From 7c56748377f0aa4a796b77a99d3f7bcfc4f844d0 Mon Sep 17 00:00:00 2001 From: Su-Shing Chen Date: Sat, 8 Jun 2019 16:09:50 +1200 Subject: [PATCH 001/472] Sort worlds in world hopper using Guava Use Guava to abstract the world hopper sorting code. This fixes secondary sorting when sorting by activity, e.g. when sorting by "Ping" and then by "Activity". --- .../worldhopper/WorldSwitcherPanel.java | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java index b27f356dac..df32b03ee4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.worldhopper; +import com.google.common.collect.Ordering; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; @@ -33,6 +34,7 @@ import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.function.Function; import javax.swing.JPanel; import javax.swing.SwingUtilities; import lombok.AccessLevel; @@ -159,24 +161,23 @@ class WorldSwitcherPanel extends PluginPanel switch (orderIndex) { case PING: - return Integer.compare(r1.getPing(), r2.getPing()) * (ascendingOrder ? 1 : -1); + return getCompareValue(r1, r2, WorldTableRow::getPing); case WORLD: - return Integer.compare(r1.getWorld().getId(), r2.getWorld().getId()) * (ascendingOrder ? 1 : -1); + return getCompareValue(r1, r2, row -> row.getWorld().getId()); case PLAYERS: - return Integer.compare(r1.getUpdatedPlayerCount(), r2.getUpdatedPlayerCount()) * (ascendingOrder ? 1 : -1); + return getCompareValue(r1, r2, WorldTableRow::getUpdatedPlayerCount); case ACTIVITY: - return r1.getWorld().getActivity().compareTo(r2.getWorld().getActivity()) * -1 * (ascendingOrder ? 1 : -1); + // Leave empty activity worlds on the bottom of the list + return getCompareValue(r1, r2, row -> + { + String activity = row.getWorld().getActivity(); + return !activity.equals("-") ? activity : null; + }); default: return 0; } }); - // Leave empty activity worlds on the bottom of the list - if (orderIndex == WorldOrder.ACTIVITY) - { - rows.sort((r1, r2) -> r1.getWorld().getActivity().equals("-") ? 1 : -1); - } - rows.sort((r1, r2) -> { boolean b1 = plugin.isFavorite(r1.getWorld()); @@ -197,6 +198,17 @@ class WorldSwitcherPanel extends PluginPanel listContainer.repaint(); } + private int getCompareValue(WorldTableRow row1, WorldTableRow row2, Function compareByFn) + { + Ordering ordering = Ordering.natural(); + if (!ascendingOrder) + { + ordering = ordering.reverse(); + } + ordering = ordering.nullsLast(); + return ordering.compare(compareByFn.apply(row1), compareByFn.apply(row2)); + } + void updateFavoriteMenu(int world, boolean favorite) { for (WorldTableRow row : rows) From 799158bacd6c55ec7658d76b0f1e7e835833cc58 Mon Sep 17 00:00:00 2001 From: Su-Shing Chen Date: Sat, 8 Jun 2019 16:11:41 +1200 Subject: [PATCH 002/472] Put worlds with unknown ping at the bottom of the world hopper list Closes #8176 --- .../client/plugins/worldhopper/WorldSwitcherPanel.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java index df32b03ee4..937a9e74d2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java @@ -161,7 +161,12 @@ class WorldSwitcherPanel extends PluginPanel switch (orderIndex) { case PING: - return getCompareValue(r1, r2, WorldTableRow::getPing); + // Leave worlds with unknown ping at the bottom + return getCompareValue(r1, r2, row -> + { + int ping = row.getPing(); + return ping > 0 ? ping : null; + }); case WORLD: return getCompareValue(r1, r2, row -> row.getWorld().getId()); case PLAYERS: From 45e1441072c9618ec9167114e2cef10e073cd17a Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Sun, 30 Jun 2019 23:10:05 -0700 Subject: [PATCH 003/472] HotColdTemperature: Fix warm-but-colder temperature bug Because the word "cold" is used both as a temperature ("The device is cold"), and in a temperature change ("but colder than last time."), HotColdTemperature tried to interpret COLDER temperature changes as a COLD temperature match. By matching only the section of the temperature string preceding the optional comma, this bug is avoided. --- .../plugins/cluescrolls/clues/hotcold/HotColdTemperature.java | 4 +++- .../cluescrolls/clues/hotcold/HotColdTemperatureTest.java | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperature.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperature.java index 2dc5909000..21171eec8d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperature.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperature.java @@ -32,6 +32,7 @@ import java.util.Set; import javax.annotation.Nullable; import lombok.AllArgsConstructor; import lombok.Getter; +import net.runelite.client.util.Text; @AllArgsConstructor @Getter @@ -93,11 +94,12 @@ public enum HotColdTemperature return null; } + final String messageStart = Text.fromCSV(message).get(0); final List possibleTemperatures = new ArrayList<>(); for (final HotColdTemperature temperature : temperatureSet) { - if (message.contains(temperature.getText())) + if (messageStart.contains(temperature.getText())) { possibleTemperatures.add(temperature); } diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java index e9711dc433..cbc4c0e267 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java @@ -73,5 +73,7 @@ public class HotColdTemperatureTest assertEquals(HotColdTemperature.ICE_COLD, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES, "The device is ice cold.")); assertEquals(HotColdTemperature.VERY_COLD, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES, "The device is very cold.")); assertEquals(HotColdTemperature.VERY_HOT, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES, "The device is very hot.")); + assertEquals(HotColdTemperature.COLD, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.BEGINNER_HOT_COLD_TEMPERATURES, "The device is cold, and warmer than last time.")); + assertEquals(HotColdTemperature.WARM, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.BEGINNER_HOT_COLD_TEMPERATURES, "The device is warm, but colder than last time.")); } } From 29d786b948f52d5ec4ae3f31f90e23a3e81bdc9a Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Sun, 30 Jun 2019 22:26:09 -0700 Subject: [PATCH 004/472] HotColdClue: Improve behavior on visibly shaking location This change causes the locations list to be narrowed on all locator orb checks, having the consequence of narrowing the list to the visibly shaking location (for better display via `makeOverlayHint()'). The call to `reset()' must be removed as it would re-add all locations to the instance's solver when finding the dig location, which effectively reverses the apparent narrowing the overlay displayed until that point. --- .../client/plugins/cluescrolls/clues/HotColdClue.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java index 5fad4e4207..3ea30d27b6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java @@ -296,11 +296,11 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat else { location = null; - - final HotColdTemperatureChange temperatureChange = HotColdTemperatureChange.of(message); - hotColdSolver.signal(localWorld, temperature, temperatureChange); } + final HotColdTemperatureChange temperatureChange = HotColdTemperatureChange.of(message); + hotColdSolver.signal(localWorld, temperature, temperatureChange); + return true; } @@ -339,7 +339,6 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat private void markFinalSpot(WorldPoint wp) { this.location = wp; - reset(); } public String[] getNpcs() From 2c13816ca9896ab89de3e5335b126f3fae89f9f6 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Sun, 30 Jun 2019 22:37:55 -0700 Subject: [PATCH 005/472] HotColdClue: Clear final location on clue reset If the clue is being reset, say from a new clue being read and initialized, we should not continue to use the old location. --- .../runelite/client/plugins/cluescrolls/clues/HotColdClue.java | 1 + 1 file changed, 1 insertion(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java index 3ea30d27b6..219916d240 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java @@ -307,6 +307,7 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat @Override public void reset() { + location = null; initializeSolver(); } From 80f0000f894e817ceb0cf2f7c427b75f75ccb6d8 Mon Sep 17 00:00:00 2001 From: Kusha Gharahi <3326002+kushagharahi@users.noreply.github.com> Date: Tue, 25 Jun 2019 04:19:55 +0000 Subject: [PATCH 006/472] wintertodt plugin: add round start notification Co-authored-by: Adam --- .../main/java/net/runelite/api/Varbits.java | 4 +- .../plugins/wintertodt/WintertodtConfig.java | 15 ++ .../plugins/wintertodt/WintertodtPlugin.java | 28 ++++ .../wintertodt/WintertodtPluginTest.java | 155 ++++++++++++++++++ 4 files changed, 201 insertions(+), 1 deletion(-) create mode 100644 runelite-client/src/test/java/net/runelite/client/plugins/wintertodt/WintertodtPluginTest.java diff --git a/runelite-api/src/main/java/net/runelite/api/Varbits.java b/runelite-api/src/main/java/net/runelite/api/Varbits.java index b55956dd20..ee72d85f2b 100644 --- a/runelite-api/src/main/java/net/runelite/api/Varbits.java +++ b/runelite-api/src/main/java/net/runelite/api/Varbits.java @@ -496,7 +496,9 @@ public enum Varbits EXPLORER_RING_ALCHTYPE(5398), EXPLORER_RING_TELEPORTS(4552), EXPLORER_RING_ALCHS(4554), - EXPLORER_RING_RUNENERGY(4553); + EXPLORER_RING_RUNENERGY(4553), + + WINTERTODT_TIMER(7980); /** * The raw varbit ID. diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtConfig.java index 8fd6e6e446..6b1adb7e9d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtConfig.java @@ -29,6 +29,7 @@ import java.awt.Color; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; +import net.runelite.client.config.Range; import net.runelite.client.plugins.wintertodt.config.WintertodtNotifyMode; @ConfigGroup("wintertodt") @@ -55,4 +56,18 @@ public interface WintertodtConfig extends Config { return Color.CYAN; } + + @ConfigItem( + position = 3, + keyName = "roundNotification", + name = "Wintertodt round notification", + description = "Notifies you before the round starts (in seconds)" + ) + @Range( + max = 60 + ) + default int roundNotification() + { + return 5; + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java index 2360a68604..1fb36bfd27 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java @@ -56,10 +56,12 @@ import static net.runelite.api.ItemID.BRUMA_KINDLING; import static net.runelite.api.ItemID.BRUMA_ROOT; import net.runelite.api.MessageNode; import net.runelite.api.Player; +import net.runelite.api.Varbits; import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameTick; import net.runelite.api.events.ItemContainerChanged; +import net.runelite.api.events.VarbitChanged; import net.runelite.client.Notifier; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.config.ConfigManager; @@ -117,6 +119,8 @@ public class WintertodtPlugin extends Plugin private Instant lastActionTime; + private int previousTimerValue; + @Provides WintertodtConfig getConfig(ConfigManager configManager) { @@ -182,6 +186,30 @@ public class WintertodtPlugin extends Plugin checkActionTimeout(); } + @Subscribe + public void onVarbitChanged(VarbitChanged varbitChanged) + { + int timerValue = client.getVar(Varbits.WINTERTODT_TIMER); + if (timerValue != previousTimerValue) + { + int timeToNotify = config.roundNotification(); + if (timeToNotify > 0) + { + int timeInSeconds = timerValue * 30 / 50; + int prevTimeInSeconds = previousTimerValue * 30 / 50; + + log.debug("Seconds left until round start: {}", timeInSeconds); + + if (prevTimeInSeconds > timeToNotify && timeInSeconds <= timeToNotify) + { + notifier.notify("Wintertodt round is about to start"); + } + } + + previousTimerValue = timerValue; + } + } + private void checkActionTimeout() { if (currentActivity == WintertodtActivity.IDLE) diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/wintertodt/WintertodtPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/wintertodt/WintertodtPluginTest.java new file mode 100644 index 0000000000..7069d4f06a --- /dev/null +++ b/runelite-client/src/test/java/net/runelite/client/plugins/wintertodt/WintertodtPluginTest.java @@ -0,0 +1,155 @@ +/* + * Copyright (c) 2019, Kusha Gharahi + * Copyright (c) 2019, Adam + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.client.plugins.wintertodt; + +import com.google.inject.Guice; +import com.google.inject.testing.fieldbinder.Bind; +import com.google.inject.testing.fieldbinder.BoundFieldModule; +import javax.inject.Inject; +import net.runelite.api.Client; +import net.runelite.api.Varbits; +import net.runelite.api.events.VarbitChanged; +import net.runelite.client.Notifier; +import net.runelite.client.chat.ChatMessageManager; +import net.runelite.client.ui.overlay.OverlayManager; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import org.mockito.runners.MockitoJUnitRunner; + +@RunWith(MockitoJUnitRunner.class) +public class WintertodtPluginTest +{ + @Inject + WintertodtPlugin wintertodtPlugin; + + @Mock + @Bind + WintertodtConfig config; + + @Mock + @Bind + WintertodtOverlay wintertodtOverlay; + + @Mock + @Bind + OverlayManager overlayManager; + + @Mock + @Bind + ChatMessageManager chatMessageManager; + + @Mock + @Bind + Notifier notifier; + + @Mock + @Bind + Client client; + + @Before + public void before() + { + Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this); + } + + @Test + public void matchStartingNotification_shouldNotify_when15SecondsOptionSelected() + { + when(config.roundNotification()).thenReturn(15); + + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(35); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + //(15 * 50) / 30 = ~25 + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(25); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + + verify(notifier, times(1)).notify("Wintertodt round is about to start"); + } + + @Test + public void matchStartingNotification_shouldNotify_when10SecondsOptionSelected() + { + when(config.roundNotification()).thenReturn(10); + + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(20); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + //(10 * 50) / 30 = ~16 + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(16); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + + verify(notifier, times(1)).notify("Wintertodt round is about to start"); + } + + @Test + public void matchStartingNotification_shouldNotify_when5SecondsOptionSelected() + { + when(config.roundNotification()).thenReturn(5); + + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(10); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + //(5 * 50) / 30 = ~8 + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(8); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + + verify(notifier, times(1)).notify("Wintertodt round is about to start"); + } + + @Test + public void matchStartingNotification_shouldNotifyOnce() + { + when(config.roundNotification()).thenReturn(5); + + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(0); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(10); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(8); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(6); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(5); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(4); + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + + verify(notifier, times(1)).notify("Wintertodt round is about to start"); + } + + @Test + public void matchStartingNotification_shouldNotNotify_whenNoneOptionSelected() + { + when(config.roundNotification()).thenReturn(5); + when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(25); + + wintertodtPlugin.onVarbitChanged(new VarbitChanged()); + verify(notifier, times(0)).notify("Wintertodt round is about to start"); + } +} From d72a1b9456ac2757c7012a6f2b35c679e3f490bb Mon Sep 17 00:00:00 2001 From: Max Weber Date: Wed, 3 Jul 2019 00:48:18 -0600 Subject: [PATCH 007/472] runelite-client: Don't try to contain to screen when contain is off Java's GraphicsConfiguration::getBounds() is completely nonfunctional for me, returning nearly random values, which causes the our window to move itself to random places, often outside of my displays' bounds --- .../runelite/client/ui/ContainableFrame.java | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/ContainableFrame.java b/runelite-client/src/main/java/net/runelite/client/ui/ContainableFrame.java index 0748731c9a..fdfca6e89c 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/ContainableFrame.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/ContainableFrame.java @@ -113,23 +113,27 @@ public class ContainableFrame extends JFrame if (forcedWidthIncrease || expandResizeType == ExpandResizeType.KEEP_GAME_SIZE) { final int newWindowWidth = getWidth() + increment; - final Rectangle screenBounds = getGraphicsConfiguration().getBounds(); - final boolean wouldExpandThroughEdge = getX() + newWindowWidth > screenBounds.getX() + screenBounds.getWidth(); int newWindowX = getX(); - if (wouldExpandThroughEdge) + if (containedInScreen) { - if (!isFrameCloseToRightEdge() || isFrameCloseToLeftEdge()) + final Rectangle screenBounds = getGraphicsConfiguration().getBounds(); + final boolean wouldExpandThroughEdge = getX() + newWindowWidth > screenBounds.getX() + screenBounds.getWidth(); + + if (wouldExpandThroughEdge) { - // Move the window to the edge - newWindowX = (int)(screenBounds.getX() + screenBounds.getWidth()) - getWidth(); + if (!isFrameCloseToRightEdge() || isFrameCloseToLeftEdge()) + { + // Move the window to the edge + newWindowX = (int) (screenBounds.getX() + screenBounds.getWidth()) - getWidth(); + } + + // Expand the window to the left as the user probably don't want the + // window to go through the screen + newWindowX -= increment; + + expandedClientOppositeDirection = true; } - - // Expand the window to the left as the user probably don't want the - // window to go through the screen - newWindowX -= increment; - - expandedClientOppositeDirection = true; } setBounds(newWindowX, getY(), newWindowWidth, getHeight()); From 3889ebefa18333c7822f12da8b3c0c7b8f00f3dd Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Wed, 3 Jul 2019 15:13:03 +0100 Subject: [PATCH 008/472] bring inline with font manager bring inline with font manager currently ignores font manager --- .../net/runelite/client/plugins/runepouch/RunepouchOverlay.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java index deec35072a..33bdbd4106 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java @@ -83,7 +83,7 @@ public class RunepouchOverlay extends WidgetItemOverlay assert AMOUNT_VARBITS.length == RUNE_VARBITS.length; - graphics.setFont(FontManager.getRunescapeSmallFont()); + graphics.setFont(FontManager.getSmallFont(graphics.getFont()); Point location = itemWidget.getCanvasLocation(); StringBuilder tooltipBuilder = new StringBuilder(); From 911893b71064db5a9e40984146286c08d1f2d3fa Mon Sep 17 00:00:00 2001 From: Max Weber Date: Wed, 3 Jul 2019 08:45:24 -0600 Subject: [PATCH 009/472] cache/FrameDumperTest: Don't get the wrong framemaps for a frame --- cache/src/test/java/net/runelite/cache/FrameDumper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cache/src/test/java/net/runelite/cache/FrameDumper.java b/cache/src/test/java/net/runelite/cache/FrameDumper.java index 8e856cd2f8..f6cc20532d 100644 --- a/cache/src/test/java/net/runelite/cache/FrameDumper.java +++ b/cache/src/test/java/net/runelite/cache/FrameDumper.java @@ -88,7 +88,7 @@ public class FrameDumper int framemapArchiveId = (contents[0] & 0xff) << 8 | contents[1] & 0xff; - Archive framemapArchive = framemapIndex.getArchives().get(framemapArchiveId); + Archive framemapArchive = framemapIndex.getArchive(framemapArchiveId); archiveData = storage.loadArchive(framemapArchive); byte[] framemapContents = framemapArchive.decompress(archiveData); From d8d75eac1b2634b6e27240b1112c920ddd38dace Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Wed, 3 Jul 2019 15:47:23 +0100 Subject: [PATCH 010/472] Update RunepouchOverlay.java stupid insert key --- .../net/runelite/client/plugins/runepouch/RunepouchOverlay.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java index 33bdbd4106..8088176bd9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java @@ -83,7 +83,7 @@ public class RunepouchOverlay extends WidgetItemOverlay assert AMOUNT_VARBITS.length == RUNE_VARBITS.length; - graphics.setFont(FontManager.getSmallFont(graphics.getFont()); + graphics.setFont(FontManager.getSmallFont(graphics.getFont())); Point location = itemWidget.getCanvasLocation(); StringBuilder tooltipBuilder = new StringBuilder(); From 9e7d124d49549ad9cf03117d05547447eb12893f Mon Sep 17 00:00:00 2001 From: Ian William O'Neill Date: Wed, 3 Jul 2019 19:53:44 +0100 Subject: [PATCH 011/472] Quick fix for people not being able to send/receive Translated messages. (#868) Thanks to 7ate9. --- runelite-client/pom.xml | 5 ----- .../plugins/chattranslation/Translator.java | 16 +++++++++------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 98b1c9529c..70c5c83000 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -284,11 +284,6 @@ asm-all 6.0_BETA - - org.json - json - 20180813 - diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java index df8f26ea29..71e34d16d9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java @@ -1,6 +1,7 @@ package net.runelite.client.plugins.chattranslation; -import org.json.JSONArray; +import com.google.gson.JsonArray; +import com.google.gson.JsonParser; import java.io.BufferedReader; import java.io.InputStreamReader; @@ -33,14 +34,15 @@ public class Translator return parseResult(response.toString()); } - private String parseResult(String inputJson) throws Exception + private String parseResult(String inputJson) { - //TODO: find a way to do this using google.gson - JSONArray jsonArray = new JSONArray(inputJson); - JSONArray jsonArray2 = (JSONArray) jsonArray.get(0); - JSONArray jsonArray3 = (JSONArray) jsonArray2.get(0); + String result; + JsonArray jsonArray = new JsonParser().parse(inputJson).getAsJsonArray(); + JsonArray jsonArray2 = jsonArray.get(0).getAsJsonArray(); + JsonArray jsonArray3 = jsonArray2.get(0).getAsJsonArray(); + result = jsonArray3.get(0).toString(); - return jsonArray3.get(0).toString(); + return result.substring(1, result.length() - 1); } } From 9d927c3d6f2d5755a333752fb12fccb2ad8add3f Mon Sep 17 00:00:00 2001 From: kristo naeris Date: Thu, 4 Jul 2019 01:25:29 +0300 Subject: [PATCH 012/472] world hopper: add option to disable Hop-to menu option --- .../plugins/worldhopper/WorldHopperConfig.java | 13 ++++++++++++- .../plugins/worldhopper/WorldHopperPlugin.java | 5 +++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperConfig.java index f7a75781fd..8035af73fb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperConfig.java @@ -102,11 +102,22 @@ public interface WorldHopperConfig extends Config return true; } + @ConfigItem( + keyName = "menuOption", + name = "Show Hop-to menu option", + description = "Adds Hop-to menu option to the friends list and clan members list", + position = 6 + ) + default boolean menuOption() + { + return true; + } + @ConfigItem( keyName = "subscriptionFilter", name = "Show subscription types", description = "Only show free worlds, member worlds, or both types of worlds in sidebar", - position = 6 + position = 7 ) default SubscriptionFilterMode subscriptionFilter() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java index 0dce1c78b5..31bc11a925 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java @@ -327,6 +327,11 @@ public class WorldHopperPlugin extends Plugin @Subscribe public void onMenuEntryAdded(MenuEntryAdded event) { + if (!config.menuOption()) + { + return; + } + int groupId = WidgetInfo.TO_GROUP(event.getActionParam1()); String option = event.getOption(); From 6193c08aadb03d7a44acb3ef37ab162e40354ae3 Mon Sep 17 00:00:00 2001 From: JavaBlah Date: Tue, 2 Jul 2019 21:27:00 -0500 Subject: [PATCH 013/472] cursors plugin: add dragon dagger (p) cursor --- .../client/plugins/customcursor/CustomCursor.java | 1 + .../customcursor/cursor-dragon-dagger-p.png | Bin 0 -> 973 bytes 2 files changed, 1 insertion(+) create mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/customcursor/cursor-dragon-dagger-p.png diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java b/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java index 1116ab10c2..2e371632b4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java @@ -33,6 +33,7 @@ public enum CustomCursor RS3_GOLD("RS3 Gold", "cursor-rs3-gold.png"), RS3_SILVER("RS3 Silver", "cursor-rs3-silver.png"), DRAGON_DAGGER("Dragon Dagger", "cursor-dragon-dagger.png"), + DRAGON_DAGGER_POISON("Dragon Dagger (p)", "cursor-dragon-dagger-p.png"), TROUT("Trout", "cursor-trout.png"), DRAGON_SCIMITAR("Dragon Scimitar", "cursor-dragon-scimitar.png"); diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/customcursor/cursor-dragon-dagger-p.png b/runelite-client/src/main/resources/net/runelite/client/plugins/customcursor/cursor-dragon-dagger-p.png new file mode 100644 index 0000000000000000000000000000000000000000..86f1751afa4191c4fc9b735228094b1c14fa083c GIT binary patch literal 973 zcmV;;12X)HP)EX>4Tx04R}tkv&MmKpe$i(@IOJIM_kNAwzYtAS&W0RV;#q(pG5I!Q|2}Xws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;i>s5OiW2pGZ8%bi*RvAfDN@ zbk6(4QC5)@;&bA0gDyz?$aUG}H_l~;1)do-a+!JJD6v@XVY!D{#ZZZ-iDQbYQNECO zS>e3JS*eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00E^*L_t(o!|j&4N&`U@hQCQxjJnaN2pUkt*2>miL5X++ zu@DQv-cBq88?my~XAm3Tz)A!IwiZ4>KnP}|Yj!p}aV(5UyrQxfQBOB4%=z~_|2cC6 z00<3Q@P*J?<443m=)UY=RYdp^BjTtD=sD<(gu>4u0Fc`53Z25wA^?zF?+lef1lZWQE|!||=)qv7P^Ac8nx#=wjlv;ZAOOPC(eVl!tG2U0O;Hw;>VOfnIQ z7pfkpi|A;Aqyeo)XdZZW)H`XDJ0R~Vt`r;tfqB`9dKO54^Hk z$&q-ThgUA+xGt7uG0=R$$))70OUt)QurM=C!Lk@O&&ge@+Lyyq>3a#@`J=iI)-q;I zM2G@j5E)Ipq7YCUzB%>9W73FU!~T&Kl0$RMPEPnb4?ZbCi`~6_%ATU4@1xrXN~IFE veHU~aer(7mBEEHjUl;wJrSxCGpA+x^GMcfd{<`2>00000NkvXXu0mjfnP968 literal 0 HcmV?d00001 From a46b3c0321b434e0dc9f63a94bb70e93d55034c1 Mon Sep 17 00:00:00 2001 From: James Munson Date: Wed, 3 Jul 2019 17:59:31 -0700 Subject: [PATCH 014/472] Increase timeout for runelites api --- http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java index de2b1d469c..1bca0032cb 100644 --- a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java +++ b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java @@ -103,8 +103,8 @@ public class RuneLiteAPI CLIENT = new OkHttpClient.Builder() .pingInterval(30, TimeUnit.SECONDS) - .connectTimeout(5655, TimeUnit.MILLISECONDS) - .writeTimeout(5655, TimeUnit.MILLISECONDS) + .connectTimeout(8655, TimeUnit.MILLISECONDS) + .writeTimeout(8655, TimeUnit.MILLISECONDS) .addNetworkInterceptor(new Interceptor() { @Override From 2d3af49624bd65b62ff3d2382bbb7f4ae01eb952 Mon Sep 17 00:00:00 2001 From: se7enAte9 <50936458+se7enAte9@users.noreply.github.com> Date: Wed, 3 Jul 2019 22:00:16 -0400 Subject: [PATCH 015/472] =?UTF-8?q?pluginsorter:=20fix=20runelite=20plugin?= =?UTF-8?q?=20incorrect=20position=20when=20unhidi=E2=80=A6=20(#872)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/plugins/pluginsorter/PluginSorterPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java index 9d742a5280..c33b63de06 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java @@ -163,8 +163,8 @@ public class PluginSorterPlugin extends Plugin private void showPlugins() { List tempList = new ArrayList<>(); - tempList.addAll(removedPlugins); tempList.addAll(ConfigPanel.pluginList); + tempList.addAll(1, removedPlugins); ConfigPanel.pluginList = tempList; } } From be301d14fa6cb44aa2c282c29a6af4fbc9568f5f Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Thu, 4 Jul 2019 04:32:29 +0200 Subject: [PATCH 016/472] DynamicObjectAnimationChanged --- .../events/DynamicObjectAnimationChanged.java | 16 ++++++++++++++++ .../runelite/mixins/RSDynamicObjectMixin.java | 9 +++++++++ 2 files changed, 25 insertions(+) create mode 100644 runelite-api/src/main/java/net/runelite/api/events/DynamicObjectAnimationChanged.java diff --git a/runelite-api/src/main/java/net/runelite/api/events/DynamicObjectAnimationChanged.java b/runelite-api/src/main/java/net/runelite/api/events/DynamicObjectAnimationChanged.java new file mode 100644 index 0000000000..1e4571e4fe --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/events/DynamicObjectAnimationChanged.java @@ -0,0 +1,16 @@ +package net.runelite.api.events; + +import lombok.Data; + +@Data +public class DynamicObjectAnimationChanged +{ + /** + * The object that has entered a new animation. + */ + private int object; + /** + * The id of the animation animation. + */ + private int animation; +} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSDynamicObjectMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSDynamicObjectMixin.java index 5760e13157..ed1a4a70b9 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSDynamicObjectMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSDynamicObjectMixin.java @@ -24,6 +24,7 @@ */ package net.runelite.mixins; +import net.runelite.api.events.DynamicObjectAnimationChanged; import net.runelite.api.mixins.Copy; import net.runelite.api.mixins.FieldHook; import net.runelite.api.mixins.Inject; @@ -89,6 +90,14 @@ public abstract class RSDynamicObjectMixin implements RSDynamicObject public void rl$init(int id, int type, int orientation, int plane, int x, int y, int animationID, boolean var8, RSEntity var9) { this.animationID = animationID; + + if (animationID != -1) + { + DynamicObjectAnimationChanged dynamicObjectAnimationChanged = new DynamicObjectAnimationChanged(); + dynamicObjectAnimationChanged.setObject(id); + dynamicObjectAnimationChanged.setAnimation(animationID); + client.getCallbacks().post(dynamicObjectAnimationChanged); + } } @Inject From 4fd0fcab0f0c4f74226329fbd96c71cee01b00b9 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Thu, 4 Jul 2019 13:01:12 +0000 Subject: [PATCH 017/472] [maven-release-plugin] prepare release runelite-parent-1.5.28 --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- http-api/pom.xml | 2 +- http-service/pom.xml | 2 +- pom.xml | 4 ++-- protocol-api/pom.xml | 2 +- protocol/pom.xml | 2 +- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-mixins/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- runescape-api/pom.xml | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 59b213541f..0a04e5fc3e 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 4eb3f28217..ebee5230d0 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 2069230ff9..eb7eba2fe5 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 cache diff --git a/http-api/pom.xml b/http-api/pom.xml index 0b08a5d6c9..edb35c731c 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index b47299f9b2..2c8ae8a40e 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 Web Service diff --git a/pom.xml b/pom.xml index b191cd34d0..2ee625a627 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 pom RuneLite @@ -59,7 +59,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - HEAD + runelite-parent-1.5.28 diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml index cb85d612f9..cad5d414e5 100644 --- a/protocol-api/pom.xml +++ b/protocol-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 protocol-api diff --git a/protocol/pom.xml b/protocol/pom.xml index 1e03da9e36..496f3e6262 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 protocol diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index a4c60790a2..d5c0b9ed62 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 6f765e2d81..886a198fc0 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 client diff --git a/runelite-mixins/pom.xml b/runelite-mixins/pom.xml index db8285d1c9..5614b3ea4b 100644 --- a/runelite-mixins/pom.xml +++ b/runelite-mixins/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 mixins diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 25f0b49f51..963480596b 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 script-assembler-plugin diff --git a/runescape-api/pom.xml b/runescape-api/pom.xml index 710b68be9f..e678027e1e 100644 --- a/runescape-api/pom.xml +++ b/runescape-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.28 net.runelite.rs From d7a1e510413ce6625eb29ea831d7640519ca9b7c Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Thu, 4 Jul 2019 13:01:18 +0000 Subject: [PATCH 018/472] [maven-release-plugin] prepare for next development iteration --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- http-api/pom.xml | 2 +- http-service/pom.xml | 2 +- pom.xml | 4 ++-- protocol-api/pom.xml | 2 +- protocol/pom.xml | 2 +- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-mixins/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- runescape-api/pom.xml | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 0a04e5fc3e..3073c9f439 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index ebee5230d0..b57857a714 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index eb7eba2fe5..e79fdf3c58 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT cache diff --git a/http-api/pom.xml b/http-api/pom.xml index edb35c731c..9d6ef8d1b6 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index 2c8ae8a40e..1c64147d7e 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT Web Service diff --git a/pom.xml b/pom.xml index 2ee625a627..52a30f3d35 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT pom RuneLite @@ -59,7 +59,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - runelite-parent-1.5.28 + HEAD diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml index cad5d414e5..ea06134acf 100644 --- a/protocol-api/pom.xml +++ b/protocol-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT protocol-api diff --git a/protocol/pom.xml b/protocol/pom.xml index 496f3e6262..8e504698b7 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT protocol diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index d5c0b9ed62..502f90706d 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 886a198fc0..53bfdf94f9 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT client diff --git a/runelite-mixins/pom.xml b/runelite-mixins/pom.xml index 5614b3ea4b..e29ca008fe 100644 --- a/runelite-mixins/pom.xml +++ b/runelite-mixins/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT mixins diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 963480596b..6387f338e7 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT script-assembler-plugin diff --git a/runescape-api/pom.xml b/runescape-api/pom.xml index e678027e1e..cfe8d98273 100644 --- a/runescape-api/pom.xml +++ b/runescape-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28 + 1.5.29-SNAPSHOT net.runelite.rs From f213753c7ecf42dac73f59fa1b9a11d72e2f7183 Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Thu, 4 Jul 2019 14:51:32 +0100 Subject: [PATCH 019/472] prayer: fix HD prayer bar flick location --- .../net/runelite/client/plugins/prayer/PrayerBarOverlay.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerBarOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerBarOverlay.java index 5798698621..df4da38850 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerBarOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerBarOverlay.java @@ -109,10 +109,11 @@ class PrayerBarOverlay extends Overlay final double t = plugin.getTickProgress(); final int halfBarWidth = (barWidth / 2) - HD_PRAYER_BAR_PADDING; - final int xOffset = (int) (-Math.cos(t) * halfBarWidth) + ((barWidth / 2) - halfBarWidth); + final int xOffset = (int) (-Math.cos(t) * halfBarWidth) + halfBarWidth; graphics.setColor(FLICK_HELP_COLOR); - graphics.fillRect(barX + xOffset + HD_PRAYER_BAR_PADDING, barY + HD_PRAYER_BAR_PADDING, 1, barHeight - HD_PRAYER_BAR_PADDING * 2); + // Padding is accounted for in the offset calculation + graphics.fillRect(barX + xOffset, barY + HD_PRAYER_BAR_PADDING, 1, barHeight - HD_PRAYER_BAR_PADDING * 2); } return new Dimension(barWidth, barHeight); From 8f05c016184fb329e39172dac7f6576a7a98f756 Mon Sep 17 00:00:00 2001 From: ocekyled <19616058+ocekyled@users.noreply.github.com> Date: Fri, 5 Jul 2019 00:07:56 +0930 Subject: [PATCH 020/472] Added several missing interfaces to bank pin plugin (#878) --- .../client/plugins/runeliteplus/RuneLitePlusPlugin.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java index 289940cb8f..2279d2ddd8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java @@ -258,7 +258,12 @@ public class RuneLitePlusPlugin extends Plugin && !client.getWidget(WidgetInfo.BANK_PIN_TOP_LEFT_TEXT).getText().equals("Grand Exchange") && !client.getWidget(WidgetInfo.BANK_PIN_TOP_LEFT_TEXT).getText().equals("Housing Security System") && !client.getWidget(WidgetInfo.BANK_PIN_TOP_LEFT_TEXT).getText().equals("Dominic's Coffer") - && !client.getWidget(WidgetInfo.BANK_PIN_TOP_LEFT_TEXT).getText().equals("Dominic's Reward Shop")) + && !client.getWidget(WidgetInfo.BANK_PIN_TOP_LEFT_TEXT).getText().equals("Dominic's Reward Shop") + && !client.getWidget(WidgetInfo.BANK_PIN_TOP_LEFT_TEXT).getText().equals("Seed Vault") + && !client.getWidget(WidgetInfo.BANK_PIN_TOP_LEFT_TEXT).getText().equals("Leprechaun Protection") + && !client.getWidget(WidgetInfo.BANK_PIN_TOP_LEFT_TEXT).getText().equals("Access Bond Pouch") + && !client.getWidget(WidgetInfo.BANK_PIN_TOP_LEFT_TEXT).getText().equals("Miscellania Security System") + && !client.getWidget(WidgetInfo.BANK_PIN_TOP_LEFT_TEXT).getText().equals("STASH Security")) { entered = 0; From 0c64dddf7841d1f406d380310f93b551e4ea4b8f Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Thu, 4 Jul 2019 20:47:31 +0100 Subject: [PATCH 021/472] Update FlexoPlugin.java --- .../java/net/runelite/client/plugins/flexo/FlexoPlugin.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java index ed49c53b91..e9edc5352f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java @@ -64,7 +64,8 @@ import net.runelite.client.ui.overlay.OverlayManager; name = "Flexo Config", description = "Customizes the flexo api", tags = {"flexo", "null"}, - type = PluginType.UTILITY + type = PluginType.EXTERNAL, + enabledByDefault = false ) public class FlexoPlugin extends Plugin From 6b0851001a51189ef44a90f0e6a075edfbdc5922 Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Thu, 4 Jul 2019 20:49:30 +0100 Subject: [PATCH 022/472] Update RuneLitePlusPlugin.java --- .../client/plugins/runeliteplus/RuneLitePlusPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java index 289940cb8f..7889820bbc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java @@ -54,7 +54,7 @@ import net.runelite.client.ui.ClientUI; hidden = true, // prevent users from disabling name = "RuneLitePlus", description = "Configures various aspects of RuneLitePlus", - type = PluginType.EXTERNAL + type = PluginType.UTILITY ) @Slf4j From 6617f6a14430d8da1d176f3721095aaa2d2af0e8 Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Thu, 4 Jul 2019 20:50:36 +0100 Subject: [PATCH 023/472] Update RuneLiteConfig.java --- .../main/java/net/runelite/client/config/RuneLiteConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java b/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java index f57df0c6f0..b7503fb616 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java @@ -73,7 +73,7 @@ public interface RuneLiteConfig extends Config ) default boolean enablePlugins() { - return true; + return false; } @ConfigItem( From d26115cac660a8ae6b076f274a1453288af963a8 Mon Sep 17 00:00:00 2001 From: Lucas Date: Thu, 4 Jul 2019 22:59:34 +0200 Subject: [PATCH 024/472] Fix deob pom and revert updatemappings change Revert not working updatemappings change Show log messages in deob --- deobfuscator/pom.xml | 1 + .../runelite/deob/updater/UpdateMappings.java | 40 +------------------ 2 files changed, 2 insertions(+), 39 deletions(-) diff --git a/deobfuscator/pom.xml b/deobfuscator/pom.xml index c711697622..babd26ed24 100644 --- a/deobfuscator/pom.xml +++ b/deobfuscator/pom.xml @@ -65,6 +65,7 @@ org.slf4j slf4j-simple 1.7.12 + runtime com.google.code.gson diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java b/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java index db6ed0ef1c..0201caabb1 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java +++ b/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java @@ -26,24 +26,19 @@ package net.runelite.deob.updater; import java.io.File; import java.io.IOException; -import java.util.Map; import net.runelite.asm.ClassGroup; -import net.runelite.asm.Field; -import net.runelite.asm.Method; -import net.runelite.deob.deobfuscators.Renamer; import net.runelite.deob.deobfuscators.mapping.AnnotationIntegrityChecker; import net.runelite.deob.deobfuscators.mapping.AnnotationMapper; import net.runelite.deob.deobfuscators.mapping.Mapper; import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; import net.runelite.deob.util.JarUtil; -import net.runelite.deob.util.NameMappings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class UpdateMappings { private static final Logger logger = LoggerFactory.getLogger(UpdateMappings.class); - private static boolean renameRL = true; + private final ClassGroup group1, group2; public UpdateMappings(ClassGroup group1, ClassGroup group2) @@ -79,32 +74,6 @@ public class UpdateMappings pr.run(); } - public void updateRL() - { - Mapper mapper = new Mapper(group1, group2); - mapper.run(); - ParallelExecutorMapping mapping = mapper.getMapping(); - NameMappings names = new NameMappings(); - - for (Map.Entry e : mapping.getMap().entrySet()) - { - Object k = e.getKey(); - Object v = e.getValue(); - - if (k instanceof Field) - { - names.map(((Field) v).getPoolField(), ((Field) k).getName()); - } - else if (k instanceof Method) - { - names.map(((Method) v).getPoolMethod(), ((Method) k).getName()); - } - } - - Renamer renamer = new Renamer(names); - renamer.run(group2); - } - public void save(File out) throws IOException { JarUtil.saveJar(group2, out); @@ -121,14 +90,7 @@ public class UpdateMappings JarUtil.loadJar(new File(args[0])), JarUtil.loadJar(new File(args[1])) ); - if (renameRL) - { - u.updateRL(); - } - else - { u.update(); - } u.save(new File(args[2])); } } From 1f2a9b21d6a8208aeddea5aaf4060a881c7e48ac Mon Sep 17 00:00:00 2001 From: Lucas Date: Thu, 4 Jul 2019 23:49:33 +0200 Subject: [PATCH 025/472] Fix some deob/asm bugs Check if last char is ; as well, so (e.g.) Login doesn't end up as ogi Check if name is the same as exported already for renamer --- deobfuscator/src/main/java/net/runelite/asm/Type.java | 2 +- .../java/net/runelite/deob/deobfuscators/RenameUnique.java | 5 +++-- .../main/java/net/runelite/deob/deobfuscators/Renamer.java | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/deobfuscator/src/main/java/net/runelite/asm/Type.java b/deobfuscator/src/main/java/net/runelite/asm/Type.java index 68ba6960d4..89eb3b3023 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/Type.java +++ b/deobfuscator/src/main/java/net/runelite/asm/Type.java @@ -110,7 +110,7 @@ public class Type { s = s.substring(1); } - if (s.startsWith("L")) + if (s.startsWith("L") && s.endsWith(";")) { return s.substring(1, s.length() - 1); } diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java index 7e341b1a55..eb75795d49 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java @@ -31,6 +31,7 @@ import net.runelite.asm.Field; import net.runelite.asm.Method; import net.runelite.asm.signature.util.VirtualMethods; import net.runelite.deob.Deob; +import net.runelite.deob.DeobAnnotations; import net.runelite.deob.Deobfuscator; import net.runelite.deob.util.NameMappings; @@ -60,7 +61,7 @@ public class RenameUnique implements Deobfuscator for (ClassFile cf : group.getClasses()) for (Field field : cf.getFields()) { - if (field.getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN) + if (field.getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN && !field.getName().startsWith("__") || field.getName().equals(DeobAnnotations.getExportedName(field.getAnnotations()))) continue; map.map(field.getPoolField(), "field" + i++); @@ -74,7 +75,7 @@ public class RenameUnique implements Deobfuscator for (ClassFile cf : group.getClasses()) for (Method method : cf.getMethods()) { - if (method.getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN) + if (method.getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN && !method.getName().startsWith("__") || method.getName().equals(DeobAnnotations.getExportedName(method.getAnnotations()))) continue; List virtualMethods = VirtualMethods.getVirtualMethods(method); diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Renamer.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Renamer.java index cbb38be382..418802ef5a 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Renamer.java +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Renamer.java @@ -216,6 +216,8 @@ public class Renamer implements Deobfuscator field.getAnnotations().addAnnotation(DeobAnnotations.OBFUSCATED_NAME, "value", field.getName()); } + assert DeobAnnotations.getExportedName(field.getAnnotations()) == null || DeobAnnotations.getExportedName(field.getAnnotations()).equals(newName) : "Tried changing field name to something other than the exported name!"; + field.setName(newName); ++fields; } From a8d801d8303ccc0694ac5ed57aa8e3320acc480b Mon Sep 17 00:00:00 2001 From: Lucas Date: Thu, 4 Jul 2019 23:51:52 +0200 Subject: [PATCH 026/472] Use newer version of fernflower and remove __xx names --- .../main/java/AbstractByteArrayCopier.java | 57 +- .../src/main/java/AbstractFont.java | 489 +- .../src/main/java/AbstractIndexCache.java | 239 +- .../src/main/java/AbstractSocket.java | 8 +- .../src/main/java/AbstractUserComparator.java | 39 +- .../src/main/java/AbstractWorldMapIcon.java | 57 +- .../src/main/java/AccessFile.java | 63 +- runescape-client/src/main/java/Actor.java | 1341 ++-- runescape-client/src/main/java/Animation.java | 76 +- .../src/main/java/AttackOption.java | 112 +- .../src/main/java/AudioFilter.java | 136 +- .../src/main/java/BoundaryObject.java | 30 +- runescape-client/src/main/java/Bounds.java | 91 +- runescape-client/src/main/java/Buddy.java | 14 +- runescape-client/src/main/java/Buffer.java | 375 +- .../src/main/java/BufferedFile.java | 276 +- .../src/main/java/BufferedNetSocket.java | 3 +- .../src/main/java/BufferedSink.java | 161 +- .../src/main/java/BufferedSource.java | 72 +- .../src/main/java/ByteArrayPool.java | 92 +- .../src/main/java/Bzip2Decompressor.java | 717 +- .../src/main/java/Bzip2State.java | 121 +- runescape-client/src/main/java/Canvas.java | 125 +- .../src/main/java/ChatChannel.java | 219 +- runescape-client/src/main/java/ClanChat.java | 86 +- runescape-client/src/main/java/ClanMate.java | 8 +- runescape-client/src/main/java/Client.java | 5980 +++++++++-------- .../src/main/java/ClientPacket.java | 410 +- .../src/main/java/ClientParameter.java | 116 +- .../src/main/java/ClientPreferences.java | 55 +- runescape-client/src/main/java/Clock.java | 39 +- .../src/main/java/CollisionMap.java | 417 +- runescape-client/src/main/java/Decimator.java | 157 +- .../src/main/java/DemotingHashTable.java | 25 +- .../java/DesktopPlatformInfoProvider.java | 120 +- .../src/main/java/DevicePcmPlayer.java | 37 +- .../main/java/DevicePcmPlayerProvider.java | 660 +- runescape-client/src/main/java/DualNode.java | 3 +- .../src/main/java/DualNodeDeque.java | 14 +- .../src/main/java/DynamicObject.java | 610 +- runescape-client/src/main/java/Entity.java | 2 +- .../src/main/java/EnumDefinition.java | 32 +- .../main/java/EvictingDualNodeHashTable.java | 17 +- .../src/main/java/FaceNormal.java | 58 +- .../src/main/java/FloorDecoration.java | 22 +- runescape-client/src/main/java/Font.java | 22 +- runescape-client/src/main/java/FontName.java | 424 +- runescape-client/src/main/java/Fonts.java | 34 +- .../src/main/java/Formatting.java | 62 +- runescape-client/src/main/java/Frames.java | 18 +- runescape-client/src/main/java/Friend.java | 6 +- .../src/main/java/FriendLoginUpdate.java | 2 +- .../src/main/java/FriendSystem.java | 167 +- .../src/main/java/FriendsList.java | 48 +- .../src/main/java/GameObject.java | 4 +- runescape-client/src/main/java/GameShell.java | 365 +- .../src/main/java/GrandExchangeEvent.java | 372 +- .../src/main/java/GrandExchangeEvents.java | 81 +- .../src/main/java/GrandExchangeOffer.java | 32 +- .../src/main/java/GraphicsObject.java | 16 +- .../src/main/java/GroundItem.java | 8 +- .../src/main/java/GroundItemPile.java | 18 +- .../src/main/java/GzipDecompressor.java | 16 +- runescape-client/src/main/java/HealthBar.java | 143 +- .../src/main/java/HealthBarDefinition.java | 68 +- .../src/main/java/HealthBarUpdate.java | 36 +- .../src/main/java/HitSplatDefinition.java | 228 +- runescape-client/src/main/java/Huffman.java | 148 +- .../src/main/java/IgnoreList.java | 54 +- runescape-client/src/main/java/Ignored.java | 4 +- .../src/main/java/IndexCache.java | 347 +- .../src/main/java/IndexCacheLoader.java | 985 +-- .../src/main/java/IndexStore.java | 559 +- .../src/main/java/IndexStoreAction.java | 70 +- .../main/java/IndexStoreActionHandler.java | 71 +- .../src/main/java/IndexedSprite.java | 92 +- .../src/main/java/Instrument.java | 310 +- .../src/main/java/IntHashTable.java | 16 +- .../src/main/java/Interpreter.java | 124 +- .../src/main/java/InvDefinition.java | 18 +- .../src/main/java/IsaacCipher.java | 387 +- .../src/main/java/ItemContainer.java | 56 +- .../src/main/java/ItemDefinition.java | 362 +- .../src/main/java/IterableDualNodeQueue.java | 22 +- .../java/IterableDualNodeQueueIterator.java | 30 +- .../src/main/java/IterableNodeDeque.java | 14 +- .../IterableNodeDequeDescendingIterator.java | 38 +- .../src/main/java/IterableNodeHashTable.java | 31 +- .../java/IterableNodeHashTableIterator.java | 61 +- .../src/main/java/KeyHandler.java | 142 +- .../src/main/java/KitDefinition.java | 120 +- runescape-client/src/main/java/Link.java | 15 +- runescape-client/src/main/java/LinkDeque.java | 43 +- runescape-client/src/main/java/Login.java | 104 +- .../src/main/java/LoginPacket.java | 64 +- .../src/main/java/LoginScreenAnimation.java | 311 +- runescape-client/src/main/java/LoginType.java | 59 +- .../src/main/java/MenuAction.java | 62 +- runescape-client/src/main/java/Message.java | 192 +- runescape-client/src/main/java/Messages.java | 20 +- .../src/main/java/MidiFileReader.java | 137 +- .../src/main/java/MidiPcmStream.java | 797 +-- .../src/main/java/MilliClock.java | 137 +- runescape-client/src/main/java/Model.java | 1258 ++-- runescape-client/src/main/java/ModelData.java | 1299 ++-- .../src/main/java/MouseHandler.java | 64 +- .../src/main/java/MouseRecorder.java | 418 +- .../src/main/java/MusicPatch.java | 510 +- .../src/main/java/MusicPatchNode.java | 40 +- .../src/main/java/MusicPatchNode2.java | 21 +- .../src/main/java/MusicPatchPcmStream.java | 122 +- .../src/main/java/MusicSample.java | 555 +- .../src/main/java/MusicTrack.java | 234 +- runescape-client/src/main/java/NanoClock.java | 6 +- runescape-client/src/main/java/NetCache.java | 32 +- .../src/main/java/NetFileRequest.java | 62 +- runescape-client/src/main/java/NetSocket.java | 485 +- runescape-client/src/main/java/Node.java | 3 +- runescape-client/src/main/java/NodeDeque.java | 22 +- .../src/main/java/NodeHashTable.java | 31 +- runescape-client/src/main/java/Npc.java | 64 +- .../src/main/java/NpcDefinition.java | 369 +- .../src/main/java/ObjectDefinition.java | 469 +- .../src/main/java/ObjectSound.java | 44 +- runescape-client/src/main/java/Occluder.java | 48 +- .../src/main/java/OverlayDefinition.java | 83 +- .../src/main/java/OwnWorldComparator.java | 32 +- .../src/main/java/PacketBuffer.java | 49 +- .../src/main/java/PacketBufferNode.java | 25 +- .../src/main/java/PacketWriter.java | 52 +- .../src/main/java/ParamKeyDefinition.java | 372 +- runescape-client/src/main/java/PcmPlayer.java | 228 +- runescape-client/src/main/java/PcmStream.java | 16 +- .../src/main/java/PcmStreamMixer.java | 100 +- .../src/main/java/PcmStreamMixerListener.java | 2 +- .../src/main/java/PlatformInfo.java | 168 +- runescape-client/src/main/java/Player.java | 165 +- .../src/main/java/PlayerAppearance.java | 284 +- .../src/main/java/PlayerType.java | 11 +- runescape-client/src/main/java/Players.java | 104 +- .../src/main/java/Projectile.java | 18 +- .../src/main/java/Rasterizer2D.java | 476 +- .../src/main/java/Rasterizer3D.java | 3623 +++++----- .../src/main/java/RawPcmStream.java | 1416 ++-- runescape-client/src/main/java/RawSound.java | 8 +- .../src/main/java/RectangleMode.java | 11 +- .../src/main/java/RouteStrategy.java | 13 +- .../src/main/java/RunException.java | 9 +- runescape-client/src/main/java/Scene.java | 1601 ++--- runescape-client/src/main/java/Script.java | 44 +- .../src/main/java/ScriptEvent.java | 110 +- .../src/main/java/ScriptFrame.java | 12 +- .../src/main/java/SecureRandomCallable.java | 40 +- .../src/main/java/SecureRandomFuture.java | 2 +- .../src/main/java/SequenceDefinition.java | 177 +- .../src/main/java/ServerBuild.java | 24 +- .../src/main/java/ServerPacket.java | 418 +- runescape-client/src/main/java/Skeleton.java | 92 +- runescape-client/src/main/java/Skills.java | 56 +- .../src/main/java/SoundCache.java | 144 +- .../src/main/java/SoundEffect.java | 43 +- .../src/main/java/SoundEnvelope.java | 12 +- .../src/main/java/SoundSystem.java | 14 +- .../main/java/SpotAnimationDefinition.java | 94 +- runescape-client/src/main/java/Sprite.java | 544 +- runescape-client/src/main/java/SpriteIds.java | 62 +- .../src/main/java/SpriteMask.java | 14 +- runescape-client/src/main/java/Strings.java | 60 +- .../src/main/java/StructDefinition.java | 280 +- .../src/main/java/StudioGame.java | 22 +- .../src/main/java/TaskHandler.java | 31 +- runescape-client/src/main/java/Texture.java | 137 +- .../src/main/java/TextureLoader.java | 4 +- .../src/main/java/TextureProvider.java | 204 +- runescape-client/src/main/java/Tile.java | 227 +- .../src/main/java/TileLocation.java | 12 +- runescape-client/src/main/java/TileModel.java | 358 +- runescape-client/src/main/java/TilePaint.java | 35 +- runescape-client/src/main/java/Tiles.java | 52 +- runescape-client/src/main/java/Timer.java | 106 +- .../main/java/TotalQuantityComparator.java | 204 +- runescape-client/src/main/java/TriBool.java | 14 +- .../src/main/java/UnderlayDefinition.java | 46 +- .../src/main/java/UnitPriceComparator.java | 70 +- .../src/main/java/UrlRequester.java | 106 +- runescape-client/src/main/java/User.java | 6 +- .../src/main/java/UserComparator1.java | 12 +- .../src/main/java/UserComparator10.java | 28 +- .../src/main/java/UserComparator2.java | 12 +- .../src/main/java/UserComparator3.java | 10 +- .../src/main/java/UserComparator4.java | 26 +- .../src/main/java/UserComparator5.java | 24 +- .../src/main/java/UserComparator6.java | 28 +- .../src/main/java/UserComparator7.java | 86 +- .../src/main/java/UserComparator8.java | 24 +- .../src/main/java/UserComparator9.java | 23 +- runescape-client/src/main/java/UserList.java | 35 +- runescape-client/src/main/java/Username.java | 23 +- .../src/main/java/VarbitDefinition.java | 22 +- runescape-client/src/main/java/VarcInt.java | 24 +- runescape-client/src/main/java/Varcs.java | 250 +- .../src/main/java/VarpDefinition.java | 20 +- runescape-client/src/main/java/Varps.java | 33 +- .../src/main/java/VertexNormal.java | 41 +- .../src/main/java/ViewportMouse.java | 70 +- .../src/main/java/WallDecoration.java | 12 +- runescape-client/src/main/java/Widget.java | 492 +- .../src/main/java/WidgetGroupParent.java | 24 +- runescape-client/src/main/java/World.java | 24 +- .../src/main/java/WorldComparator.java | 124 +- runescape-client/src/main/java/WorldMap.java | 658 +- .../src/main/java/WorldMapArea.java | 92 +- .../src/main/java/WorldMapAreaData.java | 179 +- .../src/main/java/WorldMapCacheName.java | 71 +- .../src/main/java/WorldMapElement.java | 168 +- .../src/main/java/WorldMapEvent.java | 229 +- .../src/main/java/WorldMapIcon1.java | 105 +- .../src/main/java/WorldMapIcon2.java | 95 +- .../main/java/WorldMapIndexCacheLoader.java | 25 +- .../src/main/java/WorldMapLabel.java | 101 +- .../src/main/java/WorldMapLabelSize.java | 50 +- .../src/main/java/WorldMapManager.java | 197 +- .../src/main/java/WorldMapRegion.java | 819 +-- .../src/main/java/WorldMapSection0.java | 127 +- .../src/main/java/WorldMapSection1.java | 140 +- .../src/main/java/WorldMapSection2.java | 241 +- .../src/main/java/WorldMapSection3.java | 134 +- .../src/main/java/WorldMapSectionType.java | 53 +- runescape-client/src/main/java/class1.java | 90 +- runescape-client/src/main/java/class102.java | 194 +- runescape-client/src/main/java/class109.java | 48 +- runescape-client/src/main/java/class11.java | 153 +- runescape-client/src/main/java/class114.java | 8 +- runescape-client/src/main/java/class12.java | 57 +- runescape-client/src/main/java/class13.java | 24 +- runescape-client/src/main/java/class14.java | 16 +- runescape-client/src/main/java/class15.java | 85 +- runescape-client/src/main/java/class157.java | 7 +- runescape-client/src/main/java/class159.java | 2 +- runescape-client/src/main/java/class16.java | 534 +- runescape-client/src/main/java/class168.java | 16 +- runescape-client/src/main/java/class171.java | 632 +- runescape-client/src/main/java/class190.java | 39 +- runescape-client/src/main/java/class196.java | 14 +- runescape-client/src/main/java/class198.java | 2 +- runescape-client/src/main/java/class2.java | 42 +- runescape-client/src/main/java/class203.java | 23 +- runescape-client/src/main/java/class204.java | 79 +- runescape-client/src/main/java/class21.java | 279 +- runescape-client/src/main/java/class210.java | 154 +- runescape-client/src/main/java/class211.java | 174 +- runescape-client/src/main/java/class212.java | 21 +- runescape-client/src/main/java/class214.java | 54 +- runescape-client/src/main/java/class22.java | 23 +- runescape-client/src/main/java/class226.java | 88 +- runescape-client/src/main/java/class227.java | 614 +- runescape-client/src/main/java/class229.java | 90 +- runescape-client/src/main/java/class230.java | 121 +- runescape-client/src/main/java/class231.java | 19 +- runescape-client/src/main/java/class233.java | 16 +- runescape-client/src/main/java/class234.java | 21 +- runescape-client/src/main/java/class236.java | 118 +- runescape-client/src/main/java/class238.java | 648 +- runescape-client/src/main/java/class248.java | 209 +- runescape-client/src/main/java/class249.java | 2 +- runescape-client/src/main/java/class25.java | 22 +- runescape-client/src/main/java/class258.java | 12 +- runescape-client/src/main/java/class266.java | 8 +- runescape-client/src/main/java/class27.java | 10 +- runescape-client/src/main/java/class277.java | 61 +- runescape-client/src/main/java/class279.java | 5 +- runescape-client/src/main/java/class3.java | 222 +- runescape-client/src/main/java/class30.java | 52 +- runescape-client/src/main/java/class305.java | 9 +- runescape-client/src/main/java/class306.java | 30 +- runescape-client/src/main/java/class307.java | 94 +- runescape-client/src/main/java/class31.java | 149 +- runescape-client/src/main/java/class310.java | 8 +- runescape-client/src/main/java/class311.java | 13 +- runescape-client/src/main/java/class313.java | 2 +- runescape-client/src/main/java/class32.java | 28 +- runescape-client/src/main/java/class322.java | 10 +- runescape-client/src/main/java/class39.java | 756 ++- runescape-client/src/main/java/class4.java | 369 +- runescape-client/src/main/java/class40.java | 478 +- runescape-client/src/main/java/class48.java | 50 +- runescape-client/src/main/java/class50.java | 216 +- runescape-client/src/main/java/class54.java | 1109 ++- runescape-client/src/main/java/class60.java | 8 +- runescape-client/src/main/java/class65.java | 249 +- runescape-client/src/main/java/class68.java | 14 +- runescape-client/src/main/java/class80.java | 22 +- runescape-client/src/main/java/class83.java | 23 +- runescape-client/src/main/java/class98.java | 144 +- 294 files changed, 27369 insertions(+), 27322 deletions(-) diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index f87ef77718..87e40aa100 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -13,11 +13,7 @@ public abstract class AbstractByteArrayCopier { @ObfuscatedSignature( signature = "Lit;" ) - static IndexCache __gu_et; - - static { - directBufferUnavailable = false; - } + static IndexCache field0; @ObfuscatedName("m") @ObfuscatedSignature( @@ -43,13 +39,13 @@ public abstract class AbstractByteArrayCopier { @Export("getVarcInt") public static VarcInt getVarcInt(int var0) { VarcInt var1 = (VarcInt)VarcInt.cachedVarcInts.get((long)var0); - if(var1 != null) { + if (var1 != null) { return var1; } else { - byte[] var2 = VarcInt.__iw_m.takeRecord(19, var0); + byte[] var2 = VarcInt.field942.takeRecord(19, var0); var1 = new VarcInt(); - if(var2 != null) { - var1.__q_411(new Buffer(var2)); + if (var2 != null) { + var1.method354(new Buffer(var2)); } VarcInt.cachedVarcInts.put(var1, (long)var0); @@ -64,30 +60,29 @@ public abstract class AbstractByteArrayCopier { ) @Export("unloadWidgetGroup") public static void unloadWidgetGroup(int var0) { - if(var0 != -1) { - if(Widget.loadedWidgetGroups[var0]) { - Widget.Widget_indexCache.__h_399(var0); - if(Widget.widgets[var0] != null) { - boolean var1 = true; + if (var0 != -1 && Widget.loadedWidgetGroups[var0]) { + Widget.Widget_indexCache.method7(var0); + if (Widget.widgets[var0] != null) { + boolean var1 = true; - for(int var2 = 0; var2 < Widget.widgets[var0].length; ++var2) { - if(Widget.widgets[var0][var2] != null) { - if(Widget.widgets[var0][var2].type != 2) { - Widget.widgets[var0][var2] = null; - } else { - var1 = false; - } + for (int var2 = 0; var2 < Widget.widgets[var0].length; ++var2) { + if (Widget.widgets[var0][var2] != null) { + if (Widget.widgets[var0][var2].type != 2) { + Widget.widgets[var0][var2] = null; + } else { + var1 = false; } } - - if(var1) { - Widget.widgets[var0] = null; - } - - Widget.loadedWidgetGroups[var0] = false; } + + if (var1) { + Widget.widgets[var0] = null; + } + + Widget.loadedWidgetGroups[var0] = false; } } + } @ObfuscatedName("gb") @@ -96,10 +91,14 @@ public abstract class AbstractByteArrayCopier { garbageValue = "-1256278627" ) static void method4024() { - PacketBufferNode var0 = Interpreter.method1915(ClientPacket.__gs_aw, Client.packetWriter.isaacCipher); + PacketBufferNode var0 = Interpreter.method1915(ClientPacket.field257, Client.packetWriter.isaacCipher); var0.packetBuffer.writeByte(SpotAnimationDefinition.method4822()); var0.packetBuffer.writeShort(SoundCache.canvasWidth); var0.packetBuffer.writeShort(Huffman.canvasHeight); - Client.packetWriter.__q_167(var0); + Client.packetWriter.method241(var0); + } + + static { + directBufferUnavailable = false; } } diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index 967f2b291c..a387cfe60f 100644 --- a/runescape-client/src/main/java/AbstractFont.java +++ b/runescape-client/src/main/java/AbstractFont.java @@ -77,20 +77,6 @@ public abstract class AbstractFont extends Rasterizer2D { @Export("kerning") byte[] kerning; - static { - AbstractFont_strike = -1; - AbstractFont_underline = -1; - AbstractFont_previousShadow = -1; - AbstractFont_shadow = -1; - AbstractFont_previousColor = 0; - AbstractFont_color = 0; - AbstractFont_alpha = 256; - AbstractFont_justificationTotal = 0; - AbstractFont_justificationCurrent = 0; - AbstractFont_random = new Random(); - AbstractFont_lines = new String[100]; - } - AbstractFont(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { this.pixels = new byte[256][]; this.ascent = 0; @@ -103,12 +89,12 @@ public abstract class AbstractFont extends Rasterizer2D { int var8 = Integer.MAX_VALUE; int var9 = Integer.MIN_VALUE; - for(int var10 = 0; var10 < 256; ++var10) { - if(this.topBearings[var10] < var8 && this.heights[var10] != 0) { + for (int var10 = 0; var10 < 256; ++var10) { + if (this.topBearings[var10] < var8 && this.heights[var10] != 0) { var8 = this.topBearings[var10]; } - if(this.topBearings[var10] + this.heights[var10] > var9) { + if (this.topBearings[var10] + this.heights[var10] > var9) { var9 = this.topBearings[var10] + this.heights[var10]; } } @@ -136,8 +122,8 @@ public abstract class AbstractFont extends Rasterizer2D { void readMetrics(byte[] var1) { this.advances = new int[256]; int var2; - if(var1.length == 257) { - for(var2 = 0; var2 < this.advances.length; ++var2) { + if (var1.length == 257) { + for (var2 = 0; var2 < this.advances.length; ++var2) { this.advances[var2] = var1[var2] & 255; } @@ -145,61 +131,61 @@ public abstract class AbstractFont extends Rasterizer2D { } else { var2 = 0; - for(int var3 = 0; var3 < 256; ++var3) { + for (int var3 = 0; var3 < 256; ++var3) { this.advances[var3] = var1[var2++] & 255; } - int[] var10 = new int[256]; + int[] var12 = new int[256]; int[] var4 = new int[256]; int var5; - for(var5 = 0; var5 < 256; ++var5) { - var10[var5] = var1[var2++] & 255; + for (var5 = 0; var5 < 256; ++var5) { + var12[var5] = var1[var2++] & 255; } - for(var5 = 0; var5 < 256; ++var5) { + for (var5 = 0; var5 < 256; ++var5) { var4[var5] = var1[var2++] & 255; } - byte[][] var11 = new byte[256][]; + byte[][] var6 = new byte[256][]; - int var8; - for(int var6 = 0; var6 < 256; ++var6) { - var11[var6] = new byte[var10[var6]]; - byte var7 = 0; + int var7; + for (int var8 = 0; var8 < 256; ++var8) { + var6[var8] = new byte[var12[var8]]; + byte var9 = 0; - for(var8 = 0; var8 < var11[var6].length; ++var8) { - var7 += var1[var2++]; - var11[var6][var8] = var7; + for (var7 = 0; var7 < var6[var8].length; ++var7) { + var9 += var1[var2++]; + var6[var8][var7] = var9; } } - byte[][] var12 = new byte[256][]; + byte[][] var13 = new byte[256][]; - int var13; - for(var13 = 0; var13 < 256; ++var13) { - var12[var13] = new byte[var10[var13]]; - byte var14 = 0; + int var14; + for (var14 = 0; var14 < 256; ++var14) { + var13[var14] = new byte[var12[var14]]; + byte var10 = 0; - for(int var9 = 0; var9 < var12[var13].length; ++var9) { - var14 += var1[var2++]; - var12[var13][var9] = var14; + for (int var11 = 0; var11 < var13[var14].length; ++var11) { + var10 += var1[var2++]; + var13[var14][var11] = var10; } } this.kerning = new byte[65536]; - for(var13 = 0; var13 < 256; ++var13) { - if(var13 != 32 && var13 != 160) { - for(var8 = 0; var8 < 256; ++var8) { - if(var8 != 32 && var8 != 160) { - this.kerning[var8 + (var13 << 8)] = (byte)method5658(var11, var12, var4, this.advances, var10, var13, var8); + for (var14 = 0; var14 < 256; ++var14) { + if (var14 != 32 && var14 != 160) { + for (var7 = 0; var7 < 256; ++var7) { + if (var7 != 32 && var7 != 160) { + this.kerning[var7 + (var14 << 8)] = (byte)method5658(var6, var13, var4, this.advances, var12, var14, var7); } } } } - this.ascent = var4[32] + var10[32]; + this.ascent = var4[32] + var12[32]; } } @@ -207,7 +193,7 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("x") @Export("charWidth") int charWidth(char var1) { - if(var1 == 160) { + if (var1 == 160) { var1 = ' '; } @@ -217,32 +203,31 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("d") @Export("stringWidth") public int stringWidth(String var1) { - if(var1 == null) { + if (var1 == null) { return 0; } else { int var2 = -1; int var3 = -1; int var4 = 0; - for(int var5 = 0; var5 < var1.length(); ++var5) { + for (int var5 = 0; var5 < var1.length(); ++var5) { char var6 = var1.charAt(var5); - if(var6 == '<') { + if (var6 == '<') { var2 = var5; } else { - if(var6 == '>' && var2 != -1) { + if (var6 == '>' && var2 != -1) { String var7 = var1.substring(var2 + 1, var5); var2 = -1; - if(var7.equals("lt")) { + if (var7.equals("lt")) { var6 = '<'; } else { - if(!var7.equals("gt")) { - if(var7.startsWith("img=")) { + if (!var7.equals("gt")) { + if (var7.startsWith("img=")) { try { int var8 = MouseHandler.method1085(var7.substring(4)); var4 += AbstractFont_modIconSprites[var8].width; var3 = -1; - } catch (Exception var10) { - ; + } catch (Exception var9) { } } continue; @@ -252,13 +237,13 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if(var6 == 160) { + if (var6 == 160) { var6 = ' '; } - if(var2 == -1) { + if (var2 == -1) { var4 += this.advances[(char)(HealthBar.charToByteCp1252(var6) & 255)]; - if(this.kerning != null && var3 != -1) { + if (this.kerning != null && var3 != -1) { var4 += this.kerning[var6 + (var3 << 8)]; } @@ -274,7 +259,7 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("a") @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { - if(var1 == null) { + if (var1 == null) { return 0; } else { int var4 = 0; @@ -288,69 +273,68 @@ public abstract class AbstractFont extends Rasterizer2D { int var12 = 0; int var13 = var1.length(); - for(int var14 = 0; var14 < var13; ++var14) { + for (int var14 = 0; var14 < var13; ++var14) { char var15 = var1.charAt(var14); - if(var15 == '<') { + if (var15 == '<') { var10 = var14; } else { - if(var15 == '>' && var10 != -1) { + if (var15 == '>' && var10 != -1) { String var16 = var1.substring(var10 + 1, var14); var10 = -1; var6.append('<'); var6.append(var16); var6.append('>'); - if(var16.equals("br")) { + if (var16.equals("br")) { var3[var12] = var6.toString().substring(var5, var6.length()); ++var12; var5 = var6.length(); var4 = 0; var7 = -1; var11 = 0; - } else if(var16.equals("lt")) { + } else if (var16.equals("lt")) { var4 += this.charWidth('<'); - if(this.kerning != null && var11 != -1) { + if (this.kerning != null && var11 != -1) { var4 += this.kerning[(var11 << '\b') + 60]; } var11 = '<'; - } else if(var16.equals("gt")) { + } else if (var16.equals("gt")) { var4 += this.charWidth('>'); - if(this.kerning != null && var11 != -1) { + if (this.kerning != null && var11 != -1) { var4 += this.kerning[(var11 << '\b') + 62]; } var11 = '>'; - } else if(var16.startsWith("img=")) { + } else if (var16.startsWith("img=")) { try { int var17 = MouseHandler.method1085(var16.substring(4)); var4 += AbstractFont_modIconSprites[var17].width; var11 = 0; - } catch (Exception var20) { - ; + } catch (Exception var18) { } } var15 = 0; } - if(var10 == -1) { - if(var15 != 0) { + if (var10 == -1) { + if (var15 != 0) { var6.append(var15); var4 += this.charWidth(var15); - if(this.kerning != null && var11 != -1) { + if (this.kerning != null && var11 != -1) { var4 += this.kerning[var15 + (var11 << '\b')]; } var11 = var15; } - if(var15 == ' ') { + if (var15 == ' ') { var7 = var6.length(); var8 = var4; var9 = 1; } - if(var2 != null && var4 > var2[var12 < var2.length?var12:var2.length - 1] && var7 >= 0) { + if (var2 != null && var4 > var2[var12 < var2.length ? var12 : var2.length - 1] && var7 >= 0) { var3[var12] = var6.toString().substring(var5, var7 - var9); ++var12; var5 = var7; @@ -359,7 +343,7 @@ public abstract class AbstractFont extends Rasterizer2D { var11 = 0; } - if(var15 == '-') { + if (var15 == '-') { var7 = var6.length(); var8 = var4; var9 = 0; @@ -369,7 +353,7 @@ public abstract class AbstractFont extends Rasterizer2D { } String var19 = var6.toString(); - if(var19.length() > var5) { + if (var19.length() > var5) { var3[var12++] = var19.substring(var5, var19.length()); } @@ -383,9 +367,9 @@ public abstract class AbstractFont extends Rasterizer2D { int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); int var4 = 0; - for(int var5 = 0; var5 < var3; ++var5) { + for (int var5 = 0; var5 < var3; ++var5) { int var6 = this.stringWidth(AbstractFont_lines[var5]); - if(var6 > var4) { + if (var6 > var4) { var4 = var6; } } @@ -402,72 +386,76 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("t") @Export("draw") public void draw(String var1, int var2, int var3, int var4, int var5) { - if(var1 != null) { + if (var1 != null) { this.reset(var4, var5); this.draw0(var1, var2, var3); } + } @ObfuscatedName("y") @Export("drawAlpha") public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { - if(var1 != null) { + if (var1 != null) { this.reset(var4, var5); AbstractFont_alpha = var6; this.draw0(var1, var2, var3); } + } @ObfuscatedName("h") @Export("drawRightAligned") public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { - if(var1 != null) { + if (var1 != null) { this.reset(var4, var5); this.draw0(var1, var2 - this.stringWidth(var1), var3); } + } @ObfuscatedName("b") @Export("drawCentered") public void drawCentered(String var1, int var2, int var3, int var4, int var5) { - if(var1 != null) { + if (var1 != null) { this.reset(var4, var5); this.draw0(var1, var2 - this.stringWidth(var1) / 2, var3); } + } @ObfuscatedName("c") @Export("drawLines") public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { - if(var1 == null) { + if (var1 == null) { return 0; } else { this.reset(var6, var7); - if(var10 == 0) { + if (var10 == 0) { var10 = this.ascent; } int[] var11 = new int[]{var4}; - if(var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) { + if (var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) { var11 = null; } int var12 = this.breakLines(var1, var11, AbstractFont_lines); - if(var9 == 3 && var12 == 1) { + if (var9 == 3 && var12 == 1) { var9 = 1; } int var13; int var14; - if(var9 == 0) { + if (var9 == 0) { var13 = var3 + this.maxAscent; - } else if(var9 == 1) { + } else if (var9 == 1) { var13 = var3 + (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / 2 + this.maxAscent; - } else if(var9 == 2) { + } else if (var9 == 2) { var13 = var3 + var5 - this.maxDescent - var10 * (var12 - 1); } else { var14 = (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / (var12 + 1); - if(var14 < 0) { + if (var14 < 0) { var14 = 0; } @@ -475,14 +463,14 @@ public abstract class AbstractFont extends Rasterizer2D { var10 += var14; } - for(var14 = 0; var14 < var12; ++var14) { - if(var8 == 0) { + for (var14 = 0; var14 < var12; ++var14) { + if (var8 == 0) { this.draw0(AbstractFont_lines[var14], var2, var13); - } else if(var8 == 1) { + } else if (var8 == 1) { this.draw0(AbstractFont_lines[var14], var2 + (var4 - this.stringWidth(AbstractFont_lines[var14])) / 2, var13); - } else if(var8 == 2) { + } else if (var8 == 2) { this.draw0(AbstractFont_lines[var14], var2 + var4 - this.stringWidth(AbstractFont_lines[var14]), var13); - } else if(var14 == var12 - 1) { + } else if (var14 == var12 - 1) { this.draw0(AbstractFont_lines[var14], var2, var13); } else { this.calculateLineJustification(AbstractFont_lines[var14], var4); @@ -500,74 +488,78 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("p") @Export("drawCenteredWave") public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) { - if(var1 != null) { + if (var1 != null) { this.reset(var4, var5); int[] var7 = new int[var1.length()]; - for(int var8 = 0; var8 < var1.length(); ++var8) { + for (int var8 = 0; var8 < var1.length(); ++var8) { var7[var8] = (int)(Math.sin((double)var8 / 2.0D + (double)var6 / 5.0D) * 5.0D); } this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var7); } + } @ObfuscatedName("v") @Export("drawCenteredWave2") public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) { - if(var1 != null) { + if (var1 != null) { this.reset(var4, var5); int[] var7 = new int[var1.length()]; int[] var8 = new int[var1.length()]; - for(int var9 = 0; var9 < var1.length(); ++var9) { + for (int var9 = 0; var9 < var1.length(); ++var9) { var7[var9] = (int)(Math.sin((double)var9 / 5.0D + (double)var6 / 5.0D) * 5.0D); var8[var9] = (int)(Math.sin((double)var9 / 3.0D + (double)var6 / 5.0D) * 5.0D); } this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, var7, var8); } + } @ObfuscatedName("ag") @Export("drawCenteredShake") public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if(var1 != null) { + if (var1 != null) { this.reset(var4, var5); double var8 = 7.0D - (double)var7 / 8.0D; - if(var8 < 0.0D) { + if (var8 < 0.0D) { var8 = 0.0D; } int[] var10 = new int[var1.length()]; - for(int var11 = 0; var11 < var1.length(); ++var11) { + for (int var11 = 0; var11 < var1.length(); ++var11) { var10[var11] = (int)(Math.sin((double)var11 / 1.5D + (double)var6 / 1.0D) * var8); } this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var10); } + } @ObfuscatedName("aq") @Export("drawRandomAlphaAndSpacing") public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { - if(var1 != null) { + if (var1 != null) { this.reset(var4, var5); AbstractFont_random.setSeed((long)var6); AbstractFont_alpha = 192 + (AbstractFont_random.nextInt() & 31); int[] var7 = new int[var1.length()]; int var8 = 0; - for(int var9 = 0; var9 < var1.length(); ++var9) { + for (int var9 = 0; var9 < var1.length(); ++var9) { var7[var9] = var8; - if((AbstractFont_random.nextInt() & 3) == 0) { + if ((AbstractFont_random.nextInt() & 3) == 0) { ++var8; } } this.drawWithOffsets0(var1, var2, var3, var7, (int[])null); } + } @ObfuscatedName("aj") @@ -588,33 +580,32 @@ public abstract class AbstractFont extends Rasterizer2D { @Export("decodeTag") void decodeTag(String var1) { try { - if(var1.startsWith("col=")) { + if (var1.startsWith("col=")) { AbstractFont_color = class214.method4157(var1.substring(4), 16); - } else if(var1.equals("/col")) { + } else if (var1.equals("/col")) { AbstractFont_color = AbstractFont_previousColor; - } else if(var1.startsWith("str=")) { + } else if (var1.startsWith("str=")) { AbstractFont_strike = class214.method4157(var1.substring(4), 16); - } else if(var1.equals("str")) { + } else if (var1.equals("str")) { AbstractFont_strike = 8388608; - } else if(var1.equals("/str")) { + } else if (var1.equals("/str")) { AbstractFont_strike = -1; - } else if(var1.startsWith("u=")) { + } else if (var1.startsWith("u=")) { AbstractFont_underline = class214.method4157(var1.substring(2), 16); - } else if(var1.equals("u")) { + } else if (var1.equals("u")) { AbstractFont_underline = 0; - } else if(var1.equals("/u")) { + } else if (var1.equals("/u")) { AbstractFont_underline = -1; - } else if(var1.startsWith("shad=")) { + } else if (var1.startsWith("shad=")) { AbstractFont_shadow = class214.method4157(var1.substring(5), 16); - } else if(var1.equals("shad")) { + } else if (var1.equals("shad")) { AbstractFont_shadow = 0; - } else if(var1.equals("/shad")) { + } else if (var1.equals("/shad")) { AbstractFont_shadow = AbstractFont_previousShadow; - } else if(var1.equals("br")) { + } else if (var1.equals("br")) { this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); } } catch (Exception var3) { - ; } } @@ -625,18 +616,18 @@ public abstract class AbstractFont extends Rasterizer2D { int var3 = 0; boolean var4 = false; - for(int var5 = 0; var5 < var1.length(); ++var5) { + for (int var5 = 0; var5 < var1.length(); ++var5) { char var6 = var1.charAt(var5); - if(var6 == '<') { + if (var6 == '<') { var4 = true; - } else if(var6 == '>') { + } else if (var6 == '>') { var4 = false; - } else if(!var4 && var6 == ' ') { + } else if (!var4 && var6 == ' ') { ++var3; } } - if(var3 > 0) { + if (var3 > 0) { AbstractFont_justificationTotal = (var2 - this.stringWidth(var1) << 8) / var3; } @@ -649,32 +640,31 @@ public abstract class AbstractFont extends Rasterizer2D { int var4 = -1; int var5 = -1; - for(int var6 = 0; var6 < var1.length(); ++var6) { - if(var1.charAt(var6) != 0) { + for (int var6 = 0; var6 < var1.length(); ++var6) { + if (var1.charAt(var6) != 0) { char var7 = (char)(HealthBar.charToByteCp1252(var1.charAt(var6)) & 255); - if(var7 == '<') { + if (var7 == '<') { var4 = var6; } else { - int var9; - if(var7 == '>' && var4 != -1) { - String var8 = var1.substring(var4 + 1, var6); + int var8; + if (var7 == '>' && var4 != -1) { + String var9 = var1.substring(var4 + 1, var6); var4 = -1; - if(var8.equals("lt")) { + if (var9.equals("lt")) { var7 = '<'; } else { - if(!var8.equals("gt")) { - if(var8.startsWith("img=")) { + if (!var9.equals("gt")) { + if (var9.startsWith("img=")) { try { - var9 = MouseHandler.method1085(var8.substring(4)); - IndexedSprite var10 = AbstractFont_modIconSprites[var9]; - var10.drawAt(var2, var3 + this.ascent - var10.height); - var2 += var10.width; + var8 = MouseHandler.method1085(var9.substring(4)); + IndexedSprite var13 = AbstractFont_modIconSprites[var8]; + var13.drawAt(var2, var3 + this.ascent - var13.height); + var2 += var13.width; var5 = -1; - } catch (Exception var14) { - ; + } catch (Exception var11) { } } else { - this.decodeTag(var8); + this.decodeTag(var9); } continue; } @@ -683,47 +673,47 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if(var7 == 160) { + if (var7 == 160) { var7 = ' '; } - if(var4 == -1) { - if(this.kerning != null && var5 != -1) { + if (var4 == -1) { + if (this.kerning != null && var5 != -1) { var2 += this.kerning[var7 + (var5 << 8)]; } int var12 = this.widths[var7]; - var9 = this.heights[var7]; - if(var7 != ' ') { - if(AbstractFont_alpha == 256) { - if(AbstractFont_shadow != -1) { - AbstractFont_drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow); + var8 = this.heights[var7]; + if (var7 != ' ') { + if (AbstractFont_alpha == 256) { + if (AbstractFont_shadow != -1) { + AbstractFont_drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var8, AbstractFont_shadow); } - this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color); + this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var8, AbstractFont_color); } else { - if(AbstractFont_shadow != -1) { - AbstractFont_drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow, AbstractFont_alpha); + if (AbstractFont_shadow != -1) { + AbstractFont_drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var8, AbstractFont_shadow, AbstractFont_alpha); } - this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha); + this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var8, AbstractFont_color, AbstractFont_alpha); } - } else if(AbstractFont_justificationTotal > 0) { + } else if (AbstractFont_justificationTotal > 0) { AbstractFont_justificationCurrent += AbstractFont_justificationTotal; var2 += AbstractFont_justificationCurrent >> 8; AbstractFont_justificationCurrent &= 255; } - int var13 = this.advances[var7]; - if(AbstractFont_strike != -1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike); + int var10 = this.advances[var7]; + if (AbstractFont_strike != -1) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var10, AbstractFont_strike); } - if(AbstractFont_underline != -1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline); + if (AbstractFont_underline != -1) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var10, AbstractFont_underline); } - var2 += var13; + var2 += var10; var5 = var7; } } @@ -740,47 +730,46 @@ public abstract class AbstractFont extends Rasterizer2D { int var7 = -1; int var8 = 0; - for(int var9 = 0; var9 < var1.length(); ++var9) { - if(var1.charAt(var9) != 0) { + for (int var9 = 0; var9 < var1.length(); ++var9) { + if (var1.charAt(var9) != 0) { char var10 = (char)(HealthBar.charToByteCp1252(var1.charAt(var9)) & 255); - if(var10 == '<') { + if (var10 == '<') { var6 = var9; } else { + int var11; int var12; int var13; - int var14; - if(var10 == '>' && var6 != -1) { - String var11 = var1.substring(var6 + 1, var9); + if (var10 == '>' && var6 != -1) { + String var14 = var1.substring(var6 + 1, var9); var6 = -1; - if(var11.equals("lt")) { + if (var14.equals("lt")) { var10 = '<'; } else { - if(!var11.equals("gt")) { - if(var11.startsWith("img=")) { + if (!var14.equals("gt")) { + if (var14.startsWith("img=")) { try { - if(var4 != null) { - var12 = var4[var8]; + if (var4 != null) { + var11 = var4[var8]; + } else { + var11 = 0; + } + + if (var5 != null) { + var12 = var5[var8]; } else { var12 = 0; } - if(var5 != null) { - var13 = var5[var8]; - } else { - var13 = 0; - } - ++var8; - var14 = MouseHandler.method1085(var11.substring(4)); - IndexedSprite var15 = AbstractFont_modIconSprites[var14]; - var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); - var2 += var15.width; + var13 = MouseHandler.method1085(var14.substring(4)); + IndexedSprite var18 = AbstractFont_modIconSprites[var13]; + var18.drawAt(var11 + var2, var12 + (var3 + this.ascent - var18.height)); + var2 += var18.width; var7 = -1; - } catch (Exception var19) { - ; + } catch (Exception var16) { } } else { - this.decodeTag(var11); + this.decodeTag(var14); } continue; } @@ -789,60 +778,60 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if(var10 == 160) { + if (var10 == 160) { var10 = ' '; } - if(var6 == -1) { - if(this.kerning != null && var7 != -1) { + if (var6 == -1) { + if (this.kerning != null && var7 != -1) { var2 += this.kerning[var10 + (var7 << 8)]; } int var17 = this.widths[var10]; - var12 = this.heights[var10]; - if(var4 != null) { - var13 = var4[var8]; + var11 = this.heights[var10]; + if (var4 != null) { + var12 = var4[var8]; + } else { + var12 = 0; + } + + if (var5 != null) { + var13 = var5[var8]; } else { var13 = 0; } - if(var5 != null) { - var14 = var5[var8]; - } else { - var14 = 0; - } - ++var8; - if(var10 != ' ') { - if(AbstractFont_alpha == 256) { - if(AbstractFont_shadow != -1) { - AbstractFont_drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow); + if (var10 != ' ') { + if (AbstractFont_alpha == 256) { + if (AbstractFont_shadow != -1) { + AbstractFont_drawGlyph(this.pixels[var10], var12 + var2 + this.leftBearings[var10] + 1, var3 + var13 + this.topBearings[var10] + 1, var17, var11, AbstractFont_shadow); } - this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color); + this.drawGlyph(this.pixels[var10], var12 + var2 + this.leftBearings[var10], var3 + var13 + this.topBearings[var10], var17, var11, AbstractFont_color); } else { - if(AbstractFont_shadow != -1) { - AbstractFont_drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow, AbstractFont_alpha); + if (AbstractFont_shadow != -1) { + AbstractFont_drawGlyphAlpha(this.pixels[var10], var12 + var2 + this.leftBearings[var10] + 1, var3 + var13 + this.topBearings[var10] + 1, var17, var11, AbstractFont_shadow, AbstractFont_alpha); } - this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha); + this.drawGlyphAlpha(this.pixels[var10], var12 + var2 + this.leftBearings[var10], var3 + var13 + this.topBearings[var10], var17, var11, AbstractFont_color, AbstractFont_alpha); } - } else if(AbstractFont_justificationTotal > 0) { + } else if (AbstractFont_justificationTotal > 0) { AbstractFont_justificationCurrent += AbstractFont_justificationTotal; var2 += AbstractFont_justificationCurrent >> 8; AbstractFont_justificationCurrent &= 255; } - int var18 = this.advances[var10]; - if(AbstractFont_strike != -1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike); + int var15 = this.advances[var10]; + if (AbstractFont_strike != -1) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var15, AbstractFont_strike); } - if(AbstractFont_underline != -1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var18, AbstractFont_underline); + if (AbstractFont_underline != -1) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var15, AbstractFont_underline); } - var2 += var18; + var2 += var15; var7 = var10; } } @@ -858,17 +847,17 @@ public abstract class AbstractFont extends Rasterizer2D { int var9 = var2[var6]; int var10 = var9 + var4[var6]; int var11 = var7; - if(var9 > var7) { + if (var9 > var7) { var11 = var9; } int var12 = var8; - if(var10 < var8) { + if (var10 < var8) { var12 = var10; } int var13 = var3[var5]; - if(var3[var6] < var13) { + if (var3[var6] < var13) { var13 = var3[var6]; } @@ -877,9 +866,9 @@ public abstract class AbstractFont extends Rasterizer2D { int var16 = var11 - var7; int var17 = var11 - var9; - for(int var18 = var11; var18 < var12; ++var18) { + for (int var18 = var11; var18 < var12; ++var18) { int var19 = var14[var16++] + var15[var17++]; - if(var19 < var13) { + if (var19 < var13) { var13 = var19; } } @@ -893,20 +882,20 @@ public abstract class AbstractFont extends Rasterizer2D { int var1 = var0.length(); int var2 = 0; - for(int var3 = 0; var3 < var1; ++var3) { + for (int var3 = 0; var3 < var1; ++var3) { char var4 = var0.charAt(var3); - if(var4 == '<' || var4 == '>') { + if (var4 == '<' || var4 == '>') { var2 += 3; } } StringBuilder var6 = new StringBuilder(var1 + var2); - for(int var7 = 0; var7 < var1; ++var7) { + for (int var7 = 0; var7 < var1; ++var7) { char var5 = var0.charAt(var7); - if(var5 == '<') { + if (var5 == '<') { var6.append(""); - } else if(var5 == '>') { + } else if (var5 == '>') { var6.append(""); } else { var6.append(var5); @@ -924,7 +913,7 @@ public abstract class AbstractFont extends Rasterizer2D { int var8 = 0; int var9 = 0; int var10; - if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; var4 -= var10; var2 = Rasterizer2D.Rasterizer2D_yClipStart; @@ -932,11 +921,11 @@ public abstract class AbstractFont extends Rasterizer2D { var6 += var10 * Rasterizer2D.Rasterizer2D_width; } - if(var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; var3 -= var10; var1 = Rasterizer2D.Rasterizer2D_xClipStart; @@ -946,16 +935,17 @@ public abstract class AbstractFont extends Rasterizer2D { var7 += var10; } - if(var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; var3 -= var10; var8 += var10; var7 += var10; } - if(var3 > 0 && var4 > 0) { + if (var3 > 0 && var4 > 0) { AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); } + } @ObfuscatedName("ak") @@ -964,36 +954,36 @@ public abstract class AbstractFont extends Rasterizer2D { int var9 = -(var5 >> 2); var5 = -(var5 & 3); - for(int var10 = -var6; var10 < 0; ++var10) { + for (int var10 = -var6; var10 < 0; ++var10) { int var11; - for(var11 = var9; var11 < 0; ++var11) { - if(var1[var3++] != 0) { + for (var11 = var9; var11 < 0; ++var11) { + if (var1[var3++] != 0) { var0[var4++] = var2; } else { ++var4; } - if(var1[var3++] != 0) { + if (var1[var3++] != 0) { var0[var4++] = var2; } else { ++var4; } - if(var1[var3++] != 0) { + if (var1[var3++] != 0) { var0[var4++] = var2; } else { ++var4; } - if(var1[var3++] != 0) { + if (var1[var3++] != 0) { var0[var4++] = var2; } else { ++var4; } } - for(var11 = var5; var11 < 0; ++var11) { - if(var1[var3++] != 0) { + for (var11 = var5; var11 < 0; ++var11) { + if (var1[var3++] != 0) { var0[var4++] = var2; } else { ++var4; @@ -1014,7 +1004,7 @@ public abstract class AbstractFont extends Rasterizer2D { int var9 = 0; int var10 = 0; int var11; - if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; var4 -= var11; var2 = Rasterizer2D.Rasterizer2D_yClipStart; @@ -1022,11 +1012,11 @@ public abstract class AbstractFont extends Rasterizer2D { var7 += var11 * Rasterizer2D.Rasterizer2D_width; } - if(var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; var3 -= var11; var1 = Rasterizer2D.Rasterizer2D_xClipStart; @@ -1036,16 +1026,17 @@ public abstract class AbstractFont extends Rasterizer2D { var8 += var11; } - if(var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; var3 -= var11; var9 += var11; var8 += var11; } - if(var3 > 0 && var4 > 0) { + if (var3 > 0 && var4 > 0) { AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); } + } @ObfuscatedName("al") @@ -1054,9 +1045,9 @@ public abstract class AbstractFont extends Rasterizer2D { var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; var9 = 256 - var9; - for(int var10 = -var6; var10 < 0; ++var10) { - for(int var11 = -var5; var11 < 0; ++var11) { - if(var1[var3++] != 0) { + for (int var10 = -var6; var10 < 0; ++var10) { + for (int var11 = -var5; var11 < 0; ++var11) { + if (var1[var3++] != 0) { int var12 = var0[var4]; var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2; } else { @@ -1069,4 +1060,18 @@ public abstract class AbstractFont extends Rasterizer2D { } } + + static { + AbstractFont_strike = -1; + AbstractFont_underline = -1; + AbstractFont_previousShadow = -1; + AbstractFont_shadow = -1; + AbstractFont_previousColor = 0; + AbstractFont_color = 0; + AbstractFont_alpha = 256; + AbstractFont_justificationTotal = 0; + AbstractFont_justificationCurrent = 0; + AbstractFont_random = new Random(); + AbstractFont_lines = new String[100]; + } } diff --git a/runescape-client/src/main/java/AbstractIndexCache.java b/runescape-client/src/main/java/AbstractIndexCache.java index 22249e8e50..c6c7ff1a91 100644 --- a/runescape-client/src/main/java/AbstractIndexCache.java +++ b/runescape-client/src/main/java/AbstractIndexCache.java @@ -24,7 +24,7 @@ public abstract class AbstractIndexCache { @ObfuscatedGetter( intValue = -244224193 ) - static int __ir_s; + static int field1; @ObfuscatedName("au") @Export("garbageCollector") static GarbageCollectorMXBean garbageCollector; @@ -32,7 +32,7 @@ public abstract class AbstractIndexCache { @ObfuscatedGetter( intValue = 334735939 ) - static int __ir_bu; + static int field2; @ObfuscatedName("di") @ObfuscatedSignature( signature = "Lit;" @@ -97,11 +97,6 @@ public abstract class AbstractIndexCache { @Export("shallowRecords") boolean shallowRecords; - static { - gzipDecompressor = new GzipDecompressor(); - __ir_s = 0; - } - AbstractIndexCache(boolean var1, boolean var2) { this.releaseArchives = var1; this.shallowRecords = var2; @@ -117,33 +112,33 @@ public abstract class AbstractIndexCache { this.hash = WallDecoration.method3257(var1, var1.length); Buffer var2 = new Buffer(Strings.decompressBytes(var1)); int var3 = var2.readUnsignedByte(); - if(var3 >= 5 && var3 <= 7) { - if(var3 >= 6) { + if (var3 >= 5 && var3 <= 7) { + if (var3 >= 6) { var2.readInt(); } int var4 = var2.readUnsignedByte(); - if(var3 >= 7) { - this.archiveCount = var2.__ad_309(); + if (var3 >= 7) { + this.archiveCount = var2.method50(); } else { - this.archiveCount = var2.__ag_302(); + this.archiveCount = var2.method43(); } int var5 = 0; int var6 = -1; this.archiveIds = new int[this.archiveCount]; int var7; - if(var3 >= 7) { - for(var7 = 0; var7 < this.archiveCount; ++var7) { - this.archiveIds[var7] = var5 += var2.__ad_309(); - if(this.archiveIds[var7] > var6) { + if (var3 >= 7) { + for (var7 = 0; var7 < this.archiveCount; ++var7) { + this.archiveIds[var7] = var5 += var2.method50(); + if (this.archiveIds[var7] > var6) { var6 = this.archiveIds[var7]; } } } else { - for(var7 = 0; var7 < this.archiveCount; ++var7) { - this.archiveIds[var7] = var5 += var2.__ag_302(); - if(this.archiveIds[var7] > var6) { + for (var7 = 0; var7 < this.archiveCount; ++var7) { + this.archiveIds[var7] = var5 += var2.method43(); + if (this.archiveIds[var7] > var6) { var6 = this.archiveIds[var7]; } } @@ -155,26 +150,26 @@ public abstract class AbstractIndexCache { this.recordIds = new int[var6 + 1][]; this.archives = new Object[var6 + 1]; this.records = new Object[var6 + 1][]; - if(var4 != 0) { + if (var4 != 0) { this.archiveNameHashes = new int[var6 + 1]; - for(var7 = 0; var7 < this.archiveCount; ++var7) { + for (var7 = 0; var7 < this.archiveCount; ++var7) { this.archiveNameHashes[this.archiveIds[var7]] = var2.readInt(); } this.archiveNameHashTable = new IntHashTable(this.archiveNameHashes); } - for(var7 = 0; var7 < this.archiveCount; ++var7) { + for (var7 = 0; var7 < this.archiveCount; ++var7) { this.archiveCrcs[this.archiveIds[var7]] = var2.readInt(); } - for(var7 = 0; var7 < this.archiveCount; ++var7) { + for (var7 = 0; var7 < this.archiveCount; ++var7) { this.archiveVersions[this.archiveIds[var7]] = var2.readInt(); } - for(var7 = 0; var7 < this.archiveCount; ++var7) { - this.recordCounts[this.archiveIds[var7]] = var2.__ag_302(); + for (var7 = 0; var7 < this.archiveCount; ++var7) { + this.recordCounts[this.archiveIds[var7]] = var2.method43(); } int var8; @@ -182,17 +177,17 @@ public abstract class AbstractIndexCache { int var10; int var11; int var12; - if(var3 >= 7) { - for(var7 = 0; var7 < this.archiveCount; ++var7) { + if (var3 >= 7) { + for (var7 = 0; var7 < this.archiveCount; ++var7) { var8 = this.archiveIds[var7]; var9 = this.recordCounts[var8]; var5 = 0; var10 = -1; this.recordIds[var8] = new int[var9]; - for(var11 = 0; var11 < var9; ++var11) { - var12 = this.recordIds[var8][var11] = var5 += var2.__ad_309(); - if(var12 > var10) { + for (var11 = 0; var11 < var9; ++var11) { + var12 = this.recordIds[var8][var11] = var5 += var2.method50(); + if (var12 > var10) { var10 = var12; } } @@ -200,16 +195,16 @@ public abstract class AbstractIndexCache { this.records[var8] = new Object[var10 + 1]; } } else { - for(var7 = 0; var7 < this.archiveCount; ++var7) { + for (var7 = 0; var7 < this.archiveCount; ++var7) { var8 = this.archiveIds[var7]; var9 = this.recordCounts[var8]; var5 = 0; var10 = -1; this.recordIds[var8] = new int[var9]; - for(var11 = 0; var11 < var9; ++var11) { - var12 = this.recordIds[var8][var11] = var5 += var2.__ag_302(); - if(var12 > var10) { + for (var11 = 0; var11 < var9; ++var11) { + var12 = this.recordIds[var8][var11] = var5 += var2.method43(); + if (var12 > var10) { var10 = var12; } } @@ -218,16 +213,16 @@ public abstract class AbstractIndexCache { } } - if(var4 != 0) { + if (var4 != 0) { this.recordNameHashes = new int[var6 + 1][]; this.recordNameHashTables = new IntHashTable[var6 + 1]; - for(var7 = 0; var7 < this.archiveCount; ++var7) { + for (var7 = 0; var7 < this.archiveCount; ++var7) { var8 = this.archiveIds[var7]; var9 = this.recordCounts[var8]; this.recordNameHashes[var8] = new int[this.records[var8].length]; - for(var10 = 0; var10 < var9; ++var10) { + for (var10 = 0; var10 < var9; ++var10) { this.recordNameHashes[var8][this.recordIds[var8][var10]] = var2.readInt(); } @@ -245,7 +240,7 @@ public abstract class AbstractIndexCache { signature = "(II)V", garbageValue = "2102142648" ) - void __f_392(int var1) { + void vmethod129(int var1) { } @ObfuscatedName("q") @@ -265,20 +260,20 @@ public abstract class AbstractIndexCache { ) @Export("takeRecordEncrypted") public byte[] takeRecordEncrypted(int var1, int var2, int[] var3) { - if(var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) { - if(this.records[var1][var2] == null) { + if (var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) { + if (this.records[var1][var2] == null) { boolean var4 = this.buildRecords(var1, var3); - if(!var4) { + if (!var4) { this.loadArchive(var1); var4 = this.buildRecords(var1, var3); - if(!var4) { + if (!var4) { return null; } } } byte[] var5 = TextureProvider.byteArrayFromObject(this.records[var1][var2], false); - if(this.shallowRecords) { + if (this.shallowRecords) { this.records[var1][var2] = null; } @@ -295,10 +290,10 @@ public abstract class AbstractIndexCache { ) @Export("tryLoadRecord") public boolean tryLoadRecord(int var1, int var2) { - if(var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) { - if(this.records[var1][var2] != null) { + if (var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) { + if (this.records[var1][var2] != null) { return true; - } else if(this.archives[var1] != null) { + } else if (this.archives[var1] != null) { return true; } else { this.loadArchive(var1); @@ -314,10 +309,10 @@ public abstract class AbstractIndexCache { signature = "(II)Z", garbageValue = "-1923759754" ) - public boolean __u_393(int var1) { - if(this.records.length == 1) { + public boolean method1(int var1) { + if (this.records.length == 1) { return this.tryLoadRecord(0, var1); - } else if(this.records[var1].length == 1) { + } else if (this.records[var1].length == 1) { return this.tryLoadRecord(var1, 0); } else { throw new RuntimeException(); @@ -331,7 +326,7 @@ public abstract class AbstractIndexCache { ) @Export("tryLoadArchive") public boolean tryLoadArchive(int var1) { - if(this.archives[var1] != null) { + if (this.archives[var1] != null) { return true; } else { this.loadArchive(var1); @@ -344,14 +339,14 @@ public abstract class AbstractIndexCache { signature = "(I)Z", garbageValue = "1694975256" ) - public boolean __l_394() { + public boolean method2() { boolean var1 = true; - for(int var2 = 0; var2 < this.archiveIds.length; ++var2) { + for (int var2 = 0; var2 < this.archiveIds.length; ++var2) { int var3 = this.archiveIds[var2]; - if(this.archives[var3] == null) { + if (this.archives[var3] == null) { this.loadArchive(var3); - if(this.archives[var3] == null) { + if (this.archives[var3] == null) { var1 = false; } } @@ -367,7 +362,7 @@ public abstract class AbstractIndexCache { ) @Export("archiveLoadPercent") int archiveLoadPercent(int var1) { - return this.archives[var1] != null?100:0; + return this.archives[var1] != null ? 100 : 0; } @ObfuscatedName("x") @@ -377,9 +372,9 @@ public abstract class AbstractIndexCache { ) @Export("takeRecordFlat") public byte[] takeRecordFlat(int var1) { - if(this.records.length == 1) { + if (this.records.length == 1) { return this.takeRecord(0, var1); - } else if(this.records[var1].length == 1) { + } else if (this.records[var1].length == 1) { return this.takeRecord(var1, 0); } else { throw new RuntimeException(); @@ -393,13 +388,13 @@ public abstract class AbstractIndexCache { ) @Export("getRecord") public byte[] getRecord(int var1, int var2) { - if(var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) { - if(this.records[var1][var2] == null) { + if (var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) { + if (this.records[var1][var2] == null) { boolean var3 = this.buildRecords(var1, (int[])null); - if(!var3) { + if (!var3) { this.loadArchive(var1); var3 = this.buildRecords(var1, (int[])null); - if(!var3) { + if (!var3) { return null; } } @@ -419,9 +414,9 @@ public abstract class AbstractIndexCache { ) @Export("getRecordFlat") public byte[] getRecordFlat(int var1) { - if(this.records.length == 1) { + if (this.records.length == 1) { return this.getRecord(0, var1); - } else if(this.records[var1].length == 1) { + } else if (this.records[var1].length == 1) { return this.getRecord(var1, 0); } else { throw new RuntimeException(); @@ -442,8 +437,8 @@ public abstract class AbstractIndexCache { signature = "(IB)[I", garbageValue = "28" ) - public int[] __j_395(int var1) { - return var1 >= 0 && var1 < this.recordIds.length?this.recordIds[var1]:null; + public int[] method3(int var1) { + return var1 >= 0 && var1 < this.recordIds.length ? this.recordIds[var1] : null; } @ObfuscatedName("s") @@ -451,7 +446,7 @@ public abstract class AbstractIndexCache { signature = "(II)I", garbageValue = "1178362496" ) - public int __s_396(int var1) { + public int method4(int var1) { return this.records[var1].length; } @@ -460,7 +455,7 @@ public abstract class AbstractIndexCache { signature = "(I)I", garbageValue = "1702434573" ) - public int __t_397() { + public int method5() { return this.records.length; } @@ -469,8 +464,8 @@ public abstract class AbstractIndexCache { signature = "(B)V", garbageValue = "38" ) - public void __y_398() { - for(int var1 = 0; var1 < this.archives.length; ++var1) { + public void method6() { + for (int var1 = 0; var1 < this.archives.length; ++var1) { this.archives[var1] = null; } @@ -481,8 +476,8 @@ public abstract class AbstractIndexCache { signature = "(II)V", garbageValue = "330258899" ) - public void __h_399(int var1) { - for(int var2 = 0; var2 < this.records[var1].length; ++var2) { + public void method7(int var1) { + for (int var2 = 0; var2 < this.records[var1].length; ++var2) { this.records[var1][var2] = null; } @@ -493,10 +488,10 @@ public abstract class AbstractIndexCache { signature = "(I)V", garbageValue = "-709581639" ) - public void __b_400() { - for(int var1 = 0; var1 < this.records.length; ++var1) { - if(this.records[var1] != null) { - for(int var2 = 0; var2 < this.records[var1].length; ++var2) { + public void method8() { + for (int var1 = 0; var1 < this.records.length; ++var1) { + if (this.records[var1] != null) { + for (int var2 = 0; var2 < this.records[var1].length; ++var2) { this.records[var1][var2] = null; } } @@ -511,7 +506,7 @@ public abstract class AbstractIndexCache { ) @Export("buildRecords") boolean buildRecords(int var1, int[] var2) { - if(this.archives[var1] == null) { + if (this.archives[var1] == null) { return false; } else { int var3 = this.recordCounts[var1]; @@ -519,18 +514,18 @@ public abstract class AbstractIndexCache { Object[] var5 = this.records[var1]; boolean var6 = true; - for(int var7 = 0; var7 < var3; ++var7) { - if(var5[var4[var7]] == null) { + for (int var7 = 0; var7 < var3; ++var7) { + if (var5[var4[var7]] == null) { var6 = false; break; } } - if(var6) { + if (var6) { return true; } else { byte[] var18; - if(var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { + if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { var18 = TextureProvider.byteArrayFromObject(this.archives[var1], false); } else { var18 = TextureProvider.byteArrayFromObject(this.archives[var1], true); @@ -538,63 +533,63 @@ public abstract class AbstractIndexCache { var8.xteaDecrypt(var2, 5, var8.array.length); } - byte[] var20 = Strings.decompressBytes(var18); - if(this.releaseArchives) { + byte[] var19 = Strings.decompressBytes(var18); + if (this.releaseArchives) { this.archives[var1] = null; } - if(var3 > 1) { - int var9 = var20.length; + if (var3 > 1) { + int var9 = var19.length; --var9; - int var10 = var20[var9] & 255; + int var10 = var19[var9] & 255; var9 -= var10 * var3 * 4; - Buffer var11 = new Buffer(var20); + Buffer var11 = new Buffer(var19); int[] var12 = new int[var3]; var11.index = var9; + int var13; int var14; - int var15; - for(int var13 = 0; var13 < var10; ++var13) { - var14 = 0; + for (int var15 = 0; var15 < var10; ++var15) { + var13 = 0; - for(var15 = 0; var15 < var3; ++var15) { - var14 += var11.readInt(); - var12[var15] += var14; + for (var14 = 0; var14 < var3; ++var14) { + var13 += var11.readInt(); + var12[var14] += var13; } } - byte[][] var19 = new byte[var3][]; + byte[][] var20 = new byte[var3][]; - for(var14 = 0; var14 < var3; ++var14) { - var19[var14] = new byte[var12[var14]]; - var12[var14] = 0; + for (var13 = 0; var13 < var3; ++var13) { + var20[var13] = new byte[var12[var13]]; + var12[var13] = 0; } var11.index = var9; - var14 = 0; + var13 = 0; - for(var15 = 0; var15 < var10; ++var15) { + for (var14 = 0; var14 < var10; ++var14) { int var16 = 0; - for(int var17 = 0; var17 < var3; ++var17) { + for (int var17 = 0; var17 < var3; ++var17) { var16 += var11.readInt(); - System.arraycopy(var20, var14, var19[var17], var12[var17], var16); + System.arraycopy(var19, var13, var20[var17], var12[var17], var16); var12[var17] += var16; - var14 += var16; + var13 += var16; } } - for(var15 = 0; var15 < var3; ++var15) { - if(!this.shallowRecords) { - var5[var4[var15]] = Projectile.byteArrayToObject(var19[var15], false); + for (var14 = 0; var14 < var3; ++var14) { + if (!this.shallowRecords) { + var5[var4[var14]] = Projectile.byteArrayToObject(var20[var14], false); } else { - var5[var4[var15]] = var19[var15]; + var5[var4[var14]] = var20[var14]; } } - } else if(!this.shallowRecords) { - var5[var4[0]] = Projectile.byteArrayToObject(var20, false); + } else if (!this.shallowRecords) { + var5[var4[0]] = Projectile.byteArrayToObject(var19, false); } else { - var5[var4[0]] = var20; + var5[var4[0]] = var19; } return true; @@ -629,11 +624,11 @@ public abstract class AbstractIndexCache { signature = "(Ljava/lang/String;Ljava/lang/String;B)Z", garbageValue = "68" ) - public boolean __ag_401(String var1, String var2) { + public boolean method9(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); int var3 = this.archiveNameHashTable.get(Client.hashString(var1)); - if(var3 < 0) { + if (var3 < 0) { return false; } else { int var4 = this.recordNameHashTables[var3].get(Client.hashString(var2)); @@ -686,12 +681,13 @@ public abstract class AbstractIndexCache { signature = "(Ljava/lang/String;B)V", garbageValue = "40" ) - public void __ar_402(String var1) { + public void method10(String var1) { var1 = var1.toLowerCase(); int var2 = this.archiveNameHashTable.get(Client.hashString(var1)); - if(var2 >= 0) { - this.__f_392(var2); + if (var2 >= 0) { + this.vmethod129(var2); } + } @ObfuscatedName("ac") @@ -715,16 +711,16 @@ public abstract class AbstractIndexCache { static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { int var2 = var0.readUnsignedByte(); int var3; - if(var1 == null) { + if (var1 == null) { var3 = World.method1759(var2); var1 = new IterableNodeHashTable(var3); } - for(var3 = 0; var3 < var2; ++var3) { + for (var3 = 0; var3 < var2; ++var3) { boolean var4 = var0.readUnsignedByte() == 1; int var5 = var0.readMedium(); Object var6; - if(var4) { + if (var4) { var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); } else { var6 = new IntegerNode(var0.readInt()); @@ -752,10 +748,10 @@ public abstract class AbstractIndexCache { garbageValue = "308670894" ) static boolean method4585() { - if(Client.indexCacheLoaders != null && Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) { - while(Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) { + if (Client.indexCacheLoaders != null && Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) { + while (Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) { IndexCacheLoader var0 = (IndexCacheLoader)Client.indexCacheLoaders.get(Client.indexCacheLoaderIndex); - if(!var0.__m_122()) { + if (!var0.method134()) { return false; } @@ -767,4 +763,9 @@ public abstract class AbstractIndexCache { return true; } } + + static { + gzipDecompressor = new GzipDecompressor(); + field1 = 0; + } } diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java index 9748d7bcfc..0c7a6326c8 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -61,12 +61,12 @@ public abstract class AbstractSocket { garbageValue = "-15" ) public static void method3488(int var0) { - class214.__hf_o = 1; - class214.__hf_u = null; + class214.field1129 = 1; + class214.field1130 = null; class30.musicTrackArchiveId = -1; GrandExchangeOffer.musicTrackFileId = -1; - WorldMapLabel.__aj_e = 0; + WorldMapLabel.field1039 = 0; RectangleMode.musicTrackBoolean = false; - FaceNormal.__el_x = var0; + FaceNormal.field344 = var0; } } diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 2ce70ecb9b..0d2b77c0d2 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -1,5 +1,4 @@ import java.util.Comparator; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,18 +7,18 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { @ObfuscatedName("f") - Comparator __f; + Comparator field3; @ObfuscatedName("e") @ObfuscatedSignature( signature = "(Ljava/util/Comparator;B)V", garbageValue = "-2" ) - final void __e_460(Comparator var1) { - if(this.__f == null) { - this.__f = var1; - } else if(this.__f instanceof AbstractUserComparator) { - ((AbstractUserComparator)this.__f).__e_460(var1); + final void method11(Comparator var1) { + if (this.field3 == null) { + this.field3 = var1; + } else if (this.field3 instanceof AbstractUserComparator) { + ((AbstractUserComparator)this.field3).method11(var1); } } @@ -29,12 +28,12 @@ public abstract class AbstractUserComparator implements Comparator { signature = "(Ljs;Ljs;I)I", garbageValue = "-962181316" ) - protected final int __x_461(User var1, User var2) { - return this.__f == null?0:this.__f.compare(var1, var2); + protected final int method12(User var1, User var2) { + return this.field3 == null ? 0 : this.field3.compare(var1, var2); } @ObfuscatedName("equals") - public boolean __equals_462(Object var1) { + public boolean method13(Object var1) { return super.equals(var1); } @@ -44,22 +43,22 @@ public abstract class AbstractUserComparator implements Comparator { garbageValue = "2048322935" ) static void method5437(int var0) { - if(var0 == -1 && !Client.__client_qq) { + if (var0 == -1 && !Client.field107) { class214.midiPcmStream.clear(); - class214.__hf_o = 1; - class214.__hf_u = null; - } else if(var0 != -1 && var0 != Client.__client_qy && Client.__client_qf != 0 && !Client.__client_qq) { + class214.field1129 = 1; + class214.field1130 = null; + } else if (var0 != -1 && var0 != Client.field112 && Client.field128 != 0 && !Client.field107) { IndexCache var1 = UserComparator3.indexCache6; - int var2 = Client.__client_qf; - class214.__hf_o = 1; - class214.__hf_u = var1; + int var2 = Client.field128; + class214.field1129 = 1; + class214.field1130 = var1; class30.musicTrackArchiveId = var0; GrandExchangeOffer.musicTrackFileId = 0; - WorldMapLabel.__aj_e = var2; + WorldMapLabel.field1039 = var2; RectangleMode.musicTrackBoolean = false; - FaceNormal.__el_x = 2; + FaceNormal.field344 = 2; } - Client.__client_qy = var0; + Client.field112 = var0; } } diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index f98c6c3107..b6ed56b3b4 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -11,7 +11,7 @@ public abstract class AbstractWorldMapIcon { @ObfuscatedGetter( intValue = -1942470229 ) - static int __ak_qj; + static int field4; @ObfuscatedName("ka") @ObfuscatedGetter( intValue = -1734004743 @@ -34,12 +34,12 @@ public abstract class AbstractWorldMapIcon { @ObfuscatedGetter( intValue = -521086143 ) - int __e; + int field5; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -1065362217 ) - int __x; + int field6; @ObfuscatedSignature( signature = "(Lhu;Lhu;)V" @@ -54,36 +54,36 @@ public abstract class AbstractWorldMapIcon { signature = "(I)I", garbageValue = "1990181988" ) - public abstract int __m_15(); + public abstract int vmethod395(); @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)Laj;", garbageValue = "1159446036" ) - abstract WorldMapLabel __f_16(); + abstract WorldMapLabel vmethod396(); @ObfuscatedName("q") @ObfuscatedSignature( signature = "(B)I", garbageValue = "75" ) - abstract int __q_17(); + abstract int vmethod397(); @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)I", garbageValue = "-1558233611" ) - abstract int __w_18(); + abstract int vmethod398(); @ObfuscatedName("y") @ObfuscatedSignature( signature = "(IIB)Z", garbageValue = "-63" ) - boolean __y_66(int var1, int var2) { - return this.__b_68(var1, var2)?true:this.__c_69(var1, var2); + boolean method18(int var1, int var2) { + return this.method20(var1, var2) ? true : this.method21(var1, var2); } @ObfuscatedName("h") @@ -91,8 +91,8 @@ public abstract class AbstractWorldMapIcon { signature = "(I)Z", garbageValue = "1150380891" ) - boolean __h_67() { - return this.__m_15() >= 0; + boolean method19() { + return this.vmethod395() >= 0; } @ObfuscatedName("b") @@ -100,44 +100,45 @@ public abstract class AbstractWorldMapIcon { signature = "(III)Z", garbageValue = "484201257" ) - boolean __b_68(int var1, int var2) { - if(!this.__h_67()) { + boolean method20(int var1, int var2) { + if (!this.method19()) { return false; } else { - WorldMapElement var3 = ViewportMouse.getWorldMapElement(this.__m_15()); - int var4 = this.__q_17(); - int var5 = this.__w_18(); + WorldMapElement var3 = ViewportMouse.getWorldMapElement(this.vmethod395()); + int var4 = this.vmethod397(); + int var5 = this.vmethod398(); switch(var3.field3287.field3528) { case 0: - if(var1 < this.__e - var4 / 2 || var1 > var4 / 2 + this.__e) { - return false; + if (var1 >= this.field5 - var4 / 2 && var1 <= var4 / 2 + this.field5) { + break; } - break; + + return false; case 1: - if(var1 >= this.__e && var1 < var4 + this.__e) { + if (var1 >= this.field5 && var1 < var4 + this.field5) { break; } return false; case 2: - if(var1 <= this.__e - var4 || var1 > this.__e) { + if (var1 <= this.field5 - var4 || var1 > this.field5) { return false; } } switch(var3.field3301.field3275) { case 0: - if(var2 <= this.__x - var5 || var2 > this.__x) { + if (var2 <= this.field6 - var5 || var2 > this.field6) { return false; } break; case 1: - if(var2 < this.__x - var5 / 2 || var2 > var5 / 2 + this.__x) { + if (var2 < this.field6 - var5 / 2 || var2 > var5 / 2 + this.field6) { return false; } break; case 2: - if(var2 < this.__x || var2 >= var5 + this.__x) { + if (var2 < this.field6 || var2 >= var5 + this.field6) { return false; } } @@ -151,9 +152,9 @@ public abstract class AbstractWorldMapIcon { signature = "(III)Z", garbageValue = "1201712205" ) - boolean __c_69(int var1, int var2) { - WorldMapLabel var3 = this.__f_16(); - return var3 == null?false:(var1 >= this.__e - var3.width / 2 && var1 <= var3.width / 2 + this.__e?var2 >= this.__x && var2 <= var3.height + this.__x:false); + boolean method21(int var1, int var2) { + WorldMapLabel var3 = this.vmethod396(); + return var3 == null ? false : (var1 >= this.field5 - var3.width / 2 && var1 <= var3.width / 2 + this.field5 ? var2 >= this.field6 && var2 <= var3.height + this.field6 : false); } @ObfuscatedName("es") @@ -164,6 +165,6 @@ public abstract class AbstractWorldMapIcon { static void method625(IndexCache var0, String var1) { IndexCacheLoader var2 = new IndexCacheLoader(var0, var1); Client.indexCacheLoaders.add(var2); - Client.__client_sx += var2.__q; + Client.field140 += var2.field408; } } diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index cf25c7a265..2426fcb1e9 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -16,12 +16,12 @@ public final class AccessFile { @ObfuscatedGetter( intValue = -1762891465 ) - static int __dk_o; + static int field7; @ObfuscatedName("lm") @ObfuscatedSignature( signature = "Lho;" ) - static Widget __dk_lm; + static Widget field8; @ObfuscatedName("m") @Export("file") RandomAccessFile file; @@ -39,11 +39,11 @@ public final class AccessFile { long index; public AccessFile(File var1, String var2, long var3) throws IOException { - if(var3 == -1L) { + if (var3 == -1L) { var3 = Long.MAX_VALUE; } - if(var1.length() >= var3) { + if (var1.length() >= var3) { var1.delete(); } @@ -51,7 +51,7 @@ public final class AccessFile { this.capacity = var3; this.index = 0L; int var5 = this.file.read(); - if(var5 != -1 && !var2.equals("r")) { + if (var5 != -1 && !var2.equals("r")) { this.file.seek(0L); this.file.write(var5); } @@ -73,7 +73,7 @@ public final class AccessFile { ) @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { - if((long)var3 + this.index > this.capacity) { + if ((long)var3 + this.index > this.capacity) { this.file.seek(this.capacity + 1L); this.file.write(1); throw new EOFException(); @@ -100,12 +100,11 @@ public final class AccessFile { ) @Export("closeSync") public final void closeSync(boolean var1) throws IOException { - if(this.file != null) { - if(var1) { + if (this.file != null) { + if (var1) { try { this.file.getFD().sync(); } catch (SyncFailedException var3) { - ; } } @@ -133,7 +132,7 @@ public final class AccessFile { @Export("read") public final int read(byte[] var1, int var2, int var3) throws IOException { int var4 = this.file.read(var1, var2, var3); - if(var4 > 0) { + if (var4 > 0) { this.index += (long)var4; } @@ -141,8 +140,8 @@ public final class AccessFile { } @ObfuscatedName("finalize") - protected void __finalize_211() throws Throwable { - if(this.file != null) { + protected void method22() throws Throwable { + if (this.file != null) { System.out.println(""); this.close(); } @@ -155,31 +154,31 @@ public final class AccessFile { garbageValue = "-728558316" ) @Export("addWidgetItemMenuItem") - static final void addWidgetItemMenuItem(Widget widget, ItemDefinition definition, int var2, int actionIndex, boolean shiftClick) { - String[] var5 = definition.inventoryActions; - byte opcode = -1; - String action = null; - if(var5 != null && var5[actionIndex] != null) { - if(actionIndex == 0) { - opcode = 33; - } else if(actionIndex == 1) { - opcode = 34; - } else if(actionIndex == 2) { - opcode = 35; - } else if(actionIndex == 3) { - opcode = 36; + static final void addWidgetItemMenuItem(Widget var0, ItemDefinition var1, int var2, int var3, boolean var4) { + String[] var5 = var1.inventoryActions; + byte var6 = -1; + String var7 = null; + if (var5 != null && var5[var3] != null) { + if (var3 == 0) { + var6 = 33; + } else if (var3 == 1) { + var6 = 34; + } else if (var3 == 2) { + var6 = 35; + } else if (var3 == 3) { + var6 = 36; } else { - opcode = 37; + var6 = 37; } - action = var5[actionIndex]; - } else if(actionIndex == 4) { - opcode = 37; - action = "Drop"; + var7 = var5[var3]; + } else if (var3 == 4) { + var6 = 37; + var7 = "Drop"; } - if(opcode != -1 && action != null) { - class16.insertMenuItem(action, BufferedFile.colorStartTag(0xff9040) + definition.name, opcode, definition.id, var2, widget.id, shiftClick); + if (var6 != -1 && var7 != null) { + class16.insertMenuItem(var7, BufferedFile.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); } } diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index ecd96ba288..1f1be493c2 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -23,9 +23,9 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = 1439711403 ) - int __ac; + int field9; @ObfuscatedName("ay") - boolean __ay; + boolean field10; @ObfuscatedName("ah") @ObfuscatedGetter( intValue = -1357622739 @@ -93,7 +93,7 @@ public abstract class Actor extends Entity { @Export("isAutoChatting") boolean isAutoChatting; @ObfuscatedName("az") - boolean __az; + boolean field11; @ObfuscatedName("au") @ObfuscatedGetter( intValue = 137508815 @@ -149,7 +149,7 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = 139384875 ) - int __bc; + int field12; @ObfuscatedName("bo") @ObfuscatedGetter( intValue = 1614854211 @@ -196,7 +196,7 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = -1523249259 ) - int __bj; + int field13; @ObfuscatedName("bi") @ObfuscatedGetter( intValue = -220610999 @@ -219,7 +219,7 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = 886371765 ) - int __bt; + int field14; @ObfuscatedName("bp") @ObfuscatedGetter( intValue = -779457309 @@ -230,37 +230,37 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = 2121599561 ) - int __bf; + int field15; @ObfuscatedName("bh") @ObfuscatedGetter( intValue = 280591281 ) - int __bh; + int field16; @ObfuscatedName("be") @ObfuscatedGetter( intValue = 837989037 ) - int __be; + int field17; @ObfuscatedName("bv") @ObfuscatedGetter( intValue = -1857513783 ) - int __bv; + int field18; @ObfuscatedName("bw") @ObfuscatedGetter( intValue = -1630403001 ) - int __bw; + int field19; @ObfuscatedName("cr") @ObfuscatedGetter( intValue = 1367256299 ) - int __cr; + int field20; @ObfuscatedName("cv") @ObfuscatedGetter( intValue = -1723834619 ) - int __cv; + int field21; @ObfuscatedName("ce") @ObfuscatedGetter( intValue = 2051334073 @@ -283,12 +283,12 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = 1252341007 ) - int __cm; + int field22; @ObfuscatedName("cj") @ObfuscatedGetter( intValue = -336931157 ) - int __cj; + int field23; @ObfuscatedName("cu") @ObfuscatedGetter( intValue = -2033082375 @@ -308,15 +308,15 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = -1583514013 ) - int __cq; + int field24; @ObfuscatedName("ch") @ObfuscatedGetter( intValue = 1584102533 ) - int __ch; + int field25; Actor() { - this.__ay = false; + this.field10 = false; this.size = 1; this.idleSequence = -1; this.turnLeftSequence = -1; @@ -327,7 +327,7 @@ public abstract class Actor extends Entity { this.walkTurnRightSequence = -1; this.runSequence = -1; this.overheadText = null; - this.__az = false; + this.field11 = false; this.overheadTextCyclesRemaining = 100; this.overheadTextColor = 0; this.overheadTextEffect = 0; @@ -340,7 +340,7 @@ public abstract class Actor extends Entity { this.healthBars = new IterableNodeDeque(); this.targetIndex = -1; this.false0 = false; - this.__bc = -1; + this.field12 = -1; this.movementSequence = -1; this.movementFrame = 0; this.movementFrameCycle = 0; @@ -348,20 +348,20 @@ public abstract class Actor extends Entity { this.sequenceFrame = 0; this.sequenceFrameCycle = 0; this.sequenceDelay = 0; - this.__bj = 0; + this.field13 = 0; this.spotAnimation = -1; this.spotAnimationFrame = 0; this.spotAnimationFrameCycle = 0; this.npcCycle = 0; this.defaultHeight = 200; - this.__cm = 0; - this.__cj = 32; + this.field22 = 0; + this.field23 = 32; this.pathLength = 0; this.pathX = new int[10]; this.pathY = new int[10]; this.pathTraversed = new byte[10]; - this.__cq = 0; - this.__ch = 0; + this.field24 = 0; + this.field25 = 0; } @ObfuscatedName("z") @@ -379,9 +379,9 @@ public abstract class Actor extends Entity { signature = "(I)V", garbageValue = "1415393262" ) - final void __bb_143() { + final void method23() { this.pathLength = 0; - this.__ch = 0; + this.field25 = 0; } @ObfuscatedName("bs") @@ -395,8 +395,8 @@ public abstract class Actor extends Entity { boolean var8 = true; int var9; - for(var9 = 0; var9 < 4; ++var9) { - if(this.hitSplatCycles[var9] > var5) { + for (var9 = 0; var9 < 4; ++var9) { + if (this.hitSplatCycles[var9] > var5) { var7 = false; } else { var8 = false; @@ -406,63 +406,64 @@ public abstract class Actor extends Entity { var9 = -1; int var10 = -1; int var11 = 0; - if(var1 >= 0) { + if (var1 >= 0) { HitSplatDefinition var12 = LoginScreenAnimation.getHitSplatDefinition(var1); - var10 = var12.__c; - var11 = var12.__i; + var10 = var12.field396; + var11 = var12.field387; } int var14; - if(var8) { - if(var10 == -1) { + if (var8) { + if (var10 == -1) { return; } var9 = 0; var14 = 0; - if(var10 == 0) { + if (var10 == 0) { var14 = this.hitSplatCycles[0]; - } else if(var10 == 1) { + } else if (var10 == 1) { var14 = this.hitSplatValues[0]; } - for(int var13 = 1; var13 < 4; ++var13) { - if(var10 == 0) { - if(this.hitSplatCycles[var13] < var14) { + for (int var13 = 1; var13 < 4; ++var13) { + if (var10 == 0) { + if (this.hitSplatCycles[var13] < var14) { var9 = var13; var14 = this.hitSplatCycles[var13]; } - } else if(var10 == 1 && this.hitSplatValues[var13] < var14) { + } else if (var10 == 1 && this.hitSplatValues[var13] < var14) { var9 = var13; var14 = this.hitSplatValues[var13]; } } - if(var10 == 1 && var14 >= var2) { + if (var10 == 1 && var14 >= var2) { return; } } else { - if(var7) { + if (var7) { this.hitSplatCount = 0; } - for(var14 = 0; var14 < 4; ++var14) { + for (var14 = 0; var14 < 4; ++var14) { byte var15 = this.hitSplatCount; this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4); - if(this.hitSplatCycles[var15] <= var5) { + if (this.hitSplatCycles[var15] <= var5) { var9 = var15; break; } } } - if(var9 >= 0) { + if (var9 >= 0) { this.hitSplatTypes[var9] = var1; this.hitSplatValues[var9] = var2; this.hitSplatTypes2[var9] = var3; this.hitSplatValues2[var9] = var4; this.hitSplatCycles[var9] = var5 + var11 + var6; } + } @ObfuscatedName("bq") @@ -472,59 +473,59 @@ public abstract class Actor extends Entity { ) @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { - HealthBarDefinition var8 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); - HealthBarDefinition var7; - if(var8 != null) { - var7 = var8; + HealthBarDefinition var7 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); + HealthBarDefinition var8; + if (var7 != null) { + var8 = var7; } else { - byte[] var9 = HealthBarDefinition.__ii_m.takeRecord(33, var1); - var8 = new HealthBarDefinition(); - if(var9 != null) { - var8.read(new Buffer(var9)); + byte[] var9 = HealthBarDefinition.field379.takeRecord(33, var1); + var7 = new HealthBarDefinition(); + if (var9 != null) { + var7.read(new Buffer(var9)); } - HealthBarDefinition.HealthBarDefinition_cached.put(var8, (long)var1); - var7 = var8; + HealthBarDefinition.HealthBarDefinition_cached.put(var7, (long)var1); + var8 = var7; } - var8 = var7; + var7 = var8; HealthBar var14 = null; HealthBar var10 = null; - int var11 = var7.int2; + int var11 = var8.int2; int var12 = 0; HealthBar var13; - for(var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) { + for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) { ++var12; - if(var13.definition.__o == var8.__o) { + if (var13.definition.field381 == var7.field381) { var13.put(var2 + var4, var5, var6, var3); return; } - if(var13.definition.int1 <= var8.int1) { + if (var13.definition.int1 <= var7.int1) { var14 = var13; } - if(var13.definition.int2 > var11) { + if (var13.definition.int2 > var11) { var10 = var13; var11 = var13.definition.int2; } } - if(var10 != null || var12 < 4) { - var13 = new HealthBar(var8); - if(var14 == null) { + if (var10 != null || var12 < 4) { + var13 = new HealthBar(var7); + if (var14 == null) { this.healthBars.addLast(var13); } else { IterableNodeDeque.IterableNodeDeque_addBefore(var13, var14); } var13.put(var2 + var4, var5, var6, var3); - if(var12 >= 4) { + if (var12 >= 4) { var10.remove(); } - } + } @ObfuscatedName("bn") @@ -534,25 +535,25 @@ public abstract class Actor extends Entity { ) @Export("removeHealthBar") final void removeHealthBar(int var1) { - HealthBarDefinition var3 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); - HealthBarDefinition var2; - if(var3 != null) { - var2 = var3; + HealthBarDefinition var2 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); + HealthBarDefinition var3; + if (var2 != null) { + var3 = var2; } else { - byte[] var4 = HealthBarDefinition.__ii_m.takeRecord(33, var1); - var3 = new HealthBarDefinition(); - if(var4 != null) { - var3.read(new Buffer(var4)); + byte[] var4 = HealthBarDefinition.field379.takeRecord(33, var1); + var2 = new HealthBarDefinition(); + if (var4 != null) { + var2.read(new Buffer(var4)); } - HealthBarDefinition.HealthBarDefinition_cached.put(var3, (long)var1); - var2 = var3; + HealthBarDefinition.HealthBarDefinition_cached.put(var2, (long)var1); + var3 = var2; } - var3 = var2; + var2 = var3; - for(HealthBar var5 = (HealthBar)this.healthBars.last(); var5 != null; var5 = (HealthBar)this.healthBars.previous()) { - if(var3 == var5.definition) { + for (HealthBar var5 = (HealthBar)this.healthBars.last(); var5 != null; var5 = (HealthBar)this.healthBars.previous()) { + if (var2 == var5.definition) { var5.remove(); return; } @@ -566,754 +567,754 @@ public abstract class Actor extends Entity { garbageValue = "493234011" ) @Export("menuAction") - static final void menuAction(int arg1, int arg2, int opcode, int arg0, String action, String target, int mouseX, int mouseY) { - if(opcode >= 2000) { - opcode -= 2000; + static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) { + if (var2 >= 2000) { + var2 -= 2000; } PacketBufferNode var8; - if(opcode == 1) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + if (var2 == 1) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var8 = Interpreter.method1915(ClientPacket.__gs_an, Client.packetWriter.isaacCipher); - var8.packetBuffer.__bx_323(GraphicsObject.baseY + arg2); + Client.destinationX = var0; + Client.destinationY = var1; + var8 = Interpreter.method1915(ClientPacket.field266, Client.packetWriter.isaacCipher); + var8.packetBuffer.method64(GraphicsObject.baseY + var1); var8.packetBuffer.writeShortLE(HealthBarDefinition.selectedItemSlot); - var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0); + var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); var8.packetBuffer.writeIntLE(ServerPacket.selectedItemWidget); - var8.packetBuffer.__bx_323(arg1 + class50.baseX); - var8.packetBuffer.writeShort(arg0); + var8.packetBuffer.method64(var0 + class50.baseX); + var8.packetBuffer.writeShort(var3); var8.packetBuffer.writeShortLE(MenuAction.selectedItemId); - Client.packetWriter.__q_167(var8); - } else if(opcode == 2) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + Client.packetWriter.method241(var8); + } else if (var2 == 2) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var8 = Interpreter.method1915(ClientPacket.__gs_cg, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var8.packetBuffer.writeShort(arg1 + class50.baseX); - var8.packetBuffer.__bo_322(arg0); - var8.packetBuffer.writeIntLE16(ServerBuild.__iy_lo); - var8.packetBuffer.writeShort(Client.__client_lc); - var8.packetBuffer.writeShortLE(GraphicsObject.baseY + arg2); - Client.packetWriter.__q_167(var8); - } else if(opcode == 3) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = Interpreter.method1915(ClientPacket.field314, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShort(var0 + class50.baseX); + var8.packetBuffer.method63(var3); + var8.packetBuffer.writeIntLE16(ServerBuild.field788); + var8.packetBuffer.writeShort(Client.field220); + var8.packetBuffer.writeShortLE(GraphicsObject.baseY + var1); + Client.packetWriter.method241(var8); + } else if (var2 == 3) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var8 = Interpreter.method1915(ClientPacket.__gs_d, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(GraphicsObject.baseY + arg2); - var8.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var8.packetBuffer.__bo_322(arg0); - var8.packetBuffer.__bx_323(arg1 + class50.baseX); - Client.packetWriter.__q_167(var8); - } else if(opcode == 4) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = Interpreter.method1915(ClientPacket.field232, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(GraphicsObject.baseY + var1); + var8.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method63(var3); + var8.packetBuffer.method64(var0 + class50.baseX); + Client.packetWriter.method241(var8); + } else if (var2 == 4) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var8 = Interpreter.method1915(ClientPacket.__gs_cv, Client.packetWriter.isaacCipher); - var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var8.packetBuffer.writeShort(arg0); - var8.packetBuffer.writeShort(GraphicsObject.baseY + arg2); - var8.packetBuffer.writeShort(arg1 + class50.baseX); - Client.packetWriter.__q_167(var8); - } else if(opcode == 5) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = Interpreter.method1915(ClientPacket.field301, Client.packetWriter.isaacCipher); + var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeShort(GraphicsObject.baseY + var1); + var8.packetBuffer.writeShort(var0 + class50.baseX); + Client.packetWriter.method241(var8); + } else if (var2 == 5) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var8 = Interpreter.method1915(ClientPacket.__gs_cq, Client.packetWriter.isaacCipher); - var8.packetBuffer.__bx_323(arg1 + class50.baseX); - var8.packetBuffer.__bo_322(arg0); - var8.packetBuffer.__bx_323(GraphicsObject.baseY + arg2); - var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - Client.packetWriter.__q_167(var8); - } else if(opcode == 6) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = Interpreter.method1915(ClientPacket.field311, Client.packetWriter.isaacCipher); + var8.packetBuffer.method64(var0 + class50.baseX); + var8.packetBuffer.method63(var3); + var8.packetBuffer.method64(GraphicsObject.baseY + var1); + var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.method241(var8); + } else if (var2 == 6) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var8 = Interpreter.method1915(ClientPacket.__gs_w, Client.packetWriter.isaacCipher); - var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var8.packetBuffer.__bo_322(GraphicsObject.baseY + arg2); - var8.packetBuffer.__bo_322(arg1 + class50.baseX); - var8.packetBuffer.writeShortLE(arg0); - Client.packetWriter.__q_167(var8); + Client.destinationX = var0; + Client.destinationY = var1; + var8 = Interpreter.method1915(ClientPacket.field225, Client.packetWriter.isaacCipher); + var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method63(GraphicsObject.baseY + var1); + var8.packetBuffer.method63(var0 + class50.baseX); + var8.packetBuffer.writeShortLE(var3); + Client.packetWriter.method241(var8); } else { PacketBufferNode var9; - Npc var13; - if(opcode == 7) { - var13 = Client.npcs[arg0]; - if(var13 != null) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + NPC var10; + if (var2 == 7) { + var10 = Client.npcs[var3]; + if (var10 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var9 = Interpreter.method1915(ClientPacket.__gs_r, Client.packetWriter.isaacCipher); - var9.packetBuffer.__bx_323(MenuAction.selectedItemId); + Client.destinationX = var0; + Client.destinationY = var1; + var9 = Interpreter.method1915(ClientPacket.field245, Client.packetWriter.isaacCipher); + var9.packetBuffer.method64(MenuAction.selectedItemId); var9.packetBuffer.writeShort(HealthBarDefinition.selectedItemSlot); - var9.packetBuffer.__bx_323(arg0); - var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0); + var9.packetBuffer.method64(var3); + var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); var9.packetBuffer.writeInt(ServerPacket.selectedItemWidget); - Client.packetWriter.__q_167(var9); + Client.packetWriter.method241(var9); } - } else if(opcode == 8) { - var13 = Client.npcs[arg0]; - if(var13 != null) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + } else if (var2 == 8) { + var10 = Client.npcs[var3]; + if (var10 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var9 = Interpreter.method1915(ClientPacket.__gs_cb, Client.packetWriter.isaacCipher); - var9.packetBuffer.__bx_323(arg0); - var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var9.packetBuffer.writeIntLE(ServerBuild.__iy_lo); - var9.packetBuffer.__bo_322(Client.__client_lc); - Client.packetWriter.__q_167(var9); + Client.destinationX = var0; + Client.destinationY = var1; + var9 = Interpreter.method1915(ClientPacket.field308, Client.packetWriter.isaacCipher); + var9.packetBuffer.method64(var3); + var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeIntLE(ServerBuild.field788); + var9.packetBuffer.method63(Client.field220); + Client.packetWriter.method241(var9); } - } else if(opcode == 9) { - var13 = Client.npcs[arg0]; - if(var13 != null) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + } else if (var2 == 9) { + var10 = Client.npcs[var3]; + if (var10 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var9 = Interpreter.method1915(ClientPacket.__gs_bt, Client.packetWriter.isaacCipher); - var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var9.packetBuffer.writeShortLE(arg0); - Client.packetWriter.__q_167(var9); + Client.destinationX = var0; + Client.destinationY = var1; + var9 = Interpreter.method1915(ClientPacket.field293, Client.packetWriter.isaacCipher); + var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeShortLE(var3); + Client.packetWriter.method241(var9); } - } else if(opcode == 10) { - var13 = Client.npcs[arg0]; - if(var13 != null) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + } else if (var2 == 10) { + var10 = Client.npcs[var3]; + if (var10 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var9 = Interpreter.method1915(ClientPacket.__gs_f, Client.packetWriter.isaacCipher); - var9.packetBuffer.__bo_322(arg0); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - Client.packetWriter.__q_167(var9); + Client.destinationX = var0; + Client.destinationY = var1; + var9 = Interpreter.method1915(ClientPacket.field223, Client.packetWriter.isaacCipher); + var9.packetBuffer.method63(var3); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.method241(var9); } - } else if(opcode == 11) { - var13 = Client.npcs[arg0]; - if(var13 != null) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + } else if (var2 == 11) { + var10 = Client.npcs[var3]; + if (var10 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var9 = Interpreter.method1915(ClientPacket.__gs_ah, Client.packetWriter.isaacCipher); - var9.packetBuffer.__bx_323(arg0); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - Client.packetWriter.__q_167(var9); + Client.destinationX = var0; + Client.destinationY = var1; + var9 = Interpreter.method1915(ClientPacket.field255, Client.packetWriter.isaacCipher); + var9.packetBuffer.method64(var3); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.method241(var9); } - } else if(opcode == 12) { - var13 = Client.npcs[arg0]; - if(var13 != null) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + } else if (var2 == 12) { + var10 = Client.npcs[var3]; + if (var10 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var9 = Interpreter.method1915(ClientPacket.__gs_bc, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(arg0); - var9.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - Client.packetWriter.__q_167(var9); + Client.destinationX = var0; + Client.destinationY = var1; + var9 = Interpreter.method1915(ClientPacket.field281, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.method241(var9); } - } else if(opcode == 13) { - var13 = Client.npcs[arg0]; - if(var13 != null) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + } else if (var2 == 13) { + var10 = Client.npcs[var3]; + if (var10 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var9 = Interpreter.method1915(ClientPacket.__gs_ac, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var9.packetBuffer.__bo_322(arg0); - Client.packetWriter.__q_167(var9); + Client.destinationX = var0; + Client.destinationY = var1; + var9 = Interpreter.method1915(ClientPacket.field253, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method63(var3); + Client.packetWriter.method241(var9); } } else { - Player var15; - if(opcode == 14) { - var15 = Client.players[arg0]; - if(var15 != null) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + Player var11; + if (var2 == 14) { + var11 = Client.players[var3]; + if (var11 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var9 = Interpreter.method1915(ClientPacket.__gs_cy, Client.packetWriter.isaacCipher); - var9.packetBuffer.__bx_323(HealthBarDefinition.selectedItemSlot); - var9.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0); + Client.destinationX = var0; + Client.destinationY = var1; + var9 = Interpreter.method1915(ClientPacket.field303, Client.packetWriter.isaacCipher); + var9.packetBuffer.method64(HealthBarDefinition.selectedItemSlot); + var9.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); var9.packetBuffer.writeIntME(ServerPacket.selectedItemWidget); - var9.packetBuffer.writeShort(arg0); + var9.packetBuffer.writeShort(var3); var9.packetBuffer.writeShort(MenuAction.selectedItemId); - Client.packetWriter.__q_167(var9); + Client.packetWriter.method241(var9); } - } else if(opcode == 15) { - var15 = Client.players[arg0]; - if(var15 != null) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + } else if (var2 == 15) { + var11 = Client.players[var3]; + if (var11 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var9 = Interpreter.method1915(ClientPacket.__gs_bq, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeIntLE16(ServerBuild.__iy_lo); - var9.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var9.packetBuffer.__bo_322(Client.__client_lc); - var9.packetBuffer.writeShort(arg0); - Client.packetWriter.__q_167(var9); + Client.destinationX = var0; + Client.destinationY = var1; + var9 = Interpreter.method1915(ClientPacket.field277, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeIntLE16(ServerBuild.field788); + var9.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method63(Client.field220); + var9.packetBuffer.writeShort(var3); + Client.packetWriter.method241(var9); } - } else if(opcode == 16) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + } else if (var2 == 16) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var8 = Interpreter.method1915(ClientPacket.__gs_t, Client.packetWriter.isaacCipher); + Client.destinationX = var0; + Client.destinationY = var1; + var8 = Interpreter.method1915(ClientPacket.field240, Client.packetWriter.isaacCipher); var8.packetBuffer.writeIntME(ServerPacket.selectedItemWidget); - var8.packetBuffer.__bx_323(MenuAction.selectedItemId); - var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0); + var8.packetBuffer.method64(MenuAction.selectedItemId); + var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); var8.packetBuffer.writeShortLE(HealthBarDefinition.selectedItemSlot); - var8.packetBuffer.__bx_323(arg0); - var8.packetBuffer.__bx_323(arg1 + class50.baseX); - var8.packetBuffer.writeShortLE(GraphicsObject.baseY + arg2); - Client.packetWriter.__q_167(var8); - } else if(opcode == 17) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + var8.packetBuffer.method64(var3); + var8.packetBuffer.method64(var0 + class50.baseX); + var8.packetBuffer.writeShortLE(GraphicsObject.baseY + var1); + Client.packetWriter.method241(var8); + } else if (var2 == 17) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var8 = Interpreter.method1915(ClientPacket.__gs_bb, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(ServerBuild.__iy_lo); - var8.packetBuffer.writeShort(Client.__client_lc); - var8.packetBuffer.__bo_322(GraphicsObject.baseY + arg2); - var8.packetBuffer.__bo_322(arg1 + class50.baseX); - var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var8.packetBuffer.writeShortLE(arg0); - Client.packetWriter.__q_167(var8); - } else if(opcode == 18) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = Interpreter.method1915(ClientPacket.field275, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(ServerBuild.field788); + var8.packetBuffer.writeShort(Client.field220); + var8.packetBuffer.method63(GraphicsObject.baseY + var1); + var8.packetBuffer.method63(var0 + class50.baseX); + var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShortLE(var3); + Client.packetWriter.method241(var8); + } else if (var2 == 18) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var8 = Interpreter.method1915(ClientPacket.__gs_u, Client.packetWriter.isaacCipher); - var8.packetBuffer.__bx_323(GraphicsObject.baseY + arg2); - var8.packetBuffer.writeShortLE(arg0); - var8.packetBuffer.writeShortLE(arg1 + class50.baseX); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - Client.packetWriter.__q_167(var8); - } else if(opcode == 19) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = Interpreter.method1915(ClientPacket.field227, Client.packetWriter.isaacCipher); + var8.packetBuffer.method64(GraphicsObject.baseY + var1); + var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.writeShortLE(var0 + class50.baseX); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.method241(var8); + } else if (var2 == 19) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var8 = Interpreter.method1915(ClientPacket.__gs_bh, Client.packetWriter.isaacCipher); - var8.packetBuffer.__bx_323(arg0); - var8.packetBuffer.__bo_322(arg1 + class50.baseX); - var8.packetBuffer.writeShort(GraphicsObject.baseY + arg2); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - Client.packetWriter.__q_167(var8); - } else if(opcode == 20) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = Interpreter.method1915(ClientPacket.field296, Client.packetWriter.isaacCipher); + var8.packetBuffer.method64(var3); + var8.packetBuffer.method63(var0 + class50.baseX); + var8.packetBuffer.writeShort(GraphicsObject.baseY + var1); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.method241(var8); + } else if (var2 == 20) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var8 = Interpreter.method1915(ClientPacket.__gs_g, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(GraphicsObject.baseY + arg2); - var8.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var8.packetBuffer.writeShortLE(arg1 + class50.baseX); - var8.packetBuffer.writeShortLE(arg0); - Client.packetWriter.__q_167(var8); - } else if(opcode == 21) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = Interpreter.method1915(ClientPacket.field228, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShortLE(GraphicsObject.baseY + var1); + var8.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShortLE(var0 + class50.baseX); + var8.packetBuffer.writeShortLE(var3); + Client.packetWriter.method241(var8); + } else if (var2 == 21) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var8 = Interpreter.method1915(ClientPacket.__gs_av, Client.packetWriter.isaacCipher); - var8.packetBuffer.__bo_322(GraphicsObject.baseY + arg2); - var8.packetBuffer.writeShortLE(arg0); - var8.packetBuffer.writeShort(arg1 + class50.baseX); - var8.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - Client.packetWriter.__q_167(var8); - } else if(opcode == 22) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = Interpreter.method1915(ClientPacket.field251, Client.packetWriter.isaacCipher); + var8.packetBuffer.method63(GraphicsObject.baseY + var1); + var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.writeShort(var0 + class50.baseX); + var8.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.method241(var8); + } else if (var2 == 22) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var8 = Interpreter.method1915(ClientPacket.__gs_ai, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var8.packetBuffer.__bx_323(arg0); - var8.packetBuffer.__bo_322(GraphicsObject.baseY + arg2); - var8.packetBuffer.writeShort(arg1 + class50.baseX); - Client.packetWriter.__q_167(var8); - } else if(opcode == 23) { - if(Client.isMenuOpen) { - class65.scene.__as_250(); + Client.destinationX = var0; + Client.destinationY = var1; + var8 = Interpreter.method1915(ClientPacket.field273, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method64(var3); + var8.packetBuffer.method63(GraphicsObject.baseY + var1); + var8.packetBuffer.writeShort(var0 + class50.baseX); + Client.packetWriter.method241(var8); + } else if (var2 == 23) { + if (Client.isMenuOpen) { + class65.scene.method296(); } else { - class65.scene.menuOpen(SoundSystem.plane, arg1, arg2, true); + class65.scene.menuOpen(SoundSystem.plane, var0, var1, true); } } else { - PacketBufferNode var10; - Widget var16; - if(opcode == 24) { - var16 = Huffman.getWidget(arg2); - boolean var12 = true; - if(var16.contentType > 0) { - var12 = ViewportMouse.method2957(var16); + PacketBufferNode var12; + Widget var13; + if (var2 == 24) { + var13 = Huffman.getWidget(var1); + boolean var14 = true; + if (var13.contentType > 0) { + var14 = ViewportMouse.method2957(var13); } - if(var12) { - var10 = Interpreter.method1915(ClientPacket.__gs_bz, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(arg2); - Client.packetWriter.__q_167(var10); + if (var14) { + var12 = Interpreter.method1915(ClientPacket.field291, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeInt(var1); + Client.packetWriter.method241(var12); } } else { - if(opcode == 25) { - var16 = class204.getWidgetChild(arg2, arg1); - if(var16 != null) { + if (var2 == 25) { + var13 = class204.getWidgetChild(var1, var0); + if (var13 != null) { Player.method1281(); - class25.method350(arg2, arg1, class211.method4107(class1.getWidgetClickMask(var16)), var16.itemId); + class25.method350(var1, var0, class211.method4107(class1.getWidgetClickMask(var13)), var13.itemId); Client.isItemSelected = 0; - Client.selectedSpellActionName = class198.method3745(var16); - if(Client.selectedSpellActionName == null) { + Client.selectedSpellActionName = class198.method3745(var13); + if (Client.selectedSpellActionName == null) { Client.selectedSpellActionName = "null"; } - if(var16.isIf3) { - Client.selectedSpellName = var16.dataText + BufferedFile.colorStartTag(16777215); + if (var13.isIf3) { + Client.selectedSpellName = var13.dataText + BufferedFile.colorStartTag(16777215); } else { - Client.selectedSpellName = BufferedFile.colorStartTag(65280) + var16.spellName + BufferedFile.colorStartTag(16777215); + Client.selectedSpellName = BufferedFile.colorStartTag(65280) + var13.spellName + BufferedFile.colorStartTag(16777215); } } return; } - if(opcode == 26) { + if (var2 == 26) { WorldMapLabelSize.method198(); } else { - int var11; - Widget var14; - if(opcode == 28) { - var8 = Interpreter.method1915(ClientPacket.__gs_bz, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(arg2); - Client.packetWriter.__q_167(var8); - var14 = Huffman.getWidget(arg2); - if(var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { - var11 = var14.cs1Instructions[0][1]; - Varps.Varps_main[var11] = 1 - Varps.Varps_main[var11]; - IndexCache.method4703(var11); + Widget var15; + int var17; + if (var2 == 28) { + var8 = Interpreter.method1915(ClientPacket.field291, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.method241(var8); + var15 = Huffman.getWidget(var1); + if (var15.cs1Instructions != null && var15.cs1Instructions[0][0] == 5) { + var17 = var15.cs1Instructions[0][1]; + Varps.Varps_main[var17] = 1 - Varps.Varps_main[var17]; + IndexCache.method4703(var17); } - } else if(opcode == 29) { - var8 = Interpreter.method1915(ClientPacket.__gs_bz, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(arg2); - Client.packetWriter.__q_167(var8); - var14 = Huffman.getWidget(arg2); - if(var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { - var11 = var14.cs1Instructions[0][1]; - if(Varps.Varps_main[var11] != var14.cs1ComparisonValues[0]) { - Varps.Varps_main[var11] = var14.cs1ComparisonValues[0]; - IndexCache.method4703(var11); + } else if (var2 == 29) { + var8 = Interpreter.method1915(ClientPacket.field291, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.method241(var8); + var15 = Huffman.getWidget(var1); + if (var15.cs1Instructions != null && var15.cs1Instructions[0][0] == 5) { + var17 = var15.cs1Instructions[0][1]; + if (Varps.Varps_main[var17] != var15.cs1ComparisonValues[0]) { + Varps.Varps_main[var17] = var15.cs1ComparisonValues[0]; + IndexCache.method4703(var17); } } - } else if(opcode == 30) { - if(Client.__client_mo == null) { - TilePaint.method3060(arg2, arg1); - Client.__client_mo = class204.getWidgetChild(arg2, arg1); - class22.method295(Client.__client_mo); + } else if (var2 == 30) { + if (Client.field127 == null) { + TilePaint.method3060(var1, var0); + Client.field127 = class204.getWidgetChild(var1, var0); + class22.method295(Client.field127); } - } else if(opcode == 31) { - var8 = Interpreter.method1915(ClientPacket.__gs_bu, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(arg2); + } else if (var2 == 31) { + var8 = Interpreter.method1915(ClientPacket.field285, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(var1); var8.packetBuffer.writeIntLE16(ServerPacket.selectedItemWidget); - var8.packetBuffer.__bx_323(HealthBarDefinition.selectedItemSlot); + var8.packetBuffer.method64(HealthBarDefinition.selectedItemSlot); var8.packetBuffer.writeShortLE(MenuAction.selectedItemId); - var8.packetBuffer.writeShortLE(arg1); - var8.packetBuffer.__bx_323(arg0); - Client.packetWriter.__q_167(var8); - Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(arg2); - Client.__client_jz = arg1; - } else if(opcode == 32) { - var8 = Interpreter.method1915(ClientPacket.__gs_q, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(ServerBuild.__iy_lo); - var8.packetBuffer.writeInt(arg2); - var8.packetBuffer.writeShort(arg1); - var8.packetBuffer.writeShortLE(arg0); - var8.packetBuffer.writeShortLE(Client.__client_lc); - Client.packetWriter.__q_167(var8); - Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(arg2); - Client.__client_jz = arg1; - } else if(opcode == 33) { - var8 = Interpreter.method1915(ClientPacket.__gs_ck, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(arg0); - var8.packetBuffer.writeIntME(arg2); - var8.packetBuffer.writeShort(arg1); - Client.packetWriter.__q_167(var8); - Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(arg2); - Client.__client_jz = arg1; - } else if(opcode == 34) { - var8 = Interpreter.method1915(ClientPacket.__gs_cc, Client.packetWriter.isaacCipher); - var8.packetBuffer.__bo_322(arg0); - var8.packetBuffer.writeIntLE16(arg2); - var8.packetBuffer.__bx_323(arg1); - Client.packetWriter.__q_167(var8); - Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(arg2); - Client.__client_jz = arg1; - } else if(opcode == 35) { - var8 = Interpreter.method1915(ClientPacket.__gs_bp, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntLE(arg2); - var8.packetBuffer.__bx_323(arg1); - var8.packetBuffer.__bx_323(arg0); - Client.packetWriter.__q_167(var8); - Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(arg2); - Client.__client_jz = arg1; - } else if(opcode == 36) { - var8 = Interpreter.method1915(ClientPacket.__gs_l, Client.packetWriter.isaacCipher); - var8.packetBuffer.__bx_323(arg0); - var8.packetBuffer.writeInt(arg2); - var8.packetBuffer.__bx_323(arg1); - Client.packetWriter.__q_167(var8); - Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(arg2); - Client.__client_jz = arg1; - } else if(opcode == 37) { - var8 = Interpreter.method1915(ClientPacket.__gs_bd, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(arg2); - var8.packetBuffer.writeShort(arg1); - var8.packetBuffer.writeShort(arg0); - Client.packetWriter.__q_167(var8); - Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(arg2); - Client.__client_jz = arg1; + var8.packetBuffer.writeShortLE(var0); + var8.packetBuffer.method64(var3); + Client.packetWriter.method241(var8); + Client.field203 = 0; + BoundaryObject.field40 = Huffman.getWidget(var1); + Client.field204 = var0; + } else if (var2 == 32) { + var8 = Interpreter.method1915(ClientPacket.field224, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(ServerBuild.field788); + var8.packetBuffer.writeInt(var1); + var8.packetBuffer.writeShort(var0); + var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.writeShortLE(Client.field220); + Client.packetWriter.method241(var8); + Client.field203 = 0; + BoundaryObject.field40 = Huffman.getWidget(var1); + Client.field204 = var0; + } else if (var2 == 33) { + var8 = Interpreter.method1915(ClientPacket.field309, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.writeIntME(var1); + var8.packetBuffer.writeShort(var0); + Client.packetWriter.method241(var8); + Client.field203 = 0; + BoundaryObject.field40 = Huffman.getWidget(var1); + Client.field204 = var0; + } else if (var2 == 34) { + var8 = Interpreter.method1915(ClientPacket.field320, Client.packetWriter.isaacCipher); + var8.packetBuffer.method63(var3); + var8.packetBuffer.writeIntLE16(var1); + var8.packetBuffer.method64(var0); + Client.packetWriter.method241(var8); + Client.field203 = 0; + BoundaryObject.field40 = Huffman.getWidget(var1); + Client.field204 = var0; + } else if (var2 == 35) { + var8 = Interpreter.method1915(ClientPacket.field294, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntLE(var1); + var8.packetBuffer.method64(var0); + var8.packetBuffer.method64(var3); + Client.packetWriter.method241(var8); + Client.field203 = 0; + BoundaryObject.field40 = Huffman.getWidget(var1); + Client.field204 = var0; + } else if (var2 == 36) { + var8 = Interpreter.method1915(ClientPacket.field229, Client.packetWriter.isaacCipher); + var8.packetBuffer.method64(var3); + var8.packetBuffer.writeInt(var1); + var8.packetBuffer.method64(var0); + Client.packetWriter.method241(var8); + Client.field203 = 0; + BoundaryObject.field40 = Huffman.getWidget(var1); + Client.field204 = var0; + } else if (var2 == 37) { + var8 = Interpreter.method1915(ClientPacket.field280, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + var8.packetBuffer.writeShort(var0); + var8.packetBuffer.writeShort(var3); + Client.packetWriter.method241(var8); + Client.field203 = 0; + BoundaryObject.field40 = Huffman.getWidget(var1); + Client.field204 = var0; } else { - if(opcode == 38) { + if (var2 == 38) { Player.method1281(); - var16 = Huffman.getWidget(arg2); + var13 = Huffman.getWidget(var1); Client.isItemSelected = 1; - HealthBarDefinition.selectedItemSlot = arg1; - ServerPacket.selectedItemWidget = arg2; - MenuAction.selectedItemId = arg0; - class22.method295(var16); - Client.selectedItemName = BufferedFile.colorStartTag(16748608) + Skills.getItemDefinition(arg0).name + BufferedFile.colorStartTag(16777215); - if(Client.selectedItemName == null) { + HealthBarDefinition.selectedItemSlot = var0; + ServerPacket.selectedItemWidget = var1; + MenuAction.selectedItemId = var3; + class22.method295(var13); + Client.selectedItemName = BufferedFile.colorStartTag(16748608) + Skills.getItemDefinition(var3).name + BufferedFile.colorStartTag(16777215); + if (Client.selectedItemName == null) { Client.selectedItemName = "null"; } return; } - if(opcode == 39) { - var8 = Interpreter.method1915(ClientPacket.__gs_au, Client.packetWriter.isaacCipher); - var8.packetBuffer.__bx_323(arg0); - var8.packetBuffer.writeIntLE16(arg2); - var8.packetBuffer.writeShortLE(arg1); - Client.packetWriter.__q_167(var8); - Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(arg2); - Client.__client_jz = arg1; - } else if(opcode == 40) { - var8 = Interpreter.method1915(ClientPacket.__gs_ag, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntLE16(arg2); - var8.packetBuffer.writeShortLE(arg1); - var8.packetBuffer.__bo_322(arg0); - Client.packetWriter.__q_167(var8); - Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(arg2); - Client.__client_jz = arg1; - } else if(opcode == 41) { - var8 = Interpreter.method1915(ClientPacket.__gs_bl, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntLE(arg2); - var8.packetBuffer.__bo_322(arg1); - var8.packetBuffer.writeShort(arg0); - Client.packetWriter.__q_167(var8); - Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(arg2); - Client.__client_jz = arg1; - } else if(opcode == 42) { - var8 = Interpreter.method1915(ClientPacket.__gs_bm, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(arg2); - var8.packetBuffer.__bo_322(arg1); - var8.packetBuffer.writeShort(arg0); - Client.packetWriter.__q_167(var8); - Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(arg2); - Client.__client_jz = arg1; - } else if(opcode == 43) { - var8 = Interpreter.method1915(ClientPacket.__gs_ay, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(arg0); - var8.packetBuffer.writeIntME(arg2); - var8.packetBuffer.writeShort(arg1); - Client.packetWriter.__q_167(var8); - Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(arg2); - Client.__client_jz = arg1; - } else if(opcode == 44) { - var15 = Client.players[arg0]; - if(var15 != null) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + if (var2 == 39) { + var8 = Interpreter.method1915(ClientPacket.field268, Client.packetWriter.isaacCipher); + var8.packetBuffer.method64(var3); + var8.packetBuffer.writeIntLE16(var1); + var8.packetBuffer.writeShortLE(var0); + Client.packetWriter.method241(var8); + Client.field203 = 0; + BoundaryObject.field40 = Huffman.getWidget(var1); + Client.field204 = var0; + } else if (var2 == 40) { + var8 = Interpreter.method1915(ClientPacket.field248, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntLE16(var1); + var8.packetBuffer.writeShortLE(var0); + var8.packetBuffer.method63(var3); + Client.packetWriter.method241(var8); + Client.field203 = 0; + BoundaryObject.field40 = Huffman.getWidget(var1); + Client.field204 = var0; + } else if (var2 == 41) { + var8 = Interpreter.method1915(ClientPacket.field287, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntLE(var1); + var8.packetBuffer.method63(var0); + var8.packetBuffer.writeShort(var3); + Client.packetWriter.method241(var8); + Client.field203 = 0; + BoundaryObject.field40 = Huffman.getWidget(var1); + Client.field204 = var0; + } else if (var2 == 42) { + var8 = Interpreter.method1915(ClientPacket.field286, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + var8.packetBuffer.method63(var0); + var8.packetBuffer.writeShort(var3); + Client.packetWriter.method241(var8); + Client.field203 = 0; + BoundaryObject.field40 = Huffman.getWidget(var1); + Client.field204 = var0; + } else if (var2 == 43) { + var8 = Interpreter.method1915(ClientPacket.field254, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeIntME(var1); + var8.packetBuffer.writeShort(var0); + Client.packetWriter.method241(var8); + Client.field203 = 0; + BoundaryObject.field40 = Huffman.getWidget(var1); + Client.field204 = var0; + } else if (var2 == 44) { + var11 = Client.players[var3]; + if (var11 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var9 = Interpreter.method1915(ClientPacket.__gs_ao, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(arg0); - var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - Client.packetWriter.__q_167(var9); + Client.destinationX = var0; + Client.destinationY = var1; + var9 = Interpreter.method1915(ClientPacket.field269, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.method241(var9); } - } else if(opcode == 45) { - var15 = Client.players[arg0]; - if(var15 != null) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + } else if (var2 == 45) { + var11 = Client.players[var3]; + if (var11 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var9 = Interpreter.method1915(ClientPacket.__gs_bn, Client.packetWriter.isaacCipher); - var9.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var9.packetBuffer.__bo_322(arg0); - Client.packetWriter.__q_167(var9); + Client.destinationX = var0; + Client.destinationY = var1; + var9 = Interpreter.method1915(ClientPacket.field278, Client.packetWriter.isaacCipher); + var9.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method63(var3); + Client.packetWriter.method241(var9); } - } else if(opcode == 46) { - var15 = Client.players[arg0]; - if(var15 != null) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + } else if (var2 == 46) { + var11 = Client.players[var3]; + if (var11 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var9 = Interpreter.method1915(ClientPacket.__gs_by, Client.packetWriter.isaacCipher); - var9.packetBuffer.__bo_322(arg0); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - Client.packetWriter.__q_167(var9); + Client.destinationX = var0; + Client.destinationY = var1; + var9 = Interpreter.method1915(ClientPacket.field284, Client.packetWriter.isaacCipher); + var9.packetBuffer.method63(var3); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.method241(var9); } - } else if(opcode == 47) { - var15 = Client.players[arg0]; - if(var15 != null) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + } else if (var2 == 47) { + var11 = Client.players[var3]; + if (var11 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var9 = Interpreter.method1915(ClientPacket.__gs_aq, Client.packetWriter.isaacCipher); - var9.packetBuffer.__bx_323(arg0); - var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - Client.packetWriter.__q_167(var9); + Client.destinationX = var0; + Client.destinationY = var1; + var9 = Interpreter.method1915(ClientPacket.field249, Client.packetWriter.isaacCipher); + var9.packetBuffer.method64(var3); + var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.method241(var9); } - } else if(opcode == 48) { - var15 = Client.players[arg0]; - if(var15 != null) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + } else if (var2 == 48) { + var11 = Client.players[var3]; + if (var11 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var9 = Interpreter.method1915(ClientPacket.__gs_cm, Client.packetWriter.isaacCipher); - var9.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var9.packetBuffer.__bo_322(arg0); - Client.packetWriter.__q_167(var9); + Client.destinationX = var0; + Client.destinationY = var1; + var9 = Interpreter.method1915(ClientPacket.field305, Client.packetWriter.isaacCipher); + var9.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method63(var3); + Client.packetWriter.method241(var9); } - } else if(opcode == 49) { - var15 = Client.players[arg0]; - if(var15 != null) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + } else if (var2 == 49) { + var11 = Client.players[var3]; + if (var11 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var9 = Interpreter.method1915(ClientPacket.__gs_cf, Client.packetWriter.isaacCipher); - var9.packetBuffer.__bo_322(arg0); - var9.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - Client.packetWriter.__q_167(var9); + Client.destinationX = var0; + Client.destinationY = var1; + var9 = Interpreter.method1915(ClientPacket.field315, Client.packetWriter.isaacCipher); + var9.packetBuffer.method63(var3); + var9.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.method241(var9); } - } else if(opcode == 50) { - var15 = Client.players[arg0]; - if(var15 != null) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + } else if (var2 == 50) { + var11 = Client.players[var3]; + if (var11 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var9 = Interpreter.method1915(ClientPacket.__gs_be, Client.packetWriter.isaacCipher); - var9.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var9.packetBuffer.writeShortLE(arg0); - Client.packetWriter.__q_167(var9); + Client.destinationX = var0; + Client.destinationY = var1; + var9 = Interpreter.method1915(ClientPacket.field297, Client.packetWriter.isaacCipher); + var9.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeShortLE(var3); + Client.packetWriter.method241(var9); } - } else if(opcode == 51) { - var15 = Client.players[arg0]; - if(var15 != null) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + } else if (var2 == 51) { + var11 = Client.players[var3]; + if (var11 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var9 = Interpreter.method1915(ClientPacket.__gs_af, Client.packetWriter.isaacCipher); - var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var9.packetBuffer.__bx_323(arg0); - Client.packetWriter.__q_167(var9); + Client.destinationX = var0; + Client.destinationY = var1; + var9 = Interpreter.method1915(ClientPacket.field272, Client.packetWriter.isaacCipher); + var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method64(var3); + Client.packetWriter.method241(var9); } } else { - label921: { - if(opcode != 57) { - if(opcode == 58) { - var16 = class204.getWidgetChild(arg2, arg1); - if(var16 != null) { - var9 = Interpreter.method1915(ClientPacket.__gs_cs, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortLE(Client.__client_lc); - var9.packetBuffer.writeIntLE16(arg2); - var9.packetBuffer.writeShortLE(Client.__client_mh); - var9.packetBuffer.__bx_323(arg1); - var9.packetBuffer.writeInt(ServerBuild.__iy_lo); - var9.packetBuffer.__bx_323(var16.itemId); - Client.packetWriter.__q_167(var9); + label415: { + if (var2 != 57) { + if (var2 == 58) { + var13 = class204.getWidgetChild(var1, var0); + if (var13 != null) { + var9 = Interpreter.method1915(ClientPacket.field304, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortLE(Client.field220); + var9.packetBuffer.writeIntLE16(var1); + var9.packetBuffer.writeShortLE(Client.field157); + var9.packetBuffer.method64(var0); + var9.packetBuffer.writeInt(ServerBuild.field788); + var9.packetBuffer.method64(var13.itemId); + Client.packetWriter.method241(var9); } - break label921; + break label415; } - if(opcode == 1001) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + if (var2 == 1001) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = arg1; - Client.destinationY = arg2; - var8 = Interpreter.method1915(ClientPacket.__gs_cp, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(arg0); - var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0); - var8.packetBuffer.__bo_322(arg1 + class50.baseX); - var8.packetBuffer.__bx_323(GraphicsObject.baseY + arg2); - Client.packetWriter.__q_167(var8); - break label921; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = Interpreter.method1915(ClientPacket.field316, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method63(var0 + class50.baseX); + var8.packetBuffer.method64(GraphicsObject.baseY + var1); + Client.packetWriter.method241(var8); + break label415; } - if(opcode == 1002) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + if (var2 == 1002) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - var8 = Interpreter.method1915(ClientPacket.__gs_al, Client.packetWriter.isaacCipher); - var8.packetBuffer.__bo_322(arg0); - Client.packetWriter.__q_167(var8); - break label921; + var8 = Interpreter.method1915(ClientPacket.field258, Client.packetWriter.isaacCipher); + var8.packetBuffer.method63(var3); + Client.packetWriter.method241(var8); + break label415; } - if(opcode == 1003) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + if (var2 == 1003) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - var13 = Client.npcs[arg0]; - if(var13 != null) { - NpcDefinition var17 = var13.definition; - if(var17.transforms != null) { - var17 = var17.transform(); + var10 = Client.npcs[var3]; + if (var10 != null) { + NPCDefinition var16 = var10.definition; + if (var16.transforms != null) { + var16 = var16.transform(); } - if(var17 != null) { - var10 = Interpreter.method1915(ClientPacket.__gs_ar, Client.packetWriter.isaacCipher); - var10.packetBuffer.__bo_322(var17.id); - Client.packetWriter.__q_167(var10); + if (var16 != null) { + var12 = Interpreter.method1915(ClientPacket.field252, Client.packetWriter.isaacCipher); + var12.packetBuffer.method63(var16.id); + Client.packetWriter.method241(var12); } } - break label921; + break label415; } - if(opcode == 1004) { - Client.mouseCrossX = mouseX; - Client.mouseCrossY = mouseY; + if (var2 == 1004) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - var8 = Interpreter.method1915(ClientPacket.__gs_p, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(arg0); - Client.packetWriter.__q_167(var8); - break label921; + var8 = Interpreter.method1915(ClientPacket.field246, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShortLE(var3); + Client.packetWriter.method241(var8); + break label415; } - if(opcode == 1005) { - var16 = Huffman.getWidget(arg2); - if(var16 != null && var16.itemQuantities[arg1] >= 100000) { - WorldMapIcon1.method219(27, "", var16.itemQuantities[arg1] + " x " + Skills.getItemDefinition(arg0).name); + if (var2 == 1005) { + var13 = Huffman.getWidget(var1); + if (var13 != null && var13.itemQuantities[var0] >= 100000) { + WorldMapIcon1.method219(27, "", var13.itemQuantities[var0] + " x " + Skills.getItemDefinition(var3).name); } else { - var9 = Interpreter.method1915(ClientPacket.__gs_p, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortLE(arg0); - Client.packetWriter.__q_167(var9); + var9 = Interpreter.method1915(ClientPacket.field246, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortLE(var3); + Client.packetWriter.method241(var9); } - Client.__client_ju = 0; - BoundaryObject.__ej_jv = Huffman.getWidget(arg2); - Client.__client_jz = arg1; - break label921; + Client.field203 = 0; + BoundaryObject.field40 = Huffman.getWidget(var1); + Client.field204 = var0; + break label415; } - if(opcode != 1007) { - if(opcode == 1008 || opcode == 1011 || opcode == 1010 || opcode == 1009 || opcode == 1012) { - class60.worldMap0.menuAction(opcode, arg0, new TileLocation(arg1), new TileLocation(arg2)); + if (var2 != 1007) { + if (var2 == 1008 || var2 == 1011 || var2 == 1010 || var2 == 1009 || var2 == 1012) { + class60.worldMap0.menuAction(var2, var3, new TileLocation(var0), new TileLocation(var1)); } - break label921; + break label415; } } - var16 = class204.getWidgetChild(arg2, arg1); - if(var16 != null) { - class171.method3494(arg0, arg2, arg1, var16.itemId, target); + var13 = class204.getWidgetChild(var1, var0); + if (var13 != null) { + class171.method3494(var3, var1, var0, var13.itemId, var5); } } } @@ -1324,17 +1325,17 @@ public abstract class Actor extends Entity { } } - if(Client.isItemSelected != 0) { + if (Client.isItemSelected != 0) { Client.isItemSelected = 0; class22.method295(Huffman.getWidget(ServerPacket.selectedItemWidget)); } - if(Client.isSpellSelected) { + if (Client.isSpellSelected) { Player.method1281(); } - if(BoundaryObject.__ej_jv != null && Client.__client_ju == 0) { - class22.method295(BoundaryObject.__ej_jv); + if (BoundaryObject.field40 != null && Client.field203 == 0) { + class22.method295(BoundaryObject.field40); } } diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index 826dd5043d..da9442b259 100644 --- a/runescape-client/src/main/java/Animation.java +++ b/runescape-client/src/main/java/Animation.java @@ -7,13 +7,13 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Animation") public class Animation { @ObfuscatedName("m") - static int[] __dz_m; + static int[] field26; @ObfuscatedName("f") - static int[] __dz_f; + static int[] field27; @ObfuscatedName("q") - static int[] __dz_q; + static int[] field28; @ObfuscatedName("w") - static int[] __dz_w; + static int[] field29; @ObfuscatedName("o") @ObfuscatedSignature( signature = "Lek;" @@ -39,13 +39,6 @@ public class Animation { @Export("hasAlphaTransform") boolean hasAlphaTransform; - static { - __dz_m = new int[500]; - __dz_f = new int[500]; - __dz_q = new int[500]; - __dz_w = new int[500]; - } - @ObfuscatedSignature( signature = "([BLek;)V" ) @@ -63,55 +56,55 @@ public class Animation { var4.index = var5 + var3.index; int var8; - for(var8 = 0; var8 < var5; ++var8) { + for (var8 = 0; var8 < var5; ++var8) { int var9 = var3.readUnsignedByte(); - if(var9 > 0) { - if(this.skeleton.transformTypes[var8] != 0) { - for(int var10 = var8 - 1; var10 > var6; --var10) { - if(this.skeleton.transformTypes[var10] == 0) { - __dz_m[var7] = var10; - __dz_f[var7] = 0; - __dz_q[var7] = 0; - __dz_w[var7] = 0; + if (var9 > 0) { + if (this.skeleton.transformTypes[var8] != 0) { + for (int var10 = var8 - 1; var10 > var6; --var10) { + if (this.skeleton.transformTypes[var10] == 0) { + field26[var7] = var10; + field27[var7] = 0; + field28[var7] = 0; + field29[var7] = 0; ++var7; break; } } } - __dz_m[var7] = var8; + field26[var7] = var8; short var11 = 0; - if(this.skeleton.transformTypes[var8] == 3) { + if (this.skeleton.transformTypes[var8] == 3) { var11 = 128; } - if((var9 & 1) != 0) { - __dz_f[var7] = var4.__ab_306(); + if ((var9 & 1) != 0) { + field27[var7] = var4.method47(); } else { - __dz_f[var7] = var11; + field27[var7] = var11; } - if((var9 & 2) != 0) { - __dz_q[var7] = var4.__ab_306(); + if ((var9 & 2) != 0) { + field28[var7] = var4.method47(); } else { - __dz_q[var7] = var11; + field28[var7] = var11; } - if((var9 & 4) != 0) { - __dz_w[var7] = var4.__ab_306(); + if ((var9 & 4) != 0) { + field29[var7] = var4.method47(); } else { - __dz_w[var7] = var11; + field29[var7] = var11; } var6 = var8; ++var7; - if(this.skeleton.transformTypes[var8] == 5) { + if (this.skeleton.transformTypes[var8] == 5) { this.hasAlphaTransform = true; } } } - if(var1.length != var4.index) { + if (var1.length != var4.index) { throw new RuntimeException(); } else { this.transformCount = var7; @@ -120,13 +113,20 @@ public class Animation { this.transformYs = new int[var7]; this.transformZs = new int[var7]; - for(var8 = 0; var8 < var7; ++var8) { - this.transformSkeletonLabels[var8] = __dz_m[var8]; - this.transformXs[var8] = __dz_f[var8]; - this.transformYs[var8] = __dz_q[var8]; - this.transformZs[var8] = __dz_w[var8]; + for (var8 = 0; var8 < var7; ++var8) { + this.transformSkeletonLabels[var8] = field26[var8]; + this.transformXs[var8] = field27[var8]; + this.transformYs[var8] = field28[var8]; + this.transformZs[var8] = field29[var8]; } } } + + static { + field26 = new int[500]; + field27 = new int[500]; + field28 = new int[500]; + field29 = new int[500]; + } } diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index 49787eda2c..2f393def77 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -33,10 +33,11 @@ public enum AttackOption implements Enumerated { ) @Export("AttackOption_hidden") AttackOption_hidden(3); + @ObfuscatedName("sp") - static short[] __cj_sp; + static short[] field30; @ObfuscatedName("ay") - static String __cj_ay; + static String field31; @ObfuscatedName("bo") @ObfuscatedSignature( signature = "[Llq;" @@ -50,7 +51,7 @@ public enum AttackOption implements Enumerated { @Export("id") final int id; - AttackOption(int var3) { + private AttackOption(int var3) { this.id = var3; } @@ -88,57 +89,57 @@ public enum AttackOption implements Enumerated { byte var7 = 0; byte var8 = 0; - while(var5 - var7 < var3 || var6 - var8 < var4) { - if(var5 - var7 >= var3) { + while (var5 - var7 < var3 || var6 - var8 < var4) { + if (var5 - var7 >= var3) { return -1; } - if(var6 - var8 >= var4) { + if (var6 - var8 >= var4) { return 1; } char var9; - if(var7 != 0) { + if (var7 != 0) { var9 = (char)var7; - boolean var14 = false; + boolean var10 = false; } else { var9 = var0.charAt(var5++); } - char var10; - if(var8 != 0) { - var10 = (char)var8; - boolean var15 = false; + char var14; + if (var8 != 0) { + var14 = (char)var8; + boolean var11 = false; } else { - var10 = var1.charAt(var6++); + var14 = var1.charAt(var6++); } - byte var11; - if(var9 == 198) { - var11 = 69; - } else if(var9 == 230) { - var11 = 101; - } else if(var9 == 223) { - var11 = 115; - } else if(var9 == 338) { - var11 = 69; - } else if(var9 == 339) { - var11 = 101; + byte var16; + if (var9 == 198) { + var16 = 69; + } else if (var9 == 230) { + var16 = 101; + } else if (var9 == 223) { + var16 = 115; + } else if (var9 == 338) { + var16 = 69; + } else if (var9 == 339) { + var16 = 101; } else { - var11 = 0; + var16 = 0; } - var7 = var11; + var7 = var16; byte var12; - if(var10 == 198) { + if (var14 == 198) { var12 = 69; - } else if(var10 == 230) { + } else if (var14 == 230) { var12 = 101; - } else if(var10 == 223) { + } else if (var14 == 223) { var12 = 115; - } else if(var10 == 338) { + } else if (var14 == 338) { var12 = 69; - } else if(var10 == 339) { + } else if (var14 == 339) { var12 = 101; } else { var12 = 0; @@ -146,41 +147,41 @@ public enum AttackOption implements Enumerated { var8 = var12; var9 = class12.method155(var9, var2); - var10 = class12.method155(var10, var2); - if(var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { + var14 = class12.method155(var14, var2); + if (var9 != var14 && Character.toUpperCase(var9) != Character.toUpperCase(var14)) { var9 = Character.toLowerCase(var9); - var10 = Character.toLowerCase(var10); - if(var10 != var9) { - return CollisionMap.method3631(var9, var2) - CollisionMap.method3631(var10, var2); + var14 = Character.toLowerCase(var14); + if (var14 != var9) { + return CollisionMap.method3631(var9, var2) - CollisionMap.method3631(var14, var2); } } } - int var16 = Math.min(var3, var4); + int var15 = Math.min(var3, var4); int var17; - char var20; - for(var17 = 0; var17 < var16; ++var17) { - char var18 = var0.charAt(var17); - var20 = var1.charAt(var17); - if(var20 != var18 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) { + char var18; + for (var17 = 0; var17 < var15; ++var17) { + char var19 = var0.charAt(var17); + var18 = var1.charAt(var17); + if (var18 != var19 && Character.toUpperCase(var19) != Character.toUpperCase(var18)) { + var19 = Character.toLowerCase(var19); var18 = Character.toLowerCase(var18); - var20 = Character.toLowerCase(var20); - if(var18 != var20) { - return CollisionMap.method3631(var18, var2) - CollisionMap.method3631(var20, var2); + if (var19 != var18) { + return CollisionMap.method3631(var19, var2) - CollisionMap.method3631(var18, var2); } } } var17 = var3 - var4; - if(var17 != 0) { + if (var17 != 0) { return var17; } else { - for(int var19 = 0; var19 < var16; ++var19) { - var20 = var0.charAt(var19); - char var13 = var1.charAt(var19); - if(var20 != var13) { - return CollisionMap.method3631(var20, var2) - CollisionMap.method3631(var13, var2); + for (int var20 = 0; var20 < var15; ++var20) { + var18 = var0.charAt(var20); + char var13 = var1.charAt(var20); + if (var18 != var13) { + return CollisionMap.method3631(var18, var2) - CollisionMap.method3631(var13, var2); } } @@ -201,15 +202,14 @@ public enum AttackOption implements Enumerated { class168.randomDat.readFill(var0); int var1; - for(var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { - ; + for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { } - if(var1 >= 24) { + if (var1 >= 24) { throw new IOException(); } - } catch (Exception var4) { - for(int var2 = 0; var2 < 24; ++var2) { + } catch (Exception var3) { + for (int var2 = 0; var2 < 24; ++var2) { var0[var2] = -1; } } diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index 4c84f460d0..660e6931f5 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,92 +6,92 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("AudioFilter") public class AudioFilter { @ObfuscatedName("u") - static float[][] __di_u; + static float[][] field32; @ObfuscatedName("g") - static int[][] __di_g; + static int[][] field33; @ObfuscatedName("l") - static float __di_l; + static float field34; @ObfuscatedName("e") - static int __di_e; + static int field35; @ObfuscatedName("m") - int[] __m; + int[] field36; @ObfuscatedName("q") - int[][][] __q; + int[][][] field37; @ObfuscatedName("w") - int[][][] __w; + int[][][] field38; @ObfuscatedName("o") - int[] __o; - - static { - __di_u = new float[2][8]; - __di_g = new int[2][8]; - } + int[] field39; AudioFilter() { - this.__m = new int[2]; - this.__q = new int[2][2][4]; - this.__w = new int[2][2][4]; - this.__o = new int[2]; + this.field36 = new int[2]; + this.field37 = new int[2][2][4]; + this.field38 = new int[2][2][4]; + this.field39 = new int[2]; } @ObfuscatedName("m") - float __m_205(int var1, int var2, float var3) { - float var4 = (float)this.__w[var1][0][var2] + var3 * (float)(this.__w[var1][1][var2] - this.__w[var1][0][var2]); + float method24(int var1, int var2, float var3) { + float var4 = (float)this.field38[var1][0][var2] + var3 * (float)(this.field38[var1][1][var2] - this.field38[var1][0][var2]); var4 *= 0.0015258789F; return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); } @ObfuscatedName("q") - float __q_206(int var1, int var2, float var3) { - float var4 = (float)this.__q[var1][0][var2] + var3 * (float)(this.__q[var1][1][var2] - this.__q[var1][0][var2]); + float method25(int var1, int var2, float var3) { + float var4 = (float)this.field37[var1][0][var2] + var3 * (float)(this.field37[var1][1][var2] - this.field37[var1][0][var2]); var4 *= 1.2207031E-4F; return method2646(var4); } @ObfuscatedName("w") - int __w_207(int var1, float var2) { + int method26(int var1, float var2) { float var3; - if(var1 == 0) { - var3 = (float)this.__o[0] + (float)(this.__o[1] - this.__o[0]) * var2; + if (var1 == 0) { + var3 = (float)this.field39[0] + (float)(this.field39[1] - this.field39[0]) * var2; var3 *= 0.0030517578F; - __di_l = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); - __di_e = (int)(__di_l * 65536.0F); + field34 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); + field35 = (int)(field34 * 65536.0F); } - if(this.__m[var1] == 0) { + if (this.field36[var1] == 0) { return 0; } else { - var3 = this.__m_205(var1, 0, var2); - __di_u[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.__q_206(var1, 0, var2)); - __di_u[var1][1] = var3 * var3; + var3 = this.method24(var1, 0, var2); + field32[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method25(var1, 0, var2)); + field32[var1][1] = var3 * var3; + float[] var10000; int var4; - for(var4 = 1; var4 < this.__m[var1]; ++var4) { - var3 = this.__m_205(var1, var4, var2); - float var5 = -2.0F * var3 * (float)Math.cos((double)this.__q_206(var1, var4, var2)); + for (var4 = 1; var4 < this.field36[var1]; ++var4) { + var3 = this.method24(var1, var4, var2); + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method25(var1, var4, var2)); float var6 = var3 * var3; - __di_u[var1][var4 * 2 + 1] = __di_u[var1][var4 * 2 - 1] * var6; - __di_u[var1][var4 * 2] = __di_u[var1][var4 * 2 - 1] * var5 + __di_u[var1][var4 * 2 - 2] * var6; + field32[var1][var4 * 2 + 1] = field32[var1][var4 * 2 - 1] * var6; + field32[var1][var4 * 2] = field32[var1][var4 * 2 - 1] * var5 + field32[var1][var4 * 2 - 2] * var6; - for(int var7 = var4 * 2 - 1; var7 >= 2; --var7) { - __di_u[var1][var7] += __di_u[var1][var7 - 1] * var5 + __di_u[var1][var7 - 2] * var6; + for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { + var10000 = field32[var1]; + var10000[var7] += field32[var1][var7 - 1] * var5 + field32[var1][var7 - 2] * var6; } - __di_u[var1][1] += __di_u[var1][0] * var5 + var6; - __di_u[var1][0] += var5; + var10000 = field32[var1]; + var10000[1] += field32[var1][0] * var5 + var6; + var10000 = field32[var1]; + var10000[0] += var5; } - if(var1 == 0) { - for(var4 = 0; var4 < this.__m[0] * 2; ++var4) { - __di_u[0][var4] *= __di_l; + if (var1 == 0) { + for (var4 = 0; var4 < this.field36[0] * 2; ++var4) { + var10000 = field32[0]; + var10000[var4] *= field34; } } - for(var4 = 0; var4 < this.__m[var1] * 2; ++var4) { - __di_g[var1][var4] = (int)(__di_u[var1][var4] * 65536.0F); + for (var4 = 0; var4 < this.field36[var1] * 2; ++var4) { + field33[var1][var4] = (int)(field32[var1][var4] * 65536.0F); } - return this.__m[var1] * 2; + return this.field36[var1] * 2; } } @@ -100,42 +99,42 @@ public class AudioFilter { @ObfuscatedSignature( signature = "(Lgr;Lde;)V" ) - final void __o_208(Buffer var1, SoundEnvelope var2) { + final void method27(Buffer var1, SoundEnvelope var2) { int var3 = var1.readUnsignedByte(); - this.__m[0] = var3 >> 4; - this.__m[1] = var3 & 15; - if(var3 != 0) { - this.__o[0] = var1.__ag_302(); - this.__o[1] = var1.__ag_302(); + this.field36[0] = var3 >> 4; + this.field36[1] = var3 & 15; + if (var3 != 0) { + this.field39[0] = var1.method43(); + this.field39[1] = var1.method43(); int var4 = var1.readUnsignedByte(); int var5; int var6; - for(var5 = 0; var5 < 2; ++var5) { - for(var6 = 0; var6 < this.__m[var5]; ++var6) { - this.__q[var5][0][var6] = var1.__ag_302(); - this.__w[var5][0][var6] = var1.__ag_302(); + for (var5 = 0; var5 < 2; ++var5) { + for (var6 = 0; var6 < this.field36[var5]; ++var6) { + this.field37[var5][0][var6] = var1.method43(); + this.field38[var5][0][var6] = var1.method43(); } } - for(var5 = 0; var5 < 2; ++var5) { - for(var6 = 0; var6 < this.__m[var5]; ++var6) { - if((var4 & 1 << var5 * 4 << var6) != 0) { - this.__q[var5][1][var6] = var1.__ag_302(); - this.__w[var5][1][var6] = var1.__ag_302(); + for (var5 = 0; var5 < 2; ++var5) { + for (var6 = 0; var6 < this.field36[var5]; ++var6) { + if ((var4 & 1 << var5 * 4 << var6) != 0) { + this.field37[var5][1][var6] = var1.method43(); + this.field38[var5][1][var6] = var1.method43(); } else { - this.__q[var5][1][var6] = this.__q[var5][0][var6]; - this.__w[var5][1][var6] = this.__w[var5][0][var6]; + this.field37[var5][1][var6] = this.field37[var5][0][var6]; + this.field38[var5][1][var6] = this.field38[var5][0][var6]; } } } - if(var4 != 0 || this.__o[1] != this.__o[0]) { + if (var4 != 0 || this.field39[1] != this.field39[0]) { var2.decodeSegments(var1); } } else { - int[] var7 = this.__o; - this.__o[1] = 0; + int[] var7 = this.field39; + this.field39[1] = 0; var7[0] = 0; } @@ -146,4 +145,9 @@ public class AudioFilter { float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); return var1 * 3.1415927F / 11025.0F; } + + static { + field32 = new float[2][8]; + field33 = new int[2][8]; + } } diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index 8c65d3323a..f648c7a322 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -11,7 +11,7 @@ public final class BoundaryObject { @ObfuscatedSignature( signature = "Lho;" ) - static Widget __ej_jv; + static Widget field40; @ObfuscatedName("m") @ObfuscatedGetter( intValue = -9307913 @@ -79,57 +79,57 @@ public final class BoundaryObject { ) @Export("doCheat") static final void doCheat(String var0) { - if(var0.equalsIgnoreCase("toggleroof")) { + if (var0.equalsIgnoreCase("toggleroof")) { ReflectionCheck.clientPreferences.roofsHidden = !ReflectionCheck.clientPreferences.roofsHidden; WorldMapSection0.savePreferences(); - if(ReflectionCheck.clientPreferences.roofsHidden) { + if (ReflectionCheck.clientPreferences.roofsHidden) { WorldMapIcon1.method219(99, "", "Roofs are now all hidden"); } else { WorldMapIcon1.method219(99, "", "Roofs will only be removed selectively"); } } - if(var0.equalsIgnoreCase("displayfps")) { + if (var0.equalsIgnoreCase("displayfps")) { Client.displayFps = !Client.displayFps; } - if(var0.equalsIgnoreCase("renderself")) { + if (var0.equalsIgnoreCase("renderself")) { Client.renderSelf = !Client.renderSelf; } - if(var0.equalsIgnoreCase("mouseovertext")) { + if (var0.equalsIgnoreCase("mouseovertext")) { Client.showMouseOverText = !Client.showMouseOverText; } - if(Client.rights >= 2) { - if(var0.equalsIgnoreCase("errortest")) { + if (Client.rights >= 2) { + if (var0.equalsIgnoreCase("errortest")) { throw new RuntimeException(); } - if(var0.equalsIgnoreCase("showcoord")) { + if (var0.equalsIgnoreCase("showcoord")) { class60.worldMap0.showCoord = !class60.worldMap0.showCoord; } - if(var0.equalsIgnoreCase("fpson")) { + if (var0.equalsIgnoreCase("fpson")) { Client.displayFps = true; } - if(var0.equalsIgnoreCase("fpsoff")) { + if (var0.equalsIgnoreCase("fpsoff")) { Client.displayFps = false; } - if(var0.equalsIgnoreCase("gc")) { + if (var0.equalsIgnoreCase("gc")) { System.gc(); } - if(var0.equalsIgnoreCase("clientdrop")) { + if (var0.equalsIgnoreCase("clientdrop")) { class48.method868(); } } - PacketBufferNode var1 = Interpreter.method1915(ClientPacket.__gs_bo, Client.packetWriter.isaacCipher); + PacketBufferNode var1 = Interpreter.method1915(ClientPacket.field282, Client.packetWriter.isaacCipher); var1.packetBuffer.writeByte(var0.length() + 1); var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.__q_167(var1); + Client.packetWriter.method241(var1); } } diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index 45b2743682..28eb923bce 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,26 +10,26 @@ public class Bounds { @ObfuscatedGetter( intValue = -2004088829 ) - public int __m; + public int field41; @ObfuscatedName("f") @ObfuscatedGetter( intValue = -1887298731 ) - public int __f; + public int field42; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 2001187823 ) - public int __q; + public int field43; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 1377856837 ) - public int __w; + public int field44; public Bounds(int var1, int var2, int var3, int var4) { - this.__m_487(var1, var2); - this.__f_488(var3, var4); + this.method28(var1, var2); + this.method29(var3, var4); } public Bounds(int var1, int var2) { @@ -42,9 +41,9 @@ public class Bounds { signature = "(IIB)V", garbageValue = "1" ) - public void __m_487(int var1, int var2) { - this.__m = var1; - this.__f = var2; + public void method28(int var1, int var2) { + this.field41 = var1; + this.field42 = var2; } @ObfuscatedName("f") @@ -52,9 +51,9 @@ public class Bounds { signature = "(III)V", garbageValue = "-11269827" ) - public void __f_488(int var1, int var2) { - this.__q = var1; - this.__w = var2; + public void method29(int var1, int var2) { + this.field43 = var1; + this.field44 = var2; } @ObfuscatedName("q") @@ -62,9 +61,9 @@ public class Bounds { signature = "(Lla;Lla;I)V", garbageValue = "-2123792170" ) - public void __q_490(Bounds var1, Bounds var2) { - this.__w_491(var1, var2); - this.__o_492(var1, var2); + public void method30(Bounds var1, Bounds var2) { + this.method31(var1, var2); + this.method32(var1, var2); } @ObfuscatedName("w") @@ -72,20 +71,20 @@ public class Bounds { signature = "(Lla;Lla;I)V", garbageValue = "314675149" ) - void __w_491(Bounds var1, Bounds var2) { - var2.__m = this.__m; - var2.__q = this.__q; - if(this.__m < var1.__m) { - var2.__q -= var1.__m - this.__m; - var2.__m = var1.__m; + void method31(Bounds var1, Bounds var2) { + var2.field41 = this.field41; + var2.field43 = this.field43; + if (this.field41 < var1.field41) { + var2.field43 -= var1.field41 - this.field41; + var2.field41 = var1.field41; } - if(var2.__u_493() > var1.__u_493()) { - var2.__q -= var2.__u_493() - var1.__u_493(); + if (var2.method33() > var1.method33()) { + var2.field43 -= var2.method33() - var1.method33(); } - if(var2.__q < 0) { - var2.__q = 0; + if (var2.field43 < 0) { + var2.field43 = 0; } } @@ -95,20 +94,20 @@ public class Bounds { signature = "(Lla;Lla;S)V", garbageValue = "128" ) - void __o_492(Bounds var1, Bounds var2) { - var2.__f = this.__f; - var2.__w = this.__w; - if(this.__f < var1.__f) { - var2.__w -= var1.__f - this.__f; - var2.__f = var1.__f; + void method32(Bounds var1, Bounds var2) { + var2.field42 = this.field42; + var2.field44 = this.field44; + if (this.field42 < var1.field42) { + var2.field44 -= var1.field42 - this.field42; + var2.field42 = var1.field42; } - if(var2.__g_494() > var1.__g_494()) { - var2.__w -= var2.__g_494() - var1.__g_494(); + if (var2.method34() > var1.method34()) { + var2.field44 -= var2.method34() - var1.method34(); } - if(var2.__w < 0) { - var2.__w = 0; + if (var2.field44 < 0) { + var2.field44 = 0; } } @@ -118,8 +117,8 @@ public class Bounds { signature = "(I)I", garbageValue = "-1842151293" ) - int __u_493() { - return this.__m + this.__q; + int method33() { + return this.field41 + this.field43; } @ObfuscatedName("g") @@ -127,12 +126,12 @@ public class Bounds { signature = "(B)I", garbageValue = "-22" ) - int __g_494() { - return this.__f + this.__w; + int method34() { + return this.field42 + this.field44; } @ObfuscatedName("toString") - public String __toString_489() { + public String method35() { return null; } @@ -146,11 +145,11 @@ public class Bounds { double[] var6 = new double[var5]; int var7 = -var4; - for(int var8 = 0; var7 <= var4; ++var8) { - double var15 = ((double)var7 - var0) / var2; - double var13 = Math.exp(-var15 * var15 / 2.0D) / Math.sqrt(6.283185307179586D); - double var11 = var13 / var2; - var6[var8] = var11; + for (int var8 = 0; var7 <= var4; ++var8) { + double var9 = ((double)var7 - var0) / var2; + double var11 = Math.exp(-var9 * var9 / 2.0D) / Math.sqrt(6.283185307179586D); + double var13 = var11 / var2; + var6[var8] = var13; ++var7; } diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index 42a54d7e6b..a676800453 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -71,22 +71,22 @@ public class Buddy extends User { int[] var0 = Players.Players_indices; int var1; - for(var1 = 0; var1 < Players.Players_count; ++var1) { + for (var1 = 0; var1 < Players.Players_count; ++var1) { Player var2 = Client.players[var0[var1]]; - if(var2 != null && var2.overheadTextCyclesRemaining > 0) { + if (var2 != null && var2.overheadTextCyclesRemaining > 0) { --var2.overheadTextCyclesRemaining; - if(var2.overheadTextCyclesRemaining == 0) { + if (var2.overheadTextCyclesRemaining == 0) { var2.overheadText = null; } } } - for(var1 = 0; var1 < Client.npcCount; ++var1) { + for (var1 = 0; var1 < Client.npcCount; ++var1) { int var4 = Client.npcIndices[var1]; - Npc var3 = Client.npcs[var4]; - if(var3 != null && var3.overheadTextCyclesRemaining > 0) { + NPC var3 = Client.npcs[var4]; + if (var3 != null && var3.overheadTextCyclesRemaining > 0) { --var3.overheadTextCyclesRemaining; - if(var3.overheadTextCyclesRemaining == 0) { + if (var3.overheadTextCyclesRemaining == 0) { var3.overheadText = null; } } diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index c711dc32c1..0c263a1b47 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -9,9 +9,9 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Buffer") public class Buffer extends Node { @ObfuscatedName("q") - static int[] __gr_q; + static int[] field45; @ObfuscatedName("o") - static long[] __gr_o; + static long[] field46; @ObfuscatedName("m") @Export("array") public byte[] array; @@ -22,42 +22,6 @@ public class Buffer extends Node { @Export("index") public int index; - static { - __gr_q = new int[256]; - - int var2; - for(int var1 = 0; var1 < 256; ++var1) { - int var0 = var1; - - for(var2 = 0; var2 < 8; ++var2) { - if((var0 & 1) == 1) { - var0 = var0 >>> 1 ^ -306674912; - } else { - var0 >>>= 1; - } - } - - __gr_q[var1] = var0; - } - - __gr_o = new long[256]; - - for(var2 = 0; var2 < 256; ++var2) { - long var4 = (long)var2; - - for(int var3 = 0; var3 < 8; ++var3) { - if((var4 & 1L) == 1L) { - var4 = var4 >>> 1 ^ -3932672073523589310L; - } else { - var4 >>>= 1; - } - } - - __gr_o[var2] = var4; - } - - } - public Buffer(int var1) { this.array = Canvas.method862(var1); this.index = 0; @@ -73,8 +37,8 @@ public class Buffer extends Node { signature = "(S)V", garbageValue = "13572" ) - public void __f_295() { - if(this.array != null) { + public void method36() { + if (this.array != null) { VertexNormal.method2984(this.array); } @@ -158,7 +122,7 @@ public class Buffer extends Node { ) @Export("writeBoolean") public void writeBoolean(boolean var1) { - this.writeByte(var1?1:0); + this.writeByte(var1 ? 1 : 0); } @ObfuscatedName("d") @@ -169,7 +133,7 @@ public class Buffer extends Node { @Export("writeStringCp1252NullTerminated") public void writeStringCp1252NullTerminated(String var1) { int var2 = var1.indexOf(0); - if(var2 >= 0) { + if (var2 >= 0) { throw new IllegalArgumentException(""); } else { this.index += SoundCache.encodeStringCp1252(var1, 0, var1.length(), this.array, this.index); @@ -185,7 +149,7 @@ public class Buffer extends Node { @Export("writeStringCp1252NullCircumfixed") public void writeStringCp1252NullCircumfixed(String var1) { int var2 = var1.indexOf(0); - if(var2 >= 0) { + if (var2 >= 0) { throw new IllegalArgumentException(""); } else { this.array[++this.index - 1] = 0; @@ -199,23 +163,23 @@ public class Buffer extends Node { signature = "(Ljava/lang/CharSequence;B)V", garbageValue = "58" ) - public void __j_296(CharSequence var1) { - int var3 = var1.length(); - int var4 = 0; + public void method37(CharSequence var1) { + int var2 = var1.length(); + int var3 = 0; - for(int var5 = 0; var5 < var3; ++var5) { - char var6 = var1.charAt(var5); - if(var6 <= 127) { - ++var4; - } else if(var6 <= 2047) { - var4 += 2; + for (int var4 = 0; var4 < var2; ++var4) { + char var5 = var1.charAt(var4); + if (var5 <= 127) { + ++var3; + } else if (var5 <= 2047) { + var3 += 2; } else { - var4 += 3; + var3 += 3; } } this.array[++this.index - 1] = 0; - this.__c_301(var4); + this.method42(var3); this.index += class16.method190(this.array, this.index, var1); } @@ -224,8 +188,8 @@ public class Buffer extends Node { signature = "([BIII)V", garbageValue = "-1915344405" ) - public void __s_297(byte[] var1, int var2, int var3) { - for(int var4 = var2; var4 < var3 + var2; ++var4) { + public void method38(byte[] var1, int var2, int var3) { + for (int var4 = var2; var4 < var3 + var2; ++var4) { this.array[++this.index - 1] = var1[var4]; } @@ -236,7 +200,7 @@ public class Buffer extends Node { signature = "(II)V", garbageValue = "-225163682" ) - public void __t_298(int var1) { + public void method39(int var1) { this.array[this.index - var1 - 4] = (byte)(var1 >> 24); this.array[this.index - var1 - 3] = (byte)(var1 >> 16); this.array[this.index - var1 - 2] = (byte)(var1 >> 8); @@ -248,7 +212,7 @@ public class Buffer extends Node { signature = "(II)V", garbageValue = "-1298210761" ) - public void __y_299(int var1) { + public void method40(int var1) { this.array[this.index - var1 - 2] = (byte)(var1 >> 8); this.array[this.index - var1 - 1] = (byte)var1; } @@ -258,7 +222,7 @@ public class Buffer extends Node { signature = "(II)V", garbageValue = "-1839722163" ) - public void __h_300(int var1) { + public void method41(int var1) { this.array[this.index - var1 - 1] = (byte)var1; } @@ -269,13 +233,16 @@ public class Buffer extends Node { ) @Export("writeSmartByteShort") public void writeSmartByteShort(int var1) { - if(var1 >= 0 && var1 < 128) { + if (var1 >= 0 && var1 < 128) { this.writeByte(var1); - } else if(var1 >= 0 && var1 < 32768) { - this.writeShort(var1 + 32768); } else { - throw new IllegalArgumentException(); + if (var1 < 0 || var1 >= 32768) { + throw new IllegalArgumentException(); + } + + this.writeShort(var1 + 32768); } + } @ObfuscatedName("c") @@ -283,11 +250,11 @@ public class Buffer extends Node { signature = "(II)V", garbageValue = "820873705" ) - public void __c_301(int var1) { - if((var1 & -128) != 0) { - if((var1 & -16384) != 0) { - if((var1 & -2097152) != 0) { - if((var1 & -268435456) != 0) { + public void method42(int var1) { + if ((var1 & -128) != 0) { + if ((var1 & -16384) != 0) { + if ((var1 & -2097152) != 0) { + if ((var1 & -268435456) != 0) { this.writeByte(var1 >>> 28 | 128); } @@ -328,7 +295,7 @@ public class Buffer extends Node { signature = "(B)I", garbageValue = "-86" ) - public int __ag_302() { + public int method43() { this.index += 2; return (this.array[this.index - 1] & 255) + ((this.array[this.index - 2] & 255) << 8); } @@ -338,10 +305,10 @@ public class Buffer extends Node { signature = "(B)I", garbageValue = "1" ) - public int __aq_303() { + public int method44() { this.index += 2; int var1 = (this.array[this.index - 1] & 255) + ((this.array[this.index - 2] & 255) << 8); - if(var1 > 32767) { + if (var1 > 32767) { var1 -= 65536; } @@ -399,7 +366,7 @@ public class Buffer extends Node { ) @Export("readStringCp1252NullTerminatedOrNull") public String readStringCp1252NullTerminatedOrNull() { - if(this.array[this.index] == 0) { + if (this.array[this.index] == 0) { ++this.index; return null; } else { @@ -416,12 +383,11 @@ public class Buffer extends Node { public String readStringCp1252NullTerminated() { int var1 = this.index; - while(this.array[++this.index - 1] != 0) { - ; + while (this.array[++this.index - 1] != 0) { } int var2 = this.index - var1 - 1; - return var2 == 0?"":WidgetGroupParent.decodeStringCp1252(this.array, var1, var2); + return var2 == 0 ? "" : WidgetGroupParent.decodeStringCp1252(this.array, var1, var2); } @ObfuscatedName("ak") @@ -432,17 +398,16 @@ public class Buffer extends Node { @Export("readStringCp1252NullCircumfixed") public String readStringCp1252NullCircumfixed() { byte var1 = this.array[++this.index - 1]; - if(var1 != 0) { + if (var1 != 0) { throw new IllegalStateException(""); } else { int var2 = this.index; - while(this.array[++this.index - 1] != 0) { - ; + while (this.array[++this.index - 1] != 0) { } int var3 = this.index - var2 - 1; - return var3 == 0?"":WidgetGroupParent.decodeStringCp1252(this.array, var2, var3); + return var3 == 0 ? "" : WidgetGroupParent.decodeStringCp1252(this.array, var2, var3); } } @@ -451,69 +416,69 @@ public class Buffer extends Node { signature = "(B)Ljava/lang/String;", garbageValue = "-14" ) - public String __aw_304() { + public String method45() { byte var1 = this.array[++this.index - 1]; - if(var1 != 0) { + if (var1 != 0) { throw new IllegalStateException(""); } else { - int var2 = this.__as_311(); - if(var2 + this.index > this.array.length) { + int var2 = this.method52(); + if (var2 + this.index > this.array.length) { throw new IllegalStateException(""); } else { - byte[] var4 = this.array; - int var5 = this.index; - char[] var6 = new char[var2]; - int var7 = 0; - int var8 = var5; + byte[] var3 = this.array; + int var4 = this.index; + char[] var5 = new char[var2]; + int var6 = 0; + int var7 = var4; - int var11; - for(int var9 = var5 + var2; var8 < var9; var6[var7++] = (char)var11) { - int var10 = var4[var8++] & 255; - if(var10 < 128) { - if(var10 == 0) { - var11 = 65533; + int var8; + for (int var9 = var4 + var2; var7 < var9; var5[var6++] = (char)var8) { + int var10 = var3[var7++] & 255; + if (var10 < 128) { + if (var10 == 0) { + var8 = 65533; } else { - var11 = var10; + var8 = var10; } - } else if(var10 < 192) { - var11 = 65533; - } else if(var10 < 224) { - if(var8 < var9 && (var4[var8] & 192) == 128) { - var11 = (var10 & 31) << 6 | var4[var8++] & 63; - if(var11 < 128) { - var11 = 65533; + } else if (var10 < 192) { + var8 = 65533; + } else if (var10 < 224) { + if (var7 < var9 && (var3[var7] & 192) == 128) { + var8 = (var10 & 31) << 6 | var3[var7++] & 63; + if (var8 < 128) { + var8 = 65533; } } else { - var11 = 65533; + var8 = 65533; } - } else if(var10 < 240) { - if(var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { - var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; - if(var11 < 2048) { - var11 = 65533; + } else if (var10 < 240) { + if (var7 + 1 < var9 && (var3[var7] & 192) == 128 && (var3[var7 + 1] & 192) == 128) { + var8 = (var10 & 15) << 12 | (var3[var7++] & 63) << 6 | var3[var7++] & 63; + if (var8 < 2048) { + var8 = 65533; } } else { - var11 = 65533; + var8 = 65533; } - } else if(var10 < 248) { - if(var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { - var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; - if(var11 >= 65536 && var11 <= 1114111) { - var11 = 65533; + } else if (var10 < 248) { + if (var7 + 2 < var9 && (var3[var7] & 192) == 128 && (var3[var7 + 1] & 192) == 128 && (var3[var7 + 2] & 192) == 128) { + var8 = (var10 & 7) << 18 | (var3[var7++] & 63) << 12 | (var3[var7++] & 63) << 6 | var3[var7++] & 63; + if (var8 >= 65536 && var8 <= 1114111) { + var8 = 65533; } else { - var11 = 65533; + var8 = 65533; } } else { - var11 = 65533; + var8 = 65533; } } else { - var11 = 65533; + var8 = 65533; } } - String var3 = new String(var6, 0, var7); + String var11 = new String(var5, 0, var6); this.index += var2; - return var3; + return var11; } } } @@ -523,8 +488,8 @@ public class Buffer extends Node { signature = "([BIIB)V", garbageValue = "-122" ) - public void __al_305(byte[] var1, int var2, int var3) { - for(int var4 = var2; var4 < var3 + var2; ++var4) { + public void method46(byte[] var1, int var2, int var3) { + for (int var4 = var2; var4 < var3 + var2; ++var4) { var1[var4] = this.array[++this.index - 1]; } @@ -535,9 +500,9 @@ public class Buffer extends Node { signature = "(B)I", garbageValue = "-24" ) - public int __ab_306() { + public int method47() { int var1 = this.array[this.index] & 255; - return var1 < 128?this.readUnsignedByte() - 64:this.__ag_302() - 49152; + return var1 < 128 ? this.readUnsignedByte() - 64 : this.method43() - 49152; } @ObfuscatedName("ae") @@ -545,9 +510,9 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "1370512869" ) - public int __ae_307() { + public int method48() { int var1 = this.array[this.index] & 255; - return var1 < 128?this.readUnsignedByte():this.__ag_302() - 32768; + return var1 < 128 ? this.readUnsignedByte() : this.method43() - 32768; } @ObfuscatedName("at") @@ -555,11 +520,11 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "1177684230" ) - public int __at_308() { + public int method49() { int var1 = 0; int var2; - for(var2 = this.__ae_307(); var2 == 32767; var2 = this.__ae_307()) { + for (var2 = this.method48(); var2 == 32767; var2 = this.method48()) { var1 += 32767; } @@ -572,8 +537,8 @@ public class Buffer extends Node { signature = "(B)I", garbageValue = "103" ) - public int __ad_309() { - return this.array[this.index] < 0?this.readInt() & Integer.MAX_VALUE:this.__ag_302(); + public int method50() { + return this.array[this.index] < 0 ? this.readInt() & Integer.MAX_VALUE : this.method43(); } @ObfuscatedName("ap") @@ -581,12 +546,12 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "-1151173205" ) - public int __ap_310() { - if(this.array[this.index] < 0) { + public int method51() { + if (this.array[this.index] < 0) { return this.readInt() & Integer.MAX_VALUE; } else { - int var1 = this.__ag_302(); - return var1 == 32767?-1:var1; + int var1 = this.method43(); + return var1 == 32767 ? -1 : var1; } } @@ -595,11 +560,11 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "984135559" ) - public int __as_311() { + public int method52() { byte var1 = this.array[++this.index - 1]; int var2; - for(var2 = 0; var1 < 0; var1 = this.array[++this.index - 1]) { + for (var2 = 0; var1 < 0; var1 = this.array[++this.index - 1]) { var2 = (var2 | var1 & 127) << 7; } @@ -616,13 +581,13 @@ public class Buffer extends Node { int var2 = this.index / 8; this.index = 0; - for(int var3 = 0; var3 < var2; ++var3) { + for (int var3 = 0; var3 < var2; ++var3) { int var4 = this.readInt(); int var5 = this.readInt(); int var6 = 0; int var7 = -1640531527; - for(int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { + for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; var6 += var7; } @@ -644,13 +609,13 @@ public class Buffer extends Node { int var2 = this.index / 8; this.index = 0; - for(int var3 = 0; var3 < var2; ++var3) { + for (int var3 = 0; var3 < var2; ++var3) { int var4 = this.readInt(); int var5 = this.readInt(); int var6 = -957401312; int var7 = -1640531527; - for(int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { + for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; var6 -= var7; } @@ -673,13 +638,13 @@ public class Buffer extends Node { this.index = var2; int var5 = (var3 - var2) / 8; - for(int var6 = 0; var6 < var5; ++var6) { + for (int var6 = 0; var6 < var5; ++var6) { int var7 = this.readInt(); int var8 = this.readInt(); int var9 = 0; int var10 = -1640531527; - for(int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { + for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; var9 += var10; } @@ -703,13 +668,13 @@ public class Buffer extends Node { this.index = var2; int var5 = (var3 - var2) / 8; - for(int var6 = 0; var6 < var5; ++var6) { + for (int var6 = 0; var6 < var5; ++var6) { int var7 = this.readInt(); int var8 = this.readInt(); int var9 = -957401312; int var10 = -1640531527; - for(int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { + for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; var9 -= var10; } @@ -732,13 +697,13 @@ public class Buffer extends Node { int var3 = this.index; this.index = 0; byte[] var4 = new byte[var3]; - this.__al_305(var4, 0, var3); + this.method46(var4, 0, var3); BigInteger var5 = new BigInteger(var4); BigInteger var6 = var5.modPow(var1, var2); byte[] var7 = var6.toByteArray(); this.index = 0; this.writeShort(var7.length); - this.__s_297(var7, 0, var7.length); + this.method38(var7, 0, var7.length); } @ObfuscatedName("aa") @@ -746,18 +711,18 @@ public class Buffer extends Node { signature = "(II)I", garbageValue = "-484928770" ) - public int __aa_312(int var1) { - byte[] var3 = this.array; - int var4 = this.index; - int var5 = -1; + public int method53(int var1) { + byte[] var2 = this.array; + int var3 = this.index; + int var4 = -1; - for(int var6 = var1; var6 < var4; ++var6) { - var5 = var5 >>> 8 ^ __gr_q[(var5 ^ var3[var6]) & 255]; + for (int var5 = var1; var5 < var3; ++var5) { + var4 = var4 >>> 8 ^ field45[(var4 ^ var2[var5]) & 255]; } - var5 = ~var5; - this.writeInt(var5); - return var5; + var4 = ~var4; + this.writeInt(var4); + return var4; } @ObfuscatedName("ax") @@ -765,20 +730,20 @@ public class Buffer extends Node { signature = "(B)Z", garbageValue = "-11" ) - public boolean __ax_313() { + public boolean method54() { this.index -= 4; - byte[] var2 = this.array; - int var3 = this.index; - int var4 = -1; + byte[] var1 = this.array; + int var2 = this.index; + int var3 = -1; - int var5; - for(var5 = 0; var5 < var3; ++var5) { - var4 = var4 >>> 8 ^ __gr_q[(var4 ^ var2[var5]) & 255]; + int var4; + for (var4 = 0; var4 < var2; ++var4) { + var3 = var3 >>> 8 ^ field45[(var3 ^ var1[var4]) & 255]; } - var4 = ~var4; - var5 = this.readInt(); - return var5 == var4; + var3 = ~var3; + var4 = this.readInt(); + return var4 == var3; } @ObfuscatedName("af") @@ -786,7 +751,7 @@ public class Buffer extends Node { signature = "(IB)V", garbageValue = "-47" ) - public void __af_314(int var1) { + public void method55(int var1) { this.array[++this.index - 1] = (byte)(var1 + 128); } @@ -795,7 +760,7 @@ public class Buffer extends Node { signature = "(II)V", garbageValue = "-1336494664" ) - public void __ai_315(int var1) { + public void method56(int var1) { this.array[++this.index - 1] = (byte)(0 - var1); } @@ -804,7 +769,7 @@ public class Buffer extends Node { signature = "(IB)V", garbageValue = "21" ) - public void __ba_316(int var1) { + public void method57(int var1) { this.array[++this.index - 1] = (byte)(128 - var1); } @@ -813,7 +778,7 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "-86972759" ) - public int __bb_317() { + public int method58() { return this.array[++this.index - 1] - 128 & 255; } @@ -832,7 +797,7 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "359814653" ) - public int __bq_318() { + public int method59() { return 128 - this.array[++this.index - 1] & 255; } @@ -841,7 +806,7 @@ public class Buffer extends Node { signature = "(I)B", garbageValue = "2130167320" ) - public byte __bn_319() { + public byte method60() { return (byte)(this.array[++this.index - 1] - 128); } @@ -850,7 +815,7 @@ public class Buffer extends Node { signature = "(I)B", garbageValue = "1415936818" ) - public byte __bk_320() { + public byte method61() { return (byte)(0 - this.array[++this.index - 1]); } @@ -859,7 +824,7 @@ public class Buffer extends Node { signature = "(I)B", garbageValue = "1496705333" ) - public byte __bd_321() { + public byte method62() { return (byte)(128 - this.array[++this.index - 1]); } @@ -879,7 +844,7 @@ public class Buffer extends Node { signature = "(II)V", garbageValue = "189694315" ) - public void __bo_322(int var1) { + public void method63(int var1) { this.array[++this.index - 1] = (byte)(var1 >> 8); this.array[++this.index - 1] = (byte)(var1 + 128); } @@ -889,7 +854,7 @@ public class Buffer extends Node { signature = "(IB)V", garbageValue = "-7" ) - public void __bx_323(int var1) { + public void method64(int var1) { this.array[++this.index - 1] = (byte)(var1 + 128); this.array[++this.index - 1] = (byte)(var1 >> 8); } @@ -899,7 +864,7 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "2147134369" ) - public int __by_324() { + public int method65() { this.index += 2; return ((this.array[this.index - 1] & 255) << 8) + (this.array[this.index - 2] & 255); } @@ -909,7 +874,7 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "-1489217204" ) - public int __bu_325() { + public int method66() { this.index += 2; return (this.array[this.index - 1] - 128 & 255) + ((this.array[this.index - 2] & 255) << 8); } @@ -919,7 +884,7 @@ public class Buffer extends Node { signature = "(B)I", garbageValue = "-86" ) - public int __bm_326() { + public int method67() { this.index += 2; return ((this.array[this.index - 1] & 255) << 8) + (this.array[this.index - 2] - 128 & 255); } @@ -929,10 +894,10 @@ public class Buffer extends Node { signature = "(B)I", garbageValue = "54" ) - public int __bl_327() { + public int method68() { this.index += 2; int var1 = ((this.array[this.index - 1] & 255) << 8) + (this.array[this.index - 2] & 255); - if(var1 > 32767) { + if (var1 > 32767) { var1 -= 65536; } @@ -944,10 +909,10 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "388487388" ) - public int __br_328() { + public int method69() { this.index += 2; int var1 = ((this.array[this.index - 1] & 255) << 8) + (this.array[this.index - 2] - 128 & 255); - if(var1 > 32767) { + if (var1 > 32767) { var1 -= 65536; } @@ -959,7 +924,7 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "-88751042" ) - public int __bj_329() { + public int method70() { this.index += 3; return (this.array[this.index - 3] & 255) + ((this.array[this.index - 2] & 255) << 8) + ((this.array[this.index - 1] & 255) << 16); } @@ -1008,7 +973,7 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "-1322860835" ) - public int __bt_330() { + public int method71() { this.index += 4; return (this.array[this.index - 4] & 255) + ((this.array[this.index - 3] & 255) << 8) + ((this.array[this.index - 2] & 255) << 16) + ((this.array[this.index - 1] & 255) << 24); } @@ -1018,7 +983,7 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "-1731171028" ) - public int __bp_331() { + public int method72() { this.index += 4; return ((this.array[this.index - 2] & 255) << 24) + ((this.array[this.index - 4] & 255) << 8) + (this.array[this.index - 3] & 255) + ((this.array[this.index - 1] & 255) << 16); } @@ -1028,7 +993,7 @@ public class Buffer extends Node { signature = "(B)I", garbageValue = "-126" ) - public int __bf_332() { + public int method73() { this.index += 4; return ((this.array[this.index - 1] & 255) << 8) + ((this.array[this.index - 4] & 255) << 16) + (this.array[this.index - 2] & 255) + ((this.array[this.index - 3] & 255) << 24); } @@ -1038,8 +1003,8 @@ public class Buffer extends Node { signature = "([BIII)V", garbageValue = "1303287859" ) - public void __bh_333(byte[] var1, int var2, int var3) { - for(int var4 = var2; var4 < var3 + var2; ++var4) { + public void method74(byte[] var1, int var2, int var3) { + for (int var4 = var2; var4 < var3 + var2; ++var4) { var1[var4] = (byte)(this.array[++this.index - 1] - 128); } @@ -1055,4 +1020,40 @@ public class Buffer extends Node { HealthBarDefinition.HealthBarDefinition_cached.clear(); HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); } + + static { + field45 = new int[256]; + + int var0; + for (int var1 = 0; var1 < 256; ++var1) { + int var2 = var1; + + for (var0 = 0; var0 < 8; ++var0) { + if ((var2 & 1) == 1) { + var2 = var2 >>> 1 ^ -306674912; + } else { + var2 >>>= 1; + } + } + + field45[var1] = var2; + } + + field46 = new long[256]; + + for (var0 = 0; var0 < 256; ++var0) { + long var4 = (long)var0; + + for (int var3 = 0; var3 < 8; ++var3) { + if ((var4 & 1L) == 1L) { + var4 = var4 >>> 1 ^ -3932672073523589310L; + } else { + var4 >>>= 1; + } + } + + field46[var0] = var4; + } + + } } diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index 5b4292d34b..e7385c68e3 100644 --- a/runescape-client/src/main/java/BufferedFile.java +++ b/runescape-client/src/main/java/BufferedFile.java @@ -23,12 +23,12 @@ public class BufferedFile { @ObfuscatedGetter( longValue = -7773729680030815835L ) - long __q; + long field47; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -846810907 ) - int __w; + int field48; @ObfuscatedName("o") @Export("writeBuffer") byte[] writeBuffer; @@ -36,22 +36,22 @@ public class BufferedFile { @ObfuscatedGetter( longValue = 5249231081498323007L ) - long __u; + long field49; @ObfuscatedName("g") @ObfuscatedGetter( intValue = -1558233611 ) - int __g; + int field50; @ObfuscatedName("l") @ObfuscatedGetter( longValue = -6819476051574242871L ) - long __l; + long field51; @ObfuscatedName("e") @ObfuscatedGetter( longValue = -3728247331531750871L ) - long __e; + long field52; @ObfuscatedName("x") @ObfuscatedGetter( longValue = 2663146692618913943L @@ -62,20 +62,20 @@ public class BufferedFile { @ObfuscatedGetter( longValue = 5720856138805191881L ) - long __d; + long field53; @ObfuscatedSignature( signature = "(Ldk;II)V" ) public BufferedFile(AccessFile var1, int var2, int var3) throws IOException { - this.__q = -1L; - this.__u = -1L; - this.__g = 0; + this.field47 = -1L; + this.field49 = -1L; + this.field50 = 0; this.accessFile = var1; - this.capacity = this.__e = var1.length(); + this.capacity = this.field52 = var1.length(); this.readBuffer = new byte[var2]; this.writeBuffer = new byte[var3]; - this.__l = 0L; + this.field51 = 0L; } @ObfuscatedName("m") @@ -92,10 +92,10 @@ public class BufferedFile { @ObfuscatedName("f") @Export("seek") public void seek(long var1) throws IOException { - if(var1 < 0L) { + if (var1 < 0L) { throw new IOException(""); } else { - this.__l = var1; + this.field51 = var1; } } @@ -127,100 +127,100 @@ public class BufferedFile { @Export("read") public void read(byte[] var1, int var2, int var3) throws IOException { try { - if(var3 + var2 > var1.length) { + if (var3 + var2 > var1.length) { throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length); } - if(-1L != this.__u && this.__l >= this.__u && this.__l + (long)var3 <= this.__u + (long)this.__g) { - System.arraycopy(this.writeBuffer, (int)(this.__l - this.__u), var1, var2, var3); - this.__l += (long)var3; + if (-1L != this.field49 && this.field51 >= this.field49 && this.field51 + (long)var3 <= this.field49 + (long)this.field50) { + System.arraycopy(this.writeBuffer, (int)(this.field51 - this.field49), var1, var2, var3); + this.field51 += (long)var3; return; } - long var4 = this.__l; - int var7 = var3; - int var8; - if(this.__l >= this.__q && this.__l < this.__q + (long)this.__w) { - var8 = (int)((long)this.__w - (this.__l - this.__q)); - if(var8 > var3) { - var8 = var3; + long var4 = this.field51; + int var6 = var3; + int var7; + if (this.field51 >= this.field47 && this.field51 < this.field47 + (long)this.field48) { + var7 = (int)((long)this.field48 - (this.field51 - this.field47)); + if (var7 > var3) { + var7 = var3; } - System.arraycopy(this.readBuffer, (int)(this.__l - this.__q), var1, var2, var8); - this.__l += (long)var8; - var2 += var8; - var3 -= var8; + System.arraycopy(this.readBuffer, (int)(this.field51 - this.field47), var1, var2, var7); + this.field51 += (long)var7; + var2 += var7; + var3 -= var7; } - if(var3 > this.readBuffer.length) { - this.accessFile.seek(this.__l); + if (var3 > this.readBuffer.length) { + this.accessFile.seek(this.field51); - for(this.__d = this.__l; var3 > 0; var3 -= var8) { - var8 = this.accessFile.read(var1, var2, var3); - if(var8 == -1) { + for (this.field53 = this.field51; var3 > 0; var3 -= var7) { + var7 = this.accessFile.read(var1, var2, var3); + if (var7 == -1) { break; } - this.__d += (long)var8; - this.__l += (long)var8; - var2 += var8; + this.field53 += (long)var7; + this.field51 += (long)var7; + var2 += var7; } - } else if(var3 > 0) { + } else if (var3 > 0) { this.load(); - var8 = var3; - if(var3 > this.__w) { - var8 = this.__w; + var7 = var3; + if (var3 > this.field48) { + var7 = this.field48; } - System.arraycopy(this.readBuffer, 0, var1, var2, var8); - var2 += var8; - var3 -= var8; - this.__l += (long)var8; + System.arraycopy(this.readBuffer, 0, var1, var2, var7); + var2 += var7; + var3 -= var7; + this.field51 += (long)var7; } - if(-1L != this.__u) { - if(this.__u > this.__l && var3 > 0) { - var8 = var2 + (int)(this.__u - this.__l); - if(var8 > var3 + var2) { - var8 = var3 + var2; + if (-1L != this.field49) { + if (this.field49 > this.field51 && var3 > 0) { + var7 = var2 + (int)(this.field49 - this.field51); + if (var7 > var3 + var2) { + var7 = var3 + var2; } - while(var2 < var8) { + while (var2 < var7) { var1[var2++] = 0; --var3; - ++this.__l; + ++this.field51; } } - long var13 = -1L; + long var8 = -1L; long var10 = -1L; - if(this.__u >= var4 && this.__u < var4 + (long)var7) { - var13 = this.__u; - } else if(var4 >= this.__u && var4 < this.__u + (long)this.__g) { - var13 = var4; + if (this.field49 >= var4 && this.field49 < var4 + (long)var6) { + var8 = this.field49; + } else if (var4 >= this.field49 && var4 < this.field49 + (long)this.field50) { + var8 = var4; } - if((long)this.__g + this.__u > var4 && this.__u + (long)this.__g <= var4 + (long)var7) { - var10 = (long)this.__g + this.__u; - } else if((long)var7 + var4 > this.__u && (long)var7 + var4 <= this.__u + (long)this.__g) { - var10 = (long)var7 + var4; + if ((long)this.field50 + this.field49 > var4 && this.field49 + (long)this.field50 <= var4 + (long)var6) { + var10 = (long)this.field50 + this.field49; + } else if ((long)var6 + var4 > this.field49 && (long)var6 + var4 <= this.field49 + (long)this.field50) { + var10 = (long)var6 + var4; } - if(var13 > -1L && var10 > var13) { - int var12 = (int)(var10 - var13); - System.arraycopy(this.writeBuffer, (int)(var13 - this.__u), var1, (int)(var13 - var4) + var2, var12); - if(var10 > this.__l) { - var3 = (int)((long)var3 - (var10 - this.__l)); - this.__l = var10; + if (var8 > -1L && var10 > var8) { + int var12 = (int)(var10 - var8); + System.arraycopy(this.writeBuffer, (int)(var8 - this.field49), var1, (int)(var8 - var4) + var2, var12); + if (var10 > this.field51) { + var3 = (int)((long)var3 - (var10 - this.field51)); + this.field51 = var10; } } } - } catch (IOException var16) { - this.__d = -1L; - throw var16; + } catch (IOException var13) { + this.field53 = -1L; + throw var13; } - if(var3 > 0) { + if (var3 > 0) { throw new EOFException(); } } @@ -232,20 +232,20 @@ public class BufferedFile { ) @Export("load") void load() throws IOException { - this.__w = 0; - if(this.__d != this.__l) { - this.accessFile.seek(this.__l); - this.__d = this.__l; + this.field48 = 0; + if (this.field53 != this.field51) { + this.accessFile.seek(this.field51); + this.field53 = this.field51; } int var1; - for(this.__q = this.__l; this.__w < this.readBuffer.length; this.__w += var1) { - var1 = this.accessFile.read(this.readBuffer, this.__w, this.readBuffer.length - this.__w); - if(var1 == -1) { + for (this.field47 = this.field51; this.field48 < this.readBuffer.length; this.field48 += var1) { + var1 = this.accessFile.read(this.readBuffer, this.field48, this.readBuffer.length - this.field48); + if (var1 == -1) { break; } - this.__d += (long)var1; + this.field53 += (long)var1; } } @@ -258,73 +258,73 @@ public class BufferedFile { @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { try { - if(this.__l + (long)var3 > this.capacity) { - this.capacity = this.__l + (long)var3; + if (this.field51 + (long)var3 > this.capacity) { + this.capacity = this.field51 + (long)var3; } - if(-1L != this.__u && (this.__l < this.__u || this.__l > this.__u + (long)this.__g)) { + if (-1L != this.field49 && (this.field51 < this.field49 || this.field51 > this.field49 + (long)this.field50)) { this.flush(); } - if(this.__u != -1L && (long)var3 + this.__l > this.__u + (long)this.writeBuffer.length) { - int var4 = (int)((long)this.writeBuffer.length - (this.__l - this.__u)); - System.arraycopy(var1, var2, this.writeBuffer, (int)(this.__l - this.__u), var4); - this.__l += (long)var4; + if (this.field49 != -1L && (long)var3 + this.field51 > this.field49 + (long)this.writeBuffer.length) { + int var4 = (int)((long)this.writeBuffer.length - (this.field51 - this.field49)); + System.arraycopy(var1, var2, this.writeBuffer, (int)(this.field51 - this.field49), var4); + this.field51 += (long)var4; var2 += var4; var3 -= var4; - this.__g = this.writeBuffer.length; + this.field50 = this.writeBuffer.length; this.flush(); } - if(var3 <= this.writeBuffer.length) { - if(var3 > 0) { - if(this.__u == -1L) { - this.__u = this.__l; + if (var3 <= this.writeBuffer.length) { + if (var3 > 0) { + if (this.field49 == -1L) { + this.field49 = this.field51; } - System.arraycopy(var1, var2, this.writeBuffer, (int)(this.__l - this.__u), var3); - this.__l += (long)var3; - if(this.__l - this.__u > (long)this.__g) { - this.__g = (int)(this.__l - this.__u); + System.arraycopy(var1, var2, this.writeBuffer, (int)(this.field51 - this.field49), var3); + this.field51 += (long)var3; + if (this.field51 - this.field49 > (long)this.field50) { + this.field50 = (int)(this.field51 - this.field49); } - } } else { - if(this.__d != this.__l) { - this.accessFile.seek(this.__l); - this.__d = this.__l; + if (this.field53 != this.field51) { + this.accessFile.seek(this.field51); + this.field53 = this.field51; } this.accessFile.write(var1, var2, var3); - this.__d += (long)var3; - if(this.__d > this.__e) { - this.__e = this.__d; + this.field53 += (long)var3; + if (this.field53 > this.field52) { + this.field52 = this.field53; } - long var9 = -1L; + long var10 = -1L; long var6 = -1L; - if(this.__l >= this.__q && this.__l < (long)this.__w + this.__q) { - var9 = this.__l; - } else if(this.__q >= this.__l && this.__q < (long)var3 + this.__l) { - var9 = this.__q; + if (this.field51 >= this.field47 && this.field51 < (long)this.field48 + this.field47) { + var10 = this.field51; + } else if (this.field47 >= this.field51 && this.field47 < (long)var3 + this.field51) { + var10 = this.field47; } - if(this.__l + (long)var3 > this.__q && (long)var3 + this.__l <= (long)this.__w + this.__q) { - var6 = this.__l + (long)var3; - } else if((long)this.__w + this.__q > this.__l && this.__q + (long)this.__w <= (long)var3 + this.__l) { - var6 = (long)this.__w + this.__q; + if (this.field51 + (long)var3 > this.field47 && (long)var3 + this.field51 <= (long)this.field48 + this.field47) { + var6 = this.field51 + (long)var3; + } else if ((long)this.field48 + this.field47 > this.field51 && this.field47 + (long)this.field48 <= (long)var3 + this.field51) { + var6 = (long)this.field48 + this.field47; } - if(var9 > -1L && var6 > var9) { - int var8 = (int)(var6 - var9); - System.arraycopy(var1, (int)(var9 + (long)var2 - this.__l), this.readBuffer, (int)(var9 - this.__q), var8); + if (var10 > -1L && var6 > var10) { + int var8 = (int)(var6 - var10); + System.arraycopy(var1, (int)(var10 + (long)var2 - this.field51), this.readBuffer, (int)(var10 - this.field47), var8); } - this.__l += (long)var3; + this.field51 += (long)var3; } - } catch (IOException var12) { - this.__d = -1L; - throw var12; + + } catch (IOException var9) { + this.field53 = -1L; + throw var9; } } @@ -335,39 +335,39 @@ public class BufferedFile { ) @Export("flush") void flush() throws IOException { - if(this.__u != -1L) { - if(this.__u != this.__d) { - this.accessFile.seek(this.__u); - this.__d = this.__u; + if (this.field49 != -1L) { + if (this.field49 != this.field53) { + this.accessFile.seek(this.field49); + this.field53 = this.field49; } - this.accessFile.write(this.writeBuffer, 0, this.__g); - this.__d += (long)(this.__g * 1290782301) * -1558233611L; - if(this.__d > this.__e) { - this.__e = this.__d; + this.accessFile.write(this.writeBuffer, 0, this.field50); + this.field53 += (long)(this.field50 * 1290782301) * -1558233611L; + if (this.field53 > this.field52) { + this.field52 = this.field53; } long var1 = -1L; long var3 = -1L; - if(this.__u >= this.__q && this.__u < (long)this.__w + this.__q) { - var1 = this.__u; - } else if(this.__q >= this.__u && this.__q < this.__u + (long)this.__g) { - var1 = this.__q; + if (this.field49 >= this.field47 && this.field49 < (long)this.field48 + this.field47) { + var1 = this.field49; + } else if (this.field47 >= this.field49 && this.field47 < this.field49 + (long)this.field50) { + var1 = this.field47; } - if(this.__u + (long)this.__g > this.__q && this.__u + (long)this.__g <= this.__q + (long)this.__w) { - var3 = this.__u + (long)this.__g; - } else if((long)this.__w + this.__q > this.__u && (long)this.__w + this.__q <= (long)this.__g + this.__u) { - var3 = this.__q + (long)this.__w; + if (this.field49 + (long)this.field50 > this.field47 && this.field49 + (long)this.field50 <= this.field47 + (long)this.field48) { + var3 = this.field49 + (long)this.field50; + } else if ((long)this.field48 + this.field47 > this.field49 && (long)this.field48 + this.field47 <= (long)this.field50 + this.field49) { + var3 = this.field47 + (long)this.field48; } - if(var1 > -1L && var3 > var1) { + if (var1 > -1L && var3 > var1) { int var5 = (int)(var3 - var1); - System.arraycopy(this.writeBuffer, (int)(var1 - this.__u), this.readBuffer, (int)(var1 - this.__q), var5); + System.arraycopy(this.writeBuffer, (int)(var1 - this.field49), this.readBuffer, (int)(var1 - this.field47), var5); } - this.__u = -1L; - this.__g = 0; + this.field49 = -1L; + this.field50 = 0; } } diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java index 1b5b13c43e..16f77583d9 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -96,14 +96,13 @@ public class BufferedNetSocket extends AbstractSocket { try { this.socket.close(); } catch (IOException var2) { - ; } this.source.close(); } @ObfuscatedName("finalize") - protected void __finalize_280() { + protected void method75() { this.close(); } diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index 3bca5ee7dd..f4d5e0a768 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -61,14 +61,14 @@ public class BufferedSink implements Runnable { ) @Export("isClosed") boolean isClosed() { - if(this.isClosed0) { + if (this.isClosed0) { try { this.outputStream.close(); - if(this.exception == null) { + if (this.exception == null) { this.exception = new IOException(""); } } catch (IOException var2) { - if(this.exception == null) { + if (this.exception == null) { this.exception = new IOException(var2); } } @@ -86,22 +86,22 @@ public class BufferedSink implements Runnable { ) @Export("write") void write(byte[] var1, int var2, int var3) throws IOException { - if(var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { + if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { synchronized(this) { - if(this.exception != null) { + if (this.exception != null) { throw new IOException(this.exception.toString()); } else { int var5; - if(this.position <= this.limit) { + if (this.position <= this.limit) { var5 = this.capacity - this.limit + this.position - 1; } else { var5 = this.position - this.limit - 1; } - if(var5 < var3) { + if (var5 < var3) { throw new IOException(""); } else { - if(var3 + this.limit <= this.capacity) { + if (var3 + this.limit <= this.capacity) { System.arraycopy(var1, var2, this.buffer, this.limit, var3); } else { int var6 = this.capacity - this.limit; @@ -134,7 +134,6 @@ public class BufferedSink implements Runnable { try { this.thread.join(); } catch (InterruptedException var3) { - ; } } @@ -142,64 +141,78 @@ public class BufferedSink implements Runnable { @Export("run") @ObfuscatedName("run") public void run() { - do { - int var1; - synchronized(this) { - while(true) { - if(this.exception != null) { + while (true) { + synchronized(this){} + + while (true) { + boolean var13 = false; + + int var1; + try { + var13 = true; + if (this.exception != null) { return; } - if(this.position <= this.limit) { + if (this.position <= this.limit) { var1 = this.limit - this.position; } else { var1 = this.capacity - this.position + this.limit; } - if(var1 > 0) { - break; + if (var1 <= 0) { + try { + this.outputStream.flush(); + } catch (IOException var17) { + this.exception = var17; + return; + } + + if (this.isClosed()) { + return; + } + + try { + this.wait(); + } catch (InterruptedException var18) { + } + continue; } - try { - this.outputStream.flush(); - } catch (IOException var11) { - this.exception = var11; - return; - } - - if(this.isClosed()) { - return; - } - - try { - this.wait(); - } catch (InterruptedException var12) { + var13 = false; + } finally { + if (var13) { ; } } - } - try { - if(var1 + this.position <= this.capacity) { - this.outputStream.write(this.buffer, this.position, var1); - } else { - int var7 = this.capacity - this.position; - this.outputStream.write(this.buffer, this.position, var7); - this.outputStream.write(this.buffer, 0, var1 - var7); + try { + if (var1 + this.position <= this.capacity) { + this.outputStream.write(this.buffer, this.position, var1); + } else { + int var2 = this.capacity - this.position; + this.outputStream.write(this.buffer, this.position, var2); + this.outputStream.write(this.buffer, 0, var1 - var2); + } + } catch (IOException var16) { + IOException var3 = var16; + synchronized(this) { + this.exception = var3; + return; + } } - } catch (IOException var10) { - IOException var2 = var10; + synchronized(this) { - this.exception = var2; - return; + this.position = (var1 + this.position) % this.capacity; } - } - synchronized(this) { - this.position = (var1 + this.position) % this.capacity; - } - } while(!this.isClosed()); + if (!this.isClosed()) { + break; + } + return; + } + } } @ObfuscatedName("m") @@ -208,18 +221,18 @@ public class BufferedSink implements Runnable { garbageValue = "449588720" ) static void method3603() { - Tiles.__bq_w = null; - Fonts.__kz_o = null; - class32.__ay_u = null; - class307.__kc_g = null; - Tiles.__bq_a = null; - Tiles.__bq_l = null; - Huffman.__gd_e = null; - class13.__i_x = null; - Formatting.__cy_d = null; - class214.__hf_k = null; - WorldMapSectionType.__h_n = null; - Message.__bm_i = null; + Tiles.field908 = (byte[][][])null; + Fonts.field350 = (byte[][][])null; + class32.field1157 = (byte[][][])null; + class307.field1155 = (byte[][][])null; + Tiles.field910 = (int[][][])null; + Tiles.field909 = (byte[][][])null; + Huffman.field398 = (int[][])null; + class13.field1112 = null; + Formatting.field353 = null; + class214.field1131 = null; + WorldMapSectionType.field1104 = null; + Message.field490 = null; } @ObfuscatedName("e") @@ -228,31 +241,31 @@ public class BufferedSink implements Runnable { garbageValue = "-1337774818" ) static final void method3595(Widget var0, int var1, byte[] var2, byte[] var3) { - if(var0.__cf == null) { - if(var2 == null) { + if (var0.field966 == null) { + if (var2 == null) { return; } - var0.__cf = new byte[11][]; - var0.__cp = new byte[11][]; - var0.__cc = new int[11]; - var0.__ci = new int[11]; + var0.field966 = new byte[11][]; + var0.field967 = new byte[11][]; + var0.field968 = new int[11]; + var0.field969 = new int[11]; } - var0.__cf[var1] = var2; - if(var2 != null) { - var0.__cg = true; + var0.field966[var1] = var2; + if (var2 != null) { + var0.field965 = true; } else { - var0.__cg = false; + var0.field965 = false; - for(int var4 = 0; var4 < var0.__cf.length; ++var4) { - if(var0.__cf[var4] != null) { - var0.__cg = true; + for (int var4 = 0; var4 < var0.field966.length; ++var4) { + if (var0.field966[var4] != null) { + var0.field965 = true; break; } } } - var0.__cp[var1] = var3; + var0.field967[var1] = var3; } } diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index 5069205f88..2f5483c779 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -14,7 +14,7 @@ public class BufferedSource implements Runnable { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache __fh_x; + public static AbstractIndexCache field54; @ObfuscatedName("m") @Export("thread") Thread thread; @@ -64,19 +64,19 @@ public class BufferedSource implements Runnable { ) @Export("isAvailable") boolean isAvailable(int var1) throws IOException { - if(var1 == 0) { + if (var1 == 0) { return true; - } else if(var1 > 0 && var1 < this.capacity) { + } else if (var1 > 0 && var1 < this.capacity) { synchronized(this) { int var3; - if(this.position <= this.limit) { + if (this.position <= this.limit) { var3 = this.limit - this.position; } else { var3 = this.capacity - this.position + this.limit; } - if(var3 < var1) { - if(this.exception != null) { + if (var3 < var1) { + if (this.exception != null) { throw new IOException(this.exception.toString()); } else { this.notifyAll(); @@ -100,13 +100,13 @@ public class BufferedSource implements Runnable { int available() throws IOException { synchronized(this) { int var2; - if(this.position <= this.limit) { + if (this.position <= this.limit) { var2 = this.limit - this.position; } else { var2 = this.capacity - this.position + this.limit; } - if(var2 <= 0 && this.exception != null) { + if (var2 <= 0 && this.exception != null) { throw new IOException(this.exception.toString()); } else { this.notifyAll(); @@ -123,8 +123,8 @@ public class BufferedSource implements Runnable { @Export("readUnsignedByte") int readUnsignedByte() throws IOException { synchronized(this) { - if(this.position == this.limit) { - if(this.exception != null) { + if (this.position == this.limit) { + if (this.exception != null) { throw new IOException(this.exception.toString()); } else { return -1; @@ -145,23 +145,23 @@ public class BufferedSource implements Runnable { ) @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { - if(var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { + if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { synchronized(this) { int var5; - if(this.position <= this.limit) { + if (this.position <= this.limit) { var5 = this.limit - this.position; } else { var5 = this.capacity - this.position + this.limit; } - if(var3 > var5) { + if (var3 > var5) { var3 = var5; } - if(var3 == 0 && this.exception != null) { + if (var3 == 0 && this.exception != null) { throw new IOException(this.exception.toString()); } else { - if(var3 + this.position <= this.capacity) { + if (var3 + this.position <= this.capacity) { System.arraycopy(this.buffer, this.position, var1, var2, var3); } else { int var6 = this.capacity - this.position; @@ -187,7 +187,7 @@ public class BufferedSource implements Runnable { @Export("close") void close() { synchronized(this) { - if(this.exception == null) { + if (this.exception == null) { this.exception = new IOException(""); } @@ -197,7 +197,6 @@ public class BufferedSource implements Runnable { try { this.thread.join(); } catch (InterruptedException var3) { - ; } } @@ -205,50 +204,49 @@ public class BufferedSource implements Runnable { @Export("run") @ObfuscatedName("run") public void run() { - while(true) { + while (true) { int var1; synchronized(this) { - while(true) { - if(this.exception != null) { + while (true) { + if (this.exception != null) { return; } - if(this.position == 0) { + if (this.position == 0) { var1 = this.capacity - this.limit - 1; - } else if(this.position <= this.limit) { + } else if (this.position <= this.limit) { var1 = this.capacity - this.limit; } else { var1 = this.position - this.limit - 1; } - if(var1 > 0) { + if (var1 > 0) { break; } try { this.wait(); } catch (InterruptedException var10) { - ; } } } - int var7; + int var2; try { - var7 = this.inputStream.read(this.buffer, this.limit, var1); - if(var7 == -1) { + var2 = this.inputStream.read(this.buffer, this.limit, var1); + if (var2 == -1) { throw new EOFException(); } } catch (IOException var11) { - IOException var3 = var11; + IOException var4 = var11; synchronized(this) { - this.exception = var3; + this.exception = var4; return; } } synchronized(this) { - this.limit = (var7 + this.limit) % this.capacity; + this.limit = (var2 + this.limit) % this.capacity; } } } @@ -259,14 +257,14 @@ public class BufferedSource implements Runnable { garbageValue = "6" ) static final void method3423(boolean var0) { - for(int var1 = 0; var1 < Client.npcCount; ++var1) { - Npc var2 = Client.npcs[Client.npcIndices[var1]]; - if(var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.__e_435()) { + for (int var1 = 0; var1 < Client.npcCount; ++var1) { + NPC var2 = Client.npcs[Client.npcIndices[var1]]; + if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.method229()) { int var3 = var2.x >> 7; int var4 = var2.y >> 7; - if(var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { - if(var2.size == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { - if(Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { + if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { + if (var2.size == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { + if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { continue; } @@ -275,7 +273,7 @@ public class BufferedSource implements Runnable { long var5 = FontName.method5637(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); var2.playerCycle = Client.cycle; - class65.scene.__a_239(SoundSystem.plane, var2.x, var2.y, class32.getTileHeight(var2.size * 64 - 64 + var2.x, var2.size * 64 - 64 + var2.y, SoundSystem.plane), var2.size * 64 - 64 + 60, var2, var2.__ac, var5, var2.__ay); + class65.scene.method285(SoundSystem.plane, var2.x, var2.y, class32.getTileHeight(var2.size * 64 - 64 + var2.x, var2.size * 64 - 64 + var2.y, SoundSystem.plane), var2.size * 64 - 64 + 60, var2, var2.field9, var5, var2.field10); } } } diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index 8ac8278150..ca26e844a9 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -35,7 +35,7 @@ public class ByteArrayPool { @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; @ObfuscatedName("g") - static int[] __gi_g; + static int[] field55; @ObfuscatedName("dz") @ObfuscatedSignature( signature = "Lit;" @@ -43,15 +43,6 @@ public class ByteArrayPool { @Export("indexCache13") static IndexCache indexCache13; - static { - ByteArrayPool_smallCount = 0; - ByteArrayPool_mediumCount = 0; - ByteArrayPool_largeCount = 0; - ByteArrayPool_small = new byte[1000][]; - ByteArrayPool_medium = new byte[250][]; - ByteArrayPool_large = new byte[50][]; - } - @ObfuscatedName("f") @ObfuscatedSignature( signature = "(IZI)[B", @@ -60,46 +51,42 @@ public class ByteArrayPool { @Export("ByteArrayPool_get") static synchronized byte[] ByteArrayPool_get(int var0, boolean var1) { byte[] var2; - if(var0 != 100) { - if(var0 < 100) { - ; + if (var0 != 100) { + if (var0 < 100) { } - } else if(ByteArrayPool_smallCount > 0) { + } else if (ByteArrayPool_smallCount > 0) { var2 = ByteArrayPool_small[--ByteArrayPool_smallCount]; ByteArrayPool_small[ByteArrayPool_smallCount] = null; return var2; } - if(var0 != 5000) { - if(var0 < 5000) { - ; + if (var0 != 5000) { + if (var0 < 5000) { } - } else if(ByteArrayPool_mediumCount > 0) { + } else if (ByteArrayPool_mediumCount > 0) { var2 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; return var2; } - if(var0 != 30000) { - if(var0 < 30000) { - ; + if (var0 != 30000) { + if (var0 < 30000) { } - } else if(ByteArrayPool_largeCount > 0) { + } else if (ByteArrayPool_largeCount > 0) { var2 = ByteArrayPool_large[--ByteArrayPool_largeCount]; ByteArrayPool_large[ByteArrayPool_largeCount] = null; return var2; } - if(RouteStrategy.__fe_e != null) { - for(int var4 = 0; var4 < __gi_g.length; ++var4) { - if(__gi_g[var4] != var0) { - if(var0 < __gi_g[var4]) { - ; + if (RouteStrategy.field760 != null) { + for (int var3 = 0; var3 < field55.length; ++var3) { + if (field55[var3] != var0) { + if (var0 < field55[var3]) { } - } else if(WorldMapSection2.__ah_l[var4] > 0) { - byte[] var3 = RouteStrategy.__fe_e[var4][--WorldMapSection2.__ah_l[var4]]; - RouteStrategy.__fe_e[var4][WorldMapSection2.__ah_l[var4]] = null; - return var3; + } else if (WorldMapSection2.field1082[var3] > 0) { + byte[] var4 = RouteStrategy.field760[var3][--WorldMapSection2.field1082[var3]]; + RouteStrategy.field760[var3][WorldMapSection2.field1082[var3]] = null; + return var4; } } } @@ -113,38 +100,47 @@ public class ByteArrayPool { garbageValue = "-399583759" ) public static String method4001(int var0, boolean var1) { - if(var1 && var0 >= 0) { - int var3 = var0; - String var2; - if(var1 && var0 >= 0) { + if (var1 && var0 >= 0) { + int var2 = var0; + String var3; + if (var1 && var0 >= 0) { int var4 = 2; - for(int var5 = var0 / 10; var5 != 0; ++var4) { + for (int var5 = var0 / 10; var5 != 0; ++var4) { var5 /= 10; } - char[] var6 = new char[var4]; - var6[0] = '+'; + char[] var9 = new char[var4]; + var9[0] = '+'; - for(int var7 = var4 - 1; var7 > 0; --var7) { - int var8 = var3; - var3 /= 10; - int var9 = var8 - var3 * 10; - if(var9 >= 10) { - var6[var7] = (char)(var9 + 87); + for (int var6 = var4 - 1; var6 > 0; --var6) { + int var7 = var2; + var2 /= 10; + int var8 = var7 - var2 * 10; + if (var8 >= 10) { + var9[var6] = (char)(var8 + 87); } else { - var6[var7] = (char)(var9 + 48); + var9[var6] = (char)(var8 + 48); } } - var2 = new String(var6); + var3 = new String(var9); } else { - var2 = Integer.toString(var0, 10); + var3 = Integer.toString(var0, 10); } - return var2; + return var3; } else { return Integer.toString(var0); } } + + static { + ByteArrayPool_smallCount = 0; + ByteArrayPool_mediumCount = 0; + ByteArrayPool_largeCount = 0; + ByteArrayPool_small = new byte[1000][]; + ByteArrayPool_medium = new byte[250][]; + ByteArrayPool_large = new byte[50][]; + } } diff --git a/runescape-client/src/main/java/Bzip2Decompressor.java b/runescape-client/src/main/java/Bzip2Decompressor.java index b5cee0b5ba..70b8bdb0f8 100644 --- a/runescape-client/src/main/java/Bzip2Decompressor.java +++ b/runescape-client/src/main/java/Bzip2Decompressor.java @@ -13,28 +13,24 @@ public final class Bzip2Decompressor { @Export("Bzip2Decompressor_state") static Bzip2State Bzip2Decompressor_state; - static { - Bzip2Decompressor_state = new Bzip2State(); - } - @ObfuscatedName("m") @Export("Bzip2Decompressor_decompress") public static int Bzip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) { Bzip2State var5 = Bzip2Decompressor_state; synchronized(Bzip2Decompressor_state) { - Bzip2Decompressor_state.__g = var2; - Bzip2Decompressor_state.__l = var4; - Bzip2Decompressor_state.__x = var0; - Bzip2Decompressor_state.__d = 0; - Bzip2Decompressor_state.__k = var1; - Bzip2Decompressor_state.__j = 0; - Bzip2Decompressor_state.__z = 0; - Bzip2Decompressor_state.__e = 0; - Bzip2Decompressor_state.__n = 0; + Bzip2Decompressor_state.field62 = var2; + Bzip2Decompressor_state.field63 = var4; + Bzip2Decompressor_state.field65 = var0; + Bzip2Decompressor_state.field66 = 0; + Bzip2Decompressor_state.field67 = var1; + Bzip2Decompressor_state.field72 = 0; + Bzip2Decompressor_state.field71 = 0; + Bzip2Decompressor_state.field64 = 0; + Bzip2Decompressor_state.field68 = 0; method3725(Bzip2Decompressor_state); - var1 -= Bzip2Decompressor_state.__k; - Bzip2Decompressor_state.__g = null; - Bzip2Decompressor_state.__x = null; + var1 -= Bzip2Decompressor_state.field67; + Bzip2Decompressor_state.field62 = null; + Bzip2Decompressor_state.field65 = null; return var1; } } @@ -44,131 +40,130 @@ public final class Bzip2Decompressor { signature = "(Lgt;)V" ) static void method3705(Bzip2State var0) { - byte var2 = var0.__i; - int var3 = var0.__a; - int var4 = var0.__c; - int var5 = var0.__h; - int[] var6 = WorldMapSection0.__y_p; - int var7 = var0.__y; - byte[] var8 = var0.__x; - int var9 = var0.__d; - int var10 = var0.__k; - int var12 = var0.__ae + 1; + byte var1 = var0.field69; + int var2 = var0.field70; + int var3 = var0.field78; + int var4 = var0.field76; + int[] var5 = WorldMapSection0.field1056; + int var6 = var0.field75; + byte[] var7 = var0.field65; + int var8 = var0.field66; + int var9 = var0.field67; + int var10 = var0.field93 + 1; label65: - while(true) { - if(var3 > 0) { - while(true) { - if(var10 == 0) { + while (true) { + if (var2 > 0) { + while (true) { + if (var9 == 0) { break label65; } - if(var3 == 1) { - if(var10 == 0) { - var3 = 1; + if (var2 == 1) { + if (var9 == 0) { + var2 = 1; break label65; } - var8[var9] = var2; - ++var9; - --var10; + var7[var8] = var1; + ++var8; + --var9; break; } - var8[var9] = var2; - --var3; - ++var9; - --var10; + var7[var8] = var1; + --var2; + ++var8; + --var9; } } - boolean var14 = true; + boolean var11 = true; - byte var1; - while(var14) { - var14 = false; - if(var4 == var12) { - var3 = 0; + byte var12; + while (var11) { + var11 = false; + if (var3 == var10) { + var2 = 0; break label65; } - var2 = (byte)var5; - var7 = var6[var7]; - var1 = (byte)(var7 & 255); - var7 >>= 8; - ++var4; - if(var1 != var5) { - var5 = var1; - if(var10 == 0) { - var3 = 1; + var1 = (byte)var4; + var6 = var5[var6]; + var12 = (byte)(var6 & 255); + var6 >>= 8; + ++var3; + if (var12 != var4) { + var4 = var12; + if (var9 == 0) { + var2 = 1; break label65; } - var8[var9] = var2; - ++var9; - --var10; - var14 = true; - } else if(var4 == var12) { - if(var10 == 0) { - var3 = 1; + var7[var8] = var1; + ++var8; + --var9; + var11 = true; + } else if (var3 == var10) { + if (var9 == 0) { + var2 = 1; break label65; } - var8[var9] = var2; - ++var9; - --var10; - var14 = true; + var7[var8] = var1; + ++var8; + --var9; + var11 = true; } } - var3 = 2; - var7 = var6[var7]; - var1 = (byte)(var7 & 255); - var7 >>= 8; - ++var4; - if(var4 != var12) { - if(var1 != var5) { - var5 = var1; + var2 = 2; + var6 = var5[var6]; + var12 = (byte)(var6 & 255); + var6 >>= 8; + ++var3; + if (var3 != var10) { + if (var12 != var4) { + var4 = var12; } else { - var3 = 3; - var7 = var6[var7]; - var1 = (byte)(var7 & 255); - var7 >>= 8; - ++var4; - if(var4 != var12) { - if(var1 != var5) { - var5 = var1; + var2 = 3; + var6 = var5[var6]; + var12 = (byte)(var6 & 255); + var6 >>= 8; + ++var3; + if (var3 != var10) { + if (var12 != var4) { + var4 = var12; } else { - var7 = var6[var7]; - var1 = (byte)(var7 & 255); - var7 >>= 8; - ++var4; - var3 = (var1 & 255) + 4; - var7 = var6[var7]; - var5 = (byte)(var7 & 255); - var7 >>= 8; - ++var4; + var6 = var5[var6]; + var12 = (byte)(var6 & 255); + var6 >>= 8; + ++var3; + var2 = (var12 & 255) + 4; + var6 = var5[var6]; + var4 = (byte)(var6 & 255); + var6 >>= 8; + ++var3; } } } } } - int var13 = var0.__n; - var0.__n += var10 - var10; - if(var0.__n < var13) { - ; + int var13 = var0.field68; + var0.field68 += var9 - var9; + if (var0.field68 < var13) { } - var0.__i = var2; - var0.__a = var3; - var0.__c = var4; - var0.__h = var5; - WorldMapSection0.__y_p = var6; - var0.__y = var7; - var0.__x = var8; - var0.__d = var9; - var0.__k = var10; + var0.field69 = var1; + var0.field70 = var2; + var0.field78 = var3; + var0.field76 = var4; + WorldMapSection0.field1056 = var5; + var0.field75 = var6; + var0.field65 = var7; + var0.field66 = var8; + var0.field67 = var9; } @ObfuscatedName("q") @@ -176,6 +171,9 @@ public final class Bzip2Decompressor { signature = "(Lgt;)V" ) static void method3725(Bzip2State var0) { + boolean var1 = false; + boolean var2 = false; + boolean var3 = false; boolean var4 = false; boolean var5 = false; boolean var6 = false; @@ -191,350 +189,351 @@ public final class Bzip2Decompressor { boolean var16 = false; boolean var17 = false; boolean var18 = false; - boolean var19 = false; - boolean var20 = false; - boolean var21 = false; - int var22 = 0; - int[] var23 = null; - int[] var24 = null; - int[] var25 = null; - var0.__s = 1; - if(WorldMapSection0.__y_p == null) { - WorldMapSection0.__y_p = new int[var0.__s * 100000]; + int var19 = 0; + int[] var20 = null; + int[] var21 = null; + int[] var22 = null; + var0.field73 = 1; + if (WorldMapSection0.field1056 == null) { + WorldMapSection0.field1056 = new int[var0.field73 * 100000]; } - boolean var26 = true; + boolean var23 = true; - while(true) { - while(var26) { - byte var1 = method3707(var0); - if(var1 == 23) { + while (true) { + while (var23) { + byte var24 = method3707(var0); + if (var24 == 23) { return; } - var1 = method3707(var0); - var1 = method3707(var0); - var1 = method3707(var0); - var1 = method3707(var0); - var1 = method3707(var0); - var1 = method3707(var0); - var1 = method3707(var0); - var1 = method3707(var0); - var1 = method3707(var0); - var1 = method3711(var0); - if(var1 != 0) { - ; + var24 = method3707(var0); + var24 = method3707(var0); + var24 = method3707(var0); + var24 = method3707(var0); + var24 = method3707(var0); + var24 = method3707(var0); + var24 = method3707(var0); + var24 = method3707(var0); + var24 = method3707(var0); + var24 = method3711(var0); + if (var24 != 0) { } - var0.__t = 0; - var1 = method3707(var0); - var0.__t = var0.__t << 8 | var1 & 255; - var1 = method3707(var0); - var0.__t = var0.__t << 8 | var1 & 255; - var1 = method3707(var0); - var0.__t = var0.__t << 8 | var1 & 255; + var0.field74 = 0; + var24 = method3707(var0); + var0.field74 = var0.field74 << 8 | var24 & 255; + var24 = method3707(var0); + var0.field74 = var0.field74 << 8 | var24 & 255; + var24 = method3707(var0); + var0.field74 = var0.field74 << 8 | var24 & 255; - int var36; - for(var36 = 0; var36 < 16; ++var36) { - var1 = method3711(var0); - if(var1 == 1) { - var0.__aq[var36] = true; + int var25; + for (var25 = 0; var25 < 16; ++var25) { + var24 = method3711(var0); + if (var24 == 1) { + var0.field82[var25] = true; } else { - var0.__aq[var36] = false; + var0.field82[var25] = false; } } - for(var36 = 0; var36 < 256; ++var36) { - var0.__ag[var36] = false; + for (var25 = 0; var25 < 256; ++var25) { + var0.field81[var25] = false; } - int var37; - for(var36 = 0; var36 < 16; ++var36) { - if(var0.__aq[var36]) { - for(var37 = 0; var37 < 16; ++var37) { - var1 = method3711(var0); - if(var1 == 1) { - var0.__ag[var37 + var36 * 16] = true; + int var26; + for (var25 = 0; var25 < 16; ++var25) { + if (var0.field82[var25]) { + for (var26 = 0; var26 < 16; ++var26) { + var24 = method3711(var0); + if (var24 == 1) { + var0.field81[var26 + var25 * 16] = true; } } } } method3710(var0); - int var39 = var0.__v + 2; - int var40 = method3708(3, var0); - int var41 = method3708(15, var0); + int var27 = var0.field80 + 2; + int var28 = method3708(3, var0); + int var29 = method3708(15, var0); - for(var36 = 0; var36 < var41; ++var36) { - var37 = 0; + for (var25 = 0; var25 < var29; ++var25) { + var26 = 0; - while(true) { - var1 = method3711(var0); - if(var1 == 0) { - var0.__ay[var36] = (byte)var37; + while (true) { + var24 = method3711(var0); + if (var24 == 0) { + var0.field87[var25] = (byte)var26; break; } - ++var37; + ++var26; } } - byte[] var27 = new byte[6]; + byte[] var30 = new byte[6]; - byte var29; - for(var29 = 0; var29 < var40; var27[var29] = var29++) { - ; + byte var31; + for (var31 = 0; var31 < var28; var30[var31] = var31++) { } - for(var36 = 0; var36 < var41; ++var36) { - var29 = var0.__ay[var36]; + for (var25 = 0; var25 < var29; ++var25) { + var31 = var0.field87[var25]; - byte var28; - for(var28 = var27[var29]; var29 > 0; --var29) { - var27[var29] = var27[var29 - 1]; + byte var32; + for (var32 = var30[var31]; var31 > 0; --var31) { + var30[var31] = var30[var31 - 1]; } - var27[0] = var28; - var0.__ac[var36] = var28; + var30[0] = var32; + var0.field86[var25] = var32; } - int var38; - for(var38 = 0; var38 < var40; ++var38) { - int var50 = method3708(5, var0); + int var33; + int var50; + for (var50 = 0; var50 < var28; ++var50) { + var33 = method3708(5, var0); - for(var36 = 0; var36 < var39; ++var36) { - while(true) { - var1 = method3711(var0); - if(var1 == 0) { - var0.__ah[var38][var36] = (byte)var50; + for (var25 = 0; var25 < var27; ++var25) { + while (true) { + var24 = method3711(var0); + if (var24 == 0) { + var0.field88[var50][var25] = (byte)var33; break; } - var1 = method3711(var0); - if(var1 == 0) { - ++var50; + var24 = method3711(var0); + if (var24 == 0) { + ++var33; } else { - --var50; + --var33; } } } } - for(var38 = 0; var38 < var40; ++var38) { - byte var2 = 32; - byte var3 = 0; + for (var50 = 0; var50 < var28; ++var50) { + byte var51 = 32; + byte var34 = 0; - for(var36 = 0; var36 < var39; ++var36) { - if(var0.__ah[var38][var36] > var3) { - var3 = var0.__ah[var38][var36]; + for (var25 = 0; var25 < var27; ++var25) { + if (var0.field88[var50][var25] > var34) { + var34 = var0.field88[var50][var25]; } - if(var0.__ah[var38][var36] < var2) { - var2 = var0.__ah[var38][var36]; + if (var0.field88[var50][var25] < var51) { + var51 = var0.field88[var50][var25]; } } - method3706(var0.__ak[var38], var0.__aw[var38], var0.__al[var38], var0.__ah[var38], var2, var3, var39); - var0.__ab[var38] = var2; + method3706(var0.field89[var50], var0.field90[var50], var0.field91[var50], var0.field88[var50], var51, var34, var27); + var0.field92[var50] = var51; } - int var42 = var0.__v + 1; - int var43 = -1; - byte var44 = 0; + var33 = var0.field80 + 1; + int var52 = -1; + byte var35 = 0; - for(var36 = 0; var36 <= 255; ++var36) { - var0.__b[var36] = 0; + for (var25 = 0; var25 <= 255; ++var25) { + var0.field77[var25] = 0; } - int var56 = 4095; + int var36 = 4095; - int var35; - int var55; - for(var35 = 15; var35 >= 0; --var35) { - for(var55 = 15; var55 >= 0; --var55) { - var0.__av[var56] = (byte)(var55 + var35 * 16); - --var56; + int var37; + int var38; + for (var37 = 15; var37 >= 0; --var37) { + for (var38 = 15; var38 >= 0; --var38) { + var0.field84[var36] = (byte)(var38 + var37 * 16); + --var36; } - var0.__ar[var35] = var56 + 1; + var0.field85[var37] = var36 + 1; } - int var47 = 0; - byte var54; - if(var44 == 0) { - ++var43; - var44 = 50; - var54 = var0.__ac[var43]; - var22 = var0.__ab[var54]; - var23 = var0.__ak[var54]; - var25 = var0.__al[var54]; - var24 = var0.__aw[var54]; + int var39 = 0; + byte var40; + if (var35 == 0) { + ++var52; + var35 = 50; + var40 = var0.field86[var52]; + var19 = var0.field92[var40]; + var20 = var0.field89[var40]; + var22 = var0.field91[var40]; + var21 = var0.field90[var40]; } - int var45 = var44 - 1; - int var51 = var22; + int var41 = var35 - 1; + int var42 = var19; - int var52; - byte var53; - for(var52 = method3708(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { - ++var51; - var53 = method3711(var0); + int var43; + byte var44; + for (var43 = method3708(var19, var0); var43 > var20[var42]; var43 = var43 << 1 | var44) { + ++var42; + var44 = method3711(var0); } - int var46 = var25[var52 - var24[var51]]; + int var45 = var22[var43 - var21[var42]]; - while(true) { - while(var46 != var42) { - if(var46 != 0 && var46 != 1) { - int var33 = var46 - 1; - int var30; - if(var33 < 16) { - var30 = var0.__ar[0]; + while (true) { + int[] var10000; + int var54; + while (var45 != var33) { + int var46; + int var47; + if (var45 != 0 && var45 != 1) { + var46 = var45 - 1; + int var48; + if (var46 < 16) { + var47 = var0.field85[0]; - for(var1 = var0.__av[var30 + var33]; var33 > 3; var33 -= 4) { - int var34 = var30 + var33; - var0.__av[var34] = var0.__av[var34 - 1]; - var0.__av[var34 - 1] = var0.__av[var34 - 2]; - var0.__av[var34 - 2] = var0.__av[var34 - 3]; - var0.__av[var34 - 3] = var0.__av[var34 - 4]; + for (var24 = var0.field84[var47 + var46]; var46 > 3; var46 -= 4) { + var48 = var47 + var46; + var0.field84[var48] = var0.field84[var48 - 1]; + var0.field84[var48 - 1] = var0.field84[var48 - 2]; + var0.field84[var48 - 2] = var0.field84[var48 - 3]; + var0.field84[var48 - 3] = var0.field84[var48 - 4]; } - while(var33 > 0) { - var0.__av[var30 + var33] = var0.__av[var30 + var33 - 1]; - --var33; + while (var46 > 0) { + var0.field84[var47 + var46] = var0.field84[var47 + var46 - 1]; + --var46; } - var0.__av[var30] = var1; + var0.field84[var47] = var24; } else { - int var31 = var33 / 16; - int var32 = var33 % 16; - var30 = var0.__ar[var31] + var32; + var48 = var46 / 16; + int var49 = var46 % 16; + var47 = var0.field85[var48] + var49; - for(var1 = var0.__av[var30]; var30 > var0.__ar[var31]; --var30) { - var0.__av[var30] = var0.__av[var30 - 1]; + for (var24 = var0.field84[var47]; var47 > var0.field85[var48]; --var47) { + var0.field84[var47] = var0.field84[var47 - 1]; } - ++var0.__ar[var31]; - - while(var31 > 0) { - --var0.__ar[var31]; - var0.__av[var0.__ar[var31]] = var0.__av[var0.__ar[var31 - 1] + 16 - 1]; - --var31; + for (var54 = var0.field85[var48]++; var48 > 0; --var48) { + var54 = var0.field85[var48]--; + var0.field84[var0.field85[var48]] = var0.field84[var0.field85[var48 - 1] + 16 - 1]; } - --var0.__ar[0]; - var0.__av[var0.__ar[0]] = var1; - if(var0.__ar[0] == 0) { - var56 = 4095; + var54 = var0.field85[0]--; + var0.field84[var0.field85[0]] = var24; + if (var0.field85[0] == 0) { + var36 = 4095; - for(var35 = 15; var35 >= 0; --var35) { - for(var55 = 15; var55 >= 0; --var55) { - var0.__av[var56] = var0.__av[var0.__ar[var35] + var55]; - --var56; + for (var37 = 15; var37 >= 0; --var37) { + for (var38 = 15; var38 >= 0; --var38) { + var0.field84[var36] = var0.field84[var0.field85[var37] + var38]; + --var36; } - var0.__ar[var35] = var56 + 1; + var0.field85[var37] = var36 + 1; } } } - ++var0.__b[var0.__aj[var1 & 255] & 255]; - WorldMapSection0.__y_p[var47] = var0.__aj[var1 & 255] & 255; - ++var47; - if(var45 == 0) { - ++var43; - var45 = 50; - var54 = var0.__ac[var43]; - var22 = var0.__ab[var54]; - var23 = var0.__ak[var54]; - var25 = var0.__al[var54]; - var24 = var0.__aw[var54]; + var54 = var0.field77[var0.field83[var24 & 255] & 255]++; + WorldMapSection0.field1056[var39] = var0.field83[var24 & 255] & 255; + ++var39; + if (var41 == 0) { + ++var52; + var41 = 50; + var40 = var0.field86[var52]; + var19 = var0.field92[var40]; + var20 = var0.field89[var40]; + var22 = var0.field91[var40]; + var21 = var0.field90[var40]; } - --var45; - var51 = var22; + --var41; + var42 = var19; - for(var52 = method3708(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { - ++var51; - var53 = method3711(var0); + for (var43 = method3708(var19, var0); var43 > var20[var42]; var43 = var43 << 1 | var44) { + ++var42; + var44 = method3711(var0); } - var46 = var25[var52 - var24[var51]]; + var45 = var22[var43 - var21[var42]]; } else { - int var48 = -1; - int var49 = 1; + var46 = -1; + var47 = 1; do { - if(var46 == 0) { - var48 += var49; - } else if(var46 == 1) { - var48 += var49 * 2; + if (var45 == 0) { + var46 += var47; + } else if (var45 == 1) { + var46 += var47 * 2; } - var49 *= 2; - if(var45 == 0) { - ++var43; - var45 = 50; - var54 = var0.__ac[var43]; - var22 = var0.__ab[var54]; - var23 = var0.__ak[var54]; - var25 = var0.__al[var54]; - var24 = var0.__aw[var54]; + var47 *= 2; + if (var41 == 0) { + ++var52; + var41 = 50; + var40 = var0.field86[var52]; + var19 = var0.field92[var40]; + var20 = var0.field89[var40]; + var22 = var0.field91[var40]; + var21 = var0.field90[var40]; } - --var45; - var51 = var22; + --var41; + var42 = var19; - for(var52 = method3708(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { - ++var51; - var53 = method3711(var0); + for (var43 = method3708(var19, var0); var43 > var20[var42]; var43 = var43 << 1 | var44) { + ++var42; + var44 = method3711(var0); } - var46 = var25[var52 - var24[var51]]; - } while(var46 == 0 || var46 == 1); + var45 = var22[var43 - var21[var42]]; + } while(var45 == 0 || var45 == 1); - ++var48; - var1 = var0.__aj[var0.__av[var0.__ar[0]] & 255]; + ++var46; + var24 = var0.field83[var0.field84[var0.field85[0]] & 255]; + var10000 = var0.field77; - for(var0.__b[var1 & 255] += var48; var48 > 0; --var48) { - WorldMapSection0.__y_p[var47] = var1 & 255; - ++var47; + for (var10000[var24 & 255] += var46; var46 > 0; --var46) { + WorldMapSection0.field1056[var39] = var24 & 255; + ++var39; } } } - var0.__a = 0; - var0.__i = 0; - var0.__r[0] = 0; + var0.field70 = 0; + var0.field69 = 0; + var0.field79[0] = 0; - for(var36 = 1; var36 <= 256; ++var36) { - var0.__r[var36] = var0.__b[var36 - 1]; + for (var25 = 1; var25 <= 256; ++var25) { + var0.field79[var25] = var0.field77[var25 - 1]; } - for(var36 = 1; var36 <= 256; ++var36) { - var0.__r[var36] += var0.__r[var36 - 1]; + for (var25 = 1; var25 <= 256; ++var25) { + var10000 = var0.field79; + var10000[var25] += var0.field79[var25 - 1]; } - for(var36 = 0; var36 < var47; ++var36) { - var1 = (byte)(WorldMapSection0.__y_p[var36] & 255); - WorldMapSection0.__y_p[var0.__r[var1 & 255]] |= var36 << 8; - ++var0.__r[var1 & 255]; + for (var25 = 0; var25 < var39; ++var25) { + var24 = (byte)(WorldMapSection0.field1056[var25] & 255); + var10000 = WorldMapSection0.field1056; + int var53 = var0.field79[var24 & 255]; + var10000[var53] |= var25 << 8; + var54 = var0.field79[var24 & 255]++; } - var0.__y = WorldMapSection0.__y_p[var0.__t] >> 8; - var0.__c = 0; - var0.__y = WorldMapSection0.__y_p[var0.__y]; - var0.__h = (byte)(var0.__y & 255); - var0.__y >>= 8; - ++var0.__c; - var0.__ae = var47; + var0.field75 = WorldMapSection0.field1056[var0.field74] >> 8; + var0.field78 = 0; + var0.field75 = WorldMapSection0.field1056[var0.field75]; + var0.field76 = (byte)(var0.field75 & 255); + var0.field75 >>= 8; + ++var0.field78; + var0.field93 = var39; method3705(var0); - if(var0.__ae + 1 == var0.__c && var0.__a == 0) { - var26 = true; + if (var0.field93 + 1 == var0.field78 && var0.field70 == 0) { + var23 = true; break; } - var26 = false; + var23 = false; break; } } @@ -564,19 +563,18 @@ public final class Bzip2Decompressor { signature = "(ILgt;)I" ) static int method3708(int var0, Bzip2State var1) { - while(var1.__j < var0) { - var1.__z = var1.__z << 8 | var1.__g[var1.__l] & 255; - var1.__j += 8; - ++var1.__l; - ++var1.__e; - if(var1.__e == 0) { - ; + while (var1.field72 < var0) { + var1.field71 = var1.field71 << 8 | var1.field62[var1.field63] & 255; + var1.field72 += 8; + ++var1.field63; + ++var1.field64; + if (var1.field64 == 0) { } } - int var3 = var1.__z >> var1.__j - var0 & (1 << var0) - 1; - var1.__j -= var0; - return var3; + int var2 = var1.field71 >> var1.field72 - var0 & (1 << var0) - 1; + var1.field72 -= var0; + return var2; } @ObfuscatedName("g") @@ -584,12 +582,12 @@ public final class Bzip2Decompressor { signature = "(Lgt;)V" ) static void method3710(Bzip2State var0) { - var0.__v = 0; + var0.field80 = 0; - for(int var1 = 0; var1 < 256; ++var1) { - if(var0.__ag[var1]) { - var0.__aj[var0.__v] = (byte)var1; - ++var0.__v; + for (int var1 = 0; var1 < 256; ++var1) { + if (var0.field81[var1]) { + var0.field83[var0.field80] = (byte)var1; + ++var0.field80; } } @@ -600,42 +598,47 @@ public final class Bzip2Decompressor { int var7 = 0; int var8; - for(var8 = var4; var8 <= var5; ++var8) { - for(int var9 = 0; var9 < var6; ++var9) { - if(var8 == var3[var9]) { + int var9; + for (var8 = var4; var8 <= var5; ++var8) { + for (var9 = 0; var9 < var6; ++var9) { + if (var8 == var3[var9]) { var2[var7] = var9; ++var7; } } } - for(var8 = 0; var8 < 23; ++var8) { + for (var8 = 0; var8 < 23; ++var8) { var1[var8] = 0; } - for(var8 = 0; var8 < var6; ++var8) { + for (var8 = 0; var8 < var6; ++var8) { ++var1[var3[var8] + 1]; } - for(var8 = 1; var8 < 23; ++var8) { + for (var8 = 1; var8 < 23; ++var8) { var1[var8] += var1[var8 - 1]; } - for(var8 = 0; var8 < 23; ++var8) { + for (var8 = 0; var8 < 23; ++var8) { var0[var8] = 0; } - int var10 = 0; + var9 = 0; - for(var8 = var4; var8 <= var5; ++var8) { - var10 += var1[var8 + 1] - var1[var8]; - var0[var8] = var10 - 1; - var10 <<= 1; + for (var8 = var4; var8 <= var5; ++var8) { + var9 += var1[var8 + 1] - var1[var8]; + var0[var8] = var9 - 1; + var9 <<= 1; } - for(var8 = var4 + 1; var8 <= var5; ++var8) { + for (var8 = var4 + 1; var8 <= var5; ++var8) { var1[var8] = (var0[var8 - 1] + 1 << 1) - var1[var8]; } } + + static { + Bzip2Decompressor_state = new Bzip2State(); + } } diff --git a/runescape-client/src/main/java/Bzip2State.java b/runescape-client/src/main/java/Bzip2State.java index 41c6b17ddc..8bc2fb66a7 100644 --- a/runescape-client/src/main/java/Bzip2State.java +++ b/runescape-client/src/main/java/Bzip2State.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -7,149 +6,149 @@ import net.runelite.mapping.ObfuscatedName; @Implements("Bzip2State") public final class Bzip2State { @ObfuscatedName("m") - final int __m; + final int field56; @ObfuscatedName("f") - final int __f; + final int field57; @ObfuscatedName("q") - final int __q; + final int field58; @ObfuscatedName("w") - final int __w; + final int field59; @ObfuscatedName("o") - final int __o; + final int field60; @ObfuscatedName("u") - final int __u; + final int field61; @ObfuscatedName("g") - byte[] __g; + byte[] field62; @ObfuscatedName("l") @ObfuscatedGetter( intValue = -1510817847 ) - int __l; + int field63; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -473971741 ) - int __e; + int field64; @ObfuscatedName("x") - byte[] __x; + byte[] field65; @ObfuscatedName("d") @ObfuscatedGetter( intValue = -861462251 ) - int __d; + int field66; @ObfuscatedName("k") @ObfuscatedGetter( intValue = 594179173 ) - int __k; + int field67; @ObfuscatedName("n") @ObfuscatedGetter( intValue = 1860254567 ) - int __n; + int field68; @ObfuscatedName("i") - byte __i; + byte field69; @ObfuscatedName("a") @ObfuscatedGetter( intValue = -1994129645 ) - int __a; + int field70; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -1793367959 ) - int __z; + int field71; @ObfuscatedName("j") @ObfuscatedGetter( intValue = -1987934943 ) - int __j; + int field72; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 1172102327 ) - int __s; + int field73; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 1502359789 ) - int __t; + int field74; @ObfuscatedName("y") @ObfuscatedGetter( intValue = -953353963 ) - int __y; + int field75; @ObfuscatedName("h") @ObfuscatedGetter( intValue = -1981923611 ) - int __h; + int field76; @ObfuscatedName("b") - int[] __b; + int[] field77; @ObfuscatedName("c") @ObfuscatedGetter( intValue = -557334365 ) - int __c; + int field78; @ObfuscatedName("r") - int[] __r; + int[] field79; @ObfuscatedName("v") @ObfuscatedGetter( intValue = -886333045 ) - int __v; + int field80; @ObfuscatedName("ag") - boolean[] __ag; + boolean[] field81; @ObfuscatedName("aq") - boolean[] __aq; + boolean[] field82; @ObfuscatedName("aj") - byte[] __aj; + byte[] field83; @ObfuscatedName("av") - byte[] __av; + byte[] field84; @ObfuscatedName("ar") - int[] __ar; + int[] field85; @ObfuscatedName("ac") - byte[] __ac; + byte[] field86; @ObfuscatedName("ay") - byte[] __ay; + byte[] field87; @ObfuscatedName("ah") - byte[][] __ah; + byte[][] field88; @ObfuscatedName("ak") - int[][] __ak; + int[][] field89; @ObfuscatedName("aw") - int[][] __aw; + int[][] field90; @ObfuscatedName("al") - int[][] __al; + int[][] field91; @ObfuscatedName("ab") - int[] __ab; + int[] field92; @ObfuscatedName("ae") @ObfuscatedGetter( intValue = 444639767 ) - int __ae; + int field93; Bzip2State() { - this.__m = 4096; - this.__f = 16; - this.__q = 258; - this.__w = 6; - this.__o = 50; - this.__u = 18002; - this.__l = 0; - this.__d = 0; - this.__b = new int[256]; - this.__r = new int[257]; - this.__ag = new boolean[256]; - this.__aq = new boolean[16]; - this.__aj = new byte[256]; - this.__av = new byte[4096]; - this.__ar = new int[16]; - this.__ac = new byte[18002]; - this.__ay = new byte[18002]; - this.__ah = new byte[6][258]; - this.__ak = new int[6][258]; - this.__aw = new int[6][258]; - this.__al = new int[6][258]; - this.__ab = new int[6]; + this.field56 = 4096; + this.field57 = 16; + this.field58 = 258; + this.field59 = 6; + this.field60 = 50; + this.field61 = 18002; + this.field63 = 0; + this.field66 = 0; + this.field77 = new int[256]; + this.field79 = new int[257]; + this.field81 = new boolean[256]; + this.field82 = new boolean[16]; + this.field83 = new byte[256]; + this.field84 = new byte[4096]; + this.field85 = new int[16]; + this.field86 = new byte[18002]; + this.field87 = new byte[18002]; + this.field88 = new byte[6][258]; + this.field89 = new int[6][258]; + this.field90 = new int[6][258]; + this.field91 = new int[6][258]; + this.field92 = new int[6]; } } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index ccea55acb9..6b70aefc8e 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -15,12 +15,12 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Canvas") public final class Canvas extends java.awt.Canvas { @ObfuscatedName("s") - public static String[] __ao_s; + public static String[] field94; @ObfuscatedName("gk") @ObfuscatedGetter( intValue = -1131782991 ) - static int __ao_gk; + static int field95; @ObfuscatedName("jk") @ObfuscatedSignature( signature = "Lbr;" @@ -54,7 +54,7 @@ public final class Canvas extends java.awt.Canvas { ) static String method860(Throwable var0) throws IOException { String var1; - if(var0 instanceof RunException) { + if (var0 instanceof RunException) { RunException var2 = (RunException)var0; var1 = var2.string + " | "; var0 = var2.throwable; @@ -70,20 +70,20 @@ public final class Canvas extends java.awt.Canvas { BufferedReader var5 = new BufferedReader(new StringReader(var4)); String var6 = var5.readLine(); - while(true) { - while(true) { + while (true) { + while (true) { String var7 = var5.readLine(); - if(var7 == null) { + if (var7 == null) { var1 = var1 + "| " + var6; return var1; } int var8 = var7.indexOf(40); int var9 = var7.indexOf(41, var8 + 1); - if(var8 >= 0 && var9 >= 0) { + if (var8 >= 0 && var9 >= 0) { String var10 = var7.substring(var8 + 1, var9); int var11 = var10.indexOf(".java:"); - if(var11 >= 0) { + if (var11 >= 0) { var10 = var10.substring(0, var11) + var10.substring(var11 + 5); var1 = var1 + var10 + ' '; continue; @@ -117,42 +117,43 @@ public final class Canvas extends java.awt.Canvas { static int method861(int var0, Script var1, boolean var2) { int var3; int var4; - if(var0 == 100) { + Widget var6; + if (var0 == 100) { 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) { + int var9 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; + if (var4 == 0) { throw new RuntimeException(); } else { - Widget var6 = Huffman.getWidget(var3); - if(var6.children == null) { - var6.children = new Widget[var5 + 1]; + var6 = Huffman.getWidget(var3); + if (var6.children == null) { + var6.children = new Widget[var9 + 1]; } - if(var6.children.length <= var5) { - Widget[] var7 = new Widget[var5 + 1]; + if (var6.children.length <= var9) { + Widget[] var7 = new Widget[var9 + 1]; - for(int var8 = 0; var8 < var6.children.length; ++var8) { + for (int var8 = 0; var8 < var6.children.length; ++var8) { var7[var8] = var6.children[var8]; } var6.children = var7; } - if(var5 > 0 && var6.children[var5 - 1] == null) { - throw new RuntimeException("" + (var5 - 1)); + if (var9 > 0 && var6.children[var9 - 1] == null) { + throw new RuntimeException("" + (var9 - 1)); } else { - Widget var12 = new Widget(); - var12.type = var4; - var12.parentId = var12.id = var6.id; - var12.childIndex = var5; - var12.isIf3 = true; - var6.children[var5] = var12; - if(var2) { - WorldMapIcon1.__t_i = var12; + Widget var10 = new Widget(); + var10.type = var4; + var10.parentId = var10.id = var6.id; + var10.childIndex = var9; + var10.isIf3 = true; + var6.children[var9] = var10; + if (var2) { + WorldMapIcon1.field1030 = var10; } else { - class12.__n_n = var12; + class12.field1111 = var10; } class22.method295(var6); @@ -160,27 +161,27 @@ public final class Canvas extends java.awt.Canvas { } } } else { - Widget var9; - if(var0 == 101) { - var9 = var2?WorldMapIcon1.__t_i:class12.__n_n; - Widget var10 = Huffman.getWidget(var9.id); - var10.children[var9.childIndex] = null; - class22.method295(var10); + Widget var5; + if (var0 == 101) { + var5 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + var6 = Huffman.getWidget(var5.id); + var6.children[var5.childIndex] = null; + class22.method295(var6); return 1; - } else if(var0 == 102) { - var9 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - var9.children = null; - class22.method295(var9); + } else if (var0 == 102) { + var5 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + var5.children = null; + class22.method295(var5); return 1; - } else if(var0 != 200) { - if(var0 == 201) { - var9 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - if(var9 != null) { + } else if (var0 != 200) { + if (var0 == 201) { + var5 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + if (var5 != null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; - if(var2) { - WorldMapIcon1.__t_i = var9; + if (var2) { + WorldMapIcon1.field1030 = var5; } else { - class12.__n_n = var9; + class12.field1111 = var5; } } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; @@ -194,13 +195,13 @@ public final class Canvas extends java.awt.Canvas { 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) { + var6 = class204.getWidgetChild(var3, var4); + if (var6 != null && var4 != -1) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; - if(var2) { - WorldMapIcon1.__t_i = var11; + if (var2) { + WorldMapIcon1.field1030 = var6; } else { - class12.__n_n = var11; + class12.field1111 = var6; } } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; @@ -219,13 +220,13 @@ public final class Canvas extends java.awt.Canvas { public static void method858(int var0, AbstractIndexCache var1, String var2, String var3, int var4, boolean var5) { int var6 = var1.getArchiveId(var2); int var7 = var1.getRecordId(var6, var3); - class214.__hf_o = 1; - class214.__hf_u = var1; + class214.field1129 = 1; + class214.field1130 = var1; class30.musicTrackArchiveId = var6; GrandExchangeOffer.musicTrackFileId = var7; - WorldMapLabel.__aj_e = var4; + WorldMapLabel.field1039 = var4; RectangleMode.musicTrackBoolean = var5; - FaceNormal.__el_x = var0; + FaceNormal.field344 = var0; } @ObfuscatedName("ha") @@ -234,27 +235,27 @@ public final class Canvas extends java.awt.Canvas { garbageValue = "-1032035944" ) static final void method855() { - for(class68 var0 = (class68)Client.__client_kh.last(); var0 != null; var0 = (class68)Client.__client_kh.previous()) { - if(var0.field910 > 0) { + for (class68 var0 = (class68)Client.field214.last(); var0 != null; var0 = (class68)Client.field214.previous()) { + if (var0.field910 > 0) { --var0.field910; } - if(var0.field910 == 0) { - if(var0.field903 < 0 || VarbitDefinition.method4910(var0.field903, var0.field905)) { + if (var0.field910 == 0) { + if (var0.field903 < 0 || VarbitDefinition.method4910(var0.field903, var0.field905)) { ParamKeyDefinition.method4933(var0.field911, var0.field906, var0.field913, var0.field901, var0.field903, var0.field904, var0.field905); var0.remove(); } } else { - if(var0.field909 > 0) { + if (var0.field909 > 0) { --var0.field909; } - if(var0.field909 == 0 && var0.field913 >= 1 && var0.field901 >= 1 && var0.field913 <= 102 && var0.field901 <= 102 && (var0.field899 < 0 || VarbitDefinition.method4910(var0.field899, var0.field908))) { + if (var0.field909 == 0 && var0.field913 >= 1 && var0.field901 >= 1 && var0.field913 <= 102 && var0.field901 <= 102 && (var0.field899 < 0 || VarbitDefinition.method4910(var0.field899, var0.field908))) { ParamKeyDefinition.method4933(var0.field911, var0.field906, var0.field913, var0.field901, var0.field899, var0.field907, var0.field908); var0.field909 = -1; - if(var0.field903 == var0.field899 && var0.field903 == -1) { + if (var0.field903 == var0.field899 && var0.field903 == -1) { var0.remove(); - } else if(var0.field899 == var0.field903 && var0.field904 == var0.field907 && var0.field908 == var0.field905) { + } else if (var0.field899 == var0.field903 && var0.field904 == var0.field907 && var0.field908 == var0.field905) { var0.remove(); } } diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index 66e6aaea2f..1e5967e1e3 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -33,13 +33,13 @@ public class ChatChannel { Message addMessage(int var1, String var2, String var3, String var4) { Message var5 = this.messages[99]; - for(int var6 = this.count; var6 > 0; --var6) { - if(var6 != 100) { + for (int var6 = this.count; var6 > 0; --var6) { + if (var6 != 100) { this.messages[var6] = this.messages[var6 - 1]; } } - if(var5 == null) { + if (var5 == null) { var5 = new Message(var1, var2, var4, var3); } else { var5.remove(); @@ -48,7 +48,7 @@ public class ChatChannel { } this.messages[0] = var5; - if(this.count < 100) { + if (this.count < 100) { ++this.count; } @@ -62,7 +62,7 @@ public class ChatChannel { ) @Export("getMessage") Message getMessage(int var1) { - return var1 >= 0 && var1 < this.count?this.messages[var1]:null; + return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; } @ObfuscatedName("q") @@ -81,7 +81,7 @@ public class ChatChannel { garbageValue = "-1857344803" ) public static boolean method2238(char var0) { - return var0 >= ' ' && var0 <= '~'?true:(var0 >= 160 && var0 <= 255?true:var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376); + return var0 >= ' ' && var0 <= '~' ? true : (var0 >= 160 && var0 <= 255 ? true : var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376); } @ObfuscatedName("fk") @@ -90,19 +90,19 @@ public class ChatChannel { garbageValue = "911583338" ) static final void method2225(Actor var0) { - var0.__ay = false; + var0.field10 = false; SequenceDefinition var1; - if(var0.movementSequence != -1) { + if (var0.movementSequence != -1) { var1 = WorldMapAreaData.getSequenceDefinition(var0.movementSequence); - if(var1 != null && var1.frameIds != null) { + if (var1 != null && var1.frameIds != null) { ++var0.movementFrameCycle; - if(var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { + if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { var0.movementFrameCycle = 1; ++var0.movementFrame; Script.method2201(var1, var0.movementFrame, var0.x, var0.y); } - if(var0.movementFrame >= var1.frameIds.length) { + if (var0.movementFrame >= var1.frameIds.length) { var0.movementFrameCycle = 0; var0.movementFrame = 0; Script.method2201(var1, var0.movementFrame, var0.x, var0.y); @@ -112,23 +112,23 @@ public class ChatChannel { } } - if(var0.spotAnimation != -1 && Client.cycle >= var0.__bt) { - if(var0.spotAnimationFrame < 0) { + if (var0.spotAnimation != -1 && Client.cycle >= var0.field14) { + if (var0.spotAnimationFrame < 0) { var0.spotAnimationFrame = 0; } - int var3 = class50.getSpotAnimationDefinition(var0.spotAnimation).sequence; - if(var3 != -1) { - SequenceDefinition var2 = WorldMapAreaData.getSequenceDefinition(var3); - if(var2 != null && var2.frameIds != null) { + int var2 = class50.getSpotAnimationDefinition(var0.spotAnimation).sequence; + if (var2 != -1) { + SequenceDefinition var3 = WorldMapAreaData.getSequenceDefinition(var2); + if (var3 != null && var3.frameIds != null) { ++var0.spotAnimationFrameCycle; - if(var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) { + if (var0.spotAnimationFrame < var3.frameIds.length && var0.spotAnimationFrameCycle > var3.frameLengths[var0.spotAnimationFrame]) { var0.spotAnimationFrameCycle = 1; ++var0.spotAnimationFrame; - Script.method2201(var2, var0.spotAnimationFrame, var0.x, var0.y); + Script.method2201(var3, var0.spotAnimationFrame, var0.x, var0.y); } - if(var0.spotAnimationFrame >= var2.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var2.frameIds.length)) { + if (var0.spotAnimationFrame >= var3.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var3.frameIds.length)) { var0.spotAnimation = -1; } } else { @@ -139,43 +139,43 @@ public class ChatChannel { } } - if(var0.sequence != -1 && var0.sequenceDelay <= 1) { + if (var0.sequence != -1 && var0.sequenceDelay <= 1) { var1 = WorldMapAreaData.getSequenceDefinition(var0.sequence); - if(var1.__j == 1 && var0.__ch > 0 && var0.__bw <= Client.cycle && var0.__cr < Client.cycle) { + if (var1.field781 == 1 && var0.field25 > 0 && var0.field19 <= Client.cycle && var0.field20 < Client.cycle) { var0.sequenceDelay = 1; return; } } - if(var0.sequence != -1 && var0.sequenceDelay == 0) { + if (var0.sequence != -1 && var0.sequenceDelay == 0) { var1 = WorldMapAreaData.getSequenceDefinition(var0.sequence); - if(var1 != null && var1.frameIds != null) { + if (var1 != null && var1.frameIds != null) { ++var0.sequenceFrameCycle; - if(var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { + if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { var0.sequenceFrameCycle = 1; ++var0.sequenceFrame; Script.method2201(var1, var0.sequenceFrame, var0.x, var0.y); } - if(var0.sequenceFrame >= var1.frameIds.length) { + if (var0.sequenceFrame >= var1.frameIds.length) { var0.sequenceFrame -= var1.frameCount; - ++var0.__bj; - if(var0.__bj >= var1.__z) { + ++var0.field13; + if (var0.field13 >= var1.field780) { var0.sequence = -1; - } else if(var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { Script.method2201(var1, var0.sequenceFrame, var0.x, var0.y); } else { var0.sequence = -1; } } - var0.__ay = var1.__k; + var0.field10 = var1.field778; } else { var0.sequence = -1; } } - if(var0.sequenceDelay > 0) { + if (var0.sequenceDelay > 0) { --var0.sequenceDelay; } @@ -187,162 +187,163 @@ public class ChatChannel { garbageValue = "94" ) static final void method2237(Widget var0, int var1, int var2) { - if(var0.buttonType == 1) { + if (var0.buttonType == 1) { Tiles.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); } String var3; - if(var0.buttonType == 2 && !Client.isSpellSelected) { + if (var0.buttonType == 2 && !Client.isSpellSelected) { var3 = class198.method3745(var0); - if(var3 != null) { + if (var3 != null) { Tiles.insertMenuItemNoShift(var3, BufferedFile.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); } } - if(var0.buttonType == 3) { + if (var0.buttonType == 3) { Tiles.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); } - if(var0.buttonType == 4) { + if (var0.buttonType == 4) { Tiles.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); } - if(var0.buttonType == 5) { + if (var0.buttonType == 5) { Tiles.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); } - if(var0.buttonType == 6 && Client.__client_mo == null) { + if (var0.buttonType == 6 && Client.field127 == null) { Tiles.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); } int var4; int var5; - int var13; - if(var0.type == 2) { - var13 = 0; + int var6; + if (var0.type == 2) { + var6 = 0; - for(var4 = 0; var4 < var0.height; ++var4) { - for(var5 = 0; var5 < var0.width; ++var5) { - int var6 = (var0.paddingX + 32) * var5; - int var7 = (var0.paddingY + 32) * var4; - if(var13 < 20) { - var6 += var0.inventoryXOffsets[var13]; - var7 += var0.inventoryYOffsets[var13]; + for (var4 = 0; var4 < var0.height; ++var4) { + for (var5 = 0; var5 < var0.width; ++var5) { + int var7 = (var0.paddingX + 32) * var5; + int var8 = (var0.paddingY + 32) * var4; + if (var6 < 20) { + var7 += var0.inventoryXOffsets[var6]; + var8 += var0.inventoryYOffsets[var6]; } - if(var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { - Client.dragItemSlotDestination = var13; - UserComparator6.__fg_jh = var0; - if(var0.itemIds[var13] > 0) { - 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.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id); + if (var1 >= var7 && var2 >= var8 && var1 < var7 + 32 && var2 < var8 + 32) { + Client.dragItemSlotDestination = var6; + UserComparator6.field937 = var0; + if (var0.itemIds[var6] > 0) { + ItemDefinition var9 = Skills.getItemDefinition(var0.itemIds[var6] - 1); + if (Client.isItemSelected == 1 && WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) { + if (var0.id != ServerPacket.selectedItemWidget || var6 != HealthBarDefinition.selectedItemSlot) { + Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16748608) + var9.name, 31, var9.id, var6, var0.id); } - } else if(Client.isSpellSelected && WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) { - if((FloorDecoration.selectedSpellFlags & 16) == 16) { - Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id); + } else if (Client.isSpellSelected && WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) { + if ((FloorDecoration.selectedSpellFlags & 16) == 16) { + Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16748608) + var9.name, 32, var9.id, var6, var0.id); } } else { - String[] var9 = var8.inventoryActions; - int var10 = -1; - if(Client.shiftClickDrop && WorldMapEvent.method779()) { - var10 = var8.getShiftClickIndex(); + String[] var10 = var9.inventoryActions; + int var11 = -1; + if (Client.shiftClickDrop && WorldMapEvent.isShiftPressed()) { + var11 = var9.getShiftClickIndex(); } - int var11; - if(WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) { - for(var11 = 4; var11 >= 3; --var11) { - if(var10 != var11) { - AccessFile.addWidgetItemMenuItem(var0, var8, var13, var11, false); + int var12; + if (WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) { + for (var12 = 4; var12 >= 3; --var12) { + if (var11 != var12) { + AccessFile.addWidgetItemMenuItem(var0, var9, var6, var12, false); } } } - if(SecureRandomFuture.method2101(class1.getWidgetClickMask(var0))) { - Tiles.insertMenuItemNoShift("Use", BufferedFile.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id); + if (SecureRandomFuture.method2101(class1.getWidgetClickMask(var0))) { + Tiles.insertMenuItemNoShift("Use", BufferedFile.colorStartTag(16748608) + var9.name, 38, var9.id, var6, var0.id); } - if(WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) { - for(var11 = 2; var11 >= 0; --var11) { - if(var11 != var10) { - AccessFile.addWidgetItemMenuItem(var0, var8, var13, var11, false); + if (WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) { + for (var12 = 2; var12 >= 0; --var12) { + if (var12 != var11) { + AccessFile.addWidgetItemMenuItem(var0, var9, var6, var12, false); } } - if(var10 >= 0) { - AccessFile.addWidgetItemMenuItem(var0, var8, var13, var10, true); + if (var11 >= 0) { + AccessFile.addWidgetItemMenuItem(var0, var9, var6, var11, true); } } - var9 = var0.itemActions; - if(var9 != null) { - for(var11 = 4; var11 >= 0; --var11) { - if(var9[var11] != null) { - byte var12 = 0; - if(var11 == 0) { - var12 = 39; + var10 = var0.itemActions; + if (var10 != null) { + for (var12 = 4; var12 >= 0; --var12) { + if (var10[var12] != null) { + byte var13 = 0; + if (var12 == 0) { + var13 = 39; } - if(var11 == 1) { - var12 = 40; + if (var12 == 1) { + var13 = 40; } - if(var11 == 2) { - var12 = 41; + if (var12 == 2) { + var13 = 41; } - if(var11 == 3) { - var12 = 42; + if (var12 == 3) { + var13 = 42; } - if(var11 == 4) { - var12 = 43; + if (var12 == 4) { + var13 = 43; } - Tiles.insertMenuItemNoShift(var9[var11], BufferedFile.colorStartTag(0xff9040) + var8.name, var12, var8.id, var13, var0.id); + Tiles.insertMenuItemNoShift(var10[var12], BufferedFile.colorStartTag(16748608) + var9.name, var13, var9.id, var6, var0.id); } } } - Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(0xff9040) + var8.name, 1005, var8.id, var13, var0.id); + Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16748608) + var9.name, 1005, var9.id, var6, var0.id); } } } - ++var13; + ++var6; } } } - if(var0.isIf3) { - if(Client.isSpellSelected) { - if(WorldComparator.method58(class1.getWidgetClickMask(var0)) && (FloorDecoration.selectedSpellFlags & 32) == 32) { - Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); + if (var0.isIf3) { + if (Client.isSpellSelected) { + if (WorldComparator.method58(class1.getWidgetClickMask(var0)) && (FloorDecoration.selectedSpellFlags & 32) == 32) { + 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.insertMenuItemNoShift(var14, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id); + String var14; + for (var6 = 9; var6 >= 5; --var6) { + var14 = GameShell.method1060(var0, var6); + if (var14 != null) { + Tiles.insertMenuItemNoShift(var14, var0.dataText, 1007, var6 + 1, var0.childIndex, var0.id); } } var3 = class198.method3745(var0); - if(var3 != null) { + if (var3 != null) { Tiles.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); } - for(var4 = 4; var4 >= 0; --var4) { - String var15 = GameShell.method1060(var0, var4); - if(var15 != null) { - class16.insertMenuItem(var15, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.__fz); + for (var4 = 4; var4 >= 0; --var4) { + var14 = GameShell.method1060(var0, var4); + if (var14 != null) { + class16.insertMenuItem(var14, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.field985); } } var5 = class1.getWidgetClickMask(var0); - boolean var16 = (var5 & 1) != 0; - if(var16) { + boolean var15 = (var5 & 1) != 0; + if (var15) { 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 608c06c72c..68f78b31e8 100644 --- a/runescape-client/src/main/java/ClanChat.java +++ b/runescape-client/src/main/java/ClanChat.java @@ -26,7 +26,7 @@ public class ClanChat extends UserList { @Export("owner") public String owner; @ObfuscatedName("k") - public byte __k; + public byte field96; @ObfuscatedName("n") @ObfuscatedGetter( intValue = -1534670751 @@ -37,7 +37,7 @@ public class ClanChat extends UserList { @ObfuscatedGetter( intValue = 386706253 ) - int __i; + int field97; @ObfuscatedSignature( signature = "(Llx;Lky;)V" @@ -46,7 +46,7 @@ public class ClanChat extends UserList { super(100); this.name = null; this.owner = null; - this.__i = 1; + this.field97 = 1; this.loginType = var1; this.localUser = var2; } @@ -76,7 +76,7 @@ public class ClanChat extends UserList { signature = "(Ljava/lang/String;I)V", garbageValue = "242122326" ) - final void __q_472(String var1) { + final void method76(String var1) { this.name = HealthBarUpdate.method1722(var1); } @@ -85,7 +85,7 @@ public class ClanChat extends UserList { signature = "(Ljava/lang/String;B)V", garbageValue = "103" ) - final void __x_473(String var1) { + final void method77(String var1) { this.owner = HealthBarUpdate.method1722(var1); } @@ -96,51 +96,51 @@ public class ClanChat extends UserList { ) @Export("readUpdate") public final void readUpdate(Buffer var1) { - this.__x_473(var1.readStringCp1252NullTerminated()); + this.method77(var1.readStringCp1252NullTerminated()); long var2 = var1.readLong(); - long var5 = var2; - String var4; + long var4 = var2; + String var6; int var7; - if(var2 > 0L && var2 < 6582952005840035281L) { - if(var2 % 37L == 0L) { - var4 = null; + if (var2 > 0L && var2 < 6582952005840035281L) { + if (var2 % 37L == 0L) { + var6 = null; } else { var7 = 0; - for(long var13 = var2; var13 != 0L; var13 /= 37L) { + for (long var8 = var2; var8 != 0L; var8 /= 37L) { ++var7; } - StringBuilder var15 = new StringBuilder(var7); + StringBuilder var11 = new StringBuilder(var7); - while(var5 != 0L) { - long var11 = var5; - var5 /= 37L; - var15.append(class306.base37Table[(int)(var11 - 37L * var5)]); + while (var4 != 0L) { + long var9 = var4; + var4 /= 37L; + var11.append(class306.base37Table[(int)(var9 - 37L * var4)]); } - var4 = var15.reverse().toString(); + var6 = var11.reverse().toString(); } } else { - var4 = null; + var6 = null; } - this.__q_472(var4); - this.__k = var1.readByte(); + this.method76(var6); + this.field96 = var1.readByte(); var7 = var1.readUnsignedByte(); - if(var7 != 255) { + if (var7 != 255) { this.clear(); - for(int var8 = 0; var8 < var7; ++var8) { - ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); - int var10 = var1.__ag_302(); - var9.set(var10, ++this.__i - 1); - var9.rank = var1.readByte(); + for (int var12 = 0; var12 < var7; ++var12) { + ClanMate var13 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); + int var10 = var1.method43(); + var13.set(var10, ++this.field97 - 1); + var13.rank = var1.readByte(); var1.readStringCp1252NullTerminated(); - this.__cp_475(var9); + this.method79(var13); } - } + } @ObfuscatedName("a") @@ -148,39 +148,39 @@ public class ClanChat extends UserList { signature = "(Lgr;B)V", garbageValue = "24" ) - public final void __a_474(Buffer var1) { + public final void method78(Buffer var1) { Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - int var3 = var1.__ag_302(); + int var3 = var1.method43(); byte var4 = var1.readByte(); boolean var5 = false; - if(var4 == -128) { + if (var4 == -128) { var5 = true; } ClanMate var6; - if(var5) { - if(this.size() == 0) { + if (var5) { + if (this.size() == 0) { return; } var6 = (ClanMate)this.getByCurrentUsername(var2); - if(var6 != null && var6.world() == var3) { + if (var6 != null && var6.world() == var3) { this.remove(var6); } } else { var1.readStringCp1252NullTerminated(); var6 = (ClanMate)this.getByCurrentUsername(var2); - if(var6 == null) { - if(this.size() > super.capacity) { + if (var6 == null) { + if (this.size() > super.capacity) { return; } var6 = (ClanMate)this.addLastNoPreviousUsername(var2); } - var6.set(var3, ++this.__i - 1); + var6.set(var3, ++this.field97 - 1); var6.rank = var4; - this.__cp_475(var6); + this.method79(var6); } } @@ -192,7 +192,7 @@ public class ClanChat extends UserList { ) @Export("clearFriends") public final void clearFriends() { - for(int var1 = 0; var1 < this.size(); ++var1) { + for (int var1 = 0; var1 < this.size(); ++var1) { ((ClanMate)this.get(var1)).clearIsFriend(); } @@ -205,7 +205,7 @@ public class ClanChat extends UserList { ) @Export("clearIgnoreds") public final void clearIgnoreds() { - for(int var1 = 0; var1 < this.size(); ++var1) { + for (int var1 = 0; var1 < this.size(); ++var1) { ((ClanMate)this.get(var1)).clearIsIgnored(); } @@ -216,8 +216,8 @@ public class ClanChat extends UserList { signature = "(Ljk;I)V", garbageValue = "-128608554" ) - final void __cp_475(ClanMate var1) { - if(var1.username().equals(this.localUser.username())) { + final void method79(ClanMate var1) { + if (var1.username().equals(this.localUser.username())) { this.rank = var1.rank; } diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java index 1939253721..baf085d3fa 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -41,7 +41,7 @@ public class ClanMate extends Buddy { ) @Export("isFriend") public final boolean isFriend() { - if(this.isFriend0 == TriBool.TriBool_unknown) { + if (this.isFriend0 == TriBool.TriBool_unknown) { this.fillIsFriend(); } @@ -55,7 +55,7 @@ public class ClanMate extends Buddy { ) @Export("fillIsFriend") void fillIsFriend() { - this.isFriend0 = WorldMapArea.friendSystem.friendsList.contains(super.username0)?TriBool.TriBool_true:TriBool.TriBool_false; + this.isFriend0 = WorldMapArea.friendSystem.friendsList.contains(super.username0) ? TriBool.TriBool_true : TriBool.TriBool_false; } @ObfuscatedName("w") @@ -75,7 +75,7 @@ public class ClanMate extends Buddy { ) @Export("isIgnored") public final boolean isIgnored() { - if(this.isIgnored0 == TriBool.TriBool_unknown) { + if (this.isIgnored0 == TriBool.TriBool_unknown) { this.fillIsIgnored(); } @@ -89,6 +89,6 @@ public class ClanMate extends Buddy { ) @Export("fillIsIgnored") void fillIsIgnored() { - this.isIgnored0 = WorldMapArea.friendSystem.ignoreList.contains(super.username0)?TriBool.TriBool_true:TriBool.TriBool_false; + this.isIgnored0 = WorldMapArea.friendSystem.ignoreList.contains(super.username0) ? TriBool.TriBool_true : TriBool.TriBool_false; } } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 413e46bf08..10787ccfb1 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -30,7 +30,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 1348053843 ) - static int __client_oo; + static int field98; @ObfuscatedName("os") @ObfuscatedGetter( intValue = -546798303 @@ -41,15 +41,15 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( longValue = 8818983958751331899L ) - static long __client_oa; + static long field99; @ObfuscatedName("od") - static boolean[] __client_od; + static boolean[] field100; @ObfuscatedName("oq") - static boolean[] __client_oq; + static boolean[] field101; @ObfuscatedName("ot") - static boolean[] __client_ot; + static boolean[] field102; @ObfuscatedName("nt") - static boolean __client_nt; + static boolean field103; @ObfuscatedName("ng") @ObfuscatedGetter( intValue = -1379876433 @@ -63,16 +63,16 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -451622431 ) - public static int __client_ss; + public static int field104; @ObfuscatedName("na") @ObfuscatedGetter( intValue = -934082817 ) - static int __client_na; + static int field105; @ObfuscatedName("nn") - static boolean __client_nn; + static boolean field106; @ObfuscatedName("qq") - static boolean __client_qq; + static boolean field107; @ObfuscatedName("mt") @ObfuscatedGetter( intValue = -1972775883 @@ -89,7 +89,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -843739713 ) - static int __client_nw; + static int field108; @ObfuscatedName("mr") @ObfuscatedSignature( signature = "Lho;" @@ -112,7 +112,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 1939745821 ) - static int __client_nl; + static int field109; @ObfuscatedName("mx") @ObfuscatedSignature( signature = "Lho;" @@ -161,12 +161,12 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 1019025247 ) - static int __client_nk; + static int field110; @ObfuscatedName("np") @ObfuscatedGetter( intValue = 1881890525 ) - static int __client_np; + static int field111; @ObfuscatedName("pd") @ObfuscatedGetter( intValue = -362336323 @@ -183,11 +183,11 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -34294211 ) - static int __client_qy; + static int field112; @ObfuscatedName("tp") - static int[] __client_tp; + static int[] field113; @ObfuscatedName("th") - static int[] __client_th; + static int[] field114; @ObfuscatedName("ny") @Export("isDraggingWidget") static boolean isDraggingWidget; @@ -219,24 +219,24 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -818676431 ) - static int __client_qc; + static int field115; @ObfuscatedName("nz") - static int[] __client_nz; + static int[] field116; @ObfuscatedName("ns") @ObfuscatedGetter( intValue = 743073293 ) - static int __client_ns; + static int field117; @ObfuscatedName("sd") @ObfuscatedGetter( intValue = 944933439 ) - static int __client_sd; + static int field118; @ObfuscatedName("ru") @ObfuscatedSignature( signature = "Lhi;" ) - static PlayerAppearance __client_ru; + static PlayerAppearance field119; @ObfuscatedName("qa") @ObfuscatedGetter( intValue = -1481002083 @@ -259,7 +259,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -1605855913 ) - static int __client_sl; + static int field120; @ObfuscatedName("md") @ObfuscatedSignature( signature = "Lho;" @@ -279,22 +279,22 @@ public final class Client extends GameShell implements Usernamed { @Export("queuedSoundEffectDelays") static int[] queuedSoundEffectDelays; @ObfuscatedName("nr") - static int[] __client_nr; + static int[] field121; @ObfuscatedName("nv") @ObfuscatedGetter( intValue = -758575207 ) - static int __client_nv; + static int field122; @ObfuscatedName("nd") @ObfuscatedGetter( intValue = 760022015 ) - static int __client_nd; + static int field123; @ObfuscatedName("ni") @ObfuscatedGetter( intValue = 1990512261 ) - static int __client_ni; + static int field124; @ObfuscatedName("qe") @ObfuscatedSignature( signature = "[Lci;" @@ -314,12 +314,12 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 587773171 ) - static int __client_ph; + static int field125; @ObfuscatedName("pp") @ObfuscatedGetter( longValue = -1704358328771670975L ) - static long __client_pp; + static long field126; @ObfuscatedName("sk") @ObfuscatedSignature( signature = "Llm;" @@ -330,19 +330,19 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedSignature( signature = "Lho;" ) - static Widget __client_mo; + static Widget field127; @ObfuscatedName("qf") @ObfuscatedGetter( intValue = 1365951359 ) - static int __client_qf; + static int field128; @ObfuscatedName("nh") @ObfuscatedGetter( intValue = -278874973 ) - static int __client_nh; + static int field129; @ObfuscatedName("rw") - static short __client_rw; + static short field130; @ObfuscatedName("qp") @ObfuscatedGetter( intValue = -1352723865 @@ -350,13 +350,13 @@ public final class Client extends GameShell implements Usernamed { @Export("soundEffectVolume") static int soundEffectVolume; @ObfuscatedName("rm") - static short __client_rm; + static short field131; @ObfuscatedName("rs") - static short __client_rs; + static short field132; @ObfuscatedName("rp") - static short __client_rp; + static short field133; @ObfuscatedName("ri") - static short __client_ri; + static short field134; @ObfuscatedName("pi") @ObfuscatedGetter( intValue = 864673321 @@ -370,7 +370,7 @@ public final class Client extends GameShell implements Usernamed { @Export("viewportZoom") static int viewportZoom; @ObfuscatedName("rv") - static short __client_rv; + static short field135; @ObfuscatedName("ry") @ObfuscatedGetter( intValue = 2035623995 @@ -405,7 +405,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 1694810089 ) - static int __client_mb; + static int field136; @ObfuscatedName("rr") @ObfuscatedGetter( intValue = 386331251 @@ -422,14 +422,14 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -460406997 ) - static int __client_pm; + static int field137; @ObfuscatedName("pl") @ObfuscatedGetter( intValue = -1362734353 ) - static int __client_pl; + static int field138; @ObfuscatedName("rh") - static boolean[] __client_rh; + static boolean[] field139; @ObfuscatedName("ml") @ObfuscatedGetter( intValue = 1602665191 @@ -446,50 +446,50 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 206275573 ) - static int __client_sx; + static int field140; @ObfuscatedName("rd") - static int[] __client_rd; + static int[] field141; @ObfuscatedName("rl") - static int[] __client_rl; + static int[] field142; @ObfuscatedName("rj") - static int[] __client_rj; + static int[] field143; @ObfuscatedName("rk") - static int[] __client_rk; + static int[] field144; @ObfuscatedName("pn") - static int[] __client_pn; + static int[] field145; @ObfuscatedName("pq") - static int[] __client_pq; + static int[] field146; @ObfuscatedName("oh") @ObfuscatedSignature( signature = "Lje;" ) - static NodeDeque __client_oh; + static NodeDeque field147; @ObfuscatedName("oc") @ObfuscatedSignature( signature = "Lje;" ) - static NodeDeque __client_oc; + static NodeDeque field148; @ObfuscatedName("rb") - static short __client_rb; + static short field149; @ObfuscatedName("re") - static short __client_re; + static short field150; @ObfuscatedName("mf") @ObfuscatedGetter( intValue = -1715020411 ) - static int __client_mf; + static int field151; @ObfuscatedName("pu") - static long[] __client_pu; + static long[] field152; @ObfuscatedName("ms") @ObfuscatedGetter( intValue = 2128395635 ) - static int __client_ms; + static int field153; @ObfuscatedName("nc") @ObfuscatedGetter( intValue = 344308849 ) - static int __client_nc; + static int field154; @ObfuscatedName("nf") @Export("changedSkills") static int[] changedSkills; @@ -500,12 +500,12 @@ public final class Client extends GameShell implements Usernamed { @Export("changedSkillsCount") static int changedSkillsCount; @ObfuscatedName("mn") - static boolean __client_mn; + static boolean field155; @ObfuscatedName("pb") @ObfuscatedGetter( intValue = 1230692157 ) - static int __client_pb; + static int field156; @ObfuscatedName("nq") @ObfuscatedGetter( intValue = 1467519791 @@ -516,16 +516,16 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 535219347 ) - static int __client_mh; + static int field157; @ObfuscatedName("pz") - static String __client_pz; + static String field158; @ObfuscatedName("sj") @ObfuscatedSignature( signature = "Lbj;" ) - static OwnWorldComparator __client_sj; + static OwnWorldComparator field159; @ObfuscatedName("pv") - static int[] __client_pv; + static int[] field160; @ObfuscatedName("w") @ObfuscatedSignature( signature = "[Lfy;" @@ -533,7 +533,7 @@ public final class Client extends GameShell implements Usernamed { @Export("collisionMaps") static CollisionMap[] collisionMaps; @ObfuscatedName("ai") - static boolean __client_ai; + static boolean field161; @ObfuscatedName("ba") @ObfuscatedGetter( intValue = 1412639841 @@ -571,7 +571,7 @@ public final class Client extends GameShell implements Usernamed { @Export("clientType") static int clientType; @ObfuscatedName("bl") - static boolean __client_bl; + static boolean field162; @ObfuscatedName("br") @ObfuscatedGetter( intValue = 244995961 @@ -597,19 +597,19 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -1731573291 ) - static int __client_cn; + static int field163; @ObfuscatedName("cq") @ObfuscatedGetter( intValue = -1313705721 ) - static int __client_cq; + static int field164; @ObfuscatedName("ch") @ObfuscatedGetter( longValue = -6574384275386813769L ) - static long __client_ch; + static long field165; @ObfuscatedName("cw") - static boolean __client_cw; + static boolean field166; @ObfuscatedName("cg") @Export("displayFps") static boolean displayFps; @@ -695,7 +695,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 1154760205 ) - static int __client_dp; + static int field167; @ObfuscatedName("ek") @ObfuscatedGetter( intValue = 1791955261 @@ -712,17 +712,17 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 755300107 ) - static int __client_ex; + static int field168; @ObfuscatedName("ej") @ObfuscatedGetter( intValue = -964416527 ) - static int __client_ej; + static int field169; @ObfuscatedName("el") @ObfuscatedGetter( intValue = 689094231 ) - static int __client_el; + static int field170; @ObfuscatedName("en") @ObfuscatedSignature( signature = "Lfc;" @@ -732,7 +732,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -447055355 ) - static int __client_eo; + static int field171; @ObfuscatedName("ew") @Export("Login_isUsernameRemembered") static boolean Login_isUsernameRemembered; @@ -743,13 +743,13 @@ public final class Client extends GameShell implements Usernamed { @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; @ObfuscatedName("ev") - static byte[] __client_ev; + static byte[] field172; @ObfuscatedName("ez") @ObfuscatedSignature( signature = "[Lcv;" ) @Export("npcs") - static Npc[] npcs; + static NPC[] npcs; @ObfuscatedName("ep") @ObfuscatedGetter( intValue = -1569269731 @@ -763,9 +763,9 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 516059665 ) - static int __client_fw; + static int field173; @ObfuscatedName("fg") - static int[] __client_fg; + static int[] field174; @ObfuscatedName("fj") @ObfuscatedSignature( signature = "Lcl;" @@ -776,9 +776,9 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -1050480853 ) - static int __client_fd; + static int field175; @ObfuscatedName("fh") - static boolean __client_fh; + static boolean field176; @ObfuscatedName("fx") @Export("useBufferedSocket") static boolean useBufferedSocket; @@ -795,27 +795,27 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 829228151 ) - static int __client_fe; + static int field177; @ObfuscatedName("fn") @ObfuscatedGetter( intValue = -597100741 ) - static int __client_fn; + static int field178; @ObfuscatedName("fk") @ObfuscatedGetter( intValue = 8470625 ) - static int __client_fk; + static int field179; @ObfuscatedName("gp") @ObfuscatedGetter( intValue = 685418907 ) - static int __client_gp; + static int field180; @ObfuscatedName("gh") @ObfuscatedGetter( intValue = -1456975367 ) - static int __client_gh; + static int field181; @ObfuscatedName("gg") @Export("isInInstance") static boolean isInInstance; @@ -823,39 +823,39 @@ public final class Client extends GameShell implements Usernamed { @Export("instanceChunkTemplates") static int[][][] instanceChunkTemplates; @ObfuscatedName("gd") - static final int[] __client_gd; + static final int[] field182; @ObfuscatedName("gy") @ObfuscatedGetter( intValue = -134014371 ) - static int __client_gy; + static int field183; @ObfuscatedName("hx") @ObfuscatedGetter( intValue = -1406125895 ) - static int __client_hx; + static int field184; @ObfuscatedName("hn") @ObfuscatedGetter( intValue = -516933613 ) - static int __client_hn; + static int field185; @ObfuscatedName("hr") @ObfuscatedGetter( intValue = 1664350313 ) - static int __client_hr; + static int field186; @ObfuscatedName("hg") @ObfuscatedGetter( intValue = 1658018867 ) - static int __client_hg; + static int field187; @ObfuscatedName("hh") - static boolean __client_hh; + static boolean field188; @ObfuscatedName("hd") @ObfuscatedGetter( intValue = 438998245 ) - static int __client_hd; + static int field189; @ObfuscatedName("hw") @ObfuscatedGetter( intValue = 410614005 @@ -872,22 +872,22 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 218086227 ) - static int __client_hv; + static int field190; @ObfuscatedName("hu") @ObfuscatedGetter( intValue = -480633777 ) - static int __client_hu; + static int field191; @ObfuscatedName("hi") @ObfuscatedGetter( intValue = 402871301 ) - static int __client_hi; + static int field192; @ObfuscatedName("ht") @ObfuscatedGetter( intValue = 1502058429 ) - static int __client_ht; + static int field193; @ObfuscatedName("hj") @ObfuscatedGetter( intValue = -1420078475 @@ -904,17 +904,17 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -441913785 ) - static int __client_hc; + static int field194; @ObfuscatedName("hk") @ObfuscatedGetter( intValue = -1149138989 ) - static int __client_hk; + static int field195; @ObfuscatedName("if") @ObfuscatedGetter( intValue = -952172003 ) - static int __client_if; + static int field196; @ObfuscatedName("ie") @ObfuscatedGetter( intValue = 236939601 @@ -925,26 +925,26 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 351193663 ) - static int __client_in; + static int field197; @ObfuscatedName("il") @ObfuscatedGetter( intValue = -1063713523 ) - public static int __client_il; + public static int field198; @ObfuscatedName("ij") - static boolean __client_ij; + static boolean field199; @ObfuscatedName("iy") @ObfuscatedGetter( intValue = -1213062413 ) - static int __client_iy; + static int field200; @ObfuscatedName("is") - static boolean __client_is; + static boolean field201; @ObfuscatedName("ik") @ObfuscatedGetter( intValue = 910983131 ) - static int __client_ik; + static int field202; @ObfuscatedName("ir") @ObfuscatedGetter( intValue = 616180377 @@ -1036,12 +1036,12 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 1691923909 ) - static int __client_ju; + static int field203; @ObfuscatedName("jz") @ObfuscatedGetter( intValue = -1267243587 ) - static int __client_jz; + static int field204; @ObfuscatedName("jp") @ObfuscatedGetter( intValue = 485534011 @@ -1052,12 +1052,12 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 813973829 ) - static int __client_ja; + static int field205; @ObfuscatedName("je") @ObfuscatedGetter( intValue = 1959822241 ) - static int __client_je; + static int field206; @ObfuscatedName("jy") @ObfuscatedGetter( intValue = -836653679 @@ -1065,7 +1065,7 @@ public final class Client extends GameShell implements Usernamed { @Export("dragItemSlotDestination") static int dragItemSlotDestination; @ObfuscatedName("jl") - static boolean __client_jl; + static boolean field207; @ObfuscatedName("jt") @ObfuscatedGetter( intValue = 1486366835 @@ -1076,7 +1076,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 1084498299 ) - static int __client_jc; + static int field208; @ObfuscatedName("jj") @Export("showLoadingMessages") static boolean showLoadingMessages; @@ -1096,7 +1096,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -836962805 ) - static int __client_jo; + static int field209; @ObfuscatedName("js") @Export("renderSelf") static boolean renderSelf; @@ -1104,14 +1104,14 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -1208823721 ) - static int __client_ke; + static int field210; @ObfuscatedName("ky") @ObfuscatedGetter( intValue = -64320473 ) - static int __client_ky; + static int field211; @ObfuscatedName("kd") - static int[] __client_kd; + static int[] field212; @ObfuscatedName("kp") @Export("playerMenuOpcodes") static final int[] playerMenuOpcodes; @@ -1122,7 +1122,7 @@ public final class Client extends GameShell implements Usernamed { @Export("playerOptionsPriorities") static boolean[] playerOptionsPriorities; @ObfuscatedName("kn") - static int[] __client_kn; + static int[] field213; @ObfuscatedName("kx") @ObfuscatedGetter( intValue = -1309758309 @@ -1139,7 +1139,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedSignature( signature = "Lje;" ) - static NodeDeque __client_kh; + static NodeDeque field214; @ObfuscatedName("kk") @ObfuscatedSignature( signature = "Lje;" @@ -1165,7 +1165,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -898263359 ) - static int __client_ku; + static int field215; @ObfuscatedName("kc") @Export("isMenuOpen") static boolean isMenuOpen; @@ -1212,22 +1212,22 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 26099827 ) - static int __client_lq; + static int field216; @ObfuscatedName("ln") @ObfuscatedGetter( intValue = 885052255 ) - static int __client_ln; + static int field217; @ObfuscatedName("lb") @ObfuscatedGetter( intValue = 699084605 ) - static int __client_lb; + static int field218; @ObfuscatedName("ls") @ObfuscatedGetter( intValue = -274968037 ) - static int __client_ls; + static int field219; @ObfuscatedName("lz") @ObfuscatedGetter( intValue = 1630772923 @@ -1241,296 +1241,18 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 196309625 ) - static int __client_lc; - - static { - __client_ai = true; - worldId = 1; - worldProperties = 0; - gameBuild = 0; - isMembersWorld = false; - isLowDetail = false; - language = 0; - clientType = -1; - __client_bl = false; - gameState = 0; - isLoading = true; - cycle = 0; - mouseLastLastPressedTimeMillis = 1L; - __client_cn = -1; - __client_cq = -1; - __client_ch = -1L; - __client_cw = true; - displayFps = false; - rebootTimer = 0; - hintArrowType = 0; - hintArrowNpcIndex = 0; - hintArrowPlayerIndex = 0; - hintArrowX = 0; - hintArrowY = 0; - hintArrowHeight = 0; - hintArrowSubX = 0; - hintArrowSubY = 0; - playerAttackOption = AttackOption.AttackOption_hidden; - npcAttackOption = AttackOption.AttackOption_hidden; - titleLoadingStage = 0; - js5ConnectState = 0; - __client_dp = 0; - js5Errors = 0; - loginState = 0; - __client_ex = 0; - __client_ej = 0; - __client_el = 0; - field658 = class159.field1985; - Login_isUsernameRemembered = false; - secureRandomFuture = new SecureRandomFuture(); - __client_ev = null; - npcs = new Npc['耀']; - npcCount = 0; - npcIndices = new int['耀']; - __client_fw = 0; - __client_fg = new int[250]; - packetWriter = new PacketWriter(); - __client_fd = 0; - __client_fh = false; - useBufferedSocket = true; - timer = new Timer(); - fontsMap = new HashMap(); - __client_fe = 0; - __client_fn = 1; - __client_fk = 0; - __client_gp = 1; - __client_gh = 0; - collisionMaps = new CollisionMap[4]; - isInInstance = false; - instanceChunkTemplates = new int[4][13][13]; - __client_gd = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; - __client_gy = 0; - __client_hx = 2301979; - __client_hn = 5063219; - __client_hr = 3353893; - __client_hg = 7759444; - __client_hh = false; - __client_hd = 0; - cameraPitchTarget = 128; - minimapOrientation = 0; - __client_hv = 0; - __client_hu = 0; - __client_hi = 0; - __client_ht = 0; - oculusOrbState = 0; - cameraFollowHeight = 50; - __client_hc = 0; - __client_hk = 0; - __client_if = 0; - oculusOrbNormalSpeed = 12; - __client_in = 6; - __client_il = 0; - __client_ij = false; - __client_iy = 0; - __client_is = false; - __client_ik = 0; - overheadTextCount = 0; - overheadTextLimit = 50; - overheadTextXs = new int[overheadTextLimit]; - overheadTextYs = new int[overheadTextLimit]; - overheadTextAscents = new int[overheadTextLimit]; - overheadTextXOffsets = new int[overheadTextLimit]; - overheadTextColors = new int[overheadTextLimit]; - overheadTextEffects = new int[overheadTextLimit]; - overheadTextCyclesRemaining = new int[overheadTextLimit]; - overheadText = new String[overheadTextLimit]; - tileLastDrawnActor = new int[104][104]; - viewportDrawCount = 0; - viewportTempX = -1; - viewportTempY = -1; - mouseCrossX = 0; - mouseCrossY = 0; - mouseCrossState = 0; - mouseCrossColor = 0; - showMouseCross = true; - __client_ju = 0; - __client_jz = 0; - dragItemSlotSource = 0; - __client_ja = 0; - __client_je = 0; - dragItemSlotDestination = 0; - __client_jl = false; - itemDragDuration = 0; - __client_jc = 0; - showLoadingMessages = true; - players = new Player[2048]; - localPlayerIndex = -1; - __client_jo = 0; - renderSelf = true; - __client_ke = 0; - __client_ky = 0; - __client_kd = new int[1000]; - playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; - playerMenuActions = new String[8]; - playerOptionsPriorities = new boolean[8]; - __client_kn = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; - combatTargetPlayerIndex = -1; - groundItems = new NodeDeque[4][104][104]; - __client_kh = new NodeDeque(); - projectiles = new NodeDeque(); - graphicsObjects = new NodeDeque(); - currentLevels = new int[25]; - levels = new int[25]; - experience = new int[25]; - __client_ku = 0; - isMenuOpen = false; - menuOptionsCount = 0; - menuArguments1 = new int[500]; - menuArguments2 = new int[500]; - menuOpcodes = new int[500]; - menuArguments0 = new int[500]; - menuActions = new String[500]; - menuTargetNames = new String[500]; - menuShiftClick = new boolean[500]; - followerOpsLowPriority = false; - shiftClickDrop = false; - tapToDrop = false; - showMouseOverText = true; - __client_lq = -1; - __client_ln = -1; - __client_lb = 0; - __client_ls = 50; - isItemSelected = 0; - selectedItemName = null; - isSpellSelected = false; - __client_lc = -1; - __client_mh = -1; - selectedSpellActionName = null; - selectedSpellName = null; - rootWidgetGroup = -1; - widgetGroupParents = new NodeHashTable(8); - __client_mf = 0; - __client_ms = -1; - chatEffects = 0; - __client_mb = 0; - __client_mo = null; - runEnergy = 0; - weight = 0; - rights = 0; - followerIndex = -1; - __client_mn = false; - viewportWidget = null; - clickedWidget = null; - clickedWidgetParent = null; - widgetClickX = 0; - widgetClickY = 0; - draggedOnWidget = null; - __client_nn = false; - __client_nw = -1; - __client_nl = -1; - __client_nt = false; - __client_nk = -1; - __client_np = -1; - isDraggingWidget = false; - cycleCntr = 1; - __client_nr = new int[32]; - __client_nd = 0; - __client_nz = new int[32]; - __client_ns = 0; - changedSkills = new int[32]; - changedSkillsCount = 0; - chatCycle = 0; - __client_na = 0; - __client_nh = 0; - __client_nv = 0; - __client_nc = 0; - __client_ni = 0; - mouseWheelRotation = 0; - scriptEvents = new NodeDeque(); - __client_oh = new NodeDeque(); - __client_oc = new NodeDeque(); - widgetClickMasks = new NodeHashTable(512); - rootWidgetCount = 0; - __client_oo = -2; - __client_od = new boolean[100]; - __client_ot = new boolean[100]; - __client_oq = new boolean[100]; - rootWidgetXs = new int[100]; - rootWidgetYs = new int[100]; - rootWidgetWidths = new int[100]; - rootWidgetHeights = new int[100]; - gameDrawingMode = 0; - __client_oa = 0L; - isResizable = true; - __client_pv = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; - publicChatMode = 0; - __client_pl = 0; - __client_pz = ""; - __client_pu = new long[100]; - __client_pb = 0; - __client_pm = 0; - __client_pq = new int[128]; - __client_pn = new int[128]; - __client_pp = -1L; - __client_ph = -1; - mapIconCount = 0; - mapIconXs = new int[1000]; - mapIconYs = new int[1000]; - mapIcons = new Sprite[1000]; - destinationX = 0; - destinationY = 0; - minimapState = 0; - __client_qf = 255; - __client_qy = -1; - __client_qq = false; - soundEffectVolume = 127; - __client_qc = 127; - soundEffectCount = 0; - soundEffectIds = new int[50]; - queuedSoundEffectLoops = new int[50]; - queuedSoundEffectDelays = new int[50]; - soundLocations = new int[50]; - soundEffects = new SoundEffect[50]; - isCameraLocked = false; - __client_rh = new boolean[5]; - __client_rd = new int[5]; - __client_rl = new int[5]; - __client_rj = new int[5]; - __client_rk = new int[5]; - __client_rw = 256; - __client_rm = 205; - __client_re = 256; - __client_rb = 320; - __client_rv = 1; - __client_ri = 32767; - __client_rs = 1; - __client_rp = 32767; - viewportOffsetX = 0; - viewportOffsetY = 0; - viewportWidth = 0; - viewportHeight = 0; - viewportZoom = 0; - __client_ru = new PlayerAppearance(); - __client_sd = -1; - __client_sl = -1; - platformInfoProvider = new DesktopPlatformInfoProvider(); - grandExchangeOffers = new GrandExchangeOffer[8]; - __client_sj = new OwnWorldComparator(); - __client_ss = -1; - indexCacheLoaders = new ArrayList(10); - indexCacheLoaderIndex = 0; - __client_sx = 0; - field895 = new class65(); - __client_tp = new int[50]; - __client_th = new int[50]; - } + static int field220; @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)V", garbageValue = "-1773624745" ) - protected final void __j_113() { - __client_oa = class203.currentTimeMs() + 500L; - this.__ge_137(); - if(rootWidgetGroup != -1) { - this.__iu_141(true); + protected final void vmethod107() { + field99 = class203.currentTimeMs() + 500L; + this.method84(); + if (rootWidgetGroup != -1) { + this.method87(true); } } @@ -1543,13 +1265,13 @@ public final class Client extends GameShell implements Usernamed { @Export("setUp") protected final void setUp() { WorldMapCacheName.method633(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); - class2.port1 = gameBuild == 0?43594:worldId + 40000; - WorldMapArea.port2 = gameBuild == 0?443:worldId + 50000; + class2.port1 = gameBuild == 0 ? 43594 : worldId + 40000; + WorldMapArea.port2 = gameBuild == 0 ? 443 : worldId + 50000; class203.port3 = class2.port1; - PlayerAppearance.__hi_g = class226.__ht_m; - class229.__hz_l = class226.__ht_f; - class227.__hj_e = class226.__ht_q; - IndexCacheLoader.__bd_x = class226.__ht_w; + PlayerAppearance.field726 = class226.field1132; + class229.field1137 = class226.field1133; + class227.field1136 = class226.field1134; + IndexCacheLoader.field406 = class226.field1135; TriBool.urlRequester = new UrlRequester(); this.setUpKeyboard(); this.setUpMouse(); @@ -1557,13 +1279,13 @@ public final class Client extends GameShell implements Usernamed { Fonts.indexStore255 = new IndexStore(255, class168.dat2File, class168.idx255File, 500000); ReflectionCheck.clientPreferences = class306.method5780(); this.setUpClipboard(); - String var2 = Ignored.__ks_at; - class50.__af_m = this; - if(var2 != null) { - class50.__af_f = var2; + String var1 = Ignored.field402; + class50.field1159 = this; + if (var1 != null) { + class50.field1160 = var1; } - if(gameBuild != 0) { + if (gameBuild != 0) { displayFps = true; } @@ -1576,47 +1298,47 @@ public final class Client extends GameShell implements Usernamed { signature = "(I)V", garbageValue = "1445885427" ) - protected final void __al_111() { + protected final void vmethod112() { ++cycle; this.doCycleJs5(); class3.method41(); int var1; try { - if(class214.__hf_o == 1) { - var1 = class214.midiPcmStream.__f_341(); - if(var1 > 0 && class214.midiPcmStream.isReady()) { - var1 -= FaceNormal.__el_x; - if(var1 < 0) { + if (class214.field1129 == 1) { + var1 = class214.midiPcmStream.method170(); + if (var1 > 0 && class214.midiPcmStream.isReady()) { + var1 -= FaceNormal.field344; + if (var1 < 0) { var1 = 0; } - class214.midiPcmStream.__m_340(var1); + class214.midiPcmStream.method169(var1); } else { class214.midiPcmStream.clear(); class214.midiPcmStream.removeAll(); - if(class214.__hf_u != null) { - class214.__hf_o = 2; + if (class214.field1130 != null) { + class214.field1129 = 2; } else { - class214.__hf_o = 0; + class214.field1129 = 0; } class13.musicTrack = null; class307.soundCache = null; } } - } catch (Exception var63) { - var63.printStackTrace(); + } catch (Exception var54) { + var54.printStackTrace(); class214.midiPcmStream.clear(); - class214.__hf_o = 0; + class214.field1129 = 0; class13.musicTrack = null; class307.soundCache = null; - class214.__hf_u = null; + class214.field1130 = null; } class13.playPcmPlayers(); class171.method3498(); - MouseHandler var47 = MouseHandler.MouseHandler_instance; + MouseHandler var2 = MouseHandler.MouseHandler_instance; synchronized(MouseHandler.MouseHandler_instance) { MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButton0; MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_x0; @@ -1629,108 +1351,110 @@ public final class Client extends GameShell implements Usernamed { MouseHandler.MouseHandler_lastButton0 = 0; } - if(class16.mouseWheel != null) { + if (class16.mouseWheel != null) { var1 = class16.mouseWheel.useRotation(); mouseWheelRotation = var1; } - if(gameState == 0) { + if (gameState == 0) { class171.method3497(); class11.method145(); - } else if(gameState == 5) { + } else if (gameState == 5) { class54.method1092(this); class171.method3497(); class11.method145(); - } else if(gameState != 10 && gameState != 11) { - if(gameState == 20) { + } else if (gameState != 10 && gameState != 11) { + if (gameState == 20) { class54.method1092(this); this.doCycleLoggedOut(); - } else if(gameState == 25) { + } else if (gameState == 25) { UserComparator10.method3352(false); - __client_fe = 0; - boolean var64 = true; + field177 = 0; + boolean var3 = true; - int var48; - for(var48 = 0; var48 < class40.regionLandArchives.length; ++var48) { - if(IndexCacheLoader.regionMapArchiveIds[var48] != -1 && class40.regionLandArchives[var48] == null) { - class40.regionLandArchives[var48] = SecureRandomFuture.indexCache5.takeRecord(IndexCacheLoader.regionMapArchiveIds[var48], 0); - if(class40.regionLandArchives[var48] == null) { - var64 = false; - ++__client_fe; + int var4; + for (var4 = 0; var4 < class40.regionLandArchives.length; ++var4) { + if (IndexCacheLoader.regionMapArchiveIds[var4] != -1 && class40.regionLandArchives[var4] == null) { + class40.regionLandArchives[var4] = SecureRandomFuture.indexCache5.takeRecord(IndexCacheLoader.regionMapArchiveIds[var4], 0); + if (class40.regionLandArchives[var4] == null) { + var3 = false; + ++field177; } } - if(MouseHandler.regionLandArchiveIds[var48] != -1 && HealthBarUpdate.regionMapArchives[var48] == null) { - HealthBarUpdate.regionMapArchives[var48] = SecureRandomFuture.indexCache5.takeRecordEncrypted(MouseHandler.regionLandArchiveIds[var48], 0, class190.xteaKeys[var48]); - if(HealthBarUpdate.regionMapArchives[var48] == null) { - var64 = false; - ++__client_fe; + if (MouseHandler.regionLandArchiveIds[var4] != -1 && HealthBarUpdate.regionMapArchives[var4] == null) { + HealthBarUpdate.regionMapArchives[var4] = SecureRandomFuture.indexCache5.takeRecordEncrypted(MouseHandler.regionLandArchiveIds[var4], 0, class190.xteaKeys[var4]); + if (HealthBarUpdate.regionMapArchives[var4] == null) { + var3 = false; + ++field177; } } } - if(!var64) { - __client_gh = 1; + if (!var3) { + field181 = 1; } else { - __client_fk = 0; - var64 = true; + field179 = 0; + var3 = true; - int var4; int var5; - for(var48 = 0; var48 < class40.regionLandArchives.length; ++var48) { - byte[] var3 = HealthBarUpdate.regionMapArchives[var48]; - if(var3 != null) { - var4 = (class308.regions[var48] >> 8) * 64 - class50.baseX; - var5 = (class308.regions[var48] & 255) * 64 - GraphicsObject.baseY; - if(isInInstance) { - var4 = 10; + int var6; + for (var4 = 0; var4 < class40.regionLandArchives.length; ++var4) { + byte[] var7 = HealthBarUpdate.regionMapArchives[var4]; + if (var7 != null) { + var5 = (class308.regions[var4] >> 8) * 64 - class50.baseX; + var6 = (class308.regions[var4] & 255) * 64 - GraphicsObject.baseY; + if (isInInstance) { var5 = 10; + var6 = 10; } - var64 &= TextureProvider.method2774(var3, var4, var5); + var3 &= TextureProvider.method2774(var7, var5, var6); } } - if(!var64) { - __client_gh = 2; + if (!var3) { + field181 = 2; } else { - if(__client_gh != 0) { - class68.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); + if (field181 != 0) { + class68.drawLoadingMessage("Loading - please wait.
(100%)", true); } class13.playPcmPlayers(); class65.scene.clear(); - for(var48 = 0; var48 < 4; ++var48) { - collisionMaps[var48].clear(); + for (var4 = 0; var4 < 4; ++var4) { + collisionMaps[var4].clear(); } - int var49; - for(var48 = 0; var48 < 4; ++var48) { - for(var49 = 0; var49 < 104; ++var49) { - for(var4 = 0; var4 < 104; ++var4) { - Tiles.Tiles_renderFlags[var48][var49][var4] = 0; + int var55; + for (var4 = 0; var4 < 4; ++var4) { + for (var55 = 0; var55 < 104; ++var55) { + for (var5 = 0; var5 < 104; ++var5) { + Tiles.Tiles_renderFlags[var4][var55][var5] = 0; } } } class13.playPcmPlayers(); Tiles.Tiles_minPlane = 99; - Tiles.__bq_w = new byte[4][104][104]; - Fonts.__kz_o = new byte[4][104][104]; - class32.__ay_u = new byte[4][104][104]; - class307.__kc_g = new byte[4][104][104]; - Tiles.__bq_a = new int[4][105][105]; - Tiles.__bq_l = new byte[4][105][105]; - Huffman.__gd_e = new int[105][105]; - class13.__i_x = new int[104]; - Formatting.__cy_d = new int[104]; - class214.__hf_k = new int[104]; - WorldMapSectionType.__h_n = new int[104]; - Message.__bm_i = new int[104]; - var48 = class40.regionLandArchives.length; + Tiles.field908 = new byte[4][104][104]; + Fonts.field350 = new byte[4][104][104]; + class32.field1157 = new byte[4][104][104]; + class307.field1155 = new byte[4][104][104]; + Tiles.field910 = new int[4][105][105]; + Tiles.field909 = new byte[4][105][105]; + Huffman.field398 = new int[105][105]; + class13.field1112 = new int[104]; + Formatting.field353 = new int[104]; + class214.field1131 = new int[104]; + WorldMapSectionType.field1104 = new int[104]; + Message.field490 = new int[104]; + var4 = class40.regionLandArchives.length; SpriteMask.method4390(); UserComparator10.method3352(true); + int var8; + int var9; int var10; int var11; int var12; @@ -1743,79 +1467,77 @@ public final class Client extends GameShell implements Usernamed { int var19; int var20; int var21; - int var22; - int var51; - if(!isInInstance) { - byte[] var6; - for(var49 = 0; var49 < var48; ++var49) { - var4 = (class308.regions[var49] >> 8) * 64 - class50.baseX; - var5 = (class308.regions[var49] & 255) * 64 - GraphicsObject.baseY; - var6 = class40.regionLandArchives[var49]; - if(var6 != null) { + if (!isInInstance) { + byte[] var22; + for (var55 = 0; var55 < var4; ++var55) { + var5 = (class308.regions[var55] >> 8) * 64 - class50.baseX; + var6 = (class308.regions[var55] & 255) * 64 - GraphicsObject.baseY; + var22 = class40.regionLandArchives[var55]; + if (var22 != null) { class13.playPcmPlayers(); - Varcs.method2166(var6, var4, var5, GameObject.__eh_fy * 8 - 48, WorldMapLabelSize.__s_fi * 8 - 48, collisionMaps); + Varcs.method2166(var22, var5, var6, GameObject.field359 * 8 - 48, WorldMapLabelSize.field1041 * 8 - 48, collisionMaps); } } - for(var49 = 0; var49 < var48; ++var49) { - var4 = (class308.regions[var49] >> 8) * 64 - class50.baseX; - var5 = (class308.regions[var49] & 255) * 64 - GraphicsObject.baseY; - var6 = class40.regionLandArchives[var49]; - if(var6 == null && WorldMapLabelSize.__s_fi < 800) { + for (var55 = 0; var55 < var4; ++var55) { + var5 = (class308.regions[var55] >> 8) * 64 - class50.baseX; + var6 = (class308.regions[var55] & 255) * 64 - GraphicsObject.baseY; + var22 = class40.regionLandArchives[var55]; + if (var22 == null && WorldMapLabelSize.field1041 < 800) { class13.playPcmPlayers(); - UserComparator6.method3390(var4, var5, 64, 64); + UserComparator6.method3390(var5, var6, 64, 64); } } UserComparator10.method3352(true); - for(var49 = 0; var49 < var48; ++var49) { - byte[] var50 = HealthBarUpdate.regionMapArchives[var49]; - if(var50 != null) { - var5 = (class308.regions[var49] >> 8) * 64 - class50.baseX; - var51 = (class308.regions[var49] & 255) * 64 - GraphicsObject.baseY; + for (var55 = 0; var55 < var4; ++var55) { + byte[] var23 = HealthBarUpdate.regionMapArchives[var55]; + if (var23 != null) { + var6 = (class308.regions[var55] >> 8) * 64 - class50.baseX; + var21 = (class308.regions[var55] & 255) * 64 - GraphicsObject.baseY; class13.playPcmPlayers(); - Scene var7 = class65.scene; - CollisionMap[] var8 = collisionMaps; - Buffer var9 = new Buffer(var50); - var10 = -1; + Scene var24 = class65.scene; + CollisionMap[] var25 = collisionMaps; + Buffer var26 = new Buffer(var23); + var8 = -1; - while(true) { - var11 = var9.__at_308(); - if(var11 == 0) { + while (true) { + var9 = var26.method49(); + if (var9 == 0) { break; } - var10 += var11; - var12 = 0; + var8 += var9; + var10 = 0; - while(true) { - var13 = var9.__ae_307(); - if(var13 == 0) { + while (true) { + var11 = var26.method48(); + if (var11 == 0) { break; } - var12 += var13 - 1; - var14 = var12 & 63; - var15 = var12 >> 6 & 63; - var16 = var12 >> 12; - var17 = var9.readUnsignedByte(); - var18 = var17 >> 2; - var19 = var17 & 3; - var20 = var5 + var15; - var21 = var14 + var51; - if(var20 > 0 && var21 > 0 && var20 < 103 && var21 < 103) { - var22 = var16; - if((Tiles.Tiles_renderFlags[1][var20][var21] & 2) == 2) { - var22 = var16 - 1; + var10 += var11 - 1; + var12 = var10 & 63; + var13 = var10 >> 6 & 63; + var14 = var10 >> 12; + var15 = var26.readUnsignedByte(); + var16 = var15 >> 2; + var17 = var15 & 3; + var18 = var6 + var13; + var19 = var12 + var21; + if (var18 > 0 && var19 > 0 && var18 < 103 && var19 < 103) { + var20 = var14; + if ((Tiles.Tiles_renderFlags[1][var18][var19] & 2) == 2) { + var20 = var14 - 1; } - CollisionMap var23 = null; - if(var22 >= 0) { - var23 = var8[var22]; + CollisionMap var27 = null; + if (var20 >= 0) { + var27 = var25[var20]; } - class227.method4446(var16, var20, var21, var10, var19, var18, var7, var23); + class227.method4446(var14, var18, var19, var8, var17, var16, var24, var27); } } } @@ -1823,47 +1545,47 @@ public final class Client extends GameShell implements Usernamed { } } - int var52; - int var53; - int var54; - if(isInInstance) { - var49 = 0; + int var56; + int var57; + int var58; + if (isInInstance) { + var55 = 0; - label1186: - while(true) { - if(var49 >= 4) { - for(var49 = 0; var49 < 13; ++var49) { - for(var4 = 0; var4 < 13; ++var4) { - var5 = instanceChunkTemplates[0][var49][var4]; - if(var5 == -1) { - UserComparator6.method3390(var49 * 8, var4 * 8, 8, 8); + label998: + while (true) { + if (var55 >= 4) { + for (var55 = 0; var55 < 13; ++var55) { + for (var5 = 0; var5 < 13; ++var5) { + var6 = instanceChunkTemplates[0][var55][var5]; + if (var6 == -1) { + UserComparator6.method3390(var55 * 8, var5 * 8, 8, 8); } } } UserComparator10.method3352(true); - var49 = 0; + var55 = 0; - while(true) { - if(var49 >= 4) { - break label1186; + while (true) { + if (var55 >= 4) { + break label998; } class13.playPcmPlayers(); - for(var4 = 0; var4 < 13; ++var4) { - for(var5 = 0; var5 < 13; ++var5) { - var51 = instanceChunkTemplates[var49][var4][var5]; - if(var51 != -1) { - var52 = var51 >> 24 & 3; - var53 = var51 >> 1 & 3; - var54 = var51 >> 14 & 1023; - var10 = var51 >> 3 & 2047; - var11 = (var54 / 8 << 8) + var10 / 8; + for (var5 = 0; var5 < 13; ++var5) { + for (var6 = 0; var6 < 13; ++var6) { + var21 = instanceChunkTemplates[var55][var5][var6]; + if (var21 != -1) { + var56 = var21 >> 24 & 3; + var57 = var21 >> 1 & 3; + var58 = var21 >> 14 & 1023; + var8 = var21 >> 3 & 2047; + var9 = (var58 / 8 << 8) + var8 / 8; - for(var12 = 0; var12 < class308.regions.length; ++var12) { - if(class308.regions[var12] == var11 && HealthBarUpdate.regionMapArchives[var12] != null) { - ServerPacket.method3662(HealthBarUpdate.regionMapArchives[var12], var49, var4 * 8, var5 * 8, var52, (var54 & 7) * 8, (var10 & 7) * 8, var53, class65.scene, collisionMaps); + for (var10 = 0; var10 < class308.regions.length; ++var10) { + if (class308.regions[var10] == var9 && HealthBarUpdate.regionMapArchives[var10] != null) { + ServerPacket.method3662(HealthBarUpdate.regionMapArchives[var10], var55, var5 * 8, var6 * 8, var56, (var58 & 7) * 8, (var8 & 7) * 8, var57, class65.scene, collisionMaps); break; } } @@ -1871,335 +1593,347 @@ public final class Client extends GameShell implements Usernamed { } } - ++var49; + ++var55; } } class13.playPcmPlayers(); - for(var4 = 0; var4 < 13; ++var4) { - for(var5 = 0; var5 < 13; ++var5) { - boolean var72 = false; - var52 = instanceChunkTemplates[var49][var4][var5]; - if(var52 != -1) { - var53 = var52 >> 24 & 3; - var54 = var52 >> 1 & 3; - var10 = var52 >> 14 & 1023; - var11 = var52 >> 3 & 2047; - var12 = (var10 / 8 << 8) + var11 / 8; + for (var5 = 0; var5 < 13; ++var5) { + for (var6 = 0; var6 < 13; ++var6) { + boolean var59 = false; + var56 = instanceChunkTemplates[var55][var5][var6]; + if (var56 != -1) { + var57 = var56 >> 24 & 3; + var58 = var56 >> 1 & 3; + var8 = var56 >> 14 & 1023; + var9 = var56 >> 3 & 2047; + var10 = (var8 / 8 << 8) + var9 / 8; - for(var13 = 0; var13 < class308.regions.length; ++var13) { - if(class308.regions[var13] == var12 && class40.regionLandArchives[var13] != null) { - class204.method4013(class40.regionLandArchives[var13], var49, var4 * 8, var5 * 8, var53, (var10 & 7) * 8, (var11 & 7) * 8, var54, collisionMaps); - var72 = true; + for (var11 = 0; var11 < class308.regions.length; ++var11) { + if (class308.regions[var11] == var10 && class40.regionLandArchives[var11] != null) { + class204.method4013(class40.regionLandArchives[var11], var55, var5 * 8, var6 * 8, var57, (var8 & 7) * 8, (var9 & 7) * 8, var58, collisionMaps); + var59 = true; break; } } } - if(!var72) { - var53 = var49; - var54 = var4 * 8; - var10 = var5 * 8; + if (!var59) { + var57 = var55; + var58 = var5 * 8; + var8 = var6 * 8; - for(var11 = 0; var11 < 8; ++var11) { - for(var12 = 0; var12 < 8; ++var12) { - Tiles.Tiles_heights[var53][var11 + var54][var12 + var10] = 0; + for (var9 = 0; var9 < 8; ++var9) { + for (var10 = 0; var10 < 8; ++var10) { + Tiles.Tiles_heights[var57][var9 + var58][var10 + var8] = 0; } } - if(var54 > 0) { - for(var11 = 1; var11 < 8; ++var11) { - Tiles.Tiles_heights[var53][var54][var10 + var11] = Tiles.Tiles_heights[var53][var54 - 1][var10 + var11]; + if (var58 > 0) { + for (var9 = 1; var9 < 8; ++var9) { + Tiles.Tiles_heights[var57][var58][var8 + var9] = Tiles.Tiles_heights[var57][var58 - 1][var8 + var9]; } } - if(var10 > 0) { - for(var11 = 1; var11 < 8; ++var11) { - Tiles.Tiles_heights[var53][var54 + var11][var10] = Tiles.Tiles_heights[var53][var54 + var11][var10 - 1]; + if (var8 > 0) { + for (var9 = 1; var9 < 8; ++var9) { + Tiles.Tiles_heights[var57][var58 + var9][var8] = Tiles.Tiles_heights[var57][var58 + var9][var8 - 1]; } } - if(var54 > 0 && Tiles.Tiles_heights[var53][var54 - 1][var10] != 0) { - Tiles.Tiles_heights[var53][var54][var10] = Tiles.Tiles_heights[var53][var54 - 1][var10]; - } else if(var10 > 0 && Tiles.Tiles_heights[var53][var54][var10 - 1] != 0) { - Tiles.Tiles_heights[var53][var54][var10] = Tiles.Tiles_heights[var53][var54][var10 - 1]; - } else if(var54 > 0 && var10 > 0 && Tiles.Tiles_heights[var53][var54 - 1][var10 - 1] != 0) { - Tiles.Tiles_heights[var53][var54][var10] = Tiles.Tiles_heights[var53][var54 - 1][var10 - 1]; + if (var58 > 0 && Tiles.Tiles_heights[var57][var58 - 1][var8] != 0) { + Tiles.Tiles_heights[var57][var58][var8] = Tiles.Tiles_heights[var57][var58 - 1][var8]; + } else if (var8 > 0 && Tiles.Tiles_heights[var57][var58][var8 - 1] != 0) { + Tiles.Tiles_heights[var57][var58][var8] = Tiles.Tiles_heights[var57][var58][var8 - 1]; + } else if (var58 > 0 && var8 > 0 && Tiles.Tiles_heights[var57][var58 - 1][var8 - 1] != 0) { + Tiles.Tiles_heights[var57][var58][var8] = Tiles.Tiles_heights[var57][var58 - 1][var8 - 1]; } } } } - ++var49; + ++var55; } } UserComparator10.method3352(true); class13.playPcmPlayers(); - Scene var65 = class65.scene; - CollisionMap[] var71 = collisionMaps; + Scene var60 = class65.scene; + CollisionMap[] var61 = collisionMaps; - for(var5 = 0; var5 < 4; ++var5) { - for(var51 = 0; var51 < 104; ++var51) { - for(var52 = 0; var52 < 104; ++var52) { - if((Tiles.Tiles_renderFlags[var5][var51][var52] & 1) == 1) { - var53 = var5; - if((Tiles.Tiles_renderFlags[1][var51][var52] & 2) == 2) { - var53 = var5 - 1; + for (var6 = 0; var6 < 4; ++var6) { + for (var21 = 0; var21 < 104; ++var21) { + for (var56 = 0; var56 < 104; ++var56) { + if ((Tiles.Tiles_renderFlags[var6][var21][var56] & 1) == 1) { + var57 = var6; + if ((Tiles.Tiles_renderFlags[1][var21][var56] & 2) == 2) { + var57 = var6 - 1; } - if(var53 >= 0) { - var71[var53].__w_285(var51, var52); + if (var57 >= 0) { + var61[var57].method92(var21, var56); } } } } } - Tiles.__bq_p += (int)(Math.random() * 5.0D) - 2; - if(Tiles.__bq_p < -8) { - Tiles.__bq_p = -8; + Tiles.field917 += (int)(Math.random() * 5.0D) - 2; + if (Tiles.field917 < -8) { + Tiles.field917 = -8; } - if(Tiles.__bq_p > 8) { - Tiles.__bq_p = 8; + if (Tiles.field917 > 8) { + Tiles.field917 = 8; } - Tiles.__bq_v += (int)(Math.random() * 5.0D) - 2; - if(Tiles.__bq_v < -16) { - Tiles.__bq_v = -16; + Tiles.field918 += (int)(Math.random() * 5.0D) - 2; + if (Tiles.field918 < -16) { + Tiles.field918 = -16; } - if(Tiles.__bq_v > 16) { - Tiles.__bq_v = 16; + if (Tiles.field918 > 16) { + Tiles.field918 = 16; } - for(var5 = 0; var5 < 4; ++var5) { - byte[][] var66 = Tiles.__bq_l[var5]; - var12 = (int)Math.sqrt(5100.0D); - var13 = var12 * 768 >> 8; + int[] var10000; + for (var6 = 0; var6 < 4; ++var6) { + byte[][] var62 = Tiles.field909[var6]; + var10 = (int)Math.sqrt(5100.0D); + var11 = var10 * 768 >> 8; - int var55; - for(var14 = 1; var14 < 103; ++var14) { - for(var15 = 1; var15 < 103; ++var15) { - var16 = Tiles.Tiles_heights[var5][var15 + 1][var14] - Tiles.Tiles_heights[var5][var15 - 1][var14]; - var17 = Tiles.Tiles_heights[var5][var15][var14 + 1] - Tiles.Tiles_heights[var5][var15][var14 - 1]; - var18 = (int)Math.sqrt((double)(var17 * var17 + var16 * var16 + 65536)); - var19 = (var16 << 8) / var18; - var20 = 65536 / var18; - var21 = (var17 << 8) / var18; - var22 = (var21 * -50 + var19 * -50 + var20 * -10) / var13 + 96; - var55 = (var66[var15 - 1][var14] >> 2) + (var66[var15][var14 - 1] >> 2) + (var66[var15 + 1][var14] >> 3) + (var66[var15][var14 + 1] >> 3) + (var66[var15][var14] >> 1); - Huffman.__gd_e[var15][var14] = var22 - var55; + int var28; + for (var12 = 1; var12 < 103; ++var12) { + for (var13 = 1; var13 < 103; ++var13) { + var14 = Tiles.Tiles_heights[var6][var13 + 1][var12] - Tiles.Tiles_heights[var6][var13 - 1][var12]; + var15 = Tiles.Tiles_heights[var6][var13][var12 + 1] - Tiles.Tiles_heights[var6][var13][var12 - 1]; + var16 = (int)Math.sqrt((double)(var15 * var15 + var14 * var14 + 65536)); + var17 = (var14 << 8) / var16; + var18 = 65536 / var16; + var19 = (var15 << 8) / var16; + var20 = (var19 * -50 + var17 * -50 + var18 * -10) / var11 + 96; + var28 = (var62[var13 - 1][var12] >> 2) + (var62[var13][var12 - 1] >> 2) + (var62[var13 + 1][var12] >> 3) + (var62[var13][var12 + 1] >> 3) + (var62[var13][var12] >> 1); + Huffman.field398[var13][var12] = var20 - var28; } } - for(var14 = 0; var14 < 104; ++var14) { - class13.__i_x[var14] = 0; - Formatting.__cy_d[var14] = 0; - class214.__hf_k[var14] = 0; - WorldMapSectionType.__h_n[var14] = 0; - Message.__bm_i[var14] = 0; + for (var12 = 0; var12 < 104; ++var12) { + class13.field1112[var12] = 0; + Formatting.field353[var12] = 0; + class214.field1131[var12] = 0; + WorldMapSectionType.field1104[var12] = 0; + Message.field490[var12] = 0; } - for(var14 = -5; var14 < 109; ++var14) { - for(var15 = 0; var15 < 104; ++var15) { - var16 = var14 + 5; - if(var16 >= 0 && var16 < 104) { - var17 = Tiles.__bq_w[var5][var16][var15] & 255; - if(var17 > 0) { - UnderlayDefinition var56 = StudioGame.method4550(var17 - 1); - class13.__i_x[var15] += var56.hue; - Formatting.__cy_d[var15] += var56.saturation; - class214.__hf_k[var15] += var56.lightness; - WorldMapSectionType.__h_n[var15] += var56.hueMultiplier; - ++Message.__bm_i[var15]; + for (var12 = -5; var12 < 109; ++var12) { + for (var13 = 0; var13 < 104; ++var13) { + var14 = var12 + 5; + int var10002; + UnderlayDefinition var29; + if (var14 >= 0 && var14 < 104) { + var15 = Tiles.field908[var6][var14][var13] & 255; + if (var15 > 0) { + var29 = StudioGame.method4550(var15 - 1); + var10000 = class13.field1112; + var10000[var13] += var29.hue; + var10000 = Formatting.field353; + var10000[var13] += var29.saturation; + var10000 = class214.field1131; + var10000[var13] += var29.lightness; + var10000 = WorldMapSectionType.field1104; + var10000[var13] += var29.hueMultiplier; + var10002 = Message.field490[var13]++; } } - var17 = var14 - 5; - if(var17 >= 0 && var17 < 104) { - var18 = Tiles.__bq_w[var5][var17][var15] & 255; - if(var18 > 0) { - UnderlayDefinition var57 = StudioGame.method4550(var18 - 1); - class13.__i_x[var15] -= var57.hue; - Formatting.__cy_d[var15] -= var57.saturation; - class214.__hf_k[var15] -= var57.lightness; - WorldMapSectionType.__h_n[var15] -= var57.hueMultiplier; - --Message.__bm_i[var15]; + var15 = var12 - 5; + if (var15 >= 0 && var15 < 104) { + var16 = Tiles.field908[var6][var15][var13] & 255; + if (var16 > 0) { + var29 = StudioGame.method4550(var16 - 1); + var10000 = class13.field1112; + var10000[var13] -= var29.hue; + var10000 = Formatting.field353; + var10000[var13] -= var29.saturation; + var10000 = class214.field1131; + var10000[var13] -= var29.lightness; + var10000 = WorldMapSectionType.field1104; + var10000[var13] -= var29.hueMultiplier; + var10002 = Message.field490[var13]--; } } } - if(var14 >= 1 && var14 < 103) { + if (var12 >= 1 && var12 < 103) { + var13 = 0; + var14 = 0; var15 = 0; var16 = 0; var17 = 0; - var18 = 0; - var19 = 0; - for(var20 = -5; var20 < 109; ++var20) { - var21 = var20 + 5; - if(var21 >= 0 && var21 < 104) { - var15 += class13.__i_x[var21]; - var16 += Formatting.__cy_d[var21]; - var17 += class214.__hf_k[var21]; - var18 += WorldMapSectionType.__h_n[var21]; - var19 += Message.__bm_i[var21]; + for (var18 = -5; var18 < 109; ++var18) { + var19 = var18 + 5; + if (var19 >= 0 && var19 < 104) { + var13 += class13.field1112[var19]; + var14 += Formatting.field353[var19]; + var15 += class214.field1131[var19]; + var16 += WorldMapSectionType.field1104[var19]; + var17 += Message.field490[var19]; } - var22 = var20 - 5; - if(var22 >= 0 && var22 < 104) { - var15 -= class13.__i_x[var22]; - var16 -= Formatting.__cy_d[var22]; - var17 -= class214.__hf_k[var22]; - var18 -= WorldMapSectionType.__h_n[var22]; - var19 -= Message.__bm_i[var22]; + var20 = var18 - 5; + if (var20 >= 0 && var20 < 104) { + var13 -= class13.field1112[var20]; + var14 -= Formatting.field353[var20]; + var15 -= class214.field1131[var20]; + var16 -= WorldMapSectionType.field1104[var20]; + var17 -= Message.field490[var20]; } - if(var20 >= 1 && var20 < 103 && (!isLowDetail || (Tiles.Tiles_renderFlags[0][var14][var20] & 2) != 0 || (Tiles.Tiles_renderFlags[var5][var14][var20] & 16) == 0)) { - if(var5 < Tiles.Tiles_minPlane) { - Tiles.Tiles_minPlane = var5; + if (var18 >= 1 && var18 < 103 && (!isLowDetail || (Tiles.Tiles_renderFlags[0][var12][var18] & 2) != 0 || (Tiles.Tiles_renderFlags[var6][var12][var18] & 16) == 0)) { + if (var6 < Tiles.Tiles_minPlane) { + Tiles.Tiles_minPlane = var6; } - var55 = Tiles.__bq_w[var5][var14][var20] & 255; - int var24 = Fonts.__kz_o[var5][var14][var20] & 255; - if(var55 > 0 || var24 > 0) { - int var25 = Tiles.Tiles_heights[var5][var14][var20]; - int var26 = Tiles.Tiles_heights[var5][var14 + 1][var20]; - int var27 = Tiles.Tiles_heights[var5][var14 + 1][var20 + 1]; - int var28 = Tiles.Tiles_heights[var5][var14][var20 + 1]; - int var29 = Huffman.__gd_e[var14][var20]; - int var30 = Huffman.__gd_e[var14 + 1][var20]; - int var31 = Huffman.__gd_e[var14 + 1][var20 + 1]; - int var32 = Huffman.__gd_e[var14][var20 + 1]; - int var33 = -1; - int var34 = -1; - int var35; - int var36; - int var37; - if(var55 > 0) { - var35 = var15 * 256 / var18; - var36 = var16 / var19; - var37 = var17 / var19; - var33 = WorldMapAreaData.method712(var35, var36, var37); - var35 = var35 + Tiles.__bq_p & 255; - var37 += Tiles.__bq_v; - if(var37 < 0) { - var37 = 0; - } else if(var37 > 255) { - var37 = 255; + var28 = Tiles.field908[var6][var12][var18] & 255; + int var65 = Fonts.field350[var6][var12][var18] & 255; + if (var28 > 0 || var65 > 0) { + int var30 = Tiles.Tiles_heights[var6][var12][var18]; + int var31 = Tiles.Tiles_heights[var6][var12 + 1][var18]; + int var32 = Tiles.Tiles_heights[var6][var12 + 1][var18 + 1]; + int var33 = Tiles.Tiles_heights[var6][var12][var18 + 1]; + int var34 = Huffman.field398[var12][var18]; + int var35 = Huffman.field398[var12 + 1][var18]; + int var36 = Huffman.field398[var12 + 1][var18 + 1]; + int var37 = Huffman.field398[var12][var18 + 1]; + int var38 = -1; + int var39 = -1; + int var40; + int var41; + int var42; + if (var28 > 0) { + var40 = var13 * 256 / var16; + var41 = var14 / var17; + var42 = var15 / var17; + var38 = WorldMapAreaData.method712(var40, var41, var42); + var40 = var40 + Tiles.field917 & 255; + var42 += Tiles.field918; + if (var42 < 0) { + var42 = 0; + } else if (var42 > 255) { + var42 = 255; } - var34 = WorldMapAreaData.method712(var35, var36, var37); + var39 = WorldMapAreaData.method712(var40, var41, var42); } - OverlayDefinition var38; - if(var5 > 0) { - boolean var69 = true; - if(var55 == 0 && class32.__ay_u[var5][var14][var20] != 0) { - var69 = false; + OverlayDefinition var43; + if (var6 > 0) { + boolean var44 = true; + if (var28 == 0 && class32.field1157[var6][var12][var18] != 0) { + var44 = false; } - if(var24 > 0) { - var37 = var24 - 1; - var38 = (OverlayDefinition)OverlayDefinition.__jf_f.get((long)var37); - OverlayDefinition var58; - if(var38 != null) { - var58 = var38; + if (var65 > 0) { + var42 = var65 - 1; + var43 = (OverlayDefinition)OverlayDefinition.field664.get((long)var42); + OverlayDefinition var45; + if (var43 != null) { + var45 = var43; } else { - byte[] var39 = OverlayDefinition.__jf_m.takeRecord(4, var37); - var38 = new OverlayDefinition(); - if(var39 != null) { - var38.read(new Buffer(var39), var37); + byte[] var46 = OverlayDefinition.field663.takeRecord(4, var42); + var43 = new OverlayDefinition(); + if (var46 != null) { + var43.read(new Buffer(var46), var42); } - var38.init(); - OverlayDefinition.__jf_f.put(var38, (long)var37); - var58 = var38; + var43.init(); + OverlayDefinition.field664.put(var43, (long)var42); + var45 = var43; } - if(!var58.__o) { - var69 = false; + if (!var45.field665) { + var44 = false; } } - if(var69 && var25 == var26 && var25 == var27 && var28 == var25) { - Tiles.__bq_a[var5][var14][var20] |= 2340; + if (var44 && var30 == var31 && var30 == var32 && var33 == var30) { + var10000 = Tiles.field910[var6][var12]; + var10000[var18] |= 2340; } } - var35 = 0; - if(var34 != -1) { - var35 = Rasterizer3D.Rasterizer3D_colorPalette[class15.method183(var34, 96)]; + var40 = 0; + if (var39 != -1) { + var40 = Rasterizer3D.Rasterizer3D_colorPalette[class15.method183(var39, 96)]; } - if(var24 == 0) { - var65.addTile(var5, var14, var20, 0, 0, -1, var25, var26, var27, var28, class15.method183(var33, var29), class15.method183(var33, var30), class15.method183(var33, var31), class15.method183(var33, var32), 0, 0, 0, 0, var35, 0); + if (var65 == 0) { + var60.addTile(var6, var12, var18, 0, 0, -1, var30, var31, var32, var33, class15.method183(var38, var34), class15.method183(var38, var35), class15.method183(var38, var36), class15.method183(var38, var37), 0, 0, 0, 0, var40, 0); } else { - var36 = class32.__ay_u[var5][var14][var20] + 1; - byte var70 = class307.__kc_g[var5][var14][var20]; - int var59 = var24 - 1; - OverlayDefinition var40 = (OverlayDefinition)OverlayDefinition.__jf_f.get((long)var59); - if(var40 != null) { - var38 = var40; + var41 = class32.field1157[var6][var12][var18] + 1; + byte var66 = class307.field1155[var6][var12][var18]; + int var67 = var65 - 1; + OverlayDefinition var68 = (OverlayDefinition)OverlayDefinition.field664.get((long)var67); + if (var68 != null) { + var43 = var68; } else { - byte[] var41 = OverlayDefinition.__jf_m.takeRecord(4, var59); - var40 = new OverlayDefinition(); - if(var41 != null) { - var40.read(new Buffer(var41), var59); + byte[] var47 = OverlayDefinition.field663.takeRecord(4, var67); + var68 = new OverlayDefinition(); + if (var47 != null) { + var68.read(new Buffer(var47), var67); } - var40.init(); - OverlayDefinition.__jf_f.put(var40, (long)var59); - var38 = var40; + var68.init(); + OverlayDefinition.field664.put(var68, (long)var67); + var43 = var68; } - int var60 = var38.texture; - int var42; - int var43; - int var44; - int var45; - if(var60 >= 0) { - var43 = Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var60); - var42 = -1; - } else if(var38.rgb == 16711935) { - var42 = -2; - var60 = -1; - var43 = -2; + int var69 = var43.texture; + int var48; + int var49; + int var50; + int var51; + if (var69 >= 0) { + var49 = Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var69); + var48 = -1; + } else if (var43.rgb == 16711935) { + var48 = -2; + var69 = -1; + var49 = -2; } else { - var42 = WorldMapAreaData.method712(var38.hue, var38.saturation, var38.lightness); - var44 = var38.hue + Tiles.__bq_p & 255; - var45 = var38.lightness + Tiles.__bq_v; - if(var45 < 0) { - var45 = 0; - } else if(var45 > 255) { - var45 = 255; + var48 = WorldMapAreaData.method712(var43.hue, var43.saturation, var43.lightness); + var50 = var43.hue + Tiles.field917 & 255; + var51 = var43.lightness + Tiles.field918; + if (var51 < 0) { + var51 = 0; + } else if (var51 > 255) { + var51 = 255; } - var43 = WorldMapAreaData.method712(var44, var38.saturation, var45); + var49 = WorldMapAreaData.method712(var50, var43.saturation, var51); } - var44 = 0; - if(var43 != -2) { - var44 = Rasterizer3D.Rasterizer3D_colorPalette[class25.method348(var43, 96)]; + var50 = 0; + if (var49 != -2) { + var50 = Rasterizer3D.Rasterizer3D_colorPalette[class25.method348(var49, 96)]; } - if(var38.rgb2 != -1) { - var45 = var38.hue2 + Tiles.__bq_p & 255; - int var46 = var38.lightness2 + Tiles.__bq_v; - if(var46 < 0) { - var46 = 0; - } else if(var46 > 255) { - var46 = 255; + if (var43.rgb2 != -1) { + var51 = var43.hue2 + Tiles.field917 & 255; + int var52 = var43.lightness2 + Tiles.field918; + if (var52 < 0) { + var52 = 0; + } else if (var52 > 255) { + var52 = 255; } - var43 = WorldMapAreaData.method712(var45, var38.saturation2, var46); - var44 = Rasterizer3D.Rasterizer3D_colorPalette[class25.method348(var43, 96)]; + var49 = WorldMapAreaData.method712(var51, var43.saturation2, var52); + var50 = Rasterizer3D.Rasterizer3D_colorPalette[class25.method348(var49, 96)]; } - var65.addTile(var5, var14, var20, var36, var70, var60, var25, var26, var27, var28, class15.method183(var33, var29), class15.method183(var33, var30), class15.method183(var33, var31), class15.method183(var33, var32), class25.method348(var42, var29), class25.method348(var42, var30), class25.method348(var42, var31), class25.method348(var42, var32), var35, var44); + var60.addTile(var6, var12, var18, var41, var66, var69, var30, var31, var32, var33, class15.method183(var38, var34), class15.method183(var38, var35), class15.method183(var38, var36), class15.method183(var38, var37), class25.method348(var48, var34), class25.method348(var48, var35), class25.method348(var48, var36), class25.method348(var48, var37), var40, var50); } } } @@ -2207,194 +1941,194 @@ public final class Client extends GameShell implements Usernamed { } } - for(var14 = 1; var14 < 103; ++var14) { - for(var15 = 1; var15 < 103; ++var15) { - if((Tiles.Tiles_renderFlags[var5][var15][var14] & 8) != 0) { - var20 = 0; - } else if(var5 > 0 && (Tiles.Tiles_renderFlags[1][var15][var14] & 2) != 0) { - var20 = var5 - 1; + for (var12 = 1; var12 < 103; ++var12) { + for (var13 = 1; var13 < 103; ++var13) { + if ((Tiles.Tiles_renderFlags[var6][var13][var12] & 8) != 0) { + var18 = 0; + } else if (var6 > 0 && (Tiles.Tiles_renderFlags[1][var13][var12] & 2) != 0) { + var18 = var6 - 1; } else { - var20 = var5; + var18 = var6; } - var65.setTileMinPlane(var5, var15, var14, var20); + var60.setTileMinPlane(var6, var13, var12, var18); } } - Tiles.__bq_w[var5] = null; - Fonts.__kz_o[var5] = null; - class32.__ay_u[var5] = null; - class307.__kc_g[var5] = null; - Tiles.__bq_l[var5] = null; + Tiles.field908[var6] = (byte[][])null; + Fonts.field350[var6] = (byte[][])null; + class32.field1157[var6] = (byte[][])null; + class307.field1155[var6] = (byte[][])null; + Tiles.field909[var6] = (byte[][])null; } - var65.__aw_247(-50, -10, -50); + var60.method293(-50, -10, -50); - for(var5 = 0; var5 < 104; ++var5) { - for(var51 = 0; var51 < 104; ++var51) { - if((Tiles.Tiles_renderFlags[1][var5][var51] & 2) == 2) { - var65.setLinkBelow(var5, var51); + for (var6 = 0; var6 < 104; ++var6) { + for (var21 = 0; var21 < 104; ++var21) { + if ((Tiles.Tiles_renderFlags[1][var6][var21] & 2) == 2) { + var60.setLinkBelow(var6, var21); } } } - var5 = 1; - var51 = 2; - var52 = 4; + var6 = 1; + var21 = 2; + var56 = 4; - for(var53 = 0; var53 < 4; ++var53) { - if(var53 > 0) { - var5 <<= 3; - var51 <<= 3; - var52 <<= 3; + for (var57 = 0; var57 < 4; ++var57) { + if (var57 > 0) { + var6 <<= 3; + var21 <<= 3; + var56 <<= 3; } - for(var54 = 0; var54 <= var53; ++var54) { - for(var10 = 0; var10 <= 104; ++var10) { - for(var11 = 0; var11 <= 104; ++var11) { - short var68; - if((Tiles.__bq_a[var54][var11][var10] & var5) != 0) { - var12 = var10; - var13 = var10; - var14 = var54; + for (var58 = 0; var58 <= var57; ++var58) { + for (var8 = 0; var8 <= 104; ++var8) { + for (var9 = 0; var9 <= 104; ++var9) { + short var63; + if ((Tiles.field910[var58][var9][var8] & var6) != 0) { + var10 = var8; + var11 = var8; + var12 = var58; - for(var15 = var54; var12 > 0 && (Tiles.__bq_a[var54][var11][var12 - 1] & var5) != 0; --var12) { - ; + for (var13 = var58; var10 > 0 && (Tiles.field910[var58][var9][var10 - 1] & var6) != 0; --var10) { } - while(var13 < 104 && (Tiles.__bq_a[var54][var11][var13 + 1] & var5) != 0) { - ++var13; + while (var11 < 104 && (Tiles.field910[var58][var9][var11 + 1] & var6) != 0) { + ++var11; } - label837: - while(var14 > 0) { - for(var16 = var12; var16 <= var13; ++var16) { - if((Tiles.__bq_a[var14 - 1][var11][var16] & var5) == 0) { - break label837; - } - } - - --var14; - } - - label826: - while(var15 < var53) { - for(var16 = var12; var16 <= var13; ++var16) { - if((Tiles.__bq_a[var15 + 1][var11][var16] & var5) == 0) { - break label826; - } - } - - ++var15; - } - - var16 = (var13 - var12 + 1) * (var15 + 1 - var14); - if(var16 >= 8) { - var68 = 240; - var18 = Tiles.Tiles_heights[var15][var11][var12] - var68; - var19 = Tiles.Tiles_heights[var14][var11][var12]; - Scene.Scene_addOccluder(var53, 1, var11 * 128, var11 * 128, var12 * 128, var13 * 128 + 128, var18, var19); - - for(var20 = var14; var20 <= var15; ++var20) { - for(var21 = var12; var21 <= var13; ++var21) { - Tiles.__bq_a[var20][var11][var21] &= ~var5; - } - } - } - } - - if((Tiles.__bq_a[var54][var11][var10] & var51) != 0) { - var12 = var11; - var13 = var11; - var14 = var54; - - for(var15 = var54; var12 > 0 && (Tiles.__bq_a[var54][var12 - 1][var10] & var51) != 0; --var12) { - ; - } - - while(var13 < 104 && (Tiles.__bq_a[var54][var13 + 1][var10] & var51) != 0) { - ++var13; - } - - label890: - while(var14 > 0) { - for(var16 = var12; var16 <= var13; ++var16) { - if((Tiles.__bq_a[var14 - 1][var16][var10] & var51) == 0) { - break label890; - } - } - - --var14; - } - - label879: - while(var15 < var53) { - for(var16 = var12; var16 <= var13; ++var16) { - if((Tiles.__bq_a[var15 + 1][var16][var10] & var51) == 0) { - break label879; - } - } - - ++var15; - } - - var16 = (var13 - var12 + 1) * (var15 + 1 - var14); - if(var16 >= 8) { - var68 = 240; - var18 = Tiles.Tiles_heights[var15][var12][var10] - var68; - var19 = Tiles.Tiles_heights[var14][var12][var10]; - Scene.Scene_addOccluder(var53, 2, var12 * 128, var13 * 128 + 128, var10 * 128, var10 * 128, var18, var19); - - for(var20 = var14; var20 <= var15; ++var20) { - for(var21 = var12; var21 <= var13; ++var21) { - Tiles.__bq_a[var20][var21][var10] &= ~var51; - } - } - } - } - - if((Tiles.__bq_a[var54][var11][var10] & var52) != 0) { - var12 = var11; - var13 = var11; - var14 = var10; - - for(var15 = var10; var14 > 0 && (Tiles.__bq_a[var54][var11][var14 - 1] & var52) != 0; --var14) { - ; - } - - while(var15 < 104 && (Tiles.__bq_a[var54][var11][var15 + 1] & var52) != 0) { - ++var15; - } - - label943: - while(var12 > 0) { - for(var16 = var14; var16 <= var15; ++var16) { - if((Tiles.__bq_a[var54][var12 - 1][var16] & var52) == 0) { - break label943; + label649: + while (var12 > 0) { + for (var14 = var10; var14 <= var11; ++var14) { + if ((Tiles.field910[var12 - 1][var9][var14] & var6) == 0) { + break label649; } } --var12; } - label932: - while(var13 < 104) { - for(var16 = var14; var16 <= var15; ++var16) { - if((Tiles.__bq_a[var54][var13 + 1][var16] & var52) == 0) { - break label932; + label638: + while (var13 < var57) { + for (var14 = var10; var14 <= var11; ++var14) { + if ((Tiles.field910[var13 + 1][var9][var14] & var6) == 0) { + break label638; } } ++var13; } - if((var15 - var14 + 1) * (var13 - var12 + 1) >= 4) { - var16 = Tiles.Tiles_heights[var54][var12][var14]; - Scene.Scene_addOccluder(var53, 4, var12 * 128, var13 * 128 + 128, var14 * 128, var15 * 128 + 128, var16, var16); + var14 = (var11 - var10 + 1) * (var13 + 1 - var12); + if (var14 >= 8) { + var63 = 240; + var16 = Tiles.Tiles_heights[var13][var9][var10] - var63; + var17 = Tiles.Tiles_heights[var12][var9][var10]; + Scene.Scene_addOccluder(var57, 1, var9 * 128, var9 * 128, var10 * 128, var11 * 128 + 128, var16, var17); - for(var17 = var12; var17 <= var13; ++var17) { - for(var18 = var14; var18 <= var15; ++var18) { - Tiles.__bq_a[var54][var17][var18] &= ~var52; + for (var18 = var12; var18 <= var13; ++var18) { + for (var19 = var10; var19 <= var11; ++var19) { + var10000 = Tiles.field910[var18][var9]; + var10000[var19] &= ~var6; + } + } + } + } + + if ((Tiles.field910[var58][var9][var8] & var21) != 0) { + var10 = var9; + var11 = var9; + var12 = var58; + + for (var13 = var58; var10 > 0 && (Tiles.field910[var58][var10 - 1][var8] & var21) != 0; --var10) { + } + + while (var11 < 104 && (Tiles.field910[var58][var11 + 1][var8] & var21) != 0) { + ++var11; + } + + label702: + while (var12 > 0) { + for (var14 = var10; var14 <= var11; ++var14) { + if ((Tiles.field910[var12 - 1][var14][var8] & var21) == 0) { + break label702; + } + } + + --var12; + } + + label691: + while (var13 < var57) { + for (var14 = var10; var14 <= var11; ++var14) { + if ((Tiles.field910[var13 + 1][var14][var8] & var21) == 0) { + break label691; + } + } + + ++var13; + } + + var14 = (var11 - var10 + 1) * (var13 + 1 - var12); + if (var14 >= 8) { + var63 = 240; + var16 = Tiles.Tiles_heights[var13][var10][var8] - var63; + var17 = Tiles.Tiles_heights[var12][var10][var8]; + Scene.Scene_addOccluder(var57, 2, var10 * 128, var11 * 128 + 128, var8 * 128, var8 * 128, var16, var17); + + for (var18 = var12; var18 <= var13; ++var18) { + for (var19 = var10; var19 <= var11; ++var19) { + var10000 = Tiles.field910[var18][var19]; + var10000[var8] &= ~var21; + } + } + } + } + + if ((Tiles.field910[var58][var9][var8] & var56) != 0) { + var10 = var9; + var11 = var9; + var12 = var8; + + for (var13 = var8; var12 > 0 && (Tiles.field910[var58][var9][var12 - 1] & var56) != 0; --var12) { + } + + while (var13 < 104 && (Tiles.field910[var58][var9][var13 + 1] & var56) != 0) { + ++var13; + } + + label755: + while (var10 > 0) { + for (var14 = var12; var14 <= var13; ++var14) { + if ((Tiles.field910[var58][var10 - 1][var14] & var56) == 0) { + break label755; + } + } + + --var10; + } + + label744: + while (var11 < 104) { + for (var14 = var12; var14 <= var13; ++var14) { + if ((Tiles.field910[var58][var11 + 1][var14] & var56) == 0) { + break label744; + } + } + + ++var11; + } + + if ((var13 - var12 + 1) * (var11 - var10 + 1) >= 4) { + var14 = Tiles.Tiles_heights[var58][var10][var12]; + Scene.Scene_addOccluder(var57, 4, var10 * 128, var11 * 128 + 128, var12 * 128, var13 * 128 + 128, var14, var14); + + for (var15 = var10; var15 <= var11; ++var15) { + for (var16 = var12; var16 <= var13; ++var16) { + var10000 = Tiles.field910[var58][var15]; + var10000[var16] &= ~var56; } } } @@ -2405,48 +2139,48 @@ public final class Client extends GameShell implements Usernamed { } UserComparator10.method3352(true); - var5 = Tiles.Tiles_minPlane; - if(var5 > SoundSystem.plane) { - var5 = SoundSystem.plane; + var6 = Tiles.Tiles_minPlane; + if (var6 > SoundSystem.plane) { + var6 = SoundSystem.plane; } - if(var5 < SoundSystem.plane - 1) { - var5 = SoundSystem.plane - 1; + if (var6 < SoundSystem.plane - 1) { + var6 = SoundSystem.plane - 1; } - if(isLowDetail) { + if (isLowDetail) { class65.scene.init(Tiles.Tiles_minPlane); } else { class65.scene.init(0); } - for(var51 = 0; var51 < 104; ++var51) { - for(var52 = 0; var52 < 104; ++var52) { - TilePaint.method3061(var51, var52); + for (var21 = 0; var21 < 104; ++var21) { + for (var56 = 0; var56 < 104; ++var56) { + TilePaint.method3061(var21, var56); } } class13.playPcmPlayers(); ScriptEvent.method1179(); - ObjectDefinition.__jr_o.clear(); - PacketBufferNode var67; - if(TextureProvider.client.hasFrame()) { - var67 = Interpreter.method1915(ClientPacket.__gs_x, packetWriter.isaacCipher); - var67.packetBuffer.writeInt(1057001181); - packetWriter.__q_167(var67); + ObjectDefinition.field641.clear(); + PacketBufferNode var64; + if (TextureProvider.client.hasFrame()) { + var64 = Interpreter.method1915(ClientPacket.field231, packetWriter.isaacCipher); + var64.packetBuffer.writeInt(1057001181); + packetWriter.method241(var64); } - if(!isInInstance) { - var51 = (GameObject.__eh_fy - 6) / 8; - var52 = (GameObject.__eh_fy + 6) / 8; - var53 = (WorldMapLabelSize.__s_fi - 6) / 8; - var54 = (WorldMapLabelSize.__s_fi + 6) / 8; + if (!isInInstance) { + var21 = (GameObject.field359 - 6) / 8; + var56 = (GameObject.field359 + 6) / 8; + var57 = (WorldMapLabelSize.field1041 - 6) / 8; + var58 = (WorldMapLabelSize.field1041 + 6) / 8; - for(var10 = var51 - 1; var10 <= var52 + 1; ++var10) { - for(var11 = var53 - 1; var11 <= var54 + 1; ++var11) { - if(var10 < var51 || var10 > var52 || var11 < var53 || var11 > var54) { - SecureRandomFuture.indexCache5.__ar_402("m" + var10 + "_" + var11); - SecureRandomFuture.indexCache5.__ar_402("l" + var10 + "_" + var11); + for (var8 = var21 - 1; var8 <= var56 + 1; ++var8) { + for (var9 = var57 - 1; var9 <= var58 + 1; ++var9) { + if (var8 < var21 || var8 > var56 || var9 < var57 || var9 > var58) { + SecureRandomFuture.indexCache5.method10("m" + var8 + "_" + var9); + SecureRandomFuture.indexCache5.method10("l" + var8 + "_" + var9); } } } @@ -2455,8 +2189,8 @@ public final class Client extends GameShell implements Usernamed { GameShell.updateGameState(30); class13.playPcmPlayers(); BufferedSink.method3603(); - var67 = Interpreter.method1915(ClientPacket.__gs_bv, packetWriter.isaacCipher); - packetWriter.__q_167(var67); + var64 = Interpreter.method1915(ClientPacket.field298, packetWriter.isaacCipher); + packetWriter.method241(var64); class11.method145(); } } @@ -2465,9 +2199,9 @@ public final class Client extends GameShell implements Usernamed { class54.method1092(this); } - if(gameState == 30) { + if (gameState == 30) { this.doCycleLoggedIn(); - } else if(gameState == 40 || gameState == 45) { + } else if (gameState == 40 || gameState == 45) { this.doCycleLoggedOut(); } @@ -2481,108 +2215,108 @@ public final class Client extends GameShell implements Usernamed { @Export("methodDraw") protected final void methodDraw(boolean var1) { boolean var2; - label166: { + label139: { try { - if(class214.__hf_o == 2) { - if(class13.musicTrack == null) { - class13.musicTrack = MusicTrack.readTrack(class214.__hf_u, class30.musicTrackArchiveId, GrandExchangeOffer.musicTrackFileId); - if(class13.musicTrack == null) { + if (class214.field1129 == 2) { + if (class13.musicTrack == null) { + class13.musicTrack = MusicTrack.readTrack(class214.field1130, class30.musicTrackArchiveId, GrandExchangeOffer.musicTrackFileId); + if (class13.musicTrack == null) { var2 = false; - break label166; + break label139; } } - if(class307.soundCache == null) { - class307.soundCache = new SoundCache(class214.__hf_q, class214.__hf_f); + if (class307.soundCache == null) { + class307.soundCache = new SoundCache(class214.field1128, class214.field1127); } - if(class214.midiPcmStream.loadMusicTrack(class13.musicTrack, class1.__f_m, class307.soundCache, 22050)) { + if (class214.midiPcmStream.loadMusicTrack(class13.musicTrack, class1.field1105, class307.soundCache, 22050)) { class214.midiPcmStream.clearAll(); - class214.midiPcmStream.__m_340(WorldMapLabel.__aj_e); + class214.midiPcmStream.method169(WorldMapLabel.field1039); class214.midiPcmStream.setMusicTrack(class13.musicTrack, RectangleMode.musicTrackBoolean); - class214.__hf_o = 0; + class214.field1129 = 0; class13.musicTrack = null; class307.soundCache = null; - class214.__hf_u = null; + class214.field1130 = null; var2 = true; - break label166; + break label139; } } - } catch (Exception var6) { - var6.printStackTrace(); + } catch (Exception var4) { + var4.printStackTrace(); class214.midiPcmStream.clear(); - class214.__hf_o = 0; + class214.field1129 = 0; class13.musicTrack = null; class307.soundCache = null; - class214.__hf_u = null; + class214.field1130 = null; } var2 = false; } - if(var2 && __client_qq && WorldMapCacheName.pcmPlayer0 != null) { + if (var2 && field107 && WorldMapCacheName.pcmPlayer0 != null) { WorldMapCacheName.pcmPlayer0.tryDiscard(); } - if((gameState == 10 || gameState == 20 || gameState == 30) && __client_oa != 0L && class203.currentTimeMs() > __client_oa) { + if ((gameState == 10 || gameState == 20 || gameState == 30) && field99 != 0L && class203.currentTimeMs() > field99) { GroundItem.method2095(SpotAnimationDefinition.method4822()); } - int var4; - if(var1) { - for(var4 = 0; var4 < 100; ++var4) { - __client_od[var4] = true; + int var3; + if (var1) { + for (var3 = 0; var3 < 100; ++var3) { + field100[var3] = true; } } - if(gameState == 0) { + if (gameState == 0) { this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); - } else if(gameState == 5) { + } else if (gameState == 5) { IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); - } else if(gameState != 10 && gameState != 11) { - if(gameState == 20) { + } else if (gameState != 10 && gameState != 11) { + if (gameState == 20) { IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); - } else if(gameState == 25) { - if(__client_gh == 1) { - if(__client_fe > __client_fn) { - __client_fn = __client_fe; + } else if (gameState == 25) { + if (field181 == 1) { + if (field177 > field178) { + field178 = field177; } - var4 = (__client_fn * 50 - __client_fe * 50) / __client_fn; - class68.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); - } else if(__client_gh == 2) { - if(__client_fk > __client_gp) { - __client_gp = __client_fk; + var3 = (field178 * 50 - field177 * 50) / field178; + class68.drawLoadingMessage("Loading - please wait.
(" + var3 + "%)", false); + } else if (field181 == 2) { + if (field179 > field180) { + field180 = field179; } - var4 = (__client_gp * 50 - __client_fk * 50) / __client_gp + 50; - class68.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); + var3 = (field180 * 50 - field179 * 50) / field180 + 50; + class68.drawLoadingMessage("Loading - please wait.
(" + var3 + "%)", false); } else { class68.drawLoadingMessage("Loading - please wait.", false); } - } else if(gameState == 30) { + } else if (gameState == 30) { this.drawLoggedIn(); - } else if(gameState == 40) { - class68.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); - } else if(gameState == 45) { + } else if (gameState == 40) { + class68.drawLoadingMessage("Connection lost
Please wait - attempting to reestablish", false); + } else if (gameState == 45) { class68.drawLoadingMessage("Please wait...", false); } } else { IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); } - if(gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { - for(var4 = 0; var4 < rootWidgetCount; ++var4) { - if(__client_ot[var4]) { - class197.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); - __client_ot[var4] = false; + if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { + for (var3 = 0; var3 < rootWidgetCount; ++var3) { + if (field102[var3]) { + class197.rasterProvider.draw(rootWidgetXs[var3], rootWidgetYs[var3], rootWidgetWidths[var3], rootWidgetHeights[var3]); + field102[var3] = false; } } - } else if(gameState > 0) { + } else if (gameState > 0) { class197.rasterProvider.drawFull(0, 0); - for(var4 = 0; var4 < rootWidgetCount; ++var4) { - __client_ot[var4] = false; + for (var3 = 0; var3 < rootWidgetCount; ++var3) { + field102[var3] = false; } } @@ -2595,24 +2329,24 @@ public final class Client extends GameShell implements Usernamed { ) @Export("kill0") protected final void kill0() { - if(class196.varcs.hasUnwrittenChanges()) { + if (class196.varcs.hasUnwrittenChanges()) { class196.varcs.write(); } - if(Projectile.mouseRecorder != null) { + if (Projectile.mouseRecorder != null) { Projectile.mouseRecorder.isRunning = false; } Projectile.mouseRecorder = null; packetWriter.close(); - if(KeyHandler.KeyHandler_instance != null) { + if (KeyHandler.KeyHandler_instance != null) { KeyHandler var1 = KeyHandler.KeyHandler_instance; synchronized(KeyHandler.KeyHandler_instance) { KeyHandler.KeyHandler_instance = null; } } - if(MouseHandler.MouseHandler_instance != null) { + if (MouseHandler.MouseHandler_instance != null) { MouseHandler var8 = MouseHandler.MouseHandler_instance; synchronized(MouseHandler.MouseHandler_instance) { MouseHandler.MouseHandler_instance = null; @@ -2620,20 +2354,20 @@ public final class Client extends GameShell implements Usernamed { } class16.mouseWheel = null; - if(WorldMapCacheName.pcmPlayer0 != null) { + if (WorldMapCacheName.pcmPlayer0 != null) { WorldMapCacheName.pcmPlayer0.shutdown(); } - if(AbstractIndexCache.pcmPlayer1 != null) { + if (AbstractIndexCache.pcmPlayer1 != null) { AbstractIndexCache.pcmPlayer1.shutdown(); } - if(NetCache.NetCache_socket != null) { + if (NetCache.NetCache_socket != null) { NetCache.NetCache_socket.close(); } RunException.method3431(); - if(TriBool.urlRequester != null) { + if (TriBool.urlRequester != null) { TriBool.urlRequester.close(); TriBool.urlRequester = null; } @@ -2641,14 +2375,13 @@ public final class Client extends GameShell implements Usernamed { try { class168.dat2File.close(); - for(int var4 = 0; var4 < class168.idxCount; ++var4) { - IndexStoreAction.idxFiles[var4].close(); + for (int var9 = 0; var9 < class168.idxCount; ++var9) { + IndexStoreAction.idxFiles[var9].close(); } class168.idx255File.close(); class168.randomDat.close(); } catch (Exception var7) { - ; } } @@ -2658,23 +2391,234 @@ public final class Client extends GameShell implements Usernamed { signature = "(I)V", garbageValue = "1860808291" ) - protected final void __au_110() { + protected final void vmethod114() { } @ObfuscatedName("init") - public final void __init_109() { + public final void vmethod117() { try { - if(this.checkHost()) { + if (this.checkHost()) { ClientParameter[] var1 = class4.method47(); + int var3 = 0; - int var9; - for(int var2 = 0; var2 < var1.length; ++var2) { - ClientParameter var3 = var1[var2]; - String var4 = this.getParameter(var3.id); - if(var4 != null) { - switch(Integer.parseInt(var3.id)) { + while (true) { + int var2; + if (var3 >= var1.length) { + class237.method4539(); + class50.worldHost = this.getCodeBase().getHost(); + String var25 = class15.serverBuild.name; + byte var26 = 0; + + try { + class168.idxCount = 21; + PacketBuffer.field667 = var26; + + try { + class266.osName = System.getProperty("os.name"); + } catch (Exception var20) { + class266.osName = "Unknown"; + } + + WorldMapSection3.osNameLowerCase = class266.osName.toLowerCase(); + + try { + WorldMapSection1.userHomeDirectory = System.getProperty("user.home"); + if (WorldMapSection1.userHomeDirectory != null) { + WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/"; + } + } catch (Exception var19) { + } + + try { + if (WorldMapSection3.osNameLowerCase.startsWith("win")) { + if (WorldMapSection1.userHomeDirectory == null) { + WorldMapSection1.userHomeDirectory = System.getenv("USERPROFILE"); + } + } else if (WorldMapSection1.userHomeDirectory == null) { + WorldMapSection1.userHomeDirectory = System.getenv("HOME"); + } + + if (WorldMapSection1.userHomeDirectory != null) { + WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/"; + } + } catch (Exception var18) { + } + + if (WorldMapSection1.userHomeDirectory == null) { + WorldMapSection1.userHomeDirectory = "~/"; + } + + WorldMapSection2.cacheDirectoryLocations = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", WorldMapSection1.userHomeDirectory, "/tmp/", ""}; + Canvas.field94 = new String[]{".jagex_cache_" + PacketBuffer.field667, ".file_store_" + PacketBuffer.field667}; + int var27 = 0; + + label262: + while (var27 < 4) { + String var28 = var27 == 0 ? "" : "" + var27; + class337.clDat = new File(WorldMapSection1.userHomeDirectory, "jagex_cl_oldschool_" + var25 + var28 + ".dat"); + String var30 = null; + String var31 = null; + boolean var32 = false; + int var14; + File var33; + if (class337.clDat.exists()) { + try { + AccessFile var11 = new AccessFile(class337.clDat, "rw", 10000L); + + int var12; + Buffer var13; + for (var13 = new Buffer((int)var11.length()); var13.index < var13.array.length; var13.index += var12) { + var12 = var11.read(var13.array, var13.index, var13.array.length - var13.index); + if (var12 == -1) { + throw new IOException(); + } + } + + var13.index = 0; + var12 = var13.readUnsignedByte(); + if (var12 < 1 || var12 > 3) { + throw new IOException("" + var12); + } + + var14 = 0; + if (var12 > 1) { + var14 = var13.readUnsignedByte(); + } + + if (var12 <= 2) { + var30 = var13.readStringCp1252NullCircumfixed(); + if (var14 == 1) { + var31 = var13.readStringCp1252NullCircumfixed(); + } + } else { + var30 = var13.method45(); + if (var14 == 1) { + var31 = var13.method45(); + } + } + + var11.close(); + } catch (IOException var22) { + var22.printStackTrace(); + } + + if (var30 != null) { + var33 = new File(var30); + if (!var33.exists()) { + var30 = null; + } + } + + if (var30 != null) { + var33 = new File(var30, "test.dat"); + if (!DevicePcmPlayerProvider.method847(var33, true)) { + var30 = null; + } + } + } + + if (var30 == null && var27 == 0) { + label237: + for (var2 = 0; var2 < Canvas.field94.length; ++var2) { + for (int var34 = 0; var34 < WorldMapSection2.cacheDirectoryLocations.length; ++var34) { + File var37 = new File(WorldMapSection2.cacheDirectoryLocations[var34] + Canvas.field94[var2] + File.separatorChar + "oldschool" + File.separatorChar); + if (var37.exists() && DevicePcmPlayerProvider.method847(new File(var37, "test.dat"), true)) { + var30 = var37.toString(); + var32 = true; + break label237; + } + } + } + } + + if (var30 == null) { + var30 = WorldMapSection1.userHomeDirectory + File.separatorChar + "jagexcache" + var28 + File.separatorChar + "oldschool" + File.separatorChar + var25 + File.separatorChar; + var32 = true; + } + + File var15; + File var36; + File[] var38; + File[] var39; + if (var31 != null) { + var36 = new File(var31); + var33 = new File(var30); + + try { + var38 = var36.listFiles(); + var39 = var38; + + for (var14 = 0; var14 < var39.length; ++var14) { + var15 = var39[var14]; + File var16 = new File(var33, var15.getName()); + boolean var17 = var15.renameTo(var16); + if (!var17) { + throw new IOException(); + } + } + } catch (Exception var21) { + var21.printStackTrace(); + } + + var32 = true; + } + + if (var32) { + class14.method167(new File(var30), (File)null); + } + + var36 = new File(var30); + class168.field1115 = var36; + if (!class168.field1115.exists()) { + class168.field1115.mkdirs(); + } + + var38 = class168.field1115.listFiles(); + if (var38 != null) { + var39 = var38; + + for (var14 = 0; var14 < var39.length; ++var14) { + var15 = var39[var14]; + if (!DevicePcmPlayerProvider.method847(var15, false)) { + ++var27; + continue label262; + } + } + } + break; + } + + File var29 = class168.field1115; + class171.field1118 = var29; + if (!class171.field1118.exists()) { + throw new RuntimeException(""); + } + + class171.field1117 = true; + Interpreter.method1976(); + class168.dat2File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); + class168.idx255File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); + IndexStoreAction.idxFiles = new BufferedFile[class168.idxCount]; + + for (int var35 = 0; var35 < class168.idxCount; ++var35) { + IndexStoreAction.idxFiles[var35] = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx" + var35), "rw", 1048576L), 6000, 0); + } + } catch (Exception var23) { + NPCDefinition.sendStackTrace((String)null, var23); + } + + TextureProvider.client = this; + RunException.field761 = clientType; + this.startThread(765, 503, 180); + break; + } + + ClientParameter var4 = var1[var3]; + String var5 = this.getParameter(var4.id); + if (var5 != null) { + switch(Integer.parseInt(var4.id)) { case 1: - useBufferedSocket = Integer.parseInt(var4) != 0; + useBufferedSocket = Integer.parseInt(var5) != 0; case 2: case 11: case 13: @@ -2682,284 +2626,82 @@ public final class Client extends GameShell implements Usernamed { default: break; case 3: - if(var4.equalsIgnoreCase("true")) { + if (var5.equalsIgnoreCase("true")) { isMembersWorld = true; } else { isMembersWorld = false; } break; case 4: - if(clientType == -1) { - clientType = Integer.parseInt(var4); + if (clientType == -1) { + clientType = Integer.parseInt(var5); } break; case 5: - worldProperties = Integer.parseInt(var4); + worldProperties = Integer.parseInt(var5); break; case 6: - language = Integer.parseInt(var4); + language = Integer.parseInt(var5); break; case 7: - int var6 = Integer.parseInt(var4); - ServerBuild[] var7 = new ServerBuild[]{ServerBuild.__iy_q, ServerBuild.__iy_w, ServerBuild.__iy_m, ServerBuild.__iy_f}; + int var6 = Integer.parseInt(var5); + ServerBuild[] var7 = new ServerBuild[]{ServerBuild.field786, ServerBuild.field787, ServerBuild.field784, ServerBuild.field785}; ServerBuild[] var8 = var7; - var9 = 0; + var2 = 0; - ServerBuild var5; - while(true) { - if(var9 >= var8.length) { - var5 = null; + ServerBuild var9; + while (true) { + if (var2 >= var8.length) { + var9 = null; break; } - ServerBuild var10 = var8[var9]; - if(var6 == var10.id) { - var5 = var10; + ServerBuild var10 = var8[var2]; + if (var6 == var10.id) { + var9 = var10; break; } - ++var9; + ++var2; } - class15.serverBuild = var5; + class15.serverBuild = var9; break; case 8: - if(var4.equalsIgnoreCase("true")) { - ; + if (var5.equalsIgnoreCase("true")) { } break; case 9: - class21.__b_by = var4; + class21.field1123 = var5; break; case 10: - class22.studioGame = (StudioGame)ScriptFrame.findEnumerated(ClientPacket.method3664(), Integer.parseInt(var4)); - if(class22.studioGame == StudioGame.__is_u) { - KeyHandler.loginType = LoginType.__lx_m; + class22.studioGame = (StudioGame)ScriptFrame.findEnumerated(ClientPacket.method3664(), Integer.parseInt(var5)); + if (class22.studioGame == StudioGame.field892) { + KeyHandler.loginType = LoginType.field479; } else { - KeyHandler.loginType = LoginType.__lx_e; + KeyHandler.loginType = LoginType.field487; } break; case 12: - worldId = Integer.parseInt(var4); + worldId = Integer.parseInt(var5); break; case 14: - AbstractIndexCache.__ir_bu = Integer.parseInt(var4); + AbstractIndexCache.field2 = Integer.parseInt(var5); break; case 15: - gameBuild = Integer.parseInt(var4); + gameBuild = Integer.parseInt(var5); break; case 17: - ServerBuild.worldsUrl = var4; + ServerBuild.worldsUrl = var5; } } + + ++var3; } - - class237.method4539(); - class50.worldHost = this.getCodeBase().getHost(); - String var33 = class15.serverBuild.name; - byte var34 = 0; - - try { - class168.idxCount = 21; - PacketBuffer.__hx_z = var34; - - try { - class266.osName = System.getProperty("os.name"); - } catch (Exception var28) { - class266.osName = "Unknown"; - } - - WorldMapSection3.osNameLowerCase = class266.osName.toLowerCase(); - - try { - WorldMapSection1.userHomeDirectory = System.getProperty("user.home"); - if(WorldMapSection1.userHomeDirectory != null) { - WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/"; - } - } catch (Exception var27) { - ; - } - - try { - if(WorldMapSection3.osNameLowerCase.startsWith("win")) { - if(WorldMapSection1.userHomeDirectory == null) { - WorldMapSection1.userHomeDirectory = System.getenv("USERPROFILE"); - } - } else if(WorldMapSection1.userHomeDirectory == null) { - WorldMapSection1.userHomeDirectory = System.getenv("HOME"); - } - - if(WorldMapSection1.userHomeDirectory != null) { - WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/"; - } - } catch (Exception var26) { - ; - } - - if(WorldMapSection1.userHomeDirectory == null) { - WorldMapSection1.userHomeDirectory = "~/"; - } - - WorldMapSection2.cacheDirectoryLocations = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", WorldMapSection1.userHomeDirectory, "/tmp/", ""}; - Canvas.__ao_s = new String[]{".jagex_cache_" + PacketBuffer.__hx_z, ".file_store_" + PacketBuffer.__hx_z}; - int var17 = 0; - - label259: - while(var17 < 4) { - String var37 = var17 == 0?"":"" + var17; - class337.clDat = new File(WorldMapSection1.userHomeDirectory, "jagex_cl_oldschool_" + var33 + var37 + ".dat"); - String var18 = null; - String var39 = null; - boolean var19 = false; - File var42; - if(class337.clDat.exists()) { - try { - AccessFile var20 = new AccessFile(class337.clDat, "rw", 10000L); - - int var11; - Buffer var41; - for(var41 = new Buffer((int)var20.length()); var41.index < var41.array.length; var41.index += var11) { - var11 = var20.read(var41.array, var41.index, var41.array.length - var41.index); - if(var11 == -1) { - throw new IOException(); - } - } - - var41.index = 0; - var11 = var41.readUnsignedByte(); - if(var11 < 1 || var11 > 3) { - throw new IOException("" + var11); - } - - int var12 = 0; - if(var11 > 1) { - var12 = var41.readUnsignedByte(); - } - - if(var11 <= 2) { - var18 = var41.readStringCp1252NullCircumfixed(); - if(var12 == 1) { - var39 = var41.readStringCp1252NullCircumfixed(); - } - } else { - var18 = var41.__aw_304(); - if(var12 == 1) { - var39 = var41.__aw_304(); - } - } - - var20.close(); - } catch (IOException var30) { - var30.printStackTrace(); - } - - if(var18 != null) { - var42 = new File(var18); - if(!var42.exists()) { - var18 = null; - } - } - - if(var18 != null) { - var42 = new File(var18, "test.dat"); - if(!DevicePcmPlayerProvider.method847(var42, true)) { - var18 = null; - } - } - } - - if(var18 == null && var17 == 0) { - label234: - for(var9 = 0; var9 < Canvas.__ao_s.length; ++var9) { - for(int var21 = 0; var21 < WorldMapSection2.cacheDirectoryLocations.length; ++var21) { - File var22 = new File(WorldMapSection2.cacheDirectoryLocations[var21] + Canvas.__ao_s[var9] + File.separatorChar + "oldschool" + File.separatorChar); - if(var22.exists() && DevicePcmPlayerProvider.method847(new File(var22, "test.dat"), true)) { - var18 = var22.toString(); - var19 = true; - break label234; - } - } - } - } - - if(var18 == null) { - var18 = WorldMapSection1.userHomeDirectory + File.separatorChar + "jagexcache" + var37 + File.separatorChar + "oldschool" + File.separatorChar + var33 + File.separatorChar; - var19 = true; - } - - if(var39 != null) { - File var43 = new File(var39); - var42 = new File(var18); - - try { - File[] var44 = var43.listFiles(); - File[] var23 = var44; - - for(int var13 = 0; var13 < var23.length; ++var13) { - File var14 = var23[var13]; - File var15 = new File(var42, var14.getName()); - boolean var16 = var14.renameTo(var15); - if(!var16) { - throw new IOException(); - } - } - } catch (Exception var29) { - var29.printStackTrace(); - } - - var19 = true; - } - - if(var19) { - class14.method167(new File(var18), (File)null); - } - - File var36 = new File(var18); - class168.__fs_o = var36; - if(!class168.__fs_o.exists()) { - class168.__fs_o.mkdirs(); - } - - File[] var38 = class168.__fs_o.listFiles(); - if(var38 != null) { - File[] var45 = var38; - - for(int var24 = 0; var24 < var45.length; ++var24) { - File var40 = var45[var24]; - if(!DevicePcmPlayerProvider.method847(var40, false)) { - ++var17; - continue label259; - } - } - } - break; - } - - File var35 = class168.__fs_o; - class171.__fo_f = var35; - if(!class171.__fo_f.exists()) { - throw new RuntimeException(""); - } - - class171.__fo_m = true; - Interpreter.method1976(); - class168.dat2File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); - class168.idx255File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); - IndexStoreAction.idxFiles = new BufferedFile[class168.idxCount]; - - for(int var25 = 0; var25 < class168.idxCount; ++var25) { - IndexStoreAction.idxFiles[var25] = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx" + var25), "rw", 1048576L), 6000, 0); - } - } catch (Exception var31) { - NpcDefinition.sendStackTrace((String)null, var31); - } - - TextureProvider.client = this; - RunException.__fx_w = clientType; - this.startThread(765, 503, 180); } - } catch (RuntimeException var32) { - throw Players.method2120(var32, "client.init(" + ')'); + + } catch (RuntimeException var24) { + throw Players.method2120(var24, "client.init()"); } } @@ -2970,30 +2712,30 @@ public final class Client extends GameShell implements Usernamed { ) @Export("doCycleJs5") void doCycleJs5() { - if(gameState != 1000) { - long var2 = class203.currentTimeMs(); - int var4 = (int)(var2 - NetCache.__iq_q); - NetCache.__iq_q = var2; - if(var4 > 200) { - var4 = 200; + if (gameState != 1000) { + long var1 = class203.currentTimeMs(); + int var3 = (int)(var1 - NetCache.field629); + NetCache.field629 = var1; + if (var3 > 200) { + var3 = 200; } - NetCache.__iq_f += var4; - boolean var1; - if(NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { - var1 = true; - } else if(NetCache.NetCache_socket == null) { - var1 = false; + NetCache.field628 += var3; + boolean var4; + if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { + var4 = true; + } else if (NetCache.NetCache_socket == null) { + var4 = false; } else { try { - label242: { - if(NetCache.__iq_f > 30000) { + label205: { + if (NetCache.field628 > 30000) { throw new IOException(); } NetFileRequest var5; Buffer var6; - while(NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { + while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); var6 = new Buffer(4); var6.writeByte(1); @@ -3004,7 +2746,7 @@ public final class Client extends GameShell implements Usernamed { ++NetCache.NetCache_pendingPriorityResponsesCount; } - while(NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { + while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.last(); var6 = new Buffer(4); var6.writeByte(0); @@ -3016,175 +2758,182 @@ public final class Client extends GameShell implements Usernamed { ++NetCache.NetCache_pendingResponsesCount; } - for(int var17 = 0; var17 < 100; ++var17) { - int var18 = NetCache.NetCache_socket.available(); - if(var18 < 0) { + for (int var7 = 0; var7 < 100; ++var7) { + int var8 = NetCache.NetCache_socket.available(); + if (var8 < 0) { throw new IOException(); } - if(var18 == 0) { + if (var8 == 0) { break; } - NetCache.__iq_f = 0; - byte var7 = 0; - if(ModelData0.NetCache_currentResponse == null) { - var7 = 8; - } else if(NetCache.__iq_j == 0) { - var7 = 1; + NetCache.field628 = 0; + byte var9 = 0; + if (ModelData0.NetCache_currentResponse == null) { + var9 = 8; + } else if (NetCache.field630 == 0) { + var9 = 1; } - int var8; - int var9; int var10; + int var11; int var12; - if(var7 > 0) { - var8 = var7 - NetCache.NetCache_responseHeaderBuffer.index; - if(var8 > var18) { - var8 = var18; + int var13; + byte[] var10000; + int var10001; + Buffer var24; + if (var9 > 0) { + var10 = var9 - NetCache.NetCache_responseHeaderBuffer.index; + if (var10 > var8) { + var10 = var8; } - NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.index, var8); - if(NetCache.__iq_b != 0) { - for(var9 = 0; var9 < var8; ++var9) { - NetCache.NetCache_responseHeaderBuffer.array[NetCache.NetCache_responseHeaderBuffer.index + var9] ^= NetCache.__iq_b; + NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.index, var10); + if (NetCache.field631 != 0) { + for (var11 = 0; var11 < var10; ++var11) { + var10000 = NetCache.NetCache_responseHeaderBuffer.array; + var10001 = NetCache.NetCache_responseHeaderBuffer.index + var11; + var10000[var10001] ^= NetCache.field631; } } - NetCache.NetCache_responseHeaderBuffer.index += var8; - if(NetCache.NetCache_responseHeaderBuffer.index < var7) { + var24 = NetCache.NetCache_responseHeaderBuffer; + var24.index += var10; + if (NetCache.NetCache_responseHeaderBuffer.index < var9) { break; } - if(ModelData0.NetCache_currentResponse == null) { + if (ModelData0.NetCache_currentResponse == null) { NetCache.NetCache_responseHeaderBuffer.index = 0; - var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); - var10 = NetCache.NetCache_responseHeaderBuffer.__ag_302(); - int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); - var12 = NetCache.NetCache_responseHeaderBuffer.readInt(); - long var13 = (long)(var10 + (var9 << 16)); - NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13); - WorldComparator.__u_n = true; - if(var15 == null) { - var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13); - WorldComparator.__u_n = false; + var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); + var12 = NetCache.NetCache_responseHeaderBuffer.method43(); + int var14 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); + var13 = NetCache.NetCache_responseHeaderBuffer.readInt(); + long var15 = (long)(var12 + (var11 << 16)); + NetFileRequest var17 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var15); + WorldComparator.field988 = true; + if (var17 == null) { + var17 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var15); + WorldComparator.field988 = false; } - if(var15 == null) { + if (var17 == null) { throw new IOException(); } - int var16 = var11 == 0?5:9; - ModelData0.NetCache_currentResponse = var15; - class22.NetCache_responseArchiveBuffer = new Buffer(var12 + var16 + ModelData0.NetCache_currentResponse.padding); - class22.NetCache_responseArchiveBuffer.writeByte(var11); - class22.NetCache_responseArchiveBuffer.writeInt(var12); - NetCache.__iq_j = 8; + int var18 = var14 == 0 ? 5 : 9; + ModelData0.NetCache_currentResponse = var17; + class22.NetCache_responseArchiveBuffer = new Buffer(var13 + var18 + ModelData0.NetCache_currentResponse.padding); + class22.NetCache_responseArchiveBuffer.writeByte(var14); + class22.NetCache_responseArchiveBuffer.writeInt(var13); + NetCache.field630 = 8; NetCache.NetCache_responseHeaderBuffer.index = 0; - } else if(NetCache.__iq_j == 0) { - if(NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { - NetCache.__iq_j = 1; + } else if (NetCache.field630 == 0) { + if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { + NetCache.field630 = 1; NetCache.NetCache_responseHeaderBuffer.index = 0; } else { ModelData0.NetCache_currentResponse = null; } } } else { - var8 = class22.NetCache_responseArchiveBuffer.array.length - ModelData0.NetCache_currentResponse.padding; - var9 = 512 - NetCache.__iq_j; - if(var9 > var8 - class22.NetCache_responseArchiveBuffer.index) { - var9 = var8 - class22.NetCache_responseArchiveBuffer.index; + var10 = class22.NetCache_responseArchiveBuffer.array.length - ModelData0.NetCache_currentResponse.padding; + var11 = 512 - NetCache.field630; + if (var11 > var10 - class22.NetCache_responseArchiveBuffer.index) { + var11 = var10 - class22.NetCache_responseArchiveBuffer.index; } - if(var9 > var18) { - var9 = var18; + if (var11 > var8) { + var11 = var8; } - NetCache.NetCache_socket.read(class22.NetCache_responseArchiveBuffer.array, class22.NetCache_responseArchiveBuffer.index, var9); - if(NetCache.__iq_b != 0) { - for(var10 = 0; var10 < var9; ++var10) { - class22.NetCache_responseArchiveBuffer.array[class22.NetCache_responseArchiveBuffer.index + var10] ^= NetCache.__iq_b; + NetCache.NetCache_socket.read(class22.NetCache_responseArchiveBuffer.array, class22.NetCache_responseArchiveBuffer.index, var11); + if (NetCache.field631 != 0) { + for (var12 = 0; var12 < var11; ++var12) { + var10000 = class22.NetCache_responseArchiveBuffer.array; + var10001 = class22.NetCache_responseArchiveBuffer.index + var12; + var10000[var10001] ^= NetCache.field631; } } - class22.NetCache_responseArchiveBuffer.index += var9; - NetCache.__iq_j += var9; - if(var8 == class22.NetCache_responseArchiveBuffer.index) { - if(16711935L == ModelData0.NetCache_currentResponse.key) { + var24 = class22.NetCache_responseArchiveBuffer; + var24.index += var11; + NetCache.field630 += var11; + if (var10 == class22.NetCache_responseArchiveBuffer.index) { + if (16711935L == ModelData0.NetCache_currentResponse.key) { Players.NetCache_reference = class22.NetCache_responseArchiveBuffer; - for(var10 = 0; var10 < 256; ++var10) { - IndexCache var19 = NetCache.NetCache_indexCaches[var10]; - if(var19 != null) { - Players.NetCache_reference.index = var10 * 8 + 5; - var12 = Players.NetCache_reference.readInt(); - int var20 = Players.NetCache_reference.readInt(); - var19.loadIndexReference(var12, var20); + for (var12 = 0; var12 < 256; ++var12) { + IndexCache var22 = NetCache.NetCache_indexCaches[var12]; + if (var22 != null) { + Players.NetCache_reference.index = var12 * 8 + 5; + var13 = Players.NetCache_reference.readInt(); + int var23 = Players.NetCache_reference.readInt(); + var22.loadIndexReference(var13, var23); } } } else { NetCache.NetCache_crc.reset(); - NetCache.NetCache_crc.update(class22.NetCache_responseArchiveBuffer.array, 0, var8); - var10 = (int)NetCache.NetCache_crc.getValue(); - if(var10 != ModelData0.NetCache_currentResponse.crc) { + NetCache.NetCache_crc.update(class22.NetCache_responseArchiveBuffer.array, 0, var10); + var12 = (int)NetCache.NetCache_crc.getValue(); + if (var12 != ModelData0.NetCache_currentResponse.crc) { try { NetCache.NetCache_socket.close(); - } catch (Exception var23) { - ; + } catch (Exception var20) { } ++NetCache.NetCache_crcMismatches; NetCache.NetCache_socket = null; - NetCache.__iq_b = (byte)((int)(Math.random() * 255.0D + 1.0D)); - var1 = false; - break label242; + NetCache.field631 = (byte)((int)(Math.random() * 255.0D + 1.0D)); + var4 = false; + break label205; } NetCache.NetCache_crcMismatches = 0; NetCache.NetCache_ioExceptions = 0; - ModelData0.NetCache_currentResponse.indexCache.write((int)(ModelData0.NetCache_currentResponse.key & 65535L), class22.NetCache_responseArchiveBuffer.array, 16711680L == (ModelData0.NetCache_currentResponse.key & 16711680L), WorldComparator.__u_n); + ModelData0.NetCache_currentResponse.indexCache.write((int)(ModelData0.NetCache_currentResponse.key & 65535L), class22.NetCache_responseArchiveBuffer.array, 16711680L == (ModelData0.NetCache_currentResponse.key & 16711680L), WorldComparator.field988); } ModelData0.NetCache_currentResponse.remove(); - if(WorldComparator.__u_n) { + if (WorldComparator.field988) { --NetCache.NetCache_pendingPriorityResponsesCount; } else { --NetCache.NetCache_pendingResponsesCount; } - NetCache.__iq_j = 0; + NetCache.field630 = 0; ModelData0.NetCache_currentResponse = null; class22.NetCache_responseArchiveBuffer = null; } else { - if(NetCache.__iq_j != 512) { + if (NetCache.field630 != 512) { break; } - NetCache.__iq_j = 0; + NetCache.field630 = 0; } } } - var1 = true; + var4 = true; } - } catch (IOException var24) { + } catch (IOException var21) { try { NetCache.NetCache_socket.close(); - } catch (Exception var22) { - ; + } catch (Exception var19) { } ++NetCache.NetCache_ioExceptions; NetCache.NetCache_socket = null; - var1 = false; + var4 = false; } } - if(!var1) { + if (!var4) { this.doCycleJs5Connect(); } - } + } @ObfuscatedName("ev") @@ -3194,41 +2943,41 @@ public final class Client extends GameShell implements Usernamed { ) @Export("doCycleJs5Connect") void doCycleJs5Connect() { - if(NetCache.NetCache_crcMismatches >= 4) { + if (NetCache.NetCache_crcMismatches >= 4) { this.error("js5crc"); gameState = 1000; } else { - if(NetCache.NetCache_ioExceptions >= 4) { - if(gameState <= 5) { + if (NetCache.NetCache_ioExceptions >= 4) { + if (gameState <= 5) { this.error("js5io"); gameState = 1000; return; } - __client_dp = 3000; + field167 = 3000; NetCache.NetCache_ioExceptions = 3; } - if(--__client_dp + 1 <= 0) { + if (--field167 + 1 <= 0) { try { - if(js5ConnectState == 0) { + if (js5ConnectState == 0) { class210.js5SocketTask = GameShell.taskHandler.newSocketTask(class50.worldHost, class203.port3); ++js5ConnectState; } - if(js5ConnectState == 1) { - if(class210.js5SocketTask.status == 2) { + if (js5ConnectState == 1) { + if (class210.js5SocketTask.status == 2) { this.js5Error(-1); return; } - if(class210.js5SocketTask.status == 1) { + if (class210.js5SocketTask.status == 1) { ++js5ConnectState; } } - if(js5ConnectState == 2) { - if(useBufferedSocket) { + if (js5ConnectState == 2) { + if (useBufferedSocket) { DynamicObject.js5Socket = BufferedFile.method2719((Socket)class210.js5SocketTask.result, 40000, 5000); } else { DynamicObject.js5Socket = new NetSocket((Socket)class210.js5SocketTask.result, GameShell.taskHandler, 5000); @@ -3242,59 +2991,57 @@ public final class Client extends GameShell implements Usernamed { GameObject.js5StartTimeMs = class203.currentTimeMs(); } - if(js5ConnectState == 3) { - if(DynamicObject.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { - int var5 = DynamicObject.js5Socket.readUnsignedByte(); - if(var5 != 0) { - this.js5Error(var5); + if (js5ConnectState == 3) { + if (DynamicObject.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { + int var10 = DynamicObject.js5Socket.readUnsignedByte(); + if (var10 != 0) { + this.js5Error(var10); return; } ++js5ConnectState; - } else if(class203.currentTimeMs() - GameObject.js5StartTimeMs > 30000L) { + } else if (class203.currentTimeMs() - GameObject.js5StartTimeMs > 30000L) { this.js5Error(-2); return; } } - if(js5ConnectState == 4) { - AbstractSocket var10 = DynamicObject.js5Socket; + if (js5ConnectState == 4) { + AbstractSocket var11 = DynamicObject.js5Socket; boolean var2 = gameState > 20; - if(NetCache.NetCache_socket != null) { + if (NetCache.NetCache_socket != null) { try { NetCache.NetCache_socket.close(); } catch (Exception var8) { - ; } NetCache.NetCache_socket = null; } - NetCache.NetCache_socket = var10; + NetCache.NetCache_socket = var11; UserComparator9.method3343(var2); NetCache.NetCache_responseHeaderBuffer.index = 0; ModelData0.NetCache_currentResponse = null; class22.NetCache_responseArchiveBuffer = null; - NetCache.__iq_j = 0; + NetCache.field630 = 0; - while(true) { + while (true) { NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); - if(var3 == null) { - while(true) { + if (var3 == null) { + while (true) { var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); - if(var3 == null) { - if(NetCache.__iq_b != 0) { + if (var3 == null) { + if (NetCache.field631 != 0) { try { - Buffer var11 = new Buffer(4); - var11.writeByte(4); - var11.writeByte(NetCache.__iq_b); - var11.writeShort(0); - NetCache.NetCache_socket.write(var11.array, 0, 4); + Buffer var4 = new Buffer(4); + var4.writeByte(4); + var4.writeByte(NetCache.field631); + var4.writeShort(0); + NetCache.NetCache_socket.write(var4.array, 0, 4); } catch (IOException var7) { try { NetCache.NetCache_socket.close(); } catch (Exception var6) { - ; } ++NetCache.NetCache_ioExceptions; @@ -3302,8 +3049,8 @@ public final class Client extends GameShell implements Usernamed { } } - NetCache.__iq_f = 0; - NetCache.__iq_q = class203.currentTimeMs(); + NetCache.field628 = 0; + NetCache.field629 = class203.currentTimeMs(); class210.js5SocketTask = null; DynamicObject.js5Socket = null; js5ConnectState = 0; @@ -3326,9 +3073,9 @@ public final class Client extends GameShell implements Usernamed { } catch (IOException var9) { this.js5Error(-3); } - } } + } @ObfuscatedName("ea") @@ -3341,30 +3088,30 @@ public final class Client extends GameShell implements Usernamed { class210.js5SocketTask = null; DynamicObject.js5Socket = null; js5ConnectState = 0; - if(class2.port1 == class203.port3) { + if (class2.port1 == class203.port3) { class203.port3 = WorldMapArea.port2; } else { class203.port3 = class2.port1; } ++js5Errors; - if(js5Errors >= 2 && (var1 == 7 || var1 == 9)) { - if(gameState <= 5) { - this.error("js5connect_full"); + if (js5Errors < 2 || var1 != 7 && var1 != 9) { + if (js5Errors >= 2 && var1 == 6) { + this.error("js5connect_outofdate"); gameState = 1000; - } else { - __client_dp = 3000; + } else if (js5Errors >= 4) { + if (gameState <= 5) { + this.error("js5connect"); + gameState = 1000; + } else { + field167 = 3000; + } } - } else if(js5Errors >= 2 && var1 == 6) { - this.error("js5connect_outofdate"); + } else if (gameState <= 5) { + this.error("js5connect_full"); gameState = 1000; - } else if(js5Errors >= 4) { - if(gameState <= 5) { - this.error("js5connect"); - gameState = 1000; - } else { - __client_dp = 3000; - } + } else { + field167 = 3000; } } @@ -3380,37 +3127,37 @@ public final class Client extends GameShell implements Usernamed { PacketBuffer var2 = packetWriter.packetBuffer; try { - if(loginState == 0) { - if(WorldMapIcon1.secureRandom == null && (secureRandomFuture.isDone() || __client_ex > 250)) { + if (loginState == 0) { + if (WorldMapIcon1.secureRandom == null && (secureRandomFuture.isDone() || field168 > 250)) { WorldMapIcon1.secureRandom = secureRandomFuture.get(); secureRandomFuture.shutdown(); secureRandomFuture = null; } - if(WorldMapIcon1.secureRandom != null) { - if(var1 != null) { + if (WorldMapIcon1.secureRandom != null) { + if (var1 != null) { ((AbstractSocket)var1).close(); var1 = null; } UserComparator3.socketTask = null; - __client_fh = false; - __client_ex = 0; + field176 = false; + field168 = 0; loginState = 1; } } - if(loginState == 1) { - if(UserComparator3.socketTask == null) { + if (loginState == 1) { + if (UserComparator3.socketTask == null) { UserComparator3.socketTask = GameShell.taskHandler.newSocketTask(class50.worldHost, class203.port3); } - if(UserComparator3.socketTask.status == 2) { + if (UserComparator3.socketTask.status == 2) { throw new IOException(); } - if(UserComparator3.socketTask.status == 1) { - if(useBufferedSocket) { + if (UserComparator3.socketTask.status == 1) { + if (useBufferedSocket) { var1 = BufferedFile.method2719((Socket)UserComparator3.socketTask.result, 40000, 5000); } else { var1 = new NetSocket((Socket)UserComparator3.socketTask.result, GameShell.taskHandler, 5000); @@ -3422,53 +3169,53 @@ public final class Client extends GameShell implements Usernamed { } } - if(loginState == 2) { - packetWriter.__m_165(); - PacketBufferNode var4; - if(PacketBufferNode.__gg_u == 0) { - var4 = new PacketBufferNode(); + if (loginState == 2) { + packetWriter.method239(); + PacketBufferNode var3; + if (PacketBufferNode.field668 == 0) { + var3 = new PacketBufferNode(); } else { - var4 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.__gg_u]; + var3 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.field668]; } - var4.__m = null; - var4.__f = 0; - var4.packetBuffer = new PacketBuffer(5000); - var4.packetBuffer.writeByte(LoginPacket.__gl_m.id); - packetWriter.__q_167(var4); - packetWriter.__f_166(); + var3.field669 = null; + var3.field670 = 0; + var3.packetBuffer = new PacketBuffer(5000); + var3.packetBuffer.writeByte(LoginPacket.field473.id); + packetWriter.method241(var3); + packetWriter.method240(); var2.index = 0; loginState = 3; } - boolean var12; - int var13; - if(loginState == 3) { - if(WorldMapCacheName.pcmPlayer0 != null) { - WorldMapCacheName.pcmPlayer0.__ac_176(); + int var4; + boolean var16; + if (loginState == 3) { + if (WorldMapCacheName.pcmPlayer0 != null) { + WorldMapCacheName.pcmPlayer0.method242(); } - if(AbstractIndexCache.pcmPlayer1 != null) { - AbstractIndexCache.pcmPlayer1.__ac_176(); + if (AbstractIndexCache.pcmPlayer1 != null) { + AbstractIndexCache.pcmPlayer1.method242(); } - var12 = true; - if(useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { - var12 = false; + var16 = true; + if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { + var16 = false; } - if(var12) { - var13 = ((AbstractSocket)var1).readUnsignedByte(); - if(WorldMapCacheName.pcmPlayer0 != null) { - WorldMapCacheName.pcmPlayer0.__ac_176(); + if (var16) { + var4 = ((AbstractSocket)var1).readUnsignedByte(); + if (WorldMapCacheName.pcmPlayer0 != null) { + WorldMapCacheName.pcmPlayer0.method242(); } - if(AbstractIndexCache.pcmPlayer1 != null) { - AbstractIndexCache.pcmPlayer1.__ac_176(); + if (AbstractIndexCache.pcmPlayer1 != null) { + AbstractIndexCache.pcmPlayer1.method242(); } - if(var13 != 0) { - IsaacCipher.method4093(var13); + if (var4 != 0) { + IsaacCipher.method4093(var4); return; } @@ -3477,154 +3224,154 @@ public final class Client extends GameShell implements Usernamed { } } - int var25; - if(loginState == 4) { - if(var2.index < 8) { - var25 = ((AbstractSocket)var1).available(); - if(var25 > 8 - var2.index) { - var25 = 8 - var2.index; + int var5; + if (loginState == 4) { + if (var2.index < 8) { + var5 = ((AbstractSocket)var1).available(); + if (var5 > 8 - var2.index) { + var5 = 8 - var2.index; } - if(var25 > 0) { - ((AbstractSocket)var1).read(var2.array, var2.index, var25); - var2.index += var25; + if (var5 > 0) { + ((AbstractSocket)var1).read(var2.array, var2.index, var5); + var2.index += var5; } } - if(var2.index == 8) { + if (var2.index == 8) { var2.index = 0; - MusicPatchNode2.__hd_fc = var2.readLong(); + MusicPatchNode2.field592 = var2.readLong(); loginState = 5; } } - if(loginState == 5) { + if (loginState == 5) { packetWriter.packetBuffer.index = 0; - packetWriter.__m_165(); - PacketBuffer var3 = new PacketBuffer(500); - int[] var20 = new int[]{WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt()}; - var3.index = 0; - var3.writeByte(1); - var3.writeInt(var20[0]); - var3.writeInt(var20[1]); - var3.writeInt(var20[2]); - var3.writeInt(var20[3]); - var3.writeLong(MusicPatchNode2.__hd_fc); - if(gameState == 40) { - var3.writeInt(Skills.__hc_ef[0]); - var3.writeInt(Skills.__hc_ef[1]); - var3.writeInt(Skills.__hc_ef[2]); - var3.writeInt(Skills.__hc_ef[3]); + packetWriter.method239(); + PacketBuffer var6 = new PacketBuffer(500); + int[] var7 = new int[]{WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt()}; + var6.index = 0; + var6.writeByte(1); + var6.writeInt(var7[0]); + var6.writeInt(var7[1]); + var6.writeInt(var7[2]); + var6.writeInt(var7[3]); + var6.writeLong(MusicPatchNode2.field592); + if (gameState == 40) { + var6.writeInt(Skills.field875[0]); + var6.writeInt(Skills.field875[1]); + var6.writeInt(Skills.field875[2]); + var6.writeInt(Skills.field875[3]); } else { - var3.writeByte(field658.rsOrdinal()); + var6.writeByte(field658.rsOrdinal()); switch(field658.field1984) { case 0: case 3: - var3.writeMedium(class13.otpInt); - ++var3.index; + var6.writeMedium(class13.otpInt); + ++var6.index; break; case 1: - var3.index += 4; + var6.index += 4; break; case 2: - var3.writeInt(((Integer)ReflectionCheck.clientPreferences.parameters.get(Integer.valueOf(class279.method5357(Login.Login_username)))).intValue()); + var6.writeInt((Integer)ReflectionCheck.clientPreferences.parameters.get(class279.method5357(Login.Login_username))); } - var3.writeByte(class313.field3834.rsOrdinal()); - var3.writeStringCp1252NullTerminated(Login.Login_password); + var6.writeByte(class313.field3834.rsOrdinal()); + var6.writeStringCp1252NullTerminated(Login.Login_password); } - var3.encryptRsa(class83.__cm_m, class83.__cm_f); - Skills.__hc_ef = var20; - PacketBufferNode var6; - if(PacketBufferNode.__gg_u == 0) { - var6 = new PacketBufferNode(); + var6.encryptRsa(class83.field1165, class83.field1166); + Skills.field875 = var7; + PacketBufferNode var8; + if (PacketBufferNode.field668 == 0) { + var8 = new PacketBufferNode(); } else { - var6 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.__gg_u]; + var8 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.field668]; } - var6.__m = null; - var6.__f = 0; - var6.packetBuffer = new PacketBuffer(5000); - var6.packetBuffer.index = 0; - if(gameState == 40) { - var6.packetBuffer.writeByte(LoginPacket.__gl_w.id); + var8.field669 = null; + var8.field670 = 0; + var8.packetBuffer = new PacketBuffer(5000); + var8.packetBuffer.index = 0; + if (gameState == 40) { + var8.packetBuffer.writeByte(LoginPacket.field476.id); } else { - var6.packetBuffer.writeByte(LoginPacket.__gl_q.id); + var8.packetBuffer.writeByte(LoginPacket.field475.id); } - var6.packetBuffer.writeShort(0); - int var14 = var6.packetBuffer.index; - var6.packetBuffer.writeInt(180); - var6.packetBuffer.writeInt(1); - var6.packetBuffer.writeByte(clientType); - var6.packetBuffer.__s_297(var3.array, 0, var3.index); - int var8 = var6.packetBuffer.index; - var6.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); - var6.packetBuffer.writeByte((isResizable?1:0) << 1 | (isLowDetail?1:0)); - var6.packetBuffer.writeShort(SoundCache.canvasWidth); - var6.packetBuffer.writeShort(Huffman.canvasHeight); - Varps.method4400(var6.packetBuffer); - var6.packetBuffer.writeStringCp1252NullTerminated(class21.__b_by); - var6.packetBuffer.writeInt(AbstractIndexCache.__ir_bu); - Buffer var9 = new Buffer(WorldMapLabelSize.platformInfo.size()); - WorldMapLabelSize.platformInfo.write(var9); - var6.packetBuffer.__s_297(var9.array, 0, var9.array.length); - var6.packetBuffer.writeByte(clientType); - var6.packetBuffer.writeInt(0); - var6.packetBuffer.writeInt(AbstractIndexCache.indexCache0.hash); - var6.packetBuffer.writeInt(Skeleton.indexCache1.hash); - var6.packetBuffer.writeInt(ObjectSound.indexCache2.hash); - var6.packetBuffer.writeInt(WorldMapIcon1.indexCache3.hash); - var6.packetBuffer.writeInt(class25.indexCache4.hash); - var6.packetBuffer.writeInt(SecureRandomFuture.indexCache5.hash); - var6.packetBuffer.writeInt(UserComparator3.indexCache6.hash); - var6.packetBuffer.writeInt(class40.indexCache7.hash); - var6.packetBuffer.writeInt(WorldMapSection3.indexCache8.hash); - var6.packetBuffer.writeInt(class238.indexCache9.hash); - var6.packetBuffer.writeInt(class16.indexCache10.hash); - var6.packetBuffer.writeInt(Login.indexCache11.hash); - var6.packetBuffer.writeInt(Formatting.indexCache12.hash); - var6.packetBuffer.writeInt(ByteArrayPool.indexCache13.hash); - var6.packetBuffer.writeInt(class2.indexCache14.hash); - var6.packetBuffer.writeInt(WorldMapSection1.indexCache15.hash); - var6.packetBuffer.writeInt(0); - var6.packetBuffer.writeInt(class22.indexCache16.hash); - var6.packetBuffer.writeInt(WorldMapLabelSize.__s_dq.hash); - var6.packetBuffer.writeInt(ItemContainer.__bc_dm.hash); - var6.packetBuffer.writeInt(AbstractByteArrayCopier.__gu_et.hash); - var6.packetBuffer.xteaEncrypt(var20, var8, var6.packetBuffer.index); - var6.packetBuffer.__y_299(var6.packetBuffer.index - var14); - packetWriter.__q_167(var6); - packetWriter.__f_166(); - packetWriter.isaacCipher = new IsaacCipher(var20); - int[] var10 = new int[4]; + var8.packetBuffer.writeShort(0); + int var9 = var8.packetBuffer.index; + var8.packetBuffer.writeInt(180); + var8.packetBuffer.writeInt(1); + var8.packetBuffer.writeByte(clientType); + var8.packetBuffer.method38(var6.array, 0, var6.index); + int var10 = var8.packetBuffer.index; + var8.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); + var8.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); + var8.packetBuffer.writeShort(SoundCache.canvasWidth); + var8.packetBuffer.writeShort(Huffman.canvasHeight); + Varps.method4400(var8.packetBuffer); + var8.packetBuffer.writeStringCp1252NullTerminated(class21.field1123); + var8.packetBuffer.writeInt(AbstractIndexCache.field2); + Buffer var11 = new Buffer(WorldMapLabelSize.platformInfo.size()); + WorldMapLabelSize.platformInfo.write(var11); + var8.packetBuffer.method38(var11.array, 0, var11.array.length); + var8.packetBuffer.writeByte(clientType); + var8.packetBuffer.writeInt(0); + var8.packetBuffer.writeInt(AbstractIndexCache.indexCache0.hash); + var8.packetBuffer.writeInt(Skeleton.indexCache1.hash); + var8.packetBuffer.writeInt(ObjectSound.indexCache2.hash); + var8.packetBuffer.writeInt(WorldMapIcon1.indexCache3.hash); + var8.packetBuffer.writeInt(class25.indexCache4.hash); + var8.packetBuffer.writeInt(SecureRandomFuture.indexCache5.hash); + var8.packetBuffer.writeInt(UserComparator3.indexCache6.hash); + var8.packetBuffer.writeInt(class40.indexCache7.hash); + var8.packetBuffer.writeInt(WorldMapSection3.indexCache8.hash); + var8.packetBuffer.writeInt(class238.indexCache9.hash); + var8.packetBuffer.writeInt(class16.indexCache10.hash); + var8.packetBuffer.writeInt(Login.indexCache11.hash); + var8.packetBuffer.writeInt(Formatting.indexCache12.hash); + var8.packetBuffer.writeInt(ByteArrayPool.indexCache13.hash); + var8.packetBuffer.writeInt(class2.indexCache14.hash); + var8.packetBuffer.writeInt(WorldMapSection1.indexCache15.hash); + var8.packetBuffer.writeInt(0); + var8.packetBuffer.writeInt(class22.indexCache16.hash); + var8.packetBuffer.writeInt(WorldMapLabelSize.field1040.hash); + var8.packetBuffer.writeInt(ItemContainer.field434.hash); + var8.packetBuffer.writeInt(AbstractByteArrayCopier.field0.hash); + var8.packetBuffer.xteaEncrypt(var7, var10, var8.packetBuffer.index); + var8.packetBuffer.method40(var8.packetBuffer.index - var9); + packetWriter.method241(var8); + packetWriter.method240(); + packetWriter.isaacCipher = new IsaacCipher(var7); + int[] var12 = new int[4]; - for(int var11 = 0; var11 < 4; ++var11) { - var10[var11] = var20[var11] + 50; + for (int var13 = 0; var13 < 4; ++var13) { + var12[var13] = var7[var13] + 50; } - var2.newIsaacCipher(var10); + var2.newIsaacCipher(var12); loginState = 6; } - if(loginState == 6 && ((AbstractSocket)var1).available() > 0) { - var25 = ((AbstractSocket)var1).readUnsignedByte(); - if(var25 == 21 && gameState == 20) { + if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { + var5 = ((AbstractSocket)var1).readUnsignedByte(); + if (var5 == 21 && gameState == 20) { loginState = 9; - } else if(var25 == 2) { + } else if (var5 == 2) { loginState = 11; - } else if(var25 == 15 && gameState == 40) { + } else if (var5 == 15 && gameState == 40) { packetWriter.serverPacket0Length = -1; loginState = 16; - } else if(var25 == 64) { + } else if (var5 == 64) { loginState = 7; - } else if(var25 == 23 && __client_ej < 1) { - ++__client_ej; + } else if (var5 == 23 && field169 < 1) { + ++field169; loginState = 0; } else { - if(var25 != 29) { - IsaacCipher.method4093(var25); + if (var5 != 29) { + IsaacCipher.method4093(var5); return; } @@ -3632,56 +3379,55 @@ public final class Client extends GameShell implements Usernamed { } } - if(loginState == 7 && ((AbstractSocket)var1).available() > 0) { - WorldMapSection1.__as_ey = ((AbstractSocket)var1).readUnsignedByte(); + if (loginState == 7 && ((AbstractSocket)var1).available() > 0) { + WorldMapSection1.field1071 = ((AbstractSocket)var1).readUnsignedByte(); loginState = 8; } - if(loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapSection1.__as_ey) { - ((AbstractSocket)var1).read(var2.array, 0, WorldMapSection1.__as_ey); + if (loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapSection1.field1071) { + ((AbstractSocket)var1).read(var2.array, 0, WorldMapSection1.field1071); var2.index = 0; loginState = 6; } - if(loginState == 9 && ((AbstractSocket)var1).available() > 0) { - __client_el = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; + if (loginState == 9 && ((AbstractSocket)var1).available() > 0) { + field170 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; loginState = 10; } - if(loginState == 10) { - __client_ex = 0; - class54.method1089("You have only just left another world.", "Your profile will be transferred in:", __client_el / 60 + " seconds."); - if(--__client_el <= 0) { + if (loginState == 10) { + field168 = 0; + class54.method1089("You have only just left another world.", "Your profile will be transferred in:", field170 / 60 + " seconds."); + if (--field170 <= 0) { loginState = 0; } - } else { - if(loginState == 11 && ((AbstractSocket)var1).available() >= 1) { - __client_eo = ((AbstractSocket)var1).readUnsignedByte(); + if (loginState == 11 && ((AbstractSocket)var1).available() >= 1) { + field171 = ((AbstractSocket)var1).readUnsignedByte(); loginState = 12; } - if(loginState == 12 && ((AbstractSocket)var1).available() >= __client_eo) { - var12 = ((AbstractSocket)var1).readUnsignedByte() == 1; + if (loginState == 12 && ((AbstractSocket)var1).available() >= field171) { + var16 = ((AbstractSocket)var1).readUnsignedByte() == 1; ((AbstractSocket)var1).read(var2.array, 0, 4); var2.index = 0; - boolean var26 = false; - if(var12) { - var13 = var2.readByteIsaac() << 24; - var13 |= var2.readByteIsaac() << 16; - var13 |= var2.readByteIsaac() << 8; - var13 |= var2.readByteIsaac(); - int var15 = class279.method5357(Login.Login_username); - if(ReflectionCheck.clientPreferences.parameters.size() >= 10 && !ReflectionCheck.clientPreferences.parameters.containsKey(Integer.valueOf(var15))) { - Iterator var24 = ReflectionCheck.clientPreferences.parameters.entrySet().iterator(); - var24.next(); - var24.remove(); + boolean var17 = false; + if (var16) { + var4 = var2.readByteIsaac() << 24; + var4 |= var2.readByteIsaac() << 16; + var4 |= var2.readByteIsaac() << 8; + var4 |= var2.readByteIsaac(); + int var20 = class279.method5357(Login.Login_username); + if (ReflectionCheck.clientPreferences.parameters.size() >= 10 && !ReflectionCheck.clientPreferences.parameters.containsKey(var20)) { + Iterator var23 = ReflectionCheck.clientPreferences.parameters.entrySet().iterator(); + var23.next(); + var23.remove(); } - ReflectionCheck.clientPreferences.parameters.put(Integer.valueOf(var15), Integer.valueOf(var13)); + ReflectionCheck.clientPreferences.parameters.put(var20, var4); } - if(Login_isUsernameRemembered) { + if (Login_isUsernameRemembered) { ReflectionCheck.clientPreferences.rememberedUsername = Login.Login_username; } else { ReflectionCheck.clientPreferences.rememberedUsername = null; @@ -3689,157 +3435,156 @@ public final class Client extends GameShell implements Usernamed { WorldMapSection0.savePreferences(); rights = ((AbstractSocket)var1).readUnsignedByte(); - __client_mn = ((AbstractSocket)var1).readUnsignedByte() == 1; + field155 = ((AbstractSocket)var1).readUnsignedByte() == 1; localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); localPlayerIndex <<= 8; localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); - __client_jo = ((AbstractSocket)var1).readUnsignedByte(); + field209 = ((AbstractSocket)var1).readUnsignedByte(); ((AbstractSocket)var1).read(var2.array, 0, 1); var2.index = 0; - ServerPacket[] var5 = class27.method429(); - int var16 = var2.readSmartByteShortIsaac(); - if(var16 < 0 || var16 >= var5.length) { - throw new IOException(var16 + " " + var2.index); + ServerPacket[] var21 = class27.method429(); + int var24 = var2.readSmartByteShortIsaac(); + if (var24 < 0 || var24 >= var21.length) { + throw new IOException(var24 + " " + var2.index); } - packetWriter.serverPacket0 = var5[var16]; + packetWriter.serverPacket0 = var21[var24]; packetWriter.serverPacket0Length = packetWriter.serverPacket0.length; ((AbstractSocket)var1).read(var2.array, 0, 2); var2.index = 0; - packetWriter.serverPacket0Length = var2.__ag_302(); + packetWriter.serverPacket0Length = var2.method43(); try { - Client var7 = TextureProvider.client; - JSObject.getWindow(var7).call("zap", (Object[])null); - } catch (Throwable var17) { - ; + Client var25 = TextureProvider.client; + JSObject.getWindow(var25).call("zap", (Object[])null); + } catch (Throwable var14) { } loginState = 13; } - if(loginState == 13) { - if(((AbstractSocket)var1).available() >= packetWriter.serverPacket0Length) { + if (loginState == 13) { + if (((AbstractSocket)var1).available() >= packetWriter.serverPacket0Length) { var2.index = 0; ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacket0Length); - timer.__w_456(); + timer.method332(); WorldMapSection1.method808(); class11.updatePlayer(var2); - GameObject.__eh_fy = -1; + GameObject.field359 = -1; class50.loadRegions(false, var2); packetWriter.serverPacket0 = null; } - } else { - if(loginState == 14 && ((AbstractSocket)var1).available() >= 2) { + if (loginState == 14 && ((AbstractSocket)var1).available() >= 2) { var2.index = 0; ((AbstractSocket)var1).read(var2.array, 0, 2); var2.index = 0; - IndexCacheLoader.__bd_er = var2.__ag_302(); + IndexCacheLoader.field407 = var2.method43(); loginState = 15; } - if(loginState == 15 && ((AbstractSocket)var1).available() >= IndexCacheLoader.__bd_er) { + if (loginState == 15 && ((AbstractSocket)var1).available() >= IndexCacheLoader.field407) { var2.index = 0; - ((AbstractSocket)var1).read(var2.array, 0, IndexCacheLoader.__bd_er); + ((AbstractSocket)var1).read(var2.array, 0, IndexCacheLoader.field407); var2.index = 0; - String var19 = var2.readStringCp1252NullTerminated(); - String var21 = var2.readStringCp1252NullTerminated(); + String var18 = var2.readStringCp1252NullTerminated(); String var22 = var2.readStringCp1252NullTerminated(); - class54.method1089(var19, var21, var22); + String var26 = var2.readStringCp1252NullTerminated(); + class54.method1089(var18, var22, var26); GameShell.updateGameState(10); } - if(loginState != 16) { - ++__client_ex; - if(__client_ex > 2000) { - if(__client_ej < 1) { - if(class203.port3 == class2.port1) { + if (loginState != 16) { + ++field168; + if (field168 > 2000) { + if (field169 < 1) { + if (class203.port3 == class2.port1) { class203.port3 = WorldMapArea.port2; } else { class203.port3 = class2.port1; } - ++__client_ej; + ++field169; loginState = 0; } else { IsaacCipher.method4093(-3); } } } else { - if(packetWriter.serverPacket0Length == -1) { - if(((AbstractSocket)var1).available() < 2) { + if (packetWriter.serverPacket0Length == -1) { + if (((AbstractSocket)var1).available() < 2) { return; } ((AbstractSocket)var1).read(var2.array, 0, 2); var2.index = 0; - packetWriter.serverPacket0Length = var2.__ag_302(); + packetWriter.serverPacket0Length = var2.method43(); } - if(((AbstractSocket)var1).available() >= packetWriter.serverPacket0Length) { + if (((AbstractSocket)var1).available() >= packetWriter.serverPacket0Length) { ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacket0Length); var2.index = 0; - var25 = packetWriter.serverPacket0Length; - timer.__u_458(); - packetWriter.__m_165(); + var5 = packetWriter.serverPacket0Length; + timer.method334(); + packetWriter.method239(); packetWriter.packetBuffer.index = 0; packetWriter.serverPacket0 = null; - packetWriter.__k = null; - packetWriter.__n = null; - packetWriter.__i = null; + packetWriter.field676 = null; + packetWriter.field677 = null; + packetWriter.field678 = null; packetWriter.serverPacket0Length = 0; - packetWriter.__x = 0; + packetWriter.field674 = 0; rebootTimer = 0; menuOptionsCount = 0; isMenuOpen = false; minimapState = 0; destinationX = 0; - for(var13 = 0; var13 < 2048; ++var13) { - players[var13] = null; + for (var4 = 0; var4 < 2048; ++var4) { + players[var4] = null; } Canvas.localPlayer = null; - for(var13 = 0; var13 < npcs.length; ++var13) { - Npc var23 = npcs[var13]; - if(var23 != null) { - var23.targetIndex = -1; - var23.false0 = false; + for (var4 = 0; var4 < npcs.length; ++var4) { + NPC var19 = npcs[var4]; + if (var19 != null) { + var19.targetIndex = -1; + var19.false0 = false; } } SpriteMask.method4389(); GameShell.updateGameState(30); - for(var13 = 0; var13 < 100; ++var13) { - __client_od[var13] = true; + for (var4 = 0; var4 < 100; ++var4) { + field100[var4] = true; } AbstractByteArrayCopier.method4024(); class11.updatePlayer(var2); - if(var25 != var2.index) { + if (var5 != var2.index) { throw new RuntimeException(); } } } } } - } catch (IOException var18) { - if(__client_ej < 1) { - if(class2.port1 == class203.port3) { + } catch (IOException var15) { + if (field169 < 1) { + if (class2.port1 == class203.port3) { class203.port3 = WorldMapArea.port2; } else { class203.port3 = class2.port1; } - ++__client_ej; + ++field169; loginState = 0; } else { IsaacCipher.method4093(-2); } } + } @ObfuscatedName("fx") @@ -3849,666 +3594,669 @@ public final class Client extends GameShell implements Usernamed { ) @Export("doCycleLoggedIn") final void doCycleLoggedIn() { - if(rebootTimer > 1) { + if (rebootTimer > 1) { --rebootTimer; } - if(__client_fd > 0) { - --__client_fd; + if (field175 > 0) { + --field175; } - if(__client_fh) { - __client_fh = false; + if (field176) { + field176 = false; class48.method868(); } else { - if(!isMenuOpen) { + if (!isMenuOpen) { class30.resetMenuEntries(); } int var1; - for(var1 = 0; var1 < 100 && this.__hg_138(packetWriter); ++var1) { - ; + for (var1 = 0; var1 < 100 && this.method85(packetWriter); ++var1) { } - if(gameState == 30) { - while(true) { + if (gameState == 30) { + while (true) { ReflectionCheck var2 = (ReflectionCheck)class322.reflectionChecks.last(); - boolean var29; - if(var2 == null) { - var29 = false; + boolean var3; + if (var2 == null) { + var3 = false; } else { - var29 = true; + var3 = true; } - int var3; - PacketBufferNode var30; - if(!var29) { - PacketBufferNode var14; - int var15; - if(timer.__q) { - var14 = Interpreter.method1915(ClientPacket.__gs_o, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(0); - var15 = var14.packetBuffer.index; - timer.write(var14.packetBuffer); - var14.packetBuffer.__h_300(var14.packetBuffer.index - var15); - packetWriter.__q_167(var14); - timer.__o_457(); + int var4; + PacketBufferNode var5; + if (!var3) { + PacketBufferNode var6; + int var7; + if (timer.field921) { + var6 = Interpreter.method1915(ClientPacket.field226, packetWriter.isaacCipher); + var6.packetBuffer.writeByte(0); + var7 = var6.packetBuffer.index; + timer.write(var6.packetBuffer); + var6.packetBuffer.method41(var6.packetBuffer.index - var7); + packetWriter.method241(var6); + timer.method333(); } - Object var34 = Projectile.mouseRecorder.lock; - int var4; - int var5; - int var6; - int var7; - int var8; + Object var8 = Projectile.mouseRecorder.lock; int var9; int var10; int var11; int var12; + int var13; + int var14; + int var15; + int var16; + int var17; synchronized(Projectile.mouseRecorder.lock) { - if(!__client_ai) { + if (!field161) { Projectile.mouseRecorder.index = 0; - } else if(MouseHandler.MouseHandler_lastButton != 0 || Projectile.mouseRecorder.index >= 40) { - var30 = null; - var3 = 0; + } else if (MouseHandler.MouseHandler_lastButton != 0 || Projectile.mouseRecorder.index >= 40) { + var5 = null; var4 = 0; - var5 = 0; - var6 = 0; + var9 = 0; + var10 = 0; + var11 = 0; - for(var7 = 0; var7 < Projectile.mouseRecorder.index && (var30 == null || var30.packetBuffer.index - var3 < 246); ++var7) { - var4 = var7; - var8 = Projectile.mouseRecorder.ys[var7]; - if(var8 < -1) { - var8 = -1; - } else if(var8 > 65534) { - var8 = 65534; + for (var12 = 0; var12 < Projectile.mouseRecorder.index && (var5 == null || var5.packetBuffer.index - var4 < 246); ++var12) { + var9 = var12; + var13 = Projectile.mouseRecorder.ys[var12]; + if (var13 < -1) { + var13 = -1; + } else if (var13 > 65534) { + var13 = 65534; } - var9 = Projectile.mouseRecorder.xs[var7]; - if(var9 < -1) { - var9 = -1; - } else if(var9 > 65534) { - var9 = 65534; + var14 = Projectile.mouseRecorder.xs[var12]; + if (var14 < -1) { + var14 = -1; + } else if (var14 > 65534) { + var14 = 65534; } - if(var9 != __client_cn || var8 != __client_cq) { - if(var30 == null) { - var30 = Interpreter.method1915(ClientPacket.__gs_ak, packetWriter.isaacCipher); - var30.packetBuffer.writeByte(0); - var3 = var30.packetBuffer.index; - var30.packetBuffer.index += 2; - var5 = 0; - var6 = 0; + if (var14 != field163 || var13 != field164) { + if (var5 == null) { + var5 = Interpreter.method1915(ClientPacket.field256, packetWriter.isaacCipher); + var5.packetBuffer.writeByte(0); + var4 = var5.packetBuffer.index; + PacketBuffer var10000 = var5.packetBuffer; + var10000.index += 2; + var10 = 0; + var11 = 0; } - if(-1L != __client_ch) { - var10 = var9 - __client_cn; - var11 = var8 - __client_cq; - var12 = (int)((Projectile.mouseRecorder.millis[var7] - __client_ch) / 20L); - var5 = (int)((long)var5 + (Projectile.mouseRecorder.millis[var7] - __client_ch) % 20L); + if (-1L != field165) { + var15 = var14 - field163; + var16 = var13 - field164; + var17 = (int)((Projectile.mouseRecorder.millis[var12] - field165) / 20L); + var10 = (int)((long)var10 + (Projectile.mouseRecorder.millis[var12] - field165) % 20L); } else { - var10 = var9; - var11 = var8; - var12 = Integer.MAX_VALUE; + var15 = var14; + var16 = var13; + var17 = Integer.MAX_VALUE; } - __client_cn = var9; - __client_cq = var8; - if(var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { - var10 += 32; - var11 += 32; - var30.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); - } else if(var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { - var10 += 128; - var11 += 128; - var30.packetBuffer.writeByte(var12 + 128); - var30.packetBuffer.writeShort(var11 + (var10 << 8)); - } else if(var12 < 32) { - var30.packetBuffer.writeByte(var12 + 192); - if(var9 != -1 && var8 != -1) { - var30.packetBuffer.writeInt(var9 | var8 << 16); + field163 = var14; + field164 = var13; + if (var17 < 8 && var15 >= -32 && var15 <= 31 && var16 >= -32 && var16 <= 31) { + var15 += 32; + var16 += 32; + var5.packetBuffer.writeShort((var17 << 12) + var16 + (var15 << 6)); + } else if (var17 < 32 && var15 >= -128 && var15 <= 127 && var16 >= -128 && var16 <= 127) { + var15 += 128; + var16 += 128; + var5.packetBuffer.writeByte(var17 + 128); + var5.packetBuffer.writeShort(var16 + (var15 << 8)); + } else if (var17 < 32) { + var5.packetBuffer.writeByte(var17 + 192); + if (var14 != -1 && var13 != -1) { + var5.packetBuffer.writeInt(var14 | var13 << 16); } else { - var30.packetBuffer.writeInt(Integer.MIN_VALUE); + var5.packetBuffer.writeInt(Integer.MIN_VALUE); } } else { - var30.packetBuffer.writeShort((var12 & 8191) + 57344); - if(var9 != -1 && var8 != -1) { - var30.packetBuffer.writeInt(var9 | var8 << 16); + var5.packetBuffer.writeShort((var17 & 8191) + 57344); + if (var14 != -1 && var13 != -1) { + var5.packetBuffer.writeInt(var14 | var13 << 16); } else { - var30.packetBuffer.writeInt(Integer.MIN_VALUE); + var5.packetBuffer.writeInt(Integer.MIN_VALUE); } } - ++var6; - __client_ch = Projectile.mouseRecorder.millis[var7]; + ++var11; + field165 = Projectile.mouseRecorder.millis[var12]; } } - if(var30 != null) { - var30.packetBuffer.__h_300(var30.packetBuffer.index - var3); - var7 = var30.packetBuffer.index; - var30.packetBuffer.index = var3; - var30.packetBuffer.writeByte(var5 / var6); - var30.packetBuffer.writeByte(var5 % var6); - var30.packetBuffer.index = var7; - packetWriter.__q_167(var30); + if (var5 != null) { + var5.packetBuffer.method41(var5.packetBuffer.index - var4); + var12 = var5.packetBuffer.index; + var5.packetBuffer.index = var4; + var5.packetBuffer.writeByte(var10 / var11); + var5.packetBuffer.writeByte(var10 % var11); + var5.packetBuffer.index = var12; + packetWriter.method241(var5); } - if(var4 >= Projectile.mouseRecorder.index) { + if (var9 >= Projectile.mouseRecorder.index) { Projectile.mouseRecorder.index = 0; } else { - Projectile.mouseRecorder.index -= var4; - System.arraycopy(Projectile.mouseRecorder.xs, var4, Projectile.mouseRecorder.xs, 0, Projectile.mouseRecorder.index); - System.arraycopy(Projectile.mouseRecorder.ys, var4, Projectile.mouseRecorder.ys, 0, Projectile.mouseRecorder.index); - System.arraycopy(Projectile.mouseRecorder.millis, var4, Projectile.mouseRecorder.millis, 0, Projectile.mouseRecorder.index); + MouseRecorder var36 = Projectile.mouseRecorder; + var36.index -= var9; + System.arraycopy(Projectile.mouseRecorder.xs, var9, Projectile.mouseRecorder.xs, 0, Projectile.mouseRecorder.index); + System.arraycopy(Projectile.mouseRecorder.ys, var9, Projectile.mouseRecorder.ys, 0, Projectile.mouseRecorder.index); + System.arraycopy(Projectile.mouseRecorder.millis, var9, Projectile.mouseRecorder.millis, 0, Projectile.mouseRecorder.index); } } } PacketBufferNode var18; - 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; + long var19; + if (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { + var19 = (MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis * -1L) / 50L; + if (var19 > 4095L) { + var19 = 4095L; } mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis * -1L; - var3 = MouseHandler.MouseHandler_lastPressedY; - if(var3 < 0) { - var3 = 0; - } else if(var3 > Huffman.canvasHeight) { - var3 = Huffman.canvasHeight; - } - - var4 = MouseHandler.MouseHandler_lastPressedX; - if(var4 < 0) { + var4 = MouseHandler.MouseHandler_lastPressedY; + if (var4 < 0) { var4 = 0; - } else if(var4 > SoundCache.canvasWidth) { - var4 = SoundCache.canvasWidth; + } else if (var4 > Huffman.canvasHeight) { + var4 = Huffman.canvasHeight; } - var5 = (int)var16; - var18 = Interpreter.method1915(ClientPacket.__gs_ap, packetWriter.isaacCipher); - var18.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2?1:0)); + var9 = MouseHandler.MouseHandler_lastPressedX; + if (var9 < 0) { + var9 = 0; + } else if (var9 > SoundCache.canvasWidth) { + var9 = SoundCache.canvasWidth; + } + + var10 = (int)var19; + var18 = Interpreter.method1915(ClientPacket.field263, packetWriter.isaacCipher); + var18.packetBuffer.writeShort((var10 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0)); + var18.packetBuffer.writeShort(var9); var18.packetBuffer.writeShort(var4); - var18.packetBuffer.writeShort(var3); - packetWriter.__q_167(var18); + packetWriter.method241(var18); } - if(KeyHandler.__an_cl > 0) { - var14 = Interpreter.method1915(ClientPacket.__gs_bj, packetWriter.isaacCipher); - var14.packetBuffer.writeShort(0); - var15 = var14.packetBuffer.index; - long var19 = class203.currentTimeMs(); + if (KeyHandler.field452 > 0) { + var6 = Interpreter.method1915(ClientPacket.field289, packetWriter.isaacCipher); + var6.packetBuffer.writeShort(0); + var7 = var6.packetBuffer.index; + var19 = class203.currentTimeMs(); - for(var5 = 0; var5 < KeyHandler.__an_cl; ++var5) { - long var21 = var19 - __client_pp; - if(var21 > 16777215L) { + for (var10 = 0; var10 < KeyHandler.field452; ++var10) { + long var21 = var19 - field126; + if (var21 > 16777215L) { var21 = 16777215L; } - __client_pp = var19; - var14.packetBuffer.__ai_315(KeyHandler.__an_cp[var5]); - var14.packetBuffer.writeMedium((int)var21); + field126 = var19; + var6.packetBuffer.method56(KeyHandler.field451[var10]); + var6.packetBuffer.writeMedium((int)var21); } - var14.packetBuffer.__y_299(var14.packetBuffer.index - var15); - packetWriter.__q_167(var14); + var6.packetBuffer.method40(var6.packetBuffer.index - var7); + packetWriter.method241(var6); } - if(__client_iy > 0) { - --__client_iy; + if (field200 > 0) { + --field200; } - if(KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { - __client_is = true; + if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { + field201 = true; } - if(__client_is && __client_iy <= 0) { - __client_iy = 20; - __client_is = false; - var14 = Interpreter.method1915(ClientPacket.__gs_at, packetWriter.isaacCipher); - var14.packetBuffer.__bx_323(cameraPitchTarget); - var14.packetBuffer.writeShortLE(minimapOrientation); - packetWriter.__q_167(var14); + if (field201 && field200 <= 0) { + field200 = 20; + field201 = false; + var6 = Interpreter.method1915(ClientPacket.field261, packetWriter.isaacCipher); + var6.packetBuffer.method64(cameraPitchTarget); + var6.packetBuffer.writeShortLE(minimapOrientation); + packetWriter.method241(var6); } - if(class230.__hy_az && !__client_cw) { - __client_cw = true; - var14 = Interpreter.method1915(ClientPacket.__gs_bf, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(1); - packetWriter.__q_167(var14); + if (class230.field1138 && !field166) { + field166 = true; + var6 = Interpreter.method1915(ClientPacket.field295, packetWriter.isaacCipher); + var6.packetBuffer.writeByte(1); + packetWriter.method241(var6); } - if(!class230.__hy_az && __client_cw) { - __client_cw = false; - var14 = Interpreter.method1915(ClientPacket.__gs_bf, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(0); - packetWriter.__q_167(var14); + if (!class230.field1138 && field166) { + field166 = false; + var6 = Interpreter.method1915(ClientPacket.field295, packetWriter.isaacCipher); + var6.packetBuffer.writeByte(0); + packetWriter.method241(var6); } - if(class60.worldMap0 != null) { - class60.worldMap0.__f_518(); + if (class60.worldMap0 != null) { + class60.worldMap0.method360(); } class266.method5120(); Message.method1228(); - if(gameState != 30) { + if (gameState != 30) { return; } Canvas.method855(); WorldMapIcon1.method212(); - ++packetWriter.__x; - if(packetWriter.__x > 750) { + ++packetWriter.field674; + if (packetWriter.field674 > 750) { class48.method868(); return; } var1 = Players.Players_count; - int[] var31 = Players.Players_indices; + int[] var30 = Players.Players_indices; - for(var3 = 0; var3 < var1; ++var3) { - Player var23 = players[var31[var3]]; - if(var23 != null) { - class65.method1232(var23, 1); + for (var4 = 0; var4 < var1; ++var4) { + Player var20 = players[var30[var4]]; + if (var20 != null) { + class65.method1232(var20, 1); } } - for(var1 = 0; var1 < npcCount; ++var1) { - var15 = npcIndices[var1]; - Npc var24 = npcs[var15]; - if(var24 != null) { - class65.method1232(var24, var24.definition.size); + for (var1 = 0; var1 < npcCount; ++var1) { + var7 = npcIndices[var1]; + NPC var31 = npcs[var7]; + if (var31 != null) { + class65.method1232(var31, var31.definition.size); } } Buddy.processOverheadText(); - ++__client_gy; - if(mouseCrossColor != 0) { + ++field183; + if (mouseCrossColor != 0) { mouseCrossState += 20; - if(mouseCrossState >= 400) { + if (mouseCrossState >= 400) { mouseCrossColor = 0; } } - if(BoundaryObject.__ej_jv != null) { - ++__client_ju; - if(__client_ju >= 15) { - class22.method295(BoundaryObject.__ej_jv); - BoundaryObject.__ej_jv = null; + if (BoundaryObject.field40 != null) { + ++field203; + if (field203 >= 15) { + class22.method295(BoundaryObject.field40); + BoundaryObject.field40 = null; } } - Widget var35 = Clock.mousedOverWidgetIf1; - Widget var32 = AccessFile.__dk_lm; + Widget var32 = Clock.mousedOverWidgetIf1; + Widget var33 = AccessFile.field8; Clock.mousedOverWidgetIf1 = null; - AccessFile.__dk_lm = null; + AccessFile.field8 = null; draggedOnWidget = null; - __client_nt = false; - __client_nn = false; - __client_pm = 0; + field103 = false; + field106 = false; + field137 = 0; - while(Decimator.method2490() && __client_pm < 128) { - if(rights >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && IndexStoreAction.__ik_cn == 66) { - String var37 = KeyHandler.method839(); - TextureProvider.client.clipboardSetString(var37); - } else if(oculusOrbState != 1 || GzipDecompressor.__go_ck <= 0) { - __client_pn[__client_pm] = IndexStoreAction.__ik_cn; - __client_pq[__client_pm] = GzipDecompressor.__go_ck; - ++__client_pm; + while (Decimator.method2490() && field137 < 128) { + if (rights >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && IndexStoreAction.field411 == 66) { + String var22 = KeyHandler.method839(); + TextureProvider.client.clipboardSetString(var22); + } else if (oculusOrbState != 1 || GzipDecompressor.field378 <= 0) { + field145[field137] = IndexStoreAction.field411; + field146[field137] = GzipDecompressor.field378; + ++field137; } } - if(FriendSystem.jmodCheck() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { - var3 = Canvas.localPlayer.plane - mouseWheelRotation; - if(var3 < 0) { - var3 = 0; - } else if(var3 > 3) { - var3 = 3; + if (FriendSystem.jmodCheck() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { + var4 = Canvas.localPlayer.plane - mouseWheelRotation; + if (var4 < 0) { + var4 = 0; + } else if (var4 > 3) { + var4 = 3; } - if(var3 != Canvas.localPlayer.plane) { - var4 = Canvas.localPlayer.pathX[0] + class50.baseX; - var5 = Canvas.localPlayer.pathY[0] + GraphicsObject.baseY; - var18 = Interpreter.method1915(ClientPacket.__gs_bx, packetWriter.isaacCipher); + if (var4 != Canvas.localPlayer.plane) { + var9 = Canvas.localPlayer.pathX[0] + class50.baseX; + var10 = Canvas.localPlayer.pathY[0] + GraphicsObject.baseY; + var18 = Interpreter.method1915(ClientPacket.field283, packetWriter.isaacCipher); var18.packetBuffer.writeIntME(0); - var18.packetBuffer.writeShortLE(var5); - var18.packetBuffer.__ai_315(var3); - var18.packetBuffer.writeShort(var4); - packetWriter.__q_167(var18); + var18.packetBuffer.writeShortLE(var10); + var18.packetBuffer.method56(var4); + var18.packetBuffer.writeShort(var9); + packetWriter.method241(var18); } mouseWheelRotation = 0; } - if(rootWidgetGroup != -1) { + if (rootWidgetGroup != -1) { class231.method4517(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0); } ++cycleCntr; - while(true) { - Widget var25; - Widget var36; - ScriptEvent var38; + while (true) { + Widget var23; + ScriptEvent var24; + Widget var34; do { - var38 = (ScriptEvent)__client_oh.removeLast(); - if(var38 == null) { - while(true) { + var24 = (ScriptEvent)field147.removeLast(); + if (var24 == null) { + while (true) { do { - var38 = (ScriptEvent)__client_oc.removeLast(); - if(var38 == null) { - while(true) { + var24 = (ScriptEvent)field148.removeLast(); + if (var24 == null) { + while (true) { do { - var38 = (ScriptEvent)scriptEvents.removeLast(); - if(var38 == null) { - this.__hi_139(); + var24 = (ScriptEvent)scriptEvents.removeLast(); + if (var24 == null) { + this.method86(); WorldMapSectionType.method254(); - if(clickedWidget != null) { - this.__jh_142(); + if (clickedWidget != null) { + this.method88(); } - PacketBufferNode var40; - if(DevicePcmPlayerProvider.dragInventoryWidget != null) { + PacketBufferNode var25; + if (DevicePcmPlayerProvider.dragInventoryWidget != null) { class22.method295(DevicePcmPlayerProvider.dragInventoryWidget); ++itemDragDuration; - if(MouseHandler.MouseHandler_currentButton == 0) { - if(__client_jl) { - if(UserComparator6.__fg_jh == DevicePcmPlayerProvider.dragInventoryWidget && dragItemSlotSource != dragItemSlotDestination) { - Widget var39 = DevicePcmPlayerProvider.dragInventoryWidget; - byte var33 = 0; - if(__client_mb == 1 && var39.contentType == 206) { - var33 = 1; + if (MouseHandler.MouseHandler_currentButton == 0) { + if (field207) { + if (UserComparator6.field937 == DevicePcmPlayerProvider.dragInventoryWidget && dragItemSlotSource != dragItemSlotDestination) { + Widget var26 = DevicePcmPlayerProvider.dragInventoryWidget; + byte var27 = 0; + if (field136 == 1 && var26.contentType == 206) { + var27 = 1; } - if(var39.itemIds[dragItemSlotDestination] <= 0) { - var33 = 0; + if (var26.itemIds[dragItemSlotDestination] <= 0) { + var27 = 0; } - if(class168.method3461(class1.getWidgetClickMask(var39))) { - var5 = dragItemSlotSource; - var6 = dragItemSlotDestination; - var39.itemIds[var6] = var39.itemIds[var5]; - var39.itemQuantities[var6] = var39.itemQuantities[var5]; - var39.itemIds[var5] = -1; - var39.itemQuantities[var5] = 0; - } else if(var33 == 1) { - var5 = dragItemSlotSource; - var6 = dragItemSlotDestination; + if (class168.method3461(class1.getWidgetClickMask(var26))) { + var10 = dragItemSlotSource; + var11 = dragItemSlotDestination; + var26.itemIds[var11] = var26.itemIds[var10]; + var26.itemQuantities[var11] = var26.itemQuantities[var10]; + var26.itemIds[var10] = -1; + var26.itemQuantities[var10] = 0; + } else if (var27 == 1) { + var10 = dragItemSlotSource; + var11 = dragItemSlotDestination; - while(var5 != var6) { - if(var5 > var6) { - var39.swapItems(var5 - 1, var5); - --var5; - } else if(var5 < var6) { - var39.swapItems(var5 + 1, var5); - ++var5; + while (var10 != var11) { + if (var10 > var11) { + var26.swapItems(var10 - 1, var10); + --var10; + } else if (var10 < var11) { + var26.swapItems(var10 + 1, var10); + ++var10; } } } else { - var39.swapItems(dragItemSlotDestination, dragItemSlotSource); + var26.swapItems(dragItemSlotDestination, dragItemSlotSource); } - var40 = Interpreter.method1915(ClientPacket.__gs_ce, packetWriter.isaacCipher); - var40.packetBuffer.writeShort(dragItemSlotDestination); - var40.packetBuffer.writeShortLE(dragItemSlotSource); - var40.packetBuffer.writeInt(DevicePcmPlayerProvider.dragInventoryWidget.id); - var40.packetBuffer.__ai_315(var33); - packetWriter.__q_167(var40); + var25 = Interpreter.method1915(ClientPacket.field302, packetWriter.isaacCipher); + var25.packetBuffer.writeShort(dragItemSlotDestination); + var25.packetBuffer.writeShortLE(dragItemSlotSource); + var25.packetBuffer.writeInt(DevicePcmPlayerProvider.dragInventoryWidget.id); + var25.packetBuffer.method56(var27); + packetWriter.method241(var25); } - } else if(this.shouldLeftClickOpenMenu()) { - this.openMenu(__client_ja, __client_je); - } else if(menuOptionsCount > 0) { - var3 = __client_ja; - var4 = __client_je; - class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var3, var4); + } else if (this.shouldLeftClickOpenMenu()) { + this.openMenu(field205, field206); + } else if (menuOptionsCount > 0) { + var4 = field205; + var9 = field206; + class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var4, var9); UnitPriceComparator.tempMenuAction = null; } - __client_ju = 10; + field203 = 10; MouseHandler.MouseHandler_lastButton = 0; DevicePcmPlayerProvider.dragInventoryWidget = null; - } else if(itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > __client_ja + 5 || MouseHandler.MouseHandler_x < __client_ja - 5 || MouseHandler.MouseHandler_y > __client_je + 5 || MouseHandler.MouseHandler_y < __client_je - 5)) { - __client_jl = true; + } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > field205 + 5 || MouseHandler.MouseHandler_x < field205 - 5 || MouseHandler.MouseHandler_y > field206 + 5 || MouseHandler.MouseHandler_y < field206 - 5)) { + field207 = true; } } - if(Scene.method3187()) { - var3 = Scene.Scene_selectedX; - var4 = Scene.Scene_selectedY; - var40 = Interpreter.method1915(ClientPacket.__gs_ct, packetWriter.isaacCipher); - var40.packetBuffer.writeByte(5); - var40.packetBuffer.__bo_322(var4 + GraphicsObject.baseY); - var40.packetBuffer.__bo_322(var3 + class50.baseX); - var40.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?(KeyHandler.KeyHandler_pressedKeys[81]?2:1):0); - packetWriter.__q_167(var40); + if (Scene.method3187()) { + var4 = Scene.Scene_selectedX; + var9 = Scene.Scene_selectedY; + var25 = Interpreter.method1915(ClientPacket.field318, packetWriter.isaacCipher); + var25.packetBuffer.writeByte(5); + var25.packetBuffer.method63(var9 + GraphicsObject.baseY); + var25.packetBuffer.method63(var4 + class50.baseX); + var25.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); + packetWriter.method241(var25); Scene.method3103(); mouseCrossX = MouseHandler.MouseHandler_lastPressedX; mouseCrossY = MouseHandler.MouseHandler_lastPressedY; mouseCrossColor = 1; mouseCrossState = 0; - destinationX = var3; - destinationY = var4; + destinationX = var4; + destinationY = var9; } - if(var35 != Clock.mousedOverWidgetIf1) { - if(var35 != null) { - class22.method295(var35); + if (var32 != Clock.mousedOverWidgetIf1) { + if (var32 != null) { + class22.method295(var32); } - if(Clock.mousedOverWidgetIf1 != null) { + if (Clock.mousedOverWidgetIf1 != null) { class22.method295(Clock.mousedOverWidgetIf1); } } - if(var32 != AccessFile.__dk_lm && __client_lb == __client_ls) { - if(var32 != null) { - class22.method295(var32); + if (var33 != AccessFile.field8 && field218 == field219) { + if (var33 != null) { + class22.method295(var33); } - if(AccessFile.__dk_lm != null) { - class22.method295(AccessFile.__dk_lm); + if (AccessFile.field8 != null) { + class22.method295(AccessFile.field8); } } - if(AccessFile.__dk_lm != null) { - if(__client_lb < __client_ls) { - ++__client_lb; - if(__client_ls == __client_lb) { - class22.method295(AccessFile.__dk_lm); + if (AccessFile.field8 != null) { + if (field218 < field219) { + ++field218; + if (field219 == field218) { + class22.method295(AccessFile.field8); } } - } else if(__client_lb > 0) { - --__client_lb; + } else if (field218 > 0) { + --field218; } class54.method1091(); - if(isCameraLocked) { - var3 = class3.__w_qs * 128 + 64; - var4 = MusicPatchPcmStream.__hq_qg * 128 + 64; - var5 = class32.getTileHeight(var3, var4, SoundSystem.plane) - AbstractWorldMapIcon.__ak_qj; - if(WorldMapSection1.cameraX < var3) { - WorldMapSection1.cameraX = (var3 - WorldMapSection1.cameraX) * class30.__ar_qw / 1000 + WorldMapSection1.cameraX + ClientPacket.__gs_qh; - if(WorldMapSection1.cameraX > var3) { - WorldMapSection1.cameraX = var3; + if (isCameraLocked) { + var4 = class3.field1146 * 128 + 64; + var9 = MusicPatchPcmStream.field602 * 128 + 64; + var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - AbstractWorldMapIcon.field4; + if (WorldMapSection1.cameraX < var4) { + WorldMapSection1.cameraX = (var4 - WorldMapSection1.cameraX) * class30.field1148 / 1000 + WorldMapSection1.cameraX + ClientPacket.field221; + if (WorldMapSection1.cameraX > var4) { + WorldMapSection1.cameraX = var4; } } - if(WorldMapSection1.cameraX > var3) { - WorldMapSection1.cameraX -= class30.__ar_qw * (WorldMapSection1.cameraX - var3) / 1000 + ClientPacket.__gs_qh; - if(WorldMapSection1.cameraX < var3) { - WorldMapSection1.cameraX = var3; + if (WorldMapSection1.cameraX > var4) { + WorldMapSection1.cameraX -= class30.field1148 * (WorldMapSection1.cameraX - var4) / 1000 + ClientPacket.field221; + if (WorldMapSection1.cameraX < var4) { + WorldMapSection1.cameraX = var4; } } - if(GrandExchangeEvents.cameraY < var5) { - GrandExchangeEvents.cameraY = (var5 - GrandExchangeEvents.cameraY) * class30.__ar_qw / 1000 + GrandExchangeEvents.cameraY + ClientPacket.__gs_qh; - if(GrandExchangeEvents.cameraY > var5) { - GrandExchangeEvents.cameraY = var5; + if (GrandExchangeEvents.cameraY < var10) { + GrandExchangeEvents.cameraY = (var10 - GrandExchangeEvents.cameraY) * class30.field1148 / 1000 + GrandExchangeEvents.cameraY + ClientPacket.field221; + if (GrandExchangeEvents.cameraY > var10) { + GrandExchangeEvents.cameraY = var10; } } - if(GrandExchangeEvents.cameraY > var5) { - GrandExchangeEvents.cameraY -= class30.__ar_qw * (GrandExchangeEvents.cameraY - var5) / 1000 + ClientPacket.__gs_qh; - if(GrandExchangeEvents.cameraY < var5) { - GrandExchangeEvents.cameraY = var5; + if (GrandExchangeEvents.cameraY > var10) { + GrandExchangeEvents.cameraY -= class30.field1148 * (GrandExchangeEvents.cameraY - var10) / 1000 + ClientPacket.field221; + if (GrandExchangeEvents.cameraY < var10) { + GrandExchangeEvents.cameraY = var10; } } - if(class11.cameraZ < var4) { - class11.cameraZ = (var4 - class11.cameraZ) * class30.__ar_qw / 1000 + class11.cameraZ + ClientPacket.__gs_qh; - if(class11.cameraZ > var4) { - class11.cameraZ = var4; + if (class11.cameraZ < var9) { + class11.cameraZ = (var9 - class11.cameraZ) * class30.field1148 / 1000 + class11.cameraZ + ClientPacket.field221; + if (class11.cameraZ > var9) { + class11.cameraZ = var9; } } - if(class11.cameraZ > var4) { - class11.cameraZ -= class30.__ar_qw * (class11.cameraZ - var4) / 1000 + ClientPacket.__gs_qh; - if(class11.cameraZ < var4) { - class11.cameraZ = var4; + if (class11.cameraZ > var9) { + class11.cameraZ -= class30.field1148 * (class11.cameraZ - var9) / 1000 + ClientPacket.field221; + if (class11.cameraZ < var9) { + class11.cameraZ = var9; } } - var3 = GrandExchangeOffer.__x_rg * 128 + 64; - var4 = KeyHandler.__an_ra * 128 + 64; - var5 = class32.getTileHeight(var3, var4, SoundSystem.plane) - IndexStoreAction.__ik_rt; - var6 = var3 - WorldMapSection1.cameraX; - var7 = var5 - GrandExchangeEvents.cameraY; - var8 = var4 - class11.cameraZ; - var9 = (int)Math.sqrt((double)(var8 * var8 + var6 * var6)); - var10 = (int)(Math.atan2((double)var7, (double)var9) * 325.949D) & 2047; - var11 = (int)(Math.atan2((double)var6, (double)var8) * -325.949D) & 2047; - if(var10 < 128) { - var10 = 128; + var4 = GrandExchangeOffer.field376 * 128 + 64; + var9 = KeyHandler.field445 * 128 + 64; + var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - IndexStoreAction.field410; + var11 = var4 - WorldMapSection1.cameraX; + var12 = var10 - GrandExchangeEvents.cameraY; + var13 = var9 - class11.cameraZ; + var14 = (int)Math.sqrt((double)(var13 * var13 + var11 * var11)); + var15 = (int)(Math.atan2((double)var12, (double)var14) * 325.949D) & 2047; + var16 = (int)(Math.atan2((double)var11, (double)var13) * -325.949D) & 2047; + if (var15 < 128) { + var15 = 128; } - if(var10 > 383) { - var10 = 383; + if (var15 > 383) { + var15 = 383; } - if(WorldMapIcon1.cameraPitch < var10) { - WorldMapIcon1.cameraPitch = (var10 - WorldMapIcon1.cameraPitch) * class171.__fo_ro / 1000 + WorldMapIcon1.cameraPitch + VertexNormal.__dq_rq; - if(WorldMapIcon1.cameraPitch > var10) { - WorldMapIcon1.cameraPitch = var10; + if (WorldMapIcon1.cameraPitch < var15) { + WorldMapIcon1.cameraPitch = (var15 - WorldMapIcon1.cameraPitch) * class171.field1116 / 1000 + WorldMapIcon1.cameraPitch + VertexNormal.field946; + if (WorldMapIcon1.cameraPitch > var15) { + WorldMapIcon1.cameraPitch = var15; } } - if(WorldMapIcon1.cameraPitch > var10) { - WorldMapIcon1.cameraPitch -= class171.__fo_ro * (WorldMapIcon1.cameraPitch - var10) / 1000 + VertexNormal.__dq_rq; - if(WorldMapIcon1.cameraPitch < var10) { - WorldMapIcon1.cameraPitch = var10; + if (WorldMapIcon1.cameraPitch > var15) { + WorldMapIcon1.cameraPitch -= class171.field1116 * (WorldMapIcon1.cameraPitch - var15) / 1000 + VertexNormal.field946; + if (WorldMapIcon1.cameraPitch < var15) { + WorldMapIcon1.cameraPitch = var15; } } - var12 = var11 - MusicPatchNode.cameraYaw; - if(var12 > 1024) { - var12 -= 2048; + var17 = var16 - MusicPatchNode.cameraYaw; + if (var17 > 1024) { + var17 -= 2048; } - if(var12 < -1024) { - var12 += 2048; + if (var17 < -1024) { + var17 += 2048; } - if(var12 > 0) { - MusicPatchNode.cameraYaw = MusicPatchNode.cameraYaw + VertexNormal.__dq_rq + var12 * class171.__fo_ro / 1000; + if (var17 > 0) { + MusicPatchNode.cameraYaw = MusicPatchNode.cameraYaw + VertexNormal.field946 + var17 * class171.field1116 / 1000; MusicPatchNode.cameraYaw &= 2047; } - if(var12 < 0) { - MusicPatchNode.cameraYaw -= VertexNormal.__dq_rq + -var12 * class171.__fo_ro / 1000; + if (var17 < 0) { + MusicPatchNode.cameraYaw -= VertexNormal.field946 + -var17 * class171.field1116 / 1000; MusicPatchNode.cameraYaw &= 2047; } - int var26 = var11 - MusicPatchNode.cameraYaw; - if(var26 > 1024) { - var26 -= 2048; + int var35 = var16 - MusicPatchNode.cameraYaw; + if (var35 > 1024) { + var35 -= 2048; } - if(var26 < -1024) { - var26 += 2048; + if (var35 < -1024) { + var35 += 2048; } - if(var26 < 0 && var12 > 0 || var26 > 0 && var12 < 0) { - MusicPatchNode.cameraYaw = var11; + if (var35 < 0 && var17 > 0 || var35 > 0 && var17 < 0) { + MusicPatchNode.cameraYaw = var16; } } - for(var3 = 0; var3 < 5; ++var3) { - ++__client_rk[var3]; + for (var4 = 0; var4 < 5; ++var4) { + int var10002 = field144[var4]++; } class196.varcs.tryWrite(); - var3 = class22.method297(); - var4 = KeyHandler.KeyHandler_idleCycles; - if(var3 > 15000 && var4 > 15000) { - __client_fd = 250; + var4 = class22.method297(); + var9 = KeyHandler.KeyHandler_idleCycles; + if (var4 > 15000 && var9 > 15000) { + field175 = 250; MouseHandler.MouseHandler_idleCycles = 14500; - var18 = Interpreter.method1915(ClientPacket.__gs_ax, packetWriter.isaacCipher); - packetWriter.__q_167(var18); + var18 = Interpreter.method1915(ClientPacket.field271, packetWriter.isaacCipher); + packetWriter.method241(var18); } - WorldMapArea.friendSystem.__w_154(); - ++packetWriter.__d; - if(packetWriter.__d > 50) { - var18 = Interpreter.method1915(ClientPacket.__gs_c, packetWriter.isaacCipher); - packetWriter.__q_167(var18); + WorldMapArea.friendSystem.method102(); + ++packetWriter.field675; + if (packetWriter.field675 > 50) { + var18 = Interpreter.method1915(ClientPacket.field244, packetWriter.isaacCipher); + packetWriter.method241(var18); } try { - packetWriter.__f_166(); - } catch (IOException var27) { + packetWriter.method240(); + } catch (IOException var28) { class48.method868(); } return; } - var36 = var38.widget; - if(var36.childIndex < 0) { + var23 = var24.widget; + if (var23.childIndex < 0) { break; } - var25 = Huffman.getWidget(var36.parentId); - } while(var25 == null || var25.children == null || var36.childIndex >= var25.children.length || var36 != var25.children[var36.childIndex]); + var34 = Huffman.getWidget(var23.parentId); + } while(var34 == null || var34.children == null || var23.childIndex >= var34.children.length || var23 != var34.children[var23.childIndex]); - AbstractIndexCache.runScript(var38); + AbstractIndexCache.runScript(var24); } } - var36 = var38.widget; - if(var36.childIndex < 0) { + var23 = var24.widget; + if (var23.childIndex < 0) { break; } - var25 = Huffman.getWidget(var36.parentId); - } while(var25 == null || var25.children == null || var36.childIndex >= var25.children.length || var36 != var25.children[var36.childIndex]); + var34 = Huffman.getWidget(var23.parentId); + } while(var34 == null || var34.children == null || var23.childIndex >= var34.children.length || var23 != var34.children[var23.childIndex]); - AbstractIndexCache.runScript(var38); + AbstractIndexCache.runScript(var24); } } - var36 = var38.widget; - if(var36.childIndex < 0) { + var23 = var24.widget; + if (var23.childIndex < 0) { break; } - var25 = Huffman.getWidget(var36.parentId); - } while(var25 == null || var25.children == null || var36.childIndex >= var25.children.length || var36 != var25.children[var36.childIndex]); + var34 = Huffman.getWidget(var23.parentId); + } while(var34 == null || var34.children == null || var23.childIndex >= var34.children.length || var23 != var34.children[var23.childIndex]); - AbstractIndexCache.runScript(var38); + AbstractIndexCache.runScript(var24); } } - var30 = Interpreter.method1915(ClientPacket.__gs_cw, packetWriter.isaacCipher); - var30.packetBuffer.writeByte(0); - var3 = var30.packetBuffer.index; - WorldMapLabel.method443(var30.packetBuffer); - var30.packetBuffer.__h_300(var30.packetBuffer.index - var3); - packetWriter.__q_167(var30); + var5 = Interpreter.method1915(ClientPacket.field313, packetWriter.isaacCipher); + var5.packetBuffer.writeByte(0); + var4 = var5.packetBuffer.index; + WorldMapLabel.method443(var5.packetBuffer); + var5.packetBuffer.method41(var5.packetBuffer.index - var4); + packetWriter.method241(var5); } } } + } @ObfuscatedName("ge") @@ -4516,24 +4264,23 @@ public final class Client extends GameShell implements Usernamed { signature = "(I)V", garbageValue = "-1792846917" ) - void __ge_137() { + void method84() { int var1 = SoundCache.canvasWidth; int var2 = Huffman.canvasHeight; - if(super.contentWidth < var1) { + if (super.contentWidth < var1) { var1 = super.contentWidth; } - if(super.contentHeight < var2) { + if (super.contentHeight < var2) { var2 = super.contentHeight; } - if(ReflectionCheck.clientPreferences != null) { + if (ReflectionCheck.clientPreferences != null) { try { Client var3 = TextureProvider.client; - Object[] var4 = new Object[]{Integer.valueOf(SpotAnimationDefinition.method4822())}; + Object[] var4 = new Object[]{SpotAnimationDefinition.method4822()}; JSObject.getWindow(var3).call("resize", var4); } catch (Throwable var5) { - ; } } @@ -4546,36 +4293,36 @@ public final class Client extends GameShell implements Usernamed { ) @Export("drawLoggedIn") final void drawLoggedIn() { - if(rootWidgetGroup != -1) { + if (rootWidgetGroup != -1) { ClientPreferences.method1809(rootWidgetGroup); } int var1; - for(var1 = 0; var1 < rootWidgetCount; ++var1) { - if(__client_od[var1]) { - __client_ot[var1] = true; + for (var1 = 0; var1 < rootWidgetCount; ++var1) { + if (field100[var1]) { + field102[var1] = true; } - __client_oq[var1] = __client_od[var1]; - __client_od[var1] = false; + field101[var1] = field100[var1]; + field100[var1] = false; } - __client_oo = cycle; - __client_lq = -1; - __client_ln = -1; - UserComparator6.__fg_jh = null; - if(rootWidgetGroup != -1) { + field98 = cycle; + field216 = -1; + field217 = -1; + UserComparator6.field937 = null; + if (rootWidgetGroup != -1) { rootWidgetCount = 0; Interpreter.drawWidgets(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0, -1); } Rasterizer2D.Rasterizer2D_resetClip(); - if(showMouseCross) { - if(mouseCrossColor == 1) { + if (showMouseCross) { + if (mouseCrossColor == 1) { KeyHandler.crossSprites[mouseCrossState / 100].drawAt2(mouseCrossX - 8, mouseCrossY - 8); } - if(mouseCrossColor == 2) { + if (mouseCrossColor == 2) { KeyHandler.crossSprites[mouseCrossState / 100 + 4].drawAt2(mouseCrossX - 8, mouseCrossY - 8); } } @@ -4583,66 +4330,66 @@ public final class Client extends GameShell implements Usernamed { int var2; int var3; int var4; + int var5; int var6; int var7; - int var8; - if(!isMenuOpen) { - if(__client_lq != -1) { - class39.drawMenuActionTextAt(__client_lq, __client_ln); + if (!isMenuOpen) { + if (field216 != -1) { + class39.drawMenuActionTextAt(field216, field217); } } else { var1 = class25.menuX; var2 = GameShell.menuY; var3 = class214.menuWidth; var4 = AbstractWorldMapIcon.menuHeight; - int var5 = 0x5d5447; - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var5); + int var8 = 6116423; + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var8); Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0); Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0); - class2.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var5, -1); - var6 = MouseHandler.MouseHandler_x; - var7 = MouseHandler.MouseHandler_y; + class2.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var8, -1); + var5 = MouseHandler.MouseHandler_x; + var6 = MouseHandler.MouseHandler_y; int var9; int var10; - for(var8 = 0; var8 < menuOptionsCount; ++var8) { - var9 = var2 + (menuOptionsCount - 1 - var8) * 15 + 31; - var10 = 0xffffff; - if(var6 > var1 && var6 < var3 + var1 && var7 > var9 - 13 && var7 < var9 + 3) { - var10 = 0xffff00; + for (var7 = 0; var7 < menuOptionsCount; ++var7) { + var9 = var2 + (menuOptionsCount - 1 - var7) * 15 + 31; + var10 = 16777215; + if (var5 > var1 && var5 < var3 + var1 && var6 > var9 - 13 && var6 < var9 + 3) { + var10 = 16776960; } Font var11 = class2.fontBold12; String var12; - if(var8 < 0) { + if (var7 < 0) { var12 = ""; - } else if(menuTargetNames[var8].length() > 0) { - var12 = menuActions[var8] + " " + menuTargetNames[var8]; + } else if (menuTargetNames[var7].length() > 0) { + var12 = menuActions[var7] + " " + menuTargetNames[var7]; } else { - var12 = menuActions[var8]; + var12 = menuActions[var7]; } var11.draw(var12, var1 + 3, var9, var10, 0); } - var8 = class25.menuX; + var7 = class25.menuX; var9 = GameShell.menuY; var10 = class214.menuWidth; - int var13 = AbstractWorldMapIcon.menuHeight; + int var15 = AbstractWorldMapIcon.menuHeight; - for(int var14 = 0; var14 < rootWidgetCount; ++var14) { - if(rootWidgetXs[var14] + rootWidgetWidths[var14] > var8 && rootWidgetXs[var14] < var8 + var10 && rootWidgetYs[var14] + rootWidgetHeights[var14] > var9 && rootWidgetYs[var14] < var9 + var13) { - __client_ot[var14] = true; + for (int var18 = 0; var18 < rootWidgetCount; ++var18) { + if (rootWidgetXs[var18] + rootWidgetWidths[var18] > var7 && rootWidgetXs[var18] < var7 + var10 && rootWidgetYs[var18] + rootWidgetHeights[var18] > var9 && rootWidgetYs[var18] < var9 + var15) { + field102[var18] = true; } } } - if(gameDrawingMode == 3) { - for(var1 = 0; var1 < rootWidgetCount; ++var1) { - if(__client_oq[var1]) { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 0xff00ff, 128); - } else if(__client_ot[var1]) { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 0xff0000, 128); + if (gameDrawingMode == 3) { + for (var1 = 0; var1 < rootWidgetCount; ++var1) { + if (field101[var1]) { + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); + } else if (field102[var1]) { + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); } } } @@ -4650,82 +4397,85 @@ public final class Client extends GameShell implements Usernamed { var1 = SoundSystem.plane; var2 = Canvas.localPlayer.x; var3 = Canvas.localPlayer.y; - var4 = __client_gy; + var4 = field183; - for(ObjectSound var15 = (ObjectSound)ObjectSound.objectSounds.last(); var15 != null; var15 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if(var15.soundEffectId != -1 || var15.soundEffectIds != null) { - var6 = 0; - if(var2 > var15.__o) { - var6 += var2 - var15.__o; - } else if(var2 < var15.__q) { - var6 += var15.__q - var2; + for (ObjectSound var13 = (ObjectSound)ObjectSound.objectSounds.last(); var13 != null; var13 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var13.soundEffectId != -1 || var13.soundEffectIds != null) { + var5 = 0; + if (var2 > var13.field650) { + var5 += var2 - var13.field650; + } else if (var2 < var13.field648) { + var5 += var13.field648 - var2; } - if(var3 > var15.__u) { - var6 += var3 - var15.__u; - } else if(var3 < var15.__w) { - var6 += var15.__w - var3; + if (var3 > var13.field651) { + var5 += var3 - var13.field651; + } else if (var3 < var13.field649) { + var5 += var13.field649 - var3; } - if(var6 - 64 <= var15.__g && __client_qc != 0 && var1 == var15.__f) { - var6 -= 64; - if(var6 < 0) { - var6 = 0; + if (var5 - 64 <= var13.field652 && field115 != 0 && var1 == var13.field647) { + var5 -= 64; + if (var5 < 0) { + var5 = 0; } - var7 = (var15.__g - var6) * __client_qc / var15.__g; - Object var10000; - if(var15.stream1 == null) { - if(var15.soundEffectId >= 0) { - var10000 = null; - SoundEffect var16 = SoundEffect.readSoundEffect(class25.indexCache4, var15.soundEffectId, 0); - if(var16 != null) { - RawSound var17 = var16.toRawSound().resample(MilliClock.decimator); - RawPcmStream var18 = RawPcmStream.createRawPcmStream(var17, 100, var7); - var18.setNumLoops(-1); - TaskHandler.pcmStreamMixer.addSubStream(var18); - var15.stream1 = var18; + var6 = (var13.field652 - var5) * field115 / var13.field652; + Object var14; + SoundEffect var16; + RawSound var17; + RawPcmStream var19; + if (var13.stream1 == null) { + if (var13.soundEffectId >= 0) { + var14 = null; + var16 = SoundEffect.readSoundEffect(class25.indexCache4, var13.soundEffectId, 0); + if (var16 != null) { + var17 = var16.toRawSound().resample(MilliClock.decimator); + var19 = RawPcmStream.createRawPcmStream(var17, 100, var6); + var19.setNumLoops(-1); + TaskHandler.pcmStreamMixer.addSubStream(var19); + var13.stream1 = var19; } } } else { - var15.stream1.__a_182(var7); + var13.stream1.method265(var6); } - if(var15.stream2 == null) { - if(var15.soundEffectIds != null && (var15.__n -= var4) <= 0) { - var8 = (int)(Math.random() * (double)var15.soundEffectIds.length); - var10000 = null; - SoundEffect var20 = SoundEffect.readSoundEffect(class25.indexCache4, var15.soundEffectIds[var8], 0); - if(var20 != null) { - RawSound var21 = var20.toRawSound().resample(MilliClock.decimator); - RawPcmStream var19 = RawPcmStream.createRawPcmStream(var21, 100, var7); + if (var13.stream2 == null) { + if (var13.soundEffectIds != null && (var13.field655 -= var4) <= 0) { + var7 = (int)(Math.random() * (double)var13.soundEffectIds.length); + var14 = null; + var16 = SoundEffect.readSoundEffect(class25.indexCache4, var13.soundEffectIds[var7], 0); + if (var16 != null) { + var17 = var16.toRawSound().resample(MilliClock.decimator); + var19 = RawPcmStream.createRawPcmStream(var17, 100, var6); var19.setNumLoops(0); TaskHandler.pcmStreamMixer.addSubStream(var19); - var15.stream2 = var19; - var15.__n = var15.__x + (int)(Math.random() * (double)(var15.__d - var15.__x)); + var13.stream2 = var19; + var13.field655 = var13.field653 + (int)(Math.random() * (double)(var13.field654 - var13.field653)); } } } else { - var15.stream2.__a_182(var7); - if(!var15.stream2.hasNext()) { - var15.stream2 = null; + var13.stream2.method265(var6); + if (!var13.stream2.hasNext()) { + var13.stream2 = null; } } } else { - if(var15.stream1 != null) { - TaskHandler.pcmStreamMixer.removeSubStream(var15.stream1); - var15.stream1 = null; + if (var13.stream1 != null) { + TaskHandler.pcmStreamMixer.removeSubStream(var13.stream1); + var13.stream1 = null; } - if(var15.stream2 != null) { - TaskHandler.pcmStreamMixer.removeSubStream(var15.stream2); - var15.stream2 = null; + if (var13.stream2 != null) { + TaskHandler.pcmStreamMixer.removeSubStream(var13.stream2); + var13.stream2 = null; } } } } - __client_gy = 0; + field183 = 0; } @ObfuscatedName("hg") @@ -4733,50 +4483,50 @@ public final class Client extends GameShell implements Usernamed { signature = "(Lcl;I)Z", garbageValue = "1488446149" ) - final boolean __hg_138(PacketWriter var1) { + final boolean method85(PacketWriter var1) { AbstractSocket var2 = var1.getSocket(); PacketBuffer var3 = var1.packetBuffer; - if(var2 == null) { + if (var2 == null) { return false; } else { - String var17; - int var18; + String var4; + int var5; try { - int var5; - if(var1.serverPacket0 == null) { - if(var1.__e) { - if(!var2.isAvailable(1)) { + int var6; + if (var1.serverPacket0 == null) { + if (var1.field673) { + if (!var2.isAvailable(1)) { return false; } var2.read(var1.packetBuffer.array, 0, 1); - var1.__x = 0; - var1.__e = false; + var1.field674 = 0; + var1.field673 = false; } var3.index = 0; - if(var3.__ig_334()) { - if(!var2.isAvailable(1)) { + if (var3.method236()) { + if (!var2.isAvailable(1)) { return false; } var2.read(var1.packetBuffer.array, 1, 1); - var1.__x = 0; + var1.field674 = 0; } - var1.__e = true; - ServerPacket[] var4 = class27.method429(); - var5 = var3.readSmartByteShortIsaac(); - if(var5 < 0 || var5 >= var4.length) { - throw new IOException(var5 + " " + var3.index); + var1.field673 = true; + ServerPacket[] var7 = class27.method429(); + var6 = var3.readSmartByteShortIsaac(); + if (var6 < 0 || var6 >= var7.length) { + throw new IOException(var6 + " " + var3.index); } - var1.serverPacket0 = var4[var5]; + var1.serverPacket0 = var7[var6]; var1.serverPacket0Length = var1.serverPacket0.length; } - if(var1.serverPacket0Length == -1) { - if(!var2.isAvailable(1)) { + if (var1.serverPacket0Length == -1) { + if (!var2.isAvailable(1)) { return false; } @@ -4784,61 +4534,61 @@ public final class Client extends GameShell implements Usernamed { var1.serverPacket0Length = var3.array[0] & 255; } - if(var1.serverPacket0Length == -2) { - if(!var2.isAvailable(2)) { + if (var1.serverPacket0Length == -2) { + if (!var2.isAvailable(2)) { return false; } var1.getSocket().read(var3.array, 0, 2); var3.index = 0; - var1.serverPacket0Length = var3.__ag_302(); + var1.serverPacket0Length = var3.method43(); } - if(!var2.isAvailable(var1.serverPacket0Length)) { + if (!var2.isAvailable(var1.serverPacket0Length)) { return false; } var3.index = 0; var2.read(var3.array, 0, var1.serverPacket0Length); - var1.__x = 0; - timer.__m_453(); - var1.__i = var1.__n; - var1.__n = var1.__k; - var1.__k = var1.serverPacket0; - if(ServerPacket.__ge_ax == var1.serverPacket0) { + var1.field674 = 0; + timer.method329(); + var1.field678 = var1.field677; + var1.field677 = var1.field676; + var1.field676 = var1.serverPacket0; + if (ServerPacket.field838 == var1.serverPacket0) { class16.method189(class190.field2344); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_be == var1.serverPacket0) { + if (ServerPacket.field864 == var1.serverPacket0) { isCameraLocked = true; - class3.__w_qs = var3.readUnsignedByte(); - MusicPatchPcmStream.__hq_qg = var3.readUnsignedByte(); - AbstractWorldMapIcon.__ak_qj = var3.__ag_302(); - ClientPacket.__gs_qh = var3.readUnsignedByte(); - class30.__ar_qw = var3.readUnsignedByte(); - if(class30.__ar_qw >= 100) { - WorldMapSection1.cameraX = class3.__w_qs * 128 + 64; - class11.cameraZ = MusicPatchPcmStream.__hq_qg * 128 + 64; - GrandExchangeEvents.cameraY = class32.getTileHeight(WorldMapSection1.cameraX, class11.cameraZ, SoundSystem.plane) - AbstractWorldMapIcon.__ak_qj; + class3.field1146 = var3.readUnsignedByte(); + MusicPatchPcmStream.field602 = var3.readUnsignedByte(); + AbstractWorldMapIcon.field4 = var3.method43(); + ClientPacket.field221 = var3.readUnsignedByte(); + class30.field1148 = var3.readUnsignedByte(); + if (class30.field1148 >= 100) { + WorldMapSection1.cameraX = class3.field1146 * 128 + 64; + class11.cameraZ = MusicPatchPcmStream.field602 * 128 + 64; + GrandExchangeEvents.cameraY = class32.getTileHeight(WorldMapSection1.cameraX, class11.cameraZ, SoundSystem.plane) - AbstractWorldMapIcon.field4; } var1.serverPacket0 = null; return true; } - int var16; - if(ServerPacket.__ge_aj == var1.serverPacket0) { - for(var16 = 0; var16 < players.length; ++var16) { - if(players[var16] != null) { - players[var16].sequence = -1; + int var37; + if (ServerPacket.field817 == var1.serverPacket0) { + for (var37 = 0; var37 < players.length; ++var37) { + if (players[var37] != null) { + players[var37].sequence = -1; } } - for(var16 = 0; var16 < npcs.length; ++var16) { - if(npcs[var16] != null) { - npcs[var16].sequence = -1; + for (var37 = 0; var37 < npcs.length; ++var37) { + if (npcs[var37] != null) { + npcs[var37].sequence = -1; } } @@ -4846,300 +4596,300 @@ public final class Client extends GameShell implements Usernamed { return true; } - if(ServerPacket.__ge_s == var1.serverPacket0) { - Canvas.__ao_gk = var3.__bq_318(); - WorldMapSection3.__p_go = var3.readUnsignedByteNegate(); + if (ServerPacket.field806 == var1.serverPacket0) { + Canvas.field95 = var3.method59(); + WorldMapSection3.field1089 = var3.readUnsignedByteNegate(); - while(var3.index < var1.serverPacket0Length) { - var16 = var3.readUnsignedByte(); - class190 var56 = RunException.method3430()[var16]; - class16.method189(var56); + while (var3.index < var1.serverPacket0Length) { + var37 = var3.readUnsignedByte(); + class190 var38 = RunException.method3430()[var37]; + class16.method189(var38); } var1.serverPacket0 = null; return true; } - Widget var41; - if(ServerPacket.__ge_bx == var1.serverPacket0) { - var16 = var3.__aq_303(); - var5 = var3.__bf_332(); - var41 = Huffman.getWidget(var5); - if(var16 != var41.sequenceId || var16 == -1) { - var41.sequenceId = var16; - var41.modelFrame = 0; - var41.modelFrameCycle = 0; - class22.method295(var41); + Widget var8; + if (ServerPacket.field850 == var1.serverPacket0) { + var37 = var3.method44(); + var6 = var3.method73(); + var8 = Huffman.getWidget(var6); + if (var37 != var8.sequenceId || var37 == -1) { + var8.sequenceId = var37; + var8.modelFrame = 0; + var8.modelFrameCycle = 0; + class22.method295(var8); } var1.serverPacket0 = null; return true; } - Widget var52; - if(ServerPacket.__ge_ar == var1.serverPacket0) { - var16 = var3.__bf_332(); - var52 = Huffman.getWidget(var16); - var52.modelType = 3; - var52.modelId = Canvas.localPlayer.appearance.getChatHeadId(); - class22.method295(var52); + Widget var9; + if (ServerPacket.field819 == var1.serverPacket0) { + var37 = var3.method73(); + var9 = Huffman.getWidget(var37); + var9.modelType = 3; + var9.modelId = Canvas.localPlayer.appearance.getChatHeadId(); + class22.method295(var9); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_f == var1.serverPacket0) { + if (ServerPacket.field790 == var1.serverPacket0) { TextureProvider.method2773(); var1.serverPacket0 = null; return false; } - if(ServerPacket.__ge_l == var1.serverPacket0) { - var16 = var3.__bp_331(); - var52 = Huffman.getWidget(var16); + if (ServerPacket.field796 == var1.serverPacket0) { + var37 = var3.method72(); + var9 = Huffman.getWidget(var37); - for(var18 = 0; var18 < var52.itemIds.length; ++var18) { - var52.itemIds[var18] = -1; - var52.itemIds[var18] = 0; + for (var5 = 0; var5 < var9.itemIds.length; ++var5) { + var9.itemIds[var5] = -1; + var9.itemIds[var5] = 0; } - class22.method295(var52); + class22.method295(var9); var1.serverPacket0 = null; return true; } - int var7; - int var8; - int var9; int var10; - if(ServerPacket.__ge_bg == var1.serverPacket0) { - var16 = var3.readInt(); - var5 = var3.__ag_302(); - if(var16 < -70000) { - var5 += 32768; + int var11; + int var12; + int var13; + if (ServerPacket.field859 == var1.serverPacket0) { + var37 = var3.readInt(); + var6 = var3.method43(); + if (var37 < -70000) { + var6 += 32768; } - if(var16 >= 0) { - var41 = Huffman.getWidget(var16); + if (var37 >= 0) { + var8 = Huffman.getWidget(var37); } else { - var41 = null; + var8 = null; } - if(var41 != null) { - for(var7 = 0; var7 < var41.itemIds.length; ++var7) { - var41.itemIds[var7] = 0; - var41.itemQuantities[var7] = 0; + if (var8 != null) { + for (var10 = 0; var10 < var8.itemIds.length; ++var10) { + var8.itemIds[var10] = 0; + var8.itemQuantities[var10] = 0; } } - PlayerType.clearItemContainer(var5); - var7 = var3.__ag_302(); + PlayerType.clearItemContainer(var6); + var10 = var3.method43(); - for(var8 = 0; var8 < var7; ++var8) { - var9 = var3.__ag_302(); - var10 = var3.readUnsignedByte(); - if(var10 == 255) { - var10 = var3.__bf_332(); + for (var11 = 0; var11 < var10; ++var11) { + var12 = var3.method43(); + var13 = var3.readUnsignedByte(); + if (var13 == 255) { + var13 = var3.method73(); } - if(var41 != null && var8 < var41.itemIds.length) { - var41.itemIds[var8] = var9; - var41.itemQuantities[var8] = var10; + if (var8 != null && var11 < var8.itemIds.length) { + var8.itemIds[var11] = var12; + var8.itemQuantities[var11] = var13; } - WorldMapManager.itemContainerSetItem(var5, var8, var9 - 1, var10); + WorldMapManager.itemContainerSetItem(var6, var11, var12 - 1, var13); } - if(var41 != null) { - class22.method295(var41); + if (var8 != null) { + class22.method295(var8); } class12.method159(); - __client_nz[++__client_ns - 1 & 31] = var5 & 32767; + field116[++field117 - 1 & 31] = var6 & 32767; var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_e == var1.serverPacket0) { + if (ServerPacket.field797 == var1.serverPacket0) { class16.method189(class190.field2341); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_bb == var1.serverPacket0) { + if (ServerPacket.field842 == var1.serverPacket0) { UserComparator7.method3360(var3, var1.serverPacket0Length); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_bm == var1.serverPacket0) { - WorldMapSection3.__p_go = var3.readUnsignedByteNegate(); - Canvas.__ao_gk = var3.__bq_318(); + if (ServerPacket.field853 == var1.serverPacket0) { + WorldMapSection3.field1089 = var3.readUnsignedByteNegate(); + Canvas.field95 = var3.method59(); var1.serverPacket0 = null; return true; } - boolean var47; - if(ServerPacket.__ge_b == var1.serverPacket0) { - var16 = var3.readInt(); - var47 = var3.readUnsignedByte() == 1; - var41 = Huffman.getWidget(var16); - if(var47 != var41.isHidden) { - var41.isHidden = var47; - class22.method295(var41); + boolean var14; + if (ServerPacket.field810 == var1.serverPacket0) { + var37 = var3.readInt(); + var14 = var3.readUnsignedByte() == 1; + var8 = Huffman.getWidget(var37); + if (var14 != var8.isHidden) { + var8.isHidden = var14; + class22.method295(var8); } var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_bu == var1.serverPacket0) { - byte var60 = var3.__bn_319(); - var5 = var3.__bu_325(); - Varps.Varps_temp[var5] = var60; - if(Varps.Varps_main[var5] != var60) { - Varps.Varps_main[var5] = var60; + if (ServerPacket.field852 == var1.serverPacket0) { + byte var39 = var3.method60(); + var6 = var3.method66(); + Varps.Varps_temp[var6] = var39; + if (Varps.Varps_main[var6] != var39) { + Varps.Varps_main[var6] = var39; } - IndexCache.method4703(var5); - __client_nr[++__client_nd - 1 & 31] = var5; + IndexCache.method4703(var6); + field121[++field123 - 1 & 31] = var6; var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_a == var1.serverPacket0) { + if (ServerPacket.field803 == var1.serverPacket0) { class16.method189(class190.field2347); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_bq == var1.serverPacket0) { - var16 = var3.readUnsignedByte(); - if(var3.readUnsignedByte() == 0) { - grandExchangeOffers[var16] = new GrandExchangeOffer(); + if (ServerPacket.field844 == var1.serverPacket0) { + var37 = var3.readUnsignedByte(); + if (var3.readUnsignedByte() == 0) { + grandExchangeOffers[var37] = new GrandExchangeOffer(); var3.index += 18; } else { --var3.index; - grandExchangeOffers[var16] = new GrandExchangeOffer(var3, false); + grandExchangeOffers[var37] = new GrandExchangeOffer(var3, false); } - __client_nv = cycleCntr; + field122 = cycleCntr; var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_cj == var1.serverPacket0) { - var16 = var3.__bm_326(); - rootWidgetGroup = var16; - this.__iu_141(false); - DevicePcmPlayerProvider.method845(var16); + if (ServerPacket.field873 == var1.serverPacket0) { + var37 = var3.method67(); + rootWidgetGroup = var37; + this.method87(false); + DevicePcmPlayerProvider.method845(var37); WorldMapSection3.runWidgetOnLoadListener(rootWidgetGroup); - for(var5 = 0; var5 < 100; ++var5) { - __client_od[var5] = true; + for (var6 = 0; var6 < 100; ++var6) { + field100[var6] = true; } var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_bo == var1.serverPacket0) { + if (ServerPacket.field849 == var1.serverPacket0) { class12.method159(); runEnergy = var3.readUnsignedByte(); - __client_ni = cycleCntr; + field124 = cycleCntr; var1.serverPacket0 = null; return true; } - Widget var19; - if(ServerPacket.__ge_af == var1.serverPacket0) { - var16 = var3.__bm_326(); - var5 = var3.__bm_326(); - var18 = var3.__bm_326(); - var7 = var3.__bf_332(); - var19 = Huffman.getWidget(var7); - if(var16 != var19.modelAngleX || var18 != var19.modelAngleY || var5 != var19.modelZoom) { - var19.modelAngleX = var16; - var19.modelAngleY = var18; - var19.modelZoom = var5; - class22.method295(var19); + Widget var15; + if (ServerPacket.field839 == var1.serverPacket0) { + var37 = var3.method67(); + var6 = var3.method67(); + var5 = var3.method67(); + var10 = var3.method73(); + var15 = Huffman.getWidget(var10); + if (var37 != var15.modelAngleX || var5 != var15.modelAngleY || var6 != var15.modelZoom) { + var15.modelAngleX = var37; + var15.modelAngleY = var5; + var15.modelZoom = var6; + class22.method295(var15); } var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_al == var1.serverPacket0) { + if (ServerPacket.field825 == var1.serverPacket0) { hintArrowType = var3.readUnsignedByte(); - if(hintArrowType == 1) { - hintArrowNpcIndex = var3.__ag_302(); + if (hintArrowType == 1) { + hintArrowNpcIndex = var3.method43(); } - if(hintArrowType >= 2 && hintArrowType <= 6) { - if(hintArrowType == 2) { + if (hintArrowType >= 2 && hintArrowType <= 6) { + if (hintArrowType == 2) { hintArrowSubX = 64; hintArrowSubY = 64; } - if(hintArrowType == 3) { + if (hintArrowType == 3) { hintArrowSubX = 0; hintArrowSubY = 64; } - if(hintArrowType == 4) { + if (hintArrowType == 4) { hintArrowSubX = 128; hintArrowSubY = 64; } - if(hintArrowType == 5) { + if (hintArrowType == 5) { hintArrowSubX = 64; hintArrowSubY = 0; } - if(hintArrowType == 6) { + if (hintArrowType == 6) { hintArrowSubX = 64; hintArrowSubY = 128; } hintArrowType = 2; - hintArrowX = var3.__ag_302(); - hintArrowY = var3.__ag_302(); + hintArrowX = var3.method43(); + hintArrowY = var3.method43(); hintArrowHeight = var3.readUnsignedByte(); } - if(hintArrowType == 10) { - hintArrowPlayerIndex = var3.__ag_302(); + if (hintArrowType == 10) { + hintArrowPlayerIndex = var3.method43(); } var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_cv == var1.serverPacket0) { + if (ServerPacket.field868 == var1.serverPacket0) { Skeleton.method3062(var3, var1.serverPacket0Length); ScriptFrame.method1138(); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_m == var1.serverPacket0) { + if (ServerPacket.field789 == var1.serverPacket0) { class50.loadRegions(false, var1.packetBuffer); var1.serverPacket0 = null; return true; } - Widget var58; - if(ServerPacket.__ge_ap == var1.serverPacket0) { - var16 = var3.__bu_325(); - var5 = var3.__by_324(); - var18 = var3.__bp_331(); - var58 = Huffman.getWidget(var18); - var58.__bh = var16 + (var5 << 16); + Widget var16; + if (ServerPacket.field830 == var1.serverPacket0) { + var37 = var3.method66(); + var6 = var3.method65(); + var5 = var3.method72(); + var16 = Huffman.getWidget(var5); + var16.field963 = var37 + (var6 << 16); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_ba == var1.serverPacket0) { - if(rootWidgetGroup != -1) { + if (ServerPacket.field841 == var1.serverPacket0) { + if (rootWidgetGroup != -1) { GrandExchangeEvents.method74(rootWidgetGroup, 0); } @@ -5147,98 +4897,98 @@ public final class Client extends GameShell implements Usernamed { return true; } - if(ServerPacket.__ge_h == var1.serverPacket0) { - var16 = var3.readInt(); - var5 = var3.__ag_302(); - if(var5 == 65535) { - var5 = -1; + if (ServerPacket.field809 == var1.serverPacket0) { + var37 = var3.readInt(); + var6 = var3.method43(); + if (var6 == 65535) { + var6 = -1; } - var18 = var3.__bf_332(); - var58 = Huffman.getWidget(var16); - ItemDefinition var54; - if(!var58.isIf3) { - if(var5 == -1) { - var58.modelType = 0; + var5 = var3.method73(); + var16 = Huffman.getWidget(var37); + ItemDefinition var40; + if (!var16.isIf3) { + if (var6 == -1) { + var16.modelType = 0; var1.serverPacket0 = null; return true; } - var54 = Skills.getItemDefinition(var5); - var58.modelType = 4; - var58.modelId = var5; - var58.modelAngleX = var54.xan2d; - var58.modelAngleY = var54.yan2d; - var58.modelZoom = var54.zoom2d * 100 / var18; - class22.method295(var58); + var40 = Skills.getItemDefinition(var6); + var16.modelType = 4; + var16.modelId = var6; + var16.modelAngleX = var40.xan2d; + var16.modelAngleY = var40.yan2d; + var16.modelZoom = var40.zoom2d * 100 / var5; + class22.method295(var16); } else { - var58.itemId = var5; - var58.itemQuantity = var18; - var54 = Skills.getItemDefinition(var5); - var58.modelAngleX = var54.xan2d; - var58.modelAngleY = var54.yan2d; - var58.modelAngleZ = var54.zan2d; - var58.modelOffsetX = var54.offsetX2d; - var58.modelOffsetY = var54.offsetY2d; - var58.modelZoom = var54.zoom2d; - if(var54.isStackable == 1) { - var58.itemQuantityMode = 1; + var16.itemId = var6; + var16.itemQuantity = var5; + var40 = Skills.getItemDefinition(var6); + var16.modelAngleX = var40.xan2d; + var16.modelAngleY = var40.yan2d; + var16.modelAngleZ = var40.zan2d; + var16.modelOffsetX = var40.offsetX2d; + var16.modelOffsetY = var40.offsetY2d; + var16.modelZoom = var40.zoom2d; + if (var40.isStackable == 1) { + var16.itemQuantityMode = 1; } else { - var58.itemQuantityMode = 2; + var16.itemQuantityMode = 2; } - if(var58.__bf > 0) { - var58.modelZoom = var58.modelZoom * 32 / var58.__bf; - } else if(var58.rawWidth > 0) { - var58.modelZoom = var58.modelZoom * 32 / var58.rawWidth; + if (var16.field962 > 0) { + var16.modelZoom = var16.modelZoom * 32 / var16.field962; + } else if (var16.rawWidth > 0) { + var16.modelZoom = var16.modelZoom * 32 / var16.rawWidth; } - class22.method295(var58); + class22.method295(var16); } var1.serverPacket0 = null; return true; } - String var6; - if(ServerPacket.__ge_w == var1.serverPacket0) { - var16 = var3.__ae_307(); - var47 = var3.readUnsignedByte() == 1; - var6 = ""; - boolean var44 = false; - if(var47) { - var6 = var3.readStringCp1252NullTerminated(); - if(WorldMapArea.friendSystem.isIgnored(new Username(var6, KeyHandler.loginType))) { - var44 = true; + String var17; + boolean var18; + if (ServerPacket.field792 == var1.serverPacket0) { + var37 = var3.method48(); + var14 = var3.readUnsignedByte() == 1; + var17 = ""; + var18 = false; + if (var14) { + var17 = var3.readStringCp1252NullTerminated(); + if (WorldMapArea.friendSystem.isIgnored(new Username(var17, KeyHandler.loginType))) { + var18 = true; } } - String var53 = var3.readStringCp1252NullTerminated(); - if(!var44) { - WorldMapIcon1.method219(var16, var6, var53); + String var41 = var3.readStringCp1252NullTerminated(); + if (!var18) { + WorldMapIcon1.method219(var37, var17, var41); } var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_bi == var1.serverPacket0) { + if (ServerPacket.field857 == var1.serverPacket0) { IndexCacheLoader.field512 = WorldMapElement.method4783(var3.readUnsignedByte()); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_n == var1.serverPacket0) { + if (ServerPacket.field801 == var1.serverPacket0) { class16.method189(class190.field2345); var1.serverPacket0 = null; return true; } - boolean var55; - if(ServerPacket.__ge_j == var1.serverPacket0) { - var55 = var3.readBoolean(); - if(var55) { - if(ClientParameter.field3645 == null) { + if (ServerPacket.field805 == var1.serverPacket0) { + var18 = var3.readBoolean(); + if (var18) { + if (ClientParameter.field3645 == null) { ClientParameter.field3645 = new class248(); } } else { @@ -5249,43 +4999,43 @@ public final class Client extends GameShell implements Usernamed { return true; } - long var21; - if(ServerPacket.__ge_aa == var1.serverPacket0) { - var16 = var3.__bt_330(); - var5 = var3.__bu_325(); - if(var5 == 65535) { - var5 = -1; + long var19; + if (ServerPacket.field837 == var1.serverPacket0) { + var37 = var3.method71(); + var6 = var3.method66(); + if (var6 == 65535) { + var6 = -1; } - var18 = var3.__bf_332(); - var7 = var3.__ag_302(); - if(var7 == 65535) { - var7 = -1; + var5 = var3.method73(); + var10 = var3.method43(); + if (var10 == 65535) { + var10 = -1; } - for(var8 = var7; var8 <= var5; ++var8) { - var21 = (long)var8 + ((long)var18 << 32); - Node var45 = widgetClickMasks.get(var21); - if(var45 != null) { - var45.remove(); + for (var11 = var10; var11 <= var6; ++var11) { + var19 = (long)var11 + ((long)var5 << 32); + Node var42 = widgetClickMasks.get(var19); + if (var42 != null) { + var42.remove(); } - widgetClickMasks.put(new IntegerNode(var16), var21); + widgetClickMasks.put(new IntegerNode(var37), var19); } var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_cy == var1.serverPacket0) { + if (ServerPacket.field870 == var1.serverPacket0) { class3.updateNpcs(true, var3); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_az == var1.serverPacket0) { - if(PacketWriter.clanChat != null) { - PacketWriter.clanChat.__a_474(var3); + if (ServerPacket.field834 == var1.serverPacket0) { + if (PacketWriter.clanChat != null) { + PacketWriter.clanChat.method78(var3); } UserComparator8.method3349(); @@ -5293,53 +5043,53 @@ public final class Client extends GameShell implements Usernamed { return true; } - if(ServerPacket.__ge_z == var1.serverPacket0) { + if (ServerPacket.field804 == var1.serverPacket0) { class16.method189(class190.field2346); var1.serverPacket0 = null; return true; } - String var37; - if(ServerPacket.__ge_by == var1.serverPacket0) { - var37 = var3.readStringCp1252NullTerminated(); - Object[] var51 = new Object[var37.length() + 1]; + String var21; + if (ServerPacket.field851 == var1.serverPacket0) { + var21 = var3.readStringCp1252NullTerminated(); + Object[] var46 = new Object[var21.length() + 1]; - for(var18 = var37.length() - 1; var18 >= 0; --var18) { - if(var37.charAt(var18) == 's') { - var51[var18 + 1] = var3.readStringCp1252NullTerminated(); + for (var5 = var21.length() - 1; var5 >= 0; --var5) { + if (var21.charAt(var5) == 's') { + var46[var5 + 1] = var3.readStringCp1252NullTerminated(); } else { - var51[var18 + 1] = new Integer(var3.readInt()); + var46[var5 + 1] = new Integer(var3.readInt()); } } - var51[0] = new Integer(var3.readInt()); - ScriptEvent var43 = new ScriptEvent(); - var43.args0 = var51; - AbstractIndexCache.runScript(var43); + var46[0] = new Integer(var3.readInt()); + ScriptEvent var49 = new ScriptEvent(); + var49.args0 = var46; + AbstractIndexCache.runScript(var49); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_ag == var1.serverPacket0) { + if (ServerPacket.field815 == var1.serverPacket0) { class16.method189(class190.field2343); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_i == var1.serverPacket0) { + if (ServerPacket.field802 == var1.serverPacket0) { class16.method189(class190.field2350); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_bj == var1.serverPacket0) { + if (ServerPacket.field856 == var1.serverPacket0) { destinationX = var3.readUnsignedByte(); - if(destinationX == 255) { + if (destinationX == 255) { destinationX = 0; } destinationY = var3.readUnsignedByte(); - if(destinationY == 255) { + if (destinationY == 255) { destinationY = 0; } @@ -5347,84 +5097,84 @@ public final class Client extends GameShell implements Usernamed { return true; } - if(ServerPacket.__ge_cr == var1.serverPacket0) { - for(var16 = 0; var16 < VarpDefinition.__ix_f; ++var16) { - VarpDefinition var50 = SecureRandomCallable.method1140(var16); - if(var50 != null) { - Varps.Varps_temp[var16] = 0; - Varps.Varps_main[var16] = 0; + if (ServerPacket.field867 == var1.serverPacket0) { + for (var37 = 0; var37 < VarpDefinition.field944; ++var37) { + VarpDefinition var44 = SecureRandomCallable.method1140(var37); + if (var44 != null) { + Varps.Varps_temp[var37] = 0; + Varps.Varps_main[var37] = 0; } } class12.method159(); - __client_nd += 32; + field123 += 32; var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_an == var1.serverPacket0) { - var16 = var3.readInt(); - var5 = var3.__ag_302(); - if(var16 < -70000) { - var5 += 32768; + if (ServerPacket.field833 == var1.serverPacket0) { + var37 = var3.readInt(); + var6 = var3.method43(); + if (var37 < -70000) { + var6 += 32768; } - if(var16 >= 0) { - var41 = Huffman.getWidget(var16); + if (var37 >= 0) { + var8 = Huffman.getWidget(var37); } else { - var41 = null; + var8 = null; } - for(; var3.index < var1.serverPacket0Length; WorldMapManager.itemContainerSetItem(var5, var7, var8 - 1, var9)) { - var7 = var3.__ae_307(); - var8 = var3.__ag_302(); - var9 = 0; - if(var8 != 0) { - var9 = var3.readUnsignedByte(); - if(var9 == 255) { - var9 = var3.readInt(); + for (; var3.index < var1.serverPacket0Length; WorldMapManager.itemContainerSetItem(var6, var10, var11 - 1, var12)) { + var10 = var3.method48(); + var11 = var3.method43(); + var12 = 0; + if (var11 != 0) { + var12 = var3.readUnsignedByte(); + if (var12 == 255) { + var12 = var3.readInt(); } } - if(var41 != null && var7 >= 0 && var7 < var41.itemIds.length) { - var41.itemIds[var7] = var8; - var41.itemQuantities[var7] = var9; + if (var8 != null && var10 >= 0 && var10 < var8.itemIds.length) { + var8.itemIds[var10] = var11; + var8.itemQuantities[var10] = var12; } } - if(var41 != null) { - class22.method295(var41); + if (var8 != null) { + class22.method295(var8); } class12.method159(); - __client_nz[++__client_ns - 1 & 31] = var5 & 32767; + field116[++field117 - 1 & 31] = var6 & 32767; var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_bl == var1.serverPacket0) { - var16 = var3.__ag_302(); - var5 = var3.readUnsignedByte(); - var18 = var3.__ag_302(); - Ignored.queueSoundEffect(var16, var5, var18); + if (ServerPacket.field854 == var1.serverPacket0) { + var37 = var3.method43(); + var6 = var3.readUnsignedByte(); + var5 = var3.method43(); + Ignored.queueSoundEffect(var37, var6, var5); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_bc == var1.serverPacket0) { - var16 = var3.__bp_331(); - var5 = var3.__br_328(); - var18 = var3.__bl_327(); - var58 = Huffman.getWidget(var16); - if(var18 != var58.rawX || var5 != var58.rawY || var58.xAlignment != 0 || var58.yAlignment != 0) { - var58.rawX = var18; - var58.rawY = var5; - var58.xAlignment = 0; - var58.yAlignment = 0; - class22.method295(var58); - this.alignWidget(var58); - if(var58.type == 0) { - class39.revalidateWidgetScroll(Widget.widgets[var16 >> 16], var58, false); + if (ServerPacket.field848 == var1.serverPacket0) { + var37 = var3.method72(); + var6 = var3.method69(); + var5 = var3.method68(); + var16 = Huffman.getWidget(var37); + if (var5 != var16.rawX || var6 != var16.rawY || var16.xAlignment != 0 || var16.yAlignment != 0) { + var16.rawX = var5; + var16.rawY = var6; + var16.xAlignment = 0; + var16.yAlignment = 0; + class22.method295(var16); + this.alignWidget(var16); + if (var16.type == 0) { + class39.revalidateWidgetScroll(Widget.widgets[var37 >> 16], var16, false); } } @@ -5432,75 +5182,75 @@ public final class Client extends GameShell implements Usernamed { return true; } - if(ServerPacket.__ge_aw == var1.serverPacket0) { - var16 = var3.__bm_326(); - var5 = var3.__bf_332(); - var41 = Huffman.getWidget(var5); - if(var41.modelType != 2 || var16 != var41.modelId) { - var41.modelType = 2; - var41.modelId = var16; - class22.method295(var41); + if (ServerPacket.field824 == var1.serverPacket0) { + var37 = var3.method67(); + var6 = var3.method73(); + var8 = Huffman.getWidget(var6); + if (var8.modelType != 2 || var37 != var8.modelId) { + var8.modelType = 2; + var8.modelId = var37; + class22.method295(var8); } var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_ao == var1.serverPacket0) { - World var40 = new World(); - var40.host = var3.readStringCp1252NullTerminated(); - var40.id = var3.__ag_302(); - var5 = var3.readInt(); - var40.properties = var5; + if (ServerPacket.field836 == var1.serverPacket0) { + World var43 = new World(); + var43.host = var3.readStringCp1252NullTerminated(); + var43.id = var3.method43(); + var6 = var3.readInt(); + var43.properties = var6; GameShell.updateGameState(45); var2.close(); var2 = null; - class31.changeWorld(var40); + class31.changeWorld(var43); var1.serverPacket0 = null; return false; } - if(ServerPacket.__ge_ay == var1.serverPacket0) { + if (ServerPacket.field821 == var1.serverPacket0) { WorldMapArea.friendSystem.ignoreList.read(var3, var1.serverPacket0Length); class229.method4512(); - __client_na = cycleCntr; + field105 = cycleCntr; var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_ah == var1.serverPacket0) { + if (ServerPacket.field822 == var1.serverPacket0) { class3.updateNpcs(false, var3); var1.serverPacket0 = null; return true; } - WidgetGroupParent var20; - if(ServerPacket.__ge_cs == var1.serverPacket0) { - var16 = var3.readInt(); - var5 = var3.readInt(); - WidgetGroupParent var42 = (WidgetGroupParent)widgetGroupParents.get((long)var5); - var20 = (WidgetGroupParent)widgetGroupParents.get((long)var16); - if(var20 != null) { - MenuAction.closeWidgetGroup(var20, var42 == null || var42.group != var20.group); + WidgetGroupParent var22; + if (ServerPacket.field871 == var1.serverPacket0) { + var37 = var3.readInt(); + var6 = var3.readInt(); + WidgetGroupParent var48 = (WidgetGroupParent)widgetGroupParents.get((long)var6); + var22 = (WidgetGroupParent)widgetGroupParents.get((long)var37); + if (var22 != null) { + MenuAction.closeWidgetGroup(var22, var48 == null || var48.group != var22.group); } - if(var42 != null) { - var42.remove(); - widgetGroupParents.put(var42, (long)var16); + if (var48 != null) { + var48.remove(); + widgetGroupParents.put(var48, (long)var37); } - var19 = Huffman.getWidget(var5); - if(var19 != null) { - class22.method295(var19); + var15 = Huffman.getWidget(var6); + if (var15 != null) { + class22.method295(var15); } - var19 = Huffman.getWidget(var16); - if(var19 != null) { - class22.method295(var19); - class39.revalidateWidgetScroll(Widget.widgets[var19.id >>> 16], var19, true); + var15 = Huffman.getWidget(var37); + if (var15 != null) { + class22.method295(var15); + class39.revalidateWidgetScroll(Widget.widgets[var15.id >>> 16], var15, true); } - if(rootWidgetGroup != -1) { + if (rootWidgetGroup != -1) { GrandExchangeEvents.method74(rootWidgetGroup, 1); } @@ -5508,67 +5258,67 @@ public final class Client extends GameShell implements Usernamed { return true; } - if(ServerPacket.__ge_p == var1.serverPacket0) { - var16 = var3.__bp_331(); - var5 = var3.__bu_325(); - var18 = var5 >> 10 & 31; - var7 = var5 >> 5 & 31; - var8 = var5 & 31; - var9 = (var7 << 11) + (var18 << 19) + (var8 << 3); - Widget var59 = Huffman.getWidget(var16); - if(var9 != var59.color) { - var59.color = var9; - class22.method295(var59); + if (ServerPacket.field813 == var1.serverPacket0) { + var37 = var3.method72(); + var6 = var3.method66(); + var5 = var6 >> 10 & 31; + var10 = var6 >> 5 & 31; + var11 = var6 & 31; + var12 = (var10 << 11) + (var5 << 19) + (var11 << 3); + Widget var47 = Huffman.getWidget(var37); + if (var12 != var47.color) { + var47.color = var12; + class22.method295(var47); } var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_at == var1.serverPacket0) { - var16 = var3.readUnsignedByte(); + if (ServerPacket.field828 == var1.serverPacket0) { + var37 = var3.readUnsignedByte(); + var6 = var3.readUnsignedByte(); var5 = var3.readUnsignedByte(); - var18 = var3.readUnsignedByte(); - var7 = var3.readUnsignedByte(); - __client_rh[var16] = true; - __client_rd[var16] = var5; - __client_rl[var16] = var18; - __client_rj[var16] = var7; - __client_rk[var16] = 0; + var10 = var3.readUnsignedByte(); + field139[var37] = true; + field141[var37] = var6; + field142[var37] = var5; + field143[var37] = var10; + field144[var37] = 0; var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_ce == var1.serverPacket0) { - __client_pl = var3.readUnsignedByteNegate(); + if (ServerPacket.field869 == var1.serverPacket0) { + field138 = var3.readUnsignedByteNegate(); publicChatMode = var3.readUnsignedByteNegate(); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_bp == var1.serverPacket0) { - rebootTimer = var3.__ag_302() * 30; - __client_ni = cycleCntr; + if (ServerPacket.field861 == var1.serverPacket0) { + rebootTimer = var3.method43() * 30; + field124 = cycleCntr; var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_v == var1.serverPacket0) { - Canvas.__ao_gk = var3.readUnsignedByteNegate(); - WorldMapSection3.__p_go = var3.readUnsignedByte(); + if (ServerPacket.field814 == var1.serverPacket0) { + Canvas.field95 = var3.readUnsignedByteNegate(); + WorldMapSection3.field1089 = var3.readUnsignedByte(); - for(var16 = WorldMapSection3.__p_go; var16 < WorldMapSection3.__p_go + 8; ++var16) { - for(var5 = Canvas.__ao_gk; var5 < Canvas.__ao_gk + 8; ++var5) { - if(groundItems[SoundSystem.plane][var16][var5] != null) { - groundItems[SoundSystem.plane][var16][var5] = null; - TilePaint.method3061(var16, var5); + for (var37 = WorldMapSection3.field1089; var37 < WorldMapSection3.field1089 + 8; ++var37) { + for (var6 = Canvas.field95; var6 < Canvas.field95 + 8; ++var6) { + if (groundItems[SoundSystem.plane][var37][var6] != null) { + groundItems[SoundSystem.plane][var37][var6] = null; + TilePaint.method3061(var37, var6); } } } - for(class68 var39 = (class68)__client_kh.last(); var39 != null; var39 = (class68)__client_kh.previous()) { - if(var39.field913 >= WorldMapSection3.__p_go && var39.field913 < WorldMapSection3.__p_go + 8 && var39.field901 >= Canvas.__ao_gk && var39.field901 < Canvas.__ao_gk + 8 && var39.field911 == SoundSystem.plane) { - var39.field910 = 0; + for (class68 var45 = (class68)field214.last(); var45 != null; var45 = (class68)field214.previous()) { + if (var45.field913 >= WorldMapSection3.field1089 && var45.field913 < WorldMapSection3.field1089 + 8 && var45.field901 >= Canvas.field95 && var45.field901 < Canvas.field95 + 8 && var45.field911 == SoundSystem.plane) { + var45.field910 = 0; } } @@ -5576,58 +5326,59 @@ public final class Client extends GameShell implements Usernamed { return true; } - if(ServerPacket.__ge_ac == var1.serverPacket0) { - var16 = var3.__bf_332(); - var5 = var3.__bm_326(); - var41 = Huffman.getWidget(var16); - if(var41.modelType != 1 || var5 != var41.modelId) { - var41.modelType = 1; - var41.modelId = var5; - class22.method295(var41); + if (ServerPacket.field820 == var1.serverPacket0) { + var37 = var3.method73(); + var6 = var3.method67(); + var8 = Huffman.getWidget(var37); + if (var8.modelType != 1 || var6 != var8.modelId) { + var8.modelType = 1; + var8.modelId = var6; + class22.method295(var8); } var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_ak == var1.serverPacket0) { - var16 = var3.readUnsignedByte(); - BufferedNetSocket.method3500(var16); + if (ServerPacket.field823 == var1.serverPacket0) { + var37 = var3.readUnsignedByte(); + BufferedNetSocket.method3500(var37); var1.serverPacket0 = null; return true; } - long var12; - long var24; - long var26; - if(ServerPacket.__ge_bs == var1.serverPacket0) { - var37 = var3.readStringCp1252NullTerminated(); - var24 = var3.readLong(); - var26 = (long)var3.__ag_302(); - var21 = (long)var3.readMedium(); - PlayerType var11 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte()); - var12 = (var26 << 32) + var21; - boolean var46 = false; + long var23; + long var25; + long var27; + PlayerType var29; + if (ServerPacket.field843 == var1.serverPacket0) { + var21 = var3.readStringCp1252NullTerminated(); + var25 = var3.readLong(); + var27 = (long)var3.method43(); + var19 = (long)var3.readMedium(); + var29 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte()); + var23 = (var27 << 32) + var19; + boolean var53 = false; - for(int var15 = 0; var15 < 100; ++var15) { - if(__client_pu[var15] == var12) { - var46 = true; + for (int var31 = 0; var31 < 100; ++var31) { + if (field152[var31] == var23) { + var53 = true; break; } } - if(var11.isUser && WorldMapArea.friendSystem.isIgnored(new Username(var37, KeyHandler.loginType))) { - var46 = true; + if (var29.isUser && WorldMapArea.friendSystem.isIgnored(new Username(var21, KeyHandler.loginType))) { + var53 = true; } - if(!var46 && __client_jc == 0) { - __client_pu[__client_pb] = var12; - __client_pb = (__client_pb + 1) % 100; - String var28 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3))); - if(var11.modIcon != -1) { - GrandExchangeEvents.addChatMessage(9, ItemContainer.method1170(var11.modIcon) + var37, var28, Clock.method3534(var24)); + if (!var53 && field208 == 0) { + field152[field156] = var23; + field156 = (field156 + 1) % 100; + String var55 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3))); + if (var29.modIcon != -1) { + GrandExchangeEvents.addChatMessage(9, ItemContainer.method1170(var29.modIcon) + var21, var55, Clock.method3534(var25)); } else { - GrandExchangeEvents.addChatMessage(9, var37, var28, Clock.method3534(var24)); + GrandExchangeEvents.addChatMessage(9, var21, var55, Clock.method3534(var25)); } } @@ -5635,64 +5386,64 @@ public final class Client extends GameShell implements Usernamed { return true; } - if(ServerPacket.__ge_as == var1.serverPacket0) { + if (ServerPacket.field831 == var1.serverPacket0) { class16.method189(class190.field2342); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_y == var1.serverPacket0) { - var16 = var3.readInt(); - var17 = var3.readStringCp1252NullTerminated(); - var41 = Huffman.getWidget(var16); - if(!var17.equals(var41.text)) { - var41.text = var17; - class22.method295(var41); + if (ServerPacket.field808 == var1.serverPacket0) { + var37 = var3.readInt(); + var4 = var3.readStringCp1252NullTerminated(); + var8 = Huffman.getWidget(var37); + if (!var4.equals(var8.text)) { + var8.text = var4; + class22.method295(var8); } var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_ai == var1.serverPacket0) { + if (ServerPacket.field840 == var1.serverPacket0) { class50.loadRegions(true, var1.packetBuffer); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_q == var1.serverPacket0) { + if (ServerPacket.field791 == var1.serverPacket0) { isCameraLocked = false; - for(var16 = 0; var16 < 5; ++var16) { - __client_rh[var16] = false; + for (var37 = 0; var37 < 5; ++var37) { + field139[var37] = false; } var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_cm == var1.serverPacket0) { + if (ServerPacket.field872 == var1.serverPacket0) { isCameraLocked = true; - GrandExchangeOffer.__x_rg = var3.readUnsignedByte(); - KeyHandler.__an_ra = var3.readUnsignedByte(); - IndexStoreAction.__ik_rt = var3.__ag_302(); - VertexNormal.__dq_rq = var3.readUnsignedByte(); - class171.__fo_ro = var3.readUnsignedByte(); - if(class171.__fo_ro >= 100) { - var16 = GrandExchangeOffer.__x_rg * 128 + 64; - var5 = KeyHandler.__an_ra * 128 + 64; - var18 = class32.getTileHeight(var16, var5, SoundSystem.plane) - IndexStoreAction.__ik_rt; - var7 = var16 - WorldMapSection1.cameraX; - var8 = var18 - GrandExchangeEvents.cameraY; - var9 = var5 - class11.cameraZ; - var10 = (int)Math.sqrt((double)(var9 * var9 + var7 * var7)); - WorldMapIcon1.cameraPitch = (int)(Math.atan2((double)var8, (double)var10) * 325.949D) & 2047; - MusicPatchNode.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047; - if(WorldMapIcon1.cameraPitch < 128) { + GrandExchangeOffer.field376 = var3.readUnsignedByte(); + KeyHandler.field445 = var3.readUnsignedByte(); + IndexStoreAction.field410 = var3.method43(); + VertexNormal.field946 = var3.readUnsignedByte(); + class171.field1116 = var3.readUnsignedByte(); + if (class171.field1116 >= 100) { + var37 = GrandExchangeOffer.field376 * 128 + 64; + var6 = KeyHandler.field445 * 128 + 64; + var5 = class32.getTileHeight(var37, var6, SoundSystem.plane) - IndexStoreAction.field410; + var10 = var37 - WorldMapSection1.cameraX; + var11 = var5 - GrandExchangeEvents.cameraY; + var12 = var6 - class11.cameraZ; + var13 = (int)Math.sqrt((double)(var12 * var12 + var10 * var10)); + WorldMapIcon1.cameraPitch = (int)(Math.atan2((double)var11, (double)var13) * 325.949D) & 2047; + MusicPatchNode.cameraYaw = (int)(Math.atan2((double)var10, (double)var12) * -325.949D) & 2047; + if (WorldMapIcon1.cameraPitch < 128) { WorldMapIcon1.cameraPitch = 128; } - if(WorldMapIcon1.cameraPitch > 383) { + if (WorldMapIcon1.cameraPitch > 383) { WorldMapIcon1.cameraPitch = 383; } } @@ -5701,22 +5452,22 @@ public final class Client extends GameShell implements Usernamed { return true; } - if(ServerPacket.__ge_bv == var1.serverPacket0) { - var16 = var3.__bf_332(); - var5 = var3.__bm_326(); - var41 = Huffman.getWidget(var16); - if(var41 != null && var41.type == 0) { - if(var5 > var41.scrollHeight - var41.height) { - var5 = var41.scrollHeight - var41.height; + if (ServerPacket.field865 == var1.serverPacket0) { + var37 = var3.method73(); + var6 = var3.method67(); + var8 = Huffman.getWidget(var37); + if (var8 != null && var8.type == 0) { + if (var6 > var8.scrollHeight - var8.height) { + var6 = var8.scrollHeight - var8.height; } - if(var5 < 0) { - var5 = 0; + if (var6 < 0) { + var6 = 0; } - if(var5 != var41.scrollY) { - var41.scrollY = var5; - class22.method295(var41); + if (var6 != var8.scrollY) { + var8.scrollY = var6; + class22.method295(var8); } } @@ -5724,17 +5475,17 @@ public final class Client extends GameShell implements Usernamed { return true; } - if(ServerPacket.__ge_au == var1.serverPacket0) { - var16 = var3.__by_324(); - Script.method2216(var16); - __client_nz[++__client_ns - 1 & 31] = var16 & 32767; + if (ServerPacket.field835 == var1.serverPacket0) { + var37 = var3.method65(); + Script.method2216(var37); + field116[++field117 - 1 & 31] = var37 & 32767; var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_bk == var1.serverPacket0) { + if (ServerPacket.field846 == var1.serverPacket0) { var3.index += 28; - if(var3.__ax_313()) { + if (var3.method54()) { class234.method4535(var3, var3.index - 28); } @@ -5742,135 +5493,135 @@ public final class Client extends GameShell implements Usernamed { return true; } - if(ServerPacket.__ge_c == var1.serverPacket0) { + if (ServerPacket.field811 == var1.serverPacket0) { class12.method159(); - var16 = var3.__bt_330(); - var5 = var3.readUnsignedByteNegate(); - var18 = var3.readUnsignedByte(); - experience[var5] = var16; - currentLevels[var5] = var18; - levels[var5] = 1; + var37 = var3.method71(); + var6 = var3.readUnsignedByteNegate(); + var5 = var3.readUnsignedByte(); + experience[var6] = var37; + currentLevels[var6] = var5; + levels[var6] = 1; - for(var7 = 0; var7 < 98; ++var7) { - if(var16 >= Skills.Skills_experienceTable[var7]) { - levels[var5] = var7 + 2; + for (var10 = 0; var10 < 98; ++var10) { + if (var37 >= Skills.Skills_experienceTable[var10]) { + levels[var6] = var10 + 2; } } - changedSkills[++changedSkillsCount - 1 & 31] = var5; + changedSkills[++changedSkillsCount - 1 & 31] = var6; var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_bz == var1.serverPacket0) { - var16 = var3.readInt(); - var5 = var3.readInt(); - var18 = DynamicObject.method2222(); - PacketBufferNode var57 = Interpreter.method1915(ClientPacket.__gs_k, packetWriter.isaacCipher); - var57.packetBuffer.__ai_315(var18); - var57.packetBuffer.writeByte(GameShell.fps); - var57.packetBuffer.writeIntME(var16); - var57.packetBuffer.writeIntLE(var5); - packetWriter.__q_167(var57); + if (ServerPacket.field858 == var1.serverPacket0) { + var37 = var3.readInt(); + var6 = var3.readInt(); + var5 = DynamicObject.method2222(); + PacketBufferNode var56 = Interpreter.method1915(ClientPacket.field233, packetWriter.isaacCipher); + var56.packetBuffer.method56(var5); + var56.packetBuffer.writeByte(GameShell.fps); + var56.packetBuffer.writeIntME(var37); + var56.packetBuffer.writeIntLE(var6); + packetWriter.method241(var56); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_bt == var1.serverPacket0) { + if (ServerPacket.field860 == var1.serverPacket0) { class12.method159(); - weight = var3.__aq_303(); - __client_ni = cycleCntr; + weight = var3.method44(); + field124 = cycleCntr; var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_aq == var1.serverPacket0) { - var55 = var3.readUnsignedByte() == 1; - if(var55) { - class15.__z_si = class203.currentTimeMs() - var3.readLong(); + if (ServerPacket.field816 == var1.serverPacket0) { + var18 = var3.readUnsignedByte() == 1; + if (var18) { + class15.field1113 = class203.currentTimeMs() - var3.readLong(); FloorDecoration.grandExchangeEvents = new GrandExchangeEvents(var3, true); } else { FloorDecoration.grandExchangeEvents = null; } - __client_nc = cycleCntr; + field154 = cycleCntr; var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_av == var1.serverPacket0) { - WorldMapArea.friendSystem.__f_152(); - __client_na = cycleCntr; + if (ServerPacket.field818 == var1.serverPacket0) { + WorldMapArea.friendSystem.method100(); + field105 = cycleCntr; var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_t == var1.serverPacket0) { - byte[] var38 = new byte[var1.serverPacket0Length]; - var3.__jb_335(var38, 0, var38.length); - Buffer var49 = new Buffer(var38); - var6 = var49.readStringCp1252NullTerminated(); - WorldMapCacheName.method635(var6, true, false); + if (ServerPacket.field807 == var1.serverPacket0) { + byte[] var54 = new byte[var1.serverPacket0Length]; + var3.method237(var54, 0, var54.length); + Buffer var52 = new Buffer(var54); + var17 = var52.readStringCp1252NullTerminated(); + WorldMapCacheName.method635(var17, true, false); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_k == var1.serverPacket0) { + if (ServerPacket.field800 == var1.serverPacket0) { class16.method189(class190.field2352); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_bn == var1.serverPacket0) { - var16 = var3.index + var1.serverPacket0Length; - var5 = var3.__ag_302(); - var18 = var3.__ag_302(); - if(var5 != rootWidgetGroup) { - rootWidgetGroup = var5; - this.__iu_141(false); + WidgetGroupParent var50; + if (ServerPacket.field845 == var1.serverPacket0) { + var37 = var3.index + var1.serverPacket0Length; + var6 = var3.method43(); + var5 = var3.method43(); + if (var6 != rootWidgetGroup) { + rootWidgetGroup = var6; + this.method87(false); DevicePcmPlayerProvider.method845(rootWidgetGroup); WorldMapSection3.runWidgetOnLoadListener(rootWidgetGroup); - for(var7 = 0; var7 < 100; ++var7) { - __client_od[var7] = true; + for (var10 = 0; var10 < 100; ++var10) { + field100[var10] = true; } } - WidgetGroupParent var23; - for(; var18-- > 0; var23.keep = true) { - var7 = var3.readInt(); - var8 = var3.__ag_302(); - var9 = var3.readUnsignedByte(); - var23 = (WidgetGroupParent)widgetGroupParents.get((long)var7); - if(var23 != null && var8 != var23.group) { - MenuAction.closeWidgetGroup(var23, true); - var23 = null; + for (; var5-- > 0; var50.keep = true) { + var10 = var3.readInt(); + var11 = var3.method43(); + var12 = var3.readUnsignedByte(); + var50 = (WidgetGroupParent)widgetGroupParents.get((long)var10); + if (var50 != null && var11 != var50.group) { + MenuAction.closeWidgetGroup(var50, true); + var50 = null; } - if(var23 == null) { - var23 = SecureRandomCallable.method1143(var7, var8, var9); + if (var50 == null) { + var50 = SecureRandomCallable.method1143(var10, var11, var12); } } - for(var20 = (WidgetGroupParent)widgetGroupParents.first(); var20 != null; var20 = (WidgetGroupParent)widgetGroupParents.next()) { - if(var20.keep) { - var20.keep = false; + for (var22 = (WidgetGroupParent)widgetGroupParents.first(); var22 != null; var22 = (WidgetGroupParent)widgetGroupParents.next()) { + if (var22.keep) { + var22.keep = false; } else { - MenuAction.closeWidgetGroup(var20, true); + MenuAction.closeWidgetGroup(var22, true); } } widgetClickMasks = new NodeHashTable(512); - while(var3.index < var16) { - var7 = var3.readInt(); - var8 = var3.__ag_302(); - var9 = var3.__ag_302(); + while (var3.index < var37) { var10 = var3.readInt(); + var11 = var3.method43(); + var12 = var3.method43(); + var13 = var3.readInt(); - for(int var29 = var8; var29 <= var9; ++var29) { - var12 = (long)var29 + ((long)var7 << 32); - widgetClickMasks.put(new IntegerNode(var10), var12); + for (int var51 = var11; var51 <= var12; ++var51) { + var23 = (long)var51 + ((long)var10 << 32); + widgetClickMasks.put(new IntegerNode(var13), var23); } } @@ -5878,34 +5629,34 @@ public final class Client extends GameShell implements Usernamed { return true; } - if(ServerPacket.__ge_br == var1.serverPacket0) { - var16 = var3.__bb_317(); - var5 = var3.__bb_317(); - var6 = var3.readStringCp1252NullTerminated(); - if(var5 >= 1 && var5 <= 8) { - if(var6.equalsIgnoreCase("null")) { - var6 = null; + if (ServerPacket.field855 == var1.serverPacket0) { + var37 = var3.method58(); + var6 = var3.method58(); + var17 = var3.readStringCp1252NullTerminated(); + if (var6 >= 1 && var6 <= 8) { + if (var17.equalsIgnoreCase("null")) { + var17 = null; } - playerMenuActions[var5 - 1] = var6; - playerOptionsPriorities[var5 - 1] = var16 == 0; + playerMenuActions[var6 - 1] = var17; + playerOptionsPriorities[var6 - 1] = var37 == 0; } var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_ab == var1.serverPacket0) { + if (ServerPacket.field826 == var1.serverPacket0) { Clock.method3533(var3.readStringCp1252NullTerminated()); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_am == var1.serverPacket0) { - if(var1.serverPacket0Length == 0) { + if (ServerPacket.field832 == var1.serverPacket0) { + if (var1.serverPacket0Length == 0) { PacketWriter.clanChat = null; } else { - if(PacketWriter.clanChat == null) { + if (PacketWriter.clanChat == null) { PacketWriter.clanChat = new ClanChat(KeyHandler.loginType, TextureProvider.client); } @@ -5917,48 +5668,48 @@ public final class Client extends GameShell implements Usernamed { return true; } - if(ServerPacket.__ge_o == var1.serverPacket0) { - var16 = var3.__ag_302(); - var5 = var3.readInt(); - Varps.Varps_temp[var16] = var5; - if(Varps.Varps_main[var16] != var5) { - Varps.Varps_main[var16] = var5; + if (ServerPacket.field793 == var1.serverPacket0) { + var37 = var3.method43(); + var6 = var3.readInt(); + Varps.Varps_temp[var37] = var6; + if (Varps.Varps_main[var37] != var6) { + Varps.Varps_main[var37] = var6; } - IndexCache.method4703(var16); - __client_nr[++__client_nd - 1 & 31] = var16; + IndexCache.method4703(var37); + field121[++field123 - 1 & 31] = var37; var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_g == var1.serverPacket0) { + if (ServerPacket.field795 == var1.serverPacket0) { class16.method189(class190.field2349); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_x == var1.serverPacket0) { - var16 = var3.readInt(); - WidgetGroupParent var48 = (WidgetGroupParent)widgetGroupParents.get((long)var16); - if(var48 != null) { - MenuAction.closeWidgetGroup(var48, true); + if (ServerPacket.field798 == var1.serverPacket0) { + var37 = var3.readInt(); + var50 = (WidgetGroupParent)widgetGroupParents.get((long)var37); + if (var50 != null) { + MenuAction.closeWidgetGroup(var50, true); } - if(__client_mo != null) { - class22.method295(__client_mo); - __client_mo = null; + if (field127 != null) { + class22.method295(field127); + field127 = null; } var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_bf == var1.serverPacket0) { - for(var16 = 0; var16 < Varps.Varps_main.length; ++var16) { - if(Varps.Varps_temp[var16] != Varps.Varps_main[var16]) { - Varps.Varps_main[var16] = Varps.Varps_temp[var16]; - IndexCache.method4703(var16); - __client_nr[++__client_nd - 1 & 31] = var16; + if (ServerPacket.field862 == var1.serverPacket0) { + for (var37 = 0; var37 < Varps.Varps_main.length; ++var37) { + if (Varps.Varps_temp[var37] != Varps.Varps_main[var37]) { + Varps.Varps_main[var37] = Varps.Varps_temp[var37]; + IndexCache.method4703(var37); + field121[++field123 - 1 & 31] = var37; } } @@ -5966,84 +5717,84 @@ public final class Client extends GameShell implements Usernamed { return true; } - if(ServerPacket.__ge_bd == var1.serverPacket0) { - WorldMapArea.friendSystem.__q_153(var3, var1.serverPacket0Length); - __client_na = cycleCntr; + if (ServerPacket.field847 == var1.serverPacket0) { + WorldMapArea.friendSystem.method101(var3, var1.serverPacket0Length); + field105 = cycleCntr; var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_r == var1.serverPacket0) { - var16 = var3.__bm_326(); - if(var16 == 65535) { - var16 = -1; + if (ServerPacket.field812 == var1.serverPacket0) { + var37 = var3.method67(); + if (var37 == 65535) { + var37 = -1; } - AbstractUserComparator.method5437(var16); + AbstractUserComparator.method5437(var37); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_ad == var1.serverPacket0) { - var16 = var3.__bj_329(); - var5 = var3.__bu_325(); - if(var5 == 65535) { - var5 = -1; + if (ServerPacket.field829 == var1.serverPacket0) { + var37 = var3.method70(); + var6 = var3.method66(); + if (var6 == 65535) { + var6 = -1; } - HealthBar.method1994(var5, var16); + HealthBar.method1994(var6, var37); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_bw == var1.serverPacket0) { - var16 = var3.__bb_317(); - var5 = var3.__bp_331(); - var18 = var3.__bm_326(); - var20 = (WidgetGroupParent)widgetGroupParents.get((long)var5); - if(var20 != null) { - MenuAction.closeWidgetGroup(var20, var18 != var20.group); + if (ServerPacket.field866 == var1.serverPacket0) { + var37 = var3.method58(); + var6 = var3.method72(); + var5 = var3.method67(); + var22 = (WidgetGroupParent)widgetGroupParents.get((long)var6); + if (var22 != null) { + MenuAction.closeWidgetGroup(var22, var5 != var22.group); } - SecureRandomCallable.method1143(var5, var18, var16); + SecureRandomCallable.method1143(var6, var5, var37); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_d == var1.serverPacket0) { - var37 = var3.readStringCp1252NullTerminated(); - var24 = (long)var3.__ag_302(); - var26 = (long)var3.readMedium(); - PlayerType var30 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte()); - long var31 = (var24 << 32) + var26; - boolean var33 = false; + if (ServerPacket.field799 == var1.serverPacket0) { + var21 = var3.readStringCp1252NullTerminated(); + var25 = (long)var3.method43(); + var27 = (long)var3.readMedium(); + var29 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte()); + long var30 = (var25 << 32) + var27; + boolean var32 = false; - for(int var13 = 0; var13 < 100; ++var13) { - if(var31 == __client_pu[var13]) { - var33 = true; + for (int var33 = 0; var33 < 100; ++var33) { + if (var30 == field152[var33]) { + var32 = true; break; } } - if(WorldMapArea.friendSystem.isIgnored(new Username(var37, KeyHandler.loginType))) { - var33 = true; + if (WorldMapArea.friendSystem.isIgnored(new Username(var21, KeyHandler.loginType))) { + var32 = true; } - if(!var33 && __client_jc == 0) { - __client_pu[__client_pb] = var31; - __client_pb = (__client_pb + 1) % 100; - String var34 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3))); - byte var14; - if(var30.isPrivileged) { - var14 = 7; + if (!var32 && field208 == 0) { + field152[field156] = var30; + field156 = (field156 + 1) % 100; + String var57 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3))); + byte var34; + if (var29.isPrivileged) { + var34 = 7; } else { - var14 = 3; + var34 = 3; } - if(var30.modIcon != -1) { - WorldMapIcon1.method219(var14, ItemContainer.method1170(var30.modIcon) + var37, var34); + if (var29.modIcon != -1) { + WorldMapIcon1.method219(var34, ItemContainer.method1170(var29.modIcon) + var21, var57); } else { - WorldMapIcon1.method219(var14, var37, var34); + WorldMapIcon1.method219(var34, var21, var57); } } @@ -6051,10 +5802,10 @@ public final class Client extends GameShell implements Usernamed { return true; } - if(ServerPacket.__ge_u == var1.serverPacket0) { - var16 = var3.readInt(); - if(var16 != __client_il) { - __client_il = var16; + if (ServerPacket.field794 == var1.serverPacket0) { + var37 = var3.readInt(); + if (var37 != field198) { + field198 = var37; WorldMapArea.method428(); } @@ -6062,32 +5813,32 @@ public final class Client extends GameShell implements Usernamed { return true; } - if(ServerPacket.__ge_bh == var1.serverPacket0) { + if (ServerPacket.field863 == var1.serverPacket0) { minimapState = var3.readUnsignedByte(); var1.serverPacket0 = null; return true; } - if(ServerPacket.__ge_ae == var1.serverPacket0) { - var37 = var3.readStringCp1252NullTerminated(); - var17 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3))); - WorldMapIcon1.method219(6, var37, var17); + if (ServerPacket.field827 == var1.serverPacket0) { + var21 = var3.readStringCp1252NullTerminated(); + var4 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3))); + WorldMapIcon1.method219(6, var21, var4); var1.serverPacket0 = null; return true; } - NpcDefinition.sendStackTrace("" + (var1.serverPacket0 != null?var1.serverPacket0.id:-1) + "," + (var1.__n != null?var1.__n.id:-1) + "," + (var1.__i != null?var1.__i.id:-1) + "," + var1.serverPacket0Length, (Throwable)null); + NPCDefinition.sendStackTrace("" + (var1.serverPacket0 != null ? var1.serverPacket0.id : -1) + "," + (var1.field677 != null ? var1.field677.id : -1) + "," + (var1.field678 != null ? var1.field678.id : -1) + "," + var1.serverPacket0Length, (Throwable)null); TextureProvider.method2773(); } catch (IOException var35) { class48.method868(); } catch (Exception var36) { - var17 = "" + (var1.serverPacket0 != null?var1.serverPacket0.id:-1) + "," + (var1.__n != null?var1.__n.id:-1) + "," + (var1.__i != null?var1.__i.id:-1) + "," + var1.serverPacket0Length + "," + (Canvas.localPlayer.pathX[0] + class50.baseX) + "," + (Canvas.localPlayer.pathY[0] + GraphicsObject.baseY) + ","; + var4 = "" + (var1.serverPacket0 != null ? var1.serverPacket0.id : -1) + "," + (var1.field677 != null ? var1.field677.id : -1) + "," + (var1.field678 != null ? var1.field678.id : -1) + "," + var1.serverPacket0Length + "," + (Canvas.localPlayer.pathX[0] + class50.baseX) + "," + (Canvas.localPlayer.pathY[0] + GraphicsObject.baseY) + ","; - for(var18 = 0; var18 < var1.serverPacket0Length && var18 < 50; ++var18) { - var17 = var17 + var3.array[var18] + ","; + for (var5 = 0; var5 < var1.serverPacket0Length && var5 < 50; ++var5) { + var4 = var4 + var3.array[var5] + ","; } - NpcDefinition.sendStackTrace(var17, var36); + NPCDefinition.sendStackTrace(var4, var36); TextureProvider.method2773(); } @@ -6100,34 +5851,34 @@ public final class Client extends GameShell implements Usernamed { signature = "(I)V", garbageValue = "-387903382" ) - final void __hi_139() { + final void method86() { boolean var1 = false; int var2; - int var5; - while(!var1) { + int var3; + while (!var1) { var1 = true; - for(var2 = 0; var2 < menuOptionsCount - 1; ++var2) { - if(menuOpcodes[var2] < 1000 && menuOpcodes[var2 + 1] > 1000) { - String var3 = menuTargetNames[var2]; + for (var2 = 0; var2 < menuOptionsCount - 1; ++var2) { + if (menuOpcodes[var2] < 1000 && menuOpcodes[var2 + 1] > 1000) { + String var4 = menuTargetNames[var2]; menuTargetNames[var2] = menuTargetNames[var2 + 1]; - menuTargetNames[var2 + 1] = var3; - String var4 = menuActions[var2]; + menuTargetNames[var2 + 1] = var4; + String var5 = menuActions[var2]; menuActions[var2] = menuActions[var2 + 1]; - menuActions[var2 + 1] = var4; - var5 = menuOpcodes[var2]; + menuActions[var2 + 1] = var5; + var3 = menuOpcodes[var2]; menuOpcodes[var2] = menuOpcodes[var2 + 1]; - menuOpcodes[var2 + 1] = var5; - var5 = menuArguments1[var2]; + menuOpcodes[var2 + 1] = var3; + var3 = menuArguments1[var2]; menuArguments1[var2] = menuArguments1[var2 + 1]; - menuArguments1[var2 + 1] = var5; - var5 = menuArguments2[var2]; + menuArguments1[var2 + 1] = var3; + var3 = menuArguments2[var2]; menuArguments2[var2] = menuArguments2[var2 + 1]; - menuArguments2[var2 + 1] = var5; - var5 = menuArguments0[var2]; + menuArguments2[var2 + 1] = var3; + var3 = menuArguments0[var2]; menuArguments0[var2] = menuArguments0[var2 + 1]; - menuArguments0[var2 + 1] = var5; + menuArguments0[var2 + 1] = var3; boolean var6 = menuShiftClick[var2]; menuShiftClick[var2] = menuShiftClick[var2 + 1]; menuShiftClick[var2 + 1] = var6; @@ -6136,111 +5887,107 @@ public final class Client extends GameShell implements Usernamed { } } - if(DevicePcmPlayerProvider.dragInventoryWidget == null) { - if(clickedWidget == null) { - int var16; - label279: { - int var15 = MouseHandler.MouseHandler_lastButton; - int var9; - int var13; - if(isMenuOpen) { - int var12; - 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) { - isMenuOpen = false; - Players.method2112(class25.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight); - } - } + if (DevicePcmPlayerProvider.dragInventoryWidget == null && clickedWidget == null) { + int var12 = MouseHandler.MouseHandler_lastButton; + int var7; + int var11; + int var13; + if (isMenuOpen) { + int var14; + if (var12 != 1 && (AbstractRasterProvider.mouseCam || var12 != 4)) { + var2 = MouseHandler.MouseHandler_x; + var14 = MouseHandler.MouseHandler_y; + if (var2 < class25.menuX - 10 || var2 > class25.menuX + class214.menuWidth + 10 || var14 < GameShell.menuY - 10 || var14 > AbstractWorldMapIcon.menuHeight + GameShell.menuY + 10) { + isMenuOpen = false; + Players.method2112(class25.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight); + } + } - if(var15 == 1 || !AbstractRasterProvider.mouseCam && var15 == 4) { - var2 = class25.menuX; - var12 = GameShell.menuY; - var13 = class214.menuWidth; - var5 = MouseHandler.MouseHandler_lastPressedX; - var16 = MouseHandler.MouseHandler_lastPressedY; - int var7 = -1; + if (var12 == 1 || !AbstractRasterProvider.mouseCam && var12 == 4) { + var2 = class25.menuX; + var14 = GameShell.menuY; + var7 = class214.menuWidth; + var3 = MouseHandler.MouseHandler_lastPressedX; + var11 = MouseHandler.MouseHandler_lastPressedY; + int var15 = -1; - for(int var17 = 0; var17 < menuOptionsCount; ++var17) { - var9 = (menuOptionsCount - 1 - var17) * 15 + var12 + 31; - if(var5 > var2 && var5 < var13 + var2 && var16 > var9 - 13 && var16 < var9 + 3) { - var7 = var17; - } - } - - if(var7 != -1) { - WorldMapSection0.method245(var7); - } - - isMenuOpen = false; - Players.method2112(class25.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight); - } - } else { - var2 = menuOptionsCount - 1; - 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]; - var16 = menuArguments2[var2]; - Widget var14 = Huffman.getWidget(var16); - var9 = class1.getWidgetClickMask(var14); - boolean var8 = (var9 >> 28 & 1) != 0; - if(var8) { - break label279; - } - - Object var10000 = null; - if(class168.method3461(class1.getWidgetClickMask(var14))) { - break label279; - } - } - } - - if((var15 == 1 || !AbstractRasterProvider.mouseCam && var15 == 4) && this.shouldLeftClickOpenMenu()) { - var15 = 2; - } - - if((var15 == 1 || !AbstractRasterProvider.mouseCam && var15 == 4) && menuOptionsCount > 0) { - WorldMapSection0.method245(var2); - } - - if(var15 == 2 && menuOptionsCount > 0) { - this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + for (int var16 = 0; var16 < menuOptionsCount; ++var16) { + var13 = (menuOptionsCount - 1 - var16) * 15 + var14 + 31; + if (var3 > var2 && var3 < var7 + var2 && var11 > var13 - 13 && var11 < var13 + 3) { + var15 = var16; } } - return; + if (var15 != -1) { + WorldMapSection0.method245(var15); + } + + isMenuOpen = false; + Players.method2112(class25.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight); + } + } else { + var2 = menuOptionsCount - 1; + if ((var12 == 1 || !AbstractRasterProvider.mouseCam && var12 == 4) && var2 >= 0) { + var7 = menuOpcodes[var2]; + if (var7 == 39 || var7 == 40 || var7 == 41 || var7 == 42 || var7 == 43 || var7 == 33 || var7 == 34 || var7 == 35 || var7 == 36 || var7 == 37 || var7 == 38 || var7 == 1005) { + label223: { + var3 = menuArguments1[var2]; + var11 = menuArguments2[var2]; + Widget var8 = Huffman.getWidget(var11); + var13 = class1.getWidgetClickMask(var8); + boolean var9 = (var13 >> 28 & 1) != 0; + if (!var9) { + Object var10 = null; + if (!class168.method3461(class1.getWidgetClickMask(var8))) { + break label223; + } + } + + if (DevicePcmPlayerProvider.dragInventoryWidget != null && !field207 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { + var12 = field205; + var13 = field206; + class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var12, var13); + UnitPriceComparator.tempMenuAction = null; + } + + field207 = false; + itemDragDuration = 0; + if (DevicePcmPlayerProvider.dragInventoryWidget != null) { + class22.method295(DevicePcmPlayerProvider.dragInventoryWidget); + } + + DevicePcmPlayerProvider.dragInventoryWidget = Huffman.getWidget(var11); + dragItemSlotSource = var3; + field205 = MouseHandler.MouseHandler_lastPressedX; + field206 = MouseHandler.MouseHandler_lastPressedY; + if (var2 >= 0) { + UnitPriceComparator.tempMenuAction = new MenuAction(); + UnitPriceComparator.tempMenuAction.argument1 = menuArguments1[var2]; + UnitPriceComparator.tempMenuAction.argument2 = menuArguments2[var2]; + UnitPriceComparator.tempMenuAction.opcode = menuOpcodes[var2]; + UnitPriceComparator.tempMenuAction.argument0 = menuArguments0[var2]; + UnitPriceComparator.tempMenuAction.action = menuActions[var2]; + } + + class22.method295(DevicePcmPlayerProvider.dragInventoryWidget); + return; + } + } } - if(DevicePcmPlayerProvider.dragInventoryWidget != null && !__client_jl && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { - int var10 = __client_ja; - int var11 = __client_je; - class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var10, var11); - UnitPriceComparator.tempMenuAction = null; + if ((var12 == 1 || !AbstractRasterProvider.mouseCam && var12 == 4) && this.shouldLeftClickOpenMenu()) { + var12 = 2; } - __client_jl = false; - itemDragDuration = 0; - if(DevicePcmPlayerProvider.dragInventoryWidget != null) { - class22.method295(DevicePcmPlayerProvider.dragInventoryWidget); + if ((var12 == 1 || !AbstractRasterProvider.mouseCam && var12 == 4) && menuOptionsCount > 0) { + WorldMapSection0.method245(var2); } - DevicePcmPlayerProvider.dragInventoryWidget = Huffman.getWidget(var16); - dragItemSlotSource = var5; - __client_ja = MouseHandler.MouseHandler_lastPressedX; - __client_je = MouseHandler.MouseHandler_lastPressedY; - if(var2 >= 0) { - UnitPriceComparator.tempMenuAction = new MenuAction(); - UnitPriceComparator.tempMenuAction.argument1 = menuArguments1[var2]; - UnitPriceComparator.tempMenuAction.argument2 = menuArguments2[var2]; - UnitPriceComparator.tempMenuAction.opcode = menuOpcodes[var2]; - UnitPriceComparator.tempMenuAction.argument0 = menuArguments0[var2]; - UnitPriceComparator.tempMenuAction.action = menuActions[var2]; + if (var12 == 2 && menuOptionsCount > 0) { + this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } - - class22.method295(DevicePcmPlayerProvider.dragInventoryWidget); } + } } @@ -6252,7 +5999,7 @@ public final class Client extends GameShell implements Usernamed { @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { int var1 = menuOptionsCount - 1; - return (__client_ku == 1 && menuOptionsCount > 2 || UserComparator7.method3364(var1)) && !menuShiftClick[var1]; + return (field215 == 1 && menuOptionsCount > 2 || UserComparator7.method3364(var1)) && !menuShiftClick[var1]; } @ObfuscatedName("hj") @@ -6265,19 +6012,19 @@ public final class Client extends GameShell implements Usernamed { int var3 = class2.fontBold12.stringWidth("Choose Option"); int var4; - for(var4 = 0; var4 < menuOptionsCount; ++var4) { + for (var4 = 0; var4 < menuOptionsCount; ++var4) { Font var5 = class2.fontBold12; String var6; - if(var4 < 0) { + if (var4 < 0) { var6 = ""; - } else if(menuTargetNames[var4].length() > 0) { + } else if (menuTargetNames[var4].length() > 0) { var6 = menuActions[var4] + " " + menuTargetNames[var4]; } else { var6 = menuActions[var4]; } int var7 = var5.stringWidth(var6); - if(var7 > var3) { + if (var7 > var3) { var3 = var7; } } @@ -6285,20 +6032,20 @@ public final class Client extends GameShell implements Usernamed { var3 += 8; var4 = menuOptionsCount * 15 + 22; int var8 = var1 - var3 / 2; - if(var3 + var8 > SoundCache.canvasWidth) { + if (var3 + var8 > SoundCache.canvasWidth) { var8 = SoundCache.canvasWidth - var3; } - if(var8 < 0) { + if (var8 < 0) { var8 = 0; } int var9 = var2; - if(var4 + var2 > Huffman.canvasHeight) { + if (var4 + var2 > Huffman.canvasHeight) { var9 = Huffman.canvasHeight - var4; } - if(var9 < 0) { + if (var9 < 0) { var9 = 0; } @@ -6315,11 +6062,11 @@ public final class Client extends GameShell implements Usernamed { signature = "(ZI)V", garbageValue = "-271438207" ) - final void __iu_141(boolean var1) { + final void method87(boolean var1) { int var2 = rootWidgetGroup; int var3 = SoundCache.canvasWidth; int var4 = Huffman.canvasHeight; - if(GroundItemPile.loadWidgetGroup(var2)) { + if (GroundItemPile.loadWidgetGroup(var2)) { WorldMapRegion.notRevalidateWidgetScroll(Widget.widgets[var2], -1, var3, var4, var1); } @@ -6332,10 +6079,10 @@ public final class Client extends GameShell implements Usernamed { ) @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1?null:Huffman.getWidget(var1.parentId); + Widget var2 = var1.parentId == -1 ? null : Huffman.getWidget(var1.parentId); int var3; int var4; - if(var2 == null) { + if (var2 == null) { var3 = SoundCache.canvasWidth; var4 = Huffman.canvasHeight; } else { @@ -6352,41 +6099,41 @@ public final class Client extends GameShell implements Usernamed { signature = "(I)V", garbageValue = "715978124" ) - final void __jh_142() { + final void method88() { class22.method295(clickedWidget); ++MouseRecorder.widgetDragDuration; - if(__client_nt && __client_nn) { + if (field103 && field106) { int var1 = MouseHandler.MouseHandler_x; int var2 = MouseHandler.MouseHandler_y; var1 -= widgetClickX; var2 -= widgetClickY; - if(var1 < __client_nw) { - var1 = __client_nw; + if (var1 < field108) { + var1 = field108; } - if(var1 + clickedWidget.width > __client_nw + clickedWidgetParent.width) { - var1 = __client_nw + clickedWidgetParent.width - clickedWidget.width; + if (var1 + clickedWidget.width > field108 + clickedWidgetParent.width) { + var1 = field108 + clickedWidgetParent.width - clickedWidget.width; } - if(var2 < __client_nl) { - var2 = __client_nl; + if (var2 < field109) { + var2 = field109; } - if(var2 + clickedWidget.height > __client_nl + clickedWidgetParent.height) { - var2 = __client_nl + clickedWidgetParent.height - clickedWidget.height; + if (var2 + clickedWidget.height > field109 + clickedWidgetParent.height) { + var2 = field109 + clickedWidgetParent.height - clickedWidget.height; } - int var3 = var1 - __client_nk; - int var4 = var2 - __client_np; + int var3 = var1 - field110; + int var4 = var2 - field111; int var5 = clickedWidget.dragZoneSize; - if(MouseRecorder.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { + if (MouseRecorder.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { isDraggingWidget = true; } - int var6 = var1 - __client_nw + clickedWidgetParent.scrollX; - int var7 = var2 - __client_nl + clickedWidgetParent.scrollY; + int var6 = var1 - field108 + clickedWidgetParent.scrollX; + int var7 = var2 - field109 + clickedWidgetParent.scrollY; ScriptEvent var8; - if(clickedWidget.onDrag != null && isDraggingWidget) { + if (clickedWidget.onDrag != null && isDraggingWidget) { var8 = new ScriptEvent(); var8.widget = clickedWidget; var8.mouseX = var6; @@ -6395,9 +6142,10 @@ public final class Client extends GameShell implements Usernamed { AbstractIndexCache.runScript(var8); } - if(MouseHandler.MouseHandler_currentButton == 0) { - if(isDraggingWidget) { - if(clickedWidget.onDragComplete != null) { + if (MouseHandler.MouseHandler_currentButton == 0) { + int var10; + if (isDraggingWidget) { + if (clickedWidget.onDragComplete != null) { var8 = new ScriptEvent(); var8.widget = clickedWidget; var8.mouseX = var6; @@ -6407,60 +6155,52 @@ public final class Client extends GameShell implements Usernamed { AbstractIndexCache.runScript(var8); } - if(draggedOnWidget != null) { - Widget var9 = clickedWidget; - int var10 = WorldMapRegion.method568(class1.getWidgetClickMask(var9)); - Widget var15; - if(var10 == 0) { - var15 = null; + if (draggedOnWidget != null) { + Widget var13 = clickedWidget; + var10 = WorldMapRegion.method568(class1.getWidgetClickMask(var13)); + Widget var11; + if (var10 == 0) { + var11 = null; } else { - int var11 = 0; - - while(true) { - if(var11 >= var10) { - var15 = var9; - break; + label100: { + for (int var12 = 0; var12 < var10; ++var12) { + var13 = Huffman.getWidget(var13.parentId); + if (var13 == null) { + var11 = null; + break label100; + } } - var9 = Huffman.getWidget(var9.parentId); - if(var9 == null) { - var15 = null; - break; - } - - ++var11; + var11 = var13; } } - if(var15 != null) { - PacketBufferNode var12 = Interpreter.method1915(ClientPacket.__gs_bk, packetWriter.isaacCipher); - var12.packetBuffer.__bo_322(clickedWidget.childIndex); - var12.packetBuffer.__bo_322(draggedOnWidget.itemId); - var12.packetBuffer.writeShort(draggedOnWidget.childIndex); - var12.packetBuffer.writeIntLE(clickedWidget.id); - var12.packetBuffer.writeIntME(draggedOnWidget.id); - var12.packetBuffer.writeShort(clickedWidget.itemId); - packetWriter.__q_167(var12); + if (var11 != null) { + PacketBufferNode var14 = Interpreter.method1915(ClientPacket.field279, packetWriter.isaacCipher); + var14.packetBuffer.method63(clickedWidget.childIndex); + var14.packetBuffer.method63(draggedOnWidget.itemId); + var14.packetBuffer.writeShort(draggedOnWidget.childIndex); + var14.packetBuffer.writeIntLE(clickedWidget.id); + var14.packetBuffer.writeIntME(draggedOnWidget.id); + var14.packetBuffer.writeShort(clickedWidget.itemId); + packetWriter.method241(var14); } } - } else if(this.shouldLeftClickOpenMenu()) { - this.openMenu(__client_nk + widgetClickX, __client_np + widgetClickY); - } else if(menuOptionsCount > 0) { - int var13 = widgetClickX + __client_nk; - int var14 = widgetClickY + __client_np; - class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var13, var14); + } else if (this.shouldLeftClickOpenMenu()) { + this.openMenu(field110 + widgetClickX, field111 + widgetClickY); + } else if (menuOptionsCount > 0) { + int var9 = widgetClickX + field110; + var10 = widgetClickY + field111; + class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var9, var10); UnitPriceComparator.tempMenuAction = null; } clickedWidget = null; } - - } else { - if(MouseRecorder.widgetDragDuration > 1) { - clickedWidget = null; - } - + } else if (MouseRecorder.widgetDragDuration > 1) { + clickedWidget = null; } + } @ObfuscatedName("kr") @@ -6470,7 +6210,7 @@ public final class Client extends GameShell implements Usernamed { ) @Export("username") public Username username() { - return Canvas.localPlayer != null?Canvas.localPlayer.username:null; + return Canvas.localPlayer != null ? Canvas.localPlayer.username : null; } @ObfuscatedName("l") @@ -6483,7 +6223,7 @@ public final class Client extends GameShell implements Usernamed { int var1 = var0.length(); int var2 = 0; - for(int var3 = 0; var3 < var1; ++var3) { + for (int var3 = 0; var3 < var1; ++var3) { var2 = (var2 << 5) - var2 + HealthBar.charToByteCp1252(var0.charAt(var3)); } @@ -6498,4 +6238,282 @@ public final class Client extends GameShell implements Usernamed { public static int method1692(String var0) { return var0.length() + 2; } + + static { + field161 = true; + worldId = 1; + worldProperties = 0; + gameBuild = 0; + isMembersWorld = false; + isLowDetail = false; + language = 0; + clientType = -1; + field162 = false; + gameState = 0; + isLoading = true; + cycle = 0; + mouseLastLastPressedTimeMillis = 1L; + field163 = -1; + field164 = -1; + field165 = -1L; + field166 = true; + displayFps = false; + rebootTimer = 0; + hintArrowType = 0; + hintArrowNpcIndex = 0; + hintArrowPlayerIndex = 0; + hintArrowX = 0; + hintArrowY = 0; + hintArrowHeight = 0; + hintArrowSubX = 0; + hintArrowSubY = 0; + playerAttackOption = AttackOption.AttackOption_hidden; + npcAttackOption = AttackOption.AttackOption_hidden; + titleLoadingStage = 0; + js5ConnectState = 0; + field167 = 0; + js5Errors = 0; + loginState = 0; + field168 = 0; + field169 = 0; + field170 = 0; + field658 = class159.field1985; + Login_isUsernameRemembered = false; + secureRandomFuture = new SecureRandomFuture(); + field172 = null; + npcs = new NPC[32768]; + npcCount = 0; + npcIndices = new int[32768]; + field173 = 0; + field174 = new int[250]; + packetWriter = new PacketWriter(); + field175 = 0; + field176 = false; + useBufferedSocket = true; + timer = new Timer(); + fontsMap = new HashMap(); + field177 = 0; + field178 = 1; + field179 = 0; + field180 = 1; + field181 = 0; + collisionMaps = new CollisionMap[4]; + isInInstance = false; + instanceChunkTemplates = new int[4][13][13]; + field182 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; + field183 = 0; + field184 = 2301979; + field185 = 5063219; + field186 = 3353893; + field187 = 7759444; + field188 = false; + field189 = 0; + cameraPitchTarget = 128; + minimapOrientation = 0; + field190 = 0; + field191 = 0; + field192 = 0; + field193 = 0; + oculusOrbState = 0; + cameraFollowHeight = 50; + field194 = 0; + field195 = 0; + field196 = 0; + oculusOrbNormalSpeed = 12; + field197 = 6; + field198 = 0; + field199 = false; + field200 = 0; + field201 = false; + field202 = 0; + overheadTextCount = 0; + overheadTextLimit = 50; + overheadTextXs = new int[overheadTextLimit]; + overheadTextYs = new int[overheadTextLimit]; + overheadTextAscents = new int[overheadTextLimit]; + overheadTextXOffsets = new int[overheadTextLimit]; + overheadTextColors = new int[overheadTextLimit]; + overheadTextEffects = new int[overheadTextLimit]; + overheadTextCyclesRemaining = new int[overheadTextLimit]; + overheadText = new String[overheadTextLimit]; + tileLastDrawnActor = new int[104][104]; + viewportDrawCount = 0; + viewportTempX = -1; + viewportTempY = -1; + mouseCrossX = 0; + mouseCrossY = 0; + mouseCrossState = 0; + mouseCrossColor = 0; + showMouseCross = true; + field203 = 0; + field204 = 0; + dragItemSlotSource = 0; + field205 = 0; + field206 = 0; + dragItemSlotDestination = 0; + field207 = false; + itemDragDuration = 0; + field208 = 0; + showLoadingMessages = true; + players = new Player[2048]; + localPlayerIndex = -1; + field209 = 0; + renderSelf = true; + field210 = 0; + field211 = 0; + field212 = new int[1000]; + playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; + playerMenuActions = new String[8]; + playerOptionsPriorities = new boolean[8]; + field213 = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; + combatTargetPlayerIndex = -1; + groundItems = new NodeDeque[4][104][104]; + field214 = new NodeDeque(); + projectiles = new NodeDeque(); + graphicsObjects = new NodeDeque(); + currentLevels = new int[25]; + levels = new int[25]; + experience = new int[25]; + field215 = 0; + isMenuOpen = false; + menuOptionsCount = 0; + menuArguments1 = new int[500]; + menuArguments2 = new int[500]; + menuOpcodes = new int[500]; + menuArguments0 = new int[500]; + menuActions = new String[500]; + menuTargetNames = new String[500]; + menuShiftClick = new boolean[500]; + followerOpsLowPriority = false; + shiftClickDrop = false; + tapToDrop = false; + showMouseOverText = true; + field216 = -1; + field217 = -1; + field218 = 0; + field219 = 50; + isItemSelected = 0; + selectedItemName = null; + isSpellSelected = false; + field220 = -1; + field157 = -1; + selectedSpellActionName = null; + selectedSpellName = null; + rootWidgetGroup = -1; + widgetGroupParents = new NodeHashTable(8); + field151 = 0; + field153 = -1; + chatEffects = 0; + field136 = 0; + field127 = null; + runEnergy = 0; + weight = 0; + rights = 0; + followerIndex = -1; + field155 = false; + viewportWidget = null; + clickedWidget = null; + clickedWidgetParent = null; + widgetClickX = 0; + widgetClickY = 0; + draggedOnWidget = null; + field106 = false; + field108 = -1; + field109 = -1; + field103 = false; + field110 = -1; + field111 = -1; + isDraggingWidget = false; + cycleCntr = 1; + field121 = new int[32]; + field123 = 0; + field116 = new int[32]; + field117 = 0; + changedSkills = new int[32]; + changedSkillsCount = 0; + chatCycle = 0; + field105 = 0; + field129 = 0; + field122 = 0; + field154 = 0; + field124 = 0; + mouseWheelRotation = 0; + scriptEvents = new NodeDeque(); + field147 = new NodeDeque(); + field148 = new NodeDeque(); + widgetClickMasks = new NodeHashTable(512); + rootWidgetCount = 0; + field98 = -2; + field100 = new boolean[100]; + field102 = new boolean[100]; + field101 = new boolean[100]; + rootWidgetXs = new int[100]; + rootWidgetYs = new int[100]; + rootWidgetWidths = new int[100]; + rootWidgetHeights = new int[100]; + gameDrawingMode = 0; + field99 = 0L; + isResizable = true; + field160 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; + publicChatMode = 0; + field138 = 0; + field158 = ""; + field152 = new long[100]; + field156 = 0; + field137 = 0; + field146 = new int[128]; + field145 = new int[128]; + field126 = -1L; + field125 = -1; + mapIconCount = 0; + mapIconXs = new int[1000]; + mapIconYs = new int[1000]; + mapIcons = new Sprite[1000]; + destinationX = 0; + destinationY = 0; + minimapState = 0; + field128 = 255; + field112 = -1; + field107 = false; + soundEffectVolume = 127; + field115 = 127; + soundEffectCount = 0; + soundEffectIds = new int[50]; + queuedSoundEffectLoops = new int[50]; + queuedSoundEffectDelays = new int[50]; + soundLocations = new int[50]; + soundEffects = new SoundEffect[50]; + isCameraLocked = false; + field139 = new boolean[5]; + field141 = new int[5]; + field142 = new int[5]; + field143 = new int[5]; + field144 = new int[5]; + field130 = 256; + field131 = 205; + field150 = 256; + field149 = 320; + field135 = 1; + field134 = 32767; + field132 = 1; + field133 = 32767; + viewportOffsetX = 0; + viewportOffsetY = 0; + viewportWidth = 0; + viewportHeight = 0; + viewportZoom = 0; + field119 = new PlayerAppearance(); + field118 = -1; + field120 = -1; + platformInfoProvider = new DesktopPlatformInfoProvider(); + grandExchangeOffers = new GrandExchangeOffer[8]; + field159 = new OwnWorldComparator(); + field104 = -1; + indexCacheLoaders = new ArrayList(10); + indexCacheLoaderIndex = 0; + field140 = 0; + field895 = new class65(); + field113 = new int[50]; + field114 = new int[50]; + } } diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index cf9ef3997d..cc684eabd8 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -11,507 +11,507 @@ public class ClientPacket implements ClientPacketMarker { @ObfuscatedGetter( intValue = 1076448827 ) - static int __gs_qh; + static int field221; @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_m; + public static final ClientPacket field222; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_f; + public static final ClientPacket field223; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_q; + public static final ClientPacket field224; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_w; + public static final ClientPacket field225; @ObfuscatedName("o") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_o; + public static final ClientPacket field226; @ObfuscatedName("u") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_u; + public static final ClientPacket field227; @ObfuscatedName("g") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_g; + public static final ClientPacket field228; @ObfuscatedName("l") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_l; + public static final ClientPacket field229; @ObfuscatedName("e") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_e; + public static final ClientPacket field230; @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_x; + public static final ClientPacket field231; @ObfuscatedName("d") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_d; + public static final ClientPacket field232; @ObfuscatedName("k") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_k; + public static final ClientPacket field233; @ObfuscatedName("n") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_n; + public static final ClientPacket field234; @ObfuscatedName("i") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_i; + public static final ClientPacket field235; @ObfuscatedName("a") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_a; + public static final ClientPacket field236; @ObfuscatedName("z") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_z; + public static final ClientPacket field237; @ObfuscatedName("j") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_j; + public static final ClientPacket field238; @ObfuscatedName("s") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_s; + public static final ClientPacket field239; @ObfuscatedName("t") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_t; + public static final ClientPacket field240; @ObfuscatedName("y") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_y; + public static final ClientPacket field241; @ObfuscatedName("h") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_h; + public static final ClientPacket field242; @ObfuscatedName("b") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_b; + public static final ClientPacket field243; @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_c; + public static final ClientPacket field244; @ObfuscatedName("r") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_r; + public static final ClientPacket field245; @ObfuscatedName("p") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_p; + public static final ClientPacket field246; @ObfuscatedName("v") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_v; + public static final ClientPacket field247; @ObfuscatedName("ag") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_ag; + public static final ClientPacket field248; @ObfuscatedName("aq") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_aq; + public static final ClientPacket field249; @ObfuscatedName("aj") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_aj; + public static final ClientPacket field250; @ObfuscatedName("av") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_av; + public static final ClientPacket field251; @ObfuscatedName("ar") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_ar; + public static final ClientPacket field252; @ObfuscatedName("ac") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_ac; + public static final ClientPacket field253; @ObfuscatedName("ay") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_ay; + public static final ClientPacket field254; @ObfuscatedName("ah") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_ah; + public static final ClientPacket field255; @ObfuscatedName("ak") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_ak; + public static final ClientPacket field256; @ObfuscatedName("aw") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_aw; + public static final ClientPacket field257; @ObfuscatedName("al") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_al; + public static final ClientPacket field258; @ObfuscatedName("ab") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_ab; + public static final ClientPacket field259; @ObfuscatedName("ae") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_ae; + public static final ClientPacket field260; @ObfuscatedName("at") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_at; + public static final ClientPacket field261; @ObfuscatedName("ad") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_ad; + public static final ClientPacket field262; @ObfuscatedName("ap") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_ap; + public static final ClientPacket field263; @ObfuscatedName("as") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_as; + public static final ClientPacket field264; @ObfuscatedName("am") @ObfuscatedSignature( signature = "Lgs;" ) - static final ClientPacket __gs_am; + static final ClientPacket field265; @ObfuscatedName("an") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_an; + public static final ClientPacket field266; @ObfuscatedName("az") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_az; + public static final ClientPacket field267; @ObfuscatedName("au") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_au; + public static final ClientPacket field268; @ObfuscatedName("ao") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_ao; + public static final ClientPacket field269; @ObfuscatedName("aa") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_aa; + public static final ClientPacket field270; @ObfuscatedName("ax") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_ax; + public static final ClientPacket field271; @ObfuscatedName("af") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_af; + public static final ClientPacket field272; @ObfuscatedName("ai") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_ai; + public static final ClientPacket field273; @ObfuscatedName("ba") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_ba; + public static final ClientPacket field274; @ObfuscatedName("bb") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_bb; + public static final ClientPacket field275; @ObfuscatedName("bs") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_bs; + public static final ClientPacket field276; @ObfuscatedName("bq") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_bq; + public static final ClientPacket field277; @ObfuscatedName("bn") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_bn; + public static final ClientPacket field278; @ObfuscatedName("bk") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_bk; + public static final ClientPacket field279; @ObfuscatedName("bd") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_bd; + public static final ClientPacket field280; @ObfuscatedName("bc") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_bc; + public static final ClientPacket field281; @ObfuscatedName("bo") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_bo; + public static final ClientPacket field282; @ObfuscatedName("bx") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_bx; + public static final ClientPacket field283; @ObfuscatedName("by") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_by; + public static final ClientPacket field284; @ObfuscatedName("bu") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_bu; + public static final ClientPacket field285; @ObfuscatedName("bm") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_bm; + public static final ClientPacket field286; @ObfuscatedName("bl") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_bl; + public static final ClientPacket field287; @ObfuscatedName("br") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_br; + public static final ClientPacket field288; @ObfuscatedName("bj") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_bj; + public static final ClientPacket field289; @ObfuscatedName("bi") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_bi; + public static final ClientPacket field290; @ObfuscatedName("bz") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_bz; + public static final ClientPacket field291; @ObfuscatedName("bg") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_bg; + public static final ClientPacket field292; @ObfuscatedName("bt") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_bt; + public static final ClientPacket field293; @ObfuscatedName("bp") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_bp; + public static final ClientPacket field294; @ObfuscatedName("bf") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_bf; + public static final ClientPacket field295; @ObfuscatedName("bh") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_bh; + public static final ClientPacket field296; @ObfuscatedName("be") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_be; + public static final ClientPacket field297; @ObfuscatedName("bv") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_bv; + public static final ClientPacket field298; @ObfuscatedName("bw") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_bw; + public static final ClientPacket field299; @ObfuscatedName("cr") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_cr; + public static final ClientPacket field300; @ObfuscatedName("cv") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_cv; + public static final ClientPacket field301; @ObfuscatedName("ce") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_ce; + public static final ClientPacket field302; @ObfuscatedName("cy") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_cy; + public static final ClientPacket field303; @ObfuscatedName("cs") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_cs; + public static final ClientPacket field304; @ObfuscatedName("cm") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_cm; + public static final ClientPacket field305; @ObfuscatedName("cj") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_cj; + public static final ClientPacket field306; @ObfuscatedName("cu") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_cu; + public static final ClientPacket field307; @ObfuscatedName("cb") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_cb; + public static final ClientPacket field308; @ObfuscatedName("ck") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_ck; + public static final ClientPacket field309; @ObfuscatedName("cn") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_cn; + public static final ClientPacket field310; @ObfuscatedName("cq") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_cq; + public static final ClientPacket field311; @ObfuscatedName("ch") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_ch; + public static final ClientPacket field312; @ObfuscatedName("cw") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_cw; + public static final ClientPacket field313; @ObfuscatedName("cg") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_cg; + public static final ClientPacket field314; @ObfuscatedName("cf") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_cf; + public static final ClientPacket field315; @ObfuscatedName("cp") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_cp; + public static final ClientPacket field316; @ObfuscatedName("cl") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_cl; + public static final ClientPacket field317; @ObfuscatedName("ct") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_ct; + public static final ClientPacket field318; @ObfuscatedName("cz") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_cz; + public static final ClientPacket field319; @ObfuscatedName("cc") @ObfuscatedSignature( signature = "Lgs;" ) - public static final ClientPacket __gs_cc; + public static final ClientPacket field320; @ObfuscatedName("ci") @ObfuscatedSignature( signature = "Lgs;" ) - static final ClientPacket __gs_ci; + static final ClientPacket field321; @ObfuscatedName("cd") @ObfuscatedGetter( intValue = -286923745 @@ -525,109 +525,6 @@ public class ClientPacket implements ClientPacketMarker { @Export("length") final int length; - static { - __gs_m = new ClientPacket(0, 8); - __gs_f = new ClientPacket(1, 3); - __gs_q = new ClientPacket(2, 14); - __gs_w = new ClientPacket(3, 7); - __gs_o = new ClientPacket(4, -1); - __gs_u = new ClientPacket(5, 7); - __gs_g = new ClientPacket(6, 7); - __gs_l = new ClientPacket(7, 8); - __gs_e = new ClientPacket(8, -1); - __gs_x = new ClientPacket(9, 4); - __gs_d = new ClientPacket(10, 7); - __gs_k = new ClientPacket(11, 10); - __gs_n = new ClientPacket(12, 13); - __gs_i = new ClientPacket(13, -1); - __gs_a = new ClientPacket(14, 8); - __gs_z = new ClientPacket(15, 3); - __gs_j = new ClientPacket(16, -2); - __gs_s = new ClientPacket(17, 4); - __gs_t = new ClientPacket(18, 15); - __gs_y = new ClientPacket(19, 8); - __gs_h = new ClientPacket(20, 0); - __gs_b = new ClientPacket(21, 8); - __gs_c = new ClientPacket(22, 0); - __gs_r = new ClientPacket(23, 11); - __gs_p = new ClientPacket(24, 2); - __gs_v = new ClientPacket(25, -2); - __gs_ag = new ClientPacket(26, 8); - __gs_aq = new ClientPacket(27, 3); - __gs_aj = new ClientPacket(28, -1); - __gs_av = new ClientPacket(29, 7); - __gs_ar = new ClientPacket(30, 2); - __gs_ac = new ClientPacket(31, 3); - __gs_ay = new ClientPacket(32, 8); - __gs_ah = new ClientPacket(33, 3); - __gs_ak = new ClientPacket(34, -1); - __gs_aw = new ClientPacket(35, 5); - __gs_al = new ClientPacket(36, 2); - __gs_ab = new ClientPacket(37, 0); - __gs_ae = new ClientPacket(38, -1); - __gs_at = new ClientPacket(39, 4); - __gs_ad = new ClientPacket(40, 8); - __gs_ap = new ClientPacket(41, 6); - __gs_as = new ClientPacket(42, 2); - __gs_am = new ClientPacket(43, -1); - __gs_an = new ClientPacket(44, 15); - __gs_az = new ClientPacket(45, 4); - __gs_au = new ClientPacket(46, 8); - __gs_ao = new ClientPacket(47, 3); - __gs_aa = new ClientPacket(48, 8); - __gs_ax = new ClientPacket(49, 0); - __gs_af = new ClientPacket(50, 3); - __gs_ai = new ClientPacket(51, 7); - __gs_ba = new ClientPacket(52, -1); - __gs_bb = new ClientPacket(53, 13); - __gs_bs = new ClientPacket(54, -1); - __gs_bq = new ClientPacket(55, 9); - __gs_bn = new ClientPacket(56, 3); - __gs_bk = new ClientPacket(57, 16); - __gs_bd = new ClientPacket(58, 8); - __gs_bc = new ClientPacket(59, 3); - __gs_bo = new ClientPacket(60, -1); - __gs_bx = new ClientPacket(61, 9); - __gs_by = new ClientPacket(62, 3); - __gs_bu = new ClientPacket(63, 16); - __gs_bm = new ClientPacket(64, 8); - __gs_bl = new ClientPacket(65, 8); - __gs_br = new ClientPacket(66, 8); - __gs_bj = new ClientPacket(67, -2); - __gs_bi = new ClientPacket(68, 8); - __gs_bz = new ClientPacket(69, 4); - __gs_bg = new ClientPacket(70, 6); - __gs_bt = new ClientPacket(71, 3); - __gs_bp = new ClientPacket(72, 8); - __gs_bf = new ClientPacket(73, 1); - __gs_bh = new ClientPacket(74, 7); - __gs_be = new ClientPacket(75, 3); - __gs_bv = new ClientPacket(76, 0); - __gs_bw = new ClientPacket(77, -1); - __gs_cr = new ClientPacket(78, -1); - __gs_cv = new ClientPacket(79, 7); - __gs_ce = new ClientPacket(80, 9); - __gs_cy = new ClientPacket(81, 11); - __gs_cs = new ClientPacket(82, 16); - __gs_cm = new ClientPacket(83, 3); - __gs_cj = new ClientPacket(84, 8); - __gs_cu = new ClientPacket(85, 8); - __gs_cb = new ClientPacket(86, 9); - __gs_ck = new ClientPacket(87, 8); - __gs_cn = new ClientPacket(88, -1); - __gs_cq = new ClientPacket(89, 7); - __gs_ch = new ClientPacket(90, -1); - __gs_cw = new ClientPacket(91, -1); - __gs_cg = new ClientPacket(92, 13); - __gs_cf = new ClientPacket(93, 3); - __gs_cp = new ClientPacket(94, 7); - __gs_cl = new ClientPacket(95, -1); - __gs_ct = new ClientPacket(96, -1); - __gs_cz = new ClientPacket(97, -1); - __gs_cc = new ClientPacket(98, 8); - __gs_ci = new ClientPacket(99, 7); - } - ClientPacket(int var1, int var2) { this.id = var1; this.length = var2; @@ -639,7 +536,7 @@ public class ClientPacket implements ClientPacketMarker { garbageValue = "-26" ) public static StudioGame[] method3664() { - return new StudioGame[]{StudioGame.__is_q, StudioGame.__is_m, StudioGame.__is_o, StudioGame.__is_u, StudioGame.__is_f, StudioGame.__is_w}; + return new StudioGame[]{StudioGame.field889, StudioGame.field887, StudioGame.field891, StudioGame.field892, StudioGame.field888, StudioGame.field890}; } @ObfuscatedName("m") @@ -650,4 +547,107 @@ public class ClientPacket implements ClientPacketMarker { static AttackOption[] method3665() { return new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels}; } + + static { + field222 = new ClientPacket(0, 8); + field223 = new ClientPacket(1, 3); + field224 = new ClientPacket(2, 14); + field225 = new ClientPacket(3, 7); + field226 = new ClientPacket(4, -1); + field227 = new ClientPacket(5, 7); + field228 = new ClientPacket(6, 7); + field229 = new ClientPacket(7, 8); + field230 = new ClientPacket(8, -1); + field231 = new ClientPacket(9, 4); + field232 = new ClientPacket(10, 7); + field233 = new ClientPacket(11, 10); + field234 = new ClientPacket(12, 13); + field235 = new ClientPacket(13, -1); + field236 = new ClientPacket(14, 8); + field237 = new ClientPacket(15, 3); + field238 = new ClientPacket(16, -2); + field239 = new ClientPacket(17, 4); + field240 = new ClientPacket(18, 15); + field241 = new ClientPacket(19, 8); + field242 = new ClientPacket(20, 0); + field243 = new ClientPacket(21, 8); + field244 = new ClientPacket(22, 0); + field245 = new ClientPacket(23, 11); + field246 = new ClientPacket(24, 2); + field247 = new ClientPacket(25, -2); + field248 = new ClientPacket(26, 8); + field249 = new ClientPacket(27, 3); + field250 = new ClientPacket(28, -1); + field251 = new ClientPacket(29, 7); + field252 = new ClientPacket(30, 2); + field253 = new ClientPacket(31, 3); + field254 = new ClientPacket(32, 8); + field255 = new ClientPacket(33, 3); + field256 = new ClientPacket(34, -1); + field257 = new ClientPacket(35, 5); + field258 = new ClientPacket(36, 2); + field259 = new ClientPacket(37, 0); + field260 = new ClientPacket(38, -1); + field261 = new ClientPacket(39, 4); + field262 = new ClientPacket(40, 8); + field263 = new ClientPacket(41, 6); + field264 = new ClientPacket(42, 2); + field265 = new ClientPacket(43, -1); + field266 = new ClientPacket(44, 15); + field267 = new ClientPacket(45, 4); + field268 = new ClientPacket(46, 8); + field269 = new ClientPacket(47, 3); + field270 = new ClientPacket(48, 8); + field271 = new ClientPacket(49, 0); + field272 = new ClientPacket(50, 3); + field273 = new ClientPacket(51, 7); + field274 = new ClientPacket(52, -1); + field275 = new ClientPacket(53, 13); + field276 = new ClientPacket(54, -1); + field277 = new ClientPacket(55, 9); + field278 = new ClientPacket(56, 3); + field279 = new ClientPacket(57, 16); + field280 = new ClientPacket(58, 8); + field281 = new ClientPacket(59, 3); + field282 = new ClientPacket(60, -1); + field283 = new ClientPacket(61, 9); + field284 = new ClientPacket(62, 3); + field285 = new ClientPacket(63, 16); + field286 = new ClientPacket(64, 8); + field287 = new ClientPacket(65, 8); + field288 = new ClientPacket(66, 8); + field289 = new ClientPacket(67, -2); + field290 = new ClientPacket(68, 8); + field291 = new ClientPacket(69, 4); + field292 = new ClientPacket(70, 6); + field293 = new ClientPacket(71, 3); + field294 = new ClientPacket(72, 8); + field295 = new ClientPacket(73, 1); + field296 = new ClientPacket(74, 7); + field297 = new ClientPacket(75, 3); + field298 = new ClientPacket(76, 0); + field299 = new ClientPacket(77, -1); + field300 = new ClientPacket(78, -1); + field301 = new ClientPacket(79, 7); + field302 = new ClientPacket(80, 9); + field303 = new ClientPacket(81, 11); + field304 = new ClientPacket(82, 16); + field305 = new ClientPacket(83, 3); + field306 = new ClientPacket(84, 8); + field307 = new ClientPacket(85, 8); + field308 = new ClientPacket(86, 9); + field309 = new ClientPacket(87, 8); + field310 = new ClientPacket(88, -1); + field311 = new ClientPacket(89, 7); + field312 = new ClientPacket(90, -1); + field313 = new ClientPacket(91, -1); + field314 = new ClientPacket(92, 13); + field315 = new ClientPacket(93, 3); + field316 = new ClientPacket(94, 7); + field317 = new ClientPacket(95, -1); + field318 = new ClientPacket(96, -1); + field319 = new ClientPacket(97, -1); + field320 = new ClientPacket(98, 8); + field321 = new ClientPacket(99, 7); + } } diff --git a/runescape-client/src/main/java/ClientParameter.java b/runescape-client/src/main/java/ClientParameter.java index 19961d5bed..f2c8156aea 100644 --- a/runescape-client/src/main/java/ClientParameter.java +++ b/runescape-client/src/main/java/ClientParameter.java @@ -16,128 +16,106 @@ public class ClientParameter { @ObfuscatedSignature( signature = "Lji;" ) - static final ClientParameter __ji_m; + static final ClientParameter field322; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lji;" ) - static final ClientParameter __ji_f; + static final ClientParameter field323; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lji;" ) - static final ClientParameter __ji_q; + static final ClientParameter field324; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lji;" ) - static final ClientParameter __ji_w; + static final ClientParameter field325; @ObfuscatedName("o") @ObfuscatedSignature( signature = "Lji;" ) - static final ClientParameter __ji_o; + static final ClientParameter field326; @ObfuscatedName("u") @ObfuscatedSignature( signature = "Lji;" ) - static final ClientParameter __ji_u; + static final ClientParameter field327; @ObfuscatedName("g") @ObfuscatedSignature( signature = "Lji;" ) - static final ClientParameter __ji_g; + static final ClientParameter field328; @ObfuscatedName("l") @ObfuscatedSignature( signature = "Lji;" ) - static final ClientParameter __ji_l; + static final ClientParameter field329; @ObfuscatedName("e") @ObfuscatedSignature( signature = "Lji;" ) - static final ClientParameter __ji_e; + static final ClientParameter field330; @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lji;" ) - static final ClientParameter __ji_x; + static final ClientParameter field331; @ObfuscatedName("d") @ObfuscatedSignature( signature = "Lji;" ) - static final ClientParameter __ji_d; + static final ClientParameter field332; @ObfuscatedName("k") @ObfuscatedSignature( signature = "Lji;" ) - static final ClientParameter __ji_k; + static final ClientParameter field333; @ObfuscatedName("n") @ObfuscatedSignature( signature = "Lji;" ) - public static final ClientParameter __ji_n; + public static final ClientParameter field334; @ObfuscatedName("i") @ObfuscatedSignature( signature = "Lji;" ) - public static final ClientParameter __ji_i; + public static final ClientParameter field335; @ObfuscatedName("a") @ObfuscatedSignature( signature = "Lji;" ) - static final ClientParameter __ji_a; + static final ClientParameter field336; @ObfuscatedName("z") @ObfuscatedSignature( signature = "Lji;" ) - static final ClientParameter __ji_z; + static final ClientParameter field337; @ObfuscatedName("j") @ObfuscatedSignature( signature = "Lji;" ) - static final ClientParameter __ji_j; + static final ClientParameter field338; @ObfuscatedName("s") @ObfuscatedSignature( signature = "Lji;" ) - static final ClientParameter __ji_s; + static final ClientParameter field339; @ObfuscatedName("t") @ObfuscatedSignature( signature = "Lji;" ) - static final ClientParameter __ji_t; + static final ClientParameter field340; @ObfuscatedName("fp") @ObfuscatedSignature( signature = "Lfu;" ) - static AbstractSocket __ji_fp; + static AbstractSocket field341; @ObfuscatedName("y") @Export("id") public final String id; - static { - __ji_m = new ClientParameter("8", "8"); - __ji_f = new ClientParameter("15", "15"); - __ji_q = new ClientParameter("7", "7"); - __ji_w = new ClientParameter("10", "10"); - __ji_o = new ClientParameter("16", "16"); - __ji_u = new ClientParameter("12", "12"); - __ji_g = new ClientParameter("3", "3"); - __ji_l = new ClientParameter("6", "6"); - __ji_e = new ClientParameter("17", "17"); - __ji_x = new ClientParameter("5", "5"); - __ji_d = new ClientParameter("9", "9"); - __ji_k = new ClientParameter("14", "14"); - __ji_n = new ClientParameter("18", "18"); - __ji_i = new ClientParameter("13", "13"); - __ji_a = new ClientParameter("4", "4"); - __ji_z = new ClientParameter("1", "1"); - __ji_j = new ClientParameter("11", "11"); - __ji_s = new ClientParameter("2", "2"); - __ji_t = new ClientParameter("19", "19"); - } - ClientParameter(String var1, String var2) { this.id = var2; } @@ -150,35 +128,57 @@ public class ClientParameter { @Export("loadWorlds") static boolean loadWorlds() { try { - if(FriendLoginUpdate.__kn_x == null) { - FriendLoginUpdate.__kn_x = TriBool.urlRequester.request(new URL(ServerBuild.worldsUrl)); - } else if(FriendLoginUpdate.__kn_x.isDone()) { - byte[] var0 = FriendLoginUpdate.__kn_x.getResponse(); + if (FriendLoginUpdate.field356 == null) { + FriendLoginUpdate.field356 = TriBool.urlRequester.request(new URL(ServerBuild.worldsUrl)); + } else if (FriendLoginUpdate.field356.isDone()) { + byte[] var0 = FriendLoginUpdate.field356.getResponse(); Buffer var1 = new Buffer(var0); var1.readInt(); - World.worldsCount = var1.__ag_302(); + World.worldsCount = var1.method43(); ItemContainer.worlds = new World[World.worldsCount]; - World var3; - for(int var2 = 0; var2 < World.worldsCount; var3.index = var2++) { - var3 = ItemContainer.worlds[var2] = new World(); - var3.id = var1.__ag_302(); - var3.properties = var1.readInt(); - var3.host = var1.readStringCp1252NullTerminated(); - var3.activity = var1.readStringCp1252NullTerminated(); - var3.location = var1.readUnsignedByte(); - var3.population = var1.__aq_303(); + World var2; + for (int var3 = 0; var3 < World.worldsCount; var2.index = var3++) { + var2 = ItemContainer.worlds[var3] = new World(); + var2.id = var1.method43(); + var2.properties = var1.readInt(); + var2.host = var1.readStringCp1252NullTerminated(); + var2.activity = var1.readStringCp1252NullTerminated(); + var2.location = var1.readUnsignedByte(); + var2.population = var1.method44(); } MilliClock.method3400(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.sortOption1, World.sortOption2); - FriendLoginUpdate.__kn_x = null; + FriendLoginUpdate.field356 = null; return true; } } catch (Exception var4) { var4.printStackTrace(); - FriendLoginUpdate.__kn_x = null; + FriendLoginUpdate.field356 = null; } return false; } + + static { + field322 = new ClientParameter("8", "8"); + field323 = new ClientParameter("15", "15"); + field324 = new ClientParameter("7", "7"); + field325 = new ClientParameter("10", "10"); + field326 = new ClientParameter("16", "16"); + field327 = new ClientParameter("12", "12"); + field328 = new ClientParameter("3", "3"); + field329 = new ClientParameter("6", "6"); + field330 = new ClientParameter("17", "17"); + field331 = new ClientParameter("5", "5"); + field332 = new ClientParameter("9", "9"); + field333 = new ClientParameter("14", "14"); + field334 = new ClientParameter("18", "18"); + field335 = new ClientParameter("13", "13"); + field336 = new ClientParameter("4", "4"); + field337 = new ClientParameter("1", "1"); + field338 = new ClientParameter("11", "11"); + field339 = new ClientParameter("2", "2"); + field340 = new ClientParameter("19", "19"); + } } diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index 33ece76295..6383e1ba8e 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -14,7 +14,7 @@ public class ClientPreferences { @ObfuscatedGetter( intValue = 1548448409 ) - static int __bf_m; + static int field342; @ObfuscatedName("gr") @ObfuscatedSignature( signature = "[Lln;" @@ -43,16 +43,12 @@ public class ClientPreferences { @Export("parameters") LinkedHashMap parameters; - static { - __bf_m = 6; - } - ClientPreferences() { this.windowMode = 1; this.rememberedUsername = null; this.hideUsername = false; this.parameters = new LinkedHashMap(); - this.__m_150(true); + this.method89(true); } @ObfuscatedSignature( @@ -63,43 +59,43 @@ public class ClientPreferences { this.rememberedUsername = null; this.hideUsername = false; this.parameters = new LinkedHashMap(); - if(var1 != null && var1.array != null) { + if (var1 != null && var1.array != null) { int var2 = var1.readUnsignedByte(); - if(var2 >= 0 && var2 <= __bf_m) { - if(var1.readUnsignedByte() == 1) { + if (var2 >= 0 && var2 <= field342) { + if (var1.readUnsignedByte() == 1) { this.roofsHidden = true; } - if(var2 > 1) { + if (var2 > 1) { this.titleMusicDisabled = var1.readUnsignedByte() == 1; } - if(var2 > 3) { + if (var2 > 3) { this.windowMode = var1.readUnsignedByte(); } - if(var2 > 2) { + if (var2 > 2) { int var3 = var1.readUnsignedByte(); - for(int var4 = 0; var4 < var3; ++var4) { + for (int var4 = 0; var4 < var3; ++var4) { int var5 = var1.readInt(); int var6 = var1.readInt(); - this.parameters.put(Integer.valueOf(var5), Integer.valueOf(var6)); + this.parameters.put(var5, var6); } } - if(var2 > 4) { + if (var2 > 4) { this.rememberedUsername = var1.readStringCp1252NullTerminatedOrNull(); } - if(var2 > 5) { + if (var2 > 5) { this.hideUsername = var1.readBoolean(); } } else { - this.__m_150(true); + this.method89(true); } } else { - this.__m_150(true); + this.method89(true); } } @@ -109,7 +105,7 @@ public class ClientPreferences { signature = "(ZI)V", garbageValue = "1213718182" ) - void __m_150(boolean var1) { + void method89(boolean var1) { } @ObfuscatedName("f") @@ -120,20 +116,20 @@ public class ClientPreferences { @Export("toBuffer") Buffer toBuffer() { Buffer var1 = new Buffer(100); - var1.writeByte(__bf_m); - var1.writeByte(this.roofsHidden?1:0); - var1.writeByte(this.titleMusicDisabled?1:0); + var1.writeByte(field342); + var1.writeByte(this.roofsHidden ? 1 : 0); + var1.writeByte(this.titleMusicDisabled ? 1 : 0); var1.writeByte(this.windowMode); var1.writeByte(this.parameters.size()); Iterator var2 = this.parameters.entrySet().iterator(); - while(var2.hasNext()) { + while (var2.hasNext()) { Entry var3 = (Entry)var2.next(); - var1.writeInt(((Integer)var3.getKey()).intValue()); - var1.writeInt(((Integer)var3.getValue()).intValue()); + var1.writeInt((Integer)var3.getKey()); + var1.writeInt((Integer)var3.getValue()); } - var1.writeStringCp1252NullTerminated(this.rememberedUsername != null?this.rememberedUsername:""); + var1.writeStringCp1252NullTerminated(this.rememberedUsername != null ? this.rememberedUsername : ""); var1.writeBoolean(this.hideUsername); return var1; } @@ -153,8 +149,13 @@ public class ClientPreferences { garbageValue = "0" ) static final void method1809(int var0) { - if(GroundItemPile.loadWidgetGroup(var0)) { + if (GroundItemPile.loadWidgetGroup(var0)) { NetFileRequest.method4555(Widget.widgets[var0], -1); } + + } + + static { + field342 = 6; } } diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index b814aa2d99..5b4f4b05b2 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -31,32 +31,32 @@ public abstract class Clock { @ObfuscatedName("m") public static String method3534(long var0) { - if(var0 > 0L && var0 < 6582952005840035281L) { - if(0L == var0 % 37L) { + if (var0 > 0L && var0 < 6582952005840035281L) { + if (0L == var0 % 37L) { return null; } else { int var2 = 0; - for(long var3 = var0; var3 != 0L; var3 /= 37L) { + for (long var3 = var0; var3 != 0L; var3 /= 37L) { ++var2; } - StringBuilder var5; - char var8; - for(var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) { - long var6 = var0; + char var4; + StringBuilder var8; + for (var8 = new StringBuilder(var2); var0 != 0L; var8.append(var4)) { + long var5 = var0; var0 /= 37L; - var8 = class306.base37Table[(int)(var6 - 37L * var0)]; - if(var8 == '_') { - int var9 = var5.length() - 1; - var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); - var8 = 160; + var4 = class306.base37Table[(int)(var5 - 37L * var0)]; + if (var4 == '_') { + int var7 = var8.length() - 1; + var8.setCharAt(var7, Character.toUpperCase(var8.charAt(var7))); + var4 = 160; } } - var5.reverse(); - var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); - return var5.toString(); + var8.reverse(); + var8.setCharAt(0, Character.toUpperCase(var8.charAt(0))); + return var8.toString(); } } else { return null; @@ -69,13 +69,13 @@ public abstract class Clock { garbageValue = "-1555959688" ) static void method3533(String var0) { - class21.__b_by = var0; + class21.field1123 = var0; try { - String var1 = TextureProvider.client.getParameter(ClientParameter.__ji_n.id); - String var2 = TextureProvider.client.getParameter(ClientParameter.__ji_i.id); + String var1 = TextureProvider.client.getParameter(ClientParameter.field334.id); + String var2 = TextureProvider.client.getParameter(ClientParameter.field335.id); String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; - if(var0.length() == 0) { + if (var0.length() == 0) { var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; } else { var3 = var3 + "; Expires=" + WorldMapSectionType.method252(class203.currentTimeMs() + 94608000000L) + "; Max-Age=" + 94608000L; @@ -83,7 +83,6 @@ public abstract class Clock { class46.method850(TextureProvider.client, "document.cookie=\"" + var3 + "\""); } catch (Throwable var4) { - ; } } diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index a55c80bc1b..1e1ac5e132 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -51,9 +51,9 @@ public class CollisionMap { ) @Export("clear") public void clear() { - for(int var1 = 0; var1 < this.xSize; ++var1) { - for(int var2 = 0; var2 < this.ySize; ++var2) { - if(var1 != 0 && var2 != 0 && var1 < this.xSize - 5 && var2 < this.ySize - 5) { + for (int var1 = 0; var1 < this.xSize; ++var1) { + for (int var2 = 0; var2 < this.ySize; ++var2) { + if (var1 != 0 && var2 != 0 && var1 < this.xSize - 5 && var2 < this.ySize - 5) { this.flags[var1][var2] = 16777216; } else { this.flags[var1][var2] = 16777215; @@ -68,147 +68,147 @@ public class CollisionMap { signature = "(IIIIZB)V", garbageValue = "2" ) - public void __f_283(int var1, int var2, int var3, int var4, boolean var5) { + public void method90(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; var2 -= this.yInset; - if(var3 == 0) { - if(var4 == 0) { - this.__u_287(var1, var2, 128); - this.__u_287(var1 - 1, var2, 8); + if (var3 == 0) { + if (var4 == 0) { + this.method94(var1, var2, 128); + this.method94(var1 - 1, var2, 8); } - if(var4 == 1) { - this.__u_287(var1, var2, 2); - this.__u_287(var1, var2 + 1, 32); + if (var4 == 1) { + this.method94(var1, var2, 2); + this.method94(var1, var2 + 1, 32); } - if(var4 == 2) { - this.__u_287(var1, var2, 8); - this.__u_287(var1 + 1, var2, 128); + if (var4 == 2) { + this.method94(var1, var2, 8); + this.method94(var1 + 1, var2, 128); } - if(var4 == 3) { - this.__u_287(var1, var2, 32); - this.__u_287(var1, var2 - 1, 2); + if (var4 == 3) { + this.method94(var1, var2, 32); + this.method94(var1, var2 - 1, 2); } } - if(var3 == 1 || var3 == 3) { - if(var4 == 0) { - this.__u_287(var1, var2, 1); - this.__u_287(var1 - 1, var2 + 1, 16); + if (var3 == 1 || var3 == 3) { + if (var4 == 0) { + this.method94(var1, var2, 1); + this.method94(var1 - 1, var2 + 1, 16); } - if(var4 == 1) { - this.__u_287(var1, var2, 4); - this.__u_287(var1 + 1, var2 + 1, 64); + if (var4 == 1) { + this.method94(var1, var2, 4); + this.method94(var1 + 1, var2 + 1, 64); } - if(var4 == 2) { - this.__u_287(var1, var2, 16); - this.__u_287(var1 + 1, var2 - 1, 1); + if (var4 == 2) { + this.method94(var1, var2, 16); + this.method94(var1 + 1, var2 - 1, 1); } - if(var4 == 3) { - this.__u_287(var1, var2, 64); - this.__u_287(var1 - 1, var2 - 1, 4); + if (var4 == 3) { + this.method94(var1, var2, 64); + this.method94(var1 - 1, var2 - 1, 4); } } - if(var3 == 2) { - if(var4 == 0) { - this.__u_287(var1, var2, 130); - this.__u_287(var1 - 1, var2, 8); - this.__u_287(var1, var2 + 1, 32); + if (var3 == 2) { + if (var4 == 0) { + this.method94(var1, var2, 130); + this.method94(var1 - 1, var2, 8); + this.method94(var1, var2 + 1, 32); } - if(var4 == 1) { - this.__u_287(var1, var2, 10); - this.__u_287(var1, var2 + 1, 32); - this.__u_287(var1 + 1, var2, 128); + if (var4 == 1) { + this.method94(var1, var2, 10); + this.method94(var1, var2 + 1, 32); + this.method94(var1 + 1, var2, 128); } - if(var4 == 2) { - this.__u_287(var1, var2, 40); - this.__u_287(var1 + 1, var2, 128); - this.__u_287(var1, var2 - 1, 2); + if (var4 == 2) { + this.method94(var1, var2, 40); + this.method94(var1 + 1, var2, 128); + this.method94(var1, var2 - 1, 2); } - if(var4 == 3) { - this.__u_287(var1, var2, 160); - this.__u_287(var1, var2 - 1, 2); - this.__u_287(var1 - 1, var2, 8); + if (var4 == 3) { + this.method94(var1, var2, 160); + this.method94(var1, var2 - 1, 2); + this.method94(var1 - 1, var2, 8); } } - if(var5) { - if(var3 == 0) { - if(var4 == 0) { - this.__u_287(var1, var2, 65536); - this.__u_287(var1 - 1, var2, 4096); + if (var5) { + if (var3 == 0) { + if (var4 == 0) { + this.method94(var1, var2, 65536); + this.method94(var1 - 1, var2, 4096); } - if(var4 == 1) { - this.__u_287(var1, var2, 1024); - this.__u_287(var1, var2 + 1, 16384); + if (var4 == 1) { + this.method94(var1, var2, 1024); + this.method94(var1, var2 + 1, 16384); } - if(var4 == 2) { - this.__u_287(var1, var2, 4096); - this.__u_287(var1 + 1, var2, 65536); + if (var4 == 2) { + this.method94(var1, var2, 4096); + this.method94(var1 + 1, var2, 65536); } - if(var4 == 3) { - this.__u_287(var1, var2, 16384); - this.__u_287(var1, var2 - 1, 1024); + if (var4 == 3) { + this.method94(var1, var2, 16384); + this.method94(var1, var2 - 1, 1024); } } - if(var3 == 1 || var3 == 3) { - if(var4 == 0) { - this.__u_287(var1, var2, 512); - this.__u_287(var1 - 1, var2 + 1, 8192); + if (var3 == 1 || var3 == 3) { + if (var4 == 0) { + this.method94(var1, var2, 512); + this.method94(var1 - 1, var2 + 1, 8192); } - if(var4 == 1) { - this.__u_287(var1, var2, 2048); - this.__u_287(var1 + 1, var2 + 1, 32768); + if (var4 == 1) { + this.method94(var1, var2, 2048); + this.method94(var1 + 1, var2 + 1, 32768); } - if(var4 == 2) { - this.__u_287(var1, var2, 8192); - this.__u_287(var1 + 1, var2 - 1, 512); + if (var4 == 2) { + this.method94(var1, var2, 8192); + this.method94(var1 + 1, var2 - 1, 512); } - if(var4 == 3) { - this.__u_287(var1, var2, 32768); - this.__u_287(var1 - 1, var2 - 1, 2048); + if (var4 == 3) { + this.method94(var1, var2, 32768); + this.method94(var1 - 1, var2 - 1, 2048); } } - if(var3 == 2) { - if(var4 == 0) { - this.__u_287(var1, var2, 66560); - this.__u_287(var1 - 1, var2, 4096); - this.__u_287(var1, var2 + 1, 16384); + if (var3 == 2) { + if (var4 == 0) { + this.method94(var1, var2, 66560); + this.method94(var1 - 1, var2, 4096); + this.method94(var1, var2 + 1, 16384); } - if(var4 == 1) { - this.__u_287(var1, var2, 5120); - this.__u_287(var1, var2 + 1, 16384); - this.__u_287(var1 + 1, var2, 65536); + if (var4 == 1) { + this.method94(var1, var2, 5120); + this.method94(var1, var2 + 1, 16384); + this.method94(var1 + 1, var2, 65536); } - if(var4 == 2) { - this.__u_287(var1, var2, 20480); - this.__u_287(var1 + 1, var2, 65536); - this.__u_287(var1, var2 - 1, 1024); + if (var4 == 2) { + this.method94(var1, var2, 20480); + this.method94(var1 + 1, var2, 65536); + this.method94(var1, var2 - 1, 1024); } - if(var4 == 3) { - this.__u_287(var1, var2, 81920); - this.__u_287(var1, var2 - 1, 1024); - this.__u_287(var1 - 1, var2, 4096); + if (var4 == 3) { + this.method94(var1, var2, 81920); + this.method94(var1, var2 - 1, 1024); + this.method94(var1 - 1, var2, 4096); } } } @@ -220,20 +220,20 @@ public class CollisionMap { signature = "(IIIIZI)V", garbageValue = "1813281219" ) - public void __q_284(int var1, int var2, int var3, int var4, boolean var5) { + public void method91(int var1, int var2, int var3, int var4, boolean var5) { int var6 = 256; - if(var5) { + if (var5) { var6 += 131072; } var1 -= this.xInset; var2 -= this.yInset; - for(int var7 = var1; var7 < var3 + var1; ++var7) { - if(var7 >= 0 && var7 < this.xSize) { - for(int var8 = var2; var8 < var2 + var4; ++var8) { - if(var8 >= 0 && var8 < this.ySize) { - this.__u_287(var7, var8, var6); + for (int var7 = var1; var7 < var3 + var1; ++var7) { + if (var7 >= 0 && var7 < this.xSize) { + for (int var8 = var2; var8 < var2 + var4; ++var8) { + if (var8 >= 0 && var8 < this.ySize) { + this.method94(var7, var8, var6); } } } @@ -246,10 +246,11 @@ public class CollisionMap { signature = "(III)V", garbageValue = "1082834717" ) - public void __w_285(int var1, int var2) { + public void method92(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; - this.flags[var1][var2] |= 2097152; + int[] var10000 = this.flags[var1]; + var10000[var2] |= 2097152; } @ObfuscatedName("o") @@ -257,10 +258,11 @@ public class CollisionMap { signature = "(III)V", garbageValue = "2022671149" ) - public void __o_286(int var1, int var2) { + public void method93(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; - this.flags[var1][var2] |= 262144; + int[] var10000 = this.flags[var1]; + var10000[var2] |= 262144; } @ObfuscatedName("u") @@ -268,8 +270,9 @@ public class CollisionMap { signature = "(IIII)V", garbageValue = "953350100" ) - void __u_287(int var1, int var2, int var3) { - this.flags[var1][var2] |= var3; + void method94(int var1, int var2, int var3) { + int[] var10000 = this.flags[var1]; + var10000[var2] |= var3; } @ObfuscatedName("g") @@ -277,147 +280,147 @@ public class CollisionMap { signature = "(IIIIZB)V", garbageValue = "54" ) - public void __g_288(int var1, int var2, int var3, int var4, boolean var5) { + public void method95(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; var2 -= this.yInset; - if(var3 == 0) { - if(var4 == 0) { - this.__e_290(var1, var2, 128); - this.__e_290(var1 - 1, var2, 8); + if (var3 == 0) { + if (var4 == 0) { + this.method97(var1, var2, 128); + this.method97(var1 - 1, var2, 8); } - if(var4 == 1) { - this.__e_290(var1, var2, 2); - this.__e_290(var1, var2 + 1, 32); + if (var4 == 1) { + this.method97(var1, var2, 2); + this.method97(var1, var2 + 1, 32); } - if(var4 == 2) { - this.__e_290(var1, var2, 8); - this.__e_290(var1 + 1, var2, 128); + if (var4 == 2) { + this.method97(var1, var2, 8); + this.method97(var1 + 1, var2, 128); } - if(var4 == 3) { - this.__e_290(var1, var2, 32); - this.__e_290(var1, var2 - 1, 2); + if (var4 == 3) { + this.method97(var1, var2, 32); + this.method97(var1, var2 - 1, 2); } } - if(var3 == 1 || var3 == 3) { - if(var4 == 0) { - this.__e_290(var1, var2, 1); - this.__e_290(var1 - 1, var2 + 1, 16); + if (var3 == 1 || var3 == 3) { + if (var4 == 0) { + this.method97(var1, var2, 1); + this.method97(var1 - 1, var2 + 1, 16); } - if(var4 == 1) { - this.__e_290(var1, var2, 4); - this.__e_290(var1 + 1, var2 + 1, 64); + if (var4 == 1) { + this.method97(var1, var2, 4); + this.method97(var1 + 1, var2 + 1, 64); } - if(var4 == 2) { - this.__e_290(var1, var2, 16); - this.__e_290(var1 + 1, var2 - 1, 1); + if (var4 == 2) { + this.method97(var1, var2, 16); + this.method97(var1 + 1, var2 - 1, 1); } - if(var4 == 3) { - this.__e_290(var1, var2, 64); - this.__e_290(var1 - 1, var2 - 1, 4); + if (var4 == 3) { + this.method97(var1, var2, 64); + this.method97(var1 - 1, var2 - 1, 4); } } - if(var3 == 2) { - if(var4 == 0) { - this.__e_290(var1, var2, 130); - this.__e_290(var1 - 1, var2, 8); - this.__e_290(var1, var2 + 1, 32); + if (var3 == 2) { + if (var4 == 0) { + this.method97(var1, var2, 130); + this.method97(var1 - 1, var2, 8); + this.method97(var1, var2 + 1, 32); } - if(var4 == 1) { - this.__e_290(var1, var2, 10); - this.__e_290(var1, var2 + 1, 32); - this.__e_290(var1 + 1, var2, 128); + if (var4 == 1) { + this.method97(var1, var2, 10); + this.method97(var1, var2 + 1, 32); + this.method97(var1 + 1, var2, 128); } - if(var4 == 2) { - this.__e_290(var1, var2, 40); - this.__e_290(var1 + 1, var2, 128); - this.__e_290(var1, var2 - 1, 2); + if (var4 == 2) { + this.method97(var1, var2, 40); + this.method97(var1 + 1, var2, 128); + this.method97(var1, var2 - 1, 2); } - if(var4 == 3) { - this.__e_290(var1, var2, 160); - this.__e_290(var1, var2 - 1, 2); - this.__e_290(var1 - 1, var2, 8); + if (var4 == 3) { + this.method97(var1, var2, 160); + this.method97(var1, var2 - 1, 2); + this.method97(var1 - 1, var2, 8); } } - if(var5) { - if(var3 == 0) { - if(var4 == 0) { - this.__e_290(var1, var2, 65536); - this.__e_290(var1 - 1, var2, 4096); + if (var5) { + if (var3 == 0) { + if (var4 == 0) { + this.method97(var1, var2, 65536); + this.method97(var1 - 1, var2, 4096); } - if(var4 == 1) { - this.__e_290(var1, var2, 1024); - this.__e_290(var1, var2 + 1, 16384); + if (var4 == 1) { + this.method97(var1, var2, 1024); + this.method97(var1, var2 + 1, 16384); } - if(var4 == 2) { - this.__e_290(var1, var2, 4096); - this.__e_290(var1 + 1, var2, 65536); + if (var4 == 2) { + this.method97(var1, var2, 4096); + this.method97(var1 + 1, var2, 65536); } - if(var4 == 3) { - this.__e_290(var1, var2, 16384); - this.__e_290(var1, var2 - 1, 1024); + if (var4 == 3) { + this.method97(var1, var2, 16384); + this.method97(var1, var2 - 1, 1024); } } - if(var3 == 1 || var3 == 3) { - if(var4 == 0) { - this.__e_290(var1, var2, 512); - this.__e_290(var1 - 1, var2 + 1, 8192); + if (var3 == 1 || var3 == 3) { + if (var4 == 0) { + this.method97(var1, var2, 512); + this.method97(var1 - 1, var2 + 1, 8192); } - if(var4 == 1) { - this.__e_290(var1, var2, 2048); - this.__e_290(var1 + 1, var2 + 1, 32768); + if (var4 == 1) { + this.method97(var1, var2, 2048); + this.method97(var1 + 1, var2 + 1, 32768); } - if(var4 == 2) { - this.__e_290(var1, var2, 8192); - this.__e_290(var1 + 1, var2 - 1, 512); + if (var4 == 2) { + this.method97(var1, var2, 8192); + this.method97(var1 + 1, var2 - 1, 512); } - if(var4 == 3) { - this.__e_290(var1, var2, 32768); - this.__e_290(var1 - 1, var2 - 1, 2048); + if (var4 == 3) { + this.method97(var1, var2, 32768); + this.method97(var1 - 1, var2 - 1, 2048); } } - if(var3 == 2) { - if(var4 == 0) { - this.__e_290(var1, var2, 66560); - this.__e_290(var1 - 1, var2, 4096); - this.__e_290(var1, var2 + 1, 16384); + if (var3 == 2) { + if (var4 == 0) { + this.method97(var1, var2, 66560); + this.method97(var1 - 1, var2, 4096); + this.method97(var1, var2 + 1, 16384); } - if(var4 == 1) { - this.__e_290(var1, var2, 5120); - this.__e_290(var1, var2 + 1, 16384); - this.__e_290(var1 + 1, var2, 65536); + if (var4 == 1) { + this.method97(var1, var2, 5120); + this.method97(var1, var2 + 1, 16384); + this.method97(var1 + 1, var2, 65536); } - if(var4 == 2) { - this.__e_290(var1, var2, 20480); - this.__e_290(var1 + 1, var2, 65536); - this.__e_290(var1, var2 - 1, 1024); + if (var4 == 2) { + this.method97(var1, var2, 20480); + this.method97(var1 + 1, var2, 65536); + this.method97(var1, var2 - 1, 1024); } - if(var4 == 3) { - this.__e_290(var1, var2, 81920); - this.__e_290(var1, var2 - 1, 1024); - this.__e_290(var1 - 1, var2, 4096); + if (var4 == 3) { + this.method97(var1, var2, 81920); + this.method97(var1, var2 - 1, 1024); + this.method97(var1 - 1, var2, 4096); } } } @@ -429,26 +432,26 @@ public class CollisionMap { signature = "(IIIIIZB)V", garbageValue = "23" ) - public void __l_289(int var1, int var2, int var3, int var4, int var5, boolean var6) { + public void method96(int var1, int var2, int var3, int var4, int var5, boolean var6) { int var7 = 256; - if(var6) { + if (var6) { var7 += 131072; } var1 -= this.xInset; var2 -= this.yInset; int var8; - if(var5 == 1 || var5 == 3) { + if (var5 == 1 || var5 == 3) { var8 = var3; var3 = var4; var4 = var8; } - for(var8 = var1; var8 < var3 + var1; ++var8) { - if(var8 >= 0 && var8 < this.xSize) { - for(int var9 = var2; var9 < var2 + var4; ++var9) { - if(var9 >= 0 && var9 < this.ySize) { - this.__e_290(var8, var9, var7); + for (var8 = var1; var8 < var3 + var1; ++var8) { + if (var8 >= 0 && var8 < this.xSize) { + for (int var9 = var2; var9 < var2 + var4; ++var9) { + if (var9 >= 0 && var9 < this.ySize) { + this.method97(var8, var9, var7); } } } @@ -461,8 +464,9 @@ public class CollisionMap { signature = "(IIII)V", garbageValue = "52290294" ) - void __e_290(int var1, int var2, int var3) { - this.flags[var1][var2] &= ~var3; + void method97(int var1, int var2, int var3) { + int[] var10000 = this.flags[var1]; + var10000[var2] &= ~var3; } @ObfuscatedName("x") @@ -470,10 +474,11 @@ public class CollisionMap { signature = "(IIB)V", garbageValue = "37" ) - public void __x_291(int var1, int var2) { + public void method98(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; - this.flags[var1][var2] &= -262145; + int[] var10000 = this.flags[var1]; + var10000[var2] &= -262145; } @ObfuscatedName("m") @@ -483,7 +488,7 @@ public class CollisionMap { ) public static int method3632(int var0, int var1, int var2) { var2 &= 3; - return var2 == 0?var0:(var2 == 1?var1:(var2 == 2?7 - var0:7 - var1)); + return var2 == 0 ? var0 : (var2 == 1 ? var1 : (var2 == 2 ? 7 - var0 : 7 - var1)); } @ObfuscatedName("q") @@ -493,7 +498,7 @@ public class CollisionMap { ) static int method3631(char var0, int var1) { int var2 = var0 << 4; - if(Character.isUpperCase(var0) || Character.isTitleCase(var0)) { + if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { var0 = Character.toLowerCase(var0); var2 = (var0 << 4) + 1; } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index 1d376b3d10..c063c4d198 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -24,52 +24,53 @@ public class Decimator { int[][] table; public Decimator(int var1, int var2) { - if(var2 != var1) { - int var4 = var1; - int var5 = var2; - if(var2 > var1) { - var4 = var2; - var5 = var1; + if (var2 != var1) { + int var3 = var1; + int var4 = var2; + if (var2 > var1) { + var3 = var2; + var4 = var1; } - while(var5 != 0) { - int var6 = var4 % var5; + int var5; + while (var4 != 0) { + var5 = var3 % var4; + var3 = var4; var4 = var5; - var5 = var6; } - var1 /= var4; - var2 /= var4; + var1 /= var3; + var2 /= var3; this.inputRate = var1; this.outputRate = var2; this.table = new int[var1][14]; - for(int var7 = 0; var7 < var1; ++var7) { - int[] var8 = this.table[var7]; - double var9 = (double)var7 / (double)var1 + 6.0D; - int var11 = (int)Math.floor(var9 - 7.0D + 1.0D); - if(var11 < 0) { - var11 = 0; + for (var5 = 0; var5 < var1; ++var5) { + int[] var6 = this.table[var5]; + double var7 = (double)var5 / (double)var1 + 6.0D; + int var9 = (int)Math.floor(var7 - 7.0D + 1.0D); + if (var9 < 0) { + var9 = 0; } - int var12 = (int)Math.ceil(var9 + 7.0D); - if(var12 > 14) { - var12 = 14; + int var10 = (int)Math.ceil(var7 + 7.0D); + if (var10 > 14) { + var10 = 14; } - for(double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) { - double var15 = ((double)var11 - var9) * 3.141592653589793D; - double var17 = var13; - if(var15 < -1.0E-4D || var15 > 1.0E-4D) { - var17 = var13 * (Math.sin(var15) / var15); + for (double var11 = (double)var2 / (double)var1; var9 < var10; ++var9) { + double var13 = ((double)var9 - var7) * 3.141592653589793D; + double var15 = var11; + if (var13 < -1.0E-4D || var13 > 1.0E-4D) { + var15 = var11 * (Math.sin(var13) / var13); } - var17 *= 0.54D + 0.46D * Math.cos(((double)var11 - var9) * 0.2243994752564138D); - var8[var11] = (int)Math.floor(0.5D + var17 * 65536.0D); + var15 *= 0.54D + 0.46D * Math.cos(((double)var9 - var7) * 0.2243994752564138D); + var6[var9] = (int)Math.floor(0.5D + var15 * 65536.0D); } } - } + } @ObfuscatedName("m") @@ -79,19 +80,19 @@ public class Decimator { ) @Export("resample") byte[] resample(byte[] var1) { - if(this.table != null) { + if (this.table != null) { int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14; int[] var3 = new int[var2]; int var4 = 0; int var5 = 0; int var6; - for(var6 = 0; var6 < var1.length; ++var6) { + for (var6 = 0; var6 < var1.length; ++var6) { byte var7 = var1[var6]; int[] var8 = this.table[var5]; int var9; - for(var9 = 0; var9 < 14; ++var9) { + for (var9 = 0; var9 < 14; ++var9) { var3[var9 + var4] += var8[var9] * var7; } @@ -103,11 +104,11 @@ public class Decimator { var1 = new byte[var2]; - for(var6 = 0; var6 < var2; ++var6) { + for (var6 = 0; var6 < var2; ++var6) { int var10 = var3[var6] + 32768 >> 16; - if(var10 < -128) { + if (var10 < -128) { var1[var6] = -128; - } else if(var10 > 127) { + } else if (var10 > 127) { var1[var6] = 127; } else { var1[var6] = (byte)var10; @@ -125,7 +126,7 @@ public class Decimator { ) @Export("scaleRate") int scaleRate(int var1) { - if(this.table != null) { + if (this.table != null) { var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate); } @@ -139,7 +140,7 @@ public class Decimator { ) @Export("scalePosition") int scalePosition(int var1) { - if(this.table != null) { + if (this.table != null) { var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6; } @@ -154,12 +155,12 @@ public class Decimator { public static final boolean method2490() { KeyHandler var0 = KeyHandler.KeyHandler_instance; synchronized(KeyHandler.KeyHandler_instance) { - if(KeyHandler.__an_ct == KeyHandler.__an_cc) { + if (KeyHandler.field453 == KeyHandler.field455) { return false; } else { - IndexStoreAction.__ik_cn = KeyHandler.__an_cf[KeyHandler.__an_ct]; - GzipDecompressor.__go_ck = KeyHandler.__an_cg[KeyHandler.__an_ct]; - KeyHandler.__an_ct = KeyHandler.__an_ct + 1 & 127; + IndexStoreAction.field411 = KeyHandler.field450[KeyHandler.field453]; + GzipDecompressor.field378 = KeyHandler.field449[KeyHandler.field453]; + KeyHandler.field453 = KeyHandler.field453 + 1 & 127; return true; } } @@ -172,61 +173,61 @@ public class Decimator { ) static final boolean method2491(Model var0, int var1, int var2, int var3) { boolean var4 = ViewportMouse.ViewportMouse_isInViewport; - if(!var4) { + if (!var4) { return false; } else { int var5; int var6; int var7; int var8; + int var9; + int var10; int var11; int var12; int var13; - int var16; - int var17; - if(!ViewportMouse.ViewportMouse_false0) { + if (!ViewportMouse.ViewportMouse_false0) { var5 = Scene.Scene_cameraPitchSine; var6 = Scene.Scene_cameraPitchCosine; var7 = Scene.Scene_cameraYawSine; var8 = Scene.Scene_cameraYawCosine; - 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.rot1(var14, clickboxFar, var6, var5); - var17 = Rasterizer3D.rot2(var14, clickboxFar, var6, var5); - var14 = var15; - var15 = Rasterizer3D.rot3(var11, var16, var8, var7); - var16 = Rasterizer3D.rot4(var11, var16, var8, var7); - var11 = var15; - 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; - ViewportMouse.__dm_l = (var15 - var11) / 2; - class311.__ka_e = (var14 - var12) / 2; - Skeleton.__ek_x = (var17 - var16) / 2; - GraphicsObject.__bw_d = Math.abs(ViewportMouse.__dm_l); - ViewportMouse.__dm_k = Math.abs(class311.__ka_e); - class248.__iu_n = Math.abs(Skeleton.__ek_x); + byte var14 = 50; + short var15 = 3500; + var9 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var14 / Rasterizer3D.Rasterizer3D_zoom; + var10 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var14 / Rasterizer3D.Rasterizer3D_zoom; + var11 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var15 / Rasterizer3D.Rasterizer3D_zoom; + int var16 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var15 / Rasterizer3D.Rasterizer3D_zoom; + int var17 = Rasterizer3D.rot1(var10, var14, var6, var5); + var12 = Rasterizer3D.rot2(var10, var14, var6, var5); + var10 = var17; + var17 = Rasterizer3D.rot1(var16, var15, var6, var5); + var13 = Rasterizer3D.rot2(var16, var15, var6, var5); + var16 = var17; + var17 = Rasterizer3D.rot3(var9, var12, var8, var7); + var12 = Rasterizer3D.rot4(var9, var12, var8, var7); + var9 = var17; + var17 = Rasterizer3D.rot3(var11, var13, var8, var7); + var13 = Rasterizer3D.rot4(var11, var13, var8, var7); + AccessFile.field7 = (var9 + var17) / 2; + ViewportMouse.field951 = (var16 + var10) / 2; + ViewportMouse.field952 = (var13 + var12) / 2; + ViewportMouse.field953 = (var17 - var9) / 2; + class311.field1156 = (var16 - var10) / 2; + Skeleton.field874 = (var13 - var12) / 2; + GraphicsObject.field377 = Math.abs(ViewportMouse.field953); + ViewportMouse.field954 = Math.abs(class311.field1156); + class248.field1142 = Math.abs(Skeleton.field874); } var5 = var0.xMid + var1; var6 = var2 + var0.yMid; var7 = var3 + var0.zMid; var8 = var0.xMidOffset; - var16 = var0.yMidOffset; - var17 = var0.zMidOffset; - var11 = AccessFile.__dk_o - var5; - var12 = ViewportMouse.__dm_u - var6; - var13 = ViewportMouse.__dm_g - var7; - return Math.abs(var11) > var8 + GraphicsObject.__bw_d?false:(Math.abs(var12) > var16 + ViewportMouse.__dm_k?false:(Math.abs(var13) > var17 + class248.__iu_n?false:(Math.abs(var13 * class311.__ka_e - var12 * Skeleton.__ek_x) > var17 * ViewportMouse.__dm_k + var16 * class248.__iu_n?false:(Math.abs(var11 * Skeleton.__ek_x - var13 * ViewportMouse.__dm_l) > var8 * class248.__iu_n + var17 * GraphicsObject.__bw_d?false:Math.abs(var12 * ViewportMouse.__dm_l - var11 * class311.__ka_e) <= var8 * ViewportMouse.__dm_k + var16 * GraphicsObject.__bw_d)))); + var12 = var0.yMidOffset; + var13 = var0.zMidOffset; + var9 = AccessFile.field7 - var5; + var10 = ViewportMouse.field951 - var6; + var11 = ViewportMouse.field952 - var7; + return Math.abs(var9) > var8 + GraphicsObject.field377 ? false : (Math.abs(var10) > var12 + ViewportMouse.field954 ? false : (Math.abs(var11) > var13 + class248.field1142 ? false : (Math.abs(var11 * class311.field1156 - var10 * Skeleton.field874) > var13 * ViewportMouse.field954 + var12 * class248.field1142 ? false : (Math.abs(var9 * Skeleton.field874 - var11 * ViewportMouse.field953) > var8 * class248.field1142 + var13 * GraphicsObject.field377 ? false : Math.abs(var10 * ViewportMouse.field953 - var9 * class311.field1156) <= var8 * ViewportMouse.field954 + var12 * GraphicsObject.field377)))); } } @@ -236,8 +237,8 @@ public class Decimator { garbageValue = "-858740470" ) static int method2492(int var0, Script var1, boolean var2) { - if(var0 == 5630) { - Client.__client_fd = 250; + if (var0 == 5630) { + Client.field175 = 250; return 1; } else { return 2; diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index 58ac1934ac..60c70c651a 100644 --- a/runescape-client/src/main/java/DemotingHashTable.java +++ b/runescape-client/src/main/java/DemotingHashTable.java @@ -31,8 +31,7 @@ public final class DemotingHashTable { this.remaining = var1; int var3; - for(var3 = 1; var3 + var3 < var1 && var3 < var2; var3 += var3) { - ; + for (var3 = 1; var3 + var3 < var1 && var3 < var2; var3 += var3) { } this.hashTable = new IterableNodeHashTable(var3); @@ -42,17 +41,17 @@ public final class DemotingHashTable { @Export("get") public Object get(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); - if(var3 == null) { + if (var3 == null) { return null; } else { Object var4 = var3.get(); - if(var4 == null) { + if (var4 == null) { var3.remove(); var3.removeDual(); this.remaining += var3.size; return null; } else { - if(var3.isSoft()) { + if (var3.isSoft()) { DirectWrapper var5 = new DirectWrapper(var4, var3.size); this.hashTable.put(var5, var3.key); this.queue.add(var5); @@ -82,7 +81,7 @@ public final class DemotingHashTable { ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { - if(var1 != null) { + if (var1 != null) { var1.remove(); var1.removeDual(); this.remaining += var1.size; @@ -93,14 +92,14 @@ public final class DemotingHashTable { @ObfuscatedName("w") @Export("put") public void put(Object var1, long var2, int var4) { - if(var4 > this.capacity) { + if (var4 > this.capacity) { throw new IllegalStateException(); } else { this.remove(var2); this.remaining -= var4; - while(this.remaining < 0) { - Wrapper var5 = (Wrapper)this.queue.__q_448(); + while (this.remaining < 0) { + Wrapper var5 = (Wrapper)this.queue.method149(); this.removeWrapper(var5); } @@ -114,14 +113,14 @@ public final class DemotingHashTable { @ObfuscatedName("o") @Export("demote") public void demote(int var1) { - for(Wrapper var2 = (Wrapper)this.queue.__w_449(); var2 != null; var2 = (Wrapper)this.queue.__u_451()) { - if(var2.isSoft()) { - if(var2.get() == null) { + for (Wrapper var2 = (Wrapper)this.queue.method150(); var2 != null; var2 = (Wrapper)this.queue.method152()) { + if (var2.isSoft()) { + if (var2.get() == null) { var2.remove(); var2.removeDual(); this.remaining += var2.size; } - } else if(++var2.keyDual > (long)var1) { + } else if (++var2.keyDual > (long)var1) { SoftWrapper var3 = new SoftWrapper(var2.get(), var2.size); this.hashTable.put(var3, var2.key); DualNodeDeque.method5220(var3, var2); diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java index b04a824018..34868b1afd 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -15,11 +15,11 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { @Export("get") public PlatformInfo get() { byte var1; - if(WorldMapSection3.osNameLowerCase.startsWith("win")) { + if (WorldMapSection3.osNameLowerCase.startsWith("win")) { var1 = 1; - } else if(WorldMapSection3.osNameLowerCase.startsWith("mac")) { + } else if (WorldMapSection3.osNameLowerCase.startsWith("mac")) { var1 = 2; - } else if(WorldMapSection3.osNameLowerCase.startsWith("linux")) { + } else if (WorldMapSection3.osNameLowerCase.startsWith("linux")) { var1 = 3; } else { var1 = 4; @@ -28,14 +28,14 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { String var2; try { var2 = System.getProperty("os.arch").toLowerCase(); - } catch (Exception var35) { + } catch (Exception var25) { var2 = ""; } String var3; try { var3 = System.getProperty("os.version").toLowerCase(); - } catch (Exception var34) { + } catch (Exception var24) { var3 = ""; } @@ -45,74 +45,73 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { try { var4 = System.getProperty("java.vendor"); var5 = System.getProperty("java.version"); - } catch (Exception var33) { - ; + } catch (Exception var23) { } - boolean var29; - if(!var2.startsWith("amd64") && !var2.startsWith("x86_64")) { - var29 = false; + boolean var6; + if (!var2.startsWith("amd64") && !var2.startsWith("x86_64")) { + var6 = false; } else { - var29 = true; + var6 = true; } byte var7 = 0; - if(var1 == 1) { - if(var3.indexOf("4.0") != -1) { + if (var1 == 1) { + if (var3.indexOf("4.0") != -1) { var7 = 1; - } else if(var3.indexOf("4.1") != -1) { + } else if (var3.indexOf("4.1") != -1) { var7 = 2; - } else if(var3.indexOf("4.9") != -1) { + } else if (var3.indexOf("4.9") != -1) { var7 = 3; - } else if(var3.indexOf("5.0") != -1) { + } else if (var3.indexOf("5.0") != -1) { var7 = 4; - } else if(var3.indexOf("5.1") != -1) { + } else if (var3.indexOf("5.1") != -1) { var7 = 5; - } else if(var3.indexOf("5.2") != -1) { + } else if (var3.indexOf("5.2") != -1) { var7 = 8; - } else if(var3.indexOf("6.0") != -1) { + } else if (var3.indexOf("6.0") != -1) { var7 = 6; - } else if(var3.indexOf("6.1") != -1) { + } else if (var3.indexOf("6.1") != -1) { var7 = 7; - } else if(var3.indexOf("6.2") != -1) { + } else if (var3.indexOf("6.2") != -1) { var7 = 9; - } else if(var3.indexOf("6.3") != -1) { + } else if (var3.indexOf("6.3") != -1) { var7 = 10; - } else if(var3.indexOf("10.0") != -1) { + } else if (var3.indexOf("10.0") != -1) { var7 = 11; } - } else if(var1 == 2) { - if(var3.indexOf("10.4") != -1) { + } else if (var1 == 2) { + if (var3.indexOf("10.4") != -1) { var7 = 20; - } else if(var3.indexOf("10.5") != -1) { + } else if (var3.indexOf("10.5") != -1) { var7 = 21; - } else if(var3.indexOf("10.6") != -1) { + } else if (var3.indexOf("10.6") != -1) { var7 = 22; - } else if(var3.indexOf("10.7") != -1) { + } else if (var3.indexOf("10.7") != -1) { var7 = 23; - } else if(var3.indexOf("10.8") != -1) { + } else if (var3.indexOf("10.8") != -1) { var7 = 24; - } else if(var3.indexOf("10.9") != -1) { + } else if (var3.indexOf("10.9") != -1) { var7 = 25; - } else if(var3.indexOf("10.10") != -1) { + } else if (var3.indexOf("10.10") != -1) { var7 = 26; - } else if(var3.indexOf("10.11") != -1) { + } else if (var3.indexOf("10.11") != -1) { var7 = 27; - } else if(var3.indexOf("10.12") != -1) { + } else if (var3.indexOf("10.12") != -1) { var7 = 28; - } else if(var3.indexOf("10.13") != -1) { + } else if (var3.indexOf("10.13") != -1) { var7 = 29; } } byte var8; - if(var4.toLowerCase().indexOf("sun") != -1) { + if (var4.toLowerCase().indexOf("sun") != -1) { var8 = 1; - } else if(var4.toLowerCase().indexOf("microsoft") != -1) { + } else if (var4.toLowerCase().indexOf("microsoft") != -1) { var8 = 2; - } else if(var4.toLowerCase().indexOf("apple") != -1) { + } else if (var4.toLowerCase().indexOf("apple") != -1) { var8 = 3; - } else if(var4.toLowerCase().indexOf("oracle") != -1) { + } else if (var4.toLowerCase().indexOf("oracle") != -1) { var8 = 5; } else { var8 = 4; @@ -122,72 +121,69 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { int var10 = 0; try { - while(var9 < var5.length()) { + while (var9 < var5.length()) { char var11 = var5.charAt(var9); - if(var11 < '0' || var11 > '9') { + if (var11 < '0' || var11 > '9') { break; } var10 = var10 * 10 + (var11 - '0'); ++var9; } - } catch (Exception var38) { - ; + } catch (Exception var28) { } - int var39 = var10; + int var29 = var10; var9 = var5.indexOf(46, 2) + 1; var10 = 0; try { - while(var9 < var5.length()) { + while (var9 < var5.length()) { char var12 = var5.charAt(var9); - if(var12 < '0' || var12 > '9') { + if (var12 < '0' || var12 > '9') { break; } var10 = var12 - '0' + var10 * 10; ++var9; } - } catch (Exception var37) { - ; + } catch (Exception var27) { } - int var40 = var10; + int var30 = var10; var9 = var5.indexOf(95, 4) + 1; var10 = 0; try { - while(var9 < var5.length()) { + while (var9 < var5.length()) { char var13 = var5.charAt(var9); - if(var13 < '0' || var13 > '9') { + if (var13 < '0' || var13 > '9') { break; } var10 = var13 - '0' + var10 * 10; ++var9; } - } catch (Exception var36) { - ; + } catch (Exception var26) { } Runtime.getRuntime(); - int var15 = (int)((long)((new Random()).nextInt(31457280) + 230686720) / 1048576L) + 1; - int var16; - if(var39 > 3) { - var16 = Runtime.getRuntime().availableProcessors(); + int var31 = (int)((long)((new Random()).nextInt(31457280) + 230686720) / 1048576L) + 1; + int var14; + if (var29 > 3) { + var14 = Runtime.getRuntime().availableProcessors(); } else { - var16 = 0; + var14 = 0; } - byte var17 = 0; + byte var15 = 0; + String var16 = ""; + String var17 = ""; String var18 = ""; String var19 = ""; String var20 = ""; String var21 = ""; - String var22 = ""; - String var23 = ""; - int[] var28 = new int[3]; - return new PlatformInfo(var1, var29, var7, var8, var39, var40, var10, false, var15, var16, var17, 0, var18, var19, var20, var21, 0, 0, 0, 0, var22, var23, var28, 0, ""); + int[] var22 = new int[3]; + return new PlatformInfo(var1, var6, var7, var8, var29, var30, var10, false, var31, var14, var15, 0, var16, var17, var18, var19, 0, 0, 0, 0, var20, var21, var22, 0, ""); } } diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index b76b322285..894db8a282 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -1,8 +1,8 @@ import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioSystem; -import javax.sound.sampled.DataLine.Info; import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.SourceDataLine; +import javax.sound.sampled.DataLine.Info; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -35,8 +35,8 @@ public class DevicePcmPlayer extends PcmPlayer { ) @Export("init") protected void init() { - this.format = new AudioFormat((float)class309.PcmPlayer_sampleRate, 16, PcmPlayer.isStereo?2:1, true, false); - this.byteSamples = new byte[256 << (PcmPlayer.isStereo?2:1)]; + this.format = new AudioFormat((float)class309.PcmPlayer_sampleRate, 16, PcmPlayer.isStereo ? 2 : 1, true, false); + this.byteSamples = new byte[256 << (PcmPlayer.isStereo ? 2 : 1)]; } @ObfuscatedName("f") @@ -47,25 +47,26 @@ public class DevicePcmPlayer extends PcmPlayer { @Export("open") protected void open(int var1) throws LineUnavailableException { try { - Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.isStereo?2:1)); + Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.isStereo ? 2 : 1)); this.line = (SourceDataLine)AudioSystem.getLine(var2); this.line.open(); this.line.start(); this.capacity2 = var1; } catch (LineUnavailableException var5) { - int var4 = (var1 >>> 1 & 1431655765) + (var1 & 1431655765); - var4 = (var4 >>> 2 & 858993459) + (var4 & 858993459); - var4 = (var4 >>> 4) + var4 & 252645135; - var4 += var4 >>> 8; - var4 += var4 >>> 16; - int var3 = var4 & 255; - if(var3 != 1) { - this.open(World.method1759(var1)); - } else { + int var3 = (var1 >>> 1 & 1431655765) + (var1 & 1431655765); + var3 = (var3 >>> 2 & 858993459) + (var3 & 858993459); + var3 = (var3 >>> 4) + var3 & 252645135; + var3 += var3 >>> 8; + var3 += var3 >>> 16; + int var4 = var3 & 255; + if (var4 == 1) { this.line = null; throw var5; } + + this.open(World.method1759(var1)); } + } @ObfuscatedName("q") @@ -75,20 +76,20 @@ public class DevicePcmPlayer extends PcmPlayer { ) @Export("position") protected int position() { - return this.capacity2 - (this.line.available() >> (PcmPlayer.isStereo?2:1)); + return this.capacity2 - (this.line.available() >> (PcmPlayer.isStereo ? 2 : 1)); } @ObfuscatedName("w") @Export("write") protected void write() { int var1 = 256; - if(PcmPlayer.isStereo) { + if (PcmPlayer.isStereo) { var1 <<= 1; } - for(int var2 = 0; var2 < var1; ++var2) { + for (int var2 = 0; var2 < var1; ++var2) { int var3 = super.samples[var2]; - if((var3 + 8388608 & -16777216) != 0) { + if ((var3 + 8388608 & -16777216) != 0) { var3 = 8388607 ^ var3 >> 31; } @@ -106,7 +107,7 @@ public class DevicePcmPlayer extends PcmPlayer { ) @Export("close") protected void close() { - if(this.line != null) { + if (this.line != null) { this.line.close(); this.line = null; } diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index 91034e8a5c..dfbf94b5c9 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -44,7 +44,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { var2.write(var3); var2.seek(0L); var2.close(); - if(var1) { + if (var1) { var0.delete(); } @@ -72,47 +72,47 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { static void decodeSprite(byte[] var0) { Buffer var1 = new Buffer(var0); var1.index = var0.length - 2; - class328.indexedSpriteCount = var1.__ag_302(); + class328.indexedSpriteCount = var1.method43(); class328.indexedSpriteOffsetXs = new int[class328.indexedSpriteCount]; class328.indexedSpriteOffsetYs = new int[class328.indexedSpriteCount]; VarbitDefinition.indexedSpriteWidths = new int[class328.indexedSpriteCount]; SecureRandomCallable.indexedSpriteHeights = new int[class328.indexedSpriteCount]; class328.spritePixels = new byte[class328.indexedSpriteCount][]; var1.index = var0.length - 7 - class328.indexedSpriteCount * 8; - class328.indexedSpriteWidth = var1.__ag_302(); - class328.indexedSpriteHeight = var1.__ag_302(); + class328.indexedSpriteWidth = var1.method43(); + class328.indexedSpriteHeight = var1.method43(); int var2 = (var1.readUnsignedByte() & 255) + 1; int var3; - for(var3 = 0; var3 < class328.indexedSpriteCount; ++var3) { - class328.indexedSpriteOffsetXs[var3] = var1.__ag_302(); + for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) { + class328.indexedSpriteOffsetXs[var3] = var1.method43(); } - for(var3 = 0; var3 < class328.indexedSpriteCount; ++var3) { - class328.indexedSpriteOffsetYs[var3] = var1.__ag_302(); + for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) { + class328.indexedSpriteOffsetYs[var3] = var1.method43(); } - for(var3 = 0; var3 < class328.indexedSpriteCount; ++var3) { - VarbitDefinition.indexedSpriteWidths[var3] = var1.__ag_302(); + for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) { + VarbitDefinition.indexedSpriteWidths[var3] = var1.method43(); } - for(var3 = 0; var3 < class328.indexedSpriteCount; ++var3) { - SecureRandomCallable.indexedSpriteHeights[var3] = var1.__ag_302(); + for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) { + SecureRandomCallable.indexedSpriteHeights[var3] = var1.method43(); } var1.index = var0.length - 7 - class328.indexedSpriteCount * 8 - (var2 - 1) * 3; class328.indexedSpritePalette = new int[var2]; - for(var3 = 1; var3 < var2; ++var3) { + for (var3 = 1; var3 < var2; ++var3) { class328.indexedSpritePalette[var3] = var1.readMedium(); - if(class328.indexedSpritePalette[var3] == 0) { + if (class328.indexedSpritePalette[var3] == 0) { class328.indexedSpritePalette[var3] = 1; } } var1.index = 0; - for(var3 = 0; var3 < class328.indexedSpriteCount; ++var3) { + for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) { int var4 = VarbitDefinition.indexedSpriteWidths[var3]; int var5 = SecureRandomCallable.indexedSpriteHeights[var3]; int var6 = var4 * var5; @@ -120,13 +120,13 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { class328.spritePixels[var3] = var7; int var8 = var1.readUnsignedByte(); int var9; - if(var8 == 0) { - for(var9 = 0; var9 < var6; ++var9) { + if (var8 == 0) { + for (var9 = 0; var9 < var6; ++var9) { var7[var9] = var1.readByte(); } - } else if(var8 == 1) { - for(var9 = 0; var9 < var4; ++var9) { - for(int var10 = 0; var10 < var5; ++var10) { + } else if (var8 == 1) { + for (var9 = 0; var9 < var4; ++var9) { + for (int var10 = 0; var10 < var5; ++var10) { var7[var9 + var10 * var4] = var1.readByte(); } } @@ -154,11 +154,11 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); Rasterizer3D.Rasterizer3D_method1(); - for(int var9 = 0; var9 < var0.length; ++var9) { + for (int var9 = 0; var9 < var0.length; ++var9) { Widget var10 = var0[var9]; - if(var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { + if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { int var11; - if(var8 == -1) { + if (var8 == -1) { Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; @@ -170,8 +170,8 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { var10.rootIndex = var11; var10.cycle = Client.cycle; - if(!var10.isIf3 || !PacketBufferNode.method3673(var10)) { - if(var10.contentType > 0) { + if (!var10.isIf3 || !PacketBufferNode.method3673(var10)) { + if (var10.contentType > 0) { class15.method186(var10); } @@ -180,266 +180,266 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { int var14 = var10.transparency; int var15; int var16; - if(var10 == Client.clickedWidget) { - if(var1 != -1412584499 && !var10.isScrollBar) { - class279.__jx_ne = var0; - class54.__bs_nb = var6; - class157.__fw_nm = var7; + if (var10 == Client.clickedWidget) { + if (var1 != -1412584499 && !var10.isScrollBar) { + class279.field1145 = var0; + class54.field1161 = var6; + class157.field1114 = var7; continue; } - if(Client.isDraggingWidget && Client.__client_nn) { + if (Client.isDraggingWidget && Client.field106) { var15 = MouseHandler.MouseHandler_x; var16 = MouseHandler.MouseHandler_y; var15 -= Client.widgetClickX; var16 -= Client.widgetClickY; - if(var15 < Client.__client_nw) { - var15 = Client.__client_nw; + if (var15 < Client.field108) { + var15 = Client.field108; } - if(var15 + var10.width > Client.__client_nw + Client.clickedWidgetParent.width) { - var15 = Client.__client_nw + Client.clickedWidgetParent.width - var10.width; + if (var15 + var10.width > Client.field108 + Client.clickedWidgetParent.width) { + var15 = Client.field108 + Client.clickedWidgetParent.width - var10.width; } - if(var16 < Client.__client_nl) { - var16 = Client.__client_nl; + if (var16 < Client.field109) { + var16 = Client.field109; } - if(var16 + var10.height > Client.__client_nl + Client.clickedWidgetParent.height) { - var16 = Client.__client_nl + Client.clickedWidgetParent.height - var10.height; + if (var16 + var10.height > Client.field109 + Client.clickedWidgetParent.height) { + var16 = Client.field109 + Client.clickedWidgetParent.height - var10.height; } var12 = var15; var13 = var16; } - if(!var10.isScrollBar) { + if (!var10.isScrollBar) { var14 = 128; } } int var17; int var18; + int var19; int var20; int var21; int var22; - int var30; - if(var10.type == 2) { + if (var10.type == 2) { var15 = var2; var16 = var3; var17 = var4; var18 = var5; - } else if(var10.type == 9) { - var30 = var12; - var20 = var13; - var21 = var12 + var10.width; - var22 = var13 + var10.height; - if(var21 < var12) { - var30 = var21; - var21 = var12; + } else if (var10.type == 9) { + var22 = var12; + var19 = var13; + var20 = var12 + var10.width; + var21 = var13 + var10.height; + if (var20 < var12) { + var22 = var20; + var20 = var12; } - if(var22 < var13) { - var20 = var22; - var22 = var13; + if (var21 < var13) { + var19 = var21; + var21 = var13; } + ++var20; ++var21; - ++var22; - var15 = var30 > var2?var30:var2; - var16 = var20 > var3?var20:var3; - var17 = var21 < var4?var21:var4; - var18 = var22 < var5?var22:var5; + var15 = var22 > var2 ? var22 : var2; + var16 = var19 > var3 ? var19 : var3; + var17 = var20 < var4 ? var20 : var4; + var18 = var21 < var5 ? var21 : var5; } else { - var30 = var12 + var10.width; - var20 = var13 + var10.height; - var15 = var12 > var2?var12:var2; - var16 = var13 > var3?var13:var3; - var17 = var30 < var4?var30:var4; - var18 = var20 < var5?var20:var5; + var22 = var12 + var10.width; + var19 = var13 + var10.height; + var15 = var12 > var2 ? var12 : var2; + var16 = var13 > var3 ? var13 : var3; + var17 = var22 < var4 ? var22 : var4; + var18 = var19 < var5 ? var19 : var5; } - if(!var10.isIf3 || var15 < var17 && var16 < var18) { - if(var10.contentType != 0) { - if(var10.contentType == 1336) { - if(Client.displayFps) { + if (!var10.isIf3 || var15 < var17 && var16 < var18) { + if (var10.contentType != 0) { + if (var10.contentType == 1336) { + if (Client.displayFps) { var13 += 15; fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 16776960, -1); var13 += 15; - Runtime var38 = Runtime.getRuntime(); - var20 = (int)((var38.totalMemory() - var38.freeMemory()) / 1024L); - var21 = 16776960; - if(var20 > 327680 && !Client.isLowDetail) { - var21 = 16711680; + Runtime var34 = Runtime.getRuntime(); + var19 = (int)((var34.totalMemory() - var34.freeMemory()) / 1024L); + var20 = 16776960; + if (var19 > 327680 && !Client.isLowDetail) { + var20 = 16711680; } - fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); + fontPlain12.drawRightAligned("Mem:" + var19 + "k", var12 + var10.width, var13, var20, -1); var13 += 15; } continue; } - if(var10.contentType == 1337) { - Client.__client_lq = var12; - Client.__client_ln = var13; + if (var10.contentType == 1337) { + Client.field216 = var12; + Client.field217 = var13; class40.drawEntities(var12, var13, var10.width, var10.height); - Client.__client_od[var10.rootIndex] = true; + Client.field100[var10.rootIndex] = true; Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); continue; } - if(var10.contentType == 1338) { + if (var10.contentType == 1338) { MouseRecorder.method1189(var10, var12, var13, var11); Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); continue; } - if(var10.contentType == 1339) { + if (var10.contentType == 1339) { class22.method296(var10, var12, var13, var11); Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); continue; } - if(var10.contentType == 1400) { + if (var10.contentType == 1400) { class60.worldMap0.draw(var12, var13, var10.width, var10.height, Client.cycle); } - if(var10.contentType == 1401) { + if (var10.contentType == 1401) { class60.worldMap0.drawOverview(var12, var13, var10.width, var10.height); } - if(var10.contentType == 1402) { + if (var10.contentType == 1402) { class16.loginScreenRunesAnimation.method1782(var12, Client.cycle); } } - if(var10.type == 0) { - if(!var10.isIf3 && PacketBufferNode.method3673(var10) && var10 != Clock.mousedOverWidgetIf1) { + if (var10.type == 0) { + if (!var10.isIf3 && PacketBufferNode.method3673(var10) && var10 != Clock.mousedOverWidgetIf1) { continue; } - if(!var10.isIf3) { - if(var10.scrollY > var10.scrollHeight - var10.height) { + if (!var10.isIf3) { + if (var10.scrollY > var10.scrollHeight - var10.height) { var10.scrollY = var10.scrollHeight - var10.height; } - if(var10.scrollY < 0) { + if (var10.scrollY < 0) { var10.scrollY = 0; } } drawWidgetGroup(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - if(var10.children != null) { + if (var10.children != null) { drawWidgetGroup(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); } - WidgetGroupParent var19 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var10.id); - if(var19 != null) { - Interpreter.drawWidgets(var19.group, var15, var16, var17, var18, var12, var13, var11); + WidgetGroupParent var23 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var10.id); + if (var23 != null) { + Interpreter.drawWidgets(var23.group, var15, var16, var17, var18, var12, var13, var11); } Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); Rasterizer3D.Rasterizer3D_method1(); } - if(Client.isResizable || Client.__client_oq[var11] || Client.gameDrawingMode > 1) { - if(var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { + if (Client.isResizable || Client.field101[var11] || Client.gameDrawingMode > 1) { + if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { class11.method148(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); } - if(var10.type != 1) { - int var23; + if (var10.type != 1) { int var24; int var25; int var26; - if(var10.type == 2) { - var30 = 0; + int var33; + if (var10.type == 2) { + var22 = 0; - for(var20 = 0; var20 < var10.rawHeight; ++var20) { - for(var21 = 0; var21 < var10.rawWidth; ++var21) { - var22 = var12 + var21 * (var10.paddingX + 32); - var23 = var13 + var20 * (var10.paddingY + 32); - if(var30 < 20) { - var22 += var10.inventoryXOffsets[var30]; - var23 += var10.inventoryYOffsets[var30]; + for (var19 = 0; var19 < var10.rawHeight; ++var19) { + for (var20 = 0; var20 < var10.rawWidth; ++var20) { + var21 = var12 + var20 * (var10.paddingX + 32); + var33 = var13 + var19 * (var10.paddingY + 32); + if (var22 < 20) { + var21 += var10.inventoryXOffsets[var22]; + var33 += var10.inventoryYOffsets[var22]; } - if(var10.itemIds[var30] <= 0) { - if(var10.inventorySprites != null && var30 < 20) { - Sprite var42 = var10.getInventorySprite(var30); - if(var42 != null) { - var42.drawAt2(var22, var23); - } else if(Widget.__ho_j) { + if (var10.itemIds[var22] <= 0) { + if (var10.inventorySprites != null && var22 < 20) { + Sprite var36 = var10.getInventorySprite(var22); + if (var36 != null) { + var36.drawAt2(var21, var33); + } else if (Widget.field957) { class22.method295(var10); } } } else { - boolean var39 = false; - boolean var40 = false; - var26 = var10.itemIds[var30] - 1; - if(var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == dragInventoryWidget && var30 == Client.dragItemSlotSource) { - Sprite var27; - if(Client.isItemSelected == 1 && var30 == HealthBarDefinition.selectedItemSlot && var10.id == ServerPacket.selectedItemWidget) { - var27 = class226.getItemSprite(var26, var10.itemQuantities[var30], 2, 0, 2, false); + boolean var35 = false; + boolean var46 = false; + var26 = var10.itemIds[var22] - 1; + if (var21 + 32 > var2 && var21 < var4 && var33 + 32 > var3 && var33 < var5 || var10 == dragInventoryWidget && var22 == Client.dragItemSlotSource) { + Sprite var42; + if (Client.isItemSelected == 1 && var22 == HealthBarDefinition.selectedItemSlot && var10.id == ServerPacket.selectedItemWidget) { + var42 = class226.getItemSprite(var26, var10.itemQuantities[var22], 2, 0, 2, false); } else { - var27 = class226.getItemSprite(var26, var10.itemQuantities[var30], 1, 3153952, 2, false); + var42 = class226.getItemSprite(var26, var10.itemQuantities[var22], 1, 3153952, 2, false); } - if(var27 != null) { - if(var10 == dragInventoryWidget && var30 == Client.dragItemSlotSource) { - var24 = MouseHandler.MouseHandler_x - Client.__client_ja; - var25 = MouseHandler.MouseHandler_y - Client.__client_je; - if(var24 < 5 && var24 > -5) { + if (var42 != null) { + if (var10 == dragInventoryWidget && var22 == Client.dragItemSlotSource) { + var24 = MouseHandler.MouseHandler_x - Client.field205; + var25 = MouseHandler.MouseHandler_y - Client.field206; + if (var24 < 5 && var24 > -5) { var24 = 0; } - if(var25 < 5 && var25 > -5) { + if (var25 < 5 && var25 > -5) { var25 = 0; } - if(Client.itemDragDuration < 5) { + if (Client.itemDragDuration < 5) { var24 = 0; var25 = 0; } - var27.__h_508(var22 + var24, var23 + var25, 128); - if(var1 != -1) { - Widget var28 = var0[var1 & 65535]; - int var29; - if(var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { - var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.__client_gy / 3; - if(var29 > Client.__client_gy * 10) { - var29 = Client.__client_gy * 10; + var42.method310(var21 + var24, var33 + var25, 128); + if (var1 != -1) { + Widget var47 = var0[var1 & 65535]; + int var45; + if (var33 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var47.scrollY > 0) { + var45 = (Rasterizer2D.Rasterizer2D_yClipStart - var33 - var25) * Client.field183 / 3; + if (var45 > Client.field183 * 10) { + var45 = Client.field183 * 10; } - if(var29 > var28.scrollY) { - var29 = var28.scrollY; + if (var45 > var47.scrollY) { + var45 = var47.scrollY; } - var28.scrollY -= var29; - Client.__client_je += var29; - class22.method295(var28); + var47.scrollY -= var45; + Client.field206 += var45; + class22.method295(var47); } - if(var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { - var29 = (var23 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.__client_gy / 3; - if(var29 > Client.__client_gy * 10) { - var29 = Client.__client_gy * 10; + if (var25 + var33 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var47.scrollY < var47.scrollHeight - var47.height) { + var45 = (var33 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field183 / 3; + if (var45 > Client.field183 * 10) { + var45 = Client.field183 * 10; } - if(var29 > var28.scrollHeight - var28.height - var28.scrollY) { - var29 = var28.scrollHeight - var28.height - var28.scrollY; + if (var45 > var47.scrollHeight - var47.height - var47.scrollY) { + var45 = var47.scrollHeight - var47.height - var47.scrollY; } - var28.scrollY += var29; - Client.__client_je -= var29; - class22.method295(var28); + var47.scrollY += var45; + Client.field206 -= var45; + class22.method295(var47); } } - } else if(var10 == BoundaryObject.__ej_jv && var30 == Client.__client_jz) { - var27.__h_508(var22, var23, 128); + } else if (var10 == BoundaryObject.field40 && var22 == Client.field204) { + var42.method310(var21, var33, 128); } else { - var27.drawAt2(var22, var23); + var42.drawAt2(var21, var33); } } else { class22.method295(var10); @@ -447,138 +447,138 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } } - ++var30; + ++var22; } } - } else if(var10.type == 3) { - if(class238.runCs1(var10)) { - var30 = var10.color2; - if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var30 = var10.mouseOverColor2; + } else if (var10.type == 3) { + if (class238.runCs1(var10)) { + var22 = var10.color2; + if (var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { + var22 = var10.mouseOverColor2; } } else { - var30 = var10.color; - if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var30 = var10.mouseOverColor; + var22 = var10.color; + if (var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { + var22 = var10.mouseOverColor; } } - if(var10.fill) { + if (var10.fill) { switch(var10.rectangleMode.id) { case 1: Rasterizer2D.drawGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); break; case 2: - Rasterizer2D.drawGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparency & 255), 255 - (var10.__af & 255)); + Rasterizer2D.drawGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparency & 255), 255 - (var10.field960 & 255)); break; default: - if(var14 == 0) { - Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var30); + if (var14 == 0) { + Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var22); } else { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255)); + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var22, 256 - (var14 & 255)); } } - } else if(var14 == 0) { - Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var30); + } else if (var14 == 0) { + Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var22); } else { - Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255)); + Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var22, 256 - (var14 & 255)); } } else { - Font var36; - if(var10.type == 4) { - var36 = var10.getFont(); - if(var36 == null) { - if(Widget.__ho_j) { + Font var27; + if (var10.type == 4) { + var27 = var10.getFont(); + if (var27 == null) { + if (Widget.field957) { class22.method295(var10); } } else { - String var45 = var10.text; - if(class238.runCs1(var10)) { - var20 = var10.color2; - if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var20 = var10.mouseOverColor2; + String var38 = var10.text; + if (class238.runCs1(var10)) { + var19 = var10.color2; + if (var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { + var19 = var10.mouseOverColor2; } - if(var10.text2.length() > 0) { - var45 = var10.text2; + if (var10.text2.length() > 0) { + var38 = var10.text2; } } else { - var20 = var10.color; - if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var20 = var10.mouseOverColor; + var19 = var10.color; + if (var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { + var19 = var10.mouseOverColor; } } - if(var10.isIf3 && var10.itemId != -1) { - ItemDefinition var46 = Skills.getItemDefinition(var10.itemId); - var45 = var46.name; - if(var45 == null) { - var45 = "null"; + if (var10.isIf3 && var10.itemId != -1) { + ItemDefinition var41 = Skills.getItemDefinition(var10.itemId); + var38 = var41.name; + if (var38 == null) { + var38 = "null"; } - if((var46.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { - var45 = BufferedFile.colorStartTag(16748608) + var45 + "" + " " + 'x' + GrandExchangeEvent.method88(var10.itemQuantity); + if ((var41.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { + var38 = BufferedFile.colorStartTag(16748608) + var38 + " " + 'x' + GrandExchangeEvent.method88(var10.itemQuantity); } } - if(var10 == Client.__client_mo) { - var45 = "Please wait..."; - var20 = var10.color; + if (var10 == Client.field127) { + var38 = "Please wait..."; + var19 = var10.color; } - if(!var10.isIf3) { - var45 = MouseRecorder.method1194(var45, var10); + if (!var10.isIf3) { + var38 = MouseRecorder.method1194(var38, var10); } - var36.drawLines(var45, var12, var13, var10.width, var10.height, var20, var10.textShadowed?0:-1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); + var27.drawLines(var38, var12, var13, var10.width, var10.height, var19, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); } - } else if(var10.type == 5) { + } else if (var10.type == 5) { Sprite var37; - if(!var10.isIf3) { + if (!var10.isIf3) { var37 = var10.getSprite(class238.runCs1(var10)); - if(var37 != null) { + if (var37 != null) { var37.drawAt2(var12, var13); - } else if(Widget.__ho_j) { + } else if (Widget.field957) { class22.method295(var10); } } else { - if(var10.itemId != -1) { + if (var10.itemId != -1) { var37 = class226.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); } else { var37 = var10.getSprite(false); } - if(var37 == null) { - if(Widget.__ho_j) { + if (var37 == null) { + if (Widget.field957) { class22.method295(var10); } } else { - var20 = var37.width; - var21 = var37.height; - if(!var10.spriteTiling) { - var22 = var10.width * 4096 / var20; - if(var10.spriteAngle != 0) { - var37.__ak_515(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); - } else if(var14 != 0) { - var37.__c_509(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); - } else if(var20 == var10.width && var21 == var10.height) { + var19 = var37.width; + var20 = var37.height; + if (!var10.spriteTiling) { + var21 = var10.width * 4096 / var19; + if (var10.spriteAngle != 0) { + var37.method317(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var21); + } else if (var14 != 0) { + var37.method311(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); + } else if (var19 == var10.width && var20 == var10.height) { var37.drawAt2(var12, var13); } else { - var37.__j_506(var12, var13, var10.width, var10.height); + var37.method309(var12, var13, var10.width, var10.height); } } else { Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); - var22 = (var20 - 1 + var10.width) / var20; - var23 = (var21 - 1 + var10.height) / var21; + var21 = (var19 - 1 + var10.width) / var19; + var33 = (var20 - 1 + var10.height) / var20; - for(var24 = 0; var24 < var22; ++var24) { - for(var25 = 0; var25 < var23; ++var25) { - if(var10.spriteAngle != 0) { - var37.__ak_515(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); - } else if(var14 != 0) { - var37.__h_508(var12 + var20 * var24, var13 + var21 * var25, 256 - (var14 & 255)); + for (var24 = 0; var24 < var21; ++var24) { + for (var25 = 0; var25 < var33; ++var25) { + if (var10.spriteAngle != 0) { + var37.method317(var19 / 2 + var12 + var19 * var24, var20 / 2 + var13 + var25 * var20, var10.spriteAngle, 4096); + } else if (var14 != 0) { + var37.method310(var12 + var19 * var24, var13 + var20 * var25, 256 - (var14 & 255)); } else { - var37.drawAt2(var12 + var20 * var24, var13 + var25 * var21); + var37.drawAt2(var12 + var19 * var24, var13 + var25 * var20); } } } @@ -588,179 +588,179 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } } } else { - ItemDefinition var34; - if(var10.type == 6) { - boolean var43 = class238.runCs1(var10); - if(var43) { - var20 = var10.sequenceId2; + ItemDefinition var28; + if (var10.type == 6) { + boolean var40 = class238.runCs1(var10); + if (var40) { + var19 = var10.sequenceId2; } else { - var20 = var10.sequenceId; + var19 = var10.sequenceId; } - Model var41 = null; - var22 = 0; - if(var10.itemId != -1) { - var34 = Skills.getItemDefinition(var10.itemId); - if(var34 != null) { - var34 = var34.__x_430(var10.itemQuantity); - var41 = var34.getModel(1); - if(var41 != null) { - var41.calculateBoundsCylinder(); - var22 = var41.height / 2; + Model var43 = null; + var21 = 0; + if (var10.itemId != -1) { + var28 = Skills.getItemDefinition(var10.itemId); + if (var28 != null) { + var28 = var28.method144(var10.itemQuantity); + var43 = var28.getModel(1); + if (var43 != null) { + var43.calculateBoundsCylinder(); + var21 = var43.height / 2; } else { class22.method295(var10); } } - } else if(var10.modelType == 5) { - if(var10.modelId == 0) { - var41 = Client.__client_ru.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); + } else if (var10.modelType == 5) { + if (var10.modelId == 0) { + var43 = Client.field119.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); } else { - var41 = Canvas.localPlayer.getModel(); + var43 = Canvas.localPlayer.getModel(); } - } else if(var20 == -1) { - var41 = var10.getModel((SequenceDefinition)null, -1, var43, Canvas.localPlayer.appearance); - if(var41 == null && Widget.__ho_j) { + } else if (var19 == -1) { + var43 = var10.getModel((SequenceDefinition)null, -1, var40, Canvas.localPlayer.appearance); + if (var43 == null && Widget.field957) { class22.method295(var10); } } else { - SequenceDefinition var47 = WorldMapAreaData.getSequenceDefinition(var20); - var41 = var10.getModel(var47, var10.modelFrame, var43, Canvas.localPlayer.appearance); - if(var41 == null && Widget.__ho_j) { + SequenceDefinition var44 = WorldMapAreaData.getSequenceDefinition(var19); + var43 = var10.getModel(var44, var10.modelFrame, var40, Canvas.localPlayer.appearance); + if (var43 == null && Widget.field957) { class22.method295(var10); } } Rasterizer3D.method2989(var10.width / 2 + var12, var10.height / 2 + var13); - var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; + var33 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; - if(var41 != null) { - if(!var10.isIf3) { - var41.__c_234(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); + if (var43 != null) { + if (!var10.isIf3) { + var43.method199(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var33, var24); } else { - var41.calculateBoundsCylinder(); - if(var10.modelOrthog) { - var41.__p_235(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + var43.calculateBoundsCylinder(); + if (var10.modelOrthog) { + var43.method200(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var21 + var33 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); } else { - var41.__c_234(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); + var43.method199(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var33 + var21 + var10.modelOffsetY, var24 + var10.modelOffsetY); } } } Rasterizer3D.Rasterizer3D_method3(); } else { - if(var10.type == 7) { - var36 = var10.getFont(); - if(var36 == null) { - if(Widget.__ho_j) { + if (var10.type == 7) { + var27 = var10.getFont(); + if (var27 == null) { + if (Widget.field957) { class22.method295(var10); } continue; } - var20 = 0; + var19 = 0; - for(var21 = 0; var21 < var10.rawHeight; ++var21) { - for(var22 = 0; var22 < var10.rawWidth; ++var22) { - if(var10.itemIds[var20] > 0) { - var34 = Skills.getItemDefinition(var10.itemIds[var20] - 1); - String var31; - if(var34.isStackable != 1 && var10.itemQuantities[var20] == 1) { - var31 = BufferedFile.colorStartTag(16748608) + var34.name + ""; + for (var20 = 0; var20 < var10.rawHeight; ++var20) { + for (var21 = 0; var21 < var10.rawWidth; ++var21) { + if (var10.itemIds[var19] > 0) { + var28 = Skills.getItemDefinition(var10.itemIds[var19] - 1); + String var29; + if (var28.isStackable != 1 && var10.itemQuantities[var19] == 1) { + var29 = BufferedFile.colorStartTag(16748608) + var28.name + ""; } else { - var31 = BufferedFile.colorStartTag(16748608) + var34.name + "" + " " + 'x' + GrandExchangeEvent.method88(var10.itemQuantities[var20]); + var29 = BufferedFile.colorStartTag(16748608) + var28.name + " " + 'x' + GrandExchangeEvent.method88(var10.itemQuantities[var19]); } - var25 = var22 * (var10.paddingX + 115) + var12; - var26 = var21 * (var10.paddingY + 12) + var13; - if(var10.textXAlignment == 0) { - var36.draw(var31, var25, var26, var10.color, var10.textShadowed?0:-1); - } else if(var10.textXAlignment == 1) { - var36.drawCentered(var31, var10.width / 2 + var25, var26, var10.color, var10.textShadowed?0:-1); + var25 = var21 * (var10.paddingX + 115) + var12; + var26 = var20 * (var10.paddingY + 12) + var13; + if (var10.textXAlignment == 0) { + var27.draw(var29, var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else if (var10.textXAlignment == 1) { + var27.drawCentered(var29, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); } else { - var36.drawRightAligned(var31, var25 + var10.width - 1, var26, var10.color, var10.textShadowed?0:-1); + var27.drawRightAligned(var29, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); } } - ++var20; + ++var19; } } } - if(var10.type == 8 && var10 == AccessFile.__dk_lm && Client.__client_ls == Client.__client_lb) { - var30 = 0; - var20 = 0; - Font var32 = fontPlain12; - String var33 = var10.text; + if (var10.type == 8 && var10 == AccessFile.field8 && Client.field219 == Client.field218) { + var22 = 0; + var19 = 0; + Font var39 = fontPlain12; + String var30 = var10.text; - String var44; - for(var33 = MouseRecorder.method1194(var33, var10); var33.length() > 0; var20 = var20 + var32.ascent + 1) { - var24 = var33.indexOf("
"); - if(var24 != -1) { - var44 = var33.substring(0, var24); - var33 = var33.substring(var24 + 4); + String var31; + for (var30 = MouseRecorder.method1194(var30, var10); var30.length() > 0; var19 = var19 + var39.ascent + 1) { + var24 = var30.indexOf("
"); + if (var24 != -1) { + var31 = var30.substring(0, var24); + var30 = var30.substring(var24 + 4); } else { - var44 = var33; - var33 = ""; + var31 = var30; + var30 = ""; } - var25 = var32.stringWidth(var44); - if(var25 > var30) { - var30 = var25; + var25 = var39.stringWidth(var31); + if (var25 > var22) { + var22 = var25; } } - var30 += 6; - var20 += 7; - var24 = var12 + var10.width - 5 - var30; + var22 += 6; + var19 += 7; + var24 = var12 + var10.width - 5 - var22; var25 = var13 + var10.height + 5; - if(var24 < var12 + 5) { + if (var24 < var12 + 5) { var24 = var12 + 5; } - if(var30 + var24 > var4) { - var24 = var4 - var30; + if (var22 + var24 > var4) { + var24 = var4 - var22; } - if(var25 + var20 > var5) { - var25 = var5 - var20; + if (var25 + var19 > var5) { + var25 = var5 - var19; } - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var30, var20, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var30, var20, 0); - var33 = var10.text; - var26 = var25 + var32.ascent + 2; + Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var22, var19, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var22, var19, 0); + var30 = var10.text; + var26 = var25 + var39.ascent + 2; - for(var33 = MouseRecorder.method1194(var33, var10); var33.length() > 0; var26 = var26 + var32.ascent + 1) { - int var35 = var33.indexOf("
"); - if(var35 != -1) { - var44 = var33.substring(0, var35); - var33 = var33.substring(var35 + 4); + for (var30 = MouseRecorder.method1194(var30, var10); var30.length() > 0; var26 = var26 + var39.ascent + 1) { + int var32 = var30.indexOf("
"); + if (var32 != -1) { + var31 = var30.substring(0, var32); + var30 = var30.substring(var32 + 4); } else { - var44 = var33; - var33 = ""; + var31 = var30; + var30 = ""; } - var32.draw(var44, var24 + 3, var26, 0, -1); + var39.draw(var31, var24 + 3, var26, 0, -1); } } - if(var10.type == 9) { - if(var10.__ba) { - var30 = var12; - var20 = var13 + var10.height; - var21 = var12 + var10.width; - var22 = var13; + if (var10.type == 9) { + if (var10.field961) { + var22 = var12; + var19 = var13 + var10.height; + var20 = var12 + var10.width; + var21 = var13; } else { - var30 = var12; - var20 = var13; - var21 = var12 + var10.width; - var22 = var13 + var10.height; + var22 = var12; + var19 = var13; + var20 = var12 + var10.width; + var21 = var13 + var10.height; } - if(var10.lineWid == 1) { - Rasterizer2D.Rasterizer2D_drawLine(var30, var20, var21, var22, var10.color); + if (var10.lineWid == 1) { + Rasterizer2D.Rasterizer2D_drawLine(var22, var19, var20, var21, var10.color); } else { - class190.method3669(var30, var20, var21, var22, var10.color, var10.lineWid); + class190.method3669(var22, var19, var20, var21, var10.color, var10.lineWid); } } } @@ -781,17 +781,17 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { garbageValue = "-1666917204" ) static final void method845(int var0) { - if(GroundItemPile.loadWidgetGroup(var0)) { + if (GroundItemPile.loadWidgetGroup(var0)) { Widget[] var1 = Widget.widgets[var0]; - for(int var2 = 0; var2 < var1.length; ++var2) { + for (int var2 = 0; var2 < var1.length; ++var2) { Widget var3 = var1[var2]; - if(var3 != null) { + if (var3 != null) { var3.modelFrame = 0; var3.modelFrameCycle = 0; } } - } + } } diff --git a/runescape-client/src/main/java/DualNode.java b/runescape-client/src/main/java/DualNode.java index 434d68ecff..640d22b969 100644 --- a/runescape-client/src/main/java/DualNode.java +++ b/runescape-client/src/main/java/DualNode.java @@ -25,11 +25,12 @@ public class DualNode extends Node { @ObfuscatedName("cg") @Export("removeDual") public void removeDual() { - if(this.nextDual != null) { + if (this.nextDual != null) { this.nextDual.previousDual = this.previousDual; this.previousDual.nextDual = this.nextDual; this.previousDual = null; this.nextDual = null; } + } } diff --git a/runescape-client/src/main/java/DualNodeDeque.java b/runescape-client/src/main/java/DualNodeDeque.java index b84ff91bd3..89f3fa326b 100644 --- a/runescape-client/src/main/java/DualNodeDeque.java +++ b/runescape-client/src/main/java/DualNodeDeque.java @@ -25,7 +25,7 @@ public final class DualNodeDeque { ) @Export("addFirst") public void addFirst(DualNode var1) { - if(var1.nextDual != null) { + if (var1.nextDual != null) { var1.removeDual(); } @@ -41,7 +41,7 @@ public final class DualNodeDeque { ) @Export("addLast") public void addLast(DualNode var1) { - if(var1.nextDual != null) { + if (var1.nextDual != null) { var1.removeDual(); } @@ -58,7 +58,7 @@ public final class DualNodeDeque { @Export("removeLast") public DualNode removeLast() { DualNode var1 = this.sentinel.previousDual; - if(var1 == this.sentinel) { + if (var1 == this.sentinel) { return null; } else { var1.removeDual(); @@ -73,15 +73,15 @@ public final class DualNodeDeque { @Export("last") public DualNode last() { DualNode var1 = this.sentinel.previousDual; - return var1 == this.sentinel?null:var1; + return var1 == this.sentinel ? null : var1; } @ObfuscatedName("u") @Export("clear") public void clear() { - while(true) { + while (true) { DualNode var1 = this.sentinel.previousDual; - if(var1 == this.sentinel) { + if (var1 == this.sentinel) { return; } @@ -94,7 +94,7 @@ public final class DualNodeDeque { signature = "(Lfn;Lfn;)V" ) public static void method5220(DualNode var0, DualNode var1) { - if(var0.nextDual != null) { + if (var0.nextDual != null) { var0.removeDual(); } diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index af0b3ff97a..31c8470632 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -74,27 +74,27 @@ public class DynamicObject extends Entity { @ObfuscatedSignature( signature = "(IIIIIIIZLex;)V" ) - DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int animationID, boolean var8, Entity var9) { + DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Entity var9) { this.id = var1; this.type = var2; this.orientation = var3; this.plane = var4; this.x = var5; this.y = var6; - if(animationID != -1) { - this.sequenceDefinition = WorldMapAreaData.getSequenceDefinition(animationID); + if (var7 != -1) { + this.sequenceDefinition = WorldMapAreaData.getSequenceDefinition(var7); this.frame = 0; this.cycleStart = Client.cycle - 1; - if(this.sequenceDefinition.__t == 0 && var9 != null && var9 instanceof DynamicObject) { + if (this.sequenceDefinition.field783 == 0 && var9 != null && var9 instanceof DynamicObject) { DynamicObject var10 = (DynamicObject)var9; - if(this.sequenceDefinition == var10.sequenceDefinition) { + if (this.sequenceDefinition == var10.sequenceDefinition) { this.frame = var10.frame; this.cycleStart = var10.cycleStart; return; } } - if(var8 && this.sequenceDefinition.frameCount != -1) { + if (var8 && this.sequenceDefinition.frameCount != -1) { this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length); this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]); } @@ -109,17 +109,17 @@ public class DynamicObject extends Entity { ) @Export("getModel") protected final Model getModel() { - if(this.sequenceDefinition != null) { + if (this.sequenceDefinition != null) { int var1 = Client.cycle - this.cycleStart; - if(var1 > 100 && this.sequenceDefinition.frameCount > 0) { + if (var1 > 100 && this.sequenceDefinition.frameCount > 0) { var1 = 100; } - label55: { + label47: { do { do { - if(var1 <= this.sequenceDefinition.frameLengths[this.frame]) { - break label55; + if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { + break label47; } var1 -= this.sequenceDefinition.frameLengths[this.frame]; @@ -136,16 +136,16 @@ public class DynamicObject extends Entity { } ObjectDefinition var12 = class50.getObjectDefinition(this.id); - if(var12.transforms != null) { + if (var12.transforms != null) { var12 = var12.transform(); } - if(var12 == null) { + if (var12 == null) { return null; } else { int var2; int var3; - if(this.orientation != 1 && this.orientation != 3) { + if (this.orientation != 1 && this.orientation != 3) { var2 = var12.sizeX; var3 = var12.sizeY; } else { @@ -171,7 +171,7 @@ public class DynamicObject extends Entity { garbageValue = "1172859329" ) static void method2218(String[] var0, short[] var1, int var2, int var3) { - if(var2 < var3) { + if (var2 < var3) { int var4 = (var3 + var2) / 2; int var5 = var2; String var6 = var0[var4]; @@ -181,8 +181,8 @@ public class DynamicObject extends Entity { var1[var4] = var1[var3]; var1[var3] = var7; - for(int var8 = var2; var8 < var3; ++var8) { - if(var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { + for (int var8 = var2; var8 < var3; ++var8) { + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { String var9 = var0[var8]; var0[var8] = var0[var5]; var0[var5] = var9; @@ -208,53 +208,54 @@ public class DynamicObject extends Entity { garbageValue = "-83" ) static int method2223(int var0, Script var1, boolean var2) { - if(var0 == 5000) { + if (var0 == 5000) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.publicChatMode; return 1; - } else if(var0 == 5001) { + } else if (var0 == 5001) { 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) { + if (IndexCacheLoader.field512 == null) { IndexCacheLoader.field512 = class310.field3805; } - 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); - var18.packetBuffer.writeByte(Client.__client_pl); - Client.packetWriter.__q_167(var18); + Client.field138 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; + PacketBufferNode var15 = Interpreter.method1915(ClientPacket.field237, Client.packetWriter.isaacCipher); + var15.packetBuffer.writeByte(Client.publicChatMode); + var15.packetBuffer.writeByte(IndexCacheLoader.field512.field3804); + var15.packetBuffer.writeByte(Client.field138); + Client.packetWriter.method241(var15); return 1; } else { String var3; int var4; - if(var0 == 5002) { + int var5; + if (var0 == 5002) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; 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); - var6.packetBuffer.writeByte(var4 - 1); - var6.packetBuffer.writeByte(var5); - Client.packetWriter.__q_167(var6); + var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + PacketBufferNode var13 = Interpreter.method1915(ClientPacket.field260, Client.packetWriter.isaacCipher); + var13.packetBuffer.writeByte(WorldMapRegion.method550(var3) + 2); + var13.packetBuffer.writeStringCp1252NullTerminated(var3); + var13.packetBuffer.writeByte(var4 - 1); + var13.packetBuffer.writeByte(var5); + Client.packetWriter.method241(var13); return 1; } else { - int var10; - if(var0 == 5003) { + Message var11; + if (var0 == 5003) { RouteStrategy.Interpreter_intStackSize -= 2; - var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var5 = 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[++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[++RouteStrategy.Interpreter_intStackSize - 1] = var15.isFromFriend()?1:(var15.isFromIgnored()?2:0); + var11 = Message.method1226(var5, var4); + if (var11 != null) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.count; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.cycle; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.sender != null ? var11.sender : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.prefix != null ? var11.prefix : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.text != null ? var11.text : ""; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.isFromFriend() ? 1 : (var11.isFromIgnored() ? 2 : 0); } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; @@ -265,16 +266,16 @@ public class DynamicObject extends Entity { } return 1; - } else if(var0 == 5004) { - var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Message var16 = NetCache.method4708(var10); - if(var16 != null) { - 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[++RouteStrategy.Interpreter_intStackSize - 1] = var16.isFromFriend()?1:(var16.isFromIgnored()?2:0); + } else if (var0 == 5004) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + var11 = NetCache.method4708(var5); + if (var11 != null) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.type; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.cycle; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.sender != null ? var11.sender : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.prefix != null ? var11.prefix : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.text != null ? var11.text : ""; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.isFromFriend() ? 1 : (var11.isFromIgnored() ? 2 : 0); } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; @@ -285,195 +286,198 @@ public class DynamicObject extends Entity { } return 1; - } else if(var0 == 5005) { - if(IndexCacheLoader.field512 == null) { + } else if (var0 == 5005) { + if (IndexCacheLoader.field512 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { 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[--RouteStrategy.Interpreter_intStackSize]; - String var14 = var3.toLowerCase(); - byte var17 = 0; - if(var14.startsWith("yellow:")) { - var17 = 0; - var3 = var3.substring("yellow:".length()); - } else if(var14.startsWith("red:")) { - var17 = 1; - var3 = var3.substring("red:".length()); - } else if(var14.startsWith("green:")) { - var17 = 2; - var3 = var3.substring("green:".length()); - } else if(var14.startsWith("cyan:")) { - var17 = 3; - var3 = var3.substring("cyan:".length()); - } else if(var14.startsWith("purple:")) { - var17 = 4; - var3 = var3.substring("purple:".length()); - } else if(var14.startsWith("white:")) { - var17 = 5; - var3 = var3.substring("white:".length()); - } else if(var14.startsWith("flash1:")) { - var17 = 6; - var3 = var3.substring("flash1:".length()); - } else if(var14.startsWith("flash2:")) { - var17 = 7; - var3 = var3.substring("flash2:".length()); - } else if(var14.startsWith("flash3:")) { - var17 = 8; - var3 = var3.substring("flash3:".length()); - } else if(var14.startsWith("glow1:")) { - var17 = 9; - var3 = var3.substring("glow1:".length()); - } else if(var14.startsWith("glow2:")) { - var17 = 10; - var3 = var3.substring("glow2:".length()); - } else if(var14.startsWith("glow3:")) { - var17 = 11; - var3 = var3.substring("glow3:".length()); - } else if(Client.language != 0) { - if(var14.startsWith("yellow:")) { - var17 = 0; - var3 = var3.substring("yellow:".length()); - } else if(var14.startsWith("red:")) { - var17 = 1; - var3 = var3.substring("red:".length()); - } else if(var14.startsWith("green:")) { - var17 = 2; - var3 = var3.substring("green:".length()); - } else if(var14.startsWith("cyan:")) { - var17 = 3; - var3 = var3.substring("cyan:".length()); - } else if(var14.startsWith("purple:")) { - var17 = 4; - var3 = var3.substring("purple:".length()); - } else if(var14.startsWith("white:")) { - var17 = 5; - var3 = var3.substring("white:".length()); - } else if(var14.startsWith("flash1:")) { - var17 = 6; - var3 = var3.substring("flash1:".length()); - } else if(var14.startsWith("flash2:")) { - var17 = 7; - var3 = var3.substring("flash2:".length()); - } else if(var14.startsWith("flash3:")) { - var17 = 8; - var3 = var3.substring("flash3:".length()); - } else if(var14.startsWith("glow1:")) { - var17 = 9; - var3 = var3.substring("glow1:".length()); - } else if(var14.startsWith("glow2:")) { - var17 = 10; - var3 = var3.substring("glow2:".length()); - } else if(var14.startsWith("glow3:")) { - var17 = 11; - var3 = var3.substring("glow3:".length()); - } - } - - var14 = var3.toLowerCase(); - byte var7 = 0; - if(var14.startsWith("wave:")) { - var7 = 1; - var3 = var3.substring("wave:".length()); - } else if(var14.startsWith("wave2:")) { - var7 = 2; - var3 = var3.substring("wave2:".length()); - } else if(var14.startsWith("shake:")) { - var7 = 3; - var3 = var3.substring("shake:".length()); - } else if(var14.startsWith("scroll:")) { - var7 = 4; - var3 = var3.substring("scroll:".length()); - } else if(var14.startsWith("slide:")) { - var7 = 5; - var3 = var3.substring("slide:".length()); - } else if(Client.language != 0) { - if(var14.startsWith("wave:")) { - var7 = 1; - var3 = var3.substring("wave:".length()); - } else if(var14.startsWith("wave2:")) { - var7 = 2; - var3 = var3.substring("wave2:".length()); - } else if(var14.startsWith("shake:")) { - var7 = 3; - var3 = var3.substring("shake:".length()); - } else if(var14.startsWith("scroll:")) { - var7 = 4; - var3 = var3.substring("scroll:".length()); - } else if(var14.startsWith("slide:")) { - var7 = 5; - var3 = var3.substring("slide:".length()); - } - } - - PacketBufferNode var8 = Interpreter.method1915(ClientPacket.__gs_cz, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(0); - int var9 = var8.packetBuffer.index; - var8.packetBuffer.writeByte(var4); - var8.packetBuffer.writeByte(var17); - var8.packetBuffer.writeByte(var7); - TextureProvider.method2777(var8.packetBuffer, var3); - var8.packetBuffer.__h_300(var8.packetBuffer.index - var9); - Client.packetWriter.__q_167(var8); - return 1; - } else if(var0 == 5009) { - Interpreter.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; - String var12 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; - PacketBufferNode var11 = Interpreter.method1915(ClientPacket.__gs_v, Client.packetWriter.isaacCipher); - var11.packetBuffer.writeShort(0); - int var13 = var11.packetBuffer.index; - var11.packetBuffer.writeStringCp1252NullTerminated(var3); - TextureProvider.method2777(var11.packetBuffer, var12); - var11.packetBuffer.__y_299(var11.packetBuffer.index - var13); - Client.packetWriter.__q_167(var11); - return 1; - } else if(var0 != 5015) { - if(var0 == 5016) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.__client_pl; - return 1; - } else if(var0 == 5017) { - 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[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class12.method161(var10); - return 1; - } else if(var0 == 5019) { - 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.doCheat(var3); - return 1; - } else if(var0 == 5021) { - Client.__client_pz = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim(); - return 1; - } else if(var0 == 5022) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.__client_pz; - return 1; - } else if(var0 == 5023) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - System.out.println(var3); - return 1; - } else { - return 2; - } } else { - if(Canvas.localPlayer != null && Canvas.localPlayer.username != null) { - var3 = Canvas.localPlayer.username.getName(); - } else { - var3 = ""; - } + String var6; + if (var0 == 5008) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + var6 = var3.toLowerCase(); + byte var12 = 0; + if (var6.startsWith("yellow:")) { + var12 = 0; + var3 = var3.substring("yellow:".length()); + } else if (var6.startsWith("red:")) { + var12 = 1; + var3 = var3.substring("red:".length()); + } else if (var6.startsWith("green:")) { + var12 = 2; + var3 = var3.substring("green:".length()); + } else if (var6.startsWith("cyan:")) { + var12 = 3; + var3 = var3.substring("cyan:".length()); + } else if (var6.startsWith("purple:")) { + var12 = 4; + var3 = var3.substring("purple:".length()); + } else if (var6.startsWith("white:")) { + var12 = 5; + var3 = var3.substring("white:".length()); + } else if (var6.startsWith("flash1:")) { + var12 = 6; + var3 = var3.substring("flash1:".length()); + } else if (var6.startsWith("flash2:")) { + var12 = 7; + var3 = var3.substring("flash2:".length()); + } else if (var6.startsWith("flash3:")) { + var12 = 8; + var3 = var3.substring("flash3:".length()); + } else if (var6.startsWith("glow1:")) { + var12 = 9; + var3 = var3.substring("glow1:".length()); + } else if (var6.startsWith("glow2:")) { + var12 = 10; + var3 = var3.substring("glow2:".length()); + } else if (var6.startsWith("glow3:")) { + var12 = 11; + var3 = var3.substring("glow3:".length()); + } else if (Client.language != 0) { + if (var6.startsWith("yellow:")) { + var12 = 0; + var3 = var3.substring("yellow:".length()); + } else if (var6.startsWith("red:")) { + var12 = 1; + var3 = var3.substring("red:".length()); + } else if (var6.startsWith("green:")) { + var12 = 2; + var3 = var3.substring("green:".length()); + } else if (var6.startsWith("cyan:")) { + var12 = 3; + var3 = var3.substring("cyan:".length()); + } else if (var6.startsWith("purple:")) { + var12 = 4; + var3 = var3.substring("purple:".length()); + } else if (var6.startsWith("white:")) { + var12 = 5; + var3 = var3.substring("white:".length()); + } else if (var6.startsWith("flash1:")) { + var12 = 6; + var3 = var3.substring("flash1:".length()); + } else if (var6.startsWith("flash2:")) { + var12 = 7; + var3 = var3.substring("flash2:".length()); + } else if (var6.startsWith("flash3:")) { + var12 = 8; + var3 = var3.substring("flash3:".length()); + } else if (var6.startsWith("glow1:")) { + var12 = 9; + var3 = var3.substring("glow1:".length()); + } else if (var6.startsWith("glow2:")) { + var12 = 10; + var3 = var3.substring("glow2:".length()); + } else if (var6.startsWith("glow3:")) { + var12 = 11; + var3 = var3.substring("glow3:".length()); + } + } - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; - return 1; + var6 = var3.toLowerCase(); + byte var14 = 0; + if (var6.startsWith("wave:")) { + var14 = 1; + var3 = var3.substring("wave:".length()); + } else if (var6.startsWith("wave2:")) { + var14 = 2; + var3 = var3.substring("wave2:".length()); + } else if (var6.startsWith("shake:")) { + var14 = 3; + var3 = var3.substring("shake:".length()); + } else if (var6.startsWith("scroll:")) { + var14 = 4; + var3 = var3.substring("scroll:".length()); + } else if (var6.startsWith("slide:")) { + var14 = 5; + var3 = var3.substring("slide:".length()); + } else if (Client.language != 0) { + if (var6.startsWith("wave:")) { + var14 = 1; + var3 = var3.substring("wave:".length()); + } else if (var6.startsWith("wave2:")) { + var14 = 2; + var3 = var3.substring("wave2:".length()); + } else if (var6.startsWith("shake:")) { + var14 = 3; + var3 = var3.substring("shake:".length()); + } else if (var6.startsWith("scroll:")) { + var14 = 4; + var3 = var3.substring("scroll:".length()); + } else if (var6.startsWith("slide:")) { + var14 = 5; + var3 = var3.substring("slide:".length()); + } + } + + PacketBufferNode var9 = Interpreter.method1915(ClientPacket.field319, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByte(0); + int var10 = var9.packetBuffer.index; + var9.packetBuffer.writeByte(var4); + var9.packetBuffer.writeByte(var12); + var9.packetBuffer.writeByte(var14); + TextureProvider.method2777(var9.packetBuffer, var3); + var9.packetBuffer.method41(var9.packetBuffer.index - var10); + Client.packetWriter.method241(var9); + return 1; + } else if (var0 == 5009) { + Interpreter.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; + var6 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; + PacketBufferNode var7 = Interpreter.method1915(ClientPacket.field247, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeShort(0); + int var8 = var7.packetBuffer.index; + var7.packetBuffer.writeStringCp1252NullTerminated(var3); + TextureProvider.method2777(var7.packetBuffer, var6); + var7.packetBuffer.method40(var7.packetBuffer.index - var8); + Client.packetWriter.method241(var7); + return 1; + } else if (var0 != 5015) { + if (var0 == 5016) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.field138; + return 1; + } else if (var0 == 5017) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WidgetGroupParent.method1174(var5); + return 1; + } else if (var0 == 5018) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class12.method161(var5); + return 1; + } else if (var0 == 5019) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SpriteMask.method4391(var5); + return 1; + } else if (var0 == 5020) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + BoundaryObject.doCheat(var3); + return 1; + } else if (var0 == 5021) { + Client.field158 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim(); + return 1; + } else if (var0 == 5022) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.field158; + return 1; + } else if (var0 == 5023) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + System.out.println(var3); + return 1; + } else { + return 2; + } + } else { + if (Canvas.localPlayer != null && Canvas.localPlayer.username != null) { + var3 = Canvas.localPlayer.username.getName(); + } else { + var3 = ""; + } + + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; + return 1; + } } } } @@ -486,36 +490,35 @@ public class DynamicObject extends Entity { ) protected static int method2222() { int var0 = 0; - if(AbstractIndexCache.garbageCollector == null || !AbstractIndexCache.garbageCollector.isValid()) { + if (AbstractIndexCache.garbageCollector == null || !AbstractIndexCache.garbageCollector.isValid()) { try { Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); - while(var1.hasNext()) { + while (var1.hasNext()) { GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); - if(var2.isValid()) { + if (var2.isValid()) { AbstractIndexCache.garbageCollector = var2; GameShell.garbageCollectorLastCheckTimeMs = -1L; GameShell.garbageCollectorLastCollectionTime = -1L; } } - } catch (Throwable var11) { - ; + } catch (Throwable var9) { } } - if(AbstractIndexCache.garbageCollector != null) { - long var9 = class203.currentTimeMs(); + if (AbstractIndexCache.garbageCollector != null) { + long var10 = class203.currentTimeMs(); long var3 = AbstractIndexCache.garbageCollector.getCollectionTime(); - if(GameShell.garbageCollectorLastCollectionTime != -1L) { + if (GameShell.garbageCollectorLastCollectionTime != -1L) { long var5 = var3 - GameShell.garbageCollectorLastCollectionTime; - long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs; - if(0L != var7) { + long var7 = var10 - GameShell.garbageCollectorLastCheckTimeMs; + if (0L != var7) { var0 = (int)(var5 * 100L / var7); } } GameShell.garbageCollectorLastCollectionTime = var3; - GameShell.garbageCollectorLastCheckTimeMs = var9; + GameShell.garbageCollectorLastCheckTimeMs = var10; } return var0; @@ -527,9 +530,9 @@ public class DynamicObject extends Entity { garbageValue = "2072073729" ) static final void method2224(int var0, int var1, boolean var2) { - if(!var2 || var0 != GameObject.__eh_fy || WorldMapLabelSize.__s_fi != var1) { - GameObject.__eh_fy = var0; - WorldMapLabelSize.__s_fi = var1; + if (!var2 || var0 != GameObject.field359 || WorldMapLabelSize.field1041 != var1) { + GameObject.field359 = var0; + WorldMapLabelSize.field1041 = var1; GameShell.updateGameState(25); class68.drawLoadingMessage("Loading - please wait.", true); int var3 = class50.baseX; @@ -542,76 +545,81 @@ public class DynamicObject extends Entity { var4 = GraphicsObject.baseY; int var7; - int var9; - for(var7 = 0; var7 < 32768; ++var7) { - Npc var8 = Client.npcs[var7]; - if(var8 != null) { - for(var9 = 0; var9 < 10; ++var9) { - var8.pathX[var9] -= var5; - var8.pathY[var9] -= var6; + int var8; + int[] var10000; + for (var7 = 0; var7 < 32768; ++var7) { + NPC var9 = Client.npcs[var7]; + if (var9 != null) { + for (var8 = 0; var8 < 10; ++var8) { + var10000 = var9.pathX; + var10000[var8] -= var5; + var10000 = var9.pathY; + var10000[var8] -= var6; } - var8.x -= var5 * 128; - var8.y -= var6 * 128; + var9.x -= var5 * 128; + var9.y -= var6 * 128; } } - for(var7 = 0; var7 < 2048; ++var7) { - Player var21 = Client.players[var7]; - if(var21 != null) { - for(var9 = 0; var9 < 10; ++var9) { - var21.pathX[var9] -= var5; - var21.pathY[var9] -= var6; + for (var7 = 0; var7 < 2048; ++var7) { + Player var20 = Client.players[var7]; + if (var20 != null) { + for (var8 = 0; var8 < 10; ++var8) { + var10000 = var20.pathX; + var10000[var8] -= var5; + var10000 = var20.pathY; + var10000[var8] -= var6; } - var21.x -= var5 * 128; - var21.y -= var6 * 128; + var20.x -= var5 * 128; + var20.y -= var6 * 128; } } - byte var20 = 0; - byte var18 = 104; - byte var22 = 1; - if(var5 < 0) { - var20 = 103; - var18 = -1; - var22 = -1; - } - - byte var10 = 0; - byte var11 = 104; - byte var12 = 1; - if(var6 < 0) { - var10 = 103; + byte var21 = 0; + byte var10 = 104; + byte var11 = 1; + if (var5 < 0) { + var21 = 103; + var10 = -1; var11 = -1; - var12 = -1; } - int var14; - for(int var13 = var20; var13 != var18; var13 += var22) { - for(var14 = var10; var11 != var14; var14 += var12) { - int var15 = var13 + var5; - int var16 = var14 + var6; + byte var12 = 0; + byte var13 = 104; + byte var14 = 1; + if (var6 < 0) { + var12 = 103; + var13 = -1; + var14 = -1; + } - for(int var17 = 0; var17 < 4; ++var17) { - if(var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { - Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; + int var15; + for (int var16 = var21; var16 != var10; var16 += var11) { + for (var15 = var12; var13 != var15; var15 += var14) { + int var17 = var16 + var5; + int var18 = var15 + var6; + + for (int var19 = 0; var19 < 4; ++var19) { + if (var17 >= 0 && var18 >= 0 && var17 < 104 && var18 < 104) { + Client.groundItems[var19][var16][var15] = Client.groundItems[var19][var17][var18]; } else { - Client.groundItems[var17][var13][var14] = null; + Client.groundItems[var19][var16][var15] = null; } } } } - for(class68 var19 = (class68)Client.__client_kh.last(); var19 != null; var19 = (class68)Client.__client_kh.previous()) { - var19.field913 -= var5; - var19.field901 -= var6; - if(var19.field913 < 0 || var19.field901 < 0 || var19.field913 >= 104 || var19.field901 >= 104) { - var19.remove(); + for (class68 var22 = (class68)Client.field214.last(); var22 != null; var22 = (class68)Client.field214.previous()) { + var22.field913 -= var5; + var22.field901 -= var6; + if (var22.field913 < 0 || var22.field901 < 0 || var22.field913 >= 104 || var22.field901 >= 104) { + var22.remove(); } } - if(Client.destinationX != 0) { + if (Client.destinationX != 0) { Client.destinationX -= var5; Client.destinationY -= var6; } @@ -622,14 +630,14 @@ public class DynamicObject extends Entity { class11.cameraZ -= var6 << 7; MouseHandler.oculusOrbFocalPointX -= var5 << 7; ScriptEvent.oculusOrbFocalPointY -= var6 << 7; - Client.__client_ph = -1; + Client.field125 = -1; Client.graphicsObjects.clear(); Client.projectiles.clear(); - for(var14 = 0; var14 < 4; ++var14) { - Client.collisionMaps[var14].clear(); + for (var15 = 0; var15 < 4; ++var15) { + Client.collisionMaps[var15].clear(); } - } + } } diff --git a/runescape-client/src/main/java/Entity.java b/runescape-client/src/main/java/Entity.java index e1b55d193e..e0778c1f42 100644 --- a/runescape-client/src/main/java/Entity.java +++ b/runescape-client/src/main/java/Entity.java @@ -32,7 +32,7 @@ public abstract class Entity extends DualNode { @Export("renderDraw") void renderDraw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { Model var11 = this.getModel(); - if(var11 != null) { + if (var11 != null) { this.height = var11.height; var11.renderDraw(var1, var2, var3, var4, var5, var6, var7, var8, var9); } diff --git a/runescape-client/src/main/java/EnumDefinition.java b/runescape-client/src/main/java/EnumDefinition.java index 28d6576ba4..c66cf81e96 100644 --- a/runescape-client/src/main/java/EnumDefinition.java +++ b/runescape-client/src/main/java/EnumDefinition.java @@ -50,10 +50,6 @@ public class EnumDefinition extends DualNode { @Export("stringVals") public String[] stringVals; - static { - EnumDefinition_cached = new EvictingDualNodeHashTable(64); - } - EnumDefinition() { this.defaultString = "null"; this.size0 = 0; @@ -66,9 +62,9 @@ public class EnumDefinition extends DualNode { ) @Export("read") void read(Buffer var1) { - while(true) { + while (true) { int var2 = var1.readUnsignedByte(); - if(var2 == 0) { + if (var2 == 0) { return; } @@ -83,31 +79,31 @@ public class EnumDefinition extends DualNode { ) @Export("readNext") void readNext(Buffer var1, int var2) { - if(var2 == 1) { + if (var2 == 1) { this.keyType = (char)var1.readUnsignedByte(); - } else if(var2 == 2) { + } else if (var2 == 2) { this.valType = (char)var1.readUnsignedByte(); - } else if(var2 == 3) { + } else if (var2 == 3) { this.defaultString = var1.readStringCp1252NullTerminated(); - } else if(var2 == 4) { + } else if (var2 == 4) { this.defaultInt = var1.readInt(); } else { int var3; - if(var2 == 5) { - this.size0 = var1.__ag_302(); + if (var2 == 5) { + this.size0 = var1.method43(); this.keys = new int[this.size0]; this.stringVals = new String[this.size0]; - for(var3 = 0; var3 < this.size0; ++var3) { + for (var3 = 0; var3 < this.size0; ++var3) { this.keys[var3] = var1.readInt(); this.stringVals[var3] = var1.readStringCp1252NullTerminated(); } - } else if(var2 == 6) { - this.size0 = var1.__ag_302(); + } else if (var2 == 6) { + this.size0 = var1.method43(); this.keys = new int[this.size0]; this.intVals = new int[this.size0]; - for(var3 = 0; var3 < this.size0; ++var3) { + for (var3 = 0; var3 < this.size0; ++var3) { this.keys[var3] = var1.readInt(); this.intVals[var3] = var1.readInt(); } @@ -125,4 +121,8 @@ public class EnumDefinition extends DualNode { public int size() { return this.size0; } + + static { + EnumDefinition_cached = new EvictingDualNodeHashTable(64); + } } diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index c655b8180b..f05386d31e 100644 --- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java +++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java @@ -10,7 +10,7 @@ public final class EvictingDualNodeHashTable { @ObfuscatedSignature( signature = "Lfn;" ) - DualNode __m; + DualNode field343; @ObfuscatedName("f") @Export("capacity") int capacity; @@ -31,14 +31,13 @@ public final class EvictingDualNodeHashTable { DualNodeDeque deque; public EvictingDualNodeHashTable(int var1) { - this.__m = new DualNode(); + this.field343 = new DualNode(); this.deque = new DualNodeDeque(); this.capacity = var1; this.remainingCapacity = var1; int var2; - for(var2 = 1; var2 + var2 < var1; var2 += var2) { - ; + for (var2 = 1; var2 + var2 < var1; var2 += var2) { } this.hashTable = new NodeHashTable(var2); @@ -51,7 +50,7 @@ public final class EvictingDualNodeHashTable { @Export("get") public DualNode get(long var1) { DualNode var3 = (DualNode)this.hashTable.get(var1); - if(var3 != null) { + if (var3 != null) { this.deque.addFirst(var3); } @@ -62,7 +61,7 @@ public final class EvictingDualNodeHashTable { @Export("remove") public void remove(long var1) { DualNode var3 = (DualNode)this.hashTable.get(var1); - if(var3 != null) { + if (var3 != null) { var3.remove(); var3.removeDual(); ++this.remainingCapacity; @@ -76,11 +75,11 @@ public final class EvictingDualNodeHashTable { ) @Export("put") public void put(DualNode var1, long var2) { - if(this.remainingCapacity == 0) { + if (this.remainingCapacity == 0) { DualNode var4 = this.deque.removeLast(); var4.remove(); var4.removeDual(); - if(var4 == this.__m) { + if (var4 == this.field343) { var4 = this.deque.removeLast(); var4.remove(); var4.removeDual(); @@ -98,7 +97,7 @@ public final class EvictingDualNodeHashTable { public void clear() { this.deque.clear(); this.hashTable.clear(); - this.__m = new DualNode(); + this.field343 = new DualNode(); this.remainingCapacity = this.capacity; } } diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java index 88ab031bd5..4257d4d4b5 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -1,6 +1,5 @@ import java.applet.Applet; import java.net.URL; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -14,27 +13,27 @@ public class FaceNormal { @ObfuscatedGetter( intValue = 422473713 ) - public static int __el_x; + public static int field344; @ObfuscatedName("gm") @ObfuscatedSignature( signature = "Lln;" ) - static Sprite __el_gm; + static Sprite field345; @ObfuscatedName("m") @ObfuscatedGetter( intValue = -2074333261 ) - int __m; + int field346; @ObfuscatedName("f") @ObfuscatedGetter( intValue = -1376860893 ) - int __f; + int field347; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 2619977 ) - int __q; + int field348; @ObfuscatedName("f") @ObfuscatedSignature( @@ -44,12 +43,12 @@ public class FaceNormal { static Script method3236(int var0, int var1, int var2) { int var3 = UnitPriceComparator.method125(var1, var0); Script var4 = WidgetGroupParent.method1175(var3, var0); - if(var4 != null) { + if (var4 != null) { return var4; } else { var3 = PacketBuffer.method4081(var2, var0); var4 = WidgetGroupParent.method1175(var3, var0); - return var4 != null?var4:null; + return var4 != null ? var4 : null; } } @@ -59,17 +58,17 @@ public class FaceNormal { garbageValue = "-1495992318" ) static boolean method3237(String var0, int var1, String var2) { - if(var1 == 0) { + if (var1 == 0) { try { - if(!class50.__af_f.startsWith("win")) { + if (!class50.field1160.startsWith("win")) { throw new Exception(); - } else if(!var0.startsWith("http://") && !var0.startsWith("https://")) { + } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { throw new Exception(); } else { - String var13 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; + String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; - for(int var4 = 0; var4 < var0.length(); ++var4) { - if(var13.indexOf(var0.charAt(var4)) == -1) { + for (int var12 = 0; var12 < var0.length(); ++var12) { + if (var11.indexOf(var0.charAt(var12)) == -1) { throw new Exception(); } } @@ -77,36 +76,35 @@ public class FaceNormal { Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); return true; } - } catch (Throwable var8) { + } catch (Throwable var6) { return false; } - } else if(var1 == 1) { + } else if (var1 == 1) { try { - Applet var7 = class50.__af_m; - Object[] var5 = new Object[]{(new URL(class50.__af_m.getCodeBase(), var0)).toString()}; - Object var3 = JSObject.getWindow(var7).call(var2, var5); - return var3 != null; - } catch (Throwable var9) { + Applet var3 = class50.field1159; + Object[] var4 = new Object[]{(new URL(class50.field1159.getCodeBase(), var0)).toString()}; + Object var5 = JSObject.getWindow(var3).call(var2, var4); + return var5 != null; + } catch (Throwable var7) { return false; } - } else if(var1 == 2) { + } else if (var1 == 2) { try { - class50.__af_m.getAppletContext().showDocument(new URL(class50.__af_m.getCodeBase(), var0), "_blank"); + class50.field1159.getAppletContext().showDocument(new URL(class50.field1159.getCodeBase(), var0), "_blank"); return true; - } catch (Exception var10) { + } catch (Exception var8) { return false; } - } else if(var1 == 3) { + } else if (var1 == 3) { try { - class46.method851(class50.__af_m, "loggedout"); - } catch (Throwable var12) { - ; + class46.method851(class50.field1159, "loggedout"); + } catch (Throwable var10) { } try { - class50.__af_m.getAppletContext().showDocument(new URL(class50.__af_m.getCodeBase(), var0), "_top"); + class50.field1159.getAppletContext().showDocument(new URL(class50.field1159.getCodeBase(), var0), "_top"); return true; - } catch (Exception var11) { + } catch (Exception var9) { return false; } } else { diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index da05438d44..83b04eb080 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -63,47 +63,47 @@ public final class FloorDecoration { ) static int method2853(AbstractIndexCache var0, AbstractIndexCache var1) { int var2 = 0; - if(var0.tryLoadRecordByNames("title.jpg", "")) { + if (var0.tryLoadRecordByNames("title.jpg", "")) { ++var2; } - if(var1.tryLoadRecordByNames("logo", "")) { + if (var1.tryLoadRecordByNames("logo", "")) { ++var2; } - if(var1.tryLoadRecordByNames("logo_deadman_mode", "")) { + if (var1.tryLoadRecordByNames("logo_deadman_mode", "")) { ++var2; } - if(var1.tryLoadRecordByNames("titlebox", "")) { + if (var1.tryLoadRecordByNames("titlebox", "")) { ++var2; } - if(var1.tryLoadRecordByNames("titlebutton", "")) { + if (var1.tryLoadRecordByNames("titlebutton", "")) { ++var2; } - if(var1.tryLoadRecordByNames("runes", "")) { + if (var1.tryLoadRecordByNames("runes", "")) { ++var2; } - if(var1.tryLoadRecordByNames("title_mute", "")) { + if (var1.tryLoadRecordByNames("title_mute", "")) { ++var2; } - if(var1.tryLoadRecordByNames("options_radio_buttons,0", "")) { + if (var1.tryLoadRecordByNames("options_radio_buttons,0", "")) { ++var2; } - if(var1.tryLoadRecordByNames("options_radio_buttons,2", "")) { + if (var1.tryLoadRecordByNames("options_radio_buttons,2", "")) { ++var2; } - if(var1.tryLoadRecordByNames("options_radio_buttons,4", "")) { + if (var1.tryLoadRecordByNames("options_radio_buttons,4", "")) { ++var2; } - if(var1.tryLoadRecordByNames("options_radio_buttons,6", "")) { + if (var1.tryLoadRecordByNames("options_radio_buttons,6", "")) { ++var2; } diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java index 55ef8f5fe3..ca70b027cd 100644 --- a/runescape-client/src/main/java/Font.java +++ b/runescape-client/src/main/java/Font.java @@ -21,7 +21,7 @@ public final class Font extends AbstractFont { int var9 = 0; int var10 = 0; int var11; - if(var3 < Rasterizer2D.Rasterizer2D_yClipStart) { + if (var3 < Rasterizer2D.Rasterizer2D_yClipStart) { var11 = Rasterizer2D.Rasterizer2D_yClipStart - var3; var5 -= var11; var3 = Rasterizer2D.Rasterizer2D_yClipStart; @@ -29,11 +29,11 @@ public final class Font extends AbstractFont { var7 += var11 * Rasterizer2D.Rasterizer2D_width; } - if(var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) { var5 -= var3 + var5 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if(var2 < Rasterizer2D.Rasterizer2D_xClipStart) { + if (var2 < Rasterizer2D.Rasterizer2D_xClipStart) { var11 = Rasterizer2D.Rasterizer2D_xClipStart - var2; var4 -= var11; var2 = Rasterizer2D.Rasterizer2D_xClipStart; @@ -43,16 +43,17 @@ public final class Font extends AbstractFont { var8 += var11; } - if(var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) { + if (var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) { var11 = var2 + var4 - Rasterizer2D.Rasterizer2D_xClipEnd; var4 -= var11; var9 += var11; var8 += var11; } - if(var4 > 0 && var5 > 0) { + if (var4 > 0 && var5 > 0) { AbstractFont.AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var10, var7, var4, var5, var8, var9); } + } @ObfuscatedName("f") @@ -63,7 +64,7 @@ public final class Font extends AbstractFont { int var10 = 0; int var11 = 0; int var12; - if(var3 < Rasterizer2D.Rasterizer2D_yClipStart) { + if (var3 < Rasterizer2D.Rasterizer2D_yClipStart) { var12 = Rasterizer2D.Rasterizer2D_yClipStart - var3; var5 -= var12; var3 = Rasterizer2D.Rasterizer2D_yClipStart; @@ -71,11 +72,11 @@ public final class Font extends AbstractFont { var8 += var12 * Rasterizer2D.Rasterizer2D_width; } - if(var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) { var5 -= var3 + var5 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if(var2 < Rasterizer2D.Rasterizer2D_xClipStart) { + if (var2 < Rasterizer2D.Rasterizer2D_xClipStart) { var12 = Rasterizer2D.Rasterizer2D_xClipStart - var2; var4 -= var12; var2 = Rasterizer2D.Rasterizer2D_xClipStart; @@ -85,15 +86,16 @@ public final class Font extends AbstractFont { var9 += var12; } - if(var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) { + if (var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) { var12 = var2 + var4 - Rasterizer2D.Rasterizer2D_xClipEnd; var4 -= var12; var10 += var12; var9 += var12; } - if(var4 > 0 && var5 > 0) { + if (var4 > 0 && var5 > 0) { AbstractFont.AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var11, var8, var4, var5, var9, var10, var7); } + } } diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 89099885cc..7e7b4c6584 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -43,19 +43,10 @@ public class FontName { @Export("FontName_verdana15") public static final FontName FontName_verdana15; @ObfuscatedName("g") - String __g; - - static { - FontName_plain11 = new FontName("p11_full"); - FontName_plain12 = new FontName("p12_full"); - FontName_bold12 = new FontName("b12_full"); - FontName_verdana11 = new FontName("verdana_11pt_regular"); - FontName_verdana13 = new FontName("verdana_13pt_regular"); - FontName_verdana15 = new FontName("verdana_15pt_regular"); - } + String field349; FontName(String var1) { - this.__g = var1; + this.field349 = var1; } @ObfuscatedName("u") @@ -65,7 +56,7 @@ public class FontName { ) public static long method5637(int var0, int var1, int var2, boolean var3, int var4) { long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; - if(var3) { + if (var3) { var5 |= 65536L; } @@ -91,11 +82,11 @@ public class FontName { garbageValue = "-871458249" ) static final void method5638(String var0, int var1) { - PacketBufferNode var2 = Interpreter.method1915(ClientPacket.__gs_bw, Client.packetWriter.isaacCipher); + PacketBufferNode var2 = Interpreter.method1915(ClientPacket.field299, Client.packetWriter.isaacCipher); var2.packetBuffer.writeByte(WorldMapRegion.method550(var0) + 1); var2.packetBuffer.writeStringCp1252NullTerminated(var0); var2.packetBuffer.writeByte(var1); - Client.packetWriter.__q_167(var2); + Client.packetWriter.method241(var2); } @ObfuscatedName("av") @@ -104,10 +95,10 @@ public class FontName { garbageValue = "-1336396061" ) static int method5639(int var0, Script var1, boolean var2) { - if(var0 == 3600) { - if(WorldMapArea.friendSystem.__g == 0) { + if (var0 == 3600) { + if (WorldMapArea.friendSystem.field357 == 0) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -2; - } else if(WorldMapArea.friendSystem.__g == 1) { + } else if (WorldMapArea.friendSystem.field357 == 1) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.friendsList.size(); @@ -116,30 +107,30 @@ public class FontName { return 1; } else { int var3; - if(var0 == 3601) { + if (var0 == 3601) { 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(); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.previousName(); + if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) { + Friend var6 = (Friend)WorldMapArea.friendSystem.friendsList.get(var3); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.name(); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.previousName(); } else { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } return 1; - } else if(var0 == 3602) { + } else if (var0 == 3602) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - if(WorldMapArea.friendSystem.__m_151() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) { + if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)WorldMapArea.friendSystem.friendsList.get(var3)).world0; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; - } else if(var0 == 3603) { + } else if (var0 == 3603) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - if(WorldMapArea.friendSystem.__m_151() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) { + if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)WorldMapArea.friendSystem.friendsList.get(var3)).rank; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; @@ -147,297 +138,297 @@ public class FontName { return 1; } else { - String var5; - if(var0 == 3604) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - int var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - method5638(var5, var6); + String var4; + if (var0 == 3604) { + var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + int var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + method5638(var4, var8); return 1; - } else if(var0 == 3605) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - WorldMapArea.friendSystem.__l_157(var5); + } else if (var0 == 3605) { + var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + WorldMapArea.friendSystem.method103(var4); return 1; - } else if(var0 == 3606) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - WorldMapArea.friendSystem.removeFriend(var5); + } else if (var0 == 3606) { + var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + WorldMapArea.friendSystem.removeFriend(var4); return 1; - } else if(var0 == 3607) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - WorldMapArea.friendSystem.__x_159(var5); + } else if (var0 == 3607) { + var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + WorldMapArea.friendSystem.method105(var4); return 1; - } else if(var0 == 3608) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - WorldMapArea.friendSystem.removeIgnore(var5); + } else if (var0 == 3608) { + var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + WorldMapArea.friendSystem.removeIgnore(var4); return 1; - } else if(var0 == 3609) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var5 = NpcDefinition.method5161(var5); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isFriended(new Username(var5, KeyHandler.loginType), false)?1:0; + } else if (var0 == 3609) { + var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var4 = NPCDefinition.method5161(var4); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isFriended(new Username(var4, KeyHandler.loginType), false) ? 1 : 0; return 1; - } else if(var0 == 3611) { - if(PacketWriter.clanChat != null) { + } else if (var0 == 3611) { + if (PacketWriter.clanChat != null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketWriter.clanChat.name; } else { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } return 1; - } else if(var0 == 3612) { - if(PacketWriter.clanChat != null) { + } else if (var0 == 3612) { + if (PacketWriter.clanChat != null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat.size(); } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; - } else if(var0 == 3613) { + } else if (var0 == 3613) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) { + if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketWriter.clanChat.get(var3).username().getName(); } else { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } return 1; - } else if(var0 == 3614) { + } else if (var0 == 3614) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) { + if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)PacketWriter.clanChat.get(var3)).world(); } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; - } else if(var0 == 3615) { + } else if (var0 == 3615) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) { + if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)PacketWriter.clanChat.get(var3)).rank; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; - } else if(var0 == 3616) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null?PacketWriter.clanChat.__k:0; + } else if (var0 == 3616) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null ? PacketWriter.clanChat.field96 : 0; return 1; - } else if(var0 == 3617) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - IndexStoreActionHandler.method4655(var5); + } else if (var0 == 3617) { + var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + IndexStoreActionHandler.method4655(var4); return 1; - } else if(var0 == 3618) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null?PacketWriter.clanChat.rank:0; + } else if (var0 == 3618) { + 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]; - class31.method574(var5); + } else if (var0 == 3619) { + var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + class31.method574(var4); return 1; - } else if(var0 == 3620) { + } else if (var0 == 3620) { class12.method158(); return 1; - } else if(var0 == 3621) { - if(!WorldMapArea.friendSystem.__m_151()) { + } else if (var0 == 3621) { + if (!WorldMapArea.friendSystem.method99()) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.ignoreList.size(); } return 1; - } else if(var0 == 3622) { + } else if (var0 == 3622) { 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(); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.previousName(); + if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.ignoreList.size()) { + Ignored var7 = (Ignored)WorldMapArea.friendSystem.ignoreList.get(var3); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.name(); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.previousName(); } else { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } return 1; - } else if(var0 == 3623) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var5 = NpcDefinition.method5161(var5); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isIgnored(new Username(var5, KeyHandler.loginType))?1:0; + } else if (var0 == 3623) { + var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var4 = NPCDefinition.method5161(var4); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isIgnored(new Username(var4, KeyHandler.loginType)) ? 1 : 0; return 1; - } else if(var0 == 3624) { + } else if (var0 == 3624) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && PacketWriter.clanChat.get(var3).username().equals(Canvas.localPlayer.username)) { + 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[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; - } else if(var0 == 3625) { - if(PacketWriter.clanChat != null && PacketWriter.clanChat.owner != null) { + } else if (var0 == 3625) { + if (PacketWriter.clanChat != null && PacketWriter.clanChat.owner != null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketWriter.clanChat.owner; } else { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } return 1; - } else if(var0 == 3626) { + } else if (var0 == 3626) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && ((ClanMate)PacketWriter.clanChat.get(var3)).isFriend()) { + if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && ((ClanMate)PacketWriter.clanChat.get(var3)).isFriend()) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; - } else if(var0 != 3627) { - if(var0 == 3628) { + } else if (var0 != 3627) { + if (var0 == 3628) { WorldMapArea.friendSystem.friendsList.removeComparator(); return 1; } else { - boolean var7; - if(var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator1(var7)); + boolean var5; + if (var0 == 3629) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator1(var5)); return 1; - } else if(var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator2(var7)); + } else if (var0 == 3630) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator2(var5)); return 1; - } else if(var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator3(var7)); + } else if (var0 == 3631) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator3(var5)); return 1; - } else if(var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator4(var7)); + } else if (var0 == 3632) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator4(var5)); return 1; - } else if(var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator5(var7)); + } else if (var0 == 3633) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator5(var5)); return 1; - } else if(var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator6(var7)); + } else if (var0 == 3634) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator6(var5)); return 1; - } else if(var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator7(var7)); + } else if (var0 == 3635) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator7(var5)); return 1; - } else if(var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator8(var7)); + } else if (var0 == 3636) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator8(var5)); return 1; - } else if(var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator9(var7)); + } else if (var0 == 3637) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator9(var5)); return 1; - } else if(var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator10(var7)); + } else if (var0 == 3638) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator10(var5)); return 1; - } else if(var0 == 3639) { + } else if (var0 == 3639) { WorldMapArea.friendSystem.friendsList.sort(); return 1; - } else if(var0 == 3640) { + } else if (var0 == 3640) { WorldMapArea.friendSystem.ignoreList.removeComparator(); return 1; - } else if(var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - WorldMapArea.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); + } else if (var0 == 3641) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + WorldMapArea.friendSystem.ignoreList.addComparator(new UserComparator1(var5)); return 1; - } else if(var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - WorldMapArea.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); + } else if (var0 == 3642) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + WorldMapArea.friendSystem.ignoreList.addComparator(new UserComparator2(var5)); return 1; - } else if(var0 == 3643) { + } else if (var0 == 3643) { WorldMapArea.friendSystem.ignoreList.sort(); return 1; - } else if(var0 == 3644) { - if(PacketWriter.clanChat != null) { + } else if (var0 == 3644) { + if (PacketWriter.clanChat != null) { PacketWriter.clanChat.removeComparator(); } return 1; - } else if(var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - if(PacketWriter.clanChat != null) { - PacketWriter.clanChat.addComparator(new UserComparator1(var7)); + } else if (var0 == 3645) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + if (PacketWriter.clanChat != null) { + PacketWriter.clanChat.addComparator(new UserComparator1(var5)); } return 1; - } else if(var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - if(PacketWriter.clanChat != null) { - PacketWriter.clanChat.addComparator(new UserComparator2(var7)); + } else if (var0 == 3646) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + if (PacketWriter.clanChat != null) { + PacketWriter.clanChat.addComparator(new UserComparator2(var5)); } return 1; - } else if(var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - if(PacketWriter.clanChat != null) { - PacketWriter.clanChat.addComparator(new UserComparator3(var7)); + } else if (var0 == 3647) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + if (PacketWriter.clanChat != null) { + PacketWriter.clanChat.addComparator(new UserComparator3(var5)); } return 1; - } else if(var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - if(PacketWriter.clanChat != null) { - PacketWriter.clanChat.addComparator(new UserComparator4(var7)); + } else if (var0 == 3648) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + if (PacketWriter.clanChat != null) { + PacketWriter.clanChat.addComparator(new UserComparator4(var5)); } return 1; - } else if(var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - if(PacketWriter.clanChat != null) { - PacketWriter.clanChat.addComparator(new UserComparator5(var7)); + } else if (var0 == 3649) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + if (PacketWriter.clanChat != null) { + PacketWriter.clanChat.addComparator(new UserComparator5(var5)); } return 1; - } else if(var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - if(PacketWriter.clanChat != null) { - PacketWriter.clanChat.addComparator(new UserComparator6(var7)); + } else if (var0 == 3650) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + if (PacketWriter.clanChat != null) { + PacketWriter.clanChat.addComparator(new UserComparator6(var5)); } return 1; - } else if(var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - if(PacketWriter.clanChat != null) { - PacketWriter.clanChat.addComparator(new UserComparator7(var7)); + } else if (var0 == 3651) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + if (PacketWriter.clanChat != null) { + PacketWriter.clanChat.addComparator(new UserComparator7(var5)); } return 1; - } else if(var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - if(PacketWriter.clanChat != null) { - PacketWriter.clanChat.addComparator(new UserComparator8(var7)); + } else if (var0 == 3652) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + if (PacketWriter.clanChat != null) { + PacketWriter.clanChat.addComparator(new UserComparator8(var5)); } return 1; - } else if(var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - if(PacketWriter.clanChat != null) { - PacketWriter.clanChat.addComparator(new UserComparator9(var7)); + } else if (var0 == 3653) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + if (PacketWriter.clanChat != null) { + PacketWriter.clanChat.addComparator(new UserComparator9(var5)); } return 1; - } else if(var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - if(PacketWriter.clanChat != null) { - PacketWriter.clanChat.addComparator(new UserComparator10(var7)); + } else if (var0 == 3654) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + if (PacketWriter.clanChat != null) { + PacketWriter.clanChat.addComparator(new UserComparator10(var5)); } return 1; - } else if(var0 == 3655) { - if(PacketWriter.clanChat != null) { + } else if (var0 == 3655) { + if (PacketWriter.clanChat != null) { PacketWriter.clanChat.sort(); } return 1; - } else if(var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - WorldMapArea.friendSystem.friendsList.addComparator(new class157(var7)); + } else if (var0 == 3656) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + WorldMapArea.friendSystem.friendsList.addComparator(new class157(var5)); return 1; - } else if(var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - if(PacketWriter.clanChat != null) { - PacketWriter.clanChat.addComparator(new class157(var7)); + } else if (var0 == 3657) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + if (PacketWriter.clanChat != null) { + PacketWriter.clanChat.addComparator(new class157(var5)); } return 1; @@ -447,7 +438,7 @@ public class FontName { } } else { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && ((ClanMate)PacketWriter.clanChat.get(var3)).isIgnored()) { + if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && ((ClanMate)PacketWriter.clanChat.get(var3)).isIgnored()) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; @@ -472,31 +463,31 @@ public class FontName { WorldMapLabel.method440(); LoginScreenAnimation.method1780(); SequenceDefinition.SequenceDefinition_cached.clear(); - SequenceDefinition.__jh_o.clear(); + SequenceDefinition.field775.clear(); UserComparator3.method3379(); VarbitDefinition.VarbitDefinition_cached.clear(); VarpDefinition.VarpDefinition_cached.clear(); GrandExchangeEvents.method69(); Buffer.clearHealthbarCaches(); - StructDefinition.__jq_f.clear(); + StructDefinition.field886.clear(); InvDefinition.method4754(); Projectile.method2089(); PlayerAppearance.PlayerAppearance_cachedModels.clear(); class157.method3382(); ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); Script.Script_cached.clear(); - AbstractIndexCache.indexCache0.__b_400(); - Skeleton.indexCache1.__b_400(); - WorldMapIcon1.indexCache3.__b_400(); - class25.indexCache4.__b_400(); - SecureRandomFuture.indexCache5.__b_400(); - UserComparator3.indexCache6.__b_400(); - class40.indexCache7.__b_400(); - WorldMapSection3.indexCache8.__b_400(); - class238.indexCache9.__b_400(); - class16.indexCache10.__b_400(); - Login.indexCache11.__b_400(); - Formatting.indexCache12.__b_400(); + AbstractIndexCache.indexCache0.method8(); + Skeleton.indexCache1.method8(); + WorldMapIcon1.indexCache3.method8(); + class25.indexCache4.method8(); + SecureRandomFuture.indexCache5.method8(); + UserComparator3.indexCache6.method8(); + class40.indexCache7.method8(); + WorldMapSection3.indexCache8.method8(); + class238.indexCache9.method8(); + class16.indexCache10.method8(); + Login.indexCache11.method8(); + Formatting.indexCache12.method8(); } @ObfuscatedName("gg") @@ -506,36 +497,36 @@ public class FontName { ) @Export("setViewportShape") static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { - if(var2 < 1) { + if (var2 < 1) { var2 = 1; } - if(var3 < 1) { + if (var3 < 1) { var3 = 1; } int var5 = var3 - 334; int var6; - if(var5 < 0) { - var6 = Client.__client_rw; - } else if(var5 >= 100) { - var6 = Client.__client_rm; + if (var5 < 0) { + var6 = Client.field130; + } else if (var5 >= 100) { + var6 = Client.field131; } else { - var6 = (Client.__client_rm - Client.__client_rw) * var5 / 100 + Client.__client_rw; + var6 = (Client.field131 - Client.field130) * var5 / 100 + Client.field130; } int var7 = var3 * var6 * 512 / (var2 * 334); int var8; int var9; short var10; - if(var7 < Client.__client_rs) { - var10 = Client.__client_rs; + if (var7 < Client.field132) { + var10 = Client.field132; var6 = var10 * var2 * 334 / (var3 * 512); - if(var6 > Client.__client_ri) { - var6 = Client.__client_ri; + if (var6 > Client.field134) { + var6 = Client.field134; var8 = var3 * var6 * 512 / (var10 * 334); var9 = (var2 - var8) / 2; - if(var4) { + if (var4) { Rasterizer2D.Rasterizer2D_resetClip(); Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); @@ -544,14 +535,14 @@ public class FontName { var0 += var9; var2 -= var9 * 2; } - } else if(var7 > Client.__client_rp) { - var10 = Client.__client_rp; + } else if (var7 > Client.field133) { + var10 = Client.field133; var6 = var10 * var2 * 334 / (var3 * 512); - if(var6 < Client.__client_rv) { - var6 = Client.__client_rv; + if (var6 < Client.field135) { + var6 = Client.field135; var8 = var10 * var2 * 334 / (var6 * 512); var9 = (var3 - var8) / 2; - if(var4) { + if (var4) { Rasterizer2D.Rasterizer2D_resetClip(); Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); @@ -563,7 +554,7 @@ public class FontName { } Client.viewportZoom = var3 * var6 / 334; - if(var2 != Client.viewportWidth || var3 != Client.viewportHeight) { + if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { ScriptEvent.method1183(var2, var3); } @@ -579,10 +570,19 @@ public class FontName { garbageValue = "51" ) static final void method5635() { - for(int var0 = 0; var0 < Players.Players_count; ++var0) { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { Player var1 = Client.players[Players.Players_indices[var0]]; var1.clearIsInClanChat(); } } + + static { + FontName_plain11 = new FontName("p11_full"); + FontName_plain12 = new FontName("p12_full"); + FontName_bold12 = new FontName("b12_full"); + FontName_verdana11 = new FontName("verdana_11pt_regular"); + FontName_verdana13 = new FontName("verdana_13pt_regular"); + FontName_verdana15 = new FontName("verdana_15pt_regular"); + } } diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index 98f2077878..dd41db27c5 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -14,7 +14,7 @@ public class Fonts { @Export("indexStore255") static IndexStore indexStore255; @ObfuscatedName("o") - static byte[][][] __kz_o; + static byte[][][] field350; @ObfuscatedName("l") @ObfuscatedSignature( signature = "Lln;" @@ -25,12 +25,12 @@ public class Fonts { @ObfuscatedSignature( signature = "Lir;" ) - AbstractIndexCache __m; + AbstractIndexCache field351; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - AbstractIndexCache __f; + AbstractIndexCache field352; @ObfuscatedName("q") @Export("map") HashMap map; @@ -39,8 +39,8 @@ public class Fonts { signature = "(Lir;Lir;)V" ) public Fonts(AbstractIndexCache var1, AbstractIndexCache var2) { - this.__m = var1; - this.__f = var2; + this.field351 = var1; + this.field352 = var2; this.map = new HashMap(); } @@ -54,20 +54,20 @@ public class Fonts { HashMap var2 = new HashMap(); FontName[] var3 = var1; - for(int var4 = 0; var4 < var3.length; ++var4) { + for (int var4 = 0; var4 < var3.length; ++var4) { FontName var5 = var3[var4]; - if(this.map.containsKey(var5)) { + if (this.map.containsKey(var5)) { var2.put(var5, this.map.get(var5)); } else { - AbstractIndexCache var7 = this.__m; - AbstractIndexCache var8 = this.__f; - String var9 = var5.__g; - int var10 = var7.getArchiveId(var9); - int var11 = var7.getRecordId(var10, ""); - Font var6 = SpriteIds.method5823(var7, var8, var10, var11); - if(var6 != null) { - this.map.put(var5, var6); - var2.put(var5, var6); + AbstractIndexCache var6 = this.field351; + AbstractIndexCache var7 = this.field352; + String var8 = var5.field349; + int var9 = var6.getArchiveId(var8); + int var10 = var6.getRecordId(var9, ""); + Font var11 = SpriteIds.method5823(var6, var7, var9, var10); + if (var11 != null) { + this.map.put(var5, var11); + var2.put(var5, var11); } } } @@ -81,6 +81,6 @@ public class Fonts { garbageValue = "2102006478" ) static World method5647() { - return World.__bt_g < World.worldsCount?ItemContainer.worlds[++World.__bt_g - 1]:null; + return World.field987 < World.worldsCount ? ItemContainer.worlds[++World.field987 - 1] : null; } } diff --git a/runescape-client/src/main/java/Formatting.java b/runescape-client/src/main/java/Formatting.java index 1a656b9e0a..789f058734 100644 --- a/runescape-client/src/main/java/Formatting.java +++ b/runescape-client/src/main/java/Formatting.java @@ -7,7 +7,7 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Formatting") public class Formatting { @ObfuscatedName("d") - static int[] __cy_d; + static int[] field353; @ObfuscatedName("dh") @ObfuscatedSignature( signature = "Lit;" @@ -21,19 +21,19 @@ public class Formatting { garbageValue = "1654486766" ) static int method2023(int var0, Script var1, boolean var2) { - Widget var3 = var2?WorldMapIcon1.__t_i:class12.__n_n; - if(var0 == 1700) { + Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + if (var0 == 1700) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemId; return 1; - } else if(var0 == 1701) { - if(var3.itemId != -1) { + } else if (var0 == 1701) { + if (var3.itemId != -1) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemQuantity; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; - } else if(var0 == 1702) { + } else if (var0 == 1702) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.childIndex; return 1; } else { @@ -49,34 +49,34 @@ public class Formatting { static int method2022(int var0, Script var1, boolean var2) { int var3; int var4; - int var6; - if(var0 == 3400) { + int var5; + EnumDefinition var9; + if (var0 == 3400) { 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') { - ; + var9 = Interpreter.getEnum(var3); + if (var9.valType != 's') { } - for(var6 = 0; var6 < var5.size0; ++var6) { - if(var4 == var5.keys[var6]) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.stringVals[var6]; - var5 = null; + for (var5 = 0; var5 < var9.size0; ++var5) { + if (var4 == var9.keys[var5]) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.stringVals[var5]; + var9 = null; break; } } - if(var5 != null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.defaultString; + if (var9 != null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.defaultString; } return 1; - } else if(var0 != 3408) { - if(var0 == 3411) { + } else if (var0 != 3408) { + if (var0 == 3411) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - EnumDefinition var10 = Interpreter.getEnum(var3); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var10.size(); + var9 = Interpreter.getEnum(var3); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var9.size(); return 1; } else { return 2; @@ -85,13 +85,13 @@ public class Formatting { 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) { - if(var6 == var7.keys[var8]) { - if(var4 == 115) { + int var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; + var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3]; + EnumDefinition var7 = Interpreter.getEnum(var6); + if (var3 == var7.keyType && var4 == var7.valType) { + for (int var8 = 0; var8 < var7.size0; ++var8) { + if (var5 == var7.keys[var8]) { + if (var4 == 115) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.stringVals[var8]; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.intVals[var8]; @@ -102,8 +102,8 @@ public class Formatting { } } - if(var7 != null) { - if(var4 == 115) { + if (var7 != null) { + if (var4 == 115) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.defaultString; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.defaultInt; @@ -112,7 +112,7 @@ public class Formatting { return 1; } else { - if(var4 == 115) { + if (var4 == 115) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "null"; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index cca71579cf..434c8880c6 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -28,23 +28,23 @@ public class Frames extends DualNode { ) public Frames(AbstractIndexCache var1, AbstractIndexCache var2, int var3, boolean var4) { NodeDeque var5 = new NodeDeque(); - int var6 = var1.__s_396(var3); + int var6 = var1.method4(var3); this.frames = new Animation[var6]; - int[] var7 = var1.__j_395(var3); + int[] var7 = var1.method3(var3); - for(int var8 = 0; var8 < var7.length; ++var8) { + for (int var8 = 0; var8 < var7.length; ++var8) { byte[] var9 = var1.takeRecord(var3, var7[var8]); Skeleton var10 = null; int var11 = (var9[0] & 255) << 8 | var9[1] & 255; - for(Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) { - if(var11 == var12.id) { + for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) { + if (var11 == var12.id) { var10 = var12; break; } } - if(var10 == null) { + if (var10 == null) { byte[] var13 = var2.getRecord(var11, 0); var10 = new Skeleton(var11, var13); var5.addFirst(var10); @@ -71,7 +71,7 @@ public class Frames extends DualNode { garbageValue = "1204337492" ) public static void method3241(AbstractIndexCache var0) { - VarcInt.__iw_m = var0; + VarcInt.field942 = var0; } @ObfuscatedName("f") @@ -80,11 +80,11 @@ public class Frames extends DualNode { garbageValue = "1776656760" ) static String method3238(IterableNodeHashTable var0, int var1, String var2) { - if(var0 == null) { + if (var0 == null) { return var2; } else { ObjectNode var3 = (ObjectNode)var0.get((long)var1); - return var3 == null?var2:(String)var3.obj; + return var3 == null ? var2 : (String)var3.obj; } } } diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index 946be4825c..af3960acfd 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -11,9 +11,9 @@ public class Friend extends Buddy { @Export("soundSystemExecutor") static ScheduledExecutorService soundSystemExecutor; @ObfuscatedName("m") - boolean __m; + boolean field354; @ObfuscatedName("f") - boolean __f; + boolean field355; @ObfuscatedName("m") @ObfuscatedSignature( @@ -22,7 +22,7 @@ public class Friend extends Buddy { ) @Export("compareTo00") int compareTo00(Friend var1) { - return super.world0 == Client.worldId && Client.worldId != var1.world0?-1:(Client.worldId == var1.world0 && super.world0 != Client.worldId?1:(super.world0 != 0 && var1.world0 == 0?-1:(var1.world0 != 0 && super.world0 == 0?1:(this.__m && !var1.__m?-1:(!this.__m && var1.__m?1:(this.__f && !var1.__f?-1:(!this.__f && var1.__f?1:(super.world0 != 0?super.int2 - var1.int2:var1.int2 - super.int2)))))))); + return super.world0 == Client.worldId && Client.worldId != var1.world0 ? -1 : (Client.worldId == var1.world0 && super.world0 != Client.worldId ? 1 : (super.world0 != 0 && var1.world0 == 0 ? -1 : (var1.world0 != 0 && super.world0 == 0 ? 1 : (this.field354 && !var1.field354 ? -1 : (!this.field354 && var1.field354 ? 1 : (this.field355 && !var1.field355 ? -1 : (!this.field355 && var1.field355 ? 1 : (super.world0 != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2)))))))); } @ObfuscatedName("aj") diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index 8745b5bdc2..19b191955c 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -11,7 +11,7 @@ public class FriendLoginUpdate extends Link { @ObfuscatedSignature( signature = "Ley;" ) - static UrlRequest __kn_x; + static UrlRequest field356; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -1390885889 diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 908cc6f100..2032c738be 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -29,13 +29,13 @@ public class FriendSystem { @ObfuscatedGetter( intValue = 1477282369 ) - int __g; + int field357; @ObfuscatedSignature( signature = "(Llx;)V" ) FriendSystem(LoginType var1) { - this.__g = 0; + this.field357 = 0; this.loginType = var1; this.friendsList = new FriendsList(var1); this.ignoreList = new IgnoreList(var1); @@ -46,8 +46,8 @@ public class FriendSystem { signature = "(B)Z", garbageValue = "-114" ) - boolean __m_151() { - return this.__g == 2; + boolean method99() { + return this.field357 == 2; } @ObfuscatedName("f") @@ -55,8 +55,8 @@ public class FriendSystem { signature = "(I)V", garbageValue = "-2125539725" ) - final void __f_152() { - this.__g = 1; + final void method100() { + this.field357 = 1; } @ObfuscatedName("q") @@ -64,9 +64,9 @@ public class FriendSystem { signature = "(Lgr;II)V", garbageValue = "-1440726810" ) - final void __q_153(Buffer var1, int var2) { + final void method101(Buffer var1, int var2) { this.friendsList.read(var1, var2); - this.__g = 2; + this.field357 = 2; GrandExchangeOffer.method121(); } @@ -75,14 +75,14 @@ public class FriendSystem { signature = "(I)V", garbageValue = "-1408945788" ) - final void __w_154() { - for(FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.__f_438(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.__q_439()) { - if((long)var1.time < class203.currentTimeMs() / 1000L - 5L) { - if(var1.world > 0) { + final void method102() { + for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.method164(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.method165()) { + if ((long)var1.time < class203.currentTimeMs() / 1000L - 5L) { + if (var1.world > 0) { WorldMapIcon1.method219(5, "", var1.username + " has logged in."); } - if(var1.world == 0) { + if (var1.world == 0) { WorldMapIcon1.method219(5, "", var1.username + " has logged out."); } @@ -99,7 +99,7 @@ public class FriendSystem { ) @Export("clear") final void clear() { - this.__g = 0; + this.field357 = 0; this.friendsList.clear(); this.ignoreList.clear(); } @@ -129,43 +129,44 @@ public class FriendSystem { signature = "(Ljava/lang/String;I)V", garbageValue = "-1721017960" ) - final void __l_157(String var1) { - if(var1 != null) { + final void method103(String var1) { + if (var1 != null) { Username var2 = new Username(var1, this.loginType); - if(var2.hasCleanName()) { - StringBuilder var10000; + if (var2.hasCleanName()) { + StringBuilder var3; String var4; - if(this.__e_158()) { - var10000 = null; + if (this.method104()) { + var3 = 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(var2)) { - var10000 = null; - var4 = "You can\'t add yourself to your own friend list"; + } else if (Canvas.localPlayer.username.equals(var2)) { + var3 = null; + var4 = "You can't add yourself to your own friend list"; WorldMapIcon1.method219(30, "", var4); } else { - Object var10001; - if(this.isFriended(var2, false)) { - var10000 = (new StringBuilder()).append(var1); - var10001 = null; - var4 = var10000.append(" is already on your friend list").toString(); + Object var5; + if (this.isFriended(var2, false)) { + var3 = (new StringBuilder()).append(var1); + var5 = null; + var4 = var3.append(" is already on your friend list").toString(); WorldMapIcon1.method219(30, "", var4); - } else if(this.isIgnored(var2)) { - var10000 = new StringBuilder(); - var10001 = null; - var10000 = var10000.append("Please remove ").append(var1); - var10001 = null; - var4 = var10000.append(" from your ignore list first").toString(); + } else if (this.isIgnored(var2)) { + var3 = new StringBuilder(); + var5 = null; + var3 = var3.append("Please remove ").append(var1); + var5 = null; + var4 = var3.append(" from your ignore list first").toString(); WorldMapIcon1.method219(30, "", var4); } else { - PacketBufferNode var3 = Interpreter.method1915(ClientPacket.__gs_cn, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(WorldMapRegion.method550(var1)); - var3.packetBuffer.writeStringCp1252NullTerminated(var1); - Client.packetWriter.__q_167(var3); + PacketBufferNode var6 = Interpreter.method1915(ClientPacket.field310, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeByte(WorldMapRegion.method550(var1)); + var6.packetBuffer.writeStringCp1252NullTerminated(var1); + Client.packetWriter.method241(var6); } } } } + } @ObfuscatedName("e") @@ -173,8 +174,8 @@ public class FriendSystem { signature = "(B)Z", garbageValue = "57" ) - final boolean __e_158() { - return this.friendsList.isFull() || this.friendsList.size() >= 200 && Client.__client_jo != 1; + final boolean method104() { + return this.friendsList.isFull() || this.friendsList.size() >= 200 && Client.field209 != 1; } @ObfuscatedName("x") @@ -182,37 +183,41 @@ public class FriendSystem { signature = "(Ljava/lang/String;B)V", garbageValue = "30" ) - final void __x_159(String var1) { - if(var1 != null) { + final void method105(String var1) { + if (var1 != null) { Username var2 = new Username(var1, this.loginType); - if(var2.hasCleanName()) { - StringBuilder var10000; + if (var2.hasCleanName()) { + StringBuilder var3; String var4; - if(this.__a_160()) { - var10000 = null; + if (this.method106()) { + var3 = 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(var2)) { - var10000 = null; - var4 = "You can\'t add yourself to your own ignore list"; + } else if (Canvas.localPlayer.username.equals(var2)) { + var3 = null; + var4 = "You can't add yourself to your own ignore list"; WorldMapIcon1.method219(30, "", var4); - } else if(this.isIgnored(var2)) { + } else if (this.isIgnored(var2)) { class22.method294(var1); - } else if(this.isFriended(var2, false)) { - var10000 = new StringBuilder(); - Object var10001 = null; - var10000 = var10000.append("Please remove ").append(var1); - var10001 = null; - var4 = var10000.append(" from your friend list first").toString(); - WorldMapIcon1.method219(30, "", var4); } else { - PacketBufferNode var3 = Interpreter.method1915(ClientPacket.__gs_ch, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(WorldMapRegion.method550(var1)); - var3.packetBuffer.writeStringCp1252NullTerminated(var1); - Client.packetWriter.__q_167(var3); + PacketBufferNode var5; + if (this.isFriended(var2, false)) { + var3 = new StringBuilder(); + var5 = null; + var3 = var3.append("Please remove ").append(var1); + var5 = null; + var4 = var3.append(" from your friend list first").toString(); + WorldMapIcon1.method219(30, "", var4); + } else { + var5 = Interpreter.method1915(ClientPacket.field312, Client.packetWriter.isaacCipher); + var5.packetBuffer.writeByte(WorldMapRegion.method550(var1)); + var5.packetBuffer.writeStringCp1252NullTerminated(var1); + Client.packetWriter.method241(var5); + } } } } + } @ObfuscatedName("a") @@ -220,8 +225,8 @@ public class FriendSystem { signature = "(B)Z", garbageValue = "120" ) - final boolean __a_160() { - return this.ignoreList.isFull() || this.ignoreList.size() >= 100 && Client.__client_jo != 1; + final boolean method106() { + return this.ignoreList.isFull() || this.ignoreList.size() >= 100 && Client.field209 != 1; } @ObfuscatedName("z") @@ -231,20 +236,21 @@ public class FriendSystem { ) @Export("removeFriend") final void removeFriend(String var1) { - if(var1 != null) { + if (var1 != null) { Username var2 = new Username(var1, this.loginType); - if(var2.hasCleanName()) { - if(this.friendsList.removeByUsername(var2)) { + if (var2.hasCleanName()) { + if (this.friendsList.removeByUsername(var2)) { WorldMapManager.method668(); - PacketBufferNode var3 = Interpreter.method1915(ClientPacket.__gs_bs, Client.packetWriter.isaacCipher); + PacketBufferNode var3 = Interpreter.method1915(ClientPacket.field276, Client.packetWriter.isaacCipher); var3.packetBuffer.writeByte(WorldMapRegion.method550(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); - Client.packetWriter.__q_167(var3); + Client.packetWriter.method241(var3); } GrandExchangeOffer.method121(); } } + } @ObfuscatedName("j") @@ -254,20 +260,21 @@ public class FriendSystem { ) @Export("removeIgnore") final void removeIgnore(String var1) { - if(var1 != null) { + if (var1 != null) { Username var2 = new Username(var1, this.loginType); - if(var2.hasCleanName()) { - if(this.ignoreList.removeByUsername(var2)) { + if (var2.hasCleanName()) { + if (this.ignoreList.removeByUsername(var2)) { WorldMapManager.method668(); - PacketBufferNode var3 = Interpreter.method1915(ClientPacket.__gs_aj, Client.packetWriter.isaacCipher); + PacketBufferNode var3 = Interpreter.method1915(ClientPacket.field250, Client.packetWriter.isaacCipher); var3.packetBuffer.writeByte(WorldMapRegion.method550(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); - Client.packetWriter.__q_167(var3); + Client.packetWriter.method241(var3); } class229.method4512(); } } + } @ObfuscatedName("t") @@ -288,23 +295,23 @@ public class FriendSystem { ) static int method1867(int var0, Script var1, boolean var2) { Widget var3; - if(var0 >= 2000) { + if (var0 >= 2000) { var0 -= 1000; var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); } else { - var3 = var2?WorldMapIcon1.__t_i:class12.__n_n; + var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; } - if(var0 == 1927) { - if(Interpreter.__bv_y >= 10) { + if (var0 == 1927) { + if (Interpreter.field425 >= 10) { throw new RuntimeException(); - } else if(var3.__ee == null) { + } else if (var3.field975 == null) { return 0; } else { ScriptEvent var4 = new ScriptEvent(); var4.widget = var3; - var4.args0 = var3.__ee; - var4.__d = Interpreter.__bv_y + 1; + var4.args0 = var3.field975; + var4.field772 = Interpreter.field425 + 1; Client.scriptEvents.addFirst(var4); return 1; } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index b39fda53a7..aec0b08c1f 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -17,7 +17,7 @@ public class FriendsList extends UserList { @ObfuscatedGetter( intValue = -217526077 ) - int __x; + int field358; @ObfuscatedName("d") @ObfuscatedSignature( signature = "Ljy;" @@ -30,7 +30,7 @@ public class FriendsList extends UserList { ) public FriendsList(LoginType var1) { super(400); - this.__x = 1; + this.field358 = 1; this.friendLoginUpdates = new LinkDeque(); this.loginType = var1; } @@ -73,29 +73,29 @@ public class FriendsList extends UserList { ) @Export("read") public void read(Buffer var1, int var2) { - while(true) { - if(var1.index < var2) { + while (true) { + if (var1.index < var2) { boolean var3 = var1.readUnsignedByte() == 1; Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - int var6 = var1.__ag_302(); + int var6 = var1.method43(); int var7 = var1.readUnsignedByte(); int var8 = var1.readUnsignedByte(); boolean var9 = (var8 & 2) != 0; boolean var10 = (var8 & 1) != 0; - if(var6 > 0) { + if (var6 > 0) { var1.readStringCp1252NullTerminated(); var1.readUnsignedByte(); var1.readInt(); } var1.readStringCp1252NullTerminated(); - if(var4 != null && var4.hasCleanName()) { + if (var4 != null && var4.hasCleanName()) { Friend var11 = (Friend)this.getByCurrentUsername(var4); - if(var3) { + if (var3) { Friend var12 = (Friend)this.getByCurrentUsername(var5); - if(var12 != null && var12 != var11) { - if(var11 != null) { + if (var12 != null && var12 != var11) { + if (var11 != null) { this.remove(var12); } else { var11 = var12; @@ -103,38 +103,38 @@ public class FriendsList extends UserList { } } - if(var11 != null) { + if (var11 != null) { this.changeName(var11, var4, var5); - if(var6 != var11.world0) { + if (var6 != var11.world0) { boolean var14 = true; - for(FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.__f_438(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.__q_439()) { - if(var13.username.equals(var4)) { - if(var6 != 0 && var13.world == 0) { + for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.method164(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.method165()) { + if (var13.username.equals(var4)) { + if (var6 != 0 && var13.world == 0) { var13.remove(); var14 = false; - } else if(var6 == 0 && var13.world != 0) { + } else if (var6 == 0 && var13.world != 0) { var13.remove(); var14 = false; } } } - if(var14) { - this.friendLoginUpdates.__m_437(new FriendLoginUpdate(var4, var6)); + if (var14) { + this.friendLoginUpdates.method163(new FriendLoginUpdate(var4, var6)); } } } else { - if(this.size() >= 400) { + if (this.size() >= 400) { continue; } var11 = (Friend)this.addLast(var4, var5); } - if(var6 != var11.world0) { - var11.int2 = ++this.__x - 1; - if(var11.world0 == -1 && var6 == 0) { + if (var6 != var11.world0) { + var11.int2 = ++this.field358 - 1; + if (var11.world0 == -1 && var6 == 0) { var11.int2 = -(var11.int2 * -1377538447) * 120689297; } @@ -142,8 +142,8 @@ public class FriendsList extends UserList { } var11.rank = var7; - var11.__m = var9; - var11.__f = var10; + var11.field354 = var9; + var11.field355 = var10; continue; } diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index 8bb9660616..48cdc5d053 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -17,7 +17,7 @@ public final class GameObject { @ObfuscatedGetter( intValue = -457229589 ) - static int __eh_fy; + static int field359; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 1393658667 @@ -82,7 +82,7 @@ public final class GameObject { @ObfuscatedGetter( intValue = 1941106389 ) - int __d; + int field360; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -1043687633 diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index dad3bf2500..11d8c7dd6e 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -43,7 +43,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedGetter( intValue = -281664295 ) - static int __ba_q; + static int field361; @ObfuscatedName("o") @ObfuscatedGetter( longValue = 5666519919949401915L @@ -57,17 +57,17 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedGetter( intValue = -1179083285 ) - static int __ba_l; + static int field362; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -1698831905 ) - static int __ba_e; + static int field363; @ObfuscatedName("d") @ObfuscatedGetter( intValue = 425367827 ) - static int __ba_d; + static int field364; @ObfuscatedName("k") @ObfuscatedGetter( intValue = 1789653893 @@ -75,19 +75,19 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @Export("fps") protected static int fps; @ObfuscatedName("a") - static long[] __ba_a; + static long[] field365; @ObfuscatedName("j") - static long[] __ba_j; + static long[] field366; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -2078849253 ) - static int __ba_s; + static int field367; @ObfuscatedName("aw") @ObfuscatedGetter( intValue = -1042005999 ) - static int __ba_aw; + static int field368; @ObfuscatedName("an") @Export("hasFocus") static volatile boolean hasFocus; @@ -167,7 +167,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @Export("canvas") java.awt.Canvas canvas; @ObfuscatedName("ah") - volatile boolean __ah; + volatile boolean field369; @ObfuscatedName("al") @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; @@ -193,27 +193,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @Export("eventQueue") final EventQueue eventQueue; - static { - gameShell = null; - __ba_q = 0; - stopTimeMs = 0L; - isKilled = false; - __ba_e = 20; - __ba_d = 1; - fps = 0; - __ba_a = new long[32]; - __ba_j = new long[32]; - __ba_aw = 500; - hasFocus = true; - garbageCollectorLastCollectionTime = -1L; - garbageCollectorLastCheckTimeMs = -1L; - } - protected GameShell() { this.hasErrored = false; this.canvasX = 0; this.canvasY = 0; - this.__ah = true; + this.field369 = true; this.resizeCanvasNextFrame = false; this.isCanvasInvalid = false; this.canvasSetTimeMs = 0L; @@ -222,7 +206,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene try { var1 = Toolkit.getDefaultToolkit().getSystemEventQueue(); } catch (Throwable var3) { - ; } this.eventQueue = var1; @@ -237,8 +220,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene ) @Export("setMaxCanvasSize") protected final void setMaxCanvasSize(int var1, int var2) { - if(this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { - this.__ay_96(); + if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { + this.method111(); } this.maxCanvasWidth = var1; @@ -252,16 +235,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene ) @Export("post") final void post(Object var1) { - if(this.eventQueue != null) { - for(int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { + if (this.eventQueue != null) { + for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { class203.method4010(1L); } - if(var1 != null) { + if (var1 != null) { this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); } - } + } @ObfuscatedName("l") @@ -271,7 +254,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene ) @Export("mouseWheel") protected MouseWheel mouseWheel() { - if(this.mouseWheelHandler == null) { + if (this.mouseWheelHandler == null) { this.mouseWheelHandler = new MouseWheelHandler(); this.mouseWheelHandler.addTo(this.canvas); } @@ -306,7 +289,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene ) @Export("setUpKeyboard") protected final void setUpKeyboard() { - if(TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { + if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { KeyHandler.KeyHandler_keyCodes[186] = 57; KeyHandler.KeyHandler_keyCodes[187] = 27; KeyHandler.KeyHandler_keyCodes[188] = 71; @@ -361,15 +344,15 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @Export("resizeCanvas") final void resizeCanvas() { Container var1 = this.container(); - if(var1 != null) { + if (var1 != null) { Bounds var2 = this.getFrameContentBounds(); - this.contentWidth = Math.max(var2.__q, this.contentWidth0); - this.contentHeight = Math.max(var2.__w, this.contentHeight0); - if(this.contentWidth <= 0) { + this.contentWidth = Math.max(var2.field43, this.contentWidth0); + this.contentHeight = Math.max(var2.field44, this.contentHeight0); + if (this.contentWidth <= 0) { this.contentWidth = 1; } - if(this.contentHeight <= 0) { + if (this.contentHeight <= 0) { this.contentHeight = 1; } @@ -379,16 +362,17 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.canvasY = 0; this.canvas.setSize(SoundCache.canvasWidth, Huffman.canvasHeight); class197.rasterProvider = new RasterProvider(SoundCache.canvasWidth, Huffman.canvasHeight, this.canvas); - if(var1 == this.frame) { + if (var1 == this.frame) { Insets var3 = this.frame.getInsets(); this.canvas.setLocation(this.canvasX + var3.left, var3.top + this.canvasY); } else { this.canvas.setLocation(this.canvasX, this.canvasY); } - this.__ah = true; - this.__j_113(); + this.field369 = true; + this.vmethod107(); } + } @ObfuscatedName("j") @@ -396,7 +380,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(I)V", garbageValue = "-1773624745" ) - protected abstract void __j_113(); + protected abstract void vmethod107(); @ObfuscatedName("p") @ObfuscatedSignature( @@ -409,12 +393,12 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene int var2 = this.canvasY; int var3 = this.contentWidth - SoundCache.canvasWidth - var1; int var4 = this.contentHeight - Huffman.canvasHeight - var2; - if(var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { + if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { try { Container var5 = this.container(); int var6 = 0; int var7 = 0; - if(var5 == this.frame) { + if (var5 == this.frame) { Insets var8 = this.frame.getInsets(); var6 = var8.left; var7 = var8.top; @@ -422,23 +406,22 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene Graphics var10 = var5.getGraphics(); var10.setColor(Color.black); - if(var1 > 0) { + if (var1 > 0) { var10.fillRect(var6, var7, var1, this.contentHeight); } - if(var2 > 0) { + if (var2 > 0) { var10.fillRect(var6, var7, this.contentWidth, var2); } - if(var3 > 0) { + if (var3 > 0) { var10.fillRect(var6 + this.contentWidth - var3, var7, var3, this.contentHeight); } - if(var4 > 0) { + if (var4 > 0) { var10.fillRect(var6, var7 + this.contentHeight - var4, this.contentWidth, var4); } } catch (Exception var9) { - ; } } @@ -454,13 +437,13 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene java.awt.Canvas var1 = this.canvas; var1.removeKeyListener(KeyHandler.KeyHandler_instance); var1.removeFocusListener(KeyHandler.KeyHandler_instance); - KeyHandler.__an_cw = -1; + KeyHandler.field448 = -1; java.awt.Canvas var2 = this.canvas; var2.removeMouseListener(MouseHandler.MouseHandler_instance); var2.removeMouseMotionListener(MouseHandler.MouseHandler_instance); var2.removeFocusListener(MouseHandler.MouseHandler_instance); MouseHandler.MouseHandler_currentButton0 = 0; - if(this.mouseWheelHandler != null) { + if (this.mouseWheelHandler != null) { this.mouseWheelHandler.removeFrom(this.canvas); } @@ -473,11 +456,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene var4.addMouseListener(MouseHandler.MouseHandler_instance); var4.addMouseMotionListener(MouseHandler.MouseHandler_instance); var4.addFocusListener(MouseHandler.MouseHandler_instance); - if(this.mouseWheelHandler != null) { + if (this.mouseWheelHandler != null) { this.mouseWheelHandler.addTo(this.canvas); } - this.__ay_96(); + this.method111(); } @ObfuscatedName("ag") @@ -488,9 +471,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @Export("startThread") protected final void startThread(int var1, int var2, int var3) { try { - if(gameShell != null) { - ++__ba_q; - if(__ba_q >= 3) { + if (gameShell != null) { + ++field361; + if (field361 >= 3) { this.error("alreadyloaded"); return; } @@ -504,13 +487,13 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene Huffman.canvasHeight = var2; RunException.revision = var3; RunException.applet = this; - if(taskHandler == null) { + if (taskHandler == null) { taskHandler = new TaskHandler(); } taskHandler.newThreadTask(this, 1); } catch (Exception var5) { - NpcDefinition.sendStackTrace((String)null, var5); + NPCDefinition.sendStackTrace((String)null, var5); this.error("crash"); } @@ -524,7 +507,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @Export("addCanvas") final synchronized void addCanvas() { Container var1 = this.container(); - if(this.canvas != null) { + if (this.canvas != null) { this.canvas.removeFocusListener(this); var1.remove(this.canvas); } @@ -532,7 +515,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene SoundCache.canvasWidth = Math.max(var1.getWidth(), this.contentWidth0); Huffman.canvasHeight = Math.max(var1.getHeight(), this.contentHeight0); Insets var2; - if(this.frame != null) { + if (this.frame != null) { var2 = this.frame.getInsets(); SoundCache.canvasWidth -= var2.right + var2.left; Huffman.canvasHeight -= var2.top + var2.bottom; @@ -545,7 +528,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.canvas.setSize(SoundCache.canvasWidth, Huffman.canvasHeight); this.canvas.setVisible(true); this.canvas.setBackground(Color.BLACK); - if(var1 == this.frame) { + if (var1 == this.frame) { var2 = this.frame.getInsets(); this.canvas.setLocation(var2.left + this.canvasX, var2.top + this.canvasY); } else { @@ -554,8 +537,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.canvas.addFocusListener(this); this.canvas.requestFocus(); - this.__ah = true; - if(class197.rasterProvider != null && SoundCache.canvasWidth == class197.rasterProvider.width && Huffman.canvasHeight == class197.rasterProvider.height) { + this.field369 = true; + if (class197.rasterProvider != null && SoundCache.canvasWidth == class197.rasterProvider.width && Huffman.canvasHeight == class197.rasterProvider.height) { ((RasterProvider)class197.rasterProvider).setComponent(this.canvas); class197.rasterProvider.drawFull(0, 0); } else { @@ -574,16 +557,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @Export("checkHost") protected final boolean checkHost() { String var1 = this.getDocumentBase().getHost().toLowerCase(); - if(!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { - if(!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { - if(var1.endsWith("127.0.0.1")) { + if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { + if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { + if (var1.endsWith("127.0.0.1")) { return true; } else { - while(var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') { + while (var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') { var1 = var1.substring(0, var1.length() - 1); } - if(var1.endsWith("192.168.1.")) { + if (var1.endsWith("192.168.1.")) { return true; } else { this.error("invalidhost"); @@ -603,20 +586,19 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(B)V", garbageValue = "0" ) - void __av_93() { + void method108() { long var1 = class203.currentTimeMs(); - long var3 = __ba_j[__ba_s]; - __ba_j[__ba_s] = var1; - __ba_s = __ba_s + 1 & 31; - if(var3 != 0L && var1 > var3) { - ; + long var3 = field366[field367]; + field366[field367] = var1; + field367 = field367 + 1 & 31; + if (var3 != 0L && var1 > var3) { } synchronized(this) { - class230.__hy_az = hasFocus; + class230.field1138 = hasFocus; } - this.__al_111(); + this.vmethod112(); } @ObfuscatedName("ar") @@ -624,23 +606,23 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(B)V", garbageValue = "-2" ) - void __ar_94() { + void method109() { Container var1 = this.container(); long var2 = class203.currentTimeMs(); - long var4 = __ba_a[GrandExchangeEvents.__g_z]; - __ba_a[GrandExchangeEvents.__g_z] = var2; - GrandExchangeEvents.__g_z = GrandExchangeEvents.__g_z + 1 & 31; - if(var4 != 0L && var2 > var4) { + long var4 = field365[GrandExchangeEvents.field375]; + field365[GrandExchangeEvents.field375] = var2; + GrandExchangeEvents.field375 = GrandExchangeEvents.field375 + 1 & 31; + if (var4 != 0L && var2 > var4) { int var6 = (int)(var2 - var4); fps = ((var6 >> 1) + 32000) / var6; } - if(++__ba_aw - 1 > 50) { - __ba_aw -= 50; - this.__ah = true; + if (++field368 - 1 > 50) { + field368 -= 50; + this.field369 = true; this.canvas.setSize(SoundCache.canvasWidth, Huffman.canvasHeight); this.canvas.setVisible(true); - if(var1 == this.frame) { + if (var1 == this.frame) { Insets var7 = this.frame.getInsets(); this.canvas.setLocation(var7.left + this.canvasX, this.canvasY + var7.top); } else { @@ -648,17 +630,17 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - if(this.isCanvasInvalid) { + if (this.isCanvasInvalid) { this.replaceCanvas(); } - this.__ac_95(); - this.methodDraw(this.__ah); - if(this.__ah) { + this.method110(); + this.methodDraw(this.field369); + if (this.field369) { this.clearBackground(); } - this.__ah = false; + this.field369 = false; } @ObfuscatedName("ac") @@ -666,9 +648,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(I)V", garbageValue = "-1999661001" ) - final void __ac_95() { + final void method110() { Bounds var1 = this.getFrameContentBounds(); - if(var1.__q != this.contentWidth || this.contentHeight != var1.__w || this.resizeCanvasNextFrame) { + if (var1.field43 != this.contentWidth || this.contentHeight != var1.field44 || this.resizeCanvasNextFrame) { this.resizeCanvas(); this.resizeCanvasNextFrame = false; } @@ -680,7 +662,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(I)V", garbageValue = "1147427427" ) - final void __ay_96() { + final void method111() { this.resizeCanvasNextFrame = true; } @@ -691,39 +673,36 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene ) @Export("kill") final synchronized void kill() { - if(!isKilled) { + if (!isKilled) { isKilled = true; try { this.canvas.removeFocusListener(this); } catch (Exception var5) { - ; } try { this.kill0(); } catch (Exception var4) { - ; } - if(this.frame != null) { + if (this.frame != null) { try { System.exit(0); } catch (Throwable var3) { - ; } } - if(taskHandler != null) { + if (taskHandler != null) { try { taskHandler.close(); } catch (Exception var2) { - ; } } - this.__au_110(); + this.vmethod114(); } + } @ObfuscatedName("aw") @@ -739,7 +718,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(I)V", garbageValue = "1445885427" ) - protected abstract void __al_111(); + protected abstract void vmethod112(); @ObfuscatedName("ab") @ObfuscatedSignature( @@ -766,12 +745,12 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene protected final void drawInitial(int var1, String var2, boolean var3) { try { Graphics var4 = this.canvas.getGraphics(); - if(class231.__hb_av == null) { - class231.__hb_av = new java.awt.Font("Helvetica", 1, 13); - class60.__bo_ar = this.canvas.getFontMetrics(class231.__hb_av); + if (class231.field1140 == null) { + class231.field1140 = new java.awt.Font("Helvetica", 1, 13); + class60.field1162 = this.canvas.getFontMetrics(class231.field1140); } - if(var3) { + if (var3) { var4.setColor(Color.black); var4.fillRect(0, 0, SoundCache.canvasWidth, Huffman.canvasHeight); } @@ -779,21 +758,21 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene Color var5 = new Color(140, 17, 17); try { - if(PlayerType.__ij_ak == null) { - PlayerType.__ij_ak = this.canvas.createImage(304, 34); + if (PlayerType.field730 == null) { + PlayerType.field730 = this.canvas.createImage(304, 34); } - Graphics var6 = PlayerType.__ij_ak.getGraphics(); + Graphics var6 = PlayerType.field730.getGraphics(); var6.setColor(var5); var6.drawRect(0, 0, 303, 33); var6.fillRect(2, 2, var1 * 3, 30); var6.setColor(Color.black); var6.drawRect(1, 1, 301, 31); var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); - var6.setFont(class231.__hb_av); + var6.setFont(class231.field1140); var6.setColor(Color.white); - var6.drawString(var2, (304 - class60.__bo_ar.stringWidth(var2)) / 2, 22); - var4.drawImage(PlayerType.__ij_ak, SoundCache.canvasWidth / 2 - 152, Huffman.canvasHeight / 2 - 18, (ImageObserver)null); + var6.drawString(var2, (304 - class60.field1162.stringWidth(var2)) / 2, 22); + var4.drawImage(PlayerType.field730, SoundCache.canvasWidth / 2 - 152, Huffman.canvasHeight / 2 - 18, (ImageObserver)null); } catch (Exception var9) { int var7 = SoundCache.canvasWidth / 2 - 152; int var8 = Huffman.canvasHeight / 2 - 18; @@ -803,9 +782,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene var4.setColor(Color.black); var4.drawRect(var7 + 1, var8 + 1, 301, 31); var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); - var4.setFont(class231.__hb_av); + var4.setFont(class231.field1140); var4.setColor(Color.white); - var4.drawString(var2, var7 + (304 - class60.__bo_ar.stringWidth(var2)) / 2, var8 + 22); + var4.drawString(var2, var7 + (304 - class60.field1162.stringWidth(var2)) / 2, var8 + 22); } } catch (Exception var10) { this.canvas.repaint(); @@ -818,10 +797,10 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(I)V", garbageValue = "-1283386969" ) - protected final void __ad_108() { - PlayerType.__ij_ak = null; - class231.__hb_av = null; - class60.__bo_ar = null; + protected final void method113() { + PlayerType.field730 = null; + class231.field1140 = null; + class60.field1162 = null; } @ObfuscatedName("ap") @@ -831,17 +810,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene ) @Export("error") protected void error(String var1) { - if(!this.hasErrored) { + if (!this.hasErrored) { this.hasErrored = true; System.out.println("error_game_" + var1); try { this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); } catch (Exception var3) { - ; } - } + } @ObfuscatedName("as") @@ -851,7 +829,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene ) @Export("container") Container container() { - return (Container)(this.frame != null?this.frame:this); + return (Container)(this.frame != null ? this.frame : this); } @ObfuscatedName("am") @@ -864,7 +842,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene Container var1 = this.container(); int var2 = Math.max(var1.getWidth(), this.contentWidth0); int var3 = Math.max(var1.getHeight(), this.contentHeight0); - if(this.frame != null) { + if (this.frame != null) { Insets var4 = this.frame.getInsets(); var2 -= var4.right + var4.left; var3 -= var4.bottom + var4.top; @@ -888,59 +866,59 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(I)V", garbageValue = "1860808291" ) - protected abstract void __au_110(); + protected abstract void vmethod114(); @ObfuscatedName("destroy") - public final void __destroy_99() { - if(this == gameShell && !isKilled) { + public final void method115() { + if (this == gameShell && !isKilled) { stopTimeMs = class203.currentTimeMs(); class203.method4010(5000L); this.kill(); } + } @Export("paint") @ObfuscatedName("paint") public final synchronized void paint(Graphics var1) { - if(this == gameShell && !isKilled) { - this.__ah = true; - if(class203.currentTimeMs() - this.canvasSetTimeMs > 1000L) { + if (this == gameShell && !isKilled) { + this.field369 = true; + if (class203.currentTimeMs() - this.canvasSetTimeMs > 1000L) { Rectangle var2 = var1.getClipBounds(); - if(var2 == null || var2.width >= SoundCache.canvasWidth && var2.height >= Huffman.canvasHeight) { + if (var2 == null || var2.width >= SoundCache.canvasWidth && var2.height >= Huffman.canvasHeight) { this.isCanvasInvalid = true; } } - } + } @Export("run") @ObfuscatedName("run") public void run() { try { - if(TaskHandler.javaVendor != null) { + if (TaskHandler.javaVendor != null) { String var1 = TaskHandler.javaVendor.toLowerCase(); - if(var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { + if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { String var2 = TaskHandler.javaVersion; - if(var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) { + if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) { this.error("wrongjava"); return; } - if(var2.startsWith("1.6.0_")) { + if (var2.startsWith("1.6.0_")) { int var3; - for(var3 = 6; var3 < var2.length() && class159.method3394(var2.charAt(var3)); ++var3) { - ; + for (var3 = 6; var3 < var2.length() && class159.method3394(var2.charAt(var3)); ++var3) { } String var4 = var2.substring(6, var3); - if(UserComparator4.method3336(var4) && MouseHandler.method1085(var4) < 10) { + if (UserComparator4.method3336(var4) && MouseHandler.method1085(var4) < 10) { this.error("wrongjava"); return; } } - __ba_d = 5; + field364 = 5; } } @@ -948,27 +926,27 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.addCanvas(); this.setUp(); - Object var8; + Object var7; try { - var8 = new NanoClock(); - } catch (Throwable var6) { - var8 = new MilliClock(); + var7 = new NanoClock(); + } catch (Throwable var5) { + var7 = new MilliClock(); } - UserComparator6.clock = (Clock)var8; + UserComparator6.clock = (Clock)var7; - while(0L == stopTimeMs || class203.currentTimeMs() < stopTimeMs) { - __ba_l = UserComparator6.clock.wait(__ba_e, __ba_d); + while (0L == stopTimeMs || class203.currentTimeMs() < stopTimeMs) { + field362 = UserComparator6.clock.wait(field363, field364); - for(int var5 = 0; var5 < __ba_l; ++var5) { - this.__av_93(); + for (int var8 = 0; var8 < field362; ++var8) { + this.method108(); } - this.__ar_94(); + this.method109(); this.post(this.canvas); } - } catch (Exception var7) { - NpcDefinition.sendStackTrace((String)null, var7); + } catch (Exception var6) { + NPCDefinition.sendStackTrace((String)null, var6); this.error("crash"); } @@ -976,10 +954,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } @ObfuscatedName("start") - public final void __start_97() { - if(this == gameShell && !isKilled) { + public final void method116() { + if (this == gameShell && !isKilled) { stopTimeMs = 0L; } + } @Export("update") @@ -992,7 +971,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("focusGained") public final void focusGained(FocusEvent var1) { hasFocus = true; - this.__ah = true; + this.field369 = true; } @Export("windowActivated") @@ -1008,7 +987,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @Export("windowClosing") @ObfuscatedName("windowClosing") public final void windowClosing(WindowEvent var1) { - this.__destroy_99(); + this.method115(); } @Export("windowDeiconified") @@ -1022,13 +1001,14 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } @ObfuscatedName("init") - public abstract void __init_109(); + public abstract void vmethod117(); @ObfuscatedName("stop") - public final void __stop_98() { - if(this == gameShell && !isKilled) { + public final void method118() { + if (this == gameShell && !isKilled) { stopTimeMs = class203.currentTimeMs() + 4000L; } + } @Export("windowIconified") @@ -1054,38 +1034,38 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene ) @Export("updateGameState") static void updateGameState(int var0) { - if(var0 != Client.gameState) { - if(Client.gameState == 0) { - TextureProvider.client.__ad_108(); + if (var0 != Client.gameState) { + if (Client.gameState == 0) { + TextureProvider.client.method113(); } - if(var0 == 20 || var0 == 40 || var0 == 45) { + if (var0 == 20 || var0 == 40 || var0 == 45) { Client.loginState = 0; - Client.__client_ex = 0; - Client.__client_ej = 0; - Client.timer.__q_455(var0); - if(var0 != 20) { + Client.field168 = 0; + Client.field169 = 0; + Client.timer.method331(var0); + if (var0 != 20) { class15.method184(false); } } - if(var0 != 20 && var0 != 40 && ClientParameter.__ji_fp != null) { - ClientParameter.__ji_fp.close(); - ClientParameter.__ji_fp = null; + if (var0 != 20 && var0 != 40 && ClientParameter.field341 != null) { + ClientParameter.field341.close(); + ClientParameter.field341 = null; } - if(Client.gameState == 25) { - Client.__client_gh = 0; - Client.__client_fe = 0; - Client.__client_fn = 1; - Client.__client_fk = 0; - Client.__client_gp = 1; + if (Client.gameState == 25) { + Client.field181 = 0; + Client.field177 = 0; + Client.field178 = 1; + Client.field179 = 0; + Client.field180 = 1; } - if(var0 != 5 && var0 != 10) { - if(var0 == 20) { - class2.method27(class16.indexCache10, WorldMapSection3.indexCache8, true, Client.gameState == 11?4:0); - } else if(var0 == 11) { + if (var0 != 5 && var0 != 10) { + if (var0 == 20) { + class2.method27(class16.indexCache10, WorldMapSection3.indexCache8, true, Client.gameState == 11 ? 4 : 0); + } else if (var0 == 11) { class2.method27(class16.indexCache10, WorldMapSection3.indexCache8, false, 4); } else { class80.method2015(); @@ -1096,6 +1076,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene Client.gameState = var0; } + } @ObfuscatedName("kv") @@ -1104,8 +1085,24 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene garbageValue = "2016931356" ) static String method1060(Widget var0, int var1) { - int var3 = class1.getWidgetClickMask(var0); - boolean var2 = (var3 >> var1 + 1 & 1) != 0; - return !var2 && var0.onOp == null?null:(var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0?var0.actions[var1]:null); + int var2 = class1.getWidgetClickMask(var0); + boolean var3 = (var2 >> var1 + 1 & 1) != 0; + return !var3 && var0.onOp == null ? null : (var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0 ? var0.actions[var1] : null); + } + + static { + gameShell = null; + field361 = 0; + stopTimeMs = 0L; + isKilled = false; + field363 = 20; + field364 = 1; + fps = 0; + field365 = new long[32]; + field366 = new long[32]; + field368 = 500; + hasFocus = true; + garbageCollectorLastCollectionTime = -1L; + garbageCollectorLastCheckTimeMs = -1L; } } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index 07f41da157..fc5e9170a5 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -17,7 +17,7 @@ public class GrandExchangeEvent { @ObfuscatedGetter( longValue = -6503890758391257651L ) - public final long __f; + public final long field370; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lx;" @@ -37,13 +37,13 @@ public class GrandExchangeEvent { GrandExchangeEvent(Buffer var1, byte var2, int var3) { this.string1 = var1.readStringCp1252NullTerminated(); this.string2 = var1.readStringCp1252NullTerminated(); - this.world = var1.__ag_302(); - this.__f = var1.readLong(); + this.world = var1.method43(); + this.field370 = var1.readLong(); int var4 = var1.readInt(); int var5 = var1.readInt(); this.grandExchangeOffer = new GrandExchangeOffer(); - this.grandExchangeOffer.__o_9(2); - this.grandExchangeOffer.__u_10(var2); + this.grandExchangeOffer.method121(2); + this.grandExchangeOffer.method122(var2); this.grandExchangeOffer.unitPrice = var4; this.grandExchangeOffer.totalQuantity = var5; this.grandExchangeOffer.currentQuantity = 0; @@ -56,7 +56,7 @@ public class GrandExchangeEvent { signature = "(I)Ljava/lang/String;", garbageValue = "1672323214" ) - public String __m_3() { + public String method119() { return this.string1; } @@ -65,7 +65,7 @@ public class GrandExchangeEvent { signature = "(I)Ljava/lang/String;", garbageValue = "-271438207" ) - public String __f_4() { + public String method120() { return this.string2; } @@ -78,108 +78,108 @@ public class GrandExchangeEvent { static void runScript0(ScriptEvent var0, int var1) { Object[] var2 = var0.args0; Script var3; - int var17; - if(class12.method162(var0.type0)) { + int var4; + if (class12.method162(var0.type0)) { class15.worldMapEvent = (WorldMapEvent)var2[0]; - WorldMapElement var4 = ViewportMouse.getWorldMapElement(class15.worldMapEvent.mapElement); - var3 = FaceNormal.method3236(var0.type0, var4.__o, var4.category); + WorldMapElement var5 = ViewportMouse.getWorldMapElement(class15.worldMapEvent.mapElement); + var3 = FaceNormal.method3236(var0.type0, var5.field1020, var5.category); } else { - var17 = ((Integer)var2[0]).intValue(); - var3 = SoundSystem.method2451(var17); + var4 = (Integer)var2[0]; + var3 = SoundSystem.method2451(var4); } - if(var3 != null) { + if (var3 != null) { RouteStrategy.Interpreter_intStackSize = 0; Interpreter.Interpreter_stringStackSize = 0; - var17 = -1; - int[] var5 = var3.opcodes; + var4 = -1; + int[] var25 = var3.opcodes; int[] var6 = var3.intOperands; byte var7 = -1; Interpreter.Interpreter_frameDepth = 0; - Interpreter.__bv_s = false; + Interpreter.field423 = false; try { - int var10; + int var8; try { Username.Interpreter_intLocals = new int[var3.localIntCount]; - int var8 = 0; - Interpreter.Interpreter_stringLocals = new String[var3.localStringCount]; int var9 = 0; + Interpreter.Interpreter_stringLocals = new String[var3.localStringCount]; + int var26 = 0; int var11; - String var18; - for(var10 = 1; var10 < var2.length; ++var10) { - if(var2[var10] instanceof Integer) { - var11 = ((Integer)var2[var10]).intValue(); - if(var11 == -2147483647) { + String var12; + for (var8 = 1; var8 < var2.length; ++var8) { + if (var2[var8] instanceof Integer) { + var11 = (Integer)var2[var8]; + if (var11 == -2147483647) { var11 = var0.mouseX; } - if(var11 == -2147483646) { + if (var11 == -2147483646) { var11 = var0.mouseY; } - if(var11 == -2147483645) { - var11 = var0.widget != null?var0.widget.id:-1; + if (var11 == -2147483645) { + var11 = var0.widget != null ? var0.widget.id : -1; } - if(var11 == -2147483644) { + if (var11 == -2147483644) { var11 = var0.opIndex; } - if(var11 == -2147483643) { - var11 = var0.widget != null?var0.widget.childIndex:-1; + if (var11 == -2147483643) { + var11 = var0.widget != null ? var0.widget.childIndex : -1; } - if(var11 == -2147483642) { - var11 = var0.dragTarget != null?var0.dragTarget.id:-1; + if (var11 == -2147483642) { + var11 = var0.dragTarget != null ? var0.dragTarget.id : -1; } - if(var11 == -2147483641) { - var11 = var0.dragTarget != null?var0.dragTarget.childIndex:-1; + if (var11 == -2147483641) { + var11 = var0.dragTarget != null ? var0.dragTarget.childIndex : -1; } - if(var11 == -2147483640) { + if (var11 == -2147483640) { var11 = var0.keyTyped; } - if(var11 == -2147483639) { + if (var11 == -2147483639) { var11 = var0.keyPressed; } - Username.Interpreter_intLocals[var8++] = var11; - } else if(var2[var10] instanceof String) { - var18 = (String)var2[var10]; - if(var18.equals("event_opbase")) { - var18 = var0.targetName; + Username.Interpreter_intLocals[var9++] = var11; + } else if (var2[var8] instanceof String) { + var12 = (String)var2[var8]; + if (var12.equals("event_opbase")) { + var12 = var0.targetName; } - Interpreter.Interpreter_stringLocals[var9++] = var18; + Interpreter.Interpreter_stringLocals[var26++] = var12; } } - var10 = 0; - Interpreter.__bv_y = var0.__d; + var8 = 0; + Interpreter.field425 = var0.field772; - while(true) { - ++var10; - if(var10 > var1) { + while (true) { + ++var8; + if (var8 > var1) { throw new RuntimeException(); } - ++var17; - int var29 = var5[var17]; - int var20; - if(var29 >= 100) { + ++var4; + int var13 = var25[var4]; + int var14; + if (var13 >= 100) { boolean var32; - if(var3.intOperands[var17] == 1) { + if (var3.intOperands[var4] == 1) { var32 = true; } else { var32 = false; } - var20 = class196.method3736(var29, var3, var32); - switch(var20) { + var14 = class196.method3736(var13, var3, var32); + switch(var14) { case 0: return; case 1: @@ -188,198 +188,198 @@ public class GrandExchangeEvent { case 2: throw new IllegalStateException(); } - } else if(var29 == 0) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6[var17]; - } else if(var29 == 1) { - var11 = var6[var17]; + } else if (var13 == 0) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6[var4]; + } else if (var13 == 1) { + var11 = var6[var4]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Varps.Varps_main[var11]; - } else if(var29 == 2) { - var11 = var6[var17]; + } else if (var13 == 2) { + var11 = var6[var4]; 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) { + } else if (var13 == 3) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.stringOperands[var4]; + } else if (var13 == 6) { + var4 += var6[var4]; + } else if (var13 == 7) { RouteStrategy.Interpreter_intStackSize -= 2; - if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; + if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { + var4 += var6[var4]; } - } else if(var29 == 8) { + } else if (var13 == 8) { RouteStrategy.Interpreter_intStackSize -= 2; - if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; + if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { + var4 += var6[var4]; } - } else if(var29 == 9) { + } else if (var13 == 9) { RouteStrategy.Interpreter_intStackSize -= 2; - if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; + if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { + var4 += var6[var4]; } - } else if(var29 == 10) { + } else if (var13 == 10) { RouteStrategy.Interpreter_intStackSize -= 2; - if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; + if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { + var4 += var6[var4]; } - } else if(var29 == 21) { - if(Interpreter.Interpreter_frameDepth == 0) { + } else if (var13 == 21) { + if (Interpreter.Interpreter_frameDepth == 0) { return; } - ScriptFrame var34 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; - var3 = var34.script; - var5 = var3.opcodes; + ScriptFrame var30 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; + var3 = var30.script; + var25 = var3.opcodes; var6 = var3.intOperands; - var17 = var34.pc; - Username.Interpreter_intLocals = var34.intLocals; - Interpreter.Interpreter_stringLocals = var34.stringLocals; - } else if(var29 == 25) { - var11 = var6[var17]; + var4 = var30.pc; + Username.Interpreter_intLocals = var30.intLocals; + Interpreter.Interpreter_stringLocals = var30.stringLocals; + } else if (var13 == 25) { + var11 = var6[var4]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection2.getVarbit(var11); - } else if(var29 == 27) { - var11 = var6[var17]; + } else if (var13 == 27) { + var11 = var6[var4]; class68.method1695(var11, Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - } else if(var29 == 31) { + } else if (var13 == 31) { RouteStrategy.Interpreter_intStackSize -= 2; - if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; + if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { + var4 += var6[var4]; } - } else if(var29 == 32) { + } else if (var13 == 32) { RouteStrategy.Interpreter_intStackSize -= 2; - if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; + if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { + var4 += var6[var4]; } - } else if(var29 == 33) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Username.Interpreter_intLocals[var6[var17]]; - } else if(var29 == 34) { - 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) { - Interpreter.Interpreter_stringLocals[var6[var17]] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - } else if(var29 == 37) { - var11 = var6[var17]; + } else if (var13 == 33) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Username.Interpreter_intLocals[var6[var4]]; + } else if (var13 == 34) { + Username.Interpreter_intLocals[var6[var4]] = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + } else if (var13 == 35) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var6[var4]]; + } else if (var13 == 36) { + Interpreter.Interpreter_stringLocals[var6[var4]] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + } else if (var13 == 37) { + var11 = var6[var4]; Interpreter.Interpreter_stringStackSize -= var11; - String var31 = class277.method5356(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var11); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var31; - } else if(var29 == 38) { + String var29 = class277.method5356(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var11); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var29; + } else if (var13 == 38) { --RouteStrategy.Interpreter_intStackSize; - } else if(var29 == 39) { + } else if (var13 == 39) { --Interpreter.Interpreter_stringStackSize; } else { int var15; - if(var29 != 40) { - if(var29 == 42) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class196.varcs.getInt(var6[var17]); - } else if(var29 == 43) { - 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[--RouteStrategy.Interpreter_intStackSize]; - if(var21 < 0 || var21 > 5000) { + if (var13 != 40) { + if (var13 == 42) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class196.varcs.getInt(var6[var4]); + } else if (var13 == 43) { + class196.varcs.setInt(var6[var4], Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + } else if (var13 == 44) { + var11 = var6[var4] >> 16; + var14 = var6[var4] & 65535; + int var28 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + if (var28 < 0 || var28 > 5000) { throw new RuntimeException(); } - Interpreter.Interpreter_arrayLengths[var11] = var21; - byte var22 = -1; - if(var20 == 105) { - var22 = 0; + Interpreter.Interpreter_arrayLengths[var11] = var28; + byte var33 = -1; + if (var14 == 105) { + var33 = 0; } - for(var15 = 0; var15 < var21; ++var15) { - Interpreter.Interpreter_arrays[var11][var15] = var22; + for (var15 = 0; var15 < var28; ++var15) { + Interpreter.Interpreter_arrays[var11][var15] = var33; } - } else if(var29 == 45) { - var11 = var6[var17]; - var20 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - if(var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { + } else if (var13 == 45) { + var11 = var6[var4]; + var14 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var11]) { throw new RuntimeException(); } - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20]; - } else if(var29 == 46) { - var11 = var6[var17]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var14]; + } else if (var13 == 46) { + var11 = var6[var4]; RouteStrategy.Interpreter_intStackSize -= 2; - var20 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; - if(var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { + var14 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var11]) { throw new RuntimeException(); } - 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) { - var18 = "null"; + Interpreter.Interpreter_arrays[var11][var14] = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + } else if (var13 == 47) { + var12 = class196.varcs.getStringOld(var6[var4]); + if (var12 == null) { + var12 = "null"; } - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var18; - } else if(var29 == 48) { - class196.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); - } else if(var29 == 49) { - var18 = class196.varcs.getString(var6[var17]); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var18; - } else if(var29 == 50) { - class196.varcs.setString(var6[var17], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12; + } else if (var13 == 48) { + class196.varcs.setStringOld(var6[var4], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); + } else if (var13 == 49) { + var12 = class196.varcs.getString(var6[var4]); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12; + } else if (var13 == 50) { + class196.varcs.setString(var6[var4], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); } else { - if(var29 != 60) { + if (var13 != 60) { throw new IllegalStateException(); } - IterableNodeHashTable var33 = var3.switches[var6[var17]]; - IntegerNode var30 = (IntegerNode)var33.get((long)Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - if(var30 != null) { - var17 += var30.integer; + IterableNodeHashTable var27 = var3.switches[var6[var4]]; + IntegerNode var31 = (IntegerNode)var27.get((long)Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + if (var31 != null) { + var4 += var31.integer; } } } else { - var11 = var6[var17]; - Script var12 = SoundSystem.method2451(var11); - int[] var13 = new int[var12.localIntCount]; - String[] var14 = new String[var12.localStringCount]; + var11 = var6[var4]; + Script var16 = SoundSystem.method2451(var11); + int[] var17 = new int[var16.localIntCount]; + String[] var18 = new String[var16.localStringCount]; - for(var15 = 0; var15 < var12.intArgumentCount; ++var15) { - var13[var15] = Interpreter.Interpreter_intStack[var15 + (RouteStrategy.Interpreter_intStackSize - var12.intArgumentCount)]; + for (var15 = 0; var15 < var16.intArgumentCount; ++var15) { + var17[var15] = Interpreter.Interpreter_intStack[var15 + (RouteStrategy.Interpreter_intStackSize - var16.intArgumentCount)]; } - for(var15 = 0; var15 < var12.stringArgumentCount; ++var15) { - var14[var15] = Interpreter.Interpreter_stringStack[var15 + (Interpreter.Interpreter_stringStackSize - var12.stringArgumentCount)]; + for (var15 = 0; var15 < var16.stringArgumentCount; ++var15) { + var18[var15] = Interpreter.Interpreter_stringStack[var15 + (Interpreter.Interpreter_stringStackSize - var16.stringArgumentCount)]; } - RouteStrategy.Interpreter_intStackSize -= var12.intArgumentCount; - Interpreter.Interpreter_stringStackSize -= var12.stringArgumentCount; + RouteStrategy.Interpreter_intStackSize -= var16.intArgumentCount; + Interpreter.Interpreter_stringStackSize -= var16.stringArgumentCount; ScriptFrame var19 = new ScriptFrame(); var19.script = var3; - var19.pc = var17; + var19.pc = var4; var19.intLocals = Username.Interpreter_intLocals; var19.stringLocals = Interpreter.Interpreter_stringLocals; Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19; - var3 = var12; - var5 = var12.opcodes; - var6 = var12.intOperands; - var17 = -1; - Username.Interpreter_intLocals = var13; - Interpreter.Interpreter_stringLocals = var14; + var3 = var16; + var25 = var16.opcodes; + var6 = var16.intOperands; + var4 = -1; + Username.Interpreter_intLocals = var17; + Interpreter.Interpreter_stringLocals = var18; } } } - } catch (Exception var27) { - StringBuilder var24 = new StringBuilder(30); - var24.append("").append(var3.key).append(" "); + } catch (Exception var23) { + StringBuilder var10 = new StringBuilder(30); + var10.append("").append(var3.key).append(" "); - for(var10 = Interpreter.Interpreter_frameDepth - 1; var10 >= 0; --var10) { - var24.append("").append(Interpreter.Interpreter_frames[var10].script.key).append(" "); + for (var8 = Interpreter.Interpreter_frameDepth - 1; var8 >= 0; --var8) { + var10.append("").append(Interpreter.Interpreter_frames[var8].script.key).append(" "); } - var24.append("").append(var7); - NpcDefinition.sendStackTrace(var24.toString(), var27); + var10.append("").append(var7); + NPCDefinition.sendStackTrace(var10.toString(), var23); } } finally { - if(Interpreter.__bv_s) { - Interpreter.__bv_t = true; + if (Interpreter.field423) { + Interpreter.field424 = true; WorldMapLabelSize.method198(); - Interpreter.__bv_t = false; - Interpreter.__bv_s = false; + Interpreter.field424 = false; + Interpreter.field423 = false; } } @@ -392,9 +392,9 @@ public class GrandExchangeEvent { garbageValue = "1404" ) public static int method80(int var0) { - long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; - int var1 = (int)(var2 >>> 14 & 3L); - return var1; + long var1 = ViewportMouse.ViewportMouse_entityTags[var0]; + int var3 = (int)(var1 >>> 14 & 3L); + return var3; } @ObfuscatedName("w") @@ -404,7 +404,7 @@ public class GrandExchangeEvent { ) public static int method87(int var0, int var1) { int var2; - for(var2 = 0; var1 > 0; --var1) { + for (var2 = 0; var1 > 0; --var1) { var2 = var2 << 1 | var0 & 1; var0 >>>= 1; } @@ -420,10 +420,10 @@ public class GrandExchangeEvent { static final String method88(int var0) { String var1 = Integer.toString(var0); - for(int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { + for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { var1 = var1.substring(0, var2) + "," + var1.substring(var2); } - return var1.length() > 9?" " + BufferedFile.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + "":(var1.length() > 6?" " + BufferedFile.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "":" " + BufferedFile.colorStartTag(16776960) + var1 + ""); + return var1.length() > 9 ? " " + BufferedFile.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M (" + var1 + ")" : (var1.length() > 6 ? " " + BufferedFile.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K (" + var1 + ")" : " " + BufferedFile.colorStartTag(16776960) + var1 + ""); } } diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index fba00b388a..78452aadf2 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -12,18 +12,18 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("GrandExchangeEvents") public class GrandExchangeEvents { @ObfuscatedName("f") - public static Comparator __g_f; + public static Comparator field371; @ObfuscatedName("q") - public static Comparator __g_q; + public static Comparator field372; @ObfuscatedName("w") - public static Comparator __g_w; + public static Comparator field373; @ObfuscatedName("o") - public static Comparator __g_o; + public static Comparator field374; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -1605454211 ) - static int __g_z; + static int field375; @ObfuscatedName("hs") @ObfuscatedGetter( intValue = 1326137897 @@ -34,32 +34,24 @@ public class GrandExchangeEvents { @Export("events") public final List events; - static { - __g_f = new class12(); - new WorldComparator(); - __g_q = new UnitPriceComparator(); - __g_w = new class11(); - __g_o = new TotalQuantityComparator(); - } - @ObfuscatedSignature( signature = "(Lgr;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { - int var3 = var1.__ag_302(); + int var3 = var1.method43(); boolean var4 = var1.readUnsignedByte() == 1; byte var5; - if(var4) { + if (var4) { var5 = 1; } else { var5 = 0; } - int var6 = var1.__ag_302(); + int var6 = var1.method43(); this.events = new ArrayList(var6); - for(int var7 = 0; var7 < var6; ++var7) { + for (int var7 = 0; var7 < var6; ++var7) { this.events.add(new GrandExchangeEvent(var1, var5, var3)); } @@ -72,7 +64,7 @@ public class GrandExchangeEvents { ) @Export("sort") public void sort(Comparator var1, boolean var2) { - if(var2) { + if (var2) { Collections.sort(this.events, var1); } else { Collections.sort(this.events, Collections.reverseOrder(var1)); @@ -87,10 +79,10 @@ public class GrandExchangeEvents { ) @Export("addChatMessage") static void addChatMessage(int var0, String var1, String var2, String var3) { - ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(Integer.valueOf(var0)); - if(var4 == null) { + ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); + if (var4 == null) { var4 = new ChatChannel(); - Messages.Messages_channels.put(Integer.valueOf(var0), var4); + Messages.Messages_channels.put(var0, var4); } Message var5 = var4.addMessage(var0, var1, var2, var3); @@ -106,7 +98,7 @@ public class GrandExchangeEvents { ) public static void method69() { HitSplatDefinition.HitSplatDefinition_cached.clear(); - HitSplatDefinition.__jm_o.clear(); + HitSplatDefinition.field385.clear(); HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); } @@ -117,50 +109,50 @@ public class GrandExchangeEvents { ) static int method75(int var0, Script var1, boolean var2) { Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - if(var0 == 2600) { + if (var0 == 2600) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollX; return 1; - } else if(var0 == 2601) { + } else if (var0 == 2601) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollY; return 1; - } else if(var0 == 2602) { + } else if (var0 == 2602) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; return 1; - } else if(var0 == 2603) { + } else if (var0 == 2603) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollWidth; return 1; - } else if(var0 == 2604) { + } else if (var0 == 2604) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollHeight; return 1; - } else if(var0 == 2605) { + } else if (var0 == 2605) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelZoom; return 1; - } else if(var0 == 2606) { + } else if (var0 == 2606) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleX; return 1; - } else if(var0 == 2607) { + } else if (var0 == 2607) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleZ; return 1; - } else if(var0 == 2608) { + } else if (var0 == 2608) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleY; return 1; - } else if(var0 == 2609) { + } else if (var0 == 2609) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.transparency; return 1; - } else if(var0 == 2610) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.__af; + } else if (var0 == 2610) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.field960; return 1; - } else if(var0 == 2611) { + } else if (var0 == 2611) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color; return 1; - } else if(var0 == 2612) { + } else if (var0 == 2612) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color2; return 1; - } else if(var0 == 2613) { + } else if (var0 == 2613) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.rectangleMode.rsOrdinal(); return 1; - } else if(var0 == 2614) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.__bv?1:0; + } else if (var0 == 2614) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.field964 ? 1 : 0; return 1; } else { return 2; @@ -173,8 +165,17 @@ public class GrandExchangeEvents { garbageValue = "-635606409" ) static final void method74(int var0, int var1) { - if(GroundItemPile.loadWidgetGroup(var0)) { + if (GroundItemPile.loadWidgetGroup(var0)) { class30.method570(Widget.widgets[var0], var1); } + + } + + static { + field371 = new class12(); + new WorldComparator(); + field372 = new UnitPriceComparator(); + field373 = new class11(); + field374 = new TotalQuantityComparator(); } } diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index 07df2e51e1..c98cd110d1 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -12,7 +12,7 @@ public class GrandExchangeOffer { @ObfuscatedGetter( intValue = -1286287981 ) - static int __x_rg; + static int field376; @ObfuscatedName("l") @ObfuscatedGetter( intValue = -812708185 @@ -62,7 +62,7 @@ public class GrandExchangeOffer { ) public GrandExchangeOffer(Buffer var1, boolean var2) { this.state = var1.readByte(); - this.id = var1.__ag_302(); + this.id = var1.method43(); this.unitPrice = var1.readInt(); this.totalQuantity = var1.readInt(); this.currentQuantity = var1.readInt(); @@ -86,7 +86,7 @@ public class GrandExchangeOffer { ) @Export("type") public int type() { - return (this.state & 8) == 8?1:0; + return (this.state & 8) == 8 ? 1 : 0; } @ObfuscatedName("o") @@ -94,7 +94,7 @@ public class GrandExchangeOffer { signature = "(II)V", garbageValue = "1339285061" ) - void __o_9(int var1) { + void method121(int var1) { this.state &= -8; this.state = (byte)(this.state | var1 & 7); } @@ -104,9 +104,9 @@ public class GrandExchangeOffer { signature = "(II)V", garbageValue = "743094900" ) - void __u_10(int var1) { + void method122(int var1) { this.state &= -9; - if(var1 == 1) { + if (var1 == 1) { this.state = (byte)(this.state | 8); } @@ -120,11 +120,11 @@ public class GrandExchangeOffer { static int method105(PacketBuffer var0) { int var1 = var0.readBits(2); int var2; - if(var1 == 0) { + if (var1 == 0) { var2 = 0; - } else if(var1 == 1) { + } else if (var1 == 1) { var2 = var0.readBits(5); - } else if(var1 == 2) { + } else if (var1 == 2) { var2 = var0.readBits(8); } else { var2 = var0.readBits(11); @@ -139,14 +139,14 @@ public class GrandExchangeOffer { garbageValue = "50" ) static int method101() { - if(Client.indexCacheLoaders != null && Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) { + if (Client.indexCacheLoaders != null && Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) { int var0 = 0; - for(int var1 = 0; var1 <= Client.indexCacheLoaderIndex; ++var1) { - var0 += ((IndexCacheLoader)Client.indexCacheLoaders.get(var1)).__w; + for (int var1 = 0; var1 <= Client.indexCacheLoaderIndex; ++var1) { + var0 += ((IndexCacheLoader)Client.indexCacheLoaders.get(var1)).field409; } - return var0 * 10000 / Client.__client_sx; + return var0 * 10000 / Client.field140; } else { return 10000; } @@ -158,19 +158,19 @@ public class GrandExchangeOffer { garbageValue = "-304562381" ) static final void method121() { - for(int var0 = 0; var0 < Players.Players_count; ++var0) { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { Player var1 = Client.players[Players.Players_indices[var0]]; var1.clearIsFriend(); } Iterator var2 = Messages.Messages_hashTable.iterator(); - while(var2.hasNext()) { + while (var2.hasNext()) { Message var3 = (Message)var2.next(); var3.clearIsFromFriend(); } - if(PacketWriter.clanChat != null) { + if (PacketWriter.clanChat != null) { PacketWriter.clanChat.clearFriends(); } diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index e717317aa6..e6c943d2e2 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -11,7 +11,7 @@ public final class GraphicsObject extends Entity { @ObfuscatedGetter( intValue = -1807262579 ) - static int __bw_d; + static int field377; @ObfuscatedName("k") @ObfuscatedSignature( signature = "Llq;" @@ -93,7 +93,7 @@ public final class GraphicsObject extends Entity { this.height = var5; this.cycleStart = var7 + var6; int var8 = class50.getSpotAnimationDefinition(this.id).sequence; - if(var8 != -1) { + if (var8 != -1) { this.isFinished = false; this.sequenceDefinition = WorldMapAreaData.getSequenceDefinition(var8); } else { @@ -109,19 +109,19 @@ public final class GraphicsObject extends Entity { ) @Export("advance") final void advance(int var1) { - if(!this.isFinished) { + if (!this.isFinished) { this.frameCycle += var1; - while(this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) { + while (this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) { this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; ++this.frame; - if(this.frame >= this.sequenceDefinition.frameIds.length) { + if (this.frame >= this.sequenceDefinition.frameIds.length) { this.isFinished = true; break; } } - } + } @ObfuscatedName("e") @@ -133,13 +133,13 @@ public final class GraphicsObject extends Entity { protected final Model getModel() { SpotAnimationDefinition var1 = class50.getSpotAnimationDefinition(this.id); Model var2; - if(!this.isFinished) { + if (!this.isFinished) { var2 = var1.getModel(this.frame); } else { var2 = var1.getModel(-1); } - return var2 == null?null:var2; + return var2 == null ? null : var2; } @ObfuscatedName("x") diff --git a/runescape-client/src/main/java/GroundItem.java b/runescape-client/src/main/java/GroundItem.java index 515facdfdb..076a89f0e3 100644 --- a/runescape-client/src/main/java/GroundItem.java +++ b/runescape-client/src/main/java/GroundItem.java @@ -48,20 +48,20 @@ public final class GroundItem extends Entity { garbageValue = "411352848" ) static void method2095(int var0) { - Client.__client_oa = 0L; - if(var0 >= 2) { + Client.field99 = 0L; + if (var0 >= 2) { Client.isResizable = true; } else { Client.isResizable = false; } - if(SpotAnimationDefinition.method4822() == 1) { + if (SpotAnimationDefinition.method4822() == 1) { TextureProvider.client.setMaxCanvasSize(765, 503); } else { TextureProvider.client.setMaxCanvasSize(7680, 2160); } - if(Client.gameState >= 25) { + if (Client.gameState >= 25) { AbstractByteArrayCopier.method4024(); } diff --git a/runescape-client/src/main/java/GroundItemPile.java b/runescape-client/src/main/java/GroundItemPile.java index 4b9c5708bd..dbbc9aa6d2 100644 --- a/runescape-client/src/main/java/GroundItemPile.java +++ b/runescape-client/src/main/java/GroundItemPile.java @@ -69,27 +69,27 @@ public final class GroundItemPile { ) @Export("loadWidgetGroup") public static boolean loadWidgetGroup(int var0) { - if(Widget.loadedWidgetGroups[var0]) { + if (Widget.loadedWidgetGroups[var0]) { return true; - } else if(!Widget.Widget_indexCache.tryLoadArchive(var0)) { + } else if (!Widget.Widget_indexCache.tryLoadArchive(var0)) { return false; } else { - int var1 = Widget.Widget_indexCache.__s_396(var0); - if(var1 == 0) { + int var1 = Widget.Widget_indexCache.method4(var0); + if (var1 == 0) { Widget.loadedWidgetGroups[var0] = true; return true; } else { - if(Widget.widgets[var0] == null) { + if (Widget.widgets[var0] == null) { Widget.widgets[var0] = new Widget[var1]; } - for(int var2 = 0; var2 < var1; ++var2) { - if(Widget.widgets[var0][var2] == null) { + for (int var2 = 0; var2 < var1; ++var2) { + if (Widget.widgets[var0][var2] == null) { byte[] var3 = Widget.Widget_indexCache.takeRecord(var0, var2); - if(var3 != null) { + if (var3 != null) { Widget.widgets[var0][var2] = new Widget(); Widget.widgets[var0][var2].id = var2 + (var0 << 16); - if(var3[0] == -1) { + if (var3[0] == -1) { Widget.widgets[var0][var2].decode(new Buffer(var3)); } else { Widget.widgets[var0][var2].decodeLegacy(new Buffer(var3)); diff --git a/runescape-client/src/main/java/GzipDecompressor.java b/runescape-client/src/main/java/GzipDecompressor.java index 26ba4cbf74..2c1a5225b7 100644 --- a/runescape-client/src/main/java/GzipDecompressor.java +++ b/runescape-client/src/main/java/GzipDecompressor.java @@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("GzipDecompressor") public class GzipDecompressor { @ObfuscatedName("ck") - public static char __go_ck; + public static char field378; @ObfuscatedName("m") @Export("inflater") Inflater inflater; @@ -31,8 +31,8 @@ public class GzipDecompressor { ) @Export("decompress") public void decompress(Buffer var1, byte[] var2) { - if(var1.array[var1.index] == 31 && var1.array[var1.index + 1] == -117) { - if(this.inflater == null) { + if (var1.array[var1.index] == 31 && var1.array[var1.index + 1] == -117) { + if (this.inflater == null) { this.inflater = new Inflater(true); } @@ -56,18 +56,18 @@ public class GzipDecompressor { garbageValue = "-1060388349" ) public static StructDefinition method3702(int var0) { - StructDefinition var1 = (StructDefinition)StructDefinition.__jq_f.get((long)var0); - if(var1 != null) { + StructDefinition var1 = (StructDefinition)StructDefinition.field886.get((long)var0); + if (var1 != null) { return var1; } else { - byte[] var2 = StructDefinition.__jq_m.takeRecord(34, var0); + byte[] var2 = StructDefinition.field885.takeRecord(34, var0); var1 = new StructDefinition(); - if(var2 != null) { + if (var2 != null) { var1.read(new Buffer(var2)); } var1.init(); - StructDefinition.__jq_f.put(var1, (long)var0); + StructDefinition.field886.put(var1, (long)var0); return var1; } } diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index 5e59f095ee..30b7bcba53 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -37,30 +37,29 @@ public class HealthBar extends Node { HealthBarUpdate var5 = null; int var6 = 0; - for(HealthBarUpdate var7 = (HealthBarUpdate)this.updates.last(); var7 != null; var7 = (HealthBarUpdate)this.updates.previous()) { + for (HealthBarUpdate var7 = (HealthBarUpdate)this.updates.last(); var7 != null; var7 = (HealthBarUpdate)this.updates.previous()) { ++var6; - if(var7.cycle == var1) { + if (var7.cycle == var1) { var7.set(var1, var2, var3, var4); return; } - if(var7.cycle <= var1) { + if (var7.cycle <= var1) { var5 = var7; } } - if(var5 == null) { - if(var6 < 4) { + if (var5 == null) { + if (var6 < 4) { this.updates.addLast(new HealthBarUpdate(var1, var2, var3, var4)); } - } else { IterableNodeDeque.IterableNodeDeque_addBefore(new HealthBarUpdate(var1, var2, var3, var4), var5); - if(var6 >= 4) { + if (var6 >= 4) { this.updates.last().remove(); } - } + } @ObfuscatedName("f") @@ -71,13 +70,13 @@ public class HealthBar extends Node { @Export("get") HealthBarUpdate get(int var1) { HealthBarUpdate var2 = (HealthBarUpdate)this.updates.last(); - if(var2 != null && var2.cycle <= var1) { - for(HealthBarUpdate var3 = (HealthBarUpdate)this.updates.previous(); var3 != null && var3.cycle <= var1; var3 = (HealthBarUpdate)this.updates.previous()) { + if (var2 != null && var2.cycle <= var1) { + for (HealthBarUpdate var3 = (HealthBarUpdate)this.updates.previous(); var3 != null && var3.cycle <= var1; var3 = (HealthBarUpdate)this.updates.previous()) { var2.remove(); var2 = var3; } - if(this.definition.int5 + var2.cycleOffset + var2.cycle > var1) { + if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) { return var2; } else { var2.remove(); @@ -106,64 +105,66 @@ public class HealthBar extends Node { @Export("charToByteCp1252") public static byte charToByteCp1252(char var0) { byte var1; - if(var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { - var1 = (byte)var0; - } else if(var0 == 8364) { - var1 = -128; - } else if(var0 == 8218) { - var1 = -126; - } else if(var0 == 402) { - var1 = -125; - } else if(var0 == 8222) { - var1 = -124; - } else if(var0 == 8230) { - var1 = -123; - } else if(var0 == 8224) { - var1 = -122; - } else if(var0 == 8225) { - var1 = -121; - } else if(var0 == 710) { - var1 = -120; - } else if(var0 == 8240) { - var1 = -119; - } else if(var0 == 352) { - var1 = -118; - } else if(var0 == 8249) { - var1 = -117; - } else if(var0 == 338) { - var1 = -116; - } else if(var0 == 381) { - var1 = -114; - } else if(var0 == 8216) { - var1 = -111; - } else if(var0 == 8217) { - var1 = -110; - } else if(var0 == 8220) { - var1 = -109; - } else if(var0 == 8221) { - var1 = -108; - } else if(var0 == 8226) { - var1 = -107; - } else if(var0 == 8211) { - var1 = -106; - } else if(var0 == 8212) { - var1 = -105; - } else if(var0 == 732) { - var1 = -104; - } else if(var0 == 8482) { - var1 = -103; - } else if(var0 == 353) { - var1 = -102; - } else if(var0 == 8250) { - var1 = -101; - } else if(var0 == 339) { - var1 = -100; - } else if(var0 == 382) { - var1 = -98; - } else if(var0 == 376) { - var1 = -97; + if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { + if (var0 == 8364) { + var1 = -128; + } else if (var0 == 8218) { + var1 = -126; + } else if (var0 == 402) { + var1 = -125; + } else if (var0 == 8222) { + var1 = -124; + } else if (var0 == 8230) { + var1 = -123; + } else if (var0 == 8224) { + var1 = -122; + } else if (var0 == 8225) { + var1 = -121; + } else if (var0 == 710) { + var1 = -120; + } else if (var0 == 8240) { + var1 = -119; + } else if (var0 == 352) { + var1 = -118; + } else if (var0 == 8249) { + var1 = -117; + } else if (var0 == 338) { + var1 = -116; + } else if (var0 == 381) { + var1 = -114; + } else if (var0 == 8216) { + var1 = -111; + } else if (var0 == 8217) { + var1 = -110; + } else if (var0 == 8220) { + var1 = -109; + } else if (var0 == 8221) { + var1 = -108; + } else if (var0 == 8226) { + var1 = -107; + } else if (var0 == 8211) { + var1 = -106; + } else if (var0 == 8212) { + var1 = -105; + } else if (var0 == 732) { + var1 = -104; + } else if (var0 == 8482) { + var1 = -103; + } else if (var0 == 353) { + var1 = -102; + } else if (var0 == 8250) { + var1 = -101; + } else if (var0 == 339) { + var1 = -100; + } else if (var0 == 382) { + var1 = -98; + } else if (var0 == 376) { + var1 = -97; + } else { + var1 = 63; + } } else { - var1 = 63; + var1 = (byte)var0; } return var1; @@ -175,9 +176,9 @@ public class HealthBar extends Node { garbageValue = "-1326999134" ) static void method1994(int var0, int var1) { - if(Client.__client_qf != 0 && var0 != -1) { - Login.method2076(Login.indexCache11, var0, 0, Client.__client_qf, false); - Client.__client_qq = true; + if (Client.field128 != 0 && var0 != -1) { + Login.method2076(Login.indexCache11, var0, 0, Client.field128, false); + Client.field107 = true; } } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index b147b45c00..a898b9a8d2 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -11,12 +11,12 @@ public class HealthBarDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache __ii_m; + public static AbstractIndexCache field379; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache __ii_f; + public static AbstractIndexCache field380; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Ler;" @@ -39,7 +39,7 @@ public class HealthBarDefinition extends DualNode { @ObfuscatedGetter( intValue = 1515955705 ) - public int __o; + public int field381; @ObfuscatedName("l") @ObfuscatedGetter( intValue = 390656615 @@ -95,11 +95,6 @@ public class HealthBarDefinition extends DualNode { @Export("widthPadding") public int widthPadding; - static { - HealthBarDefinition_cached = new EvictingDualNodeHashTable(64); - HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); - } - public HealthBarDefinition() { this.int1 = 255; this.int2 = 255; @@ -119,9 +114,9 @@ public class HealthBarDefinition extends DualNode { ) @Export("read") public void read(Buffer var1) { - while(true) { + while (true) { int var2 = var1.readUnsignedByte(); - if(var2 == 0) { + if (var2 == 0) { return; } @@ -136,27 +131,27 @@ public class HealthBarDefinition extends DualNode { ) @Export("readNext") void readNext(Buffer var1, int var2) { - if(var2 == 1) { - var1.__ag_302(); - } else if(var2 == 2) { + if (var2 == 1) { + var1.method43(); + } else if (var2 == 2) { this.int1 = var1.readUnsignedByte(); - } else if(var2 == 3) { + } else if (var2 == 3) { this.int2 = var1.readUnsignedByte(); - } else if(var2 == 4) { + } else if (var2 == 4) { this.int3 = 0; - } else if(var2 == 5) { - this.int5 = var1.__ag_302(); - } else if(var2 == 6) { + } else if (var2 == 5) { + this.int5 = var1.method43(); + } else if (var2 == 6) { var1.readUnsignedByte(); - } else if(var2 == 7) { - this.spriteId1 = var1.__ap_310(); - } else if(var2 == 8) { - this.spriteId2 = var1.__ap_310(); - } else if(var2 == 11) { - this.int3 = var1.__ag_302(); - } else if(var2 == 14) { + } else if (var2 == 7) { + this.spriteId1 = var1.method51(); + } else if (var2 == 8) { + this.spriteId2 = var1.method51(); + } else if (var2 == 11) { + this.int3 = var1.method43(); + } else if (var2 == 14) { this.width = var1.readUnsignedByte(); - } else if(var2 == 15) { + } else if (var2 == 15) { this.widthPadding = var1.readUnsignedByte(); } @@ -169,15 +164,15 @@ public class HealthBarDefinition extends DualNode { ) @Export("getSprite1") public Sprite getSprite1() { - if(this.spriteId1 < 0) { + if (this.spriteId1 < 0) { return null; } else { Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.spriteId1); - if(var1 != null) { + if (var1 != null) { return var1; } else { - var1 = class322.readSprite(__ii_f, this.spriteId1, 0); - if(var1 != null) { + var1 = class322.readSprite(field380, this.spriteId1, 0); + if (var1 != null) { HealthBarDefinition_cachedSprites.put(var1, (long)this.spriteId1); } @@ -193,15 +188,15 @@ public class HealthBarDefinition extends DualNode { ) @Export("getSprite2") public Sprite getSprite2() { - if(this.spriteId2 < 0) { + if (this.spriteId2 < 0) { return null; } else { Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.spriteId2); - if(var1 != null) { + if (var1 != null) { return var1; } else { - var1 = class322.readSprite(__ii_f, this.spriteId2, 0); - if(var1 != null) { + var1 = class322.readSprite(field380, this.spriteId2, 0); + if (var1 != null) { HealthBarDefinition_cachedSprites.put(var1, (long)this.spriteId2); } @@ -209,4 +204,9 @@ public class HealthBarDefinition extends DualNode { } } } + + static { + HealthBarDefinition_cached = new EvictingDualNodeHashTable(64); + HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); + } } diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index 4970ba4bd4..0cab72dbf6 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -61,34 +61,34 @@ public class HealthBarUpdate extends Node { garbageValue = "342552136" ) public static String method1722(CharSequence var0) { - long var3 = 0L; - int var5 = var0.length(); + long var1 = 0L; + int var3 = var0.length(); - for(int var6 = 0; var6 < var5; ++var6) { - var3 *= 37L; - char var7 = var0.charAt(var6); - if(var7 >= 'A' && var7 <= 'Z') { - var3 += (long)(var7 + 1 - 65); - } else if(var7 >= 'a' && var7 <= 'z') { - var3 += (long)(var7 + 1 - 97); - } else if(var7 >= '0' && var7 <= '9') { - var3 += (long)(var7 + 27 - 48); + for (int var4 = 0; var4 < var3; ++var4) { + var1 *= 37L; + char var5 = var0.charAt(var4); + if (var5 >= 'A' && var5 <= 'Z') { + var1 += (long)(var5 + 1 - 65); + } else if (var5 >= 'a' && var5 <= 'z') { + var1 += (long)(var5 + 1 - 97); + } else if (var5 >= '0' && var5 <= '9') { + var1 += (long)(var5 + 27 - 48); } - if(var3 >= 177917621779460413L) { + if (var1 >= 177917621779460413L) { break; } } - while(0L == var3 % 37L && var3 != 0L) { - var3 /= 37L; + while (0L == var1 % 37L && var1 != 0L) { + var1 /= 37L; } - String var8 = Clock.method3534(var3); - if(var8 == null) { - var8 = ""; + String var6 = Clock.method3534(var1); + if (var6 == null) { + var6 = ""; } - return var8; + return var6; } } diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 961a1c899c..a31e8cb465 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -11,17 +11,17 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - static AbstractIndexCache __jm_m; + static AbstractIndexCache field382; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - static AbstractIndexCache __jm_f; + static AbstractIndexCache field383; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lir;" ) - static AbstractIndexCache __jm_q; + static AbstractIndexCache field384; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Ler;" @@ -32,7 +32,7 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedSignature( signature = "Ler;" ) - static EvictingDualNodeHashTable __jm_o; + static EvictingDualNodeHashTable field385; @ObfuscatedName("u") @ObfuscatedSignature( signature = "Ler;" @@ -49,59 +49,59 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedGetter( intValue = -1151968735 ) - public int __n; + public int field386; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -102270561 ) - public int __i; + public int field387; @ObfuscatedName("a") @ObfuscatedGetter( intValue = -1533306389 ) - int __a; + int field388; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -1677628889 ) - int __z; + int field389; @ObfuscatedName("j") @ObfuscatedGetter( intValue = 1683792491 ) - int __j; + int field390; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 1845590719 ) - int __s; + int field391; @ObfuscatedName("t") @ObfuscatedGetter( intValue = -389283589 ) - public int __t; + public int field392; @ObfuscatedName("y") @ObfuscatedGetter( intValue = 1751286975 ) - public int __y; + public int field393; @ObfuscatedName("h") @ObfuscatedGetter( intValue = 199815415 ) - public int __h; + public int field394; @ObfuscatedName("b") - String __b; + String field395; @ObfuscatedName("c") @ObfuscatedGetter( intValue = 1003116765 ) - public int __c; + public int field396; @ObfuscatedName("r") @ObfuscatedGetter( intValue = 1498880475 ) - public int __r; + public int field397; @ObfuscatedName("p") @Export("transforms") public int[] transforms; @@ -118,26 +118,20 @@ public class HitSplatDefinition extends DualNode { @Export("transformVarp") int transformVarp; - static { - HitSplatDefinition_cached = new EvictingDualNodeHashTable(64); - __jm_o = new EvictingDualNodeHashTable(64); - HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20); - } - HitSplatDefinition() { this.fontId = -1; - this.__n = 16777215; - this.__i = 70; - this.__a = -1; - this.__z = -1; - this.__j = -1; - this.__s = -1; - this.__t = 0; - this.__y = 0; - this.__h = -1; - this.__b = ""; - this.__c = -1; - this.__r = 0; + this.field386 = 16777215; + this.field387 = 70; + this.field388 = -1; + this.field389 = -1; + this.field390 = -1; + this.field391 = -1; + this.field392 = 0; + this.field393 = 0; + this.field394 = -1; + this.field395 = ""; + this.field396 = -1; + this.field397 = 0; this.transformVarbit = -1; this.transformVarp = -1; } @@ -149,9 +143,9 @@ public class HitSplatDefinition extends DualNode { ) @Export("read") void read(Buffer var1) { - while(true) { + while (true) { int var2 = var1.readUnsignedByte(); - if(var2 == 0) { + if (var2 == 0) { return; } @@ -166,49 +160,49 @@ public class HitSplatDefinition extends DualNode { ) @Export("readNext") void readNext(Buffer var1, int var2) { - if(var2 == 1) { - this.fontId = var1.__ap_310(); - } else if(var2 == 2) { - this.__n = var1.readMedium(); - } else if(var2 == 3) { - this.__a = var1.__ap_310(); - } else if(var2 == 4) { - this.__j = var1.__ap_310(); - } else if(var2 == 5) { - this.__z = var1.__ap_310(); - } else if(var2 == 6) { - this.__s = var1.__ap_310(); - } else if(var2 == 7) { - this.__t = var1.__aq_303(); - } else if(var2 == 8) { - this.__b = var1.readStringCp1252NullCircumfixed(); - } else if(var2 == 9) { - this.__i = var1.__ag_302(); - } else if(var2 == 10) { - this.__y = var1.__aq_303(); - } else if(var2 == 11) { - this.__h = 0; - } else if(var2 == 12) { - this.__c = var1.readUnsignedByte(); - } else if(var2 == 13) { - this.__r = var1.__aq_303(); - } else if(var2 == 14) { - this.__h = var1.__ag_302(); - } else if(var2 == 17 || var2 == 18) { - this.transformVarbit = var1.__ag_302(); - if(this.transformVarbit == 65535) { + if (var2 == 1) { + this.fontId = var1.method51(); + } else if (var2 == 2) { + this.field386 = var1.readMedium(); + } else if (var2 == 3) { + this.field388 = var1.method51(); + } else if (var2 == 4) { + this.field390 = var1.method51(); + } else if (var2 == 5) { + this.field389 = var1.method51(); + } else if (var2 == 6) { + this.field391 = var1.method51(); + } else if (var2 == 7) { + this.field392 = var1.method44(); + } else if (var2 == 8) { + this.field395 = var1.readStringCp1252NullCircumfixed(); + } else if (var2 == 9) { + this.field387 = var1.method43(); + } else if (var2 == 10) { + this.field393 = var1.method44(); + } else if (var2 == 11) { + this.field394 = 0; + } else if (var2 == 12) { + this.field396 = var1.readUnsignedByte(); + } else if (var2 == 13) { + this.field397 = var1.method44(); + } else if (var2 == 14) { + this.field394 = var1.method43(); + } else if (var2 == 17 || var2 == 18) { + this.transformVarbit = var1.method43(); + if (this.transformVarbit == 65535) { this.transformVarbit = -1; } - this.transformVarp = var1.__ag_302(); - if(this.transformVarp == 65535) { + this.transformVarp = var1.method43(); + if (this.transformVarp == 65535) { this.transformVarp = -1; } int var3 = -1; - if(var2 == 18) { - var3 = var1.__ag_302(); - if(var3 == 65535) { + if (var2 == 18) { + var3 = var1.method43(); + if (var3 == 65535) { var3 = -1; } } @@ -216,9 +210,9 @@ public class HitSplatDefinition extends DualNode { int var4 = var1.readUnsignedByte(); this.transforms = new int[var4 + 2]; - for(int var5 = 0; var5 <= var4; ++var5) { - this.transforms[var5] = var1.__ag_302(); - if(this.transforms[var5] == 65535) { + for (int var5 = 0; var5 <= var4; ++var5) { + this.transforms[var5] = var1.method43(); + if (this.transforms[var5] == 65535) { this.transforms[var5] = -1; } } @@ -236,20 +230,20 @@ public class HitSplatDefinition extends DualNode { @Export("transform") public final HitSplatDefinition transform() { int var1 = -1; - if(this.transformVarbit != -1) { + if (this.transformVarbit != -1) { var1 = WorldMapSection2.getVarbit(this.transformVarbit); - } else if(this.transformVarp != -1) { + } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } int var2; - if(var1 >= 0 && var1 < this.transforms.length - 1) { + if (var1 >= 0 && var1 < this.transforms.length - 1) { var2 = this.transforms[var1]; } else { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1? LoginScreenAnimation.getHitSplatDefinition(var2):null; + return var2 != -1 ? LoginScreenAnimation.getHitSplatDefinition(var2) : null; } @ObfuscatedName("u") @@ -259,11 +253,11 @@ public class HitSplatDefinition extends DualNode { ) @Export("getString") public String getString(int var1) { - String var2 = this.__b; + String var2 = this.field395; - while(true) { + while (true) { int var3 = var2.indexOf("%1"); - if(var3 < 0) { + if (var3 < 0) { return var2; } @@ -276,17 +270,17 @@ public class HitSplatDefinition extends DualNode { signature = "(I)Lln;", garbageValue = "-1692599381" ) - public Sprite __g_417() { - if(this.__a < 0) { + public Sprite method123() { + if (this.field388 < 0) { return null; } else { - Sprite var1 = (Sprite)__jm_o.get((long)this.__a); - if(var1 != null) { + Sprite var1 = (Sprite)field385.get((long)this.field388); + if (var1 != null) { return var1; } else { - var1 = class322.readSprite(__jm_f, this.__a, 0); - if(var1 != null) { - __jm_o.put(var1, (long)this.__a); + var1 = class322.readSprite(field383, this.field388, 0); + if (var1 != null) { + field385.put(var1, (long)this.field388); } return var1; @@ -299,17 +293,17 @@ public class HitSplatDefinition extends DualNode { signature = "(B)Lln;", garbageValue = "-15" ) - public Sprite __l_418() { - if(this.__z < 0) { + public Sprite method124() { + if (this.field389 < 0) { return null; } else { - Sprite var1 = (Sprite)__jm_o.get((long)this.__z); - if(var1 != null) { + Sprite var1 = (Sprite)field385.get((long)this.field389); + if (var1 != null) { return var1; } else { - var1 = class322.readSprite(__jm_f, this.__z, 0); - if(var1 != null) { - __jm_o.put(var1, (long)this.__z); + var1 = class322.readSprite(field383, this.field389, 0); + if (var1 != null) { + field385.put(var1, (long)this.field389); } return var1; @@ -322,17 +316,17 @@ public class HitSplatDefinition extends DualNode { signature = "(B)Lln;", garbageValue = "-49" ) - public Sprite __e_419() { - if(this.__j < 0) { + public Sprite method125() { + if (this.field390 < 0) { return null; } else { - Sprite var1 = (Sprite)__jm_o.get((long)this.__j); - if(var1 != null) { + Sprite var1 = (Sprite)field385.get((long)this.field390); + if (var1 != null) { return var1; } else { - var1 = class322.readSprite(__jm_f, this.__j, 0); - if(var1 != null) { - __jm_o.put(var1, (long)this.__j); + var1 = class322.readSprite(field383, this.field390, 0); + if (var1 != null) { + field385.put(var1, (long)this.field390); } return var1; @@ -345,17 +339,17 @@ public class HitSplatDefinition extends DualNode { signature = "(I)Lln;", garbageValue = "393569067" ) - public Sprite __x_420() { - if(this.__s < 0) { + public Sprite method126() { + if (this.field391 < 0) { return null; } else { - Sprite var1 = (Sprite)__jm_o.get((long)this.__s); - if(var1 != null) { + Sprite var1 = (Sprite)field385.get((long)this.field391); + if (var1 != null) { return var1; } else { - var1 = class322.readSprite(__jm_f, this.__s, 0); - if(var1 != null) { - __jm_o.put(var1, (long)this.__s); + var1 = class322.readSprite(field383, this.field391, 0); + if (var1 != null) { + field385.put(var1, (long)this.field391); } return var1; @@ -370,15 +364,15 @@ public class HitSplatDefinition extends DualNode { ) @Export("getFont") public Font getFont() { - if(this.fontId == -1) { + if (this.fontId == -1) { return null; } else { Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); - if(var1 != null) { + if (var1 != null) { return var1; } else { - var1 = SpriteIds.method5823(__jm_f, __jm_q, this.fontId, 0); - if(var1 != null) { + var1 = SpriteIds.method5823(field383, field384, this.fontId, 0); + if (var1 != null) { HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); } @@ -391,4 +385,10 @@ public class HitSplatDefinition extends DualNode { public static int method4972(long var0) { return (int)(var0 >>> 17 & 4294967295L); } + + static { + HitSplatDefinition_cached = new EvictingDualNodeHashTable(64); + field385 = new EvictingDualNodeHashTable(64); + HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20); + } } diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index cf37ace67f..b8de92c5b8 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Huffman") public class Huffman { @ObfuscatedName("e") - static int[][] __gd_e; + static int[][] field398; @ObfuscatedName("p") @ObfuscatedGetter( intValue = -842662451 @@ -16,43 +16,43 @@ public class Huffman { @Export("canvasHeight") public static int canvasHeight; @ObfuscatedName("m") - int[] __m; + int[] field399; @ObfuscatedName("f") - byte[] __f; + byte[] field400; @ObfuscatedName("q") - int[] __q; + int[] field401; public Huffman(byte[] var1) { int var2 = var1.length; - this.__m = new int[var2]; - this.__f = var1; + this.field399 = new int[var2]; + this.field400 = var1; int[] var3 = new int[33]; - this.__q = new int[8]; + this.field401 = new int[8]; int var4 = 0; - for(int var5 = 0; var5 < var2; ++var5) { + for (int var5 = 0; var5 < var2; ++var5) { byte var6 = var1[var5]; - if(var6 != 0) { + if (var6 != 0) { int var7 = 1 << 32 - var6; int var8 = var3[var6]; - this.__m[var5] = var8; + this.field399[var5] = var8; int var9; int var10; int var11; int var12; - if((var8 & var7) != 0) { + if ((var8 & var7) != 0) { var9 = var3[var6 - 1]; } else { var9 = var8 | var7; - for(var10 = var6 - 1; var10 >= 1; --var10) { + for (var10 = var6 - 1; var10 >= 1; --var10) { var11 = var3[var10]; - if(var11 != var8) { + if (var11 != var8) { break; } var12 = 1 << 32 - var10; - if((var11 & var12) != 0) { + if ((var11 & var12) != 0) { var3[var10] = var3[var10 - 1]; break; } @@ -63,41 +63,41 @@ public class Huffman { var3[var6] = var9; - for(var10 = var6 + 1; var10 <= 32; ++var10) { - if(var8 == var3[var10]) { + for (var10 = var6 + 1; var10 <= 32; ++var10) { + if (var8 == var3[var10]) { var3[var10] = var9; } } var10 = 0; - for(var11 = 0; var11 < var6; ++var11) { + for (var11 = 0; var11 < var6; ++var11) { var12 = Integer.MIN_VALUE >>> var11; - if((var8 & var12) != 0) { - if(this.__q[var10] == 0) { - this.__q[var10] = var4; + if ((var8 & var12) != 0) { + if (this.field401[var10] == 0) { + this.field401[var10] = var4; } - var10 = this.__q[var10]; + var10 = this.field401[var10]; } else { ++var10; } - if(var10 >= this.__q.length) { - int[] var13 = new int[this.__q.length * 2]; + if (var10 >= this.field401.length) { + int[] var13 = new int[this.field401.length * 2]; - for(int var14 = 0; var14 < this.__q.length; ++var14) { - var13[var14] = this.__q[var14]; + for (int var14 = 0; var14 < this.field401.length; ++var14) { + var13[var14] = this.field401[var14]; } - this.__q = var13; + this.field401 = var13; } var12 >>>= 1; } - this.__q[var10] = ~var5; - if(var10 >= var4) { + this.field401[var10] = ~var5; + if (var10 >= var4) { var4 = var10 + 1; } } @@ -110,15 +110,15 @@ public class Huffman { signature = "([BII[BIB)I", garbageValue = "64" ) - public int __m_293(byte[] var1, int var2, int var3, byte[] var4, int var5) { + public int method127(byte[] var1, int var2, int var3, byte[] var4, int var5) { int var6 = 0; int var7 = var5 << 3; - for(var3 += var2; var2 < var3; ++var2) { + for (var3 += var2; var2 < var3; ++var2) { int var8 = var1[var2] & 255; - int var9 = this.__m[var8]; - byte var10 = this.__f[var8]; - if(var10 == 0) { + int var9 = this.field399[var8]; + byte var10 = this.field400[var8]; + if (var10 == 0) { throw new RuntimeException(""); } @@ -128,19 +128,19 @@ public class Huffman { int var13 = (var10 + var12 - 1 >> 3) + var11; var12 += 24; var4[var11] = (byte)(var6 |= var9 >>> var12); - if(var11 < var13) { + if (var11 < var13) { ++var11; var12 -= 8; var4[var11] = (byte)(var6 = var9 >>> var12); - if(var11 < var13) { + if (var11 < var13) { ++var11; var12 -= 8; var4[var11] = (byte)(var6 = var9 >>> var12); - if(var11 < var13) { + if (var11 < var13) { ++var11; var12 -= 8; var4[var11] = (byte)(var6 = var9 >>> var12); - if(var11 < var13) { + if (var11 < var13) { ++var11; var12 -= 8; var4[var11] = (byte)(var6 = var9 << -var12); @@ -160,131 +160,131 @@ public class Huffman { signature = "([BI[BIII)I", garbageValue = "-2094399899" ) - public int __f_294(byte[] var1, int var2, byte[] var3, int var4, int var5) { - if(var5 == 0) { + public int method128(byte[] var1, int var2, byte[] var3, int var4, int var5) { + if (var5 == 0) { return 0; } else { int var6 = 0; var5 += var4; int var7 = var2; - while(true) { + while (true) { byte var8 = var1[var7]; - if(var8 < 0) { - var6 = this.__q[var6]; + if (var8 < 0) { + var6 = this.field401[var6]; } else { ++var6; } int var9; - if((var9 = this.__q[var6]) < 0) { + if ((var9 = this.field401[var6]) < 0) { var3[var4++] = (byte)(~var9); - if(var4 >= var5) { + if (var4 >= var5) { break; } var6 = 0; } - if((var8 & 64) != 0) { - var6 = this.__q[var6]; + if ((var8 & 64) != 0) { + var6 = this.field401[var6]; } else { ++var6; } - if((var9 = this.__q[var6]) < 0) { + if ((var9 = this.field401[var6]) < 0) { var3[var4++] = (byte)(~var9); - if(var4 >= var5) { + if (var4 >= var5) { break; } var6 = 0; } - if((var8 & 32) != 0) { - var6 = this.__q[var6]; + if ((var8 & 32) != 0) { + var6 = this.field401[var6]; } else { ++var6; } - if((var9 = this.__q[var6]) < 0) { + if ((var9 = this.field401[var6]) < 0) { var3[var4++] = (byte)(~var9); - if(var4 >= var5) { + if (var4 >= var5) { break; } var6 = 0; } - if((var8 & 16) != 0) { - var6 = this.__q[var6]; + if ((var8 & 16) != 0) { + var6 = this.field401[var6]; } else { ++var6; } - if((var9 = this.__q[var6]) < 0) { + if ((var9 = this.field401[var6]) < 0) { var3[var4++] = (byte)(~var9); - if(var4 >= var5) { + if (var4 >= var5) { break; } var6 = 0; } - if((var8 & 8) != 0) { - var6 = this.__q[var6]; + if ((var8 & 8) != 0) { + var6 = this.field401[var6]; } else { ++var6; } - if((var9 = this.__q[var6]) < 0) { + if ((var9 = this.field401[var6]) < 0) { var3[var4++] = (byte)(~var9); - if(var4 >= var5) { + if (var4 >= var5) { break; } var6 = 0; } - if((var8 & 4) != 0) { - var6 = this.__q[var6]; + if ((var8 & 4) != 0) { + var6 = this.field401[var6]; } else { ++var6; } - if((var9 = this.__q[var6]) < 0) { + if ((var9 = this.field401[var6]) < 0) { var3[var4++] = (byte)(~var9); - if(var4 >= var5) { + if (var4 >= var5) { break; } var6 = 0; } - if((var8 & 2) != 0) { - var6 = this.__q[var6]; + if ((var8 & 2) != 0) { + var6 = this.field401[var6]; } else { ++var6; } - if((var9 = this.__q[var6]) < 0) { + if ((var9 = this.field401[var6]) < 0) { var3[var4++] = (byte)(~var9); - if(var4 >= var5) { + if (var4 >= var5) { break; } var6 = 0; } - if((var8 & 1) != 0) { - var6 = this.__q[var6]; + if ((var8 & 1) != 0) { + var6 = this.field401[var6]; } else { ++var6; } - if((var9 = this.__q[var6]) < 0) { + if ((var9 = this.field401[var6]) < 0) { var3[var4++] = (byte)(~var9); - if(var4 >= var5) { + if (var4 >= var5) { break; } @@ -307,9 +307,9 @@ public class Huffman { public static Widget getWidget(int var0) { int var1 = var0 >> 16; int var2 = var0 & 65535; - if(Widget.widgets[var1] == null || Widget.widgets[var1][var2] == null) { + if (Widget.widgets[var1] == null || Widget.widgets[var1][var2] == null) { boolean var3 = GroundItemPile.loadWidgetGroup(var1); - if(!var3) { + if (!var3) { return null; } } diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index 3257e5fa90..2ba085647a 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -48,19 +48,19 @@ public class IgnoreList extends UserList { ) @Export("read") public void read(Buffer var1, int var2) { - while(true) { - if(var1.index < var2) { + while (true) { + if (var1.index < var2) { int var3 = var1.readUnsignedByte(); boolean var4 = (var3 & 1) == 1; Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); var1.readStringCp1252NullTerminated(); - if(var5 != null && var5.hasCleanName()) { + if (var5 != null && var5.hasCleanName()) { Ignored var7 = (Ignored)this.getByCurrentUsername(var5); - if(var4) { + if (var4) { Ignored var8 = (Ignored)this.getByCurrentUsername(var6); - if(var8 != null && var8 != var7) { - if(var7 != null) { + if (var8 != null && var8 != var7) { + if (var7 != null) { this.remove(var8); } else { var7 = var8; @@ -68,12 +68,12 @@ public class IgnoreList extends UserList { } } - if(var7 != null) { + if (var7 != null) { this.changeName(var7, var5, var6); continue; } - if(this.size() < 400) { + if (this.size() < 400) { int var9 = this.size(); var7 = (Ignored)this.addLast(var5, var6); var7.id = var9; @@ -94,56 +94,56 @@ public class IgnoreList extends UserList { garbageValue = "5" ) static int method5438(CharSequence var0, int var1, boolean var2) { - if(var1 >= 2 && var1 <= 36) { + if (var1 >= 2 && var1 <= 36) { boolean var3 = false; boolean var4 = false; int var5 = 0; int var6 = var0.length(); - for(int var7 = 0; var7 < var6; ++var7) { + for (int var7 = 0; var7 < var6; ++var7) { char var8 = var0.charAt(var7); - if(var7 == 0) { - if(var8 == '-') { + if (var7 == 0) { + if (var8 == '-') { var3 = true; continue; } - if(var8 == '+') { + if (var8 == '+') { continue; } } - int var10; - if(var8 >= '0' && var8 <= '9') { - var10 = var8 - '0'; - } else if(var8 >= 'A' && var8 <= 'Z') { - var10 = var8 - '7'; + int var9; + if (var8 >= '0' && var8 <= '9') { + var9 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { + var9 = var8 - '7'; } else { - if(var8 < 'a' || var8 > 'z') { + if (var8 < 'a' || var8 > 'z') { throw new NumberFormatException(); } - var10 = var8 - 'W'; + var9 = var8 - 'W'; } - if(var10 >= var1) { + if (var9 >= var1) { throw new NumberFormatException(); } - if(var3) { - var10 = -var10; + if (var3) { + var9 = -var9; } - int var9 = var10 + var5 * var1; - if(var9 / var1 != var5) { + int var10 = var9 + var5 * var1; + if (var10 / var1 != var5) { throw new NumberFormatException(); } - var5 = var9; + var5 = var10; var4 = true; } - if(!var4) { + if (!var4) { throw new NumberFormatException(); } else { return var5; diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index 87c2827f60..dca7210b00 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Ignored") public class Ignored extends User { @ObfuscatedName("at") - protected static String __ks_at; + protected static String field402; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 344024525 @@ -47,7 +47,7 @@ public class Ignored extends User { ) @Export("queueSoundEffect") static void queueSoundEffect(int var0, int var1, int var2) { - if(Client.soundEffectVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { + if (Client.soundEffectVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { Client.soundEffectIds[Client.soundEffectCount] = var0; Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; diff --git a/runescape-client/src/main/java/IndexCache.java b/runescape-client/src/main/java/IndexCache.java index 6f39f6bf7b..20676bbfbe 100644 --- a/runescape-client/src/main/java/IndexCache.java +++ b/runescape-client/src/main/java/IndexCache.java @@ -30,9 +30,9 @@ public class IndexCache extends AbstractIndexCache { @Export("index") int index; @ObfuscatedName("v") - volatile boolean __v; + volatile boolean field403; @ObfuscatedName("ag") - boolean __ag; + boolean field404; @ObfuscatedName("aq") @Export("validArchives") volatile boolean[] validArchives; @@ -52,33 +52,29 @@ public class IndexCache extends AbstractIndexCache { @ObfuscatedGetter( intValue = -1884661133 ) - int __ac; - - static { - IndexCache_crc = new CRC32(); - } + int field405; @ObfuscatedSignature( signature = "(Lff;Lff;IZZZ)V" ) public IndexCache(IndexStore var1, IndexStore var2, int var3, boolean var4, boolean var5, boolean var6) { super(var4, var5); - this.__v = false; - this.__ag = false; - this.__ac = -1; + this.field403 = false; + this.field404 = false; + this.field405 = -1; this.indexStore = var1; this.referenceStore = var2; this.index = var3; - this.__ag = var6; - int var8 = this.index; - if(Players.NetCache_reference != null) { - Players.NetCache_reference.index = var8 * 8 + 5; + this.field404 = var6; + int var7 = this.index; + if (Players.NetCache_reference != null) { + Players.NetCache_reference.index = var7 * 8 + 5; + int var8 = Players.NetCache_reference.readInt(); int var9 = Players.NetCache_reference.readInt(); - int var10 = Players.NetCache_reference.readInt(); - this.loadIndexReference(var9, var10); + this.loadIndexReference(var8, var9); } else { PacketBuffer.requestNetFile((IndexCache)null, 255, 255, 0, (byte)0, true); - NetCache.NetCache_indexCaches[var8] = this; + NetCache.NetCache_indexCaches[var7] = this; } } @@ -88,11 +84,11 @@ public class IndexCache extends AbstractIndexCache { signature = "(II)V", garbageValue = "2102142648" ) - void __f_392(int var1) { + void vmethod129(int var1) { int var2 = this.index; long var3 = (long)((var2 << 16) + var1); NetFileRequest var5 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var3); - if(var5 != null) { + if (var5 != null) { NetCache.NetCache_pendingWritesQueue.addLast(var5); } @@ -105,7 +101,7 @@ public class IndexCache extends AbstractIndexCache { ) @Export("archiveLoadPercent") int archiveLoadPercent(int var1) { - return super.archives[var1] != null?100:(this.validArchives[var1]?100:class54.method1086(this.index, var1)); + return super.archives[var1] != null ? 100 : (this.validArchives[var1] ? 100 : class54.method1086(this.index, var1)); } @ObfuscatedName("z") @@ -115,24 +111,24 @@ public class IndexCache extends AbstractIndexCache { ) @Export("loadArchive") void loadArchive(int var1) { - if(this.indexStore != null && this.validArchives != null && this.validArchives[var1]) { + if (this.indexStore != null && this.validArchives != null && this.validArchives[var1]) { IndexStore var2 = this.indexStore; - byte[] var4 = null; - NodeDeque var5 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; + byte[] var3 = null; + NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { - for(IndexStoreAction var6 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.last(); var6 != null; var6 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.previous()) { - if(var6.key == (long)var1 && var2 == var6.indexStore && var6.type == 0) { - var4 = var6.data; + for (IndexStoreAction var6 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.last(); var6 != null; var6 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.previous()) { + if (var6.key == (long)var1 && var2 == var6.indexStore && var6.type == 0) { + var3 = var6.data; break; } } } - if(var4 != null) { - this.load(var2, var1, var4, true); + if (var3 != null) { + this.load(var2, var1, var3, true); } else { - byte[] var9 = var2.read(var1); - this.load(var2, var1, var9, true); + byte[] var5 = var2.read(var1); + this.load(var2, var1, var5, true); } } else { PacketBuffer.requestNetFile(this, this.index, var1, super.archiveCrcs[var1], (byte)2, true); @@ -145,8 +141,8 @@ public class IndexCache extends AbstractIndexCache { signature = "(I)Z", garbageValue = "1750279412" ) - public boolean __cx_404() { - return this.__v; + public boolean method130() { + return this.field403; } @ObfuscatedName("ca") @@ -154,14 +150,14 @@ public class IndexCache extends AbstractIndexCache { signature = "(I)I", garbageValue = "1671499504" ) - public int __ca_405() { - if(this.__v) { + public int method131() { + if (this.field403) { return 100; - } else if(super.archives != null) { + } else if (super.archives != null) { return 99; } else { int var1 = class54.method1086(255, this.index); - if(var1 >= 100) { + if (var1 >= 100) { var1 = 99; } @@ -178,25 +174,25 @@ public class IndexCache extends AbstractIndexCache { public void loadIndexReference(int var1, int var2) { this.indexReferenceCrc = var1; this.indexReferenceVersion = var2; - if(this.referenceStore != null) { + if (this.referenceStore != null) { int var3 = this.index; IndexStore var4 = this.referenceStore; - byte[] var6 = null; - NodeDeque var7 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; + byte[] var5 = null; + NodeDeque var6 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { - for(IndexStoreAction var8 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.last(); var8 != null; var8 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.previous()) { - if(var8.key == (long)var3 && var4 == var8.indexStore && var8.type == 0) { - var6 = var8.data; + for (IndexStoreAction var8 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.last(); var8 != null; var8 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.previous()) { + if (var8.key == (long)var3 && var4 == var8.indexStore && var8.type == 0) { + var5 = var8.data; break; } } } - if(var6 != null) { - this.load(var4, var3, var6, true); + if (var5 != null) { + this.load(var4, var3, var5, true); } else { - byte[] var11 = var4.read(var3); - this.load(var4, var3, var11, true); + byte[] var7 = var4.read(var3); + this.load(var4, var3, var7, true); } } else { PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true); @@ -211,12 +207,12 @@ public class IndexCache extends AbstractIndexCache { ) @Export("write") public void write(int var1, byte[] var2, boolean var3, boolean var4) { - if(var3) { - if(this.__v) { + if (var3) { + if (this.field403) { throw new RuntimeException(); } - if(this.referenceStore != null) { + if (this.referenceStore != null) { Widget.method4499(this.index, var2, this.referenceStore); } @@ -225,12 +221,12 @@ public class IndexCache extends AbstractIndexCache { } else { var2[var2.length - 2] = (byte)(super.archiveVersions[var1] >> 8); var2[var2.length - 1] = (byte)super.archiveVersions[var1]; - if(this.indexStore != null) { + if (this.indexStore != null) { Widget.method4499(var1, var2, this.indexStore); this.validArchives[var1] = true; } - if(var4) { + if (var4) { super.archives[var1] = Projectile.byteArrayToObject(var2, false); } } @@ -245,75 +241,68 @@ public class IndexCache extends AbstractIndexCache { @Export("load") void load(IndexStore var1, int var2, byte[] var3, boolean var4) { int var5; - if(var1 == this.referenceStore) { - if(this.__v) { + if (var1 == this.referenceStore) { + if (this.field403) { throw new RuntimeException(); - } - - if(var3 == null) { + } else if (var3 == null) { PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true); - return; - } + } else { + IndexCache_crc.reset(); + IndexCache_crc.update(var3, 0, var3.length); + var5 = (int)IndexCache_crc.getValue(); + if (var5 != this.indexReferenceCrc) { + PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true); + } else { + Buffer var9 = new Buffer(Strings.decompressBytes(var3)); + int var7 = var9.readUnsignedByte(); + if (var7 != 5 && var7 != 6) { + throw new RuntimeException(var7 + "," + this.index + "," + var2); + } else { + int var8 = 0; + if (var7 >= 6) { + var8 = var9.readInt(); + } - IndexCache_crc.reset(); - IndexCache_crc.update(var3, 0, var3.length); - var5 = (int)IndexCache_crc.getValue(); - if(var5 != this.indexReferenceCrc) { - PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true); - return; + if (var8 != this.indexReferenceVersion) { + PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true); + } else { + this.setIndexReference(var3); + this.loadAllLocal(); + } + } + } } - - Buffer var9 = new Buffer(Strings.decompressBytes(var3)); - int var7 = var9.readUnsignedByte(); - if(var7 != 5 && var7 != 6) { - throw new RuntimeException(var7 + "," + this.index + "," + var2); - } - - int var8 = 0; - if(var7 >= 6) { - var8 = var9.readInt(); - } - - if(var8 != this.indexReferenceVersion) { - PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true); - return; - } - - this.setIndexReference(var3); - this.loadAllLocal(); } else { - if(!var4 && var2 == this.__ac) { - this.__v = true; + if (!var4 && var2 == this.field405) { + this.field403 = true; } - if(var3 == null || var3.length <= 2) { + if (var3 != null && var3.length > 2) { + IndexCache_crc.reset(); + IndexCache_crc.update(var3, 0, var3.length - 2); + var5 = (int)IndexCache_crc.getValue(); + int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); + if (var5 == super.archiveCrcs[var2] && var6 == super.archiveVersions[var2]) { + this.validArchives[var2] = true; + if (var4) { + super.archives[var2] = Projectile.byteArrayToObject(var3, false); + } + + } else { + this.validArchives[var2] = false; + if (this.field404 || var4) { + PacketBuffer.requestNetFile(this, this.index, var2, super.archiveCrcs[var2], (byte)2, var4); + } + + } + } else { this.validArchives[var2] = false; - if(this.__ag || var4) { + if (this.field404 || var4) { PacketBuffer.requestNetFile(this, this.index, var2, super.archiveCrcs[var2], (byte)2, var4); } - return; - } - - IndexCache_crc.reset(); - IndexCache_crc.update(var3, 0, var3.length - 2); - var5 = (int)IndexCache_crc.getValue(); - int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); - if(var5 != super.archiveCrcs[var2] || var6 != super.archiveVersions[var2]) { - this.validArchives[var2] = false; - if(this.__ag || var4) { - PacketBuffer.requestNetFile(this, this.index, var2, super.archiveCrcs[var2], (byte)2, var4); - } - - return; - } - - this.validArchives[var2] = true; - if(var4) { - super.archives[var2] = Projectile.byteArrayToObject(var3, false); } } - } @ObfuscatedName("dt") @@ -326,27 +315,27 @@ public class IndexCache extends AbstractIndexCache { this.validArchives = new boolean[super.archives.length]; int var1; - for(var1 = 0; var1 < this.validArchives.length; ++var1) { + for (var1 = 0; var1 < this.validArchives.length; ++var1) { this.validArchives[var1] = false; } - if(this.indexStore == null) { - this.__v = true; + if (this.indexStore == null) { + this.field403 = true; } else { - this.__ac = -1; + this.field405 = -1; - for(var1 = 0; var1 < this.validArchives.length; ++var1) { - if(super.recordCounts[var1] > 0) { - Npc.method2009(var1, this.indexStore, this); - this.__ac = var1; + for (var1 = 0; var1 < this.validArchives.length; ++var1) { + if (super.recordCounts[var1] > 0) { + NPC.method2009(var1, this.indexStore, this); + this.field405 = var1; } } - if(this.__ac == -1) { - this.__v = true; + if (this.field405 == -1) { + this.field403 = true; } - } + } @ObfuscatedName("dn") @@ -354,7 +343,7 @@ public class IndexCache extends AbstractIndexCache { signature = "(IB)Z", garbageValue = "0" ) - public boolean __dn_407(int var1) { + public boolean method132(int var1) { return this.validArchives[var1]; } @@ -363,8 +352,8 @@ public class IndexCache extends AbstractIndexCache { signature = "(II)Z", garbageValue = "1419648188" ) - public boolean __df_408(int var1) { - return this.__j_395(var1) != null; + public boolean method133(int var1) { + return this.method3(var1) != null; } @ObfuscatedName("da") @@ -378,14 +367,14 @@ public class IndexCache extends AbstractIndexCache { int var2 = 0; int var3; - for(var3 = 0; var3 < super.archives.length; ++var3) { - if(super.recordCounts[var3] > 0) { + for (var3 = 0; var3 < super.archives.length; ++var3) { + if (super.recordCounts[var3] > 0) { var1 += 100; var2 += this.archiveLoadPercent(var3); } } - if(var1 == 0) { + if (var1 == 0) { return 100; } else { var3 = var2 * 100 / var1; @@ -401,32 +390,32 @@ public class IndexCache extends AbstractIndexCache { static final void method4703(int var0) { class12.method159(); - for(ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if(var1.obj != null) { + for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var1.obj != null) { var1.set(); } } int var4 = SecureRandomCallable.method1140(var0).type; - if(var4 != 0) { + if (var4 != 0) { int var2 = Varps.Varps_main[var0]; - if(var4 == 1) { - if(var2 == 1) { + if (var4 == 1) { + if (var2 == 1) { Rasterizer3D.Rasterizer3D_setBrightness(0.9D); ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.9D); } - if(var2 == 2) { + if (var2 == 2) { Rasterizer3D.Rasterizer3D_setBrightness(0.8D); ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.8D); } - if(var2 == 3) { + if (var2 == 3) { Rasterizer3D.Rasterizer3D_setBrightness(0.7D); ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.7D); } - if(var2 == 4) { + if (var2 == 4) { Rasterizer3D.Rasterizer3D_setBrightness(0.6D); ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.6D); } @@ -434,127 +423,131 @@ public class IndexCache extends AbstractIndexCache { ObjectDefinition.method5041(); } - if(var4 == 3) { + if (var4 == 3) { short var3 = 0; - if(var2 == 0) { + if (var2 == 0) { var3 = 255; } - if(var2 == 1) { + if (var2 == 1) { var3 = 192; } - if(var2 == 2) { + if (var2 == 2) { var3 = 128; } - if(var2 == 3) { + if (var2 == 3) { var3 = 64; } - if(var2 == 4) { + if (var2 == 4) { var3 = 0; } - if(var3 != Client.__client_qf) { - if(Client.__client_qf == 0 && Client.__client_qy != -1) { - Login.method2076(UserComparator3.indexCache6, Client.__client_qy, 0, var3, false); - Client.__client_qq = false; - } else if(var3 == 0) { + if (var3 != Client.field128) { + if (Client.field128 == 0 && Client.field112 != -1) { + Login.method2076(UserComparator3.indexCache6, Client.field112, 0, var3, false); + Client.field107 = false; + } else if (var3 == 0) { class214.midiPcmStream.clear(); - class214.__hf_o = 1; - class214.__hf_u = null; - Client.__client_qq = false; + class214.field1129 = 1; + class214.field1130 = null; + Client.field107 = false; } else { class203.method4008(var3); } - Client.__client_qf = var3; + Client.field128 = var3; } } - if(var4 == 4) { - if(var2 == 0) { + if (var4 == 4) { + if (var2 == 0) { Client.soundEffectVolume = 127; } - if(var2 == 1) { + if (var2 == 1) { Client.soundEffectVolume = 96; } - if(var2 == 2) { + if (var2 == 2) { Client.soundEffectVolume = 64; } - if(var2 == 3) { + if (var2 == 3) { Client.soundEffectVolume = 32; } - if(var2 == 4) { + if (var2 == 4) { Client.soundEffectVolume = 0; } } - if(var4 == 5) { - Client.__client_ku = var2; + if (var4 == 5) { + Client.field215 = var2; } - if(var4 == 6) { + if (var4 == 6) { Client.chatEffects = var2; } - if(var4 == 9) { - Client.__client_mb = var2; + if (var4 == 9) { + Client.field136 = var2; } - if(var4 == 10) { - if(var2 == 0) { - Client.__client_qc = 127; + if (var4 == 10) { + if (var2 == 0) { + Client.field115 = 127; } - if(var2 == 1) { - Client.__client_qc = 96; + if (var2 == 1) { + Client.field115 = 96; } - if(var2 == 2) { - Client.__client_qc = 64; + if (var2 == 2) { + Client.field115 = 64; } - if(var2 == 3) { - Client.__client_qc = 32; + if (var2 == 3) { + Client.field115 = 32; } - if(var2 == 4) { - Client.__client_qc = 0; + if (var2 == 4) { + Client.field115 = 0; } } - if(var4 == 17) { + if (var4 == 17) { Client.followerIndex = var2 & 65535; } - if(var4 == 18) { + if (var4 == 18) { Client.playerAttackOption = (AttackOption)ScriptFrame.findEnumerated(ClientPacket.method3665(), var2); - if(Client.playerAttackOption == null) { + if (Client.playerAttackOption == null) { Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; } } - if(var4 == 19) { - if(var2 == -1) { + if (var4 == 19) { + if (var2 == -1) { Client.combatTargetPlayerIndex = -1; } else { Client.combatTargetPlayerIndex = var2 & 2047; } } - if(var4 == 22) { + if (var4 == 22) { Client.npcAttackOption = (AttackOption)ScriptFrame.findEnumerated(ClientPacket.method3665(), var2); - if(Client.npcAttackOption == null) { + if (Client.npcAttackOption == null) { Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; } } - } + + } + + static { + IndexCache_crc = new CRC32(); } } diff --git a/runescape-client/src/main/java/IndexCacheLoader.java b/runescape-client/src/main/java/IndexCacheLoader.java index 352fa614f5..c4c05568d9 100644 --- a/runescape-client/src/main/java/IndexCacheLoader.java +++ b/runescape-client/src/main/java/IndexCacheLoader.java @@ -19,12 +19,12 @@ public class IndexCacheLoader { @Export("titlebuttonSprite") static IndexedSprite titlebuttonSprite; @ObfuscatedName("x") - public static short[][] __bd_x; + public static short[][] field406; @ObfuscatedName("er") @ObfuscatedGetter( intValue = 636454135 ) - static int __bd_er; + static int field407; @ObfuscatedName("gw") @Export("regionMapArchiveIds") static int[] regionMapArchiveIds; @@ -38,20 +38,20 @@ public class IndexCacheLoader { @ObfuscatedGetter( intValue = 1459455501 ) - final int __q; + final int field408; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 782003089 ) - int __w; + int field409; @ObfuscatedSignature( signature = "(Lit;Ljava/lang/String;)V" ) IndexCacheLoader(IndexCache var1, String var2) { - this.__w = 0; + this.field409 = 0; this.indexCache = var1; - this.__q = var1.__t_397(); + this.field408 = var1.method5(); } @ObfuscatedName("m") @@ -59,16 +59,16 @@ public class IndexCacheLoader { signature = "(I)Z", garbageValue = "1352221725" ) - boolean __m_122() { - this.__w = 0; + boolean method134() { + this.field409 = 0; - for(int var1 = 0; var1 < this.__q; ++var1) { - if(!this.indexCache.__df_408(var1) || this.indexCache.__dn_407(var1)) { - ++this.__w; + for (int var1 = 0; var1 < this.field408; ++var1) { + if (!this.indexCache.method133(var1) || this.indexCache.method132(var1)) { + ++this.field409; } } - return this.__w >= this.__q; + return this.field409 >= this.field408; } @ObfuscatedName("x") @@ -81,67 +81,68 @@ public class IndexCacheLoader { Login.xPadding = (SoundCache.canvasWidth - 765) / 2; Login.loginBoxX = Login.xPadding + 202; Varps.loginBoxCenter = Login.loginBoxX + 180; + int var3; + int var4; + int var5; + byte var6; + int var7; + int var8; int var9; - int var11; - int var19; - byte var23; - int var24; - int var27; - int var28; - int var48; - if(Login.worldSelectOpen) { - if(class30.worldSelectBackSprites == null) { + int var10; + boolean var20; + 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.worldSelectFlagSprites == null) { - var36 = WorldMapSection3.indexCache8; - var39 = var36.getArchiveId("sl_flags"); - var37 = var36.getRecordId(var39, ""); - if(!SpriteMask.loadSprite(var36, var39, var37)) { - var40 = null; + IndexCache var11; + int var12; + int var13; + IndexedSprite[] var14; + if (Frames.worldSelectFlagSprites == null) { + var11 = WorldMapSection3.indexCache8; + var13 = var11.getArchiveId("sl_flags"); + var12 = var11.getRecordId(var13, ""); + if (!SpriteMask.loadSprite(var11, var13, var12)) { + var14 = null; } else { - var40 = WorldMapLabel.createIndexedSpriteArray(); + var14 = WorldMapLabel.createIndexedSpriteArray(); } - Frames.worldSelectFlagSprites = var40; + Frames.worldSelectFlagSprites = var14; } - if(AttackOption.worldSelectArrows == null) { - var36 = WorldMapSection3.indexCache8; - var39 = var36.getArchiveId("sl_arrows"); - var37 = var36.getRecordId(var39, ""); - if(!SpriteMask.loadSprite(var36, var39, var37)) { - var40 = null; + if (AttackOption.worldSelectArrows == null) { + var11 = WorldMapSection3.indexCache8; + var13 = var11.getArchiveId("sl_arrows"); + var12 = var11.getRecordId(var13, ""); + if (!SpriteMask.loadSprite(var11, var13, var12)) { + var14 = null; } else { - var40 = WorldMapLabel.createIndexedSpriteArray(); + var14 = WorldMapLabel.createIndexedSpriteArray(); } - AttackOption.worldSelectArrows = var40; + AttackOption.worldSelectArrows = var14; } - if(UrlRequest.worldSelectStars == null) { - var36 = WorldMapSection3.indexCache8; - var39 = var36.getArchiveId("sl_stars"); - var37 = var36.getRecordId(var39, ""); - if(!SpriteMask.loadSprite(var36, var39, var37)) { - var40 = null; + if (UrlRequest.worldSelectStars == null) { + var11 = WorldMapSection3.indexCache8; + var13 = var11.getArchiveId("sl_stars"); + var12 = var11.getRecordId(var13, ""); + if (!SpriteMask.loadSprite(var11, var13, var12)) { + var14 = null; } else { - var40 = WorldMapLabel.createIndexedSpriteArray(); + var14 = WorldMapLabel.createIndexedSpriteArray(); } - UrlRequest.worldSelectStars = var40; + UrlRequest.worldSelectStars = var14; } - if(SecureRandomFuture.worldSelectLeftSprite == null) { + if (SecureRandomFuture.worldSelectLeftSprite == null) { SecureRandomFuture.worldSelectLeftSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.indexCache8, "leftarrow", ""); } - if(NetSocket.worldSelectRightSprite == null) { + if (NetSocket.worldSelectRightSprite == null) { NetSocket.worldSelectRightSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.indexCache8, "rightarrow", ""); } @@ -149,200 +150,203 @@ public class IndexCacheLoader { 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) { + 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.worldSelectArrows != null) { - var48 = Login.xPadding + 280; - if(World.sortOption1[0] == 0 && World.sortOption2[0] == 0) { - AttackOption.worldSelectArrows[2].drawAt(var48, 4); + if (AttackOption.worldSelectArrows != null) { + var10 = Login.xPadding + 280; + if (World.sortOption1[0] == 0 && World.sortOption2[0] == 0) { + AttackOption.worldSelectArrows[2].drawAt(var10, 4); } else { - AttackOption.worldSelectArrows[0].drawAt(var48, 4); + AttackOption.worldSelectArrows[0].drawAt(var10, 4); } - if(World.sortOption1[0] == 0 && World.sortOption2[0] == 1) { - AttackOption.worldSelectArrows[3].drawAt(var48 + 15, 4); + if (World.sortOption1[0] == 0 && World.sortOption2[0] == 1) { + AttackOption.worldSelectArrows[3].drawAt(var10 + 15, 4); } else { - AttackOption.worldSelectArrows[1].drawAt(var48 + 15, 4); + AttackOption.worldSelectArrows[1].drawAt(var10 + 15, 4); } - var0.draw("World", var48 + 32, 17, 16777215, -1); - var24 = Login.xPadding + 390; - if(World.sortOption1[0] == 1 && World.sortOption2[0] == 0) { - AttackOption.worldSelectArrows[2].drawAt(var24, 4); + var0.draw("World", var10 + 32, 17, 16777215, -1); + var7 = Login.xPadding + 390; + if (World.sortOption1[0] == 1 && World.sortOption2[0] == 0) { + AttackOption.worldSelectArrows[2].drawAt(var7, 4); } else { - AttackOption.worldSelectArrows[0].drawAt(var24, 4); + AttackOption.worldSelectArrows[0].drawAt(var7, 4); } - if(World.sortOption1[0] == 1 && World.sortOption2[0] == 1) { - AttackOption.worldSelectArrows[3].drawAt(var24 + 15, 4); + if (World.sortOption1[0] == 1 && World.sortOption2[0] == 1) { + AttackOption.worldSelectArrows[3].drawAt(var7 + 15, 4); } else { - AttackOption.worldSelectArrows[1].drawAt(var24 + 15, 4); + AttackOption.worldSelectArrows[1].drawAt(var7 + 15, 4); } - var0.draw("Players", var24 + 32, 17, 16777215, -1); - var39 = Login.xPadding + 500; - if(World.sortOption1[0] == 2 && World.sortOption2[0] == 0) { - AttackOption.worldSelectArrows[2].drawAt(var39, 4); + var0.draw("Players", var7 + 32, 17, 16777215, -1); + var13 = Login.xPadding + 500; + if (World.sortOption1[0] == 2 && World.sortOption2[0] == 0) { + AttackOption.worldSelectArrows[2].drawAt(var13, 4); } else { - AttackOption.worldSelectArrows[0].drawAt(var39, 4); + AttackOption.worldSelectArrows[0].drawAt(var13, 4); } - if(World.sortOption1[0] == 2 && World.sortOption2[0] == 1) { - AttackOption.worldSelectArrows[3].drawAt(var39 + 15, 4); + if (World.sortOption1[0] == 2 && World.sortOption2[0] == 1) { + AttackOption.worldSelectArrows[3].drawAt(var13 + 15, 4); } else { - AttackOption.worldSelectArrows[1].drawAt(var39 + 15, 4); + AttackOption.worldSelectArrows[1].drawAt(var13 + 15, 4); } - var0.draw("Location", var39 + 32, 17, 16777215, -1); - var37 = Login.xPadding + 610; - if(World.sortOption1[0] == 3 && World.sortOption2[0] == 0) { - AttackOption.worldSelectArrows[2].drawAt(var37, 4); + var0.draw("Location", var13 + 32, 17, 16777215, -1); + var12 = Login.xPadding + 610; + if (World.sortOption1[0] == 3 && World.sortOption2[0] == 0) { + AttackOption.worldSelectArrows[2].drawAt(var12, 4); } else { - AttackOption.worldSelectArrows[0].drawAt(var37, 4); + AttackOption.worldSelectArrows[0].drawAt(var12, 4); } - if(World.sortOption1[0] == 3 && World.sortOption2[0] == 1) { - AttackOption.worldSelectArrows[3].drawAt(var37 + 15, 4); + if (World.sortOption1[0] == 3 && World.sortOption2[0] == 1) { + AttackOption.worldSelectArrows[3].drawAt(var12 + 15, 4); } else { - AttackOption.worldSelectArrows[1].drawAt(var37 + 15, 4); + AttackOption.worldSelectArrows[1].drawAt(var12 + 15, 4); } - var0.draw("Type", var37 + 32, 17, 16777215, -1); + var0.draw("Type", var12 + 32, 17, 16777215, -1); } Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); Login.hoveredWorldIndex = -1; - if(class30.worldSelectBackSprites != null) { - var23 = 88; - byte var51 = 19; - var39 = 765 / (var23 + 1) - 1; - var37 = 480 / (var51 + 1); + if (class30.worldSelectBackSprites != null) { + var6 = 88; + byte var15 = 19; + var13 = 765 / (var6 + 1) - 1; + var12 = 480 / (var15 + 1); - do { - var27 = var37; - var28 = var39; - if(var37 * (var39 - 1) >= World.worldsCount) { - --var39; + while (true) { + var8 = var12; + var9 = var13; + if (var12 * (var13 - 1) >= World.worldsCount) { + --var13; } - if(var39 * (var37 - 1) >= World.worldsCount) { - --var37; + if (var13 * (var12 - 1) >= World.worldsCount) { + --var12; } - if(var39 * (var37 - 1) >= World.worldsCount) { - --var37; - } - } while(var37 != var27 || var39 != var28); - - var27 = (765 - var23 * var39) / (var39 + 1); - if(var27 > 5) { - var27 = 5; - } - - var28 = (480 - var51 * var37) / (var37 + 1); - if(var28 > 5) { - var28 = 5; - } - - var9 = (765 - var39 * var23 - var27 * (var39 - 1)) / 2; - int var10 = (480 - var37 * var51 - var28 * (var37 - 1)) / 2; - var11 = (var37 + World.worldsCount - 1) / var37; - Login.worldSelectPagesCount = var11 - var39; - if(SecureRandomFuture.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { - SecureRandomFuture.worldSelectLeftSprite.drawAt(8, Huffman.canvasHeight / 2 - SecureRandomFuture.worldSelectLeftSprite.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.xPadding; - int var43 = 0; - boolean var15 = false; - int var16 = Login.worldSelectPage; - - int 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); - if(var29.population == -1) { - var20 = "OFF"; - var46 = false; - } else if(var29.population > 1980) { - var20 = "FULL"; - var46 = false; + if (var13 * (var12 - 1) >= World.worldsCount) { + --var12; } - int var22 = 0; - byte var21; - if(var29.isBeta()) { - if(var29.isMembersOnly()) { - var21 = 7; - } else { - var21 = 6; + if (var12 == var8 && var13 == var9) { + var8 = (765 - var6 * var13) / (var13 + 1); + if (var8 > 5) { + var8 = 5; } - } else if(var29.isDeadman()) { - var22 = 0xff0000; - if(var29.isMembersOnly()) { - var21 = 5; - } else { - var21 = 4; + + var9 = (480 - var15 * var12) / (var12 + 1); + if (var9 > 5) { + var9 = 5; } - } else if(var29.isPvp()) { - if(var29.isMembersOnly()) { - var21 = 3; - } else { - var21 = 2; + + var3 = (765 - var13 * var6 - var8 * (var13 - 1)) / 2; + int var16 = (480 - var12 * var15 - var9 * (var12 - 1)) / 2; + var4 = (var12 + World.worldsCount - 1) / var12; + Login.worldSelectPagesCount = var4 - var13; + if (SecureRandomFuture.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { + SecureRandomFuture.worldSelectLeftSprite.drawAt(8, Huffman.canvasHeight / 2 - SecureRandomFuture.worldSelectLeftSprite.subHeight / 2); } - } 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.hoveredWorldIndex = var44; - class30.worldSelectBackSprites[var21].drawAtTransOverlay(var42, var41, 128, 0xffffff); - var15 = true; - } else { - class30.worldSelectBackSprites[var21].drawAt(var42, var41); - } + if (NetSocket.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { + NetSocket.worldSelectRightSprite.drawAt(SoundCache.canvasWidth - NetSocket.worldSelectRightSprite.subWidth - 8, Huffman.canvasHeight / 2 - NetSocket.worldSelectRightSprite.subHeight / 2); + } - if(Frames.worldSelectFlagSprites != null) { - Frames.worldSelectFlagSprites[(var29.isMembersOnly()?8:0) + var29.location].drawAt(var42 + 29, var41); - } + int var17 = var16 + 23; + int var18 = var3 + Login.xPadding; + int var19 = 0; + var20 = false; + int var21 = Login.worldSelectPage; - var0.drawCentered(Integer.toString(var29.id), var42 + 15, var51 / 2 + var41 + 5, var22, -1); - var1.drawCentered(var20, var42 + 60, var51 / 2 + var41 + 5, 268435455, -1); - var41 = var41 + var28 + var51; - ++var43; - if(var43 >= var37) { - var41 = var10 + 23; - var42 = var42 + var23 + var27; - var43 = 0; - ++var16; - } - } + int var22; + for (var22 = var12 * var21; var22 < World.worldsCount && var21 - Login.worldSelectPage < var13; ++var22) { + World var23 = ItemContainer.worlds[var22]; + boolean var24 = true; + String var25 = Integer.toString(var23.population); + if (var23.population == -1) { + var25 = "OFF"; + var24 = false; + } else if (var23.population > 1980) { + var25 = "FULL"; + var24 = false; + } - if(var15) { - var44 = var1.stringWidth(ItemContainer.worlds[Login.hoveredWorldIndex].activity) + 6; - int var45 = var1.ascent + 8; - var19 = MouseHandler.MouseHandler_y + 25; - if(var45 + var19 > 480) { - var19 = MouseHandler.MouseHandler_y - 25 - var45; - } + int var26 = 0; + byte var27; + if (var23.isBeta()) { + if (var23.isMembersOnly()) { + var27 = 7; + } else { + var27 = 6; + } + } else if (var23.isDeadman()) { + var26 = 16711680; + if (var23.isMembersOnly()) { + var27 = 5; + } else { + var27 = 4; + } + } else if (var23.isPvp()) { + if (var23.isMembersOnly()) { + var27 = 3; + } else { + var27 = 2; + } + } else if (var23.isMembersOnly()) { + var27 = 1; + } else { + var27 = 0; + } - 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.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var19 + var1.ascent + 4, 0, -1); + if (MouseHandler.MouseHandler_x >= var18 && MouseHandler.MouseHandler_y >= var17 && MouseHandler.MouseHandler_x < var18 + var6 && MouseHandler.MouseHandler_y < var15 + var17 && var24) { + Login.hoveredWorldIndex = var22; + class30.worldSelectBackSprites[var27].drawAtTransOverlay(var18, var17, 128, 16777215); + var20 = true; + } else { + class30.worldSelectBackSprites[var27].drawAt(var18, var17); + } + + if (Frames.worldSelectFlagSprites != null) { + Frames.worldSelectFlagSprites[(var23.isMembersOnly() ? 8 : 0) + var23.location].drawAt(var18 + 29, var17); + } + + var0.drawCentered(Integer.toString(var23.id), var18 + 15, var15 / 2 + var17 + 5, var26, -1); + var1.drawCentered(var25, var18 + 60, var15 / 2 + var17 + 5, 268435455, -1); + var17 = var17 + var9 + var15; + ++var19; + if (var19 >= var12) { + var17 = var16 + 23; + var18 = var18 + var6 + var8; + var19 = 0; + ++var21; + } + } + + if (var20) { + var22 = var1.stringWidth(ItemContainer.worlds[Login.hoveredWorldIndex].activity) + 6; + int var47 = var1.ascent + 8; + var5 = MouseHandler.MouseHandler_y + 25; + if (var47 + var5 > 480) { + var5 = MouseHandler.MouseHandler_y - 25 - var47; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var22 / 2, var5, var22, var47, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var22 / 2, var5, var22, var47, 0); + var1.drawCentered(ItemContainer.worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var5 + var1.ascent + 4, 0, -1); + } + break; + } } } @@ -351,354 +355,353 @@ public class IndexCacheLoader { 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.loginBoxX + 180, 245 - var23, 16777215, -1); - var24 = 253 - var23; - 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); + if (Client.gameState == 0 || Client.gameState == 5) { + var6 = 20; + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var6, 16777215, -1); + var7 = 253 - var6; + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var7, 304, 34, 9179409); + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var7 + 1, 302, 32, 0); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var7 + 2, Login.Login_loadingPercent * 3, 30, 9179409); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var7 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var6, 16777215, -1); } - String var7; - String var8; - String var25; + String var28; + String var29; String var30; String var31; - short var47; - short var49; - if(Client.gameState == 20) { + short var32; + String var33; + short var34; + if (Client.gameState == 20) { Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); - var47 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16776960, 0); - var48 = var47 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16776960, 0); - var48 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16776960, 0); - var48 += 15; - var48 += 7; - if(Login.loginIndex != 4) { - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var48, 16777215, 0); - var49 = 200; - if(ReflectionCheck.clientPreferences.hideUsername) { - var8 = Login.Login_username; - var7 = class168.method3450('*', var8.length()); - var25 = var7; + var32 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); + var10 = var32 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var10 += 7; + if (Login.loginIndex != 4) { + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var10, 16777215, 0); + var34 = 200; + if (ReflectionCheck.clientPreferences.hideUsername) { + var29 = Login.Login_username; + var28 = class168.method3450('*', var29.length()); + var30 = var28; } else { - var25 = Login.Login_username; + var30 = Login.Login_username; } - for(var25 = var25; var0.stringWidth(var25) > var49; var25 = var25.substring(0, var25.length() - 1)) { - ; + for (var30 = var30; var0.stringWidth(var30) > var34; var30 = var30.substring(0, var30.length() - 1)) { } - 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.loginBoxX + 180 - 108, var48, 16777215, 0); - var48 += 15; + var0.draw(AbstractFont.escapeBrackets(var30), Login.loginBoxX + 180 - 70, var10, 16777215, 0); + var10 += 15; + var29 = "Password: "; + var33 = Login.Login_password; + var31 = class168.method3450('*', var33.length()); + var0.draw(var29 + var31, Login.loginBoxX + 180 - 108, var10, 16777215, 0); + var10 += 15; } } - if(Client.gameState == 10 || Client.gameState == 11) { + if (Client.gameState == 10 || Client.gameState == 11) { Login.titleboxSprite.drawAt(Login.loginBoxX, 171); - short var5; - if(Login.loginIndex == 0) { - var47 = 251; - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var47, 16776960, 0); - var48 = var47 + 30; - var24 = Login.loginBoxX + 180 - 80; - var5 = 291; - titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawLines("New User", var24 - 73, var5 - 20, 144, 40, 16777215, 0, 1, 1, 0); - 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) { + short var35; + if (Login.loginIndex == 0) { + var32 = 251; + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var32, 16776960, 0); + var10 = var32 + 30; + var7 = Login.loginBoxX + 180 - 80; + var35 = 291; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawLines("New User", var7 - 73, var35 - 20, 144, 40, 16777215, 0, 1, 1, 0); + var7 = Login.loginBoxX + 180 + 80; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawLines("Existing User", var7 - 73, var35 - 20, 144, 40, 16777215, 0, 1, 1, 0); + } else if (Login.loginIndex == 1) { var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); - var47 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16777215, 0); - var48 = var47 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16777215, 0); - var48 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16777215, 0); - var48 += 15; - var24 = Login.loginBoxX + 180 - 80; - var5 = 321; - titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Continue", var24, var5 + 5, 16777215, 0); - 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.loginBoxCenter, var47, 16776960, 0); - var48 = var47 + 15; - var0.drawCentered(Login.Login_response2, Varps.loginBoxCenter, var48, 16776960, 0); - var48 += 15; - var0.drawCentered(Login.Login_response3, Varps.loginBoxCenter, var48, 16776960, 0); - var48 += 15; - var48 += 7; - var0.draw("Login: ", Varps.loginBoxCenter - 110, var48, 16777215, 0); - var49 = 200; - if(ReflectionCheck.clientPreferences.hideUsername) { - var8 = Login.Login_username; - var7 = class168.method3450('*', var8.length()); - var25 = var7; + var32 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0); + var10 = var32 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16777215, 0); + var10 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16777215, 0); + var10 += 15; + var7 = Login.loginBoxX + 180 - 80; + var35 = 321; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawCentered("Continue", var7, var35 + 5, 16777215, 0); + var7 = Login.loginBoxX + 180 + 80; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawCentered("Cancel", var7, var35 + 5, 16777215, 0); + } else if (Login.loginIndex == 2) { + var32 = 201; + var0.drawCentered(Login.Login_response1, Varps.loginBoxCenter, var32, 16776960, 0); + var10 = var32 + 15; + var0.drawCentered(Login.Login_response2, Varps.loginBoxCenter, var10, 16776960, 0); + var10 += 15; + var0.drawCentered(Login.Login_response3, Varps.loginBoxCenter, var10, 16776960, 0); + var10 += 15; + var10 += 7; + var0.draw("Login: ", Varps.loginBoxCenter - 110, var10, 16777215, 0); + var34 = 200; + if (ReflectionCheck.clientPreferences.hideUsername) { + var29 = Login.Login_username; + var28 = class168.method3450('*', var29.length()); + var30 = var28; } else { - var25 = Login.Login_username; + var30 = Login.Login_username; } - for(var25 = var25; var0.stringWidth(var25) > var49; var25 = var25.substring(1)) { - ; + for (var30 = var30; var0.stringWidth(var30) > var34; var30 = var30.substring(1)) { } - 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.loginBoxCenter - 108, var48, 16777215, 0); - var48 += 15; - var47 = 277; - var11 = Varps.loginBoxCenter + -117; - boolean var13 = Client.Login_isUsernameRemembered; - boolean var14 = Login.__cu_aa; - 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.loginBoxCenter + 24; - boolean var17 = ReflectionCheck.clientPreferences.hideUsername; - boolean var18 = Login.__cu_ax; - 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.loginBoxCenter - 80; - short var35 = 321; - titlebuttonSprite.drawAt(var19 - 73, var35 - 20); - var0.drawCentered("Login", var19, var35 + 5, 16777215, 0); - var19 = Varps.loginBoxCenter + 80; - titlebuttonSprite.drawAt(var19 - 73, var35 - 20); - var0.drawCentered("Cancel", var19, var35 + 5, 16777215, 0); - var47 = 357; - switch(Login.__cu_ac) { + var0.draw(AbstractFont.escapeBrackets(var30) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Varps.loginBoxCenter - 70, var10, 16777215, 0); + var10 += 15; + var29 = "Password: "; + var33 = Login.Login_password; + var31 = class168.method3450('*', var33.length()); + var0.draw(var29 + var31 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Varps.loginBoxCenter - 108, var10, 16777215, 0); + var10 += 15; + var32 = 277; + var4 = Varps.loginBoxCenter + -117; + boolean var40 = Client.Login_isUsernameRemembered; + var20 = Login.field468; + IndexedSprite var46 = var40 ? (var20 ? KeyHandler.options_buttons_6Sprite : class308.options_buttons_2Sprite) : (var20 ? GraphicsObject.options_buttons_4Sprite : Login.options_buttons_0Sprite); + var46.drawAt(var4, var32); + var4 = var4 + var46.subWidth + 5; + var1.draw("Remember username", var4, var32 + 13, 16776960, 0); + var4 = Varps.loginBoxCenter + 24; + boolean var44 = ReflectionCheck.clientPreferences.hideUsername; + boolean var48 = Login.field469; + IndexedSprite var49 = var44 ? (var48 ? KeyHandler.options_buttons_6Sprite : class308.options_buttons_2Sprite) : (var48 ? GraphicsObject.options_buttons_4Sprite : Login.options_buttons_0Sprite); + var49.drawAt(var4, var32); + var4 = var4 + var49.subWidth + 5; + var1.draw("Hide username", var4, var32 + 13, 16776960, 0); + var10 = var32 + 15; + var5 = Varps.loginBoxCenter - 80; + short var50 = 321; + titlebuttonSprite.drawAt(var5 - 73, var50 - 20); + var0.drawCentered("Login", var5, var50 + 5, 16777215, 0); + var5 = Varps.loginBoxCenter + 80; + titlebuttonSprite.drawAt(var5 - 73, var50 - 20); + var0.drawCentered("Cancel", var5, var50 + 5, 16777215, 0); + var32 = 357; + switch(Login.field467) { case 2: - AttackOption.__cj_ay = "Having trouble logging in?"; + AttackOption.field31 = "Having trouble logging in?"; break; default: - AttackOption.__cj_ay = "Can\'t login? Click here."; + AttackOption.field31 = "Can't login? Click here."; } - 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.loginBoxX + 180, var47, 16776960, 0); - var48 = var47 + 20; - 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.loginBoxX + 180, var48, 16776960, 0); - var48 += 15; - var24 = Login.loginBoxX + 180; - var5 = 276; - titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var2.drawCentered("Try again", var24, var5 + 5, 16777215, 0); - var24 = Login.loginBoxX + 180; - var5 = 326; - titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var2.drawCentered("Forgotten password?", var24, var5 + 5, 16777215, 0); + TilePaint.field907 = new Bounds(Varps.loginBoxCenter, var32, var1.stringWidth(AttackOption.field31), 11); + UrlRequester.field930 = new Bounds(Varps.loginBoxCenter, var32, var1.stringWidth("Still having trouble logging in?"), 11); + var1.drawCentered(AttackOption.field31, Varps.loginBoxCenter, var32, 16777215, 0); + } else if (Login.loginIndex == 3) { + var32 = 201; + var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var32, 16776960, 0); + var10 = var32 + 20; + var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var7 = Login.loginBoxX + 180; + var35 = 276; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var2.drawCentered("Try again", var7, var35 + 5, 16777215, 0); + var7 = Login.loginBoxX + 180; + var35 = 326; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var2.drawCentered("Forgotten password?", var7, var35 + 5, 16777215, 0); } else { - String var26; - if(Login.loginIndex == 4) { + String var36; + if (Login.loginIndex == 4) { var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); - var47 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16777215, 0); - var48 = var47 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16777215, 0); - var48 += 15; - 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.loginBoxX + 180 - 108, var48, 16777215, 0); - var48 -= 8; - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var48, 16776960, 0); - var48 += 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.options_buttons_2Sprite; + var32 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0); + var10 = var32 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16777215, 0); + var10 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16777215, 0); + var10 += 15; + var36 = "PIN: "; + var28 = Login.otp; + var30 = class168.method3450('*', var28.length()); + var0.draw(var36 + var30 + (Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var10, 16777215, 0); + var10 -= 8; + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var10, 16776960, 0); + var10 += 15; + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var10, 16776960, 0); + var9 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; + var3 = var10 - var0.ascent; + IndexedSprite var43; + if (Login.field470) { + var43 = class308.options_buttons_2Sprite; } else { - var52 = Login.options_buttons_0Sprite; + var43 = Login.options_buttons_0Sprite; } - var52.drawAt(var28, var9); - var48 += 15; - var11 = Login.loginBoxX + 180 - 80; - short var12 = 321; - titlebuttonSprite.drawAt(var11 - 73, var12 - 20); - var0.drawCentered("Continue", var11, var12 + 5, 16777215, 0); - 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.loginBoxX + 180, var12 + 36, 255, 0); + var43.drawAt(var9, var3); + var10 += 15; + var4 = Login.loginBoxX + 180 - 80; + short var45 = 321; + titlebuttonSprite.drawAt(var4 - 73, var45 - 20); + var0.drawCentered("Continue", var4, var45 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + titlebuttonSprite.drawAt(var4 - 73, var45 - 20); + var0.drawCentered("Cancel", var4, var45 + 5, 16777215, 0); + var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var45 + 36, 255, 0); } else { - short var50; - if(Login.loginIndex == 5) { + short var37; + if (Login.loginIndex != 5) { + if (Login.loginIndex == 6) { + var32 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); + var10 = var32 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var7 = Login.loginBoxX + 180; + var35 = 321; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawCentered("Back", var7, var35 + 5, 16777215, 0); + } else if (Login.loginIndex == 7) { + var32 = 216; + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var32, 16776960, 0); + var10 = var32 + 15; + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var7 = Login.loginBoxX + 180 - 80; + var35 = 321; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawCentered("Set Date of Birth", var7, var35 + 5, 16777215, 0); + var7 = Login.loginBoxX + 180 + 80; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawCentered("Back", var7, var35 + 5, 16777215, 0); + } else if (Login.loginIndex == 8) { + var32 = 216; + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var32, 16776960, 0); + var10 = var32 + 15; + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var7 = Login.loginBoxX + 180 - 80; + var35 = 321; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawCentered("Privacy Policy", var7, var35 + 5, 16777215, 0); + var7 = Login.loginBoxX + 180 + 80; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawCentered("Back", var7, var35 + 5, 16777215, 0); + } else if (Login.loginIndex == 12) { + var32 = 201; + String var41 = ""; + var36 = ""; + var30 = ""; + switch(Login.field466) { + case 0: + var41 = "Your account has been disabled."; + var36 = Strings.field880; + var30 = ""; + break; + case 1: + var41 = "Account locked as we suspect it has been stolen."; + var36 = Strings.field881; + var30 = ""; + break; + default: + MouseHandler.method1084(false); + } + + var0.drawCentered(var41, Login.loginBoxX + 180, var32, 16776960, 0); + var10 = var32 + 15; + var2.drawCentered(var36, Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var2.drawCentered(var30, Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var8 = Login.loginBoxX + 180; + var37 = 276; + titlebuttonSprite.drawAt(var8 - 73, var37 - 20); + var0.drawCentered("Support Page", var8, var37 + 5, 16777215, 0); + var8 = Login.loginBoxX + 180; + var37 = 326; + titlebuttonSprite.drawAt(var8 - 73, var37 - 20); + var0.drawCentered("Back", var8, var37 + 5, 16777215, 0); + } + } else { var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); - var47 = 221; - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16776960, 0); - var48 = var47 + 15; - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16776960, 0); - var48 += 15; - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16776960, 0); - var48 += 15; - var48 += 14; - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var48, 16777215, 0); - var49 = 174; - if(ReflectionCheck.clientPreferences.hideUsername) { - var8 = Login.Login_username; - var7 = class168.method3450('*', var8.length()); - var25 = var7; + var32 = 221; + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); + var10 = var32 + 15; + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var10 += 14; + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var10, 16777215, 0); + var34 = 174; + if (ReflectionCheck.clientPreferences.hideUsername) { + var29 = Login.Login_username; + var28 = class168.method3450('*', var29.length()); + var30 = var28; } else { - var25 = Login.Login_username; + var30 = Login.Login_username; } - for(var25 = var25; var0.stringWidth(var25) > var49; var25 = var25.substring(1)) { - ; + for (var30 = var30; var0.stringWidth(var30) > var34; var30 = var30.substring(1)) { } - var0.draw(AbstractFont.escapeBrackets(var25) + (Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Login.loginBoxX + 180 - 34, var48, 16777215, 0); - var48 += 15; - var27 = Login.loginBoxX + 180 - 80; - var50 = 321; - titlebuttonSprite.drawAt(var27 - 73, var50 - 20); - var0.drawCentered("Recover", var27, var50 + 5, 16777215, 0); - 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.loginBoxCenter, var50, 268435455, 0); - } else if(Login.loginIndex == 6) { - var47 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16776960, 0); - var48 = var47 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16776960, 0); - var48 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16776960, 0); - var48 += 15; - var24 = Login.loginBoxX + 180; - var5 = 321; - 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.loginBoxX + 180, var47, 16776960, 0); - var48 = var47 + 15; - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var48, 16776960, 0); - var48 += 15; - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var48, 16776960, 0); - var48 += 15; - var24 = Login.loginBoxX + 180 - 80; - var5 = 321; - titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Set Date of Birth", var24, var5 + 5, 16777215, 0); - 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.loginBoxX + 180, var47, 16776960, 0); - var48 = var47 + 15; - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var48, 16776960, 0); - var48 += 15; - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var48, 16776960, 0); - var48 += 15; - var24 = Login.loginBoxX + 180 - 80; - var5 = 321; - titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Privacy Policy", var24, var5 + 5, 16777215, 0); - 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; - String var4 = ""; - var26 = ""; - var25 = ""; - switch(Login.__cu_aj) { - case 0: - var4 = "Your account has been disabled."; - var26 = Strings.__id_bq; - var25 = ""; - break; - case 1: - var4 = "Account locked as we suspect it has been stolen."; - var26 = Strings.__id_cp; - var25 = ""; - break; - default: - MouseHandler.method1084(false); - } - - var0.drawCentered(var4, Login.loginBoxX + 180, var47, 16776960, 0); - var48 = var47 + 15; - var2.drawCentered(var26, Login.loginBoxX + 180, var48, 16776960, 0); - var48 += 15; - var2.drawCentered(var25, Login.loginBoxX + 180, var48, 16776960, 0); - var48 += 15; - var27 = Login.loginBoxX + 180; - var50 = 276; - titlebuttonSprite.drawAt(var27 - 73, var50 - 20); - var0.drawCentered("Support Page", var27, var50 + 5, 16777215, 0); - var27 = Login.loginBoxX + 180; - var50 = 326; - titlebuttonSprite.drawAt(var27 - 73, var50 - 20); - var0.drawCentered("Back", var27, var50 + 5, 16777215, 0); + var0.draw(AbstractFont.escapeBrackets(var30) + (Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var10, 16777215, 0); + var10 += 15; + var8 = Login.loginBoxX + 180 - 80; + var37 = 321; + titlebuttonSprite.drawAt(var8 - 73, var37 - 20); + var0.drawCentered("Recover", var8, var37 + 5, 16777215, 0); + var8 = Login.loginBoxX + 180 + 80; + titlebuttonSprite.drawAt(var8 - 73, var37 - 20); + var0.drawCentered("Back", var8, var37 + 5, 16777215, 0); + var37 = 356; + var1.drawCentered("Still having trouble logging in?", Varps.loginBoxCenter, var37, 268435455, 0); } } } } - if(Client.gameState >= 10) { - int[] var3 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var3); + if (Client.gameState >= 10) { + int[] var38 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var38); 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); + Rasterizer2D.Rasterizer2D_setClipArray(var38); } - 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.xPadding + 5; - var49 = 463; - byte var38 = 100; - byte var6 = 35; - 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); + KeyHandler.title_muteSprite[ReflectionCheck.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); + if (Client.gameState > 5 && Client.language == 0) { + if (class277.field1144 != null) { + var10 = Login.xPadding + 5; + var34 = 463; + byte var39 = 100; + byte var42 = 35; + class277.field1144.drawAt(var10, var34); + var0.drawCentered("World " + Client.worldId, var39 / 2 + var10, var42 / 2 + var34 - 2, 16777215, 0); + if (FriendLoginUpdate.field356 != null) { + var1.drawCentered("Loading...", var39 / 2 + var10, var42 / 2 + var34 + 12, 16777215, 0); } else { - var1.drawCentered("Click to switch", var38 / 2 + var48, var6 / 2 + var49 + 12, 16777215, 0); + var1.drawCentered("Click to switch", var39 / 2 + var10, var42 / 2 + var34 + 12, 16777215, 0); } } else { - class277.__jn_by = MenuAction.loadIndexedSpriteByName(WorldMapSection3.indexCache8, "sl_button", ""); + class277.field1144 = 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 c17efeb20a..673372a309 100644 --- a/runescape-client/src/main/java/IndexStore.java +++ b/runescape-client/src/main/java/IndexStore.java @@ -37,10 +37,6 @@ public final class IndexStore { @Export("maxEntrySize") int maxEntrySize; - static { - IndexStore_buffer = new byte[520]; - } - @ObfuscatedSignature( signature = "(ILdy;Ldy;I)V" ) @@ -63,70 +59,80 @@ public final class IndexStore { public byte[] read(int var1) { BufferedFile var2 = this.dataFile; synchronized(this.dataFile) { + byte[] var10000; try { - Object var10000; - if(this.indexFile.length() < (long)(var1 * 6 + 6)) { - var10000 = null; - return (byte[])var10000; - } else { - this.indexFile.seek((long)(var1 * 6)); - this.indexFile.read(IndexStore_buffer, 0, 6); - int var3 = ((IndexStore_buffer[0] & 255) << 16) + (IndexStore_buffer[2] & 255) + ((IndexStore_buffer[1] & 255) << 8); - int var4 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8); - if(var3 < 0 || var3 > this.maxEntrySize) { - var10000 = null; - return (byte[])var10000; - } else if(var4 <= 0 || (long)var4 > this.dataFile.length() / 520L) { - var10000 = null; - return (byte[])var10000; - } else { - byte[] var5 = new byte[var3]; - int var6 = 0; - int var7 = 0; + Object var4; + if (this.indexFile.length() < (long)(var1 * 6 + 6)) { + var4 = null; + var10000 = (byte[])((byte[])var4); + return var10000; + } - while(var6 < var3) { - if(var4 == 0) { - var10000 = null; - return (byte[])var10000; - } + this.indexFile.seek((long)(var1 * 6)); + this.indexFile.read(IndexStore_buffer, 0, 6); + int var5 = ((IndexStore_buffer[0] & 255) << 16) + (IndexStore_buffer[2] & 255) + ((IndexStore_buffer[1] & 255) << 8); + int var6 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8); + if (var5 < 0 || var5 > this.maxEntrySize) { + var4 = null; + var10000 = (byte[])((byte[])var4); + return var10000; + } - this.dataFile.seek((long)(var4 * 520)); - int var8 = var3 - var6; - if(var8 > 512) { - var8 = 512; - } + if (var6 > 0 && (long)var6 <= this.dataFile.length() / 520L) { + byte[] var7 = new byte[var5]; + int var8 = 0; + int var9 = 0; - this.dataFile.read(IndexStore_buffer, 0, var8 + 8); - int var9 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8); - int var10 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8); - int var11 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255); - int var12 = IndexStore_buffer[7] & 255; - if(var9 == var1 && var7 == var10 && var12 == this.index) { - if(var11 >= 0 && (long)var11 <= this.dataFile.length() / 520L) { - for(int var13 = 0; var13 < var8; ++var13) { - var5[var6++] = IndexStore_buffer[var13 + 8]; - } - - var4 = var11; - ++var7; - continue; - } - - var10000 = null; - return (byte[])var10000; - } - - var10000 = null; - return (byte[])var10000; + while (var8 < var5) { + if (var6 == 0) { + var4 = null; + var10000 = (byte[])((byte[])var4); + return var10000; } - byte[] var18 = var5; - return var18; + this.dataFile.seek((long)(var6 * 520)); + int var10 = var5 - var8; + if (var10 > 512) { + var10 = 512; + } + + this.dataFile.read(IndexStore_buffer, 0, var10 + 8); + int var11 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8); + int var12 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8); + int var13 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255); + int var14 = IndexStore_buffer[7] & 255; + if (var11 == var1 && var9 == var12 && var14 == this.index) { + if (var13 >= 0 && (long)var13 <= this.dataFile.length() / 520L) { + for (int var15 = 0; var15 < var10; ++var15) { + var7[var8++] = IndexStore_buffer[var15 + 8]; + } + + var6 = var13; + ++var9; + continue; + } + + var4 = null; + var10000 = (byte[])((byte[])var4); + return var10000; + } + + var4 = null; + var10000 = (byte[])((byte[])var4); + return var10000; } + + var10000 = var7; + return var10000; } - } catch (IOException var16) { + + var4 = null; + var10000 = (byte[])((byte[])var4); + } catch (IOException var17) { return null; } + + return var10000; } } @@ -139,13 +145,13 @@ public final class IndexStore { public boolean write(int var1, byte[] var2, int var3) { BufferedFile var4 = this.dataFile; synchronized(this.dataFile) { - if(var3 >= 0 && var3 <= this.maxEntrySize) { - boolean var5 = this.write0(var1, var2, var3, true); - if(!var5) { - var5 = this.write0(var1, var2, var3, false); + if (var3 >= 0 && var3 <= this.maxEntrySize) { + boolean var6 = this.write0(var1, var2, var3, true); + if (!var6) { + var6 = this.write0(var1, var2, var3, false); } - return var5; + return var6; } else { throw new IllegalArgumentException(); } @@ -162,108 +168,114 @@ public final class IndexStore { BufferedFile var5 = this.dataFile; synchronized(this.dataFile) { try { - int var6; + int var7; + boolean var8; boolean var10000; - if(var4) { - if(this.indexFile.length() < (long)(var1 * 6 + 6)) { - var10000 = false; + if (var4) { + if (this.indexFile.length() < (long)(var1 * 6 + 6)) { + var8 = false; + var10000 = var8; return var10000; } this.indexFile.seek((long)(var1 * 6)); this.indexFile.read(IndexStore_buffer, 0, 6); - var6 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8); - if(var6 <= 0 || (long)var6 > this.dataFile.length() / 520L) { - var10000 = false; + var7 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8); + if (var7 <= 0 || (long)var7 > this.dataFile.length() / 520L) { + var8 = false; + var10000 = var8; return var10000; } } else { - var6 = (int)((this.dataFile.length() + 519L) / 520L); - if(var6 == 0) { - var6 = 1; + var7 = (int)((this.dataFile.length() + 519L) / 520L); + if (var7 == 0) { + var7 = 1; } } IndexStore_buffer[0] = (byte)(var3 >> 16); IndexStore_buffer[1] = (byte)(var3 >> 8); IndexStore_buffer[2] = (byte)var3; - IndexStore_buffer[3] = (byte)(var6 >> 16); - IndexStore_buffer[4] = (byte)(var6 >> 8); - IndexStore_buffer[5] = (byte)var6; + IndexStore_buffer[3] = (byte)(var7 >> 16); + IndexStore_buffer[4] = (byte)(var7 >> 8); + IndexStore_buffer[5] = (byte)var7; this.indexFile.seek((long)(var1 * 6)); this.indexFile.write(IndexStore_buffer, 0, 6); - int var7 = 0; - int var8 = 0; + int var9 = 0; + int var10 = 0; - while(true) { - if(var7 < var3) { - label142: { - int var9 = 0; - int var14; - if(var4) { - this.dataFile.seek((long)(var6 * 520)); + while (true) { + if (var9 < var3) { + label129: { + int var11 = 0; + int var12; + if (var4) { + this.dataFile.seek((long)(var7 * 520)); try { this.dataFile.read(IndexStore_buffer, 0, 8); } catch (EOFException var16) { - break label142; + break label129; } - var14 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8); - int var11 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8); - var9 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255); - int var12 = IndexStore_buffer[7] & 255; - if(var14 != var1 || var11 != var8 || var12 != this.index) { - var10000 = false; + var12 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8); + int var13 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8); + var11 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255); + int var14 = IndexStore_buffer[7] & 255; + if (var12 != var1 || var13 != var10 || var14 != this.index) { + var8 = false; + var10000 = var8; return var10000; } - if(var9 < 0 || (long)var9 > this.dataFile.length() / 520L) { - var10000 = false; + if (var11 < 0 || (long)var11 > this.dataFile.length() / 520L) { + var8 = false; + var10000 = var8; return var10000; } } - if(var9 == 0) { + if (var11 == 0) { var4 = false; - var9 = (int)((this.dataFile.length() + 519L) / 520L); - if(var9 == 0) { - ++var9; + var11 = (int)((this.dataFile.length() + 519L) / 520L); + if (var11 == 0) { + ++var11; } - if(var6 == var9) { - ++var9; + if (var7 == var11) { + ++var11; } } - if(var3 - var7 <= 512) { - var9 = 0; + if (var3 - var9 <= 512) { + var11 = 0; } IndexStore_buffer[0] = (byte)(var1 >> 8); IndexStore_buffer[1] = (byte)var1; - IndexStore_buffer[2] = (byte)(var8 >> 8); - IndexStore_buffer[3] = (byte)var8; - IndexStore_buffer[4] = (byte)(var9 >> 16); - IndexStore_buffer[5] = (byte)(var9 >> 8); - IndexStore_buffer[6] = (byte)var9; + IndexStore_buffer[2] = (byte)(var10 >> 8); + IndexStore_buffer[3] = (byte)var10; + IndexStore_buffer[4] = (byte)(var11 >> 16); + IndexStore_buffer[5] = (byte)(var11 >> 8); + IndexStore_buffer[6] = (byte)var11; IndexStore_buffer[7] = (byte)this.index; - this.dataFile.seek((long)(var6 * 520)); + this.dataFile.seek((long)(var7 * 520)); this.dataFile.write(IndexStore_buffer, 0, 8); - var14 = var3 - var7; - if(var14 > 512) { - var14 = 512; + var12 = var3 - var9; + if (var12 > 512) { + var12 = 512; } - this.dataFile.write(var2, var7, var14); - var7 += var14; - var6 = var9; - ++var8; + this.dataFile.write(var2, var9, var12); + var9 += var12; + var7 = var11; + ++var10; continue; } } - var10000 = true; + var8 = true; + var10000 = var8; return var10000; } } catch (IOException var17) { @@ -289,200 +301,195 @@ public final class IndexStore { byte var11 = 0; int var12 = 0; class178.bufferX[var11] = var0; - int var20 = var11 + 1; + int var13 = var11 + 1; class178.bufferY[var11] = var1; - int[][] var13 = var4.flags; + int[][] var14 = var4.flags; - while(true) { - label300: - while(true) { - int var14; - int var15; - int var16; - int var17; - int var18; - int var19; - do { - do { - do { - label277: - do { - if(var20 == var12) { - WidgetGroupParent.__bx_o = var5; - UrlRequester.__eo_u = var6; - return false; - } + label204: + while (var13 != var12) { + var5 = class178.bufferX[var12]; + var6 = class178.bufferY[var12]; + var12 = var12 + 1 & 4095; + int var19 = var5 - var9; + int var20 = var6 - var10; + int var15 = var5 - var4.xInset; + int var16 = var6 - var4.yInset; + if (var3.vmethod3644(var2, var5, var6, var4)) { + WidgetGroupParent.field986 = var5; + UrlRequester.field929 = var6; + return true; + } - var5 = class178.bufferX[var12]; - var6 = class178.bufferY[var12]; - var12 = var12 + 1 & 4095; - var18 = var5 - var9; - var19 = var6 - var10; - var14 = var5 - var4.xInset; - var15 = var6 - var4.yInset; - if(var3.vmethod3644(var2, var5, var6, var4)) { - WidgetGroupParent.__bx_o = var5; - UrlRequester.__eo_u = var6; - return true; - } + int var17 = class178.distances[var19][var20] + 1; + int var18; + if (var19 > 0 && class178.directions[var19 - 1][var20] == 0 && (var14[var15 - 1][var16] & 19136782) == 0 && (var14[var15 - 1][var16 + var2 - 1] & 19136824) == 0) { + var18 = 1; - 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 (var18 >= var2 - 1) { + class178.bufferX[var13] = var5 - 1; + class178.bufferY[var13] = var6; + var13 = var13 + 1 & 4095; + class178.directions[var19 - 1][var20] = 2; + class178.distances[var19 - 1][var20] = var17; + break; + } - while(true) { - if(var17 >= var2 - 1) { - class178.bufferX[var20] = var5 - 1; - class178.bufferY[var20] = var6; - var20 = var20 + 1 & 4095; - class178.directions[var18 - 1][var19] = 2; - class178.distances[var18 - 1][var19] = var16; - break; - } + if ((var14[var15 - 1][var18 + var16] & 19136830) != 0) { + break; + } - if((var13[var14 - 1][var17 + var15] & 19136830) != 0) { - break; - } + ++var18; + } + } - ++var17; - } - } + if (var19 < 128 - var2 && class178.directions[var19 + 1][var20] == 0 && (var14[var15 + var2][var16] & 19136899) == 0 && (var14[var15 + var2][var16 + var2 - 1] & 19136992) == 0) { + var18 = 1; - 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 (var18 >= var2 - 1) { + class178.bufferX[var13] = var5 + 1; + class178.bufferY[var13] = var6; + var13 = var13 + 1 & 4095; + class178.directions[var19 + 1][var20] = 8; + class178.distances[var19 + 1][var20] = var17; + break; + } - while(true) { - if(var17 >= var2 - 1) { - class178.bufferX[var20] = var5 + 1; - class178.bufferY[var20] = var6; - var20 = var20 + 1 & 4095; - class178.directions[var18 + 1][var19] = 8; - class178.distances[var18 + 1][var19] = var16; - break; - } + if ((var14[var15 + var2][var16 + var18] & 19136995) != 0) { + break; + } - if((var13[var14 + var2][var15 + var17] & 19136995) != 0) { - break; - } + ++var18; + } + } - ++var17; - } - } + if (var20 > 0 && class178.directions[var19][var20 - 1] == 0 && (var14[var15][var16 - 1] & 19136782) == 0 && (var14[var15 + var2 - 1][var16 - 1] & 19136899) == 0) { + var18 = 1; - 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 (var18 >= var2 - 1) { + class178.bufferX[var13] = var5; + class178.bufferY[var13] = var6 - 1; + var13 = var13 + 1 & 4095; + class178.directions[var19][var20 - 1] = 1; + class178.distances[var19][var20 - 1] = var17; + break; + } - while(true) { - if(var17 >= var2 - 1) { - class178.bufferX[var20] = var5; - class178.bufferY[var20] = var6 - 1; - var20 = var20 + 1 & 4095; - class178.directions[var18][var19 - 1] = 1; - class178.distances[var18][var19 - 1] = var16; - break; - } + if ((var14[var18 + var15][var16 - 1] & 19136911) != 0) { + break; + } - if((var13[var17 + var14][var15 - 1] & 19136911) != 0) { - break; - } + ++var18; + } + } - ++var17; - } - } + if (var20 < 128 - var2 && class178.directions[var19][var20 + 1] == 0 && (var14[var15][var16 + var2] & 19136824) == 0 && (var14[var15 + var2 - 1][var16 + var2] & 19136992) == 0) { + var18 = 1; - 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 (var18 >= var2 - 1) { + class178.bufferX[var13] = var5; + class178.bufferY[var13] = var6 + 1; + var13 = var13 + 1 & 4095; + class178.directions[var19][var20 + 1] = 4; + class178.distances[var19][var20 + 1] = var17; + break; + } - while(true) { - if(var17 >= var2 - 1) { - class178.bufferX[var20] = var5; - class178.bufferY[var20] = var6 + 1; - var20 = var20 + 1 & 4095; - class178.directions[var18][var19 + 1] = 4; - class178.distances[var18][var19 + 1] = var16; - break; - } + if ((var14[var18 + var15][var16 + var2] & 19137016) != 0) { + break; + } - if((var13[var17 + var14][var15 + var2] & 19137016) != 0) { - break; - } + ++var18; + } + } - ++var17; - } - } + if (var19 > 0 && var20 > 0 && class178.directions[var19 - 1][var20 - 1] == 0 && (var14[var15 - 1][var16 - 1] & 19136782) == 0) { + var18 = 1; - if(var18 > 0 && var19 > 0 && class178.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { - var17 = 1; + while (true) { + if (var18 >= var2) { + class178.bufferX[var13] = var5 - 1; + class178.bufferY[var13] = var6 - 1; + var13 = var13 + 1 & 4095; + class178.directions[var19 - 1][var20 - 1] = 3; + class178.distances[var19 - 1][var20 - 1] = var17; + break; + } - while(true) { - if(var17 >= var2) { - class178.bufferX[var20] = var5 - 1; - class178.bufferY[var20] = var6 - 1; - var20 = var20 + 1 & 4095; - class178.directions[var18 - 1][var19 - 1] = 3; - class178.distances[var18 - 1][var19 - 1] = var16; - break; - } + if ((var14[var15 - 1][var18 + (var16 - 1)] & 19136830) != 0 || (var14[var18 + (var15 - 1)][var16 - 1] & 19136911) != 0) { + break; + } - if((var13[var14 - 1][var17 + (var15 - 1)] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 - 1] & 19136911) != 0) { - break; - } + ++var18; + } + } - ++var17; - } - } + if (var19 < 128 - var2 && var20 > 0 && class178.directions[var19 + 1][var20 - 1] == 0 && (var14[var15 + var2][var16 - 1] & 19136899) == 0) { + var18 = 1; - 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 (var18 >= var2) { + class178.bufferX[var13] = var5 + 1; + class178.bufferY[var13] = var6 - 1; + var13 = var13 + 1 & 4095; + class178.directions[var19 + 1][var20 - 1] = 9; + class178.distances[var19 + 1][var20 - 1] = var17; + break; + } - while(true) { - if(var17 >= var2) { - class178.bufferX[var20] = var5 + 1; - class178.bufferY[var20] = var6 - 1; - var20 = var20 + 1 & 4095; - class178.directions[var18 + 1][var19 - 1] = 9; - class178.distances[var18 + 1][var19 - 1] = var16; - break; - } + if ((var14[var15 + var2][var18 + (var16 - 1)] & 19136995) != 0 || (var14[var18 + var15][var16 - 1] & 19136911) != 0) { + break; + } - if((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var17 + var14][var15 - 1] & 19136911) != 0) { - break; - } + ++var18; + } + } - ++var17; - } - } + if (var19 > 0 && var20 < 128 - var2 && class178.directions[var19 - 1][var20 + 1] == 0 && (var14[var15 - 1][var16 + var2] & 19136824) == 0) { + var18 = 1; - 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; - } - } + while (true) { + if (var18 >= var2) { + class178.bufferX[var13] = var5 - 1; + class178.bufferY[var13] = var6 + 1; + var13 = var13 + 1 & 4095; + class178.directions[var19 - 1][var20 + 1] = 6; + class178.distances[var19 - 1][var20 + 1] = var17; + break; + } - class178.bufferX[var20] = var5 - 1; - class178.bufferY[var20] = var6 + 1; - var20 = var20 + 1 & 4095; - class178.directions[var18 - 1][var19 + 1] = 6; - class178.distances[var18 - 1][var19 + 1] = var16; - } - } while(var18 >= 128 - var2); - } while(var19 >= 128 - var2); - } while(class178.directions[var18 + 1][var19 + 1] != 0); - } while((var13[var14 + var2][var15 + var2] & 19136992) != 0); + if ((var14[var15 - 1][var16 + var18] & 19136830) != 0 || (var14[var18 + (var15 - 1)][var16 + var2] & 19137016) != 0) { + break; + } - for(var17 = 1; var17 < var2; ++var17) { - if((var13[var14 + var17][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var17 + var15] & 19136995) != 0) { - continue label300; + ++var18; + } + } + + if (var19 < 128 - var2 && var20 < 128 - var2 && class178.directions[var19 + 1][var20 + 1] == 0 && (var14[var15 + var2][var16 + var2] & 19136992) == 0) { + for (var18 = 1; var18 < var2; ++var18) { + if ((var14[var15 + var18][var16 + var2] & 19137016) != 0 || (var14[var15 + var2][var18 + var16] & 19136995) != 0) { + continue label204; } } - class178.bufferX[var20] = var5 + 1; - class178.bufferY[var20] = var6 + 1; - var20 = var20 + 1 & 4095; - class178.directions[var18 + 1][var19 + 1] = 12; - class178.distances[var18 + 1][var19 + 1] = var16; + class178.bufferX[var13] = var5 + 1; + class178.bufferY[var13] = var6 + 1; + var13 = var13 + 1 & 4095; + class178.directions[var19 + 1][var20 + 1] = 12; + class178.distances[var19 + 1][var20 + 1] = var17; } } + + WidgetGroupParent.field986 = var5; + UrlRequester.field929 = var6; + return false; + } + + static { + IndexStore_buffer = new byte[520]; } } diff --git a/runescape-client/src/main/java/IndexStoreAction.java b/runescape-client/src/main/java/IndexStoreAction.java index 99aa4acd1b..c8b7bdd8da 100644 --- a/runescape-client/src/main/java/IndexStoreAction.java +++ b/runescape-client/src/main/java/IndexStoreAction.java @@ -11,7 +11,7 @@ public class IndexStoreAction extends Node { @ObfuscatedGetter( intValue = -1086790653 ) - static int __ik_rt; + static int field410; @ObfuscatedName("a") @ObfuscatedSignature( signature = "[Ldy;" @@ -22,7 +22,7 @@ public class IndexStoreAction extends Node { @ObfuscatedGetter( intValue = -1753937079 ) - public static int __ik_cn; + public static int field411; @ObfuscatedName("m") @ObfuscatedGetter( intValue = -1942326733 @@ -51,66 +51,66 @@ public class IndexStoreAction extends Node { garbageValue = "483387730" ) static final void method4553(Actor var0) { - if(var0.__cj != 0) { - if(var0.targetIndex != -1) { + if (var0.field23 != 0) { + if (var0.targetIndex != -1) { Object var1 = null; - if(var0.targetIndex < 32768) { + if (var0.targetIndex < 32768) { var1 = Client.npcs[var0.targetIndex]; - } else if(var0.targetIndex >= 32768) { + } else if (var0.targetIndex >= 32768) { var1 = Client.players[var0.targetIndex - 32768]; } - if(var1 != null) { + if (var1 != null) { int var2 = var0.x - ((Actor)var1).x; int var3 = var0.y - ((Actor)var1).y; - if(var2 != 0 || var3 != 0) { + if (var2 != 0 || var3 != 0) { var0.orientation = (int)(Math.atan2((double)var2, (double)var3) * 325.949D) & 2047; } - } else if(var0.false0) { + } else if (var0.false0) { var0.targetIndex = -1; var0.false0 = false; } } - if(var0.__bc != -1 && (var0.pathLength == 0 || var0.__cq > 0)) { - var0.orientation = var0.__bc; - var0.__bc = -1; + if (var0.field12 != -1 && (var0.pathLength == 0 || var0.field24 > 0)) { + var0.orientation = var0.field12; + var0.field12 = -1; } - int var4 = var0.orientation - var0.__ac & 2047; - if(var4 == 0 && var0.false0) { + int var4 = var0.orientation - var0.field9 & 2047; + if (var4 == 0 && var0.false0) { var0.targetIndex = -1; var0.false0 = false; } - if(var4 != 0) { - ++var0.__cm; - boolean var6; - if(var4 > 1024) { - var0.__ac -= var0.__cj; - var6 = true; - if(var4 < var0.__cj || var4 > 2048 - var0.__cj) { - var0.__ac = var0.orientation; - var6 = false; + if (var4 != 0) { + ++var0.field22; + boolean var5; + if (var4 > 1024) { + var0.field9 -= var0.field23; + var5 = true; + if (var4 < var0.field23 || var4 > 2048 - var0.field23) { + var0.field9 = var0.orientation; + var5 = false; } - if(var0.movementSequence == var0.idleSequence && (var0.__cm > 25 || var6)) { - if(var0.turnLeftSequence != -1) { + if (var0.movementSequence == var0.idleSequence && (var0.field22 > 25 || var5)) { + if (var0.turnLeftSequence != -1) { var0.movementSequence = var0.turnLeftSequence; } else { var0.movementSequence = var0.walkSequence; } } } else { - var0.__ac += var0.__cj; - var6 = true; - if(var4 < var0.__cj || var4 > 2048 - var0.__cj) { - var0.__ac = var0.orientation; - var6 = false; + var0.field9 += var0.field23; + var5 = true; + if (var4 < var0.field23 || var4 > 2048 - var0.field23) { + var0.field9 = var0.orientation; + var5 = false; } - if(var0.movementSequence == var0.idleSequence && (var0.__cm > 25 || var6)) { - if(var0.turnRightSequence != -1) { + if (var0.movementSequence == var0.idleSequence && (var0.field22 > 25 || var5)) { + if (var0.turnRightSequence != -1) { var0.movementSequence = var0.turnRightSequence; } else { var0.movementSequence = var0.walkSequence; @@ -118,11 +118,11 @@ public class IndexStoreAction extends Node { } } - var0.__ac &= 2047; + var0.field9 &= 2047; } else { - var0.__cm = 0; + var0.field22 = 0; } - } + } } diff --git a/runescape-client/src/main/java/IndexStoreActionHandler.java b/runescape-client/src/main/java/IndexStoreActionHandler.java index 5d0c97e34c..608fb79d1e 100644 --- a/runescape-client/src/main/java/IndexStoreActionHandler.java +++ b/runescape-client/src/main/java/IndexStoreActionHandler.java @@ -23,71 +23,64 @@ public class IndexStoreActionHandler implements Runnable { @ObfuscatedGetter( intValue = -1282224505 ) - static int __iv_q; + static int field412; @ObfuscatedName("w") @Export("IndexStoreActionHandler_lock") static Object IndexStoreActionHandler_lock; - static { - IndexStoreActionHandler_requestQueue = new NodeDeque(); - IndexStoreActionHandler_responseQueue = new NodeDeque(); - __iv_q = 0; - IndexStoreActionHandler_lock = new Object(); - } - @Export("run") @ObfuscatedName("run") public void run() { try { - while(true) { - NodeDeque var2 = IndexStoreActionHandler_requestQueue; - IndexStoreAction var1; + while (true) { + NodeDeque var1 = IndexStoreActionHandler_requestQueue; + IndexStoreAction var2; synchronized(IndexStoreActionHandler_requestQueue) { - var1 = (IndexStoreAction)IndexStoreActionHandler_requestQueue.last(); + var2 = (IndexStoreAction)IndexStoreActionHandler_requestQueue.last(); } - Object var14; - if(var1 != null) { - if(var1.type == 0) { - var1.indexStore.write((int)var1.key, var1.data, var1.data.length); - var2 = IndexStoreActionHandler_requestQueue; + Object var3; + if (var2 != null) { + if (var2.type == 0) { + var2.indexStore.write((int)var2.key, var2.data, var2.data.length); + var1 = IndexStoreActionHandler_requestQueue; synchronized(IndexStoreActionHandler_requestQueue) { - var1.remove(); + var2.remove(); } - } else if(var1.type == 1) { - var1.data = var1.indexStore.read((int)var1.key); - var2 = IndexStoreActionHandler_requestQueue; + } else if (var2.type == 1) { + var2.data = var2.indexStore.read((int)var2.key); + var1 = IndexStoreActionHandler_requestQueue; synchronized(IndexStoreActionHandler_requestQueue) { - IndexStoreActionHandler_responseQueue.addFirst(var1); + IndexStoreActionHandler_responseQueue.addFirst(var2); } } - var14 = IndexStoreActionHandler_lock; + var3 = IndexStoreActionHandler_lock; synchronized(IndexStoreActionHandler_lock) { - if(__iv_q <= 1) { - __iv_q = 0; + if (field412 <= 1) { + field412 = 0; IndexStoreActionHandler_lock.notifyAll(); return; } - __iv_q = 600; + field412 = 600; } } else { class203.method4010(100L); - var14 = IndexStoreActionHandler_lock; + var3 = IndexStoreActionHandler_lock; synchronized(IndexStoreActionHandler_lock) { - if(__iv_q <= 1) { - __iv_q = 0; + if (field412 <= 1) { + field412 = 0; IndexStoreActionHandler_lock.notifyAll(); return; } - --__iv_q; + --field412; } } } - } catch (Exception var13) { - NpcDefinition.sendStackTrace((String)null, var13); + } catch (Exception var14) { + NPCDefinition.sendStackTrace((String)null, var14); } } @@ -97,11 +90,19 @@ public class IndexStoreActionHandler implements Runnable { garbageValue = "67" ) static final void method4655(String var0) { - if(PacketWriter.clanChat != null) { - PacketBufferNode var1 = Interpreter.method1915(ClientPacket.__gs_i, Client.packetWriter.isaacCipher); + if (PacketWriter.clanChat != null) { + PacketBufferNode var1 = Interpreter.method1915(ClientPacket.field235, Client.packetWriter.isaacCipher); var1.packetBuffer.writeByte(WorldMapRegion.method550(var0)); var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.__q_167(var1); + Client.packetWriter.method241(var1); } + + } + + static { + IndexStoreActionHandler_requestQueue = new NodeDeque(); + IndexStoreActionHandler_responseQueue = new NodeDeque(); + field412 = 0; + IndexStoreActionHandler_lock = new Object(); } } diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java index 9a0e481697..85002bdf4e 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -33,12 +33,12 @@ public final class IndexedSprite extends Rasterizer2D { @ObfuscatedName("m") @Export("normalize") public void normalize() { - if(this.subWidth != this.width || this.subHeight != this.height) { + if (this.subWidth != this.width || this.subHeight != this.height) { byte[] var1 = new byte[this.width * this.height]; int var2 = 0; - for(int var3 = 0; var3 < this.subHeight; ++var3) { - for(int var4 = 0; var4 < this.subWidth; ++var4) { + for (int var3 = 0; var3 < this.subHeight; ++var3) { + for (int var4 = 0; var4 < this.subWidth; ++var4) { var1[var4 + (var3 + this.yOffset) * this.width + this.xOffset] = this.pixels[var2++]; } } @@ -49,33 +49,34 @@ public final class IndexedSprite extends Rasterizer2D { this.xOffset = 0; this.yOffset = 0; } + } @ObfuscatedName("f") @Export("shiftColors") public void shiftColors(int var1, int var2, int var3) { - for(int var4 = 0; var4 < this.palette.length; ++var4) { + for (int var4 = 0; var4 < this.palette.length; ++var4) { int var5 = this.palette[var4] >> 16 & 255; var5 += var1; - if(var5 < 0) { + if (var5 < 0) { var5 = 0; - } else if(var5 > 255) { + } else if (var5 > 255) { var5 = 255; } int var6 = this.palette[var4] >> 8 & 255; var6 += var2; - if(var6 < 0) { + if (var6 < 0) { var6 = 0; - } else if(var6 > 255) { + } else if (var6 > 255) { var6 = 255; } int var7 = this.palette[var4] & 255; var7 += var3; - if(var7 < 0) { + if (var7 < 0) { var7 = 0; - } else if(var7 > 255) { + } else if (var7 > 255) { var7 = 255; } @@ -86,52 +87,53 @@ public final class IndexedSprite extends Rasterizer2D { @ObfuscatedName("q") @Export("drawAt") - public void drawAt(int x, int y) { - x += this.xOffset; - y += this.yOffset; - int var3 = x + y * Rasterizer2D.Rasterizer2D_width; + public void drawAt(int var1, int var2) { + var1 += this.xOffset; + var2 += this.yOffset; + int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; int var4 = 0; int var5 = this.subHeight; int var6 = this.subWidth; int var7 = Rasterizer2D.Rasterizer2D_width - var6; int var8 = 0; int var9; - if(y < Rasterizer2D.Rasterizer2D_yClipStart) { - var9 = Rasterizer2D.Rasterizer2D_yClipStart - y; + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; var5 -= var9; - y = Rasterizer2D.Rasterizer2D_yClipStart; + var2 = Rasterizer2D.Rasterizer2D_yClipStart; var4 += var9 * var6; var3 += var9 * Rasterizer2D.Rasterizer2D_width; } - if(var5 + y > Rasterizer2D.Rasterizer2D_yClipEnd) { - var5 -= var5 + y - Rasterizer2D.Rasterizer2D_yClipEnd; + if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { + var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if(x < Rasterizer2D.Rasterizer2D_xClipStart) { - var9 = Rasterizer2D.Rasterizer2D_xClipStart - x; + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; var6 -= var9; - x = Rasterizer2D.Rasterizer2D_xClipStart; + var1 = Rasterizer2D.Rasterizer2D_xClipStart; var4 += var9; var3 += var9; var8 += var9; var7 += var9; } - if(var6 + x > Rasterizer2D.Rasterizer2D_xClipEnd) { - var9 = var6 + x - Rasterizer2D.Rasterizer2D_xClipEnd; + if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; var6 -= var9; var8 += var9; var7 += var9; } - if(var6 > 0 && var5 > 0) { + if (var6 > 0 && var5 > 0) { IndexedSprite_two(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var4, var3, var6, var5, var7, var8); } + } @ObfuscatedName("o") - public void __o_497(int var1, int var2, int var3, int var4) { + public void method135(int var1, int var2, int var3, int var4) { int var5 = this.subWidth; int var6 = this.subHeight; int var7 = 0; @@ -141,47 +143,47 @@ public final class IndexedSprite extends Rasterizer2D { int var11 = (var9 << 16) / var3; int var12 = (var10 << 16) / var4; int var13; - if(this.xOffset > 0) { + if (this.xOffset > 0) { var13 = (var11 + (this.xOffset << 16) - 1) / var11; var1 += var13; var7 += var13 * var11 - (this.xOffset << 16); } - if(this.yOffset > 0) { + if (this.yOffset > 0) { var13 = (var12 + (this.yOffset << 16) - 1) / var12; var2 += var13; var8 += var13 * var12 - (this.yOffset << 16); } - if(var5 < var9) { + if (var5 < var9) { var3 = (var11 + ((var5 << 16) - var7) - 1) / var11; } - if(var6 < var10) { + if (var6 < var10) { var4 = (var12 + ((var6 << 16) - var8) - 1) / var12; } var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; int var14 = Rasterizer2D.Rasterizer2D_width - var3; - if(var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } int var15; - if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { var15 = Rasterizer2D.Rasterizer2D_yClipStart - var2; var4 -= var15; var13 += var15 * Rasterizer2D.Rasterizer2D_width; var8 += var12 * var15; } - if(var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; var3 -= var15; var14 += var15; } - if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1; var3 -= var15; var13 += var15; @@ -198,42 +200,42 @@ public final class IndexedSprite extends Rasterizer2D { int var9 = -(var5 >> 2); var5 = -(var5 & 3); - for(int var10 = -var6; var10 < 0; ++var10) { + for (int var10 = -var6; var10 < 0; ++var10) { int var11; byte var12; - for(var11 = var9; var11 < 0; ++var11) { + for (var11 = var9; var11 < 0; ++var11) { var12 = var1[var3++]; - if(var12 != 0) { + if (var12 != 0) { var0[var4++] = var2[var12 & 255]; } else { ++var4; } var12 = var1[var3++]; - if(var12 != 0) { + if (var12 != 0) { var0[var4++] = var2[var12 & 255]; } else { ++var4; } var12 = var1[var3++]; - if(var12 != 0) { + if (var12 != 0) { var0[var4++] = var2[var12 & 255]; } else { ++var4; } var12 = var1[var3++]; - if(var12 != 0) { + if (var12 != 0) { var0[var4++] = var2[var12 & 255]; } else { ++var4; } } - for(var11 = var5; var11 < 0; ++var11) { + for (var11 = var5; var11 < 0; ++var11) { var12 = var1[var3++]; - if(var12 != 0) { + if (var12 != 0) { var0[var4++] = var2[var12 & 255]; } else { ++var4; @@ -251,12 +253,12 @@ public final class IndexedSprite extends Rasterizer2D { static void IndexedSprite_something(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { int var12 = var3; - for(int var13 = -var8; var13 < 0; ++var13) { + for (int var13 = -var8; var13 < 0; ++var13) { int var14 = var11 * (var4 >> 16); - for(int var15 = -var7; var15 < 0; ++var15) { + for (int var15 = -var7; var15 < 0; ++var15) { byte var16 = var1[(var3 >> 16) + var14]; - if(var16 != 0) { + if (var16 != 0) { var0[var5++] = var2[var16 & 255]; } else { ++var5; diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index e6f6ae9645..d8f97202b4 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -35,42 +35,42 @@ public class Instrument { @ObfuscatedSignature( signature = "Lde;" ) - SoundEnvelope __m; + SoundEnvelope field413; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lde;" ) - SoundEnvelope __f; + SoundEnvelope field414; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lde;" ) - SoundEnvelope __q; + SoundEnvelope field415; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lde;" ) - SoundEnvelope __w; + SoundEnvelope field416; @ObfuscatedName("o") @ObfuscatedSignature( signature = "Lde;" ) - SoundEnvelope __o; + SoundEnvelope field417; @ObfuscatedName("u") @ObfuscatedSignature( signature = "Lde;" ) - SoundEnvelope __u; + SoundEnvelope field418; @ObfuscatedName("g") @ObfuscatedSignature( signature = "Lde;" ) - SoundEnvelope __g; + SoundEnvelope field419; @ObfuscatedName("l") @ObfuscatedSignature( signature = "Lde;" ) - SoundEnvelope __l; + SoundEnvelope field420; @ObfuscatedName("e") @Export("oscillatorVolume") int[] oscillatorVolume; @@ -96,7 +96,7 @@ public class Instrument { @ObfuscatedSignature( signature = "Lde;" ) - SoundEnvelope __a; + SoundEnvelope field421; @ObfuscatedName("z") @Export("duration") int duration; @@ -104,29 +104,6 @@ public class Instrument { @Export("offset") int offset; - static { - Instrument_noise = new int['耀']; - Random var0 = new Random(0L); - - int var1; - for(var1 = 0; var1 < 32768; ++var1) { - Instrument_noise[var1] = (var0.nextInt() & 2) - 1; - } - - Instrument_sine = new int['耀']; - - for(var1 = 0; var1 < 32768; ++var1) { - Instrument_sine[var1] = (int)(Math.sin((double)var1 / 5215.1903D) * 16384.0D); - } - - Instrument_samples = new int[220500]; - Instrument_phases = new int[5]; - Instrument_delays = new int[5]; - Instrument_volumeSteps = new int[5]; - Instrument_pitchSteps = new int[5]; - Instrument_pitchBaseSteps = new int[5]; - } - Instrument() { this.oscillatorVolume = new int[]{0, 0, 0, 0, 0}; this.oscillatorPitch = new int[]{0, 0, 0, 0, 0}; @@ -141,40 +118,40 @@ public class Instrument { @Export("synthesize") final int[] synthesize(int var1, int var2) { class212.clearIntArray(Instrument_samples, 0, var1); - if(var2 < 10) { + if (var2 < 10) { return Instrument_samples; } else { double var3 = (double)var1 / ((double)var2 + 0.0D); - this.__m.reset(); - this.__f.reset(); + this.field413.reset(); + this.field414.reset(); int var5 = 0; int var6 = 0; int var7 = 0; - if(this.__q != null) { - this.__q.reset(); - this.__w.reset(); - var5 = (int)((double)(this.__q.end - this.__q.start) * 32.768D / var3); - var6 = (int)((double)this.__q.start * 32.768D / var3); + if (this.field415 != null) { + this.field415.reset(); + this.field416.reset(); + var5 = (int)((double)(this.field415.end - this.field415.start) * 32.768D / var3); + var6 = (int)((double)this.field415.start * 32.768D / var3); } int var8 = 0; int var9 = 0; int var10 = 0; - if(this.__o != null) { - this.__o.reset(); - this.__u.reset(); - var8 = (int)((double)(this.__o.end - this.__o.start) * 32.768D / var3); - var9 = (int)((double)this.__o.start * 32.768D / var3); + if (this.field417 != null) { + this.field417.reset(); + this.field418.reset(); + var8 = (int)((double)(this.field417.end - this.field417.start) * 32.768D / var3); + var9 = (int)((double)this.field417.start * 32.768D / var3); } int var11; - for(var11 = 0; var11 < 5; ++var11) { - if(this.oscillatorVolume[var11] != 0) { + for (var11 = 0; var11 < 5; ++var11) { + if (this.oscillatorVolume[var11] != 0) { Instrument_phases[var11] = 0; Instrument_delays[var11] = (int)((double)this.oscillatorDelays[var11] * var3); Instrument_volumeSteps[var11] = (this.oscillatorVolume[var11] << 14) / 100; - Instrument_pitchSteps[var11] = (int)((double)(this.__m.end - this.__m.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3); - Instrument_pitchBaseSteps[var11] = (int)((double)this.__m.start * 32.768D / var3); + Instrument_pitchSteps[var11] = (int)((double)(this.field413.end - this.field413.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3); + Instrument_pitchBaseSteps[var11] = (int)((double)this.field413.start * 32.768D / var3); } } @@ -182,156 +159,160 @@ public class Instrument { int var13; int var14; int var15; - for(var11 = 0; var11 < var1; ++var11) { - var12 = this.__m.doStep(var1); - var13 = this.__f.doStep(var1); - if(this.__q != null) { - var14 = this.__q.doStep(var1); - var15 = this.__w.doStep(var1); - var12 += this.evaluateWave(var7, var15, this.__q.form) >> 1; + int[] var10000; + for (var11 = 0; var11 < var1; ++var11) { + var12 = this.field413.doStep(var1); + var13 = this.field414.doStep(var1); + if (this.field415 != null) { + var14 = this.field415.doStep(var1); + var15 = this.field416.doStep(var1); + var12 += this.evaluateWave(var7, var15, this.field415.form) >> 1; var7 = var7 + var6 + (var14 * var5 >> 16); } - if(this.__o != null) { - var14 = this.__o.doStep(var1); - var15 = this.__u.doStep(var1); - var13 = var13 * ((this.evaluateWave(var10, var15, this.__o.form) >> 1) + 32768) >> 15; + if (this.field417 != null) { + var14 = this.field417.doStep(var1); + var15 = this.field418.doStep(var1); + var13 = var13 * ((this.evaluateWave(var10, var15, this.field417.form) >> 1) + 32768) >> 15; var10 = var10 + var9 + (var14 * var8 >> 16); } - for(var14 = 0; var14 < 5; ++var14) { - if(this.oscillatorVolume[var14] != 0) { + for (var14 = 0; var14 < 5; ++var14) { + if (this.oscillatorVolume[var14] != 0) { var15 = Instrument_delays[var14] + var11; - if(var15 < var1) { - Instrument_samples[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.__m.form); - Instrument_phases[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14]; + if (var15 < var1) { + var10000 = Instrument_samples; + var10000[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.field413.form); + var10000 = Instrument_phases; + var10000[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14]; } } } } int var16; - if(this.__g != null) { - this.__g.reset(); - this.__l.reset(); + if (this.field419 != null) { + this.field419.reset(); + this.field420.reset(); var11 = 0; - boolean var19 = false; - boolean var20 = true; + boolean var17 = false; + boolean var18 = true; - for(var14 = 0; var14 < var1; ++var14) { - var15 = this.__g.doStep(var1); - var16 = this.__l.doStep(var1); - if(var20) { - var12 = (var15 * (this.__g.end - this.__g.start) >> 8) + this.__g.start; + for (var14 = 0; var14 < var1; ++var14) { + var15 = this.field419.doStep(var1); + var16 = this.field420.doStep(var1); + if (var18) { + var12 = (var15 * (this.field419.end - this.field419.start) >> 8) + this.field419.start; } else { - var12 = (var16 * (this.__g.end - this.__g.start) >> 8) + this.__g.start; + var12 = (var16 * (this.field419.end - this.field419.start) >> 8) + this.field419.start; } var11 += 256; - if(var11 >= var12) { + if (var11 >= var12) { var11 = 0; - var20 = !var20; + var18 = !var18; } - if(var20) { + if (var18) { Instrument_samples[var14] = 0; } } } - if(this.delayTime > 0 && this.delayDecay > 0) { + if (this.delayTime > 0 && this.delayDecay > 0) { var11 = (int)((double)this.delayTime * var3); - for(var12 = var11; var12 < var1; ++var12) { - Instrument_samples[var12] += Instrument_samples[var12 - var11] * this.delayDecay / 100; + for (var12 = var11; var12 < var1; ++var12) { + var10000 = Instrument_samples; + var10000[var12] += Instrument_samples[var12 - var11] * this.delayDecay / 100; } } - if(this.filter.__m[0] > 0 || this.filter.__m[1] > 0) { - this.__a.reset(); - var11 = this.__a.doStep(var1 + 1); - var12 = this.filter.__w_207(0, (float)var11 / 65536.0F); - var13 = this.filter.__w_207(1, (float)var11 / 65536.0F); - if(var1 >= var12 + var13) { + if (this.filter.field36[0] > 0 || this.filter.field36[1] > 0) { + this.field421.reset(); + var11 = this.field421.doStep(var1 + 1); + var12 = this.filter.method26(0, (float)var11 / 65536.0F); + var13 = this.filter.method26(1, (float)var11 / 65536.0F); + if (var1 >= var12 + var13) { var14 = 0; var15 = var13; - if(var13 > var1 - var12) { + if (var13 > var1 - var12) { var15 = var1 - var12; } - int var17; - while(var14 < var15) { - var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.__di_e >> 16); + int var19; + while (var14 < var15) { + var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.field35 >> 16); - for(var17 = 0; var17 < var12; ++var17) { - var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var17] * (long)AudioFilter.__di_g[0][var17] >> 16); + for (var19 = 0; var19 < var12; ++var19) { + var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var19] * (long)AudioFilter.field33[0][var19] >> 16); } - for(var17 = 0; var17 < var14; ++var17) { - var16 -= (int)((long)Instrument_samples[var14 - 1 - var17] * (long)AudioFilter.__di_g[1][var17] >> 16); + for (var19 = 0; var19 < var14; ++var19) { + var16 -= (int)((long)Instrument_samples[var14 - 1 - var19] * (long)AudioFilter.field33[1][var19] >> 16); } Instrument_samples[var14] = var16; - var11 = this.__a.doStep(var1 + 1); + var11 = this.field421.doStep(var1 + 1); ++var14; } var15 = 128; - while(true) { - if(var15 > var1 - var12) { + while (true) { + if (var15 > var1 - var12) { var15 = var1 - var12; } - int var18; - while(var14 < var15) { - var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.__di_e >> 16); + int var20; + while (var14 < var15) { + var19 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.field35 >> 16); - for(var18 = 0; var18 < var12; ++var18) { - var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.__di_g[0][var18] >> 16); + for (var20 = 0; var20 < var12; ++var20) { + var19 += (int)((long)Instrument_samples[var14 + var12 - 1 - var20] * (long)AudioFilter.field33[0][var20] >> 16); } - for(var18 = 0; var18 < var13; ++var18) { - var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.__di_g[1][var18] >> 16); + for (var20 = 0; var20 < var13; ++var20) { + var19 -= (int)((long)Instrument_samples[var14 - 1 - var20] * (long)AudioFilter.field33[1][var20] >> 16); } - Instrument_samples[var14] = var17; - var11 = this.__a.doStep(var1 + 1); + Instrument_samples[var14] = var19; + var11 = this.field421.doStep(var1 + 1); ++var14; } - if(var14 >= var1 - var12) { - while(var14 < var1) { - var17 = 0; + if (var14 >= var1 - var12) { + while (var14 < var1) { + var19 = 0; - for(var18 = var14 + var12 - var1; var18 < var12; ++var18) { - var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.__di_g[0][var18] >> 16); + for (var20 = var14 + var12 - var1; var20 < var12; ++var20) { + var19 += (int)((long)Instrument_samples[var14 + var12 - 1 - var20] * (long)AudioFilter.field33[0][var20] >> 16); } - for(var18 = 0; var18 < var13; ++var18) { - var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.__di_g[1][var18] >> 16); + for (var20 = 0; var20 < var13; ++var20) { + var19 -= (int)((long)Instrument_samples[var14 - 1 - var20] * (long)AudioFilter.field33[1][var20] >> 16); } - Instrument_samples[var14] = var17; - this.__a.doStep(var1 + 1); + Instrument_samples[var14] = var19; + this.field421.doStep(var1 + 1); ++var14; } break; } - var12 = this.filter.__w_207(0, (float)var11 / 65536.0F); - var13 = this.filter.__w_207(1, (float)var11 / 65536.0F); + var12 = this.filter.method26(0, (float)var11 / 65536.0F); + var13 = this.filter.method26(1, (float)var11 / 65536.0F); var15 += 128; } } } - for(var11 = 0; var11 < var1; ++var11) { - if(Instrument_samples[var11] < -32768) { + for (var11 = 0; var11 < var1; ++var11) { + if (Instrument_samples[var11] < -32768) { Instrument_samples[var11] = -32768; } - if(Instrument_samples[var11] > 32767) { + if (Instrument_samples[var11] > 32767) { Instrument_samples[var11] = 32767; } } @@ -343,7 +324,7 @@ public class Instrument { @ObfuscatedName("f") @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { - return var3 == 1?((var1 & 32767) < 16384?var2:-var2):(var3 == 2?Instrument_sine[var1 & 32767] * var2 >> 14:(var3 == 3?(var2 * (var1 & 32767) >> 14) - var2:(var3 == 4?var2 * Instrument_noise[var1 / 2607 & 32767]:0))); + return var3 == 1 ? ((var1 & 32767) < 16384 ? var2 : -var2) : (var3 == 2 ? Instrument_sine[var1 & 32767] * var2 >> 14 : (var3 == 3 ? (var2 * (var1 & 32767) >> 14) - var2 : (var3 == 4 ? var2 * Instrument_noise[var1 / 2607 & 32767] : 0))); } @ObfuscatedName("q") @@ -352,54 +333,77 @@ public class Instrument { ) @Export("decode") final void decode(Buffer var1) { - this.__m = new SoundEnvelope(); - this.__m.decode(var1); - this.__f = new SoundEnvelope(); - this.__f.decode(var1); + this.field413 = new SoundEnvelope(); + this.field413.decode(var1); + this.field414 = new SoundEnvelope(); + this.field414.decode(var1); int var2 = var1.readUnsignedByte(); - if(var2 != 0) { + if (var2 != 0) { --var1.index; - this.__q = new SoundEnvelope(); - this.__q.decode(var1); - this.__w = new SoundEnvelope(); - this.__w.decode(var1); + this.field415 = new SoundEnvelope(); + this.field415.decode(var1); + this.field416 = new SoundEnvelope(); + this.field416.decode(var1); } var2 = var1.readUnsignedByte(); - if(var2 != 0) { + if (var2 != 0) { --var1.index; - this.__o = new SoundEnvelope(); - this.__o.decode(var1); - this.__u = new SoundEnvelope(); - this.__u.decode(var1); + this.field417 = new SoundEnvelope(); + this.field417.decode(var1); + this.field418 = new SoundEnvelope(); + this.field418.decode(var1); } var2 = var1.readUnsignedByte(); - if(var2 != 0) { + if (var2 != 0) { --var1.index; - this.__g = new SoundEnvelope(); - this.__g.decode(var1); - this.__l = new SoundEnvelope(); - this.__l.decode(var1); + this.field419 = new SoundEnvelope(); + this.field419.decode(var1); + this.field420 = new SoundEnvelope(); + this.field420.decode(var1); } - for(int var3 = 0; var3 < 10; ++var3) { - int var4 = var1.__ae_307(); - if(var4 == 0) { + for (int var3 = 0; var3 < 10; ++var3) { + int var4 = var1.method48(); + if (var4 == 0) { break; } this.oscillatorVolume[var3] = var4; - this.oscillatorPitch[var3] = var1.__ab_306(); - this.oscillatorDelays[var3] = var1.__ae_307(); + this.oscillatorPitch[var3] = var1.method47(); + this.oscillatorDelays[var3] = var1.method48(); } - this.delayTime = var1.__ae_307(); - this.delayDecay = var1.__ae_307(); - this.duration = var1.__ag_302(); - this.offset = var1.__ag_302(); + this.delayTime = var1.method48(); + this.delayDecay = var1.method48(); + this.duration = var1.method43(); + this.offset = var1.method43(); this.filter = new AudioFilter(); - this.__a = new SoundEnvelope(); - this.filter.__o_208(var1, this.__a); + this.field421 = new SoundEnvelope(); + this.filter.method27(var1, this.field421); + } + + static { + Instrument_noise = new int[32768]; + Random var0 = new Random(0L); + + int var1; + for (var1 = 0; var1 < 32768; ++var1) { + Instrument_noise[var1] = (var0.nextInt() & 2) - 1; + } + + Instrument_sine = new int[32768]; + + for (var1 = 0; var1 < 32768; ++var1) { + Instrument_sine[var1] = (int)(Math.sin((double)var1 / 5215.1903D) * 16384.0D); + } + + Instrument_samples = new int[220500]; + Instrument_phases = new int[5]; + Instrument_delays = new int[5]; + Instrument_volumeSteps = new int[5]; + Instrument_pitchSteps = new int[5]; + Instrument_pitchBaseSteps = new int[5]; } } diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java index 8e94ce9a5f..44e2b9aa59 100644 --- a/runescape-client/src/main/java/IntHashTable.java +++ b/runescape-client/src/main/java/IntHashTable.java @@ -12,21 +12,19 @@ public class IntHashTable { public IntHashTable(int[] var1) { int var2; - for(var2 = 1; var2 <= (var1.length >> 1) + var1.length; var2 <<= 1) { - ; + for (var2 = 1; var2 <= (var1.length >> 1) + var1.length; var2 <<= 1) { } this.array = new int[var2 + var2]; int var3; - for(var3 = 0; var3 < var2 + var2; ++var3) { + for (var3 = 0; var3 < var2 + var2; ++var3) { this.array[var3] = -1; } int var4; - for(var3 = 0; var3 < var1.length; this.array[var4 + var4 + 1] = var3++) { - for(var4 = var1[var3] & var2 - 1; this.array[var4 + var4 + 1] != -1; var4 = var4 + 1 & var2 - 1) { - ; + for (var3 = 0; var3 < var1.length; this.array[var4 + var4 + 1] = var3++) { + for (var4 = var1[var3] & var2 - 1; this.array[var4 + var4 + 1] != -1; var4 = var4 + 1 & var2 - 1) { } this.array[var4 + var4] = var1[var3]; @@ -44,13 +42,13 @@ public class IntHashTable { int var2 = (this.array.length >> 1) - 1; int var3 = var1 & var2; - while(true) { + while (true) { int var4 = this.array[var3 + var3 + 1]; - if(var4 == -1) { + if (var4 == -1) { return -1; } - if(this.array[var3 + var3] == var1) { + if (this.array[var3 + var3] == var1) { return var4; } diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index 61ace7fd65..80135fddbd 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -48,33 +48,18 @@ public class Interpreter { @Export("Interpreter_calendar") static Calendar Interpreter_calendar; @ObfuscatedName("z") - static final String[] __bv_z; + static final String[] field422; @ObfuscatedName("s") - static boolean __bv_s; + static boolean field423; @ObfuscatedName("t") - static boolean __bv_t; + static boolean field424; @ObfuscatedName("y") @ObfuscatedGetter( intValue = -1019558835 ) - static int __bv_y; + static int field425; @ObfuscatedName("r") - static final double __bv_r; - - static { - Interpreter_arrayLengths = new int[5]; - Interpreter_arrays = new int[5][5000]; - Interpreter_intStack = new int[1000]; - Interpreter_stringStack = new String[1000]; - Interpreter_frameDepth = 0; - Interpreter_frames = new ScriptFrame[50]; - Interpreter_calendar = Calendar.getInstance(); - __bv_z = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; - __bv_s = false; - __bv_t = false; - __bv_y = 0; - __bv_r = Math.log(2.0D); - } + static final double field426; @ObfuscatedName("m") @ObfuscatedSignature( @@ -83,29 +68,29 @@ public class Interpreter { ) public static PacketBufferNode method1915(ClientPacket var0, IsaacCipher var1) { PacketBufferNode var2; - if(PacketBufferNode.__gg_u == 0) { + if (PacketBufferNode.field668 == 0) { var2 = new PacketBufferNode(); } else { - var2 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.__gg_u]; + var2 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.field668]; } - var2.__m = var0; - var2.__f = var0.length; - if(var2.__f == -1) { + var2.field669 = var0; + var2.field670 = var0.length; + if (var2.field670 == -1) { var2.packetBuffer = new PacketBuffer(260); - } else if(var2.__f == -2) { + } else if (var2.field670 == -2) { var2.packetBuffer = new PacketBuffer(10000); - } else if(var2.__f <= 18) { + } else if (var2.field670 <= 18) { var2.packetBuffer = new PacketBuffer(20); - } else if(var2.__f <= 98) { + } else if (var2.field670 <= 98) { var2.packetBuffer = new PacketBuffer(100); } else { var2.packetBuffer = new PacketBuffer(260); } var2.packetBuffer.setIsaacCipher(var1); - var2.packetBuffer.writeByteIsaac(var2.__m.id); - var2.__w = 0; + var2.packetBuffer.writeByteIsaac(var2.field669.id); + var2.field671 = 0; return var2; } @@ -117,12 +102,12 @@ public class Interpreter { @Export("getEnum") public static EnumDefinition getEnum(int var0) { EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0); - if(var1 != null) { + if (var1 != null) { return var1; } else { byte[] var2 = EnumDefinition.EnumDefinition_indexCache.takeRecord(8, var0); var1 = new EnumDefinition(); - if(var2 != null) { + if (var2 != null) { var1.read(new Buffer(var2)); } @@ -144,8 +129,8 @@ public class Interpreter { var3[0] = var1; int var4 = 1; - for(int var5 = 0; var5 < 4; ++var5) { - if(World.sortOption1[var5] != var0) { + for (int var5 = 0; var5 < 4; ++var5) { + if (World.sortOption1[var5] != var0) { var2[var4] = World.sortOption1[var5]; var3[var4] = World.sortOption2[var5]; ++var4; @@ -165,33 +150,32 @@ public class Interpreter { public static void method1976() { try { File var0 = new File(WorldMapSection1.userHomeDirectory, "random.dat"); - int var2; - if(var0.exists()) { + int var1; + if (var0.exists()) { class168.randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); } else { - label38: - for(int var1 = 0; var1 < Canvas.__ao_s.length; ++var1) { - for(var2 = 0; var2 < WorldMapSection2.cacheDirectoryLocations.length; ++var2) { - File var3 = new File(WorldMapSection2.cacheDirectoryLocations[var2] + Canvas.__ao_s[var1] + File.separatorChar + "random.dat"); - if(var3.exists()) { + label34: + for (int var2 = 0; var2 < Canvas.field94.length; ++var2) { + for (var1 = 0; var1 < WorldMapSection2.cacheDirectoryLocations.length; ++var1) { + File var3 = new File(WorldMapSection2.cacheDirectoryLocations[var1] + Canvas.field94[var2] + File.separatorChar + "random.dat"); + if (var3.exists()) { class168.randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); - break label38; + break label34; } } } } - if(class168.randomDat == null) { - RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); - var2 = var4.read(); - var4.seek(0L); - var4.write(var2); - var4.seek(0L); - var4.close(); + if (class168.randomDat == null) { + RandomAccessFile var5 = new RandomAccessFile(var0, "rw"); + var1 = var5.read(); + var5.seek(0L); + var5.write(var1); + var5.seek(0L); + var5.close(); class168.randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); } - } catch (IOException var5) { - ; + } catch (IOException var4) { } } @@ -203,23 +187,35 @@ public class Interpreter { ) @Export("drawWidgets") static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if(GroundItemPile.loadWidgetGroup(var0)) { - class279.__jx_ne = null; + if (GroundItemPile.loadWidgetGroup(var0)) { + class279.field1145 = null; DevicePcmPlayerProvider.drawWidgetGroup(Widget.widgets[var0], -1, var1, var2, var3, var4, var5, var6, var7); - if(class279.__jx_ne != null) { - DevicePcmPlayerProvider.drawWidgetGroup(class279.__jx_ne, -1412584499, var1, var2, var3, var4, class54.__bs_nb, class157.__fw_nm, var7); - class279.__jx_ne = null; + if (class279.field1145 != null) { + DevicePcmPlayerProvider.drawWidgetGroup(class279.field1145, -1412584499, var1, var2, var3, var4, class54.field1161, class157.field1114, var7); + class279.field1145 = null; } - + } else if (var7 != -1) { + Client.field100[var7] = true; } else { - if(var7 != -1) { - Client.__client_od[var7] = true; - } else { - for(int var8 = 0; var8 < 100; ++var8) { - Client.__client_od[var8] = true; - } + for (int var8 = 0; var8 < 100; ++var8) { + Client.field100[var8] = true; } - } + + } + + static { + Interpreter_arrayLengths = new int[5]; + Interpreter_arrays = new int[5][5000]; + Interpreter_intStack = new int[1000]; + Interpreter_stringStack = new String[1000]; + Interpreter_frameDepth = 0; + Interpreter_frames = new ScriptFrame[50]; + Interpreter_calendar = Calendar.getInstance(); + field422 = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; + field423 = false; + field424 = false; + field425 = 0; + field426 = Math.log(2.0D); } } diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index 922b60700a..c058dbea3e 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -11,7 +11,7 @@ public class InvDefinition extends DualNode { @ObfuscatedSignature( signature = "Ler;" ) - static EvictingDualNodeHashTable __ib_f; + static EvictingDualNodeHashTable field427; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 1358868971 @@ -19,10 +19,6 @@ public class InvDefinition extends DualNode { @Export("size") public int size; - static { - __ib_f = new EvictingDualNodeHashTable(64); - } - InvDefinition() { this.size = 0; } @@ -34,9 +30,9 @@ public class InvDefinition extends DualNode { ) @Export("read") void read(Buffer var1) { - while(true) { + while (true) { int var2 = var1.readUnsignedByte(); - if(var2 == 0) { + if (var2 == 0) { return; } @@ -51,8 +47,8 @@ public class InvDefinition extends DualNode { ) @Export("readNext") void readNext(Buffer var1, int var2) { - if(var2 == 2) { - this.size = var1.__ag_302(); + if (var2 == 2) { + this.size = var1.method43(); } } @@ -65,4 +61,8 @@ public class InvDefinition extends DualNode { public static void method4754() { ParamKeyDefinition.ParamKeyDefinition_cached.clear(); } + + static { + field427 = new EvictingDualNodeHashTable(64); + } } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index 11f5951763..a1f33c11cd 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,36 +10,36 @@ public final class IsaacCipher { @ObfuscatedGetter( intValue = 1514845493 ) - int __w; + int field428; @ObfuscatedName("o") - int[] __o; + int[] field429; @ObfuscatedName("u") - int[] __u; + int[] field430; @ObfuscatedName("g") @ObfuscatedGetter( intValue = -1670027699 ) - int __g; + int field431; @ObfuscatedName("l") @ObfuscatedGetter( intValue = -325762649 ) - int __l; + int field432; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -1951204929 ) - int __e; + int field433; public IsaacCipher(int[] var1) { - this.__u = new int[256]; - this.__o = new int[256]; + this.field430 = new int[256]; + this.field429 = new int[256]; - for(int var2 = 0; var2 < var1.length; ++var2) { - this.__o[var2] = var1[var2]; + for (int var2 = 0; var2 < var1.length; ++var2) { + this.field429[var2] = var1[var2]; } - this.__w_339(); + this.method139(); } @ObfuscatedName("m") @@ -48,13 +47,13 @@ public final class IsaacCipher { signature = "(I)I", garbageValue = "-7509790" ) - final int __m_336() { - if(0 == --this.__w + 1) { - this.__q_338(); - this.__w = 255; + final int method136() { + if (0 == --this.field428 + 1) { + this.method138(); + this.field428 = 255; } - return this.__o[this.__w]; + return this.field429[this.field428]; } @ObfuscatedName("f") @@ -62,13 +61,13 @@ public final class IsaacCipher { signature = "(I)I", garbageValue = "-506873526" ) - final int __f_337() { - if(this.__w == 0) { - this.__q_338(); - this.__w = 256; + final int method137() { + if (this.field428 == 0) { + this.method138(); + this.field428 = 256; } - return this.__o[this.__w - 1]; + return this.field429[this.field428 - 1]; } @ObfuscatedName("q") @@ -76,27 +75,27 @@ public final class IsaacCipher { signature = "(B)V", garbageValue = "124" ) - final void __q_338() { - this.__l += ++this.__e; + final void method138() { + this.field432 += ++this.field433; - for(int var1 = 0; var1 < 256; ++var1) { - int var2 = this.__u[var1]; - if((var1 & 2) == 0) { - if((var1 & 1) == 0) { - this.__g ^= this.__g << 13; + for (int var1 = 0; var1 < 256; ++var1) { + int var2 = this.field430[var1]; + if ((var1 & 2) == 0) { + if ((var1 & 1) == 0) { + this.field431 ^= this.field431 << 13; } else { - this.__g ^= this.__g >>> 6; + this.field431 ^= this.field431 >>> 6; } - } else if((var1 & 1) == 0) { - this.__g ^= this.__g << 2; + } else if ((var1 & 1) == 0) { + this.field431 ^= this.field431 << 2; } else { - this.__g ^= this.__g >>> 16; + this.field431 ^= this.field431 >>> 16; } - this.__g += this.__u[128 + var1 & 255]; + this.field431 += this.field430[128 + var1 & 255]; int var3; - this.__u[var1] = var3 = this.__u[(var2 & 1020) >> 2] + this.__l + this.__g; - this.__o[var1] = this.__l = this.__u[(var3 >> 8 & 1020) >> 2] + var2; + this.field430[var1] = var3 = this.field430[(var2 & 1020) >> 2] + this.field432 + this.field431; + this.field429[var1] = this.field432 = this.field430[(var3 >> 8 & 1020) >> 2] + var2; } } @@ -106,132 +105,132 @@ public final class IsaacCipher { signature = "(I)V", garbageValue = "579890110" ) - final void __w_339() { - int var9 = -1640531527; - int var8 = -1640531527; - int var7 = -1640531527; - int var6 = -1640531527; - int var5 = -1640531527; - int var4 = -1640531527; - int var3 = -1640531527; + final void method139() { + int var1 = -1640531527; int var2 = -1640531527; + int var3 = -1640531527; + int var4 = -1640531527; + int var5 = -1640531527; + int var6 = -1640531527; + int var7 = -1640531527; + int var8 = -1640531527; - int var1; - for(var1 = 0; var1 < 4; ++var1) { - var2 ^= var3 << 11; - var5 += var2; - var3 += var4; - var3 ^= var4 >>> 2; - var6 += var3; - var4 += var5; - var4 ^= var5 << 8; - var7 += var4; - var5 += var6; - var5 ^= var6 >>> 16; - var8 += var5; - var6 += var7; - var6 ^= var7 << 10; - var9 += var6; - var7 += var8; - var7 ^= var8 >>> 4; - var2 += var7; - var8 += var9; - var8 ^= var9 << 8; - var3 += var8; - var9 += var2; - var9 ^= var2 >>> 9; - var4 += var9; - var2 += var3; + int var9; + for (var9 = 0; var9 < 4; ++var9) { + var8 ^= var7 << 11; + var5 += var8; + var7 += var6; + var7 ^= var6 >>> 2; + var4 += var7; + var6 += var5; + var6 ^= var5 << 8; + var3 += var6; + var5 += var4; + var5 ^= var4 >>> 16; + var2 += var5; + var4 += var3; + var4 ^= var3 << 10; + var1 += var4; + var3 += var2; + var3 ^= var2 >>> 4; + var8 += var3; + var2 += var1; + var2 ^= var1 << 8; + var7 += var2; + var1 += var8; + var1 ^= var8 >>> 9; + var6 += var1; + var8 += var7; } - for(var1 = 0; var1 < 256; var1 += 8) { - var2 += this.__o[var1]; - var3 += this.__o[var1 + 1]; - var4 += this.__o[var1 + 2]; - var5 += this.__o[var1 + 3]; - var6 += this.__o[var1 + 4]; - var7 += this.__o[var1 + 5]; - var8 += this.__o[var1 + 6]; - var9 += this.__o[var1 + 7]; - var2 ^= var3 << 11; - var5 += var2; - var3 += var4; - var3 ^= var4 >>> 2; - var6 += var3; - var4 += var5; - var4 ^= var5 << 8; - var7 += var4; - var5 += var6; - var5 ^= var6 >>> 16; - var8 += var5; - var6 += var7; - var6 ^= var7 << 10; - var9 += var6; - var7 += var8; - var7 ^= var8 >>> 4; - var2 += var7; - var8 += var9; - var8 ^= var9 << 8; - var3 += var8; - var9 += var2; - var9 ^= var2 >>> 9; - var4 += var9; - var2 += var3; - this.__u[var1] = var2; - this.__u[var1 + 1] = var3; - this.__u[var1 + 2] = var4; - this.__u[var1 + 3] = var5; - this.__u[var1 + 4] = var6; - this.__u[var1 + 5] = var7; - this.__u[var1 + 6] = var8; - this.__u[var1 + 7] = var9; + for (var9 = 0; var9 < 256; var9 += 8) { + var8 += this.field429[var9]; + var7 += this.field429[var9 + 1]; + var6 += this.field429[var9 + 2]; + var5 += this.field429[var9 + 3]; + var4 += this.field429[var9 + 4]; + var3 += this.field429[var9 + 5]; + var2 += this.field429[var9 + 6]; + var1 += this.field429[var9 + 7]; + var8 ^= var7 << 11; + var5 += var8; + var7 += var6; + var7 ^= var6 >>> 2; + var4 += var7; + var6 += var5; + var6 ^= var5 << 8; + var3 += var6; + var5 += var4; + var5 ^= var4 >>> 16; + var2 += var5; + var4 += var3; + var4 ^= var3 << 10; + var1 += var4; + var3 += var2; + var3 ^= var2 >>> 4; + var8 += var3; + var2 += var1; + var2 ^= var1 << 8; + var7 += var2; + var1 += var8; + var1 ^= var8 >>> 9; + var6 += var1; + var8 += var7; + this.field430[var9] = var8; + this.field430[var9 + 1] = var7; + this.field430[var9 + 2] = var6; + this.field430[var9 + 3] = var5; + this.field430[var9 + 4] = var4; + this.field430[var9 + 5] = var3; + this.field430[var9 + 6] = var2; + this.field430[var9 + 7] = var1; } - for(var1 = 0; var1 < 256; var1 += 8) { - var2 += this.__u[var1]; - var3 += this.__u[var1 + 1]; - var4 += this.__u[var1 + 2]; - var5 += this.__u[var1 + 3]; - var6 += this.__u[var1 + 4]; - var7 += this.__u[var1 + 5]; - var8 += this.__u[var1 + 6]; - var9 += this.__u[var1 + 7]; - var2 ^= var3 << 11; - var5 += var2; - var3 += var4; - var3 ^= var4 >>> 2; - var6 += var3; - var4 += var5; - var4 ^= var5 << 8; - var7 += var4; - var5 += var6; - var5 ^= var6 >>> 16; - var8 += var5; - var6 += var7; - var6 ^= var7 << 10; - var9 += var6; - var7 += var8; - var7 ^= var8 >>> 4; - var2 += var7; - var8 += var9; - var8 ^= var9 << 8; - var3 += var8; - var9 += var2; - var9 ^= var2 >>> 9; - var4 += var9; - var2 += var3; - this.__u[var1] = var2; - this.__u[var1 + 1] = var3; - this.__u[var1 + 2] = var4; - this.__u[var1 + 3] = var5; - this.__u[var1 + 4] = var6; - this.__u[var1 + 5] = var7; - this.__u[var1 + 6] = var8; - this.__u[var1 + 7] = var9; + for (var9 = 0; var9 < 256; var9 += 8) { + var8 += this.field430[var9]; + var7 += this.field430[var9 + 1]; + var6 += this.field430[var9 + 2]; + var5 += this.field430[var9 + 3]; + var4 += this.field430[var9 + 4]; + var3 += this.field430[var9 + 5]; + var2 += this.field430[var9 + 6]; + var1 += this.field430[var9 + 7]; + var8 ^= var7 << 11; + var5 += var8; + var7 += var6; + var7 ^= var6 >>> 2; + var4 += var7; + var6 += var5; + var6 ^= var5 << 8; + var3 += var6; + var5 += var4; + var5 ^= var4 >>> 16; + var2 += var5; + var4 += var3; + var4 ^= var3 << 10; + var1 += var4; + var3 += var2; + var3 ^= var2 >>> 4; + var8 += var3; + var2 += var1; + var2 ^= var1 << 8; + var7 += var2; + var1 += var8; + var1 ^= var8 >>> 9; + var6 += var1; + var8 += var7; + this.field430[var9] = var8; + this.field430[var9 + 1] = var7; + this.field430[var9 + 2] = var6; + this.field430[var9 + 3] = var5; + this.field430[var9 + 4] = var4; + this.field430[var9 + 5] = var3; + this.field430[var9 + 6] = var2; + this.field430[var9 + 7] = var1; } - this.__q_338(); - this.__w = 256; + this.method138(); + this.field428 = 256; } @ObfuscatedName("m") @@ -240,8 +239,8 @@ public final class IsaacCipher { garbageValue = "75867683" ) public static void method4082(AbstractIndexCache var0, AbstractIndexCache var1) { - NpcDefinition.NpcDefinition_indexCache = var0; - NpcDefinition.NpcDefinition_modelIndexCache = var1; + NPCDefinition.NpcDefinition_indexCache = var0; + NPCDefinition.NpcDefinition_modelIndexCache = var1; } @ObfuscatedName("fl") @@ -250,83 +249,83 @@ public final class IsaacCipher { garbageValue = "1676957578" ) static void method4093(int var0) { - if(var0 == -3) { + if (var0 == -3) { class54.method1089("Connection timed out.", "Please try using a different world.", ""); - } else if(var0 == -2) { + } else if (var0 == -2) { class54.method1089("", "Error connecting to server.", ""); - } else if(var0 == -1) { + } else if (var0 == -1) { class54.method1089("No response from server.", "Please try using a different world.", ""); - } else if(var0 == 3) { + } else if (var0 == 3) { Login.loginIndex = 3; - Login.__cu_ac = 1; - } else if(var0 == 4) { + Login.field467 = 1; + } else if (var0 == 4) { class32.method578(0); - } else if(var0 == 5) { - Login.__cu_ac = 2; + } else if (var0 == 5) { + Login.field467 = 2; class54.method1089("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); - } else if(var0 != 68 && (Client.__client_bl || var0 != 6)) { - if(var0 == 7) { + } else if (var0 != 68 && (Client.field162 || var0 != 6)) { + if (var0 == 7) { class54.method1089("This world is full.", "Please use a different world.", ""); - } else if(var0 == 8) { + } else if (var0 == 8) { class54.method1089("Unable to connect.", "Login server offline.", ""); - } else if(var0 == 9) { + } else if (var0 == 9) { class54.method1089("Login limit exceeded.", "Too many connections from your address.", ""); - } else if(var0 == 10) { + } else if (var0 == 10) { class54.method1089("Unable to connect.", "Bad session id.", ""); - } else if(var0 == 11) { - class54.method1089("We suspect someone knows your password.", "Press \'change your password\' on front page.", ""); - } else if(var0 == 12) { + } else if (var0 == 11) { + class54.method1089("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); + } else if (var0 == 12) { class54.method1089("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); - } else if(var0 == 13) { + } else if (var0 == 13) { class54.method1089("Could not complete login.", "Please try using a different world.", ""); - } else if(var0 == 14) { + } else if (var0 == 14) { class54.method1089("The server is being updated.", "Please wait 1 minute and try again.", ""); - } else if(var0 == 16) { + } else if (var0 == 16) { class54.method1089("Too many login attempts.", "Please wait a few minutes before trying again.", ""); - } else if(var0 == 17) { + } else if (var0 == 17) { class54.method1089("You are standing in a members-only area.", "To play on this world move to a free area first", ""); - } else if(var0 == 18) { + } else if (var0 == 18) { class32.method578(1); - } else if(var0 == 19) { + } else if (var0 == 19) { class54.method1089("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); - } else if(var0 == 20) { + } else if (var0 == 20) { class54.method1089("Invalid loginserver requested.", "Please try using a different world.", ""); - } else if(var0 == 22) { + } else if (var0 == 22) { class54.method1089("Malformed login packet.", "Please try again.", ""); - } else if(var0 == 23) { + } else if (var0 == 23) { class54.method1089("No reply from loginserver.", "Please wait 1 minute and try again.", ""); - } else if(var0 == 24) { + } else if (var0 == 24) { class54.method1089("Error loading your profile.", "Please contact customer support.", ""); - } else if(var0 == 25) { + } else if (var0 == 25) { class54.method1089("Unexpected loginserver response.", "Please try using a different world.", ""); - } else if(var0 == 26) { + } else if (var0 == 26) { class54.method1089("This computers address has been blocked", "as it was used to break our rules.", ""); - } else if(var0 == 27) { + } else if (var0 == 27) { class54.method1089("", "Service unavailable.", ""); - } else if(var0 == 31) { + } else if (var0 == 31) { class54.method1089("Your account must have a displayname set", "in order to play the game. Please set it", "via the website, or the main game."); - } else if(var0 == 32) { - class54.method1089("Your attempt to log into your account was", "unsuccessful. Don\'t worry, you can sort", "this out by visiting the billing system."); - } else if(var0 == 37) { + } else if (var0 == 32) { + class54.method1089("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); + } else if (var0 == 37) { class54.method1089("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); - } else if(var0 == 38) { + } else if (var0 == 38) { class54.method1089("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); - } else if(var0 == 55) { + } else if (var0 == 55) { Login.loginIndex = 8; } else { - if(var0 == 56) { + if (var0 == 56) { class54.method1089("Enter the 6-digit code generated by your", "authenticator app.", ""); GameShell.updateGameState(11); return; } - if(var0 == 57) { + if (var0 == 57) { class54.method1089("The code you entered was incorrect.", "Please try again.", ""); GameShell.updateGameState(11); return; } - if(var0 == 61) { + if (var0 == 61) { Login.loginIndex = 7; } else { class54.method1089("Unexpected server response", "Please try using a different world.", ""); diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index 8a99037d41..4404e399d1 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -22,7 +22,7 @@ public class ItemContainer extends Node { @ObfuscatedSignature( signature = "Lit;" ) - static IndexCache __bc_dm; + static IndexCache field434; @ObfuscatedName("f") @Export("ids") int[] ids; @@ -30,10 +30,6 @@ public class ItemContainer extends Node { @Export("quantities") int[] quantities; - static { - itemContainers = new NodeHashTable(32); - } - ItemContainer() { this.ids = new int[]{-1}; this.quantities = new int[]{0}; @@ -55,44 +51,48 @@ public class ItemContainer extends Node { ) @Export("getFrames") static Frames getFrames(int var0) { - Frames var1 = (Frames)SequenceDefinition.__jh_o.get((long)var0); - if(var1 != null) { + Frames var1 = (Frames)SequenceDefinition.field775.get((long)var0); + if (var1 != null) { return var1; } else { - AbstractIndexCache var3 = SequenceDefinition.__jh_f; - AbstractIndexCache var4 = SequenceDefinition.__jh_q; - boolean var5 = true; - int[] var6 = var3.__j_395(var0); + AbstractIndexCache var2 = SequenceDefinition.field773; + AbstractIndexCache var3 = SequenceDefinition.field774; + boolean var4 = true; + int[] var5 = var2.method3(var0); - for(int var7 = 0; var7 < var6.length; ++var7) { - byte[] var8 = var3.getRecord(var0, var6[var7]); - if(var8 == null) { - var5 = false; + for (int var6 = 0; var6 < var5.length; ++var6) { + byte[] var7 = var2.getRecord(var0, var5[var6]); + if (var7 == null) { + var4 = false; } else { - int var9 = (var8[0] & 255) << 8 | var8[1] & 255; - byte[] var10 = var4.getRecord(var9, 0); - if(var10 == null) { - var5 = false; + int var8 = (var7[0] & 255) << 8 | var7[1] & 255; + byte[] var9 = var3.getRecord(var8, 0); + if (var9 == null) { + var4 = false; } } } - Frames var2; - if(!var5) { - var2 = null; + Frames var11; + if (!var4) { + var11 = null; } else { try { - var2 = new Frames(var3, var4, var0, false); - } catch (Exception var12) { - var2 = null; + var11 = new Frames(var2, var3, var0, false); + } catch (Exception var10) { + var11 = null; } } - if(var2 != null) { - SequenceDefinition.__jh_o.put(var2, (long)var0); + if (var11 != null) { + SequenceDefinition.field775.put(var11, (long)var0); } - return var2; + return var11; } } + + static { + itemContainers = new NodeHashTable(32); + } } diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index 79a6776a68..2e9fc77fde 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -47,7 +47,7 @@ public class ItemDefinition extends DualNode { @ObfuscatedGetter( intValue = 1070080857 ) - int __a; + int field435; @ObfuscatedName("z") @Export("name") public String name; @@ -199,9 +199,9 @@ public class ItemDefinition extends DualNode { @Export("femaleHeadModel2") int femaleHeadModel2; @ObfuscatedName("az") - int[] __az; + int[] field436; @ObfuscatedName("au") - int[] __au; + int[] field437; @ObfuscatedName("ao") @ObfuscatedGetter( intValue = 619422509 @@ -284,12 +284,6 @@ public class ItemDefinition extends DualNode { @Export("placeholderTemplate") public int placeholderTemplate; - static { - ItemDefinition_cached = new EvictingDualNodeHashTable(64); - ItemDefinition_cachedModels = new EvictingDualNodeHashTable(50); - Sprite_cached = new EvictingDualNodeHashTable(200); - } - ItemDefinition() { this.name = "null"; this.zoom2d = 2000; @@ -347,9 +341,9 @@ public class ItemDefinition extends DualNode { ) @Export("read") void read(Buffer var1) { - while(true) { + while (true) { int var2 = var1.readUnsignedByte(); - if(var2 == 0) { + if (var2 == 0) { return; } @@ -364,121 +358,121 @@ public class ItemDefinition extends DualNode { ) @Export("readNext") void readNext(Buffer var1, int var2) { - if(var2 == 1) { - this.__a = var1.__ag_302(); - } else if(var2 == 2) { + if (var2 == 1) { + this.field435 = var1.method43(); + } else if (var2 == 2) { this.name = var1.readStringCp1252NullTerminated(); - } else if(var2 == 4) { - this.zoom2d = var1.__ag_302(); - } else if(var2 == 5) { - this.xan2d = var1.__ag_302(); - } else if(var2 == 6) { - this.yan2d = var1.__ag_302(); - } else if(var2 == 7) { - this.offsetX2d = var1.__ag_302(); - if(this.offsetX2d > 32767) { + } else if (var2 == 4) { + this.zoom2d = var1.method43(); + } else if (var2 == 5) { + this.xan2d = var1.method43(); + } else if (var2 == 6) { + this.yan2d = var1.method43(); + } else if (var2 == 7) { + this.offsetX2d = var1.method43(); + if (this.offsetX2d > 32767) { this.offsetX2d -= 65536; } - } else if(var2 == 8) { - this.offsetY2d = var1.__ag_302(); - if(this.offsetY2d > 32767) { + } else if (var2 == 8) { + this.offsetY2d = var1.method43(); + if (this.offsetY2d > 32767) { this.offsetY2d -= 65536; } - } else if(var2 == 11) { + } else if (var2 == 11) { this.isStackable = 1; - } else if(var2 == 12) { + } else if (var2 == 12) { this.price = var1.readInt(); - } else if(var2 == 16) { + } else if (var2 == 16) { this.isMembersOnly = true; - } else if(var2 == 23) { - this.maleModel = var1.__ag_302(); + } else if (var2 == 23) { + this.maleModel = var1.method43(); this.maleOffset = var1.readUnsignedByte(); - } else if(var2 == 24) { - this.maleModel1 = var1.__ag_302(); - } else if(var2 == 25) { - this.femaleModel = var1.__ag_302(); + } else if (var2 == 24) { + this.maleModel1 = var1.method43(); + } else if (var2 == 25) { + this.femaleModel = var1.method43(); this.femaleOffset = var1.readUnsignedByte(); - } else if(var2 == 26) { - this.femaleModel1 = var1.__ag_302(); - } else if(var2 >= 30 && var2 < 35) { + } else if (var2 == 26) { + this.femaleModel1 = var1.method43(); + } else if (var2 >= 30 && var2 < 35) { this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); - if(this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { + if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { this.groundActions[var2 - 30] = null; } - } else if(var2 >= 35 && var2 < 40) { + } else if (var2 >= 35 && var2 < 40) { this.inventoryActions[var2 - 35] = var1.readStringCp1252NullTerminated(); } else { int var3; int var4; - if(var2 == 40) { + if (var2 == 40) { var3 = var1.readUnsignedByte(); this.recolorFrom = new short[var3]; this.recolorTo = new short[var3]; - for(var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.__ag_302(); - this.recolorTo[var4] = (short)var1.__ag_302(); + for (var4 = 0; var4 < var3; ++var4) { + this.recolorFrom[var4] = (short)var1.method43(); + this.recolorTo[var4] = (short)var1.method43(); } - } else if(var2 == 41) { + } else if (var2 == 41) { var3 = var1.readUnsignedByte(); this.retextureFrom = new short[var3]; this.retextureTo = new short[var3]; - for(var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.__ag_302(); - this.retextureTo[var4] = (short)var1.__ag_302(); + for (var4 = 0; var4 < var3; ++var4) { + this.retextureFrom[var4] = (short)var1.method43(); + this.retextureTo[var4] = (short)var1.method43(); } - } else if(var2 == 42) { + } else if (var2 == 42) { this.shiftClickIndex0 = var1.readByte(); - } else if(var2 == 65) { + } else if (var2 == 65) { this.isTradable = true; - } else if(var2 == 78) { - this.maleModel2 = var1.__ag_302(); - } else if(var2 == 79) { - this.femaleModel2 = var1.__ag_302(); - } else if(var2 == 90) { - this.maleHeadModel = var1.__ag_302(); - } else if(var2 == 91) { - this.femaleHeadModel = var1.__ag_302(); - } else if(var2 == 92) { - this.maleHeadModel2 = var1.__ag_302(); - } else if(var2 == 93) { - this.femaleHeadModel2 = var1.__ag_302(); - } else if(var2 == 95) { - this.zan2d = var1.__ag_302(); - } else if(var2 == 97) { - this.note = var1.__ag_302(); - } else if(var2 == 98) { - this.noteTemplate = var1.__ag_302(); - } else if(var2 >= 100 && var2 < 110) { - if(this.__az == null) { - this.__az = new int[10]; - this.__au = new int[10]; + } else if (var2 == 78) { + this.maleModel2 = var1.method43(); + } else if (var2 == 79) { + this.femaleModel2 = var1.method43(); + } else if (var2 == 90) { + this.maleHeadModel = var1.method43(); + } else if (var2 == 91) { + this.femaleHeadModel = var1.method43(); + } else if (var2 == 92) { + this.maleHeadModel2 = var1.method43(); + } else if (var2 == 93) { + this.femaleHeadModel2 = var1.method43(); + } else if (var2 == 95) { + this.zan2d = var1.method43(); + } else if (var2 == 97) { + this.note = var1.method43(); + } else if (var2 == 98) { + this.noteTemplate = var1.method43(); + } else if (var2 >= 100 && var2 < 110) { + if (this.field436 == null) { + this.field436 = new int[10]; + this.field437 = new int[10]; } - this.__az[var2 - 100] = var1.__ag_302(); - this.__au[var2 - 100] = var1.__ag_302(); - } else if(var2 == 110) { - this.resizeX = var1.__ag_302(); - } else if(var2 == 111) { - this.resizeY = var1.__ag_302(); - } else if(var2 == 112) { - this.resizeZ = var1.__ag_302(); - } else if(var2 == 113) { + this.field436[var2 - 100] = var1.method43(); + this.field437[var2 - 100] = var1.method43(); + } else if (var2 == 110) { + this.resizeX = var1.method43(); + } else if (var2 == 111) { + this.resizeY = var1.method43(); + } else if (var2 == 112) { + this.resizeZ = var1.method43(); + } else if (var2 == 113) { this.ambient = var1.readByte(); - } else if(var2 == 114) { + } else if (var2 == 114) { this.contrast = var1.readByte(); - } else if(var2 == 115) { + } else if (var2 == 115) { this.int1 = var1.readUnsignedByte(); - } else if(var2 == 139) { - this.unnotedId = var1.__ag_302(); - } else if(var2 == 140) { - this.notedId = var1.__ag_302(); - } else if(var2 == 148) { - this.placeholder = var1.__ag_302(); - } else if(var2 == 149) { - this.placeholderTemplate = var1.__ag_302(); - } else if(var2 == 249) { + } else if (var2 == 139) { + this.unnotedId = var1.method43(); + } else if (var2 == 140) { + this.notedId = var1.method43(); + } else if (var2 == 148) { + this.placeholder = var1.method43(); + } else if (var2 == 149) { + this.placeholderTemplate = var1.method43(); + } else if (var2 == 249) { this.params = AbstractIndexCache.readStringIntParameters(var1, this.params); } } @@ -490,8 +484,8 @@ public class ItemDefinition extends DualNode { signature = "(Ljv;Ljv;I)V", garbageValue = "2051877377" ) - void __o_426(ItemDefinition var1, ItemDefinition var2) { - this.__a = var1.__a; + void method140(ItemDefinition var1, ItemDefinition var2) { + this.field435 = var1.field435; this.zoom2d = var1.zoom2d; this.xan2d = var1.xan2d; this.yan2d = var1.yan2d; @@ -513,8 +507,8 @@ public class ItemDefinition extends DualNode { signature = "(Ljv;Ljv;I)V", garbageValue = "227754762" ) - void __u_427(ItemDefinition var1, ItemDefinition var2) { - this.__a = var1.__a; + void method141(ItemDefinition var1, ItemDefinition var2) { + this.field435 = var1.field435; this.zoom2d = var1.zoom2d; this.xan2d = var1.xan2d; this.yan2d = var1.yan2d; @@ -541,8 +535,8 @@ public class ItemDefinition extends DualNode { this.int1 = var2.int1; this.groundActions = var2.groundActions; this.inventoryActions = new String[5]; - if(var2.inventoryActions != null) { - for(int var3 = 0; var3 < 4; ++var3) { + if (var2.inventoryActions != null) { + for (int var3 = 0; var3 < 4; ++var3) { this.inventoryActions[var3] = var2.inventoryActions[var3]; } } @@ -556,8 +550,8 @@ public class ItemDefinition extends DualNode { signature = "(Ljv;Ljv;I)V", garbageValue = "2084647027" ) - void __g_428(ItemDefinition var1, ItemDefinition var2) { - this.__a = var1.__a; + void method142(ItemDefinition var1, ItemDefinition var2) { + this.field435 = var1.field435; this.zoom2d = var1.zoom2d; this.xan2d = var1.xan2d; this.yan2d = var1.yan2d; @@ -580,39 +574,39 @@ public class ItemDefinition extends DualNode { signature = "(II)Ldw;", garbageValue = "-223149161" ) - public final ModelData __l_429(int var1) { - int var3; - if(this.__az != null && var1 > 1) { - int var2 = -1; + public final ModelData method143(int var1) { + int var2; + if (this.field436 != null && var1 > 1) { + int var3 = -1; - for(var3 = 0; var3 < 10; ++var3) { - if(var1 >= this.__au[var3] && this.__au[var3] != 0) { - var2 = this.__az[var3]; + for (var2 = 0; var2 < 10; ++var2) { + if (var1 >= this.field437[var2] && this.field437[var2] != 0) { + var3 = this.field436[var2]; } } - if(var2 != -1) { - return Skills.getItemDefinition(var2).__l_429(1); + if (var3 != -1) { + return Skills.getItemDefinition(var3).method143(1); } } - ModelData var4 = ModelData.method2788(ItemDefinition_modelIndexCache, this.__a, 0); - if(var4 == null) { + ModelData var4 = ModelData.method2788(ItemDefinition_modelIndexCache, this.field435, 0); + if (var4 == null) { return null; } else { - if(this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { - var4.__y_227(this.resizeX, this.resizeY, this.resizeZ); + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { + var4.method215(this.resizeX, this.resizeY, this.resizeZ); } - if(this.recolorFrom != null) { - for(var3 = 0; var3 < this.recolorFrom.length; ++var3) { - var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); + if (this.recolorFrom != null) { + for (var2 = 0; var2 < this.recolorFrom.length; ++var2) { + var4.recolor(this.recolorFrom[var2], this.recolorTo[var2]); } } - if(this.retextureFrom != null) { - for(var3 = 0; var3 < this.retextureFrom.length; ++var3) { - var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); + if (this.retextureFrom != null) { + for (var2 = 0; var2 < this.retextureFrom.length; ++var2) { + var4.retexture(this.retextureFrom[var2], this.retextureTo[var2]); } } @@ -627,41 +621,41 @@ public class ItemDefinition extends DualNode { ) @Export("getModel") public final Model getModel(int var1) { - if(this.__az != null && var1 > 1) { + if (this.field436 != null && var1 > 1) { int var2 = -1; - for(int var3 = 0; var3 < 10; ++var3) { - if(var1 >= this.__au[var3] && this.__au[var3] != 0) { - var2 = this.__az[var3]; + for (int var3 = 0; var3 < 10; ++var3) { + if (var1 >= this.field437[var3] && this.field437[var3] != 0) { + var2 = this.field436[var3]; } } - if(var2 != -1) { + if (var2 != -1) { return Skills.getItemDefinition(var2).getModel(1); } } Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); - if(var5 != null) { + if (var5 != null) { return var5; } else { - ModelData var6 = ModelData.method2788(ItemDefinition_modelIndexCache, this.__a, 0); - if(var6 == null) { + ModelData var6 = ModelData.method2788(ItemDefinition_modelIndexCache, this.field435, 0); + if (var6 == null) { return null; } else { - if(this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { - var6.__y_227(this.resizeX, this.resizeY, this.resizeZ); + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { + var6.method215(this.resizeX, this.resizeY, this.resizeZ); } int var4; - if(this.recolorFrom != null) { - for(var4 = 0; var4 < this.recolorFrom.length; ++var4) { + if (this.recolorFrom != null) { + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); } } - if(this.retextureFrom != null) { - for(var4 = 0; var4 < this.retextureFrom.length; ++var4) { + if (this.retextureFrom != null) { + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); } } @@ -679,17 +673,17 @@ public class ItemDefinition extends DualNode { signature = "(IB)Ljv;", garbageValue = "0" ) - public ItemDefinition __x_430(int var1) { - if(this.__az != null && var1 > 1) { + public ItemDefinition method144(int var1) { + if (this.field436 != null && var1 > 1) { int var2 = -1; - for(int var3 = 0; var3 < 10; ++var3) { - if(var1 >= this.__au[var3] && this.__au[var3] != 0) { - var2 = this.__az[var3]; + for (int var3 = 0; var3 < 10; ++var3) { + if (var1 >= this.field437[var3] && this.field437[var3] != 0) { + var2 = this.field436[var3]; } } - if(var2 != -1) { + if (var2 != -1) { return Skills.getItemDefinition(var2); } } @@ -702,29 +696,29 @@ public class ItemDefinition extends DualNode { signature = "(ZI)Z", garbageValue = "-918880706" ) - public final boolean __z_431(boolean var1) { + public final boolean method145(boolean var1) { int var2 = this.maleModel; int var3 = this.maleModel1; int var4 = this.maleModel2; - if(var1) { + if (var1) { var2 = this.femaleModel; var3 = this.femaleModel1; var4 = this.femaleModel2; } - if(var2 == -1) { + if (var2 == -1) { return true; } else { boolean var5 = true; - if(!ItemDefinition_modelIndexCache.tryLoadRecord(var2, 0)) { + if (!ItemDefinition_modelIndexCache.tryLoadRecord(var2, 0)) { var5 = false; } - if(var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var3, 0)) { var5 = false; } - if(var4 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var4, 0)) { + if (var4 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var4, 0)) { var5 = false; } @@ -737,23 +731,23 @@ public class ItemDefinition extends DualNode { signature = "(ZB)Ldw;", garbageValue = "-123" ) - public final ModelData __j_432(boolean var1) { + public final ModelData method146(boolean var1) { int var2 = this.maleModel; int var3 = this.maleModel1; int var4 = this.maleModel2; - if(var1) { + if (var1) { var2 = this.femaleModel; var3 = this.femaleModel1; var4 = this.femaleModel2; } - if(var2 == -1) { + if (var2 == -1) { return null; } else { ModelData var5 = ModelData.method2788(ItemDefinition_modelIndexCache, var2, 0); - if(var3 != -1) { + if (var3 != -1) { ModelData var6 = ModelData.method2788(ItemDefinition_modelIndexCache, var3, 0); - if(var4 != -1) { + if (var4 != -1) { ModelData var7 = ModelData.method2788(ItemDefinition_modelIndexCache, var4, 0); ModelData[] var8 = new ModelData[]{var5, var6, var7}; var5 = new ModelData(var8, 3); @@ -763,23 +757,23 @@ public class ItemDefinition extends DualNode { } } - if(!var1 && this.maleOffset != 0) { - var5.__z_225(0, this.maleOffset, 0); + if (!var1 && this.maleOffset != 0) { + var5.method213(0, this.maleOffset, 0); } - if(var1 && this.femaleOffset != 0) { - var5.__z_225(0, this.femaleOffset, 0); + if (var1 && this.femaleOffset != 0) { + var5.method213(0, this.femaleOffset, 0); } int var9; - if(this.recolorFrom != null) { - for(var9 = 0; var9 < this.recolorFrom.length; ++var9) { + if (this.recolorFrom != null) { + for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); } } - if(this.retextureFrom != null) { - for(var9 = 0; var9 < this.retextureFrom.length; ++var9) { + if (this.retextureFrom != null) { + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); } } @@ -793,23 +787,23 @@ public class ItemDefinition extends DualNode { signature = "(ZI)Z", garbageValue = "-998582497" ) - public final boolean __s_433(boolean var1) { + public final boolean method147(boolean var1) { int var2 = this.maleHeadModel; int var3 = this.maleHeadModel2; - if(var1) { + if (var1) { var2 = this.femaleHeadModel; var3 = this.femaleHeadModel2; } - if(var2 == -1) { + if (var2 == -1) { return true; } else { boolean var4 = true; - if(!ItemDefinition_modelIndexCache.tryLoadRecord(var2, 0)) { + if (!ItemDefinition_modelIndexCache.tryLoadRecord(var2, 0)) { var4 = false; } - if(var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var3, 0)) { var4 = false; } @@ -822,33 +816,33 @@ public class ItemDefinition extends DualNode { signature = "(ZI)Ldw;", garbageValue = "-1820885439" ) - public final ModelData __t_434(boolean var1) { + public final ModelData method148(boolean var1) { int var2 = this.maleHeadModel; int var3 = this.maleHeadModel2; - if(var1) { + if (var1) { var2 = this.femaleHeadModel; var3 = this.femaleHeadModel2; } - if(var2 == -1) { + if (var2 == -1) { return null; } else { ModelData var4 = ModelData.method2788(ItemDefinition_modelIndexCache, var2, 0); - if(var3 != -1) { + if (var3 != -1) { ModelData var5 = ModelData.method2788(ItemDefinition_modelIndexCache, var3, 0); ModelData[] var6 = new ModelData[]{var4, var5}; var4 = new ModelData(var6, 2); } int var7; - if(this.recolorFrom != null) { - for(var7 = 0; var7 < this.recolorFrom.length; ++var7) { + if (this.recolorFrom != null) { + for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); } } - if(this.retextureFrom != null) { - for(var7 = 0; var7 < this.retextureFrom.length; ++var7) { + if (this.retextureFrom != null) { + for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); } } @@ -864,20 +858,20 @@ public class ItemDefinition extends DualNode { ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; - int var3; - if(var4 == null) { - var3 = var2; + IterableNodeHashTable var3 = this.params; + int var4; + if (var3 == null) { + var4 = var2; } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); - if(var5 == null) { - var3 = var2; + IntegerNode var5 = (IntegerNode)var3.get((long)var1); + if (var5 == null) { + var4 = var2; } else { - var3 = var5.integer; + var4 = var5.integer; } } - return var3; + return var4; } @ObfuscatedName("h") @@ -897,6 +891,12 @@ public class ItemDefinition extends DualNode { ) @Export("getShiftClickIndex") public int getShiftClickIndex() { - return this.shiftClickIndex0 != -1 && this.inventoryActions != null?(this.shiftClickIndex0 >= 0?(this.inventoryActions[this.shiftClickIndex0] != null?this.shiftClickIndex0:-1):("Drop".equalsIgnoreCase(this.inventoryActions[4])?4:-1)):-1; + return this.shiftClickIndex0 != -1 && this.inventoryActions != null ? (this.shiftClickIndex0 >= 0 ? (this.inventoryActions[this.shiftClickIndex0] != null ? this.shiftClickIndex0 : -1) : ("Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1)) : -1; + } + + static { + ItemDefinition_cached = new EvictingDualNodeHashTable(64); + ItemDefinition_cachedModels = new EvictingDualNodeHashTable(50); + Sprite_cached = new EvictingDualNodeHashTable(200); } } diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index da2bea045e..ed7ebad7ad 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueue.java +++ b/runescape-client/src/main/java/IterableDualNodeQueue.java @@ -29,7 +29,7 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedName("m") @Export("clear") public void clear() { - while(this.sentinel.previousDual != this.sentinel) { + while (this.sentinel.previousDual != this.sentinel) { this.sentinel.previousDual.removeDual(); } @@ -41,7 +41,7 @@ public class IterableDualNodeQueue implements Iterable { ) @Export("add") public void add(DualNode var1) { - if(var1.nextDual != null) { + if (var1.nextDual != null) { var1.removeDual(); } @@ -55,9 +55,9 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedSignature( signature = "()Lfn;" ) - public DualNode __q_448() { + public DualNode method149() { DualNode var1 = this.sentinel.previousDual; - if(var1 == this.sentinel) { + if (var1 == this.sentinel) { return null; } else { var1.removeDual(); @@ -69,23 +69,23 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedSignature( signature = "()Lfn;" ) - public DualNode __w_449() { - return this.__o_450((DualNode)null); + public DualNode method150() { + return this.method151((DualNode)null); } @ObfuscatedName("o") @ObfuscatedSignature( signature = "(Lfn;)Lfn;" ) - DualNode __o_450(DualNode var1) { + DualNode method151(DualNode var1) { DualNode var2; - if(var1 == null) { + if (var1 == null) { var2 = this.sentinel.previousDual; } else { var2 = var1; } - if(var2 == this.sentinel) { + if (var2 == this.sentinel) { this.head = null; return null; } else { @@ -98,9 +98,9 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedSignature( signature = "()Lfn;" ) - public DualNode __u_451() { + public DualNode method152() { DualNode var1 = this.head; - if(var1 == this.sentinel) { + if (var1 == this.sentinel) { this.head = null; return null; } else { diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java index 76c1205ba7..336fe57531 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java +++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java @@ -17,51 +17,51 @@ public class IterableDualNodeQueueIterator implements Iterator { @ObfuscatedSignature( signature = "Lfn;" ) - DualNode __f; + DualNode field438; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lfn;" ) - DualNode __q; + DualNode field439; @ObfuscatedSignature( signature = "(Ljc;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { - this.__q = null; + this.field439 = null; this.queue = var1; - this.__f = this.queue.sentinel.previousDual; - this.__q = null; + this.field438 = this.queue.sentinel.previousDual; + this.field439 = null; } @Export("next") @ObfuscatedName("next") public Object next() { - DualNode var1 = this.__f; - if(var1 == this.queue.sentinel) { + DualNode var1 = this.field438; + if (var1 == this.queue.sentinel) { var1 = null; - this.__f = null; + this.field438 = null; } else { - this.__f = var1.previousDual; + this.field438 = var1.previousDual; } - this.__q = var1; + this.field439 = var1; return var1; } @Export("hasNext") @ObfuscatedName("hasNext") public boolean hasNext() { - return this.queue.sentinel != this.__f; + return this.queue.sentinel != this.field438; } @ObfuscatedName("remove") - public void __remove_442() { - if(this.__q == null) { + public void method153() { + if (this.field439 == null) { throw new IllegalStateException(); } else { - this.__q.removeDual(); - this.__q = null; + this.field439.removeDual(); + this.field439 = null; } } } diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java index 6a09c766a7..153160f944 100644 --- a/runescape-client/src/main/java/IterableNodeDeque.java +++ b/runescape-client/src/main/java/IterableNodeDeque.java @@ -29,7 +29,7 @@ public class IterableNodeDeque implements Iterable { @ObfuscatedName("m") @Export("clear") public void clear() { - while(this.sentinel.previous != this.sentinel) { + while (this.sentinel.previous != this.sentinel) { this.sentinel.previous.remove(); } @@ -41,7 +41,7 @@ public class IterableNodeDeque implements Iterable { ) @Export("addFirst") public void addFirst(Node var1) { - if(var1.next != null) { + if (var1.next != null) { var1.remove(); } @@ -57,7 +57,7 @@ public class IterableNodeDeque implements Iterable { ) @Export("addLast") public void addLast(Node var1) { - if(var1.next != null) { + if (var1.next != null) { var1.remove(); } @@ -83,13 +83,13 @@ public class IterableNodeDeque implements Iterable { @Export("previousOrLast") Node previousOrLast(Node var1) { Node var2; - if(var1 == null) { + if (var1 == null) { var2 = this.sentinel.previous; } else { var2 = var1; } - if(var2 == this.sentinel) { + if (var2 == this.sentinel) { this.current = null; return null; } else { @@ -105,7 +105,7 @@ public class IterableNodeDeque implements Iterable { @Export("previous") public Node previous() { Node var1 = this.current; - if(var1 == this.sentinel) { + if (var1 == this.sentinel) { this.current = null; return null; } else { @@ -132,7 +132,7 @@ public class IterableNodeDeque implements Iterable { ) @Export("IterableNodeDeque_addBefore") public static void IterableNodeDeque_addBefore(Node var0, Node var1) { - if(var0.next != null) { + if (var0.next != null) { var0.remove(); } diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java index dd0e92ce91..0c3d2349f1 100644 --- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java @@ -17,64 +17,64 @@ public class IterableNodeDequeDescendingIterator implements Iterator { @ObfuscatedSignature( signature = "Lgw;" ) - Node __f; + Node field440; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lgw;" ) - Node __q; + Node field441; @ObfuscatedSignature( signature = "(Lja;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { - this.__q = null; - this.__u_443(var1); + this.field441 = null; + this.method154(var1); } @ObfuscatedName("u") @ObfuscatedSignature( signature = "(Lja;)V" ) - void __u_443(IterableNodeDeque var1) { + void method154(IterableNodeDeque var1) { this.deque = var1; - this.__g_444(); + this.method155(); } @ObfuscatedName("g") - void __g_444() { - this.__f = this.deque != null?this.deque.sentinel.previous:null; - this.__q = null; + void method155() { + this.field440 = this.deque != null ? this.deque.sentinel.previous : null; + this.field441 = null; } @Export("hasNext") @ObfuscatedName("hasNext") public boolean hasNext() { - return this.deque.sentinel != this.__f; + return this.deque.sentinel != this.field440; } @Export("next") @ObfuscatedName("next") public Object next() { - Node var1 = this.__f; - if(var1 == this.deque.sentinel) { + Node var1 = this.field440; + if (var1 == this.deque.sentinel) { var1 = null; - this.__f = null; + this.field440 = null; } else { - this.__f = var1.previous; + this.field440 = var1.previous; } - this.__q = var1; + this.field441 = var1; return var1; } @ObfuscatedName("remove") - public void __remove_447() { - if(this.__q == null) { + public void method156() { + if (this.field441 == null) { throw new IllegalStateException(); } else { - this.__q.remove(); - this.__q = null; + this.field441.remove(); + this.field441 = null; } } } diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index a3404858e8..93cecb53a0 100644 --- a/runescape-client/src/main/java/IterableNodeHashTable.java +++ b/runescape-client/src/main/java/IterableNodeHashTable.java @@ -37,7 +37,7 @@ public final class IterableNodeHashTable implements Iterable { this.size = var1; this.buckets = new Node[var1]; - for(int var2 = 0; var2 < var1; ++var2) { + for (int var2 = 0; var2 < var1; ++var2) { Node var3 = this.buckets[var2] = new Node(); var3.previous = var3; var3.next = var3; @@ -53,8 +53,8 @@ public final class IterableNodeHashTable implements Iterable { public Node get(long var1) { Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; - for(this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { - if(this.currentGet.key == var1) { + for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { + if (this.currentGet.key == var1) { Node var4 = this.currentGet; this.currentGet = this.currentGet.previous; return var4; @@ -71,7 +71,7 @@ public final class IterableNodeHashTable implements Iterable { ) @Export("put") public void put(Node var1, long var2) { - if(var1.next != null) { + if (var1.next != null) { var1.remove(); } @@ -86,12 +86,12 @@ public final class IterableNodeHashTable implements Iterable { @ObfuscatedName("q") @Export("clear") public void clear() { - for(int var1 = 0; var1 < this.size; ++var1) { + for (int var1 = 0; var1 < this.size; ++var1) { Node var2 = this.buckets[var1]; - while(true) { + while (true) { Node var3 = var2.previous; - if(var3 == var2) { + if (var3 == var2) { break; } @@ -120,21 +120,20 @@ public final class IterableNodeHashTable implements Iterable { @Export("next") public Node next() { Node var1; - if(this.index > 0 && this.buckets[this.index - 1] != this.current) { + if (this.index > 0 && this.buckets[this.index - 1] != this.current) { var1 = this.current; this.current = var1.previous; return var1; } else { - do { - if(this.index >= this.size) { - return null; - } - + while (this.index < this.size) { var1 = this.buckets[this.index++].previous; - } while(var1 == this.buckets[this.index - 1]); + if (var1 != this.buckets[this.index - 1]) { + this.current = var1.previous; + return var1; + } + } - this.current = var1.previous; - return var1; + return null; } } diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index 87ce727ad7..9c6b6c8a3d 100644 --- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java +++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java @@ -17,68 +17,67 @@ public class IterableNodeHashTableIterator implements Iterator { @ObfuscatedSignature( signature = "Lgw;" ) - Node __f; + Node field442; @ObfuscatedName("q") - int __q; + int field443; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lgw;" ) - Node __w; + Node field444; @ObfuscatedSignature( signature = "(Llh;)V" ) IterableNodeHashTableIterator(IterableNodeHashTable var1) { - this.__w = null; + this.field444 = null; this.hashTable = var1; - this.__u_483(); + this.method157(); } @ObfuscatedName("u") - void __u_483() { - this.__f = this.hashTable.buckets[0].previous; - this.__q = 1; - this.__w = null; + void method157() { + this.field442 = this.hashTable.buckets[0].previous; + this.field443 = 1; + this.field444 = null; } @Export("next") @ObfuscatedName("next") public Object next() { Node var1; - if(this.hashTable.buckets[this.__q - 1] != this.__f) { - var1 = this.__f; - this.__f = var1.previous; - this.__w = var1; + if (this.hashTable.buckets[this.field443 - 1] != this.field442) { + var1 = this.field442; + this.field442 = var1.previous; + this.field444 = var1; return var1; } else { - do { - if(this.__q >= this.hashTable.size) { - return null; + while (this.field443 < this.hashTable.size) { + var1 = this.hashTable.buckets[this.field443++].previous; + if (var1 != this.hashTable.buckets[this.field443 - 1]) { + this.field442 = var1.previous; + this.field444 = var1; + return var1; } + } - var1 = this.hashTable.buckets[this.__q++].previous; - } while(var1 == this.hashTable.buckets[this.__q - 1]); - - this.__f = var1.previous; - this.__w = var1; - return var1; + return null; } } @Export("hasNext") @ObfuscatedName("hasNext") public boolean hasNext() { - if(this.hashTable.buckets[this.__q - 1] != this.__f) { + if (this.hashTable.buckets[this.field443 - 1] != this.field442) { return true; } else { - while(this.__q < this.hashTable.size) { - if(this.hashTable.buckets[this.__q++].previous != this.hashTable.buckets[this.__q - 1]) { - this.__f = this.hashTable.buckets[this.__q - 1].previous; + while (this.field443 < this.hashTable.size) { + if (this.hashTable.buckets[this.field443++].previous != this.hashTable.buckets[this.field443 - 1]) { + this.field442 = this.hashTable.buckets[this.field443 - 1].previous; return true; } - this.__f = this.hashTable.buckets[this.__q - 1]; + this.field442 = this.hashTable.buckets[this.field443 - 1]; } return false; @@ -86,12 +85,12 @@ public class IterableNodeHashTableIterator implements Iterator { } @ObfuscatedName("remove") - public void __remove_486() { - if(this.__w == null) { + public void method158() { + if (this.field444 == null) { throw new IllegalStateException(); } else { - this.__w.remove(); - this.__w = null; + this.field444.remove(); + this.field444 = null; } } } diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index 7bd6aa523f..d788fc95c4 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -16,7 +16,7 @@ public final class KeyHandler implements KeyListener, FocusListener { @ObfuscatedGetter( intValue = -817957995 ) - static int __an_ra; + static int field445; @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lan;" @@ -45,43 +45,43 @@ public final class KeyHandler implements KeyListener, FocusListener { @Export("KeyHandler_pressedKeys") public static boolean[] KeyHandler_pressedKeys; @ObfuscatedName("cq") - static int[] __an_cq; + static int[] field446; @ObfuscatedName("ch") @ObfuscatedGetter( intValue = 1112094745 ) - static int __an_ch; + static int field447; @ObfuscatedName("cw") @ObfuscatedGetter( intValue = -1208053825 ) - static int __an_cw; + static int field448; @ObfuscatedName("cg") - static char[] __an_cg; + static char[] field449; @ObfuscatedName("cf") - static int[] __an_cf; + static int[] field450; @ObfuscatedName("cp") - public static int[] __an_cp; + public static int[] field451; @ObfuscatedName("cl") @ObfuscatedGetter( intValue = -674534717 ) - public static int __an_cl; + public static int field452; @ObfuscatedName("ct") @ObfuscatedGetter( intValue = -93280591 ) - static int __an_ct; + static int field453; @ObfuscatedName("cz") @ObfuscatedGetter( intValue = 2066759739 ) - static int __an_cz; + static int field454; @ObfuscatedName("cc") @ObfuscatedGetter( intValue = -1942898885 ) - static int __an_cc; + static int field455; @ObfuscatedName("ci") @ObfuscatedGetter( intValue = -474146073 @@ -98,57 +98,40 @@ public final class KeyHandler implements KeyListener, FocusListener { @Export("crossSprites") static Sprite[] crossSprites; - static { - KeyHandler_instance = new KeyHandler(); - KeyHandler_pressedKeys = new boolean[112]; - __an_cq = new int[128]; - __an_ch = 0; - __an_cw = 0; - __an_cg = new char[128]; - __an_cf = new int[128]; - __an_cp = new int[128]; - __an_cl = 0; - __an_ct = 0; - __an_cz = 0; - __an_cc = 0; - KeyHandler_idleCycles = 0; - KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; - } - @Export("keyPressed") @ObfuscatedName("keyPressed") public final synchronized void keyPressed(KeyEvent var1) { - if(KeyHandler_instance != null) { + if (KeyHandler_instance != null) { int var2 = var1.getKeyCode(); - if(var2 >= 0 && var2 < KeyHandler_keyCodes.length) { + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { var2 = KeyHandler_keyCodes[var2]; - if((var2 & 128) != 0) { + if ((var2 & 128) != 0) { var2 = -1; } } else { var2 = -1; } - if(__an_cw >= 0 && var2 >= 0) { - __an_cq[__an_cw] = var2; - __an_cw = __an_cw + 1 & 127; - if(__an_ch == __an_cw) { - __an_cw = -1; + if (field448 >= 0 && var2 >= 0) { + field446[field448] = var2; + field448 = field448 + 1 & 127; + if (field447 == field448) { + field448 = -1; } } int var3; - if(var2 >= 0) { - var3 = __an_cz + 1 & 127; - if(var3 != __an_ct) { - __an_cf[__an_cz] = var2; - __an_cg[__an_cz] = 0; - __an_cz = var3; + if (var2 >= 0) { + var3 = field454 + 1 & 127; + if (var3 != field453) { + field450[field454] = var2; + field449[field454] = 0; + field454 = var3; } } var3 = var1.getModifiers(); - if((var3 & 10) != 0 || var2 == 85 || var2 == 10) { + if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { var1.consume(); } } @@ -163,8 +146,8 @@ public final class KeyHandler implements KeyListener, FocusListener { @Export("focusLost") @ObfuscatedName("focusLost") public final synchronized void focusLost(FocusEvent var1) { - if(KeyHandler_instance != null) { - __an_cw = -1; + if (KeyHandler_instance != null) { + field448 = -1; } } @@ -172,19 +155,19 @@ public final class KeyHandler implements KeyListener, FocusListener { @Export("keyReleased") @ObfuscatedName("keyReleased") public final synchronized void keyReleased(KeyEvent var1) { - if(KeyHandler_instance != null) { + if (KeyHandler_instance != null) { int var2 = var1.getKeyCode(); - if(var2 >= 0 && var2 < KeyHandler_keyCodes.length) { + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { var2 = KeyHandler_keyCodes[var2] & -129; } else { var2 = -1; } - if(__an_cw >= 0 && var2 >= 0) { - __an_cq[__an_cw] = ~var2; - __an_cw = __an_cw + 1 & 127; - if(__an_ch == __an_cw) { - __an_cw = -1; + if (field448 >= 0 && var2 >= 0) { + field446[field448] = ~var2; + field448 = field448 + 1 & 127; + if (field447 == field448) { + field448 = -1; } } } @@ -195,22 +178,22 @@ public final class KeyHandler implements KeyListener, FocusListener { @Export("keyTyped") @ObfuscatedName("keyTyped") public final void keyTyped(KeyEvent var1) { - if(KeyHandler_instance != null) { + if (KeyHandler_instance != null) { char var2 = var1.getKeyChar(); - if(var2 != 0 && var2 != '\uffff') { + if (var2 != 0 && var2 != '\uffff') { boolean var3; - if(var2 > 0 && var2 < 128 || var2 >= 160 && var2 <= 255) { + if (var2 > 0 && var2 < 128 || var2 >= 160 && var2 <= 255) { var3 = true; } else { - label63: { - if(var2 != 0) { - char[] var7 = class304.cp1252AsciiExtension; + label56: { + if (var2 != 0) { + char[] var4 = class304.cp1252AsciiExtension; - for(int var5 = 0; var5 < var7.length; ++var5) { - char var6 = var7[var5]; - if(var2 == var6) { + for (int var5 = 0; var5 < var4.length; ++var5) { + char var6 = var4[var5]; + if (var2 == var6) { var3 = true; - break label63; + break label56; } } } @@ -219,12 +202,12 @@ public final class KeyHandler implements KeyListener, FocusListener { } } - if(var3) { - int var4 = __an_cz + 1 & 127; - if(var4 != __an_ct) { - __an_cf[__an_cz] = -1; - __an_cg[__an_cz] = var2; - __an_cz = var4; + if (var3) { + int var7 = field454 + 1 & 127; + if (var7 != field453) { + field450[field454] = -1; + field449[field454] = var2; + field454 = var7; } } } @@ -241,11 +224,28 @@ public final class KeyHandler implements KeyListener, FocusListener { static String method839() { String var0 = ""; - Message var2; - for(Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0 = var0 + var2.sender + ':' + var2.text + '\n') { - var2 = (Message)var1.next(); + Message var1; + for (Iterator var2 = Messages.Messages_hashTable.iterator(); var2.hasNext(); var0 = var0 + var1.sender + ':' + var1.text + '\n') { + var1 = (Message)var2.next(); } return var0; } + + static { + KeyHandler_instance = new KeyHandler(); + KeyHandler_pressedKeys = new boolean[112]; + field446 = new int[128]; + field447 = 0; + field448 = 0; + field449 = new char[128]; + field450 = new int[128]; + field451 = new int[128]; + field452 = 0; + field453 = 0; + field454 = 0; + field455 = 0; + KeyHandler_idleCycles = 0; + KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; + } } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index bb2b7caf1e..920c77abf6 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -17,12 +17,12 @@ public class KitDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache __im_f; + public static AbstractIndexCache field456; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 235389995 ) - public static int __im_q; + public static int field457; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Ler;" @@ -33,9 +33,9 @@ public class KitDefinition extends DualNode { @ObfuscatedGetter( intValue = 1619779051 ) - public int __o; + public int field458; @ObfuscatedName("u") - int[] __u; + int[] field459; @ObfuscatedName("g") @Export("recolorFrom") short[] recolorFrom; @@ -52,16 +52,12 @@ public class KitDefinition extends DualNode { @Export("archives") int[] archives; @ObfuscatedName("k") - public boolean __k; - - static { - KitDefinition_cached = new EvictingDualNodeHashTable(64); - } + public boolean field460; KitDefinition() { - this.__o = -1; + this.field458 = -1; this.archives = new int[]{-1, -1, -1, -1, -1}; - this.__k = false; + this.field460 = false; } @ObfuscatedName("f") @@ -71,9 +67,9 @@ public class KitDefinition extends DualNode { ) @Export("read") void read(Buffer var1) { - while(true) { + while (true) { int var2 = var1.readUnsignedByte(); - if(var2 == 0) { + if (var2 == 0) { return; } @@ -88,40 +84,40 @@ public class KitDefinition extends DualNode { ) @Export("readNext") void readNext(Buffer var1, int var2) { - if(var2 == 1) { - this.__o = var1.readUnsignedByte(); + if (var2 == 1) { + this.field458 = var1.readUnsignedByte(); } else { int var3; int var4; - if(var2 == 2) { + if (var2 == 2) { var3 = var1.readUnsignedByte(); - this.__u = new int[var3]; + this.field459 = new int[var3]; - for(var4 = 0; var4 < var3; ++var4) { - this.__u[var4] = var1.__ag_302(); + for (var4 = 0; var4 < var3; ++var4) { + this.field459[var4] = var1.method43(); } - } else if(var2 == 3) { - this.__k = true; - } else if(var2 == 40) { + } else if (var2 == 3) { + this.field460 = true; + } else if (var2 == 40) { var3 = var1.readUnsignedByte(); this.recolorFrom = new short[var3]; this.recolorTo = new short[var3]; - for(var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.__ag_302(); - this.recolorTo[var4] = (short)var1.__ag_302(); + for (var4 = 0; var4 < var3; ++var4) { + this.recolorFrom[var4] = (short)var1.method43(); + this.recolorTo[var4] = (short)var1.method43(); } - } else if(var2 == 41) { + } else if (var2 == 41) { var3 = var1.readUnsignedByte(); this.retextureFrom = new short[var3]; this.retextureTo = new short[var3]; - for(var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.__ag_302(); - this.retextureTo[var4] = (short)var1.__ag_302(); + for (var4 = 0; var4 < var3; ++var4) { + this.retextureFrom[var4] = (short)var1.method43(); + this.retextureTo[var4] = (short)var1.method43(); } - } else if(var2 >= 60 && var2 < 70) { - this.archives[var2 - 60] = var1.__ag_302(); + } else if (var2 >= 60 && var2 < 70) { + this.archives[var2 - 60] = var1.method43(); } } @@ -132,14 +128,14 @@ public class KitDefinition extends DualNode { signature = "(I)Z", garbageValue = "-1250940659" ) - public boolean __w_413() { - if(this.__u == null) { + public boolean method159() { + if (this.field459 == null) { return true; } else { boolean var1 = true; - for(int var2 = 0; var2 < this.__u.length; ++var2) { - if(!__im_f.tryLoadRecord(this.__u[var2], 0)) { + for (int var2 = 0; var2 < this.field459.length; ++var2) { + if (!field456.tryLoadRecord(this.field459[var2], 0)) { var1 = false; } } @@ -153,32 +149,32 @@ public class KitDefinition extends DualNode { signature = "(B)Ldw;", garbageValue = "0" ) - public ModelData __o_414() { - if(this.__u == null) { + public ModelData method160() { + if (this.field459 == null) { return null; } else { - ModelData[] var1 = new ModelData[this.__u.length]; + ModelData[] var1 = new ModelData[this.field459.length]; - for(int var2 = 0; var2 < this.__u.length; ++var2) { - var1[var2] = ModelData.method2788(__im_f, this.__u[var2], 0); + for (int var2 = 0; var2 < this.field459.length; ++var2) { + var1[var2] = ModelData.method2788(field456, this.field459[var2], 0); } ModelData var4; - if(var1.length == 1) { + if (var1.length == 1) { var4 = var1[0]; } else { var4 = new ModelData(var1, var1.length); } int var3; - if(this.recolorFrom != null) { - for(var3 = 0; var3 < this.recolorFrom.length; ++var3) { + if (this.recolorFrom != null) { + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); } } - if(this.retextureFrom != null) { - for(var3 = 0; var3 < this.retextureFrom.length; ++var3) { + if (this.retextureFrom != null) { + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); } } @@ -192,11 +188,11 @@ public class KitDefinition extends DualNode { signature = "(I)Z", garbageValue = "742548471" ) - public boolean __u_415() { + public boolean method161() { boolean var1 = true; - for(int var2 = 0; var2 < 5; ++var2) { - if(this.archives[var2] != -1 && !__im_f.tryLoadRecord(this.archives[var2], 0)) { + for (int var2 = 0; var2 < 5; ++var2) { + if (this.archives[var2] != -1 && !field456.tryLoadRecord(this.archives[var2], 0)) { var1 = false; } } @@ -209,26 +205,26 @@ public class KitDefinition extends DualNode { signature = "(B)Ldw;", garbageValue = "-56" ) - public ModelData __g_416() { + public ModelData method162() { ModelData[] var1 = new ModelData[5]; int var2 = 0; - for(int var3 = 0; var3 < 5; ++var3) { - if(this.archives[var3] != -1) { - var1[var2++] = ModelData.method2788(__im_f, this.archives[var3], 0); + for (int var3 = 0; var3 < 5; ++var3) { + if (this.archives[var3] != -1) { + var1[var2++] = ModelData.method2788(field456, this.archives[var3], 0); } } ModelData var5 = new ModelData(var1, var2); int var4; - if(this.recolorFrom != null) { - for(var4 = 0; var4 < this.recolorFrom.length; ++var4) { + if (this.recolorFrom != null) { + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { var5.recolor(this.recolorFrom[var4], this.recolorTo[var4]); } } - if(this.retextureFrom != null) { - for(var4 = 0; var4 < this.retextureFrom.length; ++var4) { + if (this.retextureFrom != null) { + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]); } } @@ -244,19 +240,23 @@ public class KitDefinition extends DualNode { public static String method4866(Buffer var0) { String var1; try { - int var2 = var0.__ae_307(); - if(var2 > 32767) { + int var2 = var0.method48(); + if (var2 > 32767) { var2 = 32767; } byte[] var3 = new byte[var2]; - var0.index += class303.huffman.__f_294(var0.array, var0.index, var3, 0, var2); + var0.index += class303.huffman.method128(var0.array, var0.index, var3, 0, var2); String var4 = WidgetGroupParent.decodeStringCp1252(var3, 0, var2); var1 = var4; - } catch (Exception var6) { + } catch (Exception var5) { var1 = "Cabbage"; } return var1; } + + static { + KitDefinition_cached = new EvictingDualNodeHashTable(64); + } } diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index b8722c44a4..54598f5db2 100644 --- a/runescape-client/src/main/java/Link.java +++ b/runescape-client/src/main/java/Link.java @@ -10,21 +10,22 @@ public class Link { @ObfuscatedSignature( signature = "Lgh;" ) - public Link __m; + public Link field461; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lgh;" ) - public Link __f; + public Link field462; @ObfuscatedName("m") @Export("remove") public void remove() { - if(this.__f != null) { - this.__f.__m = this.__m; - this.__m.__f = this.__f; - this.__m = null; - this.__f = null; + if (this.field462 != null) { + this.field462.field461 = this.field461; + this.field461.field462 = this.field462; + this.field461 = null; + this.field462 = null; } + } } diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java index c74ef769cc..d83b58e84d 100644 --- a/runescape-client/src/main/java/LinkDeque.java +++ b/runescape-client/src/main/java/LinkDeque.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,45 +9,45 @@ public class LinkDeque { @ObfuscatedSignature( signature = "Lgh;" ) - Link __m; + Link field463; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lgh;" ) - Link __f; + Link field464; public LinkDeque() { - this.__m = new Link(); - this.__m.__m = this.__m; - this.__m.__f = this.__m; + this.field463 = new Link(); + this.field463.field461 = this.field463; + this.field463.field462 = this.field463; } @ObfuscatedName("m") @ObfuscatedSignature( signature = "(Lgh;)V" ) - public void __m_437(Link var1) { - if(var1.__f != null) { + public void method163(Link var1) { + if (var1.field462 != null) { var1.remove(); } - var1.__f = this.__m.__f; - var1.__m = this.__m; - var1.__f.__m = var1; - var1.__m.__f = var1; + var1.field462 = this.field463.field462; + var1.field461 = this.field463; + var1.field462.field461 = var1; + var1.field461.field462 = var1; } @ObfuscatedName("f") @ObfuscatedSignature( signature = "()Lgh;" ) - public Link __f_438() { - Link var1 = this.__m.__m; - if(var1 == this.__m) { - this.__f = null; + public Link method164() { + Link var1 = this.field463.field461; + if (var1 == this.field463) { + this.field464 = null; return null; } else { - this.__f = var1.__m; + this.field464 = var1.field461; return var1; } } @@ -57,13 +56,13 @@ public class LinkDeque { @ObfuscatedSignature( signature = "()Lgh;" ) - public Link __q_439() { - Link var1 = this.__f; - if(var1 == this.__m) { - this.__f = null; + public Link method165() { + Link var1 = this.field464; + if (var1 == this.field463) { + this.field464 = null; return null; } else { - this.__f = var1.__m; + this.field464 = var1.field461; return var1; } } diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 82123fb5af..646b5a23a1 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Login") public class Login { @ObfuscatedName("f") - static boolean __cu_f; + static boolean field465; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 1606541885 @@ -59,12 +59,12 @@ public class Login { @ObfuscatedGetter( intValue = 1077910071 ) - static int __cu_aj; + static int field466; @ObfuscatedName("ac") @ObfuscatedGetter( intValue = 1677133239 ) - static int __cu_ac; + static int field467; @ObfuscatedName("aw") @ObfuscatedGetter( intValue = 1861681835 @@ -90,14 +90,14 @@ public class Login { @Export("Login_password") static String Login_password; @ObfuscatedName("aa") - static boolean __cu_aa; + static boolean field468; @ObfuscatedName("ax") - static boolean __cu_ax; + static boolean field469; @ObfuscatedName("ai") @Export("otp") static String otp; @ObfuscatedName("ba") - static boolean __cu_ba; + static boolean field470; @ObfuscatedName("bb") @ObfuscatedGetter( intValue = 1769484271 @@ -129,12 +129,12 @@ public class Login { @ObfuscatedGetter( longValue = 803647694904294325L ) - static long __cu_bi; + static long field471; @ObfuscatedName("bz") @ObfuscatedGetter( longValue = -3234258972092460093L ) - static long __cu_bz; + static long field472; @ObfuscatedName("do") @ObfuscatedSignature( signature = "Lit;" @@ -142,34 +142,6 @@ public class Login { @Export("indexCache11") static IndexCache indexCache11; - static { - xPadding = 0; - loginBoxX = xPadding + 202; - Login_loadingPercent = 10; - Login_loadingText = ""; - __cu_aj = -1; - __cu_ac = 1; - loginIndex = 0; - Login_response0 = ""; - Login_response1 = ""; - Login_response2 = ""; - Login_response3 = ""; - Login_username = ""; - Login_password = ""; - __cu_aa = false; - __cu_ax = false; - __cu_ba = true; - currentLoginField = 0; - worldSelectOpen = false; - hoveredWorldIndex = -1; - worldSelectPage = 0; - worldSelectPagesCount = 0; - new DecimalFormat("##0.00"); - new class161(); - __cu_bi = -1L; - __cu_bz = -1L; - } - @ObfuscatedName("m") @ObfuscatedSignature( signature = "(Lir;II)Lhl;", @@ -177,7 +149,7 @@ public class Login { ) static MusicPatch method2045(AbstractIndexCache var0, int var1) { byte[] var2 = var0.takeRecordFlat(var1); - return var2 == null?null:new MusicPatch(var2); + return var2 == null ? null : new MusicPatch(var2); } @ObfuscatedName("m") @@ -186,24 +158,24 @@ public class Login { garbageValue = "-246495141" ) static void method2056() { - class248.__iu_e = new int[2000]; + class248.field1141 = new int[2000]; int var0 = 0; int var1 = 240; - int var3; - for(byte var2 = 12; var0 < 16; var1 -= var2) { - var3 = class277.method5355((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)((float)var0 * 0.425F / 16.0F + 0.075F)); - class248.__iu_e[var0] = var3; + int var2; + for (byte var3 = 12; var0 < 16; var1 -= var3) { + var2 = class277.method5355((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)((float)var0 * 0.425F / 16.0F + 0.075F)); + class248.field1141[var0] = var2; ++var0; } var1 = 48; - for(int var5 = var1 / 6; var0 < class248.__iu_e.length; var1 -= var5) { - var3 = var0 * 2; + for (int var5 = var1 / 6; var0 < class248.field1141.length; var1 -= var5) { + var2 = var0 * 2; - for(int var4 = class277.method5355((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < class248.__iu_e.length; ++var0) { - class248.__iu_e[var0] = var4; + for (int var4 = class277.method5355((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var2 && var0 < class248.field1141.length; ++var0) { + class248.field1141[var0] = var4; } } @@ -215,13 +187,13 @@ public class Login { garbageValue = "45" ) public static void method2076(AbstractIndexCache var0, int var1, int var2, int var3, boolean var4) { - class214.__hf_o = 1; - class214.__hf_u = var0; + class214.field1129 = 1; + class214.field1130 = var0; class30.musicTrackArchiveId = var1; GrandExchangeOffer.musicTrackFileId = var2; - WorldMapLabel.__aj_e = var3; + WorldMapLabel.field1039 = var3; RectangleMode.musicTrackBoolean = var4; - FaceNormal.__el_x = 10000; + FaceNormal.field344 = 10000; } @ObfuscatedName("gm") @@ -230,11 +202,39 @@ public class Login { garbageValue = "-1" ) static final int method2061() { - if(ReflectionCheck.clientPreferences.roofsHidden) { + if (ReflectionCheck.clientPreferences.roofsHidden) { return SoundSystem.plane; } else { int var0 = class32.getTileHeight(WorldMapSection1.cameraX, class11.cameraZ, SoundSystem.plane); - return var0 - GrandExchangeEvents.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.plane][WorldMapSection1.cameraX >> 7][class11.cameraZ >> 7] & 4) != 0?SoundSystem.plane:3; + return var0 - GrandExchangeEvents.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.plane][WorldMapSection1.cameraX >> 7][class11.cameraZ >> 7] & 4) != 0 ? SoundSystem.plane : 3; } } + + static { + xPadding = 0; + loginBoxX = xPadding + 202; + Login_loadingPercent = 10; + Login_loadingText = ""; + field466 = -1; + field467 = 1; + loginIndex = 0; + Login_response0 = ""; + Login_response1 = ""; + Login_response2 = ""; + Login_response3 = ""; + Login_username = ""; + Login_password = ""; + field468 = false; + field469 = false; + field470 = true; + currentLoginField = 0; + worldSelectOpen = false; + hoveredWorldIndex = -1; + worldSelectPage = 0; + worldSelectPagesCount = 0; + new DecimalFormat("##0.00"); + new class161(); + field471 = -1L; + field472 = -1L; + } } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index d3f674d1d9..95d3ad97ad 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -13,32 +13,32 @@ public class LoginPacket implements ClientPacketMarker { @ObfuscatedSignature( signature = "Lgl;" ) - public static final LoginPacket __gl_m; + public static final LoginPacket field473; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lgl;" ) - static final LoginPacket __gl_f; + static final LoginPacket field474; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lgl;" ) - public static final LoginPacket __gl_q; + public static final LoginPacket field475; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lgl;" ) - public static final LoginPacket __gl_w; + public static final LoginPacket field476; @ObfuscatedName("o") @ObfuscatedSignature( signature = "Lgl;" ) - static final LoginPacket __gl_o; + static final LoginPacket field477; @ObfuscatedName("g") @ObfuscatedSignature( signature = "[Lgl;" ) - static final LoginPacket[] __gl_g; + static final LoginPacket[] field478; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 1743806243 @@ -46,21 +46,6 @@ public class LoginPacket implements ClientPacketMarker { @Export("id") public final int id; - static { - __gl_m = new LoginPacket(14, 0); - __gl_f = new LoginPacket(15, 4); - __gl_q = new LoginPacket(16, -2); - __gl_w = new LoginPacket(18, -2); - __gl_o = new LoginPacket(27, 0); - __gl_g = new LoginPacket[32]; - LoginPacket[] var0 = WorldMapIcon2.method300(); - - for(int var1 = 0; var1 < var0.length; ++var1) { - __gl_g[var0[var1].id] = var0[var1]; - } - - } - @ObfuscatedSignature( signature = "(II)V", garbageValue = "0" @@ -76,39 +61,52 @@ public class LoginPacket implements ClientPacketMarker { ) @Export("getPreferencesFile") public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { - File var3 = new File(class168.__fs_o, "preferences" + var0 + ".dat"); - if(var3.exists()) { + File var3 = new File(class168.field1115, "preferences" + var0 + ".dat"); + if (var3.exists()) { try { - AccessFile var10 = new AccessFile(var3, "rw", 10000L); - return var10; - } catch (IOException var9) { - ; + AccessFile var11 = new AccessFile(var3, "rw", 10000L); + return var11; + } catch (IOException var10) { } } String var4 = ""; - if(PacketBuffer.__hx_z == 33) { + if (PacketBuffer.field667 == 33) { var4 = "_rc"; - } else if(PacketBuffer.__hx_z == 34) { + } else if (PacketBuffer.field667 == 34) { var4 = "_wip"; } File var5 = new File(WorldMapSection1.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); AccessFile var6; - if(!var2 && var5.exists()) { + if (!var2 && var5.exists()) { try { var6 = new AccessFile(var5, "rw", 10000L); return var6; - } catch (IOException var8) { - ; + } catch (IOException var9) { } } try { var6 = new AccessFile(var3, "rw", 10000L); return var6; - } catch (IOException var7) { + } catch (IOException var8) { throw new RuntimeException(); } } + + static { + field473 = new LoginPacket(14, 0); + field474 = new LoginPacket(15, 4); + field475 = new LoginPacket(16, -2); + field476 = new LoginPacket(18, -2); + field477 = new LoginPacket(27, 0); + field478 = new LoginPacket[32]; + LoginPacket[] var0 = WorldMapIcon2.method300(); + + for (int var1 = 0; var1 < var0.length; ++var1) { + field478[var0[var1].id] = var0[var1]; + } + + } } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index ddceffb8d9..6d73e2b166 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -9,8 +9,7 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("bp") -public class LoginScreenAnimation -{ +public class LoginScreenAnimation { @ObfuscatedName("m") @ObfuscatedSignature( signature = "[Llq;" @@ -90,65 +89,65 @@ public class LoginScreenAnimation this.field1006 = new int[256]; int var1; - for(var1 = 0; var1 < 64; ++var1) { - this.field1006[var1] = var1 * 0x40000; + for (var1 = 0; var1 < 64; ++var1) { + this.field1006[var1] = var1 * 262144; } - for(var1 = 0; var1 < 64; ++var1) { - this.field1006[var1 + 64] = var1 * 0x400 + 0xff0000; + for (var1 = 0; var1 < 64; ++var1) { + this.field1006[var1 + 64] = var1 * 1024 + 16711680; } - for(var1 = 0; var1 < 64; ++var1) { - this.field1006[var1 + 128] = var1 * 0x4 + 0xffff00; + for (var1 = 0; var1 < 64; ++var1) { + this.field1006[var1 + 128] = var1 * 4 + 16776960; } - for(var1 = 0; var1 < 64; ++var1) { - this.field1006[var1 + 192] = 0xffffff; + for (var1 = 0; var1 < 64; ++var1) { + this.field1006[var1 + 192] = 16777215; } this.field1007 = new int[256]; - for(var1 = 0; var1 < 64; ++var1) { - this.field1007[var1] = var1 * 0x400; + for (var1 = 0; var1 < 64; ++var1) { + this.field1007[var1] = var1 * 1024; } - for(var1 = 0; var1 < 64; ++var1) { - this.field1007[var1 + 64] = var1 * 0x4 + 0xff00; + for (var1 = 0; var1 < 64; ++var1) { + this.field1007[var1 + 64] = var1 * 4 + 65280; } - for(var1 = 0; var1 < 64; ++var1) { - this.field1007[var1 + 128] = var1 * 0x40000 + 0xffff; + for (var1 = 0; var1 < 64; ++var1) { + this.field1007[var1 + 128] = var1 * 262144 + 65535; } - for(var1 = 0; var1 < 64; ++var1) { - this.field1007[var1 + 192] = 0xffffff; + for (var1 = 0; var1 < 64; ++var1) { + this.field1007[var1 + 192] = 16777215; } this.field1014 = new int[256]; - for(var1 = 0; var1 < 64; ++var1) { - this.field1014[var1] = var1 * 0x4; + for (var1 = 0; var1 < 64; ++var1) { + this.field1014[var1] = var1 * 4; } - for(var1 = 0; var1 < 64; ++var1) { - this.field1014[var1 + 64] = var1 * 0x40000 + 0xff; + for (var1 = 0; var1 < 64; ++var1) { + this.field1014[var1 + 64] = var1 * 262144 + 255; } - for(var1 = 0; var1 < 64; ++var1) { - this.field1014[var1 + 128] = var1 * 0x400 + 0xff00ff; + for (var1 = 0; var1 < 64; ++var1) { + this.field1014[var1 + 128] = var1 * 1024 + 16711935; } - for(var1 = 0; var1 < 64; ++var1) { - this.field1014[var1 + 192] = 0xffffff; + for (var1 = 0; var1 < 64; ++var1) { + this.field1014[var1 + 192] = 16777215; } this.field1013 = new int[256]; this.field1010 = 0; - this.field1004 = new int['耀']; - this.field1018 = new int['耀']; + this.field1004 = new int[32768]; + this.field1018 = new int[32768]; this.method1779((IndexedSprite)null); - this.field1011 = new int['耀']; - this.field1012 = new int['耀']; + this.field1011 = new int[32768]; + this.field1012 = new int[32768]; } @ObfuscatedName("f") @@ -174,26 +173,26 @@ public class LoginScreenAnimation signature = "(III)V", garbageValue = "-1684910110" ) - void method1782(int x, int cycle) { - if(this.field1011 == null) { + void method1782(int var1, int var2) { + if (this.field1011 == null) { this.method1772(); } - if(this.field1017 == 0) { - this.field1017 = cycle; + if (this.field1017 == 0) { + this.field1017 = var2; } - int var3 = cycle - this.field1017; - if(var3 >= 256) { + int var3 = var2 - this.field1017; + if (var3 >= 256) { var3 = 0; } - this.field1017 = cycle; - if(var3 > 0) { + this.field1017 = var2; + if (var3 > 0) { this.method1791(var3); } - this.method1787(x); + this.method1787(var1); } @ObfuscatedName("w") @@ -204,7 +203,7 @@ public class LoginScreenAnimation final void method1791(int var1) { this.field1010 += var1 * 128; int var2; - if(this.field1010 > this.field1004.length) { + if (this.field1010 > this.field1004.length) { this.field1010 -= this.field1004.length; var2 = (int)(Math.random() * 12.0D); this.method1779(this.sprites[var2]); @@ -214,74 +213,74 @@ public class LoginScreenAnimation int var3 = var1 * 128; int var4 = (256 - var1) * 128; - int var6; - for(int var5 = 0; var5 < var4; ++var5) { - var6 = this.field1011[var3 + var2] - this.field1004[var2 + this.field1010 & this.field1004.length - 1] * var1 / 6; - if(var6 < 0) { - var6 = 0; + int var5; + for (int var6 = 0; var6 < var4; ++var6) { + var5 = this.field1011[var3 + var2] - this.field1004[var2 + this.field1010 & this.field1004.length - 1] * var1 / 6; + if (var5 < 0) { + var5 = 0; } - this.field1011[var2++] = var6; + this.field1011[var2++] = var5; } byte var15 = 10; - var6 = 128 - var15; + var5 = 128 - var15; int var7; - int var10; - for(var7 = 256 - var1; var7 < 256; ++var7) { - int var8 = var7 * 128; + int var8; + for (var7 = 256 - var1; var7 < 256; ++var7) { + int var9 = var7 * 128; - for(int var9 = 0; var9 < 128; ++var9) { - var10 = (int)(Math.random() * 100.0D); - if(var10 < 50 && var9 > var15 && var9 < var6) { - this.field1011[var9 + var8] = 255; + for (int var10 = 0; var10 < 128; ++var10) { + var8 = (int)(Math.random() * 100.0D); + if (var8 < 50 && var10 > var15 && var10 < var5) { + this.field1011[var10 + var9] = 255; } else { - this.field1011[var9 + var8] = 0; + this.field1011[var10 + var9] = 0; } } } - if(this.field1009 > 0) { + if (this.field1009 > 0) { this.field1009 -= var1 * 4; } - if(this.field1005 > 0) { + if (this.field1005 > 0) { this.field1005 -= var1 * 4; } - if(this.field1009 == 0 && this.field1005 == 0) { + if (this.field1009 == 0 && this.field1005 == 0) { var7 = (int)(Math.random() * (double)(2000 / var1)); - if(var7 == 0) { + if (var7 == 0) { this.field1009 = 1024; } - if(var7 == 1) { + if (var7 == 1) { this.field1005 = 1024; } } - for(var7 = 0; var7 < 256 - var1; ++var7) { + for (var7 = 0; var7 < 256 - var1; ++var7) { this.field1015[var7] = this.field1015[var7 + var1]; } - for(var7 = 256 - var1; var7 < 256; ++var7) { + for (var7 = 256 - var1; var7 < 256; ++var7) { this.field1015[var7] = (int)(Math.sin((double)this.field1008 / 14.0D) * 16.0D + Math.sin((double)this.field1008 / 15.0D) * 14.0D + Math.sin((double)this.field1008 / 16.0D) * 12.0D); ++this.field1008; } this.field1016 += var1; var7 = ((Client.cycle & 1) + var1) / 2; - if(var7 > 0) { + if (var7 > 0) { short var16 = 128; byte var17 = 2; - var10 = 128 - var17 - var17; + var8 = 128 - var17 - var17; int var11; int var12; int var13; - for(var11 = 0; var11 < this.field1016 * 100; ++var11) { - var12 = (int)(Math.random() * (double)var10) + var17; + for (var11 = 0; var11 < this.field1016 * 100; ++var11) { + var12 = (int)(Math.random() * (double)var8) + var17; var13 = (int)(Math.random() * (double)var16) + var16; this.field1011[var12 + (var13 << 7)] = 192; } @@ -289,39 +288,39 @@ public class LoginScreenAnimation this.field1016 = 0; int var14; - for(var11 = 0; var11 < 256; ++var11) { + for (var11 = 0; var11 < 256; ++var11) { var12 = 0; var13 = var11 * 128; - for(var14 = -var7; var14 < 128; ++var14) { - if(var7 + var14 < 128) { + for (var14 = -var7; var14 < 128; ++var14) { + if (var7 + var14 < 128) { var12 += this.field1011[var7 + var14 + var13]; } - if(var14 - (var7 + 1) >= 0) { + if (var14 - (var7 + 1) >= 0) { var12 -= this.field1011[var14 + var13 - (var7 + 1)]; } - if(var14 >= 0) { + if (var14 >= 0) { this.field1012[var14 + var13] = var12 / (var7 * 2 + 1); } } } - for(var11 = 0; var11 < 128; ++var11) { + for (var11 = 0; var11 < 128; ++var11) { var12 = 0; - for(var13 = -var7; var13 < 256; ++var13) { + for (var13 = -var7; var13 < 256; ++var13) { var14 = var13 * 128; - if(var13 + var7 < 256) { + if (var13 + var7 < 256) { var12 += this.field1012[var14 + var11 + var7 * 128]; } - if(var13 - (var7 + 1) >= 0) { + if (var13 - (var7 + 1) >= 0) { var12 -= this.field1012[var11 + var14 - (var7 + 1) * 128]; } - if(var13 >= 0) { + if (var13 >= 0) { this.field1011[var11 + var14] = var12 / (var7 * 2 + 1); } } @@ -337,7 +336,7 @@ public class LoginScreenAnimation ) final int method1765(int var1, int var2, int var3) { int var4 = 256 - var3; - return (var4 * (var1 & 0xff00) + var3 * (var2 & 0xff00) & 0xff0000) + (var4 * (var1 & 0xff00ff) + var3 * (var2 & 0xff00ff) & 0xff00ff00) >> 8; + return (var4 * (var1 & 65280) + var3 * (var2 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8; } @ObfuscatedName("u") @@ -347,12 +346,12 @@ public class LoginScreenAnimation ) final void method1787(int var1) { int var2 = this.field1013.length; - if(this.field1009 > 0) { + if (this.field1009 > 0) { this.method1766(this.field1009, this.field1007); - } else if(this.field1005 > 0) { + } else if (this.field1005 > 0) { this.method1766(this.field1005, this.field1014); } else { - for(int var3 = 0; var3 < var2; ++var3) { + for (int var3 = 0; var3 < var2; ++var3) { this.field1013[var3] = this.field1006[var3]; } } @@ -368,10 +367,10 @@ public class LoginScreenAnimation final void method1766(int var1, int[] var2) { int var3 = this.field1013.length; - for(int var4 = 0; var4 < var3; ++var4) { - if(var1 > 768) { + for (int var4 = 0; var4 < var3; ++var4) { + if (var1 > 768) { this.field1013[var4] = this.method1765(this.field1006[var4], var2[var4], 1024 - var1); - } else if(var1 > 256) { + } else if (var1 > 256) { this.field1013[var4] = var2[var4]; } else { this.field1013[var4] = this.method1765(var2[var4], this.field1006[var4], 256 - var1); @@ -388,32 +387,32 @@ public class LoginScreenAnimation final void method1767(int var1) { int var2 = 0; - for(int var3 = 1; var3 < 255; ++var3) { + for (int var3 = 1; var3 < 255; ++var3) { int var4 = (256 - var3) * this.field1015[var3] / 256; int var5 = var4 + var1; int var6 = 0; int var7 = 128; - if(var5 < 0) { + if (var5 < 0) { var6 = -var5; var5 = 0; } - if(var5 + 128 >= class197.rasterProvider.width) { + if (var5 + 128 >= class197.rasterProvider.width) { var7 = class197.rasterProvider.width - var5; } int var8 = var5 + (var3 + 8) * class197.rasterProvider.width; var2 += var6; - for(int var9 = var6; var9 < var7; ++var9) { + for (int var9 = var6; var9 < var7; ++var9) { int var10 = this.field1011[var2++]; int var11 = var8 % Rasterizer2D.Rasterizer2D_width; - if(var10 != 0 && var11 >= Rasterizer2D.Rasterizer2D_xClipStart && var11 < Rasterizer2D.Rasterizer2D_xClipEnd) { + if (var10 != 0 && var11 >= Rasterizer2D.Rasterizer2D_xClipStart && var11 < Rasterizer2D.Rasterizer2D_xClipEnd) { int var12 = var10; int var13 = 256 - var10; var10 = this.field1013[var10]; int var14 = class197.rasterProvider.pixels[var8]; - class197.rasterProvider.pixels[var8++] = 0xff000000 | ((var10 & 0xff00ff) * var12 + (var14 & 0xff00ff) * var13 & 0xff00ff00) + (var12 * (var10 & 0xff00) + var13 * (var14 & 0xff00) & 0xff0000) >> 8; + class197.rasterProvider.pixels[var8++] = -16777216 | ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) + (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) >> 8; } else { ++var8; } @@ -431,40 +430,40 @@ public class LoginScreenAnimation ) final void method1779(IndexedSprite var1) { int var2; - for(var2 = 0; var2 < this.field1004.length; ++var2) { + for (var2 = 0; var2 < this.field1004.length; ++var2) { this.field1004[var2] = 0; } int var3; - for(var2 = 0; var2 < 5000; ++var2) { + for (var2 = 0; var2 < 5000; ++var2) { var3 = (int)(Math.random() * 128.0D * 256.0D); this.field1004[var3] = (int)(Math.random() * 256.0D); } int var4; int var5; - for(var2 = 0; var2 < 20; ++var2) { - for(var3 = 1; var3 < 255; ++var3) { - for(var4 = 1; var4 < 127; ++var4) { + for (var2 = 0; var2 < 20; ++var2) { + for (var3 = 1; var3 < 255; ++var3) { + for (var4 = 1; var4 < 127; ++var4) { var5 = var4 + (var3 << 7); this.field1018[var5] = (this.field1004[var5 + 1] + this.field1004[var5 + 128] + this.field1004[var5 - 128] + this.field1004[var5 - 1]) / 4; } } - int[] var8 = this.field1004; + int[] var6 = this.field1004; this.field1004 = this.field1018; - this.field1018 = var8; + this.field1018 = var6; } - if(var1 != null) { + if (var1 != null) { var2 = 0; - for(var3 = 0; var3 < var1.subHeight; ++var3) { - for(var4 = 0; var4 < var1.subWidth; ++var4) { - if(var1.pixels[var2++] != 0) { + for (var3 = 0; var3 < var1.subHeight; ++var3) { + for (var4 = 0; var4 < var1.subWidth; ++var4) { + if (var1.pixels[var2++] != 0) { var5 = var4 + var1.xOffset + 16; - int var6 = var3 + var1.yOffset + 16; - int var7 = var5 + (var6 << 7); + int var8 = var3 + var1.yOffset + 16; + int var7 = var5 + (var8 << 7); this.field1004[var7] = 0; } } @@ -486,7 +485,7 @@ public class LoginScreenAnimation var4.writeByte(10); int var7; - for(var7 = 0; var7 < 4; ++var7) { + for (var7 = 0; var7 < 4; ++var7) { var4.writeInt(var3.nextInt()); } @@ -495,14 +494,14 @@ public class LoginScreenAnimation var4.writeLong(var0); var4.writeLong(0L); - for(var7 = 0; var7 < 4; ++var7) { + for (var7 = 0; var7 < 4; ++var7) { var4.writeInt(var3.nextInt()); } - var4.encryptRsa(class80.__ce_o, class80.__ce_u); + var4.encryptRsa(class80.field1163, class80.field1164); var5.writeByte(10); - for(var7 = 0; var7 < 3; ++var7) { + for (var7 = 0; var7 < 3; ++var7) { var5.writeInt(var3.nextInt()); } @@ -510,9 +509,9 @@ public class LoginScreenAnimation var5.writeLongMedium(var3.nextLong()); Varps.method4400(var5); var5.writeLong(var3.nextLong()); - var5.encryptRsa(class80.__ce_o, class80.__ce_u); + var5.encryptRsa(class80.field1163, class80.field1164); var7 = WorldMapRegion.method550(var2); - if(var7 % 8 != 0) { + if (var7 % 8 != 0) { var7 += 8 - var7 % 8; } @@ -523,72 +522,72 @@ public class LoginScreenAnimation Buffer var9 = new Buffer(var4.index + var5.index + var8.index + 5); var9.writeByte(2); var9.writeByte(var4.index); - var9.__s_297(var4.array, 0, var4.index); + var9.method38(var4.array, 0, var4.index); var9.writeByte(var5.index); - var9.__s_297(var5.array, 0, var5.index); + var9.method38(var5.array, 0, var5.index); var9.writeShort(var8.index); - var9.__s_297(var8.array, 0, var8.index); - byte[] var11 = var9.array; - int var13 = var11.length; - StringBuilder var14 = new StringBuilder(); + var9.method38(var8.array, 0, var8.index); + byte[] var10 = var9.array; + int var11 = var10.length; + StringBuilder var12 = new StringBuilder(); - int var17; - for(int var15 = 0; var15 < var13 + 0; var15 += 3) { - int var16 = var11[var15] & 255; - var14.append(class307.__kc_m[var16 >>> 2]); - if(var15 < var13 - 1) { - var17 = var11[var15 + 1] & 255; - var14.append(class307.__kc_m[(var16 & 3) << 4 | var17 >>> 4]); - if(var15 < var13 - 2) { - int var18 = var11[var15 + 2] & 255; - var14.append(class307.__kc_m[(var17 & 15) << 2 | var18 >>> 6]).append(class307.__kc_m[var18 & 63]); + int var13; + for (int var14 = 0; var14 < var11 + 0; var14 += 3) { + int var15 = var10[var14] & 255; + var12.append(class307.field1151[var15 >>> 2]); + if (var14 < var11 - 1) { + var13 = var10[var14 + 1] & 255; + var12.append(class307.field1151[(var15 & 3) << 4 | var13 >>> 4]); + if (var14 < var11 - 2) { + int var16 = var10[var14 + 2] & 255; + var12.append(class307.field1151[(var13 & 15) << 2 | var16 >>> 6]).append(class307.field1151[var16 & 63]); } else { - var14.append(class307.__kc_m[(var17 & 15) << 2]).append("="); + var12.append(class307.field1151[(var13 & 15) << 2]).append("="); } } else { - var14.append(class307.__kc_m[(var16 & 3) << 4]).append("=="); + var12.append(class307.field1151[(var15 & 3) << 4]).append("=="); } } - String var12 = var14.toString(); - var12 = var12; + String var21 = var12.toString(); + var21 = var21; try { - URL var19 = new URL(Message.method1227("services", false) + "m=accountappeal/login.ws"); - URLConnection var24 = var19.openConnection(); - var24.setDoInput(true); - var24.setDoOutput(true); - var24.setConnectTimeout(5000); - OutputStreamWriter var20 = new OutputStreamWriter(var24.getOutputStream()); - var20.write("data2=" + class306.method5781(var12) + "&dest=" + class306.method5781("passwordchoice.ws")); - var20.flush(); - InputStream var21 = var24.getInputStream(); + URL var22 = new URL(Message.method1227("services", false) + "m=accountappeal/login.ws"); + URLConnection var23 = var22.openConnection(); + var23.setDoInput(true); + var23.setDoOutput(true); + var23.setConnectTimeout(5000); + OutputStreamWriter var17 = new OutputStreamWriter(var23.getOutputStream()); + var17.write("data2=" + class306.method5781(var21) + "&dest=" + class306.method5781("passwordchoice.ws")); + var17.flush(); + InputStream var18 = var23.getInputStream(); var9 = new Buffer(new byte[1000]); do { - var17 = var21.read(var9.array, var9.index, 1000 - var9.index); - if(var17 == -1) { - var20.close(); - var21.close(); - String var22 = new String(var9.array); - if(var22.startsWith("OFFLINE")) { + var13 = var18.read(var9.array, var9.index, 1000 - var9.index); + if (var13 == -1) { + var17.close(); + var18.close(); + String var19 = new String(var9.array); + if (var19.startsWith("OFFLINE")) { return 4; - } else if(var22.startsWith("WRONG")) { + } else if (var19.startsWith("WRONG")) { return 7; - } else if(var22.startsWith("RELOAD")) { + } else if (var19.startsWith("RELOAD")) { return 3; - } else if(var22.startsWith("Not permitted for social network accounts.")) { + } else if (var19.startsWith("Not permitted for social network accounts.")) { return 6; } else { var9.xteaDecryptAll(var6); - while(var9.index > 0 && var9.array[var9.index - 1] == 0) { + while (var9.index > 0 && var9.array[var9.index - 1] == 0) { --var9.index; } - var22 = new String(var9.array, 0, var9.index); - if(class83.method2026(var22)) { - WorldMapCacheName.method635(var22, true, false); + var19 = new String(var9.array, 0, var9.index); + if (class83.method2026(var19)) { + WorldMapCacheName.method635(var19, true, false); return 2; } else { return 5; @@ -596,12 +595,12 @@ public class LoginScreenAnimation } } - var9.index += var17; + var9.index += var13; } while(var9.index < 1000); return 5; - } catch (Throwable var23) { - var23.printStackTrace(); + } catch (Throwable var20) { + var20.printStackTrace(); return 5; } } @@ -614,12 +613,12 @@ public class LoginScreenAnimation @Export("getHitSplatDefinition") public static HitSplatDefinition getHitSplatDefinition(int var0) { HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); - if(var1 != null) { + if (var1 != null) { return var1; } else { - byte[] var2 = HitSplatDefinition.__jm_m.takeRecord(32, var0); + byte[] var2 = HitSplatDefinition.field382.takeRecord(32, var0); var1 = new HitSplatDefinition(); - if(var2 != null) { + if (var2 != null) { var1.read(new Buffer(var2)); } diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index 91705d5b3d..c00ed82f4c 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,82 +10,82 @@ public class LoginType { @ObfuscatedSignature( signature = "Llx;" ) - public static final LoginType __lx_m; + public static final LoginType field479; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Llx;" ) - static final LoginType __lx_f; + static final LoginType field480; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Llx;" ) - static final LoginType __lx_q; + static final LoginType field481; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Llx;" ) - static final LoginType __lx_w; + static final LoginType field482; @ObfuscatedName("o") @ObfuscatedSignature( signature = "Llx;" ) - static final LoginType __lx_o; + static final LoginType field483; @ObfuscatedName("u") @ObfuscatedSignature( signature = "Llx;" ) - static final LoginType __lx_u; + static final LoginType field484; @ObfuscatedName("g") @ObfuscatedSignature( signature = "Llx;" ) - static final LoginType __lx_g; + static final LoginType field485; @ObfuscatedName("l") @ObfuscatedSignature( signature = "Llx;" ) - static final LoginType __lx_l; + static final LoginType field486; @ObfuscatedName("e") @ObfuscatedSignature( signature = "Llx;" ) - public static final LoginType __lx_e; + public static final LoginType field487; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -1916729379 ) - public final int __x; + public final int field488; @ObfuscatedName("d") - final String __d; - - static { - __lx_m = new LoginType(8, 0, "", ""); - __lx_f = new LoginType(3, 1, "", ""); - __lx_q = new LoginType(2, 2, "", ""); - __lx_w = new LoginType(6, 3, "", ""); - __lx_o = new LoginType(4, 4, "", ""); - __lx_u = new LoginType(7, 5, "", ""); - __lx_g = new LoginType(1, 6, "", ""); - __lx_l = new LoginType(5, 7, "", ""); - __lx_e = new LoginType(0, -1, "", "", true, new LoginType[]{__lx_m, __lx_f, __lx_q, __lx_o, __lx_w}); - } + final String field489; LoginType(int var1, int var2, String var3, String var4) { - this.__x = var1; - this.__d = var4; + this.field488 = var1; + this.field489 = var4; } @ObfuscatedSignature( signature = "(IILjava/lang/String;Ljava/lang/String;Z[Llx;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { - this.__x = var1; - this.__d = var4; + this.field488 = var1; + this.field489 = var4; } @ObfuscatedName("toString") - public String __toString_546() { - return this.__d; + public String method166() { + return this.field489; + } + + static { + field479 = new LoginType(8, 0, "", ""); + field480 = new LoginType(3, 1, "", ""); + field481 = new LoginType(2, 2, "", ""); + field482 = new LoginType(6, 3, "", ""); + field483 = new LoginType(4, 4, "", ""); + field484 = new LoginType(7, 5, "", ""); + field485 = new LoginType(1, 6, "", ""); + field486 = new LoginType(5, 7, "", ""); + field487 = new LoginType(0, -1, "", "", true, new LoginType[]{field479, field480, field481, field483, field482}); } } diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 1e3b209c99..677531848f 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -51,7 +51,7 @@ public class MenuAction { int var3 = var0.getArchiveId(var1); int var4 = var0.getRecordId(var3, var2); IndexedSprite var5; - if(!SpriteMask.loadSprite(var0, var3, var4)) { + if (!SpriteMask.loadSprite(var0, var3, var4)) { var5 = null; } else { var5 = ServerPacket.createIndexedSprite(); @@ -70,27 +70,27 @@ public class MenuAction { int var2 = var0.group; int var3 = (int)var0.key; var0.remove(); - if(var1) { + if (var1) { AbstractByteArrayCopier.unloadWidgetGroup(var2); } - for(IntegerNode var4 = (IntegerNode)Client.widgetClickMasks.first(); var4 != null; var4 = (IntegerNode)Client.widgetClickMasks.next()) { - if((long)var2 == (var4.key >> 48 & 65535L)) { + for (IntegerNode var4 = (IntegerNode)Client.widgetClickMasks.first(); var4 != null; var4 = (IntegerNode)Client.widgetClickMasks.next()) { + if ((long)var2 == (var4.key >> 48 & 65535L)) { var4.remove(); } } - Widget var14 = Huffman.getWidget(var3); - if(var14 != null) { - class22.method295(var14); + Widget var12 = Huffman.getWidget(var3); + if (var12 != null) { + class22.method295(var12); } int var5; int var6; - for(var5 = 0; var5 < Client.menuOptionsCount; ++var5) { - if(WorldMapManager.isWidgetMenuOpcode(Client.menuOpcodes[var5])) { - if(var5 < Client.menuOptionsCount - 1) { - for(var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) { + for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) { + if (WorldMapManager.isWidgetMenuOpcode(Client.menuOpcodes[var5])) { + if (var5 < Client.menuOptionsCount - 1) { + for (var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) { Client.menuActions[var6] = Client.menuActions[var6 + 1]; Client.menuTargetNames[var6] = Client.menuTargetNames[var6 + 1]; Client.menuOpcodes[var6] = Client.menuOpcodes[var6 + 1]; @@ -111,48 +111,48 @@ public class MenuAction { int var7 = class2.fontBold12.stringWidth("Choose Option"); int var8; - for(var8 = 0; var8 < Client.menuOptionsCount; ++var8) { + for (var8 = 0; var8 < Client.menuOptionsCount; ++var8) { Font var9 = class2.fontBold12; String var10; - if(var8 < 0) { + if (var8 < 0) { var10 = ""; - } else if(Client.menuTargetNames[var8].length() > 0) { + } else if (Client.menuTargetNames[var8].length() > 0) { var10 = Client.menuActions[var8] + " " + Client.menuTargetNames[var8]; } else { var10 = Client.menuActions[var8]; } int var11 = var9.stringWidth(var10); - if(var11 > var7) { + if (var11 > var7) { var7 = var11; } } var7 += 8; var8 = Client.menuOptionsCount * 15 + 22; - int var12 = var5 - var7 / 2; - if(var7 + var12 > SoundCache.canvasWidth) { - var12 = SoundCache.canvasWidth - var7; + int var13 = var5 - var7 / 2; + if (var7 + var13 > SoundCache.canvasWidth) { + var13 = SoundCache.canvasWidth - var7; } - if(var12 < 0) { - var12 = 0; - } - - int var13 = var6; - if(var6 + var8 > Huffman.canvasHeight) { - var13 = Huffman.canvasHeight - var8; - } - - if(var13 < 0) { + if (var13 < 0) { var13 = 0; } - class25.menuX = var12; - GameShell.menuY = var13; + int var14 = var6; + if (var6 + var8 > Huffman.canvasHeight) { + var14 = Huffman.canvasHeight - var8; + } + + if (var14 < 0) { + var14 = 0; + } + + class25.menuX = var13; + GameShell.menuY = var14; class214.menuWidth = var7; AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22; - if(Client.rootWidgetGroup != -1) { + if (Client.rootWidgetGroup != -1) { GrandExchangeEvents.method74(Client.rootWidgetGroup, 1); } diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 570ff3192f..30ac47dfcb 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Message") public class Message extends DualNode { @ObfuscatedName("i") - static int[] __bm_i; + static int[] field490; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 1597147817 @@ -97,7 +97,7 @@ public class Message extends DualNode { ) @Export("isFromFriend") final boolean isFromFriend() { - if(this.isFromFriend0 == TriBool.TriBool_unknown) { + if (this.isFromFriend0 == TriBool.TriBool_unknown) { this.fillIsFromFriend(); } @@ -111,7 +111,7 @@ public class Message extends DualNode { ) @Export("fillIsFromFriend") void fillIsFromFriend() { - this.isFromFriend0 = WorldMapArea.friendSystem.friendsList.contains(this.senderUsername)?TriBool.TriBool_true:TriBool.TriBool_false; + this.isFromFriend0 = WorldMapArea.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; } @ObfuscatedName("o") @@ -131,7 +131,7 @@ public class Message extends DualNode { ) @Export("isFromIgnored") final boolean isFromIgnored() { - if(this.isFromIgnored0 == TriBool.TriBool_unknown) { + if (this.isFromIgnored0 == TriBool.TriBool_unknown) { this.fillIsFromIgnored(); } @@ -145,7 +145,7 @@ public class Message extends DualNode { ) @Export("fillIsFromIgnored") void fillIsFromIgnored() { - this.isFromIgnored0 = WorldMapArea.friendSystem.ignoreList.contains(this.senderUsername)?TriBool.TriBool_true:TriBool.TriBool_false; + this.isFromIgnored0 = WorldMapArea.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; } @ObfuscatedName("l") @@ -155,8 +155,8 @@ public class Message extends DualNode { ) @Export("fillSenderUsername") final void fillSenderUsername() { - if(this.sender != null) { - this.senderUsername = new Username(NpcDefinition.method5161(this.sender), KeyHandler.loginType); + if (this.sender != null) { + this.senderUsername = new Username(NPCDefinition.method5161(this.sender), KeyHandler.loginType); } else { this.senderUsername = null; } @@ -169,7 +169,7 @@ public class Message extends DualNode { garbageValue = "-1905151806" ) public static String method1229(CharSequence var0, LoginType var1) { - if(var0 == null) { + if (var0 == null) { return null; } else { int var2 = 0; @@ -177,94 +177,96 @@ public class Message extends DualNode { int var3; boolean var4; char var5; - for(var3 = var0.length(); var2 < var3; ++var2) { + for (var3 = var0.length(); var2 < var3; ++var2) { var5 = var0.charAt(var2); var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; - if(!var4) { + if (!var4) { break; } } - while(var3 > var2) { + while (var3 > var2) { var5 = var0.charAt(var3 - 1); var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; - if(!var4) { + if (!var4) { break; } --var3; } - int var14 = var3 - var2; - if(var14 >= 1) { - byte var6; - if(var1 == null) { - var6 = 12; + int var6 = var3 - var2; + if (var6 >= 1) { + byte var7; + if (var1 == null) { + var7 = 12; } else { - switch(var1.__x) { + switch(var1.field488) { case 7: - var6 = 20; + var7 = 20; break; default: - var6 = 12; + var7 = 12; } } - if(var14 <= var6) { - StringBuilder var12 = new StringBuilder(var14); + if (var6 <= var7) { + StringBuilder var8 = new StringBuilder(var6); - for(int var15 = var2; var15 < var3; ++var15) { - char var7 = var0.charAt(var15); - boolean var8; - if(Character.isISOControl(var7)) { - var8 = false; - } else if(VarcInt.isAlphaNumeric(var7)) { - var8 = true; + for (int var9 = var2; var9 < var3; ++var9) { + char var10 = var0.charAt(var9); + boolean var11; + if (Character.isISOControl(var10)) { + var11 = false; + } else if (VarcInt.isAlphaNumeric(var10)) { + var11 = true; } else { - char[] var13 = class305.__kb_q; - int var10 = 0; + label149: { + char[] var12 = class305.field1149; - label118: - while(true) { - char var11; - if(var10 >= var13.length) { - var13 = class305.__kb_w; + int var13; + char var14; + for (var13 = 0; var13 < var12.length; ++var13) { + var14 = var12[var13]; + if (var10 == var14) { + var11 = true; + break label149; + } + } - for(var10 = 0; var10 < var13.length; ++var10) { - var11 = var13[var10]; - if(var7 == var11) { - var8 = true; - break label118; - } + var12 = class305.field1150; + var13 = 0; + + while (true) { + if (var13 >= var12.length) { + var11 = false; + break; } - var8 = false; - break; - } + var14 = var12[var13]; + if (var10 == var14) { + var11 = true; + break; + } - var11 = var13[var10]; - if(var7 == var11) { - var8 = true; - break; + ++var13; } - - ++var10; } } - if(var8) { - char var9; - switch(var7) { + if (var11) { + char var15; + switch(var10) { case ' ': case '-': case '_': case ' ': - var9 = '_'; + var15 = '_'; break; case '#': case '[': case ']': - var9 = var7; + var15 = var10; break; case 'À': case 'Á': @@ -276,11 +278,11 @@ public class Message extends DualNode { case 'â': case 'ã': case 'ä': - var9 = 'a'; + var15 = 'a'; break; case 'Ç': case 'ç': - var9 = 'c'; + var15 = 'c'; break; case 'È': case 'É': @@ -290,7 +292,7 @@ public class Message extends DualNode { case 'é': case 'ê': case 'ë': - var9 = 'e'; + var15 = 'e'; break; case 'Í': case 'Î': @@ -298,11 +300,11 @@ public class Message extends DualNode { case 'í': case 'î': case 'ï': - var9 = 'i'; + var15 = 'i'; break; case 'Ñ': case 'ñ': - var9 = 'n'; + var15 = 'n'; break; case 'Ò': case 'Ó': @@ -314,7 +316,7 @@ public class Message extends DualNode { case 'ô': case 'õ': case 'ö': - var9 = 'o'; + var15 = 'o'; break; case 'Ù': case 'Ú': @@ -324,30 +326,30 @@ public class Message extends DualNode { case 'ú': case 'û': case 'ü': - var9 = 'u'; + var15 = 'u'; break; case 'ß': - var9 = 'b'; + var15 = 'b'; break; case 'ÿ': case 'Ÿ': - var9 = 'y'; + var15 = 'y'; break; default: - var9 = Character.toLowerCase(var7); + var15 = Character.toLowerCase(var10); } - if(var9 != 0) { - var12.append(var9); + if (var15 != 0) { + var8.append(var15); } } } - if(var12.length() == 0) { + if (var8.length() == 0) { return null; } - return var12.toString(); + return var8.toString(); } } @@ -361,7 +363,7 @@ public class Message extends DualNode { garbageValue = "-1262174034" ) static Message method1226(int var0, int var1) { - ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(Integer.valueOf(var0)); + ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); return var2.getMessage(var1); } @@ -371,28 +373,28 @@ public class Message extends DualNode { garbageValue = "-2007966264" ) static final void method1228() { - if(SoundSystem.plane != Client.__client_ph) { - Client.__client_ph = SoundSystem.plane; + if (SoundSystem.plane != Client.field125) { + Client.field125 = SoundSystem.plane; int var0 = SoundSystem.plane; int[] var1 = WidgetGroupParent.sceneMinimapSprite.pixels; int var2 = var1.length; int var3; - for(var3 = 0; var3 < var2; ++var3) { + for (var3 = 0; var3 < var2; ++var3) { var1[var3] = 0; } int var4; int var5; - for(var3 = 1; var3 < 103; ++var3) { + for (var3 = 1; var3 < 103; ++var3) { var4 = (103 - var3) * 2048 + 24628; - for(var5 = 1; var5 < 103; ++var5) { - if((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { + for (var5 = 1; var5 < 103; ++var5) { + if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { class65.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); } - if(var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { class65.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); } @@ -405,13 +407,13 @@ public class Message extends DualNode { WidgetGroupParent.sceneMinimapSprite.setRaster(); int var6; - for(var5 = 1; var5 < 103; ++var5) { - for(var6 = 1; var6 < 103; ++var6) { - if((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { + for (var5 = 1; var5 < 103; ++var5) { + for (var6 = 1; var6 < 103; ++var6) { + if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { MouseRecorder.drawObject(var0, var6, var5, var3, var4); } - if(var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { MouseRecorder.drawObject(var0 + 1, var6, var5, var3, var4); } } @@ -419,13 +421,13 @@ public class Message extends DualNode { Client.mapIconCount = 0; - for(var5 = 0; var5 < 104; ++var5) { - for(var6 = 0; var6 < 104; ++var6) { + for (var5 = 0; var5 < 104; ++var5) { + for (var6 = 0; var6 < 104; ++var6) { long var7 = class65.scene.getFloorDecorationTag(SoundSystem.plane, var5, var6); - if(var7 != 0L) { + if (var7 != 0L) { int var9 = HitSplatDefinition.method4972(var7); int var10 = class50.getObjectDefinition(var9).mapIconId; - if(var10 >= 0) { + if (var10 >= 0) { Client.mapIcons[Client.mapIconCount] = ViewportMouse.getWorldMapElement(var10).getSprite(false); Client.mapIconXs[Client.mapIconCount] = var5; Client.mapIconYs[Client.mapIconCount] = var6; @@ -446,25 +448,25 @@ public class Message extends DualNode { garbageValue = "1047910257" ) static String method1227(String var0, boolean var1) { - String var2 = var1?"https://":"http://"; - if(Client.gameBuild == 1) { + String var2 = var1 ? "https://" : "http://"; + if (Client.gameBuild == 1) { var0 = var0 + "-wtrc"; - } else if(Client.gameBuild == 2) { + } else if (Client.gameBuild == 2) { var0 = var0 + "-wtqa"; - } else if(Client.gameBuild == 3) { + } else if (Client.gameBuild == 3) { var0 = var0 + "-wtwip"; - } else if(Client.gameBuild == 5) { + } else if (Client.gameBuild == 5) { var0 = var0 + "-wti"; - } else if(Client.gameBuild == 4) { + } else if (Client.gameBuild == 4) { var0 = "local"; } String var3 = ""; - if(class21.__b_by != null) { - var3 = "/p=" + class21.__b_by; + if (class21.field1123 != null) { + var3 = "/p=" + class21.field1123; } String var4 = "runescape.com"; - return var2 + var0 + "." + var4 + "/l=" + Client.language + "/a=" + AbstractIndexCache.__ir_bu + var3 + "/"; + return var2 + var0 + "." + var4 + "/l=" + Client.language + "/a=" + AbstractIndexCache.field2 + var3 + "/"; } } diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java index 4c06de37c8..81e912029f 100644 --- a/runescape-client/src/main/java/Messages.java +++ b/runescape-client/src/main/java/Messages.java @@ -37,27 +37,27 @@ public class Messages { @Export("soundSystem") static SoundSystem soundSystem; - static { - Messages_channels = new HashMap(); - Messages_hashTable = new IterableNodeHashTable(1024); - Messages_queue = new IterableDualNodeQueue(); - Messages_count = 0; - } - @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)V", garbageValue = "103402661" ) static void method2200() { - if(Login.Login_username == null || Login.Login_username.length() <= 0) { - if(ReflectionCheck.clientPreferences.rememberedUsername != null) { + if (Login.Login_username == null || Login.Login_username.length() <= 0) { + if (ReflectionCheck.clientPreferences.rememberedUsername != null) { Login.Login_username = ReflectionCheck.clientPreferences.rememberedUsername; Client.Login_isUsernameRemembered = true; } else { Client.Login_isUsernameRemembered = false; } - } + + } + + static { + Messages_channels = new HashMap(); + Messages_hashTable = new IterableNodeHashTable(1024); + Messages_queue = new IterableDualNodeQueue(); + Messages_count = 0; } } diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index 7425856d16..f0a41c3311 100644 --- a/runescape-client/src/main/java/MidiFileReader.java +++ b/runescape-client/src/main/java/MidiFileReader.java @@ -7,7 +7,7 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("MidiFileReader") public class MidiFileReader { @ObfuscatedName("x") - static final byte[] __hs_x; + static final byte[] field491; @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lgr;" @@ -27,15 +27,11 @@ public class MidiFileReader { @Export("trackLengths") int[] trackLengths; @ObfuscatedName("u") - int[] __u; + int[] field492; @ObfuscatedName("g") - int __g; + int field493; @ObfuscatedName("e") - long __e; - - static { - __hs_x = new byte[]{(byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)0, (byte)1, (byte)2, (byte)1, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0}; - } + long field494; MidiFileReader(byte[] var1) { this.buffer = new Buffer((byte[])null); @@ -51,31 +47,34 @@ public class MidiFileReader { void parse(byte[] var1) { this.buffer.array = var1; this.buffer.index = 10; - int var2 = this.buffer.__ag_302(); - this.division = this.buffer.__ag_302(); - this.__g = 500000; + int var2 = this.buffer.method43(); + this.division = this.buffer.method43(); + this.field493 = 500000; this.trackStarts = new int[var2]; + Buffer var10000; int var3; - int var5; - for(var3 = 0; var3 < var2; this.buffer.index += var5) { - int var4 = this.buffer.readInt(); - var5 = this.buffer.readInt(); - if(var4 == 1297379947) { + int var4; + for (var3 = 0; var3 < var2; var10000.index += var4) { + int var5 = this.buffer.readInt(); + var4 = this.buffer.readInt(); + if (var5 == 1297379947) { this.trackStarts[var3] = this.buffer.index; ++var3; } + + var10000 = this.buffer; } - this.__e = 0L; + this.field494 = 0L; this.trackPositions = new int[var2]; - for(var3 = 0; var3 < var2; ++var3) { + for (var3 = 0; var3 < var2; ++var3) { this.trackPositions[var3] = this.trackStarts[var3]; } this.trackLengths = new int[var2]; - this.__u = new int[var2]; + this.field492 = new int[var2]; } @ObfuscatedName("f") @@ -85,7 +84,7 @@ public class MidiFileReader { this.trackStarts = null; this.trackPositions = null; this.trackLengths = null; - this.__u = null; + this.field492 = null; } @ObfuscatedName("q") @@ -121,8 +120,9 @@ public class MidiFileReader { @ObfuscatedName("l") @Export("readTrackLength") void readTrackLength(int var1) { - int var2 = this.buffer.__as_311(); - this.trackLengths[var1] += var2; + int var2 = this.buffer.method52(); + int[] var10000 = this.trackLengths; + var10000[var1] += var2; } @ObfuscatedName("e") @@ -136,72 +136,77 @@ public class MidiFileReader { @Export("readMessage0") int readMessage0(int var1) { byte var2 = this.buffer.array[this.buffer.index]; - int var5; - if(var2 < 0) { - var5 = var2 & 255; - this.__u[var1] = var5; + int var3; + if (var2 < 0) { + var3 = var2 & 255; + this.field492[var1] = var3; ++this.buffer.index; } else { - var5 = this.__u[var1]; + var3 = this.field492[var1]; } - if(var5 != 240 && var5 != 247) { - return this.__d_371(var1, var5); + if (var3 != 240 && var3 != 247) { + return this.method167(var1, var3); } else { - int var3 = this.buffer.__as_311(); - if(var5 == 247 && var3 > 0) { - int var4 = this.buffer.array[this.buffer.index] & 255; - if(var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) { + int var4 = this.buffer.method52(); + if (var3 == 247 && var4 > 0) { + int var5 = this.buffer.array[this.buffer.index] & 255; + if (var5 >= 241 && var5 <= 243 || var5 == 246 || var5 == 248 || var5 >= 250 && var5 <= 252 || var5 == 254) { ++this.buffer.index; - this.__u[var1] = var4; - return this.__d_371(var1, var4); + this.field492[var1] = var5; + return this.method167(var1, var5); } } - this.buffer.index += var3; + Buffer var10000 = this.buffer; + var10000.index += var4; return 0; } } @ObfuscatedName("d") - int __d_371(int var1, int var2) { - int var4; - if(var2 == 255) { + int method167(int var1, int var2) { + int var3; + if (var2 == 255) { int var7 = this.buffer.readUnsignedByte(); - var4 = this.buffer.__as_311(); - if(var7 == 47) { - this.buffer.index += var4; + var3 = this.buffer.method52(); + Buffer var10000; + if (var7 == 47) { + var10000 = this.buffer; + var10000.index += var3; return 1; - } else if(var7 == 81) { + } else if (var7 == 81) { int var5 = this.buffer.readMedium(); - var4 -= 3; + var3 -= 3; int var6 = this.trackLengths[var1]; - this.__e += (long)var6 * (long)(this.__g - var5); - this.__g = var5; - this.buffer.index += var4; + this.field494 += (long)var6 * (long)(this.field493 - var5); + this.field493 = var5; + var10000 = this.buffer; + var10000.index += var3; return 2; } else { - this.buffer.index += var4; + var10000 = this.buffer; + var10000.index += var3; return 3; } } else { - byte var3 = __hs_x[var2 - 128]; - var4 = var2; - if(var3 >= 1) { - var4 = var2 | this.buffer.readUnsignedByte() << 8; + byte var4 = field491[var2 - 128]; + var3 = var2; + if (var4 >= 1) { + var3 = var2 | this.buffer.readUnsignedByte() << 8; } - if(var3 >= 2) { - var4 |= this.buffer.readUnsignedByte() << 16; + if (var4 >= 2) { + var3 |= this.buffer.readUnsignedByte() << 16; } - return var4; + return var3; } } @ObfuscatedName("a") - long __a_372(int var1) { - return this.__e + (long)var1 * (long)this.__g; + long method168(int var1) { + return this.field494 + (long)var1 * (long)this.field493; } @ObfuscatedName("z") @@ -211,8 +216,8 @@ public class MidiFileReader { int var2 = -1; int var3 = Integer.MAX_VALUE; - for(int var4 = 0; var4 < var1; ++var4) { - if(this.trackPositions[var4] >= 0 && this.trackLengths[var4] < var3) { + for (int var4 = 0; var4 < var1; ++var4) { + if (this.trackPositions[var4] >= 0 && this.trackLengths[var4] < var3) { var2 = var4; var3 = this.trackLengths[var4]; } @@ -226,8 +231,8 @@ public class MidiFileReader { boolean isDone() { int var1 = this.trackPositions.length; - for(int var2 = 0; var2 < var1; ++var2) { - if(this.trackPositions[var2] >= 0) { + for (int var2 = 0; var2 < var1; ++var2) { + if (this.trackPositions[var2] >= 0) { return false; } } @@ -238,16 +243,20 @@ public class MidiFileReader { @ObfuscatedName("s") @Export("reset") void reset(long var1) { - this.__e = var1; + this.field494 = var1; int var3 = this.trackPositions.length; - for(int var4 = 0; var4 < var3; ++var4) { + for (int var4 = 0; var4 < var3; ++var4) { this.trackLengths[var4] = 0; - this.__u[var4] = 0; + this.field492[var4] = 0; this.buffer.index = this.trackStarts[var4]; this.readTrackLength(var4); this.trackPositions[var4] = this.buffer.index; } } + + static { + field491 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; + } } diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java index 800b277560..eec4788edf 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -17,52 +17,52 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedGetter( intValue = 335918727 ) - int __f; + int field495; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 2095480747 ) - int __q; + int field496; @ObfuscatedName("o") - int[] __o; + int[] field497; @ObfuscatedName("u") - int[] __u; + int[] field498; @ObfuscatedName("g") - int[] __g; + int[] field499; @ObfuscatedName("l") - int[] __l; + int[] field500; @ObfuscatedName("e") - int[] __e; + int[] field501; @ObfuscatedName("x") - int[] __x; + int[] field502; @ObfuscatedName("d") - int[] __d; + int[] field503; @ObfuscatedName("k") - int[] __k; + int[] field504; @ObfuscatedName("n") - int[] __n; + int[] field505; @ObfuscatedName("y") - int[] __y; + int[] field506; @ObfuscatedName("h") - int[] __h; + int[] field507; @ObfuscatedName("b") - int[] __b; + int[] field508; @ObfuscatedName("c") - int[] __c; + int[] field509; @ObfuscatedName("r") - int[] __r; + int[] field510; @ObfuscatedName("p") - int[] __p; + int[] field511; @ObfuscatedName("v") @ObfuscatedSignature( signature = "[[Lha;" ) - MusicPatchNode[][] __v; + MusicPatchNode[][] field512; @ObfuscatedName("ag") @ObfuscatedSignature( signature = "[[Lha;" ) - MusicPatchNode[][] __ag; + MusicPatchNode[][] field513; @ObfuscatedName("aq") @ObfuscatedSignature( signature = "Lhs;" @@ -70,7 +70,7 @@ public class MidiPcmStream extends PcmStream { @Export("midiFile") MidiFileReader midiFile; @ObfuscatedName("aj") - boolean __aj; + boolean field514; @ObfuscatedName("av") @ObfuscatedGetter( intValue = 1450922835 @@ -87,12 +87,12 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedGetter( longValue = -7547625335559871937L ) - long __ac; + long field515; @ObfuscatedName("ay") @ObfuscatedGetter( longValue = 3736036110499628937L ) - long __ay; + long field516; @ObfuscatedName("ah") @ObfuscatedSignature( signature = "Lhq;" @@ -101,29 +101,29 @@ public class MidiPcmStream extends PcmStream { MusicPatchPcmStream patchStream; public MidiPcmStream() { - this.__f = 256; - this.__q = 1000000; - this.__o = new int[16]; - this.__u = new int[16]; - this.__g = new int[16]; - this.__l = new int[16]; - this.__e = new int[16]; - this.__x = new int[16]; - this.__d = new int[16]; - this.__k = new int[16]; - this.__n = new int[16]; - this.__y = new int[16]; - this.__h = new int[16]; - this.__b = new int[16]; - this.__c = new int[16]; - this.__r = new int[16]; - this.__p = new int[16]; - this.__v = new MusicPatchNode[16][128]; - this.__ag = new MusicPatchNode[16][128]; + this.field495 = 256; + this.field496 = 1000000; + this.field497 = new int[16]; + this.field498 = new int[16]; + this.field499 = new int[16]; + this.field500 = new int[16]; + this.field501 = new int[16]; + this.field502 = new int[16]; + this.field503 = new int[16]; + this.field504 = new int[16]; + this.field505 = new int[16]; + this.field506 = new int[16]; + this.field507 = new int[16]; + this.field508 = new int[16]; + this.field509 = new int[16]; + this.field510 = new int[16]; + this.field511 = new int[16]; + this.field512 = new MusicPatchNode[16][128]; + this.field513 = new MusicPatchNode[16][128]; this.midiFile = new MidiFileReader(); this.patchStream = new MusicPatchPcmStream(this); this.musicPatches = new NodeHashTable(128); - this.__at_354(); + this.method186(); } @ObfuscatedName("m") @@ -131,8 +131,8 @@ public class MidiPcmStream extends PcmStream { signature = "(IB)V", garbageValue = "92" ) - public synchronized void __m_340(int var1) { - this.__f = var1; + public synchronized void method169(int var1) { + this.field495 = var1; } @ObfuscatedName("f") @@ -140,8 +140,8 @@ public class MidiPcmStream extends PcmStream { signature = "(I)I", garbageValue = "2067929289" ) - public int __f_341() { - return this.__f; + public int method170() { + return this.field495; } @ObfuscatedName("q") @@ -151,19 +151,19 @@ public class MidiPcmStream extends PcmStream { ) @Export("loadMusicTrack") public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractIndexCache var2, SoundCache var3, int var4) { - var1.__f_381(); + var1.method226(); boolean var5 = true; int[] var6 = null; - if(var4 > 0) { + if (var4 > 0) { var6 = new int[]{var4}; } - for(ByteArrayNode var7 = (ByteArrayNode)var1.table.first(); var7 != null; var7 = (ByteArrayNode)var1.table.next()) { + for (ByteArrayNode var7 = (ByteArrayNode)var1.table.first(); var7 != null; var7 = (ByteArrayNode)var1.table.next()) { int var8 = (int)var7.key; MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)var8); - if(var9 == null) { + if (var9 == null) { var9 = Login.method2045(var2, var8); - if(var9 == null) { + if (var9 == null) { var5 = false; continue; } @@ -171,12 +171,12 @@ public class MidiPcmStream extends PcmStream { this.musicPatches.put(var9, (long)var8); } - if(!var9.__f_373(var3, var7.byteArray, var6)) { + if (!var9.method218(var3, var7.byteArray, var6)) { var5 = false; } } - if(var5) { + if (var5) { var1.clear(); } @@ -190,7 +190,7 @@ public class MidiPcmStream extends PcmStream { ) @Export("clearAll") public synchronized void clearAll() { - for(MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { + for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { var1.clear(); } @@ -203,7 +203,7 @@ public class MidiPcmStream extends PcmStream { ) @Export("removeAll") public synchronized void removeAll() { - for(MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { + for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { var1.remove(); } @@ -228,32 +228,32 @@ public class MidiPcmStream extends PcmStream { } @ObfuscatedName("l") - protected synchronized int __l_171() { + protected synchronized int vmethod262() { return 0; } @ObfuscatedName("e") - protected synchronized void __e_172(int[] var1, int var2, int var3) { - if(this.midiFile.isReady()) { - int var4 = this.midiFile.division * this.__q / class309.PcmPlayer_sampleRate; + protected synchronized void vmethod263(int[] var1, int var2, int var3) { + if (this.midiFile.isReady()) { + int var4 = this.midiFile.division * this.field496 / class309.PcmPlayer_sampleRate; do { - long var5 = (long)var4 * (long)var3 + this.__ac; - if(this.__ay - var5 >= 0L) { - this.__ac = var5; + long var5 = (long)var4 * (long)var3 + this.field515; + if (this.field516 - var5 >= 0L) { + this.field515 = var5; break; } - int var7 = (int)(((long)var4 + (this.__ay - this.__ac) - 1L) / (long)var4); - this.__ac += (long)var4 * (long)var7; - this.patchStream.__e_172(var1, var2, var7); + int var7 = (int)(((long)var4 + (this.field516 - this.field515) - 1L) / (long)var4); + this.field515 += (long)var4 * (long)var7; + this.patchStream.vmethod263(var1, var2, var7); var2 += var7; var3 -= var7; - this.__ai_367(); + this.method194(); } while(this.midiFile.isReady()); } - this.patchStream.__e_172(var1, var2, var3); + this.patchStream.vmethod263(var1, var2, var3); } @ObfuscatedName("x") @@ -265,11 +265,11 @@ public class MidiPcmStream extends PcmStream { public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { this.clear(); this.midiFile.parse(var1.midi); - this.__aj = var2; - this.__ac = 0L; + this.field514 = var2; + this.field515 = 0L; int var3 = this.midiFile.trackCount(); - for(int var4 = 0; var4 < var3; ++var4) { + for (int var4 = 0; var4 < var3; ++var4) { this.midiFile.gotoTrack(var4); this.midiFile.readTrackLength(var4); this.midiFile.markTrackPosition(var4); @@ -277,30 +277,30 @@ public class MidiPcmStream extends PcmStream { this.track = this.midiFile.getPrioritizedTrack(); this.trackLength = this.midiFile.trackLengths[this.track]; - this.__ay = this.midiFile.__a_372(this.trackLength); + this.field516 = this.midiFile.method168(this.trackLength); } @ObfuscatedName("d") - protected synchronized void __d_173(int var1) { - if(this.midiFile.isReady()) { - int var2 = this.midiFile.division * this.__q / class309.PcmPlayer_sampleRate; + protected synchronized void vmethod264(int var1) { + if (this.midiFile.isReady()) { + int var2 = this.midiFile.division * this.field496 / class309.PcmPlayer_sampleRate; do { - long var3 = this.__ac + (long)var2 * (long)var1; - if(this.__ay - var3 >= 0L) { - this.__ac = var3; + long var3 = this.field515 + (long)var2 * (long)var1; + if (this.field516 - var3 >= 0L) { + this.field515 = var3; break; } - int var5 = (int)(((long)var2 + (this.__ay - this.__ac) - 1L) / (long)var2); - this.__ac += (long)var5 * (long)var2; - this.patchStream.__d_173(var5); + int var5 = (int)(((long)var2 + (this.field516 - this.field515) - 1L) / (long)var2); + this.field515 += (long)var5 * (long)var2; + this.patchStream.vmethod264(var5); var1 -= var5; - this.__ai_367(); + this.method194(); } while(this.midiFile.isReady()); } - this.patchStream.__d_173(var1); + this.patchStream.vmethod264(var1); } @ObfuscatedName("a") @@ -311,7 +311,7 @@ public class MidiPcmStream extends PcmStream { @Export("clear") public synchronized void clear() { this.midiFile.clear(); - this.__at_354(); + this.method186(); } @ObfuscatedName("z") @@ -329,8 +329,8 @@ public class MidiPcmStream extends PcmStream { signature = "(III)V", garbageValue = "789206119" ) - public synchronized void __j_342(int var1, int var2) { - this.__s_343(var1, var2); + public synchronized void method174(int var1, int var2) { + this.method175(var1, var2); } @ObfuscatedName("s") @@ -338,10 +338,10 @@ public class MidiPcmStream extends PcmStream { signature = "(III)V", garbageValue = "-1475022240" ) - void __s_343(int var1, int var2) { - this.__l[var1] = var2; - this.__x[var1] = var2 & -128; - this.__t_344(var1, var2); + void method175(int var1, int var2) { + this.field500[var1] = var2; + this.field502[var1] = var2 & -128; + this.method176(var1, var2); } @ObfuscatedName("t") @@ -349,12 +349,12 @@ public class MidiPcmStream extends PcmStream { signature = "(III)V", garbageValue = "-213159072" ) - void __t_344(int var1, int var2) { - if(var2 != this.__e[var1]) { - this.__e[var1] = var2; + void method176(int var1, int var2) { + if (var2 != this.field501[var1]) { + this.field501[var1] = var2; - for(int var3 = 0; var3 < 128; ++var3) { - this.__ag[var1][var3] = null; + for (int var3 = 0; var3 < 128; ++var3) { + this.field513[var1][var3] = null; } } @@ -365,67 +365,68 @@ public class MidiPcmStream extends PcmStream { signature = "(IIIB)V", garbageValue = "15" ) - void __y_345(int var1, int var2, int var3) { - this.__b_347(var1, var2, 64); - if((this.__y[var1] & 2) != 0) { - for(MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { - if(var4.__m == var1 && var4.__a < 0) { - this.__v[var1][var4.__u] = null; - this.__v[var1][var2] = var4; - int var5 = (var4.__d * var4.__x >> 12) + var4.__e; - var4.__e += var2 - var4.__u << 8; - var4.__x = var5 - var4.__e; - var4.__d = 4096; - var4.__u = var2; + void method177(int var1, int var2, int var3) { + this.method179(var1, var2, 64); + if ((this.field506[var1] & 2) != 0) { + for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { + if (var4.field574 == var1 && var4.field586 < 0) { + this.field512[var1][var4.field577] = null; + this.field512[var1][var2] = var4; + int var5 = (var4.field582 * var4.field581 >> 12) + var4.field580; + var4.field580 += var2 - var4.field577 << 8; + var4.field581 = var5 - var4.field580; + var4.field582 = 4096; + var4.field577 = var2; return; } } } - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.__e[var1]); - if(var9 != null) { - RawSound var8 = var9.rawSounds[var2]; - if(var8 != null) { + MusicPatch var8 = (MusicPatch)this.musicPatches.get((long)this.field501[var1]); + if (var8 != null) { + RawSound var9 = var8.rawSounds[var2]; + if (var9 != null) { MusicPatchNode var6 = new MusicPatchNode(); - var6.__m = var1; - var6.patch = var9; - var6.rawSound = var8; - var6.__w = var9.__u[var2]; - var6.__o = var9.__g[var2]; - var6.__u = var2; - var6.__g = var3 * var3 * var9.__w[var2] * var9.__m + 1024 >> 11; - var6.__l = var9.__o[var2] & 255; - var6.__e = (var2 << 8) - (var9.__q[var2] & 32767); - var6.__k = 0; - var6.__n = 0; - var6.__i = 0; - var6.__a = -1; - var6.__z = 0; - if(this.__c[var1] == 0) { - var6.stream = RawPcmStream.method2524(var8, this.__aa_359(var6), this.__ax_360(var6), this.__af_361(var6)); + var6.field574 = var1; + var6.patch = var8; + var6.rawSound = var9; + var6.field575 = var8.field571[var2]; + var6.field576 = var8.field572[var2]; + var6.field577 = var2; + var6.field578 = var3 * var3 * var8.field569[var2] * var8.field567 + 1024 >> 11; + var6.field579 = var8.field570[var2] & 255; + var6.field580 = (var2 << 8) - (var8.field568[var2] & 32767); + var6.field583 = 0; + var6.field584 = 0; + var6.field585 = 0; + var6.field586 = -1; + var6.field587 = 0; + if (this.field509[var1] == 0) { + var6.stream = RawPcmStream.method2524(var9, this.method191(var6), this.method192(var6), this.method193(var6)); } else { - var6.stream = RawPcmStream.method2524(var8, this.__aa_359(var6), 0, this.__af_361(var6)); - this.__h_346(var6, var9.__q[var2] < 0); + var6.stream = RawPcmStream.method2524(var9, this.method191(var6), 0, this.method193(var6)); + this.method178(var6, var8.field568[var2] < 0); } - if(var9.__q[var2] < 0) { + if (var8.field568[var2] < 0) { var6.stream.setNumLoops(-1); } - if(var6.__o >= 0) { - MusicPatchNode var7 = this.__ag[var1][var6.__o]; - if(var7 != null && var7.__a < 0) { - this.__v[var1][var7.__u] = null; - var7.__a = 0; + if (var6.field576 >= 0) { + MusicPatchNode var7 = this.field513[var1][var6.field576]; + if (var7 != null && var7.field586 < 0) { + this.field512[var1][var7.field577] = null; + var7.field586 = 0; } - this.__ag[var1][var6.__o] = var6; + this.field513[var1][var6.field576] = var6; } this.patchStream.queue.addFirst(var6); - this.__v[var1][var2] = var6; + this.field512[var1][var2] = var6; } } + } @ObfuscatedName("h") @@ -433,22 +434,22 @@ public class MidiPcmStream extends PcmStream { signature = "(Lha;ZI)V", garbageValue = "-1455849160" ) - void __h_346(MusicPatchNode var1, boolean var2) { + void method178(MusicPatchNode var1, boolean var2) { int var3 = var1.rawSound.samples.length; int var4; - if(var2 && var1.rawSound.__o) { + if (var2 && var1.rawSound.field756) { int var5 = var3 + var3 - var1.rawSound.start; - var4 = (int)((long)var5 * (long)this.__c[var1.__m] >> 6); + var4 = (int)((long)var5 * (long)this.field509[var1.field574] >> 6); var3 <<= 8; - if(var4 >= var3) { + if (var4 >= var3) { var4 = var3 + var3 - 1 - var4; - var1.stream.__h_188(); + var1.stream.method271(); } } else { - var4 = (int)((long)this.__c[var1.__m] * (long)var3 >> 6); + var4 = (int)((long)this.field509[var1.field574] * (long)var3 >> 6); } - var1.stream.__y_187(var4); + var1.stream.method270(var4); } @ObfuscatedName("b") @@ -456,22 +457,22 @@ public class MidiPcmStream extends PcmStream { signature = "(IIII)V", garbageValue = "-1244653525" ) - void __b_347(int var1, int var2, int var3) { - MusicPatchNode var4 = this.__v[var1][var2]; - if(var4 != null) { - this.__v[var1][var2] = null; - if((this.__y[var1] & 2) != 0) { - for(MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { - if(var5.__m == var4.__m && var5.__a < 0 && var5 != var4) { - var4.__a = 0; + void method179(int var1, int var2, int var3) { + MusicPatchNode var4 = this.field512[var1][var2]; + if (var4 != null) { + this.field512[var1][var2] = null; + if ((this.field506[var1] & 2) != 0) { + for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var5.field574 == var4.field574 && var5.field586 < 0 && var5 != var4) { + var4.field586 = 0; break; } } } else { - var4.__a = 0; + var4.field586 = 0; } - } + } @ObfuscatedName("c") @@ -479,7 +480,7 @@ public class MidiPcmStream extends PcmStream { signature = "(IIII)V", garbageValue = "1055105177" ) - void __c_348(int var1, int var2, int var3) { + void method180(int var1, int var2, int var3) { } @ObfuscatedName("p") @@ -487,7 +488,7 @@ public class MidiPcmStream extends PcmStream { signature = "(IIB)V", garbageValue = "-43" ) - void __p_349(int var1, int var2) { + void method181(int var1, int var2) { } @ObfuscatedName("v") @@ -495,8 +496,8 @@ public class MidiPcmStream extends PcmStream { signature = "(IIB)V", garbageValue = "-1" ) - void __v_350(int var1, int var2) { - this.__d[var1] = var2; + void method182(int var1, int var2) { + this.field503[var1] = var2; } @ObfuscatedName("ah") @@ -504,20 +505,20 @@ public class MidiPcmStream extends PcmStream { signature = "(II)V", garbageValue = "137929054" ) - void __ah_351(int var1) { - for(MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if(var1 < 0 || var2.__m == var1) { - if(var2.stream != null) { - var2.stream.__v_192(class309.PcmPlayer_sampleRate / 100); - if(var2.stream.__at_196()) { + void method183(int var1) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var1 < 0 || var2.field574 == var1) { + if (var2.stream != null) { + var2.stream.method275(class309.PcmPlayer_sampleRate / 100); + if (var2.stream.method279()) { this.patchStream.mixer.addSubStream(var2.stream); } - var2.__m_370(); + var2.method219(); } - if(var2.__a < 0) { - this.__v[var2.__m][var2.__u] = null; + if (var2.field586 < 0) { + this.field512[var2.field574][var2.field577] = null; } var2.remove(); @@ -531,27 +532,27 @@ public class MidiPcmStream extends PcmStream { signature = "(II)V", garbageValue = "-59494316" ) - void __ab_352(int var1) { - if(var1 >= 0) { - this.__o[var1] = 12800; - this.__u[var1] = 8192; - this.__g[var1] = 16383; - this.__d[var1] = 8192; - this.__k[var1] = 0; - this.__n[var1] = 8192; - this.__ad_355(var1); - this.__ap_356(var1); - this.__y[var1] = 0; - this.__h[var1] = 32767; - this.__b[var1] = 256; - this.__c[var1] = 0; - this.__ao_358(var1, 8192); + void method184(int var1) { + if (var1 >= 0) { + this.field497[var1] = 12800; + this.field498[var1] = 8192; + this.field499[var1] = 16383; + this.field503[var1] = 8192; + this.field504[var1] = 0; + this.field505[var1] = 8192; + this.method187(var1); + this.method188(var1); + this.field506[var1] = 0; + this.field507[var1] = 32767; + this.field508[var1] = 256; + this.field509[var1] = 0; + this.method190(var1, 8192); } else { - for(var1 = 0; var1 < 16; ++var1) { - this.__ab_352(var1); + for (var1 = 0; var1 < 16; ++var1) { + this.method184(var1); } - } + } @ObfuscatedName("ae") @@ -559,11 +560,11 @@ public class MidiPcmStream extends PcmStream { signature = "(II)V", garbageValue = "1458917637" ) - void __ae_353(int var1) { - for(MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if((var1 < 0 || var2.__m == var1) && var2.__a < 0) { - this.__v[var2.__m][var2.__u] = null; - var2.__a = 0; + void method185(int var1) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if ((var1 < 0 || var2.field574 == var1) && var2.field586 < 0) { + this.field512[var2.field574][var2.field577] = null; + var2.field586 = 0; } } @@ -574,17 +575,17 @@ public class MidiPcmStream extends PcmStream { signature = "(I)V", garbageValue = "808372536" ) - void __at_354() { - this.__ah_351(-1); - this.__ab_352(-1); + void method186() { + this.method183(-1); + this.method184(-1); int var1; - for(var1 = 0; var1 < 16; ++var1) { - this.__e[var1] = this.__l[var1]; + for (var1 = 0; var1 < 16; ++var1) { + this.field501[var1] = this.field500[var1]; } - for(var1 = 0; var1 < 16; ++var1) { - this.__x[var1] = this.__l[var1] & -128; + for (var1 = 0; var1 < 16; ++var1) { + this.field502[var1] = this.field500[var1] & -128; } } @@ -594,11 +595,11 @@ public class MidiPcmStream extends PcmStream { signature = "(II)V", garbageValue = "-1934460661" ) - void __ad_355(int var1) { - if((this.__y[var1] & 2) != 0) { - for(MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if(var2.__m == var1 && this.__v[var1][var2.__u] == null && var2.__a < 0) { - var2.__a = 0; + void method187(int var1) { + if ((this.field506[var1] & 2) != 0) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var2.field574 == var1 && this.field512[var1][var2.field577] == null && var2.field586 < 0) { + var2.field586 = 0; } } } @@ -610,11 +611,11 @@ public class MidiPcmStream extends PcmStream { signature = "(II)V", garbageValue = "-1305073262" ) - void __ap_356(int var1) { - if((this.__y[var1] & 4) != 0) { - for(MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if(var2.__m == var1) { - var2.__b = 0; + void method188(int var1) { + if ((this.field506[var1] & 4) != 0) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var2.field574 == var1) { + var2.field591 = 0; } } } @@ -626,186 +627,192 @@ public class MidiPcmStream extends PcmStream { signature = "(II)V", garbageValue = "1168111396" ) - void __au_357(int var1) { + void method189(int var1) { int var2 = var1 & 240; int var3; int var4; int var5; - if(var2 == 128) { + if (var2 == 128) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - this.__b_347(var3, var4, var5); - } else if(var2 == 144) { + this.method179(var3, var4, var5); + } else if (var2 == 144) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - if(var5 > 0) { - this.__y_345(var3, var4, var5); + if (var5 > 0) { + this.method177(var3, var4, var5); } else { - this.__b_347(var3, var4, 64); + this.method179(var3, var4, 64); } - - } else if(var2 == 160) { + } else if (var2 == 160) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - this.__c_348(var3, var4, var5); - } else if(var2 == 176) { + this.method180(var3, var4, var5); + } else if (var2 == 176) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - if(var4 == 0) { - this.__x[var3] = (var5 << 14) + (this.__x[var3] & -2080769); + if (var4 == 0) { + this.field502[var3] = (var5 << 14) + (this.field502[var3] & -2080769); } - if(var4 == 32) { - this.__x[var3] = (var5 << 7) + (this.__x[var3] & -16257); + if (var4 == 32) { + this.field502[var3] = (var5 << 7) + (this.field502[var3] & -16257); } - if(var4 == 1) { - this.__k[var3] = (var5 << 7) + (this.__k[var3] & -16257); + if (var4 == 1) { + this.field504[var3] = (var5 << 7) + (this.field504[var3] & -16257); } - if(var4 == 33) { - this.__k[var3] = var5 + (this.__k[var3] & -128); + if (var4 == 33) { + this.field504[var3] = var5 + (this.field504[var3] & -128); } - if(var4 == 5) { - this.__n[var3] = (var5 << 7) + (this.__n[var3] & -16257); + if (var4 == 5) { + this.field505[var3] = (var5 << 7) + (this.field505[var3] & -16257); } - if(var4 == 37) { - this.__n[var3] = var5 + (this.__n[var3] & -128); + if (var4 == 37) { + this.field505[var3] = var5 + (this.field505[var3] & -128); } - if(var4 == 7) { - this.__o[var3] = (var5 << 7) + (this.__o[var3] & -16257); + if (var4 == 7) { + this.field497[var3] = (var5 << 7) + (this.field497[var3] & -16257); } - if(var4 == 39) { - this.__o[var3] = var5 + (this.__o[var3] & -128); + if (var4 == 39) { + this.field497[var3] = var5 + (this.field497[var3] & -128); } - if(var4 == 10) { - this.__u[var3] = (var5 << 7) + (this.__u[var3] & -16257); + if (var4 == 10) { + this.field498[var3] = (var5 << 7) + (this.field498[var3] & -16257); } - if(var4 == 42) { - this.__u[var3] = var5 + (this.__u[var3] & -128); + if (var4 == 42) { + this.field498[var3] = var5 + (this.field498[var3] & -128); } - if(var4 == 11) { - this.__g[var3] = (var5 << 7) + (this.__g[var3] & -16257); + if (var4 == 11) { + this.field499[var3] = (var5 << 7) + (this.field499[var3] & -16257); } - if(var4 == 43) { - this.__g[var3] = var5 + (this.__g[var3] & -128); + if (var4 == 43) { + this.field499[var3] = var5 + (this.field499[var3] & -128); } - if(var4 == 64) { - if(var5 >= 64) { - this.__y[var3] |= 1; + int[] var10000; + if (var4 == 64) { + if (var5 >= 64) { + var10000 = this.field506; + var10000[var3] |= 1; } else { - this.__y[var3] &= -2; + var10000 = this.field506; + var10000[var3] &= -2; } } - if(var4 == 65) { - if(var5 >= 64) { - this.__y[var3] |= 2; + if (var4 == 65) { + if (var5 >= 64) { + var10000 = this.field506; + var10000[var3] |= 2; } else { - this.__ad_355(var3); - this.__y[var3] &= -3; + this.method187(var3); + var10000 = this.field506; + var10000[var3] &= -3; } } - if(var4 == 99) { - this.__h[var3] = (var5 << 7) + (this.__h[var3] & 127); + if (var4 == 99) { + this.field507[var3] = (var5 << 7) + (this.field507[var3] & 127); } - if(var4 == 98) { - this.__h[var3] = (this.__h[var3] & 16256) + var5; + if (var4 == 98) { + this.field507[var3] = (this.field507[var3] & 16256) + var5; } - if(var4 == 101) { - this.__h[var3] = (var5 << 7) + (this.__h[var3] & 127) + 16384; + if (var4 == 101) { + this.field507[var3] = (var5 << 7) + (this.field507[var3] & 127) + 16384; } - if(var4 == 100) { - this.__h[var3] = (this.__h[var3] & 16256) + var5 + 16384; + if (var4 == 100) { + this.field507[var3] = (this.field507[var3] & 16256) + var5 + 16384; } - if(var4 == 120) { - this.__ah_351(var3); + if (var4 == 120) { + this.method183(var3); } - if(var4 == 121) { - this.__ab_352(var3); + if (var4 == 121) { + this.method184(var3); } - if(var4 == 123) { - this.__ae_353(var3); + if (var4 == 123) { + this.method185(var3); } int var6; - if(var4 == 6) { - var6 = this.__h[var3]; - if(var6 == 16384) { - this.__b[var3] = (var5 << 7) + (this.__b[var3] & -16257); + if (var4 == 6) { + var6 = this.field507[var3]; + if (var6 == 16384) { + this.field508[var3] = (var5 << 7) + (this.field508[var3] & -16257); } } - if(var4 == 38) { - var6 = this.__h[var3]; - if(var6 == 16384) { - this.__b[var3] = var5 + (this.__b[var3] & -128); + if (var4 == 38) { + var6 = this.field507[var3]; + if (var6 == 16384) { + this.field508[var3] = var5 + (this.field508[var3] & -128); } } - if(var4 == 16) { - this.__c[var3] = (var5 << 7) + (this.__c[var3] & -16257); + if (var4 == 16) { + this.field509[var3] = (var5 << 7) + (this.field509[var3] & -16257); } - if(var4 == 48) { - this.__c[var3] = var5 + (this.__c[var3] & -128); + if (var4 == 48) { + this.field509[var3] = var5 + (this.field509[var3] & -128); } - if(var4 == 81) { - if(var5 >= 64) { - this.__y[var3] |= 4; + if (var4 == 81) { + if (var5 >= 64) { + var10000 = this.field506; + var10000[var3] |= 4; } else { - this.__ap_356(var3); - this.__y[var3] &= -5; + this.method188(var3); + var10000 = this.field506; + var10000[var3] &= -5; } } - if(var4 == 17) { - this.__ao_358(var3, (var5 << 7) + (this.__r[var3] & -16257)); + if (var4 == 17) { + this.method190(var3, (var5 << 7) + (this.field510[var3] & -16257)); } - if(var4 == 49) { - this.__ao_358(var3, var5 + (this.__r[var3] & -128)); + if (var4 == 49) { + this.method190(var3, var5 + (this.field510[var3] & -128)); } - - } else if(var2 == 192) { + } else if (var2 == 192) { var3 = var1 & 15; var4 = var1 >> 8 & 127; - this.__t_344(var3, var4 + this.__x[var3]); - } else if(var2 == 208) { + this.method176(var3, var4 + this.field502[var3]); + } else if (var2 == 208) { var3 = var1 & 15; var4 = var1 >> 8 & 127; - this.__p_349(var3, var4); - } else if(var2 == 224) { + this.method181(var3, var4); + } else if (var2 == 224) { var3 = var1 & 15; var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); - this.__v_350(var3, var4); + this.method182(var3, var4); } else { var2 = var1 & 255; - if(var2 == 255) { - this.__at_354(); + if (var2 == 255) { + this.method186(); } } + } @ObfuscatedName("ao") @@ -813,9 +820,9 @@ public class MidiPcmStream extends PcmStream { signature = "(III)V", garbageValue = "1380282032" ) - void __ao_358(int var1, int var2) { - this.__r[var1] = var2; - this.__p[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); + void method190(int var1, int var2) { + this.field510[var1] = var2; + this.field511[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); } @ObfuscatedName("aa") @@ -823,25 +830,25 @@ public class MidiPcmStream extends PcmStream { signature = "(Lha;I)I", garbageValue = "-1821299983" ) - int __aa_359(MusicPatchNode var1) { - int var2 = (var1.__d * var1.__x >> 12) + var1.__e; - var2 += (this.__d[var1.__m] - 8192) * this.__b[var1.__m] >> 12; - MusicPatchNode2 var3 = var1.__w; + int method191(MusicPatchNode var1) { + int var2 = (var1.field582 * var1.field581 >> 12) + var1.field580; + var2 += (this.field503[var1.field574] - 8192) * this.field508[var1.field574] >> 12; + MusicPatchNode2 var3 = var1.field575; int var4; - if(var3.__l > 0 && (var3.__g > 0 || this.__k[var1.__m] > 0)) { - var4 = var3.__g << 2; - int var5 = var3.__e << 1; - if(var1.__j < var5) { - var4 = var4 * var1.__j / var5; + if (var3.field600 > 0 && (var3.field599 > 0 || this.field504[var1.field574] > 0)) { + var4 = var3.field599 << 2; + int var5 = var3.field601 << 1; + if (var1.field588 < var5) { + var4 = var4 * var1.field588 / var5; } - var4 += this.__k[var1.__m] >> 7; - double var6 = Math.sin((double)(var1.__s & 511) * 0.01227184630308513D); + var4 += this.field504[var1.field574] >> 7; + double var6 = Math.sin((double)(var1.field589 & 511) * 0.01227184630308513D); var2 += (int)(var6 * (double)var4); } var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)class309.PcmPlayer_sampleRate + 0.5D); - return var4 < 1?1:var4; + return var4 < 1 ? 1 : var4; } @ObfuscatedName("ax") @@ -849,39 +856,39 @@ public class MidiPcmStream extends PcmStream { signature = "(Lha;I)I", garbageValue = "24812899" ) - int __ax_360(MusicPatchNode var1) { - MusicPatchNode2 var2 = var1.__w; - int var3 = this.__o[var1.__m] * this.__g[var1.__m] + 4096 >> 13; + int method192(MusicPatchNode var1) { + MusicPatchNode2 var2 = var1.field575; + int var3 = this.field497[var1.field574] * this.field499[var1.field574] + 4096 >> 13; var3 = var3 * var3 + 16384 >> 15; - var3 = var3 * var1.__g + 16384 >> 15; - var3 = var3 * this.__f + 128 >> 8; - if(var2.__q > 0) { - var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.__q * (double)var1.__k * 1.953125E-5D) + 0.5D); + var3 = var3 * var1.field578 + 16384 >> 15; + var3 = var3 * this.field495 + 128 >> 8; + if (var2.field595 > 0) { + var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field595 * (double)var1.field583 * 1.953125E-5D) + 0.5D); } int var4; int var5; int var6; int var7; - if(var2.__m != null) { - var4 = var1.__n; - var5 = var2.__m[var1.__i + 1]; - if(var1.__i < var2.__m.length - 2) { - var6 = (var2.__m[var1.__i] & 255) << 8; - var7 = (var2.__m[var1.__i + 2] & 255) << 8; - var5 += (var2.__m[var1.__i + 3] - var5) * (var4 - var6) / (var7 - var6); + if (var2.field593 != null) { + var4 = var1.field584; + var5 = var2.field593[var1.field585 + 1]; + if (var1.field585 < var2.field593.length - 2) { + var6 = (var2.field593[var1.field585] & 255) << 8; + var7 = (var2.field593[var1.field585 + 2] & 255) << 8; + var5 += (var2.field593[var1.field585 + 3] - var5) * (var4 - var6) / (var7 - var6); } var3 = var5 * var3 + 32 >> 6; } - if(var1.__a > 0 && var2.__f != null) { - var4 = var1.__a; - var5 = var2.__f[var1.__z + 1]; - if(var1.__z < var2.__f.length - 2) { - var6 = (var2.__f[var1.__z] & 255) << 8; - var7 = (var2.__f[var1.__z + 2] & 255) << 8; - var5 += (var4 - var6) * (var2.__f[var1.__z + 3] - var5) / (var7 - var6); + if (var1.field586 > 0 && var2.field594 != null) { + var4 = var1.field586; + var5 = var2.field594[var1.field587 + 1]; + if (var1.field587 < var2.field594.length - 2) { + var6 = (var2.field594[var1.field587] & 255) << 8; + var7 = (var2.field594[var1.field587 + 2] & 255) << 8; + var5 += (var4 - var6) * (var2.field594[var1.field587 + 3] - var5) / (var7 - var6); } var3 = var3 * var5 + 32 >> 6; @@ -895,9 +902,9 @@ public class MidiPcmStream extends PcmStream { signature = "(Lha;I)I", garbageValue = "360643400" ) - int __af_361(MusicPatchNode var1) { - int var2 = this.__u[var1.__m]; - return var2 < 8192?var2 * var1.__l + 32 >> 6:16384 - ((128 - var1.__l) * (16384 - var2) + 32 >> 6); + int method193(MusicPatchNode var1) { + int var2 = this.field498[var1.field574]; + return var2 < 8192 ? var2 * var1.field579 + 32 >> 6 : 16384 - ((128 - var1.field579) * (16384 - var2) + 32 >> 6); } @ObfuscatedName("ai") @@ -905,21 +912,21 @@ public class MidiPcmStream extends PcmStream { signature = "(B)V", garbageValue = "30" ) - void __ai_367() { + void method194() { int var1 = this.track; int var2 = this.trackLength; long var3; - for(var3 = this.__ay; var2 == this.trackLength; var3 = this.midiFile.__a_372(var2)) { - while(var2 == this.midiFile.trackLengths[var1]) { + for (var3 = this.field516; var2 == this.trackLength; var3 = this.midiFile.method168(var2)) { + while (var2 == this.midiFile.trackLengths[var1]) { this.midiFile.gotoTrack(var1); int var5 = this.midiFile.readMessage(var1); - if(var5 == 1) { + if (var5 == 1) { this.midiFile.setTrackDone(); this.midiFile.markTrackPosition(var1); - if(this.midiFile.isDone()) { - if(!this.__aj || var2 == 0) { - this.__at_354(); + if (this.midiFile.isDone()) { + if (!this.field514 || var2 == 0) { + this.method186(); this.midiFile.clear(); return; } @@ -929,8 +936,8 @@ public class MidiPcmStream extends PcmStream { break; } - if((var5 & 128) != 0) { - this.__au_357(var5); + if ((var5 & 128) != 0) { + this.method189(var5); } this.midiFile.readTrackLength(var1); @@ -943,7 +950,7 @@ public class MidiPcmStream extends PcmStream { this.track = var1; this.trackLength = var2; - this.__ay = var3; + this.field516 = var3; } @ObfuscatedName("ba") @@ -951,12 +958,12 @@ public class MidiPcmStream extends PcmStream { signature = "(Lha;I)Z", garbageValue = "1820762013" ) - boolean __ba_368(MusicPatchNode var1) { - if(var1.stream == null) { - if(var1.__a >= 0) { + boolean method195(MusicPatchNode var1) { + if (var1.stream == null) { + if (var1.field586 >= 0) { var1.remove(); - if(var1.__o > 0 && var1 == this.__ag[var1.__m][var1.__o]) { - this.__ag[var1.__m][var1.__o] = null; + if (var1.field576 > 0 && var1 == this.field513[var1.field574][var1.field576]) { + this.field513[var1.field574][var1.field576] = null; } } @@ -971,95 +978,95 @@ public class MidiPcmStream extends PcmStream { signature = "(Lha;[IIII)Z", garbageValue = "-1605961549" ) - boolean __bb_369(MusicPatchNode var1, int[] var2, int var3, int var4) { - var1.__y = class309.PcmPlayer_sampleRate / 100; - if(var1.__a < 0 || var1.stream != null && !var1.stream.__ae_195()) { - int var5 = var1.__d; - if(var5 > 0) { - var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.__n[var1.__m] * 4.921259842519685E-4D) + 0.5D); - if(var5 < 0) { + boolean method196(MusicPatchNode var1, int[] var2, int var3, int var4) { + var1.field590 = class309.PcmPlayer_sampleRate / 100; + if (var1.field586 < 0 || var1.stream != null && !var1.stream.method278()) { + int var5 = var1.field582; + if (var5 > 0) { + var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field505[var1.field574] * 4.921259842519685E-4D) + 0.5D); + if (var5 < 0) { var5 = 0; } - var1.__d = var5; + var1.field582 = var5; } - var1.stream.__ah_193(this.__aa_359(var1)); - MusicPatchNode2 var6 = var1.__w; + var1.stream.method276(this.method191(var1)); + MusicPatchNode2 var6 = var1.field575; boolean var7 = false; - ++var1.__j; - var1.__s += var6.__l; - double var8 = 5.086263020833333E-6D * (double)((var1.__u - 60 << 8) + (var1.__x * var1.__d >> 12)); - if(var6.__q > 0) { - if(var6.__u > 0) { - var1.__k += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.__u) + 0.5D); + ++var1.field588; + var1.field589 += var6.field600; + double var8 = 5.086263020833333E-6D * (double)((var1.field577 - 60 << 8) + (var1.field581 * var1.field582 >> 12)); + if (var6.field595 > 0) { + if (var6.field598 > 0) { + var1.field583 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field598) + 0.5D); } else { - var1.__k += 128; + var1.field583 += 128; } } - if(var6.__m != null) { - if(var6.__w > 0) { - var1.__n += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.__w) + 0.5D); + if (var6.field593 != null) { + if (var6.field596 > 0) { + var1.field584 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field596) + 0.5D); } else { - var1.__n += 128; + var1.field584 += 128; } - while(var1.__i < var6.__m.length - 2 && var1.__n > (var6.__m[var1.__i + 2] & 255) << 8) { - var1.__i += 2; + while (var1.field585 < var6.field593.length - 2 && var1.field584 > (var6.field593[var1.field585 + 2] & 255) << 8) { + var1.field585 += 2; } - if(var6.__m.length - 2 == var1.__i && var6.__m[var1.__i + 1] == 0) { + if (var6.field593.length - 2 == var1.field585 && var6.field593[var1.field585 + 1] == 0) { var7 = true; } } - if(var1.__a >= 0 && var6.__f != null && (this.__y[var1.__m] & 1) == 0 && (var1.__o < 0 || var1 != this.__ag[var1.__m][var1.__o])) { - if(var6.__o > 0) { - var1.__a += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.__o) + 0.5D); + if (var1.field586 >= 0 && var6.field594 != null && (this.field506[var1.field574] & 1) == 0 && (var1.field576 < 0 || var1 != this.field513[var1.field574][var1.field576])) { + if (var6.field597 > 0) { + var1.field586 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field597) + 0.5D); } else { - var1.__a += 128; + var1.field586 += 128; } - while(var1.__z < var6.__f.length - 2 && var1.__a > (var6.__f[var1.__z + 2] & 255) << 8) { - var1.__z += 2; + while (var1.field587 < var6.field594.length - 2 && var1.field586 > (var6.field594[var1.field587 + 2] & 255) << 8) { + var1.field587 += 2; } - if(var6.__f.length - 2 == var1.__z) { + if (var6.field594.length - 2 == var1.field587) { var7 = true; } } - if(var7) { - var1.stream.__v_192(var1.__y); - if(var2 != null) { - var1.stream.__e_172(var2, var3, var4); + if (var7) { + var1.stream.method275(var1.field590); + if (var2 != null) { + var1.stream.vmethod263(var2, var3, var4); } else { - var1.stream.__d_173(var4); + var1.stream.vmethod264(var4); } - if(var1.stream.__at_196()) { + if (var1.stream.method279()) { this.patchStream.mixer.addSubStream(var1.stream); } - var1.__m_370(); - if(var1.__a >= 0) { + var1.method219(); + if (var1.field586 >= 0) { var1.remove(); - if(var1.__o > 0 && var1 == this.__ag[var1.__m][var1.__o]) { - this.__ag[var1.__m][var1.__o] = null; + if (var1.field576 > 0 && var1 == this.field513[var1.field574][var1.field576]) { + this.field513[var1.field574][var1.field576] = null; } } return true; } else { - var1.stream.__p_191(var1.__y, this.__ax_360(var1), this.__af_361(var1)); + var1.stream.method274(var1.field590, this.method192(var1), this.method193(var1)); return false; } } else { - var1.__m_370(); + var1.method219(); var1.remove(); - if(var1.__o > 0 && var1 == this.__ag[var1.__m][var1.__o]) { - this.__ag[var1.__m][var1.__o] = null; + if (var1.field576 > 0 && var1 == this.field513[var1.field574][var1.field576]) { + this.field513[var1.field574][var1.field576] = null; } return true; @@ -1074,11 +1081,11 @@ public class MidiPcmStream extends PcmStream { @Export("PcmStream_disable") static final void PcmStream_disable(PcmStream var0) { var0.active = false; - if(var0.sound != null) { + if (var0.sound != null) { var0.sound.position = 0; } - for(PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { + for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { PcmStream_disable(var1); } diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 14f7d02a67..0693a0531c 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -14,42 +14,42 @@ public class MilliClock extends Clock { @Export("decimator") static Decimator decimator; @ObfuscatedName("m") - long[] __m; + long[] field517; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1940981129 ) - int __f; + int field518; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 1217137493 ) - int __q; + int field519; @ObfuscatedName("w") @ObfuscatedGetter( longValue = -8372744267470318611L ) - long __w; + long field520; @ObfuscatedName("o") @ObfuscatedGetter( intValue = 250272357 ) - int __o; + int field521; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 576555527 ) - int __u; + int field522; public MilliClock() { - this.__m = new long[10]; - this.__f = 256; - this.__q = 1; - this.__o = 0; - this.__w = class203.currentTimeMs(); + this.field517 = new long[10]; + this.field518 = 256; + this.field519 = 1; + this.field521 = 0; + this.field520 = class203.currentTimeMs(); - for(int var1 = 0; var1 < 10; ++var1) { - this.__m[var1] = this.__w; + for (int var1 = 0; var1 < 10; ++var1) { + this.field517[var1] = this.field520; } } @@ -61,8 +61,8 @@ public class MilliClock extends Clock { ) @Export("mark") public void mark() { - for(int var1 = 0; var1 < 10; ++var1) { - this.__m[var1] = 0L; + for (int var1 = 0; var1 < 10; ++var1) { + this.field517[var1] = 0L; } } @@ -74,53 +74,54 @@ public class MilliClock extends Clock { ) @Export("wait") public int wait(int var1, int var2) { - int var3 = this.__f; - int var4 = this.__q; - this.__f = 300; - this.__q = 1; - this.__w = class203.currentTimeMs(); - if(0L == this.__m[this.__u]) { - this.__f = var3; - this.__q = var4; - } else if(this.__w > this.__m[this.__u]) { - this.__f = (int)((long)(var1 * 2560) / (this.__w - this.__m[this.__u])); + int var3 = this.field518; + int var4 = this.field519; + this.field518 = 300; + this.field519 = 1; + this.field520 = class203.currentTimeMs(); + if (0L == this.field517[this.field522]) { + this.field518 = var3; + this.field519 = var4; + } else if (this.field520 > this.field517[this.field522]) { + this.field518 = (int)((long)(var1 * 2560) / (this.field520 - this.field517[this.field522])); } - if(this.__f < 25) { - this.__f = 25; + if (this.field518 < 25) { + this.field518 = 25; } - if(this.__f > 256) { - this.__f = 256; - this.__q = (int)((long)var1 - (this.__w - this.__m[this.__u]) / 10L); + if (this.field518 > 256) { + this.field518 = 256; + this.field519 = (int)((long)var1 - (this.field520 - this.field517[this.field522]) / 10L); } - if(this.__q > var1) { - this.__q = var1; + if (this.field519 > var1) { + this.field519 = var1; } - this.__m[this.__u] = this.__w; - this.__u = (this.__u + 1) % 10; + this.field517[this.field522] = this.field520; + this.field522 = (this.field522 + 1) % 10; int var5; - if(this.__q > 1) { - for(var5 = 0; var5 < 10; ++var5) { - if(this.__m[var5] != 0L) { - this.__m[var5] += (long)this.__q; + if (this.field519 > 1) { + for (var5 = 0; var5 < 10; ++var5) { + if (this.field517[var5] != 0L) { + long[] var10000 = this.field517; + var10000[var5] += (long)this.field519; } } } - if(this.__q < var2) { - this.__q = var2; + if (this.field519 < var2) { + this.field519 = var2; } - class203.method4010((long)this.__q); + class203.method4010((long)this.field519); - for(var5 = 0; this.__o < 256; this.__o += this.__f) { + for (var5 = 0; this.field521 < 256; this.field521 += this.field518) { ++var5; } - this.__o &= 255; + this.field521 &= 255; return var5; } @@ -130,7 +131,7 @@ public class MilliClock extends Clock { garbageValue = "-1374398116" ) static void method3400(World[] var0, int var1, int var2, int[] var3, int[] var4) { - if(var1 < var2) { + if (var1 < var2) { int var5 = var1 - 1; int var6 = var2 + 1; int var7 = (var2 + var1) / 2; @@ -138,7 +139,7 @@ public class MilliClock extends Clock { var0[var7] = var0[var1]; var0[var1] = var8; - while(var5 < var6) { + while (var5 < var6) { boolean var9 = true; int var10; @@ -147,36 +148,36 @@ public class MilliClock extends Clock { do { --var6; - for(var10 = 0; var10 < 4; ++var10) { - if(var3[var10] == 2) { + for (var10 = 0; var10 < 4; ++var10) { + if (var3[var10] == 2) { var11 = var0[var6].index; var12 = var8.index; - } else if(var3[var10] == 1) { + } else if (var3[var10] == 1) { var11 = var0[var6].population; var12 = var8.population; - if(var11 == -1 && var4[var10] == 1) { + if (var11 == -1 && var4[var10] == 1) { var11 = 2001; } - if(var12 == -1 && var4[var10] == 1) { + if (var12 == -1 && var4[var10] == 1) { var12 = 2001; } - } else if(var3[var10] == 3) { - var11 = var0[var6].isMembersOnly()?1:0; - var12 = var8.isMembersOnly()?1:0; + } else if (var3[var10] == 3) { + var11 = var0[var6].isMembersOnly() ? 1 : 0; + var12 = var8.isMembersOnly() ? 1 : 0; } else { var11 = var0[var6].id; var12 = var8.id; } - if(var12 != var11) { - if((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { + if (var12 != var11) { + if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { var9 = false; } break; } - if(var10 == 3) { + if (var10 == 3) { var9 = false; } } @@ -187,42 +188,42 @@ public class MilliClock extends Clock { do { ++var5; - for(var10 = 0; var10 < 4; ++var10) { - if(var3[var10] == 2) { + for (var10 = 0; var10 < 4; ++var10) { + if (var3[var10] == 2) { var11 = var0[var5].index; var12 = var8.index; - } else if(var3[var10] == 1) { + } else if (var3[var10] == 1) { var11 = var0[var5].population; var12 = var8.population; - if(var11 == -1 && var4[var10] == 1) { + if (var11 == -1 && var4[var10] == 1) { var11 = 2001; } - if(var12 == -1 && var4[var10] == 1) { + if (var12 == -1 && var4[var10] == 1) { var12 = 2001; } - } else if(var3[var10] == 3) { - var11 = var0[var5].isMembersOnly()?1:0; - var12 = var8.isMembersOnly()?1:0; + } else if (var3[var10] == 3) { + var11 = var0[var5].isMembersOnly() ? 1 : 0; + var12 = var8.isMembersOnly() ? 1 : 0; } else { var11 = var0[var5].id; var12 = var8.id; } - if(var11 != var12) { - if((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { + if (var11 != var12) { + if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { var9 = false; } break; } - if(var10 == 3) { + if (var10 == 3) { var9 = false; } } } while(var9); - if(var5 < var6) { + if (var5 < var6) { World var13 = var0[var5]; var0[var5] = var0[var6]; var0[var6] = var13; diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index bd90fa306f..1d8fefe2ee 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -25,9 +25,9 @@ public class Model extends Entity { @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; @ObfuscatedName("at") - static boolean[] __du_at; + static boolean[] field523; @ObfuscatedName("ad") - static boolean[] __du_ad; + static boolean[] field524; @ObfuscatedName("ap") @Export("modelViewportXs") static int[] modelViewportXs; @@ -35,33 +35,33 @@ public class Model extends Entity { @Export("modelViewportYs") static int[] modelViewportYs; @ObfuscatedName("am") - static int[] __du_am; + static int[] field525; @ObfuscatedName("an") - static int[] __du_an; + static int[] field526; @ObfuscatedName("az") - static int[] __du_az; + static int[] field527; @ObfuscatedName("au") - static int[] __du_au; + static int[] field528; @ObfuscatedName("aa") - static int[] __du_aa; + static int[] field529; @ObfuscatedName("ax") - static int[][] __du_ax; + static int[][] field530; @ObfuscatedName("af") - static int[] __du_af; + static int[] field531; @ObfuscatedName("ai") - static int[][] __du_ai; + static int[][] field532; @ObfuscatedName("ba") - static int[] __du_ba; + static int[] field533; @ObfuscatedName("bb") - static int[] __du_bb; + static int[] field534; @ObfuscatedName("bs") - static int[] __du_bs; + static int[] field535; @ObfuscatedName("bq") - static int[] __du_bq; + static int[] field536; @ObfuscatedName("bn") - static int[] __du_bn; + static int[] field537; @ObfuscatedName("bk") - static int[] __du_bk; + static int[] field538; @ObfuscatedName("bd") @Export("Model_transformTempX") static int Model_transformTempX; @@ -72,7 +72,7 @@ public class Model extends Entity { @Export("Model_transformTempZ") static int Model_transformTempZ; @ObfuscatedName("bx") - static boolean __du_bx; + static boolean field539; @ObfuscatedName("bm") @Export("Model_sine") static int[] Model_sine; @@ -80,9 +80,9 @@ public class Model extends Entity { @Export("Model_cosine") static int[] Model_cosine; @ObfuscatedName("br") - static int[] __du_br; + static int[] field540; @ObfuscatedName("bj") - static int[] __du_bj; + static int[] field541; @ObfuscatedName("o") @Export("verticesCount") int verticesCount; @@ -123,20 +123,20 @@ public class Model extends Entity { @Export("faceAlphas") byte[] faceAlphas; @ObfuscatedName("s") - byte[] __s; + byte[] field542; @ObfuscatedName("t") @Export("faceTextures") short[] faceTextures; @ObfuscatedName("y") - byte __y; + byte field543; @ObfuscatedName("h") - int __h; + int field544; @ObfuscatedName("b") - int[] __b; + int[] field545; @ObfuscatedName("c") - int[] __c; + int[] field546; @ObfuscatedName("r") - int[] __r; + int[] field547; @ObfuscatedName("p") @Export("vertexLabels") int[][] vertexLabels; @@ -180,41 +180,11 @@ public class Model extends Entity { @Export("zMidOffset") int zMidOffset; - static { - Model_sharedSequenceModel = new Model(); - Model_sharedSequenceModelFaceAlphas = new byte[1]; - Model_sharedSpotAnimationModel = new Model(); - Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; - __du_at = new boolean[4700]; - __du_ad = new boolean[4700]; - modelViewportXs = new int[4700]; - modelViewportYs = new int[4700]; - __du_am = new int[4700]; - __du_an = new int[4700]; - __du_az = new int[4700]; - __du_au = new int[4700]; - __du_aa = new int[1600]; - __du_ax = new int[1600][512]; - __du_af = new int[12]; - __du_ai = new int[12][2000]; - __du_ba = new int[2000]; - __du_bb = new int[2000]; - __du_bs = new int[12]; - __du_bq = new int[10]; - __du_bn = new int[10]; - __du_bk = new int[10]; - __du_bx = true; - Model_sine = Rasterizer3D.Rasterizer3D_sine; - Model_cosine = Rasterizer3D.Rasterizer3D_cosine; - __du_br = Rasterizer3D.Rasterizer3D_colorPalette; - __du_bj = Rasterizer3D.__et_p; - } - Model() { this.verticesCount = 0; this.indicesCount = 0; - this.__y = 0; - this.__h = 0; + this.field543 = 0; + this.field544 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; @@ -227,8 +197,8 @@ public class Model extends Entity { public Model(Model[] var1, int var2) { this.verticesCount = 0; this.indicesCount = 0; - this.__y = 0; - this.__h = 0; + this.field543 = 0; + this.field544 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; @@ -239,32 +209,32 @@ public class Model extends Entity { boolean var6 = false; this.verticesCount = 0; this.indicesCount = 0; - this.__h = 0; - this.__y = -1; + this.field544 = 0; + this.field543 = -1; int var7; Model var8; - for(var7 = 0; var7 < var2; ++var7) { + for (var7 = 0; var7 < var2; ++var7) { var8 = var1[var7]; - if(var8 != null) { + if (var8 != null) { this.verticesCount += var8.verticesCount; this.indicesCount += var8.indicesCount; - this.__h += var8.__h; - if(var8.faceRenderPriorities != null) { + this.field544 += var8.field544; + if (var8.faceRenderPriorities != null) { var3 = true; } else { - if(this.__y == -1) { - this.__y = var8.__y; + if (this.field543 == -1) { + this.field543 = var8.field543; } - if(this.__y != var8.__y) { + if (this.field543 != var8.field543) { var3 = true; } } var4 |= var8.faceAlphas != null; var5 |= var8.faceTextures != null; - var6 |= var8.__s != null; + var6 |= var8.field542 != null; } } @@ -277,82 +247,82 @@ public class Model extends Entity { this.faceColors1 = new int[this.indicesCount]; this.faceColors2 = new int[this.indicesCount]; this.faceColors3 = new int[this.indicesCount]; - if(var3) { + if (var3) { this.faceRenderPriorities = new byte[this.indicesCount]; } - if(var4) { + if (var4) { this.faceAlphas = new byte[this.indicesCount]; } - if(var5) { + if (var5) { this.faceTextures = new short[this.indicesCount]; } - if(var6) { - this.__s = new byte[this.indicesCount]; + if (var6) { + this.field542 = new byte[this.indicesCount]; } - if(this.__h > 0) { - this.__b = new int[this.__h]; - this.__c = new int[this.__h]; - this.__r = new int[this.__h]; + if (this.field544 > 0) { + this.field545 = new int[this.field544]; + this.field546 = new int[this.field544]; + this.field547 = new int[this.field544]; } this.verticesCount = 0; this.indicesCount = 0; - this.__h = 0; + this.field544 = 0; - for(var7 = 0; var7 < var2; ++var7) { + for (var7 = 0; var7 < var2; ++var7) { var8 = var1[var7]; - if(var8 != null) { + if (var8 != null) { int var9; - for(var9 = 0; var9 < var8.indicesCount; ++var9) { + for (var9 = 0; var9 < var8.indicesCount; ++var9) { this.indices1[this.indicesCount] = this.verticesCount + var8.indices1[var9]; this.indices2[this.indicesCount] = this.verticesCount + var8.indices2[var9]; this.indices3[this.indicesCount] = this.verticesCount + var8.indices3[var9]; this.faceColors1[this.indicesCount] = var8.faceColors1[var9]; this.faceColors2[this.indicesCount] = var8.faceColors2[var9]; this.faceColors3[this.indicesCount] = var8.faceColors3[var9]; - if(var3) { - if(var8.faceRenderPriorities != null) { + if (var3) { + if (var8.faceRenderPriorities != null) { this.faceRenderPriorities[this.indicesCount] = var8.faceRenderPriorities[var9]; } else { - this.faceRenderPriorities[this.indicesCount] = var8.__y; + this.faceRenderPriorities[this.indicesCount] = var8.field543; } } - if(var4 && var8.faceAlphas != null) { + if (var4 && var8.faceAlphas != null) { this.faceAlphas[this.indicesCount] = var8.faceAlphas[var9]; } - if(var5) { - if(var8.faceTextures != null) { + if (var5) { + if (var8.faceTextures != null) { this.faceTextures[this.indicesCount] = var8.faceTextures[var9]; } else { this.faceTextures[this.indicesCount] = -1; } } - if(var6) { - if(var8.__s != null && var8.__s[var9] != -1) { - this.__s[this.indicesCount] = (byte)(this.__h + var8.__s[var9]); + if (var6) { + if (var8.field542 != null && var8.field542[var9] != -1) { + this.field542[this.indicesCount] = (byte)(this.field544 + var8.field542[var9]); } else { - this.__s[this.indicesCount] = -1; + this.field542[this.indicesCount] = -1; } } ++this.indicesCount; } - for(var9 = 0; var9 < var8.__h; ++var9) { - this.__b[this.__h] = this.verticesCount + var8.__b[var9]; - this.__c[this.__h] = this.verticesCount + var8.__c[var9]; - this.__r[this.__h] = this.verticesCount + var8.__r[var9]; - ++this.__h; + for (var9 = 0; var9 < var8.field544; ++var9) { + this.field545[this.field544] = this.verticesCount + var8.field545[var9]; + this.field546[this.field544] = this.verticesCount + var8.field546[var9]; + this.field547[this.field544] = this.verticesCount + var8.field547[var9]; + ++this.field544; } - for(var9 = 0; var9 < var8.verticesCount; ++var9) { + for (var9 = 0; var9 < var8.verticesCount; ++var9) { this.verticesX[this.verticesCount] = var8.verticesX[var9]; this.verticesY[this.verticesCount] = var8.verticesY[var9]; this.verticesZ[this.verticesCount] = var8.verticesZ[var9]; @@ -374,20 +344,20 @@ public class Model extends Entity { int var8 = var2 + this.xzRadius; int var9 = var4 - this.xzRadius; int var10 = var4 + this.xzRadius; - if(var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { + if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { var7 >>= 7; var8 = var8 + 127 >> 7; var9 >>= 7; var10 = var10 + 127 >> 7; - if(var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { + if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { return this; } else { Model var11; - if(var5) { + if (var5) { var11 = new Model(); var11.verticesCount = this.verticesCount; var11.indicesCount = this.indicesCount; - var11.__h = this.__h; + var11.field544 = this.field544; var11.verticesX = this.verticesX; var11.verticesZ = this.verticesZ; var11.indices1 = this.indices1; @@ -398,12 +368,12 @@ public class Model extends Entity { var11.faceColors3 = this.faceColors3; var11.faceRenderPriorities = this.faceRenderPriorities; var11.faceAlphas = this.faceAlphas; - var11.__s = this.__s; + var11.field542 = this.field542; var11.faceTextures = this.faceTextures; - var11.__y = this.__y; - var11.__b = this.__b; - var11.__c = this.__c; - var11.__r = this.__r; + var11.field543 = this.field543; + var11.field545 = this.field545; + var11.field546 = this.field546; + var11.field547 = this.field547; var11.vertexLabels = this.vertexLabels; var11.faceLabelsAlpha = this.faceLabelsAlpha; var11.isSingleTile = this.isSingleTile; @@ -422,8 +392,8 @@ public class Model extends Entity { int var19; int var20; int var21; - if(var6 == 0) { - for(var12 = 0; var12 < var11.verticesCount; ++var12) { + if (var6 == 0) { + for (var12 = 0; var12 < var11.verticesCount; ++var12) { var13 = var2 + this.verticesX[var12]; var14 = var4 + this.verticesZ[var12]; var15 = var13 & 127; @@ -436,9 +406,9 @@ public class Model extends Entity { var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; } } else { - for(var12 = 0; var12 < var11.verticesCount; ++var12) { + for (var12 = 0; var12 < var11.verticesCount; ++var12) { var13 = (-this.verticesY[var12] << 16) / super.height; - if(var13 < var6) { + if (var13 < var6) { var14 = var2 + this.verticesX[var12]; var15 = var4 + this.verticesZ[var12]; var16 = var14 & 127; @@ -467,7 +437,7 @@ public class Model extends Entity { ) @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { - if(!var1 && Model_sharedSequenceModelFaceAlphas.length < this.indicesCount) { + if (!var1 && Model_sharedSequenceModelFaceAlphas.length < this.indicesCount) { Model_sharedSequenceModelFaceAlphas = new byte[this.indicesCount + 100]; } @@ -480,7 +450,7 @@ public class Model extends Entity { ) @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { - if(!var1 && Model_sharedSpotAnimationModelFaceAlphas.length < this.indicesCount) { + if (!var1 && Model_sharedSpotAnimationModelFaceAlphas.length < this.indicesCount) { Model_sharedSpotAnimationModelFaceAlphas = new byte[this.indicesCount + 100]; } @@ -495,30 +465,30 @@ public class Model extends Entity { Model buildSharedModel(boolean var1, Model var2, byte[] var3) { var2.verticesCount = this.verticesCount; var2.indicesCount = this.indicesCount; - var2.__h = this.__h; - if(var2.verticesX == null || var2.verticesX.length < this.verticesCount) { + var2.field544 = this.field544; + if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { var2.verticesX = new int[this.verticesCount + 100]; var2.verticesY = new int[this.verticesCount + 100]; var2.verticesZ = new int[this.verticesCount + 100]; } int var4; - for(var4 = 0; var4 < this.verticesCount; ++var4) { + for (var4 = 0; var4 < this.verticesCount; ++var4) { var2.verticesX[var4] = this.verticesX[var4]; var2.verticesY[var4] = this.verticesY[var4]; var2.verticesZ[var4] = this.verticesZ[var4]; } - if(var1) { + if (var1) { var2.faceAlphas = this.faceAlphas; } else { var2.faceAlphas = var3; - if(this.faceAlphas == null) { - for(var4 = 0; var4 < this.indicesCount; ++var4) { + if (this.faceAlphas == null) { + for (var4 = 0; var4 < this.indicesCount; ++var4) { var2.faceAlphas[var4] = 0; } } else { - for(var4 = 0; var4 < this.indicesCount; ++var4) { + for (var4 = 0; var4 < this.indicesCount; ++var4) { var2.faceAlphas[var4] = this.faceAlphas[var4]; } } @@ -531,12 +501,12 @@ public class Model extends Entity { var2.faceColors2 = this.faceColors2; var2.faceColors3 = this.faceColors3; var2.faceRenderPriorities = this.faceRenderPriorities; - var2.__s = this.__s; + var2.field542 = this.field542; var2.faceTextures = this.faceTextures; - var2.__y = this.__y; - var2.__b = this.__b; - var2.__c = this.__c; - var2.__r = this.__r; + var2.field543 = this.field543; + var2.field545 = this.field545; + var2.field546 = this.field546; + var2.field547 = this.field547; var2.vertexLabels = this.vertexLabels; var2.faceLabelsAlpha = this.faceLabelsAlpha; var2.isSingleTile = this.isSingleTile; @@ -547,7 +517,7 @@ public class Model extends Entity { @ObfuscatedName("o") @Export("calculateBoundingBox") void calculateBoundingBox(int var1) { - if(this.xMidOffset == -1) { + if (this.xMidOffset == -1) { int var2 = 0; int var3 = 0; int var4 = 0; @@ -557,31 +527,31 @@ public class Model extends Entity { int var8 = Model_cosine[var1]; int var9 = Model_sine[var1]; - for(int var10 = 0; var10 < this.verticesCount; ++var10) { + for (int var10 = 0; var10 < this.verticesCount; ++var10) { int var11 = Rasterizer3D.method3039(this.verticesX[var10], this.verticesZ[var10], var8, var9); int var12 = this.verticesY[var10]; int var13 = Rasterizer3D.method3004(this.verticesX[var10], this.verticesZ[var10], var8, var9); - if(var11 < var2) { + if (var11 < var2) { var2 = var11; } - if(var11 > var5) { + if (var11 > var5) { var5 = var11; } - if(var12 < var3) { + if (var12 < var3) { var3 = var12; } - if(var12 > var6) { + if (var12 > var6) { var6 = var12; } - if(var13 < var4) { + if (var13 < var4) { var4 = var13; } - if(var13 > var7) { + if (var13 > var7) { var7 = var13; } } @@ -592,45 +562,45 @@ public class Model extends Entity { this.xMidOffset = (var5 - var2 + 1) / 2; this.yMidOffset = (var6 - var3 + 1) / 2; this.zMidOffset = (var7 - var4 + 1) / 2; - if(this.xMidOffset < 32) { + if (this.xMidOffset < 32) { this.xMidOffset = 32; } - if(this.zMidOffset < 32) { + if (this.zMidOffset < 32) { this.zMidOffset = 32; } - if(this.isSingleTile) { + if (this.isSingleTile) { this.xMidOffset += 8; this.zMidOffset += 8; } - } + } @ObfuscatedName("u") @Export("calculateBoundsCylinder") public void calculateBoundsCylinder() { - if(this.boundsType != 1) { + if (this.boundsType != 1) { this.boundsType = 1; super.height = 0; this.bottomY = 0; this.xzRadius = 0; - for(int var1 = 0; var1 < this.verticesCount; ++var1) { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesX[var1]; int var3 = this.verticesY[var1]; int var4 = this.verticesZ[var1]; - if(-var3 > super.height) { + if (-var3 > super.height) { super.height = -var3; } - if(var3 > this.bottomY) { + if (var3 > this.bottomY) { this.bottomY = var3; } int var5 = var2 * var2 + var4 * var4; - if(var5 > this.xzRadius) { + if (var5 > this.xzRadius) { this.xzRadius = var5; } } @@ -639,20 +609,21 @@ public class Model extends Entity { this.radius = (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + super.height * super.height)) + 0.99D); this.diameter = this.radius + (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + this.bottomY * this.bottomY)) + 0.99D); } + } @ObfuscatedName("g") - void __g_232() { - if(this.boundsType != 2) { + void method197() { + if (this.boundsType != 2) { this.boundsType = 2; this.xzRadius = 0; - for(int var1 = 0; var1 < this.verticesCount; ++var1) { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesX[var1]; int var3 = this.verticesY[var1]; int var4 = this.verticesZ[var1]; int var5 = var2 * var2 + var4 * var4 + var3 * var3; - if(var5 > this.xzRadius) { + if (var5 > this.xzRadius) { this.xzRadius = var5; } } @@ -661,10 +632,11 @@ public class Model extends Entity { this.radius = this.xzRadius; this.diameter = this.xzRadius + this.xzRadius; } + } @ObfuscatedName("l") - public int __l_233() { + public int method198() { this.calculateBoundsCylinder(); return this.xzRadius; } @@ -682,22 +654,21 @@ public class Model extends Entity { ) @Export("animate") public void animate(Frames var1, int var2) { - if(this.vertexLabels != null) { - if(var2 != -1) { - Animation var3 = var1.frames[var2]; - Skeleton var4 = var3.skeleton; - Model_transformTempX = 0; - Model_transformTempY = 0; - Model_transformTempZ = 0; + if (this.vertexLabels != null && var2 != -1) { + Animation var3 = var1.frames[var2]; + Skeleton var4 = var3.skeleton; + Model_transformTempX = 0; + Model_transformTempY = 0; + Model_transformTempZ = 0; - for(int var5 = 0; var5 < var3.transformCount; ++var5) { - int var6 = var3.transformSkeletonLabels[var5]; - this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]); - } - - this.resetBounds(); + for (int var5 = 0; var5 < var3.transformCount; ++var5) { + int var6 = var3.transformSkeletonLabels[var5]; + this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]); } + + this.resetBounds(); } + } @ObfuscatedName("a") @@ -706,8 +677,8 @@ public class Model extends Entity { ) @Export("animate2") public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { - if(var2 != -1) { - if(var5 != null && var4 != -1) { + if (var2 != -1) { + if (var5 != null && var4 != -1) { Animation var6 = var1.frames[var2]; Animation var7 = var3.frames[var4]; Skeleton var8 = var6.skeleton; @@ -715,18 +686,17 @@ public class Model extends Entity { Model_transformTempY = 0; Model_transformTempZ = 0; byte var9 = 0; - int var13 = var9 + 1; - int var10 = var5[var9]; + int var10 = var9 + 1; + int var11 = var5[var9]; - int var11; int var12; - for(var11 = 0; var11 < var6.transformCount; ++var11) { - for(var12 = var6.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { - ; + int var13; + for (var12 = 0; var12 < var6.transformCount; ++var12) { + for (var13 = var6.transformSkeletonLabels[var12]; var13 > var11; var11 = var5[var10++]) { } - if(var12 != var10 || var8.transformTypes[var12] == 0) { - this.transform(var8.transformTypes[var12], var8.labels[var12], var6.transformXs[var11], var6.transformYs[var11], var6.transformZs[var11]); + if (var13 != var11 || var8.transformTypes[var13] == 0) { + this.transform(var8.transformTypes[var13], var8.labels[var13], var6.transformXs[var12], var6.transformYs[var12], var6.transformZs[var12]); } } @@ -734,16 +704,15 @@ public class Model extends Entity { Model_transformTempY = 0; Model_transformTempZ = 0; var9 = 0; - var13 = var9 + 1; - var10 = var5[var9]; + var10 = var9 + 1; + var11 = var5[var9]; - for(var11 = 0; var11 < var7.transformCount; ++var11) { - for(var12 = var7.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { - ; + for (var12 = 0; var12 < var7.transformCount; ++var12) { + for (var13 = var7.transformSkeletonLabels[var12]; var13 > var11; var11 = var5[var10++]) { } - if(var12 == var10 || var8.transformTypes[var12] == 0) { - this.transform(var8.transformTypes[var12], var8.labels[var12], var7.transformXs[var11], var7.transformYs[var11], var7.transformZs[var11]); + if (var13 == var11 || var8.transformTypes[var13] == 0) { + this.transform(var8.transformTypes[var13], var8.labels[var13], var7.transformXs[var12], var7.transformYs[var12], var7.transformZs[var12]); } } @@ -752,6 +721,7 @@ public class Model extends Entity { this.animate(var1, var2); } } + } @ObfuscatedName("z") @@ -760,30 +730,30 @@ public class Model extends Entity { int var6 = var2.length; int var7; int var8; - int var11; - int var12; - if(var1 == 0) { + int var9; + int var10; + if (var1 == 0) { var7 = 0; Model_transformTempX = 0; Model_transformTempY = 0; Model_transformTempZ = 0; - for(var8 = 0; var8 < var6; ++var8) { - int var9 = var2[var8]; - if(var9 < this.vertexLabels.length) { - int[] var10 = this.vertexLabels[var9]; + for (var8 = 0; var8 < var6; ++var8) { + int var11 = var2[var8]; + if (var11 < this.vertexLabels.length) { + int[] var12 = this.vertexLabels[var11]; - for(var11 = 0; var11 < var10.length; ++var11) { - var12 = var10[var11]; - Model_transformTempX += this.verticesX[var12]; - Model_transformTempY += this.verticesY[var12]; - Model_transformTempZ += this.verticesZ[var12]; + for (var9 = 0; var9 < var12.length; ++var9) { + var10 = var12[var9]; + Model_transformTempX += this.verticesX[var10]; + Model_transformTempY += this.verticesY[var10]; + Model_transformTempZ += this.verticesZ[var10]; ++var7; } } } - if(var7 > 0) { + if (var7 > 0) { Model_transformTempX = var3 + Model_transformTempX / var7; Model_transformTempY = var4 + Model_transformTempY / var7; Model_transformTempZ = var5 + Model_transformTempZ / var7; @@ -792,124 +762,134 @@ public class Model extends Entity { Model_transformTempY = var4; Model_transformTempZ = var5; } - } else { + int[] var10000; int[] var18; int var19; - if(var1 == 1) { - for(var7 = 0; var7 < var6; ++var7) { + if (var1 == 1) { + for (var7 = 0; var7 < var6; ++var7) { var8 = var2[var7]; - if(var8 < this.vertexLabels.length) { + if (var8 < this.vertexLabels.length) { var18 = this.vertexLabels[var8]; - for(var19 = 0; var19 < var18.length; ++var19) { - var11 = var18[var19]; - this.verticesX[var11] += var3; - this.verticesY[var11] += var4; - this.verticesZ[var11] += var5; + for (var19 = 0; var19 < var18.length; ++var19) { + var9 = var18[var19]; + var10000 = this.verticesX; + var10000[var9] += var3; + var10000 = this.verticesY; + var10000[var9] += var4; + var10000 = this.verticesZ; + var10000[var9] += var5; } } } - - } else if(var1 == 2) { - for(var7 = 0; var7 < var6; ++var7) { + } else if (var1 == 2) { + for (var7 = 0; var7 < var6; ++var7) { var8 = var2[var7]; - if(var8 < this.vertexLabels.length) { + if (var8 < this.vertexLabels.length) { var18 = this.vertexLabels[var8]; - for(var19 = 0; var19 < var18.length; ++var19) { - var11 = var18[var19]; - this.verticesX[var11] -= Model_transformTempX; - this.verticesY[var11] -= Model_transformTempY; - this.verticesZ[var11] -= Model_transformTempZ; - var12 = (var3 & 255) * 8; + for (var19 = 0; var19 < var18.length; ++var19) { + var9 = var18[var19]; + var10000 = this.verticesX; + var10000[var9] -= Model_transformTempX; + var10000 = this.verticesY; + var10000[var9] -= Model_transformTempY; + var10000 = this.verticesZ; + var10000[var9] -= Model_transformTempZ; + var10 = (var3 & 255) * 8; int var13 = (var4 & 255) * 8; int var14 = (var5 & 255) * 8; int var15; int var16; int var17; - if(var14 != 0) { + if (var14 != 0) { var15 = Model_sine[var14]; var16 = Model_cosine[var14]; - var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16; - this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16; - this.verticesX[var11] = var17; + var17 = var15 * this.verticesY[var9] + var16 * this.verticesX[var9] >> 16; + this.verticesY[var9] = var16 * this.verticesY[var9] - var15 * this.verticesX[var9] >> 16; + this.verticesX[var9] = var17; } - if(var12 != 0) { - var15 = Model_sine[var12]; - var16 = Model_cosine[var12]; - var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16; - this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16; - this.verticesY[var11] = var17; + if (var10 != 0) { + var15 = Model_sine[var10]; + var16 = Model_cosine[var10]; + var17 = var16 * this.verticesY[var9] - var15 * this.verticesZ[var9] >> 16; + this.verticesZ[var9] = var15 * this.verticesY[var9] + var16 * this.verticesZ[var9] >> 16; + this.verticesY[var9] = var17; } - if(var13 != 0) { + if (var13 != 0) { var15 = Model_sine[var13]; var16 = Model_cosine[var13]; - var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16; - this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16; - this.verticesX[var11] = var17; + var17 = var15 * this.verticesZ[var9] + var16 * this.verticesX[var9] >> 16; + this.verticesZ[var9] = var16 * this.verticesZ[var9] - var15 * this.verticesX[var9] >> 16; + this.verticesX[var9] = var17; } - this.verticesX[var11] += Model_transformTempX; - this.verticesY[var11] += Model_transformTempY; - this.verticesZ[var11] += Model_transformTempZ; + var10000 = this.verticesX; + var10000[var9] += Model_transformTempX; + var10000 = this.verticesY; + var10000[var9] += Model_transformTempY; + var10000 = this.verticesZ; + var10000[var9] += Model_transformTempZ; } } } - - } else if(var1 == 3) { - for(var7 = 0; var7 < var6; ++var7) { + } else if (var1 == 3) { + for (var7 = 0; var7 < var6; ++var7) { var8 = var2[var7]; - if(var8 < this.vertexLabels.length) { + if (var8 < this.vertexLabels.length) { var18 = this.vertexLabels[var8]; - for(var19 = 0; var19 < var18.length; ++var19) { - var11 = var18[var19]; - this.verticesX[var11] -= Model_transformTempX; - this.verticesY[var11] -= Model_transformTempY; - this.verticesZ[var11] -= Model_transformTempZ; - this.verticesX[var11] = var3 * this.verticesX[var11] / 128; - this.verticesY[var11] = var4 * this.verticesY[var11] / 128; - this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128; - this.verticesX[var11] += Model_transformTempX; - this.verticesY[var11] += Model_transformTempY; - this.verticesZ[var11] += Model_transformTempZ; + for (var19 = 0; var19 < var18.length; ++var19) { + var9 = var18[var19]; + var10000 = this.verticesX; + var10000[var9] -= Model_transformTempX; + var10000 = this.verticesY; + var10000[var9] -= Model_transformTempY; + var10000 = this.verticesZ; + var10000[var9] -= Model_transformTempZ; + this.verticesX[var9] = var3 * this.verticesX[var9] / 128; + this.verticesY[var9] = var4 * this.verticesY[var9] / 128; + this.verticesZ[var9] = var5 * this.verticesZ[var9] / 128; + var10000 = this.verticesX; + var10000[var9] += Model_transformTempX; + var10000 = this.verticesY; + var10000[var9] += Model_transformTempY; + var10000 = this.verticesZ; + var10000[var9] += Model_transformTempZ; } } } + } else if (var1 == 5 && this.faceLabelsAlpha != null && this.faceAlphas != null) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2[var7]; + if (var8 < this.faceLabelsAlpha.length) { + var18 = this.faceLabelsAlpha[var8]; - } else if(var1 == 5) { - if(this.faceLabelsAlpha != null && this.faceAlphas != null) { - for(var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; - if(var8 < this.faceLabelsAlpha.length) { - var18 = this.faceLabelsAlpha[var8]; - - for(var19 = 0; var19 < var18.length; ++var19) { - var11 = var18[var19]; - var12 = (this.faceAlphas[var11] & 255) + var3 * 8; - if(var12 < 0) { - var12 = 0; - } else if(var12 > 255) { - var12 = 255; - } - - this.faceAlphas[var11] = (byte)var12; + for (var19 = 0; var19 < var18.length; ++var19) { + var9 = var18[var19]; + var10 = (this.faceAlphas[var9] & 255) + var3 * 8; + if (var10 < 0) { + var10 = 0; + } else if (var10 > 255) { + var10 = 255; } + + this.faceAlphas[var9] = (byte)var10; } } } - } } + } @ObfuscatedName("j") @Export("rotateY90Ccw") public void rotateY90Ccw() { - for(int var1 = 0; var1 < this.verticesCount; ++var1) { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesX[var1]; this.verticesX[var1] = this.verticesZ[var1]; this.verticesZ[var1] = -var2; @@ -921,7 +901,7 @@ public class Model extends Entity { @ObfuscatedName("s") @Export("rotateY180") public void rotateY180() { - for(int var1 = 0; var1 < this.verticesCount; ++var1) { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { this.verticesX[var1] = -this.verticesX[var1]; this.verticesZ[var1] = -this.verticesZ[var1]; } @@ -932,7 +912,7 @@ public class Model extends Entity { @ObfuscatedName("t") @Export("rotateY270Ccw") public void rotateY270Ccw() { - for(int var1 = 0; var1 < this.verticesCount; ++var1) { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesZ[var1]; this.verticesZ[var1] = this.verticesX[var1]; this.verticesX[var1] = -var2; @@ -947,7 +927,7 @@ public class Model extends Entity { int var2 = Model_sine[var1]; int var3 = Model_cosine[var1]; - for(int var4 = 0; var4 < this.verticesCount; ++var4) { + for (int var4 = 0; var4 < this.verticesCount; ++var4) { int var5 = var3 * this.verticesY[var4] - var2 * this.verticesZ[var4] >> 16; this.verticesZ[var4] = var2 * this.verticesY[var4] + var3 * this.verticesZ[var4] >> 16; this.verticesY[var4] = var5; @@ -959,10 +939,13 @@ public class Model extends Entity { @ObfuscatedName("h") @Export("offsetBy") public void offsetBy(int var1, int var2, int var3) { - for(int var4 = 0; var4 < this.verticesCount; ++var4) { - this.verticesX[var4] += var1; - this.verticesY[var4] += var2; - this.verticesZ[var4] += var3; + for (int var4 = 0; var4 < this.verticesCount; ++var4) { + int[] var10000 = this.verticesX; + var10000[var4] += var1; + var10000 = this.verticesY; + var10000[var4] += var2; + var10000 = this.verticesZ; + var10000[var4] += var3; } this.resetBounds(); @@ -971,7 +954,7 @@ public class Model extends Entity { @ObfuscatedName("b") @Export("scale") public void scale(int var1, int var2, int var3) { - for(int var4 = 0; var4 < this.verticesCount; ++var4) { + for (int var4 = 0; var4 < this.verticesCount; ++var4) { this.verticesX[var4] = this.verticesX[var4] * var1 / 128; this.verticesY[var4] = var2 * this.verticesY[var4] / 128; this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; @@ -981,10 +964,10 @@ public class Model extends Entity { } @ObfuscatedName("c") - public final void __c_234(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - __du_aa[0] = -1; - if(this.boundsType != 2 && this.boundsType != 1) { - this.__g_232(); + public final void method199(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + field529[0] = -1; + if (this.boundsType != 2 && this.boundsType != 1) { + this.method197(); } int var8 = Rasterizer3D.Rasterizer3D_clipMidX; @@ -999,24 +982,24 @@ public class Model extends Entity { int var17 = Model_cosine[var4]; int var18 = var16 * var6 + var17 * var7 >> 16; - for(int var19 = 0; var19 < this.verticesCount; ++var19) { + for (int var19 = 0; var19 < this.verticesCount; ++var19) { int var20 = this.verticesX[var19]; int var21 = this.verticesY[var19]; int var22 = this.verticesZ[var19]; int var23; - if(var3 != 0) { + if (var3 != 0) { var23 = var21 * var14 + var20 * var15 >> 16; var21 = var21 * var15 - var20 * var14 >> 16; var20 = var23; } - if(var1 != 0) { + if (var1 != 0) { var23 = var21 * var11 - var22 * var10 >> 16; var22 = var21 * var10 + var22 * var11 >> 16; var21 = var23; } - if(var2 != 0) { + if (var2 != 0) { var23 = var22 * var12 + var20 * var13 >> 16; var22 = var22 * var13 - var20 * var12 >> 16; var20 = var23; @@ -1027,29 +1010,28 @@ public class Model extends Entity { var22 += var7; var23 = var21 * var17 - var22 * var16 >> 16; var22 = var21 * var16 + var22 * var17 >> 16; - __du_am[var19] = var22 - var18; + field525[var19] = var22 - var18; modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; - if(this.__h > 0) { - __du_an[var19] = var20; - __du_az[var19] = var23; - __du_au[var19] = var22; + if (this.field544 > 0) { + field526[var19] = var20; + field527[var19] = var23; + field528[var19] = var22; } } try { this.draw0(false, false, false, 0L); - } catch (Exception var25) { - ; + } catch (Exception var24) { } } @ObfuscatedName("p") - public final void __p_235(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - __du_aa[0] = -1; - if(this.boundsType != 2 && this.boundsType != 1) { - this.__g_232(); + public final void method200(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + field529[0] = -1; + if (this.boundsType != 2 && this.boundsType != 1) { + this.method197(); } int var9 = Rasterizer3D.Rasterizer3D_clipMidX; @@ -1064,24 +1046,24 @@ public class Model extends Entity { int var18 = Model_cosine[var4]; int var19 = var17 * var6 + var18 * var7 >> 16; - for(int var20 = 0; var20 < this.verticesCount; ++var20) { + for (int var20 = 0; var20 < this.verticesCount; ++var20) { int var21 = this.verticesX[var20]; int var22 = this.verticesY[var20]; int var23 = this.verticesZ[var20]; int var24; - if(var3 != 0) { + if (var3 != 0) { var24 = var22 * var15 + var21 * var16 >> 16; var22 = var22 * var16 - var21 * var15 >> 16; var21 = var24; } - if(var1 != 0) { + if (var1 != 0) { var24 = var22 * var12 - var23 * var11 >> 16; var23 = var22 * var11 + var23 * var12 >> 16; var22 = var24; } - if(var2 != 0) { + if (var2 != 0) { var24 = var23 * var13 + var21 * var14 >> 16; var23 = var23 * var14 - var21 * var13 >> 16; var21 = var24; @@ -1092,20 +1074,19 @@ public class Model extends Entity { var23 += var7; var24 = var22 * var18 - var23 * var17 >> 16; var23 = var22 * var17 + var23 * var18 >> 16; - __du_am[var20] = var23 - var19; + field525[var20] = var23 - var19; modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; - if(this.__h > 0) { - __du_an[var20] = var21; - __du_az[var20] = var24; - __du_au[var20] = var23; + if (this.field544 > 0) { + field526[var20] = var21; + field527[var20] = var24; + field528[var20] = var23; } } try { this.draw0(false, false, false, 0L); - } catch (Exception var26) { - ; + } catch (Exception var25) { } } @@ -1113,283 +1094,283 @@ public class Model extends Entity { @ObfuscatedName("v") @Export("draw0") final void draw0(boolean var1, boolean var2, boolean var3, long var4) { - if(this.diameter < 1600) { + if (this.diameter < 1600) { int var6; - for(var6 = 0; var6 < this.diameter; ++var6) { - __du_aa[var6] = 0; + for (var6 = 0; var6 < this.diameter; ++var6) { + field529[var6] = 0; } - var6 = var3?20:5; + var6 = var3 ? 20 : 5; int var7; int var8; + int var9; int var10; int var11; int var12; int var13; + int var14; int var15; int var16; - int var18; - int var27; - for(var7 = 0; var7 < this.indicesCount; ++var7) { - if(this.faceColors3[var7] != -2) { + for (var7 = 0; var7 < this.indicesCount; ++var7) { + if (this.faceColors3[var7] != -2) { var8 = this.indices1[var7]; - var27 = this.indices2[var7]; - var10 = this.indices3[var7]; - var11 = modelViewportXs[var8]; - var12 = modelViewportXs[var27]; - var13 = modelViewportXs[var10]; - int var14; - if(!var1 || var11 != -5000 && var12 != -5000 && var13 != -5000) { - if(var2 && NpcDefinition.method5164(modelViewportYs[var8], modelViewportYs[var27], modelViewportYs[var10], var11, var12, var13, var6)) { + var16 = this.indices2[var7]; + var9 = this.indices3[var7]; + var10 = modelViewportXs[var8]; + var11 = modelViewportXs[var16]; + var12 = modelViewportXs[var9]; + int var17; + if (!var1 || var10 != -5000 && var11 != -5000 && var12 != -5000) { + if (var2 && NPCDefinition.method5164(modelViewportYs[var8], modelViewportYs[var16], modelViewportYs[var9], var10, var11, var12, var6)) { Projectile.method2081(var4); var2 = false; } - if((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var27]) - (var13 - var12) * (modelViewportYs[var8] - modelViewportYs[var27]) > 0) { - __du_ad[var7] = false; - if(var11 >= 0 && var12 >= 0 && var13 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var13 <= Rasterizer3D.Rasterizer3D_clipWidth) { - __du_at[var7] = false; + if ((var10 - var11) * (modelViewportYs[var9] - modelViewportYs[var16]) - (var12 - var11) * (modelViewportYs[var8] - modelViewportYs[var16]) > 0) { + field524[var7] = false; + if (var10 >= 0 && var11 >= 0 && var12 >= 0 && var10 <= Rasterizer3D.Rasterizer3D_clipWidth && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth) { + field523[var7] = false; } else { - __du_at[var7] = true; + field523[var7] = true; } - var14 = (__du_am[var8] + __du_am[var27] + __du_am[var10]) / 3 + this.radius; - __du_ax[var14][__du_aa[var14]++] = var7; + var17 = (field525[var8] + field525[var16] + field525[var9]) / 3 + this.radius; + field530[var17][field529[var17]++] = var7; } } else { - var14 = __du_an[var8]; - var15 = __du_an[var27]; - var16 = __du_an[var10]; - int var17 = __du_az[var8]; - var18 = __du_az[var27]; - int var19 = __du_az[var10]; - int var20 = __du_au[var8]; - int var21 = __du_au[var27]; - int var22 = __du_au[var10]; - var14 -= var15; - var16 -= var15; - var17 -= var18; - var19 -= var18; + var17 = field526[var8]; + var13 = field526[var16]; + var14 = field526[var9]; + int var18 = field527[var8]; + var15 = field527[var16]; + int var19 = field527[var9]; + int var20 = field528[var8]; + int var21 = field528[var16]; + int var22 = field528[var9]; + var17 -= var13; + var14 -= var13; + var18 -= var15; + var19 -= var15; var20 -= var21; var22 -= var21; - int var23 = var17 * var22 - var20 * var19; - int var24 = var20 * var16 - var14 * var22; - int var25 = var14 * var19 - var17 * var16; - if(var15 * var23 + var18 * var24 + var21 * var25 > 0) { - __du_ad[var7] = true; - int var26 = (__du_am[var8] + __du_am[var27] + __du_am[var10]) / 3 + this.radius; - __du_ax[var26][__du_aa[var26]++] = var7; + int var23 = var18 * var22 - var20 * var19; + int var24 = var20 * var14 - var17 * var22; + int var25 = var17 * var19 - var18 * var14; + if (var13 * var23 + var15 * var24 + var21 * var25 > 0) { + field524[var7] = true; + int var26 = (field525[var8] + field525[var16] + field525[var9]) / 3 + this.radius; + field530[var26][field529[var26]++] = var7; } } } } - int[] var9; - if(this.faceRenderPriorities == null) { - for(var7 = this.diameter - 1; var7 >= 0; --var7) { - var8 = __du_aa[var7]; - if(var8 > 0) { - var9 = __du_ax[var7]; + int[] var27; + if (this.faceRenderPriorities == null) { + for (var7 = this.diameter - 1; var7 >= 0; --var7) { + var8 = field529[var7]; + if (var8 > 0) { + var27 = field530[var7]; - for(var10 = 0; var10 < var8; ++var10) { - this.__ag_236(var9[var10]); + for (var9 = 0; var9 < var8; ++var9) { + this.method201(var27[var9]); } } } - } else { - for(var7 = 0; var7 < 12; ++var7) { - __du_af[var7] = 0; - __du_bs[var7] = 0; + for (var7 = 0; var7 < 12; ++var7) { + field531[var7] = 0; + field535[var7] = 0; } - for(var7 = this.diameter - 1; var7 >= 0; --var7) { - var8 = __du_aa[var7]; - if(var8 > 0) { - var9 = __du_ax[var7]; + for (var7 = this.diameter - 1; var7 >= 0; --var7) { + var8 = field529[var7]; + if (var8 > 0) { + var27 = field530[var7]; - for(var10 = 0; var10 < var8; ++var10) { - var11 = var9[var10]; - byte var31 = this.faceRenderPriorities[var11]; - var13 = __du_af[var31]++; - __du_ai[var31][var13] = var11; - if(var31 < 10) { - __du_bs[var31] += var7; - } else if(var31 == 10) { - __du_ba[var13] = var7; + for (var9 = 0; var9 < var8; ++var9) { + var10 = var27[var9]; + byte var28 = this.faceRenderPriorities[var10]; + var12 = field531[var28]++; + field532[var28][var12] = var10; + if (var28 < 10) { + int[] var10000 = field535; + var10000[var28] += var7; + } else if (var28 == 10) { + field533[var12] = var7; } else { - __du_bb[var13] = var7; + field534[var12] = var7; } } } } var7 = 0; - if(__du_af[1] > 0 || __du_af[2] > 0) { - var7 = (__du_bs[1] + __du_bs[2]) / (__du_af[1] + __du_af[2]); + if (field531[1] > 0 || field531[2] > 0) { + var7 = (field535[1] + field535[2]) / (field531[1] + field531[2]); } var8 = 0; - if(__du_af[3] > 0 || __du_af[4] > 0) { - var8 = (__du_bs[3] + __du_bs[4]) / (__du_af[3] + __du_af[4]); + if (field531[3] > 0 || field531[4] > 0) { + var8 = (field535[3] + field535[4]) / (field531[3] + field531[4]); } - var27 = 0; - if(__du_af[6] > 0 || __du_af[8] > 0) { - var27 = (__du_bs[8] + __du_bs[6]) / (__du_af[8] + __du_af[6]); + var16 = 0; + if (field531[6] > 0 || field531[8] > 0) { + var16 = (field535[8] + field535[6]) / (field531[8] + field531[6]); } - var11 = 0; - var12 = __du_af[10]; - int[] var28 = __du_ai[10]; - int[] var29 = __du_ba; - if(var11 == var12) { - var11 = 0; - var12 = __du_af[11]; - var28 = __du_ai[11]; - var29 = __du_bb; + var10 = 0; + var11 = field531[10]; + int[] var29 = field532[10]; + int[] var30 = field533; + if (var10 == var11) { + var10 = 0; + var11 = field531[11]; + var29 = field532[11]; + var30 = field534; } - if(var11 < var12) { - var10 = var29[var11]; + if (var10 < var11) { + var9 = var30[var10]; } else { - var10 = -1000; + var9 = -1000; } - for(var15 = 0; var15 < 10; ++var15) { - while(var15 == 0 && var10 > var7) { - this.__ag_236(var28[var11++]); - if(var11 == var12 && var28 != __du_ai[11]) { - var11 = 0; - var12 = __du_af[11]; - var28 = __du_ai[11]; - var29 = __du_bb; + for (var13 = 0; var13 < 10; ++var13) { + while (var13 == 0 && var9 > var7) { + this.method201(var29[var10++]); + if (var10 == var11 && var29 != field532[11]) { + var10 = 0; + var11 = field531[11]; + var29 = field532[11]; + var30 = field534; } - if(var11 < var12) { - var10 = var29[var11]; + if (var10 < var11) { + var9 = var30[var10]; } else { - var10 = -1000; + var9 = -1000; } } - while(var15 == 3 && var10 > var8) { - this.__ag_236(var28[var11++]); - if(var11 == var12 && var28 != __du_ai[11]) { - var11 = 0; - var12 = __du_af[11]; - var28 = __du_ai[11]; - var29 = __du_bb; + while (var13 == 3 && var9 > var8) { + this.method201(var29[var10++]); + if (var10 == var11 && var29 != field532[11]) { + var10 = 0; + var11 = field531[11]; + var29 = field532[11]; + var30 = field534; } - if(var11 < var12) { - var10 = var29[var11]; + if (var10 < var11) { + var9 = var30[var10]; } else { - var10 = -1000; + var9 = -1000; } } - while(var15 == 5 && var10 > var27) { - this.__ag_236(var28[var11++]); - if(var11 == var12 && var28 != __du_ai[11]) { - var11 = 0; - var12 = __du_af[11]; - var28 = __du_ai[11]; - var29 = __du_bb; + while (var13 == 5 && var9 > var16) { + this.method201(var29[var10++]); + if (var10 == var11 && var29 != field532[11]) { + var10 = 0; + var11 = field531[11]; + var29 = field532[11]; + var30 = field534; } - if(var11 < var12) { - var10 = var29[var11]; + if (var10 < var11) { + var9 = var30[var10]; } else { - var10 = -1000; + var9 = -1000; } } - var16 = __du_af[var15]; - int[] var30 = __du_ai[var15]; + var14 = field531[var13]; + int[] var31 = field532[var13]; - for(var18 = 0; var18 < var16; ++var18) { - this.__ag_236(var30[var18]); + for (var15 = 0; var15 < var14; ++var15) { + this.method201(var31[var15]); } } - while(var10 != -1000) { - this.__ag_236(var28[var11++]); - if(var11 == var12 && var28 != __du_ai[11]) { - var11 = 0; - var28 = __du_ai[11]; - var12 = __du_af[11]; - var29 = __du_bb; + while (var9 != -1000) { + this.method201(var29[var10++]); + if (var10 == var11 && var29 != field532[11]) { + var10 = 0; + var29 = field532[11]; + var11 = field531[11]; + var30 = field534; } - if(var11 < var12) { - var10 = var29[var11]; + if (var10 < var11) { + var9 = var30[var10]; } else { - var10 = -1000; + var9 = -1000; } } - } } + } @ObfuscatedName("ag") - final void __ag_236(int var1) { - if(__du_ad[var1]) { - this.__aq_237(var1); + final void method201(int var1) { + if (field524[var1]) { + this.method202(var1); } else { int var2 = this.indices1[var1]; int var3 = this.indices2[var1]; int var4 = this.indices3[var1]; - Rasterizer3D.__et_m = __du_at[var1]; - if(this.faceAlphas == null) { + Rasterizer3D.field739 = field523[var1]; + if (this.faceAlphas == null) { Rasterizer3D.Rasterizer3D_alpha = 0; } else { Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; } - if(this.faceTextures != null && this.faceTextures[var1] != -1) { + if (this.faceTextures != null && this.faceTextures[var1] != -1) { int var5; int var6; int var7; - if(this.__s != null && this.__s[var1] != -1) { - int var8 = this.__s[var1] & 255; - var5 = this.__b[var8]; - var6 = this.__c[var8]; - var7 = this.__r[var8]; + if (this.field542 != null && this.field542[var1] != -1) { + int var8 = this.field542[var1] & 255; + var5 = this.field545[var8]; + var6 = this.field546[var8]; + var7 = this.field547[var8]; } else { var5 = var2; var6 = var3; var7 = var4; } - if(this.faceColors3[var1] == -1) { - Rasterizer3D.method2986(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], __du_an[var5], __du_an[var6], __du_an[var7], __du_az[var5], __du_az[var6], __du_az[var7], __du_au[var5], __du_au[var6], __du_au[var7], this.faceTextures[var1]); + if (this.faceColors3[var1] == -1) { + Rasterizer3D.method2986(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field526[var5], field526[var6], field526[var7], field527[var5], field527[var6], field527[var7], field528[var5], field528[var6], field528[var7], this.faceTextures[var1]); } else { - Rasterizer3D.method2986(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], __du_an[var5], __du_an[var6], __du_an[var7], __du_az[var5], __du_az[var6], __du_az[var7], __du_au[var5], __du_au[var6], __du_au[var7], this.faceTextures[var1]); + Rasterizer3D.method2986(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field526[var5], field526[var6], field526[var7], field527[var5], field527[var6], field527[var7], field528[var5], field528[var6], field528[var7], this.faceTextures[var1]); } - } else if(this.faceColors3[var1] == -1) { - Rasterizer3D.method3020(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], __du_br[this.faceColors1[var1]]); + } else if (this.faceColors3[var1] == -1) { + Rasterizer3D.method3020(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field540[this.faceColors1[var1]]); } else { Rasterizer3D.method3037(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); } - } + } @ObfuscatedName("aq") - final void __aq_237(int var1) { + final void method202(int var1) { int var2 = Rasterizer3D.Rasterizer3D_clipMidX; int var3 = Rasterizer3D.Rasterizer3D_clipMidY; int var4 = 0; int var5 = this.indices1[var1]; int var6 = this.indices2[var1]; int var7 = this.indices3[var1]; - int var8 = __du_au[var5]; - int var9 = __du_au[var6]; - int var10 = __du_au[var7]; - if(this.faceAlphas == null) { + int var8 = field528[var5]; + int var9 = field528[var6]; + int var10 = field528[var7]; + if (this.faceAlphas == null) { Rasterizer3D.Rasterizer3D_alpha = 0; } else { Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; @@ -1399,126 +1380,126 @@ public class Model extends Entity { int var12; int var13; int var14; - if(var8 >= 50) { - __du_bq[var4] = modelViewportXs[var5]; - __du_bn[var4] = modelViewportYs[var5]; - __du_bk[var4++] = this.faceColors1[var1]; + if (var8 >= 50) { + field536[var4] = modelViewportXs[var5]; + field537[var4] = modelViewportYs[var5]; + field538[var4++] = this.faceColors1[var1]; } else { - var11 = __du_an[var5]; - var12 = __du_az[var5]; + var11 = field526[var5]; + var12 = field527[var5]; var13 = this.faceColors1[var1]; - if(var10 >= 50) { - var14 = __du_bj[var10 - var8] * (50 - var8); - __du_bq[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((__du_an[var7] - var11) * var14 >> 16)) / 50; - __du_bn[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((__du_az[var7] - var12) * var14 >> 16)) / 50; - __du_bk[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + if (var10 >= 50) { + var14 = field541[var10 - var8] * (50 - var8); + field536[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field526[var7] - var11) * var14 >> 16)) / 50; + field537[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field527[var7] - var12) * var14 >> 16)) / 50; + field538[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } - if(var9 >= 50) { - var14 = __du_bj[var9 - var8] * (50 - var8); - __du_bq[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((__du_an[var6] - var11) * var14 >> 16)) / 50; - __du_bn[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((__du_az[var6] - var12) * var14 >> 16)) / 50; - __du_bk[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + if (var9 >= 50) { + var14 = field541[var9 - var8] * (50 - var8); + field536[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field526[var6] - var11) * var14 >> 16)) / 50; + field537[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field527[var6] - var12) * var14 >> 16)) / 50; + field538[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } } - if(var9 >= 50) { - __du_bq[var4] = modelViewportXs[var6]; - __du_bn[var4] = modelViewportYs[var6]; - __du_bk[var4++] = this.faceColors2[var1]; + if (var9 >= 50) { + field536[var4] = modelViewportXs[var6]; + field537[var4] = modelViewportYs[var6]; + field538[var4++] = this.faceColors2[var1]; } else { - var11 = __du_an[var6]; - var12 = __du_az[var6]; + var11 = field526[var6]; + var12 = field527[var6]; var13 = this.faceColors2[var1]; - if(var8 >= 50) { - var14 = __du_bj[var8 - var9] * (50 - var9); - __du_bq[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((__du_an[var5] - var11) * var14 >> 16)) / 50; - __du_bn[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((__du_az[var5] - var12) * var14 >> 16)) / 50; - __du_bk[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + if (var8 >= 50) { + var14 = field541[var8 - var9] * (50 - var9); + field536[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field526[var5] - var11) * var14 >> 16)) / 50; + field537[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field527[var5] - var12) * var14 >> 16)) / 50; + field538[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } - if(var10 >= 50) { - var14 = __du_bj[var10 - var9] * (50 - var9); - __du_bq[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((__du_an[var7] - var11) * var14 >> 16)) / 50; - __du_bn[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((__du_az[var7] - var12) * var14 >> 16)) / 50; - __du_bk[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + if (var10 >= 50) { + var14 = field541[var10 - var9] * (50 - var9); + field536[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field526[var7] - var11) * var14 >> 16)) / 50; + field537[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field527[var7] - var12) * var14 >> 16)) / 50; + field538[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } } - if(var10 >= 50) { - __du_bq[var4] = modelViewportXs[var7]; - __du_bn[var4] = modelViewportYs[var7]; - __du_bk[var4++] = this.faceColors3[var1]; + if (var10 >= 50) { + field536[var4] = modelViewportXs[var7]; + field537[var4] = modelViewportYs[var7]; + field538[var4++] = this.faceColors3[var1]; } else { - var11 = __du_an[var7]; - var12 = __du_az[var7]; + var11 = field526[var7]; + var12 = field527[var7]; var13 = this.faceColors3[var1]; - if(var9 >= 50) { - var14 = __du_bj[var9 - var10] * (50 - var10); - __du_bq[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((__du_an[var6] - var11) * var14 >> 16)) / 50; - __du_bn[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((__du_az[var6] - var12) * var14 >> 16)) / 50; - __du_bk[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + if (var9 >= 50) { + var14 = field541[var9 - var10] * (50 - var10); + field536[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field526[var6] - var11) * var14 >> 16)) / 50; + field537[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field527[var6] - var12) * var14 >> 16)) / 50; + field538[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } - if(var8 >= 50) { - var14 = __du_bj[var8 - var10] * (50 - var10); - __du_bq[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((__du_an[var5] - var11) * var14 >> 16)) / 50; - __du_bn[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((__du_az[var5] - var12) * var14 >> 16)) / 50; - __du_bk[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + if (var8 >= 50) { + var14 = field541[var8 - var10] * (50 - var10); + field536[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field526[var5] - var11) * var14 >> 16)) / 50; + field537[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field527[var5] - var12) * var14 >> 16)) / 50; + field538[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } } - var11 = __du_bq[0]; - var12 = __du_bq[1]; - var13 = __du_bq[2]; - var14 = __du_bn[0]; - int var15 = __du_bn[1]; - int var16 = __du_bn[2]; - Rasterizer3D.__et_m = false; + var11 = field536[0]; + var12 = field536[1]; + var13 = field536[2]; + var14 = field537[0]; + int var15 = field537[1]; + int var16 = field537[2]; + Rasterizer3D.field739 = false; int var17; int var18; int var19; int var20; - if(var4 == 3) { - if(var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.__et_m = true; + if (var4 == 3) { + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { + Rasterizer3D.field739 = true; } - if(this.faceTextures != null && this.faceTextures[var1] != -1) { - if(this.__s != null && this.__s[var1] != -1) { - var20 = this.__s[var1] & 255; - var17 = this.__b[var20]; - var18 = this.__c[var20]; - var19 = this.__r[var20]; + if (this.faceTextures != null && this.faceTextures[var1] != -1) { + if (this.field542 != null && this.field542[var1] != -1) { + var20 = this.field542[var1] & 255; + var17 = this.field545[var20]; + var18 = this.field546[var20]; + var19 = this.field547[var20]; } else { var17 = var5; var18 = var6; var19 = var7; } - if(this.faceColors3[var1] == -1) { - Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], __du_an[var17], __du_an[var18], __du_an[var19], __du_az[var17], __du_az[var18], __du_az[var19], __du_au[var17], __du_au[var18], __du_au[var19], this.faceTextures[var1]); + if (this.faceColors3[var1] == -1) { + Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field526[var17], field526[var18], field526[var19], field527[var17], field527[var18], field527[var19], field528[var17], field528[var18], field528[var19], this.faceTextures[var1]); } else { - Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, __du_bk[0], __du_bk[1], __du_bk[2], __du_an[var17], __du_an[var18], __du_an[var19], __du_az[var17], __du_az[var18], __du_az[var19], __du_au[var17], __du_au[var18], __du_au[var19], this.faceTextures[var1]); + Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, field538[0], field538[1], field538[2], field526[var17], field526[var18], field526[var19], field527[var17], field527[var18], field527[var19], field528[var17], field528[var18], field528[var19], this.faceTextures[var1]); } - } else if(this.faceColors3[var1] == -1) { - Rasterizer3D.method3020(var14, var15, var16, var11, var12, var13, __du_br[this.faceColors1[var1]]); + } else if (this.faceColors3[var1] == -1) { + Rasterizer3D.method3020(var14, var15, var16, var11, var12, var13, field540[this.faceColors1[var1]]); } else { - Rasterizer3D.method3037(var14, var15, var16, var11, var12, var13, __du_bk[0], __du_bk[1], __du_bk[2]); + Rasterizer3D.method3037(var14, var15, var16, var11, var12, var13, field538[0], field538[1], field538[2]); } } - if(var4 == 4) { - if(var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || __du_bq[3] < 0 || __du_bq[3] > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.__et_m = true; + if (var4 == 4) { + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field536[3] < 0 || field536[3] > Rasterizer3D.Rasterizer3D_clipWidth) { + Rasterizer3D.field739 = true; } - if(this.faceTextures != null && this.faceTextures[var1] != -1) { - if(this.__s != null && this.__s[var1] != -1) { - var20 = this.__s[var1] & 255; - var17 = this.__b[var20]; - var18 = this.__c[var20]; - var19 = this.__r[var20]; + if (this.faceTextures != null && this.faceTextures[var1] != -1) { + if (this.field542 != null && this.field542[var1] != -1) { + var20 = this.field542[var1] & 255; + var17 = this.field545[var20]; + var18 = this.field546[var20]; + var19 = this.field547[var20]; } else { var17 = var5; var18 = var6; @@ -1526,20 +1507,20 @@ public class Model extends Entity { } short var21 = this.faceTextures[var1]; - if(this.faceColors3[var1] == -1) { - Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], __du_an[var17], __du_an[var18], __du_an[var19], __du_az[var17], __du_az[var18], __du_az[var19], __du_au[var17], __du_au[var18], __du_au[var19], var21); - Rasterizer3D.method2986(var14, var16, __du_bn[3], var11, var13, __du_bq[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], __du_an[var17], __du_an[var18], __du_an[var19], __du_az[var17], __du_az[var18], __du_az[var19], __du_au[var17], __du_au[var18], __du_au[var19], var21); + if (this.faceColors3[var1] == -1) { + Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field526[var17], field526[var18], field526[var19], field527[var17], field527[var18], field527[var19], field528[var17], field528[var18], field528[var19], var21); + Rasterizer3D.method2986(var14, var16, field537[3], var11, var13, field536[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field526[var17], field526[var18], field526[var19], field527[var17], field527[var18], field527[var19], field528[var17], field528[var18], field528[var19], var21); } else { - Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, __du_bk[0], __du_bk[1], __du_bk[2], __du_an[var17], __du_an[var18], __du_an[var19], __du_az[var17], __du_az[var18], __du_az[var19], __du_au[var17], __du_au[var18], __du_au[var19], var21); - Rasterizer3D.method2986(var14, var16, __du_bn[3], var11, var13, __du_bq[3], __du_bk[0], __du_bk[2], __du_bk[3], __du_an[var17], __du_an[var18], __du_an[var19], __du_az[var17], __du_az[var18], __du_az[var19], __du_au[var17], __du_au[var18], __du_au[var19], var21); + Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, field538[0], field538[1], field538[2], field526[var17], field526[var18], field526[var19], field527[var17], field527[var18], field527[var19], field528[var17], field528[var18], field528[var19], var21); + Rasterizer3D.method2986(var14, var16, field537[3], var11, var13, field536[3], field538[0], field538[2], field538[3], field526[var17], field526[var18], field526[var19], field527[var17], field527[var18], field527[var19], field528[var17], field528[var18], field528[var19], var21); } - } else if(this.faceColors3[var1] == -1) { - var17 = __du_br[this.faceColors1[var1]]; + } else if (this.faceColors3[var1] == -1) { + var17 = field540[this.faceColors1[var1]]; Rasterizer3D.method3020(var14, var15, var16, var11, var12, var13, var17); - Rasterizer3D.method3020(var14, var16, __du_bn[3], var11, var13, __du_bq[3], var17); + Rasterizer3D.method3020(var14, var16, field537[3], var11, var13, field536[3], var17); } else { - Rasterizer3D.method3037(var14, var15, var16, var11, var12, var13, __du_bk[0], __du_bk[1], __du_bk[2]); - Rasterizer3D.method3037(var14, var16, __du_bn[3], var11, var13, __du_bq[3], __du_bk[0], __du_bk[2], __du_bk[3]); + Rasterizer3D.method3037(var14, var15, var16, var11, var12, var13, field538[0], field538[1], field538[2]); + Rasterizer3D.method3037(var14, var16, field537[3], var11, var13, field536[3], field538[0], field538[2], field538[3]); } } @@ -1548,8 +1529,8 @@ public class Model extends Entity { @ObfuscatedName("cy") @Export("renderDraw") void renderDraw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { - __du_aa[0] = -1; - if(this.boundsType != 1) { + field529[0] = -1; + if (this.boundsType != 1) { this.calculateBoundsCylinder(); } @@ -1558,137 +1539,166 @@ public class Model extends Entity { int var12 = var2 * var7 + var3 * var11 >> 16; int var13 = var3 * this.xzRadius >> 16; int var14 = var12 + var13; - if(var14 > 50 && var12 < 3500) { + if (var14 > 50 && var12 < 3500) { int var15 = var8 * var4 + var5 * var6 >> 16; int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; - if(var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) { + if (var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) { int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; - if(var17 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidX) { + if (var17 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidX) { int var18 = var3 * var7 - var11 * var2 >> 16; int var19 = var2 * this.xzRadius >> 16; int var20 = (var18 + var19) * Rasterizer3D.Rasterizer3D_zoom; - if(var20 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) { + if (var20 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) { int var21 = (var3 * super.height >> 16) + var19; int var22 = (var18 - var21) * Rasterizer3D.Rasterizer3D_zoom; - if(var22 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) { + if (var22 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) { int var23 = var13 + (var2 * super.height >> 16); boolean var24 = false; boolean var25 = false; - if(var12 - var23 <= 50) { + if (var12 - var23 <= 50) { var25 = true; } - boolean var26 = var25 || this.__h > 0; + boolean var26 = var25 || this.field544 > 0; int var27 = ViewportMouse.ViewportMouse_x; - int var29 = ViewportMouse.ViewportMouse_y; - boolean var31 = ViewportMouse.ViewportMouse_isInViewport; - boolean var34 = 0L != var9; - boolean var35; - if(var34) { - var35 = (int)(var9 >>> 16 & 1L) == 1; - var34 = !var35; + int var28 = ViewportMouse.ViewportMouse_y; + boolean var29 = ViewportMouse.ViewportMouse_isInViewport; + boolean var30 = 0L != var9; + boolean var31; + if (var30) { + var31 = (int)(var9 >>> 16 & 1L) == 1; + var30 = !var31; } - var35 = false; - int var37; - int var38; - int var39; - if(var34 && var31) { - boolean var36 = false; - if(__du_bx) { - var36 = Decimator.method2491(this, var6, var7, var8); + var31 = false; + int var32; + int var33; + int var34; + if (var30 && var29) { + boolean var35 = false; + if (field539) { + var35 = Decimator.method2491(this, var6, var7, var8); } else { - var37 = var12 - var13; - if(var37 <= 50) { - var37 = 50; + var32 = var12 - var13; + if (var32 <= 50) { + var32 = 50; } - if(var15 > 0) { + if (var15 > 0) { var16 /= var14; - var17 /= var37; + var17 /= var32; } else { var17 /= var14; - var16 /= var37; + var16 /= var32; } - if(var18 > 0) { + if (var18 > 0) { var22 /= var14; - var20 /= var37; + var20 /= var32; } else { var20 /= var14; - var22 /= var37; + var22 /= var32; } - var38 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; - var39 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; - if(var38 > var16 && var38 < var17 && var39 > var22 && var39 < var20) { - var36 = true; - } - } - - if(var36) { - if(this.isSingleTile) { - Projectile.method2081(var9); - } else { + var33 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; + var34 = var28 - Rasterizer3D.Rasterizer3D_clipMidY; + if (var33 > var16 && var33 < var17 && var34 > var22 && var34 < var20) { var35 = true; } } + + if (var35) { + if (this.isSingleTile) { + Projectile.method2081(var9); + } else { + var31 = true; + } + } } - int var47 = Rasterizer3D.Rasterizer3D_clipMidX; - var37 = Rasterizer3D.Rasterizer3D_clipMidY; - var38 = 0; - var39 = 0; - if(var1 != 0) { - var38 = Model_sine[var1]; - var39 = Model_cosine[var1]; + int var42 = Rasterizer3D.Rasterizer3D_clipMidX; + var32 = Rasterizer3D.Rasterizer3D_clipMidY; + var33 = 0; + var34 = 0; + if (var1 != 0) { + var33 = Model_sine[var1]; + var34 = Model_cosine[var1]; } - for(int var40 = 0; var40 < this.verticesCount; ++var40) { - int var41 = this.verticesX[var40]; - int var42 = this.verticesY[var40]; - int var43 = this.verticesZ[var40]; - int var44; - if(var1 != 0) { - var44 = var43 * var38 + var41 * var39 >> 16; - var43 = var43 * var39 - var41 * var38 >> 16; - var41 = var44; + for (int var36 = 0; var36 < this.verticesCount; ++var36) { + int var37 = this.verticesX[var36]; + int var38 = this.verticesY[var36]; + int var39 = this.verticesZ[var36]; + int var40; + if (var1 != 0) { + var40 = var39 * var33 + var37 * var34 >> 16; + var39 = var39 * var34 - var37 * var33 >> 16; + var37 = var40; } - var41 += var6; - var42 += var7; - var43 += var8; - var44 = var43 * var4 + var5 * var41 >> 16; - var43 = var5 * var43 - var41 * var4 >> 16; - var41 = var44; - var44 = var3 * var42 - var43 * var2 >> 16; - var43 = var42 * var2 + var3 * var43 >> 16; - __du_am[var40] = var43 - var12; - if(var43 >= 50) { - modelViewportXs[var40] = var41 * Rasterizer3D.Rasterizer3D_zoom / var43 + var47; - modelViewportYs[var40] = var44 * Rasterizer3D.Rasterizer3D_zoom / var43 + var37; + var37 += var6; + var38 += var7; + var39 += var8; + var40 = var39 * var4 + var5 * var37 >> 16; + var39 = var5 * var39 - var37 * var4 >> 16; + var37 = var40; + var40 = var3 * var38 - var39 * var2 >> 16; + var39 = var38 * var2 + var3 * var39 >> 16; + field525[var36] = var39 - var12; + if (var39 >= 50) { + modelViewportXs[var36] = var37 * Rasterizer3D.Rasterizer3D_zoom / var39 + var42; + modelViewportYs[var36] = var40 * Rasterizer3D.Rasterizer3D_zoom / var39 + var32; } else { - modelViewportXs[var40] = -5000; + modelViewportXs[var36] = -5000; var24 = true; } - if(var26) { - __du_an[var40] = var41; - __du_az[var40] = var44; - __du_au[var40] = var43; + if (var26) { + field526[var36] = var37; + field527[var36] = var40; + field528[var36] = var39; } } try { - this.draw0(var24, var35, this.isSingleTile, var9); - } catch (Exception var46) { - ; + this.draw0(var24, var31, this.isSingleTile, var9); + } catch (Exception var41) { } - } } } } } + + } + + static { + Model_sharedSequenceModel = new Model(); + Model_sharedSequenceModelFaceAlphas = new byte[1]; + Model_sharedSpotAnimationModel = new Model(); + Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; + field523 = new boolean[4700]; + field524 = new boolean[4700]; + modelViewportXs = new int[4700]; + modelViewportYs = new int[4700]; + field525 = new int[4700]; + field526 = new int[4700]; + field527 = new int[4700]; + field528 = new int[4700]; + field529 = new int[1600]; + field530 = new int[1600][512]; + field531 = new int[12]; + field532 = new int[12][2000]; + field533 = new int[2000]; + field534 = new int[2000]; + field535 = new int[12]; + field536 = new int[10]; + field537 = new int[10]; + field538 = new int[10]; + field539 = true; + Model_sine = Rasterizer3D.Rasterizer3D_sine; + Model_cosine = Rasterizer3D.Rasterizer3D_cosine; + field540 = Rasterizer3D.Rasterizer3D_colorPalette; + field541 = Rasterizer3D.field743; } } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index a0ce7dd443..fdcb9827d3 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -7,11 +7,11 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("ModelData") public class ModelData extends Entity { @ObfuscatedName("aw") - static int[] __dw_aw; + static int[] field548; @ObfuscatedName("al") - static int[] __dw_al; + static int[] field549; @ObfuscatedName("ab") - static int __dw_ab; + static int field550; @ObfuscatedName("ae") @Export("ModelData_sine") static int[] ModelData_sine; @@ -43,9 +43,9 @@ public class ModelData extends Entity { @Export("indices3") int[] indices3; @ObfuscatedName("e") - byte[] __e; + byte[] field551; @ObfuscatedName("x") - byte[] __x; + byte[] field552; @ObfuscatedName("d") @Export("faceAlphas") byte[] faceAlphas; @@ -59,9 +59,9 @@ public class ModelData extends Entity { @Export("faceTextures") short[] faceTextures; @ObfuscatedName("a") - byte __a; + byte field553; @ObfuscatedName("z") - int __z; + int field554; @ObfuscatedName("j") @Export("textureRenderTypes") byte[] textureRenderTypes; @@ -75,9 +75,9 @@ public class ModelData extends Entity { @Export("texTriangleZ") short[] texTriangleZ; @ObfuscatedName("h") - int[] __h; + int[] field555; @ObfuscatedName("b") - int[] __b; + int[] field556; @ObfuscatedName("c") @Export("vertexLabels") int[][] vertexLabels; @@ -94,42 +94,34 @@ public class ModelData extends Entity { @ObfuscatedSignature( signature = "[Ldq;" ) - VertexNormal[] __v; + VertexNormal[] field557; @ObfuscatedName("ag") @ObfuscatedSignature( signature = "[Ldq;" ) - VertexNormal[] __ag; + VertexNormal[] field558; @ObfuscatedName("aq") - public short __aq; + public short field559; @ObfuscatedName("aj") - public short __aj; + public short field560; @ObfuscatedName("av") @Export("isBoundsCalculated") boolean isBoundsCalculated; @ObfuscatedName("ar") - int __ar; + int field561; @ObfuscatedName("ac") - int __ac; + int field562; @ObfuscatedName("ay") - int __ay; + int field563; @ObfuscatedName("ah") - int __ah; + int field564; @ObfuscatedName("ak") - int __ak; - - static { - __dw_aw = new int[10000]; - __dw_al = new int[10000]; - __dw_ab = 0; - ModelData_sine = Rasterizer3D.Rasterizer3D_sine; - ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; - } + int field565; ModelData() { this.verticesCount = 0; this.faceCount = 0; - this.__a = 0; + this.field553 = 0; this.isBoundsCalculated = false; } @@ -139,7 +131,7 @@ public class ModelData extends Entity { public ModelData(ModelData[] var1, int var2) { this.verticesCount = 0; this.faceCount = 0; - this.__a = 0; + this.field553 = 0; this.isBoundsCalculated = false; boolean var3 = false; boolean var4 = false; @@ -149,32 +141,32 @@ public class ModelData extends Entity { boolean var8 = false; this.verticesCount = 0; this.faceCount = 0; - this.__z = 0; - this.__a = -1; + this.field554 = 0; + this.field553 = -1; int var9; ModelData var10; - for(var9 = 0; var9 < var2; ++var9) { + for (var9 = 0; var9 < var2; ++var9) { var10 = var1[var9]; - if(var10 != null) { + if (var10 != null) { this.verticesCount += var10.verticesCount; this.faceCount += var10.faceCount; - this.__z += var10.__z; - if(var10.__x != null) { + this.field554 += var10.field554; + if (var10.field552 != null) { var4 = true; } else { - if(this.__a == -1) { - this.__a = var10.__a; + if (this.field553 == -1) { + this.field553 = var10.field553; } - if(this.__a != var10.__a) { + if (this.field553 != var10.field553) { var4 = true; } } - var3 |= var10.__e != null; + var3 |= var10.field551 != null; var5 |= var10.faceAlphas != null; - var6 |= var10.__b != null; + var6 |= var10.field556 != null; var7 |= var10.faceTextures != null; var8 |= var10.textureCoords != null; } @@ -183,103 +175,103 @@ public class ModelData extends Entity { this.verticesX = new int[this.verticesCount]; this.verticesY = new int[this.verticesCount]; this.verticesZ = new int[this.verticesCount]; - this.__h = new int[this.verticesCount]; + this.field555 = new int[this.verticesCount]; this.indices1 = new int[this.faceCount]; this.indices2 = new int[this.faceCount]; this.indices3 = new int[this.faceCount]; - if(var3) { - this.__e = new byte[this.faceCount]; + if (var3) { + this.field551 = new byte[this.faceCount]; } - if(var4) { - this.__x = new byte[this.faceCount]; + if (var4) { + this.field552 = new byte[this.faceCount]; } - if(var5) { + if (var5) { this.faceAlphas = new byte[this.faceCount]; } - if(var6) { - this.__b = new int[this.faceCount]; + if (var6) { + this.field556 = new int[this.faceCount]; } - if(var7) { + if (var7) { this.faceTextures = new short[this.faceCount]; } - if(var8) { + if (var8) { this.textureCoords = new byte[this.faceCount]; } this.faceColors = new short[this.faceCount]; - if(this.__z > 0) { - this.textureRenderTypes = new byte[this.__z]; - this.texTriangleX = new short[this.__z]; - this.texTriangleY = new short[this.__z]; - this.texTriangleZ = new short[this.__z]; + if (this.field554 > 0) { + this.textureRenderTypes = new byte[this.field554]; + this.texTriangleX = new short[this.field554]; + this.texTriangleY = new short[this.field554]; + this.texTriangleZ = new short[this.field554]; } this.verticesCount = 0; this.faceCount = 0; - this.__z = 0; + this.field554 = 0; - for(var9 = 0; var9 < var2; ++var9) { + for (var9 = 0; var9 < var2; ++var9) { var10 = var1[var9]; - if(var10 != null) { + if (var10 != null) { int var11; - for(var11 = 0; var11 < var10.faceCount; ++var11) { - if(var3 && var10.__e != null) { - this.__e[this.faceCount] = var10.__e[var11]; + for (var11 = 0; var11 < var10.faceCount; ++var11) { + if (var3 && var10.field551 != null) { + this.field551[this.faceCount] = var10.field551[var11]; } - if(var4) { - if(var10.__x != null) { - this.__x[this.faceCount] = var10.__x[var11]; + if (var4) { + if (var10.field552 != null) { + this.field552[this.faceCount] = var10.field552[var11]; } else { - this.__x[this.faceCount] = var10.__a; + this.field552[this.faceCount] = var10.field553; } } - if(var5 && var10.faceAlphas != null) { + if (var5 && var10.faceAlphas != null) { this.faceAlphas[this.faceCount] = var10.faceAlphas[var11]; } - if(var6 && var10.__b != null) { - this.__b[this.faceCount] = var10.__b[var11]; + if (var6 && var10.field556 != null) { + this.field556[this.faceCount] = var10.field556[var11]; } - if(var7) { - if(var10.faceTextures != null) { + if (var7) { + if (var10.faceTextures != null) { this.faceTextures[this.faceCount] = var10.faceTextures[var11]; } else { this.faceTextures[this.faceCount] = -1; } } - if(var8) { - if(var10.textureCoords != null && var10.textureCoords[var11] != -1) { - this.textureCoords[this.faceCount] = (byte)(this.__z + var10.textureCoords[var11]); + if (var8) { + if (var10.textureCoords != null && var10.textureCoords[var11] != -1) { + this.textureCoords[this.faceCount] = (byte)(this.field554 + var10.textureCoords[var11]); } else { this.textureCoords[this.faceCount] = -1; } } this.faceColors[this.faceCount] = var10.faceColors[var11]; - this.indices1[this.faceCount] = this.__w_217(var10, var10.indices1[var11]); - this.indices2[this.faceCount] = this.__w_217(var10, var10.indices2[var11]); - this.indices3[this.faceCount] = this.__w_217(var10, var10.indices3[var11]); + this.indices1[this.faceCount] = this.method205(var10, var10.indices1[var11]); + this.indices2[this.faceCount] = this.method205(var10, var10.indices2[var11]); + this.indices3[this.faceCount] = this.method205(var10, var10.indices3[var11]); ++this.faceCount; } - for(var11 = 0; var11 < var10.__z; ++var11) { - byte var12 = this.textureRenderTypes[this.__z] = var10.textureRenderTypes[var11]; - if(var12 == 0) { - this.texTriangleX[this.__z] = (short)this.__w_217(var10, var10.texTriangleX[var11]); - this.texTriangleY[this.__z] = (short)this.__w_217(var10, var10.texTriangleY[var11]); - this.texTriangleZ[this.__z] = (short)this.__w_217(var10, var10.texTriangleZ[var11]); + for (var11 = 0; var11 < var10.field554; ++var11) { + byte var12 = this.textureRenderTypes[this.field554] = var10.textureRenderTypes[var11]; + if (var12 == 0) { + this.texTriangleX[this.field554] = (short)this.method205(var10, var10.texTriangleX[var11]); + this.texTriangleY[this.field554] = (short)this.method205(var10, var10.texTriangleY[var11]); + this.texTriangleZ[this.field554] = (short)this.method205(var10, var10.texTriangleZ[var11]); } - ++this.__z; + ++this.field554; } } } @@ -289,12 +281,12 @@ public class ModelData extends Entity { ModelData(byte[] var1) { this.verticesCount = 0; this.faceCount = 0; - this.__a = 0; + this.field553 = 0; this.isBoundsCalculated = false; - if(var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { - this.__f_215(var1); + if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { + this.method203(var1); } else { - this.__q_216(var1); + this.method204(var1); } } @@ -306,13 +298,13 @@ public class ModelData extends Entity { public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) { this.verticesCount = 0; this.faceCount = 0; - this.__a = 0; + this.field553 = 0; this.isBoundsCalculated = false; this.verticesCount = var1.verticesCount; this.faceCount = var1.faceCount; - this.__z = var1.__z; + this.field554 = var1.field554; int var6; - if(var2) { + if (var2) { this.verticesX = var1.verticesX; this.verticesY = var1.verticesY; this.verticesZ = var1.verticesZ; @@ -321,27 +313,27 @@ public class ModelData extends Entity { this.verticesY = new int[this.verticesCount]; this.verticesZ = new int[this.verticesCount]; - for(var6 = 0; var6 < this.verticesCount; ++var6) { + for (var6 = 0; var6 < this.verticesCount; ++var6) { this.verticesX[var6] = var1.verticesX[var6]; this.verticesY[var6] = var1.verticesY[var6]; this.verticesZ[var6] = var1.verticesZ[var6]; } } - if(var3) { + if (var3) { this.faceColors = var1.faceColors; } else { this.faceColors = new short[this.faceCount]; - for(var6 = 0; var6 < this.faceCount; ++var6) { + for (var6 = 0; var6 < this.faceCount; ++var6) { this.faceColors[var6] = var1.faceColors[var6]; } } - if(!var4 && var1.faceTextures != null) { + if (!var4 && var1.faceTextures != null) { this.faceTextures = new short[this.faceCount]; - for(var6 = 0; var6 < this.faceCount; ++var6) { + for (var6 = 0; var6 < this.faceCount; ++var6) { this.faceTextures[var6] = var1.faceTextures[var6]; } } else { @@ -352,27 +344,27 @@ public class ModelData extends Entity { this.indices1 = var1.indices1; this.indices2 = var1.indices2; this.indices3 = var1.indices3; - this.__e = var1.__e; - this.__x = var1.__x; + this.field551 = var1.field551; + this.field552 = var1.field552; this.textureCoords = var1.textureCoords; - this.__a = var1.__a; + this.field553 = var1.field553; this.textureRenderTypes = var1.textureRenderTypes; this.texTriangleX = var1.texTriangleX; this.texTriangleY = var1.texTriangleY; this.texTriangleZ = var1.texTriangleZ; - this.__h = var1.__h; - this.__b = var1.__b; + this.field555 = var1.field555; + this.field556 = var1.field556; this.vertexLabels = var1.vertexLabels; this.faceLabelsAlpha = var1.faceLabelsAlpha; - this.__v = var1.__v; + this.field557 = var1.field557; this.faceNormals = var1.faceNormals; - this.__ag = var1.__ag; - this.__aq = var1.__aq; - this.__aj = var1.__aj; + this.field558 = var1.field558; + this.field559 = var1.field559; + this.field560 = var1.field560; } @ObfuscatedName("f") - void __f_215(byte[] var1) { + void method203(byte[] var1) { Buffer var2 = new Buffer(var1); Buffer var3 = new Buffer(var1); Buffer var4 = new Buffer(var1); @@ -381,8 +373,8 @@ public class ModelData extends Entity { Buffer var7 = new Buffer(var1); Buffer var8 = new Buffer(var1); var2.index = var1.length - 23; - int var9 = var2.__ag_302(); - int var10 = var2.__ag_302(); + int var9 = var2.method43(); + int var10 = var2.method43(); int var11 = var2.readUnsignedByte(); int var12 = var2.readUnsignedByte(); int var13 = var2.readUnsignedByte(); @@ -390,295 +382,295 @@ public class ModelData extends Entity { int var15 = var2.readUnsignedByte(); int var16 = var2.readUnsignedByte(); int var17 = var2.readUnsignedByte(); - int var18 = var2.__ag_302(); - int var19 = var2.__ag_302(); - int var20 = var2.__ag_302(); - int var21 = var2.__ag_302(); - int var22 = var2.__ag_302(); + int var18 = var2.method43(); + int var19 = var2.method43(); + int var20 = var2.method43(); + int var21 = var2.method43(); + int var22 = var2.method43(); int var23 = 0; int var24 = 0; int var25 = 0; int var26; - if(var11 > 0) { + if (var11 > 0) { this.textureRenderTypes = new byte[var11]; var2.index = 0; - for(var26 = 0; var26 < var11; ++var26) { + for (var26 = 0; var26 < var11; ++var26) { byte var27 = this.textureRenderTypes[var26] = var2.readByte(); - if(var27 == 0) { + if (var27 == 0) { ++var23; } - if(var27 >= 1 && var27 <= 3) { + if (var27 >= 1 && var27 <= 3) { ++var24; } - if(var27 == 2) { + if (var27 == 2) { ++var25; } } } var26 = var11 + var9; - int var28 = var26; - if(var12 == 1) { + int var56 = var26; + if (var12 == 1) { var26 += var10; } - int var29 = var26; + int var28 = var26; var26 += var10; + int var29 = var26; + if (var13 == 255) { + var26 += var10; + } + int var30 = var26; - if(var13 == 255) { + if (var15 == 1) { var26 += var10; } int var31 = var26; - if(var15 == 1) { - var26 += var10; - } - - int var32 = var26; - if(var17 == 1) { + if (var17 == 1) { var26 += var9; } - int var33 = var26; - if(var14 == 1) { + int var32 = var26; + if (var14 == 1) { var26 += var10; } - int var34 = var26; + int var33 = var26; var26 += var21; - int var35 = var26; - if(var16 == 1) { + int var34 = var26; + if (var16 == 1) { var26 += var10 * 2; } - int var36 = var26; + int var35 = var26; var26 += var22; - int var37 = var26; + int var36 = var26; var26 += var10 * 2; - int var38 = var26; + int var37 = var26; var26 += var18; - int var39 = var26; + int var38 = var26; var26 += var19; - int var40 = var26; + int var39 = var26; var26 += var20; - int var41 = var26; + int var40 = var26; var26 += var23 * 6; + int var41 = var26; + var26 += var24 * 6; int var42 = var26; var26 += var24 * 6; int var43 = var26; - var26 += var24 * 6; - int var44 = var26; var26 += var24 * 2; - int var45 = var26; + int var44 = var26; var26 += var24; - int var46 = var26; + int var45 = var26; var26 += var24 * 2 + var25 * 2; this.verticesCount = var9; this.faceCount = var10; - this.__z = var11; + this.field554 = var11; this.verticesX = new int[var9]; this.verticesY = new int[var9]; this.verticesZ = new int[var9]; this.indices1 = new int[var10]; this.indices2 = new int[var10]; this.indices3 = new int[var10]; - if(var17 == 1) { - this.__h = new int[var9]; + if (var17 == 1) { + this.field555 = new int[var9]; } - if(var12 == 1) { - this.__e = new byte[var10]; + if (var12 == 1) { + this.field551 = new byte[var10]; } - if(var13 == 255) { - this.__x = new byte[var10]; + if (var13 == 255) { + this.field552 = new byte[var10]; } else { - this.__a = (byte)var13; + this.field553 = (byte)var13; } - if(var14 == 1) { + if (var14 == 1) { this.faceAlphas = new byte[var10]; } - if(var15 == 1) { - this.__b = new int[var10]; + if (var15 == 1) { + this.field556 = new int[var10]; } - if(var16 == 1) { + if (var16 == 1) { this.faceTextures = new short[var10]; } - if(var16 == 1 && var11 > 0) { + if (var16 == 1 && var11 > 0) { this.textureCoords = new byte[var10]; } this.faceColors = new short[var10]; - if(var11 > 0) { + if (var11 > 0) { this.texTriangleX = new short[var11]; this.texTriangleY = new short[var11]; this.texTriangleZ = new short[var11]; } var2.index = var11; - var3.index = var38; - var4.index = var39; - var5.index = var40; - var6.index = var32; + var3.index = var37; + var4.index = var38; + var5.index = var39; + var6.index = var31; + int var46 = 0; + int var47 = 0; int var48 = 0; - int var49 = 0; - int var50 = 0; + int var49; + int var50; int var51; int var52; int var53; - int var54; - int var55; - for(var51 = 0; var51 < var9; ++var51) { - var52 = var2.readUnsignedByte(); + for (var49 = 0; var49 < var9; ++var49) { + var50 = var2.readUnsignedByte(); + var51 = 0; + if ((var50 & 1) != 0) { + var51 = var3.method47(); + } + + var52 = 0; + if ((var50 & 2) != 0) { + var52 = var4.method47(); + } + var53 = 0; - if((var52 & 1) != 0) { - var53 = var3.__ab_306(); + if ((var50 & 4) != 0) { + var53 = var5.method47(); } - var54 = 0; - if((var52 & 2) != 0) { - var54 = var4.__ab_306(); - } - - var55 = 0; - if((var52 & 4) != 0) { - var55 = var5.__ab_306(); - } - - this.verticesX[var51] = var48 + var53; - this.verticesY[var51] = var49 + var54; - this.verticesZ[var51] = var50 + var55; - var48 = this.verticesX[var51]; - var49 = this.verticesY[var51]; - var50 = this.verticesZ[var51]; - if(var17 == 1) { - this.__h[var51] = var6.readUnsignedByte(); + this.verticesX[var49] = var46 + var51; + this.verticesY[var49] = var47 + var52; + this.verticesZ[var49] = var48 + var53; + var46 = this.verticesX[var49]; + var47 = this.verticesY[var49]; + var48 = this.verticesZ[var49]; + if (var17 == 1) { + this.field555[var49] = var6.readUnsignedByte(); } } - var2.index = var37; + var2.index = var36; + var3.index = var56; + var4.index = var29; + var5.index = var32; + var6.index = var30; + var7.index = var34; + var8.index = var35; + + for (var49 = 0; var49 < var10; ++var49) { + this.faceColors[var49] = (short)var2.method43(); + if (var12 == 1) { + this.field551[var49] = var3.readByte(); + } + + if (var13 == 255) { + this.field552[var49] = var4.readByte(); + } + + if (var14 == 1) { + this.faceAlphas[var49] = var5.readByte(); + } + + if (var15 == 1) { + this.field556[var49] = var6.readUnsignedByte(); + } + + if (var16 == 1) { + this.faceTextures[var49] = (short)(var7.method43() - 1); + } + + if (this.textureCoords != null && this.faceTextures[var49] != -1) { + this.textureCoords[var49] = (byte)(var8.readUnsignedByte() - 1); + } + } + + var2.index = var33; var3.index = var28; - var4.index = var30; - var5.index = var33; - var6.index = var31; - var7.index = var35; - var8.index = var36; - - for(var51 = 0; var51 < var10; ++var51) { - this.faceColors[var51] = (short)var2.__ag_302(); - if(var12 == 1) { - this.__e[var51] = var3.readByte(); - } - - if(var13 == 255) { - this.__x[var51] = var4.readByte(); - } - - if(var14 == 1) { - this.faceAlphas[var51] = var5.readByte(); - } - - if(var15 == 1) { - this.__b[var51] = var6.readUnsignedByte(); - } - - if(var16 == 1) { - this.faceTextures[var51] = (short)(var7.__ag_302() - 1); - } - - if(this.textureCoords != null && this.faceTextures[var51] != -1) { - this.textureCoords[var51] = (byte)(var8.readUnsignedByte() - 1); - } - } - - var2.index = var34; - var3.index = var29; + var49 = 0; + var50 = 0; var51 = 0; var52 = 0; - var53 = 0; - var54 = 0; - int var56; - for(var55 = 0; var55 < var10; ++var55) { - var56 = var3.readUnsignedByte(); - if(var56 == 1) { - var51 = var2.__ab_306() + var54; - var52 = var2.__ab_306() + var51; - var53 = var2.__ab_306() + var52; - var54 = var53; - this.indices1[var55] = var51; - this.indices2[var55] = var52; - this.indices3[var55] = var53; + int var54; + for (var53 = 0; var53 < var10; ++var53) { + var54 = var3.readUnsignedByte(); + if (var54 == 1) { + var49 = var2.method47() + var52; + var50 = var2.method47() + var49; + var51 = var2.method47() + var50; + var52 = var51; + this.indices1[var53] = var49; + this.indices2[var53] = var50; + this.indices3[var53] = var51; } - if(var56 == 2) { - var52 = var53; - var53 = var2.__ab_306() + var54; - var54 = var53; - this.indices1[var55] = var51; - this.indices2[var55] = var52; - this.indices3[var55] = var53; + if (var54 == 2) { + var50 = var51; + var51 = var2.method47() + var52; + var52 = var51; + this.indices1[var53] = var49; + this.indices2[var53] = var50; + this.indices3[var53] = var51; } - if(var56 == 3) { - var51 = var53; - var53 = var2.__ab_306() + var54; - var54 = var53; - this.indices1[var55] = var51; - this.indices2[var55] = var52; - this.indices3[var55] = var53; + if (var54 == 3) { + var49 = var51; + var51 = var2.method47() + var52; + var52 = var51; + this.indices1[var53] = var49; + this.indices2[var53] = var50; + this.indices3[var53] = var51; } - if(var56 == 4) { - int var57 = var51; - var51 = var52; - var52 = var57; - var53 = var2.__ab_306() + var54; - var54 = var53; - this.indices1[var55] = var51; - this.indices2[var55] = var57; - this.indices3[var55] = var53; + if (var54 == 4) { + int var55 = var49; + var49 = var50; + var50 = var55; + var51 = var2.method47() + var52; + var52 = var51; + this.indices1[var53] = var49; + this.indices2[var53] = var55; + this.indices3[var53] = var51; } } - var2.index = var41; - var3.index = var42; - var4.index = var43; - var5.index = var44; - var6.index = var45; - var7.index = var46; + var2.index = var40; + var3.index = var41; + var4.index = var42; + var5.index = var43; + var6.index = var44; + var7.index = var45; - for(var55 = 0; var55 < var11; ++var55) { - var56 = this.textureRenderTypes[var55] & 255; - if(var56 == 0) { - this.texTriangleX[var55] = (short)var2.__ag_302(); - this.texTriangleY[var55] = (short)var2.__ag_302(); - this.texTriangleZ[var55] = (short)var2.__ag_302(); + for (var53 = 0; var53 < var11; ++var53) { + var54 = this.textureRenderTypes[var53] & 255; + if (var54 == 0) { + this.texTriangleX[var53] = (short)var2.method43(); + this.texTriangleY[var53] = (short)var2.method43(); + this.texTriangleZ[var53] = (short)var2.method43(); } } var2.index = var26; - var55 = var2.readUnsignedByte(); - if(var55 != 0) { + var53 = var2.readUnsignedByte(); + if (var53 != 0) { new ModelData0(); - var2.__ag_302(); - var2.__ag_302(); - var2.__ag_302(); + var2.method43(); + var2.method43(); + var2.method43(); var2.readInt(); } } @ObfuscatedName("q") - void __q_216(byte[] var1) { + void method204(byte[] var1) { boolean var2 = false; boolean var3 = false; Buffer var4 = new Buffer(var1); @@ -687,103 +679,103 @@ public class ModelData extends Entity { Buffer var7 = new Buffer(var1); Buffer var8 = new Buffer(var1); var4.index = var1.length - 18; - int var9 = var4.__ag_302(); - int var10 = var4.__ag_302(); + int var9 = var4.method43(); + int var10 = var4.method43(); int var11 = var4.readUnsignedByte(); int var12 = var4.readUnsignedByte(); int var13 = var4.readUnsignedByte(); int var14 = var4.readUnsignedByte(); int var15 = var4.readUnsignedByte(); int var16 = var4.readUnsignedByte(); - int var17 = var4.__ag_302(); - int var18 = var4.__ag_302(); - int var19 = var4.__ag_302(); - int var20 = var4.__ag_302(); + int var17 = var4.method43(); + int var18 = var4.method43(); + int var19 = var4.method43(); + int var20 = var4.method43(); byte var21 = 0; - int var45 = var21 + var9; - int var23 = var45; - var45 += var10; - int var24 = var45; - if(var13 == 255) { - var45 += var10; + int var22 = var21 + var9; + int var23 = var22; + var22 += var10; + int var24 = var22; + if (var13 == 255) { + var22 += var10; } - int var25 = var45; - if(var15 == 1) { - var45 += var10; + int var25 = var22; + if (var15 == 1) { + var22 += var10; } - int var26 = var45; - if(var12 == 1) { - var45 += var10; + int var26 = var22; + if (var12 == 1) { + var22 += var10; } - int var27 = var45; - if(var16 == 1) { - var45 += var9; + int var27 = var22; + if (var16 == 1) { + var22 += var9; } - int var28 = var45; - if(var14 == 1) { - var45 += var10; + int var28 = var22; + if (var14 == 1) { + var22 += var10; } - int var29 = var45; - var45 += var20; - int var30 = var45; - var45 += var10 * 2; - int var31 = var45; - var45 += var11 * 6; - int var32 = var45; - var45 += var17; - int var33 = var45; - var45 += var18; - int var10000 = var45 + var19; + int var29 = var22; + var22 += var20; + int var30 = var22; + var22 += var10 * 2; + int var31 = var22; + var22 += var11 * 6; + int var32 = var22; + var22 += var17; + int var33 = var22; + var22 += var18; + int var10000 = var22 + var19; this.verticesCount = var9; this.faceCount = var10; - this.__z = var11; + this.field554 = var11; this.verticesX = new int[var9]; this.verticesY = new int[var9]; this.verticesZ = new int[var9]; this.indices1 = new int[var10]; this.indices2 = new int[var10]; this.indices3 = new int[var10]; - if(var11 > 0) { + if (var11 > 0) { this.textureRenderTypes = new byte[var11]; this.texTriangleX = new short[var11]; this.texTriangleY = new short[var11]; this.texTriangleZ = new short[var11]; } - if(var16 == 1) { - this.__h = new int[var9]; + if (var16 == 1) { + this.field555 = new int[var9]; } - if(var12 == 1) { - this.__e = new byte[var10]; + if (var12 == 1) { + this.field551 = new byte[var10]; this.textureCoords = new byte[var10]; this.faceTextures = new short[var10]; } - if(var13 == 255) { - this.__x = new byte[var10]; + if (var13 == 255) { + this.field552 = new byte[var10]; } else { - this.__a = (byte)var13; + this.field553 = (byte)var13; } - if(var14 == 1) { + if (var14 == 1) { this.faceAlphas = new byte[var10]; } - if(var15 == 1) { - this.__b = new int[var10]; + if (var15 == 1) { + this.field556 = new int[var10]; } this.faceColors = new short[var10]; var4.index = var21; var5.index = var32; var6.index = var33; - var7.index = var45; + var7.index = var22; var8.index = var27; int var35 = 0; int var36 = 0; @@ -794,21 +786,21 @@ public class ModelData extends Entity { int var40; int var41; int var42; - for(var38 = 0; var38 < var9; ++var38) { + for (var38 = 0; var38 < var9; ++var38) { var39 = var4.readUnsignedByte(); var40 = 0; - if((var39 & 1) != 0) { - var40 = var5.__ab_306(); + if ((var39 & 1) != 0) { + var40 = var5.method47(); } var41 = 0; - if((var39 & 2) != 0) { - var41 = var6.__ab_306(); + if ((var39 & 2) != 0) { + var41 = var6.method47(); } var42 = 0; - if((var39 & 4) != 0) { - var42 = var7.__ab_306(); + if ((var39 & 4) != 0) { + var42 = var7.method47(); } this.verticesX[var38] = var35 + var40; @@ -817,8 +809,8 @@ public class ModelData extends Entity { var35 = this.verticesX[var38]; var36 = this.verticesY[var38]; var37 = this.verticesZ[var38]; - if(var16 == 1) { - this.__h[var38] = var8.readUnsignedByte(); + if (var16 == 1) { + this.field555[var38] = var8.readUnsignedByte(); } } @@ -828,22 +820,22 @@ public class ModelData extends Entity { var7.index = var28; var8.index = var25; - for(var38 = 0; var38 < var10; ++var38) { - this.faceColors[var38] = (short)var4.__ag_302(); - if(var12 == 1) { + for (var38 = 0; var38 < var10; ++var38) { + this.faceColors[var38] = (short)var4.method43(); + if (var12 == 1) { var39 = var5.readUnsignedByte(); - if((var39 & 1) == 1) { - this.__e[var38] = 1; + if ((var39 & 1) == 1) { + this.field551[var38] = 1; var2 = true; } else { - this.__e[var38] = 0; + this.field551[var38] = 0; } - if((var39 & 2) == 2) { + if ((var39 & 2) == 2) { this.textureCoords[var38] = (byte)(var39 >> 2); this.faceTextures[var38] = this.faceColors[var38]; this.faceColors[var38] = 127; - if(this.faceTextures[var38] != -1) { + if (this.faceTextures[var38] != -1) { var3 = true; } } else { @@ -852,16 +844,16 @@ public class ModelData extends Entity { } } - if(var13 == 255) { - this.__x[var38] = var6.readByte(); + if (var13 == 255) { + this.field552[var38] = var6.readByte(); } - if(var14 == 1) { + if (var14 == 1) { this.faceAlphas[var38] = var7.readByte(); } - if(var15 == 1) { - this.__b[var38] = var8.readUnsignedByte(); + if (var15 == 1) { + this.field556[var38] = var8.readUnsignedByte(); } } @@ -874,41 +866,41 @@ public class ModelData extends Entity { int var43; int var44; - for(var42 = 0; var42 < var10; ++var42) { + for (var42 = 0; var42 < var10; ++var42) { var43 = var5.readUnsignedByte(); - if(var43 == 1) { - var38 = var4.__ab_306() + var41; - var39 = var4.__ab_306() + var38; - var40 = var4.__ab_306() + var39; + if (var43 == 1) { + var38 = var4.method47() + var41; + var39 = var4.method47() + var38; + var40 = var4.method47() + var39; var41 = var40; this.indices1[var42] = var38; this.indices2[var42] = var39; this.indices3[var42] = var40; } - if(var43 == 2) { + if (var43 == 2) { var39 = var40; - var40 = var4.__ab_306() + var41; + var40 = var4.method47() + var41; var41 = var40; this.indices1[var42] = var38; this.indices2[var42] = var39; this.indices3[var42] = var40; } - if(var43 == 3) { + if (var43 == 3) { var38 = var40; - var40 = var4.__ab_306() + var41; + var40 = var4.method47() + var41; var41 = var40; this.indices1[var42] = var38; this.indices2[var42] = var39; this.indices3[var42] = var40; } - if(var43 == 4) { + if (var43 == 4) { var44 = var38; var38 = var39; var39 = var44; - var40 = var4.__ab_306() + var41; + var40 = var4.method47() + var41; var41 = var40; this.indices1[var42] = var38; this.indices2[var42] = var44; @@ -918,38 +910,38 @@ public class ModelData extends Entity { var4.index = var31; - for(var42 = 0; var42 < var11; ++var42) { + for (var42 = 0; var42 < var11; ++var42) { this.textureRenderTypes[var42] = 0; - this.texTriangleX[var42] = (short)var4.__ag_302(); - this.texTriangleY[var42] = (short)var4.__ag_302(); - this.texTriangleZ[var42] = (short)var4.__ag_302(); + this.texTriangleX[var42] = (short)var4.method43(); + this.texTriangleY[var42] = (short)var4.method43(); + this.texTriangleZ[var42] = (short)var4.method43(); } - if(this.textureCoords != null) { - boolean var46 = false; + if (this.textureCoords != null) { + boolean var45 = false; - for(var43 = 0; var43 < var10; ++var43) { + for (var43 = 0; var43 < var10; ++var43) { var44 = this.textureCoords[var43] & 255; - if(var44 != 255) { - if(this.indices1[var43] == (this.texTriangleX[var44] & '\uffff') && this.indices2[var43] == (this.texTriangleY[var44] & '\uffff') && this.indices3[var43] == (this.texTriangleZ[var44] & '\uffff')) { + if (var44 != 255) { + if (this.indices1[var43] == (this.texTriangleX[var44] & '\uffff') && this.indices2[var43] == (this.texTriangleY[var44] & '\uffff') && this.indices3[var43] == (this.texTriangleZ[var44] & '\uffff')) { this.textureCoords[var43] = -1; } else { - var46 = true; + var45 = true; } } } - if(!var46) { + if (!var45) { this.textureCoords = null; } } - if(!var3) { + if (!var3) { this.faceTextures = null; } - if(!var2) { - this.__e = null; + if (!var2) { + this.field551 = null; } } @@ -958,25 +950,25 @@ public class ModelData extends Entity { @ObfuscatedSignature( signature = "(Ldw;I)I" ) - final int __w_217(ModelData var1, int var2) { + final int method205(ModelData var1, int var2) { int var3 = -1; int var4 = var1.verticesX[var2]; int var5 = var1.verticesY[var2]; int var6 = var1.verticesZ[var2]; - for(int var7 = 0; var7 < this.verticesCount; ++var7) { - if(var4 == this.verticesX[var7] && var5 == this.verticesY[var7] && var6 == this.verticesZ[var7]) { + for (int var7 = 0; var7 < this.verticesCount; ++var7) { + if (var4 == this.verticesX[var7] && var5 == this.verticesY[var7] && var6 == this.verticesZ[var7]) { var3 = var7; break; } } - if(var3 == -1) { + if (var3 == -1) { this.verticesX[this.verticesCount] = var4; this.verticesY[this.verticesCount] = var5; this.verticesZ[this.verticesCount] = var6; - if(var1.__h != null) { - this.__h[this.verticesCount] = var1.__h[var2]; + if (var1.field555 != null) { + this.field555[this.verticesCount] = var1.field555[var2]; } var3 = this.verticesCount++; @@ -989,43 +981,43 @@ public class ModelData extends Entity { @ObfuscatedSignature( signature = "()Ldw;" ) - public ModelData __o_218() { + public ModelData method206() { ModelData var1 = new ModelData(); - if(this.__e != null) { - var1.__e = new byte[this.faceCount]; + if (this.field551 != null) { + var1.field551 = new byte[this.faceCount]; - for(int var2 = 0; var2 < this.faceCount; ++var2) { - var1.__e[var2] = this.__e[var2]; + for (int var2 = 0; var2 < this.faceCount; ++var2) { + var1.field551[var2] = this.field551[var2]; } } var1.verticesCount = this.verticesCount; var1.faceCount = this.faceCount; - var1.__z = this.__z; + var1.field554 = this.field554; var1.verticesX = this.verticesX; var1.verticesY = this.verticesY; var1.verticesZ = this.verticesZ; var1.indices1 = this.indices1; var1.indices2 = this.indices2; var1.indices3 = this.indices3; - var1.__x = this.__x; + var1.field552 = this.field552; var1.faceAlphas = this.faceAlphas; var1.textureCoords = this.textureCoords; var1.faceColors = this.faceColors; var1.faceTextures = this.faceTextures; - var1.__a = this.__a; + var1.field553 = this.field553; var1.textureRenderTypes = this.textureRenderTypes; var1.texTriangleX = this.texTriangleX; var1.texTriangleY = this.texTriangleY; var1.texTriangleZ = this.texTriangleZ; - var1.__h = this.__h; - var1.__b = this.__b; + var1.field555 = this.field555; + var1.field556 = this.field556; var1.vertexLabels = this.vertexLabels; var1.faceLabelsAlpha = this.faceLabelsAlpha; - var1.__v = this.__v; + var1.field557 = this.field557; var1.faceNormals = this.faceNormals; - var1.__aq = this.__aq; - var1.__aj = this.__aj; + var1.field559 = this.field559; + var1.field560 = this.field560; return var1; } @@ -1033,46 +1025,46 @@ public class ModelData extends Entity { @ObfuscatedSignature( signature = "([[IIIIZI)Ldw;" ) - public ModelData __u_219(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { - this.__c_229(); - int var7 = var2 + this.__ac; - int var8 = var2 + this.__ay; - int var9 = var4 + this.__ak; - int var10 = var4 + this.__ah; - if(var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { + public ModelData method207(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { + this.method217(); + int var7 = var2 + this.field562; + int var8 = var2 + this.field563; + int var9 = var4 + this.field565; + int var10 = var4 + this.field564; + if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { var7 >>= 7; var8 = var8 + 127 >> 7; var9 >>= 7; var10 = var10 + 127 >> 7; - if(var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { + if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { return this; } else { ModelData var11 = new ModelData(); var11.verticesCount = this.verticesCount; var11.faceCount = this.faceCount; - var11.__z = this.__z; + var11.field554 = this.field554; var11.verticesX = this.verticesX; var11.verticesZ = this.verticesZ; var11.indices1 = this.indices1; var11.indices2 = this.indices2; var11.indices3 = this.indices3; - var11.__e = this.__e; - var11.__x = this.__x; + var11.field551 = this.field551; + var11.field552 = this.field552; var11.faceAlphas = this.faceAlphas; var11.textureCoords = this.textureCoords; var11.faceColors = this.faceColors; var11.faceTextures = this.faceTextures; - var11.__a = this.__a; + var11.field553 = this.field553; var11.textureRenderTypes = this.textureRenderTypes; var11.texTriangleX = this.texTriangleX; var11.texTriangleY = this.texTriangleY; var11.texTriangleZ = this.texTriangleZ; - var11.__h = this.__h; - var11.__b = this.__b; + var11.field555 = this.field555; + var11.field556 = this.field556; var11.vertexLabels = this.vertexLabels; var11.faceLabelsAlpha = this.faceLabelsAlpha; - var11.__aq = this.__aq; - var11.__aj = this.__aj; + var11.field559 = this.field559; + var11.field560 = this.field560; var11.verticesY = new int[var11.verticesCount]; int var12; int var13; @@ -1084,8 +1076,8 @@ public class ModelData extends Entity { int var19; int var20; int var21; - if(var6 == 0) { - for(var12 = 0; var12 < var11.verticesCount; ++var12) { + if (var6 == 0) { + for (var12 = 0; var12 < var11.verticesCount; ++var12) { var13 = var2 + this.verticesX[var12]; var14 = var4 + this.verticesZ[var12]; var15 = var13 & 127; @@ -1098,9 +1090,9 @@ public class ModelData extends Entity { var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; } } else { - for(var12 = 0; var12 < var11.verticesCount; ++var12) { + for (var12 = 0; var12 < var11.verticesCount; ++var12) { var13 = (-this.verticesY[var12] << 16) / super.height; - if(var13 < var6) { + if (var13 < var6) { var14 = var2 + this.verticesX[var12]; var15 = var4 + this.verticesZ[var12]; var16 = var14 & 127; @@ -1124,68 +1116,69 @@ public class ModelData extends Entity { } @ObfuscatedName("g") - void __g_220() { + void method208() { int[] var1; int var2; + int var10002; int var3; int var4; - if(this.__h != null) { + if (this.field555 != null) { var1 = new int[256]; var2 = 0; - for(var3 = 0; var3 < this.verticesCount; ++var3) { - var4 = this.__h[var3]; - ++var1[var4]; - if(var4 > var2) { + for (var3 = 0; var3 < this.verticesCount; ++var3) { + var4 = this.field555[var3]; + var10002 = var1[var4]++; + if (var4 > var2) { var2 = var4; } } this.vertexLabels = new int[var2 + 1][]; - for(var3 = 0; var3 <= var2; ++var3) { + for (var3 = 0; var3 <= var2; ++var3) { this.vertexLabels[var3] = new int[var1[var3]]; var1[var3] = 0; } - for(var3 = 0; var3 < this.verticesCount; this.vertexLabels[var4][var1[var4]++] = var3++) { - var4 = this.__h[var3]; + for (var3 = 0; var3 < this.verticesCount; this.vertexLabels[var4][var1[var4]++] = var3++) { + var4 = this.field555[var3]; } - this.__h = null; + this.field555 = null; } - if(this.__b != null) { + if (this.field556 != null) { var1 = new int[256]; var2 = 0; - for(var3 = 0; var3 < this.faceCount; ++var3) { - var4 = this.__b[var3]; - ++var1[var4]; - if(var4 > var2) { + for (var3 = 0; var3 < this.faceCount; ++var3) { + var4 = this.field556[var3]; + var10002 = var1[var4]++; + if (var4 > var2) { var2 = var4; } } this.faceLabelsAlpha = new int[var2 + 1][]; - for(var3 = 0; var3 <= var2; ++var3) { + for (var3 = 0; var3 <= var2; ++var3) { this.faceLabelsAlpha[var3] = new int[var1[var3]]; var1[var3] = 0; } - for(var3 = 0; var3 < this.faceCount; this.faceLabelsAlpha[var4][var1[var4]++] = var3++) { - var4 = this.__b[var3]; + for (var3 = 0; var3 < this.faceCount; this.faceLabelsAlpha[var4][var1[var4]++] = var3++) { + var4 = this.field556[var3]; } - this.__b = null; + this.field556 = null; } } @ObfuscatedName("l") - public void __l_221() { - for(int var1 = 0; var1 < this.verticesCount; ++var1) { + public void method209() { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesX[var1]; this.verticesX[var1] = this.verticesZ[var1]; this.verticesZ[var1] = -var2; @@ -1195,8 +1188,8 @@ public class ModelData extends Entity { } @ObfuscatedName("x") - public void __x_222() { - for(int var1 = 0; var1 < this.verticesCount; ++var1) { + public void method210() { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { this.verticesX[var1] = -this.verticesX[var1]; this.verticesZ[var1] = -this.verticesZ[var1]; } @@ -1205,8 +1198,8 @@ public class ModelData extends Entity { } @ObfuscatedName("d") - public void __d_223() { - for(int var1 = 0; var1 < this.verticesCount; ++var1) { + public void method211() { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesZ[var1]; this.verticesZ[var1] = this.verticesX[var1]; this.verticesX[var1] = -var2; @@ -1216,11 +1209,11 @@ public class ModelData extends Entity { } @ObfuscatedName("a") - public void __a_224(int var1) { + public void method212(int var1) { int var2 = ModelData_sine[var1]; int var3 = ModelData_cosine[var1]; - for(int var4 = 0; var4 < this.verticesCount; ++var4) { + for (int var4 = 0; var4 < this.verticesCount; ++var4) { int var5 = var2 * this.verticesZ[var4] + var3 * this.verticesX[var4] >> 16; this.verticesZ[var4] = var3 * this.verticesZ[var4] - var2 * this.verticesX[var4] >> 16; this.verticesX[var4] = var5; @@ -1230,11 +1223,14 @@ public class ModelData extends Entity { } @ObfuscatedName("z") - public void __z_225(int var1, int var2, int var3) { - for(int var4 = 0; var4 < this.verticesCount; ++var4) { - this.verticesX[var4] += var1; - this.verticesY[var4] += var2; - this.verticesZ[var4] += var3; + public void method213(int var1, int var2, int var3) { + for (int var4 = 0; var4 < this.verticesCount; ++var4) { + int[] var10000 = this.verticesX; + var10000[var4] += var1; + var10000 = this.verticesY; + var10000[var4] += var2; + var10000 = this.verticesZ; + var10000[var4] += var3; } this.invalidate(); @@ -1243,8 +1239,8 @@ public class ModelData extends Entity { @ObfuscatedName("j") @Export("recolor") public void recolor(short var1, short var2) { - for(int var3 = 0; var3 < this.faceCount; ++var3) { - if(this.faceColors[var3] == var1) { + for (int var3 = 0; var3 < this.faceCount; ++var3) { + if (this.faceColors[var3] == var1) { this.faceColors[var3] = var2; } } @@ -1254,24 +1250,24 @@ public class ModelData extends Entity { @ObfuscatedName("s") @Export("retexture") public void retexture(short var1, short var2) { - if(this.faceTextures != null) { - for(int var3 = 0; var3 < this.faceCount; ++var3) { - if(this.faceTextures[var3] == var1) { + if (this.faceTextures != null) { + for (int var3 = 0; var3 < this.faceCount; ++var3) { + if (this.faceTextures[var3] == var1) { this.faceTextures[var3] = var2; } } - } + } @ObfuscatedName("t") - public void __t_226() { + public void method214() { int var1; - for(var1 = 0; var1 < this.verticesCount; ++var1) { + for (var1 = 0; var1 < this.verticesCount; ++var1) { this.verticesZ[var1] = -this.verticesZ[var1]; } - for(var1 = 0; var1 < this.faceCount; ++var1) { + for (var1 = 0; var1 < this.faceCount; ++var1) { int var2 = this.indices1[var1]; this.indices1[var1] = this.indices3[var1]; this.indices3[var1] = var2; @@ -1281,8 +1277,8 @@ public class ModelData extends Entity { } @ObfuscatedName("y") - public void __y_227(int var1, int var2, int var3) { - for(int var4 = 0; var4 < this.verticesCount; ++var4) { + public void method215(int var1, int var2, int var3) { + for (int var4 = 0; var4 < this.verticesCount; ++var4) { this.verticesX[var4] = this.verticesX[var4] * var1 / 128; this.verticesY[var4] = var2 * this.verticesY[var4] / 128; this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; @@ -1292,16 +1288,16 @@ public class ModelData extends Entity { } @ObfuscatedName("h") - public void __h_228() { - if(this.__v == null) { - this.__v = new VertexNormal[this.verticesCount]; + public void method216() { + if (this.field557 == null) { + this.field557 = new VertexNormal[this.verticesCount]; int var1; - for(var1 = 0; var1 < this.verticesCount; ++var1) { - this.__v[var1] = new VertexNormal(); + for (var1 = 0; var1 < this.verticesCount; ++var1) { + this.field557[var1] = new VertexNormal(); } - for(var1 = 0; var1 < this.faceCount; ++var1) { + for (var1 = 0; var1 < this.faceCount; ++var1) { int var2 = this.indices1[var1]; int var3 = this.indices2[var1]; int var4 = this.indices3[var1]; @@ -1315,13 +1311,13 @@ public class ModelData extends Entity { int var12 = var7 * var8 - var10 * var5; int var13; - for(var13 = var5 * var9 - var8 * var6; var11 > 8192 || var12 > 8192 || var13 > 8192 || var11 < -8192 || var12 < -8192 || var13 < -8192; var13 >>= 1) { + for (var13 = var5 * var9 - var8 * var6; var11 > 8192 || var12 > 8192 || var13 > 8192 || var11 < -8192 || var12 < -8192 || var13 < -8192; var13 >>= 1) { var11 >>= 1; var12 >>= 1; } int var14 = (int)Math.sqrt((double)(var11 * var11 + var12 * var12 + var13 * var13)); - if(var14 <= 0) { + if (var14 <= 0) { var14 = 1; } @@ -1329,93 +1325,94 @@ public class ModelData extends Entity { var12 = var12 * 256 / var14; var13 = var13 * 256 / var14; byte var15; - if(this.__e == null) { + if (this.field551 == null) { var15 = 0; } else { - var15 = this.__e[var1]; + var15 = this.field551[var1]; } - if(var15 == 0) { - VertexNormal var16 = this.__v[var2]; - var16.__m += var11; - var16.__f += var12; - var16.__q += var13; - ++var16.__w; - var16 = this.__v[var3]; - var16.__m += var11; - var16.__f += var12; - var16.__q += var13; - ++var16.__w; - var16 = this.__v[var4]; - var16.__m += var11; - var16.__f += var12; - var16.__q += var13; - ++var16.__w; - } else if(var15 == 1) { - if(this.faceNormals == null) { + if (var15 == 0) { + VertexNormal var16 = this.field557[var2]; + var16.field947 += var11; + var16.field948 += var12; + var16.field949 += var13; + ++var16.field950; + var16 = this.field557[var3]; + var16.field947 += var11; + var16.field948 += var12; + var16.field949 += var13; + ++var16.field950; + var16 = this.field557[var4]; + var16.field947 += var11; + var16.field948 += var12; + var16.field949 += var13; + ++var16.field950; + } else if (var15 == 1) { + if (this.faceNormals == null) { this.faceNormals = new FaceNormal[this.faceCount]; } FaceNormal var17 = this.faceNormals[var1] = new FaceNormal(); - var17.__m = var11; - var17.__f = var12; - var17.__q = var13; + var17.field346 = var11; + var17.field347 = var12; + var17.field348 = var13; } } - } + } @ObfuscatedName("b") @Export("invalidate") void invalidate() { - this.__v = null; - this.__ag = null; + this.field557 = null; + this.field558 = null; this.faceNormals = null; this.isBoundsCalculated = false; } @ObfuscatedName("c") - void __c_229() { - if(!this.isBoundsCalculated) { + void method217() { + if (!this.isBoundsCalculated) { super.height = 0; - this.__ar = 0; - this.__ac = 999999; - this.__ay = -999999; - this.__ah = -99999; - this.__ak = 99999; + this.field561 = 0; + this.field562 = 999999; + this.field563 = -999999; + this.field564 = -99999; + this.field565 = 99999; - for(int var1 = 0; var1 < this.verticesCount; ++var1) { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesX[var1]; int var3 = this.verticesY[var1]; int var4 = this.verticesZ[var1]; - if(var2 < this.__ac) { - this.__ac = var2; + if (var2 < this.field562) { + this.field562 = var2; } - if(var2 > this.__ay) { - this.__ay = var2; + if (var2 > this.field563) { + this.field563 = var2; } - if(var4 < this.__ak) { - this.__ak = var4; + if (var4 < this.field565) { + this.field565 = var4; } - if(var4 > this.__ah) { - this.__ah = var4; + if (var4 > this.field564) { + this.field564 = var4; } - if(-var3 > super.height) { + if (-var3 > super.height) { super.height = -var3; } - if(var3 > this.__ar) { - this.__ar = var3; + if (var3 > this.field561) { + this.field561 = var3; } } this.isBoundsCalculated = true; } + } @ObfuscatedName("v") @@ -1424,170 +1421,170 @@ public class ModelData extends Entity { ) @Export("toModel") public final Model toModel(int var1, int var2, int var3, int var4, int var5) { - this.__h_228(); + this.method216(); int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3 + var4 * var4)); int var7 = var6 * var2 >> 8; Model var8 = new Model(); var8.faceColors1 = new int[this.faceCount]; var8.faceColors2 = new int[this.faceCount]; var8.faceColors3 = new int[this.faceCount]; - if(this.__z > 0 && this.textureCoords != null) { - int[] var9 = new int[this.__z]; + if (this.field554 > 0 && this.textureCoords != null) { + int[] var9 = new int[this.field554]; int var10; - for(var10 = 0; var10 < this.faceCount; ++var10) { - if(this.textureCoords[var10] != -1) { + for (var10 = 0; var10 < this.faceCount; ++var10) { + if (this.textureCoords[var10] != -1) { ++var9[this.textureCoords[var10] & 255]; } } - var8.__h = 0; + var8.field544 = 0; - for(var10 = 0; var10 < this.__z; ++var10) { - if(var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { - ++var8.__h; + for (var10 = 0; var10 < this.field554; ++var10) { + if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { + ++var8.field544; } } - var8.__b = new int[var8.__h]; - var8.__c = new int[var8.__h]; - var8.__r = new int[var8.__h]; + var8.field545 = new int[var8.field544]; + var8.field546 = new int[var8.field544]; + var8.field547 = new int[var8.field544]; var10 = 0; int var11; - for(var11 = 0; var11 < this.__z; ++var11) { - if(var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { - var8.__b[var10] = this.texTriangleX[var11] & '\uffff'; - var8.__c[var10] = this.texTriangleY[var11] & '\uffff'; - var8.__r[var10] = this.texTriangleZ[var11] & '\uffff'; + for (var11 = 0; var11 < this.field554; ++var11) { + if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { + var8.field545[var10] = this.texTriangleX[var11] & '\uffff'; + var8.field546[var10] = this.texTriangleY[var11] & '\uffff'; + var8.field547[var10] = this.texTriangleZ[var11] & '\uffff'; var9[var11] = var10++; } else { var9[var11] = -1; } } - var8.__s = new byte[this.faceCount]; + var8.field542 = new byte[this.faceCount]; - for(var11 = 0; var11 < this.faceCount; ++var11) { - if(this.textureCoords[var11] != -1) { - var8.__s[var11] = (byte)var9[this.textureCoords[var11] & 255]; + for (var11 = 0; var11 < this.faceCount; ++var11) { + if (this.textureCoords[var11] != -1) { + var8.field542[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.__s[var11] = -1; + var8.field542[var11] = -1; } } } - for(int var16 = 0; var16 < this.faceCount; ++var16) { - byte var17; - if(this.__e == null) { - var17 = 0; - } else { - var17 = this.__e[var16]; - } - + for (int var17 = 0; var17 < this.faceCount; ++var17) { byte var18; - if(this.faceAlphas == null) { + if (this.field551 == null) { var18 = 0; } else { - var18 = this.faceAlphas[var16]; + var18 = this.field551[var17]; + } + + byte var19; + if (this.faceAlphas == null) { + var19 = 0; + } else { + var19 = this.faceAlphas[var17]; } short var12; - if(this.faceTextures == null) { + if (this.faceTextures == null) { var12 = -1; } else { - var12 = this.faceTextures[var16]; + var12 = this.faceTextures[var17]; } - if(var18 == -2) { - var17 = 3; + if (var19 == -2) { + var18 = 3; } - if(var18 == -1) { - var17 = 2; + if (var19 == -1) { + var18 = 2; } VertexNormal var13; int var14; - FaceNormal var19; - if(var12 == -1) { - if(var17 != 0) { - if(var17 == 1) { - var19 = this.faceNormals[var16]; - var14 = (var4 * var19.__f + var5 * var19.__q + var3 * var19.__m) / (var7 / 2 + var7) + var1; - var8.faceColors1[var16] = method2802(this.faceColors[var16] & '\uffff', var14); - var8.faceColors3[var16] = -1; - } else if(var17 == 3) { - var8.faceColors1[var16] = 128; - var8.faceColors3[var16] = -1; + FaceNormal var15; + if (var12 == -1) { + if (var18 != 0) { + if (var18 == 1) { + var15 = this.faceNormals[var17]; + var14 = (var4 * var15.field347 + var5 * var15.field348 + var3 * var15.field346) / (var7 / 2 + var7) + var1; + var8.faceColors1[var17] = method2802(this.faceColors[var17] & '\uffff', var14); + var8.faceColors3[var17] = -1; + } else if (var18 == 3) { + var8.faceColors1[var17] = 128; + var8.faceColors3[var17] = -1; } else { - var8.faceColors3[var16] = -2; + var8.faceColors3[var17] = -2; } } else { - int var15 = this.faceColors[var16] & '\uffff'; - if(this.__ag != null && this.__ag[this.indices1[var16]] != null) { - var13 = this.__ag[this.indices1[var16]]; + int var16 = this.faceColors[var17] & '\uffff'; + if (this.field558 != null && this.field558[this.indices1[var17]] != null) { + var13 = this.field558[this.indices1[var17]]; } else { - var13 = this.__v[this.indices1[var16]]; + var13 = this.field557[this.indices1[var17]]; } - var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1; - var8.faceColors1[var16] = method2802(var15, var14); - if(this.__ag != null && this.__ag[this.indices2[var16]] != null) { - var13 = this.__ag[this.indices2[var16]]; + var14 = (var4 * var13.field948 + var5 * var13.field949 + var3 * var13.field947) / (var7 * var13.field950) + var1; + var8.faceColors1[var17] = method2802(var16, var14); + if (this.field558 != null && this.field558[this.indices2[var17]] != null) { + var13 = this.field558[this.indices2[var17]]; } else { - var13 = this.__v[this.indices2[var16]]; + var13 = this.field557[this.indices2[var17]]; } - var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1; - var8.faceColors2[var16] = method2802(var15, var14); - if(this.__ag != null && this.__ag[this.indices3[var16]] != null) { - var13 = this.__ag[this.indices3[var16]]; + var14 = (var4 * var13.field948 + var5 * var13.field949 + var3 * var13.field947) / (var7 * var13.field950) + var1; + var8.faceColors2[var17] = method2802(var16, var14); + if (this.field558 != null && this.field558[this.indices3[var17]] != null) { + var13 = this.field558[this.indices3[var17]]; } else { - var13 = this.__v[this.indices3[var16]]; + var13 = this.field557[this.indices3[var17]]; } - var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1; - var8.faceColors3[var16] = method2802(var15, var14); + var14 = (var4 * var13.field948 + var5 * var13.field949 + var3 * var13.field947) / (var7 * var13.field950) + var1; + var8.faceColors3[var17] = method2802(var16, var14); } - } else if(var17 != 0) { - if(var17 == 1) { - var19 = this.faceNormals[var16]; - var14 = (var4 * var19.__f + var5 * var19.__q + var3 * var19.__m) / (var7 / 2 + var7) + var1; - var8.faceColors1[var16] = method2803(var14); - var8.faceColors3[var16] = -1; + } else if (var18 != 0) { + if (var18 == 1) { + var15 = this.faceNormals[var17]; + var14 = (var4 * var15.field347 + var5 * var15.field348 + var3 * var15.field346) / (var7 / 2 + var7) + var1; + var8.faceColors1[var17] = method2803(var14); + var8.faceColors3[var17] = -1; } else { - var8.faceColors3[var16] = -2; + var8.faceColors3[var17] = -2; } } else { - if(this.__ag != null && this.__ag[this.indices1[var16]] != null) { - var13 = this.__ag[this.indices1[var16]]; + if (this.field558 != null && this.field558[this.indices1[var17]] != null) { + var13 = this.field558[this.indices1[var17]]; } else { - var13 = this.__v[this.indices1[var16]]; + var13 = this.field557[this.indices1[var17]]; } - var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1; - var8.faceColors1[var16] = method2803(var14); - if(this.__ag != null && this.__ag[this.indices2[var16]] != null) { - var13 = this.__ag[this.indices2[var16]]; + var14 = (var4 * var13.field948 + var5 * var13.field949 + var3 * var13.field947) / (var7 * var13.field950) + var1; + var8.faceColors1[var17] = method2803(var14); + if (this.field558 != null && this.field558[this.indices2[var17]] != null) { + var13 = this.field558[this.indices2[var17]]; } else { - var13 = this.__v[this.indices2[var16]]; + var13 = this.field557[this.indices2[var17]]; } - var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1; - var8.faceColors2[var16] = method2803(var14); - if(this.__ag != null && this.__ag[this.indices3[var16]] != null) { - var13 = this.__ag[this.indices3[var16]]; + var14 = (var4 * var13.field948 + var5 * var13.field949 + var3 * var13.field947) / (var7 * var13.field950) + var1; + var8.faceColors2[var17] = method2803(var14); + if (this.field558 != null && this.field558[this.indices3[var17]] != null) { + var13 = this.field558[this.indices3[var17]]; } else { - var13 = this.__v[this.indices3[var16]]; + var13 = this.field557[this.indices3[var17]]; } - var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1; - var8.faceColors3[var16] = method2803(var14); + var14 = (var4 * var13.field948 + var5 * var13.field949 + var3 * var13.field947) / (var7 * var13.field950) + var1; + var8.faceColors3[var17] = method2803(var14); } } - this.__g_220(); + this.method208(); var8.verticesCount = this.verticesCount; var8.verticesX = this.verticesX; var8.verticesY = this.verticesY; @@ -1596,9 +1593,9 @@ public class ModelData extends Entity { var8.indices1 = this.indices1; var8.indices2 = this.indices2; var8.indices3 = this.indices3; - var8.faceRenderPriorities = this.__x; + var8.faceRenderPriorities = this.field552; var8.faceAlphas = this.faceAlphas; - var8.__y = this.__a; + var8.field543 = this.field553; var8.vertexLabels = this.vertexLabels; var8.faceLabelsAlpha = this.faceLabelsAlpha; var8.faceTextures = this.faceTextures; @@ -1611,7 +1608,7 @@ public class ModelData extends Entity { ) public static ModelData method2788(AbstractIndexCache var0, int var1, int var2) { byte[] var3 = var0.takeRecord(var1, var2); - return var3 == null?null:new ModelData(var3); + return var3 == null ? null : new ModelData(var3); } @ObfuscatedName("p") @@ -1619,57 +1616,57 @@ public class ModelData extends Entity { signature = "(Ldw;Ldw;IIIZ)V" ) static void method2800(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { - var0.__c_229(); - var0.__h_228(); - var1.__c_229(); - var1.__h_228(); - ++__dw_ab; + var0.method217(); + var0.method216(); + var1.method217(); + var1.method216(); + ++field550; int var6 = 0; int[] var7 = var1.verticesX; int var8 = var1.verticesCount; int var9; - for(var9 = 0; var9 < var0.verticesCount; ++var9) { - VertexNormal var10 = var0.__v[var9]; - if(var10.__w != 0) { + for (var9 = 0; var9 < var0.verticesCount; ++var9) { + VertexNormal var10 = var0.field557[var9]; + if (var10.field950 != 0) { int var11 = var0.verticesY[var9] - var3; - if(var11 <= var1.__ar) { + if (var11 <= var1.field561) { int var12 = var0.verticesX[var9] - var2; - if(var12 >= var1.__ac && var12 <= var1.__ay) { + if (var12 >= var1.field562 && var12 <= var1.field563) { int var13 = var0.verticesZ[var9] - var4; - if(var13 >= var1.__ak && var13 <= var1.__ah) { - for(int var14 = 0; var14 < var8; ++var14) { - VertexNormal var15 = var1.__v[var14]; - if(var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.__w != 0) { - if(var0.__ag == null) { - var0.__ag = new VertexNormal[var0.verticesCount]; + if (var13 >= var1.field565 && var13 <= var1.field564) { + for (int var14 = 0; var14 < var8; ++var14) { + VertexNormal var15 = var1.field557[var14]; + if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.field950 != 0) { + if (var0.field558 == null) { + var0.field558 = new VertexNormal[var0.verticesCount]; } - if(var1.__ag == null) { - var1.__ag = new VertexNormal[var8]; + if (var1.field558 == null) { + var1.field558 = new VertexNormal[var8]; } - VertexNormal var16 = var0.__ag[var9]; - if(var16 == null) { - var16 = var0.__ag[var9] = new VertexNormal(var10); + VertexNormal var16 = var0.field558[var9]; + if (var16 == null) { + var16 = var0.field558[var9] = new VertexNormal(var10); } - VertexNormal var17 = var1.__ag[var14]; - if(var17 == null) { - var17 = var1.__ag[var14] = new VertexNormal(var15); + VertexNormal var17 = var1.field558[var14]; + if (var17 == null) { + var17 = var1.field558[var14] = new VertexNormal(var15); } - var16.__m += var15.__m; - var16.__f += var15.__f; - var16.__q += var15.__q; - var16.__w += var15.__w; - var17.__m += var10.__m; - var17.__f += var10.__f; - var17.__q += var10.__q; - var17.__w += var10.__w; + var16.field947 += var15.field947; + var16.field948 += var15.field948; + var16.field949 += var15.field949; + var16.field950 += var15.field950; + var17.field947 += var10.field947; + var17.field948 += var10.field948; + var17.field949 += var10.field949; + var17.field950 += var10.field950; ++var6; - __dw_aw[var9] = __dw_ab; - __dw_al[var14] = __dw_ab; + field548[var9] = field550; + field549[var14] = field550; } } } @@ -1678,36 +1675,36 @@ public class ModelData extends Entity { } } - if(var6 >= 3 && var5) { - for(var9 = 0; var9 < var0.faceCount; ++var9) { - if(__dw_aw[var0.indices1[var9]] == __dw_ab && __dw_aw[var0.indices2[var9]] == __dw_ab && __dw_aw[var0.indices3[var9]] == __dw_ab) { - if(var0.__e == null) { - var0.__e = new byte[var0.faceCount]; + if (var6 >= 3 && var5) { + for (var9 = 0; var9 < var0.faceCount; ++var9) { + if (field548[var0.indices1[var9]] == field550 && field548[var0.indices2[var9]] == field550 && field548[var0.indices3[var9]] == field550) { + if (var0.field551 == null) { + var0.field551 = new byte[var0.faceCount]; } - var0.__e[var9] = 2; + var0.field551[var9] = 2; } } - for(var9 = 0; var9 < var1.faceCount; ++var9) { - if(__dw_ab == __dw_al[var1.indices1[var9]] && __dw_ab == __dw_al[var1.indices2[var9]] && __dw_ab == __dw_al[var1.indices3[var9]]) { - if(var1.__e == null) { - var1.__e = new byte[var1.faceCount]; + for (var9 = 0; var9 < var1.faceCount; ++var9) { + if (field550 == field549[var1.indices1[var9]] && field550 == field549[var1.indices2[var9]] && field550 == field549[var1.indices3[var9]]) { + if (var1.field551 == null) { + var1.field551 = new byte[var1.faceCount]; } - var1.__e[var9] = 2; + var1.field551[var9] = 2; } } - } + } @ObfuscatedName("ag") static final int method2802(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; - if(var1 < 2) { + if (var1 < 2) { var1 = 2; - } else if(var1 > 126) { + } else if (var1 > 126) { var1 = 126; } @@ -1716,12 +1713,20 @@ public class ModelData extends Entity { @ObfuscatedName("aq") static final int method2803(int var0) { - if(var0 < 2) { + if (var0 < 2) { var0 = 2; - } else if(var0 > 126) { + } else if (var0 > 126) { var0 = 126; } return var0; } + + static { + field548 = new int[10000]; + field549 = new int[10000]; + field550 = 0; + ModelData_sine = Rasterizer3D.Rasterizer3D_sine; + ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; + } } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index e43304e3e5..d7f7c7f983 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -130,27 +130,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi @Export("oculusOrbFocalPointX") static int oculusOrbFocalPointX; - static { - MouseHandler_instance = new MouseHandler(); - MouseHandler_idleCycles = 0; - MouseHandler_currentButton0 = 0; - MouseHandler_x0 = -1; - MouseHandler_y0 = -1; - MouseHandler_millis0 = -1L; - MouseHandler_currentButton = 0; - MouseHandler_x = 0; - MouseHandler_y = 0; - MouseHandler_millis = 0L; - MouseHandler_lastButton0 = 0; - MouseHandler_lastPressedX0 = 0; - MouseHandler_lastPressedY0 = 0; - MouseHandler_lastPressedTimeMillis0 = 0L; - MouseHandler_lastButton = 0; - MouseHandler_lastPressedX = 0; - MouseHandler_lastPressedY = 0; - MouseHandler_lastPressedTimeMillis = 0L; - } - @ObfuscatedName("f") @ObfuscatedSignature( signature = "(Ljava/awt/event/MouseEvent;I)I", @@ -159,13 +138,13 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi @Export("getButton") final int getButton(MouseEvent var1) { int var2 = var1.getButton(); - return !var1.isAltDown() && var2 != 2?(!var1.isMetaDown() && var2 != 3?1:2):4; + return !var1.isAltDown() && var2 != 2 ? (!var1.isMetaDown() && var2 != 3 ? 1 : 2) : 4; } @Export("mouseMoved") @ObfuscatedName("mouseMoved") public final synchronized void mouseMoved(MouseEvent var1) { - if(MouseHandler_instance != null) { + if (MouseHandler_instance != null) { MouseHandler_idleCycles = 0; MouseHandler_x0 = var1.getX(); MouseHandler_y0 = var1.getY(); @@ -177,18 +156,18 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi @Export("mousePressed") @ObfuscatedName("mousePressed") public final synchronized void mousePressed(MouseEvent var1) { - if(MouseHandler_instance != null) { + if (MouseHandler_instance != null) { MouseHandler_idleCycles = 0; MouseHandler_lastPressedX0 = var1.getX(); MouseHandler_lastPressedY0 = var1.getY(); MouseHandler_lastPressedTimeMillis0 = class203.currentTimeMs(); MouseHandler_lastButton0 = this.getButton(var1); - if(MouseHandler_lastButton0 != 0) { + if (MouseHandler_lastButton0 != 0) { MouseHandler_currentButton0 = MouseHandler_lastButton0; } } - if(var1.isPopupTrigger()) { + if (var1.isPopupTrigger()) { var1.consume(); } @@ -197,12 +176,12 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi @Export("mouseReleased") @ObfuscatedName("mouseReleased") public final synchronized void mouseReleased(MouseEvent var1) { - if(MouseHandler_instance != null) { + if (MouseHandler_instance != null) { MouseHandler_idleCycles = 0; MouseHandler_currentButton0 = 0; } - if(var1.isPopupTrigger()) { + if (var1.isPopupTrigger()) { var1.consume(); } @@ -211,7 +190,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi @Export("mouseClicked") @ObfuscatedName("mouseClicked") public final void mouseClicked(MouseEvent var1) { - if(var1.isPopupTrigger()) { + if (var1.isPopupTrigger()) { var1.consume(); } @@ -220,7 +199,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi @Export("mouseExited") @ObfuscatedName("mouseExited") public final synchronized void mouseExited(MouseEvent var1) { - if(MouseHandler_instance != null) { + if (MouseHandler_instance != null) { MouseHandler_idleCycles = 0; MouseHandler_x0 = -1; MouseHandler_y0 = -1; @@ -243,7 +222,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi @Export("focusLost") @ObfuscatedName("focusLost") public final synchronized void focusLost(FocusEvent var1) { - if(MouseHandler_instance != null) { + if (MouseHandler_instance != null) { MouseHandler_currentButton0 = 0; } @@ -283,11 +262,32 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi Login.Login_response2 = "Enter your username/email & password."; Login.Login_response3 = ""; Login.loginIndex = 2; - if(var0) { + if (var0) { Login.Login_password = ""; } Messages.method2200(); class196.method3740(); } + + static { + MouseHandler_instance = new MouseHandler(); + MouseHandler_idleCycles = 0; + MouseHandler_currentButton0 = 0; + MouseHandler_x0 = -1; + MouseHandler_y0 = -1; + MouseHandler_millis0 = -1L; + MouseHandler_currentButton = 0; + MouseHandler_x = 0; + MouseHandler_y = 0; + MouseHandler_millis = 0L; + MouseHandler_lastButton0 = 0; + MouseHandler_lastPressedX0 = 0; + MouseHandler_lastPressedY0 = 0; + MouseHandler_lastPressedTimeMillis0 = 0L; + MouseHandler_lastButton = 0; + MouseHandler_lastPressedX = 0; + MouseHandler_lastPressedY = 0; + MouseHandler_lastPressedTimeMillis = 0L; + } } diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index 22f81c03b4..01c8725cbb 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -17,7 +17,7 @@ public class MouseRecorder implements Runnable { @ObfuscatedGetter( intValue = 1075569245 ) - static int __bu_hy; + static int field566; @ObfuscatedName("m") @Export("isRunning") boolean isRunning; @@ -52,10 +52,10 @@ public class MouseRecorder implements Runnable { @Export("run") @ObfuscatedName("run") public void run() { - for(; this.isRunning; class203.method4010(50L)) { + for (; this.isRunning; class203.method4010(50L)) { Object var1 = this.lock; synchronized(this.lock) { - if(this.index < 500) { + if (this.index < 500) { this.xs[this.index] = MouseHandler.MouseHandler_x; this.ys[this.index] = MouseHandler.MouseHandler_y; this.millis[this.index] = MouseHandler.MouseHandler_millis; @@ -73,154 +73,157 @@ public class MouseRecorder implements Runnable { ) @Export("drawObject") static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = class65.scene.__ar_244(var0, var1, var2); + long var5 = class65.scene.method290(var0, var1, var2); int var7; int var8; int var9; int var10; - int var14; - int var26; - if(var5 != 0L) { + int var11; + int var12; + int var17; + if (var5 != 0L) { var7 = class65.scene.getObjectFlags(var0, var1, var2, var5); var8 = var7 >> 6 & 3; var9 = var7 & 31; var10 = var3; - boolean var12 = var5 != 0L; - if(var12) { - boolean var13 = (int)(var5 >>> 16 & 1L) == 1; - var12 = !var13; + boolean var13 = var5 != 0L; + if (var13) { + boolean var14 = (int)(var5 >>> 16 & 1L) == 1; + var13 = !var14; } - if(var12) { + if (var13) { var10 = var4; } - int[] var19 = WidgetGroupParent.sceneMinimapSprite.pixels; - var26 = var1 * 4 + (103 - var2) * 2048 + 24624; - var14 = HitSplatDefinition.method4972(var5); - ObjectDefinition var15 = class50.getObjectDefinition(var14); - if(var15.mapSceneId != -1) { + int[] var20 = WidgetGroupParent.sceneMinimapSprite.pixels; + var12 = var1 * 4 + (103 - var2) * 2048 + 24624; + var11 = HitSplatDefinition.method4972(var5); + ObjectDefinition var15 = class50.getObjectDefinition(var11); + if (var15.mapSceneId != -1) { IndexedSprite var16 = class192.mapSceneSprites[var15.mapSceneId]; - if(var16 != null) { - int var17 = (var15.sizeX * 4 - var16.subWidth) / 2; + if (var16 != null) { + var17 = (var15.sizeX * 4 - var16.subWidth) / 2; int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; var16.drawAt(var1 * 4 + var17 + 48, (104 - var2 - var15.sizeY) * 4 + var18 + 48); } } else { - if(var9 == 0 || var9 == 2) { - if(var8 == 0) { - var19[var26] = var10; - var19[var26 + 512] = var10; - var19[var26 + 1024] = var10; - var19[var26 + 1536] = var10; - } else if(var8 == 1) { - var19[var26] = var10; - var19[var26 + 1] = var10; - var19[var26 + 2] = var10; - var19[var26 + 3] = var10; - } else if(var8 == 2) { - var19[var26 + 3] = var10; - var19[var26 + 512 + 3] = var10; - var19[var26 + 1024 + 3] = var10; - var19[var26 + 1536 + 3] = var10; - } else if(var8 == 3) { - var19[var26 + 1536] = var10; - var19[var26 + 1536 + 1] = var10; - var19[var26 + 1536 + 2] = var10; - var19[var26 + 1536 + 3] = var10; + if (var9 == 0 || var9 == 2) { + if (var8 == 0) { + var20[var12] = var10; + var20[var12 + 512] = var10; + var20[var12 + 1024] = var10; + var20[var12 + 1536] = var10; + } else if (var8 == 1) { + var20[var12] = var10; + var20[var12 + 1] = var10; + var20[var12 + 2] = var10; + var20[var12 + 3] = var10; + } else if (var8 == 2) { + var20[var12 + 3] = var10; + var20[var12 + 512 + 3] = var10; + var20[var12 + 1024 + 3] = var10; + var20[var12 + 1536 + 3] = var10; + } else if (var8 == 3) { + var20[var12 + 1536] = var10; + var20[var12 + 1536 + 1] = var10; + var20[var12 + 1536 + 2] = var10; + var20[var12 + 1536 + 3] = var10; } } - if(var9 == 3) { - if(var8 == 0) { - var19[var26] = var10; - } else if(var8 == 1) { - var19[var26 + 3] = var10; - } else if(var8 == 2) { - var19[var26 + 1536 + 3] = var10; - } else if(var8 == 3) { - var19[var26 + 1536] = var10; + if (var9 == 3) { + if (var8 == 0) { + var20[var12] = var10; + } else if (var8 == 1) { + var20[var12 + 3] = var10; + } else if (var8 == 2) { + var20[var12 + 1536 + 3] = var10; + } else if (var8 == 3) { + var20[var12 + 1536] = var10; } } - if(var9 == 2) { - if(var8 == 3) { - var19[var26] = var10; - var19[var26 + 512] = var10; - var19[var26 + 1024] = var10; - var19[var26 + 1536] = var10; - } else if(var8 == 0) { - var19[var26] = var10; - var19[var26 + 1] = var10; - var19[var26 + 2] = var10; - var19[var26 + 3] = var10; - } else if(var8 == 1) { - var19[var26 + 3] = var10; - var19[var26 + 512 + 3] = var10; - var19[var26 + 1024 + 3] = var10; - var19[var26 + 1536 + 3] = var10; - } else if(var8 == 2) { - var19[var26 + 1536] = var10; - var19[var26 + 1536 + 1] = var10; - var19[var26 + 1536 + 2] = var10; - var19[var26 + 1536 + 3] = var10; + if (var9 == 2) { + if (var8 == 3) { + var20[var12] = var10; + var20[var12 + 512] = var10; + var20[var12 + 1024] = var10; + var20[var12 + 1536] = var10; + } else if (var8 == 0) { + var20[var12] = var10; + var20[var12 + 1] = var10; + var20[var12 + 2] = var10; + var20[var12 + 3] = var10; + } else if (var8 == 1) { + var20[var12 + 3] = var10; + var20[var12 + 512 + 3] = var10; + var20[var12 + 1024 + 3] = var10; + var20[var12 + 1536 + 3] = var10; + } else if (var8 == 2) { + var20[var12 + 1536] = var10; + var20[var12 + 1536 + 1] = var10; + var20[var12 + 1536 + 2] = var10; + var20[var12 + 1536 + 3] = var10; } } } } - var5 = class65.scene.__ay_246(var0, var1, var2); - if(0L != var5) { + var5 = class65.scene.method292(var0, var1, var2); + ObjectDefinition var19; + IndexedSprite var21; + if (0L != var5) { var7 = class65.scene.getObjectFlags(var0, var1, var2, var5); var8 = var7 >> 6 & 3; var9 = var7 & 31; var10 = HitSplatDefinition.method4972(var5); - ObjectDefinition var20 = class50.getObjectDefinition(var10); - if(var20.mapSceneId != -1) { - IndexedSprite var28 = class192.mapSceneSprites[var20.mapSceneId]; - if(var28 != null) { - var26 = (var20.sizeX * 4 - var28.subWidth) / 2; - var14 = (var20.sizeY * 4 - var28.subHeight) / 2; - var28.drawAt(var26 + var1 * 4 + 48, (104 - var2 - var20.sizeY) * 4 + var14 + 48); + var19 = class50.getObjectDefinition(var10); + if (var19.mapSceneId != -1) { + var21 = class192.mapSceneSprites[var19.mapSceneId]; + if (var21 != null) { + var12 = (var19.sizeX * 4 - var21.subWidth) / 2; + var11 = (var19.sizeY * 4 - var21.subHeight) / 2; + var21.drawAt(var12 + var1 * 4 + 48, (104 - var2 - var19.sizeY) * 4 + var11 + 48); } - } else if(var9 == 9) { - int var25 = 15658734; - boolean var27 = 0L != var5; - if(var27) { - boolean var23 = (int)(var5 >>> 16 & 1L) == 1; - var27 = !var23; + } else if (var9 == 9) { + int var22 = 15658734; + boolean var23 = 0L != var5; + if (var23) { + boolean var24 = (int)(var5 >>> 16 & 1L) == 1; + var23 = !var24; } - if(var27) { - var25 = 15597568; + if (var23) { + var22 = 15597568; } - int[] var24 = WidgetGroupParent.sceneMinimapSprite.pixels; - int var29 = var1 * 4 + (103 - var2) * 2048 + 24624; - if(var8 != 0 && var8 != 2) { - var24[var29] = var25; - var24[var29 + 1 + 512] = var25; - var24[var29 + 1024 + 2] = var25; - var24[var29 + 1536 + 3] = var25; + int[] var26 = WidgetGroupParent.sceneMinimapSprite.pixels; + var17 = var1 * 4 + (103 - var2) * 2048 + 24624; + if (var8 != 0 && var8 != 2) { + var26[var17] = var22; + var26[var17 + 1 + 512] = var22; + var26[var17 + 1024 + 2] = var22; + var26[var17 + 1536 + 3] = var22; } else { - var24[var29 + 1536] = var25; - var24[var29 + 1 + 1024] = var25; - var24[var29 + 512 + 2] = var25; - var24[var29 + 3] = var25; + var26[var17 + 1536] = var22; + var26[var17 + 1 + 1024] = var22; + var26[var17 + 512 + 2] = var22; + var26[var17 + 3] = var22; } } } var5 = class65.scene.getFloorDecorationTag(var0, var1, var2); - if(var5 != 0L) { + if (var5 != 0L) { var7 = HitSplatDefinition.method4972(var5); - ObjectDefinition var21 = class50.getObjectDefinition(var7); - if(var21.mapSceneId != -1) { - IndexedSprite var22 = class192.mapSceneSprites[var21.mapSceneId]; - if(var22 != null) { - var10 = (var21.sizeX * 4 - var22.subWidth) / 2; - int var11 = (var21.sizeY * 4 - var22.subHeight) / 2; - var22.drawAt(var10 + var1 * 4 + 48, var11 + (104 - var2 - var21.sizeY) * 4 + 48); + var19 = class50.getObjectDefinition(var7); + if (var19.mapSceneId != -1) { + var21 = class192.mapSceneSprites[var19.mapSceneId]; + if (var21 != null) { + var10 = (var19.sizeX * 4 - var21.subWidth) / 2; + int var25 = (var19.sizeY * 4 - var21.subHeight) / 2; + var21.drawAt(var10 + var1 * 4 + 48, var25 + (104 - var2 - var19.sizeY) * 4 + 48); } } } @@ -233,24 +236,24 @@ public class MouseRecorder implements Runnable { garbageValue = "17" ) static String method1194(String var0, Widget var1) { - if(var0.indexOf("%") != -1) { - for(int var2 = 1; var2 <= 5; ++var2) { - while(true) { + if (var0.indexOf("%") != -1) { + for (int var2 = 1; var2 <= 5; ++var2) { + while (true) { int var3 = var0.indexOf("%" + var2); - if(var3 == -1) { + if (var3 == -1) { break; } String var4 = var0.substring(0, var3); - int var6 = class16.method187(var1, var2 - 1); - String var5; - if(var6 < 999999999) { - var5 = Integer.toString(var6); + int var5 = class16.method187(var1, var2 - 1); + String var6; + if (var5 < 999999999) { + var6 = Integer.toString(var5); } else { - var5 = "*"; + var6 = "*"; } - var0 = var4 + var5 + var0.substring(var3 + 2); + var0 = var4 + var6 + var0.substring(var3 + 2); } } } @@ -266,117 +269,126 @@ public class MouseRecorder implements Runnable { static final void method1189(Widget var0, int var1, int var2, int var3) { class13.playPcmPlayers(); SpriteMask var4 = var0.getSpriteMask(false); - if(var4 != null) { + if (var4 != null) { Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); - if(Client.minimapState != 2 && Client.minimapState != 5) { + if (Client.minimapState != 2 && Client.minimapState != 5) { int var5 = Client.minimapOrientation & 2047; int var6 = Canvas.localPlayer.x / 32 + 48; int var7 = 464 - Canvas.localPlayer.y / 32; - WidgetGroupParent.sceneMinimapSprite.__ay_513(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); + WidgetGroupParent.sceneMinimapSprite.method315(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); int var8; int var9; int var10; - for(var8 = 0; var8 < Client.mapIconCount; ++var8) { + for (var8 = 0; var8 < Client.mapIconCount; ++var8) { var9 = Client.mapIconXs[var8] * 4 + 2 - Canvas.localPlayer.x / 32; var10 = Client.mapIconYs[var8] * 4 + 2 - Canvas.localPlayer.y / 32; NetFileRequest.method4554(var1, var2, var9, var10, Client.mapIcons[var8], var4); } - int var11; - int var12; - for(var8 = 0; var8 < 104; ++var8) { - for(var9 = 0; var9 < 104; ++var9) { - NodeDeque var15 = Client.groundItems[SoundSystem.plane][var8][var9]; - if(var15 != null) { + var8 = 0; + + while (true) { + int var11; + int var12; + if (var8 >= 104) { + for (var8 = 0; var8 < Client.npcCount; ++var8) { + NPC var17 = Client.npcs[Client.npcIndices[var8]]; + if (var17 != null && var17.isVisible()) { + NPCDefinition var14 = var17.definition; + if (var14 != null && var14.transforms != null) { + var14 = var14.transform(); + } + + if (var14 != null && var14.drawMapDot && var14.isInteractable) { + var11 = var17.x / 32 - Canvas.localPlayer.x / 32; + var12 = var17.y / 32 - Canvas.localPlayer.y / 32; + NetFileRequest.method4554(var1, var2, var11, var12, class39.mapDotSprites[1], var4); + } + } + } + + var8 = Players.Players_count; + int[] var18 = Players.Players_indices; + + Player var19; + for (var10 = 0; var10 < var8; ++var10) { + var19 = Client.players[var18[var10]]; + if (var19 != null && var19.isVisible() && !var19.isHidden && var19 != Canvas.localPlayer) { + var12 = var19.x / 32 - Canvas.localPlayer.x / 32; + int var15 = var19.y / 32 - Canvas.localPlayer.y / 32; + boolean var16 = false; + if (Canvas.localPlayer.team != 0 && var19.team != 0 && var19.team == Canvas.localPlayer.team) { + var16 = true; + } + + if (var19.isFriend()) { + NetFileRequest.method4554(var1, var2, var12, var15, class39.mapDotSprites[3], var4); + } else if (var16) { + NetFileRequest.method4554(var1, var2, var12, var15, class39.mapDotSprites[4], var4); + } else if (var19.isClanMember()) { + NetFileRequest.method4554(var1, var2, var12, var15, class39.mapDotSprites[5], var4); + } else { + NetFileRequest.method4554(var1, var2, var12, var15, class39.mapDotSprites[2], var4); + } + } + } + + if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { + if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { + NPC var20 = Client.npcs[Client.hintArrowNpcIndex]; + if (var20 != null) { + var11 = var20.x / 32 - Canvas.localPlayer.x / 32; + var12 = var20.y / 32 - Canvas.localPlayer.y / 32; + UserComparator5.worldToMinimap(var1, var2, var11, var12, class16.mapMarkerSprites[1], var4); + } + } + + if (Client.hintArrowType == 2) { + var10 = Client.hintArrowX * 4 - class50.baseX * 4 + 2 - Canvas.localPlayer.x / 32; + var11 = Client.hintArrowY * 4 - GraphicsObject.baseY * 4 + 2 - Canvas.localPlayer.y / 32; + UserComparator5.worldToMinimap(var1, var2, var10, var11, class16.mapMarkerSprites[1], var4); + } + + if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { + var19 = Client.players[Client.hintArrowPlayerIndex]; + if (var19 != null) { + var11 = var19.x / 32 - Canvas.localPlayer.x / 32; + var12 = var19.y / 32 - Canvas.localPlayer.y / 32; + UserComparator5.worldToMinimap(var1, var2, var11, var12, class16.mapMarkerSprites[1], var4); + } + } + } + + if (Client.destinationX != 0) { + var10 = Client.destinationX * 4 + 2 - Canvas.localPlayer.x / 32; + var11 = Client.destinationY * 4 + 2 - Canvas.localPlayer.y / 32; + NetFileRequest.method4554(var1, var2, var10, var11, class16.mapMarkerSprites[0], var4); + } + + if (!Canvas.localPlayer.isHidden) { + Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); + } + break; + } + + for (var9 = 0; var9 < 104; ++var9) { + NodeDeque var13 = Client.groundItems[SoundSystem.plane][var8][var9]; + if (var13 != null) { var11 = var8 * 4 + 2 - Canvas.localPlayer.x / 32; var12 = var9 * 4 + 2 - Canvas.localPlayer.y / 32; NetFileRequest.method4554(var1, var2, var11, var12, class39.mapDotSprites[0], var4); } } - } - for(var8 = 0; var8 < Client.npcCount; ++var8) { - Npc var16 = Client.npcs[Client.npcIndices[var8]]; - if(var16 != null && var16.isVisible()) { - NpcDefinition var18 = var16.definition; - if(var18 != null && var18.transforms != null) { - var18 = var18.transform(); - } - - if(var18 != null && var18.drawMapDot && var18.isInteractable) { - var11 = var16.x / 32 - Canvas.localPlayer.x / 32; - var12 = var16.y / 32 - Canvas.localPlayer.y / 32; - NetFileRequest.method4554(var1, var2, var11, var12, class39.mapDotSprites[1], var4); - } - } - } - - var8 = Players.Players_count; - int[] var19 = Players.Players_indices; - - for(var10 = 0; var10 < var8; ++var10) { - Player var17 = Client.players[var19[var10]]; - if(var17 != null && var17.isVisible() && !var17.isHidden && var17 != Canvas.localPlayer) { - var12 = var17.x / 32 - Canvas.localPlayer.x / 32; - int var13 = var17.y / 32 - Canvas.localPlayer.y / 32; - boolean var14 = false; - if(Canvas.localPlayer.team != 0 && var17.team != 0 && var17.team == Canvas.localPlayer.team) { - var14 = true; - } - - if(var17.isFriend()) { - NetFileRequest.method4554(var1, var2, var12, var13, class39.mapDotSprites[3], var4); - } else if(var14) { - NetFileRequest.method4554(var1, var2, var12, var13, class39.mapDotSprites[4], var4); - } else if(var17.isClanMember()) { - NetFileRequest.method4554(var1, var2, var12, var13, class39.mapDotSprites[5], var4); - } else { - NetFileRequest.method4554(var1, var2, var12, var13, class39.mapDotSprites[2], var4); - } - } - } - - if(Client.hintArrowType != 0 && Client.cycle % 20 < 10) { - if(Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { - Npc var20 = Client.npcs[Client.hintArrowNpcIndex]; - if(var20 != null) { - var11 = var20.x / 32 - Canvas.localPlayer.x / 32; - var12 = var20.y / 32 - Canvas.localPlayer.y / 32; - UserComparator5.worldToMinimap(var1, var2, var11, var12, class16.mapMarkerSprites[1], var4); - } - } - - if(Client.hintArrowType == 2) { - var10 = Client.hintArrowX * 4 - class50.baseX * 4 + 2 - Canvas.localPlayer.x / 32; - var11 = Client.hintArrowY * 4 - GraphicsObject.baseY * 4 + 2 - Canvas.localPlayer.y / 32; - UserComparator5.worldToMinimap(var1, var2, var10, var11, class16.mapMarkerSprites[1], var4); - } - - if(Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { - Player var21 = Client.players[Client.hintArrowPlayerIndex]; - if(var21 != null) { - var11 = var21.x / 32 - Canvas.localPlayer.x / 32; - var12 = var21.y / 32 - Canvas.localPlayer.y / 32; - UserComparator5.worldToMinimap(var1, var2, var11, var12, class16.mapMarkerSprites[1], var4); - } - } - } - - if(Client.destinationX != 0) { - var10 = Client.destinationX * 4 + 2 - Canvas.localPlayer.x / 32; - var11 = Client.destinationY * 4 + 2 - Canvas.localPlayer.y / 32; - NetFileRequest.method4554(var1, var2, var10, var11, class16.mapMarkerSprites[0], var4); - } - - if(!Canvas.localPlayer.isHidden) { - Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); + ++var8; } } else { Rasterizer2D.method5948(var1, var2, 0, var4.xStarts, var4.xWidths); } - Client.__client_ot[var3] = true; + Client.field102[var3] = true; } + } } diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java index a51914bfd3..4ebabaf7ee 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -11,7 +11,7 @@ public class MusicPatch extends Node { @ObfuscatedGetter( intValue = 574200865 ) - int __m; + int field567; @ObfuscatedName("f") @ObfuscatedSignature( signature = "[Lcx;" @@ -19,40 +19,39 @@ public class MusicPatch extends Node { @Export("rawSounds") RawSound[] rawSounds; @ObfuscatedName("q") - short[] __q; + short[] field568; @ObfuscatedName("w") - byte[] __w; + byte[] field569; @ObfuscatedName("o") - byte[] __o; + byte[] field570; @ObfuscatedName("u") @ObfuscatedSignature( signature = "[Lhd;" ) - MusicPatchNode2[] __u; + MusicPatchNode2[] field571; @ObfuscatedName("g") - byte[] __g; + byte[] field572; @ObfuscatedName("l") - int[] __l; + int[] field573; MusicPatch(byte[] var1) { this.rawSounds = new RawSound[128]; - this.__q = new short[128]; - this.__w = new byte[128]; - this.__o = new byte[128]; - this.__u = new MusicPatchNode2[128]; - this.__g = new byte[128]; - this.__l = new int[128]; + this.field568 = new short[128]; + this.field569 = new byte[128]; + this.field570 = new byte[128]; + this.field571 = new MusicPatchNode2[128]; + this.field572 = new byte[128]; + this.field573 = new int[128]; Buffer var2 = new Buffer(var1); int var3; - for(var3 = 0; var2.array[var3 + var2.index] != 0; ++var3) { - ; + for (var3 = 0; var2.array[var3 + var2.index] != 0; ++var3) { } byte[] var4 = new byte[var3]; int var5; - for(var5 = 0; var5 < var3; ++var5) { + for (var5 = 0; var5 < var3; ++var5) { var4[var5] = var2.readByte(); } @@ -62,14 +61,13 @@ public class MusicPatch extends Node { var2.index += var3; int var6; - for(var6 = 0; var2.array[var6 + var2.index] != 0; ++var6) { - ; + for (var6 = 0; var2.array[var6 + var2.index] != 0; ++var6) { } byte[] var7 = new byte[var6]; int var8; - for(var8 = 0; var8 < var6; ++var8) { + for (var8 = 0; var8 < var6; ++var8) { var7[var8] = var2.readByte(); } @@ -79,407 +77,405 @@ public class MusicPatch extends Node { var2.index += var6; int var9; - for(var9 = 0; var2.array[var9 + var2.index] != 0; ++var9) { - ; + for (var9 = 0; var2.array[var9 + var2.index] != 0; ++var9) { } byte[] var10 = new byte[var9]; - for(int var11 = 0; var11 < var9; ++var11) { + for (int var11 = 0; var11 < var9; ++var11) { var10[var11] = var2.readByte(); } ++var2.index; ++var9; - byte[] var38 = new byte[var9]; + byte[] var42 = new byte[var9]; int var12; - int var14; - if(var9 > 1) { - var38[1] = 1; - int var13 = 1; + int var13; + if (var9 > 1) { + var42[1] = 1; + int var14 = 1; var12 = 2; - for(var14 = 2; var14 < var9; ++var14) { + for (var13 = 2; var13 < var9; ++var13) { int var15 = var2.readUnsignedByte(); - if(var15 == 0) { - var13 = var12++; + if (var15 == 0) { + var14 = var12++; } else { - if(var15 <= var13) { + if (var15 <= var14) { --var15; } - var13 = var15; + var14 = var15; } - var38[var14] = (byte)var13; + var42[var13] = (byte)var14; } } else { var12 = var9; } - MusicPatchNode2[] var39 = new MusicPatchNode2[var12]; + MusicPatchNode2[] var43 = new MusicPatchNode2[var12]; - MusicPatchNode2 var40; - for(var14 = 0; var14 < var39.length; ++var14) { - var40 = var39[var14] = new MusicPatchNode2(); + MusicPatchNode2 var44; + for (var13 = 0; var13 < var43.length; ++var13) { + var44 = var43[var13] = new MusicPatchNode2(); int var16 = var2.readUnsignedByte(); - if(var16 > 0) { - var40.__m = new byte[var16 * 2]; + if (var16 > 0) { + var44.field593 = new byte[var16 * 2]; } var16 = var2.readUnsignedByte(); - if(var16 > 0) { - var40.__f = new byte[var16 * 2 + 2]; - var40.__f[1] = 64; + if (var16 > 0) { + var44.field594 = new byte[var16 * 2 + 2]; + var44.field594[1] = 64; } } - var14 = var2.readUnsignedByte(); - byte[] var47 = var14 > 0?new byte[var14 * 2]:null; - var14 = var2.readUnsignedByte(); - byte[] var41 = var14 > 0?new byte[var14 * 2]:null; + var13 = var2.readUnsignedByte(); + byte[] var45 = var13 > 0 ? new byte[var13 * 2] : null; + var13 = var2.readUnsignedByte(); + byte[] var17 = var13 > 0 ? new byte[var13 * 2] : null; - int var17; - for(var17 = 0; var2.array[var17 + var2.index] != 0; ++var17) { - ; + int var18; + for (var18 = 0; var2.array[var18 + var2.index] != 0; ++var18) { } - byte[] var18 = new byte[var17]; + byte[] var19 = new byte[var18]; - int var19; - for(var19 = 0; var19 < var17; ++var19) { - var18[var19] = var2.readByte(); + int var20; + for (var20 = 0; var20 < var18; ++var20) { + var19[var20] = var2.readByte(); } ++var2.index; - ++var17; - var19 = 0; + ++var18; + var20 = 0; - int var20; - for(var20 = 0; var20 < 128; ++var20) { - var19 += var2.readUnsignedByte(); - this.__q[var20] = (short)var19; - } - - var19 = 0; - - for(var20 = 0; var20 < 128; ++var20) { - var19 += var2.readUnsignedByte(); - this.__q[var20] = (short)(this.__q[var20] + (var19 << 8)); + int var21; + for (var21 = 0; var21 < 128; ++var21) { + var20 += var2.readUnsignedByte(); + this.field568[var21] = (short)var20; } var20 = 0; - int var21 = 0; - int var22 = 0; - int var23; - for(var23 = 0; var23 < 128; ++var23) { - if(var20 == 0) { - if(var21 < var18.length) { - var20 = var18[var21++]; - } else { - var20 = -1; - } - - var22 = var2.__as_311(); - } - - this.__q[var23] = (short)(this.__q[var23] + ((var22 - 1 & 2) << 14)); - this.__l[var23] = var22; - --var20; + for (var21 = 0; var21 < 128; ++var21) { + var20 += var2.readUnsignedByte(); + this.field568[var21] = (short)(this.field568[var21] + (var20 << 8)); } - var20 = 0; var21 = 0; - var23 = 0; + int var22 = 0; + int var23 = 0; int var24; - for(var24 = 0; var24 < 128; ++var24) { - if(this.__l[var24] != 0) { - if(var20 == 0) { - if(var21 < var4.length) { - var20 = var4[var21++]; - } else { - var20 = -1; - } - - var23 = var2.array[var5++] - 1; + for (var24 = 0; var24 < 128; ++var24) { + if (var21 == 0) { + if (var22 < var19.length) { + var21 = var19[var22++]; + } else { + var21 = -1; } - this.__g[var24] = (byte)var23; - --var20; + var23 = var2.method52(); } + + this.field568[var24] = (short)(this.field568[var24] + ((var23 - 1 & 2) << 14)); + this.field573[var24] = var23; + --var21; } - var20 = 0; var21 = 0; + var22 = 0; var24 = 0; - for(int var25 = 0; var25 < 128; ++var25) { - if(this.__l[var25] != 0) { - if(var20 == 0) { - if(var21 < var7.length) { - var20 = var7[var21++]; + int var25; + for (var25 = 0; var25 < 128; ++var25) { + if (this.field573[var25] != 0) { + if (var21 == 0) { + if (var22 < var4.length) { + var21 = var4[var22++]; } else { - var20 = -1; + var21 = -1; } - var24 = var2.array[var8++] + 16 << 2; + var24 = var2.array[var5++] - 1; } - this.__o[var25] = (byte)var24; - --var20; + this.field572[var25] = (byte)var24; + --var21; } } - var20 = 0; var21 = 0; - MusicPatchNode2 var42 = null; + var22 = 0; + var25 = 0; - int var26; - for(var26 = 0; var26 < 128; ++var26) { - if(this.__l[var26] != 0) { - if(var20 == 0) { - var42 = var39[var38[var21]]; - if(var21 < var10.length) { - var20 = var10[var21++]; + for (int var26 = 0; var26 < 128; ++var26) { + if (this.field573[var26] != 0) { + if (var21 == 0) { + if (var22 < var7.length) { + var21 = var7[var22++]; } else { - var20 = -1; + var21 = -1; } + + var25 = var2.array[var8++] + 16 << 2; } - this.__u[var26] = var42; - --var20; + this.field570[var26] = (byte)var25; + --var21; } } - var20 = 0; var21 = 0; - var26 = 0; + var22 = 0; + MusicPatchNode2 var46 = null; int var27; - for(var27 = 0; var27 < 128; ++var27) { - if(var20 == 0) { - if(var21 < var18.length) { - var20 = var18[var21++]; + for (var27 = 0; var27 < 128; ++var27) { + if (this.field573[var27] != 0) { + if (var21 == 0) { + var46 = var43[var42[var22]]; + if (var22 < var10.length) { + var21 = var10[var22++]; + } else { + var21 = -1; + } + } + + this.field571[var27] = var46; + --var21; + } + } + + var21 = 0; + var22 = 0; + var27 = 0; + + int var28; + for (var28 = 0; var28 < 128; ++var28) { + if (var21 == 0) { + if (var22 < var19.length) { + var21 = var19[var22++]; } else { - var20 = -1; + var21 = -1; } - if(this.__l[var27] > 0) { - var26 = var2.readUnsignedByte() + 1; + if (this.field573[var28] > 0) { + var27 = var2.readUnsignedByte() + 1; } } - this.__w[var27] = (byte)var26; - --var20; + this.field569[var28] = (byte)var27; + --var21; } - this.__m = var2.readUnsignedByte() + 1; + this.field567 = var2.readUnsignedByte() + 1; - MusicPatchNode2 var28; - int var29; - for(var27 = 0; var27 < var12; ++var27) { - var28 = var39[var27]; - if(var28.__m != null) { - for(var29 = 1; var29 < var28.__m.length; var29 += 2) { - var28.__m[var29] = var2.readByte(); + MusicPatchNode2 var29; + int var30; + for (var28 = 0; var28 < var12; ++var28) { + var29 = var43[var28]; + if (var29.field593 != null) { + for (var30 = 1; var30 < var29.field593.length; var30 += 2) { + var29.field593[var30] = var2.readByte(); } } - if(var28.__f != null) { - for(var29 = 3; var29 < var28.__f.length - 2; var29 += 2) { - var28.__f[var29] = var2.readByte(); + if (var29.field594 != null) { + for (var30 = 3; var30 < var29.field594.length - 2; var30 += 2) { + var29.field594[var30] = var2.readByte(); } } } - if(var47 != null) { - for(var27 = 1; var27 < var47.length; var27 += 2) { - var47[var27] = var2.readByte(); + if (var45 != null) { + for (var28 = 1; var28 < var45.length; var28 += 2) { + var45[var28] = var2.readByte(); } } - if(var41 != null) { - for(var27 = 1; var27 < var41.length; var27 += 2) { - var41[var27] = var2.readByte(); + if (var17 != null) { + for (var28 = 1; var28 < var17.length; var28 += 2) { + var17[var28] = var2.readByte(); } } - for(var27 = 0; var27 < var12; ++var27) { - var28 = var39[var27]; - if(var28.__f != null) { - var19 = 0; + for (var28 = 0; var28 < var12; ++var28) { + var29 = var43[var28]; + if (var29.field594 != null) { + var20 = 0; - for(var29 = 2; var29 < var28.__f.length; var29 += 2) { - var19 = 1 + var19 + var2.readUnsignedByte(); - var28.__f[var29] = (byte)var19; + for (var30 = 2; var30 < var29.field594.length; var30 += 2) { + var20 = 1 + var20 + var2.readUnsignedByte(); + var29.field594[var30] = (byte)var20; } } } - for(var27 = 0; var27 < var12; ++var27) { - var28 = var39[var27]; - if(var28.__m != null) { - var19 = 0; + for (var28 = 0; var28 < var12; ++var28) { + var29 = var43[var28]; + if (var29.field593 != null) { + var20 = 0; - for(var29 = 2; var29 < var28.__m.length; var29 += 2) { - var19 = 1 + var19 + var2.readUnsignedByte(); - var28.__m[var29] = (byte)var19; + for (var30 = 2; var30 < var29.field593.length; var30 += 2) { + var20 = 1 + var20 + var2.readUnsignedByte(); + var29.field593[var30] = (byte)var20; } } } - byte var30; + byte var31; int var32; int var33; int var34; int var35; int var36; - int var44; - byte var46; - if(var47 != null) { - var19 = var2.readUnsignedByte(); - var47[0] = (byte)var19; + int var37; + byte var38; + if (var45 != null) { + var20 = var2.readUnsignedByte(); + var45[0] = (byte)var20; - for(var27 = 2; var27 < var47.length; var27 += 2) { - var19 = 1 + var19 + var2.readUnsignedByte(); - var47[var27] = (byte)var19; + for (var28 = 2; var28 < var45.length; var28 += 2) { + var20 = 1 + var20 + var2.readUnsignedByte(); + var45[var28] = (byte)var20; } - var46 = var47[0]; - byte var43 = var47[1]; + var38 = var45[0]; + byte var39 = var45[1]; - for(var29 = 0; var29 < var46; ++var29) { - this.__w[var29] = (byte)(var43 * this.__w[var29] + 32 >> 6); + for (var30 = 0; var30 < var38; ++var30) { + this.field569[var30] = (byte)(var39 * this.field569[var30] + 32 >> 6); } - for(var29 = 2; var29 < var47.length; var29 += 2) { - var30 = var47[var29]; - byte var31 = var47[var29 + 1]; - var32 = var43 * (var30 - var46) + (var30 - var46) / 2; + for (var30 = 2; var30 < var45.length; var30 += 2) { + var31 = var45[var30]; + byte var40 = var45[var30 + 1]; + var32 = var39 * (var31 - var38) + (var31 - var38) / 2; - for(var33 = var46; var33 < var30; ++var33) { - var35 = var30 - var46; + for (var33 = var38; var33 < var31; ++var33) { + var35 = var31 - var38; var36 = var32 >>> 31; var34 = (var32 + var36) / var35 - var36; - this.__w[var33] = (byte)(var34 * this.__w[var33] + 32 >> 6); - var32 += var31 - var43; + this.field569[var33] = (byte)(var34 * this.field569[var33] + 32 >> 6); + var32 += var40 - var39; } - var46 = var30; - var43 = var31; + var38 = var31; + var39 = var40; } - for(var44 = var46; var44 < 128; ++var44) { - this.__w[var44] = (byte)(var43 * this.__w[var44] + 32 >> 6); + for (var37 = var38; var37 < 128; ++var37) { + this.field569[var37] = (byte)(var39 * this.field569[var37] + 32 >> 6); } - var40 = null; + var44 = null; } - if(var41 != null) { - var19 = var2.readUnsignedByte(); - var41[0] = (byte)var19; + if (var17 != null) { + var20 = var2.readUnsignedByte(); + var17[0] = (byte)var20; - for(var27 = 2; var27 < var41.length; var27 += 2) { - var19 = 1 + var19 + var2.readUnsignedByte(); - var41[var27] = (byte)var19; + for (var28 = 2; var28 < var17.length; var28 += 2) { + var20 = 1 + var20 + var2.readUnsignedByte(); + var17[var28] = (byte)var20; } - var46 = var41[0]; - int var49 = var41[1] << 1; + var38 = var17[0]; + int var47 = var17[1] << 1; - for(var29 = 0; var29 < var46; ++var29) { - var44 = var49 + (this.__o[var29] & 255); - if(var44 < 0) { - var44 = 0; + for (var30 = 0; var30 < var38; ++var30) { + var37 = var47 + (this.field570[var30] & 255); + if (var37 < 0) { + var37 = 0; } - if(var44 > 128) { - var44 = 128; + if (var37 > 128) { + var37 = 128; } - this.__o[var29] = (byte)var44; + this.field570[var30] = (byte)var37; } - int var45; - for(var29 = 2; var29 < var41.length; var29 += 2) { - var30 = var41[var29]; - var45 = var41[var29 + 1] << 1; - var32 = var49 * (var30 - var46) + (var30 - var46) / 2; + int var48; + for (var30 = 2; var30 < var17.length; var30 += 2) { + var31 = var17[var30]; + var48 = var17[var30 + 1] << 1; + var32 = var47 * (var31 - var38) + (var31 - var38) / 2; - for(var33 = var46; var33 < var30; ++var33) { - var35 = var30 - var46; + for (var33 = var38; var33 < var31; ++var33) { + var35 = var31 - var38; var36 = var32 >>> 31; var34 = (var32 + var36) / var35 - var36; - int var37 = var34 + (this.__o[var33] & 255); - if(var37 < 0) { - var37 = 0; + int var41 = var34 + (this.field570[var33] & 255); + if (var41 < 0) { + var41 = 0; } - if(var37 > 128) { - var37 = 128; + if (var41 > 128) { + var41 = 128; } - this.__o[var33] = (byte)var37; - var32 += var45 - var49; + this.field570[var33] = (byte)var41; + var32 += var48 - var47; } - var46 = var30; - var49 = var45; + var38 = var31; + var47 = var48; } - for(var44 = var46; var44 < 128; ++var44) { - var45 = var49 + (this.__o[var44] & 255); - if(var45 < 0) { - var45 = 0; + for (var37 = var38; var37 < 128; ++var37) { + var48 = var47 + (this.field570[var37] & 255); + if (var48 < 0) { + var48 = 0; } - if(var45 > 128) { - var45 = 128; + if (var48 > 128) { + var48 = 128; } - this.__o[var44] = (byte)var45; + this.field570[var37] = (byte)var48; } - Object var48 = null; + Object var49 = null; } - for(var27 = 0; var27 < var12; ++var27) { - var39[var27].__q = var2.readUnsignedByte(); + for (var28 = 0; var28 < var12; ++var28) { + var43[var28].field595 = var2.readUnsignedByte(); } - for(var27 = 0; var27 < var12; ++var27) { - var28 = var39[var27]; - if(var28.__m != null) { - var28.__w = var2.readUnsignedByte(); + for (var28 = 0; var28 < var12; ++var28) { + var29 = var43[var28]; + if (var29.field593 != null) { + var29.field596 = var2.readUnsignedByte(); } - if(var28.__f != null) { - var28.__o = var2.readUnsignedByte(); + if (var29.field594 != null) { + var29.field597 = var2.readUnsignedByte(); } - if(var28.__q > 0) { - var28.__u = var2.readUnsignedByte(); + if (var29.field595 > 0) { + var29.field598 = var2.readUnsignedByte(); } } - for(var27 = 0; var27 < var12; ++var27) { - var39[var27].__l = var2.readUnsignedByte(); + for (var28 = 0; var28 < var12; ++var28) { + var43[var28].field600 = var2.readUnsignedByte(); } - for(var27 = 0; var27 < var12; ++var27) { - var28 = var39[var27]; - if(var28.__l > 0) { - var28.__g = var2.readUnsignedByte(); + for (var28 = 0; var28 < var12; ++var28) { + var29 = var43[var28]; + if (var29.field600 > 0) { + var29.field599 = var2.readUnsignedByte(); } } - for(var27 = 0; var27 < var12; ++var27) { - var28 = var39[var27]; - if(var28.__g > 0) { - var28.__e = var2.readUnsignedByte(); + for (var28 = 0; var28 < var12; ++var28) { + var29 = var43[var28]; + if (var29.field599 > 0) { + var29.field601 = var2.readUnsignedByte(); } } @@ -490,31 +486,31 @@ public class MusicPatch extends Node { signature = "(Ldt;[B[II)Z", garbageValue = "1828768318" ) - boolean __f_373(SoundCache var1, byte[] var2, int[] var3) { + boolean method218(SoundCache var1, byte[] var2, int[] var3) { boolean var4 = true; int var5 = 0; RawSound var6 = null; - for(int var7 = 0; var7 < 128; ++var7) { - if(var2 == null || var2[var7] != 0) { - int var8 = this.__l[var7]; - if(var8 != 0) { - if(var8 != var5) { + for (int var7 = 0; var7 < 128; ++var7) { + if (var2 == null || var2[var7] != 0) { + int var8 = this.field573[var7]; + if (var8 != 0) { + if (var8 != var5) { var5 = var8--; - if((var8 & 1) == 0) { + if ((var8 & 1) == 0) { var6 = var1.getSoundEffect(var8 >> 2, var3); } else { var6 = var1.getMusicSample(var8 >> 2, var3); } - if(var6 == null) { + if (var6 == null) { var4 = false; } } - if(var6 != null) { + if (var6 != null) { this.rawSounds[var7] = var6; - this.__l[var7] = 0; + this.field573[var7] = 0; } } } @@ -530,6 +526,6 @@ public class MusicPatch extends Node { ) @Export("clear") void clear() { - this.__l = null; + this.field573 = null; } } diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index 66f778d7ee..4615410c85 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -17,7 +17,7 @@ public class MusicPatchNode extends Node { @ObfuscatedGetter( intValue = 801157533 ) - int __m; + int field574; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lhl;" @@ -34,77 +34,77 @@ public class MusicPatchNode extends Node { @ObfuscatedSignature( signature = "Lhd;" ) - MusicPatchNode2 __w; + MusicPatchNode2 field575; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -2058553171 ) - int __o; + int field576; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 62958303 ) - int __u; + int field577; @ObfuscatedName("g") @ObfuscatedGetter( intValue = -836502917 ) - int __g; + int field578; @ObfuscatedName("l") @ObfuscatedGetter( intValue = -308599455 ) - int __l; + int field579; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -471899285 ) - int __e; + int field580; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -1520706641 ) - int __x; + int field581; @ObfuscatedName("d") @ObfuscatedGetter( intValue = -852988281 ) - int __d; + int field582; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -439388365 ) - int __k; + int field583; @ObfuscatedName("n") @ObfuscatedGetter( intValue = 476852577 ) - int __n; + int field584; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -2136855685 ) - int __i; + int field585; @ObfuscatedName("a") @ObfuscatedGetter( intValue = -2083252379 ) - int __a; + int field586; @ObfuscatedName("z") @ObfuscatedGetter( intValue = 1605236771 ) - int __z; + int field587; @ObfuscatedName("j") @ObfuscatedGetter( intValue = 173672931 ) - int __j; + int field588; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 219840779 ) - int __s; + int field589; @ObfuscatedName("t") @ObfuscatedSignature( signature = "Lds;" @@ -115,22 +115,22 @@ public class MusicPatchNode extends Node { @ObfuscatedGetter( intValue = -666877449 ) - int __y; + int field590; @ObfuscatedName("b") @ObfuscatedGetter( intValue = 1359854411 ) - int __b; + int field591; @ObfuscatedName("m") @ObfuscatedSignature( signature = "(B)V", garbageValue = "39" ) - void __m_370() { + void method219() { this.patch = null; this.rawSound = null; - this.__w = null; + this.field575 = null; this.stream = null; } } diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java index 71625b12cc..c6d425a0a6 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -10,44 +9,44 @@ public class MusicPatchNode2 { @ObfuscatedGetter( longValue = -6780258776884306463L ) - static long __hd_fc; + static long field592; @ObfuscatedName("m") - byte[] __m; + byte[] field593; @ObfuscatedName("f") - byte[] __f; + byte[] field594; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 140046797 ) - int __q; + int field595; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -249046051 ) - int __w; + int field596; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -1455145595 ) - int __o; + int field597; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 1577527995 ) - int __u; + int field598; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 391670135 ) - int __g; + int field599; @ObfuscatedName("l") @ObfuscatedGetter( intValue = 320761691 ) - int __l; + int field600; @ObfuscatedName("e") @ObfuscatedGetter( intValue = 1984131473 ) - int __e; + int field601; } diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index 664d11868d..2109c5b68a 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -11,7 +11,7 @@ public class MusicPatchPcmStream extends PcmStream { @ObfuscatedGetter( intValue = -1367955455 ) - static int __hq_qg; + static int field602; @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lhm;" @@ -45,49 +45,49 @@ public class MusicPatchPcmStream extends PcmStream { signature = "(Lha;[IIIII)V", garbageValue = "1988628167" ) - void __m_379(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { - if((this.superStream.__y[var1.__m] & 4) != 0 && var1.__a < 0) { - int var6 = this.superStream.__p[var1.__m] / class309.PcmPlayer_sampleRate; + void method220(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { + if ((this.superStream.field506[var1.field574] & 4) != 0 && var1.field586 < 0) { + int var6 = this.superStream.field511[var1.field574] / class309.PcmPlayer_sampleRate; - while(true) { - int var7 = (var6 + 1048575 - var1.__b) / var6; - if(var7 > var4) { - var1.__b += var4 * var6; + while (true) { + int var7 = (var6 + 1048575 - var1.field591) / var6; + if (var7 > var4) { + var1.field591 += var4 * var6; break; } - var1.stream.__e_172(var2, var3, var7); + var1.stream.vmethod263(var2, var3, var7); var3 += var7; var4 -= var7; - var1.__b += var7 * var6 - 1048576; + var1.field591 += var7 * var6 - 1048576; int var8 = class309.PcmPlayer_sampleRate / 100; int var9 = 262144 / var6; - if(var9 < var8) { + if (var9 < var8) { var8 = var9; } RawPcmStream var10 = var1.stream; - if(this.superStream.__c[var1.__m] == 0) { - var1.stream = RawPcmStream.method2524(var1.rawSound, var10.__ab_194(), var10.__s_185(), var10.__t_186()); + if (this.superStream.field509[var1.field574] == 0) { + var1.stream = RawPcmStream.method2524(var1.rawSound, var10.method277(), var10.method268(), var10.method269()); } else { - var1.stream = RawPcmStream.method2524(var1.rawSound, var10.__ab_194(), 0, var10.__t_186()); - this.superStream.__h_346(var1, var1.patch.__q[var1.__u] < 0); - var1.stream.__c_190(var8, var10.__s_185()); + var1.stream = RawPcmStream.method2524(var1.rawSound, var10.method277(), 0, var10.method269()); + this.superStream.method178(var1, var1.patch.field568[var1.field577] < 0); + var1.stream.method273(var8, var10.method268()); } - if(var1.patch.__q[var1.__u] < 0) { + if (var1.patch.field568[var1.field577] < 0) { var1.stream.setNumLoops(-1); } - var10.__v_192(var8); - var10.__e_172(var2, var3, var5 - var3); - if(var10.__at_196()) { + var10.method275(var8); + var10.vmethod263(var2, var3, var5 - var3); + if (var10.method279()) { this.mixer.addSubStream(var10); } } } - var1.stream.__e_172(var2, var3, var4); + var1.stream.vmethod263(var2, var3, var4); } @ObfuscatedName("f") @@ -95,28 +95,28 @@ public class MusicPatchPcmStream extends PcmStream { signature = "(Lha;II)V", garbageValue = "1882591412" ) - void __f_380(MusicPatchNode var1, int var2) { - if((this.superStream.__y[var1.__m] & 4) != 0 && var1.__a < 0) { - int var3 = this.superStream.__p[var1.__m] / class309.PcmPlayer_sampleRate; - int var4 = (var3 + 1048575 - var1.__b) / var3; - var1.__b = var3 * var2 + var1.__b & 1048575; - if(var4 <= var2) { - if(this.superStream.__c[var1.__m] == 0) { - var1.stream = RawPcmStream.method2524(var1.rawSound, var1.stream.__ab_194(), var1.stream.__s_185(), var1.stream.__t_186()); + void method221(MusicPatchNode var1, int var2) { + if ((this.superStream.field506[var1.field574] & 4) != 0 && var1.field586 < 0) { + int var3 = this.superStream.field511[var1.field574] / class309.PcmPlayer_sampleRate; + int var4 = (var3 + 1048575 - var1.field591) / var3; + var1.field591 = var3 * var2 + var1.field591 & 1048575; + if (var4 <= var2) { + if (this.superStream.field509[var1.field574] == 0) { + var1.stream = RawPcmStream.method2524(var1.rawSound, var1.stream.method277(), var1.stream.method268(), var1.stream.method269()); } else { - var1.stream = RawPcmStream.method2524(var1.rawSound, var1.stream.__ab_194(), 0, var1.stream.__t_186()); - this.superStream.__h_346(var1, var1.patch.__q[var1.__u] < 0); + var1.stream = RawPcmStream.method2524(var1.rawSound, var1.stream.method277(), 0, var1.stream.method269()); + this.superStream.method178(var1, var1.patch.field568[var1.field577] < 0); } - if(var1.patch.__q[var1.__u] < 0) { + if (var1.patch.field568[var1.field577] < 0) { var1.stream.setNumLoops(-1); } - var2 = var1.__b / var3; + var2 = var1.field591 / var3; } } - var1.stream.__d_173(var2); + var1.stream.vmethod264(var2); } @ObfuscatedName("u") @@ -126,7 +126,7 @@ public class MusicPatchPcmStream extends PcmStream { @Export("firstSubStream") protected PcmStream firstSubStream() { MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); - return (PcmStream)(var1 == null?null:(var1.stream != null?var1.stream:this.nextSubStream())); + return (PcmStream)(var1 == null ? null : (var1.stream != null ? var1.stream : this.nextSubStream())); } @ObfuscatedName("g") @@ -138,7 +138,7 @@ public class MusicPatchPcmStream extends PcmStream { MusicPatchNode var1; do { var1 = (MusicPatchNode)this.queue.previous(); - if(var1 == null) { + if (var1 == null) { return null; } } while(var1.stream == null); @@ -147,53 +147,53 @@ public class MusicPatchPcmStream extends PcmStream { } @ObfuscatedName("l") - protected int __l_171() { + protected int vmethod262() { return 0; } @ObfuscatedName("e") - protected void __e_172(int[] var1, int var2, int var3) { - this.mixer.__e_172(var1, var2, var3); + protected void vmethod263(int[] var1, int var2, int var3) { + this.mixer.vmethod263(var1, var2, var3); - for(MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { - if(!this.superStream.__ba_368(var6)) { - int var4 = var2; - int var5 = var3; + for (MusicPatchNode var4 = (MusicPatchNode)this.queue.last(); var4 != null; var4 = (MusicPatchNode)this.queue.previous()) { + if (!this.superStream.method195(var4)) { + int var5 = var2; + int var6 = var3; do { - if(var5 <= var6.__y) { - this.__m_379(var6, var1, var4, var5, var5 + var4); - var6.__y -= var5; + if (var6 <= var4.field590) { + this.method220(var4, var1, var5, var6, var6 + var5); + var4.field590 -= var6; break; } - this.__m_379(var6, var1, var4, var6.__y, var5 + var4); - var4 += var6.__y; - var5 -= var6.__y; - } while(!this.superStream.__bb_369(var6, var1, var4, var5)); + this.method220(var4, var1, var5, var4.field590, var6 + var5); + var5 += var4.field590; + var6 -= var4.field590; + } while(!this.superStream.method196(var4, var1, var5, var6)); } } } @ObfuscatedName("d") - protected void __d_173(int var1) { - this.mixer.__d_173(var1); + protected void vmethod264(int var1) { + this.mixer.vmethod264(var1); - for(MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { - if(!this.superStream.__ba_368(var3)) { - int var2 = var1; + for (MusicPatchNode var2 = (MusicPatchNode)this.queue.last(); var2 != null; var2 = (MusicPatchNode)this.queue.previous()) { + if (!this.superStream.method195(var2)) { + int var3 = var1; do { - if(var2 <= var3.__y) { - this.__f_380(var3, var2); - var3.__y -= var2; + if (var3 <= var2.field590) { + this.method221(var2, var3); + var2.field590 -= var3; break; } - this.__f_380(var3, var3.__y); - var2 -= var3.__y; - } while(!this.superStream.__bb_369(var3, (int[])null, 0, var2)); + this.method221(var2, var2.field590); + var3 -= var2.field590; + } while(!this.superStream.method196(var2, (int[])null, 0, var3)); } } diff --git a/runescape-client/src/main/java/MusicSample.java b/runescape-client/src/main/java/MusicSample.java index 7c5cb71a6a..99bd23e94c 100644 --- a/runescape-client/src/main/java/MusicSample.java +++ b/runescape-client/src/main/java/MusicSample.java @@ -7,15 +7,15 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("MusicSample") public class MusicSample extends Node { @ObfuscatedName("g") - static byte[] __cd_g; + static byte[] field603; @ObfuscatedName("l") - static int __cd_l; + static int field604; @ObfuscatedName("e") - static int __cd_e; + static int field605; @ObfuscatedName("x") - static int __cd_x; + static int field606; @ObfuscatedName("d") - static int __cd_d; + static int field607; @ObfuscatedName("k") @ObfuscatedSignature( signature = "[Lcc;" @@ -37,31 +37,31 @@ public class MusicSample extends Node { ) static class114[] field1326; @ObfuscatedName("z") - static boolean[] __cd_z; + static boolean[] field608; @ObfuscatedName("j") - static int[] __cd_j; + static int[] field609; @ObfuscatedName("s") - static boolean __cd_s; + static boolean field610; @ObfuscatedName("c") - static float[] __cd_c; + static float[] field611; @ObfuscatedName("r") - static float[] __cd_r; + static float[] field612; @ObfuscatedName("p") - static float[] __cd_p; + static float[] field613; @ObfuscatedName("v") - static float[] __cd_v; + static float[] field614; @ObfuscatedName("ag") - static float[] __cd_ag; + static float[] field615; @ObfuscatedName("aq") - static float[] __cd_aq; + static float[] field616; @ObfuscatedName("aj") - static float[] __cd_aj; + static float[] field617; @ObfuscatedName("av") - static int[] __cd_av; + static int[] field618; @ObfuscatedName("ar") - static int[] __cd_ar; + static int[] field619; @ObfuscatedName("m") - byte[][] __m; + byte[][] field620; @ObfuscatedName("f") @Export("sampleRate") int sampleRate; @@ -75,26 +75,22 @@ public class MusicSample extends Node { @Export("end") int end; @ObfuscatedName("u") - boolean __u; + boolean field621; @ObfuscatedName("t") - float[] __t; + float[] field622; @ObfuscatedName("y") - int __y; + int field623; @ObfuscatedName("h") - int __h; + int field624; @ObfuscatedName("b") - boolean __b; + boolean field625; @ObfuscatedName("ac") @Export("samples") byte[] samples; @ObfuscatedName("ay") - int __ay; + int field626; @ObfuscatedName("ah") - int __ah; - - static { - __cd_s = false; - } + int field627; MusicSample(byte[] var1) { this.read(var1); @@ -108,15 +104,15 @@ public class MusicSample extends Node { this.sampleCount = var2.readInt(); this.start = var2.readInt(); this.end = var2.readInt(); - if(this.end < 0) { + if (this.end < 0) { this.end = ~this.end; - this.__u = true; + this.field621 = true; } int var3 = var2.readInt(); - this.__m = new byte[var3][]; + this.field620 = new byte[var3][]; - for(int var4 = 0; var4 < var3; ++var4) { + for (int var4 = 0; var4 < var3; ++var4) { int var5 = 0; int var6; @@ -126,22 +122,22 @@ public class MusicSample extends Node { } while(var6 >= 255); byte[] var7 = new byte[var5]; - var2.__al_305(var7, 0, var5); - this.__m[var4] = var7; + var2.method46(var7, 0, var5); + this.field620[var4] = var7; } } @ObfuscatedName("g") - float[] __g_175(int var1) { - method2337(this.__m[var1], 0); + float[] method225(int var1) { + method2337(this.field620[var1], 0); method2338(); - int var2 = method2352(WorldMapCacheName.method634(__cd_j.length - 1)); - boolean var3 = __cd_z[var2]; - int var4 = var3?__cd_d:__cd_x; + int var2 = method2352(WorldMapCacheName.method634(field609.length - 1)); + boolean var3 = field608[var2]; + int var4 = var3 ? field607 : field606; boolean var5 = false; boolean var6 = false; - if(var3) { + if (var3) { var5 = method2338() != 0; var6 = method2338() != 0; } @@ -150,10 +146,10 @@ public class MusicSample extends Node { int var8; int var9; int var10; - if(var3 && !var5) { - var8 = (var4 >> 2) - (__cd_x >> 2); - var9 = (__cd_x >> 2) + (var4 >> 2); - var10 = __cd_x >> 1; + if (var3 && !var5) { + var8 = (var4 >> 2) - (field606 >> 2); + var9 = (field606 >> 2) + (var4 >> 2); + var10 = field606 >> 1; } else { var8 = 0; var9 = var7; @@ -163,224 +159,227 @@ public class MusicSample extends Node { int var11; int var12; int var13; - if(var3 && !var6) { - var11 = var4 - (var4 >> 2) - (__cd_x >> 2); - var12 = (__cd_x >> 2) + (var4 - (var4 >> 2)); - var13 = __cd_x >> 1; + if (var3 && !var6) { + var11 = var4 - (var4 >> 2) - (field606 >> 2); + var12 = (field606 >> 2) + (var4 - (var4 >> 2)); + var13 = field606 >> 1; } else { var11 = var7; var12 = var4; var13 = var4 >> 1; } - class114 var14 = field1326[__cd_j[var2]]; - int var16 = var14.field1454; - int var17 = var14.field1452[var16]; - boolean var15 = !field1324[var17].method2367(); - boolean var45 = var15; + class114 var14 = field1326[field609[var2]]; + int var15 = var14.field1454; + int var16 = var14.field1452[var15]; + boolean var17 = !field1324[var16].method2367(); + boolean var18 = var17; - for(var17 = 0; var17 < var14.field1453; ++var17) { - class109 var18 = field1344[var14.field1455[var17]]; - float[] var19 = __cd_c; - var18.method2473(var19, var4 >> 1, var45); + for (var16 = 0; var16 < var14.field1453; ++var16) { + class109 var19 = field1344[var14.field1455[var16]]; + float[] var20 = field611; + var19.method2473(var20, var4 >> 1, var18); } - int var40; - if(!var15) { - var17 = var14.field1454; - var40 = var14.field1452[var17]; - field1324[var40].method2375(__cd_c, var4 >> 1); + int var48; + if (!var17) { + var16 = var14.field1454; + var48 = var14.field1452[var16]; + field1324[var48].method2375(field611, var4 >> 1); } - int var42; - if(var15) { - for(var17 = var4 >> 1; var17 < var4; ++var17) { - __cd_c[var17] = 0.0F; + float[] var21; + int var22; + int var49; + if (var17) { + for (var16 = var4 >> 1; var16 < var4; ++var16) { + field611[var16] = 0.0F; } } else { - var17 = var4 >> 1; - var40 = var4 >> 2; - var42 = var4 >> 3; - float[] var43 = __cd_c; + var16 = var4 >> 1; + var48 = var4 >> 2; + var49 = var4 >> 3; + var21 = field611; - int var21; - for(var21 = 0; var21 < var17; ++var21) { - var43[var21] *= 0.5F; + for (var22 = 0; var22 < var16; ++var22) { + var21[var22] *= 0.5F; } - for(var21 = var17; var21 < var4; ++var21) { - var43[var21] = -var43[var4 - var21 - 1]; + for (var22 = var16; var22 < var4; ++var22) { + var21[var22] = -var21[var4 - var22 - 1]; } - float[] var44 = var3?__cd_ag:__cd_r; - float[] var22 = var3?__cd_aq:__cd_p; - float[] var23 = var3?__cd_aj:__cd_v; - int[] var24 = var3?__cd_ar:__cd_av; + float[] var23 = var3 ? field615 : field612; + float[] var24 = var3 ? field616 : field613; + float[] var25 = var3 ? field617 : field614; + int[] var26 = var3 ? field619 : field618; - int var25; - float var26; - float var27; + int var27; float var28; float var29; - for(var25 = 0; var25 < var40; ++var25) { - var26 = var43[var25 * 4] - var43[var4 - var25 * 4 - 1]; - var27 = var43[var25 * 4 + 2] - var43[var4 - var25 * 4 - 3]; - var28 = var44[var25 * 2]; - var29 = var44[var25 * 2 + 1]; - var43[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; - var43[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; - } - float var30; float var31; - for(var25 = 0; var25 < var42; ++var25) { - var26 = var43[var17 + var25 * 4 + 3]; - var27 = var43[var17 + var25 * 4 + 1]; - var28 = var43[var25 * 4 + 3]; - var29 = var43[var25 * 4 + 1]; - var43[var17 + var25 * 4 + 3] = var26 + var28; - var43[var17 + var25 * 4 + 1] = var27 + var29; - var30 = var44[var17 - 4 - var25 * 4]; - var31 = var44[var17 - 3 - var25 * 4]; - var43[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; - var43[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; + for (var27 = 0; var27 < var48; ++var27) { + var28 = var21[var27 * 4] - var21[var4 - var27 * 4 - 1]; + var29 = var21[var27 * 4 + 2] - var21[var4 - var27 * 4 - 3]; + var30 = var23[var27 * 2]; + var31 = var23[var27 * 2 + 1]; + var21[var4 - var27 * 4 - 1] = var28 * var30 - var29 * var31; + var21[var4 - var27 * 4 - 3] = var28 * var31 + var29 * var30; } - var25 = WorldMapCacheName.method634(var4 - 1); + float var32; + float var33; + for (var27 = 0; var27 < var49; ++var27) { + var28 = var21[var16 + var27 * 4 + 3]; + var29 = var21[var16 + var27 * 4 + 1]; + var30 = var21[var27 * 4 + 3]; + var31 = var21[var27 * 4 + 1]; + var21[var16 + var27 * 4 + 3] = var28 + var30; + var21[var16 + var27 * 4 + 1] = var29 + var31; + var32 = var23[var16 - 4 - var27 * 4]; + var33 = var23[var16 - 3 - var27 * 4]; + var21[var27 * 4 + 3] = (var28 - var30) * var32 - (var29 - var31) * var33; + var21[var27 * 4 + 1] = (var29 - var31) * var32 + (var28 - var30) * var33; + } - int var47; - int var48; - int var49; - int var50; - for(var47 = 0; var47 < var25 - 3; ++var47) { - var48 = var4 >> var47 + 2; - var49 = 8 << var47; + var27 = WorldMapCacheName.method634(var4 - 1); - for(var50 = 0; var50 < 2 << var47; ++var50) { - int var51 = var4 - var48 * var50 * 2; - int var52 = var4 - var48 * (var50 * 2 + 1); + int var34; + int var35; + int var36; + int var37; + for (var34 = 0; var34 < var27 - 3; ++var34) { + var35 = var4 >> var34 + 2; + var36 = 8 << var34; - for(int var32 = 0; var32 < var4 >> var47 + 4; ++var32) { - int var33 = var32 * 4; - float var34 = var43[var51 - 1 - var33]; - float var35 = var43[var51 - 3 - var33]; - float var36 = var43[var52 - 1 - var33]; - float var37 = var43[var52 - 3 - var33]; - var43[var51 - 1 - var33] = var34 + var36; - var43[var51 - 3 - var33] = var35 + var37; - float var38 = var44[var32 * var49]; - float var39 = var44[var32 * var49 + 1]; - var43[var52 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; - var43[var52 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; + for (var37 = 0; var37 < 2 << var34; ++var37) { + int var38 = var4 - var35 * var37 * 2; + int var39 = var4 - var35 * (var37 * 2 + 1); + + for (int var40 = 0; var40 < var4 >> var34 + 4; ++var40) { + int var41 = var40 * 4; + float var42 = var21[var38 - 1 - var41]; + float var43 = var21[var38 - 3 - var41]; + float var44 = var21[var39 - 1 - var41]; + float var45 = var21[var39 - 3 - var41]; + var21[var38 - 1 - var41] = var42 + var44; + var21[var38 - 3 - var41] = var43 + var45; + float var46 = var23[var40 * var36]; + float var47 = var23[var40 * var36 + 1]; + var21[var39 - 1 - var41] = (var42 - var44) * var46 - (var43 - var45) * var47; + var21[var39 - 3 - var41] = (var43 - var45) * var46 + (var42 - var44) * var47; } } } - for(var47 = 1; var47 < var42 - 1; ++var47) { - var48 = var24[var47]; - if(var47 < var48) { - var49 = var47 * 8; - var50 = var48 * 8; - var30 = var43[var49 + 1]; - var43[var49 + 1] = var43[var50 + 1]; - var43[var50 + 1] = var30; - var30 = var43[var49 + 3]; - var43[var49 + 3] = var43[var50 + 3]; - var43[var50 + 3] = var30; - var30 = var43[var49 + 5]; - var43[var49 + 5] = var43[var50 + 5]; - var43[var50 + 5] = var30; - var30 = var43[var49 + 7]; - var43[var49 + 7] = var43[var50 + 7]; - var43[var50 + 7] = var30; + for (var34 = 1; var34 < var49 - 1; ++var34) { + var35 = var26[var34]; + if (var34 < var35) { + var36 = var34 * 8; + var37 = var35 * 8; + var32 = var21[var36 + 1]; + var21[var36 + 1] = var21[var37 + 1]; + var21[var37 + 1] = var32; + var32 = var21[var36 + 3]; + var21[var36 + 3] = var21[var37 + 3]; + var21[var37 + 3] = var32; + var32 = var21[var36 + 5]; + var21[var36 + 5] = var21[var37 + 5]; + var21[var37 + 5] = var32; + var32 = var21[var36 + 7]; + var21[var36 + 7] = var21[var37 + 7]; + var21[var37 + 7] = var32; } } - for(var47 = 0; var47 < var17; ++var47) { - var43[var47] = var43[var47 * 2 + 1]; + for (var34 = 0; var34 < var16; ++var34) { + var21[var34] = var21[var34 * 2 + 1]; } - for(var47 = 0; var47 < var42; ++var47) { - var43[var4 - 1 - var47 * 2] = var43[var47 * 4]; - var43[var4 - 2 - var47 * 2] = var43[var47 * 4 + 1]; - var43[var4 - var40 - 1 - var47 * 2] = var43[var47 * 4 + 2]; - var43[var4 - var40 - 2 - var47 * 2] = var43[var47 * 4 + 3]; + for (var34 = 0; var34 < var49; ++var34) { + var21[var4 - 1 - var34 * 2] = var21[var34 * 4]; + var21[var4 - 2 - var34 * 2] = var21[var34 * 4 + 1]; + var21[var4 - var48 - 1 - var34 * 2] = var21[var34 * 4 + 2]; + var21[var4 - var48 - 2 - var34 * 2] = var21[var34 * 4 + 3]; } - for(var47 = 0; var47 < var42; ++var47) { - var27 = var23[var47 * 2]; - var28 = var23[var47 * 2 + 1]; - var29 = var43[var17 + var47 * 2]; - var30 = var43[var17 + var47 * 2 + 1]; - var31 = var43[var4 - 2 - var47 * 2]; - float var53 = var43[var4 - 1 - var47 * 2]; - float var54 = var28 * (var29 - var31) + var27 * (var30 + var53); - var43[var17 + var47 * 2] = (var29 + var31 + var54) * 0.5F; - var43[var4 - 2 - var47 * 2] = (var29 + var31 - var54) * 0.5F; - var54 = var28 * (var30 + var53) - var27 * (var29 - var31); - var43[var17 + var47 * 2 + 1] = (var30 - var53 + var54) * 0.5F; - var43[var4 - 1 - var47 * 2] = (-var30 + var53 + var54) * 0.5F; + for (var34 = 0; var34 < var49; ++var34) { + var29 = var25[var34 * 2]; + var30 = var25[var34 * 2 + 1]; + var31 = var21[var16 + var34 * 2]; + var32 = var21[var16 + var34 * 2 + 1]; + var33 = var21[var4 - 2 - var34 * 2]; + float var51 = var21[var4 - 1 - var34 * 2]; + float var52 = var30 * (var31 - var33) + var29 * (var32 + var51); + var21[var16 + var34 * 2] = (var31 + var33 + var52) * 0.5F; + var21[var4 - 2 - var34 * 2] = (var31 + var33 - var52) * 0.5F; + var52 = var30 * (var32 + var51) - var29 * (var31 - var33); + var21[var16 + var34 * 2 + 1] = (var32 - var51 + var52) * 0.5F; + var21[var4 - 1 - var34 * 2] = (-var32 + var51 + var52) * 0.5F; } - for(var47 = 0; var47 < var40; ++var47) { - var43[var47] = var43[var17 + var47 * 2] * var22[var47 * 2] + var43[var17 + var47 * 2 + 1] * var22[var47 * 2 + 1]; - var43[var17 - 1 - var47] = var43[var17 + var47 * 2] * var22[var47 * 2 + 1] - var43[var17 + var47 * 2 + 1] * var22[var47 * 2]; + for (var34 = 0; var34 < var48; ++var34) { + var21[var34] = var21[var16 + var34 * 2] * var24[var34 * 2] + var21[var16 + var34 * 2 + 1] * var24[var34 * 2 + 1]; + var21[var16 - 1 - var34] = var21[var16 + var34 * 2] * var24[var34 * 2 + 1] - var21[var16 + var34 * 2 + 1] * var24[var34 * 2]; } - for(var47 = 0; var47 < var40; ++var47) { - var43[var47 + (var4 - var40)] = -var43[var47]; + for (var34 = 0; var34 < var48; ++var34) { + var21[var34 + (var4 - var48)] = -var21[var34]; } - for(var47 = 0; var47 < var40; ++var47) { - var43[var47] = var43[var40 + var47]; + for (var34 = 0; var34 < var48; ++var34) { + var21[var34] = var21[var48 + var34]; } - for(var47 = 0; var47 < var40; ++var47) { - var43[var40 + var47] = -var43[var40 - var47 - 1]; + for (var34 = 0; var34 < var48; ++var34) { + var21[var48 + var34] = -var21[var48 - var34 - 1]; } - for(var47 = 0; var47 < var40; ++var47) { - var43[var17 + var47] = var43[var4 - var47 - 1]; + for (var34 = 0; var34 < var48; ++var34) { + var21[var16 + var34] = var21[var4 - var34 - 1]; } - for(var47 = var8; var47 < var9; ++var47) { - var27 = (float)Math.sin(((double)(var47 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); - __cd_c[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); + float[] var10000; + for (var34 = var8; var34 < var9; ++var34) { + var29 = (float)Math.sin(((double)(var34 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); + var10000 = field611; + var10000[var34] *= (float)Math.sin(1.5707963267948966D * (double)var29 * (double)var29); } - for(var47 = var11; var47 < var12; ++var47) { - var27 = (float)Math.sin(((double)(var47 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); - __cd_c[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); + for (var34 = var11; var34 < var12; ++var34) { + var29 = (float)Math.sin(((double)(var34 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); + var10000 = field611; + var10000[var34] *= (float)Math.sin(1.5707963267948966D * (double)var29 * (double)var29); } } - float[] var41 = null; - if(this.__y > 0) { - var40 = var4 + this.__y >> 2; - var41 = new float[var40]; - int var20; - if(!this.__b) { - for(var42 = 0; var42 < this.__h; ++var42) { - var20 = var42 + (this.__y >> 1); - var41[var42] += this.__t[var20]; + var21 = null; + if (this.field623 > 0) { + var48 = var4 + this.field623 >> 2; + var21 = new float[var48]; + if (!this.field625) { + for (var49 = 0; var49 < this.field624; ++var49) { + var22 = var49 + (this.field623 >> 1); + var21[var49] += this.field622[var22]; } } - if(!var15) { - for(var42 = var8; var42 < var4 >> 1; ++var42) { - var20 = var41.length - (var4 >> 1) + var42; - var41[var20] += __cd_c[var42]; + if (!var17) { + for (var49 = var8; var49 < var4 >> 1; ++var49) { + var22 = var21.length - (var4 >> 1) + var49; + var21[var22] += field611[var49]; } } } - float[] var46 = this.__t; - this.__t = __cd_c; - __cd_c = var46; - this.__y = var4; - this.__h = var12 - (var4 >> 1); - this.__b = var15; - return var41; + float[] var50 = this.field622; + this.field622 = field611; + field611 = var50; + this.field623 = var4; + this.field624 = var12 - (var4 >> 1); + this.field625 = var17; + return var21; } @ObfuscatedName("x") @@ -389,51 +388,51 @@ public class MusicSample extends Node { ) @Export("toRawSound") RawSound toRawSound(int[] var1) { - if(var1 != null && var1[0] <= 0) { + if (var1 != null && var1[0] <= 0) { return null; } else { - if(this.samples == null) { - this.__y = 0; - this.__t = new float[__cd_d]; + if (this.samples == null) { + this.field623 = 0; + this.field622 = new float[field607]; this.samples = new byte[this.sampleCount]; - this.__ay = 0; - this.__ah = 0; + this.field626 = 0; + this.field627 = 0; } - for(; this.__ah < this.__m.length; ++this.__ah) { - if(var1 != null && var1[0] <= 0) { + for (; this.field627 < this.field620.length; ++this.field627) { + if (var1 != null && var1[0] <= 0) { return null; } - float[] var2 = this.__g_175(this.__ah); - if(var2 != null) { - int var3 = this.__ay; + float[] var2 = this.method225(this.field627); + if (var2 != null) { + int var3 = this.field626; int var4 = var2.length; - if(var4 > this.sampleCount - var3) { + if (var4 > this.sampleCount - var3) { var4 = this.sampleCount - var3; } - for(int var5 = 0; var5 < var4; ++var5) { + for (int var5 = 0; var5 < var4; ++var5) { int var6 = (int)(128.0F + var2[var5] * 128.0F); - if((var6 & -256) != 0) { + if ((var6 & -256) != 0) { var6 = ~var6 >> 31; } this.samples[var3++] = (byte)(var6 - 128); } - if(var1 != null) { - var1[0] -= var3 - this.__ay; + if (var1 != null) { + var1[0] -= var3 - this.field626; } - this.__ay = var3; + this.field626 = var3; } } - this.__t = null; + this.field622 = null; byte[] var7 = this.samples; this.samples = null; - return new RawSound(this.sampleRate, var7, this.start, this.end, this.__u); + return new RawSound(this.sampleRate, var7, this.start, this.end, this.field621); } } @@ -442,7 +441,7 @@ public class MusicSample extends Node { int var1 = var0 & 2097151; int var2 = var0 & Integer.MIN_VALUE; int var3 = (var0 & 2145386496) >> 21; - if(var2 != 0) { + if (var2 != 0) { var1 = -var1; } @@ -451,17 +450,17 @@ public class MusicSample extends Node { @ObfuscatedName("f") static void method2337(byte[] var0, int var1) { - __cd_g = var0; - __cd_l = var1; - __cd_e = 0; + field603 = var0; + field604 = var1; + field605 = 0; } @ObfuscatedName("q") static int method2338() { - int var0 = __cd_g[__cd_l] >> __cd_e & 1; - ++__cd_e; - __cd_l += __cd_e >> 3; - __cd_e &= 7; + int var0 = field603[field604] >> field605 & 1; + ++field605; + field604 += field605 >> 3; + field605 &= 7; return var0; } @@ -471,19 +470,19 @@ public class MusicSample extends Node { int var2; int var3; - for(var2 = 0; var0 >= 8 - __cd_e; var0 -= var3) { - var3 = 8 - __cd_e; + for (var2 = 0; var0 >= 8 - field605; var0 -= var3) { + var3 = 8 - field605; int var4 = (1 << var3) - 1; - var1 += (__cd_g[__cd_l] >> __cd_e & var4) << var2; - __cd_e = 0; - ++__cd_l; + var1 += (field603[field604] >> field605 & var4) << var2; + field605 = 0; + ++field604; var2 += var3; } - if(var0 > 0) { + if (var0 > 0) { var3 = (1 << var0) - 1; - var1 += (__cd_g[__cd_l] >> __cd_e & var3) << var2; - __cd_e += var0; + var1 += (field603[field604] >> field605 & var3) << var2; + field605 += var0; } return var1; @@ -492,104 +491,104 @@ public class MusicSample extends Node { @ObfuscatedName("u") static void method2341(byte[] var0) { method2337(var0, 0); - __cd_x = 1 << method2352(4); - __cd_d = 1 << method2352(4); - __cd_c = new float[__cd_d]; + field606 = 1 << method2352(4); + field607 = 1 << method2352(4); + field611 = new float[field607]; int var1; int var2; int var3; int var4; int var5; - for(var1 = 0; var1 < 2; ++var1) { - var2 = var1 != 0?__cd_d:__cd_x; + for (var1 = 0; var1 < 2; ++var1) { + var2 = var1 != 0 ? field607 : field606; var3 = var2 >> 1; var4 = var2 >> 2; var5 = var2 >> 3; float[] var6 = new float[var3]; - for(int var7 = 0; var7 < var4; ++var7) { + for (int var7 = 0; var7 < var4; ++var7) { var6[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); var6[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); } - float[] var12 = new float[var3]; + float[] var13 = new float[var3]; - for(int var8 = 0; var8 < var4; ++var8) { - var12[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); - var12[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); + for (int var8 = 0; var8 < var4; ++var8) { + var13[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); + var13[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); } - float[] var13 = new float[var4]; + float[] var14 = new float[var4]; - for(int var9 = 0; var9 < var5; ++var9) { - var13[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); - var13[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); + for (int var9 = 0; var9 < var5; ++var9) { + var14[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); + var14[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); } - int[] var14 = new int[var5]; + int[] var15 = new int[var5]; int var10 = WorldMapCacheName.method634(var5 - 1); - for(int var11 = 0; var11 < var5; ++var11) { - var14[var11] = GrandExchangeEvent.method87(var11, var10); + for (int var11 = 0; var11 < var5; ++var11) { + var15[var11] = GrandExchangeEvent.method87(var11, var10); } - if(var1 != 0) { - __cd_ag = var6; - __cd_aq = var12; - __cd_aj = var13; - __cd_ar = var14; + if (var1 != 0) { + field615 = var6; + field616 = var13; + field617 = var14; + field619 = var15; } else { - __cd_r = var6; - __cd_p = var12; - __cd_v = var13; - __cd_av = var14; + field612 = var6; + field613 = var13; + field614 = var14; + field618 = var15; } } var1 = method2352(8) + 1; field1323 = new class98[var1]; - for(var2 = 0; var2 < var1; ++var2) { + for (var2 = 0; var2 < var1; ++var2) { field1323[var2] = new class98(); } var2 = method2352(6) + 1; - for(var3 = 0; var3 < var2; ++var3) { + for (var3 = 0; var3 < var2; ++var3) { method2352(16); } var2 = method2352(6) + 1; field1324 = new class102[var2]; - for(var3 = 0; var3 < var2; ++var3) { + for (var3 = 0; var3 < var2; ++var3) { field1324[var3] = new class102(); } var3 = method2352(6) + 1; field1344 = new class109[var3]; - for(var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { field1344[var4] = new class109(); } var4 = method2352(6) + 1; field1326 = new class114[var4]; - for(var5 = 0; var5 < var4; ++var5) { + for (var5 = 0; var5 < var4; ++var5) { field1326[var5] = new class114(); } var5 = method2352(6) + 1; - __cd_z = new boolean[var5]; - __cd_j = new int[var5]; + field608 = new boolean[var5]; + field609 = new int[var5]; - for(int var15 = 0; var15 < var5; ++var15) { - __cd_z[var15] = method2338() != 0; + for (int var12 = 0; var12 < var5; ++var12) { + field608[var12] = method2338() != 0; method2352(16); method2352(16); - __cd_j[var15] = method2352(8); + field609[var12] = method2352(8); } } @@ -599,14 +598,14 @@ public class MusicSample extends Node { signature = "(Lir;)Z" ) static boolean method2343(AbstractIndexCache var0) { - if(!__cd_s) { + if (!field610) { byte[] var1 = var0.takeRecord(0, 0); - if(var1 == null) { + if (var1 == null) { return false; } method2341(var1); - __cd_s = true; + field610 = true; } return true; @@ -618,12 +617,16 @@ public class MusicSample extends Node { ) @Export("readMusicSample") static MusicSample readMusicSample(AbstractIndexCache var0, int var1, int var2) { - if(!method2343(var0)) { + if (!method2343(var0)) { var0.tryLoadRecord(var1, var2); return null; } else { byte[] var3 = var0.takeRecord(var1, var2); - return var3 == null?null:new MusicSample(var3); + return var3 == null ? null : new MusicSample(var3); } } + + static { + field610 = false; + } } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index bd207d4761..57a5653b29 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -22,7 +22,7 @@ public class MusicTrack extends Node { MusicTrack(Buffer var1) { var1.index = var1.array.length - 3; int var2 = var1.readUnsignedByte(); - int var3 = var1.__ag_302(); + int var3 = var1.method43(); int var4 = var2 * 10 + 14; var1.index = 0; int var5 = 0; @@ -37,36 +37,36 @@ public class MusicTrack extends Node { int var13; int var14; int var15; - for(var13 = 0; var13 < var2; ++var13) { + for (var13 = 0; var13 < var2; ++var13) { var14 = -1; - while(true) { + while (true) { var15 = var1.readUnsignedByte(); - if(var15 != var14) { + if (var15 != var14) { ++var4; } var14 = var15 & 15; - if(var15 == 7) { + if (var15 == 7) { break; } - if(var15 == 23) { + if (var15 == 23) { ++var5; - } else if(var14 == 0) { + } else if (var14 == 0) { ++var7; - } else if(var14 == 1) { + } else if (var14 == 1) { ++var8; - } else if(var14 == 2) { + } else if (var14 == 2) { ++var6; - } else if(var14 == 3) { + } else if (var14 == 3) { ++var9; - } else if(var14 == 4) { + } else if (var14 == 4) { ++var10; - } else if(var14 == 5) { + } else if (var14 == 5) { ++var11; } else { - if(var14 != 6) { + if (var14 != 6) { throw new RuntimeException(); } @@ -81,8 +81,8 @@ public class MusicTrack extends Node { var13 = var1.index; var14 = var2 + var5 + var6 + var7 + var8 + var9 + var10 + var11 + var12; - for(var15 = 0; var15 < var14; ++var15) { - var1.__as_311(); + for (var15 = 0; var15 < var14; ++var15) { + var1.method52(); } var4 += var1.index - var13; @@ -102,30 +102,30 @@ public class MusicTrack extends Node { int var28 = 0; int var29; - for(var29 = 0; var29 < var6; ++var29) { + for (var29 = 0; var29 < var6; ++var29) { var28 = var28 + var1.readUnsignedByte() & 127; - if(var28 != 0 && var28 != 32) { - if(var28 == 1) { + if (var28 != 0 && var28 != 32) { + if (var28 == 1) { ++var16; - } else if(var28 == 33) { + } else if (var28 == 33) { ++var17; - } else if(var28 == 7) { + } else if (var28 == 7) { ++var18; - } else if(var28 == 39) { + } else if (var28 == 39) { ++var19; - } else if(var28 == 10) { + } else if (var28 == 10) { ++var20; - } else if(var28 == 42) { + } else if (var28 == 42) { ++var21; - } else if(var28 == 99) { + } else if (var28 == 99) { ++var22; - } else if(var28 == 98) { + } else if (var28 == 98) { ++var23; - } else if(var28 == 101) { + } else if (var28 == 101) { ++var24; - } else if(var28 == 100) { + } else if (var28 == 100) { ++var25; - } else if(var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { + } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { ++var27; } else { ++var26; @@ -182,7 +182,7 @@ public class MusicTrack extends Node { Buffer var51 = new Buffer(this.midi); var51.writeInt(1297377380); var51.writeInt(6); - var51.writeShort(var2 > 1?1:0); + var51.writeShort(var2 > 1 ? 1 : 0); var51.writeShort(var2); var51.writeShort(var3); var1.index = var13; @@ -196,33 +196,33 @@ public class MusicTrack extends Node { int[] var59 = new int[128]; var28 = 0; - label231: - for(int var60 = 0; var60 < var2; ++var60) { + label222: + for (int var60 = 0; var60 < var2; ++var60) { var51.writeInt(1297379947); var51.index += 4; int var61 = var51.index; int var62 = -1; - while(true) { - while(true) { - int var63 = var1.__as_311(); - var51.__c_301(var63); + while (true) { + while (true) { + int var63 = var1.method52(); + var51.method42(var63); int var64 = var1.array[var29++] & 255; boolean var65 = var64 != var62; var62 = var64 & 15; - if(var64 == 7) { - if(var65) { + if (var64 == 7) { + if (var65) { var51.writeByte(255); } var51.writeByte(47); var51.writeByte(0); - var51.__t_298(var51.index - var61); - continue label231; + var51.method39(var51.index - var61); + continue label222; } - if(var64 == 23) { - if(var65) { + if (var64 == 23) { + if (var65) { var51.writeByte(255); } @@ -233,8 +233,8 @@ public class MusicTrack extends Node { var51.writeByte(var1.array[var50++]); } else { var52 ^= var64 >> 4; - if(var62 == 0) { - if(var65) { + if (var62 == 0) { + if (var65) { var51.writeByte(var52 + 144); } @@ -242,8 +242,8 @@ public class MusicTrack extends Node { var54 += var1.array[var38++]; var51.writeByte(var53 & 127); var51.writeByte(var54 & 127); - } else if(var62 == 1) { - if(var65) { + } else if (var62 == 1) { + if (var65) { var51.writeByte(var52 + 128); } @@ -251,36 +251,36 @@ public class MusicTrack extends Node { var55 += var1.array[var40++]; var51.writeByte(var53 & 127); var51.writeByte(var55 & 127); - } else if(var62 == 2) { - if(var65) { + } else if (var62 == 2) { + if (var65) { var51.writeByte(var52 + 176); } var28 = var28 + var1.array[var15++] & 127; var51.writeByte(var28); byte var66; - if(var28 != 0 && var28 != 32) { - if(var28 == 1) { + if (var28 != 0 && var28 != 32) { + if (var28 == 1) { var66 = var1.array[var34++]; - } else if(var28 == 33) { + } else if (var28 == 33) { var66 = var1.array[var41++]; - } else if(var28 == 7) { + } else if (var28 == 7) { var66 = var1.array[var35++]; - } else if(var28 == 39) { + } else if (var28 == 39) { var66 = var1.array[var42++]; - } else if(var28 == 10) { + } else if (var28 == 10) { var66 = var1.array[var36++]; - } else if(var28 == 42) { + } else if (var28 == 42) { var66 = var1.array[var43++]; - } else if(var28 == 99) { + } else if (var28 == 99) { var66 = var1.array[var46++]; - } else if(var28 == 98) { + } else if (var28 == 98) { var66 = var1.array[var47++]; - } else if(var28 == 101) { + } else if (var28 == 101) { var66 = var1.array[var48++]; - } else if(var28 == 100) { + } else if (var28 == 100) { var66 = var1.array[var49++]; - } else if(var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { + } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { var66 = var1.array[var39++]; } else { var66 = var1.array[var30++]; @@ -292,8 +292,8 @@ public class MusicTrack extends Node { int var67 = var66 + var59[var28]; var59[var28] = var67; var51.writeByte(var67 & 127); - } else if(var62 == 3) { - if(var65) { + } else if (var62 == 3) { + if (var65) { var51.writeByte(var52 + 224); } @@ -301,15 +301,15 @@ public class MusicTrack extends Node { var56 += var1.array[var33++] << 7; var51.writeByte(var56 & 127); var51.writeByte(var56 >> 7 & 127); - } else if(var62 == 4) { - if(var65) { + } else if (var62 == 4) { + if (var65) { var51.writeByte(var52 + 208); } var57 += var1.array[var32++]; var51.writeByte(var57 & 127); - } else if(var62 == 5) { - if(var65) { + } else if (var62 == 5) { + if (var65) { var51.writeByte(var52 + 160); } @@ -318,11 +318,11 @@ public class MusicTrack extends Node { var51.writeByte(var53 & 127); var51.writeByte(var58 & 127); } else { - if(var62 != 6) { + if (var62 != 6) { throw new RuntimeException(); } - if(var65) { + if (var65) { var51.writeByte(var52 + 192); } @@ -336,84 +336,84 @@ public class MusicTrack extends Node { } @ObfuscatedName("f") - void __f_381() { - if(this.table == null) { + void method226() { + if (this.table == null) { this.table = new NodeHashTable(16); int[] var1 = new int[16]; int[] var2 = new int[16]; var2[9] = 128; var1[9] = 128; - MidiFileReader var4 = new MidiFileReader(this.midi); - int var5 = var4.trackCount(); + MidiFileReader var3 = new MidiFileReader(this.midi); + int var4 = var3.trackCount(); - int var6; - for(var6 = 0; var6 < var5; ++var6) { - var4.gotoTrack(var6); - var4.readTrackLength(var6); - var4.markTrackPosition(var6); + int var5; + for (var5 = 0; var5 < var4; ++var5) { + var3.gotoTrack(var5); + var3.readTrackLength(var5); + var3.markTrackPosition(var5); } - label53: + label56: do { - while(true) { - var6 = var4.getPrioritizedTrack(); - int var7 = var4.trackLengths[var6]; + while (true) { + var5 = var3.getPrioritizedTrack(); + int var6 = var3.trackLengths[var5]; - while(var7 == var4.trackLengths[var6]) { - var4.gotoTrack(var6); - int var8 = var4.readMessage(var6); - if(var8 == 1) { - var4.setTrackDone(); - var4.markTrackPosition(var6); - continue label53; + while (var6 == var3.trackLengths[var5]) { + var3.gotoTrack(var5); + int var7 = var3.readMessage(var5); + if (var7 == 1) { + var3.setTrackDone(); + var3.markTrackPosition(var5); + continue label56; } - int var9 = var8 & 240; + int var8 = var7 & 240; + int var9; int var10; int var11; - int var12; - if(var9 == 176) { - var10 = var8 & 15; - var11 = var8 >> 8 & 127; - var12 = var8 >> 16 & 127; - if(var11 == 0) { - var1[var10] = (var12 << 14) + (var1[var10] & -2080769); + if (var8 == 176) { + var9 = var7 & 15; + var10 = var7 >> 8 & 127; + var11 = var7 >> 16 & 127; + if (var10 == 0) { + var1[var9] = (var11 << 14) + (var1[var9] & -2080769); } - if(var11 == 32) { - var1[var10] = (var1[var10] & -16257) + (var12 << 7); + if (var10 == 32) { + var1[var9] = (var1[var9] & -16257) + (var11 << 7); } } - if(var9 == 192) { - var10 = var8 & 15; - var11 = var8 >> 8 & 127; - var2[var10] = var11 + var1[var10]; + if (var8 == 192) { + var9 = var7 & 15; + var10 = var7 >> 8 & 127; + var2[var9] = var10 + var1[var9]; } - if(var9 == 144) { - var10 = var8 & 15; - var11 = var8 >> 8 & 127; - var12 = var8 >> 16 & 127; - if(var12 > 0) { - int var13 = var2[var10]; - ByteArrayNode var14 = (ByteArrayNode)this.table.get((long)var13); - if(var14 == null) { - var14 = new ByteArrayNode(new byte[128]); - this.table.put(var14, (long)var13); + if (var8 == 144) { + var9 = var7 & 15; + var10 = var7 >> 8 & 127; + var11 = var7 >> 16 & 127; + if (var11 > 0) { + int var12 = var2[var9]; + ByteArrayNode var13 = (ByteArrayNode)this.table.get((long)var12); + if (var13 == null) { + var13 = new ByteArrayNode(new byte[128]); + this.table.put(var13, (long)var12); } - var14.byteArray[var11] = 1; + var13.byteArray[var10] = 1; } } - var4.readTrackLength(var6); - var4.markTrackPosition(var6); + var3.readTrackLength(var5); + var3.markTrackPosition(var5); } } - } while(!var4.isDone()); - + } while(!var3.isDone()); } + } @ObfuscatedName("q") @@ -429,6 +429,6 @@ public class MusicTrack extends Node { @Export("readTrack") public static MusicTrack readTrack(AbstractIndexCache var0, int var1, int var2) { byte[] var3 = var0.takeRecord(var1, var2); - return var3 == null?null:new MusicTrack(new Buffer(var3)); + return var3 == null ? null : new MusicTrack(new Buffer(var3)); } } diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index 22fb3b32eb..d7c216de4e 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -37,7 +37,7 @@ public class NanoClock extends Clock { public int wait(int var1, int var2) { long var3 = 1000000L * (long)var2; long var5 = this.lastTimeNano - System.nanoTime(); - if(var5 < var3) { + if (var5 < var3) { var5 = var3; } @@ -45,11 +45,11 @@ public class NanoClock extends Clock { long var7 = System.nanoTime(); int var9; - for(var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) { + for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) { ++var9; } - if(this.lastTimeNano < var7) { + if (this.lastTimeNano < var7) { this.lastTimeNano = var7; } diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index 660896990b..a4c6dfc5c5 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -18,12 +18,12 @@ public class NetCache { @ObfuscatedGetter( intValue = 948359621 ) - public static int __iq_f; + public static int field628; @ObfuscatedName("q") @ObfuscatedGetter( longValue = -4580427166942649525L ) - public static long __iq_q; + public static long field629; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lld;" @@ -88,7 +88,7 @@ public class NetCache { @ObfuscatedGetter( intValue = 840549915 ) - public static int __iq_j; + public static int field630; @ObfuscatedName("t") @Export("NetCache_crc") public static CRC32 NetCache_crc; @@ -99,7 +99,7 @@ public class NetCache { @Export("NetCache_indexCaches") public static IndexCache[] NetCache_indexCaches; @ObfuscatedName("b") - public static byte __iq_b; + public static byte field631; @ObfuscatedName("c") @ObfuscatedGetter( intValue = -1404585009 @@ -113,8 +113,17 @@ public class NetCache { @Export("NetCache_ioExceptions") public static int NetCache_ioExceptions; + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(IB)Lbm;", + garbageValue = "31" + ) + static Message method4708(int var0) { + return (Message)Messages.Messages_hashTable.get((long)var0); + } + static { - __iq_f = 0; + field628 = 0; NetCache_pendingPriorityWrites = new NodeHashTable(4096); NetCache_pendingPriorityWritesCount = 0; NetCache_pendingPriorityResponses = new NodeHashTable(32); @@ -125,20 +134,11 @@ public class NetCache { NetCache_pendingResponses = new NodeHashTable(4096); NetCache_pendingResponsesCount = 0; NetCache_responseHeaderBuffer = new Buffer(8); - __iq_j = 0; + field630 = 0; NetCache_crc = new CRC32(); NetCache_indexCaches = new IndexCache[256]; - __iq_b = 0; + field631 = 0; NetCache_crcMismatches = 0; NetCache_ioExceptions = 0; } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(IB)Lbm;", - garbageValue = "31" - ) - static Message method4708(int var0) { - return (Message)Messages.Messages_hashTable.get((long)var0); - } } diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index 7420f200e2..03b741230c 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -29,44 +29,44 @@ public class NetFileRequest extends DualNode { garbageValue = "1807602893" ) static final void method4555(Widget[] var0, int var1) { - for(int var2 = 0; var2 < var0.length; ++var2) { + for (int var2 = 0; var2 < var0.length; ++var2) { Widget var3 = var0[var2]; - if(var3 != null && var3.parentId == var1 && (!var3.isIf3 || !PacketBufferNode.method3673(var3))) { - if(var3.type == 0) { - if(!var3.isIf3 && PacketBufferNode.method3673(var3) && var3 != Clock.mousedOverWidgetIf1) { + if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !PacketBufferNode.method3673(var3))) { + if (var3.type == 0) { + if (!var3.isIf3 && PacketBufferNode.method3673(var3) && var3 != Clock.mousedOverWidgetIf1) { continue; } method4555(var0, var3.id); - if(var3.children != null) { + if (var3.children != null) { method4555(var3.children, var3.id); } - WidgetGroupParent var7 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var3.id); - if(var7 != null) { - ClientPreferences.method1809(var7.group); + WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var3.id); + if (var4 != null) { + ClientPreferences.method1809(var4.group); } } - if(var3.type == 6) { - int var5; - if(var3.sequenceId != -1 || var3.sequenceId2 != -1) { - boolean var4 = class238.runCs1(var3); - if(var4) { - var5 = var3.sequenceId2; + if (var3.type == 6) { + int var7; + if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { + boolean var5 = class238.runCs1(var3); + if (var5) { + var7 = var3.sequenceId2; } else { - var5 = var3.sequenceId; + var7 = var3.sequenceId; } - if(var5 != -1) { - SequenceDefinition var6 = WorldMapAreaData.getSequenceDefinition(var5); + if (var7 != -1) { + SequenceDefinition var6 = WorldMapAreaData.getSequenceDefinition(var7); - for(var3.modelFrameCycle += Client.__client_gy; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class22.method295(var3)) { + for (var3.modelFrameCycle += Client.field183; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class22.method295(var3)) { var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; ++var3.modelFrame; - if(var3.modelFrame >= var6.frameIds.length) { + if (var3.modelFrame >= var6.frameIds.length) { var3.modelFrame -= var6.frameCount; - if(var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { + if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { var3.modelFrame = 0; } } @@ -74,13 +74,13 @@ public class NetFileRequest extends DualNode { } } - if(var3.__bh != 0 && !var3.isIf3) { - int var8 = var3.__bh >> 16; - var5 = var3.__bh << 16 >> 16; - var8 *= Client.__client_gy; - var5 *= Client.__client_gy; + if (var3.field963 != 0 && !var3.isIf3) { + int var8 = var3.field963 >> 16; + var7 = var3.field963 << 16 >> 16; + var8 *= Client.field183; + var7 *= Client.field183; var3.modelAngleX = var8 + var3.modelAngleX & 2047; - var3.modelAngleY = var5 + var3.modelAngleY & 2047; + var3.modelAngleY = var7 + var3.modelAngleY & 2047; class22.method295(var3); } } @@ -95,21 +95,21 @@ public class NetFileRequest extends DualNode { garbageValue = "-37" ) static final void method4554(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { - if(var4 != null) { + if (var4 != null) { int var6 = Client.minimapOrientation & 2047; int var7 = var3 * var3 + var2 * var2; - if(var7 <= 6400) { + if (var7 <= 6400) { int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; int var10 = var3 * var8 + var9 * var2 >> 16; int var11 = var3 * var9 - var8 * var2 >> 16; - if(var7 > 2500) { - var4.__ac_512(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); + if (var7 > 2500) { + var4.method314(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); } else { var4.drawAt2(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); } - } } + } } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index f01da8362d..ae8947b0d5 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -49,12 +49,12 @@ public final class NetSocket extends AbstractSocket implements Runnable { @ObfuscatedGetter( intValue = -738185459 ) - int __l; + int field632; @ObfuscatedName("e") @ObfuscatedGetter( intValue = 2057244853 ) - int __e; + int field633; @ObfuscatedName("x") @Export("exceptionWriting") boolean exceptionWriting; @@ -62,25 +62,25 @@ public final class NetSocket extends AbstractSocket implements Runnable { @ObfuscatedGetter( intValue = -1644762957 ) - final int __d; + final int field634; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -782964015 ) - final int __k; + final int field635; @ObfuscatedSignature( signature = "(Ljava/net/Socket;Lfz;I)V" ) public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException { this.isClosed = false; - this.__l = 0; - this.__e = 0; + this.field632 = 0; + this.field633 = 0; this.exceptionWriting = false; this.taskHandler = var2; this.socket = var1; - this.__d = var3; - this.__k = var3 - 100; + this.field634 = var3; + this.field635 = var3 - 100; this.socket.setSoTimeout(30000); this.socket.setTcpNoDelay(true); this.socket.setReceiveBufferSize(65536); @@ -96,7 +96,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { - return this.isClosed?false:this.inputStream.available() >= var1; + return this.isClosed ? false : this.inputStream.available() >= var1; } @ObfuscatedName("q") @@ -106,7 +106,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { ) @Export("available") public int available() throws IOException { - return this.isClosed?0:this.inputStream.available(); + return this.isClosed ? 0 : this.inputStream.available(); } @ObfuscatedName("w") @@ -116,7 +116,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { - return this.isClosed?0:this.inputStream.read(); + return this.isClosed ? 0 : this.inputStream.read(); } @ObfuscatedName("o") @@ -126,14 +126,14 @@ public final class NetSocket extends AbstractSocket implements Runnable { ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { - if(this.isClosed) { + if (this.isClosed) { return 0; } else { int var4; int var5; - for(var4 = var3; var3 > 0; var3 -= var5) { + for (var4 = var3; var3 > 0; var3 -= var5) { var5 = this.inputStream.read(var1, var2, var3); - if(var5 <= 0) { + if (var5 <= 0) { throw new EOFException(); } @@ -161,28 +161,28 @@ public final class NetSocket extends AbstractSocket implements Runnable { ) @Export("close") public void close() { - if(!this.isClosed) { + if (!this.isClosed) { synchronized(this) { this.isClosed = true; this.notifyAll(); } - if(this.task != null) { - while(this.task.status == 0) { + if (this.task != null) { + while (this.task.status == 0) { class203.method4010(1L); } - if(this.task.status == 1) { + if (this.task.status == 1) { try { ((Thread)this.task.result).join(); } catch (InterruptedException var3) { - ; } } } this.task = null; } + } @ObfuscatedName("ay") @@ -192,106 +192,105 @@ public final class NetSocket extends AbstractSocket implements Runnable { ) @Export("write0") void write0(byte[] var1, int var2, int var3) throws IOException { - if(!this.isClosed) { - if(this.exceptionWriting) { + if (!this.isClosed) { + if (this.exceptionWriting) { this.exceptionWriting = false; throw new IOException(); - } else { - if(this.array == null) { - this.array = new byte[this.__d]; + } + + if (this.array == null) { + this.array = new byte[this.field634]; + } + + synchronized(this) { + for (int var5 = 0; var5 < var3; ++var5) { + this.array[this.field633] = var1[var5 + var2]; + this.field633 = (this.field633 + 1) % this.field634; + if ((this.field635 + this.field632) % this.field634 == this.field633) { + throw new IOException(); + } } - synchronized(this) { - for(int var5 = 0; var5 < var3; ++var5) { - this.array[this.__e] = var1[var5 + var2]; - this.__e = (this.__e + 1) % this.__d; - if((this.__k + this.__l) % this.__d == this.__e) { - throw new IOException(); - } - } - - if(this.task == null) { - this.task = this.taskHandler.newThreadTask(this, 3); - } - - this.notifyAll(); + if (this.task == null) { + this.task = this.taskHandler.newThreadTask(this, 3); } + + this.notifyAll(); } } + } @Export("run") @ObfuscatedName("run") public void run() { try { - while(true) { + while (true) { label84: { int var1; int var2; synchronized(this) { - if(this.__e == this.__l) { - if(this.isClosed) { + if (this.field633 == this.field632) { + if (this.isClosed) { break label84; } try { this.wait(); - } catch (InterruptedException var10) { - ; + } catch (InterruptedException var9) { } } - var2 = this.__l; - if(this.__e >= this.__l) { - var1 = this.__e - this.__l; + var2 = this.field632; + if (this.field633 >= this.field632) { + var1 = this.field633 - this.field632; } else { - var1 = this.__d - this.__l; + var1 = this.field634 - this.field632; } } - if(var1 <= 0) { + if (var1 <= 0) { continue; } try { this.outputStream.write(this.array, var2, var1); - } catch (IOException var9) { + } catch (IOException var8) { this.exceptionWriting = true; } - this.__l = (var1 + this.__l) % this.__d; + this.field632 = (var1 + this.field632) % this.field634; try { - if(this.__e == this.__l) { + if (this.field633 == this.field632) { this.outputStream.flush(); } - } catch (IOException var8) { + } catch (IOException var7) { this.exceptionWriting = true; } continue; } try { - if(this.inputStream != null) { + if (this.inputStream != null) { this.inputStream.close(); } - if(this.outputStream != null) { + if (this.outputStream != null) { this.outputStream.close(); } - if(this.socket != null) { + if (this.socket != null) { this.socket.close(); } - } catch (IOException var7) { - ; + } catch (IOException var6) { } this.array = null; break; } - } catch (Exception var12) { - NpcDefinition.sendStackTrace((String)null, var12); + } catch (Exception var11) { + NPCDefinition.sendStackTrace((String)null, var11); } } @@ -308,227 +307,227 @@ public final class NetSocket extends AbstractSocket implements Runnable { garbageValue = "-98" ) @Export("calculateRoute") - 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(graphBaseX = 0; graphBaseX < 128; ++graphBaseX) { - class178.directions[var8][graphBaseX] = 0; - class178.distances[var8][graphBaseX] = 99999999; + public static int calculateRoute(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4, boolean var5, int[] var6, int[] var7) { + int var8; + int var9; + for (var9 = 0; var9 < 128; ++var9) { + for (var8 = 0; var8 < 128; ++var8) { + class178.directions[var9][var8] = 0; + class178.distances[var9][var8] = 99999999; } } - int graphBaseY; - int endX; - byte var13; - int lowestDistance; + int var10; + byte var11; + int var12; + int var13; + int var14; int var15; - 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; - lowestDistance = srcX - var12; - var15 = srcY - var13; - class178.directions[var12][var13] = 99; - class178.distances[var12][var13] = 0; - byte var16 = 0; - approxDestY = 0; - class178.bufferX[var16] = srcX; - approxDestX = var16 + 1; - class178.bufferY[var16] = srcY; - int[][] var18 = collisionMap.flags; + int var16; + int var17; + boolean var18; + int var19; + int var20; + int var21; + byte var22; + if (var2 == 1) { + var9 = var0; + var10 = var1; + var22 = 64; + var11 = 64; + var12 = var0 - var22; + var13 = var1 - var11; + class178.directions[var22][var11] = 99; + class178.distances[var22][var11] = 0; + byte var23 = 0; + var14 = 0; + class178.bufferX[var23] = var0; + var21 = var23 + 1; + class178.bufferY[var23] = var1; + int[][] var24 = var4.flags; - boolean var29; - while(true) { - if(approxDestX == approxDestY) { - WidgetGroupParent.__bx_o = graphBaseY; - UrlRequester.__eo_u = endX; - var29 = false; - break; + boolean var25; + label226: { + while (var21 != var14) { + var9 = class178.bufferX[var14]; + var10 = class178.bufferY[var14]; + var14 = var14 + 1 & 4095; + var19 = var9 - var12; + var20 = var10 - var13; + var15 = var9 - var4.xInset; + var16 = var10 - var4.yInset; + if (var3.vmethod3644(1, var9, var10, var4)) { + WidgetGroupParent.field986 = var9; + UrlRequester.field929 = var10; + var25 = true; + break label226; + } + + var17 = class178.distances[var19][var20] + 1; + if (var19 > 0 && class178.directions[var19 - 1][var20] == 0 && (var24[var15 - 1][var16] & 19136776) == 0) { + class178.bufferX[var21] = var9 - 1; + class178.bufferY[var21] = var10; + var21 = var21 + 1 & 4095; + class178.directions[var19 - 1][var20] = 2; + class178.distances[var19 - 1][var20] = var17; + } + + if (var19 < 127 && class178.directions[var19 + 1][var20] == 0 && (var24[var15 + 1][var16] & 19136896) == 0) { + class178.bufferX[var21] = var9 + 1; + class178.bufferY[var21] = var10; + var21 = var21 + 1 & 4095; + class178.directions[var19 + 1][var20] = 8; + class178.distances[var19 + 1][var20] = var17; + } + + if (var20 > 0 && class178.directions[var19][var20 - 1] == 0 && (var24[var15][var16 - 1] & 19136770) == 0) { + class178.bufferX[var21] = var9; + class178.bufferY[var21] = var10 - 1; + var21 = var21 + 1 & 4095; + class178.directions[var19][var20 - 1] = 1; + class178.distances[var19][var20 - 1] = var17; + } + + if (var20 < 127 && class178.directions[var19][var20 + 1] == 0 && (var24[var15][var16 + 1] & 19136800) == 0) { + class178.bufferX[var21] = var9; + class178.bufferY[var21] = var10 + 1; + var21 = var21 + 1 & 4095; + class178.directions[var19][var20 + 1] = 4; + class178.distances[var19][var20 + 1] = var17; + } + + if (var19 > 0 && var20 > 0 && class178.directions[var19 - 1][var20 - 1] == 0 && (var24[var15 - 1][var16 - 1] & 19136782) == 0 && (var24[var15 - 1][var16] & 19136776) == 0 && (var24[var15][var16 - 1] & 19136770) == 0) { + class178.bufferX[var21] = var9 - 1; + class178.bufferY[var21] = var10 - 1; + var21 = var21 + 1 & 4095; + class178.directions[var19 - 1][var20 - 1] = 3; + class178.distances[var19 - 1][var20 - 1] = var17; + } + + if (var19 < 127 && var20 > 0 && class178.directions[var19 + 1][var20 - 1] == 0 && (var24[var15 + 1][var16 - 1] & 19136899) == 0 && (var24[var15 + 1][var16] & 19136896) == 0 && (var24[var15][var16 - 1] & 19136770) == 0) { + class178.bufferX[var21] = var9 + 1; + class178.bufferY[var21] = var10 - 1; + var21 = var21 + 1 & 4095; + class178.directions[var19 + 1][var20 - 1] = 9; + class178.distances[var19 + 1][var20 - 1] = var17; + } + + if (var19 > 0 && var20 < 127 && class178.directions[var19 - 1][var20 + 1] == 0 && (var24[var15 - 1][var16 + 1] & 19136824) == 0 && (var24[var15 - 1][var16] & 19136776) == 0 && (var24[var15][var16 + 1] & 19136800) == 0) { + class178.bufferX[var21] = var9 - 1; + class178.bufferY[var21] = var10 + 1; + var21 = var21 + 1 & 4095; + class178.directions[var19 - 1][var20 + 1] = 6; + class178.distances[var19 - 1][var20 + 1] = var17; + } + + if (var19 < 127 && var20 < 127 && class178.directions[var19 + 1][var20 + 1] == 0 && (var24[var15 + 1][var16 + 1] & 19136992) == 0 && (var24[var15 + 1][var16] & 19136896) == 0 && (var24[var15][var16 + 1] & 19136800) == 0) { + class178.bufferX[var21] = var9 + 1; + class178.bufferY[var21] = var10 + 1; + var21 = var21 + 1 & 4095; + class178.directions[var19 + 1][var20 + 1] = 12; + class178.distances[var19 + 1][var20 + 1] = var17; + } } - 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; - } - - 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(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(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(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(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(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(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(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; - } + WidgetGroupParent.field986 = var9; + UrlRequester.field929 = var10; + var25 = false; } - found = var29; // Vars are weird above here cause that's an inlined method - } else if(srcSize == 2) { - found = WorldMapSection2.method593(srcX, srcY, strategy, collisionMap); + var18 = var25; + } else if (var2 == 2) { + var18 = WorldMapSection2.method593(var0, var1, var3, var4); } else { - found = IndexStore.method3585(srcX, srcY, srcSize, strategy, collisionMap); + var18 = IndexStore.method3585(var0, var1, var2, var3, var4); } - 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; + var8 = var0 - 64; + var9 = var1 - 64; + var10 = WidgetGroupParent.field986; + var19 = UrlRequester.field929; + if (!var18) { + var20 = Integer.MAX_VALUE; + var12 = Integer.MAX_VALUE; + var22 = 10; + var21 = var3.approxDestinationX; + var14 = var3.approxDestinationY; + int var29 = var3.approxDestinationSizeX; + var15 = var3.approxDestinationSizeY; - 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); + for (var16 = var21 - var22; var16 <= var22 + var21; ++var16) { + for (var17 = var14 - var22; var17 <= var14 + var22; ++var17) { + int var30 = var16 - var8; + int var31 = var17 - var9; + if (var30 >= 0 && var31 >= 0 && var30 < 128 && var31 < 128 && class178.distances[var30][var31] < 100) { + int var26 = 0; + if (var16 < var21) { + var26 = var21 - var16; + } else if (var16 > var29 + var21 - 1) { + var26 = var16 - (var29 + var21 - 1); } - int deltaY = 0; - if(checkY < approxDestY) { - deltaY = approxDestY - checkY; - } else if(checkY > approxDestSizeY + approxDestY - 1) { - deltaY = checkY - (approxDestSizeY + approxDestY - 1); + int var27 = 0; + if (var17 < var14) { + var27 = var14 - var17; + } else if (var17 > var15 + var14 - 1) { + var27 = var17 - (var15 + var14 - 1); } - 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; + int var28 = var27 * var27 + var26 * var26; + if (var28 < var20 || var28 == var20 && class178.distances[var30][var31] < var12) { + var20 = var28; + var12 = class178.distances[var30][var31]; + var10 = var16; + var19 = var17; } } } } - if(lowestCost == Integer.MAX_VALUE) { + if (var20 == Integer.MAX_VALUE) { return -1; } } - if(srcX == endX && endY == srcY) { + if (var0 == var10 && var19 == var1) { return 0; - } else { // Inlined again after this I think - var13 = 0; - class178.bufferX[var13] = endX; - lowestCost = var13 + 1; - class178.bufferY[var13] = endY; + } else { + var11 = 0; + class178.bufferX[var11] = var10; + var20 = var11 + 1; + class178.bufferY[var11] = var19; - 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; + for (var12 = var13 = class178.directions[var10 - var8][var19 - var9]; var0 != var10 || var19 != var1; var12 = class178.directions[var10 - var8][var19 - var9]) { + if (var12 != var13) { + var13 = var12; + class178.bufferX[var20] = var10; + class178.bufferY[var20++] = var19; } - if((lowestDistance & 2) != 0) { - ++endX; - } else if((lowestDistance & 8) != 0) { - --endX; + if ((var12 & 2) != 0) { + ++var10; + } else if ((var12 & 8) != 0) { + --var10; } - if((lowestDistance & 1) != 0) { - ++endY; - } else if((lowestDistance & 4) != 0) { - --endY; + if ((var12 & 1) != 0) { + ++var19; + } else if ((var12 & 4) != 0) { + --var19; } } - approxDestX = 0; + var21 = 0; - while(lowestCost-- > 0) { - bufferX[approxDestX] = class178.bufferX[lowestCost]; - bufferY[approxDestX++] = class178.bufferY[lowestCost]; - if(approxDestX >= bufferX.length) { + while (var20-- > 0) { + var6[var21] = class178.bufferX[var20]; + var7[var21++] = class178.bufferY[var20]; + if (var21 >= var6.length) { break; } } - return approxDestX; + return var21; } } @@ -538,9 +537,9 @@ public final class NetSocket extends AbstractSocket implements Runnable { garbageValue = "-590103687" ) public static boolean method3537(AbstractIndexCache var0, AbstractIndexCache var1, AbstractIndexCache var2, MidiPcmStream var3) { - class1.__f_m = var0; - class214.__hf_f = var1; - class214.__hf_q = var2; + class1.field1105 = var0; + class214.field1127 = var1; + class214.field1128 = var2; class214.midiPcmStream = var3; return true; } diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java index 56baec5554..938753e5bc 100644 --- a/runescape-client/src/main/java/Node.java +++ b/runescape-client/src/main/java/Node.java @@ -25,12 +25,13 @@ public class Node { @ObfuscatedName("es") @Export("remove") public void remove() { - if(this.next != null) { + if (this.next != null) { this.next.previous = this.previous; this.previous.next = this.next; this.previous = null; this.next = null; } + } @ObfuscatedName("eg") diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java index f2b7a54fbb..f6d54a2622 100644 --- a/runescape-client/src/main/java/NodeDeque.java +++ b/runescape-client/src/main/java/NodeDeque.java @@ -28,9 +28,9 @@ public class NodeDeque { @ObfuscatedName("m") @Export("clear") public void clear() { - while(true) { + while (true) { Node var1 = this.sentinel.previous; - if(var1 == this.sentinel) { + if (var1 == this.sentinel) { this.current = null; return; } @@ -45,7 +45,7 @@ public class NodeDeque { ) @Export("addFirst") public void addFirst(Node var1) { - if(var1.next != null) { + if (var1.next != null) { var1.remove(); } @@ -61,7 +61,7 @@ public class NodeDeque { ) @Export("addLast") public void addLast(Node var1) { - if(var1.next != null) { + if (var1.next != null) { var1.remove(); } @@ -78,7 +78,7 @@ public class NodeDeque { @Export("removeLast") public Node removeLast() { Node var1 = this.sentinel.previous; - if(var1 == this.sentinel) { + if (var1 == this.sentinel) { return null; } else { var1.remove(); @@ -93,7 +93,7 @@ public class NodeDeque { @Export("removeFirst") public Node removeFirst() { Node var1 = this.sentinel.next; - if(var1 == this.sentinel) { + if (var1 == this.sentinel) { return null; } else { var1.remove(); @@ -108,7 +108,7 @@ public class NodeDeque { @Export("last") public Node last() { Node var1 = this.sentinel.previous; - if(var1 == this.sentinel) { + if (var1 == this.sentinel) { this.current = null; return null; } else { @@ -124,7 +124,7 @@ public class NodeDeque { @Export("first") public Node first() { Node var1 = this.sentinel.next; - if(var1 == this.sentinel) { + if (var1 == this.sentinel) { this.current = null; return null; } else { @@ -140,7 +140,7 @@ public class NodeDeque { @Export("previous") public Node previous() { Node var1 = this.current; - if(var1 == this.sentinel) { + if (var1 == this.sentinel) { this.current = null; return null; } else { @@ -156,7 +156,7 @@ public class NodeDeque { @Export("next") public Node next() { Node var1 = this.current; - if(var1 == this.sentinel) { + if (var1 == this.sentinel) { this.current = null; return null; } else { @@ -170,7 +170,7 @@ public class NodeDeque { signature = "(Lgw;Lgw;)V" ) public static void method5270(Node var0, Node var1) { - if(var0.next != null) { + if (var0.next != null) { var0.remove(); } diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java index 2e4fcbf1bb..ae81442438 100644 --- a/runescape-client/src/main/java/NodeHashTable.java +++ b/runescape-client/src/main/java/NodeHashTable.java @@ -36,7 +36,7 @@ public final class NodeHashTable { this.size = var1; this.buckets = new Node[var1]; - for(int var2 = 0; var2 < var1; ++var2) { + for (int var2 = 0; var2 < var1; ++var2) { Node var3 = this.buckets[var2] = new Node(); var3.previous = var3; var3.next = var3; @@ -52,8 +52,8 @@ public final class NodeHashTable { public Node get(long var1) { Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; - for(this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { - if(this.currentGet.key == var1) { + for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { + if (this.currentGet.key == var1) { Node var4 = this.currentGet; this.currentGet = this.currentGet.previous; return var4; @@ -70,7 +70,7 @@ public final class NodeHashTable { ) @Export("put") public void put(Node var1, long var2) { - if(var1.next != null) { + if (var1.next != null) { var1.remove(); } @@ -85,12 +85,12 @@ public final class NodeHashTable { @ObfuscatedName("q") @Export("clear") public void clear() { - for(int var1 = 0; var1 < this.size; ++var1) { + for (int var1 = 0; var1 < this.size; ++var1) { Node var2 = this.buckets[var1]; - while(true) { + while (true) { Node var3 = var2.previous; - if(var3 == var2) { + if (var3 == var2) { break; } @@ -119,21 +119,20 @@ public final class NodeHashTable { @Export("next") public Node next() { Node var1; - if(this.index > 0 && this.buckets[this.index - 1] != this.current) { + if (this.index > 0 && this.buckets[this.index - 1] != this.current) { var1 = this.current; this.current = var1.previous; return var1; } else { - do { - if(this.index >= this.size) { - return null; - } - + while (this.index < this.size) { var1 = this.buckets[this.index++].previous; - } while(var1 == this.buckets[this.index - 1]); + if (var1 != this.buckets[this.index - 1]) { + this.current = var1.previous; + return var1; + } + } - this.current = var1.previous; - return var1; + return null; } } } diff --git a/runescape-client/src/main/java/Npc.java b/runescape-client/src/main/java/Npc.java index eb11180d3b..81857313b4 100644 --- a/runescape-client/src/main/java/Npc.java +++ b/runescape-client/src/main/java/Npc.java @@ -5,67 +5,67 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("cv") @Implements("NPC") -public final class Npc extends Actor { +public final class NPC extends Actor { @ObfuscatedName("m") @ObfuscatedSignature( signature = "Ljz;" ) @Export("definition") - NpcDefinition definition; + NPCDefinition definition; @ObfuscatedName("m") @ObfuscatedSignature( signature = "(IBI)V", garbageValue = "306250019" ) - final void __m_162(int var1, byte var2) { + final void method227(int var1, byte var2) { int var3 = super.pathX[0]; int var4 = super.pathY[0]; - if(var1 == 0) { + if (var1 == 0) { --var3; ++var4; } - if(var1 == 1) { + if (var1 == 1) { ++var4; } - if(var1 == 2) { + if (var1 == 2) { ++var3; ++var4; } - if(var1 == 3) { + if (var1 == 3) { --var3; } - if(var1 == 4) { + if (var1 == 4) { ++var3; } - if(var1 == 5) { + if (var1 == 5) { --var3; --var4; } - if(var1 == 6) { + if (var1 == 6) { --var4; } - if(var1 == 7) { + if (var1 == 7) { ++var3; --var4; } - if(super.sequence != -1 && WorldMapAreaData.getSequenceDefinition(super.sequence).__s == 1) { + if (super.sequence != -1 && WorldMapAreaData.getSequenceDefinition(super.sequence).field782 == 1) { super.sequence = -1; } - if(super.pathLength < 9) { + if (super.pathLength < 9) { ++super.pathLength; } - for(int var5 = super.pathLength; var5 > 0; --var5) { + for (int var5 = super.pathLength; var5 > 0; --var5) { super.pathX[var5] = super.pathX[var5 - 1]; super.pathY[var5] = super.pathY[var5 - 1]; super.pathTraversed[var5] = super.pathTraversed[var5 - 1]; @@ -81,20 +81,20 @@ public final class Npc extends Actor { signature = "(IIZI)V", garbageValue = "-1647134110" ) - final void __f_163(int var1, int var2, boolean var3) { - if(super.sequence != -1 && WorldMapAreaData.getSequenceDefinition(super.sequence).__s == 1) { + final void method228(int var1, int var2, boolean var3) { + if (super.sequence != -1 && WorldMapAreaData.getSequenceDefinition(super.sequence).field782 == 1) { super.sequence = -1; } - if(!var3) { + if (!var3) { int var4 = var1 - super.pathX[0]; int var5 = var2 - super.pathY[0]; - if(var4 >= -8 && var4 <= 8 && var5 >= -8 && var5 <= 8) { - if(super.pathLength < 9) { + if (var4 >= -8 && var4 <= 8 && var5 >= -8 && var5 <= 8) { + if (super.pathLength < 9) { ++super.pathLength; } - for(int var6 = super.pathLength; var6 > 0; --var6) { + for (int var6 = super.pathLength; var6 > 0; --var6) { super.pathX[var6] = super.pathX[var6 - 1]; super.pathY[var6] = super.pathY[var6 - 1]; super.pathTraversed[var6] = super.pathTraversed[var6 - 1]; @@ -108,8 +108,8 @@ public final class Npc extends Actor { } super.pathLength = 0; - super.__ch = 0; - super.__cq = 0; + super.field25 = 0; + super.field24 = 0; super.pathX[0] = var1; super.pathY[0] = var2; super.x = super.size * 64 + super.pathX[0] * 128; @@ -123,27 +123,27 @@ public final class Npc extends Actor { ) @Export("getModel") protected final Model getModel() { - if(this.definition == null) { + if (this.definition == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0?WorldMapAreaData.getSequenceDefinition(super.sequence):null; - SequenceDefinition var2 = super.movementSequence != -1 && (super.movementSequence != super.idleSequence || var1 == null)?WorldMapAreaData.getSequenceDefinition(super.movementSequence):null; + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapAreaData.getSequenceDefinition(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence == -1 || super.movementSequence == super.idleSequence && var1 != null ? null : WorldMapAreaData.getSequenceDefinition(super.movementSequence); Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); - if(var3 == null) { + if (var3 == null) { return null; } else { var3.calculateBoundsCylinder(); super.defaultHeight = var3.height; - if(super.spotAnimation != -1 && super.spotAnimationFrame != -1) { + if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { Model var4 = class50.getSpotAnimationDefinition(super.spotAnimation).getModel(super.spotAnimationFrame); - if(var4 != null) { + if (var4 != null) { var4.offsetBy(0, -super.heightOffset, 0); Model[] var5 = new Model[]{var3, var4}; var3 = new Model(var5, 2); } } - if(this.definition.size == 1) { + if (this.definition.size == 1) { var3.isSingleTile = true; } @@ -178,16 +178,16 @@ public final class Npc extends Actor { IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.addFirst(var3); } - Object var9 = IndexStoreActionHandler.IndexStoreActionHandler_lock; + Object var5 = IndexStoreActionHandler.IndexStoreActionHandler_lock; synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) { - if(IndexStoreActionHandler.__iv_q == 0) { + if (IndexStoreActionHandler.field412 == 0) { Frames.IndexStoreActionHandler_thread = new Thread(new IndexStoreActionHandler()); Frames.IndexStoreActionHandler_thread.setDaemon(true); Frames.IndexStoreActionHandler_thread.start(); Frames.IndexStoreActionHandler_thread.setPriority(5); } - IndexStoreActionHandler.__iv_q = 600; + IndexStoreActionHandler.field412 = 600; } } } diff --git a/runescape-client/src/main/java/NpcDefinition.java b/runescape-client/src/main/java/NpcDefinition.java index 8161c2cc1e..f62133beee 100644 --- a/runescape-client/src/main/java/NpcDefinition.java +++ b/runescape-client/src/main/java/NpcDefinition.java @@ -11,7 +11,7 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("jz") @Implements("NPCDefinition") -public class NpcDefinition extends DualNode { +public class NPCDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lir;" @@ -55,7 +55,7 @@ public class NpcDefinition extends DualNode { @Export("archives") int[] archives; @ObfuscatedName("e") - int[] __e; + int[] field636; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 275200787 @@ -141,12 +141,12 @@ public class NpcDefinition extends DualNode { @ObfuscatedGetter( intValue = -1235927151 ) - int __ag; + int field637; @ObfuscatedName("aq") @ObfuscatedGetter( intValue = 1962875903 ) - int __aq; + int field638; @ObfuscatedName("aj") @ObfuscatedGetter( intValue = 235824283 @@ -157,7 +157,7 @@ public class NpcDefinition extends DualNode { @ObfuscatedGetter( intValue = -506638747 ) - public int __av; + public int field639; @ObfuscatedName("ar") @Export("transforms") public int[] transforms; @@ -189,12 +189,7 @@ public class NpcDefinition extends DualNode { @Export("params") IterableNodeHashTable params; - static { - NpcDefinition_cached = new EvictingDualNodeHashTable(64); - NpcDefinition_cachedModels = new EvictingDualNodeHashTable(50); - } - - NpcDefinition() { + NPCDefinition() { this.name = "null"; this.size = 1; this.idleSequence = -1; @@ -210,10 +205,10 @@ public class NpcDefinition extends DualNode { this.widthScale = 128; this.heightScale = 128; this.isVisible = false; - this.__ag = 0; - this.__aq = 0; + this.field637 = 0; + this.field638 = 0; this.headIconPrayer = -1; - this.__av = 32; + this.field639 = 32; this.transformVarbit = -1; this.transformVarp = -1; this.isInteractable = true; @@ -237,9 +232,9 @@ public class NpcDefinition extends DualNode { ) @Export("read") void read(Buffer var1) { - while(true) { + while (true) { int var2 = var1.readUnsignedByte(); - if(var2 == 0) { + if (var2 == 0) { return; } @@ -256,103 +251,103 @@ public class NpcDefinition extends DualNode { void readNext(Buffer var1, int var2) { int var3; int var4; - if(var2 == 1) { + if (var2 == 1) { var3 = var1.readUnsignedByte(); this.archives = new int[var3]; - for(var4 = 0; var4 < var3; ++var4) { - this.archives[var4] = var1.__ag_302(); + for (var4 = 0; var4 < var3; ++var4) { + this.archives[var4] = var1.method43(); } - } else if(var2 == 2) { + } else if (var2 == 2) { this.name = var1.readStringCp1252NullTerminated(); - } else if(var2 == 12) { + } else if (var2 == 12) { this.size = var1.readUnsignedByte(); - } else if(var2 == 13) { - this.idleSequence = var1.__ag_302(); - } else if(var2 == 14) { - this.walkSequence = var1.__ag_302(); - } else if(var2 == 15) { - this.turnLeftSequence = var1.__ag_302(); - } else if(var2 == 16) { - this.turnRightSequence = var1.__ag_302(); - } else if(var2 == 17) { - this.walkSequence = var1.__ag_302(); - this.walkTurnSequence = var1.__ag_302(); - this.walkTurnLeftSequence = var1.__ag_302(); - this.walkTurnRightSequence = var1.__ag_302(); - } else if(var2 >= 30 && var2 < 35) { + } else if (var2 == 13) { + this.idleSequence = var1.method43(); + } else if (var2 == 14) { + this.walkSequence = var1.method43(); + } else if (var2 == 15) { + this.turnLeftSequence = var1.method43(); + } else if (var2 == 16) { + this.turnRightSequence = var1.method43(); + } else if (var2 == 17) { + this.walkSequence = var1.method43(); + this.walkTurnSequence = var1.method43(); + this.walkTurnLeftSequence = var1.method43(); + this.walkTurnRightSequence = var1.method43(); + } else if (var2 >= 30 && var2 < 35) { this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); - if(this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { + if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { this.actions[var2 - 30] = null; } - } else if(var2 == 40) { + } else if (var2 == 40) { var3 = var1.readUnsignedByte(); this.recolorFrom = new short[var3]; this.recolorTo = new short[var3]; - for(var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.__ag_302(); - this.recolorTo[var4] = (short)var1.__ag_302(); + for (var4 = 0; var4 < var3; ++var4) { + this.recolorFrom[var4] = (short)var1.method43(); + this.recolorTo[var4] = (short)var1.method43(); } - } else if(var2 == 41) { + } else if (var2 == 41) { var3 = var1.readUnsignedByte(); this.retextureFrom = new short[var3]; this.retextureTo = new short[var3]; - for(var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.__ag_302(); - this.retextureTo[var4] = (short)var1.__ag_302(); + for (var4 = 0; var4 < var3; ++var4) { + this.retextureFrom[var4] = (short)var1.method43(); + this.retextureTo[var4] = (short)var1.method43(); } - } else if(var2 == 60) { + } else if (var2 == 60) { var3 = var1.readUnsignedByte(); - this.__e = new int[var3]; + this.field636 = new int[var3]; - for(var4 = 0; var4 < var3; ++var4) { - this.__e[var4] = var1.__ag_302(); + for (var4 = 0; var4 < var3; ++var4) { + this.field636[var4] = var1.method43(); } - } else if(var2 == 93) { + } else if (var2 == 93) { this.drawMapDot = false; - } else if(var2 == 95) { - this.combatLevel = var1.__ag_302(); - } else if(var2 == 97) { - this.widthScale = var1.__ag_302(); - } else if(var2 == 98) { - this.heightScale = var1.__ag_302(); - } else if(var2 == 99) { + } else if (var2 == 95) { + this.combatLevel = var1.method43(); + } else if (var2 == 97) { + this.widthScale = var1.method43(); + } else if (var2 == 98) { + this.heightScale = var1.method43(); + } else if (var2 == 99) { this.isVisible = true; - } else if(var2 == 100) { - this.__ag = var1.readByte(); - } else if(var2 == 101) { - this.__aq = var1.readByte(); - } else if(var2 == 102) { - this.headIconPrayer = var1.__ag_302(); - } else if(var2 == 103) { - this.__av = var1.__ag_302(); - } else if(var2 != 106 && var2 != 118) { - if(var2 == 107) { + } else if (var2 == 100) { + this.field637 = var1.readByte(); + } else if (var2 == 101) { + this.field638 = var1.readByte(); + } else if (var2 == 102) { + this.headIconPrayer = var1.method43(); + } else if (var2 == 103) { + this.field639 = var1.method43(); + } else if (var2 != 106 && var2 != 118) { + if (var2 == 107) { this.isInteractable = false; - } else if(var2 == 109) { + } else if (var2 == 109) { this.isClickable = false; - } else if(var2 == 111) { + } else if (var2 == 111) { this.isFollower = true; - } else if(var2 == 249) { + } else if (var2 == 249) { this.params = AbstractIndexCache.readStringIntParameters(var1, this.params); } } else { - this.transformVarbit = var1.__ag_302(); - if(this.transformVarbit == 65535) { + this.transformVarbit = var1.method43(); + if (this.transformVarbit == 65535) { this.transformVarbit = -1; } - this.transformVarp = var1.__ag_302(); - if(this.transformVarp == 65535) { + this.transformVarp = var1.method43(); + if (this.transformVarp == 65535) { this.transformVarp = -1; } var3 = -1; - if(var2 == 118) { - var3 = var1.__ag_302(); - if(var3 == 65535) { + if (var2 == 118) { + var3 = var1.method43(); + if (var3 == 65535) { var3 = -1; } } @@ -360,9 +355,9 @@ public class NpcDefinition extends DualNode { var4 = var1.readUnsignedByte(); this.transforms = new int[var4 + 2]; - for(int var5 = 0; var5 <= var4; ++var5) { - this.transforms[var5] = var1.__ag_302(); - if(this.transforms[var5] == 65535) { + for (int var5 = 0; var5 <= var4; ++var5) { + this.transforms[var5] = var1.method43(); + if (this.transforms[var5] == 65535) { this.transforms[var5] = -1; } } @@ -379,66 +374,66 @@ public class NpcDefinition extends DualNode { ) @Export("getModel") public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { - if(this.transforms != null) { - NpcDefinition var12 = this.transform(); - return var12 == null?null:var12.getModel(var1, var2, var3, var4); + if (this.transforms != null) { + NPCDefinition var11 = this.transform(); + return var11 == null ? null : var11.getModel(var1, var2, var3, var4); } else { Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id); - if(var5 == null) { + if (var5 == null) { boolean var6 = false; - for(int var7 = 0; var7 < this.archives.length; ++var7) { - if(!NpcDefinition_modelIndexCache.tryLoadRecord(this.archives[var7], 0)) { + for (int var7 = 0; var7 < this.archives.length; ++var7) { + if (!NpcDefinition_modelIndexCache.tryLoadRecord(this.archives[var7], 0)) { var6 = true; } } - if(var6) { + if (var6) { return null; } - ModelData[] var8 = new ModelData[this.archives.length]; + ModelData[] var12 = new ModelData[this.archives.length]; - int var9; - for(var9 = 0; var9 < this.archives.length; ++var9) { - var8[var9] = ModelData.method2788(NpcDefinition_modelIndexCache, this.archives[var9], 0); + int var8; + for (var8 = 0; var8 < this.archives.length; ++var8) { + var12[var8] = ModelData.method2788(NpcDefinition_modelIndexCache, this.archives[var8], 0); } - ModelData var11; - if(var8.length == 1) { - var11 = var8[0]; + ModelData var9; + if (var12.length == 1) { + var9 = var12[0]; } else { - var11 = new ModelData(var8, var8.length); + var9 = new ModelData(var12, var12.length); } - if(this.recolorFrom != null) { - for(var9 = 0; var9 < this.recolorFrom.length; ++var9) { - var11.recolor(this.recolorFrom[var9], this.recolorTo[var9]); + if (this.recolorFrom != null) { + for (var8 = 0; var8 < this.recolorFrom.length; ++var8) { + var9.recolor(this.recolorFrom[var8], this.recolorTo[var8]); } } - if(this.retextureFrom != null) { - for(var9 = 0; var9 < this.retextureFrom.length; ++var9) { - var11.retexture(this.retextureFrom[var9], this.retextureTo[var9]); + if (this.retextureFrom != null) { + for (var8 = 0; var8 < this.retextureFrom.length; ++var8) { + var9.retexture(this.retextureFrom[var8], this.retextureTo[var8]); } } - var5 = var11.toModel(this.__ag + 64, this.__aq * 5 + 850, -30, -50, -30); + var5 = var9.toModel(this.field637 + 64, this.field638 * 5 + 850, -30, -50, -30); NpcDefinition_cachedModels.put(var5, (long)this.id); } Model var10; - if(var1 != null && var3 != null) { + if (var1 != null && var3 != null) { var10 = var1.animateSequence2(var5, var2, var3, var4); - } else if(var1 != null) { + } else if (var1 != null) { var10 = var1.animateSequence(var5, var2); - } else if(var3 != null) { + } else if (var3 != null) { var10 = var3.animateSequence(var5, var4); } else { var10 = var5.toSharedSequenceModel(true); } - if(this.widthScale != 128 || this.heightScale != 128) { + if (this.widthScale != 128 || this.heightScale != 128) { var10.scale(this.widthScale, this.heightScale, this.widthScale); } @@ -453,45 +448,45 @@ public class NpcDefinition extends DualNode { ) @Export("getModelData") public final ModelData getModelData() { - if(this.transforms != null) { - NpcDefinition var1 = this.transform(); - return var1 == null?null:var1.getModelData(); - } else if(this.__e == null) { + if (this.transforms != null) { + NPCDefinition var5 = this.transform(); + return var5 == null ? null : var5.getModelData(); + } else if (this.field636 == null) { return null; } else { - boolean var5 = false; + boolean var1 = false; - for(int var2 = 0; var2 < this.__e.length; ++var2) { - if(!NpcDefinition_modelIndexCache.tryLoadRecord(this.__e[var2], 0)) { - var5 = true; + for (int var2 = 0; var2 < this.field636.length; ++var2) { + if (!NpcDefinition_modelIndexCache.tryLoadRecord(this.field636[var2], 0)) { + var1 = true; } } - if(var5) { + if (var1) { return null; } else { - ModelData[] var6 = new ModelData[this.__e.length]; + ModelData[] var6 = new ModelData[this.field636.length]; - for(int var3 = 0; var3 < this.__e.length; ++var3) { - var6[var3] = ModelData.method2788(NpcDefinition_modelIndexCache, this.__e[var3], 0); + for (int var3 = 0; var3 < this.field636.length; ++var3) { + var6[var3] = ModelData.method2788(NpcDefinition_modelIndexCache, this.field636[var3], 0); } ModelData var7; - if(var6.length == 1) { + if (var6.length == 1) { var7 = var6[0]; } else { var7 = new ModelData(var6, var6.length); } int var4; - if(this.recolorFrom != null) { - for(var4 = 0; var4 < this.recolorFrom.length; ++var4) { + if (this.recolorFrom != null) { + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { var7.recolor(this.recolorFrom[var4], this.recolorTo[var4]); } } - if(this.retextureFrom != null) { - for(var4 = 0; var4 < this.retextureFrom.length; ++var4) { + if (this.retextureFrom != null) { + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { var7.retexture(this.retextureFrom[var4], this.retextureTo[var4]); } } @@ -507,22 +502,22 @@ public class NpcDefinition extends DualNode { garbageValue = "-113" ) @Export("transform") - public final NpcDefinition transform() { + public final NPCDefinition transform() { int var1 = -1; - if(this.transformVarbit != -1) { + if (this.transformVarbit != -1) { var1 = WorldMapSection2.getVarbit(this.transformVarbit); - } else if(this.transformVarp != -1) { + } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } int var2; - if(var1 >= 0 && var1 < this.transforms.length - 1) { + if (var1 >= 0 && var1 < this.transforms.length - 1) { var2 = this.transforms[var1]; } else { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1?ObjectDefinition.getNpcDefinition(var2):null; + return var2 != -1 ? ObjectDefinition.getNpcDefinition(var2) : null; } @ObfuscatedName("e") @@ -530,18 +525,18 @@ public class NpcDefinition extends DualNode { signature = "(I)Z", garbageValue = "853540088" ) - public boolean __e_435() { - if(this.transforms == null) { + public boolean method229() { + if (this.transforms == null) { return true; } else { int var1 = -1; - if(this.transformVarbit != -1) { + if (this.transformVarbit != -1) { var1 = WorldMapSection2.getVarbit(this.transformVarbit); - } else if(this.transformVarp != -1) { + } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } - return var1 >= 0 && var1 < this.transforms.length?this.transforms[var1] != -1:this.transforms[this.transforms.length - 1] != -1; + return var1 >= 0 && var1 < this.transforms.length ? this.transforms[var1] != -1 : this.transforms[this.transforms.length - 1] != -1; } } @@ -552,20 +547,20 @@ public class NpcDefinition extends DualNode { ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; - int var3; - if(var4 == null) { - var3 = var2; + IterableNodeHashTable var3 = this.params; + int var4; + if (var3 == null) { + var4 = var2; } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); - if(var5 == null) { - var3 = var2; + IntegerNode var5 = (IntegerNode)var3.get((long)var1); + if (var5 == null) { + var4 = var2; } else { - var3 = var5.integer; + var4 = var5.integer; } } - return var3; + return var4; } @ObfuscatedName("d") @@ -585,17 +580,17 @@ public class NpcDefinition extends DualNode { ) @Export("sendStackTrace") public static void sendStackTrace(String var0, Throwable var1) { - if(var1 != null) { + if (var1 != null) { var1.printStackTrace(); } else { try { String var2 = ""; - if(var1 != null) { + if (var1 != null) { var2 = Canvas.method860(var1); } - if(var0 != null) { - if(var1 != null) { + if (var0 != null) { + if (var1 != null) { var2 = var2 + " | "; } @@ -607,19 +602,18 @@ public class NpcDefinition extends DualNode { var2 = var2.replace('@', '_'); var2 = var2.replace('&', '_'); var2 = var2.replace('#', '_'); - if(RunException.applet == null) { + if (RunException.applet == null) { return; } - URL var3 = new URL(RunException.applet.getCodeBase(), "clienterror.ws?c=" + RunException.revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.__fx_w + "&e=" + var2); + URL var3 = new URL(RunException.applet.getCodeBase(), "clienterror.ws?c=" + RunException.revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.field761 + "&e=" + var2); DataInputStream var4 = new DataInputStream(var3.openStream()); var4.read(); var4.close(); } catch (Exception var5) { - ; } - } + } @ObfuscatedName("e") @@ -629,15 +623,15 @@ public class NpcDefinition extends DualNode { ) static final boolean method5164(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { int var7 = ViewportMouse.ViewportMouse_y + var6; - if(var7 < var0 && var7 < var1 && var7 < var2) { + if (var7 < var0 && var7 < var1 && var7 < var2) { return false; } else { var7 = ViewportMouse.ViewportMouse_y - var6; - if(var7 > var0 && var7 > var1 && var7 > var2) { + if (var7 > var0 && var7 > var1 && var7 > var2) { return false; } else { var7 = ViewportMouse.ViewportMouse_x + var6; - if(var7 < var3 && var7 < var4 && var7 < var5) { + if (var7 < var3 && var7 < var4 && var7 < var5) { return false; } else { var7 = ViewportMouse.ViewportMouse_x - var6; @@ -654,52 +648,52 @@ public class NpcDefinition extends DualNode { ) static void method5162() { Login.Login_username = Login.Login_username.trim(); - if(Login.Login_username.length() == 0) { + if (Login.Login_username.length() == 0) { class54.method1089("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); } else { - long var1; + long var0; try { - URL var3 = new URL(Message.method1227("services", false) + "m=accountappeal/login.ws"); - URLConnection var4 = var3.openConnection(); - var4.setRequestProperty("connection", "close"); - var4.setDoInput(true); - var4.setDoOutput(true); - var4.setConnectTimeout(5000); - OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream()); - var5.write("data1=req"); - var5.flush(); - InputStream var6 = var4.getInputStream(); - Buffer var7 = new Buffer(new byte[1000]); + URL var2 = new URL(Message.method1227("services", false) + "m=accountappeal/login.ws"); + URLConnection var3 = var2.openConnection(); + var3.setRequestProperty("connection", "close"); + var3.setDoInput(true); + var3.setDoOutput(true); + var3.setConnectTimeout(5000); + OutputStreamWriter var4 = new OutputStreamWriter(var3.getOutputStream()); + var4.write("data1=req"); + var4.flush(); + InputStream var5 = var3.getInputStream(); + Buffer var6 = new Buffer(new byte[1000]); - while(true) { - int var8 = var6.read(var7.array, var7.index, 1000 - var7.index); - if(var8 == -1) { - var7.index = 0; - long var10 = var7.readLong(); - var1 = var10; + while (true) { + int var7 = var5.read(var6.array, var6.index, 1000 - var6.index); + if (var7 == -1) { + var6.index = 0; + long var8 = var6.readLong(); + var0 = var8; break; } - var7.index += var8; - if(var7.index >= 1000) { - var1 = 0L; + var6.index += var7; + if (var6.index >= 1000) { + var0 = 0L; break; } } - } catch (Exception var14) { - var1 = 0L; + } catch (Exception var10) { + var0 = 0L; } - int var0; - if(var1 == 0L) { - var0 = 5; + int var11; + if (var0 == 0L) { + var11 = 5; } else { - var0 = LoginScreenAnimation.method1778(var1, Login.Login_username); + var11 = LoginScreenAnimation.method1778(var0, Login.Login_username); } - switch(var0) { + switch(var11) { case 2: - class54.method1089(Strings.__id_jr, Strings.__id_jv, Strings.__id_ju); + class54.method1089(Strings.field882, Strings.field883, Strings.field884); Login.loginIndex = 6; break; case 3: @@ -717,8 +711,8 @@ public class NpcDefinition extends DualNode { case 7: class54.method1089("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); } - } + } @ObfuscatedName("kw") @@ -729,9 +723,9 @@ public class NpcDefinition extends DualNode { static String method5161(String var0) { PlayerType[] var1 = class48.method865(); - for(int var2 = 0; var2 < var1.length; ++var2) { + for (int var2 = 0; var2 < var1.length; ++var2) { PlayerType var3 = var1[var2]; - if(var3.modIcon != -1 && var0.startsWith(ItemContainer.method1170(var3.modIcon))) { + if (var3.modIcon != -1 && var0.startsWith(ItemContainer.method1170(var3.modIcon))) { var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); break; } @@ -739,4 +733,9 @@ public class NpcDefinition extends DualNode { return var0; } + + static { + NpcDefinition_cached = new EvictingDualNodeHashTable(64); + NpcDefinition_cachedModels = new EvictingDualNodeHashTable(50); + } } diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index 0599790b68..546c84679e 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -20,7 +20,7 @@ public class ObjectDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - static AbstractIndexCache __jr_q; + static AbstractIndexCache field640; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Ler;" @@ -31,12 +31,12 @@ public class ObjectDefinition extends DualNode { @ObfuscatedSignature( signature = "Ler;" ) - public static EvictingDualNodeHashTable __jr_o; + public static EvictingDualNodeHashTable field641; @ObfuscatedName("u") @ObfuscatedSignature( signature = "Ler;" ) - static EvictingDualNodeHashTable __jr_u; + static EvictingDualNodeHashTable field642; @ObfuscatedName("g") @ObfuscatedSignature( signature = "Ler;" @@ -47,7 +47,7 @@ public class ObjectDefinition extends DualNode { @ObfuscatedSignature( signature = "[Ldw;" ) - static ModelData[] __jr_l; + static ModelData[] field643; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -2034835389 @@ -55,9 +55,9 @@ public class ObjectDefinition extends DualNode { @Export("id") public int id; @ObfuscatedName("x") - int[] __x; + int[] field644; @ObfuscatedName("d") - int[] __d; + int[] field645; @ObfuscatedName("k") @Export("name") public String name; @@ -245,7 +245,7 @@ public class ObjectDefinition extends DualNode { @Export("int6") public int int6; @ObfuscatedName("ax") - public int[] __ax; + public int[] field646; @ObfuscatedName("af") @ObfuscatedSignature( signature = "Llh;" @@ -253,15 +253,6 @@ public class ObjectDefinition extends DualNode { @Export("params") IterableNodeHashTable params; - static { - ObjectDefinition_isLowDetail = false; - ObjectDefinition_cached = new EvictingDualNodeHashTable(4096); - __jr_o = new EvictingDualNodeHashTable(500); - __jr_u = new EvictingDualNodeHashTable(30); - ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); - __jr_l = new ModelData[4]; - } - ObjectDefinition() { this.name = "null"; this.sizeX = 1; @@ -305,21 +296,21 @@ public class ObjectDefinition extends DualNode { ) @Export("init") void init() { - if(this.int1 == -1) { + if (this.int1 == -1) { this.int1 = 0; - if(this.__x != null && (this.__d == null || this.__d[0] == 10)) { + if (this.field644 != null && (this.field645 == null || this.field645[0] == 10)) { this.int1 = 1; } - for(int var1 = 0; var1 < 5; ++var1) { - if(this.actions[var1] != null) { + for (int var1 = 0; var1 < 5; ++var1) { + if (this.actions[var1] != null) { this.int1 = 1; } } } - if(this.int3 == -1) { - this.int3 = this.interactType != 0?1:0; + if (this.int3 == -1) { + this.int3 = this.interactType != 0 ? 1 : 0; } } @@ -331,9 +322,9 @@ public class ObjectDefinition extends DualNode { ) @Export("read") void read(Buffer var1) { - while(true) { + while (true) { int var2 = var1.readUnsignedByte(); - if(var2 == 0) { + if (var2 == 0) { return; } @@ -350,152 +341,152 @@ public class ObjectDefinition extends DualNode { void readNext(Buffer var1, int var2) { int var3; int var4; - if(var2 == 1) { + if (var2 == 1) { var3 = var1.readUnsignedByte(); - if(var3 > 0) { - if(this.__x != null && !ObjectDefinition_isLowDetail) { + if (var3 > 0) { + if (this.field644 != null && !ObjectDefinition_isLowDetail) { var1.index += var3 * 3; } else { - this.__d = new int[var3]; - this.__x = new int[var3]; + this.field645 = new int[var3]; + this.field644 = new int[var3]; - for(var4 = 0; var4 < var3; ++var4) { - this.__x[var4] = var1.__ag_302(); - this.__d[var4] = var1.readUnsignedByte(); + for (var4 = 0; var4 < var3; ++var4) { + this.field644[var4] = var1.method43(); + this.field645[var4] = var1.readUnsignedByte(); } } } - } else if(var2 == 2) { + } else if (var2 == 2) { this.name = var1.readStringCp1252NullTerminated(); - } else if(var2 == 5) { + } else if (var2 == 5) { var3 = var1.readUnsignedByte(); - if(var3 > 0) { - if(this.__x != null && !ObjectDefinition_isLowDetail) { + if (var3 > 0) { + if (this.field644 != null && !ObjectDefinition_isLowDetail) { var1.index += var3 * 2; } else { - this.__d = null; - this.__x = new int[var3]; + this.field645 = null; + this.field644 = new int[var3]; - for(var4 = 0; var4 < var3; ++var4) { - this.__x[var4] = var1.__ag_302(); + for (var4 = 0; var4 < var3; ++var4) { + this.field644[var4] = var1.method43(); } } } - } else if(var2 == 14) { + } else if (var2 == 14) { this.sizeX = var1.readUnsignedByte(); - } else if(var2 == 15) { + } else if (var2 == 15) { this.sizeY = var1.readUnsignedByte(); - } else if(var2 == 17) { + } else if (var2 == 17) { this.interactType = 0; this.boolean1 = false; - } else if(var2 == 18) { + } else if (var2 == 18) { this.boolean1 = false; - } else if(var2 == 19) { + } else if (var2 == 19) { this.int1 = var1.readUnsignedByte(); - } else if(var2 == 21) { + } else if (var2 == 21) { this.clipType = 0; - } else if(var2 == 22) { + } else if (var2 == 22) { this.nonFlatShading = true; - } else if(var2 == 23) { + } else if (var2 == 23) { this.modelClipped = true; - } else if(var2 == 24) { - this.animationId = var1.__ag_302(); - if(this.animationId == 65535) { + } else if (var2 == 24) { + this.animationId = var1.method43(); + if (this.animationId == 65535) { this.animationId = -1; } - } else if(var2 == 27) { + } else if (var2 == 27) { this.interactType = 1; - } else if(var2 == 28) { + } else if (var2 == 28) { this.int2 = var1.readUnsignedByte(); - } else if(var2 == 29) { + } else if (var2 == 29) { this.ambient = var1.readByte(); - } else if(var2 == 39) { + } else if (var2 == 39) { this.contrast = var1.readByte() * 25; - } else if(var2 >= 30 && var2 < 35) { + } else if (var2 >= 30 && var2 < 35) { this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); - if(this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { + if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { this.actions[var2 - 30] = null; } - } else if(var2 == 40) { + } else if (var2 == 40) { var3 = var1.readUnsignedByte(); this.recolorFrom = new short[var3]; this.recolorTo = new short[var3]; - for(var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.__ag_302(); - this.recolorTo[var4] = (short)var1.__ag_302(); + for (var4 = 0; var4 < var3; ++var4) { + this.recolorFrom[var4] = (short)var1.method43(); + this.recolorTo[var4] = (short)var1.method43(); } - } else if(var2 == 41) { + } else if (var2 == 41) { var3 = var1.readUnsignedByte(); this.retextureFrom = new short[var3]; this.retextureTo = new short[var3]; - for(var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.__ag_302(); - this.retextureTo[var4] = (short)var1.__ag_302(); + for (var4 = 0; var4 < var3; ++var4) { + this.retextureFrom[var4] = (short)var1.method43(); + this.retextureTo[var4] = (short)var1.method43(); } - } else if(var2 == 62) { + } else if (var2 == 62) { this.isRotated = true; - } else if(var2 == 64) { + } else if (var2 == 64) { this.clipped = false; - } else if(var2 == 65) { - this.modelSizeX = var1.__ag_302(); - } else if(var2 == 66) { - this.modelHeight = var1.__ag_302(); - } else if(var2 == 67) { - this.modelSizeY = var1.__ag_302(); - } else if(var2 == 68) { - this.mapSceneId = var1.__ag_302(); - } else if(var2 == 69) { + } else if (var2 == 65) { + this.modelSizeX = var1.method43(); + } else if (var2 == 66) { + this.modelHeight = var1.method43(); + } else if (var2 == 67) { + this.modelSizeY = var1.method43(); + } else if (var2 == 68) { + this.mapSceneId = var1.method43(); + } else if (var2 == 69) { var1.readUnsignedByte(); - } else if(var2 == 70) { - this.offsetX = var1.__aq_303(); - } else if(var2 == 71) { - this.offsetHeight = var1.__aq_303(); - } else if(var2 == 72) { - this.offsetY = var1.__aq_303(); - } else if(var2 == 73) { + } else if (var2 == 70) { + this.offsetX = var1.method44(); + } else if (var2 == 71) { + this.offsetHeight = var1.method44(); + } else if (var2 == 72) { + this.offsetY = var1.method44(); + } else if (var2 == 73) { this.boolean2 = true; - } else if(var2 == 74) { + } else if (var2 == 74) { this.isSolid = true; - } else if(var2 == 75) { + } else if (var2 == 75) { this.int3 = var1.readUnsignedByte(); - } else if(var2 != 77 && var2 != 92) { - if(var2 == 78) { - this.ambientSoundId = var1.__ag_302(); + } else if (var2 != 77 && var2 != 92) { + if (var2 == 78) { + this.ambientSoundId = var1.method43(); this.int4 = var1.readUnsignedByte(); - } else if(var2 == 79) { - this.int5 = var1.__ag_302(); - this.int6 = var1.__ag_302(); + } else if (var2 == 79) { + this.int5 = var1.method43(); + this.int6 = var1.method43(); this.int4 = var1.readUnsignedByte(); var3 = var1.readUnsignedByte(); - this.__ax = new int[var3]; + this.field646 = new int[var3]; - for(var4 = 0; var4 < var3; ++var4) { - this.__ax[var4] = var1.__ag_302(); + for (var4 = 0; var4 < var3; ++var4) { + this.field646[var4] = var1.method43(); } - } else if(var2 == 81) { + } else if (var2 == 81) { this.clipType = var1.readUnsignedByte() * 256; - } else if(var2 == 82) { - this.mapIconId = var1.__ag_302(); - } else if(var2 == 249) { + } else if (var2 == 82) { + this.mapIconId = var1.method43(); + } else if (var2 == 249) { this.params = AbstractIndexCache.readStringIntParameters(var1, this.params); } } else { - this.transformVarbit = var1.__ag_302(); - if(this.transformVarbit == 65535) { + this.transformVarbit = var1.method43(); + if (this.transformVarbit == 65535) { this.transformVarbit = -1; } - this.transformConfigId = var1.__ag_302(); - if(this.transformConfigId == 65535) { + this.transformConfigId = var1.method43(); + if (this.transformConfigId == 65535) { this.transformConfigId = -1; } var3 = -1; - if(var2 == 92) { - var3 = var1.__ag_302(); - if(var3 == 65535) { + if (var2 == 92) { + var3 = var1.method43(); + if (var3 == 65535) { var3 = -1; } } @@ -503,9 +494,9 @@ public class ObjectDefinition extends DualNode { var4 = var1.readUnsignedByte(); this.transforms = new int[var4 + 2]; - for(int var5 = 0; var5 <= var4; ++var5) { - this.transforms[var5] = var1.__ag_302(); - if(this.transforms[var5] == 65535) { + for (int var5 = 0; var5 <= var4; ++var5) { + this.transforms[var5] = var1.method43(); + if (this.transforms[var5] == 65535) { this.transforms[var5] = -1; } } @@ -520,24 +511,24 @@ public class ObjectDefinition extends DualNode { signature = "(II)Z", garbageValue = "1880172029" ) - public final boolean __u_421(int var1) { - if(this.__d != null) { - for(int var4 = 0; var4 < this.__d.length; ++var4) { - if(this.__d[var4] == var1) { - return __jr_q.tryLoadRecord(this.__x[var4] & 65535, 0); + public final boolean method230(int var1) { + if (this.field645 != null) { + for (int var4 = 0; var4 < this.field645.length; ++var4) { + if (this.field645[var4] == var1) { + return field640.tryLoadRecord(this.field644[var4] & 65535, 0); } } return true; - } else if(this.__x == null) { + } else if (this.field644 == null) { return true; - } else if(var1 != 10) { + } else if (var1 != 10) { return true; } else { boolean var2 = true; - for(int var3 = 0; var3 < this.__x.length; ++var3) { - var2 &= __jr_q.tryLoadRecord(this.__x[var3] & 65535, 0); + for (int var3 = 0; var3 < this.field644.length; ++var3) { + var2 &= field640.tryLoadRecord(this.field644[var3] & 65535, 0); } return var2; @@ -549,14 +540,14 @@ public class ObjectDefinition extends DualNode { signature = "(I)Z", garbageValue = "-666846742" ) - public final boolean __g_422() { - if(this.__x == null) { + public final boolean method231() { + if (this.field644 == null) { return true; } else { boolean var1 = true; - for(int var2 = 0; var2 < this.__x.length; ++var2) { - var1 &= __jr_q.tryLoadRecord(this.__x[var2] & 65535, 0); + for (int var2 = 0; var2 < this.field644.length; ++var2) { + var1 &= field640.tryLoadRecord(this.field644[var2] & 65535, 0); } return var1; @@ -568,42 +559,42 @@ public class ObjectDefinition extends DualNode { signature = "(II[[IIIIS)Lex;", garbageValue = "-27831" ) - public final Entity __l_423(int var1, int var2, int[][] var3, int var4, int var5, int var6) { + public final Entity method232(int var1, int var2, int[][] var3, int var4, int var5, int var6) { long var7; - if(this.__d == null) { + if (this.field645 == null) { var7 = (long)(var2 + (this.id << 10)); } else { var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); } - Object var9 = (Entity)__jr_u.get(var7); - if(var9 == null) { + Object var9 = (Entity)field642.get(var7); + if (var9 == null) { ModelData var10 = this.getModelData(var1, var2); - if(var10 == null) { + if (var10 == null) { return null; } - if(!this.nonFlatShading) { + if (!this.nonFlatShading) { var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); } else { - var10.__aq = (short)(this.ambient + 64); - var10.__aj = (short)(this.contrast + 768); - var10.__h_228(); + var10.field559 = (short)(this.ambient + 64); + var10.field560 = (short)(this.contrast + 768); + var10.method216(); var9 = var10; } - __jr_u.put((DualNode)var9, var7); + field642.put((DualNode)var9, var7); } - if(this.nonFlatShading) { - var9 = ((ModelData)var9).__o_218(); + if (this.nonFlatShading) { + var9 = ((ModelData)var9).method206(); } - if(this.clipType >= 0) { - if(var9 instanceof Model) { + if (this.clipType >= 0) { + if (var9 instanceof Model) { var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType); - } else if(var9 instanceof ModelData) { - var9 = ((ModelData)var9).__u_219(var3, var4, var5, var6, true, this.clipType); + } else if (var9 instanceof ModelData) { + var9 = ((ModelData)var9).method207(var3, var4, var5, var6, true, this.clipType); } } @@ -618,16 +609,16 @@ public class ObjectDefinition extends DualNode { @Export("getModel") public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { long var7; - if(this.__d == null) { + if (this.field645 == null) { var7 = (long)(var2 + (this.id << 10)); } else { var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); } Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); - if(var9 == null) { + if (var9 == null) { ModelData var10 = this.getModelData(var1, var2); - if(var10 == null) { + if (var10 == null) { return null; } @@ -635,7 +626,7 @@ public class ObjectDefinition extends DualNode { ObjectDefinition_cachedModels.put(var9, var7); } - if(this.clipType >= 0) { + if (this.clipType >= 0) { var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType); } @@ -650,16 +641,16 @@ public class ObjectDefinition extends DualNode { @Export("getModelDynamic") public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) { long var9; - if(this.__d == null) { + if (this.field645 == null) { var9 = (long)(var2 + (this.id << 10)); } else { var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); } Model var11 = (Model)ObjectDefinition_cachedModels.get(var9); - if(var11 == null) { + if (var11 == null) { ModelData var12 = this.getModelData(var1, var2); - if(var12 == null) { + if (var12 == null) { return null; } @@ -667,16 +658,16 @@ public class ObjectDefinition extends DualNode { ObjectDefinition_cachedModels.put(var11, var9); } - if(var7 == null && this.clipType == -1) { + if (var7 == null && this.clipType == -1) { return var11; } else { - if(var7 != null) { + if (var7 != null) { var11 = var7.animateObject(var11, var8, var2); } else { var11 = var11.toSharedSequenceModel(true); } - if(this.clipType >= 0) { + if (this.clipType >= 0) { var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType); } @@ -694,135 +685,136 @@ public class ObjectDefinition extends DualNode { ModelData var3 = null; boolean var4; int var5; + int var6; int var7; - if(this.__d == null) { - if(var1 != 10) { + if (this.field645 == null) { + if (var1 != 10) { return null; } - if(this.__x == null) { + if (this.field644 == null) { return null; } var4 = this.isRotated; - if(var1 == 2 && var2 > 3) { + if (var1 == 2 && var2 > 3) { var4 = !var4; } - var5 = this.__x.length; + var5 = this.field644.length; - for(int var6 = 0; var6 < var5; ++var6) { - var7 = this.__x[var6]; - if(var4) { - var7 += 65536; + for (var7 = 0; var7 < var5; ++var7) { + var6 = this.field644[var7]; + if (var4) { + var6 += 65536; } - var3 = (ModelData)__jr_o.get((long)var7); - if(var3 == null) { - var3 = ModelData.method2788(__jr_q, var7 & 65535, 0); - if(var3 == null) { + var3 = (ModelData)field641.get((long)var6); + if (var3 == null) { + var3 = ModelData.method2788(field640, var6 & 65535, 0); + if (var3 == null) { return null; } - if(var4) { - var3.__t_226(); + if (var4) { + var3.method214(); } - __jr_o.put(var3, (long)var7); + field641.put(var3, (long)var6); } - if(var5 > 1) { - __jr_l[var6] = var3; + if (var5 > 1) { + field643[var7] = var3; } } - if(var5 > 1) { - var3 = new ModelData(__jr_l, var5); + if (var5 > 1) { + var3 = new ModelData(field643, var5); } } else { - int var9 = -1; + var7 = -1; - for(var5 = 0; var5 < this.__d.length; ++var5) { - if(this.__d[var5] == var1) { - var9 = var5; + for (var5 = 0; var5 < this.field645.length; ++var5) { + if (this.field645[var5] == var1) { + var7 = var5; break; } } - if(var9 == -1) { + if (var7 == -1) { return null; } - var5 = this.__x[var9]; - boolean var10 = this.isRotated ^ var2 > 3; - if(var10) { + var5 = this.field644[var7]; + boolean var8 = this.isRotated ^ var2 > 3; + if (var8) { var5 += 65536; } - var3 = (ModelData)__jr_o.get((long)var5); - if(var3 == null) { - var3 = ModelData.method2788(__jr_q, var5 & 65535, 0); - if(var3 == null) { + var3 = (ModelData)field641.get((long)var5); + if (var3 == null) { + var3 = ModelData.method2788(field640, var5 & 65535, 0); + if (var3 == null) { return null; } - if(var10) { - var3.__t_226(); + if (var8) { + var3.method214(); } - __jr_o.put(var3, (long)var5); + field641.put(var3, (long)var5); } } - if(this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) { + if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) { var4 = false; } else { var4 = true; } - boolean var11; - if(this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { - var11 = false; + boolean var10; + if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { + var10 = false; } else { - var11 = true; + var10 = true; } - ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, null == this.retextureFrom, true); - if(var1 == 4 && var2 > 3) { - var8.__a_224(256); - var8.__z_225(45, 0, -45); + ModelData var9 = new ModelData(var3, var2 == 0 && !var4 && !var10, this.recolorFrom == null, null == this.retextureFrom, true); + if (var1 == 4 && var2 > 3) { + var9.method212(256); + var9.method213(45, 0, -45); } var2 &= 3; - if(var2 == 1) { - var8.__l_221(); - } else if(var2 == 2) { - var8.__x_222(); - } else if(var2 == 3) { - var8.__d_223(); + if (var2 == 1) { + var9.method209(); + } else if (var2 == 2) { + var9.method210(); + } else if (var2 == 3) { + var9.method211(); } - if(this.recolorFrom != null) { - for(var7 = 0; var7 < this.recolorFrom.length; ++var7) { - var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]); + if (this.recolorFrom != null) { + for (var6 = 0; var6 < this.recolorFrom.length; ++var6) { + var9.recolor(this.recolorFrom[var6], this.recolorTo[var6]); } } - if(this.retextureFrom != null) { - for(var7 = 0; var7 < this.retextureFrom.length; ++var7) { - var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]); + if (this.retextureFrom != null) { + for (var6 = 0; var6 < this.retextureFrom.length; ++var6) { + var9.retexture(this.retextureFrom[var6], this.retextureTo[var6]); } } - if(var4) { - var8.__y_227(this.modelSizeX, this.modelHeight, this.modelSizeY); + if (var4) { + var9.method215(this.modelSizeX, this.modelHeight, this.modelSizeY); } - if(var11) { - var8.__z_225(this.offsetX, this.offsetHeight, this.offsetY); + if (var10) { + var9.method213(this.offsetX, this.offsetHeight, this.offsetY); } - return var8; + return var9; } @ObfuscatedName("a") @@ -833,20 +825,20 @@ public class ObjectDefinition extends DualNode { @Export("transform") public final ObjectDefinition transform() { int var1 = -1; - if(this.transformVarbit != -1) { + if (this.transformVarbit != -1) { var1 = WorldMapSection2.getVarbit(this.transformVarbit); - } else if(this.transformConfigId != -1) { + } else if (this.transformConfigId != -1) { var1 = Varps.Varps_main[this.transformConfigId]; } int var2; - if(var1 >= 0 && var1 < this.transforms.length - 1) { + if (var1 >= 0 && var1 < this.transforms.length - 1) { var2 = this.transforms[var1]; } else { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1?class50.getObjectDefinition(var2):null; + return var2 != -1 ? class50.getObjectDefinition(var2) : null; } @ObfuscatedName("z") @@ -856,20 +848,20 @@ public class ObjectDefinition extends DualNode { ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; - int var3; - if(var4 == null) { - var3 = var2; + IterableNodeHashTable var3 = this.params; + int var4; + if (var3 == null) { + var4 = var2; } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); - if(var5 == null) { - var3 = var2; + IntegerNode var5 = (IntegerNode)var3.get((long)var1); + if (var5 == null) { + var4 = var2; } else { - var3 = var5.integer; + var4 = var5.integer; } } - return var3; + return var4; } @ObfuscatedName("j") @@ -887,14 +879,14 @@ public class ObjectDefinition extends DualNode { signature = "(I)Z", garbageValue = "8470625" ) - public boolean __t_424() { - if(this.transforms == null) { - return this.ambientSoundId != -1 || this.__ax != null; + public boolean method233() { + if (this.transforms == null) { + return this.ambientSoundId != -1 || this.field646 != null; } else { - for(int var1 = 0; var1 < this.transforms.length; ++var1) { - if(this.transforms[var1] != -1) { + for (int var1 = 0; var1 < this.transforms.length; ++var1) { + if (this.transforms[var1] != -1) { ObjectDefinition var2 = class50.getObjectDefinition(this.transforms[var1]); - if(var2.ambientSoundId != -1 || var2.__ax != null) { + if (var2.ambientSoundId != -1 || var2.field646 != null) { return true; } } @@ -910,20 +902,20 @@ public class ObjectDefinition extends DualNode { garbageValue = "-1284680749" ) @Export("getNpcDefinition") - public static NpcDefinition getNpcDefinition(int var0) { - NpcDefinition var1 = (NpcDefinition)NpcDefinition.NpcDefinition_cached.get((long)var0); - if(var1 != null) { + public static NPCDefinition getNpcDefinition(int var0) { + NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0); + if (var1 != null) { return var1; } else { - byte[] var2 = NpcDefinition.NpcDefinition_indexCache.takeRecord(9, var0); - var1 = new NpcDefinition(); + byte[] var2 = NPCDefinition.NpcDefinition_indexCache.takeRecord(9, var0); + var1 = new NPCDefinition(); var1.id = var0; - if(var2 != null) { + if (var2 != null) { var1.read(new Buffer(var2)); } var1.init(); - NpcDefinition.NpcDefinition_cached.put(var1, (long)var0); + NPCDefinition.NpcDefinition_cached.put(var1, (long)var0); return var1; } } @@ -936,4 +928,13 @@ public class ObjectDefinition extends DualNode { public static void method5041() { ItemDefinition.Sprite_cached.clear(); } + + static { + ObjectDefinition_isLowDetail = false; + ObjectDefinition_cached = new EvictingDualNodeHashTable(4096); + field641 = new EvictingDualNodeHashTable(500); + field642 = new EvictingDualNodeHashTable(30); + ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); + field643 = new ModelData[4]; + } } diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java index 773f32dc91..1fb50a8cb5 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -23,32 +23,32 @@ public final class ObjectSound extends Node { @ObfuscatedGetter( intValue = 647270745 ) - int __f; + int field647; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -800464493 ) - int __q; + int field648; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -85911525 ) - int __w; + int field649; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -211591209 ) - int __o; + int field650; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 512258949 ) - int __u; + int field651; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 1344558633 ) - int __g; + int field652; @ObfuscatedName("l") @ObfuscatedGetter( intValue = -731474443 @@ -65,12 +65,12 @@ public final class ObjectSound extends Node { @ObfuscatedGetter( intValue = -1608400407 ) - int __x; + int field653; @ObfuscatedName("d") @ObfuscatedGetter( intValue = 1748890449 ) - int __d; + int field654; @ObfuscatedName("k") @Export("soundEffectIds") int[] soundEffectIds; @@ -78,7 +78,7 @@ public final class ObjectSound extends Node { @ObfuscatedGetter( intValue = -1041508847 ) - int __n; + int field655; @ObfuscatedName("i") @ObfuscatedSignature( signature = "Lds;" @@ -92,10 +92,6 @@ public final class ObjectSound extends Node { @Export("obj") ObjectDefinition obj; - static { - objectSounds = new NodeDeque(); - } - @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)V", @@ -105,24 +101,28 @@ public final class ObjectSound extends Node { void set() { int var1 = this.soundEffectId; ObjectDefinition var2 = this.obj.transform(); - if(var2 != null) { + if (var2 != null) { this.soundEffectId = var2.ambientSoundId; - this.__g = var2.int4 * 128; - this.__x = var2.int5; - this.__d = var2.int6; - this.soundEffectIds = var2.__ax; + this.field652 = var2.int4 * 128; + this.field653 = var2.int5; + this.field654 = var2.int6; + this.soundEffectIds = var2.field646; } else { this.soundEffectId = -1; - this.__g = 0; - this.__x = 0; - this.__d = 0; + this.field652 = 0; + this.field653 = 0; + this.field654 = 0; this.soundEffectIds = null; } - if(var1 != this.soundEffectId && this.stream1 != null) { + if (var1 != this.soundEffectId && this.stream1 != null) { TaskHandler.pcmStreamMixer.removeSubStream(this.stream1); this.stream1 = null; } } + + static { + objectSounds = new NodeDeque(); + } } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index ba1f42329d..144bc43c11 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -77,37 +77,37 @@ public final class Occluder { @ObfuscatedGetter( intValue = 826041747 ) - int __k; + int field656; @ObfuscatedName("n") @ObfuscatedGetter( intValue = -407777817 ) - int __n; + int field657; @ObfuscatedName("i") @ObfuscatedGetter( intValue = 1324959981 ) - int __i; + int field658; @ObfuscatedName("a") @ObfuscatedGetter( intValue = -1527021367 ) - int __a; + int field659; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -570391007 ) - int __z; + int field660; @ObfuscatedName("j") @ObfuscatedGetter( intValue = -373839103 ) - int __j; + int field661; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1334433969 ) - int __s; + int field662; @ObfuscatedName("f") @ObfuscatedSignature( @@ -116,12 +116,12 @@ public final class Occluder { ) public static VarbitDefinition method3255(int var0) { VarbitDefinition var1 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); - if(var1 != null) { + if (var1 != null) { return var1; } else { byte[] var2 = VarbitDefinition.VarbitDefinition_indexCache.takeRecord(14, var0); var1 = new VarbitDefinition(); - if(var2 != null) { + if (var2 != null) { var1.read(new Buffer(var2)); } @@ -140,26 +140,26 @@ public final class Occluder { Script var1 = new Script(); Buffer var2 = new Buffer(var0); var2.index = var2.array.length - 2; - int var3 = var2.__ag_302(); + int var3 = var2.method43(); int var4 = var2.array.length - 2 - var3 - 12; var2.index = var4; int var5 = var2.readInt(); - var1.localIntCount = var2.__ag_302(); - var1.localStringCount = var2.__ag_302(); - var1.intArgumentCount = var2.__ag_302(); - var1.stringArgumentCount = var2.__ag_302(); + var1.localIntCount = var2.method43(); + var1.localStringCount = var2.method43(); + var1.intArgumentCount = var2.method43(); + var1.stringArgumentCount = var2.method43(); int var6 = var2.readUnsignedByte(); int var7; int var8; - if(var6 > 0) { - var1.switches = var1.__o_164(var6); + if (var6 > 0) { + var1.switches = var1.method302(var6); - for(var7 = 0; var7 < var6; ++var7) { - var8 = var2.__ag_302(); - IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0?World.method1759(var8):1); + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2.method43(); + IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? World.method1759(var8) : 1); var1.switches[var7] = var9; - while(var8-- > 0) { + while (var8-- > 0) { int var10 = var2.readInt(); int var11 = var2.readInt(); var9.put(new IntegerNode(var11), (long)var10); @@ -173,11 +173,11 @@ public final class Occluder { var1.intOperands = new int[var5]; var1.stringOperands = new String[var5]; - for(var7 = 0; var2.index < var4; var1.opcodes[var7++] = var8) { - var8 = var2.__ag_302(); - if(var8 == 3) { + for (var7 = 0; var2.index < var4; var1.opcodes[var7++] = var8) { + var8 = var2.method43(); + if (var8 == 3) { var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); - } else if(var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { + } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { var1.intOperands[var7] = var2.readInt(); } else { var1.intOperands[var7] = var2.readUnsignedByte(); diff --git a/runescape-client/src/main/java/OverlayDefinition.java b/runescape-client/src/main/java/OverlayDefinition.java index 89a966d8dc..63a376eb61 100644 --- a/runescape-client/src/main/java/OverlayDefinition.java +++ b/runescape-client/src/main/java/OverlayDefinition.java @@ -11,12 +11,12 @@ public class OverlayDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache __jf_m; + public static AbstractIndexCache field663; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" ) - public static EvictingDualNodeHashTable __jf_f; + public static EvictingDualNodeHashTable field664; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -111851793 @@ -30,7 +30,7 @@ public class OverlayDefinition extends DualNode { @Export("texture") public int texture; @ObfuscatedName("o") - public boolean __o; + public boolean field665; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 528865753 @@ -74,14 +74,10 @@ public class OverlayDefinition extends DualNode { @Export("lightness2") public int lightness2; - static { - __jf_f = new EvictingDualNodeHashTable(64); - } - public OverlayDefinition() { this.rgb = 0; this.texture = -1; - this.__o = true; + this.field665 = true; this.rgb2 = -1; } @@ -92,7 +88,7 @@ public class OverlayDefinition extends DualNode { ) @Export("init") public void init() { - if(this.rgb2 != -1) { + if (this.rgb2 != -1) { this.setHsl(this.rgb2); this.hue2 = this.hue; this.saturation2 = this.saturation; @@ -109,9 +105,9 @@ public class OverlayDefinition extends DualNode { ) @Export("read") public void read(Buffer var1, int var2) { - while(true) { + while (true) { int var3 = var1.readUnsignedByte(); - if(var3 == 0) { + if (var3 == 0) { return; } @@ -126,16 +122,15 @@ public class OverlayDefinition extends DualNode { ) @Export("readNext") void readNext(Buffer var1, int var2, int var3) { - if(var2 == 1) { + if (var2 == 1) { this.rgb = var1.readMedium(); - } else if(var2 == 2) { + } else if (var2 == 2) { this.texture = var1.readUnsignedByte(); - } else if(var2 == 5) { - this.__o = false; - } else if(var2 == 7) { + } else if (var2 == 5) { + this.field665 = false; + } else if (var2 == 7) { this.rgb2 = var1.readMedium(); - } else if(var2 == 8) { - ; + } else if (var2 == 8) { } } @@ -151,40 +146,40 @@ public class OverlayDefinition extends DualNode { double var4 = (double)(var1 >> 8 & 255) / 256.0D; double var6 = (double)(var1 & 255) / 256.0D; double var8 = var2; - if(var4 < var2) { + if (var4 < var2) { var8 = var4; } - if(var6 < var8) { + if (var6 < var8) { var8 = var6; } double var10 = var2; - if(var4 > var2) { + if (var4 > var2) { var10 = var4; } - if(var6 > var10) { + if (var6 > var10) { var10 = var6; } double var12 = 0.0D; double var14 = 0.0D; double var16 = (var10 + var8) / 2.0D; - if(var8 != var10) { - if(var16 < 0.5D) { + if (var8 != var10) { + if (var16 < 0.5D) { var14 = (var10 - var8) / (var8 + var10); } - if(var16 >= 0.5D) { + if (var16 >= 0.5D) { var14 = (var10 - var8) / (2.0D - var10 - var8); } - if(var10 == var2) { + if (var10 == var2) { var12 = (var4 - var6) / (var10 - var8); - } else if(var10 == var4) { + } else if (var10 == var4) { var12 = (var6 - var2) / (var10 - var8) + 2.0D; - } else if(var10 == var6) { + } else if (var10 == var6) { var12 = (var2 - var4) / (var10 - var8) + 4.0D; } } @@ -193,15 +188,15 @@ public class OverlayDefinition extends DualNode { this.hue = (int)(var12 * 256.0D); this.saturation = (int)(256.0D * var14); this.lightness = (int)(var16 * 256.0D); - if(this.saturation < 0) { + if (this.saturation < 0) { this.saturation = 0; - } else if(this.saturation > 255) { + } else if (this.saturation > 255) { this.saturation = 255; } - if(this.lightness < 0) { + if (this.lightness < 0) { this.lightness = 0; - } else if(this.lightness > 255) { + } else if (this.lightness > 255) { this.lightness = 255; } @@ -214,33 +209,37 @@ public class OverlayDefinition extends DualNode { ) @Export("alignWidgetPosition") static void alignWidgetPosition(Widget var0, int var1, int var2) { - if(var0.xAlignment == 0) { + if (var0.xAlignment == 0) { var0.x = var0.rawX; - } else if(var0.xAlignment == 1) { + } else if (var0.xAlignment == 1) { var0.x = var0.rawX + (var1 - var0.width) / 2; - } else if(var0.xAlignment == 2) { + } else if (var0.xAlignment == 2) { var0.x = var1 - var0.width - var0.rawX; - } else if(var0.xAlignment == 3) { + } else if (var0.xAlignment == 3) { var0.x = var0.rawX * var1 >> 14; - } else if(var0.xAlignment == 4) { + } else if (var0.xAlignment == 4) { var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2; } else { var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); } - if(var0.yAlignment == 0) { + if (var0.yAlignment == 0) { var0.y = var0.rawY; - } else if(var0.yAlignment == 1) { + } else if (var0.yAlignment == 1) { var0.y = (var2 - var0.height) / 2 + var0.rawY; - } else if(var0.yAlignment == 2) { + } else if (var0.yAlignment == 2) { var0.y = var2 - var0.height - var0.rawY; - } else if(var0.yAlignment == 3) { + } else if (var0.yAlignment == 3) { var0.y = var2 * var0.rawY >> 14; - } else if(var0.yAlignment == 4) { + } else if (var0.yAlignment == 4) { var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2; } else { var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); } } + + static { + field664 = new EvictingDualNodeHashTable(64); + } } diff --git a/runescape-client/src/main/java/OwnWorldComparator.java b/runescape-client/src/main/java/OwnWorldComparator.java index 0c81a18929..4914d77bed 100644 --- a/runescape-client/src/main/java/OwnWorldComparator.java +++ b/runescape-client/src/main/java/OwnWorldComparator.java @@ -8,40 +8,40 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("OwnWorldComparator") public class OwnWorldComparator implements Comparator { @ObfuscatedName("m") - boolean __m; + boolean field666; @ObfuscatedName("m") @ObfuscatedSignature( signature = "(Ll;Ll;B)I", garbageValue = "21" ) - int __m_132(GrandExchangeEvent var1, GrandExchangeEvent var2) { - if(var2.world == var1.world) { + int method234(GrandExchangeEvent var1, GrandExchangeEvent var2) { + if (var2.world == var1.world) { return 0; } else { - if(this.__m) { - if(Client.worldId == var1.world) { + if (this.field666) { + if (Client.worldId == var1.world) { return -1; } - if(var2.world == Client.worldId) { + if (var2.world == Client.worldId) { return 1; } } - return var1.world < var2.world?-1:1; + return var1.world < var2.world ? -1 : 1; } } @ObfuscatedName("equals") - public boolean __equals_134(Object var1) { + public boolean method235(Object var1) { return super.equals(var1); } @Export("compare") @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.__m_132((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.method234((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } @ObfuscatedName("al") @@ -51,31 +51,31 @@ public class OwnWorldComparator implements Comparator { ) static int method1285(int var0, Script var1, boolean var2) { int var3; - if(var0 == 5504) { + if (var0 == 5504) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; int var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - if(!Client.isCameraLocked) { + if (!Client.isCameraLocked) { Client.cameraPitchTarget = var3; Client.minimapOrientation = var4; } return 1; - } else if(var0 == 5505) { + } else if (var0 == 5505) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cameraPitchTarget; return 1; - } else if(var0 == 5506) { + } else if (var0 == 5506) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.minimapOrientation; return 1; - } else if(var0 == 5530) { + } else if (var0 == 5530) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - if(var3 < 0) { + if (var3 < 0) { var3 = 0; } Client.cameraFollowHeight = var3; return 1; - } else if(var0 == 5531) { + } else if (var0 == 5531) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cameraFollowHeight; return 1; } else { diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index 308a9d2a77..b4985caf88 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -14,7 +14,7 @@ public final class PacketBuffer extends Buffer { @ObfuscatedGetter( intValue = 701739159 ) - public static int __hx_z; + public static int field667; @ObfuscatedName("e") @ObfuscatedSignature( signature = "Lhn;" @@ -28,10 +28,6 @@ public final class PacketBuffer extends Buffer { @Export("bitIndex") int bitIndex; - static { - PacketBuffer_masks = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; - } - public PacketBuffer(int var1) { super(var1); } @@ -63,7 +59,7 @@ public final class PacketBuffer extends Buffer { ) @Export("writeByteIsaac") public void writeByteIsaac(int var1) { - super.array[++super.index - 1] = (byte)(var1 + this.isaacCipher0.__m_336()); + super.array[++super.index - 1] = (byte)(var1 + this.isaacCipher0.method136()); } @ObfuscatedName("ii") @@ -73,7 +69,7 @@ public final class PacketBuffer extends Buffer { ) @Export("readByteIsaac") public int readByteIsaac() { - return super.array[++super.index - 1] - this.isaacCipher0.__m_336() & 255; + return super.array[++super.index - 1] - this.isaacCipher0.method136() & 255; } @ObfuscatedName("ig") @@ -81,8 +77,8 @@ public final class PacketBuffer extends Buffer { signature = "(B)Z", garbageValue = "101" ) - public boolean __ig_334() { - int var1 = super.array[super.index] - this.isaacCipher0.__f_337() & 255; + public boolean method236() { + int var1 = super.array[super.index] - this.isaacCipher0.method137() & 255; return var1 >= 128; } @@ -93,8 +89,8 @@ public final class PacketBuffer extends Buffer { ) @Export("readSmartByteShortIsaac") public int readSmartByteShortIsaac() { - int var1 = super.array[++super.index - 1] - this.isaacCipher0.__m_336() & 255; - return var1 < 128?var1:(var1 - 128 << 8) + (super.array[++super.index - 1] - this.isaacCipher0.__m_336() & 255); + int var1 = super.array[++super.index - 1] - this.isaacCipher0.method136() & 255; + return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.index - 1] - this.isaacCipher0.method136() & 255); } @ObfuscatedName("jb") @@ -102,9 +98,9 @@ public final class PacketBuffer extends Buffer { signature = "([BIII)V", garbageValue = "-1168019189" ) - public void __jb_335(byte[] var1, int var2, int var3) { - for(int var4 = 0; var4 < var3; ++var4) { - var1[var4 + var2] = (byte)(super.array[++super.index - 1] - this.isaacCipher0.__m_336()); + public void method237(byte[] var1, int var2, int var3) { + for (int var4 = 0; var4 < var3; ++var4) { + var1[var4 + var2] = (byte)(super.array[++super.index - 1] - this.isaacCipher0.method136()); } } @@ -130,12 +126,12 @@ public final class PacketBuffer extends Buffer { int var3 = 8 - (this.bitIndex & 7); int var4 = 0; - for(this.bitIndex += var1; var1 > var3; var3 = 8) { + for (this.bitIndex += var1; var1 > var3; var3 = 8) { var4 += (super.array[var2++] & PacketBuffer_masks[var3]) << var1 - var3; var1 -= var3; } - if(var3 == var1) { + if (var3 == var1) { var4 += super.array[var2] & PacketBuffer_masks[var3]; } else { var4 += super.array[var2] >> var3 - var1 & PacketBuffer_masks[var1]; @@ -182,22 +178,21 @@ public final class PacketBuffer extends Buffer { static void requestNetFile(IndexCache var0, int var1, int var2, int var3, byte var4, boolean var5) { long var6 = (long)((var1 << 16) + var2); NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); - if(var8 == null) { + if (var8 == null) { var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); - if(var8 == null) { + if (var8 == null) { var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); - if(var8 != null) { - if(var5) { + if (var8 != null) { + if (var5) { var8.removeDual(); NetCache.NetCache_pendingPriorityWrites.put(var8, var6); --NetCache.NetCache_pendingWritesCount; ++NetCache.NetCache_pendingPriorityWritesCount; } - } else { - if(!var5) { + if (!var5) { var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); - if(var8 != null) { + if (var8 != null) { return; } } @@ -206,7 +201,7 @@ public final class PacketBuffer extends Buffer { var8.indexCache = var0; var8.crc = var3; var8.padding = var4; - if(var5) { + if (var5) { NetCache.NetCache_pendingPriorityWrites.put(var8, var6); ++NetCache.NetCache_pendingPriorityWritesCount; } else { @@ -214,10 +209,10 @@ public final class PacketBuffer extends Buffer { NetCache.NetCache_pendingWrites.put(var8, var6); ++NetCache.NetCache_pendingWritesCount; } - } } } + } @ObfuscatedName("f") @@ -228,4 +223,8 @@ public final class PacketBuffer extends Buffer { public static int method4081(int var0, int var1) { return (var0 + 40000 << 8) + var1; } + + static { + PacketBuffer_masks = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; + } } diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index 4db93c1b8c..192a707d9b 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -17,17 +17,17 @@ public class PacketBufferNode extends Node { @ObfuscatedGetter( intValue = -1583654139 ) - public static int __gg_u; + public static int field668; @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lgs;" ) - public ClientPacket __m; + public ClientPacket field669; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1433542775 ) - public int __f; + public int field670; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lhx;" @@ -38,22 +38,18 @@ public class PacketBufferNode extends Node { @ObfuscatedGetter( intValue = -2051819203 ) - public int __w; - - static { - packetBufferNodes = new PacketBufferNode[300]; - __gg_u = 0; - } + public int field671; @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)V", garbageValue = "-1987685511" ) - public void __f_292() { - if(__gg_u < packetBufferNodes.length) { - packetBufferNodes[++__gg_u - 1] = this; + public void method238() { + if (field668 < packetBufferNodes.length) { + packetBufferNodes[++field668 - 1] = this; } + } @ObfuscatedName("kq") @@ -64,4 +60,9 @@ public class PacketBufferNode extends Node { static boolean method3673(Widget var0) { return var0.isHidden; } + + static { + packetBufferNodes = new PacketBufferNode[300]; + field668 = 0; + } } diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index d01f2bce26..ea0c467d30 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -30,7 +30,7 @@ public class PacketWriter { @ObfuscatedGetter( intValue = -1028046199 ) - int __q; + int field672; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lgr;" @@ -62,43 +62,43 @@ public class PacketWriter { @Export("serverPacket0Length") int serverPacket0Length; @ObfuscatedName("e") - boolean __e; + boolean field673; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 120570975 ) - int __x; + int field674; @ObfuscatedName("d") @ObfuscatedGetter( intValue = 1672229609 ) - int __d; + int field675; @ObfuscatedName("k") @ObfuscatedSignature( signature = "Lge;" ) - ServerPacket __k; + ServerPacket field676; @ObfuscatedName("n") @ObfuscatedSignature( signature = "Lge;" ) - ServerPacket __n; + ServerPacket field677; @ObfuscatedName("i") @ObfuscatedSignature( signature = "Lge;" ) - ServerPacket __i; + ServerPacket field678; PacketWriter() { this.packetBufferNodes = new IterableNodeDeque(); - this.__q = 0; + this.field672 = 0; this.buffer = new Buffer(5000); this.packetBuffer = new PacketBuffer(40000); this.serverPacket0 = null; this.serverPacket0Length = 0; - this.__e = true; - this.__x = 0; - this.__d = 0; + this.field673 = true; + this.field674 = 0; + this.field675 = 0; } @ObfuscatedName("m") @@ -106,9 +106,9 @@ public class PacketWriter { signature = "(I)V", garbageValue = "1561094077" ) - final void __m_165() { + final void method239() { this.packetBufferNodes.clear(); - this.__q = 0; + this.field672 = 0; } @ObfuscatedName("f") @@ -116,23 +116,23 @@ public class PacketWriter { signature = "(I)V", garbageValue = "-1839929685" ) - final void __f_166() throws IOException { - if(this.socket0 != null && this.__q > 0) { + final void method240() throws IOException { + if (this.socket0 != null && this.field672 > 0) { this.buffer.index = 0; - while(true) { + while (true) { PacketBufferNode var1 = (PacketBufferNode)this.packetBufferNodes.last(); - if(var1 == null || var1.__w > this.buffer.array.length - this.buffer.index) { + if (var1 == null || var1.field671 > this.buffer.array.length - this.buffer.index) { this.socket0.write(this.buffer.array, 0, this.buffer.index); - this.__d = 0; + this.field675 = 0; break; } - this.buffer.__s_297(var1.packetBuffer.array, 0, var1.__w); - this.__q -= var1.__w; + this.buffer.method38(var1.packetBuffer.array, 0, var1.field671); + this.field672 -= var1.field671; var1.remove(); - var1.packetBuffer.__f_295(); - var1.__f_292(); + var1.packetBuffer.method36(); + var1.method238(); } } @@ -143,11 +143,11 @@ public class PacketWriter { signature = "(Lgg;I)V", garbageValue = "599379248" ) - public final void __q_167(PacketBufferNode var1) { + public final void method241(PacketBufferNode var1) { this.packetBufferNodes.addFirst(var1); - var1.__w = var1.packetBuffer.index; + var1.field671 = var1.packetBuffer.index; var1.packetBuffer.index = 0; - this.__q += var1.__w; + this.field672 += var1.field671; } @ObfuscatedName("w") @@ -167,7 +167,7 @@ public class PacketWriter { ) @Export("close") void close() { - if(this.socket0 != null) { + if (this.socket0 != null) { this.socket0.close(); this.socket0 = null; } diff --git a/runescape-client/src/main/java/ParamKeyDefinition.java b/runescape-client/src/main/java/ParamKeyDefinition.java index c5b54db627..da1d214b1e 100644 --- a/runescape-client/src/main/java/ParamKeyDefinition.java +++ b/runescape-client/src/main/java/ParamKeyDefinition.java @@ -11,7 +11,7 @@ public class ParamKeyDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache __jb_m; + public static AbstractIndexCache field679; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" @@ -34,10 +34,6 @@ public class ParamKeyDefinition extends DualNode { @Export("isMembersOnly") boolean isMembersOnly; - static { - ParamKeyDefinition_cached = new EvictingDualNodeHashTable(64); - } - ParamKeyDefinition() { this.isMembersOnly = true; } @@ -58,9 +54,9 @@ public class ParamKeyDefinition extends DualNode { ) @Export("read") void read(Buffer var1) { - while(true) { + while (true) { int var2 = var1.readUnsignedByte(); - if(var2 == 0) { + if (var2 == 0) { return; } @@ -75,13 +71,13 @@ public class ParamKeyDefinition extends DualNode { ) @Export("readNext") void readNext(Buffer var1, int var2) { - if(var2 == 1) { + if (var2 == 1) { this.type = class14.method171(var1.readByte()); - } else if(var2 == 2) { + } else if (var2 == 2) { this.keyInt = var1.readInt(); - } else if(var2 == 4) { + } else if (var2 == 4) { this.isMembersOnly = false; - } else if(var2 == 5) { + } else if (var2 == 5) { this.keyString = var1.readStringCp1252NullTerminated(); } @@ -103,8 +99,8 @@ public class ParamKeyDefinition extends DualNode { garbageValue = "-904254947" ) static final void method4933(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if(var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { - if(Client.isLowDetail && var0 != SoundSystem.plane) { + if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { + if (Client.isLowDetail && var0 != SoundSystem.plane) { return; } @@ -112,86 +108,86 @@ public class ParamKeyDefinition extends DualNode { boolean var9 = true; boolean var10 = false; boolean var11 = false; - if(var1 == 0) { - var7 = class65.scene.__ar_244(var0, var2, var3); + if (var1 == 0) { + var7 = class65.scene.method290(var0, var2, var3); } - if(var1 == 1) { - var7 = class65.scene.__ac_245(var0, var2, var3); + if (var1 == 1) { + var7 = class65.scene.method291(var0, var2, var3); } - if(var1 == 2) { - var7 = class65.scene.__ay_246(var0, var2, var3); + if (var1 == 2) { + var7 = class65.scene.method292(var0, var2, var3); } - if(var1 == 3) { + if (var1 == 3) { var7 = class65.scene.getFloorDecorationTag(var0, var2, var3); } int var12; - if(0L != var7) { + if (0L != var7) { var12 = class65.scene.getObjectFlags(var0, var2, var3, var7); - int var39 = HitSplatDefinition.method4972(var7); - int var40 = var12 & 31; - int var41 = var12 >> 6 & 3; - ObjectDefinition var13; - if(var1 == 0) { + int var13 = HitSplatDefinition.method4972(var7); + int var14 = var12 & 31; + int var15 = var12 >> 6 & 3; + ObjectDefinition var16; + if (var1 == 0) { class65.scene.removeBoundaryObject(var0, var2, var3); - var13 = class50.getObjectDefinition(var39); - if(var13.interactType != 0) { - Client.collisionMaps[var0].__g_288(var2, var3, var40, var41, var13.boolean1); + var16 = class50.getObjectDefinition(var13); + if (var16.interactType != 0) { + Client.collisionMaps[var0].method95(var2, var3, var14, var15, var16.boolean1); } } - if(var1 == 1) { + if (var1 == 1) { class65.scene.removeWallDecoration(var0, var2, var3); } - if(var1 == 2) { - class65.scene.__c_242(var0, var2, var3); - var13 = class50.getObjectDefinition(var39); - if(var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { + if (var1 == 2) { + class65.scene.method288(var0, var2, var3); + var16 = class50.getObjectDefinition(var13); + if (var2 + var16.sizeX > 103 || var3 + var16.sizeX > 103 || var2 + var16.sizeY > 103 || var3 + var16.sizeY > 103) { return; } - if(var13.interactType != 0) { - Client.collisionMaps[var0].__l_289(var2, var3, var13.sizeX, var13.sizeY, var41, var13.boolean1); + if (var16.interactType != 0) { + Client.collisionMaps[var0].method96(var2, var3, var16.sizeX, var16.sizeY, var15, var16.boolean1); } } - if(var1 == 3) { + if (var1 == 3) { class65.scene.removeFloorDecoration(var0, var2, var3); - var13 = class50.getObjectDefinition(var39); - if(var13.interactType == 1) { - Client.collisionMaps[var0].__x_291(var2, var3); + var16 = class50.getObjectDefinition(var13); + if (var16.interactType == 1) { + Client.collisionMaps[var0].method98(var2, var3); } } } - if(var4 >= 0) { + if (var4 >= 0) { var12 = var0; - if(var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { + if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { var12 = var0 + 1; } - Scene var42 = class65.scene; - CollisionMap var14 = Client.collisionMaps[var0]; - ObjectDefinition var15 = class50.getObjectDefinition(var4); - int var16; + Scene var36 = class65.scene; + CollisionMap var37 = Client.collisionMaps[var0]; + ObjectDefinition var38 = class50.getObjectDefinition(var4); int var17; - if(var5 != 1 && var5 != 3) { - var16 = var15.sizeX; - var17 = var15.sizeY; + int var39; + if (var5 != 1 && var5 != 3) { + var39 = var38.sizeX; + var17 = var38.sizeY; } else { - var16 = var15.sizeY; - var17 = var15.sizeX; + var39 = var38.sizeY; + var17 = var38.sizeX; } int var18; int var19; - if(var16 + var2 <= 104) { - var18 = (var16 >> 1) + var2; - var19 = var2 + (var16 + 1 >> 1); + if (var39 + var2 <= 104) { + var18 = (var39 >> 1) + var2; + var19 = var2 + (var39 + 1 >> 1); } else { var18 = var2; var19 = var2 + 1; @@ -199,7 +195,7 @@ public class ParamKeyDefinition extends DualNode { int var20; int var21; - if(var3 + var17 <= 104) { + if (var3 + var17 <= 104) { var20 = var3 + (var17 >> 1); var21 = var3 + (var17 + 1 >> 1); } else { @@ -209,186 +205,192 @@ public class ParamKeyDefinition extends DualNode { int[][] var22 = Tiles.Tiles_heights[var12]; int var23 = var22[var18][var21] + var22[var19][var20] + var22[var18][var20] + var22[var19][var21] >> 2; - int var24 = (var2 << 7) + (var16 << 6); + int var24 = (var2 << 7) + (var39 << 6); int var25 = (var3 << 7) + (var17 << 6); - long var26 = FontName.method5637(var2, var3, 2, var15.int1 == 0, var4); + long var26 = FontName.method5637(var2, var3, 2, var38.int1 == 0, var4); int var28 = (var5 << 6) + var6; - if(var15.int3 == 1) { + if (var38.int3 == 1) { var28 += 256; } Object var29; - if(var6 == 22) { - if(var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(22, var5, var22, var24, var23, var25); + if (var6 == 22) { + if (var38.animationId == -1 && var38.transforms == null) { + var29 = var38.getModel(22, var5, var22, var24, var23, var25); } else { - var29 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + var29 = new DynamicObject(var4, 22, var5, var12, var2, var3, var38.animationId, true, (Entity)null); } - var42.newFloorDecoration(var0, var2, var3, var23, (Entity)var29, var26, var28); - if(var15.interactType == 1) { - var14.__o_286(var2, var3); + var36.newFloorDecoration(var0, var2, var3, var23, (Entity)var29, var26, var28); + if (var38.interactType == 1) { + var37.method93(var2, var3); } - } else if(var6 != 10 && var6 != 11) { - if(var6 >= 12) { - if(var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(var6, var5, var22, var24, var23, var25); + } else if (var6 != 10 && var6 != 11) { + if (var6 >= 12) { + if (var38.animationId == -1 && var38.transforms == null) { + var29 = var38.getModel(var6, var5, var22, var24, var23, var25); } else { - var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var38.animationId, true, (Entity)null); } - var42.__d_238(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28); - if(var15.interactType != 0) { - var14.__q_284(var2, var3, var16, var17, var15.boolean1); + var36.method284(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28); + if (var38.interactType != 0) { + var37.method91(var2, var3, var39, var17, var38.boolean1); } - } else if(var6 == 0) { - if(var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(0, var5, var22, var24, var23, var25); + } else if (var6 == 0) { + if (var38.animationId == -1 && var38.transforms == null) { + var29 = var38.getModel(0, var5, var22, var24, var23, var25); } else { - var29 = new DynamicObject(var4, 0, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + var29 = new DynamicObject(var4, 0, var5, var12, var2, var3, var38.animationId, true, (Entity)null); } - var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.__bq_t[var5], 0, var26, var28); - if(var15.interactType != 0) { - var14.__f_283(var2, var3, var6, var5, var15.boolean1); + var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field911[var5], 0, var26, var28); + if (var38.interactType != 0) { + var37.method90(var2, var3, var6, var5, var38.boolean1); } - } else if(var6 == 1) { - if(var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(1, var5, var22, var24, var23, var25); + } else if (var6 == 1) { + if (var38.animationId == -1 && var38.transforms == null) { + var29 = var38.getModel(1, var5, var22, var24, var23, var25); } else { - var29 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + var29 = new DynamicObject(var4, 1, var5, var12, var2, var3, var38.animationId, true, (Entity)null); } - var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.__bq_y[var5], 0, var26, var28); - if(var15.interactType != 0) { - var14.__f_283(var2, var3, var6, var5, var15.boolean1); + var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field912[var5], 0, var26, var28); + if (var38.interactType != 0) { + var37.method90(var2, var3, var6, var5, var38.boolean1); } } else { - int var35; - if(var6 == 2) { - var35 = var5 + 1 & 3; - Object var30; - Object var31; - if(var15.animationId == -1 && var15.transforms == null) { - var30 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); - var31 = var15.getModel(2, var35, var22, var24, var23, var25); - } else { - var30 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); - var31 = new DynamicObject(var4, 2, var35, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var30, (Entity)var31, Tiles.__bq_t[var5], Tiles.__bq_t[var35], var26, var28); - if(var15.interactType != 0) { - var14.__f_283(var2, var3, var6, var5, var15.boolean1); - } - } else if(var6 == 3) { - if(var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(3, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 3, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.__bq_y[var5], 0, var26, var28); - if(var15.interactType != 0) { - var14.__f_283(var2, var3, var6, var5, var15.boolean1); - } - } else if(var6 == 9) { - if(var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(var6, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.__d_238(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28); - if(var15.interactType != 0) { - var14.__q_284(var2, var3, var16, var17, var15.boolean1); - } - } else if(var6 == 4) { - if(var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(4, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.__bq_t[var5], 0, 0, 0, var26, var28); - } else { + int var30; + Object var31; + if (var6 == 2) { + var30 = var5 + 1 & 3; Object var32; - long var36; - if(var6 == 5) { - var35 = 16; - var36 = var42.__ar_244(var0, var2, var3); - if(var36 != 0L) { - var35 = class50.getObjectDefinition(HitSplatDefinition.method4972(var36)).int2; + if (var38.animationId == -1 && var38.transforms == null) { + var31 = var38.getModel(2, var5 + 4, var22, var24, var23, var25); + var32 = var38.getModel(2, var30, var22, var24, var23, var25); + } else { + var31 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var38.animationId, true, (Entity)null); + var32 = new DynamicObject(var4, 2, var30, var12, var2, var3, var38.animationId, true, (Entity)null); + } + + var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var31, (Entity)var32, Tiles.field911[var5], Tiles.field911[var30], var26, var28); + if (var38.interactType != 0) { + var37.method90(var2, var3, var6, var5, var38.boolean1); + } + } else if (var6 == 3) { + if (var38.animationId == -1 && var38.transforms == null) { + var29 = var38.getModel(3, var5, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(var4, 3, var5, var12, var2, var3, var38.animationId, true, (Entity)null); + } + + var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field912[var5], 0, var26, var28); + if (var38.interactType != 0) { + var37.method90(var2, var3, var6, var5, var38.boolean1); + } + } else if (var6 == 9) { + if (var38.animationId == -1 && var38.transforms == null) { + var29 = var38.getModel(var6, var5, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var38.animationId, true, (Entity)null); + } + + var36.method284(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28); + if (var38.interactType != 0) { + var37.method91(var2, var3, var39, var17, var38.boolean1); + } + } else if (var6 == 4) { + if (var38.animationId == -1 && var38.transforms == null) { + var29 = var38.getModel(4, var5, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(var4, 4, var5, var12, var2, var3, var38.animationId, true, (Entity)null); + } + + var36.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field911[var5], 0, 0, 0, var26, var28); + } else { + long var40; + if (var6 == 5) { + var30 = 16; + var40 = var36.method290(var0, var2, var3); + if (var40 != 0L) { + var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2; } - if(var15.animationId == -1 && var15.transforms == null) { - var32 = var15.getModel(4, var5, var22, var24, var23, var25); + if (var38.animationId == -1 && var38.transforms == null) { + var31 = var38.getModel(4, var5, var22, var24, var23, var25); } else { - var32 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + var31 = new DynamicObject(var4, 4, var5, var12, var2, var3, var38.animationId, true, (Entity)null); } - var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)null, Tiles.__bq_t[var5], 0, var35 * Tiles.__bq_h[var5], var35 * Tiles.__bq_b[var5], var26, var28); - } else if(var6 == 6) { - var35 = 8; - var36 = var42.__ar_244(var0, var2, var3); - if(var36 != 0L) { - var35 = class50.getObjectDefinition(HitSplatDefinition.method4972(var36)).int2 / 2; + var36.newWallDecoration(var0, var2, var3, var23, (Entity)var31, (Entity)null, Tiles.field911[var5], 0, var30 * Tiles.field913[var5], var30 * Tiles.field914[var5], var26, var28); + } else if (var6 == 6) { + var30 = 8; + var40 = var36.method290(var0, var2, var3); + if (var40 != 0L) { + var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2 / 2; } - if(var15.animationId == -1 && var15.transforms == null) { - var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); + if (var38.animationId == -1 && var38.transforms == null) { + var31 = var38.getModel(4, var5 + 4, var22, var24, var23, var25); } else { - var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); + var31 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var38.animationId, true, (Entity)null); } - var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)null, 256, var5, var35 * Tiles.__bq_c[var5], var35 * Tiles.__bq_r[var5], var26, var28); - } else if(var6 == 7) { - int var38 = var5 + 2 & 3; - if(var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(4, var38 + 4, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 4, var38 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); - } + var36.newWallDecoration(var0, var2, var3, var23, (Entity)var31, (Entity)null, 256, var5, var30 * Tiles.field915[var5], var30 * Tiles.field916[var5], var26, var28); + } else { + int var34; + if (var6 == 7) { + var34 = var5 + 2 & 3; + if (var38.animationId == -1 && var38.transforms == null) { + var29 = var38.getModel(4, var34 + 4, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var38.animationId, true, (Entity)null); + } - var42.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, 256, var38, 0, 0, var26, var28); - } else if(var6 == 8) { - var35 = 8; - var36 = var42.__ar_244(var0, var2, var3); - if(var36 != 0L) { - var35 = class50.getObjectDefinition(HitSplatDefinition.method4972(var36)).int2 / 2; - } + var36.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, 256, var34, 0, 0, var26, var28); + } else if (var6 == 8) { + var30 = 8; + var40 = var36.method290(var0, var2, var3); + if (var40 != 0L) { + var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2 / 2; + } - int var34 = var5 + 2 & 3; - Object var33; - if(var15.animationId == -1 && var15.transforms == null) { - var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); - var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25); - } else { - var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); - var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); - } + var34 = var5 + 2 & 3; + Object var35; + if (var38.animationId == -1 && var38.transforms == null) { + var31 = var38.getModel(4, var5 + 4, var22, var24, var23, var25); + var35 = var38.getModel(4, var34 + 4, var22, var24, var23, var25); + } else { + var31 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var38.animationId, true, (Entity)null); + var35 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var38.animationId, true, (Entity)null); + } - var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)var33, 256, var5, var35 * Tiles.__bq_c[var5], var35 * Tiles.__bq_r[var5], var26, var28); + var36.newWallDecoration(var0, var2, var3, var23, (Entity)var31, (Entity)var35, 256, var5, var30 * Tiles.field915[var5], var30 * Tiles.field916[var5], var26, var28); + } } } } } else { - if(var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(10, var5, var22, var24, var23, var25); + if (var38.animationId == -1 && var38.transforms == null) { + var29 = var38.getModel(10, var5, var22, var24, var23, var25); } else { - var29 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + var29 = new DynamicObject(var4, 10, var5, var12, var2, var3, var38.animationId, true, (Entity)null); } - if(var29 != null) { - var42.__d_238(var0, var2, var3, var23, var16, var17, (Entity)var29, var6 == 11?256:0, var26, var28); + if (var29 != null) { + var36.method284(var0, var2, var3, var23, var39, var17, (Entity)var29, var6 == 11 ? 256 : 0, var26, var28); } - if(var15.interactType != 0) { - var14.__q_284(var2, var3, var16, var17, var15.boolean1); + if (var38.interactType != 0) { + var37.method91(var2, var3, var39, var17, var38.boolean1); } } } } } + + static { + ParamKeyDefinition_cached = new EvictingDualNodeHashTable(64); + } } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index 296ae184e5..3645cf21ef 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -23,7 +23,7 @@ public class PcmPlayer { @ObfuscatedGetter( intValue = 1125788887 ) - int __z; + int field680; @ObfuscatedName("j") @ObfuscatedGetter( longValue = -8124323644430480811L @@ -46,7 +46,7 @@ public class PcmPlayer { @ObfuscatedGetter( intValue = 1907203055 ) - int __y; + int field681; @ObfuscatedName("h") @ObfuscatedGetter( longValue = -200656835998283411L @@ -57,12 +57,12 @@ public class PcmPlayer { @ObfuscatedGetter( intValue = 48658021 ) - int __b; + int field682; @ObfuscatedName("c") @ObfuscatedGetter( intValue = 1624619697 ) - int __c; + int field683; @ObfuscatedName("r") @ObfuscatedGetter( intValue = -1586398263 @@ -73,37 +73,37 @@ public class PcmPlayer { @ObfuscatedGetter( longValue = -8188447292076890879L ) - long __p; + long field684; @ObfuscatedName("v") - boolean __v; + boolean field685; @ObfuscatedName("ac") @ObfuscatedGetter( intValue = -645495803 ) - int __ac; + int field686; @ObfuscatedName("ay") @ObfuscatedSignature( signature = "[Ldc;" ) - PcmStream[] __ay; + PcmStream[] field687; @ObfuscatedName("ah") @ObfuscatedSignature( signature = "[Ldc;" ) - PcmStream[] __ah; + PcmStream[] field688; protected PcmPlayer() { - this.__z = 32; + this.field680 = 32; this.timeMs = class203.currentTimeMs(); this.retryTimeMs = 0L; - this.__b = 0; - this.__c = 0; + this.field682 = 0; + this.field683 = 0; this.nextPosition = 0; - this.__p = 0L; - this.__v = true; - this.__ac = 0; - this.__ay = new PcmStream[8]; - this.__ah = new PcmStream[8]; + this.field684 = 0L; + this.field685 = true; + this.field686 = 0; + this.field687 = new PcmStream[8]; + this.field688 = new PcmStream[8]; } @ObfuscatedName("m") @@ -174,90 +174,90 @@ public class PcmPlayer { ) @Export("run") public final synchronized void run() { - if(this.samples != null) { + if (this.samples != null) { long var1 = class203.currentTimeMs(); try { - if(0L != this.retryTimeMs) { - if(var1 < this.retryTimeMs) { + if (0L != this.retryTimeMs) { + if (var1 < this.retryTimeMs) { return; } this.open(this.capacity); this.retryTimeMs = 0L; - this.__v = true; + this.field685 = true; } int var3 = this.position(); - if(this.nextPosition - var3 > this.__b) { - this.__b = this.nextPosition - var3; + if (this.nextPosition - var3 > this.field682) { + this.field682 = this.nextPosition - var3; } - int var4 = this.__y + this.frequency; - if(var4 + 256 > 16384) { + int var4 = this.field681 + this.frequency; + if (var4 + 256 > 16384) { var4 = 16128; } - if(var4 + 256 > this.capacity) { + if (var4 + 256 > this.capacity) { this.capacity += 1024; - if(this.capacity > 16384) { + if (this.capacity > 16384) { this.capacity = 16384; } this.close(); this.open(this.capacity); var3 = 0; - this.__v = true; - if(var4 + 256 > this.capacity) { + this.field685 = true; + if (var4 + 256 > this.capacity) { var4 = this.capacity - 256; - this.__y = var4 - this.frequency; + this.field681 = var4 - this.frequency; } } - while(var3 < var4) { + while (var3 < var4) { this.fill(this.samples, 256); this.write(); var3 += 256; } - if(var1 > this.__p) { - if(!this.__v) { - if(this.__b == 0 && this.__c == 0) { + if (var1 > this.field684) { + if (!this.field685) { + if (this.field682 == 0 && this.field683 == 0) { this.close(); this.retryTimeMs = 2000L + var1; return; } - this.__y = Math.min(this.__c, this.__b); - this.__c = this.__b; + this.field681 = Math.min(this.field683, this.field682); + this.field683 = this.field682; } else { - this.__v = false; + this.field685 = false; } - this.__b = 0; - this.__p = 2000L + var1; + this.field682 = 0; + this.field684 = 2000L + var1; } this.nextPosition = var3; - } catch (Exception var7) { + } catch (Exception var6) { this.close(); this.retryTimeMs = var1 + 2000L; } try { - if(var1 > this.timeMs + 500000L) { + if (var1 > this.timeMs + 500000L) { var1 = this.timeMs; } - while(var1 > 5000L + this.timeMs) { + while (var1 > 5000L + this.timeMs) { this.skip(256); this.timeMs += (long)(256000 / class309.PcmPlayer_sampleRate); } - } catch (Exception var6) { + } catch (Exception var5) { this.timeMs = var1; } - } + } @ObfuscatedName("ac") @@ -265,8 +265,8 @@ public class PcmPlayer { signature = "(I)V", garbageValue = "-922069005" ) - public final void __ac_176() { - this.__v = true; + public final void method242() { + this.field685 = true; } @ObfuscatedName("ay") @@ -276,7 +276,7 @@ public class PcmPlayer { ) @Export("tryDiscard") public final synchronized void tryDiscard() { - this.__v = true; + this.field685 = true; try { this.discard(); @@ -294,20 +294,20 @@ public class PcmPlayer { ) @Export("shutdown") public final synchronized void shutdown() { - if(Messages.soundSystem != null) { + if (Messages.soundSystem != null) { boolean var1 = true; - for(int var2 = 0; var2 < 2; ++var2) { - if(this == Messages.soundSystem.players[var2]) { + for (int var2 = 0; var2 < 2; ++var2) { + if (this == Messages.soundSystem.players[var2]) { Messages.soundSystem.players[var2] = null; } - if(Messages.soundSystem.players[var2] != null) { + if (Messages.soundSystem.players[var2] != null) { var1 = false; } } - if(var1) { + if (var1) { Friend.soundSystemExecutor.shutdownNow(); Friend.soundSystemExecutor = null; Messages.soundSystem = null; @@ -325,13 +325,13 @@ public class PcmPlayer { ) @Export("skip") final void skip(int var1) { - this.__ac -= var1; - if(this.__ac < 0) { - this.__ac = 0; + this.field686 -= var1; + if (this.field686 < 0) { + this.field686 = 0; } - if(this.stream0 != null) { - this.stream0.__d_173(var1); + if (this.stream0 != null) { + this.stream0.vmethod264(var1); } } @@ -340,80 +340,80 @@ public class PcmPlayer { @Export("fill") final void fill(int[] var1, int var2) { int var3 = var2; - if(isStereo) { + if (isStereo) { var3 = var2 << 1; } class212.clearIntArray(var1, 0, var3); - this.__ac -= var2; - if(this.stream0 != null && this.__ac <= 0) { - this.__ac += class309.PcmPlayer_sampleRate >> 4; + this.field686 -= var2; + if (this.stream0 != null && this.field686 <= 0) { + this.field686 += class309.PcmPlayer_sampleRate >> 4; MidiPcmStream.PcmStream_disable(this.stream0); - this.__ab_177(this.stream0, this.stream0.__az_179()); + this.method243(this.stream0, this.stream0.vmethod282()); int var4 = 0; int var5 = 255; int var6; - PcmStream var10; - label104: - for(var6 = 7; var5 != 0; --var6) { - int var7; + PcmStream var7; + label106: + for (var6 = 7; var5 != 0; --var6) { int var8; - if(var6 < 0) { - var7 = var6 & 3; - var8 = -(var6 >> 2); + int var9; + if (var6 < 0) { + var8 = var6 & 3; + var9 = -(var6 >> 2); } else { - var7 = var6; - var8 = 0; + var8 = var6; + var9 = 0; } - for(int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { - if((var9 & 1) != 0) { - var5 &= ~(1 << var7); - var10 = null; - PcmStream var11 = this.__ay[var7]; + for (int var10 = var5 >>> var8 & 286331153; var10 != 0; var10 >>>= 4) { + if ((var10 & 1) != 0) { + var5 &= ~(1 << var8); + var7 = null; + PcmStream var11 = this.field687[var8]; - label98: - while(true) { - while(true) { - if(var11 == null) { - break label98; + label100: + while (true) { + while (true) { + if (var11 == null) { + break label100; } AbstractSound var12 = var11.sound; - if(var12 != null && var12.position > var8) { - var5 |= 1 << var7; - var10 = var11; + if (var12 != null && var12.position > var9) { + var5 |= 1 << var8; + var7 = var11; var11 = var11.after; } else { var11.active = true; - int var13 = var11.__l_171(); + int var13 = var11.vmethod262(); var4 += var13; - if(var12 != null) { + if (var12 != null) { var12.position += var13; } - if(var4 >= this.__z) { - break label104; + if (var4 >= this.field680) { + break label106; } PcmStream var14 = var11.firstSubStream(); - if(var14 != null) { - for(int var15 = var11.__s; var14 != null; var14 = var11.nextSubStream()) { - this.__ab_177(var14, var15 * var14.__az_179() >> 8); + if (var14 != null) { + for (int var15 = var11.field689; var14 != null; var14 = var11.nextSubStream()) { + this.method243(var14, var15 * var14.vmethod282() >> 8); } } PcmStream var18 = var11.after; var11.after = null; - if(var10 == null) { - this.__ay[var7] = var18; + if (var7 == null) { + this.field687[var8] = var18; } else { - var10.after = var18; + var7.after = var18; } - if(var18 == null) { - this.__ah[var7] = var10; + if (var18 == null) { + this.field688[var8] = var7; } var11 = var18; @@ -422,29 +422,29 @@ public class PcmPlayer { } } - var7 += 4; - ++var8; + var8 += 4; + ++var9; } } - for(var6 = 0; var6 < 8; ++var6) { - PcmStream var16 = this.__ay[var6]; - PcmStream[] var17 = this.__ay; - this.__ah[var6] = null; + for (var6 = 0; var6 < 8; ++var6) { + PcmStream var16 = this.field687[var6]; + PcmStream[] var17 = this.field687; + this.field688[var6] = null; - for(var17[var6] = null; var16 != null; var16 = var10) { - var10 = var16.after; + for (var17[var6] = null; var16 != null; var16 = var7) { + var7 = var16.after; var16.after = null; } } } - if(this.__ac < 0) { - this.__ac = 0; + if (this.field686 < 0) { + this.field686 = 0; } - if(this.stream0 != null) { - this.stream0.__e_172(var1, 0, var2); + if (this.stream0 != null) { + this.stream0.vmethod263(var1, 0, var2); } this.timeMs = class203.currentTimeMs(); @@ -455,16 +455,16 @@ public class PcmPlayer { signature = "(Ldc;II)V", garbageValue = "-1884182540" ) - final void __ab_177(PcmStream var1, int var2) { + final void method243(PcmStream var1, int var2) { int var3 = var2 >> 5; - PcmStream var4 = this.__ah[var3]; - if(var4 == null) { - this.__ay[var3] = var1; + PcmStream var4 = this.field688[var3]; + if (var4 == null) { + this.field687[var3] = var1; } else { var4.after = var1; } - this.__ah[var3] = var1; - var1.__s = var2; + this.field688[var3] = var1; + var1.field689 = var2; } } diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index 0518a56eee..de4c6a3fc7 100644 --- a/runescape-client/src/main/java/PcmStream.java +++ b/runescape-client/src/main/java/PcmStream.java @@ -16,7 +16,7 @@ public abstract class PcmStream extends Node { @Export("after") PcmStream after; @ObfuscatedName("s") - int __s; + int field689; @ObfuscatedName("t") @ObfuscatedSignature( signature = "Ldd;" @@ -43,26 +43,26 @@ public abstract class PcmStream extends Node { protected abstract PcmStream nextSubStream(); @ObfuscatedName("l") - protected abstract int __l_171(); + protected abstract int vmethod262(); @ObfuscatedName("e") - protected abstract void __e_172(int[] var1, int var2, int var3); + protected abstract void vmethod263(int[] var1, int var2, int var3); @ObfuscatedName("d") - protected abstract void __d_173(int var1); + protected abstract void vmethod264(int var1); @ObfuscatedName("az") - int __az_179() { + int vmethod282() { return 255; } @ObfuscatedName("ef") @Export("update") final void update(int[] var1, int var2, int var3) { - if(this.active) { - this.__e_172(var1, var2, var3); + if (this.active) { + this.vmethod263(var1, var2, var3); } else { - this.__d_173(var3); + this.vmethod264(var3); } } diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java index 205d7ca61f..0942f7ecd7 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -16,17 +16,17 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedSignature( signature = "Lje;" ) - NodeDeque __f; + NodeDeque field690; @ObfuscatedName("q") - int __q; + int field691; @ObfuscatedName("o") - int __o; + int field692; public PcmStreamMixer() { this.subStreams = new NodeDeque(); - this.__f = new NodeDeque(); - this.__q = 0; - this.__o = -1; + this.field690 = new NodeDeque(); + this.field691 = 0; + this.field692 = -1; } @ObfuscatedName("m") @@ -48,14 +48,14 @@ public class PcmStreamMixer extends PcmStream { } @ObfuscatedName("q") - void __q_168() { - if(this.__q > 0) { - for(PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.__f.last(); var1 != null; var1 = (PcmStreamMixerListener)this.__f.previous()) { - var1.__m -= this.__q; + void method248() { + if (this.field691 > 0) { + for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field690.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field690.previous()) { + var1.field693 -= this.field691; } - this.__o -= this.__q; - this.__q = 0; + this.field692 -= this.field691; + this.field691 = 0; } } @@ -64,27 +64,27 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedSignature( signature = "(Lgw;Ldf;)V" ) - void __w_169(Node var1, PcmStreamMixerListener var2) { - while(this.__f.sentinel != var1 && ((PcmStreamMixerListener)var1).__m <= var2.__m) { + void method249(Node var1, PcmStreamMixerListener var2) { + while (this.field690.sentinel != var1 && ((PcmStreamMixerListener)var1).field693 <= var2.field693) { var1 = var1.previous; } NodeDeque.method5270(var2, var1); - this.__o = ((PcmStreamMixerListener)this.__f.sentinel.previous).__m; + this.field692 = ((PcmStreamMixerListener)this.field690.sentinel.previous).field693; } @ObfuscatedName("o") @ObfuscatedSignature( signature = "(Ldf;)V" ) - void __o_170(PcmStreamMixerListener var1) { + void method250(PcmStreamMixerListener var1) { var1.remove(); var1.remove2(); - Node var2 = this.__f.sentinel.previous; - if(var2 == this.__f.sentinel) { - this.__o = -1; + Node var2 = this.field690.sentinel.previous; + if (var2 == this.field690.sentinel) { + this.field692 = -1; } else { - this.__o = ((PcmStreamMixerListener)var2).__m; + this.field692 = ((PcmStreamMixerListener)var2).field693; } } @@ -108,39 +108,39 @@ public class PcmStreamMixer extends PcmStream { } @ObfuscatedName("l") - protected int __l_171() { + protected int vmethod262() { return 0; } @ObfuscatedName("e") - public final synchronized void __e_172(int[] var1, int var2, int var3) { + public final synchronized void vmethod263(int[] var1, int var2, int var3) { do { - if(this.__o < 0) { + if (this.field692 < 0) { this.updateSubStreams(var1, var2, var3); return; } - if(var3 + this.__q < this.__o) { - this.__q += var3; + if (var3 + this.field691 < this.field692) { + this.field691 += var3; this.updateSubStreams(var1, var2, var3); return; } - int var4 = this.__o - this.__q; + int var4 = this.field692 - this.field691; this.updateSubStreams(var1, var2, var4); var2 += var4; var3 -= var4; - this.__q += var4; - this.__q_168(); - PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.__f.last(); + this.field691 += var4; + this.method248(); + PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field690.last(); synchronized(var5) { int var7 = var5.update(); - if(var7 < 0) { - var5.__m = 0; - this.__o_170(var5); + if (var7 < 0) { + var5.field693 = 0; + this.method250(var5); } else { - var5.__m = var7; - this.__w_169(var5.previous, var5); + var5.field693 = var7; + this.method249(var5.previous, var5); } } } while(var3 != 0); @@ -150,40 +150,40 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedName("x") @Export("updateSubStreams") void updateSubStreams(int[] var1, int var2, int var3) { - for(PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { + for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { var4.update(var1, var2, var3); } } @ObfuscatedName("d") - public final synchronized void __d_173(int var1) { + public final synchronized void vmethod264(int var1) { do { - if(this.__o < 0) { + if (this.field692 < 0) { this.skipSubStreams(var1); return; } - if(this.__q + var1 < this.__o) { - this.__q += var1; + if (this.field691 + var1 < this.field692) { + this.field691 += var1; this.skipSubStreams(var1); return; } - int var2 = this.__o - this.__q; + int var2 = this.field692 - this.field691; this.skipSubStreams(var2); var1 -= var2; - this.__q += var2; - this.__q_168(); - PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.__f.last(); + this.field691 += var2; + this.method248(); + PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field690.last(); synchronized(var3) { int var5 = var3.update(); - if(var5 < 0) { - var3.__m = 0; - this.__o_170(var3); + if (var5 < 0) { + var3.field693 = 0; + this.method250(var3); } else { - var3.__m = var5; - this.__w_169(var3.previous, var3); + var3.field693 = var5; + this.method249(var3.previous, var3); } } } while(var1 != 0); @@ -193,8 +193,8 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedName("a") @Export("skipSubStreams") void skipSubStreams(int var1) { - for(PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { - var2.__d_173(var1); + for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { + var2.vmethod264(var1); } } diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java index 4e696ca7c1..a1db067cc7 100644 --- a/runescape-client/src/main/java/PcmStreamMixerListener.java +++ b/runescape-client/src/main/java/PcmStreamMixerListener.java @@ -7,7 +7,7 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { @ObfuscatedName("m") - int __m; + int field693; @ObfuscatedName("m") @Export("remove2") diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index 6a8fa2e1dd..674c083ee3 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -11,125 +11,125 @@ public class PlatformInfo extends Node { @ObfuscatedGetter( intValue = 1318366785 ) - int __ay; + int field694; @ObfuscatedName("ah") - boolean __ah; + boolean field695; @ObfuscatedName("ak") @ObfuscatedGetter( intValue = 703904161 ) - int __ak; + int field696; @ObfuscatedName("aw") @ObfuscatedGetter( intValue = 467004305 ) - int __aw; + int field697; @ObfuscatedName("al") @ObfuscatedGetter( intValue = 2097018521 ) - int __al; + int field698; @ObfuscatedName("ab") @ObfuscatedGetter( intValue = -1667177301 ) - int __ab; + int field699; @ObfuscatedName("ae") @ObfuscatedGetter( intValue = 385109109 ) - int __ae; + int field700; @ObfuscatedName("at") - boolean __at; + boolean field701; @ObfuscatedName("ad") @ObfuscatedGetter( intValue = -1765017 ) - int __ad; + int field702; @ObfuscatedName("ap") @ObfuscatedGetter( intValue = -817941105 ) - int __ap; + int field703; @ObfuscatedName("am") @ObfuscatedGetter( intValue = 30207059 ) - int __am; + int field704; @ObfuscatedName("an") @ObfuscatedGetter( intValue = 890109053 ) - int __an; + int field705; @ObfuscatedName("az") - String __az; + String field706; @ObfuscatedName("au") - String __au; + String field707; @ObfuscatedName("ao") - String __ao; + String field708; @ObfuscatedName("aa") - String __aa; + String field709; @ObfuscatedName("ax") @ObfuscatedGetter( intValue = 871094255 ) - int __ax; + int field710; @ObfuscatedName("af") @ObfuscatedGetter( intValue = 1955966365 ) - int __af; + int field711; @ObfuscatedName("ai") @ObfuscatedGetter( intValue = 1196598207 ) - int __ai; + int field712; @ObfuscatedName("ba") @ObfuscatedGetter( intValue = -170839105 ) - int __ba; + int field713; @ObfuscatedName("bb") - String __bb; + String field714; @ObfuscatedName("bs") - String __bs; + String field715; @ObfuscatedName("bq") - int[] __bq; + int[] field716; @ObfuscatedName("bn") @ObfuscatedGetter( intValue = 1466207635 ) - int __bn; + int field717; @ObfuscatedName("bk") - String __bk; + String field718; PlatformInfo(int var1, boolean var2, int var3, int var4, int var5, int var6, int var7, boolean var8, int var9, int var10, int var11, int var12, String var13, String var14, String var15, String var16, int var17, int var18, int var19, int var20, String var21, String var22, int[] var23, int var24, String var25) { - this.__bq = new int[3]; - this.__ay = var1; - this.__ah = var2; - this.__ak = var3; - this.__aw = var4; - this.__al = var5; - this.__ab = var6; - this.__ae = var7; - this.__at = var8; - this.__ad = var9; - this.__ap = var10; - this.__am = var11; - this.__an = var12; - this.__az = var13; - this.__au = var14; - this.__ao = var15; - this.__aa = var16; - this.__ax = var17; - this.__af = var18; - this.__ai = var19; - this.__ba = var20; - this.__bb = var21; - this.__bs = var22; - this.__bq = var23; - this.__bn = var24; - this.__bk = var25; + this.field716 = new int[3]; + this.field694 = var1; + this.field695 = var2; + this.field696 = var3; + this.field697 = var4; + this.field698 = var5; + this.field699 = var6; + this.field700 = var7; + this.field701 = var8; + this.field702 = var9; + this.field703 = var10; + this.field704 = var11; + this.field705 = var12; + this.field706 = var13; + this.field707 = var14; + this.field708 = var15; + this.field709 = var16; + this.field710 = var17; + this.field711 = var18; + this.field712 = var19; + this.field713 = var20; + this.field714 = var21; + this.field715 = var22; + this.field716 = var23; + this.field717 = var24; + this.field718 = var25; } @ObfuscatedName("m") @@ -140,35 +140,35 @@ public class PlatformInfo extends Node { @Export("write") public void write(Buffer var1) { var1.writeByte(7); - var1.writeByte(this.__ay); - var1.writeByte(this.__ah?1:0); - var1.writeByte(this.__ak); - var1.writeByte(this.__aw); - var1.writeByte(this.__al); - var1.writeByte(this.__ab); - var1.writeByte(this.__ae); - var1.writeByte(this.__at?1:0); - var1.writeShort(this.__ad); - var1.writeByte(this.__ap); - var1.writeMedium(this.__am); - var1.writeShort(this.__an); - var1.writeStringCp1252NullCircumfixed(this.__az); - var1.writeStringCp1252NullCircumfixed(this.__au); - var1.writeStringCp1252NullCircumfixed(this.__ao); - var1.writeStringCp1252NullCircumfixed(this.__aa); - var1.writeByte(this.__af); - var1.writeShort(this.__ax); - var1.writeStringCp1252NullCircumfixed(this.__bb); - var1.writeStringCp1252NullCircumfixed(this.__bs); - var1.writeByte(this.__ai); - var1.writeByte(this.__ba); + var1.writeByte(this.field694); + var1.writeByte(this.field695 ? 1 : 0); + var1.writeByte(this.field696); + var1.writeByte(this.field697); + var1.writeByte(this.field698); + var1.writeByte(this.field699); + var1.writeByte(this.field700); + var1.writeByte(this.field701 ? 1 : 0); + var1.writeShort(this.field702); + var1.writeByte(this.field703); + var1.writeMedium(this.field704); + var1.writeShort(this.field705); + var1.writeStringCp1252NullCircumfixed(this.field706); + var1.writeStringCp1252NullCircumfixed(this.field707); + var1.writeStringCp1252NullCircumfixed(this.field708); + var1.writeStringCp1252NullCircumfixed(this.field709); + var1.writeByte(this.field711); + var1.writeShort(this.field710); + var1.writeStringCp1252NullCircumfixed(this.field714); + var1.writeStringCp1252NullCircumfixed(this.field715); + var1.writeByte(this.field712); + var1.writeByte(this.field713); - for(int var2 = 0; var2 < this.__bq.length; ++var2) { - var1.writeInt(this.__bq[var2]); + for (int var2 = 0; var2 < this.field716.length; ++var2) { + var1.writeInt(this.field716[var2]); } - var1.writeInt(this.__bn); - var1.writeStringCp1252NullCircumfixed(this.__bk); + var1.writeInt(this.field717); + var1.writeStringCp1252NullCircumfixed(this.field718); } @ObfuscatedName("f") @@ -179,13 +179,13 @@ public class PlatformInfo extends Node { @Export("size") public int size() { byte var1 = 38; - int var2 = var1 + Client.method1692(this.__az); - var2 += Client.method1692(this.__au); - var2 += Client.method1692(this.__ao); - var2 += Client.method1692(this.__aa); - var2 += Client.method1692(this.__bb); - var2 += Client.method1692(this.__bs); - var2 += Client.method1692(this.__bk); + int var2 = var1 + Client.method1692(this.field706); + var2 += Client.method1692(this.field707); + var2 += Client.method1692(this.field708); + var2 += Client.method1692(this.field709); + var2 += Client.method1692(this.field714); + var2 += Client.method1692(this.field715); + var2 += Client.method1692(this.field718); return var2; } } diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 54cb0e8f4d..4c3021db70 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -74,7 +74,7 @@ public final class Player extends Actor { @ObfuscatedGetter( intValue = 665272587 ) - int __k; + int field719; @ObfuscatedName("n") @ObfuscatedGetter( intValue = -1624108131 @@ -85,7 +85,7 @@ public final class Player extends Actor { @ObfuscatedGetter( intValue = -1771431457 ) - int __i; + int field720; @ObfuscatedName("a") @ObfuscatedSignature( signature = "Ldu;" @@ -96,22 +96,22 @@ public final class Player extends Actor { @ObfuscatedGetter( intValue = 1610462047 ) - int __z; + int field721; @ObfuscatedName("j") @ObfuscatedGetter( intValue = 224552403 ) - int __j; + int field722; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 305969541 ) - int __s; + int field723; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 892671055 ) - int __t; + int field724; @ObfuscatedName("y") @Export("isUnanimated") boolean isUnanimated; @@ -149,7 +149,7 @@ public final class Player extends Actor { @Export("isInClanChat") TriBool isInClanChat; @ObfuscatedName("ag") - boolean __ag; + boolean field725; @ObfuscatedName("aq") @ObfuscatedGetter( intValue = -539678769 @@ -168,7 +168,7 @@ public final class Player extends Actor { this.headIconPrayer = -1; this.actions = new String[3]; - for(int var1 = 0; var1 < 3; ++var1) { + for (int var1 = 0; var1 < 3; ++var1) { this.actions[var1] = ""; } @@ -181,7 +181,7 @@ public final class Player extends Actor { this.isHidden = false; this.isFriendTriBool = TriBool.TriBool_unknown; this.isInClanChat = TriBool.TriBool_unknown; - this.__ag = false; + this.field725 = false; } @ObfuscatedName("m") @@ -199,23 +199,23 @@ public final class Player extends Actor { this.team = 0; int[] var4 = new int[12]; + int var5; int var6; - int var7; - for(int var5 = 0; var5 < 12; ++var5) { - var6 = var1.readUnsignedByte(); - if(var6 == 0) { - var4[var5] = 0; + for (int var7 = 0; var7 < 12; ++var7) { + var5 = var1.readUnsignedByte(); + if (var5 == 0) { + var4[var7] = 0; } else { - var7 = var1.readUnsignedByte(); - var4[var5] = var7 + (var6 << 8); - if(var5 == 0 && var4[0] == 65535) { - var3 = var1.__ag_302(); + var6 = var1.readUnsignedByte(); + var4[var7] = var6 + (var5 << 8); + if (var7 == 0 && var4[0] == 65535) { + var3 = var1.method43(); break; } - if(var4[var5] >= 512) { - int var8 = Skills.getItemDefinition(var4[var5] - 512).int1; - if(var8 != 0) { + if (var4[var7] >= 512) { + int var8 = Skills.getItemDefinition(var4[var7] - 512).int1; + if (var8 != 0) { this.team = var8; } } @@ -224,70 +224,70 @@ public final class Player extends Actor { int[] var9 = new int[5]; - for(var6 = 0; var6 < 5; ++var6) { - var7 = var1.readUnsignedByte(); - if(var7 < 0 || var7 >= class229.__hz_l[var6].length) { - var7 = 0; + for (var5 = 0; var5 < 5; ++var5) { + var6 = var1.readUnsignedByte(); + if (var6 < 0 || var6 >= class229.field1137[var5].length) { + var6 = 0; } - var9[var6] = var7; + var9[var5] = var6; } - super.idleSequence = var1.__ag_302(); - if(super.idleSequence == 65535) { + super.idleSequence = var1.method43(); + if (super.idleSequence == 65535) { super.idleSequence = -1; } - super.turnLeftSequence = var1.__ag_302(); - if(super.turnLeftSequence == 65535) { + super.turnLeftSequence = var1.method43(); + if (super.turnLeftSequence == 65535) { super.turnLeftSequence = -1; } super.turnRightSequence = super.turnLeftSequence; - super.walkSequence = var1.__ag_302(); - if(super.walkSequence == 65535) { + super.walkSequence = var1.method43(); + if (super.walkSequence == 65535) { super.walkSequence = -1; } - super.walkTurnSequence = var1.__ag_302(); - if(super.walkTurnSequence == 65535) { + super.walkTurnSequence = var1.method43(); + if (super.walkTurnSequence == 65535) { super.walkTurnSequence = -1; } - super.walkTurnLeftSequence = var1.__ag_302(); - if(super.walkTurnLeftSequence == 65535) { + super.walkTurnLeftSequence = var1.method43(); + if (super.walkTurnLeftSequence == 65535) { super.walkTurnLeftSequence = -1; } - super.walkTurnRightSequence = var1.__ag_302(); - if(super.walkTurnRightSequence == 65535) { + super.walkTurnRightSequence = var1.method43(); + if (super.walkTurnRightSequence == 65535) { super.walkTurnRightSequence = -1; } - super.runSequence = var1.__ag_302(); - if(super.runSequence == 65535) { + super.runSequence = var1.method43(); + if (super.runSequence == 65535) { super.runSequence = -1; } this.username = new Username(var1.readStringCp1252NullTerminated(), KeyHandler.loginType); this.clearIsFriend(); this.clearIsInClanChat(); - if(this == Canvas.localPlayer) { + if (this == Canvas.localPlayer) { RunException.localPlayerName = this.username.getName(); } this.combatLevel = var1.readUnsignedByte(); - this.skillLevel = var1.__ag_302(); + this.skillLevel = var1.method43(); this.isHidden = var1.readUnsignedByte() == 1; - if(Client.gameBuild == 0 && Client.rights >= 2) { + if (Client.gameBuild == 0 && Client.rights >= 2) { this.isHidden = false; } - if(this.appearance == null) { + if (this.appearance == null) { this.appearance = new PlayerAppearance(); } - this.appearance.__m_385(var4, var9, var2 == 1, var3); + this.appearance.method256(var4, var9, var2 == 1, var3); } @ObfuscatedName("f") @@ -297,7 +297,7 @@ public final class Player extends Actor { ) @Export("isFriend") boolean isFriend() { - if(this.isFriendTriBool == TriBool.TriBool_unknown) { + if (this.isFriendTriBool == TriBool.TriBool_unknown) { this.checkIsFriend(); } @@ -321,7 +321,7 @@ public final class Player extends Actor { ) @Export("checkIsFriend") void checkIsFriend() { - this.isFriendTriBool = WorldMapArea.friendSystem.isFriendAndHasWorld(this.username)?TriBool.TriBool_true:TriBool.TriBool_false; + this.isFriendTriBool = WorldMapArea.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } @ObfuscatedName("o") @@ -331,7 +331,7 @@ public final class Player extends Actor { ) @Export("isClanMember") boolean isClanMember() { - if(this.isInClanChat == TriBool.TriBool_unknown) { + if (this.isInClanChat == TriBool.TriBool_unknown) { this.updateIsInClanChat(); } @@ -355,7 +355,7 @@ public final class Player extends Actor { ) @Export("updateIsInClanChat") void updateIsInClanChat() { - this.isInClanChat = PacketWriter.clanChat != null && PacketWriter.clanChat.contains(this.username)?TriBool.TriBool_true:TriBool.TriBool_false; + this.isInClanChat = PacketWriter.clanChat != null && PacketWriter.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } @ObfuscatedName("l") @@ -365,7 +365,7 @@ public final class Player extends Actor { ) @Export("transformedSize") int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1?ObjectDefinition.getNpcDefinition(this.appearance.npcTransformId).size:1; + return this.appearance != null && this.appearance.npcTransformId != -1 ? ObjectDefinition.getNpcDefinition(this.appearance.npcTransformId).size : 1; } @ObfuscatedName("e") @@ -375,61 +375,61 @@ public final class Player extends Actor { ) @Export("getModel") protected final Model getModel() { - if(this.appearance == null) { + if (this.appearance == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0?WorldMapAreaData.getSequenceDefinition(super.sequence):null; - SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null?null:WorldMapAreaData.getSequenceDefinition(super.movementSequence); + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapAreaData.getSequenceDefinition(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.idleSequence != super.movementSequence || var1 == null) ? WorldMapAreaData.getSequenceDefinition(super.movementSequence) : null; Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); - if(var3 == null) { + if (var3 == null) { return null; } else { var3.calculateBoundsCylinder(); super.defaultHeight = var3.height; Model var4; Model[] var5; - if(!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { + if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { var4 = class50.getSpotAnimationDefinition(super.spotAnimation).getModel(super.spotAnimationFrame); - if(var4 != null) { + if (var4 != null) { var4.offsetBy(0, -super.heightOffset, 0); var5 = new Model[]{var3, var4}; var3 = new Model(var5, 2); } } - if(!this.isUnanimated && this.model0 != null) { - if(Client.cycle >= this.animationCycleEnd) { + if (!this.isUnanimated && this.model0 != null) { + if (Client.cycle >= this.animationCycleEnd) { this.model0 = null; } - if(Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { + if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { var4 = this.model0; - var4.offsetBy(this.__k - super.x, this.tileHeight2 - this.tileHeight, this.__i - super.y); - if(super.orientation == 512) { + var4.offsetBy(this.field719 - super.x, this.tileHeight2 - this.tileHeight, this.field720 - super.y); + if (super.orientation == 512) { var4.rotateY90Ccw(); var4.rotateY90Ccw(); var4.rotateY90Ccw(); - } else if(super.orientation == 1024) { + } else if (super.orientation == 1024) { var4.rotateY90Ccw(); var4.rotateY90Ccw(); - } else if(super.orientation == 1536) { + } else if (super.orientation == 1536) { var4.rotateY90Ccw(); } var5 = new Model[]{var3, var4}; var3 = new Model(var5, 2); - if(super.orientation == 512) { + if (super.orientation == 512) { var4.rotateY90Ccw(); - } else if(super.orientation == 1024) { + } else if (super.orientation == 1024) { var4.rotateY90Ccw(); var4.rotateY90Ccw(); - } else if(super.orientation == 1536) { + } else if (super.orientation == 1536) { var4.rotateY90Ccw(); var4.rotateY90Ccw(); var4.rotateY90Ccw(); } - var4.offsetBy(super.x - this.__k, this.tileHeight - this.tileHeight2, super.y - this.__i); + var4.offsetBy(super.x - this.field719, this.tileHeight - this.tileHeight2, super.y - this.field720); } } @@ -444,19 +444,19 @@ public final class Player extends Actor { signature = "(IIBI)V", garbageValue = "-2066158770" ) - final void __x_130(int var1, int var2, byte var3) { - if(super.sequence != -1 && WorldMapAreaData.getSequenceDefinition(super.sequence).__s == 1) { + final void method254(int var1, int var2, byte var3) { + if (super.sequence != -1 && WorldMapAreaData.getSequenceDefinition(super.sequence).field782 == 1) { super.sequence = -1; } - super.__bc = -1; - if(var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { - if(super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { - if(var3 == 2) { + super.field12 = -1; + if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { + if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { + if (var3 == 2) { WorldMapIcon2.method316(this, var1, var2, (byte)2); } - this.__a_131(var1, var2, var3); + this.method255(var1, var2, var3); } else { this.resetPath(var1, var2); } @@ -474,8 +474,8 @@ public final class Player extends Actor { @Export("resetPath") void resetPath(int var1, int var2) { super.pathLength = 0; - super.__ch = 0; - super.__cq = 0; + super.field25 = 0; + super.field24 = 0; super.pathX[0] = var1; super.pathY[0] = var2; int var3 = this.transformedSize(); @@ -488,12 +488,12 @@ public final class Player extends Actor { signature = "(IIBI)V", garbageValue = "-1280043751" ) - final void __a_131(int var1, int var2, byte var3) { - if(super.pathLength < 9) { + final void method255(int var1, int var2, byte var3) { + if (super.pathLength < 9) { ++super.pathLength; } - for(int var4 = super.pathLength; var4 > 0; --var4) { + for (int var4 = super.pathLength; var4 > 0; --var4) { super.pathX[var4] = super.pathX[var4 - 1]; super.pathY[var4] = super.pathY[var4 - 1]; super.pathTraversed[var4] = super.pathTraversed[var4 - 1]; @@ -520,9 +520,9 @@ public final class Player extends Actor { garbageValue = "13" ) static void method1281() { - if(Client.isSpellSelected) { - Widget var0 = class204.getWidgetChild(ServerBuild.__iy_lo, Client.__client_lc); - if(var0 != null && var0.onTargetLeave != null) { + if (Client.isSpellSelected) { + Widget var0 = class204.getWidgetChild(ServerBuild.field788, Client.field220); + if (var0 != null && var0.onTargetLeave != null) { ScriptEvent var1 = new ScriptEvent(); var1.widget = var0; var1.args0 = var0.onTargetLeave; @@ -532,5 +532,6 @@ public final class Player extends Actor { Client.isSpellSelected = false; class22.method295(var0); } + } } diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java index 4a360ac4ce..bc18190bc9 100644 --- a/runescape-client/src/main/java/PlayerAppearance.java +++ b/runescape-client/src/main/java/PlayerAppearance.java @@ -8,9 +8,9 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("PlayerAppearance") public class PlayerAppearance { @ObfuscatedName("g") - public static short[] __hi_g; + public static short[] field726; @ObfuscatedName("d") - static final int[] __hi_d; + static final int[] field727; @ObfuscatedName("k") @ObfuscatedSignature( signature = "Ler;" @@ -36,32 +36,27 @@ public class PlayerAppearance { @ObfuscatedGetter( longValue = -3506189412688081513L ) - long __o; + long field728; @ObfuscatedName("u") @ObfuscatedGetter( longValue = 8217880921734028425L ) - long __u; - - static { - __hi_d = new int[]{8, 11, 4, 6, 9, 7, 10}; - PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); - } + long field729; @ObfuscatedName("m") @ObfuscatedSignature( signature = "([I[IZII)V", garbageValue = "727056871" ) - public void __m_385(int[] var1, int[] var2, boolean var3, int var4) { - if(var1 == null) { + public void method256(int[] var1, int[] var2, boolean var3, int var4) { + if (var1 == null) { var1 = new int[12]; - for(int var5 = 0; var5 < 7; ++var5) { - for(int var6 = 0; var6 < KitDefinition.__im_q; ++var6) { + for (int var5 = 0; var5 < 7; ++var5) { + for (int var6 = 0; var6 < KitDefinition.field457; ++var6) { KitDefinition var7 = WorldMapSection1.getKitDefinition(var6); - if(var7 != null && !var7.__k && var5 + (var3?7:0) == var7.__o) { - var1[__hi_d[var5]] = var6 + 256; + if (var7 != null && !var7.field460 && var5 + (var3 ? 7 : 0) == var7.field458) { + var1[field727[var5]] = var6 + 256; break; } } @@ -80,33 +75,38 @@ public class PlayerAppearance { signature = "(IZI)V", garbageValue = "-581016899" ) - public void __f_386(int var1, boolean var2) { - if(var1 != 1 || !this.isFemale) { - int var3 = this.equipment[__hi_d[var1]]; - if(var3 != 0) { + public void method257(int var1, boolean var2) { + if (var1 != 1 || !this.isFemale) { + int var3 = this.equipment[field727[var1]]; + if (var3 != 0) { var3 -= 256; KitDefinition var4; do { - if(!var2) { - --var3; - if(var3 < 0) { - var3 = KitDefinition.__im_q - 1; - } - } else { - ++var3; - if(var3 >= KitDefinition.__im_q) { - var3 = 0; - } - } + do { + do { + if (!var2) { + --var3; + if (var3 < 0) { + var3 = KitDefinition.field457 - 1; + } + } else { + ++var3; + if (var3 >= KitDefinition.field457) { + var3 = 0; + } + } - var4 = WorldMapSection1.getKitDefinition(var3); - } while(var4 == null || var4.__k || var1 + (this.isFemale?7:0) != var4.__o); + var4 = WorldMapSection1.getKitDefinition(var3); + } while(var4 == null); + } while(var4.field460); + } while(var1 + (this.isFemale ? 7 : 0) != var4.field458); - this.equipment[__hi_d[var1]] = var3 + 256; + this.equipment[field727[var1]] = var3 + 256; this.setHash(); } } + } @ObfuscatedName("q") @@ -114,19 +114,19 @@ public class PlayerAppearance { signature = "(IZI)V", garbageValue = "1416503110" ) - public void __q_387(int var1, boolean var2) { + public void method258(int var1, boolean var2) { int var3 = this.bodyColors[var1]; - if(!var2) { + if (!var2) { do { --var3; - if(var3 < 0) { - var3 = class229.__hz_l[var1].length - 1; + if (var3 < 0) { + var3 = class229.field1137[var1].length - 1; } } while(!PacketBuffer.method4062(var1, var3)); } else { do { ++var3; - if(var3 >= class229.__hz_l[var1].length) { + if (var3 >= class229.field1137[var1].length) { var3 = 0; } } while(!PacketBuffer.method4062(var1, var3)); @@ -141,10 +141,11 @@ public class PlayerAppearance { signature = "(ZB)V", garbageValue = "-90" ) - public void __w_388(boolean var1) { - if(this.isFemale != var1) { - this.__m_385((int[])null, this.bodyColors, var1, -1); + public void method259(boolean var1) { + if (this.isFemale != var1) { + this.method256((int[])null, this.bodyColors, var1, -1); } + } @ObfuscatedName("o") @@ -152,20 +153,20 @@ public class PlayerAppearance { signature = "(Lgr;I)V", garbageValue = "779254645" ) - public void __o_389(Buffer var1) { - var1.writeByte(this.isFemale?1:0); + public void method260(Buffer var1) { + var1.writeByte(this.isFemale ? 1 : 0); int var2; - for(var2 = 0; var2 < 7; ++var2) { - int var3 = this.equipment[__hi_d[var2]]; - if(var3 == 0) { + for (var2 = 0; var2 < 7; ++var2) { + int var3 = this.equipment[field727[var2]]; + if (var3 == 0) { var1.writeByte(-1); } else { var1.writeByte(var3 - 256); } } - for(var2 = 0; var2 < 5; ++var2) { + for (var2 = 0; var2 < 5; ++var2) { var1.writeByte(this.bodyColors[var2]); } @@ -178,39 +179,39 @@ public class PlayerAppearance { ) @Export("setHash") void setHash() { - long var1 = this.__o; + long var1 = this.field728; int var3 = this.equipment[5]; int var4 = this.equipment[9]; this.equipment[5] = var4; this.equipment[9] = var3; - this.__o = 0L; + this.field728 = 0L; int var5; - for(var5 = 0; var5 < 12; ++var5) { - this.__o <<= 4; - if(this.equipment[var5] >= 256) { - this.__o += (long)(this.equipment[var5] - 256); + for (var5 = 0; var5 < 12; ++var5) { + this.field728 <<= 4; + if (this.equipment[var5] >= 256) { + this.field728 += (long)(this.equipment[var5] - 256); } } - if(this.equipment[0] >= 256) { - this.__o += (long)(this.equipment[0] - 256 >> 4); + if (this.equipment[0] >= 256) { + this.field728 += (long)(this.equipment[0] - 256 >> 4); } - if(this.equipment[1] >= 256) { - this.__o += (long)(this.equipment[1] - 256 >> 8); + if (this.equipment[1] >= 256) { + this.field728 += (long)(this.equipment[1] - 256 >> 8); } - for(var5 = 0; var5 < 5; ++var5) { - this.__o <<= 3; - this.__o += (long)this.bodyColors[var5]; + for (var5 = 0; var5 < 5; ++var5) { + this.field728 <<= 3; + this.field728 += (long)this.bodyColors[var5]; } - this.__o <<= 1; - this.__o += (long)(this.isFemale?1:0); + this.field728 <<= 1; + this.field728 += (long)(this.isFemale ? 1 : 0); this.equipment[5] = var3; this.equipment[9] = var4; - if(var1 != 0L && this.__o != var1) { + if (var1 != 0L && this.field728 != var1) { PlayerAppearance_cachedModels.remove(var1); } @@ -223,109 +224,109 @@ public class PlayerAppearance { ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { - if(this.npcTransformId != -1) { + if (this.npcTransformId != -1) { return ObjectDefinition.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); } else { - long var5 = this.__o; + long var5 = this.field728; int[] var7 = this.equipment; - if(var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { + if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { var7 = new int[12]; - for(int var15 = 0; var15 < 12; ++var15) { - var7[var15] = this.equipment[var15]; + for (int var8 = 0; var8 < 12; ++var8) { + var7[var8] = this.equipment[var8]; } - if(var1.shield >= 0) { + if (var1.shield >= 0) { var5 += (long)(var1.shield - this.equipment[5] << 40); var7[5] = var1.shield; } - if(var1.weapon >= 0) { + if (var1.weapon >= 0) { var5 += (long)(var1.weapon - this.equipment[3] << 48); var7[3] = var1.weapon; } } - Model var8 = (Model)PlayerAppearance_cachedModels.get(var5); - if(var8 == null) { + Model var15 = (Model)PlayerAppearance_cachedModels.get(var5); + if (var15 == null) { boolean var9 = false; - int var11; - for(int var10 = 0; var10 < 12; ++var10) { - var11 = var7[var10]; - if(var11 >= 256 && var11 < 512 && !WorldMapSection1.getKitDefinition(var11 - 256).__w_413()) { + int var10; + for (int var11 = 0; var11 < 12; ++var11) { + var10 = var7[var11]; + if (var10 >= 256 && var10 < 512 && !WorldMapSection1.getKitDefinition(var10 - 256).method159()) { var9 = true; } - if(var11 >= 512 && !Skills.getItemDefinition(var11 - 512).__z_431(this.isFemale)) { + if (var10 >= 512 && !Skills.getItemDefinition(var10 - 512).method145(this.isFemale)) { var9 = true; } } - if(var9) { - if(this.__u != -1L) { - var8 = (Model)PlayerAppearance_cachedModels.get(this.__u); + if (var9) { + if (this.field729 != -1L) { + var15 = (Model)PlayerAppearance_cachedModels.get(this.field729); } - if(var8 == null) { + if (var15 == null) { return null; } } - if(var8 == null) { - ModelData[] var16 = new ModelData[12]; - var11 = 0; + if (var15 == null) { + ModelData[] var17 = new ModelData[12]; + var10 = 0; - int var13; - for(int var12 = 0; var12 < 12; ++var12) { - var13 = var7[var12]; + int var12; + for (int var13 = 0; var13 < 12; ++var13) { + var12 = var7[var13]; ModelData var14; - if(var13 >= 256 && var13 < 512) { - var14 = WorldMapSection1.getKitDefinition(var13 - 256).__o_414(); - if(var14 != null) { - var16[var11++] = var14; + if (var12 >= 256 && var12 < 512) { + var14 = WorldMapSection1.getKitDefinition(var12 - 256).method160(); + if (var14 != null) { + var17[var10++] = var14; } } - if(var13 >= 512) { - var14 = Skills.getItemDefinition(var13 - 512).__j_432(this.isFemale); - if(var14 != null) { - var16[var11++] = var14; + if (var12 >= 512) { + var14 = Skills.getItemDefinition(var12 - 512).method146(this.isFemale); + if (var14 != null) { + var17[var10++] = var14; } } } - ModelData var18 = new ModelData(var16, var11); + ModelData var18 = new ModelData(var17, var10); - for(var13 = 0; var13 < 5; ++var13) { - if(this.bodyColors[var13] < class229.__hz_l[var13].length) { - var18.recolor(__hi_g[var13], class229.__hz_l[var13][this.bodyColors[var13]]); + for (var12 = 0; var12 < 5; ++var12) { + if (this.bodyColors[var12] < class229.field1137[var12].length) { + var18.recolor(field726[var12], class229.field1137[var12][this.bodyColors[var12]]); } - if(this.bodyColors[var13] < IndexCacheLoader.__bd_x[var13].length) { - var18.recolor(class227.__hj_e[var13], IndexCacheLoader.__bd_x[var13][this.bodyColors[var13]]); + if (this.bodyColors[var12] < IndexCacheLoader.field406[var12].length) { + var18.recolor(class227.field1136[var12], IndexCacheLoader.field406[var12][this.bodyColors[var12]]); } } - var8 = var18.toModel(64, 850, -30, -50, -30); - PlayerAppearance_cachedModels.put(var8, var5); - this.__u = var5; + var15 = var18.toModel(64, 850, -30, -50, -30); + PlayerAppearance_cachedModels.put(var15, var5); + this.field729 = var5; } } - if(var1 == null && var3 == null) { - return var8; + if (var1 == null && var3 == null) { + return var15; } else { - Model var17; - if(var1 != null && var3 != null) { - var17 = var1.animateSequence2(var8, var2, var3, var4); - } else if(var1 != null) { - var17 = var1.animateSequence(var8, var2); + Model var16; + if (var1 != null && var3 != null) { + var16 = var1.animateSequence2(var15, var2, var3, var4); + } else if (var1 != null) { + var16 = var1.animateSequence(var15, var2); } else { - var17 = var3.animateSequence(var8, var4); + var16 = var3.animateSequence(var15, var4); } - return var17; + return var16; } } } @@ -337,57 +338,57 @@ public class PlayerAppearance { ) @Export("getModelData") ModelData getModelData() { - if(this.npcTransformId != -1) { + if (this.npcTransformId != -1) { return ObjectDefinition.getNpcDefinition(this.npcTransformId).getModelData(); } else { boolean var1 = false; - int var3; - for(int var2 = 0; var2 < 12; ++var2) { - var3 = this.equipment[var2]; - if(var3 >= 256 && var3 < 512 && !WorldMapSection1.getKitDefinition(var3 - 256).__u_415()) { + int var2; + for (int var3 = 0; var3 < 12; ++var3) { + var2 = this.equipment[var3]; + if (var2 >= 256 && var2 < 512 && !WorldMapSection1.getKitDefinition(var2 - 256).method161()) { var1 = true; } - if(var3 >= 512 && !Skills.getItemDefinition(var3 - 512).__s_433(this.isFemale)) { + if (var2 >= 512 && !Skills.getItemDefinition(var2 - 512).method147(this.isFemale)) { var1 = true; } } - if(var1) { + if (var1) { return null; } else { ModelData[] var7 = new ModelData[12]; - var3 = 0; + var2 = 0; - int var5; - for(int var4 = 0; var4 < 12; ++var4) { - var5 = this.equipment[var4]; + int var4; + for (int var5 = 0; var5 < 12; ++var5) { + var4 = this.equipment[var5]; ModelData var6; - if(var5 >= 256 && var5 < 512) { - var6 = WorldMapSection1.getKitDefinition(var5 - 256).__g_416(); - if(var6 != null) { - var7[var3++] = var6; + if (var4 >= 256 && var4 < 512) { + var6 = WorldMapSection1.getKitDefinition(var4 - 256).method162(); + if (var6 != null) { + var7[var2++] = var6; } } - if(var5 >= 512) { - var6 = Skills.getItemDefinition(var5 - 512).__t_434(this.isFemale); - if(var6 != null) { - var7[var3++] = var6; + if (var4 >= 512) { + var6 = Skills.getItemDefinition(var4 - 512).method148(this.isFemale); + if (var6 != null) { + var7[var2++] = var6; } } } - ModelData var8 = new ModelData(var7, var3); + ModelData var8 = new ModelData(var7, var2); - for(var5 = 0; var5 < 5; ++var5) { - if(this.bodyColors[var5] < class229.__hz_l[var5].length) { - var8.recolor(__hi_g[var5], class229.__hz_l[var5][this.bodyColors[var5]]); + for (var4 = 0; var4 < 5; ++var4) { + if (this.bodyColors[var4] < class229.field1137[var4].length) { + var8.recolor(field726[var4], class229.field1137[var4][this.bodyColors[var4]]); } - if(this.bodyColors[var5] < IndexCacheLoader.__bd_x[var5].length) { - var8.recolor(class227.__hj_e[var5], IndexCacheLoader.__bd_x[var5][this.bodyColors[var5]]); + if (this.bodyColors[var4] < IndexCacheLoader.field406[var4].length) { + var8.recolor(class227.field1136[var4], IndexCacheLoader.field406[var4][this.bodyColors[var4]]); } } @@ -403,6 +404,11 @@ public class PlayerAppearance { ) @Export("getChatHeadId") public int getChatHeadId() { - return this.npcTransformId == -1?(this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20):305419896 + ObjectDefinition.getNpcDefinition(this.npcTransformId).id; + return this.npcTransformId == -1 ? (this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20) : 305419896 + ObjectDefinition.getNpcDefinition(this.npcTransformId).id; + } + + static { + field727 = new int[]{8, 11, 4, 6, 9, 7, 10}; + PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); } } diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index 8d3c185b3e..e42ad431ce 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -44,8 +44,9 @@ public enum PlayerType implements Enumerated { ) @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true); + @ObfuscatedName("ak") - static Image __ij_ak; + static Image field730; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 1999564657 @@ -65,7 +66,7 @@ public enum PlayerType implements Enumerated { @Export("isUser") public final boolean isUser; - PlayerType(int var3, int var4, boolean var5, boolean var6, boolean var7) { + private PlayerType(int var3, int var4, boolean var5, boolean var6, boolean var7) { this.id = var3; this.modIcon = var4; this.isPrivileged = var6; @@ -90,12 +91,12 @@ public enum PlayerType implements Enumerated { @Export("clearItemContainer") static void clearItemContainer(int var0) { ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if(var1 != null) { - for(int var2 = 0; var2 < var1.ids.length; ++var2) { + if (var1 != null) { + for (int var2 = 0; var2 < var1.ids.length; ++var2) { var1.ids[var2] = -1; var1.quantities[var2] = 0; } - } + } } diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index 5a6fc3c3c4..8ce53385e0 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -10,14 +10,14 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Players") public class Players { @ObfuscatedName("q") - static byte[] __cq_q; + static byte[] field731; @ObfuscatedName("w") - static byte[] __cq_w; + static byte[] field732; @ObfuscatedName("o") @ObfuscatedSignature( signature = "[Lgr;" ) - static Buffer[] __cq_o; + static Buffer[] field733; @ObfuscatedName("u") @ObfuscatedGetter( intValue = -766468303 @@ -31,9 +31,9 @@ public class Players { @ObfuscatedGetter( intValue = 945250525 ) - static int __cq_l; + static int field734; @ObfuscatedName("e") - static int[] __cq_e; + static int[] field735; @ObfuscatedName("x") @Export("Players_regions") static int[] Players_regions; @@ -47,14 +47,14 @@ public class Players { @ObfuscatedGetter( intValue = -22568397 ) - static int __cq_n; + static int field736; @ObfuscatedName("i") - static int[] __cq_i; + static int[] field737; @ObfuscatedName("a") @ObfuscatedSignature( signature = "Lgr;" ) - static Buffer __cq_a; + static Buffer field738; @ObfuscatedName("y") @ObfuscatedSignature( signature = "Lgr;" @@ -62,29 +62,13 @@ public class Players { @Export("NetCache_reference") public static Buffer NetCache_reference; - static { - __cq_q = new byte[2048]; - __cq_w = new byte[2048]; - __cq_o = new Buffer[2048]; - Players_count = 0; - Players_indices = new int[2048]; - __cq_l = 0; - __cq_e = new int[2048]; - Players_regions = new int[2048]; - Players_orientations = new int[2048]; - Players_targetIndices = new int[2048]; - __cq_n = 0; - __cq_i = new int[2048]; - __cq_a = new Buffer(new byte[5000]); - } - @ObfuscatedName("f") @ObfuscatedSignature( signature = "(Ljava/lang/Throwable;Ljava/lang/String;)Lfx;" ) public static RunException method2120(Throwable var0, String var1) { RunException var2; - if(var0 instanceof RunException) { + if (var0 instanceof RunException) { var2 = (RunException)var0; var2.string = var2.string + ' ' + var1; } else { @@ -101,30 +85,30 @@ public class Players { ) @Export("newPcmPlayer") public static final PcmPlayer newPcmPlayer(TaskHandler var0, int var1, int var2) { - if(var1 >= 0 && var1 < 2) { - if(var2 < 256) { + if (var1 >= 0 && var1 < 2) { + if (var2 < 256) { var2 = 256; } try { PcmPlayer var3 = class65.pcmPlayerProvider.player(); - var3.samples = new int[(PcmPlayer.isStereo?2:1) * 256]; + var3.samples = new int[(PcmPlayer.isStereo ? 2 : 1) * 256]; var3.frequency = var2; var3.init(); var3.capacity = (var2 & -1024) + 1024; - if(var3.capacity > 16384) { + if (var3.capacity > 16384) { var3.capacity = 16384; } var3.open(var3.capacity); - if(Login.pcmPlayerCount > 0 && Messages.soundSystem == null) { + if (Login.pcmPlayerCount > 0 && Messages.soundSystem == null) { Messages.soundSystem = new SoundSystem(); Friend.soundSystemExecutor = Executors.newScheduledThreadPool(1); Friend.soundSystemExecutor.scheduleAtFixedRate(Messages.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); } - if(Messages.soundSystem != null) { - if(Messages.soundSystem.players[var1] != null) { + if (Messages.soundSystem != null) { + if (Messages.soundSystem.players[var1] != null) { throw new IllegalArgumentException(); } @@ -146,9 +130,9 @@ public class Players { garbageValue = "46802049" ) static final void method2112(int var0, int var1, int var2, int var3) { - for(int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { - if(Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { - Client.__client_od[var4] = true; + for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { + if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { + Client.field100[var4] = true; } } @@ -161,25 +145,39 @@ public class Players { ) @Export("clickWidget") static final void clickWidget(Widget var0, int var1, int var2) { - if(Client.clickedWidget == null && !Client.isMenuOpen) { - if(var0 != null && class48.method869(var0) != null) { - Client.clickedWidget = var0; - Client.clickedWidgetParent = class48.method869(var0); - Client.widgetClickX = var1; - Client.widgetClickY = var2; - MouseRecorder.widgetDragDuration = 0; - Client.isDraggingWidget = false; - int var3 = Client.menuOptionsCount - 1; - if(var3 != -1) { - UnitPriceComparator.tempMenuAction = new MenuAction(); - UnitPriceComparator.tempMenuAction.argument1 = Client.menuArguments1[var3]; - UnitPriceComparator.tempMenuAction.argument2 = Client.menuArguments2[var3]; - UnitPriceComparator.tempMenuAction.opcode = Client.menuOpcodes[var3]; - UnitPriceComparator.tempMenuAction.argument0 = Client.menuArguments0[var3]; - UnitPriceComparator.tempMenuAction.action = Client.menuActions[var3]; - } - + if (Client.clickedWidget == null && !Client.isMenuOpen && var0 != null && class48.method869(var0) != null) { + Client.clickedWidget = var0; + Client.clickedWidgetParent = class48.method869(var0); + Client.widgetClickX = var1; + Client.widgetClickY = var2; + MouseRecorder.widgetDragDuration = 0; + Client.isDraggingWidget = false; + int var3 = Client.menuOptionsCount - 1; + if (var3 != -1) { + UnitPriceComparator.tempMenuAction = new MenuAction(); + UnitPriceComparator.tempMenuAction.argument1 = Client.menuArguments1[var3]; + UnitPriceComparator.tempMenuAction.argument2 = Client.menuArguments2[var3]; + UnitPriceComparator.tempMenuAction.opcode = Client.menuOpcodes[var3]; + UnitPriceComparator.tempMenuAction.argument0 = Client.menuArguments0[var3]; + UnitPriceComparator.tempMenuAction.action = Client.menuActions[var3]; } } + + } + + static { + field731 = new byte[2048]; + field732 = new byte[2048]; + field733 = new Buffer[2048]; + Players_count = 0; + Players_indices = new int[2048]; + field734 = 0; + field735 = new int[2048]; + Players_regions = new int[2048]; + Players_orientations = new int[2048]; + Players_targetIndices = new int[2048]; + field736 = 0; + field737 = new int[2048]; + field738 = new Buffer(new byte[5000]); } } diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index e3e2945ea1..75b778240c 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -154,7 +154,7 @@ public final class Projectile extends Entity { this.endHeight = var11; this.isMoving = false; int var12 = class50.getSpotAnimationDefinition(this.id).sequence; - if(var12 != -1) { + if (var12 != -1) { this.sequenceDefinition = WorldMapAreaData.getSequenceDefinition(var12); } else { this.sequenceDefinition = null; @@ -170,7 +170,7 @@ public final class Projectile extends Entity { @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { double var5; - if(!this.isMoving) { + if (!this.isMoving) { var5 = (double)(var1 - this.sourceX); double var7 = (double)(var2 - this.sourceY); double var9 = Math.sqrt(var5 * var5 + var7 * var7); @@ -183,7 +183,7 @@ public final class Projectile extends Entity { this.speedX = ((double)var1 - this.x) / var5; this.speedY = ((double)var2 - this.y) / var5; this.speed = Math.sqrt(this.speedY * this.speedY + this.speedX * this.speedX); - if(!this.isMoving) { + if (!this.isMoving) { this.speedZ = -this.speed * Math.tan(0.02454369D * (double)this.slope); } @@ -204,13 +204,13 @@ public final class Projectile extends Entity { this.speedZ += this.accelerationZ * (double)var1; this.yaw = (int)(Math.atan2(this.speedX, this.speedY) * 325.949D) + 1024 & 2047; this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047; - if(this.sequenceDefinition != null) { + if (this.sequenceDefinition != null) { this.frameCycle += var1; - while(true) { + while (true) { do { do { - if(this.frameCycle <= this.sequenceDefinition.frameLengths[this.frame]) { + if (this.frameCycle <= this.sequenceDefinition.frameLengths[this.frame]) { return; } @@ -235,7 +235,7 @@ public final class Projectile extends Entity { protected final Model getModel() { SpotAnimationDefinition var1 = class50.getSpotAnimationDefinition(this.id); Model var2 = var1.getModel(this.frame); - if(var2 == null) { + if (var2 == null) { return null; } else { var2.rotateZ(this.pitch); @@ -250,10 +250,10 @@ public final class Projectile extends Entity { ) @Export("byteArrayToObject") public static Object byteArrayToObject(byte[] var0, boolean var1) { - if(var0 == null) { + if (var0 == null) { return null; } else { - if(var0.length > 136 && !AbstractByteArrayCopier.directBufferUnavailable) { + if (var0.length > 136 && !AbstractByteArrayCopier.directBufferUnavailable) { try { DirectByteArrayCopier var2 = new DirectByteArrayCopier(); var2.set(var0); diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java index 477a8d02cc..fa866cd41a 100644 --- a/runescape-client/src/main/java/Rasterizer2D.java +++ b/runescape-client/src/main/java/Rasterizer2D.java @@ -28,13 +28,6 @@ public class Rasterizer2D extends DualNode { @Export("Rasterizer2D_xClipEnd") public static int Rasterizer2D_xClipEnd; - static { - Rasterizer2D_yClipStart = 0; - Rasterizer2D_yClipEnd = 0; - Rasterizer2D_xClipStart = 0; - Rasterizer2D_xClipEnd = 0; - } - @ObfuscatedName("dp") @Export("Rasterizer2D_replace") public static void Rasterizer2D_replace(int[] var0, int var1, int var2) { @@ -56,19 +49,19 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("di") @Export("Rasterizer2D_setClip") public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) { - if(var0 < 0) { + if (var0 < 0) { var0 = 0; } - if(var1 < 0) { + if (var1 < 0) { var1 = 0; } - if(var2 > Rasterizer2D_width) { + if (var2 > Rasterizer2D_width) { var2 = Rasterizer2D_width; } - if(var3 > Rasterizer2D_height) { + if (var3 > Rasterizer2D_height) { var3 = Rasterizer2D_height; } @@ -81,19 +74,19 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("dc") @Export("Rasterizer2D_expandClip") public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) { - if(Rasterizer2D_xClipStart < var0) { + if (Rasterizer2D_xClipStart < var0) { Rasterizer2D_xClipStart = var0; } - if(Rasterizer2D_yClipStart < var1) { + if (Rasterizer2D_yClipStart < var1) { Rasterizer2D_yClipStart = var1; } - if(Rasterizer2D_xClipEnd > var2) { + if (Rasterizer2D_xClipEnd > var2) { Rasterizer2D_xClipEnd = var2; } - if(Rasterizer2D_yClipEnd > var3) { + if (Rasterizer2D_yClipEnd > var3) { Rasterizer2D_yClipEnd = var3; } @@ -123,7 +116,7 @@ public class Rasterizer2D extends DualNode { int var0 = 0; int var1; - for(var1 = Rasterizer2D_width * Rasterizer2D_height - 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) { + for (var1 = Rasterizer2D_width * Rasterizer2D_height - 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) { Rasterizer2D_pixels[var0++] = 0; Rasterizer2D_pixels[var0++] = 0; Rasterizer2D_pixels[var0++] = 0; @@ -133,8 +126,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_pixels[var0++] = 0; } - for(var1 += 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) { - ; + for (var1 += 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) { } } @@ -142,20 +134,20 @@ public class Rasterizer2D extends DualNode { @Export("drawCircle") @ObfuscatedName("dy") static void drawCircle(int var0, int var1, int var2, int var3) { - if(var2 == 0) { + if (var2 == 0) { Rasterizer2D_setPixel(var0, var1, var3); } else { - if(var2 < 0) { + if (var2 < 0) { var2 = -var2; } int var4 = var1 - var2; - if(var4 < Rasterizer2D_yClipStart) { + if (var4 < Rasterizer2D_yClipStart) { var4 = Rasterizer2D_yClipStart; } int var5 = var2 + var1 + 1; - if(var5 > Rasterizer2D_yClipEnd) { + if (var5 > Rasterizer2D_yClipEnd) { var5 = Rasterizer2D_yClipEnd; } @@ -165,7 +157,7 @@ public class Rasterizer2D extends DualNode { int var9 = var1 - var4; int var10 = var9 * var9; int var11 = var10 - var9; - if(var1 > var5) { + if (var1 > var5) { var1 = var5; } @@ -173,25 +165,25 @@ public class Rasterizer2D extends DualNode { int var13; int var14; int var15; - while(var6 < var1) { - while(var11 <= var7 || var10 <= var7) { + while (var6 < var1) { + while (var11 <= var7 || var10 <= var7) { var10 = var10 + var8 + var8; var11 += var8++ + var8; } var12 = var0 - var8 + 1; - if(var12 < Rasterizer2D_xClipStart) { + if (var12 < Rasterizer2D_xClipStart) { var12 = Rasterizer2D_xClipStart; } var13 = var0 + var8; - if(var13 > Rasterizer2D_xClipEnd) { + if (var13 > Rasterizer2D_xClipEnd) { var13 = Rasterizer2D_xClipEnd; } var14 = var12 + var6 * Rasterizer2D_width; - for(var15 = var12; var15 < var13; ++var15) { + for (var15 = var12; var15 < var13; ++var15) { Rasterizer2D_pixels[var14++] = var3; } @@ -205,43 +197,43 @@ public class Rasterizer2D extends DualNode { var11 = var7 + var9 * var9; var10 = var11 - var2; - for(var11 -= var9; var6 < var5; var10 += var9++ + var9) { - while(var11 > var7 && var10 > var7) { + for (var11 -= var9; var6 < var5; var10 += var9++ + var9) { + while (var11 > var7 && var10 > var7) { var11 -= var8-- + var8; var10 -= var8 + var8; } var12 = var0 - var8; - if(var12 < Rasterizer2D_xClipStart) { + if (var12 < Rasterizer2D_xClipStart) { var12 = Rasterizer2D_xClipStart; } var13 = var0 + var8; - if(var13 > Rasterizer2D_xClipEnd - 1) { + if (var13 > Rasterizer2D_xClipEnd - 1) { var13 = Rasterizer2D_xClipEnd - 1; } var14 = var12 + var6 * Rasterizer2D_width; - for(var15 = var12; var15 <= var13; ++var15) { + for (var15 = var12; var15 <= var13; ++var15) { Rasterizer2D_pixels[var14++] = var3; } ++var6; var11 = var11 + var9 + var9; } - } + } @ObfuscatedName("dk") @Export("Rasterizer2D_drawCircleAlpha") public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) { - if(var4 != 0) { - if(var4 == 256) { + if (var4 != 0) { + if (var4 == 256) { drawCircle(var0, var1, var2, var3); } else { - if(var2 < 0) { + if (var2 < 0) { var2 = -var2; } @@ -249,122 +241,122 @@ public class Rasterizer2D extends DualNode { int var6 = (var3 >> 16 & 255) * var4; int var7 = (var3 >> 8 & 255) * var4; int var8 = var4 * (var3 & 255); - int var12 = var1 - var2; - if(var12 < Rasterizer2D_yClipStart) { - var12 = Rasterizer2D_yClipStart; + int var9 = var1 - var2; + if (var9 < Rasterizer2D_yClipStart) { + var9 = Rasterizer2D_yClipStart; } - int var13 = var2 + var1 + 1; - if(var13 > Rasterizer2D_yClipEnd) { - var13 = Rasterizer2D_yClipEnd; + int var10 = var2 + var1 + 1; + if (var10 > Rasterizer2D_yClipEnd) { + var10 = Rasterizer2D_yClipEnd; } - int var14 = var12; - int var15 = var2 * var2; - int var16 = 0; - int var17 = var1 - var12; - int var18 = var17 * var17; - int var19 = var18 - var17; - if(var1 > var13) { - var1 = var13; + int var11 = var9; + int var12 = var2 * var2; + int var13 = 0; + int var14 = var1 - var9; + int var15 = var14 * var14; + int var16 = var15 - var14; + if (var1 > var10) { + var1 = var10; } - int var9; - int var10; - int var11; + int var17; + int var18; + int var19; int var20; int var21; int var22; int var23; int var24; - while(var14 < var1) { - while(var19 <= var15 || var18 <= var15) { - var18 = var18 + var16 + var16; - var19 += var16++ + var16; + while (var11 < var1) { + while (var16 <= var12 || var15 <= var12) { + var15 = var15 + var13 + var13; + var16 += var13++ + var13; } - var20 = var0 - var16 + 1; - if(var20 < Rasterizer2D_xClipStart) { + var20 = var0 - var13 + 1; + if (var20 < Rasterizer2D_xClipStart) { var20 = Rasterizer2D_xClipStart; } - var21 = var0 + var16; - if(var21 > Rasterizer2D_xClipEnd) { + var21 = var0 + var13; + if (var21 > Rasterizer2D_xClipEnd) { var21 = Rasterizer2D_xClipEnd; } - var22 = var20 + var14 * Rasterizer2D_width; + var22 = var20 + var11 * Rasterizer2D_width; - for(var23 = var20; var23 < var21; ++var23) { - var9 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255); - var10 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5; - var11 = var5 * (Rasterizer2D_pixels[var22] & 255); - var24 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); + for (var23 = var20; var23 < var21; ++var23) { + var17 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255); + var18 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5; + var19 = var5 * (Rasterizer2D_pixels[var22] & 255); + var24 = (var8 + var19 >> 8) + (var6 + var17 >> 8 << 16) + (var7 + var18 >> 8 << 8); Rasterizer2D_pixels[var22++] = var24; } - ++var14; - var18 -= var17-- + var17; - var19 -= var17 + var17; + ++var11; + var15 -= var14-- + var14; + var16 -= var14 + var14; } - var16 = var2; - var17 = -var17; - var19 = var15 + var17 * var17; - var18 = var19 - var2; + var13 = var2; + var14 = -var14; + var16 = var12 + var14 * var14; + var15 = var16 - var2; - for(var19 -= var17; var14 < var13; var18 += var17++ + var17) { - while(var19 > var15 && var18 > var15) { - var19 -= var16-- + var16; - var18 -= var16 + var16; + for (var16 -= var14; var11 < var10; var15 += var14++ + var14) { + while (var16 > var12 && var15 > var12) { + var16 -= var13-- + var13; + var15 -= var13 + var13; } - var20 = var0 - var16; - if(var20 < Rasterizer2D_xClipStart) { + var20 = var0 - var13; + if (var20 < Rasterizer2D_xClipStart) { var20 = Rasterizer2D_xClipStart; } - var21 = var0 + var16; - if(var21 > Rasterizer2D_xClipEnd - 1) { + var21 = var0 + var13; + if (var21 > Rasterizer2D_xClipEnd - 1) { var21 = Rasterizer2D_xClipEnd - 1; } - var22 = var20 + var14 * Rasterizer2D_width; + var22 = var20 + var11 * Rasterizer2D_width; - for(var23 = var20; var23 <= var21; ++var23) { - var9 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255); - var10 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5; - var11 = var5 * (Rasterizer2D_pixels[var22] & 255); - var24 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); + for (var23 = var20; var23 <= var21; ++var23) { + var17 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255); + var18 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5; + var19 = var5 * (Rasterizer2D_pixels[var22] & 255); + var24 = (var8 + var19 >> 8) + (var6 + var17 >> 8 << 16) + (var7 + var18 >> 8 << 8); Rasterizer2D_pixels[var22++] = var24; } - ++var14; - var19 = var19 + var17 + var17; + ++var11; + var16 = var16 + var14 + var14; } - } } + } @ObfuscatedName("dl") @Export("Rasterizer2D_fillRectangleAlpha") public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { - if(var0 < Rasterizer2D_xClipStart) { + if (var0 < Rasterizer2D_xClipStart) { var2 -= Rasterizer2D_xClipStart - var0; var0 = Rasterizer2D_xClipStart; } - if(var1 < Rasterizer2D_yClipStart) { + if (var1 < Rasterizer2D_yClipStart) { var3 -= Rasterizer2D_yClipStart - var1; var1 = Rasterizer2D_yClipStart; } - if(var0 + var2 > Rasterizer2D_xClipEnd) { + if (var0 + var2 > Rasterizer2D_xClipEnd) { var2 = Rasterizer2D_xClipEnd - var0; } - if(var3 + var1 > Rasterizer2D_yClipEnd) { + if (var3 + var1 > Rasterizer2D_yClipEnd) { var3 = Rasterizer2D_yClipEnd - var1; } @@ -373,8 +365,8 @@ public class Rasterizer2D extends DualNode { int var7 = Rasterizer2D_width - var2; int var8 = var0 + Rasterizer2D_width * var1; - for(int var9 = 0; var9 < var3; ++var9) { - for(int var10 = -var2; var10 < 0; ++var10) { + for (int var9 = 0; var9 < var3; ++var9) { + for (int var10 = -var2; var10 < 0; ++var10) { int var11 = Rasterizer2D_pixels[var8]; var11 = ((var11 & 16711935) * var6 >> 8 & 16711935) + (var6 * (var11 & 65280) >> 8 & 65280); Rasterizer2D_pixels[var8++] = var11 + var4; @@ -388,29 +380,29 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("dr") @Export("Rasterizer2D_fillRectangle") public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { - if(var0 < Rasterizer2D_xClipStart) { + if (var0 < Rasterizer2D_xClipStart) { var2 -= Rasterizer2D_xClipStart - var0; var0 = Rasterizer2D_xClipStart; } - if(var1 < Rasterizer2D_yClipStart) { + if (var1 < Rasterizer2D_yClipStart) { var3 -= Rasterizer2D_yClipStart - var1; var1 = Rasterizer2D_yClipStart; } - if(var0 + var2 > Rasterizer2D_xClipEnd) { + if (var0 + var2 > Rasterizer2D_xClipEnd) { var2 = Rasterizer2D_xClipEnd - var0; } - if(var3 + var1 > Rasterizer2D_yClipEnd) { + if (var3 + var1 > Rasterizer2D_yClipEnd) { var3 = Rasterizer2D_yClipEnd - var1; } int var5 = Rasterizer2D_width - var2; int var6 = var0 + Rasterizer2D_width * var1; - for(int var7 = -var3; var7 < 0; ++var7) { - for(int var8 = -var2; var8 < 0; ++var8) { + for (int var7 = -var3; var7 < 0; ++var7) { + for (int var8 = -var2; var8 < 0; ++var8) { Rasterizer2D_pixels[var6++] = var4; } @@ -422,80 +414,80 @@ public class Rasterizer2D extends DualNode { @Export("drawGradient") @ObfuscatedName("dw") public static void drawGradient(int var0, int var1, int var2, int var3, int var4, int var5) { - if(var2 > 0 && var3 > 0) { + if (var2 > 0 && var3 > 0) { int var6 = 0; int var7 = 65536 / var3; - if(var0 < Rasterizer2D_xClipStart) { + if (var0 < Rasterizer2D_xClipStart) { var2 -= Rasterizer2D_xClipStart - var0; var0 = Rasterizer2D_xClipStart; } - if(var1 < Rasterizer2D_yClipStart) { + if (var1 < Rasterizer2D_yClipStart) { var6 += (Rasterizer2D_yClipStart - var1) * var7; var3 -= Rasterizer2D_yClipStart - var1; var1 = Rasterizer2D_yClipStart; } - if(var0 + var2 > Rasterizer2D_xClipEnd) { + if (var0 + var2 > Rasterizer2D_xClipEnd) { var2 = Rasterizer2D_xClipEnd - var0; } - if(var3 + var1 > Rasterizer2D_yClipEnd) { + if (var3 + var1 > Rasterizer2D_yClipEnd) { var3 = Rasterizer2D_yClipEnd - var1; } int var8 = Rasterizer2D_width - var2; int var9 = var0 + Rasterizer2D_width * var1; - for(int var10 = -var3; var10 < 0; ++var10) { + for (int var10 = -var3; var10 < 0; ++var10) { int var11 = 65536 - var6 >> 8; int var12 = var6 >> 8; int var13 = (var12 * (var5 & 16711935) + var11 * (var4 & 16711935) & -16711936) + (var12 * (var5 & 65280) + var11 * (var4 & 65280) & 16711680) >>> 8; - for(int var14 = -var2; var14 < 0; ++var14) { + for (int var14 = -var2; var14 < 0; ++var14) { Rasterizer2D_pixels[var9++] = var13; } var9 += var8; var6 += var7; } - } + } @ObfuscatedName("dv") @Export("drawGradientAlpha") public static void drawGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if(var2 > 0 && var3 > 0) { + if (var2 > 0 && var3 > 0) { int var8 = 0; int var9 = 65536 / var3; - if(var0 < Rasterizer2D_xClipStart) { + if (var0 < Rasterizer2D_xClipStart) { var2 -= Rasterizer2D_xClipStart - var0; var0 = Rasterizer2D_xClipStart; } - if(var1 < Rasterizer2D_yClipStart) { + if (var1 < Rasterizer2D_yClipStart) { var8 += (Rasterizer2D_yClipStart - var1) * var9; var3 -= Rasterizer2D_yClipStart - var1; var1 = Rasterizer2D_yClipStart; } - if(var0 + var2 > Rasterizer2D_xClipEnd) { + if (var0 + var2 > Rasterizer2D_xClipEnd) { var2 = Rasterizer2D_xClipEnd - var0; } - if(var3 + var1 > Rasterizer2D_yClipEnd) { + if (var3 + var1 > Rasterizer2D_yClipEnd) { var3 = Rasterizer2D_yClipEnd - var1; } int var10 = Rasterizer2D_width - var2; int var11 = var0 + Rasterizer2D_width * var1; - for(int var12 = -var3; var12 < 0; ++var12) { + for (int var12 = -var3; var12 < 0; ++var12) { int var13 = 65536 - var8 >> 8; int var14 = var8 >> 8; int var15 = (var13 * var6 + var14 * var7 & 65280) >>> 8; - if(var15 == 0) { + if (var15 == 0) { var11 += Rasterizer2D_width; var8 += var9; } else { @@ -503,9 +495,9 @@ public class Rasterizer2D extends DualNode { int var17 = 255 - var15; int var18 = ((var16 & 16711935) * var15 >> 8 & 16711935) + (var15 * (var16 & 65280) >> 8 & 65280); - for(int var19 = -var2; var19 < 0; ++var19) { + for (int var19 = -var2; var19 < 0; ++var19) { int var20 = Rasterizer2D_pixels[var11]; - if(var20 == 0) { + if (var20 == 0) { Rasterizer2D_pixels[var11++] = var18; } else { var20 = ((var20 & 16711935) * var17 >> 8 & 16711935) + (var17 * (var20 & 65280) >> 8 & 65280); @@ -517,8 +509,8 @@ public class Rasterizer2D extends DualNode { var8 += var9; } } - } + } @ObfuscatedName("do") @@ -528,78 +520,76 @@ public class Rasterizer2D extends DualNode { ) @Export("raster2d7") public static void raster2d7(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) { - if(var0 + var2 >= 0 && var3 + var1 >= 0) { - if(var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) { - int var8 = 0; - int var9 = 0; - if(var0 < 0) { - var8 -= var0; - var2 += var0; + if (var0 + var2 >= 0 && var3 + var1 >= 0 && var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) { + int var8 = 0; + int var9 = 0; + if (var0 < 0) { + var8 -= var0; + var2 += var0; + } + + if (var1 < 0) { + var9 -= var1; + var3 += var1; + } + + if (var0 + var2 > Rasterizer2D_width) { + var2 = Rasterizer2D_width - var0; + } + + if (var3 + var1 > Rasterizer2D_height) { + var3 = Rasterizer2D_height - var1; + } + + int var10 = var6.length / var7; + int var11 = Rasterizer2D_width - var2; + int var12 = var4 >>> 24; + int var13 = var5 >>> 24; + int var14; + int var15; + int var16; + int var17; + int var18; + if (var12 == 255 && var13 == 255) { + var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; + + for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { + for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { + var17 = (var15 - var1) % var10; + var18 = (var16 - var0) % var7; + if (var6[var18 + var17 * var7] != 0) { + Rasterizer2D_pixels[var14++] = var5; + } else { + Rasterizer2D_pixels[var14++] = var4; + } + } + + var14 += var11; } + } else { + var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; - if(var1 < 0) { - var9 -= var1; - var3 += var1; - } - - if(var0 + var2 > Rasterizer2D_width) { - var2 = Rasterizer2D_width - var0; - } - - if(var3 + var1 > Rasterizer2D_height) { - var3 = Rasterizer2D_height - var1; - } - - int var10 = var6.length / var7; - int var11 = Rasterizer2D_width - var2; - int var12 = var4 >>> 24; - int var13 = var5 >>> 24; - int var14; - int var15; - int var16; - int var17; - int var18; - if(var12 == 255 && var13 == 255) { - var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; - - for(var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { - for(var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { - var17 = (var15 - var1) % var10; - var18 = (var16 - var0) % var7; - if(var6[var18 + var17 * var7] != 0) { - Rasterizer2D_pixels[var14++] = var5; - } else { - Rasterizer2D_pixels[var14++] = var4; - } + for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { + for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { + var17 = (var15 - var1) % var10; + var18 = (var16 - var0) % var7; + int var19 = var4; + if (var6[var18 + var17 * var7] != 0) { + var19 = var5; } - var14 += var11; + int var20 = var19 >>> 24; + int var21 = 255 - var20; + int var22 = Rasterizer2D_pixels[var14]; + int var23 = ((var19 & 16711935) * var20 + (var22 & 16711935) * var21 & -16711936) + (var20 * (var19 & 65280) + var21 * (var22 & 65280) & 16711680) >> 8; + Rasterizer2D_pixels[var14++] = var23; } - } else { - var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; - for(var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { - for(var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { - var17 = (var15 - var1) % var10; - var18 = (var16 - var0) % var7; - int var19 = var4; - if(var6[var18 + var17 * var7] != 0) { - var19 = var5; - } - - int var20 = var19 >>> 24; - int var21 = 255 - var20; - int var22 = Rasterizer2D_pixels[var14]; - int var23 = ((var19 & 16711935) * var20 + (var22 & 16711935) * var21 & -16711936) + (var20 * (var19 & 65280) + var21 * (var22 & 65280) & 16711680) >> 8; - Rasterizer2D_pixels[var14++] = var23; - } - - var14 += var11; - } + var14 += var11; } - } } + } @ObfuscatedName("dh") @@ -616,7 +606,7 @@ public class Rasterizer2D extends DualNode { public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); Rasterizer2D_drawHorizontalLineAlpha(var0, var3 + var1 - 1, var2, var4, var5); - if(var3 >= 3) { + if (var3 >= 3) { Rasterizer2D_drawVerticalLineAlpha(var0, var1 + 1, var3 - 2, var4, var5); Rasterizer2D_drawVerticalLineAlpha(var0 + var2 - 1, var1 + 1, var3 - 2, var4, var5); } @@ -626,35 +616,35 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("dj") @Export("Rasterizer2D_drawHorizontalLine") public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) { - if(var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { - if(var0 < Rasterizer2D_xClipStart) { + if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { + if (var0 < Rasterizer2D_xClipStart) { var2 -= Rasterizer2D_xClipStart - var0; var0 = Rasterizer2D_xClipStart; } - if(var0 + var2 > Rasterizer2D_xClipEnd) { + if (var0 + var2 > Rasterizer2D_xClipEnd) { var2 = Rasterizer2D_xClipEnd - var0; } int var4 = var0 + Rasterizer2D_width * var1; - for(int var5 = 0; var5 < var2; ++var5) { - Rasterizer2D_pixels[var4 + var5] = var3; // XXX + for (int var5 = 0; var5 < var2; ++var5) { + Rasterizer2D_pixels[var4 + var5] = var3; } - } + } @ObfuscatedName("du") @Export("Rasterizer2D_drawHorizontalLineAlpha") static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) { - if(var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { - if(var0 < Rasterizer2D_xClipStart) { + if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { + if (var0 < Rasterizer2D_xClipStart) { var2 -= Rasterizer2D_xClipStart - var0; var0 = Rasterizer2D_xClipStart; } - if(var0 + var2 > Rasterizer2D_xClipEnd) { + if (var0 + var2 > Rasterizer2D_xClipEnd) { var2 = Rasterizer2D_xClipEnd - var0; } @@ -662,51 +652,51 @@ public class Rasterizer2D extends DualNode { int var6 = (var3 >> 16 & 255) * var4; int var7 = (var3 >> 8 & 255) * var4; int var8 = var4 * (var3 & 255); - int var12 = var0 + Rasterizer2D_width * var1; + int var9 = var0 + Rasterizer2D_width * var1; - for(int var13 = 0; var13 < var2; ++var13) { - int var9 = var5 * (Rasterizer2D_pixels[var12] >> 16 & 255); - int var10 = (Rasterizer2D_pixels[var12] >> 8 & 255) * var5; - int var11 = var5 * (Rasterizer2D_pixels[var12] & 255); - int var14 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); - Rasterizer2D_pixels[var12++] = var14; + for (int var10 = 0; var10 < var2; ++var10) { + int var11 = var5 * (Rasterizer2D_pixels[var9] >> 16 & 255); + int var12 = (Rasterizer2D_pixels[var9] >> 8 & 255) * var5; + int var13 = var5 * (Rasterizer2D_pixels[var9] & 255); + int var14 = (var8 + var13 >> 8) + (var6 + var11 >> 8 << 16) + (var7 + var12 >> 8 << 8); + Rasterizer2D_pixels[var9++] = var14; } - } + } @ObfuscatedName("dm") @Export("Rasterizer2D_drawVerticalLine") public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) { - if(var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { - if(var1 < Rasterizer2D_yClipStart) { + if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { + if (var1 < Rasterizer2D_yClipStart) { var2 -= Rasterizer2D_yClipStart - var1; var1 = Rasterizer2D_yClipStart; } - if(var2 + var1 > Rasterizer2D_yClipEnd) { + if (var2 + var1 > Rasterizer2D_yClipEnd) { var2 = Rasterizer2D_yClipEnd - var1; } int var4 = var0 + Rasterizer2D_width * var1; - for(int var5 = 0; var5 < var2; ++var5) { + for (int var5 = 0; var5 < var2; ++var5) { Rasterizer2D_pixels[var4 + var5 * Rasterizer2D_width] = var3; } - } + } @ObfuscatedName("dq") @Export("Rasterizer2D_drawVerticalLineAlpha") static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) { - if(var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { - if(var1 < Rasterizer2D_yClipStart) { + if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { + if (var1 < Rasterizer2D_yClipStart) { var2 -= Rasterizer2D_yClipStart - var1; var1 = Rasterizer2D_yClipStart; } - if(var2 + var1 > Rasterizer2D_yClipEnd) { + if (var2 + var1 > Rasterizer2D_yClipEnd) { var2 = Rasterizer2D_yClipEnd - var1; } @@ -714,18 +704,18 @@ public class Rasterizer2D extends DualNode { int var6 = (var3 >> 16 & 255) * var4; int var7 = (var3 >> 8 & 255) * var4; int var8 = var4 * (var3 & 255); - int var12 = var0 + Rasterizer2D_width * var1; + int var9 = var0 + Rasterizer2D_width * var1; - for(int var13 = 0; var13 < var2; ++var13) { - int var9 = var5 * (Rasterizer2D_pixels[var12] >> 16 & 255); - int var10 = (Rasterizer2D_pixels[var12] >> 8 & 255) * var5; - int var11 = var5 * (Rasterizer2D_pixels[var12] & 255); - int var14 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); - Rasterizer2D_pixels[var12] = var14; - var12 += Rasterizer2D_width; + for (int var10 = 0; var10 < var2; ++var10) { + int var11 = var5 * (Rasterizer2D_pixels[var9] >> 16 & 255); + int var12 = (Rasterizer2D_pixels[var9] >> 8 & 255) * var5; + int var13 = var5 * (Rasterizer2D_pixels[var9] & 255); + int var14 = (var8 + var13 >> 8) + (var6 + var11 >> 8 << 16) + (var7 + var12 >> 8 << 8); + Rasterizer2D_pixels[var9] = var14; + var9 += Rasterizer2D_width; } - } + } @ObfuscatedName("et") @@ -733,22 +723,20 @@ public class Rasterizer2D extends DualNode { public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) { var2 -= var0; var3 -= var1; - if(var3 == 0) { - if(var2 >= 0) { + if (var3 == 0) { + if (var2 >= 0) { Rasterizer2D_drawHorizontalLine(var0, var1, var2 + 1, var4); } else { Rasterizer2D_drawHorizontalLine(var0 + var2, var1, -var2 + 1, var4); } - - } else if(var2 == 0) { - if(var3 >= 0) { + } else if (var2 == 0) { + if (var3 >= 0) { Rasterizer2D_drawVerticalLine(var0, var1, var3 + 1, var4); } else { Rasterizer2D_drawVerticalLine(var0, var3 + var1, -var3 + 1, var4); } - } else { - if(var3 + var2 < 0) { + if (var3 + var2 < 0) { var0 += var2; var2 = -var2; var1 += var3; @@ -757,24 +745,24 @@ public class Rasterizer2D extends DualNode { int var5; int var6; - if(var2 > var3) { + if (var2 > var3) { var1 <<= 16; var1 += 32768; var3 <<= 16; var5 = (int)Math.floor((double)var3 / (double)var2 + 0.5D); var2 += var0; - if(var0 < Rasterizer2D_xClipStart) { + if (var0 < Rasterizer2D_xClipStart) { var1 += var5 * (Rasterizer2D_xClipStart - var0); var0 = Rasterizer2D_xClipStart; } - if(var2 >= Rasterizer2D_xClipEnd) { + if (var2 >= Rasterizer2D_xClipEnd) { var2 = Rasterizer2D_xClipEnd - 1; } - while(var0 <= var2) { + while (var0 <= var2) { var6 = var1 >> 16; - if(var6 >= Rasterizer2D_yClipStart && var6 < Rasterizer2D_yClipEnd) { + if (var6 >= Rasterizer2D_yClipStart && var6 < Rasterizer2D_yClipEnd) { Rasterizer2D_pixels[var0 + var6 * Rasterizer2D_width] = var4; } @@ -787,18 +775,18 @@ public class Rasterizer2D extends DualNode { var2 <<= 16; var5 = (int)Math.floor((double)var2 / (double)var3 + 0.5D); var3 += var1; - if(var1 < Rasterizer2D_yClipStart) { + if (var1 < Rasterizer2D_yClipStart) { var0 += (Rasterizer2D_yClipStart - var1) * var5; var1 = Rasterizer2D_yClipStart; } - if(var3 >= Rasterizer2D_yClipEnd) { + if (var3 >= Rasterizer2D_yClipEnd) { var3 = Rasterizer2D_yClipEnd - 1; } - while(var1 <= var3) { + while (var1 <= var3) { var6 = var0 >> 16; - if(var6 >= Rasterizer2D_xClipStart && var6 < Rasterizer2D_xClipEnd) { + if (var6 >= Rasterizer2D_xClipStart && var6 < Rasterizer2D_xClipEnd) { Rasterizer2D_pixels[var6 + Rasterizer2D_width * var1] = var4; } @@ -806,26 +794,27 @@ public class Rasterizer2D extends DualNode { ++var1; } } - } + } @ObfuscatedName("eb") @Export("Rasterizer2D_setPixel") static void Rasterizer2D_setPixel(int var0, int var1, int var2) { - if(var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) { + if (var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) { Rasterizer2D_pixels[var0 + Rasterizer2D_width * var1] = var2; } + } @ObfuscatedName("ek") public static void method5948(int var0, int var1, int var2, int[] var3, int[] var4) { int var5 = var0 + Rasterizer2D_width * var1; - for(var1 = 0; var1 < var3.length; ++var1) { + for (var1 = 0; var1 < var3.length; ++var1) { int var6 = var5 + var3[var1]; - for(var0 = -var4[var1]; var0 < 0; ++var0) { + for (var0 = -var4[var1]; var0 < 0; ++var0) { Rasterizer2D_pixels[var6++] = var2; } @@ -833,4 +822,11 @@ public class Rasterizer2D extends DualNode { } } + + static { + Rasterizer2D_yClipStart = 0; + Rasterizer2D_yClipEnd = 0; + Rasterizer2D_xClipStart = 0; + Rasterizer2D_xClipEnd = 0; + } } diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java index b242467b4e..1723beeb42 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -7,14 +7,14 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Rasterizer3D") public class Rasterizer3D extends Rasterizer2D { @ObfuscatedName("m") - static boolean __et_m; + static boolean field739; @ObfuscatedName("f") - static boolean __et_f; + static boolean field740; @ObfuscatedName("q") @Export("Rasterizer3D_isLowDetailTexture") static boolean Rasterizer3D_isLowDetailTexture; @ObfuscatedName("w") - public static boolean __et_w; + public static boolean field741; @ObfuscatedName("o") @Export("Rasterizer3D_alpha") static int Rasterizer3D_alpha; @@ -58,9 +58,9 @@ public class Rasterizer3D extends Rasterizer2D { @Export("Rasterizer3D_textureLoader") public static TextureLoader Rasterizer3D_textureLoader; @ObfuscatedName("r") - static int[] __et_r; + static int[] field742; @ObfuscatedName("p") - static int[] __et_p; + static int[] field743; @ObfuscatedName("v") @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; @@ -68,36 +68,6 @@ public class Rasterizer3D extends Rasterizer2D { @Export("Rasterizer3D_cosine") public static int[] Rasterizer3D_cosine; - static { - __et_m = false; - __et_f = false; - Rasterizer3D_isLowDetailTexture = false; - __et_w = true; - Rasterizer3D_alpha = 0; - Rasterizer3D_zoom = 512; - Rasterizer3D_rowOffsets = new int[1024]; - Rasterizer3D_colorPalette = new int[65536]; - __et_r = new int[512]; - __et_p = new int[2048]; - Rasterizer3D_sine = new int[2048]; - Rasterizer3D_cosine = new int[2048]; - - int var0; - for(var0 = 1; var0 < 512; ++var0) { - __et_r[var0] = 32768 / var0; - } - - for(var0 = 1; var0 < 2048; ++var0) { - __et_p[var0] = 65536 / var0; - } - - for(var0 = 0; var0 < 2048; ++var0) { - Rasterizer3D_sine[var0] = (int)(65536.0D * Math.sin((double)var0 * 0.0030679615D)); - Rasterizer3D_cosine[var0] = (int)(65536.0D * Math.cos((double)var0 * 0.0030679615D)); - } - - } - @ObfuscatedName("m") @Export("Rasterizer3D_method1") public static final void Rasterizer3D_method1() { @@ -110,13 +80,13 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipWidth = var2 - var0; Rasterizer3D_clipHeight = var3 - var1; Rasterizer3D_method3(); - if(Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { + if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { Rasterizer3D_rowOffsets = new int[World.method1759(Rasterizer3D_clipHeight)]; } int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; - for(int var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { + for (int var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { Rasterizer3D_rowOffsets[var5] = var4; var4 += Rasterizer2D.Rasterizer2D_width; } @@ -167,18 +137,18 @@ public class Rasterizer3D extends Rasterizer2D { static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) { int var4 = var2 * 128; - for(int var5 = var2; var5 < var3; ++var5) { + for (int var5 = var2; var5 < var3; ++var5) { double var6 = (double)(var5 >> 3) / 64.0D + 0.0078125D; double var8 = (double)(var5 & 7) / 8.0D + 0.0625D; - for(int var10 = 0; var10 < 128; ++var10) { + for (int var10 = 0; var10 < 128; ++var10) { double var11 = (double)var10 / 128.0D; double var13 = var11; double var15 = var11; double var17 = var11; - if(var8 != 0.0D) { + if (var8 != 0.0D) { double var19; - if(var11 < 0.5D) { + if (var11 < 0.5D) { var19 = var11 * (1.0D + var8); } else { var19 = var11 + var8 - var11 * var8; @@ -186,52 +156,52 @@ public class Rasterizer3D extends Rasterizer2D { double var21 = 2.0D * var11 - var19; double var23 = var6 + 0.3333333333333333D; - if(var23 > 1.0D) { + if (var23 > 1.0D) { --var23; } - double var27 = var6 - 0.3333333333333333D; - if(var27 < 0.0D) { - ++var27; + double var25 = var6 - 0.3333333333333333D; + if (var25 < 0.0D) { + ++var25; } - if(6.0D * var23 < 1.0D) { + if (6.0D * var23 < 1.0D) { var13 = var21 + (var19 - var21) * 6.0D * var23; - } else if(2.0D * var23 < 1.0D) { + } else if (2.0D * var23 < 1.0D) { var13 = var19; - } else if(3.0D * var23 < 2.0D) { + } else if (3.0D * var23 < 2.0D) { var13 = var21 + (var19 - var21) * (0.6666666666666666D - var23) * 6.0D; } else { var13 = var21; } - if(6.0D * var6 < 1.0D) { + if (6.0D * var6 < 1.0D) { var15 = var21 + (var19 - var21) * 6.0D * var6; - } else if(2.0D * var6 < 1.0D) { + } else if (2.0D * var6 < 1.0D) { var15 = var19; - } else if(3.0D * var6 < 2.0D) { + } else if (3.0D * var6 < 2.0D) { var15 = var21 + (var19 - var21) * (0.6666666666666666D - var6) * 6.0D; } else { var15 = var21; } - if(6.0D * var27 < 1.0D) { - var17 = var21 + (var19 - var21) * 6.0D * var27; - } else if(2.0D * var27 < 1.0D) { + if (6.0D * var25 < 1.0D) { + var17 = var21 + (var19 - var21) * 6.0D * var25; + } else if (2.0D * var25 < 1.0D) { var17 = var19; - } else if(3.0D * var27 < 2.0D) { - var17 = var21 + (var19 - var21) * (0.6666666666666666D - var27) * 6.0D; + } else if (3.0D * var25 < 2.0D) { + var17 = var21 + (var19 - var21) * (0.6666666666666666D - var25) * 6.0D; } else { var17 = var21; } } - int var29 = (int)(var13 * 256.0D); + int var28 = (int)(var13 * 256.0D); int var20 = (int)(var15 * 256.0D); - int var30 = (int)(var17 * 256.0D); - int var22 = var30 + (var20 << 8) + (var29 << 16); + int var27 = (int)(var17 * 256.0D); + int var22 = var27 + (var20 << 8) + (var28 << 16); var22 = Rasterizer3D_brighten(var22, var0); - if(var22 == 0) { + if (var22 == 0) { var22 = 1; } @@ -258,7 +228,7 @@ public class Rasterizer3D extends Rasterizer2D { @ObfuscatedName("e") public static void method2985(int var0, int var1, int var2) { - __et_m = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; + field739 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; } @ObfuscatedName("x") @@ -270,44 +240,44 @@ public class Rasterizer3D extends Rasterizer2D { int var13 = var7 - var6; int var14 = var8 - var6; int var15; - if(var2 != var1) { + if (var2 != var1) { var15 = (var5 - var4 << 14) / (var2 - var1); } else { var15 = 0; } int var16; - if(var0 != var1) { + if (var0 != var1) { var16 = (var9 << 14) / var10; } else { var16 = 0; } int var17; - if(var0 != var2) { + if (var0 != var2) { var17 = (var11 << 14) / var12; } else { var17 = 0; } int var18 = var9 * var12 - var11 * var10; - if(var18 != 0) { + if (var18 != 0) { int var19 = (var13 * var12 - var14 * var10 << 8) / var18; int var20 = (var14 * var9 - var13 * var11 << 8) / var18; - if(var0 <= var1 && var0 <= var2) { - if(var0 < Rasterizer3D_clipHeight) { - if(var1 > Rasterizer3D_clipHeight) { + if (var0 <= var1 && var0 <= var2) { + if (var0 < Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } - if(var2 > Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } var6 = var19 + ((var6 << 8) - var3 * var19); - if(var1 < var2) { + if (var1 < var2) { var5 = var3 <<= 14; - if(var0 < 0) { + if (var0 < 0) { var5 -= var0 * var17; var3 -= var0 * var16; var6 -= var0 * var20; @@ -315,22 +285,22 @@ public class Rasterizer3D extends Rasterizer2D { } var4 <<= 14; - if(var1 < 0) { + if (var1 < 0) { var4 -= var15 * var1; var1 = 0; } - if(var0 != var1 && var17 < var16 || var0 == var1 && var17 > var15) { + if (var0 != var1 && var17 < var16 || var0 == var1 && var17 > var15) { var2 -= var1; var1 -= var0; var0 = Rasterizer3D_rowOffsets[var0]; - while(true) { + while (true) { --var1; - if(var1 < 0) { - while(true) { + if (var1 < 0) { + while (true) { --var2; - if(var2 < 0) { + if (var2 < 0) { return; } @@ -348,123 +318,123 @@ public class Rasterizer3D extends Rasterizer2D { var6 += var20; var0 += Rasterizer2D.Rasterizer2D_width; } - } else { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while(true) { - --var1; - if(var1 < 0) { - while(true) { - --var2; - if(var2 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var5 >> 14, var6, var19); - var5 += var17; - var4 += var15; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); - var5 += var17; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - } else { - var4 = var3 <<= 14; - if(var0 < 0) { - var4 -= var0 * var17; - var3 -= var0 * var16; - var6 -= var0 * var20; - var0 = 0; } - var5 <<= 14; - if(var2 < 0) { - var5 -= var15 * var2; - var2 = 0; - } + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; - if(var0 != var2 && var17 < var16 || var0 == var2 && var15 > var16) { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while(true) { - --var2; - if(var2 < 0) { - while(true) { - --var1; - if(var1 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); - var5 += var15; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var5 >> 14, var6, var19); + var5 += var17; + var4 += var15; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19); - var4 += var17; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; } - } else { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - while(true) { - --var2; - if(var2 < 0) { - while(true) { - --var1; - if(var1 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); - var5 += var15; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19); - var4 += var17; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; - } + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); + var5 += var17; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; } } + + var4 = var3 <<= 14; + if (var0 < 0) { + var4 -= var0 * var17; + var3 -= var0 * var16; + var6 -= var0 * var20; + var0 = 0; + } + + var5 <<= 14; + if (var2 < 0) { + var5 -= var15 * var2; + var2 = 0; + } + + if ((var0 == var2 || var17 >= var16) && (var0 != var2 || var15 <= var16)) { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); + var5 += var15; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19); + var4 += var17; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); + var5 += var15; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19); + var4 += var17; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; + } } - } else if(var1 <= var2) { - if(var1 < Rasterizer3D_clipHeight) { - if(var2 > Rasterizer3D_clipHeight) { + } else if (var1 <= var2) { + if (var1 < Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } - if(var0 > Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } var7 = var19 + ((var7 << 8) - var19 * var4); - if(var2 < var0) { + if (var2 < var0) { var3 = var4 <<= 14; - if(var1 < 0) { + if (var1 < 0) { var3 -= var16 * var1; var4 -= var15 * var1; var7 -= var20 * var1; @@ -472,22 +442,22 @@ public class Rasterizer3D extends Rasterizer2D { } var5 <<= 14; - if(var2 < 0) { + if (var2 < 0) { var5 -= var17 * var2; var2 = 0; } - if(var2 != var1 && var16 < var15 || var2 == var1 && var16 > var17) { + if (var2 != var1 && var16 < var15 || var2 == var1 && var16 > var17) { var0 -= var2; var2 -= var1; var1 = Rasterizer3D_rowOffsets[var1]; - while(true) { + while (true) { --var2; - if(var2 < 0) { - while(true) { + if (var2 < 0) { + while (true) { --var0; - if(var0 < 0) { + if (var0 < 0) { return; } @@ -505,122 +475,122 @@ public class Rasterizer3D extends Rasterizer2D { var7 += var20; var1 += Rasterizer2D.Rasterizer2D_width; } - } else { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + } - while(true) { - --var2; - if(var2 < 0) { - while(true) { - --var0; - if(var0 < 0) { - return; - } + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19); - var3 += var16; - var5 += var17; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19); + var3 += var16; + var5 += var17; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); + var3 += var16; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + + var5 = var4 <<= 14; + if (var1 < 0) { + var5 -= var16 * var1; + var4 -= var15 * var1; + var7 -= var20 * var1; + var1 = 0; + } + + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var17; + var0 = 0; + } + + if (var16 < var15) { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); + var3 += var17; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19); + var5 += var16; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; } Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); - var3 += var16; + var3 += var17; var4 += var15; var7 += var20; var1 += Rasterizer2D.Rasterizer2D_width; } } - } else { - var5 = var4 <<= 14; - if(var1 < 0) { - var5 -= var16 * var1; - var4 -= var15 * var1; - var7 -= var20 * var1; - var1 = 0; - } - var3 <<= 14; - if(var0 < 0) { - var3 -= var0 * var17; - var0 = 0; - } - - if(var16 < var15) { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while(true) { - --var0; - if(var0 < 0) { - while(true) { - --var2; - if(var2 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); - var3 += var17; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19); - var5 += var16; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } else { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while(true) { - --var0; - if(var0 < 0) { - while(true) { - --var2; - if(var2 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); - var3 += var17; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19); - var5 += var16; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19); + var5 += var16; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; } } - } else if(var2 < Rasterizer3D_clipHeight) { - if(var0 > Rasterizer3D_clipHeight) { + } else if (var2 < Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } - if(var1 > Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } var8 = var19 + ((var8 << 8) - var5 * var19); - if(var0 < var1) { + if (var0 < var1) { var4 = var5 <<= 14; - if(var2 < 0) { + if (var2 < 0) { var4 -= var15 * var2; var5 -= var17 * var2; var8 -= var20 * var2; @@ -628,22 +598,22 @@ public class Rasterizer3D extends Rasterizer2D { } var3 <<= 14; - if(var0 < 0) { + if (var0 < 0) { var3 -= var0 * var16; var0 = 0; } - if(var15 < var17) { + if (var15 < var17) { var1 -= var0; var0 -= var2; var2 = Rasterizer3D_rowOffsets[var2]; - while(true) { + while (true) { --var0; - if(var0 < 0) { - while(true) { + if (var0 < 0) { + while (true) { --var1; - if(var1 < 0) { + if (var1 < 0) { return; } @@ -661,136 +631,137 @@ public class Rasterizer3D extends Rasterizer2D { var8 += var20; var2 += Rasterizer2D.Rasterizer2D_width; } - } else { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + } - while(true) { - --var0; - if(var0 < 0) { - while(true) { - --var1; - if(var1 < 0) { - return; - } + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19); - var4 += var15; - var3 += var16; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19); + var4 += var15; + var3 += var16; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); + var4 += var15; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } + + var3 = var5 <<= 14; + if (var2 < 0) { + var3 -= var15 * var2; + var5 -= var17 * var2; + var8 -= var20 * var2; + var2 = 0; + } + + var4 <<= 14; + if (var1 < 0) { + var4 -= var16 * var1; + var1 = 0; + } + + if (var15 < var17) { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); + var4 += var16; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19); + var3 += var15; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } + + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; } Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); - var4 += var15; + var4 += var16; var5 += var17; var8 += var20; var2 += Rasterizer2D.Rasterizer2D_width; } } - } else { - var3 = var5 <<= 14; - if(var2 < 0) { - var3 -= var15 * var2; - var5 -= var17 * var2; - var8 -= var20 * var2; - var2 = 0; - } - var4 <<= 14; - if(var1 < 0) { - var4 -= var16 * var1; - var1 = 0; - } - - if(var15 < var17) { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while(true) { - --var1; - if(var1 < 0) { - while(true) { - --var0; - if(var0 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); - var4 += var16; - var5 += var17; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19); - var3 += var15; - var5 += var17; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } else { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while(true) { - --var1; - if(var1 < 0) { - while(true) { - --var0; - if(var0 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); - var4 += var16; - var5 += var17; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19); - var3 += var15; - var5 += var17; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19); + var3 += var15; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; } } } + } @ObfuscatedName("d") @Export("Rasterizer3D_vertAlpha") static final void Rasterizer3D_vertAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if(__et_m) { - if(var5 > Rasterizer3D_clipWidth) { + if (field739) { + if (var5 > Rasterizer3D_clipWidth) { var5 = Rasterizer3D_clipWidth; } - if(var4 < 0) { + if (var4 < 0) { var4 = 0; } } - if(var4 < var5) { + if (var4 < var5) { var1 += var4; var6 += var4 * var7; int var8; int var9; int var10; - if(__et_w) { + if (field741) { var3 = var5 - var4 >> 2; var7 <<= 2; - if(Rasterizer3D_alpha == 0) { - if(var3 > 0) { + if (Rasterizer3D_alpha == 0) { + if (var3 > 0) { do { var2 = Rasterizer3D_colorPalette[var6 >> 8]; var6 += var7; @@ -803,7 +774,7 @@ public class Rasterizer3D extends Rasterizer2D { } var3 = var5 - var4 & 3; - if(var3 > 0) { + if (var3 > 0) { var2 = Rasterizer3D_colorPalette[var6 >> 8]; do { @@ -814,7 +785,7 @@ public class Rasterizer3D extends Rasterizer2D { } else { var8 = Rasterizer3D_alpha; var9 = 256 - Rasterizer3D_alpha; - if(var3 > 0) { + if (var3 > 0) { do { var2 = Rasterizer3D_colorPalette[var6 >> 8]; var6 += var7; @@ -832,7 +803,7 @@ public class Rasterizer3D extends Rasterizer2D { } var3 = var5 - var4 & 3; - if(var3 > 0) { + if (var3 > 0) { var2 = Rasterizer3D_colorPalette[var6 >> 8]; var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); @@ -843,10 +814,9 @@ public class Rasterizer3D extends Rasterizer2D { } while(var3 > 0); } } - } else { var3 = var5 - var4; - if(Rasterizer3D_alpha == 0) { + if (Rasterizer3D_alpha == 0) { do { var0[var1++] = Rasterizer3D_colorPalette[var6 >> 8]; var6 += var7; @@ -865,63 +835,63 @@ public class Rasterizer3D extends Rasterizer2D { --var3; } while(var3 > 0); } - } } + } @ObfuscatedName("a") public static final void method3020(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { int var7 = 0; - if(var0 != var1) { + if (var0 != var1) { var7 = (var4 - var3 << 14) / (var1 - var0); } int var8 = 0; - if(var2 != var1) { + if (var2 != var1) { var8 = (var5 - var4 << 14) / (var2 - var1); } int var9 = 0; - if(var0 != var2) { + if (var0 != var2) { var9 = (var3 - var5 << 14) / (var0 - var2); } - if(var0 <= var1 && var0 <= var2) { - if(var0 < Rasterizer3D_clipHeight) { - if(var1 > Rasterizer3D_clipHeight) { + if (var0 <= var1 && var0 <= var2) { + if (var0 < Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } - if(var2 > Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } - if(var1 < var2) { + if (var1 < var2) { var5 = var3 <<= 14; - if(var0 < 0) { + if (var0 < 0) { var5 -= var0 * var9; var3 -= var0 * var7; var0 = 0; } var4 <<= 14; - if(var1 < 0) { + if (var1 < 0) { var4 -= var8 * var1; var1 = 0; } - if((var0 == var1 || var9 >= var7) && (var0 != var1 || var9 <= var8)) { + if ((var0 == var1 || var9 >= var7) && (var0 != var1 || var9 <= var8)) { var2 -= var1; var1 -= var0; var0 = Rasterizer3D_rowOffsets[var0]; - while(true) { + while (true) { --var1; - if(var1 < 0) { - while(true) { + if (var1 < 0) { + while (true) { --var2; - if(var2 < 0) { + if (var2 < 0) { return; } @@ -937,137 +907,137 @@ public class Rasterizer3D extends Rasterizer2D { var3 += var7; var0 += Rasterizer2D.Rasterizer2D_width; } - } else { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while(true) { - --var1; - if(var1 < 0) { - while(true) { - --var2; - if(var2 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14); - var5 += var9; - var4 += var8; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); - var5 += var9; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - } else { - var4 = var3 <<= 14; - if(var0 < 0) { - var4 -= var0 * var9; - var3 -= var0 * var7; - var0 = 0; } - var5 <<= 14; - if(var2 < 0) { - var5 -= var8 * var2; - var2 = 0; - } + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; - if(var0 != var2 && var9 < var7 || var0 == var2 && var8 > var7) { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while(true) { - --var2; - if(var2 < 0) { - while(true) { - --var1; - if(var1 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); - var5 += var8; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14); + var5 += var9; + var4 += var8; + var0 += Rasterizer2D.Rasterizer2D_width; } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14); - var4 += var9; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; } - } else { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - while(true) { - --var2; - if(var2 < 0) { - while(true) { - --var1; - if(var1 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); - var5 += var8; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); - var4 += var9; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; - } + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); + var5 += var9; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; } } + + var4 = var3 <<= 14; + if (var0 < 0) { + var4 -= var0 * var9; + var3 -= var0 * var7; + var0 = 0; + } + + var5 <<= 14; + if (var2 < 0) { + var5 -= var8 * var2; + var2 = 0; + } + + if (var0 != var2 && var9 < var7 || var0 == var2 && var8 > var7) { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); + var5 += var8; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14); + var4 += var9; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); + var5 += var8; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); + var4 += var9; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; + } } - } else if(var1 <= var2) { - if(var1 < Rasterizer3D_clipHeight) { - if(var2 > Rasterizer3D_clipHeight) { + } else if (var1 <= var2) { + if (var1 < Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } - if(var0 > Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } - if(var2 < var0) { + if (var2 < var0) { var3 = var4 <<= 14; - if(var1 < 0) { + if (var1 < 0) { var3 -= var7 * var1; var4 -= var8 * var1; var1 = 0; } var5 <<= 14; - if(var2 < 0) { + if (var2 < 0) { var5 -= var9 * var2; var2 = 0; } - if((var2 == var1 || var7 >= var8) && (var2 != var1 || var7 <= var9)) { + if ((var2 == var1 || var7 >= var8) && (var2 != var1 || var7 <= var9)) { var0 -= var2; var2 -= var1; var1 = Rasterizer3D_rowOffsets[var1]; - while(true) { + while (true) { --var2; - if(var2 < 0) { - while(true) { + if (var2 < 0) { + while (true) { --var0; - if(var0 < 0) { + if (var0 < 0) { return; } @@ -1083,136 +1053,136 @@ public class Rasterizer3D extends Rasterizer2D { var4 += var8; var1 += Rasterizer2D.Rasterizer2D_width; } - } else { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while(true) { - --var2; - if(var2 < 0) { - while(true) { - --var0; - if(var0 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14); - var3 += var7; - var5 += var9; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); - var3 += var7; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } - } else { - var5 = var4 <<= 14; - if(var1 < 0) { - var5 -= var7 * var1; - var4 -= var8 * var1; - var1 = 0; } - var3 <<= 14; - if(var0 < 0) { - var3 -= var0 * var9; - var0 = 0; - } + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; - if(var7 < var8) { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while(true) { - --var0; - if(var0 < 0) { - while(true) { - --var2; - if(var2 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); - var3 += var9; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14); + var3 += var7; + var5 += var9; + var1 += Rasterizer2D.Rasterizer2D_width; } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14); - var5 += var7; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; } - } else { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - while(true) { - --var0; - if(var0 < 0) { - while(true) { - --var2; - if(var2 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); - var3 += var9; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14); - var5 += var7; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; - } + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); + var3 += var7; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; } } + + var5 = var4 <<= 14; + if (var1 < 0) { + var5 -= var7 * var1; + var4 -= var8 * var1; + var1 = 0; + } + + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var9; + var0 = 0; + } + + if (var7 < var8) { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); + var3 += var9; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14); + var5 += var7; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); + var3 += var9; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14); + var5 += var7; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; + } } - } else if(var2 < Rasterizer3D_clipHeight) { - if(var0 > Rasterizer3D_clipHeight) { + } else if (var2 < Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } - if(var1 > Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } - if(var0 < var1) { + if (var0 < var1) { var4 = var5 <<= 14; - if(var2 < 0) { + if (var2 < 0) { var4 -= var8 * var2; var5 -= var9 * var2; var2 = 0; } var3 <<= 14; - if(var0 < 0) { + if (var0 < 0) { var3 -= var0 * var7; var0 = 0; } - if(var8 < var9) { + if (var8 < var9) { var1 -= var0; var0 -= var2; var2 = Rasterizer3D_rowOffsets[var2]; - while(true) { + while (true) { --var0; - if(var0 < 0) { - while(true) { + if (var0 < 0) { + while (true) { --var1; - if(var1 < 0) { + if (var1 < 0) { return; } @@ -1228,130 +1198,131 @@ public class Rasterizer3D extends Rasterizer2D { var5 += var9; var2 += Rasterizer2D.Rasterizer2D_width; } - } else { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + } - while(true) { - --var0; - if(var0 < 0) { - while(true) { - --var1; - if(var1 < 0) { - return; - } + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14); - var4 += var8; - var3 += var7; - var2 += Rasterizer2D.Rasterizer2D_width; + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14); + var4 += var8; + var3 += var7; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); + var4 += var8; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } + + var3 = var5 <<= 14; + if (var2 < 0) { + var3 -= var8 * var2; + var5 -= var9 * var2; + var2 = 0; + } + + var4 <<= 14; + if (var1 < 0) { + var4 -= var7 * var1; + var1 = 0; + } + + if (var8 < var9) { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); + var4 += var7; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14); + var3 += var8; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } + + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; } Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); - var4 += var8; + var4 += var7; var5 += var9; var2 += Rasterizer2D.Rasterizer2D_width; } } - } else { - var3 = var5 <<= 14; - if(var2 < 0) { - var3 -= var8 * var2; - var5 -= var9 * var2; - var2 = 0; - } - var4 <<= 14; - if(var1 < 0) { - var4 -= var7 * var1; - var1 = 0; - } - - if(var8 < var9) { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while(true) { - --var1; - if(var1 < 0) { - while(true) { - --var0; - if(var0 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); - var4 += var7; - var5 += var9; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14); - var3 += var8; - var5 += var9; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } else { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while(true) { - --var1; - if(var1 < 0) { - while(true) { - --var0; - if(var0 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); - var4 += var7; - var5 += var9; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14); - var3 += var8; - var5 += var9; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14); + var3 += var8; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; } } + } @ObfuscatedName("z") @Export("Rasterizer3D_horizAlpha") static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) { - if(__et_m) { - if(var5 > Rasterizer3D_clipWidth) { + if (field739) { + if (var5 > Rasterizer3D_clipWidth) { var5 = Rasterizer3D_clipWidth; } - if(var4 < 0) { + if (var4 < 0) { var4 = 0; } } - if(var4 < var5) { + if (var4 < var5) { var1 += var4; var3 = var5 - var4 >> 2; - if(Rasterizer3D_alpha != 0) { - if(Rasterizer3D_alpha == 254) { - while(true) { + if (Rasterizer3D_alpha != 0) { + if (Rasterizer3D_alpha == 254) { + while (true) { --var3; - if(var3 < 0) { + if (var3 < 0) { var3 = var5 - var4 & 3; - while(true) { + while (true) { --var3; - if(var3 < 0) { + if (var3 < 0) { return; } @@ -1369,15 +1340,15 @@ public class Rasterizer3D extends Rasterizer2D { int var7 = 256 - Rasterizer3D_alpha; var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935); - while(true) { + while (true) { --var3; int var8; - if(var3 < 0) { + if (var3 < 0) { var3 = var5 - var4 & 3; - while(true) { + while (true) { --var3; - if(var3 < 0) { + if (var3 < 0) { return; } @@ -1397,14 +1368,14 @@ public class Rasterizer3D extends Rasterizer2D { } } } else { - while(true) { + while (true) { --var3; - if(var3 < 0) { + if (var3 < 0) { var3 = var5 - var4 & 3; - while(true) { + while (true) { --var3; - if(var3 < 0) { + if (var3 < 0) { return; } @@ -1425,12 +1396,12 @@ public class Rasterizer3D extends Rasterizer2D { static final void method2986(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { int[] var19 = Rasterizer3D_textureLoader.load(var18); int var20; - if(var19 == null) { - var20 = Rasterizer3D_textureLoader.__w_213(var18); + if (var19 == null) { + var20 = Rasterizer3D_textureLoader.vmethod324(var18); method3037(var0, var1, var2, var3, var4, var5, method3040(var20, var6), method3040(var20, var7), method3040(var20, var8)); } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); - __et_f = Rasterizer3D_textureLoader.__o_214(var18); + field740 = Rasterizer3D_textureLoader.vmethod325(var18); var20 = var4 - var3; int var21 = var1 - var0; int var22 = var5 - var3; @@ -1438,22 +1409,22 @@ public class Rasterizer3D extends Rasterizer2D { int var24 = var7 - var6; int var25 = var8 - var6; int var26 = 0; - if(var0 != var1) { + if (var0 != var1) { var26 = (var4 - var3 << 14) / (var1 - var0); } int var27 = 0; - if(var2 != var1) { + if (var2 != var1) { var27 = (var5 - var4 << 14) / (var2 - var1); } int var28 = 0; - if(var0 != var2) { + if (var0 != var2) { var28 = (var3 - var5 << 14) / (var0 - var2); } int var29 = var20 * var23 - var22 * var21; - if(var29 != 0) { + if (var29 != 0) { int var30 = (var24 * var23 - var25 * var21 << 9) / var29; int var31 = (var25 * var20 - var24 * var22 << 9) / var29; var10 = var9 - var10; @@ -1472,20 +1443,20 @@ public class Rasterizer3D extends Rasterizer2D { int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 3 << 14) / (long)Rasterizer3D_zoom); int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); int var41; - if(var0 <= var1 && var0 <= var2) { - if(var0 < Rasterizer3D_clipHeight) { - if(var1 > Rasterizer3D_clipHeight) { + if (var0 <= var1 && var0 <= var2) { + if (var0 < Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } - if(var2 > Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } var6 = var30 + ((var6 << 9) - var3 * var30); - if(var1 < var2) { + if (var1 < var2) { var5 = var3 <<= 14; - if(var0 < 0) { + if (var0 < 0) { var5 -= var0 * var28; var3 -= var0 * var26; var6 -= var0 * var31; @@ -1493,7 +1464,7 @@ public class Rasterizer3D extends Rasterizer2D { } var4 <<= 14; - if(var1 < 0) { + if (var1 < 0) { var4 -= var27 * var1; var1 = 0; } @@ -1502,17 +1473,17 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; var35 += var37 * var41; var38 += var40 * var41; - if(var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { + if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { var2 -= var1; var1 -= var0; var0 = Rasterizer3D_rowOffsets[var0]; - while(true) { + while (true) { --var1; - if(var1 < 0) { - while(true) { + if (var1 < 0) { + while (true) { --var2; - if(var2 < 0) { + if (var2 < 0) { return; } @@ -1536,33 +1507,112 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } - } else { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + } - while(true) { - --var1; - if(var1 < 0) { - while(true) { - --var2; - if(var2 < 0) { - return; - } + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; - var4 += var27; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var4 += var27; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + var4 = var3 <<= 14; + if (var0 < 0) { + var4 -= var0 * var28; + var3 -= var0 * var26; + var6 -= var0 * var31; + var0 = 0; + } + + var5 <<= 14; + if (var2 < 0) { + var5 -= var27 * var2; + var2 = 0; + } + + var41 = var0 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var27; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var4 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; } Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; + var5 += var27; var3 += var26; var6 += var31; var0 += Rasterizer2D.Rasterizer2D_width; @@ -1571,110 +1621,31 @@ public class Rasterizer3D extends Rasterizer2D { var38 += var40; } } - } else { - var4 = var3 <<= 14; - if(var0 < 0) { - var4 -= var0 * var28; - var3 -= var0 * var26; - var6 -= var0 * var31; - var0 = 0; - } - var5 <<= 14; - if(var2 < 0) { - var5 -= var27 * var2; - var2 = 0; - } - - var41 = var0 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if(var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while(true) { - --var2; - if(var2 < 0) { - while(true) { - --var1; - if(var1 < 0) { - return; - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var27; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var4 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while(true) { - --var2; - if(var2 < 0) { - while(true) { - --var1; - if(var1 < 0) { - return; - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var27; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var4 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var4 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - } else if(var1 <= var2) { - if(var1 < Rasterizer3D_clipHeight) { - if(var2 > Rasterizer3D_clipHeight) { + } else if (var1 <= var2) { + if (var1 < Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } - if(var0 > Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } var7 = var30 + ((var7 << 9) - var30 * var4); - if(var2 < var0) { + if (var2 < var0) { var3 = var4 <<= 14; - if(var1 < 0) { + if (var1 < 0) { var3 -= var26 * var1; var4 -= var27 * var1; var7 -= var31 * var1; @@ -1682,7 +1653,7 @@ public class Rasterizer3D extends Rasterizer2D { } var5 <<= 14; - if(var2 < 0) { + if (var2 < 0) { var5 -= var28 * var2; var2 = 0; } @@ -1691,17 +1662,17 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; var35 += var37 * var41; var38 += var40 * var41; - if(var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { + if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { var0 -= var2; var2 -= var1; var1 = Rasterizer3D_rowOffsets[var1]; - while(true) { + while (true) { --var2; - if(var2 < 0) { - while(true) { + if (var2 < 0) { + while (true) { --var0; - if(var0 < 0) { + if (var0 < 0) { return; } @@ -1725,33 +1696,112 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } - } else { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + } - while(true) { - --var2; - if(var2 < 0) { - while(true) { - --var0; - if(var0 < 0) { - return; - } + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; - var5 += var28; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var5 += var28; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + var5 = var4 <<= 14; + if (var1 < 0) { + var5 -= var26 * var1; + var4 -= var27 * var1; + var7 -= var31 * var1; + var1 = 0; + } + + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var28; + var0 = 0; + } + + var41 = var1 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var26 < var27) { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var28; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var5 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; } Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; + var3 += var28; var4 += var27; var7 += var31; var1 += Rasterizer2D.Rasterizer2D_width; @@ -1760,109 +1810,30 @@ public class Rasterizer3D extends Rasterizer2D { var38 += var40; } } - } else { - var5 = var4 <<= 14; - if(var1 < 0) { - var5 -= var26 * var1; - var4 -= var27 * var1; - var7 -= var31 * var1; - var1 = 0; - } - var3 <<= 14; - if(var0 < 0) { - var3 -= var0 * var28; - var0 = 0; - } - - var41 = var1 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if(var26 < var27) { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while(true) { - --var0; - if(var0 < 0) { - while(true) { - --var2; - if(var2 < 0) { - return; - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var28; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var5 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while(true) { - --var0; - if(var0 < 0) { - while(true) { - --var2; - if(var2 < 0) { - return; - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var28; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var5 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var5 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - } else if(var2 < Rasterizer3D_clipHeight) { - if(var0 > Rasterizer3D_clipHeight) { + } else if (var2 < Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } - if(var1 > Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } var8 = (var8 << 9) - var5 * var30 + var30; - if(var0 < var1) { + if (var0 < var1) { var4 = var5 <<= 14; - if(var2 < 0) { + if (var2 < 0) { var4 -= var27 * var2; var5 -= var28 * var2; var8 -= var31 * var2; @@ -1870,7 +1841,7 @@ public class Rasterizer3D extends Rasterizer2D { } var3 <<= 14; - if(var0 < 0) { + if (var0 < 0) { var3 -= var0 * var26; var0 = 0; } @@ -1879,17 +1850,17 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; var35 += var37 * var41; var38 += var40 * var41; - if(var27 < var28) { + if (var27 < var28) { var1 -= var0; var0 -= var2; var2 = Rasterizer3D_rowOffsets[var2]; - while(true) { + while (true) { --var0; - if(var0 < 0) { - while(true) { + if (var0 < 0) { + while (true) { --var1; - if(var1 < 0) { + if (var1 < 0) { return; } @@ -1913,33 +1884,112 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } - } else { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + } - while(true) { - --var0; - if(var0 < 0) { - while(true) { - --var1; - if(var1 < 0) { - return; - } + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; - var3 += var26; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var3 += var26; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + var3 = var5 <<= 14; + if (var2 < 0) { + var3 -= var27 * var2; + var5 -= var28 * var2; + var8 -= var31 * var2; + var2 = 0; + } + + var4 <<= 14; + if (var1 < 0) { + var4 -= var26 * var1; + var1 = 0; + } + + var41 = var2 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var27 < var28) { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var26; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var3 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; } Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; + var4 += var26; var5 += var28; var8 += var31; var2 += Rasterizer2D.Rasterizer2D_width; @@ -1948,531 +1998,453 @@ public class Rasterizer3D extends Rasterizer2D { var38 += var40; } } - } else { - var3 = var5 <<= 14; - if(var2 < 0) { - var3 -= var27 * var2; - var5 -= var28 * var2; - var8 -= var31 * var2; - var2 = 0; - } - var4 <<= 14; - if(var1 < 0) { - var4 -= var26 * var1; - var1 = 0; - } - - var41 = var2 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if(var27 < var28) { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while(true) { - --var1; - if(var1 < 0) { - while(true) { - --var0; - if(var0 < 0) { - return; - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var26; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var3 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while(true) { - --var1; - if(var1 < 0) { - while(true) { - --var0; - if(var0 < 0) { - return; - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var26; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var3 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var3 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } } + } @ObfuscatedName("s") @Export("Rasterizer3D_iDontKnow") static final void Rasterizer3D_iDontKnow(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14) { - if(__et_m) { - if(var6 > Rasterizer3D_clipWidth) { + if (field739) { + if (var6 > Rasterizer3D_clipWidth) { var6 = Rasterizer3D_clipWidth; } - if(var5 < 0) { + if (var5 < 0) { var5 = 0; } } - if(var5 < var6) { + if (var5 < var6) { var4 += var5; var7 += var5 * var8; - int var17 = var6 - var5; - int var15; + int var15 = var6 - var5; int var16; int var10000; - int var18; + int var17; int var19; int var20; int var21; int var22; int var23; - if(Rasterizer3D_isLowDetailTexture) { - var23 = var5 - Rasterizer3D_clipMidX; - var9 += var23 * (var12 >> 3); - var10 += (var13 >> 3) * var23; - var11 += var23 * (var14 >> 3); - var22 = var11 >> 12; - if(var22 != 0) { - var18 = var9 / var22; - var19 = var10 / var22; - if(var18 < 0) { - var18 = 0; - } else if(var18 > 4032) { - var18 = 4032; + int var24; + if (Rasterizer3D_isLowDetailTexture) { + var24 = var5 - Rasterizer3D_clipMidX; + var9 += var24 * (var12 >> 3); + var10 += (var13 >> 3) * var24; + var11 += var24 * (var14 >> 3); + var23 = var11 >> 12; + if (var23 != 0) { + var19 = var9 / var23; + var20 = var10 / var23; + if (var19 < 0) { + var19 = 0; + } else if (var19 > 4032) { + var19 = 4032; } } else { - var18 = 0; var19 = 0; + var20 = 0; } var9 += var12; var10 += var13; var11 += var14; - var22 = var11 >> 12; - if(var22 != 0) { - var20 = var9 / var22; - var21 = var10 / var22; - if(var20 < 0) { - var20 = 0; - } else if(var20 > 4032) { - var20 = 4032; + var23 = var11 >> 12; + if (var23 != 0) { + var21 = var9 / var23; + var22 = var10 / var23; + if (var21 < 0) { + var21 = 0; + } else if (var21 > 4032) { + var21 = 4032; } } else { - var20 = 0; var21 = 0; + var22 = 0; } - var2 = (var18 << 20) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); - var17 >>= 3; + var2 = (var19 << 20) + var20; + var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20); + var15 >>= 3; var8 <<= 3; - var15 = var7 >> 8; - if(__et_f) { - if(var17 > 0) { + var16 = var7 >> 8; + if (field740) { + if (var15 > 0) { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var10000 = var16 + var2; - var18 = var20; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var10000 = var17 + var2; var19 = var21; + var20 = var22; var9 += var12; var10 += var13; var11 += var14; - var22 = var11 >> 12; - if(var22 != 0) { - var20 = var9 / var22; - var21 = var10 / var22; - if(var20 < 0) { - var20 = 0; - } else if(var20 > 4032) { - var20 = 4032; + var23 = var11 >> 12; + if (var23 != 0) { + var21 = var9 / var23; + var22 = var10 / var23; + if (var21 < 0) { + var21 = 0; + } else if (var21 > 4032) { + var21 = 4032; } } else { - var20 = 0; var21 = 0; + var22 = 0; } - var2 = (var18 << 20) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); + var2 = (var19 << 20) + var20; + var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20); var7 += var8; - var15 = var7 >> 8; - --var17; - } while(var17 > 0); + var16 = var7 >> 8; + --var15; + } while(var15 > 0); } - var17 = var6 - var5 & 7; - if(var17 > 0) { + var15 = var6 - var5 & 7; + if (var15 > 0) { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - --var17; - } while(var17 > 0); + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; + --var15; + } while(var15 > 0); } } else { - if(var17 > 0) { + if (var15 > 0) { do { - if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var10000 = var16 + var2; - var18 = var20; + var10000 = var17 + var2; var19 = var21; + var20 = var22; var9 += var12; var10 += var13; var11 += var14; - var22 = var11 >> 12; - if(var22 != 0) { - var20 = var9 / var22; - var21 = var10 / var22; - if(var20 < 0) { - var20 = 0; - } else if(var20 > 4032) { - var20 = 4032; + var23 = var11 >> 12; + if (var23 != 0) { + var21 = var9 / var23; + var22 = var10 / var23; + if (var21 < 0) { + var21 = 0; + } else if (var21 > 4032) { + var21 = 4032; } } else { - var20 = 0; var21 = 0; + var22 = 0; } - var2 = (var18 << 20) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); + var2 = (var19 << 20) + var20; + var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20); var7 += var8; - var15 = var7 >> 8; - --var17; - } while(var17 > 0); + var16 = var7 >> 8; + --var15; + } while(var15 > 0); } - var17 = var6 - var5 & 7; - if(var17 > 0) { + var15 = var6 - var5 & 7; + if (var15 > 0) { do { - if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - --var17; - } while(var17 > 0); + var2 += var17; + --var15; + } while(var15 > 0); } } } else { - var23 = var5 - Rasterizer3D_clipMidX; - var9 += var23 * (var12 >> 3); - var10 += (var13 >> 3) * var23; - var11 += var23 * (var14 >> 3); - var22 = var11 >> 14; - if(var22 != 0) { - var18 = var9 / var22; - var19 = var10 / var22; - if(var18 < 0) { - var18 = 0; - } else if(var18 > 16256) { - var18 = 16256; + var24 = var5 - Rasterizer3D_clipMidX; + var9 += var24 * (var12 >> 3); + var10 += (var13 >> 3) * var24; + var11 += var24 * (var14 >> 3); + var23 = var11 >> 14; + if (var23 != 0) { + var19 = var9 / var23; + var20 = var10 / var23; + if (var19 < 0) { + var19 = 0; + } else if (var19 > 16256) { + var19 = 16256; } } else { - var18 = 0; var19 = 0; + var20 = 0; } var9 += var12; var10 += var13; var11 += var14; - var22 = var11 >> 14; - if(var22 != 0) { - var20 = var9 / var22; - var21 = var10 / var22; - if(var20 < 0) { - var20 = 0; - } else if(var20 > 16256) { - var20 = 16256; + var23 = var11 >> 14; + if (var23 != 0) { + var21 = var9 / var23; + var22 = var10 / var23; + if (var21 < 0) { + var21 = 0; + } else if (var21 > 16256) { + var21 = 16256; } } else { - var20 = 0; var21 = 0; + var22 = 0; } - var2 = (var18 << 18) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); - var17 >>= 3; + var2 = (var19 << 18) + var20; + var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18); + var15 >>= 3; var8 <<= 3; - var15 = var7 >> 8; - if(__et_f) { - if(var17 > 0) { + var16 = var7 >> 8; + if (field740) { + if (var15 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var10000 = var16 + var2; - var18 = var20; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var10000 = var17 + var2; var19 = var21; + var20 = var22; var9 += var12; var10 += var13; var11 += var14; - var22 = var11 >> 14; - if(var22 != 0) { - var20 = var9 / var22; - var21 = var10 / var22; - if(var20 < 0) { - var20 = 0; - } else if(var20 > 16256) { - var20 = 16256; + var23 = var11 >> 14; + if (var23 != 0) { + var21 = var9 / var23; + var22 = var10 / var23; + if (var21 < 0) { + var21 = 0; + } else if (var21 > 16256) { + var21 = 16256; } } else { - var20 = 0; var21 = 0; + var22 = 0; } - var2 = (var18 << 18) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); + var2 = (var19 << 18) + var20; + var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18); var7 += var8; - var15 = var7 >> 8; - --var17; - } while(var17 > 0); + var16 = var7 >> 8; + --var15; + } while(var15 > 0); } - var17 = var6 - var5 & 7; - if(var17 > 0) { + var15 = var6 - var5 & 7; + if (var15 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - --var17; - } while(var17 > 0); + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; + --var15; + } while(var15 > 0); } } else { - if(var17 > 0) { + if (var15 > 0) { do { - if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var10000 = var16 + var2; - var18 = var20; + var10000 = var17 + var2; var19 = var21; + var20 = var22; var9 += var12; var10 += var13; var11 += var14; - var22 = var11 >> 14; - if(var22 != 0) { - var20 = var9 / var22; - var21 = var10 / var22; - if(var20 < 0) { - var20 = 0; - } else if(var20 > 16256) { - var20 = 16256; + var23 = var11 >> 14; + if (var23 != 0) { + var21 = var9 / var23; + var22 = var10 / var23; + if (var21 < 0) { + var21 = 0; + } else if (var21 > 16256) { + var21 = 16256; } } else { - var20 = 0; var21 = 0; + var22 = 0; } - var2 = (var18 << 18) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); + var2 = (var19 << 18) + var20; + var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18); var7 += var8; - var15 = var7 >> 8; - --var17; - } while(var17 > 0); + var16 = var7 >> 8; + --var15; + } while(var15 > 0); } - var17 = var6 - var5 & 7; - if(var17 > 0) { + var15 = var6 - var5 & 7; + if (var15 > 0) { do { - if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - --var17; - } while(var17 > 0); + var2 += var17; + --var15; + } while(var15 > 0); } } } - } + } @ObfuscatedName("t") static final void method3012(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { int[] var19 = Rasterizer3D_textureLoader.load(var18); int var20; - if(var19 == null) { - var20 = Rasterizer3D_textureLoader.__w_213(var18); + if (var19 == null) { + var20 = Rasterizer3D_textureLoader.vmethod324(var18); method3037(var0, var1, var2, var3, var4, var5, method3040(var20, var6), method3040(var20, var7), method3040(var20, var8)); } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); - __et_f = Rasterizer3D_textureLoader.__o_214(var18); + field740 = Rasterizer3D_textureLoader.vmethod325(var18); var20 = var4 - var3; int var21 = var1 - var0; int var22 = var5 - var3; @@ -2480,22 +2452,22 @@ public class Rasterizer3D extends Rasterizer2D { int var24 = var7 - var6; int var25 = var8 - var6; int var26 = 0; - if(var0 != var1) { + if (var0 != var1) { var26 = (var4 - var3 << 14) / (var1 - var0); } int var27 = 0; - if(var2 != var1) { + if (var2 != var1) { var27 = (var5 - var4 << 14) / (var2 - var1); } int var28 = 0; - if(var0 != var2) { + if (var0 != var2) { var28 = (var3 - var5 << 14) / (var0 - var2); } int var29 = var20 * var23 - var22 * var21; - if(var29 != 0) { + if (var29 != 0) { int var30 = (var24 * var23 - var25 * var21 << 9) / var29; int var31 = (var25 * var20 - var24 * var22 << 9) / var29; var10 = var9 - var10; @@ -2514,20 +2486,20 @@ public class Rasterizer3D extends Rasterizer2D { int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 14) / (long)Rasterizer3D_zoom); int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); int var41; - if(var0 <= var1 && var0 <= var2) { - if(var0 < Rasterizer3D_clipHeight) { - if(var1 > Rasterizer3D_clipHeight) { + if (var0 <= var1 && var0 <= var2) { + if (var0 < Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } - if(var2 > Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } var6 = var30 + ((var6 << 9) - var3 * var30); - if(var1 < var2) { + if (var1 < var2) { var5 = var3 <<= 14; - if(var0 < 0) { + if (var0 < 0) { var5 -= var0 * var28; var3 -= var0 * var26; var6 -= var0 * var31; @@ -2535,7 +2507,7 @@ public class Rasterizer3D extends Rasterizer2D { } var4 <<= 14; - if(var1 < 0) { + if (var1 < 0) { var4 -= var27 * var1; var1 = 0; } @@ -2544,17 +2516,17 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; var35 += var37 * var41; var38 += var40 * var41; - if(var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { + if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { var2 -= var1; var1 -= var0; var0 = Rasterizer3D_rowOffsets[var0]; - while(true) { + while (true) { --var1; - if(var1 < 0) { - while(true) { + if (var1 < 0) { + while (true) { --var2; - if(var2 < 0) { + if (var2 < 0) { return; } @@ -2578,33 +2550,112 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } - } else { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + } - while(true) { - --var1; - if(var1 < 0) { - while(true) { - --var2; - if(var2 < 0) { - return; - } + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; - var4 += var27; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var4 += var27; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + var4 = var3 <<= 14; + if (var0 < 0) { + var4 -= var0 * var28; + var3 -= var0 * var26; + var6 -= var0 * var31; + var0 = 0; + } + + var5 <<= 14; + if (var2 < 0) { + var5 -= var27 * var2; + var2 = 0; + } + + var41 = var0 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var27; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var4 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; } Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; + var5 += var27; var3 += var26; var6 += var31; var0 += Rasterizer2D.Rasterizer2D_width; @@ -2613,110 +2664,31 @@ public class Rasterizer3D extends Rasterizer2D { var38 += var40; } } - } else { - var4 = var3 <<= 14; - if(var0 < 0) { - var4 -= var0 * var28; - var3 -= var0 * var26; - var6 -= var0 * var31; - var0 = 0; - } - var5 <<= 14; - if(var2 < 0) { - var5 -= var27 * var2; - var2 = 0; - } - - var41 = var0 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while(true) { - --var2; - if(var2 < 0) { - while(true) { - --var1; - if(var1 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var27; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var4 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while(true) { - --var2; - if(var2 < 0) { - while(true) { - --var1; - if(var1 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var27; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var4 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var4 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - } else if(var1 <= var2) { - if(var1 < Rasterizer3D_clipHeight) { - if(var2 > Rasterizer3D_clipHeight) { + } else if (var1 <= var2) { + if (var1 < Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { var2 = Rasterizer3D_clipHeight; } - if(var0 > Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } var7 = var30 + ((var7 << 9) - var30 * var4); - if(var2 < var0) { + if (var2 < var0) { var3 = var4 <<= 14; - if(var1 < 0) { + if (var1 < 0) { var3 -= var26 * var1; var4 -= var27 * var1; var7 -= var31 * var1; @@ -2724,7 +2696,7 @@ public class Rasterizer3D extends Rasterizer2D { } var5 <<= 14; - if(var2 < 0) { + if (var2 < 0) { var5 -= var28 * var2; var2 = 0; } @@ -2733,17 +2705,17 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; var35 += var37 * var41; var38 += var40 * var41; - if(var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { + if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { var0 -= var2; var2 -= var1; var1 = Rasterizer3D_rowOffsets[var1]; - while(true) { + while (true) { --var2; - if(var2 < 0) { - while(true) { + if (var2 < 0) { + while (true) { --var0; - if(var0 < 0) { + if (var0 < 0) { return; } @@ -2767,33 +2739,112 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } - } else { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + } - while(true) { - --var2; - if(var2 < 0) { - while(true) { - --var0; - if(var0 < 0) { - return; - } + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; - var5 += var28; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var5 += var28; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + var5 = var4 <<= 14; + if (var1 < 0) { + var5 -= var26 * var1; + var4 -= var27 * var1; + var7 -= var31 * var1; + var1 = 0; + } + + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var28; + var0 = 0; + } + + var41 = var1 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var26 < var27) { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var28; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var5 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; } Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; + var3 += var28; var4 += var27; var7 += var31; var1 += Rasterizer2D.Rasterizer2D_width; @@ -2802,109 +2853,30 @@ public class Rasterizer3D extends Rasterizer2D { var38 += var40; } } - } else { - var5 = var4 <<= 14; - if(var1 < 0) { - var5 -= var26 * var1; - var4 -= var27 * var1; - var7 -= var31 * var1; - var1 = 0; - } - var3 <<= 14; - if(var0 < 0) { - var3 -= var0 * var28; - var0 = 0; - } - - var41 = var1 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if(var26 < var27) { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while(true) { - --var0; - if(var0 < 0) { - while(true) { - --var2; - if(var2 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var28; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var5 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while(true) { - --var0; - if(var0 < 0) { - while(true) { - --var2; - if(var2 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var28; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var5 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var5 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } - } else if(var2 < Rasterizer3D_clipHeight) { - if(var0 > Rasterizer3D_clipHeight) { + } else if (var2 < Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { var0 = Rasterizer3D_clipHeight; } - if(var1 > Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { var1 = Rasterizer3D_clipHeight; } var8 = (var8 << 9) - var5 * var30 + var30; - if(var0 < var1) { + if (var0 < var1) { var4 = var5 <<= 14; - if(var2 < 0) { + if (var2 < 0) { var4 -= var27 * var2; var5 -= var28 * var2; var8 -= var31 * var2; @@ -2912,7 +2884,7 @@ public class Rasterizer3D extends Rasterizer2D { } var3 <<= 14; - if(var0 < 0) { + if (var0 < 0) { var3 -= var0 * var26; var0 = 0; } @@ -2921,17 +2893,17 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; var35 += var37 * var41; var38 += var40 * var41; - if(var27 < var28) { + if (var27 < var28) { var1 -= var0; var0 -= var2; var2 = Rasterizer3D_rowOffsets[var2]; - while(true) { + while (true) { --var0; - if(var0 < 0) { - while(true) { + if (var0 < 0) { + while (true) { --var1; - if(var1 < 0) { + if (var1 < 0) { return; } @@ -2955,33 +2927,112 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } - } else { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + } - while(true) { - --var0; - if(var0 < 0) { - while(true) { - --var1; - if(var1 < 0) { - return; - } + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; - var3 += var26; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var3 += var26; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + var3 = var5 <<= 14; + if (var2 < 0) { + var3 -= var27 * var2; + var5 -= var28 * var2; + var8 -= var31 * var2; + var2 = 0; + } + + var4 <<= 14; + if (var1 < 0) { + var4 -= var26 * var1; + var1 = 0; + } + + var41 = var2 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var27 < var28) { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var26; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var3 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; } Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; + var4 += var26; var5 += var28; var8 += var31; var2 += Rasterizer2D.Rasterizer2D_width; @@ -2990,132 +3041,54 @@ public class Rasterizer3D extends Rasterizer2D { var38 += var40; } } - } else { - var3 = var5 <<= 14; - if(var2 < 0) { - var3 -= var27 * var2; - var5 -= var28 * var2; - var8 -= var31 * var2; - var2 = 0; - } - var4 <<= 14; - if(var1 < 0) { - var4 -= var26 * var1; - var1 = 0; - } - - var41 = var2 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if(var27 < var28) { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while(true) { - --var1; - if(var1 < 0) { - while(true) { - --var0; - if(var0 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var26; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var3 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while(true) { - --var1; - if(var1 < 0) { - while(true) { - --var0; - if(var0 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var26; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var3 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var3 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } } + } @ObfuscatedName("y") @Export("Rasterizer3D_textureAlpha") static final void Rasterizer3D_textureAlpha(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14) { - if(__et_m) { - if(var6 > Rasterizer3D_clipWidth) { + if (field739) { + if (var6 > Rasterizer3D_clipWidth) { var6 = Rasterizer3D_clipWidth; } - if(var5 < 0) { + if (var5 < 0) { var5 = 0; } } - if(var5 < var6) { + if (var5 < var6) { var4 += var5; var7 += var5 * var8; - int var17 = var6 - var5; - int var15; + int var15 = var6 - var5; int var16; + int var17; int var18; int var19; int var20; int var21; int var22; int var23; - if(Rasterizer3D_isLowDetailTexture) { + if (Rasterizer3D_isLowDetailTexture) { var23 = var5 - Rasterizer3D_clipMidX; var9 += var23 * var12; var10 += var13 * var23; var11 += var23 * var14; var22 = var11 >> 12; - if(var22 != 0) { + if (var22 != 0) { var18 = var9 / var22; var19 = var10 / var22; } else { @@ -3123,11 +3096,11 @@ public class Rasterizer3D extends Rasterizer2D { var19 = 0; } - var9 += var17 * var12; - var10 += var13 * var17; - var11 += var17 * var14; + var9 += var15 * var12; + var10 += var13 * var15; + var11 += var15 * var14; var22 = var11 >> 12; - if(var22 != 0) { + if (var22 != 0) { var20 = var9 / var22; var21 = var10 / var22; } else { @@ -3136,120 +3109,120 @@ public class Rasterizer3D extends Rasterizer2D { } var2 = (var18 << 20) + var19; - var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 20); - var17 >>= 3; + var17 = (var21 - var19) / var15 + ((var20 - var18) / var15 << 20); + var15 >>= 3; var8 <<= 3; - var15 = var7 >> 8; - if(__et_f) { - if(var17 > 0) { + var16 = var7 >> 8; + if (field740) { + if (var15 > 0) { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var7 += var8; - var15 = var7 >> 8; - --var17; - } while(var17 > 0); + var16 = var7 >> 8; + --var15; + } while(var15 > 0); } - var17 = var6 - var5 & 7; - if(var17 > 0) { + var15 = var6 - var5 & 7; + if (var15 > 0) { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - --var17; - } while(var17 > 0); + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; + --var15; + } while(var15 > 0); } } else { - if(var17 > 0) { + if (var15 > 0) { do { - if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; + var2 += var17; var7 += var8; - var15 = var7 >> 8; - --var17; - } while(var17 > 0); + var16 = var7 >> 8; + --var15; + } while(var15 > 0); } - var17 = var6 - var5 & 7; - if(var17 > 0) { + var15 = var6 - var5 & 7; + if (var15 > 0) { do { - if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - --var17; - } while(var17 > 0); + var2 += var17; + --var15; + } while(var15 > 0); } } } else { @@ -3258,7 +3231,7 @@ public class Rasterizer3D extends Rasterizer2D { var10 += var13 * var23; var11 += var23 * var14; var22 = var11 >> 14; - if(var22 != 0) { + if (var22 != 0) { var18 = var9 / var22; var19 = var10 / var22; } else { @@ -3266,11 +3239,11 @@ public class Rasterizer3D extends Rasterizer2D { var19 = 0; } - var9 += var17 * var12; - var10 += var13 * var17; - var11 += var17 * var14; + var9 += var15 * var12; + var10 += var13 * var15; + var11 += var15 * var14; var22 = var11 >> 14; - if(var22 != 0) { + if (var22 != 0) { var20 = var9 / var22; var21 = var10 / var22; } else { @@ -3279,133 +3252,133 @@ public class Rasterizer3D extends Rasterizer2D { } var2 = (var18 << 18) + var19; - var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 18); - var17 >>= 3; + var17 = (var21 - var19) / var15 + ((var20 - var18) / var15 << 18); + var15 >>= 3; var8 <<= 3; - var15 = var7 >> 8; - if(__et_f) { - if(var17 > 0) { + var16 = var7 >> 8; + if (field740) { + if (var15 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; var7 += var8; - var15 = var7 >> 8; - --var17; - } while(var17 > 0); + var16 = var7 >> 8; + --var15; + } while(var15 > 0); } - var17 = var6 - var5 & 7; - if(var17 > 0) { + var15 = var6 - var5 & 7; + if (var15 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - --var17; - } while(var17 > 0); + var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; + var2 += var17; + --var15; + } while(var15 > 0); } } else { - if(var17 > 0) { + if (var15 > 0) { do { - if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + var2 += var17; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; + var2 += var17; var7 += var8; - var15 = var7 >> 8; - --var17; - } while(var17 > 0); + var16 = var7 >> 8; + --var15; + } while(var15 > 0); } - var17 = var6 - var5 & 7; - if(var17 > 0) { + var15 = var6 - var5 & 7; + if (var15 > 0) { do { - if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { + var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var16; - --var17; - } while(var17 > 0); + var2 += var17; + --var15; + } while(var15 > 0); } } } - } + } @ObfuscatedName("h") static final int method3040(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; - if(var1 < 2) { + if (var1 < 2) { var1 = 2; - } else if(var1 > 126) { + } else if (var1 > 126) { var1 = 126; } @@ -3445,4 +3418,34 @@ public class Rasterizer3D extends Rasterizer2D { static final int rot2(int var0, int var1, int var2, int var3) { return var2 * var1 - var3 * var0 >> 16; } + + static { + field739 = false; + field740 = false; + Rasterizer3D_isLowDetailTexture = false; + field741 = true; + Rasterizer3D_alpha = 0; + Rasterizer3D_zoom = 512; + Rasterizer3D_rowOffsets = new int[1024]; + Rasterizer3D_colorPalette = new int[65536]; + field742 = new int[512]; + field743 = new int[2048]; + Rasterizer3D_sine = new int[2048]; + Rasterizer3D_cosine = new int[2048]; + + int var0; + for (var0 = 1; var0 < 512; ++var0) { + field742[var0] = 32768 / var0; + } + + for (var0 = 1; var0 < 2048; ++var0) { + field743[var0] = 65536 / var0; + } + + for (var0 = 0; var0 < 2048; ++var0) { + Rasterizer3D_sine[var0] = (int)(65536.0D * Math.sin((double)var0 * 0.0030679615D)); + Rasterizer3D_cosine[var0] = (int)(65536.0D * Math.cos((double)var0 * 0.0030679615D)); + } + + } } diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java index 2bc138ada2..4137302304 100644 --- a/runescape-client/src/main/java/RawPcmStream.java +++ b/runescape-client/src/main/java/RawPcmStream.java @@ -7,19 +7,19 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("RawPcmStream") public class RawPcmStream extends PcmStream { @ObfuscatedName("m") - int __m; + int field744; @ObfuscatedName("f") - int __f; + int field745; @ObfuscatedName("q") - int __q; + int field746; @ObfuscatedName("o") - int __o; + int field747; @ObfuscatedName("u") - int __u; + int field748; @ObfuscatedName("g") - int __g; + int field749; @ObfuscatedName("l") - int __l; + int field750; @ObfuscatedName("e") @Export("numLoops") int numLoops; @@ -30,15 +30,15 @@ public class RawPcmStream extends PcmStream { @Export("end") int end; @ObfuscatedName("k") - boolean __k; + boolean field751; @ObfuscatedName("n") - int __n; + int field752; @ObfuscatedName("i") - int __i; + int field753; @ObfuscatedName("a") - int __a; + int field754; @ObfuscatedName("z") - int __z; + int field755; @ObfuscatedSignature( signature = "(Lcx;III)V" @@ -47,12 +47,12 @@ public class RawPcmStream extends PcmStream { super.sound = var1; this.start = var1.start; this.end = var1.end; - this.__k = var1.__o; - this.__f = var2; - this.__q = var3; - this.__o = var4; - this.__m = 0; - this.__o_180(); + this.field751 = var1.field756; + this.field745 = var2; + this.field746 = var3; + this.field747 = var4; + this.field744 = 0; + this.method261(); } @ObfuscatedSignature( @@ -62,19 +62,19 @@ public class RawPcmStream extends PcmStream { super.sound = var1; this.start = var1.start; this.end = var1.end; - this.__k = var1.__o; - this.__f = var2; - this.__q = var3; - this.__o = 8192; - this.__m = 0; - this.__o_180(); + this.field751 = var1.field756; + this.field745 = var2; + this.field746 = var3; + this.field747 = 8192; + this.field744 = 0; + this.method261(); } @ObfuscatedName("o") - void __o_180() { - this.__u = this.__q; - this.__g = method2603(this.__q, this.__o); - this.__l = method2494(this.__q, this.__o); + void method261() { + this.field748 = this.field746; + this.field749 = method2603(this.field746, this.field747); + this.field750 = method2494(this.field746, this.field747); } @ObfuscatedName("u") @@ -96,189 +96,191 @@ public class RawPcmStream extends PcmStream { } @ObfuscatedName("l") - protected int __l_171() { - return this.__q == 0 && this.__n == 0?0:1; + protected int vmethod262() { + return this.field746 == 0 && this.field752 == 0 ? 0 : 1; } @ObfuscatedName("e") - public synchronized void __e_172(int[] var1, int var2, int var3) { - if(this.__q == 0 && this.__n == 0) { - this.__d_173(var3); + public synchronized void vmethod263(int[] var1, int var2, int var3) { + if (this.field746 == 0 && this.field752 == 0) { + this.vmethod264(var3); } else { RawSound var4 = (RawSound)super.sound; int var5 = this.start << 8; int var6 = this.end << 8; int var7 = var4.samples.length << 8; int var8 = var6 - var5; - if(var8 <= 0) { + if (var8 <= 0) { this.numLoops = 0; } int var9 = var2; var3 += var2; - if(this.__m < 0) { - if(this.__f <= 0) { - this.__b_189(); + if (this.field744 < 0) { + if (this.field745 <= 0) { + this.method272(); this.remove(); return; } - this.__m = 0; + this.field744 = 0; } - if(this.__m >= var7) { - if(this.__f >= 0) { - this.__b_189(); + if (this.field744 >= var7) { + if (this.field745 >= 0) { + this.method272(); this.remove(); return; } - this.__m = var7 - 1; + this.field744 = var7 - 1; } - if(this.numLoops < 0) { - if(this.__k) { - if(this.__f < 0) { - var9 = this.__ap_203(var1, var2, var5, var3, var4.samples[this.start]); - if(this.__m >= var5) { + if (this.numLoops < 0) { + if (this.field751) { + if (this.field745 < 0) { + var9 = this.method281(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field744 >= var5) { return; } - this.__m = var5 + var5 - 1 - this.__m; - this.__f = -this.__f; + this.field744 = var5 + var5 - 1 - this.field744; + this.field745 = -this.field745; } - while(true) { - var9 = this.__ad_202(var1, var9, var6, var3, var4.samples[this.end - 1]); - if(this.__m < var6) { + while (true) { + var9 = this.method280(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field744 < var6) { return; } - this.__m = var6 + var6 - 1 - this.__m; - this.__f = -this.__f; - var9 = this.__ap_203(var1, var9, var5, var3, var4.samples[this.start]); - if(this.__m >= var5) { + this.field744 = var6 + var6 - 1 - this.field744; + this.field745 = -this.field745; + var9 = this.method281(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field744 >= var5) { return; } - this.__m = var5 + var5 - 1 - this.__m; - this.__f = -this.__f; - } - } else if(this.__f < 0) { - while(true) { - var9 = this.__ap_203(var1, var9, var5, var3, var4.samples[this.end - 1]); - if(this.__m >= var5) { - return; - } - - this.__m = var6 - 1 - (var6 - 1 - this.__m) % var8; - } - } else { - while(true) { - var9 = this.__ad_202(var1, var9, var6, var3, var4.samples[this.start]); - if(this.__m < var6) { - return; - } - - this.__m = var5 + (this.__m - var5) % var8; + this.field744 = var5 + var5 - 1 - this.field744; + this.field745 = -this.field745; } } - } else { - if(this.numLoops > 0) { - if(this.__k) { - label140: { - if(this.__f < 0) { - var9 = this.__ap_203(var1, var2, var5, var3, var4.samples[this.start]); - if(this.__m >= var5) { - return; - } - this.__m = var5 + var5 - 1 - this.__m; - this.__f = -this.__f; - if(--this.numLoops == 0) { - break label140; - } + if (this.field745 < 0) { + while (true) { + var9 = this.method281(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field744 >= var5) { + return; + } + + this.field744 = var6 - 1 - (var6 - 1 - this.field744) % var8; + } + } + + while (true) { + var9 = this.method280(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field744 < var6) { + return; + } + + this.field744 = var5 + (this.field744 - var5) % var8; + } + } + + if (this.numLoops > 0) { + if (this.field751) { + label118: { + if (this.field745 < 0) { + var9 = this.method281(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field744 >= var5) { + return; } - do { - var9 = this.__ad_202(var1, var9, var6, var3, var4.samples[this.end - 1]); - if(this.__m < var6) { - return; - } + this.field744 = var5 + var5 - 1 - this.field744; + this.field745 = -this.field745; + if (--this.numLoops == 0) { + break label118; + } + } - this.__m = var6 + var6 - 1 - this.__m; - this.__f = -this.__f; - if(--this.numLoops == 0) { - break; - } + do { + var9 = this.method280(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field744 < var6) { + return; + } - var9 = this.__ap_203(var1, var9, var5, var3, var4.samples[this.start]); - if(this.__m >= var5) { - return; - } + this.field744 = var6 + var6 - 1 - this.field744; + this.field745 = -this.field745; + if (--this.numLoops == 0) { + break; + } - this.__m = var5 + var5 - 1 - this.__m; - this.__f = -this.__f; - } while(--this.numLoops != 0); + var9 = this.method281(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field744 >= var5) { + return; + } + + this.field744 = var5 + var5 - 1 - this.field744; + this.field745 = -this.field745; + } while(--this.numLoops != 0); + } + } else { + int var10; + if (this.field745 < 0) { + while (true) { + var9 = this.method281(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field744 >= var5) { + return; + } + + var10 = (var6 - 1 - this.field744) / var8; + if (var10 >= this.numLoops) { + this.field744 += var8 * this.numLoops; + this.numLoops = 0; + break; + } + + this.field744 += var8 * var10; + this.numLoops -= var10; } } else { - int var10; - if(this.__f < 0) { - while(true) { - var9 = this.__ap_203(var1, var9, var5, var3, var4.samples[this.end - 1]); - if(this.__m >= var5) { - return; - } - - var10 = (var6 - 1 - this.__m) / var8; - if(var10 >= this.numLoops) { - this.__m += var8 * this.numLoops; - this.numLoops = 0; - break; - } - - this.__m += var8 * var10; - this.numLoops -= var10; + while (true) { + var9 = this.method280(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field744 < var6) { + return; } - } else { - while(true) { - var9 = this.__ad_202(var1, var9, var6, var3, var4.samples[this.start]); - if(this.__m < var6) { - return; - } - var10 = (this.__m - var5) / var8; - if(var10 >= this.numLoops) { - this.__m -= var8 * this.numLoops; - this.numLoops = 0; - break; - } - - this.__m -= var8 * var10; - this.numLoops -= var10; + var10 = (this.field744 - var5) / var8; + if (var10 >= this.numLoops) { + this.field744 -= var8 * this.numLoops; + this.numLoops = 0; + break; } + + this.field744 -= var8 * var10; + this.numLoops -= var10; } } } + } - if(this.__f < 0) { - this.__ap_203(var1, var9, 0, var3, 0); - if(this.__m < 0) { - this.__m = -1; - this.__b_189(); - this.remove(); - } - } else { - this.__ad_202(var1, var9, var7, var3, 0); - if(this.__m >= var7) { - this.__m = var7; - this.__b_189(); - this.remove(); - } + if (this.field745 < 0) { + this.method281(var1, var9, 0, var3, 0); + if (this.field744 < 0) { + this.field744 = -1; + this.method272(); + this.remove(); + } + } else { + this.method280(var1, var9, var7, var3, 0); + if (this.field744 >= var7) { + this.field744 = var7; + this.method272(); + this.remove(); } - } } + } @ObfuscatedName("x") @@ -288,25 +290,25 @@ public class RawPcmStream extends PcmStream { } @ObfuscatedName("d") - public synchronized void __d_173(int var1) { - if(this.__n > 0) { - if(var1 >= this.__n) { - if(this.__q == Integer.MIN_VALUE) { - this.__q = 0; - this.__l = 0; - this.__g = 0; - this.__u = 0; + public synchronized void vmethod264(int var1) { + if (this.field752 > 0) { + if (var1 >= this.field752) { + if (this.field746 == Integer.MIN_VALUE) { + this.field746 = 0; + this.field750 = 0; + this.field749 = 0; + this.field748 = 0; this.remove(); - var1 = this.__n; + var1 = this.field752; } - this.__n = 0; - this.__o_180(); + this.field752 = 0; + this.method261(); } else { - this.__u += this.__i * var1; - this.__g += this.__a * var1; - this.__l += this.__z * var1; - this.__n -= var1; + this.field748 += this.field753 * var1; + this.field749 += this.field754 * var1; + this.field750 += this.field755 * var1; + this.field752 -= var1; } } @@ -315,193 +317,191 @@ public class RawPcmStream extends PcmStream { int var4 = this.end << 8; int var5 = var2.samples.length << 8; int var6 = var4 - var3; - if(var6 <= 0) { + if (var6 <= 0) { this.numLoops = 0; } - if(this.__m < 0) { - if(this.__f <= 0) { - this.__b_189(); + if (this.field744 < 0) { + if (this.field745 <= 0) { + this.method272(); this.remove(); return; } - this.__m = 0; + this.field744 = 0; } - if(this.__m >= var5) { - if(this.__f >= 0) { - this.__b_189(); + if (this.field744 >= var5) { + if (this.field745 >= 0) { + this.method272(); this.remove(); return; } - this.__m = var5 - 1; + this.field744 = var5 - 1; } - this.__m += this.__f * var1; - if(this.numLoops < 0) { - if(!this.__k) { - if(this.__f < 0) { - if(this.__m >= var3) { + this.field744 += this.field745 * var1; + if (this.numLoops < 0) { + if (!this.field751) { + if (this.field745 < 0) { + if (this.field744 >= var3) { return; } - this.__m = var4 - 1 - (var4 - 1 - this.__m) % var6; + this.field744 = var4 - 1 - (var4 - 1 - this.field744) % var6; } else { - if(this.__m < var4) { + if (this.field744 < var4) { return; } - this.__m = var3 + (this.__m - var3) % var6; + this.field744 = var3 + (this.field744 - var3) % var6; } - } else { - if(this.__f < 0) { - if(this.__m >= var3) { + if (this.field745 < 0) { + if (this.field744 >= var3) { return; } - this.__m = var3 + var3 - 1 - this.__m; - this.__f = -this.__f; + this.field744 = var3 + var3 - 1 - this.field744; + this.field745 = -this.field745; } - while(this.__m >= var4) { - this.__m = var4 + var4 - 1 - this.__m; - this.__f = -this.__f; - if(this.__m >= var3) { + while (this.field744 >= var4) { + this.field744 = var4 + var4 - 1 - this.field744; + this.field745 = -this.field745; + if (this.field744 >= var3) { return; } - this.__m = var3 + var3 - 1 - this.__m; - this.__f = -this.__f; + this.field744 = var3 + var3 - 1 - this.field744; + this.field745 = -this.field745; } - } } else { - if(this.numLoops > 0) { - if(this.__k) { - label123: { - if(this.__f < 0) { - if(this.__m >= var3) { + if (this.numLoops > 0) { + if (this.field751) { + label113: { + if (this.field745 < 0) { + if (this.field744 >= var3) { return; } - this.__m = var3 + var3 - 1 - this.__m; - this.__f = -this.__f; - if(--this.numLoops == 0) { - break label123; + this.field744 = var3 + var3 - 1 - this.field744; + this.field745 = -this.field745; + if (--this.numLoops == 0) { + break label113; } } do { - if(this.__m < var4) { + if (this.field744 < var4) { return; } - this.__m = var4 + var4 - 1 - this.__m; - this.__f = -this.__f; - if(--this.numLoops == 0) { + this.field744 = var4 + var4 - 1 - this.field744; + this.field745 = -this.field745; + if (--this.numLoops == 0) { break; } - if(this.__m >= var3) { + if (this.field744 >= var3) { return; } - this.__m = var3 + var3 - 1 - this.__m; - this.__f = -this.__f; + this.field744 = var3 + var3 - 1 - this.field744; + this.field745 = -this.field745; } while(--this.numLoops != 0); } } else { int var7; - if(this.__f < 0) { - if(this.__m >= var3) { + if (this.field745 < 0) { + if (this.field744 >= var3) { return; } - var7 = (var4 - 1 - this.__m) / var6; - if(var7 < this.numLoops) { - this.__m += var6 * var7; + var7 = (var4 - 1 - this.field744) / var6; + if (var7 < this.numLoops) { + this.field744 += var6 * var7; this.numLoops -= var7; return; } - this.__m += var6 * this.numLoops; + this.field744 += var6 * this.numLoops; this.numLoops = 0; } else { - if(this.__m < var4) { + if (this.field744 < var4) { return; } - var7 = (this.__m - var3) / var6; - if(var7 < this.numLoops) { - this.__m -= var6 * var7; + var7 = (this.field744 - var3) / var6; + if (var7 < this.numLoops) { + this.field744 -= var6 * var7; this.numLoops -= var7; return; } - this.__m -= var6 * this.numLoops; + this.field744 -= var6 * this.numLoops; this.numLoops = 0; } } } - if(this.__f < 0) { - if(this.__m < 0) { - this.__m = -1; - this.__b_189(); + if (this.field745 < 0) { + if (this.field744 < 0) { + this.field744 = -1; + this.method272(); this.remove(); } - } else if(this.__m >= var5) { - this.__m = var5; - this.__b_189(); + } else if (this.field744 >= var5) { + this.field744 = var5; + this.method272(); this.remove(); } - } + } @ObfuscatedName("a") - public synchronized void __a_182(int var1) { - this.__j_184(var1 << 6, this.__t_186()); + public synchronized void method265(int var1) { + this.method267(var1 << 6, this.method269()); } @ObfuscatedName("z") - synchronized void __z_183(int var1) { - this.__j_184(var1, this.__t_186()); + synchronized void method266(int var1) { + this.method267(var1, this.method269()); } @ObfuscatedName("j") - synchronized void __j_184(int var1, int var2) { - this.__q = var1; - this.__o = var2; - this.__n = 0; - this.__o_180(); + synchronized void method267(int var1, int var2) { + this.field746 = var1; + this.field747 = var2; + this.field752 = 0; + this.method261(); } @ObfuscatedName("s") - public synchronized int __s_185() { - return this.__q == Integer.MIN_VALUE?0:this.__q; + public synchronized int method268() { + return this.field746 == Integer.MIN_VALUE ? 0 : this.field746; } @ObfuscatedName("t") - public synchronized int __t_186() { - return this.__o < 0?-1:this.__o; + public synchronized int method269() { + return this.field747 < 0 ? -1 : this.field747; } @ObfuscatedName("y") - public synchronized void __y_187(int var1) { + public synchronized void method270(int var1) { int var2 = ((RawSound)super.sound).samples.length << 8; - if(var1 < -1) { + if (var1 < -1) { var1 = -1; } - if(var1 > var2) { + if (var1 > var2) { var1 = var2; } - this.__m = var1; + this.field744 = var1; } @ObfuscatedName("h") @@ -509,319 +509,321 @@ public class RawPcmStream extends PcmStream { signature = "(Z)V", garbageValue = "1" ) - public synchronized void __h_188() { - this.__f = (this.__f ^ this.__f >> 31) + (this.__f >>> 31); - this.__f = -this.__f; + public synchronized void method271() { + this.field745 = (this.field745 ^ this.field745 >> 31) + (this.field745 >>> 31); + this.field745 = -this.field745; } @ObfuscatedName("b") - void __b_189() { - if(this.__n != 0) { - if(this.__q == Integer.MIN_VALUE) { - this.__q = 0; + void method272() { + if (this.field752 != 0) { + if (this.field746 == Integer.MIN_VALUE) { + this.field746 = 0; } - this.__n = 0; - this.__o_180(); + this.field752 = 0; + this.method261(); } } @ObfuscatedName("c") - public synchronized void __c_190(int var1, int var2) { - this.__p_191(var1, var2, this.__t_186()); + public synchronized void method273(int var1, int var2) { + this.method274(var1, var2, this.method269()); } @ObfuscatedName("p") - public synchronized void __p_191(int var1, int var2, int var3) { - if(var1 == 0) { - this.__j_184(var2, var3); + public synchronized void method274(int var1, int var2, int var3) { + if (var1 == 0) { + this.method267(var2, var3); } else { int var4 = method2603(var2, var3); int var5 = method2494(var2, var3); - if(var4 == this.__g && var5 == this.__l) { - this.__n = 0; + if (var4 == this.field749 && var5 == this.field750) { + this.field752 = 0; } else { - int var6 = var2 - this.__u; - if(this.__u - var2 > var6) { - var6 = this.__u - var2; + int var6 = var2 - this.field748; + if (this.field748 - var2 > var6) { + var6 = this.field748 - var2; } - if(var4 - this.__g > var6) { - var6 = var4 - this.__g; + if (var4 - this.field749 > var6) { + var6 = var4 - this.field749; } - if(this.__g - var4 > var6) { - var6 = this.__g - var4; + if (this.field749 - var4 > var6) { + var6 = this.field749 - var4; } - if(var5 - this.__l > var6) { - var6 = var5 - this.__l; + if (var5 - this.field750 > var6) { + var6 = var5 - this.field750; } - if(this.__l - var5 > var6) { - var6 = this.__l - var5; + if (this.field750 - var5 > var6) { + var6 = this.field750 - var5; } - if(var1 > var6) { + if (var1 > var6) { var1 = var6; } - this.__n = var1; - this.__q = var2; - this.__o = var3; - this.__i = (var2 - this.__u) / var1; - this.__a = (var4 - this.__g) / var1; - this.__z = (var5 - this.__l) / var1; + this.field752 = var1; + this.field746 = var2; + this.field747 = var3; + this.field753 = (var2 - this.field748) / var1; + this.field754 = (var4 - this.field749) / var1; + this.field755 = (var5 - this.field750) / var1; } } + } @ObfuscatedName("v") - public synchronized void __v_192(int var1) { - if(var1 == 0) { - this.__z_183(0); + public synchronized void method275(int var1) { + if (var1 == 0) { + this.method266(0); this.remove(); - } else if(this.__g == 0 && this.__l == 0) { - this.__n = 0; - this.__q = 0; - this.__u = 0; + } else if (this.field749 == 0 && this.field750 == 0) { + this.field752 = 0; + this.field746 = 0; + this.field748 = 0; this.remove(); } else { - int var2 = -this.__u; - if(this.__u > var2) { - var2 = this.__u; + int var2 = -this.field748; + if (this.field748 > var2) { + var2 = this.field748; } - if(-this.__g > var2) { - var2 = -this.__g; + if (-this.field749 > var2) { + var2 = -this.field749; } - if(this.__g > var2) { - var2 = this.__g; + if (this.field749 > var2) { + var2 = this.field749; } - if(-this.__l > var2) { - var2 = -this.__l; + if (-this.field750 > var2) { + var2 = -this.field750; } - if(this.__l > var2) { - var2 = this.__l; + if (this.field750 > var2) { + var2 = this.field750; } - if(var1 > var2) { + if (var1 > var2) { var1 = var2; } - this.__n = var1; - this.__q = Integer.MIN_VALUE; - this.__i = -this.__u / var1; - this.__a = -this.__g / var1; - this.__z = -this.__l / var1; + this.field752 = var1; + this.field746 = Integer.MIN_VALUE; + this.field753 = -this.field748 / var1; + this.field754 = -this.field749 / var1; + this.field755 = -this.field750 / var1; } + } @ObfuscatedName("ah") - public synchronized void __ah_193(int var1) { - if(this.__f < 0) { - this.__f = -var1; + public synchronized void method276(int var1) { + if (this.field745 < 0) { + this.field745 = -var1; } else { - this.__f = var1; + this.field745 = var1; } } @ObfuscatedName("ab") - public synchronized int __ab_194() { - return this.__f < 0?-this.__f:this.__f; + public synchronized int method277() { + return this.field745 < 0 ? -this.field745 : this.field745; } @ObfuscatedName("ae") - public boolean __ae_195() { - return this.__m < 0 || this.__m >= ((RawSound)super.sound).samples.length << 8; + public boolean method278() { + return this.field744 < 0 || this.field744 >= ((RawSound)super.sound).samples.length << 8; } @ObfuscatedName("at") - public boolean __at_196() { - return this.__n != 0; + public boolean method279() { + return this.field752 != 0; } @ObfuscatedName("ad") - int __ad_202(int[] var1, int var2, int var3, int var4, int var5) { - while(true) { - if(this.__n > 0) { - int var6 = var2 + this.__n; - if(var6 > var4) { + int method280(int[] var1, int var2, int var3, int var4, int var5) { + while (true) { + if (this.field752 > 0) { + int var6 = var2 + this.field752; + if (var6 > var4) { var6 = var4; } - this.__n += var2; - if(this.__f == 256 && (this.__m & 255) == 0) { - if(PcmPlayer.isStereo) { - var2 = method2533(0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, this.__a, this.__z, 0, var6, var3, this); + this.field752 += var2; + if (this.field745 == 256 && (this.field744 & 255) == 0) { + if (PcmPlayer.isStereo) { + var2 = method2533(0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, this.field754, this.field755, 0, var6, var3, this); } else { - var2 = method2532(((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, this.__i, 0, var6, var3, this); + var2 = method2532(((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, this.field753, 0, var6, var3, this); } - } else if(PcmPlayer.isStereo) { - var2 = method2504(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, this.__a, this.__z, 0, var6, var3, this, this.__f, var5); + } else if (PcmPlayer.isStereo) { + var2 = method2504(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, this.field754, this.field755, 0, var6, var3, this, this.field745, var5); } else { - var2 = method2536(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, this.__i, 0, var6, var3, this, this.__f, var5); + var2 = method2536(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, this.field753, 0, var6, var3, this, this.field745, var5); } - this.__n -= var2; - if(this.__n != 0) { + this.field752 -= var2; + if (this.field752 != 0) { return var2; } - if(!this.__au_204()) { + if (!this.method283()) { continue; } return var4; } - if(this.__f == 256 && (this.__m & 255) == 0) { - if(PcmPlayer.isStereo) { - return method2525(0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, 0, var4, var3, this); + if (this.field745 == 256 && (this.field744 & 255) == 0) { + if (PcmPlayer.isStereo) { + return method2525(0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, 0, var4, var3, this); } - return method2563(((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, 0, var4, var3, this); + return method2563(((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, 0, var4, var3, this); } - if(PcmPlayer.isStereo) { - return method2529(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, 0, var4, var3, this, this.__f, var5); + if (PcmPlayer.isStereo) { + return method2529(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, 0, var4, var3, this, this.field745, var5); } - return method2528(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, 0, var4, var3, this, this.__f, var5); + return method2528(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, 0, var4, var3, this, this.field745, var5); } } @ObfuscatedName("ap") - int __ap_203(int[] var1, int var2, int var3, int var4, int var5) { - while(true) { - if(this.__n > 0) { - int var6 = var2 + this.__n; - if(var6 > var4) { + int method281(int[] var1, int var2, int var3, int var4, int var5) { + while (true) { + if (this.field752 > 0) { + int var6 = var2 + this.field752; + if (var6 > var4) { var6 = var4; } - this.__n += var2; - if(this.__f == -256 && (this.__m & 255) == 0) { - if(PcmPlayer.isStereo) { - var2 = method2547(0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, this.__a, this.__z, 0, var6, var3, this); + this.field752 += var2; + if (this.field745 == -256 && (this.field744 & 255) == 0) { + if (PcmPlayer.isStereo) { + var2 = method2547(0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, this.field754, this.field755, 0, var6, var3, this); } else { - var2 = method2534(((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, this.__i, 0, var6, var3, this); + var2 = method2534(((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, this.field753, 0, var6, var3, this); } - } else if(PcmPlayer.isStereo) { - var2 = method2624(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, this.__a, this.__z, 0, var6, var3, this, this.__f, var5); + } else if (PcmPlayer.isStereo) { + var2 = method2624(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, this.field754, this.field755, 0, var6, var3, this, this.field745, var5); } else { - var2 = method2538(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, this.__i, 0, var6, var3, this, this.__f, var5); + var2 = method2538(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, this.field753, 0, var6, var3, this, this.field745, var5); } - this.__n -= var2; - if(this.__n != 0) { + this.field752 -= var2; + if (this.field752 != 0) { return var2; } - if(!this.__au_204()) { + if (!this.method283()) { continue; } return var4; } - if(this.__f == -256 && (this.__m & 255) == 0) { - if(PcmPlayer.isStereo) { - return method2496(0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, 0, var4, var3, this); + if (this.field745 == -256 && (this.field744 & 255) == 0) { + if (PcmPlayer.isStereo) { + return method2496(0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, 0, var4, var3, this); } - return method2636(((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, 0, var4, var3, this); + return method2636(((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, 0, var4, var3, this); } - if(PcmPlayer.isStereo) { - return method2531(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, 0, var4, var3, this, this.__f, var5); + if (PcmPlayer.isStereo) { + return method2531(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, 0, var4, var3, this, this.field745, var5); } - return method2509(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, 0, var4, var3, this, this.__f, var5); + return method2509(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, 0, var4, var3, this, this.field745, var5); } } @ObfuscatedName("az") - int __az_179() { - int var1 = this.__u * 3 >> 6; + int vmethod282() { + int var1 = this.field748 * 3 >> 6; var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); - if(this.numLoops == 0) { - var1 -= var1 * this.__m / (((RawSound)super.sound).samples.length << 8); - } else if(this.numLoops >= 0) { + if (this.numLoops == 0) { + var1 -= var1 * this.field744 / (((RawSound)super.sound).samples.length << 8); + } else if (this.numLoops >= 0) { var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; } - return var1 > 255?255:var1; + return var1 > 255 ? 255 : var1; } @ObfuscatedName("au") - boolean __au_204() { - int var1 = this.__q; + boolean method283() { + int var1 = this.field746; int var2; int var3; - if(var1 == Integer.MIN_VALUE) { + if (var1 == Integer.MIN_VALUE) { var3 = 0; var2 = 0; var1 = 0; } else { - var2 = method2603(var1, this.__o); - var3 = method2494(var1, this.__o); + var2 = method2603(var1, this.field747); + var3 = method2494(var1, this.field747); } - if(var1 == this.__u && var2 == this.__g && var3 == this.__l) { - if(this.__q == Integer.MIN_VALUE) { - this.__q = 0; - this.__l = 0; - this.__g = 0; - this.__u = 0; + if (var1 == this.field748 && var2 == this.field749 && var3 == this.field750) { + if (this.field746 == Integer.MIN_VALUE) { + this.field746 = 0; + this.field750 = 0; + this.field749 = 0; + this.field748 = 0; this.remove(); return true; } else { - this.__o_180(); + this.method261(); return false; } } else { - if(this.__u < var1) { - this.__i = 1; - this.__n = var1 - this.__u; - } else if(this.__u > var1) { - this.__i = -1; - this.__n = this.__u - var1; + if (this.field748 < var1) { + this.field753 = 1; + this.field752 = var1 - this.field748; + } else if (this.field748 > var1) { + this.field753 = -1; + this.field752 = this.field748 - var1; } else { - this.__i = 0; + this.field753 = 0; } - if(this.__g < var2) { - this.__a = 1; - if(this.__n == 0 || this.__n > var2 - this.__g) { - this.__n = var2 - this.__g; + if (this.field749 < var2) { + this.field754 = 1; + if (this.field752 == 0 || this.field752 > var2 - this.field749) { + this.field752 = var2 - this.field749; } - } else if(this.__g > var2) { - this.__a = -1; - if(this.__n == 0 || this.__n > this.__g - var2) { - this.__n = this.__g - var2; + } else if (this.field749 > var2) { + this.field754 = -1; + if (this.field752 == 0 || this.field752 > this.field749 - var2) { + this.field752 = this.field749 - var2; } } else { - this.__a = 0; + this.field754 = 0; } - if(this.__l < var3) { - this.__z = 1; - if(this.__n == 0 || this.__n > var3 - this.__l) { - this.__n = var3 - this.__l; + if (this.field750 < var3) { + this.field755 = 1; + if (this.field752 == 0 || this.field752 > var3 - this.field750) { + this.field752 = var3 - this.field750; } - } else if(this.__l > var3) { - this.__z = -1; - if(this.__n == 0 || this.__n > this.__l - var3) { - this.__n = this.__l - var3; + } else if (this.field750 > var3) { + this.field755 = -1; + if (this.field752 == 0 || this.field752 > this.field750 - var3) { + this.field752 = this.field750 - var3; } } else { - this.__z = 0; + this.field755 = 0; } return false; @@ -830,12 +832,12 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("m") static int method2603(int var0, int var1) { - return var1 < 0?var0:(int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); + return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); } @ObfuscatedName("f") static int method2494(int var0, int var1) { - return var1 < 0?-var0:(int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); + return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); } @ObfuscatedName("q") @@ -844,7 +846,7 @@ public class RawPcmStream extends PcmStream { ) @Export("createRawPcmStream") public static RawPcmStream createRawPcmStream(RawSound var0, int var1, int var2) { - return var0.samples != null && var0.samples.length != 0?new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(class309.PcmPlayer_sampleRate * 100)), var2 << 6):null; + return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(class309.PcmPlayer_sampleRate * 100)), var2 << 6) : null; } @ObfuscatedName("w") @@ -852,7 +854,7 @@ public class RawPcmStream extends PcmStream { signature = "(Lcx;III)Lds;" ) public static RawPcmStream method2524(RawSound var0, int var1, int var2, int var3) { - return var0.samples != null && var0.samples.length != 0?new RawPcmStream(var0, var1, var2, var3):null; + return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; } @ObfuscatedName("ao") @@ -863,26 +865,26 @@ public class RawPcmStream extends PcmStream { var2 >>= 8; var7 >>= 8; var4 <<= 2; - if((var5 = var3 + var7 - var2) > var6) { + if ((var5 = var3 + var7 - var2) > var6) { var5 = var6; } - int var10001; - for(var5 -= 3; var3 < var5; var1[var10001] += var0[var2++] * var4) { - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; - var10001 = var3++; + int var9; + for (var5 -= 3; var3 < var5; var1[var9] += var0[var2++] * var4) { + var9 = var3++; + var1[var9] += var0[var2++] * var4; + var9 = var3++; + var1[var9] += var0[var2++] * var4; + var9 = var3++; + var1[var9] += var0[var2++] * var4; + var9 = var3++; } - for(var5 += 3; var3 < var5; var1[var10001] += var0[var2++] * var4) { - var10001 = var3++; + for (var5 += 3; var3 < var5; var1[var9] += var0[var2++] * var4) { + var9 = var3++; } - var8.__m = var2 << 8; + var8.field744 = var2 << 8; return var3; } @@ -895,45 +897,45 @@ public class RawPcmStream extends PcmStream { var9 >>= 8; var5 <<= 2; var6 <<= 2; - if((var7 = var4 + var9 - var3) > var8) { + if ((var7 = var4 + var9 - var3) > var8) { var7 = var8; } var4 <<= 1; var7 <<= 1; - int var10001; - byte var11; - for(var7 -= 6; var4 < var7; var2[var10001] += var11 * var6) { - var11 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var11 * var5; - var10001 = var4++; - var2[var10001] += var11 * var6; - var11 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var11 * var5; - var10001 = var4++; - var2[var10001] += var11 * var6; - var11 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var11 * var5; - var10001 = var4++; - var2[var10001] += var11 * var6; - var11 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var11 * var5; - var10001 = var4++; + int var11; + byte var12; + for (var7 -= 6; var4 < var7; var2[var11] += var12 * var6) { + var12 = var1[var3++]; + var11 = var4++; + var2[var11] += var12 * var5; + var11 = var4++; + var2[var11] += var12 * var6; + var12 = var1[var3++]; + var11 = var4++; + var2[var11] += var12 * var5; + var11 = var4++; + var2[var11] += var12 * var6; + var12 = var1[var3++]; + var11 = var4++; + var2[var11] += var12 * var5; + var11 = var4++; + var2[var11] += var12 * var6; + var12 = var1[var3++]; + var11 = var4++; + var2[var11] += var12 * var5; + var11 = var4++; } - for(var7 += 6; var4 < var7; var2[var10001] += var11 * var6) { - var11 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var11 * var5; - var10001 = var4++; + for (var7 += 6; var4 < var7; var2[var11] += var12 * var6) { + var12 = var1[var3++]; + var11 = var4++; + var2[var11] += var12 * var5; + var11 = var4++; } - var10.__m = var3 << 8; + var10.field744 = var3 << 8; return var4 >> 1; } @@ -945,26 +947,26 @@ public class RawPcmStream extends PcmStream { var2 >>= 8; var7 >>= 8; var4 <<= 2; - if((var5 = var3 + var2 - (var7 - 1)) > var6) { + if ((var5 = var3 + var2 - (var7 - 1)) > var6) { var5 = var6; } - int var10001; - for(var5 -= 3; var3 < var5; var1[var10001] += var0[var2--] * var4) { - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; - var10001 = var3++; + int var9; + for (var5 -= 3; var3 < var5; var1[var9] += var0[var2--] * var4) { + var9 = var3++; + var1[var9] += var0[var2--] * var4; + var9 = var3++; + var1[var9] += var0[var2--] * var4; + var9 = var3++; + var1[var9] += var0[var2--] * var4; + var9 = var3++; } - for(var5 += 3; var3 < var5; var1[var10001] += var0[var2--] * var4) { - var10001 = var3++; + for (var5 += 3; var3 < var5; var1[var9] += var0[var2--] * var4) { + var9 = var3++; } - var8.__m = var2 << 8; + var8.field744 = var2 << 8; return var3; } @@ -977,45 +979,45 @@ public class RawPcmStream extends PcmStream { var9 >>= 8; var5 <<= 2; var6 <<= 2; - if((var7 = var3 + var4 - (var9 - 1)) > var8) { + if ((var7 = var3 + var4 - (var9 - 1)) > var8) { var7 = var8; } var4 <<= 1; var7 <<= 1; - int var10001; - byte var11; - for(var7 -= 6; var4 < var7; var2[var10001] += var11 * var6) { - var11 = var1[var3--]; - var10001 = var4++; - var2[var10001] += var11 * var5; - var10001 = var4++; - var2[var10001] += var11 * var6; - var11 = var1[var3--]; - var10001 = var4++; - var2[var10001] += var11 * var5; - var10001 = var4++; - var2[var10001] += var11 * var6; - var11 = var1[var3--]; - var10001 = var4++; - var2[var10001] += var11 * var5; - var10001 = var4++; - var2[var10001] += var11 * var6; - var11 = var1[var3--]; - var10001 = var4++; - var2[var10001] += var11 * var5; - var10001 = var4++; + int var11; + byte var12; + for (var7 -= 6; var4 < var7; var2[var11] += var12 * var6) { + var12 = var1[var3--]; + var11 = var4++; + var2[var11] += var12 * var5; + var11 = var4++; + var2[var11] += var12 * var6; + var12 = var1[var3--]; + var11 = var4++; + var2[var11] += var12 * var5; + var11 = var4++; + var2[var11] += var12 * var6; + var12 = var1[var3--]; + var11 = var4++; + var2[var11] += var12 * var5; + var11 = var4++; + var2[var11] += var12 * var6; + var12 = var1[var3--]; + var11 = var4++; + var2[var11] += var12 * var5; + var11 = var4++; } - for(var7 += 6; var4 < var7; var2[var10001] += var11 * var6) { - var11 = var1[var3--]; - var10001 = var4++; - var2[var10001] += var11 * var5; - var10001 = var4++; + for (var7 += 6; var4 < var7; var2[var11] += var12 * var6) { + var12 = var1[var3--]; + var11 = var4++; + var2[var11] += var12 * var5; + var11 = var4++; } - var10.__m = var3 << 8; + var10.field744 = var3 << 8; return var4 >> 1; } @@ -1024,31 +1026,31 @@ public class RawPcmStream extends PcmStream { signature = "(II[B[IIIIIIILds;II)I" ) static int method2528(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { - if(var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { + if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { var7 = var8; } byte var13; - int var10001; - while(var5 < var7) { + int var14; + while (var5 < var7) { var1 = var4 >> 8; var13 = var2[var1]; - var10001 = var5++; - var3[var10001] += ((var13 << 8) + (var2[var1 + 1] - var13) * (var4 & 255)) * var6 >> 6; + var14 = var5++; + var3[var14] += ((var13 << 8) + (var2[var1 + 1] - var13) * (var4 & 255)) * var6 >> 6; var4 += var11; } - if(var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 1) / var11) > var8) { + if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 1) / var11) > var8) { var7 = var8; } - for(var1 = var12; var5 < var7; var4 += var11) { + for (var1 = var12; var5 < var7; var4 += var11) { var13 = var2[var4 >> 8]; - var10001 = var5++; - var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; + var14 = var5++; + var3[var14] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; } - var10.__m = var4; + var10.field744 = var4; return var5; } @@ -1057,40 +1059,40 @@ public class RawPcmStream extends PcmStream { signature = "(II[B[IIIIIIIILds;II)I" ) static int method2529(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - if(var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { + if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { var8 = var9; } var5 <<= 1; byte var14; - int var10001; - for(var8 <<= 1; var5 < var8; var4 += var12) { + int var15; + for (var8 <<= 1; var5 < var8; var4 += var12) { var1 = var4 >> 8; var14 = var2[var1]; var0 = (var14 << 8) + (var4 & 255) * (var2[var1 + 1] - var14); - var10001 = var5++; - var3[var10001] += var0 * var6 >> 6; - var10001 = var5++; - var3[var10001] += var0 * var7 >> 6; + var15 = var5++; + var3[var15] += var0 * var6 >> 6; + var15 = var5++; + var3[var15] += var0 * var7 >> 6; } - if(var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12 - 1) / var12) > var9) { + if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12 - 1) / var12) > var9) { var8 = var9; } var8 <<= 1; - for(var1 = var13; var5 < var8; var4 += var12) { + for (var1 = var13; var5 < var8; var4 += var12) { var14 = var2[var4 >> 8]; var0 = (var14 << 8) + (var1 - var14) * (var4 & 255); - var10001 = var5++; - var3[var10001] += var0 * var6 >> 6; - var10001 = var5++; - var3[var10001] += var0 * var7 >> 6; + var15 = var5++; + var3[var15] += var0 * var6 >> 6; + var15 = var5++; + var3[var15] += var0 * var7 >> 6; } - var11.__m = var4; + var11.field744 = var4; return var5 >> 1; } @@ -1099,31 +1101,31 @@ public class RawPcmStream extends PcmStream { signature = "(II[B[IIIIIIILds;II)I" ) static int method2509(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { - if(var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) { + if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) { var7 = var8; } - int var10001; - while(var5 < var7) { + int var13; + while (var5 < var7) { var1 = var4 >> 8; - byte var13 = var2[var1 - 1]; - var10001 = var5++; - var3[var10001] += ((var13 << 8) + (var2[var1] - var13) * (var4 & 255)) * var6 >> 6; + byte var14 = var2[var1 - 1]; + var13 = var5++; + var3[var13] += ((var14 << 8) + (var2[var1] - var14) * (var4 & 255)) * var6 >> 6; var4 += var11; } - if(var11 == 0 || (var7 = var5 + (var11 + (var9 - var4)) / var11) > var8) { + if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4)) / var11) > var8) { var7 = var8; } var0 = var12; - for(var1 = var11; var5 < var7; var4 += var1) { - var10001 = var5++; - var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; + for (var1 = var11; var5 < var7; var4 += var1) { + var13 = var5++; + var3[var13] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; } - var10.__m = var4; + var10.field744 = var4; return var5; } @@ -1132,38 +1134,38 @@ public class RawPcmStream extends PcmStream { signature = "(II[B[IIIIIIIILds;II)I" ) static int method2531(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - if(var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { + if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { var8 = var9; } var5 <<= 1; - int var10001; - for(var8 <<= 1; var5 < var8; var4 += var12) { + int var14; + for (var8 <<= 1; var5 < var8; var4 += var12) { var1 = var4 >> 8; - byte var14 = var2[var1 - 1]; - var0 = (var2[var1] - var14) * (var4 & 255) + (var14 << 8); - var10001 = var5++; - var3[var10001] += var0 * var6 >> 6; - var10001 = var5++; - var3[var10001] += var0 * var7 >> 6; + byte var15 = var2[var1 - 1]; + var0 = (var2[var1] - var15) * (var4 & 255) + (var15 << 8); + var14 = var5++; + var3[var14] += var0 * var6 >> 6; + var14 = var5++; + var3[var14] += var0 * var7 >> 6; } - if(var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12) / var12) > var9) { + if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12) / var12) > var9) { var8 = var9; } var8 <<= 1; - for(var1 = var13; var5 < var8; var4 += var12) { + for (var1 = var13; var5 < var8; var4 += var12) { var0 = (var1 << 8) + (var4 & 255) * (var2[var4 >> 8] - var1); - var10001 = var5++; - var3[var10001] += var0 * var6 >> 6; - var10001 = var5++; - var3[var10001] += var0 * var7 >> 6; + var14 = var5++; + var3[var14] += var0 * var6 >> 6; + var14 = var5++; + var3[var14] += var0 * var7 >> 6; } - var11.__m = var4; + var11.field744 = var4; return var5 >> 1; } @@ -1176,35 +1178,35 @@ public class RawPcmStream extends PcmStream { var8 >>= 8; var4 <<= 2; var5 <<= 2; - if((var6 = var3 + var8 - var2) > var7) { + if ((var6 = var3 + var8 - var2) > var7) { var6 = var7; } - var9.__g += var9.__a * (var6 - var3); - var9.__l += var9.__z * (var6 - var3); + var9.field749 += var9.field754 * (var6 - var3); + var9.field750 += var9.field755 * (var6 - var3); - int var10001; - for(var6 -= 3; var3 < var6; var4 += var5) { - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; + int var10; + for (var6 -= 3; var3 < var6; var4 += var5) { + var10 = var3++; + var1[var10] += var0[var2++] * var4; var4 += var5; - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; + var10 = var3++; + var1[var10] += var0[var2++] * var4; var4 += var5; - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; + var10 = var3++; + var1[var10] += var0[var2++] * var4; var4 += var5; - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; + var10 = var3++; + var1[var10] += var0[var2++] * var4; } - for(var6 += 3; var3 < var6; var4 += var5) { - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; + for (var6 += 3; var3 < var6; var4 += var5) { + var10 = var3++; + var1[var10] += var0[var2++] * var4; } - var9.__u = var4 >> 2; - var9.__m = var2 << 8; + var9.field748 = var4 >> 2; + var9.field744 = var2 << 8; return var3; } @@ -1219,58 +1221,58 @@ public class RawPcmStream extends PcmStream { var6 <<= 2; var7 <<= 2; var8 <<= 2; - if((var9 = var11 + var4 - var3) > var10) { + if ((var9 = var11 + var4 - var3) > var10) { var9 = var10; } - var12.__u += var12.__i * (var9 - var4); + var12.field748 += var12.field753 * (var9 - var4); var4 <<= 1; var9 <<= 1; byte var13; - int var10001; - for(var9 -= 6; var4 < var9; var6 += var8) { + int var14; + for (var9 -= 6; var4 < var9; var6 += var8) { var13 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var13 * var5; + var14 = var4++; + var2[var14] += var13 * var5; var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; + var14 = var4++; + var2[var14] += var13 * var6; var6 += var8; var13 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var13 * var5; + var14 = var4++; + var2[var14] += var13 * var5; var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; + var14 = var4++; + var2[var14] += var13 * var6; var6 += var8; var13 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var13 * var5; + var14 = var4++; + var2[var14] += var13 * var5; var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; + var14 = var4++; + var2[var14] += var13 * var6; var6 += var8; var13 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var13 * var5; + var14 = var4++; + var2[var14] += var13 * var5; var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; + var14 = var4++; + var2[var14] += var13 * var6; } - for(var9 += 6; var4 < var9; var6 += var8) { + for (var9 += 6; var4 < var9; var6 += var8) { var13 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var13 * var5; + var14 = var4++; + var2[var14] += var13 * var5; var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; + var14 = var4++; + var2[var14] += var13 * var6; } - var12.__g = var5 >> 2; - var12.__l = var6 >> 2; - var12.__m = var3 << 8; + var12.field749 = var5 >> 2; + var12.field750 = var6 >> 2; + var12.field744 = var3 << 8; return var4 >> 1; } @@ -1283,35 +1285,35 @@ public class RawPcmStream extends PcmStream { var8 >>= 8; var4 <<= 2; var5 <<= 2; - if((var6 = var3 + var2 - (var8 - 1)) > var7) { + if ((var6 = var3 + var2 - (var8 - 1)) > var7) { var6 = var7; } - var9.__g += var9.__a * (var6 - var3); - var9.__l += var9.__z * (var6 - var3); + var9.field749 += var9.field754 * (var6 - var3); + var9.field750 += var9.field755 * (var6 - var3); - int var10001; - for(var6 -= 3; var3 < var6; var4 += var5) { - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; + int var10; + for (var6 -= 3; var3 < var6; var4 += var5) { + var10 = var3++; + var1[var10] += var0[var2--] * var4; var4 += var5; - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; + var10 = var3++; + var1[var10] += var0[var2--] * var4; var4 += var5; - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; + var10 = var3++; + var1[var10] += var0[var2--] * var4; var4 += var5; - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; + var10 = var3++; + var1[var10] += var0[var2--] * var4; } - for(var6 += 3; var3 < var6; var4 += var5) { - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; + for (var6 += 3; var3 < var6; var4 += var5) { + var10 = var3++; + var1[var10] += var0[var2--] * var4; } - var9.__u = var4 >> 2; - var9.__m = var2 << 8; + var9.field748 = var4 >> 2; + var9.field744 = var2 << 8; return var3; } @@ -1326,58 +1328,58 @@ public class RawPcmStream extends PcmStream { var6 <<= 2; var7 <<= 2; var8 <<= 2; - if((var9 = var3 + var4 - (var11 - 1)) > var10) { + if ((var9 = var3 + var4 - (var11 - 1)) > var10) { var9 = var10; } - var12.__u += var12.__i * (var9 - var4); + var12.field748 += var12.field753 * (var9 - var4); var4 <<= 1; var9 <<= 1; byte var13; - int var10001; - for(var9 -= 6; var4 < var9; var6 += var8) { + int var14; + for (var9 -= 6; var4 < var9; var6 += var8) { var13 = var1[var3--]; - var10001 = var4++; - var2[var10001] += var13 * var5; + var14 = var4++; + var2[var14] += var13 * var5; var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; + var14 = var4++; + var2[var14] += var13 * var6; var6 += var8; var13 = var1[var3--]; - var10001 = var4++; - var2[var10001] += var13 * var5; + var14 = var4++; + var2[var14] += var13 * var5; var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; + var14 = var4++; + var2[var14] += var13 * var6; var6 += var8; var13 = var1[var3--]; - var10001 = var4++; - var2[var10001] += var13 * var5; + var14 = var4++; + var2[var14] += var13 * var5; var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; + var14 = var4++; + var2[var14] += var13 * var6; var6 += var8; var13 = var1[var3--]; - var10001 = var4++; - var2[var10001] += var13 * var5; + var14 = var4++; + var2[var14] += var13 * var5; var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; + var14 = var4++; + var2[var14] += var13 * var6; } - for(var9 += 6; var4 < var9; var6 += var8) { + for (var9 += 6; var4 < var9; var6 += var8) { var13 = var1[var3--]; - var10001 = var4++; - var2[var10001] += var13 * var5; + var14 = var4++; + var2[var14] += var13 * var5; var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; + var14 = var4++; + var2[var14] += var13 * var6; } - var12.__g = var5 >> 2; - var12.__l = var6 >> 2; - var12.__m = var3 << 8; + var12.field749 = var5 >> 2; + var12.field750 = var6 >> 2; + var12.field744 = var3 << 8; return var4 >> 1; } @@ -1386,38 +1388,38 @@ public class RawPcmStream extends PcmStream { signature = "(II[B[IIIIIIIILds;II)I" ) static int method2536(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - var11.__g -= var11.__a * var5; - var11.__l -= var11.__z * var5; - if(var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { + var11.field749 -= var11.field754 * var5; + var11.field750 -= var11.field755 * var5; + if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { var8 = var9; } byte var14; - int var10001; - while(var5 < var8) { + int var15; + while (var5 < var8) { var1 = var4 >> 8; var14 = var2[var1]; - var10001 = var5++; - var3[var10001] += ((var14 << 8) + (var2[var1 + 1] - var14) * (var4 & 255)) * var6 >> 6; + var15 = var5++; + var3[var15] += ((var14 << 8) + (var2[var1 + 1] - var14) * (var4 & 255)) * var6 >> 6; var6 += var7; var4 += var12; } - if(var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 1) / var12) > var9) { + if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 1) / var12) > var9) { var8 = var9; } - for(var1 = var13; var5 < var8; var4 += var12) { + for (var1 = var13; var5 < var8; var4 += var12) { var14 = var2[var4 >> 8]; - var10001 = var5++; - var3[var10001] += ((var14 << 8) + (var1 - var14) * (var4 & 255)) * var6 >> 6; + var15 = var5++; + var3[var15] += ((var14 << 8) + (var1 - var14) * (var4 & 255)) * var6 >> 6; var6 += var7; } - var11.__g += var11.__a * var5; - var11.__l += var11.__z * var5; - var11.__u = var6; - var11.__m = var4; + var11.field749 += var11.field754 * var5; + var11.field750 += var11.field755 * var5; + var11.field748 = var6; + var11.field744 = var4; return var5; } @@ -1426,49 +1428,49 @@ public class RawPcmStream extends PcmStream { signature = "(II[B[IIIIIIIIIILds;II)I" ) static int method2504(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { - var13.__u -= var5 * var13.__i; - if(var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { + var13.field748 -= var5 * var13.field753; + if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { var10 = var11; } var5 <<= 1; byte var16; - int var10001; - for(var10 <<= 1; var5 < var10; var4 += var14) { + int var17; + for (var10 <<= 1; var5 < var10; var4 += var14) { var1 = var4 >> 8; var16 = var2[var1]; var0 = (var16 << 8) + (var4 & 255) * (var2[var1 + 1] - var16); - var10001 = var5++; - var3[var10001] += var0 * var6 >> 6; + var17 = var5++; + var3[var17] += var0 * var6 >> 6; var6 += var8; - var10001 = var5++; - var3[var10001] += var0 * var7 >> 6; + var17 = var5++; + var3[var17] += var0 * var7 >> 6; var7 += var9; } - if(var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14 - 1) / var14) > var11) { + if (var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14 - 1) / var14) > var11) { var10 = var11; } var10 <<= 1; - for(var1 = var15; var5 < var10; var4 += var14) { + for (var1 = var15; var5 < var10; var4 += var14) { var16 = var2[var4 >> 8]; var0 = (var16 << 8) + (var1 - var16) * (var4 & 255); - var10001 = var5++; - var3[var10001] += var0 * var6 >> 6; + var17 = var5++; + var3[var17] += var0 * var6 >> 6; var6 += var8; - var10001 = var5++; - var3[var10001] += var0 * var7 >> 6; + var17 = var5++; + var3[var17] += var0 * var7 >> 6; var7 += var9; } var5 >>= 1; - var13.__u += var13.__i * var5; - var13.__g = var6; - var13.__l = var7; - var13.__m = var4; + var13.field748 += var13.field753 * var5; + var13.field749 = var6; + var13.field750 = var7; + var13.field744 = var4; return var5; } @@ -1477,38 +1479,38 @@ public class RawPcmStream extends PcmStream { signature = "(II[B[IIIIIIIILds;II)I" ) static int method2538(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - var11.__g -= var11.__a * var5; - var11.__l -= var11.__z * var5; - if(var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { + var11.field749 -= var11.field754 * var5; + var11.field750 -= var11.field755 * var5; + if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { var8 = var9; } - int var10001; - while(var5 < var8) { + int var14; + while (var5 < var8) { var1 = var4 >> 8; - byte var14 = var2[var1 - 1]; - var10001 = var5++; - var3[var10001] += ((var14 << 8) + (var2[var1] - var14) * (var4 & 255)) * var6 >> 6; + byte var15 = var2[var1 - 1]; + var14 = var5++; + var3[var14] += ((var15 << 8) + (var2[var1] - var15) * (var4 & 255)) * var6 >> 6; var6 += var7; var4 += var12; } - if(var12 == 0 || (var8 = var5 + (var10 - var4 + var12) / var12) > var9) { + if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12) / var12) > var9) { var8 = var9; } var0 = var13; - for(var1 = var12; var5 < var8; var4 += var1) { - var10001 = var5++; - var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; + for (var1 = var12; var5 < var8; var4 += var1) { + var14 = var5++; + var3[var14] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; var6 += var7; } - var11.__g += var11.__a * var5; - var11.__l += var11.__z * var5; - var11.__u = var6; - var11.__m = var4; + var11.field749 += var11.field754 * var5; + var11.field750 += var11.field755 * var5; + var11.field748 = var6; + var11.field744 = var4; return var5; } @@ -1517,47 +1519,47 @@ public class RawPcmStream extends PcmStream { signature = "(II[B[IIIIIIIIIILds;II)I" ) static int method2624(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { - var13.__u -= var5 * var13.__i; - if(var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { + var13.field748 -= var5 * var13.field753; + if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { var10 = var11; } var5 <<= 1; - int var10001; - for(var10 <<= 1; var5 < var10; var4 += var14) { + int var16; + for (var10 <<= 1; var5 < var10; var4 += var14) { var1 = var4 >> 8; - byte var16 = var2[var1 - 1]; - var0 = (var2[var1] - var16) * (var4 & 255) + (var16 << 8); - var10001 = var5++; - var3[var10001] += var0 * var6 >> 6; + byte var17 = var2[var1 - 1]; + var0 = (var2[var1] - var17) * (var4 & 255) + (var17 << 8); + var16 = var5++; + var3[var16] += var0 * var6 >> 6; var6 += var8; - var10001 = var5++; - var3[var10001] += var0 * var7 >> 6; + var16 = var5++; + var3[var16] += var0 * var7 >> 6; var7 += var9; } - if(var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14) / var14) > var11) { + if (var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14) / var14) > var11) { var10 = var11; } var10 <<= 1; - for(var1 = var15; var5 < var10; var4 += var14) { + for (var1 = var15; var5 < var10; var4 += var14) { var0 = (var1 << 8) + (var4 & 255) * (var2[var4 >> 8] - var1); - var10001 = var5++; - var3[var10001] += var0 * var6 >> 6; + var16 = var5++; + var3[var16] += var0 * var6 >> 6; var6 += var8; - var10001 = var5++; - var3[var10001] += var0 * var7 >> 6; + var16 = var5++; + var3[var16] += var0 * var7 >> 6; var7 += var9; } var5 >>= 1; - var13.__u += var13.__i * var5; - var13.__g = var6; - var13.__l = var7; - var13.__m = var4; + var13.field748 += var13.field753 * var5; + var13.field749 = var6; + var13.field750 = var7; + var13.field744 = var4; return var5; } } diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java index e746b0a448..c1b0778740 100644 --- a/runescape-client/src/main/java/RawSound.java +++ b/runescape-client/src/main/java/RawSound.java @@ -19,7 +19,7 @@ public class RawSound extends AbstractSound { @Export("end") int end; @ObfuscatedName("o") - public boolean __o; + public boolean field756; RawSound(int var1, byte[] var2, int var3, int var4) { this.sampleRate = var1; @@ -33,7 +33,7 @@ public class RawSound extends AbstractSound { this.samples = var2; this.start = var3; this.end = var4; - this.__o = var5; + this.field756 = var5; } @ObfuscatedName("m") @@ -44,12 +44,12 @@ public class RawSound extends AbstractSound { public RawSound resample(Decimator var1) { this.samples = var1.resample(this.samples); this.sampleRate = var1.scaleRate(this.sampleRate); - if(this.start == this.end) { + if (this.start == this.end) { this.start = this.end = var1.scalePosition(this.start); } else { this.start = var1.scalePosition(this.start); this.end = var1.scalePosition(this.end); - if(this.start == this.end) { + if (this.start == this.end) { --this.start; } } diff --git a/runescape-client/src/main/java/RectangleMode.java b/runescape-client/src/main/java/RectangleMode.java index 006557d5f8..53928a6045 100644 --- a/runescape-client/src/main/java/RectangleMode.java +++ b/runescape-client/src/main/java/RectangleMode.java @@ -11,17 +11,18 @@ public enum RectangleMode implements Enumerated { @ObfuscatedSignature( signature = "Llj;" ) - __lj_m(0, 0), + field757(0, 0), @ObfuscatedName("f") @ObfuscatedSignature( signature = "Llj;" ) - __lj_f(1, 1), + field758(1, 1), @ObfuscatedName("q") @ObfuscatedSignature( signature = "Llj;" ) - __lj_q(2, 2); + field759(2, 2); + @ObfuscatedName("d") @Export("musicTrackBoolean") public static boolean musicTrackBoolean; @@ -38,7 +39,7 @@ public enum RectangleMode implements Enumerated { @Export("id2") final int id2; - RectangleMode(int var3, int var4) { + private RectangleMode(int var3, int var4) { this.id = var3; this.id2 = var4; } @@ -60,7 +61,7 @@ public enum RectangleMode implements Enumerated { ) public static void method6028(AbstractIndexCache var0, AbstractIndexCache var1, boolean var2) { ObjectDefinition.ObjectDefinition_indexCache = var0; - ObjectDefinition.__jr_q = var1; + ObjectDefinition.field640 = var1; ObjectDefinition.ObjectDefinition_isLowDetail = var2; } } diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index 47bf872c16..23ce144181 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -4,8 +4,7 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("fe") -public abstract class RouteStrategy -{ +public abstract class RouteStrategy { @ObfuscatedName("l") @ObfuscatedGetter( intValue = -1237576843 @@ -13,7 +12,7 @@ public abstract class RouteStrategy @Export("Interpreter_intStackSize") static int Interpreter_intStackSize; @ObfuscatedName("e") - static byte[][][] __fe_e; + static byte[][][] field760; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 123677543 @@ -53,15 +52,15 @@ public abstract class RouteStrategy ) public static int method3642(int var0, int var1) { int var2; - for(var2 = 1; var1 > 1; var1 >>= 1) { - if((var1 & 1) != 0) { + for (var2 = 1; var1 > 1; var1 >>= 1) { + if ((var1 & 1) != 0) { var2 = var0 * var2; } var0 *= var0; } - if(var1 == 1) { + if (var1 == 1) { return var0 * var2; } else { return var2; @@ -76,7 +75,7 @@ public abstract class RouteStrategy @Export("loadSpriteFlat") static boolean loadSpriteFlat(AbstractIndexCache var0, int var1) { byte[] var2 = var0.takeRecordFlat(var1); - if(var2 == null) { + if (var2 == null) { return false; } else { DevicePcmPlayerProvider.decodeSprite(var2); diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index 75df0eac82..64669fbe91 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -24,7 +24,7 @@ public class RunException extends RuntimeException { @ObfuscatedGetter( intValue = 121013503 ) - public static int __fx_w; + public static int field761; @ObfuscatedName("o") @Export("string") String string; @@ -54,13 +54,12 @@ public class RunException extends RuntimeException { public static void method3431() { Object var0 = IndexStoreActionHandler.IndexStoreActionHandler_lock; synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) { - if(IndexStoreActionHandler.__iv_q != 0) { - IndexStoreActionHandler.__iv_q = 1; + if (IndexStoreActionHandler.field412 != 0) { + IndexStoreActionHandler.field412 = 1; try { IndexStoreActionHandler.IndexStoreActionHandler_lock.wait(); - } catch (InterruptedException var3) { - ; + } catch (InterruptedException var4) { } } diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index 85a75d1337..3fee0d60ae 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -112,19 +112,19 @@ public class Scene { @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; @ObfuscatedName("au") - static final int[] __em_au; + static final int[] field762; @ObfuscatedName("ao") - static final int[] __em_ao; + static final int[] field763; @ObfuscatedName("aa") - static final int[] __em_aa; + static final int[] field764; @ObfuscatedName("ax") - static final int[] __em_ax; + static final int[] field765; @ObfuscatedName("af") - static final int[] __em_af; + static final int[] field766; @ObfuscatedName("ai") - static final int[] __em_ai; + static final int[] field767; @ObfuscatedName("ba") - static final int[] __em_ba; + static final int[] field768; @ObfuscatedName("bc") @Export("visibilityMap") static boolean[][][][] visibilityMap; @@ -180,51 +180,23 @@ public class Scene { @Export("tempGameObjects") GameObject[] tempGameObjects; @ObfuscatedName("x") - int[][][] __x; + int[][][] field769; @ObfuscatedName("bk") - int[][] __bk; + int[][] field770; @ObfuscatedName("bd") - int[][] __bd; - - static { - Scene_isLowDetail = true; - tileUpdateCount = 0; - Scene_plane = 0; - Scene_gameObjects = new GameObject[100]; - checkClick = false; - Scene_selectedPlane = 0; - Scene_selectedScreenX = 0; - Scene_selectedScreenY = 0; - Scene_selectedX = -1; - Scene_selectedY = -1; - viewportWalking = false; - Scene_planesCount = 4; - Scene_planeOccluderCounts = new int[Scene_planesCount]; - Scene_planeOccluders = new Occluder[Scene_planesCount][500]; - Scene_currentOccludersCount = 0; - Scene_currentOccluders = new Occluder[500]; - Scene_tilesDeque = new NodeDeque(); - __em_au = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; - __em_ao = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; - __em_aa = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; - __em_ax = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; - __em_af = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; - __em_ai = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; - __em_ba = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; - visibilityMap = new boolean[8][32][51][51]; - } + int[][] field771; public Scene(int var1, int var2, int var3, int[][][] var4) { this.Scene_minPlane = 0; this.tempGameObjectsCount = 0; this.tempGameObjects = new GameObject[5000]; - this.__bk = new int[][]{{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1}, {0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1}, {1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1}, {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1}}; - this.__bd = new int[][]{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, {12, 8, 4, 0, 13, 9, 5, 1, 14, 10, 6, 2, 15, 11, 7, 3}, {15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}, {3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12}}; + this.field770 = new int[][]{{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1}, {0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1}, {1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1}, {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1}}; + this.field771 = new int[][]{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, {12, 8, 4, 0, 13, 9, 5, 1, 14, 10, 6, 2, 15, 11, 7, 3}, {15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}, {3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12}}; this.planes = var1; this.xSize = var2; this.ySize = var3; this.tiles = new Tile[var1][var2][var3]; - this.__x = new int[var1][var2 + 1][var3 + 1]; + this.field769 = new int[var1][var2 + 1][var3 + 1]; this.tileHeights = var4; this.clear(); } @@ -234,29 +206,29 @@ public class Scene { public void clear() { int var1; int var2; - for(var1 = 0; var1 < this.planes; ++var1) { - for(var2 = 0; var2 < this.xSize; ++var2) { - for(int var3 = 0; var3 < this.ySize; ++var3) { + for (var1 = 0; var1 < this.planes; ++var1) { + for (var2 = 0; var2 < this.xSize; ++var2) { + for (int var3 = 0; var3 < this.ySize; ++var3) { this.tiles[var1][var2][var3] = null; } } } - for(var1 = 0; var1 < Scene_planesCount; ++var1) { - for(var2 = 0; var2 < Scene_planeOccluderCounts[var1]; ++var2) { + for (var1 = 0; var1 < Scene_planesCount; ++var1) { + for (var2 = 0; var2 < Scene_planeOccluderCounts[var1]; ++var2) { Scene_planeOccluders[var1][var2] = null; } Scene_planeOccluderCounts[var1] = 0; } - for(var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { + for (var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { this.tempGameObjects[var1] = null; } this.tempGameObjectsCount = 0; - for(var1 = 0; var1 < Scene_gameObjects.length; ++var1) { + for (var1 = 0; var1 < Scene_gameObjects.length; ++var1) { Scene_gameObjects[var1] = null; } @@ -267,9 +239,9 @@ public class Scene { public void init(int var1) { this.Scene_minPlane = var1; - for(int var2 = 0; var2 < this.xSize; ++var2) { - for(int var3 = 0; var3 < this.ySize; ++var3) { - if(this.tiles[var1][var2][var3] == null) { + for (int var2 = 0; var2 < this.xSize; ++var2) { + for (int var3 = 0; var3 < this.ySize; ++var3) { + if (this.tiles[var1][var2][var3] == null) { this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); } } @@ -282,24 +254,24 @@ public class Scene { public void setLinkBelow(int var1, int var2) { Tile var3 = this.tiles[0][var1][var2]; - for(int var4 = 0; var4 < 3; ++var4) { + for (int var4 = 0; var4 < 3; ++var4) { Tile var5 = this.tiles[var4][var1][var2] = this.tiles[var4 + 1][var1][var2]; - if(var5 != null) { + if (var5 != null) { --var5.plane; - for(int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { + for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { GameObject var7 = var5.gameObjects[var6]; - long var9 = var7.tag; - int var11 = (int)(var9 >>> 14 & 3L); - boolean var8 = var11 == 2; - if(var8 && var7.startX == var1 && var2 == var7.startY) { + long var8 = var7.tag; + int var10 = (int)(var8 >>> 14 & 3L); + boolean var11 = var10 == 2; + if (var11 && var7.startX == var1 && var2 == var7.startY) { --var7.plane; } } } } - if(this.tiles[0][var1][var2] == null) { + if (this.tiles[0][var1][var2] == null) { this.tiles[0][var1][var2] = new Tile(0, var1, var2); } @@ -311,9 +283,10 @@ public class Scene { @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; - if(var5 != null) { + if (var5 != null) { this.tiles[var1][var2][var3].minPlane = var4; } + } @ObfuscatedName("u") @@ -321,21 +294,21 @@ public class Scene { public void addTile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20) { TilePaint var21; int var22; - if(var4 == 0) { + if (var4 == 0) { var21 = new TilePaint(var11, var12, var13, var14, -1, var19, false); - for(var22 = var1; var22 >= 0; --var22) { - if(this.tiles[var22][var2][var3] == null) { + for (var22 = var1; var22 >= 0; --var22) { + if (this.tiles[var22][var2][var3] == null) { this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); } } this.tiles[var1][var2][var3].paint = var21; - } else if(var4 != 1) { + } else if (var4 != 1) { TileModel var23 = new TileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); - for(var22 = var1; var22 >= 0; --var22) { - if(this.tiles[var22][var2][var3] == null) { + for (var22 = var1; var22 >= 0; --var22) { + if (this.tiles[var22][var2][var3] == null) { this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); } } @@ -344,14 +317,15 @@ public class Scene { } else { var21 = new TilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); - for(var22 = var1; var22 >= 0; --var22) { - if(this.tiles[var22][var2][var3] == null) { + for (var22 = var1; var22 >= 0; --var22) { + if (this.tiles[var22][var2][var3] == null) { this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); } } this.tiles[var1][var2][var3].paint = var21; } + } @ObfuscatedName("g") @@ -360,7 +334,7 @@ public class Scene { ) @Export("newFloorDecoration") public void newFloorDecoration(int var1, int var2, int var3, int var4, Entity var5, long var6, int var8) { - if(var5 != null) { + if (var5 != null) { FloorDecoration var9 = new FloorDecoration(); var9.entity = var5; var9.x = var2 * 128 + 64; @@ -368,12 +342,13 @@ public class Scene { var9.tileHeight = var4; var9.tag = var6; var9.flags = var8; - if(this.tiles[var1][var2][var3] == null) { + if (this.tiles[var1][var2][var3] == null) { this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); } this.tiles[var1][var2][var3].floorDecoration = var9; } + } @ObfuscatedName("l") @@ -392,12 +367,12 @@ public class Scene { var10.third = var9; int var11 = 0; Tile var12 = this.tiles[var1][var2][var3]; - if(var12 != null) { - for(int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { - if((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].entity instanceof Model) { + if (var12 != null) { + for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { + if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].entity instanceof Model) { Model var14 = (Model)var12.gameObjects[var13].entity; var14.calculateBoundsCylinder(); - if(var14.height > var11) { + if (var14.height > var11) { var11 = var14.height; } } @@ -405,7 +380,7 @@ public class Scene { } var10.height = var11; - if(this.tiles[var1][var2][var3] == null) { + if (this.tiles[var1][var2][var3] == null) { this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); } @@ -418,7 +393,7 @@ public class Scene { ) @Export("newBoundaryObject") public void newBoundaryObject(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, long var9, int var11) { - if(var5 != null || var6 != null) { + if (var5 != null || var6 != null) { BoundaryObject var12 = new BoundaryObject(); var12.tag = var9; var12.flags = var11; @@ -430,14 +405,15 @@ public class Scene { var12.orientationA = var7; var12.orientationB = var8; - for(int var13 = var1; var13 >= 0; --var13) { - if(this.tiles[var13][var2][var3] == null) { + for (int var13 = var1; var13 >= 0; --var13) { + if (this.tiles[var13][var2][var3] == null) { this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); } } this.tiles[var1][var2][var3].boundaryObject = var12; } + } @ObfuscatedName("x") @@ -446,7 +422,7 @@ public class Scene { ) @Export("newWallDecoration") public void newWallDecoration(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, int var9, int var10, long var11, int var13) { - if(var5 != null) { + if (var5 != null) { WallDecoration var14 = new WallDecoration(); var14.tag = var11; var14.flags = var13; @@ -460,22 +436,23 @@ public class Scene { var14.xOffset = var9; var14.yOffset = var10; - for(int var15 = var1; var15 >= 0; --var15) { - if(this.tiles[var15][var2][var3] == null) { + for (int var15 = var1; var15 >= 0; --var15) { + if (this.tiles[var15][var2][var3] == null) { this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); } } this.tiles[var1][var2][var3].wallDecoration = var14; } + } @ObfuscatedName("d") @ObfuscatedSignature( signature = "(IIIIIILex;IJI)Z" ) - public boolean __d_238(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) { - if(var7 == null) { + public boolean method284(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) { + if (var7 == null) { return true; } else { int var12 = var5 * 64 + var2 * 128; @@ -488,28 +465,28 @@ public class Scene { @ObfuscatedSignature( signature = "(IIIIILex;IJZ)Z" ) - public boolean __a_239(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, boolean var10) { - if(var6 == null) { + public boolean method285(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, boolean var10) { + if (var6 == null) { return true; } else { int var11 = var2 - var5; int var12 = var3 - var5; int var13 = var5 + var2; int var14 = var3 + var5; - if(var10) { - if(var7 > 640 && var7 < 1408) { + if (var10) { + if (var7 > 640 && var7 < 1408) { var14 += 128; } - if(var7 > 1152 && var7 < 1920) { + if (var7 > 1152 && var7 < 1920) { var13 += 128; } - if(var7 > 1664 || var7 < 384) { + if (var7 > 1664 || var7 < 384) { var12 -= 128; } - if(var7 > 128 && var7 < 896) { + if (var7 > 128 && var7 < 896) { var11 -= 128; } } @@ -526,8 +503,8 @@ public class Scene { @ObfuscatedSignature( signature = "(IIIIILex;IJIIII)Z" ) - public boolean __z_240(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, int var10, int var11, int var12, int var13) { - return var6 == null?true:this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); + public boolean method286(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, int var10, int var11, int var12, int var13) { + return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); } @ObfuscatedName("j") @@ -536,69 +513,69 @@ public class Scene { ) @Export("newGameObject") boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Entity var9, int var10, boolean var11, long var12, int var14) { - int var16; - for(int var15 = var2; var15 < var2 + var4; ++var15) { - for(var16 = var3; var16 < var3 + var5; ++var16) { - if(var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { + int var15; + for (int var16 = var2; var16 < var2 + var4; ++var16) { + for (var15 = var3; var15 < var3 + var5; ++var15) { + if (var16 < 0 || var15 < 0 || var16 >= this.xSize || var15 >= this.ySize) { return false; } - Tile var17 = this.tiles[var1][var15][var16]; - if(var17 != null && var17.gameObjectsCount >= 5) { + Tile var17 = this.tiles[var1][var16][var15]; + if (var17 != null && var17.gameObjectsCount >= 5) { return false; } } } - GameObject var21 = new GameObject(); - var21.tag = var12; - var21.flags = var14; - var21.plane = var1; - var21.centerX = var6; - var21.centerY = var7; - var21.height = var8; - var21.entity = var9; - var21.orientation = var10; - var21.startX = var2; - var21.startY = var3; - var21.endX = var2 + var4 - 1; - var21.endY = var3 + var5 - 1; + GameObject var20 = new GameObject(); + var20.tag = var12; + var20.flags = var14; + var20.plane = var1; + var20.centerX = var6; + var20.centerY = var7; + var20.height = var8; + var20.entity = var9; + var20.orientation = var10; + var20.startX = var2; + var20.startY = var3; + var20.endX = var2 + var4 - 1; + var20.endY = var3 + var5 - 1; - for(var16 = var2; var16 < var2 + var4; ++var16) { - for(int var22 = var3; var22 < var3 + var5; ++var22) { + for (var15 = var2; var15 < var2 + var4; ++var15) { + for (int var21 = var3; var21 < var3 + var5; ++var21) { int var18 = 0; - if(var16 > var2) { + if (var15 > var2) { ++var18; } - if(var16 < var2 + var4 - 1) { + if (var15 < var2 + var4 - 1) { var18 += 4; } - if(var22 > var3) { + if (var21 > var3) { var18 += 8; } - if(var22 < var3 + var5 - 1) { + if (var21 < var3 + var5 - 1) { var18 += 2; } - for(int var19 = var1; var19 >= 0; --var19) { - if(this.tiles[var19][var16][var22] == null) { - this.tiles[var19][var16][var22] = new Tile(var19, var16, var22); + for (int var19 = var1; var19 >= 0; --var19) { + if (this.tiles[var19][var15][var21] == null) { + this.tiles[var19][var15][var21] = new Tile(var19, var15, var21); } } - Tile var23 = this.tiles[var1][var16][var22]; - var23.gameObjects[var23.gameObjectsCount] = var21; - var23.gameObjectEdgeMasks[var23.gameObjectsCount] = var18; - var23.gameObjectsEdgeMask |= var18; - ++var23.gameObjectsCount; + Tile var22 = this.tiles[var1][var15][var21]; + var22.gameObjects[var22.gameObjectsCount] = var20; + var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; + var22.gameObjectsEdgeMask |= var18; + ++var22.gameObjectsCount; } } - if(var11) { - this.tempGameObjects[this.tempGameObjectsCount++] = var21; + if (var11) { + this.tempGameObjects[this.tempGameObjectsCount++] = var20; } return true; @@ -607,7 +584,7 @@ public class Scene { @ObfuscatedName("s") @Export("clearTempGameObjects") public void clearTempGameObjects() { - for(int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { + for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { GameObject var2 = this.tempGameObjects[var1]; this.removeGameObject(var2); this.tempGameObjects[var1] = null; @@ -622,16 +599,16 @@ public class Scene { ) @Export("removeGameObject") void removeGameObject(GameObject var1) { - for(int var2 = var1.startX; var2 <= var1.endX; ++var2) { - for(int var3 = var1.startY; var3 <= var1.endY; ++var3) { + for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { + for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { Tile var4 = this.tiles[var1.plane][var2][var3]; - if(var4 != null) { + if (var4 != null) { int var5; - for(var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - if(var4.gameObjects[var5] == var1) { + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { + if (var4.gameObjects[var5] == var1) { --var4.gameObjectsCount; - for(int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { + for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; } @@ -643,7 +620,7 @@ public class Scene { var4.gameObjectsEdgeMask = 0; - for(var5 = 0; var5 < var4.gameObjectsCount; ++var5) { + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; } } @@ -653,69 +630,74 @@ public class Scene { } @ObfuscatedName("y") - public void __y_241(int var1, int var2, int var3, int var4) { + public void method287(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; - if(var5 != null) { + if (var5 != null) { WallDecoration var6 = var5.wallDecoration; - if(var6 != null) { + if (var6 != null) { var6.xOffset = var4 * var6.xOffset / 16; var6.yOffset = var4 * var6.yOffset / 16; } } + } @ObfuscatedName("h") @Export("removeBoundaryObject") public void removeBoundaryObject(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; - if(var4 != null) { + if (var4 != null) { var4.boundaryObject = null; } + } @ObfuscatedName("b") @Export("removeWallDecoration") public void removeWallDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; - if(var4 != null) { + if (var4 != null) { var4.wallDecoration = null; } + } @ObfuscatedName("c") - public void __c_242(int var1, int var2, int var3) { + public void method288(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; - if(var4 != null) { - for(int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { + if (var4 != null) { + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; - long var8 = var6.tag; - int var10 = (int)(var8 >>> 14 & 3L); - boolean var7 = var10 == 2; - if(var7 && var2 == var6.startX && var3 == var6.startY) { + long var7 = var6.tag; + int var9 = (int)(var7 >>> 14 & 3L); + boolean var10 = var9 == 2; + if (var10 && var2 == var6.startX && var3 == var6.startY) { this.removeGameObject(var6); return; } } - } + } @ObfuscatedName("p") @Export("removeFloorDecoration") public void removeFloorDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; - if(var4 != null) { + if (var4 != null) { var4.floorDecoration = null; } + } @ObfuscatedName("v") @Export("removeGroundItemPile") public void removeGroundItemPile(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; - if(var4 != null) { + if (var4 != null) { var4.groundItemPile = null; } + } @ObfuscatedName("ag") @@ -725,7 +707,7 @@ public class Scene { @Export("getBoundaryObject") public BoundaryObject getBoundaryObject(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; - return var4 == null?null:var4.boundaryObject; + return var4 == null ? null : var4.boundaryObject; } @ObfuscatedName("aq") @@ -735,24 +717,24 @@ public class Scene { @Export("getWallDecoration") public WallDecoration getWallDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; - return var4 == null?null:var4.wallDecoration; + return var4 == null ? null : var4.wallDecoration; } @ObfuscatedName("aj") @ObfuscatedSignature( signature = "(III)Leh;" ) - public GameObject __aj_243(int var1, int var2, int var3) { + public GameObject method289(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; - if(var4 == null) { + if (var4 == null) { return null; } else { - for(int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; - long var8 = var6.tag; - int var10 = (int)(var8 >>> 14 & 3L); - boolean var7 = var10 == 2; - if(var7 && var2 == var6.startX && var3 == var6.startY) { + long var7 = var6.tag; + int var9 = (int)(var7 >>> 14 & 3L); + boolean var10 = var9 == 2; + if (var10 && var2 == var6.startX && var3 == var6.startY) { return var6; } } @@ -768,33 +750,33 @@ public class Scene { @Export("getFloorDecoration") public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; - return var4 != null && var4.floorDecoration != null?var4.floorDecoration:null; + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; } @ObfuscatedName("ar") - public long __ar_244(int var1, int var2, int var3) { + public long method290(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; - return var4 != null && var4.boundaryObject != null?var4.boundaryObject.tag:0L; + return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; } @ObfuscatedName("ac") - public long __ac_245(int var1, int var2, int var3) { + public long method291(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; - return var4 != null && var4.wallDecoration != null?var4.wallDecoration.tag:0L; + return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; } @ObfuscatedName("ay") - public long __ay_246(int var1, int var2, int var3) { + public long method292(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; - if(var4 == null) { + if (var4 == null) { return 0L; } else { - for(int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; - long var8 = var6.tag; - int var10 = (int)(var8 >>> 14 & 3L); - boolean var7 = var10 == 2; - if(var7 && var2 == var6.startX && var3 == var6.startY) { + long var7 = var6.tag; + int var9 = (int)(var7 >>> 14 & 3L); + boolean var10 = var9 == 2; + if (var10 && var2 == var6.startX && var3 == var6.startY) { return var6.tag; } } @@ -807,24 +789,24 @@ public class Scene { @Export("getFloorDecorationTag") public long getFloorDecorationTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; - return var4 != null && var4.floorDecoration != null?var4.floorDecoration.tag:0L; + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; } @ObfuscatedName("ak") @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { Tile var6 = this.tiles[var1][var2][var3]; - if(var6 == null) { + if (var6 == null) { return -1; - } else if(var6.boundaryObject != null && var6.boundaryObject.tag == var4) { + } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { return var6.boundaryObject.flags & 255; - } else if(var6.wallDecoration != null && var6.wallDecoration.tag == var4) { + } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { return var6.wallDecoration.flags & 255; - } else if(var6.floorDecoration != null && var6.floorDecoration.tag == var4) { + } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { return var6.floorDecoration.flags & 255; } else { - for(int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { - if(var6.gameObjects[var7].tag == var4) { + for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { + if (var6.gameObjects[var7].tag == var4) { return var6.gameObjects[var7].flags & 255; } } @@ -834,41 +816,41 @@ public class Scene { } @ObfuscatedName("aw") - public void __aw_247(int var1, int var2, int var3) { - for(int var4 = 0; var4 < this.planes; ++var4) { - for(int var5 = 0; var5 < this.xSize; ++var5) { - for(int var6 = 0; var6 < this.ySize; ++var6) { + public void method293(int var1, int var2, int var3) { + for (int var4 = 0; var4 < this.planes; ++var4) { + for (int var5 = 0; var5 < this.xSize; ++var5) { + for (int var6 = 0; var6 < this.ySize; ++var6) { Tile var7 = this.tiles[var4][var5][var6]; - if(var7 != null) { + if (var7 != null) { BoundaryObject var8 = var7.boundaryObject; - ModelData var10; - if(var8 != null && var8.entity1 instanceof ModelData) { - ModelData var9 = (ModelData)var8.entity1; - this.__ab_249(var9, var4, var5, var6, 1, 1); - if(var8.entity2 instanceof ModelData) { - var10 = (ModelData)var8.entity2; - this.__ab_249(var10, var4, var5, var6, 1, 1); - ModelData.method2800(var9, var10, 0, 0, 0, false); - var8.entity2 = var10.toModel(var10.__aq, var10.__aj, var1, var2, var3); + ModelData var9; + if (var8 != null && var8.entity1 instanceof ModelData) { + ModelData var10 = (ModelData)var8.entity1; + this.method295(var10, var4, var5, var6, 1, 1); + if (var8.entity2 instanceof ModelData) { + var9 = (ModelData)var8.entity2; + this.method295(var9, var4, var5, var6, 1, 1); + ModelData.method2800(var10, var9, 0, 0, 0, false); + var8.entity2 = var9.toModel(var9.field559, var9.field560, var1, var2, var3); } - var8.entity1 = var9.toModel(var9.__aq, var9.__aj, var1, var2, var3); + var8.entity1 = var10.toModel(var10.field559, var10.field560, var1, var2, var3); } - for(int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { - GameObject var14 = var7.gameObjects[var12]; - if(var14 != null && var14.entity instanceof ModelData) { - ModelData var11 = (ModelData)var14.entity; - this.__ab_249(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); - var14.entity = var11.toModel(var11.__aq, var11.__aj, var1, var2, var3); + for (int var13 = 0; var13 < var7.gameObjectsCount; ++var13) { + GameObject var11 = var7.gameObjects[var13]; + if (var11 != null && var11.entity instanceof ModelData) { + ModelData var12 = (ModelData)var11.entity; + this.method295(var12, var4, var5, var6, var11.endX - var11.startX + 1, var11.endY - var11.startY + 1); + var11.entity = var12.toModel(var12.field559, var12.field560, var1, var2, var3); } } - FloorDecoration var13 = var7.floorDecoration; - if(var13 != null && var13.entity instanceof ModelData) { - var10 = (ModelData)var13.entity; - this.__al_248(var10, var4, var5, var6); - var13.entity = var10.toModel(var10.__aq, var10.__aj, var1, var2, var3); + FloorDecoration var14 = var7.floorDecoration; + if (var14 != null && var14.entity instanceof ModelData) { + var9 = (ModelData)var14.entity; + this.method294(var9, var4, var5, var6); + var14.entity = var9.toModel(var9.field559, var9.field560, var1, var2, var3); } } } @@ -881,36 +863,36 @@ public class Scene { @ObfuscatedSignature( signature = "(Ldw;III)V" ) - void __al_248(ModelData var1, int var2, int var3, int var4) { + void method294(ModelData var1, int var2, int var3, int var4) { Tile var5; ModelData var6; - if(var3 < this.xSize) { + if (var3 < this.xSize) { var5 = this.tiles[var2][var3 + 1][var4]; - if(var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { var6 = (ModelData)var5.floorDecoration.entity; ModelData.method2800(var1, var6, 128, 0, 0, true); } } - if(var4 < this.xSize) { + if (var4 < this.xSize) { var5 = this.tiles[var2][var3][var4 + 1]; - if(var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { var6 = (ModelData)var5.floorDecoration.entity; ModelData.method2800(var1, var6, 0, 0, 128, true); } } - if(var3 < this.xSize && var4 < this.ySize) { + if (var3 < this.xSize && var4 < this.ySize) { var5 = this.tiles[var2][var3 + 1][var4 + 1]; - if(var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { var6 = (ModelData)var5.floorDecoration.entity; ModelData.method2800(var1, var6, 128, 0, 128, true); } } - if(var3 < this.xSize && var4 > 0) { + if (var3 < this.xSize && var4 > 0) { var5 = this.tiles[var2][var3 + 1][var4 - 1]; - if(var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { var6 = (ModelData)var5.floorDecoration.entity; ModelData.method2800(var1, var6, 128, 0, -128, true); } @@ -922,39 +904,39 @@ public class Scene { @ObfuscatedSignature( signature = "(Ldw;IIIII)V" ) - void __ab_249(ModelData var1, int var2, int var3, int var4, int var5, int var6) { + void method295(ModelData var1, int var2, int var3, int var4, int var5, int var6) { boolean var7 = true; int var8 = var3; int var9 = var3 + var5; int var10 = var4 - 1; int var11 = var4 + var6; - for(int var12 = var2; var12 <= var2 + 1; ++var12) { - if(var12 != this.planes) { - for(int var13 = var8; var13 <= var9; ++var13) { - if(var13 >= 0 && var13 < this.xSize) { - for(int var14 = var10; var14 <= var11; ++var14) { - if(var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { + for (int var12 = var2; var12 <= var2 + 1; ++var12) { + if (var12 != this.planes) { + for (int var13 = var8; var13 <= var9; ++var13) { + if (var13 >= 0 && var13 < this.xSize) { + for (int var14 = var10; var14 <= var11; ++var14) { + if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { Tile var15 = this.tiles[var12][var13][var14]; - if(var15 != null) { + if (var15 != null) { int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; BoundaryObject var17 = var15.boundaryObject; - if(var17 != null) { + if (var17 != null) { ModelData var18; - if(var17.entity1 instanceof ModelData) { + if (var17.entity1 instanceof ModelData) { var18 = (ModelData)var17.entity1; ModelData.method2800(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); } - if(var17.entity2 instanceof ModelData) { + if (var17.entity2 instanceof ModelData) { var18 = (ModelData)var17.entity2; ModelData.method2800(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); } } - for(int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { + for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { GameObject var19 = var15.gameObjects[var23]; - if(var19 != null && var19.entity instanceof ModelData) { + if (var19 != null && var19.entity instanceof ModelData) { ModelData var20 = (ModelData)var19.entity; int var21 = var19.endX - var19.startX + 1; int var22 = var19.endY - var19.startY + 1; @@ -978,71 +960,70 @@ public class Scene { @Export("drawTileMinimap") public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) { Tile var7 = this.tiles[var4][var5][var6]; - if(var7 != null) { + if (var7 != null) { TilePaint var8 = var7.paint; - int var10; - if(var8 != null) { - int var9 = var8.rgb; - if(var9 != 0) { - for(var10 = 0; var10 < 4; ++var10) { - var1[var2] = var9; - var1[var2 + 1] = var9; - var1[var2 + 2] = var9; - var1[var2 + 3] = var9; + int var9; + if (var8 != null) { + int var10 = var8.rgb; + if (var10 != 0) { + for (var9 = 0; var9 < 4; ++var9) { + var1[var2] = var10; + var1[var2 + 1] = var10; + var1[var2 + 2] = var10; + var1[var2 + 3] = var10; var2 += var3; } - } } else { TileModel var18 = var7.model; - if(var18 != null) { - var10 = var18.shape; + if (var18 != null) { + var9 = var18.shape; int var11 = var18.rotation; int var12 = var18.underlayRgb; int var13 = var18.overlayRgb; - int[] var14 = this.__bk[var10]; - int[] var15 = this.__bd[var11]; + int[] var14 = this.field770[var9]; + int[] var15 = this.field771[var11]; int var16 = 0; int var17; - if(var12 != 0) { - for(var17 = 0; var17 < 4; ++var17) { - var1[var2] = var14[var15[var16++]] == 0?var12:var13; - var1[var2 + 1] = var14[var15[var16++]] == 0?var12:var13; - var1[var2 + 2] = var14[var15[var16++]] == 0?var12:var13; - var1[var2 + 3] = var14[var15[var16++]] == 0?var12:var13; + if (var12 != 0) { + for (var17 = 0; var17 < 4; ++var17) { + var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; + var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; + var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; + var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; var2 += var3; } } else { - for(var17 = 0; var17 < 4; ++var17) { - if(var14[var15[var16++]] != 0) { + for (var17 = 0; var17 < 4; ++var17) { + if (var14[var15[var16++]] != 0) { var1[var2] = var13; } - if(var14[var15[var16++]] != 0) { + if (var14[var15[var16++]] != 0) { var1[var2 + 1] = var13; } - if(var14[var15[var16++]] != 0) { + if (var14[var15[var16++]] != 0) { var1[var2 + 2] = var13; } - if(var14[var15[var16++]] != 0) { + if (var14[var15[var16++]] != 0) { var1[var2 + 3] = var13; } var2 += var3; } } - } } } + } @ObfuscatedName("ap") @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { - if(!method3187() || var4) { + if (!method3187() || var4) { checkClick = true; viewportWalking = var4; Scene_selectedPlane = var1; @@ -1051,31 +1032,32 @@ public class Scene { Scene_selectedX = -1; Scene_selectedY = -1; } + } @ObfuscatedName("as") - public void __as_250() { + public void method296() { viewportWalking = true; } @ObfuscatedName("az") @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { - if(var1 < 0) { + if (var1 < 0) { var1 = 0; - } else if(var1 >= this.xSize * 128) { + } else if (var1 >= this.xSize * 128) { var1 = this.xSize * 128 - 1; } - if(var3 < 0) { + if (var3 < 0) { var3 = 0; - } else if(var3 >= this.ySize * 128) { + } else if (var3 >= this.ySize * 128) { var3 = this.ySize * 128 - 1; } - if(var4 < 128) { + if (var4 < 128) { var4 = 128; - } else if(var4 > 383) { + } else if (var4 > 383) { var4 = 383; } @@ -1092,22 +1074,22 @@ public class Scene { Scene_cameraYTile = var3 / 128; Scene_plane = var6; Scene_cameraXTileMin = Scene_cameraXTile - 25; - if(Scene_cameraXTileMin < 0) { + if (Scene_cameraXTileMin < 0) { Scene_cameraXTileMin = 0; } Scene_cameraYTileMin = Scene_cameraYTile - 25; - if(Scene_cameraYTileMin < 0) { + if (Scene_cameraYTileMin < 0) { Scene_cameraYTileMin = 0; } Scene_cameraXTileMax = Scene_cameraXTile + 25; - if(Scene_cameraXTileMax > this.xSize) { + if (Scene_cameraXTileMax > this.xSize) { Scene_cameraXTileMax = this.xSize; } Scene_cameraYTileMax = Scene_cameraYTile + 25; - if(Scene_cameraYTileMax > this.ySize) { + if (Scene_cameraYTileMax > this.ySize) { Scene_cameraYTileMax = this.ySize; } @@ -1118,21 +1100,21 @@ public class Scene { Tile[][] var8; int var9; int var10; - for(var7 = this.Scene_minPlane; var7 < this.planes; ++var7) { + for (var7 = this.Scene_minPlane; var7 < this.planes; ++var7) { var8 = this.tiles[var7]; - for(var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { - for(var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { + for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { + for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { Tile var11 = var8[var9][var10]; - if(var11 != null) { - if(var11.minPlane > var6 || !visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] && this.tileHeights[var7][var9][var10] - var2 < 2000) { + if (var11 != null) { + if (var11.minPlane > var6 || !visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] && this.tileHeights[var7][var9][var10] - var2 < 2000) { var11.drawPrimary = false; var11.drawSecondary = false; var11.drawGameObjectEdges = 0; } else { var11.drawPrimary = true; var11.drawSecondary = true; - if(var11.gameObjectsCount > 0) { + if (var11.gameObjectsCount > 0) { var11.drawGameObjects = true; } else { var11.drawGameObjects = false; @@ -1147,52 +1129,52 @@ public class Scene { int var12; int var13; - int var14; - Tile var15; + Tile var14; + int var15; int var16; - for(var7 = this.Scene_minPlane; var7 < this.planes; ++var7) { + for (var7 = this.Scene_minPlane; var7 < this.planes; ++var7) { var8 = this.tiles[var7]; - for(var9 = -25; var9 <= 0; ++var9) { + for (var9 = -25; var9 <= 0; ++var9) { var10 = var9 + Scene_cameraXTile; - var16 = Scene_cameraXTile - var9; - if(var10 >= Scene_cameraXTileMin || var16 < Scene_cameraXTileMax) { - for(var12 = -25; var12 <= 0; ++var12) { - var13 = var12 + Scene_cameraYTile; - var14 = Scene_cameraYTile - var12; - if(var10 >= Scene_cameraXTileMin) { - if(var13 >= Scene_cameraYTileMin) { - var15 = var8[var10][var13]; - if(var15 != null && var15.drawPrimary) { - this.drawTile(var15, true); + var15 = Scene_cameraXTile - var9; + if (var10 >= Scene_cameraXTileMin || var15 < Scene_cameraXTileMax) { + for (var16 = -25; var16 <= 0; ++var16) { + var12 = var16 + Scene_cameraYTile; + var13 = Scene_cameraYTile - var16; + if (var10 >= Scene_cameraXTileMin) { + if (var12 >= Scene_cameraYTileMin) { + var14 = var8[var10][var12]; + if (var14 != null && var14.drawPrimary) { + this.drawTile(var14, true); } } - if(var14 < Scene_cameraYTileMax) { - var15 = var8[var10][var14]; - if(var15 != null && var15.drawPrimary) { - this.drawTile(var15, true); + if (var13 < Scene_cameraYTileMax) { + var14 = var8[var10][var13]; + if (var14 != null && var14.drawPrimary) { + this.drawTile(var14, true); } } } - if(var16 < Scene_cameraXTileMax) { - if(var13 >= Scene_cameraYTileMin) { - var15 = var8[var16][var13]; - if(var15 != null && var15.drawPrimary) { - this.drawTile(var15, true); + if (var15 < Scene_cameraXTileMax) { + if (var12 >= Scene_cameraYTileMin) { + var14 = var8[var15][var12]; + if (var14 != null && var14.drawPrimary) { + this.drawTile(var14, true); } } - if(var14 < Scene_cameraYTileMax) { - var15 = var8[var16][var14]; - if(var15 != null && var15.drawPrimary) { - this.drawTile(var15, true); + if (var13 < Scene_cameraYTileMax) { + var14 = var8[var15][var13]; + if (var14 != null && var14.drawPrimary) { + this.drawTile(var14, true); } } } - if(tileUpdateCount == 0) { + if (tileUpdateCount == 0) { checkClick = false; return; } @@ -1201,49 +1183,49 @@ public class Scene { } } - for(var7 = this.Scene_minPlane; var7 < this.planes; ++var7) { + for (var7 = this.Scene_minPlane; var7 < this.planes; ++var7) { var8 = this.tiles[var7]; - for(var9 = -25; var9 <= 0; ++var9) { + for (var9 = -25; var9 <= 0; ++var9) { var10 = var9 + Scene_cameraXTile; - var16 = Scene_cameraXTile - var9; - if(var10 >= Scene_cameraXTileMin || var16 < Scene_cameraXTileMax) { - for(var12 = -25; var12 <= 0; ++var12) { - var13 = var12 + Scene_cameraYTile; - var14 = Scene_cameraYTile - var12; - if(var10 >= Scene_cameraXTileMin) { - if(var13 >= Scene_cameraYTileMin) { - var15 = var8[var10][var13]; - if(var15 != null && var15.drawPrimary) { - this.drawTile(var15, false); + var15 = Scene_cameraXTile - var9; + if (var10 >= Scene_cameraXTileMin || var15 < Scene_cameraXTileMax) { + for (var16 = -25; var16 <= 0; ++var16) { + var12 = var16 + Scene_cameraYTile; + var13 = Scene_cameraYTile - var16; + if (var10 >= Scene_cameraXTileMin) { + if (var12 >= Scene_cameraYTileMin) { + var14 = var8[var10][var12]; + if (var14 != null && var14.drawPrimary) { + this.drawTile(var14, false); } } - if(var14 < Scene_cameraYTileMax) { - var15 = var8[var10][var14]; - if(var15 != null && var15.drawPrimary) { - this.drawTile(var15, false); + if (var13 < Scene_cameraYTileMax) { + var14 = var8[var10][var13]; + if (var14 != null && var14.drawPrimary) { + this.drawTile(var14, false); } } } - if(var16 < Scene_cameraXTileMax) { - if(var13 >= Scene_cameraYTileMin) { - var15 = var8[var16][var13]; - if(var15 != null && var15.drawPrimary) { - this.drawTile(var15, false); + if (var15 < Scene_cameraXTileMax) { + if (var12 >= Scene_cameraYTileMin) { + var14 = var8[var15][var12]; + if (var14 != null && var14.drawPrimary) { + this.drawTile(var14, false); } } - if(var14 < Scene_cameraYTileMax) { - var15 = var8[var16][var14]; - if(var15 != null && var15.drawPrimary) { - this.drawTile(var15, false); + if (var13 < Scene_cameraYTileMax) { + var14 = var8[var15][var13]; + if (var14 != null && var14.drawPrimary) { + this.drawTile(var14, false); } } } - if(tileUpdateCount == 0) { + if (tileUpdateCount == 0) { checkClick = false; return; } @@ -1263,7 +1245,7 @@ public class Scene { void drawTile(Tile var1, boolean var2) { Scene_tilesDeque.addFirst(var1); - while(true) { + while (true) { Tile var3; int var4; int var5; @@ -1271,30 +1253,30 @@ public class Scene { int var7; Tile[][] var8; Tile var9; + int var10; int var11; + int var12; + int var13; int var14; int var15; - int var16; - int var24; - int var25; do { do { do { do { do { do { - while(true) { - BoundaryObject var10; - GameObject var12; - int var17; + while (true) { + BoundaryObject var16; + GameObject var17; int var18; + int var19; boolean var20; int var21; - Tile var36; - while(true) { + Tile var22; + while (true) { do { var3 = (Tile)Scene_tilesDeque.removeLast(); - if(var3 == null) { + if (var3 == null) { return; } } while(!var3.drawSecondary); @@ -1304,42 +1286,42 @@ public class Scene { var6 = var3.plane; var7 = var3.originalPlane; var8 = this.tiles[var6]; - if(!var3.drawPrimary) { + if (!var3.drawPrimary) { break; } - if(var2) { - if(var6 > 0) { + if (var2) { + if (var6 > 0) { var9 = this.tiles[var6 - 1][var4][var5]; - if(var9 != null && var9.drawSecondary) { + if (var9 != null && var9.drawSecondary) { continue; } } - if(var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { + if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { var9 = var8[var4 - 1][var5]; - if(var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { continue; } } - if(var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { + if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { var9 = var8[var4 + 1][var5]; - if(var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { continue; } } - if(var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { + if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { var9 = var8[var4][var5 - 1]; - if(var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { continue; } } - if(var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { + if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { var9 = var8[var4][var5 + 1]; - if(var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { continue; } } @@ -1348,311 +1330,312 @@ public class Scene { } var3.drawPrimary = false; - if(var3.linkedBelowTile != null) { + if (var3.linkedBelowTile != null) { var9 = var3.linkedBelowTile; - if(var9.paint != null) { - if(!this.__ba_253(0, var4, var5)) { + if (var9.paint != null) { + if (!this.method297(0, var4, var5)) { this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - } else if(var9.model != null && !this.__ba_253(0, var4, var5)) { + } else if (var9.model != null && !this.method297(0, var4, var5)) { this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - var10 = var9.boundaryObject; - if(var10 != null) { - var10.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); + var16 = var9.boundaryObject; + if (var16 != null) { + var16.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var16.x - Scene_cameraX, var16.tileHeight - Scene_cameraY, var16.y - Scene_cameraZ, var16.tag); } - for(var11 = 0; var11 < var9.gameObjectsCount; ++var11) { - var12 = var9.gameObjects[var11]; - if(var12 != null) { - var12.entity.renderDraw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.height - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag); + for (var10 = 0; var10 < var9.gameObjectsCount; ++var10) { + var17 = var9.gameObjects[var10]; + if (var17 != null) { + var17.entity.renderDraw(var17.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var17.centerX - Scene_cameraX, var17.height - Scene_cameraY, var17.centerY - Scene_cameraZ, var17.tag); } } } var20 = false; - if(var3.paint != null) { - if(!this.__ba_253(var7, var4, var5)) { + if (var3.paint != null) { + if (!this.method297(var7, var4, var5)) { var20 = true; - if(var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { + if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } } - } else if(var3.model != null && !this.__ba_253(var7, var4, var5)) { + } else if (var3.model != null && !this.method297(var7, var4, var5)) { var20 = true; this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } var21 = 0; - var11 = 0; - BoundaryObject var31 = var3.boundaryObject; - WallDecoration var13 = var3.wallDecoration; - if(var31 != null || var13 != null) { - if(var4 == Scene_cameraXTile) { + var10 = 0; + BoundaryObject var23 = var3.boundaryObject; + WallDecoration var24 = var3.wallDecoration; + if (var23 != null || var24 != null) { + if (var4 == Scene_cameraXTile) { ++var21; - } else if(Scene_cameraXTile < var4) { + } else if (Scene_cameraXTile < var4) { var21 += 2; } - if(var5 == Scene_cameraYTile) { + if (var5 == Scene_cameraYTile) { var21 += 3; - } else if(Scene_cameraYTile > var5) { + } else if (Scene_cameraYTile > var5) { var21 += 6; } - var11 = __em_au[var21]; - var3.__b = __em_aa[var21]; + var10 = field762[var21]; + var3.field899 = field764[var21]; } - if(var31 != null) { - if((var31.orientationA & __em_ao[var21]) != 0) { - if(var31.orientationA == 16) { + if (var23 != null) { + if ((var23.orientationA & field763[var21]) != 0) { + if (var23.orientationA == 16) { var3.drawGameObjectEdges = 3; - var3.__y = __em_ax[var21]; - var3.__h = 3 - var3.__y; - } else if(var31.orientationA == 32) { + var3.field897 = field765[var21]; + var3.field898 = 3 - var3.field897; + } else if (var23.orientationA == 32) { var3.drawGameObjectEdges = 6; - var3.__y = __em_af[var21]; - var3.__h = 6 - var3.__y; - } else if(var31.orientationA == 64) { + var3.field897 = field766[var21]; + var3.field898 = 6 - var3.field897; + } else if (var23.orientationA == 64) { var3.drawGameObjectEdges = 12; - var3.__y = __em_ai[var21]; - var3.__h = 12 - var3.__y; + var3.field897 = field767[var21]; + var3.field898 = 12 - var3.field897; } else { var3.drawGameObjectEdges = 9; - var3.__y = __em_ba[var21]; - var3.__h = 9 - var3.__y; + var3.field897 = field768[var21]; + var3.field898 = 9 - var3.field897; } } else { var3.drawGameObjectEdges = 0; } - if((var31.orientationA & var11) != 0 && !this.__bb_254(var7, var4, var5, var31.orientationA)) { - var31.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); + if ((var23.orientationA & var10) != 0 && !this.method298(var7, var4, var5, var23.orientationA)) { + var23.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } - if((var31.orientationB & var11) != 0 && !this.__bb_254(var7, var4, var5, var31.orientationB)) { - var31.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); + if ((var23.orientationB & var10) != 0 && !this.method298(var7, var4, var5, var23.orientationB)) { + var23.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } } - if(var13 != null && !this.__bs_255(var7, var4, var5, var13.entity1.height)) { - if((var13.orientation & var11) != 0) { - var13.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); - } else if(var13.orientation == 256) { - var14 = var13.x - Scene_cameraX; - var15 = var13.tileHeight - Scene_cameraY; - var16 = var13.y - Scene_cameraZ; - var17 = var13.orientation2; - if(var17 != 1 && var17 != 2) { - var18 = var14; + if (var24 != null && !this.method299(var7, var4, var5, var24.entity1.height)) { + if ((var24.orientation & var10) != 0) { + var24.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var24.x - Scene_cameraX + var24.xOffset, var24.tileHeight - Scene_cameraY, var24.y - Scene_cameraZ + var24.yOffset, var24.tag); + } else if (var24.orientation == 256) { + var11 = var24.x - Scene_cameraX; + var12 = var24.tileHeight - Scene_cameraY; + var13 = var24.y - Scene_cameraZ; + var18 = var24.orientation2; + if (var18 != 1 && var18 != 2) { + var19 = var11; } else { - var18 = -var14; + var19 = -var11; } - int var19; - if(var17 != 2 && var17 != 3) { - var19 = var16; + int var25; + if (var18 != 2 && var18 != 3) { + var25 = var13; } else { - var19 = -var16; + var25 = -var13; } - if(var19 < var18) { - var13.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); - } else if(var13.entity2 != null) { - var13.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); + if (var25 < var19) { + var24.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var24.xOffset, var12, var13 + var24.yOffset, var24.tag); + } else if (var24.entity2 != null) { + var24.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var12, var13, var24.tag); } } } - if(var20) { - FloorDecoration var22 = var3.floorDecoration; - if(var22 != null) { - var22.entity.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x - Scene_cameraX, var22.tileHeight - Scene_cameraY, var22.y - Scene_cameraZ, var22.tag); + if (var20) { + FloorDecoration var34 = var3.floorDecoration; + if (var34 != null) { + var34.entity.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var34.x - Scene_cameraX, var34.tileHeight - Scene_cameraY, var34.y - Scene_cameraZ, var34.tag); } - GroundItemPile var23 = var3.groundItemPile; - if(var23 != null && var23.height == 0) { - if(var23.second != null) { - var23.second.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); + GroundItemPile var26 = var3.groundItemPile; + if (var26 != null && var26.height == 0) { + if (var26.second != null) { + var26.second.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag); } - if(var23.third != null) { - var23.third.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); + if (var26.third != null) { + var26.third.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag); } - if(var23.first != null) { - var23.first.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); + if (var26.first != null) { + var26.first.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag); } } } - var14 = var3.gameObjectsEdgeMask; - if(var14 != 0) { - if(var4 < Scene_cameraXTile && (var14 & 4) != 0) { - var36 = var8[var4 + 1][var5]; - if(var36 != null && var36.drawSecondary) { - Scene_tilesDeque.addFirst(var36); + var11 = var3.gameObjectsEdgeMask; + if (var11 != 0) { + if (var4 < Scene_cameraXTile && (var11 & 4) != 0) { + var22 = var8[var4 + 1][var5]; + if (var22 != null && var22.drawSecondary) { + Scene_tilesDeque.addFirst(var22); } } - if(var5 < Scene_cameraYTile && (var14 & 2) != 0) { - var36 = var8[var4][var5 + 1]; - if(var36 != null && var36.drawSecondary) { - Scene_tilesDeque.addFirst(var36); + if (var5 < Scene_cameraYTile && (var11 & 2) != 0) { + var22 = var8[var4][var5 + 1]; + if (var22 != null && var22.drawSecondary) { + Scene_tilesDeque.addFirst(var22); } } - if(var4 > Scene_cameraXTile && (var14 & 1) != 0) { - var36 = var8[var4 - 1][var5]; - if(var36 != null && var36.drawSecondary) { - Scene_tilesDeque.addFirst(var36); + if (var4 > Scene_cameraXTile && (var11 & 1) != 0) { + var22 = var8[var4 - 1][var5]; + if (var22 != null && var22.drawSecondary) { + Scene_tilesDeque.addFirst(var22); } } - if(var5 > Scene_cameraYTile && (var14 & 8) != 0) { - var36 = var8[var4][var5 - 1]; - if(var36 != null && var36.drawSecondary) { - Scene_tilesDeque.addFirst(var36); + if (var5 > Scene_cameraYTile && (var11 & 8) != 0) { + var22 = var8[var4][var5 - 1]; + if (var22 != null && var22.drawSecondary) { + Scene_tilesDeque.addFirst(var22); } } } break; } - if(var3.drawGameObjectEdges != 0) { + if (var3.drawGameObjectEdges != 0) { var20 = true; - for(var21 = 0; var21 < var3.gameObjectsCount; ++var21) { - if(var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.__y) { + for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field897) { var20 = false; break; } } - if(var20) { - var10 = var3.boundaryObject; - if(!this.__bb_254(var7, var4, var5, var10.orientationA)) { - var10.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); + if (var20) { + var16 = var3.boundaryObject; + if (!this.method298(var7, var4, var5, var16.orientationA)) { + var16.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var16.x - Scene_cameraX, var16.tileHeight - Scene_cameraY, var16.y - Scene_cameraZ, var16.tag); } var3.drawGameObjectEdges = 0; } } - if(!var3.drawGameObjects) { + if (!var3.drawGameObjects) { break; } try { - int var34 = var3.gameObjectsCount; + int var32 = var3.gameObjectsCount; var3.drawGameObjects = false; var21 = 0; - label563: - for(var11 = 0; var11 < var34; ++var11) { - var12 = var3.gameObjects[var11]; - if(var12.lastDrawn != Scene_drawnCount) { - for(var24 = var12.startX; var24 <= var12.endX; ++var24) { - for(var14 = var12.startY; var14 <= var12.endY; ++var14) { - var36 = var8[var24][var14]; - if(var36.drawPrimary) { + label562: + for (var10 = 0; var10 < var32; ++var10) { + var17 = var3.gameObjects[var10]; + if (var17.lastDrawn != Scene_drawnCount) { + for (var14 = var17.startX; var14 <= var17.endX; ++var14) { + for (var11 = var17.startY; var11 <= var17.endY; ++var11) { + var22 = var8[var14][var11]; + if (var22.drawPrimary) { var3.drawGameObjects = true; - continue label563; + continue label562; } - if(var36.drawGameObjectEdges != 0) { - var16 = 0; - if(var24 > var12.startX) { - ++var16; + if (var22.drawGameObjectEdges != 0) { + var13 = 0; + if (var14 > var17.startX) { + ++var13; } - if(var24 < var12.endX) { - var16 += 4; + if (var14 < var17.endX) { + var13 += 4; } - if(var14 > var12.startY) { - var16 += 8; + if (var11 > var17.startY) { + var13 += 8; } - if(var14 < var12.endY) { - var16 += 2; + if (var11 < var17.endY) { + var13 += 2; } - if((var16 & var36.drawGameObjectEdges) == var3.__h) { + if ((var13 & var22.drawGameObjectEdges) == var3.field898) { var3.drawGameObjects = true; - continue label563; + continue label562; } } } } - Scene_gameObjects[var21++] = var12; - var24 = Scene_cameraXTile - var12.startX; - var14 = var12.endX - Scene_cameraXTile; - if(var14 > var24) { - var24 = var14; + Scene_gameObjects[var21++] = var17; + var14 = Scene_cameraXTile - var17.startX; + var11 = var17.endX - Scene_cameraXTile; + if (var11 > var14) { + var14 = var11; } - var15 = Scene_cameraYTile - var12.startY; - var16 = var12.endY - Scene_cameraYTile; - if(var16 > var15) { - var12.__d = var24 + var16; + var12 = Scene_cameraYTile - var17.startY; + var13 = var17.endY - Scene_cameraYTile; + if (var13 > var12) { + var17.field360 = var14 + var13; } else { - var12.__d = var24 + var15; + var17.field360 = var14 + var12; } } } - while(var21 > 0) { - var11 = -50; - var25 = -1; + while (var21 > 0) { + var10 = -50; + var15 = -1; - for(var24 = 0; var24 < var21; ++var24) { - GameObject var35 = Scene_gameObjects[var24]; - if(var35.lastDrawn != Scene_drawnCount) { - if(var35.__d > var11) { - var11 = var35.__d; - var25 = var24; - } else if(var11 == var35.__d) { - var15 = var35.centerX - Scene_cameraX; - var16 = var35.centerY - Scene_cameraZ; - var17 = Scene_gameObjects[var25].centerX - Scene_cameraX; - var18 = Scene_gameObjects[var25].centerY - Scene_cameraZ; - if(var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { - var25 = var24; + GameObject var33; + for (var14 = 0; var14 < var21; ++var14) { + var33 = Scene_gameObjects[var14]; + if (var33.lastDrawn != Scene_drawnCount) { + if (var33.field360 > var10) { + var10 = var33.field360; + var15 = var14; + } else if (var10 == var33.field360) { + var12 = var33.centerX - Scene_cameraX; + var13 = var33.centerY - Scene_cameraZ; + var18 = Scene_gameObjects[var15].centerX - Scene_cameraX; + var19 = Scene_gameObjects[var15].centerY - Scene_cameraZ; + if (var12 * var12 + var13 * var13 > var18 * var18 + var19 * var19) { + var15 = var14; } } } } - if(var25 == -1) { + if (var15 == -1) { break; } - GameObject var33 = Scene_gameObjects[var25]; + var33 = Scene_gameObjects[var15]; var33.lastDrawn = Scene_drawnCount; - if(!this.__bq_256(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) { + if (!this.method300(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) { var33.entity.renderDraw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); } - for(var14 = var33.startX; var14 <= var33.endX; ++var14) { - for(var15 = var33.startY; var15 <= var33.endY; ++var15) { - Tile var26 = var8[var14][var15]; - if(var26.drawGameObjectEdges != 0) { - Scene_tilesDeque.addFirst(var26); - } else if((var14 != var4 || var15 != var5) && var26.drawSecondary) { - Scene_tilesDeque.addFirst(var26); + for (var11 = var33.startX; var11 <= var33.endX; ++var11) { + for (var12 = var33.startY; var12 <= var33.endY; ++var12) { + Tile var35 = var8[var11][var12]; + if (var35.drawGameObjectEdges != 0) { + Scene_tilesDeque.addFirst(var35); + } else if ((var11 != var4 || var12 != var5) && var35.drawSecondary) { + Scene_tilesDeque.addFirst(var35); } } } } - if(!var3.drawGameObjects) { + if (!var3.drawGameObjects) { break; } - } catch (Exception var28) { + } catch (Exception var27) { var3.drawGameObjects = false; break; } @@ -1660,28 +1643,28 @@ public class Scene { } while(!var3.drawSecondary); } while(var3.drawGameObjectEdges != 0); - if(var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { + if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { break; } var9 = var8[var4 - 1][var5]; } while(var9 != null && var9.drawSecondary); - if(var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { + if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { break; } var9 = var8[var4 + 1][var5]; } while(var9 != null && var9.drawSecondary); - if(var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { + if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { break; } var9 = var8[var4][var5 - 1]; } while(var9 != null && var9.drawSecondary); - if(var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { + if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { break; } @@ -1690,95 +1673,95 @@ public class Scene { var3.drawSecondary = false; --tileUpdateCount; - GroundItemPile var32 = var3.groundItemPile; - if(var32 != null && var32.height != 0) { - if(var32.second != null) { - var32.second.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); + GroundItemPile var28 = var3.groundItemPile; + if (var28 != null && var28.height != 0) { + if (var28.second != null) { + var28.second.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag); } - if(var32.third != null) { - var32.third.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); + if (var28.third != null) { + var28.third.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag); } - if(var32.first != null) { - var32.first.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); + if (var28.first != null) { + var28.first.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag); } } - if(var3.__b != 0) { + if (var3.field899 != 0) { WallDecoration var29 = var3.wallDecoration; - if(var29 != null && !this.__bs_255(var7, var4, var5, var29.entity1.height)) { - if((var29.orientation & var3.__b) != 0) { + if (var29 != null && !this.method299(var7, var4, var5, var29.entity1.height)) { + if ((var29.orientation & var3.field899) != 0) { var29.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); - } else if(var29.orientation == 256) { - var11 = var29.x - Scene_cameraX; - var25 = var29.tileHeight - Scene_cameraY; - var24 = var29.y - Scene_cameraZ; - var14 = var29.orientation2; - if(var14 != 1 && var14 != 2) { - var15 = var11; + } else if (var29.orientation == 256) { + var10 = var29.x - Scene_cameraX; + var15 = var29.tileHeight - Scene_cameraY; + var14 = var29.y - Scene_cameraZ; + var11 = var29.orientation2; + if (var11 != 1 && var11 != 2) { + var12 = var10; } else { - var15 = -var11; + var12 = -var10; } - if(var14 != 2 && var14 != 3) { - var16 = var24; + if (var11 != 2 && var11 != 3) { + var13 = var14; } else { - var16 = -var24; + var13 = -var14; } - if(var16 >= var15) { - var29.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); - } else if(var29.entity2 != null) { - var29.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); + if (var13 >= var12) { + var29.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10 + var29.xOffset, var15, var14 + var29.yOffset, var29.tag); + } else if (var29.entity2 != null) { + var29.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10, var15, var14, var29.tag); } } } - BoundaryObject var27 = var3.boundaryObject; - if(var27 != null) { - if((var27.orientationB & var3.__b) != 0 && !this.__bb_254(var7, var4, var5, var27.orientationB)) { - var27.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); + BoundaryObject var31 = var3.boundaryObject; + if (var31 != null) { + if ((var31.orientationB & var3.field899) != 0 && !this.method298(var7, var4, var5, var31.orientationB)) { + var31.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } - if((var27.orientationA & var3.__b) != 0 && !this.__bb_254(var7, var4, var5, var27.orientationA)) { - var27.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); + if ((var31.orientationA & var3.field899) != 0 && !this.method298(var7, var4, var5, var31.orientationA)) { + var31.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } } } Tile var30; - if(var6 < this.planes - 1) { + if (var6 < this.planes - 1) { var30 = this.tiles[var6 + 1][var4][var5]; - if(var30 != null && var30.drawSecondary) { + if (var30 != null && var30.drawSecondary) { Scene_tilesDeque.addFirst(var30); } } - if(var4 < Scene_cameraXTile) { + if (var4 < Scene_cameraXTile) { var30 = var8[var4 + 1][var5]; - if(var30 != null && var30.drawSecondary) { + if (var30 != null && var30.drawSecondary) { Scene_tilesDeque.addFirst(var30); } } - if(var5 < Scene_cameraYTile) { + if (var5 < Scene_cameraYTile) { var30 = var8[var4][var5 + 1]; - if(var30 != null && var30.drawSecondary) { + if (var30 != null && var30.drawSecondary) { Scene_tilesDeque.addFirst(var30); } } - if(var4 > Scene_cameraXTile) { + if (var4 > Scene_cameraXTile) { var30 = var8[var4 - 1][var5]; - if(var30 != null && var30.drawSecondary) { + if (var30 != null && var30.drawSecondary) { Scene_tilesDeque.addFirst(var30); } } - if(var5 > Scene_cameraYTile) { + if (var5 > Scene_cameraYTile) { var30 = var8[var4][var5 - 1]; - if(var30 != null && var30.drawSecondary) { + if (var30 != null && var30.drawSecondary) { Scene_tilesDeque.addFirst(var30); } } @@ -1809,27 +1792,27 @@ public class Scene { var21 = var17 * var4 - var3 * var12 >> 16; var12 = var3 * var17 + var12 * var4 >> 16; var17 = var21; - if(var12 >= 50) { + if (var12 >= 50) { var21 = var14 * var6 + var5 * var11 >> 16; var11 = var11 * var6 - var5 * var14 >> 16; var14 = var21; var21 = var18 * var4 - var3 * var11 >> 16; var11 = var3 * var18 + var11 * var4 >> 16; var18 = var21; - if(var11 >= 50) { + if (var11 >= 50) { var21 = var13 * var6 + var5 * var16 >> 16; var16 = var16 * var6 - var5 * var13 >> 16; var13 = var21; var21 = var19 * var4 - var3 * var16 >> 16; var16 = var3 * var19 + var16 * var4 >> 16; var19 = var21; - if(var16 >= 50) { + if (var16 >= 50) { var21 = var9 * var6 + var5 * var15 >> 16; var15 = var15 * var6 - var5 * var9 >> 16; var9 = var21; var21 = var20 * var4 - var3 * var15 >> 16; var15 = var3 * var20 + var15 * var4 >> 16; - if(var15 >= 50) { + if (var15 >= 50) { int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; @@ -1840,60 +1823,60 @@ public class Scene { int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; Rasterizer3D.Rasterizer3D_alpha = 0; int var30; - if((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { - Rasterizer3D.__et_m = false; - if(var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.__et_m = true; + if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { + Rasterizer3D.field739 = false; + if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { + Rasterizer3D.field739 = true; } - if(checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { Scene_selectedX = var7; Scene_selectedY = var8; } - if(var1.texture == -1) { - if(var1.neColor != 12345678) { + if (var1.texture == -1) { + if (var1.neColor != 12345678) { Rasterizer3D.method3037(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); } - } else if(!Scene_isLowDetail) { - if(var1.isFlat) { + } else if (!Scene_isLowDetail) { + if (var1.isFlat) { Rasterizer3D.method3012(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); } else { Rasterizer3D.method3012(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); } } else { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var1.texture); + var30 = Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var1.texture); Rasterizer3D.method3037(var27, var29, var25, var26, var28, var24, method3108(var30, var1.neColor), method3108(var30, var1.nwColor), method3108(var30, var1.seColor)); } } - if((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { - Rasterizer3D.__et_m = false; - if(var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.__et_m = true; + if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { + Rasterizer3D.field739 = false; + if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { + Rasterizer3D.field739 = true; } - if(checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { Scene_selectedX = var7; Scene_selectedY = var8; } - if(var1.texture == -1) { - if(var1.swColor != 12345678) { + if (var1.texture == -1) { + if (var1.swColor != 12345678) { Rasterizer3D.method3037(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); } - } else if(!Scene_isLowDetail) { + } else if (!Scene_isLowDetail) { Rasterizer3D.method3012(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); } else { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var1.texture); + var30 = Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var1.texture); Rasterizer3D.method3037(var23, var25, var29, var22, var24, var28, method3108(var30, var1.swColor), method3108(var30, var1.seColor), method3108(var30, var1.nwColor)); } } - } } } } + } @ObfuscatedName("aa") @@ -1909,7 +1892,7 @@ public class Scene { int var11; int var12; int var13; - for(var9 = 0; var9 < var8; ++var9) { + for (var9 = 0; var9 < var8; ++var9) { var10 = var1.vertexX[var9] - Scene_cameraX; var11 = var1.vertexY[var9] - Scene_cameraY; var12 = var1.vertexZ[var9] - Scene_cameraZ; @@ -1918,56 +1901,56 @@ public class Scene { var10 = var13; var13 = var3 * var11 - var12 * var2 >> 16; var12 = var11 * var2 + var3 * var12 >> 16; - if(var12 < 50) { + if (var12 < 50) { return; } - if(var1.triangleTextureId != null) { - TileModel.__dv_s[var9] = var10; - TileModel.__dv_t[var9] = var13; - TileModel.__dv_y[var9] = var12; + if (var1.triangleTextureId != null) { + TileModel.field902[var9] = var10; + TileModel.field903[var9] = var13; + TileModel.field904[var9] = var12; } - TileModel.__dv_z[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; - TileModel.__dv_j[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; + TileModel.field900[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; + TileModel.field901[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; } Rasterizer3D.Rasterizer3D_alpha = 0; var8 = var1.faceX.length; - for(var9 = 0; var9 < var8; ++var9) { + for (var9 = 0; var9 < var8; ++var9) { var10 = var1.faceX[var9]; var11 = var1.faceY[var9]; var12 = var1.faceZ[var9]; - var13 = TileModel.__dv_z[var10]; - int var14 = TileModel.__dv_z[var11]; - int var15 = TileModel.__dv_z[var12]; - int var16 = TileModel.__dv_j[var10]; - int var17 = TileModel.__dv_j[var11]; - int var18 = TileModel.__dv_j[var12]; - if((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { - Rasterizer3D.__et_m = false; - if(var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.__et_m = true; + var13 = TileModel.field900[var10]; + int var14 = TileModel.field900[var11]; + int var15 = TileModel.field900[var12]; + int var16 = TileModel.field901[var10]; + int var17 = TileModel.field901[var11]; + int var18 = TileModel.field901[var12]; + if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { + Rasterizer3D.field739 = false; + if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { + Rasterizer3D.field739 = true; } - if(checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { Scene_selectedX = var6; Scene_selectedY = var7; } - if(var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { - if(!Scene_isLowDetail) { - if(var1.isFlat) { - Rasterizer3D.method3012(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.__dv_s[0], TileModel.__dv_s[1], TileModel.__dv_s[3], TileModel.__dv_t[0], TileModel.__dv_t[1], TileModel.__dv_t[3], TileModel.__dv_y[0], TileModel.__dv_y[1], TileModel.__dv_y[3], var1.triangleTextureId[var9]); + if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { + if (!Scene_isLowDetail) { + if (var1.isFlat) { + Rasterizer3D.method3012(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field902[0], TileModel.field902[1], TileModel.field902[3], TileModel.field903[0], TileModel.field903[1], TileModel.field903[3], TileModel.field904[0], TileModel.field904[1], TileModel.field904[3], var1.triangleTextureId[var9]); } else { - Rasterizer3D.method3012(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.__dv_s[var10], TileModel.__dv_s[var11], TileModel.__dv_s[var12], TileModel.__dv_t[var10], TileModel.__dv_t[var11], TileModel.__dv_t[var12], TileModel.__dv_y[var10], TileModel.__dv_y[var11], TileModel.__dv_y[var12], var1.triangleTextureId[var9]); + Rasterizer3D.method3012(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field902[var10], TileModel.field902[var11], TileModel.field902[var12], TileModel.field903[var10], TileModel.field903[var11], TileModel.field903[var12], TileModel.field904[var10], TileModel.field904[var11], TileModel.field904[var12], var1.triangleTextureId[var9]); } } else { - int var19 = Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var1.triangleTextureId[var9]); + int var19 = Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var1.triangleTextureId[var9]); Rasterizer3D.method3037(var16, var17, var18, var13, var14, var15, method3108(var19, var1.triangleColorA[var9]), method3108(var19, var1.triangleColorB[var9]), method3108(var19, var1.triangleColorC[var9])); } - } else if(var1.triangleColorA[var9] != 12345678) { + } else if (var1.triangleColorA[var9] != 12345678) { Rasterizer3D.method3037(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } } @@ -1982,139 +1965,139 @@ public class Scene { Occluder[] var2 = Scene_planeOccluders[Scene_plane]; Scene_currentOccludersCount = 0; - for(int var3 = 0; var3 < var1; ++var3) { + for (int var3 = 0; var3 < var1; ++var3) { Occluder var4 = var2[var3]; int var5; int var6; int var7; - int var9; - boolean var13; - if(var4.type == 1) { + int var8; + boolean var9; + if (var4.type == 1) { var5 = var4.minTileX - Scene_cameraXTile + 25; - if(var5 >= 0 && var5 <= 50) { + if (var5 >= 0 && var5 <= 50) { var6 = var4.minTileY - Scene_cameraYTile + 25; - if(var6 < 0) { + if (var6 < 0) { var6 = 0; } var7 = var4.maxTileY - Scene_cameraYTile + 25; - if(var7 > 50) { + if (var7 > 50) { var7 = 50; } - var13 = false; + var9 = false; - while(var6 <= var7) { - if(visibleTiles[var5][var6++]) { - var13 = true; + while (var6 <= var7) { + if (visibleTiles[var5][var6++]) { + var9 = true; break; } } - if(var13) { - var9 = Scene_cameraX - var4.minX; - if(var9 > 32) { - var4.__k = 1; + if (var9) { + var8 = Scene_cameraX - var4.minX; + if (var8 > 32) { + var4.field656 = 1; } else { - if(var9 >= -32) { + if (var8 >= -32) { continue; } - var4.__k = 2; - var9 = -var9; + var4.field656 = 2; + var8 = -var8; } - var4.__a = (var4.minZ - Scene_cameraZ << 8) / var9; - var4.__z = (var4.maxZ - Scene_cameraZ << 8) / var9; - var4.__j = (var4.minY - Scene_cameraY << 8) / var9; - var4.__s = (var4.maxY - Scene_cameraY << 8) / var9; + var4.field659 = (var4.minZ - Scene_cameraZ << 8) / var8; + var4.field660 = (var4.maxZ - Scene_cameraZ << 8) / var8; + var4.field661 = (var4.minY - Scene_cameraY << 8) / var8; + var4.field662 = (var4.maxY - Scene_cameraY << 8) / var8; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } - } else if(var4.type == 2) { + } else if (var4.type == 2) { var5 = var4.minTileY - Scene_cameraYTile + 25; - if(var5 >= 0 && var5 <= 50) { + if (var5 >= 0 && var5 <= 50) { var6 = var4.minTileX - Scene_cameraXTile + 25; - if(var6 < 0) { + if (var6 < 0) { var6 = 0; } var7 = var4.maxTileX - Scene_cameraXTile + 25; - if(var7 > 50) { + if (var7 > 50) { var7 = 50; } - var13 = false; + var9 = false; - while(var6 <= var7) { - if(visibleTiles[var6++][var5]) { - var13 = true; + while (var6 <= var7) { + if (visibleTiles[var6++][var5]) { + var9 = true; break; } } - if(var13) { - var9 = Scene_cameraZ - var4.minZ; - if(var9 > 32) { - var4.__k = 3; + if (var9) { + var8 = Scene_cameraZ - var4.minZ; + if (var8 > 32) { + var4.field656 = 3; } else { - if(var9 >= -32) { + if (var8 >= -32) { continue; } - var4.__k = 4; - var9 = -var9; + var4.field656 = 4; + var8 = -var8; } - var4.__n = (var4.minX - Scene_cameraX << 8) / var9; - var4.__i = (var4.maxX - Scene_cameraX << 8) / var9; - var4.__j = (var4.minY - Scene_cameraY << 8) / var9; - var4.__s = (var4.maxY - Scene_cameraY << 8) / var9; + var4.field657 = (var4.minX - Scene_cameraX << 8) / var8; + var4.field658 = (var4.maxX - Scene_cameraX << 8) / var8; + var4.field661 = (var4.minY - Scene_cameraY << 8) / var8; + var4.field662 = (var4.maxY - Scene_cameraY << 8) / var8; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } - } else if(var4.type == 4) { + } else if (var4.type == 4) { var5 = var4.minY - Scene_cameraY; - if(var5 > 128) { + if (var5 > 128) { var6 = var4.minTileY - Scene_cameraYTile + 25; - if(var6 < 0) { + if (var6 < 0) { var6 = 0; } var7 = var4.maxTileY - Scene_cameraYTile + 25; - if(var7 > 50) { + if (var7 > 50) { var7 = 50; } - if(var6 <= var7) { - int var8 = var4.minTileX - Scene_cameraXTile + 25; - if(var8 < 0) { - var8 = 0; + if (var6 <= var7) { + int var10 = var4.minTileX - Scene_cameraXTile + 25; + if (var10 < 0) { + var10 = 0; } - var9 = var4.maxTileX - Scene_cameraXTile + 25; - if(var9 > 50) { - var9 = 50; + var8 = var4.maxTileX - Scene_cameraXTile + 25; + if (var8 > 50) { + var8 = 50; } - boolean var10 = false; + boolean var11 = false; - label144: - for(int var11 = var8; var11 <= var9; ++var11) { - for(int var12 = var6; var12 <= var7; ++var12) { - if(visibleTiles[var11][var12]) { - var10 = true; - break label144; + label140: + for (int var12 = var10; var12 <= var8; ++var12) { + for (int var13 = var6; var13 <= var7; ++var13) { + if (visibleTiles[var12][var13]) { + var11 = true; + break label140; } } } - if(var10) { - var4.__k = 5; - var4.__n = (var4.minX - Scene_cameraX << 8) / var5; - var4.__i = (var4.maxX - Scene_cameraX << 8) / var5; - var4.__a = (var4.minZ - Scene_cameraZ << 8) / var5; - var4.__z = (var4.maxZ - Scene_cameraZ << 8) / var5; + if (var11) { + var4.field656 = 5; + var4.field657 = (var4.minX - Scene_cameraX << 8) / var5; + var4.field658 = (var4.maxX - Scene_cameraX << 8) / var5; + var4.field659 = (var4.minZ - Scene_cameraZ << 8) / var5; + var4.field660 = (var4.maxZ - Scene_cameraZ << 8) / var5; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2125,28 +2108,28 @@ public class Scene { } @ObfuscatedName("ba") - boolean __ba_253(int var1, int var2, int var3) { - int var4 = this.__x[var1][var2][var3]; - if(var4 == -Scene_drawnCount) { + boolean method297(int var1, int var2, int var3) { + int var4 = this.field769[var1][var2][var3]; + if (var4 == -Scene_drawnCount) { return false; - } else if(var4 == Scene_drawnCount) { + } else if (var4 == Scene_drawnCount) { return true; } else { int var5 = var2 << 7; int var6 = var3 << 7; - if(this.__bn_257(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.__bn_257(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.__bn_257(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.__bn_257(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { - this.__x[var1][var2][var3] = Scene_drawnCount; + if (this.method301(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method301(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method301(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method301(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { + this.field769[var1][var2][var3] = Scene_drawnCount; return true; } else { - this.__x[var1][var2][var3] = -Scene_drawnCount; + this.field769[var1][var2][var3] = -Scene_drawnCount; return false; } } } @ObfuscatedName("bb") - boolean __bb_254(int var1, int var2, int var3, int var4) { - if(!this.__ba_253(var1, var2, var3)) { + boolean method298(int var1, int var2, int var3, int var4) { + if (!this.method297(var1, var2, var3)) { return false; } else { int var5 = var2 << 7; @@ -2155,129 +2138,129 @@ public class Scene { int var8 = var7 - 120; int var9 = var7 - 230; int var10 = var7 - 238; - if(var4 < 16) { - if(var4 == 1) { - if(var5 > Scene_cameraX) { - if(!this.__bn_257(var5, var7, var6)) { + if (var4 < 16) { + if (var4 == 1) { + if (var5 > Scene_cameraX) { + if (!this.method301(var5, var7, var6)) { return false; } - if(!this.__bn_257(var5, var7, var6 + 128)) { + if (!this.method301(var5, var7, var6 + 128)) { return false; } } - if(var1 > 0) { - if(!this.__bn_257(var5, var8, var6)) { + if (var1 > 0) { + if (!this.method301(var5, var8, var6)) { return false; } - if(!this.__bn_257(var5, var8, var6 + 128)) { + if (!this.method301(var5, var8, var6 + 128)) { return false; } } - if(!this.__bn_257(var5, var9, var6)) { + if (!this.method301(var5, var9, var6)) { return false; } - if(!this.__bn_257(var5, var9, var6 + 128)) { + if (!this.method301(var5, var9, var6 + 128)) { return false; } return true; } - if(var4 == 2) { - if(var6 < Scene_cameraZ) { - if(!this.__bn_257(var5, var7, var6 + 128)) { + if (var4 == 2) { + if (var6 < Scene_cameraZ) { + if (!this.method301(var5, var7, var6 + 128)) { return false; } - if(!this.__bn_257(var5 + 128, var7, var6 + 128)) { + if (!this.method301(var5 + 128, var7, var6 + 128)) { return false; } } - if(var1 > 0) { - if(!this.__bn_257(var5, var8, var6 + 128)) { + if (var1 > 0) { + if (!this.method301(var5, var8, var6 + 128)) { return false; } - if(!this.__bn_257(var5 + 128, var8, var6 + 128)) { + if (!this.method301(var5 + 128, var8, var6 + 128)) { return false; } } - if(!this.__bn_257(var5, var9, var6 + 128)) { + if (!this.method301(var5, var9, var6 + 128)) { return false; } - if(!this.__bn_257(var5 + 128, var9, var6 + 128)) { + if (!this.method301(var5 + 128, var9, var6 + 128)) { return false; } return true; } - if(var4 == 4) { - if(var5 < Scene_cameraX) { - if(!this.__bn_257(var5 + 128, var7, var6)) { + if (var4 == 4) { + if (var5 < Scene_cameraX) { + if (!this.method301(var5 + 128, var7, var6)) { return false; } - if(!this.__bn_257(var5 + 128, var7, var6 + 128)) { + if (!this.method301(var5 + 128, var7, var6 + 128)) { return false; } } - if(var1 > 0) { - if(!this.__bn_257(var5 + 128, var8, var6)) { + if (var1 > 0) { + if (!this.method301(var5 + 128, var8, var6)) { return false; } - if(!this.__bn_257(var5 + 128, var8, var6 + 128)) { + if (!this.method301(var5 + 128, var8, var6 + 128)) { return false; } } - if(!this.__bn_257(var5 + 128, var9, var6)) { + if (!this.method301(var5 + 128, var9, var6)) { return false; } - if(!this.__bn_257(var5 + 128, var9, var6 + 128)) { + if (!this.method301(var5 + 128, var9, var6 + 128)) { return false; } return true; } - if(var4 == 8) { - if(var6 > Scene_cameraZ) { - if(!this.__bn_257(var5, var7, var6)) { + if (var4 == 8) { + if (var6 > Scene_cameraZ) { + if (!this.method301(var5, var7, var6)) { return false; } - if(!this.__bn_257(var5 + 128, var7, var6)) { + if (!this.method301(var5 + 128, var7, var6)) { return false; } } - if(var1 > 0) { - if(!this.__bn_257(var5, var8, var6)) { + if (var1 > 0) { + if (!this.method301(var5, var8, var6)) { return false; } - if(!this.__bn_257(var5 + 128, var8, var6)) { + if (!this.method301(var5 + 128, var8, var6)) { return false; } } - if(!this.__bn_257(var5, var9, var6)) { + if (!this.method301(var5, var9, var6)) { return false; } - if(!this.__bn_257(var5 + 128, var9, var6)) { + if (!this.method301(var5 + 128, var9, var6)) { return false; } @@ -2285,37 +2268,37 @@ public class Scene { } } - return !this.__bn_257(var5 + 64, var10, var6 + 64)?false:(var4 == 16?this.__bn_257(var5, var9, var6 + 128):(var4 == 32?this.__bn_257(var5 + 128, var9, var6 + 128):(var4 == 64?this.__bn_257(var5 + 128, var9, var6):(var4 == 128?this.__bn_257(var5, var9, var6):true)))); + return !this.method301(var5 + 64, var10, var6 + 64) ? false : (var4 == 16 ? this.method301(var5, var9, var6 + 128) : (var4 == 32 ? this.method301(var5 + 128, var9, var6 + 128) : (var4 == 64 ? this.method301(var5 + 128, var9, var6) : (var4 == 128 ? this.method301(var5, var9, var6) : true)))); } } @ObfuscatedName("bs") - boolean __bs_255(int var1, int var2, int var3, int var4) { - if(!this.__ba_253(var1, var2, var3)) { + boolean method299(int var1, int var2, int var3, int var4) { + if (!this.method297(var1, var2, var3)) { return false; } else { int var5 = var2 << 7; int var6 = var3 << 7; - return this.__bn_257(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.__bn_257(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.__bn_257(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.__bn_257(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); + return this.method301(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method301(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method301(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method301(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); } } @ObfuscatedName("bq") - boolean __bq_256(int var1, int var2, int var3, int var4, int var5, int var6) { + boolean method300(int var1, int var2, int var3, int var4, int var5, int var6) { int var7; int var8; - if(var3 == var2 && var5 == var4) { - if(!this.__ba_253(var1, var2, var4)) { + if (var3 == var2 && var5 == var4) { + if (!this.method297(var1, var2, var4)) { return false; } else { var7 = var2 << 7; var8 = var4 << 7; - return this.__bn_257(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.__bn_257(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.__bn_257(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.__bn_257(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); + return this.method301(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method301(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method301(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method301(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); } } else { - for(var7 = var2; var7 <= var3; ++var7) { - for(var8 = var4; var8 <= var5; ++var8) { - if(this.__x[var1][var7][var8] == -Scene_drawnCount) { + for (var7 = var2; var7 <= var3; ++var7) { + for (var8 = var4; var8 <= var5; ++var8) { + if (this.field769[var1][var7][var8] == -Scene_drawnCount) { return false; } } @@ -2324,17 +2307,17 @@ public class Scene { var7 = (var2 << 7) + 1; var8 = (var4 << 7) + 2; int var9 = this.tileHeights[var1][var2][var4] - var6; - if(!this.__bn_257(var7, var9, var8)) { + if (!this.method301(var7, var9, var8)) { return false; } else { int var10 = (var3 << 7) - 1; - if(!this.__bn_257(var10, var9, var8)) { + if (!this.method301(var10, var9, var8)) { return false; } else { int var11 = (var5 << 7) - 1; - if(!this.__bn_257(var7, var9, var11)) { + if (!this.method301(var7, var9, var11)) { return false; - } else if(!this.__bn_257(var10, var9, var11)) { + } else if (!this.method301(var10, var9, var11)) { return false; } else { return true; @@ -2345,66 +2328,66 @@ public class Scene { } @ObfuscatedName("bn") - boolean __bn_257(int var1, int var2, int var3) { - for(int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { + boolean method301(int var1, int var2, int var3) { + for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { Occluder var5 = Scene_currentOccluders[var4]; int var6; int var7; int var8; int var9; int var10; - if(var5.__k == 1) { + if (var5.field656 == 1) { var6 = var5.minX - var1; - if(var6 > 0) { - var7 = (var6 * var5.__a >> 8) + var5.minZ; - var8 = (var6 * var5.__z >> 8) + var5.maxZ; - var9 = (var6 * var5.__j >> 8) + var5.minY; - var10 = (var6 * var5.__s >> 8) + var5.maxY; - if(var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { + if (var6 > 0) { + var7 = (var6 * var5.field659 >> 8) + var5.minZ; + var8 = (var6 * var5.field660 >> 8) + var5.maxZ; + var9 = (var6 * var5.field661 >> 8) + var5.minY; + var10 = (var6 * var5.field662 >> 8) + var5.maxY; + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if(var5.__k == 2) { + } else if (var5.field656 == 2) { var6 = var1 - var5.minX; - if(var6 > 0) { - var7 = (var6 * var5.__a >> 8) + var5.minZ; - var8 = (var6 * var5.__z >> 8) + var5.maxZ; - var9 = (var6 * var5.__j >> 8) + var5.minY; - var10 = (var6 * var5.__s >> 8) + var5.maxY; - if(var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { + if (var6 > 0) { + var7 = (var6 * var5.field659 >> 8) + var5.minZ; + var8 = (var6 * var5.field660 >> 8) + var5.maxZ; + var9 = (var6 * var5.field661 >> 8) + var5.minY; + var10 = (var6 * var5.field662 >> 8) + var5.maxY; + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if(var5.__k == 3) { + } else if (var5.field656 == 3) { var6 = var5.minZ - var3; - if(var6 > 0) { - var7 = (var6 * var5.__n >> 8) + var5.minX; - var8 = (var6 * var5.__i >> 8) + var5.maxX; - var9 = (var6 * var5.__j >> 8) + var5.minY; - var10 = (var6 * var5.__s >> 8) + var5.maxY; - if(var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { + if (var6 > 0) { + var7 = (var6 * var5.field657 >> 8) + var5.minX; + var8 = (var6 * var5.field658 >> 8) + var5.maxX; + var9 = (var6 * var5.field661 >> 8) + var5.minY; + var10 = (var6 * var5.field662 >> 8) + var5.maxY; + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if(var5.__k == 4) { + } else if (var5.field656 == 4) { var6 = var3 - var5.minZ; - if(var6 > 0) { - var7 = (var6 * var5.__n >> 8) + var5.minX; - var8 = (var6 * var5.__i >> 8) + var5.maxX; - var9 = (var6 * var5.__j >> 8) + var5.minY; - var10 = (var6 * var5.__s >> 8) + var5.maxY; - if(var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { + if (var6 > 0) { + var7 = (var6 * var5.field657 >> 8) + var5.minX; + var8 = (var6 * var5.field658 >> 8) + var5.maxX; + var9 = (var6 * var5.field661 >> 8) + var5.minY; + var10 = (var6 * var5.field662 >> 8) + var5.maxY; + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if(var5.__k == 5) { + } else if (var5.field656 == 5) { var6 = var2 - var5.minY; - if(var6 > 0) { - var7 = (var6 * var5.__n >> 8) + var5.minX; - var8 = (var6 * var5.__i >> 8) + var5.maxX; - var9 = (var6 * var5.__a >> 8) + var5.minZ; - var10 = (var6 * var5.__z >> 8) + var5.maxZ; - if(var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { + if (var6 > 0) { + var7 = (var6 * var5.field657 >> 8) + var5.minX; + var8 = (var6 * var5.field658 >> 8) + var5.maxX; + var9 = (var6 * var5.field659 >> 8) + var5.minZ; + var10 = (var6 * var5.field660 >> 8) + var5.maxZ; + if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { return true; } } @@ -2447,10 +2430,10 @@ public class Scene { int var7; int var8; int var9; + int var10; int var11; - int var12; - for(var6 = 128; var6 <= 383; var6 += 32) { - for(var7 = 0; var7 < 2048; var7 += 64) { + for (var6 = 128; var6 <= 383; var6 += 32) { + for (var7 = 0; var7 < 2048; var7 += 64) { Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; @@ -2458,50 +2441,50 @@ public class Scene { var8 = (var6 - 128) / 32; var9 = var7 / 64; - for(int var10 = -26; var10 < 26; ++var10) { - for(var11 = -26; var11 < 26; ++var11) { - var12 = var10 * 128; - int var13 = var11 * 128; + for (int var12 = -26; var12 < 26; ++var12) { + for (var10 = -26; var10 < 26; ++var10) { + var11 = var12 * 128; + int var13 = var10 * 128; boolean var14 = false; - for(int var15 = -var1; var15 <= var2; var15 += 128) { - if(method3100(var12, var0[var8] + var15, var13)) { + for (int var15 = -var1; var15 <= var2; var15 += 128) { + if (method3100(var11, var0[var8] + var15, var13)) { var14 = true; break; } } - var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; + var5[var8][var9][var12 + 1 + 25][var10 + 1 + 25] = var14; } } } } - for(var6 = 0; var6 < 8; ++var6) { - for(var7 = 0; var7 < 32; ++var7) { - for(var8 = -25; var8 < 25; ++var8) { - for(var9 = -25; var9 < 25; ++var9) { + for (var6 = 0; var6 < 8; ++var6) { + for (var7 = 0; var7 < 32; ++var7) { + for (var8 = -25; var8 < 25; ++var8) { + for (var9 = -25; var9 < 25; ++var9) { boolean var16 = false; label76: - for(var11 = -1; var11 <= 1; ++var11) { - for(var12 = -1; var12 <= 1; ++var12) { - if(var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { + for (var10 = -1; var10 <= 1; ++var10) { + for (var11 = -1; var11 <= 1; ++var11) { + if (var5[var6][var7][var8 + var10 + 1 + 25][var9 + var11 + 1 + 25]) { var16 = true; break label76; } - if(var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { + if (var5[var6][(var7 + 1) % 31][var8 + var10 + 1 + 25][var9 + var11 + 1 + 25]) { var16 = true; break label76; } - if(var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { + if (var5[var6 + 1][var7][var8 + var10 + 1 + 25][var9 + var11 + 1 + 25]) { var16 = true; break label76; } - if(var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { + if (var5[var6 + 1][(var7 + 1) % 31][var8 + var10 + 1 + 25][var9 + var11 + 1 + 25]) { var16 = true; break label76; } @@ -2522,7 +2505,7 @@ public class Scene { int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; - if(var5 >= 50 && var5 <= 3500) { + if (var5 >= 50 && var5 <= 3500) { int var7 = var3 * 128 / var5 + Scene_viewportXCenter; int var8 = var6 * 128 / var5 + Scene_viewportYCenter; return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; @@ -2545,9 +2528,9 @@ public class Scene { @ObfuscatedName("ax") static final int method3108(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; - if(var1 < 2) { + if (var1 < 2) { var1 = 2; - } else if(var1 > 126) { + } else if (var1 > 126) { var1 = 126; } @@ -2557,19 +2540,47 @@ public class Scene { @Export("containsBounds") @ObfuscatedName("af") static boolean containsBounds(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if(var1 < var2 && var1 < var3 && var1 < var4) { + if (var1 < var2 && var1 < var3 && var1 < var4) { return false; - } else if(var1 > var2 && var1 > var3 && var1 > var4) { + } else if (var1 > var2 && var1 > var3 && var1 > var4) { return false; - } else if(var0 < var5 && var0 < var6 && var0 < var7) { + } else if (var0 < var5 && var0 < var6 && var0 < var7) { return false; - } else if(var0 > var5 && var0 > var6 && var0 > var7) { + } else if (var0 > var5 && var0 > var6 && var0 > var7) { return false; } else { int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); - return var8 == 0?(var9 != 0?(var9 < 0?var10 <= 0:var10 >= 0):true):(var8 < 0?var9 <= 0 && var10 <= 0:var9 >= 0 && var10 >= 0); + return var8 == 0 ? (var9 != 0 ? (var9 < 0 ? var10 <= 0 : var10 >= 0) : true) : (var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0); } } + + static { + Scene_isLowDetail = true; + tileUpdateCount = 0; + Scene_plane = 0; + Scene_gameObjects = new GameObject[100]; + checkClick = false; + Scene_selectedPlane = 0; + Scene_selectedScreenX = 0; + Scene_selectedScreenY = 0; + Scene_selectedX = -1; + Scene_selectedY = -1; + viewportWalking = false; + Scene_planesCount = 4; + Scene_planeOccluderCounts = new int[Scene_planesCount]; + Scene_planeOccluders = new Occluder[Scene_planesCount][500]; + Scene_currentOccludersCount = 0; + Scene_currentOccluders = new Occluder[500]; + Scene_tilesDeque = new NodeDeque(); + field762 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; + field763 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; + field764 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; + field765 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; + field766 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; + field767 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; + field768 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; + visibilityMap = new boolean[8][32][51][51]; + } } diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java index 585a8793b2..83c0f47574 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -53,16 +53,12 @@ public class Script extends DualNode { @Export("switches") IterableNodeHashTable[] switches; - static { - Script_cached = new EvictingDualNodeHashTable(128); - } - @ObfuscatedName("o") @ObfuscatedSignature( signature = "(II)[Llh;", garbageValue = "-729647116" ) - IterableNodeHashTable[] __o_164(int var1) { + IterableNodeHashTable[] method302(int var1) { return new IterableNodeHashTable[var1]; } @@ -73,9 +69,10 @@ public class Script extends DualNode { ) static void method2216(int var0) { ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if(var1 != null) { + if (var1 != null) { var1.remove(); } + } @ObfuscatedName("e") @@ -115,23 +112,26 @@ public class Script extends DualNode { garbageValue = "-1584807244" ) static void method2201(SequenceDefinition var0, int var1, int var2, int var3) { - if(Client.soundEffectCount < 50 && Client.__client_qc != 0) { - if(var0.__e != null && var1 < var0.__e.length) { - int var4 = var0.__e[var1]; - if(var4 != 0) { - int var5 = var4 >> 8; - int var6 = var4 >> 4 & 7; - int var7 = var4 & 15; - Client.soundEffectIds[Client.soundEffectCount] = var5; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; - Client.soundEffects[Client.soundEffectCount] = null; - int var8 = (var2 - 64) / 128; - int var9 = (var3 - 64) / 128; - Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); - ++Client.soundEffectCount; - } + if (Client.soundEffectCount < 50 && Client.field115 != 0 && var0.field776 != null && var1 < var0.field776.length) { + int var4 = var0.field776[var1]; + if (var4 != 0) { + int var5 = var4 >> 8; + int var6 = var4 >> 4 & 7; + int var7 = var4 & 15; + Client.soundEffectIds[Client.soundEffectCount] = var5; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; + Client.soundEffects[Client.soundEffectCount] = null; + int var8 = (var2 - 64) / 128; + int var9 = (var3 - 64) / 128; + Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); + ++Client.soundEffectCount; } } + + } + + static { + Script_cached = new EvictingDualNodeHashTable(128); } } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index a772be2e8d..328851d6dc 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -74,7 +74,7 @@ public class ScriptEvent extends Node { @ObfuscatedGetter( intValue = -2138736593 ) - int __d; + int field772; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -161292529 @@ -112,51 +112,51 @@ public class ScriptEvent extends Node { garbageValue = "0" ) static int method1185(int var0, Script var1, boolean var2) { - Widget var3 = var2?WorldMapIcon1.__t_i:class12.__n_n; - if(var0 == 1600) { + Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + if (var0 == 1600) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollX; return 1; - } else if(var0 == 1601) { + } else if (var0 == 1601) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollY; return 1; - } else if(var0 == 1602) { + } else if (var0 == 1602) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; return 1; - } else if(var0 == 1603) { + } else if (var0 == 1603) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollWidth; return 1; - } else if(var0 == 1604) { + } else if (var0 == 1604) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollHeight; return 1; - } else if(var0 == 1605) { + } else if (var0 == 1605) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelZoom; return 1; - } else if(var0 == 1606) { + } else if (var0 == 1606) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleX; return 1; - } else if(var0 == 1607) { + } else if (var0 == 1607) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleZ; return 1; - } else if(var0 == 1608) { + } else if (var0 == 1608) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleY; return 1; - } else if(var0 == 1609) { + } else if (var0 == 1609) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.transparency; return 1; - } else if(var0 == 1610) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.__af; + } else if (var0 == 1610) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.field960; return 1; - } else if(var0 == 1611) { + } else if (var0 == 1611) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color; return 1; - } else if(var0 == 1612) { + } else if (var0 == 1612) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color2; return 1; - } else if(var0 == 1613) { + } else if (var0 == 1613) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.rectangleMode.rsOrdinal(); return 1; - } else if(var0 == 1614) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.__bv?1:0; + } else if (var0 == 1614) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.field964 ? 1 : 0; return 1; } else { return 2; @@ -169,119 +169,119 @@ public class ScriptEvent extends Node { garbageValue = "1256509027" ) static int method1187(int var0, Script var1, boolean var2) { - if(var0 == 3300) { + if (var0 == 3300) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cycle; return 1; } else { int var3; int var4; - if(var0 == 3301) { + if (var0 == 3301) { 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) { + } else if (var0 == 3302) { 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) { + } else if (var0 == 3303) { 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) { + } else if (var0 == 3304) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class231.method4523(var3).size; return 1; - } else if(var0 == 3305) { + } else if (var0 == 3305) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; return 1; - } else if(var0 == 3306) { + } else if (var0 == 3306) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.levels[var3]; return 1; - } else if(var0 == 3307) { + } else if (var0 == 3307) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.experience[var3]; return 1; } else { int var5; - if(var0 == 3308) { + if (var0 == 3308) { var3 = SoundSystem.plane; var4 = (Canvas.localPlayer.x >> 7) + class50.baseX; var5 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); return 1; - } else if(var0 == 3309) { + } else if (var0 == 3309) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; return 1; - } else if(var0 == 3310) { + } else if (var0 == 3310) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 >> 28; return 1; - } else if(var0 == 3311) { + } else if (var0 == 3311) { 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[++RouteStrategy.Interpreter_intStackSize - 1] = Client.isMembersWorld?1:0; + } else if (var0 == 3312) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; return 1; - } else if(var0 == 3313) { + } else if (var0 == 3313) { 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) { + } else if (var0 == 3314) { 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) { + } else if (var0 == 3315) { 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) { + } else if (var0 == 3316) { + if (Client.rights >= 2) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rights; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; - } else if(var0 == 3317) { + } else if (var0 == 3317) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rebootTimer; return 1; - } else if(var0 == 3318) { + } else if (var0 == 3318) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.worldId; return 1; - } else if(var0 == 3321) { + } else if (var0 == 3321) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.runEnergy; return 1; - } else if(var0 == 3322) { + } else if (var0 == 3322) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.weight; return 1; - } else if(var0 == 3323) { - if(Client.__client_mn) { + } else if (var0 == 3323) { + if (Client.field155) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; - } else if(var0 == 3324) { + } else if (var0 == 3324) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.worldProperties; return 1; - } else if(var0 == 3325) { + } else if (var0 == 3325) { RouteStrategy.Interpreter_intStackSize -= 4; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -307,12 +307,12 @@ public class ScriptEvent extends Node { static void method1183(int var0, int var1) { int[] var2 = new int[9]; - for(int var3 = 0; var3 < var2.length; ++var3) { + for (int var3 = 0; var3 < var2.length; ++var3) { int var4 = var3 * 32 + 15 + 128; int var5 = var4 * 3 + 600; - int var7 = Rasterizer3D.Rasterizer3D_sine[var4]; - int var6 = method1176(var5, var1); - var2[var3] = var6 * var7 >> 16; + int var6 = Rasterizer3D.Rasterizer3D_sine[var4]; + int var7 = method1176(var5, var1); + var2[var3] = var7 * var6 >> 16; } Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334); @@ -325,13 +325,13 @@ public class ScriptEvent extends Node { ) static int method1176(int var0, int var1) { int var2 = var1 - 334; - if(var2 < 0) { + if (var2 < 0) { var2 = 0; - } else if(var2 > 100) { + } else if (var2 > 100) { var2 = 100; } - int var3 = (Client.__client_rb - Client.__client_re) * var2 / 100 + Client.__client_re; + int var3 = (Client.field149 - Client.field150) * var2 / 100 + Client.field150; return var0 * var3 / 256; } @@ -341,8 +341,8 @@ public class ScriptEvent extends Node { garbageValue = "35" ) static final void method1179() { - for(class68 var0 = (class68)Client.__client_kh.last(); var0 != null; var0 = (class68)Client.__client_kh.previous()) { - if(var0.field910 == -1) { + for (class68 var0 = (class68)Client.field214.last(); var0 != null; var0 = (class68)Client.field214.previous()) { + if (var0.field910 == -1) { var0.field909 = 0; class13.method165(var0); } else { diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index c31e812dc4..e86e4aea9d 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -39,9 +39,9 @@ public class ScriptFrame { public static Enumerated findEnumerated(Enumerated[] var0, int var1) { Enumerated[] var2 = var0; - for(int var3 = 0; var3 < var2.length; ++var3) { + for (int var3 = 0; var3 < var2.length; ++var3) { Enumerated var4 = var2[var3]; - if(var1 == var4.rsOrdinal()) { + if (var1 == var4.rsOrdinal()) { return var4; } } @@ -55,12 +55,12 @@ public class ScriptFrame { garbageValue = "-423549686" ) static void method1138() { - if(ClientParameter.field3645 != null) { - Client.__client_ss = Client.cycle; + if (ClientParameter.field3645 != null) { + Client.field104 = Client.cycle; ClientParameter.field3645.method4719(); - for(int var0 = 0; var0 < Client.players.length; ++var0) { - if(Client.players[var0] != null) { + for (int var0 = 0; var0 < Client.players.length; ++var0) { + if (Client.players[var0] != null) { ClientParameter.field3645.method4738((Client.players[var0].x >> 7) + class50.baseX, (Client.players[var0].y >> 7) + GraphicsObject.baseY); } } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index fcfe23f2ec..3e02c0905e 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.convertJpgToSprite(var0).pixels); + return var0 == null ? new class27() : new class27(class27.convertJpgToSprite(var0).pixels); } @ObfuscatedName("m") @@ -33,12 +33,12 @@ public class SecureRandomCallable implements Callable { ) public static VarpDefinition method1140(int var0) { VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); - if(var1 != null) { + if (var1 != null) { return var1; } else { - byte[] var2 = VarpDefinition.__ix_m.takeRecord(16, var0); + byte[] var2 = VarpDefinition.field943.takeRecord(16, var0); var1 = new VarpDefinition(); - if(var2 != null) { + if (var2 != null) { var1.read(new Buffer(var2)); } @@ -60,17 +60,17 @@ public class SecureRandomCallable implements Callable { DevicePcmPlayerProvider.method845(var1); Widget var4 = Huffman.getWidget(var0); class22.method295(var4); - if(Client.__client_mo != null) { - class22.method295(Client.__client_mo); - Client.__client_mo = null; + if (Client.field127 != null) { + class22.method295(Client.field127); + Client.field127 = null; } int var5; int var6; - for(var5 = 0; var5 < Client.menuOptionsCount; ++var5) { - if(WorldMapManager.isWidgetMenuOpcode(Client.menuOpcodes[var5])) { - if(var5 < Client.menuOptionsCount - 1) { - for(var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) { + for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) { + if (WorldMapManager.isWidgetMenuOpcode(Client.menuOpcodes[var5])) { + if (var5 < Client.menuOptionsCount - 1) { + for (var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) { Client.menuActions[var6] = Client.menuActions[var6 + 1]; Client.menuTargetNames[var6] = Client.menuTargetNames[var6 + 1]; Client.menuOpcodes[var6] = Client.menuOpcodes[var6 + 1]; @@ -91,19 +91,19 @@ public class SecureRandomCallable implements Callable { int var7 = class2.fontBold12.stringWidth("Choose Option"); int var8; - for(var8 = 0; var8 < Client.menuOptionsCount; ++var8) { + for (var8 = 0; var8 < Client.menuOptionsCount; ++var8) { Font var9 = class2.fontBold12; String var10; - if(var8 < 0) { + if (var8 < 0) { var10 = ""; - } else if(Client.menuTargetNames[var8].length() > 0) { + } else if (Client.menuTargetNames[var8].length() > 0) { var10 = Client.menuActions[var8] + " " + Client.menuTargetNames[var8]; } else { var10 = Client.menuActions[var8]; } int var11 = var9.stringWidth(var10); - if(var11 > var7) { + if (var11 > var7) { var7 = var11; } } @@ -111,20 +111,20 @@ public class SecureRandomCallable implements Callable { var7 += 8; var8 = Client.menuOptionsCount * 15 + 22; int var12 = var5 - var7 / 2; - if(var12 + var7 > SoundCache.canvasWidth) { + if (var12 + var7 > SoundCache.canvasWidth) { var12 = SoundCache.canvasWidth - var7; } - if(var12 < 0) { + if (var12 < 0) { var12 = 0; } int var13 = var6; - if(var8 + var6 > Huffman.canvasHeight) { + if (var8 + var6 > Huffman.canvasHeight) { var13 = Huffman.canvasHeight - var8; } - if(var13 < 0) { + if (var13 < 0) { var13 = 0; } @@ -134,7 +134,7 @@ public class SecureRandomCallable implements Callable { AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22; class39.revalidateWidgetScroll(Widget.widgets[var0 >> 16], var4, false); WorldMapSection3.runWidgetOnLoadListener(var1); - if(Client.rootWidgetGroup != -1) { + if (Client.rootWidgetGroup != -1) { GrandExchangeEvents.method74(Client.rootWidgetGroup, 1); } diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index d9cf7aab24..378872b26b 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -84,7 +84,7 @@ public class SecureRandomFuture { static void method2104() { Iterator var0 = Messages.Messages_hashTable.iterator(); - while(var0.hasNext()) { + while (var0.hasNext()) { Message var1 = (Message)var0.next(); var1.clearIsFromIgnored(); } diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index 0223305001..555ecbd1df 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -17,12 +17,12 @@ public class SequenceDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache __jh_f; + public static AbstractIndexCache field773; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache __jh_q; + public static AbstractIndexCache field774; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Ler;" @@ -33,7 +33,7 @@ public class SequenceDefinition extends DualNode { @ObfuscatedSignature( signature = "Ler;" ) - public static EvictingDualNodeHashTable __jh_o; + public static EvictingDualNodeHashTable field775; @ObfuscatedName("u") @Export("frameIds") public int[] frameIds; @@ -44,7 +44,7 @@ public class SequenceDefinition extends DualNode { @Export("frameLengths") public int[] frameLengths; @ObfuscatedName("e") - public int[] __e; + public int[] field776; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -736885973 @@ -52,14 +52,14 @@ public class SequenceDefinition extends DualNode { @Export("frameCount") public int frameCount; @ObfuscatedName("d") - int[] __d; + int[] field777; @ObfuscatedName("k") - public boolean __k; + public boolean field778; @ObfuscatedName("n") @ObfuscatedGetter( intValue = 1309695045 ) - public int __n; + public int field779; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -1308226131 @@ -76,38 +76,33 @@ public class SequenceDefinition extends DualNode { @ObfuscatedGetter( intValue = -28345361 ) - public int __z; + public int field780; @ObfuscatedName("j") @ObfuscatedGetter( intValue = 1339014215 ) - public int __j; + public int field781; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 2012242069 ) - public int __s; + public int field782; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 1147391369 ) - public int __t; - - static { - SequenceDefinition_cached = new EvictingDualNodeHashTable(64); - __jh_o = new EvictingDualNodeHashTable(100); - } + public int field783; SequenceDefinition() { this.frameCount = -1; - this.__k = false; - this.__n = 5; + this.field778 = false; + this.field779 = 5; this.shield = -1; this.weapon = -1; - this.__z = 99; - this.__j = -1; - this.__s = -1; - this.__t = 2; + this.field780 = 99; + this.field781 = -1; + this.field782 = -1; + this.field783 = 2; } @ObfuscatedName("f") @@ -117,9 +112,9 @@ public class SequenceDefinition extends DualNode { ) @Export("read") void read(Buffer var1) { - while(true) { + while (true) { int var2 = var1.readUnsignedByte(); - if(var2 == 0) { + if (var2 == 0) { return; } @@ -134,69 +129,72 @@ public class SequenceDefinition extends DualNode { ) @Export("readNext") void readNext(Buffer var1, int var2) { + int[] var10000; int var3; int var4; - if(var2 == 1) { - var3 = var1.__ag_302(); + if (var2 == 1) { + var3 = var1.method43(); this.frameLengths = new int[var3]; - for(var4 = 0; var4 < var3; ++var4) { - this.frameLengths[var4] = var1.__ag_302(); + for (var4 = 0; var4 < var3; ++var4) { + this.frameLengths[var4] = var1.method43(); } this.frameIds = new int[var3]; - for(var4 = 0; var4 < var3; ++var4) { - this.frameIds[var4] = var1.__ag_302(); + for (var4 = 0; var4 < var3; ++var4) { + this.frameIds[var4] = var1.method43(); } - for(var4 = 0; var4 < var3; ++var4) { - this.frameIds[var4] += var1.__ag_302() << 16; + for (var4 = 0; var4 < var3; ++var4) { + var10000 = this.frameIds; + var10000[var4] += var1.method43() << 16; } - } else if(var2 == 2) { - this.frameCount = var1.__ag_302(); - } else if(var2 == 3) { + } else if (var2 == 2) { + this.frameCount = var1.method43(); + } else if (var2 == 3) { var3 = var1.readUnsignedByte(); - this.__d = new int[var3 + 1]; + this.field777 = new int[var3 + 1]; - for(var4 = 0; var4 < var3; ++var4) { - this.__d[var4] = var1.readUnsignedByte(); + for (var4 = 0; var4 < var3; ++var4) { + this.field777[var4] = var1.readUnsignedByte(); } - this.__d[var3] = 9999999; - } else if(var2 == 4) { - this.__k = true; - } else if(var2 == 5) { - this.__n = var1.readUnsignedByte(); - } else if(var2 == 6) { - this.shield = var1.__ag_302(); - } else if(var2 == 7) { - this.weapon = var1.__ag_302(); - } else if(var2 == 8) { - this.__z = var1.readUnsignedByte(); - } else if(var2 == 9) { - this.__j = var1.readUnsignedByte(); - } else if(var2 == 10) { - this.__s = var1.readUnsignedByte(); - } else if(var2 == 11) { - this.__t = var1.readUnsignedByte(); - } else if(var2 == 12) { + this.field777[var3] = 9999999; + } else if (var2 == 4) { + this.field778 = true; + } else if (var2 == 5) { + this.field779 = var1.readUnsignedByte(); + } else if (var2 == 6) { + this.shield = var1.method43(); + } else if (var2 == 7) { + this.weapon = var1.method43(); + } else if (var2 == 8) { + this.field780 = var1.readUnsignedByte(); + } else if (var2 == 9) { + this.field781 = var1.readUnsignedByte(); + } else if (var2 == 10) { + this.field782 = var1.readUnsignedByte(); + } else if (var2 == 11) { + this.field783 = var1.readUnsignedByte(); + } else if (var2 == 12) { var3 = var1.readUnsignedByte(); this.frameIds2 = new int[var3]; - for(var4 = 0; var4 < var3; ++var4) { - this.frameIds2[var4] = var1.__ag_302(); + for (var4 = 0; var4 < var3; ++var4) { + this.frameIds2[var4] = var1.method43(); } - for(var4 = 0; var4 < var3; ++var4) { - this.frameIds2[var4] += var1.__ag_302() << 16; + for (var4 = 0; var4 < var3; ++var4) { + var10000 = this.frameIds2; + var10000[var4] += var1.method43() << 16; } - } else if(var2 == 13) { + } else if (var2 == 13) { var3 = var1.readUnsignedByte(); - this.__e = new int[var3]; + this.field776 = new int[var3]; - for(var4 = 0; var4 < var3; ++var4) { - this.__e[var4] = var1.readMedium(); + for (var4 = 0; var4 < var3; ++var4) { + this.field776[var4] = var1.readMedium(); } } @@ -209,19 +207,19 @@ public class SequenceDefinition extends DualNode { ) @Export("init") void init() { - if(this.__j == -1) { - if(this.__d != null) { - this.__j = 2; + if (this.field781 == -1) { + if (this.field777 != null) { + this.field781 = 2; } else { - this.__j = 0; + this.field781 = 0; } } - if(this.__s == -1) { - if(this.__d != null) { - this.__s = 2; + if (this.field782 == -1) { + if (this.field777 != null) { + this.field782 = 2; } else { - this.__s = 0; + this.field782 = 0; } } @@ -237,7 +235,7 @@ public class SequenceDefinition extends DualNode { var2 = this.frameIds[var2]; Frames var3 = ItemContainer.getFrames(var2 >> 16); var2 &= 65535; - if(var3 == null) { + if (var3 == null) { return var1.toSharedSequenceModel(true); } else { Model var4 = var1.toSharedSequenceModel(!var3.hasAlphaTransform(var2)); @@ -256,25 +254,25 @@ public class SequenceDefinition extends DualNode { var2 = this.frameIds[var2]; Frames var4 = ItemContainer.getFrames(var2 >> 16); var2 &= 65535; - if(var4 == null) { + if (var4 == null) { return var1.toSharedSequenceModel(true); } else { Model var5 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var2)); var3 &= 3; - if(var3 == 1) { + if (var3 == 1) { var5.rotateY270Ccw(); - } else if(var3 == 2) { + } else if (var3 == 2) { var5.rotateY180(); - } else if(var3 == 3) { + } else if (var3 == 3) { var5.rotateY90Ccw(); } var5.animate(var4, var2); - if(var3 == 1) { + if (var3 == 1) { var5.rotateY90Ccw(); - } else if(var3 == 2) { + } else if (var3 == 2) { var5.rotateY180(); - } else if(var3 == 3) { + } else if (var3 == 3) { var5.rotateY270Ccw(); } @@ -292,7 +290,7 @@ public class SequenceDefinition extends DualNode { var2 = this.frameIds[var2]; Frames var3 = ItemContainer.getFrames(var2 >> 16); var2 &= 65535; - if(var3 == null) { + if (var3 == null) { return var1.toSharedSpotAnimationModel(true); } else { Model var4 = var1.toSharedSpotAnimationModel(!var3.hasAlphaTransform(var2)); @@ -311,20 +309,20 @@ public class SequenceDefinition extends DualNode { var2 = this.frameIds[var2]; Frames var5 = ItemContainer.getFrames(var2 >> 16); var2 &= 65535; - if(var5 == null) { + if (var5 == null) { return var3.animateSequence(var1, var4); } else { var4 = var3.frameIds[var4]; Frames var6 = ItemContainer.getFrames(var4 >> 16); var4 &= 65535; Model var7; - if(var6 == null) { + if (var6 == null) { var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); var7.animate(var5, var2); return var7; } else { var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); - var7.animate2(var5, var2, var6, var4, this.__d); + var7.animate2(var5, var2, var6, var4, this.field777); return var7; } } @@ -340,19 +338,19 @@ public class SequenceDefinition extends DualNode { int var3 = this.frameIds[var2]; Frames var4 = ItemContainer.getFrames(var3 >> 16); var3 &= 65535; - if(var4 == null) { + if (var4 == null) { return var1.toSharedSequenceModel(true); } else { Frames var5 = null; int var6 = 0; - if(this.frameIds2 != null && var2 < this.frameIds2.length) { + if (this.frameIds2 != null && var2 < this.frameIds2.length) { var6 = this.frameIds2[var2]; var5 = ItemContainer.getFrames(var6 >> 16); var6 &= 65535; } Model var7; - if(var5 != null && var6 != 65535) { + if (var5 != null && var6 != 65535) { var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); var7.animate(var4, var3); var7.animate(var5, var6); @@ -364,4 +362,9 @@ public class SequenceDefinition extends DualNode { } } } + + static { + SequenceDefinition_cached = new EvictingDualNodeHashTable(64); + field775 = new EvictingDualNodeHashTable(100); + } } diff --git a/runescape-client/src/main/java/ServerBuild.java b/runescape-client/src/main/java/ServerBuild.java index cf133ba7c4..4723592ad8 100644 --- a/runescape-client/src/main/java/ServerBuild.java +++ b/runescape-client/src/main/java/ServerBuild.java @@ -11,22 +11,22 @@ public class ServerBuild { @ObfuscatedSignature( signature = "Liy;" ) - public static final ServerBuild __iy_m; + public static final ServerBuild field784; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Liy;" ) - public static final ServerBuild __iy_f; + public static final ServerBuild field785; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Liy;" ) - public static final ServerBuild __iy_q; + public static final ServerBuild field786; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Liy;" ) - public static final ServerBuild __iy_w; + public static final ServerBuild field787; @ObfuscatedName("bx") @Export("worldsUrl") static String worldsUrl; @@ -34,7 +34,7 @@ public class ServerBuild { @ObfuscatedGetter( intValue = -365366303 ) - static int __iy_lo; + static int field788; @ObfuscatedName("o") @Export("name") public final String name; @@ -45,15 +45,15 @@ public class ServerBuild { @Export("id") public final int id; - static { - __iy_m = new ServerBuild("LIVE", 0); - __iy_f = new ServerBuild("BUILDLIVE", 3); - __iy_q = new ServerBuild("RC", 1); - __iy_w = new ServerBuild("WIP", 2); - } - ServerBuild(String var1, int var2) { this.name = var1; this.id = var2; } + + static { + field784 = new ServerBuild("LIVE", 0); + field785 = new ServerBuild("BUILDLIVE", 3); + field786 = new ServerBuild("RC", 1); + field787 = new ServerBuild("WIP", 2); + } } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index c0df9ef55c..175df49e43 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -11,427 +11,427 @@ public class ServerPacket { @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_m; + public static final ServerPacket field789; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_f; + public static final ServerPacket field790; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_q; + public static final ServerPacket field791; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_w; + public static final ServerPacket field792; @ObfuscatedName("o") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_o; + public static final ServerPacket field793; @ObfuscatedName("u") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_u; + public static final ServerPacket field794; @ObfuscatedName("g") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_g; + public static final ServerPacket field795; @ObfuscatedName("l") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_l; + public static final ServerPacket field796; @ObfuscatedName("e") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_e; + public static final ServerPacket field797; @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_x; + public static final ServerPacket field798; @ObfuscatedName("d") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_d; + public static final ServerPacket field799; @ObfuscatedName("k") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_k; + public static final ServerPacket field800; @ObfuscatedName("n") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_n; + public static final ServerPacket field801; @ObfuscatedName("i") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_i; + public static final ServerPacket field802; @ObfuscatedName("a") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_a; + public static final ServerPacket field803; @ObfuscatedName("z") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_z; + public static final ServerPacket field804; @ObfuscatedName("j") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_j; + public static final ServerPacket field805; @ObfuscatedName("s") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_s; + public static final ServerPacket field806; @ObfuscatedName("t") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_t; + public static final ServerPacket field807; @ObfuscatedName("y") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_y; + public static final ServerPacket field808; @ObfuscatedName("h") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_h; + public static final ServerPacket field809; @ObfuscatedName("b") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_b; + public static final ServerPacket field810; @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_c; + public static final ServerPacket field811; @ObfuscatedName("r") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_r; + public static final ServerPacket field812; @ObfuscatedName("p") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_p; + public static final ServerPacket field813; @ObfuscatedName("v") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_v; + public static final ServerPacket field814; @ObfuscatedName("ag") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_ag; + public static final ServerPacket field815; @ObfuscatedName("aq") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_aq; + public static final ServerPacket field816; @ObfuscatedName("aj") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_aj; + public static final ServerPacket field817; @ObfuscatedName("av") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_av; + public static final ServerPacket field818; @ObfuscatedName("ar") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_ar; + public static final ServerPacket field819; @ObfuscatedName("ac") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_ac; + public static final ServerPacket field820; @ObfuscatedName("ay") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_ay; + public static final ServerPacket field821; @ObfuscatedName("ah") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_ah; + public static final ServerPacket field822; @ObfuscatedName("ak") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_ak; + public static final ServerPacket field823; @ObfuscatedName("aw") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_aw; + public static final ServerPacket field824; @ObfuscatedName("al") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_al; + public static final ServerPacket field825; @ObfuscatedName("ab") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_ab; + public static final ServerPacket field826; @ObfuscatedName("ae") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_ae; + public static final ServerPacket field827; @ObfuscatedName("at") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_at; + public static final ServerPacket field828; @ObfuscatedName("ad") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_ad; + public static final ServerPacket field829; @ObfuscatedName("ap") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_ap; + public static final ServerPacket field830; @ObfuscatedName("as") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_as; + public static final ServerPacket field831; @ObfuscatedName("am") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_am; + public static final ServerPacket field832; @ObfuscatedName("an") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_an; + public static final ServerPacket field833; @ObfuscatedName("az") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_az; + public static final ServerPacket field834; @ObfuscatedName("au") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_au; + public static final ServerPacket field835; @ObfuscatedName("ao") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_ao; + public static final ServerPacket field836; @ObfuscatedName("aa") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_aa; + public static final ServerPacket field837; @ObfuscatedName("ax") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_ax; + public static final ServerPacket field838; @ObfuscatedName("af") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_af; + public static final ServerPacket field839; @ObfuscatedName("ai") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_ai; + public static final ServerPacket field840; @ObfuscatedName("ba") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_ba; + public static final ServerPacket field841; @ObfuscatedName("bb") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_bb; + public static final ServerPacket field842; @ObfuscatedName("bs") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_bs; + public static final ServerPacket field843; @ObfuscatedName("bq") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_bq; + public static final ServerPacket field844; @ObfuscatedName("bn") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_bn; + public static final ServerPacket field845; @ObfuscatedName("bk") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_bk; + public static final ServerPacket field846; @ObfuscatedName("bd") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_bd; + public static final ServerPacket field847; @ObfuscatedName("bc") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_bc; + public static final ServerPacket field848; @ObfuscatedName("bo") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_bo; + public static final ServerPacket field849; @ObfuscatedName("bx") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_bx; + public static final ServerPacket field850; @ObfuscatedName("by") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_by; + public static final ServerPacket field851; @ObfuscatedName("bu") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_bu; + public static final ServerPacket field852; @ObfuscatedName("bm") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_bm; + public static final ServerPacket field853; @ObfuscatedName("bl") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_bl; + public static final ServerPacket field854; @ObfuscatedName("br") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_br; + public static final ServerPacket field855; @ObfuscatedName("bj") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_bj; + public static final ServerPacket field856; @ObfuscatedName("bi") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_bi; + public static final ServerPacket field857; @ObfuscatedName("bz") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_bz; + public static final ServerPacket field858; @ObfuscatedName("bg") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_bg; + public static final ServerPacket field859; @ObfuscatedName("bt") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_bt; + public static final ServerPacket field860; @ObfuscatedName("bp") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_bp; + public static final ServerPacket field861; @ObfuscatedName("bf") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_bf; + public static final ServerPacket field862; @ObfuscatedName("bh") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_bh; + public static final ServerPacket field863; @ObfuscatedName("be") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_be; + public static final ServerPacket field864; @ObfuscatedName("bv") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_bv; + public static final ServerPacket field865; @ObfuscatedName("bw") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_bw; + public static final ServerPacket field866; @ObfuscatedName("cr") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_cr; + public static final ServerPacket field867; @ObfuscatedName("cv") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_cv; + public static final ServerPacket field868; @ObfuscatedName("ce") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_ce; + public static final ServerPacket field869; @ObfuscatedName("cy") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_cy; + public static final ServerPacket field870; @ObfuscatedName("cs") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_cs; + public static final ServerPacket field871; @ObfuscatedName("cm") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_cm; + public static final ServerPacket field872; @ObfuscatedName("cj") @ObfuscatedSignature( signature = "Lge;" ) - public static final ServerPacket __ge_cj; + public static final ServerPacket field873; @ObfuscatedName("ix") @ObfuscatedGetter( intValue = -1645409107 @@ -451,94 +451,6 @@ public class ServerPacket { @Export("length") public final int length; - static { - __ge_m = new ServerPacket(0, -2); - __ge_f = new ServerPacket(1, 0); - __ge_q = new ServerPacket(2, 0); - __ge_w = new ServerPacket(3, -1); - __ge_o = new ServerPacket(4, 6); - __ge_u = new ServerPacket(5, 4); - __ge_g = new ServerPacket(6, 4); - __ge_l = new ServerPacket(7, 4); - __ge_e = new ServerPacket(8, 6); - __ge_x = new ServerPacket(9, 4); - __ge_d = new ServerPacket(10, -2); - __ge_k = new ServerPacket(11, 15); - __ge_n = new ServerPacket(12, 5); - __ge_i = new ServerPacket(13, 2); - __ge_a = new ServerPacket(14, 3); - __ge_z = new ServerPacket(15, 7); - __ge_j = new ServerPacket(16, 1); - __ge_s = new ServerPacket(17, -2); - __ge_t = new ServerPacket(18, -2); - __ge_y = new ServerPacket(19, -2); - __ge_h = new ServerPacket(20, 10); - __ge_b = new ServerPacket(21, 5); - __ge_c = new ServerPacket(22, 6); - __ge_r = new ServerPacket(23, 2); - __ge_p = new ServerPacket(24, 6); - __ge_v = new ServerPacket(25, 2); - __ge_ag = new ServerPacket(26, 5); - __ge_aq = new ServerPacket(27, -2); - __ge_aj = new ServerPacket(28, 0); - __ge_av = new ServerPacket(29, 0); - __ge_ar = new ServerPacket(30, 4); - __ge_ac = new ServerPacket(31, 6); - __ge_ay = new ServerPacket(32, -2); - __ge_ah = new ServerPacket(33, -2); - __ge_ak = new ServerPacket(34, 1); - __ge_aw = new ServerPacket(35, 6); - __ge_al = new ServerPacket(36, 6); - __ge_ab = new ServerPacket(37, -1); - __ge_ae = new ServerPacket(38, -2); - __ge_at = new ServerPacket(39, 4); - __ge_ad = new ServerPacket(40, 5); - __ge_ap = new ServerPacket(41, 8); - __ge_as = new ServerPacket(42, 14); - __ge_am = new ServerPacket(43, -2); - __ge_an = new ServerPacket(44, -2); - __ge_az = new ServerPacket(45, -1); - __ge_au = new ServerPacket(46, 2); - __ge_ao = new ServerPacket(47, -1); - __ge_aa = new ServerPacket(48, 12); - __ge_ax = new ServerPacket(49, 4); - __ge_af = new ServerPacket(50, 10); - __ge_ai = new ServerPacket(51, -2); - __ge_ba = new ServerPacket(52, 0); - __ge_bb = new ServerPacket(53, -2); - __ge_bs = new ServerPacket(54, -1); - __ge_bq = new ServerPacket(55, 20); - __ge_bn = new ServerPacket(56, -2); - __ge_bk = new ServerPacket(57, 28); - __ge_bd = new ServerPacket(58, -2); - __ge_bc = new ServerPacket(59, 8); - __ge_bo = new ServerPacket(60, 1); - __ge_bx = new ServerPacket(61, 6); - __ge_by = new ServerPacket(62, -2); - __ge_bu = new ServerPacket(63, 3); - __ge_bm = new ServerPacket(64, 2); - __ge_bl = new ServerPacket(65, 5); - __ge_br = new ServerPacket(66, -1); - __ge_bj = new ServerPacket(67, 2); - __ge_bi = new ServerPacket(68, 1); - __ge_bz = new ServerPacket(69, 8); - __ge_bg = new ServerPacket(70, -2); - __ge_bt = new ServerPacket(71, 2); - __ge_bp = new ServerPacket(72, 2); - __ge_bf = new ServerPacket(73, 0); - __ge_bh = new ServerPacket(74, 1); - __ge_be = new ServerPacket(75, 6); - __ge_bv = new ServerPacket(76, 6); - __ge_bw = new ServerPacket(77, 7); - __ge_cr = new ServerPacket(78, 0); - __ge_cv = new ServerPacket(79, -2); - __ge_ce = new ServerPacket(80, 2); - __ge_cy = new ServerPacket(81, -2); - __ge_cs = new ServerPacket(82, 8); - __ge_cm = new ServerPacket(83, 6); - __ge_cj = new ServerPacket(84, 2); - } - ServerPacket(int var1, int var2) { this.id = var1; this.length = var2; @@ -565,7 +477,7 @@ public class ServerPacket { VarbitDefinition.indexedSpriteWidths = null; SecureRandomCallable.indexedSpriteHeights = null; class328.indexedSpritePalette = null; - class328.spritePixels = null; + class328.spritePixels = (byte[][])null; return var0; } @@ -578,18 +490,18 @@ public class ServerPacket { Buffer var10 = new Buffer(var0); int var11 = -1; - while(true) { - int var12 = var10.__at_308(); - if(var12 == 0) { + while (true) { + int var12 = var10.method49(); + if (var12 == 0) { return; } var11 += var12; int var13 = 0; - while(true) { - int var14 = var10.__ae_307(); - if(var14 == 0) { + while (true) { + int var14 = var10.method48(); + if (var14 == 0) { break; } @@ -600,48 +512,136 @@ public class ServerPacket { int var18 = var10.readUnsignedByte(); int var19 = var18 >> 2; int var20 = var18 & 3; - if(var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { + if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { ObjectDefinition var21 = class50.getObjectDefinition(var11); - int var24 = var16 & 7; - int var25 = var15 & 7; - int var27 = var21.sizeX; - int var28 = var21.sizeY; - int var29; - if((var20 & 1) == 1) { - var29 = var27; - var27 = var28; - var28 = var29; + int var22 = var16 & 7; + int var23 = var15 & 7; + int var24 = var21.sizeX; + int var25 = var21.sizeY; + int var26; + if ((var20 & 1) == 1) { + var26 = var24; + var24 = var25; + var25 = var26; } - int var26 = var7 & 3; - int var23; - if(var26 == 0) { - var23 = var24; - } else if(var26 == 1) { - var23 = var25; - } else if(var26 == 2) { - var23 = 7 - var24 - (var27 - 1); + int var27 = var7 & 3; + int var28; + if (var27 == 0) { + var28 = var22; + } else if (var27 == 1) { + var28 = var23; + } else if (var27 == 2) { + var28 = 7 - var22 - (var24 - 1); } else { - var23 = 7 - var25 - (var28 - 1); + var28 = 7 - var23 - (var25 - 1); } - var29 = var2 + var23; - int var30 = var3 + class171.method3496(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); - if(var29 > 0 && var30 > 0 && var29 < 103 && var30 < 103) { - int var31 = var1; - if((Tiles.Tiles_renderFlags[1][var29][var30] & 2) == 2) { - var31 = var1 - 1; + var26 = var2 + var28; + int var29 = var3 + class171.method3496(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); + if (var26 > 0 && var29 > 0 && var26 < 103 && var29 < 103) { + int var30 = var1; + if ((Tiles.Tiles_renderFlags[1][var26][var29] & 2) == 2) { + var30 = var1 - 1; } - CollisionMap var32 = null; - if(var31 >= 0) { - var32 = var9[var31]; + CollisionMap var31 = null; + if (var30 >= 0) { + var31 = var9[var30]; } - class227.method4446(var1, var29, var30, var11, var20 + var7 & 3, var19, var8, var32); + class227.method4446(var1, var26, var29, var11, var20 + var7 & 3, var19, var8, var31); } } } } } + + static { + field789 = new ServerPacket(0, -2); + field790 = new ServerPacket(1, 0); + field791 = new ServerPacket(2, 0); + field792 = new ServerPacket(3, -1); + field793 = new ServerPacket(4, 6); + field794 = new ServerPacket(5, 4); + field795 = new ServerPacket(6, 4); + field796 = new ServerPacket(7, 4); + field797 = new ServerPacket(8, 6); + field798 = new ServerPacket(9, 4); + field799 = new ServerPacket(10, -2); + field800 = new ServerPacket(11, 15); + field801 = new ServerPacket(12, 5); + field802 = new ServerPacket(13, 2); + field803 = new ServerPacket(14, 3); + field804 = new ServerPacket(15, 7); + field805 = new ServerPacket(16, 1); + field806 = new ServerPacket(17, -2); + field807 = new ServerPacket(18, -2); + field808 = new ServerPacket(19, -2); + field809 = new ServerPacket(20, 10); + field810 = new ServerPacket(21, 5); + field811 = new ServerPacket(22, 6); + field812 = new ServerPacket(23, 2); + field813 = new ServerPacket(24, 6); + field814 = new ServerPacket(25, 2); + field815 = new ServerPacket(26, 5); + field816 = new ServerPacket(27, -2); + field817 = new ServerPacket(28, 0); + field818 = new ServerPacket(29, 0); + field819 = new ServerPacket(30, 4); + field820 = new ServerPacket(31, 6); + field821 = new ServerPacket(32, -2); + field822 = new ServerPacket(33, -2); + field823 = new ServerPacket(34, 1); + field824 = new ServerPacket(35, 6); + field825 = new ServerPacket(36, 6); + field826 = new ServerPacket(37, -1); + field827 = new ServerPacket(38, -2); + field828 = new ServerPacket(39, 4); + field829 = new ServerPacket(40, 5); + field830 = new ServerPacket(41, 8); + field831 = new ServerPacket(42, 14); + field832 = new ServerPacket(43, -2); + field833 = new ServerPacket(44, -2); + field834 = new ServerPacket(45, -1); + field835 = new ServerPacket(46, 2); + field836 = new ServerPacket(47, -1); + field837 = new ServerPacket(48, 12); + field838 = new ServerPacket(49, 4); + field839 = new ServerPacket(50, 10); + field840 = new ServerPacket(51, -2); + field841 = new ServerPacket(52, 0); + field842 = new ServerPacket(53, -2); + field843 = new ServerPacket(54, -1); + field844 = new ServerPacket(55, 20); + field845 = new ServerPacket(56, -2); + field846 = new ServerPacket(57, 28); + field847 = new ServerPacket(58, -2); + field848 = new ServerPacket(59, 8); + field849 = new ServerPacket(60, 1); + field850 = new ServerPacket(61, 6); + field851 = new ServerPacket(62, -2); + field852 = new ServerPacket(63, 3); + field853 = new ServerPacket(64, 2); + field854 = new ServerPacket(65, 5); + field855 = new ServerPacket(66, -1); + field856 = new ServerPacket(67, 2); + field857 = new ServerPacket(68, 1); + field858 = new ServerPacket(69, 8); + field859 = new ServerPacket(70, -2); + field860 = new ServerPacket(71, 2); + field861 = new ServerPacket(72, 2); + field862 = new ServerPacket(73, 0); + field863 = new ServerPacket(74, 1); + field864 = new ServerPacket(75, 6); + field865 = new ServerPacket(76, 6); + field866 = new ServerPacket(77, 7); + field867 = new ServerPacket(78, 0); + field868 = new ServerPacket(79, -2); + field869 = new ServerPacket(80, 2); + field870 = new ServerPacket(81, -2); + field871 = new ServerPacket(82, 8); + field872 = new ServerPacket(83, 6); + field873 = new ServerPacket(84, 2); + } } diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index 5fc72906be..1f17947b6a 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -11,7 +11,7 @@ public class Skeleton extends Node { @ObfuscatedGetter( intValue = 2096389021 ) - static int __ek_x; + static int field874; @ObfuscatedName("dc") @ObfuscatedSignature( signature = "Lit;" @@ -45,16 +45,16 @@ public class Skeleton extends Node { this.labels = new int[this.count][]; int var4; - for(var4 = 0; var4 < this.count; ++var4) { + for (var4 = 0; var4 < this.count; ++var4) { this.transformTypes[var4] = var3.readUnsignedByte(); } - for(var4 = 0; var4 < this.count; ++var4) { + for (var4 = 0; var4 < this.count; ++var4) { this.labels[var4] = new int[var3.readUnsignedByte()]; } - for(var4 = 0; var4 < this.count; ++var4) { - for(int var5 = 0; var5 < this.labels[var4].length; ++var5) { + for (var4 = 0; var4 < this.count; ++var4) { + for (int var5 = 0; var5 < this.labels[var4].length; ++var5) { this.labels[var4][var5] = var3.readUnsignedByte(); } } @@ -68,24 +68,24 @@ public class Skeleton extends Node { ) static final void method3062(PacketBuffer var0, int var1) { int var2 = var0.index; - Players.__cq_n = 0; + Players.field736 = 0; int var3 = 0; var0.importIndex(); int var4; int var5; int var6; - for(var4 = 0; var4 < Players.Players_count; ++var4) { + for (var4 = 0; var4 < Players.Players_count; ++var4) { var5 = Players.Players_indices[var4]; - if((Players.__cq_q[var5] & 1) == 0) { - if(var3 > 0) { + if ((Players.field731[var5] & 1) == 0) { + if (var3 > 0) { --var3; - Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2); + Players.field731[var5] = (byte)(Players.field731[var5] | 2); } else { var6 = var0.readBits(1); - if(var6 == 0) { + if (var6 == 0) { var3 = GrandExchangeOffer.method105(var0); - Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2); + Players.field731[var5] = (byte)(Players.field731[var5] | 2); } else { class210.method4101(var0, var5); } @@ -94,22 +94,22 @@ public class Skeleton extends Node { } var0.exportIndex(); - if(var3 != 0) { + if (var3 != 0) { throw new RuntimeException(); } else { var0.importIndex(); - for(var4 = 0; var4 < Players.Players_count; ++var4) { + for (var4 = 0; var4 < Players.Players_count; ++var4) { var5 = Players.Players_indices[var4]; - if((Players.__cq_q[var5] & 1) != 0) { - if(var3 > 0) { + if ((Players.field731[var5] & 1) != 0) { + if (var3 > 0) { --var3; - Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2); + Players.field731[var5] = (byte)(Players.field731[var5] | 2); } else { var6 = var0.readBits(1); - if(var6 == 0) { + if (var6 == 0) { var3 = GrandExchangeOffer.method105(var0); - Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2); + Players.field731[var5] = (byte)(Players.field731[var5] | 2); } else { class210.method4101(var0, var5); } @@ -118,72 +118,72 @@ public class Skeleton extends Node { } var0.exportIndex(); - if(var3 != 0) { + if (var3 != 0) { throw new RuntimeException(); } else { var0.importIndex(); - for(var4 = 0; var4 < Players.__cq_l; ++var4) { - var5 = Players.__cq_e[var4]; - if((Players.__cq_q[var5] & 1) != 0) { - if(var3 > 0) { + for (var4 = 0; var4 < Players.field734; ++var4) { + var5 = Players.field735[var4]; + if ((Players.field731[var5] & 1) != 0) { + if (var3 > 0) { --var3; - Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2); + Players.field731[var5] = (byte)(Players.field731[var5] | 2); } else { var6 = var0.readBits(1); - if(var6 == 0) { + if (var6 == 0) { var3 = GrandExchangeOffer.method105(var0); - Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2); - } else if(class236.updateExternalPlayer(var0, var5)) { - Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2); + Players.field731[var5] = (byte)(Players.field731[var5] | 2); + } else if (class236.updateExternalPlayer(var0, var5)) { + Players.field731[var5] = (byte)(Players.field731[var5] | 2); } } } } var0.exportIndex(); - if(var3 != 0) { + if (var3 != 0) { throw new RuntimeException(); } else { var0.importIndex(); - for(var4 = 0; var4 < Players.__cq_l; ++var4) { - var5 = Players.__cq_e[var4]; - if((Players.__cq_q[var5] & 1) == 0) { - if(var3 > 0) { + for (var4 = 0; var4 < Players.field734; ++var4) { + var5 = Players.field735[var4]; + if ((Players.field731[var5] & 1) == 0) { + if (var3 > 0) { --var3; - Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2); + Players.field731[var5] = (byte)(Players.field731[var5] | 2); } else { var6 = var0.readBits(1); - if(var6 == 0) { + if (var6 == 0) { var3 = GrandExchangeOffer.method105(var0); - Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2); - } else if(class236.updateExternalPlayer(var0, var5)) { - Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2); + Players.field731[var5] = (byte)(Players.field731[var5] | 2); + } else if (class236.updateExternalPlayer(var0, var5)) { + Players.field731[var5] = (byte)(Players.field731[var5] | 2); } } } } var0.exportIndex(); - if(var3 != 0) { + if (var3 != 0) { throw new RuntimeException(); } else { Players.Players_count = 0; - Players.__cq_l = 0; + Players.field734 = 0; - for(var4 = 1; var4 < 2048; ++var4) { - Players.__cq_q[var4] = (byte)(Players.__cq_q[var4] >> 1); + for (var4 = 1; var4 < 2048; ++var4) { + Players.field731[var4] = (byte)(Players.field731[var4] >> 1); Player var7 = Client.players[var4]; - if(var7 != null) { + if (var7 != null) { Players.Players_indices[++Players.Players_count - 1] = var4; } else { - Players.__cq_e[++Players.__cq_l - 1] = var4; + Players.field735[++Players.field734 - 1] = var4; } } class21.method293(var0); - if(var0.index - var2 != var1) { + if (var0.index - var2 != var1) { throw new RuntimeException(var0.index - var2 + " " + var1); } } diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index ae1e7c6b0a..a35cc48a35 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -13,21 +13,7 @@ public class Skills { @Export("Skills_experienceTable") public static int[] Skills_experienceTable; @ObfuscatedName("ef") - static int[] __hc_ef; - - static { - Skills_enabled = new boolean[]{true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false}; - Skills_experienceTable = new int[99]; - int var0 = 0; - - for(int var1 = 0; var1 < 99; ++var1) { - int var2 = var1 + 1; - int var3 = (int)((double)var2 + 300.0D * Math.pow(2.0D, (double)var2 / 7.0D)); - var0 += var3; - Skills_experienceTable[var1] = var0 / 4; - } - - } + static int[] field875; @ObfuscatedName("m") @ObfuscatedSignature( @@ -37,49 +23,49 @@ public class Skills { @Export("getItemDefinition") public static ItemDefinition getItemDefinition(int var0) { ItemDefinition var1 = (ItemDefinition)ItemDefinition.ItemDefinition_cached.get((long)var0); - if(var1 != null) { + if (var1 != null) { return var1; } else { byte[] var2 = ItemDefinition.ItemDefinition_indexCache.takeRecord(10, var0); var1 = new ItemDefinition(); var1.id = var0; - if(var2 != null) { + if (var2 != null) { var1.read(new Buffer(var2)); } var1.post(); - if(var1.noteTemplate != -1) { - var1.__o_426(getItemDefinition(var1.noteTemplate), getItemDefinition(var1.note)); + if (var1.noteTemplate != -1) { + var1.method140(getItemDefinition(var1.noteTemplate), getItemDefinition(var1.note)); } - if(var1.notedId != -1) { - var1.__u_427(getItemDefinition(var1.notedId), getItemDefinition(var1.unnotedId)); + if (var1.notedId != -1) { + var1.method141(getItemDefinition(var1.notedId), getItemDefinition(var1.unnotedId)); } - if(var1.placeholderTemplate != -1) { - var1.__g_428(getItemDefinition(var1.placeholderTemplate), getItemDefinition(var1.placeholder)); + if (var1.placeholderTemplate != -1) { + var1.method142(getItemDefinition(var1.placeholderTemplate), getItemDefinition(var1.placeholder)); } - if(!class30.inMembersWorld && var1.isMembersOnly) { + if (!class30.inMembersWorld && var1.isMembersOnly) { var1.name = "Members object"; var1.isTradable = false; var1.groundActions = null; var1.inventoryActions = null; var1.shiftClickIndex0 = -1; var1.int1 = 0; - if(var1.params != null) { + if (var1.params != null) { boolean var3 = false; - for(Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { + for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { ParamKeyDefinition var5 = class229.getParamKeyDefinition((int)var4.key); - if(var5.isMembersOnly) { + if (var5.isMembersOnly) { var4.remove(); } else { var3 = true; } } - if(!var3) { + if (!var3) { var1.params = null; } } @@ -89,4 +75,18 @@ public class Skills { return var1; } } + + static { + Skills_enabled = new boolean[]{true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false}; + Skills_experienceTable = new int[99]; + int var0 = 0; + + for (int var1 = 0; var1 < 99; ++var1) { + int var2 = var1 + 1; + int var3 = (int)((double)var2 + 300.0D * Math.pow(2.0D, (double)var2 / 7.0D)); + var0 += var3; + Skills_experienceTable[var1] = var0 / 4; + } + + } } diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java index 11816e754e..273e1d1d91 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -59,18 +59,18 @@ public class SoundCache { var4 |= var1 << 16; long var5 = (long)var4; RawSound var7 = (RawSound)this.rawSounds.get(var5); - if(var7 != null) { + if (var7 != null) { return var7; - } else if(var3 != null && var3[0] <= 0) { + } else if (var3 != null && var3[0] <= 0) { return null; } else { SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2); - if(var8 == null) { + if (var8 == null) { return null; } else { var7 = var8.toRawSound(); this.rawSounds.put(var7, var5); - if(var3 != null) { + if (var3 != null) { var3[0] -= var7.samples.length; } @@ -90,15 +90,15 @@ public class SoundCache { var4 |= var1 << 16; long var5 = (long)var4 ^ 4294967296L; RawSound var7 = (RawSound)this.rawSounds.get(var5); - if(var7 != null) { + if (var7 != null) { return var7; - } else if(var3 != null && var3[0] <= 0) { + } else if (var3 != null && var3[0] <= 0) { return null; } else { MusicSample var8 = (MusicSample)this.musicSamples.get(var5); - if(var8 == null) { + if (var8 == null) { var8 = MusicSample.readMusicSample(this.musicSampleIndex, var1, var2); - if(var8 == null) { + if (var8 == null) { return null; } @@ -106,7 +106,7 @@ public class SoundCache { } var7 = var8.toRawSound(var3); - if(var7 == null) { + if (var7 == null) { return null; } else { var8.remove(); @@ -123,9 +123,9 @@ public class SoundCache { ) @Export("getSoundEffect") public RawSound getSoundEffect(int var1, int[] var2) { - if(this.soundEffectIndex.__t_397() == 1) { + if (this.soundEffectIndex.method5() == 1) { return this.getSoundEffect0(0, var1, var2); - } else if(this.soundEffectIndex.__s_396(var1) == 1) { + } else if (this.soundEffectIndex.method4(var1) == 1) { return this.getSoundEffect0(var1, 0, var2); } else { throw new RuntimeException(); @@ -139,9 +139,9 @@ public class SoundCache { ) @Export("getMusicSample") public RawSound getMusicSample(int var1, int[] var2) { - if(this.musicSampleIndex.__t_397() == 1) { + if (this.musicSampleIndex.method5() == 1) { return this.getMusicSample0(0, var1, var2); - } else if(this.musicSampleIndex.__s_396(var1) == 1) { + } else if (this.musicSampleIndex.method4(var1) == 1) { return this.getMusicSample0(var1, 0, var2); } else { throw new RuntimeException(); @@ -157,66 +157,68 @@ public class SoundCache { public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { int var5 = var2 - var1; - for(int var6 = 0; var6 < var5; ++var6) { + for (int var6 = 0; var6 < var5; ++var6) { char var7 = var0.charAt(var6 + var1); - if(var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { - var3[var6 + var4] = (byte)var7; - } else if(var7 == 8364) { - var3[var6 + var4] = -128; - } else if(var7 == 8218) { - var3[var6 + var4] = -126; - } else if(var7 == 402) { - var3[var6 + var4] = -125; - } else if(var7 == 8222) { - var3[var6 + var4] = -124; - } else if(var7 == 8230) { - var3[var6 + var4] = -123; - } else if(var7 == 8224) { - var3[var6 + var4] = -122; - } else if(var7 == 8225) { - var3[var6 + var4] = -121; - } else if(var7 == 710) { - var3[var6 + var4] = -120; - } else if(var7 == 8240) { - var3[var6 + var4] = -119; - } else if(var7 == 352) { - var3[var6 + var4] = -118; - } else if(var7 == 8249) { - var3[var6 + var4] = -117; - } else if(var7 == 338) { - var3[var6 + var4] = -116; - } else if(var7 == 381) { - var3[var6 + var4] = -114; - } else if(var7 == 8216) { - var3[var6 + var4] = -111; - } else if(var7 == 8217) { - var3[var6 + var4] = -110; - } else if(var7 == 8220) { - var3[var6 + var4] = -109; - } else if(var7 == 8221) { - var3[var6 + var4] = -108; - } else if(var7 == 8226) { - var3[var6 + var4] = -107; - } else if(var7 == 8211) { - var3[var6 + var4] = -106; - } else if(var7 == 8212) { - var3[var6 + var4] = -105; - } else if(var7 == 732) { - var3[var6 + var4] = -104; - } else if(var7 == 8482) { - var3[var6 + var4] = -103; - } else if(var7 == 353) { - var3[var6 + var4] = -102; - } else if(var7 == 8250) { - var3[var6 + var4] = -101; - } else if(var7 == 339) { - var3[var6 + var4] = -100; - } else if(var7 == 382) { - var3[var6 + var4] = -98; - } else if(var7 == 376) { - var3[var6 + var4] = -97; + if ((var7 <= 0 || var7 >= 128) && (var7 < 160 || var7 > 255)) { + if (var7 == 8364) { + var3[var6 + var4] = -128; + } else if (var7 == 8218) { + var3[var6 + var4] = -126; + } else if (var7 == 402) { + var3[var6 + var4] = -125; + } else if (var7 == 8222) { + var3[var6 + var4] = -124; + } else if (var7 == 8230) { + var3[var6 + var4] = -123; + } else if (var7 == 8224) { + var3[var6 + var4] = -122; + } else if (var7 == 8225) { + var3[var6 + var4] = -121; + } else if (var7 == 710) { + var3[var6 + var4] = -120; + } else if (var7 == 8240) { + var3[var6 + var4] = -119; + } else if (var7 == 352) { + var3[var6 + var4] = -118; + } else if (var7 == 8249) { + var3[var6 + var4] = -117; + } else if (var7 == 338) { + var3[var6 + var4] = -116; + } else if (var7 == 381) { + var3[var6 + var4] = -114; + } else if (var7 == 8216) { + var3[var6 + var4] = -111; + } else if (var7 == 8217) { + var3[var6 + var4] = -110; + } else if (var7 == 8220) { + var3[var6 + var4] = -109; + } else if (var7 == 8221) { + var3[var6 + var4] = -108; + } else if (var7 == 8226) { + var3[var6 + var4] = -107; + } else if (var7 == 8211) { + var3[var6 + var4] = -106; + } else if (var7 == 8212) { + var3[var6 + var4] = -105; + } else if (var7 == 732) { + var3[var6 + var4] = -104; + } else if (var7 == 8482) { + var3[var6 + var4] = -103; + } else if (var7 == 353) { + var3[var6 + var4] = -102; + } else if (var7 == 8250) { + var3[var6 + var4] = -101; + } else if (var7 == 339) { + var3[var6 + var4] = -100; + } else if (var7 == 382) { + var3[var6 + var4] = -98; + } else if (var7 == 376) { + var3[var6 + var4] = -97; + } else { + var3[var6 + var4] = 63; + } } else { - var3[var6 + var4] = 63; + var3[var6 + var4] = (byte)var7; } } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index f443c3306f..631add0a0c 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -25,17 +25,17 @@ public class SoundEffect { SoundEffect(Buffer var1) { this.instruments = new Instrument[10]; - for(int var2 = 0; var2 < 10; ++var2) { + for (int var2 = 0; var2 < 10; ++var2) { int var3 = var1.readUnsignedByte(); - if(var3 != 0) { + if (var3 != 0) { --var1.index; this.instruments[var2] = new Instrument(); this.instruments[var2].decode(var1); } } - this.start = var1.__ag_302(); - this.end = var1.__ag_302(); + this.start = var1.method43(); + this.end = var1.method43(); } @ObfuscatedName("f") @@ -49,28 +49,29 @@ public class SoundEffect { } @ObfuscatedName("q") - public final int __q_174() { + public final int method303() { int var1 = 9999999; int var2; - for(var2 = 0; var2 < 10; ++var2) { - if(this.instruments[var2] != null && this.instruments[var2].offset / 20 < var1) { + for (var2 = 0; var2 < 10; ++var2) { + if (this.instruments[var2] != null && this.instruments[var2].offset / 20 < var1) { var1 = this.instruments[var2].offset / 20; } } - if(this.start < this.end && this.start / 20 < var1) { + if (this.start < this.end && this.start / 20 < var1) { var1 = this.start / 20; } - if(var1 != 9999999 && var1 != 0) { - for(var2 = 0; var2 < 10; ++var2) { - if(this.instruments[var2] != null) { - this.instruments[var2].offset -= var1 * 20; + if (var1 != 9999999 && var1 != 0) { + for (var2 = 0; var2 < 10; ++var2) { + if (this.instruments[var2] != null) { + Instrument var10000 = this.instruments[var2]; + var10000.offset -= var1 * 20; } } - if(this.start < this.end) { + if (this.start < this.end) { this.start -= var1 * 20; this.end -= var1 * 20; } @@ -87,27 +88,27 @@ public class SoundEffect { int var1 = 0; int var2; - for(var2 = 0; var2 < 10; ++var2) { - if(this.instruments[var2] != null && this.instruments[var2].duration + this.instruments[var2].offset > var1) { + for (var2 = 0; var2 < 10; ++var2) { + if (this.instruments[var2] != null && this.instruments[var2].duration + this.instruments[var2].offset > var1) { var1 = this.instruments[var2].duration + this.instruments[var2].offset; } } - if(var1 == 0) { + if (var1 == 0) { return new byte[0]; } else { var2 = var1 * 22050 / 1000; byte[] var3 = new byte[var2]; - for(int var4 = 0; var4 < 10; ++var4) { - if(this.instruments[var4] != null) { + for (int var4 = 0; var4 < 10; ++var4) { + if (this.instruments[var4] != null) { int var5 = this.instruments[var4].duration * 22050 / 1000; int var6 = this.instruments[var4].offset * 22050 / 1000; int[] var7 = this.instruments[var4].synthesize(var5, this.instruments[var4].duration); - for(int var8 = 0; var8 < var5; ++var8) { + for (int var8 = 0; var8 < var5; ++var8) { int var9 = (var7[var8] >> 8) + var3[var8 + var6]; - if((var9 + 128 & -256) != 0) { + if ((var9 + 128 & -256) != 0) { var9 = var9 >> 31 ^ 127; } @@ -127,6 +128,6 @@ public class SoundEffect { @Export("readSoundEffect") public static SoundEffect readSoundEffect(AbstractIndexCache var0, int var1, int var2) { byte[] var3 = var0.takeRecord(var1, var2); - return var3 == null?null:new SoundEffect(new Buffer(var3)); + return var3 == null ? null : new SoundEffect(new Buffer(var3)); } } diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java index 633080a2f0..b5d494def3 100644 --- a/runescape-client/src/main/java/SoundEnvelope.java +++ b/runescape-client/src/main/java/SoundEnvelope.java @@ -72,9 +72,9 @@ public class SoundEnvelope { this.durations = new int[this.segments]; this.phases = new int[this.segments]; - for(int var2 = 0; var2 < this.segments; ++var2) { - this.durations[var2] = var1.__ag_302(); - this.phases[var2] = var1.__ag_302(); + for (int var2 = 0; var2 < this.segments; ++var2) { + this.durations[var2] = var1.method43(); + this.phases[var2] = var1.method43(); } } @@ -92,14 +92,14 @@ public class SoundEnvelope { @ObfuscatedName("w") @Export("doStep") final int doStep(int var1) { - if(this.max >= this.ticks) { + if (this.max >= this.ticks) { this.amplitude = this.phases[this.phaseIndex++] << 15; - if(this.phaseIndex >= this.segments) { + if (this.phaseIndex >= this.segments) { this.phaseIndex = this.segments - 1; } this.ticks = (int)((double)this.durations[this.phaseIndex] / 65536.0D * (double)var1); - if(this.ticks > this.max) { + if (this.ticks > this.max) { this.step = ((this.phases[this.phaseIndex] << 15) - this.amplitude) / (this.ticks - this.max); } } diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java index 798f86746b..e80bd0db1f 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -28,14 +28,14 @@ public class SoundSystem implements Runnable { @ObfuscatedName("run") public void run() { try { - for(int var1 = 0; var1 < 2; ++var1) { + for (int var1 = 0; var1 < 2; ++var1) { PcmPlayer var2 = this.players[var1]; - if(var2 != null) { + if (var2 != null) { var2.run(); } } - } catch (Exception var4) { - NpcDefinition.sendStackTrace((String)null, var4); + } catch (Exception var3) { + NPCDefinition.sendStackTrace((String)null, var3); } } @@ -47,11 +47,11 @@ public class SoundSystem implements Runnable { ) static Script method2451(int var0) { Script var1 = (Script)Script.Script_cached.get((long)var0); - if(var1 != null) { + if (var1 != null) { return var1; } else { byte[] var2 = Formatting.indexCache12.takeRecord(var0, 0); - if(var2 == null) { + if (var2 == null) { return null; } else { var1 = Occluder.newScript(var2); @@ -67,6 +67,6 @@ public class SoundSystem implements Runnable { garbageValue = "20" ) static void method2456() { - WorldMapRegion.__av_o.clear(); + WorldMapRegion.field1051.clear(); } } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index 84807ce61c..cc37a677b7 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -83,25 +83,20 @@ public class SpotAnimationDefinition extends DualNode { @ObfuscatedGetter( intValue = -20619847 ) - int __a; + int field876; @ObfuscatedName("z") @ObfuscatedGetter( intValue = 1866148625 ) - int __z; - - static { - SpotAnimationDefinition_cached = new EvictingDualNodeHashTable(64); - SpotAnimationDefinition_cachedModels = new EvictingDualNodeHashTable(30); - } + int field877; SpotAnimationDefinition() { this.sequence = -1; this.widthScale = 128; this.heightScale = 128; this.orientation = 0; - this.__a = 0; - this.__z = 0; + this.field876 = 0; + this.field877 = 0; } @ObfuscatedName("f") @@ -111,9 +106,9 @@ public class SpotAnimationDefinition extends DualNode { ) @Export("read") void read(Buffer var1) { - while(true) { + while (true) { int var2 = var1.readUnsignedByte(); - if(var2 == 0) { + if (var2 == 0) { return; } @@ -128,40 +123,40 @@ public class SpotAnimationDefinition extends DualNode { ) @Export("readNext") void readNext(Buffer var1, int var2) { - if(var2 == 1) { - this.archive = var1.__ag_302(); - } else if(var2 == 2) { - this.sequence = var1.__ag_302(); - } else if(var2 == 4) { - this.widthScale = var1.__ag_302(); - } else if(var2 == 5) { - this.heightScale = var1.__ag_302(); - } else if(var2 == 6) { - this.orientation = var1.__ag_302(); - } else if(var2 == 7) { - this.__a = var1.readUnsignedByte(); - } else if(var2 == 8) { - this.__z = var1.readUnsignedByte(); + if (var2 == 1) { + this.archive = var1.method43(); + } else if (var2 == 2) { + this.sequence = var1.method43(); + } else if (var2 == 4) { + this.widthScale = var1.method43(); + } else if (var2 == 5) { + this.heightScale = var1.method43(); + } else if (var2 == 6) { + this.orientation = var1.method43(); + } else if (var2 == 7) { + this.field876 = var1.readUnsignedByte(); + } else if (var2 == 8) { + this.field877 = var1.readUnsignedByte(); } else { int var3; int var4; - if(var2 == 40) { + if (var2 == 40) { var3 = var1.readUnsignedByte(); this.recolorFrom = new short[var3]; this.recolorTo = new short[var3]; - for(var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.__ag_302(); - this.recolorTo[var4] = (short)var1.__ag_302(); + for (var4 = 0; var4 < var3; ++var4) { + this.recolorFrom[var4] = (short)var1.method43(); + this.recolorTo[var4] = (short)var1.method43(); } - } else if(var2 == 41) { + } else if (var2 == 41) { var3 = var1.readUnsignedByte(); this.retextureFrom = new short[var3]; this.retextureTo = new short[var3]; - for(var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.__ag_302(); - this.retextureTo[var4] = (short)var1.__ag_302(); + for (var4 = 0; var4 < var3; ++var4) { + this.retextureFrom[var4] = (short)var1.method43(); + this.retextureTo[var4] = (short)var1.method43(); } } } @@ -176,51 +171,51 @@ public class SpotAnimationDefinition extends DualNode { @Export("getModel") public final Model getModel(int var1) { Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); - if(var2 == null) { + if (var2 == null) { ModelData var3 = ModelData.method2788(SpotAnimationDefinition_modelIndexCache, this.archive, 0); - if(var3 == null) { + if (var3 == null) { return null; } int var4; - if(this.recolorFrom != null) { - for(var4 = 0; var4 < this.recolorFrom.length; ++var4) { + if (this.recolorFrom != null) { + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { var3.recolor(this.recolorFrom[var4], this.recolorTo[var4]); } } - if(this.retextureFrom != null) { - for(var4 = 0; var4 < this.retextureFrom.length; ++var4) { + if (this.retextureFrom != null) { + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { var3.retexture(this.retextureFrom[var4], this.retextureTo[var4]); } } - var2 = var3.toModel(this.__a + 64, this.__z + 850, -30, -50, -30); + var2 = var3.toModel(this.field876 + 64, this.field877 + 850, -30, -50, -30); SpotAnimationDefinition_cachedModels.put(var2, (long)this.id); } Model var5; - if(this.sequence != -1 && var1 != -1) { + if (this.sequence != -1 && var1 != -1) { var5 = WorldMapAreaData.getSequenceDefinition(this.sequence).animateSpotAnimation(var2, var1); } else { var5 = var2.toSharedSpotAnimationModel(true); } - if(this.widthScale != 128 || this.heightScale != 128) { + if (this.widthScale != 128 || this.heightScale != 128) { var5.scale(this.widthScale, this.heightScale, this.widthScale); } - if(this.orientation != 0) { - if(this.orientation == 90) { + if (this.orientation != 0) { + if (this.orientation == 90) { var5.rotateY90Ccw(); } - if(this.orientation == 180) { + if (this.orientation == 180) { var5.rotateY90Ccw(); var5.rotateY90Ccw(); } - if(this.orientation == 270) { + if (this.orientation == 270) { var5.rotateY90Ccw(); var5.rotateY90Ccw(); var5.rotateY90Ccw(); @@ -236,6 +231,11 @@ public class SpotAnimationDefinition extends DualNode { garbageValue = "95" ) static int method4822() { - return Client.isResizable?2:1; + return Client.isResizable ? 2 : 1; + } + + static { + SpotAnimationDefinition_cached = new EvictingDualNodeHashTable(64); + SpotAnimationDefinition_cachedModels = new EvictingDualNodeHashTable(30); } } diff --git a/runescape-client/src/main/java/Sprite.java b/runescape-client/src/main/java/Sprite.java index d56f907f4a..58538a0d46 100644 --- a/runescape-client/src/main/java/Sprite.java +++ b/runescape-client/src/main/java/Sprite.java @@ -55,8 +55,8 @@ public final class Sprite extends Rasterizer2D { var1.yOffset = this.width - this.subWidth - this.yOffset; var1.xOffset = this.xOffset; - for(int var2 = 0; var2 < this.subHeight; ++var2) { - for(int var3 = 0; var3 < this.subWidth; ++var3) { + for (int var2 = 0; var2 < this.subHeight; ++var2) { + for (int var3 = 0; var3 < this.subWidth; ++var3) { var1.pixels[var3 + var2 * this.subWidth] = this.pixels[var2 * this.subWidth + this.subWidth - 1 - var3]; } } @@ -72,8 +72,8 @@ public final class Sprite extends Rasterizer2D { public Sprite copyNormalized() { Sprite var1 = new Sprite(this.width, this.height); - for(int var2 = 0; var2 < this.subHeight; ++var2) { - for(int var3 = 0; var3 < this.subWidth; ++var3) { + for (int var2 = 0; var2 < this.subHeight; ++var2) { + for (int var3 = 0; var3 < this.subWidth; ++var3) { var1.pixels[var3 + (var2 + this.xOffset) * this.width + this.yOffset] = this.pixels[var3 + var2 * this.subWidth]; } } @@ -90,11 +90,11 @@ public final class Sprite extends Rasterizer2D { @ObfuscatedName("w") @Export("normalize") public void normalize() { - if(this.subWidth != this.width || this.subHeight != this.height) { + if (this.subWidth != this.width || this.subHeight != this.height) { int[] var1 = new int[this.width * this.height]; - for(int var2 = 0; var2 < this.subHeight; ++var2) { - for(int var3 = 0; var3 < this.subWidth; ++var3) { + for (int var2 = 0; var2 < this.subHeight; ++var2) { + for (int var3 = 0; var3 < this.subWidth; ++var3) { var1[var3 + (var2 + this.xOffset) * this.width + this.yOffset] = this.pixels[var3 + var2 * this.subWidth]; } } @@ -105,28 +105,29 @@ public final class Sprite extends Rasterizer2D { this.yOffset = 0; this.xOffset = 0; } + } @ObfuscatedName("o") - public void __o_499(int var1) { - if(this.subWidth != this.width || this.subHeight != this.height) { + public void method304(int var1) { + if (this.subWidth != this.width || this.subHeight != this.height) { int var2 = var1; - if(var1 > this.yOffset) { + if (var1 > this.yOffset) { var2 = this.yOffset; } int var3 = var1; - if(var1 + this.yOffset + this.subWidth > this.width) { + if (var1 + this.yOffset + this.subWidth > this.width) { var3 = this.width - this.yOffset - this.subWidth; } int var4 = var1; - if(var1 > this.xOffset) { + if (var1 > this.xOffset) { var4 = this.xOffset; } int var5 = var1; - if(var1 + this.xOffset + this.subHeight > this.height) { + if (var1 + this.xOffset + this.subHeight > this.height) { var5 = this.height - this.xOffset - this.subHeight; } @@ -134,8 +135,8 @@ public final class Sprite extends Rasterizer2D { int var7 = var4 + var5 + this.subHeight; int[] var8 = new int[var6 * var7]; - for(int var9 = 0; var9 < this.subHeight; ++var9) { - for(int var10 = 0; var10 < this.subWidth; ++var10) { + for (int var9 = 0; var9 < this.subHeight; ++var9) { + for (int var10 = 0; var10 < this.subWidth; ++var10) { var8[var6 * (var9 + var4) + var10 + var2] = this.pixels[var10 + var9 * this.subWidth]; } } @@ -146,15 +147,16 @@ public final class Sprite extends Rasterizer2D { this.yOffset -= var2; this.xOffset -= var4; } + } @ObfuscatedName("u") - public void __u_500() { + public void method305() { int[] var1 = new int[this.subWidth * this.subHeight]; int var2 = 0; - for(int var3 = 0; var3 < this.subHeight; ++var3) { - for(int var4 = this.subWidth - 1; var4 >= 0; --var4) { + for (int var3 = 0; var3 < this.subHeight; ++var3) { + for (int var4 = this.subWidth - 1; var4 >= 0; --var4) { var1[var2++] = this.pixels[var4 + var3 * this.subWidth]; } } @@ -164,12 +166,12 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("g") - public void __g_501() { + public void method306() { int[] var1 = new int[this.subWidth * this.subHeight]; int var2 = 0; - for(int var3 = this.subHeight - 1; var3 >= 0; --var3) { - for(int var4 = 0; var4 < this.subWidth; ++var4) { + for (int var3 = this.subHeight - 1; var3 >= 0; --var3) { + for (int var4 = 0; var4 < this.subWidth; ++var4) { var1[var2++] = this.pixels[var4 + var3 * this.subWidth]; } } @@ -179,21 +181,21 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("l") - public void __l_502(int var1) { + public void method307(int var1) { int[] var2 = new int[this.subWidth * this.subHeight]; int var3 = 0; - for(int var4 = 0; var4 < this.subHeight; ++var4) { - for(int var5 = 0; var5 < this.subWidth; ++var5) { + for (int var4 = 0; var4 < this.subHeight; ++var4) { + for (int var5 = 0; var5 < this.subWidth; ++var5) { int var6 = this.pixels[var3]; - if(var6 == 0) { - if(var5 > 0 && this.pixels[var3 - 1] != 0) { + if (var6 == 0) { + if (var5 > 0 && this.pixels[var3 - 1] != 0) { var6 = var1; - } else if(var4 > 0 && this.pixels[var3 - this.subWidth] != 0) { + } else if (var4 > 0 && this.pixels[var3 - this.subWidth] != 0) { var6 = var1; - } else if(var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) { + } else if (var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) { var6 = var1; - } else if(var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) { + } else if (var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) { var6 = var1; } } @@ -206,12 +208,12 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("e") - public void __e_503(int var1) { - for(int var2 = this.subHeight - 1; var2 > 0; --var2) { + public void method308(int var1) { + for (int var2 = this.subHeight - 1; var2 > 0; --var2) { int var3 = var2 * this.subWidth; - for(int var4 = this.subWidth - 1; var4 > 0; --var4) { - if(this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) { + for (int var4 = this.subWidth - 1; var4 > 0; --var4) { + if (this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) { this.pixels[var4 + var3] = var1; } } @@ -231,7 +233,7 @@ public final class Sprite extends Rasterizer2D { int var7 = Rasterizer2D.Rasterizer2D_width - var6; int var8 = 0; int var9; - if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; var5 -= var9; var2 = Rasterizer2D.Rasterizer2D_yClipStart; @@ -239,11 +241,11 @@ public final class Sprite extends Rasterizer2D { var3 += var9 * Rasterizer2D.Rasterizer2D_width; } - if(var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; var6 -= var9; var1 = Rasterizer2D.Rasterizer2D_xClipStart; @@ -253,16 +255,17 @@ public final class Sprite extends Rasterizer2D { var7 += var9; } - if(var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; var6 -= var9; var8 += var9; var7 += var9; } - if(var6 > 0 && var5 > 0) { + if (var6 > 0 && var5 > 0) { Sprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, var4, var3, var6, var5, var7, var8); } + } @ObfuscatedName("a") @@ -277,7 +280,7 @@ public final class Sprite extends Rasterizer2D { int var7 = Rasterizer2D.Rasterizer2D_width - var6; int var8 = 0; int var9; - if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; var5 -= var9; var2 = Rasterizer2D.Rasterizer2D_yClipStart; @@ -285,11 +288,11 @@ public final class Sprite extends Rasterizer2D { var3 += var9 * Rasterizer2D.Rasterizer2D_width; } - if(var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; var6 -= var9; var1 = Rasterizer2D.Rasterizer2D_xClipStart; @@ -299,21 +302,22 @@ public final class Sprite extends Rasterizer2D { var7 += var9; } - if(var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; var6 -= var9; var8 += var9; var7 += var9; } - if(var6 > 0 && var5 > 0) { + if (var6 > 0 && var5 > 0) { Sprite_andAnotherOne(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var4, var3, var6, var5, var7, var8); } + } @ObfuscatedName("j") - public void __j_506(int var1, int var2, int var3, int var4) { - if(var3 > 0 && var4 > 0) { + public void method309(int var1, int var2, int var3, int var4) { + if (var3 > 0 && var4 > 0) { int var5 = this.subWidth; int var6 = this.subHeight; int var7 = 0; @@ -323,47 +327,47 @@ public final class Sprite extends Rasterizer2D { int var11 = (var9 << 16) / var3; int var12 = (var10 << 16) / var4; int var13; - if(this.yOffset > 0) { + if (this.yOffset > 0) { var13 = (var11 + (this.yOffset << 16) - 1) / var11; var1 += var13; var7 += var13 * var11 - (this.yOffset << 16); } - if(this.xOffset > 0) { + if (this.xOffset > 0) { var13 = (var12 + (this.xOffset << 16) - 1) / var12; var2 += var13; var8 += var13 * var12 - (this.xOffset << 16); } - if(var5 < var9) { + if (var5 < var9) { var3 = (var11 + ((var5 << 16) - var7) - 1) / var11; } - if(var6 < var10) { + if (var6 < var10) { var4 = (var12 + ((var6 << 16) - var8) - 1) / var12; } var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; int var14 = Rasterizer2D.Rasterizer2D_width - var3; - if(var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } int var15; - if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { var15 = Rasterizer2D.Rasterizer2D_yClipStart - var2; var4 -= var15; var13 += var15 * Rasterizer2D.Rasterizer2D_width; var8 += var12 * var15; } - if(var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; var3 -= var15; var14 += var15; } - if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1; var3 -= var15; var13 += var15; @@ -373,12 +377,13 @@ public final class Sprite extends Rasterizer2D { Sprite_somethingElse(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var7, var8, var13, var14, var3, var4, var11, var12, var5); } + } @ObfuscatedName("t") @Export("drawAtTransOverlay") public void drawAtTransOverlay(int var1, int var2, int var3, int var4) { - if(var3 == 256) { + if (var3 == 256) { this.drawAt2(var1, var2); } else { var1 += this.yOffset; @@ -390,7 +395,7 @@ public final class Sprite extends Rasterizer2D { int var9 = Rasterizer2D.Rasterizer2D_width - var8; int var10 = 0; int var11; - if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; var7 -= var11; var2 = Rasterizer2D.Rasterizer2D_yClipStart; @@ -398,11 +403,11 @@ public final class Sprite extends Rasterizer2D { var5 += var11 * Rasterizer2D.Rasterizer2D_width; } - if(var7 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var7 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { var7 -= var7 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; var8 -= var11; var1 = Rasterizer2D.Rasterizer2D_xClipStart; @@ -412,21 +417,22 @@ public final class Sprite extends Rasterizer2D { var9 += var11; } - if(var8 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + if (var8 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { var11 = var8 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; var8 -= var11; var10 += var11; var9 += var11; } - if(var8 > 0 && var7 > 0) { + if (var8 > 0 && var7 > 0) { Sprite_anotherOne(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var6, var5, var8, var7, var9, var10, var3, var4); } } + } @ObfuscatedName("h") - public void __h_508(int var1, int var2, int var3) { + public void method310(int var1, int var2, int var3) { var1 += this.yOffset; var2 += this.xOffset; int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; @@ -436,7 +442,7 @@ public final class Sprite extends Rasterizer2D { int var8 = Rasterizer2D.Rasterizer2D_width - var7; int var9 = 0; int var10; - if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; var6 -= var10; var2 = Rasterizer2D.Rasterizer2D_yClipStart; @@ -444,11 +450,11 @@ public final class Sprite extends Rasterizer2D { var4 += var10 * Rasterizer2D.Rasterizer2D_width; } - if(var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { var6 -= var6 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; var7 -= var10; var1 = Rasterizer2D.Rasterizer2D_xClipStart; @@ -458,21 +464,22 @@ public final class Sprite extends Rasterizer2D { var8 += var10; } - if(var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + if (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; var7 -= var10; var9 += var10; var8 += var10; } - if(var7 > 0 && var6 > 0) { + if (var7 > 0 && var6 > 0) { Sprite_alpha1(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var5, var4, var7, var6, var8, var9, var3); } + } @ObfuscatedName("c") - public void __c_509(int var1, int var2, int var3, int var4, int var5) { - if(var3 > 0 && var4 > 0) { + public void method311(int var1, int var2, int var3, int var4, int var5) { + if (var3 > 0 && var4 > 0) { int var6 = this.subWidth; int var7 = this.subHeight; int var8 = 0; @@ -482,47 +489,47 @@ public final class Sprite extends Rasterizer2D { int var12 = (var10 << 16) / var3; int var13 = (var11 << 16) / var4; int var14; - if(this.yOffset > 0) { + if (this.yOffset > 0) { var14 = (var12 + (this.yOffset << 16) - 1) / var12; var1 += var14; var8 += var14 * var12 - (this.yOffset << 16); } - if(this.xOffset > 0) { + if (this.xOffset > 0) { var14 = (var13 + (this.xOffset << 16) - 1) / var13; var2 += var14; var9 += var14 * var13 - (this.xOffset << 16); } - if(var6 < var10) { + if (var6 < var10) { var3 = (var12 + ((var6 << 16) - var8) - 1) / var12; } - if(var7 < var11) { + if (var7 < var11) { var4 = (var13 + ((var7 << 16) - var9) - 1) / var13; } var14 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; int var15 = Rasterizer2D.Rasterizer2D_width - var3; - if(var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } int var16; - if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { var16 = Rasterizer2D.Rasterizer2D_yClipStart - var2; var4 -= var16; var14 += var16 * Rasterizer2D.Rasterizer2D_width; var9 += var13 * var16; } - if(var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; var3 -= var16; var15 += var16; } - if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1; var3 -= var16; var14 += var16; @@ -532,10 +539,11 @@ public final class Sprite extends Rasterizer2D { Sprite_alpha2(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var8, var9, var14, var15, var3, var4, var12, var13, var6, var5); } + } @ObfuscatedName("v") - public void __v_510(int var1, int var2, int var3) { + public void method312(int var1, int var2, int var3) { var1 += this.yOffset; var2 += this.xOffset; int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; @@ -545,7 +553,7 @@ public final class Sprite extends Rasterizer2D { int var8 = Rasterizer2D.Rasterizer2D_width - var7; int var9 = 0; int var10; - if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; var6 -= var10; var2 = Rasterizer2D.Rasterizer2D_yClipStart; @@ -553,11 +561,11 @@ public final class Sprite extends Rasterizer2D { var4 += var10 * Rasterizer2D.Rasterizer2D_width; } - if(var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { var6 -= var6 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; var7 -= var10; var1 = Rasterizer2D.Rasterizer2D_xClipStart; @@ -567,26 +575,26 @@ public final class Sprite extends Rasterizer2D { var8 += var10; } - if(var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + if (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; var7 -= var10; var9 += var10; var8 += var10; } - if(var7 > 0 && var6 > 0) { - if(var3 == 256) { + if (var7 > 0 && var6 > 0) { + if (var3 == 256) { method6074(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); } else { method6075(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); } - } + } @ObfuscatedName("aj") - public void __aj_511(int var1, int var2, int var3, int var4, int var5) { - if(var3 > 0 && var4 > 0) { + public void method313(int var1, int var2, int var3, int var4, int var5) { + if (var3 > 0 && var4 > 0) { int var6 = this.subWidth; int var7 = this.subHeight; int var8 = 0; @@ -596,47 +604,47 @@ public final class Sprite extends Rasterizer2D { int var12 = (var10 << 16) / var3; int var13 = (var11 << 16) / var4; int var14; - if(this.yOffset > 0) { + if (this.yOffset > 0) { var14 = (var12 + (this.yOffset << 16) - 1) / var12; var1 += var14; var8 += var14 * var12 - (this.yOffset << 16); } - if(this.xOffset > 0) { + if (this.xOffset > 0) { var14 = (var13 + (this.xOffset << 16) - 1) / var13; var2 += var14; var9 += var14 * var13 - (this.xOffset << 16); } - if(var6 < var10) { + if (var6 < var10) { var3 = (var12 + ((var6 << 16) - var8) - 1) / var12; } - if(var7 < var11) { + if (var7 < var11) { var4 = (var13 + ((var7 << 16) - var9) - 1) / var13; } var14 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; int var15 = Rasterizer2D.Rasterizer2D_width - var3; - if(var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } int var16; - if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { var16 = Rasterizer2D.Rasterizer2D_yClipStart - var2; var4 -= var16; var14 += var16 * Rasterizer2D.Rasterizer2D_width; var9 += var13 * var16; } - if(var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; var3 -= var16; var15 += var16; } - if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1; var3 -= var16; var14 += var16; @@ -644,53 +652,52 @@ public final class Sprite extends Rasterizer2D { var15 += var16; } - if(var5 == 256) { + if (var5 == 256) { method6144(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); } else { method6078(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); } - } + } @ObfuscatedName("ac") - public void __ac_512(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { - int var9 = var2 < 0?-var2:0; - int var10 = var2 + this.subHeight <= var6?this.subHeight:var6 - var2; - int var11 = var1 < 0?-var1:0; - int var10000; - if(this.subWidth + var1 <= var5) { - var10000 = this.subWidth; + public void method314(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { + int var9 = var2 < 0 ? -var2 : 0; + int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; + int var11 = var1 < 0 ? -var1 : 0; + if (this.subWidth + var1 <= var5) { + int var12 = this.subWidth; } else { - var10000 = var5 - var1; + int var10000 = var5 - var1; } int var13 = var3 + var11 + (var9 + var2 + var4) * Rasterizer2D.Rasterizer2D_width + var1; int var14 = var9 + var2; - for(int var15 = var9; var15 < var10; ++var15) { + for (int var15 = var9; var15 < var10; ++var15) { int var16 = var7[var14]; int var17 = var8[var14++]; int var18 = var13; int var19; - if(var1 < var16) { + if (var1 < var16) { var19 = var16 - var1; var18 = var13 + (var19 - var11); } else { var19 = var11; } - int var12; - if(this.subWidth + var1 <= var16 + var17) { - var12 = this.subWidth; + int var20; + if (this.subWidth + var1 <= var16 + var17) { + var20 = this.subWidth; } else { - var12 = var16 + var17 - var1; + var20 = var16 + var17 - var1; } - for(int var20 = var19; var20 < var12; ++var20) { - int var21 = this.pixels[var20 + var15 * this.subWidth]; - if(var21 != 0) { - Rasterizer2D.Rasterizer2D_pixels[var18++] = var21; + for (int var21 = var19; var21 < var20; ++var21) { + int var22 = this.pixels[var21 + var15 * this.subWidth]; + if (var22 != 0) { + Rasterizer2D.Rasterizer2D_pixels[var18++] = var22; } else { ++var18; } @@ -702,7 +709,7 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("ay") - public void __ay_513(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) { + public void method315(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) { try { int var11 = -var3 / 2; int var12 = -var4 / 2; @@ -714,13 +721,13 @@ public final class Sprite extends Rasterizer2D { int var16 = var12 * var14 - var11 * var13 + (var6 << 16); int var17 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - for(var2 = 0; var2 < var4; ++var2) { + for (var2 = 0; var2 < var4; ++var2) { int var18 = var9[var2]; int var19 = var17 + var18; int var20 = var15 + var14 * var18; int var21 = var16 - var13 * var18; - for(var1 = -var10[var2]; var1 < 0; ++var1) { + for (var1 = -var10[var2]; var1 < 0; ++var1) { Rasterizer2D.Rasterizer2D_pixels[var19++] = this.pixels[this.subWidth * (var21 >> 16) + (var20 >> 16)]; var20 += var14; var21 -= var13; @@ -730,14 +737,13 @@ public final class Sprite extends Rasterizer2D { var16 += var14; var17 += Rasterizer2D.Rasterizer2D_width; } - } catch (Exception var23) { - ; + } catch (Exception var22) { } } @ObfuscatedName("ah") - public void __ah_514(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { + public void method316(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { try { int var10 = -var3 / 2; int var11 = -var4 / 2; @@ -749,14 +755,14 @@ public final class Sprite extends Rasterizer2D { int var15 = var11 * var13 - var10 * var12 + (var6 << 16); int var16 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - for(var2 = 0; var2 < var4; ++var2) { + for (var2 = 0; var2 < var4; ++var2) { int var17 = var16; int var18 = var14; int var19 = var15; - for(var1 = -var3; var1 < 0; ++var1) { + for (var1 = -var3; var1 < 0; ++var1) { int var20 = this.pixels[this.subWidth * (var19 >> 16) + (var18 >> 16)]; - if(var20 != 0) { + if (var20 != 0) { Rasterizer2D.Rasterizer2D_pixels[var17++] = var20; } else { ++var17; @@ -770,20 +776,19 @@ public final class Sprite extends Rasterizer2D { var15 += var13; var16 += Rasterizer2D.Rasterizer2D_width; } - } catch (Exception var22) { - ; + } catch (Exception var21) { } } @ObfuscatedName("ak") - public void __ak_515(int var1, int var2, int var3, int var4) { - this.__aw_516(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); + public void method317(int var1, int var2, int var3, int var4) { + this.method318(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); } @ObfuscatedName("aw") - void __aw_516(int var1, int var2, int var3, int var4, int var5, int var6) { - if(var6 != 0) { + void method318(int var1, int var2, int var3, int var4, int var5, int var6) { + if (var6 != 0) { var1 -= this.yOffset << 4; var2 -= this.xOffset << 4; double var7 = (double)(var5 & 65535) * 9.587379924285257E-5D; @@ -799,7 +804,7 @@ public final class Sprite extends Rasterizer2D { int var18 = ((this.subHeight << 4) - var2) * var10 + var9 * -((this.subWidth << 4) - var1); int var19; int var20; - if(var11 < var13) { + if (var11 < var13) { var19 = var11; var20 = var13; } else { @@ -807,25 +812,25 @@ public final class Sprite extends Rasterizer2D { var20 = var11; } - if(var15 < var19) { + if (var15 < var19) { var19 = var15; } - if(var17 < var19) { + if (var17 < var19) { var19 = var17; } - if(var15 > var20) { + if (var15 > var20) { var20 = var15; } - if(var17 > var20) { + if (var17 > var20) { var20 = var17; } int var21; int var22; - if(var12 < var14) { + if (var12 < var14) { var21 = var12; var22 = var14; } else { @@ -833,19 +838,19 @@ public final class Sprite extends Rasterizer2D { var22 = var12; } - if(var16 < var21) { + if (var16 < var21) { var21 = var16; } - if(var18 < var21) { + if (var18 < var21) { var21 = var18; } - if(var16 > var22) { + if (var16 > var22) { var22 = var16; } - if(var18 > var22) { + if (var18 > var22) { var22 = var18; } @@ -861,26 +866,26 @@ public final class Sprite extends Rasterizer2D { var20 = var20 + 15 >> 4; var21 >>= 4; var22 = var22 + 15 >> 4; - if(var19 < Rasterizer2D.Rasterizer2D_xClipStart) { + if (var19 < Rasterizer2D.Rasterizer2D_xClipStart) { var19 = Rasterizer2D.Rasterizer2D_xClipStart; } - if(var20 > Rasterizer2D.Rasterizer2D_xClipEnd) { + if (var20 > Rasterizer2D.Rasterizer2D_xClipEnd) { var20 = Rasterizer2D.Rasterizer2D_xClipEnd; } - if(var21 < Rasterizer2D.Rasterizer2D_yClipStart) { + if (var21 < Rasterizer2D.Rasterizer2D_yClipStart) { var21 = Rasterizer2D.Rasterizer2D_yClipStart; } - if(var22 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var22 > Rasterizer2D.Rasterizer2D_yClipEnd) { var22 = Rasterizer2D.Rasterizer2D_yClipEnd; } var20 = var19 - var20; - if(var20 < 0) { + if (var20 < 0) { var22 = var21 - var22; - if(var22 < 0) { + if (var22 < 0) { int var23 = var19 + var21 * Rasterizer2D.Rasterizer2D_width; double var24 = 1.6777216E7D / (double)var6; int var26 = (int)Math.floor(Math.sin(var7) * var24 + 0.5D); @@ -896,17 +901,17 @@ public final class Sprite extends Rasterizer2D { int var36; int var37; int var38; - if(var27 == 0) { - if(var26 == 0) { - for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { + if (var27 == 0) { + if (var26 == 0) { + for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { var34 = var23; var35 = var30; var36 = var31; var37 = var20; - if(var30 >= 0 && var31 >= 0 && var30 - (this.subWidth << 12) < 0 && var31 - (this.subHeight << 12) < 0) { - for(; var37 < 0; ++var37) { + if (var30 >= 0 && var31 >= 0 && var30 - (this.subWidth << 12) < 0 && var31 - (this.subHeight << 12) < 0) { + for (; var37 < 0; ++var37) { var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if(var38 != 0) { + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { ++var34; @@ -916,27 +921,27 @@ public final class Sprite extends Rasterizer2D { ++var33; } - } else if(var26 < 0) { - for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { + } else if (var26 < 0) { + for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { var34 = var23; var35 = var30; var36 = (var28 * var26 >> 4) + var31; var37 = var20; - if(var30 >= 0 && var30 - (this.subWidth << 12) < 0) { - if((var32 = var36 - (this.subHeight << 12)) >= 0) { + if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) { + if ((var32 = var36 - (this.subHeight << 12)) >= 0) { var32 = (var26 - var32) / var26; var37 = var20 + var32; var36 += var26 * var32; var34 = var23 + var32; } - if((var32 = (var36 - var26) / var26) > var37) { + if ((var32 = (var36 - var26) / var26) > var37) { var37 = var32; } - while(var37 < 0) { + while (var37 < 0) { var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if(var38 != 0) { + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { ++var34; @@ -951,26 +956,26 @@ public final class Sprite extends Rasterizer2D { var30 -= var26; } } else { - for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { + for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { var34 = var23; var35 = var30; var36 = (var28 * var26 >> 4) + var31; var37 = var20; - if(var30 >= 0 && var30 - (this.subWidth << 12) < 0) { - if(var36 < 0) { + if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) { + if (var36 < 0) { var32 = (var26 - 1 - var36) / var26; var37 = var20 + var32; var36 += var26 * var32; var34 = var23 + var32; } - if((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { + if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { var37 = var32; } - while(var37 < 0) { + while (var37 < 0) { var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if(var38 != 0) { + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { ++var34; @@ -985,28 +990,28 @@ public final class Sprite extends Rasterizer2D { var30 -= var26; } } - } else if(var27 < 0) { - if(var26 == 0) { - for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { + } else if (var27 < 0) { + if (var26 == 0) { + for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { var34 = var23; var35 = (var28 * var27 >> 4) + var30; var36 = var31; var37 = var20; - if(var31 >= 0 && var31 - (this.subHeight << 12) < 0) { - if((var32 = var35 - (this.subWidth << 12)) >= 0) { + if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) { + if ((var32 = var35 - (this.subWidth << 12)) >= 0) { var32 = (var27 - var32) / var27; var37 = var20 + var32; var35 += var27 * var32; var34 = var23 + var32; } - if((var32 = (var35 - var27) / var27) > var37) { + if ((var32 = (var35 - var27) / var27) > var37) { var37 = var32; } - while(var37 < 0) { + while (var37 < 0) { var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if(var38 != 0) { + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { ++var34; @@ -1020,13 +1025,13 @@ public final class Sprite extends Rasterizer2D { ++var33; var31 += var27; } - } else if(var26 < 0) { - for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { + } else if (var26 < 0) { + for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { var34 = var23; var35 = (var28 * var27 >> 4) + var30; var36 = (var28 * var26 >> 4) + var31; var37 = var20; - if((var32 = var35 - (this.subWidth << 12)) >= 0) { + if ((var32 = var35 - (this.subWidth << 12)) >= 0) { var32 = (var27 - var32) / var27; var37 = var20 + var32; var35 += var27 * var32; @@ -1034,11 +1039,11 @@ public final class Sprite extends Rasterizer2D { var34 = var23 + var32; } - if((var32 = (var35 - var27) / var27) > var37) { + if ((var32 = (var35 - var27) / var27) > var37) { var37 = var32; } - if((var32 = var36 - (this.subHeight << 12)) >= 0) { + if ((var32 = var36 - (this.subHeight << 12)) >= 0) { var32 = (var26 - var32) / var26; var37 += var32; var35 += var27 * var32; @@ -1046,13 +1051,13 @@ public final class Sprite extends Rasterizer2D { var34 += var32; } - if((var32 = (var36 - var26) / var26) > var37) { + if ((var32 = (var36 - var26) / var26) > var37) { var37 = var32; } - while(var37 < 0) { + while (var37 < 0) { var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if(var38 != 0) { + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { ++var34; @@ -1068,12 +1073,12 @@ public final class Sprite extends Rasterizer2D { var31 += var27; } } else { - for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { + for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { var34 = var23; var35 = (var28 * var27 >> 4) + var30; var36 = (var28 * var26 >> 4) + var31; var37 = var20; - if((var32 = var35 - (this.subWidth << 12)) >= 0) { + if ((var32 = var35 - (this.subWidth << 12)) >= 0) { var32 = (var27 - var32) / var27; var37 = var20 + var32; var35 += var27 * var32; @@ -1081,11 +1086,11 @@ public final class Sprite extends Rasterizer2D { var34 = var23 + var32; } - if((var32 = (var35 - var27) / var27) > var37) { + if ((var32 = (var35 - var27) / var27) > var37) { var37 = var32; } - if(var36 < 0) { + if (var36 < 0) { var32 = (var26 - 1 - var36) / var26; var37 += var32; var35 += var27 * var32; @@ -1093,13 +1098,13 @@ public final class Sprite extends Rasterizer2D { var34 += var32; } - if((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { + if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { var37 = var32; } - while(var37 < 0) { + while (var37 < 0) { var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if(var38 != 0) { + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { ++var34; @@ -1115,27 +1120,27 @@ public final class Sprite extends Rasterizer2D { var31 += var27; } } - } else if(var26 == 0) { - for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { + } else if (var26 == 0) { + for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { var34 = var23; var35 = (var28 * var27 >> 4) + var30; var36 = var31; var37 = var20; - if(var31 >= 0 && var31 - (this.subHeight << 12) < 0) { - if(var35 < 0) { + if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) { + if (var35 < 0) { var32 = (var27 - 1 - var35) / var27; var37 = var20 + var32; var35 += var27 * var32; var34 = var23 + var32; } - if((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { + if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { var37 = var32; } - while(var37 < 0) { + while (var37 < 0) { var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if(var38 != 0) { + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { ++var34; @@ -1149,13 +1154,13 @@ public final class Sprite extends Rasterizer2D { ++var33; var31 += var27; } - } else if(var26 < 0) { - for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { + } else if (var26 < 0) { + for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { var34 = var23; var35 = (var28 * var27 >> 4) + var30; var36 = (var28 * var26 >> 4) + var31; var37 = var20; - if(var35 < 0) { + if (var35 < 0) { var32 = (var27 - 1 - var35) / var27; var37 = var20 + var32; var35 += var27 * var32; @@ -1163,11 +1168,11 @@ public final class Sprite extends Rasterizer2D { var34 = var23 + var32; } - if((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { + if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { var37 = var32; } - if((var32 = var36 - (this.subHeight << 12)) >= 0) { + if ((var32 = var36 - (this.subHeight << 12)) >= 0) { var32 = (var26 - var32) / var26; var37 += var32; var35 += var27 * var32; @@ -1175,13 +1180,13 @@ public final class Sprite extends Rasterizer2D { var34 += var32; } - if((var32 = (var36 - var26) / var26) > var37) { + if ((var32 = (var36 - var26) / var26) > var37) { var37 = var32; } - while(var37 < 0) { + while (var37 < 0) { var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if(var38 != 0) { + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { ++var34; @@ -1197,12 +1202,12 @@ public final class Sprite extends Rasterizer2D { var31 += var27; } } else { - for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { + for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { var34 = var23; var35 = (var28 * var27 >> 4) + var30; var36 = (var28 * var26 >> 4) + var31; var37 = var20; - if(var35 < 0) { + if (var35 < 0) { var32 = (var27 - 1 - var35) / var27; var37 = var20 + var32; var35 += var27 * var32; @@ -1210,11 +1215,11 @@ public final class Sprite extends Rasterizer2D { var34 = var23 + var32; } - if((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { + if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { var37 = var32; } - if(var36 < 0) { + if (var36 < 0) { var32 = (var26 - 1 - var36) / var26; var37 += var32; var35 += var27 * var32; @@ -1222,13 +1227,13 @@ public final class Sprite extends Rasterizer2D { var34 += var32; } - if((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { + if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { var37 = var32; } - while(var37 < 0) { + while (var37 < 0) { var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if(var38 != 0) { + if (var38 != 0) { Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { ++var34; @@ -1244,41 +1249,41 @@ public final class Sprite extends Rasterizer2D { var31 += var27; } } - } } } + } @ObfuscatedName("al") - public void __al_517(int var1, int var2, int var3, int var4) { - if(var3 <= this.width && var4 <= this.height) { + public void method319(int var1, int var2, int var3, int var4) { + if (var3 <= this.width && var4 <= this.height) { int var5 = var3 * this.yOffset / this.width + var1; int var6 = (var3 * (this.yOffset + this.subWidth) + this.width - 1) / this.width + var1; int var7 = var2 + var4 * this.xOffset / this.height; int var8 = var2 + (this.height + (this.xOffset + this.subHeight) * var4 - 1) / this.height; - if(var5 < Rasterizer2D.Rasterizer2D_xClipStart) { + if (var5 < Rasterizer2D.Rasterizer2D_xClipStart) { var5 = Rasterizer2D.Rasterizer2D_xClipStart; } - if(var6 > Rasterizer2D.Rasterizer2D_xClipEnd) { + if (var6 > Rasterizer2D.Rasterizer2D_xClipEnd) { var6 = Rasterizer2D.Rasterizer2D_xClipEnd; } - if(var7 < Rasterizer2D.Rasterizer2D_yClipStart) { + if (var7 < Rasterizer2D.Rasterizer2D_yClipStart) { var7 = Rasterizer2D.Rasterizer2D_yClipStart; } - if(var8 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var8 > Rasterizer2D.Rasterizer2D_yClipEnd) { var8 = Rasterizer2D.Rasterizer2D_yClipEnd; } - if(var5 < var6 && var7 < var8) { + if (var5 < var6 && var7 < var8) { int var9 = var5 + var7 * Rasterizer2D.Rasterizer2D_width; int var10 = Rasterizer2D.Rasterizer2D_width - (var6 - var5); - if(var9 < Rasterizer2D.Rasterizer2D_pixels.length) { - for(int var11 = var7; var11 < var8; ++var11) { - for(int var12 = var5; var12 < var6; ++var12) { + if (var9 < Rasterizer2D.Rasterizer2D_pixels.length) { + for (int var11 = var7; var11 < var8; ++var11) { + for (int var12 = var5; var12 < var6; ++var12) { int var13 = var12 - var1 << 4; int var14 = var11 - var2 << 4; int var15 = var13 * this.width / var3 - (this.yOffset << 4); @@ -1286,20 +1291,20 @@ public final class Sprite extends Rasterizer2D { int var17 = var14 * this.height / var4 - (this.xOffset << 4); int var18 = (var14 + 16) * this.height / var4 - (this.xOffset << 4); int var19 = (var16 - var15) * (var18 - var17) >> 1; - if(var19 != 0) { - if(var15 < 0) { + if (var19 != 0) { + if (var15 < 0) { var15 = 0; } - if(var16 >= this.subWidth << 4) { + if (var16 >= this.subWidth << 4) { var16 = this.subWidth << 4; } - if(var17 < 0) { + if (var17 < 0) { var17 = 0; } - if(var18 >= this.subHeight << 4) { + if (var18 >= this.subHeight << 4) { var18 = this.subHeight << 4; } @@ -1319,23 +1324,23 @@ public final class Sprite extends Rasterizer2D { int var27 = 0; int var28; - for(var28 = var17; var28 <= var18; ++var28) { + for (var28 = var17; var28 <= var18; ++var28) { int var29 = 16; - if(var28 == var17) { + if (var28 == var17) { var29 = var22; } - if(var28 == var18) { + if (var28 == var18) { var29 = var23; } - for(int var30 = var15; var30 <= var16; ++var30) { + for (int var30 = var15; var30 <= var16; ++var30) { int var31 = this.pixels[var30 + var28 * this.subWidth]; - if(var31 != 0) { + if (var31 != 0) { int var32; - if(var30 == var15) { + if (var30 == var15) { var32 = var29 * var20; - } else if(var30 == var16) { + } else if (var30 == var16) { var32 = var29 * var21; } else { var32 = var29 << 4; @@ -1349,9 +1354,9 @@ public final class Sprite extends Rasterizer2D { } } - if(var27 >= var19) { + if (var27 >= var19) { var28 = var26 / var27 + (var24 / var27 << 16) + (var25 / var27 << 8); - if(var28 == 0) { + if (var28 == 0) { var28 = 1; } @@ -1364,9 +1369,9 @@ public final class Sprite extends Rasterizer2D { var9 += var10; } - } } + } else { throw new IllegalArgumentException(); } @@ -1375,16 +1380,15 @@ public final class Sprite extends Rasterizer2D { @ObfuscatedName("d") @Export("Sprite_something") static void Sprite_something(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { - for(int var8 = -var5; var8 < 0; ++var8) { + for (int var8 = -var5; var8 < 0; ++var8) { int var9; - for(var9 = var3 + var4 - 3; var3 < var9; var0[var3++] = var1[var2++]) { + for (var9 = var3 + var4 - 3; var3 < var9; var0[var3++] = var1[var2++]) { var0[var3++] = var1[var2++]; var0[var3++] = var1[var2++]; var0[var3++] = var1[var2++]; } - for(var9 += 3; var3 < var9; var0[var3++] = var1[var2++]) { - ; + for (var9 += 3; var3 < var9; var0[var3++] = var1[var2++]) { } var3 += var6; @@ -1399,41 +1403,41 @@ public final class Sprite extends Rasterizer2D { int var9 = -(var5 >> 2); var5 = -(var5 & 3); - for(int var10 = -var6; var10 < 0; ++var10) { + for (int var10 = -var6; var10 < 0; ++var10) { int var11; - for(var11 = var9; var11 < 0; ++var11) { + for (var11 = var9; var11 < 0; ++var11) { var2 = var1[var3++]; - if(var2 != 0) { + if (var2 != 0) { var0[var4++] = var2; } else { ++var4; } var2 = var1[var3++]; - if(var2 != 0) { + if (var2 != 0) { var0[var4++] = var2; } else { ++var4; } var2 = var1[var3++]; - if(var2 != 0) { + if (var2 != 0) { var0[var4++] = var2; } else { ++var4; } var2 = var1[var3++]; - if(var2 != 0) { + if (var2 != 0) { var0[var4++] = var2; } else { ++var4; } } - for(var11 = var5; var11 < 0; ++var11) { + for (var11 = var5; var11 < 0; ++var11) { var2 = var1[var3++]; - if(var2 != 0) { + if (var2 != 0) { var0[var4++] = var2; } else { ++var4; @@ -1451,12 +1455,12 @@ public final class Sprite extends Rasterizer2D { static void Sprite_somethingElse(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { int var12 = var3; - for(int var13 = -var8; var13 < 0; ++var13) { + for (int var13 = -var8; var13 < 0; ++var13) { int var14 = var11 * (var4 >> 16); - for(int var15 = -var7; var15 < 0; ++var15) { + for (int var15 = -var7; var15 < 0; ++var15) { var2 = var1[(var3 >> 16) + var14]; - if(var2 != 0) { + if (var2 != 0) { var0[var5++] = var2; } else { ++var5; @@ -1480,10 +1484,10 @@ public final class Sprite extends Rasterizer2D { int var13 = (var10 & 65280) * var11 & 16711680; var10 = (var12 | var13) >>> 8; - for(int var14 = -var6; var14 < 0; ++var14) { - for(int var15 = -var5; var15 < 0; ++var15) { + for (int var14 = -var6; var14 < 0; ++var14) { + for (int var15 = -var5; var15 < 0; ++var15) { var2 = var1[var3++]; - if(var2 != 0) { + if (var2 != 0) { var12 = var9 * (var2 & 16711935) & -16711936; var13 = (var2 & 65280) * var9 & 16711680; var0[var4++] = var10 + ((var12 | var13) >>> 8); @@ -1503,10 +1507,10 @@ public final class Sprite extends Rasterizer2D { static void Sprite_alpha1(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { int var10 = 256 - var9; - for(int var11 = -var6; var11 < 0; ++var11) { - for(int var12 = -var5; var12 < 0; ++var12) { + for (int var11 = -var6; var11 < 0; ++var11) { + for (int var12 = -var5; var12 < 0; ++var12) { var2 = var1[var3++]; - if(var2 != 0) { + if (var2 != 0) { int var13 = var0[var4]; var0[var4++] = ((var13 & 16711935) * var10 + var9 * (var2 & 16711935) & -16711936) + ((var2 & 65280) * var9 + var10 * (var13 & 65280) & 16711680) >> 8; } else { @@ -1526,12 +1530,12 @@ public final class Sprite extends Rasterizer2D { int var13 = 256 - var12; int var14 = var3; - for(int var15 = -var8; var15 < 0; ++var15) { + for (int var15 = -var8; var15 < 0; ++var15) { int var16 = var11 * (var4 >> 16); - for(int var17 = -var7; var17 < 0; ++var17) { + for (int var17 = -var7; var17 < 0; ++var17) { var2 = var1[(var3 >> 16) + var16]; - if(var2 != 0) { + if (var2 != 0) { int var18 = var0[var5]; var0[var5++] = ((var2 & 65280) * var12 + var13 * (var18 & 65280) & 16711680) + ((var18 & 16711935) * var13 + var12 * (var2 & 16711935) & -16711936) >> 8; } else { @@ -1550,10 +1554,10 @@ public final class Sprite extends Rasterizer2D { @ObfuscatedName("ag") static void method6074(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { - for(var8 = -var10; var8 < 0; ++var8) { - for(var6 = -var9; var6 < 0; ++var6) { + for (var8 = -var10; var8 < 0; ++var8) { + for (var6 = -var9; var6 < 0; ++var6) { var0 = var4[var5++]; - if(var0 != 0) { + if (var0 != 0) { var1 = var3[var7]; var2 = var0 + var1; var0 = (var0 & 16711935) + (var1 & 16711935); @@ -1572,10 +1576,10 @@ public final class Sprite extends Rasterizer2D { @ObfuscatedName("aq") static void method6075(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { - for(var8 = -var10; var8 < 0; ++var8) { - for(var6 = -var9; var6 < 0; ++var6) { + for (var8 = -var10; var8 < 0; ++var8) { + for (var6 = -var9; var6 < 0; ++var6) { var0 = var4[var5++]; - if(var0 != 0) { + if (var0 != 0) { var1 = var13 * (var0 & 16711935); var0 = (var1 & -16711936) + (var13 * var0 - var1 & 16711680) >>> 8; var1 = var3[var7]; @@ -1596,12 +1600,12 @@ public final class Sprite extends Rasterizer2D { @ObfuscatedName("av") static void method6144(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { - for(int var16 = var3; var8 < 0; ++var8) { + for (int var16 = var3; var8 < 0; ++var8) { var7 = var15 * (var9 >> 16); - for(var6 = -var12; var6 < 0; ++var6) { + for (var6 = -var12; var6 < 0; ++var6) { var0 = var4[(var3 >> 16) + var7]; - if(var0 != 0) { + if (var0 != 0) { var1 = var5[var10]; var2 = var0 + var1; var0 = (var0 & 16711935) + (var1 & 16711935); @@ -1623,12 +1627,12 @@ public final class Sprite extends Rasterizer2D { @ObfuscatedName("ar") static void method6078(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { - for(int var17 = var3; var8 < 0; ++var8) { + for (int var17 = var3; var8 < 0; ++var8) { var7 = var15 * (var9 >> 16); - for(var6 = -var12; var6 < 0; ++var6) { + for (var6 = -var12; var6 < 0; ++var6) { var0 = var4[(var3 >> 16) + var7]; - if(var0 != 0) { + if (var0 != 0) { var1 = (var0 & 16711935) * var16; var0 = (var1 & -16711936) + (var0 * var16 - var1 & 16711680) >>> 8; var1 = var5[var10]; diff --git a/runescape-client/src/main/java/SpriteIds.java b/runescape-client/src/main/java/SpriteIds.java index e0db3df86e..a21e1d23ec 100644 --- a/runescape-client/src/main/java/SpriteIds.java +++ b/runescape-client/src/main/java/SpriteIds.java @@ -11,12 +11,12 @@ public class SpriteIds { @ObfuscatedGetter( intValue = 1673796151 ) - public int __m; + public int field878; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 159591367 ) - public int __f; + public int field879; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -104203005 @@ -73,8 +73,8 @@ public class SpriteIds { public int modIcons; public SpriteIds() { - this.__m = -1; - this.__f = -1; + this.field878 = -1; + this.field879 = -1; this.mapScenes = -1; this.headIconsPk = -1; this.headIconsPrayer = -1; @@ -96,9 +96,9 @@ public class SpriteIds { byte[] var2 = var1.takeRecordFlat(class311.field3810.field3809); Buffer var3 = new Buffer(var2); - while(true) { + while (true) { int var4 = var3.readUnsignedByte(); - if(var4 == 0) { + if (var4 == 0) { return; } @@ -107,17 +107,17 @@ public class SpriteIds { var3.readMedium(); break; case 2: - this.__m = var3.__ap_310(); - this.__f = var3.__ap_310(); - this.mapScenes = var3.__ap_310(); - this.headIconsPk = var3.__ap_310(); - this.headIconsPrayer = var3.__ap_310(); - this.headIconsHint = var3.__ap_310(); - this.mapMarkers = var3.__ap_310(); - this.crosses = var3.__ap_310(); - this.mapDots = var3.__ap_310(); - this.scrollBars = var3.__ap_310(); - this.modIcons = var3.__ap_310(); + this.field878 = var3.method51(); + this.field879 = var3.method51(); + this.mapScenes = var3.method51(); + this.headIconsPk = var3.method51(); + this.headIconsPrayer = var3.method51(); + this.headIconsHint = var3.method51(); + this.mapMarkers = var3.method51(); + this.crosses = var3.method51(); + this.mapDots = var3.method51(); + this.scrollBars = var3.method51(); + this.modIcons = var3.method51(); } } } @@ -128,25 +128,25 @@ public class SpriteIds { garbageValue = "195396240" ) public static Font method5823(AbstractIndexCache var0, AbstractIndexCache var1, int var2, int var3) { - if(!SpriteMask.loadSprite(var0, var2, var3)) { + if (!SpriteMask.loadSprite(var0, var2, var3)) { return null; } else { - byte[] var5 = var1.takeRecord(var2, var3); - Font var4; - if(var5 == null) { - var4 = null; + byte[] var4 = var1.takeRecord(var2, var3); + Font var5; + if (var4 == null) { + var5 = null; } else { - Font var6 = new Font(var5, class328.indexedSpriteOffsetXs, class328.indexedSpriteOffsetYs, VarbitDefinition.indexedSpriteWidths, SecureRandomCallable.indexedSpriteHeights, class328.indexedSpritePalette, class328.spritePixels); + Font var6 = new Font(var4, class328.indexedSpriteOffsetXs, class328.indexedSpriteOffsetYs, VarbitDefinition.indexedSpriteWidths, SecureRandomCallable.indexedSpriteHeights, class328.indexedSpritePalette, class328.spritePixels); class328.indexedSpriteOffsetXs = null; class328.indexedSpriteOffsetYs = null; VarbitDefinition.indexedSpriteWidths = null; SecureRandomCallable.indexedSpriteHeights = null; class328.indexedSpritePalette = null; - class328.spritePixels = null; - var4 = var6; + class328.spritePixels = (byte[][])null; + var5 = var6; } - return var4; + return var5; } } @@ -156,12 +156,12 @@ public class SpriteIds { garbageValue = "58" ) static final void method5828(Actor var0) { - int var1 = var0.__bw - Client.cycle; - int var2 = var0.__bf * 128 + var0.size * 64; - int var3 = var0.__be * 128 + var0.size * 64; + int var1 = var0.field19 - Client.cycle; + int var2 = var0.field15 * 128 + var0.size * 64; + int var3 = var0.field17 * 128 + var0.size * 64; var0.x += (var2 - var0.x) / var1; var0.y += (var3 - var0.y) / var1; - var0.__cq = 0; - var0.orientation = var0.__cv; + var0.field24 = 0; + var0.orientation = var0.field21; } } diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index abcc91283c..e14649895e 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -40,9 +40,9 @@ public class SpriteMask extends DualNode { ) @Export("contains") public boolean contains(int var1, int var2) { - if(var2 >= 0 && var2 < this.xStarts.length) { + if (var2 >= 0 && var2 < this.xStarts.length) { int var3 = this.xStarts[var2]; - if(var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { + if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { return true; } } @@ -56,13 +56,13 @@ public class SpriteMask extends DualNode { garbageValue = "-1301156444" ) static void method4390() { - for(ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if(var0.stream1 != null) { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var0.stream1 != null) { TaskHandler.pcmStreamMixer.removeSubStream(var0.stream1); var0.stream1 = null; } - if(var0.stream2 != null) { + if (var0.stream2 != null) { TaskHandler.pcmStreamMixer.removeSubStream(var0.stream2); var0.stream2 = null; } @@ -87,7 +87,7 @@ public class SpriteMask extends DualNode { ) static int method4391(int var0) { Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - return var1 == null?-1:(var1.nextDual == Messages.Messages_queue.sentinel?-1:((Message)var1.nextDual).count); + return var1 == null ? -1 : (var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count); } @ObfuscatedName("x") @@ -98,7 +98,7 @@ public class SpriteMask extends DualNode { @Export("loadSprite") public static boolean loadSprite(AbstractIndexCache var0, int var1, int var2) { byte[] var3 = var0.takeRecord(var1, var2); - if(var3 == null) { + if (var3 == null) { return false; } else { DevicePcmPlayerProvider.decodeSprite(var3); diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index a0c5f48aac..07e4155771 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -7,23 +7,15 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Strings") public class Strings { @ObfuscatedName("bq") - public static String __id_bq; + public static String field880; @ObfuscatedName("cp") - public static String __id_cp; + public static String field881; @ObfuscatedName("jr") - public static String __id_jr; + public static String field882; @ObfuscatedName("jv") - public static String __id_jv; + public static String field883; @ObfuscatedName("ju") - public static String __id_ju; - - static { - __id_bq = "Please visit the support page for assistance."; - __id_cp = "Please visit the support page for assistance."; - __id_jr = ""; - __id_jv = "Page has opened in a new window."; - __id_ju = "(Please check your popup blocker.)"; - } + public static String field884; @ObfuscatedName("ay") @ObfuscatedSignature( @@ -35,26 +27,36 @@ public class Strings { Buffer var1 = new Buffer(var0); int var2 = var1.readUnsignedByte(); int var3 = var1.readInt(); - if(var3 < 0 || AbstractIndexCache.__ir_s != 0 && var3 > AbstractIndexCache.__ir_s) { - throw new RuntimeException(); - } else if(var2 == 0) { - byte[] var4 = new byte[var3]; - var1.__al_305(var4, 0, var3); - return var4; - } else { - int var6 = var1.readInt(); - if(var6 < 0 || AbstractIndexCache.__ir_s != 0 && var6 > AbstractIndexCache.__ir_s) { - throw new RuntimeException(); + if (var3 >= 0 && (AbstractIndexCache.field1 == 0 || var3 <= AbstractIndexCache.field1)) { + if (var2 == 0) { + byte[] var6 = new byte[var3]; + var1.method46(var6, 0, var3); + return var6; } else { - byte[] var5 = new byte[var6]; - if(var2 == 1) { - Bzip2Decompressor.Bzip2Decompressor_decompress(var5, var6, var0, var3, 9); + int var4 = var1.readInt(); + if (var4 < 0 || AbstractIndexCache.field1 != 0 && var4 > AbstractIndexCache.field1) { + throw new RuntimeException(); } else { - AbstractIndexCache.gzipDecompressor.decompress(var1, var5); - } + byte[] var5 = new byte[var4]; + if (var2 == 1) { + Bzip2Decompressor.Bzip2Decompressor_decompress(var5, var4, var0, var3, 9); + } else { + AbstractIndexCache.gzipDecompressor.decompress(var1, var5); + } - return var5; + return var5; + } } + } else { + throw new RuntimeException(); } } + + static { + field880 = "Please visit the support page for assistance."; + field881 = "Please visit the support page for assistance."; + field882 = ""; + field883 = "Page has opened in a new window."; + field884 = "(Please check your popup blocker.)"; + } } diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index 898e0a5a9c..6a9c2c932f 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -10,12 +10,12 @@ public class StructDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache __jq_m; + public static AbstractIndexCache field885; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" ) - public static EvictingDualNodeHashTable __jq_f; + public static EvictingDualNodeHashTable field886; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Llh;" @@ -23,10 +23,6 @@ public class StructDefinition extends DualNode { @Export("params") IterableNodeHashTable params; - static { - __jq_f = new EvictingDualNodeHashTable(64); - } - @ObfuscatedName("f") @ObfuscatedSignature( signature = "(B)V", @@ -43,9 +39,9 @@ public class StructDefinition extends DualNode { ) @Export("read") void read(Buffer var1) { - while(true) { + while (true) { int var2 = var1.readUnsignedByte(); - if(var2 == 0) { + if (var2 == 0) { return; } @@ -60,7 +56,7 @@ public class StructDefinition extends DualNode { ) @Export("readNext") void readNext(Buffer var1, int var2) { - if(var2 == 249) { + if (var2 == 249) { this.params = AbstractIndexCache.readStringIntParameters(var1, this.params); } @@ -73,20 +69,20 @@ public class StructDefinition extends DualNode { ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; - int var3; - if(var4 == null) { - var3 = var2; + IterableNodeHashTable var3 = this.params; + int var4; + if (var3 == null) { + var4 = var2; } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); - if(var5 == null) { - var3 = var2; + IntegerNode var5 = (IntegerNode)var3.get((long)var1); + if (var5 == null) { + var4 = var2; } else { - var3 = var5.integer; + var4 = var5.integer; } } - return var3; + return var4; } @ObfuscatedName("u") @@ -105,181 +101,181 @@ public class StructDefinition extends DualNode { garbageValue = "2127224103" ) static int method4952(int var0, Script var1, boolean var2) { - int var4 = -1; - Widget var3; - if(var0 >= 2000) { + int var3 = -1; + Widget var4; + if (var0 >= 2000) { var0 -= 1000; - var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var3 = Huffman.getWidget(var4); + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + var4 = Huffman.getWidget(var3); } else { - var3 = var2?WorldMapIcon1.__t_i:class12.__n_n; + var4 = var2 ? WorldMapIcon1.field1030 : class12.field1111; } - if(var0 == 1100) { + if (var0 == 1100) { 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; + var4.scrollX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + if (var4.scrollX > var4.scrollWidth - var4.width) { + var4.scrollX = var4.scrollWidth - var4.width; } - if(var3.scrollX < 0) { - var3.scrollX = 0; + if (var4.scrollX < 0) { + var4.scrollX = 0; } - var3.scrollY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - if(var3.scrollY > var3.scrollHeight - var3.height) { - var3.scrollY = var3.scrollHeight - var3.height; + var4.scrollY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + if (var4.scrollY > var4.scrollHeight - var4.height) { + var4.scrollY = var4.scrollHeight - var4.height; } - if(var3.scrollY < 0) { - var3.scrollY = 0; + if (var4.scrollY < 0) { + var4.scrollY = 0; } - class22.method295(var3); + class22.method295(var4); return 1; - } else if(var0 == 1101) { - var3.color = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var3); + } else if (var0 == 1101) { + var4.color = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + class22.method295(var4); return 1; - } else if(var0 == 1102) { - var3.fill = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - class22.method295(var3); + } else if (var0 == 1102) { + var4.fill = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + class22.method295(var4); return 1; - } else if(var0 == 1103) { - var3.transparency = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var3); + } else if (var0 == 1103) { + var4.transparency = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + class22.method295(var4); return 1; - } else if(var0 == 1104) { - var3.lineWid = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var3); + } else if (var0 == 1104) { + var4.lineWid = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + class22.method295(var4); return 1; - } else if(var0 == 1105) { - var3.spriteId2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var3); + } else if (var0 == 1105) { + var4.spriteId2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + class22.method295(var4); return 1; - } else if(var0 == 1106) { - var3.spriteAngle = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var3); + } else if (var0 == 1106) { + var4.spriteAngle = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + class22.method295(var4); return 1; - } else if(var0 == 1107) { - var3.spriteTiling = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - class22.method295(var3); + } else if (var0 == 1107) { + var4.spriteTiling = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + class22.method295(var4); return 1; - } else if(var0 == 1108) { - var3.modelType = 1; - var3.modelId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var3); + } else if (var0 == 1108) { + var4.modelType = 1; + var4.modelId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + class22.method295(var4); return 1; - } else if(var0 == 1109) { + } else if (var0 == 1109) { 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); + var4.modelOffsetX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4.modelOffsetY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + var4.modelAngleX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; + var4.modelAngleY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3]; + var4.modelAngleZ = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 4]; + var4.modelZoom = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 5]; + class22.method295(var4); return 1; } else { - int var8; - if(var0 == 1110) { - var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - if(var8 != var3.sequenceId) { - var3.sequenceId = var8; - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - class22.method295(var3); + int var5; + if (var0 == 1110) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + if (var5 != var4.sequenceId) { + var4.sequenceId = var5; + var4.modelFrame = 0; + var4.modelFrameCycle = 0; + class22.method295(var4); } return 1; - } else if(var0 == 1111) { - var3.modelOrthog = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - class22.method295(var3); + } else if (var0 == 1111) { + var4.modelOrthog = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + class22.method295(var4); return 1; - } else if(var0 == 1112) { - String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - if(!var7.equals(var3.text)) { - var3.text = var7; - class22.method295(var3); + } else if (var0 == 1112) { + String var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + if (!var8.equals(var4.text)) { + var4.text = var8; + class22.method295(var4); } return 1; - } else if(var0 == 1113) { - var3.fontId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var3); + } else if (var0 == 1113) { + var4.fontId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + class22.method295(var4); return 1; - } else if(var0 == 1114) { + } else if (var0 == 1114) { 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); + var4.textXAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4.textYAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + var4.textLineHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; + class22.method295(var4); return 1; - } else if(var0 == 1115) { - var3.textShadowed = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - class22.method295(var3); + } else if (var0 == 1115) { + var4.textShadowed = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + class22.method295(var4); return 1; - } else if(var0 == 1116) { - var3.outline = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var3); + } else if (var0 == 1116) { + var4.outline = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + class22.method295(var4); return 1; - } else if(var0 == 1117) { - var3.spriteShadow = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var3); + } else if (var0 == 1117) { + var4.spriteShadow = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + class22.method295(var4); return 1; - } else if(var0 == 1118) { - var3.spriteFlipV = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - class22.method295(var3); + } else if (var0 == 1118) { + var4.spriteFlipV = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + class22.method295(var4); return 1; - } else if(var0 == 1119) { - var3.spriteFlipH = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - class22.method295(var3); + } else if (var0 == 1119) { + var4.spriteFlipH = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + class22.method295(var4); return 1; - } else if(var0 == 1120) { + } else if (var0 == 1120) { 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); + var4.scrollWidth = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4.scrollHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + class22.method295(var4); + if (var3 != -1 && var4.type == 0) { + class39.revalidateWidgetScroll(Widget.widgets[var3 >> 16], var4, false); } return 1; - } else if(var0 == 1121) { - TilePaint.method3060(var3.id, var3.childIndex); - Client.__client_mo = var3; - class22.method295(var3); + } else if (var0 == 1121) { + TilePaint.method3060(var4.id, var4.childIndex); + Client.field127 = var4; + class22.method295(var4); return 1; - } else if(var0 == 1122) { - var3.spriteId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var3); + } else if (var0 == 1122) { + var4.spriteId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + class22.method295(var4); return 1; - } else if(var0 == 1123) { - var3.color2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var3); + } else if (var0 == 1123) { + var4.color2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + class22.method295(var4); return 1; - } else if(var0 == 1124) { - var3.__af = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var3); + } else if (var0 == 1124) { + var4.field960 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + class22.method295(var4); return 1; - } else if(var0 == 1125) { - var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - RectangleMode var6 = (RectangleMode)ScriptFrame.findEnumerated(class311.method5822(), var8); - if(var6 != null) { - var3.rectangleMode = var6; - class22.method295(var3); + } else if (var0 == 1125) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + RectangleMode var7 = (RectangleMode)ScriptFrame.findEnumerated(class311.method5822(), var5); + if (var7 != null) { + var4.rectangleMode = var7; + class22.method295(var4); } return 1; } else { - boolean var5; - if(var0 == 1126) { - var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - var3.__ba = var5; + boolean var6; + if (var0 == 1126) { + var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + var4.field961 = var6; return 1; - } else if(var0 == 1127) { - var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - var3.__bv = var5; + } else if (var0 == 1127) { + var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + var4.field964 = var6; return 1; } else { return 2; @@ -287,4 +283,8 @@ public class StructDefinition extends DualNode { } } } + + static { + field886 = new EvictingDualNodeHashTable(64); + } } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index 4e175febd8..8a6694afac 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -11,33 +11,33 @@ public enum StudioGame implements Enumerated { @ObfuscatedSignature( signature = "Lis;" ) - __is_m("runescape", "RuneScape", 0), + field887("runescape", "RuneScape", 0), @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lis;" ) - __is_f("stellardawn", "Stellar Dawn", 1), + field888("stellardawn", "Stellar Dawn", 1), @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lis;" ) - __is_q("game3", "Game 3", 2), + field889("game3", "Game 3", 2), @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lis;" ) - __is_w("game4", "Game 4", 3), + field890("game4", "Game 4", 3), @ObfuscatedName("o") @ObfuscatedSignature( signature = "Lis;" ) - __is_o("game5", "Game 5", 4), + field891("game5", "Game 5", 4), @ObfuscatedName("u") @ObfuscatedSignature( signature = "Lis;" ) - __is_u("oldscape", "RuneScape 2007", 5); - + field892("oldscape", "RuneScape 2007", 5); + @ObfuscatedName("g") @Export("name") public final String name; @@ -47,8 +47,8 @@ public enum StudioGame implements Enumerated { ) @Export("id") final int id; - - StudioGame(String var3, String var4, int var5) { + + private StudioGame(String var3, String var4, int var5) { this.name = var3; this.id = var5; } @@ -70,12 +70,12 @@ public enum StudioGame implements Enumerated { ) public static UnderlayDefinition method4550(int var0) { UnderlayDefinition var1 = (UnderlayDefinition)UnderlayDefinition.UnderlayDefinition_cached.get((long)var0); - if(var1 != null) { + if (var1 != null) { return var1; } else { byte[] var2 = UnderlayDefinition.UnderlayDefinition_indexCache.takeRecord(1, var0); var1 = new UnderlayDefinition(); - if(var2 != null) { + if (var2 != null) { var1.read(new Buffer(var2), var0); } diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java index 0ab109ab03..5a6c3f2bf9 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -52,7 +52,6 @@ public class TaskHandler implements Runnable { javaVendor = System.getProperty("java.vendor"); javaVersion = System.getProperty("java.version"); } catch (Exception var2) { - ; } this.isClosed = false; @@ -77,7 +76,6 @@ public class TaskHandler implements Runnable { try { this.thread.join(); } catch (InterruptedException var3) { - ; } } @@ -94,7 +92,7 @@ public class TaskHandler implements Runnable { var5.intArgument = var2; var5.objectArgument = var4; synchronized(this) { - if(this.task0 != null) { + if (this.task0 != null) { this.task0.next = var5; this.task0 = var5; } else { @@ -129,18 +127,18 @@ public class TaskHandler implements Runnable { @Export("run") @ObfuscatedName("run") public final void run() { - while(true) { + while (true) { Task var1; synchronized(this) { - while(true) { - if(this.isClosed) { + while (true) { + if (this.isClosed) { return; } - if(this.current != null) { + if (this.current != null) { var1 = this.current; this.current = this.current.next; - if(this.current == null) { + if (this.current == null) { this.task0 = null; } break; @@ -148,30 +146,29 @@ public class TaskHandler implements Runnable { try { this.wait(); - } catch (InterruptedException var8) { - ; + } catch (InterruptedException var7) { } } } try { - int var5 = var1.type; - if(var5 == 1) { + int var2 = var1.type; + if (var2 == 1) { var1.result = new Socket(InetAddress.getByName((String)var1.objectArgument), var1.intArgument); - } else if(var5 == 2) { + } else if (var2 == 2) { Thread var3 = new Thread((Runnable)var1.objectArgument); var3.setDaemon(true); var3.start(); var3.setPriority(var1.intArgument); var1.result = var3; - } else if(var5 == 4) { + } else if (var2 == 4) { var1.result = new DataInputStream(((URL)var1.objectArgument).openStream()); } var1.status = 1; - } catch (ThreadDeath var6) { - throw var6; - } catch (Throwable var7) { + } catch (ThreadDeath var5) { + throw var5; + } catch (Throwable var6) { var1.status = 2; } } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index b17f92e690..cc4f89e197 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -13,16 +13,16 @@ public class Texture extends Node { @Export("int1") int int1; @ObfuscatedName("u") - boolean __u; + boolean field893; @ObfuscatedName("g") @Export("records") int[] records; @ObfuscatedName("l") - int[] __l; + int[] field894; @ObfuscatedName("e") - int[] __e; + int[] field895; @ObfuscatedName("x") - int[] __x; + int[] field896; @ObfuscatedName("d") @Export("animationDirection") int animationDirection; @@ -41,37 +41,37 @@ public class Texture extends Node { ) Texture(Buffer var1) { this.isLoaded = false; - this.int1 = var1.__ag_302(); - this.__u = var1.readUnsignedByte() == 1; + this.int1 = var1.method43(); + this.field893 = var1.readUnsignedByte() == 1; int var2 = var1.readUnsignedByte(); - if(var2 >= 1 && var2 <= 4) { + if (var2 >= 1 && var2 <= 4) { this.records = new int[var2]; int var3; - for(var3 = 0; var3 < var2; ++var3) { - this.records[var3] = var1.__ag_302(); + for (var3 = 0; var3 < var2; ++var3) { + this.records[var3] = var1.method43(); } - if(var2 > 1) { - this.__l = new int[var2 - 1]; + if (var2 > 1) { + this.field894 = new int[var2 - 1]; - for(var3 = 0; var3 < var2 - 1; ++var3) { - this.__l[var3] = var1.readUnsignedByte(); + for (var3 = 0; var3 < var2 - 1; ++var3) { + this.field894[var3] = var1.readUnsignedByte(); } } - if(var2 > 1) { - this.__e = new int[var2 - 1]; + if (var2 > 1) { + this.field895 = new int[var2 - 1]; - for(var3 = 0; var3 < var2 - 1; ++var3) { - this.__e[var3] = var1.readUnsignedByte(); + for (var3 = 0; var3 < var2 - 1; ++var3) { + this.field895[var3] = var1.readUnsignedByte(); } } - this.__x = new int[var2]; + this.field896 = new int[var2]; - for(var3 = 0; var3 < var2; ++var3) { - this.__x[var3] = var1.readInt(); + for (var3 = 0; var3 < var2; ++var3) { + this.field896[var3] = var1.readInt(); } this.animationDirection = var1.readUnsignedByte(); @@ -86,10 +86,10 @@ public class Texture extends Node { @ObfuscatedSignature( signature = "(DILir;)Z" ) - boolean __m_230(double var1, int var3, AbstractIndexCache var4) { + boolean method320(double var1, int var3, AbstractIndexCache var4) { int var5; - for(var5 = 0; var5 < this.records.length; ++var5) { - if(var4.getRecordFlat(this.records[var5]) == null) { + for (var5 = 0; var5 < this.records.length; ++var5) { + if (var4.getRecordFlat(this.records[var5]) == null) { return false; } } @@ -97,85 +97,80 @@ public class Texture extends Node { var5 = var3 * var3; this.pixels = new int[var5]; - for(int var6 = 0; var6 < this.records.length; ++var6) { + for (int var6 = 0; var6 < this.records.length; ++var6) { IndexedSprite var7 = class83.method2028(var4, this.records[var6]); var7.normalize(); byte[] var8 = var7.pixels; int[] var9 = var7.palette; - int var10 = this.__x[var6]; - if((var10 & -16777216) == 16777216) { - ; + int var10 = this.field896[var6]; + if ((var10 & -16777216) == 16777216) { } - if((var10 & -16777216) == 33554432) { - ; + if ((var10 & -16777216) == 33554432) { } int var11; int var12; int var13; int var14; - if((var10 & -16777216) == 50331648) { + if ((var10 & -16777216) == 50331648) { var11 = var10 & 16711935; var12 = var10 >> 8 & 255; - for(var13 = 0; var13 < var9.length; ++var13) { + for (var13 = 0; var13 < var9.length; ++var13) { var14 = var9[var13]; - if(var14 >> 8 == (var14 & 65535)) { + if (var14 >> 8 == (var14 & 65535)) { var14 &= 255; var9[var13] = var11 * var14 >> 8 & 16711935 | var12 * var14 & 65280; } } } - for(var11 = 0; var11 < var9.length; ++var11) { + for (var11 = 0; var11 < var9.length; ++var11) { var9[var11] = Rasterizer3D.Rasterizer3D_brighten(var9[var11], var1); } - if(var6 == 0) { + if (var6 == 0) { var11 = 0; } else { - var11 = this.__l[var6 - 1]; + var11 = this.field894[var6 - 1]; } - if(var11 == 0) { - if(var3 == var7.subWidth) { - for(var12 = 0; var12 < var5; ++var12) { + if (var11 == 0) { + if (var3 == var7.subWidth) { + for (var12 = 0; var12 < var5; ++var12) { this.pixels[var12] = var9[var8[var12] & 255]; } - } else if(var7.subWidth == 64 && var3 == 128) { + } else if (var7.subWidth == 64 && var3 == 128) { var12 = 0; - for(var13 = 0; var13 < var3; ++var13) { - for(var14 = 0; var14 < var3; ++var14) { + for (var13 = 0; var13 < var3; ++var13) { + for (var14 = 0; var14 < var3; ++var14) { this.pixels[var12++] = var9[var8[(var13 >> 1 << 6) + (var14 >> 1)] & 255]; } } } else { - if(var7.subWidth != 128 || var3 != 64) { + if (var7.subWidth != 128 || var3 != 64) { throw new RuntimeException(); } var12 = 0; - for(var13 = 0; var13 < var3; ++var13) { - for(var14 = 0; var14 < var3; ++var14) { + for (var13 = 0; var13 < var3; ++var13) { + for (var14 = 0; var14 < var3; ++var14) { this.pixels[var12++] = var9[var8[(var14 << 1) + (var13 << 1 << 7)] & 255]; } } } } - if(var11 == 1) { - ; + if (var11 == 1) { } - if(var11 == 2) { - ; + if (var11 == 2) { } - if(var11 == 3) { - ; + if (var11 == 3) { } } @@ -191,20 +186,20 @@ public class Texture extends Node { @ObfuscatedName("q") @Export("Texture_animate") void Texture_animate(int var1) { - if(this.pixels != null) { + if (this.pixels != null) { short var2; int var3; int var4; int var5; int var6; int var7; - int[] var10; - if(this.animationDirection == 1 || this.animationDirection == 3) { - if(Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { + int[] var8; + if (this.animationDirection == 1 || this.animationDirection == 3) { + if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { Texture_animatedPixels = new int[this.pixels.length]; } - if(this.pixels.length == 4096) { + if (this.pixels.length == 4096) { var2 = 64; } else { var2 = 128; @@ -213,26 +208,26 @@ public class Texture extends Node { var3 = this.pixels.length; var4 = var2 * this.animationSpeed * var1; var5 = var3 - 1; - if(this.animationDirection == 1) { + if (this.animationDirection == 1) { var4 = -var4; } - for(var6 = 0; var6 < var3; ++var6) { + for (var6 = 0; var6 < var3; ++var6) { var7 = var6 + var4 & var5; Texture_animatedPixels[var6] = this.pixels[var7]; } - var10 = this.pixels; + var8 = this.pixels; this.pixels = Texture_animatedPixels; - Texture_animatedPixels = var10; + Texture_animatedPixels = var8; } - if(this.animationDirection == 2 || this.animationDirection == 4) { - if(Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { + if (this.animationDirection == 2 || this.animationDirection == 4) { + if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { Texture_animatedPixels = new int[this.pixels.length]; } - if(this.pixels.length == 4096) { + if (this.pixels.length == 4096) { var2 = 64; } else { var2 = 128; @@ -241,23 +236,23 @@ public class Texture extends Node { var3 = this.pixels.length; var4 = this.animationSpeed * var1; var5 = var2 - 1; - if(this.animationDirection == 2) { + if (this.animationDirection == 2) { var4 = -var4; } - for(var6 = 0; var6 < var3; var6 += var2) { - for(var7 = 0; var7 < var2; ++var7) { - int var8 = var6 + var7; - int var9 = var6 + (var7 + var4 & var5); - Texture_animatedPixels[var8] = this.pixels[var9]; + for (var6 = 0; var6 < var3; var6 += var2) { + for (var7 = 0; var7 < var2; ++var7) { + int var9 = var6 + var7; + int var10 = var6 + (var7 + var4 & var5); + Texture_animatedPixels[var9] = this.pixels[var10]; } } - var10 = this.pixels; + var8 = this.pixels; this.pixels = Texture_animatedPixels; - Texture_animatedPixels = var10; + Texture_animatedPixels = var8; } - } + } } diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java index 7656d33409..ef97959b05 100644 --- a/runescape-client/src/main/java/TextureLoader.java +++ b/runescape-client/src/main/java/TextureLoader.java @@ -19,14 +19,14 @@ public interface TextureLoader { signature = "(II)I", garbageValue = "-1641984961" ) - int __w_213(int var1); + int vmethod324(int var1); @ObfuscatedName("o") @ObfuscatedSignature( signature = "(IB)Z", garbageValue = "14" ) - boolean __o_214(int var1); + boolean vmethod325(int var1); @ObfuscatedName("u") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java index da771e9d17..347ad0ba62 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -66,11 +66,11 @@ public class TextureProvider implements TextureLoader { this.remaining = this.capacity; this.brightness0 = var4; this.textureSize = var6; - int[] var7 = var1.__j_395(0); + int[] var7 = var1.method3(0); int var8 = var7.length; - this.textures = new Texture[var1.__s_396(0)]; + this.textures = new Texture[var1.method4(0)]; - for(int var9 = 0; var9 < var8; ++var9) { + for (int var9 = 0; var9 < var8; ++var9) { Buffer var10 = new Buffer(var1.takeRecord(0, var7[var9])); this.textures[var7[var9]] = new Texture(var10); } @@ -82,27 +82,27 @@ public class TextureProvider implements TextureLoader { signature = "(I)I", garbageValue = "-1996487053" ) - public int __m_212() { + public int method323() { int var1 = 0; int var2 = 0; Texture[] var3 = this.textures; - for(int var4 = 0; var4 < var3.length; ++var4) { + for (int var4 = 0; var4 < var3.length; ++var4) { Texture var5 = var3[var4]; - if(var5 != null && var5.records != null) { + if (var5 != null && var5.records != null) { var1 += var5.records.length; int[] var6 = var5.records; - for(int var7 = 0; var7 < var6.length; ++var7) { + for (int var7 = 0; var7 < var6.length; ++var7) { int var8 = var6[var7]; - if(this.indexCache.__u_393(var8)) { + if (this.indexCache.method1(var8)) { ++var2; } } } } - if(var1 == 0) { + if (var1 == 0) { return 0; } else { return var2 * 100 / var1; @@ -124,16 +124,16 @@ public class TextureProvider implements TextureLoader { @Export("load") public int[] load(int var1) { Texture var2 = this.textures[var1]; - if(var2 != null) { - if(var2.pixels != null) { + if (var2 != null) { + if (var2.pixels != null) { this.deque.addLast(var2); var2.isLoaded = true; return var2.pixels; } - boolean var3 = var2.__m_230(this.brightness0, this.textureSize, this.indexCache); - if(var3) { - if(this.remaining == 0) { + boolean var3 = var2.method320(this.brightness0, this.textureSize, this.indexCache); + if (var3) { + if (this.remaining == 0) { Texture var4 = (Texture)this.deque.removeFirst(); var4.reset(); } else { @@ -154,8 +154,8 @@ public class TextureProvider implements TextureLoader { signature = "(II)I", garbageValue = "-1641984961" ) - public int __w_213(int var1) { - return this.textures[var1] != null?this.textures[var1].int1:0; + public int vmethod324(int var1) { + return this.textures[var1] != null ? this.textures[var1].int1 : 0; } @ObfuscatedName("o") @@ -163,8 +163,8 @@ public class TextureProvider implements TextureLoader { signature = "(IB)Z", garbageValue = "14" ) - public boolean __o_214(int var1) { - return this.textures[var1].__u; + public boolean vmethod325(int var1) { + return this.textures[var1].field893; } @ObfuscatedName("u") @@ -184,8 +184,8 @@ public class TextureProvider implements TextureLoader { ) @Export("clear") public void clear() { - for(int var1 = 0; var1 < this.textures.length; ++var1) { - if(this.textures[var1] != null) { + for (int var1 = 0; var1 < this.textures.length; ++var1) { + if (this.textures[var1] != null) { this.textures[var1].reset(); } } @@ -201,9 +201,9 @@ public class TextureProvider implements TextureLoader { ) @Export("animate") public void animate(int var1) { - for(int var2 = 0; var2 < this.textures.length; ++var2) { + for (int var2 = 0; var2 < this.textures.length; ++var2) { Texture var3 = this.textures[var2]; - if(var3 != null && var3.animationDirection != 0 && var3.isLoaded) { + if (var3 != null && var3.animationDirection != 0 && var3.isLoaded) { var3.Texture_animate(var1); var3.isLoaded = false; } @@ -220,7 +220,7 @@ public class TextureProvider implements TextureLoader { int var2 = var0.index; byte[] var3 = class230.method4516(var1); var0.writeSmartByteShort(var3.length); - var0.index += class303.huffman.__m_293(var3, 0, var3.length, var0.array, var0.index); + var0.index += class303.huffman.method127(var3, 0, var3.length, var0.array, var0.index); return var0.index - var2; } @@ -231,19 +231,19 @@ public class TextureProvider implements TextureLoader { ) @Export("byteArrayFromObject") public static byte[] byteArrayFromObject(Object var0, boolean var1) { - if(var0 == null) { + if (var0 == null) { return null; - } else if(var0 instanceof byte[]) { - byte[] var6 = (byte[])((byte[])var0); - if(var1) { - int var4 = var6.length; - byte[] var5 = new byte[var4]; - System.arraycopy(var6, 0, var5, 0, var4); - return var5; + } else if (var0 instanceof byte[]) { + byte[] var5 = (byte[])((byte[])((byte[])var0)); + if (var1) { + int var3 = var5.length; + byte[] var4 = new byte[var3]; + System.arraycopy(var5, 0, var4, 0, var3); + return var4; } else { - return var6; + return var5; } - } else if(var0 instanceof AbstractByteArrayCopier) { + } else if (var0 instanceof AbstractByteArrayCopier) { AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; return var2.get(); } else { @@ -261,10 +261,10 @@ public class TextureProvider implements TextureLoader { Buffer var4 = new Buffer(var0); int var5 = -1; - label69: - while(true) { - int var6 = var4.__at_308(); - if(var6 == 0) { + label71: + while (true) { + int var6 = var4.method49(); + if (var6 == 0) { return var3; } @@ -272,39 +272,51 @@ public class TextureProvider implements TextureLoader { int var7 = 0; boolean var8 = false; - while(true) { - int var9; - while(!var8) { - var9 = var4.__ae_307(); - if(var9 == 0) { - continue label69; - } + while (true) { + int var12; + ObjectDefinition var15; + do { + int var13; + int var14; + do { + do { + do { + do { + int var9; + while (var8) { + var9 = var4.method48(); + if (var9 == 0) { + continue label71; + } - var7 += var9 - 1; - int var10 = var7 & 63; - int var11 = var7 >> 6 & 63; - int var12 = var4.readUnsignedByte() >> 2; - int var13 = var11 + var1; - int var14 = var10 + var2; - if(var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { - ObjectDefinition var15 = class50.getObjectDefinition(var5); - if(var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { - if(!var15.__g_422()) { - ++Client.__client_fk; - var3 = false; - } + var4.readUnsignedByte(); + } - var8 = true; - } - } + var9 = var4.method48(); + if (var9 == 0) { + continue label71; + } + + var7 += var9 - 1; + int var10 = var7 & 63; + int var11 = var7 >> 6 & 63; + var12 = var4.readUnsignedByte() >> 2; + var13 = var11 + var1; + var14 = var10 + var2; + } while(var13 <= 0); + } while(var14 <= 0); + } while(var13 >= 103); + } while(var14 >= 103); + + var15 = class50.getObjectDefinition(var5); + } while(var12 == 22 && Client.isLowDetail && var15.int1 == 0 && var15.interactType != 1 && !var15.boolean2); + + if (!var15.method231()) { + ++Client.field179; + var3 = false; } - var9 = var4.__ae_307(); - if(var9 == 0) { - break; - } - - var4.readUnsignedByte(); + var8 = true; } } } @@ -317,93 +329,93 @@ public class TextureProvider implements TextureLoader { static int method2752(int var0, Script var1, boolean var2) { int var3; int var4; - if(var0 == 4000) { + if (var0 == 4000) { 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) { + } else if (var0 == 4001) { 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) { + } else if (var0 == 4002) { 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) { + } else if (var0 == 4003) { 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) { + } else if (var0 == 4004) { 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) { + } else if (var0 == 4005) { 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) { + } else if (var0 == 4006) { 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 var11 = 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); + int var12 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 4]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 + (var12 - var11) * (var4 - var3) / (var6 - var11); return 1; - } else if(var0 == 4007) { + } else if (var0 == 4007) { 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) { + } else if (var0 == 4008) { 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) { + } else if (var0 == 4009) { 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) { + } else if (var0 == 4010) { 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; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; return 1; - } else if(var0 == 4011) { + } else if (var0 == 4011) { 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) { + } else if (var0 == 4012) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - if(var3 == 0) { + if (var3 == 0) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); } return 1; - } else if(var0 == 4013) { + } else if (var0 == 4013) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - if(var3 == 0) { + if (var3 == 0) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; return 1; } else { @@ -429,24 +441,24 @@ public class TextureProvider implements TextureLoader { return 1; } - } else if(var0 == 4014) { + } else if (var0 == 4014) { 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) { + } else if (var0 == 4015) { 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) { + } else if (var0 == 4018) { 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); + long var5 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + long var7 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + long var9 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)(var9 * var5 / var7); return 1; } else { return 2; @@ -463,14 +475,14 @@ public class TextureProvider implements TextureLoader { FontName.method5641(); class65.scene.clear(); - for(int var0 = 0; var0 < 4; ++var0) { + for (int var0 = 0; var0 < 4; ++var0) { Client.collisionMaps[var0].clear(); } System.gc(); AbstractSocket.method3488(2); - Client.__client_qy = -1; - Client.__client_qq = false; + Client.field112 = -1; + Client.field107 = false; SpriteMask.method4390(); GameShell.updateGameState(10); } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index 8a2336572e..679acac7ce 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -113,17 +113,17 @@ public final class Tile extends Node { @ObfuscatedGetter( intValue = 1724493981 ) - int __y; + int field897; @ObfuscatedName("h") @ObfuscatedGetter( intValue = -172066661 ) - int __h; + int field898; @ObfuscatedName("b") @ObfuscatedGetter( intValue = 2030010491 ) - int __b; + int field899; @ObfuscatedName("c") @ObfuscatedSignature( signature = "Ldj;" @@ -155,132 +155,129 @@ public final class Tile extends Node { garbageValue = "117" ) @Export("addNpcToMenu") - static final void addNpcToMenu(NpcDefinition var0, int var1, int var2, int var3) { - if(Client.menuOptionsCount < 400) { - if(var0.transforms != null) { + static final void addNpcToMenu(NPCDefinition var0, int var1, int var2, int var3) { + if (Client.menuOptionsCount < 400) { + if (var0.transforms != null) { var0 = var0.transform(); } - if(var0 != null) { - if(var0.isInteractable) { - if(!var0.isFollower || Client.followerIndex == var1) { - String var4 = var0.name; - int var7; - int var8; - if(var0.combatLevel != 0) { - var7 = var0.combatLevel; - var8 = Canvas.localPlayer.combatLevel; - int var9 = var8 - var7; - String var6; - if(var9 < -9) { - var6 = BufferedFile.colorStartTag(16711680); - } else if(var9 < -6) { - var6 = BufferedFile.colorStartTag(16723968); - } else if(var9 < -3) { - var6 = BufferedFile.colorStartTag(16740352); - } else if(var9 < 0) { - var6 = BufferedFile.colorStartTag(16756736); - } else if(var9 > 9) { - var6 = BufferedFile.colorStartTag(65280); - } else if(var9 > 6) { - var6 = BufferedFile.colorStartTag(4259584); - } else if(var9 > 3) { - var6 = BufferedFile.colorStartTag(8453888); - } else if(var9 > 0) { - var6 = BufferedFile.colorStartTag(12648192); - } else { - var6 = BufferedFile.colorStartTag(16776960); + if (var0 != null && var0.isInteractable && (!var0.isFollower || Client.followerIndex == var1)) { + String var4 = var0.name; + int var5; + int var6; + int var7; + if (var0.combatLevel != 0) { + var5 = var0.combatLevel; + var6 = Canvas.localPlayer.combatLevel; + var7 = var6 - var5; + String var8; + if (var7 < -9) { + var8 = BufferedFile.colorStartTag(16711680); + } else if (var7 < -6) { + var8 = BufferedFile.colorStartTag(16723968); + } else if (var7 < -3) { + var8 = BufferedFile.colorStartTag(16740352); + } else if (var7 < 0) { + var8 = BufferedFile.colorStartTag(16756736); + } else if (var7 > 9) { + var8 = BufferedFile.colorStartTag(65280); + } else if (var7 > 6) { + var8 = BufferedFile.colorStartTag(4259584); + } else if (var7 > 3) { + var8 = BufferedFile.colorStartTag(8453888); + } else if (var7 > 0) { + var8 = BufferedFile.colorStartTag(12648192); + } else { + var8 = BufferedFile.colorStartTag(16776960); + } + + var4 = var4 + var8 + " (level-" + var0.combatLevel + ")"; + } + + if (var0.isFollower && Client.followerOpsLowPriority) { + Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + } + + if (Client.isItemSelected == 1) { + Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16776960) + var4, 7, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((FloorDecoration.selectedSpellFlags & 2) == 2) { + Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16776960) + var4, 8, var1, var2, var3); + } + } else { + var7 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; + String[] var10 = var0.actions; + if (var10 != null) { + for (var5 = 4; var5 >= 0; --var5) { + if (var10[var5] != null && !var10[var5].equalsIgnoreCase("Attack")) { + var6 = 0; + if (var5 == 0) { + var6 = var7 + 9; + } + + if (var5 == 1) { + var6 = var7 + 10; + } + + if (var5 == 2) { + var6 = var7 + 11; + } + + if (var5 == 3) { + var6 = var7 + 12; + } + + if (var5 == 4) { + var6 = var7 + 13; + } + + Tiles.insertMenuItemNoShift(var10[var5], BufferedFile.colorStartTag(16776960) + var4, var6, var1, var2, var3); } - - var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; } + } - if(var0.isFollower && Client.followerOpsLowPriority) { - Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, var1, var2, var3); - } - - if(Client.isItemSelected == 1) { - Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16776960) + var4, 7, var1, var2, var3); - } else if(Client.isSpellSelected) { - if((FloorDecoration.selectedSpellFlags & 2) == 2) { - Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16776960) + var4, 8, var1, var2, var3); - } - } else { - int var10 = var0.isFollower && Client.followerOpsLowPriority?2000:0; - String[] var11 = var0.actions; - if(var11 != null) { - for(var7 = 4; var7 >= 0; --var7) { - if(var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) { - var8 = 0; - if(var7 == 0) { - var8 = var10 + 9; - } - - if(var7 == 1) { - var8 = var10 + 10; - } - - if(var7 == 2) { - var8 = var10 + 11; - } - - if(var7 == 3) { - var8 = var10 + 12; - } - - if(var7 == 4) { - var8 = var10 + 13; - } - - Tiles.insertMenuItemNoShift(var11[var7], BufferedFile.colorStartTag(16776960) + var4, var8, var1, var2, var3); + if (var10 != null) { + for (var5 = 4; var5 >= 0; --var5) { + if (var10[var5] != null && var10[var5].equalsIgnoreCase("Attack")) { + short var9 = 0; + if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { + if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > Canvas.localPlayer.combatLevel) { + var9 = 2000; } + + var6 = 0; + if (var5 == 0) { + var6 = var9 + 9; + } + + if (var5 == 1) { + var6 = var9 + 10; + } + + if (var5 == 2) { + var6 = var9 + 11; + } + + if (var5 == 3) { + var6 = var9 + 12; + } + + if (var5 == 4) { + var6 = var9 + 13; + } + + Tiles.insertMenuItemNoShift(var10[var5], BufferedFile.colorStartTag(16776960) + var4, var6, var1, var2, var3); } } - - if(var11 != null) { - for(var7 = 4; var7 >= 0; --var7) { - if(var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) { - short var12 = 0; - if(AttackOption.AttackOption_hidden != Client.npcAttackOption) { - if(AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > Canvas.localPlayer.combatLevel) { - var12 = 2000; - } - - var8 = 0; - if(var7 == 0) { - var8 = var12 + 9; - } - - if(var7 == 1) { - var8 = var12 + 10; - } - - if(var7 == 2) { - var8 = var12 + 11; - } - - if(var7 == 3) { - var8 = var12 + 12; - } - - if(var7 == 4) { - var8 = var12 + 13; - } - - Tiles.insertMenuItemNoShift(var11[var7], BufferedFile.colorStartTag(16776960) + var4, var8, var1, var2, var3); - } - } - } - } - - if(!var0.isFollower || !Client.followerOpsLowPriority) { - Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, var1, var2, var3); - } } + } + if (!var0.isFollower || !Client.followerOpsLowPriority) { + Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, var1, var2, var3); } } } } + } } diff --git a/runescape-client/src/main/java/TileLocation.java b/runescape-client/src/main/java/TileLocation.java index 35e6007294..20e031a17f 100644 --- a/runescape-client/src/main/java/TileLocation.java +++ b/runescape-client/src/main/java/TileLocation.java @@ -42,7 +42,7 @@ public class TileLocation { } public TileLocation(int var1) { - if(var1 == -1) { + if (var1 == -1) { this.plane = -1; } else { this.plane = var1 >> 28 & 3; @@ -69,7 +69,7 @@ public class TileLocation { ) @Export("equals0") boolean equals0(TileLocation var1) { - return this.plane != var1.plane?false:(this.x != var1.x?false:this.y == var1.y); + return this.plane != var1.plane ? false : (this.x != var1.x ? false : this.y == var1.y); } @ObfuscatedName("q") @@ -83,17 +83,17 @@ public class TileLocation { } @ObfuscatedName("equals") - public boolean __equals_382(Object var1) { - return this == var1?true:(!(var1 instanceof TileLocation)?false:this.equals0((TileLocation)var1)); + public boolean method326(Object var1) { + return this == var1 ? true : (!(var1 instanceof TileLocation) ? false : this.equals0((TileLocation)var1)); } @ObfuscatedName("hashCode") - public int __hashCode_383() { + public int method327() { return this.packed(); } @ObfuscatedName("toString") - public String __toString_384() { + public String method328() { return this.toString0(","); } } diff --git a/runescape-client/src/main/java/TileModel.java b/runescape-client/src/main/java/TileModel.java index 43694cdb9b..ba633f0b6b 100644 --- a/runescape-client/src/main/java/TileModel.java +++ b/runescape-client/src/main/java/TileModel.java @@ -6,19 +6,19 @@ import net.runelite.mapping.ObfuscatedName; @Implements("TileModel") public final class TileModel { @ObfuscatedName("z") - static int[] __dv_z; + static int[] field900; @ObfuscatedName("j") - static int[] __dv_j; + static int[] field901; @ObfuscatedName("s") - static int[] __dv_s; + static int[] field902; @ObfuscatedName("t") - static int[] __dv_t; + static int[] field903; @ObfuscatedName("y") - static int[] __dv_y; + static int[] field904; @ObfuscatedName("h") - static final int[][] __dv_h; + static final int[][] field905; @ObfuscatedName("b") - static final int[][] __dv_b; + static final int[][] field906; @ObfuscatedName("m") @Export("vertexX") int[] vertexX; @@ -65,19 +65,9 @@ public final class TileModel { @Export("overlayRgb") int overlayRgb; - static { - __dv_z = new int[6]; - __dv_j = new int[6]; - __dv_s = new int[6]; - __dv_t = new int[6]; - __dv_y = new int[6]; - __dv_h = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; - __dv_b = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; - } - TileModel(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19) { this.isFlat = true; - if(var7 != var6 || var8 != var6 || var9 != var6) { + if (var7 != var6 || var8 != var6 || var9 != var6) { this.isFlat = false; } @@ -89,7 +79,7 @@ public final class TileModel { int var21 = var20 / 2; int var22 = var20 / 4; int var23 = var20 * 3 / 4; - int[] var24 = __dv_h[var1]; + int[] var24 = field905[var1]; int var25 = var24.length; this.vertexX = new int[var25]; this.vertexY = new int[var25]; @@ -99,210 +89,220 @@ public final class TileModel { int var28 = var20 * var4; int var29 = var5 * var20; + int var30; int var31; int var32; int var33; int var34; int var35; - int var36; - for(int var30 = 0; var30 < var25; ++var30) { - var31 = var24[var30]; - if((var31 & 1) == 0 && var31 <= 8) { - var31 = (var31 - var2 - var2 - 1 & 7) + 1; + for (int var36 = 0; var36 < var25; ++var36) { + var30 = var24[var36]; + if ((var30 & 1) == 0 && var30 <= 8) { + var30 = (var30 - var2 - var2 - 1 & 7) + 1; } - if(var31 > 8 && var31 <= 12) { - var31 = (var31 - 9 - var2 & 3) + 9; + if (var30 > 8 && var30 <= 12) { + var30 = (var30 - 9 - var2 & 3) + 9; } - if(var31 > 12 && var31 <= 16) { - var31 = (var31 - 13 - var2 & 3) + 13; + if (var30 > 12 && var30 <= 16) { + var30 = (var30 - 13 - var2 & 3) + 13; } - if(var31 == 1) { - var32 = var28; - var33 = var29; - var34 = var6; - var35 = var10; - var36 = var14; - } else if(var31 == 2) { - var32 = var28 + var21; - var33 = var29; - var34 = var7 + var6 >> 1; - var35 = var11 + var10 >> 1; - var36 = var15 + var14 >> 1; - } else if(var31 == 3) { - var32 = var28 + var20; - var33 = var29; - var34 = var7; - var35 = var11; - var36 = var15; - } else if(var31 == 4) { - var32 = var28 + var20; - var33 = var29 + var21; - var34 = var8 + var7 >> 1; - var35 = var11 + var12 >> 1; - var36 = var15 + var16 >> 1; - } else if(var31 == 5) { - var32 = var28 + var20; - var33 = var29 + var20; - var34 = var8; - var35 = var12; - var36 = var16; - } else if(var31 == 6) { - var32 = var28 + var21; - var33 = var29 + var20; - var34 = var8 + var9 >> 1; - var35 = var13 + var12 >> 1; - var36 = var17 + var16 >> 1; - } else if(var31 == 7) { - var32 = var28; - var33 = var29 + var20; - var34 = var9; - var35 = var13; - var36 = var17; - } else if(var31 == 8) { - var32 = var28; - var33 = var29 + var21; - var34 = var9 + var6 >> 1; - var35 = var13 + var10 >> 1; - var36 = var17 + var14 >> 1; - } else if(var31 == 9) { - var32 = var28 + var21; - var33 = var29 + var22; - var34 = var7 + var6 >> 1; - var35 = var11 + var10 >> 1; - var36 = var15 + var14 >> 1; - } else if(var31 == 10) { - var32 = var28 + var23; - var33 = var29 + var21; - var34 = var8 + var7 >> 1; - var35 = var11 + var12 >> 1; - var36 = var15 + var16 >> 1; - } else if(var31 == 11) { - var32 = var28 + var21; - var33 = var29 + var23; - var34 = var8 + var9 >> 1; - var35 = var13 + var12 >> 1; - var36 = var17 + var16 >> 1; - } else if(var31 == 12) { - var32 = var28 + var22; - var33 = var29 + var21; - var34 = var9 + var6 >> 1; - var35 = var13 + var10 >> 1; - var36 = var17 + var14 >> 1; - } else if(var31 == 13) { - var32 = var28 + var22; - var33 = var29 + var22; - var34 = var6; - var35 = var10; - var36 = var14; - } else if(var31 == 14) { - var32 = var28 + var23; - var33 = var29 + var22; - var34 = var7; - var35 = var11; - var36 = var15; - } else if(var31 == 15) { - var32 = var28 + var23; - var33 = var29 + var23; - var34 = var8; - var35 = var12; - var36 = var16; + if (var30 == 1) { + var31 = var28; + var32 = var29; + var33 = var6; + var34 = var10; + var35 = var14; + } else if (var30 == 2) { + var31 = var28 + var21; + var32 = var29; + var33 = var7 + var6 >> 1; + var34 = var11 + var10 >> 1; + var35 = var15 + var14 >> 1; + } else if (var30 == 3) { + var31 = var28 + var20; + var32 = var29; + var33 = var7; + var34 = var11; + var35 = var15; + } else if (var30 == 4) { + var31 = var28 + var20; + var32 = var29 + var21; + var33 = var8 + var7 >> 1; + var34 = var11 + var12 >> 1; + var35 = var15 + var16 >> 1; + } else if (var30 == 5) { + var31 = var28 + var20; + var32 = var29 + var20; + var33 = var8; + var34 = var12; + var35 = var16; + } else if (var30 == 6) { + var31 = var28 + var21; + var32 = var29 + var20; + var33 = var8 + var9 >> 1; + var34 = var13 + var12 >> 1; + var35 = var17 + var16 >> 1; + } else if (var30 == 7) { + var31 = var28; + var32 = var29 + var20; + var33 = var9; + var34 = var13; + var35 = var17; + } else if (var30 == 8) { + var31 = var28; + var32 = var29 + var21; + var33 = var9 + var6 >> 1; + var34 = var13 + var10 >> 1; + var35 = var17 + var14 >> 1; + } else if (var30 == 9) { + var31 = var28 + var21; + var32 = var29 + var22; + var33 = var7 + var6 >> 1; + var34 = var11 + var10 >> 1; + var35 = var15 + var14 >> 1; + } else if (var30 == 10) { + var31 = var28 + var23; + var32 = var29 + var21; + var33 = var8 + var7 >> 1; + var34 = var11 + var12 >> 1; + var35 = var15 + var16 >> 1; + } else if (var30 == 11) { + var31 = var28 + var21; + var32 = var29 + var23; + var33 = var8 + var9 >> 1; + var34 = var13 + var12 >> 1; + var35 = var17 + var16 >> 1; + } else if (var30 == 12) { + var31 = var28 + var22; + var32 = var29 + var21; + var33 = var9 + var6 >> 1; + var34 = var13 + var10 >> 1; + var35 = var17 + var14 >> 1; + } else if (var30 == 13) { + var31 = var28 + var22; + var32 = var29 + var22; + var33 = var6; + var34 = var10; + var35 = var14; + } else if (var30 == 14) { + var31 = var28 + var23; + var32 = var29 + var22; + var33 = var7; + var34 = var11; + var35 = var15; + } else if (var30 == 15) { + var31 = var28 + var23; + var32 = var29 + var23; + var33 = var8; + var34 = var12; + var35 = var16; } else { - var32 = var28 + var22; - var33 = var29 + var23; - var34 = var9; - var35 = var13; - var36 = var17; + var31 = var28 + var22; + var32 = var29 + var23; + var33 = var9; + var34 = var13; + var35 = var17; } - this.vertexX[var30] = var32; - this.vertexY[var30] = var34; - this.vertexZ[var30] = var33; - var26[var30] = var35; - var27[var30] = var36; + this.vertexX[var36] = var31; + this.vertexY[var36] = var33; + this.vertexZ[var36] = var32; + var26[var36] = var34; + var27[var36] = var35; } - int[] var38 = __dv_b[var1]; - var31 = var38.length / 4; - this.faceX = new int[var31]; - this.faceY = new int[var31]; - this.faceZ = new int[var31]; - this.triangleColorA = new int[var31]; - this.triangleColorB = new int[var31]; - this.triangleColorC = new int[var31]; - if(var3 != -1) { - this.triangleTextureId = new int[var31]; + int[] var38 = field906[var1]; + var30 = var38.length / 4; + this.faceX = new int[var30]; + this.faceY = new int[var30]; + this.faceZ = new int[var30]; + this.triangleColorA = new int[var30]; + this.triangleColorB = new int[var30]; + this.triangleColorC = new int[var30]; + if (var3 != -1) { + this.triangleTextureId = new int[var30]; } - var32 = 0; + var31 = 0; - for(var33 = 0; var33 < var31; ++var33) { - var34 = var38[var32]; - var35 = var38[var32 + 1]; - var36 = var38[var32 + 2]; - int var37 = var38[var32 + 3]; - var32 += 4; - if(var35 < 4) { + for (var32 = 0; var32 < var30; ++var32) { + var33 = var38[var31]; + var34 = var38[var31 + 1]; + var35 = var38[var31 + 2]; + int var37 = var38[var31 + 3]; + var31 += 4; + if (var34 < 4) { + var34 = var34 - var2 & 3; + } + + if (var35 < 4) { var35 = var35 - var2 & 3; } - if(var36 < 4) { - var36 = var36 - var2 & 3; - } - - if(var37 < 4) { + if (var37 < 4) { var37 = var37 - var2 & 3; } - this.faceX[var33] = var35; - this.faceY[var33] = var36; - this.faceZ[var33] = var37; - if(var34 == 0) { - this.triangleColorA[var33] = var26[var35]; - this.triangleColorB[var33] = var26[var36]; - this.triangleColorC[var33] = var26[var37]; - if(this.triangleTextureId != null) { - this.triangleTextureId[var33] = -1; + this.faceX[var32] = var34; + this.faceY[var32] = var35; + this.faceZ[var32] = var37; + if (var33 == 0) { + this.triangleColorA[var32] = var26[var34]; + this.triangleColorB[var32] = var26[var35]; + this.triangleColorC[var32] = var26[var37]; + if (this.triangleTextureId != null) { + this.triangleTextureId[var32] = -1; } } else { - this.triangleColorA[var33] = var27[var35]; - this.triangleColorB[var33] = var27[var36]; - this.triangleColorC[var33] = var27[var37]; - if(this.triangleTextureId != null) { - this.triangleTextureId[var33] = var3; + this.triangleColorA[var32] = var27[var34]; + this.triangleColorB[var32] = var27[var35]; + this.triangleColorC[var32] = var27[var37]; + if (this.triangleTextureId != null) { + this.triangleTextureId[var32] = var3; } } } - var33 = var6; - var34 = var7; - if(var7 < var6) { + var32 = var6; + var33 = var7; + if (var7 < var6) { + var32 = var7; + } + + if (var7 > var7) { var33 = var7; } - if(var7 > var7) { - var34 = var7; + if (var8 < var32) { + var32 = var8; } - if(var8 < var33) { + if (var8 > var33) { var33 = var8; } - if(var8 > var34) { - var34 = var8; + if (var9 < var32) { + var32 = var9; } - if(var9 < var33) { + if (var9 > var33) { var33 = var9; } - if(var9 > var34) { - var34 = var9; - } - + var32 /= 14; var33 /= 14; - var34 /= 14; + } + + static { + field900 = new int[6]; + field901 = new int[6]; + field902 = new int[6]; + field903 = new int[6]; + field904 = new int[6]; + field905 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; + field906 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; } } diff --git a/runescape-client/src/main/java/TilePaint.java b/runescape-client/src/main/java/TilePaint.java index e63ed8340a..e42027a483 100644 --- a/runescape-client/src/main/java/TilePaint.java +++ b/runescape-client/src/main/java/TilePaint.java @@ -11,7 +11,7 @@ public final class TilePaint { @ObfuscatedSignature( signature = "Lla;" ) - static Bounds __eb_ah; + static Bounds field907; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 181759449 @@ -70,49 +70,50 @@ public final class TilePaint { ) static final void method3061(int var0, int var1) { NodeDeque var2 = Client.groundItems[SoundSystem.plane][var0][var1]; - if(var2 == null) { + if (var2 == null) { class65.scene.removeGroundItemPile(SoundSystem.plane, var0, var1); } else { long var3 = -99999999L; GroundItem var5 = null; GroundItem var6; - for(var6 = (GroundItem)var2.last(); var6 != null; var6 = (GroundItem)var2.previous()) { + for (var6 = (GroundItem)var2.last(); var6 != null; var6 = (GroundItem)var2.previous()) { ItemDefinition var7 = Skills.getItemDefinition(var6.id); long var8 = (long)var7.price; - if(var7.isStackable == 1) { + if (var7.isStackable == 1) { var8 *= (long)(var6.quantity + 1); } - if(var8 > var3) { + if (var8 > var3) { var3 = var8; var5 = var6; } } - if(var5 == null) { + if (var5 == null) { class65.scene.removeGroundItemPile(SoundSystem.plane, var0, var1); } else { var2.addLast(var5); - GroundItem var12 = null; GroundItem var11 = null; + GroundItem var12 = null; - for(var6 = (GroundItem)var2.last(); var6 != null; var6 = (GroundItem)var2.previous()) { - if(var5.id != var6.id) { - if(var12 == null) { - var12 = var6; + for (var6 = (GroundItem)var2.last(); var6 != null; var6 = (GroundItem)var2.previous()) { + if (var5.id != var6.id) { + if (var11 == null) { + var11 = var6; } - if(var12.id != var6.id && var11 == null) { - var11 = var6; + if (var11.id != var6.id && var12 == null) { + var12 = var6; } } } long var9 = FontName.method5637(var0, var1, 3, false, 0); - class65.scene.newGroundItemPile(SoundSystem.plane, var0, var1, class32.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, SoundSystem.plane), var5, var9, var12, var11); + class65.scene.newGroundItemPile(SoundSystem.plane, var0, var1, class32.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, SoundSystem.plane), var5, var9, var11, var12); } } + } @ObfuscatedName("id") @@ -121,9 +122,9 @@ public final class TilePaint { garbageValue = "-2025682764" ) static void method3060(int var0, int var1) { - PacketBufferNode var2 = Interpreter.method1915(ClientPacket.__gs_bg, Client.packetWriter.isaacCipher); + PacketBufferNode var2 = Interpreter.method1915(ClientPacket.field292, Client.packetWriter.isaacCipher); var2.packetBuffer.writeIntLE16(var0); - var2.packetBuffer.__bo_322(var1); - Client.packetWriter.__q_167(var2); + var2.packetBuffer.method63(var1); + Client.packetWriter.method241(var2); } } diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index 2c80cd3d1a..a5bba19237 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -20,47 +20,33 @@ public final class Tiles { @Export("Tiles_minPlane") static int Tiles_minPlane; @ObfuscatedName("w") - static byte[][][] __bq_w; + static byte[][][] field908; @ObfuscatedName("l") - static byte[][][] __bq_l; + static byte[][][] field909; @ObfuscatedName("a") - static int[][][] __bq_a; + static int[][][] field910; @ObfuscatedName("t") - static final int[] __bq_t; + static final int[] field911; @ObfuscatedName("y") - static final int[] __bq_y; + static final int[] field912; @ObfuscatedName("h") - static final int[] __bq_h; + static final int[] field913; @ObfuscatedName("b") - static final int[] __bq_b; + static final int[] field914; @ObfuscatedName("c") - static final int[] __bq_c; + static final int[] field915; @ObfuscatedName("r") - static final int[] __bq_r; + static final int[] field916; @ObfuscatedName("p") @ObfuscatedGetter( intValue = -2142579405 ) - static int __bq_p; + static int field917; @ObfuscatedName("v") @ObfuscatedGetter( intValue = 834543729 ) - static int __bq_v; - - static { - Tiles_heights = new int[4][105][105]; - Tiles_renderFlags = new byte[4][104][104]; - Tiles_minPlane = 99; - __bq_t = new int[]{1, 2, 4, 8}; - __bq_y = new int[]{16, 32, 64, 128}; - __bq_h = new int[]{1, 0, -1, 0}; - __bq_b = new int[]{0, -1, 0, 1}; - __bq_c = new int[]{1, -1, -1, 1}; - __bq_r = new int[]{-1, -1, 1, 1}; - __bq_p = (int)(Math.random() * 17.0D) - 8; - __bq_v = (int)(Math.random() * 33.0D) - 16; - } + static int field918; @ObfuscatedName("aq") @ObfuscatedSignature( @@ -68,7 +54,7 @@ public final class Tiles { garbageValue = "1832579963" ) public static final void method1097(int var0, boolean var1, int var2) { - if(var0 >= 8000 && var0 <= 48000) { + if (var0 >= 8000 && var0 <= 48000) { class309.PcmPlayer_sampleRate = var0; PcmPlayer.isStereo = var1; Login.pcmPlayerCount = var2; @@ -86,4 +72,18 @@ public final class Tiles { 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); } + + static { + Tiles_heights = new int[4][105][105]; + Tiles_renderFlags = new byte[4][104][104]; + Tiles_minPlane = 99; + field911 = new int[]{1, 2, 4, 8}; + field912 = new int[]{16, 32, 64, 128}; + field913 = new int[]{1, 0, -1, 0}; + field914 = new int[]{0, -1, 0, 1}; + field915 = new int[]{1, -1, -1, 1}; + field916 = new int[]{-1, -1, 1, 1}; + field917 = (int)(Math.random() * 17.0D) - 8; + field918 = (int)(Math.random() * 33.0D) - 16; + } } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index 97088532cc..e2bd0099ce 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -11,61 +11,61 @@ public class Timer { @ObfuscatedGetter( longValue = 6181704275746246665L ) - long __m; + long field919; @ObfuscatedName("f") @ObfuscatedGetter( longValue = -8166664055136527097L ) - long __f; + long field920; @ObfuscatedName("q") - public boolean __q; + public boolean field921; @ObfuscatedName("w") @ObfuscatedGetter( longValue = -6206176920376957899L ) - long __w; + long field922; @ObfuscatedName("o") @ObfuscatedGetter( longValue = -5820022560321695785L ) - long __o; + long field923; @ObfuscatedName("u") @ObfuscatedGetter( longValue = -7044840680232740733L ) - long __u; + long field924; @ObfuscatedName("g") @ObfuscatedGetter( intValue = -500639955 ) - int __g; + int field925; @ObfuscatedName("l") @ObfuscatedGetter( intValue = 2043109577 ) - int __l; + int field926; @ObfuscatedName("e") @ObfuscatedGetter( intValue = 978183419 ) - int __e; + int field927; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 1684916659 ) - int __x; + int field928; public Timer() { - this.__m = -1L; - this.__f = -1L; - this.__q = false; - this.__w = 0L; - this.__o = 0L; - this.__u = 0L; - this.__g = 0; - this.__l = 0; - this.__e = 0; - this.__x = 0; + this.field919 = -1L; + this.field920 = -1L; + this.field921 = false; + this.field922 = 0L; + this.field923 = 0L; + this.field924 = 0L; + this.field925 = 0; + this.field926 = 0; + this.field927 = 0; + this.field928 = 0; } @ObfuscatedName("m") @@ -73,8 +73,8 @@ public class Timer { signature = "(I)V", garbageValue = "2027048361" ) - public void __m_453() { - this.__m = class203.currentTimeMs(); + public void method329() { + this.field919 = class203.currentTimeMs(); } @ObfuscatedName("f") @@ -82,10 +82,10 @@ public class Timer { signature = "(B)V", garbageValue = "3" ) - public void __f_454() { - if(-1L != this.__m) { - this.__o = class203.currentTimeMs() - this.__m; - this.__m = -1L; + public void method330() { + if (-1L != this.field919) { + this.field923 = class203.currentTimeMs() - this.field919; + this.field919 = -1L; } } @@ -95,9 +95,9 @@ public class Timer { signature = "(II)V", garbageValue = "-1162738177" ) - public void __q_455(int var1) { - this.__f = class203.currentTimeMs(); - this.__g = var1; + public void method331(int var1) { + this.field920 = class203.currentTimeMs(); + this.field925 = var1; } @ObfuscatedName("w") @@ -105,14 +105,14 @@ public class Timer { signature = "(I)V", garbageValue = "-1855026926" ) - public void __w_456() { - if(this.__f != -1L) { - this.__w = class203.currentTimeMs() - this.__f; - this.__f = -1L; + public void method332() { + if (this.field920 != -1L) { + this.field922 = class203.currentTimeMs() - this.field920; + this.field920 = -1L; } - ++this.__e; - this.__q = true; + ++this.field927; + this.field921 = true; } @ObfuscatedName("o") @@ -120,9 +120,9 @@ public class Timer { signature = "(S)V", garbageValue = "-30171" ) - public void __o_457() { - this.__q = false; - this.__l = 0; + public void method333() { + this.field921 = false; + this.field926 = 0; } @ObfuscatedName("u") @@ -130,8 +130,8 @@ public class Timer { signature = "(I)V", garbageValue = "-812012402" ) - public void __u_458() { - this.__w_456(); + public void method334() { + this.method332(); } @ObfuscatedName("g") @@ -141,36 +141,36 @@ public class Timer { ) @Export("write") public void write(Buffer var1) { - long var2 = this.__o; + long var2 = this.field923; var2 /= 10L; - if(var2 < 0L) { + if (var2 < 0L) { var2 = 0L; - } else if(var2 > 65535L) { + } else if (var2 > 65535L) { var2 = 65535L; } var1.writeShort((int)var2); - long var4 = this.__w; + long var4 = this.field922; var4 /= 10L; - if(var4 < 0L) { + if (var4 < 0L) { var4 = 0L; - } else if(var4 > 65535L) { + } else if (var4 > 65535L) { var4 = 65535L; } var1.writeShort((int)var4); - long var6 = this.__u; + long var6 = this.field924; var6 /= 10L; - if(var6 < 0L) { + if (var6 < 0L) { var6 = 0L; - } else if(var6 > 65535L) { + } else if (var6 > 65535L) { var6 = 65535L; } var1.writeShort((int)var6); - var1.writeShort(this.__g); - var1.writeShort(this.__l); - var1.writeShort(this.__e); - var1.writeShort(this.__x); + var1.writeShort(this.field925); + var1.writeShort(this.field926); + var1.writeShort(this.field927); + var1.writeShort(this.field928); } } diff --git a/runescape-client/src/main/java/TotalQuantityComparator.java b/runescape-client/src/main/java/TotalQuantityComparator.java index 14da8aef2c..7437594cb0 100644 --- a/runescape-client/src/main/java/TotalQuantityComparator.java +++ b/runescape-client/src/main/java/TotalQuantityComparator.java @@ -12,18 +12,18 @@ final class TotalQuantityComparator implements Comparator { signature = "(Ll;Ll;I)I", garbageValue = "-573736433" ) - int __m_5(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity?-1:(var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity?0:1); + int method335(GrandExchangeEvent var1, GrandExchangeEvent var2) { + return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity ? -1 : (var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity ? 0 : 1); } @Export("compare") @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.__m_5((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.method335((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } @ObfuscatedName("equals") - public boolean __equals_7(Object var1) { + public boolean method336(Object var1) { return super.equals(var1); } @@ -35,68 +35,68 @@ final class TotalQuantityComparator implements Comparator { @Export("loadTerrain") static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { int var7; - if(var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { Tiles.Tiles_renderFlags[var1][var2][var3] = 0; - while(true) { + while (true) { var7 = var0.readUnsignedByte(); - if(var7 == 0) { - if(var1 == 0) { - int[] var8 = Tiles.Tiles_heights[0][var2]; - int var11 = var2 + var4 + 932731; - int var12 = var3 + var5 + 556238; - int var13 = Script.method2204(var11 + 45365, var12 + 91923, 4) - 128 + (Script.method2204(10294 + var11, 37821 + var12, 2) - 128 >> 1) + (Script.method2204(var11, var12, 1) - 128 >> 2); - var13 = (int)((double)var13 * 0.3D) + 35; - if(var13 < 10) { - var13 = 10; - } else if(var13 > 60) { - var13 = 60; + if (var7 == 0) { + if (var1 == 0) { + int[] var12 = Tiles.Tiles_heights[0][var2]; + int var9 = var2 + var4 + 932731; + int var10 = var3 + var5 + 556238; + int var11 = Script.method2204(var9 + 45365, var10 + 91923, 4) - 128 + (Script.method2204(10294 + var9, 37821 + var10, 2) - 128 >> 1) + (Script.method2204(var9, var10, 1) - 128 >> 2); + var11 = (int)((double)var11 * 0.3D) + 35; + if (var11 < 10) { + var11 = 10; + } else if (var11 > 60) { + var11 = 60; } - var8[var3] = -var13 * 8; + var12[var3] = -var11 * 8; } else { Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; } break; } - if(var7 == 1) { - int var14 = var0.readUnsignedByte(); - if(var14 == 1) { - var14 = 0; + if (var7 == 1) { + int var8 = var0.readUnsignedByte(); + if (var8 == 1) { + var8 = 0; } - if(var1 == 0) { - Tiles.Tiles_heights[0][var2][var3] = -var14 * 8; + if (var1 == 0) { + Tiles.Tiles_heights[0][var2][var3] = -var8 * 8; } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var14 * 8; + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; } break; } - if(var7 <= 49) { - Fonts.__kz_o[var1][var2][var3] = var0.readByte(); - class32.__ay_u[var1][var2][var3] = (byte)((var7 - 2) / 4); - class307.__kc_g[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); - } else if(var7 <= 81) { + if (var7 <= 49) { + Fonts.field350[var1][var2][var3] = var0.readByte(); + class32.field1157[var1][var2][var3] = (byte)((var7 - 2) / 4); + class307.field1155[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); + } else if (var7 <= 81) { Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); } else { - Tiles.__bq_w[var1][var2][var3] = (byte)(var7 - 81); + Tiles.field908[var1][var2][var3] = (byte)(var7 - 81); } } } else { - while(true) { + while (true) { var7 = var0.readUnsignedByte(); - if(var7 == 0) { + if (var7 == 0) { break; } - if(var7 == 1) { + if (var7 == 1) { var0.readUnsignedByte(); break; } - if(var7 <= 49) { + if (var7 <= 49) { var0.readUnsignedByte(); } } @@ -115,7 +115,7 @@ final class TotalQuantityComparator implements Comparator { int var5 = (Canvas.localPlayer.x >> 7) + class50.baseX; int var6 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY; TileLocation var7 = new TileLocation(var4, var5, var6); - BufferedFile.worldMap().__h_526(var3, var7, var1, var2); + BufferedFile.worldMap().method367(var3, var7, var1, var2); } @ObfuscatedName("ik") @@ -125,87 +125,85 @@ final class TotalQuantityComparator implements Comparator { ) @Export("addPlayerToMenu") static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if(Canvas.localPlayer != var0) { - if(Client.menuOptionsCount < 400) { - String var4; - int var7; - if(var0.skillLevel == 0) { - String var5 = var0.actions[0] + var0.username + var0.actions[1]; - var7 = var0.combatLevel; - int var8 = Canvas.localPlayer.combatLevel; - int var9 = var8 - var7; - String var6; - if(var9 < -9) { - var6 = BufferedFile.colorStartTag(16711680); - } else if(var9 < -6) { - var6 = BufferedFile.colorStartTag(16723968); - } else if(var9 < -3) { - var6 = BufferedFile.colorStartTag(16740352); - } else if(var9 < 0) { - var6 = BufferedFile.colorStartTag(16756736); - } else if(var9 > 9) { - var6 = BufferedFile.colorStartTag(65280); - } else if(var9 > 6) { - var6 = BufferedFile.colorStartTag(4259584); - } else if(var9 > 3) { - var6 = BufferedFile.colorStartTag(8453888); - } else if(var9 > 0) { - var6 = BufferedFile.colorStartTag(12648192); - } else { - var6 = BufferedFile.colorStartTag(16776960); - } - - var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; + if (Canvas.localPlayer != var0 && Client.menuOptionsCount < 400) { + String var4; + int var5; + if (var0.skillLevel == 0) { + String var6 = var0.actions[0] + var0.username + var0.actions[1]; + var5 = var0.combatLevel; + int var7 = Canvas.localPlayer.combatLevel; + int var8 = var7 - var5; + String var9; + if (var8 < -9) { + var9 = BufferedFile.colorStartTag(16711680); + } else if (var8 < -6) { + var9 = BufferedFile.colorStartTag(16723968); + } else if (var8 < -3) { + var9 = BufferedFile.colorStartTag(16740352); + } else if (var8 < 0) { + var9 = BufferedFile.colorStartTag(16756736); + } else if (var8 > 9) { + var9 = BufferedFile.colorStartTag(65280); + } else if (var8 > 6) { + var9 = BufferedFile.colorStartTag(4259584); + } else if (var8 > 3) { + var9 = BufferedFile.colorStartTag(8453888); + } else if (var8 > 0) { + var9 = BufferedFile.colorStartTag(12648192); } else { - var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; + var9 = BufferedFile.colorStartTag(16776960); } - int var10; - if(Client.isItemSelected == 1) { - Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16777215) + var4, 14, var1, var2, var3); - } else if(Client.isSpellSelected) { - if((FloorDecoration.selectedSpellFlags & 8) == 8) { - Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16777215) + var4, 15, var1, var2, var3); - } - } else { - for(var10 = 7; var10 >= 0; --var10) { - if(Client.playerMenuActions[var10] != null) { - short var11 = 0; - if(Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { - if(AttackOption.AttackOption_hidden == Client.playerAttackOption) { - continue; - } + var4 = var6 + var9 + " (level-" + var0.combatLevel + ")" + var0.actions[2]; + } else { + var4 = var0.actions[0] + var0.username + var0.actions[1] + " (skill-" + var0.skillLevel + ")" + var0.actions[2]; + } - if(AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > Canvas.localPlayer.combatLevel) { - var11 = 2000; - } + int var10; + if (Client.isItemSelected == 1) { + Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16777215) + var4, 14, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((FloorDecoration.selectedSpellFlags & 8) == 8) { + Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16777215) + var4, 15, var1, var2, var3); + } + } else { + for (var10 = 7; var10 >= 0; --var10) { + if (Client.playerMenuActions[var10] != null) { + short var11 = 0; + if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { + if (AttackOption.AttackOption_hidden == Client.playerAttackOption) { + continue; + } - if(Canvas.localPlayer.team != 0 && var0.team != 0) { - if(var0.team == Canvas.localPlayer.team) { - var11 = 2000; - } else { - var11 = 0; - } - } - } else if(Client.playerOptionsPriorities[var10]) { + if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > Canvas.localPlayer.combatLevel) { var11 = 2000; } - boolean var12 = false; - var7 = Client.playerMenuOpcodes[var10] + var11; - Tiles.insertMenuItemNoShift(Client.playerMenuActions[var10], BufferedFile.colorStartTag(16777215) + var4, var7, var1, var2, var3); + if (Canvas.localPlayer.team != 0 && var0.team != 0) { + if (var0.team == Canvas.localPlayer.team) { + var11 = 2000; + } else { + var11 = 0; + } + } + } else if (Client.playerOptionsPriorities[var10]) { + var11 = 2000; } + + boolean var12 = false; + var5 = Client.playerMenuOpcodes[var10] + var11; + Tiles.insertMenuItemNoShift(Client.playerMenuActions[var10], BufferedFile.colorStartTag(16777215) + var4, var5, var1, var2, var3); } } + } - for(var10 = 0; var10 < Client.menuOptionsCount; ++var10) { - if(Client.menuOpcodes[var10] == 23) { - Client.menuTargetNames[var10] = BufferedFile.colorStartTag(16777215) + var4; - break; - } + for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { + if (Client.menuOpcodes[var10] == 23) { + Client.menuTargetNames[var10] = BufferedFile.colorStartTag(16777215) + var4; + break; } - } } + } } diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index dd0f2233b5..d15489313e 100644 --- a/runescape-client/src/main/java/TriBool.java +++ b/runescape-client/src/main/java/TriBool.java @@ -31,21 +31,21 @@ public class TriBool { @Export("urlRequester") static UrlRequester urlRequester; - static { - TriBool_unknown = new TriBool(); - TriBool_true = new TriBool(); - TriBool_false = new TriBool(); - } - @ObfuscatedName("go") @ObfuscatedSignature( signature = "(I)V", garbageValue = "-1009406649" ) static void method5560() { - if(Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { WorldMapCacheName.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); } } + + static { + TriBool_unknown = new TriBool(); + TriBool_true = new TriBool(); + TriBool_false = new TriBool(); + } } diff --git a/runescape-client/src/main/java/UnderlayDefinition.java b/runescape-client/src/main/java/UnderlayDefinition.java index 67346653c6..8ebdfe0da9 100644 --- a/runescape-client/src/main/java/UnderlayDefinition.java +++ b/runescape-client/src/main/java/UnderlayDefinition.java @@ -50,10 +50,6 @@ public class UnderlayDefinition extends DualNode { @Export("hueMultiplier") public int hueMultiplier; - static { - UnderlayDefinition_cached = new EvictingDualNodeHashTable(64); - } - UnderlayDefinition() { this.rgb = 0; } @@ -75,9 +71,9 @@ public class UnderlayDefinition extends DualNode { ) @Export("read") void read(Buffer var1, int var2) { - while(true) { + while (true) { int var3 = var1.readUnsignedByte(); - if(var3 == 0) { + if (var3 == 0) { return; } @@ -92,7 +88,7 @@ public class UnderlayDefinition extends DualNode { ) @Export("readNext") void readNext(Buffer var1, int var2, int var3) { - if(var2 == 1) { + if (var2 == 1) { this.rgb = var1.readMedium(); } @@ -109,40 +105,40 @@ public class UnderlayDefinition extends DualNode { double var4 = (double)(var1 >> 8 & 255) / 256.0D; double var6 = (double)(var1 & 255) / 256.0D; double var8 = var2; - if(var4 < var2) { + if (var4 < var2) { var8 = var4; } - if(var6 < var8) { + if (var6 < var8) { var8 = var6; } double var10 = var2; - if(var4 > var2) { + if (var4 > var2) { var10 = var4; } - if(var6 > var10) { + if (var6 > var10) { var10 = var6; } double var12 = 0.0D; double var14 = 0.0D; double var16 = (var10 + var8) / 2.0D; - if(var10 != var8) { - if(var16 < 0.5D) { + if (var10 != var8) { + if (var16 < 0.5D) { var14 = (var10 - var8) / (var10 + var8); } - if(var16 >= 0.5D) { + if (var16 >= 0.5D) { var14 = (var10 - var8) / (2.0D - var10 - var8); } - if(var2 == var10) { + if (var2 == var10) { var12 = (var4 - var6) / (var10 - var8); - } else if(var4 == var10) { + } else if (var4 == var10) { var12 = 2.0D + (var6 - var2) / (var10 - var8); - } else if(var10 == var6) { + } else if (var10 == var6) { var12 = (var2 - var4) / (var10 - var8) + 4.0D; } } @@ -150,25 +146,25 @@ public class UnderlayDefinition extends DualNode { var12 /= 6.0D; this.saturation = (int)(256.0D * var14); this.lightness = (int)(256.0D * var16); - if(this.saturation < 0) { + if (this.saturation < 0) { this.saturation = 0; - } else if(this.saturation > 255) { + } else if (this.saturation > 255) { this.saturation = 255; } - if(this.lightness < 0) { + if (this.lightness < 0) { this.lightness = 0; - } else if(this.lightness > 255) { + } else if (this.lightness > 255) { this.lightness = 255; } - if(var16 > 0.5D) { + if (var16 > 0.5D) { this.hueMultiplier = (int)(var14 * (1.0D - var16) * 512.0D); } else { this.hueMultiplier = (int)(var16 * var14 * 512.0D); } - if(this.hueMultiplier < 1) { + if (this.hueMultiplier < 1) { this.hueMultiplier = 1; } @@ -183,4 +179,8 @@ public class UnderlayDefinition extends DualNode { static class249[] method4839() { return new class249[]{class249.field3277, class249.field3273, class249.field3274}; } + + static { + UnderlayDefinition_cached = new EvictingDualNodeHashTable(64); + } } diff --git a/runescape-client/src/main/java/UnitPriceComparator.java b/runescape-client/src/main/java/UnitPriceComparator.java index 57e4706f23..d1c09b9fe3 100644 --- a/runescape-client/src/main/java/UnitPriceComparator.java +++ b/runescape-client/src/main/java/UnitPriceComparator.java @@ -25,18 +25,18 @@ final class UnitPriceComparator implements Comparator { signature = "(Ll;Ll;I)I", garbageValue = "-120071238" ) - int __m_11(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice?-1:(var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice?0:1); + int method337(GrandExchangeEvent var1, GrandExchangeEvent var2) { + return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice ? -1 : (var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice ? 0 : 1); } @Export("compare") @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.__m_11((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.method337((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } @ObfuscatedName("equals") - public boolean __equals_13(Object var1) { + public boolean method338(Object var1) { return super.equals(var1); } @@ -69,14 +69,14 @@ final class UnitPriceComparator implements Comparator { garbageValue = "2032203362" ) static final int method131() { - if(ReflectionCheck.clientPreferences.roofsHidden) { + if (ReflectionCheck.clientPreferences.roofsHidden) { return SoundSystem.plane; } else { int var0 = 3; - if(WorldMapIcon1.cameraPitch < 310) { + if (WorldMapIcon1.cameraPitch < 310) { int var1; int var2; - if(Client.oculusOrbState == 1) { + if (Client.oculusOrbState == 1) { var1 = MouseHandler.oculusOrbFocalPointX >> 7; var2 = ScriptEvent.oculusOrbFocalPointY >> 7; } else { @@ -86,27 +86,27 @@ final class UnitPriceComparator implements Comparator { int var3 = WorldMapSection1.cameraX >> 7; int var4 = class11.cameraZ >> 7; - if(var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { + if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { return SoundSystem.plane; } - if(var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) { + if (var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) { return SoundSystem.plane; } - if((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) { + if ((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) { var0 = SoundSystem.plane; } int var5; - if(var1 > var3) { + if (var1 > var3) { var5 = var1 - var3; } else { var5 = var3 - var1; } int var6; - if(var2 > var4) { + if (var2 > var4) { var6 = var2 - var4; } else { var6 = var4 - var2; @@ -114,60 +114,60 @@ final class UnitPriceComparator implements Comparator { int var7; int var8; - if(var5 > var6) { + if (var5 > var6) { var7 = var6 * 65536 / var5; var8 = 32768; - while(var3 != var1) { - if(var3 < var1) { + while (var3 != var1) { + if (var3 < var1) { ++var3; - } else if(var3 > var1) { + } else if (var3 > var1) { --var3; } - if((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) { + if ((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) { var0 = SoundSystem.plane; } var8 += var7; - if(var8 >= 65536) { + if (var8 >= 65536) { var8 -= 65536; - if(var4 < var2) { + if (var4 < var2) { ++var4; - } else if(var4 > var2) { + } else if (var4 > var2) { --var4; } - if((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) { + if ((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) { var0 = SoundSystem.plane; } } } - } else if(var6 > 0) { + } else if (var6 > 0) { var7 = var5 * 65536 / var6; var8 = 32768; - while(var4 != var2) { - if(var4 < var2) { + while (var4 != var2) { + if (var4 < var2) { ++var4; - } else if(var4 > var2) { + } else if (var4 > var2) { --var4; } - if((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) { + if ((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) { var0 = SoundSystem.plane; } var8 += var7; - if(var8 >= 65536) { + if (var8 >= 65536) { var8 -= 65536; - if(var3 < var1) { + if (var3 < var1) { ++var3; - } else if(var3 > var1) { + } else if (var3 > var1) { --var3; } - if((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) { + if ((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) { var0 = SoundSystem.plane; } } @@ -175,8 +175,8 @@ final class UnitPriceComparator implements Comparator { } } - if(Canvas.localPlayer.x >= 0 && Canvas.localPlayer.y >= 0 && Canvas.localPlayer.x < 13312 && Canvas.localPlayer.y < 13312) { - if((Tiles.Tiles_renderFlags[SoundSystem.plane][Canvas.localPlayer.x >> 7][Canvas.localPlayer.y >> 7] & 4) != 0) { + if (Canvas.localPlayer.x >= 0 && Canvas.localPlayer.y >= 0 && Canvas.localPlayer.x < 13312 && Canvas.localPlayer.y < 13312) { + if ((Tiles.Tiles_renderFlags[SoundSystem.plane][Canvas.localPlayer.x >> 7][Canvas.localPlayer.y >> 7] & 4) != 0) { var0 = SoundSystem.plane; } @@ -193,12 +193,12 @@ final class UnitPriceComparator implements Comparator { garbageValue = "-239357025" ) static final void method136(int var0, int var1) { - if(Client.hintArrowType == 2) { + if (Client.hintArrowType == 2) { WorldMapLabel.worldToScreen((Client.hintArrowX - class50.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - GraphicsObject.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); - if(Client.viewportTempX > -1 && Client.cycle % 20 < 10) { + if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { Player.headIconHintSprites[0].drawAt2(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); } - } + } } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index f34eb61bc9..2ba47e291b 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -18,12 +18,12 @@ public class UrlRequester implements Runnable { @ObfuscatedGetter( intValue = -883931753 ) - static int __eo_u; + static int field929; @ObfuscatedName("ak") @ObfuscatedSignature( signature = "Lla;" ) - static Bounds __eo_ak; + static Bounds field930; @ObfuscatedName("m") @Export("thread") final Thread thread; @@ -72,7 +72,6 @@ public class UrlRequester implements Runnable { this.thread.join(); } catch (InterruptedException var4) { - ; } } @@ -80,16 +79,15 @@ public class UrlRequester implements Runnable { @Export("run") @ObfuscatedName("run") public void run() { - while(!this.isClosed) { + while (!this.isClosed) { try { UrlRequest var1; synchronized(this) { var1 = (UrlRequest)this.requests.poll(); - if(var1 == null) { + if (var1 == null) { try { this.wait(); - } catch (InterruptedException var13) { - ; + } catch (InterruptedException var12) { } continue; } @@ -104,29 +102,29 @@ public class UrlRequester implements Runnable { var3.setReadTimeout(5000); var3.setUseCaches(false); var3.setRequestProperty("Connection", "close"); - int var7 = var3.getContentLength(); - if(var7 >= 0) { - byte[] var5 = new byte[var7]; + int var4 = var3.getContentLength(); + if (var4 >= 0) { + byte[] var5 = new byte[var4]; var2 = new DataInputStream(var3.getInputStream()); var2.readFully(var5); var1.response0 = var5; } var1.isDone0 = true; - } catch (IOException var14) { + } catch (IOException var13) { var1.isDone0 = true; } finally { - if(var2 != null) { + if (var2 != null) { var2.close(); } - if(var3 != null && var3 instanceof HttpURLConnection) { + if (var3 != null && var3 instanceof HttpURLConnection) { ((HttpURLConnection)var3).disconnect(); } } - } catch (Exception var17) { - NpcDefinition.sendStackTrace((String)null, var17); + } catch (Exception var16) { + NPCDefinition.sendStackTrace((String)null, var16); } } @@ -146,17 +144,17 @@ public class UrlRequester implements Runnable { int[] var8 = Players.Players_indices; int var9; - for(var9 = 0; var9 < var7 + Client.npcCount; ++var9) { + for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) { Object var10; - if(var9 < var7) { + if (var9 < var7) { var10 = Client.players[var8[var9]]; - if(var8[var9] == Client.combatTargetPlayerIndex) { + if (var8[var9] == Client.combatTargetPlayerIndex) { var4 = true; var5 = var9; continue; } - if(var10 == Canvas.localPlayer) { + if (var10 == Canvas.localPlayer) { var6 = var9; continue; } @@ -167,26 +165,26 @@ public class UrlRequester implements Runnable { class39.drawActor2d((Actor)var10, var9, var0, var1, var2, var3); } - if(Client.renderSelf && var6 != -1) { + if (Client.renderSelf && var6 != -1) { class39.drawActor2d(Canvas.localPlayer, var6, var0, var1, var2, var3); } - if(var4) { + if (var4) { class39.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3); } - for(var9 = 0; var9 < Client.overheadTextCount; ++var9) { + for (var9 = 0; var9 < Client.overheadTextCount; ++var9) { int var19 = Client.overheadTextXs[var9]; int var11 = Client.overheadTextYs[var9]; int var12 = Client.overheadTextXOffsets[var9]; int var13 = Client.overheadTextAscents[var9]; boolean var14 = true; - while(var14) { + while (var14) { var14 = false; - for(int var15 = 0; var15 < var9; ++var15) { - if(var11 + 2 > Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] && var11 - var13 < Client.overheadTextYs[var15] + 2 && var19 - var12 < Client.overheadTextXOffsets[var15] + Client.overheadTextXs[var15] && var19 + var12 > Client.overheadTextXs[var15] - Client.overheadTextXOffsets[var15] && Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] < var11) { + for (int var15 = 0; var15 < var9; ++var15) { + if (var11 + 2 > Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] && var11 - var13 < Client.overheadTextYs[var15] + 2 && var19 - var12 < Client.overheadTextXOffsets[var15] + Client.overheadTextXs[var15] && var19 + var12 > Client.overheadTextXs[var15] - Client.overheadTextXOffsets[var15] && Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] < var11) { var11 = Client.overheadTextYs[var15] - Client.overheadTextAscents[var15]; var14 = true; } @@ -196,87 +194,87 @@ public class UrlRequester implements Runnable { Client.viewportTempX = Client.overheadTextXs[var9]; Client.viewportTempY = Client.overheadTextYs[var9] = var11; String var20 = Client.overheadText[var9]; - if(Client.chatEffects == 0) { + if (Client.chatEffects == 0) { int var16 = 16776960; - if(Client.overheadTextColors[var9] < 6) { - var16 = Client.__client_pv[Client.overheadTextColors[var9]]; + if (Client.overheadTextColors[var9] < 6) { + var16 = Client.field160[Client.overheadTextColors[var9]]; } - if(Client.overheadTextColors[var9] == 6) { - var16 = Client.viewportDrawCount % 20 < 10?16711680:16776960; + if (Client.overheadTextColors[var9] == 6) { + var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; } - if(Client.overheadTextColors[var9] == 7) { - var16 = Client.viewportDrawCount % 20 < 10?255:'\uffff'; + if (Client.overheadTextColors[var9] == 7) { + var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; } - if(Client.overheadTextColors[var9] == 8) { - var16 = Client.viewportDrawCount % 20 < 10?'뀀':8454016; + if (Client.overheadTextColors[var9] == 8) { + var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; } int var17; - if(Client.overheadTextColors[var9] == 9) { + if (Client.overheadTextColors[var9] == 9) { var17 = 150 - Client.overheadTextCyclesRemaining[var9]; - if(var17 < 50) { + if (var17 < 50) { var16 = var17 * 1280 + 16711680; - } else if(var17 < 100) { + } else if (var17 < 100) { var16 = 16776960 - (var17 - 50) * 327680; - } else if(var17 < 150) { + } else if (var17 < 150) { var16 = (var17 - 100) * 5 + 65280; } } - if(Client.overheadTextColors[var9] == 10) { + if (Client.overheadTextColors[var9] == 10) { var17 = 150 - Client.overheadTextCyclesRemaining[var9]; - if(var17 < 50) { + if (var17 < 50) { var16 = var17 * 5 + 16711680; - } else if(var17 < 100) { + } else if (var17 < 100) { var16 = 16711935 - (var17 - 50) * 327680; - } else if(var17 < 150) { + } else if (var17 < 150) { var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5; } } - if(Client.overheadTextColors[var9] == 11) { + if (Client.overheadTextColors[var9] == 11) { var17 = 150 - Client.overheadTextCyclesRemaining[var9]; - if(var17 < 50) { + if (var17 < 50) { var16 = 16777215 - var17 * 327685; - } else if(var17 < 100) { + } else if (var17 < 100) { var16 = (var17 - 50) * 327685 + 65280; - } else if(var17 < 150) { + } else if (var17 < 150) { var16 = 16777215 - (var17 - 100) * 327680; } } - if(Client.overheadTextEffects[var9] == 0) { + if (Client.overheadTextEffects[var9] == 0) { class2.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0); } - if(Client.overheadTextEffects[var9] == 1) { + if (Client.overheadTextEffects[var9] == 1) { class2.fontBold12.drawCenteredWave(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); } - if(Client.overheadTextEffects[var9] == 2) { + if (Client.overheadTextEffects[var9] == 2) { class2.fontBold12.drawCenteredWave2(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); } - if(Client.overheadTextEffects[var9] == 3) { + if (Client.overheadTextEffects[var9] == 3) { class2.fontBold12.drawCenteredShake(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]); } - if(Client.overheadTextEffects[var9] == 4) { + if (Client.overheadTextEffects[var9] == 4) { var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (class2.fontBold12.stringWidth(var20) + 100) / 150; Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); class2.fontBold12.draw(var20, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0); Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); } - if(Client.overheadTextEffects[var9] == 5) { + if (Client.overheadTextEffects[var9] == 5) { var17 = 150 - Client.overheadTextCyclesRemaining[var9]; int var18 = 0; - if(var17 < 25) { + if (var17 < 25) { var18 = var17 - 25; - } else if(var17 > 125) { + } else if (var17 > 125) { var18 = var17 - 125; } diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index 4a1913ceb9..51a619cdf7 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -36,7 +36,7 @@ public class User implements Comparable { ) @Export("name") public String name() { - return this.username0 == null?"":this.username0.getName(); + return this.username0 == null ? "" : this.username0.getName(); } @ObfuscatedName("ag") @@ -46,7 +46,7 @@ public class User implements Comparable { ) @Export("previousName") public String previousName() { - return this.previousUsername == null?"":this.previousUsername.getName(); + return this.previousUsername == null ? "" : this.previousUsername.getName(); } @ObfuscatedName("aq") @@ -56,7 +56,7 @@ public class User implements Comparable { ) @Export("set") void set(Username var1, Username var2) { - if(var1 == null) { + if (var1 == null) { throw new NullPointerException(); } else { this.username0 = var1; diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index a289a2a733..2adcca3189 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -8,10 +8,10 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator1") public class UserComparator1 implements Comparator { @ObfuscatedName("m") - final boolean __m; + final boolean field931; public UserComparator1(boolean var1) { - this.__m = var1; + this.field931 = var1; } @ObfuscatedName("m") @@ -19,18 +19,18 @@ public class UserComparator1 implements Comparator { signature = "(Ljs;Ljs;B)I", garbageValue = "68" ) - int __m_476(User var1, User var2) { - return this.__m?var1.compareTo0(var2):var2.compareTo0(var1); + int method339(User var1, User var2) { + return this.field931 ? var1.compareTo0(var2) : var2.compareTo0(var1); } @Export("compare") @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.__m_476((User)var1, (User)var2); + return this.method339((User)var1, (User)var2); } @ObfuscatedName("equals") - public boolean __equals_478(Object var1) { + public boolean method340(Object var1) { return super.equals(var1); } } diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index 693298d8ab..e1fdf2f164 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -8,10 +8,10 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { @ObfuscatedName("m") - final boolean __m; + final boolean field932; public UserComparator10(boolean var1) { - this.__m = var1; + this.field932 = var1; } @ObfuscatedName("m") @@ -19,14 +19,14 @@ public class UserComparator10 extends AbstractUserComparator { signature = "(Lke;Lke;B)I", garbageValue = "-15" ) - int __m_268(Buddy var1, Buddy var2) { - return Client.worldId == var1.world0 && var2.world0 == Client.worldId?(this.__m?var1.int2 - var2.int2:var2.int2 - var1.int2):this.__x_461(var1, var2); + int method341(Buddy var1, Buddy var2) { + return Client.worldId == var1.world0 && var2.world0 == Client.worldId ? (this.field932 ? var1.int2 - var2.int2 : var2.int2 - var1.int2) : this.method12(var1, var2); } @Export("compare") @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.__m_268((Buddy)var1, (Buddy)var2); + return this.method341((Buddy)var1, (Buddy)var2); } @ObfuscatedName("hn") @@ -36,20 +36,20 @@ public class UserComparator10 extends AbstractUserComparator { ) static final void method3352(boolean var0) { class13.playPcmPlayers(); - ++Client.packetWriter.__d; - if(Client.packetWriter.__d >= 50 || var0) { - Client.packetWriter.__d = 0; - if(!Client.__client_fh && Client.packetWriter.getSocket() != null) { - PacketBufferNode var1 = Interpreter.method1915(ClientPacket.__gs_c, Client.packetWriter.isaacCipher); - Client.packetWriter.__q_167(var1); + ++Client.packetWriter.field675; + if (Client.packetWriter.field675 >= 50 || var0) { + Client.packetWriter.field675 = 0; + if (!Client.field176 && Client.packetWriter.getSocket() != null) { + PacketBufferNode var1 = Interpreter.method1915(ClientPacket.field244, Client.packetWriter.isaacCipher); + Client.packetWriter.method241(var1); try { - Client.packetWriter.__f_166(); + Client.packetWriter.method240(); } catch (IOException var3) { - Client.__client_fh = true; + Client.field176 = true; } } - } + } } diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index cf58e0cd5c..44a97180b0 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -8,10 +8,10 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator2") public class UserComparator2 implements Comparator { @ObfuscatedName("m") - final boolean __m; + final boolean field933; public UserComparator2(boolean var1) { - this.__m = var1; + this.field933 = var1; } @ObfuscatedName("m") @@ -19,18 +19,18 @@ public class UserComparator2 implements Comparator { signature = "(Ljs;Ljs;I)I", garbageValue = "-2069683911" ) - int __m_479(User var1, User var2) { - return this.__m?var1.username().compareTo0(var2.username()):var2.username().compareTo0(var1.username()); + int method342(User var1, User var2) { + return this.field933 ? var1.username().compareTo0(var2.username()) : var2.username().compareTo0(var1.username()); } @ObfuscatedName("equals") - public boolean __equals_481(Object var1) { + public boolean method343(Object var1) { return super.equals(var1); } @Export("compare") @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.__m_479((User)var1, (User)var2); + return this.method342((User)var1, (User)var2); } } diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index f6e38ee6bf..d016050749 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -19,10 +19,10 @@ public class UserComparator3 extends AbstractUserComparator { @Export("socketTask") static Task socketTask; @ObfuscatedName("m") - final boolean __m; + final boolean field934; public UserComparator3(boolean var1) { - this.__m = var1; + this.field934 = var1; } @ObfuscatedName("m") @@ -30,14 +30,14 @@ public class UserComparator3 extends AbstractUserComparator { signature = "(Lke;Lke;I)I", garbageValue = "-1157645406" ) - int __m_274(Buddy var1, Buddy var2) { - return var2.world0 != var1.world0?(this.__m?var1.world0 - var2.world0:var2.world0 - var1.world0):this.__x_461(var1, var2); + int method344(Buddy var1, Buddy var2) { + return var2.world0 != var1.world0 ? (this.field934 ? var1.world0 - var2.world0 : var2.world0 - var1.world0) : this.method12(var1, var2); } @Export("compare") @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.__m_274((Buddy)var1, (Buddy)var2); + return this.method344((Buddy)var1, (Buddy)var2); } @ObfuscatedName("o") diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index b6b05a509f..98b1c71cd6 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -15,10 +15,10 @@ public class UserComparator4 implements Comparator { @Export("WorldMapElement_count") public static int WorldMapElement_count; @ObfuscatedName("m") - final boolean __m; + final boolean field935; public UserComparator4(boolean var1) { - this.__m = var1; + this.field935 = var1; } @ObfuscatedName("m") @@ -26,19 +26,19 @@ public class UserComparator4 implements Comparator { signature = "(Lke;Lke;I)I", garbageValue = "950234237" ) - int __m_261(Buddy var1, Buddy var2) { - return this.__m?var1.int2 - var2.int2:var2.int2 - var1.int2; + int method345(Buddy var1, Buddy var2) { + return this.field935 ? var1.int2 - var2.int2 : var2.int2 - var1.int2; } @ObfuscatedName("equals") - public boolean __equals_263(Object var1) { + public boolean method346(Object var1) { return super.equals(var1); } @Export("compare") @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.__m_261((Buddy)var1, (Buddy)var2); + return this.method345((Buddy)var1, (Buddy)var2); } @ObfuscatedName("f") @@ -56,23 +56,23 @@ public class UserComparator4 implements Comparator { garbageValue = "-2050984400" ) static int method3335(int var0, Script var1, boolean var2) { - if(var0 == 5306) { + if (var0 == 5306) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SpotAnimationDefinition.method4822(); return 1; } else { int var3; - if(var0 == 5307) { + if (var0 == 5307) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - if(var3 == 1 || var3 == 2) { + if (var3 == 1 || var3 == 2) { GroundItem.method2095(var3); } return 1; - } else if(var0 == 5308) { + } else if (var0 == 5308) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.windowMode; return 1; - } else if(var0 != 5309) { - if(var0 == 5310) { + } else if (var0 != 5309) { + if (var0 == 5310) { --RouteStrategy.Interpreter_intStackSize; return 1; } else { @@ -80,7 +80,7 @@ public class UserComparator4 implements Comparator { } } else { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - if(var3 == 1 || var3 == 2) { + if (var3 == 1 || var3 == 2) { ReflectionCheck.clientPreferences.windowMode = var3; WorldMapSection0.savePreferences(); } diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index 0ee89e85f2..7ef94fba67 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -7,10 +7,10 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { @ObfuscatedName("m") - final boolean __m; + final boolean field936; public UserComparator5(boolean var1) { - this.__m = var1; + this.field936 = var1; } @ObfuscatedName("m") @@ -18,22 +18,22 @@ public class UserComparator5 extends AbstractUserComparator { signature = "(Lke;Lke;B)I", garbageValue = "-22" ) - int __m_272(Buddy var1, Buddy var2) { - if(var1.world0 != 0) { - if(var2.world0 == 0) { - return this.__m?-1:1; + int method347(Buddy var1, Buddy var2) { + if (var1.world0 != 0) { + if (var2.world0 == 0) { + return this.field936 ? -1 : 1; } - } else if(var2.world0 != 0) { - return this.__m?1:-1; + } else if (var2.world0 != 0) { + return this.field936 ? 1 : -1; } - return this.__x_461(var1, var2); + return this.method12(var1, var2); } @Export("compare") @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.__m_272((Buddy)var1, (Buddy)var2); + return this.method347((Buddy)var1, (Buddy)var2); } @ObfuscatedName("jk") @@ -44,7 +44,7 @@ public class UserComparator5 extends AbstractUserComparator { @Export("worldToMinimap") static final void worldToMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { int var6 = var3 * var3 + var2 * var2; - if(var6 > 4225 && var6 < 90000) { + if (var6 > 4225 && var6 < 90000) { int var7 = Client.minimapOrientation & 2047; int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; @@ -55,7 +55,7 @@ public class UserComparator5 extends AbstractUserComparator { int var15 = (int)(Math.sin(var12) * (double)var14); int var16 = (int)(Math.cos(var12) * (double)var14); byte var17 = 20; - FaceNormal.__el_gm.__ah_514(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); + FaceNormal.field345.method316(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); } else { NetFileRequest.method4554(var0, var1, var2, var3, var4, var5); } diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index 90761a877b..58325e9817 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -16,12 +16,12 @@ public class UserComparator6 extends AbstractUserComparator { @ObfuscatedSignature( signature = "Lho;" ) - static Widget __fg_jh; + static Widget field937; @ObfuscatedName("m") - final boolean __m; + final boolean field938; public UserComparator6(boolean var1) { - this.__m = var1; + this.field938 = var1; } @ObfuscatedName("m") @@ -29,14 +29,14 @@ public class UserComparator6 extends AbstractUserComparator { signature = "(Lke;Lke;I)I", garbageValue = "750521759" ) - int __m_276(Buddy var1, Buddy var2) { - return var1.world0 != 0 && var2.world0 != 0?(this.__m?var1.username().compareTo0(var2.username()):var2.username().compareTo0(var1.username())):this.__x_461(var1, var2); + int method348(Buddy var1, Buddy var2) { + return var1.world0 != 0 && var2.world0 != 0 ? (this.field938 ? var1.username().compareTo0(var2.username()) : var2.username().compareTo0(var1.username())) : this.method12(var1, var2); } @Export("compare") @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.__m_276((Buddy)var1, (Buddy)var2); + return this.method348((Buddy)var1, (Buddy)var2); } @ObfuscatedName("f") @@ -45,23 +45,23 @@ public class UserComparator6 extends AbstractUserComparator { garbageValue = "-1968376475" ) static final void method3390(int var0, int var1, int var2, int var3) { - for(int var4 = var1; var4 <= var3 + var1; ++var4) { - for(int var5 = var0; var5 <= var0 + var2; ++var5) { - if(var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { - Tiles.__bq_l[0][var5][var4] = 127; - if(var0 == var5 && var5 > 0) { + for (int var4 = var1; var4 <= var3 + var1; ++var4) { + for (int var5 = var0; var5 <= var0 + var2; ++var5) { + if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { + Tiles.field909[0][var5][var4] = 127; + if (var0 == var5 && var5 > 0) { Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; } - if(var5 == var0 + var2 && var5 < 103) { + if (var5 == var0 + var2 && var5 < 103) { Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; } - if(var4 == var1 && var4 > 0) { + if (var4 == var1 && var4 > 0) { Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; } - if(var3 + var1 == var4 && var4 < 103) { + if (var3 + var1 == var4 && var4 < 103) { Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; } } diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index f5387fbc87..72f05177c9 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -10,10 +10,10 @@ import net.runelite.rs.Reflection; @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { @ObfuscatedName("m") - final boolean __m; + final boolean field939; public UserComparator7(boolean var1) { - this.__m = var1; + this.field939 = var1; } @ObfuscatedName("m") @@ -21,14 +21,14 @@ public class UserComparator7 extends AbstractUserComparator { signature = "(Lke;Lke;I)I", garbageValue = "-9252550" ) - int __m_270(Buddy var1, Buddy var2) { - return var1.world0 != 0 && var2.world0 != 0?(this.__m?var1.int2 - var2.int2:var2.int2 - var1.int2):this.__x_461(var1, var2); + int method349(Buddy var1, Buddy var2) { + return var1.world0 != 0 && var2.world0 != 0 ? (this.field939 ? var1.int2 - var2.int2 : var2.int2 - var1.int2) : this.method12(var1, var2); } @Export("compare") @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.__m_270((Buddy)var1, (Buddy)var2); + return this.method349((Buddy)var1, (Buddy)var2); } @ObfuscatedName("q") @@ -47,65 +47,65 @@ public class UserComparator7 extends AbstractUserComparator { var2.methods = new Method[var2.size]; var2.arguments = new byte[var2.size][][]; - for(int var3 = 0; var3 < var2.size; ++var3) { + for (int var3 = 0; var3 < var2.size; ++var3) { try { int var4 = var0.readUnsignedByte(); String var5; String var6; int var7; - if(var4 != 0 && var4 != 1 && var4 != 2) { - if(var4 == 3 || var4 == 4) { + if (var4 != 0 && var4 != 1 && var4 != 2) { + if (var4 == 3 || var4 == 4) { var5 = var0.readStringCp1252NullTerminated(); var6 = var0.readStringCp1252NullTerminated(); var7 = var0.readUnsignedByte(); String[] var8 = new String[var7]; - for(int var9 = 0; var9 < var7; ++var9) { + for (int var9 = 0; var9 < var7; ++var9) { var8[var9] = var0.readStringCp1252NullTerminated(); } - String var20 = var0.readStringCp1252NullTerminated(); + String var26 = var0.readStringCp1252NullTerminated(); byte[][] var10 = new byte[var7][]; - int var12; - if(var4 == 3) { - for(int var11 = 0; var11 < var7; ++var11) { - var12 = var0.readInt(); - var10[var11] = new byte[var12]; - var0.__al_305(var10[var11], 0, var12); + int var11; + if (var4 == 3) { + for (int var12 = 0; var12 < var7; ++var12) { + var11 = var0.readInt(); + var10[var12] = new byte[var11]; + var0.method46(var10[var12], 0, var11); } } var2.operations[var3] = var4; - Class[] var21 = new Class[var7]; + Class[] var27 = new Class[var7]; - for(var12 = 0; var12 < var7; ++var12) { - var21[var12] = VarcInt.loadClassFromDescriptor(var8[var12]); + for (var11 = 0; var11 < var7; ++var11) { + var27[var11] = VarcInt.loadClassFromDescriptor(var8[var11]); } - Class var22 = VarcInt.loadClassFromDescriptor(var20); - if(VarcInt.loadClassFromDescriptor(var5).getClassLoader() == null) { + Class var13 = VarcInt.loadClassFromDescriptor(var26); + if (VarcInt.loadClassFromDescriptor(var5).getClassLoader() == null) { throw new SecurityException(); } - Method[] var13 = VarcInt.loadClassFromDescriptor(var5).getDeclaredMethods(); - Method[] var14 = var13; + Method[] var14 = VarcInt.loadClassFromDescriptor(var5).getDeclaredMethods(); + Method[] var15 = var14; - for(int var15 = 0; var15 < var14.length; ++var15) { - Method var16 = var14[var15]; - if(Reflection.getMethodName(var16).equals(var6)) { - Class[] var17 = Reflection.getParameterTypes(var16); - if(var21.length == var17.length) { - boolean var18 = true; + for (int var16 = 0; var16 < var15.length; ++var16) { + Method var17 = var15[var16]; + if (Reflection.getMethodName(var17).equals(var6)) { + Class[] var18 = Reflection.getParameterTypes(var17); + if (var27.length == var18.length) { + boolean var19 = true; - for(int var19 = 0; var19 < var21.length; ++var19) { - if(var21[var19] != var17[var19]) { - var18 = false; + for (int var20 = 0; var20 < var27.length; ++var20) { + if (var27[var20] != var18[var20]) { + var19 = false; break; } } - if(var18 && var22 == var16.getReturnType()) { - var2.methods[var3] = var16; + if (var19 && var13 == var17.getReturnType()) { + var2.methods[var3] = var17; } } } @@ -117,27 +117,27 @@ public class UserComparator7 extends AbstractUserComparator { var5 = var0.readStringCp1252NullTerminated(); var6 = var0.readStringCp1252NullTerminated(); var7 = 0; - if(var4 == 1) { + if (var4 == 1) { var7 = var0.readInt(); } var2.operations[var3] = var4; var2.intReplaceValues[var3] = var7; - if(VarcInt.loadClassFromDescriptor(var5).getClassLoader() == null) { + if (VarcInt.loadClassFromDescriptor(var5).getClassLoader() == null) { throw new SecurityException(); } var2.fields[var3] = Reflection.findField(VarcInt.loadClassFromDescriptor(var5), var6); } - } catch (ClassNotFoundException var24) { + } catch (ClassNotFoundException var21) { var2.creationErrors[var3] = -1; - } catch (SecurityException var25) { + } catch (SecurityException var22) { var2.creationErrors[var3] = -2; - } catch (NullPointerException var26) { + } catch (NullPointerException var23) { var2.creationErrors[var3] = -3; - } catch (Exception var27) { + } catch (Exception var24) { var2.creationErrors[var3] = -4; - } catch (Throwable var28) { + } catch (Throwable var25) { var2.creationErrors[var3] = -5; } } @@ -151,11 +151,11 @@ public class UserComparator7 extends AbstractUserComparator { garbageValue = "2084569794" ) static final boolean method3364(int var0) { - if(var0 < 0) { + if (var0 < 0) { return false; } else { int var1 = Client.menuOpcodes[var0]; - if(var1 >= 2000) { + if (var1 >= 2000) { var1 -= 2000; } diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index ae6288a967..a5a40b8595 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -7,10 +7,10 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { @ObfuscatedName("m") - final boolean __m; + final boolean field940; public UserComparator8(boolean var1) { - this.__m = var1; + this.field940 = var1; } @ObfuscatedName("m") @@ -18,22 +18,22 @@ public class UserComparator8 extends AbstractUserComparator { signature = "(Lke;Lke;B)I", garbageValue = "0" ) - int __m_266(Buddy var1, Buddy var2) { - if(Client.worldId == var1.world0) { - if(var2.world0 != Client.worldId) { - return this.__m?-1:1; + int method350(Buddy var1, Buddy var2) { + if (Client.worldId == var1.world0) { + if (var2.world0 != Client.worldId) { + return this.field940 ? -1 : 1; } - } else if(var2.world0 == Client.worldId) { - return this.__m?1:-1; + } else if (var2.world0 == Client.worldId) { + return this.field940 ? 1 : -1; } - return this.__x_461(var1, var2); + return this.method12(var1, var2); } @Export("compare") @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.__m_266((Buddy)var1, (Buddy)var2); + return this.method350((Buddy)var1, (Buddy)var2); } @ObfuscatedName("ke") @@ -42,7 +42,7 @@ public class UserComparator8 extends AbstractUserComparator { garbageValue = "1" ) static final void method3349() { - Client.__client_nh = Client.cycleCntr; - VertexNormal.__dq_pe = true; + Client.field129 = Client.cycleCntr; + VertexNormal.field945 = true; } } diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index b44d9086e3..0a6ed5f44d 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -8,10 +8,10 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { @ObfuscatedName("m") - final boolean __m; + final boolean field941; public UserComparator9(boolean var1) { - this.__m = var1; + this.field941 = var1; } @ObfuscatedName("m") @@ -19,14 +19,14 @@ public class UserComparator9 extends AbstractUserComparator { signature = "(Lke;Lke;I)I", garbageValue = "1966780392" ) - int __m_264(Buddy var1, Buddy var2) { - return Client.worldId == var1.world0 && var2.world0 == Client.worldId?(this.__m?var1.username().compareTo0(var2.username()):var2.username().compareTo0(var1.username())):this.__x_461(var1, var2); + int method351(Buddy var1, Buddy var2) { + return Client.worldId == var1.world0 && var2.world0 == Client.worldId ? (this.field941 ? var1.username().compareTo0(var2.username()) : var2.username().compareTo0(var1.username())) : this.method12(var1, var2); } @Export("compare") @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.__m_264((Buddy)var1, (Buddy)var2); + return this.method351((Buddy)var1, (Buddy)var2); } @ObfuscatedName("m") @@ -35,24 +35,23 @@ public class UserComparator9 extends AbstractUserComparator { garbageValue = "-1" ) public static void method3343(boolean var0) { - if(NetCache.NetCache_socket != null) { + if (NetCache.NetCache_socket != null) { try { Buffer var1 = new Buffer(4); - var1.writeByte(var0?2:3); + var1.writeByte(var0 ? 2 : 3); var1.writeMedium(0); NetCache.NetCache_socket.write(var1.array, 0, 4); } catch (IOException var4) { try { NetCache.NetCache_socket.close(); } catch (Exception var3) { - ; } ++NetCache.NetCache_ioExceptions; NetCache.NetCache_socket = null; } - } + } @ObfuscatedName("l") @@ -64,7 +63,7 @@ public class UserComparator9 extends AbstractUserComparator { public static Sprite[] createSpriteArray() { Sprite[] var0 = new Sprite[class328.indexedSpriteCount]; - for(int var1 = 0; var1 < class328.indexedSpriteCount; ++var1) { + for (int var1 = 0; var1 < class328.indexedSpriteCount; ++var1) { Sprite var2 = var0[var1] = new Sprite(); var2.width = class328.indexedSpriteWidth; var2.height = class328.indexedSpriteHeight; @@ -76,7 +75,7 @@ public class UserComparator9 extends AbstractUserComparator { byte[] var4 = class328.spritePixels[var1]; var2.pixels = new int[var3]; - for(int var5 = 0; var5 < var3; ++var5) { + for (int var5 = 0; var5 < var3; ++var5) { var2.pixels[var5] = class328.indexedSpritePalette[var4[var5] & 255]; } } @@ -86,7 +85,7 @@ public class UserComparator9 extends AbstractUserComparator { VarbitDefinition.indexedSpriteWidths = null; SecureRandomCallable.indexedSpriteHeights = null; class328.indexedSpritePalette = null; - class328.spritePixels = null; + class328.spritePixels = (byte[][])null; return var0; } } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index 85c03c5fcf..bca808e17d 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -114,7 +114,7 @@ public abstract class UserList { @Export("getByUsername") public User getByUsername(Username var1) { User var2 = this.getByCurrentUsername(var1); - return var2 != null?var2:this.getByPreviousUsername(var1); + return var2 != null ? var2 : this.getByPreviousUsername(var1); } @ObfuscatedName("h") @@ -124,7 +124,7 @@ public abstract class UserList { ) @Export("getByCurrentUsername") User getByCurrentUsername(Username var1) { - return !var1.hasCleanName()?null:(User)this.usernamesMap.get(var1); + return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); } @ObfuscatedName("b") @@ -134,7 +134,7 @@ public abstract class UserList { ) @Export("getByPreviousUsername") User getByPreviousUsername(Username var1) { - return !var1.hasCleanName()?null:(User)this.previousUsernamesMap.get(var1); + return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); } @ObfuscatedName("c") @@ -145,7 +145,7 @@ public abstract class UserList { @Export("removeByUsername") public final boolean removeByUsername(Username var1) { User var2 = this.getByCurrentUsername(var1); - if(var2 == null) { + if (var2 == null) { return false; } else { this.remove(var2); @@ -161,10 +161,11 @@ public abstract class UserList { @Export("remove") final void remove(User var1) { int var2 = this.indexOf(var1); - if(var2 != -1) { + if (var2 != -1) { this.arrayRemove(var2); this.mapRemove(var1); } + } @ObfuscatedName("v") @@ -184,7 +185,7 @@ public abstract class UserList { ) @Export("addLast") User addLast(Username var1, Username var2) { - if(this.getByCurrentUsername(var1) != null) { + if (this.getByCurrentUsername(var1) != null) { throw new IllegalStateException(); } else { User var3 = this.newInstance(); @@ -202,7 +203,7 @@ public abstract class UserList { ) @Export("get") public final User get(int var1) { - if(var1 >= 0 && var1 < this.size0) { + if (var1 >= 0 && var1 < this.size0) { return this.array[var1]; } else { throw new ArrayIndexOutOfBoundsException(var1); @@ -216,7 +217,7 @@ public abstract class UserList { ) @Export("sort") public final void sort() { - if(this.comparator == null) { + if (this.comparator == null) { Arrays.sort(this.array, 0, this.size0); } else { Arrays.sort(this.array, 0, this.size0, this.comparator); @@ -243,8 +244,8 @@ public abstract class UserList { ) @Export("indexOf") final int indexOf(User var1) { - for(int var2 = 0; var2 < this.size0; ++var2) { - if(this.array[var2] == var1) { + for (int var2 = 0; var2 < this.size0; ++var2) { + if (this.array[var2] == var1) { return var2; } } @@ -259,7 +260,7 @@ public abstract class UserList { ) @Export("mapRemove") final void mapRemove(User var1) { - if(var1.previousUsername != null) { + if (var1.previousUsername != null) { this.previousUsernamesMap.remove(var1.previousUsername); } @@ -283,9 +284,9 @@ public abstract class UserList { @Export("mapPut") final void mapPut(User var1) { this.usernamesMap.put(var1.username0, var1); - if(var1.previousUsername != null) { + if (var1.previousUsername != null) { User var2 = (User)this.previousUsernamesMap.put(var1.previousUsername, var1); - if(var2 != null && var2 != var1) { + if (var2 != null && var2 != var1) { var2.previousUsername = null; } } @@ -300,7 +301,7 @@ public abstract class UserList { @Export("arrayRemove") final void arrayRemove(int var1) { --this.size0; - if(var1 < this.size0) { + if (var1 < this.size0) { System.arraycopy(this.array, var1 + 1, this.array, var1, this.size0 - var1); } @@ -323,10 +324,10 @@ public abstract class UserList { ) @Export("addComparator") public final void addComparator(Comparator var1) { - if(this.comparator == null) { + if (this.comparator == null) { this.comparator = var1; - } else if(this.comparator instanceof AbstractUserComparator) { - ((AbstractUserComparator)this.comparator).__e_460(var1); + } else if (this.comparator instanceof AbstractUserComparator) { + ((AbstractUserComparator)this.comparator).method11(var1); } } diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index bbcdaf3dee..8d5f6e22b8 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -51,34 +51,31 @@ public class Username implements Comparable { ) @Export("compareTo0") public int compareTo0(Username var1) { - return this.cleanName == null?(var1.cleanName == null?0:1):(var1.cleanName == null?-1:this.cleanName.compareTo(var1.cleanName)); + return this.cleanName == null ? (var1.cleanName == null ? 0 : 1) : (var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName)); } @Export("equals") @ObfuscatedName("equals") public boolean equals(Object var1) { - if(var1 instanceof Username) { + if (var1 instanceof Username) { Username var2 = (Username)var1; - if (this.cleanName == null) - { - return var2.cleanName == null; - } - else - { - return var2.cleanName != null && (this.__hashCode_467() == var2.__hashCode_467() && this.cleanName.equals(var2.cleanName)); - } + if (this.cleanName == null) { + return var2.cleanName == null; + } else { + return var2.cleanName != null && this.method352() == var2.method352() && this.cleanName.equals(var2.cleanName); + } } else { return false; } } @ObfuscatedName("hashCode") - public int __hashCode_467() { - return this.cleanName == null?0:this.cleanName.hashCode(); + public int method352() { + return this.cleanName == null ? 0 : this.cleanName.hashCode(); } @ObfuscatedName("toString") - public String __toString_468() { + public String method353() { return this.getName(); } diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java index 3734f09ca3..6479d49090 100644 --- a/runescape-client/src/main/java/VarbitDefinition.java +++ b/runescape-client/src/main/java/VarbitDefinition.java @@ -41,10 +41,6 @@ public class VarbitDefinition extends DualNode { @Export("highBit") public int highBit; - static { - VarbitDefinition_cached = new EvictingDualNodeHashTable(64); - } - @ObfuscatedName("q") @ObfuscatedSignature( signature = "(Lgr;I)V", @@ -52,9 +48,9 @@ public class VarbitDefinition extends DualNode { ) @Export("read") void read(Buffer var1) { - while(true) { + while (true) { int var2 = var1.readUnsignedByte(); - if(var2 == 0) { + if (var2 == 0) { return; } @@ -69,8 +65,8 @@ public class VarbitDefinition extends DualNode { ) @Export("readNext") void readNext(Buffer var1, int var2) { - if(var2 == 1) { - this.varp = var1.__ag_302(); + if (var2 == 1) { + this.varp = var1.method43(); this.lowBit = var1.readUnsignedByte(); this.highBit = var1.readUnsignedByte(); } @@ -84,14 +80,18 @@ public class VarbitDefinition extends DualNode { ) static final boolean method4910(int var0, int var1) { ObjectDefinition var2 = class50.getObjectDefinition(var0); - if(var1 == 11) { + if (var1 == 11) { var1 = 10; } - if(var1 >= 5 && var1 <= 8) { + if (var1 >= 5 && var1 <= 8) { var1 = 4; } - return var2.__u_421(var1); + return var2.method230(var1); + } + + static { + VarbitDefinition_cached = new EvictingDualNodeHashTable(64); } } diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index 4734f53ee8..359502ebb5 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -11,7 +11,7 @@ public class VarcInt extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - static AbstractIndexCache __iw_m; + static AbstractIndexCache field942; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" @@ -22,10 +22,6 @@ public class VarcInt extends DualNode { @Export("persist") public boolean persist; - static { - cachedVarcInts = new EvictingDualNodeHashTable(64); - } - VarcInt() { this.persist = false; } @@ -35,14 +31,14 @@ public class VarcInt extends DualNode { signature = "(Lgr;I)V", garbageValue = "1023420886" ) - void __q_411(Buffer var1) { - while(true) { + void method354(Buffer var1) { + while (true) { int var2 = var1.readUnsignedByte(); - if(var2 == 0) { + if (var2 == 0) { return; } - this.__w_412(var1, var2); + this.method355(var1, var2); } } @@ -51,8 +47,8 @@ public class VarcInt extends DualNode { signature = "(Lgr;II)V", garbageValue = "-202810982" ) - void __w_412(Buffer var1, int var2) { - if(var2 == 2) { + void method355(Buffer var1, int var2) { + if (var2 == 2) { this.persist = true; } @@ -65,7 +61,7 @@ public class VarcInt extends DualNode { ) @Export("loadClassFromDescriptor") static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { - return var0.equals("B")?Byte.TYPE:(var0.equals("I")?Integer.TYPE:(var0.equals("S")?Short.TYPE:(var0.equals("J")?Long.TYPE:(var0.equals("Z")?Boolean.TYPE:(var0.equals("F")?Float.TYPE:(var0.equals("D")?Double.TYPE:(var0.equals("C")?Character.TYPE:(var0.equals("void")?Void.TYPE:Reflection.findClass(var0))))))))); + return var0.equals("B") ? Byte.TYPE : (var0.equals("I") ? Integer.TYPE : (var0.equals("S") ? Short.TYPE : (var0.equals("J") ? Long.TYPE : (var0.equals("Z") ? Boolean.TYPE : (var0.equals("F") ? Float.TYPE : (var0.equals("D") ? Double.TYPE : (var0.equals("C") ? Character.TYPE : (var0.equals("void") ? Void.TYPE : Reflection.findClass(var0))))))))); } @ObfuscatedName("a") @@ -77,4 +73,8 @@ public class VarcInt extends DualNode { public static boolean isAlphaNumeric(char var0) { return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; } + + static { + cachedVarcInts = new EvictingDualNodeHashTable(64); + } } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index 8efa66c2e2..5813666fd3 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -33,19 +33,19 @@ public class Varcs { Varcs() { this.unwrittenChanges = false; - int var1 = ObjectSound.indexCache2.__s_396(19); + int var1 = ObjectSound.indexCache2.method4(19); this.map = new HashMap(); this.intsPersistence = new boolean[var1]; int var2; - for(var2 = 0; var2 < var1; ++var2) { + for (var2 = 0; var2 < var1; ++var2) { VarcInt var3 = AbstractByteArrayCopier.getVarcInt(var2); this.intsPersistence[var2] = var3.persist; } var2 = 0; - if(ObjectSound.indexCache2.__df_408(15)) { - var2 = ObjectSound.indexCache2.__s_396(15); + if (ObjectSound.indexCache2.method133(15)) { + var2 = ObjectSound.indexCache2.method4(15); } this.strings = new String[var2]; @@ -59,8 +59,8 @@ public class Varcs { ) @Export("setInt") void setInt(int var1, int var2) { - this.map.put(Integer.valueOf(var1), Integer.valueOf(var2)); - if(this.intsPersistence[var1]) { + this.map.put(var1, var2); + if (this.intsPersistence[var1]) { this.unwrittenChanges = true; } @@ -73,8 +73,8 @@ public class Varcs { ) @Export("getInt") int getInt(int var1) { - Object var2 = this.map.get(Integer.valueOf(var1)); - return var2 instanceof Integer?((Integer)var2).intValue():-1; + Object var2 = this.map.get(var1); + return var2 instanceof Integer ? (Integer)var2 : -1; } @ObfuscatedName("q") @@ -84,7 +84,7 @@ public class Varcs { ) @Export("setString") void setString(int var1, String var2) { - this.map.put(Integer.valueOf(var1), var2); + this.map.put(var1, var2); } @ObfuscatedName("w") @@ -94,8 +94,8 @@ public class Varcs { ) @Export("getString") String getString(int var1) { - Object var2 = this.map.get(Integer.valueOf(var1)); - return var2 instanceof String?(String)var2:""; + Object var2 = this.map.get(var1); + return var2 instanceof String ? (String)var2 : ""; } @ObfuscatedName("o") @@ -126,13 +126,13 @@ public class Varcs { @Export("clearTransient") void clearTransient() { int var1; - for(var1 = 0; var1 < this.intsPersistence.length; ++var1) { - if(!this.intsPersistence[var1]) { - this.map.remove(Integer.valueOf(var1)); + for (var1 = 0; var1 < this.intsPersistence.length; ++var1) { + if (!this.intsPersistence[var1]) { + this.map.remove(var1); } } - for(var1 = 0; var1 < this.strings.length; ++var1) { + for (var1 = 0; var1 < this.strings.length; ++var1) { this.strings[var1] = null; } @@ -162,15 +162,15 @@ public class Varcs { int var3 = 0; Iterator var4 = this.map.entrySet().iterator(); - while(var4.hasNext()) { + while (var4.hasNext()) { Entry var5 = (Entry)var4.next(); - int var6 = ((Integer)var5.getKey()).intValue(); - if(this.intsPersistence[var6]) { + int var6 = (Integer)var5.getKey(); + if (this.intsPersistence[var6]) { Object var7 = var5.getValue(); var2 += 3; - if(var7 instanceof Integer) { + if (var7 instanceof Integer) { var2 += 4; - } else if(var7 instanceof String) { + } else if (var7 instanceof String) { var2 += WorldMapRegion.method550((String)var7); } @@ -178,82 +178,72 @@ public class Varcs { } } - Buffer var32 = new Buffer(var2); - var32.writeByte(2); - var32.writeShort(var3); - Iterator var33 = this.map.entrySet().iterator(); + Buffer var29 = new Buffer(var2); + var29.writeByte(2); + var29.writeShort(var3); + Iterator var30 = this.map.entrySet().iterator(); - label185: - while(true) { - Entry var20; - int var21; + label187: + while (true) { + int var8; + Entry var31; do { - if(!var33.hasNext()) { - var1.write(var32.array, 0, var32.index); - break label185; + if (!var30.hasNext()) { + var1.write(var29.array, 0, var29.index); + break label187; } - var20 = (Entry)var33.next(); - var21 = ((Integer)var20.getKey()).intValue(); - } while(!this.intsPersistence[var21]); + var31 = (Entry)var30.next(); + var8 = (Integer)var31.getKey(); + } while(!this.intsPersistence[var8]); - var32.writeShort(var21); - Object var8 = var20.getValue(); - Class var10 = var8.getClass(); + var29.writeShort(var8); + Object var9 = var31.getValue(); + Class var10 = var9.getClass(); class3[] var11 = class3.method34(); - int var12 = 0; - class3 var9; - while(true) { - if(var12 >= var11.length) { - var9 = null; - break; + class3 var13; + label174: { + for (int var12 = 0; var12 < var11.length; ++var12) { + class3 var14 = var11[var12]; + if (var10 == var14.field18) { + var13 = var14; + break label174; + } } - class3 var13 = var11[var12]; - if(var10 == var13.field18) { - var9 = var13; - break; - } - - ++var12; + var13 = null; } - var32.writeByte(var9.id); - Class var34 = var8.getClass(); + var29.writeByte(var13.field1147); + Class var32 = var9.getClass(); class3[] var15 = class3.method34(); - int var16 = 0; - class3 var14; - while(true) { - if(var16 >= var15.length) { - var14 = null; - break; + class3 var17; + label184: { + for (int var16 = 0; var16 < var15.length; ++var16) { + class3 var18 = var15[var16]; + if (var32 == var18.field18) { + var17 = var18; + break label184; + } } - class3 var17 = var15[var16]; - if(var34 == var17.field18) { - var14 = var17; - break; - } - - ++var16; + var17 = null; } - if(var14 == null) { + if (var17 == null) { throw new IllegalArgumentException(); } - class0 var22 = var14.field19; - var22.vmethod44(var8, var32); + class0 var33 = var17.field19; + var33.vmethod44(var9, var29); } - } catch (Exception var30) { - ; + } catch (Exception var27) { } finally { try { var1.close(); - } catch (Exception var29) { - ; + } catch (Exception var26) { } } @@ -271,80 +261,79 @@ public class Varcs { void read() { AccessFile var1 = this.getPreferencesFile(false); - label215: { + label225: { try { byte[] var2 = new byte[(int)var1.length()]; - int var4; - for(int var3 = 0; var3 < var2.length; var3 += var4) { - var4 = var1.read(var2, var3, var2.length - var3); - if(var4 == -1) { + int var3; + for (int var4 = 0; var4 < var2.length; var4 += var3) { + var3 = var1.read(var2, var4, var2.length - var4); + if (var3 == -1) { throw new EOFException(); } } - Buffer var14 = new Buffer(var2); - if(var14.array.length - var14.index >= 1) { - int var15 = var14.readUnsignedByte(); - if(var15 < 0 || var15 > 2) { - return; - } + Buffer var25 = new Buffer(var2); + if (var25.array.length - var25.index < 1) { + return; + } + int var5 = var25.readUnsignedByte(); + if (var5 >= 0 && var5 <= 2) { + int var6; int var7; int var8; int var9; - int var16; - if(var15 >= 2) { - var16 = var14.__ag_302(); - var7 = 0; + if (var5 >= 2) { + var9 = var25.method43(); + var6 = 0; - while(true) { - if(var7 >= var16) { - break label215; + while (true) { + if (var6 >= var9) { + break label225; } - var8 = var14.__ag_302(); - var9 = var14.readUnsignedByte(); - class3 var10 = (class3)ScriptFrame.findEnumerated(class3.method34(), var9); - Object var11 = var10.method31(var14); - if(this.intsPersistence[var8]) { - this.map.put(Integer.valueOf(var8), var11); + var7 = var25.method43(); + var8 = var25.readUnsignedByte(); + class3 var10 = (class3)ScriptFrame.findEnumerated(class3.method34(), var8); + Object var11 = var10.method31(var25); + if (this.intsPersistence[var7]) { + this.map.put(var7, var11); } - ++var7; + ++var6; } } else { - var16 = var14.__ag_302(); + var9 = var25.method43(); - for(var7 = 0; var7 < var16; ++var7) { - var8 = var14.__ag_302(); - var9 = var14.readInt(); - if(this.intsPersistence[var8]) { - this.map.put(Integer.valueOf(var8), Integer.valueOf(var9)); + for (var6 = 0; var6 < var9; ++var6) { + var7 = var25.method43(); + var8 = var25.readInt(); + if (this.intsPersistence[var7]) { + this.map.put(var7, var8); } } - var7 = var14.__ag_302(); - var8 = 0; + var6 = var25.method43(); + var7 = 0; - while(true) { - if(var8 >= var7) { - break label215; + while (true) { + if (var7 >= var6) { + break label225; } - var14.__ag_302(); - var14.readStringCp1252NullTerminated(); - ++var8; + var25.method43(); + var25.readStringCp1252NullTerminated(); + ++var7; } } } - } catch (Exception var25) { - break label215; + } catch (Exception var23) { + break label225; } finally { try { var1.close(); - } catch (Exception var24) { - ; + } catch (Exception var22) { } } @@ -362,7 +351,7 @@ public class Varcs { ) @Export("tryWrite") void tryWrite() { - if(this.unwrittenChanges && this.lastWriteTimeMs < class203.currentTimeMs() - 60000L) { + if (this.unwrittenChanges && this.lastWriteTimeMs < class203.currentTimeMs() - 60000L) { this.write(); } @@ -384,7 +373,7 @@ public class Varcs { garbageValue = "321265868" ) public static void method2160(AbstractIndexCache var0) { - OverlayDefinition.__jf_m = var0; + OverlayDefinition.field663 = var0; } @ObfuscatedName("q") @@ -393,13 +382,14 @@ public class Varcs { garbageValue = "1119202993" ) static final void method2166(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) { + int var6; int var7; - int var8; - for(int var6 = 0; var6 < 4; ++var6) { - for(var7 = 0; var7 < 64; ++var7) { - for(var8 = 0; var8 < 64; ++var8) { - if(var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { - var5[var6].flags[var7 + var1][var8 + var2] &= -16777217; + for (int var8 = 0; var8 < 4; ++var8) { + for (var6 = 0; var6 < 64; ++var6) { + for (var7 = 0; var7 < 64; ++var7) { + if (var6 + var1 > 0 && var6 + var1 < 103 && var7 + var2 > 0 && var7 + var2 < 103) { + int[] var10000 = var5[var8].flags[var6 + var1]; + var10000[var7 + var2] &= -16777217; } } } @@ -407,10 +397,10 @@ public class Varcs { Buffer var10 = new Buffer(var0); - for(var7 = 0; var7 < 4; ++var7) { - for(var8 = 0; var8 < 64; ++var8) { - for(int var9 = 0; var9 < 64; ++var9) { - TotalQuantityComparator.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); + for (var6 = 0; var6 < 4; ++var6) { + for (var7 = 0; var7 < 64; ++var7) { + for (int var9 = 0; var9 < 64; ++var9) { + TotalQuantityComparator.loadTerrain(var10, var6, var7 + var1, var9 + var2, var3, var4, 0); } } } @@ -423,11 +413,11 @@ public class Varcs { garbageValue = "1592367053" ) static final void method2168(Widget var0, int var1, int var2, int var3) { - if(var0.__cc == null) { + if (var0.field968 == null) { throw new RuntimeException(); } else { - var0.__cc[var1] = var2; - var0.__ci[var1] = var3; + var0.field968[var1] = var2; + var0.field969[var1] = var3; } } } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index 1fb5900843..658062221e 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -11,12 +11,12 @@ public class VarpDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache __ix_m; + public static AbstractIndexCache field943; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 510774535 ) - public static int __ix_f; + public static int field944; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Ler;" @@ -30,10 +30,6 @@ public class VarpDefinition extends DualNode { @Export("type") public int type; - static { - VarpDefinition_cached = new EvictingDualNodeHashTable(64); - } - VarpDefinition() { this.type = 0; } @@ -45,9 +41,9 @@ public class VarpDefinition extends DualNode { ) @Export("read") void read(Buffer var1) { - while(true) { + while (true) { int var2 = var1.readUnsignedByte(); - if(var2 == 0) { + if (var2 == 0) { return; } @@ -62,9 +58,13 @@ public class VarpDefinition extends DualNode { ) @Export("readNext") void readNext(Buffer var1, int var2) { - if(var2 == 5) { - this.type = var1.__ag_302(); + if (var2 == 5) { + this.type = var1.method43(); } } + + static { + VarpDefinition_cached = new EvictingDualNodeHashTable(64); + } } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index 9e064f5004..57745938a0 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -23,19 +23,6 @@ public class Varps { @Export("loginBoxCenter") static int loginBoxCenter; - static { - Varps_masks = new int[32]; - int var0 = 2; - - for(int var1 = 0; var1 < 32; ++var1) { - Varps_masks[var1] = var0 - 1; - var0 += var0; - } - - Varps_temp = new int[4000]; - Varps_main = new int[4000]; - } - @ObfuscatedName("m") @ObfuscatedSignature( signature = "(Lir;I)V", @@ -51,11 +38,25 @@ public class Varps { garbageValue = "-1714608824" ) static void method4400(Buffer var0) { - if(Client.__client_ev != null) { - var0.__s_297(Client.__client_ev, 0, Client.__client_ev.length); + if (Client.field172 != null) { + var0.method38(Client.field172, 0, Client.field172.length); } else { byte[] var1 = AttackOption.method2032(); - var0.__s_297(var1, 0, var1.length); + var0.method38(var1, 0, var1.length); } + + } + + static { + Varps_masks = new int[32]; + int var0 = 2; + + for (int var1 = 0; var1 < 32; ++var1) { + Varps_masks[var1] = var0 - 1; + var0 += var0; + } + + Varps_temp = new int[4000]; + Varps_main = new int[4000]; } } diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index 05c9b9616c..213155cbe1 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -8,32 +7,32 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("VertexNormal") public class VertexNormal { @ObfuscatedName("pe") - static boolean __dq_pe; + static boolean field945; @ObfuscatedName("rq") @ObfuscatedGetter( intValue = 1351620693 ) - static int __dq_rq; + static int field946; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 1414310131 ) - int __m; + int field947; @ObfuscatedName("f") @ObfuscatedGetter( intValue = -1493845293 ) - int __f; + int field948; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 1575149515 ) - int __q; + int field949; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -487323631 ) - int __w; + int field950; VertexNormal() { } @@ -42,10 +41,10 @@ public class VertexNormal { signature = "(Ldq;)V" ) VertexNormal(VertexNormal var1) { - this.__m = var1.__m; - this.__f = var1.__f; - this.__q = var1.__q; - this.__w = var1.__w; + this.field947 = var1.field947; + this.field948 = var1.field948; + this.field949 = var1.field949; + this.field950 = var1.field950; } @ObfuscatedName("w") @@ -54,22 +53,20 @@ public class VertexNormal { garbageValue = "-86" ) static synchronized void method2984(byte[] var0) { - if(var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { + if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; - } else if(var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { + } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; - } else if(var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { + } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; - } else { - 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] < RouteStrategy.__fe_e[var1].length) { - RouteStrategy.__fe_e[var1][WorldMapSection2.__ah_l[var1]++] = var0; - return; - } + } else if (RouteStrategy.field760 != null) { + for (int var1 = 0; var1 < ByteArrayPool.field55.length; ++var1) { + if (var0.length == ByteArrayPool.field55[var1] && WorldMapSection2.field1082[var1] < RouteStrategy.field760[var1].length) { + RouteStrategy.field760[var1][WorldMapSection2.field1082[var1]++] = var0; + return; } } - } + } } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index c1ff7b8b25..57312a18ae 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -29,22 +29,22 @@ public class ViewportMouse { @ObfuscatedGetter( intValue = 1135175963 ) - static int __dm_u; + static int field951; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 262104267 ) - static int __dm_g; + static int field952; @ObfuscatedName("l") @ObfuscatedGetter( intValue = -2071972829 ) - static int __dm_l; + static int field953; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -852671813 ) - static int __dm_k; + static int field954; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -2140977119 @@ -55,15 +55,6 @@ public class ViewportMouse { @Export("ViewportMouse_entityTags") public static long[] ViewportMouse_entityTags; - static { - ViewportMouse_isInViewport = false; - ViewportMouse_x = 0; - ViewportMouse_y = 0; - ViewportMouse_false0 = false; - ViewportMouse_entityCount = 0; - ViewportMouse_entityTags = new long[1000]; - } - @ObfuscatedName("m") @ObfuscatedSignature( signature = "(IB)Lic;", @@ -71,7 +62,7 @@ public class ViewportMouse { ) @Export("getWorldMapElement") public static WorldMapElement getWorldMapElement(int var0) { - return var0 >= 0 && var0 < Widget.WorldMapElement_cached.length && Widget.WorldMapElement_cached[var0] != null?Widget.WorldMapElement_cached[var0]:new WorldMapElement(var0); + return var0 >= 0 && var0 < Widget.WorldMapElement_cached.length && Widget.WorldMapElement_cached[var0] != null ? Widget.WorldMapElement_cached[var0] : new WorldMapElement(var0); } @ObfuscatedName("h") @@ -81,22 +72,22 @@ public class ViewportMouse { ) static int method2983(int var0, Script var1, boolean var2) { Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - if(var0 == 2500) { + if (var0 == 2500) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.x; return 1; - } else if(var0 == 2501) { + } else if (var0 == 2501) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.y; return 1; - } else if(var0 == 2502) { + } else if (var0 == 2502) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.width; return 1; - } else if(var0 == 2503) { + } else if (var0 == 2503) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.height; return 1; - } else if(var0 == 2504) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.isHidden?1:0; + } else if (var0 == 2504) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; return 1; - } else if(var0 == 2505) { + } else if (var0 == 2505) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.parentId; return 1; } else { @@ -111,40 +102,49 @@ public class ViewportMouse { ) static final boolean method2957(Widget var0) { int var1 = var0.contentType; - if(var1 == 205) { - Client.__client_fd = 250; + if (var1 == 205) { + Client.field175 = 250; return true; } else { int var2; int var3; - if(var1 >= 300 && var1 <= 313) { + if (var1 >= 300 && var1 <= 313) { var2 = (var1 - 300) / 2; var3 = var1 & 1; - Client.__client_ru.__f_386(var2, var3 == 1); + Client.field119.method257(var2, var3 == 1); } - if(var1 >= 314 && var1 <= 323) { + if (var1 >= 314 && var1 <= 323) { var2 = (var1 - 314) / 2; var3 = var1 & 1; - Client.__client_ru.__q_387(var2, var3 == 1); + Client.field119.method258(var2, var3 == 1); } - if(var1 == 324) { - Client.__client_ru.__w_388(false); + if (var1 == 324) { + Client.field119.method259(false); } - if(var1 == 325) { - Client.__client_ru.__w_388(true); + if (var1 == 325) { + Client.field119.method259(true); } - if(var1 == 326) { - PacketBufferNode var4 = Interpreter.method1915(ClientPacket.__gs_n, Client.packetWriter.isaacCipher); - Client.__client_ru.__o_389(var4.packetBuffer); - Client.packetWriter.__q_167(var4); + if (var1 == 326) { + PacketBufferNode var4 = Interpreter.method1915(ClientPacket.field234, Client.packetWriter.isaacCipher); + Client.field119.method260(var4.packetBuffer); + Client.packetWriter.method241(var4); return true; } else { return false; } } } + + static { + ViewportMouse_isInViewport = false; + ViewportMouse_x = 0; + ViewportMouse_y = 0; + ViewportMouse_false0 = false; + ViewportMouse_entityCount = 0; + ViewportMouse_entityTags = new long[1000]; + } } diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java index b472fef687..517e9deb81 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -85,14 +85,14 @@ public final class WallDecoration { garbageValue = "1120739015" ) public static int method3257(byte[] var0, int var1) { - int var3 = -1; + int var2 = -1; - for(int var4 = 0; var4 < var1; ++var4) { - var3 = var3 >>> 8 ^ Buffer.__gr_q[(var3 ^ var0[var4]) & 255]; + for (int var3 = 0; var3 < var1; ++var3) { + var2 = var2 >>> 8 ^ Buffer.field45[(var2 ^ var0[var3]) & 255]; } - var3 = ~var3; - return var3; + var2 = ~var2; + return var2; } @ObfuscatedName("t") @@ -101,6 +101,6 @@ public final class WallDecoration { garbageValue = "-881894911" ) public static int method3256(int var0) { - return var0 > 0?1:(var0 < 0?-1:0); + return var0 > 0 ? 1 : (var0 < 0 ? -1 : 0); } } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index afda76d29b..46cb448535 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -32,7 +32,7 @@ public class Widget extends Node { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache __ho_d; + public static AbstractIndexCache field955; @ObfuscatedName("n") @ObfuscatedSignature( signature = "Ler;" @@ -55,9 +55,9 @@ public class Widget extends Node { @ObfuscatedSignature( signature = "Ler;" ) - static EvictingDualNodeHashTable __ho_z; + static EvictingDualNodeHashTable field956; @ObfuscatedName("j") - public static boolean __ho_j; + public static boolean field957; @ObfuscatedName("s") @Export("isIf3") public boolean isIf3; @@ -167,12 +167,12 @@ public class Widget extends Node { @ObfuscatedGetter( intValue = 206556853 ) - public int __aw; + public int field958; @ObfuscatedName("al") @ObfuscatedGetter( intValue = -1047989223 ) - public int __al; + public int field959; @ObfuscatedName("ab") @ObfuscatedGetter( intValue = -617209253 @@ -249,7 +249,7 @@ public class Widget extends Node { @ObfuscatedGetter( intValue = -1853255291 ) - public int __af; + public int field960; @ObfuscatedName("ai") @ObfuscatedGetter( intValue = -110526699 @@ -257,7 +257,7 @@ public class Widget extends Node { @Export("lineWid") public int lineWid; @ObfuscatedName("ba") - public boolean __ba; + public boolean field961; @ObfuscatedName("bb") @ObfuscatedGetter( intValue = -1074168553 @@ -373,17 +373,17 @@ public class Widget extends Node { @ObfuscatedGetter( intValue = -1692331135 ) - public int __bf; + public int field962; @ObfuscatedName("bh") @ObfuscatedGetter( intValue = 727421593 ) - public int __bh; + public int field963; @ObfuscatedName("be") @Export("modelOrthog") public boolean modelOrthog; @ObfuscatedName("bv") - public boolean __bv; + public boolean field964; @ObfuscatedName("bw") @ObfuscatedGetter( intValue = -1658511475 @@ -454,15 +454,15 @@ public class Widget extends Node { @Export("clickMask") public int clickMask; @ObfuscatedName("cg") - public boolean __cg; + public boolean field965; @ObfuscatedName("cf") - public byte[][] __cf; + public byte[][] field966; @ObfuscatedName("cp") - public byte[][] __cp; + public byte[][] field967; @ObfuscatedName("cc") - public int[] __cc; + public int[] field968; @ObfuscatedName("ci") - public int[] __ci; + public int[] field969; @ObfuscatedName("de") @Export("dataText") public String dataText; @@ -560,27 +560,27 @@ public class Widget extends Node { @Export("onScroll") public Object[] onScroll; @ObfuscatedName("em") - public Object[] __em; + public Object[] field970; @ObfuscatedName("ed") @Export("onKeyListener") public Object[] onKeyListener; @ObfuscatedName("ex") - public Object[] __ex; + public Object[] field971; @ObfuscatedName("ej") - public Object[] __ej; + public Object[] field972; @ObfuscatedName("el") - public Object[] __el; + public Object[] field973; @ObfuscatedName("en") @Export("onDialogAbortListener") public Object[] onDialogAbortListener; @ObfuscatedName("ei") - public Object[] __ei; + public Object[] field974; @ObfuscatedName("ee") - public Object[] __ee; + public Object[] field975; @ObfuscatedName("eq") - public Object[] __eq; + public Object[] field976; @ObfuscatedName("eh") - public Object[] __eh; + public Object[] field977; @ObfuscatedName("eo") @Export("cs1Instructions") public int[][] cs1Instructions; @@ -639,29 +639,29 @@ public class Widget extends Node { @Export("children") public Widget[] children; @ObfuscatedName("fq") - public boolean __fq; + public boolean field978; @ObfuscatedName("fw") - public boolean __fw; + public boolean field979; @ObfuscatedName("fg") @ObfuscatedGetter( intValue = -1520351537 ) - public int __fg; + public int field980; @ObfuscatedName("fc") @ObfuscatedGetter( intValue = 209458049 ) - public int __fc; + public int field981; @ObfuscatedName("fl") @ObfuscatedGetter( intValue = -672198209 ) - public int __fl; + public int field982; @ObfuscatedName("fj") @ObfuscatedGetter( intValue = 876695207 ) - public int __fj; + public int field983; @ObfuscatedName("fp") @ObfuscatedGetter( intValue = 365867737 @@ -675,7 +675,7 @@ public class Widget extends Node { @Export("cycle") public int cycle; @ObfuscatedName("fh") - public int[] __fh; + public int[] field984; @ObfuscatedName("fx") @Export("noClickThrough") public boolean noClickThrough; @@ -683,15 +683,7 @@ public class Widget extends Node { @Export("noScrollThrough") public boolean noScrollThrough; @ObfuscatedName("fz") - public boolean __fz; - - static { - widgetSpriteCache = new EvictingDualNodeHashTable(200); - Widget_cachedModels = new EvictingDualNodeHashTable(50); - Widget_cachedFonts = new EvictingDualNodeHashTable(20); - __ho_z = new EvictingDualNodeHashTable(8); - __ho_j = false; - } + public boolean field985; public Widget() { this.isIf3 = false; @@ -711,8 +703,8 @@ public class Widget extends Node { this.y = 0; this.width = 0; this.height = 0; - this.__aw = 1; - this.__al = 1; + this.field958 = 1; + this.field959 = 1; this.parentId = -1; this.isHidden = false; this.scrollX = 0; @@ -724,11 +716,11 @@ public class Widget extends Node { this.mouseOverColor = 0; this.mouseOverColor2 = 0; this.fill = false; - this.rectangleMode = RectangleMode.__lj_m; + this.rectangleMode = RectangleMode.field757; this.transparency = 0; - this.__af = 0; + this.field960 = 0; this.lineWid = 1; - this.__ba = false; + this.field961 = false; this.spriteId2 = -1; this.spriteId = -1; this.spriteAngle = 0; @@ -747,10 +739,10 @@ public class Widget extends Node { this.modelAngleY = 0; this.modelAngleZ = 0; this.modelZoom = 100; - this.__bf = 0; - this.__bh = 0; + this.field962 = 0; + this.field963 = 0; this.modelOrthog = false; - this.__bv = false; + this.field964 = false; this.itemQuantityMode = 2; this.fontId = -1; this.text = ""; @@ -762,7 +754,7 @@ public class Widget extends Node { this.paddingX = 0; this.paddingY = 0; this.clickMask = 0; - this.__cg = false; + this.field965 = false; this.dataText = ""; this.parent = null; this.dragZoneSize = 0; @@ -777,17 +769,17 @@ public class Widget extends Node { this.itemQuantity = 0; this.modelFrame = 0; this.modelFrameCycle = 0; - this.__fq = false; - this.__fw = false; - this.__fg = -1; - this.__fc = 0; - this.__fl = 0; - this.__fj = 0; + this.field978 = false; + this.field979 = false; + this.field980 = -1; + this.field981 = 0; + this.field982 = 0; + this.field983 = 0; this.rootIndex = -1; this.cycle = -1; this.noClickThrough = false; this.noScrollThrough = false; - this.__fz = false; + this.field985 = false; } @ObfuscatedName("o") @@ -800,33 +792,33 @@ public class Widget extends Node { this.isIf3 = false; this.type = var1.readUnsignedByte(); this.buttonType = var1.readUnsignedByte(); - this.contentType = var1.__ag_302(); - this.rawX = var1.__aq_303(); - this.rawY = var1.__aq_303(); - this.rawWidth = var1.__ag_302(); - this.rawHeight = var1.__ag_302(); + this.contentType = var1.method43(); + this.rawX = var1.method44(); + this.rawY = var1.method44(); + this.rawWidth = var1.method43(); + this.rawHeight = var1.method43(); this.transparency = var1.readUnsignedByte(); - this.parentId = var1.__ag_302(); - if(this.parentId == 65535) { + this.parentId = var1.method43(); + if (this.parentId == 65535) { this.parentId = -1; } else { this.parentId += this.id & -65536; } - this.mouseOverRedirect = var1.__ag_302(); - if(this.mouseOverRedirect == 65535) { + this.mouseOverRedirect = var1.method43(); + if (this.mouseOverRedirect == 65535) { this.mouseOverRedirect = -1; } int var2 = var1.readUnsignedByte(); int var3; - if(var2 > 0) { + if (var2 > 0) { this.cs1Comparisons = new int[var2]; this.cs1ComparisonValues = new int[var2]; - for(var3 = 0; var3 < var2; ++var3) { + for (var3 = 0; var3 < var2; ++var3) { this.cs1Comparisons[var3] = var1.readUnsignedByte(); - this.cs1ComparisonValues[var3] = var1.__ag_302(); + this.cs1ComparisonValues[var3] = var1.method43(); } } @@ -834,52 +826,52 @@ public class Widget extends Node { int var4; int var5; int var6; - if(var3 > 0) { + if (var3 > 0) { this.cs1Instructions = new int[var3][]; - for(var4 = 0; var4 < var3; ++var4) { - var5 = var1.__ag_302(); + for (var4 = 0; var4 < var3; ++var4) { + var5 = var1.method43(); this.cs1Instructions[var4] = new int[var5]; - for(var6 = 0; var6 < var5; ++var6) { - this.cs1Instructions[var4][var6] = var1.__ag_302(); - if(this.cs1Instructions[var4][var6] == 65535) { + for (var6 = 0; var6 < var5; ++var6) { + this.cs1Instructions[var4][var6] = var1.method43(); + if (this.cs1Instructions[var4][var6] == 65535) { this.cs1Instructions[var4][var6] = -1; } } } } - if(this.type == 0) { - this.scrollHeight = var1.__ag_302(); + if (this.type == 0) { + this.scrollHeight = var1.method43(); this.isHidden = var1.readUnsignedByte() == 1; } - if(this.type == 1) { - var1.__ag_302(); + if (this.type == 1) { + var1.method43(); var1.readUnsignedByte(); } - if(this.type == 2) { + if (this.type == 2) { this.itemIds = new int[this.rawHeight * this.rawWidth]; this.itemQuantities = new int[this.rawWidth * this.rawHeight]; var4 = var1.readUnsignedByte(); - if(var4 == 1) { + if (var4 == 1) { this.clickMask |= 268435456; } var5 = var1.readUnsignedByte(); - if(var5 == 1) { + if (var5 == 1) { this.clickMask |= 1073741824; } var6 = var1.readUnsignedByte(); - if(var6 == 1) { + if (var6 == 1) { this.clickMask |= Integer.MIN_VALUE; } int var7 = var1.readUnsignedByte(); - if(var7 == 1) { + if (var7 == 1) { this.clickMask |= 536870912; } @@ -890,11 +882,11 @@ public class Widget extends Node { this.inventorySprites = new int[20]; int var8; - for(var8 = 0; var8 < 20; ++var8) { + for (var8 = 0; var8 < 20; ++var8) { int var9 = var1.readUnsignedByte(); - if(var9 == 1) { - this.inventoryXOffsets[var8] = var1.__aq_303(); - this.inventoryYOffsets[var8] = var1.__aq_303(); + if (var9 == 1) { + this.inventoryXOffsets[var8] = var1.method44(); + this.inventoryYOffsets[var8] = var1.method44(); this.inventorySprites[var8] = var1.readInt(); } else { this.inventorySprites[var8] = -1; @@ -903,145 +895,145 @@ public class Widget extends Node { this.itemActions = new String[5]; - for(var8 = 0; var8 < 5; ++var8) { + for (var8 = 0; var8 < 5; ++var8) { String var11 = var1.readStringCp1252NullTerminated(); - if(var11.length() > 0) { + if (var11.length() > 0) { this.itemActions[var8] = var11; this.clickMask |= 1 << var8 + 23; } } } - if(this.type == 3) { + if (this.type == 3) { this.fill = var1.readUnsignedByte() == 1; } - if(this.type == 4 || this.type == 1) { + if (this.type == 4 || this.type == 1) { this.textXAlignment = var1.readUnsignedByte(); this.textYAlignment = var1.readUnsignedByte(); this.textLineHeight = var1.readUnsignedByte(); - this.fontId = var1.__ag_302(); - if(this.fontId == 65535) { + this.fontId = var1.method43(); + if (this.fontId == 65535) { this.fontId = -1; } this.textShadowed = var1.readUnsignedByte() == 1; } - if(this.type == 4) { + if (this.type == 4) { this.text = var1.readStringCp1252NullTerminated(); this.text2 = var1.readStringCp1252NullTerminated(); } - if(this.type == 1 || this.type == 3 || this.type == 4) { + if (this.type == 1 || this.type == 3 || this.type == 4) { this.color = var1.readInt(); } - if(this.type == 3 || this.type == 4) { + if (this.type == 3 || this.type == 4) { this.color2 = var1.readInt(); this.mouseOverColor = var1.readInt(); this.mouseOverColor2 = var1.readInt(); } - if(this.type == 5) { + if (this.type == 5) { this.spriteId2 = var1.readInt(); this.spriteId = var1.readInt(); } - if(this.type == 6) { + if (this.type == 6) { this.modelType = 1; - this.modelId = var1.__ag_302(); - if(this.modelId == 65535) { + this.modelId = var1.method43(); + if (this.modelId == 65535) { this.modelId = -1; } this.modelType2 = 1; - this.modelId2 = var1.__ag_302(); - if(this.modelId2 == 65535) { + this.modelId2 = var1.method43(); + if (this.modelId2 == 65535) { this.modelId2 = -1; } - this.sequenceId = var1.__ag_302(); - if(this.sequenceId == 65535) { + this.sequenceId = var1.method43(); + if (this.sequenceId == 65535) { this.sequenceId = -1; } - this.sequenceId2 = var1.__ag_302(); - if(this.sequenceId2 == 65535) { + this.sequenceId2 = var1.method43(); + if (this.sequenceId2 == 65535) { this.sequenceId2 = -1; } - this.modelZoom = var1.__ag_302(); - this.modelAngleX = var1.__ag_302(); - this.modelAngleY = var1.__ag_302(); + this.modelZoom = var1.method43(); + this.modelAngleX = var1.method43(); + this.modelAngleY = var1.method43(); } - if(this.type == 7) { + if (this.type == 7) { this.itemIds = new int[this.rawHeight * this.rawWidth]; this.itemQuantities = new int[this.rawWidth * this.rawHeight]; this.textXAlignment = var1.readUnsignedByte(); - this.fontId = var1.__ag_302(); - if(this.fontId == 65535) { + this.fontId = var1.method43(); + if (this.fontId == 65535) { this.fontId = -1; } this.textShadowed = var1.readUnsignedByte() == 1; this.color = var1.readInt(); - this.paddingX = var1.__aq_303(); - this.paddingY = var1.__aq_303(); + this.paddingX = var1.method44(); + this.paddingY = var1.method44(); var4 = var1.readUnsignedByte(); - if(var4 == 1) { + if (var4 == 1) { this.clickMask |= 1073741824; } this.itemActions = new String[5]; - for(var5 = 0; var5 < 5; ++var5) { + for (var5 = 0; var5 < 5; ++var5) { String var10 = var1.readStringCp1252NullTerminated(); - if(var10.length() > 0) { + if (var10.length() > 0) { this.itemActions[var5] = var10; this.clickMask |= 1 << var5 + 23; } } } - if(this.type == 8) { + if (this.type == 8) { this.text = var1.readStringCp1252NullTerminated(); } - if(this.buttonType == 2 || this.type == 2) { + if (this.buttonType == 2 || this.type == 2) { this.spellActionName = var1.readStringCp1252NullTerminated(); this.spellName = var1.readStringCp1252NullTerminated(); - var4 = var1.__ag_302() & 63; + var4 = var1.method43() & 63; this.clickMask |= var4 << 11; } - if(this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { this.buttonText = var1.readStringCp1252NullTerminated(); - if(this.buttonText.length() == 0) { - if(this.buttonType == 1) { + if (this.buttonText.length() == 0) { + if (this.buttonType == 1) { this.buttonText = "Ok"; } - if(this.buttonType == 4) { + if (this.buttonType == 4) { this.buttonText = "Select"; } - if(this.buttonType == 5) { + if (this.buttonType == 5) { this.buttonText = "Select"; } - if(this.buttonType == 6) { + if (this.buttonType == 6) { this.buttonText = "Continue"; } } } - if(this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { this.clickMask |= 4194304; } - if(this.buttonType == 6) { + if (this.buttonType == 6) { this.clickMask |= 1; } @@ -1057,37 +1049,37 @@ public class Widget extends Node { var1.readUnsignedByte(); this.isIf3 = true; this.type = var1.readUnsignedByte(); - this.contentType = var1.__ag_302(); - this.rawX = var1.__aq_303(); - this.rawY = var1.__aq_303(); - this.rawWidth = var1.__ag_302(); - if(this.type == 9) { - this.rawHeight = var1.__aq_303(); + this.contentType = var1.method43(); + this.rawX = var1.method44(); + this.rawY = var1.method44(); + this.rawWidth = var1.method43(); + if (this.type == 9) { + this.rawHeight = var1.method44(); } else { - this.rawHeight = var1.__ag_302(); + this.rawHeight = var1.method43(); } this.widthAlignment = var1.readByte(); this.heightAlignment = var1.readByte(); this.xAlignment = var1.readByte(); this.yAlignment = var1.readByte(); - this.parentId = var1.__ag_302(); - if(this.parentId == 65535) { + this.parentId = var1.method43(); + if (this.parentId == 65535) { this.parentId = -1; } else { this.parentId += this.id & -65536; } this.isHidden = var1.readUnsignedByte() == 1; - if(this.type == 0) { - this.scrollWidth = var1.__ag_302(); - this.scrollHeight = var1.__ag_302(); + if (this.type == 0) { + this.scrollWidth = var1.method43(); + this.scrollHeight = var1.method43(); this.noClickThrough = var1.readUnsignedByte() == 1; } - if(this.type == 5) { + if (this.type == 5) { this.spriteId2 = var1.readInt(); - this.spriteAngle = var1.__ag_302(); + this.spriteAngle = var1.method43(); this.spriteTiling = var1.readUnsignedByte() == 1; this.transparency = var1.readUnsignedByte(); this.outline = var1.readUnsignedByte(); @@ -1096,38 +1088,38 @@ public class Widget extends Node { this.spriteFlipH = var1.readUnsignedByte() == 1; } - if(this.type == 6) { + if (this.type == 6) { this.modelType = 1; - this.modelId = var1.__ag_302(); - if(this.modelId == 65535) { + this.modelId = var1.method43(); + if (this.modelId == 65535) { this.modelId = -1; } - this.modelOffsetX = var1.__aq_303(); - this.modelOffsetY = var1.__aq_303(); - this.modelAngleX = var1.__ag_302(); - this.modelAngleY = var1.__ag_302(); - this.modelAngleZ = var1.__ag_302(); - this.modelZoom = var1.__ag_302(); - this.sequenceId = var1.__ag_302(); - if(this.sequenceId == 65535) { + this.modelOffsetX = var1.method44(); + this.modelOffsetY = var1.method44(); + this.modelAngleX = var1.method43(); + this.modelAngleY = var1.method43(); + this.modelAngleZ = var1.method43(); + this.modelZoom = var1.method43(); + this.sequenceId = var1.method43(); + if (this.sequenceId == 65535) { this.sequenceId = -1; } this.modelOrthog = var1.readUnsignedByte() == 1; - var1.__ag_302(); - if(this.widthAlignment != 0) { - this.__bf = var1.__ag_302(); + var1.method43(); + if (this.widthAlignment != 0) { + this.field962 = var1.method43(); } - if(this.heightAlignment != 0) { - var1.__ag_302(); + if (this.heightAlignment != 0) { + var1.method43(); } } - if(this.type == 4) { - this.fontId = var1.__ag_302(); - if(this.fontId == 65535) { + if (this.type == 4) { + this.fontId = var1.method43(); + if (this.fontId == 65535) { this.fontId = -1; } @@ -1139,25 +1131,25 @@ public class Widget extends Node { this.color = var1.readInt(); } - if(this.type == 3) { + if (this.type == 3) { this.color = var1.readInt(); this.fill = var1.readUnsignedByte() == 1; this.transparency = var1.readUnsignedByte(); } - if(this.type == 9) { + if (this.type == 9) { this.lineWid = var1.readUnsignedByte(); this.color = var1.readInt(); - this.__ba = var1.readUnsignedByte() == 1; + this.field961 = var1.readUnsignedByte() == 1; } this.clickMask = var1.readMedium(); this.dataText = var1.readStringCp1252NullTerminated(); int var2 = var1.readUnsignedByte(); - if(var2 > 0) { + if (var2 > 0) { this.actions = new String[var2]; - for(int var3 = 0; var3 < var2; ++var3) { + for (int var3 = 0; var3 < var2; ++var3) { this.actions[var3] = var1.readStringCp1252NullTerminated(); } } @@ -1197,16 +1189,16 @@ public class Widget extends Node { @Export("readListener") Object[] readListener(Buffer var1) { int var2 = var1.readUnsignedByte(); - if(var2 == 0) { + if (var2 == 0) { return null; } else { Object[] var3 = new Object[var2]; - for(int var4 = 0; var4 < var2; ++var4) { + for (int var4 = 0; var4 < var2; ++var4) { int var5 = var1.readUnsignedByte(); - if(var5 == 0) { + if (var5 == 0) { var3[var4] = new Integer(var1.readInt()); - } else if(var5 == 1) { + } else if (var5 == 1) { var3[var4] = var1.readStringCp1252NullTerminated(); } } @@ -1224,12 +1216,12 @@ public class Widget extends Node { @Export("readListenerTriggers") int[] readListenerTriggers(Buffer var1) { int var2 = var1.readUnsignedByte(); - if(var2 == 0) { + if (var2 == 0) { return null; } else { int[] var3 = new int[var2]; - for(int var4 = 0; var4 < var2; ++var4) { + for (int var4 = 0; var4 < var2; ++var4) { var3[var4] = var1.readInt(); } @@ -1259,49 +1251,49 @@ public class Widget extends Node { ) @Export("getSprite") public Sprite getSprite(boolean var1) { - __ho_j = false; + field957 = false; int var2; - if(var1) { + if (var1) { var2 = this.spriteId; } else { var2 = this.spriteId2; } - if(var2 == -1) { + if (var2 == -1) { return null; } else { - long var3 = ((this.spriteFlipV?1L:0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipH?1L:0L) << 39) + ((long)this.spriteShadow << 40); - Sprite var5 = (Sprite) widgetSpriteCache.get(var3); - if(var5 != null) { + long var3 = ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); + Sprite var5 = (Sprite)widgetSpriteCache.get(var3); + if (var5 != null) { return var5; } else { - var5 = class322.readSprite(__ho_d, var2, 0); - if(var5 == null) { - __ho_j = true; + var5 = class322.readSprite(field955, var2, 0); + if (var5 == null) { + field957 = true; return null; } else { - if(this.spriteFlipV) { - var5.__g_501(); + if (this.spriteFlipV) { + var5.method306(); } - if(this.spriteFlipH) { - var5.__u_500(); + if (this.spriteFlipH) { + var5.method305(); } - if(this.outline > 0) { - var5.__o_499(this.outline); + if (this.outline > 0) { + var5.method304(this.outline); } - if(this.outline >= 1) { - var5.__l_502(1); + if (this.outline >= 1) { + var5.method307(1); } - if(this.outline >= 2) { - var5.__l_502(16777215); + if (this.outline >= 2) { + var5.method307(16777215); } - if(this.spriteShadow != 0) { - var5.__e_503(this.spriteShadow); + if (this.spriteShadow != 0) { + var5.method308(this.spriteShadow); } widgetSpriteCache.put(var5, var3); @@ -1318,19 +1310,19 @@ public class Widget extends Node { ) @Export("getFont") public Font getFont() { - __ho_j = false; - if(this.fontId == -1) { + field957 = false; + if (this.fontId == -1) { return null; } else { Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); - if(var1 != null) { + if (var1 != null) { return var1; } else { - var1 = SpriteIds.method5823(__ho_d, class27.__aq_k, this.fontId, 0); - if(var1 != null) { + var1 = SpriteIds.method5823(field955, class27.field1143, this.fontId, 0); + if (var1 != null) { Widget_cachedFonts.put(var1, (long)this.fontId); } else { - __ho_j = true; + field957 = true; } return var1; @@ -1345,21 +1337,21 @@ public class Widget extends Node { ) @Export("getInventorySprite") public Sprite getInventorySprite(int var1) { - __ho_j = false; - if(var1 >= 0 && var1 < this.inventorySprites.length) { + field957 = false; + if (var1 >= 0 && var1 < this.inventorySprites.length) { int var2 = this.inventorySprites[var1]; - if(var2 == -1) { + if (var2 == -1) { return null; } else { - Sprite var3 = (Sprite) widgetSpriteCache.get((long)var2); - if(var3 != null) { + Sprite var3 = (Sprite)widgetSpriteCache.get((long)var2); + if (var3 != null) { return var3; } else { - var3 = class322.readSprite(__ho_d, var2, 0); - if(var3 != null) { + var3 = class322.readSprite(field955, var2, 0); + if (var3 != null) { widgetSpriteCache.put(var3, (long)var2); } else { - __ho_j = true; + field957 = true; } return var3; @@ -1377,10 +1369,10 @@ public class Widget extends Node { ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerAppearance var4) { - __ho_j = false; + field957 = false; int var5; int var6; - if(var3) { + if (var3) { var5 = this.modelType2; var6 = this.modelId2; } else { @@ -1388,53 +1380,53 @@ public class Widget extends Node { var6 = this.modelId; } - if(var5 == 0) { + if (var5 == 0) { return null; - } else if(var5 == 1 && var6 == -1) { + } else if (var5 == 1 && var6 == -1) { return null; } else { Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); - if(var7 == null) { + if (var7 == null) { ModelData var8; - if(var5 == 1) { - var8 = ModelData.method2788(BufferedSource.__fh_x, var6, 0); - if(var8 == null) { - __ho_j = true; + if (var5 == 1) { + var8 = ModelData.method2788(BufferedSource.field54, var6, 0); + if (var8 == null) { + field957 = true; return null; } var7 = var8.toModel(64, 768, -50, -10, -50); } - if(var5 == 2) { + if (var5 == 2) { var8 = ObjectDefinition.getNpcDefinition(var6).getModelData(); - if(var8 == null) { - __ho_j = true; + if (var8 == null) { + field957 = true; return null; } var7 = var8.toModel(64, 768, -50, -10, -50); } - if(var5 == 3) { - if(var4 == null) { + if (var5 == 3) { + if (var4 == null) { return null; } var8 = var4.getModelData(); - if(var8 == null) { - __ho_j = true; + if (var8 == null) { + field957 = true; return null; } var7 = var8.toModel(64, 768, -50, -10, -50); } - if(var5 == 4) { + if (var5 == 4) { ItemDefinition var9 = Skills.getItemDefinition(var6); - var8 = var9.__l_429(10); - if(var8 == null) { - __ho_j = true; + var8 = var9.method143(10); + if (var8 == null) { + field957 = true; return null; } @@ -1444,7 +1436,7 @@ public class Widget extends Node { Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); } - if(var1 != null) { + if (var1 != null) { var7 = var1.animateWidget(var7, var2); } @@ -1459,41 +1451,41 @@ public class Widget extends Node { ) @Export("getSpriteMask") public SpriteMask getSpriteMask(boolean var1) { - if(this.spriteId == -1) { + if (this.spriteId == -1) { var1 = false; } - int var2 = var1?this.spriteId:this.spriteId2; - if(var2 == -1) { + int var2 = var1 ? this.spriteId : this.spriteId2; + if (var2 == -1) { return null; } else { - long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH?1L:0L) << 39) + ((this.spriteFlipV?1L:0L) << 38) + ((long)this.outline << 36) + (long)var2; - SpriteMask var5 = (SpriteMask)__ho_z.get(var3); - if(var5 != null) { + long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.outline << 36) + (long)var2; + SpriteMask var5 = (SpriteMask)field956.get(var3); + if (var5 != null) { return var5; } else { Sprite var6 = this.getSprite(var1); - if(var6 == null) { + if (var6 == null) { return null; } else { Sprite var7 = var6.copyNormalized(); int[] var8 = new int[var7.subHeight]; int[] var9 = new int[var7.subHeight]; - for(int var10 = 0; var10 < var7.subHeight; ++var10) { + for (int var10 = 0; var10 < var7.subHeight; ++var10) { int var11 = 0; int var12 = var7.subWidth; int var13; - for(var13 = 0; var13 < var7.subWidth; ++var13) { - if(var7.pixels[var13 + var10 * var7.subWidth] == 0) { + for (var13 = 0; var13 < var7.subWidth; ++var13) { + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { var11 = var13; break; } } - for(var13 = var7.subWidth - 1; var13 >= var11; --var13) { - if(var7.pixels[var13 + var10 * var7.subWidth] == 0) { + for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { var12 = var13 + 1; break; } @@ -1504,7 +1496,7 @@ public class Widget extends Node { } var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); - __ho_z.put(var5, var3); + field956.put(var5, var3); return var5; } } @@ -1518,10 +1510,10 @@ public class Widget extends Node { ) @Export("setAction") public void setAction(int var1, String var2) { - if(this.actions == null || this.actions.length <= var1) { + if (this.actions == null || this.actions.length <= var1) { String[] var3 = new String[var1 + 1]; - if(this.actions != null) { - for(int var4 = 0; var4 < this.actions.length; ++var4) { + if (this.actions != null) { + for (int var4 = 0; var4 < this.actions.length; ++var4) { var3[var4] = this.actions[var4]; } } @@ -1548,16 +1540,24 @@ public class Widget extends Node { IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.addFirst(var3); } - Object var9 = IndexStoreActionHandler.IndexStoreActionHandler_lock; + Object var5 = IndexStoreActionHandler.IndexStoreActionHandler_lock; synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) { - if(IndexStoreActionHandler.__iv_q == 0) { + if (IndexStoreActionHandler.field412 == 0) { Frames.IndexStoreActionHandler_thread = new Thread(new IndexStoreActionHandler()); Frames.IndexStoreActionHandler_thread.setDaemon(true); Frames.IndexStoreActionHandler_thread.start(); Frames.IndexStoreActionHandler_thread.setPriority(5); } - IndexStoreActionHandler.__iv_q = 600; + IndexStoreActionHandler.field412 = 600; } } + + static { + widgetSpriteCache = new EvictingDualNodeHashTable(200); + Widget_cachedModels = new EvictingDualNodeHashTable(50); + Widget_cachedFonts = new EvictingDualNodeHashTable(20); + field956 = new EvictingDualNodeHashTable(8); + field957 = false; + } } diff --git a/runescape-client/src/main/java/WidgetGroupParent.java b/runescape-client/src/main/java/WidgetGroupParent.java index 491c7b8343..19c90b5d88 100644 --- a/runescape-client/src/main/java/WidgetGroupParent.java +++ b/runescape-client/src/main/java/WidgetGroupParent.java @@ -17,7 +17,7 @@ public class WidgetGroupParent extends Node { @ObfuscatedGetter( intValue = -992379173 ) - static int __bx_o; + static int field986; @ObfuscatedName("m") @ObfuscatedGetter( intValue = -707461797 @@ -45,22 +45,22 @@ public class WidgetGroupParent extends Node { ) static Script method1175(int var0, int var1) { Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); - if(var2 != null) { + if (var2 != null) { return var2; } else { String var3 = String.valueOf(var0); int var4 = Formatting.indexCache12.getArchiveId(var3); - if(var4 == -1) { + if (var4 == -1) { return null; } else { byte[] var5 = Formatting.indexCache12.takeRecordFlat(var4); - if(var5 != null) { - if(var5.length <= 1) { + if (var5 != null) { + if (var5.length <= 1) { return null; } var2 = Occluder.newScript(var5); - if(var2 != null) { + if (var2 != null) { Script.Script_cached.put(var2, (long)(var0 << 16)); return var2; } @@ -81,12 +81,12 @@ public class WidgetGroupParent extends Node { char[] var3 = new char[var2]; int var4 = 0; - for(int var5 = 0; var5 < var2; ++var5) { + for (int var5 = 0; var5 < var2; ++var5) { int var6 = var0[var5 + var1] & 255; - if(var6 != 0) { - if(var6 >= 128 && var6 < 160) { + if (var6 != 0) { + if (var6 >= 128 && var6 < 160) { char var7 = class304.cp1252AsciiExtension[var6 - 128]; - if(var7 == 0) { + if (var7 == 0) { var7 = '?'; } @@ -106,7 +106,7 @@ public class WidgetGroupParent extends Node { garbageValue = "32" ) static int method1174(int var0) { - ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(Integer.valueOf(var0)); - return var1 == null?0:var1.size(); + ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); + return var1 == null ? 0 : var1.size(); } } diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index 17297fb7e8..410e309591 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -17,7 +17,7 @@ public class World { @ObfuscatedGetter( intValue = 1143875805 ) - static int __bt_g; + static int field987; @ObfuscatedName("l") @Export("sortOption2") static int[] sortOption2; @@ -61,13 +61,6 @@ public class World { @Export("index") int index; - static { - worldsCount = 0; - __bt_g = 0; - sortOption2 = new int[]{1, 1, 1, 1}; - sortOption1 = new int[]{0, 1, 2, 3}; - } - @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)Z", @@ -83,7 +76,7 @@ public class World { signature = "(B)Z", garbageValue = "0" ) - boolean __x_145() { + boolean method356() { return (2 & this.properties) != 0; } @@ -102,7 +95,7 @@ public class World { signature = "(I)Z", garbageValue = "-1662622660" ) - boolean __a_147() { + boolean method357() { return (8 & this.properties) != 0; } @@ -113,7 +106,7 @@ public class World { ) @Export("isDeadman") boolean isDeadman() { - return (0x20000000 & this.properties) != 0; // 1 << 29 + return (536870912 & this.properties) != 0; } @ObfuscatedName("j") @@ -123,7 +116,7 @@ public class World { ) @Export("isBeta") boolean isBeta() { - return (0x2000000 & this.properties) != 0; // 1 << 25 + return (33554432 & this.properties) != 0; } @ObfuscatedName("f") @@ -140,4 +133,11 @@ public class World { var0 |= var0 >>> 16; return var0 + 1; } + + static { + worldsCount = 0; + field987 = 0; + sortOption2 = new int[]{1, 1, 1, 1}; + sortOption1 = new int[]{0, 1, 2, 3}; + } } diff --git a/runescape-client/src/main/java/WorldComparator.java b/runescape-client/src/main/java/WorldComparator.java index 1f284bc1a2..b186520c8a 100644 --- a/runescape-client/src/main/java/WorldComparator.java +++ b/runescape-client/src/main/java/WorldComparator.java @@ -8,25 +8,25 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("WorldComparator") final class WorldComparator implements Comparator { @ObfuscatedName("n") - public static boolean __u_n; + public static boolean field988; @ObfuscatedName("m") @ObfuscatedSignature( signature = "(Ll;Ll;I)I", garbageValue = "707844889" ) - int __m_0(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.world < var2.world?-1:(var2.world == var1.world?0:1); + int method358(GrandExchangeEvent var1, GrandExchangeEvent var2) { + return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1); } @Export("compare") @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.__m_0((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.method358((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } @ObfuscatedName("equals") - public boolean __equals_2(Object var1) { + public boolean method359(Object var1) { return super.equals(var1); } @@ -45,14 +45,14 @@ final class WorldComparator implements Comparator { garbageValue = "108" ) static int method68(int var0, Script var1, boolean var2) { - if(var0 == 3200) { + if (var0 == 3200) { 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) { + } else if (var0 == 3201) { AbstractUserComparator.method5437(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); return 1; - } else if(var0 == 3202) { + } else if (var0 == 3202) { RouteStrategy.Interpreter_intStackSize -= 2; HealthBar.method1994(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); return 1; @@ -67,13 +67,13 @@ final class WorldComparator implements Comparator { garbageValue = "96" ) static final void method67(PacketBuffer var0) { - for(int var1 = 0; var1 < Client.__client_fw; ++var1) { - int var2 = Client.__client_fg[var1]; - Npc var3 = Client.npcs[var2]; + for (int var1 = 0; var1 < Client.field173; ++var1) { + int var2 = Client.field174[var1]; + NPC var3 = Client.npcs[var2]; int var4 = var0.readUnsignedByte(); - if((var4 & 1) != 0) { - var3.targetIndex = var0.__by_324(); - if(var3.targetIndex == 65535) { + if ((var4 & 1) != 0) { + var3.targetIndex = var0.method65(); + if (var3.targetIndex == 65535) { var3.targetIndex = -1; } } @@ -82,49 +82,49 @@ final class WorldComparator implements Comparator { int var6; int var7; int var8; - if((var4 & 64) != 0) { - var5 = var0.__bm_326(); - var6 = var0.__bm_326(); + if ((var4 & 64) != 0) { + var5 = var0.method67(); + var6 = var0.method67(); var7 = var3.x - (var5 - class50.baseX - class50.baseX) * 64; var8 = var3.y - (var6 - GraphicsObject.baseY - GraphicsObject.baseY) * 64; - if(var7 != 0 || var8 != 0) { - var3.__bc = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; + if (var7 != 0 || var8 != 0) { + var3.field12 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; } } - if((var4 & 32) != 0) { - var5 = var0.__ag_302(); - if(var5 == 65535) { + if ((var4 & 32) != 0) { + var5 = var0.method43(); + if (var5 == 65535) { var5 = -1; } - var6 = var0.__bq_318(); - if(var5 == var3.sequence && var5 != -1) { - var7 = WorldMapAreaData.getSequenceDefinition(var5).__t; - if(var7 == 1) { + var6 = var0.method59(); + if (var5 == var3.sequence && var5 != -1) { + var7 = WorldMapAreaData.getSequenceDefinition(var5).field783; + if (var7 == 1) { var3.sequenceFrame = 0; var3.sequenceFrameCycle = 0; var3.sequenceDelay = var6; - var3.__bj = 0; + var3.field13 = 0; } - if(var7 == 2) { - var3.__bj = 0; + if (var7 == 2) { + var3.field13 = 0; } - } else if(var5 == -1 || var3.sequence == -1 || WorldMapAreaData.getSequenceDefinition(var5).__n >= WorldMapAreaData.getSequenceDefinition(var3.sequence).__n) { + } else if (var5 == -1 || var3.sequence == -1 || WorldMapAreaData.getSequenceDefinition(var5).field779 >= WorldMapAreaData.getSequenceDefinition(var3.sequence).field779) { var3.sequence = var5; var3.sequenceFrame = 0; var3.sequenceFrameCycle = 0; var3.sequenceDelay = var6; - var3.__bj = 0; - var3.__ch = var3.pathLength; + var3.field13 = 0; + var3.field25 = var3.pathLength; } } - if((var4 & 4) != 0) { - var3.definition = ObjectDefinition.getNpcDefinition(var0.__ag_302()); + if ((var4 & 4) != 0) { + var3.definition = ObjectDefinition.getNpcDefinition(var0.method43()); var3.size = var3.definition.size; - var3.__cj = var3.definition.__av; + var3.field23 = var3.definition.field639; var3.walkSequence = var3.definition.walkSequence; var3.walkTurnSequence = var3.definition.walkTurnSequence; var3.walkTurnLeftSequence = var3.definition.walkTurnLeftSequence; @@ -134,42 +134,42 @@ final class WorldComparator implements Comparator { var3.turnRightSequence = var3.definition.turnRightSequence; } - if((var4 & 16) != 0) { + if ((var4 & 16) != 0) { var5 = var0.readUnsignedByteNegate(); int var9; int var10; int var11; - if(var5 > 0) { - for(var6 = 0; var6 < var5; ++var6) { + if (var5 > 0) { + for (var6 = 0; var6 < var5; ++var6) { var8 = -1; var9 = -1; var10 = -1; - var7 = var0.__ae_307(); - if(var7 == 32767) { - var7 = var0.__ae_307(); - var9 = var0.__ae_307(); - var8 = var0.__ae_307(); - var10 = var0.__ae_307(); - } else if(var7 != 32766) { - var9 = var0.__ae_307(); + var7 = var0.method48(); + if (var7 == 32767) { + var7 = var0.method48(); + var9 = var0.method48(); + var8 = var0.method48(); + var10 = var0.method48(); + } else if (var7 != 32766) { + var9 = var0.method48(); } else { var7 = -1; } - var11 = var0.__ae_307(); + var11 = var0.method48(); var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); } } - var6 = var0.__bb_317(); - if(var6 > 0) { - for(var7 = 0; var7 < var6; ++var7) { - var8 = var0.__ae_307(); - var9 = var0.__ae_307(); - if(var9 != 32767) { - var10 = var0.__ae_307(); + var6 = var0.method58(); + if (var6 > 0) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var0.method48(); + var9 = var0.method48(); + if (var9 != 32767) { + var10 = var0.method48(); var11 = var0.readUnsignedByte(); - int var12 = var9 > 0?var0.__bq_318():var11; + int var12 = var9 > 0 ? var0.method59() : var11; var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); } else { var3.removeHealthBar(var8); @@ -178,23 +178,23 @@ final class WorldComparator implements Comparator { } } - if((var4 & 8) != 0) { - var3.spotAnimation = var0.__by_324(); - var5 = var0.__bp_331(); + if ((var4 & 8) != 0) { + var3.spotAnimation = var0.method65(); + var5 = var0.method72(); var3.heightOffset = var5 >> 16; - var3.__bt = (var5 & 65535) + Client.cycle; + var3.field14 = (var5 & 65535) + Client.cycle; var3.spotAnimationFrame = 0; var3.spotAnimationFrameCycle = 0; - if(var3.__bt > Client.cycle) { + if (var3.field14 > Client.cycle) { var3.spotAnimationFrame = -1; } - if(var3.spotAnimation == 65535) { + if (var3.spotAnimation == 65535) { var3.spotAnimation = -1; } } - if((var4 & 2) != 0) { + if ((var4 & 2) != 0) { var3.overheadText = var0.readStringCp1252NullTerminated(); var3.overheadTextCyclesRemaining = 100; } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 13b495ddb3..323886684a 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -35,17 +35,17 @@ public class WorldMap { @ObfuscatedSignature( signature = "Lir;" ) - AbstractIndexCache __g; + AbstractIndexCache field989; @ObfuscatedName("l") @ObfuscatedSignature( signature = "Lir;" ) - AbstractIndexCache __l; + AbstractIndexCache field990; @ObfuscatedName("e") @ObfuscatedSignature( signature = "Lir;" ) - AbstractIndexCache __e; + AbstractIndexCache field991; @ObfuscatedName("n") @ObfuscatedSignature( signature = "Lkk;" @@ -80,7 +80,7 @@ public class WorldMap { @ObfuscatedSignature( signature = "Lag;" ) - WorldMapArea __t; + WorldMapArea field992; @ObfuscatedName("y") @ObfuscatedSignature( signature = "Lal;" @@ -151,12 +151,12 @@ public class WorldMap { @ObfuscatedGetter( intValue = -1653084915 ) - int __ac; + int field993; @ObfuscatedName("ay") @ObfuscatedGetter( intValue = 1664740569 ) - int __ay; + int field994; @ObfuscatedName("ah") @Export("perpetualFlash0") boolean perpetualFlash0; @@ -167,49 +167,49 @@ public class WorldMap { @ObfuscatedGetter( intValue = -1683910031 ) - int __aw; + int field995; @ObfuscatedName("al") @ObfuscatedGetter( intValue = 2064651113 ) - int __al; + int field996; @ObfuscatedName("ab") @ObfuscatedGetter( intValue = -1979665983 ) - int __ab; + int field997; @ObfuscatedName("ae") @ObfuscatedGetter( intValue = 547126547 ) - int __ae; + int field998; @ObfuscatedName("at") @ObfuscatedGetter( intValue = -815748997 ) - int __at; + int field999; @ObfuscatedName("ad") @ObfuscatedGetter( intValue = -988933407 ) - int __ad; + int field1000; @ObfuscatedName("ap") @ObfuscatedGetter( longValue = -4747643242047040283L ) - long __ap; + long field1001; @ObfuscatedName("as") @ObfuscatedGetter( intValue = -969094439 ) - int __as; + int field1002; @ObfuscatedName("am") @ObfuscatedGetter( intValue = -869889187 ) - int __am; + int field1003; @ObfuscatedName("an") - boolean __an; + boolean field1004; @ObfuscatedName("ao") @Export("enabledElements") HashSet enabledElements; @@ -217,9 +217,9 @@ public class WorldMap { @Export("enabledCategories") HashSet enabledCategories; @ObfuscatedName("ax") - HashSet __ax; + HashSet field1005; @ObfuscatedName("af") - HashSet __af; + HashSet field1006; @ObfuscatedName("ai") @Export("elementsDisabled") boolean elementsDisabled; @@ -227,16 +227,16 @@ public class WorldMap { @ObfuscatedGetter( intValue = -237734529 ) - int __ba; + int field1007; @ObfuscatedName("bs") - final int[] __bs; + final int[] field1008; @ObfuscatedName("bq") - List __bq; + List field1009; @ObfuscatedName("bn") @Export("iconIterator") Iterator iconIterator; @ObfuscatedName("bk") - HashSet __bk; + HashSet field1010; @ObfuscatedName("bd") @ObfuscatedSignature( signature = "Lhu;" @@ -256,28 +256,22 @@ public class WorldMap { @ObfuscatedGetter( intValue = 2031417343 ) - int __bx; + int field1011; @ObfuscatedName("by") @ObfuscatedGetter( intValue = 754899959 ) - int __by; + int field1012; @ObfuscatedName("bu") @ObfuscatedGetter( intValue = 2064728623 ) - int __bu; + int field1013; @ObfuscatedName("bm") @ObfuscatedGetter( intValue = -1774424249 ) - int __bm; - - static { - fontNameVerdana11 = FontName.FontName_verdana11; - fontNameVerdana13 = FontName.FontName_verdana13; - fontNameVerdana15 = FontName.FontName_verdana15; - } + int field1014; public WorldMap() { this.worldMapTargetX = -1; @@ -286,30 +280,30 @@ public class WorldMap { this.worldMapDisplayHeight = -1; this.worldMapDisplayX = -1; this.worldMapDisplayY = -1; - this.__ac = 3; - this.__ay = 50; + this.field993 = 3; + this.field994 = 50; this.perpetualFlash0 = false; this.flashingElements = null; - this.__aw = -1; - this.__al = -1; - this.__ab = -1; - this.__ae = -1; - this.__at = -1; - this.__ad = -1; - this.__an = true; + this.field995 = -1; + this.field996 = -1; + this.field997 = -1; + this.field998 = -1; + this.field999 = -1; + this.field1000 = -1; + this.field1004 = true; this.enabledElements = new HashSet(); this.enabledCategories = new HashSet(); - this.__ax = new HashSet(); - this.__af = new HashSet(); + this.field1005 = new HashSet(); + this.field1006 = new HashSet(); this.elementsDisabled = false; - this.__ba = 0; - this.__bs = new int[]{1008, 1009, 1010, 1011, 1012}; - this.__bk = new HashSet(); + this.field1007 = 0; + this.field1008 = new int[]{1008, 1009, 1010, 1011, 1012}; + this.field1010 = new HashSet(); this.mouseCoord = null; this.showCoord = false; - this.__by = -1; - this.__bu = -1; - this.__bm = -1; + this.field1012 = -1; + this.field1013 = -1; + this.field1014 = -1; } @ObfuscatedName("m") @@ -320,31 +314,31 @@ public class WorldMap { @Export("init") public void init(AbstractIndexCache var1, AbstractIndexCache var2, AbstractIndexCache var3, Font var4, HashMap var5, IndexedSprite[] var6) { this.mapSceneSprites = var6; - this.__g = var1; - this.__l = var2; - this.__e = var3; + this.field989 = var1; + this.field990 = var2; + this.field991 = var3; this.font = var4; this.fonts = new HashMap(); this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_small, var5.get(fontNameVerdana11)); this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); this.cacheLoader = new WorldMapIndexCacheLoader(var1); - int var7 = this.__g.getArchiveId(WorldMapCacheName.WorldMapCacheName_details.name); - int[] var8 = this.__g.__j_395(var7); + int var7 = this.field989.getArchiveId(WorldMapCacheName.WorldMapCacheName_details.name); + int[] var8 = this.field989.method3(var7); this.mapAreas = new HashMap(var8.length); - for(int var9 = 0; var9 < var8.length; ++var9) { - Buffer var10 = new Buffer(this.__g.takeRecord(var7, var8[var9])); + for (int var9 = 0; var9 < var8.length; ++var9) { + Buffer var10 = new Buffer(this.field989.takeRecord(var7, var8[var9])); WorldMapArea var11 = new WorldMapArea(); var11.read(var10, var8[var9]); this.mapAreas.put(var11.archiveName(), var11); - if(var11.isMain()) { + if (var11.isMain()) { this.mainMapArea = var11; } } this.setCurrentMapArea(this.mainMapArea); - this.__t = null; + this.field992 = null; } @ObfuscatedName("f") @@ -352,8 +346,8 @@ public class WorldMap { signature = "(I)V", garbageValue = "-1144390092" ) - public void __f_518() { - WorldMapRegion.__av_o.demote(5); + public void method360() { + WorldMapRegion.field1051.demote(5); } @ObfuscatedName("q") @@ -363,48 +357,49 @@ public class WorldMap { ) @Export("onCycle") public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) { - if(this.cacheLoader.isLoaded()) { + if (this.cacheLoader.isLoaded()) { this.smoothZoom(); - this.__g_521(); - if(var3) { + this.method363(); + if (var3) { int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); - List var10 = this.worldMapManager.__u_74(this.worldMapX - var8 / 2 - 1, this.worldMapY - var9 / 2 - 1, var8 / 2 + this.worldMapX + 1, var9 / 2 + this.worldMapY + 1, var4, var5, var6, var7, var1, var2); + List var10 = this.worldMapManager.method403(this.worldMapX - var8 / 2 - 1, this.worldMapY - var9 / 2 - 1, var8 / 2 + this.worldMapX + 1, var9 / 2 + this.worldMapY + 1, var4, var5, var6, var7, var1, var2); HashSet var11 = new HashSet(); Iterator var12; AbstractWorldMapIcon var13; ScriptEvent var14; WorldMapEvent var15; - for(var12 = var10.iterator(); var12.hasNext(); AbstractIndexCache.runScript(var14)) { + for (var12 = var10.iterator(); var12.hasNext(); AbstractIndexCache.runScript(var14)) { var13 = (AbstractWorldMapIcon)var12.next(); var11.add(var13); var14 = new ScriptEvent(); - var15 = new WorldMapEvent(var13.__m_15(), var13.coord1, var13.coord2); - var14.setArgs(new Object[]{var15, Integer.valueOf(var1), Integer.valueOf(var2)}); - if(this.__bk.contains(var13)) { + var15 = new WorldMapEvent(var13.vmethod395(), var13.coord1, var13.coord2); + var14.setArgs(new Object[]{var15, var1, var2}); + if (this.field1010.contains(var13)) { var14.setType(17); } else { var14.setType(15); } } - var12 = this.__bk.iterator(); + var12 = this.field1010.iterator(); - while(var12.hasNext()) { + while (var12.hasNext()) { var13 = (AbstractWorldMapIcon)var12.next(); - if(!var11.contains(var13)) { + if (!var11.contains(var13)) { var14 = new ScriptEvent(); - var15 = new WorldMapEvent(var13.__m_15(), var13.coord1, var13.coord2); - var14.setArgs(new Object[]{var15, Integer.valueOf(var1), Integer.valueOf(var2)}); + var15 = new WorldMapEvent(var13.vmethod395(), var13.coord1, var13.coord2); + var14.setArgs(new Object[]{var15, var1, var2}); var14.setType(16); AbstractIndexCache.runScript(var14); } } - this.__bk = var11; + this.field1010 = var11; } } + } @ObfuscatedName("w") @@ -412,68 +407,69 @@ public class WorldMap { signature = "(IIZZS)V", garbageValue = "18431" ) - public void __w_519(int var1, int var2, boolean var3, boolean var4) { + public void method361(int var1, int var2, boolean var3, boolean var4) { long var5 = class203.currentTimeMs(); - this.__o_520(var1, var2, var4, var5); - if(!this.__x_524() && (var4 || var3)) { - if(var4) { - this.__at = var1; - this.__ad = var2; - this.__ab = this.worldMapX; - this.__ae = this.worldMapY; + this.method362(var1, var2, var4, var5); + if (this.method365() || !var4 && !var3) { + this.method364(); + } else { + if (var4) { + this.field999 = var1; + this.field1000 = var2; + this.field997 = this.worldMapX; + this.field998 = this.worldMapY; } - if(this.__ab != -1) { - int var7 = var1 - this.__at; - int var8 = var2 - this.__ad; - this.setWorldMapPosition(this.__ab - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.__ae, false); + if (this.field997 != -1) { + int var7 = var1 - this.field999; + int var8 = var2 - this.field1000; + this.setWorldMapPosition(this.field997 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field998, false); } - } else { - this.__e_523(); } - if(var4) { - this.__ap = var5; - this.__as = var1; - this.__am = var2; + if (var4) { + this.field1001 = var5; + this.field1002 = var1; + this.field1003 = var2; } } @ObfuscatedName("o") - void __o_520(int var1, int var2, boolean var3, long var4) { - if(this.currentMapArea0 != null) { - int var6 = (int)((float)this.worldMapX + ((float)(var1 - this.worldMapDisplayX) - (float)this.__ap_537() * this.zoom / 2.0F) / this.zoom); - int var7 = (int)((float)this.worldMapY - ((float)(var2 - this.worldMapDisplayY) - (float)this.__as_538() * this.zoom / 2.0F) / this.zoom); + void method362(int var1, int var2, boolean var3, long var4) { + if (this.currentMapArea0 != null) { + int var6 = (int)((float)this.worldMapX + ((float)(var1 - this.worldMapDisplayX) - (float)this.method377() * this.zoom / 2.0F) / this.zoom); + int var7 = (int)((float)this.worldMapY - ((float)(var2 - this.worldMapDisplayY) - (float)this.method378() * this.zoom / 2.0F) / this.zoom); this.mouseCoord = this.currentMapArea0.coord(var6 + this.currentMapArea0.minX() * 64, var7 + this.currentMapArea0.minY() * 64); - if(this.mouseCoord != null && var3) { + if (this.mouseCoord != null && var3) { + int var8; int var9; - int var10; - if(FriendSystem.jmodCheck() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { - int var13 = this.mouseCoord.x; - var9 = this.mouseCoord.y; - var10 = this.mouseCoord.plane; - PacketBufferNode var11 = Interpreter.method1915(ClientPacket.__gs_bx, Client.packetWriter.isaacCipher); + PacketBufferNode var11; + if (FriendSystem.jmodCheck() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { + int var12 = this.mouseCoord.x; + var8 = this.mouseCoord.y; + var9 = this.mouseCoord.plane; + var11 = Interpreter.method1915(ClientPacket.field283, Client.packetWriter.isaacCipher); var11.packetBuffer.writeIntME(0); - var11.packetBuffer.writeShortLE(var9); - var11.packetBuffer.__ai_315(var10); - var11.packetBuffer.writeShort(var13); - Client.packetWriter.__q_167(var11); + var11.packetBuffer.writeShortLE(var8); + var11.packetBuffer.method56(var9); + var11.packetBuffer.writeShort(var12); + Client.packetWriter.method241(var11); } else { - boolean var8 = true; - if(this.__an) { - var9 = var1 - this.__as; - var10 = var2 - this.__am; - if(var4 - this.__ap > 500L || var9 < -25 || var9 > 25 || var10 < -25 || var10 > 25) { - var8 = false; + boolean var10 = true; + if (this.field1004) { + var8 = var1 - this.field1002; + var9 = var2 - this.field1003; + if (var4 - this.field1001 > 500L || var8 < -25 || var8 > 25 || var9 < -25 || var9 > 25) { + var10 = false; } } - if(var8) { - PacketBufferNode var12 = Interpreter.method1915(ClientPacket.__gs_az, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeIntME(this.mouseCoord.packed()); - Client.packetWriter.__q_167(var12); - this.__ap = 0L; + if (var10) { + var11 = Interpreter.method1915(ClientPacket.field267, Client.packetWriter.isaacCipher); + var11.packetBuffer.writeIntME(this.mouseCoord.packed()); + Client.packetWriter.method241(var11); + this.field1001 = 0L; } } } @@ -490,18 +486,18 @@ public class WorldMap { ) @Export("smoothZoom") void smoothZoom() { - if(ClientParameter.field3645 != null) { + if (ClientParameter.field3645 != null) { this.zoom = this.zoomTarget; } else { - if(this.zoom < this.zoomTarget) { + if (this.zoom < this.zoomTarget) { this.zoom = Math.min(this.zoomTarget, this.zoom / 30.0F + this.zoom); } - if(this.zoom > this.zoomTarget) { + if (this.zoom > this.zoomTarget) { this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); } - } + } @ObfuscatedName("g") @@ -509,25 +505,25 @@ public class WorldMap { signature = "(I)V", garbageValue = "2075446341" ) - void __g_521() { - if(this.__x_524()) { + void method363() { + if (this.method365()) { int var1 = this.worldMapTargetX - this.worldMapX; int var2 = this.worldMapTargetY - this.worldMapY; - if(var1 != 0) { + if (var1 != 0) { var1 /= Math.min(8, Math.abs(var1)); } - if(var2 != 0) { + if (var2 != 0) { var2 /= Math.min(8, Math.abs(var2)); } this.setWorldMapPosition(var1 + this.worldMapX, var2 + this.worldMapY, true); - if(this.worldMapTargetX == this.worldMapX && this.worldMapTargetY == this.worldMapY) { + if (this.worldMapTargetX == this.worldMapX && this.worldMapTargetY == this.worldMapY) { this.worldMapTargetX = -1; this.worldMapTargetY = -1; } - } + } @ObfuscatedName("l") @@ -540,8 +536,8 @@ public class WorldMap { this.worldMapX = var1; this.worldMapY = var2; class203.currentTimeMs(); - if(var3) { - this.__e_523(); + if (var3) { + this.method364(); } } @@ -551,11 +547,11 @@ public class WorldMap { signature = "(B)V", garbageValue = "35" ) - final void __e_523() { - this.__ad = -1; - this.__at = -1; - this.__ae = -1; - this.__ab = -1; + final void method364() { + this.field1000 = -1; + this.field999 = -1; + this.field998 = -1; + this.field997 = -1; } @ObfuscatedName("x") @@ -563,7 +559,7 @@ public class WorldMap { signature = "(I)Z", garbageValue = "1444745621" ) - boolean __x_524() { + boolean method365() { return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; } @@ -576,16 +572,14 @@ public class WorldMap { public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { Iterator var4 = this.mapAreas.values().iterator(); - WorldMapArea var5; - do { - if(!var4.hasNext()) { - return null; + while (var4.hasNext()) { + WorldMapArea var5 = (WorldMapArea)var4.next(); + if (var5.containsCoord(var1, var2, var3)) { + return var5; } + } - var5 = (WorldMapArea)var4.next(); - } while(!var5.containsCoord(var1, var2, var3)); - - return var5; + return null; } @ObfuscatedName("a") @@ -593,10 +587,10 @@ public class WorldMap { signature = "(IIIZI)V", garbageValue = "469045892" ) - public void __a_525(int var1, int var2, int var3, boolean var4) { + public void method366(int var1, int var2, int var3, boolean var4) { WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); - if(var5 == null) { - if(!var4) { + if (var5 == null) { + if (!var4) { return; } @@ -604,13 +598,13 @@ public class WorldMap { } boolean var6 = false; - if(var5 != this.__t || var4) { - this.__t = var5; + if (var5 != this.field992 || var4) { + this.field992 = var5; this.setCurrentMapArea(var5); var6 = true; } - if(var6 || var4) { + if (var6 || var4) { this.jump(var1, var2, var3); } @@ -624,7 +618,7 @@ public class WorldMap { @Export("setCurrentMapAreaId") public void setCurrentMapAreaId(int var1) { WorldMapArea var2 = this.getMapArea(var1); - if(var2 != null) { + if (var2 != null) { this.setCurrentMapArea(var2); } @@ -637,7 +631,7 @@ public class WorldMap { ) @Export("currentMapAreaId") public int currentMapAreaId() { - return this.currentMapArea0 == null?-1:this.currentMapArea0.id(); + return this.currentMapArea0 == null ? -1 : this.currentMapArea0.id(); } @ObfuscatedName("s") @@ -657,10 +651,11 @@ public class WorldMap { ) @Export("setCurrentMapArea") void setCurrentMapArea(WorldMapArea var1) { - if(this.currentMapArea0 == null || var1 != this.currentMapArea0) { + if (this.currentMapArea0 == null || var1 != this.currentMapArea0) { this.initializeWorldMap(var1); this.jump(-1, -1, -1); } + } @ObfuscatedName("y") @@ -671,7 +666,7 @@ public class WorldMap { @Export("initializeWorldMap") void initializeWorldMap(WorldMapArea var1) { this.currentMapArea0 = var1; - this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.__l, this.__e); + this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.field990, this.field991); this.cacheLoader.reset(this.currentMapArea0.archiveName()); } @@ -680,19 +675,19 @@ public class WorldMap { signature = "(Lag;Lhu;Lhu;ZI)V", garbageValue = "-1430939646" ) - public void __h_526(WorldMapArea var1, TileLocation var2, TileLocation var3, boolean var4) { - if(var1 != null) { - if(this.currentMapArea0 == null || var1 != this.currentMapArea0) { + public void method367(WorldMapArea var1, TileLocation var2, TileLocation var3, boolean var4) { + if (var1 != null) { + if (this.currentMapArea0 == null || var1 != this.currentMapArea0) { this.initializeWorldMap(var1); } - if(!var4 && this.currentMapArea0.containsCoord(var2.plane, var2.x, var2.y)) { + if (!var4 && this.currentMapArea0.containsCoord(var2.plane, var2.x, var2.y)) { this.jump(var2.plane, var2.x, var2.y); } else { this.jump(var3.plane, var3.x, var3.y); } - } + } @ObfuscatedName("b") @@ -702,21 +697,22 @@ public class WorldMap { ) @Export("jump") void jump(int var1, int var2, int var3) { - if(this.currentMapArea0 != null) { + if (this.currentMapArea0 != null) { int[] var4 = this.currentMapArea0.position(var1, var2, var3); - if(var4 == null) { + if (var4 == null) { var4 = this.currentMapArea0.position(this.currentMapArea0.originPlane(), this.currentMapArea0.originX(), this.currentMapArea0.originY()); } this.setWorldMapPosition(var4[0] - this.currentMapArea0.minX() * 64, var4[1] - this.currentMapArea0.minY() * 64, true); this.worldMapTargetX = -1; this.worldMapTargetY = -1; - this.zoom = this.__av_529(this.currentMapArea0.zoom()); + this.zoom = this.method370(this.currentMapArea0.zoom()); this.zoomTarget = this.zoom; - this.__bq = null; + this.field1009 = null; this.iconIterator = null; this.worldMapManager.clearIcons(); } + } @ObfuscatedName("c") @@ -731,43 +727,43 @@ public class WorldMap { Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); int var7 = this.cacheLoader.percentLoaded(); - if(var7 < 100) { + if (var7 < 100) { this.drawLoading(var1, var2, var3, var4, var7); } else { - if(!this.worldMapManager.isLoaded()) { - this.worldMapManager.load(this.__g, this.currentMapArea0.archiveName(), Client.isMembersWorld); - if(!this.worldMapManager.isLoaded()) { + if (!this.worldMapManager.isLoaded()) { + this.worldMapManager.load(this.field989, this.currentMapArea0.archiveName(), Client.isMembersWorld); + if (!this.worldMapManager.isLoaded()) { return; } } - if(this.flashingElements != null) { - ++this.__al; - if(this.__al % this.__ay == 0) { - this.__al = 0; - ++this.__aw; + if (this.flashingElements != null) { + ++this.field996; + if (this.field996 % this.field994 == 0) { + this.field996 = 0; + ++this.field995; } - if(this.__aw >= this.__ac && !this.perpetualFlash0) { + if (this.field995 >= this.field993 && !this.perpetualFlash0) { this.flashingElements = null; } } int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); - this.worldMapManager.__q_72(this.worldMapX - var8 / 2, this.worldMapY - var9 / 2, var8 / 2 + this.worldMapX, var9 / 2 + this.worldMapY, var1, var2, var3 + var1, var2 + var4); - if(!this.elementsDisabled) { + this.worldMapManager.method401(this.worldMapX - var8 / 2, this.worldMapY - var9 / 2, var8 / 2 + this.worldMapX, var9 / 2 + this.worldMapY, var1, var2, var3 + var1, var2 + var4); + if (!this.elementsDisabled) { boolean var10 = false; - if(var5 - this.__ba > 100) { - this.__ba = var5; + if (var5 - this.field1007 > 100) { + this.field1007 = var5; var10 = true; } - this.worldMapManager.__w_73(this.worldMapX - var8 / 2, this.worldMapY - var9 / 2, var8 / 2 + this.worldMapX, var9 / 2 + this.worldMapY, var1, var2, var3 + var1, var2 + var4, this.__af, this.flashingElements, this.__al, this.__ay, var10); + this.worldMapManager.method402(this.worldMapX - var8 / 2, this.worldMapY - var9 / 2, var8 / 2 + this.worldMapX, var9 / 2 + this.worldMapY, var1, var2, var3 + var1, var2 + var4, this.field1006, this.flashingElements, this.field996, this.field994, var10); } - this.__v_528(var1, var2, var3, var4, var8, var9); - if(FriendSystem.jmodCheck() && this.showCoord && this.mouseCoord != null) { + this.method369(var1, var2, var3, var4, var8, var9); + if (FriendSystem.jmodCheck() && this.showCoord && this.mouseCoord != null) { this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); } @@ -777,6 +773,7 @@ public class WorldMap { this.worldMapDisplayY = var2; Rasterizer2D.Rasterizer2D_setClipArray(var6); } + } @ObfuscatedName("p") @@ -784,8 +781,8 @@ public class WorldMap { signature = "(IIIIIII)Z", garbageValue = "-1561237851" ) - boolean __p_527(int var1, int var2, int var3, int var4, int var5, int var6) { - return this.sprite == null?true:(this.sprite.subWidth == var1 && this.sprite.subHeight == var2?(this.worldMapManager.__z != this.__bx?true:(this.__bm != Client.__client_ss?true:(var3 <= 0 && var4 <= 0?var3 + var1 < var5 || var2 + var4 < var6:true))):true); + boolean method368(int var1, int var2, int var3, int var4, int var5, int var6) { + return this.sprite == null ? true : (this.sprite.subWidth == var1 && this.sprite.subHeight == var2 ? (this.worldMapManager.field1050 != this.field1011 ? true : (this.field1014 != Client.field104 ? true : (var3 <= 0 && var4 <= 0 ? var3 + var1 < var5 || var2 + var4 < var6 : true))) : true); } @ObfuscatedName("v") @@ -793,39 +790,39 @@ public class WorldMap { signature = "(IIIIIII)V", garbageValue = "-2090965249" ) - void __v_528(int var1, int var2, int var3, int var4, int var5, int var6) { - if(ClientParameter.field3645 != null) { - int var7 = 512 / (this.worldMapManager.__z * 2); + void method369(int var1, int var2, int var3, int var4, int var5, int var6) { + if (ClientParameter.field3645 != null) { + int var7 = 512 / (this.worldMapManager.field1050 * 2); int var8 = var3 + 512; int var9 = var4 + 512; float var10 = 1.0F; var8 = (int)((float)var8 / var10); var9 = (int)((float)var9 / var10); - int var11 = this.__ae_534() - var5 / 2 - var7; - int var12 = this.__at_535() - var6 / 2 - var7; - int var13 = var1 - (var7 + var11 - this.__by) * this.worldMapManager.__z; - int var14 = var2 - this.worldMapManager.__z * (var7 - (var12 - this.__bu)); - if(this.__p_527(var8, var9, var13, var14, var3, var4)) { - if(this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { + int var11 = this.method374() - var5 / 2 - var7; + int var12 = this.method375() - var6 / 2 - var7; + int var13 = var1 - (var7 + var11 - this.field1012) * this.worldMapManager.field1050; + int var14 = var2 - this.worldMapManager.field1050 * (var7 - (var12 - this.field1013)); + if (this.method368(var8, var9, var13, var14, var3, var4)) { + if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { Arrays.fill(this.sprite.pixels, 0); } else { this.sprite = new Sprite(var8, var9); } - this.__by = this.__ae_534() - var5 / 2 - var7; - this.__bu = this.__at_535() - var6 / 2 - var7; - this.__bx = this.worldMapManager.__z; - ClientParameter.field3645.method4720(this.__by, this.__bu, this.sprite, (float)this.__bx / var10); - this.__bm = Client.__client_ss; - var13 = var1 - (var11 + var7 - this.__by) * this.worldMapManager.__z; - var14 = var2 - this.worldMapManager.__z * (var7 - (var12 - this.__bu)); + this.field1012 = this.method374() - var5 / 2 - var7; + this.field1013 = this.method375() - var6 / 2 - var7; + this.field1011 = this.worldMapManager.field1050; + ClientParameter.field3645.method4720(this.field1012, this.field1013, this.sprite, (float)this.field1011 / var10); + this.field1014 = Client.field104; + var13 = var1 - (var11 + var7 - this.field1012) * this.worldMapManager.field1050; + var14 = var2 - this.worldMapManager.field1050 * (var7 - (var12 - this.field1013)); } Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); - if(1.0F == var10) { - this.sprite.__v_510(var13, var14, 192); + if (1.0F == var10) { + this.sprite.method312(var13, var14, 192); } else { - this.sprite.__aj_511(var13, var14, (int)(var10 * (float)var8), (int)((float)var9 * var10), 192); + this.sprite.method313(var13, var14, (int)(var10 * (float)var8), (int)((float)var9 * var10), 192); } } @@ -838,16 +835,17 @@ public class WorldMap { ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4) { - if(this.cacheLoader.isLoaded()) { - if(!this.worldMapManager.isLoaded()) { - this.worldMapManager.load(this.__g, this.currentMapArea0.archiveName(), Client.isMembersWorld); - if(!this.worldMapManager.isLoaded()) { + if (this.cacheLoader.isLoaded()) { + if (!this.worldMapManager.isLoaded()) { + this.worldMapManager.load(this.field989, this.currentMapArea0.archiveName(), Client.isMembersWorld); + if (!this.worldMapManager.isLoaded()) { return; } } - this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.__al, this.__ay); + this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.field996, this.field994); } + } @ObfuscatedName("aq") @@ -857,7 +855,7 @@ public class WorldMap { ) @Export("setZoomLevel") public void setZoomLevel(int var1) { - this.zoomTarget = this.__av_529(var1); + this.zoomTarget = this.method370(var1); } @ObfuscatedName("aj") @@ -881,8 +879,8 @@ public class WorldMap { signature = "(IB)F", garbageValue = "56" ) - float __av_529(int var1) { - return var1 == 25?1.0F:(var1 == 37?1.5F:(var1 == 50?2.0F:(var1 == 75?3.0F:(var1 == 100?4.0F:8.0F)))); + float method370(int var1) { + return var1 == 25 ? 1.0F : (var1 == 37 ? 1.5F : (var1 == 50 ? 2.0F : (var1 == 75 ? 3.0F : (var1 == 100 ? 4.0F : 8.0F)))); } @ObfuscatedName("ar") @@ -892,7 +890,7 @@ public class WorldMap { ) @Export("getZoomLevel") public int getZoomLevel() { - return (double)this.zoomTarget == 1.0D?25:((double)this.zoomTarget == 1.5D?37:(2.0D == (double)this.zoomTarget?50:(3.0D == (double)this.zoomTarget?75:(4.0D == (double)this.zoomTarget?100:200)))); + return (double)this.zoomTarget == 1.0D ? 25 : ((double)this.zoomTarget == 1.5D ? 37 : (2.0D == (double)this.zoomTarget ? 50 : (3.0D == (double)this.zoomTarget ? 75 : (4.0D == (double)this.zoomTarget ? 100 : 200)))); } @ObfuscatedName("ac") @@ -924,16 +922,14 @@ public class WorldMap { public WorldMapArea getMapArea(int var1) { Iterator var2 = this.mapAreas.values().iterator(); - WorldMapArea var3; - do { - if(!var2.hasNext()) { - return null; + while (var2.hasNext()) { + WorldMapArea var3 = (WorldMapArea)var2.next(); + if (var3.id() == var1) { + return var3; } + } - var3 = (WorldMapArea)var2.next(); - } while(var3.id() != var1); - - return var3; + return null; } @ObfuscatedName("ak") @@ -943,10 +939,11 @@ public class WorldMap { ) @Export("setWorldMapPositionTarget") public void setWorldMapPositionTarget(int var1, int var2) { - if(this.currentMapArea0 != null && this.currentMapArea0.containsPosition(var1, var2)) { + if (this.currentMapArea0 != null && this.currentMapArea0.containsPosition(var1, var2)) { this.worldMapTargetX = var1 - this.currentMapArea0.minX() * 64; this.worldMapTargetY = var2 - this.currentMapArea0.minY() * 64; } + } @ObfuscatedName("aw") @@ -954,12 +951,13 @@ public class WorldMap { signature = "(III)V", garbageValue = "-2147142500" ) - public void __aw_531(int var1, int var2) { - if(this.currentMapArea0 != null) { + public void method371(int var1, int var2) { + if (this.currentMapArea0 != null) { this.setWorldMapPosition(var1 - this.currentMapArea0.minX() * 64, var2 - this.currentMapArea0.minY() * 64, true); this.worldMapTargetX = -1; this.worldMapTargetY = -1; } + } @ObfuscatedName("al") @@ -967,14 +965,14 @@ public class WorldMap { signature = "(IIIB)V", garbageValue = "-40" ) - public void __al_532(int var1, int var2, int var3) { - if(this.currentMapArea0 != null) { + public void method372(int var1, int var2, int var3) { + if (this.currentMapArea0 != null) { int[] var4 = this.currentMapArea0.position(var1, var2, var3); - if(var4 != null) { + if (var4 != null) { this.setWorldMapPositionTarget(var4[0], var4[1]); } - } + } @ObfuscatedName("ab") @@ -982,14 +980,14 @@ public class WorldMap { signature = "(IIII)V", garbageValue = "1808854561" ) - public void __ab_533(int var1, int var2, int var3) { - if(this.currentMapArea0 != null) { + public void method373(int var1, int var2, int var3) { + if (this.currentMapArea0 != null) { int[] var4 = this.currentMapArea0.position(var1, var2, var3); - if(var4 != null) { - this.__aw_531(var4[0], var4[1]); + if (var4 != null) { + this.method371(var4[0], var4[1]); } - } + } @ObfuscatedName("ae") @@ -997,8 +995,8 @@ public class WorldMap { signature = "(I)I", garbageValue = "-659556919" ) - public int __ae_534() { - return this.currentMapArea0 == null?-1:this.worldMapX + this.currentMapArea0.minX() * 64; + public int method374() { + return this.currentMapArea0 == null ? -1 : this.worldMapX + this.currentMapArea0.minX() * 64; } @ObfuscatedName("at") @@ -1006,8 +1004,8 @@ public class WorldMap { signature = "(I)I", garbageValue = "1893257871" ) - public int __at_535() { - return this.currentMapArea0 == null?-1:this.worldMapY + this.currentMapArea0.minY() * 64; + public int method375() { + return this.currentMapArea0 == null ? -1 : this.worldMapY + this.currentMapArea0.minY() * 64; } @ObfuscatedName("ad") @@ -1015,8 +1013,8 @@ public class WorldMap { signature = "(I)Lhu;", garbageValue = "-2005824064" ) - public TileLocation __ad_536() { - return this.currentMapArea0 == null?null:this.currentMapArea0.coord(this.__ae_534(), this.__at_535()); + public TileLocation method376() { + return this.currentMapArea0 == null ? null : this.currentMapArea0.coord(this.method374(), this.method375()); } @ObfuscatedName("ap") @@ -1024,7 +1022,7 @@ public class WorldMap { signature = "(I)I", garbageValue = "442119278" ) - public int __ap_537() { + public int method377() { return this.worldMapDisplayWidth; } @@ -1033,7 +1031,7 @@ public class WorldMap { signature = "(I)I", garbageValue = "-2065910749" ) - public int __as_538() { + public int method378() { return this.worldMapDisplayHeight; } @@ -1042,9 +1040,9 @@ public class WorldMap { signature = "(II)V", garbageValue = "2017050927" ) - public void __am_539(int var1) { - if(var1 >= 1) { - this.__ac = var1; + public void method379(int var1) { + if (var1 >= 1) { + this.field993 = var1; } } @@ -1054,8 +1052,8 @@ public class WorldMap { signature = "(I)V", garbageValue = "-1568631080" ) - public void __an_540() { - this.__ac = 3; + public void method380() { + this.field993 = 3; } @ObfuscatedName("az") @@ -1063,9 +1061,9 @@ public class WorldMap { signature = "(II)V", garbageValue = "107295139" ) - public void __az_541(int var1) { - if(var1 >= 1) { - this.__ay = var1; + public void method381(int var1) { + if (var1 >= 1) { + this.field994 = var1; } } @@ -1075,8 +1073,8 @@ public class WorldMap { signature = "(I)V", garbageValue = "2023118274" ) - public void __au_542() { - this.__ay = 50; + public void method382() { + this.field994 = 50; } @ObfuscatedName("ao") @@ -1097,9 +1095,9 @@ public class WorldMap { @Export("flashElement") public void flashElement(int var1) { this.flashingElements = new HashSet(); - this.flashingElements.add(Integer.valueOf(var1)); - this.__aw = 0; - this.__al = 0; + this.flashingElements.add(var1); + this.field995 = 0; + this.field996 = 0; } @ObfuscatedName("ax") @@ -1110,12 +1108,12 @@ public class WorldMap { @Export("flashCategory") public void flashCategory(int var1) { this.flashingElements = new HashSet(); - this.__aw = 0; - this.__al = 0; + this.field995 = 0; + this.field996 = 0; - for(int var2 = 0; var2 < UserComparator4.WorldMapElement_count; ++var2) { - if(ViewportMouse.getWorldMapElement(var2) != null && ViewportMouse.getWorldMapElement(var2).category == var1) { - this.flashingElements.add(Integer.valueOf(ViewportMouse.getWorldMapElement(var2).__o)); + for (int var2 = 0; var2 < UserComparator4.WorldMapElement_count; ++var2) { + if (ViewportMouse.getWorldMapElement(var2) != null && ViewportMouse.getWorldMapElement(var2).category == var1) { + this.flashingElements.add(ViewportMouse.getWorldMapElement(var2).field1020); } } @@ -1148,13 +1146,13 @@ public class WorldMap { ) @Export("disableElement") public void disableElement(int var1, boolean var2) { - if(!var2) { - this.enabledElements.add(Integer.valueOf(var1)); + if (!var2) { + this.enabledElements.add(var1); } else { - this.enabledElements.remove(Integer.valueOf(var1)); + this.enabledElements.remove(var1); } - this.__bk_543(); + this.method383(); } @ObfuscatedName("bb") @@ -1164,24 +1162,24 @@ public class WorldMap { ) @Export("disableCategory") public void disableCategory(int var1, boolean var2) { - if(!var2) { - this.enabledCategories.add(Integer.valueOf(var1)); + if (!var2) { + this.enabledCategories.add(var1); } else { - this.enabledCategories.remove(Integer.valueOf(var1)); + this.enabledCategories.remove(var1); } - for(int var3 = 0; var3 < UserComparator4.WorldMapElement_count; ++var3) { - if(ViewportMouse.getWorldMapElement(var3) != null && ViewportMouse.getWorldMapElement(var3).category == var1) { - int var4 = ViewportMouse.getWorldMapElement(var3).__o; - if(!var2) { - this.__ax.add(Integer.valueOf(var4)); + for (int var3 = 0; var3 < UserComparator4.WorldMapElement_count; ++var3) { + if (ViewportMouse.getWorldMapElement(var3) != null && ViewportMouse.getWorldMapElement(var3).category == var1) { + int var4 = ViewportMouse.getWorldMapElement(var3).field1020; + if (!var2) { + this.field1005.add(var4); } else { - this.__ax.remove(Integer.valueOf(var4)); + this.field1005.remove(var4); } } } - this.__bk_543(); + this.method383(); } @ObfuscatedName("bs") @@ -1201,7 +1199,7 @@ public class WorldMap { ) @Export("isElementDisabled") public boolean isElementDisabled(int var1) { - return !this.enabledElements.contains(Integer.valueOf(var1)); + return !this.enabledElements.contains(var1); } @ObfuscatedName("bn") @@ -1211,7 +1209,7 @@ public class WorldMap { ) @Export("isCategoryDisabled") public boolean isCategoryDisabled(int var1) { - return !this.enabledCategories.contains(Integer.valueOf(var1)); + return !this.enabledCategories.contains(var1); } @ObfuscatedName("bk") @@ -1219,10 +1217,10 @@ public class WorldMap { signature = "(I)V", garbageValue = "758731634" ) - void __bk_543() { - this.__af.clear(); - this.__af.addAll(this.enabledElements); - this.__af.addAll(this.__ax); + void method383() { + this.field1006.clear(); + this.field1006.addAll(this.enabledElements); + this.field1006.addAll(this.field1005); } @ObfuscatedName("bd") @@ -1230,34 +1228,34 @@ public class WorldMap { signature = "(IIIIIIB)V", garbageValue = "-73" ) - public void __bd_544(int var1, int var2, int var3, int var4, int var5, int var6) { - if(this.cacheLoader.isLoaded()) { + public void method384(int var1, int var2, int var3, int var4, int var5, int var6) { + if (this.cacheLoader.isLoaded()) { int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); - List var9 = this.worldMapManager.__u_74(this.worldMapX - var7 / 2 - 1, this.worldMapY - var8 / 2 - 1, var7 / 2 + this.worldMapX + 1, var8 / 2 + this.worldMapY + 1, var1, var2, var3, var4, var5, var6); - if(!var9.isEmpty()) { + List var9 = this.worldMapManager.method403(this.worldMapX - var7 / 2 - 1, this.worldMapY - var8 / 2 - 1, var7 / 2 + this.worldMapX + 1, var8 / 2 + this.worldMapY + 1, var1, var2, var3, var4, var5, var6); + if (!var9.isEmpty()) { Iterator var10 = var9.iterator(); - boolean var13; + boolean var11; do { - if(!var10.hasNext()) { + if (!var10.hasNext()) { return; } - AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); - WorldMapElement var12 = ViewportMouse.getWorldMapElement(var11.__m_15()); - var13 = false; + AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var10.next(); + WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.vmethod395()); + var11 = false; - for(int var14 = this.__bs.length - 1; var14 >= 0; --var14) { - if(var12.strings[var14] != null) { - Tiles.insertMenuItemNoShift(var12.strings[var14], var12.string1, this.__bs[var14], var11.__m_15(), var11.coord1.packed(), var11.coord2.packed()); - var13 = true; + for (int var14 = this.field1008.length - 1; var14 >= 0; --var14) { + if (var13.strings[var14] != null) { + Tiles.insertMenuItemNoShift(var13.strings[var14], var13.string1, this.field1008[var14], var12.vmethod395(), var12.coord1.packed(), var12.coord2.packed()); + var11 = true; } } - } while(!var13); - + } while(!var11); } } + } @ObfuscatedName("bc") @@ -1265,41 +1263,37 @@ public class WorldMap { signature = "(ILhu;I)Lhu;", garbageValue = "333454230" ) - public TileLocation __bc_545(int var1, TileLocation var2) { - if(!this.cacheLoader.isLoaded()) { + public TileLocation method385(int var1, TileLocation var2) { + if (!this.cacheLoader.isLoaded()) { return null; - } else if(!this.worldMapManager.isLoaded()) { + } else if (!this.worldMapManager.isLoaded()) { return null; - } else if(!this.currentMapArea0.containsPosition(var2.x, var2.y)) { + } else if (!this.currentMapArea0.containsPosition(var2.x, var2.y)) { return null; } else { HashMap var3 = this.worldMapManager.buildIcons(); - List var4 = (List)var3.get(Integer.valueOf(var1)); - if(var4 != null && !var4.isEmpty()) { + List var4 = (List)var3.get(var1); + if (var4 != null && !var4.isEmpty()) { AbstractWorldMapIcon var5 = null; int var6 = -1; Iterator var7 = var4.iterator(); - while(true) { - AbstractWorldMapIcon var8; - int var11; - do { - if(!var7.hasNext()) { - return var5.coord2; - } + while (var7.hasNext()) { + AbstractWorldMapIcon var8 = (AbstractWorldMapIcon)var7.next(); + int var10 = var8.coord2.x - var2.x; + int var11 = var8.coord2.y - var2.y; + int var9 = var11 * var11 + var10 * var10; + if (var9 == 0) { + return var8.coord2; + } - var8 = (AbstractWorldMapIcon)var7.next(); - int var9 = var8.coord2.x - var2.x; - int var10 = var8.coord2.y - var2.y; - var11 = var10 * var10 + var9 * var9; - if(var11 == 0) { - return var8.coord2; - } - } while(var11 >= var6 && var5 != null); - - var5 = var8; - var6 = var11; + if (var9 < var6 || var5 == null) { + var5 = var8; + var6 = var9; + } } + + return var5.coord2; } else { return null; } @@ -1343,21 +1337,21 @@ public class WorldMap { ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { - if(!this.cacheLoader.isLoaded()) { + if (!this.cacheLoader.isLoaded()) { return null; - } else if(!this.worldMapManager.isLoaded()) { + } else if (!this.worldMapManager.isLoaded()) { return null; } else { HashMap var1 = this.worldMapManager.buildIcons(); - this.__bq = new LinkedList(); + this.field1009 = new LinkedList(); Iterator var2 = var1.values().iterator(); - while(var2.hasNext()) { + while (var2.hasNext()) { List var3 = (List)var2.next(); - this.__bq.addAll(var3); + this.field1009.addAll(var3); } - this.iconIterator = this.__bq.iterator(); + this.iconIterator = this.field1009.iterator(); return this.iconNext(); } } @@ -1369,19 +1363,23 @@ public class WorldMap { ) @Export("iconNext") public AbstractWorldMapIcon iconNext() { - if(this.iconIterator == null) { + if (this.iconIterator == null) { return null; } else { - AbstractWorldMapIcon var1; - do { - if(!this.iconIterator.hasNext()) { - return null; + while (this.iconIterator.hasNext()) { + AbstractWorldMapIcon var1 = (AbstractWorldMapIcon)this.iconIterator.next(); + if (var1.vmethod395() != -1) { + return var1; } + } - var1 = (AbstractWorldMapIcon)this.iconIterator.next(); - } while(var1.__m_15() == -1); - - return var1; + return null; } } + + static { + fontNameVerdana11 = FontName.FontName_verdana11; + fontNameVerdana13 = FontName.FontName_verdana13; + fontNameVerdana15 = FontName.FontName_verdana15; + } } diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index 2a3d27d961..0d20341aaa 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -37,7 +37,7 @@ public class WorldMapArea { @ObfuscatedGetter( intValue = 986239133 ) - int __w; + int field1015; @ObfuscatedName("o") @ObfuscatedGetter( intValue = 196514055 @@ -83,7 +83,7 @@ public class WorldMapArea { public WorldMapArea() { this.id0 = -1; - this.__w = -1; + this.field1015 = -1; this.zoom0 = -1; this.origin0 = null; this.minX0 = Integer.MAX_VALUE; @@ -104,14 +104,14 @@ public class WorldMapArea { this.archiveName0 = var1.readStringCp1252NullTerminated(); this.name0 = var1.readStringCp1252NullTerminated(); this.origin0 = new TileLocation(var1.readInt()); - this.__w = var1.readInt(); + this.field1015 = var1.readInt(); var1.readUnsignedByte(); this.isMain0 = var1.readUnsignedByte() == 1; this.zoom0 = var1.readUnsignedByte(); int var3 = var1.readUnsignedByte(); this.sections = new LinkedList(); - for(int var4 = 0; var4 < var3; ++var4) { + for (int var4 = 0; var4 < var3; ++var4) { this.sections.add(this.readWorldMapSection(var1)); } @@ -126,7 +126,7 @@ public class WorldMapArea { @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { int var2 = var1.readUnsignedByte(); - WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.__h_f, WorldMapSectionType.__h_w, WorldMapSectionType.__h_m, WorldMapSectionType.__h_q}; + WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.field1101, WorldMapSectionType.field1103, WorldMapSectionType.field1100, WorldMapSectionType.field1102}; WorldMapSectionType var4 = (WorldMapSectionType)ScriptFrame.findEnumerated(var3, var2); Object var5 = null; switch(var4.type) { @@ -159,16 +159,14 @@ public class WorldMapArea { public boolean containsCoord(int var1, int var2, int var3) { Iterator var4 = this.sections.iterator(); - WorldMapSection var5; - do { - if(!var4.hasNext()) { - return false; + while (var4.hasNext()) { + WorldMapSection var5 = (WorldMapSection)var4.next(); + if (var5.containsCoord(var1, var2, var3)) { + return true; } + } - var5 = (WorldMapSection)var4.next(); - } while(!var5.containsCoord(var1, var2, var3)); - - return true; + return false; } @ObfuscatedName("w") @@ -180,20 +178,18 @@ public class WorldMapArea { public boolean containsPosition(int var1, int var2) { int var3 = var1 / 64; int var4 = var2 / 64; - if(var3 >= this.minX0 && var3 <= this.maxX0) { - if(var4 >= this.minY0 && var4 <= this.maxY0) { + if (var3 >= this.minX0 && var3 <= this.maxX0) { + if (var4 >= this.minY0 && var4 <= this.maxY0) { Iterator var5 = this.sections.iterator(); - WorldMapSection var6; - do { - if(!var5.hasNext()) { - return false; + while (var5.hasNext()) { + WorldMapSection var6 = (WorldMapSection)var5.next(); + if (var6.containsPosition(var1, var2)) { + return true; } + } - var6 = (WorldMapSection)var5.next(); - } while(!var6.containsPosition(var1, var2)); - - return true; + return false; } else { return false; } @@ -211,16 +207,14 @@ public class WorldMapArea { public int[] position(int var1, int var2, int var3) { Iterator var4 = this.sections.iterator(); - WorldMapSection var5; - do { - if(!var4.hasNext()) { - return null; + while (var4.hasNext()) { + WorldMapSection var5 = (WorldMapSection)var4.next(); + if (var5.containsCoord(var1, var2, var3)) { + return var5.position(var1, var2, var3); } + } - var5 = (WorldMapSection)var4.next(); - } while(!var5.containsCoord(var1, var2, var3)); - - return var5.position(var1, var2, var3); + return null; } @ObfuscatedName("u") @@ -232,16 +226,14 @@ public class WorldMapArea { public TileLocation coord(int var1, int var2) { Iterator var3 = this.sections.iterator(); - WorldMapSection var4; - do { - if(!var3.hasNext()) { - return null; + while (var3.hasNext()) { + WorldMapSection var4 = (WorldMapSection)var3.next(); + if (var4.containsPosition(var1, var2)) { + return var4.coord(var1, var2); } + } - var4 = (WorldMapSection)var3.next(); - } while(!var4.containsPosition(var1, var2)); - - return var4.coord(var1, var2); + return null; } @ObfuscatedName("g") @@ -253,7 +245,7 @@ public class WorldMapArea { void setBounds() { Iterator var1 = this.sections.iterator(); - while(var1.hasNext()) { + while (var1.hasNext()) { WorldMapSection var2 = (WorldMapSection)var1.next(); var2.expandBounds(this); } @@ -305,8 +297,8 @@ public class WorldMapArea { signature = "(I)I", garbageValue = "-1657905623" ) - int __a_39() { - return this.__w; + int method386() { + return this.field1015; } @ObfuscatedName("z") @@ -405,12 +397,12 @@ public class WorldMapArea { garbageValue = "-1490951132" ) static int method427(int var0, int var1) { - if(var0 == -2) { + if (var0 == -2) { return 12345678; - } else if(var0 == -1) { - if(var1 < 0) { + } else if (var0 == -1) { + if (var1 < 0) { var1 = 0; - } else if(var1 > 127) { + } else if (var1 > 127) { var1 = 127; } @@ -418,9 +410,9 @@ public class WorldMapArea { return var1; } else { var1 = (var0 & 127) * var1 / 128; - if(var1 < 2) { + if (var1 < 2) { var1 = 2; - } else if(var1 > 126) { + } else if (var1 > 126) { var1 = 126; } @@ -434,8 +426,8 @@ public class WorldMapArea { garbageValue = "-26" ) static void method428() { - if(Client.oculusOrbState == 1) { - Client.__client_ij = true; + if (Client.oculusOrbState == 1) { + Client.field199 = true; } } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index eeacab73f6..6c7931c721 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -10,51 +10,51 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("WorldMapAreaData") public class WorldMapAreaData extends WorldMapArea { @ObfuscatedName("n") - HashSet __n; + HashSet field1016; @ObfuscatedName("i") - HashSet __i; + HashSet field1017; @ObfuscatedName("a") - List __a; + List field1018; @ObfuscatedName("ce") @ObfuscatedSignature( signature = "(Lgr;Lgr;IZI)V", garbageValue = "-1999841505" ) - void __ce_76(Buffer var1, Buffer var2, int var3, boolean var4) { + void method387(Buffer var1, Buffer var2, int var3, boolean var4) { this.read(var1, var3); - int var5 = var2.__ag_302(); - this.__n = new HashSet(var5); + int var5 = var2.method43(); + this.field1016 = new HashSet(var5); int var6; - for(var6 = 0; var6 < var5; ++var6) { + for (var6 = 0; var6 < var5; ++var6) { class15 var7 = new class15(); try { var7.method173(var2); - } catch (IllegalStateException var12) { - continue; - } - - this.__n.add(var7); - } - - var6 = var2.__ag_302(); - this.__i = new HashSet(var6); - - for(int var10 = 0; var10 < var6; ++var10) { - class39 var8 = new class39(); - - try { - var8.method714(var2); } catch (IllegalStateException var11) { continue; } - this.__i.add(var8); + this.field1016.add(var7); } - this.__cy_77(var2, var4); + var6 = var2.method43(); + this.field1017 = new HashSet(var6); + + for (int var12 = 0; var12 < var6; ++var12) { + class39 var8 = new class39(); + + try { + var8.method714(var2); + } catch (IllegalStateException var10) { + continue; + } + + this.field1017.add(var8); + } + + this.method388(var2, var4); } @ObfuscatedName("cy") @@ -62,16 +62,16 @@ public class WorldMapAreaData extends WorldMapArea { signature = "(Lgr;ZB)V", garbageValue = "48" ) - void __cy_77(Buffer var1, boolean var2) { - this.__a = new LinkedList(); - int var3 = var1.__ag_302(); + void method388(Buffer var1, boolean var2) { + this.field1018 = new LinkedList(); + int var3 = var1.method43(); - for(int var4 = 0; var4 < var3; ++var4) { - int var5 = var1.__ap_310(); + for (int var4 = 0; var4 < var3; ++var4) { + int var5 = var1.method51(); TileLocation var6 = new TileLocation(var1.readInt()); boolean var7 = var1.readUnsignedByte() == 1; - if(var2 || !var7) { - this.__a.add(new WorldMapIcon1((TileLocation)null, var6, var5, (WorldMapLabel)null)); + if (var2 || !var7) { + this.field1018.add(new WorldMapIcon1((TileLocation)null, var6, var5, (WorldMapLabel)null)); } } @@ -85,12 +85,12 @@ public class WorldMapAreaData extends WorldMapArea { @Export("getSequenceDefinition") public static SequenceDefinition getSequenceDefinition(int var0) { SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); - if(var1 != null) { + if (var1 != null) { return var1; } else { byte[] var2 = SequenceDefinition.SequenceDefinition_indexCache.takeRecord(12, var0); var1 = new SequenceDefinition(); - if(var2 != null) { + if (var2 != null) { var1.read(new Buffer(var2)); } @@ -126,19 +126,19 @@ public class WorldMapAreaData extends WorldMapArea { static int method710(int var0, Script var1, boolean var2) { boolean var3 = true; Widget var4; - if(var0 >= 2000) { + if (var0 >= 2000) { var0 -= 1000; var4 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); var3 = false; } else { - var4 = var2?WorldMapIcon1.__t_i:class12.__n_n; + var4 = var2 ? WorldMapIcon1.field1030 : class12.field1111; } - int var11; - if(var0 == 1300) { - var11 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] - 1; - if(var11 >= 0 && var11 <= 9) { - var4.setAction(var11, Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); + int var5; + if (var0 == 1300) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] - 1; + if (var5 >= 0 && var5 <= 9) { + var4.setAction(var5, Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); return 1; } else { --Interpreter.Interpreter_stringStackSize; @@ -146,106 +146,105 @@ public class WorldMapAreaData extends WorldMapArea { } } else { int var6; - if(var0 == 1301) { + if (var0 == 1301) { RouteStrategy.Interpreter_intStackSize -= 2; - var11 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var4.parent = class204.getWidgetChild(var11, var6); + var4.parent = class204.getWidgetChild(var5, var6); return 1; - } else if(var0 == 1302) { + } else if (var0 == 1302) { var4.isScrollBar = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; - } else if(var0 == 1303) { + } else if (var0 == 1303) { var4.dragZoneSize = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; return 1; - } else if(var0 == 1304) { + } else if (var0 == 1304) { var4.dragThreshold = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; return 1; - } else if(var0 == 1305) { + } else if (var0 == 1305) { var4.dataText = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; return 1; - } else if(var0 == 1306) { + } else if (var0 == 1306) { var4.spellActionName = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; return 1; - } else if(var0 == 1307) { + } else if (var0 == 1307) { var4.actions = null; return 1; - } else if(var0 == 1308) { - var4.__fz = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + } else if (var0 == 1308) { + var4.field985 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else { int var7; - byte[] var9; - if(var0 != 1350) { - byte var5; - if(var0 == 1351) { + byte[] var8; + if (var0 != 1350) { + byte var11; + if (var0 == 1351) { RouteStrategy.Interpreter_intStackSize -= 2; - var5 = 10; - var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]}; + var11 = 10; + var8 = 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); + BufferedSink.method3595(var4, var11, var8, var10); return 1; - } else if(var0 == 1352) { + } else if (var0 == 1352) { RouteStrategy.Interpreter_intStackSize -= 3; - var11 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] - 1; + var5 = 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); + if (var5 >= 0 && var5 <= 9) { + Varcs.method2168(var4, var5, var6, var7); return 1; } else { throw new RuntimeException(); } - } else if(var0 == 1353) { - var5 = 10; + } else if (var0 == 1353) { + var11 = 10; var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Varcs.method2168(var4, var5, var6, var7); + Varcs.method2168(var4, var11, var6, var7); return 1; - } else if(var0 == 1354) { + } else if (var0 == 1354) { --RouteStrategy.Interpreter_intStackSize; - var11 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] - 1; - if(var11 >= 0 && var11 <= 9) { - WorldMapSection3.method345(var4, var11); + var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] - 1; + if (var5 >= 0 && var5 <= 9) { + WorldMapSection3.method345(var4, var5); return 1; } else { throw new RuntimeException(); } - } else if(var0 == 1355) { - var5 = 10; - WorldMapSection3.method345(var4, var5); + } else if (var0 == 1355) { + var11 = 10; + WorldMapSection3.method345(var4, var11); return 1; } else { return 2; } } else { - byte[] var8 = null; - var9 = null; - if(var3) { + byte[] var9 = null; + var8 = null; + if (var3) { RouteStrategy.Interpreter_intStackSize -= 10; - for(var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + RouteStrategy.Interpreter_intStackSize] >= 0; var7 += 2) { - ; + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + RouteStrategy.Interpreter_intStackSize] >= 0; var7 += 2) { } - if(var7 > 0) { - var8 = new byte[var7 / 2]; + if (var7 > 0) { var9 = new byte[var7 / 2]; + var8 = new byte[var7 / 2]; - for(var7 -= 2; var7 >= 0; var7 -= 2) { - var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + RouteStrategy.Interpreter_intStackSize]; - var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + RouteStrategy.Interpreter_intStackSize + 1]; + for (var7 -= 2; var7 >= 0; var7 -= 2) { + var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + RouteStrategy.Interpreter_intStackSize]; + var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + RouteStrategy.Interpreter_intStackSize + 1]; } } } else { 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]}; + var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]}; + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]}; } var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] - 1; - if(var7 >= 0 && var7 <= 9) { - BufferedSink.method3595(var4, var7, var8, var9); + if (var7 >= 0 && var7 <= 9) { + BufferedSink.method3595(var4, var7, var9, var8); return 1; } else { throw new RuntimeException(); @@ -261,19 +260,19 @@ public class WorldMapAreaData extends WorldMapArea { garbageValue = "1705746695" ) static final int method712(int var0, int var1, int var2) { - if(var2 > 179) { + if (var2 > 179) { var1 /= 2; } - if(var2 > 192) { + if (var2 > 192) { var1 /= 2; } - if(var2 > 217) { + if (var2 > 217) { var1 /= 2; } - if(var2 > 243) { + if (var2 > 243) { var1 /= 2; } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 705477fe2c..8a9ca944f4 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -49,14 +49,6 @@ public class WorldMapCacheName { @Export("name") public final String name; - static { - WorldMapCacheName_details = new WorldMapCacheName("details"); - WorldMapCacheName_compositeMap = new WorldMapCacheName("compositemap"); - WorldMapCacheName_compositeTexture = new WorldMapCacheName("compositetexture"); - WorldMapCacheName_area = new WorldMapCacheName("area"); - WorldMapCacheName_labels = new WorldMapCacheName("labels"); - } - WorldMapCacheName(String var1) { this.name = var1; } @@ -67,20 +59,20 @@ public class WorldMapCacheName { garbageValue = "-1459849000" ) public static void method633(int[] var0, int[] var1) { - if(var0 != null && var1 != null) { - ByteArrayPool.__gi_g = var0; - WorldMapSection2.__ah_l = new int[var0.length]; - RouteStrategy.__fe_e = new byte[var0.length][][]; + if (var0 != null && var1 != null) { + ByteArrayPool.field55 = var0; + WorldMapSection2.field1082 = new int[var0.length]; + RouteStrategy.field760 = new byte[var0.length][][]; - for(int var2 = 0; var2 < ByteArrayPool.__gi_g.length; ++var2) { - RouteStrategy.__fe_e[var2] = new byte[var1[var2]][]; + for (int var2 = 0; var2 < ByteArrayPool.field55.length; ++var2) { + RouteStrategy.field760[var2] = new byte[var1[var2]][]; } - } else { - ByteArrayPool.__gi_g = null; - WorldMapSection2.__ah_l = null; - RouteStrategy.__fe_e = null; + ByteArrayPool.field55 = null; + WorldMapSection2.field1082 = null; + RouteStrategy.field760 = (byte[][][])null; } + } @ObfuscatedName("m") @@ -89,19 +81,18 @@ public class WorldMapCacheName { garbageValue = "1532180466" ) public static void method635(String var0, boolean var1, boolean var2) { - if(var1) { - if(Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { + if (var1) { + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { try { Desktop.getDesktop().browse(new URI(var0)); return; } catch (Exception var4) { - ; } } - if(class50.__af_f.startsWith("win")) { + if (class50.field1160.startsWith("win")) { ReflectionCheck.method5920(var0, 0); - } else if(class50.__af_f.startsWith("mac")) { + } else if (class50.field1160.startsWith("mac")) { FaceNormal.method3237(var0, 1, "openjs"); } else { ReflectionCheck.method5920(var0, 2); @@ -119,27 +110,27 @@ public class WorldMapCacheName { ) public static int method634(int var0) { int var1 = 0; - if(var0 < 0 || var0 >= 65536) { + if (var0 < 0 || var0 >= 65536) { var0 >>>= 16; var1 += 16; } - if(var0 >= 256) { + if (var0 >= 256) { var0 >>>= 8; var1 += 8; } - if(var0 >= 16) { + if (var0 >= 16) { var0 >>>= 4; var1 += 4; } - if(var0 >= 4) { + if (var0 >= 4) { var0 >>>= 2; var1 += 2; } - if(var0 >= 1) { + if (var0 >= 1) { var0 >>>= 1; ++var1; } @@ -154,24 +145,24 @@ public class WorldMapCacheName { ) @Export("addPlayerToScene") static void addPlayerToScene(Player var0, boolean var1) { - if(var0 != null && var0.isVisible() && !var0.isHidden) { + if (var0 != null && var0.isVisible() && !var0.isHidden) { var0.isUnanimated = false; - if((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) { + if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) { var0.isUnanimated = true; } int var2 = var0.x >> 7; int var3 = var0.y >> 7; - if(var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { long var4 = FontName.method5637(0, 0, 0, false, var0.index); - if(var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { + if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { var0.isUnanimated = false; var0.tileHeight = class32.getTileHeight(var0.x, var0.y, SoundSystem.plane); var0.playerCycle = Client.cycle; - class65.scene.__z_240(SoundSystem.plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.__ac, var4, var0.__z, var0.__j, var0.__s, var0.__t); + class65.scene.method286(SoundSystem.plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.field9, var4, var0.field721, var0.field722, var0.field723, var0.field724); } else { - if((var0.x & 127) == 64 && (var0.y & 127) == 64) { - if(Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { + if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { + if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { return; } @@ -180,10 +171,18 @@ public class WorldMapCacheName { var0.tileHeight = class32.getTileHeight(var0.x, var0.y, SoundSystem.plane); var0.playerCycle = Client.cycle; - class65.scene.__a_239(SoundSystem.plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.__ac, var4, var0.__ay); + class65.scene.method285(SoundSystem.plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.field9, var4, var0.field10); } } } } + + static { + WorldMapCacheName_details = new WorldMapCacheName("details"); + WorldMapCacheName_compositeMap = new WorldMapCacheName("compositemap"); + WorldMapCacheName_compositeTexture = new WorldMapCacheName("compositetexture"); + WorldMapCacheName_area = new WorldMapCacheName("area"); + WorldMapCacheName_labels = new WorldMapCacheName("labels"); + } } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index 04d541e9df..e890251192 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -11,7 +11,7 @@ public class WorldMapElement extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache __ic_m; + public static AbstractIndexCache field1019; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Ler;" @@ -28,7 +28,7 @@ public class WorldMapElement extends DualNode { @ObfuscatedGetter( intValue = -1579051565 ) - public final int __o; + public final int field1020; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 2012857993 @@ -42,12 +42,12 @@ public class WorldMapElement extends DualNode { @Export("sprite2") int sprite2; @ObfuscatedName("l") - public String __l; + public String field1021; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -231067 ) - public int __e; + public int field1022; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 1184517129 @@ -61,27 +61,27 @@ public class WorldMapElement extends DualNode { @Export("string1") public String string1; @ObfuscatedName("i") - int[] __i; + int[] field1023; @ObfuscatedName("a") @ObfuscatedGetter( intValue = 1336803515 ) - int __a; + int field1024; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -1825795359 ) - int __z; + int field1025; @ObfuscatedName("j") @ObfuscatedGetter( intValue = -1007121521 ) - int __j; + int field1026; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1209054101 ) - int __s; + int field1027; @ObfuscatedName("t") @ObfuscatedSignature( signature = "Lju;" @@ -93,9 +93,9 @@ public class WorldMapElement extends DualNode { ) public class249 field3301; @ObfuscatedName("h") - int[] __h; + int[] field1028; @ObfuscatedName("b") - byte[] __b; + byte[] field1029; @ObfuscatedName("c") @ObfuscatedGetter( intValue = -653112729 @@ -103,23 +103,19 @@ public class WorldMapElement extends DualNode { @Export("category") public int category; - static { - WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256); - } - public WorldMapElement(int var1) { this.sprite1 = -1; this.sprite2 = -1; this.textSize = 0; this.strings = new String[5]; - this.__a = Integer.MAX_VALUE; - this.__z = Integer.MAX_VALUE; - this.__j = Integer.MIN_VALUE; - this.__s = Integer.MIN_VALUE; + this.field1024 = Integer.MAX_VALUE; + this.field1025 = Integer.MAX_VALUE; + this.field1026 = Integer.MIN_VALUE; + this.field1027 = Integer.MIN_VALUE; this.field3287 = class266.field3527; this.field3301 = class249.field3273; this.category = -1; - this.__o = var1; + this.field1020 = var1; } @ObfuscatedName("f") @@ -129,9 +125,9 @@ public class WorldMapElement extends DualNode { ) @Export("read") public void read(Buffer var1) { - while(true) { + while (true) { int var2 = var1.readUnsignedByte(); - if(var2 == 0) { + if (var2 == 0) { return; } @@ -146,82 +142,80 @@ public class WorldMapElement extends DualNode { ) @Export("readNext") void readNext(Buffer var1, int var2) { - if(var2 == 1) { - this.sprite1 = var1.__ap_310(); - } else if(var2 == 2) { - this.sprite2 = var1.__ap_310(); - } else if(var2 == 3) { - this.__l = var1.readStringCp1252NullTerminated(); - } else if(var2 == 4) { - this.__e = var1.readMedium(); - } else if(var2 == 5) { + if (var2 == 1) { + this.sprite1 = var1.method51(); + } else if (var2 == 2) { + this.sprite2 = var1.method51(); + } else if (var2 == 3) { + this.field1021 = var1.readStringCp1252NullTerminated(); + } else if (var2 == 4) { + this.field1022 = var1.readMedium(); + } else if (var2 == 5) { var1.readMedium(); - } else if(var2 == 6) { + } else if (var2 == 6) { this.textSize = var1.readUnsignedByte(); } else { int var3; - if(var2 == 7) { + if (var2 == 7) { var3 = var1.readUnsignedByte(); - if((var3 & 1) == 0) { - ; + if ((var3 & 1) == 0) { } - if((var3 & 2) == 2) { - ; + if ((var3 & 2) == 2) { } - } else if(var2 == 8) { + } else if (var2 == 8) { var1.readUnsignedByte(); - } else if(var2 >= 10 && var2 <= 14) { + } else if (var2 >= 10 && var2 <= 14) { this.strings[var2 - 10] = var1.readStringCp1252NullTerminated(); - } else if(var2 == 15) { + } else if (var2 == 15) { var3 = var1.readUnsignedByte(); - this.__i = new int[var3 * 2]; + this.field1023 = new int[var3 * 2]; int var4; - for(var4 = 0; var4 < var3 * 2; ++var4) { - this.__i[var4] = var1.__aq_303(); + for (var4 = 0; var4 < var3 * 2; ++var4) { + this.field1023[var4] = var1.method44(); } var1.readInt(); var4 = var1.readUnsignedByte(); - this.__h = new int[var4]; + this.field1028 = new int[var4]; int var5; - for(var5 = 0; var5 < this.__h.length; ++var5) { - this.__h[var5] = var1.readInt(); + for (var5 = 0; var5 < this.field1028.length; ++var5) { + this.field1028[var5] = var1.readInt(); } - this.__b = new byte[var3]; + this.field1029 = new byte[var3]; - for(var5 = 0; var5 < var3; ++var5) { - this.__b[var5] = var1.readByte(); + for (var5 = 0; var5 < var3; ++var5) { + this.field1029[var5] = var1.readByte(); } - } else if(var2 != 16) { - if(var2 == 17) { + } else if (var2 != 16) { + if (var2 == 17) { this.string1 = var1.readStringCp1252NullTerminated(); - } else if(var2 == 18) { - var1.__ap_310(); - } else if(var2 == 19) { - this.category = var1.__ag_302(); - } else if(var2 == 21) { + } else if (var2 == 18) { + var1.method51(); + } else if (var2 == 19) { + this.category = var1.method43(); + } else if (var2 == 21) { var1.readInt(); - } else if(var2 == 22) { + } else if (var2 == 22) { var1.readInt(); - } else if(var2 == 23) { + } else if (var2 == 23) { var1.readUnsignedByte(); var1.readUnsignedByte(); var1.readUnsignedByte(); - } else if(var2 == 24) { - var1.__aq_303(); - var1.__aq_303(); - } else if(var2 == 25) { - var1.__ap_310(); - } else if(var2 == 28) { + } else if (var2 == 24) { + var1.method44(); + var1.method44(); + } else if (var2 == 25) { + var1.method51(); + } else if (var2 == 28) { var1.readUnsignedByte(); - } else if(var2 == 29) { + } else if (var2 == 29) { class266[] var6 = new class266[]{class266.field3527, class266.field3526, class266.field3529}; this.field3287 = (class266)ScriptFrame.findEnumerated(var6, var1.readUnsignedByte()); - } else if(var2 == 30) { + } else if (var2 == 30) { this.field3301 = (class249)ScriptFrame.findEnumerated(UnderlayDefinition.method4839(), var1.readUnsignedByte()); } } @@ -234,19 +228,19 @@ public class WorldMapElement extends DualNode { signature = "(I)V", garbageValue = "1799485224" ) - public void __w_409() { - if(this.__i != null) { - for(int var1 = 0; var1 < this.__i.length; var1 += 2) { - if(this.__i[var1] < this.__a) { - this.__a = this.__i[var1]; - } else if(this.__i[var1] > this.__j) { - this.__j = this.__i[var1]; + public void method389() { + if (this.field1023 != null) { + for (int var1 = 0; var1 < this.field1023.length; var1 += 2) { + if (this.field1023[var1] < this.field1024) { + this.field1024 = this.field1023[var1]; + } else if (this.field1023[var1] > this.field1026) { + this.field1026 = this.field1023[var1]; } - if(this.__i[var1 + 1] < this.__z) { - this.__z = this.__i[var1 + 1]; - } else if(this.__i[var1 + 1] > this.__s) { - this.__s = this.__i[var1 + 1]; + if (this.field1023[var1 + 1] < this.field1025) { + this.field1025 = this.field1023[var1 + 1]; + } else if (this.field1023[var1 + 1] > this.field1027) { + this.field1027 = this.field1023[var1 + 1]; } } } @@ -271,15 +265,15 @@ public class WorldMapElement extends DualNode { ) @Export("getSprite0") Sprite getSprite0(int var1) { - if(var1 < 0) { + if (var1 < 0) { return null; } else { Sprite var2 = (Sprite)WorldMapElement_cachedSprites.get((long)var1); - if(var2 != null) { + if (var2 != null) { return var2; } else { - var2 = class322.readSprite(__ic_m, var1, 0); - if(var2 != null) { + var2 = class322.readSprite(field1019, var1, 0); + if (var2 != null) { WorldMapElement_cachedSprites.put(var2, (long)var1); } @@ -293,8 +287,8 @@ public class WorldMapElement extends DualNode { signature = "(I)I", garbageValue = "821701099" ) - public int __g_410() { - return this.__o; + public int method390() { + return this.field1020; } @ObfuscatedName("m") @@ -306,13 +300,17 @@ public class WorldMapElement extends DualNode { class310[] var1 = new class310[]{class310.field3805, class310.field3807, class310.field3806}; class310[] var2 = var1; - for(int var3 = 0; var3 < var2.length; ++var3) { + for (int var3 = 0; var3 < var2.length; ++var3) { class310 var4 = var2[var3]; - if(var0 == var4.field3804) { + if (var0 == var4.field3804) { return var4; } } return null; } + + static { + WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256); + } } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index 258935c48c..31641f4ed8 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -55,8 +55,8 @@ public class WorldMapEvent { signature = "(IIIIB)V", garbageValue = "2" ) - static final void method781(int var0, int var1, int var2, int var3) { - if(Client.isItemSelected == 0 && !Client.isSpellSelected) { + static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { + if (Client.isItemSelected == 0 && !Client.isSpellSelected) { Tiles.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); } @@ -64,189 +64,189 @@ public class WorldMapEvent { long var6 = -1L; int var8 = 0; - while(true) { - int var10 = ViewportMouse.ViewportMouse_entityCount; - if(var8 >= var10) { - if(-1L != var4) { + while (true) { + int var9 = ViewportMouse.ViewportMouse_entityCount; + if (var8 >= var9) { + if (-1L != var4) { var8 = UnitPriceComparator.method134(var4); - int var9 = (int)(var4 >>> 7 & 127L); + int var29 = (int)(var4 >>> 7 & 127L); Player var11 = Client.players[Client.combatTargetPlayerIndex]; - TotalQuantityComparator.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var9); + TotalQuantityComparator.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var29); } return; } - long var26 = ViewportMouse.ViewportMouse_entityTags[var8]; - if(var6 != var26) { - label338: { - var6 = var26; - int var15 = method780(var8); - long var18 = ViewportMouse.ViewportMouse_entityTags[var8]; - int var17 = (int)(var18 >>> 7 & 127L); - var17 = var17; - int var28 = GrandExchangeEvent.method80(var8); - int var19 = ClientPreferences.method1808(var8); - if(var28 == 2 && class65.scene.getObjectFlags(SoundSystem.plane, var15, var17, var26) >= 0) { - ObjectDefinition var20 = class50.getObjectDefinition(var19); - if(var20.transforms != null) { - var20 = var20.transform(); + long var10 = ViewportMouse.ViewportMouse_entityTags[var8]; + if (var6 != var10) { + label276: { + var6 = var10; + int var12 = method780(var8); + long var13 = ViewportMouse.ViewportMouse_entityTags[var8]; + int var15 = (int)(var13 >>> 7 & 127L); + var15 = var15; + int var16 = GrandExchangeEvent.method80(var8); + int var17 = ClientPreferences.method1808(var8); + if (var16 == 2 && class65.scene.getObjectFlags(SoundSystem.plane, var12, var15, var10) >= 0) { + ObjectDefinition var18 = class50.getObjectDefinition(var17); + if (var18.transforms != null) { + var18 = var18.transform(); } - if(var20 == null) { - break label338; + if (var18 == null) { + break label276; } - if(Client.isItemSelected == 1) { - Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(65535) + var20.name, 1, var19, var15, var17); - } else if(Client.isSpellSelected) { - if((FloorDecoration.selectedSpellFlags & 4) == 4) { - Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(65535) + var20.name, 2, var19, var15, var17); + if (Client.isItemSelected == 1) { + Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(65535) + var18.name, 1, var17, var12, var15); + } else if (Client.isSpellSelected) { + if ((FloorDecoration.selectedSpellFlags & 4) == 4) { + Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(65535) + var18.name, 2, var17, var12, var15); } } else { - String[] var29 = var20.actions; - if(var29 != null) { - for(int var30 = 4; var30 >= 0; --var30) { - if(var29[var30] != null) { - short var23 = 0; - if(var30 == 0) { - var23 = 3; + String[] var19 = var18.actions; + if (var19 != null) { + for (int var20 = 4; var20 >= 0; --var20) { + if (var19[var20] != null) { + short var21 = 0; + if (var20 == 0) { + var21 = 3; } - if(var30 == 1) { - var23 = 4; + if (var20 == 1) { + var21 = 4; } - if(var30 == 2) { - var23 = 5; + if (var20 == 2) { + var21 = 5; } - if(var30 == 3) { - var23 = 6; + if (var20 == 3) { + var21 = 6; } - if(var30 == 4) { - var23 = 1001; + if (var20 == 4) { + var21 = 1001; } - Tiles.insertMenuItemNoShift(var29[var30], BufferedFile.colorStartTag(65535) + var20.name, var23, var19, var15, var17); + Tiles.insertMenuItemNoShift(var19[var20], BufferedFile.colorStartTag(65535) + var18.name, var21, var17, var12, var15); } } } - Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(65535) + var20.name, 1002, var20.id, var15, var17); + Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(65535) + var18.name, 1002, var18.id, var12, var15); } } - int var21; - Npc var22; - Player var24; - int[] var36; - int var38; - if(var28 == 1) { - Npc var33 = Client.npcs[var19]; - if(var33 == null) { - break label338; + int var22; + int var30; + NPC var31; + Player var32; + int[] var34; + if (var16 == 1) { + NPC var23 = Client.npcs[var17]; + if (var23 == null) { + break label276; } - if(var33.definition.size == 1 && (var33.x & 127) == 64 && (var33.y & 127) == 64) { - for(var21 = 0; var21 < Client.npcCount; ++var21) { - var22 = Client.npcs[Client.npcIndices[var21]]; - if(var22 != null && var33 != var22 && var22.definition.size == 1 && var22.x == var33.x && var22.y == var33.y) { - Tile.addNpcToMenu(var22.definition, Client.npcIndices[var21], var15, var17); + if (var23.definition.size == 1 && (var23.x & 127) == 64 && (var23.y & 127) == 64) { + for (var30 = 0; var30 < Client.npcCount; ++var30) { + var31 = Client.npcs[Client.npcIndices[var30]]; + if (var31 != null && var23 != var31 && var31.definition.size == 1 && var31.x == var23.x && var31.y == var23.y) { + Tile.addNpcToMenu(var31.definition, Client.npcIndices[var30], var12, var15); } } - var21 = Players.Players_count; - var36 = Players.Players_indices; + var30 = Players.Players_count; + var34 = Players.Players_indices; - for(var38 = 0; var38 < var21; ++var38) { - var24 = Client.players[var36[var38]]; - if(var24 != null && var24.x == var33.x && var24.y == var33.y) { - TotalQuantityComparator.addPlayerToMenu(var24, var36[var38], var15, var17); + for (var22 = 0; var22 < var30; ++var22) { + var32 = Client.players[var34[var22]]; + if (var32 != null && var32.x == var23.x && var32.y == var23.y) { + TotalQuantityComparator.addPlayerToMenu(var32, var34[var22], var12, var15); } } } - Tile.addNpcToMenu(var33.definition, var19, var15, var17); + Tile.addNpcToMenu(var23.definition, var17, var12, var15); } - if(var28 == 0) { - Player var34 = Client.players[var19]; - if(var34 == null) { - break label338; + if (var16 == 0) { + Player var33 = Client.players[var17]; + if (var33 == null) { + break label276; } - if((var34.x & 127) == 64 && (var34.y & 127) == 64) { - for(var21 = 0; var21 < Client.npcCount; ++var21) { - var22 = Client.npcs[Client.npcIndices[var21]]; - if(var22 != null && var22.definition.size == 1 && var34.x == var22.x && var34.y == var22.y) { - Tile.addNpcToMenu(var22.definition, Client.npcIndices[var21], var15, var17); + if ((var33.x & 127) == 64 && (var33.y & 127) == 64) { + for (var30 = 0; var30 < Client.npcCount; ++var30) { + var31 = Client.npcs[Client.npcIndices[var30]]; + if (var31 != null && var31.definition.size == 1 && var33.x == var31.x && var33.y == var31.y) { + Tile.addNpcToMenu(var31.definition, Client.npcIndices[var30], var12, var15); } } - var21 = Players.Players_count; - var36 = Players.Players_indices; + var30 = Players.Players_count; + var34 = Players.Players_indices; - for(var38 = 0; var38 < var21; ++var38) { - var24 = Client.players[var36[var38]]; - if(var24 != null && var24 != var34 && var24.x == var34.x && var24.y == var34.y) { - TotalQuantityComparator.addPlayerToMenu(var24, var36[var38], var15, var17); + for (var22 = 0; var22 < var30; ++var22) { + var32 = Client.players[var34[var22]]; + if (var32 != null && var32 != var33 && var32.x == var33.x && var32.y == var33.y) { + TotalQuantityComparator.addPlayerToMenu(var32, var34[var22], var12, var15); } } } - if(var19 != Client.combatTargetPlayerIndex) { - TotalQuantityComparator.addPlayerToMenu(var34, var19, var15, var17); + if (var17 != Client.combatTargetPlayerIndex) { + TotalQuantityComparator.addPlayerToMenu(var33, var17, var12, var15); } else { - var4 = var26; + var4 = var10; } } - if(var28 == 3) { - NodeDeque var35 = Client.groundItems[SoundSystem.plane][var15][var17]; - if(var35 != null) { - for(GroundItem var39 = (GroundItem)var35.first(); var39 != null; var39 = (GroundItem)var35.next()) { - ItemDefinition var37 = Skills.getItemDefinition(var39.id); - if(Client.isItemSelected == 1) { - 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.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var37.name, 17, var39.id, var15, var17); + if (var16 == 3) { + NodeDeque var35 = Client.groundItems[SoundSystem.plane][var12][var15]; + if (var35 != null) { + for (GroundItem var24 = (GroundItem)var35.first(); var24 != null; var24 = (GroundItem)var35.next()) { + ItemDefinition var25 = Skills.getItemDefinition(var24.id); + if (Client.isItemSelected == 1) { + Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16748608) + var25.name, 16, var24.id, var12, var15); + } else if (Client.isSpellSelected) { + if ((FloorDecoration.selectedSpellFlags & 1) == 1) { + Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16748608) + var25.name, 17, var24.id, var12, var15); } } else { - String[] var31 = var37.groundActions; + String[] var26 = var25.groundActions; - for(int var32 = 4; var32 >= 0; --var32) { - if(var31 != null && var31[var32] != null) { - byte var25 = 0; - if(var32 == 0) { - var25 = 18; + for (int var27 = 4; var27 >= 0; --var27) { + if (var26 != null && var26[var27] != null) { + byte var28 = 0; + if (var27 == 0) { + var28 = 18; } - if(var32 == 1) { - var25 = 19; + if (var27 == 1) { + var28 = 19; } - if(var32 == 2) { - var25 = 20; + if (var27 == 2) { + var28 = 20; } - if(var32 == 3) { - var25 = 21; + if (var27 == 3) { + var28 = 21; } - if(var32 == 4) { - var25 = 22; + if (var27 == 4) { + var28 = 22; } - Tiles.insertMenuItemNoShift(var31[var32], BufferedFile.colorStartTag(16748608) + var37.name, var25, var39.id, var15, var17); - } else if(var32 == 2) { - Tiles.insertMenuItemNoShift("Take", BufferedFile.colorStartTag(16748608) + var37.name, 20, var39.id, var15, var17); + Tiles.insertMenuItemNoShift(var26[var27], BufferedFile.colorStartTag(16748608) + var25.name, var28, var24.id, var12, var15); + } else if (var27 == 2) { + Tiles.insertMenuItemNoShift("Take", BufferedFile.colorStartTag(16748608) + var25.name, 20, var24.id, var12, var15); } } - Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16748608) + var37.name, 1004, var39.id, var15, var17); + Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16748608) + var25.name, 1004, var24.id, var12, var15); } } } @@ -263,7 +263,8 @@ public class WorldMapEvent { signature = "(B)Z", garbageValue = "43" ) - static boolean method779() { + @Export("isShiftPressed") + static boolean isShiftPressed() { return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; } } diff --git a/runescape-client/src/main/java/WorldMapIcon1.java b/runescape-client/src/main/java/WorldMapIcon1.java index 0e1f232744..a672e3263f 100644 --- a/runescape-client/src/main/java/WorldMapIcon1.java +++ b/runescape-client/src/main/java/WorldMapIcon1.java @@ -12,7 +12,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { @ObfuscatedSignature( signature = "Lho;" ) - static Widget __t_i; + static Widget field1030; @ObfuscatedName("db") @ObfuscatedSignature( signature = "Lit;" @@ -32,7 +32,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { @ObfuscatedGetter( intValue = -1722323621 ) - final int __m; + final int field1031; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Laj;" @@ -43,28 +43,28 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { @ObfuscatedGetter( intValue = 364253793 ) - final int __q; + final int field1032; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -362031241 ) - final int __w; + final int field1033; @ObfuscatedSignature( signature = "(Lhu;Lhu;ILaj;)V" ) WorldMapIcon1(TileLocation var1, TileLocation var2, int var3, WorldMapLabel var4) { super(var1, var2); - this.__m = var3; + this.field1031 = var3; this.label0 = var4; - WorldMapElement var5 = ViewportMouse.getWorldMapElement(this.__m_15()); + WorldMapElement var5 = ViewportMouse.getWorldMapElement(this.vmethod395()); Sprite var6 = var5.getSprite(false); - if(var6 != null) { - this.__q = var6.subWidth; - this.__w = var6.subHeight; + if (var6 != null) { + this.field1032 = var6.subWidth; + this.field1033 = var6.subHeight; } else { - this.__q = 0; - this.__w = 0; + this.field1032 = 0; + this.field1033 = 0; } } @@ -74,8 +74,8 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { signature = "(I)I", garbageValue = "1990181988" ) - public int __m_15() { - return this.__m; + public int vmethod395() { + return this.field1031; } @ObfuscatedName("f") @@ -83,7 +83,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { signature = "(I)Laj;", garbageValue = "1159446036" ) - WorldMapLabel __f_16() { + WorldMapLabel vmethod396() { return this.label0; } @@ -92,8 +92,8 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { signature = "(B)I", garbageValue = "75" ) - int __q_17() { - return this.__q; + int vmethod397() { + return this.field1032; } @ObfuscatedName("w") @@ -101,8 +101,8 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { signature = "(I)I", garbageValue = "-1558233611" ) - int __w_18() { - return this.__w; + int vmethod398() { + return this.field1033; } @ObfuscatedName("m") @@ -120,57 +120,58 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { garbageValue = "-252304353" ) static final void method212() { - for(int var0 = 0; var0 < Client.soundEffectCount; ++var0) { - --Client.queuedSoundEffectDelays[var0]; - if(Client.queuedSoundEffectDelays[var0] >= -10) { - SoundEffect var9 = Client.soundEffects[var0]; - if(var9 == null) { - Object var10000 = null; - var9 = SoundEffect.readSoundEffect(class25.indexCache4, Client.soundEffectIds[var0], 0); - if(var9 == null) { + for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { + int var10002 = Client.queuedSoundEffectDelays[var0]--; + if (Client.queuedSoundEffectDelays[var0] >= -10) { + SoundEffect var10 = Client.soundEffects[var0]; + if (var10 == null) { + Object var2 = null; + var10 = SoundEffect.readSoundEffect(class25.indexCache4, Client.soundEffectIds[var0], 0); + if (var10 == null) { continue; } - Client.queuedSoundEffectDelays[var0] += var9.__q_174(); - Client.soundEffects[var0] = var9; + int[] var10000 = Client.queuedSoundEffectDelays; + var10000[var0] += var10.method303(); + Client.soundEffects[var0] = var10; } - if(Client.queuedSoundEffectDelays[var0] < 0) { - int var2; - if(Client.soundLocations[var0] != 0) { + if (Client.queuedSoundEffectDelays[var0] < 0) { + int var11; + if (Client.soundLocations[var0] != 0) { int var3 = (Client.soundLocations[var0] & 255) * 128; int var4 = Client.soundLocations[var0] >> 16 & 255; int var5 = var4 * 128 + 64 - Canvas.localPlayer.x; - if(var5 < 0) { + if (var5 < 0) { var5 = -var5; } int var6 = Client.soundLocations[var0] >> 8 & 255; int var7 = var6 * 128 + 64 - Canvas.localPlayer.y; - if(var7 < 0) { + if (var7 < 0) { var7 = -var7; } int var8 = var5 + var7 - 128; - if(var8 > var3) { + if (var8 > var3) { Client.queuedSoundEffectDelays[var0] = -100; continue; } - if(var8 < 0) { + if (var8 < 0) { var8 = 0; } - var2 = (var3 - var8) * Client.__client_qc / var3; + var11 = (var3 - var8) * Client.field115 / var3; } else { - var2 = Client.soundEffectVolume; + var11 = Client.soundEffectVolume; } - if(var2 > 0) { - RawSound var10 = var9.toRawSound().resample(MilliClock.decimator); - RawPcmStream var11 = RawPcmStream.createRawPcmStream(var10, 100, var2); - var11.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); - TaskHandler.pcmStreamMixer.addSubStream(var11); + if (var11 > 0) { + RawSound var12 = var10.toRawSound().resample(MilliClock.decimator); + RawPcmStream var13 = RawPcmStream.createRawPcmStream(var12, 100, var11); + var13.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); + TaskHandler.pcmStreamMixer.addSubStream(var13); } Client.queuedSoundEffectDelays[var0] = -100; @@ -178,7 +179,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { } else { --Client.soundEffectCount; - for(int var1 = var0; var1 < Client.soundEffectCount; ++var1) { + for (int var1 = var0; var1 < Client.soundEffectCount; ++var1) { Client.soundEffectIds[var1] = Client.soundEffectIds[var1 + 1]; Client.soundEffects[var1] = Client.soundEffects[var1 + 1]; Client.queuedSoundEffectLoops[var1] = Client.queuedSoundEffectLoops[var1 + 1]; @@ -190,20 +191,20 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { } } - if(Client.__client_qq) { - boolean var12; - if(class214.__hf_o != 0) { - var12 = true; + if (Client.field107) { + boolean var9; + if (class214.field1129 != 0) { + var9 = true; } else { - var12 = class214.midiPcmStream.isReady(); + var9 = class214.midiPcmStream.isReady(); } - if(!var12) { - if(Client.__client_qf != 0 && Client.__client_qy != -1) { - Login.method2076(UserComparator3.indexCache6, Client.__client_qy, 0, Client.__client_qf, false); + if (!var9) { + if (Client.field128 != 0 && Client.field112 != -1) { + Login.method2076(UserComparator3.indexCache6, Client.field112, 0, Client.field128, false); } - Client.__client_qq = false; + Client.field107 = false; } } diff --git a/runescape-client/src/main/java/WorldMapIcon2.java b/runescape-client/src/main/java/WorldMapIcon2.java index 4ed41ff111..baf78223a7 100644 --- a/runescape-client/src/main/java/WorldMapIcon2.java +++ b/runescape-client/src/main/java/WorldMapIcon2.java @@ -13,17 +13,17 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { @ObfuscatedGetter( intValue = -985436813 ) - final int __m; + final int field1034; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lav;" ) - final WorldMapRegion __f; + final WorldMapRegion field1035; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -25914375 ) - int __q; + int field1036; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Laj;" @@ -34,21 +34,21 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { @ObfuscatedGetter( intValue = 927871683 ) - int __o; + int field1037; @ObfuscatedName("u") @ObfuscatedGetter( intValue = -1431936619 ) - int __u; + int field1038; @ObfuscatedSignature( signature = "(Lhu;Lhu;ILav;)V" ) WorldMapIcon2(TileLocation var1, TileLocation var2, int var3, WorldMapRegion var4) { super(var1, var2); - this.__m = var3; - this.__f = var4; - this.__z_27(); + this.field1034 = var3; + this.field1035 = var4; + this.method399(); } @ObfuscatedName("m") @@ -56,8 +56,8 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { signature = "(I)I", garbageValue = "1990181988" ) - public int __m_15() { - return this.__q; + public int vmethod395() { + return this.field1036; } @ObfuscatedName("f") @@ -65,7 +65,7 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { signature = "(I)Laj;", garbageValue = "1159446036" ) - WorldMapLabel __f_16() { + WorldMapLabel vmethod396() { return this.label0; } @@ -74,8 +74,8 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { signature = "(B)I", garbageValue = "75" ) - int __q_17() { - return this.__o; + int vmethod397() { + return this.field1037; } @ObfuscatedName("w") @@ -83,8 +83,8 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { signature = "(I)I", garbageValue = "-1558233611" ) - int __w_18() { - return this.__u; + int vmethod398() { + return this.field1038; } @ObfuscatedName("z") @@ -92,17 +92,17 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { signature = "(I)V", garbageValue = "-806344204" ) - void __z_27() { - this.__q = class50.getObjectDefinition(this.__m).transform().mapIconId; - this.label0 = this.__f.__ab_56(ViewportMouse.getWorldMapElement(this.__q)); - WorldMapElement var1 = ViewportMouse.getWorldMapElement(this.__m_15()); + void method399() { + this.field1036 = class50.getObjectDefinition(this.field1034).transform().mapIconId; + this.label0 = this.field1035.method420(ViewportMouse.getWorldMapElement(this.field1036)); + WorldMapElement var1 = ViewportMouse.getWorldMapElement(this.vmethod395()); Sprite var2 = var1.getSprite(false); - if(var2 != null) { - this.__o = var2.subWidth; - this.__u = var2.subHeight; + if (var2 != null) { + this.field1037 = var2.subWidth; + this.field1038 = var2.subHeight; } else { - this.__o = 0; - this.__u = 0; + this.field1037 = 0; + this.field1038 = 0; } } @@ -113,7 +113,7 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { garbageValue = "1026409510" ) static LoginPacket[] method300() { - return new LoginPacket[]{LoginPacket.__gl_q, LoginPacket.__gl_w, LoginPacket.__gl_m, LoginPacket.__gl_o, LoginPacket.__gl_f}; + return new LoginPacket[]{LoginPacket.field475, LoginPacket.field476, LoginPacket.field473, LoginPacket.field477, LoginPacket.field474}; } @ObfuscatedName("m") @@ -122,19 +122,19 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { garbageValue = "16723968" ) public static File method315(String var0) { - if(!class171.__fo_m) { + if (!class171.field1117) { throw new RuntimeException(""); } else { - File var1 = (File)class171.__fo_q.get(var0); - if(var1 != null) { + File var1 = (File)class171.field1119.get(var0); + if (var1 != null) { return var1; } else { - File var2 = new File(class171.__fo_f, var0); + File var2 = new File(class171.field1118, var0); RandomAccessFile var3 = null; try { File var4 = new File(var2.getParent()); - if(!var4.exists()) { + if (!var4.exists()) { throw new RuntimeException(""); } else { var3 = new RandomAccessFile(var2, "rw"); @@ -143,17 +143,16 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { var3.write(var5); var3.seek(0L); var3.close(); - class171.__fo_q.put(var0, var2); + class171.field1119.put(var0, var2); return var2; } - } catch (Exception var8) { + } catch (Exception var7) { try { - if(var3 != null) { + if (var3 != null) { var3.close(); var3 = null; } - } catch (Exception var7) { - ; + } catch (Exception var6) { } throw new RuntimeException(); @@ -171,22 +170,20 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { int var4 = var0.pathX[0]; int var5 = var0.pathY[0]; int var6 = var0.transformedSize(); - if(var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { - if(var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { - int var9 = var0.transformedSize(); - Client.field895.approxDestinationX = var1; - Client.field895.approxDestinationY = var2; - Client.field895.approxDestinationSizeX = 1; - Client.field895.approxDestinationSizeY = 1; - class65 var10 = Client.field895; - 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); - } - + if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6 && var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { + int var7 = var0.transformedSize(); + Client.field895.approxDestinationX = var1; + Client.field895.approxDestinationY = var2; + Client.field895.approxDestinationSizeX = 1; + Client.field895.approxDestinationSizeY = 1; + class65 var8 = Client.field895; + int var9 = NetSocket.calculateRoute(var4, var5, var7, var8, Client.collisionMaps[var0.plane], true, Client.field113, Client.field114); + if (var9 >= 1) { + for (int var10 = 0; var10 < var9 - 1; ++var10) { + var0.method255(Client.field113[var10], Client.field114[var10], var3); } } } + } } diff --git a/runescape-client/src/main/java/WorldMapIndexCacheLoader.java b/runescape-client/src/main/java/WorldMapIndexCacheLoader.java index 5333cd9d1b..7dadbb8aac 100644 --- a/runescape-client/src/main/java/WorldMapIndexCacheLoader.java +++ b/runescape-client/src/main/java/WorldMapIndexCacheLoader.java @@ -42,14 +42,13 @@ public class WorldMapIndexCacheLoader { ) @Export("reset") void reset(String var1) { - if(var1 != null && !var1.isEmpty()) { - if(var1 != this.cacheName) { - this.cacheName = var1; - this.percentLoaded0 = 0; - this.isLoaded0 = false; - this.load(); - } + if (var1 != null && !var1.isEmpty() && var1 != this.cacheName) { + this.cacheName = var1; + this.percentLoaded0 = 0; + this.isLoaded0 = false; + this.load(); } + } @ObfuscatedName("f") @@ -59,24 +58,24 @@ public class WorldMapIndexCacheLoader { ) @Export("load") int load() { - if(this.percentLoaded0 < 33) { - if(!this.indexCache.tryLoadRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, this.cacheName)) { + if (this.percentLoaded0 < 33) { + if (!this.indexCache.tryLoadRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, this.cacheName)) { return this.percentLoaded0; } this.percentLoaded0 = 33; } - if(this.percentLoaded0 == 33) { - if(this.indexCache.__ag_401(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName) && !this.indexCache.tryLoadRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName)) { + if (this.percentLoaded0 == 33) { + if (this.indexCache.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName) && !this.indexCache.tryLoadRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName)) { return this.percentLoaded0; } this.percentLoaded0 = 66; } - if(this.percentLoaded0 == 66) { - if(!this.indexCache.tryLoadRecordByNames(this.cacheName, WorldMapCacheName.WorldMapCacheName_labels.name)) { + if (this.percentLoaded0 == 66) { + if (!this.indexCache.tryLoadRecordByNames(this.cacheName, WorldMapCacheName.WorldMapCacheName_labels.name)) { return this.percentLoaded0; } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index 2aa8c12cc7..0917600d1d 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -21,7 +21,7 @@ public class WorldMapLabel { @ObfuscatedGetter( intValue = -1536028937 ) - public static int __aj_e; + public static int field1039; @ObfuscatedName("m") @Export("text") String text; @@ -61,96 +61,97 @@ public class WorldMapLabel { ) public static void method443(PacketBuffer var0) { ReflectionCheck var1 = (ReflectionCheck)class322.reflectionChecks.last(); - if(var1 != null) { + if (var1 != null) { int var2 = var0.index; var0.writeInt(var1.id); - for(int var3 = 0; var3 < var1.size; ++var3) { - if(var1.creationErrors[var3] != 0) { + for (int var3 = 0; var3 < var1.size; ++var3) { + if (var1.creationErrors[var3] != 0) { var0.writeByte(var1.creationErrors[var3]); } else { try { int var4 = var1.operations[var3]; Field var5; int var6; - if(var4 == 0) { + if (var4 == 0) { var5 = var1.fields[var3]; var6 = Reflection.getInt(var5, (Object)null); var0.writeByte(0); var0.writeInt(var6); - } else if(var4 == 1) { + } else if (var4 == 1) { var5 = var1.fields[var3]; Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); var0.writeByte(0); - } else if(var4 == 2) { + } else if (var4 == 2) { var5 = var1.fields[var3]; var6 = var5.getModifiers(); var0.writeByte(0); var0.writeInt(var6); } - Method var25; - if(var4 != 3) { - if(var4 == 4) { - var25 = var1.methods[var3]; - var6 = var25.getModifiers(); + Method var7; + if (var4 != 3) { + if (var4 == 4) { + var7 = var1.methods[var3]; + var6 = var7.getModifiers(); var0.writeByte(0); var0.writeInt(var6); } } else { - var25 = var1.methods[var3]; - byte[][] var10 = var1.arguments[var3]; - Object[] var7 = new Object[var10.length]; + var7 = var1.methods[var3]; + byte[][] var8 = var1.arguments[var3]; + Object[] var9 = new Object[var8.length]; - for(int var8 = 0; var8 < var10.length; ++var8) { - ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); - var7[var8] = var9.readObject(); + for (int var10 = 0; var10 < var8.length; ++var10) { + ObjectInputStream var11 = new ObjectInputStream(new ByteArrayInputStream(var8[var10])); + var9[var10] = var11.readObject(); } - Object var11 = Reflection.invoke(var25, (Object)null, var7); - if(var11 == null) { + Object var24 = Reflection.invoke(var7, (Object)null, var9); + if (var24 == null) { var0.writeByte(0); - } else if(var11 instanceof Number) { + } else if (var24 instanceof Number) { var0.writeByte(1); - var0.writeLong(((Number)var11).longValue()); - } else if(var11 instanceof String) { + var0.writeLong(((Number)var24).longValue()); + } else if (var24 instanceof String) { var0.writeByte(2); - var0.writeStringCp1252NullTerminated((String)var11); + var0.writeStringCp1252NullTerminated((String)var24); } else { var0.writeByte(4); } } - } catch (ClassNotFoundException var13) { + } catch (ClassNotFoundException var12) { var0.writeByte(-10); - } catch (InvalidClassException var14) { + } catch (InvalidClassException var13) { var0.writeByte(-11); - } catch (StreamCorruptedException var15) { + } catch (StreamCorruptedException var14) { var0.writeByte(-12); - } catch (OptionalDataException var16) { + } catch (OptionalDataException var15) { var0.writeByte(-13); - } catch (IllegalAccessException var17) { + } catch (IllegalAccessException var16) { var0.writeByte(-14); - } catch (IllegalArgumentException var18) { + } catch (IllegalArgumentException var17) { var0.writeByte(-15); - } catch (InvocationTargetException var19) { + } catch (InvocationTargetException var18) { var0.writeByte(-16); - } catch (SecurityException var20) { + } catch (SecurityException var19) { var0.writeByte(-17); - } catch (IOException var21) { + } catch (IOException var20) { var0.writeByte(-18); - } catch (NullPointerException var22) { + } catch (NullPointerException var21) { var0.writeByte(-19); - } catch (Exception var23) { + } catch (Exception var22) { var0.writeByte(-20); - } catch (Throwable var24) { + } catch (Throwable var23) { var0.writeByte(-21); } } } - var0.__aa_312(var2); + var0.method53(var2); var1.remove(); } + } @ObfuscatedName("f") @@ -160,7 +161,7 @@ public class WorldMapLabel { ) static int method442(int var0, int var1) { ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - return var2 == null?0:(var1 >= 0 && var1 < var2.quantities.length?var2.quantities[var1]:0); + return var2 == null ? 0 : (var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0); } @ObfuscatedName("u") @@ -172,7 +173,7 @@ public class WorldMapLabel { public static IndexedSprite[] createIndexedSpriteArray() { IndexedSprite[] var0 = new IndexedSprite[class328.indexedSpriteCount]; - for(int var1 = 0; var1 < class328.indexedSpriteCount; ++var1) { + for (int var1 = 0; var1 < class328.indexedSpriteCount; ++var1) { IndexedSprite var2 = var0[var1] = new IndexedSprite(); var2.width = class328.indexedSpriteWidth; var2.height = class328.indexedSpriteHeight; @@ -189,7 +190,7 @@ public class WorldMapLabel { VarbitDefinition.indexedSpriteWidths = null; SecureRandomCallable.indexedSpriteHeights = null; class328.indexedSpritePalette = null; - class328.spritePixels = null; + class328.spritePixels = (byte[][])null; return var0; } @@ -200,22 +201,22 @@ public class WorldMapLabel { ) @Export("compareWorlds") static int compareWorlds(World var0, World var1, int var2, boolean var3) { - if(var2 == 1) { + if (var2 == 1) { int var4 = var0.population; int var5 = var1.population; - if(!var3) { - if(var4 == -1) { + if (!var3) { + if (var4 == -1) { var4 = 2001; } - if(var5 == -1) { + if (var5 == -1) { var5 = 2001; } } 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.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))))); + 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.method357() ? (var1.method357() ? 0 : 1) : (var1.method357() ? -1 : 0)) : (var2 == 5 ? (var0.method356() ? (var1.method356() ? 0 : 1) : (var1.method356() ? -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))))); } } @@ -225,8 +226,8 @@ public class WorldMapLabel { garbageValue = "60" ) public static void method440() { - NpcDefinition.NpcDefinition_cached.clear(); - NpcDefinition.NpcDefinition_cachedModels.clear(); + NPCDefinition.NpcDefinition_cached.clear(); + NPCDefinition.NpcDefinition_cachedModels.clear(); } @ObfuscatedName("gx") @@ -236,7 +237,7 @@ public class WorldMapLabel { ) @Export("worldToScreen") static final void worldToScreen(int var0, int var1, int var2) { - if(var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { + if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { int var3 = class32.getTileHeight(var0, var1, SoundSystem.plane) - var2; var0 -= WorldMapSection1.cameraX; var3 -= GrandExchangeEvents.cameraY; @@ -250,17 +251,17 @@ public class WorldMapLabel { var0 = var8; var8 = var3 * var5 - var4 * var1 >> 16; var1 = var5 * var1 + var3 * var4 >> 16; - if(var1 >= 50) { + if (var1 >= 50) { Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; } else { Client.viewportTempX = -1; Client.viewportTempY = -1; } - } else { Client.viewportTempX = -1; Client.viewportTempY = -1; } + } } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index 3730917588..18cb501ec4 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -35,38 +35,32 @@ public class WorldMapLabelSize { @ObfuscatedSignature( signature = "Lit;" ) - static IndexCache __s_dq; + static IndexCache field1040; @ObfuscatedName("fi") @ObfuscatedGetter( intValue = 1577759565 ) - static int __s_fi; + static int field1041; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 1252293513 ) - final int __w; + final int field1042; @ObfuscatedName("o") @ObfuscatedGetter( intValue = 707828941 ) - final int __o; + final int field1043; @ObfuscatedName("u") @ObfuscatedGetter( intValue = -422937451 ) - final int __u; - - static { - WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4); - WorldMapLabelSize_medium = new WorldMapLabelSize(2, 1, 2); - WorldMapLabelSize_large = new WorldMapLabelSize(1, 2, 0); - } + final int field1044; WorldMapLabelSize(int var1, int var2, int var3) { - this.__w = var1; - this.__o = var2; - this.__u = var3; + this.field1042 = var1; + this.field1043 = var2; + this.field1044 = var3; } @ObfuscatedName("f") @@ -74,8 +68,8 @@ public class WorldMapLabelSize { signature = "(FI)Z", garbageValue = "2107231705" ) - boolean __f_14(float var1) { - return var1 >= (float)this.__u; + boolean method400(float var1) { + return var1 >= (float)this.field1044; } @ObfuscatedName("m") @@ -95,9 +89,9 @@ public class WorldMapLabelSize { static WorldMapLabelSize method195(int var0) { WorldMapLabelSize[] var1 = method192(); - for(int var2 = 0; var2 < var1.length; ++var2) { + for (int var2 = 0; var2 < var1.length; ++var2) { WorldMapLabelSize var3 = var1[var2]; - if(var0 == var3.__o) { + if (var0 == var3.field1043) { return var3; } } @@ -111,19 +105,25 @@ public class WorldMapLabelSize { garbageValue = "-187598326" ) static final void method198() { - PacketBufferNode var0 = Interpreter.method1915(ClientPacket.__gs_h, Client.packetWriter.isaacCipher); - Client.packetWriter.__q_167(var0); + PacketBufferNode var0 = Interpreter.method1915(ClientPacket.field242, Client.packetWriter.isaacCipher); + Client.packetWriter.method241(var0); - for(WidgetGroupParent var1 = (WidgetGroupParent)Client.widgetGroupParents.first(); var1 != null; var1 = (WidgetGroupParent)Client.widgetGroupParents.next()) { - if(var1.type == 0 || var1.type == 3) { + for (WidgetGroupParent var1 = (WidgetGroupParent)Client.widgetGroupParents.first(); var1 != null; var1 = (WidgetGroupParent)Client.widgetGroupParents.next()) { + if (var1.type == 0 || var1.type == 3) { MenuAction.closeWidgetGroup(var1, true); } } - if(Client.__client_mo != null) { - class22.method295(Client.__client_mo); - Client.__client_mo = null; + if (Client.field127 != null) { + class22.method295(Client.field127); + Client.field127 = null; } } + + static { + WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4); + WorldMapLabelSize_medium = new WorldMapLabelSize(2, 1, 2); + WorldMapLabelSize_large = new WorldMapLabelSize(1, 2, 0); + } } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 7388645bbb..e15da8096e 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -40,7 +40,7 @@ public final class WorldMapManager { @Export("regions") WorldMapRegion[][] regions; @ObfuscatedName("g") - HashMap __g; + HashMap field1045; @ObfuscatedName("l") @ObfuscatedSignature( signature = "[Llq;" @@ -51,12 +51,12 @@ public final class WorldMapManager { @ObfuscatedSignature( signature = "Lir;" ) - final AbstractIndexCache __e; + final AbstractIndexCache field1046; @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lir;" ) - final AbstractIndexCache __x; + final AbstractIndexCache field1047; @ObfuscatedName("d") @Export("fonts") final HashMap fonts; @@ -76,17 +76,17 @@ public final class WorldMapManager { @ObfuscatedGetter( intValue = 1729323633 ) - int __i; + int field1048; @ObfuscatedName("a") @ObfuscatedGetter( intValue = -395718741 ) - int __a; + int field1049; @ObfuscatedName("z") @ObfuscatedGetter( intValue = 1085359673 ) - public int __z; + public int field1050; @ObfuscatedSignature( signature = "([Llq;Ljava/util/HashMap;Lir;Lir;)V" @@ -94,12 +94,12 @@ public final class WorldMapManager { public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractIndexCache var3, AbstractIndexCache var4) { this.isLoaded0 = false; this.loadStarted = false; - this.__g = new HashMap(); - this.__z = 0; + this.field1045 = new HashMap(); + this.field1050 = 0; this.mapSceneSprites = var1; this.fonts = var2; - this.__e = var3; - this.__x = var4; + this.field1046 = var3; + this.field1047 = var4; } @ObfuscatedName("m") @@ -109,7 +109,7 @@ public final class WorldMapManager { ) @Export("load") public void load(AbstractIndexCache var1, String var2, boolean var3) { - if(!this.loadStarted) { + if (!this.loadStarted) { this.isLoaded0 = false; this.loadStarted = true; System.nanoTime(); @@ -122,8 +122,8 @@ public final class WorldMapManager { this.mapAreaData = new WorldMapAreaData(); try { - this.mapAreaData.__ce_76(var6, var7, var5, var3); - } catch (IllegalStateException var19) { + this.mapAreaData.method387(var6, var7, var5, var3); + } catch (IllegalStateException var16) { return; } @@ -132,47 +132,49 @@ public final class WorldMapManager { this.mapAreaData.originY(); this.surfaceOffsetX = this.mapAreaData.minX() * 64; this.surfaceOffsetY = this.mapAreaData.minY() * 64; - this.__i = (this.mapAreaData.maxX() - this.mapAreaData.minX() + 1) * 64; - this.__a = (this.mapAreaData.maxY() - this.mapAreaData.minY() + 1) * 64; - int var16 = this.mapAreaData.maxX() - this.mapAreaData.minX() + 1; + this.field1048 = (this.mapAreaData.maxX() - this.mapAreaData.minX() + 1) * 64; + this.field1049 = (this.mapAreaData.maxY() - this.mapAreaData.minY() + 1) * 64; + int var8 = this.mapAreaData.maxX() - this.mapAreaData.minX() + 1; int var9 = this.mapAreaData.maxY() - this.mapAreaData.minY() + 1; System.nanoTime(); System.nanoTime(); SoundSystem.method2456(); - this.regions = new WorldMapRegion[var16][var9]; - Iterator var10 = this.mapAreaData.__n.iterator(); + this.regions = new WorldMapRegion[var8][var9]; + Iterator var10 = this.mapAreaData.field1016.iterator(); - while(var10.hasNext()) { + int var12; + while (var10.hasNext()) { class15 var11 = (class15)var10.next(); - int var12 = var11.field149; + var12 = var11.field149; int var13 = var11.field146; int var14 = var12 - this.mapAreaData.minX(); int var15 = var13 - this.mapAreaData.minY(); - this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.__a_39(), this.fonts); - this.regions[var14][var15].method447(var11, this.mapAreaData.__a); + this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.method386(), this.fonts); + this.regions[var14][var15].method447(var11, this.mapAreaData.field1018); } - for(int var17 = 0; var17 < var16; ++var17) { - for(int var18 = 0; var18 < var9; ++var18) { - if(this.regions[var17][var18] == null) { - this.regions[var17][var18] = new WorldMapRegion(this.mapAreaData.minX() + var17, this.mapAreaData.minY() + var18, this.mapAreaData.__a_39(), this.fonts); - this.regions[var17][var18].__u_41(this.mapAreaData.__i, this.mapAreaData.__a); + for (int var17 = 0; var17 < var8; ++var17) { + for (var12 = 0; var12 < var9; ++var12) { + if (this.regions[var17][var12] == null) { + this.regions[var17][var12] = new WorldMapRegion(this.mapAreaData.minX() + var17, this.mapAreaData.minY() + var12, this.mapAreaData.method386(), this.fonts); + this.regions[var17][var12].method405(this.mapAreaData.field1017, this.mapAreaData.field1018); } } } System.nanoTime(); System.nanoTime(); - if(var1.__ag_401(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2)) { - byte[] var20 = var1.takeRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2); - this.overviewSprite = class27.convertJpgToSprite(var20); + if (var1.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2)) { + byte[] var18 = var1.takeRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2); + this.overviewSprite = class27.convertJpgToSprite(var18); } System.nanoTime(); - var1.__y_398(); - var1.__b_400(); + var1.method6(); + var1.method8(); this.isLoaded0 = true; } + } @ObfuscatedName("f") @@ -190,7 +192,7 @@ public final class WorldMapManager { signature = "(IIIIIIIII)V", garbageValue = "1619301748" ) - public final void __q_72(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + public final void method401(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int[] var9 = Rasterizer2D.Rasterizer2D_pixels; int var10 = Rasterizer2D.Rasterizer2D_width; int var11 = Rasterizer2D.Rasterizer2D_height; @@ -199,11 +201,11 @@ public final class WorldMapManager { class22 var13 = this.method643(var1, var2, var3, var4); float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); int var15 = (int)Math.ceil((double)var14); - this.__z = var15; - if(!this.__g.containsKey(Integer.valueOf(var15))) { + this.field1050 = var15; + if (!this.field1045.containsKey(var15)) { class40 var16 = new class40(var15); var16.method763(); - this.__g.put(Integer.valueOf(var15), var16); + this.field1045.put(var15, var16); } int var23 = var13.field166 + var13.field169 - 1; @@ -211,9 +213,9 @@ public final class WorldMapManager { int var18; int var19; - for(var18 = var13.field166; var18 <= var23; ++var18) { - for(var19 = var13.field167; var19 <= var17; ++var19) { - this.regions[var18][var19].method455(var15, (class40)this.__g.get(Integer.valueOf(var15)), this.mapSceneSprites, this.__e, this.__x); + for (var18 = var13.field166; var18 <= var23; ++var18) { + for (var19 = var13.field167; var19 <= var17; ++var19) { + this.regions[var18][var19].method455(var15, (class40)this.field1045.get(var15), this.mapSceneSprites, this.field1046, this.field1047); } } @@ -223,9 +225,9 @@ public final class WorldMapManager { var19 = this.surfaceOffsetX + var1; int var20 = var2 + this.surfaceOffsetY; - for(int var21 = var13.field166; var21 < var13.field166 + var13.field169; ++var21) { - for(int var22 = var13.field167; var22 < var13.field167 + var13.field164; ++var22) { - this.regions[var21][var22].__w_40(var5 + var18 * (this.regions[var21][var22].x * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].y * 64 - var20 + 64) / 64, var18); + for (int var21 = var13.field166; var21 < var13.field166 + var13.field169; ++var21) { + for (int var22 = var13.field167; var22 < var13.field167 + var13.field164; ++var22) { + this.regions[var21][var22].method404(var5 + var18 * (this.regions[var21][var22].x * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].y * 64 - var20 + 64) / 64, var18); } } @@ -236,7 +238,7 @@ public final class WorldMapManager { signature = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZB)V", garbageValue = "-71" ) - public final void __w_73(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) { + public final void method402(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) { class22 var14 = this.method643(var1, var2, var3, var4); float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); int var16 = (int)(var15 * 64.0F); @@ -245,20 +247,20 @@ public final class WorldMapManager { int var19; int var20; - for(var19 = var14.field166; var19 < var14.field169 + var14.field166; ++var19) { - for(var20 = var14.field167; var20 < var14.field164 + var14.field167; ++var20) { - if(var13) { - this.regions[var19][var20].__e_42(); + for (var19 = var14.field166; var19 < var14.field169 + var14.field166; ++var19) { + for (var20 = var14.field167; var20 < var14.field164 + var14.field167; ++var20) { + if (var13) { + this.regions[var19][var20].method406(); } - this.regions[var19][var20].__j_46(var5 + var16 * (this.regions[var19][var20].x * 64 - var17) / 64, var8 - var16 * (this.regions[var19][var20].y * 64 - var18 + 64) / 64, var16, var9); + this.regions[var19][var20].method410(var5 + var16 * (this.regions[var19][var20].x * 64 - var17) / 64, var8 - var16 * (this.regions[var19][var20].y * 64 - var18 + 64) / 64, var16, var9); } } - if(var10 != null && var11 > 0) { - for(var19 = var14.field166; var19 < var14.field169 + var14.field166; ++var19) { - for(var20 = var14.field167; var20 < var14.field167 + var14.field164; ++var20) { - this.regions[var19][var20].__s_47(var10, var11, var12); + if (var10 != null && var11 > 0) { + for (var19 = var14.field166; var19 < var14.field169 + var14.field166; ++var19) { + for (var20 = var14.field167; var20 < var14.field167 + var14.field164; ++var20) { + this.regions[var19][var20].method411(var10, var11, var12); } } } @@ -272,37 +274,38 @@ public final class WorldMapManager { ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) { - if(this.overviewSprite != null) { - this.overviewSprite.__j_506(var1, var2, var3, var4); - if(var6 > 0 && var6 % var7 < var7 / 2) { - if(this.icons == null) { + if (this.overviewSprite != null) { + this.overviewSprite.method309(var1, var2, var3, var4); + if (var6 > 0 && var6 % var7 < var7 / 2) { + if (this.icons == null) { this.buildIcons0(); } Iterator var8 = var5.iterator(); - while(true) { - List var10; + while (true) { + List var9; do { - if(!var8.hasNext()) { + if (!var8.hasNext()) { return; } - int var9 = ((Integer)var8.next()).intValue(); - var10 = (List)this.icons.get(Integer.valueOf(var9)); - } while(var10 == null); + int var10 = (Integer)var8.next(); + var9 = (List)this.icons.get(var10); + } while(var9 == null); - Iterator var11 = var10.iterator(); + Iterator var14 = var9.iterator(); - while(var11.hasNext()) { - AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); - int var13 = var3 * (var12.coord2.x - this.surfaceOffsetX) / this.__i; - int var14 = var4 - (var12.coord2.y - this.surfaceOffsetY) * var4 / this.__a; - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256); + while (var14.hasNext()) { + AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var14.next(); + int var12 = var3 * (var11.coord2.x - this.surfaceOffsetX) / this.field1048; + int var13 = var4 - (var11.coord2.y - this.surfaceOffsetY) * var4 / this.field1049; + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var12 + var1, var13 + var2, 2, 16776960, 256); } } } } + } @ObfuscatedName("u") @@ -310,9 +313,9 @@ public final class WorldMapManager { signature = "(IIIIIIIIIII)Ljava/util/List;", garbageValue = "1185703832" ) - public List __u_74(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + public List method403(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { LinkedList var11 = new LinkedList(); - if(!this.isLoaded0) { + if (!this.isLoaded0) { return var11; } else { class22 var12 = this.method643(var1, var2, var3, var4); @@ -321,10 +324,10 @@ public final class WorldMapManager { int var15 = this.surfaceOffsetX + var1; int var16 = var2 + this.surfaceOffsetY; - for(int var17 = var12.field166; var17 < var12.field166 + var12.field169; ++var17) { - for(int var18 = var12.field167; var18 < var12.field164 + var12.field167; ++var18) { - List var19 = this.regions[var17][var18].__ae_57(var5 + var14 * (this.regions[var17][var18].x * 64 - var15) / 64, var8 + var6 - var14 * (this.regions[var17][var18].y * 64 - var16 + 64) / 64, var14, var9, var10); - if(!var19.isEmpty()) { + for (int var17 = var12.field166; var17 < var12.field166 + var12.field169; ++var17) { + for (int var18 = var12.field167; var18 < var12.field164 + var12.field167; ++var18) { + List var19 = this.regions[var17][var18].method421(var5 + var14 * (this.regions[var17][var18].x * 64 - var15) / 64, var8 + var6 - var14 * (this.regions[var17][var18].y * 64 - var16 + 64) / 64, var14, var9, var10); + if (!var19.isEmpty()) { var11.addAll(var19); } } @@ -353,21 +356,21 @@ public final class WorldMapManager { var5.field164 = var13 - var11 + 1; var5.field166 = var10 - this.mapAreaData.minX(); var5.field167 = var11 - this.mapAreaData.minY(); - if(var5.field166 < 0) { + if (var5.field166 < 0) { var5.field169 += var5.field166; var5.field166 = 0; } - if(var5.field166 > this.regions.length - var5.field169) { + if (var5.field166 > this.regions.length - var5.field169) { var5.field169 = this.regions.length - var5.field166; } - if(var5.field167 < 0) { + if (var5.field167 < 0) { var5.field164 += var5.field167; var5.field167 = 0; } - if(var5.field167 > this.regions[0].length - var5.field164) { + if (var5.field167 > this.regions[0].length - var5.field164) { var5.field164 = this.regions[0].length - var5.field167; } @@ -404,27 +407,27 @@ public final class WorldMapManager { ) @Export("buildIcons0") void buildIcons0() { - if(this.icons == null) { + if (this.icons == null) { this.icons = new HashMap(); } this.icons.clear(); - for(int var1 = 0; var1 < this.regions.length; ++var1) { - for(int var2 = 0; var2 < this.regions[var1].length; ++var2) { + for (int var1 = 0; var1 < this.regions.length; ++var1) { + for (int var2 = 0; var2 < this.regions[var1].length; ++var2) { List var3 = this.regions[var1][var2].icons(); Iterator var4 = var3.iterator(); - while(var4.hasNext()) { + while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); - if(var5.__h_67()) { - int var6 = var5.__m_15(); - if(!this.icons.containsKey(Integer.valueOf(var6))) { + if (var5.method19()) { + int var6 = var5.vmethod395(); + if (!this.icons.containsKey(var6)) { LinkedList var7 = new LinkedList(); var7.add(var5); - this.icons.put(Integer.valueOf(var6), var7); + this.icons.put(var6, var7); } else { - List var8 = (List)this.icons.get(Integer.valueOf(var6)); + List var8 = (List)this.icons.get(var6); var8.add(var5); } } @@ -442,13 +445,13 @@ public final class WorldMapManager { @Export("getPixelsPerTile") float getPixelsPerTile(int var1, int var2) { float var3 = (float)var1 / (float)var2; - if(var3 > 8.0F) { + if (var3 > 8.0F) { return 8.0F; - } else if(var3 < 1.0F) { + } else if (var3 < 1.0F) { return 1.0F; } else { int var4 = Math.round(var3); - return Math.abs((float)var4 - var3) < 0.05F?(float)var4:var3; + return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; } } @@ -460,22 +463,22 @@ public final class WorldMapManager { @Export("itemContainerSetItem") static void itemContainerSetItem(int var0, int var1, int var2, int var3) { ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if(var4 == null) { + if (var4 == null) { var4 = new ItemContainer(); ItemContainer.itemContainers.put(var4, (long)var0); } - if(var4.ids.length <= var1) { + if (var4.ids.length <= var1) { int[] var5 = new int[var1 + 1]; int[] var6 = new int[var1 + 1]; int var7; - for(var7 = 0; var7 < var4.ids.length; ++var7) { + for (var7 = 0; var7 < var4.ids.length; ++var7) { var5[var7] = var4.ids[var7]; var6[var7] = var4.quantities[var7]; } - for(var7 = var4.ids.length; var7 < var1; ++var7) { + for (var7 = var4.ids.length; var7 < var1; ++var7) { var5[var7] = -1; var6[var7] = 0; } @@ -495,8 +498,8 @@ public final class WorldMapManager { ) public static void method673() { ObjectDefinition.ObjectDefinition_cached.clear(); - ObjectDefinition.__jr_o.clear(); - ObjectDefinition.__jr_u.clear(); + ObjectDefinition.field641.clear(); + ObjectDefinition.field642.clear(); ObjectDefinition.ObjectDefinition_cachedModels.clear(); } @@ -516,6 +519,6 @@ public final class WorldMapManager { garbageValue = "1341489301" ) static final void method668() { - Client.__client_na = Client.cycleCntr; + Client.field105 = Client.cycleCntr; } } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 9df1dc4a80..381bc708fe 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -17,7 +17,7 @@ public class WorldMapRegion { @ObfuscatedSignature( signature = "Lec;" ) - public static DemotingHashTable __av_o; + public static DemotingHashTable field1051; @ObfuscatedName("u") @ObfuscatedGetter( intValue = -1061363609 @@ -36,17 +36,17 @@ public class WorldMapRegion { ) class15 field239; @ObfuscatedName("e") - LinkedList __e; + LinkedList field1052; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -120515153 ) - int __x; + int field1053; @ObfuscatedName("d") @ObfuscatedGetter( intValue = 415972873 ) - int __d; + int field1054; @ObfuscatedName("k") @Export("iconsList") List iconsList; @@ -57,17 +57,13 @@ public class WorldMapRegion { @Export("fonts") final HashMap fonts; - static { - __av_o = new DemotingHashTable(37748736, 256); - } - WorldMapRegion(int var1, int var2, int var3, HashMap var4) { this.x = var1; this.y = var2; - this.__e = new LinkedList(); + this.field1052 = new LinkedList(); this.iconsList = new LinkedList(); this.iconsMap = new HashMap(); - this.__x = var3 | -16777216; + this.field1053 = var3 | -16777216; this.fonts = var4; } @@ -76,16 +72,16 @@ public class WorldMapRegion { signature = "(IIIB)V", garbageValue = "-87" ) - void __w_40(int var1, int var2, int var3) { - Sprite var4 = class13.method164(this.x, this.y, this.__d); - if(var4 != null) { - if(var3 == this.__d * 64) { + void method404(int var1, int var2, int var3) { + Sprite var4 = class13.method164(this.x, this.y, this.field1054); + if (var4 != null) { + if (var3 == this.field1054 * 64) { var4.drawAt(var1, var2); } else { - var4.__al_517(var1, var2, var3, var3); + var4.method319(var1, var2, var3, var3); } - } + } @ObfuscatedName("o") @@ -96,7 +92,7 @@ public class WorldMapRegion { void method447(class15 var1, List var2) { this.iconsMap.clear(); this.field239 = var1; - this.__x_43(var2); + this.method407(var2); } @ObfuscatedName("u") @@ -104,18 +100,18 @@ public class WorldMapRegion { signature = "(Ljava/util/HashSet;Ljava/util/List;B)V", garbageValue = "-47" ) - void __u_41(HashSet var1, List var2) { + void method405(HashSet var1, List var2) { this.iconsMap.clear(); Iterator var3 = var1.iterator(); - while(var3.hasNext()) { + while (var3.hasNext()) { class39 var4 = (class39)var3.next(); - if(var4.method256() == this.x && var4.method264() == this.y) { - this.__e.add(var4); + if (var4.method256() == this.x && var4.method264() == this.y) { + this.field1052.add(var4); } } - this.__x_43(var2); + this.method407(var2); } @ObfuscatedName("g") @@ -126,42 +122,42 @@ public class WorldMapRegion { void method449(int var1, int var2, int var3, int var4, class21 var5) { this.iconsMap.clear(); - for(int var6 = var1; var6 < var3 + var1; ++var6) { - label75: - for(int var7 = var2; var7 < var2 + var4; ++var7) { - for(int var8 = 0; var8 < var5.field156; ++var8) { + for (int var6 = var1; var6 < var3 + var1; ++var6) { + label66: + for (int var7 = var2; var7 < var2 + var4; ++var7) { + for (int var8 = 0; var8 < var5.field156; ++var8) { class25[] var9 = var5.field144[var8][var6][var7]; - if(var9 != null && var9.length != 0) { + if (var9 != null && var9.length != 0) { class25[] var10 = var9; - for(int var11 = 0; var11 < var10.length; ++var11) { - ObjectDefinition var13; - boolean var14; - label66: { - class25 var12 = var10[var11]; - var13 = class50.getObjectDefinition(var12.field199); - if(var13.transforms != null) { - int[] var15 = var13.transforms; + for (int var11 = 0; var11 < var10.length; ++var11) { + ObjectDefinition var12; + boolean var13; + label57: { + class25 var14 = var10[var11]; + var12 = class50.getObjectDefinition(var14.field199); + if (var12.transforms != null) { + int[] var15 = var12.transforms; - for(int var16 = 0; var16 < var15.length; ++var16) { + for (int var16 = 0; var16 < var15.length; ++var16) { int var17 = var15[var16]; ObjectDefinition var18 = class50.getObjectDefinition(var17); - if(var18.mapIconId != -1) { - var14 = true; - break label66; + if (var18.mapIconId != -1) { + var13 = true; + break label57; } } - } else if(var13.mapIconId != -1) { - var14 = true; - break label66; + } else if (var12.mapIconId != -1) { + var13 = true; + break label57; } - var14 = false; + var13 = false; } - if(var14) { - this.method479(var13, var8, var6, var7, var5); - continue label75; + if (var13) { + this.method479(var12, var8, var6, var7, var5); + continue label66; } } } @@ -179,7 +175,7 @@ public class WorldMapRegion { void method479(ObjectDefinition var1, int var2, int var3, int var4, class21 var5) { TileLocation var6 = new TileLocation(var2, var3 + this.x * 64, this.y * 64 + var4); TileLocation var7 = null; - if(this.field239 != null) { + if (this.field239 != null) { var7 = new TileLocation(this.field239.field148 + var2, var3 + this.field239.field149 * 64, var4 + this.field239.field146 * 64); } else { class39 var8 = (class39)var5; @@ -187,11 +183,11 @@ public class WorldMapRegion { } Object var10; - if(var1.transforms != null) { + if (var1.transforms != null) { var10 = new WorldMapIcon2(var7, var6, var1.id, this); } else { WorldMapElement var9 = ViewportMouse.getWorldMapElement(var1.mapIconId); - var10 = new WorldMapIcon1(var7, var6, var9.__o, this.__ab_56(var9)); + var10 = new WorldMapIcon1(var7, var6, var9.field1020, this.method420(var9)); } this.iconsMap.put(new TileLocation(0, var3, var4), var10); @@ -202,13 +198,13 @@ public class WorldMapRegion { signature = "(B)V", garbageValue = "5" ) - void __e_42() { + void method406() { Iterator var1 = this.iconsMap.values().iterator(); - while(var1.hasNext()) { + while (var1.hasNext()) { AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); - if(var2 instanceof WorldMapIcon2) { - ((WorldMapIcon2)var2).__z_27(); + if (var2 instanceof WorldMapIcon2) { + ((WorldMapIcon2)var2).method399(); } } @@ -219,13 +215,13 @@ public class WorldMapRegion { signature = "(Ljava/util/List;I)V", garbageValue = "128876606" ) - void __x_43(List var1) { + void method407(List var1) { Iterator var2 = var1.iterator(); - while(var2.hasNext()) { + while (var2.hasNext()) { WorldMapIcon1 var3 = (WorldMapIcon1)var2.next(); - if(var3.coord2.x >> 6 == this.x && var3.coord2.y >> 6 == this.y) { - WorldMapIcon1 var4 = new WorldMapIcon1(var3.coord2, var3.coord2, var3.__m, this.__al_55(var3.__m)); + if (var3.coord2.x >> 6 == this.x && var3.coord2.y >> 6 == this.y) { + WorldMapIcon1 var4 = new WorldMapIcon1(var3.coord2, var3.coord2, var3.field1031, this.method419(var3.field1031)); this.iconsList.add(var4); } } @@ -237,13 +233,13 @@ public class WorldMapRegion { signature = "(I)V", garbageValue = "1543354181" ) - void __d_44() { - if(this.field239 != null) { + void method408() { + if (this.field239 != null) { this.field239.method282(); } else { - Iterator var1 = this.__e.iterator(); + Iterator var1 = this.field1052.iterator(); - while(var1.hasNext()) { + while (var1.hasNext()) { class39 var2 = (class39)var1.next(); var2.method282(); } @@ -256,10 +252,10 @@ public class WorldMapRegion { signature = "(Lir;B)Z", garbageValue = "2" ) - boolean __a_45(AbstractIndexCache var1) { - if(this.field239 != null) { + boolean method409(AbstractIndexCache var1) { + if (this.field239 != null) { this.field239.method263(var1); - if(this.field239.method271()) { + if (this.field239.method271()) { this.method449(0, 0, 64, 64, this.field239); return true; } else { @@ -270,15 +266,15 @@ public class WorldMapRegion { Iterator var3; class39 var4; - for(var3 = this.__e.iterator(); var3.hasNext(); var2 &= var4.method271()) { + for (var3 = this.field1052.iterator(); var3.hasNext(); var2 &= var4.method271()) { var4 = (class39)var3.next(); var4.method263(var1); } - if(var2) { - var3 = this.__e.iterator(); + if (var2) { + var3 = this.field1052.iterator(); - while(var3.hasNext()) { + while (var3.hasNext()) { var4 = (class39)var3.next(); this.method449(var4.method719() * 8, var4.method720() * 8, 8, 8, var4); } @@ -294,38 +290,37 @@ public class WorldMapRegion { garbageValue = "518389076" ) void method455(int var1, class40 var2, IndexedSprite[] var3, AbstractIndexCache var4, AbstractIndexCache var5) { - this.__d = var1; - if(this.field239 != null || !this.__e.isEmpty()) { - if(class13.method164(this.x, this.y, var1) == null) { - boolean var6 = true; - var6 &= this.__a_45(var4); - int var8; - if(this.field239 != null) { - var8 = this.field239.field150; + this.field1054 = var1; + if ((this.field239 != null || !this.field1052.isEmpty()) && class13.method164(this.x, this.y, var1) == null) { + boolean var6 = true; + var6 &= this.method409(var4); + int var7; + if (this.field239 != null) { + var7 = this.field239.field150; + } else { + var7 = ((class21)this.field1052.getFirst()).field150; + } + + var6 &= var5.tryLoadArchive(var7); + if (var6) { + byte[] var8 = var5.takeRecordFlat(var7); + class27 var9 = SecureRandomCallable.method1145(var8); + Sprite var10 = new Sprite(this.field1054 * 64, this.field1054 * 64); + var10.setRaster(); + if (this.field239 != null) { + this.method546(var2, var3, var9); } else { - var8 = ((class21)this.__e.getFirst()).field150; + this.method459(var2, var3, var9); } - var6 &= var5.tryLoadArchive(var8); - if(var6) { - byte[] var7 = var5.takeRecordFlat(var8); - class27 var9 = SecureRandomCallable.method1145(var7); - Sprite var10 = new Sprite(this.__d * 64, this.__d * 64); - var10.setRaster(); - if(this.field239 != null) { - this.method546(var2, var3, var9); - } else { - this.method459(var2, var3, var9); - } - - int var11 = this.x; - int var12 = this.y; - int var13 = this.__d; - __av_o.put(var10, MouseHandler.method1083(var11, var12, var13), var10.pixels.length * 4); - this.__d_44(); - } + int var11 = this.x; + int var12 = this.y; + int var13 = this.field1054; + field1051.put(var10, MouseHandler.method1083(var11, var12, var13), var10.pixels.length * 4); + this.method408(); } } + } @ObfuscatedName("j") @@ -333,13 +328,13 @@ public class WorldMapRegion { signature = "(IIILjava/util/HashSet;I)V", garbageValue = "893970699" ) - void __j_46(int var1, int var2, int var3, HashSet var4) { - if(var4 == null) { + void method410(int var1, int var2, int var3, HashSet var4) { + if (var4 == null) { var4 = new HashSet(); } - this.__aq_48(var1, var2, var4, var3); - this.__ah_54(var1, var2, var4, var3); + this.method412(var1, var2, var4, var3); + this.method418(var1, var2, var4, var3); } @ObfuscatedName("s") @@ -347,21 +342,21 @@ public class WorldMapRegion { signature = "(Ljava/util/HashSet;IIB)V", garbageValue = "-70" ) - void __s_47(HashSet var1, int var2, int var3) { + void method411(HashSet var1, int var2, int var3) { Iterator var4 = this.iconsMap.values().iterator(); - while(var4.hasNext()) { + while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); - if(var5.__h_67()) { - int var6 = var5.__m_15(); - if(var1.contains(Integer.valueOf(var6))) { + if (var5.method19()) { + int var6 = var5.vmethod395(); + if (var1.contains(var6)) { WorldMapElement var7 = ViewportMouse.getWorldMapElement(var6); - this.__av_50(var7, var5.__e, var5.__x, var2, var3); + this.method414(var7, var5.field5, var5.field6, var2, var3); } } } - this.__aj_49(var1, var2, var3); + this.method413(var1, var2, var3); } @ObfuscatedName("t") @@ -372,15 +367,15 @@ public class WorldMapRegion { void method546(class40 var1, IndexedSprite[] var2, class27 var3) { int var4; int var5; - for(var4 = 0; var4 < 64; ++var4) { - for(var5 = 0; var5 < 64; ++var5) { + for (var4 = 0; var4 < 64; ++var4) { + for (var5 = 0; var5 < 64; ++var5) { this.method461(var4, var5, this.field239, var1, var3); this.method462(var4, var5, this.field239, var1); } } - for(var4 = 0; var4 < 64; ++var4) { - for(var5 = 0; var5 < 64; ++var5) { + for (var4 = 0; var4 < 64; ++var4) { + for (var5 = 0; var5 < 64; ++var5) { this.method460(var4, var5, this.field239, var1, var2); } } @@ -393,29 +388,29 @@ public class WorldMapRegion { garbageValue = "752069098" ) void method459(class40 var1, IndexedSprite[] var2, class27 var3) { - Iterator var4 = this.__e.iterator(); + Iterator var4 = this.field1052.iterator(); class39 var5; int var6; int var7; - while(var4.hasNext()) { + while (var4.hasNext()) { var5 = (class39)var4.next(); - for(var6 = var5.method719() * 8; var6 < var5.method719() * 8 + 8; ++var6) { - for(var7 = var5.method720() * 8; var7 < var5.method720() * 8 + 8; ++var7) { + for (var6 = var5.method719() * 8; var6 < var5.method719() * 8 + 8; ++var6) { + for (var7 = var5.method720() * 8; var7 < var5.method720() * 8 + 8; ++var7) { this.method461(var6, var7, var5, var1, var3); this.method462(var6, var7, var5, var1); } } } - var4 = this.__e.iterator(); + var4 = this.field1052.iterator(); - while(var4.hasNext()) { + while (var4.hasNext()) { var5 = (class39)var4.next(); - for(var6 = var5.method719() * 8; var6 < var5.method719() * 8 + 8; ++var6) { - for(var7 = var5.method720() * 8; var7 < var5.method720() * 8 + 8; ++var7) { + for (var6 = var5.method719() * 8; var6 < var5.method719() * 8 + 8; ++var6) { + for (var7 = var5.method720() * 8; var7 < var5.method720() * 8 + 8; ++var7) { this.method460(var6, var7, var5, var1, var2); } } @@ -441,103 +436,107 @@ public class WorldMapRegion { void method461(int var1, int var2, class21 var3, class40 var4, class27 var5) { int var6 = var3.field151[0][var1][var2] - 1; int var7 = var3.field145[0][var1][var2] - 1; - if(var6 == -1 && var7 == -1) { - Rasterizer2D.Rasterizer2D_fillRectangle(this.__d * var1, this.__d * (63 - var2), this.__d, this.__d, this.__x); + if (var6 == -1 && var7 == -1) { + Rasterizer2D.Rasterizer2D_fillRectangle(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, this.field1054, this.field1053); } int var8 = 16711935; int var9; - if(var7 != -1) { - int var10 = this.__x; - OverlayDefinition var12 = (OverlayDefinition)OverlayDefinition.__jf_f.get((long)var7); - OverlayDefinition var11; - if(var12 != null) { - var11 = var12; + if (var7 != -1) { + int var10 = this.field1053; + OverlayDefinition var11 = (OverlayDefinition)OverlayDefinition.field664.get((long)var7); + OverlayDefinition var12; + if (var11 != null) { + var12 = var11; } else { - byte[] var13 = OverlayDefinition.__jf_m.takeRecord(4, var7); - var12 = new OverlayDefinition(); - if(var13 != null) { - var12.read(new Buffer(var13), var7); + byte[] var13 = OverlayDefinition.field663.takeRecord(4, var7); + var11 = new OverlayDefinition(); + if (var13 != null) { + var11.read(new Buffer(var13), var7); } - var12.init(); - OverlayDefinition.__jf_f.put(var12, (long)var7); - var11 = var12; + var11.init(); + OverlayDefinition.field664.put(var11, (long)var7); + var12 = var11; } - if(var11 == null) { - var9 = var10; - } else if(var11.rgb2 >= 0) { - var9 = var11.rgb2 | -16777216; - } else if(var11.texture >= 0) { - int var21 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var11.texture), 96); - var9 = Rasterizer3D.Rasterizer3D_colorPalette[var21] | -16777216; - } else if(var11.rgb == 16711935) { + if (var12 == null) { var9 = var10; + } else if (var12.rgb2 >= 0) { + var9 = var12.rgb2 | -16777216; } else { - int var14 = var11.hue; - int var15 = var11.saturation; - int var16 = var11.lightness; - if(var16 > 179) { - var15 /= 2; - } - - if(var16 > 192) { - var15 /= 2; - } - - if(var16 > 217) { - var15 /= 2; - } - - if(var16 > 243) { - var15 /= 2; - } - - int var17 = (var15 / 32 << 7) + var16 / 2 + (var14 / 4 << 10); - byte var19 = 96; - int var18; - if(var17 == -2) { - var18 = 12345678; + int var20; + if (var12.texture >= 0) { + var20 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var12.texture), 96); + var9 = Rasterizer3D.Rasterizer3D_colorPalette[var20] | -16777216; + } else if (var12.rgb == 16711935) { + var9 = var10; } else { - int var22; - if(var17 == -1) { - if(var19 < 0) { - var19 = 0; - } else if(var19 > 127) { - var19 = 127; - } - - var22 = 127 - var19; - var18 = var22; - } else { - var22 = var19 * (var17 & 127) / 128; - if(var22 < 2) { - var22 = 2; - } else if(var22 > 126) { - var22 = 126; - } - - var18 = var22 + (var17 & 65408); + var20 = var12.hue; + int var14 = var12.saturation; + int var15 = var12.lightness; + if (var15 > 179) { + var14 /= 2; } - } - var9 = Rasterizer3D.Rasterizer3D_colorPalette[var18] | -16777216; + if (var15 > 192) { + var14 /= 2; + } + + if (var15 > 217) { + var14 /= 2; + } + + if (var15 > 243) { + var14 /= 2; + } + + int var16 = (var14 / 32 << 7) + var15 / 2 + (var20 / 4 << 10); + byte var17 = 96; + int var18; + if (var16 == -2) { + var18 = 12345678; + } else { + int var19; + if (var16 == -1) { + if (var17 < 0) { + var17 = 0; + } else if (var17 > 127) { + var17 = 127; + } + + var19 = 127 - var17; + var18 = var19; + } else { + var19 = var17 * (var16 & 127) / 128; + if (var19 < 2) { + var19 = 2; + } else if (var19 > 126) { + var19 = 126; + } + + var18 = var19 + (var16 & 65408); + } + } + + var9 = Rasterizer3D.Rasterizer3D_colorPalette[var18] | -16777216; + } } var8 = var9; } - if(var7 > -1 && var3.field154[0][var1][var2] == 0) { - Rasterizer2D.Rasterizer2D_fillRectangle(this.__d * var1, this.__d * (63 - var2), this.__d, this.__d, var8); + if (var7 > -1 && var3.field154[0][var1][var2] == 0) { + Rasterizer2D.Rasterizer2D_fillRectangle(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, this.field1054, var8); } else { var9 = this.method541(var1, var2, var3, var5); - if(var7 == -1) { - Rasterizer2D.Rasterizer2D_fillRectangle(this.__d * var1, this.__d * (63 - var2), this.__d, this.__d, var9); + if (var7 == -1) { + Rasterizer2D.Rasterizer2D_fillRectangle(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, this.field1054, var9); } else { - var4.method743(this.__d * var1, this.__d * (63 - var2), var9, var8, this.__d, this.__d, var3.field154[0][var1][var2], var3.field155[0][var1][var2]); + var4.method743(this.field1054 * var1, this.field1054 * (63 - var2), var9, var8, this.field1054, this.field1054, var3.field154[0][var1][var2], var3.field155[0][var1][var2]); } } + } @ObfuscatedName("c") @@ -546,91 +545,94 @@ public class WorldMapRegion { garbageValue = "9" ) void method462(int var1, int var2, class21 var3, class40 var4) { - for(int var5 = 1; var5 < var3.field156; ++var5) { + for (int var5 = 1; var5 < var3.field156; ++var5) { int var6 = var3.field145[var5][var1][var2] - 1; - if(var6 > -1) { - int var8 = this.__x; - OverlayDefinition var10 = (OverlayDefinition)OverlayDefinition.__jf_f.get((long)var6); + if (var6 > -1) { + int var7 = this.field1053; + OverlayDefinition var8 = (OverlayDefinition)OverlayDefinition.field664.get((long)var6); OverlayDefinition var9; - if(var10 != null) { - var9 = var10; + if (var8 != null) { + var9 = var8; } else { - byte[] var11 = OverlayDefinition.__jf_m.takeRecord(4, var6); - var10 = new OverlayDefinition(); - if(var11 != null) { - var10.read(new Buffer(var11), var6); + byte[] var10 = OverlayDefinition.field663.takeRecord(4, var6); + var8 = new OverlayDefinition(); + if (var10 != null) { + var8.read(new Buffer(var10), var6); } - var10.init(); - OverlayDefinition.__jf_f.put(var10, (long)var6); - var9 = var10; + var8.init(); + OverlayDefinition.field664.put(var8, (long)var6); + var9 = var8; } - int var7; - if(var9 == null) { - var7 = var8; - } else if(var9.rgb2 >= 0) { - var7 = var9.rgb2 | -16777216; - } else if(var9.texture >= 0) { - int var20 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var9.texture), 96); - var7 = Rasterizer3D.Rasterizer3D_colorPalette[var20] | -16777216; - } else if(var9.rgb == 16711935) { - var7 = var8; + int var18; + if (var9 == null) { + var18 = var7; + } else if (var9.rgb2 >= 0) { + var18 = var9.rgb2 | -16777216; } else { - int var12 = var9.hue; - int var13 = var9.saturation; - int var14 = var9.lightness; - if(var14 > 179) { - var13 /= 2; - } - - if(var14 > 192) { - var13 /= 2; - } - - if(var14 > 217) { - var13 /= 2; - } - - if(var14 > 243) { - var13 /= 2; - } - - int var15 = (var13 / 32 << 7) + var14 / 2 + (var12 / 4 << 10); - byte var17 = 96; - int var16; - if(var15 == -2) { - var16 = 12345678; + int var11; + if (var9.texture >= 0) { + var11 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var9.texture), 96); + var18 = Rasterizer3D.Rasterizer3D_colorPalette[var11] | -16777216; + } else if (var9.rgb == 16711935) { + var18 = var7; } else { - int var21; - if(var15 == -1) { - if(var17 < 0) { - var17 = 0; - } else if(var17 > 127) { - var17 = 127; - } - - var21 = 127 - var17; - var16 = var21; - } else { - var21 = var17 * (var15 & 127) / 128; - if(var21 < 2) { - var21 = 2; - } else if(var21 > 126) { - var21 = 126; - } - - var16 = var21 + (var15 & 65408); + var11 = var9.hue; + int var12 = var9.saturation; + int var13 = var9.lightness; + if (var13 > 179) { + var12 /= 2; } - } - var7 = Rasterizer3D.Rasterizer3D_colorPalette[var16] | -16777216; + if (var13 > 192) { + var12 /= 2; + } + + if (var13 > 217) { + var12 /= 2; + } + + if (var13 > 243) { + var12 /= 2; + } + + int var14 = (var12 / 32 << 7) + var13 / 2 + (var11 / 4 << 10); + byte var15 = 96; + int var16; + if (var14 == -2) { + var16 = 12345678; + } else { + int var17; + if (var14 == -1) { + if (var15 < 0) { + var15 = 0; + } else if (var15 > 127) { + var15 = 127; + } + + var17 = 127 - var15; + var16 = var17; + } else { + var17 = var15 * (var14 & 127) / 128; + if (var17 < 2) { + var17 = 2; + } else if (var17 > 126) { + var17 = 126; + } + + var16 = var17 + (var14 & 65408); + } + } + + var18 = Rasterizer3D.Rasterizer3D_colorPalette[var16] | -16777216; + } } - if(var3.field154[var5][var1][var2] == 0) { - Rasterizer2D.Rasterizer2D_fillRectangle(this.__d * var1, this.__d * (63 - var2), this.__d, this.__d, var7); + if (var3.field154[var5][var1][var2] == 0) { + Rasterizer2D.Rasterizer2D_fillRectangle(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, this.field1054, var18); } else { - var4.method743(this.__d * var1, this.__d * (63 - var2), 0, var7, this.__d, this.__d, var3.field154[var5][var1][var2], var3.field155[var5][var1][var2]); + var4.method743(this.field1054 * var1, this.field1054 * (63 - var2), 0, var18, this.field1054, this.field1054, var3.field154[var5][var1][var2], var3.field155[var5][var1][var2]); } } } @@ -643,7 +645,7 @@ public class WorldMapRegion { garbageValue = "1908333009" ) int method541(int var1, int var2, class21 var3, class27 var4) { - return var3.field151[0][var1][var2] == 0?this.__x:var4.method430(var1, var2); + return var3.field151[0][var1][var2] == 0 ? this.field1053 : var4.method430(var1, var2); } @ObfuscatedName("v") @@ -652,20 +654,20 @@ public class WorldMapRegion { garbageValue = "-26219" ) void method464(int var1, int var2, class21 var3, IndexedSprite[] var4) { - for(int var5 = 0; var5 < var3.field156; ++var5) { + for (int var5 = 0; var5 < var3.field156; ++var5) { class25[] var6 = var3.field144[var5][var1][var2]; - if(var6 != null && var6.length != 0) { + if (var6 != null && var6.length != 0) { class25[] var7 = var6; - for(int var8 = 0; var8 < var7.length; ++var8) { + for (int var8 = 0; var8 < var7.length; ++var8) { class25 var9 = var7[var8]; - if(WorldMapAreaData.method711(var9.field198) || class1.method19(var9.field198)) { + if (WorldMapAreaData.method711(var9.field198) || class1.method19(var9.field198)) { ObjectDefinition var10 = class50.getObjectDefinition(var9.field199); - if(var10.mapSceneId != -1) { - if(var10.mapSceneId != 46 && var10.mapSceneId != 52) { - var4[var10.mapSceneId].__o_497(this.__d * var1, this.__d * (63 - var2), this.__d * 2, this.__d * 2); + if (var10.mapSceneId != -1) { + if (var10.mapSceneId != 46 && var10.mapSceneId != 52) { + var4[var10.mapSceneId].method135(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054 * 2, this.field1054 * 2); } else { - var4[var10.mapSceneId].__o_497(this.__d * var1, this.__d * (63 - var2), this.__d * 2 + 1, this.__d * 2 + 1); + var4[var10.mapSceneId].method135(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054 * 2 + 1, this.field1054 * 2 + 1); } } } @@ -681,55 +683,55 @@ public class WorldMapRegion { garbageValue = "-31" ) void method465(int var1, int var2, class21 var3) { - for(int var4 = 0; var4 < var3.field156; ++var4) { + for (int var4 = 0; var4 < var3.field156; ++var4) { class25[] var5 = var3.field144[var4][var1][var2]; - if(var5 != null && var5.length != 0) { + if (var5 != null && var5.length != 0) { class25[] var6 = var5; - for(int var7 = 0; var7 < var6.length; ++var7) { + for (int var7 = 0; var7 < var6.length; ++var7) { class25 var8 = var6[var7]; - int var10 = var8.field198; - boolean var9 = var10 >= class231.field2805.field2820 && var10 <= class231.field2804.field2820 || var10 == class231.field2806.field2820; - if(var9) { + int var9 = var8.field198; + boolean var10 = var9 >= class231.field2805.field2820 && var9 <= class231.field2804.field2820 || var9 == class231.field2806.field2820; + if (var10) { ObjectDefinition var11 = class50.getObjectDefinition(var8.field199); - int var12 = var11.int1 != 0?-3407872:-3355444; - if(var8.field198 == class231.field2805.field2820) { - this.__ad_58(var1, var2, var8.field202, var12); + int var12 = var11.int1 != 0 ? -3407872 : -3355444; + if (var8.field198 == class231.field2805.field2820) { + this.method422(var1, var2, var8.field202, var12); } - if(var8.field198 == class231.field2813.field2820) { - this.__ad_58(var1, var2, var8.field202, -3355444); - this.__ad_58(var1, var2, var8.field202 + 1, var12); + if (var8.field198 == class231.field2813.field2820) { + this.method422(var1, var2, var8.field202, -3355444); + this.method422(var1, var2, var8.field202 + 1, var12); } - if(var8.field198 == class231.field2804.field2820) { - if(var8.field202 == 0) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.__d * var1, this.__d * (63 - var2), 1, var12); + if (var8.field198 == class231.field2804.field2820) { + if (var8.field202 == 0) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1, this.field1054 * (63 - var2), 1, var12); } - if(var8.field202 == 1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.__d * var1 + this.__d - 1, this.__d * (63 - var2), 1, var12); + if (var8.field202 == 1) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1 + this.field1054 - 1, this.field1054 * (63 - var2), 1, var12); } - if(var8.field202 == 2) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.__d * var1 + this.__d - 1, this.__d * (63 - var2) + this.__d - 1, 1, var12); + if (var8.field202 == 2) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1 + this.field1054 - 1, this.field1054 * (63 - var2) + this.field1054 - 1, 1, var12); } - if(var8.field202 == 3) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.__d * var1, this.__d * (63 - var2) + this.__d - 1, 1, var12); + if (var8.field202 == 3) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1, this.field1054 * (63 - var2) + this.field1054 - 1, 1, var12); } } - if(var8.field198 == class231.field2806.field2820) { + if (var8.field198 == class231.field2806.field2820) { int var13 = var8.field202 % 2; int var14; - if(var13 == 0) { - for(var14 = 0; var14 < this.__d; ++var14) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.__d * var1, (64 - var2) * this.__d - 1 - var14, 1, var12); + if (var13 == 0) { + for (var14 = 0; var14 < this.field1054; ++var14) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.field1054 * var1, (64 - var2) * this.field1054 - 1 - var14, 1, var12); } } else { - for(var14 = 0; var14 < this.__d; ++var14) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.__d * var1, var14 + this.__d * (63 - var2), 1, var12); + for (var14 = 0; var14 < this.field1054; ++var14) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.field1054 * var1, var14 + this.field1054 * (63 - var2), 1, var12); } } } @@ -745,23 +747,23 @@ public class WorldMapRegion { signature = "(IILjava/util/HashSet;IB)V", garbageValue = "0" ) - void __aq_48(int var1, int var2, HashSet var3, int var4) { + void method412(int var1, int var2, HashSet var3, int var4) { float var5 = (float)var4 / 64.0F; float var6 = var5 / 2.0F; Iterator var7 = this.iconsMap.entrySet().iterator(); - while(var7.hasNext()) { + while (var7.hasNext()) { Entry var8 = (Entry)var7.next(); TileLocation var9 = (TileLocation)var8.getKey(); int var10 = (int)((float)var1 + var5 * (float)var9.x - var6); int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); - if(var12 != null && var12.__h_67()) { - var12.__e = var10; - var12.__x = var11; - WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.__m_15()); - if(!var3.contains(Integer.valueOf(var13.__g_410()))) { - this.__ar_51(var12, var10, var11, var5); + if (var12 != null && var12.method19()) { + var12.field5 = var10; + var12.field6 = var11; + WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.vmethod395()); + if (!var3.contains(var13.method390())) { + this.method415(var12, var10, var11, var5); } } } @@ -773,15 +775,15 @@ public class WorldMapRegion { signature = "(Ljava/util/HashSet;III)V", garbageValue = "781854370" ) - void __aj_49(HashSet var1, int var2, int var3) { + void method413(HashSet var1, int var2, int var3) { Iterator var4 = this.iconsList.iterator(); - while(var4.hasNext()) { + while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); - if(var5.__h_67()) { - WorldMapElement var6 = ViewportMouse.getWorldMapElement(var5.__m_15()); - if(var6 != null && var1.contains(Integer.valueOf(var6.__g_410()))) { - this.__av_50(var6, var5.__e, var5.__x, var2, var3); + if (var5.method19()) { + WorldMapElement var6 = ViewportMouse.getWorldMapElement(var5.vmethod395()); + if (var6 != null && var1.contains(var6.method390())) { + this.method414(var6, var5.field5, var5.field6, var2, var3); } } } @@ -793,16 +795,16 @@ public class WorldMapRegion { signature = "(Lic;IIIIB)V", garbageValue = "92" ) - void __av_50(WorldMapElement var1, int var2, int var3, int var4, int var5) { + void method414(WorldMapElement var1, int var2, int var3, int var4, int var5) { Sprite var6 = var1.getSprite(false); - if(var6 != null) { + if (var6 != null) { var6.drawAt2(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); - if(var4 % var5 < var5 / 2) { + if (var4 % var5 < var5 / 2) { Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); } - } + } @ObfuscatedName("ar") @@ -810,10 +812,10 @@ public class WorldMapRegion { signature = "(Lak;IIFI)V", garbageValue = "-1283733783" ) - void __ar_51(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = ViewportMouse.getWorldMapElement(var1.__m_15()); - this.__ac_52(var5, var2, var3); - this.__ay_53(var1, var5, var2, var3, var4); + void method415(AbstractWorldMapIcon var1, int var2, int var3, float var4) { + WorldMapElement var5 = ViewportMouse.getWorldMapElement(var1.vmethod395()); + this.method416(var5, var2, var3); + this.method417(var1, var5, var2, var3, var4); } @ObfuscatedName("ac") @@ -821,9 +823,9 @@ public class WorldMapRegion { signature = "(Lic;III)V", garbageValue = "423173487" ) - void __ac_52(WorldMapElement var1, int var2, int var3) { + void method416(WorldMapElement var1, int var2, int var3) { Sprite var4 = var1.getSprite(false); - if(var4 != null) { + if (var4 != null) { int var5 = this.method473(var4, var1.field3287); int var6 = this.method474(var4, var1.field3301); var4.drawAt2(var5 + var2, var3 + var6); @@ -836,14 +838,13 @@ public class WorldMapRegion { signature = "(Lak;Lic;IIFI)V", garbageValue = "-1237576843" ) - void __ay_53(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { - WorldMapLabel var6 = var1.__f_16(); - if(var6 != null) { - if(var6.size.__f_14(var5)) { - Font var7 = (Font)this.fonts.get(var6.size); - var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.__e, 0, 1, 0, var7.ascent / 2); - } + void method417(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { + WorldMapLabel var6 = var1.vmethod396(); + if (var6 != null && var6.size.method400(var5)) { + Font var7 = (Font)this.fonts.get(var6.size); + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1022, 0, 1, 0, var7.ascent / 2); } + } @ObfuscatedName("ah") @@ -851,19 +852,19 @@ public class WorldMapRegion { signature = "(IILjava/util/HashSet;IB)V", garbageValue = "-17" ) - void __ah_54(int var1, int var2, HashSet var3, int var4) { + void method418(int var1, int var2, HashSet var3, int var4) { float var5 = (float)var4 / 64.0F; Iterator var6 = this.iconsList.iterator(); - while(var6.hasNext()) { + while (var6.hasNext()) { AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); - if(var7.__h_67()) { + if (var7.method19()) { int var8 = var7.coord2.x % 64; int var9 = var7.coord2.y % 64; - var7.__e = (int)((float)var8 * var5 + (float)var1); - var7.__x = (int)(var5 * (float)(63 - var9) + (float)var2); - if(!var3.contains(Integer.valueOf(var7.__m_15()))) { - this.__ar_51(var7, var7.__e, var7.__x, var5); + var7.field5 = (int)((float)var8 * var5 + (float)var1); + var7.field6 = (int)(var5 * (float)(63 - var9) + (float)var2); + if (!var3.contains(var7.vmethod395())) { + this.method415(var7, var7.field5, var7.field6, var5); } } } @@ -907,9 +908,9 @@ public class WorldMapRegion { signature = "(II)Laj;", garbageValue = "598030754" ) - WorldMapLabel __al_55(int var1) { + WorldMapLabel method419(int var1) { WorldMapElement var2 = ViewportMouse.getWorldMapElement(var1); - return this.__ab_56(var2); + return this.method420(var2); } @ObfuscatedName("ab") @@ -917,32 +918,32 @@ public class WorldMapRegion { signature = "(Lic;B)Laj;", garbageValue = "59" ) - WorldMapLabel __ab_56(WorldMapElement var1) { - if(var1.__l != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { + WorldMapLabel method420(WorldMapElement var1) { + if (var1.field1021 != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { WorldMapLabelSize var2 = WorldMapLabelSize.method195(var1.textSize); - if(var2 == null) { + if (var2 == null) { return null; } else { Font var3 = (Font)this.fonts.get(var2); - if(var3 == null) { + if (var3 == null) { return null; } else { - int var4 = var3.lineCount(var1.__l, 1000000); + int var4 = var3.lineCount(var1.field1021, 1000000); String[] var5 = new String[var4]; - var3.breakLines(var1.__l, (int[])null, var5); + var3.breakLines(var1.field1021, (int[])null, var5); int var6 = var5.length * var3.ascent / 2; int var7 = 0; String[] var8 = var5; - for(int var9 = 0; var9 < var8.length; ++var9) { + for (int var9 = 0; var9 < var8.length; ++var9) { String var10 = var8[var9]; int var11 = var3.stringWidth(var10); - if(var11 > var7) { + if (var11 > var7) { var7 = var11; } } - return new WorldMapLabel(var1.__l, var7, var6, var2); + return new WorldMapLabel(var1.field1021, var7, var6, var2); } } } else { @@ -955,25 +956,25 @@ public class WorldMapRegion { signature = "(IIIIII)Ljava/util/List;", garbageValue = "-1237576843" ) - List __ae_57(int var1, int var2, int var3, int var4, int var5) { + List method421(int var1, int var2, int var3, int var4, int var5) { LinkedList var6 = new LinkedList(); - if(var4 >= var1 && var5 >= var2) { - if(var4 < var3 + var1 && var5 < var3 + var2) { + if (var4 >= var1 && var5 >= var2) { + if (var4 < var3 + var1 && var5 < var3 + var2) { Iterator var7 = this.iconsMap.values().iterator(); AbstractWorldMapIcon var8; - while(var7.hasNext()) { + while (var7.hasNext()) { var8 = (AbstractWorldMapIcon)var7.next(); - if(var8.__h_67() && var8.__y_66(var4, var5)) { + if (var8.method19() && var8.method18(var4, var5)) { var6.add(var8); } } var7 = this.iconsList.iterator(); - while(var7.hasNext()) { + while (var7.hasNext()) { var8 = (AbstractWorldMapIcon)var7.next(); - if(var8.__h_67() && var8.__y_66(var4, var5)) { + if (var8.method19() && var8.method18(var4, var5)) { var6.add(var8); } } @@ -1005,22 +1006,22 @@ public class WorldMapRegion { signature = "(IIIII)V", garbageValue = "-1516512827" ) - void __ad_58(int var1, int var2, int var3, int var4) { + void method422(int var1, int var2, int var3, int var4) { var3 %= 4; - if(var3 == 0) { - Rasterizer2D.Rasterizer2D_drawVerticalLine(this.__d * var1, this.__d * (63 - var2), this.__d, var4); + if (var3 == 0) { + Rasterizer2D.Rasterizer2D_drawVerticalLine(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, var4); } - if(var3 == 1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.__d * var1, this.__d * (63 - var2), this.__d, var4); + if (var3 == 1) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, var4); } - if(var3 == 2) { - Rasterizer2D.Rasterizer2D_drawVerticalLine(this.__d * var1 + this.__d - 1, this.__d * (63 - var2), this.__d, var4); + if (var3 == 2) { + Rasterizer2D.Rasterizer2D_drawVerticalLine(this.field1054 * var1 + this.field1054 - 1, this.field1054 * (63 - var2), this.field1054, var4); } - if(var3 == 3) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.__d * var1, this.__d * (63 - var2) + this.__d - 1, this.__d, var4); + if (var3 == 3) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1, this.field1054 * (63 - var2) + this.field1054 - 1, this.field1054, var4); } } @@ -1049,47 +1050,45 @@ public class WorldMapRegion { garbageValue = "597" ) 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.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { - SpriteMask var3 = var0.getSpriteMask(true); - if(var3 == null) { - return; - } - - int var4 = MouseHandler.MouseHandler_lastPressedX - var1; - int var5 = MouseHandler.MouseHandler_lastPressedY - var2; - if(var3.contains(var4, var5)) { - var4 -= var3.width / 2; - var5 -= var3.height / 2; - int var6 = Client.minimapOrientation & 2047; - int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; - int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; - int var9 = var4 * var8 + var7 * var5 >> 11; - int var10 = var5 * var8 - var4 * var7 >> 11; - int var11 = var9 + Canvas.localPlayer.x >> 7; - int var12 = Canvas.localPlayer.y - var10 >> 7; - PacketBufferNode var13 = Interpreter.method1915(ClientPacket.__gs_ba, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeByte(18); - var13.packetBuffer.__bo_322(var12 + GraphicsObject.baseY); - var13.packetBuffer.__bo_322(var11 + class50.baseX); - var13.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?(KeyHandler.KeyHandler_pressedKeys[81]?2:1):0); - var13.packetBuffer.writeByte(var4); - var13.packetBuffer.writeByte(var5); - var13.packetBuffer.writeShort(Client.minimapOrientation); - var13.packetBuffer.writeByte(57); - var13.packetBuffer.writeByte(0); - var13.packetBuffer.writeByte(0); - var13.packetBuffer.writeByte(89); - var13.packetBuffer.writeShort(Canvas.localPlayer.x); - var13.packetBuffer.writeShort(Canvas.localPlayer.y); - var13.packetBuffer.writeByte(63); - Client.packetWriter.__q_167(var13); - Client.destinationX = var11; - Client.destinationY = var12; - } + if ((Client.minimapState == 0 || Client.minimapState == 3) && !Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { + SpriteMask var3 = var0.getSpriteMask(true); + if (var3 == null) { + return; } + int var4 = MouseHandler.MouseHandler_lastPressedX - var1; + int var5 = MouseHandler.MouseHandler_lastPressedY - var2; + if (var3.contains(var4, var5)) { + var4 -= var3.width / 2; + var5 -= var3.height / 2; + int var6 = Client.minimapOrientation & 2047; + int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; + int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; + int var9 = var4 * var8 + var7 * var5 >> 11; + int var10 = var5 * var8 - var4 * var7 >> 11; + int var11 = var9 + Canvas.localPlayer.x >> 7; + int var12 = Canvas.localPlayer.y - var10 >> 7; + PacketBufferNode var13 = Interpreter.method1915(ClientPacket.field274, Client.packetWriter.isaacCipher); + var13.packetBuffer.writeByte(18); + var13.packetBuffer.method63(var12 + GraphicsObject.baseY); + var13.packetBuffer.method63(var11 + class50.baseX); + var13.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); + var13.packetBuffer.writeByte(var4); + var13.packetBuffer.writeByte(var5); + var13.packetBuffer.writeShort(Client.minimapOrientation); + var13.packetBuffer.writeByte(57); + var13.packetBuffer.writeByte(0); + var13.packetBuffer.writeByte(0); + var13.packetBuffer.writeByte(89); + var13.packetBuffer.writeShort(Canvas.localPlayer.x); + var13.packetBuffer.writeShort(Canvas.localPlayer.y); + var13.packetBuffer.writeByte(63); + Client.packetWriter.method241(var13); + Client.destinationX = var11; + Client.destinationY = var12; + } } + } @ObfuscatedName("ix") @@ -1099,32 +1098,36 @@ public class WorldMapRegion { ) @Export("notRevalidateWidgetScroll") static void notRevalidateWidgetScroll(Widget[] var0, int var1, int var2, int var3, boolean var4) { - for(int var5 = 0; var5 < var0.length; ++var5) { + for (int var5 = 0; var5 < var0.length; ++var5) { Widget var6 = var0[var5]; - if(var6 != null && var6.parentId == var1) { + if (var6 != null && var6.parentId == var1) { WorldMapSection3.alignWidgetSize(var6, var2, var3, var4); OverlayDefinition.alignWidgetPosition(var6, var2, var3); - if(var6.scrollX > var6.scrollWidth - var6.width) { + if (var6.scrollX > var6.scrollWidth - var6.width) { var6.scrollX = var6.scrollWidth - var6.width; } - if(var6.scrollX < 0) { + if (var6.scrollX < 0) { var6.scrollX = 0; } - if(var6.scrollY > var6.scrollHeight - var6.height) { + if (var6.scrollY > var6.scrollHeight - var6.height) { var6.scrollY = var6.scrollHeight - var6.height; } - if(var6.scrollY < 0) { + if (var6.scrollY < 0) { var6.scrollY = 0; } - if(var6.type == 0) { + if (var6.type == 0) { class39.revalidateWidgetScroll(var0, var6, var4); } } } } + + static { + field1051 = new DemotingHashTable(37748736, 256); + } } diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java index 6f10a54e08..a17c8d87aa 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -11,79 +11,79 @@ public class WorldMapSection0 implements WorldMapSection { @ObfuscatedGetter( intValue = -1946112139 ) - static int __y_sn; + static int field1055; @ObfuscatedName("p") - static int[] __y_p; + static int[] field1056; @ObfuscatedName("m") @ObfuscatedGetter( intValue = -2011838881 ) - int __m; + int field1057; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1299225715 ) - int __f; + int field1058; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 82600709 ) - int __q; + int field1059; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -477370575 ) - int __w; + int field1060; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -671345527 ) - int __o; + int field1061; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 529427495 ) - int __u; + int field1062; @ObfuscatedName("g") @ObfuscatedGetter( intValue = -150870205 ) - int __g; + int field1063; @ObfuscatedName("l") @ObfuscatedGetter( intValue = 1009718107 ) - int __l; + int field1064; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -1022177315 ) - int __e; + int field1065; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -1397517463 ) - int __x; + int field1066; @ObfuscatedName("d") @ObfuscatedGetter( intValue = -799353317 ) - int __d; + int field1067; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -1388959491 ) - int __k; + int field1068; @ObfuscatedName("n") @ObfuscatedGetter( intValue = -1657956317 ) - int __n; + int field1069; @ObfuscatedName("i") @ObfuscatedGetter( intValue = 1345061881 ) - int __i; + int field1070; @ObfuscatedName("m") @ObfuscatedSignature( @@ -92,20 +92,20 @@ public class WorldMapSection0 implements WorldMapSection { ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if(var1.minX0 > this.__o) { - var1.minX0 = this.__o; + if (var1.minX0 > this.field1061) { + var1.minX0 = this.field1061; } - if(var1.maxX0 < this.__o) { - var1.maxX0 = this.__o; + if (var1.maxX0 < this.field1061) { + var1.maxX0 = this.field1061; } - if(var1.minY0 > this.__u) { - var1.minY0 = this.__u; + if (var1.minY0 > this.field1062) { + var1.minY0 = this.field1062; } - if(var1.maxY0 < this.__u) { - var1.maxY0 = this.__u; + if (var1.maxY0 < this.field1062) { + var1.maxY0 = this.field1062; } } @@ -117,7 +117,7 @@ public class WorldMapSection0 implements WorldMapSection { ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - return var1 >= this.__m && var1 < this.__m + this.__f?var2 >= (this.__q << 6) + (this.__g << 3) && var2 <= (this.__q << 6) + (this.__e << 3) + 7 && var3 >= (this.__w << 6) + (this.__l << 3) && var3 <= (this.__w << 6) + (this.__x << 3) + 7:false; + return var1 >= this.field1057 && var1 < this.field1057 + this.field1058 ? var2 >= (this.field1059 << 6) + (this.field1063 << 3) && var2 <= (this.field1059 << 6) + (this.field1065 << 3) + 7 && var3 >= (this.field1060 << 6) + (this.field1064 << 3) && var3 <= (this.field1060 << 6) + (this.field1066 << 3) + 7 : false; } @ObfuscatedName("q") @@ -127,7 +127,7 @@ public class WorldMapSection0 implements WorldMapSection { ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >= (this.__o << 6) + (this.__d << 3) && var1 <= (this.__o << 6) + (this.__n << 3) + 7 && var2 >= (this.__u << 6) + (this.__k << 3) && var2 <= (this.__u << 6) + (this.__i << 3) + 7; + return var1 >= (this.field1061 << 6) + (this.field1067 << 3) && var1 <= (this.field1061 << 6) + (this.field1069 << 3) + 7 && var2 >= (this.field1062 << 6) + (this.field1068 << 3) && var2 <= (this.field1062 << 6) + (this.field1070 << 3) + 7; } @ObfuscatedName("w") @@ -137,10 +137,10 @@ public class WorldMapSection0 implements WorldMapSection { ) @Export("position") public int[] position(int var1, int var2, int var3) { - if(!this.containsCoord(var1, var2, var3)) { + if (!this.containsCoord(var1, var2, var3)) { return null; } else { - int[] var4 = new int[]{this.__o * 64 - this.__q * 64 + var2 + (this.__d * 8 - this.__g * 8), var3 + (this.__u * 64 - this.__w * 64) + (this.__k * 8 - this.__l * 8)}; + int[] var4 = new int[]{this.field1061 * 64 - this.field1059 * 64 + var2 + (this.field1067 * 8 - this.field1063 * 8), var3 + (this.field1062 * 64 - this.field1060 * 64) + (this.field1068 * 8 - this.field1064 * 8)}; return var4; } } @@ -152,12 +152,12 @@ public class WorldMapSection0 implements WorldMapSection { ) @Export("coord") public TileLocation coord(int var1, int var2) { - if(!this.containsPosition(var1, var2)) { + if (!this.containsPosition(var1, var2)) { return null; } else { - int var3 = this.__q * 64 - this.__o * 64 + (this.__g * 8 - this.__d * 8) + var1; - int var4 = this.__w * 64 - this.__u * 64 + var2 + (this.__l * 8 - this.__k * 8); - return new TileLocation(this.__m, var3, var4); + int var3 = this.field1059 * 64 - this.field1061 * 64 + (this.field1063 * 8 - this.field1067 * 8) + var1; + int var4 = this.field1060 * 64 - this.field1062 * 64 + var2 + (this.field1064 * 8 - this.field1068 * 8); + return new TileLocation(this.field1057, var3, var4); } } @@ -168,21 +168,21 @@ public class WorldMapSection0 implements WorldMapSection { ) @Export("read") public void read(Buffer var1) { - this.__m = var1.readUnsignedByte(); - this.__f = var1.readUnsignedByte(); - this.__q = var1.__ag_302(); - this.__g = var1.readUnsignedByte(); - this.__e = var1.readUnsignedByte(); - this.__w = var1.__ag_302(); - this.__l = var1.readUnsignedByte(); - this.__x = var1.readUnsignedByte(); - this.__o = var1.__ag_302(); - this.__d = var1.readUnsignedByte(); - this.__n = var1.readUnsignedByte(); - this.__u = var1.__ag_302(); - this.__k = var1.readUnsignedByte(); - this.__i = var1.readUnsignedByte(); - this.__g_25(); + this.field1057 = var1.readUnsignedByte(); + this.field1058 = var1.readUnsignedByte(); + this.field1059 = var1.method43(); + this.field1063 = var1.readUnsignedByte(); + this.field1065 = var1.readUnsignedByte(); + this.field1060 = var1.method43(); + this.field1064 = var1.readUnsignedByte(); + this.field1066 = var1.readUnsignedByte(); + this.field1061 = var1.method43(); + this.field1067 = var1.readUnsignedByte(); + this.field1069 = var1.readUnsignedByte(); + this.field1062 = var1.method43(); + this.field1068 = var1.readUnsignedByte(); + this.field1070 = var1.readUnsignedByte(); + this.method423(); } @ObfuscatedName("g") @@ -190,7 +190,7 @@ public class WorldMapSection0 implements WorldMapSection { signature = "(I)V", garbageValue = "1967186894" ) - void __g_25() { + void method423() { } @ObfuscatedName("w") @@ -207,15 +207,13 @@ public class WorldMapSection0 implements WorldMapSection { Buffer var1 = ReflectionCheck.clientPreferences.toBuffer(); var0.write(var1.array, 0, var1.index); } catch (Exception var3) { - ; } try { - if(var0 != null) { + if (var0 != null) { var0.closeSync(true); } } catch (Exception var2) { - ; } } @@ -226,7 +224,7 @@ public class WorldMapSection0 implements WorldMapSection { garbageValue = "1886145284" ) static final void method245(int var0) { - if(var0 >= 0) { + if (var0 >= 0) { int var1 = Client.menuArguments1[var0]; int var2 = Client.menuArguments2[var0]; int var3 = Client.menuOpcodes[var0]; @@ -235,6 +233,7 @@ public class WorldMapSection0 implements WorldMapSection { String var6 = Client.menuTargetNames[var0]; Actor.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } + } @ObfuscatedName("io") @@ -243,24 +242,24 @@ public class WorldMapSection0 implements WorldMapSection { garbageValue = "-1723792771" ) static final void method246(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if(Client.__client_hh) { - Client.__client_hd = 32; + if (Client.field188) { + Client.field189 = 32; } else { - Client.__client_hd = 0; + Client.field189 = 0; } - Client.__client_hh = false; + Client.field188 = false; int var7; - if(MouseHandler.MouseHandler_currentButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { - if(var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { + 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); - } else if(var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { var0.scrollY += 4; class22.method295(var0); - } else if(var5 >= var1 - Client.__client_hd && var5 < Client.__client_hd + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { + } else if (var5 >= var1 - Client.field189 && var5 < Client.field189 + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { var7 = var3 * (var3 - 32) / var4; - if(var7 < 8) { + if (var7 < 8) { var7 = 8; } @@ -268,13 +267,13 @@ public class WorldMapSection0 implements WorldMapSection { int var9 = var3 - 32 - var7; var0.scrollY = var8 * (var4 - var3) / var9; class22.method295(var0); - Client.__client_hh = true; + Client.field188 = true; } } - if(Client.mouseWheelRotation != 0) { + if (Client.mouseWheelRotation != 0) { var7 = var0.width; - if(var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { + if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { var0.scrollY += Client.mouseWheelRotation * 45; class22.method295(var0); } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index 8661c099e2..8c5859f173 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -20,7 +20,7 @@ public class WorldMapSection1 implements WorldMapSection { @ObfuscatedGetter( intValue = -1516124929 ) - static int __as_ey; + static int field1071; @ObfuscatedName("ha") @ObfuscatedGetter( intValue = 1052834531 @@ -31,52 +31,52 @@ public class WorldMapSection1 implements WorldMapSection { @ObfuscatedGetter( intValue = -1971304641 ) - int __m; + int field1072; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1483447179 ) - int __f; + int field1073; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -1875803617 ) - int __q; + int field1074; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 284566685 ) - int __w; + int field1075; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -1513010233 ) - int __o; + int field1076; @ObfuscatedName("u") @ObfuscatedGetter( intValue = -1383826035 ) - int __u; + int field1077; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 1526007343 ) - int __g; + int field1078; @ObfuscatedName("l") @ObfuscatedGetter( intValue = -890169045 ) - int __l; + int field1079; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -1797724181 ) - int __e; + int field1080; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 325777555 ) - int __x; + int field1081; @ObfuscatedName("m") @ObfuscatedSignature( @@ -85,20 +85,20 @@ public class WorldMapSection1 implements WorldMapSection { ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if(var1.minX0 > this.__o) { - var1.minX0 = this.__o; + if (var1.minX0 > this.field1076) { + var1.minX0 = this.field1076; } - if(var1.maxX0 < this.__o) { - var1.maxX0 = this.__o; + if (var1.maxX0 < this.field1076) { + var1.maxX0 = this.field1076; } - if(var1.minY0 > this.__u) { - var1.minY0 = this.__u; + if (var1.minY0 > this.field1077) { + var1.minY0 = this.field1077; } - if(var1.maxY0 < this.__u) { - var1.maxY0 = this.__u; + if (var1.maxY0 < this.field1077) { + var1.maxY0 = this.field1077; } } @@ -110,7 +110,7 @@ public class WorldMapSection1 implements WorldMapSection { ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - return var1 >= this.__m && var1 < this.__m + this.__f?var2 >= (this.__q << 6) + (this.__g << 3) && var2 <= (this.__q << 6) + (this.__g << 3) + 7 && var3 >= (this.__w << 6) + (this.__l << 3) && var3 <= (this.__w << 6) + (this.__l << 3) + 7:false; + return var1 >= this.field1072 && var1 < this.field1072 + this.field1073 ? var2 >= (this.field1074 << 6) + (this.field1078 << 3) && var2 <= (this.field1074 << 6) + (this.field1078 << 3) + 7 && var3 >= (this.field1075 << 6) + (this.field1079 << 3) && var3 <= (this.field1075 << 6) + (this.field1079 << 3) + 7 : false; } @ObfuscatedName("q") @@ -120,7 +120,7 @@ public class WorldMapSection1 implements WorldMapSection { ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >= (this.__o << 6) + (this.__e << 3) && var1 <= (this.__o << 6) + (this.__e << 3) + 7 && var2 >= (this.__u << 6) + (this.__x << 3) && var2 <= (this.__u << 6) + (this.__x << 3) + 7; + return var1 >= (this.field1076 << 6) + (this.field1080 << 3) && var1 <= (this.field1076 << 6) + (this.field1080 << 3) + 7 && var2 >= (this.field1077 << 6) + (this.field1081 << 3) && var2 <= (this.field1077 << 6) + (this.field1081 << 3) + 7; } @ObfuscatedName("w") @@ -130,10 +130,10 @@ public class WorldMapSection1 implements WorldMapSection { ) @Export("position") public int[] position(int var1, int var2, int var3) { - if(!this.containsCoord(var1, var2, var3)) { + if (!this.containsCoord(var1, var2, var3)) { return null; } else { - int[] var4 = new int[]{this.__o * 64 - this.__q * 64 + var2 + (this.__e * 8 - this.__g * 8), var3 + (this.__u * 64 - this.__w * 64) + (this.__x * 8 - this.__l * 8)}; + int[] var4 = new int[]{this.field1076 * 64 - this.field1074 * 64 + var2 + (this.field1080 * 8 - this.field1078 * 8), var3 + (this.field1077 * 64 - this.field1075 * 64) + (this.field1081 * 8 - this.field1079 * 8)}; return var4; } } @@ -145,12 +145,12 @@ public class WorldMapSection1 implements WorldMapSection { ) @Export("coord") public TileLocation coord(int var1, int var2) { - if(!this.containsPosition(var1, var2)) { + if (!this.containsPosition(var1, var2)) { return null; } else { - int var3 = this.__q * 64 - this.__o * 64 + (this.__g * 8 - this.__e * 8) + var1; - int var4 = this.__w * 64 - this.__u * 64 + var2 + (this.__l * 8 - this.__x * 8); - return new TileLocation(this.__m, var3, var4); + int var3 = this.field1074 * 64 - this.field1076 * 64 + (this.field1078 * 8 - this.field1080 * 8) + var1; + int var4 = this.field1075 * 64 - this.field1077 * 64 + var2 + (this.field1079 * 8 - this.field1081 * 8); + return new TileLocation(this.field1072, var3, var4); } } @@ -161,17 +161,17 @@ public class WorldMapSection1 implements WorldMapSection { ) @Export("read") public void read(Buffer var1) { - this.__m = var1.readUnsignedByte(); - this.__f = var1.readUnsignedByte(); - this.__q = var1.__ag_302(); - this.__g = var1.readUnsignedByte(); - this.__w = var1.__ag_302(); - this.__l = var1.readUnsignedByte(); - this.__o = var1.__ag_302(); - this.__e = var1.readUnsignedByte(); - this.__u = var1.__ag_302(); - this.__x = var1.readUnsignedByte(); - this.__g_84(); + this.field1072 = var1.readUnsignedByte(); + this.field1073 = var1.readUnsignedByte(); + this.field1074 = var1.method43(); + this.field1078 = var1.readUnsignedByte(); + this.field1075 = var1.method43(); + this.field1079 = var1.readUnsignedByte(); + this.field1076 = var1.method43(); + this.field1080 = var1.readUnsignedByte(); + this.field1077 = var1.method43(); + this.field1081 = var1.readUnsignedByte(); + this.method424(); } @ObfuscatedName("g") @@ -179,7 +179,7 @@ public class WorldMapSection1 implements WorldMapSection { signature = "(I)V", garbageValue = "2026323437" ) - void __g_84() { + void method424() { } @ObfuscatedName("m") @@ -190,12 +190,12 @@ public class WorldMapSection1 implements WorldMapSection { @Export("getKitDefinition") public static KitDefinition getKitDefinition(int var0) { KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); - if(var1 != null) { + if (var1 != null) { return var1; } else { byte[] var2 = KitDefinition.KitDefinition_indexCache.takeRecord(3, var0); var1 = new KitDefinition(); - if(var2 != null) { + if (var2 != null) { var1.read(new Buffer(var2)); } @@ -212,20 +212,20 @@ public class WorldMapSection1 implements WorldMapSection { static void method808() { Client.mouseLastLastPressedTimeMillis = 1L; Projectile.mouseRecorder.index = 0; - class230.__hy_az = true; - Client.__client_cw = true; - Client.__client_pp = -1L; + class230.field1138 = true; + Client.field166 = true; + Client.field126 = -1L; class68.method1694(); - Client.packetWriter.__m_165(); + Client.packetWriter.method239(); Client.packetWriter.packetBuffer.index = 0; Client.packetWriter.serverPacket0 = null; - Client.packetWriter.__k = null; - Client.packetWriter.__n = null; - Client.packetWriter.__i = null; + Client.packetWriter.field676 = null; + Client.packetWriter.field677 = null; + Client.packetWriter.field678 = null; Client.packetWriter.serverPacket0Length = 0; - Client.packetWriter.__x = 0; + Client.packetWriter.field674 = 0; Client.rebootTimer = 0; - Client.__client_fd = 0; + Client.field175 = 0; Client.hintArrowType = 0; Client.menuOptionsCount = 0; Client.isMenuOpen = false; @@ -238,7 +238,7 @@ public class WorldMapSection1 implements WorldMapSection { Client.oculusOrbState = 0; ClientParameter.field3645 = null; Client.minimapState = 0; - Client.__client_ph = -1; + Client.field125 = -1; Client.destinationX = 0; Client.destinationY = 0; Client.playerAttackOption = AttackOption.AttackOption_hidden; @@ -247,16 +247,16 @@ public class WorldMapSection1 implements WorldMapSection { Players.Players_count = 0; int var0; - for(var0 = 0; var0 < 2048; ++var0) { - Players.__cq_o[var0] = null; - Players.__cq_w[var0] = 1; + for (var0 = 0; var0 < 2048; ++var0) { + Players.field733[var0] = null; + Players.field732[var0] = 1; } - for(var0 = 0; var0 < 2048; ++var0) { + for (var0 = 0; var0 < 2048; ++var0) { Client.players[var0] = null; } - for(var0 = 0; var0 < 32768; ++var0) { + for (var0 = 0; var0 < 32768; ++var0) { Client.npcs[var0] = null; } @@ -264,20 +264,20 @@ public class WorldMapSection1 implements WorldMapSection { Client.projectiles.clear(); Client.graphicsObjects.clear(); - for(var0 = 0; var0 < 4; ++var0) { - for(int var1 = 0; var1 < 104; ++var1) { - for(int var2 = 0; var2 < 104; ++var2) { + for (var0 = 0; var0 < 4; ++var0) { + for (int var1 = 0; var1 < 104; ++var1) { + for (int var2 = 0; var2 < 104; ++var2) { Client.groundItems[var0][var1][var2] = null; } } } - Client.__client_kh = new NodeDeque(); + Client.field214 = new NodeDeque(); WorldMapArea.friendSystem.clear(); - for(var0 = 0; var0 < VarpDefinition.__ix_f; ++var0) { + for (var0 = 0; var0 < VarpDefinition.field944; ++var0) { VarpDefinition var3 = SecureRandomCallable.method1140(var0); - if(var3 != null) { + if (var3 != null) { Varps.Varps_temp[var0] = 0; Varps.Varps_main[var0] = 0; } @@ -285,22 +285,22 @@ public class WorldMapSection1 implements WorldMapSection { class196.varcs.clearTransient(); Client.followerIndex = -1; - if(Client.rootWidgetGroup != -1) { + if (Client.rootWidgetGroup != -1) { AbstractByteArrayCopier.unloadWidgetGroup(Client.rootWidgetGroup); } - for(WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.first(); var4 != null; var4 = (WidgetGroupParent)Client.widgetGroupParents.next()) { + for (WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.first(); var4 != null; var4 = (WidgetGroupParent)Client.widgetGroupParents.next()) { MenuAction.closeWidgetGroup(var4, true); } Client.rootWidgetGroup = -1; Client.widgetGroupParents = new NodeHashTable(8); - Client.__client_mo = null; + Client.field127 = null; Client.menuOptionsCount = 0; Client.isMenuOpen = false; - Client.__client_ru.__m_385((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); + Client.field119.method256((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); - for(var0 = 0; var0 < 8; ++var0) { + for (var0 = 0; var0 < 8; ++var0) { Client.playerMenuActions[var0] = null; Client.playerOptionsPriorities[var0] = false; } @@ -308,14 +308,14 @@ public class WorldMapSection1 implements WorldMapSection { SpriteMask.method4389(); Client.isLoading = true; - for(var0 = 0; var0 < 100; ++var0) { - Client.__client_od[var0] = true; + for (var0 = 0; var0 < 100; ++var0) { + Client.field100[var0] = true; } AbstractByteArrayCopier.method4024(); PacketWriter.clanChat = null; - for(var0 = 0; var0 < 8; ++var0) { + for (var0 = 0; var0 < 8; ++var0) { Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index ce26f97738..593ff56c98 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { @ObfuscatedName("l") - static int[] __ah_l; + static int[] field1082; @ObfuscatedName("j") @Export("cacheDirectoryLocations") public static String[] cacheDirectoryLocations; @@ -16,32 +16,32 @@ public class WorldMapSection2 implements WorldMapSection { @ObfuscatedGetter( intValue = -1561552223 ) - int __m; + int field1083; @ObfuscatedName("f") @ObfuscatedGetter( intValue = -245382089 ) - int __f; + int field1084; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -1024859679 ) - int __q; + int field1085; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 40495485 ) - int __w; + int field1086; @ObfuscatedName("o") @ObfuscatedGetter( intValue = 982234927 ) - int __o; + int field1087; @ObfuscatedName("u") @ObfuscatedGetter( intValue = -1272330125 ) - int __u; + int field1088; @ObfuscatedName("m") @ObfuscatedSignature( @@ -50,20 +50,20 @@ public class WorldMapSection2 implements WorldMapSection { ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if(var1.minX0 > this.__o) { - var1.minX0 = this.__o; + if (var1.minX0 > this.field1087) { + var1.minX0 = this.field1087; } - if(var1.maxX0 < this.__o) { - var1.maxX0 = this.__o; + if (var1.maxX0 < this.field1087) { + var1.maxX0 = this.field1087; } - if(var1.minY0 > this.__u) { - var1.minY0 = this.__u; + if (var1.minY0 > this.field1088) { + var1.minY0 = this.field1088; } - if(var1.maxY0 < this.__u) { - var1.maxY0 = this.__u; + if (var1.maxY0 < this.field1088) { + var1.maxY0 = this.field1088; } } @@ -75,7 +75,7 @@ public class WorldMapSection2 implements WorldMapSection { ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - return var1 >= this.__m && var1 < this.__m + this.__f?var2 >> 6 == this.__q && var3 >> 6 == this.__w:false; + return var1 >= this.field1083 && var1 < this.field1083 + this.field1084 ? var2 >> 6 == this.field1085 && var3 >> 6 == this.field1086 : false; } @ObfuscatedName("q") @@ -85,7 +85,7 @@ public class WorldMapSection2 implements WorldMapSection { ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 == this.__o && var2 >> 6 == this.__u; + return var1 >> 6 == this.field1087 && var2 >> 6 == this.field1088; } @ObfuscatedName("w") @@ -95,10 +95,10 @@ public class WorldMapSection2 implements WorldMapSection { ) @Export("position") public int[] position(int var1, int var2, int var3) { - if(!this.containsCoord(var1, var2, var3)) { + if (!this.containsCoord(var1, var2, var3)) { return null; } else { - int[] var4 = new int[]{this.__o * 64 - this.__q * 64 + var2, var3 + (this.__u * 64 - this.__w * 64)}; + int[] var4 = new int[]{this.field1087 * 64 - this.field1085 * 64 + var2, var3 + (this.field1088 * 64 - this.field1086 * 64)}; return var4; } } @@ -110,12 +110,12 @@ public class WorldMapSection2 implements WorldMapSection { ) @Export("coord") public TileLocation coord(int var1, int var2) { - if(!this.containsPosition(var1, var2)) { + if (!this.containsPosition(var1, var2)) { return null; } else { - int var3 = this.__q * 64 - this.__o * 64 + var1; - int var4 = this.__w * 64 - this.__u * 64 + var2; - return new TileLocation(this.__m, var3, var4); + int var3 = this.field1085 * 64 - this.field1087 * 64 + var1; + int var4 = this.field1086 * 64 - this.field1088 * 64 + var2; + return new TileLocation(this.field1083, var3, var4); } } @@ -126,13 +126,13 @@ public class WorldMapSection2 implements WorldMapSection { ) @Export("read") public void read(Buffer var1) { - this.__m = var1.readUnsignedByte(); - this.__f = var1.readUnsignedByte(); - this.__q = var1.__ag_302(); - this.__w = var1.__ag_302(); - this.__o = var1.__ag_302(); - this.__u = var1.__ag_302(); - this.__g_65(); + this.field1083 = var1.readUnsignedByte(); + this.field1084 = var1.readUnsignedByte(); + this.field1085 = var1.method43(); + this.field1086 = var1.method43(); + this.field1087 = var1.method43(); + this.field1088 = var1.method43(); + this.method425(); } @ObfuscatedName("g") @@ -140,7 +140,7 @@ public class WorldMapSection2 implements WorldMapSection { signature = "(I)V", garbageValue = "-1602858772" ) - void __g_65() { + void method425() { } @ObfuscatedName("m") @@ -163,105 +163,104 @@ public class WorldMapSection2 implements WorldMapSection { signature = "(IILfe;Lfy;I)Z", garbageValue = "-2025028346" ) - static final boolean method593(int srcX, int srcY, RouteStrategy strategy, CollisionMap collisionMap) { - int var4 = srcX; - int var5 = srcY; + static final boolean method593(int var0, int var1, RouteStrategy var2, CollisionMap var3) { + int var4 = var0; + int var5 = var1; byte var6 = 64; byte var7 = 64; - int graphBaseX = srcX - var6; - int graphBaseY = srcY - var7; + int var8 = var0 - var6; + int var9 = var1 - var7; class178.directions[var6][var7] = 99; class178.distances[var6][var7] = 0; byte var10 = 0; int var11 = 0; - class178.bufferX[var10] = srcX; - byte var10001 = var10; - int var18 = var10 + 1; - class178.bufferY[var10001] = srcY; - int[][] var12 = collisionMap.flags; + class178.bufferX[var10] = var0; + int var13 = var10 + 1; + class178.bufferY[var10] = var1; + int[][] var14 = var3.flags; - while(var18 != var11) { + while (var13 != var11) { var4 = class178.bufferX[var11]; var5 = class178.bufferY[var11]; var11 = var11 + 1 & 4095; - 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; + int var15 = var4 - var8; + int var16 = var5 - var9; + int var17 = var4 - var3.xInset; + int var18 = var5 - var3.yInset; + if (var2.vmethod3644(2, var4, var5, var3)) { + WidgetGroupParent.field986 = var4; + UrlRequester.field929 = var5; return true; } - 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.directions[var16 - 1][var17] = 2; - class178.distances[var16 - 1][var17] = var15; + int var19 = class178.distances[var15][var16] + 1; + if (var15 > 0 && class178.directions[var15 - 1][var16] == 0 && (var14[var17 - 1][var18] & 19136782) == 0 && (var14[var17 - 1][var18 + 1] & 19136824) == 0) { + class178.bufferX[var13] = var4 - 1; + class178.bufferY[var13] = var5; + var13 = var13 + 1 & 4095; + class178.directions[var15 - 1][var16] = 2; + class178.distances[var15 - 1][var16] = var19; } - 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.directions[var16 + 1][var17] = 8; - class178.distances[var16 + 1][var17] = var15; + if (var15 < 126 && class178.directions[var15 + 1][var16] == 0 && (var14[var17 + 2][var18] & 19136899) == 0 && (var14[var17 + 2][var18 + 1] & 19136992) == 0) { + class178.bufferX[var13] = var4 + 1; + class178.bufferY[var13] = var5; + var13 = var13 + 1 & 4095; + class178.directions[var15 + 1][var16] = 8; + class178.distances[var15 + 1][var16] = var19; } - 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.directions[var16][var17 - 1] = 1; - class178.distances[var16][var17 - 1] = var15; + if (var16 > 0 && class178.directions[var15][var16 - 1] == 0 && (var14[var17][var18 - 1] & 19136782) == 0 && (var14[var17 + 1][var18 - 1] & 19136899) == 0) { + class178.bufferX[var13] = var4; + class178.bufferY[var13] = var5 - 1; + var13 = var13 + 1 & 4095; + class178.directions[var15][var16 - 1] = 1; + class178.distances[var15][var16 - 1] = var19; } - 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.directions[var16][var17 + 1] = 4; - class178.distances[var16][var17 + 1] = var15; + if (var16 < 126 && class178.directions[var15][var16 + 1] == 0 && (var14[var17][var18 + 2] & 19136824) == 0 && (var14[var17 + 1][var18 + 2] & 19136992) == 0) { + class178.bufferX[var13] = var4; + class178.bufferY[var13] = var5 + 1; + var13 = var13 + 1 & 4095; + class178.directions[var15][var16 + 1] = 4; + class178.distances[var15][var16 + 1] = var19; } - 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.directions[var16 - 1][var17 - 1] = 3; - class178.distances[var16 - 1][var17 - 1] = var15; + if (var15 > 0 && var16 > 0 && class178.directions[var15 - 1][var16 - 1] == 0 && (var14[var17 - 1][var18] & 19136830) == 0 && (var14[var17 - 1][var18 - 1] & 19136782) == 0 && (var14[var17][var18 - 1] & 19136911) == 0) { + class178.bufferX[var13] = var4 - 1; + class178.bufferY[var13] = var5 - 1; + var13 = var13 + 1 & 4095; + class178.directions[var15 - 1][var16 - 1] = 3; + class178.distances[var15 - 1][var16 - 1] = var19; } - 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.directions[var16 + 1][var17 - 1] = 9; - class178.distances[var16 + 1][var17 - 1] = var15; + if (var15 < 126 && var16 > 0 && class178.directions[var15 + 1][var16 - 1] == 0 && (var14[var17 + 1][var18 - 1] & 19136911) == 0 && (var14[var17 + 2][var18 - 1] & 19136899) == 0 && (var14[var17 + 2][var18] & 19136995) == 0) { + class178.bufferX[var13] = var4 + 1; + class178.bufferY[var13] = var5 - 1; + var13 = var13 + 1 & 4095; + class178.directions[var15 + 1][var16 - 1] = 9; + class178.distances[var15 + 1][var16 - 1] = var19; } - 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.directions[var16 - 1][var17 + 1] = 6; - class178.distances[var16 - 1][var17 + 1] = var15; + if (var15 > 0 && var16 < 126 && class178.directions[var15 - 1][var16 + 1] == 0 && (var14[var17 - 1][var18 + 1] & 19136830) == 0 && (var14[var17 - 1][var18 + 2] & 19136824) == 0 && (var14[var17][var18 + 2] & 19137016) == 0) { + class178.bufferX[var13] = var4 - 1; + class178.bufferY[var13] = var5 + 1; + var13 = var13 + 1 & 4095; + class178.directions[var15 - 1][var16 + 1] = 6; + class178.distances[var15 - 1][var16 + 1] = var19; } - 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.directions[var16 + 1][var17 + 1] = 12; - class178.distances[var16 + 1][var17 + 1] = var15; + if (var15 < 126 && var16 < 126 && class178.directions[var15 + 1][var16 + 1] == 0 && (var14[var17 + 1][var18 + 2] & 19137016) == 0 && (var14[var17 + 2][var18 + 2] & 19136992) == 0 && (var14[var17 + 2][var18 + 1] & 19136995) == 0) { + class178.bufferX[var13] = var4 + 1; + class178.bufferY[var13] = var5 + 1; + var13 = var13 + 1 & 4095; + class178.directions[var15 + 1][var16 + 1] = 12; + class178.distances[var15 + 1][var16 + 1] = var19; } } - WidgetGroupParent.__bx_o = var4; - UrlRequester.__eo_u = var5; + WidgetGroupParent.field986 = var4; + UrlRequester.field929 = var5; return false; } @@ -276,30 +275,30 @@ public class WorldMapSection2 implements WorldMapSection { boolean var4 = false; Username var5 = new Username(var1, KeyHandler.loginType); - for(int var6 = 0; var6 < var2; ++var6) { + 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(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); + if (var0 == 1) { + var8 = Interpreter.method1915(ClientPacket.field269, Client.packetWriter.isaacCipher); var8.packetBuffer.writeShort(var3[var6]); - var8.packetBuffer.__ai_315(0); - Client.packetWriter.__q_167(var8); - } else if(var0 == 4) { - var8 = Interpreter.method1915(ClientPacket.__gs_aq, Client.packetWriter.isaacCipher); - var8.packetBuffer.__bx_323(var3[var6]); - var8.packetBuffer.__ai_315(0); - Client.packetWriter.__q_167(var8); - } else if(var0 == 6) { - var8 = Interpreter.method1915(ClientPacket.__gs_cf, Client.packetWriter.isaacCipher); - var8.packetBuffer.__bo_322(var3[var6]); - var8.packetBuffer.__ba_316(0); - Client.packetWriter.__q_167(var8); - } else if(var0 == 7) { - var8 = Interpreter.method1915(ClientPacket.__gs_be, Client.packetWriter.isaacCipher); - var8.packetBuffer.__ba_316(0); + var8.packetBuffer.method56(0); + Client.packetWriter.method241(var8); + } else if (var0 == 4) { + var8 = Interpreter.method1915(ClientPacket.field249, Client.packetWriter.isaacCipher); + var8.packetBuffer.method64(var3[var6]); + var8.packetBuffer.method56(0); + Client.packetWriter.method241(var8); + } else if (var0 == 6) { + var8 = Interpreter.method1915(ClientPacket.field315, Client.packetWriter.isaacCipher); + var8.packetBuffer.method63(var3[var6]); + var8.packetBuffer.method57(0); + Client.packetWriter.method241(var8); + } else if (var0 == 7) { + var8 = Interpreter.method1915(ClientPacket.field297, Client.packetWriter.isaacCipher); + var8.packetBuffer.method57(0); var8.packetBuffer.writeShortLE(var3[var6]); - Client.packetWriter.__q_167(var8); + Client.packetWriter.method241(var8); } var4 = true; @@ -307,7 +306,7 @@ public class WorldMapSection2 implements WorldMapSection { } } - if(!var4) { + if (!var4) { WorldMapIcon1.method219(4, "", "Unable to find " + var1); } diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java index 77c5862ad7..674ae00ca1 100644 --- a/runescape-client/src/main/java/WorldMapSection3.java +++ b/runescape-client/src/main/java/WorldMapSection3.java @@ -20,57 +20,57 @@ public class WorldMapSection3 implements WorldMapSection { @ObfuscatedGetter( intValue = -948290091 ) - static int __p_go; + static int field1089; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 1389733201 ) - int __m; + int field1090; @ObfuscatedName("f") @ObfuscatedGetter( intValue = -1622972483 ) - int __f; + int field1091; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 702057599 ) - int __q; + int field1092; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -1068088609 ) - int __w; + int field1093; @ObfuscatedName("o") @ObfuscatedGetter( intValue = 1257151629 ) - int __o; + int field1094; @ObfuscatedName("u") @ObfuscatedGetter( intValue = -1351623663 ) - int __u; + int field1095; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 1016557381 ) - int __g; + int field1096; @ObfuscatedName("l") @ObfuscatedGetter( intValue = 884736611 ) - int __l; + int field1097; @ObfuscatedName("e") @ObfuscatedGetter( intValue = 395786901 ) - int __e; + int field1098; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -627081155 ) - int __x; + int field1099; @ObfuscatedName("m") @ObfuscatedSignature( @@ -79,20 +79,20 @@ public class WorldMapSection3 implements WorldMapSection { ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if(var1.minX0 > this.__g) { - var1.minX0 = this.__g; + if (var1.minX0 > this.field1096) { + var1.minX0 = this.field1096; } - if(var1.maxX0 < this.__e) { - var1.maxX0 = this.__e; + if (var1.maxX0 < this.field1098) { + var1.maxX0 = this.field1098; } - if(var1.minY0 > this.__l) { - var1.minY0 = this.__l; + if (var1.minY0 > this.field1097) { + var1.minY0 = this.field1097; } - if(var1.maxY0 < this.__x) { - var1.maxY0 = this.__x; + if (var1.maxY0 < this.field1099) { + var1.maxY0 = this.field1099; } } @@ -104,7 +104,7 @@ public class WorldMapSection3 implements WorldMapSection { ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - return var1 >= this.__m && var1 < this.__m + this.__f?var2 >> 6 >= this.__q && var2 >> 6 <= this.__o && var3 >> 6 >= this.__w && var3 >> 6 <= this.__u:false; + return var1 >= this.field1090 && var1 < this.field1090 + this.field1091 ? var2 >> 6 >= this.field1092 && var2 >> 6 <= this.field1094 && var3 >> 6 >= this.field1093 && var3 >> 6 <= this.field1095 : false; } @ObfuscatedName("q") @@ -114,7 +114,7 @@ public class WorldMapSection3 implements WorldMapSection { ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.__g && var1 >> 6 <= this.__e && var2 >> 6 >= this.__l && var2 >> 6 <= this.__x; + return var1 >> 6 >= this.field1096 && var1 >> 6 <= this.field1098 && var2 >> 6 >= this.field1097 && var2 >> 6 <= this.field1099; } @ObfuscatedName("w") @@ -124,10 +124,10 @@ public class WorldMapSection3 implements WorldMapSection { ) @Export("position") public int[] position(int var1, int var2, int var3) { - if(!this.containsCoord(var1, var2, var3)) { + if (!this.containsCoord(var1, var2, var3)) { return null; } else { - int[] var4 = new int[]{this.__g * 64 - this.__q * 64 + var2, var3 + (this.__l * 64 - this.__w * 64)}; + int[] var4 = new int[]{this.field1096 * 64 - this.field1092 * 64 + var2, var3 + (this.field1097 * 64 - this.field1093 * 64)}; return var4; } } @@ -139,12 +139,12 @@ public class WorldMapSection3 implements WorldMapSection { ) @Export("coord") public TileLocation coord(int var1, int var2) { - if(!this.containsPosition(var1, var2)) { + if (!this.containsPosition(var1, var2)) { return null; } else { - int var3 = this.__q * 64 - this.__g * 64 + var1; - int var4 = this.__w * 64 - this.__l * 64 + var2; - return new TileLocation(this.__m, var3, var4); + int var3 = this.field1092 * 64 - this.field1096 * 64 + var1; + int var4 = this.field1093 * 64 - this.field1097 * 64 + var2; + return new TileLocation(this.field1090, var3, var4); } } @@ -155,17 +155,17 @@ public class WorldMapSection3 implements WorldMapSection { ) @Export("read") public void read(Buffer var1) { - this.__m = var1.readUnsignedByte(); - this.__f = var1.readUnsignedByte(); - this.__q = var1.__ag_302(); - this.__w = var1.__ag_302(); - this.__o = var1.__ag_302(); - this.__u = var1.__ag_302(); - this.__g = var1.__ag_302(); - this.__l = var1.__ag_302(); - this.__e = var1.__ag_302(); - this.__x = var1.__ag_302(); - this.__g_38(); + this.field1090 = var1.readUnsignedByte(); + this.field1091 = var1.readUnsignedByte(); + this.field1092 = var1.method43(); + this.field1093 = var1.method43(); + this.field1094 = var1.method43(); + this.field1095 = var1.method43(); + this.field1096 = var1.method43(); + this.field1097 = var1.method43(); + this.field1098 = var1.method43(); + this.field1099 = var1.method43(); + this.method426(); } @ObfuscatedName("g") @@ -173,7 +173,7 @@ public class WorldMapSection3 implements WorldMapSection { signature = "(B)V", garbageValue = "-126" ) - void __g_38() { + void method426() { } @ObfuscatedName("d") @@ -182,14 +182,14 @@ public class WorldMapSection3 implements WorldMapSection { garbageValue = "1115233428" ) static final void method345(Widget var0, int var1) { - if(var0.__cf == null) { + if (var0.field966 == null) { throw new RuntimeException(); } else { - if(var0.__fh == null) { - var0.__fh = new int[var0.__cf.length]; + if (var0.field984 == null) { + var0.field984 = new int[var0.field966.length]; } - var0.__fh[var1] = Integer.MAX_VALUE; + var0.field984[var1] = Integer.MAX_VALUE; } } @@ -200,22 +200,20 @@ public class WorldMapSection3 implements WorldMapSection { ) @Export("runWidgetOnLoadListener") static void runWidgetOnLoadListener(int var0) { - if(var0 != -1) { - if(GroundItemPile.loadWidgetGroup(var0)) { - Widget[] var1 = Widget.widgets[var0]; + if (var0 != -1 && GroundItemPile.loadWidgetGroup(var0)) { + Widget[] var1 = Widget.widgets[var0]; - for(int var2 = 0; var2 < var1.length; ++var2) { - Widget var3 = var1[var2]; - if(var3.onLoad != null) { - ScriptEvent var4 = new ScriptEvent(); - var4.widget = var3; - var4.args0 = var3.onLoad; - GrandExchangeEvent.runScript0(var4, 5000000); - } + for (int var2 = 0; var2 < var1.length; ++var2) { + Widget var3 = var1[var2]; + if (var3.onLoad != null) { + ScriptEvent var4 = new ScriptEvent(); + var4.widget = var3; + var4.args0 = var3.onLoad; + GrandExchangeEvent.runScript0(var4, 5000000); } - } } + } @ObfuscatedName("ic") @@ -227,38 +225,38 @@ public class WorldMapSection3 implements WorldMapSection { static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { int var4 = var0.width; int var5 = var0.height; - if(var0.widthAlignment == 0) { + if (var0.widthAlignment == 0) { var0.width = var0.rawWidth; - } else if(var0.widthAlignment == 1) { + } else if (var0.widthAlignment == 1) { var0.width = var1 - var0.rawWidth; - } else if(var0.widthAlignment == 2) { + } else if (var0.widthAlignment == 2) { var0.width = var0.rawWidth * var1 >> 14; } - if(var0.heightAlignment == 0) { + if (var0.heightAlignment == 0) { var0.height = var0.rawHeight; - } else if(var0.heightAlignment == 1) { + } else if (var0.heightAlignment == 1) { var0.height = var2 - var0.rawHeight; - } else if(var0.heightAlignment == 2) { + } else if (var0.heightAlignment == 2) { var0.height = var2 * var0.rawHeight >> 14; } - if(var0.widthAlignment == 4) { - var0.width = var0.height * var0.__aw / var0.__al; + if (var0.widthAlignment == 4) { + var0.width = var0.height * var0.field958 / var0.field959; } - if(var0.heightAlignment == 4) { - var0.height = var0.width * var0.__al / var0.__aw; + if (var0.heightAlignment == 4) { + var0.height = var0.width * var0.field959 / var0.field958; } - if(var0.contentType == 1337) { + if (var0.contentType == 1337) { Client.viewportWidget = var0; } - if(var3 && var0.__ee != null && (var4 != var0.width || var5 != var0.height)) { + if (var3 && var0.field975 != null && (var4 != var0.width || var5 != var0.height)) { ScriptEvent var6 = new ScriptEvent(); var6.widget = var0; - var6.args0 = var0.__ee; + var6.args0 = var0.field975; Client.scriptEvents.addFirst(var6); } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index 25bac17559..9e31cd962e 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -12,22 +12,23 @@ public enum WorldMapSectionType implements Enumerated { @ObfuscatedSignature( signature = "Lh;" ) - __h_m(1, (byte)0), + field1100(1, (byte)0), @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lh;" ) - __h_f(0, (byte)1), + field1101(0, (byte)1), @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lh;" ) - __h_q(3, (byte)2), + field1102(3, (byte)2), @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lh;" ) - __h_w(2, (byte)3); + field1103(2, (byte)3); + @ObfuscatedName("e") @ObfuscatedSignature( signature = "Llq;" @@ -35,7 +36,7 @@ public enum WorldMapSectionType implements Enumerated { @Export("logoSprite") static IndexedSprite logoSprite; @ObfuscatedName("n") - static int[] __h_n; + static int[] field1104; @ObfuscatedName("gc") @ObfuscatedSignature( signature = "[Llq;" @@ -52,7 +53,7 @@ public enum WorldMapSectionType implements Enumerated { @Export("id") final byte id; - WorldMapSectionType(int var3, byte var4) { + private WorldMapSectionType(int var3, byte var4) { this.type = var3; this.id = var4; } @@ -69,15 +70,15 @@ public enum WorldMapSectionType implements Enumerated { @ObfuscatedName("m") public static String method252(long var0) { - class211.__hg_q.setTime(new Date(var0)); - int var2 = class211.__hg_q.get(7); - int var3 = class211.__hg_q.get(5); - int var4 = class211.__hg_q.get(2); - int var5 = class211.__hg_q.get(1); - int var6 = class211.__hg_q.get(11); - int var7 = class211.__hg_q.get(12); - int var8 = class211.__hg_q.get(13); - return class211.__hg_f[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + class211.__hg_m[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; + class211.field1126.setTime(new Date(var0)); + int var2 = class211.field1126.get(7); + int var3 = class211.field1126.get(5); + int var4 = class211.field1126.get(2); + int var5 = class211.field1126.get(1); + int var6 = class211.field1126.get(11); + int var7 = class211.field1126.get(12); + int var8 = class211.field1126.get(13); + return class211.field1125[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + class211.field1124[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; } @ObfuscatedName("w") @@ -86,7 +87,7 @@ public enum WorldMapSectionType implements Enumerated { garbageValue = "2102950996" ) static void method248(int var0, boolean var1, int var2, boolean var3) { - if(ItemContainer.worlds != null) { + if (ItemContainer.worlds != null) { class3.method42(0, ItemContainer.worlds.length - 1, var0, var1, var2, var3); } @@ -98,23 +99,23 @@ public enum WorldMapSectionType implements Enumerated { garbageValue = "-1520594673" ) static int method253(int var0, Script var1, boolean var2) { - Widget var3 = var2?WorldMapIcon1.__t_i:class12.__n_n; - if(var0 == 1500) { + Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + if (var0 == 1500) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.x; return 1; - } else if(var0 == 1501) { + } else if (var0 == 1501) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.y; return 1; - } else if(var0 == 1502) { + } else if (var0 == 1502) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.width; return 1; - } else if(var0 == 1503) { + } else if (var0 == 1503) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.height; return 1; - } else if(var0 == 1504) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.isHidden?1:0; + } else if (var0 == 1504) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; return 1; - } else if(var0 == 1505) { + } else if (var0 == 1505) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.parentId; return 1; } else { @@ -128,8 +129,8 @@ public enum WorldMapSectionType implements Enumerated { garbageValue = "1187868759" ) static void method254() { - if(class60.worldMap0 != null) { - class60.worldMap0.__a_525(SoundSystem.plane, (Canvas.localPlayer.x >> 7) + class50.baseX, (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY, false); + if (class60.worldMap0 != null) { + class60.worldMap0.method366(SoundSystem.plane, (Canvas.localPlayer.x >> 7) + class50.baseX, (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY, false); class60.worldMap0.loadCache(); } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 7e78c1a9c0..bb5a5df529 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -8,7 +8,7 @@ final class class1 implements class0 { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache __f_m; + public static AbstractIndexCache field1105; @ObfuscatedName("m") @ObfuscatedSignature( @@ -25,7 +25,7 @@ final class class1 implements class0 { garbageValue = "704451908" ) public Object vmethod46(Buffer var1) { - return Integer.valueOf(var1.readInt()); + return var1.readInt(); } @ObfuscatedName("g") @@ -34,7 +34,7 @@ final class class1 implements class0 { garbageValue = "-254123307" ) void method6(Integer var1, Buffer var2) { - var2.writeInt(var1.intValue()); + var2.writeInt(var1); } @ObfuscatedName("q") @@ -53,15 +53,15 @@ final class class1 implements class0 { ) static int method18(int var0, int var1) { ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if(var2 == null) { + if (var2 == null) { return 0; - } else if(var1 == -1) { + } else if (var1 == -1) { return 0; } else { int var3 = 0; - for(int var4 = 0; var4 < var2.quantities.length; ++var4) { - if(var2.ids[var4] == var1) { + for (int var4 = 0; var4 < var2.quantities.length; ++var4) { + if (var2.ids[var4] == var1) { var3 += var2.quantities[var4]; } } @@ -78,15 +78,15 @@ final class class1 implements class0 { static int method8(int var0, Script var1, boolean var2) { int var3 = -1; Widget var4; - if(var0 >= 2000) { + if (var0 >= 2000) { var0 -= 1000; var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4 = Huffman.getWidget(var3); } else { - var4 = var2?WorldMapIcon1.__t_i:class12.__n_n; + var4 = var2 ? WorldMapIcon1.field1030 : class12.field1111; } - if(var0 == 1000) { + if (var0 == 1000) { RouteStrategy.Interpreter_intStackSize -= 4; var4.rawX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4.rawY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -94,12 +94,12 @@ final class class1 implements class0 { var4.yAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3]; class22.method295(var4); TextureProvider.client.alignWidget(var4); - if(var3 != -1 && var4.type == 0) { + if (var3 != -1 && var4.type == 0) { class39.revalidateWidgetScroll(Widget.widgets[var3 >> 16], var4, false); } return 1; - } else if(var0 == 1001) { + } else if (var0 == 1001) { RouteStrategy.Interpreter_intStackSize -= 4; var4.rawWidth = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4.rawHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -107,23 +107,23 @@ final class class1 implements class0 { var4.heightAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3]; class22.method295(var4); TextureProvider.client.alignWidget(var4); - if(var3 != -1 && var4.type == 0) { + if (var3 != -1 && var4.type == 0) { class39.revalidateWidgetScroll(Widget.widgets[var3 >> 16], var4, false); } return 1; - } else if(var0 == 1003) { + } else if (var0 == 1003) { boolean var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - if(var5 != var4.isHidden) { + if (var5 != var4.isHidden) { var4.isHidden = var5; class22.method295(var4); } return 1; - } else if(var0 == 1005) { + } else if (var0 == 1005) { var4.noClickThrough = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; - } else if(var0 == 1006) { + } else if (var0 == 1006) { var4.noScrollThrough = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else { @@ -138,107 +138,107 @@ final class class1 implements class0 { ) static int method16(int var0, Script var1, boolean var2) { int var3; - if(var0 == 4200) { + if (var0 == 4200) { 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) { + if (var0 == 4201) { 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) { + if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; } else { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } return 1; - } else if(var0 == 4202) { + } else if (var0 == 4202) { 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) { + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; } else { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } return 1; - } else if(var0 == 4203) { + } else if (var0 == 4203) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).price; return 1; - } else if(var0 == 4204) { + } else if (var0 == 4204) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).isStackable == 1?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).isStackable == 1 ? 1 : 0; return 1; } else { ItemDefinition var6; - if(var0 == 4205) { + if (var0 == 4205) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = Skills.getItemDefinition(var3); - if(var6.noteTemplate == -1 && var6.note >= 0) { + if (var6.noteTemplate == -1 && var6.note >= 0) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.note; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3; } return 1; - } else if(var0 == 4206) { + } else if (var0 == 4206) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = Skills.getItemDefinition(var3); - if(var6.noteTemplate >= 0 && var6.note >= 0) { + if (var6.noteTemplate >= 0 && var6.note >= 0) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.note; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3; } return 1; - } else if(var0 == 4207) { + } else if (var0 == 4207) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).isMembersOnly?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).isMembersOnly ? 1 : 0; return 1; - } else if(var0 == 4208) { + } else if (var0 == 4208) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = Skills.getItemDefinition(var3); - if(var6.placeholderTemplate == -1 && var6.placeholder >= 0) { + if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.placeholder; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3; } return 1; - } else if(var0 == 4209) { + } else if (var0 == 4209) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = Skills.getItemDefinition(var3); - if(var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { + if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.placeholder; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3; } return 1; - } else if(var0 == 4210) { + } else if (var0 == 4210) { String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class50.method900(var7, var4 == 1); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection0.__y_sn; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection0.field1055; return 1; - } else if(var0 != 4211) { - if(var0 == 4212) { - class231.__hb_sg = 0; + } else if (var0 != 4211) { + if (var0 == 4212) { + class231.field1139 = 0; return 1; } else { return 2; } } else { - if(AttackOption.__cj_sp != null && class231.__hb_sg < WorldMapSection0.__y_sn) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = AttackOption.__cj_sp[++class231.__hb_sg - 1] & '\uffff'; + if (AttackOption.field30 != null && class231.field1139 < WorldMapSection0.field1055) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = AttackOption.field30[++class231.field1139 - 1] & '\uffff'; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } @@ -255,8 +255,8 @@ final class class1 implements class0 { garbageValue = "-370289311" ) static boolean method15(int var0) { - for(int var1 = 0; var1 < Client.__client_pm; ++var1) { - if(Client.__client_pn[var1] == var0) { + for (int var1 = 0; var1 < Client.field137; ++var1) { + if (Client.field145[var1] == var0) { return true; } } @@ -272,6 +272,6 @@ final class class1 implements class0 { @Export("getWidgetClickMask") static int getWidgetClickMask(Widget var0) { IntegerNode var1 = (IntegerNode)Client.widgetClickMasks.get(((long)var0.id << 32) + (long)var0.childIndex); - return var1 != null?var1.integer:var0.clickMask; + return var1 != null ? var1.integer : var0.clickMask; } } diff --git a/runescape-client/src/main/java/class102.java b/runescape-client/src/main/java/class102.java index 5099b3aa94..0e13792535 100644 --- a/runescape-client/src/main/java/class102.java +++ b/runescape-client/src/main/java/class102.java @@ -1,18 +1,17 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("ca") public class class102 { @ObfuscatedName("m") - static final int[] __ca_m; + static final int[] field1106; @ObfuscatedName("f") - static final float[] __ca_f; + static final float[] field1107; @ObfuscatedName("x") - static int[] __ca_x; + static int[] field1108; @ObfuscatedName("d") - static int[] __ca_d; + static int[] field1109; @ObfuscatedName("k") - static boolean[] __ca_k; + static boolean[] field1110; @ObfuscatedName("q") int[] field1353; @ObfuscatedName("w") @@ -28,14 +27,9 @@ public class class102 { @ObfuscatedName("e") int[][] field1359; - static { - __ca_m = new int[]{256, 128, 86, 64}; - __ca_f = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F}; - } - class102() { int var1 = MusicSample.method2352(16); - if(var1 != 1) { + if (var1 != 1) { throw new RuntimeException(); } else { int var2 = MusicSample.method2352(5); @@ -44,10 +38,10 @@ public class class102 { int var4; int var5; - for(var4 = 0; var4 < var2; ++var4) { + for (var4 = 0; var4 < var2; ++var4) { var5 = MusicSample.method2352(4); this.field1357[var4] = var5; - if(var5 >= var3) { + if (var5 >= var3) { var3 = var5 + 1; } } @@ -57,20 +51,20 @@ public class class102 { this.field1358 = new int[var3]; this.field1359 = new int[var3][]; - int var7; - for(var4 = 0; var4 < var3; ++var4) { + int var6; + for (var4 = 0; var4 < var3; ++var4) { this.field1352[var4] = MusicSample.method2352(3) + 1; var5 = this.field1356[var4] = MusicSample.method2352(2); - if(var5 != 0) { + if (var5 != 0) { this.field1358[var4] = MusicSample.method2352(8); } var5 = 1 << var5; - int[] var6 = new int[var5]; - this.field1359[var4] = var6; + int[] var7 = new int[var5]; + this.field1359[var4] = var7; - for(var7 = 0; var7 < var5; ++var7) { - var6[var7] = MusicSample.method2352(8) - 1; + for (var6 = 0; var6 < var5; ++var6) { + var7[var6] = MusicSample.method2352(8) - 1; } } @@ -79,7 +73,7 @@ public class class102 { var5 = 2; int var9; - for(var9 = 0; var9 < var2; ++var9) { + for (var9 = 0; var9 < var2; ++var9) { var5 += this.field1352[this.field1357[var9]]; } @@ -88,18 +82,18 @@ public class class102 { this.field1353[1] = 1 << var4; var5 = 2; - for(var9 = 0; var9 < var2; ++var9) { - var7 = this.field1357[var9]; + for (var9 = 0; var9 < var2; ++var9) { + var6 = this.field1357[var9]; - for(int var8 = 0; var8 < this.field1352[var7]; ++var8) { + for (int var8 = 0; var8 < this.field1352[var6]; ++var8) { this.field1353[var5++] = MusicSample.method2352(var4); } } - if(__ca_x == null || __ca_x.length < var5) { - __ca_x = new int[var5]; - __ca_d = new int[var5]; - __ca_k = new boolean[var5]; + if (field1108 == null || field1108.length < var5) { + field1108 = new int[var5]; + field1109 = new int[var5]; + field1110 = new boolean[var5]; } } @@ -109,103 +103,104 @@ public class class102 { int method2379(int var1, int var2, int var3, int var4, int var5) { int var6 = var4 - var2; int var7 = var3 - var1; - int var8 = var6 < 0?-var6:var6; + int var8 = var6 < 0 ? -var6 : var6; int var9 = (var5 - var1) * var8; int var10 = var9 / var7; - return var6 < 0?var2 - var10:var10 + var2; + return var6 < 0 ? var2 - var10 : var10 + var2; } @ObfuscatedName("w") void method2365(int var1, int var2, int var3, int var4, float[] var5, int var6) { int var7 = var4 - var2; int var8 = var3 - var1; - int var9 = var7 < 0?-var7:var7; + int var9 = var7 < 0 ? -var7 : var7; int var10 = var7 / var8; int var11 = var2; int var12 = 0; - int var13 = var7 < 0?var10 - 1:var10 + 1; - var9 -= (var10 < 0?-var10:var10) * var8; - var5[var1] *= __ca_f[var2]; - if(var3 > var6) { + int var13 = var7 < 0 ? var10 - 1 : var10 + 1; + var9 -= (var10 < 0 ? -var10 : var10) * var8; + var5[var1] *= field1107[var2]; + if (var3 > var6) { var3 = var6; } - for(int var14 = var1 + 1; var14 < var3; ++var14) { + for (int var14 = var1 + 1; var14 < var3; ++var14) { var12 += var9; - if(var12 >= var8) { + if (var12 >= var8) { var12 -= var8; var11 += var13; } else { var11 += var10; } - var5[var14] *= __ca_f[var11]; + var5[var14] *= field1107[var11]; } } @ObfuscatedName("o") void method2366(int var1, int var2) { - if(var1 < var2) { + if (var1 < var2) { int var3 = var1; - int var4 = __ca_x[var1]; - int var5 = __ca_d[var1]; - boolean var6 = __ca_k[var1]; + int var4 = field1108[var1]; + int var5 = field1109[var1]; + boolean var6 = field1110[var1]; - for(int var7 = var1 + 1; var7 <= var2; ++var7) { - int var8 = __ca_x[var7]; - if(var8 < var4) { - __ca_x[var3] = var8; - __ca_d[var3] = __ca_d[var7]; - __ca_k[var3] = __ca_k[var7]; + for (int var7 = var1 + 1; var7 <= var2; ++var7) { + int var8 = field1108[var7]; + if (var8 < var4) { + field1108[var3] = var8; + field1109[var3] = field1109[var7]; + field1110[var3] = field1110[var7]; ++var3; - __ca_x[var7] = __ca_x[var3]; - __ca_d[var7] = __ca_d[var3]; - __ca_k[var7] = __ca_k[var3]; + field1108[var7] = field1108[var3]; + field1109[var7] = field1109[var3]; + field1110[var7] = field1110[var3]; } } - __ca_x[var3] = var4; - __ca_d[var3] = var5; - __ca_k[var3] = var6; + field1108[var3] = var4; + field1109[var3] = var5; + field1110[var3] = var6; this.method2366(var1, var3 - 1); this.method2366(var3 + 1, var2); } + } @ObfuscatedName("u") boolean method2367() { boolean var1 = MusicSample.method2338() != 0; - if(!var1) { + if (!var1) { return false; } else { int var2 = this.field1353.length; int var3; - for(var3 = 0; var3 < var2; ++var3) { - __ca_x[var3] = this.field1353[var3]; + for (var3 = 0; var3 < var2; ++var3) { + field1108[var3] = this.field1353[var3]; } - var3 = __ca_m[this.field1360 - 1]; + var3 = field1106[this.field1360 - 1]; int var4 = WorldMapCacheName.method634(var3 - 1); - __ca_d[0] = MusicSample.method2352(var4); - __ca_d[1] = MusicSample.method2352(var4); + field1109[0] = MusicSample.method2352(var4); + field1109[1] = MusicSample.method2352(var4); int var5 = 2; - for(int var6 = 0; var6 < this.field1357.length; ++var6) { + for (int var6 = 0; var6 < this.field1357.length; ++var6) { int var7 = this.field1357[var6]; int var8 = this.field1352[var7]; int var9 = this.field1356[var7]; int var10 = (1 << var9) - 1; int var11 = 0; - if(var9 > 0) { + if (var9 > 0) { var11 = MusicSample.field1323[this.field1358[var7]].method2306(); } - for(int var12 = 0; var12 < var8; ++var12) { + for (int var12 = 0; var12 < var8; ++var12) { int var13 = this.field1359[var7][var11 & var10]; var11 >>>= var9; - __ca_d[var5++] = var13 >= 0?MusicSample.field1323[var13].method2306():0; + field1109[var5++] = var13 >= 0 ? MusicSample.field1323[var13].method2306() : 0; } } @@ -216,9 +211,9 @@ public class class102 { @ObfuscatedName("g") void method2375(float[] var1, int var2) { int var3 = this.field1353.length; - int var4 = __ca_m[this.field1360 - 1]; - boolean[] var5 = __ca_k; - __ca_k[1] = true; + int var4 = field1106[this.field1360 - 1]; + boolean[] var5 = field1110; + field1110[1] = true; var5[0] = true; int var6; @@ -226,39 +221,39 @@ public class class102 { int var8; int var9; int var10; - for(var6 = 2; var6 < var3; ++var6) { - var7 = method2369(__ca_x, var6); - var8 = method2363(__ca_x, var6); - var9 = this.method2379(__ca_x[var7], __ca_d[var7], __ca_x[var8], __ca_d[var8], __ca_x[var6]); - var10 = __ca_d[var6]; + for (var6 = 2; var6 < var3; ++var6) { + var7 = method2369(field1108, var6); + var8 = method2363(field1108, var6); + var9 = this.method2379(field1108[var7], field1109[var7], field1108[var8], field1109[var8], field1108[var6]); + var10 = field1109[var6]; int var11 = var4 - var9; - int var13 = (var11 < var9?var11:var9) << 1; - if(var10 != 0) { - boolean[] var14 = __ca_k; - __ca_k[var8] = true; - var14[var7] = true; - __ca_k[var6] = true; - if(var10 >= var13) { - __ca_d[var6] = var11 > var9?var9 + (var10 - var9):var11 + (var9 - var10) - 1; + int var12 = (var11 < var9 ? var11 : var9) << 1; + if (var10 != 0) { + boolean[] var13 = field1110; + field1110[var8] = true; + var13[var7] = true; + field1110[var6] = true; + if (var10 >= var12) { + field1109[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; } else { - __ca_d[var6] = (var10 & 1) != 0?var9 - (var10 + 1) / 2:var10 / 2 + var9; + field1109[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; } } else { - __ca_k[var6] = false; - __ca_d[var6] = var9; + field1110[var6] = false; + field1109[var6] = var9; } } this.method2366(0, var3 - 1); var6 = 0; - var7 = __ca_d[0] * this.field1360; + var7 = field1109[0] * this.field1360; - for(var8 = 1; var8 < var3; ++var8) { - if(__ca_k[var8]) { - var9 = __ca_x[var8]; - var10 = __ca_d[var8] * this.field1360; + for (var8 = 1; var8 < var3; ++var8) { + if (field1110[var8]) { + var9 = field1108[var8]; + var10 = field1109[var8] * this.field1360; this.method2365(var6, var7, var9, var10, var1, var2); - if(var9 >= var2) { + if (var9 >= var2) { return; } @@ -267,10 +262,10 @@ public class class102 { } } - float var16 = __ca_f[var7]; + float var14 = field1107[var7]; - for(var9 = var6; var9 < var2; ++var9) { - var1[var9] *= var16; + for (var9 = var6; var9 < var2; ++var9) { + var1[var9] *= var14; } } @@ -281,9 +276,9 @@ public class class102 { int var3 = -1; int var4 = Integer.MIN_VALUE; - for(int var5 = 0; var5 < var1; ++var5) { + for (int var5 = 0; var5 < var1; ++var5) { int var6 = var0[var5]; - if(var6 < var2 && var6 > var4) { + if (var6 < var2 && var6 > var4) { var3 = var5; var4 = var6; } @@ -298,9 +293,9 @@ public class class102 { int var3 = -1; int var4 = Integer.MAX_VALUE; - for(int var5 = 0; var5 < var1; ++var5) { + for (int var5 = 0; var5 < var1; ++var5) { int var6 = var0[var5]; - if(var6 > var2 && var6 < var4) { + if (var6 > var2 && var6 < var4) { var3 = var5; var4 = var6; } @@ -308,4 +303,9 @@ public class class102 { return var3; } + + static { + field1106 = new int[]{256, 128, 86, 64}; + field1107 = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F}; + } } diff --git a/runescape-client/src/main/java/class109.java b/runescape-client/src/main/java/class109.java index aa4195a34b..8e91a37d29 100644 --- a/runescape-client/src/main/java/class109.java +++ b/runescape-client/src/main/java/class109.java @@ -27,11 +27,11 @@ public class class109 { int[] var1 = new int[this.field1405]; int var2; - for(var2 = 0; var2 < this.field1405; ++var2) { + for (var2 = 0; var2 < this.field1405; ++var2) { int var3 = 0; int var4 = MusicSample.method2352(3); boolean var5 = MusicSample.method2338() != 0; - if(var5) { + if (var5) { var3 = MusicSample.method2352(5); } @@ -40,8 +40,8 @@ public class class109 { this.field1410 = new int[this.field1405 * 8]; - for(var2 = 0; var2 < this.field1405 * 8; ++var2) { - this.field1410[var2] = (var1[var2 >> 3] & 1 << (var2 & 7)) != 0?MusicSample.method2352(8):-1; + for (var2 = 0; var2 < this.field1405 * 8; ++var2) { + this.field1410[var2] = (var1[var2 >> 3] & 1 << (var2 & 7)) != 0 ? MusicSample.method2352(8) : -1; } } @@ -49,27 +49,27 @@ public class class109 { @ObfuscatedName("m") void method2473(float[] var1, int var2, boolean var3) { int var4; - for(var4 = 0; var4 < var2; ++var4) { + for (var4 = 0; var4 < var2; ++var4) { var1[var4] = 0.0F; } - if(!var3) { + if (!var3) { var4 = MusicSample.field1323[this.field1411].field1306; int var5 = this.field1407 - this.field1406; int var6 = var5 / this.field1408; int[] var7 = new int[var6]; - for(int var8 = 0; var8 < 8; ++var8) { + for (int var8 = 0; var8 < 8; ++var8) { int var9 = 0; - while(var9 < var6) { + while (var9 < var6) { int var10; int var11; - if(var8 == 0) { + if (var8 == 0) { var10 = MusicSample.field1323[this.field1411].method2306(); - for(var11 = var4 - 1; var11 >= 0; --var11) { - if(var9 + var11 < var6) { + for (var11 = var4 - 1; var11 >= 0; --var11) { + if (var9 + var11 < var6) { var7[var9 + var11] = var10 % this.field1405; } @@ -77,31 +77,31 @@ public class class109 { } } - for(var10 = 0; var10 < var4; ++var10) { + for (var10 = 0; var10 < var4; ++var10) { var11 = var7[var9]; int var12 = this.field1410[var8 + var11 * 8]; - if(var12 >= 0) { + if (var12 >= 0) { int var13 = var9 * this.field1408 + this.field1406; class98 var14 = MusicSample.field1323[var12]; int var15; - if(this.field1409 == 0) { + if (this.field1409 == 0) { var15 = this.field1408 / var14.field1306; - for(int var16 = 0; var16 < var15; ++var16) { - float[] var17 = var14.method2307(); + for (int var19 = 0; var19 < var15; ++var19) { + float[] var20 = var14.method2307(); - for(int var18 = 0; var18 < var14.field1306; ++var18) { - var1[var13 + var16 + var18 * var15] += var17[var18]; + for (int var18 = 0; var18 < var14.field1306; ++var18) { + var1[var13 + var19 + var18 * var15] += var20[var18]; } } } else { var15 = 0; - while(var15 < this.field1408) { - float[] var19 = var14.method2307(); + while (var15 < this.field1408) { + float[] var16 = var14.method2307(); - for(int var20 = 0; var20 < var14.field1306; ++var20) { - var1[var13 + var15] += var19[var20]; + for (int var17 = 0; var17 < var14.field1306; ++var17) { + var1[var13 + var15] += var16[var17]; ++var15; } } @@ -109,13 +109,13 @@ public class class109 { } ++var9; - if(var9 >= var6) { + if (var9 >= var6) { break; } } } } - } + } } diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java index 48df6ff7e3..f6646377ed 100644 --- a/runescape-client/src/main/java/class11.java +++ b/runescape-client/src/main/java/class11.java @@ -19,7 +19,7 @@ final class class11 implements Comparator { garbageValue = "1" ) int method138(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.__m_3().compareTo(var2.__m_3()); + return var1.method119().compareTo(var2.method119()); } public boolean equals(Object var1) { @@ -50,17 +50,17 @@ final class class11 implements Comparator { var2.pathY[0] = var6 - GraphicsObject.baseY; var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); SoundSystem.plane = var2.plane = var4; - if(Players.__cq_o[var1] != null) { - var2.read(Players.__cq_o[var1]); + if (Players.field733[var1] != null) { + var2.read(Players.field733[var1]); } Players.Players_count = 0; Players.Players_indices[++Players.Players_count - 1] = var1; - Players.__cq_q[var1] = 0; - Players.__cq_l = 0; + Players.field731[var1] = 0; + Players.field734 = 0; - for(int var7 = 1; var7 < 2048; ++var7) { - if(var1 != var7) { + for (int var7 = 1; var7 < 2048; ++var7) { + if (var1 != var7) { int var8 = var0.readBits(18); int var9 = var8 >> 16; int var10 = var8 >> 8 & 597; @@ -68,8 +68,8 @@ final class class11 implements Comparator { Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); Players.Players_orientations[var7] = 0; Players.Players_targetIndices[var7] = -1; - Players.__cq_e[++Players.__cq_l - 1] = var7; - Players.__cq_q[var7] = 0; + Players.field735[++Players.field734 - 1] = var7; + Players.field731[var7] = 0; } } @@ -83,20 +83,19 @@ final class class11 implements Comparator { ) static int method141(int var0, Script var1, boolean var2) { Widget var3; - if(var0 >= 2000) { + if (var0 >= 2000) { var0 -= 1000; var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); } else { - var3 = var2?WorldMapIcon1.__t_i:class12.__n_n; + var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; } String var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; int[] var5 = null; - if(var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { + if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { int var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - if(var6 > 0) { - for(var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]) { - ; + if (var6 > 0) { + for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]) { } } @@ -106,8 +105,8 @@ final class class11 implements Comparator { Object[] var8 = new Object[var4.length() + 1]; int var7; - for(var7 = var8.length - 1; var7 >= 1; --var7) { - if(var4.charAt(var7 - 1) == 's') { + for (var7 = var8.length - 1; var7 >= 1; --var7) { + if (var4.charAt(var7 - 1) == 's') { var8[var7] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; } else { var8[var7] = new Integer(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); @@ -115,73 +114,73 @@ final class class11 implements Comparator { } var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - if(var7 != -1) { + if (var7 != -1) { var8[0] = new Integer(var7); } else { var8 = null; } - if(var0 == 1400) { + if (var0 == 1400) { var3.onClick = var8; - } else if(var0 == 1401) { + } else if (var0 == 1401) { var3.onHold = var8; - } else if(var0 == 1402) { + } else if (var0 == 1402) { var3.onRelease = var8; - } else if(var0 == 1403) { + } else if (var0 == 1403) { var3.onMouseOver = var8; - } else if(var0 == 1404) { + } else if (var0 == 1404) { var3.onMouseLeave = var8; - } else if(var0 == 1405) { + } else if (var0 == 1405) { var3.onDrag = var8; - } else if(var0 == 1406) { + } else if (var0 == 1406) { var3.onTargetLeave = var8; - } else if(var0 == 1407) { + } else if (var0 == 1407) { var3.onVarTransmit = var8; var3.varTransmitTriggers = var5; - } else if(var0 == 1408) { + } else if (var0 == 1408) { var3.onTimer = var8; - } else if(var0 == 1409) { + } else if (var0 == 1409) { var3.onOp = var8; - } else if(var0 == 1410) { + } else if (var0 == 1410) { var3.onDragComplete = var8; - } else if(var0 == 1411) { + } else if (var0 == 1411) { var3.onClickRepeat = var8; - } else if(var0 == 1412) { + } else if (var0 == 1412) { var3.onMouseRepeat = var8; - } else if(var0 == 1414) { + } else if (var0 == 1414) { var3.onInvTransmit = var8; var3.invTransmitTriggers = var5; - } else if(var0 == 1415) { + } else if (var0 == 1415) { var3.onStatTransmit = var8; var3.statTransmitTriggers = var5; - } else if(var0 == 1416) { + } else if (var0 == 1416) { var3.onTargetEnter = var8; - } else if(var0 == 1417) { + } else if (var0 == 1417) { var3.onScroll = var8; - } else if(var0 == 1418) { - var3.__em = var8; - } else if(var0 == 1419) { + } else if (var0 == 1418) { + var3.field970 = var8; + } else if (var0 == 1419) { var3.onKeyListener = var8; - } else if(var0 == 1420) { - var3.__ex = var8; - } else if(var0 == 1421) { - var3.__ej = var8; - } else if(var0 == 1422) { - var3.__el = var8; - } else if(var0 == 1423) { + } else if (var0 == 1420) { + var3.field971 = var8; + } else if (var0 == 1421) { + var3.field972 = var8; + } else if (var0 == 1422) { + var3.field973 = var8; + } else if (var0 == 1423) { var3.onDialogAbortListener = var8; - } else if(var0 == 1424) { - var3.__ei = var8; - } else if(var0 == 1425) { - var3.__eq = var8; - } else if(var0 == 1426) { - var3.__eh = var8; + } else if (var0 == 1424) { + var3.field974 = var8; + } else if (var0 == 1425) { + var3.field976 = var8; + } else if (var0 == 1426) { + var3.field977 = var8; } else { - if(var0 != 1427) { + if (var0 != 1427) { return 2; } - var3.__ee = var8; + var3.field975 = var8; } var3.hasListener = true; @@ -195,30 +194,30 @@ final class class11 implements Comparator { ) static int method146(int var0, Script var1, boolean var2) { Widget var3; - if(var0 == 2700) { + if (var0 == 2700) { var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemId; return 1; - } else if(var0 == 2701) { + } else if (var0 == 2701) { var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - if(var3.itemId != -1) { + if (var3.itemId != -1) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemQuantity; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; - } else if(var0 == 2702) { - int var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var5); - if(var4 != null) { + } else if (var0 == 2702) { + int var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + WidgetGroupParent var5 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var4); + if (var5 != null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; - } else if(var0 == 2706) { + } else if (var0 == 2706) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rootWidgetGroup; return 1; } else { @@ -235,15 +234,15 @@ final class class11 implements Comparator { UserComparator6.clock.mark(); int var0; - for(var0 = 0; var0 < 32; ++var0) { - GameShell.__ba_a[var0] = 0L; + for (var0 = 0; var0 < 32; ++var0) { + GameShell.field365[var0] = 0L; } - for(var0 = 0; var0 < 32; ++var0) { - GameShell.__ba_j[var0] = 0L; + for (var0 = 0; var0 < 32; ++var0) { + GameShell.field366[var0] = 0L; } - GameShell.__ba_l = 0; + GameShell.field362 = 0; } @ObfuscatedName("ih") @@ -254,21 +253,21 @@ final class class11 implements Comparator { static final void method148(int var0, int var1, int var2, int var3, int var4) { 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); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field184); int var5 = var3 * (var3 - 32) / var4; - if(var5 < 8) { + if (var5 < 8) { var5 = 8; } int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.__client_hn); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.__client_hg); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.__client_hg); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.__client_hg); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.__client_hg); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.__client_hr); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.__client_hr); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.__client_hr); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.__client_hr); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field185); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field187); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field187); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field187); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field187); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field186); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field186); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field186); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field186); } } diff --git a/runescape-client/src/main/java/class114.java b/runescape-client/src/main/java/class114.java index 8339fc27b5..b45e205c8a 100644 --- a/runescape-client/src/main/java/class114.java +++ b/runescape-client/src/main/java/class114.java @@ -13,20 +13,20 @@ public class class114 { class114() { MusicSample.method2352(16); - this.field1453 = MusicSample.method2338() != 0?MusicSample.method2352(4) + 1:1; - if(MusicSample.method2338() != 0) { + this.field1453 = MusicSample.method2338() != 0 ? MusicSample.method2352(4) + 1 : 1; + if (MusicSample.method2338() != 0) { MusicSample.method2352(8); } MusicSample.method2352(2); - if(this.field1453 > 1) { + if (this.field1453 > 1) { this.field1454 = MusicSample.method2352(4); } this.field1452 = new int[this.field1453]; this.field1455 = new int[this.field1453]; - for(int var1 = 0; var1 < this.field1453; ++var1) { + for (int var1 = 0; var1 < this.field1453; ++var1) { MusicSample.method2352(8); this.field1452[var1] = MusicSample.method2352(8); this.field1455[var1] = MusicSample.method2352(8); diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java index f3808368eb..e39aafbbb2 100644 --- a/runescape-client/src/main/java/class12.java +++ b/runescape-client/src/main/java/class12.java @@ -1,5 +1,4 @@ import java.util.Comparator; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -9,7 +8,7 @@ final class class12 implements Comparator { @ObfuscatedSignature( signature = "Lho;" ) - static Widget __n_n; + static Widget field1111; @ObfuscatedName("m") @ObfuscatedSignature( @@ -17,7 +16,7 @@ final class class12 implements Comparator { garbageValue = "-86" ) int method149(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.__f < var2.__f?-1:(var1.__f == var2.__f?0:1); + return var1.field370 < var2.field370 ? -1 : (var1.field370 == var2.field370 ? 0 : 1); } public boolean equals(Object var1) { @@ -43,69 +42,69 @@ final class class12 implements Comparator { garbageValue = "1632289577" ) static char method155(char var0, int var1) { - if(var0 >= 192 && var0 <= 255) { - if(var0 >= 192 && var0 <= 198) { + if (var0 >= 192 && var0 <= 255) { + if (var0 >= 192 && var0 <= 198) { return 'A'; } - if(var0 == 199) { + if (var0 == 199) { return 'C'; } - if(var0 >= 200 && var0 <= 203) { + if (var0 >= 200 && var0 <= 203) { return 'E'; } - if(var0 >= 204 && var0 <= 207) { + if (var0 >= 204 && var0 <= 207) { return 'I'; } - if(var0 >= 210 && var0 <= 214) { + if (var0 >= 210 && var0 <= 214) { return 'O'; } - if(var0 >= 217 && var0 <= 220) { + if (var0 >= 217 && var0 <= 220) { return 'U'; } - if(var0 == 221) { + if (var0 == 221) { return 'Y'; } - if(var0 == 223) { + if (var0 == 223) { return 's'; } - if(var0 >= 224 && var0 <= 230) { + if (var0 >= 224 && var0 <= 230) { return 'a'; } - if(var0 == 231) { + if (var0 == 231) { return 'c'; } - if(var0 >= 232 && var0 <= 235) { + if (var0 >= 232 && var0 <= 235) { return 'e'; } - if(var0 >= 236 && var0 <= 239) { + if (var0 >= 236 && var0 <= 239) { return 'i'; } - if(var0 >= 242 && var0 <= 246) { + if (var0 >= 242 && var0 <= 246) { return 'o'; } - if(var0 >= 249 && var0 <= 252) { + if (var0 >= 249 && var0 <= 252) { return 'u'; } - if(var0 == 253 || var0 == 255) { + if (var0 == 253 || var0 == 255) { return 'y'; } } - return var0 == 338?'O':(var0 == 339?'o':(var0 == 376?'Y':var0)); + return var0 == 338 ? 'O' : (var0 == 339 ? 'o' : (var0 == 376 ? 'Y' : var0)); } @ObfuscatedName("e") @@ -115,7 +114,7 @@ final class class12 implements Comparator { ) static int method161(int var0) { Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - return var1 == null?-1:(var1.previousDual == Messages.Messages_queue.sentinel?-1:((Message)var1.previousDual).count); + return var1 == null ? -1 : (var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count); } @ObfuscatedName("ja") @@ -124,24 +123,24 @@ final class class12 implements Comparator { garbageValue = "1731524026" ) static void method159() { - for(WidgetGroupParent var0 = (WidgetGroupParent)Client.widgetGroupParents.first(); var0 != null; var0 = (WidgetGroupParent)Client.widgetGroupParents.next()) { + for (WidgetGroupParent var0 = (WidgetGroupParent)Client.widgetGroupParents.first(); var0 != null; var0 = (WidgetGroupParent)Client.widgetGroupParents.next()) { int var1 = var0.group; - if(GroundItemPile.loadWidgetGroup(var1)) { + if (GroundItemPile.loadWidgetGroup(var1)) { boolean var2 = true; Widget[] var3 = Widget.widgets[var1]; int var4; - for(var4 = 0; var4 < var3.length; ++var4) { - if(var3[var4] != null) { + for (var4 = 0; var4 < var3.length; ++var4) { + if (var3[var4] != null) { var2 = var3[var4].isIf3; break; } } - if(!var2) { + if (!var2) { var4 = (int)var0.key; Widget var5 = Huffman.getWidget(var4); - if(var5 != null) { + if (var5 != null) { class22.method295(var5); } } @@ -156,8 +155,8 @@ final class class12 implements Comparator { garbageValue = "-7" ) static final void method158() { - PacketBufferNode var0 = Interpreter.method1915(ClientPacket.__gs_cr, Client.packetWriter.isaacCipher); + PacketBufferNode var0 = Interpreter.method1915(ClientPacket.field300, Client.packetWriter.isaacCipher); var0.packetBuffer.writeByte(0); - Client.packetWriter.__q_167(var0); + Client.packetWriter.method241(var0); } } diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index bd6ef3a987..b4652f2105 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -6,7 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("i") public class class13 { @ObfuscatedName("x") - static int[] __i_x; + static int[] field1112; @ObfuscatedName("k") @ObfuscatedSignature( signature = "Lhe;" @@ -26,7 +26,7 @@ public class class13 { garbageValue = "862375604" ) static Sprite method164(int var0, int var1, int var2) { - return (Sprite)WorldMapRegion.__av_o.get(MouseHandler.method1083(var0, var1, var2)); + return (Sprite)WorldMapRegion.field1051.get(MouseHandler.method1083(var0, var1, var2)); } @ObfuscatedName("fm") @@ -36,11 +36,11 @@ public class class13 { ) @Export("playPcmPlayers") static final void playPcmPlayers() { - if(AbstractIndexCache.pcmPlayer1 != null) { + if (AbstractIndexCache.pcmPlayer1 != null) { AbstractIndexCache.pcmPlayer1.run(); } - if(WorldMapCacheName.pcmPlayer0 != null) { + if (WorldMapCacheName.pcmPlayer0 != null) { WorldMapCacheName.pcmPlayer0.run(); } @@ -56,23 +56,23 @@ public class class13 { int var3 = -1; int var4 = 0; int var5 = 0; - if(var0.field906 == 0) { - var1 = class65.scene.__ar_244(var0.field911, var0.field913, var0.field901); + if (var0.field906 == 0) { + var1 = class65.scene.method290(var0.field911, var0.field913, var0.field901); } - if(var0.field906 == 1) { - var1 = class65.scene.__ac_245(var0.field911, var0.field913, var0.field901); + if (var0.field906 == 1) { + var1 = class65.scene.method291(var0.field911, var0.field913, var0.field901); } - if(var0.field906 == 2) { - var1 = class65.scene.__ay_246(var0.field911, var0.field913, var0.field901); + if (var0.field906 == 2) { + var1 = class65.scene.method292(var0.field911, var0.field913, var0.field901); } - if(var0.field906 == 3) { + if (var0.field906 == 3) { var1 = class65.scene.getFloorDecorationTag(var0.field911, var0.field913, var0.field901); } - if(var1 != 0L) { + if (var1 != 0L) { int var6 = class65.scene.getObjectFlags(var0.field911, var0.field913, var0.field901, var1); var3 = HitSplatDefinition.method4972(var1); var4 = var6 & 31; diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java index 04ce881b16..c221cc9d65 100644 --- a/runescape-client/src/main/java/class14.java +++ b/runescape-client/src/main/java/class14.java @@ -15,10 +15,10 @@ public class class14 { AccessFile var2 = new AccessFile(class337.clDat, "rw", 10000L); Buffer var3 = new Buffer(500); var3.writeByte(3); - var3.writeByte(var1 != null?1:0); - var3.__j_296(var0.getPath()); - if(var1 != null) { - var3.__j_296(""); + var3.writeByte(var1 != null ? 1 : 0); + var3.method37(var0.getPath()); + if (var1 != null) { + var3.method37(""); } var2.write(var3.array, 0, var3.index); @@ -36,12 +36,12 @@ public class class14 { ) public static char method171(byte var0) { int var1 = var0 & 255; - if(var1 == 0) { + if (var1 == 0) { throw new IllegalArgumentException(""); } else { - if(var1 >= 128 && var1 < 160) { + if (var1 >= 128 && var1 < 160) { char var2 = class304.cp1252AsciiExtension[var1 - 128]; - if(var2 == 0) { + if (var2 == 0) { var2 = '?'; } @@ -58,6 +58,6 @@ public class class14 { garbageValue = "-1103685678" ) static boolean method169() { - return (Client.__client_ke & 8) != 0; + return (Client.field210 & 8) != 0; } } diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java index 0bcb48c166..42d91b8e84 100644 --- a/runescape-client/src/main/java/class15.java +++ b/runescape-client/src/main/java/class15.java @@ -9,7 +9,7 @@ public class class15 extends class21 { @ObfuscatedGetter( longValue = 3423502126894795079L ) - static long __z_si; + static long field1113; @ObfuscatedName("j") @ObfuscatedSignature( signature = "Lap;" @@ -36,17 +36,17 @@ public class class15 extends class21 { ) void method173(Buffer var1) { int var2 = var1.readUnsignedByte(); - if(var2 != class31.field259.field255) { + if (var2 != class31.field259.field255) { throw new IllegalStateException(""); } else { super.field148 = var1.readUnsignedByte(); super.field156 = var1.readUnsignedByte(); - super.field149 = var1.__ag_302(); - super.field146 = var1.__ag_302(); - super.field159 = var1.__ag_302(); - super.field147 = var1.__ag_302(); - super.field150 = var1.__ap_310(); - super.field152 = var1.__ap_310(); + super.field149 = var1.method43(); + super.field146 = var1.method43(); + super.field159 = var1.method43(); + super.field147 = var1.method43(); + super.field150 = var1.method51(); + super.field152 = var1.method51(); } } @@ -63,14 +63,14 @@ public class class15 extends class21 { super.field155 = new byte[super.field156][64][64]; super.field144 = new class25[super.field156][64][64][]; int var2 = var1.readUnsignedByte(); - if(var2 != class30.field246.field248) { + if (var2 != class30.field246.field248) { throw new IllegalStateException(""); } else { int var3 = var1.readUnsignedByte(); int var4 = var1.readUnsignedByte(); - if(var3 == super.field159 && var4 == super.field147) { - for(int var5 = 0; var5 < 64; ++var5) { - for(int var6 = 0; var6 < 64; ++var6) { + if (var3 == super.field159 && var4 == super.field147) { + for (int var5 = 0; var5 < 64; ++var5) { + for (int var6 = 0; var6 < 64; ++var6) { this.method259(var5, var6, var1); } } @@ -82,7 +82,7 @@ public class class15 extends class21 { } public boolean equals(Object var1) { - if(!(var1 instanceof class15)) { + if (!(var1 instanceof class15)) { return false; } else { class15 var2 = (class15)var1; @@ -100,13 +100,13 @@ public class class15 extends class21 { garbageValue = "3" ) static final int method183(int var0, int var1) { - if(var0 == -1) { + if (var0 == -1) { return 12345678; } else { var1 = (var0 & 127) * var1 / 128; - if(var1 < 2) { + if (var1 < 2) { var1 = 2; - } else if(var1 > 126) { + } else if (var1 > 126) { var1 = 126; } @@ -121,12 +121,12 @@ public class class15 extends class21 { ) static int method182(int var0, Script var1, boolean var2) { Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - if(var0 == 2800) { + if (var0 == 2800) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class211.method4107(class1.getWidgetClickMask(var3)); return 1; - } else if(var0 != 2801) { - if(var0 == 2802) { - if(var3.dataText == null) { + } else if (var0 != 2801) { + if (var0 == 2802) { + if (var3.dataText == null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } else { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText; @@ -139,7 +139,7 @@ public class class15 extends class21 { } else { int var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; --var4; - if(var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; } else { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; @@ -155,10 +155,10 @@ public class class15 extends class21 { garbageValue = "-1757982583" ) static final void method184(boolean var0) { - if(var0) { - Client.field658 = Login.__cu_ba?class159.field1980:class159.field1983; + if (var0) { + Client.field658 = Login.field470 ? class159.field1980 : class159.field1983; } else { - Client.field658 = ReflectionCheck.clientPreferences.parameters.containsKey(Integer.valueOf(class279.method5357(Login.Login_username)))?class159.field1982:class159.field1985; + Client.field658 = ReflectionCheck.clientPreferences.parameters.containsKey(class279.method5357(Login.Login_username)) ? class159.field1982 : class159.field1985; } } @@ -170,40 +170,39 @@ public class class15 extends class21 { ) static final void method186(Widget var0) { int var1 = var0.contentType; - if(var1 == 324) { - if(Client.__client_sd == -1) { - Client.__client_sd = var0.spriteId2; - Client.__client_sl = var0.spriteId; + if (var1 == 324) { + if (Client.field118 == -1) { + Client.field118 = var0.spriteId2; + Client.field120 = var0.spriteId; } - if(Client.__client_ru.isFemale) { - var0.spriteId2 = Client.__client_sd; + if (Client.field119.isFemale) { + var0.spriteId2 = Client.field118; } else { - var0.spriteId2 = Client.__client_sl; + var0.spriteId2 = Client.field120; + } + } else if (var1 == 325) { + if (Client.field118 == -1) { + Client.field118 = var0.spriteId2; + Client.field120 = var0.spriteId; } - } else if(var1 == 325) { - if(Client.__client_sd == -1) { - Client.__client_sd = var0.spriteId2; - Client.__client_sl = var0.spriteId; - } - - if(Client.__client_ru.isFemale) { - var0.spriteId2 = Client.__client_sl; + if (Client.field119.isFemale) { + var0.spriteId2 = Client.field120; } else { - var0.spriteId2 = Client.__client_sd; + var0.spriteId2 = Client.field118; } - - } else if(var1 == 327) { + } else if (var1 == 327) { var0.modelAngleX = 150; var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; var0.modelType = 5; var0.modelId = 0; - } else if(var1 == 328) { + } else if (var1 == 328) { var0.modelAngleX = 150; var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; var0.modelType = 5; var0.modelId = 1; } + } } diff --git a/runescape-client/src/main/java/class157.java b/runescape-client/src/main/java/class157.java index 4f2d436c49..a7d3eb0d9f 100644 --- a/runescape-client/src/main/java/class157.java +++ b/runescape-client/src/main/java/class157.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -9,7 +8,7 @@ public class class157 extends AbstractUserComparator { @ObfuscatedGetter( intValue = 1006519291 ) - static int __fw_nm; + static int field1114; @ObfuscatedName("m") final boolean field1969; @@ -23,7 +22,7 @@ public class class157 extends AbstractUserComparator { garbageValue = "884616259" ) int method3381(Buddy var1, Buddy var2) { - return var2.rank != var1.rank?(this.field1969?var1.rank - var2.rank:var2.rank - var1.rank):this.__x_461(var1, var2); + return var2.rank != var1.rank ? (this.field1969 ? var1.rank - var2.rank : var2.rank - var1.rank) : this.method12(var1, var2); } public int compare(Object var1, Object var2) { @@ -39,6 +38,6 @@ public class class157 extends AbstractUserComparator { Widget.widgetSpriteCache.clear(); Widget.Widget_cachedModels.clear(); Widget.Widget_cachedFonts.clear(); - Widget.__ho_z.clear(); + Widget.field956.clear(); } } diff --git a/runescape-client/src/main/java/class159.java b/runescape-client/src/main/java/class159.java index f38ef0ffc0..658ded8e00 100644 --- a/runescape-client/src/main/java/class159.java +++ b/runescape-client/src/main/java/class159.java @@ -37,7 +37,7 @@ public enum class159 implements Enumerated { ) final int field1981; - class159(int var3, int var4) { + private class159(int var3, int var4) { this.field1984 = var3; this.field1981 = var4; } diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index ad03754107..37218b7f60 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -38,11 +38,11 @@ public class class16 { int var3 = var2.length(); int var4 = var1; - for(int var5 = 0; var5 < var3; ++var5) { + for (int var5 = 0; var5 < var3; ++var5) { char var6 = var2.charAt(var5); - if(var6 <= 127) { + if (var6 <= 127) { var0[var4++] = (byte)var6; - } else if(var6 <= 2047) { + } else if (var6 <= 2047) { var0[var4++] = (byte)(192 | var6 >> 6); var0[var4++] = (byte)(128 | var6 & '?'); } else { @@ -61,13 +61,13 @@ public class class16 { garbageValue = "1394688825" ) static int method188(int var0, Script var1, boolean var2) { - Widget var3 = var2?WorldMapIcon1.__t_i:class12.__n_n; - if(var0 == 1800) { + Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + if (var0 == 1800) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class211.method4107(class1.getWidgetClickMask(var3)); return 1; - } else if(var0 != 1801) { - if(var0 == 1802) { - if(var3.dataText == null) { + } else if (var0 != 1801) { + if (var0 == 1802) { + if (var3.dataText == null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } else { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText; @@ -80,7 +80,7 @@ public class class16 { } else { int var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; --var4; - if(var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; } else { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; @@ -97,44 +97,44 @@ public class class16 { ) static final void method189(class190 var0) { PacketBuffer var1 = Client.packetWriter.packetBuffer; + int var2; int var3; + int var4; int var5; int var6; int var7; int var8; int var9; - int var10; - int var12; - byte var13; - int var14; - if(class190.field2342 == var0) { - byte var2 = var1.__bk_320(); - var3 = var1.__bm_326(); - byte var4 = var1.__bk_320(); - var5 = var1.__bu_325(); - var6 = var1.__ag_302(); - var7 = var1.__bb_317(); - var8 = var7 >> 2; - var9 = var7 & 3; - var10 = Client.__client_gd[var8]; - byte var11 = var1.__bn_319(); - var12 = var1.__by_324(); - var13 = var1.__bk_320(); - var14 = var1.readUnsignedByteNegate(); - int var15 = (var14 >> 4 & 7) + WorldMapSection3.__p_go; - int var16 = (var14 & 7) + Canvas.__ao_gk; + byte var10; + int var11; + if (class190.field2342 == var0) { + byte var12 = var1.method61(); + var2 = var1.method67(); + byte var13 = var1.method61(); + var3 = var1.method66(); + var4 = var1.method43(); + var5 = var1.method58(); + var6 = var5 >> 2; + var7 = var5 & 3; + var8 = Client.field182[var6]; + byte var14 = var1.method60(); + var9 = var1.method65(); + var10 = var1.method61(); + var11 = var1.readUnsignedByteNegate(); + int var15 = (var11 >> 4 & 7) + WorldMapSection3.field1089; + int var16 = (var11 & 7) + Canvas.field95; Player var17; - if(var12 == Client.localPlayerIndex) { + if (var9 == Client.localPlayerIndex) { var17 = Canvas.localPlayer; } else { - var17 = Client.players[var12]; + var17 = Client.players[var9]; } - if(var17 != null) { - ObjectDefinition var18 = class50.getObjectDefinition(var5); + if (var17 != null) { + ObjectDefinition var18 = class50.getObjectDefinition(var3); int var19; int var20; - if(var9 != 1 && var9 != 3) { + if (var7 != 1 && var7 != 3) { var19 = var18.sizeX; var20 = var18.sizeY; } else { @@ -150,259 +150,253 @@ public class class16 { int var26 = var25[var22][var23] + var25[var21][var23] + var25[var21][var24] + var25[var22][var24] >> 2; int var27 = (var15 << 7) + (var19 << 6); int var28 = (var16 << 7) + (var20 << 6); - Model var29 = var18.getModel(var8, var9, var25, var27, var26, var28); - if(var29 != null) { - class258.method4898(SoundSystem.plane, var15, var16, var10, -1, 0, 0, var6 + 1, var3 + 1); - var17.animationCycleStart = var6 + Client.cycle; - var17.animationCycleEnd = var3 + Client.cycle; + Model var29 = var18.getModel(var6, var7, var25, var27, var26, var28); + if (var29 != null) { + class258.method4898(SoundSystem.plane, var15, var16, var8, -1, 0, 0, var4 + 1, var2 + 1); + var17.animationCycleStart = var4 + Client.cycle; + var17.animationCycleEnd = var2 + Client.cycle; var17.model0 = var29; - var17.__k = var15 * 128 + var19 * 64; - var17.__i = var16 * 128 + var20 * 64; + var17.field719 = var15 * 128 + var19 * 64; + var17.field720 = var16 * 128 + var20 * 64; var17.tileHeight2 = var26; byte var30; - if(var2 > var13) { - var30 = var2; - var2 = var13; + if (var12 > var10) { + var30 = var12; + var12 = var10; + var10 = var30; + } + + if (var14 > var13) { + var30 = var14; + var14 = var13; var13 = var30; } - if(var11 > var4) { - var30 = var11; - var11 = var4; - var4 = var30; - } - - var17.__z = var15 + var2; - var17.__s = var13 + var15; - var17.__j = var11 + var16; - var17.__t = var4 + var16; + var17.field721 = var15 + var12; + var17.field723 = var10 + var15; + var17.field722 = var14 + var16; + var17.field724 = var13 + var16; } } } - int var37; - int var38; - if(class190.field2349 == var0) { - var37 = var1.__bb_317(); - var3 = (var37 >> 4 & 7) + WorldMapSection3.__p_go; - var38 = (var37 & 7) + Canvas.__ao_gk; - var5 = var1.__bq_318(); - var6 = var5 >> 2; - var7 = var5 & 3; - var8 = Client.__client_gd[var6]; - var9 = var1.__bu_325(); - if(var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) { - class258.method4898(SoundSystem.plane, var3, var38, var8, var9, var6, var7, 0, -1); + int var31; + int var32; + if (class190.field2349 == var0) { + var31 = var1.method58(); + var2 = (var31 >> 4 & 7) + WorldMapSection3.field1089; + var32 = (var31 & 7) + Canvas.field95; + var3 = var1.method59(); + var4 = var3 >> 2; + var5 = var3 & 3; + var6 = Client.field182[var4]; + var7 = var1.method66(); + if (var2 >= 0 && var32 >= 0 && var2 < 104 && var32 < 104) { + class258.method4898(SoundSystem.plane, var2, var32, var6, var7, var4, var5, 0, -1); } - } else { - if(class190.field2345 == var0) { - var37 = var1.readUnsignedByte(); - var3 = (var37 >> 4 & 7) + WorldMapSection3.__p_go; - var38 = (var37 & 7) + Canvas.__ao_gk; - var5 = var1.__bq_318(); - var6 = var1.__bb_317(); - var7 = var6 >> 4 & 15; - var8 = var6 & 7; - var9 = var1.__bm_326(); - if(var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) { - var10 = var7 + 1; - if(Canvas.localPlayer.pathX[0] >= var3 - var10 && Canvas.localPlayer.pathX[0] <= var10 + var3 && Canvas.localPlayer.pathY[0] >= var38 - var10 && Canvas.localPlayer.pathY[0] <= var10 + var38 && Client.__client_qc != 0 && var8 > 0 && Client.soundEffectCount < 50) { - Client.soundEffectIds[Client.soundEffectCount] = var9; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var5; + if (class190.field2345 == var0) { + var31 = var1.readUnsignedByte(); + var2 = (var31 >> 4 & 7) + WorldMapSection3.field1089; + var32 = (var31 & 7) + Canvas.field95; + var3 = var1.method59(); + var4 = var1.method58(); + var5 = var4 >> 4 & 15; + var6 = var4 & 7; + var7 = var1.method67(); + if (var2 >= 0 && var32 >= 0 && var2 < 104 && var32 < 104) { + var8 = var5 + 1; + if (Canvas.localPlayer.pathX[0] >= var2 - var8 && Canvas.localPlayer.pathX[0] <= var8 + var2 && Canvas.localPlayer.pathY[0] >= var32 - var8 && Canvas.localPlayer.pathY[0] <= var8 + var32 && Client.field115 != 0 && var6 > 0 && Client.soundEffectCount < 50) { + Client.soundEffectIds[Client.soundEffectCount] = var7; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var3; Client.soundEffects[Client.soundEffectCount] = null; - Client.soundLocations[Client.soundEffectCount] = var7 + (var38 << 8) + (var3 << 16); + Client.soundLocations[Client.soundEffectCount] = var5 + (var32 << 8) + (var2 << 16); ++Client.soundEffectCount; } } } - if(class190.field2341 == var0) { - var37 = var1.__ag_302(); - var3 = var1.__bb_317(); - var38 = var1.__bu_325(); - var5 = var1.readUnsignedByte(); - var6 = (var5 >> 4 & 7) + WorldMapSection3.__p_go; - var7 = (var5 & 7) + Canvas.__ao_gk; - if(var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { - var6 = var6 * 128 + 64; - var7 = var7 * 128 + 64; - GraphicsObject var42 = new GraphicsObject(var37, SoundSystem.plane, var6, var7, class32.getTileHeight(var6, var7, SoundSystem.plane) - var3, var38, Client.cycle); - Client.graphicsObjects.addFirst(var42); + if (class190.field2341 == var0) { + var31 = var1.method43(); + var2 = var1.method58(); + var32 = var1.method66(); + var3 = var1.readUnsignedByte(); + var4 = (var3 >> 4 & 7) + WorldMapSection3.field1089; + var5 = (var3 & 7) + Canvas.field95; + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { + var4 = var4 * 128 + 64; + var5 = var5 * 128 + 64; + GraphicsObject var33 = new GraphicsObject(var31, SoundSystem.plane, var4, var5, class32.getTileHeight(var4, var5, SoundSystem.plane) - var2, var32, Client.cycle); + Client.graphicsObjects.addFirst(var33); } - } else { - int var39; - if(class190.field2344 == var0) { - var37 = var1.__bq_318(); - var3 = var37 >> 2; - var38 = var37 & 3; - var5 = Client.__client_gd[var3]; - var6 = var1.readUnsignedByteNegate(); - var7 = (var6 >> 4 & 7) + WorldMapSection3.__p_go; - var8 = (var6 & 7) + Canvas.__ao_gk; - var9 = var1.__ag_302(); - if(var7 >= 0 && var8 >= 0 && var7 < 103 && var8 < 103) { - if(var5 == 0) { - BoundaryObject var32 = class65.scene.getBoundaryObject(SoundSystem.plane, var7, var8); - if(var32 != null) { - var39 = HitSplatDefinition.method4972(var32.tag); - if(var3 == 2) { - var32.entity1 = new DynamicObject(var39, 2, var38 + 4, SoundSystem.plane, var7, var8, var9, false, var32.entity1); - var32.entity2 = new DynamicObject(var39, 2, var38 + 1 & 3, SoundSystem.plane, var7, var8, var9, false, var32.entity2); + int var35; + if (class190.field2344 == var0) { + var31 = var1.method59(); + var2 = var31 >> 2; + var32 = var31 & 3; + var3 = Client.field182[var2]; + var4 = var1.readUnsignedByteNegate(); + var5 = (var4 >> 4 & 7) + WorldMapSection3.field1089; + var6 = (var4 & 7) + Canvas.field95; + var7 = var1.method43(); + if (var5 >= 0 && var6 >= 0 && var5 < 103 && var6 < 103) { + if (var3 == 0) { + BoundaryObject var34 = class65.scene.getBoundaryObject(SoundSystem.plane, var5, var6); + if (var34 != null) { + var35 = HitSplatDefinition.method4972(var34.tag); + if (var2 == 2) { + var34.entity1 = new DynamicObject(var35, 2, var32 + 4, SoundSystem.plane, var5, var6, var7, false, var34.entity1); + var34.entity2 = new DynamicObject(var35, 2, var32 + 1 & 3, SoundSystem.plane, var5, var6, var7, false, var34.entity2); } else { - var32.entity1 = new DynamicObject(var39, var3, var38, SoundSystem.plane, var7, var8, var9, false, var32.entity1); + var34.entity1 = new DynamicObject(var35, var2, var32, SoundSystem.plane, var5, var6, var7, false, var34.entity1); } } } - if(var5 == 1) { - WallDecoration var43 = class65.scene.getWallDecoration(SoundSystem.plane, var7, var8); - if(var43 != null) { - var39 = HitSplatDefinition.method4972(var43.tag); - if(var3 != 4 && var3 != 5) { - if(var3 == 6) { - var43.entity1 = new DynamicObject(var39, 4, var38 + 4, SoundSystem.plane, var7, var8, var9, false, var43.entity1); - } else if(var3 == 7) { - var43.entity1 = new DynamicObject(var39, 4, (var38 + 2 & 3) + 4, SoundSystem.plane, var7, var8, var9, false, var43.entity1); - } else if(var3 == 8) { - var43.entity1 = new DynamicObject(var39, 4, var38 + 4, SoundSystem.plane, var7, var8, var9, false, var43.entity1); - var43.entity2 = new DynamicObject(var39, 4, (var38 + 2 & 3) + 4, SoundSystem.plane, var7, var8, var9, false, var43.entity2); + if (var3 == 1) { + WallDecoration var36 = class65.scene.getWallDecoration(SoundSystem.plane, var5, var6); + if (var36 != null) { + var35 = HitSplatDefinition.method4972(var36.tag); + if (var2 != 4 && var2 != 5) { + if (var2 == 6) { + var36.entity1 = new DynamicObject(var35, 4, var32 + 4, SoundSystem.plane, var5, var6, var7, false, var36.entity1); + } else if (var2 == 7) { + var36.entity1 = new DynamicObject(var35, 4, (var32 + 2 & 3) + 4, SoundSystem.plane, var5, var6, var7, false, var36.entity1); + } else if (var2 == 8) { + var36.entity1 = new DynamicObject(var35, 4, var32 + 4, SoundSystem.plane, var5, var6, var7, false, var36.entity1); + var36.entity2 = new DynamicObject(var35, 4, (var32 + 2 & 3) + 4, SoundSystem.plane, var5, var6, var7, false, var36.entity2); } } else { - var43.entity1 = new DynamicObject(var39, 4, var38, SoundSystem.plane, var7, var8, var9, false, var43.entity1); + var36.entity1 = new DynamicObject(var35, 4, var32, SoundSystem.plane, var5, var6, var7, false, var36.entity1); } } } - if(var5 == 2) { - GameObject var44 = class65.scene.__aj_243(SoundSystem.plane, var7, var8); - if(var3 == 11) { - var3 = 10; + if (var3 == 2) { + GameObject var37 = class65.scene.method289(SoundSystem.plane, var5, var6); + if (var2 == 11) { + var2 = 10; } - if(var44 != null) { - var44.entity = new DynamicObject(HitSplatDefinition.method4972(var44.tag), var3, var38, SoundSystem.plane, var7, var8, var9, false, var44.entity); + if (var37 != null) { + var37.entity = new DynamicObject(HitSplatDefinition.method4972(var37.tag), var2, var32, SoundSystem.plane, var5, var6, var7, false, var37.entity); } } - if(var5 == 3) { - FloorDecoration var45 = class65.scene.getFloorDecoration(SoundSystem.plane, var7, var8); - if(var45 != null) { - var45.entity = new DynamicObject(HitSplatDefinition.method4972(var45.tag), 22, var38, SoundSystem.plane, var7, var8, var9, false, var45.entity); + if (var3 == 3) { + FloorDecoration var39 = class65.scene.getFloorDecoration(SoundSystem.plane, var5, var6); + if (var39 != null) { + var39.entity = new DynamicObject(HitSplatDefinition.method4972(var39.tag), 22, var32, SoundSystem.plane, var5, var6, var7, false, var39.entity); } } } - } else { - GroundItem var34; - if(class190.field2347 == var0) { - var37 = var1.__bb_317(); - var3 = (var37 >> 4 & 7) + WorldMapSection3.__p_go; - var38 = (var37 & 7) + Canvas.__ao_gk; - var5 = var1.__bm_326(); - if(var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) { - NodeDeque var33 = Client.groundItems[SoundSystem.plane][var3][var38]; - if(var33 != null) { - for(var34 = (GroundItem)var33.last(); var34 != null; var34 = (GroundItem)var33.previous()) { - if((var5 & 32767) == var34.id) { - var34.remove(); + NodeDeque var38; + GroundItem var41; + if (class190.field2347 == var0) { + var31 = var1.method58(); + var2 = (var31 >> 4 & 7) + WorldMapSection3.field1089; + var32 = (var31 & 7) + Canvas.field95; + var3 = var1.method67(); + if (var2 >= 0 && var32 >= 0 && var2 < 104 && var32 < 104) { + var38 = Client.groundItems[SoundSystem.plane][var2][var32]; + if (var38 != null) { + for (var41 = (GroundItem)var38.last(); var41 != null; var41 = (GroundItem)var38.previous()) { + if ((var3 & 32767) == var41.id) { + var41.remove(); break; } } - if(var33.last() == null) { - Client.groundItems[SoundSystem.plane][var3][var38] = null; + if (var38.last() == null) { + Client.groundItems[SoundSystem.plane][var2][var32] = null; } - TilePaint.method3061(var3, var38); + TilePaint.method3061(var2, var32); } } - - } else if(class190.field2350 == var0) { - var37 = var1.__bq_318(); - var3 = var37 >> 2; - var38 = var37 & 3; - var5 = Client.__client_gd[var3]; - var6 = var1.__bq_318(); - var7 = (var6 >> 4 & 7) + WorldMapSection3.__p_go; - var8 = (var6 & 7) + Canvas.__ao_gk; - if(var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { - class258.method4898(SoundSystem.plane, var7, var8, var5, -1, var3, var38, 0, -1); + } else if (class190.field2350 == var0) { + var31 = var1.method59(); + var2 = var31 >> 2; + var32 = var31 & 3; + var3 = Client.field182[var2]; + var4 = var1.method59(); + var5 = (var4 >> 4 & 7) + WorldMapSection3.field1089; + var6 = (var4 & 7) + Canvas.field95; + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { + class258.method4898(SoundSystem.plane, var5, var6, var3, -1, var2, var32, 0, -1); } - - } else if(class190.field2352 == var0) { - var37 = var1.__bq_318() * 4; - var3 = var1.__ag_302(); - var38 = var1.__bu_325(); - var5 = var1.__bq_318() * 4; - var6 = var1.__bl_327(); - var7 = var1.readUnsignedByte(); - var8 = var1.__bq_318(); - var9 = var1.__by_324(); - var10 = var1.__bb_317(); - var39 = (var10 >> 4 & 7) + WorldMapSection3.__p_go; - var12 = (var10 & 7) + Canvas.__ao_gk; - var13 = var1.__bn_319(); - byte var40 = var1.__bk_320(); - var14 = var40 + var39; - int var41 = var13 + var12; - if(var39 >= 0 && var12 >= 0 && var39 < 104 && var12 < 104 && var14 >= 0 && var41 >= 0 && var14 < 104 && var41 < 104 && var38 != 65535) { - var39 = var39 * 128 + 64; - var12 = var12 * 128 + 64; - var14 = var14 * 128 + 64; - var41 = var41 * 128 + 64; - Projectile var35 = new Projectile(var38, SoundSystem.plane, var39, var12, class32.getTileHeight(var39, var12, SoundSystem.plane) - var5, var9 + Client.cycle, var3 + Client.cycle, var7, var8, var6, var37); - var35.setDestination(var14, var41, class32.getTileHeight(var14, var41, SoundSystem.plane) - var37, var9 + Client.cycle); - Client.projectiles.addFirst(var35); + } else if (class190.field2352 == var0) { + var31 = var1.method59() * 4; + var2 = var1.method43(); + var32 = var1.method66(); + var3 = var1.method59() * 4; + var4 = var1.method68(); + var5 = var1.readUnsignedByte(); + var6 = var1.method59(); + var7 = var1.method65(); + var8 = var1.method58(); + var35 = (var8 >> 4 & 7) + WorldMapSection3.field1089; + var9 = (var8 & 7) + Canvas.field95; + var10 = var1.method60(); + byte var40 = var1.method61(); + var11 = var40 + var35; + int var42 = var10 + var9; + if (var35 >= 0 && var9 >= 0 && var35 < 104 && var9 < 104 && var11 >= 0 && var42 >= 0 && var11 < 104 && var42 < 104 && var32 != 65535) { + var35 = var35 * 128 + 64; + var9 = var9 * 128 + 64; + var11 = var11 * 128 + 64; + var42 = var42 * 128 + 64; + Projectile var43 = new Projectile(var32, SoundSystem.plane, var35, var9, class32.getTileHeight(var35, var9, SoundSystem.plane) - var3, var7 + Client.cycle, var2 + Client.cycle, var5, var6, var4, var31); + var43.setDestination(var11, var42, class32.getTileHeight(var11, var42, SoundSystem.plane) - var31, var7 + Client.cycle); + Client.projectiles.addFirst(var43); } - - } else if(class190.field2346 != var0) { - if(class190.field2343 == var0) { - var37 = var1.__bu_325(); - var3 = var1.__bm_326(); - var38 = var1.__bb_317(); - var5 = (var38 >> 4 & 7) + WorldMapSection3.__p_go; - var6 = (var38 & 7) + Canvas.__ao_gk; - if(var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { - var34 = new GroundItem(); - var34.id = var3; - var34.quantity = var37; - if(Client.groundItems[SoundSystem.plane][var5][var6] == null) { - Client.groundItems[SoundSystem.plane][var5][var6] = new NodeDeque(); + } else if (class190.field2346 != var0) { + if (class190.field2343 == var0) { + var31 = var1.method66(); + var2 = var1.method67(); + var32 = var1.method58(); + var3 = (var32 >> 4 & 7) + WorldMapSection3.field1089; + var4 = (var32 & 7) + Canvas.field95; + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { + var41 = new GroundItem(); + var41.id = var2; + var41.quantity = var31; + if (Client.groundItems[SoundSystem.plane][var3][var4] == null) { + Client.groundItems[SoundSystem.plane][var3][var4] = new NodeDeque(); } - Client.groundItems[SoundSystem.plane][var5][var6].addFirst(var34); - TilePaint.method3061(var5, var6); + Client.groundItems[SoundSystem.plane][var3][var4].addFirst(var41); + TilePaint.method3061(var3, var4); } - } } else { - var37 = var1.__by_324(); - var3 = var1.__bm_326(); - var38 = var1.__by_324(); - var5 = var1.__bb_317(); - var6 = (var5 >> 4 & 7) + WorldMapSection3.__p_go; - var7 = (var5 & 7) + Canvas.__ao_gk; - if(var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { - NodeDeque var31 = Client.groundItems[SoundSystem.plane][var6][var7]; - if(var31 != null) { - for(GroundItem var36 = (GroundItem)var31.last(); var36 != null; var36 = (GroundItem)var31.previous()) { - if((var37 & 32767) == var36.id && var38 == var36.quantity) { - var36.quantity = var3; + var31 = var1.method65(); + var2 = var1.method67(); + var32 = var1.method65(); + var3 = var1.method58(); + var4 = (var3 >> 4 & 7) + WorldMapSection3.field1089; + var5 = (var3 & 7) + Canvas.field95; + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { + var38 = Client.groundItems[SoundSystem.plane][var4][var5]; + if (var38 != null) { + for (GroundItem var44 = (GroundItem)var38.last(); var44 != null; var44 = (GroundItem)var38.previous()) { + if ((var31 & 32767) == var44.id && var32 == var44.quantity) { + var44.quantity = var2; break; } } - TilePaint.method3061(var6, var7); + TilePaint.method3061(var4, var5); } } - } } } } + } @ObfuscatedName("il") @@ -412,19 +406,17 @@ public class class16 { ) @Export("insertMenuItem") static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { - if(!Client.isMenuOpen) { - if(Client.menuOptionsCount < 500) { - Client.menuActions[Client.menuOptionsCount] = var0; - Client.menuTargetNames[Client.menuOptionsCount] = var1; - Client.menuOpcodes[Client.menuOptionsCount] = var2; - Client.menuArguments0[Client.menuOptionsCount] = var3; - Client.menuArguments1[Client.menuOptionsCount] = var4; - Client.menuArguments2[Client.menuOptionsCount] = var5; - Client.menuShiftClick[Client.menuOptionsCount] = var6; - ++Client.menuOptionsCount; - } - + if (!Client.isMenuOpen && Client.menuOptionsCount < 500) { + Client.menuActions[Client.menuOptionsCount] = var0; + Client.menuTargetNames[Client.menuOptionsCount] = var1; + Client.menuOpcodes[Client.menuOptionsCount] = var2; + Client.menuArguments0[Client.menuOptionsCount] = var3; + Client.menuArguments1[Client.menuOptionsCount] = var4; + Client.menuArguments2[Client.menuOptionsCount] = var5; + Client.menuShiftClick[Client.menuOptionsCount] = var6; + ++Client.menuOptionsCount; } + } @ObfuscatedName("ii") @@ -433,30 +425,30 @@ public class class16 { garbageValue = "931169314" ) static final int method187(Widget var0, int var1) { - if(var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { + if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { try { int[] var2 = var0.cs1Instructions[var1]; int var3 = 0; int var4 = 0; byte var5 = 0; - while(true) { + while (true) { int var6 = var2[var4++]; int var7 = 0; byte var8 = 0; - if(var6 == 0) { + if (var6 == 0) { return var3; } - if(var6 == 1) { + if (var6 == 1) { var7 = Client.currentLevels[var2[var4++]]; } - if(var6 == 2) { + if (var6 == 2) { var7 = Client.levels[var2[var4++]]; } - if(var6 == 3) { + if (var6 == 3) { var7 = Client.experience[var2[var4++]]; } @@ -464,52 +456,52 @@ public class class16 { Widget var10; int var11; int var12; - if(var6 == 4) { + if (var6 == 4) { var9 = var2[var4++] << 16; var9 += var2[var4++]; var10 = Huffman.getWidget(var9); var11 = var2[var4++]; - if(var11 != -1 && (!Skills.getItemDefinition(var11).isMembersOnly || Client.isMembersWorld)) { - for(var12 = 0; var12 < var10.itemIds.length; ++var12) { - if(var11 + 1 == var10.itemIds[var12]) { + if (var11 != -1 && (!Skills.getItemDefinition(var11).isMembersOnly || Client.isMembersWorld)) { + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { + if (var11 + 1 == var10.itemIds[var12]) { var7 += var10.itemQuantities[var12]; } } } } - if(var6 == 5) { + if (var6 == 5) { var7 = Varps.Varps_main[var2[var4++]]; } - if(var6 == 6) { + if (var6 == 6) { var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; } - if(var6 == 7) { + if (var6 == 7) { var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; } - if(var6 == 8) { + if (var6 == 8) { var7 = Canvas.localPlayer.combatLevel; } - if(var6 == 9) { - for(var9 = 0; var9 < 25; ++var9) { - if(Skills.Skills_enabled[var9]) { + if (var6 == 9) { + for (var9 = 0; var9 < 25; ++var9) { + if (Skills.Skills_enabled[var9]) { var7 += Client.levels[var9]; } } } - if(var6 == 10) { + if (var6 == 10) { var9 = var2[var4++] << 16; var9 += var2[var4++]; var10 = Huffman.getWidget(var9); var11 = var2[var4++]; - if(var11 != -1 && (!Skills.getItemDefinition(var11).isMembersOnly || Client.isMembersWorld)) { - for(var12 = 0; var12 < var10.itemIds.length; ++var12) { - if(var11 + 1 == var10.itemIds[var12]) { + if (var11 != -1 && (!Skills.getItemDefinition(var11).isMembersOnly || Client.isMembersWorld)) { + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { + if (var11 + 1 == var10.itemIds[var12]) { var7 = 999999999; break; } @@ -517,63 +509,63 @@ public class class16 { } } - if(var6 == 11) { + if (var6 == 11) { var7 = Client.runEnergy; } - if(var6 == 12) { + if (var6 == 12) { var7 = Client.weight; } - if(var6 == 13) { + if (var6 == 13) { var9 = Varps.Varps_main[var2[var4++]]; int var13 = var2[var4++]; - var7 = (var9 & 1 << var13) != 0?1:0; + var7 = (var9 & 1 << var13) != 0 ? 1 : 0; } - if(var6 == 14) { + if (var6 == 14) { var9 = var2[var4++]; var7 = WorldMapSection2.getVarbit(var9); } - if(var6 == 15) { + if (var6 == 15) { var8 = 1; } - if(var6 == 16) { + if (var6 == 16) { var8 = 2; } - if(var6 == 17) { + if (var6 == 17) { var8 = 3; } - if(var6 == 18) { + if (var6 == 18) { var7 = (Canvas.localPlayer.x >> 7) + class50.baseX; } - if(var6 == 19) { + if (var6 == 19) { var7 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY; } - if(var6 == 20) { + if (var6 == 20) { var7 = var2[var4++]; } - if(var8 == 0) { - if(var5 == 0) { + if (var8 == 0) { + if (var5 == 0) { var3 += var7; } - if(var5 == 1) { + if (var5 == 1) { var3 -= var7; } - if(var5 == 2 && var7 != 0) { + if (var5 == 2 && var7 != 0) { var3 /= var7; } - if(var5 == 3) { + if (var5 == 3) { var3 *= var7; } diff --git a/runescape-client/src/main/java/class168.java b/runescape-client/src/main/java/class168.java index 4b534460d2..9073494309 100644 --- a/runescape-client/src/main/java/class168.java +++ b/runescape-client/src/main/java/class168.java @@ -7,7 +7,7 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("fs") public class class168 { @ObfuscatedName("o") - public static File __fs_o; + public static File field1115; @ObfuscatedName("u") @ObfuscatedGetter( intValue = -2051451755 @@ -39,12 +39,6 @@ public class class168 { @Export("optionButtonSpriteSubWidth") static int optionButtonSpriteSubWidth; - static { - randomDat = null; - dat2File = null; - idx255File = null; - } - @ObfuscatedName("o") @ObfuscatedSignature( signature = "(II)Z", @@ -62,10 +56,16 @@ public class class168 { public static String method3450(char var0, int var1) { char[] var2 = new char[var1]; - for(int var3 = 0; var3 < var1; ++var3) { + for (int var3 = 0; var3 < var1; ++var3) { var2[var3] = var0; } return new String(var2); } + + static { + randomDat = null; + dat2File = null; + idx255File = null; + } } diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index e097229418..be6abab812 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -1,6 +1,5 @@ import java.io.File; import java.util.Hashtable; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,18 +10,13 @@ public class class171 { @ObfuscatedGetter( intValue = -852697585 ) - static int __fo_ro; + static int field1116; @ObfuscatedName("m") - public static boolean __fo_m; + public static boolean field1117; @ObfuscatedName("f") - public static File __fo_f; + public static File field1118; @ObfuscatedName("q") - static Hashtable __fo_q; - - static { - __fo_m = false; - __fo_q = new Hashtable(16); - } + static Hashtable field1119; @ObfuscatedName("m") @ObfuscatedSignature( @@ -33,36 +27,36 @@ public class class171 { KeyHandler var0 = KeyHandler.KeyHandler_instance; synchronized(KeyHandler.KeyHandler_instance) { ++KeyHandler.KeyHandler_idleCycles; - KeyHandler.__an_ct = KeyHandler.__an_cc; - KeyHandler.__an_cl = 0; - int var1; - if(KeyHandler.__an_cw < 0) { - for(var1 = 0; var1 < 112; ++var1) { - KeyHandler.KeyHandler_pressedKeys[var1] = false; + KeyHandler.field453 = KeyHandler.field455; + KeyHandler.field452 = 0; + int var2; + if (KeyHandler.field448 < 0) { + for (var2 = 0; var2 < 112; ++var2) { + KeyHandler.KeyHandler_pressedKeys[var2] = false; } - KeyHandler.__an_cw = KeyHandler.__an_ch; + KeyHandler.field448 = KeyHandler.field447; } else { - while(KeyHandler.__an_cw != KeyHandler.__an_ch) { - var1 = KeyHandler.__an_cq[KeyHandler.__an_ch]; - KeyHandler.__an_ch = KeyHandler.__an_ch + 1 & 127; - if(var1 < 0) { - KeyHandler.KeyHandler_pressedKeys[~var1] = false; + while (KeyHandler.field448 != KeyHandler.field447) { + var2 = KeyHandler.field446[KeyHandler.field447]; + KeyHandler.field447 = KeyHandler.field447 + 1 & 127; + if (var2 < 0) { + KeyHandler.KeyHandler_pressedKeys[~var2] = false; } else { - if(!KeyHandler.KeyHandler_pressedKeys[var1] && KeyHandler.__an_cl < KeyHandler.__an_cp.length - 1) { - KeyHandler.__an_cp[++KeyHandler.__an_cl - 1] = var1; + if (!KeyHandler.KeyHandler_pressedKeys[var2] && KeyHandler.field452 < KeyHandler.field451.length - 1) { + KeyHandler.field451[++KeyHandler.field452 - 1] = var2; } - KeyHandler.KeyHandler_pressedKeys[var1] = true; + KeyHandler.KeyHandler_pressedKeys[var2] = true; } } } - if(KeyHandler.__an_cl > 0) { + if (KeyHandler.field452 > 0) { KeyHandler.KeyHandler_idleCycles = 0; } - KeyHandler.__an_cc = KeyHandler.__an_cz; + KeyHandler.field455 = KeyHandler.field454; } } @@ -72,14 +66,14 @@ public class class171 { garbageValue = "-1048935304" ) public static int method3496(int var0, int var1, int var2, int var3, int var4, int var5) { - if((var5 & 1) == 1) { + if ((var5 & 1) == 1) { int var6 = var3; var3 = var4; var4 = var6; } var2 &= 3; - return var2 == 0?var1:(var2 == 1?7 - var0 - (var3 - 1):(var2 == 2?7 - var1 - (var4 - 1):var0)); + return var2 == 0 ? var1 : (var2 == 1 ? 7 - var0 - (var3 - 1) : (var2 == 2 ? 7 - var1 - (var4 - 1) : var0)); } @ObfuscatedName("fq") @@ -89,10 +83,10 @@ public class class171 { ) static void method3497() { int var0; - if(Client.titleLoadingStage == 0) { + if (Client.titleLoadingStage == 0) { class65.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); - for(var0 = 0; var0 < 4; ++var0) { + for (var0 = 0; var0 < 4; ++var0) { Client.collisionMaps[var0] = new CollisionMap(104, 104); } @@ -100,11 +94,11 @@ public class class171 { Login.Login_loadingText = "Starting game engine..."; Login.Login_loadingPercent = 5; Client.titleLoadingStage = 20; - } else if(Client.titleLoadingStage == 20) { + } else if (Client.titleLoadingStage == 20) { Login.Login_loadingText = "Prepared visibility map"; Login.Login_loadingPercent = 10; Client.titleLoadingStage = 30; - } else if(Client.titleLoadingStage == 30) { + } else if (Client.titleLoadingStage == 30) { AbstractIndexCache.indexCache0 = class22.newIndexCache(0, false, true, true); Skeleton.indexCache1 = class22.newIndexCache(1, false, true, true); ObjectSound.indexCache2 = class22.newIndexCache(2, true, false, true); @@ -122,36 +116,36 @@ public class class171 { class2.indexCache14 = class22.newIndexCache(14, false, true, true); WorldMapSection1.indexCache15 = class22.newIndexCache(15, false, true, true); class22.indexCache16 = class22.newIndexCache(17, true, true, true); - WorldMapLabelSize.__s_dq = class22.newIndexCache(18, false, true, true); - ItemContainer.__bc_dm = class22.newIndexCache(19, false, true, true); - AbstractByteArrayCopier.__gu_et = class22.newIndexCache(20, false, true, true); + WorldMapLabelSize.field1040 = class22.newIndexCache(18, false, true, true); + ItemContainer.field434 = class22.newIndexCache(19, false, true, true); + AbstractByteArrayCopier.field0 = class22.newIndexCache(20, false, true, true); Login.Login_loadingText = "Connecting to update server"; Login.Login_loadingPercent = 20; Client.titleLoadingStage = 40; - } else if(Client.titleLoadingStage == 40) { - byte var33 = 0; - var0 = var33 + AbstractIndexCache.indexCache0.__ca_405() * 4 / 100; - var0 += Skeleton.indexCache1.__ca_405() * 4 / 100; - var0 += ObjectSound.indexCache2.__ca_405() * 2 / 100; - var0 += WorldMapIcon1.indexCache3.__ca_405() * 2 / 100; - var0 += class25.indexCache4.__ca_405() * 6 / 100; - var0 += SecureRandomFuture.indexCache5.__ca_405() * 4 / 100; - var0 += UserComparator3.indexCache6.__ca_405() * 2 / 100; - var0 += class40.indexCache7.__ca_405() * 56 / 100; - var0 += WorldMapSection3.indexCache8.__ca_405() * 2 / 100; - var0 += class238.indexCache9.__ca_405() * 2 / 100; - var0 += class16.indexCache10.__ca_405() * 2 / 100; - var0 += Login.indexCache11.__ca_405() * 2 / 100; - var0 += Formatting.indexCache12.__ca_405() * 2 / 100; - var0 += ByteArrayPool.indexCache13.__ca_405() * 2 / 100; - var0 += class2.indexCache14.__ca_405() * 2 / 100; - var0 += WorldMapSection1.indexCache15.__ca_405() * 2 / 100; - var0 += ItemContainer.__bc_dm.__ca_405() / 100; - var0 += WorldMapLabelSize.__s_dq.__ca_405() / 100; - var0 += AbstractByteArrayCopier.__gu_et.__ca_405() / 100; - var0 += class22.indexCache16.__cx_404() && class22.indexCache16.__l_394()?1:0; - if(var0 != 100) { - if(var0 != 0) { + } else if (Client.titleLoadingStage == 40) { + byte var1 = 0; + var0 = var1 + AbstractIndexCache.indexCache0.method131() * 4 / 100; + var0 += Skeleton.indexCache1.method131() * 4 / 100; + var0 += ObjectSound.indexCache2.method131() * 2 / 100; + var0 += WorldMapIcon1.indexCache3.method131() * 2 / 100; + var0 += class25.indexCache4.method131() * 6 / 100; + var0 += SecureRandomFuture.indexCache5.method131() * 4 / 100; + var0 += UserComparator3.indexCache6.method131() * 2 / 100; + var0 += class40.indexCache7.method131() * 56 / 100; + var0 += WorldMapSection3.indexCache8.method131() * 2 / 100; + var0 += class238.indexCache9.method131() * 2 / 100; + var0 += class16.indexCache10.method131() * 2 / 100; + var0 += Login.indexCache11.method131() * 2 / 100; + var0 += Formatting.indexCache12.method131() * 2 / 100; + var0 += ByteArrayPool.indexCache13.method131() * 2 / 100; + var0 += class2.indexCache14.method131() * 2 / 100; + var0 += WorldMapSection1.indexCache15.method131() * 2 / 100; + var0 += ItemContainer.field434.method131() / 100; + var0 += WorldMapLabelSize.field1040.method131() / 100; + var0 += AbstractByteArrayCopier.field0.method131() / 100; + var0 += class22.indexCache16.method130() && class22.indexCache16.method2() ? 1 : 0; + if (var0 != 100) { + if (var0 != 0) { Login.Login_loadingText = "Checking for updates - " + var0 + "%"; } @@ -167,22 +161,22 @@ public class class171 { AbstractWorldMapIcon.method625(Login.indexCache11, "Music Jingles"); AbstractWorldMapIcon.method625(class2.indexCache14, "Music Samples"); AbstractWorldMapIcon.method625(WorldMapSection1.indexCache15, "Music Patches"); - AbstractWorldMapIcon.method625(ItemContainer.__bc_dm, "World Map"); - AbstractWorldMapIcon.method625(WorldMapLabelSize.__s_dq, "World Map Geography"); - AbstractWorldMapIcon.method625(AbstractByteArrayCopier.__gu_et, "World Map Ground"); + AbstractWorldMapIcon.method625(ItemContainer.field434, "World Map"); + AbstractWorldMapIcon.method625(WorldMapLabelSize.field1040, "World Map Geography"); + AbstractWorldMapIcon.method625(AbstractByteArrayCopier.field0, "World Map Ground"); class211.spriteIds = new SpriteIds(); class211.spriteIds.read(class22.indexCache16); Login.Login_loadingText = "Loaded update list"; Login.Login_loadingPercent = 30; Client.titleLoadingStage = 45; } - } else if(Client.titleLoadingStage == 45) { + } else if (Client.titleLoadingStage == 45) { Tiles.method1097(22050, !Client.isLowDetail, 2); - MidiPcmStream var36 = new MidiPcmStream(); - var36.__j_342(9, 128); + MidiPcmStream var28 = new MidiPcmStream(); + var28.method174(9, 128); WorldMapCacheName.pcmPlayer0 = Players.newPcmPlayer(GameShell.taskHandler, 0, 22050); - WorldMapCacheName.pcmPlayer0.setStream(var36); - NetSocket.method3537(WorldMapSection1.indexCache15, class2.indexCache14, class25.indexCache4, var36); + WorldMapCacheName.pcmPlayer0.setStream(var28); + NetSocket.method3537(WorldMapSection1.indexCache15, class2.indexCache14, class25.indexCache4, var28); AbstractIndexCache.pcmPlayer1 = Players.newPcmPlayer(GameShell.taskHandler, 1, 2048); TaskHandler.pcmStreamMixer = new PcmStreamMixer(); AbstractIndexCache.pcmPlayer1.setStream(TaskHandler.pcmStreamMixer); @@ -192,15 +186,15 @@ public class class171 { Client.titleLoadingStage = 50; WorldMapElement.fonts = new Fonts(WorldMapSection3.indexCache8, ByteArrayPool.indexCache13); } else { - int var1; - if(Client.titleLoadingStage == 50) { - FontName[] var35 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13}; - var1 = var35.length; - Fonts var32 = WorldMapElement.fonts; - FontName[] var31 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13}; - Client.fontsMap = var32.createMap(var31); - if(Client.fontsMap.size() < var1) { - Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%"; + int var29; + if (Client.titleLoadingStage == 50) { + FontName[] var2 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13}; + var29 = var2.length; + Fonts var3 = WorldMapElement.fonts; + FontName[] var4 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13}; + Client.fontsMap = var3.createMap(var4); + if (Client.fontsMap.size() < var29) { + Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var29 + "%"; Login.Login_loadingPercent = 40; } else { ScriptEvent.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); @@ -211,11 +205,11 @@ public class class171 { Login.Login_loadingPercent = 40; Client.titleLoadingStage = 60; } - } else if(Client.titleLoadingStage == 60) { + } else if (Client.titleLoadingStage == 60) { var0 = FloorDecoration.method2853(class16.indexCache10, WorldMapSection3.indexCache8); - var1 = class3.method36(); - if(var0 < var1) { - Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var1 + "%"; + var29 = class3.method36(); + if (var0 < var29) { + Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var29 + "%"; Login.Login_loadingPercent = 50; } else { Login.Login_loadingText = "Loaded title screen"; @@ -224,82 +218,82 @@ public class class171 { Client.titleLoadingStage = 70; } } else { - IndexCache var2; - if(Client.titleLoadingStage == 70) { - if(!ObjectSound.indexCache2.__l_394()) { + IndexCache var30; + if (Client.titleLoadingStage == 70) { + if (!ObjectSound.indexCache2.method2()) { Login.Login_loadingText = "Loading config - " + ObjectSound.indexCache2.loadPercent() + "%"; Login.Login_loadingPercent = 60; } else { Varcs.method2160(ObjectSound.indexCache2); Varps.method4393(ObjectSound.indexCache2); - IndexCache var34 = ObjectSound.indexCache2; - IndexCache var38 = class40.indexCache7; - KitDefinition.KitDefinition_indexCache = var34; - KitDefinition.__im_f = var38; - KitDefinition.__im_q = KitDefinition.KitDefinition_indexCache.__s_396(3); + IndexCache var31 = ObjectSound.indexCache2; + IndexCache var33 = class40.indexCache7; + KitDefinition.KitDefinition_indexCache = var31; + KitDefinition.field456 = var33; + KitDefinition.field457 = KitDefinition.KitDefinition_indexCache.method4(3); RectangleMode.method6028(ObjectSound.indexCache2, class40.indexCache7, Client.isLowDetail); IsaacCipher.method4082(ObjectSound.indexCache2, class40.indexCache7); - var2 = ObjectSound.indexCache2; - StructDefinition.__jq_m = var2; - IndexCache var3 = ObjectSound.indexCache2; - IndexCache var4 = class40.indexCache7; - boolean var5 = Client.isMembersWorld; - Font var6 = ScriptEvent.fontPlain11; - ItemDefinition.ItemDefinition_indexCache = var3; - ItemDefinition.ItemDefinition_modelIndexCache = var4; - class30.inMembersWorld = var5; - class83.__cm_e = ItemDefinition.ItemDefinition_indexCache.__s_396(10); - class204.__gx_n = var6; - IndexCache var7 = ObjectSound.indexCache2; - IndexCache var8 = AbstractIndexCache.indexCache0; - IndexCache var9 = Skeleton.indexCache1; - SequenceDefinition.SequenceDefinition_indexCache = var7; - SequenceDefinition.__jh_f = var8; - SequenceDefinition.__jh_q = var9; - IndexCache var10 = ObjectSound.indexCache2; - IndexCache var11 = class40.indexCache7; - SpotAnimationDefinition.SpotAnimationDefinition_indexCache = var10; - SpotAnimationDefinition.SpotAnimationDefinition_modelIndexCache = var11; - UnitPriceComparator.method135(ObjectSound.indexCache2); + var30 = ObjectSound.indexCache2; + StructDefinition.field885 = var30; + IndexCache var5 = ObjectSound.indexCache2; + IndexCache var6 = class40.indexCache7; + boolean var7 = Client.isMembersWorld; + Font var8 = ScriptEvent.fontPlain11; + ItemDefinition.ItemDefinition_indexCache = var5; + ItemDefinition.ItemDefinition_modelIndexCache = var6; + class30.inMembersWorld = var7; + class83.field1167 = ItemDefinition.ItemDefinition_indexCache.method4(10); + class204.field1122 = var8; + IndexCache var9 = ObjectSound.indexCache2; + IndexCache var10 = AbstractIndexCache.indexCache0; + IndexCache var11 = Skeleton.indexCache1; + SequenceDefinition.SequenceDefinition_indexCache = var9; + SequenceDefinition.field773 = var10; + SequenceDefinition.field774 = var11; IndexCache var12 = ObjectSound.indexCache2; - VarpDefinition.__ix_m = var12; - VarpDefinition.__ix_f = VarpDefinition.__ix_m.__s_396(16); - IndexCache var13 = WorldMapIcon1.indexCache3; - IndexCache var14 = class40.indexCache7; - IndexCache var15 = WorldMapSection3.indexCache8; - IndexCache var16 = ByteArrayPool.indexCache13; - Widget.Widget_indexCache = var13; - BufferedSource.__fh_x = var14; - Widget.__ho_d = var15; - class27.__aq_k = var16; - Widget.widgets = new Widget[Widget.Widget_indexCache.__t_397()][]; - Widget.loadedWidgetGroups = new boolean[Widget.Widget_indexCache.__t_397()]; - IndexCache var17 = ObjectSound.indexCache2; - class4.__o_m = var17; - IndexCache var18 = ObjectSound.indexCache2; - EnumDefinition.EnumDefinition_indexCache = var18; - Frames.method3241(ObjectSound.indexCache2); + IndexCache var13 = class40.indexCache7; + SpotAnimationDefinition.SpotAnimationDefinition_indexCache = var12; + SpotAnimationDefinition.SpotAnimationDefinition_modelIndexCache = var13; + UnitPriceComparator.method135(ObjectSound.indexCache2); + IndexCache var14 = ObjectSound.indexCache2; + VarpDefinition.field943 = var14; + VarpDefinition.field944 = VarpDefinition.field943.method4(16); + IndexCache var15 = WorldMapIcon1.indexCache3; + IndexCache var16 = class40.indexCache7; + IndexCache var17 = WorldMapSection3.indexCache8; + IndexCache var18 = ByteArrayPool.indexCache13; + Widget.Widget_indexCache = var15; + BufferedSource.field54 = var16; + Widget.field955 = var17; + class27.field1143 = var18; + Widget.widgets = new Widget[Widget.Widget_indexCache.method5()][]; + Widget.loadedWidgetGroups = new boolean[Widget.Widget_indexCache.method5()]; IndexCache var19 = ObjectSound.indexCache2; - ParamKeyDefinition.__jb_m = var19; + class4.field1158 = var19; + IndexCache var20 = ObjectSound.indexCache2; + EnumDefinition.EnumDefinition_indexCache = var20; + Frames.method3241(ObjectSound.indexCache2); + IndexCache var21 = ObjectSound.indexCache2; + ParamKeyDefinition.field679 = var21; class196.varcs = new Varcs(); class60.method1172(ObjectSound.indexCache2, WorldMapSection3.indexCache8, ByteArrayPool.indexCache13); - IndexCache var20 = ObjectSound.indexCache2; - IndexCache var21 = WorldMapSection3.indexCache8; - HealthBarDefinition.__ii_m = var20; - HealthBarDefinition.__ii_f = var21; IndexCache var22 = ObjectSound.indexCache2; IndexCache var23 = WorldMapSection3.indexCache8; - WorldMapElement.__ic_m = var23; - if(var22.__l_394()) { - UserComparator4.WorldMapElement_count = var22.__s_396(35); + HealthBarDefinition.field379 = var22; + HealthBarDefinition.field380 = var23; + IndexCache var24 = ObjectSound.indexCache2; + IndexCache var25 = WorldMapSection3.indexCache8; + WorldMapElement.field1019 = var25; + if (var24.method2()) { + UserComparator4.WorldMapElement_count = var24.method4(35); Widget.WorldMapElement_cached = new WorldMapElement[UserComparator4.WorldMapElement_count]; - for(int var24 = 0; var24 < UserComparator4.WorldMapElement_count; ++var24) { - byte[] var25 = var22.takeRecord(35, var24); - Widget.WorldMapElement_cached[var24] = new WorldMapElement(var24); - if(var25 != null) { - Widget.WorldMapElement_cached[var24].read(new Buffer(var25)); - Widget.WorldMapElement_cached[var24].__w_409(); + for (int var26 = 0; var26 < UserComparator4.WorldMapElement_count; ++var26) { + byte[] var27 = var24.takeRecord(35, var26); + Widget.WorldMapElement_cached[var26] = new WorldMapElement(var26); + if (var27 != null) { + Widget.WorldMapElement_cached[var26].read(new Buffer(var27)); + Widget.WorldMapElement_cached[var26].method389(); } } } @@ -308,177 +302,177 @@ public class class171 { Login.Login_loadingPercent = 60; Client.titleLoadingStage = 80; } - } else if(Client.titleLoadingStage == 80) { + } else if (Client.titleLoadingStage == 80) { var0 = 0; - if(UnitPriceComparator.compass == null) { - UnitPriceComparator.compass = class322.readSprite(WorldMapSection3.indexCache8, class211.spriteIds.__m, 0); + if (UnitPriceComparator.compass == null) { + UnitPriceComparator.compass = class322.readSprite(WorldMapSection3.indexCache8, class211.spriteIds.field878, 0); } else { ++var0; } - if(FaceNormal.__el_gm == null) { - FaceNormal.__el_gm = class322.readSprite(WorldMapSection3.indexCache8, class211.spriteIds.__f, 0); + if (FaceNormal.field345 == null) { + FaceNormal.field345 = class322.readSprite(WorldMapSection3.indexCache8, class211.spriteIds.field879, 0); } else { ++var0; } - IndexedSprite[] var27; - int var28; - if(class192.mapSceneSprites == null) { - var2 = WorldMapSection3.indexCache8; - var28 = class211.spriteIds.mapScenes; - if(!SpriteMask.loadSprite(var2, var28, 0)) { - var27 = null; + IndexedSprite[] var32; + int var34; + if (class192.mapSceneSprites == null) { + var30 = WorldMapSection3.indexCache8; + var34 = class211.spriteIds.mapScenes; + if (!SpriteMask.loadSprite(var30, var34, 0)) { + var32 = null; } else { - var27 = WorldMapLabel.createIndexedSpriteArray(); + var32 = WorldMapLabel.createIndexedSpriteArray(); } - class192.mapSceneSprites = var27; + class192.mapSceneSprites = var32; } else { ++var0; } - Sprite[] var37; - if(class15.headIconPkSprites == null) { - var2 = WorldMapSection3.indexCache8; - var28 = class211.spriteIds.headIconsPk; - if(!SpriteMask.loadSprite(var2, var28, 0)) { - var37 = null; + Sprite[] var35; + if (class15.headIconPkSprites == null) { + var30 = WorldMapSection3.indexCache8; + var34 = class211.spriteIds.headIconsPk; + if (!SpriteMask.loadSprite(var30, var34, 0)) { + var35 = null; } else { - var37 = UserComparator9.createSpriteArray(); + var35 = UserComparator9.createSpriteArray(); } - class15.headIconPkSprites = var37; + class15.headIconPkSprites = var35; } else { ++var0; } - if(ClientPreferences.headIconPrayerSprites == null) { - var2 = WorldMapSection3.indexCache8; - var28 = class211.spriteIds.headIconsPrayer; - if(!SpriteMask.loadSprite(var2, var28, 0)) { - var37 = null; + if (ClientPreferences.headIconPrayerSprites == null) { + var30 = WorldMapSection3.indexCache8; + var34 = class211.spriteIds.headIconsPrayer; + if (!SpriteMask.loadSprite(var30, var34, 0)) { + var35 = null; } else { - var37 = UserComparator9.createSpriteArray(); + var35 = UserComparator9.createSpriteArray(); } - ClientPreferences.headIconPrayerSprites = var37; + ClientPreferences.headIconPrayerSprites = var35; } else { ++var0; } - if(Player.headIconHintSprites == null) { - var2 = WorldMapSection3.indexCache8; - var28 = class211.spriteIds.headIconsHint; - if(!SpriteMask.loadSprite(var2, var28, 0)) { - var37 = null; + if (Player.headIconHintSprites == null) { + var30 = WorldMapSection3.indexCache8; + var34 = class211.spriteIds.headIconsHint; + if (!SpriteMask.loadSprite(var30, var34, 0)) { + var35 = null; } else { - var37 = UserComparator9.createSpriteArray(); + var35 = UserComparator9.createSpriteArray(); } - Player.headIconHintSprites = var37; + Player.headIconHintSprites = var35; } else { ++var0; } - if(class16.mapMarkerSprites == null) { - var2 = WorldMapSection3.indexCache8; - var28 = class211.spriteIds.mapMarkers; - if(!SpriteMask.loadSprite(var2, var28, 0)) { - var37 = null; + if (class16.mapMarkerSprites == null) { + var30 = WorldMapSection3.indexCache8; + var34 = class211.spriteIds.mapMarkers; + if (!SpriteMask.loadSprite(var30, var34, 0)) { + var35 = null; } else { - var37 = UserComparator9.createSpriteArray(); + var35 = UserComparator9.createSpriteArray(); } - class16.mapMarkerSprites = var37; + class16.mapMarkerSprites = var35; } else { ++var0; } - if(KeyHandler.crossSprites == null) { - var2 = WorldMapSection3.indexCache8; - var28 = class211.spriteIds.crosses; - if(!SpriteMask.loadSprite(var2, var28, 0)) { - var37 = null; + if (KeyHandler.crossSprites == null) { + var30 = WorldMapSection3.indexCache8; + var34 = class211.spriteIds.crosses; + if (!SpriteMask.loadSprite(var30, var34, 0)) { + var35 = null; } else { - var37 = UserComparator9.createSpriteArray(); + var35 = UserComparator9.createSpriteArray(); } - KeyHandler.crossSprites = var37; + KeyHandler.crossSprites = var35; } else { ++var0; } - if(class39.mapDotSprites == null) { - var2 = WorldMapSection3.indexCache8; - var28 = class211.spriteIds.mapDots; - if(!SpriteMask.loadSprite(var2, var28, 0)) { - var37 = null; + if (class39.mapDotSprites == null) { + var30 = WorldMapSection3.indexCache8; + var34 = class211.spriteIds.mapDots; + if (!SpriteMask.loadSprite(var30, var34, 0)) { + var35 = null; } else { - var37 = UserComparator9.createSpriteArray(); + var35 = UserComparator9.createSpriteArray(); } - class39.mapDotSprites = var37; + class39.mapDotSprites = var35; } else { ++var0; } - if(class32.scrollBarSprites == null) { - var2 = WorldMapSection3.indexCache8; - var28 = class211.spriteIds.scrollBars; - if(!SpriteMask.loadSprite(var2, var28, 0)) { - var27 = null; + if (class32.scrollBarSprites == null) { + var30 = WorldMapSection3.indexCache8; + var34 = class211.spriteIds.scrollBars; + if (!SpriteMask.loadSprite(var30, var34, 0)) { + var32 = null; } else { - var27 = WorldMapLabel.createIndexedSpriteArray(); + var32 = WorldMapLabel.createIndexedSpriteArray(); } - class32.scrollBarSprites = var27; + class32.scrollBarSprites = var32; } else { ++var0; } - if(WorldMapSectionType.modIconSprites == null) { - var2 = WorldMapSection3.indexCache8; - var28 = class211.spriteIds.modIcons; - if(!SpriteMask.loadSprite(var2, var28, 0)) { - var27 = null; + if (WorldMapSectionType.modIconSprites == null) { + var30 = WorldMapSection3.indexCache8; + var34 = class211.spriteIds.modIcons; + if (!SpriteMask.loadSprite(var30, var34, 0)) { + var32 = null; } else { - var27 = WorldMapLabel.createIndexedSpriteArray(); + var32 = WorldMapLabel.createIndexedSpriteArray(); } - WorldMapSectionType.modIconSprites = var27; + WorldMapSectionType.modIconSprites = var32; } else { ++var0; } - if(var0 < 11) { + if (var0 < 11) { Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%"; Login.Login_loadingPercent = 70; } else { AbstractFont.AbstractFont_modIconSprites = WorldMapSectionType.modIconSprites; - FaceNormal.__el_gm.normalize(); - var1 = (int)(Math.random() * 21.0D) - 10; - int var29 = (int)(Math.random() * 21.0D) - 10; - var28 = (int)(Math.random() * 21.0D) - 10; - int var30 = (int)(Math.random() * 41.0D) - 20; - class192.mapSceneSprites[0].shiftColors(var30 + var1, var30 + var29, var30 + var28); + FaceNormal.field345.normalize(); + var29 = (int)(Math.random() * 21.0D) - 10; + int var36 = (int)(Math.random() * 21.0D) - 10; + var34 = (int)(Math.random() * 21.0D) - 10; + int var38 = (int)(Math.random() * 41.0D) - 20; + class192.mapSceneSprites[0].shiftColors(var38 + var29, var38 + var36, var38 + var34); Login.Login_loadingText = "Loaded sprites"; Login.Login_loadingPercent = 70; Client.titleLoadingStage = 90; } - } else if(Client.titleLoadingStage == 90) { - if(!class238.indexCache9.__l_394()) { - Login.Login_loadingText = "Loading textures - " + "0%"; + } else if (Client.titleLoadingStage == 90) { + if (!class238.indexCache9.method2()) { + Login.Login_loadingText = "Loading textures - 0%"; Login.Login_loadingPercent = 90; } else { - SecureRandomFuture.textureProvider = new TextureProvider(class238.indexCache9, WorldMapSection3.indexCache8, 20, 0.8D, Client.isLowDetail?64:128); + SecureRandomFuture.textureProvider = new TextureProvider(class238.indexCache9, WorldMapSection3.indexCache8, 20, 0.8D, Client.isLowDetail ? 64 : 128); Rasterizer3D.Rasterizer3D_setTextureLoader(SecureRandomFuture.textureProvider); Rasterizer3D.Rasterizer3D_setBrightness(0.8D); Client.titleLoadingStage = 100; } - } else if(Client.titleLoadingStage == 100) { - var0 = SecureRandomFuture.textureProvider.__m_212(); - if(var0 < 100) { + } else if (Client.titleLoadingStage == 100) { + var0 = SecureRandomFuture.textureProvider.method323(); + if (var0 < 100) { Login.Login_loadingText = "Loading textures - " + var0 + "%"; Login.Login_loadingPercent = 90; } else { @@ -486,31 +480,31 @@ public class class171 { Login.Login_loadingPercent = 90; Client.titleLoadingStage = 110; } - } else if(Client.titleLoadingStage == 110) { + } else if (Client.titleLoadingStage == 110) { Projectile.mouseRecorder = new MouseRecorder(); GameShell.taskHandler.newThreadTask(Projectile.mouseRecorder, 10); Login.Login_loadingText = "Loaded input handler"; Login.Login_loadingPercent = 92; Client.titleLoadingStage = 120; - } else if(Client.titleLoadingStage == 120) { - if(!class16.indexCache10.tryLoadRecordByNames("huffman", "")) { - Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; + } else if (Client.titleLoadingStage == 120) { + if (!class16.indexCache10.tryLoadRecordByNames("huffman", "")) { + Login.Login_loadingText = "Loading wordpack - 0%"; Login.Login_loadingPercent = 94; } else { - Huffman var26 = new Huffman(class16.indexCache10.takeRecordByNames("huffman", "")); - class303.huffman = var26; + Huffman var37 = new Huffman(class16.indexCache10.takeRecordByNames("huffman", "")); + class303.huffman = var37; Login.Login_loadingText = "Loaded wordpack"; Login.Login_loadingPercent = 94; Client.titleLoadingStage = 130; } - } else if(Client.titleLoadingStage == 130) { - if(!WorldMapIcon1.indexCache3.__l_394()) { + } else if (Client.titleLoadingStage == 130) { + if (!WorldMapIcon1.indexCache3.method2()) { Login.Login_loadingText = "Loading interfaces - " + WorldMapIcon1.indexCache3.loadPercent() * 4 / 5 + "%"; Login.Login_loadingPercent = 96; - } else if(!Formatting.indexCache12.__l_394()) { + } else if (!Formatting.indexCache12.method2()) { Login.Login_loadingText = "Loading interfaces - " + (80 + Formatting.indexCache12.loadPercent() / 6) + "%"; Login.Login_loadingPercent = 96; - } else if(!ByteArrayPool.indexCache13.__l_394()) { + } else if (!ByteArrayPool.indexCache13.method2()) { Login.Login_loadingText = "Loading interfaces - " + (96 + ByteArrayPool.indexCache13.loadPercent() / 50) + "%"; Login.Login_loadingPercent = 96; } else { @@ -518,24 +512,25 @@ public class class171 { Login.Login_loadingPercent = 98; Client.titleLoadingStage = 140; } - } else if(Client.titleLoadingStage == 140) { + } else if (Client.titleLoadingStage == 140) { Login.Login_loadingPercent = 100; - if(!ItemContainer.__bc_dm.tryLoadArchiveByName(WorldMapCacheName.WorldMapCacheName_details.name)) { - Login.Login_loadingText = "Loading world map - " + ItemContainer.__bc_dm.archiveLoadPercentByName(WorldMapCacheName.WorldMapCacheName_details.name) / 10 + "%"; + if (!ItemContainer.field434.tryLoadArchiveByName(WorldMapCacheName.WorldMapCacheName_details.name)) { + Login.Login_loadingText = "Loading world map - " + ItemContainer.field434.archiveLoadPercentByName(WorldMapCacheName.WorldMapCacheName_details.name) / 10 + "%"; } else { - if(class60.worldMap0 == null) { + if (class60.worldMap0 == null) { class60.worldMap0 = new WorldMap(); - class60.worldMap0.init(ItemContainer.__bc_dm, WorldMapLabelSize.__s_dq, AbstractByteArrayCopier.__gu_et, class2.fontBold12, Client.fontsMap, class192.mapSceneSprites); + class60.worldMap0.init(ItemContainer.field434, WorldMapLabelSize.field1040, AbstractByteArrayCopier.field0, class2.fontBold12, Client.fontsMap, class192.mapSceneSprites); } Login.Login_loadingText = "Loaded world map"; Client.titleLoadingStage = 150; } - } else if(Client.titleLoadingStage == 150) { + } else if (Client.titleLoadingStage == 150) { GameShell.updateGameState(10); } } } + } @ObfuscatedName("ie") @@ -543,111 +538,116 @@ public class class171 { signature = "(IIIILjava/lang/String;I)V", garbageValue = "49247882" ) - static void method3494(int opIndex, int parentID, int childID, int itemID, String target) { - Widget var5 = class204.getWidgetChild(parentID, childID); - if(var5 != null) { - if(var5.onOp != null) { + static void method3494(int var0, int var1, int var2, int var3, String var4) { + Widget var5 = class204.getWidgetChild(var1, var2); + if (var5 != null) { + if (var5.onOp != null) { ScriptEvent var6 = new ScriptEvent(); var6.widget = var5; - var6.opIndex = opIndex; - var6.targetName = target; + var6.opIndex = var0; + var6.targetName = var4; var6.args0 = var5.onOp; AbstractIndexCache.runScript(var6); } boolean var11 = true; - if(var5.contentType > 0) { + if (var5.contentType > 0) { var11 = ViewportMouse.method2957(var5); } - if(var11) { - int var8 = class1.getWidgetClickMask(var5); - int var9 = opIndex - 1; - boolean var7 = (var8 >> var9 + 1 & 1) != 0; - if(var7) { + if (var11) { + int var7 = class1.getWidgetClickMask(var5); + int var8 = var0 - 1; + boolean var9 = (var7 >> var8 + 1 & 1) != 0; + if (var9) { PacketBufferNode var10; - if(opIndex == 1) { - var10 = Interpreter.method1915(ClientPacket.__gs_bi, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(parentID); - var10.packetBuffer.writeShort(childID); - var10.packetBuffer.writeShort(itemID); - Client.packetWriter.__q_167(var10); + if (var0 == 1) { + var10 = Interpreter.method1915(ClientPacket.field290, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.method241(var10); } - if(opIndex == 2) { - var10 = Interpreter.method1915(ClientPacket.__gs_b, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(parentID); - var10.packetBuffer.writeShort(childID); - var10.packetBuffer.writeShort(itemID); - Client.packetWriter.__q_167(var10); + if (var0 == 2) { + var10 = Interpreter.method1915(ClientPacket.field243, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.method241(var10); } - if(opIndex == 3) { - var10 = Interpreter.method1915(ClientPacket.__gs_aa, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(parentID); - var10.packetBuffer.writeShort(childID); - var10.packetBuffer.writeShort(itemID); - Client.packetWriter.__q_167(var10); + if (var0 == 3) { + var10 = Interpreter.method1915(ClientPacket.field270, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.method241(var10); } - if(opIndex == 4) { - var10 = Interpreter.method1915(ClientPacket.__gs_y, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(parentID); - var10.packetBuffer.writeShort(childID); - var10.packetBuffer.writeShort(itemID); - Client.packetWriter.__q_167(var10); + if (var0 == 4) { + var10 = Interpreter.method1915(ClientPacket.field241, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.method241(var10); } - if(opIndex == 5) { - var10 = Interpreter.method1915(ClientPacket.__gs_ad, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(parentID); - var10.packetBuffer.writeShort(childID); - var10.packetBuffer.writeShort(itemID); - Client.packetWriter.__q_167(var10); + if (var0 == 5) { + var10 = Interpreter.method1915(ClientPacket.field262, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.method241(var10); } - if(opIndex == 6) { - var10 = Interpreter.method1915(ClientPacket.__gs_br, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(parentID); - var10.packetBuffer.writeShort(childID); - var10.packetBuffer.writeShort(itemID); - Client.packetWriter.__q_167(var10); + if (var0 == 6) { + var10 = Interpreter.method1915(ClientPacket.field288, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.method241(var10); } - if(opIndex == 7) { - var10 = Interpreter.method1915(ClientPacket.__gs_cu, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(parentID); - var10.packetBuffer.writeShort(childID); - var10.packetBuffer.writeShort(itemID); - Client.packetWriter.__q_167(var10); + if (var0 == 7) { + var10 = Interpreter.method1915(ClientPacket.field307, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.method241(var10); } - if(opIndex == 8) { - var10 = Interpreter.method1915(ClientPacket.__gs_a, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(parentID); - var10.packetBuffer.writeShort(childID); - var10.packetBuffer.writeShort(itemID); - Client.packetWriter.__q_167(var10); + if (var0 == 8) { + var10 = Interpreter.method1915(ClientPacket.field236, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.method241(var10); } - if(opIndex == 9) { - var10 = Interpreter.method1915(ClientPacket.__gs_cj, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(parentID); - var10.packetBuffer.writeShort(childID); - var10.packetBuffer.writeShort(itemID); - Client.packetWriter.__q_167(var10); + if (var0 == 9) { + var10 = Interpreter.method1915(ClientPacket.field306, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.method241(var10); } - if(opIndex == 10) { - var10 = Interpreter.method1915(ClientPacket.__gs_m, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(parentID); - var10.packetBuffer.writeShort(childID); - var10.packetBuffer.writeShort(itemID); - Client.packetWriter.__q_167(var10); + if (var0 == 10) { + var10 = Interpreter.method1915(ClientPacket.field222, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.method241(var10); } - } } } + + } + + static { + field1117 = false; + field1119 = new Hashtable(16); } } diff --git a/runescape-client/src/main/java/class190.java b/runescape-client/src/main/java/class190.java index b36e1c9dfa..d0a6e50c4b 100644 --- a/runescape-client/src/main/java/class190.java +++ b/runescape-client/src/main/java/class190.java @@ -58,19 +58,6 @@ public class class190 { @Export("xteaKeys") static int[][] xteaKeys; - static { - field2346 = new class190(7); - field2352 = new class190(15); - field2342 = new class190(14); - field2341 = new class190(6); - field2344 = new class190(4); - field2345 = new class190(5); - field2350 = new class190(2); - field2347 = new class190(3); - field2343 = new class190(5); - field2349 = new class190(4); - } - @ObfuscatedSignature( signature = "(I)V", garbageValue = "7" @@ -84,7 +71,7 @@ public class class190 { garbageValue = "-68901151" ) static World method3672() { - World.__bt_g = 0; + World.field987 = 0; return Fonts.method5647(); } @@ -96,17 +83,17 @@ public class class190 { static final void method3669(int var0, int var1, int var2, int var3, int var4, int var5) { int var6 = var2 - var0; int var7 = var3 - var1; - int var8 = var6 >= 0?var6:-var6; - int var9 = var7 >= 0?var7:-var7; + int var8 = var6 >= 0 ? var6 : -var6; + int var9 = var7 >= 0 ? var7 : -var7; int var10 = var8; - if(var8 < var9) { + if (var8 < var9) { var10 = var9; } - if(var10 != 0) { + if (var10 != 0) { int var11 = (var6 << 16) / var10; int var12 = (var7 << 16) / var10; - if(var12 <= var11) { + if (var12 <= var11) { var11 = -var11; } else { var12 = -var12; @@ -131,5 +118,19 @@ public class class190 { Rasterizer3D.method2985(var17, var19, var20); Rasterizer3D.method3020(var21, var23, var24, var17, var19, var20, var4); } + + } + + static { + field2346 = new class190(7); + field2352 = new class190(15); + field2342 = new class190(14); + field2341 = new class190(6); + field2344 = new class190(4); + field2345 = new class190(5); + field2350 = new class190(2); + field2347 = new class190(3); + field2343 = new class190(5); + field2349 = new class190(4); } } diff --git a/runescape-client/src/main/java/class196.java b/runescape-client/src/main/java/class196.java index 750c5159bc..64d8241dc3 100644 --- a/runescape-client/src/main/java/class196.java +++ b/runescape-client/src/main/java/class196.java @@ -12,17 +12,13 @@ public class class196 { @Export("varcs") static Varcs varcs; - static { - new HashMap(); - } - @ObfuscatedName("q") @ObfuscatedSignature( signature = "(ILcg;ZB)I", garbageValue = "125" ) static int method3736(int var0, Script var1, boolean var2) { - return var0 < 1000?Canvas.method861(var0, var1, var2):(var0 < 1100?class1.method8(var0, var1, var2):(var0 < 1200?StructDefinition.method4952(var0, var1, var2):(var0 < 1300?class32.method576(var0, var1, var2):(var0 < 1400?WorldMapAreaData.method710(var0, var1, var2):(var0 < 1500?class11.method141(var0, var1, var2):(var0 < 1600?WorldMapSectionType.method253(var0, var1, var2):(var0 < 1700?ScriptEvent.method1185(var0, var1, var2):(var0 < 1800?Formatting.method2023(var0, var1, var2):(var0 < 1900?class16.method188(var0, var1, var2):(var0 < 2000?FriendSystem.method1867(var0, var1, var2):(var0 < 2100?class1.method8(var0, var1, var2):(var0 < 2200?StructDefinition.method4952(var0, var1, var2):(var0 < 2300?class32.method576(var0, var1, var2):(var0 < 2400?WorldMapAreaData.method710(var0, var1, var2):(var0 < 2500?class11.method141(var0, var1, var2):(var0 < 2600?ViewportMouse.method2983(var0, var1, var2):(var0 < 2700?GrandExchangeEvents.method75(var0, var1, var2):(var0 < 2800?class11.method146(var0, var1, var2):(var0 < 2900?class15.method182(var0, var1, var2):(var0 < 3000?FriendSystem.method1867(var0, var1, var2):(var0 < 3200?class4.method54(var0, var1, var2):(var0 < 3300?WorldComparator.method68(var0, var1, var2):(var0 < 3400?ScriptEvent.method1187(var0, var1, var2):(var0 < 3500?Formatting.method2022(var0, var1, var2):(var0 < 3700?FontName.method5639(var0, var1, var2):(var0 < 4000?class248.method4741(var0, var1, var2):(var0 < 4100?TextureProvider.method2752(var0, var1, var2):(var0 < 4200?class211.method4103(var0, var1, var2):(var0 < 4300?class1.method16(var0, var1, var2):(var0 < 5100?DynamicObject.method2223(var0, var1, var2):(var0 < 5400?UserComparator4.method3335(var0, var1, var2):(var0 < 5600?OwnWorldComparator.method1285(var0, var1, var2):(var0 < 5700?Decimator.method2492(var0, var1, var2):(var0 < 6300?class229.method4513(var0, var1, var2):(var0 < 6600?class31.method573(var0, var1, var2):(var0 < 6700?class54.method1093(var0, var1, var2):2)))))))))))))))))))))))))))))))))))); + return var0 < 1000 ? Canvas.method861(var0, var1, var2) : (var0 < 1100 ? class1.method8(var0, var1, var2) : (var0 < 1200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 1300 ? class32.method576(var0, var1, var2) : (var0 < 1400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 1500 ? class11.method141(var0, var1, var2) : (var0 < 1600 ? WorldMapSectionType.method253(var0, var1, var2) : (var0 < 1700 ? ScriptEvent.method1185(var0, var1, var2) : (var0 < 1800 ? Formatting.method2023(var0, var1, var2) : (var0 < 1900 ? class16.method188(var0, var1, var2) : (var0 < 2000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 2100 ? class1.method8(var0, var1, var2) : (var0 < 2200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 2300 ? class32.method576(var0, var1, var2) : (var0 < 2400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 2500 ? class11.method141(var0, var1, var2) : (var0 < 2600 ? ViewportMouse.method2983(var0, var1, var2) : (var0 < 2700 ? GrandExchangeEvents.method75(var0, var1, var2) : (var0 < 2800 ? class11.method146(var0, var1, var2) : (var0 < 2900 ? class15.method182(var0, var1, var2) : (var0 < 3000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 3200 ? class4.method54(var0, var1, var2) : (var0 < 3300 ? WorldComparator.method68(var0, var1, var2) : (var0 < 3400 ? ScriptEvent.method1187(var0, var1, var2) : (var0 < 3500 ? Formatting.method2022(var0, var1, var2) : (var0 < 3700 ? FontName.method5639(var0, var1, var2) : (var0 < 4000 ? class248.method4741(var0, var1, var2) : (var0 < 4100 ? TextureProvider.method2752(var0, var1, var2) : (var0 < 4200 ? class211.method4103(var0, var1, var2) : (var0 < 4300 ? class1.method16(var0, var1, var2) : (var0 < 5100 ? DynamicObject.method2223(var0, var1, var2) : (var0 < 5400 ? UserComparator4.method3335(var0, var1, var2) : (var0 < 5600 ? OwnWorldComparator.method1285(var0, var1, var2) : (var0 < 5700 ? Decimator.method2492(var0, var1, var2) : (var0 < 6300 ? class229.method4513(var0, var1, var2) : (var0 < 6600 ? class31.method573(var0, var1, var2) : (var0 < 6700 ? class54.method1093(var0, var1, var2) : 2)))))))))))))))))))))))))))))))))))); } @ObfuscatedName("u") @@ -31,7 +27,7 @@ public class class196 { garbageValue = "-127" ) static void method3740() { - if(Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { Login.currentLoginField = 1; } else { Login.currentLoginField = 0; @@ -45,6 +41,10 @@ public class class196 { garbageValue = "1247389467" ) static final String method3735(int var0) { - return var0 < 100000?"" + var0 + "":(var0 < 10000000?"" + var0 / 1000 + "K" + "":"" + var0 / 1000000 + "M" + ""); + return var0 < 100000 ? "" + var0 + "" : (var0 < 10000000 ? "" + var0 / 1000 + "K" : "" + var0 / 1000000 + "M"); + } + + static { + new HashMap(); } } diff --git a/runescape-client/src/main/java/class198.java b/runescape-client/src/main/java/class198.java index bf77a5a5b6..362dfec973 100644 --- a/runescape-client/src/main/java/class198.java +++ b/runescape-client/src/main/java/class198.java @@ -9,6 +9,6 @@ public class class198 { garbageValue = "1713547686" ) static String method3745(Widget var0) { - return class211.method4107(class1.getWidgetClickMask(var0)) == 0?null:(var0.spellActionName != null && var0.spellActionName.trim().length() != 0?var0.spellActionName:null); + return class211.method4107(class1.getWidgetClickMask(var0)) == 0 ? null : (var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null); } } diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index 7c697769f4..2fc08b58ab 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -39,7 +39,7 @@ final class class2 implements class0 { garbageValue = "704451908" ) public Object vmethod46(Buffer var1) { - return Long.valueOf(var1.readLong()); + return var1.readLong(); } @ObfuscatedName("g") @@ -48,7 +48,7 @@ final class class2 implements class0 { garbageValue = "1518625016" ) void method21(Long var1, Buffer var2) { - var2.writeLong(var1.longValue()); + var2.writeLong(var1); } @ObfuscatedName("q") @@ -57,18 +57,17 @@ final class class2 implements class0 { garbageValue = "-1535318699" ) static void method27(AbstractIndexCache var0, AbstractIndexCache var1, boolean var2, int var3) { - if(Login.__cu_f) { - if(var3 == 4) { + if (Login.field465) { + if (var3 == 4) { Login.loginIndex = 4; } - } else { Login.loginIndex = var3; Rasterizer2D.Rasterizer2D_clear(); byte[] var4 = var0.takeRecordByNames("title.jpg", ""); Login.leftTitleSprite = class27.convertJpgToSprite(var4); Fonts.rightTitleSprite = Login.leftTitleSprite.copy(); - if((Client.worldProperties & 0x20000000) != 0) { + if ((Client.worldProperties & 536870912) != 0) { WorldMapSectionType.logoSprite = MenuAction.loadIndexedSpriteByName(var1, "logo_deadman_mode", ""); } else { WorldMapSectionType.logoSprite = MenuAction.loadIndexedSpriteByName(var1, "logo", ""); @@ -76,20 +75,20 @@ final class class2 implements class0 { 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.loadSprite(var1, var6, var7)) { - var8 = null; + int var5 = var1.getArchiveId("runes"); + int var6 = var1.getRecordId(var5, ""); + IndexedSprite[] var7; + if (!SpriteMask.loadSprite(var1, var5, var6)) { + var7 = null; } else { - var8 = WorldMapLabel.createIndexedSpriteArray(); + var7 = WorldMapLabel.createIndexedSpriteArray(); } - WorldMapEvent.runesSprite = var8; - var7 = var1.getArchiveId("title_mute"); - int var10 = var1.getRecordId(var7, ""); + WorldMapEvent.runesSprite = var7; + var6 = var1.getArchiveId("title_mute"); + int var8 = var1.getRecordId(var6, ""); IndexedSprite[] var9; - if(!SpriteMask.loadSprite(var1, var7, var10)) { + if (!SpriteMask.loadSprite(var1, var6, var8)) { var9 = null; } else { var9 = WorldMapLabel.createIndexedSpriteArray(); @@ -103,23 +102,23 @@ final class class2 implements class0 { class168.optionButtonSpriteSubWidth = Login.options_buttons_0Sprite.subWidth; GroundItemPile.optionButtonSpriteSubHeight = Login.options_buttons_0Sprite.subHeight; class16.loginScreenRunesAnimation = new LoginScreenAnimation(WorldMapEvent.runesSprite); - if(var2) { + if (var2) { Login.Login_username = ""; Login.Login_password = ""; } class13.otpInt = 0; Login.otp = ""; - Login.__cu_ba = true; + Login.field470 = true; Login.worldSelectOpen = false; - if(!ReflectionCheck.clientPreferences.titleMusicDisabled) { + if (!ReflectionCheck.clientPreferences.titleMusicDisabled) { Canvas.method858(2, UserComparator3.indexCache6, "scape main", "", 255, false); } else { AbstractSocket.method3488(2); } UserComparator9.method3343(false); - Login.__cu_f = true; + Login.field465 = true; Login.xPadding = (SoundCache.canvasWidth - 765) / 2; Login.loginBoxX = Login.xPadding + 202; Varps.loginBoxCenter = Login.loginBoxX + 180; @@ -127,6 +126,7 @@ final class class2 implements class0 { Fonts.rightTitleSprite.drawAt(Login.xPadding + 382, 0); WorldMapSectionType.logoSprite.drawAt(Login.xPadding + 382 - WorldMapSectionType.logoSprite.subWidth / 2, 18); } + } @ObfuscatedName("w") @@ -138,7 +138,7 @@ final class class2 implements class0 { int var3 = var0.getArchiveId(var1); int var4 = var0.getRecordId(var3, var2); Sprite[] var5; - if(!SpriteMask.loadSprite(var0, var3, var4)) { + if (!SpriteMask.loadSprite(var0, var3, var4)) { var5 = null; } else { var5 = UserComparator9.createSpriteArray(); diff --git a/runescape-client/src/main/java/class203.java b/runescape-client/src/main/java/class203.java index 57b042deea..8761324d52 100644 --- a/runescape-client/src/main/java/class203.java +++ b/runescape-client/src/main/java/class203.java @@ -26,7 +26,7 @@ public class class203 { @Export("currentTimeMs") public static synchronized long currentTimeMs() { long var0 = System.currentTimeMillis(); - if(var0 < ModelData0.currentTimeMsLast) { + if (var0 < ModelData0.currentTimeMsLast) { currentTimeMsOffset += ModelData0.currentTimeMsLast - var0; } @@ -36,30 +36,27 @@ public class class203 { @ObfuscatedName("m") public static final void method4010(long var0) { - if(var0 > 0L) { - if(var0 % 10L == 0L) { + if (var0 > 0L) { + if (var0 % 10L == 0L) { long var2 = var0 - 1L; try { Thread.sleep(var2); - } catch (InterruptedException var8) { - ; + } catch (InterruptedException var7) { } try { Thread.sleep(1L); - } catch (InterruptedException var7) { - ; + } catch (InterruptedException var6) { } } else { try { Thread.sleep(var0); - } catch (InterruptedException var6) { - ; + } catch (InterruptedException var5) { } } - } + } @ObfuscatedName("w") @@ -68,10 +65,10 @@ public class class203 { garbageValue = "571835999" ) public static void method4008(int var0) { - if(class214.__hf_o != 0) { - WorldMapLabel.__aj_e = var0; + if (class214.field1129 != 0) { + WorldMapLabel.field1039 = var0; } else { - class214.midiPcmStream.__m_340(var0); + class214.midiPcmStream.method169(var0); } } diff --git a/runescape-client/src/main/java/class204.java b/runescape-client/src/main/java/class204.java index 191a9e79af..4f769cbdf6 100644 --- a/runescape-client/src/main/java/class204.java +++ b/runescape-client/src/main/java/class204.java @@ -5,26 +5,14 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("gx") public class class204 { @ObfuscatedName("x") - static final int[] __gx_x; + static final int[] field1120; @ObfuscatedName("d") - static final int[] __gx_d; + static final int[] field1121; @ObfuscatedName("n") @ObfuscatedSignature( signature = "Lkk;" ) - public static Font __gx_n; - - static { - __gx_x = new int[2048]; - __gx_d = new int[2048]; - double var0 = 0.0030679615757712823D; - - for(int var2 = 0; var2 < 2048; ++var2) { - __gx_x[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); - __gx_d[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); - } - - } + public static Font field1122; @ObfuscatedName("f") @ObfuscatedSignature( @@ -34,7 +22,7 @@ public class class204 { @Export("getWidgetChild") public static Widget getWidgetChild(int var0, int var1) { Widget var2 = Huffman.getWidget(var0); - return var1 == -1?var2:(var2 != null && var2.children != null && var1 < var2.children.length?var2.children[var1]:null); + return var1 == -1 ? var2 : (var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null); } @ObfuscatedName("f") @@ -54,43 +42,56 @@ public class class204 { garbageValue = "64" ) static final void method4013(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) { - int var10; - for(int var9 = 0; var9 < 8; ++var9) { - for(var10 = 0; var10 < 8; ++var10) { - if(var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { - var8[var1].flags[var9 + var2][var3 + var10] &= -16777217; + int var9; + for (int var10 = 0; var10 < 8; ++var10) { + for (var9 = 0; var9 < 8; ++var9) { + if (var10 + var2 > 0 && var10 + var2 < 103 && var3 + var9 > 0 && var3 + var9 < 103) { + int[] var10000 = var8[var1].flags[var10 + var2]; + var10000[var3 + var9] &= -16777217; } } } - Buffer var21 = new Buffer(var0); + Buffer var18 = new Buffer(var0); - for(var10 = 0; var10 < 4; ++var10) { - for(int var11 = 0; var11 < 64; ++var11) { - for(int var12 = 0; var12 < 64; ++var12) { - if(var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { - int var15 = var2 + CollisionMap.method3632(var11 & 7, var12 & 7, var7); - int var18 = var11 & 7; - int var19 = var12 & 7; - int var20 = var7 & 3; + for (var9 = 0; var9 < 4; ++var9) { + for (int var11 = 0; var11 < 64; ++var11) { + for (int var12 = 0; var12 < 64; ++var12) { + if (var9 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { + int var13 = var2 + CollisionMap.method3632(var11 & 7, var12 & 7, var7); + int var14 = var11 & 7; + int var15 = var12 & 7; + int var16 = var7 & 3; int var17; - if(var20 == 0) { - var17 = var19; - } else if(var20 == 1) { - var17 = 7 - var18; - } else if(var20 == 2) { - var17 = 7 - var19; + if (var16 == 0) { + var17 = var15; + } else if (var16 == 1) { + var17 = 7 - var14; + } else if (var16 == 2) { + var17 = 7 - var15; } else { - var17 = var18; + var17 = var14; } - TotalQuantityComparator.loadTerrain(var21, var1, var15, var3 + var17, 0, 0, var7); + TotalQuantityComparator.loadTerrain(var18, var1, var13, var3 + var17, 0, 0, var7); } else { - TotalQuantityComparator.loadTerrain(var21, 0, -1, -1, 0, 0, 0); + TotalQuantityComparator.loadTerrain(var18, 0, -1, -1, 0, 0, 0); } } } } } + + static { + field1120 = new int[2048]; + field1121 = new int[2048]; + double var0 = 0.0030679615757712823D; + + for (int var2 = 0; var2 < 2048; ++var2) { + field1120[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); + field1121[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); + } + + } } diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java index 6aa5d7d036..fcc927ce95 100644 --- a/runescape-client/src/main/java/class21.java +++ b/runescape-client/src/main/java/class21.java @@ -1,5 +1,4 @@ import java.util.LinkedList; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,7 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("b") public abstract class class21 { @ObfuscatedName("by") - static String __b_by; + static String field1123; @ObfuscatedName("m") @ObfuscatedGetter( intValue = -474193537 @@ -96,15 +95,15 @@ public abstract class class21 { garbageValue = "-108" ) void method263(AbstractIndexCache var1) { - if(!this.method271()) { + if (!this.method271()) { byte[] var2 = var1.takeRecord(this.field150, this.field152); - if(var2 != null) { + if (var2 != null) { this.vmethod715(new Buffer(var2)); this.field157 = true; this.field153 = true; } - } + } @ObfuscatedName("x") @@ -113,11 +112,11 @@ public abstract class class21 { garbageValue = "-2111523326" ) void method282() { - this.field151 = null; - this.field145 = null; - this.field154 = null; - this.field155 = null; - this.field144 = null; + this.field151 = (short[][][])null; + this.field145 = (short[][][])null; + this.field154 = (byte[][][])null; + this.field155 = (byte[][][])null; + this.field144 = (class25[][][][])null; this.field157 = false; this.field153 = false; } @@ -129,14 +128,14 @@ public abstract class class21 { ) void method259(int var1, int var2, Buffer var3) { int var4 = var3.readUnsignedByte(); - if(var4 != 0) { - if((var4 & 1) != 0) { + if (var4 != 0) { + if ((var4 & 1) != 0) { this.method260(var1, var2, var3, var4); } else { this.method257(var1, var2, var3, var4); } - } + } @ObfuscatedName("a") @@ -146,7 +145,7 @@ public abstract class class21 { ) void method260(int var1, int var2, Buffer var3, int var4) { boolean var5 = (var4 & 2) != 0; - if(var5) { + if (var5) { this.field145[0][var1][var2] = (short)var3.readUnsignedByte(); } @@ -165,31 +164,31 @@ public abstract class class21 { this.field151[0][var1][var2] = (short)var3.readUnsignedByte(); int var8; int var9; - int var11; - if(var6) { + int var10; + if (var6) { var8 = var3.readUnsignedByte(); - for(var9 = 0; var9 < var8; ++var9) { - int var10 = var3.readUnsignedByte(); - if(var10 != 0) { - this.field145[var9][var1][var2] = (short)var10; - var11 = var3.readUnsignedByte(); - this.field154[var9][var1][var2] = (byte)(var11 >> 2); - this.field155[var9][var1][var2] = (byte)(var11 & 3); + for (var9 = 0; var9 < var8; ++var9) { + int var11 = var3.readUnsignedByte(); + if (var11 != 0) { + this.field145[var9][var1][var2] = (short)var11; + var10 = var3.readUnsignedByte(); + this.field154[var9][var1][var2] = (byte)(var10 >> 2); + this.field155[var9][var1][var2] = (byte)(var10 & 3); } } } - if(var7) { - for(var8 = 0; var8 < var5; ++var8) { + if (var7) { + for (var8 = 0; var8 < var5; ++var8) { var9 = var3.readUnsignedByte(); - if(var9 != 0) { + if (var9 != 0) { class25[] var14 = this.field144[var8][var1][var2] = new class25[var9]; - for(var11 = 0; var11 < var9; ++var11) { - int var12 = var3.__ap_310(); + for (var10 = 0; var10 < var9; ++var10) { + int var12 = var3.method51(); int var13 = var3.readUnsignedByte(); - var14[var11] = new class25(var12, var13 >> 2, var13 & 3); + var14[var10] = new class25(var12, var13 >> 2, var13 & 3); } } } @@ -221,115 +220,115 @@ public abstract class class21 { garbageValue = "-3" ) static final void method293(PacketBuffer var0) { - for(int var1 = 0; var1 < Players.__cq_n; ++var1) { - int var2 = Players.__cq_i[var1]; + for (int var1 = 0; var1 < Players.field736; ++var1) { + int var2 = Players.field737[var1]; Player var3 = Client.players[var2]; int var4 = var0.readUnsignedByte(); - if((var4 & 8) != 0) { + if ((var4 & 8) != 0) { var4 += var0.readUnsignedByte() << 8; } byte var5 = -1; int var6; int var7; + int var8; int var9; int var10; - int var13; - if((var4 & 64) != 0) { - var6 = var0.__bb_317(); - int var8; + if ((var4 & 64) != 0) { + var6 = var0.method58(); int var11; int var12; - if(var6 > 0) { - for(var7 = 0; var7 < var6; ++var7) { + int var13; + if (var6 > 0) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = -1; var9 = -1; - var10 = -1; - var11 = -1; - var8 = var0.__ae_307(); - if(var8 == 32767) { - var8 = var0.__ae_307(); - var10 = var0.__ae_307(); - var9 = var0.__ae_307(); - var11 = var0.__ae_307(); - } else if(var8 != 32766) { - var10 = var0.__ae_307(); + var12 = -1; + var11 = var0.method48(); + if (var11 == 32767) { + var11 = var0.method48(); + var9 = var0.method48(); + var8 = var0.method48(); + var12 = var0.method48(); + } else if (var11 != 32766) { + var9 = var0.method48(); } else { - var8 = -1; + var11 = -1; } - var12 = var0.__ae_307(); - var3.addHitSplat(var8, var10, var9, var11, Client.cycle, var12); + var13 = var0.method48(); + var3.addHitSplat(var11, var9, var8, var12, Client.cycle, var13); } } var7 = var0.readUnsignedByteNegate(); - if(var7 > 0) { - for(var8 = 0; var8 < var7; ++var8) { - var9 = var0.__ae_307(); - var10 = var0.__ae_307(); - if(var10 != 32767) { - var11 = var0.__ae_307(); - var12 = var0.__bb_317(); - var13 = var10 > 0?var0.readUnsignedByte():var12; - var3.addHealthBar(var9, Client.cycle, var10, var11, var12, var13); + if (var7 > 0) { + for (var11 = 0; var11 < var7; ++var11) { + var8 = var0.method48(); + var9 = var0.method48(); + if (var9 != 32767) { + var12 = var0.method48(); + var13 = var0.method58(); + var10 = var9 > 0 ? var0.readUnsignedByte() : var13; + var3.addHealthBar(var8, Client.cycle, var9, var12, var13, var10); } else { - var3.removeHealthBar(var9); + var3.removeHealthBar(var8); } } } } - if((var4 & 512) != 0) { - var3.spotAnimation = var0.__bm_326(); - var6 = var0.__bp_331(); + if ((var4 & 512) != 0) { + var3.spotAnimation = var0.method67(); + var6 = var0.method72(); var3.heightOffset = var6 >> 16; - var3.__bt = (var6 & 65535) + Client.cycle; + var3.field14 = (var6 & 65535) + Client.cycle; var3.spotAnimationFrame = 0; var3.spotAnimationFrameCycle = 0; - if(var3.__bt > Client.cycle) { + if (var3.field14 > Client.cycle) { var3.spotAnimationFrame = -1; } - if(var3.spotAnimation == 65535) { + if (var3.spotAnimation == 65535) { var3.spotAnimation = -1; } } - if((var4 & 4096) != 0) { - var5 = var0.__bn_319(); + if ((var4 & 4096) != 0) { + var5 = var0.method60(); } - if((var4 & 1024) != 0) { - var3.__bf = var0.__bd_321(); - var3.__be = var0.__bn_319(); - var3.__bh = var0.__bn_319(); - var3.__bv = var0.__bd_321(); - var3.__bw = var0.__bu_325() + Client.cycle; - var3.__cr = var0.__by_324() + Client.cycle; - var3.__cv = var0.__ag_302(); - if(var3.__ag) { - var3.__bf += var3.tileX; - var3.__be += var3.tileY; - var3.__bh += var3.tileX; - var3.__bv += var3.tileY; + if ((var4 & 1024) != 0) { + var3.field15 = var0.method62(); + var3.field17 = var0.method60(); + var3.field16 = var0.method60(); + var3.field18 = var0.method62(); + var3.field19 = var0.method66() + Client.cycle; + var3.field20 = var0.method65() + Client.cycle; + var3.field21 = var0.method43(); + if (var3.field725) { + var3.field15 += var3.tileX; + var3.field17 += var3.tileY; + var3.field16 += var3.tileX; + var3.field18 += var3.tileY; var3.pathLength = 0; } else { - var3.__bf += var3.pathX[0]; - var3.__be += var3.pathY[0]; - var3.__bh += var3.pathX[0]; - var3.__bv += var3.pathY[0]; + var3.field15 += var3.pathX[0]; + var3.field17 += var3.pathY[0]; + var3.field16 += var3.pathX[0]; + var3.field18 += var3.pathY[0]; var3.pathLength = 1; } - var3.__ch = 0; + var3.field25 = 0; } - if((var4 & 32) != 0) { + if ((var4 & 32) != 0) { var3.overheadText = var0.readStringCp1252NullTerminated(); - if(var3.overheadText.charAt(0) == '~') { + if (var3.overheadText.charAt(0) == '~') { var3.overheadText = var3.overheadText.substring(1); WorldMapIcon1.method219(2, var3.username.getName(), var3.overheadText); - } else if(var3 == Canvas.localPlayer) { + } else if (var3 == Canvas.localPlayer) { WorldMapIcon1.method219(2, var3.username.getName(), var3.overheadText); } @@ -339,83 +338,83 @@ public abstract class class21 { var3.overheadTextCyclesRemaining = 150; } - if((var4 & 4) != 0) { - var3.__bc = var0.__by_324(); - if(var3.pathLength == 0) { - var3.orientation = var3.__bc; - var3.__bc = -1; + if ((var4 & 4) != 0) { + var3.field12 = var0.method65(); + if (var3.pathLength == 0) { + var3.orientation = var3.field12; + var3.field12 = -1; } } - if((var4 & 1) != 0) { - var6 = var0.__bq_318(); - byte[] var14 = new byte[var6]; - Buffer var15 = new Buffer(var14); - var0.__bh_333(var14, 0, var6); - Players.__cq_o[var2] = var15; - var3.read(var15); + if ((var4 & 1) != 0) { + var6 = var0.method59(); + byte[] var15 = new byte[var6]; + Buffer var16 = new Buffer(var15); + var0.method74(var15, 0, var6); + Players.field733[var2] = var16; + var3.read(var16); } - if((var4 & 2) != 0) { - var3.targetIndex = var0.__bu_325(); - if(var3.targetIndex == 65535) { + if ((var4 & 2) != 0) { + var3.targetIndex = var0.method66(); + if (var3.targetIndex == 65535) { var3.targetIndex = -1; } } - if((var4 & 2048) != 0) { - Players.__cq_w[var2] = var0.__bn_319(); + if ((var4 & 2048) != 0) { + Players.field732[var2] = var0.method60(); } - if((var4 & 16) != 0) { - var6 = var0.__bu_325(); - PlayerType var20 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var0.readUnsignedByte()); + if ((var4 & 16) != 0) { + var6 = var0.method66(); + PlayerType var17 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var0.readUnsignedByte()); boolean var18 = var0.readUnsignedByteNegate() == 1; - var9 = var0.readUnsignedByte(); - var10 = var0.index; - if(var3.username != null && var3.appearance != null) { + var8 = var0.readUnsignedByte(); + var9 = var0.index; + if (var3.username != null && var3.appearance != null) { boolean var19 = false; - if(var20.isUser && WorldMapArea.friendSystem.isIgnored(var3.username)) { + if (var17.isUser && WorldMapArea.friendSystem.isIgnored(var3.username)) { var19 = true; } - if(!var19 && Client.__client_jc == 0 && !var3.isHidden) { - Players.__cq_a.index = 0; - var0.__al_305(Players.__cq_a.array, 0, var9); - Players.__cq_a.index = 0; - String var16 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(Players.__cq_a))); - var3.overheadText = var16.trim(); + if (!var19 && Client.field208 == 0 && !var3.isHidden) { + Players.field738.index = 0; + var0.method46(Players.field738.array, 0, var8); + Players.field738.index = 0; + String var14 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(Players.field738))); + var3.overheadText = var14.trim(); var3.overheadTextColor = var6 >> 8; var3.overheadTextEffect = var6 & 255; var3.overheadTextCyclesRemaining = 150; var3.isAutoChatting = var18; - var3.__az = var3 != Canvas.localPlayer && var20.isUser && "" != Client.__client_pz && var16.toLowerCase().indexOf(Client.__client_pz) == -1; - if(var20.isPrivileged) { - var13 = var18?91:1; + var3.field11 = var3 != Canvas.localPlayer && var17.isUser && "" != Client.field158 && var14.toLowerCase().indexOf(Client.field158) == -1; + if (var17.isPrivileged) { + var10 = var18 ? 91 : 1; } else { - var13 = var18?90:2; + var10 = var18 ? 90 : 2; } - if(var20.modIcon != -1) { - WorldMapIcon1.method219(var13, ItemContainer.method1170(var20.modIcon) + var3.username.getName(), var16); + if (var17.modIcon != -1) { + WorldMapIcon1.method219(var10, ItemContainer.method1170(var17.modIcon) + var3.username.getName(), var14); } else { - WorldMapIcon1.method219(var13, var3.username.getName(), var16); + WorldMapIcon1.method219(var10, var3.username.getName(), var14); } } } - var0.index = var10 + var9; + var0.index = var9 + var8; } - if((var4 & 256) != 0) { - for(var6 = 0; var6 < 3; ++var6) { + if ((var4 & 256) != 0) { + for (var6 = 0; var6 < 3; ++var6) { var3.actions[var6] = var0.readStringCp1252NullTerminated(); } } - if((var4 & 128) != 0) { - var6 = var0.__ag_302(); - if(var6 == 65535) { + if ((var4 & 128) != 0) { + var6 = var0.method43(); + if (var6 == 65535) { var6 = -1; } @@ -423,18 +422,18 @@ public abstract class class21 { class234.method4534(var3, var6, var7); } - if(var3.__ag) { - if(var5 == 127) { + if (var3.field725) { + if (var5 == 127) { var3.resetPath(var3.tileX, var3.tileY); } else { - byte var17; - if(var5 != -1) { - var17 = var5; + byte var20; + if (var5 != -1) { + var20 = var5; } else { - var17 = Players.__cq_w[var2]; + var20 = Players.field732[var2]; } - var3.__x_130(var3.tileX, var3.tileY, var17); + var3.method254(var3.tileX, var3.tileY, var20); } } } diff --git a/runescape-client/src/main/java/class210.java b/runescape-client/src/main/java/class210.java index ea27bac5c4..163a3ddb17 100644 --- a/runescape-client/src/main/java/class210.java +++ b/runescape-client/src/main/java/class210.java @@ -18,176 +18,178 @@ public class class210 { ) static void method4101(PacketBuffer var0, int var1) { boolean var2 = var0.readBits(1) == 1; - if(var2) { - Players.__cq_i[++Players.__cq_n - 1] = var1; + if (var2) { + Players.field737[++Players.field736 - 1] = var1; } int var3 = var0.readBits(2); Player var4 = Client.players[var1]; - if(var3 == 0) { - if(var2) { - var4.__ag = false; - } else if(Client.localPlayerIndex == var1) { - throw new RuntimeException(); + if (var3 == 0) { + if (var2) { + var4.field725 = false; } else { + if (Client.localPlayerIndex == var1) { + throw new RuntimeException(); + } + Players.Players_regions[var1] = (var4.plane << 28) + (GraphicsObject.baseY + var4.pathY[0] >> 13) + (class50.baseX + var4.pathX[0] >> 13 << 14); - if(var4.__bc != -1) { - Players.Players_orientations[var1] = var4.__bc; + if (var4.field12 != -1) { + Players.Players_orientations[var1] = var4.field12; } else { Players.Players_orientations[var1] = var4.orientation; } Players.Players_targetIndices[var1] = var4.targetIndex; Client.players[var1] = null; - if(var0.readBits(1) != 0) { + if (var0.readBits(1) != 0) { class236.updateExternalPlayer(var0, var1); } - } } else { int var5; int var6; int var7; - if(var3 == 1) { + if (var3 == 1) { var5 = var0.readBits(3); var6 = var4.pathX[0]; var7 = var4.pathY[0]; - if(var5 == 0) { + if (var5 == 0) { --var6; --var7; - } else if(var5 == 1) { + } else if (var5 == 1) { --var7; - } else if(var5 == 2) { + } else if (var5 == 2) { ++var6; --var7; - } else if(var5 == 3) { + } else if (var5 == 3) { --var6; - } else if(var5 == 4) { + } else if (var5 == 4) { ++var6; - } else if(var5 == 5) { + } else if (var5 == 5) { --var6; ++var7; - } else if(var5 == 6) { + } else if (var5 == 6) { ++var7; - } else if(var5 == 7) { + } else if (var5 == 7) { ++var6; ++var7; } - if(Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { - var4.resetPath(var6, var7); - var4.__ag = false; - } else if(var2) { - var4.__ag = true; - var4.tileX = var6; - var4.tileY = var7; + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { + if (var2) { + var4.field725 = true; + var4.tileX = var6; + var4.tileY = var7; + } else { + var4.field725 = false; + var4.method254(var6, var7, Players.field732[var1]); + } } else { - var4.__ag = false; - var4.__x_130(var6, var7, Players.__cq_w[var1]); + var4.resetPath(var6, var7); + var4.field725 = false; } - - } else if(var3 == 2) { + } else if (var3 == 2) { var5 = var0.readBits(4); var6 = var4.pathX[0]; var7 = var4.pathY[0]; - if(var5 == 0) { + if (var5 == 0) { var6 -= 2; var7 -= 2; - } else if(var5 == 1) { + } else if (var5 == 1) { --var6; var7 -= 2; - } else if(var5 == 2) { + } else if (var5 == 2) { var7 -= 2; - } else if(var5 == 3) { + } else if (var5 == 3) { ++var6; var7 -= 2; - } else if(var5 == 4) { + } else if (var5 == 4) { var6 += 2; var7 -= 2; - } else if(var5 == 5) { + } else if (var5 == 5) { var6 -= 2; --var7; - } else if(var5 == 6) { + } else if (var5 == 6) { var6 += 2; --var7; - } else if(var5 == 7) { + } else if (var5 == 7) { var6 -= 2; - } else if(var5 == 8) { + } else if (var5 == 8) { var6 += 2; - } else if(var5 == 9) { + } else if (var5 == 9) { var6 -= 2; ++var7; - } else if(var5 == 10) { + } else if (var5 == 10) { var6 += 2; ++var7; - } else if(var5 == 11) { + } else if (var5 == 11) { var6 -= 2; var7 += 2; - } else if(var5 == 12) { + } else if (var5 == 12) { --var6; var7 += 2; - } else if(var5 == 13) { + } else if (var5 == 13) { var7 += 2; - } else if(var5 == 14) { + } else if (var5 == 14) { ++var6; var7 += 2; - } else if(var5 == 15) { + } else if (var5 == 15) { var6 += 2; var7 += 2; } - if(Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { - var4.resetPath(var6, var7); - var4.__ag = false; - } else if(var2) { - var4.__ag = true; - var4.tileX = var6; - var4.tileY = var7; + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { + if (var2) { + var4.field725 = true; + var4.tileX = var6; + var4.tileY = var7; + } else { + var4.field725 = false; + var4.method254(var6, var7, Players.field732[var1]); + } } else { - var4.__ag = false; - var4.__x_130(var6, var7, Players.__cq_w[var1]); + var4.resetPath(var6, var7); + var4.field725 = false; } - } else { var5 = var0.readBits(1); int var8; int var9; int var10; int var11; - if(var5 == 0) { + if (var5 == 0) { var6 = var0.readBits(12); var7 = var6 >> 10; var8 = var6 >> 5 & 31; - if(var8 > 15) { + if (var8 > 15) { var8 -= 32; } var9 = var6 & 31; - if(var9 > 15) { + if (var9 > 15) { var9 -= 32; } var10 = var8 + var4.pathX[0]; var11 = var9 + var4.pathY[0]; - if(Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { - if(var2) { - var4.__ag = true; + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { + if (var2) { + var4.field725 = true; var4.tileX = var10; var4.tileY = var11; } else { - var4.__ag = false; - var4.__x_130(var10, var11, Players.__cq_w[var1]); + var4.field725 = false; + var4.method254(var10, var11, Players.field732[var1]); } } else { var4.resetPath(var10, var11); - var4.__ag = false; + var4.field725 = false; } var4.plane = (byte)(var7 + var4.plane & 3); - if(Client.localPlayerIndex == var1) { + if (Client.localPlayerIndex == var1) { SoundSystem.plane = var4.plane; } - } else { var6 = var0.readBits(30); var7 = var6 >> 28; @@ -195,25 +197,25 @@ public class class210 { var9 = var6 & 16383; var10 = (var8 + class50.baseX + var4.pathX[0] & 16383) - class50.baseX; var11 = (var9 + GraphicsObject.baseY + var4.pathY[0] & 16383) - GraphicsObject.baseY; - if(Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { var4.resetPath(var10, var11); - var4.__ag = false; - } else if(var2) { - var4.__ag = true; + var4.field725 = false; + } else if (var2) { + var4.field725 = true; var4.tileX = var10; var4.tileY = var11; } else { - var4.__ag = false; - var4.__x_130(var10, var11, Players.__cq_w[var1]); + var4.field725 = false; + var4.method254(var10, var11, Players.field732[var1]); } var4.plane = (byte)(var7 + var4.plane & 3); - if(Client.localPlayerIndex == var1) { + if (Client.localPlayerIndex == var1) { SoundSystem.plane = var4.plane; } - } } } + } } diff --git a/runescape-client/src/main/java/class211.java b/runescape-client/src/main/java/class211.java index 73bb469301..dec93d8492 100644 --- a/runescape-client/src/main/java/class211.java +++ b/runescape-client/src/main/java/class211.java @@ -8,11 +8,11 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hg") public class class211 { @ObfuscatedName("m") - static final String[][] __hg_m; + static final String[][] field1124; @ObfuscatedName("f") - static final String[] __hg_f; + static final String[] field1125; @ObfuscatedName("q") - static Calendar __hg_q; + static Calendar field1126; @ObfuscatedName("em") @ObfuscatedSignature( signature = "Llg;" @@ -20,13 +20,6 @@ public class class211 { @Export("spriteIds") static SpriteIds spriteIds; - static { - __hg_m = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}}; - __hg_f = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; - Calendar.getInstance(TimeZone.getTimeZone("Europe/London")); - __hg_q = Calendar.getInstance(TimeZone.getTimeZone("GMT")); - } - @ObfuscatedName("m") @ObfuscatedSignature( signature = "(II)I", @@ -44,154 +37,154 @@ public class class211 { static int method4103(int var0, Script var1, boolean var2) { String var3; int var4; - if(var0 == 4100) { + if (var0 == 4100) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var4; return 1; } else { - String var9; - if(var0 == 4101) { + String var5; + if (var0 == 4101) { Interpreter.Interpreter_stringStackSize -= 2; var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var9; + var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var5; return 1; - } else if(var0 == 4102) { + } else if (var0 == 4102) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; 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) { + } else if (var0 == 4103) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toLowerCase(); return 1; } else { int var6; - int var10; - if(var0 == 4104) { - var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - long var11 = ((long)var10 + 11745L) * 86400000L; - Interpreter.Interpreter_calendar.setTime(new Date(var11)); + int var7; + if (var0 == 4104) { + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + long var14 = ((long)var7 + 11745L) * 86400000L; + Interpreter.Interpreter_calendar.setTime(new Date(var14)); var6 = Interpreter.Interpreter_calendar.get(5); - int var16 = Interpreter.Interpreter_calendar.get(2); - int var8 = Interpreter.Interpreter_calendar.get(1); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.__bv_z[var16] + "-" + var8; + int var15 = Interpreter.Interpreter_calendar.get(2); + int var16 = Interpreter.Interpreter_calendar.get(1); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.field422[var15] + "-" + var16; return 1; - } else if(var0 != 4105) { - if(var0 == 4106) { - var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Integer.toString(var10); + } else if (var0 != 4105) { + if (var0 == 4106) { + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Integer.toString(var7); return 1; - } else if(var0 == 4107) { + } else if (var0 == 4107) { Interpreter.Interpreter_stringStackSize -= 2; 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; - byte[] var13; - Font var14; - if(var0 == 4108) { + int var8; + byte[] var9; + Font var10; + if (var0 == 4108) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; 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[++RouteStrategy.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4); + var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + var9 = ByteArrayPool.indexCache13.takeRecord(var8, 0); + var10 = new Font(var9); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var10.lineCount(var3, var4); return 1; - } else if(var0 == 4109) { + } else if (var0 == 4109) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; 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[++RouteStrategy.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4); + var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + var9 = ByteArrayPool.indexCache13.takeRecord(var8, 0); + var10 = new Font(var9); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var10.lineWidth(var3, var4); return 1; - } else if(var0 == 4110) { + } 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[--RouteStrategy.Interpreter_intStackSize] == 1) { + var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 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; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5; } return 1; - } else if(var0 == 4111) { + } else if (var0 == 4111) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); return 1; - } else if(var0 == 4112) { + } else if (var0 == 4112) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; 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[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ChatChannel.method2238((char)var10)?1:0; + } else if (var0 == 4113) { + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ChatChannel.method2238((char)var7) ? 1 : 0; return 1; - } else if(var0 == 4114) { - var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = VarcInt.isAlphaNumeric((char)var10)?1:0; + } else if (var0 == 4114) { + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = VarcInt.isAlphaNumeric((char)var7) ? 1 : 0; return 1; - } else if(var0 == 4115) { - var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = UrlRequest.method3271((char)var10)?1:0; + } else if (var0 == 4115) { + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = UrlRequest.method3271((char)var7) ? 1 : 0; return 1; - } else if(var0 == 4116) { - var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class159.method3394((char)var10)?1:0; + } else if (var0 == 4116) { + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class159.method3394((char)var7) ? 1 : 0; return 1; - } else if(var0 == 4117) { + } else if (var0 == 4117) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - if(var3 != null) { + if (var3 != null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.length(); } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; - } else if(var0 == 4118) { + } else if (var0 == 4118) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; 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); + var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.substring(var4, var8); return 1; - } else if(var0 == 4119) { + } else if (var0 == 4119) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - StringBuilder var17 = new StringBuilder(var3.length()); - boolean var15 = false; + StringBuilder var11 = new StringBuilder(var3.length()); + boolean var12 = false; - for(var6 = 0; var6 < var3.length(); ++var6) { - char var7 = var3.charAt(var6); - if(var7 == '<') { - var15 = true; - } else if(var7 == '>') { - var15 = false; - } else if(!var15) { - var17.append(var7); + for (var6 = 0; var6 < var3.length(); ++var6) { + char var13 = var3.charAt(var6); + if (var13 == '<') { + var12 = true; + } else if (var13 == '>') { + var12 = false; + } else if (!var12) { + var11.append(var13); } } - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var17.toString(); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.toString(); return 1; - } else if(var0 == 4120) { + } else if (var0 == 4120) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.indexOf(var4); return 1; - } else if(var0 == 4121) { + } 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[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5); + var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; + var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.indexOf(var5, var8); return 1; - } else if(var0 == 4122) { + } else if (var0 == 4122) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toUpperCase(); return 1; @@ -202,9 +195,9 @@ public class class211 { } else { Interpreter.Interpreter_stringStackSize -= 2; var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; - if(Canvas.localPlayer.appearance != null && Canvas.localPlayer.appearance.isFemale) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9; + var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; + if (Canvas.localPlayer.appearance != null && Canvas.localPlayer.appearance.isFemale) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5; } else { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; } @@ -214,4 +207,11 @@ public class class211 { } } } + + static { + field1124 = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}}; + field1125 = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; + Calendar.getInstance(TimeZone.getTimeZone("Europe/London")); + field1126 = Calendar.getInstance(TimeZone.getTimeZone("GMT")); + } } diff --git a/runescape-client/src/main/java/class212.java b/runescape-client/src/main/java/class212.java index 21afc326ac..24005d53ea 100644 --- a/runescape-client/src/main/java/class212.java +++ b/runescape-client/src/main/java/class212.java @@ -5,18 +5,18 @@ import net.runelite.mapping.ObfuscatedName; public class class212 { @ObfuscatedName("m") public static void method4109(byte[] var0, int var1, byte[] var2, int var3, int var4) { - if(var2 == var0) { - if(var3 == var1) { + if (var2 == var0) { + if (var3 == var1) { return; } - if(var3 > var1 && var3 < var4 + var1) { + if (var3 > var1 && var3 < var4 + var1) { --var4; var1 += var4; var3 += var4; var4 = var1 - var4; - for(var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) { + for (var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) { var2[var3--] = var0[var1--]; var2[var3--] = var0[var1--]; var2[var3--] = var0[var1--]; @@ -26,8 +26,7 @@ public class class212 { var2[var3--] = var0[var1--]; } - for(var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { - ; + for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { } return; @@ -36,7 +35,7 @@ public class class212 { var4 += var1; - for(var4 -= 7; var1 < var4; var2[var3++] = var0[var1++]) { + for (var4 -= 7; var1 < var4; var2[var3++] = var0[var1++]) { var2[var3++] = var0[var1++]; var2[var3++] = var0[var1++]; var2[var3++] = var0[var1++]; @@ -46,8 +45,7 @@ public class class212 { var2[var3++] = var0[var1++]; } - for(var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) { - ; + for (var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) { } } @@ -55,7 +53,7 @@ public class class212 { @ObfuscatedName("x") @Export("clearIntArray") public static void clearIntArray(int[] var0, int var1, int var2) { - for(var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { + for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { var0[var1++] = 0; var0[var1++] = 0; var0[var1++] = 0; @@ -65,8 +63,7 @@ public class class212 { var0[var1++] = 0; } - for(var2 += 7; var1 < var2; var0[var1++] = 0) { - ; + for (var2 += 7; var1 < var2; var0[var1++] = 0) { } } diff --git a/runescape-client/src/main/java/class214.java b/runescape-client/src/main/java/class214.java index c5924e20a2..e57819a221 100644 --- a/runescape-client/src/main/java/class214.java +++ b/runescape-client/src/main/java/class214.java @@ -9,12 +9,12 @@ public class class214 { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache __hf_f; + public static AbstractIndexCache field1127; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache __hf_q; + public static AbstractIndexCache field1128; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lhm;" @@ -25,14 +25,14 @@ public class class214 { @ObfuscatedGetter( intValue = -848833001 ) - public static int __hf_o; + public static int field1129; @ObfuscatedName("u") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache __hf_u; + public static AbstractIndexCache field1130; @ObfuscatedName("k") - static int[] __hf_k; + static int[] field1131; @ObfuscatedName("ko") @ObfuscatedGetter( intValue = 2079315667 @@ -40,62 +40,58 @@ public class class214 { @Export("menuWidth") static int menuWidth; - static { - __hf_o = 0; - } - @ObfuscatedName("q") @ObfuscatedSignature( signature = "(Ljava/lang/CharSequence;IZI)Z", garbageValue = "-125135280" ) static boolean method4144(CharSequence var0, int var1, boolean var2) { - if(var1 >= 2 && var1 <= 36) { + if (var1 >= 2 && var1 <= 36) { boolean var3 = false; boolean var4 = false; int var5 = 0; int var6 = var0.length(); - for(int var7 = 0; var7 < var6; ++var7) { + for (int var7 = 0; var7 < var6; ++var7) { char var8 = var0.charAt(var7); - if(var7 == 0) { - if(var8 == '-') { + if (var7 == 0) { + if (var8 == '-') { var3 = true; continue; } - if(var8 == '+') { + if (var8 == '+') { continue; } } - int var10; - if(var8 >= '0' && var8 <= '9') { - var10 = var8 - '0'; - } else if(var8 >= 'A' && var8 <= 'Z') { - var10 = var8 - '7'; + int var9; + if (var8 >= '0' && var8 <= '9') { + var9 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { + var9 = var8 - '7'; } else { - if(var8 < 'a' || var8 > 'z') { + if (var8 < 'a' || var8 > 'z') { return false; } - var10 = var8 - 'W'; + var9 = var8 - 'W'; } - if(var10 >= var1) { + if (var9 >= var1) { return false; } - if(var3) { - var10 = -var10; + if (var3) { + var9 = -var9; } - int var9 = var5 * var1 + var10; - if(var9 / var1 != var5) { + int var10 = var5 * var1 + var9; + if (var10 / var1 != var5) { return false; } - var5 = var9; + var5 = var10; var4 = true; } @@ -113,4 +109,8 @@ public class class214 { public static int method4157(CharSequence var0, int var1) { return IgnoreList.method5438(var0, var1, true); } + + static { + field1129 = 0; + } } diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java index abedb5af5a..ca51d2e204 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/class22.java @@ -43,7 +43,6 @@ public final class class22 { intValue = 2138505015 ) int field167; - // $FF: synthetic field @ObfuscatedSignature( signature = "Lal;" ) @@ -71,10 +70,10 @@ public final class class22 { garbageValue = "61" ) static final void method294(String var0) { - StringBuilder var10000 = (new StringBuilder()).append(var0); - Object var10001 = null; - String var1 = var10000.append(" is already on your ignore list").toString(); - WorldMapIcon1.method219(30, "", var1); + StringBuilder var1 = (new StringBuilder()).append(var0); + Object var2 = null; + String var3 = var1.append(" is already on your ignore list").toString(); + WorldMapIcon1.method219(30, "", var3); } @ObfuscatedName("fw") @@ -85,7 +84,7 @@ public final class class22 { @Export("newIndexCache") static IndexCache newIndexCache(int var0, boolean var1, boolean var2, boolean var3) { IndexStore var4 = null; - if(class168.dat2File != null) { + if (class168.dat2File != null) { var4 = new IndexStore(var0, class168.dat2File, IndexStoreAction.idxFiles[var0], 1000000); } @@ -98,8 +97,8 @@ public final class class22 { garbageValue = "1002272291" ) static void method295(Widget var0) { - if(var0.cycle == Client.__client_oo) { - Client.__client_od[var0.rootIndex] = true; + if (var0.cycle == Client.field98) { + Client.field100[var0.rootIndex] = true; } } @@ -111,13 +110,13 @@ public final class class22 { ) static final void method296(Widget var0, int var1, int var2, int var3) { SpriteMask var4 = var0.getSpriteMask(false); - if(var4 != null) { - if(Client.minimapState < 3) { - UnitPriceComparator.compass.__ay_513(var1, var2, var4.width, var4.height, 25, 25, Client.minimapOrientation, 256, var4.xStarts, var4.xWidths); + if (var4 != null) { + if (Client.minimapState < 3) { + UnitPriceComparator.compass.method315(var1, var2, var4.width, var4.height, 25, 25, Client.minimapOrientation, 256, var4.xStarts, var4.xWidths); } else { Rasterizer2D.method5948(var1, var2, 0, var4.xStarts, var4.xWidths); } - } + } } diff --git a/runescape-client/src/main/java/class226.java b/runescape-client/src/main/java/class226.java index 6ae0e4e5b4..099dbf1a87 100644 --- a/runescape-client/src/main/java/class226.java +++ b/runescape-client/src/main/java/class226.java @@ -5,20 +5,13 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ht") public class class226 { @ObfuscatedName("m") - public static final short[] __ht_m; + public static final short[] field1132; @ObfuscatedName("f") - public static final short[][] __ht_f; + public static final short[][] field1133; @ObfuscatedName("q") - public static final short[] __ht_q; + public static final short[] field1134; @ObfuscatedName("w") - public static final short[][] __ht_w; - - static { - __ht_m = new short[]{(short)6798, (short)8741, (short)25238, (short)4626, (short)4550}; - __ht_f = new short[][]{{(short)6798, (short)107, (short)10283, (short)16, (short)4797, (short)7744, (short)5799, (short)4634, (short)-31839, (short)22433, (short)2983, (short)-11343, (short)8, (short)5281, (short)10438, (short)3650, (short)-27322, (short)-21845, (short)200, (short)571, (short)908, (short)21830, (short)28946, (short)-15701, (short)-14010}, {(short)8741, (short)12, (short)-1506, (short)-22374, (short)7735, (short)8404, (short)1701, (short)-27106, (short)24094, (short)10153, (short)-8915, (short)4783, (short)1341, (short)16578, (short)-30533, (short)25239, (short)8, (short)5281, (short)10438, (short)3650, (short)-27322, (short)-21845, (short)200, (short)571, (short)908, (short)21830, (short)28946, (short)-15701, (short)-14010}, {(short)25238, (short)8742, (short)12, (short)-1506, (short)-22374, (short)7735, (short)8404, (short)1701, (short)-27106, (short)24094, (short)10153, (short)-8915, (short)4783, (short)1341, (short)16578, (short)-30533, (short)8, (short)5281, (short)10438, (short)3650, (short)-27322, (short)-21845, (short)200, (short)571, (short)908, (short)21830, (short)28946, (short)-15701, (short)-14010}, {(short)4626, (short)11146, (short)6439, (short)12, (short)4758, (short)10270}, {(short)4550, (short)4537, (short)5681, (short)5673, (short)5790, (short)6806, (short)8076, (short)4574, (short)17050, (short)0, (short)127, (short)-31821, (short)-17991}}; - __ht_q = new short[]{(short)-10304, (short)9104, (short)-1, (short)-1, (short)-1}; - __ht_w = new short[][]{{(short)6554, (short)115, (short)10304, (short)28, (short)5702, (short)7756, (short)5681, (short)4510, (short)-31835, (short)22437, (short)2859, (short)-11339, (short)16, (short)5157, (short)10446, (short)3658, (short)-27314, (short)-21965, (short)472, (short)580, (short)784, (short)21966, (short)28950, (short)-15697, (short)-14002}, {(short)9104, (short)10275, (short)7595, (short)3610, (short)7975, (short)8526, (short)918, (short)-26734, (short)24466, (short)10145, (short)-6882, (short)5027, (short)1457, (short)16565, (short)-30545, (short)25486, (short)24, (short)5392, (short)10429, (short)3673, (short)-27335, (short)-21957, (short)192, (short)687, (short)412, (short)21821, (short)28835, (short)-15460, (short)-14019}, new short[0], new short[0], new short[0]}; - } + public static final short[][] field1135; @ObfuscatedName("d") @ObfuscatedSignature( @@ -27,54 +20,54 @@ public class class226 { ) @Export("getItemSprite") public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { - if(var1 == -1) { + if (var1 == -1) { var4 = 0; - } else if(var4 == 2 && var1 != 1) { + } else if (var4 == 2 && var1 != 1) { var4 = 1; } long var6 = ((long)var1 << 16) + (long)var0 + ((long)var2 << 38) + ((long)var4 << 40) + ((long)var3 << 42); Sprite var8; - if(!var5) { + if (!var5) { var8 = (Sprite)ItemDefinition.Sprite_cached.get(var6); - if(var8 != null) { + if (var8 != null) { return var8; } } ItemDefinition var9 = Skills.getItemDefinition(var0); - if(var1 > 1 && var9.__az != null) { + if (var1 > 1 && var9.field436 != null) { int var10 = -1; - for(int var11 = 0; var11 < 10; ++var11) { - if(var1 >= var9.__au[var11] && var9.__au[var11] != 0) { - var10 = var9.__az[var11]; + for (int var11 = 0; var11 < 10; ++var11) { + if (var1 >= var9.field437[var11] && var9.field437[var11] != 0) { + var10 = var9.field436[var11]; } } - if(var10 != -1) { + if (var10 != -1) { var9 = Skills.getItemDefinition(var10); } } Model var19 = var9.getModel(1); - if(var19 == null) { + if (var19 == null) { return null; } else { Sprite var20 = null; - if(var9.noteTemplate != -1) { + if (var9.noteTemplate != -1) { var20 = getItemSprite(var9.note, 10, 1, 0, 0, true); - if(var20 == null) { + if (var20 == null) { return null; } - } else if(var9.notedId != -1) { + } else if (var9.notedId != -1) { var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); - if(var20 == null) { + if (var20 == null) { return null; } - } else if(var9.placeholderTemplate != -1) { + } else if (var9.placeholderTemplate != -1) { var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); - if(var20 == null) { + if (var20 == null) { return null; } } @@ -89,56 +82,63 @@ public class class226 { Rasterizer2D.Rasterizer2D_clear(); Rasterizer3D.Rasterizer3D_method1(); Rasterizer3D.method2989(16, 16); - Rasterizer3D.__et_w = false; - if(var9.placeholderTemplate != -1) { + Rasterizer3D.field741 = false; + if (var9.placeholderTemplate != -1) { var20.drawAt2(0, 0); } int var16 = var9.zoom2d; - if(var5) { + if (var5) { var16 = (int)((double)var16 * 1.5D); - } else if(var2 == 2) { + } else if (var2 == 2) { var16 = (int)((double)var16 * 1.04D); } int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; var19.calculateBoundsCylinder(); - var19.__c_234(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); - if(var9.notedId != -1) { + var19.method199(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); + if (var9.notedId != -1) { var20.drawAt2(0, 0); } - if(var2 >= 1) { - var8.__l_502(1); + if (var2 >= 1) { + var8.method307(1); } - if(var2 >= 2) { - var8.__l_502(16777215); + if (var2 >= 2) { + var8.method307(16777215); } - if(var3 != 0) { - var8.__e_503(var3); + if (var3 != 0) { + var8.method308(var3); } Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); - if(var9.noteTemplate != -1) { + if (var9.noteTemplate != -1) { var20.drawAt2(0, 0); } - if(var4 == 1 || var4 == 2 && var9.isStackable == 1) { - class204.__gx_n.draw(class196.method3735(var1), 0, 9, 16776960, 1); + if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { + class204.field1122.draw(class196.method3735(var1), 0, 9, 16776960, 1); } - if(!var5) { + if (!var5) { ItemDefinition.Sprite_cached.put(var8, var6); } Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); Rasterizer2D.Rasterizer2D_setClipArray(var15); Rasterizer3D.Rasterizer3D_method1(); - Rasterizer3D.__et_w = true; + Rasterizer3D.field741 = true; return var8; } } + + static { + field1132 = new short[]{6798, 8741, 25238, 4626, 4550}; + field1133 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}}; + field1134 = new short[]{-10304, 9104, -1, -1, -1}; + field1135 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; + } } diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java index 55b596870c..c6766b9d27 100644 --- a/runescape-client/src/main/java/class227.java +++ b/runescape-client/src/main/java/class227.java @@ -1,11 +1,10 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hj") public class class227 { @ObfuscatedName("e") - public static short[] __hj_e; + public static short[] field1136; @ObfuscatedName("l") @ObfuscatedSignature( @@ -13,15 +12,15 @@ public class class227 { garbageValue = "120" ) static final void method4446(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) { - if(!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { - if(var0 < Tiles.Tiles_minPlane) { + if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { + if (var0 < Tiles.Tiles_minPlane) { Tiles.Tiles_minPlane = var0; } ObjectDefinition var8 = class50.getObjectDefinition(var3); int var9; int var10; - if(var4 != 1 && var4 != 3) { + if (var4 != 1 && var4 != 3) { var9 = var8.sizeX; var10 = var8.sizeY; } else { @@ -31,7 +30,7 @@ public class class227 { int var11; int var12; - if(var9 + var1 <= 104) { + if (var9 + var1 <= 104) { var11 = (var9 >> 1) + var1; var12 = (var9 + 1 >> 1) + var1; } else { @@ -41,7 +40,7 @@ public class class227 { int var13; int var14; - if(var10 + var2 <= 104) { + if (var10 + var2 <= 104) { var13 = (var10 >> 1) + var2; var14 = var2 + (var10 + 1 >> 1); } else { @@ -55,330 +54,337 @@ public class class227 { int var18 = (var2 << 7) + (var10 << 6); long var19 = FontName.method5637(var1, var2, 2, var8.int1 == 0, var3); int var21 = var5 + (var4 << 6); - if(var8.int3 == 1) { + if (var8.int3 == 1) { var21 += 256; } + int var22; int var23; - int var24; - if(var8.__t_424()) { - ObjectSound var22 = new ObjectSound(); - var22.__f = var0; - var22.__q = var1 * 128; - var22.__w = var2 * 128; - var23 = var8.sizeX; - var24 = var8.sizeY; - if(var4 == 1 || var4 == 3) { - var23 = var8.sizeY; - var24 = var8.sizeX; + if (var8.method233()) { + ObjectSound var24 = new ObjectSound(); + var24.field647 = var0; + var24.field648 = var1 * 128; + var24.field649 = var2 * 128; + var22 = var8.sizeX; + var23 = var8.sizeY; + if (var4 == 1 || var4 == 3) { + var22 = var8.sizeY; + var23 = var8.sizeX; } - var22.__o = (var23 + var1) * 128; - var22.__u = (var24 + var2) * 128; - var22.soundEffectId = var8.ambientSoundId; - var22.__g = var8.int4 * 128; - var22.__x = var8.int5; - var22.__d = var8.int6; - var22.soundEffectIds = var8.__ax; - if(var8.transforms != null) { - var22.obj = var8; - var22.set(); + var24.field650 = (var22 + var1) * 128; + var24.field651 = (var23 + var2) * 128; + var24.soundEffectId = var8.ambientSoundId; + var24.field652 = var8.int4 * 128; + var24.field653 = var8.int5; + var24.field654 = var8.int6; + var24.soundEffectIds = var8.field646; + if (var8.transforms != null) { + var24.obj = var8; + var24.set(); } - ObjectSound.objectSounds.addFirst(var22); - if(var22.soundEffectIds != null) { - var22.__n = var22.__x + (int)(Math.random() * (double)(var22.__d - var22.__x)); + ObjectSound.objectSounds.addFirst(var24); + if (var24.soundEffectIds != null) { + var24.field655 = var24.field653 + (int)(Math.random() * (double)(var24.field654 - var24.field653)); } } - Object var34; - if(var5 == 22) { - if(!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { - if(var8.animationId == -1 && var8.transforms == null) { - var34 = var8.__l_423(22, var4, var15, var17, var16, var18); + Object var31; + if (var5 == 22) { + if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { + if (var8.animationId == -1 && var8.transforms == null) { + var31 = var8.method232(22, var4, var15, var17, var16, var18); } else { - var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + var31 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null); } - var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var34, var19, var21); - if(var8.interactType == 1 && var7 != null) { - var7.__o_286(var1, var2); - } - - } - } else if(var5 != 10 && var5 != 11) { - if(var5 >= 12) { - if(var8.animationId == -1 && var8.transforms == null) { - var34 = var8.__l_423(var5, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.__d_238(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21); - if(var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { - Tiles.__bq_a[var0][var1][var2] |= 2340; - } - - if(var8.interactType != 0 && var7 != null) { - var7.__q_284(var1, var2, var9, var10, var8.boolean1); - } - - } else if(var5 == 0) { - if(var8.animationId == -1 && var8.transforms == null) { - var34 = var8.__l_423(0, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.__bq_t[var4], 0, var19, var21); - if(var4 == 0) { - if(var8.clipped) { - Tiles.__bq_l[var0][var1][var2] = 50; - Tiles.__bq_l[var0][var1][var2 + 1] = 50; - } - - if(var8.modelClipped) { - Tiles.__bq_a[var0][var1][var2] |= 585; - } - } else if(var4 == 1) { - if(var8.clipped) { - Tiles.__bq_l[var0][var1][var2 + 1] = 50; - Tiles.__bq_l[var0][var1 + 1][var2 + 1] = 50; - } - - if(var8.modelClipped) { - Tiles.__bq_a[var0][var1][1 + var2] |= 1170; - } - } else if(var4 == 2) { - if(var8.clipped) { - Tiles.__bq_l[var0][var1 + 1][var2] = 50; - Tiles.__bq_l[var0][var1 + 1][var2 + 1] = 50; - } - - if(var8.modelClipped) { - Tiles.__bq_a[var0][var1 + 1][var2] |= 585; - } - } else if(var4 == 3) { - if(var8.clipped) { - Tiles.__bq_l[var0][var1][var2] = 50; - Tiles.__bq_l[var0][var1 + 1][var2] = 50; - } - - if(var8.modelClipped) { - Tiles.__bq_a[var0][var1][var2] |= 1170; - } - } - - if(var8.interactType != 0 && var7 != null) { - var7.__f_283(var1, var2, var5, var4, var8.boolean1); - } - - if(var8.int2 != 16) { - var6.__y_241(var0, var1, var2, var8.int2); - } - - } else if(var5 == 1) { - if(var8.animationId == -1 && var8.transforms == null) { - var34 = var8.__l_423(1, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.__bq_y[var4], 0, var19, var21); - if(var8.clipped) { - if(var4 == 0) { - Tiles.__bq_l[var0][var1][var2 + 1] = 50; - } else if(var4 == 1) { - Tiles.__bq_l[var0][var1 + 1][var2 + 1] = 50; - } else if(var4 == 2) { - Tiles.__bq_l[var0][var1 + 1][var2] = 50; - } else if(var4 == 3) { - Tiles.__bq_l[var0][var1][var2] = 50; - } - } - - if(var8.interactType != 0 && var7 != null) { - var7.__f_283(var1, var2, var5, var4, var8.boolean1); - } - - } else { - int var28; - if(var5 == 2) { - var28 = var4 + 1 & 3; - Object var29; - Object var30; - if(var8.animationId == -1 && var8.transforms == null) { - var29 = var8.__l_423(2, var4 + 4, var15, var17, var16, var18); - var30 = var8.__l_423(2, var28, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - var30 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var29, (Entity)var30, Tiles.__bq_t[var4], Tiles.__bq_t[var28], var19, var21); - if(var8.modelClipped) { - if(var4 == 0) { - Tiles.__bq_a[var0][var1][var2] |= 585; - Tiles.__bq_a[var0][var1][1 + var2] |= 1170; - } else if(var4 == 1) { - Tiles.__bq_a[var0][var1][1 + var2] |= 1170; - Tiles.__bq_a[var0][var1 + 1][var2] |= 585; - } else if(var4 == 2) { - Tiles.__bq_a[var0][var1 + 1][var2] |= 585; - Tiles.__bq_a[var0][var1][var2] |= 1170; - } else if(var4 == 3) { - Tiles.__bq_a[var0][var1][var2] |= 1170; - Tiles.__bq_a[var0][var1][var2] |= 585; - } - } - - if(var8.interactType != 0 && var7 != null) { - var7.__f_283(var1, var2, var5, var4, var8.boolean1); - } - - if(var8.int2 != 16) { - var6.__y_241(var0, var1, var2, var8.int2); - } - - } else if(var5 == 3) { - if(var8.animationId == -1 && var8.transforms == null) { - var34 = var8.__l_423(3, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.__bq_y[var4], 0, var19, var21); - if(var8.clipped) { - if(var4 == 0) { - Tiles.__bq_l[var0][var1][var2 + 1] = 50; - } else if(var4 == 1) { - Tiles.__bq_l[var0][var1 + 1][var2 + 1] = 50; - } else if(var4 == 2) { - Tiles.__bq_l[var0][var1 + 1][var2] = 50; - } else if(var4 == 3) { - Tiles.__bq_l[var0][var1][var2] = 50; - } - } - - if(var8.interactType != 0 && var7 != null) { - var7.__f_283(var1, var2, var5, var4, var8.boolean1); - } - - } else if(var5 == 9) { - if(var8.animationId == -1 && var8.transforms == null) { - var34 = var8.__l_423(var5, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.__d_238(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21); - if(var8.interactType != 0 && var7 != null) { - var7.__q_284(var1, var2, var9, var10, var8.boolean1); - } - - if(var8.int2 != 16) { - var6.__y_241(var0, var1, var2, var8.int2); - } - - } else if(var5 == 4) { - if(var8.animationId == -1 && var8.transforms == null) { - var34 = var8.__l_423(4, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.__bq_t[var4], 0, 0, 0, var19, var21); - } else { - long var31; - Object var33; - if(var5 == 5) { - var28 = 16; - var31 = var6.__ar_244(var0, var1, var2); - if(var31 != 0L) { - var28 = class50.getObjectDefinition(HitSplatDefinition.method4972(var31)).int2; - } - - if(var8.animationId == -1 && var8.transforms == null) { - var33 = var8.__l_423(4, var4, var15, var17, var16, var18); - } else { - var33 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, Tiles.__bq_t[var4], 0, var28 * Tiles.__bq_h[var4], var28 * Tiles.__bq_b[var4], var19, var21); - } else if(var5 == 6) { - var28 = 8; - var31 = var6.__ar_244(var0, var1, var2); - if(var31 != 0L) { - var28 = class50.getObjectDefinition(HitSplatDefinition.method4972(var31)).int2 / 2; - } - - if(var8.animationId == -1 && var8.transforms == null) { - var33 = var8.__l_423(4, var4 + 4, var15, var17, var16, var18); - } else { - var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, 256, var4, var28 * Tiles.__bq_c[var4], var28 * Tiles.__bq_r[var4], var19, var21); - } else if(var5 == 7) { - var23 = var4 + 2 & 3; - if(var8.animationId == -1 && var8.transforms == null) { - var34 = var8.__l_423(4, var23 + 4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, 256, var23, 0, 0, var19, var21); - } else if(var5 == 8) { - var28 = 8; - var31 = var6.__ar_244(var0, var1, var2); - if(var31 != 0L) { - var28 = class50.getObjectDefinition(HitSplatDefinition.method4972(var31)).int2 / 2; - } - - int var27 = var4 + 2 & 3; - Object var26; - if(var8.animationId == -1 && var8.transforms == null) { - var33 = var8.__l_423(4, var4 + 4, var15, var17, var16, var18); - var26 = var8.__l_423(4, var27 + 4, var15, var17, var16, var18); - } else { - var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)var26, 256, var4, var28 * Tiles.__bq_c[var4], var28 * Tiles.__bq_r[var4], var19, var21); - } + var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var31, var19, var21); + if (var8.interactType == 1 && var7 != null) { + var7.method93(var1, var2); } } } else { - if(var8.animationId == -1 && var8.transforms == null) { - var34 = var8.__l_423(10, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } + int var25; + if (var5 != 10 && var5 != 11) { + int[] var10000; + if (var5 >= 12) { + if (var8.animationId == -1 && var8.transforms == null) { + var31 = var8.method232(var5, var4, var15, var17, var16, var18); + } else { + var31 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } - if(var34 != null && var6.__d_238(var0, var1, var2, var16, var9, var10, (Entity)var34, var5 == 11?256:0, var19, var21) && var8.clipped) { - var23 = 15; - if(var34 instanceof Model) { - var23 = ((Model)var34).__l_233() / 4; - if(var23 > 30) { - var23 = 30; + var6.method284(var0, var1, var2, var16, 1, 1, (Entity)var31, 0, var19, var21); + if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { + var10000 = Tiles.field910[var0][var1]; + var10000[var2] |= 2340; + } + + if (var8.interactType != 0 && var7 != null) { + var7.method91(var1, var2, var9, var10, var8.boolean1); + } + } else if (var5 == 0) { + if (var8.animationId == -1 && var8.transforms == null) { + var31 = var8.method232(0, var4, var15, var17, var16, var18); + } else { + var31 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var31, (Entity)null, Tiles.field911[var4], 0, var19, var21); + if (var4 == 0) { + if (var8.clipped) { + Tiles.field909[var0][var1][var2] = 50; + Tiles.field909[var0][var1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = Tiles.field910[var0][var1]; + var10000[var2] |= 585; + } + } else if (var4 == 1) { + if (var8.clipped) { + Tiles.field909[var0][var1][var2 + 1] = 50; + Tiles.field909[var0][var1 + 1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = Tiles.field910[var0][var1]; + var10000[1 + var2] |= 1170; + } + } else if (var4 == 2) { + if (var8.clipped) { + Tiles.field909[var0][var1 + 1][var2] = 50; + Tiles.field909[var0][var1 + 1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = Tiles.field910[var0][var1 + 1]; + var10000[var2] |= 585; + } + } else if (var4 == 3) { + if (var8.clipped) { + Tiles.field909[var0][var1][var2] = 50; + Tiles.field909[var0][var1 + 1][var2] = 50; + } + + if (var8.modelClipped) { + var10000 = Tiles.field910[var0][var1]; + var10000[var2] |= 1170; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method90(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method287(var0, var1, var2, var8.int2); + } + } else if (var5 == 1) { + if (var8.animationId == -1 && var8.transforms == null) { + var31 = var8.method232(1, var4, var15, var17, var16, var18); + } else { + var31 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var31, (Entity)null, Tiles.field912[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + Tiles.field909[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + Tiles.field909[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + Tiles.field909[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + Tiles.field909[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method90(var1, var2, var5, var4, var8.boolean1); + } + } else if (var5 == 2) { + var25 = var4 + 1 & 3; + Object var26; + Object var27; + if (var8.animationId == -1 && var8.transforms == null) { + var26 = var8.method232(2, var4 + 4, var15, var17, var16, var18); + var27 = var8.method232(2, var25, var15, var17, var16, var18); + } else { + var26 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + var27 = new DynamicObject(var3, 2, var25, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var26, (Entity)var27, Tiles.field911[var4], Tiles.field911[var25], var19, var21); + if (var8.modelClipped) { + if (var4 == 0) { + var10000 = Tiles.field910[var0][var1]; + var10000[var2] |= 585; + var10000 = Tiles.field910[var0][var1]; + var10000[1 + var2] |= 1170; + } else if (var4 == 1) { + var10000 = Tiles.field910[var0][var1]; + var10000[1 + var2] |= 1170; + var10000 = Tiles.field910[var0][var1 + 1]; + var10000[var2] |= 585; + } else if (var4 == 2) { + var10000 = Tiles.field910[var0][var1 + 1]; + var10000[var2] |= 585; + var10000 = Tiles.field910[var0][var1]; + var10000[var2] |= 1170; + } else if (var4 == 3) { + var10000 = Tiles.field910[var0][var1]; + var10000[var2] |= 1170; + var10000 = Tiles.field910[var0][var1]; + var10000[var2] |= 585; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method90(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method287(var0, var1, var2, var8.int2); + } + } else if (var5 == 3) { + if (var8.animationId == -1 && var8.transforms == null) { + var31 = var8.method232(3, var4, var15, var17, var16, var18); + } else { + var31 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var31, (Entity)null, Tiles.field912[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + Tiles.field909[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + Tiles.field909[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + Tiles.field909[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + Tiles.field909[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method90(var1, var2, var5, var4, var8.boolean1); + } + } else if (var5 == 9) { + if (var8.animationId == -1 && var8.transforms == null) { + var31 = var8.method232(var5, var4, var15, var17, var16, var18); + } else { + var31 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.method284(var0, var1, var2, var16, 1, 1, (Entity)var31, 0, var19, var21); + if (var8.interactType != 0 && var7 != null) { + var7.method91(var1, var2, var9, var10, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method287(var0, var1, var2, var8.int2); + } + } else if (var5 == 4) { + if (var8.animationId == -1 && var8.transforms == null) { + var31 = var8.method232(4, var4, var15, var17, var16, var18); + } else { + var31 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var31, (Entity)null, Tiles.field911[var4], 0, 0, 0, var19, var21); + } else { + Object var28; + long var32; + if (var5 == 5) { + var25 = 16; + var32 = var6.method290(var0, var1, var2); + if (var32 != 0L) { + var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var32)).int2; + } + + if (var8.animationId == -1 && var8.transforms == null) { + var28 = var8.method232(4, var4, var15, var17, var16, var18); + } else { + var28 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var28, (Entity)null, Tiles.field911[var4], 0, var25 * Tiles.field913[var4], var25 * Tiles.field914[var4], var19, var21); + } else if (var5 == 6) { + var25 = 8; + var32 = var6.method290(var0, var1, var2); + if (var32 != 0L) { + var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var32)).int2 / 2; + } + + if (var8.animationId == -1 && var8.transforms == null) { + var28 = var8.method232(4, var4 + 4, var15, var17, var16, var18); + } else { + var28 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var28, (Entity)null, 256, var4, var25 * Tiles.field915[var4], var25 * Tiles.field916[var4], var19, var21); + } else if (var5 == 7) { + var22 = var4 + 2 & 3; + if (var8.animationId == -1 && var8.transforms == null) { + var31 = var8.method232(4, var22 + 4, var15, var17, var16, var18); + } else { + var31 = new DynamicObject(var3, 4, var22 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var31, (Entity)null, 256, var22, 0, 0, var19, var21); + } else if (var5 == 8) { + var25 = 8; + var32 = var6.method290(var0, var1, var2); + if (var32 != 0L) { + var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var32)).int2 / 2; + } + + int var29 = var4 + 2 & 3; + Object var30; + if (var8.animationId == -1 && var8.transforms == null) { + var28 = var8.method232(4, var4 + 4, var15, var17, var16, var18); + var30 = var8.method232(4, var29 + 4, var15, var17, var16, var18); + } else { + var28 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + var30 = new DynamicObject(var3, 4, var29 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var28, (Entity)var30, 256, var4, var25 * Tiles.field915[var4], var25 * Tiles.field916[var4], var19, var21); } } + } else { + if (var8.animationId == -1 && var8.transforms == null) { + var31 = var8.method232(10, var4, var15, var17, var16, var18); + } else { + var31 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } - for(var24 = 0; var24 <= var9; ++var24) { - for(int var25 = 0; var25 <= var10; ++var25) { - if(var23 > Tiles.__bq_l[var0][var24 + var1][var25 + var2]) { - Tiles.__bq_l[var0][var24 + var1][var25 + var2] = (byte)var23; + if (var31 != null && var6.method284(var0, var1, var2, var16, var9, var10, (Entity)var31, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { + var22 = 15; + if (var31 instanceof Model) { + var22 = ((Model)var31).method198() / 4; + if (var22 > 30) { + var22 = 30; + } + } + + for (var23 = 0; var23 <= var9; ++var23) { + for (var25 = 0; var25 <= var10; ++var25) { + if (var22 > Tiles.field909[var0][var23 + var1][var25 + var2]) { + Tiles.field909[var0][var23 + var1][var25 + var2] = (byte)var22; + } } } } - } - if(var8.interactType != 0 && var7 != null) { - var7.__q_284(var1, var2, var9, var10, var8.boolean1); + if (var8.interactType != 0 && var7 != null) { + var7.method91(var1, var2, var9, var10, var8.boolean1); + } } - } } + } } diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java index 3ee3edf4e1..6162f555a4 100644 --- a/runescape-client/src/main/java/class229.java +++ b/runescape-client/src/main/java/class229.java @@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hz") public class class229 { @ObfuscatedName("l") - public static short[][] __hz_l; + public static short[][] field1137; @ObfuscatedName("m") @ObfuscatedSignature( @@ -15,12 +15,12 @@ public class class229 { @Export("getParamKeyDefinition") public static ParamKeyDefinition getParamKeyDefinition(int var0) { ParamKeyDefinition var1 = (ParamKeyDefinition)ParamKeyDefinition.ParamKeyDefinition_cached.get((long)var0); - if(var1 != null) { + if (var1 != null) { return var1; } else { - byte[] var2 = ParamKeyDefinition.__jb_m.takeRecord(11, var0); + byte[] var2 = ParamKeyDefinition.field679.takeRecord(11, var0); var1 = new ParamKeyDefinition(); - if(var2 != null) { + if (var2 != null) { var1.read(new Buffer(var2)); } @@ -36,61 +36,61 @@ public class class229 { garbageValue = "1886084106" ) static int method4513(int var0, Script var1, boolean var2) { - if(var0 == 6200) { + if (var0 == 6200) { 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.field130 = (short)class161.method3395(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]); + if (Client.field130 <= 0) { + Client.field130 = 256; } - Client.__client_rm = (short)class161.method3395(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); - if(Client.__client_rm <= 0) { - Client.__client_rm = 256; + Client.field131 = (short)class161.method3395(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); + if (Client.field131 <= 0) { + Client.field131 = 256; } return 1; - } else if(var0 == 6201) { + } else if (var0 == 6201) { RouteStrategy.Interpreter_intStackSize -= 2; - Client.__client_re = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; - if(Client.__client_re <= 0) { - Client.__client_re = 256; + Client.field150 = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + if (Client.field150 <= 0) { + Client.field150 = 256; } - Client.__client_rb = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - if(Client.__client_rb <= 0) { - Client.__client_rb = 320; + Client.field149 = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + if (Client.field149 <= 0) { + Client.field149 = 320; } return 1; - } else if(var0 == 6202) { + } else if (var0 == 6202) { RouteStrategy.Interpreter_intStackSize -= 4; - Client.__client_rv = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; - if(Client.__client_rv <= 0) { - Client.__client_rv = 1; + Client.field135 = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + if (Client.field135 <= 0) { + Client.field135 = 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.field134 = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + if (Client.field134 <= 0) { + Client.field134 = 32767; + } else if (Client.field134 < Client.field135) { + Client.field134 = Client.field135; } - Client.__client_rs = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; - if(Client.__client_rs <= 0) { - Client.__client_rs = 1; + Client.field132 = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; + if (Client.field132 <= 0) { + Client.field132 = 1; } - 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) { - Client.__client_rp = Client.__client_rs; + Client.field133 = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3]; + if (Client.field133 <= 0) { + Client.field133 = 32767; + } else if (Client.field133 < Client.field132) { + Client.field133 = Client.field132; } return 1; - } else if(var0 == 6203) { - if(Client.viewportWidget != null) { + } else if (var0 == 6203) { + if (Client.viewportWidget != null) { FontName.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.viewportWidth; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.viewportHeight; @@ -100,13 +100,13 @@ public class class229 { } return 1; - } else if(var0 == 6204) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.__client_re; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.__client_rb; + } else if (var0 == 6204) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.field150; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.field149; return 1; - } else if(var0 == 6205) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class30.method571(Client.__client_rw); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class30.method571(Client.__client_rm); + } else if (var0 == 6205) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class30.method571(Client.field130); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class30.method571(Client.field131); return 1; } else { return 2; @@ -119,7 +119,7 @@ public class class229 { garbageValue = "-21" ) static void method4514() { - if(Canvas.localPlayer.x >> 7 == Client.destinationX && Canvas.localPlayer.y >> 7 == Client.destinationY) { + if (Canvas.localPlayer.x >> 7 == Client.destinationX && Canvas.localPlayer.y >> 7 == Client.destinationY) { Client.destinationX = 0; } @@ -132,7 +132,7 @@ public class class229 { ) static final void method4512() { SecureRandomFuture.method2104(); - if(PacketWriter.clanChat != null) { + if (PacketWriter.clanChat != null) { PacketWriter.clanChat.clearIgnoreds(); } diff --git a/runescape-client/src/main/java/class230.java b/runescape-client/src/main/java/class230.java index 320164629a..ab493cd64a 100644 --- a/runescape-client/src/main/java/class230.java +++ b/runescape-client/src/main/java/class230.java @@ -1,11 +1,10 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hy") public class class230 { @ObfuscatedName("az") - protected static boolean __hy_az; + protected static boolean field1138; @ObfuscatedName("q") @ObfuscatedSignature( @@ -16,66 +15,68 @@ public class class230 { int var1 = var0.length(); byte[] var2 = new byte[var1]; - for(int var3 = 0; var3 < var1; ++var3) { + for (int var3 = 0; var3 < var1; ++var3) { char var4 = var0.charAt(var3); - if(var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) { - var2[var3] = (byte)var4; - } else if(var4 == 8364) { - var2[var3] = -128; - } else if(var4 == 8218) { - var2[var3] = -126; - } else if(var4 == 402) { - var2[var3] = -125; - } else if(var4 == 8222) { - var2[var3] = -124; - } else if(var4 == 8230) { - var2[var3] = -123; - } else if(var4 == 8224) { - var2[var3] = -122; - } else if(var4 == 8225) { - var2[var3] = -121; - } else if(var4 == 710) { - var2[var3] = -120; - } else if(var4 == 8240) { - var2[var3] = -119; - } else if(var4 == 352) { - var2[var3] = -118; - } else if(var4 == 8249) { - var2[var3] = -117; - } else if(var4 == 338) { - var2[var3] = -116; - } else if(var4 == 381) { - var2[var3] = -114; - } else if(var4 == 8216) { - var2[var3] = -111; - } else if(var4 == 8217) { - var2[var3] = -110; - } else if(var4 == 8220) { - var2[var3] = -109; - } else if(var4 == 8221) { - var2[var3] = -108; - } else if(var4 == 8226) { - var2[var3] = -107; - } else if(var4 == 8211) { - var2[var3] = -106; - } else if(var4 == 8212) { - var2[var3] = -105; - } else if(var4 == 732) { - var2[var3] = -104; - } else if(var4 == 8482) { - var2[var3] = -103; - } else if(var4 == 353) { - var2[var3] = -102; - } else if(var4 == 8250) { - var2[var3] = -101; - } else if(var4 == 339) { - var2[var3] = -100; - } else if(var4 == 382) { - var2[var3] = -98; - } else if(var4 == 376) { - var2[var3] = -97; + if ((var4 <= 0 || var4 >= 128) && (var4 < 160 || var4 > 255)) { + if (var4 == 8364) { + var2[var3] = -128; + } else if (var4 == 8218) { + var2[var3] = -126; + } else if (var4 == 402) { + var2[var3] = -125; + } else if (var4 == 8222) { + var2[var3] = -124; + } else if (var4 == 8230) { + var2[var3] = -123; + } else if (var4 == 8224) { + var2[var3] = -122; + } else if (var4 == 8225) { + var2[var3] = -121; + } else if (var4 == 710) { + var2[var3] = -120; + } else if (var4 == 8240) { + var2[var3] = -119; + } else if (var4 == 352) { + var2[var3] = -118; + } else if (var4 == 8249) { + var2[var3] = -117; + } else if (var4 == 338) { + var2[var3] = -116; + } else if (var4 == 381) { + var2[var3] = -114; + } else if (var4 == 8216) { + var2[var3] = -111; + } else if (var4 == 8217) { + var2[var3] = -110; + } else if (var4 == 8220) { + var2[var3] = -109; + } else if (var4 == 8221) { + var2[var3] = -108; + } else if (var4 == 8226) { + var2[var3] = -107; + } else if (var4 == 8211) { + var2[var3] = -106; + } else if (var4 == 8212) { + var2[var3] = -105; + } else if (var4 == 732) { + var2[var3] = -104; + } else if (var4 == 8482) { + var2[var3] = -103; + } else if (var4 == 353) { + var2[var3] = -102; + } else if (var4 == 8250) { + var2[var3] = -101; + } else if (var4 == 339) { + var2[var3] = -100; + } else if (var4 == 382) { + var2[var3] = -98; + } else if (var4 == 376) { + var2[var3] = -97; + } else { + var2[var3] = 63; + } } else { - var2[var3] = 63; + var2[var3] = (byte)var4; } } diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/class231.java index a448e63e70..7b7a13dd4e 100644 --- a/runescape-client/src/main/java/class231.java +++ b/runescape-client/src/main/java/class231.java @@ -125,9 +125,9 @@ public enum class231 implements Enumerated { @ObfuscatedGetter( intValue = -745071109 ) - static int __hb_sg; + static int field1139; @ObfuscatedName("av") - static java.awt.Font __hb_av; + static java.awt.Font field1140; @ObfuscatedName("r") @ObfuscatedGetter( intValue = 899733687 @@ -138,7 +138,7 @@ public enum class231 implements Enumerated { signature = "(II)V", garbageValue = "0" ) - class231(int var3, int var4) { + private class231(int var3, int var4) { this.field2820 = var3; } @@ -158,17 +158,17 @@ public enum class231 implements Enumerated { garbageValue = "1" ) public static InvDefinition method4523(int var0) { - InvDefinition var1 = (InvDefinition)InvDefinition.__ib_f.get((long)var0); - if(var1 != null) { + InvDefinition var1 = (InvDefinition)InvDefinition.field427.get((long)var0); + if (var1 != null) { return var1; } else { - byte[] var2 = class4.__o_m.takeRecord(5, var0); + byte[] var2 = class4.field1158.takeRecord(5, var0); var1 = new InvDefinition(); - if(var2 != null) { + if (var2 != null) { var1.read(new Buffer(var2)); } - InvDefinition.__ib_f.put(var1, (long)var0); + InvDefinition.field427.put(var1, (long)var0); return var1; } } @@ -189,8 +189,9 @@ public enum class231 implements Enumerated { garbageValue = "1521012895" ) static final void method4517(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if(GroundItemPile.loadWidgetGroup(var0)) { + if (GroundItemPile.loadWidgetGroup(var0)) { class238.updateWidgetGroup(Widget.widgets[var0], -1, var1, var2, var3, var4, var5, var6); } + } } diff --git a/runescape-client/src/main/java/class233.java b/runescape-client/src/main/java/class233.java index 378320997a..f3fc121e9f 100644 --- a/runescape-client/src/main/java/class233.java +++ b/runescape-client/src/main/java/class233.java @@ -13,13 +13,13 @@ public class class233 { char[] var2 = new char[var1]; byte var3 = 2; - for(int var4 = 0; var4 < var1; ++var4) { + for (int var4 = 0; var4 < var1; ++var4) { char var5 = var0.charAt(var4); - if(var3 == 0) { + if (var3 == 0) { var5 = Character.toLowerCase(var5); - } else if(var3 == 2 || Character.isUpperCase(var5)) { + } else if (var3 == 2 || Character.isUpperCase(var5)) { char var6; - if(var5 != 181 && var5 != 402) { + if (var5 != 181 && var5 != 402) { var6 = Character.toTitleCase(var5); } else { var6 = var5; @@ -28,11 +28,11 @@ public class class233 { var5 = var6; } - if(Character.isLetter(var5)) { + if (Character.isLetter(var5)) { var3 = 0; - } else if(var5 != '.' && var5 != '?' && var5 != '!') { - if(Character.isSpaceChar(var5)) { - if(var3 != 2) { + } else if (var5 != '.' && var5 != '?' && var5 != '!') { + if (Character.isSpaceChar(var5)) { + if (var3 != 2) { var3 = 1; } } else { diff --git a/runescape-client/src/main/java/class234.java b/runescape-client/src/main/java/class234.java index 269612760a..2a129de9d2 100644 --- a/runescape-client/src/main/java/class234.java +++ b/runescape-client/src/main/java/class234.java @@ -9,25 +9,25 @@ public class class234 { garbageValue = "-701527010" ) static void method4534(Player var0, int var1, int var2) { - if(var0.sequence == var1 && var1 != -1) { - int var3 = WorldMapAreaData.getSequenceDefinition(var1).__t; - if(var3 == 1) { + if (var0.sequence == var1 && var1 != -1) { + int var3 = WorldMapAreaData.getSequenceDefinition(var1).field783; + if (var3 == 1) { var0.sequenceFrame = 0; var0.sequenceFrameCycle = 0; var0.sequenceDelay = var2; - var0.__bj = 0; + var0.field13 = 0; } - if(var3 == 2) { - var0.__bj = 0; + if (var3 == 2) { + var0.field13 = 0; } - } else if(var1 == -1 || var0.sequence == -1 || WorldMapAreaData.getSequenceDefinition(var1).__n >= WorldMapAreaData.getSequenceDefinition(var0.sequence).__n) { + } else if (var1 == -1 || var0.sequence == -1 || WorldMapAreaData.getSequenceDefinition(var1).field779 >= WorldMapAreaData.getSequenceDefinition(var0.sequence).field779) { var0.sequence = var1; var0.sequenceFrame = 0; var0.sequenceFrameCycle = 0; var0.sequenceDelay = var2; - var0.__bj = 0; - var0.__ch = var0.pathLength; + var0.field13 = 0; + var0.field25 = var0.pathLength; } } @@ -39,12 +39,11 @@ public class class234 { ) static void method4535(Buffer var0, int var1) { class50.method902(var0.array, var1); - if(class168.randomDat != null) { + if (class168.randomDat != null) { try { class168.randomDat.seek(0L); class168.randomDat.write(var0.array, var1, 24); } catch (Exception var3) { - ; } } diff --git a/runescape-client/src/main/java/class236.java b/runescape-client/src/main/java/class236.java index 77d9f09cf7..214b6ba767 100644 --- a/runescape-client/src/main/java/class236.java +++ b/runescape-client/src/main/java/class236.java @@ -14,107 +14,107 @@ public class class236 { int var2 = var0.readBits(2); int var3; int var4; + int var5; + int var6; int var7; int var8; - int var9; - int var10; - if(var2 == 0) { - if(var0.readBits(1) != 0) { + if (var2 == 0) { + if (var0.readBits(1) != 0) { updateExternalPlayer(var0, var1); } var3 = var0.readBits(13); var4 = var0.readBits(13); - boolean var12 = var0.readBits(1) == 1; - if(var12) { - Players.__cq_i[++Players.__cq_n - 1] = var1; + boolean var11 = var0.readBits(1) == 1; + if (var11) { + Players.field737[++Players.field736 - 1] = var1; } - if(Client.players[var1] != null) { + if (Client.players[var1] != null) { throw new RuntimeException(); } else { - Player var6 = Client.players[var1] = new Player(); - var6.index = var1; - if(Players.__cq_o[var1] != null) { - var6.read(Players.__cq_o[var1]); + Player var12 = Client.players[var1] = new Player(); + var12.index = var1; + if (Players.field733[var1] != null) { + var12.read(Players.field733[var1]); } - var6.orientation = Players.Players_orientations[var1]; - var6.targetIndex = Players.Players_targetIndices[var1]; - var7 = Players.Players_regions[var1]; - var8 = var7 >> 28; - var9 = var7 >> 14 & 255; - var10 = var7 & 255; - var6.pathTraversed[0] = Players.__cq_w[var1]; - var6.plane = (byte)var8; - var6.resetPath((var9 << 13) + var3 - class50.baseX, (var10 << 13) + var4 - GraphicsObject.baseY); - var6.__ag = false; + var12.orientation = Players.Players_orientations[var1]; + var12.targetIndex = Players.Players_targetIndices[var1]; + var5 = Players.Players_regions[var1]; + var6 = var5 >> 28; + var7 = var5 >> 14 & 255; + var8 = var5 & 255; + var12.pathTraversed[0] = Players.field732[var1]; + var12.plane = (byte)var6; + var12.resetPath((var7 << 13) + var3 - class50.baseX, (var8 << 13) + var4 - GraphicsObject.baseY); + var12.field725 = false; return true; } - } else if(var2 == 1) { + } else if (var2 == 1) { var3 = var0.readBits(2); var4 = Players.Players_regions[var1]; Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455); return false; } else { - int var5; - int var11; - if(var2 == 2) { + int var9; + int var10; + if (var2 == 2) { var3 = var0.readBits(5); var4 = var3 >> 3; - var5 = var3 & 7; - var11 = Players.Players_regions[var1]; - var7 = (var11 >> 28) + var4 & 3; - var8 = var11 >> 14 & 255; - var9 = var11 & 255; - if(var5 == 0) { - --var8; - --var9; + var9 = var3 & 7; + var10 = Players.Players_regions[var1]; + var5 = (var10 >> 28) + var4 & 3; + var6 = var10 >> 14 & 255; + var7 = var10 & 255; + if (var9 == 0) { + --var6; + --var7; } - if(var5 == 1) { - --var9; + if (var9 == 1) { + --var7; } - if(var5 == 2) { - ++var8; - --var9; + if (var9 == 2) { + ++var6; + --var7; } - if(var5 == 3) { - --var8; + if (var9 == 3) { + --var6; } - if(var5 == 4) { - ++var8; + if (var9 == 4) { + ++var6; } - if(var5 == 5) { - --var8; - ++var9; + if (var9 == 5) { + --var6; + ++var7; } - if(var5 == 6) { - ++var9; + if (var9 == 6) { + ++var7; } - if(var5 == 7) { - ++var8; - ++var9; + if (var9 == 7) { + ++var6; + ++var7; } - Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); + Players.Players_regions[var1] = (var6 << 14) + var7 + (var5 << 28); return false; } else { var3 = var0.readBits(18); var4 = var3 >> 16; - var5 = var3 >> 8 & 255; - var11 = var3 & 255; - var7 = Players.Players_regions[var1]; - var8 = (var7 >> 28) + var4 & 3; - var9 = var5 + (var7 >> 14) & 255; - var10 = var7 + var11 & 255; - Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); + var9 = var3 >> 8 & 255; + var10 = var3 & 255; + var5 = Players.Players_regions[var1]; + var6 = (var5 >> 28) + var4 & 3; + var7 = var9 + (var5 >> 14) & 255; + var8 = var5 + var10 & 255; + Players.Players_regions[var1] = (var7 << 14) + var8 + (var6 << 28); return false; } } diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java index aa5ea9e654..09f71a5c0f 100644 --- a/runescape-client/src/main/java/class238.java +++ b/runescape-client/src/main/java/class238.java @@ -18,25 +18,25 @@ public final class class238 { ) @Export("runCs1") static final boolean runCs1(Widget var0) { - if(var0.cs1Comparisons == null) { + if (var0.cs1Comparisons == null) { return false; } else { - for(int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { + for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { int var2 = class16.method187(var0, var1); int var3 = var0.cs1ComparisonValues[var1]; - if(var0.cs1Comparisons[var1] == 2) { - if(var2 >= var3) { + if (var0.cs1Comparisons[var1] == 2) { + if (var2 >= var3) { return false; } - } else if(var0.cs1Comparisons[var1] == 3) { - if(var2 <= var3) { + } else if (var0.cs1Comparisons[var1] == 3) { + if (var2 <= var3) { return false; } - } else if(var0.cs1Comparisons[var1] == 4) { - if(var2 == var3) { + } else if (var0.cs1Comparisons[var1] == 4) { + if (var2 == var3) { return false; } - } else if(var3 != var2) { + } else if (var3 != var2) { return false; } } @@ -52,14 +52,14 @@ public final class class238 { ) @Export("updateWidgetGroup") static final void updateWidgetGroup(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - for(int var8 = 0; var8 < var0.length; ++var8) { + for (int var8 = 0; var8 < var0.length; ++var8) { Widget var9 = var0[var8]; - if(var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class1.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { - if(var9.isIf3) { - if(PacketBufferNode.method3673(var9)) { + if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class1.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { + if (var9.isIf3) { + if (PacketBufferNode.method3673(var9)) { continue; } - } else if(var9.type == 0 && var9 != Clock.mousedOverWidgetIf1 && PacketBufferNode.method3673(var9)) { + } else if (var9.type == 0 && var9 != Clock.mousedOverWidgetIf1 && PacketBufferNode.method3673(var9)) { continue; } @@ -69,524 +69,524 @@ public final class class238 { int var13; int var14; int var15; + int var16; int var17; - int var18; - if(var9.type == 2) { + if (var9.type == 2) { var12 = var2; var13 = var3; var14 = var4; var15 = var5; } else { - int var16; - if(var9.type == 9) { - var16 = var10; - var17 = var11; - var18 = var10 + var9.width; + int var18; + if (var9.type == 9) { + var18 = var10; + var16 = var11; + var17 = var10 + var9.width; int var19 = var11 + var9.height; - if(var18 < var10) { - var16 = var18; - var18 = var10; + if (var17 < var10) { + var18 = var17; + var17 = var10; } - if(var19 < var11) { - var17 = var19; + if (var19 < var11) { + var16 = var19; var19 = var11; } - ++var18; + ++var17; ++var19; - var12 = var16 > var2?var16:var2; - var13 = var17 > var3?var17:var3; - var14 = var18 < var4?var18:var4; - var15 = var19 < var5?var19:var5; + var12 = var18 > var2 ? var18 : var2; + var13 = var16 > var3 ? var16 : var3; + var14 = var17 < var4 ? var17 : var4; + var15 = var19 < var5 ? var19 : var5; } else { - var16 = var10 + var9.width; - var17 = var11 + var9.height; - var12 = var10 > var2?var10:var2; - var13 = var11 > var3?var11:var3; - var14 = var16 < var4?var16:var4; - var15 = var17 < var5?var17:var5; + var18 = var10 + var9.width; + var16 = var11 + var9.height; + var12 = var10 > var2 ? var10 : var2; + var13 = var11 > var3 ? var11 : var3; + var14 = var18 < var4 ? var18 : var4; + var15 = var16 < var5 ? var16 : var5; } } - if(var9 == Client.clickedWidget) { - Client.__client_nt = true; - Client.__client_nk = var10; - Client.__client_np = var11; + if (var9 == Client.clickedWidget) { + Client.field103 = true; + Client.field110 = var10; + Client.field111 = var11; } - boolean var32 = false; - if(var9.__cg) { - switch(Client.__client_mf) { + boolean var28 = false; + if (var9.field965) { + switch(Client.field151) { case 0: - var32 = true; + var28 = true; case 1: default: break; case 2: - if(Client.__client_ms == var9.id >>> 16) { - var32 = true; + if (Client.field153 == var9.id >>> 16) { + var28 = true; } break; case 3: - if(var9.id == Client.__client_ms) { - var32 = true; + if (var9.id == Client.field153) { + var28 = true; } } } - if(var32 || !var9.isIf3 || var12 < var14 && var13 < var15) { - if(var9.isIf3) { - ScriptEvent var26; - if(var9.noClickThrough) { - if(MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - for(var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { - if(var26.boolean1) { - var26.remove(); - var26.widget.__fq = false; + if (var28 || !var9.isIf3 || var12 < var14 && var13 < var15) { + if (var9.isIf3) { + ScriptEvent var29; + if (var9.noClickThrough) { + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + for (var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var29.boolean1) { + var29.remove(); + var29.widget.field978 = false; } } - if(MouseRecorder.widgetDragDuration == 0) { + if (MouseRecorder.widgetDragDuration == 0) { Client.clickedWidget = null; Client.clickedWidgetParent = null; } - if(!Client.isMenuOpen) { + if (!Client.isMenuOpen) { class30.resetMenuEntries(); } } - } else if(var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - for(var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { - if(var26.boolean1 && var26.widget.onScroll == var26.args0) { - var26.remove(); + } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + for (var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var29.boolean1 && var29.widget.onScroll == var29.args0) { + var29.remove(); } } } } - var17 = MouseHandler.MouseHandler_x; - var18 = MouseHandler.MouseHandler_y; - if(MouseHandler.MouseHandler_lastButton != 0) { - var17 = MouseHandler.MouseHandler_lastPressedX; - var18 = MouseHandler.MouseHandler_lastPressedY; + var16 = MouseHandler.MouseHandler_x; + var17 = MouseHandler.MouseHandler_y; + if (MouseHandler.MouseHandler_lastButton != 0) { + var16 = MouseHandler.MouseHandler_lastPressedX; + var17 = MouseHandler.MouseHandler_lastPressedY; } - boolean var33 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; - if(var9.contentType == 1337) { - if(!Client.isLoading && !Client.isMenuOpen && var33) { - WorldMapEvent.method781(var17, var18, var12, var13); + boolean var30 = var16 >= var12 && var17 >= var13 && var16 < var14 && var17 < var15; + if (var9.contentType == 1337) { + if (!Client.isLoading && !Client.isMenuOpen && var30) { + WorldMapEvent.addSceneMenuOptions(var16, var17, var12, var13); } - } else if(var9.contentType == 1338) { + } else if (var9.contentType == 1338) { WorldMapRegion.method567(var9, var10, var11); } else { - if(var9.contentType == 1400) { - class60.worldMap0.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); + if (var9.contentType == 1400) { + class60.worldMap0.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var30, var10, var11, var9.width, var9.height); } - if(!Client.isMenuOpen && var33) { - if(var9.contentType == 1400) { - class60.worldMap0.__bd_544(var10, var11, var9.width, var9.height, var17, var18); + if (!Client.isMenuOpen && var30) { + if (var9.contentType == 1400) { + class60.worldMap0.method384(var10, var11, var9.width, var9.height, var16, var17); } else { - ChatChannel.method2237(var9, var17 - var10, var18 - var11); + ChatChannel.method2237(var9, var16 - var10, var17 - var11); } } - boolean var21; - int var23; - if(var32) { - for(int var20 = 0; var20 < var9.__cf.length; ++var20) { - var21 = false; - boolean var22 = false; - if(!var21 && var9.__cf[var20] != null) { - for(var23 = 0; var23 < var9.__cf[var20].length; ++var23) { + boolean var20; + int var21; + if (var28) { + for (int var22 = 0; var22 < var9.field966.length; ++var22) { + var20 = false; + boolean var23 = false; + if (!var20 && var9.field966[var22] != null) { + for (var21 = 0; var21 < var9.field966[var22].length; ++var21) { boolean var24 = false; - if(var9.__fh != null) { - var24 = KeyHandler.KeyHandler_pressedKeys[var9.__cf[var20][var23]]; + if (var9.field984 != null) { + var24 = KeyHandler.KeyHandler_pressedKeys[var9.field966[var22][var21]]; } - if(class1.method15(var9.__cf[var20][var23]) || var24) { - var21 = true; - if(var9.__fh != null && var9.__fh[var20] > Client.cycle) { + if (class1.method15(var9.field966[var22][var21]) || var24) { + var20 = true; + if (var9.field984 != null && var9.field984[var22] > Client.cycle) { break; } - byte var25 = var9.__cp[var20][var23]; - if(var25 == 0 || ((var25 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var25 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var25 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var25 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { - var22 = true; + byte var25 = var9.field967[var22][var21]; + if (var25 == 0 || ((var25 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var25 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var25 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var25 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { + var23 = true; break; } } } } - if(var22) { - if(var20 < 10) { - class171.method3494(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); - } else if(var20 == 10) { + if (var23) { + if (var22 < 10) { + class171.method3494(var22 + 1, var9.id, var9.childIndex, var9.itemId, ""); + } else if (var22 == 10) { Player.method1281(); class25.method350(var9.id, var9.childIndex, class211.method4107(class1.getWidgetClickMask(var9)), var9.itemId); Client.selectedSpellActionName = class198.method3745(var9); - if(Client.selectedSpellActionName == null) { + if (Client.selectedSpellActionName == null) { Client.selectedSpellActionName = "null"; } Client.selectedSpellName = var9.dataText + BufferedFile.colorStartTag(16777215); } - var23 = var9.__cc[var20]; - if(var9.__fh == null) { - var9.__fh = new int[var9.__cf.length]; + var21 = var9.field968[var22]; + if (var9.field984 == null) { + var9.field984 = new int[var9.field966.length]; } - if(var9.__ci == null) { - var9.__ci = new int[var9.__cf.length]; + if (var9.field969 == null) { + var9.field969 = new int[var9.field966.length]; } - if(var23 != 0) { - if(var9.__fh[var20] == 0) { - var9.__fh[var20] = var23 + Client.cycle + var9.__ci[var20]; + if (var21 != 0) { + if (var9.field984[var22] == 0) { + var9.field984[var22] = var21 + Client.cycle + var9.field969[var22]; } else { - var9.__fh[var20] = var23 + Client.cycle; + var9.field984[var22] = var21 + Client.cycle; } } else { - var9.__fh[var20] = Integer.MAX_VALUE; + var9.field984[var22] = Integer.MAX_VALUE; } } - if(!var21 && var9.__fh != null) { - var9.__fh[var20] = 0; + if (!var20 && var9.field984 != null) { + var9.field984[var22] = 0; } } } - if(var9.isIf3) { - if(MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - var33 = true; + ScriptEvent var32; + if (var9.isIf3) { + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + var30 = true; } else { - var33 = false; + var30 = false; } - boolean var34 = false; - if((MouseHandler.MouseHandler_currentButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { - var34 = true; + boolean var31 = false; + if ((MouseHandler.MouseHandler_currentButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var30) { + var31 = true; } - var21 = false; - 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; + var20 = false; + 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) { + var20 = true; } - if(var21) { + if (var20) { Players.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); } - if(var9.contentType == 1400) { - class60.worldMap0.__w_519(var17, var18, var33 & var34, var33 & var21); + if (var9.contentType == 1400) { + class60.worldMap0.method361(var16, var17, var30 & var31, var30 & var20); } - if(Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && class54.method1090(class1.getWidgetClickMask(var9))) { + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var30 && class54.method1090(class1.getWidgetClickMask(var9))) { Client.draggedOnWidget = var9; } - if(var9 == Client.clickedWidgetParent) { - Client.__client_nn = true; - Client.__client_nw = var10; - Client.__client_nl = var11; + if (var9 == Client.clickedWidgetParent) { + Client.field106 = true; + Client.field108 = var10; + Client.field109 = var11; } - if(var9.hasListener) { - ScriptEvent var27; - if(var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { - var27 = new ScriptEvent(); - var27.boolean1 = true; - var27.widget = var9; - var27.mouseY = Client.mouseWheelRotation; - var27.args0 = var9.onScroll; - Client.scriptEvents.addFirst(var27); + if (var9.hasListener) { + if (var30 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { + var32 = new ScriptEvent(); + var32.boolean1 = true; + var32.widget = var9; + var32.mouseY = Client.mouseWheelRotation; + var32.args0 = var9.onScroll; + Client.scriptEvents.addFirst(var32); } - if(Client.clickedWidget != null || DevicePcmPlayerProvider.dragInventoryWidget != null || Client.isMenuOpen) { - var21 = false; - var34 = false; - var33 = false; + if (Client.clickedWidget != null || DevicePcmPlayerProvider.dragInventoryWidget != null || Client.isMenuOpen) { + var20 = false; + var31 = false; + var30 = false; } - if(!var9.__fw && var21) { - var9.__fw = true; - if(var9.onClick != null) { - var27 = new ScriptEvent(); - var27.boolean1 = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; - var27.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; - var27.args0 = var9.onClick; - Client.scriptEvents.addFirst(var27); + if (!var9.field979 && var20) { + var9.field979 = true; + if (var9.onClick != null) { + var32 = new ScriptEvent(); + var32.boolean1 = true; + var32.widget = var9; + var32.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; + var32.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; + var32.args0 = var9.onClick; + Client.scriptEvents.addFirst(var32); } } - if(var9.__fw && var34 && var9.onClickRepeat != null) { - var27 = new ScriptEvent(); - var27.boolean1 = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args0 = var9.onClickRepeat; - Client.scriptEvents.addFirst(var27); + if (var9.field979 && var31 && var9.onClickRepeat != null) { + var32 = new ScriptEvent(); + var32.boolean1 = true; + var32.widget = var9; + var32.mouseX = MouseHandler.MouseHandler_x - var10; + var32.mouseY = MouseHandler.MouseHandler_y - var11; + var32.args0 = var9.onClickRepeat; + Client.scriptEvents.addFirst(var32); } - if(var9.__fw && !var34) { - var9.__fw = false; - if(var9.onRelease != null) { - var27 = new ScriptEvent(); - var27.boolean1 = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args0 = var9.onRelease; - Client.__client_oc.addFirst(var27); + if (var9.field979 && !var31) { + var9.field979 = false; + if (var9.onRelease != null) { + var32 = new ScriptEvent(); + var32.boolean1 = true; + var32.widget = var9; + var32.mouseX = MouseHandler.MouseHandler_x - var10; + var32.mouseY = MouseHandler.MouseHandler_y - var11; + var32.args0 = var9.onRelease; + Client.field148.addFirst(var32); } } - if(var34 && var9.onHold != null) { - var27 = new ScriptEvent(); - var27.boolean1 = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args0 = var9.onHold; - Client.scriptEvents.addFirst(var27); + if (var31 && var9.onHold != null) { + var32 = new ScriptEvent(); + var32.boolean1 = true; + var32.widget = var9; + var32.mouseX = MouseHandler.MouseHandler_x - var10; + var32.mouseY = MouseHandler.MouseHandler_y - var11; + var32.args0 = var9.onHold; + Client.scriptEvents.addFirst(var32); } - if(!var9.__fq && var33) { - var9.__fq = true; - if(var9.onMouseOver != null) { - var27 = new ScriptEvent(); - var27.boolean1 = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args0 = var9.onMouseOver; - Client.scriptEvents.addFirst(var27); + if (!var9.field978 && var30) { + var9.field978 = true; + if (var9.onMouseOver != null) { + var32 = new ScriptEvent(); + var32.boolean1 = true; + var32.widget = var9; + var32.mouseX = MouseHandler.MouseHandler_x - var10; + var32.mouseY = MouseHandler.MouseHandler_y - var11; + var32.args0 = var9.onMouseOver; + Client.scriptEvents.addFirst(var32); } } - if(var9.__fq && var33 && var9.onMouseRepeat != null) { - var27 = new ScriptEvent(); - var27.boolean1 = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args0 = var9.onMouseRepeat; - Client.scriptEvents.addFirst(var27); + if (var9.field978 && var30 && var9.onMouseRepeat != null) { + var32 = new ScriptEvent(); + var32.boolean1 = true; + var32.widget = var9; + var32.mouseX = MouseHandler.MouseHandler_x - var10; + var32.mouseY = MouseHandler.MouseHandler_y - var11; + var32.args0 = var9.onMouseRepeat; + Client.scriptEvents.addFirst(var32); } - if(var9.__fq && !var33) { - var9.__fq = false; - if(var9.onMouseLeave != null) { - var27 = new ScriptEvent(); - var27.boolean1 = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args0 = var9.onMouseLeave; - Client.__client_oc.addFirst(var27); + if (var9.field978 && !var30) { + var9.field978 = false; + if (var9.onMouseLeave != null) { + var32 = new ScriptEvent(); + var32.boolean1 = true; + var32.widget = var9; + var32.mouseX = MouseHandler.MouseHandler_x - var10; + var32.mouseY = MouseHandler.MouseHandler_y - var11; + var32.args0 = var9.onMouseLeave; + Client.field148.addFirst(var32); } } - if(var9.onTimer != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args0 = var9.onTimer; - Client.__client_oh.addFirst(var27); + if (var9.onTimer != null) { + var32 = new ScriptEvent(); + var32.widget = var9; + var32.args0 = var9.onTimer; + Client.field147.addFirst(var32); } - ScriptEvent var30; + int var26; + ScriptEvent var34; int var35; - int var36; - if(var9.onVarTransmit != null && Client.__client_nd > var9.__fc) { - if(var9.varTransmitTriggers != null && Client.__client_nd - var9.__fc <= 32) { - label887: - for(var35 = var9.__fc; var35 < Client.__client_nd; ++var35) { - var23 = Client.__client_nr[var35 & 31]; + if (var9.onVarTransmit != null && Client.field123 > var9.field981) { + if (var9.varTransmitTriggers != null && Client.field123 - var9.field981 <= 32) { + label590: + for (var35 = var9.field981; var35 < Client.field123; ++var35) { + var21 = Client.field121[var35 & 31]; - for(var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) { - if(var23 == var9.varTransmitTriggers[var36]) { - var30 = new ScriptEvent(); - var30.widget = var9; - var30.args0 = var9.onVarTransmit; - Client.scriptEvents.addFirst(var30); - break label887; + for (var26 = 0; var26 < var9.varTransmitTriggers.length; ++var26) { + if (var21 == var9.varTransmitTriggers[var26]) { + var34 = new ScriptEvent(); + var34.widget = var9; + var34.args0 = var9.onVarTransmit; + Client.scriptEvents.addFirst(var34); + break label590; } } } } else { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args0 = var9.onVarTransmit; - Client.scriptEvents.addFirst(var27); + var32 = new ScriptEvent(); + var32.widget = var9; + var32.args0 = var9.onVarTransmit; + Client.scriptEvents.addFirst(var32); } - var9.__fc = Client.__client_nd; + var9.field981 = Client.field123; } - if(var9.onInvTransmit != null && Client.__client_ns > var9.__fl) { - if(var9.invTransmitTriggers != null && Client.__client_ns - var9.__fl <= 32) { - label863: - for(var35 = var9.__fl; var35 < Client.__client_ns; ++var35) { - var23 = Client.__client_nz[var35 & 31]; + if (var9.onInvTransmit != null && Client.field117 > var9.field982) { + if (var9.invTransmitTriggers != null && Client.field117 - var9.field982 <= 32) { + label566: + for (var35 = var9.field982; var35 < Client.field117; ++var35) { + var21 = Client.field116[var35 & 31]; - for(var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) { - if(var23 == var9.invTransmitTriggers[var36]) { - var30 = new ScriptEvent(); - var30.widget = var9; - var30.args0 = var9.onInvTransmit; - Client.scriptEvents.addFirst(var30); - break label863; + for (var26 = 0; var26 < var9.invTransmitTriggers.length; ++var26) { + if (var21 == var9.invTransmitTriggers[var26]) { + var34 = new ScriptEvent(); + var34.widget = var9; + var34.args0 = var9.onInvTransmit; + Client.scriptEvents.addFirst(var34); + break label566; } } } } else { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args0 = var9.onInvTransmit; - Client.scriptEvents.addFirst(var27); + var32 = new ScriptEvent(); + var32.widget = var9; + var32.args0 = var9.onInvTransmit; + Client.scriptEvents.addFirst(var32); } - var9.__fl = Client.__client_ns; + var9.field982 = Client.field117; } - if(var9.onStatTransmit != null && Client.changedSkillsCount > var9.__fj) { - if(var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.__fj <= 32) { - label839: - for(var35 = var9.__fj; var35 < Client.changedSkillsCount; ++var35) { - var23 = Client.changedSkills[var35 & 31]; + if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field983) { + if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field983 <= 32) { + label542: + for (var35 = var9.field983; var35 < Client.changedSkillsCount; ++var35) { + var21 = Client.changedSkills[var35 & 31]; - for(var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) { - if(var23 == var9.statTransmitTriggers[var36]) { - var30 = new ScriptEvent(); - var30.widget = var9; - var30.args0 = var9.onStatTransmit; - Client.scriptEvents.addFirst(var30); - break label839; + for (var26 = 0; var26 < var9.statTransmitTriggers.length; ++var26) { + if (var21 == var9.statTransmitTriggers[var26]) { + var34 = new ScriptEvent(); + var34.widget = var9; + var34.args0 = var9.onStatTransmit; + Client.scriptEvents.addFirst(var34); + break label542; } } } } else { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args0 = var9.onStatTransmit; - Client.scriptEvents.addFirst(var27); + var32 = new ScriptEvent(); + var32.widget = var9; + var32.args0 = var9.onStatTransmit; + Client.scriptEvents.addFirst(var32); } - var9.__fj = Client.changedSkillsCount; + var9.field983 = Client.changedSkillsCount; } - if(Client.chatCycle > var9.__fg && var9.__em != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args0 = var9.__em; - Client.scriptEvents.addFirst(var27); + if (Client.chatCycle > var9.field980 && var9.field970 != null) { + var32 = new ScriptEvent(); + var32.widget = var9; + var32.args0 = var9.field970; + Client.scriptEvents.addFirst(var32); } - if(Client.__client_na > var9.__fg && var9.__ex != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args0 = var9.__ex; - Client.scriptEvents.addFirst(var27); + if (Client.field105 > var9.field980 && var9.field971 != null) { + var32 = new ScriptEvent(); + var32.widget = var9; + var32.args0 = var9.field971; + Client.scriptEvents.addFirst(var32); } - if(Client.__client_nh > var9.__fg && var9.__ej != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args0 = var9.__ej; - Client.scriptEvents.addFirst(var27); + if (Client.field129 > var9.field980 && var9.field972 != null) { + var32 = new ScriptEvent(); + var32.widget = var9; + var32.args0 = var9.field972; + Client.scriptEvents.addFirst(var32); } - if(Client.__client_nv > var9.__fg && var9.__eq != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args0 = var9.__eq; - Client.scriptEvents.addFirst(var27); + if (Client.field122 > var9.field980 && var9.field976 != null) { + var32 = new ScriptEvent(); + var32.widget = var9; + var32.args0 = var9.field976; + Client.scriptEvents.addFirst(var32); } - if(Client.__client_nc > var9.__fg && var9.__eh != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args0 = var9.__eh; - Client.scriptEvents.addFirst(var27); + if (Client.field154 > var9.field980 && var9.field977 != null) { + var32 = new ScriptEvent(); + var32.widget = var9; + var32.args0 = var9.field977; + Client.scriptEvents.addFirst(var32); } - if(Client.__client_ni > var9.__fg && var9.__el != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args0 = var9.__el; - Client.scriptEvents.addFirst(var27); + if (Client.field124 > var9.field980 && var9.field973 != null) { + var32 = new ScriptEvent(); + var32.widget = var9; + var32.args0 = var9.field973; + Client.scriptEvents.addFirst(var32); } - var9.__fg = Client.cycleCntr; - if(var9.onKeyListener != null) { - for(var35 = 0; var35 < Client.__client_pm; ++var35) { - ScriptEvent var31 = new ScriptEvent(); - var31.widget = var9; - var31.keyTyped = Client.__client_pn[var35]; - var31.keyPressed = Client.__client_pq[var35]; - var31.args0 = var9.onKeyListener; - Client.scriptEvents.addFirst(var31); + var9.field980 = Client.cycleCntr; + if (var9.onKeyListener != null) { + for (var35 = 0; var35 < Client.field137; ++var35) { + ScriptEvent var27 = new ScriptEvent(); + var27.widget = var9; + var27.keyTyped = Client.field145[var35]; + var27.keyPressed = Client.field146[var35]; + var27.args0 = var9.onKeyListener; + Client.scriptEvents.addFirst(var27); } } } } - if(!var9.isIf3) { - if(Client.clickedWidget != null || DevicePcmPlayerProvider.dragInventoryWidget != null || Client.isMenuOpen) { + if (!var9.isIf3) { + if (Client.clickedWidget != null || DevicePcmPlayerProvider.dragInventoryWidget != null || Client.isMenuOpen) { continue; } - if((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - if(var9.mouseOverRedirect >= 0) { + if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + if (var9.mouseOverRedirect >= 0) { Clock.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; } else { Clock.mousedOverWidgetIf1 = var9; } } - if(var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - AccessFile.__dk_lm = var9; + if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + AccessFile.field8 = var9; } - if(var9.scrollHeight > var9.height) { + if (var9.scrollHeight > var9.height) { WorldMapSection0.method246(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); } } - if(var9.type == 0) { + if (var9.type == 0) { updateWidgetGroup(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); - if(var9.children != null) { + if (var9.children != null) { updateWidgetGroup(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); } - WidgetGroupParent var28 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var9.id); - if(var28 != null) { - if(var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { - for(ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { - if(var29.boolean1) { - var29.remove(); - var29.widget.__fq = false; + WidgetGroupParent var33 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var9.id); + if (var33 != null) { + if (var33.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { + for (var32 = (ScriptEvent)Client.scriptEvents.last(); var32 != null; var32 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var32.boolean1) { + var32.remove(); + var32.widget.field978 = false; } } - if(MouseRecorder.widgetDragDuration == 0) { + if (MouseRecorder.widgetDragDuration == 0) { Client.clickedWidget = null; Client.clickedWidgetParent = null; } - if(!Client.isMenuOpen) { + if (!Client.isMenuOpen) { class30.resetMenuEntries(); } } - class231.method4517(var28.group, var12, var13, var14, var15, var10, var11); + class231.method4517(var33.group, var12, var13, var14, var15, var10, var11); } } } diff --git a/runescape-client/src/main/java/class248.java b/runescape-client/src/main/java/class248.java index 7d529fbf77..b3ada630e4 100644 --- a/runescape-client/src/main/java/class248.java +++ b/runescape-client/src/main/java/class248.java @@ -1,5 +1,4 @@ import java.util.HashMap; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,12 +6,12 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("iu") public class class248 { @ObfuscatedName("e") - static int[] __iu_e; + static int[] field1141; @ObfuscatedName("n") @ObfuscatedGetter( intValue = 662119345 ) - static int __iu_n; + static int field1142; @ObfuscatedName("m") final HashMap field3267; @ObfuscatedName("f") @@ -51,17 +50,17 @@ public class class248 { int[] var6 = new int[var2 * var2]; boolean var7 = false; - for(int var8 = 0; var8 < var2; ++var8) { - for(int var9 = 0; var9 < var2; ++var9) { + for (int var8 = 0; var8 < var2; ++var8) { + for (int var9 = 0; var9 < var2; ++var9) { int var10 = var6[var9 + var2 * var8] = (int)(256.0D * (var3[var9] * var3[var8] / var4)); - if(!var7 && var10 > 0) { + if (!var7 && var10 > 0) { var7 = true; } } } Sprite var11 = new Sprite(var6, var2, var2); - this.field3267.put(Integer.valueOf(var1), var11); + this.field3267.put(var1, var11); } @ObfuscatedName("q") @@ -70,11 +69,11 @@ public class class248 { garbageValue = "-1847730067" ) Sprite method4718(int var1) { - if(!this.field3267.containsKey(Integer.valueOf(var1))) { + if (!this.field3267.containsKey(var1)) { this.method4716(var1); } - return (Sprite)this.field3267.get(Integer.valueOf(var1)); + return (Sprite)this.field3267.get(var1); } @ObfuscatedName("w") @@ -83,11 +82,12 @@ public class class248 { garbageValue = "-703491177" ) public final void method4738(int var1, int var2) { - if(this.field3266 < this.field3271.length) { + if (this.field3266 < this.field3271.length) { this.field3271[this.field3266] = var1; this.field3262[this.field3266] = var2; ++this.field3266; } + } @ObfuscatedName("o") @@ -110,38 +110,38 @@ public class class248 { int var7 = var5 * 2 + 1; Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); Bounds var9 = new Bounds(0, 0); - this.field3263.__f_488(var7, var7); + this.field3263.method29(var7, var7); System.nanoTime(); int var10; int var11; int var12; - for(var10 = 0; var10 < this.field3266; ++var10) { + for (var10 = 0; var10 < this.field3266; ++var10) { var11 = this.field3271[var10]; var12 = this.field3262[var10]; int var13 = (int)(var4 * (float)(var11 - var1)) - var5; int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; - this.field3263.__m_487(var13, var14); - this.field3263.__q_490(var8, var9); + this.field3263.method28(var13, var14); + this.field3263.method30(var8, var9); this.method4721(var6, var3, var9); } System.nanoTime(); System.nanoTime(); - for(var10 = 0; var10 < var3.pixels.length; ++var10) { - if(var3.pixels[var10] == 0) { + for (var10 = 0; var10 < var3.pixels.length; ++var10) { + if (var3.pixels[var10] == 0) { var3.pixels[var10] = -16777216; } else { var11 = (var3.pixels[var10] + 64 - 1) / 256; - if(var11 <= 0) { + if (var11 <= 0) { var3.pixels[var10] = -16777216; } else { - if(var11 > __iu_e.length) { - var11 = __iu_e.length; + if (var11 > field1141.length) { + var11 = field1141.length; } - var12 = __iu_e[var11 - 1]; + var12 = field1141[var11 - 1]; var3.pixels[var10] = -16777216 | var12; } } @@ -156,31 +156,32 @@ public class class248 { garbageValue = "112" ) void method4721(Sprite var1, Sprite var2, Bounds var3) { - if(var3.__q != 0 && var3.__w != 0) { + if (var3.field43 != 0 && var3.field44 != 0) { int var4 = 0; int var5 = 0; - if(var3.__m == 0) { - var4 = var1.subWidth - var3.__q; + if (var3.field41 == 0) { + var4 = var1.subWidth - var3.field43; } - if(var3.__f == 0) { - var5 = var1.subHeight - var3.__w; + if (var3.field42 == 0) { + var5 = var1.subHeight - var3.field44; } int var6 = var4 + var5 * var1.subWidth; - int var7 = var2.subWidth * var3.__f + var3.__m; + int var7 = var2.subWidth * var3.field42 + var3.field41; - for(int var8 = 0; var8 < var3.__w; ++var8) { - for(int var9 = 0; var9 < var3.__q; ++var9) { - int var10001 = var7++; - var2.pixels[var10001] += var1.pixels[var6++]; + for (int var8 = 0; var8 < var3.field44; ++var8) { + for (int var9 = 0; var9 < var3.field43; ++var9) { + int var10 = var7++; + int[] var11 = var2.pixels; + var11[var10] += var1.pixels[var6++]; } - var6 += var1.subWidth - var3.__q; - var7 += var2.subWidth - var3.__q; + var6 += var1.subWidth - var3.field43; + var7 += var2.subWidth - var3.field43; } - } + } @ObfuscatedName("ar") @@ -190,136 +191,136 @@ public class class248 { ) static int method4741(int var0, Script var1, boolean var2) { int var3; - if(var0 == 3903) { + if (var0 == 3903) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); return 1; - } else if(var0 == 3904) { + } else if (var0 == 3904) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; return 1; - } else if(var0 == 3905) { + } else if (var0 == 3905) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; return 1; - } else if(var0 == 3906) { + } else if (var0 == 3906) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; return 1; - } else if(var0 == 3907) { + } else if (var0 == 3907) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; return 1; - } else if(var0 == 3908) { + } else if (var0 == 3908) { 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) { + int var4; + if (var0 == 3910) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12 == 0?1:0; + var4 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 == 0 ? 1 : 0; return 1; - } else if(var0 == 3911) { + } else if (var0 == 3911) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12 == 2?1:0; + var4 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 == 2 ? 1 : 0; return 1; - } else if(var0 == 3912) { + } else if (var0 == 3912) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12 == 5?1:0; + var4 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 == 5 ? 1 : 0; return 1; - } else if(var0 == 3913) { + } else if (var0 == 3913) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12 == 1?1:0; + var4 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 == 1 ? 1 : 0; return 1; } else { - boolean var13; - if(var0 == 3914) { - var13 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - if(FloorDecoration.grandExchangeEvents != null) { - FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_w, var13); + boolean var5; + if (var0 == 3914) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + if (FloorDecoration.grandExchangeEvents != null) { + FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field373, var5); } return 1; - } else if(var0 == 3915) { - var13 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - if(FloorDecoration.grandExchangeEvents != null) { - FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_q, var13); + } else if (var0 == 3915) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + if (FloorDecoration.grandExchangeEvents != null) { + FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field372, var5); } return 1; - } else if(var0 == 3916) { + } else if (var0 == 3916) { 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); + var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] == 1; + boolean var13 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1; + if (FloorDecoration.grandExchangeEvents != null) { + Client.field159.field666 = var13; + FloorDecoration.grandExchangeEvents.sort(Client.field159, var5); } return 1; - } else if(var0 == 3917) { - var13 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - if(FloorDecoration.grandExchangeEvents != null) { - FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_f, var13); + } else if (var0 == 3917) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + if (FloorDecoration.grandExchangeEvents != null) { + FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field371, var5); } return 1; - } else if(var0 == 3918) { - var13 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - if(FloorDecoration.grandExchangeEvents != null) { - FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_o, var13); + } else if (var0 == 3918) { + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + if (FloorDecoration.grandExchangeEvents != null) { + FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field374, var5); } return 1; - } else if(var0 == 3919) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = FloorDecoration.grandExchangeEvents == null?0:FloorDecoration.grandExchangeEvents.events.size(); + } else if (var0 == 3919) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = FloorDecoration.grandExchangeEvents == null ? 0 : FloorDecoration.grandExchangeEvents.events.size(); return 1; } else { - GrandExchangeEvent var11; - if(var0 == 3920) { + GrandExchangeEvent var6; + if (var0 == 3920) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.world; + var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.world; return 1; - } else if(var0 == 3921) { + } else if (var0 == 3921) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.__m_3(); + var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.method119(); return 1; - } else if(var0 == 3922) { + } else if (var0 == 3922) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.__f_4(); + var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.method120(); return 1; - } else if(var0 == 3923) { + } else if (var0 == 3923) { 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); - int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); - int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); - String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10; + var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); + long var7 = class203.currentTimeMs() - class15.field1113 - var6.field370; + int var9 = (int)(var7 / 3600000L); + int var10 = (int)((var7 - (long)(var9 * 3600000)) / 60000L); + int var11 = (int)((var7 - (long)(var9 * 3600000) - (long)(var10 * 60000)) / 1000L); + String var12 = var9 + ":" + var10 / 10 + var10 % 10 + ":" + var11 / 10 + var11 % 10; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12; return 1; - } else if(var0 == 3924) { + } else if (var0 == 3924) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity; + var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.grandExchangeOffer.totalQuantity; return 1; - } else if(var0 == 3925) { + } else if (var0 == 3925) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice; + var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.grandExchangeOffer.unitPrice; return 1; - } else if(var0 == 3926) { + } else if (var0 == 3926) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; + var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.grandExchangeOffer.id; return 1; } else { return 2; diff --git a/runescape-client/src/main/java/class249.java b/runescape-client/src/main/java/class249.java index 05f3efda01..5693e89cd6 100644 --- a/runescape-client/src/main/java/class249.java +++ b/runescape-client/src/main/java/class249.java @@ -32,7 +32,7 @@ public enum class249 implements Enumerated { ) final int field3276; - class249(int var3, int var4) { + private class249(int var3, int var4) { this.field3275 = var3; this.field3276 = var4; } diff --git a/runescape-client/src/main/java/class25.java b/runescape-client/src/main/java/class25.java index 5bd96c6c26..59cad88368 100644 --- a/runescape-client/src/main/java/class25.java +++ b/runescape-client/src/main/java/class25.java @@ -45,21 +45,21 @@ public class class25 { garbageValue = "-1540935608" ) static final int method348(int var0, int var1) { - if(var0 == -2) { + if (var0 == -2) { return 12345678; - } else if(var0 == -1) { - if(var1 < 2) { + } else if (var0 == -1) { + if (var1 < 2) { var1 = 2; - } else if(var1 > 126) { + } else if (var1 > 126) { var1 = 126; } return var1; } else { var1 = (var0 & 127) * var1 / 128; - if(var1 < 2) { + if (var1 < 2) { var1 = 2; - } else if(var1 > 126) { + } else if (var1 > 126) { var1 = 126; } @@ -73,7 +73,7 @@ public class class25 { garbageValue = "641029128" ) static void method349() { - if(Client.renderSelf) { + if (Client.renderSelf) { WorldMapCacheName.addPlayerToScene(Canvas.localPlayer, false); } @@ -86,17 +86,17 @@ public class class25 { ) static void method350(int var0, int var1, int var2, int var3) { Widget var4 = class204.getWidgetChild(var0, var1); - if(var4 != null && var4.onTargetEnter != null) { + if (var4 != null && var4.onTargetEnter != null) { ScriptEvent var5 = new ScriptEvent(); var5.widget = var4; var5.args0 = var4.onTargetEnter; AbstractIndexCache.runScript(var5); } - Client.__client_mh = var3; + Client.field157 = var3; Client.isSpellSelected = true; - ServerBuild.__iy_lo = var0; - Client.__client_lc = var1; + ServerBuild.field788 = var0; + Client.field220 = var1; FloorDecoration.selectedSpellFlags = var2; class22.method295(var4); } diff --git a/runescape-client/src/main/java/class258.java b/runescape-client/src/main/java/class258.java index 94185ddd44..90c200d0eb 100644 --- a/runescape-client/src/main/java/class258.java +++ b/runescape-client/src/main/java/class258.java @@ -20,7 +20,7 @@ public class class258 { byte[] var2 = class328.spritePixels[0]; var0.pixels = new int[var1]; - for(int var3 = 0; var3 < var1; ++var3) { + for (int var3 = 0; var3 < var1; ++var3) { var0.pixels[var3] = class328.indexedSpritePalette[var2[var3] & 255]; } @@ -29,7 +29,7 @@ public class class258 { VarbitDefinition.indexedSpriteWidths = null; SecureRandomCallable.indexedSpriteHeights = null; class328.indexedSpritePalette = null; - class328.spritePixels = null; + class328.spritePixels = (byte[][])null; return var0; } @@ -41,21 +41,21 @@ public class class258 { static final void method4898(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { class68 var9 = null; - for(class68 var10 = (class68)Client.__client_kh.last(); var10 != null; var10 = (class68)Client.__client_kh.previous()) { - if(var0 == var10.field911 && var10.field913 == var1 && var2 == var10.field901 && var3 == var10.field906) { + for (class68 var10 = (class68)Client.field214.last(); var10 != null; var10 = (class68)Client.field214.previous()) { + if (var0 == var10.field911 && var10.field913 == var1 && var2 == var10.field901 && var3 == var10.field906) { var9 = var10; break; } } - if(var9 == null) { + if (var9 == null) { var9 = new class68(); var9.field911 = var0; var9.field906 = var3; var9.field913 = var1; var9.field901 = var2; class13.method165(var9); - Client.__client_kh.addFirst(var9); + Client.field214.addFirst(var9); } var9.field899 = var4; diff --git a/runescape-client/src/main/java/class266.java b/runescape-client/src/main/java/class266.java index 72071e4fc6..530e82e647 100644 --- a/runescape-client/src/main/java/class266.java +++ b/runescape-client/src/main/java/class266.java @@ -35,7 +35,7 @@ public enum class266 implements Enumerated { ) final int field3530; - class266(int var3, int var4) { + private class266(int var3, int var4) { this.field3528 = var3; this.field3530 = var4; } @@ -56,13 +56,13 @@ public enum class266 implements Enumerated { garbageValue = "1908348747" ) static final void method5120() { - if(VertexNormal.__dq_pe) { - if(PacketWriter.clanChat != null) { + if (VertexNormal.field945) { + if (PacketWriter.clanChat != null) { PacketWriter.clanChat.sort(); } FontName.method5635(); - VertexNormal.__dq_pe = false; + VertexNormal.field945 = false; } } diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java index 56f35f4e9d..1bc9f8323c 100644 --- a/runescape-client/src/main/java/class27.java +++ b/runescape-client/src/main/java/class27.java @@ -13,7 +13,7 @@ public final class class27 { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache __aq_k; + public static AbstractIndexCache field1143; @ObfuscatedName("f") final int[] field225; @@ -40,7 +40,7 @@ public final class class27 { garbageValue = "37" ) public static ServerPacket[] method429() { - return new ServerPacket[]{ServerPacket.__ge_m, ServerPacket.__ge_f, ServerPacket.__ge_q, ServerPacket.__ge_w, ServerPacket.__ge_o, ServerPacket.__ge_u, ServerPacket.__ge_g, ServerPacket.__ge_l, ServerPacket.__ge_e, ServerPacket.__ge_x, ServerPacket.__ge_d, ServerPacket.__ge_k, ServerPacket.__ge_n, ServerPacket.__ge_i, ServerPacket.__ge_a, ServerPacket.__ge_z, ServerPacket.__ge_j, ServerPacket.__ge_s, ServerPacket.__ge_t, ServerPacket.__ge_y, ServerPacket.__ge_h, ServerPacket.__ge_b, ServerPacket.__ge_c, ServerPacket.__ge_r, ServerPacket.__ge_p, ServerPacket.__ge_v, ServerPacket.__ge_ag, ServerPacket.__ge_aq, ServerPacket.__ge_aj, ServerPacket.__ge_av, ServerPacket.__ge_ar, ServerPacket.__ge_ac, ServerPacket.__ge_ay, ServerPacket.__ge_ah, ServerPacket.__ge_ak, ServerPacket.__ge_aw, ServerPacket.__ge_al, ServerPacket.__ge_ab, ServerPacket.__ge_ae, ServerPacket.__ge_at, ServerPacket.__ge_ad, ServerPacket.__ge_ap, ServerPacket.__ge_as, ServerPacket.__ge_am, ServerPacket.__ge_an, ServerPacket.__ge_az, ServerPacket.__ge_au, ServerPacket.__ge_ao, ServerPacket.__ge_aa, ServerPacket.__ge_ax, ServerPacket.__ge_af, ServerPacket.__ge_ai, ServerPacket.__ge_ba, ServerPacket.__ge_bb, ServerPacket.__ge_bs, ServerPacket.__ge_bq, ServerPacket.__ge_bn, ServerPacket.__ge_bk, ServerPacket.__ge_bd, ServerPacket.__ge_bc, ServerPacket.__ge_bo, ServerPacket.__ge_bx, ServerPacket.__ge_by, ServerPacket.__ge_bu, ServerPacket.__ge_bm, ServerPacket.__ge_bl, ServerPacket.__ge_br, ServerPacket.__ge_bj, ServerPacket.__ge_bi, ServerPacket.__ge_bz, ServerPacket.__ge_bg, ServerPacket.__ge_bt, ServerPacket.__ge_bp, ServerPacket.__ge_bf, ServerPacket.__ge_bh, ServerPacket.__ge_be, ServerPacket.__ge_bv, ServerPacket.__ge_bw, ServerPacket.__ge_cr, ServerPacket.__ge_cv, ServerPacket.__ge_ce, ServerPacket.__ge_cy, ServerPacket.__ge_cs, ServerPacket.__ge_cm, ServerPacket.__ge_cj}; + return new ServerPacket[]{ServerPacket.field789, ServerPacket.field790, ServerPacket.field791, ServerPacket.field792, ServerPacket.field793, ServerPacket.field794, ServerPacket.field795, ServerPacket.field796, ServerPacket.field797, ServerPacket.field798, ServerPacket.field799, ServerPacket.field800, ServerPacket.field801, ServerPacket.field802, ServerPacket.field803, ServerPacket.field804, ServerPacket.field805, ServerPacket.field806, ServerPacket.field807, ServerPacket.field808, ServerPacket.field809, ServerPacket.field810, ServerPacket.field811, ServerPacket.field812, ServerPacket.field813, ServerPacket.field814, ServerPacket.field815, ServerPacket.field816, ServerPacket.field817, ServerPacket.field818, ServerPacket.field819, ServerPacket.field820, ServerPacket.field821, ServerPacket.field822, ServerPacket.field823, ServerPacket.field824, ServerPacket.field825, ServerPacket.field826, ServerPacket.field827, ServerPacket.field828, ServerPacket.field829, ServerPacket.field830, ServerPacket.field831, ServerPacket.field832, ServerPacket.field833, ServerPacket.field834, ServerPacket.field835, ServerPacket.field836, ServerPacket.field837, ServerPacket.field838, ServerPacket.field839, ServerPacket.field840, ServerPacket.field841, ServerPacket.field842, ServerPacket.field843, ServerPacket.field844, ServerPacket.field845, ServerPacket.field846, ServerPacket.field847, ServerPacket.field848, ServerPacket.field849, ServerPacket.field850, ServerPacket.field851, ServerPacket.field852, ServerPacket.field853, ServerPacket.field854, ServerPacket.field855, ServerPacket.field856, ServerPacket.field857, ServerPacket.field858, ServerPacket.field859, ServerPacket.field860, ServerPacket.field861, ServerPacket.field862, ServerPacket.field863, ServerPacket.field864, ServerPacket.field865, ServerPacket.field866, ServerPacket.field867, ServerPacket.field868, ServerPacket.field869, ServerPacket.field870, ServerPacket.field871, ServerPacket.field872, ServerPacket.field873}; } @ObfuscatedName("m") @@ -60,10 +60,8 @@ public final class class27 { PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); var5.grabPixels(); return new Sprite(var4, var2, var3); - } catch (IOException var7) { - ; - } catch (InterruptedException var8) { - ; + } catch (IOException var6) { + } catch (InterruptedException var7) { } return new Sprite(0, 0); diff --git a/runescape-client/src/main/java/class277.java b/runescape-client/src/main/java/class277.java index 4842816eaa..561600be0e 100644 --- a/runescape-client/src/main/java/class277.java +++ b/runescape-client/src/main/java/class277.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,16 +7,16 @@ public class class277 { @ObfuscatedSignature( signature = "Llq;" ) - static IndexedSprite __jn_by; + static IndexedSprite field1144; @ObfuscatedName("m") public static final int method5355(double var0, double var2, double var4) { double var6 = var4; double var8 = var4; double var10 = var4; - if(0.0D != var2) { + if (0.0D != var2) { double var12; - if(var4 < 0.5D) { + if (var4 < 0.5D) { var12 = var4 * (var2 + 1.0D); } else { var12 = var4 + var2 - var2 * var4; @@ -25,50 +24,50 @@ public class class277 { double var14 = var4 * 2.0D - var12; double var16 = var0 + 0.3333333333333333D; - if(var16 > 1.0D) { + if (var16 > 1.0D) { --var16; } - double var20 = var0 - 0.3333333333333333D; - if(var20 < 0.0D) { - ++var20; + double var18 = var0 - 0.3333333333333333D; + if (var18 < 0.0D) { + ++var18; } - if(6.0D * var16 < 1.0D) { + if (6.0D * var16 < 1.0D) { var6 = var16 * (var12 - var14) * 6.0D + var14; - } else if(var16 * 2.0D < 1.0D) { + } else if (var16 * 2.0D < 1.0D) { var6 = var12; - } else if(var16 * 3.0D < 2.0D) { + } else if (var16 * 3.0D < 2.0D) { var6 = var14 + (var12 - var14) * (0.6666666666666666D - var16) * 6.0D; } else { var6 = var14; } - if(var0 * 6.0D < 1.0D) { + if (var0 * 6.0D < 1.0D) { var8 = var14 + (var12 - var14) * 6.0D * var0; - } else if(var0 * 2.0D < 1.0D) { + } else if (var0 * 2.0D < 1.0D) { var8 = var12; - } else if(var0 * 3.0D < 2.0D) { + } else if (var0 * 3.0D < 2.0D) { var8 = 6.0D * (0.6666666666666666D - var0) * (var12 - var14) + var14; } else { var8 = var14; } - if(var20 * 6.0D < 1.0D) { - var10 = var20 * 6.0D * (var12 - var14) + var14; - } else if(2.0D * var20 < 1.0D) { + if (var18 * 6.0D < 1.0D) { + var10 = var18 * 6.0D * (var12 - var14) + var14; + } else if (2.0D * var18 < 1.0D) { var10 = var12; - } else if(var20 * 3.0D < 2.0D) { - var10 = var14 + 6.0D * (0.6666666666666666D - var20) * (var12 - var14); + } else if (var18 * 3.0D < 2.0D) { + var10 = var14 + 6.0D * (0.6666666666666666D - var18) * (var12 - var14); } else { var10 = var14; } } - int var22 = (int)(256.0D * var6); + int var20 = (int)(256.0D * var6); int var13 = (int)(var8 * 256.0D); - int var23 = (int)(var10 * 256.0D); - int var15 = var23 + (var13 << 8) + (var22 << 16); + int var21 = (int)(var10 * 256.0D); + int var15 = var21 + (var13 << 8) + (var20 << 16); return var15; } @@ -78,18 +77,18 @@ public class class277 { garbageValue = "1648987580" ) public static String method5356(CharSequence[] var0, int var1, int var2) { - if(var2 == 0) { + if (var2 == 0) { return ""; - } else if(var2 == 1) { - CharSequence var3 = var0[var1]; - return var3 == null?"null":var3.toString(); + } else if (var2 == 1) { + CharSequence var8 = var0[var1]; + return var8 == null ? "null" : var8.toString(); } else { - int var8 = var2 + var1; + int var3 = var2 + var1; int var4 = 0; - for(int var5 = var1; var5 < var8; ++var5) { + for (int var5 = var1; var5 < var3; ++var5) { CharSequence var6 = var0[var5]; - if(var6 == null) { + if (var6 == null) { var4 += 4; } else { var4 += var6.length(); @@ -98,9 +97,9 @@ public class class277 { StringBuilder var9 = new StringBuilder(var4); - for(int var10 = var1; var10 < var8; ++var10) { + for (int var10 = var1; var10 < var3; ++var10) { CharSequence var7 = var0[var10]; - if(var7 == null) { + if (var7 == null) { var9.append("null"); } else { var9.append(var7); diff --git a/runescape-client/src/main/java/class279.java b/runescape-client/src/main/java/class279.java index d04cc4cf14..f133883da7 100644 --- a/runescape-client/src/main/java/class279.java +++ b/runescape-client/src/main/java/class279.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,7 +7,7 @@ public class class279 { @ObfuscatedSignature( signature = "[Lho;" ) - static Widget[] __jx_ne; + static Widget[] field1145; @ObfuscatedName("e") @ObfuscatedSignature( @@ -19,7 +18,7 @@ public class class279 { int var1 = var0.length(); int var2 = 0; - for(int var3 = 0; var3 < var1; ++var3) { + for (int var3 = 0; var3 < var1; ++var3) { var2 = (var2 << 5) - var2 + var0.charAt(var3); } diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index 897fa6c136..85d54a219a 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -9,7 +9,7 @@ public class class3 implements Enumerated { @ObfuscatedGetter( intValue = 1608439891 ) - static int __w_qs; + static int field1146; @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lw;" @@ -34,7 +34,7 @@ public class class3 implements Enumerated { @ObfuscatedGetter( intValue = -393250053 ) - public final int id; + public final int field1147; @ObfuscatedName("u") public final Class field18; @ObfuscatedName("g") @@ -43,18 +43,12 @@ public class class3 implements Enumerated { ) public final class0 field19; - static { - field20 = new class3(2, 0, Integer.class, new class1()); - field14 = new class3(0, 1, Long.class, new class2()); - field15 = new class3(1, 2, String.class, new class4()); - } - @ObfuscatedSignature( signature = "(IILjava/lang/Class;Lm;)V" ) class3(int var1, int var2, Class var3, class0 var4) { this.field13 = var1; - this.id = var2; + this.field1147 = var2; this.field18 = var3; this.field19 = var4; } @@ -66,7 +60,7 @@ public class class3 implements Enumerated { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.field1147; } @ObfuscatedName("q") @@ -102,18 +96,18 @@ public class class3 implements Enumerated { garbageValue = "729662922" ) public static void method41() { - while(true) { - NodeDeque var1 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; - IndexStoreAction var0; + while (true) { + NodeDeque var0 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; + IndexStoreAction var1; synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { - var0 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_responseQueue.removeLast(); + var1 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_responseQueue.removeLast(); } - if(var0 == null) { + if (var1 == null) { return; } - var0.indexCache.load(var0.indexStore, (int)var0.key, var0.data, false); + var1.indexCache.load(var1.indexStore, (int)var1.key, var1.data, false); } } @@ -123,35 +117,35 @@ public class class3 implements Enumerated { garbageValue = "653716649" ) static void method42(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { - if(var0 < var1) { + if (var0 < var1) { int var6 = (var0 + var1) / 2; int var7 = var0; World var8 = ItemContainer.worlds[var6]; ItemContainer.worlds[var6] = ItemContainer.worlds[var1]; ItemContainer.worlds[var1] = var8; - for(int var9 = var0; var9 < var1; ++var9) { - World var11 = ItemContainer.worlds[var9]; - int var12 = WorldMapLabel.compareWorlds(var11, var8, var2, var3); - int var10; - if(var12 != 0) { - if(var3) { - var10 = -var12; + for (int var9 = var0; var9 < var1; ++var9) { + World var10 = ItemContainer.worlds[var9]; + int var11 = WorldMapLabel.compareWorlds(var10, var8, var2, var3); + int var12; + if (var11 != 0) { + if (var3) { + var12 = -var11; } else { - var10 = var12; + var12 = var11; } - } else if(var4 == -1) { - var10 = 0; + } else if (var4 == -1) { + var12 = 0; } else { - int var13 = WorldMapLabel.compareWorlds(var11, var8, var4, var5); - if(var5) { - var10 = -var13; + int var13 = WorldMapLabel.compareWorlds(var10, var8, var4, var5); + if (var5) { + var12 = -var13; } else { - var10 = var13; + var12 = var13; } } - if(var10 <= 0) { + if (var12 <= 0) { World var14 = ItemContainer.worlds[var9]; ItemContainer.worlds[var9] = ItemContainer.worlds[var7]; ItemContainer.worlds[var7++] = var14; @@ -173,158 +167,164 @@ public class class3 implements Enumerated { ) @Export("updateNpcs") static final void updateNpcs(boolean var0, PacketBuffer var1) { - Client.__client_ky = 0; - Client.__client_fw = 0; + Client.field211 = 0; + Client.field173 = 0; PacketBuffer var2 = Client.packetWriter.packetBuffer; var2.importIndex(); int var3 = var2.readBits(8); int var4; - if(var3 < Client.npcCount) { - for(var4 = var3; var4 < Client.npcCount; ++var4) { - Client.__client_kd[++Client.__client_ky - 1] = Client.npcIndices[var4]; + if (var3 < Client.npcCount) { + for (var4 = var3; var4 < Client.npcCount; ++var4) { + Client.field212[++Client.field211 - 1] = Client.npcIndices[var4]; } } - if(var3 > Client.npcCount) { + if (var3 > Client.npcCount) { throw new RuntimeException(""); } else { Client.npcCount = 0; int var5; + int var6; int var7; int var8; - int var9; - for(var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { var5 = Client.npcIndices[var4]; - Npc var6 = Client.npcs[var5]; - var7 = var2.readBits(1); - if(var7 == 0) { + NPC var9 = Client.npcs[var5]; + var6 = var2.readBits(1); + if (var6 == 0) { Client.npcIndices[++Client.npcCount - 1] = var5; - var6.npcCycle = Client.cycle; + var9.npcCycle = Client.cycle; } else { - var8 = var2.readBits(2); - if(var8 == 0) { + var7 = var2.readBits(2); + if (var7 == 0) { Client.npcIndices[++Client.npcCount - 1] = var5; - var6.npcCycle = Client.cycle; - Client.__client_fg[++Client.__client_fw - 1] = var5; + var9.npcCycle = Client.cycle; + Client.field174[++Client.field173 - 1] = var5; } else { int var10; - if(var8 == 1) { + if (var7 == 1) { Client.npcIndices[++Client.npcCount - 1] = var5; - var6.npcCycle = Client.cycle; - var9 = var2.readBits(3); - var6.__m_162(var9, (byte)1); + var9.npcCycle = Client.cycle; + var8 = var2.readBits(3); + var9.method227(var8, (byte)1); var10 = var2.readBits(1); - if(var10 == 1) { - Client.__client_fg[++Client.__client_fw - 1] = var5; + if (var10 == 1) { + Client.field174[++Client.field173 - 1] = var5; } - } else if(var8 == 2) { + } else if (var7 == 2) { Client.npcIndices[++Client.npcCount - 1] = var5; - var6.npcCycle = Client.cycle; - var9 = var2.readBits(3); - var6.__m_162(var9, (byte)2); + var9.npcCycle = Client.cycle; + var8 = var2.readBits(3); + var9.method227(var8, (byte)2); var10 = var2.readBits(3); - var6.__m_162(var10, (byte)2); + var9.method227(var10, (byte)2); int var11 = var2.readBits(1); - if(var11 == 1) { - Client.__client_fg[++Client.__client_fw - 1] = var5; + if (var11 == 1) { + Client.field174[++Client.field173 - 1] = var5; } - } else if(var8 == 3) { - Client.__client_kd[++Client.__client_ky - 1] = var5; + } else if (var7 == 3) { + Client.field212[++Client.field211 - 1] = var5; } } } } - int var12; - while(var1.bitsRemaining(Client.packetWriter.serverPacket0Length) >= 27) { - var12 = var1.readBits(15); - if(var12 == 32767) { + int var13; + while (var1.bitsRemaining(Client.packetWriter.serverPacket0Length) >= 27) { + var13 = var1.readBits(15); + if (var13 == 32767) { break; } - boolean var15 = false; - if(Client.npcs[var12] == null) { - Client.npcs[var12] = new Npc(); - var15 = true; + boolean var14 = false; + if (Client.npcs[var13] == null) { + Client.npcs[var13] = new NPC(); + var14 = true; } - Npc var13 = Client.npcs[var12]; - Client.npcIndices[++Client.npcCount - 1] = var12; - var13.npcCycle = Client.cycle; - if(var0) { + NPC var15 = Client.npcs[var13]; + Client.npcIndices[++Client.npcCount - 1] = var13; + var15.npcCycle = Client.cycle; + if (var0) { var5 = var1.readBits(8); - if(var5 > 127) { + if (var5 > 127) { var5 -= 256; } } else { var5 = var1.readBits(5); - if(var5 > 15) { + if (var5 > 15) { var5 -= 32; } } - int var14 = var1.readBits(1); - var7 = Client.__client_kn[var1.readBits(3)]; - if(var15) { - var13.orientation = var13.__ac = var7; + int var12 = var1.readBits(1); + var6 = Client.field213[var1.readBits(3)]; + if (var14) { + var15.orientation = var15.field9 = var6; } - var8 = var1.readBits(1); - if(var8 == 1) { - Client.__client_fg[++Client.__client_fw - 1] = var12; + var7 = var1.readBits(1); + if (var7 == 1) { + Client.field174[++Client.field173 - 1] = var13; } - if(var0) { - var9 = var1.readBits(8); - if(var9 > 127) { - var9 -= 256; + if (var0) { + var8 = var1.readBits(8); + if (var8 > 127) { + var8 -= 256; } } else { - var9 = var1.readBits(5); - if(var9 > 15) { - var9 -= 32; + var8 = var1.readBits(5); + if (var8 > 15) { + var8 -= 32; } } - var13.definition = ObjectDefinition.getNpcDefinition(var1.readBits(14)); - var13.size = var13.definition.size; - var13.__cj = var13.definition.__av; - if(var13.__cj == 0) { - var13.__ac = 0; + var15.definition = ObjectDefinition.getNpcDefinition(var1.readBits(14)); + var15.size = var15.definition.size; + var15.field23 = var15.definition.field639; + if (var15.field23 == 0) { + var15.field9 = 0; } - var13.walkSequence = var13.definition.walkSequence; - var13.walkTurnSequence = var13.definition.walkTurnSequence; - var13.walkTurnLeftSequence = var13.definition.walkTurnLeftSequence; - var13.walkTurnRightSequence = var13.definition.walkTurnRightSequence; - var13.idleSequence = var13.definition.idleSequence; - var13.turnLeftSequence = var13.definition.turnLeftSequence; - var13.turnRightSequence = var13.definition.turnRightSequence; - var13.__f_163(Canvas.localPlayer.pathX[0] + var5, Canvas.localPlayer.pathY[0] + var9, var14 == 1); + var15.walkSequence = var15.definition.walkSequence; + var15.walkTurnSequence = var15.definition.walkTurnSequence; + var15.walkTurnLeftSequence = var15.definition.walkTurnLeftSequence; + var15.walkTurnRightSequence = var15.definition.walkTurnRightSequence; + var15.idleSequence = var15.definition.idleSequence; + var15.turnLeftSequence = var15.definition.turnLeftSequence; + var15.turnRightSequence = var15.definition.turnRightSequence; + var15.method228(Canvas.localPlayer.pathX[0] + var5, Canvas.localPlayer.pathY[0] + var8, var12 == 1); } var1.exportIndex(); WorldComparator.method67(var1); - for(var12 = 0; var12 < Client.__client_ky; ++var12) { - var3 = Client.__client_kd[var12]; - if(Client.npcs[var3].npcCycle != Client.cycle) { + for (var13 = 0; var13 < Client.field211; ++var13) { + var3 = Client.field212[var13]; + if (Client.npcs[var3].npcCycle != Client.cycle) { Client.npcs[var3].definition = null; Client.npcs[var3] = null; } } - if(var1.index != Client.packetWriter.serverPacket0Length) { + if (var1.index != Client.packetWriter.serverPacket0Length) { throw new RuntimeException(var1.index + "," + Client.packetWriter.serverPacket0Length); } else { - for(var12 = 0; var12 < Client.npcCount; ++var12) { - if(Client.npcs[Client.npcIndices[var12]] == null) { - throw new RuntimeException(var12 + "," + Client.npcCount); + for (var13 = 0; var13 < Client.npcCount; ++var13) { + if (Client.npcs[Client.npcIndices[var13]] == null) { + throw new RuntimeException(var13 + "," + Client.npcCount); } } } } } + + static { + field20 = new class3(2, 0, Integer.class, new class1()); + field14 = new class3(0, 1, Long.class, new class2()); + field15 = new class3(1, 2, String.class, new class4()); + } } diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java index 77772fbde5..0fe6164fd8 100644 --- a/runescape-client/src/main/java/class30.java +++ b/runescape-client/src/main/java/class30.java @@ -9,7 +9,7 @@ public class class30 { @ObfuscatedGetter( intValue = -1555836449 ) - static int __ar_qw; + static int field1148; @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lar;" @@ -41,11 +41,6 @@ public class class30 { ) final int field248; - static { - field246 = new class30(0); - field247 = new class30(1); - } - class30(int var1) { this.field248 = var1; } @@ -56,7 +51,7 @@ public class class30 { garbageValue = "2127022463" ) static int method571(int var0) { - return (int)((Math.log((double)var0) / Interpreter.__bv_r - 7.0D) * 256.0D); + return (int)((Math.log((double)var0) / Interpreter.field426 - 7.0D) * 256.0D); } @ObfuscatedName("hp") @@ -81,43 +76,48 @@ public class class30 { garbageValue = "-1070833742" ) static final void method570(Widget[] var0, int var1) { - for(int var2 = 0; var2 < var0.length; ++var2) { + for (int var2 = 0; var2 < var0.length; ++var2) { Widget var3 = var0[var2]; - if(var3 != null) { - if(var3.type == 0) { - if(var3.children != null) { + if (var3 != null) { + if (var3.type == 0) { + if (var3.children != null) { method570(var3.children, var1); } WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var3.id); - if(var4 != null) { + if (var4 != null) { GrandExchangeEvents.method74(var4.group, var1); } } - ScriptEvent var5; - if(var1 == 0 && var3.onDialogAbortListener != null) { - var5 = new ScriptEvent(); - var5.widget = var3; - var5.args0 = var3.onDialogAbortListener; - AbstractIndexCache.runScript(var5); + ScriptEvent var6; + if (var1 == 0 && var3.onDialogAbortListener != null) { + var6 = new ScriptEvent(); + var6.widget = var3; + var6.args0 = var3.onDialogAbortListener; + AbstractIndexCache.runScript(var6); } - if(var1 == 1 && var3.__ei != null) { - if(var3.childIndex >= 0) { - Widget var6 = Huffman.getWidget(var3.id); - if(var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { + if (var1 == 1 && var3.field974 != null) { + if (var3.childIndex >= 0) { + Widget var5 = Huffman.getWidget(var3.id); + if (var5 == null || var5.children == null || var3.childIndex >= var5.children.length || var3 != var5.children[var3.childIndex]) { continue; } } - var5 = new ScriptEvent(); - var5.widget = var3; - var5.args0 = var3.__ei; - AbstractIndexCache.runScript(var5); + var6 = new ScriptEvent(); + var6.widget = var3; + var6.args0 = var3.field974; + AbstractIndexCache.runScript(var6); } } } } + + static { + field246 = new class30(0); + field247 = new class30(1); + } } diff --git a/runescape-client/src/main/java/class305.java b/runescape-client/src/main/java/class305.java index c3c1e965b5..063e617d05 100644 --- a/runescape-client/src/main/java/class305.java +++ b/runescape-client/src/main/java/class305.java @@ -1,15 +1,14 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("kb") public class class305 { @ObfuscatedName("q") - static final char[] __kb_q; + static final char[] field1149; @ObfuscatedName("w") - static final char[] __kb_w; + static final char[] field1150; static { - __kb_q = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; - __kb_w = new char[]{'[', ']', '#'}; + field1149 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; + field1150 = new char[]{'[', ']', '#'}; } } diff --git a/runescape-client/src/main/java/class306.java b/runescape-client/src/main/java/class306.java index 86c014ae84..8d43fd8015 100644 --- a/runescape-client/src/main/java/class306.java +++ b/runescape-client/src/main/java/class306.java @@ -9,10 +9,6 @@ public final class class306 { @Export("base37Table") public static final char[] base37Table; - static { - base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; - } - @ObfuscatedName("m") @ObfuscatedSignature( signature = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", @@ -22,23 +18,23 @@ public final class class306 { int var1 = var0.length(); StringBuilder var2 = new StringBuilder(var1); - for(int var3 = 0; var3 < var1; ++var3) { + for (int var3 = 0; var3 < var1; ++var3) { char var4 = var0.charAt(var3); - if((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { - if(var4 == ' ') { + if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { + if (var4 == ' ') { var2.append('+'); } else { byte var5 = HealthBar.charToByteCp1252(var4); var2.append('%'); int var6 = var5 >> 4 & 15; - if(var6 >= 10) { + if (var6 >= 10) { var2.append((char)(var6 + 55)); } else { var2.append((char)(var6 + 48)); } var6 = var5 & 15; - if(var6 >= 10) { + if (var6 >= 10) { var2.append((char)(var6 + 55)); } else { var2.append((char)(var6 + 48)); @@ -65,27 +61,29 @@ public final class class306 { var0 = LoginPacket.getPreferencesFile("", class22.studioGame.name, false); byte[] var2 = new byte[(int)var0.length()]; - int var4; - for(int var3 = 0; var3 < var2.length; var3 += var4) { - var4 = var0.read(var2, var3, var2.length - var3); - if(var4 == -1) { + int var3; + for (int var4 = 0; var4 < var2.length; var4 += var3) { + var3 = var0.read(var2, var4, var2.length - var4); + if (var3 == -1) { throw new IOException(); } } var1 = new ClientPreferences(new Buffer(var2)); } catch (Exception var6) { - ; } try { - if(var0 != null) { + if (var0 != null) { var0.close(); } } catch (Exception var5) { - ; } return var1; } + + static { + base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; + } } diff --git a/runescape-client/src/main/java/class307.java b/runescape-client/src/main/java/class307.java index dd819cd054..a7d579e6b4 100644 --- a/runescape-client/src/main/java/class307.java +++ b/runescape-client/src/main/java/class307.java @@ -5,15 +5,15 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("kc") public class class307 { @ObfuscatedName("m") - public static char[] __kc_m; + public static char[] field1151; @ObfuscatedName("f") - static char[] __kc_f; + static char[] field1152; @ObfuscatedName("q") - static char[] __kc_q; + static char[] field1153; @ObfuscatedName("w") - static int[] __kc_w; + static int[] field1154; @ObfuscatedName("g") - static byte[][][] __kc_g; + static byte[][][] field1155; @ObfuscatedName("n") @ObfuscatedSignature( signature = "Ldt;" @@ -22,78 +22,78 @@ public class class307 { public static SoundCache soundCache; static { - __kc_m = new char[64]; + field1151 = new char[64]; int var0; - for(var0 = 0; var0 < 26; ++var0) { - __kc_m[var0] = (char)(var0 + 65); + for (var0 = 0; var0 < 26; ++var0) { + field1151[var0] = (char)(var0 + 65); } - for(var0 = 26; var0 < 52; ++var0) { - __kc_m[var0] = (char)(var0 + 97 - 26); + for (var0 = 26; var0 < 52; ++var0) { + field1151[var0] = (char)(var0 + 97 - 26); } - for(var0 = 52; var0 < 62; ++var0) { - __kc_m[var0] = (char)(var0 + 48 - 52); + for (var0 = 52; var0 < 62; ++var0) { + field1151[var0] = (char)(var0 + 48 - 52); } - __kc_m[62] = '+'; - __kc_m[63] = '/'; - __kc_f = new char[64]; + field1151[62] = '+'; + field1151[63] = '/'; + field1152 = new char[64]; - for(var0 = 0; var0 < 26; ++var0) { - __kc_f[var0] = (char)(var0 + 65); + for (var0 = 0; var0 < 26; ++var0) { + field1152[var0] = (char)(var0 + 65); } - for(var0 = 26; var0 < 52; ++var0) { - __kc_f[var0] = (char)(var0 + 97 - 26); + for (var0 = 26; var0 < 52; ++var0) { + field1152[var0] = (char)(var0 + 97 - 26); } - for(var0 = 52; var0 < 62; ++var0) { - __kc_f[var0] = (char)(var0 + 48 - 52); + for (var0 = 52; var0 < 62; ++var0) { + field1152[var0] = (char)(var0 + 48 - 52); } - __kc_f[62] = '*'; - __kc_f[63] = '-'; - __kc_q = new char[64]; + field1152[62] = '*'; + field1152[63] = '-'; + field1153 = new char[64]; - for(var0 = 0; var0 < 26; ++var0) { - __kc_q[var0] = (char)(var0 + 65); + for (var0 = 0; var0 < 26; ++var0) { + field1153[var0] = (char)(var0 + 65); } - for(var0 = 26; var0 < 52; ++var0) { - __kc_q[var0] = (char)(var0 + 97 - 26); + for (var0 = 26; var0 < 52; ++var0) { + field1153[var0] = (char)(var0 + 97 - 26); } - for(var0 = 52; var0 < 62; ++var0) { - __kc_q[var0] = (char)(var0 + 48 - 52); + for (var0 = 52; var0 < 62; ++var0) { + field1153[var0] = (char)(var0 + 48 - 52); } - __kc_q[62] = '-'; - __kc_q[63] = '_'; - __kc_w = new int[128]; + field1153[62] = '-'; + field1153[63] = '_'; + field1154 = new int[128]; - for(var0 = 0; var0 < __kc_w.length; ++var0) { - __kc_w[var0] = -1; + for (var0 = 0; var0 < field1154.length; ++var0) { + field1154[var0] = -1; } - for(var0 = 65; var0 <= 90; ++var0) { - __kc_w[var0] = var0 - 65; + for (var0 = 65; var0 <= 90; ++var0) { + field1154[var0] = var0 - 65; } - for(var0 = 97; var0 <= 122; ++var0) { - __kc_w[var0] = var0 - 97 + 26; + for (var0 = 97; var0 <= 122; ++var0) { + field1154[var0] = var0 - 97 + 26; } - for(var0 = 48; var0 <= 57; ++var0) { - __kc_w[var0] = var0 - 48 + 52; + for (var0 = 48; var0 <= 57; ++var0) { + field1154[var0] = var0 - 48 + 52; } - int[] var2 = __kc_w; - __kc_w[43] = 62; - var2[42] = 62; - int[] var1 = __kc_w; - __kc_w[47] = 63; - var1[45] = 63; + int[] var1 = field1154; + field1154[43] = 62; + var1[42] = 62; + int[] var2 = field1154; + field1154[47] = 63; + var2[45] = 63; } } diff --git a/runescape-client/src/main/java/class31.java b/runescape-client/src/main/java/class31.java index ac2e2a8f2f..e985580e29 100644 --- a/runescape-client/src/main/java/class31.java +++ b/runescape-client/src/main/java/class31.java @@ -21,11 +21,6 @@ public class class31 { ) final int field255; - static { - field259 = new class31(0); - field254 = new class31(1); - } - class31(int var1) { this.field255 = var1; } @@ -37,10 +32,10 @@ public class class31 { ) @Export("changeWorld") static void changeWorld(World var0) { - if(var0.isMembersOnly() != Client.isMembersWorld) { + if (var0.isMembersOnly() != Client.isMembersWorld) { Client.isMembersWorld = var0.isMembersOnly(); boolean var1 = var0.isMembersOnly(); - if(var1 != class30.inMembersWorld) { + if (var1 != class30.inMembersWorld) { LoginScreenAnimation.method1780(); class30.inMembersWorld = var1; } @@ -49,8 +44,8 @@ public class class31 { class50.worldHost = var0.host; Client.worldId = var0.id; Client.worldProperties = var0.properties; - class2.port1 = Client.gameBuild == 0?43594:var0.id + 40000; - WorldMapArea.port2 = Client.gameBuild == 0?443:var0.id + 50000; + class2.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000; + WorldMapArea.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000; class203.port3 = class2.port1; } @@ -60,14 +55,14 @@ public class class31 { garbageValue = "130306081" ) static int method573(int var0, Script var1, boolean var2) { - if(var0 == 6500) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ClientParameter.loadWorlds()?1:0; + if (var0 == 6500) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ClientParameter.loadWorlds() ? 1 : 0; return 1; } else { World var3; - if(var0 == 6501) { + if (var0 == 6501) { var3 = class190.method3672(); - if(var3 != null) { + if (var3 != null) { 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; @@ -84,9 +79,9 @@ public class class31 { } return 1; - } else if(var0 == 6502) { + } else if (var0 == 6502) { var3 = Fonts.method5647(); - if(var3 != null) { + if (var3 != null) { 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; @@ -106,19 +101,19 @@ public class class31 { } else { World var4; int var5; - int var7; - if(var0 == 6506) { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + int var6; + if (var0 == 6506) { + var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4 = null; - for(var5 = 0; var5 < World.worldsCount; ++var5) { - if(var7 == ItemContainer.worlds[var5].id) { + for (var5 = 0; var5 < World.worldsCount; ++var5) { + if (var6 == ItemContainer.worlds[var5].id) { var4 = ItemContainer.worlds[var5]; break; } } - if(var4 != null) { + if (var4 != null) { 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; @@ -135,94 +130,94 @@ public class class31 { } return 1; - } else if(var0 == 6507) { + } else if (var0 == 6507) { RouteStrategy.Interpreter_intStackSize -= 4; - var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; - boolean var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1; + var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + boolean var9 = 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); + boolean var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3] == 1; + WorldMapSectionType.method248(var6, var9, var5, var10); return 1; - } else if(var0 != 6511) { - if(var0 == 6512) { + } else if (var0 != 6511) { + if (var0 == 6512) { Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else { - int var8; - ParamKeyDefinition var9; - if(var0 == 6513) { + int var7; + ParamKeyDefinition var8; + if (var0 == 6513) { 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); + var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + var8 = class229.getParamKeyDefinition(var7); + if (var8.isString()) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ObjectDefinition.getNpcDefinition(var6).getStringParam(var7, var8.keyString); } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ObjectDefinition.getNpcDefinition(var7).getIntParam(var8, var9.keyInt); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ObjectDefinition.getNpcDefinition(var6).getIntParam(var7, var8.keyInt); } return 1; - } else if(var0 == 6514) { + } else if (var0 == 6514) { 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); + var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + var8 = class229.getParamKeyDefinition(var7); + if (var8.isString()) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class50.getObjectDefinition(var6).getStringParam(var7, var8.keyString); } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class50.getObjectDefinition(var7).getIntParam(var8, var9.keyInt); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class50.getObjectDefinition(var6).getIntParam(var7, var8.keyInt); } return 1; - } else if(var0 == 6515) { + } else if (var0 == 6515) { 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); + var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + var8 = class229.getParamKeyDefinition(var7); + if (var8.isString()) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Skills.getItemDefinition(var6).getStringParam(var7, var8.keyString); } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var7).getIntParam(var8, var9.keyInt); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var6).getIntParam(var7, var8.keyInt); } return 1; - } else if(var0 == 6516) { + } else if (var0 == 6516) { 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); + var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + var8 = class229.getParamKeyDefinition(var7); + if (var8.isString()) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = GzipDecompressor.method3702(var6).getStringParam(var7, var8.keyString); } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GzipDecompressor.method3702(var7).getIntParam(var8, var9.keyInt); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GzipDecompressor.method3702(var6).getIntParam(var7, var8.keyInt); } return 1; - } else if(var0 == 6518) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.__client_bl?1:0; + } else if (var0 == 6518) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.field162 ? 1 : 0; return 1; - } else if(var0 == 6519) { + } else if (var0 == 6519) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.clientType & 3; return 1; - } else if(var0 == 6520) { + } else if (var0 == 6520) { return 1; - } else if(var0 == 6521) { + } else if (var0 == 6521) { return 1; - } else if(var0 == 6522) { + } else if (var0 == 6522) { --Interpreter.Interpreter_stringStackSize; --RouteStrategy.Interpreter_intStackSize; return 1; - } else if(var0 == 6523) { + } else if (var0 == 6523) { --Interpreter.Interpreter_stringStackSize; --RouteStrategy.Interpreter_intStackSize; return 1; - } else if(var0 == 6524) { + } else if (var0 == 6524) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; return 1; - } else if(var0 == 6525) { + } else if (var0 == 6525) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; return 1; - } else if(var0 == 6526) { + } else if (var0 == 6526) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; return 1; } else { @@ -230,9 +225,9 @@ public class class31 { } } } else { - var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - if(var7 >= 0 && var7 < World.worldsCount) { - var4 = ItemContainer.worlds[var7]; + var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + if (var6 >= 0 && var6 < World.worldsCount) { + var4 = ItemContainer.worlds[var6]; 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; @@ -260,11 +255,17 @@ public class class31 { garbageValue = "-110" ) static final void method574(String var0) { - if(!var0.equals("")) { - PacketBufferNode var1 = Interpreter.method1915(ClientPacket.__gs_cr, Client.packetWriter.isaacCipher); + if (!var0.equals("")) { + PacketBufferNode var1 = Interpreter.method1915(ClientPacket.field300, Client.packetWriter.isaacCipher); var1.packetBuffer.writeByte(WorldMapRegion.method550(var0)); var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.__q_167(var1); + Client.packetWriter.method241(var1); } + + } + + static { + field259 = new class31(0); + field254 = new class31(1); } } diff --git a/runescape-client/src/main/java/class310.java b/runescape-client/src/main/java/class310.java index 49b9df7811..d853fd44c9 100644 --- a/runescape-client/src/main/java/class310.java +++ b/runescape-client/src/main/java/class310.java @@ -25,13 +25,13 @@ public class class310 { ) public final int field3804; + class310(int var1) { + this.field3804 = var1; + } + static { field3806 = new class310(0); field3805 = new class310(1); field3807 = new class310(2); } - - class310(int var1) { - this.field3804 = var1; - } } diff --git a/runescape-client/src/main/java/class311.java b/runescape-client/src/main/java/class311.java index e5f27d2836..df7d2a1fa4 100644 --- a/runescape-client/src/main/java/class311.java +++ b/runescape-client/src/main/java/class311.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -14,17 +13,13 @@ public class class311 { @ObfuscatedGetter( intValue = -2077113503 ) - static int __ka_e; + static int field1156; @ObfuscatedName("f") @ObfuscatedGetter( intValue = -800980069 ) final int field3809; - static { - field3810 = new class311(3); - } - class311(int var1) { this.field3809 = var1; } @@ -35,6 +30,10 @@ public class class311 { garbageValue = "-2017595575" ) public static RectangleMode[] method5822() { - return new RectangleMode[]{RectangleMode.__lj_f, RectangleMode.__lj_m, RectangleMode.__lj_q}; + return new RectangleMode[]{RectangleMode.field758, RectangleMode.field757, RectangleMode.field759}; + } + + static { + field3810 = new class311(3); } } diff --git a/runescape-client/src/main/java/class313.java b/runescape-client/src/main/java/class313.java index 1b7fea7a37..9e6b6af821 100644 --- a/runescape-client/src/main/java/class313.java +++ b/runescape-client/src/main/java/class313.java @@ -62,7 +62,7 @@ public enum class313 implements Enumerated { ) final int field3827; - class313(int var3, int var4) { + private class313(int var3, int var4) { this.field3833 = var3; this.field3827 = var4; } diff --git a/runescape-client/src/main/java/class32.java b/runescape-client/src/main/java/class32.java index 95bd7cf314..d77052c7ea 100644 --- a/runescape-client/src/main/java/class32.java +++ b/runescape-client/src/main/java/class32.java @@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ay") public class class32 { @ObfuscatedName("u") - static byte[][][] __ay_u; + static byte[][][] field1157; @ObfuscatedName("gj") @ObfuscatedSignature( signature = "[Llq;" @@ -20,20 +20,20 @@ public class class32 { ) static int method576(int var0, Script var1, boolean var2) { Widget var3; - if(var0 >= 2000) { + if (var0 >= 2000) { var0 -= 1000; var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); } else { - var3 = var2?WorldMapIcon1.__t_i:class12.__n_n; + var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; } class22.method295(var3); - if(var0 != 1200 && var0 != 1205 && var0 != 1212) { - if(var0 == 1201) { + if (var0 != 1200 && var0 != 1205 && var0 != 1212) { + if (var0 == 1201) { var3.modelType = 2; var3.modelId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; return 1; - } else if(var0 == 1202) { + } else if (var0 == 1202) { var3.modelType = 3; var3.modelId = Canvas.localPlayer.appearance.getChatHeadId(); return 1; @@ -53,17 +53,17 @@ public class class32 { var3.modelOffsetX = var6.offsetX2d; var3.modelOffsetY = var6.offsetY2d; var3.modelZoom = var6.zoom2d; - if(var0 == 1205) { + if (var0 == 1205) { var3.itemQuantityMode = 0; - } else if(var0 == 1212 | 1 == var6.isStackable) { + } else if (var0 == 1212 | 1 == var6.isStackable) { var3.itemQuantityMode = 1; } else { var3.itemQuantityMode = 2; } - if(var3.__bf > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.__bf; - } else if(var3.rawWidth > 0) { + if (var3.field962 > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.field962; + } else if (var3.rawWidth > 0) { var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; } @@ -78,7 +78,7 @@ public class class32 { ) static void method578(int var0) { Login.loginIndex = 12; - Login.__cu_aj = var0; + Login.field466 = var0; } @ObfuscatedName("gu") @@ -90,9 +90,9 @@ public class class32 { static final int getTileHeight(int var0, int var1, int var2) { int var3 = var0 >> 7; int var4 = var1 >> 7; - if(var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { + if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { int var5 = var2; - if(var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { + if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { var5 = var2 + 1; } diff --git a/runescape-client/src/main/java/class322.java b/runescape-client/src/main/java/class322.java index b73ed654bb..cd12bd2e00 100644 --- a/runescape-client/src/main/java/class322.java +++ b/runescape-client/src/main/java/class322.java @@ -11,10 +11,6 @@ public class class322 { @Export("reflectionChecks") public static IterableNodeDeque reflectionChecks; - static { - reflectionChecks = new IterableNodeDeque(); - } - @ObfuscatedName("m") @ObfuscatedSignature( signature = "(Lir;III)Lln;", @@ -22,6 +18,10 @@ public class class322 { ) @Export("readSprite") public static Sprite readSprite(AbstractIndexCache var0, int var1, int var2) { - return !SpriteMask.loadSprite(var0, var1, var2)?null:class258.method4900(); + return !SpriteMask.loadSprite(var0, var1, var2) ? null : class258.method4900(); + } + + static { + reflectionChecks = new IterableNodeDeque(); } } diff --git a/runescape-client/src/main/java/class39.java b/runescape-client/src/main/java/class39.java index 98926a8e6f..629a66f2d6 100644 --- a/runescape-client/src/main/java/class39.java +++ b/runescape-client/src/main/java/class39.java @@ -39,21 +39,21 @@ public class class39 extends class21 { ) void method714(Buffer var1) { int var2 = var1.readUnsignedByte(); - if(var2 != class31.field254.field255) { + if (var2 != class31.field254.field255) { throw new IllegalStateException(""); } else { super.field148 = var1.readUnsignedByte(); super.field156 = var1.readUnsignedByte(); - super.field149 = var1.__ag_302(); - super.field146 = var1.__ag_302(); + super.field149 = var1.method43(); + super.field146 = var1.method43(); this.field318 = var1.readUnsignedByte(); this.field319 = var1.readUnsignedByte(); - super.field159 = var1.__ag_302(); - super.field147 = var1.__ag_302(); + super.field159 = var1.method43(); + super.field147 = var1.method43(); this.field321 = var1.readUnsignedByte(); this.field323 = var1.readUnsignedByte(); - super.field150 = var1.__ap_310(); - super.field152 = var1.__ap_310(); + super.field150 = var1.method51(); + super.field152 = var1.method51(); } } @@ -70,16 +70,16 @@ public class class39 extends class21 { super.field155 = new byte[super.field156][64][64]; super.field144 = new class25[super.field156][64][64][]; int var2 = var1.readUnsignedByte(); - if(var2 != class30.field247.field248) { + if (var2 != class30.field247.field248) { throw new IllegalStateException(""); } else { int var3 = var1.readUnsignedByte(); int var4 = var1.readUnsignedByte(); int var5 = var1.readUnsignedByte(); int var6 = var1.readUnsignedByte(); - if(var3 == super.field159 && var4 == super.field147 && var5 == this.field321 && var6 == this.field323) { - for(int var7 = 0; var7 < 8; ++var7) { - for(int var8 = 0; var8 < 8; ++var8) { + if (var3 == super.field159 && var4 == super.field147 && var5 == this.field321 && var6 == this.field323) { + for (int var7 = 0; var7 < 8; ++var7) { + for (int var8 = 0; var8 < 8; ++var8) { this.method259(var7 + this.field321 * 8, var8 + this.field323 * 8, var1); } } @@ -131,11 +131,11 @@ public class class39 extends class21 { } public boolean equals(Object var1) { - if(!(var1 instanceof class39)) { + if (!(var1 instanceof class39)) { return false; } else { class39 var2 = (class39)var1; - return var2.field159 == super.field159 && var2.field147 == super.field147?this.field321 == var2.field321 && var2.field323 == this.field323:false; + return var2.field159 == super.field159 && var2.field147 == super.field147 ? this.field321 == var2.field321 && var2.field323 == this.field323 : false; } } @@ -146,205 +146,205 @@ public class class39 extends class21 { ) @Export("drawActor2d") static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { - if(var0 != null && var0.isVisible()) { - if(var0 instanceof Npc) { - NpcDefinition var6 = ((Npc)var0).definition; - if(var6.transforms != null) { + if (var0 != null && var0.isVisible()) { + if (var0 instanceof NPC) { + NPCDefinition var6 = ((NPC)var0).definition; + if (var6.transforms != null) { var6 = var6.transform(); } - if(var6 == null) { + if (var6 == null) { return; } } - int var75 = Players.Players_count; + int var77 = Players.Players_count; int[] var7 = Players.Players_indices; byte var8 = 0; - Player var10; - if(var1 < var75 && var0.playerCycle == Client.cycle) { - var10 = (Player)var0; - boolean var9; - if(Client.__client_ke == 0) { - var9 = false; - } else if(var10 != Canvas.localPlayer) { - boolean var77 = (Client.__client_ke & 4) != 0; - boolean var78 = var77; + Player var9; + if (var1 < var77 && var0.playerCycle == Client.cycle) { + var9 = (Player)var0; + boolean var10; + if (Client.field210 == 0) { + var10 = false; + } else if (var9 != Canvas.localPlayer) { + boolean var11 = (Client.field210 & 4) != 0; + boolean var12 = var11; boolean var13; - if(!var77) { - var13 = (Client.__client_ke & 1) != 0; - var78 = var13 && var10.isFriend(); + if (!var11) { + var13 = (Client.field210 & 1) != 0; + var12 = var13 && var9.isFriend(); } - var13 = var78; - if(!var78) { - boolean var79 = (Client.__client_ke & 2) != 0; - var13 = var79 && var10.isClanMember(); + var13 = var12; + if (!var12) { + boolean var14 = (Client.field210 & 2) != 0; + var13 = var14 && var9.isClanMember(); } - var9 = var13; + var10 = var13; } else { - var9 = class14.method169(); + var10 = class14.method169(); } - if(var9) { - Player var11 = (Player)var0; - if(var1 < var75) { + if (var10) { + Player var79 = (Player)var0; + if (var1 < var77) { DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15); - AbstractFont var12 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); - byte var92 = 9; - var12.drawCentered(var11.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var92, 16777215, 0); + AbstractFont var81 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); + byte var84 = 9; + var81.drawCentered(var79.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var84, 16777215, 0); var8 = 18; } } } - int var87 = -2; - int var15; - int var22; - int var23; - if(!var0.healthBars.isEmpty()) { + int var78 = -2; + int var24; + int var25; + int var80; + int var82; + int var85; + if (!var0.healthBars.isEmpty()) { DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15); - for(HealthBar var88 = (HealthBar)var0.healthBars.last(); var88 != null; var88 = (HealthBar)var0.healthBars.previous()) { - HealthBarUpdate var89 = var88.get(Client.cycle); - if(var89 == null) { - if(var88.isEmpty()) { - var88.remove(); + for (HealthBar var83 = (HealthBar)var0.healthBars.last(); var83 != null; var83 = (HealthBar)var0.healthBars.previous()) { + HealthBarUpdate var15 = var83.get(Client.cycle); + if (var15 == null) { + if (var83.isEmpty()) { + var83.remove(); } } else { - HealthBarDefinition var91 = var88.definition; - Sprite var76 = var91.getSprite2(); - Sprite var14 = var91.getSprite1(); - int var16 = 0; - if(var76 != null && var14 != null) { - if(var91.widthPadding * 2 < var14.subWidth) { - var16 = var91.widthPadding; + HealthBarDefinition var16 = var83.definition; + Sprite var17 = var16.getSprite2(); + Sprite var18 = var16.getSprite1(); + int var19 = 0; + if (var17 != null && var18 != null) { + if (var16.widthPadding * 2 < var18.subWidth) { + var19 = var16.widthPadding; } - var15 = var14.subWidth - var16 * 2; + var80 = var18.subWidth - var19 * 2; } else { - var15 = var91.width; + var80 = var16.width; } - int var17 = 255; - boolean var18 = true; - int var19 = Client.cycle - var89.cycle; - int var20 = var15 * var89.health2 / var91.width; - int var21; - int var93; - if(var89.cycleOffset > var19) { - var21 = var91.int4 == 0?0:var91.int4 * (var19 / var91.int4); - var22 = var15 * var89.health / var91.width; - var93 = var21 * (var20 - var22) / var89.cycleOffset + var22; + int var20 = 255; + boolean var21 = true; + int var22 = Client.cycle - var15.cycle; + int var23 = var80 * var15.health2 / var16.width; + if (var15.cycleOffset > var22) { + var24 = var16.int4 == 0 ? 0 : var16.int4 * (var22 / var16.int4); + var82 = var80 * var15.health / var16.width; + var25 = var24 * (var23 - var82) / var15.cycleOffset + var82; } else { - var93 = var20; - var21 = var89.cycleOffset + var91.int5 - var19; - if(var91.int3 >= 0) { - var17 = (var21 << 8) / (var91.int5 - var91.int3); + var25 = var23; + var24 = var15.cycleOffset + var16.int5 - var22; + if (var16.int3 >= 0) { + var20 = (var24 << 8) / (var16.int5 - var16.int3); } } - if(var89.health2 > 0 && var93 < 1) { - var93 = 1; + if (var15.health2 > 0 && var25 < 1) { + var25 = 1; } - if(var76 != null && var14 != null) { - if(var15 == var93) { - var93 += var16 * 2; + if (var17 != null && var18 != null) { + if (var80 == var25) { + var25 += var19 * 2; } else { - var93 += var16; + var25 += var19; } - var21 = var76.subHeight; - var87 += var21; - var22 = var2 + Client.viewportTempX - (var15 >> 1); - var23 = var3 + Client.viewportTempY - var87; - var22 -= var16; - if(var17 >= 0 && var17 < 255) { - var76.__h_508(var22, var23, var17); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var93, var23 + var21); - var14.__h_508(var22, var23, var17); + var24 = var17.subHeight; + var78 += var24; + var82 = var2 + Client.viewportTempX - (var80 >> 1); + var85 = var3 + Client.viewportTempY - var78; + var82 -= var19; + if (var20 >= 0 && var20 < 255) { + var17.method310(var82, var85, var20); + Rasterizer2D.Rasterizer2D_expandClip(var82, var85, var82 + var25, var85 + var24); + var18.method310(var82, var85, var20); } else { - var76.drawAt2(var22, var23); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var93 + var22, var21 + var23); - var14.drawAt2(var22, var23); + var17.drawAt2(var82, var85); + Rasterizer2D.Rasterizer2D_expandClip(var82, var85, var25 + var82, var24 + var85); + var18.drawAt2(var82, var85); } Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); - var87 += 2; + var78 += 2; } else { - var87 += 5; - if(Client.viewportTempX > -1) { - var21 = var2 + Client.viewportTempX - (var15 >> 1); - var22 = var3 + Client.viewportTempY - var87; - Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var93, 5, 0xff00); - Rasterizer2D.Rasterizer2D_fillRectangle(var21 + var93, var22, var15 - var93, 5, 0xff0000); + var78 += 5; + if (Client.viewportTempX > -1) { + var24 = var2 + Client.viewportTempX - (var80 >> 1); + var82 = var3 + Client.viewportTempY - var78; + Rasterizer2D.Rasterizer2D_fillRectangle(var24, var82, var25, 5, 65280); + Rasterizer2D.Rasterizer2D_fillRectangle(var24 + var25, var82, var80 - var25, 5, 16711680); } - var87 += 2; + var78 += 2; } } } } - if(var87 == -2) { - var87 += 7; + if (var78 == -2) { + var78 += 7; } - var87 += var8; - if(var1 < var75) { - var10 = (Player)var0; - if(var10.isHidden) { + var78 += var8; + if (var1 < var77) { + var9 = (Player)var0; + if (var9.isHidden) { return; } - if(var10.headIconPk != -1 || var10.headIconPrayer != -1) { + if (var9.headIconPk != -1 || var9.headIconPrayer != -1) { DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15); - if(Client.viewportTempX > -1) { - if(var10.headIconPk != -1) { - var87 += 25; - class15.headIconPkSprites[var10.headIconPk].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); + if (Client.viewportTempX > -1) { + if (var9.headIconPk != -1) { + var78 += 25; + class15.headIconPkSprites[var9.headIconPk].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var78); } - if(var10.headIconPrayer != -1) { - var87 += 25; - ClientPreferences.headIconPrayerSprites[var10.headIconPrayer].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); + if (var9.headIconPrayer != -1) { + var78 += 25; + ClientPreferences.headIconPrayerSprites[var9.headIconPrayer].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var78); } } } - if(var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { + if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15); - if(Client.viewportTempX > -1) { - var87 += Player.headIconHintSprites[1].subHeight; - Player.headIconHintSprites[1].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); + if (Client.viewportTempX > -1) { + var78 += Player.headIconHintSprites[1].subHeight; + Player.headIconHintSprites[1].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var78); } } } else { - NpcDefinition var90 = ((Npc)var0).definition; - if(var90.transforms != null) { - var90 = var90.transform(); + NPCDefinition var86 = ((NPC)var0).definition; + if (var86.transforms != null) { + var86 = var86.transform(); } - if(var90.headIconPrayer >= 0 && var90.headIconPrayer < ClientPreferences.headIconPrayerSprites.length) { + if (var86.headIconPrayer >= 0 && var86.headIconPrayer < ClientPreferences.headIconPrayerSprites.length) { DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15); - if(Client.viewportTempX > -1) { - ClientPreferences.headIconPrayerSprites[var90.headIconPrayer].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); + if (Client.viewportTempX > -1) { + ClientPreferences.headIconPrayerSprites[var86.headIconPrayer].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); } } - if(Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { + if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var77] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15); - if(Client.viewportTempX > -1) { + if (Client.viewportTempX > -1) { Player.headIconHintSprites[0].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); } } } - if(var0.overheadText != null && (var1 >= var75 || !var0.__az && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { + if (var0.overheadText != null && (var1 >= var77 || !var0.field11 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { DevicePcmPlayerProvider.method840(var0, var0.defaultHeight); - if(Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { + if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { Client.overheadTextXOffsets[Client.overheadTextCount] = class2.fontBold12.stringWidth(var0.overheadText) / 2; Client.overheadTextAscents[Client.overheadTextCount] = class2.fontBold12.ascent; Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; @@ -357,66 +357,66 @@ public class class39 extends class21 { } } - for(int var80 = 0; var80 < 4; ++var80) { - int var96 = var0.hitSplatCycles[var80]; - int var97 = var0.hitSplatTypes[var80]; - HitSplatDefinition var95 = null; - int var98 = 0; - if(var97 >= 0) { - if(var96 <= Client.cycle) { + for (int var88 = 0; var88 < 4; ++var88) { + int var87 = var0.hitSplatCycles[var88]; + int var89 = var0.hitSplatTypes[var88]; + HitSplatDefinition var90 = null; + int var91 = 0; + if (var89 >= 0) { + if (var87 <= Client.cycle) { continue; } - var95 = LoginScreenAnimation.getHitSplatDefinition(var0.hitSplatTypes[var80]); - var98 = var95.__i; - if(var95 != null && var95.transforms != null) { - var95 = var95.transform(); - if(var95 == null) { - var0.hitSplatCycles[var80] = -1; + var90 = LoginScreenAnimation.getHitSplatDefinition(var0.hitSplatTypes[var88]); + var91 = var90.field387; + if (var90 != null && var90.transforms != null) { + var90 = var90.transform(); + if (var90 == null) { + var0.hitSplatCycles[var88] = -1; continue; } } - } else if(var96 < 0) { + } else if (var87 < 0) { continue; } - var15 = var0.hitSplatTypes2[var80]; - HitSplatDefinition var81 = null; - if(var15 >= 0) { - var81 = LoginScreenAnimation.getHitSplatDefinition(var15); - if(var81 != null && var81.transforms != null) { - var81 = var81.transform(); + var80 = var0.hitSplatTypes2[var88]; + HitSplatDefinition var92 = null; + if (var80 >= 0) { + var92 = LoginScreenAnimation.getHitSplatDefinition(var80); + if (var92 != null && var92.transforms != null) { + var92 = var92.transform(); } } - if(var96 - var98 <= Client.cycle) { - if(var95 == null) { - var0.hitSplatCycles[var80] = -1; + if (var87 - var91 <= Client.cycle) { + if (var90 == null) { + var0.hitSplatCycles[var88] = -1; } else { DevicePcmPlayerProvider.method840(var0, var0.defaultHeight / 2); - if(Client.viewportTempX > -1) { - if(var80 == 1) { + if (Client.viewportTempX > -1) { + if (var88 == 1) { Client.viewportTempY -= 20; } - if(var80 == 2) { + if (var88 == 2) { Client.viewportTempX -= 15; Client.viewportTempY -= 10; } - if(var80 == 3) { + if (var88 == 3) { Client.viewportTempX += 15; Client.viewportTempY -= 10; } - Sprite var82 = null; - Sprite var83 = null; - Sprite var84 = null; - Sprite var85 = null; - var22 = 0; - var23 = 0; - int var24 = 0; - int var25 = 0; + Sprite var93 = null; + Sprite var94 = null; + Sprite var95 = null; + Sprite var96 = null; + var82 = 0; + var85 = 0; + var24 = 0; + var25 = 0; int var26 = 0; int var27 = 0; int var28 = 0; @@ -434,90 +434,90 @@ public class class39 extends class21 { int var40 = 0; int var41 = 0; int var42 = 0; - var82 = var95.__g_417(); + var93 = var90.method123(); int var43; - if(var82 != null) { - var22 = var82.subWidth; - var43 = var82.subHeight; - if(var43 > var42) { + if (var93 != null) { + var82 = var93.subWidth; + var43 = var93.subHeight; + if (var43 > var42) { var42 = var43; } - var26 = var82.yOffset; + var26 = var93.yOffset; } - var83 = var95.__l_418(); - if(var83 != null) { - var23 = var83.subWidth; - var43 = var83.subHeight; - if(var43 > var42) { + var94 = var90.method124(); + if (var94 != null) { + var85 = var94.subWidth; + var43 = var94.subHeight; + if (var43 > var42) { var42 = var43; } - var27 = var83.yOffset; + var27 = var94.yOffset; } - var84 = var95.__e_419(); - if(var84 != null) { - var24 = var84.subWidth; - var43 = var84.subHeight; - if(var43 > var42) { + var95 = var90.method125(); + if (var95 != null) { + var24 = var95.subWidth; + var43 = var95.subHeight; + if (var43 > var42) { var42 = var43; } - var28 = var84.yOffset; + var28 = var95.yOffset; } - var85 = var95.__x_420(); - if(var85 != null) { - var25 = var85.subWidth; - var43 = var85.subHeight; - if(var43 > var42) { + var96 = var90.method126(); + if (var96 != null) { + var25 = var96.subWidth; + var43 = var96.subHeight; + if (var43 > var42) { var42 = var43; } - var29 = var85.yOffset; + var29 = var96.yOffset; } - if(var81 != null) { - var30 = var81.__g_417(); - if(var30 != null) { + if (var92 != null) { + var30 = var92.method123(); + if (var30 != null) { var34 = var30.subWidth; var43 = var30.subHeight; - if(var43 > var42) { + if (var43 > var42) { var42 = var43; } var38 = var30.yOffset; } - var31 = var81.__l_418(); - if(var31 != null) { + var31 = var92.method124(); + if (var31 != null) { var35 = var31.subWidth; var43 = var31.subHeight; - if(var43 > var42) { + if (var43 > var42) { var42 = var43; } var39 = var31.yOffset; } - var32 = var81.__e_419(); - if(var32 != null) { + var32 = var92.method125(); + if (var32 != null) { var36 = var32.subWidth; var43 = var32.subHeight; - if(var43 > var42) { + if (var43 > var42) { var42 = var43; } var40 = var32.yOffset; } - var33 = var81.__x_420(); - if(var33 != null) { + var33 = var92.method126(); + if (var33 != null) { var37 = var33.subWidth; var43 = var33.subHeight; - if(var43 > var42) { + if (var43 > var42) { var42 = var43; } @@ -525,241 +525,239 @@ public class class39 extends class21 { } } - Font var86 = var95.getFont(); - if(var86 == null) { - var86 = ScriptEvent.fontPlain11; - } - - Font var44; - if(var81 != null) { - var44 = var81.getFont(); - if(var44 == null) { - var44 = ScriptEvent.fontPlain11; - } - } else { + Font var44 = var90.getFont(); + if (var44 == null) { var44 = ScriptEvent.fontPlain11; } - String var45 = null; + Font var45; + if (var92 != null) { + var45 = var92.getFont(); + if (var45 == null) { + var45 = ScriptEvent.fontPlain11; + } + } else { + var45 = ScriptEvent.fontPlain11; + } + String var46 = null; - boolean var47 = false; - int var48 = 0; - var45 = var95.getString(var0.hitSplatValues[var80]); - int var94 = var86.stringWidth(var45); - if(var81 != null) { - var46 = var81.getString(var0.hitSplatValues2[var80]); - var48 = var44.stringWidth(var46); - } - + String var47 = null; + boolean var48 = false; int var49 = 0; - int var50 = 0; - if(var23 > 0) { - if(var84 == null && var85 == null) { - var49 = 1; - } else { - var49 = var94 / var23 + 1; - } - } - - if(var81 != null && var35 > 0) { - if(var32 == null && var33 == null) { - var50 = 1; - } else { - var50 = var48 / var35 + 1; - } + var46 = var90.getString(var0.hitSplatValues[var88]); + int var50 = var44.stringWidth(var46); + if (var92 != null) { + var47 = var92.getString(var0.hitSplatValues2[var88]); + var49 = var45.stringWidth(var47); } int var51 = 0; - int var52 = var51; - if(var22 > 0) { - var51 += var22; + int var52 = 0; + if (var85 > 0) { + if (var95 == null && var96 == null) { + var51 = 1; + } else { + var51 = var50 / var85 + 1; + } } - var51 += 2; - int var53 = var51; - if(var24 > 0) { - var51 += var24; + if (var92 != null && var35 > 0) { + if (var32 == null && var33 == null) { + var52 = 1; + } else { + var52 = var49 / var35 + 1; + } } - int var54 = var51; - int var55 = var51; - int var56; - if(var23 > 0) { - var56 = var23 * var49; - var51 += var56; - var55 += (var56 - var94) / 2; + int var53 = 0; + int var54 = var53; + if (var82 > 0) { + var53 += var82; + } + + var53 += 2; + int var55 = var53; + if (var24 > 0) { + var53 += var24; + } + + int var56 = var53; + int var57 = var53; + int var58; + if (var85 > 0) { + var58 = var85 * var51; + var53 += var58; + var57 += (var58 - var50) / 2; } else { - var51 += var94; + var53 += var50; } - var56 = var51; - if(var25 > 0) { - var51 += var25; + var58 = var53; + if (var25 > 0) { + var53 += var25; } - int var57 = 0; - int var58 = 0; int var59 = 0; int var60 = 0; int var61 = 0; - int var62; - if(var81 != null) { - var51 += 2; - var57 = var51; - if(var34 > 0) { - var51 += var34; + int var62 = 0; + int var63 = 0; + int var64; + if (var92 != null) { + var53 += 2; + var59 = var53; + if (var34 > 0) { + var53 += var34; } - var51 += 2; - var58 = var51; - if(var36 > 0) { - var51 += var36; + var53 += 2; + var60 = var53; + if (var36 > 0) { + var53 += var36; } - var59 = var51; - var61 = var51; - if(var35 > 0) { - var62 = var35 * var50; - var51 += var62; - var61 += (var62 - var48) / 2; + var61 = var53; + var63 = var53; + if (var35 > 0) { + var64 = var35 * var52; + var53 += var64; + var63 += (var64 - var49) / 2; } else { - var51 += var48; + var53 += var49; } - var60 = var51; - if(var37 > 0) { - var51 += var37; + var62 = var53; + if (var37 > 0) { + var53 += var37; } } - var62 = var0.hitSplatCycles[var80] - Client.cycle; - int var63 = var95.__t - var62 * var95.__t / var95.__i; - int var64 = var62 * var95.__y / var95.__i + -var95.__y; - int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); - int var66 = var64 + (var3 + Client.viewportTempY - 12); - int var67 = var66; - int var68 = var42 + var66; - int var69 = var66 + var95.__r + 15; - int var70 = var69 - var86.maxAscent; - int var71 = var69 + var86.maxDescent; - if(var70 < var66) { - var67 = var70; + var64 = var0.hitSplatCycles[var88] - Client.cycle; + int var65 = var90.field392 - var64 * var90.field392 / var90.field387; + int var66 = var64 * var90.field393 / var90.field387 + -var90.field393; + int var67 = var65 + (var2 + Client.viewportTempX - (var53 >> 1)); + int var68 = var66 + (var3 + Client.viewportTempY - 12); + int var69 = var68; + int var70 = var42 + var68; + int var71 = var68 + var90.field397 + 15; + int var72 = var71 - var44.maxAscent; + int var73 = var71 + var44.maxDescent; + if (var72 < var68) { + var69 = var72; } - if(var71 > var68) { - var68 = var71; + if (var73 > var70) { + var70 = var73; } - int var72 = 0; - int var73; - int var74; - if(var81 != null) { - var72 = var66 + var81.__r + 15; - var73 = var72 - var44.maxAscent; - var74 = var72 + var44.maxDescent; - if(var73 < var67) { - ; + int var74 = 0; + int var75; + int var76; + if (var92 != null) { + var74 = var68 + var92.field397 + 15; + var75 = var74 - var45.maxAscent; + var76 = var74 + var45.maxDescent; + if (var75 < var69) { } - if(var74 > var68) { - ; + if (var76 > var70) { } } - var73 = 255; - if(var95.__h >= 0) { - var73 = (var62 << 8) / (var95.__i - var95.__h); + var75 = 255; + if (var90.field394 >= 0) { + var75 = (var64 << 8) / (var90.field387 - var90.field394); } - if(var73 >= 0 && var73 < 255) { - if(var82 != null) { - var82.__h_508(var52 + var65 - var26, var66, var73); + if (var75 >= 0 && var75 < 255) { + if (var93 != null) { + var93.method310(var54 + var67 - var26, var68, var75); } - if(var84 != null) { - var84.__h_508(var65 + var53 - var28, var66, var73); + if (var95 != null) { + var95.method310(var67 + var55 - var28, var68, var75); } - if(var83 != null) { - for(var74 = 0; var74 < var49; ++var74) { - var83.__h_508(var23 * var74 + (var65 + var54 - var27), var66, var73); + if (var94 != null) { + for (var76 = 0; var76 < var51; ++var76) { + var94.method310(var85 * var76 + (var67 + var56 - var27), var68, var75); } } - if(var85 != null) { - var85.__h_508(var56 + var65 - var29, var66, var73); + if (var96 != null) { + var96.method310(var58 + var67 - var29, var68, var75); } - var86.drawAlpha(var45, var55 + var65, var69, var95.__n, 0, var73); - if(var81 != null) { - if(var30 != null) { - var30.__h_508(var65 + var57 - var38, var66, var73); + var44.drawAlpha(var46, var57 + var67, var71, var90.field386, 0, var75); + if (var92 != null) { + if (var30 != null) { + var30.method310(var67 + var59 - var38, var68, var75); } - if(var32 != null) { - var32.__h_508(var65 + var58 - var40, var66, var73); + if (var32 != null) { + var32.method310(var67 + var60 - var40, var68, var75); } - if(var31 != null) { - for(var74 = 0; var74 < var50; ++var74) { - var31.__h_508(var74 * var35 + (var59 + var65 - var39), var66, var73); + if (var31 != null) { + for (var76 = 0; var76 < var52; ++var76) { + var31.method310(var76 * var35 + (var61 + var67 - var39), var68, var75); } } - if(var33 != null) { - var33.__h_508(var60 + var65 - var41, var66, var73); + if (var33 != null) { + var33.method310(var62 + var67 - var41, var68, var75); } - var44.drawAlpha(var46, var61 + var65, var72, var81.__n, 0, var73); + var45.drawAlpha(var47, var63 + var67, var74, var92.field386, 0, var75); } } else { - if(var82 != null) { - var82.drawAt2(var52 + var65 - var26, var66); + if (var93 != null) { + var93.drawAt2(var54 + var67 - var26, var68); } - if(var84 != null) { - var84.drawAt2(var65 + var53 - var28, var66); + if (var95 != null) { + var95.drawAt2(var67 + var55 - var28, var68); } - if(var83 != null) { - for(var74 = 0; var74 < var49; ++var74) { - var83.drawAt2(var23 * var74 + (var54 + var65 - var27), var66); + if (var94 != null) { + for (var76 = 0; var76 < var51; ++var76) { + var94.drawAt2(var85 * var76 + (var56 + var67 - var27), var68); } } - if(var85 != null) { - var85.drawAt2(var56 + var65 - var29, var66); + if (var96 != null) { + var96.drawAt2(var58 + var67 - var29, var68); } - var86.draw(var45, var55 + var65, var69, var95.__n | -16777216, 0); - if(var81 != null) { - if(var30 != null) { - var30.drawAt2(var65 + var57 - var38, var66); + var44.draw(var46, var57 + var67, var71, var90.field386 | -16777216, 0); + if (var92 != null) { + if (var30 != null) { + var30.drawAt2(var67 + var59 - var38, var68); } - if(var32 != null) { - var32.drawAt2(var58 + var65 - var40, var66); + if (var32 != null) { + var32.drawAt2(var60 + var67 - var40, var68); } - if(var31 != null) { - for(var74 = 0; var74 < var50; ++var74) { - var31.drawAt2(var74 * var35 + (var65 + var59 - var39), var66); + if (var31 != null) { + for (var76 = 0; var76 < var52; ++var76) { + var31.drawAt2(var76 * var35 + (var67 + var61 - var39), var68); } } - if(var33 != null) { - var33.drawAt2(var60 + var65 - var41, var66); + if (var33 != null) { + var33.drawAt2(var62 + var67 - var41, var68); } - var44.draw(var46, var61 + var65, var72, var81.__n | -16777216, 0); + var45.draw(var47, var63 + var67, var74, var92.field386 | -16777216, 0); } } } } } } - } + } @ObfuscatedName("hv") @@ -769,34 +767,33 @@ public class class39 extends class21 { ) @Export("drawMenuActionTextAt") static final void drawMenuActionTextAt(int var0, int var1) { - if(Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { - if(Client.showMouseOverText) { - int var2 = Client.menuOptionsCount - 1; + if ((Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) && Client.showMouseOverText) { + int var2 = Client.menuOptionsCount - 1; + String var3; + if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { + var3 = "Use " + Client.selectedItemName + " ->"; + } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { + var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " ->"; + } else { String var4; - if(Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { - var4 = "Use" + " " + Client.selectedItemName + " " + "->"; - } else if(Client.isSpellSelected && Client.menuOptionsCount < 2) { - var4 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->"; + if (var2 < 0) { + var4 = ""; + } else if (Client.menuTargetNames[var2].length() > 0) { + var4 = Client.menuActions[var2] + " " + Client.menuTargetNames[var2]; } else { - String var5; - if(var2 < 0) { - var5 = ""; - } else if(Client.menuTargetNames[var2].length() > 0) { - var5 = Client.menuActions[var2] + " " + Client.menuTargetNames[var2]; - } else { - var5 = Client.menuActions[var2]; - } - - var4 = var5; + var4 = Client.menuActions[var2]; } - if(Client.menuOptionsCount > 2) { - var4 = var4 + BufferedFile.colorStartTag(0xffffff) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options"; - } - - class2.fontBold12.drawRandomAlphaAndSpacing(var4, var0 + 4, var1 + 15, 0xffffff, 0, Client.cycle / 1000); + var3 = var4; } + + if (Client.menuOptionsCount > 2) { + var3 = var3 + BufferedFile.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options"; + } + + class2.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); } + } @ObfuscatedName("ib") @@ -806,23 +803,22 @@ public class class39 extends class21 { ) @Export("revalidateWidgetScroll") static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { - int var3 = var1.scrollWidth != 0?var1.scrollWidth:var1.width; - int var4 = var1.scrollHeight != 0?var1.scrollHeight:var1.height; + int var3 = var1.scrollWidth != 0 ? var1.scrollWidth : var1.width; + int var4 = var1.scrollHeight != 0 ? var1.scrollHeight : var1.height; WorldMapRegion.notRevalidateWidgetScroll(var0, var1.id, var3, var4, var2); - if(var1.children != null) { + if (var1.children != null) { WorldMapRegion.notRevalidateWidgetScroll(var1.children, var1.id, var3, var4, var2); } WidgetGroupParent var5 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var1.id); - if(var5 != null) { + if (var5 != null) { int var6 = var5.group; - if(GroundItemPile.loadWidgetGroup(var6)) { + if (GroundItemPile.loadWidgetGroup(var6)) { WorldMapRegion.notRevalidateWidgetScroll(Widget.widgets[var6], -1, var3, var4, var2); } } - if(var1.contentType == 1337) { - ; + if (var1.contentType == 1337) { } } diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index bdc7d67388..5aae33d902 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,7 +7,7 @@ final class class4 implements class0 { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache __o_m; + public static AbstractIndexCache field1158; @ObfuscatedName("m") @ObfuscatedSignature( @@ -43,7 +42,7 @@ final class class4 implements class0 { garbageValue = "253581236" ) public static ClientParameter[] method47() { - return new ClientParameter[]{ClientParameter.__ji_e, ClientParameter.__ji_m, ClientParameter.__ji_g, ClientParameter.__ji_d, ClientParameter.__ji_u, ClientParameter.__ji_o, ClientParameter.__ji_k, ClientParameter.__ji_j, ClientParameter.__ji_q, ClientParameter.__ji_z, ClientParameter.__ji_n, ClientParameter.__ji_a, ClientParameter.__ji_t, ClientParameter.__ji_w, ClientParameter.__ji_i, ClientParameter.__ji_s, ClientParameter.__ji_x, ClientParameter.__ji_f, ClientParameter.__ji_l}; + return new ClientParameter[]{ClientParameter.field330, ClientParameter.field322, ClientParameter.field328, ClientParameter.field332, ClientParameter.field327, ClientParameter.field326, ClientParameter.field333, ClientParameter.field338, ClientParameter.field324, ClientParameter.field337, ClientParameter.field334, ClientParameter.field336, ClientParameter.field340, ClientParameter.field325, ClientParameter.field335, ClientParameter.field339, ClientParameter.field331, ClientParameter.field323, ClientParameter.field329}; } @ObfuscatedName("u") @@ -52,7 +51,7 @@ final class class4 implements class0 { garbageValue = "-843046456" ) public static void method55() { - OverlayDefinition.__jf_f.clear(); + OverlayDefinition.field664.clear(); } @ObfuscatedName("v") @@ -62,266 +61,264 @@ final class class4 implements class0 { ) static int method54(int var0, Script var1, boolean var2) { String var3; - if(var0 == 3100) { + if (var0 == 3100) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; WorldMapIcon1.method219(0, "", var3); return 1; - } else if(var0 == 3101) { + } else if (var0 == 3101) { 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) { - Interpreter.__bv_s = true; + } else if (var0 == 3103) { + if (!Interpreter.field424) { + Interpreter.field423 = true; } return 1; } else { - int var10; - if(var0 == 3104) { + int var4; + PacketBufferNode var5; + if (var0 == 3104) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var10 = 0; - if(UserComparator4.method3336(var3)) { - var10 = MouseHandler.method1085(var3); + var4 = 0; + if (UserComparator4.method3336(var3)) { + var4 = MouseHandler.method1085(var3); } - PacketBufferNode var12 = Interpreter.method1915(ClientPacket.__gs_s, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeInt(var10); - Client.packetWriter.__q_167(var12); + var5 = Interpreter.method1915(ClientPacket.field239, Client.packetWriter.isaacCipher); + var5.packetBuffer.writeInt(var4); + Client.packetWriter.method241(var5); + return 1; + } else if (var0 == 3105) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var5 = Interpreter.method1915(ClientPacket.field317, Client.packetWriter.isaacCipher); + var5.packetBuffer.writeByte(var3.length() + 1); + var5.packetBuffer.writeStringCp1252NullTerminated(var3); + Client.packetWriter.method241(var5); + return 1; + } else if (var0 == 3106) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var5 = Interpreter.method1915(ClientPacket.field230, Client.packetWriter.isaacCipher); + var5.packetBuffer.writeByte(var3.length() + 1); + var5.packetBuffer.writeStringCp1252NullTerminated(var3); + Client.packetWriter.method241(var5); return 1; } else { - PacketBufferNode var14; - if(var0 == 3105) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var14 = Interpreter.method1915(ClientPacket.__gs_cl, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByte(var3.length() + 1); - var14.packetBuffer.writeStringCp1252NullTerminated(var3); - Client.packetWriter.__q_167(var14); + String var6; + int var7; + if (var0 == 3107) { + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + WorldMapSection2.method583(var7, var6); return 1; - } else if(var0 == 3106) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var14 = Interpreter.method1915(ClientPacket.__gs_e, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByte(var3.length() + 1); - var14.packetBuffer.writeStringCp1252NullTerminated(var3); - Client.packetWriter.__q_167(var14); + } else if (var0 == 3108) { + RouteStrategy.Interpreter_intStackSize -= 3; + var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + int var13 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; + Widget var11 = Huffman.getWidget(var13); + Players.clickWidget(var11, var7, var4); + return 1; + } else if (var0 == 3109) { + RouteStrategy.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + Widget var12 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + Players.clickWidget(var12, var7, var4); + return 1; + } else if (var0 == 3110) { + AbstractRasterProvider.mouseCam = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3111) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.roofsHidden ? 1 : 0; + return 1; + } else if (var0 == 3112) { + ReflectionCheck.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + WorldMapSection0.savePreferences(); return 1; } else { - String var7; - int var15; - if(var0 == 3107) { - var15 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - WorldMapSection2.method583(var15, var7); - return 1; - } else if(var0 == 3108) { - 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) { - 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.mouseCam = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - return 1; - } else if(var0 == 3111) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.roofsHidden?1:0; - return 1; - } else if(var0 == 3112) { - ReflectionCheck.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - WorldMapSection0.savePreferences(); - return 1; - } else if(var0 == 3113) { + boolean var8; + if (var0 == 3113) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - boolean var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - WorldMapCacheName.method635(var3, var4, false); + var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + WorldMapCacheName.method635(var3, var8, false); return 1; - } else if(var0 == 3115) { - 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); + } else if (var0 == 3115) { + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + var5 = Interpreter.method1915(ClientPacket.field264, Client.packetWriter.isaacCipher); + var5.packetBuffer.writeShort(var7); + Client.packetWriter.method241(var5); return 1; - } else if(var0 == 3116) { - var15 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + } else if (var0 == 3116) { + var7 = 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]; - if(var7.length() > 500) { + var6 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; + String var10 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; + if (var6.length() > 500) { return 1; - } else if(var5.length() > 500) { + } else if (var10.length() > 500) { return 1; } else { - PacketBufferNode var6 = Interpreter.method1915(ClientPacket.__gs_j, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeShort(1 + WorldMapRegion.method550(var7) + WorldMapRegion.method550(var5)); - var6.packetBuffer.writeStringCp1252NullTerminated(var7); - var6.packetBuffer.writeByte(var15); - var6.packetBuffer.writeStringCp1252NullTerminated(var5); - Client.packetWriter.__q_167(var6); + PacketBufferNode var9 = Interpreter.method1915(ClientPacket.field238, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(1 + WorldMapRegion.method550(var6) + WorldMapRegion.method550(var10)); + var9.packetBuffer.writeStringCp1252NullTerminated(var6); + var9.packetBuffer.writeByte(var7); + var9.packetBuffer.writeStringCp1252NullTerminated(var10); + Client.packetWriter.method241(var9); return 1; } - } else if(var0 == 3117) { + } else if (var0 == 3117) { Client.shiftClickDrop = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; - } else if(var0 == 3118) { + } else if (var0 == 3118) { Client.showMouseOverText = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; - } else if(var0 == 3119) { + } else if (var0 == 3119) { Client.renderSelf = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; - } else if(var0 == 3120) { - if(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) { - Client.__client_ke |= 1; + } else if (var0 == 3120) { + if (Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) { + Client.field210 |= 1; } else { - Client.__client_ke &= -2; + Client.field210 &= -2; } return 1; - } else if(var0 == 3121) { - if(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) { - Client.__client_ke |= 2; + } else if (var0 == 3121) { + if (Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) { + Client.field210 |= 2; } else { - Client.__client_ke &= -3; + Client.field210 &= -3; } return 1; - } else if(var0 == 3122) { - if(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) { - Client.__client_ke |= 4; + } else if (var0 == 3122) { + if (Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) { + Client.field210 |= 4; } else { - Client.__client_ke &= -5; + Client.field210 &= -5; } return 1; - } else if(var0 == 3123) { - if(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) { - Client.__client_ke |= 8; + } else if (var0 == 3123) { + if (Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) { + Client.field210 |= 8; } else { - Client.__client_ke &= -9; + Client.field210 &= -9; } return 1; - } else if(var0 == 3124) { - Client.__client_ke = 0; + } else if (var0 == 3124) { + Client.field210 = 0; return 1; - } else if(var0 == 3125) { + } else if (var0 == 3125) { Client.showMouseCross = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; - } else if(var0 == 3126) { + } else if (var0 == 3126) { Client.showLoadingMessages = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; - } else if(var0 == 3127) { + } else if (var0 == 3127) { WorldMapAreaData.method705(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1); return 1; - } else if(var0 == 3128) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class206.method4028()?1:0; + } else if (var0 == 3128) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class206.method4028() ? 1 : 0; return 1; - } else if(var0 == 3129) { + } else if (var0 == 3129) { RouteStrategy.Interpreter_intStackSize -= 2; Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; - Client.__client_in = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + Client.field197 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; return 1; - } else if(var0 == 3130) { + } else if (var0 == 3130) { RouteStrategy.Interpreter_intStackSize -= 2; return 1; - } else if(var0 == 3131) { + } else if (var0 == 3131) { --RouteStrategy.Interpreter_intStackSize; return 1; - } else if(var0 == 3132) { + } else if (var0 == 3132) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SoundCache.canvasWidth; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Huffman.canvasHeight; return 1; - } else if(var0 == 3133) { + } else if (var0 == 3133) { --RouteStrategy.Interpreter_intStackSize; return 1; - } else if(var0 == 3134) { + } else if (var0 == 3134) { return 1; - } else if(var0 == 3135) { + } else if (var0 == 3135) { RouteStrategy.Interpreter_intStackSize -= 2; return 1; - } else if(var0 == 3136) { - Client.__client_mf = 3; - Client.__client_ms = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + } else if (var0 == 3136) { + Client.field151 = 3; + Client.field153 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; return 1; - } else if(var0 == 3137) { - Client.__client_mf = 2; - Client.__client_ms = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + } else if (var0 == 3137) { + Client.field151 = 2; + Client.field153 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; return 1; - } else if(var0 == 3138) { - Client.__client_mf = 0; + } else if (var0 == 3138) { + Client.field151 = 0; return 1; - } else if(var0 == 3139) { - Client.__client_mf = 1; + } else if (var0 == 3139) { + Client.field151 = 1; return 1; - } else if(var0 == 3140) { - Client.__client_mf = 3; - Client.__client_ms = var2?WorldMapIcon1.__t_i.id:class12.__n_n.id; + } else if (var0 == 3140) { + Client.field151 = 3; + Client.field153 = var2 ? WorldMapIcon1.field1030.id : class12.field1111.id; + return 1; + } else if (var0 == 3141) { + var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + ReflectionCheck.clientPreferences.hideUsername = var8; + WorldMapSection0.savePreferences(); + return 1; + } else if (var0 == 3142) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.hideUsername ? 1 : 0; + return 1; + } else if (var0 == 3143) { + var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + Client.Login_isUsernameRemembered = var8; + if (!var8) { + ReflectionCheck.clientPreferences.rememberedUsername = ""; + WorldMapSection0.savePreferences(); + } + + return 1; + } else if (var0 == 3144) { + 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[--RouteStrategy.Interpreter_intStackSize] == 1; + if (var8 == ReflectionCheck.clientPreferences.titleMusicDisabled) { + ReflectionCheck.clientPreferences.titleMusicDisabled = !var8; + WorldMapSection0.savePreferences(); + } + + return 1; + } else if (var0 == 3147) { + 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[++RouteStrategy.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3150) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3151) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3152) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3153) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; + return 1; + } else if (var0 == 3154) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GrandExchangeOffer.method101(); return 1; } else { - boolean var8; - if(var0 == 3141) { - var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - ReflectionCheck.clientPreferences.hideUsername = var8; - WorldMapSection0.savePreferences(); - return 1; - } else if(var0 == 3142) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.hideUsername?1:0; - return 1; - } else if(var0 == 3143) { - var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - Client.Login_isUsernameRemembered = var8; - if(!var8) { - ReflectionCheck.clientPreferences.rememberedUsername = ""; - WorldMapSection0.savePreferences(); - } - - return 1; - } else if(var0 == 3144) { - 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[--RouteStrategy.Interpreter_intStackSize] == 1; - if(var8 == ReflectionCheck.clientPreferences.titleMusicDisabled) { - ReflectionCheck.clientPreferences.titleMusicDisabled = !var8; - WorldMapSection0.savePreferences(); - } - - return 1; - } else if(var0 == 3147) { - 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[++RouteStrategy.Interpreter_intStackSize - 1] = 0; - return 1; - } else if(var0 == 3150) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; - return 1; - } else if(var0 == 3151) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; - return 1; - } else if(var0 == 3152) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; - return 1; - } else if(var0 == 3153) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; - return 1; - } else if(var0 == 3154) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GrandExchangeOffer.method101(); - return 1; - } else { - return 2; - } + return 2; } } } diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java index ad1e35f2a5..7cd4ebd5af 100644 --- a/runescape-client/src/main/java/class40.java +++ b/runescape-client/src/main/java/class40.java @@ -32,11 +32,12 @@ public class class40 { garbageValue = "125" ) void method743(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - if(var7 != 0 && this.field326 != 0 && this.field329 != null) { + if (var7 != 0 && this.field326 != 0 && this.field329 != null) { var8 = this.method744(var8, var7); var7 = this.method774(var7); Rasterizer2D.raster2d7(var1, var2, var5, var6, var3, var4, this.field329[var7 - 1][var8], this.field326); } + } @ObfuscatedName("f") @@ -45,15 +46,15 @@ public class class40 { garbageValue = "-203451964" ) int method744(int var1, int var2) { - if(var2 == 9) { + if (var2 == 9) { var1 = var1 + 1 & 3; } - if(var2 == 10) { + if (var2 == 10) { var1 = var1 + 3 & 3; } - if(var2 == 11) { + if (var2 == 11) { var1 = var1 + 3 & 3; } @@ -66,7 +67,7 @@ public class class40 { garbageValue = "-63" ) int method774(int var1) { - return var1 != 9 && var1 != 10?(var1 == 11?8:var1):1; + return var1 != 9 && var1 != 10 ? (var1 == 11 ? 8 : var1) : 1; } @ObfuscatedName("w") @@ -75,7 +76,7 @@ public class class40 { garbageValue = "1551779144" ) void method763() { - if(this.field329 == null) { + if (this.field329 == null) { this.field329 = new byte[8][4][]; this.method745(); this.method748(); @@ -86,6 +87,7 @@ public class class40 { this.method753(); this.method754(); } + } @ObfuscatedName("o") @@ -99,9 +101,9 @@ public class class40 { int var3; int var4; - for(var3 = 0; var3 < this.field326; ++var3) { - for(var4 = 0; var4 < this.field326; ++var4) { - if(var4 <= var3) { + for (var3 = 0; var3 < this.field326; ++var3) { + for (var4 = 0; var4 < this.field326; ++var4) { + if (var4 <= var3) { var1[var2] = -1; } @@ -113,9 +115,9 @@ public class class40 { var1 = new byte[this.field326 * this.field326]; var2 = 0; - for(var3 = this.field326 - 1; var3 >= 0; --var3) { - for(var4 = 0; var4 < this.field326; ++var4) { - if(var4 <= var3) { + for (var3 = this.field326 - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.field326; ++var4) { + if (var4 <= var3) { var1[var2] = -1; } @@ -127,9 +129,9 @@ public class class40 { var1 = new byte[this.field326 * this.field326]; var2 = 0; - for(var3 = 0; var3 < this.field326; ++var3) { - for(var4 = 0; var4 < this.field326; ++var4) { - if(var4 >= var3) { + for (var3 = 0; var3 < this.field326; ++var3) { + for (var4 = 0; var4 < this.field326; ++var4) { + if (var4 >= var3) { var1[var2] = -1; } @@ -141,9 +143,9 @@ public class class40 { var1 = new byte[this.field326 * this.field326]; var2 = 0; - for(var3 = this.field326 - 1; var3 >= 0; --var3) { - for(var4 = 0; var4 < this.field326; ++var4) { - if(var4 >= var3) { + for (var3 = this.field326 - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.field326; ++var4) { + if (var4 >= var3) { var1[var2] = -1; } @@ -165,9 +167,9 @@ public class class40 { int var3; int var4; - for(var3 = this.field326 - 1; var3 >= 0; --var3) { - for(var4 = 0; var4 < this.field326; ++var4) { - if(var4 <= var3 >> 1) { + for (var3 = this.field326 - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.field326; ++var4) { + if (var4 <= var3 >> 1) { var1[var2] = -1; } @@ -179,10 +181,10 @@ public class class40 { var1 = new byte[this.field326 * this.field326]; var2 = 0; - for(var3 = 0; var3 < this.field326; ++var3) { - for(var4 = 0; var4 < this.field326; ++var4) { - if(var2 >= 0 && var2 < var1.length) { - if(var4 >= var3 << 1) { + for (var3 = 0; var3 < this.field326; ++var3) { + for (var4 = 0; var4 < this.field326; ++var4) { + if (var2 >= 0 && var2 < var1.length) { + if (var4 >= var3 << 1) { var1[var2] = -1; } @@ -197,9 +199,9 @@ public class class40 { var1 = new byte[this.field326 * this.field326]; var2 = 0; - for(var3 = 0; var3 < this.field326; ++var3) { - for(var4 = this.field326 - 1; var4 >= 0; --var4) { - if(var4 <= var3 >> 1) { + for (var3 = 0; var3 < this.field326; ++var3) { + for (var4 = this.field326 - 1; var4 >= 0; --var4) { + if (var4 <= var3 >> 1) { var1[var2] = -1; } @@ -211,9 +213,9 @@ public class class40 { var1 = new byte[this.field326 * this.field326]; var2 = 0; - for(var3 = this.field326 - 1; var3 >= 0; --var3) { - for(var4 = this.field326 - 1; var4 >= 0; --var4) { - if(var4 >= var3 << 1) { + for (var3 = this.field326 - 1; var3 >= 0; --var3) { + for (var4 = this.field326 - 1; var4 >= 0; --var4) { + if (var4 >= var3 << 1) { var1[var2] = -1; } @@ -235,9 +237,9 @@ public class class40 { int var3; int var4; - for(var3 = this.field326 - 1; var3 >= 0; --var3) { - for(var4 = this.field326 - 1; var4 >= 0; --var4) { - if(var4 <= var3 >> 1) { + for (var3 = this.field326 - 1; var3 >= 0; --var3) { + for (var4 = this.field326 - 1; var4 >= 0; --var4) { + if (var4 <= var3 >> 1) { var1[var2] = -1; } @@ -249,9 +251,9 @@ public class class40 { var1 = new byte[this.field326 * this.field326]; var2 = 0; - for(var3 = this.field326 - 1; var3 >= 0; --var3) { - for(var4 = 0; var4 < this.field326; ++var4) { - if(var4 >= var3 << 1) { + for (var3 = this.field326 - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.field326; ++var4) { + if (var4 >= var3 << 1) { var1[var2] = -1; } @@ -263,9 +265,9 @@ public class class40 { var1 = new byte[this.field326 * this.field326]; var2 = 0; - for(var3 = 0; var3 < this.field326; ++var3) { - for(var4 = 0; var4 < this.field326; ++var4) { - if(var4 <= var3 >> 1) { + for (var3 = 0; var3 < this.field326; ++var3) { + for (var4 = 0; var4 < this.field326; ++var4) { + if (var4 <= var3 >> 1) { var1[var2] = -1; } @@ -277,9 +279,9 @@ public class class40 { var1 = new byte[this.field326 * this.field326]; var2 = 0; - for(var3 = 0; var3 < this.field326; ++var3) { - for(var4 = this.field326 - 1; var4 >= 0; --var4) { - if(var4 >= var3 << 1) { + for (var3 = 0; var3 < this.field326; ++var3) { + for (var4 = this.field326 - 1; var4 >= 0; --var4) { + if (var4 >= var3 << 1) { var1[var2] = -1; } @@ -301,9 +303,9 @@ public class class40 { int var3; int var4; - for(var3 = this.field326 - 1; var3 >= 0; --var3) { - for(var4 = 0; var4 < this.field326; ++var4) { - if(var4 >= var3 >> 1) { + for (var3 = this.field326 - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.field326; ++var4) { + if (var4 >= var3 >> 1) { var1[var2] = -1; } @@ -315,9 +317,9 @@ public class class40 { var1 = new byte[this.field326 * this.field326]; var2 = 0; - for(var3 = 0; var3 < this.field326; ++var3) { - for(var4 = 0; var4 < this.field326; ++var4) { - if(var4 <= var3 << 1) { + for (var3 = 0; var3 < this.field326; ++var3) { + for (var4 = 0; var4 < this.field326; ++var4) { + if (var4 <= var3 << 1) { var1[var2] = -1; } @@ -329,9 +331,9 @@ public class class40 { var1 = new byte[this.field326 * this.field326]; var2 = 0; - for(var3 = 0; var3 < this.field326; ++var3) { - for(var4 = this.field326 - 1; var4 >= 0; --var4) { - if(var4 >= var3 >> 1) { + for (var3 = 0; var3 < this.field326; ++var3) { + for (var4 = this.field326 - 1; var4 >= 0; --var4) { + if (var4 >= var3 >> 1) { var1[var2] = -1; } @@ -343,9 +345,9 @@ public class class40 { var1 = new byte[this.field326 * this.field326]; var2 = 0; - for(var3 = this.field326 - 1; var3 >= 0; --var3) { - for(var4 = this.field326 - 1; var4 >= 0; --var4) { - if(var4 <= var3 << 1) { + for (var3 = this.field326 - 1; var3 >= 0; --var3) { + for (var4 = this.field326 - 1; var4 >= 0; --var4) { + if (var4 <= var3 << 1) { var1[var2] = -1; } @@ -367,9 +369,9 @@ public class class40 { int var3; int var4; - for(var3 = this.field326 - 1; var3 >= 0; --var3) { - for(var4 = this.field326 - 1; var4 >= 0; --var4) { - if(var4 >= var3 >> 1) { + for (var3 = this.field326 - 1; var3 >= 0; --var3) { + for (var4 = this.field326 - 1; var4 >= 0; --var4) { + if (var4 >= var3 >> 1) { var1[var2] = -1; } @@ -381,9 +383,9 @@ public class class40 { var1 = new byte[this.field326 * this.field326]; var2 = 0; - for(var3 = this.field326 - 1; var3 >= 0; --var3) { - for(var4 = 0; var4 < this.field326; ++var4) { - if(var4 <= var3 << 1) { + for (var3 = this.field326 - 1; var3 >= 0; --var3) { + for (var4 = 0; var4 < this.field326; ++var4) { + if (var4 <= var3 << 1) { var1[var2] = -1; } @@ -395,9 +397,9 @@ public class class40 { var1 = new byte[this.field326 * this.field326]; var2 = 0; - for(var3 = 0; var3 < this.field326; ++var3) { - for(var4 = 0; var4 < this.field326; ++var4) { - if(var4 >= var3 >> 1) { + for (var3 = 0; var3 < this.field326; ++var3) { + for (var4 = 0; var4 < this.field326; ++var4) { + if (var4 >= var3 >> 1) { var1[var2] = -1; } @@ -409,9 +411,9 @@ public class class40 { var1 = new byte[this.field326 * this.field326]; var2 = 0; - for(var3 = 0; var3 < this.field326; ++var3) { - for(var4 = this.field326 - 1; var4 >= 0; --var4) { - if(var4 <= var3 << 1) { + for (var3 = 0; var3 < this.field326; ++var3) { + for (var4 = this.field326 - 1; var4 >= 0; --var4) { + if (var4 <= var3 << 1) { var1[var2] = -1; } @@ -431,59 +433,59 @@ public class class40 { byte[] var1 = new byte[this.field326 * this.field326]; boolean var2 = false; var1 = new byte[this.field326 * this.field326]; - int var5 = 0; + int var3 = 0; - int var3; int var4; - for(var3 = 0; var3 < this.field326; ++var3) { - for(var4 = 0; var4 < this.field326; ++var4) { - if(var4 <= this.field326 / 2) { - var1[var5] = -1; + int var5; + for (var4 = 0; var4 < this.field326; ++var4) { + for (var5 = 0; var5 < this.field326; ++var5) { + if (var5 <= this.field326 / 2) { + var1[var3] = -1; } - ++var5; + ++var3; } } this.field329[5][0] = var1; var1 = new byte[this.field326 * this.field326]; - var5 = 0; + var3 = 0; - for(var3 = 0; var3 < this.field326; ++var3) { - for(var4 = 0; var4 < this.field326; ++var4) { - if(var3 <= this.field326 / 2) { - var1[var5] = -1; + for (var4 = 0; var4 < this.field326; ++var4) { + for (var5 = 0; var5 < this.field326; ++var5) { + if (var4 <= this.field326 / 2) { + var1[var3] = -1; } - ++var5; + ++var3; } } this.field329[5][1] = var1; var1 = new byte[this.field326 * this.field326]; - var5 = 0; + var3 = 0; - for(var3 = 0; var3 < this.field326; ++var3) { - for(var4 = 0; var4 < this.field326; ++var4) { - if(var4 >= this.field326 / 2) { - var1[var5] = -1; + for (var4 = 0; var4 < this.field326; ++var4) { + for (var5 = 0; var5 < this.field326; ++var5) { + if (var5 >= this.field326 / 2) { + var1[var3] = -1; } - ++var5; + ++var3; } } this.field329[5][2] = var1; var1 = new byte[this.field326 * this.field326]; - var5 = 0; + var3 = 0; - for(var3 = 0; var3 < this.field326; ++var3) { - for(var4 = 0; var4 < this.field326; ++var4) { - if(var3 >= this.field326 / 2) { - var1[var5] = -1; + for (var4 = 0; var4 < this.field326; ++var4) { + for (var5 = 0; var5 < this.field326; ++var5) { + if (var4 >= this.field326 / 2) { + var1[var3] = -1; } - ++var5; + ++var3; } } @@ -499,59 +501,59 @@ public class class40 { byte[] var1 = new byte[this.field326 * this.field326]; boolean var2 = false; var1 = new byte[this.field326 * this.field326]; - int var5 = 0; + int var3 = 0; - int var3; int var4; - for(var3 = 0; var3 < this.field326; ++var3) { - for(var4 = 0; var4 < this.field326; ++var4) { - if(var4 <= var3 - this.field326 / 2) { - var1[var5] = -1; + int var5; + for (var4 = 0; var4 < this.field326; ++var4) { + for (var5 = 0; var5 < this.field326; ++var5) { + if (var5 <= var4 - this.field326 / 2) { + var1[var3] = -1; } - ++var5; + ++var3; } } this.field329[6][0] = var1; var1 = new byte[this.field326 * this.field326]; - var5 = 0; + var3 = 0; - for(var3 = this.field326 - 1; var3 >= 0; --var3) { - for(var4 = 0; var4 < this.field326; ++var4) { - if(var4 <= var3 - this.field326 / 2) { - var1[var5] = -1; + for (var4 = this.field326 - 1; var4 >= 0; --var4) { + for (var5 = 0; var5 < this.field326; ++var5) { + if (var5 <= var4 - this.field326 / 2) { + var1[var3] = -1; } - ++var5; + ++var3; } } this.field329[6][1] = var1; var1 = new byte[this.field326 * this.field326]; - var5 = 0; + var3 = 0; - for(var3 = this.field326 - 1; var3 >= 0; --var3) { - for(var4 = this.field326 - 1; var4 >= 0; --var4) { - if(var4 <= var3 - this.field326 / 2) { - var1[var5] = -1; + for (var4 = this.field326 - 1; var4 >= 0; --var4) { + for (var5 = this.field326 - 1; var5 >= 0; --var5) { + if (var5 <= var4 - this.field326 / 2) { + var1[var3] = -1; } - ++var5; + ++var3; } } this.field329[6][2] = var1; var1 = new byte[this.field326 * this.field326]; - var5 = 0; + var3 = 0; - for(var3 = 0; var3 < this.field326; ++var3) { - for(var4 = this.field326 - 1; var4 >= 0; --var4) { - if(var4 <= var3 - this.field326 / 2) { - var1[var5] = -1; + for (var4 = 0; var4 < this.field326; ++var4) { + for (var5 = this.field326 - 1; var5 >= 0; --var5) { + if (var5 <= var4 - this.field326 / 2) { + var1[var3] = -1; } - ++var5; + ++var3; } } @@ -567,59 +569,59 @@ public class class40 { byte[] var1 = new byte[this.field326 * this.field326]; boolean var2 = false; var1 = new byte[this.field326 * this.field326]; - int var5 = 0; + int var3 = 0; - int var3; int var4; - for(var3 = 0; var3 < this.field326; ++var3) { - for(var4 = 0; var4 < this.field326; ++var4) { - if(var4 >= var3 - this.field326 / 2) { - var1[var5] = -1; + int var5; + for (var4 = 0; var4 < this.field326; ++var4) { + for (var5 = 0; var5 < this.field326; ++var5) { + if (var5 >= var4 - this.field326 / 2) { + var1[var3] = -1; } - ++var5; + ++var3; } } this.field329[7][0] = var1; var1 = new byte[this.field326 * this.field326]; - var5 = 0; + var3 = 0; - for(var3 = this.field326 - 1; var3 >= 0; --var3) { - for(var4 = 0; var4 < this.field326; ++var4) { - if(var4 >= var3 - this.field326 / 2) { - var1[var5] = -1; + for (var4 = this.field326 - 1; var4 >= 0; --var4) { + for (var5 = 0; var5 < this.field326; ++var5) { + if (var5 >= var4 - this.field326 / 2) { + var1[var3] = -1; } - ++var5; + ++var3; } } this.field329[7][1] = var1; var1 = new byte[this.field326 * this.field326]; - var5 = 0; + var3 = 0; - for(var3 = this.field326 - 1; var3 >= 0; --var3) { - for(var4 = this.field326 - 1; var4 >= 0; --var4) { - if(var4 >= var3 - this.field326 / 2) { - var1[var5] = -1; + for (var4 = this.field326 - 1; var4 >= 0; --var4) { + for (var5 = this.field326 - 1; var5 >= 0; --var5) { + if (var5 >= var4 - this.field326 / 2) { + var1[var3] = -1; } - ++var5; + ++var3; } } this.field329[7][2] = var1; var1 = new byte[this.field326 * this.field326]; - var5 = 0; + var3 = 0; - for(var3 = 0; var3 < this.field326; ++var3) { - for(var4 = this.field326 - 1; var4 >= 0; --var4) { - if(var4 >= var3 - this.field326 / 2) { - var1[var5] = -1; + for (var4 = 0; var4 < this.field326; ++var4) { + for (var5 = this.field326 - 1; var5 >= 0; --var5) { + if (var5 >= var4 - this.field326 / 2) { + var1[var3] = -1; } - ++var5; + ++var3; } } @@ -642,58 +644,58 @@ public class class40 { int[] var5 = Players.Players_indices; int var6; - for(var6 = 0; var6 < var4; ++var6) { - if(var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { + for (var6 = 0; var6 < var4; ++var6) { + if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { WorldMapCacheName.addPlayerToScene(Client.players[var5[var6]], true); } } BufferedSource.method3423(false); - for(Projectile var20 = (Projectile)Client.projectiles.last(); var20 != null; var20 = (Projectile)Client.projectiles.previous()) { - if(var20.plane == SoundSystem.plane && Client.cycle <= var20.cycleEnd) { - if(Client.cycle >= var20.cycleStart) { - if(var20.targetIndex > 0) { - Npc var22 = Client.npcs[var20.targetIndex - 1]; - if(var22 != null && var22.x >= 0 && var22.x < 13312 && var22.y >= 0 && var22.y < 13312) { - var20.setDestination(var22.x, var22.y, class32.getTileHeight(var22.x, var22.y, var20.plane) - var20.endHeight, Client.cycle); + for (Projectile var7 = (Projectile)Client.projectiles.last(); var7 != null; var7 = (Projectile)Client.projectiles.previous()) { + if (var7.plane == SoundSystem.plane && Client.cycle <= var7.cycleEnd) { + if (Client.cycle >= var7.cycleStart) { + if (var7.targetIndex > 0) { + NPC var8 = Client.npcs[var7.targetIndex - 1]; + if (var8 != null && var8.x >= 0 && var8.x < 13312 && var8.y >= 0 && var8.y < 13312) { + var7.setDestination(var8.x, var8.y, class32.getTileHeight(var8.x, var8.y, var7.plane) - var7.endHeight, Client.cycle); } } - if(var20.targetIndex < 0) { - var6 = -var20.targetIndex - 1; + if (var7.targetIndex < 0) { + var6 = -var7.targetIndex - 1; Player var23; - if(var6 == Client.localPlayerIndex) { + if (var6 == Client.localPlayerIndex) { var23 = Canvas.localPlayer; } else { var23 = Client.players[var6]; } - if(var23 != null && var23.x >= 0 && var23.x < 13312 && var23.y >= 0 && var23.y < 13312) { - var20.setDestination(var23.x, var23.y, class32.getTileHeight(var23.x, var23.y, var20.plane) - var20.endHeight, Client.cycle); + if (var23 != null && var23.x >= 0 && var23.x < 13312 && var23.y >= 0 && var23.y < 13312) { + var7.setDestination(var23.x, var23.y, class32.getTileHeight(var23.x, var23.y, var7.plane) - var7.endHeight, Client.cycle); } } - var20.advance(Client.__client_gy); - class65.scene.__a_239(SoundSystem.plane, (int)var20.x, (int)var20.y, (int)var20.z, 60, var20, var20.yaw, -1L, false); + var7.advance(Client.field183); + class65.scene.method285(SoundSystem.plane, (int)var7.x, (int)var7.y, (int)var7.z, 60, var7, var7.yaw, -1L, false); } } else { - var20.remove(); + var7.remove(); } } - for(GraphicsObject var25 = (GraphicsObject)Client.graphicsObjects.last(); var25 != null; var25 = (GraphicsObject)Client.graphicsObjects.previous()) { - if(var25.plane == SoundSystem.plane && !var25.isFinished) { - if(Client.cycle >= var25.cycleStart) { - var25.advance(Client.__client_gy); - if(var25.isFinished) { - var25.remove(); + for (GraphicsObject var21 = (GraphicsObject)Client.graphicsObjects.last(); var21 != null; var21 = (GraphicsObject)Client.graphicsObjects.previous()) { + if (var21.plane == SoundSystem.plane && !var21.isFinished) { + if (Client.cycle >= var21.cycleStart) { + var21.advance(Client.field183); + if (var21.isFinished) { + var21.remove(); } else { - class65.scene.__a_239(var25.plane, var25.x, var25.y, var25.height, 60, var25, 0, -1L, false); + class65.scene.method285(var21.plane, var21.x, var21.y, var21.height, 60, var21, 0, -1L, false); } } } else { - var25.remove(); + var21.remove(); } } @@ -704,111 +706,111 @@ public class class40 { var3 = Client.viewportHeight; Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); Rasterizer3D.Rasterizer3D_method1(); - int var7; - int var8; int var9; int var10; int var11; int var12; int var13; int var14; - int var21; - if(!Client.isCameraLocked) { + int var15; + int var22; + int var24; + if (!Client.isCameraLocked) { var4 = Client.cameraPitchTarget; - if(Client.__client_ik / 256 > var4) { - var4 = Client.__client_ik / 256; + if (Client.field202 / 256 > var4) { + var4 = Client.field202 / 256; } - if(Client.__client_rh[4] && Client.__client_rl[4] + 128 > var4) { - var4 = Client.__client_rl[4] + 128; + if (Client.field139[4] && Client.field142[4] + 128 > var4) { + var4 = Client.field142[4] + 128; } - var21 = Client.minimapOrientation & 2047; + var15 = Client.minimapOrientation & 2047; var6 = MouseHandler.oculusOrbFocalPointX; - var7 = MouseRecorder.__bu_hy; - var8 = ScriptEvent.oculusOrbFocalPointY; + var22 = MouseRecorder.field566; + var24 = ScriptEvent.oculusOrbFocalPointY; var9 = var4 * 3 + 600; var10 = ScriptEvent.method1176(var9, var3); var11 = 2048 - var4 & 2047; - var12 = 2048 - var21 & 2047; + var12 = 2048 - var15 & 2047; var13 = 0; var14 = 0; - int var15 = var10; - int var16; + int var16 = var10; int var17; int var18; - if(var11 != 0) { - var16 = Rasterizer3D.Rasterizer3D_sine[var11]; - var17 = Rasterizer3D.Rasterizer3D_cosine[var11]; - var18 = var14 * var17 - var16 * var10 >> 16; - var15 = var17 * var10 + var16 * var14 >> 16; - var14 = var18; + int var19; + if (var11 != 0) { + var17 = Rasterizer3D.Rasterizer3D_sine[var11]; + var18 = Rasterizer3D.Rasterizer3D_cosine[var11]; + var19 = var14 * var18 - var17 * var10 >> 16; + var16 = var18 * var10 + var17 * var14 >> 16; + var14 = var19; } - if(var12 != 0) { - var16 = Rasterizer3D.Rasterizer3D_sine[var12]; - var17 = Rasterizer3D.Rasterizer3D_cosine[var12]; - var18 = var15 * var16 + var17 * var13 >> 16; - var15 = var15 * var17 - var16 * var13 >> 16; - var13 = var18; + if (var12 != 0) { + var17 = Rasterizer3D.Rasterizer3D_sine[var12]; + var18 = Rasterizer3D.Rasterizer3D_cosine[var12]; + var19 = var16 * var17 + var18 * var13 >> 16; + var16 = var16 * var18 - var17 * var13 >> 16; + var13 = var19; } WorldMapSection1.cameraX = var6 - var13; - GrandExchangeEvents.cameraY = var7 - var14; - class11.cameraZ = var8 - var15; + GrandExchangeEvents.cameraY = var22 - var14; + class11.cameraZ = var24 - var16; WorldMapIcon1.cameraPitch = var4; - MusicPatchNode.cameraYaw = var21; - if(Client.oculusOrbState == 1 && Client.rights >= 2 && Client.cycle % 50 == 0 && (MouseHandler.oculusOrbFocalPointX >> 7 != Canvas.localPlayer.x >> 7 || ScriptEvent.oculusOrbFocalPointY >> 7 != Canvas.localPlayer.y >> 7)) { - var16 = Canvas.localPlayer.plane; - var17 = (MouseHandler.oculusOrbFocalPointX >> 7) + class50.baseX; - var18 = (ScriptEvent.oculusOrbFocalPointY >> 7) + GraphicsObject.baseY; - PacketBufferNode var19 = Interpreter.method1915(ClientPacket.__gs_bx, Client.packetWriter.isaacCipher); - var19.packetBuffer.writeIntME(Client.__client_il); - var19.packetBuffer.writeShortLE(var18); - var19.packetBuffer.__ai_315(var16); - var19.packetBuffer.writeShort(var17); - Client.packetWriter.__q_167(var19); + MusicPatchNode.cameraYaw = var15; + if (Client.oculusOrbState == 1 && Client.rights >= 2 && Client.cycle % 50 == 0 && (MouseHandler.oculusOrbFocalPointX >> 7 != Canvas.localPlayer.x >> 7 || ScriptEvent.oculusOrbFocalPointY >> 7 != Canvas.localPlayer.y >> 7)) { + var17 = Canvas.localPlayer.plane; + var18 = (MouseHandler.oculusOrbFocalPointX >> 7) + class50.baseX; + var19 = (ScriptEvent.oculusOrbFocalPointY >> 7) + GraphicsObject.baseY; + PacketBufferNode var20 = Interpreter.method1915(ClientPacket.field283, Client.packetWriter.isaacCipher); + var20.packetBuffer.writeIntME(Client.field198); + var20.packetBuffer.writeShortLE(var19); + var20.packetBuffer.method56(var17); + var20.packetBuffer.writeShort(var18); + Client.packetWriter.method241(var20); } } - if(!Client.isCameraLocked) { + if (!Client.isCameraLocked) { var4 = UnitPriceComparator.method131(); } else { var4 = Login.method2061(); } - var21 = WorldMapSection1.cameraX; + var15 = WorldMapSection1.cameraX; var6 = GrandExchangeEvents.cameraY; - var7 = class11.cameraZ; - var8 = WorldMapIcon1.cameraPitch; + var22 = class11.cameraZ; + var24 = WorldMapIcon1.cameraPitch; var9 = MusicPatchNode.cameraYaw; - for(var10 = 0; var10 < 5; ++var10) { - if(Client.__client_rh[var10]) { - var11 = (int)(Math.random() * (double)(Client.__client_rd[var10] * 2 + 1) - (double)Client.__client_rd[var10] + Math.sin((double)Client.__client_rk[var10] * ((double)Client.__client_rj[var10] / 100.0D)) * (double)Client.__client_rl[var10]); - if(var10 == 0) { + for (var10 = 0; var10 < 5; ++var10) { + if (Client.field139[var10]) { + var11 = (int)(Math.random() * (double)(Client.field141[var10] * 2 + 1) - (double)Client.field141[var10] + Math.sin((double)Client.field144[var10] * ((double)Client.field143[var10] / 100.0D)) * (double)Client.field142[var10]); + if (var10 == 0) { WorldMapSection1.cameraX += var11; } - if(var10 == 1) { + if (var10 == 1) { GrandExchangeEvents.cameraY += var11; } - if(var10 == 2) { + if (var10 == 2) { class11.cameraZ += var11; } - if(var10 == 3) { + if (var10 == 3) { MusicPatchNode.cameraYaw = var11 + MusicPatchNode.cameraYaw & 2047; } - if(var10 == 4) { + if (var10 == 4) { WorldMapIcon1.cameraPitch += var11; - if(WorldMapIcon1.cameraPitch < 128) { + if (WorldMapIcon1.cameraPitch < 128) { WorldMapIcon1.cameraPitch = 128; } - if(WorldMapIcon1.cameraPitch > 383) { + if (WorldMapIcon1.cameraPitch > 383) { WorldMapIcon1.cameraPitch = 383; } } @@ -817,12 +819,12 @@ public class class40 { var10 = MouseHandler.MouseHandler_x; var11 = MouseHandler.MouseHandler_y; - if(MouseHandler.MouseHandler_lastButton != 0) { + if (MouseHandler.MouseHandler_lastButton != 0) { var10 = MouseHandler.MouseHandler_lastPressedX; var11 = MouseHandler.MouseHandler_lastPressedY; } - if(var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { + if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { var12 = var10 - var0; var13 = var11 - var1; ViewportMouse.ViewportMouse_x = var12; @@ -846,36 +848,36 @@ public class class40 { class65.scene.clearTempGameObjects(); UrlRequester.method3258(var0, var1, var2, var3); UnitPriceComparator.method136(var0, var1); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.__client_gy); - Client.__client_jc = 0; + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field183); + Client.field208 = 0; var13 = (Canvas.localPlayer.x >> 7) + class50.baseX; var14 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY; - if(var13 >= 3053 && var13 <= 3156 && var14 >= 3056 && var14 <= 3136) { - Client.__client_jc = 1; + if (var13 >= 3053 && var13 <= 3156 && var14 >= 3056 && var14 <= 3136) { + Client.field208 = 1; } - if(var13 >= 3072 && var13 <= 3118 && var14 >= 9492 && var14 <= 9535) { - Client.__client_jc = 1; + if (var13 >= 3072 && var13 <= 3118 && var14 >= 9492 && var14 <= 9535) { + Client.field208 = 1; } - if(Client.__client_jc == 1 && var13 >= 3139 && var13 <= 3199 && var14 >= 3008 && var14 <= 3062) { - Client.__client_jc = 0; + if (Client.field208 == 1 && var13 >= 3139 && var13 <= 3199 && var14 >= 3008 && var14 <= 3062) { + Client.field208 = 0; } - WorldMapSection1.cameraX = var21; + WorldMapSection1.cameraX = var15; GrandExchangeEvents.cameraY = var6; - class11.cameraZ = var7; - WorldMapIcon1.cameraPitch = var8; + class11.cameraZ = var22; + WorldMapIcon1.cameraPitch = var24; MusicPatchNode.cameraYaw = var9; - if(Client.isLoading) { - byte var24 = 0; - var14 = var24 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; - if(var14 == 0) { + if (Client.isLoading) { + byte var25 = 0; + var14 = var25 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; + if (var14 == 0) { Client.isLoading = false; } } - if(Client.isLoading) { + if (Client.isLoading) { Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); class68.drawLoadingMessage("Loading - please wait.", false); } diff --git a/runescape-client/src/main/java/class48.java b/runescape-client/src/main/java/class48.java index fbbac8a5e6..802a80da79 100644 --- a/runescape-client/src/main/java/class48.java +++ b/runescape-client/src/main/java/class48.java @@ -4,10 +4,6 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("aa") public class class48 { - static { - ImageIO.setUseCache(false); - } - @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)[Lij;", @@ -23,14 +19,15 @@ public class class48 { garbageValue = "643714573" ) static final void method868() { - if(Client.__client_fd > 0) { + if (Client.field175 > 0) { TextureProvider.method2773(); } else { - Client.timer.__f_454(); + Client.timer.method330(); GameShell.updateGameState(40); - ClientParameter.__ji_fp = Client.packetWriter.getSocket(); + ClientParameter.field341 = Client.packetWriter.getSocket(); Client.packetWriter.removeSocket(); } + } @ObfuscatedName("je") @@ -39,35 +36,34 @@ public class class48 { garbageValue = "-1926681563" ) static Widget method869(Widget var0) { - Widget var2 = var0; - int var3 = WorldMapRegion.method568(class1.getWidgetClickMask(var0)); - Widget var1; - if(var3 == 0) { - var1 = null; + Widget var1 = var0; + int var2 = WorldMapRegion.method568(class1.getWidgetClickMask(var0)); + Widget var3; + if (var2 == 0) { + var3 = null; } else { - int var4 = 0; - - while(true) { - if(var4 >= var3) { - var1 = var2; - break; + label29: { + for (int var4 = 0; var4 < var2; ++var4) { + var1 = Huffman.getWidget(var1.parentId); + if (var1 == null) { + var3 = null; + break label29; + } } - var2 = Huffman.getWidget(var2.parentId); - if(var2 == null) { - var1 = null; - break; - } - - ++var4; + var3 = var1; } } - Widget var5 = var1; - if(var1 == null) { + Widget var5 = var3; + if (var3 == null) { var5 = var0.parent; } return var5; } + + static { + ImageIO.setUseCache(false); + } } diff --git a/runescape-client/src/main/java/class50.java b/runescape-client/src/main/java/class50.java index b88da2916a..8b2c6cf343 100644 --- a/runescape-client/src/main/java/class50.java +++ b/runescape-client/src/main/java/class50.java @@ -7,9 +7,9 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("af") public class class50 { @ObfuscatedName("m") - public static Applet __af_m; + public static Applet field1159; @ObfuscatedName("f") - public static String __af_f; + public static String field1160; @ObfuscatedName("ei") @Export("worldHost") static String worldHost; @@ -20,11 +20,6 @@ public class class50 { @Export("baseX") static int baseX; - static { - __af_m = null; - __af_f = ""; - } - @ObfuscatedName("m") @ObfuscatedSignature( signature = "(IB)Lio;", @@ -33,13 +28,13 @@ public class class50 { @Export("getSpotAnimationDefinition") public static SpotAnimationDefinition getSpotAnimationDefinition(int var0) { SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); - if(var1 != null) { + if (var1 != null) { return var1; } else { byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_indexCache.takeRecord(13, var0); var1 = new SpotAnimationDefinition(); var1.id = var0; - if(var2 != null) { + if (var2 != null) { var1.read(new Buffer(var2)); } @@ -56,18 +51,18 @@ public class class50 { @Export("getObjectDefinition") public static ObjectDefinition getObjectDefinition(int var0) { ObjectDefinition var1 = (ObjectDefinition)ObjectDefinition.ObjectDefinition_cached.get((long)var0); - if(var1 != null) { + if (var1 != null) { return var1; } else { byte[] var2 = ObjectDefinition.ObjectDefinition_indexCache.takeRecord(6, var0); var1 = new ObjectDefinition(); var1.id = var0; - if(var2 != null) { + if (var2 != null) { var1.read(new Buffer(var2)); } var1.init(); - if(var1.isSolid) { + if (var1.isSolid) { var1.interactType = 0; var1.boolean1 = false; } @@ -87,18 +82,77 @@ public class class50 { Client.isInInstance = var0; int var2; int var3; + int var4; int var5; int var6; int var7; - int var8; - if(!Client.isInInstance) { - var2 = var1.__bm_326(); - var3 = var1.__bu_325(); - int var4 = var1.__ag_302(); + if (!Client.isInInstance) { + var2 = var1.method67(); + var3 = var1.method66(); + int var8 = var1.method43(); + class190.xteaKeys = new int[var8][4]; + + for (var4 = 0; var4 < var8; ++var4) { + for (var5 = 0; var5 < 4; ++var5) { + class190.xteaKeys[var4][var5] = var1.readInt(); + } + } + + class308.regions = new int[var8]; + IndexCacheLoader.regionMapArchiveIds = new int[var8]; + MouseHandler.regionLandArchiveIds = new int[var8]; + class40.regionLandArchives = new byte[var8][]; + HealthBarUpdate.regionMapArchives = new byte[var8][]; + boolean var9 = false; + if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { + var9 = true; + } + + if (var3 / 8 == 48 && var2 / 8 == 148) { + var9 = true; + } + + var8 = 0; + + for (var5 = (var3 - 6) / 8; var5 <= (var3 + 6) / 8; ++var5) { + for (var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) { + var7 = var6 + (var5 << 8); + if (!var9 || var6 != 49 && var6 != 149 && var6 != 147 && var5 != 50 && (var5 != 49 || var6 != 47)) { + class308.regions[var8] = var7; + IndexCacheLoader.regionMapArchiveIds[var8] = SecureRandomFuture.indexCache5.getArchiveId("m" + var5 + "_" + var6); + MouseHandler.regionLandArchiveIds[var8] = SecureRandomFuture.indexCache5.getArchiveId("l" + var5 + "_" + var6); + ++var8; + } + } + } + + DynamicObject.method2224(var3, var2, true); + } else { + var2 = var1.method66(); + var3 = var1.method67(); + boolean var15 = var1.readUnsignedByte() == 1; + var4 = var1.method43(); + var1.importIndex(); + + int var16; + for (var5 = 0; var5 < 4; ++var5) { + for (var6 = 0; var6 < 13; ++var6) { + for (var7 = 0; var7 < 13; ++var7) { + var16 = var1.readBits(1); + if (var16 == 1) { + Client.instanceChunkTemplates[var5][var6][var7] = var1.readBits(26); + } else { + Client.instanceChunkTemplates[var5][var6][var7] = -1; + } + } + } + } + + var1.exportIndex(); class190.xteaKeys = new int[var4][4]; - for(var5 = 0; var5 < var4; ++var5) { - for(var6 = 0; var6 < 4; ++var6) { + for (var5 = 0; var5 < var4; ++var5) { + for (var6 = 0; var6 < 4; ++var6) { class190.xteaKeys[var5][var6] = var1.readInt(); } } @@ -108,91 +162,32 @@ public class class50 { MouseHandler.regionLandArchiveIds = new int[var4]; class40.regionLandArchives = new byte[var4][]; HealthBarUpdate.regionMapArchives = new byte[var4][]; - boolean var16 = false; - if((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { - var16 = true; - } - - if(var3 / 8 == 48 && var2 / 8 == 148) { - var16 = true; - } - var4 = 0; - for(var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { - for(var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) { - var8 = var7 + (var6 << 8); - if(!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { - class308.regions[var4] = var8; - IndexCacheLoader.regionMapArchiveIds[var4] = SecureRandomFuture.indexCache5.getArchiveId("m" + var6 + "_" + var7); - MouseHandler.regionLandArchiveIds[var4] = SecureRandomFuture.indexCache5.getArchiveId("l" + var6 + "_" + var7); - ++var4; - } - } - } - - DynamicObject.method2224(var3, var2, true); - } else { - var2 = var1.__bu_325(); - var3 = var1.__bm_326(); - boolean var15 = var1.readUnsignedByte() == 1; - var5 = var1.__ag_302(); - var1.importIndex(); - - int var9; - for(var6 = 0; var6 < 4; ++var6) { - for(var7 = 0; var7 < 13; ++var7) { - for(var8 = 0; var8 < 13; ++var8) { - var9 = var1.readBits(1); - if(var9 == 1) { - Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); - } else { - Client.instanceChunkTemplates[var6][var7][var8] = -1; - } - } - } - } - - var1.exportIndex(); - class190.xteaKeys = new int[var5][4]; - - for(var6 = 0; var6 < var5; ++var6) { - for(var7 = 0; var7 < 4; ++var7) { - class190.xteaKeys[var6][var7] = var1.readInt(); - } - } - - class308.regions = new int[var5]; - IndexCacheLoader.regionMapArchiveIds = new int[var5]; - MouseHandler.regionLandArchiveIds = new int[var5]; - class40.regionLandArchives = new byte[var5][]; - HealthBarUpdate.regionMapArchives = new byte[var5][]; - var5 = 0; - - for(var6 = 0; var6 < 4; ++var6) { - for(var7 = 0; var7 < 13; ++var7) { - for(var8 = 0; var8 < 13; ++var8) { - var9 = Client.instanceChunkTemplates[var6][var7][var8]; - if(var9 != -1) { - int var10 = var9 >> 14 & 1023; - int var11 = var9 >> 3 & 2047; + for (var5 = 0; var5 < 4; ++var5) { + for (var6 = 0; var6 < 13; ++var6) { + for (var7 = 0; var7 < 13; ++var7) { + var16 = Client.instanceChunkTemplates[var5][var6][var7]; + if (var16 != -1) { + int var10 = var16 >> 14 & 1023; + int var11 = var16 >> 3 & 2047; int var12 = (var10 / 8 << 8) + var11 / 8; int var13; - for(var13 = 0; var13 < var5; ++var13) { - if(class308.regions[var13] == var12) { + for (var13 = 0; var13 < var4; ++var13) { + if (class308.regions[var13] == var12) { var12 = -1; break; } } - if(var12 != -1) { - class308.regions[var5] = var12; + if (var12 != -1) { + class308.regions[var4] = var12; var13 = var12 >> 8 & 255; int var14 = var12 & 255; - IndexCacheLoader.regionMapArchiveIds[var5] = SecureRandomFuture.indexCache5.getArchiveId("m" + var13 + "_" + var14); - MouseHandler.regionLandArchiveIds[var5] = SecureRandomFuture.indexCache5.getArchiveId("l" + var13 + "_" + var14); - ++var5; + IndexCacheLoader.regionMapArchiveIds[var4] = SecureRandomFuture.indexCache5.getArchiveId("m" + var13 + "_" + var14); + MouseHandler.regionLandArchiveIds[var4] = SecureRandomFuture.indexCache5.getArchiveId("l" + var13 + "_" + var14); + ++var4; } } } @@ -214,19 +209,19 @@ public class class50 { short[] var2 = new short[16]; int var3 = 0; - for(int var4 = 0; var4 < class83.__cm_e; ++var4) { + for (int var4 = 0; var4 < class83.field1167; ++var4) { ItemDefinition var5 = Skills.getItemDefinition(var4); - if((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { - if(var3 >= 250) { - WorldMapSection0.__y_sn = -1; - AttackOption.__cj_sp = null; + if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { + if (var3 >= 250) { + WorldMapSection0.field1055 = -1; + AttackOption.field30 = null; return; } - if(var3 >= var2.length) { + if (var3 >= var2.length) { short[] var6 = new short[var2.length * 2]; - for(int var7 = 0; var7 < var3; ++var7) { + for (int var7 = 0; var7 < var3; ++var7) { var6[var7] = var2[var7]; } @@ -237,16 +232,16 @@ public class class50 { } } - AttackOption.__cj_sp = var2; - class231.__hb_sg = 0; - WorldMapSection0.__y_sn = var3; - String[] var8 = new String[WorldMapSection0.__y_sn]; + AttackOption.field30 = var2; + class231.field1139 = 0; + WorldMapSection0.field1055 = var3; + String[] var8 = new String[WorldMapSection0.field1055]; - for(int var9 = 0; var9 < WorldMapSection0.__y_sn; ++var9) { + for (int var9 = 0; var9 < WorldMapSection0.field1055; ++var9) { var8[var9] = Skills.getItemDefinition(var2[var9]).name; } - Huffman.method3695(var8, AttackOption.__cj_sp); + Huffman.method3695(var8, AttackOption.field30); } @ObfuscatedName("kk") @@ -255,10 +250,15 @@ public class class50 { garbageValue = "-522943529" ) static void method902(byte[] var0, int var1) { - if(Client.__client_ev == null) { - Client.__client_ev = new byte[24]; + if (Client.field172 == null) { + Client.field172 = new byte[24]; } - class212.method4109(var0, var1, Client.__client_ev, 0, 24); + class212.method4109(var0, var1, Client.field172, 0, 24); + } + + static { + field1159 = null; + field1160 = ""; } } diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java index 75a8e68f79..e4f0932858 100644 --- a/runescape-client/src/main/java/class54.java +++ b/runescape-client/src/main/java/class54.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -9,7 +8,7 @@ public final class class54 { @ObfuscatedGetter( intValue = -1247107945 ) - static int __bs_nb; + static int field1161; @ObfuscatedName("q") @ObfuscatedSignature( @@ -18,7 +17,7 @@ public final class class54 { ) static int method1086(int var0, int var1) { long var2 = (long)((var0 << 16) + var1); - return ModelData0.NetCache_currentResponse != null && var2 == ModelData0.NetCache_currentResponse.key?class22.NetCache_responseArchiveBuffer.index * 99 / (class22.NetCache_responseArchiveBuffer.array.length - ModelData0.NetCache_currentResponse.padding) + 1:0; + return ModelData0.NetCache_currentResponse != null && var2 == ModelData0.NetCache_currentResponse.key ? class22.NetCache_responseArchiveBuffer.index * 99 / (class22.NetCache_responseArchiveBuffer.array.length - ModelData0.NetCache_currentResponse.padding) + 1 : 0; } @ObfuscatedName("q") @@ -36,129 +35,43 @@ public final class class54 { garbageValue = "-603753561" ) static void method1092(GameShell var0) { - int var3; - int var15; - if(Login.worldSelectOpen) { - while(true) { - if(!Decimator.method2490()) { - if(MouseHandler.MouseHandler_lastButton != 1 && (AbstractRasterProvider.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) { - break; - } - - int var1 = Login.xPadding + 280; - if(MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - 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.changeWorldSelectSorting(0, 1); - break; - } - - int var2 = Login.xPadding + 390; - if(MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - 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.changeWorldSelectSorting(1, 1); - break; - } - - var3 = Login.xPadding + 500; - if(MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - 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.changeWorldSelectSorting(2, 1); - break; - } - - var15 = Login.xPadding + 610; - if(MouseHandler.MouseHandler_lastPressedX >= var15 && MouseHandler.MouseHandler_lastPressedX <= var15 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - 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.changeWorldSelectSorting(3, 1); - break; - } - - if(MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { - FontName.closeWorldSelect(); - break; - } - - if(Login.hoveredWorldIndex != -1) { - World var13 = ItemContainer.worlds[Login.hoveredWorldIndex]; - class31.changeWorld(var13); - FontName.closeWorldSelect(); - } else { - 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.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.closeWorldSelect(); - break; - } - - if(IndexStoreAction.__ik_cn == 96) { - if(Login.worldSelectPage > 0 && SecureRandomFuture.worldSelectLeftSprite != null) { - --Login.worldSelectPage; - } - } else if(IndexStoreAction.__ik_cn == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && NetSocket.worldSelectRightSprite != null) { - ++Login.worldSelectPage; - } - } - - } else { - if((MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { + int var1; + int var2; + if (!Login.worldSelectOpen) { + 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.savePreferences(); - if(!ReflectionCheck.clientPreferences.titleMusicDisabled) { + if (!ReflectionCheck.clientPreferences.titleMusicDisabled) { class204.method4011(UserComparator3.indexCache6, "scape main", "", 255, false); } else { class214.midiPcmStream.clear(); - class214.__hf_o = 1; - class214.__hf_u = null; + class214.field1129 = 1; + class214.field1130 = null; } } - if(Client.gameState != 5) { - if(-1L == Login.__cu_bi) { - Login.__cu_bi = class203.currentTimeMs() + 1000L; + if (Client.gameState != 5) { + if (-1L == Login.field471) { + Login.field471 = class203.currentTimeMs() + 1000L; } - long var11 = class203.currentTimeMs(); - if(AbstractIndexCache.method4585() && -1L == Login.__cu_bz) { - Login.__cu_bz = var11; - if(Login.__cu_bz > Login.__cu_bi) { - Login.__cu_bi = Login.__cu_bz; + long var15 = class203.currentTimeMs(); + if (AbstractIndexCache.method4585() && -1L == Login.field472) { + Login.field472 = var15; + if (Login.field472 > Login.field471) { + Login.field471 = Login.field472; } } - if(Client.gameState == 10 || Client.gameState == 11) { - if(Client.language == 0) { - 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()) { + if (Client.gameState == 10 || Client.gameState == 11) { + if (Client.language == 0) { + if (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { + var1 = Login.xPadding + 5; + short var16 = 463; + byte var6 = 100; + byte var7 = 35; + if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + var6 && MouseHandler.MouseHandler_lastPressedY >= var16 && MouseHandler.MouseHandler_lastPressedY <= var7 + var16) { + if (ClientParameter.loadWorlds()) { Login.worldSelectOpen = true; Login.worldSelectPage = 0; Login.worldSelectPagesCount = 0; @@ -168,56 +81,56 @@ public final class class54 { } } - if(FriendLoginUpdate.__kn_x != null && ClientParameter.loadWorlds()) { + if (FriendLoginUpdate.field356 != null && ClientParameter.loadWorlds()) { Login.worldSelectOpen = true; Login.worldSelectPage = 0; Login.worldSelectPagesCount = 0; } } - var3 = MouseHandler.MouseHandler_lastButton; - var15 = MouseHandler.MouseHandler_lastPressedX; - int var16 = MouseHandler.MouseHandler_lastPressedY; - if(var3 == 0) { - var15 = MouseHandler.MouseHandler_x; - var16 = MouseHandler.MouseHandler_y; + var1 = MouseHandler.MouseHandler_lastButton; + var2 = MouseHandler.MouseHandler_lastPressedX; + int var17 = MouseHandler.MouseHandler_lastPressedY; + if (var1 == 0) { + var2 = MouseHandler.MouseHandler_x; + var17 = MouseHandler.MouseHandler_y; } - if(!AbstractRasterProvider.mouseCam && var3 == 4) { - var3 = 1; + if (!AbstractRasterProvider.mouseCam && var1 == 4) { + var1 = 1; } - int var7; - short var8; - if(Login.loginIndex == 0) { - boolean var17 = false; + int var18; + short var19; + if (Login.loginIndex == 0) { + boolean var8 = false; - while(Decimator.method2490()) { - if(IndexStoreAction.__ik_cn == 84) { - var17 = true; + while (Decimator.method2490()) { + if (IndexStoreAction.field411 == 84) { + var8 = true; } } - var7 = Varps.loginBoxCenter - 80; - var8 = 291; - if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) { + var18 = Varps.loginBoxCenter - 80; + var19 = 291; + if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) { WorldMapCacheName.method635(Message.method1227("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); } - var7 = Varps.loginBoxCenter + 80; - if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20 || var17) { - if((Client.worldProperties & 0x2000000) != 0) { + var18 = Varps.loginBoxCenter + 80; + if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20 || var8) { + if ((Client.worldProperties & 33554432) != 0) { Login.Login_response0 = ""; Login.Login_response1 = "This is a Beta world."; Login.Login_response2 = "Your normal account will not be affected."; Login.Login_response3 = ""; Login.loginIndex = 1; class196.method3740(); - } else if((Client.worldProperties & 4) != 0) { - if((Client.worldProperties & 1024) != 0) { + } else if ((Client.worldProperties & 4) != 0) { + if ((Client.worldProperties & 1024) != 0) { Login.Login_response1 = "This is a High Risk PvP world."; Login.Login_response2 = "Players can attack each other almost everywhere"; - Login.Login_response3 = "and the Protect Item prayer won\'t work."; + Login.Login_response3 = "and the Protect Item prayer won't work."; } else { Login.Login_response1 = "This is a PvP world."; Login.Login_response2 = "Players can attack each other"; @@ -227,7 +140,7 @@ public final class class54 { Login.Login_response0 = "Warning!"; Login.loginIndex = 1; class196.method3740(); - } else if((Client.worldProperties & 1024) != 0) { + } else if ((Client.worldProperties & 1024) != 0) { Login.Login_response1 = "This is a High Risk world."; Login.Login_response2 = "The Protect Item prayer will"; Login.Login_response3 = "not work on this world."; @@ -239,30 +152,30 @@ public final class class54 { } } } else { - int var18; - short var20; - if(Login.loginIndex != 1) { - boolean var9; - int var10; - short var19; - if(Login.loginIndex == 2) { - var19 = 201; - var18 = var19 + 52; - if(var3 == 1 && var16 >= var18 - 12 && var16 < var18 + 2) { + short var9; + int var20; + if (Login.loginIndex != 1) { + boolean var10; + int var11; + short var12; + if (Login.loginIndex == 2) { + var12 = 201; + var20 = var12 + 52; + if (var1 == 1 && var17 >= var20 - 12 && var17 < var20 + 2) { Login.currentLoginField = 0; } - var18 += 15; - if(var3 == 1 && var16 >= var18 - 12 && var16 < var18 + 2) { + var20 += 15; + if (var1 == 1 && var17 >= var20 - 12 && var17 < var20 + 2) { Login.currentLoginField = 1; } - var18 += 15; - var19 = 361; - if(TilePaint.__eb_ah != null) { - var7 = TilePaint.__eb_ah.__q / 2; - if(var3 == 1 && var15 >= TilePaint.__eb_ah.__m - var7 && var15 <= var7 + TilePaint.__eb_ah.__m && var16 >= var19 - 15 && var16 < var19) { - switch(Login.__cu_ac) { + var20 += 15; + var12 = 361; + if (TilePaint.field907 != null) { + var18 = TilePaint.field907.field43 / 2; + if (var1 == 1 && var2 >= TilePaint.field907.field41 - var18 && var2 <= var18 + TilePaint.field907.field41 && var17 >= var12 - 15 && var17 < var12) { + switch(Login.field467) { case 1: method1089("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); Login.loginIndex = 5; @@ -273,16 +186,16 @@ public final class class54 { } } - var7 = Varps.loginBoxCenter - 80; - var8 = 321; - if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) { + var18 = Varps.loginBoxCenter - 80; + var19 = 321; + if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) { Login.Login_username = Login.Login_username.trim(); - if(Login.Login_username.length() == 0) { + if (Login.Login_username.length() == 0) { method1089("", "Please enter your username/email address.", ""); return; } - if(Login.Login_password.length() == 0) { + if (Login.Login_password.length() == 0) { method1089("", "Please enter your password.", ""); return; } @@ -293,33 +206,33 @@ public final class class54 { return; } - var7 = Login.loginBoxX + 180 + 80; - if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) { + var18 = Login.loginBoxX + 180 + 80; + if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) { Login.loginIndex = 0; Login.Login_username = ""; Login.Login_password = ""; class13.otpInt = 0; Login.otp = ""; - Login.__cu_ba = true; + Login.field470 = true; } - var7 = Varps.loginBoxCenter + -117; - var8 = 277; - Login.__cu_aa = var15 >= var7 && var15 < var7 + class168.optionButtonSpriteSubWidth && var16 >= var8 && var16 < var8 + GroundItemPile.optionButtonSpriteSubHeight; - if(var3 == 1 && Login.__cu_aa) { + var18 = Varps.loginBoxCenter + -117; + var19 = 277; + Login.field468 = var2 >= var18 && var2 < var18 + class168.optionButtonSpriteSubWidth && var17 >= var19 && var17 < var19 + GroundItemPile.optionButtonSpriteSubHeight; + if (var1 == 1 && Login.field468) { Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; - if(!Client.Login_isUsernameRemembered && ReflectionCheck.clientPreferences.rememberedUsername != null) { + if (!Client.Login_isUsernameRemembered && ReflectionCheck.clientPreferences.rememberedUsername != null) { ReflectionCheck.clientPreferences.rememberedUsername = null; WorldMapSection0.savePreferences(); } } - var7 = Varps.loginBoxCenter + 24; - var8 = 277; - Login.__cu_ax = var15 >= var7 && var15 < var7 + class168.optionButtonSpriteSubWidth && var16 >= var8 && var16 < var8 + GroundItemPile.optionButtonSpriteSubHeight; - if(var3 == 1 && Login.__cu_ax) { + var18 = Varps.loginBoxCenter + 24; + var19 = 277; + Login.field469 = var2 >= var18 && var2 < var18 + class168.optionButtonSpriteSubWidth && var17 >= var19 && var17 < var19 + GroundItemPile.optionButtonSpriteSubHeight; + if (var1 == 1 && Login.field469) { ReflectionCheck.clientPreferences.hideUsername = !ReflectionCheck.clientPreferences.hideUsername; - if(!ReflectionCheck.clientPreferences.hideUsername) { + if (!ReflectionCheck.clientPreferences.hideUsername) { Login.Login_username = ""; ReflectionCheck.clientPreferences.rememberedUsername = null; class196.method3740(); @@ -328,53 +241,53 @@ public final class class54 { WorldMapSection0.savePreferences(); } - while(true) { - while(Decimator.method2490()) { - var9 = false; + while (true) { + while (Decimator.method2490()) { + var10 = false; - for(var10 = 0; var10 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:\'@#~,<.>/?\\| ".length(); ++var10) { - if(GzipDecompressor.__go_ck == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:\'@#~,<.>/?\\| ".charAt(var10)) { - var9 = true; + for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { + if (GzipDecompressor.field378 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { + var10 = true; break; } } - if(IndexStoreAction.__ik_cn == 13) { + if (IndexStoreAction.field411 == 13) { Login.loginIndex = 0; Login.Login_username = ""; Login.Login_password = ""; class13.otpInt = 0; Login.otp = ""; - Login.__cu_ba = true; - } else if(Login.currentLoginField == 0) { - if(IndexStoreAction.__ik_cn == 85 && Login.Login_username.length() > 0) { + Login.field470 = true; + } else if (Login.currentLoginField == 0) { + if (IndexStoreAction.field411 == 85 && Login.Login_username.length() > 0) { Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); } - if(IndexStoreAction.__ik_cn == 84 || IndexStoreAction.__ik_cn == 80) { + if (IndexStoreAction.field411 == 84 || IndexStoreAction.field411 == 80) { Login.currentLoginField = 1; } - if(var9 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + GzipDecompressor.__go_ck; + if (var10 && Login.Login_username.length() < 320) { + Login.Login_username = Login.Login_username + GzipDecompressor.field378; } - } else if(Login.currentLoginField == 1) { - if(IndexStoreAction.__ik_cn == 85 && Login.Login_password.length() > 0) { + } else if (Login.currentLoginField == 1) { + if (IndexStoreAction.field411 == 85 && Login.Login_password.length() > 0) { Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); } - if(IndexStoreAction.__ik_cn == 84 || IndexStoreAction.__ik_cn == 80) { + if (IndexStoreAction.field411 == 84 || IndexStoreAction.field411 == 80) { Login.currentLoginField = 0; } - if(IndexStoreAction.__ik_cn == 84) { + if (IndexStoreAction.field411 == 84) { Login.Login_username = Login.Login_username.trim(); - if(Login.Login_username.length() == 0) { + if (Login.Login_username.length() == 0) { method1089("", "Please enter your username/email address.", ""); return; } - if(Login.Login_password.length() == 0) { + if (Login.Login_password.length() == 0) { method1089("", "Please enter your password.", ""); return; } @@ -385,36 +298,38 @@ public final class class54 { return; } - if(var9 && Login.Login_password.length() < 20) { - Login.Login_password = Login.Login_password + GzipDecompressor.__go_ck; + if (var10 && Login.Login_password.length() < 20) { + Login.Login_password = Login.Login_password + GzipDecompressor.field378; } } } return; } - } else if(Login.loginIndex == 3) { - var18 = Login.loginBoxX + 180; - var20 = 276; - if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { + } + + if (Login.loginIndex == 3) { + var20 = Login.loginBoxX + 180; + var9 = 276; + if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { MouseHandler.method1084(false); } - var18 = Login.loginBoxX + 180; - var20 = 326; - if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { + var20 = Login.loginBoxX + 180; + var9 = 326; + if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { method1089("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); Login.loginIndex = 5; return; } } else { - int var22; - if(Login.loginIndex == 4) { - var18 = Login.loginBoxX + 180 - 80; - var20 = 321; - if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { + int var13; + if (Login.loginIndex == 4) { + var20 = Login.loginBoxX + 180 - 80; + var9 = 321; + if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { Login.otp.trim(); - if(Login.otp.length() != 6) { + if (Login.otp.length() != 6) { method1089("", "Please enter a 6-digit PIN.", ""); return; } @@ -427,16 +342,16 @@ public final class class54 { return; } - if(var3 == 1 && var15 >= Login.loginBoxX + 180 - 9 && var15 <= Login.loginBoxX + 180 + 130 && var16 >= 263 && var16 <= 296) { - Login.__cu_ba = !Login.__cu_ba; + if (var1 == 1 && var2 >= Login.loginBoxX + 180 - 9 && var2 <= Login.loginBoxX + 180 + 130 && var17 >= 263 && var17 <= 296) { + Login.field470 = !Login.field470; } - if(var3 == 1 && var15 >= Login.loginBoxX + 180 - 34 && var15 <= Login.loginBoxX + 34 + 180 && var16 >= 351 && var16 <= 363) { + if (var1 == 1 && var2 >= Login.loginBoxX + 180 - 34 && var2 <= Login.loginBoxX + 34 + 180 && var17 >= 351 && var17 <= 363) { WorldMapCacheName.method635(Message.method1227("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); } - var18 = Login.loginBoxX + 180 + 80; - if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { + var20 = Login.loginBoxX + 180 + 80; + if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { Login.loginIndex = 0; Login.Login_username = ""; Login.Login_password = ""; @@ -444,30 +359,30 @@ public final class class54 { Login.otp = ""; } - while(Decimator.method2490()) { - boolean var21 = false; + while (Decimator.method2490()) { + boolean var14 = false; - for(var22 = 0; var22 < "1234567890".length(); ++var22) { - if(GzipDecompressor.__go_ck == "1234567890".charAt(var22)) { - var21 = true; + for (var13 = 0; var13 < "1234567890".length(); ++var13) { + if (GzipDecompressor.field378 == "1234567890".charAt(var13)) { + var14 = true; break; } } - if(IndexStoreAction.__ik_cn == 13) { + if (IndexStoreAction.field411 == 13) { Login.loginIndex = 0; Login.Login_username = ""; Login.Login_password = ""; class13.otpInt = 0; Login.otp = ""; } else { - if(IndexStoreAction.__ik_cn == 85 && Login.otp.length() > 0) { + if (IndexStoreAction.field411 == 85 && Login.otp.length() > 0) { Login.otp = Login.otp.substring(0, Login.otp.length() - 1); } - if(IndexStoreAction.__ik_cn == 84) { + if (IndexStoreAction.field411 == 84) { Login.otp.trim(); - if(Login.otp.length() != 6) { + if (Login.otp.length() != 6) { method1089("", "Please enter a 6-digit PIN.", ""); return; } @@ -480,156 +395,222 @@ public final class class54 { return; } - if(var21 && Login.otp.length() < 6) { - Login.otp = Login.otp + GzipDecompressor.__go_ck; + if (var14 && Login.otp.length() < 6) { + Login.otp = Login.otp + GzipDecompressor.field378; } } } - } else if(Login.loginIndex == 5) { - var18 = Login.loginBoxX + 180 - 80; - var20 = 321; - if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { - NpcDefinition.method5162(); + } else if (Login.loginIndex == 5) { + var20 = Login.loginBoxX + 180 - 80; + var9 = 321; + if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + NPCDefinition.method5162(); return; } - var18 = Login.loginBoxX + 180 + 80; - if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { + var20 = Login.loginBoxX + 180 + 80; + if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { MouseHandler.method1084(true); } - var8 = 361; - if(UrlRequester.__eo_ak != null) { - var22 = UrlRequester.__eo_ak.__q / 2; - if(var3 == 1 && var15 >= UrlRequester.__eo_ak.__m - var22 && var15 <= var22 + UrlRequester.__eo_ak.__m && var16 >= var8 - 15 && var16 < var8) { + var19 = 361; + if (UrlRequester.field930 != null) { + var13 = UrlRequester.field930.field43 / 2; + if (var1 == 1 && var2 >= UrlRequester.field930.field41 - var13 && var2 <= var13 + UrlRequester.field930.field41 && var17 >= var19 - 15 && var17 < var19) { WorldMapCacheName.method635(Message.method1227("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); } } - while(Decimator.method2490()) { - var9 = false; + while (Decimator.method2490()) { + var10 = false; - for(var10 = 0; var10 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:\'@#~,<.>/?\\| ".length(); ++var10) { - if(GzipDecompressor.__go_ck == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:\'@#~,<.>/?\\| ".charAt(var10)) { - var9 = true; + for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { + if (GzipDecompressor.field378 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { + var10 = true; break; } } - if(IndexStoreAction.__ik_cn == 13) { + if (IndexStoreAction.field411 == 13) { MouseHandler.method1084(true); } else { - if(IndexStoreAction.__ik_cn == 85 && Login.Login_username.length() > 0) { + if (IndexStoreAction.field411 == 85 && Login.Login_username.length() > 0) { Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); } - if(IndexStoreAction.__ik_cn == 84) { - NpcDefinition.method5162(); + if (IndexStoreAction.field411 == 84) { + NPCDefinition.method5162(); return; } - if(var9 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + GzipDecompressor.__go_ck; + if (var10 && Login.Login_username.length() < 320) { + Login.Login_username = Login.Login_username + GzipDecompressor.field378; } } } - } else if(Login.loginIndex == 6) { - while(true) { - do { - if(!Decimator.method2490()) { - var19 = 321; - if(var3 == 1 && var16 >= var19 - 20 && var16 <= var19 + 20) { - MouseHandler.method1084(true); + } else { + if (Login.loginIndex == 6) { + while (true) { + do { + if (!Decimator.method2490()) { + var12 = 321; + if (var1 == 1 && var17 >= var12 - 20 && var17 <= var12 + 20) { + MouseHandler.method1084(true); + } + + return; } + } while(IndexStoreAction.field411 != 84 && IndexStoreAction.field411 != 13); - return; - } - } while(IndexStoreAction.__ik_cn != 84 && IndexStoreAction.__ik_cn != 13); - - MouseHandler.method1084(true); - } - } else if(Login.loginIndex == 7) { - 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); - method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; + MouseHandler.method1084(true); + } } - 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.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); - method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } + if (Login.loginIndex == 7) { + var20 = Login.loginBoxX + 180 - 80; + var9 = 321; + if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + WorldMapCacheName.method635(Message.method1227("secure", true) + "m=dob/set_dob.ws", true, false); + method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Login.loginIndex = 6; + return; + } - 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 == 12) { - String var14 = ""; - switch(Login.__cu_aj) { - case 0: - var14 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; - break; - case 1: - var14 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; - break; - default: - MouseHandler.method1084(false); - } + var20 = Login.loginBoxX + 180 + 80; + if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + MouseHandler.method1084(true); + } + } else if (Login.loginIndex == 8) { + var20 = Login.loginBoxX + 180 - 80; + var9 = 321; + if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + WorldMapCacheName.method635("https://www.jagex.com/terms/privacy/#eight", true, false); + method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Login.loginIndex = 6; + return; + } - 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); - method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } + var20 = Login.loginBoxX + 180 + 80; + if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + MouseHandler.method1084(true); + } + } else if (Login.loginIndex == 12) { + String var21 = ""; + switch(Login.field466) { + case 0: + var21 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; + break; + case 1: + var21 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; + break; + default: + MouseHandler.method1084(false); + } - var7 = Login.loginBoxX + 180; - var8 = 326; - if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) { - MouseHandler.method1084(false); + var18 = Login.loginBoxX + 180; + var19 = 276; + if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) { + WorldMapCacheName.method635(var21, true, false); + method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Login.loginIndex = 6; + return; + } + + var18 = Login.loginBoxX + 180; + var19 = 326; + if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) { + MouseHandler.method1084(false); + } } } } } else { - while(Decimator.method2490()) { - if(IndexStoreAction.__ik_cn == 84) { + while (Decimator.method2490()) { + if (IndexStoreAction.field411 == 84) { MouseHandler.method1084(false); - } else if(IndexStoreAction.__ik_cn == 13) { + } else if (IndexStoreAction.field411 == 13) { Login.loginIndex = 0; } } - var18 = Varps.loginBoxCenter - 80; - var20 = 321; - if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { + var20 = Varps.loginBoxCenter - 80; + var9 = 321; + if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { MouseHandler.method1084(false); } - var18 = Varps.loginBoxCenter + 80; - if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { + var20 = Varps.loginBoxCenter + 80; + if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { Login.loginIndex = 0; } } } + } + } + } else { + while (true) { + if (!Decimator.method2490()) { + if (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { + int var3 = Login.xPadding + 280; + if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + Interpreter.changeWorldSelectSorting(0, 0); + } else if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + Interpreter.changeWorldSelectSorting(0, 1); + } else { + int var4 = Login.xPadding + 390; + if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + Interpreter.changeWorldSelectSorting(1, 0); + } else if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + Interpreter.changeWorldSelectSorting(1, 1); + } else { + var1 = Login.xPadding + 500; + if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + Interpreter.changeWorldSelectSorting(2, 0); + } else if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + Interpreter.changeWorldSelectSorting(2, 1); + } else { + var2 = Login.xPadding + 610; + if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + Interpreter.changeWorldSelectSorting(3, 0); + } else if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + Interpreter.changeWorldSelectSorting(3, 1); + } else if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { + FontName.closeWorldSelect(); + } else if (Login.hoveredWorldIndex != -1) { + World var5 = ItemContainer.worlds[Login.hoveredWorldIndex]; + class31.changeWorld(var5); + FontName.closeWorldSelect(); + } else { + 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.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.field411 == 13) { + FontName.closeWorldSelect(); + break; + } + + if (IndexStoreAction.field411 == 96) { + if (Login.worldSelectPage > 0 && SecureRandomFuture.worldSelectLeftSprite != null) { + --Login.worldSelectPage; + } + } else if (IndexStoreAction.field411 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && NetSocket.worldSelectRightSprite != null) { + ++Login.worldSelectPage; } } } + } @ObfuscatedName("d") @@ -650,155 +631,155 @@ public final class class54 { ) static int method1093(int var0, Script var1, boolean var2) { int var3; - if(var0 == 6600) { + if (var0 == 6600) { var3 = SoundSystem.plane; - int var9 = (Canvas.localPlayer.x >> 7) + class50.baseX; - int var5 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY; - BufferedFile.worldMap().__a_525(var3, var9, var5, true); + int var13 = (Canvas.localPlayer.x >> 7) + class50.baseX; + int var16 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY; + BufferedFile.worldMap().method366(var3, var13, var16, true); return 1; } else { - WorldMapArea var11; - if(var0 == 6601) { + WorldMapArea var4; + if (var0 == 6601) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - String var16 = ""; - var11 = BufferedFile.worldMap().getMapArea(var3); - if(var11 != null) { - var16 = var11.name(); + String var14 = ""; + var4 = BufferedFile.worldMap().getMapArea(var3); + if (var4 != null) { + var14 = var4.name(); } - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var14; return 1; - } else if(var0 == 6602) { + } else if (var0 == 6602) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; BufferedFile.worldMap().setCurrentMapAreaId(var3); return 1; - } else if(var0 == 6603) { + } else if (var0 == 6603) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getZoomLevel(); return 1; - } else if(var0 == 6604) { + } else if (var0 == 6604) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; BufferedFile.worldMap().setZoomLevel(var3); return 1; - } else if(var0 == 6605) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isCacheLoaded()?1:0; + } else if (var0 == 6605) { + 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[--RouteStrategy.Interpreter_intStackSize]); - BufferedFile.worldMap().setWorldMapPositionTarget(var15.x, var15.y); + TileLocation var5; + if (var0 == 6606) { + var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + BufferedFile.worldMap().setWorldMapPositionTarget(var5.x, var5.y); return 1; - } else if(var0 == 6607) { - var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - BufferedFile.worldMap().__aw_531(var15.x, var15.y); + } else if (var0 == 6607) { + var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + BufferedFile.worldMap().method371(var5.x, var5.y); return 1; - } else if(var0 == 6608) { - var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - BufferedFile.worldMap().__al_532(var15.plane, var15.x, var15.y); + } else if (var0 == 6608) { + var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + BufferedFile.worldMap().method372(var5.plane, var5.x, var5.y); return 1; - } else if(var0 == 6609) { - var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - BufferedFile.worldMap().__ab_533(var15.plane, var15.x, var15.y); + } else if (var0 == 6609) { + var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + BufferedFile.worldMap().method373(var5.plane, var5.x, var5.y); return 1; - } else if(var0 == 6610) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__ae_534(); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__at_535(); + } else if (var0 == 6610) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method374(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method375(); return 1; } else { - WorldMapArea var13; - if(var0 == 6611) { + WorldMapArea var6; + if (var0 == 6611) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var13 = BufferedFile.worldMap().getMapArea(var3); - if(var13 == null) { + var6 = BufferedFile.worldMap().getMapArea(var3); + if (var6 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.origin().packed(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.origin().packed(); } return 1; - } else if(var0 == 6612) { + } else if (var0 == 6612) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var13 = BufferedFile.worldMap().getMapArea(var3); - if(var13 == null) { + var6 = BufferedFile.worldMap().getMapArea(var3); + if (var6 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } else { - 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; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var6.maxX() - var6.minX() + 1) * 64; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var6.maxY() - var6.minY() + 1) * 64; } return 1; - } else if(var0 == 6613) { + } else if (var0 == 6613) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var13 = BufferedFile.worldMap().getMapArea(var3); - if(var13 == null) { + var6 = BufferedFile.worldMap().getMapArea(var3); + if (var6 == null) { 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[++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; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.minX() * 64; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.minY() * 64; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.maxX() * 64 + 64 - 1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.maxY() * 64 + 64 - 1; } return 1; - } else if(var0 == 6614) { + } else if (var0 == 6614) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var13 = BufferedFile.worldMap().getMapArea(var3); - if(var13 == null) { + var6 = BufferedFile.worldMap().getMapArea(var3); + if (var6 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.zoom(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.zoom(); } return 1; - } else if(var0 == 6615) { - var15 = BufferedFile.worldMap().__ad_536(); - if(var15 == null) { + } else if (var0 == 6615) { + var5 = BufferedFile.worldMap().method376(); + if (var5 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15.x; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15.y; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var5.x; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var5.y; } return 1; - } else if(var0 == 6616) { + } else if (var0 == 6616) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().currentMapAreaId(); return 1; - } else if(var0 == 6617) { - var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - var13 = BufferedFile.worldMap().getCurrentMapArea(); - if(var13 == null) { + } else if (var0 == 6617) { + var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + var6 = BufferedFile.worldMap().getCurrentMapArea(); + if (var6 == null) { 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) { + int[] var15 = var6.position(var5.plane, var5.x, var5.y); + if (var15 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var14[0]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var14[1]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15[0]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15[1]; } return 1; } } else { TileLocation var7; - if(var0 == 6618) { - var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - var13 = BufferedFile.worldMap().getCurrentMapArea(); - if(var13 == null) { + if (var0 == 6618) { + var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + var6 = BufferedFile.worldMap().getCurrentMapArea(); + if (var6 == null) { 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) { + var7 = var6.coord(var5.x, var5.y); + if (var7 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.packed(); @@ -807,109 +788,109 @@ public final class class54 { return 1; } } else { - TileLocation var12; - if(var0 == 6619) { + TileLocation var8; + if (var0 == 6619) { 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); + var8 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); + TotalQuantityComparator.method96(var3, var8, false); return 1; - } else if(var0 == 6620) { + } else if (var0 == 6620) { 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); + var8 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); + TotalQuantityComparator.method96(var3, var8, true); return 1; - } else if(var0 == 6621) { + } else if (var0 == 6621) { 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) { + var8 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); + var4 = BufferedFile.worldMap().getMapArea(var3); + if (var4 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; return 1; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y)?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.containsCoord(var8.plane, var8.x, var8.y) ? 1 : 0; return 1; } - } else if(var0 == 6622) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__ap_537(); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__as_538(); + } else if (var0 == 6622) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method377(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method378(); return 1; - } else if(var0 == 6623) { - var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - var13 = BufferedFile.worldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y); - if(var13 == null) { + } else if (var0 == 6623) { + var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + var6 = BufferedFile.worldMap().mapAreaAtCoord(var5.plane, var5.x, var5.y); + if (var6 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.id(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.id(); } return 1; - } else if(var0 == 6624) { - BufferedFile.worldMap().__am_539(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + } else if (var0 == 6624) { + BufferedFile.worldMap().method379(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); return 1; - } else if(var0 == 6625) { - BufferedFile.worldMap().__an_540(); + } else if (var0 == 6625) { + BufferedFile.worldMap().method380(); return 1; - } else if(var0 == 6626) { - BufferedFile.worldMap().__az_541(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + } else if (var0 == 6626) { + BufferedFile.worldMap().method381(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); return 1; - } else if(var0 == 6627) { - BufferedFile.worldMap().__au_542(); + } else if (var0 == 6627) { + BufferedFile.worldMap().method382(); return 1; } else { - boolean var10; - if(var0 == 6628) { - var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - BufferedFile.worldMap().perpetualFlash(var10); + boolean var9; + if (var0 == 6628) { + var9 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + BufferedFile.worldMap().perpetualFlash(var9); return 1; - } else if(var0 == 6629) { + } else if (var0 == 6629) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; BufferedFile.worldMap().flashElement(var3); return 1; - } else if(var0 == 6630) { + } else if (var0 == 6630) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; BufferedFile.worldMap().flashCategory(var3); return 1; - } else if(var0 == 6631) { + } else if (var0 == 6631) { BufferedFile.worldMap().stopCurrentFlashes(); return 1; - } else if(var0 == 6632) { - var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - BufferedFile.worldMap().setElementsEnabled(var10); + } else if (var0 == 6632) { + var9 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + BufferedFile.worldMap().setElementsEnabled(var9); return 1; } else { - boolean var4; - if(var0 == 6633) { + boolean var10; + if (var0 == 6633) { 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); + var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1; + BufferedFile.worldMap().disableElement(var3, var10); return 1; - } else if(var0 == 6634) { + } else if (var0 == 6634) { 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); + var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1; + BufferedFile.worldMap().disableCategory(var3, var10); return 1; - } else if(var0 == 6635) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getElementsEnabled()?1:0; + } else if (var0 == 6635) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getElementsEnabled() ? 1 : 0; return 1; - } else if(var0 == 6636) { + } else if (var0 == 6636) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isElementDisabled(var3)?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isElementDisabled(var3) ? 1 : 0; return 1; - } else if(var0 == 6637) { + } else if (var0 == 6637) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isCategoryDisabled(var3)?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isCategoryDisabled(var3) ? 1 : 0; return 1; - } else if(var0 == 6638) { + } else if (var0 == 6638) { 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) { + var8 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); + var7 = BufferedFile.worldMap().method385(var3, var8); + if (var7 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.packed(); @@ -917,73 +898,73 @@ public final class class54 { return 1; } else { - AbstractWorldMapIcon var8; - if(var0 == 6639) { - var8 = BufferedFile.worldMap().iconStart(); - if(var8 == null) { + AbstractWorldMapIcon var11; + if (var0 == 6639) { + var11 = BufferedFile.worldMap().iconStart(); + if (var11 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var8.__m_15(); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var8.coord2.packed(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.vmethod395(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.coord2.packed(); } return 1; - } else if(var0 == 6640) { - var8 = BufferedFile.worldMap().iconNext(); - if(var8 == null) { + } else if (var0 == 6640) { + var11 = BufferedFile.worldMap().iconNext(); + if (var11 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var8.__m_15(); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var8.coord2.packed(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.vmethod395(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.coord2.packed(); } return 1; } else { - WorldMapElement var6; - if(var0 == 6693) { + WorldMapElement var12; + if (var0 == 6693) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var6 = ViewportMouse.getWorldMapElement(var3); - if(var6.__l == null) { + var12 = ViewportMouse.getWorldMapElement(var3); + if (var12.field1021 == null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.__l; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12.field1021; } return 1; - } else if(var0 == 6694) { + } else if (var0 == 6694) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var6 = ViewportMouse.getWorldMapElement(var3); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.textSize; + var12 = ViewportMouse.getWorldMapElement(var3); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12.textSize; return 1; - } else if(var0 == 6695) { + } else if (var0 == 6695) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var6 = ViewportMouse.getWorldMapElement(var3); - if(var6 == null) { + var12 = ViewportMouse.getWorldMapElement(var3); + if (var12 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.category; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12.category; } return 1; - } else if(var0 == 6696) { + } else if (var0 == 6696) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var6 = ViewportMouse.getWorldMapElement(var3); - if(var6 == null) { + var12 = ViewportMouse.getWorldMapElement(var3); + if (var12 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.sprite1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12.sprite1; } return 1; - } else if(var0 == 6697) { + } else if (var0 == 6697) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class15.worldMapEvent.mapElement; return 1; - } else if(var0 == 6698) { + } else if (var0 == 6698) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class15.worldMapEvent.coord1.packed(); return 1; - } else if(var0 == 6699) { + } else if (var0 == 6699) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class15.worldMapEvent.coord2.packed(); return 1; } else { @@ -1012,19 +993,19 @@ public final class class54 { int var3; int var4; int var5; - if(Client.oculusOrbState == 0) { + if (Client.oculusOrbState == 0) { var0 = Canvas.localPlayer.x; var1 = Canvas.localPlayer.y; - if(MouseHandler.oculusOrbFocalPointX - var0 < -500 || MouseHandler.oculusOrbFocalPointX - var0 > 500 || ScriptEvent.oculusOrbFocalPointY - var1 < -500 || ScriptEvent.oculusOrbFocalPointY - var1 > 500) { + if (MouseHandler.oculusOrbFocalPointX - var0 < -500 || MouseHandler.oculusOrbFocalPointX - var0 > 500 || ScriptEvent.oculusOrbFocalPointY - var1 < -500 || ScriptEvent.oculusOrbFocalPointY - var1 > 500) { MouseHandler.oculusOrbFocalPointX = var0; ScriptEvent.oculusOrbFocalPointY = var1; } - if(var0 != MouseHandler.oculusOrbFocalPointX) { + if (var0 != MouseHandler.oculusOrbFocalPointX) { MouseHandler.oculusOrbFocalPointX += (var0 - MouseHandler.oculusOrbFocalPointX) / 16; } - if(var1 != ScriptEvent.oculusOrbFocalPointY) { + if (var1 != ScriptEvent.oculusOrbFocalPointY) { ScriptEvent.oculusOrbFocalPointY += (var1 - ScriptEvent.oculusOrbFocalPointY) / 16; } @@ -1033,16 +1014,16 @@ public final class class54 { var4 = class32.getTileHeight(MouseHandler.oculusOrbFocalPointX, ScriptEvent.oculusOrbFocalPointY, SoundSystem.plane); var5 = 0; int var6; - if(var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { - for(var6 = var2 - 4; var6 <= var2 + 4; ++var6) { - for(int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { + if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { + for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) { + for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { int var8 = SoundSystem.plane; - if(var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { + if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { ++var8; } int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; - if(var9 > var5) { + if (var9 > var5) { var5 = var9; } } @@ -1050,148 +1031,148 @@ public final class class54 { } var6 = var5 * 192; - if(var6 > 98048) { + if (var6 > 98048) { var6 = 98048; } - if(var6 < 32768) { + if (var6 < 32768) { var6 = 32768; } - if(var6 > Client.__client_ik) { - Client.__client_ik += (var6 - Client.__client_ik) / 24; - } else if(var6 < Client.__client_ik) { - Client.__client_ik += (var6 - Client.__client_ik) / 80; + if (var6 > Client.field202) { + Client.field202 += (var6 - Client.field202) / 24; + } else if (var6 < Client.field202) { + Client.field202 += (var6 - Client.field202) / 80; } - MouseRecorder.__bu_hy = class32.getTileHeight(Canvas.localPlayer.x, Canvas.localPlayer.y, SoundSystem.plane) - Client.cameraFollowHeight; - } else if(Client.oculusOrbState == 1) { - if(Client.__client_ij && Canvas.localPlayer != null) { + MouseRecorder.field566 = class32.getTileHeight(Canvas.localPlayer.x, Canvas.localPlayer.y, SoundSystem.plane) - Client.cameraFollowHeight; + } else if (Client.oculusOrbState == 1) { + if (Client.field199 && Canvas.localPlayer != null) { var0 = Canvas.localPlayer.pathX[0]; var1 = Canvas.localPlayer.pathY[0]; - if(var0 >= 0 && var1 >= 0 && var0 < 104 && var1 < 104) { + if (var0 >= 0 && var1 >= 0 && var0 < 104 && var1 < 104) { MouseHandler.oculusOrbFocalPointX = Canvas.localPlayer.x; var2 = class32.getTileHeight(Canvas.localPlayer.x, Canvas.localPlayer.y, SoundSystem.plane) - Client.cameraFollowHeight; - if(var2 < MouseRecorder.__bu_hy) { - MouseRecorder.__bu_hy = var2; + if (var2 < MouseRecorder.field566) { + MouseRecorder.field566 = var2; } ScriptEvent.oculusOrbFocalPointY = Canvas.localPlayer.y; - Client.__client_ij = false; + Client.field199 = false; } } - short var10 = -1; - if(KeyHandler.KeyHandler_pressedKeys[33]) { - var10 = 0; - } else if(KeyHandler.KeyHandler_pressedKeys[49]) { - var10 = 1024; + short var11 = -1; + if (KeyHandler.KeyHandler_pressedKeys[33]) { + var11 = 0; + } else if (KeyHandler.KeyHandler_pressedKeys[49]) { + var11 = 1024; } - if(KeyHandler.KeyHandler_pressedKeys[48]) { - if(var10 == 0) { - var10 = 1792; - } else if(var10 == 1024) { - var10 = 1280; + if (KeyHandler.KeyHandler_pressedKeys[48]) { + if (var11 == 0) { + var11 = 1792; + } else if (var11 == 1024) { + var11 = 1280; } else { - var10 = 1536; + var11 = 1536; } - } else if(KeyHandler.KeyHandler_pressedKeys[50]) { - if(var10 == 0) { - var10 = 256; - } else if(var10 == 1024) { - var10 = 768; + } else if (KeyHandler.KeyHandler_pressedKeys[50]) { + if (var11 == 0) { + var11 = 256; + } else if (var11 == 1024) { + var11 = 768; } else { - var10 = 512; + var11 = 512; } } - byte var11 = 0; - if(KeyHandler.KeyHandler_pressedKeys[35]) { - var11 = -1; - } else if(KeyHandler.KeyHandler_pressedKeys[51]) { - var11 = 1; + byte var10 = 0; + if (KeyHandler.KeyHandler_pressedKeys[35]) { + var10 = -1; + } else if (KeyHandler.KeyHandler_pressedKeys[51]) { + var10 = 1; } var2 = 0; - if(var10 >= 0 || var11 != 0) { - var2 = KeyHandler.KeyHandler_pressedKeys[81]?Client.__client_in:Client.oculusOrbNormalSpeed; + if (var11 >= 0 || var10 != 0) { + var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.field197 : Client.oculusOrbNormalSpeed; var2 *= 16; - Client.__client_hk = var10; - Client.__client_if = var11; + Client.field195 = var11; + Client.field196 = var10; } - if(Client.__client_hc < var2) { - Client.__client_hc += var2 / 8; - if(Client.__client_hc > var2) { - Client.__client_hc = var2; + if (Client.field194 < var2) { + Client.field194 += var2 / 8; + if (Client.field194 > var2) { + Client.field194 = var2; } - } else if(Client.__client_hc > var2) { - Client.__client_hc = Client.__client_hc * 9 / 10; + } else if (Client.field194 > var2) { + Client.field194 = Client.field194 * 9 / 10; } - if(Client.__client_hc > 0) { - var3 = Client.__client_hc / 16; - if(Client.__client_hk >= 0) { - var0 = Client.__client_hk - MusicPatchNode.cameraYaw & 2047; + if (Client.field194 > 0) { + var3 = Client.field194 / 16; + if (Client.field195 >= 0) { + var0 = Client.field195 - MusicPatchNode.cameraYaw & 2047; var4 = Rasterizer3D.Rasterizer3D_sine[var0]; var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; MouseHandler.oculusOrbFocalPointX += var3 * var4 / 65536; ScriptEvent.oculusOrbFocalPointY += var3 * var5 / 65536; } - if(Client.__client_if != 0) { - MouseRecorder.__bu_hy += var3 * Client.__client_if; - if(MouseRecorder.__bu_hy > 0) { - MouseRecorder.__bu_hy = 0; + if (Client.field196 != 0) { + MouseRecorder.field566 += var3 * Client.field196; + if (MouseRecorder.field566 > 0) { + MouseRecorder.field566 = 0; } } } else { - Client.__client_hk = -1; - Client.__client_if = -1; + Client.field195 = -1; + Client.field196 = -1; } - if(KeyHandler.KeyHandler_pressedKeys[13]) { - Client.packetWriter.__q_167(Interpreter.method1915(ClientPacket.__gs_ab, Client.packetWriter.isaacCipher)); + if (KeyHandler.KeyHandler_pressedKeys[13]) { + Client.packetWriter.method241(Interpreter.method1915(ClientPacket.field259, Client.packetWriter.isaacCipher)); Client.oculusOrbState = 0; } } - 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; - var1 = Client.__client_hi - MouseHandler.MouseHandler_x; - Client.__client_hv = var1 * 2; - Client.__client_hi = var1 != -1 && var1 != 1?(Client.__client_hi + MouseHandler.MouseHandler_x) / 2:MouseHandler.MouseHandler_x; + if (MouseHandler.MouseHandler_currentButton == 4 && AbstractRasterProvider.mouseCam) { + var0 = MouseHandler.MouseHandler_y - Client.field193; + Client.field191 = var0 * 2; + Client.field193 = var0 != -1 && var0 != 1 ? (MouseHandler.MouseHandler_y + Client.field193) / 2 : MouseHandler.MouseHandler_y; + var1 = Client.field192 - MouseHandler.MouseHandler_x; + Client.field190 = var1 * 2; + Client.field192 = var1 != -1 && var1 != 1 ? (Client.field192 + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x; } else { - if(KeyHandler.KeyHandler_pressedKeys[96]) { - Client.__client_hv += (-24 - Client.__client_hv) / 2; - } else if(KeyHandler.KeyHandler_pressedKeys[97]) { - Client.__client_hv += (24 - Client.__client_hv) / 2; + if (KeyHandler.KeyHandler_pressedKeys[96]) { + Client.field190 += (-24 - Client.field190) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[97]) { + Client.field190 += (24 - Client.field190) / 2; } else { - Client.__client_hv /= 2; + Client.field190 /= 2; } - if(KeyHandler.KeyHandler_pressedKeys[98]) { - Client.__client_hu += (12 - Client.__client_hu) / 2; - } else if(KeyHandler.KeyHandler_pressedKeys[99]) { - Client.__client_hu += (-12 - Client.__client_hu) / 2; + if (KeyHandler.KeyHandler_pressedKeys[98]) { + Client.field191 += (12 - Client.field191) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[99]) { + Client.field191 += (-12 - Client.field191) / 2; } else { - Client.__client_hu /= 2; + Client.field191 /= 2; } - Client.__client_ht = MouseHandler.MouseHandler_y; - Client.__client_hi = MouseHandler.MouseHandler_x; + Client.field193 = MouseHandler.MouseHandler_y; + Client.field192 = MouseHandler.MouseHandler_x; } - Client.minimapOrientation = Client.__client_hv / 2 + Client.minimapOrientation & 2047; - Client.cameraPitchTarget += Client.__client_hu / 2; - if(Client.cameraPitchTarget < 128) { + Client.minimapOrientation = Client.field190 / 2 + Client.minimapOrientation & 2047; + Client.cameraPitchTarget += Client.field191 / 2; + if (Client.cameraPitchTarget < 128) { Client.cameraPitchTarget = 128; } - if(Client.cameraPitchTarget > 383) { + if (Client.cameraPitchTarget > 383) { Client.cameraPitchTarget = 383; } diff --git a/runescape-client/src/main/java/class60.java b/runescape-client/src/main/java/class60.java index 9eeaa4ca44..1fe5e4fdba 100644 --- a/runescape-client/src/main/java/class60.java +++ b/runescape-client/src/main/java/class60.java @@ -12,7 +12,7 @@ public class class60 { @Export("worldMap0") static WorldMap worldMap0; @ObfuscatedName("ar") - static FontMetrics __bo_ar; + static FontMetrics field1162; @ObfuscatedName("m") @ObfuscatedSignature( @@ -20,8 +20,8 @@ public class class60 { garbageValue = "1583108922" ) public static void method1172(AbstractIndexCache var0, AbstractIndexCache var1, AbstractIndexCache var2) { - HitSplatDefinition.__jm_m = var0; - HitSplatDefinition.__jm_f = var1; - HitSplatDefinition.__jm_q = var2; + HitSplatDefinition.field382 = var0; + HitSplatDefinition.field383 = var1; + HitSplatDefinition.field384 = var2; } } diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java index 9f33160c98..9d498f0f79 100644 --- a/runescape-client/src/main/java/class65.java +++ b/runescape-client/src/main/java/class65.java @@ -3,8 +3,7 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("bl") -public class class65 extends RouteStrategy -{ +public class class65 extends RouteStrategy { @ObfuscatedName("n") @ObfuscatedSignature( signature = "Lcz;" @@ -32,180 +31,180 @@ public class class65 extends RouteStrategy signature = "(Lbz;II)V", garbageValue = "406386718" ) - static final void method1232(Actor actor, int var1) { - if(actor.__bw > Client.cycle) { - SpriteIds.method5828(actor); + static final void method1232(Actor var0, int var1) { + if (var0.field19 > Client.cycle) { + SpriteIds.method5828(var0); } else { int var2; int var3; int var4; int var5; - int var7; - 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; + int var6; + if (var0.field20 >= Client.cycle) { + if (var0.field20 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > WorldMapAreaData.getSequenceDefinition(var0.sequence).frameLengths[var0.sequenceFrame]) { + var2 = var0.field20 - var0.field19; + var3 = Client.cycle - var0.field19; + var4 = var0.field15 * 128 + var0.size * 64; + var5 = var0.field17 * 128 + var0.size * 64; + int var7 = var0.field16 * 128 + var0.size * 64; + var6 = var0.field18 * 128 + var0.size * 64; + var0.x = (var3 * var7 + var4 * (var2 - var3)) / var2; + var0.y = (var3 * var6 + var5 * (var2 - var3)) / var2; } - actor.__cq = 0; - actor.orientation = actor.__cv; - actor.__ac = actor.orientation; + var0.field24 = 0; + var0.orientation = var0.field21; + var0.field9 = var0.orientation; } else { - actor.movementSequence = actor.idleSequence; - if(actor.pathLength == 0) { - actor.__cq = 0; + var0.movementSequence = var0.idleSequence; + if (var0.pathLength == 0) { + var0.field24 = 0; } else { - label310: { - if(actor.sequence != -1 && actor.sequenceDelay == 0) { - SequenceDefinition var11 = WorldMapAreaData.getSequenceDefinition(actor.sequence); - if(actor.__ch > 0 && var11.__j == 0) { - ++actor.__cq; - break label310; + label225: { + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + SequenceDefinition var11 = WorldMapAreaData.getSequenceDefinition(var0.sequence); + if (var0.field25 > 0 && var11.field781 == 0) { + ++var0.field24; + break label225; } - if(actor.__ch <= 0 && var11.__s == 0) { - ++actor.__cq; - break label310; + if (var0.field25 <= 0 && var11.field782 == 0) { + ++var0.field24; + break label225; } } - 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) { - actor.orientation = 1280; - } else if(var3 > var5) { - actor.orientation = 1792; + 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; + if (var2 < var4) { + if (var3 < var5) { + var0.orientation = 1280; + } else if (var3 > var5) { + var0.orientation = 1792; } else { - actor.orientation = 1536; + var0.orientation = 1536; } - } else if(var2 > var4) { - if(var3 < var5) { - actor.orientation = 768; - } else if(var3 > var5) { - actor.orientation = 256; + } else if (var2 > var4) { + if (var3 < var5) { + var0.orientation = 768; + } else if (var3 > var5) { + var0.orientation = 256; } else { - actor.orientation = 512; + var0.orientation = 512; } - } else if(var3 < var5) { - actor.orientation = 1024; - } else if(var3 > var5) { - actor.orientation = 0; + } else if (var3 < var5) { + var0.orientation = 1024; + } else if (var3 > var5) { + var0.orientation = 0; } - byte var12 = actor.pathTraversed[actor.pathLength - 1]; - if(var4 - var2 <= 256 && var4 - var2 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { - var7 = actor.orientation - actor.__ac & 2047; - if(var7 > 1024) { - var7 -= 2048; + byte var12 = var0.pathTraversed[var0.pathLength - 1]; + if (var4 - var2 <= 256 && var4 - var2 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { + var6 = var0.orientation - var0.field9 & 2047; + if (var6 > 1024) { + var6 -= 2048; } - int var8 = actor.walkTurnSequence; - if(var7 >= -256 && var7 <= 256) { - var8 = actor.walkSequence; - } else if(var7 >= 256 && var7 < 768) { - var8 = actor.walkTurnRightSequence; - } else if(var7 >= -768 && var7 <= -256) { - var8 = actor.walkTurnLeftSequence; + int var8 = var0.walkTurnSequence; + if (var6 >= -256 && var6 <= 256) { + var8 = var0.walkSequence; + } else if (var6 >= 256 && var6 < 768) { + var8 = var0.walkTurnRightSequence; + } else if (var6 >= -768 && var6 <= -256) { + var8 = var0.walkTurnLeftSequence; } - if(var8 == -1) { - var8 = actor.walkSequence; + if (var8 == -1) { + var8 = var0.walkSequence; } - actor.movementSequence = var8; + var0.movementSequence = var8; int var9 = 4; boolean var10 = true; - if(actor instanceof Npc) { - var10 = ((Npc)actor).definition.isClickable; + if (var0 instanceof NPC) { + var10 = ((NPC)var0).definition.isClickable; } - if(var10) { - if(actor.__ac != actor.orientation && actor.targetIndex == -1 && actor.__cj != 0) { + if (var10) { + if (var0.field9 != var0.orientation && var0.targetIndex == -1 && var0.field23 != 0) { var9 = 2; } - if(actor.pathLength > 2) { + if (var0.pathLength > 2) { var9 = 6; } - if(actor.pathLength > 3) { + if (var0.pathLength > 3) { var9 = 8; } - if(actor.__cq > 0 && actor.pathLength > 1) { + if (var0.field24 > 0 && var0.pathLength > 1) { var9 = 8; - --actor.__cq; + --var0.field24; } } else { - if(actor.pathLength > 1) { + if (var0.pathLength > 1) { var9 = 6; } - if(actor.pathLength > 2) { + if (var0.pathLength > 2) { var9 = 8; } - if(actor.__cq > 0 && actor.pathLength > 1) { + if (var0.field24 > 0 && var0.pathLength > 1) { var9 = 8; - --actor.__cq; + --var0.field24; } } - if(var12 == 2) { + if (var12 == 2) { var9 <<= 1; } - if(var9 >= 8 && actor.movementSequence == actor.walkSequence && actor.runSequence != -1) { - actor.movementSequence = actor.runSequence; + if (var9 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { + var0.movementSequence = var0.runSequence; } - if(var2 != var4 || var5 != var3) { - if(var2 < var4) { - actor.x += var9; - if(actor.x > var4) { - actor.x = var4; + if (var2 != var4 || var5 != var3) { + if (var2 < var4) { + var0.x += var9; + if (var0.x > var4) { + var0.x = var4; } - } else if(var2 > 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; } } - if(var3 < var5) { - actor.y += var9; - if(actor.y > var5) { - actor.y = var5; + if (var3 < var5) { + var0.y += var9; + if (var0.y > var5) { + var0.y = var5; } - } else if(var3 > 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; } } } - if(var4 == actor.x && var5 == actor.y) { - --actor.pathLength; - if(actor.__ch > 0) { - --actor.__ch; + if (var4 == var0.x && var5 == var0.y) { + --var0.pathLength; + if (var0.field25 > 0) { + --var0.field25; } } } else { - actor.x = var4; - actor.y = var5; - --actor.pathLength; - if(actor.__ch > 0) { - --actor.__ch; + var0.x = var4; + var0.y = var5; + --var0.pathLength; + if (var0.field25 > 0) { + --var0.field25; } } } @@ -213,27 +212,27 @@ public class class65 extends RouteStrategy } } - 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 (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { + var0.sequence = -1; + var0.spotAnimation = -1; + var0.field19 = 0; + var0.field20 = 0; + var0.x = var0.pathX[0] * 128 + var0.size * 64; + var0.y = var0.pathY[0] * 128 + var0.size * 64; + var0.method23(); } - 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(); + if (Canvas.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { + var0.sequence = -1; + var0.spotAnimation = -1; + var0.field19 = 0; + var0.field20 = 0; + var0.x = var0.pathX[0] * 128 + var0.size * 64; + var0.y = var0.pathY[0] * 128 + var0.size * 64; + var0.method23(); } - IndexStoreAction.method4553(actor); - ChatChannel.method2225(actor); + IndexStoreAction.method4553(var0); + ChatChannel.method2225(var0); } } diff --git a/runescape-client/src/main/java/class68.java b/runescape-client/src/main/java/class68.java index b72668100c..6d86c0cc52 100644 --- a/runescape-client/src/main/java/class68.java +++ b/runescape-client/src/main/java/class68.java @@ -91,7 +91,7 @@ public final class class68 extends Node { int var4 = var2.lowBit; int var5 = var2.highBit; int var6 = Varps.Varps_masks[var5 - var4]; - if(var1 < 0 || var1 > var6) { + if (var1 < 0 || var1 > var6) { var1 = 0; } @@ -106,7 +106,7 @@ public final class class68 extends Node { ) @Export("drawLoadingMessage") static final void drawLoadingMessage(String var0, boolean var1) { - if(Client.showLoadingMessages) { + if (Client.showLoadingMessages) { byte var2 = 4; int var3 = var2 + 6; int var4 = var2 + 6; @@ -116,7 +116,7 @@ public final class class68 extends Node { Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var2 + var6, 16777215); DevicePcmPlayerProvider.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); Players.method2112(var3 - var2, var4 - var2, var2 + var5 + var2, var6 + var2 + var2); - if(var1) { + if (var1) { class197.rasterProvider.drawFull(0, 0); } else { int var7 = var3; @@ -124,13 +124,13 @@ public final class class68 extends Node { int var9 = var5; int var10 = var6; - for(int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { - if(Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) { - Client.__client_ot[var11] = true; + for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { + if (Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) { + Client.field102[var11] = true; } } } - } + } } diff --git a/runescape-client/src/main/java/class80.java b/runescape-client/src/main/java/class80.java index 3c671e174b..c98f5a904b 100644 --- a/runescape-client/src/main/java/class80.java +++ b/runescape-client/src/main/java/class80.java @@ -1,19 +1,13 @@ import java.math.BigInteger; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ce") public class class80 { @ObfuscatedName("o") - static final BigInteger __ce_o; + static final BigInteger field1163; @ObfuscatedName("u") - static final BigInteger __ce_u; - - static { - __ce_o = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); - __ce_u = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); - } + static final BigInteger field1164; @ObfuscatedName("o") @ObfuscatedSignature( @@ -21,7 +15,7 @@ public class class80 { garbageValue = "1844169387" ) static void method2015() { - if(Login.__cu_f) { + if (Login.field465) { Login.titleboxSprite = null; IndexCacheLoader.titlebuttonSprite = null; WorldMapEvent.runesSprite = null; @@ -35,11 +29,17 @@ public class class80 { Frames.worldSelectFlagSprites = null; AttackOption.worldSelectArrows = null; UrlRequest.worldSelectStars = null; - class277.__jn_by = null; + class277.field1144 = null; class16.loginScreenRunesAnimation.method1762(); AbstractSocket.method3488(2); UserComparator9.method3343(true); - Login.__cu_f = false; + Login.field465 = false; } + + } + + static { + field1163 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); + field1164 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); } } diff --git a/runescape-client/src/main/java/class83.java b/runescape-client/src/main/java/class83.java index e9198a0915..89a1da6b66 100644 --- a/runescape-client/src/main/java/class83.java +++ b/runescape-client/src/main/java/class83.java @@ -1,7 +1,6 @@ import java.math.BigInteger; import java.net.MalformedURLException; import java.net.URL; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -9,19 +8,14 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("cm") public class class83 { @ObfuscatedName("m") - static final BigInteger __cm_m; + static final BigInteger field1165; @ObfuscatedName("f") - static final BigInteger __cm_f; + static final BigInteger field1166; @ObfuscatedName("e") @ObfuscatedGetter( intValue = 533653621 ) - public static int __cm_e; - - static { - __cm_m = new BigInteger("10001", 16); - __cm_f = new BigInteger("83ff79a3e258b99ead1a70e1049883e78e513c4cdec538d8da9483879a9f81689c0c7d146d7b82b52d05cf26132b1cda5930eeef894e4ccf3d41eebc3aabe54598c4ca48eb5a31d736bfeea17875a35558b9e3fcd4aebe2a9cc970312a477771b36e173dc2ece6001ab895c553e2770de40073ea278026f36961c94428d8d7db", 16); - } + public static int field1167; @ObfuscatedName("m") @ObfuscatedSignature( @@ -30,7 +24,7 @@ public class class83 { ) static int method2027(int var0, int var1) { ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - return var2 == null?-1:(var1 >= 0 && var1 < var2.ids.length?var2.ids[var1]:-1); + return var2 == null ? -1 : (var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1); } @ObfuscatedName("f") @@ -39,7 +33,7 @@ public class class83 { garbageValue = "-1468699107" ) static boolean method2026(String var0) { - if(var0 == null) { + if (var0 == null) { return false; } else { try { @@ -57,6 +51,11 @@ public class class83 { garbageValue = "1413048059" ) public static IndexedSprite method2028(AbstractIndexCache var0, int var1) { - return !RouteStrategy.loadSpriteFlat(var0, var1)?null:ServerPacket.createIndexedSprite(); + return !RouteStrategy.loadSpriteFlat(var0, var1) ? null : ServerPacket.createIndexedSprite(); + } + + static { + field1165 = new BigInteger("10001", 16); + field1166 = new BigInteger("83ff79a3e258b99ead1a70e1049883e78e513c4cdec538d8da9483879a9f81689c0c7d146d7b82b52d05cf26132b1cda5930eeef894e4ccf3d41eebc3aabe54598c4ca48eb5a31d736bfeea17875a35558b9e3fcd4aebe2a9cc970312a477771b36e173dc2ece6001ab895c553e2770de40073ea278026f36961c94428d8d7db", 16); } } diff --git a/runescape-client/src/main/java/class98.java b/runescape-client/src/main/java/class98.java index 2e7e07fc24..f770d715d3 100644 --- a/runescape-client/src/main/java/class98.java +++ b/runescape-client/src/main/java/class98.java @@ -23,22 +23,22 @@ public class class98 { boolean var1 = MusicSample.method2338() != 0; int var2; int var3; - int var5; - if(var1) { + int var4; + if (var1) { var2 = 0; - for(var3 = MusicSample.method2352(5) + 1; var2 < this.field1303; ++var3) { - int var4 = MusicSample.method2352(WorldMapCacheName.method634(this.field1303 - var2)); + for (var3 = MusicSample.method2352(5) + 1; var2 < this.field1303; ++var3) { + int var5 = MusicSample.method2352(WorldMapCacheName.method634(this.field1303 - var2)); - for(var5 = 0; var5 < var4; ++var5) { + for (var4 = 0; var4 < var5; ++var4) { this.field1304[var2++] = var3; } } } else { - boolean var14 = MusicSample.method2338() != 0; + boolean var15 = MusicSample.method2338() != 0; - for(var3 = 0; var3 < this.field1303; ++var3) { - if(var14 && MusicSample.method2338() == 0) { + for (var3 = 0; var3 < this.field1303; ++var3) { + if (var15 && MusicSample.method2338() == 0) { this.field1304[var3] = 0; } else { this.field1304[var3] = MusicSample.method2352(5) + 1; @@ -48,58 +48,58 @@ public class class98 { this.method2311(); var2 = MusicSample.method2352(4); - if(var2 > 0) { - float var15 = MusicSample.method2357(MusicSample.method2352(32)); + if (var2 > 0) { float var16 = MusicSample.method2357(MusicSample.method2352(32)); - var5 = MusicSample.method2352(4) + 1; - boolean var6 = MusicSample.method2338() != 0; - int var7; - if(var2 == 1) { - var7 = method2310(this.field1303, this.field1306); + float var6 = MusicSample.method2357(MusicSample.method2352(32)); + var4 = MusicSample.method2352(4) + 1; + boolean var7 = MusicSample.method2338() != 0; + int var8; + if (var2 == 1) { + var8 = method2310(this.field1303, this.field1306); } else { - var7 = this.field1303 * this.field1306; + var8 = this.field1303 * this.field1306; } - this.field1305 = new int[var7]; + this.field1305 = new int[var8]; - int var8; - for(var8 = 0; var8 < var7; ++var8) { - this.field1305[var8] = MusicSample.method2352(var5); + int var9; + for (var9 = 0; var9 < var8; ++var9) { + this.field1305[var9] = MusicSample.method2352(var4); } this.field1302 = new float[this.field1303][this.field1306]; - float var9; - int var10; + float var10; int var11; - if(var2 == 1) { - for(var8 = 0; var8 < this.field1303; ++var8) { - var9 = 0.0F; - var10 = 1; + int var12; + if (var2 == 1) { + for (var9 = 0; var9 < this.field1303; ++var9) { + var10 = 0.0F; + var11 = 1; - for(var11 = 0; var11 < this.field1306; ++var11) { - int var12 = var8 / var10 % var7; - float var13 = (float)this.field1305[var12] * var16 + var15 + var9; - this.field1302[var8][var11] = var13; - if(var6) { - var9 = var13; + for (var12 = 0; var12 < this.field1306; ++var12) { + int var13 = var9 / var11 % var8; + float var14 = (float)this.field1305[var13] * var6 + var16 + var10; + this.field1302[var9][var12] = var14; + if (var7) { + var10 = var14; } - var10 *= var7; + var11 *= var8; } } } else { - for(var8 = 0; var8 < this.field1303; ++var8) { - var9 = 0.0F; - var10 = var8 * this.field1306; + for (var9 = 0; var9 < this.field1303; ++var9) { + var10 = 0.0F; + var11 = var9 * this.field1306; - for(var11 = 0; var11 < this.field1306; ++var11) { - float var17 = (float)this.field1305[var10] * var16 + var15 + var9; - this.field1302[var8][var11] = var17; - if(var6) { - var9 = var17; + for (var12 = 0; var12 < this.field1306; ++var12) { + float var17 = (float)this.field1305[var11] * var6 + var16 + var10; + this.field1302[var9][var12] = var17; + if (var7) { + var10 = var17; } - ++var10; + ++var11; } } } @@ -118,40 +118,40 @@ public class class98 { int var6; int var7; int var8; + int var9; int var10; - for(var3 = 0; var3 < this.field1303; ++var3) { + for (var3 = 0; var3 < this.field1303; ++var3) { var4 = this.field1304[var3]; - if(var4 != 0) { + if (var4 != 0) { var5 = 1 << 32 - var4; var6 = var2[var4]; var1[var3] = var6; - int var12; - if((var6 & var5) != 0) { + if ((var6 & var5) != 0) { var7 = var2[var4 - 1]; } else { var7 = var6 | var5; - for(var8 = var4 - 1; var8 >= 1; --var8) { - var12 = var2[var8]; - if(var12 != var6) { + for (var8 = var4 - 1; var8 >= 1; --var8) { + var10 = var2[var8]; + if (var10 != var6) { break; } - var10 = 1 << 32 - var8; - if((var12 & var10) != 0) { + var9 = 1 << 32 - var8; + if ((var10 & var9) != 0) { var2[var8] = var2[var8 - 1]; break; } - var2[var8] = var12 | var10; + var2[var8] = var10 | var9; } } var2[var4] = var7; - for(var8 = var4 + 1; var8 <= 32; ++var8) { - var12 = var2[var8]; - if(var12 == var6) { + for (var8 = var4 + 1; var8 <= 32; ++var8) { + var10 = var2[var8]; + if (var10 == var6) { var2[var8] = var7; } } @@ -159,19 +159,19 @@ public class class98 { } this.field1307 = new int[8]; - int var11 = 0; + var10 = 0; - for(var3 = 0; var3 < this.field1303; ++var3) { + for (var3 = 0; var3 < this.field1303; ++var3) { var4 = this.field1304[var3]; - if(var4 != 0) { + if (var4 != 0) { var5 = var1[var3]; var6 = 0; - for(var7 = 0; var7 < var4; ++var7) { + for (var7 = 0; var7 < var4; ++var7) { var8 = Integer.MIN_VALUE >>> var7; - if((var5 & var8) != 0) { - if(this.field1307[var6] == 0) { - this.field1307[var6] = var11; + if ((var5 & var8) != 0) { + if (this.field1307[var6] == 0) { + this.field1307[var6] = var10; } var6 = this.field1307[var6]; @@ -179,22 +179,22 @@ public class class98 { ++var6; } - if(var6 >= this.field1307.length) { - int[] var9 = new int[this.field1307.length * 2]; + if (var6 >= this.field1307.length) { + int[] var11 = new int[this.field1307.length * 2]; - for(var10 = 0; var10 < this.field1307.length; ++var10) { - var9[var10] = this.field1307[var10]; + for (var9 = 0; var9 < this.field1307.length; ++var9) { + var11[var9] = this.field1307[var9]; } - this.field1307 = var9; + this.field1307 = var11; } var8 >>>= 1; } this.field1307[var6] = ~var3; - if(var6 >= var11) { - var11 = var6 + 1; + if (var6 >= var10) { + var10 = var6 + 1; } } } @@ -204,8 +204,7 @@ public class class98 { @ObfuscatedName("q") int method2306() { int var1; - for(var1 = 0; this.field1307[var1] >= 0; var1 = MusicSample.method2338() != 0?this.field1307[var1]:var1 + 1) { - ; + for (var1 = 0; this.field1307[var1] >= 0; var1 = MusicSample.method2338() != 0 ? this.field1307[var1] : var1 + 1) { } return ~this.field1307[var1]; @@ -219,8 +218,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; RouteStrategy.method3642(var2, var1) > var0; --var2) { - ; + for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; RouteStrategy.method3642(var2, var1) > var0; --var2) { } return var2; From 6cfc662cd8b09dec7c02c561eee881a753e45aa9 Mon Sep 17 00:00:00 2001 From: Lucas Date: Fri, 5 Jul 2019 00:37:55 +0200 Subject: [PATCH 027/472] Fix wrong class names --- .../src/main/java/DemotingHashTable.java | 6 +- .../src/main/java/DualNodeDeque.java | 3 +- .../src/main/java/FriendSystem.java | 2 +- .../src/main/java/FriendsList.java | 4 +- .../src/main/java/IterableDualNodeQueue.java | 14 +++-- .../java/IterableDualNodeQueueIterator.java | 31 +++++----- .../IterableNodeDequeDescendingIterator.java | 41 +++++++------ .../java/IterableNodeHashTableIterator.java | 59 ++++++++++--------- runescape-client/src/main/java/Link.java | 16 ++--- runescape-client/src/main/java/LinkDeque.java | 48 ++++++++------- .../src/main/java/{Npc.java => NPC.java} | 0 ...{NpcDefinition.java => NPCDefinition.java} | 0 runescape-client/src/main/java/NodeDeque.java | 3 +- .../src/main/java/PcmStreamMixer.java | 2 +- .../src/main/java/WorldMapEvent.java | 1 + 15 files changed, 129 insertions(+), 101 deletions(-) rename runescape-client/src/main/java/{Npc.java => NPC.java} (100%) rename runescape-client/src/main/java/{NpcDefinition.java => NPCDefinition.java} (100%) diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index 60c70c651a..28fb0907d2 100644 --- a/runescape-client/src/main/java/DemotingHashTable.java +++ b/runescape-client/src/main/java/DemotingHashTable.java @@ -99,7 +99,7 @@ public final class DemotingHashTable { this.remaining -= var4; while (this.remaining < 0) { - Wrapper var5 = (Wrapper)this.queue.method149(); + Wrapper var5 = (Wrapper)this.queue.removeLast(); this.removeWrapper(var5); } @@ -113,7 +113,7 @@ public final class DemotingHashTable { @ObfuscatedName("o") @Export("demote") public void demote(int var1) { - for (Wrapper var2 = (Wrapper)this.queue.method150(); var2 != null; var2 = (Wrapper)this.queue.method152()) { + for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { if (var2.isSoft()) { if (var2.get() == null) { var2.remove(); @@ -123,7 +123,7 @@ public final class DemotingHashTable { } else if (++var2.keyDual > (long)var1) { SoftWrapper var3 = new SoftWrapper(var2.get(), var2.size); this.hashTable.put(var3, var2.key); - DualNodeDeque.method5220(var3, var2); + DualNodeDeque.DualNodeDeque_addBefore(var3, var2); var2.remove(); var2.removeDual(); } diff --git a/runescape-client/src/main/java/DualNodeDeque.java b/runescape-client/src/main/java/DualNodeDeque.java index 89f3fa326b..38ead2b123 100644 --- a/runescape-client/src/main/java/DualNodeDeque.java +++ b/runescape-client/src/main/java/DualNodeDeque.java @@ -93,7 +93,8 @@ public final class DualNodeDeque { @ObfuscatedSignature( signature = "(Lfn;Lfn;)V" ) - public static void method5220(DualNode var0, DualNode var1) { + @Export("DualNodeDeque_addBefore") + public static void DualNodeDeque_addBefore(DualNode var0, DualNode var1) { if (var0.nextDual != null) { var0.removeDual(); } diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 2032c738be..911b82db63 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -76,7 +76,7 @@ public class FriendSystem { garbageValue = "-1408945788" ) final void method102() { - for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.method164(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.method165()) { + for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { if ((long)var1.time < class203.currentTimeMs() / 1000L - 5L) { if (var1.world > 0) { WorldMapIcon1.method219(5, "", var1.username + " has logged in."); diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index aec0b08c1f..76ff494389 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 { if (var6 != var11.world0) { boolean var14 = true; - for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.method164(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.method165()) { + for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) { if (var13.username.equals(var4)) { if (var6 != 0 && var13.world == 0) { var13.remove(); @@ -121,7 +121,7 @@ public class FriendsList extends UserList { } if (var14) { - this.friendLoginUpdates.method163(new FriendLoginUpdate(var4, var6)); + this.friendLoginUpdates.addFirst(new FriendLoginUpdate(var4, var6)); } } } else { diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index ed7ebad7ad..8d50146343 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueue.java +++ b/runescape-client/src/main/java/IterableDualNodeQueue.java @@ -55,7 +55,8 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedSignature( signature = "()Lfn;" ) - public DualNode method149() { + @Export("removeLast") + public DualNode removeLast() { DualNode var1 = this.sentinel.previousDual; if (var1 == this.sentinel) { return null; @@ -69,15 +70,17 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedSignature( signature = "()Lfn;" ) - public DualNode method150() { - return this.method151((DualNode)null); + @Export("last") + public DualNode last() { + return this.previousOrLast((DualNode)null); } @ObfuscatedName("o") @ObfuscatedSignature( signature = "(Lfn;)Lfn;" ) - DualNode method151(DualNode var1) { + @Export("previousOrLast") + DualNode previousOrLast(DualNode var1) { DualNode var2; if (var1 == null) { var2 = this.sentinel.previousDual; @@ -98,7 +101,8 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedSignature( signature = "()Lfn;" ) - public DualNode method152() { + @Export("previous") + public DualNode previous() { DualNode var1 = this.head; if (var1 == this.sentinel) { this.head = null; diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java index 336fe57531..5f75f3b7e8 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java +++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java @@ -17,51 +17,54 @@ public class IterableDualNodeQueueIterator implements Iterator { @ObfuscatedSignature( signature = "Lfn;" ) - DualNode field438; + @Export("head") + DualNode head; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lfn;" ) - DualNode field439; + @Export("last") + DualNode last; @ObfuscatedSignature( signature = "(Ljc;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { - this.field439 = null; + this.last = null; this.queue = var1; - this.field438 = this.queue.sentinel.previousDual; - this.field439 = null; + this.head = this.queue.sentinel.previousDual; + this.last = null; } @Export("next") @ObfuscatedName("next") public Object next() { - DualNode var1 = this.field438; + DualNode var1 = this.head; if (var1 == this.queue.sentinel) { var1 = null; - this.field438 = null; + this.head = null; } else { - this.field438 = var1.previousDual; + this.head = var1.previousDual; } - this.field439 = var1; + this.last = var1; return var1; } @Export("hasNext") @ObfuscatedName("hasNext") public boolean hasNext() { - return this.queue.sentinel != this.field438; + return this.queue.sentinel != this.head; } @ObfuscatedName("remove") - public void method153() { - if (this.field439 == null) { + @Export("remove") + public void remove() { + if (this.last == null) { throw new IllegalStateException(); } else { - this.field439.removeDual(); - this.field439 = null; + this.last.removeDual(); + this.last = null; } } } diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java index 0c3d2349f1..8d81ecf84c 100644 --- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java @@ -17,64 +17,69 @@ public class IterableNodeDequeDescendingIterator implements Iterator { @ObfuscatedSignature( signature = "Lgw;" ) - Node field440; + @Export("head") + Node head; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lgw;" ) - Node field441; + @Export("last") + Node last; @ObfuscatedSignature( signature = "(Lja;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { - this.field441 = null; - this.method154(var1); + this.last = null; + this.setDeque(var1); } @ObfuscatedName("u") @ObfuscatedSignature( signature = "(Lja;)V" ) - void method154(IterableNodeDeque var1) { + @Export("setDeque") + void setDeque(IterableNodeDeque var1) { this.deque = var1; - this.method155(); + this.start(); } @ObfuscatedName("g") - void method155() { - this.field440 = this.deque != null ? this.deque.sentinel.previous : null; - this.field441 = null; + @Export("start") + void start() { + this.head = this.deque != null ? this.deque.sentinel.previous : null; + this.last = null; } @Export("hasNext") @ObfuscatedName("hasNext") public boolean hasNext() { - return this.deque.sentinel != this.field440; + return this.deque.sentinel != this.head; } @Export("next") @ObfuscatedName("next") public Object next() { - Node var1 = this.field440; + Node var1 = this.head; if (var1 == this.deque.sentinel) { var1 = null; - this.field440 = null; + this.head = null; } else { - this.field440 = var1.previous; + this.head = var1.previous; } - this.field441 = var1; + this.last = var1; return var1; } @ObfuscatedName("remove") - public void method156() { - if (this.field441 == null) { + @Export("remove") + public void remove() { + if (this.last == null) { throw new IllegalStateException(); } else { - this.field441.remove(); - this.field441 = null; + this.last.remove(); + this.last = null; } } } diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index 9c6b6c8a3d..717dff1c35 100644 --- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java +++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java @@ -17,46 +17,50 @@ public class IterableNodeHashTableIterator implements Iterator { @ObfuscatedSignature( signature = "Lgw;" ) - Node field442; + @Export("head") + Node head; @ObfuscatedName("q") - int field443; + @Export("index") + int index; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lgw;" ) - Node field444; + @Export("last") + Node last; @ObfuscatedSignature( signature = "(Llh;)V" ) IterableNodeHashTableIterator(IterableNodeHashTable var1) { - this.field444 = null; + this.last = null; this.hashTable = var1; - this.method157(); + this.start(); } @ObfuscatedName("u") - void method157() { - this.field442 = this.hashTable.buckets[0].previous; - this.field443 = 1; - this.field444 = null; + @Export("start") + void start() { + this.head = this.hashTable.buckets[0].previous; + this.index = 1; + this.last = null; } @Export("next") @ObfuscatedName("next") public Object next() { Node var1; - if (this.hashTable.buckets[this.field443 - 1] != this.field442) { - var1 = this.field442; - this.field442 = var1.previous; - this.field444 = var1; + if (this.hashTable.buckets[this.index - 1] != this.head) { + var1 = this.head; + this.head = var1.previous; + this.last = var1; return var1; } else { - while (this.field443 < this.hashTable.size) { - var1 = this.hashTable.buckets[this.field443++].previous; - if (var1 != this.hashTable.buckets[this.field443 - 1]) { - this.field442 = var1.previous; - this.field444 = var1; + while (this.index < this.hashTable.size) { + var1 = this.hashTable.buckets[this.index++].previous; + if (var1 != this.hashTable.buckets[this.index - 1]) { + this.head = var1.previous; + this.last = var1; return var1; } } @@ -68,16 +72,16 @@ public class IterableNodeHashTableIterator implements Iterator { @Export("hasNext") @ObfuscatedName("hasNext") public boolean hasNext() { - if (this.hashTable.buckets[this.field443 - 1] != this.field442) { + if (this.hashTable.buckets[this.index - 1] != this.head) { return true; } else { - while (this.field443 < this.hashTable.size) { - if (this.hashTable.buckets[this.field443++].previous != this.hashTable.buckets[this.field443 - 1]) { - this.field442 = this.hashTable.buckets[this.field443 - 1].previous; + while (this.index < this.hashTable.size) { + if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { + this.head = this.hashTable.buckets[this.index - 1].previous; return true; } - this.field442 = this.hashTable.buckets[this.field443 - 1]; + this.head = this.hashTable.buckets[this.index - 1]; } return false; @@ -85,12 +89,13 @@ public class IterableNodeHashTableIterator implements Iterator { } @ObfuscatedName("remove") - public void method158() { - if (this.field444 == null) { + @Export("remove") + public void remove() { + if (this.last == null) { throw new IllegalStateException(); } else { - this.field444.remove(); - this.field444 = null; + this.last.remove(); + this.last = null; } } } diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index 54598f5db2..9188f48e90 100644 --- a/runescape-client/src/main/java/Link.java +++ b/runescape-client/src/main/java/Link.java @@ -10,21 +10,23 @@ public class Link { @ObfuscatedSignature( signature = "Lgh;" ) - public Link field461; + @Export("previous") + public Link previous; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lgh;" ) - public Link field462; + @Export("next") + public Link next; @ObfuscatedName("m") @Export("remove") public void remove() { - if (this.field462 != null) { - this.field462.field461 = this.field461; - this.field461.field462 = this.field462; - this.field461 = null; - this.field462 = null; + if (this.next != null) { + this.next.previous = this.previous; + this.previous.next = this.next; + this.previous = null; + this.next = null; } } diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java index d83b58e84d..a4007be90b 100644 --- a/runescape-client/src/main/java/LinkDeque.java +++ b/runescape-client/src/main/java/LinkDeque.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -9,45 +10,49 @@ public class LinkDeque { @ObfuscatedSignature( signature = "Lgh;" ) - Link field463; + @Export("sentinel") + Link sentinel; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lgh;" ) - Link field464; + @Export("current") + Link current; public LinkDeque() { - this.field463 = new Link(); - this.field463.field461 = this.field463; - this.field463.field462 = this.field463; + this.sentinel = new Link(); + this.sentinel.previous = this.sentinel; + this.sentinel.next = this.sentinel; } @ObfuscatedName("m") @ObfuscatedSignature( signature = "(Lgh;)V" ) - public void method163(Link var1) { - if (var1.field462 != null) { + @Export("addFirst") + public void addFirst(Link var1) { + if (var1.next != null) { var1.remove(); } - var1.field462 = this.field463.field462; - var1.field461 = this.field463; - var1.field462.field461 = var1; - var1.field461.field462 = var1; + var1.next = this.sentinel.next; + var1.previous = this.sentinel; + var1.next.previous = var1; + var1.previous.next = var1; } @ObfuscatedName("f") @ObfuscatedSignature( signature = "()Lgh;" ) - public Link method164() { - Link var1 = this.field463.field461; - if (var1 == this.field463) { - this.field464 = null; + @Export("last") + public Link last() { + Link var1 = this.sentinel.previous; + if (var1 == this.sentinel) { + this.current = null; return null; } else { - this.field464 = var1.field461; + this.current = var1.previous; return var1; } } @@ -56,13 +61,14 @@ public class LinkDeque { @ObfuscatedSignature( signature = "()Lgh;" ) - public Link method165() { - Link var1 = this.field464; - if (var1 == this.field463) { - this.field464 = null; + @Export("previous") + public Link previous() { + Link var1 = this.current; + if (var1 == this.sentinel) { + this.current = null; return null; } else { - this.field464 = var1.field461; + this.current = var1.previous; return var1; } } diff --git a/runescape-client/src/main/java/Npc.java b/runescape-client/src/main/java/NPC.java similarity index 100% rename from runescape-client/src/main/java/Npc.java rename to runescape-client/src/main/java/NPC.java diff --git a/runescape-client/src/main/java/NpcDefinition.java b/runescape-client/src/main/java/NPCDefinition.java similarity index 100% rename from runescape-client/src/main/java/NpcDefinition.java rename to runescape-client/src/main/java/NPCDefinition.java diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java index f6d54a2622..6fb4ab6338 100644 --- a/runescape-client/src/main/java/NodeDeque.java +++ b/runescape-client/src/main/java/NodeDeque.java @@ -169,7 +169,8 @@ public class NodeDeque { @ObfuscatedSignature( signature = "(Lgw;Lgw;)V" ) - public static void method5270(Node var0, Node var1) { + @Export("NodeDeque_addBefore") + public static void NodeDeque_addBefore(Node var0, Node var1) { if (var0.next != null) { var0.remove(); } diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java index 0942f7ecd7..485333b5f2 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -69,7 +69,7 @@ public class PcmStreamMixer extends PcmStream { var1 = var1.previous; } - NodeDeque.method5270(var2, var1); + NodeDeque.NodeDeque_addBefore(var2, var1); this.field692 = ((PcmStreamMixerListener)this.field690.sentinel.previous).field693; } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index 31641f4ed8..09242f979c 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -55,6 +55,7 @@ public class WorldMapEvent { signature = "(IIIIB)V", garbageValue = "2" ) + @Export("addSceneMenuOptions") static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { if (Client.isItemSelected == 0 && !Client.isSpellSelected) { Tiles.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); From 22914889aaa010dfc7426ecc9b21169216ace88b Mon Sep 17 00:00:00 2001 From: sdburns1998 <49877861+sdburns1998@users.noreply.github.com> Date: Fri, 5 Jul 2019 01:11:31 +0200 Subject: [PATCH 028/472] plugins: reduce config calls by saving and reusing values, misc performance tweaks. (#799) * Save config values -- AgilityPlugin * Static state value map * Don't run area in the for loop * Checking for bounds is enough for widget null check * Cache font settings * SAve config values -- AntiDragPlugin * Save config values -- AoEPlugin * Save config values -- AttackStylesPlugin * Save config values -- BankPlugin * Check if player is in kingdom * Save hideAutoRetaliate -- AttackStylesPlugin * Save config values -- BanListPlugin * Save config values -- BarbaranAssaultPlugin * Save config values -- BarrowsPlugin * Checkstyle * Move up updateConfig.java * Save config values -- BlackjackPlugin * Save config values -- BlastFurnacePlugin * Save config values -- BlastMinePlugin * Save config values -- BoostsPlugin * Save config values -- CannonPlugin * Fix bank plugin test * Parallelize plugin loading * Fix sidebar going AWOL * Save config values -- ChatFilterPlugin * Save config values -- ChatHistoryPlugin * Save config values -- ChatNotificationsPlugin * Save config values -- ChatTranslationPlugin * Save config values -- ClanChatPlugin * Save config values -- ClueScrollPlugin * Cleanup CombatCounterPlugin * Save config values -- CombatCounter * Checkstyle * Save config values -- CombatLevelPlugin * Convert game thread events without mutable field to singletons These should be safe to convert, events with mutable field should be checked * Checkstyle * Fix test * Save config values -- CookingPlugin * Save config values -- CorpPlugin * SAve config values -- CoxPlugin * Save config values -- DailyTasksPlugin * Save config values -- DiscordPlugin * Coxhelper checkstyle * Save config values -- EquipmentInspectorPlugin * SAve cofig values -- XpDropPlugin * Save config values -- FairyRingPlugin * Save config values -- FightCavePlugin * Save config values -- FishingPlugin * Save config values and refactor -- FlexoPlugin * Save config values -- FlinchingPlugin * Save config values -- FreezeTimersPlugin * Save config values -- GpuPlugin * Save config values -- GrandExchangePlugin * Save config values -- GroundItemsPlugin * Save config values -- GroundMarkerPlugin * Save config values -- GroundMarkerPlugin * Save config values -- HerbiboarPlugin * Save config values -- HidePrayersPlugin * Save config values -- HighAlchemyPlugin * Save config values -- HunterPlugin * Save config values -- BabyHydraPlugin * Fix Flexo * Checkstyle * Save config values -- IdleNotifierPlugin * Save config values -- ImplingsPlugin * Save config values and cleanup -- InfernoPlugin * Use EqualsAndHashCode for GroundMarkerPoint * Save config values -- InterfaceStylesPlugin * Save config values -- InventoryGridPlugin * Save config values -- InventorySetupPlugin * Checkstyle * Save config values -- InventoryTagsPlugin * Save config values -- InventoryViewerPlugin * Save config values -- ItemChargePlugin * Save config values -- ItemIdentificationPlugin * Save config values -- ItemPricesPlugin * Save config values -- ItemStatPlugin * Save config values -- KeyRemappingPlugin * Save config values -- KourendLibraryPlugin * Save config values -- LearnToClickPlugin * Save config values -- LizardmenShamanPlugin * Save config values -- LoginScreenPlugin * Cleanup LootAssistOverlay * Remove unused LootAssistConfig * Save config values -- LootTrackerPlugin * Save config values -- MetronomePlugin * Add border color ground items * Save config values -- WorstPluginEverPlugin * Fix inferno plugin * Save config values -- MinimapPlugin * Save config values -- MiningPlugin * Save config values -- MotherlodePlugin * Save config values -- MouseHighlightPlugin * Save config values -- MTAPlugin * Save config values -- MultiIndicatorsPlugin * Save config values -- NightmareZonePlugin * Save config values -- NpcIndicatorsPlugin * Save config values -- NpcStatusPlugin * Save config values -- NpcAggroAreaPlugin * Save config values -- ObjectIndicatorsPlugin * Save config values -- OpponentInfoPlugin * Save config values -- PartyPlugin * Save config values -- PerformanceStatsPlugin * Save config values and cleanup -- PestcontrolPlugin * Save config values , cleanup and refactor -- PileIndicatorsPlugin * Save config values -- PlayerIndicatorsPlugin * Save config values -- PlayerInfoPlugin * Save config values -- PluginSorterPlugin * Save config values -- PohPlugin * Checkstyle * Save config values -- PoisonPlugin * Save config values -- PrayAgainstPlayerPlugin * Save config values -- PrayerPlugin * Save config values -- PrayerAlertPlugin * Checkstyle * Save config values -- PuzzleSolverPlugin * Save config values -- PvpToolsPlugin * Save config values -- PyramidPlunderPlugin * Save config values -- RaidsPlugin * Save config values -- ShortcutPlugin * Save config values -- RaidsThievingPlugin * Oopsie * Save config values -- RegenMeterPlugin * Save config values -- ReportButtonPlugin * Save config values -- RunecraftPlugin * Save config values -- RunedokuPlugin * Save config values -- RunepouchPlugin * Save config values -- SafeSpotPlugin * Save config values -- ScreenshotPlugin * Save config values -- ShiftWalkerPlugin * Save config values -- SlayerPlugin * Save config values -- SmeltingPlugin * Save config values -- SpawnTimerPlugin * Save config values -- SpellbookPlugin * Save config values -- StatusBarsPlugin * Save config values -- ThievingPlugin * Checkstyle * Cleanup Zulrah * Save config values -- XpTrackerPlugin * Save config values -- XpGlobesPlugin * Save config values -- WorldMapPlugin * Save config values -- TheatrePlugin * Save config values -- TickTimersPlugin * Save config values -- TileIndicatorsPlugin * Save config values -- TimersPlugin * Save config values -- TitheFarmPlugin * Save config values -- TMorphPlugin * Save config values -- WarIndicatorPlugin * Save config values -- WhaleWatchersPlugin * Save config values -- WildernessLocationsPlugin * Save config values -- WintertodtPlugin * Save config values -- WorldHopperPlugin * Save config values -- WoodcuttingPlugin * Cleanup * Checkstyle * Fix tests --- .../main/java/net/runelite/api/GameState.java | 18 +- .../java/net/runelite/api/Perspective.java | 7 +- .../net/runelite/api/events/BeforeRender.java | 6 + .../runelite/api/events/CannonballFired.java | 6 + .../api/events/CanvasSizeChanged.java | 6 + .../net/runelite/api/events/ClientTick.java | 6 + .../net/runelite/api/events/GameTick.java | 9 +- .../runelite/api/events/LocalPlayerDeath.java | 6 + .../runelite/api/events/UsernameChanged.java | 6 + .../runelite/api/events/WidgetPositioned.java | 9 +- .../net/runelite/client/callback/Hooks.java | 7 +- .../client/plugins/PluginManager.java | 119 ++- .../client/plugins/account/AccountPlugin.java | 2 + .../DiaryRequirementsPlugin.java | 2 + .../plugins/agility/AgilityOverlay.java | 24 +- .../client/plugins/agility/AgilityPlugin.java | 72 +- .../plugins/agility/AgilitySession.java | 2 +- .../client/plugins/agility/Courses.java | 9 +- .../plugins/agility/LapCounterOverlay.java | 14 +- .../plugins/alchemicalhydra/HydraOverlay.java | 2 +- .../plugins/alchemicalhydra/HydraPlugin.java | 2 + .../alchemicalhydra/HydraSceneOverlay.java | 2 +- .../client/plugins/ammo/AmmoCounter.java | 3 +- .../client/plugins/ammo/AmmoPlugin.java | 2 + .../AnimationSmoothingPlugin.java | 2 + .../plugins/antidrag/AntiDragConfig.java | 1 - .../plugins/antidrag/AntiDragOverlay.java | 10 +- .../plugins/antidrag/AntiDragPlugin.java | 64 +- .../client/plugins/antidrag/CustomCursor.java | 4 +- .../plugins/aoewarnings/AoeProjectile.java | 3 +- .../aoewarnings/AoeWarningOverlay.java | 16 +- .../plugins/aoewarnings/AoeWarningPlugin.java | 209 ++++-- .../plugins/aoewarnings/BombOverlay.java | 13 +- .../plugins/aoewarnings/CrystalBomb.java | 11 +- .../attackstyles/AttackStylesOverlay.java | 8 +- .../attackstyles/AttackStylesPlugin.java | 57 +- .../client/plugins/bank/BankCalculation.java | 12 +- .../client/plugins/bank/BankPlugin.java | 65 +- .../plugins/banktags/BankTagsPlugin.java | 2 + .../client/plugins/banlist/BanListConfig.java | 1 - .../client/plugins/banlist/BanListPlugin.java | 32 +- .../barbarianassault/AboveSceneOverlay.java | 13 +- .../barbarianassault/AboveWidgetsOverlay.java | 26 +- .../BarbarianAssaultMenu.java | 51 +- .../BarbarianAssaultPlugin.java | 165 ++++- .../plugins/barbarianassault/Scorecard.java | 2 +- .../plugins/barbarianassault/Timer.java | 3 +- .../plugins/barbarianassault/TimerBox.java | 2 + .../client/plugins/barbarianassault/Wave.java | 1 - .../barrows/BarrowsBrotherSlainOverlay.java | 4 +- .../plugins/barrows/BarrowsBrothers.java | 7 +- .../plugins/barrows/BarrowsOverlay.java | 16 +- .../client/plugins/barrows/BarrowsPlugin.java | 47 +- .../plugins/blackjack/BlackjackPlugin.java | 22 +- .../BlastFurnaceClickBoxOverlay.java | 10 +- .../BlastFurnaceCofferOverlay.java | 4 +- .../blastfurnace/BlastFurnaceOverlay.java | 4 +- .../blastfurnace/BlastFurnacePlugin.java | 28 + .../blastmine/BlastMineOreCountOverlay.java | 10 +- .../plugins/blastmine/BlastMinePlugin.java | 34 +- .../plugins/blastmine/BlastMineRock.java | 5 +- .../blastmine/BlastMineRockOverlay.java | 16 +- .../plugins/blastmine/BlastMineRockType.java | 3 +- .../client/plugins/boosts/BoostIndicator.java | 13 +- .../client/plugins/boosts/BoostsOverlay.java | 12 +- .../client/plugins/boosts/BoostsPlugin.java | 58 +- .../plugins/boosts/CombatIconsOverlay.java | 14 +- .../plugins/bosstimer/BossTimersPlugin.java | 2 + .../plugins/bosstimer/RespawnTimer.java | 2 +- .../client/plugins/cannon/CannonOverlay.java | 10 +- .../client/plugins/cannon/CannonPlugin.java | 51 +- .../plugins/cannon/CannonSpotOverlay.java | 8 +- .../plugins/cerberus/CerberusGhost.java | 3 +- .../ChatboxPerformancePlugin.java | 2 + .../chatcommands/ChatCommandsPlugin.java | 2 + .../plugins/chatfilter/ChatFilterPlugin.java | 40 +- .../chathistory/ChatHistoryPlugin.java | 29 +- .../ChatNotificationsPlugin.java | 39 +- .../ChatTranslationPlugin.java | 37 +- .../plugins/clanchat/ClanChatIndicator.java | 4 +- .../plugins/clanchat/ClanChatPlugin.java | 71 +- .../ClanManModeMinimapOverlay.java | 2 +- .../clanmanmode/ClanManModeOverlay.java | 2 +- .../clanmanmode/ClanManModePlugin.java | 3 +- .../clanmanmode/ClanManModeService.java | 2 +- .../clanmanmode/ClanManModeTileOverlay.java | 4 +- .../cluescrolls/ClueScrollEmoteOverlay.java | 4 +- .../cluescrolls/ClueScrollMusicOverlay.java | 4 +- .../cluescrolls/ClueScrollOverlay.java | 4 +- .../plugins/cluescrolls/ClueScrollPlugin.java | 21 +- .../cluescrolls/ClueScrollServiceImpl.java | 2 +- .../cluescrolls/ClueScrollWorldMapPoint.java | 2 +- .../cluescrolls/ClueScrollWorldOverlay.java | 4 +- .../plugins/combatcounter/CombatCounter.java | 108 ++- .../plugins/combatcounter/CombatOverlay.java | 22 +- .../plugins/combatcounter/DamageOverlay.java | 19 +- .../combatcounter/NPCDamageCounter.java | 14 +- .../combatlevel/CombatLevelOverlay.java | 10 +- .../combatlevel/CombatLevelPlugin.java | 24 +- .../client/plugins/config/ConfigPanel.java | 2 + .../client/plugins/config/ConfigPlugin.java | 5 +- .../client/plugins/config/HotkeyButton.java | 7 +- .../client/plugins/config/PluginListItem.java | 6 +- .../plugins/cooking/CookingOverlay.java | 4 +- .../client/plugins/cooking/CookingPlugin.java | 30 +- .../plugins/cooking/CookingSession.java | 2 + .../client/plugins/cooking/FermentTimer.java | 2 + .../client/plugins/corp/CoreOverlay.java | 7 +- .../plugins/corp/CorpDamageOverlay.java | 8 +- .../client/plugins/corp/CorpPlugin.java | 24 +- .../client/plugins/coxhelper/CoxInfoBox.java | 10 +- .../client/plugins/coxhelper/CoxOverlay.java | 70 +- .../client/plugins/coxhelper/CoxPlugin.java | 78 ++ .../plugins/coxhelper/NPCContainer.java | 37 +- .../client/plugins/coxhelper/PrayAgainst.java | 3 +- .../crystalmathlabs/CrystalMathLabs.java | 2 + .../plugins/customcursor/CustomCursor.java | 5 +- .../customcursor/CustomCursorPlugin.java | 2 + .../dailytaskindicators/DailyTasksPlugin.java | 55 +- .../deathindicator/DeathIndicatorPlugin.java | 2 + .../defaultworld/DefaultWorldPlugin.java | 2 + .../demonicgorilla/DemonicGorillaOverlay.java | 9 +- .../demonicgorilla/DemonicGorillaPlugin.java | 54 +- .../demonicgorilla/MemorizedPlayer.java | 13 +- .../demonicgorilla/PendingGorillaAttack.java | 14 +- .../plugins/discord/DiscordGameEventType.java | 3 +- .../client/plugins/discord/DiscordPlugin.java | 48 +- .../client/plugins/discord/DiscordState.java | 12 +- .../client/plugins/emojis/EmojiPlugin.java | 2 + .../entityhider/EntityHiderPlugin.java | 2 + .../EquipmentInspectorConfig.java | 2 +- .../EquipmentInspectorPlugin.java | 49 +- .../plugins/equipmentinspector/normal.png | Bin 624 -> 0 bytes .../client/plugins/examine/CacheKey.java | 2 +- .../client/plugins/examine/ExaminePlugin.java | 2 + .../plugins/experiencedrop/XpDropOverlay.java | 12 +- .../plugins/experiencedrop/XpDropPlugin.java | 44 +- .../plugins/fairyring/FairyRingPlugin.java | 24 +- .../client/plugins/feed/FeedPanel.java | 2 + .../client/plugins/feed/FeedPlugin.java | 2 + .../plugins/fightcave/FightCaveContainer.java | 8 +- .../plugins/fightcave/FightCaveOverlay.java | 22 +- .../plugins/fightcave/FightCavePlugin.java | 38 +- .../client/plugins/fightcave/WaveOverlay.java | 4 +- .../plugins/fishing/FishingOverlay.java | 8 +- .../client/plugins/fishing/FishingPlugin.java | 51 +- .../plugins/fishing/FishingSession.java | 5 +- .../fishing/FishingSpotMinimapOverlay.java | 8 +- .../plugins/fishing/FishingSpotOverlay.java | 16 +- .../client/plugins/flexo/FlexoOverlay.java | 29 +- .../client/plugins/flexo/FlexoPlugin.java | 125 +++- .../plugins/flinching/FlinchingOverlay.java | 13 +- .../plugins/flinching/FlinchingPlugin.java | 38 +- .../plugins/flinching/FlinchingTarget.java | 5 +- .../client/plugins/fps/FpsDrawListener.java | 2 +- .../client/plugins/fps/FpsOverlay.java | 4 +- .../client/plugins/fps/FpsPlugin.java | 2 + .../plugins/freezetimers/FontStyle.java | 3 +- .../plugins/freezetimers/FreezeInfo.java | 5 +- .../freezetimers/FreezeTimersOverlay.java | 49 +- .../freezetimers/FreezeTimersPlugin.java | 52 +- .../freezetimers/PlayerSpellEffect.java | 15 +- .../plugins/freezetimers/PrayerTracker.java | 4 +- .../client/plugins/freezetimers/Timers.java | 14 +- .../plugins/friendlist/FriendListPlugin.java | 2 + .../friendnotes/FriendNoteOverlay.java | 4 +- .../friendnotes/FriendNotesPlugin.java | 2 + .../friendtagging/FriendTaggingPlugin.java | 3 +- .../runelite/client/plugins/gpu/GLUtil.java | 18 +- .../client/plugins/gpu/GpuFloatBuffer.java | 4 +- .../client/plugins/gpu/GpuIntBuffer.java | 5 - .../client/plugins/gpu/GpuPlugin.java | 66 +- .../client/plugins/gpu/SceneUploader.java | 68 +- .../GrandExchangeInputListener.java | 4 +- .../grandexchange/GrandExchangeItemPanel.java | 2 + .../grandexchange/GrandExchangeOfferSlot.java | 4 +- .../GrandExchangeOffersPanel.java | 4 +- .../grandexchange/GrandExchangePanel.java | 7 +- .../grandexchange/GrandExchangePlugin.java | 28 +- .../GrandExchangeSearchPanel.java | 7 +- .../grotesqueguardians/DuskAttack.java | 2 +- .../GrotesqueGuardiansOverlay.java | 4 +- .../GrotesqueGuardiansPlugin.java | 14 +- .../GrotesqueGuardiansPrayerOverlay.java | 4 +- .../grounditems/GroundItemInputListener.java | 7 +- .../grounditems/GroundItemsOverlay.java | 34 +- .../grounditems/GroundItemsPlugin.java | 183 ++++- .../grounditems/MenuEntryWithCount.java | 5 +- .../grounditems/WildcardMatchLoader.java | 2 +- .../GroundMarkerInputListener.java | 4 +- .../GroundMarkerMinimapOverlay.java | 18 +- .../groundmarkers/GroundMarkerOverlay.java | 16 +- .../groundmarkers/GroundMarkerPlugin.java | 47 +- .../groundmarkers/GroundMarkerPoint.java | 21 +- .../groundmarkers/GroundMarkerWorldPoint.java | 2 +- .../herbiboars/HerbiboarMinimapOverlay.java | 11 +- .../plugins/herbiboars/HerbiboarOverlay.java | 32 +- .../plugins/herbiboars/HerbiboarPlugin.java | 87 ++- .../hideprayers/HidePrayersPlugin.java | 235 ++++-- .../highalchemy/HighAlchemyOverlay.java | 12 +- .../highalchemy/HighAlchemyPlugin.java | 28 +- .../client/plugins/hiscore/HiscorePanel.java | 2 + .../client/plugins/hiscore/HiscorePlugin.java | 14 +- .../plugins/hiscore/NameAutocompleter.java | 2 +- .../client/plugins/hunter/HunterPlugin.java | 32 +- .../client/plugins/hunter/HunterTrap.java | 17 +- .../client/plugins/hunter/TrapOverlay.java | 14 +- .../hydra/BabyHydraIndicatorOverlay.java | 4 +- .../plugins/hydra/BabyHydraOverlay.java | 9 +- .../client/plugins/hydra/BabyHydraPlugin.java | 30 +- .../plugins/hydra/BabyHydraPrayOverlay.java | 4 +- .../idlenotifier/IdleNotifierPlugin.java | 116 ++- .../implings/ImplingCounterOverlay.java | 11 +- .../implings/ImplingMinimapOverlay.java | 10 +- .../client/plugins/implings/ImplingSpawn.java | 3 +- .../client/plugins/implings/ImplingType.java | 3 +- .../plugins/implings/ImplingsConfig.java | 11 - .../plugins/implings/ImplingsOverlay.java | 14 +- .../plugins/implings/ImplingsPlugin.java | 129 +++- .../client/plugins/inferno/InfernoConfig.java | 76 +- .../plugins/inferno/InfernoInfobox.java | 15 +- .../plugins/inferno/InfernoJadAttack.java | 28 +- .../plugins/inferno/InfernoJadOverlay.java | 61 +- .../client/plugins/inferno/InfernoNPC.java | 39 +- .../inferno/InfernoNibblerOverlay.java | 13 +- .../plugins/inferno/InfernoOverlay.java | 28 +- .../client/plugins/inferno/InfernoPlugin.java | 146 ++-- .../plugins/inferno/InfernoWaveMappings.java | 7 +- .../plugins/inferno/InfernoWaveOverlay.java | 23 +- .../client/plugins/info/InfoPlugin.java | 2 + .../client/plugins/info/JRichTextPane.java | 4 +- .../instancemap/InstanceMapOverlay.java | 17 +- .../instancemap/InstanceMapPlugin.java | 10 +- .../interfacestyles/HealthbarOverride.java | 5 +- .../InterfaceStylesPlugin.java | 35 +- .../client/plugins/interfacestyles/Skin.java | 3 +- .../interfacestyles/SpriteOverride.java | 3 +- .../plugins/interfacestyles/WidgetOffset.java | 3 +- .../interfacestyles/WidgetOverride.java | 5 +- .../inventorygrid/InventoryGridOverlay.java | 20 +- .../inventorygrid/InventoryGridPlugin.java | 43 ++ .../InventorySetupBankOverlay.java | 8 +- .../inventorysetups/InventorySetupPlugin.java | 34 +- .../ui/InventorySetupContainerPanel.java | 10 +- .../ui/InventorySetupEquipmentPanel.java | 2 + .../ui/InventorySetupInventoryPanel.java | 3 +- .../ui/InventorySetupPluginPanel.java | 2 + .../ui/InventorySetupSlot.java | 8 +- .../inventorytags/InventoryTagsOverlay.java | 4 +- .../inventorytags/InventoryTagsPlugin.java | 34 +- .../inventoryviewer/InventoryViewerMode.java | 3 +- .../InventoryViewerOverlay.java | 16 +- .../InventoryViewerPlugin.java | 33 + .../plugins/itemcharges/ItemChargeConfig.java | 95 ++- .../itemcharges/ItemChargeInfobox.java | 15 +- .../itemcharges/ItemChargeOverlay.java | 64 +- .../plugins/itemcharges/ItemChargePlugin.java | 179 ++++- .../itemcharges/ItemRecoilOverlay.java | 9 +- .../plugins/itemcharges/ItemWithCharge.java | 3 +- .../plugins/itemcharges/ItemWithSlot.java | 3 +- .../ItemIdentificationOverlay.java | 18 +- .../ItemIdentificationPlugin.java | 42 ++ .../plugins/itemprices/ItemPricesOverlay.java | 26 +- .../plugins/itemprices/ItemPricesPlugin.java | 41 ++ .../itemskeptondeath/AlwaysLostItem.java | 3 +- .../itemskeptondeath/FixedPriceItem.java | 3 +- .../ItemsKeptOnDeathPlugin.java | 2 + .../plugins/itemstats/ItemStatOverlay.java | 43 +- .../plugins/itemstats/ItemStatPlugin.java | 51 +- .../client/plugins/itemstats/Positivity.java | 12 +- .../keyremapping/KeyRemappingListener.java | 29 +- .../keyremapping/KeyRemappingPlugin.java | 36 +- .../kingdomofmiscellania/KingdomCounter.java | 4 +- .../kingdomofmiscellania/KingdomPlugin.java | 14 +- .../client/plugins/kourendlibrary/Book.java | 15 +- .../plugins/kourendlibrary/BookPanel.java | 4 +- .../plugins/kourendlibrary/Bookcase.java | 13 +- .../kourendlibrary/KourendLibraryOverlay.java | 8 +- .../kourendlibrary/KourendLibraryPlugin.java | 20 +- .../plugins/kourendlibrary/Library.java | 7 +- .../kourendlibrary/LibraryCustomer.java | 5 +- .../learntoclick/LearnToClickPlugin.java | 45 +- .../LizardmenShamanPlugin.java | 28 +- .../lizardmenshaman/LizardmenShamanSpawn.java | 5 +- .../lizardmenshaman/ShamanSpawnOverlay.java | 4 +- .../loginscreen/LoginScreenPlugin.java | 39 +- .../plugins/lootassist/LootAssistOverlay.java | 23 +- .../plugins/lootassist/LootAssistPlugin.java | 11 +- .../plugins/lootassist/LootAssitConfig.java | 20 - .../client/plugins/lootassist/LootPile.java | 11 +- .../LootingBagViewerOverlay.java | 4 +- .../LootingBagViewerPlugin.java | 7 +- .../LootingBagViewerWidgetOverlay.java | 10 +- .../plugins/loottracker/LootTrackerBox.java | 2 +- .../plugins/loottracker/LootTrackerItem.java | 13 +- .../plugins/loottracker/LootTrackerPanel.java | 6 +- .../loottracker/LootTrackerPlugin.java | 74 +- .../plugins/lowmemory/LowMemoryPlugin.java | 2 + .../client/plugins/maxhit/MaxHitPlugin.java | 3 +- .../maxhit/equipment/EquipmentSlotItem.java | 2 +- .../MenuEntrySwapperPlugin.java | 686 ++++++++++++------ .../ShiftClickInputListener.java | 2 + .../plugins/metronome/MetronomePlugin.java | 48 +- .../client/plugins/minimap/MinimapPlugin.java | 44 +- .../plugins/mining/MiningCoalBagOverlay.java | 10 +- .../client/plugins/mining/MiningOverlay.java | 4 +- .../client/plugins/mining/MiningPlugin.java | 35 +- .../client/plugins/mining/RockRespawn.java | 3 +- .../motherlode/MotherlodeGemOverlay.java | 11 +- .../motherlode/MotherlodeOreOverlay.java | 9 +- .../plugins/motherlode/MotherlodeOverlay.java | 15 +- .../plugins/motherlode/MotherlodePlugin.java | 57 +- .../motherlode/MotherlodeRocksOverlay.java | 14 +- .../motherlode/MotherlodeSackOverlay.java | 10 +- .../plugins/motherlode/MotherlodeSession.java | 17 +- .../mousehighlight/MouseHighlightOverlay.java | 16 +- .../mousehighlight/MouseHighlightPlugin.java | 44 +- .../plugins/mta/MTAInventoryOverlay.java | 4 +- .../client/plugins/mta/MTAPlugin.java | 6 +- .../runelite/client/plugins/mta/MTARoom.java | 2 +- .../client/plugins/mta/MTASceneOverlay.java | 4 +- .../plugins/mta/alchemy/AlchemyItem.java | 2 +- .../plugins/mta/alchemy/AlchemyRoom.java | 20 +- .../plugins/mta/alchemy/AlchemyRoomTimer.java | 4 +- .../mta/enchantment/EnchantmentRoom.java | 20 +- .../mta/graveyard/GraveyardCounter.java | 2 +- .../plugins/mta/graveyard/GraveyardRoom.java | 21 +- .../client/plugins/mta/telekinetic/Maze.java | 2 +- .../mta/telekinetic/TelekineticRoom.java | 20 +- .../plugins/multiindicators/MapLocations.java | 28 +- .../MultiIndicatorsMinimapOverlay.java | 26 +- .../MultiIndicatorsOverlay.java | 17 +- .../MultiIndicatorsPlugin.java | 71 +- .../musicindicator/MusicIndicatorPlugin.java | 3 +- .../plugins/musiclist/MusicListPlugin.java | 2 + .../nightmarezone/AbsorptionCounter.java | 3 +- .../nightmarezone/NightmareZoneOverlay.java | 31 +- .../nightmarezone/NightmareZonePlugin.java | 72 +- .../client/plugins/notes/NotesPanel.java | 4 +- .../client/plugins/notes/NotesPlugin.java | 2 + .../plugins/npchighlight/MemorizedNpc.java | 21 +- .../npchighlight/NpcIndicatorsPlugin.java | 37 +- .../npchighlight/NpcMinimapOverlay.java | 13 +- .../plugins/npchighlight/NpcSceneOverlay.java | 16 +- .../plugins/npcstatus/MemorizedNPC.java | 19 +- .../plugins/npcstatus/NpcStatusConfig.java | 6 +- .../plugins/npcstatus/NpcStatusOverlay.java | 4 +- .../plugins/npcstatus/NpcStatusPlugin.java | 33 +- .../npcunaggroarea/AggressionTimer.java | 7 +- .../NpcAggroAreaNotWorkingOverlay.java | 8 +- .../npcunaggroarea/NpcAggroAreaOverlay.java | 8 +- .../npcunaggroarea/NpcAggroAreaPlugin.java | 60 +- .../ObjectIndicatorsOverlay.java | 14 +- .../ObjectIndicatorsPlugin.java | 37 + .../opponentinfo/OpponentInfoOverlay.java | 17 +- .../opponentinfo/OpponentInfoPlugin.java | 30 + .../opponentinfo/PlayerComparisonOverlay.java | 8 +- .../plugins/party/PartyPingOverlay.java | 2 + .../client/plugins/party/PartyPlugin.java | 50 +- .../plugins/party/PartyStatsOverlay.java | 8 +- .../plugins/party/PartyWorldMapPoint.java | 2 +- .../plugins/performancestats/Performance.java | 9 +- .../PerformanceStatsOverlay.java | 8 +- .../PerformanceStatsPlugin.java | 28 +- .../client/plugins/pestcontrol/Game.java | 29 +- .../plugins/pestcontrol/GangplankOverlay.java | 6 +- .../plugins/pestcontrol/HintArrowOverlay.java | 6 +- .../pestcontrol/NpcHighlightContext.java | 7 +- .../pestcontrol/NpcHighlightOverlay.java | 6 +- .../plugins/pestcontrol/PestControlNpc.java | 65 +- .../pestcontrol/PestControlPlugin.java | 101 ++- .../pestcontrol/PestControlRepairObject.java | 15 +- .../pestcontrol/PointsInfoboxCounter.java | 7 +- .../client/plugins/pestcontrol/Portal.java | 13 +- .../plugins/pestcontrol/PortalColor.java | 3 +- .../plugins/pestcontrol/PortalRotation.java | 2 +- .../pestcontrol/PortalWeaknessOverlay.java | 16 +- .../plugins/pestcontrol/RepairOverlay.java | 18 +- .../plugins/pestcontrol/TimerOverlay.java | 6 +- .../plugins/pestcontrol/WidgetOverlay.java | 6 +- .../plugins/pestcontrol/WidgetPortal.java | 3 +- .../pileindicators/PileIndicatorsConfig.java | 142 ++-- .../pileindicators/PileIndicatorsOverlay.java | 26 +- .../pileindicators/PileIndicatorsPlugin.java | 89 ++- .../PlayerIndicatorsConfig.java | 22 +- .../PlayerIndicatorsMinimapOverlay.java | 21 +- .../PlayerIndicatorsOverlay.java | 24 +- .../PlayerIndicatorsPlugin.java | 152 +++- .../PlayerIndicatorsService.java | 46 +- .../PlayerIndicatorsTileOverlay.java | 11 +- .../playerinfo/PlayerInfoCustomIndicator.java | 25 +- .../plugins/playerinfo/PlayerInfoPlugin.java | 47 +- .../pluginsorter/PluginSorterPlugin.java | 41 +- .../client/plugins/poh/BurnerOverlay.java | 8 +- .../client/plugins/poh/IncenseBurner.java | 5 +- .../client/plugins/poh/PohOverlay.java | 33 +- .../client/plugins/poh/PohPlugin.java | 58 ++ .../plugins/poison/PoisonActorOverlay.java | 4 +- .../client/plugins/poison/PoisonInfobox.java | 2 +- .../client/plugins/poison/PoisonOverlay.java | 2 + .../client/plugins/poison/PoisonPlugin.java | 45 +- .../prayagainstplayer/PlayerContainer.java | 2 +- .../PrayAgainstPlayerOverlay.java | 40 +- .../PrayAgainstPlayerOverlayPrayerTab.java | 8 +- .../PrayAgainstPlayerPlugin.java | 92 ++- .../plugins/prayer/PrayerBarOverlay.java | 22 +- .../client/plugins/prayer/PrayerCounter.java | 5 +- .../plugins/prayer/PrayerDoseOverlay.java | 12 +- .../plugins/prayer/PrayerFlickOverlay.java | 12 +- .../client/plugins/prayer/PrayerItems.java | 3 +- .../client/plugins/prayer/PrayerPlugin.java | 48 +- .../plugins/prayer/PrayerRestoreType.java | 2 +- .../client/plugins/prayer/PrayerType.java | 3 +- .../prayeralert/PrayerAlertOverlay.java | 14 +- .../prayeralert/PrayerAlertPlugin.java | 28 +- .../client/plugins/profiles/ProfilePanel.java | 4 +- .../plugins/profiles/ProfilesPanel.java | 4 +- .../plugins/profiles/ProfilesPlugin.java | 3 +- .../puzzlesolver/PuzzleSolverOverlay.java | 16 +- .../puzzlesolver/PuzzleSolverPlugin.java | 32 + .../puzzlesolver/VarrockMuseumAnswer.java | 3 +- .../client/plugins/pvptools/AttackMode.java | 2 +- .../pvptools/CurrentPlayersJFrame.java | 10 +- .../pvptools/MissingPlayersJFrame.java | 10 +- .../plugins/pvptools/PlayerCountOverlay.java | 8 +- .../plugins/pvptools/PvpToolsOverlay.java | 25 +- .../plugins/pvptools/PvpToolsPanel.java | 2 + .../plugins/pvptools/PvpToolsPlugin.java | 115 ++- .../client/plugins/pvptools/skull.png | Bin 448 -> 0 bytes .../pyramidplunder/PyramidPlunderConfig.java | 32 +- .../pyramidplunder/PyramidPlunderOverlay.java | 68 +- .../pyramidplunder/PyramidPlunderPlugin.java | 40 +- .../pyramidplunder/PyramidPlunderTimer.java | 4 +- .../plugins/questlist/QuestListPlugin.java | 10 +- .../runelite/client/plugins/raids/Raid.java | 5 +- .../client/plugins/raids/RaidRoom.java | 25 +- .../client/plugins/raids/RaidsOverlay.java | 73 +- .../client/plugins/raids/RaidsPanel.java | 7 +- .../plugins/raids/RaidsPartyOverlay.java | 4 +- .../client/plugins/raids/RaidsPlugin.java | 164 ++++- .../plugins/raids/RaidsPointsOverlay.java | 4 +- .../client/plugins/raids/RaidsTimer.java | 5 +- .../raids/shortcuts/ShortcutOverlay.java | 8 +- .../raids/shortcuts/ShortcutPlugin.java | 31 +- .../client/plugins/raids/solver/Layout.java | 7 +- .../plugins/raids/solver/LayoutSolver.java | 8 +- .../client/plugins/raids/solver/Room.java | 15 +- .../plugins/raids/solver/RotationSolver.java | 19 +- .../raidsthieving/BatSolver/BatSolver.java | 7 +- .../BatSolver/ChestIdentifier.java | 5 +- .../raidsthieving/BatSolver/SolutionSet.java | 7 +- .../BatSolver/ThievingRoomType.java | 2 +- .../plugins/raidsthieving/ChestOverlay.java | 14 +- .../plugins/raidsthieving/InstancePoint.java | 9 +- .../raidsthieving/RaidsThievingPlugin.java | 33 +- .../plugins/raidsthieving/ThievingChest.java | 12 +- .../plugins/regenmeter/RegenMeterOverlay.java | 43 +- .../plugins/regenmeter/RegenMeterPlugin.java | 39 +- .../reorderprayers/ReorderPrayersPlugin.java | 2 + .../reportbutton/ReportButtonPlugin.java | 17 +- .../plugins/reportbutton/TimeStyle.java | 2 +- .../plugins/roguesden/RoguesDenOverlay.java | 4 +- .../plugins/roguesden/RoguesDenPlugin.java | 2 + .../plugins/runecraft/AbyssOverlay.java | 38 +- .../client/plugins/runecraft/AbyssRifts.java | 7 +- .../plugins/runecraft/RunecraftOverlay.java | 7 +- .../plugins/runecraft/RunecraftPlugin.java | 72 +- .../plugins/runedoku/RunedokuConfig.java | 114 +-- .../plugins/runedoku/RunedokuOverlay.java | 8 +- .../plugins/runedoku/RunedokuPiece.java | 2 +- .../plugins/runedoku/RunedokuPlugin.java | 59 +- .../client/plugins/runedoku/RunedokuUtil.java | 49 +- .../client/plugins/runedoku/Sudoku.java | 13 +- .../runeliteplus/RuneLitePlusPlugin.java | 8 +- .../plugins/runenergy/RunEnergyOverlay.java | 2 + .../plugins/runenergy/RunEnergyPlugin.java | 2 + .../plugins/runepouch/RunepouchOverlay.java | 24 +- .../plugins/runepouch/RunepouchPlugin.java | 37 + .../client/plugins/runepouch/Runes.java | 11 +- .../plugins/safespot/SafeSpotOverlay.java | 8 +- .../plugins/safespot/SafeSpotPlugin.java | 60 +- .../ScreenMarkerCreationOverlay.java | 2 + .../ScreenMarkerMouseListener.java | 4 +- .../screenmarkers/ScreenMarkerOverlay.java | 7 +- .../screenmarkers/ScreenMarkerPlugin.java | 6 +- .../screenmarkers/ScreenMarkerRenderable.java | 4 +- .../ui/ScreenMarkerCreationPanel.java | 4 +- .../screenmarkers/ui/ScreenMarkerPanel.java | 4 +- .../ui/ScreenMarkerPluginPanel.java | 9 +- .../plugins/screenshot/ScreenshotOverlay.java | 4 +- .../plugins/screenshot/ScreenshotPlugin.java | 165 +++-- .../ShayzienInfirmaryOverlay.java | 6 +- .../ShayzienInfirmaryPlugin.java | 11 +- .../shiftwalker/ShiftWalkerInputListener.java | 2 + .../shiftwalker/ShiftWalkerPlugin.java | 26 +- .../skillcalculator/BankedCalculator.java | 12 +- .../skillcalculator/CacheSkillData.java | 2 +- .../skillcalculator/CalculatorType.java | 3 +- .../skillcalculator/SkillCalculator.java | 4 +- .../skillcalculator/SkillCalculatorPanel.java | 4 +- .../SkillCalculatorPlugin.java | 2 + .../plugins/skillcalculator/UIActionSlot.java | 2 + .../UICalculatorInputArea.java | 5 +- .../skillcalculator/UICombinedActionSlot.java | 4 +- .../banked/beans/Activity.java | 7 +- .../banked/beans/ActivitySecondaries.java | 5 +- .../banked/beans/SecondaryItem.java | 7 +- .../banked/ui/CriticalItemPanel.java | 7 +- .../skillcalculator/beans/SkillData.java | 3 +- .../skillcalculator/beans/SkillDataBonus.java | 3 +- .../skillcalculator/beans/SkillDataEntry.java | 3 +- .../client/plugins/skybox/SkyboxPlugin.java | 2 + .../client/plugins/slayer/KnapsackSolver.java | 2 + .../client/plugins/slayer/NPCPresence.java | 7 +- .../client/plugins/slayer/RenderStyle.java | 2 +- .../client/plugins/slayer/SlayerOverlay.java | 8 +- .../client/plugins/slayer/SlayerPlugin.java | 86 ++- .../plugins/slayer/SlayerTaskPanel.java | 2 + .../plugins/slayer/TargetClickboxOverlay.java | 16 +- .../plugins/slayer/TargetMinimapOverlay.java | 14 +- .../plugins/slayer/TargetWeaknessOverlay.java | 8 +- .../runelite/client/plugins/slayer/Task.java | 3 +- .../client/plugins/slayer/TaskBox.java | 2 + .../client/plugins/slayer/TaskCounter.java | 2 +- .../slayermusiq/SlayermusiqPlugin.java | 3 +- .../plugins/smelting/SmeltingOverlay.java | 4 +- .../plugins/smelting/SmeltingPlugin.java | 19 +- .../plugins/spawntimer/SpawnTimerConfig.java | 4 +- .../plugins/spawntimer/SpawnTimerOverlay.java | 32 +- .../plugins/spawntimer/SpawnTimerPlugin.java | 66 +- .../client/plugins/specbar/SpecBarPlugin.java | 3 +- .../client/plugins/specialcounter/Boss.java | 3 +- .../specialcounter/SpecialCounter.java | 4 +- .../specialcounter/SpecialCounterPlugin.java | 2 + .../specialcounter/SpecialCounterUpdate.java | 2 +- .../plugins/specialcounter/SpecialWeapon.java | 3 +- .../client/plugins/spellbook/Spellbook.java | 5 +- .../plugins/spellbook/SpellbookConfig.java | 45 -- .../spellbook/SpellbookDragOverlay.java | 2 +- .../spellbook/SpellbookMouseListener.java | 10 +- .../plugins/spellbook/SpellbookPlugin.java | 45 +- .../plugins/statusbars/StatusBarsOverlay.java | 10 +- .../plugins/statusbars/StatusBarsPlugin.java | 49 +- .../client/plugins/statusbars/Viewport.java | 3 +- .../plugins/statusbars/config/BarMode.java | 3 +- .../statusbars/renderer/BarRenderer.java | 55 +- .../statusbars/renderer/EnergyRenderer.java | 13 +- .../renderer/HitPointsRenderer.java | 13 +- .../statusbars/renderer/PrayerRenderer.java | 13 +- .../renderer/SpecialAttackRenderer.java | 13 +- .../stonedloottracker/ItemSortTypes.java | 3 +- .../StonedLootTrackerPlugin.java | 3 +- .../stonedloottracker/data/BossTab.java | 3 +- .../stonedloottracker/data/LootRecord.java | 5 +- .../data/LootRecordCustom.java | 5 +- .../data/LootTrackerItemEntry.java | 5 +- .../plugins/stonedloottracker/data/Pet.java | 5 +- .../stonedloottracker/data/UniqueItem.java | 9 +- .../stonedloottracker/ui/ItemPanel.java | 7 +- .../stonedloottracker/ui/LootGrid.java | 4 +- .../stonedloottracker/ui/LootPanel.java | 4 +- .../stonedloottracker/ui/LootTrackerBox.java | 6 +- .../ui/LootTrackerPanel.java | 4 +- .../stonedloottracker/ui/SelectionPanel.java | 6 +- .../stonedloottracker/ui/TextPanel.java | 5 +- .../stonedloottracker/ui/UniqueItemPanel.java | 7 +- .../stretchedmode/StretchedModePlugin.java | 2 + .../stretchedmode/TranslateMouseListener.java | 4 +- .../TranslateMouseWheelListener.java | 4 +- .../suppliestracker/BlowpipeDartType.java | 3 +- .../plugins/suppliestracker/ItemType.java | 3 +- .../plugins/suppliestracker/MenuAction.java | 11 +- .../plugins/suppliestracker/SuppliesBox.java | 6 +- .../suppliestracker/SuppliesTrackerItem.java | 6 +- .../suppliestracker/SuppliesTrackerPanel.java | 3 +- .../SuppliesTrackerPlugin.java | 3 +- .../plugins/tarnslair/TarnsLairOverlay.java | 4 +- .../plugins/tarnslair/TarnsLairPlugin.java | 3 +- .../plugins/teamcapes/TeamCapesOverlay.java | 4 +- .../plugins/teamcapes/TeamCapesPlugin.java | 2 + .../TearsOfGuthixExperienceOverlay.java | 2 + .../tearsofguthix/TearsOfGuthixOverlay.java | 4 +- .../tearsofguthix/TearsOfGuthixPlugin.java | 2 + .../client/plugins/theatre/RoomHandler.java | 10 +- .../plugins/theatre/TheatreOverlay.java | 12 +- .../client/plugins/theatre/TheatrePlugin.java | 105 ++- .../plugins/theatre/rooms/BloatHandler.java | 13 +- .../plugins/theatre/rooms/MaidenHandler.java | 13 +- .../client/plugins/theatre/rooms/Nylos.java | 9 +- .../theatre/rooms/SotetsegHandler.java | 17 +- .../plugins/theatre/rooms/VerzikHandler.java | 31 +- .../theatre/rooms/nylocas/NyloHandler.java | 34 +- .../theatre/rooms/nylocas/NyloOverlay.java | 23 +- .../theatre/rooms/nylocas/NyloPredictor.java | 23 +- .../theatre/rooms/xarpus/XarpusCounter.java | 13 +- .../theatre/rooms/xarpus/XarpusHandler.java | 18 +- .../plugins/theatre/timers/RoomTimer.java | 2 +- .../plugins/thieving/ThievingOverlay.java | 4 +- .../plugins/thieving/ThievingPlugin.java | 23 +- .../plugins/thieving/ThievingSession.java | 2 +- .../plugins/ticktimers/NPCContainer.java | 11 +- .../plugins/ticktimers/TickTimersConfig.java | 3 +- .../plugins/ticktimers/TickTimersPlugin.java | 47 +- .../plugins/ticktimers/TimersOverlay.java | 20 +- .../tileindicators/TileIndicatorsConfig.java | 36 +- .../tileindicators/TileIndicatorsOverlay.java | 20 +- .../tileindicators/TileIndicatorsPlugin.java | 45 ++ .../client/plugins/timers/GameIndicator.java | 4 +- .../client/plugins/timers/GameTimer.java | 19 +- .../plugins/timers/IndicatorIndicator.java | 5 +- .../client/plugins/timers/TimerTimer.java | 4 +- .../client/plugins/timers/TimersPlugin.java | 161 ++-- .../plugins/timestamp/TimestampPlugin.java | 2 + .../plugins/tithefarm/TitheFarmPlant.java | 17 +- .../tithefarm/TitheFarmPlantOverlay.java | 12 +- .../plugins/tithefarm/TitheFarmPlantType.java | 9 +- .../plugins/tithefarm/TitheFarmPlugin.java | 26 +- .../client/plugins/tmorph/TMorph.java | 376 +++++++--- .../tobdamagecount/DamageCounterPlugin.java | 7 +- .../client/plugins/twitch/TwitchPlugin.java | 2 + .../client/plugins/twitch/irc/Message.java | 3 +- .../plugins/twitch/irc/TwitchIRCClient.java | 2 +- .../client/plugins/vetion/VetionPlugin.java | 3 +- .../virtuallevels/VirtualLevelsPlugin.java | 2 + .../client/plugins/vorkath/Vorkath.java | 2 +- .../client/plugins/vorkath/VorkathAttack.java | 3 +- .../plugins/vorkath/VorkathOverlay.java | 4 +- .../client/plugins/vorkath/VorkathPlugin.java | 2 + .../vorkath/ZombifiedSpawnOverlay.java | 4 +- .../warindicators/WarIndicatorConfig.java | 1 - .../WarIndicatorMiniMapOverlay.java | 14 +- .../warindicators/WarIndicatorOverlay.java | 16 +- .../warindicators/WarIndicatorPlugin.java | 64 +- .../warindicators/WarIndicatorService.java | 20 +- .../WhaleWatchersGloryOverlay.java | 9 +- .../whalewatchers/WhaleWatchersOverlay.java | 17 +- .../whalewatchers/WhaleWatchersPlugin.java | 56 +- .../WhaleWatchersProtOverlay.java | 9 +- .../WhaleWatchersSmiteableOverlay.java | 4 +- .../client/plugins/wiki/WikiPlugin.java | 2 + .../wiki/WikiSearchChatboxTextInput.java | 3 +- .../client/plugins/wiki/WikiSprite.java | 5 +- .../WildernessLocationsOverlay.java | 9 +- .../WildernessLocationsPlugin.java | 27 +- .../wintertodt/WintertodtActivity.java | 3 +- .../wintertodt/WintertodtInterruptType.java | 3 +- .../plugins/wintertodt/WintertodtOverlay.java | 4 +- .../plugins/wintertodt/WintertodtPlugin.java | 27 +- .../config/WintertodtNotifyMode.java | 3 +- .../client/plugins/woodcutting/Axe.java | 3 +- .../client/plugins/woodcutting/Tree.java | 5 +- .../woodcutting/WoodcuttingOverlay.java | 8 +- .../woodcutting/WoodcuttingPlugin.java | 42 +- .../woodcutting/WoodcuttingSession.java | 6 +- .../woodcutting/WoodcuttingTreesOverlay.java | 8 +- .../worldhopper/WorldHopperPlugin.java | 54 +- .../worldhopper/WorldSwitcherPanel.java | 2 + .../plugins/worldhopper/WorldTableHeader.java | 2 + .../plugins/worldhopper/WorldTableRow.java | 2 + .../worldhopper/ping/IcmpEchoReply.java | 2 +- .../plugins/worldmap/WorldMapPlugin.java | 87 ++- .../client/plugins/xpglobes/XpGlobe.java | 5 +- .../plugins/xpglobes/XpGlobesOverlay.java | 53 +- .../plugins/xpglobes/XpGlobesPlugin.java | 56 +- .../client/plugins/xptracker/XpInfoBox.java | 9 +- .../plugins/xptracker/XpInfoBoxOverlay.java | 7 +- .../client/plugins/xptracker/XpPanel.java | 4 +- .../plugins/xptracker/XpTrackerPlugin.java | 46 +- .../plugins/zulrah/ImagePanelComponent.java | 13 +- .../client/plugins/zulrah/TextComponent.java | 7 +- .../client/plugins/zulrah/ZulrahConfig.java | 16 +- .../client/plugins/zulrah/ZulrahInstance.java | 6 +- .../client/plugins/zulrah/ZulrahPlugin.java | 7 +- .../overlays/ZulrahCurrentPhaseOverlay.java | 6 +- .../zulrah/overlays/ZulrahImageManager.java | 8 +- .../overlays/ZulrahNextPhaseOverlay.java | 4 +- .../zulrah/overlays/ZulrahOverlay.java | 13 +- .../zulrah/overlays/ZulrahPrayerOverlay.java | 4 +- .../zulrah/patterns/ZulrahPattern.java | 2 +- .../plugins/zulrah/phase/ZulrahPhase.java | 5 - .../runelite/client/ui/ContainableFrame.java | 11 + .../client/ui/overlay/OverlayRenderer.java | 32 +- .../plugins/bank/BankCalculationTest.java | 3 +- .../plugins/cerberus/CerberusPluginTest.java | 2 +- .../chatfilter/ChatFilterPluginTest.java | 31 +- .../plugins/cooking/CookingPluginTest.java | 3 +- .../idlenotifier/IdleNotifierPluginTest.java | 52 +- .../npchighlight/NpcIndicatorsPluginTest.java | 3 +- .../screenshot/ScreenshotPluginTest.java | 16 +- .../plugins/slayer/SlayerPluginTest.java | 24 +- .../plugins/timers/TimersPluginTest.java | 8 +- .../net/runelite/mixins/RSActorMixin.java | 2 +- .../net/runelite/mixins/RSClientMixin.java | 8 +- .../net/runelite/mixins/RSWidgetMixin.java | 2 +- 694 files changed, 9824 insertions(+), 4525 deletions(-) delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/normal.png delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssitConfig.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/pvptools/skull.png diff --git a/runelite-api/src/main/java/net/runelite/api/GameState.java b/runelite-api/src/main/java/net/runelite/api/GameState.java index 5f9083f9ca..6a61fcfe59 100644 --- a/runelite-api/src/main/java/net/runelite/api/GameState.java +++ b/runelite-api/src/main/java/net/runelite/api/GameState.java @@ -24,6 +24,11 @@ */ package net.runelite.api; +import java.util.Arrays; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + /** * An enumeration of game states the client is in. */ @@ -66,6 +71,10 @@ public enum GameState */ HOPPING(45); + private static final Map stateValueMap = + Arrays.stream(GameState.values()) + .collect(Collectors.toMap(gs -> gs.state, Function.identity())); + /** * The raw state value. */ @@ -85,13 +94,6 @@ public enum GameState */ public static GameState of(int state) { - for (GameState gs : GameState.values()) - { - if (gs.state == state) - { - return gs; - } - } - return UNKNOWN; + return stateValueMap.getOrDefault(state, UNKNOWN); } } diff --git a/runelite-api/src/main/java/net/runelite/api/Perspective.java b/runelite-api/src/main/java/net/runelite/api/Perspective.java index 4d3f312386..5c1955f249 100644 --- a/runelite-api/src/main/java/net/runelite/api/Perspective.java +++ b/runelite-api/src/main/java/net/runelite/api/Perspective.java @@ -24,6 +24,7 @@ */ package net.runelite.api; +import java.awt.geom.Path2D; import static net.runelite.api.Constants.TILE_FLAG_BRIDGE; import java.awt.FontMetrics; import java.awt.Graphics2D; @@ -549,7 +550,7 @@ public class Perspective ) { int radius = 5; - Area geometry = new Area(); + Path2D.Double geometry = new Path2D.Double(); final int tileHeight = getTileHeight(client, point, client.getPlane()); @@ -607,10 +608,10 @@ public class Perspective continue; } - geometry.add(new Area(clickableRect)); + geometry.append(clickableRect, false); } - return geometry; + return new Area(geometry); } private static Area getAABB( diff --git a/runelite-api/src/main/java/net/runelite/api/events/BeforeRender.java b/runelite-api/src/main/java/net/runelite/api/events/BeforeRender.java index 741041e1e0..73c004d4b3 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/BeforeRender.java +++ b/runelite-api/src/main/java/net/runelite/api/events/BeforeRender.java @@ -29,4 +29,10 @@ package net.runelite.api.events; */ public class BeforeRender { + public static final BeforeRender INSTANCE = new BeforeRender(); + + private BeforeRender() + { + // noop + } } diff --git a/runelite-api/src/main/java/net/runelite/api/events/CannonballFired.java b/runelite-api/src/main/java/net/runelite/api/events/CannonballFired.java index 077a88096d..c44789965a 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/CannonballFired.java +++ b/runelite-api/src/main/java/net/runelite/api/events/CannonballFired.java @@ -29,4 +29,10 @@ package net.runelite.api.events; */ public class CannonballFired { + public static final CannonballFired INSTANCE = new CannonballFired(); + + private CannonballFired() + { + // noop + } } diff --git a/runelite-api/src/main/java/net/runelite/api/events/CanvasSizeChanged.java b/runelite-api/src/main/java/net/runelite/api/events/CanvasSizeChanged.java index e76e82dd6d..0efef18d0d 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/CanvasSizeChanged.java +++ b/runelite-api/src/main/java/net/runelite/api/events/CanvasSizeChanged.java @@ -29,4 +29,10 @@ package net.runelite.api.events; */ public class CanvasSizeChanged { + public static final CanvasSizeChanged INSTANCE = new CanvasSizeChanged(); + + private CanvasSizeChanged() + { + // noop + } } diff --git a/runelite-api/src/main/java/net/runelite/api/events/ClientTick.java b/runelite-api/src/main/java/net/runelite/api/events/ClientTick.java index 369ff7982a..6874f4145c 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/ClientTick.java +++ b/runelite-api/src/main/java/net/runelite/api/events/ClientTick.java @@ -29,4 +29,10 @@ package net.runelite.api.events; */ public class ClientTick { + public static final ClientTick INSTANCE = new ClientTick(); + + private ClientTick() + { + // noop + } } diff --git a/runelite-api/src/main/java/net/runelite/api/events/GameTick.java b/runelite-api/src/main/java/net/runelite/api/events/GameTick.java index aefa7fc3e4..2bf035633d 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/GameTick.java +++ b/runelite-api/src/main/java/net/runelite/api/events/GameTick.java @@ -24,8 +24,6 @@ */ package net.runelite.api.events; -import lombok.Data; - // The NPC update event seem to run every server tick, // but having the game tick event after all packets // have been processed is typically more useful. @@ -43,7 +41,12 @@ import lombok.Data; * Note that occurrences that take place purely on the client, such as right * click menus, are independent of the game tick. */ -@Data public class GameTick { + public static final GameTick INSTANCE = new GameTick(); + + private GameTick() + { + // noop + } } diff --git a/runelite-api/src/main/java/net/runelite/api/events/LocalPlayerDeath.java b/runelite-api/src/main/java/net/runelite/api/events/LocalPlayerDeath.java index e46b815f49..0cf8f33c76 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/LocalPlayerDeath.java +++ b/runelite-api/src/main/java/net/runelite/api/events/LocalPlayerDeath.java @@ -29,4 +29,10 @@ package net.runelite.api.events; */ public class LocalPlayerDeath { + public static final LocalPlayerDeath INSTANCE = new LocalPlayerDeath(); + + private LocalPlayerDeath() + { + // noop + } } diff --git a/runelite-api/src/main/java/net/runelite/api/events/UsernameChanged.java b/runelite-api/src/main/java/net/runelite/api/events/UsernameChanged.java index 91bed8a304..3dea001150 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/UsernameChanged.java +++ b/runelite-api/src/main/java/net/runelite/api/events/UsernameChanged.java @@ -32,4 +32,10 @@ package net.runelite.api.events; */ public class UsernameChanged { + public static final UsernameChanged INSTANCE = new UsernameChanged(); + + private UsernameChanged() + { + // noop + } } diff --git a/runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java b/runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java index d5479e3485..6f58e9fe07 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java +++ b/runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java @@ -24,13 +24,16 @@ */ package net.runelite.api.events; -import lombok.Value; - /** * An event where the position of a {@link net.runelite.api.widgets.Widget} * relative to its parent has changed. */ -@Value public class WidgetPositioned { + public static final WidgetPositioned INSTANCE = new WidgetPositioned(); + + private WidgetPositioned() + { + // noop + } } diff --git a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java index ca25fa84a8..5c53677308 100644 --- a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java +++ b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java @@ -87,9 +87,6 @@ public class Hooks implements Callbacks private static final OverlayRenderer renderer = injector.getInstance(OverlayRenderer.class); private static final OverlayManager overlayManager = injector.getInstance(OverlayManager.class); - private static final GameTick GAME_TICK = new GameTick(); - private static final BeforeRender BEFORE_RENDER = new BeforeRender(); - @Inject private EventBus eventBus; @@ -151,13 +148,13 @@ public class Hooks implements Callbacks deferredEventBus.replay(); - eventBus.post(GAME_TICK); + eventBus.post(GameTick.INSTANCE); int tick = client.getTickCount(); client.setTickCount(tick + 1); } - eventBus.post(BEFORE_RENDER); + eventBus.post(BeforeRender.INSTANCE); clientThread.invoke(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java index 805b99005e..52488fb4e3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java @@ -43,11 +43,16 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; import java.util.stream.Collectors; import javax.inject.Inject; @@ -228,7 +233,6 @@ public class PluginManager .directed() .build(); - List scannedPlugins = new ArrayList<>(); ClassPath classPath = ClassPath.from(classLoader); ImmutableSet classes = packageName == null ? classPath.getAllClasses() @@ -285,24 +289,47 @@ public class PluginManager throw new RuntimeException("Plugin dependency graph contains a cycle!"); } - List> sortedPlugins = topologicalSort(graph); + List>> sortedPlugins = topologicalGroupSort(graph); sortedPlugins = Lists.reverse(sortedPlugins); - for (Class pluginClazz : sortedPlugins) - { - Plugin plugin; - try - { - plugin = instantiate(scannedPlugins, (Class) pluginClazz); - } - catch (PluginInstantiationException ex) - { - log.warn("Error instantiating plugin!", ex); - continue; - } + final long start = System.currentTimeMillis(); - scannedPlugins.add(plugin); - } + // some plugins get stuck on IO, so add some extra threads + ExecutorService exec = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 2); + + List scannedPlugins = new CopyOnWriteArrayList<>(); + sortedPlugins.forEach(group -> + { + List> curGroup = new ArrayList<>(); + group.forEach(pluginClazz -> + curGroup.add(exec.submit(() -> + { + Plugin plugin; + try + { + plugin = instantiate(scannedPlugins, (Class) pluginClazz); + } + catch (PluginInstantiationException e) + { + log.warn("Error instantiating plugin!", e); + return; + } + scannedPlugins.add(plugin); + }))); + curGroup.forEach(future -> + { + try + { + future.get(); + } + catch (InterruptedException | ExecutionException e) + { + e.printStackTrace(); + } + }); + }); + + log.info("Plugin instantiation took {}ms", System.currentTimeMillis() - start); return scannedPlugins; } @@ -515,40 +542,54 @@ public class PluginManager } /** - * Topologically sort a graph. Uses Kahn's algorithm. - * + * Topologically sort a graph into separate groups. + * Each group represents the dependency level of the plugins. + * Plugins in group (index) 0 has no dependents. + * Plugins in group 1 has dependents in group 0. + * Plugins in group 2 has dependents in group 1, etc. + * This allows for loading dependent groups serially, starting from the last group, + * while loading plugins within each group in parallel. * @param graph * @param * @return */ - private List topologicalSort(Graph graph) + private List> topologicalGroupSort(Graph graph) { - MutableGraph graphCopy = Graphs.copyOf(graph); - List l = new ArrayList<>(); - Set s = graphCopy.nodes().stream() - .filter(node -> graphCopy.inDegree(node) == 0) + final Set root = graph.nodes().stream() + .filter(node -> graph.inDegree(node) == 0) .collect(Collectors.toSet()); - while (!s.isEmpty()) - { - Iterator it = s.iterator(); - T n = it.next(); - it.remove(); + final Map dependencyCount = new HashMap<>(); - l.add(n); + root.forEach(n -> dependencyCount.put(n, 0)); + root.forEach(n -> graph.successors(n) + .forEach(m -> incrementChildren(graph, dependencyCount, m, dependencyCount.get(n) + 1))); - for (T m : graphCopy.successors(n)) + // create list dependency grouping + final List> dependencyGroups = new ArrayList<>(); + final int[] curGroup = {-1}; + + dependencyCount.entrySet().stream() + .sorted(Map.Entry.comparingByValue()) + .forEach(entry -> { - graphCopy.removeEdge(n, m); - if (graphCopy.inDegree(m) == 0) + if (entry.getValue() != curGroup[0]) { - s.add(m); + curGroup[0] = entry.getValue(); + dependencyGroups.add(new ArrayList<>()); } - } - } - if (!graphCopy.edges().isEmpty()) + dependencyGroups.get(dependencyGroups.size() - 1).add(entry.getKey()); + }); + + return dependencyGroups; + } + + private void incrementChildren(Graph graph, Map dependencyCount, T n, int val) + { + if (!dependencyCount.containsKey(n) || dependencyCount.get(n) < val) { - throw new RuntimeException("Graph has at least one cycle"); + dependencyCount.put(n, val); + graph.successors(n).forEach(m -> + incrementChildren(graph, dependencyCount, m, val + 1)); } - return l; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java index 55ab81fbe3..07bd977a81 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.account; import java.awt.image.BufferedImage; import java.util.concurrent.ScheduledExecutorService; import javax.inject.Inject; +import javax.inject.Singleton; import javax.swing.JOptionPane; import lombok.extern.slf4j.Slf4j; import net.runelite.client.account.AccountSession; @@ -47,6 +48,7 @@ import net.runelite.client.util.ImageUtil; loadWhenOutdated = true ) @Slf4j +@Singleton public class AccountPlugin extends Plugin { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java index ee77f19ecc..bc67f82a8c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java @@ -32,6 +32,7 @@ import java.util.List; import java.util.Map; import java.util.regex.Pattern; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.FontTypeFace; @@ -66,6 +67,7 @@ import net.runelite.client.util.Text; description = "Display level requirements in Achievement Diary interface", tags = {"achievements", "tasks"} ) +@Singleton public class DiaryRequirementsPlugin extends Plugin { private static final String AND_JOINER = ", "; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java index aa88396038..7db0667088 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java @@ -32,45 +32,43 @@ import java.awt.Polygon; import java.awt.geom.Area; import java.util.List; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Point; import net.runelite.api.Tile; -import net.runelite.api.coords.LocalPoint; import net.runelite.client.game.AgilityShortcut; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton class AgilityOverlay extends Overlay { private static final Color SHORTCUT_HIGH_LEVEL_COLOR = Color.ORANGE; private final Client client; private final AgilityPlugin plugin; - private final AgilityConfig config; @Inject - private AgilityOverlay(Client client, AgilityPlugin plugin, AgilityConfig config) + private AgilityOverlay(final Client client, final AgilityPlugin plugin) { super(plugin); setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); this.client = client; this.plugin = plugin; - this.config = config; } @Override public Dimension render(Graphics2D graphics) { - LocalPoint playerLocation = client.getLocalPlayer().getLocalLocation(); Point mousePosition = client.getMouseCanvasPosition(); final List marksOfGrace = plugin.getMarksOfGrace(); plugin.getObstacles().forEach((object, obstacle) -> { - if (Obstacles.SHORTCUT_OBSTACLE_IDS.containsKey(object.getId()) && !config.highlightShortcuts() || - Obstacles.TRAP_OBSTACLE_IDS.contains(object.getId()) && !config.showTrapOverlay()) + if (Obstacles.SHORTCUT_OBSTACLE_IDS.containsKey(object.getId()) && !plugin.isHighlightShortcuts() || + Obstacles.TRAP_OBSTACLE_IDS.contains(object.getId()) && !plugin.isShowTrapOverlay()) { return; } @@ -84,7 +82,7 @@ class AgilityOverlay extends Overlay Polygon polygon = object.getCanvasTilePoly(); if (polygon != null) { - OverlayUtil.renderPolygon(graphics, polygon, config.getTrapColor()); + OverlayUtil.renderPolygon(graphics, polygon, plugin.getTrapColor()); } return; } @@ -92,10 +90,10 @@ class AgilityOverlay extends Overlay if (objectClickbox != null) { AgilityShortcut agilityShortcut = obstacle.getShortcut(); - Color configColor = agilityShortcut == null || agilityShortcut.getLevel() <= plugin.getAgilityLevel() ? config.getOverlayColor() : SHORTCUT_HIGH_LEVEL_COLOR; - if (config.highlightMarks() && !marksOfGrace.isEmpty()) + Color configColor = agilityShortcut == null || agilityShortcut.getLevel() <= plugin.getAgilityLevel() ? plugin.getOverlayColor() : SHORTCUT_HIGH_LEVEL_COLOR; + if (plugin.isHighlightMarks() && !marksOfGrace.isEmpty()) { - configColor = config.getMarkColor(); + configColor = plugin.getMarkColor(); } if (objectClickbox.contains(mousePosition.getX(), mousePosition.getY())) @@ -115,7 +113,7 @@ class AgilityOverlay extends Overlay }); - if (config.highlightMarks() && !marksOfGrace.isEmpty()) + if (plugin.isHighlightMarks() && !marksOfGrace.isEmpty()) { for (Tile markOfGraceTile : marksOfGrace) { @@ -128,7 +126,7 @@ class AgilityOverlay extends Overlay continue; } - OverlayUtil.renderPolygon(graphics, poly, config.getMarkColor()); + OverlayUtil.renderPolygon(graphics, poly, plugin.getMarkColor()); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java index abe18393d8..043cc4e23a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java @@ -32,6 +32,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; @@ -83,14 +85,15 @@ import net.runelite.client.util.ColorUtil; tags = {"grace", "marks", "overlay", "shortcuts", "skilling", "traps"} ) @Slf4j +@Singleton public class AgilityPlugin extends Plugin { private static final int AGILITY_ARENA_REGION_ID = 11157; - @Getter + @Getter(AccessLevel.PACKAGE) private final Map obstacles = new HashMap<>(); - @Getter + @Getter(AccessLevel.PACKAGE) private final List marksOfGrace = new ArrayList<>(); @Inject @@ -117,13 +120,13 @@ public class AgilityPlugin extends Plugin @Inject private ItemManager itemManager; - @Getter + @Getter(AccessLevel.PACKAGE) private AgilitySession session; private int lastAgilityXp; private WorldPoint lastArenaTicketPosition; - @Getter + @Getter(AccessLevel.PACKAGE) private int agilityLevel; @Provides @@ -132,9 +135,36 @@ public class AgilityPlugin extends Plugin return configManager.getConfig(AgilityConfig.class); } + // Config values + @Getter(AccessLevel.PACKAGE) + private boolean showLapCount; + @Getter(AccessLevel.PACKAGE) + private int lapTimeout; + @Getter(AccessLevel.PACKAGE) + private boolean lapsToLevel; + @Getter(AccessLevel.PACKAGE) + private boolean lapsToGoal; + @Getter(AccessLevel.PACKAGE) + private Color overlayColor; + @Getter(AccessLevel.PACKAGE) + private boolean highlightMarks; + @Getter(AccessLevel.PACKAGE) + private Color markColor; + @Getter(AccessLevel.PACKAGE) + private boolean highlightShortcuts; + @Getter(AccessLevel.PACKAGE) + private boolean showTrapOverlay; + @Getter(AccessLevel.PACKAGE) + private Color trapColor; + private boolean notifyAgilityArena; + private boolean showAgilityArenaTimer; + private boolean showShortcutLevel; + @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(agilityOverlay); overlayManager.add(lapCounterOverlay); agilityLevel = client.getBoostedSkillLevel(Skill.AGILITY); @@ -179,16 +209,40 @@ public class AgilityPlugin extends Plugin @Subscribe public void onConfigChanged(ConfigChanged event) { - if (!config.showAgilityArenaTimer()) + if (!event.getGroup().equals("agility")) + { + return; + } + + updateConfig(); + + if (!this.showAgilityArenaTimer) { removeAgilityArenaTimer(); } } + public void updateConfig() + { + this.showLapCount = config.showLapCount(); + this.lapTimeout = config.lapTimeout(); + this.lapsToLevel = config.lapsToLevel(); + this.lapsToGoal = config.lapsToGoal(); + this.overlayColor = config.getOverlayColor(); + this.highlightMarks = config.highlightMarks(); + this.markColor = config.getMarkColor(); + this.highlightShortcuts = config.highlightShortcuts(); + this.showTrapOverlay = config.showTrapOverlay(); + this.trapColor = config.getTrapColor(); + this.notifyAgilityArena = config.notifyAgilityArena(); + this.showAgilityArenaTimer = config.showAgilityArenaTimer(); + this.showShortcutLevel = config.showShortcutLevel(); + } + @Subscribe public void onExperienceChanged(ExperienceChanged event) { - if (event.getSkill() != AGILITY || !config.showLapCount()) + if (event.getSkill() != AGILITY || !this.showLapCount) { return; } @@ -272,12 +326,12 @@ public class AgilityPlugin extends Plugin { log.debug("Ticked position moved from {} to {}", oldTickPosition, newTicketPosition); - if (config.notifyAgilityArena()) + if (this.notifyAgilityArena) { notifier.notify("Ticket location changed"); } - if (config.showAgilityArenaTimer()) + if (this.showAgilityArenaTimer) { showNewAgilityArenaTimer(); } @@ -430,7 +484,7 @@ public class AgilityPlugin extends Plugin @Subscribe public void onMenuEntryAdded(MenuEntryAdded event) { - if (!config.showShortcutLevel()) + if (!this.showShortcutLevel) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilitySession.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilitySession.java index 72e9a0dd07..1c6e413a46 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilitySession.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilitySession.java @@ -42,7 +42,7 @@ class AgilitySession private int lapsTillLevel; private int lapsTillGoal; - AgilitySession(Courses course) + AgilitySession(final Courses course) { this.course = course; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/Courses.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/Courses.java index cc732561c0..91812e30f8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/Courses.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/Courses.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.agility; import com.google.common.collect.ImmutableMap; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.coords.WorldPoint; @@ -50,16 +51,16 @@ enum Courses private final static Map coursesByRegion; - @Getter + @Getter(AccessLevel.PACKAGE) private final double totalXp; - @Getter + @Getter(AccessLevel.PACKAGE) private final int lastObstacleXp; - @Getter + @Getter(AccessLevel.PACKAGE) private final int regionId; - @Getter + @Getter(AccessLevel.PACKAGE) private final WorldPoint[] courseEndWorldPoints; static diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java index 04c60d4430..e8d0a2771c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java @@ -29,6 +29,7 @@ import java.awt.Graphics2D; import java.time.Duration; import java.time.Instant; import javax.inject.Inject; +import javax.inject.Singleton; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import net.runelite.client.ui.overlay.Overlay; import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE; @@ -39,21 +40,20 @@ import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; +@Singleton class LapCounterOverlay extends Overlay { private final AgilityPlugin plugin; - private final AgilityConfig config; private final PanelComponent panelComponent = new PanelComponent(); @Inject - private LapCounterOverlay(AgilityPlugin plugin, AgilityConfig config) + private LapCounterOverlay(final AgilityPlugin plugin) { super(plugin); setPosition(OverlayPosition.TOP_LEFT); setPriority(OverlayPriority.LOW); this.plugin = plugin; - this.config = config; getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Agility overlay")); } @@ -62,7 +62,7 @@ class LapCounterOverlay extends Overlay { AgilitySession session = plugin.getSession(); - if (!config.showLapCount() || + if (!plugin.isShowLapCount() || session == null || session.getLastLapCompleted() == null || session.getCourse() == null) @@ -70,7 +70,7 @@ class LapCounterOverlay extends Overlay return null; } - Duration lapTimeout = Duration.ofMinutes(config.lapTimeout()); + Duration lapTimeout = Duration.ofMinutes(plugin.getLapTimeout()); Duration sinceLap = Duration.between(session.getLastLapCompleted(), Instant.now()); if (sinceLap.compareTo(lapTimeout) >= 0) @@ -85,12 +85,12 @@ class LapCounterOverlay extends Overlay tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT); tableComponent.addRow("Total Laps:", Integer.toString(session.getTotalLaps())); - if (config.lapsToLevel() && session.getLapsTillLevel() > 0) + if (plugin.isLapsToLevel() && session.getLapsTillLevel() > 0) { tableComponent.addRow("Laps until level:", Integer.toString(session.getLapsTillLevel())); } - if (config.lapsToGoal() && session.getLapsTillGoal() > 0) + if (plugin.isLapsToGoal() && session.getLapsTillGoal() > 0) { tableComponent.addRow("Laps until goal:", Integer.toString(session.getLapsTillGoal())); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraOverlay.java index e5860abcd0..a84ec94887 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraOverlay.java @@ -54,7 +54,7 @@ class HydraOverlay extends Overlay private final PanelComponent panelComponent = new PanelComponent(); @Inject - HydraOverlay(HydraPlugin plugin, Client client, SpriteManager spriteManager) + HydraOverlay(final HydraPlugin plugin, final Client client, final SpriteManager spriteManager) { this.plugin = plugin; this.client = client; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraPlugin.java index b92b6f3875..fe94944427 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraPlugin.java @@ -30,6 +30,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -59,6 +60,7 @@ import net.runelite.client.ui.overlay.OverlayManager; enabledByDefault = false ) @Slf4j +@Singleton public class HydraPlugin extends Plugin { @Getter(AccessLevel.PACKAGE) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraSceneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraSceneOverlay.java index 52e02fadca..a38fa4ecfc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraSceneOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraSceneOverlay.java @@ -55,7 +55,7 @@ class HydraSceneOverlay extends Overlay private final Client client; @Inject - public HydraSceneOverlay(Client client, HydraPlugin plugin) + public HydraSceneOverlay(final Client client, final HydraPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.UNDER_WIDGETS); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoCounter.java index a9a25512a4..4350c80699 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoCounter.java @@ -29,6 +29,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.time.Duration; import java.time.Instant; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.plugins.Plugin; import net.runelite.client.ui.overlay.infobox.Counter; @@ -36,7 +37,7 @@ import net.runelite.client.util.StackFormatter; class AmmoCounter extends Counter { - @Getter + @Getter(AccessLevel.PACKAGE) private int itemID; private String name; private int total; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java index 5336fccd66..ee2b31666b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.ammo; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.EquipmentInventorySlot; import net.runelite.api.InventoryID; @@ -45,6 +46,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager; description = "Shows the current ammo the player has equipped", tags = {"bolts", "darts", "chinchompa", "equipment"} ) +@Singleton public class AmmoPlugin extends Plugin { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/animsmoothing/AnimationSmoothingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/animsmoothing/AnimationSmoothingPlugin.java index 40cc9fc1b9..6a23856217 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/animsmoothing/AnimationSmoothingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/animsmoothing/AnimationSmoothingPlugin.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.animsmoothing; import com.google.inject.Provides; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.events.ConfigChanged; import net.runelite.client.config.ConfigManager; @@ -39,6 +40,7 @@ import net.runelite.client.plugins.PluginDescriptor; tags = {"npcs", "objects", "players"}, enabledByDefault = false ) +@Singleton public class AnimationSmoothingPlugin extends Plugin { static final String CONFIG_GROUP = "animationSmoothing"; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java index 69a54cc971..bd3de31419 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java @@ -37,7 +37,6 @@ import net.runelite.client.config.ModifierlessKeybind; @ConfigGroup("antiDrag") public interface AntiDragConfig extends Config { - @ConfigItem( position = 0, keyName = "alwaysOn", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragOverlay.java index c35d9ac0b9..e1550efe33 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragOverlay.java @@ -42,13 +42,13 @@ public class AntiDragOverlay extends Overlay { private static final int RADIUS = 20; - private Client client; - private AntiDragConfig config; + private final Client client; + private final AntiDragPlugin plugin; @Inject - private AntiDragOverlay(Client client, AntiDragConfig config) + private AntiDragOverlay(final Client client, final AntiDragPlugin plugin) { - this.config = config; + this.plugin = plugin; this.client = client; setPosition(OverlayPosition.TOOLTIP); setPriority(OverlayPriority.HIGHEST); @@ -58,7 +58,7 @@ public class AntiDragOverlay extends Overlay @Override public Dimension render(Graphics2D g) { - final Color color = config.color(); + final Color color = plugin.getColor(); g.setColor(color); final net.runelite.api.Point mouseCanvasPosition = client.getMouseCanvasPosition(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java index 687ee9bc20..3a1eddfd4c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java @@ -26,11 +26,16 @@ package net.runelite.client.plugins.antidrag; import com.google.inject.Provides; +import java.awt.Color; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.FocusChanged; import net.runelite.client.config.ConfigManager; +import net.runelite.client.config.Keybind; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; @@ -48,11 +53,11 @@ import net.runelite.client.util.HotkeyListener; type = PluginType.UTILITY, enabledByDefault = false ) - +@Singleton public class AntiDragPlugin extends Plugin { private static final int DEFAULT_DELAY = 5; - + private boolean toggleDrag; @Inject @@ -82,14 +87,27 @@ public class AntiDragPlugin extends Plugin return configManager.getConfig(AntiDragConfig.class); } + private boolean alwaysOn; + private boolean keybind; + private Keybind key; + private int dragDelay; + private boolean reqfocus; + @Getter(AccessLevel.PACKAGE) + private boolean configOverlay; + @Getter(AccessLevel.PACKAGE) + private Color color; + private boolean changeCursor; + private CustomCursor selectedCursor; + @Override protected void startUp() throws Exception { - if (config.keybind()) + updateConfig(); + if (this.keybind) { keyManager.registerKeyListener(hotkeyListener); } - client.setInventoryDragDelay(config.alwaysOn() ? config.dragDelay() : DEFAULT_DELAY); + client.setInventoryDragDelay(this.alwaysOn ? this.dragDelay : DEFAULT_DELAY); } @Override @@ -106,9 +124,11 @@ public class AntiDragPlugin extends Plugin { if (event.getGroup().equals("antiDrag")) { + updateConfig(); + if (event.getKey().equals("keybind")) { - if (config.keybind()) + if (this.keybind) { keyManager.registerKeyListener(hotkeyListener); } @@ -119,17 +139,30 @@ public class AntiDragPlugin extends Plugin } if (event.getKey().equals("alwaysOn")) { - client.setInventoryDragDelay(config.alwaysOn() ? config.dragDelay() : DEFAULT_DELAY); + client.setInventoryDragDelay(this.alwaysOn ? this.dragDelay : DEFAULT_DELAY); } } } + public void updateConfig() + { + this.alwaysOn = config.alwaysOn(); + this.keybind = config.keybind(); + this.key = config.key(); + this.dragDelay = config.dragDelay(); + this.reqfocus = config.reqfocus(); + this.configOverlay = config.overlay(); + this.color = config.color(); + this.changeCursor = config.changeCursor(); + this.selectedCursor = config.selectedCursor(); + } + @Subscribe public void onFocusChanged(FocusChanged focusChanged) { - if (!config.alwaysOn()) + if (!this.alwaysOn) { - if (!focusChanged.isFocused() && config.reqfocus()) + if (!focusChanged.isFocused() && this.reqfocus) { client.setInventoryDragDelay(DEFAULT_DELAY); overlayManager.remove(overlay); @@ -137,33 +170,32 @@ public class AntiDragPlugin extends Plugin } } - private final HotkeyListener hotkeyListener = new HotkeyListener(() -> config.key()) + private final HotkeyListener hotkeyListener = new HotkeyListener(() -> this.key) { @Override public void hotkeyPressed() { - if (!config.alwaysOn()) + if (!alwaysOn) { toggleDrag = !toggleDrag; if (toggleDrag) { - if (config.overlay()) + if (configOverlay) { overlayManager.add(overlay); } - if (config.changeCursor()) + if (changeCursor) { - CustomCursor selectedCursor = config.selectedCursor(); clientUI.setCursor(selectedCursor.getCursorImage(), selectedCursor.toString()); } - client.setInventoryDragDelay(config.dragDelay()); + client.setInventoryDragDelay(dragDelay); } else { overlayManager.remove(overlay); client.setInventoryDragDelay(DEFAULT_DELAY); - if (config.changeCursor()) + if (changeCursor) { net.runelite.client.plugins.customcursor.CustomCursor selectedCursor = configManager.getConfig(CustomCursorConfig.class).selectedCursor(); clientUI.setCursor(selectedCursor.getCursorImage(), selectedCursor.toString()); @@ -172,4 +204,4 @@ public class AntiDragPlugin extends Plugin } } }; -} +} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/CustomCursor.java b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/CustomCursor.java index 27b3706c78..e6e3b5da8e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/CustomCursor.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/CustomCursor.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.antidrag; import java.awt.image.BufferedImage; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.plugins.customcursor.CustomCursorPlugin; import net.runelite.client.util.ImageUtil; @@ -43,7 +44,8 @@ public enum CustomCursor ZAMORAK_GODSWORD("Zamorak Godsword", "cursor-zamorak-godsword.png"); private final String name; - @Getter + + @Getter(AccessLevel.PACKAGE) private final BufferedImage cursorImage; CustomCursor(String name, String icon) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeProjectile.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeProjectile.java index a00d79e403..f875cae629 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeProjectile.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeProjectile.java @@ -28,11 +28,12 @@ package net.runelite.client.plugins.aoewarnings; import java.time.Instant; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.coords.LocalPoint; -@Getter +@Getter(AccessLevel.PACKAGE) @AllArgsConstructor class AoeProjectile { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java index 48491da688..d70d63c4be 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java @@ -37,6 +37,7 @@ import java.time.Instant; import java.util.Iterator; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Perspective; import net.runelite.api.Point; @@ -48,6 +49,7 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; import static net.runelite.client.util.ColorUtil.setAlphaComponent; +@Singleton public class AoeWarningOverlay extends Overlay { private static final int FILL_START_ALPHA = 25; @@ -55,16 +57,14 @@ public class AoeWarningOverlay extends Overlay private final Client client; private final AoeWarningPlugin plugin; - private final AoeWarningConfig config; @Inject - public AoeWarningOverlay(Client client, AoeWarningPlugin plugin, AoeWarningConfig config) + public AoeWarningOverlay(final Client client, final AoeWarningPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.UNDER_WIDGETS); this.client = client; this.plugin = plugin; - this.config = config; } @Override @@ -115,7 +115,7 @@ public class AoeWarningOverlay extends Overlay int tickProgress = aoeProjectile.getFinalTick() - client.getTickCount(); int fillAlpha, outlineAlpha; - if (config.isFadeEnabled()) + if (plugin.isConfigFadeEnabled()) { fillAlpha = (int) ((1 - progress) * FILL_START_ALPHA);//alpha drop off over lifetime outlineAlpha = (int) ((1 - progress) * OUTLINE_START_ALPHA); @@ -152,12 +152,12 @@ public class AoeWarningOverlay extends Overlay outlineAlpha = 255; } - if (config.isOutlineEnabled()) + if (plugin.isConfigOutlineEnabled()) { - graphics.setColor(new Color(setAlphaComponent(config.overlayColor().getRGB(), outlineAlpha), true)); + graphics.setColor(new Color(setAlphaComponent(plugin.getOverlayColor().getRGB(), outlineAlpha), true)); graphics.drawPolygon(tilePoly); } - if (config.tickTimers()) + if (plugin.isTickTimers()) { if (tickProgress >= 0) { @@ -165,7 +165,7 @@ public class AoeWarningOverlay extends Overlay plugin.getFontStyle(), color, centerPoint(tilePoly.getBounds()), plugin.isShadows(), 0); } } - graphics.setColor(new Color(setAlphaComponent(config.overlayColor().getRGB(), fillAlpha), true)); + graphics.setColor(new Color(setAlphaComponent(plugin.getOverlayColor().getRGB(), fillAlpha), true)); graphics.fillPolygon(tilePoly); } return null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java index 00ed024a44..730e36b204 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java @@ -28,6 +28,7 @@ package net.runelite.client.plugins.aoewarnings; import com.google.inject.Provides; +import java.awt.Color; import java.time.Instant; import java.util.ArrayList; import java.util.HashMap; @@ -35,6 +36,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -70,12 +72,13 @@ import net.runelite.client.ui.overlay.OverlayManager; type = PluginType.PVM, enabledByDefault = false ) - +@Singleton @Slf4j public class AoeWarningPlugin extends Plugin { - @Getter + @Getter(AccessLevel.PACKAGE) private final Map bombs = new HashMap<>(); + @Getter(AccessLevel.PACKAGE) private final Map projectiles = new HashMap<>(); @Inject public AoeWarningConfig config; @@ -97,12 +100,6 @@ public class AoeWarningPlugin extends Plugin private List CrystalSpike = new ArrayList<>(); @Getter(AccessLevel.PACKAGE) private List WintertodtSnowFall = new ArrayList<>(); - @Getter(AccessLevel.PACKAGE) - private boolean shadows; - @Getter(AccessLevel.PACKAGE) - private int textSize; - @Getter(AccessLevel.PACKAGE) - private int fontStyle; @Provides AoeWarningConfig getConfig(ConfigManager configManager) @@ -110,17 +107,73 @@ public class AoeWarningPlugin extends Plugin return configManager.getConfig(AoeWarningConfig.class); } - Map getProjectiles() - { - return projectiles; - } + // Config values + private boolean aoeNotifyAll; + @Getter(AccessLevel.PACKAGE) + private Color overlayColor; + @Getter(AccessLevel.PACKAGE) + private boolean configOutlineEnabled; + private int delay; + @Getter(AccessLevel.PACKAGE) + private boolean configFadeEnabled; + @Getter(AccessLevel.PACKAGE) + private boolean tickTimers; + @Getter(AccessLevel.PACKAGE) + private int fontStyle; + @Getter(AccessLevel.PACKAGE) + private int textSize; + @Getter(AccessLevel.PACKAGE) + private boolean shadows; + private boolean configShamansEnabled; + private boolean configShamansNotifyEnabled; + private boolean configArchaeologistEnabled; + private boolean configArchaeologistNotifyEnabled; + private boolean configIceDemonEnabled; + private boolean configIceDemonNotifyEnabled; + private boolean configVasaEnabled; + private boolean configVasaNotifyEnabled; + private boolean configTektonEnabled; + private boolean configTektonNotifyEnabled; + private boolean configVorkathEnabled; + private boolean configVorkathNotifyEnabled; + private boolean configGalvekEnabled; + private boolean configGalvekNotifyEnabled; + private boolean configGargBossEnabled; + private boolean configGargBossNotifyEnabled; + private boolean configVetionEnabled; + private boolean configVetionNotifyEnabled; + private boolean configChaosFanaticEnabled; + private boolean configChaosFanaticNotifyEnabled; + private boolean configOlmEnabled; + private boolean configOlmNotifyEnabled; + @Getter(AccessLevel.PACKAGE) + private boolean configbombDisplay; + private boolean configbombDisplayNotifyEnabled; + private boolean configLightningTrail; + private boolean configLightningTrailNotifyEnabled; + private boolean configCorpEnabled; + private boolean configCorpNotifyEnabled; + private boolean configWintertodtEnabled; + private boolean configWintertodtNotifyEnabled; + private boolean configXarpusEnabled; + private boolean configXarpusNotifyEnabled; + private boolean configaddyDrags; + private boolean configaddyDragsNotifyEnabled; + private boolean configDrakeEnabled; + private boolean configDrakeNotifyEnabled; + private boolean configCerbFireEnabled; + private boolean configCerbFireNotifyEnabled; + private boolean configDemonicGorillaEnabled; + private boolean configDemonicGorillaNotifyEnabled; @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(coreOverlay); overlayManager.add(bombOverlay); - reset(true); + reset(); } @Override @@ -128,7 +181,7 @@ public class AoeWarningPlugin extends Plugin { overlayManager.remove(coreOverlay); overlayManager.remove(bombOverlay); - reset(false); + reset(); } @Subscribe @@ -139,18 +192,7 @@ public class AoeWarningPlugin extends Plugin return; } - switch (event.getKey()) - { - case "fontStyle": - fontStyle = config.fontStyle().getFont(); - break; - case "textSize": - textSize = config.textSize(); - break; - case "shadows": - shadows = config.shadows(); - break; - } + updateConfig(); } @Subscribe @@ -159,7 +201,7 @@ public class AoeWarningPlugin extends Plugin Projectile projectile = event.getProjectile(); int projectileId = projectile.getId(); - int projectileLifetime = config.delay() + (projectile.getRemainingCycles() * 20); + int projectileLifetime = this.delay + (projectile.getRemainingCycles() * 20); int ticksRemaining = projectile.getRemainingCycles() / 30; if (!isTickTimersEnabledForProjectileID(projectileId)) { @@ -174,7 +216,7 @@ public class AoeWarningPlugin extends Plugin AoeProjectile aoeProjectile = new AoeProjectile(Instant.now(), targetPoint, aoeProjectileInfo, projectileLifetime, tickCycle); projectiles.put(projectile, aoeProjectile); - if (config.aoeNotifyAll() || isConfigEnabledForProjectileId(projectileId, true)) + if (this.aoeNotifyAll || isConfigEnabledForProjectileId(projectileId, true)) { notifier.notify("AoE attack detected!"); } @@ -192,7 +234,7 @@ public class AoeWarningPlugin extends Plugin case ObjectID.CRYSTAL_BOMB: bombs.put(wp, new CrystalBomb(gameObject, client.getTickCount())); - if (config.aoeNotifyAll() || config.bombDisplayNotifyEnabled()) + if (this.aoeNotifyAll || this.configbombDisplayNotifyEnabled) { notifier.notify("Bomb!"); } @@ -205,11 +247,11 @@ public class AoeWarningPlugin extends Plugin break; case NullObjectID.NULL_26690: //Wintertodt Snowfall - if (config.isWintertodtEnabled()) + if (this.configWintertodtEnabled) { WintertodtSnowFall.add(wp); - if (config.aoeNotifyAll() || config.isWintertodtNotifyEnabled()) + if (this.aoeNotifyAll || this.configWintertodtNotifyEnabled) { notifier.notify("Snow Fall!"); } @@ -236,7 +278,7 @@ public class AoeWarningPlugin extends Plugin break; case NullObjectID.NULL_26690: //Wintertodt Snowfall - if (config.isWintertodtEnabled()) + if (this.configWintertodtEnabled) { WintertodtSnowFall.remove(wp); } @@ -256,7 +298,7 @@ public class AoeWarningPlugin extends Plugin @Subscribe public void onGameTick(GameTick event) { - if (config.LightningTrail()) + if (this.configLightningTrail) { LightningTrail.clear(); for (GraphicsObject o : client.getGraphicsObjects()) @@ -265,7 +307,7 @@ public class AoeWarningPlugin extends Plugin { LightningTrail.add(WorldPoint.fromLocal(client, o.getLocation())); - if (config.aoeNotifyAll() || config.LightningTrailNotifyEnabled()) + if (this.aoeNotifyAll || this.configLightningTrailNotifyEnabled) { notifier.notify("Lightning!"); } @@ -350,7 +392,7 @@ public class AoeWarningPlugin extends Plugin return false; } - if (notify && config.aoeNotifyAll()) + if (notify && this.aoeNotifyAll) { return true; } @@ -358,57 +400,110 @@ public class AoeWarningPlugin extends Plugin switch (projectileInfo) { case LIZARDMAN_SHAMAN_AOE: - return notify ? config.isShamansNotifyEnabled() : config.isShamansEnabled(); + return notify ? this.configShamansNotifyEnabled : this.configShamansEnabled; case CRAZY_ARCHAEOLOGIST_AOE: - return notify ? config.isArchaeologistNotifyEnabled() : config.isArchaeologistEnabled(); + return notify ? this.configArchaeologistNotifyEnabled : this.configArchaeologistEnabled; case ICE_DEMON_RANGED_AOE: case ICE_DEMON_ICE_BARRAGE_AOE: - return notify ? config.isIceDemonNotifyEnabled() : config.isIceDemonEnabled(); + return notify ? this.configIceDemonNotifyEnabled : this.configIceDemonEnabled; case VASA_AWAKEN_AOE: case VASA_RANGED_AOE: - return notify ? config.isVasaNotifyEnabled() : config.isVasaEnabled(); + return notify ? this.configVasaNotifyEnabled : this.configVasaEnabled; case TEKTON_METEOR_AOE: - return notify ? config.isTektonNotifyEnabled() : config.isTektonEnabled(); + return notify ? this.configTektonNotifyEnabled : this.configTektonEnabled; case VORKATH_BOMB: case VORKATH_POISON_POOL: case VORKATH_SPAWN: case VORKATH_TICK_FIRE: - return notify ? config.isVorkathNotifyEnabled() : config.isVorkathEnabled(); + return notify ? this.configVorkathNotifyEnabled : this.configVorkathEnabled; case VETION_LIGHTNING: - return notify ? config.isVetionNotifyEnabled() : config.isVetionEnabled(); + return notify ? this.configVetionNotifyEnabled : this.configVetionEnabled; case CHAOS_FANATIC: - return notify ? config.isChaosFanaticNotifyEnabled() : config.isChaosFanaticEnabled(); + return notify ? this.configChaosFanaticNotifyEnabled : this.configChaosFanaticEnabled; case GALVEK_BOMB: case GALVEK_MINE: - return notify ? config.isGalvekNotifyEnabled() : config.isGalvekEnabled(); + return notify ? this.configGalvekNotifyEnabled : this.configGalvekEnabled; case DAWN_FREEZE: case DUSK_CEILING: - return notify ? config.isGargBossNotifyEnabled() : config.isGargBossEnabled(); + return notify ? this.configGargBossNotifyEnabled : this.configGargBossEnabled; case OLM_FALLING_CRYSTAL: case OLM_BURNING: case OLM_FALLING_CRYSTAL_TRAIL: case OLM_ACID_TRAIL: case OLM_FIRE_LINE: - return notify ? config.isOlmNotifyEnabled() : config.isOlmEnabled(); + return notify ? this.configOlmNotifyEnabled : this.configOlmEnabled; case CORPOREAL_BEAST: case CORPOREAL_BEAST_DARK_CORE: - return notify ? config.isCorpNotifyEnabled() : config.isCorpEnabled(); + return notify ? this.configCorpNotifyEnabled : this.configCorpEnabled; case XARPUS_POISON_AOE: - return notify ? config.isXarpusNotifyEnabled() : config.isXarpusEnabled(); + return notify ? this.configXarpusNotifyEnabled : this.configXarpusEnabled; case ADDY_DRAG_POISON: - return notify ? config.addyDragsNotifyEnabled() : config.addyDrags(); + return notify ? this.configaddyDragsNotifyEnabled : this.configaddyDrags; case DRAKE_BREATH: - return notify ? config.isDrakeNotifyEnabled() : config.isDrakeEnabled(); + return notify ? this.configDrakeNotifyEnabled : this.configDrakeEnabled; case CERB_FIRE: - return notify ? config.isCerbFireNotifyEnabled() : config.isCerbFireEnabled(); + return notify ? this.configCerbFireNotifyEnabled : this.configCerbFireEnabled; case DEMONIC_GORILLA_BOULDER: - return notify ? config.isDemonicGorillaNotifyEnabled() : config.isDemonicGorillaEnabled(); + return notify ? this.configDemonicGorillaNotifyEnabled : this.configDemonicGorillaEnabled; } return false; } - private void reset(boolean setConfig) + public void updateConfig() + { + this.aoeNotifyAll = config.aoeNotifyAll(); + this.overlayColor = config.overlayColor(); + this.configOutlineEnabled = config.isOutlineEnabled(); + this.delay = config.delay(); + this.configFadeEnabled = config.isFadeEnabled(); + this.tickTimers = config.tickTimers(); + this.fontStyle = config.fontStyle().getFont(); + this.textSize = config.textSize(); + this.shadows = config.shadows(); + this.configShamansEnabled = config.isShamansEnabled(); + this.configShamansNotifyEnabled = config.isShamansNotifyEnabled(); + this.configArchaeologistEnabled = config.isArchaeologistEnabled(); + this.configArchaeologistNotifyEnabled = config.isArchaeologistNotifyEnabled(); + this.configIceDemonEnabled = config.isIceDemonEnabled(); + this.configIceDemonNotifyEnabled = config.isIceDemonNotifyEnabled(); + this.configVasaEnabled = config.isVasaEnabled(); + this.configVasaNotifyEnabled = config.isVasaNotifyEnabled(); + this.configTektonEnabled = config.isTektonEnabled(); + this.configTektonNotifyEnabled = config.isTektonNotifyEnabled(); + this.configVorkathEnabled = config.isVorkathEnabled(); + this.configVorkathNotifyEnabled = config.isVorkathNotifyEnabled(); + this.configGalvekEnabled = config.isGalvekEnabled(); + this.configGalvekNotifyEnabled = config.isGalvekNotifyEnabled(); + this.configGargBossEnabled = config.isGargBossEnabled(); + this.configGargBossNotifyEnabled = config.isGargBossNotifyEnabled(); + this.configVetionEnabled = config.isVetionEnabled(); + this.configVetionNotifyEnabled = config.isVetionNotifyEnabled(); + this.configChaosFanaticEnabled = config.isChaosFanaticEnabled(); + this.configChaosFanaticNotifyEnabled = config.isChaosFanaticNotifyEnabled(); + this.configOlmEnabled = config.isOlmEnabled(); + this.configOlmNotifyEnabled = config.isOlmNotifyEnabled(); + this.configbombDisplay = config.bombDisplay(); + this.configbombDisplayNotifyEnabled = config.bombDisplayNotifyEnabled(); + this.configLightningTrail = config.LightningTrail(); + this.configLightningTrailNotifyEnabled = config.LightningTrailNotifyEnabled(); + this.configCorpEnabled = config.isCorpEnabled(); + this.configCorpNotifyEnabled = config.isCorpNotifyEnabled(); + this.configWintertodtEnabled = config.isWintertodtEnabled(); + this.configWintertodtNotifyEnabled = config.isWintertodtNotifyEnabled(); + this.configXarpusEnabled = config.isXarpusEnabled(); + this.configXarpusNotifyEnabled = config.isXarpusNotifyEnabled(); + this.configaddyDrags = config.addyDrags(); + this.configaddyDragsNotifyEnabled = config.addyDragsNotifyEnabled(); + this.configDrakeEnabled = config.isDrakeEnabled(); + this.configDrakeNotifyEnabled = config.isDrakeNotifyEnabled(); + this.configCerbFireEnabled = config.isCerbFireEnabled(); + this.configCerbFireNotifyEnabled = config.isCerbFireNotifyEnabled(); + this.configDemonicGorillaEnabled = config.isDemonicGorillaEnabled(); + this.configDemonicGorillaNotifyEnabled = config.isDemonicGorillaNotifyEnabled(); + } + + private void reset() { LightningTrail.clear(); AcidTrail.clear(); @@ -416,11 +511,5 @@ public class AoeWarningPlugin extends Plugin WintertodtSnowFall.clear(); bombs.clear(); projectiles.clear(); - if (setConfig) - { - fontStyle = config.fontStyle().getFont(); - textSize = config.textSize(); - shadows = config.shadows(); - } } -} \ No newline at end of file +} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/BombOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/BombOverlay.java index 317f5ad04b..d51b52aee3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/BombOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/BombOverlay.java @@ -32,10 +32,10 @@ import java.awt.Polygon; import java.text.DecimalFormat; import java.text.NumberFormat; import java.time.Instant; -import java.util.Iterator; import java.util.Locale; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.Perspective; @@ -50,6 +50,7 @@ import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; @Slf4j +@Singleton public class BombOverlay extends Overlay { @@ -81,15 +82,13 @@ public class BombOverlay extends Overlay } private final Client client; - private final AoeWarningConfig config; private final AoeWarningPlugin plugin; @Inject - public BombOverlay(Client client, AoeWarningPlugin plugin, AoeWarningConfig config) + public BombOverlay(final Client client, final AoeWarningPlugin plugin) { this.client = client; this.plugin = plugin; - this.config = config; setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); setPriority(OverlayPriority.MED); @@ -98,7 +97,7 @@ public class BombOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (config.bombDisplay()) + if (plugin.isConfigbombDisplay()) { drawBombs(graphics); } @@ -108,10 +107,8 @@ public class BombOverlay extends Overlay private void drawBombs(Graphics2D graphics) //I can condense drawDangerZone into this. Ambivalent though. { - Iterator> it = plugin.getBombs().entrySet().iterator(); - while (it.hasNext()) + for (Map.Entry entry : plugin.getBombs().entrySet()) { - Map.Entry entry = it.next(); CrystalBomb bomb = entry.getValue(); drawDangerZone(graphics, bomb); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/CrystalBomb.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/CrystalBomb.java index 5e871dca12..0a63fa4b97 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/CrystalBomb.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/CrystalBomb.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.aoewarnings; import java.time.Instant; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.GameObject; @@ -33,20 +34,20 @@ import net.runelite.api.coords.WorldPoint; @Slf4j class CrystalBomb { - @Getter + @Getter(AccessLevel.PACKAGE) private Instant plantedOn; - @Getter + @Getter(AccessLevel.PACKAGE) private Instant lastClockUpdate; - @Getter + @Getter(AccessLevel.PACKAGE) private int objectId; - @Getter + @Getter(AccessLevel.PACKAGE) private int tickStarted; // - @Getter + @Getter(AccessLevel.PACKAGE) private WorldPoint worldLocation; CrystalBomb(GameObject gameObject, int startTick) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesOverlay.java index 0660c1e659..b2112f1420 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesOverlay.java @@ -28,6 +28,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import net.runelite.client.ui.overlay.Overlay; import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE; @@ -36,19 +37,18 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; +@Singleton class AttackStylesOverlay extends Overlay { private final AttackStylesPlugin plugin; - private final AttackStylesConfig config; private final PanelComponent panelComponent = new PanelComponent(); @Inject - private AttackStylesOverlay(AttackStylesPlugin plugin, AttackStylesConfig config) + private AttackStylesOverlay(final AttackStylesPlugin plugin) { super(plugin); setPosition(OverlayPosition.ABOVE_CHATBOX_RIGHT); this.plugin = plugin; - this.config = config; getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Attack style overlay")); } @@ -58,7 +58,7 @@ class AttackStylesOverlay extends Overlay panelComponent.getChildren().clear(); boolean warnedSkillSelected = plugin.isWarnedSkillSelected(); - if (warnedSkillSelected || config.alwaysShowStyle()) + if (warnedSkillSelected || plugin.isAlwaysShowStyle()) { final String attackStyleString = plugin.getAttackStyle().getName(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java index db7a9ed751..776cc3cd72 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java @@ -31,6 +31,9 @@ import com.google.inject.Provides; import java.util.HashSet; import java.util.Set; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.Skill; @@ -60,6 +63,7 @@ import net.runelite.client.ui.overlay.OverlayManager; description = "Show your current attack style as an overlay", tags = {"combat", "defence", "magic", "overlay", "ranged", "strength", "warn", "pure"} ) +@Singleton public class AttackStylesPlugin extends Plugin { private int attackStyleVarbit = -1; @@ -91,9 +95,22 @@ public class AttackStylesPlugin extends Plugin return configManager.getConfig(AttackStylesConfig.class); } + // config values + @Getter(AccessLevel.PACKAGE) + private boolean alwaysShowStyle; + private boolean warnForDefence; + private boolean warnForAttack; + private boolean warnForStrength; + private boolean warnForRanged; + private boolean warnForMagic; + private boolean hideAutoRetaliate; + private boolean removeWarnedStyles; + @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(overlay); if (client.getGameState() == GameState.LOGGED_IN) @@ -104,11 +121,11 @@ public class AttackStylesPlugin extends Plugin private void start() { - updateWarnedSkills(config.warnForAttack(), Skill.ATTACK); - updateWarnedSkills(config.warnForStrength(), Skill.STRENGTH); - updateWarnedSkills(config.warnForDefence(), Skill.DEFENCE); - updateWarnedSkills(config.warnForRanged(), Skill.RANGED); - updateWarnedSkills(config.warnForMagic(), Skill.MAGIC); + updateWarnedSkills(warnForAttack, Skill.ATTACK); + updateWarnedSkills(warnForStrength, Skill.STRENGTH); + updateWarnedSkills(warnForDefence, Skill.DEFENCE); + updateWarnedSkills(warnForRanged, Skill.RANGED); + updateWarnedSkills(warnForMagic, Skill.MAGIC); attackStyleVarbit = client.getVar(VarPlayer.ATTACK_STYLE); equippedWeaponTypeVarbit = client.getVar(Varbits.EQUIPPED_WEAPON_TYPE); castingModeVarbit = client.getVar(Varbits.DEFENSIVE_CASTING_MODE); @@ -134,7 +151,7 @@ public class AttackStylesPlugin extends Plugin return attackStyle; } - public boolean isWarnedSkillSelected() + boolean isWarnedSkillSelected() { return warnedSkillSelected; } @@ -175,7 +192,7 @@ public class AttackStylesPlugin extends Plugin hideWidget(client.getWidget(widgetKey), widgetsToHide.get(equippedWeaponType, widgetKey)); } } - hideWidget(client.getWidget(WidgetInfo.COMBAT_AUTO_RETALIATE), config.hideAutoRetaliate()); + hideWidget(client.getWidget(WidgetInfo.COMBAT_AUTO_RETALIATE), this.hideAutoRetaliate); } @Subscribe @@ -183,11 +200,11 @@ public class AttackStylesPlugin extends Plugin { if (event.getGameState() == GameState.LOGGED_IN) { - updateWarnedSkills(config.warnForAttack(), Skill.ATTACK); - updateWarnedSkills(config.warnForStrength(), Skill.STRENGTH); - updateWarnedSkills(config.warnForDefence(), Skill.DEFENCE); - updateWarnedSkills(config.warnForRanged(), Skill.RANGED); - updateWarnedSkills(config.warnForMagic(), Skill.MAGIC); + updateWarnedSkills(this.warnForAttack, Skill.ATTACK); + updateWarnedSkills(this.warnForStrength, Skill.STRENGTH); + updateWarnedSkills(this.warnForDefence, Skill.DEFENCE); + updateWarnedSkills(this.warnForRanged, Skill.RANGED); + updateWarnedSkills(this.warnForMagic, Skill.MAGIC); } } @@ -224,6 +241,8 @@ public class AttackStylesPlugin extends Plugin { if (event.getGroup().equals("attackIndicator")) { + updateConfig(); + boolean enabled = event.getNewValue().equals("true"); switch (event.getKey()) { @@ -250,6 +269,18 @@ public class AttackStylesPlugin extends Plugin } } + public void updateConfig() + { + this.alwaysShowStyle = config.alwaysShowStyle(); + this.warnForDefence = config.warnForDefence(); + this.warnForAttack = config.warnForAttack(); + this.warnForStrength = config.warnForStrength(); + this.warnForRanged = config.warnForRanged(); + this.warnForMagic = config.warnForMagic(); + this.hideAutoRetaliate = config.hideAutoRetaliate(); + this.removeWarnedStyles = config.removeWarnedStyles(); + } + private void updateAttackStyle(int equippedWeaponType, int attackStyleIndex, int castingMode) { AttackStyle[] attackStyles = WeaponType.getWeaponType(equippedWeaponType).getAttackStyles(); @@ -298,7 +329,7 @@ public class AttackStylesPlugin extends Plugin } } } - hideWarnedStyles(config.removeWarnedStyles()); + hideWarnedStyles(this.removeWarnedStyles); } private void hideWarnedStyles(boolean enabled) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankCalculation.java b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankCalculation.java index 13398e22f7..5a9fd695fd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankCalculation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankCalculation.java @@ -58,7 +58,7 @@ class BankCalculation Varbits.BANK_TAB_NINE_COUNT ); - private final BankConfig config; + private final BankPlugin plugin; private final ItemManager itemManager; private final Client client; @@ -72,10 +72,10 @@ class BankCalculation private long haPrice; @Inject - BankCalculation(ItemManager itemManager, BankConfig config, Client client) + BankCalculation(ItemManager itemManager, BankPlugin plugin, Client client) { this.itemManager = itemManager; - this.config = config; + this.plugin = plugin; this.client = client; } @@ -142,12 +142,12 @@ class BankCalculation continue; } - if (config.showGE()) + if (plugin.isShowGE()) { itemIds.add(item.getId()); } - if (config.showHA()) + if (plugin.isShowHA()) { long alchValue = itemManager.getAlchValue(item.getId()); @@ -159,7 +159,7 @@ class BankCalculation } // Now do the calculations - if (config.showGE() && !itemIds.isEmpty()) + if (plugin.isShowGE() && !itemIds.isEmpty()) { for (Item item : items) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java index f30ba0115f..2cf7e2b746 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java @@ -28,8 +28,12 @@ package net.runelite.client.plugins.bank; import com.google.inject.Provides; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.MenuEntry; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuShouldLeftClick; import net.runelite.api.events.ScriptCallbackEvent; @@ -46,6 +50,7 @@ import net.runelite.client.util.StackFormatter; description = "Modifications to the banking interface", tags = {"grand", "exchange", "high", "alchemy", "prices", "deposit"} ) +@Singleton public class BankPlugin extends Plugin { private static final String DEPOSIT_WORN = "Deposit worn items"; @@ -75,6 +80,21 @@ public class BankPlugin extends Plugin return configManager.getConfig(BankConfig.class); } + @Getter(AccessLevel.PACKAGE) + private boolean showGE; + @Getter(AccessLevel.PACKAGE) + private boolean showHA; + private boolean showExact; + private boolean rightClickBankInventory; + private boolean rightClickBankEquip; + private boolean rightClickBankLoot; + + @Override + protected void startUp() throws Exception + { + updateConfig(); + } + @Override protected void shutDown() { @@ -94,9 +114,9 @@ public class BankPlugin extends Plugin MenuEntry[] menuEntries = client.getMenuEntries(); for (MenuEntry entry : menuEntries) { - if ((entry.getOption().equals(DEPOSIT_WORN) && config.rightClickBankEquip()) - || (entry.getOption().equals(DEPOSIT_INVENTORY) && config.rightClickBankInventory()) - || (entry.getOption().equals(DEPOSIT_LOOT) && config.rightClickBankLoot())) + if ((entry.getOption().equals(DEPOSIT_WORN) && this.rightClickBankEquip) + || (entry.getOption().equals(DEPOSIT_INVENTORY) && this.rightClickBankInventory) + || (entry.getOption().equals(DEPOSIT_LOOT) && this.rightClickBankLoot)) { event.setForceRightClick(true); return; @@ -107,9 +127,9 @@ public class BankPlugin extends Plugin @Subscribe public void onMenuEntryAdded(MenuEntryAdded event) { - if ((event.getOption().equals(DEPOSIT_WORN) && config.rightClickBankEquip()) - || (event.getOption().equals(DEPOSIT_INVENTORY) && config.rightClickBankInventory()) - || (event.getOption().equals(DEPOSIT_LOOT) && config.rightClickBankLoot())) + if ((event.getOption().equals(DEPOSIT_WORN) && this.rightClickBankEquip) + || (event.getOption().equals(DEPOSIT_INVENTORY) && this.rightClickBankInventory) + || (event.getOption().equals(DEPOSIT_LOOT) && this.rightClickBankLoot)) { forceRightClickFlag = true; } @@ -128,16 +148,16 @@ public class BankPlugin extends Plugin long gePrice = bankCalculation.getGePrice(); long haPrice = bankCalculation.getHaPrice(); - if (config.showGE() && gePrice != 0) + if (this.showGE && gePrice != 0) { strCurrentTab += " ("; - if (config.showHA()) + if (this.showHA) { strCurrentTab += "EX: "; } - if (config.showExact()) + if (this.showExact) { strCurrentTab += StackFormatter.formatNumber(gePrice) + ")"; } @@ -147,16 +167,16 @@ public class BankPlugin extends Plugin } } - if (config.showHA() && haPrice != 0) + if (this.showHA && haPrice != 0) { strCurrentTab += " ("; - if (config.showGE()) + if (this.showGE) { strCurrentTab += "HA: "; } - if (config.showExact()) + if (this.showExact) { strCurrentTab += StackFormatter.formatNumber(haPrice) + ")"; } @@ -171,4 +191,25 @@ public class BankPlugin extends Plugin stringStack[stringStackSize - 1] += strCurrentTab; } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("bank")) + { + return; + } + + updateConfig(); + } + + public void updateConfig() + { + this.showGE = config.showGE(); + this.showHA = config.showHA(); + this.showExact = config.showExact(); + this.rightClickBankInventory = config.rightClickBankInventory(); + this.rightClickBankEquip = config.rightClickBankEquip(); + this.rightClickBankLoot = config.rightClickBankLoot(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java index d593b9f0aa..9b3d72fa53 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java @@ -36,6 +36,7 @@ import java.util.Collection; import java.util.regex.Pattern; import java.util.stream.Collectors; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.InventoryID; import net.runelite.api.Item; @@ -82,6 +83,7 @@ import net.runelite.client.util.Text; tags = {"searching", "tagging"} ) @PluginDependency(ClueScrollPlugin.class) +@Singleton public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyListener { public static final String CONFIG_GROUP = "banktags"; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListConfig.java index 75c9668cf7..4278c295b4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListConfig.java @@ -8,7 +8,6 @@ import net.runelite.client.config.ConfigItem; public interface BanListConfig extends Config { - @ConfigItem( keyName = "bannedPlayers", name = "Manual Scammer List", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java index 92371331cc..c382e703b7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java @@ -31,6 +31,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.ChatMessageType; import net.runelite.api.ClanMember; @@ -67,7 +68,7 @@ import okhttp3.Response; type = PluginType.UTILITY, enabledByDefault = false ) - +@Singleton @Slf4j public class BanListPlugin extends Plugin { @@ -94,9 +95,16 @@ public class BanListPlugin extends Plugin return configManager.getConfig(BanListConfig.class); } + // save config values + private boolean enableWDR; + private boolean enableRuneWatch; + private boolean highlightInClan; + private boolean highlightInTrade; + @Override protected void startUp() throws Exception { + updateConfig(); manualBans.addAll(Text.fromCSV(config.getBannedPlayers())); fetchFromWebsites(); } @@ -128,6 +136,14 @@ public class BanListPlugin extends Plugin } } + public void updateConfig() + { + this.enableWDR = config.enableWDR(); + this.enableRuneWatch = config.enableRuneWatch(); + this.highlightInClan = config.highlightInClan(); + this.highlightInTrade = config.highlightInTrade(); + } + /** * Event to keep making sure player names are highlighted red in clan chat, since the red name goes away frequently */ @@ -138,7 +154,7 @@ public class BanListPlugin extends Plugin || client.getWidget(WidgetInfo.LOGIN_CLICK_TO_PLAY_SCREEN) != null || client.getViewportWidget() == null || client.getWidget(WidgetInfo.CLAN_CHAT) == null - || !config.highlightInClan()) + || !this.highlightInClan) { return; } @@ -163,7 +179,7 @@ public class BanListPlugin extends Plugin if (scamList != null) { sendWarning(Text.standardize(member.getUsername()), scamList); - if (config.highlightInClan()) + if (this.highlightInClan) { highlightRedInCC(); } @@ -172,7 +188,7 @@ public class BanListPlugin extends Plugin if (toxicList != null) { sendWarning(Text.standardize(member.getUsername()), toxicList); - if (config.highlightInClan()) + if (this.highlightInClan) { highlightRedInCC(); } @@ -185,7 +201,7 @@ public class BanListPlugin extends Plugin @Subscribe public void onWidgetLoaded(WidgetLoaded widgetLoaded) { - if (config.highlightInTrade()) + if (this.highlightInTrade) { if (widgetLoaded.getGroupId() == 335) { //if trading window was loaded @@ -211,7 +227,7 @@ public class BanListPlugin extends Plugin */ private ListType checkScamList(String nameToBeChecked) { - if (wdrScamArrayList.size() > 0 && config.enableWDR()) + if (wdrScamArrayList.size() > 0 && this.enableWDR) { if (wdrScamArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) { @@ -219,7 +235,7 @@ public class BanListPlugin extends Plugin } } - if (runeWatchArrayList.size() > 0 && config.enableRuneWatch()) + if (runeWatchArrayList.size() > 0 && this.enableRuneWatch) { if (runeWatchArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) { @@ -241,7 +257,7 @@ public class BanListPlugin extends Plugin private ListType checkToxicList(String nameToBeChecked) { - if (wdrToxicArrayList.size() > 0 && config.enableWDR()) + if (wdrToxicArrayList.size() > 0 && this.enableWDR) { if (wdrToxicArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java index ecfb8251ce..96aafeef5e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.barbarianassault; import com.google.common.collect.ImmutableMap; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Perspective; import net.runelite.api.Point; @@ -46,7 +47,7 @@ import java.awt.Stroke; import java.awt.BasicStroke; import java.util.Map; - +@Singleton class AboveSceneOverlay extends Overlay { private static final int HEALTH_BAR_HEIGHT = 20; @@ -62,18 +63,16 @@ class AboveSceneOverlay extends Overlay private final Client client; private final BarbarianAssaultPlugin game; - private final BarbarianAssaultConfig config; @Inject - private AboveSceneOverlay(Client client, BarbarianAssaultPlugin game, BarbarianAssaultConfig config) + private AboveSceneOverlay(final Client client, final BarbarianAssaultPlugin game) { super(game); setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); this.client = client; this.game = game; - this.config = config; } @Override @@ -88,11 +87,11 @@ class AboveSceneOverlay extends Overlay { case HEALER: - if (config.showTeammateHealthbars()) + if (game.isShowTeammateHealthbars()) { renderHealthBars(graphics); } - if (config.healerCodes()) + if (game.isHealerCodes()) { renderHealerCodes(graphics); } @@ -100,7 +99,7 @@ class AboveSceneOverlay extends Overlay case COLLECTOR: - if (config.highlightCollectorEggs()) + if (game.isHighlightCollectorEggs()) { renderEggs(graphics); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveWidgetsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveWidgetsOverlay.java index 6c140ef4b3..b89bc86148 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveWidgetsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveWidgetsOverlay.java @@ -32,6 +32,7 @@ import java.awt.Rectangle; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Point; import net.runelite.api.widgets.Widget; @@ -43,7 +44,7 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.util.ImageUtil; - +@Singleton class AboveWidgetsOverlay extends Overlay { private static final int OFFSET_X_TEXT_QUANTITY = 0; @@ -51,18 +52,15 @@ class AboveWidgetsOverlay extends Overlay private final Client client; private final BarbarianAssaultPlugin game; - private final BarbarianAssaultConfig config; - @Inject - private AboveWidgetsOverlay(Client client, BarbarianAssaultPlugin game, BarbarianAssaultConfig config) + private AboveWidgetsOverlay(final Client client, final BarbarianAssaultPlugin game) { super(game); setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); this.client = client; this.game = game; - this.config = config; } @Override @@ -75,7 +73,7 @@ class AboveWidgetsOverlay extends Overlay Role role = game.getRole(); - if (config.showTimer()) + if (game.isShowTimer()) { renderTimer(graphics, role); } @@ -83,23 +81,23 @@ class AboveWidgetsOverlay extends Overlay switch (role) { case ATTACKER: - if (config.highlightArrows()) + if (game.isHighlightArrows()) { - renderInventoryHighlights(graphics, game.getRole().getListenItem(game.getLastListenText()), config.highlightArrowColor()); + renderInventoryHighlights(graphics, game.getRole().getListenItem(game.getLastListenText()), game.getHighlightArrowColor()); } break; case DEFENDER: - if (config.highlightBait()) + if (game.isHighlightBait()) { - renderInventoryHighlights(graphics, game.getRole().getListenItem(game.getLastListenText()), config.highlightBaitColor()); + renderInventoryHighlights(graphics, game.getRole().getListenItem(game.getLastListenText()), game.getHighlightBaitColor()); } break; case HEALER: - if (config.highlightPoison()) + if (game.isHighlightPoison()) { - renderInventoryHighlights(graphics, game.getRole().getListenItem(game.getLastListenText()), config.highlightPoisonColor()); + renderInventoryHighlights(graphics, game.getRole().getListenItem(game.getLastListenText()), game.getHighlightPoisonColor()); } } return null; @@ -115,11 +113,11 @@ class AboveWidgetsOverlay extends Overlay return; } - if (role == Role.COLLECTOR && config.showEggCountOverlay() && game.getWave() != null) + if (role == Role.COLLECTOR && game.isShowEggCountOverlay() && game.getWave() != null) { roleText.setText("(" + game.getWave().getCollectedEggCount() + ") " + formatClock()); } - else if (role == Role.HEALER && config.showHpCountOverlay() && game.getWave() != null) + else if (role == Role.HEALER && game.isShowHpCountOverlay() && game.getWave() != null) { roleText.setText("(" + game.getWave().getHpHealed() + ") " + formatClock()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java index 0f8f843fd8..10e56c8ac8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.barbarianassault; import com.google.common.collect.Sets; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import net.runelite.client.menus.ComparableEntry; @@ -40,19 +41,19 @@ class BarbarianAssaultMenu { private final MenuManager menuManager; private final BarbarianAssaultPlugin game; - private final BarbarianAssaultConfig config; private final ArrayList tracker = new ArrayList<>(); - @Getter @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private boolean hornUpdated = false; - @Getter @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private boolean rebuildForced = false; @Inject - BarbarianAssaultMenu(MenuManager menuManager, BarbarianAssaultPlugin game, BarbarianAssaultConfig config) + BarbarianAssaultMenu(final MenuManager menuManager, final BarbarianAssaultPlugin game) { this.menuManager = menuManager; this.game = game; - this.config = config; } private boolean isHornOptionHidden(String option) @@ -100,24 +101,24 @@ class BarbarianAssaultMenu case TELL_BLUE_ATTACKER_HORN: case TELL_GREEN_ATTACKER_HORN: case TELL_RED_ATTACKER_HORN: - return ((role == Role.ATTACKER && isHornOptionHidden(entry.getOption())) || role == null) && config.removeIncorrectCalls(); + return ((role == Role.ATTACKER && isHornOptionHidden(entry.getOption())) || role == null) && game.isRemoveIncorrectCalls(); case ATTACK_PENANCE_FIGHTER: case ATTACK_PENANCE_RANGER: case GET_SPIKES_PETRIFIED_MUSHROOM: case TAKE_ATTACKER_ITEM_MACHINE: - return (role != Role.ATTACKER && role != null) && config.removeUnusedMenus(); + return (role != Role.ATTACKER && role != null) && game.isRemoveUnusedMenus(); // Defender role Options case TELL_MEAT_DEFENDER_HORN: case TELL_TOFU_DEFENDER_HORN: case TELL_WORMS_DEFENDER_HORN: - return ((role == Role.DEFENDER && isHornOptionHidden(entry.getOption())) || role == null) && config.removeIncorrectCalls(); + return ((role == Role.DEFENDER && isHornOptionHidden(entry.getOption())) || role == null) && game.isRemoveIncorrectCalls(); case BLOCK_PENANCE_CAVE: - return ((role != Role.DEFENDER && role != null) && config.removeUnusedMenus()) - || (role == Role.DEFENDER && config.removePenanceCave()); + return ((role != Role.DEFENDER && role != null) && game.isRemoveUnusedMenus()) + || (role == Role.DEFENDER && game.isRemovePenanceCave()); case DUNK_LAVA_CRATER: case FIX: @@ -125,7 +126,7 @@ class BarbarianAssaultMenu case TAKE_DEFENDER_ITEM_MACHINE: case TAKE_HAMMER: case TAKE_LOGS: - return (role != Role.DEFENDER && role != null) && config.removeUnusedMenus(); + return (role != Role.DEFENDER && role != null) && game.isRemoveUnusedMenus(); // Collector role options @@ -133,7 +134,7 @@ class BarbarianAssaultMenu case TELL_AGGRESSIVE_COLLECTOR_HORN: case TELL_CONTROLLED_COLLECTOR_HORN: case TELL_DEFENSIVE_COLLECTOR_HORN: - return ((role == Role.COLLECTOR && isHornOptionHidden(entry.getOption())) || role == null) && config.removeIncorrectCalls(); + return ((role == Role.COLLECTOR && isHornOptionHidden(entry.getOption())) || role == null) && game.isRemoveIncorrectCalls(); case CONVERT_COLLECTOR_CONVERTER: case LOAD_EGG_HOPPER: @@ -141,40 +142,40 @@ class BarbarianAssaultMenu case TAKE_GREEN_EGG: case TAKE_RED_EGG: case TAKE_YELLOW_EGG: - return (role != Role.COLLECTOR && role != null) && config.removeUnusedMenus(); + return (role != Role.COLLECTOR && role != null) && game.isRemoveUnusedMenus(); // Healer role options case TELL_CRACKERS_HEALER_HORN: case TELL_TOFU_HEALER_HORN: case TELL_WORMS_HEALER_HORN: - return ((role == Role.HEALER && isHornOptionHidden(entry.getOption())) || role == null) && config.removeIncorrectCalls(); + return ((role == Role.HEALER && isHornOptionHidden(entry.getOption())) || role == null) && game.isRemoveIncorrectCalls(); case DUNK_POISON_CRATER: case STOCK_UP_HEALER_ITEM_MACHINE: case TAKE_HEALER_ITEM_MACHINE: case TAKE_FROM_HEALER_SPRING: case DRINK_FROM_HEALER_SPRING: - return (role != Role.HEALER && role != null) && config.removeUnusedMenus(); + return (role != Role.HEALER && role != null) && game.isRemoveUnusedMenus(); case USE_VIAL_GROUND: case USE_VIAL_ITEM: case USE_VIAL_NPC: case USE_VIAL_WIDGET: - return role == Role.HEALER && config.removeUnusedMenus(); + return role == Role.HEALER && game.isRemoveUnusedMenus(); // Any role options case DROP_HORN: case EXAMINE_HORN: case USE_HORN: - return config.removeIncorrectCalls(); + return game.isRemoveIncorrectCalls(); case MEDIC_HORN: - return config.removeIncorrectCalls() && !hornUpdated; + return game.isRemoveIncorrectCalls() && !hornUpdated; default: - return role != null && config.removeUnusedMenus(); + return role != null && game.isRemoveUnusedMenus(); } }); @@ -189,15 +190,15 @@ class BarbarianAssaultMenu void enableSwaps() { - if (config.swapLadder()) + if (game.isSwapLadder()) { menuManager.addSwap("climb-down", "ladder", "quick-start", "ladder"); } - if (config.swapCollectorBag()) + if (game.isSwapCollectorBag()) { menuManager.addSwap("look-in", "collection bag", "empty", "collection bag"); } - if (config.swapDestroyEggs()) + if (game.isSwapDestroyEggs()) { menuManager.addSwap("use", "blue egg", "destroy", "blue egg"); menuManager.addSwap("use", "green egg", "destroy", "green egg"); @@ -207,17 +208,17 @@ class BarbarianAssaultMenu void disableSwaps(boolean force) { - if (!config.swapLadder() || force) + if (!game.isSwapLadder() || force) { menuManager.removeSwap("climb-down", "ladder", "quick-start", "ladder"); } - if (!config.swapCollectorBag() || force) + if (!game.isSwapCollectorBag() || force) { menuManager.removeSwap("look-in", "collection bag", "empty", "collection bag"); } - if (!config.swapDestroyEggs() || force) + if (!game.isSwapDestroyEggs() || force) { menuManager.removeSwap("use", "blue egg", "destroy", "blue egg"); menuManager.removeSwap("use", "green egg", "destroy", "green egg"); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java index be97a5755c..241ea3bb0b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java @@ -30,6 +30,7 @@ package net.runelite.client.plugins.barbarianassault; import com.google.common.collect.ImmutableList; import com.google.inject.Provides; +import java.awt.Color; import java.awt.Font; import java.awt.event.KeyEvent; import java.awt.image.BufferedImage; @@ -42,6 +43,8 @@ import java.util.Map; import java.util.Objects; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -108,6 +111,7 @@ import org.apache.commons.lang3.StringUtils; tags = {"minigame", "overlay", "timer"}, type = PluginType.PVM // don't remove this, added this because our barbarian assault plugin is big time modified ) +@Singleton public class BarbarianAssaultPlugin extends Plugin implements KeyListener { private static final String ENDGAME_REWARD_NEEDLE_TEXT = "
5"; @@ -241,16 +245,71 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener private String poisonUsed = null; - @Provides BarbarianAssaultConfig provideConfig(ConfigManager configManager) { return configManager.getConfig(BarbarianAssaultConfig.class); } + // save config values + @Getter(AccessLevel.PACKAGE) + private boolean swapLadder; + @Getter(AccessLevel.PACKAGE) + private boolean showTimer; + @Getter(AccessLevel.PACKAGE) + private boolean removeIncorrectCalls; + @Getter(AccessLevel.PACKAGE) + private boolean removeUnusedMenus; + private boolean prayerMetronome; + private int prayerMetronomeVolume; + private boolean showDeathTimes; + private DeathTimesMode showDeathTimesMode; + private boolean waveTimes; + private boolean showTotalRewards; + @Getter(AccessLevel.PACKAGE) + private boolean highlightArrows; + @Getter(AccessLevel.PACKAGE) + private Color highlightArrowColor; + private boolean removeIncorrectAttackStyles; + private boolean tagging; + @Getter(AccessLevel.PACKAGE) + private boolean highlightBait; + @Getter(AccessLevel.PACKAGE) + private Color highlightBaitColor; + private boolean showDefTimer; + private boolean deprioritizeBait; + @Getter(AccessLevel.PACKAGE) + private boolean removePenanceCave; + @Getter(AccessLevel.PACKAGE) + private boolean highlightPoison; + @Getter(AccessLevel.PACKAGE) + private Color highlightPoisonColor; + private boolean highlightNotification; + private Color highlightNotificationColor; + @Getter(AccessLevel.PACKAGE) + private boolean showHpCountOverlay; + @Getter(AccessLevel.PACKAGE) + private boolean showTeammateHealthbars; + @Getter(AccessLevel.PACKAGE) + private boolean healerCodes; + private boolean healerMenuOption; + private boolean shiftOverstock; + private boolean controlHealer; + @Getter(AccessLevel.PACKAGE) + private boolean swapCollectorBag; + @Getter(AccessLevel.PACKAGE) + private boolean swapDestroyEggs; + @Getter(AccessLevel.PACKAGE) + private boolean highlightCollectorEggs; + private boolean deprioritizeIncorrectEggs; + @Getter(AccessLevel.PACKAGE) + private boolean showEggCountOverlay; + @Override protected void startUp() throws Exception { + updateConfig(); + font = FontManager.getRunescapeFont().deriveFont(Font.BOLD, 24); torsoImage = itemManager.getImage(ItemID.FIGHTER_TORSO); clockImage = ImageUtil.getResourceStreamFromClass(getClass(), "clock.png"); @@ -329,10 +388,12 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener return; } + updateConfig(); + switch (configChanged.getKey()) { case "showTimer": - if (!config.showTimer()) + if (!this.showTimer) { showRoleSprite(); } @@ -352,7 +413,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener break; case "showDefTimer": - if (config.showDefTimer() && getRole() == Role.DEFENDER) + if (this.showDefTimer && getRole() == Role.DEFENDER) { addTickTimer(); } @@ -364,9 +425,9 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener case "showDeathTimes": case "showDeathTimesMode": - if (config.showDeathTimes() - && (config.showDeathTimesMode() == DeathTimesMode.INFO_BOX - || config.showDeathTimesMode() == DeathTimesMode.BOTH)) + if (this.showDeathTimes + && (this.showDeathTimesMode == DeathTimesMode.INFO_BOX + || this.showDeathTimesMode == DeathTimesMode.BOTH)) { addAllDeathTimes(); } @@ -383,7 +444,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener break; case "removeIncorrectAttackStyles": - if (!config.removeIncorrectAttackStyles()) + if (!this.removeIncorrectAttackStyles) { clientThread.invoke(this::showAllStyles); } @@ -391,6 +452,44 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener } } + public void updateConfig() + { + this.swapLadder = config.swapLadder(); + this.showTimer = config.showTimer(); + this.removeIncorrectCalls = config.removeIncorrectCalls(); + this.removeUnusedMenus = config.removeUnusedMenus(); + this.prayerMetronome = config.prayerMetronome(); + this.prayerMetronomeVolume = config.prayerMetronomeVolume(); + this.showDeathTimes = config.showDeathTimes(); + this.showDeathTimesMode = config.showDeathTimesMode(); + this.waveTimes = config.waveTimes(); + this.showTotalRewards = config.showTotalRewards(); + this.highlightArrows = config.highlightArrows(); + this.highlightArrowColor = config.highlightArrowColor(); + this.removeIncorrectAttackStyles = config.removeIncorrectAttackStyles(); + this.tagging = config.tagging(); + this.highlightBait = config.highlightBait(); + this.highlightBaitColor = config.highlightBaitColor(); + this.showDefTimer = config.showDefTimer(); + this.deprioritizeBait = config.deprioritizeBait(); + this.removePenanceCave = config.removePenanceCave(); + this.highlightPoison = config.highlightPoison(); + this.highlightPoisonColor = config.highlightPoisonColor(); + this.highlightNotification = config.highlightNotification(); + this.highlightNotificationColor = config.highlightNotificationColor(); + this.showHpCountOverlay = config.showHpCountOverlay(); + this.showTeammateHealthbars = config.showTeammateHealthbars(); + this.healerCodes = config.healerCodes(); + this.healerMenuOption = config.healerMenuOption(); + this.shiftOverstock = config.shiftOverstock(); + this.controlHealer = config.controlHealer(); + this.swapCollectorBag = config.swapCollectorBag(); + this.swapDestroyEggs = config.swapDestroyEggs(); + this.highlightCollectorEggs = config.highlightCollectorEggs(); + this.deprioritizeIncorrectEggs = config.deprioritizeIncorrectEggs(); + this.showEggCountOverlay = config.showEggCountOverlay(); + } + @Subscribe public void onWidgetLoaded(WidgetLoaded event) { @@ -408,7 +507,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener Widget pointsWidget = client.getWidget(WidgetInfo.BA_REWARD_TEXT); if (!rewardWidget.getText().contains(ENDGAME_REWARD_NEEDLE_TEXT)) { - if (config.showTotalRewards() && pointsWidget != null) + if (this.showTotalRewards && pointsWidget != null) { // The wave will be null if the plugin is disabled mid game, but // the wave points will still be accurate if it is re-enabled @@ -433,7 +532,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener { announceGameTime(); - if (config.showTotalRewards() && scorecard != null && scorecard.getNumberOfWaves() == 9) + if (this.showTotalRewards && scorecard != null && scorecard.getNumberOfWaves() == 9) { announce(scorecard.getGameSummary()); } @@ -496,11 +595,11 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener wave.setHpHealed(wave.getHpHealed() + health); } } - else if (message.contains("the wrong type of poisoned food to use") && config.highlightNotification()) + else if (message.contains("the wrong type of poisoned food to use") && this.highlightNotification) { final MessageNode messageNode = chatMessage.getMessageNode(); final String nodeValue = Text.removeTags(messageNode.getValue()); - messageNode.setValue(ColorUtil.wrapWithColorTag(nodeValue, config.highlightNotificationColor())); + messageNode.setValue(ColorUtil.wrapWithColorTag(nodeValue, this.highlightNotificationColor)); chatMessageManager.update(messageNode); } else if (message.startsWith("All of the Penance")) @@ -528,9 +627,9 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener break; } - if (config.showDeathTimes() && wave != null - && (config.showDeathTimesMode() == DeathTimesMode.CHAT_BOX - || config.showDeathTimesMode() == DeathTimesMode.BOTH)) + if (this.showDeathTimes && wave != null + && (this.showDeathTimesMode == DeathTimesMode.CHAT_BOX + || this.showDeathTimesMode == DeathTimesMode.BOTH)) { final MessageNode node = chatMessage.getMessageNode(); final String nodeValue = Text.removeTags(node.getValue()); @@ -635,9 +734,9 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener tickCounter.setCount(tickNum); } - if (config.prayerMetronome() && isAnyPrayerActive()) + if (this.prayerMetronome && isAnyPrayerActive()) { - for (int i = 0; i < config.prayerMetronomeVolume(); i++) + for (int i = 0; i < this.prayerMetronomeVolume; i++) { client.playSoundEffect(SoundEffectID.GE_INCREMENT_PLOP); } @@ -821,7 +920,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener // This doesn't have to be done in BeforeRender. And although it is // inefficient, it's only being done while in the instance. Will // likely be changed in the future - if (getRole() == Role.ATTACKER && config.removeIncorrectAttackStyles()) + if (getRole() == Role.ATTACKER && this.removeIncorrectAttackStyles) { Widget weapon = client.getWidget(WidgetInfo.COMBAT_WEAPON); @@ -891,7 +990,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener switch (getRole()) { case ATTACKER: - if (config.tagging() && option.equals("attack") && (target.startsWith("penance fighter") || target.startsWith("penance ranger"))) + if (this.tagging && option.equals("attack") && (target.startsWith("penance fighter") || target.startsWith("penance ranger"))) { String tag = StringUtils.substringBefore(entry.getTarget(), ")"); @@ -932,7 +1031,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener priority.add(entry); continue; } - else if (config.deprioritizeIncorrectEggs() + else if (this.deprioritizeIncorrectEggs && option.equals("take") && (target.equals("blue egg") || target.equals("green egg") || target.equals("red egg"))) { @@ -954,7 +1053,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener priority.add(entry); continue; } - else if (config.deprioritizeBait() + else if (this.deprioritizeBait && option.equals("take") && (target.equals("tofu") || target.equals("crackers") || target.equals("worms"))) { @@ -963,7 +1062,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener break; case HEALER: - if (config.healerMenuOption() && target.contains("penance healer") && healers.containsKey(identifier)) + if (this.healerMenuOption && target.contains("penance healer") && healers.containsKey(identifier)) { String tag = StringUtils.substringBefore(entry.getTarget(), " ("); int time = healers.get(identifier).timeToPoison(); @@ -978,17 +1077,17 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener if ((target.startsWith("poisoned meat ->") || target.startsWith("poisoned tofu ->") || target.startsWith("poisoned worms ->"))) { // Poison should only be used on healers - if (config.removeUnusedMenus() && !target.contains("penance healer")) + if (this.removeUnusedMenus && !target.contains("penance healer")) { continue; } - else if (config.controlHealer() && controlDown && identifier == lastHealerPoisoned && target.contains("penance healer")) + else if (this.controlHealer && controlDown && identifier == lastHealerPoisoned && target.contains("penance healer")) { selected.add(entry); continue; } } - else if (config.shiftOverstock() && target.equals("healer item machine") && shiftDown) + else if (this.shiftOverstock && target.equals("healer item machine") && shiftDown) { if (option.contains(listen)) { @@ -996,7 +1095,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener continue; } } - else if (config.removeUnusedMenus()) + else if (this.removeUnusedMenus) { // Vials that are empty should only be used on spring if (target.startsWith("healing vial ->") && !target.endsWith("healer spring")) @@ -1312,12 +1411,12 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener private void validateWidgets() { - if (!config.showTimer()) + if (!this.showTimer) { showRoleSprite(); } - if (config.showDefTimer() && getRole() == Role.DEFENDER) + if (this.showDefTimer && getRole() == Role.DEFENDER) { addTickTimer(); } @@ -1326,9 +1425,9 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener removeTickTimer(); } - if (config.showDeathTimes() - && (config.showDeathTimesMode() == DeathTimesMode.INFO_BOX - || config.showDeathTimesMode() == DeathTimesMode.BOTH)) + if (this.showDeathTimes + && (this.showDeathTimesMode == DeathTimesMode.INFO_BOX + || this.showDeathTimesMode == DeathTimesMode.BOTH)) { addAllDeathTimes(); } @@ -1388,7 +1487,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener deathTimes.add(box); - if (config.showDeathTimes() && (config.showDeathTimesMode() == DeathTimesMode.INFO_BOX || config.showDeathTimesMode() == DeathTimesMode.BOTH)) + if (this.showDeathTimes && (this.showDeathTimesMode == DeathTimesMode.INFO_BOX || this.showDeathTimesMode == DeathTimesMode.BOTH)) { infoBoxManager.addInfoBox(box); } @@ -1454,7 +1553,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener private void announceWaveTime() { - if (config.waveTimes() && wave != null) + if (this.waveTimes && wave != null) { announceTime("Wave " + getStage() + " duration: ", wave.getWaveTimer().getElapsedTimeFormatted()); } @@ -1462,7 +1561,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener private void announceGameTime() { - if (config.waveTimes() && gameTimer != null) + if (this.waveTimes && gameTimer != null) { announceTime("Game finished, duration: ", gameTimer.getElapsedTimeFormatted()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java index e33c798a83..2e2f6635e1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java @@ -35,7 +35,7 @@ import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.eventbus.Subscribe; -@Getter +@Getter(AccessLevel.PACKAGE) public class Scorecard { private BarbarianAssaultPlugin game; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Timer.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Timer.java index 69347915a6..18e9077e38 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Timer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Timer.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.barbarianassault; +import lombok.AccessLevel; import lombok.Getter; import java.time.Duration; @@ -33,7 +34,7 @@ import java.time.format.DateTimeFormatter; class Timer { - @Getter + @Getter(AccessLevel.PACKAGE) private final Instant startTime; Timer() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/TimerBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/TimerBox.java index 8efa4fe917..b3261d53c3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/TimerBox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/TimerBox.java @@ -26,12 +26,14 @@ package net.runelite.client.plugins.barbarianassault; import lombok.Data; +import lombok.EqualsAndHashCode; import net.runelite.client.plugins.Plugin; import net.runelite.client.ui.overlay.infobox.InfoBox; import java.awt.Color; import java.awt.image.BufferedImage; +@EqualsAndHashCode(callSuper = true) @Data public class TimerBox extends InfoBox { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java index a392312b75..feee859d9a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java @@ -37,7 +37,6 @@ import net.runelite.client.chat.ChatMessageBuilder; import java.awt.Color; - @Data public class Wave { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrotherSlainOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrotherSlainOverlay.java index a72d2dfccf..f732d6bd07 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrotherSlainOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrotherSlainOverlay.java @@ -28,6 +28,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import net.runelite.api.Varbits; @@ -43,13 +44,14 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.util.ColorUtil; +@Singleton public class BarrowsBrotherSlainOverlay extends Overlay { private final Client client; private final PanelComponent panelComponent = new PanelComponent(); @Inject - private BarrowsBrotherSlainOverlay(BarrowsPlugin plugin, Client client) + private BarrowsBrotherSlainOverlay(final BarrowsPlugin plugin, final Client client) { super(plugin); setPosition(OverlayPosition.TOP_LEFT); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrothers.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrothers.java index 6b2f3edab4..c2053439e1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrothers.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrothers.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.barrows; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import net.runelite.api.Varbits; @@ -39,10 +40,10 @@ public enum BarrowsBrothers TORAG("Torag", new WorldPoint(3553, 3283, 0), Varbits.BARROWS_KILLED_TORAG), VERAC("Verac", new WorldPoint(3557, 3298, 0), Varbits.BARROWS_KILLED_VERAC); - @Getter + @Getter(AccessLevel.PACKAGE) private final String name; - @Getter + @Getter(AccessLevel.PACKAGE) private final WorldPoint location; - @Getter + @Getter(AccessLevel.PACKAGE) private final Varbits killedVarbit; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java index 8e668d1697..12b3494af7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java @@ -30,6 +30,7 @@ import java.awt.Graphics2D; import java.awt.Rectangle; import java.util.List; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.GameObject; import net.runelite.api.NPC; @@ -44,22 +45,21 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; +@Singleton class BarrowsOverlay extends Overlay { private static final int MAX_DISTANCE = 2350; private final Client client; private final BarrowsPlugin plugin; - private final BarrowsConfig config; @Inject - private BarrowsOverlay(Client client, BarrowsPlugin plugin, BarrowsConfig config) + private BarrowsOverlay(final Client client, final BarrowsPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); this.client = client; this.plugin = plugin; - this.config = config; } @Override @@ -71,7 +71,7 @@ class BarrowsOverlay extends Overlay Widget puzzleAnswer = plugin.getPuzzleAnswer(); // tunnels are only on z=0 - if (!plugin.getWalls().isEmpty() && client.getPlane() == 0 && config.showMinimap()) + if (!plugin.getWalls().isEmpty() && client.getPlane() == 0 && plugin.isShowMinimap()) { // NPC dots graphics.setColor(npcColor); @@ -117,12 +117,12 @@ class BarrowsOverlay extends Overlay graphics.setColor(playerColor); graphics.fillRect(local.getMinimapLocation().getX(), local.getMinimapLocation().getY(), 3, 3); } - else if (config.showBrotherLoc()) + else if (plugin.isShowBrotherLoc()) { renderBarrowsBrothers(graphics); } - if (puzzleAnswer != null && config.showPuzzleAnswer() && !puzzleAnswer.isHidden()) + if (puzzleAnswer != null && plugin.isShowPuzzleAnswer() && !puzzleAnswer.isHidden()) { Rectangle answerRect = puzzleAnswer.getBounds(); graphics.setColor(Color.GREEN); @@ -230,11 +230,11 @@ class BarrowsOverlay extends Overlay if (client.getVar(brother.getKilledVarbit()) > 0) { - graphics.setColor(config.deadBrotherLocColor()); + graphics.setColor(plugin.getDeadBrotherLocColor()); } else { - graphics.setColor(config.brotherLocColor()); + graphics.setColor(plugin.getBrotherLocColor()); } graphics.drawString(brotherLetter, minimapText.getX(), minimapText.getY()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java index 2b5c044f82..a3bbf6461f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java @@ -27,10 +27,12 @@ package net.runelite.client.plugins.barrows; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import com.google.inject.Provides; +import java.awt.Color; import java.time.temporal.ChronoUnit; import java.util.HashSet; import java.util.Set; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ChatMessageType; @@ -77,6 +79,7 @@ import net.runelite.client.util.StackFormatter; description = "Show helpful information for the Barrows minigame", tags = {"combat", "minigame", "minimap", "bosses", "pve", "pvm"} ) +@Singleton public class BarrowsPlugin extends Plugin { @Getter(AccessLevel.PACKAGE) @@ -144,9 +147,23 @@ public class BarrowsPlugin extends Plugin return configManager.getConfig(BarrowsConfig.class); } + @Getter(AccessLevel.PACKAGE) + private boolean showMinimap; + @Getter(AccessLevel.PACKAGE) + private boolean showBrotherLoc; + private boolean showChestValue; + @Getter(AccessLevel.PACKAGE) + private Color brotherLocColor; + @Getter(AccessLevel.PACKAGE) + private Color deadBrotherLocColor; + @Getter(AccessLevel.PACKAGE) + private boolean showPuzzleAnswer; + private boolean showPrayerDrainTimer; + @Override protected void startUp() throws Exception { + updateConfig(); overlayManager.add(barrowsOverlay); overlayManager.add(brotherOverlay); } @@ -179,12 +196,28 @@ public class BarrowsPlugin extends Plugin @Subscribe public void onConfigChanged(ConfigChanged event) { - if (event.getGroup().equals("barrows") && !config.showPrayerDrainTimer()) + if (event.getGroup().equals("barrows")) { - stopPrayerDrainTimer(); + updateConfig(); + + if (!this.showPrayerDrainTimer) + { + stopPrayerDrainTimer(); + } } } + public void updateConfig() + { + this.showMinimap = config.showMinimap(); + this.showBrotherLoc = config.showBrotherLoc(); + this.showChestValue = config.showChestValue(); + this.brotherLocColor = config.brotherLocColor(); + this.deadBrotherLocColor = config.deadBrotherLocColor(); + this.showPuzzleAnswer = config.showPuzzleAnswer(); + this.showPrayerDrainTimer = config.showPrayerDrainTimer(); + } + @Subscribe public void onWallObjectSpawned(WallObjectSpawned event) { @@ -276,10 +309,14 @@ public class BarrowsPlugin extends Plugin @Subscribe public void onWidgetLoaded(WidgetLoaded event) { - if (event.getGroupId() == WidgetID.BARROWS_REWARD_GROUP_ID && config.showChestValue()) + if (event.getGroupId() == WidgetID.BARROWS_REWARD_GROUP_ID && this.showChestValue) { ItemContainer barrowsRewardContainer = client.getItemContainer(InventoryID.BARROWS_REWARD); - Item[] items = barrowsRewardContainer.getItems(); + Item[] items = new Item[0]; + if (barrowsRewardContainer != null) + { + items = barrowsRewardContainer.getItems(); + } long chestPrice = 0; for (Item item : items) @@ -320,7 +357,7 @@ public class BarrowsPlugin extends Plugin private void startPrayerDrainTimer() { - if (config.showPrayerDrainTimer()) + if (this.showPrayerDrainTimer) { final LoopTimer loopTimer = new LoopTimer( PRAYER_DRAIN_INTERVAL_MS, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java index b5d6c2f635..d23a8c238c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java @@ -35,10 +35,10 @@ import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.Varbits; import net.runelite.api.events.ChatMessage; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.MenuEntryAdded; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; -import net.runelite.client.menus.MenuManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; @@ -56,7 +56,6 @@ import org.apache.commons.lang3.RandomUtils; type = PluginType.SKILLING, enabledByDefault = false ) - @Singleton @Slf4j public class BlackjackPlugin extends Plugin @@ -68,10 +67,9 @@ public class BlackjackPlugin extends Plugin @Inject private Client client; @Inject - private MenuManager menuManager; - @Inject private BlackjackConfig config; + private boolean pickpocketOnAggro; @Provides BlackjackConfig getConfig(ConfigManager configManager) @@ -79,6 +77,20 @@ public class BlackjackPlugin extends Plugin return configManager.getConfig(BlackjackConfig.class); } + @Override + protected void startUp() throws Exception + { + this.pickpocketOnAggro = config.pickpocketOnAggro(); + } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (event.getGroup().equals("blackjack")) + { + this.pickpocketOnAggro = config.pickpocketOnAggro(); + } + } @Subscribe public void onMenuEntryAdded(MenuEntryAdded event) @@ -107,7 +119,7 @@ public class BlackjackPlugin extends Plugin { if (event.getType() == ChatMessageType.SPAM) { - if (event.getMessage().equals(SUCCESS_BLACKJACK) ^ (event.getMessage().equals(FAILED_BLACKJACK) && config.pickpocketOnAggro())) + if (event.getMessage().equals(SUCCESS_BLACKJACK) ^ (event.getMessage().equals(FAILED_BLACKJACK) && this.pickpocketOnAggro)) { nextKnockOutTick = client.getTickCount() + RandomUtils.nextInt(3, 4); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceClickBoxOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceClickBoxOverlay.java index 9dba17df30..4e7b818f90 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceClickBoxOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceClickBoxOverlay.java @@ -29,6 +29,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.geom.Area; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.EquipmentInventorySlot; import net.runelite.api.GameObject; @@ -42,21 +43,20 @@ import net.runelite.api.coords.LocalPoint; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; +@Singleton class BlastFurnaceClickBoxOverlay extends Overlay { private static final int MAX_DISTANCE = 2350; private final Client client; private final BlastFurnacePlugin plugin; - private final BlastFurnaceConfig config; @Inject - private BlastFurnaceClickBoxOverlay(Client client, BlastFurnacePlugin plugin, BlastFurnaceConfig config) + private BlastFurnaceClickBoxOverlay(final Client client, final BlastFurnacePlugin plugin) { setPosition(OverlayPosition.DYNAMIC); this.client = client; this.plugin = plugin; - this.config = config; } @Override @@ -64,13 +64,13 @@ class BlastFurnaceClickBoxOverlay extends Overlay { int dispenserState = client.getVar(Varbits.BAR_DISPENSER); - if (config.showConveyorBelt() && plugin.getConveyorBelt() != null) + if (plugin.isShowConveyorBelt() && plugin.getConveyorBelt() != null) { Color color = dispenserState == 1 ? Color.RED : Color.GREEN; renderObject(plugin.getConveyorBelt(), graphics, color); } - if (config.showBarDispenser() && plugin.getBarDispenser() != null) + if (plugin.isShowBarDispenser() && plugin.getBarDispenser() != null) { boolean hasIceGloves = hasIceGloves(); Color color = dispenserState == 2 && hasIceGloves ? Color.GREEN : (dispenserState == 3 ? Color.GREEN : Color.RED); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java index 49242d63a8..12c1353973 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.blastfurnace; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import static net.runelite.api.Varbits.BLAST_FURNACE_COFFER; @@ -41,6 +42,7 @@ import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.util.StackFormatter; +@Singleton class BlastFurnaceCofferOverlay extends Overlay { private final Client client; @@ -48,7 +50,7 @@ class BlastFurnaceCofferOverlay extends Overlay private final PanelComponent panelComponent = new PanelComponent(); @Inject - private BlastFurnaceCofferOverlay(Client client, BlastFurnacePlugin plugin) + private BlastFurnaceCofferOverlay(final Client client, final BlastFurnacePlugin plugin) { super(plugin); setPosition(OverlayPosition.TOP_LEFT); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceOverlay.java index 0d17c94bb7..2a83c6965d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceOverlay.java @@ -28,6 +28,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import net.runelite.client.game.ItemManager; @@ -39,6 +40,7 @@ import net.runelite.client.ui.overlay.components.ComponentOrientation; import net.runelite.client.ui.overlay.components.ImageComponent; import net.runelite.client.ui.overlay.components.PanelComponent; +@Singleton class BlastFurnaceOverlay extends Overlay { private final Client client; @@ -49,7 +51,7 @@ class BlastFurnaceOverlay extends Overlay private ItemManager itemManager; @Inject - BlastFurnaceOverlay(Client client, BlastFurnacePlugin plugin) + BlastFurnaceOverlay(final Client client, final BlastFurnacePlugin plugin) { super(plugin); this.plugin = plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java index 15d602a324..7c50696f55 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java @@ -29,6 +29,7 @@ import com.google.inject.Provides; import java.time.Duration; import java.time.Instant; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Client; @@ -37,6 +38,7 @@ import net.runelite.api.GameState; import static net.runelite.api.NullObjectID.NULL_9092; import static net.runelite.api.ObjectID.CONVEYOR_BELT; import net.runelite.api.Skill; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameObjectDespawned; import net.runelite.api.events.GameObjectSpawned; import net.runelite.api.events.GameStateChanged; @@ -57,6 +59,7 @@ import net.runelite.client.util.Text; description = "Show helpful information for the Blast Furnace minigame", tags = {"minigame", "overlay", "skilling", "smithing"} ) +@Singleton public class BlastFurnacePlugin extends Plugin { private static final int BAR_DISPENSER = NULL_9092; @@ -91,9 +94,19 @@ public class BlastFurnacePlugin extends Plugin @Inject private InfoBoxManager infoBoxManager; + @Inject + private BlastFurnaceConfig config; + + @Getter(AccessLevel.PACKAGE) + private boolean showConveyorBelt; + @Getter(AccessLevel.PACKAGE) + private boolean showBarDispenser; + @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(overlay); overlayManager.add(cofferOverlay); overlayManager.add(clickBoxOverlay); @@ -117,6 +130,15 @@ public class BlastFurnacePlugin extends Plugin return configManager.getConfig(BlastFurnaceConfig.class); } + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (event.getGroup().equals("blastfurnace")) + { + updateConfig(); + } + } + @Subscribe public void onGameObjectSpawned(GameObjectSpawned event) { @@ -187,4 +209,10 @@ public class BlastFurnacePlugin extends Plugin } } } + + public void updateConfig() + { + this.showBarDispenser = config.showBarDispenser(); + this.showConveyorBelt = config.showConveyorBelt(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineOreCountOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineOreCountOverlay.java index 8cff73bd55..0c4e15120d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineOreCountOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineOreCountOverlay.java @@ -28,6 +28,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.ItemID; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; @@ -43,20 +44,21 @@ import net.runelite.client.ui.overlay.components.ComponentOrientation; import net.runelite.client.ui.overlay.components.ImageComponent; import net.runelite.client.ui.overlay.components.PanelComponent; +@Singleton class BlastMineOreCountOverlay extends Overlay { private final Client client; - private final BlastMinePluginConfig config; + private final BlastMinePlugin plugin; private final ItemManager itemManager; private final PanelComponent panelComponent = new PanelComponent(); @Inject - private BlastMineOreCountOverlay(BlastMinePlugin plugin, Client client, BlastMinePluginConfig config, ItemManager itemManager) + private BlastMineOreCountOverlay(final BlastMinePlugin plugin, final Client client, final ItemManager itemManager) { super(plugin); setPosition(OverlayPosition.TOP_LEFT); this.client = client; - this.config = config; + this.plugin = plugin; this.itemManager = itemManager; panelComponent.setOrientation(ComponentOrientation.HORIZONTAL); getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Blast mine overlay")); @@ -74,7 +76,7 @@ class BlastMineOreCountOverlay extends Overlay panelComponent.getChildren().clear(); - if (config.showOreOverlay()) + if (plugin.isShowOreOverlay()) { blastMineWidget.setHidden(true); panelComponent.getChildren().add(new ImageComponent(getImage(ItemID.COAL, client.getVar(Varbits.BLAST_MINE_COAL)))); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMinePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMinePlugin.java index 7ddc7e8a80..88d98cebbf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMinePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMinePlugin.java @@ -25,9 +25,12 @@ package net.runelite.client.plugins.blastmine; import com.google.inject.Provides; +import java.awt.Color; import java.util.HashMap; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.GameObject; @@ -49,9 +52,10 @@ import net.runelite.client.ui.overlay.OverlayManager; description = "Show helpful information for the Blast Mine minigame", tags = {"explode", "explosive", "mining", "minigame", "skilling"} ) +@Singleton public class BlastMinePlugin extends Plugin { - @Getter + @Getter(AccessLevel.PACKAGE) private final Map rocks = new HashMap<>(); @Inject @@ -66,15 +70,33 @@ public class BlastMinePlugin extends Plugin @Inject private BlastMineOreCountOverlay blastMineOreCountOverlay; + @Inject + private BlastMinePluginConfig config; + @Provides BlastMinePluginConfig getConfig(ConfigManager configManager) { return configManager.getConfig(BlastMinePluginConfig.class); } + @Getter(AccessLevel.PACKAGE) + private boolean showOreOverlay; + @Getter(AccessLevel.PACKAGE) + private boolean showRockIconOverlay; + @Getter(AccessLevel.PACKAGE) + private boolean showTimerOverlay; + @Getter(AccessLevel.PACKAGE) + private boolean showWarningOverlay; + @Getter(AccessLevel.PACKAGE) + private Color timerColor; + @Getter(AccessLevel.PACKAGE) + private Color warningColor; + @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(blastMineRockOverlay); overlayManager.add(blastMineOreCountOverlay); } @@ -132,4 +154,14 @@ public class BlastMinePlugin extends Plugin (rock.getRemainingTimeRelative() == 1 && rock.getType() != BlastMineRockType.NORMAL) || (rock.getRemainingFuseTimeRelative() == 1 && rock.getType() == BlastMineRockType.LIT)); } + + private void updateConfig() + { + this.showOreOverlay = config.showOreOverlay(); + this.showRockIconOverlay = config.showRockIconOverlay(); + this.showTimerOverlay = config.showTimerOverlay(); + this.showWarningOverlay = config.showWarningOverlay(); + this.timerColor = config.getTimerColor(); + this.warningColor = config.getWarningColor(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRock.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRock.java index 1f1cec4fb5..441d836f3b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRock.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRock.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.blastmine; import java.time.Duration; import java.time.Instant; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.GameObject; @@ -34,10 +35,10 @@ class BlastMineRock private static final Duration PLANT_TIME = Duration.ofSeconds(30); private static final Duration FUSE_TIME = Duration.ofMillis(4200); - @Getter + @Getter(AccessLevel.PACKAGE) private final GameObject gameObject; - @Getter + @Getter(AccessLevel.PACKAGE) private final BlastMineRockType type; private final Instant creationTime = Instant.now(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockOverlay.java index 92fbdfe221..5199a9bd4f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockOverlay.java @@ -32,6 +32,7 @@ import java.awt.Polygon; import java.awt.image.BufferedImage; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.GameObject; import net.runelite.api.ItemID; @@ -49,6 +50,7 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.components.ProgressPieComponent; +@Singleton public class BlastMineRockOverlay extends Overlay { private static final int MAX_DISTANCE = 16; @@ -62,20 +64,18 @@ public class BlastMineRockOverlay extends Overlay private final Client client; private final BlastMinePlugin plugin; - private final BlastMinePluginConfig config; private final BufferedImage chiselIcon; private final BufferedImage dynamiteIcon; private final BufferedImage tinderboxIcon; @Inject - private BlastMineRockOverlay(Client client, BlastMinePlugin plugin, BlastMinePluginConfig config, ItemManager itemManager) + private BlastMineRockOverlay(final Client client, final BlastMinePlugin plugin, final ItemManager itemManager) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); this.client = client; this.plugin = plugin; - this.config = config; chiselIcon = itemManager.getImage(ItemID.CHISEL); dynamiteIcon = itemManager.getImage(ItemID.DYNAMITE); tinderboxIcon = itemManager.getImage(ItemID.TINDERBOX); @@ -114,8 +114,8 @@ public class BlastMineRockOverlay extends Overlay drawIconOnRock(graphics, rock, tinderboxIcon); break; case LIT: - drawTimerOnRock(graphics, rock, config.getTimerColor()); - drawAreaWarning(graphics, rock, config.getWarningColor(), tiles); + drawTimerOnRock(graphics, rock, plugin.getTimerColor()); + drawAreaWarning(graphics, rock, plugin.getWarningColor(), tiles); break; } } @@ -125,7 +125,7 @@ public class BlastMineRockOverlay extends Overlay private void drawIconOnRock(Graphics2D graphics, BlastMineRock rock, BufferedImage icon) { - if (!config.showRockIconOverlay()) + if (!plugin.isShowRockIconOverlay()) { return; } @@ -140,7 +140,7 @@ public class BlastMineRockOverlay extends Overlay private void drawTimerOnRock(Graphics2D graphics, BlastMineRock rock, Color color) { - if (!config.showTimerOverlay()) + if (!plugin.isShowTimerOverlay()) { return; } @@ -161,7 +161,7 @@ public class BlastMineRockOverlay extends Overlay private void drawAreaWarning(Graphics2D graphics, BlastMineRock rock, Color color, Tile[][][] tiles) { - if (!config.showWarningOverlay()) + if (!plugin.isShowWarningOverlay()) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockType.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockType.java index 20e1d37f58..0960fcfb5d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockType.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.blastmine; import com.google.common.collect.ImmutableMap; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ObjectID; @@ -54,7 +55,7 @@ public enum BlastMineRockType rockTypes = builder.build(); } - @Getter + @Getter(AccessLevel.PACKAGE) private final int[] objectIds; BlastMineRockType(int... objectIds) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostIndicator.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostIndicator.java index 00a0a97561..50a1db0b8a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostIndicator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostIndicator.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.boosts; import java.awt.Color; import java.awt.image.BufferedImage; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.Skill; @@ -35,17 +36,15 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxPriority; public class BoostIndicator extends InfoBox { private final BoostsPlugin plugin; - private final BoostsConfig config; private final Client client; - @Getter + @Getter(AccessLevel.PACKAGE) private final Skill skill; - BoostIndicator(Skill skill, BufferedImage image, BoostsPlugin plugin, Client client, BoostsConfig config) + BoostIndicator(final Skill skill, final BufferedImage image, final BoostsPlugin plugin, final Client client) { super(image, plugin); this.plugin = plugin; - this.config = config; this.client = client; this.skill = skill; setTooltip(skill.getName() + " boost"); @@ -55,7 +54,7 @@ public class BoostIndicator extends InfoBox @Override public String getText() { - if (!config.useRelativeBoost()) + if (!plugin.isUseRelativeBoost()) { return String.valueOf(client.getBoostedSkillLevel(skill)); } @@ -81,13 +80,13 @@ public class BoostIndicator extends InfoBox return new Color(238, 51, 51); } - return boosted - base <= config.boostThreshold() ? Color.YELLOW : Color.GREEN; + return boosted - base <= plugin.getBoostThreshold() ? Color.YELLOW : Color.GREEN; } @Override public boolean render() { - if (config.displayInfoboxes() && plugin.canShowBoosts() && plugin.getShownSkills().contains(getSkill())) + if (plugin.isDisplayInfoboxes() && plugin.canShowBoosts() && plugin.getShownSkills().contains(getSkill())) { return client.getBoostedSkillLevel(skill) != client.getRealSkillLevel(skill); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java index 54a4f62b8f..977fe0b5a0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java @@ -28,6 +28,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import net.runelite.api.Skill; @@ -41,20 +42,19 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.util.ColorUtil; +@Singleton class BoostsOverlay extends Overlay { private final Client client; - private final BoostsConfig config; private final PanelComponent panelComponent = new PanelComponent(); private final BoostsPlugin plugin; @Inject - private BoostsOverlay(Client client, BoostsConfig config, BoostsPlugin plugin) + private BoostsOverlay(final Client client, final BoostsPlugin plugin) { super(plugin); this.plugin = plugin; this.client = client; - this.config = config; setPosition(OverlayPosition.TOP_LEFT); setPriority(OverlayPriority.MED); getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Boosts overlay")); @@ -63,7 +63,7 @@ class BoostsOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (config.displayInfoboxes() || config.displayIcons()) + if (plugin.isDisplayInfoboxes() || plugin.isDisplayIcons()) { return null; } @@ -103,7 +103,7 @@ class BoostsOverlay extends Overlay final Color strColor = getTextColor(boost); String str; - if (config.useRelativeBoost()) + if (plugin.isUseRelativeBoost()) { str = String.valueOf(boost); if (boost > 0) @@ -133,7 +133,7 @@ class BoostsOverlay extends Overlay return new Color(238, 51, 51); } - return boost <= config.boostThreshold() ? Color.YELLOW : Color.GREEN; + return boost <= plugin.getBoostThreshold() ? Color.YELLOW : Color.GREEN; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java index 5dabff0736..a3ea8a41de 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java @@ -33,6 +33,7 @@ import java.util.List; import java.util.Set; import javax.inject.Inject; import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.Constants; @@ -107,6 +108,21 @@ public class BoostsPlugin extends Plugin private long lastTickMillis; private List boostedSkillsChanged = new ArrayList<>(); + private boolean enableSkill; + @Getter(AccessLevel.PACKAGE) + private boolean useRelativeBoost; + @Getter(AccessLevel.PACKAGE) + private boolean displayInfoboxes; + @Getter(AccessLevel.PACKAGE) + private boolean displayIcons; + @Getter(AccessLevel.PACKAGE) + private boolean boldIconFont; + private BoostsConfig.DisplayChangeMode displayNextBuffChange; + private BoostsConfig.DisplayChangeMode displayNextDebuffChange; + @Getter(AccessLevel.PACKAGE) + private int boostThreshold; + private boolean groupNotifications; + @Provides BoostsConfig provideConfig(ConfigManager configManager) { @@ -116,6 +132,8 @@ public class BoostsPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(boostsOverlay); overlayManager.add(combatIconsOverlay); updateShownSkills(); @@ -130,7 +148,7 @@ public class BoostsPlugin extends Plugin { if (skill != Skill.OVERALL) { - infoBoxManager.addInfoBox(new BoostIndicator(skill, skillIconManager.getSkillImage(skill), this, client, config)); + infoBoxManager.addInfoBox(new BoostIndicator(skill, skillIconManager.getSkillImage(skill), this, client)); } } } @@ -169,14 +187,15 @@ public class BoostsPlugin extends Plugin return; } + updateConfig(); updateShownSkills(); - if (config.displayNextBuffChange() == BoostsConfig.DisplayChangeMode.NEVER) + if (this.displayNextBuffChange == BoostsConfig.DisplayChangeMode.NEVER) { lastChangeDown = -1; } - if (config.displayNextDebuffChange() == BoostsConfig.DisplayChangeMode.NEVER) + if (this.displayNextDebuffChange == BoostsConfig.DisplayChangeMode.NEVER) { lastChangeUp = -1; } @@ -211,7 +230,7 @@ public class BoostsPlugin extends Plugin lastSkillLevels[skillIdx] = cur; updateBoostedStats(); - int boostThreshold = config.boostThreshold(); + int boostThreshold = this.boostThreshold; if (boostThreshold != 0) { @@ -220,7 +239,7 @@ public class BoostsPlugin extends Plugin int boost = cur - real; if (boost <= boostThreshold && boostThreshold < lastBoost) { - if (config.groupNotifications()) + if (this.groupNotifications) { boostedSkillsChanged.add(skill.getName()); } @@ -237,7 +256,7 @@ public class BoostsPlugin extends Plugin { lastTickMillis = System.currentTimeMillis(); - if (config.groupNotifications() && !boostedSkillsChanged.isEmpty()) + if (this.groupNotifications && !boostedSkillsChanged.isEmpty()) { if (boostedSkillsChanged.size() == 1) { @@ -268,7 +287,7 @@ public class BoostsPlugin extends Plugin if (getChangeUpTicks() <= 0) { - switch (config.displayNextDebuffChange()) + switch (this.displayNextDebuffChange) { case ALWAYS: if (lastChangeUp != -1) @@ -286,7 +305,7 @@ public class BoostsPlugin extends Plugin if (getChangeDownTicks() <= 0) { - switch (config.displayNextBuffChange()) + switch (this.displayNextBuffChange) { case ALWAYS: if (lastChangeDown != -1) @@ -305,7 +324,7 @@ public class BoostsPlugin extends Plugin private void updateShownSkills() { - if (config.enableSkill()) + if (this.enableSkill) { shownSkills.addAll(BOOSTABLE_NON_COMBAT_SKILLS); } @@ -368,8 +387,8 @@ public class BoostsPlugin extends Plugin int getChangeDownTicks() { if (lastChangeDown == -1 || - config.displayNextBuffChange() == BoostsConfig.DisplayChangeMode.NEVER || - (config.displayNextBuffChange() == BoostsConfig.DisplayChangeMode.BOOSTED && !isChangedUp)) + this.displayNextBuffChange == BoostsConfig.DisplayChangeMode.NEVER || + (this.displayNextBuffChange == BoostsConfig.DisplayChangeMode.BOOSTED && !isChangedUp)) { return -1; } @@ -396,8 +415,8 @@ public class BoostsPlugin extends Plugin int getChangeUpTicks() { if (lastChangeUp == -1 || - config.displayNextDebuffChange() == BoostsConfig.DisplayChangeMode.NEVER || - (config.displayNextDebuffChange() == BoostsConfig.DisplayChangeMode.BOOSTED && !isChangedDown)) + this.displayNextDebuffChange == BoostsConfig.DisplayChangeMode.NEVER || + (this.displayNextDebuffChange == BoostsConfig.DisplayChangeMode.BOOSTED && !isChangedDown)) { return -1; } @@ -418,4 +437,17 @@ public class BoostsPlugin extends Plugin final long diff = System.currentTimeMillis() - lastTickMillis; return time != -1 ? (int) ((time * Constants.GAME_TICK_LENGTH - diff) / 1000d) : time; } + + private void updateConfig() + { + this.enableSkill = config.enableSkill(); + this.useRelativeBoost = config.useRelativeBoost(); + this.displayInfoboxes = config.displayInfoboxes(); + this.displayIcons = config.displayIcons(); + this.boldIconFont = config.boldIconFont(); + this.displayNextBuffChange = config.displayNextDebuffChange(); + this.displayNextDebuffChange = config.displayNextDebuffChange(); + this.boostThreshold = config.boostThreshold(); + this.groupNotifications = config.groupNotifications(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/CombatIconsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/CombatIconsOverlay.java index 2e4c9c5ab9..c3c69d9561 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/CombatIconsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/CombatIconsOverlay.java @@ -6,6 +6,7 @@ import java.awt.Graphics2D; import java.awt.Rectangle; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import net.runelite.api.Skill; @@ -23,21 +24,20 @@ import net.runelite.client.ui.FontManager; import net.runelite.client.util.ColorUtil; import net.runelite.client.util.ImageUtil; +@Singleton class CombatIconsOverlay extends Overlay { private final Client client; - private final BoostsConfig config; private final PanelComponent panelComponent = new PanelComponent(); private final SkillIconManager iconManager; private final BoostsPlugin plugin; @Inject - private CombatIconsOverlay(Client client, BoostsConfig config, BoostsPlugin plugin, SkillIconManager iconManager) + private CombatIconsOverlay(final Client client, final BoostsPlugin plugin, final SkillIconManager iconManager) { super(plugin); this.plugin = plugin; this.client = client; - this.config = config; this.iconManager = iconManager; setPosition(OverlayPosition.TOP_LEFT); setPriority(OverlayPriority.MED); @@ -47,12 +47,12 @@ class CombatIconsOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (config.displayInfoboxes() || !config.displayIcons()) + if (plugin.isDisplayInfoboxes() || !plugin.isDisplayIcons()) { return null; } - if (config.boldIconFont()) + if (plugin.isBoldIconFont()) { graphics.setFont(FontManager.getRunescapeBoldFont()); } @@ -79,7 +79,7 @@ class CombatIconsOverlay extends Overlay final Color strColor = getTextColor(boost); String str; - if (config.useRelativeBoost()) + if (plugin.isUseRelativeBoost()) { str = String.valueOf(boost); if (boost > 0) @@ -137,7 +137,7 @@ class CombatIconsOverlay extends Overlay return new Color(238, 51, 51); } - return boost <= config.boostThreshold() ? Color.YELLOW : Color.GREEN; + return boost <= plugin.getBoostThreshold() ? Color.YELLOW : Color.GREEN; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java index 0e6b98c907..d5faf547dc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.bosstimer; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.NPC; import net.runelite.api.events.NpcDespawned; @@ -40,6 +41,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager; description = "Show boss spawn timer overlays", tags = {"combat", "pve", "overlay", "spawn"} ) +@Singleton @Slf4j public class BossTimersPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/RespawnTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/RespawnTimer.java index 1d9d077f25..6d3a03a85a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/RespawnTimer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/RespawnTimer.java @@ -33,7 +33,7 @@ class RespawnTimer extends Timer { private final Boss boss; - public RespawnTimer(Boss boss, BufferedImage bossImage, Plugin plugin) + RespawnTimer(Boss boss, BufferedImage bossImage, Plugin plugin) { super(boss.getSpawnTime().toMillis(), ChronoUnit.MILLIS, bossImage, plugin); this.boss = boss; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonOverlay.java index 06d0500155..84b7423ab3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonOverlay.java @@ -29,6 +29,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Polygon; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Perspective; import static net.runelite.api.Perspective.LOCAL_TILE_SIZE; @@ -40,22 +41,21 @@ import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.ui.overlay.components.TextComponent; +@Singleton class CannonOverlay extends Overlay { private static final int MAX_DISTANCE = 2500; private final Client client; - private final CannonConfig config; private final CannonPlugin plugin; private final TextComponent textComponent = new TextComponent(); @Inject - CannonOverlay(Client client, CannonConfig config, CannonPlugin plugin) + CannonOverlay(final Client client, final CannonPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setPriority(OverlayPriority.MED); this.client = client; - this.config = config; this.plugin = plugin; } @@ -91,9 +91,9 @@ class CannonOverlay extends Overlay textComponent.render(graphics); } - if (config.showDoubleHitSpot()) + if (plugin.isShowDoubleHitSpot()) { - Color color = config.highlightDoubleHitColor(); + Color color = plugin.getHighlightDoubleHitColor(); drawDoubleHitSpots(graphics, cannonPoint, color); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java index 6b82e45aca..dd229ef8c6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java @@ -33,6 +33,7 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.inject.Inject; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.AnimationID; import net.runelite.api.ChatMessageType; @@ -80,19 +81,19 @@ public class CannonPlugin extends Plugin private CannonCounter counter; private boolean skipProjectileCheckThisTick; - @Getter + @Getter(AccessLevel.PACKAGE) private int cballsLeft; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean cannonPlaced; - @Getter + @Getter(AccessLevel.PACKAGE) private WorldPoint cannonPosition; - @Getter + @Getter(AccessLevel.PACKAGE) private GameObject cannon; - @Getter + @Getter(AccessLevel.PACKAGE) private List spotPoints = new ArrayList<>(); @Inject @@ -124,6 +125,17 @@ public class CannonPlugin extends Plugin private boolean lock; + private boolean showEmptyCannonNotification; + private boolean showInfobox; + @Getter(AccessLevel.PACKAGE) + private boolean showDoubleHitSpot; + @Getter(AccessLevel.PACKAGE) + private Color highlightDoubleHitColor; + @Getter(AccessLevel.PACKAGE) + private boolean showCannonSpots; + private int ammoAmount; + private boolean notifyAmmoLeft; + @Provides CannonConfig provideConfig(ConfigManager configManager) { @@ -133,6 +145,8 @@ public class CannonPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(cannonOverlay); overlayManager.add(cannonSpotOverlay); lock = false; @@ -169,7 +183,9 @@ public class CannonPlugin extends Plugin { if (event.getGroup().equals("cannon")) { - if (!config.showInfobox()) + updateConfig(); + + if (!this.showInfobox) { removeCounter(); } @@ -190,7 +206,7 @@ public class CannonPlugin extends Plugin ) public void checkSpots() { - if (!config.showCannonSpots()) + if (!this.showCannonSpots) { return; } @@ -318,7 +334,7 @@ public class CannonPlugin extends Plugin // extra check is a good idea. cballsLeft = 0; - if (config.showEmptyCannonNotification()) + if (this.showEmptyCannonNotification) { notifier.notify("Your cannon is out of ammo!"); } @@ -350,11 +366,11 @@ public class CannonPlugin extends Plugin { return Color.orange; } - else if (cballsLeft <= config.ammoAmount()) + else if (cballsLeft <= this.ammoAmount) { - if (config.notifyAmmoLeft() && !lock) + if (this.notifyAmmoLeft && !lock) { - notifier.notify("Your cannon has " + config.ammoAmount() + " balls left!"); + notifier.notify("Your cannon has " + this.ammoAmount + " balls left!"); lock = true; } } @@ -364,7 +380,7 @@ public class CannonPlugin extends Plugin private void addCounter() { - if (!config.showInfobox() || counter != null) + if (!this.showInfobox || counter != null) { return; } @@ -385,4 +401,15 @@ public class CannonPlugin extends Plugin infoBoxManager.removeInfoBox(counter); counter = null; } + + private void updateConfig() + { + this.showEmptyCannonNotification = config.showEmptyCannonNotification(); + this.showInfobox = config.showInfobox(); + this.showDoubleHitSpot = config.showDoubleHitSpot(); + this.highlightDoubleHitColor = config.highlightDoubleHitColor(); + this.showCannonSpots = config.showCannonSpots(); + this.ammoAmount = config.ammoAmount(); + this.notifyAmmoLeft = config.notifyAmmoLeft(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java index 01c3eff871..3bf377f2b0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java @@ -30,6 +30,7 @@ import java.awt.Graphics2D; import java.awt.Polygon; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Setter; import net.runelite.api.Client; @@ -43,13 +44,13 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton public class CannonSpotOverlay extends Overlay { private static final int MAX_DISTANCE = 2350; private final Client client; private final CannonPlugin plugin; - private final CannonConfig config; @Inject private ItemManager itemManager; @@ -58,18 +59,17 @@ public class CannonSpotOverlay extends Overlay private boolean hidden; @Inject - CannonSpotOverlay(Client client, CannonPlugin plugin, CannonConfig config) + CannonSpotOverlay(final Client client, final CannonPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); this.client = client; this.plugin = plugin; - this.config = config; } @Override public Dimension render(Graphics2D graphics) { - if (hidden || !config.showCannonSpots() || plugin.isCannonPlaced()) + if (hidden || !plugin.isShowCannonSpots() || plugin.isCannonPlaced()) { return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusGhost.java b/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusGhost.java index 354dd0edf4..28adddc615 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusGhost.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusGhost.java @@ -27,13 +27,14 @@ package net.runelite.client.plugins.cerberus; import com.google.common.collect.ImmutableMap; import java.util.Map; import java.util.Optional; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import net.runelite.api.NPC; import net.runelite.api.NpcID; import net.runelite.api.Skill; -@Getter +@Getter(AccessLevel.PACKAGE) @RequiredArgsConstructor public enum CerberusGhost { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java index 4cc810847f..3f51018632 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.chatboxperformance; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.events.WidgetPositioned; import net.runelite.api.widgets.Widget; @@ -40,6 +41,7 @@ import net.runelite.client.plugins.PluginDescriptor; name = "Chatbox performance", hidden = true ) +@Singleton public class ChatboxPerformancePlugin extends Plugin { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java index 079f1cdba6..fcac5d54b1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java @@ -25,6 +25,7 @@ */ package net.runelite.client.plugins.chatcommands; +import javax.inject.Singleton; import net.runelite.api.vars.AccountType; import com.google.inject.Provides; import java.io.IOException; @@ -81,6 +82,7 @@ import org.apache.commons.text.WordUtils; description = "Enable chat commands", tags = {"grand", "exchange", "level", "prices"} ) +@Singleton @Slf4j public class ChatCommandsPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java index 8413b0e67a..a00c7391b2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java @@ -34,6 +34,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Setter; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.MessageNode; @@ -53,6 +56,7 @@ import org.apache.commons.lang3.StringUtils; description = "Censor user configurable words or patterns from chat", enabledByDefault = false ) +@Singleton public class ChatFilterPlugin extends Plugin { private static final Splitter NEWLINE_SPLITTER = Splitter @@ -71,6 +75,17 @@ public class ChatFilterPlugin extends Plugin @Inject private ChatFilterConfig config; + @Setter(AccessLevel.PACKAGE) + private ChatFilterType filterType; + @Setter(AccessLevel.PACKAGE) + private String filteredWords; + @Setter(AccessLevel.PACKAGE) + private String filteredRegex; + @Setter(AccessLevel.PACKAGE) + private boolean filterFriends; + @Setter(AccessLevel.PACKAGE) + private boolean filterClan; + @Provides ChatFilterConfig provideConfig(ConfigManager configManager) { @@ -80,6 +95,7 @@ public class ChatFilterPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); updateFilteredPatterns(); } @@ -122,8 +138,8 @@ public class ChatFilterPlugin extends Plugin MessageNode messageNode = (MessageNode) client.getMessages().get(messageId); if (client.getLocalPlayer().getName().equals(messageNode.getName()) || - !config.filterFriends() && messageNode.isFromFriend() || - !config.filterClan() && messageNode.isFromClanMate()) + !this.filterFriends && messageNode.isFromFriend() || + !this.filterClan && messageNode.isFromClanMate()) { return; } @@ -168,8 +184,8 @@ public class ChatFilterPlugin extends Plugin { boolean isMessageFromSelf = playerName.equals(client.getLocalPlayer().getName()); return !isMessageFromSelf && - (config.filterFriends() || !client.isFriended(playerName, false)) && - (config.filterClan() || !client.isClanMember(playerName)); + (this.filterFriends || !client.isFriended(playerName, false)) && + (this.filterClan || !client.isClanMember(playerName)); } String censorMessage(final String message) @@ -185,7 +201,7 @@ public class ChatFilterPlugin extends Plugin while (m.find()) { - switch (config.filterType()) + switch (this.filterType) { case CENSOR_WORDS: m.appendReplacement(sb, StringUtils.repeat("*", m.group(0).length())); @@ -209,11 +225,11 @@ public class ChatFilterPlugin extends Plugin { filteredPatterns.clear(); - Text.fromCSV(config.filteredWords()).stream() + Text.fromCSV(this.filteredWords).stream() .map(s -> Pattern.compile(Pattern.quote(s), Pattern.CASE_INSENSITIVE)) .forEach(filteredPatterns::add); - NEWLINE_SPLITTER.splitToList(config.filteredRegex()).stream() + NEWLINE_SPLITTER.splitToList(this.filteredRegex).stream() .map(s -> { try @@ -237,6 +253,16 @@ public class ChatFilterPlugin extends Plugin return; } + updateConfig(); updateFilteredPatterns(); } + + private void updateConfig() + { + this.filterType = config.filterType(); + this.filteredWords = config.filteredWords(); + this.filteredRegex = config.filteredRegex(); + this.filterFriends = config.filterFriends(); + this.filterClan = config.filterClan(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java index d6ed9d888d..86586dedf5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java @@ -32,12 +32,14 @@ import java.util.Deque; import java.util.Iterator; import java.util.Queue; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.ScriptID; import net.runelite.api.VarClientInt; import net.runelite.api.VarClientStr; import net.runelite.api.events.ChatMessage; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.vars.InputType; import net.runelite.client.callback.ClientThread; @@ -56,6 +58,7 @@ import net.runelite.client.util.Text; description = "Retain your chat history when logging in/out or world hopping", tags = {"chat", "history", "retain", "cycle", "pm"} ) +@Singleton public class ChatHistoryPlugin extends Plugin implements KeyListener { private static final String WELCOME_MESSAGE = "Welcome to Old School RuneScape."; @@ -82,6 +85,9 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener @Inject private ChatMessageManager chatMessageManager; + private boolean retainChatHistory; + private boolean pmTargetCycling; + @Provides ChatHistoryConfig getConfig(ConfigManager configManager) { @@ -91,6 +97,8 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener @Override protected void startUp() { + updateConfig(); + messageQueue = EvictingQueue.create(100); friends = new ArrayDeque<>(FRIENDS_MAX_SIZE + 1); keyManager.registerKeyListener(this); @@ -113,7 +121,7 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener // of information that chat history was reset if (chatMessage.getMessage().equals(WELCOME_MESSAGE)) { - if (!config.retainChatHistory()) + if (!this.retainChatHistory) { return; } @@ -204,7 +212,7 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener @Override public void keyPressed(KeyEvent e) { - if (e.getKeyCode() != CYCLE_HOTKEY || !config.pmTargetCycling()) + if (e.getKeyCode() != CYCLE_HOTKEY || !this.pmTargetCycling) { return; } @@ -260,4 +268,21 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener return friends.getLast(); } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!"chathistory".equals(event.getGroup())) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.retainChatHistory = config.retainChatHistory(); + this.pmTargetCycling = config.pmTargetCycling(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java index 0f9f000b28..0f8c5f1847 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java @@ -36,6 +36,7 @@ import java.util.regex.Pattern; import static java.util.regex.Pattern.quote; import java.util.stream.Collectors; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.MessageNode; import net.runelite.api.events.ChatMessage; @@ -57,6 +58,7 @@ import net.runelite.client.util.Text; tags = {"duel", "messages", "notifications", "trade", "username"}, enabledByDefault = false ) +@Singleton public class ChatNotificationsPlugin extends Plugin { @Inject @@ -82,6 +84,14 @@ public class ChatNotificationsPlugin extends Plugin // Private message cache used to avoid duplicate notifications from ChatHistory. private Set privateMessageHashes = new HashSet<>(); + private boolean highlightOwnName; + private String highlightWordsString; + private boolean notifyOnOwnName; + private boolean notifyOnHighlight; + private boolean notifyOnTrade; + private boolean notifyOnDuel; + private boolean notifyOnPm; + @Provides ChatNotificationsConfig provideConfig(ConfigManager configManager) { @@ -91,6 +101,7 @@ public class ChatNotificationsPlugin extends Plugin @Override public void startUp() { + updateConfig(); updateHighlights(); } @@ -117,6 +128,7 @@ public class ChatNotificationsPlugin extends Plugin { if (event.getGroup().equals("chatnotification")) { + updateConfig(); updateHighlights(); } } @@ -125,9 +137,9 @@ public class ChatNotificationsPlugin extends Plugin { highlightMatcher = null; - if (!config.highlightWordsString().trim().equals("")) + if (!this.highlightWordsString.trim().equals("")) { - List items = Text.fromCSV(config.highlightWordsString()); + List items = Text.fromCSV(this.highlightWordsString); String joined = items.stream() .map(Text::escapeJagex) // we compare these strings to the raw Jagex ones .map(Pattern::quote) @@ -147,13 +159,13 @@ public class ChatNotificationsPlugin extends Plugin switch (chatMessage.getType()) { case TRADEREQ: - if (chatMessage.getMessage().contains("wishes to trade with you.") && config.notifyOnTrade()) + if (chatMessage.getMessage().contains("wishes to trade with you.") && this.notifyOnTrade) { notifier.notify(chatMessage.getMessage()); } break; case CHALREQ_TRADE: - if (chatMessage.getMessage().contains("wishes to duel with you.") && config.notifyOnDuel()) + if (chatMessage.getMessage().contains("wishes to duel with you.") && this.notifyOnDuel) { notifier.notify(chatMessage.getMessage()); } @@ -167,7 +179,7 @@ public class ChatNotificationsPlugin extends Plugin break; case PRIVATECHAT: case MODPRIVATECHAT: - if (config.notifyOnPm()) + if (this.notifyOnPm) { int messageHash = this.buildMessageHash(chatMessage); if (this.privateMessageHashes.contains(messageHash)) @@ -187,7 +199,7 @@ public class ChatNotificationsPlugin extends Plugin usernameReplacer = "" + username + ""; } - if (config.highlightOwnName() && usernameMatcher != null) + if (this.highlightOwnName && usernameMatcher != null) { Matcher matcher = usernameMatcher.matcher(messageNode.getValue()); if (matcher.find()) @@ -195,7 +207,7 @@ public class ChatNotificationsPlugin extends Plugin messageNode.setValue(matcher.replaceAll(usernameReplacer)); update = true; - if (config.notifyOnOwnName()) + if (this.notifyOnOwnName) { sendNotification(chatMessage); } @@ -222,7 +234,7 @@ public class ChatNotificationsPlugin extends Plugin matcher.appendTail(stringBuffer); messageNode.setValue(stringBuffer.toString()); - if (config.notifyOnHighlight()) + if (this.notifyOnHighlight) { sendNotification(chatMessage); } @@ -261,4 +273,15 @@ public class ChatNotificationsPlugin extends Plugin String notification = stringBuilder.toString(); notifier.notify(notification); } + + private void updateConfig() + { + this.highlightOwnName = config.highlightOwnName(); + this.highlightWordsString = config.highlightWordsString(); + this.notifyOnOwnName = config.notifyOnOwnName(); + this.notifyOnHighlight = config.notifyOnHighlight(); + this.notifyOnTrade = config.notifyOnTrade(); + this.notifyOnDuel = config.notifyOnDuel(); + this.notifyOnPm = config.notifyOnPm(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java index 034dfa2647..3760f5b036 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java @@ -3,6 +3,7 @@ package net.runelite.client.plugins.chattranslation; import com.google.common.collect.ImmutableList; import com.google.common.collect.ObjectArrays; import com.google.inject.Provides; +import javax.inject.Singleton; import net.runelite.api.*; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ConfigChanged; @@ -34,6 +35,7 @@ import java.util.ArrayList; tags = {"translate", "language", "english", "spanish", "dutch", "french"}, type = PluginType.UTILITY ) +@Singleton public class ChatTranslationPlugin extends Plugin implements KeyListener { @@ -64,6 +66,13 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener @Inject private ChatTranslationConfig config; + private boolean translateOptionVisable; + private boolean publicChat; + private String getPlayerNames; + private Languages publicTargetLanguage; + private boolean playerChat; + private Languages playerTargetLanguage; + @Provides ChatTranslationConfig provideConfig(ConfigManager configManager) { @@ -73,9 +82,11 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener @Override protected void startUp() throws Exception { + updateConfig(); + if (client != null) { - if (config.translateOptionVisable()) + if (this.translateOptionVisable) { menuManager.get().addPlayerMenuItem(TRANSLATE); } @@ -90,7 +101,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener { if (client != null) { - if (config.translateOptionVisable()) + if (this.translateOptionVisable) { menuManager.get().removePlayerMenuItem(TRANSLATE); } @@ -105,9 +116,10 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener { if (event.getGroup().equals("chattranslation")) { + updateConfig(); if (event.getKey().equals("playerNames")) { - for (String names : Text.fromCSV(config.getPlayerNames())) + for (String names : Text.fromCSV(this.getPlayerNames)) { if (!playerNames.contains(Text.toJagexName(names))) { @@ -121,7 +133,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener @Subscribe public void onMenuEntryAdded(MenuEntryAdded event) { - if (!config.translateOptionVisable()) + if (!this.translateOptionVisable) { return; } @@ -181,7 +193,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener case PUBLICCHAT: case MODCHAT: case FRIENDSCHAT: - if (!config.publicChat()) + if (!this.publicChat) { return; } @@ -201,7 +213,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener try { //Automatically check language of message and translate to selected language. - String translation = translator.translate("auto", config.publicTargetLanguage().toString(), message); + String translation = translator.translate("auto", this.publicTargetLanguage.toString(), message); if (translation != null) { final MessageNode messageNode = chatMessage.getMessageNode(); @@ -227,7 +239,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener return; } - if (!config.playerChat()) + if (!this.playerChat) { return; } @@ -259,7 +271,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener try { //Automatically check language of message and translate to selected language. - String translation = translator.translate("auto", config.playerTargetLanguage().toString(), message); + String translation = translator.translate("auto", this.playerTargetLanguage.toString(), message); if (translation != null) { client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, translation); @@ -291,4 +303,13 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener // Nothing. } + private void updateConfig() + { + this.publicChat = config.publicChat(); + this.getPlayerNames = config.getPlayerNames(); + this.translateOptionVisable = config.translateOptionVisable(); + this.publicTargetLanguage = config.publicTargetLanguage(); + this.playerChat = config.playerChat(); + this.playerTargetLanguage = config.playerTargetLanguage(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatIndicator.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatIndicator.java index e8f7542d7d..38c86929dd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatIndicator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatIndicator.java @@ -26,13 +26,15 @@ package net.runelite.client.plugins.clanchat; import java.awt.Color; import java.awt.image.BufferedImage; +import javax.inject.Singleton; import net.runelite.client.ui.overlay.infobox.Counter; +@Singleton class ClanChatIndicator extends Counter { private final ClanChatPlugin plugin; - ClanChatIndicator(BufferedImage image, ClanChatPlugin plugin) + ClanChatIndicator(final BufferedImage image, final ClanChatPlugin plugin) { super(image, plugin, plugin.getClanAmount()); this.plugin = plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java index 8e053922dd..cab4bb4b45 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java @@ -40,6 +40,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.ChatLineBuffer; import net.runelite.api.ChatMessageType; import net.runelite.api.ClanMember; @@ -68,7 +69,6 @@ import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetType; import net.runelite.client.callback.ClientThread; import net.runelite.client.chat.ChatMessageBuilder; -import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.ClanManager; @@ -87,6 +87,7 @@ import net.runelite.client.util.Text; description = "Add rank icons to users talking in clan chat", tags = {"icons", "rank", "recent"} ) +@Singleton public class ClanChatPlugin extends Plugin { private static final int MAX_CHATS = 20; @@ -112,9 +113,6 @@ public class ClanChatPlugin extends Plugin @Inject private ClientThread clientThread; - - @Inject - private ChatMessageManager chatMessageManager; private List chats = new ArrayList<>(); @@ -132,6 +130,17 @@ public class ClanChatPlugin extends Plugin private Map activityBuffer = new HashMap<>(); private int clanJoinedTick; + private boolean clanChatIcons; + private boolean recentChats; + private boolean showClanCounter; + private String chatsData; + private boolean showJoinLeave; + private ClanMemberRank joinLeaveRank; + private boolean privateMessageIcons; + private boolean publicChatIcons; + private boolean clanTabChat; + private String clanname; + @Provides ClanChatConfig getConfig(ConfigManager configManager) { @@ -141,6 +150,7 @@ public class ClanChatPlugin extends Plugin @Override public void startUp() { + updateConfig(); chats = new ArrayList<>(Text.fromCSV(config.chatsData())); } @@ -157,12 +167,14 @@ public class ClanChatPlugin extends Plugin { if (configChanged.getGroup().equals("clanchat")) { - if (!config.recentChats()) + updateConfig(); + + if (!this.recentChats) { resetClanChats(); } - if (config.showClanCounter()) + if (this.showClanCounter) { clientThread.invoke(this::addClanCounter); } @@ -200,8 +212,8 @@ public class ClanChatPlugin extends Plugin return; } - if (!config.showJoinLeave() || - member.getRank().getValue() < config.joinLeaveRank().getValue()) + if (!this.showJoinLeave || + member.getRank().getValue() < this.joinLeaveRank.getValue()) { return; } @@ -245,8 +257,8 @@ public class ClanChatPlugin extends Plugin } } - if (!config.showJoinLeave() || - member.getRank().getValue() < config.joinLeaveRank().getValue()) + if (!this.showJoinLeave || + member.getRank().getValue() < this.joinLeaveRank.getValue()) { return; } @@ -271,7 +283,7 @@ public class ClanChatPlugin extends Plugin return; } - client.setVar(VarClientStr.RECENT_CLAN_CHAT, config.clanname()); + client.setVar(VarClientStr.RECENT_CLAN_CHAT, this.clanname); Widget clanChatTitleWidget = client.getWidget(WidgetInfo.CLAN_CHAT_TITLE); if (clanChatTitleWidget != null) @@ -282,7 +294,7 @@ public class ClanChatPlugin extends Plugin { clanChatTitleWidget.setText(CLAN_CHAT_TITLE + " (" + client.getClanChatCount() + "/100)"); } - else if (config.recentChats() && clanChatList.getChildren() == null && !Strings.isNullOrEmpty(owner.getText())) + else if (this.recentChats && clanChatList.getChildren() == null && !Strings.isNullOrEmpty(owner.getText())) { clanChatTitleWidget.setText(RECENT_TITLE); @@ -290,7 +302,7 @@ public class ClanChatPlugin extends Plugin } } - if (!config.showJoinLeave()) + if (!this.showJoinLeave) { return; } @@ -373,7 +385,7 @@ public class ClanChatPlugin extends Plugin channelColor = CHAT_CLAN_NAME_TRANSPARENT_BACKGROUND; } - if (config.clanChatIcons() && rank != null && rank != ClanMemberRank.UNRANKED) + if (this.clanChatIcons && rank != null && rank != ClanMemberRank.UNRANKED) { rankIcon = clanManager.getIconNumber(rank); } @@ -405,7 +417,7 @@ public class ClanChatPlugin extends Plugin @Subscribe public void onVarClientStrChanged(VarClientStrChanged strChanged) { - if (strChanged.getIndex() == VarClientStr.RECENT_CLAN_CHAT.getIndex() && config.recentChats()) + if (strChanged.getIndex() == VarClientStr.RECENT_CLAN_CHAT.getIndex() && this.recentChats) { updateRecentChat(client.getVar(VarClientStr.RECENT_CLAN_CHAT)); } @@ -428,20 +440,20 @@ public class ClanChatPlugin extends Plugin { case PRIVATECHAT: case MODPRIVATECHAT: - if (!config.privateMessageIcons()) + if (!this.privateMessageIcons) { return; } break; case PUBLICCHAT: case MODCHAT: - if (!config.publicChatIcons()) + if (!this.publicChatIcons) { return; } break; case FRIENDSCHAT: - if (!config.clanChatIcons()) + if (!this.clanChatIcons) { return; } @@ -515,7 +527,7 @@ public class ClanChatPlugin extends Plugin final int[] intStack = client.getIntStack(); final int size = client.getIntStackSize(); - intStack[size - 1] = config.clanTabChat() ? 1 : 0; + intStack[size - 1] = this.clanTabChat ? 1 : 0; } int getClanAmount() @@ -617,7 +629,10 @@ public class ClanChatPlugin extends Plugin chats.remove(0); } - config.chatsData(Text.toCSV(chats)); + String csvText = Text.toCSV(chats); + + config.chatsData(csvText); + this.chatsData = csvText; } private void removeClanCounter() @@ -628,7 +643,7 @@ public class ClanChatPlugin extends Plugin private void addClanCounter() { - if (!config.showClanCounter() || clanMemberCounter != null || clanMembers.isEmpty()) + if (!this.showClanCounter || clanMemberCounter != null || clanMembers.isEmpty()) { return; } @@ -637,4 +652,18 @@ public class ClanChatPlugin extends Plugin clanMemberCounter = new ClanChatIndicator(image, this); infoBoxManager.addInfoBox(clanMemberCounter); } + + private void updateConfig() + { + this.clanChatIcons = config.clanChatIcons(); + this.recentChats = config.recentChats(); + this.showClanCounter = config.showClanCounter(); + this.chatsData = config.chatsData(); + this.showJoinLeave = config.showJoinLeave(); + this.joinLeaveRank = config.joinLeaveRank(); + this.privateMessageIcons = config.privateMessageIcons(); + this.publicChatIcons = config.publicChatIcons(); + this.clanTabChat = config.clanTabChat(); + this.clanname = config.clanname(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeMinimapOverlay.java index be94ee06f3..d0b8e79c9c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeMinimapOverlay.java @@ -19,7 +19,7 @@ public class ClanManModeMinimapOverlay extends Overlay private final ClanManModeConfig config; @Inject - private ClanManModeMinimapOverlay(ClanManModeConfig config, ClanManModeService ClanManModeService) + private ClanManModeMinimapOverlay(final ClanManModeConfig config, final ClanManModeService ClanManModeService) { this.config = config; this.ClanManModeService = ClanManModeService; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeOverlay.java index 4cfc1cd6ad..e616ad7486 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeOverlay.java @@ -20,7 +20,7 @@ public class ClanManModeOverlay extends Overlay private final ClanManModeConfig config; @Inject - private ClanManModeOverlay(ClanManModeConfig config, ClanManModeService ClanManModeService) + private ClanManModeOverlay(final ClanManModeConfig config, final ClanManModeService ClanManModeService) { this.config = config; this.ClanManModeService = ClanManModeService; 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 65f6bbe8a2..dbee4e7291 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 @@ -5,6 +5,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.Player; @@ -27,7 +28,7 @@ import net.runelite.client.ui.overlay.OverlayManager; type = PluginType.PVP, enabledByDefault = false ) - +@Singleton public class ClanManModePlugin extends Plugin { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java index c84072e94e..ca32c5892d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java @@ -20,7 +20,7 @@ public class ClanManModeService private final ClanManModePlugin plugin; @Inject - private ClanManModeService(Client client, ClanManModeConfig config, ClanManModePlugin plugin) + private ClanManModeService(final Client client, final ClanManModeConfig config, final ClanManModePlugin plugin) { this.config = config; this.client = client; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeTileOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeTileOverlay.java index 5aea2e108f..8a70eef7c6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeTileOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeTileOverlay.java @@ -4,19 +4,21 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Polygon; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton public class ClanManModeTileOverlay extends Overlay { private final ClanManModeService ClanManModeService; private final ClanManModeConfig config; @Inject - private ClanManModeTileOverlay(ClanManModeConfig config, ClanManModeService ClanManModeService) + private ClanManModeTileOverlay(final ClanManModeConfig config, final ClanManModeService ClanManModeService) { this.config = config; this.ClanManModeService = ClanManModeService; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollEmoteOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollEmoteOverlay.java index ecaa85b8ba..bf6c3d85d5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollEmoteOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollEmoteOverlay.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.cluescrolls; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; @@ -36,6 +37,7 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; +@Singleton class ClueScrollEmoteOverlay extends Overlay { private final ClueScrollPlugin plugin; @@ -44,7 +46,7 @@ class ClueScrollEmoteOverlay extends Overlay private boolean hasScrolled; @Inject - private ClueScrollEmoteOverlay(ClueScrollPlugin plugin, Client client) + private ClueScrollEmoteOverlay(final ClueScrollPlugin plugin, final Client client) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollMusicOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollMusicOverlay.java index 2b44290fb5..19e0b5b01e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollMusicOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollMusicOverlay.java @@ -28,6 +28,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Rectangle; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; @@ -37,6 +38,7 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; +@Singleton class ClueScrollMusicOverlay extends Overlay { private static final Rectangle PADDING = new Rectangle(2, 1, 0, 1); @@ -47,7 +49,7 @@ class ClueScrollMusicOverlay extends Overlay private boolean hasScrolled; @Inject - private ClueScrollMusicOverlay(ClueScrollPlugin plugin, Client client) + private ClueScrollMusicOverlay(final ClueScrollPlugin plugin, final Client client) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java index 0f95a3c940..9347f28de5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java @@ -30,6 +30,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import static net.runelite.api.ItemID.SPADE; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import net.runelite.client.plugins.cluescrolls.clues.ClueScroll; @@ -43,6 +44,7 @@ import net.runelite.client.ui.overlay.components.ComponentConstants; import net.runelite.client.ui.overlay.components.LineComponent; import net.runelite.client.ui.overlay.components.PanelComponent; +@Singleton public class ClueScrollOverlay extends Overlay { private static final ItemRequirement HAS_SPADE = new SingleItemRequirement(SPADE); @@ -53,7 +55,7 @@ public class ClueScrollOverlay extends Overlay private final PanelComponent panelComponent = new PanelComponent(); @Inject - private ClueScrollOverlay(ClueScrollPlugin plugin) + private ClueScrollOverlay(final ClueScrollPlugin plugin) { super(plugin); this.plugin = plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java index 742decdd0d..98498a40fb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java @@ -41,6 +41,7 @@ import java.util.List; import java.util.Objects; import java.util.stream.Stream; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.ChatMessageType; @@ -108,6 +109,7 @@ import net.runelite.client.util.Text; tags = {"arrow", "hints", "world", "map", "coordinates", "emotes"} ) @Slf4j +@Singleton public class ClueScrollPlugin extends Plugin { private static final Color HIGHLIGHT_BORDER_COLOR = Color.ORANGE; @@ -164,6 +166,8 @@ public class ClueScrollPlugin extends Plugin private final TextComponent textComponent = new TextComponent(); + private boolean displayHintArrows; + @Provides ClueScrollConfig getConfig(ConfigManager configManager) { @@ -179,6 +183,7 @@ public class ClueScrollPlugin extends Plugin @Override protected void startUp() throws Exception { + this.displayHintArrows = config.displayHintArrows(); overlayManager.add(clueScrollOverlay); overlayManager.add(clueScrollEmoteOverlay); overlayManager.add(clueScrollWorldOverlay); @@ -274,7 +279,7 @@ public class ClueScrollPlugin extends Plugin worldMapPointsSet = false; npcsToMark.clear(); - if (config.displayHintArrows()) + if (this.displayHintArrows) { client.clearHintArrow(); } @@ -313,9 +318,13 @@ public class ClueScrollPlugin extends Plugin @Subscribe public void onConfigChanged(ConfigChanged event) { - if (event.getGroup().equals("cluescroll") && !config.displayHintArrows()) + if (event.getGroup().equals("cluescroll")) { - client.clearHintArrow(); + this.displayHintArrows = config.displayHintArrows(); + if (!this.displayHintArrows) + { + client.clearHintArrow(); + } } } @@ -366,7 +375,7 @@ public class ClueScrollPlugin extends Plugin if (location != null) { // Only set the location hint arrow if we do not already have more accurate location - if (config.displayHintArrows() + if (this.displayHintArrows && (client.getHintArrowNpc() == null || !npcsToMark.contains(client.getHintArrowNpc()))) { @@ -455,7 +464,7 @@ public class ClueScrollPlugin extends Plugin worldMapPointsSet = false; npcsToMark.clear(); - if (config.displayHintArrows()) + if (this.displayHintArrows) { client.clearHintArrow(); } @@ -698,7 +707,7 @@ public class ClueScrollPlugin extends Plugin } } - if (!npcsToMark.isEmpty() && config.displayHintArrows()) + if (!npcsToMark.isEmpty() && this.displayHintArrows) { // Always set hint arrow to first seen NPC client.setHintArrow(npcsToMark.get(0)); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollServiceImpl.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollServiceImpl.java index 3dd2d55a33..53887d80c6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollServiceImpl.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollServiceImpl.java @@ -35,7 +35,7 @@ class ClueScrollServiceImpl implements ClueScrollService private final ClueScrollPlugin plugin; @Inject - private ClueScrollServiceImpl(ClueScrollPlugin plugin) + private ClueScrollServiceImpl(final ClueScrollPlugin plugin) { this.plugin = plugin; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldMapPoint.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldMapPoint.java index 45fa1f874c..0ee530285c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldMapPoint.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldMapPoint.java @@ -36,7 +36,7 @@ class ClueScrollWorldMapPoint extends WorldMapPoint private final BufferedImage clueScrollWorldImage; private final Point clueScrollWorldImagePoint; - ClueScrollWorldMapPoint(final WorldPoint worldPoint, ClueScrollPlugin plugin) + ClueScrollWorldMapPoint(final WorldPoint worldPoint, final ClueScrollPlugin plugin) { super(worldPoint, null); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldOverlay.java index d68f06a691..0c4598043b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldOverlay.java @@ -28,11 +28,13 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.client.plugins.cluescrolls.clues.ClueScroll; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; +@Singleton public class ClueScrollWorldOverlay extends Overlay { public static final int IMAGE_Z_OFFSET = 30; @@ -44,7 +46,7 @@ public class ClueScrollWorldOverlay extends Overlay private final ClueScrollPlugin plugin; @Inject - private ClueScrollWorldOverlay(ClueScrollPlugin plugin) + private ClueScrollWorldOverlay(final ClueScrollPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java index 24b14895c9..162aeca40a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java @@ -25,6 +25,9 @@ package net.runelite.client.plugins.combatcounter; import com.google.inject.Provides; +import java.awt.Color; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import net.runelite.api.Actor; @@ -35,6 +38,7 @@ import net.runelite.api.NPCDefinition; import net.runelite.api.Player; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.AnimationChanged; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.HitsplatApplied; import net.runelite.api.kit.KitType; @@ -59,7 +63,7 @@ import java.util.Map; type = PluginType.UTILITY, enabledByDefault = false ) - +@Singleton public class CombatCounter extends Plugin { @@ -79,16 +83,30 @@ public class CombatCounter extends Plugin private CombatCounterConfig config; private boolean instanced = false; - private boolean prevInstance = false; - @Setter - @Getter - private Map counter = new HashMap(); - private long BLOWPIPE_ID = 5061; + @Setter(AccessLevel.PACKAGE) + @Getter(AccessLevel.PACKAGE) + private Map counter = new HashMap<>(); private Map blowpipe = new HashMap<>(); - public Map npcDamageMap = new HashMap(); - public Map playerDamage = new HashMap(); + private Map npcDamageMap = new HashMap<>(); + Map playerDamage = new HashMap<>(); + + @Getter(AccessLevel.PACKAGE) + private boolean showTickCounter; + @Getter(AccessLevel.PACKAGE) + private boolean showDamageCounter; + private boolean resetOnNewInstance; + @Getter(AccessLevel.PACKAGE) + private Color selfColor; + @Getter(AccessLevel.PACKAGE) + private Color totalColor; + @Getter(AccessLevel.PACKAGE) + private Color otherColor; + @Getter(AccessLevel.PACKAGE) + private Color bgColor; + @Getter(AccessLevel.PACKAGE) + private Color titleColor; @Provides CombatCounterConfig provideConfig(ConfigManager configManager) @@ -96,8 +114,6 @@ public class CombatCounter extends Plugin return configManager.getConfig(CombatCounterConfig.class); } - - private Map variables = new HashMap() { { @@ -157,7 +173,7 @@ public class CombatCounter extends Plugin } }; - public List MELEE_ANIMATIONS = new ArrayList() + private List MELEE_ANIMATIONS = new ArrayList() { { this.add(422); // Unarmed Punch, Block @@ -201,7 +217,7 @@ public class CombatCounter extends Plugin } }; - public List RANGE_ANIMATIONS = new ArrayList() + private List RANGE_ANIMATIONS = new ArrayList() { { this.add(7552); // Armadyl Crossbow Accurate, Rapid, Longrange, Special @@ -214,7 +230,7 @@ public class CombatCounter extends Plugin } }; - public List MAGE_ANIMATIONS = new ArrayList() + private List MAGE_ANIMATIONS = new ArrayList() { { this.add(1167); // Trident Accurate, Accurate, Longrange @@ -226,6 +242,8 @@ public class CombatCounter extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(tickOverlay); overlayManager.add(damageOverlay); @@ -252,7 +270,7 @@ public class CombatCounter extends Plugin { Actor actor = event.getActor(); - if (actor != null && actor instanceof Player) + if (actor instanceof Player) { Player p = (Player) actor; String name = actor.getName(); @@ -276,6 +294,7 @@ public class CombatCounter extends Plugin counter.put(name, ticks); counter = sortByValue(counter); + long BLOWPIPE_ID = 5061; if (animation == BLOWPIPE_ID) { this.blowpipe.put(name, -4L); @@ -285,11 +304,11 @@ public class CombatCounter extends Plugin * This part handles the Damage Counter. */ Actor interacting = actor.getInteracting(); - if (interacting != null && interacting instanceof NPC) + if (interacting instanceof NPC) { NPC npc = (NPC) interacting; - List actives = new ArrayList(); + List actives = new ArrayList<>(); actives.add(npc); if (animation == 1979 || animation == 7618) @@ -340,7 +359,7 @@ public class CombatCounter extends Plugin if (delay != -1) { - List ticksToAdd = new ArrayList(); + List ticksToAdd = new ArrayList<>(); ticksToAdd.add(delay); if (canFarcast && delay > 2) @@ -348,7 +367,7 @@ public class CombatCounter extends Plugin ticksToAdd.add(delay - 1); } - /** + /* * Dragon Claw Specials are 2 ticks long. */ if (animation == 7514) @@ -364,7 +383,7 @@ public class CombatCounter extends Plugin for (Integer tick : ticksToAdd) { - List attackers = new ArrayList(); + List attackers = new ArrayList<>(); if (dc.attackers.containsKey(tick)) attackers = dc.attackers.get(tick); @@ -389,9 +408,9 @@ public class CombatCounter extends Plugin @Subscribe public void onGameTick(GameTick event) { - if (config.resetOnNewInstance()) + if (this.resetOnNewInstance) { - prevInstance = instanced; + boolean prevInstance = instanced; instanced = client.isInInstancedRegion(); if (!prevInstance && instanced) { @@ -402,19 +421,19 @@ public class CombatCounter extends Plugin } } - Map visible = new HashMap(); + Map visible = new HashMap<>(); for (Player p : this.client.getPlayers()) { if (p.getName() != null) visible.put(p.getName(), p); } - for (NPC npc : new ArrayList(this.npcDamageMap.keySet())) + for (NPC npc : new ArrayList<>(this.npcDamageMap.keySet())) { NPCDamageCounter counter = this.npcDamageMap.get(npc); Map> attackers = counter.attackers; - for (Integer i : new ArrayList(attackers.keySet())) + for (Integer i : new ArrayList<>(attackers.keySet())) { List p = attackers.get(i); attackers.put(i - 1, p); @@ -455,7 +474,7 @@ public class CombatCounter extends Plugin // this.playerDamage.put(name, count); // } - for (Integer i : new ArrayList(attackers.keySet())) + for (Integer i : new ArrayList<>(attackers.keySet())) if (i <= -1) attackers.remove(i); @@ -465,7 +484,7 @@ public class CombatCounter extends Plugin this.playerDamage = sortByValue(this.playerDamage); - for (String user : new ArrayList(blowpipe.keySet())) + for (String user : new ArrayList<>(blowpipe.keySet())) { if (visible.containsKey(user)) { @@ -481,7 +500,7 @@ public class CombatCounter extends Plugin Player p = visible.get(user); Actor interacting = p.getInteracting(); - if (interacting != null && interacting instanceof NPC) + if (interacting instanceof NPC) { NPC npc = (NPC) interacting; @@ -493,14 +512,14 @@ public class CombatCounter extends Plugin int delay = this.calculateBPDelay(distance); - List counts = new ArrayList(); + List counts = new ArrayList<>(); counts.add(delay); if (delay > 2) counts.add(delay - 1); for (int tick : counts) { - List attackers = new ArrayList(); + List attackers = new ArrayList<>(); if (dc.attackers.containsKey(tick)) attackers = dc.attackers.get(tick); @@ -553,7 +572,7 @@ public class CombatCounter extends Plugin return result; } - public int calculateDistance(Player p, NPC npc) + private int calculateDistance(Player p, NPC npc) { int size = 1; NPCDefinition comp = npc.getTransformedDefinition(); @@ -582,23 +601,44 @@ public class CombatCounter extends Plugin return distance; } - public int calculateBPDelay(double distance) + private int calculateBPDelay(double distance) { return 2 + (int) Math.floor(distance / 6d); } - public int calculateChinDelay(double distance) + private int calculateChinDelay(double distance) { return 2 + (int) Math.floor(distance / 6d); } - public int calculateMageDelay(double distance) + private int calculateMageDelay(double distance) { return 2 + (int) Math.floor((1d + distance) / 3d); } - public int calculateRangedDelay(double distance) + private int calculateRangedDelay(double distance) { return 2 + (int) Math.floor((3d + distance) / 6d); } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (event.getGroup().equals("combatcounter")) + { + updateConfig(); + } + } + + private void updateConfig() + { + this.showTickCounter = config.showTickCounter(); + this.showDamageCounter = config.showDamageCounter(); + this.resetOnNewInstance = config.resetOnNewInstance(); + this.selfColor = config.selfColor(); + this.totalColor = config.totalColor(); + this.otherColor = config.otherColor(); + this.bgColor = config.bgColor(); + this.titleColor = config.titleColor(); + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java index 7f97d6ab42..dd0a2cc25c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java @@ -26,9 +26,9 @@ package net.runelite.client.plugins.combatcounter; import java.awt.Dimension; import java.awt.Graphics2D; -import java.util.HashMap; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import net.runelite.api.Player; @@ -42,17 +42,16 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.util.ColorUtil; +@Singleton class CombatOverlay extends Overlay { private final Client client; private final CombatCounter plugin; private final PanelComponent panelComponent = new PanelComponent(); - private final CombatCounterConfig config; - private HashMap ticks = new HashMap<>(); @Inject - public CombatOverlay(Client client, CombatCounter plugin, CombatCounterConfig config) + public CombatOverlay(final Client client, final CombatCounter plugin) { super(plugin); @@ -60,7 +59,6 @@ class CombatOverlay extends Overlay setPosition(OverlayPosition.DETACHED); setPosition(OverlayPosition.BOTTOM_RIGHT); - this.config = config; this.client = client; this.plugin = plugin; @@ -70,7 +68,7 @@ class CombatOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (config.showTickCounter()) + if (plugin.isShowTickCounter()) { panelComponent.getChildren().clear(); @@ -79,8 +77,8 @@ class CombatOverlay extends Overlay { return null; } - panelComponent.setBackgroundColor(config.bgColor()); - panelComponent.getChildren().add(TitleComponent.builder().text("Tick Counter").color(config.titleColor()).build()); + panelComponent.setBackgroundColor(plugin.getBgColor()); + panelComponent.getChildren().add(TitleComponent.builder().text("Tick Counter").color(plugin.getTitleColor()).build()); int total = 0; TableComponent tableComponent = new TableComponent(); @@ -102,22 +100,22 @@ class CombatOverlay extends Overlay { if (client.getLocalPlayer().getName().contains(name)) { - tableComponent.addRow(ColorUtil.prependColorTag(name, config.selfColor()), ColorUtil.prependColorTag(Long.toString(map.get(name)), config.selfColor())); + tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getSelfColor()), ColorUtil.prependColorTag(Long.toString(map.get(name)), plugin.getSelfColor())); } else { - tableComponent.addRow(ColorUtil.prependColorTag(name, config.otherColor()), ColorUtil.prependColorTag(Long.toString(map.get(name)), config.otherColor())); + tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getOtherColor()), ColorUtil.prependColorTag(Long.toString(map.get(name)), plugin.getOtherColor())); } total += map.get(name); } if (!map.containsKey(local.getName())) { - tableComponent.addRow(ColorUtil.prependColorTag(local.getName(), config.selfColor()), ColorUtil.prependColorTag("0", config.selfColor())); + tableComponent.addRow(ColorUtil.prependColorTag(local.getName(), plugin.getSelfColor()), ColorUtil.prependColorTag("0", plugin.getSelfColor())); } } - tableComponent.addRow(ColorUtil.prependColorTag("Total:", config.totalColor()), ColorUtil.prependColorTag(String.valueOf(total), config.totalColor())); + tableComponent.addRow(ColorUtil.prependColorTag("Total:", plugin.getTotalColor()), ColorUtil.prependColorTag(String.valueOf(total), plugin.getTotalColor())); if (!tableComponent.isEmpty()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java index 998246ccf2..0e2cd5109e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java @@ -28,6 +28,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import net.runelite.api.Player; @@ -41,6 +42,7 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.util.ColorUtil; +@Singleton class DamageOverlay extends Overlay { @@ -48,12 +50,10 @@ class DamageOverlay extends Overlay private final CombatCounter plugin; - private final CombatCounterConfig config; - private final PanelComponent panelComponent = new PanelComponent(); @Inject - public DamageOverlay(Client client, CombatCounter plugin, CombatCounterConfig config) + public DamageOverlay(final Client client, final CombatCounter plugin) { super(plugin); @@ -61,7 +61,6 @@ class DamageOverlay extends Overlay setPosition(OverlayPosition.DETACHED); setPosition(OverlayPosition.BOTTOM_RIGHT); - this.config = config; this.client = client; this.plugin = plugin; @@ -71,7 +70,7 @@ class DamageOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (config.showDamageCounter()) + if (plugin.isShowDamageCounter()) { panelComponent.getChildren().clear(); @@ -80,8 +79,8 @@ class DamageOverlay extends Overlay { return null; } - panelComponent.setBackgroundColor(config.bgColor()); - panelComponent.getChildren().add(TitleComponent.builder().text("Damage Counter").color(config.titleColor()).build()); + panelComponent.setBackgroundColor(plugin.getBgColor()); + panelComponent.getChildren().add(TitleComponent.builder().text("Damage Counter").color(plugin.getTitleColor()).build()); TableComponent tableComponent = new TableComponent(); tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT); @@ -103,17 +102,17 @@ class DamageOverlay extends Overlay String val = String.format("%.1f", map.get(name)); if (client.getLocalPlayer().getName().contains(name)) { - tableComponent.addRow(ColorUtil.prependColorTag(name, config.selfColor()), ColorUtil.prependColorTag(val, config.selfColor())); + tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getSelfColor()), ColorUtil.prependColorTag(val, plugin.getSelfColor())); } else { - tableComponent.addRow(ColorUtil.prependColorTag(name, config.otherColor()), ColorUtil.prependColorTag(val, config.otherColor())); + tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getOtherColor()), ColorUtil.prependColorTag(val, plugin.getOtherColor())); } } if (!map.containsKey(local.getName())) { - tableComponent.addRow(ColorUtil.prependColorTag(local.getName(), config.selfColor()), ColorUtil.prependColorTag("0", config.selfColor())); + tableComponent.addRow(ColorUtil.prependColorTag(local.getName(), plugin.getSelfColor()), ColorUtil.prependColorTag("0", plugin.getSelfColor())); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/NPCDamageCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/NPCDamageCounter.java index ef55777b59..2c5a848c89 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/NPCDamageCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/NPCDamageCounter.java @@ -4,17 +4,19 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.TreeMap; +import javax.inject.Singleton; -public class NPCDamageCounter +@Singleton +class NPCDamageCounter { - public Map> attackers; + Map> attackers; - public List damage; + List damage; - public NPCDamageCounter() + NPCDamageCounter() { - this.attackers = new TreeMap>(); - this.damage = new ArrayList(); + this.attackers = new TreeMap<>(); + this.damage = new ArrayList<>(); } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelOverlay.java index 3083e02cac..92c567aab9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelOverlay.java @@ -29,6 +29,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Rectangle; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Experience; import net.runelite.api.Skill; @@ -39,19 +40,20 @@ import net.runelite.client.ui.overlay.tooltip.Tooltip; import net.runelite.client.ui.overlay.tooltip.TooltipManager; import net.runelite.client.util.ColorUtil; +@Singleton class CombatLevelOverlay extends Overlay { private static final Color COMBAT_LEVEL_COLOUR = new Color(0xff981f); private final Client client; - private final CombatLevelConfig config; + private final CombatLevelPlugin plugin; private final TooltipManager tooltipManager; @Inject - private CombatLevelOverlay(Client client, CombatLevelConfig config, TooltipManager tooltipManager) + private CombatLevelOverlay(final Client client, final CombatLevelPlugin plugin, final TooltipManager tooltipManager) { this.client = client; - this.config = config; + this.plugin = plugin; this.tooltipManager = tooltipManager; } @@ -59,7 +61,7 @@ class CombatLevelOverlay extends Overlay public Dimension render(Graphics2D graphics) { Widget combatLevelWidget = client.getWidget(WidgetInfo.COMBAT_LEVEL); - if (!config.showLevelsUntil() + if (!plugin.isShowLevelsUntil() || client.getLocalPlayer().getCombatLevel() == Experience.MAX_COMBAT_LEVEL || combatLevelWidget == null || combatLevelWidget.isHidden()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java index e466e939f4..a2db038077 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java @@ -30,6 +30,9 @@ import java.text.DecimalFormat; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.Experience; import net.runelite.api.GameState; @@ -52,6 +55,7 @@ import net.runelite.client.ui.overlay.OverlayManager; description = "Show a more accurate combat level in Combat Options panel and other combat level functions", tags = {"wilderness", "attack", "range"} ) +@Singleton public class CombatLevelPlugin extends Plugin { private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#.###"); @@ -80,6 +84,10 @@ public class CombatLevelPlugin extends Plugin @Inject private OverlayManager overlayManager; + @Getter(AccessLevel.PACKAGE) + private boolean showLevelsUntil; + private boolean wildernessAttackLevelRange; + @Provides CombatLevelConfig provideConfig(ConfigManager configManager) { @@ -89,9 +97,11 @@ public class CombatLevelPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(overlay); - if (config.wildernessAttackLevelRange()) + if (this.wildernessAttackLevelRange) { appendAttackLevelRangeText(); } @@ -151,7 +161,9 @@ public class CombatLevelPlugin extends Plugin return; } - if (config.wildernessAttackLevelRange()) + updateConfig(); + + if (this.wildernessAttackLevelRange) { appendAttackLevelRangeText(); } @@ -164,7 +176,7 @@ public class CombatLevelPlugin extends Plugin @Subscribe public void onScriptCallbackEvent(ScriptCallbackEvent event) { - if (config.wildernessAttackLevelRange() + if (this.wildernessAttackLevelRange && "wildernessWidgetTextSet".equals(event.getEventName())) { appendAttackLevelRangeText(); @@ -241,4 +253,10 @@ public class CombatLevelPlugin extends Plugin { return Math.max(MIN_COMBAT_LEVEL, combatLevel - wildernessLevel) + "-" + Math.min(Experience.MAX_COMBAT_LEVEL, combatLevel + wildernessLevel); } + + private void updateConfig() + { + this.showLevelsUntil = config.showLevelsUntil(); + this.wildernessAttackLevelRange = config.showLevelsUntil(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java index b80d912bc4..4d569f827c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java @@ -50,6 +50,7 @@ import java.util.Comparator; import java.util.List; import java.util.concurrent.ScheduledExecutorService; import java.util.stream.Collectors; +import javax.inject.Singleton; import javax.swing.BorderFactory; import javax.swing.ImageIcon; import javax.swing.JButton; @@ -113,6 +114,7 @@ import net.runelite.client.util.Text; import org.apache.commons.lang3.StringUtils; @Slf4j +@Singleton public class ConfigPanel extends PluginPanel { private static final int SPINNER_FIELD_WIDTH = 6; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java index 2004675a05..a4520ebbd1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.config; import java.awt.image.BufferedImage; import java.util.concurrent.ScheduledExecutorService; import javax.inject.Inject; +import javax.inject.Singleton; import javax.swing.SwingUtilities; import net.runelite.api.MenuAction; import net.runelite.client.config.ChatColorConfig; @@ -39,7 +40,6 @@ import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginManager; import net.runelite.client.ui.ClientToolbar; -import net.runelite.client.ui.ClientUI; import net.runelite.client.ui.NavigationButton; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayMenuEntry; @@ -50,10 +50,9 @@ import net.runelite.client.util.ImageUtil; loadWhenOutdated = true, hidden = true // prevent users from disabling ) +@Singleton public class ConfigPlugin extends Plugin { - @Inject - private ClientUI clientUI; @Inject private ClientToolbar clientToolbar; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java index 585ade5ea6..98fc840a7c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java @@ -26,17 +26,20 @@ package net.runelite.client.plugins.config; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; +import javax.inject.Singleton; import javax.swing.JButton; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.config.Keybind; import net.runelite.client.config.ModifierlessKeybind; +@Singleton public class HotkeyButton extends JButton { - @Getter + @Getter(AccessLevel.PACKAGE) private Keybind value; - public HotkeyButton(Keybind value, boolean modifierless) + HotkeyButton(Keybind value, boolean modifierless) { setValue(value); addActionListener(e -> diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java index 3cd10af230..22065fc7df 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java @@ -32,6 +32,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import javax.annotation.Nullable; +import javax.inject.Singleton; import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.JPanel; @@ -47,6 +48,7 @@ import net.runelite.client.ui.components.IconButton; import net.runelite.client.util.ImageUtil; import org.apache.commons.text.similarity.JaroWinklerDistance; +@Singleton public class PluginListItem extends JPanel { private static final JaroWinklerDistance DISTANCE = new JaroWinklerDistance(); @@ -74,10 +76,10 @@ public class PluginListItem extends JPanel @Getter(AccessLevel.PACKAGE) public final ConfigDescriptor configDescriptor; - @Getter + @Getter(AccessLevel.PUBLIC) private final String name; - @Getter + @Getter(AccessLevel.PUBLIC) private final String description; private final List keywords = new ArrayList<>(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingOverlay.java index a7bad8d813..7b71bfad11 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingOverlay.java @@ -32,6 +32,7 @@ import java.text.DecimalFormat; import java.time.Instant; import java.time.Duration; import javax.inject.Inject; +import javax.inject.Singleton; import static net.runelite.api.AnimationID.COOKING_FIRE; import static net.runelite.api.AnimationID.COOKING_RANGE; import net.runelite.api.Client; @@ -47,6 +48,7 @@ import net.runelite.client.ui.overlay.components.TitleComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; +@Singleton class CookingOverlay extends Overlay { private static final int COOK_TIMEOUT = 3; @@ -58,7 +60,7 @@ class CookingOverlay extends Overlay private final PanelComponent panelComponent = new PanelComponent(); @Inject - private CookingOverlay(Client client, CookingPlugin plugin, XpTrackerService xpTrackerService) + private CookingOverlay(final Client client, final CookingPlugin plugin, final XpTrackerService xpTrackerService) { super(plugin); setPosition(OverlayPosition.TOP_LEFT); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java index 976d81c4a0..96be647e3f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java @@ -30,14 +30,17 @@ import java.time.Duration; import java.time.Instant; import java.util.Optional; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; +import lombok.Setter; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.GraphicID; import net.runelite.api.ItemID; import net.runelite.api.Player; import net.runelite.api.events.ChatMessage; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.SpotAnimationChanged; import net.runelite.client.config.ConfigManager; @@ -55,6 +58,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager; description = "Show cooking statistics", tags = {"overlay", "skilling", "cook"} ) +@Singleton @PluginDependency(XpTrackerPlugin.class) public class CookingPlugin extends Plugin { @@ -79,6 +83,10 @@ public class CookingPlugin extends Plugin @Getter(AccessLevel.PACKAGE) private CookingSession session; + private int statTimeout; + @Setter(AccessLevel.PACKAGE) + private boolean fermentTimer; + @Provides CookingConfig getConfig(ConfigManager configManager) { @@ -88,6 +96,7 @@ public class CookingPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); session = null; overlayManager.add(overlay); } @@ -103,12 +112,12 @@ public class CookingPlugin extends Plugin @Subscribe public void onGameTick(GameTick gameTick) { - if (session == null || config.statTimeout() == 0) + if (session == null || this.statTimeout == 0) { return; } - Duration statTimeout = Duration.ofMinutes(config.statTimeout()); + Duration statTimeout = Duration.ofMinutes(this.statTimeout); Duration sinceCut = Duration.between(session.getLastCookingAction(), Instant.now()); if (sinceCut.compareTo(statTimeout) >= 0) @@ -127,7 +136,7 @@ public class CookingPlugin extends Plugin return; } - if (player.getSpotAnimation() == GraphicID.WINE_MAKE && config.fermentTimer()) + if (player.getSpotAnimation() == GraphicID.WINE_MAKE && this.fermentTimer) { Optional fermentTimerOpt = infoBoxManager.getInfoBoxes().stream() .filter(FermentTimer.class::isInstance) @@ -184,4 +193,19 @@ public class CookingPlugin extends Plugin session.increaseBurnAmount(); } } + + @Subscribe + public void onConfigChanged(ConfigChanged configChanged) + { + if (configChanged.getGroup().equals("cooking")) + { + updateConfig(); + } + } + + private void updateConfig() + { + this.statTimeout = config.statTimeout(); + this.fermentTimer = config.fermentTimer(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingSession.java b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingSession.java index 292e4a3584..14ad6a2722 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingSession.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingSession.java @@ -26,9 +26,11 @@ package net.runelite.client.plugins.cooking; import java.time.Instant; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; +@Singleton class CookingSession { @Getter(AccessLevel.PACKAGE) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/FermentTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/FermentTimer.java index 5312414ad1..36ef995fa8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/FermentTimer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/FermentTimer.java @@ -28,9 +28,11 @@ import java.awt.Color; import java.awt.Image; import java.time.Duration; import java.time.Instant; +import javax.inject.Singleton; import net.runelite.client.plugins.Plugin; import net.runelite.client.ui.overlay.infobox.InfoBox; +@Singleton final class FermentTimer extends InfoBox { private static final Duration FERMENT_TIME = Duration.ofMillis(13_800); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CoreOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CoreOverlay.java index 29c7dff16a..51eb6a8d88 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CoreOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CoreOverlay.java @@ -29,24 +29,23 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Polygon; import javax.inject.Inject; -import net.runelite.api.Client; +import javax.inject.Singleton; import net.runelite.api.NPC; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton class CoreOverlay extends Overlay { - private final Client client; private final CorpPlugin corpPlugin; @Inject - private CoreOverlay(Client client, CorpPlugin corpPlugin) + private CoreOverlay(final CorpPlugin corpPlugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); - this.client = client; this.corpPlugin = corpPlugin; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpDamageOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpDamageOverlay.java index f76feec525..132075580a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpDamageOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpDamageOverlay.java @@ -29,6 +29,7 @@ import java.awt.Dimension; import java.awt.FontMetrics; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import net.runelite.api.NPC; @@ -48,16 +49,16 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.util.ColorUtil; +@Singleton class CorpDamageOverlay extends Overlay { private final Client client; private final CorpPlugin corpPlugin; - private final CorpConfig config; private final PanelComponent panelComponent = new PanelComponent(); @Inject - private CorpDamageOverlay(Client client, CorpPlugin corpPlugin, CorpConfig config) + private CorpDamageOverlay(final Client client, final CorpPlugin corpPlugin) { super(corpPlugin); setPosition(OverlayPosition.TOP_LEFT); @@ -65,7 +66,6 @@ class CorpDamageOverlay extends Overlay setPriority(OverlayPriority.LOW); this.client = client; this.corpPlugin = corpPlugin; - this.config = config; getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Corp overlay")); } @@ -122,7 +122,7 @@ class CorpDamageOverlay extends Overlay } } - if (config.showDamage()) + if (corpPlugin.isShowDamage()) { tableComponent.addRow("Your damage", ColorUtil.prependColorTag(Integer.toString(myDamage), damageForKill > 0 && myDamage >= damageForKill ? Color.GREEN : Color.RED)); tableComponent.addRow("Total damage:", Integer.toString(totalDamage)); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java index 627c9091e8..d4c815f7eb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java @@ -41,6 +41,7 @@ import net.runelite.api.MenuEntry; import net.runelite.api.NPC; import net.runelite.api.NpcID; import net.runelite.api.Varbits; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.HitsplatApplied; import net.runelite.api.events.InteractingChanged; @@ -101,6 +102,10 @@ public class CorpPlugin extends Plugin @Inject private CorpConfig config; + private boolean leftClickCore; + @Getter(AccessLevel.PACKAGE) + private boolean showDamage; + @Provides CorpConfig getConfig(ConfigManager configManager) { @@ -110,6 +115,8 @@ public class CorpPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(corpOverlay); overlayManager.add(coreOverlay); } @@ -229,7 +236,7 @@ public class CorpPlugin extends Plugin public void onMenuEntryAdded(MenuEntryAdded menuEntryAdded) { if (menuEntryAdded.getType() != NPC_SECTION_ACTION - || !config.leftClickCore() || !menuEntryAdded.getOption().equals(ATTACK)) + || !this.leftClickCore || !menuEntryAdded.getOption().equals(ATTACK)) { return; } @@ -248,4 +255,19 @@ public class CorpPlugin extends Plugin menuEntry.setType(NPC_SECTION_ACTION + MENU_ACTION_DEPRIORITIZE_OFFSET); client.setMenuEntries(menuEntries); } + + @Subscribe + public void onConfigChanged(ConfigChanged configChanged) + { + if (configChanged.getGroup().equals("corp")) + { + updateConfig(); + } + } + + private void updateConfig() + { + this.leftClickCore = config.leftClickCore(); + this.showDamage = config.showDamage(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxInfoBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxInfoBox.java index 55edc43f39..e69be13521 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxInfoBox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxInfoBox.java @@ -32,6 +32,7 @@ import java.awt.Image; import java.awt.Rectangle; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.NpcID; import net.runelite.api.SpriteID; @@ -47,21 +48,20 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.util.ColorUtil; +@Singleton public class CoxInfoBox extends Overlay { private static final Color NOT_ACTIVATED_BACKGROUND_COLOR = new Color(150, 0, 0, 150); private final CoxPlugin plugin; - private final CoxConfig config; private final Client client; private final SpriteManager spriteManager; private final PanelComponent prayAgainstPanel = new PanelComponent(); private final PanelComponent panelComponent = new PanelComponent(); @Inject - CoxInfoBox(CoxPlugin plugin, CoxConfig config, Client client, SpriteManager spriteManager) + CoxInfoBox(CoxPlugin plugin, Client client, SpriteManager spriteManager) { this.plugin = plugin; - this.config = config; this.client = client; this.spriteManager = spriteManager; setPosition(OverlayPosition.BOTTOM_RIGHT); @@ -79,7 +79,7 @@ public class CoxInfoBox extends Overlay final PrayAgainst prayAgainst = plugin.getPrayAgainstOlm(); - if (plugin.getPrayAgainstOlm() == null && !config.prayAgainstOlm()) + if (plugin.getPrayAgainstOlm() == null && !plugin.isConfigPrayAgainstOlm()) { return null; } @@ -105,7 +105,7 @@ public class CoxInfoBox extends Overlay plugin.setPrayAgainstOlm(null); } - if (config.vangHealth() && plugin.getVanguards() > 0) + if (plugin.isVangHealth() && plugin.getVanguards() > 0) { panelComponent.getChildren().add(TitleComponent.builder() .text("Vanguards") diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxOverlay.java index 4218f092c6..00d60e94ee 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxOverlay.java @@ -31,9 +31,9 @@ import java.awt.Dimension; import java.awt.Font; import java.awt.Graphics2D; import java.awt.Polygon; -import java.util.Iterator; import java.util.List; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Actor; import net.runelite.api.Client; import net.runelite.api.NPC; @@ -50,18 +50,17 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton public class CoxOverlay extends Overlay { private final Client client; private final CoxPlugin plugin; - private final CoxConfig config; @Inject - private CoxOverlay(Client client, CoxPlugin plugin, CoxConfig config) + private CoxOverlay(final Client client, final CoxPlugin plugin) { this.client = client; this.plugin = plugin; - this.config = config; setPosition(OverlayPosition.DYNAMIC); setPriority(OverlayPriority.HIGH); setLayer(OverlayLayer.ABOVE_SCENE); @@ -72,13 +71,13 @@ public class CoxOverlay extends Overlay { for (WorldPoint point : plugin.getOlm_Heal()) { - drawTile(graphics, point, config.tpColor(), 2, 150, 50); + drawTile(graphics, point, plugin.getTpColor(), 2, 150, 50); } for (WorldPoint point : plugin.getOlm_TP()) { client.setHintArrow(point); - drawTile(graphics, point, config.tpColor(), 2, 150, 50); + drawTile(graphics, point, plugin.getTpColor(), 2, 150, 50); } if (plugin.inRaid()) @@ -96,14 +95,14 @@ public class CoxOverlay extends Overlay case NpcID.TEKTON_7545: case NpcID.TEKTON_ENRAGED: case NpcID.TEKTON_ENRAGED_7544: - if (config.tekton()) + if (plugin.isTekton()) { hitSquares = getHitSquares(npcs.getNpc().getWorldLocation(), npcs.getNpcSize(), 1, false); for (WorldPoint p : hitSquares) { - drawTile(graphics, p, config.tektonColor(), 0, 0, 50); + drawTile(graphics, p, plugin.getTektonColor(), 0, 0, 50); } - if (config.tektonTickCounter()) + if (plugin.isTektonTickCounter()) { ticksLeft = npcs.getTicksUntilAttack(); int attackTicksleft = plugin.getTektonAttackTicks(); @@ -119,10 +118,10 @@ public class CoxOverlay extends Overlay } final String ticksLeftStr = String.valueOf(ticksLeft); Point canvasPoint = npcs.getNpc().getCanvasTextLocation(graphics, ticksLeftStr, 0); - renderTextLocation(graphics, ticksLeftStr, config.textSize(), config.fontStyle().getFont(), color, canvasPoint); + renderTextLocation(graphics, ticksLeftStr, plugin.getTextSize(), plugin.getFontStyle().getFont(), color, canvasPoint); } } - if (config.tektonTickCounter()) + if (plugin.isTektonTickCounter()) { final int attackTicksleft = plugin.getTektonAttackTicks(); String attacksLeftStr; @@ -143,7 +142,7 @@ public class CoxOverlay extends Overlay if (npcs.getNpc() != null) { Point canvasPoint = npcs.getNpc().getCanvasTextLocation(graphics, attacksLeftStr, 0); - renderTextLocationAbove(graphics, attacksLeftStr, config.textSize(), config.fontStyle().getFont(), attackcolor, canvasPoint); + renderTextLocationAbove(graphics, attacksLeftStr, plugin.getTextSize(), plugin.getFontStyle().getFont(), attackcolor, canvasPoint); } } } @@ -152,12 +151,12 @@ public class CoxOverlay extends Overlay case NpcID.MUTTADILE: case NpcID.MUTTADILE_7562: case NpcID.MUTTADILE_7563: - if (config.muttadile()) + if (plugin.isMuttadile()) { hitSquares = getHitSquares(npcs.getNpc().getWorldLocation(), npcs.getNpcSize(), 1, false); for (WorldPoint p : hitSquares) { - drawTile(graphics, p, config.muttaColor(), 0, 0, 50); + drawTile(graphics, p, plugin.getMuttaColor(), 0, 0, 50); } } break; @@ -165,15 +164,15 @@ public class CoxOverlay extends Overlay case NpcID.GUARDIAN_7570: case NpcID.GUARDIAN_7571: case NpcID.GUARDIAN_7572: - if (config.guardians()) + if (plugin.isGuardians()) { hitSquares = getHitSquares(npcs.getNpc().getWorldLocation(), npcs.getNpcSize(), 2, true); for (WorldPoint p : hitSquares) { - drawTile(graphics, p, config.guardColor(), 0, 0, 50); + drawTile(graphics, p, plugin.getGuardColor(), 0, 0, 50); } } - if (config.guardinTickCounter()) + if (plugin.isGuardinTickCounter()) { ticksLeft = npcs.getTicksUntilAttack(); if (ticksLeft > 0) @@ -188,7 +187,7 @@ public class CoxOverlay extends Overlay } final String ticksLeftStr = String.valueOf(ticksLeft); Point canvasPoint = npcs.getNpc().getCanvasTextLocation(graphics, ticksLeftStr, 0); - renderTextLocation(graphics, ticksLeftStr, config.textSize(), config.fontStyle().getFont(), color, canvasPoint); + renderTextLocation(graphics, ticksLeftStr, plugin.getTextSize(), plugin.getFontStyle().getFont(), color, canvasPoint); } } break; @@ -196,7 +195,7 @@ public class CoxOverlay extends Overlay case NpcID.VANGUARD_7527: case NpcID.VANGUARD_7528: case NpcID.VANGUARD_7529: - if (config.vangHighlight()) + if (plugin.isVangHighlight()) { OverlayUtil.renderPolygon(graphics, npcs.getNpc().getConvexHull(), npcs.getAttackStyle().getColor()); } @@ -210,10 +209,10 @@ public class CoxOverlay extends Overlay NPC olmHand = plugin.getHand(); final String tickStr = String.valueOf(tick); Point canvasPoint = olmHand.getCanvasTextLocation(graphics, tickStr, 50); - renderTextLocation(graphics, tickStr, config.textSize(), config.fontStyle().getFont(), Color.GRAY, canvasPoint); + renderTextLocation(graphics, tickStr, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.GRAY, canvasPoint); } - if (config.timers()) + if (plugin.isTimers()) { if (plugin.getBurnTarget().size() > 0) { @@ -221,7 +220,7 @@ public class CoxOverlay extends Overlay { final int ticksLeft = plugin.getBurnTicks(); String ticksLeftStr = String.valueOf(ticksLeft); - Color tickcolor = new Color(255, 255, 255, 255); + Color tickcolor; if (ticksLeft >= 0) { if (ticksLeft == 34 || @@ -243,7 +242,7 @@ public class CoxOverlay extends Overlay tickcolor = new Color(255, 255, 255, 255); } Point canvasPoint = actor.getCanvasTextLocation(graphics, ticksLeftStr, 0); - renderTextLocation(graphics, ticksLeftStr, config.textSize(), config.fontStyle().getFont(), tickcolor, canvasPoint); + renderTextLocation(graphics, ticksLeftStr, plugin.getTextSize(), plugin.getFontStyle().getFont(), tickcolor, canvasPoint); } } } @@ -251,9 +250,9 @@ public class CoxOverlay extends Overlay if (plugin.getAcidTarget() != null) { Actor actor = plugin.getAcidTarget(); - renderActorOverlay(graphics, actor, config.acidColor(), 2, 100, 10); + renderActorOverlay(graphics, actor, plugin.getAcidColor(), 2, 100, 10); final int ticksLeft = plugin.getAcidTicks(); - Color tickcolor = new Color(255, 255, 255, 255); + Color tickcolor; if (ticksLeft > 0) { if (ticksLeft > 1) @@ -266,12 +265,12 @@ public class CoxOverlay extends Overlay } final String ticksLeftStr = String.valueOf(ticksLeft); Point canvasPoint = actor.getCanvasTextLocation(graphics, ticksLeftStr, 0); - renderTextLocation(graphics, ticksLeftStr, config.textSize(), config.fontStyle().getFont(), tickcolor, canvasPoint); + renderTextLocation(graphics, ticksLeftStr, plugin.getTextSize(), plugin.getFontStyle().getFont(), tickcolor, canvasPoint); } } } - if (config.tpOverlay()) + if (plugin.isTpOverlay()) { if (plugin.getTeleportTarget() != null) { @@ -283,7 +282,7 @@ public class CoxOverlay extends Overlay { NPC boss = plugin.getOlm_NPC(); - if (config.olmTick()) + if (plugin.isOlmTick()) { if (boss != null) { @@ -329,7 +328,7 @@ public class CoxOverlay extends Overlay } final String combinedStr = cycleStr + ":" + tickStr; Point canvasPoint = boss.getCanvasTextLocation(graphics, combinedStr, 130); - renderTextLocation(graphics, combinedStr, config.textSize(), config.fontStyle().getFont(), Color.WHITE, canvasPoint); + renderTextLocation(graphics, combinedStr, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.WHITE, canvasPoint); } } } @@ -412,7 +411,7 @@ public class CoxOverlay extends Overlay final Point canvasCenterPoint_shadow = new Point( canvasPoint.getX() + 1, canvasPoint.getY() + 1); - if (config.shadows()) + if (plugin.isShadows()) { OverlayUtil.renderTextLocation(graphics, canvasCenterPoint_shadow, txtString, Color.BLACK); } @@ -431,7 +430,7 @@ public class CoxOverlay extends Overlay final Point canvasCenterPoint_shadow = new Point( canvasPoint.getX() + 1, canvasPoint.getY() + 21); - if (config.shadows()) + if (plugin.isShadows()) { OverlayUtil.renderTextLocation(graphics, canvasCenterPoint_shadow, txtString, Color.BLACK); } @@ -445,14 +444,7 @@ public class CoxOverlay extends Overlay List big = new WorldArea(npcLoc.getX() - thickness, npcLoc.getY() - thickness, npcSize + (thickness * 2), npcSize + (thickness * 2), npcLoc.getPlane()).toWorldPointList(); if (!includeUnder) { - for (Iterator it = big.iterator(); it.hasNext(); ) - { - WorldPoint p = it.next(); - if (little.contains(p)) - { - it.remove(); - } - } + big.removeIf(little::contains); } return big; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java index f5f08b1199..9dc12d080f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java @@ -28,6 +28,7 @@ package net.runelite.client.plugins.coxhelper; import com.google.inject.Provides; +import java.awt.Color; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -54,6 +55,7 @@ import net.runelite.api.ProjectileID; import net.runelite.api.Varbits; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ChatMessage; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; @@ -154,6 +156,47 @@ public class CoxPlugin extends Plugin @Getter(AccessLevel.PACKAGE) private Map npcContainer = new HashMap<>(); + @Getter(AccessLevel.PACKAGE) + private boolean muttadile; + @Getter(AccessLevel.PACKAGE) + private boolean tekton; + @Getter(AccessLevel.PACKAGE) + private boolean tektonTickCounter; + @Getter(AccessLevel.PACKAGE) + private boolean guardians; + @Getter(AccessLevel.PACKAGE) + private boolean guardinTickCounter; + @Getter(AccessLevel.PACKAGE) + private boolean vangHighlight; + @Getter(AccessLevel.PACKAGE) + private boolean vangHealth; + @Getter(AccessLevel.PACKAGE) + private boolean configPrayAgainstOlm; + @Getter(AccessLevel.PACKAGE) + private boolean timers; + @Getter(AccessLevel.PACKAGE) + private boolean tpOverlay; + @Getter(AccessLevel.PACKAGE) + private boolean olmTick; + @Getter(AccessLevel.PACKAGE) + private Color muttaColor; + @Getter(AccessLevel.PACKAGE) + private Color guardColor; + @Getter(AccessLevel.PACKAGE) + private Color tektonColor; + @Getter(AccessLevel.PACKAGE) + private Color burnColor; + @Getter(AccessLevel.PACKAGE) + private Color acidColor; + @Getter(AccessLevel.PACKAGE) + private Color tpColor; + @Getter(AccessLevel.PACKAGE) + private CoxConfig.FontStyle fontStyle; + @Getter(AccessLevel.PACKAGE) + private int textSize; + @Getter(AccessLevel.PACKAGE) + private boolean shadows; + @Provides CoxConfig getConfig(ConfigManager configManager) { @@ -163,6 +206,8 @@ public class CoxPlugin extends Plugin @Override protected void startUp() { + updateConfig(); + overlayManager.add(coxOverlay); overlayManager.add(coxInfoBox); HandCripple = false; @@ -650,4 +695,37 @@ public class CoxPlugin extends Plugin { return client.getVar(Varbits.IN_RAID) == 1; } + + @Subscribe + public void onConfigChanged(ConfigChanged configChanged) + { + if (configChanged.getGroup().equals("Cox")) + { + updateConfig(); + } + } + + private void updateConfig() + { + this.muttadile = config.muttadile(); + this.tekton = config.tekton(); + this.tektonTickCounter = config.tektonTickCounter(); + this.guardians = config.guardians(); + this.guardinTickCounter = config.guardinTickCounter(); + this.vangHighlight = config.vangHighlight(); + this.vangHealth = config.vangHealth(); + this.configPrayAgainstOlm = config.prayAgainstOlm(); + this.timers = config.timers(); + this.tpOverlay = config.tpOverlay(); + this.olmTick = config.olmTick(); + this.muttaColor = config.muttaColor(); + this.guardColor = config.guardColor(); + this.tektonColor = config.tektonColor(); + this.burnColor = config.burnColor(); + this.acidColor = config.acidColor(); + this.tpColor = config.tpColor(); + this.fontStyle = config.fontStyle(); + this.textSize = config.textSize(); + this.shadows = config.shadows(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/NPCContainer.java b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/NPCContainer.java index de33254a5d..6265025058 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/NPCContainer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/NPCContainer.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.coxhelper; import java.awt.Color; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; @@ -36,40 +37,40 @@ import net.runelite.api.NPCDefinition; class NPCContainer { - @Getter + @Getter(AccessLevel.PACKAGE) private NPC npc; - @Getter + @Getter(AccessLevel.PACKAGE) private int npcIndex; - @Getter + @Getter(AccessLevel.PACKAGE) private String npcName; - @Getter + @Getter(AccessLevel.PACKAGE) private int npcSize; - @Setter - @Getter + @Setter(AccessLevel.PACKAGE) + @Getter(AccessLevel.PACKAGE) private int ticksUntilAttack; - @Setter - @Getter + @Setter(AccessLevel.PACKAGE) + @Getter(AccessLevel.PACKAGE) private int intermissionPeriod; - @Setter - @Getter + @Setter(AccessLevel.PACKAGE) + @Getter(AccessLevel.PACKAGE) private int npcSpeed; - @Setter - @Getter + @Setter(AccessLevel.PACKAGE) + @Getter(AccessLevel.PACKAGE) private Actor npcInteracting; - @Setter - @Getter + @Setter(AccessLevel.PACKAGE) + @Getter(AccessLevel.PACKAGE) private Specials specials; - @Setter - @Getter + @Setter(AccessLevel.PACKAGE) + @Getter(AccessLevel.PACKAGE) private Attackstyle attackStyle; @@ -93,7 +94,7 @@ class NPCContainer } @AllArgsConstructor - @Getter + @Getter(AccessLevel.PACKAGE) public enum Specials { PORTALS("Portals"), @@ -106,7 +107,7 @@ class NPCContainer } @AllArgsConstructor - @Getter + @Getter(AccessLevel.PACKAGE) public enum Attackstyle { MAGE("Mage", Color.CYAN), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/PrayAgainst.java b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/PrayAgainst.java index 2b61b5010e..30942bb461 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/PrayAgainst.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/PrayAgainst.java @@ -24,12 +24,13 @@ */ package net.runelite.client.plugins.coxhelper; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.Prayer; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) public enum PrayAgainst { MELEE(Prayer.PROTECT_FROM_MELEE), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/crystalmathlabs/CrystalMathLabs.java b/runelite-client/src/main/java/net/runelite/client/plugins/crystalmathlabs/CrystalMathLabs.java index 155b3bfcc6..77a9ec68b2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/crystalmathlabs/CrystalMathLabs.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/crystalmathlabs/CrystalMathLabs.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.crystalmathlabs; import java.io.IOException; import java.util.Objects; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; @@ -52,6 +53,7 @@ import okhttp3.Response; enabledByDefault = false ) @Slf4j +@Singleton public class CrystalMathLabs extends Plugin { /** diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java b/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java index 11a65bccaf..ec89729654 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.customcursor; import java.awt.image.BufferedImage; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.util.ImageUtil; @@ -42,10 +43,10 @@ public enum CustomCursor ZAMORAK_GODSWORD("Zamorak Godsword", "cursor-zamorak-godsword.png"); private final String name; - @Getter + @Getter(AccessLevel.PUBLIC) private final BufferedImage cursorImage; - CustomCursor(String name, String icon) + CustomCursor(final String name, final String icon) { this.name = name; this.cursorImage = ImageUtil.getResourceStreamFromClass(CustomCursorPlugin.class, icon); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursorPlugin.java index 7e0fc4c18e..feb8729740 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursorPlugin.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.customcursor; import com.google.inject.Provides; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.events.ConfigChanged; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; @@ -38,6 +39,7 @@ import net.runelite.client.ui.ClientUI; description = "Replaces your mouse cursor image", enabledByDefault = false ) +@Singleton public class CustomCursorPlugin extends Plugin { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java index 4e9c86df1d..764b93a308 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java @@ -26,6 +26,8 @@ package net.runelite.client.plugins.dailytaskindicators; +import javax.inject.Singleton; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.vars.AccountType; import com.google.inject.Provides; import javax.inject.Inject; @@ -50,6 +52,7 @@ import net.runelite.client.plugins.PluginDescriptor; name = "Daily Task Indicator", description = "Show chat notifications for daily tasks upon login" ) +@Singleton public class DailyTasksPlugin extends Plugin { private static final int ONE_DAY = 86400000; @@ -80,6 +83,16 @@ public class DailyTasksPlugin extends Plugin private long lastReset; private boolean loggingIn; + private boolean showHerbBoxes; + private boolean showStaves; + private boolean showEssence; + private boolean showRunes; + private boolean showSand; + private boolean showFlax; + private boolean showBonemeal; + private boolean showArrows; + private boolean showDynamite; + @Provides DailyTasksConfig provideConfig(ConfigManager configManager) { @@ -89,6 +102,8 @@ public class DailyTasksPlugin extends Plugin @Override public void startUp() { + updateConfig(); + loggingIn = true; } @@ -120,47 +135,47 @@ public class DailyTasksPlugin extends Plugin lastReset = (long) Math.floor(currentTime / ONE_DAY) * ONE_DAY; loggingIn = false; - if (config.showHerbBoxes()) + if (this.showHerbBoxes) { checkHerbBoxes(dailyReset); } - if (config.showStaves()) + if (this.showStaves) { checkStaves(dailyReset); } - if (config.showEssence()) + if (this.showEssence) { checkEssence(dailyReset); } - if (config.showRunes()) + if (this.showRunes) { checkRunes(dailyReset); } - if (config.showSand()) + if (this.showSand) { checkSand(dailyReset); } - if (config.showFlax()) + if (this.showFlax) { checkFlax(dailyReset); } - if (config.showBonemeal()) + if (this.showBonemeal) { checkBonemeal(dailyReset); } - if (config.showArrows()) + if (this.showArrows) { checkArrows(dailyReset); } - if (config.showDynamite()) + if (this.showDynamite) { checkDynamite(dailyReset); } @@ -281,4 +296,26 @@ public class DailyTasksPlugin extends Plugin .runeLiteFormattedMessage(message) .build()); } + + @Subscribe + public void onConfigChanged(ConfigChanged configChanged) + { + if (configChanged.getGroup().equals("dailytaskindicators")) + { + updateConfig(); + } + } + + private void updateConfig() + { + this.showHerbBoxes = config.showHerbBoxes(); + this.showStaves = config.showStaves(); + this.showEssence = config.showEssence(); + this.showRunes = config.showRunes(); + this.showSand = config.showSand(); + this.showFlax = config.showFlax(); + this.showBonemeal = config.showBonemeal(); + this.showArrows = config.showArrows(); + this.showDynamite = config.showDynamite(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java index 34bb399c2f..049e6192b9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java @@ -32,6 +32,7 @@ import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.Set; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; @@ -56,6 +57,7 @@ import net.runelite.client.util.ImageUtil; description = "Show where you last died, and on what world", tags = {"arrow", "hints", "world", "map", "overlay"} ) +@Singleton @Slf4j public class DeathIndicatorPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java index 96d5dfa246..f8a56ffbc6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.defaultworld; import com.google.inject.Provides; import java.io.IOException; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; @@ -47,6 +48,7 @@ import net.runelite.http.api.worlds.WorldResult; tags = {"home"} ) @Slf4j +@Singleton public class DefaultWorldPlugin extends Plugin { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaOverlay.java index bf1154fecc..eaaf010435 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaOverlay.java @@ -33,6 +33,7 @@ import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.List; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Perspective; import net.runelite.api.Point; @@ -43,6 +44,7 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; +@Singleton public class DemonicGorillaOverlay extends Overlay { private static final Color COLOR_ICON_BACKGROUND = new Color(0, 0, 0, 128); @@ -58,7 +60,7 @@ public class DemonicGorillaOverlay extends Overlay private SkillIconManager iconManager; @Inject - public DemonicGorillaOverlay(Client client, DemonicGorillaPlugin plugin) + public DemonicGorillaOverlay(final Client client, final DemonicGorillaPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); @@ -106,7 +108,10 @@ public class DemonicGorillaOverlay extends Overlay { BufferedImage icon = getIcon(attackStyle); icons.add(icon); - totalWidth += icon.getWidth(); + if (icon != null) + { + totalWidth += icon.getWidth(); + } } int bgPadding = 4; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java index 0df801bda5..d031b501b5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java @@ -32,6 +32,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.AnimationID; import net.runelite.api.Client; @@ -64,6 +66,7 @@ import net.runelite.client.ui.overlay.OverlayManager; description = "Count demonic gorilla attacks and display their next possible attack styles", tags = {"combat", "overlay", "pve", "pvm"} ) +@Singleton public class DemonicGorillaPlugin extends Plugin { @Inject @@ -78,7 +81,7 @@ public class DemonicGorillaPlugin extends Plugin @Inject private ClientThread clientThread; - @Getter + @Getter(AccessLevel.PACKAGE) private Map gorillas; private List recentBoulders; @@ -145,7 +148,7 @@ public class DemonicGorillaPlugin extends Plugin } } - public static boolean isNpcGorilla(int npcId) + private static boolean isNpcGorilla(int npcId) { return npcId == NpcID.DEMONIC_GORILLA || npcId == NpcID.DEMONIC_GORILLA_7145 || @@ -321,8 +324,11 @@ public class DemonicGorillaPlugin extends Plugin .stream() .filter(x -> x != DemonicGorilla.AttackStyle.MELEE) .collect(Collectors.toList())); - checkGorillaAttackStyleSwitch(gorilla, DemonicGorilla.AttackStyle.MELEE, - getProtectedStyle(interacting)); + if (interacting != null) + { + checkGorillaAttackStyleSwitch(gorilla, DemonicGorilla.AttackStyle.MELEE, + getProtectedStyle(interacting)); + } } } else if (animationId != gorilla.getLastTickAnimation()) @@ -373,8 +379,7 @@ public class DemonicGorillaPlugin extends Plugin else if (mp != null) { WorldArea lastPlayerArea = mp.getLastWorldArea(); - if (lastPlayerArea != null && - interacting != null && recentBoulders.stream() + if (lastPlayerArea != null && recentBoulders.stream() .anyMatch(x -> x.distanceTo(lastPlayerArea) == 0)) { // A boulder started falling on the gorillas target, @@ -425,23 +430,21 @@ public class DemonicGorillaPlugin extends Plugin // Gorillas can't normally walk through other gorillas // or other players final WorldArea area1 = new WorldArea(x, 1, 1); - return area1 != null && - gorillas.values().stream().noneMatch(y -> + return gorillas.values().stream().noneMatch(y -> + { + if (y == gorilla) { - if (y == gorilla) - { - return false; - } - final WorldArea area2 = - y.getNpc().getIndex() < gorilla.getNpc().getIndex() ? - y.getNpc().getWorldArea() : y.getLastWorldArea(); - return area2 != null && area1.intersectsWith(area2); - }) && - memorizedPlayers.values().stream().noneMatch(y -> - { - final WorldArea area2 = y.getLastWorldArea(); - return area2 != null && area1.intersectsWith(area2); - }); + return false; + } + final WorldArea area2 = + y.getNpc().getIndex() < gorilla.getNpc().getIndex() ? + y.getNpc().getWorldArea() : y.getLastWorldArea(); + return area2 != null && area1.intersectsWith(area2); + }) && memorizedPlayers.values().stream().noneMatch(y -> + { + final WorldArea area2 = y.getLastWorldArea(); + return area2 != null && area1.intersectsWith(area2); + }); // There is a special case where if a player walked through // a gorilla, or a player walked through another player, @@ -453,9 +456,7 @@ public class DemonicGorillaPlugin extends Plugin { int distance = gorilla.getNpc().getWorldArea().distanceTo(mp.getLastWorldArea()); WorldPoint predictedMovement = predictedNewArea.toWorldPoint(); - if (distance <= DemonicGorilla.MAX_ATTACK_RANGE && - mp != null && - mp.getLastWorldArea().hasLineOfSightTo(client, gorilla.getLastWorldArea())) + if (distance <= DemonicGorilla.MAX_ATTACK_RANGE && mp.getLastWorldArea().hasLineOfSightTo(client, gorilla.getLastWorldArea())) { if (predictedMovement.distanceTo(gorilla.getLastWorldArea().toWorldPoint()) != 0) { @@ -549,8 +550,7 @@ public class DemonicGorillaPlugin extends Plugin { recentBoulders.add(WorldPoint.fromLocal(client, event.getPosition())); } - else if (projectileId == ProjectileID.DEMONIC_GORILLA_MAGIC || - projectileId == ProjectileID.DEMONIC_GORILLA_RANGED) + else { WorldPoint projectileSourcePosition = WorldPoint.fromLocal( client, projectile.getX1(), projectile.getY1(), client.getPlane()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/MemorizedPlayer.java b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/MemorizedPlayer.java index 7dd0058cd6..262042b7e1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/MemorizedPlayer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/MemorizedPlayer.java @@ -26,25 +26,26 @@ package net.runelite.client.plugins.demonicgorilla; import java.util.ArrayList; import java.util.List; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import net.runelite.api.Hitsplat; import net.runelite.api.Player; import net.runelite.api.coords.WorldArea; -public class MemorizedPlayer +class MemorizedPlayer { - @Getter + @Getter(AccessLevel.PACKAGE) private Player player; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private WorldArea lastWorldArea; - @Getter + @Getter(AccessLevel.PACKAGE) private List recentHitsplats; - public MemorizedPlayer(Player player) + MemorizedPlayer(final Player player) { this.player = player; this.recentHitsplats = new ArrayList<>(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/PendingGorillaAttack.java b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/PendingGorillaAttack.java index 6f3faff8d2..405f889469 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/PendingGorillaAttack.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/PendingGorillaAttack.java @@ -24,25 +24,25 @@ */ package net.runelite.client.plugins.demonicgorilla; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Player; -public class PendingGorillaAttack +class PendingGorillaAttack { - @Getter + @Getter(AccessLevel.PACKAGE) private DemonicGorilla attacker; - @Getter + @Getter(AccessLevel.PACKAGE) private DemonicGorilla.AttackStyle attackStyle; - @Getter + @Getter(AccessLevel.PACKAGE) private Player target; - @Getter + @Getter(AccessLevel.PACKAGE) private int finishesOnTick; - public PendingGorillaAttack(DemonicGorilla attacker, DemonicGorilla.AttackStyle attackStyle, - Player target, int finishesOnTick) + PendingGorillaAttack(final DemonicGorilla attacker, final DemonicGorilla.AttackStyle attackStyle, final Player target, final int finishesOnTick) { this.attacker = attacker; this.attackStyle = attackStyle; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java index 29bce7dc98..ac5487f6a8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java @@ -29,6 +29,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import java.util.List; import java.util.Map; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.Client; @@ -36,7 +37,7 @@ import net.runelite.api.Skill; import net.runelite.api.Varbits; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) enum DiscordGameEventType { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java index 9d698b2085..68a10c2567 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java @@ -28,6 +28,7 @@ package net.runelite.client.plugins.discord; import com.google.common.base.Strings; import com.google.inject.Inject; import com.google.inject.Provides; +import com.google.inject.Singleton; import java.awt.image.BufferedImage; import java.io.IOException; import java.io.InputStream; @@ -37,6 +38,8 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; import javax.imageio.ImageIO; +import lombok.AccessLevel; +import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; @@ -80,9 +83,10 @@ import okhttp3.Response; tags = {"action", "activity", "external", "integration", "status"} ) @Slf4j +@Singleton public class DiscordPlugin extends Plugin { - public static boolean discordEnabled = false; + private static boolean discordEnabled = false; @Inject private Client client; @@ -112,6 +116,19 @@ public class DiscordPlugin extends Plugin private NavigationButton discordButton; private boolean loginFlag; + @Getter(AccessLevel.PACKAGE) + private int actionTimeout; + @Getter(AccessLevel.PACKAGE) + private boolean hideElapsedTime; + @Getter(AccessLevel.PACKAGE) + private boolean alwaysShowParty; + private boolean showSkillingActivity; + private boolean showBossActivity; + private boolean showCityActivity; + private boolean showDungeonActivity; + private boolean showMinigameActivity; + private boolean showRaidingActivity; + @Provides private DiscordConfig provideConfig(ConfigManager configManager) { @@ -121,6 +138,8 @@ public class DiscordPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "discord.png"); discordButton = NavigationButton.builder() @@ -182,6 +201,8 @@ public class DiscordPlugin extends Plugin { if (event.getGroup().equalsIgnoreCase("discord")) { + updateConfig(); + checkForGameStateUpdate(); checkForAreaUpdate(); updatePresence(); @@ -201,7 +222,7 @@ public class DiscordPlugin extends Plugin final DiscordGameEventType discordGameEventType = DiscordGameEventType.fromSkill(event.getSkill()); - if (discordGameEventType != null && config.showSkillingActivity()) + if (discordGameEventType != null && this.showSkillingActivity) { discordState.triggerEvent(discordGameEventType); } @@ -210,7 +231,7 @@ public class DiscordPlugin extends Plugin @Subscribe public void onVarbitChanged(VarbitChanged event) { - if (!config.showRaidingActivity()) + if (!this.showRaidingActivity) { return; } @@ -419,15 +440,28 @@ public class DiscordPlugin extends Plugin switch (event.getDiscordAreaType()) { case BOSSES: - return config.showBossActivity(); + return this.showBossActivity; case CITIES: - return config.showCityActivity(); + return this.showCityActivity; case DUNGEONS: - return config.showDungeonActivity(); + return this.showDungeonActivity; case MINIGAMES: - return config.showMinigameActivity(); + return this.showMinigameActivity; } return false; } + + public void updateConfig() + { + this.actionTimeout = config.actionTimeout(); + this.hideElapsedTime = config.hideElapsedTime(); + this.alwaysShowParty = config.alwaysShowParty(); + this.showSkillingActivity = config.showSkillingActivity(); + this.showBossActivity = config.showBossActivity(); + this.showCityActivity = config.showCityActivity(); + this.showDungeonActivity = config.showDungeonActivity(); + this.showMinigameActivity = config.showMinigameActivity(); + this.showRaidingActivity = config.showRaidingActivity(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java index c110194187..ddb554fd75 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java @@ -56,16 +56,16 @@ class DiscordState private final UUID partyId = UUID.randomUUID(); private final List events = new ArrayList<>(); private final DiscordService discordService; - private final DiscordConfig config; + private final DiscordPlugin plugin; private PartyService party; private final RuneLiteProperties properties; private DiscordPresence lastPresence; @Inject - private DiscordState(final DiscordService discordService, final DiscordConfig config, final PartyService party, final RuneLiteProperties properties) + private DiscordState(final DiscordService discordService, final DiscordPlugin plugin, final PartyService party, final RuneLiteProperties properties) { this.discordService = discordService; - this.config = config; + this.plugin = plugin; this.party = party; this.properties = properties; } @@ -97,7 +97,7 @@ class DiscordState .startTimestamp(lastPresence.getStartTimestamp()) .smallImageKey(lastPresence.getSmallImageKey()) .partyMax(lastPresence.getPartyMax()) - .partySize(Math.max(config.alwaysShowParty() ? 1 : 0, party.getMembers().size())); + .partySize(Math.max(plugin.isAlwaysShowParty() ? 1 : 0, party.getMembers().size())); if (party.isOwner()) { @@ -126,7 +126,7 @@ class DiscordState { // If we aren't showing the elapsed time within Discord then // We null out the event start property - event = new EventWithTime(eventType, config.hideElapsedTime() ? null : Instant.now()); + event = new EventWithTime(eventType, plugin.isHideElapsedTime() ? null : Instant.now()); events.add(event); } @@ -205,7 +205,7 @@ class DiscordState */ void checkForTimeout() { - final Duration actionTimeout = Duration.ofMinutes(config.actionTimeout()); + final Duration actionTimeout = Duration.ofMinutes(plugin.getActionTimeout()); final Instant now = Instant.now(); events.removeIf(event -> event.getType().isShouldTimeout() && now.isAfter(event.getUpdated().plus(actionTimeout))); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java index 21eb1eab10..dff53b98c1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java @@ -30,6 +30,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.annotation.Nullable; import javax.inject.Inject; +import javax.inject.Singleton; import joptsimple.internal.Strings; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; @@ -52,6 +53,7 @@ import net.runelite.client.util.ImageUtil; enabledByDefault = false ) @Slf4j +@Singleton public class EmojiPlugin extends Plugin { private static final Pattern TAG_REGEXP = Pattern.compile("<[^>]*>"); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java index 73069862cd..72a13d5fe9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.entityhider; import com.google.inject.Provides; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.Player; @@ -44,6 +45,7 @@ import net.runelite.client.plugins.PluginDescriptor; tags = {"npcs", "players", "projectiles"}, enabledByDefault = false ) +@Singleton public class EntityHiderPlugin extends Plugin { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorConfig.java index a43592e5d7..91c7a4b065 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorConfig.java @@ -29,7 +29,7 @@ import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; import net.runelite.client.config.Range; -@ConfigGroup("grounditems") +@ConfigGroup("equipmentinspector") public interface EquipmentInspectorConfig extends Config { @ConfigItem( diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java index d85f8127ac..10680e620b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java @@ -37,12 +37,14 @@ import java.util.Optional; import java.util.concurrent.ScheduledExecutorService; import javax.annotation.Nullable; import javax.inject.Inject; +import javax.inject.Singleton; import javax.swing.SwingUtilities; import lombok.extern.slf4j.Slf4j; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.ItemDefinition; import net.runelite.api.Player; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.PlayerMenuOptionClicked; import net.runelite.api.kit.KitType; import net.runelite.client.chat.ChatColorType; @@ -66,7 +68,7 @@ import net.runelite.client.util.Text; type = PluginType.PVP, enabledByDefault = false ) - +@Singleton @Slf4j public class EquipmentInspectorPlugin extends Plugin { @@ -100,6 +102,10 @@ public class EquipmentInspectorPlugin extends Plugin private int Prot3 = 0; private int Prot4 = 0; + private boolean ShowValue; + private int protecteditems; + private boolean ExactValue; + @Provides EquipmentInspectorConfig provideConfig(ConfigManager configManager) { @@ -109,6 +115,7 @@ public class EquipmentInspectorPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); equipmentInspectorPanel = injector.getInstance(EquipmentInspectorPanel.class); if (client != null) @@ -166,10 +173,18 @@ public class EquipmentInspectorPlugin extends Plugin // The player menu uses a non-breaking space in the player name, we need to replace this to compare // against the playerName in the player cache. String finalPlayerName = playerName.replace('\u00A0', ' '); - List players = client.getPlayers(); - Optional targetPlayer = players.stream() - .filter(Objects::nonNull) - .filter(p -> p.getName().equals(finalPlayerName)).findFirst(); + List players = null; + if (client != null) + { + players = client.getPlayers(); + } + Optional targetPlayer = Optional.empty(); + if (players != null) + { + targetPlayer = players.stream() + .filter(Objects::nonNull) + .filter(p -> p.getName().equals(finalPlayerName)).findFirst(); + } if (targetPlayer.isPresent()) { @@ -224,13 +239,13 @@ public class EquipmentInspectorPlugin extends Plugin } } } - int IgnoredItems = config.protecteditems(); + int IgnoredItems = this.protecteditems; if (IgnoredItems != 0 && IgnoredItems != 1 && IgnoredItems != 2 && IgnoredItems != 3) { IgnoredItems = 4; } - if (config.ShowValue()) + if (this.ShowValue) { switch (IgnoredItems) { @@ -255,13 +270,13 @@ public class EquipmentInspectorPlugin extends Plugin break; } String StringPrice = ""; - if (!config.ExactValue()) + if (!this.ExactValue) { TotalPrice = TotalPrice / 1000; StringPrice = NumberFormat.getIntegerInstance().format(TotalPrice); StringPrice = StringPrice + 'K'; } - if (config.ExactValue()) + if (this.ExactValue) { StringPrice = NumberFormat.getIntegerInstance().format(TotalPrice); } @@ -281,4 +296,20 @@ public class EquipmentInspectorPlugin extends Plugin }); } } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (event.getGroup().equalsIgnoreCase("equipmentinspector")) + { + updateConfig(); + } + } + + public void updateConfig() + { + this.ShowValue = config.ShowValue(); + this.protecteditems = config.protecteditems(); + this.ExactValue = config.ExactValue(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/normal.png b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/normal.png deleted file mode 100644 index 613f95e46d5235a49ec0843faaa35384e9b0896b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 624 zcmV-$0+0QPP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0tHD#K~z{r?Uuhw z!$1_rUmcyLn~P8fmrQ~BGyq5#M;t!sDe|AI9PCT z5L;*0n(yTB<#Ji>Y`9Ti3&7jKIc7LRzA=EB!@v>HuhtrJNg@rXeB>M9M-je0Kgy>A zylh?sDMIn)l}ej(`+H8v(E%7b5cc-@C3nN&w2Fwp-R+IopcXQj3?*h0Vy~0lOgpUz zIPDlH0yrEs;AVPiQm$;Ucia462~d@01* diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/examine/CacheKey.java b/runelite-client/src/main/java/net/runelite/client/plugins/examine/CacheKey.java index 8cd0340b69..623aa869e7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/examine/CacheKey.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/examine/CacheKey.java @@ -31,7 +31,7 @@ class CacheKey private final ExamineType type; private final int id; - public CacheKey(ExamineType type, int id) + CacheKey(final ExamineType type, final int id) { this.type = type; this.id = id; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java index ddc21c724b..414c75a4c7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java @@ -33,6 +33,7 @@ import java.util.Deque; import java.util.concurrent.ScheduledExecutorService; import java.util.regex.Pattern; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; @@ -69,6 +70,7 @@ import net.runelite.http.api.osbuddy.OSBGrandExchangeResult; tags = {"npcs", "items", "inventory", "objects"} ) @Slf4j +@Singleton public class ExaminePlugin extends Plugin { private static final Pattern X_PATTERN = Pattern.compile("^\\d+ x "); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropOverlay.java index cfdd113ef6..ee6ee0f26e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropOverlay.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.experiencedrop; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Actor; import net.runelite.api.Point; import net.runelite.client.ui.overlay.Overlay; @@ -34,16 +35,15 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton class XpDropOverlay extends Overlay { private final XpDropPlugin plugin; - private final XpDropConfig config; @Inject - private XpDropOverlay(XpDropPlugin plugin, XpDropConfig config) + private XpDropOverlay(final XpDropPlugin plugin) { this.plugin = plugin; - this.config = config; setPosition(OverlayPosition.DYNAMIC); setPriority(OverlayPriority.MED); } @@ -57,12 +57,12 @@ class XpDropOverlay extends Overlay if (opponent != null) { int offset = opponent.getLogicalHeight() + 50; - String damageStr = String.valueOf(this.plugin.getDamage()); + String damageStr = String.valueOf(plugin.getDamage()); Point textLocation = opponent.getCanvasTextLocation(graphics, damageStr, offset); - if (textLocation != null && this.plugin.getDamage() != 0) + if (textLocation != null && plugin.getDamage() != 0) { - OverlayUtil.renderTextLocation(graphics, textLocation, damageStr, config.getDamageColor()); + OverlayUtil.renderTextLocation(graphics, textLocation, damageStr, plugin.getDamageColor()); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java index e6e4aa3811..a94da44953 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java @@ -27,11 +27,13 @@ package net.runelite.client.plugins.experiencedrop; import com.google.inject.Provides; +import java.awt.Color; import java.util.Arrays; import java.util.EnumMap; import java.util.Map; import java.util.stream.IntStream; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Actor; @@ -65,6 +67,7 @@ import net.runelite.client.util.ColorUtil; description = "Enable customization of the way XP drops are displayed", tags = {"experience", "levels", "tick"} ) +@Singleton public class XpDropPlugin extends Plugin { private static final int XPDROP_PADDING = 2; // space between xp drop icons @@ -104,6 +107,15 @@ public class XpDropPlugin extends Plugin private PrayerType currentTickPrayer; private XpDropConfig.DamageMode damageMode; + private boolean hideSkillIcons; + private Color getMeleePrayerColor; + private Color getRangePrayerColor; + private Color getMagePrayerColor; + private int fakeXpDropDelay; + private XpDropConfig.DamageMode showdamagedrops; + @Getter(AccessLevel.PACKAGE) + private Color damageColor; + @Provides XpDropConfig provideConfig(ConfigManager configManager) { @@ -113,6 +125,8 @@ public class XpDropPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + damageMode = config.showdamagedrops(); if (damageMode == XpDropConfig.DamageMode.ABOVE_OPPONENT) @@ -135,10 +149,11 @@ public class XpDropPlugin extends Plugin return; } + updateConfig(); if (damageMode != XpDropConfig.DamageMode.ABOVE_OPPONENT) { - damageMode = config.showdamagedrops(); + damageMode = this.showdamagedrops; if (damageMode == XpDropConfig.DamageMode.ABOVE_OPPONENT) { @@ -147,7 +162,7 @@ public class XpDropPlugin extends Plugin } else { - damageMode = config.showdamagedrops(); + damageMode = this.showdamagedrops; if (damageMode != XpDropConfig.DamageMode.ABOVE_OPPONENT) { @@ -180,7 +195,7 @@ public class XpDropPlugin extends Plugin return; } - if (config.hideSkillIcons()) + if (this.hideSkillIcons) { if (widget.getSpriteId() > 0) { @@ -245,21 +260,21 @@ public class XpDropPlugin extends Plugin id == SpriteID.SKILL_ATTACK || id == SpriteID.SKILL_STRENGTH || id == SpriteID.SKILL_DEFENCE || correctPrayer)) { - color = config.getMeleePrayerColor().getRGB(); + color = this.getMeleePrayerColor.getRGB(); correctPrayer = true; } break; case RANGE: if (spriteIDs.anyMatch(id -> id == SpriteID.SKILL_RANGED || correctPrayer)) { - color = config.getRangePrayerColor().getRGB(); + color = this.getRangePrayerColor.getRGB(); correctPrayer = true; } break; case MAGIC: if (spriteIDs.anyMatch(id -> id == SpriteID.SKILL_MAGIC || correctPrayer)) { - color = config.getMagePrayerColor().getRGB(); + color = this.getMagePrayerColor.getRGB(); correctPrayer = true; } break; @@ -301,7 +316,7 @@ public class XpDropPlugin extends Plugin currentTickPrayer = getActivePrayerType(); correctPrayer = false; - final int fakeTickDelay = config.fakeXpDropDelay(); + final int fakeTickDelay = this.fakeXpDropDelay; if (fakeTickDelay == 0 || lastSkill == null) { @@ -343,7 +358,7 @@ public class XpDropPlugin extends Plugin @Subscribe public void onScriptCallbackEvent(ScriptCallbackEvent e) { - if (config.showdamagedrops() == XpDropConfig.DamageMode.NONE) + if (this.showdamagedrops == XpDropConfig.DamageMode.NONE) { return; } @@ -388,7 +403,7 @@ public class XpDropPlugin extends Plugin StringBuilder builder = new StringBuilder() .append(stringStack[stringStackSize - 1]) - .append(ColorUtil.colorTag(config.getDamageColor())) + .append(ColorUtil.colorTag(this.damageColor)) .append(" (").append(damage).append(")"); stringStack[stringStackSize - 1] = builder.toString(); @@ -430,4 +445,15 @@ public class XpDropPlugin extends Plugin damage = (int) Math.rint(damageDealt / npcManager.getXpModifier(target.getId())); tickShow = 3; } + + private void updateConfig() + { + this.hideSkillIcons = config.hideSkillIcons(); + this.getMeleePrayerColor = config.getMeleePrayerColor(); + this.getRangePrayerColor = config.getRangePrayerColor(); + this.getMagePrayerColor = config.getMagePrayerColor(); + this.fakeXpDropDelay = config.fakeXpDropDelay(); + this.showdamagedrops = config.showdamagedrops(); + this.damageColor = config.getDamageColor(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java index b32f7f6c10..53f6b3d575 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java @@ -35,6 +35,7 @@ import java.util.Map; import java.util.TreeMap; import javax.annotation.Nullable; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.Data; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; @@ -43,6 +44,7 @@ import net.runelite.api.ScriptID; import net.runelite.api.SoundEffectID; import net.runelite.api.SpriteID; import net.runelite.api.Varbits; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.WidgetLoaded; @@ -66,6 +68,7 @@ import net.runelite.client.util.Text; description = "Show the location of the fairy ring teleport", tags = {"teleportation"} ) +@Singleton public class FairyRingPlugin extends Plugin { private static final String[] leftDial = new String[]{"A", "D", "C", "B"}; @@ -93,6 +96,8 @@ public class FairyRingPlugin extends Plugin private Widget searchBtn; private Collection codes = null; + private boolean autoOpen; + @Data private static class CodeWidgets { @@ -106,6 +111,23 @@ public class FairyRingPlugin extends Plugin private Widget description; } + @Override + protected void startUp() throws Exception + { + this.autoOpen = config.autoOpen(); + } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("fairyrings")) + { + return; + } + + this.autoOpen = config.autoOpen(); + } + @Provides FairyRingConfig getConfig(ConfigManager configManager) { @@ -142,7 +164,7 @@ public class FairyRingPlugin extends Plugin codes = null; - if (config.autoOpen()) + if (this.autoOpen) { openSearch(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java index b6eb858b72..622ef7d273 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java @@ -41,6 +41,7 @@ import java.time.Instant; import java.util.Comparator; import java.util.function.Supplier; import javax.imageio.ImageIO; +import javax.inject.Singleton; import javax.swing.Box; import javax.swing.BoxLayout; import javax.swing.ImageIcon; @@ -66,6 +67,7 @@ import okhttp3.Response; import okhttp3.ResponseBody; @Slf4j +@Singleton class FeedPanel extends PluginPanel { private static final ImageIcon RUNELITE_ICON; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java index 8a34a73cf1..0366361345 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java @@ -33,6 +33,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.events.ConfigChanged; import net.runelite.client.config.ConfigManager; @@ -53,6 +54,7 @@ import net.runelite.http.api.feed.FeedResult; loadWhenOutdated = true ) @Slf4j +@Singleton public class FeedPlugin extends Plugin { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveContainer.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveContainer.java index cc0f1a523c..3bc482bf51 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveContainer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveContainer.java @@ -40,7 +40,7 @@ import net.runelite.api.NPCDefinition; import net.runelite.api.NpcID; import net.runelite.api.Prayer; -@Getter +@Getter(AccessLevel.PACKAGE) class FightCaveContainer { private NPC npc; @@ -50,11 +50,11 @@ class FightCaveContainer private int attackSpeed; private int priority; private ImmutableSet animations; - @Setter + @Setter(AccessLevel.PACKAGE) private int ticksUntilAttack; - @Setter + @Setter(AccessLevel.PACKAGE) private Actor npcInteracting; - @Setter + @Setter(AccessLevel.PACKAGE) private AttackStyle attackStyle; FightCaveContainer(NPC npc, int attackSpeed) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java index 68569157d5..4f9c675825 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java @@ -32,6 +32,7 @@ import java.awt.Graphics2D; import java.awt.Rectangle; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Point; import net.runelite.api.Prayer; @@ -44,19 +45,18 @@ import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.util.ImageUtil; +@Singleton public class FightCaveOverlay extends Overlay { private FightCavePlugin plugin; - private FightCaveConfig config; private Client client; private SpriteManager spriteManager; @Inject - FightCaveOverlay(Client client, FightCavePlugin plugin, FightCaveConfig config, SpriteManager spriteManager) + FightCaveOverlay(final Client client, final FightCavePlugin plugin, final SpriteManager spriteManager) { this.client = client; this.plugin = plugin; - this.config = config; this.spriteManager = spriteManager; setPosition(OverlayPosition.DYNAMIC); setPriority(OverlayPriority.HIGHEST); @@ -82,8 +82,8 @@ public class FightCaveOverlay extends Overlay } final String ticksLeftStr = String.valueOf(ticksLeft); - final int font = config.fontStyle().getFont(); - final boolean shadows = config.shadows(); + final int font = plugin.getFontStyle().getFont(); + final boolean shadows = plugin.isShadows(); Color color = (ticksLeft <= 1 ? Color.WHITE : attackStyle.getColor()); final Point canvasPoint = npc.getNpc().getCanvasTextLocation(graphics, Integer.toString(ticksLeft), 0); @@ -101,10 +101,10 @@ public class FightCaveOverlay extends Overlay renderImageLocation(graphics, npc.getNpc().getCanvasImageLocation(ImageUtil.resizeImage(pray, 36, 36), 0), pray, 12, 30); } - OverlayUtil.renderTextLocation(graphics, ticksLeftStr, config.textSize(), font, color, canvasPoint, shadows, 0); + OverlayUtil.renderTextLocation(graphics, ticksLeftStr, plugin.getTextSize(), font, color, canvasPoint, shadows, 0); } - if (config.tickTimersWidget()) + if (plugin.isTickTimersWidget()) { if (!plugin.getMageTicks().isEmpty()) @@ -113,7 +113,7 @@ public class FightCaveOverlay extends Overlay Prayer.PROTECT_FROM_MAGIC, plugin.getMageTicks().get(0) == 1 ? Color.WHITE : Color.CYAN, Integer.toString(plugin.getMageTicks().get(0)), - config.shadows() + plugin.isShadows() ); } if (!plugin.getRangedTicks().isEmpty()) @@ -122,7 +122,7 @@ public class FightCaveOverlay extends Overlay Prayer.PROTECT_FROM_MISSILES, plugin.getRangedTicks().get(0) == 1 ? Color.WHITE : Color.GREEN, Integer.toString(plugin.getRangedTicks().get(0)), - config.shadows() + plugin.isShadows() ); } if (!plugin.getMeleeTicks().isEmpty()) @@ -131,7 +131,7 @@ public class FightCaveOverlay extends Overlay Prayer.PROTECT_FROM_MELEE, plugin.getMeleeTicks().get(0) == 1 ? Color.WHITE : Color.RED, Integer.toString(plugin.getMeleeTicks().get(0)), - config.shadows() + plugin.isShadows() ); } } @@ -146,7 +146,7 @@ public class FightCaveOverlay extends Overlay if (bounds != null) { - renderTextLocation(graphics, ticks, 16, config.fontStyle().getFont(), color, centerPoint(bounds), shadows); + renderTextLocation(graphics, ticks, 16, plugin.getFontStyle().getFont(), color, centerPoint(bounds), shadows); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java index c694aae2f2..a31197e700 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java @@ -35,6 +35,7 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -45,6 +46,7 @@ import net.runelite.api.GameState; import net.runelite.api.NPC; import net.runelite.api.NpcID; import net.runelite.api.events.ChatMessage; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.NpcDespawned; @@ -65,7 +67,7 @@ import org.apache.commons.lang3.ArrayUtils; type = PluginType.PVM, enabledByDefault = false ) - +@Singleton @Slf4j public class FightCavePlugin extends Plugin { @@ -146,6 +148,18 @@ public class FightCavePlugin extends Plugin return String.format("%dx %s", quantity, monster); } + + @Getter(AccessLevel.PACKAGE) + private WaveDisplayMode waveDisplay; + @Getter(AccessLevel.PACKAGE) + private boolean tickTimersWidget; + @Getter(AccessLevel.PACKAGE) + private FightCaveConfig.FontStyle fontStyle; + @Getter(AccessLevel.PACKAGE) + private int textSize; + @Getter(AccessLevel.PACKAGE) + private boolean shadows; + @Provides FightCaveConfig provideConfig(ConfigManager configManager) { @@ -155,6 +169,8 @@ public class FightCavePlugin extends Plugin @Override public void startUp() { + updateConfig(); + if (client.getGameState() == GameState.LOGGED_IN) { if (regionCheck()) @@ -174,6 +190,17 @@ public class FightCavePlugin extends Plugin currentWave = -1; } + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("fightcave")) + { + return; + } + + updateConfig(); + } + @Subscribe public void onChatMessage(ChatMessage event) { @@ -346,4 +373,13 @@ public class FightCavePlugin extends Plugin { return ArrayUtils.contains(client.getMapRegions(), FIGHT_CAVE_REGION); } + + private void updateConfig() + { + this.waveDisplay = config.waveDisplay(); + this.tickTimersWidget = config.tickTimersWidget(); + this.fontStyle = config.fontStyle(); + this.textSize = config.textSize(); + this.shadows = config.shadows(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/WaveOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/WaveOverlay.java index f1d81816f6..12beb81be2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/WaveOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/WaveOverlay.java @@ -32,6 +32,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; @@ -40,6 +41,7 @@ import net.runelite.client.ui.overlay.components.TitleComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; +@Singleton class WaveOverlay extends Overlay { private static final Color HEADER_COLOR = ColorScheme.BRAND_ORANGE; @@ -49,7 +51,7 @@ class WaveOverlay extends Overlay private final PanelComponent panelComponent = new PanelComponent(); @Inject - private WaveOverlay(FightCaveConfig config, FightCavePlugin plugin) + private WaveOverlay(final FightCaveConfig config, final FightCavePlugin plugin) { this.config = config; this.plugin = plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java index 78082d052a..24f15c5e42 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java @@ -28,6 +28,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import net.runelite.api.Skill; @@ -41,25 +42,24 @@ import net.runelite.client.ui.overlay.components.TitleComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; +@Singleton class FishingOverlay extends Overlay { private static final String FISHING_SPOT = "Fishing spot"; private final Client client; private final FishingPlugin plugin; - private final FishingConfig config; private final XpTrackerService xpTrackerService; private final PanelComponent panelComponent = new PanelComponent(); @Inject - public FishingOverlay(Client client, FishingPlugin plugin, FishingConfig config, XpTrackerService xpTrackerService) + public FishingOverlay(final Client client, final FishingPlugin plugin, final XpTrackerService xpTrackerService) { super(plugin); setPosition(OverlayPosition.TOP_LEFT); this.client = client; this.plugin = plugin; - this.config = config; this.xpTrackerService = xpTrackerService; getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Fishing overlay")); } @@ -67,7 +67,7 @@ class FishingOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (!config.showFishingStats() || plugin.getSession().getLastFishCaught() == null) + if (!plugin.isShowFishingStats() || plugin.getSession().getLastFishCaught() == null) { return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java index aa4db54c50..074a4d4858 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java @@ -50,6 +50,7 @@ import net.runelite.api.NPC; import net.runelite.api.Varbits; import net.runelite.api.coords.LocalPoint; import net.runelite.api.events.ChatMessage; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.InteractingChanged; @@ -138,9 +139,27 @@ public class FishingPlugin extends Plugin return configManager.getConfig(FishingConfig.class); } + @Getter(AccessLevel.PACKAGE) + private boolean onlyCurrentSpot; + @Getter(AccessLevel.PACKAGE) + private boolean showSpotTiles; + @Getter(AccessLevel.PACKAGE) + private boolean showSpotIcons; + @Getter(AccessLevel.PACKAGE) + private boolean showSpotNames; + private int statTimeout; + @Getter(AccessLevel.PACKAGE) + private boolean showFishingStats; + @Getter(AccessLevel.PACKAGE) + private boolean showMinnowOverlay; + private boolean trawlerNotification; + private boolean trawlerTimer; + @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(overlay); overlayManager.add(spotOverlay); overlayManager.add(fishingSpotMinimapOverlay); @@ -161,6 +180,17 @@ public class FishingPlugin extends Plugin trawlerStartTime = null; } + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("fishing")) + { + return; + } + + updateConfig(); + } + @Subscribe public void onGameStateChanged(GameStateChanged gameStateChanged) { @@ -253,7 +283,7 @@ public class FishingPlugin extends Plugin // Reset fishing session if (session.getLastFishCaught() != null) { - final Duration statTimeout = Duration.ofMinutes(config.statTimeout()); + final Duration statTimeout = Duration.ofMinutes(this.statTimeout); final Duration sinceCaught = Duration.between(session.getLastFishCaught(), Instant.now()); if (sinceCaught.compareTo(statTimeout) >= 0) @@ -267,7 +297,7 @@ public class FishingPlugin extends Plugin for (NPC npc : fishingSpots) { - if (FishingSpot.getSPOTS().get(npc.getId()) == FishingSpot.MINNOW && config.showMinnowOverlay()) + if (FishingSpot.getSPOTS().get(npc.getId()) == FishingSpot.MINNOW && this.showMinnowOverlay) { final int id = npc.getIndex(); final MinnowSpot minnowSpot = minnowSpots.get(id); @@ -282,7 +312,7 @@ public class FishingPlugin extends Plugin } } - if (config.trawlerTimer()) + if (this.trawlerTimer) { updateTrawlerTimer(); } @@ -319,7 +349,7 @@ public class FishingPlugin extends Plugin @Subscribe public void onVarbitChanged(VarbitChanged event) { - if (!config.trawlerNotification() || client.getGameState() != GameState.LOGGED_IN) + if (!this.trawlerNotification || client.getGameState() != GameState.LOGGED_IN) { return; } @@ -411,4 +441,17 @@ public class FishingPlugin extends Plugin final LocalPoint cameraPoint = new LocalPoint(client.getCameraX(), client.getCameraY()); fishingSpots.sort(Comparator.comparing(npc -> -1 * npc.getLocalLocation().distanceTo(cameraPoint))); } + + private void updateConfig() + { + this.onlyCurrentSpot = config.onlyCurrentSpot(); + this.showSpotTiles = config.showSpotTiles(); + this.showSpotIcons = config.showSpotIcons(); + this.showSpotNames = config.showSpotNames(); + this.statTimeout = config.statTimeout(); + this.showFishingStats = config.showFishingStats(); + this.showMinnowOverlay = config.showMinnowOverlay(); + this.trawlerNotification = config.trawlerNotification(); + this.trawlerTimer = config.trawlerTimer(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSession.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSession.java index ae1f387747..f5daf21ce6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSession.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSession.java @@ -25,12 +25,13 @@ package net.runelite.client.plugins.fishing; import java.time.Instant; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; class FishingSession { - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private Instant lastFishCaught; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java index c241cd695f..c04ae8426b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java @@ -28,6 +28,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Setter; import net.runelite.api.GraphicID; @@ -37,21 +38,20 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton class FishingSpotMinimapOverlay extends Overlay { private final FishingPlugin plugin; - private final FishingConfig config; @Setter(AccessLevel.PACKAGE) private boolean hidden; @Inject - public FishingSpotMinimapOverlay(FishingPlugin plugin, FishingConfig config) + public FishingSpotMinimapOverlay(final FishingPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); this.plugin = plugin; - this.config = config; } @Override @@ -71,7 +71,7 @@ class FishingSpotMinimapOverlay extends Overlay continue; } - if (config.onlyCurrentSpot() && plugin.getCurrentSpot() != null && plugin.getCurrentSpot() != spot) + if (plugin.isOnlyCurrentSpot() && plugin.getCurrentSpot() != null && plugin.getCurrentSpot() != spot) { continue; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java index 1b9c27eda0..7f7f058438 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java @@ -32,6 +32,7 @@ import java.awt.image.BufferedImage; import java.time.Duration; import java.time.Instant; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Setter; import net.runelite.api.Client; @@ -48,6 +49,7 @@ import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.ui.overlay.components.ProgressPieComponent; import net.runelite.client.util.ImageUtil; +@Singleton class FishingSpotOverlay extends Overlay { private static final Duration MINNOW_MOVE = Duration.ofSeconds(15); @@ -55,7 +57,6 @@ class FishingSpotOverlay extends Overlay private static final int ONE_TICK_AERIAL_FISHING = 3; private final FishingPlugin plugin; - private final FishingConfig config; private final Client client; private final ItemManager itemManager; @@ -63,12 +64,11 @@ class FishingSpotOverlay extends Overlay private boolean hidden; @Inject - private FishingSpotOverlay(FishingPlugin plugin, FishingConfig config, Client client, ItemManager itemManager) + private FishingSpotOverlay(final FishingPlugin plugin, final Client client, final ItemManager itemManager) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); this.plugin = plugin; - this.config = config; this.client = client; this.itemManager = itemManager; } @@ -90,14 +90,14 @@ class FishingSpotOverlay extends Overlay continue; } - if (config.onlyCurrentSpot() && plugin.getCurrentSpot() != null && plugin.getCurrentSpot() != spot) + if (plugin.isOnlyCurrentSpot() && plugin.getCurrentSpot() != null && plugin.getCurrentSpot() != spot) { continue; } Color color = npc.getSpotAnimation() == GraphicID.FLYING_FISH ? Color.RED : Color.CYAN; - if (spot == FishingSpot.MINNOW && config.showMinnowOverlay()) + if (spot == FishingSpot.MINNOW && plugin.isShowMinnowOverlay()) { MinnowSpot minnowSpot = plugin.getMinnowSpots().get(npc.getIndex()); if (minnowSpot != null) @@ -123,7 +123,7 @@ class FishingSpotOverlay extends Overlay } } - if (config.showSpotTiles()) + if (plugin.isShowSpotTiles()) { Polygon poly = npc.getCanvasTilePoly(); @@ -139,7 +139,7 @@ class FishingSpotOverlay extends Overlay } } - if (config.showSpotIcons()) + if (plugin.isShowSpotIcons()) { BufferedImage fishImage = itemManager.getImage(spot.getFishSpriteId()); @@ -159,7 +159,7 @@ class FishingSpotOverlay extends Overlay } } - if (config.showSpotNames()) + if (plugin.isShowSpotNames()) { String text = spot.getName(); Point textLocation = npc.getCanvasTextLocation(graphics, text, npc.getLogicalHeight() + 40); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java index 4c145ae303..811eca25bb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java @@ -35,38 +35,37 @@ import java.awt.Rectangle; import java.awt.geom.Line2D; import java.util.ArrayList; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; +@Singleton public class FlexoOverlay extends Overlay { - private static Rectangle clickArea; - - ArrayList clickAreas = new ArrayList<>(); - ArrayList clickPoints = new ArrayList<>(); + @Inject + private FlexoPlugin plugin; @Inject - private FlexoConfig config; - - @Inject - public FlexoOverlay(FlexoConfig config) + public FlexoOverlay(final FlexoPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); - this.config = config; + this.plugin = plugin; } @Override public Dimension render(Graphics2D graphics) { - if (config.getDebugNPCs() || config.getDebugGroundItems() || config.getDebugPlayers()) + if (!plugin.isOverlayEnabled()) { - if (clickArea != null) - { - graphics.draw(clickArea); - } + return null; + } + + if (plugin.isDebugNPCs() || plugin.isDebugGroundItems() || plugin.isDebugPlayers()) + { + ArrayList clickAreas = plugin.getClickAreas(); if (clickAreas != null) { for (Rectangle clickArea : clickAreas) @@ -77,6 +76,8 @@ public class FlexoOverlay extends Overlay } } } + + ArrayList clickPoints = plugin.getClickPoints(); if (clickPoints != null) { for (Point p : clickPoints) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java index ed49c53b91..e6587510ae 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java @@ -36,10 +36,13 @@ import com.github.joonasvali.naturalmouse.support.SinusoidalDeviationProvider; import com.github.joonasvali.naturalmouse.util.FlowTemplates; import com.google.inject.Provides; import java.awt.AWTException; +import java.awt.Point; import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; import javax.inject.Inject; +import lombok.AccessLevel; +import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.NPC; import net.runelite.api.Perspective; @@ -97,26 +100,52 @@ public class FlexoPlugin extends Plugin @Inject private FlexoOverlay overlay; + @Inject + private FlexoConfig config; + @Provides FlexoConfig getConfig(ConfigManager configManager) { return configManager.getConfig(FlexoConfig.class); } + @Getter(AccessLevel.PACKAGE) + private boolean overlayEnabled; + @Getter(AccessLevel.PACKAGE) + private boolean debugNPCs; + @Getter(AccessLevel.PACKAGE) + private boolean debugPlayers; + @Getter(AccessLevel.PACKAGE) + private boolean debugGroundItems; + private int minDelayAmt; + private int getReactionTimeVariation; + private int getMouseDragSpeed; + private int getOvershoots; + private boolean getVariatingFlow; + private boolean getSlowStartupFlow; + private boolean getSlowStartup2Flow; + private boolean getJaggedFlow; + private boolean getInterruptedFlow; + private boolean getInterruptedFlow2; + private boolean getStoppingFlow; + private int getDeviationSlope; + private String getNoisinessDivider; + private int scalingFactor; + + @Getter(AccessLevel.PACKAGE) + private ArrayList clickAreas = new ArrayList<>(); + @Getter(AccessLevel.PACKAGE) + private ArrayList clickPoints = new ArrayList<>(); + @Subscribe private void onConfigChanged(ConfigChanged event) { - if (event.getKey().compareTo("overlayEnabled") == 0) + if (!event.getGroup().equals("flexo") || (!event.getGroup().equals("stretchedmode")) ) { - if (getConfig(configManager).overlayEnabled()) - { - overlayManager.add(overlay); - } - else - { - overlayManager.remove(overlay); - } + return; } + + updateConfig(); updateMouseMotionFactory(); } @@ -132,12 +161,12 @@ public class FlexoPlugin extends Plugin { Flexo.clientUI = clientUI; } - overlay.clickAreas = new ArrayList<>(); - overlay.clickPoints = new ArrayList<>(); - if (getConfig(configManager).getDebugNPCs()) + this.clickAreas = new ArrayList<>(); + this.clickPoints = new ArrayList<>(); + if (this.debugNPCs) { Flexo.isStretched = client.isStretchedEnabled(); - Flexo.scale = configManager.getConfig(StretchedModeConfig.class).scalingFactor(); + Flexo.scale = this.scalingFactor; if (flexo != null) { for (NPC npc : client.getNpcs()) @@ -147,19 +176,19 @@ public class FlexoPlugin extends Plugin if (npc.getConvexHull() != null) { Rectangle r = FlexoMouse.getClickArea(npc.getConvexHull().getBounds()); - overlay.clickAreas.add(r); + this.clickAreas.add(r); java.awt.Point p = FlexoMouse.getClickPoint(r); - overlay.clickPoints.add(p); + this.clickPoints.add(p); } } } } } - if (getConfig(configManager).getDebugPlayers()) + if (this.debugPlayers) { Flexo.isStretched = client.isStretchedEnabled(); - Flexo.scale = configManager.getConfig(StretchedModeConfig.class).scalingFactor(); + Flexo.scale = this.scalingFactor; if (flexo != null) { for (Player player : client.getPlayers()) @@ -169,9 +198,9 @@ public class FlexoPlugin extends Plugin if (player.getConvexHull() != null) { Rectangle r = FlexoMouse.getClickArea(player.getConvexHull().getBounds()); - overlay.clickAreas.add(r); + this.clickAreas.add(r); java.awt.Point p = FlexoMouse.getClickPoint(r); - overlay.clickPoints.add(p); + this.clickPoints.add(p); } } } @@ -179,10 +208,10 @@ public class FlexoPlugin extends Plugin } // Could still use some improvement - if (getConfig(configManager).getDebugGroundItems()) + if (this.debugGroundItems) { Flexo.isStretched = client.isStretchedEnabled(); - Flexo.scale = configManager.getConfig(StretchedModeConfig.class).scalingFactor(); + Flexo.scale = this.scalingFactor; if (flexo != null) { @@ -200,9 +229,9 @@ public class FlexoPlugin extends Plugin Rectangle r1 = FlexoMouse.getClickArea(Perspective.getCanvasTilePoly(client, lp).getBounds()); Rectangle r2 = FlexoMouse.getClickArea(r1); Rectangle r3 = FlexoMouse.getClickArea(r2); - overlay.clickAreas.add(r3); + this.clickAreas.add(r3); java.awt.Point p = FlexoMouse.getClickPoint(r3); - overlay.clickPoints.add(p); + this.clickPoints.add(p); } } } @@ -214,7 +243,7 @@ public class FlexoPlugin extends Plugin private void updateMouseMotionFactory() { - Flexo.minDelay = getConfig(configManager).minDelayAmt(); + Flexo.minDelay = this.minDelayAmt; MouseMotionFactory factory = new MouseMotionFactory(); // TODO:Add Options for various flows to allow more personalization List flows = new ArrayList<>(); @@ -222,50 +251,50 @@ public class FlexoPlugin extends Plugin // Always add random flows.add(new Flow(FlowTemplates.random())); - if (getConfig(configManager).getVariatingFlow()) + if (this.getVariatingFlow) { flows.add(new Flow(FlowTemplates.variatingFlow())); } - if (getConfig(configManager).getSlowStartupFlow()) + if (this.getSlowStartupFlow) { flows.add(new Flow(FlowTemplates.slowStartupFlow())); } - if (getConfig(configManager).getSlowStartup2Flow()) + if (this.getSlowStartup2Flow) { flows.add(new Flow(FlowTemplates.slowStartup2Flow())); } - if (getConfig(configManager).getJaggedFlow()) + if (this.getJaggedFlow) { flows.add(new Flow(FlowTemplates.jaggedFlow())); } - if (getConfig(configManager).getInterruptedFlow()) + if (this.getInterruptedFlow) { flows.add(new Flow(FlowTemplates.interruptedFlow())); } - if (getConfig(configManager).getInterruptedFlow2()) + if (this.getInterruptedFlow2) { flows.add(new Flow(FlowTemplates.interruptedFlow2())); } - if (getConfig(configManager).getStoppingFlow()) + if (this.getStoppingFlow) { flows.add(new Flow(FlowTemplates.stoppingFlow())); } DefaultSpeedManager manager = new DefaultSpeedManager(flows); //TODO:Add options for custom Deviation Provider and Noise Provider - factory.setDeviationProvider(new SinusoidalDeviationProvider(getConfig(configManager).getDeviationSlope())); - factory.setNoiseProvider(new DefaultNoiseProvider(Double.valueOf(getConfig(configManager).getNoisinessDivider()))); - factory.getNature().setReactionTimeVariationMs(getConfig(configManager).getReactionTimeVariation()); - manager.setMouseMovementBaseTimeMs(getConfig(configManager).getMouseDragSpeed()); + factory.setDeviationProvider(new SinusoidalDeviationProvider(this.getDeviationSlope)); + factory.setNoiseProvider(new DefaultNoiseProvider(Double.valueOf(this.getNoisinessDivider))); + factory.getNature().setReactionTimeVariationMs(this.getReactionTimeVariation); + manager.setMouseMovementBaseTimeMs(this.getMouseDragSpeed); DefaultOvershootManager overshootManager = (DefaultOvershootManager) factory.getOvershootManager(); - overshootManager.setOvershoots(getConfig(configManager).getOvershoots()); + overshootManager.setOvershoots(this.getOvershoots); factory.setSpeedManager(manager); Flexo.currentMouseMotionFactory = factory; @@ -274,6 +303,8 @@ public class FlexoPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + Flexo.isStretched = client.isStretchedEnabled(); overlayManager.add(overlay); updateMouseMotionFactory(); @@ -284,4 +315,26 @@ public class FlexoPlugin extends Plugin { overlayManager.remove(overlay); } + + private void updateConfig() + { + this.overlayEnabled = config.overlayEnabled(); + this.debugNPCs = config.getDebugNPCs(); + this.debugPlayers = config.getDebugPlayers(); + this.debugGroundItems = config.getDebugGroundItems(); + this.minDelayAmt = config.minDelayAmt(); + this.getReactionTimeVariation = config.getReactionTimeVariation(); + this.getMouseDragSpeed = config.getMouseDragSpeed(); + this.getOvershoots = config.getOvershoots(); + this.getVariatingFlow = config.getVariatingFlow(); + this.getSlowStartupFlow = config.getSlowStartupFlow(); + this.getSlowStartup2Flow = config.getSlowStartup2Flow(); + this.getJaggedFlow = config.getJaggedFlow(); + this.getInterruptedFlow = config.getInterruptedFlow(); + this.getInterruptedFlow2 = config.getInterruptedFlow2(); + this.getStoppingFlow = config.getStoppingFlow(); + this.getDeviationSlope = config.getDeviationSlope(); + this.getNoisinessDivider = config.getNoisinessDivider(); + this.scalingFactor = configManager.getConfig(StretchedModeConfig.class).scalingFactor(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingOverlay.java index 1dfbc0bda0..a46289ad80 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingOverlay.java @@ -30,6 +30,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Perspective; import net.runelite.api.Point; @@ -40,12 +41,11 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.components.ProgressPieComponent; - +@Singleton public class FlinchingOverlay extends Overlay { private final Client client; private final FlinchingPlugin plugin; - private final FlinchingConfig config; private Color color; private Color borderColor; @@ -53,15 +53,14 @@ public class FlinchingOverlay extends Overlay private int overlaySize; @Inject - FlinchingOverlay(Client client, FlinchingPlugin plugin, FlinchingConfig config) + FlinchingOverlay(Client client, FlinchingPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); this.plugin = plugin; - this.config = config; this.client = client; - overlaySize = this.config.getFlinchOverlaySize(); + overlaySize = this.plugin.getFlinchOverlaySize(); } @Override @@ -73,10 +72,10 @@ public class FlinchingOverlay extends Overlay public void updateConfig() { - borderColor = config.getFlinchOverlayColor(); + borderColor = plugin.getFlinchOverlayColor(); color = new Color(borderColor.getRed(), borderColor.getGreen(), borderColor.getBlue(), 100); - overlaySize = config.getFlinchOverlaySize(); + overlaySize = plugin.getFlinchOverlaySize(); } private void drawOverlays(Graphics2D graphics) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java index bbe125e4f7..0ed62ecd06 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java @@ -25,10 +25,14 @@ package net.runelite.client.plugins.flinching; import com.google.inject.Provides; +import java.awt.Color; import java.util.HashMap; import java.util.Iterator; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Actor; import net.runelite.api.Client; @@ -49,6 +53,7 @@ import net.runelite.client.ui.overlay.OverlayManager; @Slf4j +@Singleton @PluginDescriptor( name = "Flinching Timer", description = "Time your attacks while flinching", @@ -79,6 +84,15 @@ public class FlinchingPlugin extends Plugin private boolean resetOnHit = true; private boolean resetOnHitReceived = true; + private int getFlinchAttackedDelay; + private int getFlinchDelay; + @Getter(AccessLevel.PACKAGE) + private int flinchOverlaySize; + @Getter(AccessLevel.PACKAGE) + private Color flinchOverlayColor; + private boolean getFlinchResetOnHit; + private boolean getFlinchResetOnHitReceived; + @Provides FlinchingConfig provideConfig(ConfigManager configManager) { @@ -88,11 +102,13 @@ public class FlinchingPlugin extends Plugin @Override protected void startUp() { + updateConfig(); + overlayManager.add(overlay); overlay.updateConfig(); - resetOnHit = config.getFlinchResetOnHit(); - resetOnHitReceived = config.getFlinchResetOnHitReceived(); + resetOnHit = this.getFlinchResetOnHit; + resetOnHitReceived = this.getFlinchResetOnHitReceived; ClearTargets(); } @@ -108,16 +124,18 @@ public class FlinchingPlugin extends Plugin { if (event.getGroup().equals("flinching")) { + updateConfig(); + overlay.updateConfig(); - resetOnHit = config.getFlinchResetOnHit(); - resetOnHitReceived = config.getFlinchResetOnHitReceived(); + resetOnHit = this.getFlinchResetOnHit; + resetOnHitReceived = this.getFlinchResetOnHitReceived; for (Map.Entry integerFlinchingTargetEntry : flinchingTargets.entrySet()) { FlinchingTarget target = integerFlinchingTargetEntry.getValue(); if (target != null) { - target.SetDelayTime(config.getFlinchDelay(), config.getFlinchAttackedDelay()); + target.SetDelayTime(this.getFlinchDelay, this.getFlinchAttackedDelay); } } } @@ -279,4 +297,14 @@ public class FlinchingPlugin extends Plugin { return (flinchingTargets); } + + private void updateConfig() + { + this.getFlinchAttackedDelay = config.getFlinchAttackedDelay(); + this.getFlinchDelay = config.getFlinchDelay(); + this.flinchOverlaySize = config.getFlinchOverlaySize(); + this.flinchOverlayColor = config.getFlinchOverlayColor(); + this.getFlinchResetOnHit = config.getFlinchResetOnHit(); + this.getFlinchResetOnHitReceived = config.getFlinchResetOnHitReceived(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java index 24c0aad399..58d90cb247 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.flinching; import java.time.Duration; import java.time.Instant; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.NPC; import net.runelite.api.coords.WorldPoint; @@ -42,11 +43,11 @@ public class FlinchingTarget public boolean isActive; - @Getter + @Getter(AccessLevel.PACKAGE) private int objectId; private NPC targetObject; - @Getter + @Getter(AccessLevel.PACKAGE) public WorldPoint worldLocation; FlinchingTarget(NPC target) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java index 671098a333..3fdd3f6925 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java @@ -59,7 +59,7 @@ public class FpsDrawListener implements Runnable private long sleepDelay = 0; @Inject - private FpsDrawListener(FpsConfig config, FpsPlugin plugin) + private FpsDrawListener(final FpsConfig config, final FpsPlugin plugin) { this.config = config; this.plugin = plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsOverlay.java index 110a447966..17afae61b6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsOverlay.java @@ -29,6 +29,7 @@ import java.awt.Dimension; import java.awt.FontMetrics; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Point; import net.runelite.api.Varbits; @@ -47,6 +48,7 @@ import net.runelite.client.ui.overlay.OverlayUtil; * This locks "FPS:" into one position (the far top right corner of the canvas), * along with a locked position for the FPS value. */ +@Singleton public class FpsOverlay extends Overlay { // Local dependencies @@ -57,7 +59,7 @@ public class FpsOverlay extends Overlay private boolean isFocused = true; @Inject - private FpsOverlay(FpsPlugin plugin, Client client) + private FpsOverlay(final FpsPlugin plugin, final Client client) { this.client = client; this.plugin = plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java index 2ef788fab8..686b09c152 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.fps; import com.google.inject.Inject; import com.google.inject.Provides; +import com.google.inject.Singleton; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; @@ -64,6 +65,7 @@ import net.runelite.client.util.ping.Ping; tags = {"frames", "framerate", "limit", "overlay", "ping"}, enabledByDefault = false ) +@Singleton public class FpsPlugin extends Plugin { static final String CONFIG_GROUP_KEY = "fpscontrol"; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FontStyle.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FontStyle.java index 47cbd82c69..c9921af410 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FontStyle.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FontStyle.java @@ -24,10 +24,11 @@ package net.runelite.client.plugins.freezetimers; import java.awt.Font; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -@Getter +@Getter(AccessLevel.PACKAGE) @AllArgsConstructor public enum FontStyle { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeInfo.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeInfo.java index 233c6710c0..2a5409cd4d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeInfo.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeInfo.java @@ -1,5 +1,6 @@ package net.runelite.client.plugins.freezetimers; +import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import net.runelite.api.Actor; @@ -8,8 +9,8 @@ import net.runelite.api.coords.LocalPoint; @Builder class FreezeInfo { - @Getter + @Getter(AccessLevel.PACKAGE) private final Actor actor; - @Getter + @Getter(AccessLevel.PACKAGE) private final LocalPoint freezePoint; } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java index 6842cd111d..fe43baae47 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java @@ -34,6 +34,7 @@ import java.awt.Graphics2D; import java.awt.Polygon; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Actor; import net.runelite.api.Client; import net.runelite.api.GraphicID; @@ -45,24 +46,22 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.util.ImageUtil; - +@Singleton public class FreezeTimersOverlay extends Overlay { - private final FreezeTimersConfig config; + private final FreezeTimersPlugin plugin; private final Client client; private final Font timerFont = FontManager.getRunescapeBoldFont().deriveFont(14.0f); private final BufferedImage FREEZE_IMAGE = ImageUtil.getResourceStreamFromClass(getClass(), "freeze.png"); private final BufferedImage TB_IMAGE = ImageUtil.getResourceStreamFromClass(getClass(), "teleblock.png"); private final BufferedImage VENG_IMAGE = ImageUtil.getResourceStreamFromClass(getClass(), "veng.png"); private Timers timers; - private boolean lock; - private long finishedAtTest; @Inject - public FreezeTimersOverlay(FreezeTimersConfig config, Client client, Timers timers) + public FreezeTimersOverlay(final FreezeTimersPlugin plugin, final Client client, final Timers timers) { - this.config = config; + this.plugin = plugin; this.client = client; this.timers = timers; setPriority(OverlayPriority.HIGHEST); @@ -73,11 +72,11 @@ public class FreezeTimersOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (config.showPlayers()) + if (plugin.isShowPlayers()) { client.getPlayers().forEach((p) -> renderOverlayFor(graphics, p)); } - if (config.showNpcs()) + if (plugin.isShowNpcs()) { client.getNpcs().forEach((npc) -> renderOverlayFor(graphics, npc)); } @@ -93,15 +92,15 @@ public class FreezeTimersOverlay extends Overlay int overlaysDrawn = 0; - if (drawFreezeOverlay(g, actor, overlaysDrawn) && config.FreezeTimers()) + if (drawFreezeOverlay(g, actor, overlaysDrawn) && plugin.isFreezeTimers()) { overlaysDrawn++; } - if (drawTBOverlay(g, actor, overlaysDrawn) && config.TB()) + if (drawTBOverlay(g, actor, overlaysDrawn) && plugin.isTB()) { overlaysDrawn++; } - if (drawVengOverlay(g, actor, overlaysDrawn) && config.Veng()) + if (drawVengOverlay(g, actor, overlaysDrawn) && plugin.isVeng()) { overlaysDrawn++; } @@ -127,15 +126,15 @@ public class FreezeTimersOverlay extends Overlay Point FixedPoint = new Point(poi.getX(), poi.getY()); - if (config.noImage()) + if (plugin.isNoImage()) { if (test > 3) { - OverlayUtil.renderTextLocation(g, text, config.textSize(), config.fontStyle().getFont(), Color.WHITE, FixedPoint, false, 0); + OverlayUtil.renderTextLocation(g, text, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.WHITE, FixedPoint, false, 0); } else { - OverlayUtil.renderTextLocation(g, text, config.textSize(), config.fontStyle().getFont(), Color.YELLOW, FixedPoint, false, 0); + OverlayUtil.renderTextLocation(g, text, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.YELLOW, FixedPoint, false, 0); } } else @@ -148,7 +147,7 @@ public class FreezeTimersOverlay extends Overlay private boolean drawTBOverlay(Graphics2D g, Actor actor, int overlaysDrawn) { long currentTick = System.currentTimeMillis(); - if (!config.TB()) + if (!plugin.isTB()) { return false; } @@ -167,19 +166,19 @@ public class FreezeTimersOverlay extends Overlay } Point FixedPoint = new Point(poi.getX() + 20, poi.getY()); - if (config.noImage()) + if (plugin.isNoImage()) { if (timers.getTimerEnd(actor, TimerType.FREEZE) <= currentTick) { - OverlayUtil.renderTextLocation(g, text, config.textSize(), config.fontStyle().getFont(), Color.CYAN, poi, false, 0); + OverlayUtil.renderTextLocation(g, text, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.CYAN, poi, false, 0); } if (timers.getTimerEnd(actor, TimerType.FREEZE) >= currentTick) { - OverlayUtil.renderTextLocation(g, " | " + text, config.textSize(), config.fontStyle().getFont(), Color.CYAN, FixedPoint, false, 0); + OverlayUtil.renderTextLocation(g, " | " + text, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.CYAN, FixedPoint, false, 0); } if (timers.getTimerEnd(actor, TimerType.VENG) >= currentTick) { - OverlayUtil.renderTextLocation(g, " | " + text, config.textSize(), config.fontStyle().getFont(), Color.CYAN, FixedPoint, false, 0); + OverlayUtil.renderTextLocation(g, " | " + text, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.CYAN, FixedPoint, false, 0); } } else @@ -192,7 +191,7 @@ public class FreezeTimersOverlay extends Overlay private boolean drawVengOverlay(Graphics2D g, Actor actor, int overlaysDrawn) { long currentTick = System.currentTimeMillis(); - if (!config.Veng()) + if (!plugin.isVeng()) { return false; } @@ -211,19 +210,19 @@ public class FreezeTimersOverlay extends Overlay } Point FixedPoint = new Point(poi.getX() - 20, poi.getY()); - if (config.noImage()) + if (plugin.isNoImage()) { if (timers.getTimerEnd(actor, TimerType.FREEZE) <= currentTick) { - OverlayUtil.renderTextLocation(g, text, config.textSize(), config.fontStyle().getFont(), Color.RED, poi, false, 0); + OverlayUtil.renderTextLocation(g, text, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.RED, poi, false, 0); } if (timers.getTimerEnd(actor, TimerType.FREEZE) >= currentTick) { - OverlayUtil.renderTextLocation(g, text + " | ", config.textSize(), config.fontStyle().getFont(), Color.RED, FixedPoint, false, 0); + OverlayUtil.renderTextLocation(g, text + " | ", plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.RED, FixedPoint, false, 0); } if (timers.getTimerEnd(actor, TimerType.TELEBLOCK) >= currentTick) { - OverlayUtil.renderTextLocation(g, text + " | ", config.textSize(), config.fontStyle().getFont(), Color.RED, FixedPoint, false, 0); + OverlayUtil.renderTextLocation(g, text + " | ", plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.RED, FixedPoint, false, 0); } } else @@ -253,7 +252,7 @@ public class FreezeTimersOverlay extends Overlay int yOffset = (overlaysDrawn * 18); g.setFont(timerFont); g.setColor(WHITE); - int xOffset = config.offset(); + int xOffset = plugin.getOffset(); renderActorTextAndImage(g, actor, text, Color.WHITE, image, yOffset, xOffset); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java index e66279aa4d..5769c33df1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java @@ -28,9 +28,13 @@ import com.google.inject.Provides; import java.util.HashMap; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; import net.runelite.api.Actor; import net.runelite.api.Client; import net.runelite.api.Player; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.SpotAnimationChanged; import net.runelite.api.events.PlayerDespawned; @@ -48,11 +52,10 @@ import net.runelite.client.ui.overlay.OverlayManager; type = PluginType.PVP, enabledByDefault = false ) - +@Singleton public class FreezeTimersPlugin extends Plugin { private final Map freezes = new HashMap<>(); - private Actor player; @Inject private Client client; @@ -69,8 +72,31 @@ public class FreezeTimersPlugin extends Plugin @Inject private FreezeTimersOverlay overlay; + @Inject + private FreezeTimersConfig config; + + @Getter(AccessLevel.PACKAGE) + private boolean showPlayers; + @Getter(AccessLevel.PACKAGE) + private boolean showNpcs; + @Getter(AccessLevel.PACKAGE) + private boolean FreezeTimers; + @Getter(AccessLevel.PACKAGE) + private boolean TB; + @Getter(AccessLevel.PACKAGE) + private boolean Veng; + @Getter(AccessLevel.PACKAGE) + private int offset; + @Getter(AccessLevel.PACKAGE) + private boolean noImage; + @Getter(AccessLevel.PACKAGE) + private FontStyle fontStyle; + @Getter(AccessLevel.PACKAGE) + private int textSize; + public void startUp() { + updateConfig(); overlayManager.add(overlay); } @@ -141,4 +167,26 @@ public class FreezeTimersPlugin extends Plugin freezes.remove(actor.getName()); } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (event.getGroup().equals("freezetimers")) + { + updateConfig(); + } + } + + private void updateConfig() + { + this.showPlayers = config.showPlayers(); + this.showNpcs = config.showNpcs(); + this.FreezeTimers = config.FreezeTimers(); + this.TB = config.TB(); + this.Veng = config.Veng(); + this.offset = config.offset(); + this.noImage = config.noImage(); + this.fontStyle = config.fontStyle(); + this.textSize = config.textSize(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PlayerSpellEffect.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PlayerSpellEffect.java index 7c8fbf80ce..bc95d19900 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PlayerSpellEffect.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PlayerSpellEffect.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.freezetimers; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; @@ -42,20 +43,20 @@ public enum PlayerSpellEffect VENG_OTHER("Vengeance Other", 725, 30000, false, 9, TimerType.VENG), NONE("Nothing", -69, 420, true, 9999, TimerType.THIS_SHIT_BROKE); - @Getter + @Getter(AccessLevel.PACKAGE) private final String name; - @Getter + @Getter(AccessLevel.PACKAGE) private final int spotAnimId; - @Getter + @Getter(AccessLevel.PACKAGE) private final int timerLengthTicks; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean halvable; - @Getter + @Getter(AccessLevel.PACKAGE) private final int spriteIdx; - @Getter + @Getter(AccessLevel.PACKAGE) private final TimerType type; - public static PlayerSpellEffect getFromSpotAnim(int spotAnim) + static PlayerSpellEffect getFromSpotAnim(int spotAnim) { for (PlayerSpellEffect effect : values()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java index 475cff14ad..05806a1c24 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java @@ -71,12 +71,12 @@ public class PrayerTracker newTick.get(actor).put("SpotAnim", actor.getSpotAnimation()); } - public int getPrayerIconLastTick(Actor p) + int getPrayerIconLastTick(Actor p) { return lastTick.getOrDefault(p, new HashMap<>()).getOrDefault("PrayerIcon", -1337); } - public int getSpotanimLastTick(Actor p) + int getSpotanimLastTick(Actor p) { return lastTick.getOrDefault(p, new HashMap<>()).getOrDefault("SpotAnim", -1337); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java index c74ab74c3d..0d58af3127 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java @@ -24,28 +24,22 @@ package net.runelite.client.plugins.freezetimers; import java.util.HashMap; -import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Actor; -import net.runelite.api.Client; @Slf4j @Singleton public class Timers { - - @Inject - private Client client; - private HashMap> timerMap = new HashMap<>(); - public void gameTick() + void gameTick() { } - public void setTimerEnd(Actor actor, TimerType type, long n) + void setTimerEnd(Actor actor, TimerType type, long n) { if (!timerMap.containsKey(actor)) { @@ -54,7 +48,7 @@ public class Timers timerMap.get(actor).put(type, n); } - public long getTimerEnd(Actor actor, TimerType type) + long getTimerEnd(Actor actor, TimerType type) { if (!timerMap.containsKey(actor)) { @@ -63,7 +57,7 @@ public class Timers return timerMap.get(actor).getOrDefault(type, (long) 0); } - public boolean areAllTimersZero(Actor actor) + boolean areAllTimersZero(Actor actor) { for (TimerType type : TimerType.values()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendlist/FriendListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendlist/FriendListPlugin.java index 355d9db46a..b98b68d7eb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendlist/FriendListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendlist/FriendListPlugin.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.friendlist; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.VarPlayer; import net.runelite.api.events.GameTick; @@ -39,6 +40,7 @@ import net.runelite.client.plugins.PluginDescriptor; name = "Friend List", description = "Add extra information to the friend and ignore lists" ) +@Singleton public class FriendListPlugin extends Plugin { private static final int MAX_FRIENDS_P2P = 400; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNoteOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNoteOverlay.java index 554a823573..acac979de6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNoteOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNoteOverlay.java @@ -30,11 +30,13 @@ package net.runelite.client.plugins.friendnotes; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.tooltip.Tooltip; import net.runelite.client.ui.overlay.tooltip.TooltipManager; +@Singleton class FriendNoteOverlay extends Overlay { private final Client client; @@ -42,7 +44,7 @@ class FriendNoteOverlay extends Overlay private final TooltipManager tooltipManager; @Inject - private FriendNoteOverlay(Client client, FriendNotesPlugin plugin, TooltipManager tooltipManager) + private FriendNoteOverlay(final Client client, final FriendNotesPlugin plugin, final TooltipManager tooltipManager) { this.client = client; this.plugin = plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java index fe27938a7e..75561cb114 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java @@ -32,6 +32,7 @@ import com.google.common.collect.ObjectArrays; import java.awt.Color; import javax.annotation.Nullable; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; @@ -58,6 +59,7 @@ import net.runelite.client.util.Text; name = "Friend Notes", description = "Store notes about your friends" ) +@Singleton public class FriendNotesPlugin extends Plugin { private static final String CONFIG_GROUP = "friendNotes"; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java index 99434bcffe..c4c088aab3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java @@ -18,6 +18,7 @@ import java.util.HashSet; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; @@ -52,7 +53,7 @@ import org.apache.commons.lang3.ArrayUtils; type = PluginType.UTILITY, enabledByDefault = false ) - +@Singleton public class FriendTaggingPlugin extends Plugin { public static final ConcurrentHashMap taggedFriends = new ConcurrentHashMap<>(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GLUtil.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GLUtil.java index 2629e81e4b..8c4bf270fc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GLUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GLUtil.java @@ -37,33 +37,33 @@ class GLUtil private static final int[] buf = new int[1]; private static final float[] fbuf = new float[1]; - static int glGetInteger(GL4 gl, int pname) + static int glGetInteger(GL4 gl) { - gl.glGetIntegerv(pname, buf, 0); + gl.glGetIntegerv(com.jogamp.opengl.GL.GL_MAX_SAMPLES, buf, 0); return buf[0]; } - static float glGetFloat(GL4 gl, int pname) + static float glGetFloat(GL4 gl) { - gl.glGetFloatv(pname, fbuf, 0); + gl.glGetFloatv(com.jogamp.opengl.GL.GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, fbuf, 0); return fbuf[0]; } - static int glGetShader(GL4 gl, int shader, int pname) + private static int glGetShader(GL4 gl, int shader) { - gl.glGetShaderiv(shader, pname, buf, 0); + gl.glGetShaderiv(shader, com.jogamp.opengl.GL2ES2.GL_COMPILE_STATUS, buf, 0); assert buf[0] > -1; return buf[0]; } - static int glGetProgram(GL4 gl, int program, int pname) + private static int glGetProgram(GL4 gl, int program, int pname) { gl.glGetProgramiv(program, pname, buf, 0); assert buf[0] > -1; return buf[0]; } - static String glGetShaderInfoLog(GL4 gl, int shader) + private static String glGetShaderInfoLog(GL4 gl, int shader) { byte[] err = new byte[ERR_LEN]; gl.glGetShaderInfoLog(shader, ERR_LEN, buf, 0, err, 0); @@ -192,7 +192,7 @@ class GLUtil gl.glShaderSource(shader, 1, new String[]{source}, null); gl.glCompileShader(shader); - if (glGetShader(gl, shader, gl.GL_COMPILE_STATUS) == gl.GL_TRUE) + if (glGetShader(gl, shader) == gl.GL_TRUE) { gl.glAttachShader(program, shader); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuFloatBuffer.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuFloatBuffer.java index a90d85a16d..a5901d65b2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuFloatBuffer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuFloatBuffer.java @@ -32,9 +32,9 @@ class GpuFloatBuffer { private FloatBuffer buffer = allocateDirect(65536); - void put(float texture, float u, float v, float pad) + void put(float texture, float u, float v) { - buffer.put(texture).put(u).put(v).put(pad); + buffer.put(texture).put(u).put(v).put((float) 0.0); } void flip() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuIntBuffer.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuIntBuffer.java index 15ea5461ad..bc85a230b0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuIntBuffer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuIntBuffer.java @@ -32,11 +32,6 @@ class GpuIntBuffer { private IntBuffer buffer = allocateDirect(65536); - void put(int x, int y, int z) - { - buffer.put(x).put(y).put(z); - } - void put(int x, int y, int z, int c) { buffer.put(x).put(y).put(z).put(c); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java index e437d3cbe9..272ff27c39 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java @@ -48,6 +48,7 @@ import java.nio.FloatBuffer; import java.nio.IntBuffer; import java.util.function.Function; import javax.inject.Inject; +import javax.inject.Singleton; import jogamp.nativewindow.SurfaceScaleUtils; import jogamp.nativewindow.jawt.x11.X11JAWTWindow; import jogamp.newt.awt.NewtFactoryAWT; @@ -65,6 +66,7 @@ import net.runelite.api.SceneTileModel; import net.runelite.api.SceneTilePaint; import net.runelite.api.Texture; import net.runelite.api.TextureProvider; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.hooks.DrawCallbacks; import net.runelite.client.callback.ClientThread; @@ -88,6 +90,7 @@ import net.runelite.client.util.OSType; tags = {"fog", "draw distance"} ) @Slf4j +@Singleton public class GpuPlugin extends Plugin implements DrawCallbacks { // This is the maximum number of triangles the compute shaders support @@ -227,9 +230,38 @@ public class GpuPlugin extends Plugin implements DrawCallbacks private int uniBlockMain; private int uniSmoothBanding; + private int drawDistance; + private boolean smoothBanding; + private AntiAliasingMode antiAliasingMode; + private AnisotropicFilteringMode anisotropicFilteringMode; + private int fogDepth; + private int fogCircularity; + private int fogDensity; + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (event.getGroup().equals("gpu")) + { + updateConfig(); + } + } + + private void updateConfig() + { + this.drawDistance = config.drawDistance(); + this.smoothBanding = config.smoothBanding(); + this.antiAliasingMode = config.antiAliasingMode(); + this.anisotropicFilteringMode = config.anisotropicFilteringMode(); + this.fogDepth = config.fogDepth(); + this.fogCircularity = config.fogCircularity(); + this.fogDensity = config.fogDensity(); + } + @Override protected void startUp() { + updateConfig(); clientThread.invoke(() -> { try @@ -704,7 +736,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks centerY = client.getCenterY(); final Scene scene = client.getScene(); - final int drawDistance = Math.max(0, Math.min(MAX_DISTANCE, config.drawDistance())); + final int drawDistance = Math.max(0, Math.min(MAX_DISTANCE, this.drawDistance)); scene.setDrawDistance(drawDistance); } @@ -794,7 +826,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks } // Setup anti-aliasing - final AntiAliasingMode antiAliasingMode = config.antiAliasingMode(); + final AntiAliasingMode antiAliasingMode = this.antiAliasingMode; final boolean aaEnabled = antiAliasingMode != AntiAliasingMode.DISABLED; if (aaEnabled) @@ -813,7 +845,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks { shutdownSceneFbo(); - final int maxSamples = glGetInteger(gl, gl.GL_MAX_SAMPLES); + final int maxSamples = glGetInteger(gl); final int samples = Math.min(antiAliasingMode.getSamples(), maxSamples); initSceneFbo(stretchedCanvasWidth, stretchedCanvasHeight, samples); @@ -977,8 +1009,8 @@ public class GpuPlugin extends Plugin implements DrawCallbacks int renderViewportWidth = viewportWidth; // Setup anisotropic filtering - final AnisotropicFilteringMode anisotropicFilteringMode = config.anisotropicFilteringMode(); - final boolean afEnabled = anisotropicFilteringMode != anisotropicFilteringMode.DISABLED; + final AnisotropicFilteringMode anisotropicFilteringMode = this.anisotropicFilteringMode; + final boolean afEnabled = anisotropicFilteringMode != AnisotropicFilteringMode.DISABLED; if (lastAnisotropicFilteringMode != anisotropicFilteringMode) { @@ -993,7 +1025,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks gl.glTexParameteri(gl.GL_TEXTURE_2D_ARRAY, gl.GL_TEXTURE_MIN_FILTER, gl.GL_LINEAR_MIPMAP_LINEAR); break; default: - final float maxSamples = glGetFloat(gl, gl.GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT); + final float maxSamples = glGetFloat(gl); final float samples = Math.min(anisotropicFilteringMode.getSamples(), maxSamples); gl.glTexParameteri(gl.GL_TEXTURE_2D_ARRAY, gl.GL_TEXTURE_MIN_FILTER, gl.GL_LINEAR_MIPMAP_LINEAR); gl.glTexParameterf(gl.GL_TEXTURE_2D_ARRAY, gl.GL_TEXTURE_MAX_ANISOTROPY_EXT, samples); @@ -1034,19 +1066,19 @@ public class GpuPlugin extends Plugin implements DrawCallbacks gl.glUseProgram(glProgram); - final int drawDistance = Math.max(0, Math.min(MAX_DISTANCE, config.drawDistance())); - final int fogDepth = config.fogDepth(); + final int drawDistance = Math.max(0, Math.min(MAX_DISTANCE, this.drawDistance)); + final int fogDepth = this.fogDepth; float effectiveDrawDistance = Perspective.LOCAL_TILE_SIZE * Math.min(Constants.SCENE_SIZE / 2, drawDistance); gl.glUniform1i(uniUseFog, fogDepth > 0 ? 1 : 0); gl.glUniform4f(uniFogColor, (sky >> 16 & 0xFF) / 255f, (sky >> 8 & 0xFF) / 255f, (sky & 0xFF) / 255f, 1f); - gl.glUniform1f(uniFogDepth, config.fogDepth() * 0.01f * effectiveDrawDistance); - gl.glUniform1f(uniFogCornerRadius, config.fogCircularity() * 0.01f * effectiveDrawDistance); - gl.glUniform1f(uniFogDensity, config.fogDensity() * 0.1f); + gl.glUniform1f(uniFogDepth, this.fogDepth * 0.01f * effectiveDrawDistance); + gl.glUniform1f(uniFogCornerRadius, this.fogCircularity * 0.01f * effectiveDrawDistance); + gl.glUniform1f(uniFogDensity, this.fogDensity * 0.1f); gl.glUniform1i(uniDrawDistance, drawDistance * Perspective.LOCAL_TILE_SIZE); // Brightness happens to also be stored in the texture provider, so we use that gl.glUniform1f(uniBrightness, (float) textureProvider.getBrightness()); - gl.glUniform1f(uniSmoothBanding, config.smoothBanding() ? 0f : 1f); + gl.glUniform1f(uniSmoothBanding, this.smoothBanding ? 0f : 1f); for (int id = 0; id < textures.length; ++id) { @@ -1303,7 +1335,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks /** * Check is a model is visible and should be drawn. */ - private boolean isVisible(Model model, int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int _x, int _y, int _z, long hash) + private boolean isNotVisible(Model model, int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int _x, int _y, int _z, long hash) { final int XYZMag = model.getXYZMag(); final int zoom = client.get3dZoom(); @@ -1334,12 +1366,12 @@ public class GpuPlugin extends Plugin implements DrawCallbacks { int var21 = (pitchCos * modelHeight >> 16) + var19; int var22 = (var18 - var21) * zoom; - return var22 / var14 < Rasterizer3D_clipMidY2; + return var22 / var14 >= Rasterizer3D_clipMidY2; } } } } - return false; + return true; } /** @@ -1367,7 +1399,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks model.calculateBoundsCylinder(); model.calculateExtreme(orientation); - if (!isVisible(model, orientation, pitchSin, pitchCos, yawSin, yawCos, x, y, z, hash)) + if (isNotVisible(model, orientation, pitchSin, pitchCos, yawSin, yawCos, x, y, z, hash)) { return; } @@ -1431,7 +1463,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks model.calculateBoundsCylinder(); model.calculateExtreme(orientation); - if (!isVisible(model, orientation, pitchSin, pitchCos, yawSin, yawCos, x, y, z, hash)) + if (isNotVisible(model, orientation, pitchSin, pitchCos, yawSin, yawCos, x, y, z, hash)) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java index cb7d283d69..056e32cc39 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java @@ -292,48 +292,34 @@ class SceneUploader vertexBuffer.ensureCapacity(24); uvBuffer.ensureCapacity(24); - // 0,0 - int vertexDx = localX; - int vertexDy = localY; - int vertexDz = swHeight; - final int c1 = swColor; - // 1,0 int vertexCx = localX + Perspective.LOCAL_TILE_SIZE; - int vertexCy = localY; - int vertexCz = seHeight; - final int c2 = seColor; // 1,1 int vertexAx = localX + Perspective.LOCAL_TILE_SIZE; int vertexAy = localY + Perspective.LOCAL_TILE_SIZE; - int vertexAz = neHeight; - final int c3 = neColor; // 0,1 - int vertexBx = localX; int vertexBy = localY + Perspective.LOCAL_TILE_SIZE; - int vertexBz = nwHeight; - final int c4 = nwColor; - vertexBuffer.put(vertexAx, vertexAz, vertexAy, c3); - vertexBuffer.put(vertexBx, vertexBz, vertexBy, c4); - vertexBuffer.put(vertexCx, vertexCz, vertexCy, c2); + vertexBuffer.put(vertexAx, neHeight, vertexAy, neColor); + vertexBuffer.put(localX, nwHeight, vertexBy, nwColor); + vertexBuffer.put(vertexCx, seHeight, localY, seColor); - vertexBuffer.put(vertexDx, vertexDz, vertexDy, c1); - vertexBuffer.put(vertexCx, vertexCz, vertexCy, c2); - vertexBuffer.put(vertexBx, vertexBz, vertexBy, c4); + vertexBuffer.put(localX, swHeight, localY, swColor); + vertexBuffer.put(vertexCx, seHeight, localY, seColor); + vertexBuffer.put(localX, nwHeight, vertexBy, nwColor); if (tile.getTexture() != -1) { float tex = tile.getTexture() + 1f; - uvBuffer.put(tex, 1.0f, 1.0f, 0f); - uvBuffer.put(tex, 0.0f, 1.0f, 0f); - uvBuffer.put(tex, 1.0f, 0.0f, 0f); + uvBuffer.put(tex, 1.0f, 1.0f); + uvBuffer.put(tex, 0.0f, 1.0f); + uvBuffer.put(tex, 1.0f, 0.0f); - uvBuffer.put(tex, 0.0f, 0.0f, 0f); - uvBuffer.put(tex, 1.0f, 0.0f, 0f); - uvBuffer.put(tex, 0.0f, 1.0f, 0f); + uvBuffer.put(tex, 0.0f, 0.0f); + uvBuffer.put(tex, 1.0f, 0.0f); + uvBuffer.put(tex, 0.0f, 1.0f); } return 6; @@ -399,15 +385,15 @@ class SceneUploader if (triangleTextures[i] != -1) { float tex = triangleTextures[i] + 1f; - uvBuffer.put(tex, vertexXA / 128f, vertexZA / 128f, 0f); - uvBuffer.put(tex, vertexXB / 128f, vertexZB / 128f, 0f); - uvBuffer.put(tex, vertexXC / 128f, vertexZC / 128f, 0f); + uvBuffer.put(tex, vertexXA / 128f, vertexZA / 128f); + uvBuffer.put(tex, vertexXB / 128f, vertexZB / 128f); + uvBuffer.put(tex, vertexXC / 128f, vertexZC / 128f); } else { - uvBuffer.put(0, 0, 0, 0f); - uvBuffer.put(0, 0, 0, 0f); - uvBuffer.put(0, 0, 0, 0f); + uvBuffer.put(0, 0, 0); + uvBuffer.put(0, 0, 0); + uvBuffer.put(0, 0, 0); } } } @@ -537,9 +523,9 @@ class SceneUploader if (faceTextures != null) { - uvBuffer.put(0, 0, 0, 0f); - uvBuffer.put(0, 0, 0, 0f); - uvBuffer.put(0, 0, 0, 0f); + uvBuffer.put(0, 0, 0); + uvBuffer.put(0, 0, 0); + uvBuffer.put(0, 0, 0); } return 3; } @@ -572,15 +558,15 @@ class SceneUploader if (u != null && v != null && (uf = u[face]) != null && (vf = v[face]) != null) { float texture = faceTextures[face] + 1f; - uvBuffer.put(texture, uf[0], vf[0], 0f); - uvBuffer.put(texture, uf[1], vf[1], 0f); - uvBuffer.put(texture, uf[2], vf[2], 0f); + uvBuffer.put(texture, uf[0], vf[0]); + uvBuffer.put(texture, uf[1], vf[1]); + uvBuffer.put(texture, uf[2], vf[2]); } else { - uvBuffer.put(0f, 0f, 0f, 0f); - uvBuffer.put(0f, 0f, 0f, 0f); - uvBuffer.put(0f, 0f, 0f, 0f); + uvBuffer.put(0f, 0f, 0f); + uvBuffer.put(0f, 0f, 0f); + uvBuffer.put(0f, 0f, 0f); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeInputListener.java index c2533d59e4..56cc228a6e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeInputListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeInputListener.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.grandexchange; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import javax.inject.Inject; +import javax.inject.Singleton; import javax.swing.SwingUtilities; import net.runelite.api.Client; import net.runelite.api.MenuEntry; @@ -35,13 +36,14 @@ import net.runelite.client.input.MouseAdapter; import static net.runelite.client.plugins.grandexchange.GrandExchangePlugin.SEARCH_GRAND_EXCHANGE; import net.runelite.client.util.Text; +@Singleton public class GrandExchangeInputListener extends MouseAdapter implements KeyListener { private final Client client; private final GrandExchangePlugin plugin; @Inject - private GrandExchangeInputListener(Client client, GrandExchangePlugin plugin) + private GrandExchangeInputListener(final Client client, final GrandExchangePlugin plugin) { this.client = client; this.plugin = plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java index 9c93d47b0f..c60130e94c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java @@ -35,6 +35,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.List; +import javax.inject.Singleton; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.border.CompoundBorder; @@ -48,6 +49,7 @@ import net.runelite.client.util.StackFormatter; * This panel displays an individual item result in the * Grand Exchange search plugin. */ +@Singleton class GrandExchangeItemPanel extends JPanel { private static final Dimension ICON_SIZE = new Dimension(32, 32); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java index 0f2f75b0de..e311fdc9e1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java @@ -37,6 +37,7 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.image.BufferedImage; import javax.annotation.Nullable; +import javax.inject.Singleton; import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.JPanel; @@ -54,7 +55,8 @@ import net.runelite.client.util.ColorUtil; import net.runelite.client.util.ImageUtil; import net.runelite.client.util.StackFormatter; -public class GrandExchangeOfferSlot extends JPanel +@Singleton +class GrandExchangeOfferSlot extends JPanel { private static final String FACE_CARD = "FACE_CARD"; private static final String DETAILS_CARD = "DETAILS_CARD"; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOffersPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOffersPanel.java index 0531651a56..b58e28cbac 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOffersPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOffersPanel.java @@ -30,6 +30,7 @@ import java.awt.CardLayout; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.image.BufferedImage; +import javax.inject.Singleton; import javax.swing.JPanel; import javax.swing.border.EmptyBorder; import net.runelite.api.GrandExchangeOffer; @@ -38,7 +39,8 @@ import net.runelite.api.ItemDefinition; import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.components.PluginErrorPanel; -public class GrandExchangeOffersPanel extends JPanel +@Singleton +class GrandExchangeOffersPanel extends JPanel { private static final String ERROR_PANEL = "ERROR_PANEL"; private static final String OFFERS_PANEL = "OFFERS_PANEL"; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePanel.java index 68e18cecc0..2544ad2c07 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePanel.java @@ -30,8 +30,10 @@ import java.awt.BorderLayout; import java.util.Map; import java.util.concurrent.ScheduledExecutorService; import javax.inject.Inject; +import javax.inject.Singleton; import javax.swing.JPanel; import javax.swing.border.EmptyBorder; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.callback.ClientThread; import net.runelite.client.game.ItemManager; @@ -40,6 +42,7 @@ import net.runelite.client.ui.PluginPanel; import net.runelite.client.ui.components.materialtabs.MaterialTab; import net.runelite.client.ui.components.materialtabs.MaterialTabGroup; +@Singleton class GrandExchangePanel extends PluginPanel { @@ -49,9 +52,9 @@ class GrandExchangePanel extends PluginPanel private final MaterialTabGroup tabGroup = new MaterialTabGroup(display); private final MaterialTab searchTab; - @Getter + @Getter(AccessLevel.PACKAGE) private GrandExchangeSearchPanel searchPanel; - @Getter + @Getter(AccessLevel.PACKAGE) private GrandExchangeOffersPanel offersPanel; @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java index 1cec9f64f1..4ce28688b9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java @@ -37,6 +37,7 @@ import java.io.InputStreamReader; import java.util.Map; import java.util.concurrent.ScheduledExecutorService; import javax.inject.Inject; +import javax.inject.Singleton; import javax.swing.SwingUtilities; import lombok.AccessLevel; import lombok.Getter; @@ -90,6 +91,7 @@ import net.runelite.http.api.osbuddy.OSBGrandExchangeResult; tags = {"external", "integration", "notifications", "panel", "prices", "trade"} ) @Slf4j +@Singleton public class GrandExchangePlugin extends Plugin { private static final int OFFER_CONTAINER_ITEM = 21; @@ -174,6 +176,11 @@ public class GrandExchangePlugin extends Plugin configManager.unsetConfiguration("geoffer." + client.getUsername().toLowerCase(), Integer.toString(slot)); } + private boolean quickLookup; + private boolean enableNotifications; + private boolean enableOsbPrices; + private boolean enableGELimits; + @Provides GrandExchangeConfig provideConfig(ConfigManager configManager) { @@ -183,6 +190,8 @@ public class GrandExchangePlugin extends Plugin @Override protected void startUp() { + updateConfig(); + itemGELimits = loadGELimits(); panel = injector.getInstance(GrandExchangePanel.class); panel.setGELimits(itemGELimits); @@ -198,7 +207,7 @@ public class GrandExchangePlugin extends Plugin clientToolbar.addNavigation(button); - if (config.quickLookup()) + if (this.quickLookup) { mouseManager.registerMouseListener(inputListener); keyManager.registerKeyListener(inputListener); @@ -237,6 +246,14 @@ public class GrandExchangePlugin extends Plugin } } + private void updateConfig() + { + this.quickLookup = config.quickLookup(); + this.enableNotifications = config.enableNotifications(); + this.enableOsbPrices = config.enableOsbPrices(); + this.enableGELimits = config.enableGELimits(); + } + @Subscribe public void onSessionClose(SessionClose sessionClose) { @@ -248,9 +265,10 @@ public class GrandExchangePlugin extends Plugin { if (event.getGroup().equals("grandexchange")) { + updateConfig(); if (event.getKey().equals("quickLookup")) { - if (config.quickLookup()) + if (this.quickLookup) { mouseManager.registerMouseListener(inputListener); keyManager.registerKeyListener(inputListener); @@ -345,7 +363,7 @@ public class GrandExchangePlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (!this.config.enableNotifications() || event.getType() != ChatMessageType.GAMEMESSAGE) + if (!this.enableNotifications || event.getType() != ChatMessageType.GAMEMESSAGE) { return; } @@ -490,7 +508,7 @@ public class GrandExchangePlugin extends Plugin return; } - if (config.enableGELimits() && itemGELimits != null && !geTextString.contains(BUY_LIMIT_GE_TEXT)) + if (this.enableGELimits && itemGELimits != null && !geTextString.contains(BUY_LIMIT_GE_TEXT)) { final Integer itemLimit = itemGELimits.get(itemId); @@ -502,7 +520,7 @@ public class GrandExchangePlugin extends Plugin } } - if (!config.enableOsbPrices() || geTextString.contains(OSB_GE_TEXT)) + if (!this.enableOsbPrices || geTextString.contains(OSB_GE_TEXT)) { // OSB prices are disabled or price was already looked up, so no need to set it again return; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java index b5443be68d..d8d88e3933 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java @@ -36,10 +36,12 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledExecutorService; +import javax.inject.Singleton; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.SwingUtilities; import javax.swing.border.EmptyBorder; +import lombok.AccessLevel; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.ItemDefinition; @@ -56,6 +58,7 @@ import net.runelite.http.api.item.ItemPrice; * It should display a search bar and either item results or a error panel. */ @Slf4j +@Singleton class GrandExchangeSearchPanel extends JPanel { private static final String ERROR_PANEL = "ERROR_PANEL"; @@ -82,10 +85,10 @@ class GrandExchangeSearchPanel extends JPanel private final List itemsList = new ArrayList<>(); - @Setter + @Setter(AccessLevel.PACKAGE) private Map itemGELimits = Collections.emptyMap(); - GrandExchangeSearchPanel(ClientThread clientThread, ItemManager itemManager, ScheduledExecutorService executor) + GrandExchangeSearchPanel(final ClientThread clientThread, final ItemManager itemManager, final ScheduledExecutorService executor) { this.clientThread = clientThread; this.itemManager = itemManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/DuskAttack.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/DuskAttack.java index ece52fe62e..afe3107282 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/DuskAttack.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/DuskAttack.java @@ -34,7 +34,7 @@ public enum DuskAttack private final int animation; private final Prayer prayer; - DuskAttack(int animation, Prayer prayer) + DuskAttack(final int animation, final Prayer prayer) { this.animation = animation; this.prayer = prayer; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java index 0c02d79b92..ed8602718b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java @@ -29,6 +29,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Polygon; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.GraphicsObject; import net.runelite.api.Perspective; @@ -40,6 +41,7 @@ import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.ui.overlay.components.TextComponent; +@Singleton class GrotesqueGuardiansOverlay extends Overlay { private static final int GROTESQUE_GUARDIANS_REGION_ID = 6727; @@ -51,7 +53,7 @@ class GrotesqueGuardiansOverlay extends Overlay private static final int GROTESQUE_GUARDIANS_STONE_ORB = 160; @Inject - private GrotesqueGuardiansOverlay(Client client, GrotesqueGuardiansPlugin plugin) + private GrotesqueGuardiansOverlay(final Client client, final GrotesqueGuardiansPlugin plugin) { this.client = client; this.plugin = plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java index 77332e3c93..1ef158830f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.grotesqueguardians; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; @@ -46,7 +47,7 @@ import static net.runelite.api.NpcID.DUSK_7888; type = PluginType.PVM, enabledByDefault = false ) - +@Singleton public class GrotesqueGuardiansPlugin extends Plugin { private static final int GARGOYLES_REGION = 6727; @@ -93,7 +94,7 @@ public class GrotesqueGuardiansPlugin extends Plugin @Subscribe public void onGameTick(final GameTick event) { - final ArrayList regions = new ArrayList(); + final ArrayList regions = new ArrayList<>(); for (final int intValue : client.getMapRegions()) { regions.add(intValue); @@ -126,14 +127,7 @@ public class GrotesqueGuardiansPlugin extends Plugin { prayAgainst = null; } - if (dusk.getAnimation() == 7802) - { - needingToRun = true; - } - else - { - needingToRun = false; - } + needingToRun = dusk.getAnimation() == 7802; } } else diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java index c63c0845da..1de4b29640 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java @@ -30,6 +30,7 @@ import java.awt.Graphics2D; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.NPC; import net.runelite.api.Perspective; @@ -43,6 +44,7 @@ import net.runelite.client.ui.overlay.components.ComponentConstants; import net.runelite.client.ui.overlay.components.ImageComponent; import net.runelite.client.ui.overlay.components.PanelComponent; +@Singleton public class GrotesqueGuardiansPrayerOverlay extends Overlay { private static final Color NOT_ACTIVATED_BACKGROUND_COLOR = new Color(150, 0, 0, 150); @@ -52,7 +54,7 @@ public class GrotesqueGuardiansPrayerOverlay extends Overlay private final PanelComponent imagePanelComponent = new PanelComponent(); @Inject - private GrotesqueGuardiansPrayerOverlay(Client client, GrotesqueGuardiansPlugin plugin, SpriteManager spriteManager) + private GrotesqueGuardiansPrayerOverlay(final Client client, final GrotesqueGuardiansPlugin plugin, final SpriteManager spriteManager) { setLayer(OverlayLayer.ABOVE_SCENE); setPriority(OverlayPriority.HIGH); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java index da6c3a80c5..4badf41ef4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java @@ -30,10 +30,12 @@ import java.awt.event.MouseEvent; import java.time.Duration; import java.time.Instant; import javax.inject.Inject; +import javax.inject.Singleton; import javax.swing.SwingUtilities; import net.runelite.client.input.KeyListener; import net.runelite.client.input.MouseAdapter; +@Singleton public class GroundItemInputListener extends MouseAdapter implements KeyListener { private static final int HOTKEY = KeyEvent.VK_ALT; @@ -43,9 +45,6 @@ public class GroundItemInputListener extends MouseAdapter implements KeyListener @Inject private GroundItemsPlugin plugin; - @Inject - private GroundItemsConfig config; - @Override public void keyTyped(KeyEvent e) { @@ -63,7 +62,7 @@ public class GroundItemInputListener extends MouseAdapter implements KeyListener plugin.setHotKeyPressed(true); lastPress = null; } - else if (lastPress != null && !plugin.isHotKeyPressed() && config.doubleTapDelay() > 0 && Duration.between(lastPress, Instant.now()).compareTo(Duration.ofMillis(config.doubleTapDelay())) < 0) + else if (lastPress != null && !plugin.isHotKeyPressed() && plugin.getDoubleTapDelay() > 0 && Duration.between(lastPress, Instant.now()).compareTo(Duration.ofMillis(plugin.getDoubleTapDelay())) < 0) { plugin.setHideAll(true); lastPress = null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java index f9ce93dad6..14ff283672 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java @@ -41,6 +41,7 @@ import java.util.Map; import java.util.List; import java.util.Comparator; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Perspective; import net.runelite.api.Player; @@ -60,6 +61,7 @@ import net.runelite.client.ui.overlay.components.ProgressPieComponent; import net.runelite.client.ui.overlay.components.TextComponent; import net.runelite.client.util.StackFormatter; +@Singleton public class GroundItemsOverlay extends Overlay { private static final int MAX_DISTANCE = 2500; @@ -83,7 +85,6 @@ public class GroundItemsOverlay extends Overlay private final Client client; private final GroundItemsPlugin plugin; - private final GroundItemsConfig config; private final StringBuilder itemStringBuilder = new StringBuilder(); private final BackgroundComponent backgroundComponent = new BackgroundComponent(); private final TextComponent textComponent = new TextComponent(); @@ -91,21 +92,20 @@ public class GroundItemsOverlay extends Overlay private final Map offsetMap = new HashMap<>(); @Inject - private GroundItemsOverlay(Client client, GroundItemsPlugin plugin, GroundItemsConfig config) + private GroundItemsOverlay(final Client client, final GroundItemsPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); this.client = client; this.plugin = plugin; - this.config = config; } @Override public Dimension render(Graphics2D graphics) { - final boolean dontShowOverlay = (config.itemHighlightMode() == MENU || plugin.isHideAll()) && !plugin.isHotKeyPressed(); + final boolean dontShowOverlay = (plugin.getItemHighlightMode() == MENU || plugin.isHideAll()) && !plugin.isHotKeyPressed(); - if (dontShowOverlay && !config.highlightTiles()) + if (dontShowOverlay && !plugin.isHighlightTiles()) { return null; } @@ -177,13 +177,13 @@ public class GroundItemsOverlay extends Overlay plugin.setHiddenBoxBounds(null); plugin.setHighlightBoxBounds(null); - final boolean onlyShowLoot = config.onlyShowLoot(); + final boolean onlyShowLoot = plugin.isOnlyShowLoot(); List groundItemListAsList = new ArrayList<>(groundItemList); // make a copy so we can non-destructively modify the list Comparator compareByHaPrice = Comparator.comparingInt(GroundItem::getHaPrice); Comparator compareByGePrice = Comparator.comparingInt(GroundItem::getGePrice); - groundItemListAsList.sort(config.sortByGEPrice() ? compareByGePrice : compareByHaPrice); + groundItemListAsList.sort(plugin.isSortByGEPrice() ? compareByGePrice : compareByHaPrice); for (GroundItem item : groundItemListAsList) { @@ -207,7 +207,7 @@ public class GroundItemsOverlay extends Overlay } // Do not display non-highlighted items - if (config.showHighlightedOnly()) + if (plugin.isShowHighlightedOnly()) { continue; } @@ -215,7 +215,7 @@ public class GroundItemsOverlay extends Overlay final Color color = plugin.getItemColor(highlighted, hidden); - if (config.highlightTiles()) + if (plugin.isHighlightTiles()) { final Polygon poly = Perspective.getCanvasTilePoly(client, groundPoint); @@ -246,7 +246,7 @@ public class GroundItemsOverlay extends Overlay } } - if (config.priceDisplayMode() == PriceDisplayMode.BOTH) + if (plugin.getPriceDisplayMode() == PriceDisplayMode.BOTH) { if (item.getGePrice() > 0) { @@ -262,9 +262,9 @@ public class GroundItemsOverlay extends Overlay .append(" gp)"); } } - else if (config.priceDisplayMode() != PriceDisplayMode.OFF) + else if (plugin.getPriceDisplayMode() != PriceDisplayMode.OFF) { - final int price = config.priceDisplayMode() == PriceDisplayMode.GE + final int price = plugin.getPriceDisplayMode() == PriceDisplayMode.GE ? item.getGePrice() : item.getHaPrice(); @@ -277,7 +277,7 @@ public class GroundItemsOverlay extends Overlay } } - if (item.getTicks() > 0 && config.showTimer()) + if (item.getTicks() > 0 && plugin.isShowTimer()) { itemStringBuilder .append(" - ") @@ -368,15 +368,15 @@ public class GroundItemsOverlay extends Overlay drawRectangle(graphics, itemHighlightBox, topItem && mouseInHighlightBox ? Color.GREEN : color, highlighted != null, false); } - if (config.showGroundItemDuration() == TimerDisplayMode.ALWAYS - || (config.showGroundItemDuration() == TimerDisplayMode.HOTKEY_PRESSED && plugin.isHotKeyPressed())) + if (plugin.getShowGroundItemDuration() == TimerDisplayMode.ALWAYS + || (plugin.getShowGroundItemDuration() == TimerDisplayMode.HOTKEY_PRESSED && plugin.isHotKeyPressed())) { drawTimerOverlay(graphics, new java.awt.Point(textX, textY), item); } - if (config.toggleOutline()) + if (plugin.isToggleOutline()) { - final Color bordercolor = config.bordercolor(); + final Color bordercolor = plugin.getBordercolor(); graphics.setColor(bordercolor); graphics.drawString(itemString, textX + 1, textY + 1); graphics.drawString(itemString, textX - 1, textY - 1); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java index 0754a4616f..f2e70b9fdc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java @@ -46,6 +46,7 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; @@ -82,11 +83,14 @@ import net.runelite.client.input.KeyManager; import net.runelite.client.input.MouseManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.grounditems.config.ItemHighlightMode; import static net.runelite.client.plugins.grounditems.config.ItemHighlightMode.OVERLAY; import net.runelite.client.plugins.grounditems.config.MenuHighlightMode; import static net.runelite.client.plugins.grounditems.config.MenuHighlightMode.BOTH; import static net.runelite.client.plugins.grounditems.config.MenuHighlightMode.NAME; import static net.runelite.client.plugins.grounditems.config.MenuHighlightMode.OPTION; +import net.runelite.client.plugins.grounditems.config.PriceDisplayMode; +import net.runelite.client.plugins.grounditems.config.TimerDisplayMode; import net.runelite.client.plugins.grounditems.config.ValueCalculationMode; import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.util.ColorUtil; @@ -98,6 +102,7 @@ import net.runelite.client.util.Text; description = "Highlight ground items and/or show price information", tags = {"grand", "exchange", "high", "alchemy", "prices", "highlight", "overlay"} ) +@Singleton public class GroundItemsPlugin extends Plugin { // ItemID for coins @@ -175,12 +180,63 @@ public class GroundItemsPlugin extends Plugin @Inject private Notifier notifier; - @Getter + @Getter(AccessLevel.PUBLIC) public static final Map collectedGroundItems = new LinkedHashMap<>(); private final Map priceChecks = new LinkedHashMap<>(); private LoadingCache highlightedItems; private LoadingCache hiddenItems; + private Color defaultColor; + private Color highlightedColor; + private Color hiddenColor; + private String getHighlightItems; + @Getter(AccessLevel.PACKAGE) + private boolean showHighlightedOnly; + private ValueCalculationMode valueCalculationMode; + private int getHighlightOverValue; + private boolean notifyHighlightedDrops; + private boolean dontHideUntradeables; + private String getHiddenItems; + private boolean recolorMenuHiddenItems; + private int getHideUnderValue; + private boolean removeIgnored; + private boolean rightClickHidden; + @Getter(AccessLevel.PACKAGE) + private boolean highlightTiles; + @Getter(AccessLevel.PACKAGE) + private ItemHighlightMode itemHighlightMode; + private MenuHighlightMode menuHighlightMode; + private Color lowValueColor; + private int lowValuePrice; + private boolean notifyLowValueDrops; + private Color mediumValueColor; + private int mediumValuePrice; + private boolean notifyMediumValueDrops; + private Color highValueColor; + private int highValuePrice; + private boolean notifyHighValueDrops; + private Color insaneValueColor; + private int insaneValuePrice; + private boolean notifyInsaneValueDrops; + @Getter(AccessLevel.PACKAGE) + private PriceDisplayMode priceDisplayMode; + @Getter(AccessLevel.PACKAGE) + private boolean sortByGEPrice; + private boolean showMenuItemQuantities; + private boolean collapseEntries; + @Getter(AccessLevel.PACKAGE) + private boolean onlyShowLoot; + @Getter(AccessLevel.PACKAGE) + private TimerDisplayMode showGroundItemDuration; + @Getter(AccessLevel.PACKAGE) + private int doubleTapDelay; + @Getter(AccessLevel.PACKAGE) + private boolean toggleOutline; + @Getter(AccessLevel.PACKAGE) + private boolean showTimer; + @Getter(AccessLevel.PACKAGE) + private Color bordercolor; + @Provides GroundItemsConfig provideConfig(ConfigManager configManager) { @@ -190,6 +246,7 @@ public class GroundItemsPlugin extends Plugin @Override protected void startUp() { + updateConfig(); overlayManager.add(overlay); reset(); mouseManager.registerMouseListener(inputListener); @@ -226,6 +283,7 @@ public class GroundItemsPlugin extends Plugin { if (event.getGroup().equals("grounditems")) { + updateConfig(); reset(); } } @@ -254,12 +312,12 @@ public class GroundItemsPlugin extends Plugin existing.setQuantity(existing.getQuantity() + groundItem.getQuantity()); } - boolean shouldNotify = !config.onlyShowLoot() && config.highlightedColor().equals(getHighlighted( + boolean shouldNotify = !this.onlyShowLoot && this.highlightedColor.equals(getHighlighted( groundItem.getName(), groundItem.getGePrice(), groundItem.getHaPrice())); - if (config.notifyHighlightedDrops() && shouldNotify) + if (this.notifyHighlightedDrops && shouldNotify) { notifyHighlightedItem(groundItem); } @@ -340,23 +398,23 @@ public class GroundItemsPlugin extends Plugin Color itemColor = getHighlighted(composition.getName(), itemManager.getItemPrice(is.getId()) * is.getQuantity(), itemManager.getAlchValue(is.getId()) * is.getQuantity()); if (itemColor != null) { - if (config.notifyHighlightedDrops() && itemColor.equals(config.highlightedColor())) + if (this.notifyHighlightedDrops && itemColor.equals(this.highlightedColor)) { sendLootNotification(composition.getName(), "highlighted"); } - else if (config.notifyLowValueDrops() && itemColor.equals(config.lowValueColor())) + else if (this.notifyLowValueDrops && itemColor.equals(this.lowValueColor)) { sendLootNotification(composition.getName(), "low value"); } - else if (config.notifyMediumValueDrops() && itemColor.equals(config.mediumValueColor())) + else if (this.notifyMediumValueDrops && itemColor.equals(this.mediumValueColor)) { sendLootNotification(composition.getName(), "medium value"); } - else if (config.notifyHighValueDrops() && itemColor.equals(config.highValueColor())) + else if (this.notifyHighValueDrops && itemColor.equals(this.highValueColor)) { sendLootNotification(composition.getName(), "high value"); } - else if (config.notifyInsaneValueDrops() && itemColor.equals(config.insaneValueColor())) + else if (this.notifyInsaneValueDrops && itemColor.equals(this.insaneValueColor)) { sendLootNotification(composition.getName(), "insane value"); } @@ -382,7 +440,7 @@ public class GroundItemsPlugin extends Plugin { MenuEntry menuEntry = menuEntries[i]; - if (config.collapseEntries()) + if (this.collapseEntries) { int menuType = menuEntry.getType(); if (menuType == FIRST_OPTION || menuType == SECOND_OPTION || menuType == THIRD_OPTION @@ -427,7 +485,7 @@ public class GroundItemsPlugin extends Plugin final int bQuantity = getCollapsedItemQuantity(bId, bEntry.getTarget()); // only put items below walk if the config is set for it - if (config.rightClickHidden()) + if (this.rightClickHidden) { if (aHidden && bMenuType == WALK) return -1; @@ -442,8 +500,8 @@ public class GroundItemsPlugin extends Plugin return 1; - // RS sorts by alch price by default, so no need to sort if config not set - if (config.sortByGEPrice()) + // RS sorts by alch price by private, so no need to sort if config not set + if (this.sortByGEPrice) return (getGePriceFromItemId(aId) * aQuantity) - (getGePriceFromItemId(bId) * bQuantity); } } @@ -455,7 +513,7 @@ public class GroundItemsPlugin extends Plugin { final MenuEntry entry = e.getEntry(); - if (config.collapseEntries()) + if (this.collapseEntries) { final int count = e.getCount(); if (count > 1) @@ -480,12 +538,12 @@ public class GroundItemsPlugin extends Plugin groundItem.setMine(true); groundItem.setTicks(200); - boolean shouldNotify = config.onlyShowLoot() && config.highlightedColor().equals(getHighlighted( + boolean shouldNotify = this.onlyShowLoot && this.highlightedColor.equals(getHighlighted( groundItem.getName(), groundItem.getGePrice(), groundItem.getHaPrice())); - if (config.notifyHighlightedDrops() && shouldNotify) + if (this.notifyHighlightedDrops && shouldNotify) { notifyHighlightedItem(groundItem); } @@ -555,10 +613,10 @@ public class GroundItemsPlugin extends Plugin private void reset() { // gets the hidden items from the text box in the config - hiddenItemList = Text.fromCSV(config.getHiddenItems()); + hiddenItemList = Text.fromCSV(this.getHiddenItems); // gets the highlighted items from the text box in the config - highlightedItemsList = Text.fromCSV(config.getHighlightItems()); + highlightedItemsList = Text.fromCSV(this.getHighlightItems); highlightedItems = CacheBuilder.newBuilder() .maximumSize(512L) @@ -573,36 +631,36 @@ public class GroundItemsPlugin extends Plugin // Cache colors priceChecks.clear(); - if (config.insaneValuePrice() > 0) + if (this.insaneValuePrice > 0) { - priceChecks.put(config.insaneValuePrice(), config.insaneValueColor()); + priceChecks.put(this.insaneValuePrice, this.insaneValueColor); } - if (config.highValuePrice() > 0) + if (this.highValuePrice > 0) { - priceChecks.put(config.highValuePrice(), config.highValueColor()); + priceChecks.put(this.highValuePrice, this.highValueColor); } - if (config.mediumValuePrice() > 0) + if (this.mediumValuePrice > 0) { - priceChecks.put(config.mediumValuePrice(), config.mediumValueColor()); + priceChecks.put(this.mediumValuePrice, this.mediumValueColor); } - if (config.lowValuePrice() > 0) + if (this.lowValuePrice > 0) { - priceChecks.put(config.lowValuePrice(), config.lowValueColor()); + priceChecks.put(this.lowValuePrice, this.lowValueColor); } - if (config.getHighlightOverValue() > 0) + if (this.getHighlightOverValue > 0) { - priceChecks.put(config.getHighlightOverValue(), config.highlightedColor()); + priceChecks.put(this.getHighlightOverValue, this.highlightedColor); } } @Subscribe public void onMenuEntryAdded(MenuEntryAdded event) { - if (config.itemHighlightMode() != OVERLAY + if (this.itemHighlightMode != OVERLAY && event.getOption().equals("Take") && event.getIdentifier() == THIRD_OPTION) { @@ -641,11 +699,11 @@ public class GroundItemsPlugin extends Plugin final Color hidden = getHidden(itemComposition.getName(), gePrice, haPrice, itemComposition.isTradeable()); final Color highlighted = getHighlighted(itemComposition.getName(), gePrice, haPrice); final Color color = getItemColor(highlighted, hidden); - final boolean canBeRecolored = highlighted != null || (hidden != null && config.recolorMenuHiddenItems()); + final boolean canBeRecolored = highlighted != null || (hidden != null && this.recolorMenuHiddenItems); - if (color != null && canBeRecolored && !color.equals(config.defaultColor())) + if (color != null && canBeRecolored && !color.equals(this.defaultColor)) { - final MenuHighlightMode mode = config.menuHighlightMode(); + final MenuHighlightMode mode = this.menuHighlightMode; if (mode == BOTH || mode == OPTION) { @@ -659,12 +717,12 @@ public class GroundItemsPlugin extends Plugin } } - if (config.showMenuItemQuantities() && itemComposition.isStackable() && quantity > 1) + if (this.showMenuItemQuantities && itemComposition.isStackable() && quantity > 1) { lastEntry.setTarget(lastEntry.getTarget() + " (" + quantity + ")"); } - if (config.removeIgnored() && event.getOption().equals("Take") && hiddenItemList.contains(Text.removeTags(event.getTarget()))) + if (this.removeIgnored && event.getOption().equals("Take") && hiddenItemList.contains(Text.removeTags(event.getTarget()))) { menuEntries = removeOption(event.getOption(), event.getTarget()); } @@ -718,14 +776,16 @@ public class GroundItemsPlugin extends Plugin } config.setHiddenItems(Text.toCSV(hiddenItemSet)); + this.getHiddenItems = Text.toCSV(hiddenItemSet); config.setHighlightedItem(Text.toCSV(highlightedItemSet)); + this.getHighlightItems = Text.toCSV(highlightedItemSet); } Color getHighlighted(String item, int gePrice, int haPrice) { if (TRUE.equals(highlightedItems.getUnchecked(item))) { - return config.highlightedColor(); + return this.highlightedColor; } // Explicit hide takes priority over implicit highlight @@ -734,7 +794,7 @@ public class GroundItemsPlugin extends Plugin return null; } - ValueCalculationMode mode = config.valueCalculationMode(); + ValueCalculationMode mode = this.valueCalculationMode; for (Map.Entry entry : priceChecks.entrySet()) { switch (mode) @@ -767,13 +827,13 @@ public class GroundItemsPlugin extends Plugin { final boolean isExplicitHidden = TRUE.equals(hiddenItems.getUnchecked(item)); final boolean isExplicitHighlight = TRUE.equals(highlightedItems.getUnchecked(item)); - final boolean canBeHidden = gePrice > 0 || isTradeable || !config.dontHideUntradeables(); - final boolean underGe = gePrice < config.getHideUnderValue(); - final boolean underHa = haPrice < config.getHideUnderValue(); + final boolean canBeHidden = gePrice > 0 || isTradeable || !this.dontHideUntradeables; + final boolean underGe = gePrice < this.getHideUnderValue; + final boolean underHa = haPrice < this.getHideUnderValue; // Explicit highlight takes priority over implicit hide return isExplicitHidden || (!isExplicitHighlight && canBeHidden && underGe && underHa) - ? config.hiddenColor() + ? this.hiddenColor : null; } @@ -827,7 +887,7 @@ public class GroundItemsPlugin extends Plugin return hidden; } - return config.defaultColor(); + return this.defaultColor; } @Subscribe @@ -868,4 +928,47 @@ public class GroundItemsPlugin extends Plugin notificationStringBuilder.append("!"); notifier.notify(notificationStringBuilder.toString()); } + + private void updateConfig() + { + this.defaultColor = config.defaultColor(); + this.highlightedColor = config.highlightedColor(); + this.hiddenColor = config.hiddenColor(); + this.getHighlightItems = config.getHighlightItems(); + this.showHighlightedOnly = config.showHighlightedOnly(); + this.valueCalculationMode = config.valueCalculationMode(); + this.getHighlightOverValue = config.getHighlightOverValue(); + this.notifyHighlightedDrops = config.notifyHighlightedDrops(); + this.dontHideUntradeables = config.dontHideUntradeables(); + this.getHiddenItems = config.getHiddenItems(); + this.recolorMenuHiddenItems = config.recolorMenuHiddenItems(); + this.getHideUnderValue = config.getHideUnderValue(); + this.removeIgnored = config.removeIgnored(); + this.rightClickHidden = config.rightClickHidden(); + this.highlightTiles = config.highlightTiles(); + this.itemHighlightMode = config.itemHighlightMode(); + this.menuHighlightMode = config.menuHighlightMode(); + this.lowValueColor = config.lowValueColor(); + this.lowValuePrice = config.lowValuePrice(); + this.notifyLowValueDrops = config.notifyLowValueDrops(); + this.mediumValueColor = config.mediumValueColor(); + this.mediumValuePrice = config.mediumValuePrice(); + this.notifyMediumValueDrops = config.notifyMediumValueDrops(); + this.highValueColor = config.highValueColor(); + this.highValuePrice = config.highValuePrice(); + this.notifyHighValueDrops = config.notifyHighValueDrops(); + this.insaneValueColor = config.insaneValueColor(); + this.insaneValuePrice = config.insaneValuePrice(); + this.notifyInsaneValueDrops = config.notifyInsaneValueDrops(); + this.priceDisplayMode = config.priceDisplayMode(); + this.sortByGEPrice = config.sortByGEPrice(); + this.showMenuItemQuantities = config.showMenuItemQuantities(); + this.collapseEntries = config.collapseEntries(); + this.onlyShowLoot = config.onlyShowLoot(); + this.showGroundItemDuration = config.showGroundItemDuration(); + this.doubleTapDelay = config.doubleTapDelay(); + this.toggleOutline = config.toggleOutline(); + this.showTimer = config.showTimer(); + this.bordercolor = config.bordercolor(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/MenuEntryWithCount.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/MenuEntryWithCount.java index a8539921c0..172bbc94ee 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/MenuEntryWithCount.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/MenuEntryWithCount.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.grounditems; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import net.runelite.api.MenuEntry; @@ -31,10 +32,10 @@ import net.runelite.api.MenuEntry; @RequiredArgsConstructor class MenuEntryWithCount { - @Getter + @Getter(AccessLevel.PACKAGE) private final MenuEntry entry; - @Getter + @Getter(AccessLevel.PACKAGE) private int count = 1; void increment() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/WildcardMatchLoader.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/WildcardMatchLoader.java index 7b91067ba4..0aeea2e1dd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/WildcardMatchLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/WildcardMatchLoader.java @@ -34,7 +34,7 @@ class WildcardMatchLoader extends CacheLoader { private final List nameFilters; - WildcardMatchLoader(List nameFilters) + WildcardMatchLoader(final List nameFilters) { this.nameFilters = nameFilters; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerInputListener.java index a097d47d29..6a92bb0e99 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerInputListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerInputListener.java @@ -27,8 +27,10 @@ package net.runelite.client.plugins.groundmarkers; import java.awt.event.KeyEvent; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.client.input.KeyListener; +@Singleton public class GroundMarkerInputListener implements KeyListener { private static final int HOTKEY = KeyEvent.VK_SHIFT; @@ -36,7 +38,7 @@ public class GroundMarkerInputListener implements KeyListener private final GroundMarkerPlugin plugin; @Inject - private GroundMarkerInputListener(GroundMarkerPlugin plugin) + private GroundMarkerInputListener(final GroundMarkerPlugin plugin) { this.plugin = plugin; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerMinimapOverlay.java index 4e53a7d966..b4c3b21d75 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerMinimapOverlay.java @@ -30,6 +30,7 @@ import java.awt.Graphics2D; import static java.lang.Math.floor; import java.util.List; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Perspective; import net.runelite.api.Point; @@ -41,6 +42,7 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton class GroundMarkerMinimapOverlay extends Overlay { private static final int MAX_DRAW_DISTANCE = 16; @@ -48,14 +50,12 @@ class GroundMarkerMinimapOverlay extends Overlay private static final int TILE_HEIGHT = 4; private final Client client; - private final GroundMarkerConfig config; private final GroundMarkerPlugin plugin; @Inject - private GroundMarkerMinimapOverlay(Client client, GroundMarkerConfig config, GroundMarkerPlugin plugin) + private GroundMarkerMinimapOverlay(final Client client, final GroundMarkerPlugin plugin) { this.client = client; - this.config = config; this.plugin = plugin; setPosition(OverlayPosition.DYNAMIC); setPriority(OverlayPriority.LOW); @@ -65,7 +65,7 @@ class GroundMarkerMinimapOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (!config.showMinimap()) + if (!plugin.isShowMinimap()) { return null; } @@ -79,20 +79,20 @@ class GroundMarkerMinimapOverlay extends Overlay continue; } - Color color = config.markerColor(); + Color color = plugin.getMarkerColor(); switch (point.getGroundMarkerPoint().getGroup()) { case 2: - color = config.markerColor2(); + color = plugin.getMarkerColor2(); break; case 3: - color = config.markerColor3(); + color = plugin.getMarkerColor3(); break; case 4: - color = config.markerColor4(); + color = plugin.getMarkerColor4(); } - int opacity = (int) floor(config.minimapOverlayOpacity() * 2.55); + int opacity = (int) floor(plugin.getMinimapOverlayOpacity() * 2.55); Color tileColor = new Color(color.getRed(), color.getGreen(), color.getBlue(), opacity); drawOnMinimap(graphics, worldPoint, tileColor); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerOverlay.java index 0d11dbf4a9..cb9b3c2eba 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerOverlay.java @@ -31,6 +31,7 @@ import java.awt.Graphics2D; import java.awt.Polygon; import java.util.List; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Perspective; import net.runelite.api.coords.LocalPoint; @@ -41,17 +42,16 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton public class GroundMarkerOverlay extends Overlay { private final Client client; - private final GroundMarkerConfig config; private final GroundMarkerPlugin plugin; @Inject - private GroundMarkerOverlay(Client client, GroundMarkerConfig config, GroundMarkerPlugin plugin) + private GroundMarkerOverlay(final Client client, final GroundMarkerPlugin plugin) { this.client = client; - this.config = config; this.plugin = plugin; setPosition(OverlayPosition.DYNAMIC); setPriority(OverlayPriority.LOW); @@ -78,8 +78,6 @@ public class GroundMarkerOverlay extends Overlay return; } - WorldPoint playerLocation = client.getLocalPlayer().getWorldLocation(); - LocalPoint lp = LocalPoint.fromWorld(client, point); if (lp == null) { @@ -92,17 +90,17 @@ public class GroundMarkerOverlay extends Overlay return; } - Color color = config.markerColor(); + Color color = plugin.getMarkerColor(); switch (groundMarkerWorldPoint.getGroundMarkerPoint().getGroup()) { case 2: - color = config.markerColor2(); + color = plugin.getMarkerColor2(); break; case 3: - color = config.markerColor3(); + color = plugin.getMarkerColor3(); break; case 4: - color = config.markerColor4(); + color = plugin.getMarkerColor4(); } OverlayUtil.renderPolygon(graphics, poly, color); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java index 400b01bd52..2566142be8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java @@ -39,6 +39,7 @@ import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; @@ -51,6 +52,7 @@ import net.runelite.api.MenuEntry; import net.runelite.api.Tile; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldPoint; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.FocusChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.MenuEntryAdded; @@ -70,6 +72,7 @@ import net.runelite.client.util.Text; description = "Enable marking of tiles using the Shift key", tags = {"overlay", "tiles"} ) +@Singleton public class GroundMarkerPlugin extends Plugin { private static final String CONFIG_GROUP = "groundMarker"; @@ -138,6 +141,19 @@ public class GroundMarkerPlugin extends Plugin { } + @Getter(AccessLevel.PACKAGE) + private Color markerColor; + @Getter(AccessLevel.PACKAGE) + private Color markerColor2; + @Getter(AccessLevel.PACKAGE) + private Color markerColor3; + @Getter(AccessLevel.PACKAGE) + private Color markerColor4; + @Getter(AccessLevel.PACKAGE) + private boolean showMinimap; + @Getter(AccessLevel.PACKAGE) + private int minimapOverlayOpacity; + @Provides GroundMarkerConfig provideConfig(ConfigManager configManager) { @@ -348,13 +364,15 @@ public class GroundMarkerPlugin extends Plugin @Override protected void shutDown() { + updateConfig(); + overlayManager.remove(overlay); overlayManager.remove(minimapOverlay); keyManager.unregisterKeyListener(inputListener); points.clear(); } - protected void markTile(LocalPoint localPoint, int group) + private void markTile(LocalPoint localPoint, int group) { if (localPoint == null) { @@ -390,19 +408,38 @@ public class GroundMarkerPlugin extends Plugin private Color getColor(int group) { - Color color = config.markerColor(); + Color color = this.markerColor; switch (group) { case 2: - color = config.markerColor2(); + color = this.markerColor2; break; case 3: - color = config.markerColor3(); + color = this.markerColor3; break; case 4: - color = config.markerColor4(); + color = this.markerColor4; } return color; } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (event.getGroup().equals("groundMarker")) + { + updateConfig(); + } + } + + private void updateConfig() + { + this.markerColor = config.markerColor(); + this.markerColor2 = config.markerColor2(); + this.markerColor3 = config.markerColor3(); + this.markerColor4 = config.markerColor4(); + this.showMinimap = config.showMinimap(); + this.minimapOverlayOpacity = config.minimapOverlayOpacity(); + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPoint.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPoint.java index e287f44efe..1d4e987862 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPoint.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPoint.java @@ -26,31 +26,16 @@ package net.runelite.client.plugins.groundmarkers; +import lombok.EqualsAndHashCode; import lombok.Value; @Value -public class GroundMarkerPoint +@EqualsAndHashCode(exclude = { "group" }) +class GroundMarkerPoint { private int regionId; private int regionX; private int regionY; private int z; private int group; - - @Override - public String toString() - { - return "GroundMarkerPoint(regionId=" + regionId + ",regionX=" + regionX + ",=regionY" + regionY + ",z=" + z + ")"; - } - - @Override - public boolean equals(Object o) - { - if (!(o instanceof GroundMarkerPoint)) - { - return false; - } - - return o.toString().equals(this.toString()); - } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerWorldPoint.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerWorldPoint.java index 9ea9915459..57234eeca0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerWorldPoint.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerWorldPoint.java @@ -28,7 +28,7 @@ import lombok.Value; import net.runelite.api.coords.WorldPoint; @Value -public class GroundMarkerWorldPoint +class GroundMarkerWorldPoint { private GroundMarkerPoint groundMarkerPoint; private WorldPoint worldPoint; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarMinimapOverlay.java index fff22cbc39..8e05236ea3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarMinimapOverlay.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.herbiboars; import com.google.inject.Inject; +import com.google.inject.Singleton; import java.awt.Dimension; import java.awt.Graphics2D; import java.util.Set; @@ -34,25 +35,23 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; - +@Singleton public class HerbiboarMinimapOverlay extends Overlay { private final HerbiboarPlugin plugin; - private final HerbiboarConfig config; @Inject - public HerbiboarMinimapOverlay(HerbiboarPlugin plugin, HerbiboarConfig config) + public HerbiboarMinimapOverlay(final HerbiboarPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); this.plugin = plugin; - this.config = config; } @Override public Dimension render(Graphics2D graphics) { - if (config.isTrailShown() && plugin.isInHerbiboarArea()) + if (plugin.isTrailShown() && plugin.isInHerbiboarArea()) { HerbiboarTrail currentTrail = plugin.getCurrentTrail(); int finishId = plugin.getFinishId(); @@ -70,7 +69,7 @@ public class HerbiboarMinimapOverlay extends Overlay if (shownTrailIds.contains(id) && (finishId > 0 || (currentTrail != null && currentTrail.getTrailId() != id && currentTrail.getTrailId() + 1 != id))) { - OverlayUtil.renderMinimapLocation(graphics, minimapLocation, config.getTrailColor()); + OverlayUtil.renderMinimapLocation(graphics, minimapLocation, plugin.getGetTrailColor()); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java index 653228cdb3..ad79b5b9e2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.herbiboars; import com.google.inject.Inject; +import com.google.inject.Singleton; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; @@ -37,18 +38,17 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton class HerbiboarOverlay extends Overlay { private final HerbiboarPlugin plugin; - private final HerbiboarConfig config; @Inject - public HerbiboarOverlay(HerbiboarPlugin plugin, HerbiboarConfig config) + public HerbiboarOverlay(final HerbiboarPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); this.plugin = plugin; - this.config = config; } @Override @@ -64,16 +64,14 @@ class HerbiboarOverlay extends Overlay int finishId = plugin.getFinishId(); // Draw start objects - if (config.isStartShown() && (currentTrail == null && finishId == 0)) + if (plugin.isStartShown() && (currentTrail == null && finishId == 0)) { plugin.getStarts().values().forEach((obj) -> - { - OverlayUtil.renderTileOverlay(graphics, obj, "", config.getStartColor()); - }); + OverlayUtil.renderTileOverlay(graphics, obj, "", plugin.getGetStartColor())); } // Draw trails - if (config.isTrailShown()) + if (plugin.isTrailShown()) { Set shownTrailIds = plugin.getShownTrails(); plugin.getTrails().values().forEach((x) -> @@ -81,13 +79,13 @@ class HerbiboarOverlay extends Overlay int id = x.getId(); if (shownTrailIds.contains(id) && (finishId > 0 || (currentTrail != null && currentTrail.getTrailId() != id && currentTrail.getTrailId() + 1 != id))) { - OverlayUtil.renderTileOverlay(graphics, x, "", config.getTrailColor()); + OverlayUtil.renderTileOverlay(graphics, x, "", plugin.getGetTrailColor()); } }); } // Draw trail objects (mushrooms, mud, etc) - if (config.isObjectShown() && currentTrail != null) + if (plugin.isObjectShown() && currentTrail != null) { int currentPath = plugin.getCurrentPath(); WorldPoint[] trailLocs = currentTrail.getObjectLocs(currentPath); @@ -101,12 +99,12 @@ class HerbiboarOverlay extends Overlay TileObject object = plugin.getTrailObjects().get(trailLoc); if (object != null) { - if (config.showClickBoxes()) + if (plugin.isShowClickBoxes()) { Area clickbox = object.getClickbox(); if (clickbox != null) { - graphics.setColor(config.getObjectColor()); + graphics.setColor(plugin.getGetObjectColor()); graphics.draw(clickbox); graphics.setColor(new Color(255, 0, 255, 20)); graphics.fill(clickbox); @@ -114,25 +112,25 @@ class HerbiboarOverlay extends Overlay } else { - OverlayUtil.renderTileOverlay(graphics, object, "", config.getObjectColor()); + OverlayUtil.renderTileOverlay(graphics, object, "", plugin.getGetObjectColor()); } } } } // Draw finish tunnels - if (config.isTunnelShown() && finishId > 0) + if (plugin.isTunnelShown() && finishId > 0) { WorldPoint finishLoc = plugin.getEndLocations().get(finishId - 1); TileObject object = plugin.getTunnels().get(finishLoc); if (object != null) { - if (config.showClickBoxes()) + if (plugin.isShowClickBoxes()) { Area clickbox = object.getClickbox(); if (clickbox != null) { - Color col = config.getObjectColor(); + Color col = plugin.getGetObjectColor(); graphics.setColor(col); graphics.draw(clickbox); graphics.setColor(new Color(col.getRed(), col.getGreen(), col.getBlue(), 20)); @@ -141,7 +139,7 @@ class HerbiboarOverlay extends Overlay } else { - OverlayUtil.renderTileOverlay(graphics, object, "", config.getTunnelColor()); + OverlayUtil.renderTileOverlay(graphics, object, "", plugin.getGetTunnelColor()); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java index b921bb5495..cc6dc7258d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.herbiboars; import com.google.inject.Provides; +import java.awt.Color; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; @@ -32,6 +33,8 @@ import java.util.List; import java.util.Map; import java.util.Set; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import net.runelite.api.Client; @@ -44,6 +47,7 @@ import net.runelite.api.Tile; import net.runelite.api.TileObject; import net.runelite.api.Varbits; import net.runelite.api.coords.WorldPoint; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameObjectChanged; import net.runelite.api.events.GameObjectDespawned; import net.runelite.api.events.GameObjectSpawned; @@ -63,6 +67,7 @@ import net.runelite.client.ui.overlay.OverlayManager; description = "Highlight starting rocks, trails, and the objects to search at the end of each trail", tags = {"herblore", "hunter", "skilling", "overlay"} ) +@Singleton public class HerbiboarPlugin extends Plugin { private static final List END_LOCATIONS = Arrays.asList( @@ -104,37 +109,59 @@ public class HerbiboarPlugin extends Plugin @Inject private HerbiboarMinimapOverlay minimapOverlay; - @Getter + @Inject + private HerbiboarConfig config; + + @Getter(AccessLevel.PACKAGE) private boolean inHerbiboarArea; - @Getter + @Getter(AccessLevel.PACKAGE) private Map trails = new HashMap<>(); - @Getter + @Getter(AccessLevel.PACKAGE) private Map tunnels = new HashMap<>(); - @Getter + @Getter(AccessLevel.PACKAGE) private Map starts = new HashMap<>(); - @Getter + @Getter(AccessLevel.PACKAGE) private Map trailObjects = new HashMap<>(); - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private Set shownTrails = new HashSet<>(); - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private HerbiboarTrail currentTrail; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private int currentPath; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private int finishId; + @Getter(AccessLevel.PACKAGE) + private boolean isStartShown; + @Getter(AccessLevel.PACKAGE) + private boolean showClickBoxes; + @Getter(AccessLevel.PACKAGE) + private Color getStartColor; + @Getter(AccessLevel.PACKAGE) + private boolean isTunnelShown; + @Getter(AccessLevel.PACKAGE) + private Color getTunnelColor; + @Getter(AccessLevel.PACKAGE) + private boolean isObjectShown; + @Getter(AccessLevel.PACKAGE) + private Color getObjectColor; + @Getter(AccessLevel.PACKAGE) + private boolean isTrailShown; + @Getter(AccessLevel.PACKAGE) + private Color getTrailColor; + @Provides HerbiboarConfig getConfig(ConfigManager configManager) { @@ -144,6 +171,8 @@ public class HerbiboarPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(overlay); overlayManager.add(minimapOverlay); inHerbiboarArea = checkArea(); @@ -260,19 +289,19 @@ public class HerbiboarPlugin extends Plugin @Subscribe public void onGroundObjectSpawned(GroundObjectSpawned event) { - onGroundObject(event.getTile(), null, event.getGroundObject()); + onGroundObject( null, event.getGroundObject()); } @Subscribe public void onGroundObjectChanged(GroundObjectChanged event) { - onGroundObject(event.getTile(), event.getPrevious(), event.getGroundObject()); + onGroundObject(event.getPrevious(), event.getGroundObject()); } @Subscribe public void onGroundObjectDespawned(GroundObjectDespawned event) { - onGroundObject(event.getTile(), event.getGroundObject(), null); + onGroundObject(event.getGroundObject(), null); } // Store relevant GameObjects (starts, objects used to trigger next trails, and some tunnels) @@ -313,7 +342,7 @@ public class HerbiboarPlugin extends Plugin } // Store relevant GroundObjects (tracks on trails, and some tunnels) - private void onGroundObject(Tile tile, TileObject oldObject, TileObject newObject) + private void onGroundObject(TileObject oldObject, TileObject newObject) { if (oldObject != null) { @@ -348,8 +377,30 @@ public class HerbiboarPlugin extends Plugin .toArray().length > 0; } - public List getEndLocations() + List getEndLocations() { return END_LOCATIONS; } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (event.getGroup().equals("herbiboar")) + { + updateConfig(); + } + } + + private void updateConfig() + { + this.isStartShown = config.isStartShown(); + this.showClickBoxes = config.showClickBoxes(); + this.getStartColor = config.getStartColor(); + this.isTunnelShown = config.isTunnelShown(); + this.getTunnelColor = config.getTunnelColor(); + this.isObjectShown = config.isObjectShown(); + this.getObjectColor = config.getObjectColor(); + this.isTrailShown = config.isTrailShown(); + this.getTrailColor = config.getTrailColor(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java index 15ae602352..0fb87507c7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java @@ -33,6 +33,7 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.HashTable; @@ -50,7 +51,16 @@ import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; +import net.runelite.client.plugins.hideprayers.util.Armadyl; +import net.runelite.client.plugins.hideprayers.util.Bandos; +import net.runelite.client.plugins.hideprayers.util.Barrows; +import net.runelite.client.plugins.hideprayers.util.Cerberus; +import net.runelite.client.plugins.hideprayers.util.PVPPrayers; import net.runelite.client.plugins.hideprayers.util.PrayerTabStates; +import net.runelite.client.plugins.hideprayers.util.Saradomin; +import net.runelite.client.plugins.hideprayers.util.Vorkath; +import net.runelite.client.plugins.hideprayers.util.Zamorak; +import net.runelite.client.plugins.hideprayers.util.Zulrah; @PluginDescriptor( name = "Show/Hide Prayers", @@ -58,7 +68,7 @@ import net.runelite.client.plugins.hideprayers.util.PrayerTabStates; type = PluginType.UTILITY, enabledByDefault = false ) - +@Singleton public class HidePrayersPlugin extends Plugin { private static final List PRAYER_WIDGET_INFO_LIST = ImmutableList.of( @@ -99,6 +109,56 @@ public class HidePrayersPlugin extends Plugin @Inject private HidePrayersConfig config; + private boolean showindividualprayers; + private boolean ShowTHICK_SKIN; + private boolean ShowBURST_OF_STRENGTH; + private boolean ShowCLARITY_OF_THOUGHT; + private boolean ShowSHARP_EYE; + private boolean ShowMYSTIC_WILL; + private boolean ShowROCK_SKIN; + private boolean ShowSUPERHUMAN_STRENGTH; + private boolean ShowIMPROVED_REFLEXES; + private boolean ShowRapidRestore; + private boolean ShowRapidHeal; + private boolean ShowProtectItem; + private boolean ShowHAWK_EYE; + private boolean ShowMYSTIC_LORE; + private boolean ShowSteelSkin; + private boolean ShowUltimateStrength; + private boolean ShowIncredibleReflex; + private boolean ShowPTFMagic; + private boolean ShowPTFRange; + private boolean ShowPTFMelee; + private boolean ShowEagle; + private boolean ShowMystic; + private boolean ShowRETRIBUTION; + private boolean ShowRedemption; + private boolean ShowSmite; + private boolean ShowPreserve; + private boolean ShowChivalry; + private boolean ShowPiety; + private boolean ShowRigour; + private boolean ShowAugury; + private boolean getarmadylprayers; + private Armadyl armadyl; + private boolean getbarrowsprayers; + private Barrows barrows; + private boolean getbandosprayers; + private Bandos bandos; + private boolean getcerberusprayers; + private Cerberus cerberus; + private boolean getsaradominprayers; + private Saradomin saradomin; + private boolean getvorkathprayers; + private Vorkath vorkath; + private boolean getzamorakprayers; + private Zamorak zamorak; + private boolean getzulrahprayers; + private Zulrah zulrah; + private boolean getpvpprayers; + private PVPPrayers pvpprayers; + private boolean HideRapidHealRestore; + @Provides HidePrayersConfig provideConfig(ConfigManager configManager) { @@ -108,6 +168,7 @@ public class HidePrayersPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); hidePrayers(); } @@ -132,6 +193,7 @@ public class HidePrayersPlugin extends Plugin { if (event.getGroup().equals("hideprayers")) { + updateConfig(); hidePrayers(); } } @@ -233,16 +295,16 @@ public class HidePrayersPlugin extends Plugin return; } - if ( !config.showindividualprayers() - && !config.getarmadylprayers() - && !config.getbarrowsprayers() - && !config.getbandosprayers() - && !config.getcerberusprayers() - && !config.getsaradominprayers() - && !config.getvorkathprayers() - && !config.getzamorakprayers() - && !config.getzulrahprayers() - && !config.getpvpprayers()) + if ( !this.showindividualprayers + && !this.getarmadylprayers + && !this.getbarrowsprayers + && !this.getbandosprayers + && !this.getcerberusprayers + && !this.getsaradominprayers + && !this.getvorkathprayers + && !this.getzamorakprayers + && !this.getzulrahprayers + && !this.getpvpprayers) { restorePrayers(); return; @@ -250,42 +312,42 @@ public class HidePrayersPlugin extends Plugin reallyHidePrayers(); - if (config.showindividualprayers()) + if (this.showindividualprayers) { - prayerWidgets.get(0).setHidden(!config.ShowTHICK_SKIN()); // Thick Skin - prayerWidgets.get(1).setHidden(!config.ShowBURST_OF_STRENGTH()); // Burst of Strength - prayerWidgets.get(2).setHidden(!config.ShowCLARITY_OF_THOUGHT()); // Clarity of Thought - prayerWidgets.get(3).setHidden(!config.ShowSHARP_EYE()); // Sharp Eye - prayerWidgets.get(4).setHidden(!config.ShowMYSTIC_WILL()); // Mystic Will - prayerWidgets.get(5).setHidden(!config.ShowROCK_SKIN()); // Rock Skin - prayerWidgets.get(6).setHidden(!config.ShowSUPERHUMAN_STRENGTH()); // Super Human Strength - prayerWidgets.get(7).setHidden(!config.ShowIMPROVED_REFLEXES()); // Improved_Reflexes - prayerWidgets.get(8).setHidden(!config.ShowRapidRestore()); // Rapid Restore - prayerWidgets.get(9).setHidden(!config.ShowRapidHeal()); // Rapid Heal - prayerWidgets.get(10).setHidden(!config.ShowProtectItem()); // Protect Item - prayerWidgets.get(11).setHidden(!config.ShowHAWK_EYE()); // Hawk Eye - prayerWidgets.get(12).setHidden(!config.ShowMYSTIC_LORE()); // Mystic Lore - prayerWidgets.get(13).setHidden(!config.ShowSteelSkin()); // Steel Skin - prayerWidgets.get(14).setHidden(!config.ShowUltimateStrength()); // Ultimate Strength - prayerWidgets.get(15).setHidden(!config.ShowIncredibleReflex()); // Incredible Reflexes - prayerWidgets.get(16).setHidden(!config.ShowPTFMagic()); // Protect from Magic - prayerWidgets.get(17).setHidden(!config.ShowPTFRange()); // Protect from Range - prayerWidgets.get(18).setHidden(!config.ShowPTFMelee()); // Protect from Melee - prayerWidgets.get(19).setHidden(!config.ShowEagle()); // eagle eye - prayerWidgets.get(20).setHidden(!config.ShowMystic()); // Mystic Might - prayerWidgets.get(21).setHidden(!config.ShowRETRIBUTION()); // Retribution - prayerWidgets.get(22).setHidden(!config.ShowRedemption()); // Redemption - prayerWidgets.get(23).setHidden(!config.ShowSmite()); // Smite - prayerWidgets.get(24).setHidden(!config.ShowPreserve()); // Preserve - prayerWidgets.get(25).setHidden(!config.ShowChivalry()); // Chivalry - prayerWidgets.get(26).setHidden(!config.ShowPiety()); // Piety - prayerWidgets.get(27).setHidden(!config.ShowRigour()); // Rigour - prayerWidgets.get(28).setHidden(!config.ShowAugury()); // Augury + prayerWidgets.get(0).setHidden(!this.ShowTHICK_SKIN); // Thick Skin + prayerWidgets.get(1).setHidden(!this.ShowBURST_OF_STRENGTH); // Burst of Strength + prayerWidgets.get(2).setHidden(!this.ShowCLARITY_OF_THOUGHT); // Clarity of Thought + prayerWidgets.get(3).setHidden(!this.ShowSHARP_EYE); // Sharp Eye + prayerWidgets.get(4).setHidden(!this.ShowMYSTIC_WILL); // Mystic Will + prayerWidgets.get(5).setHidden(!this.ShowROCK_SKIN); // Rock Skin + prayerWidgets.get(6).setHidden(!this.ShowSUPERHUMAN_STRENGTH); // Super Human Strength + prayerWidgets.get(7).setHidden(!this.ShowIMPROVED_REFLEXES); // Improved_Reflexes + prayerWidgets.get(8).setHidden(!this.ShowRapidRestore); // Rapid Restore + prayerWidgets.get(9).setHidden(!this.ShowRapidHeal); // Rapid Heal + prayerWidgets.get(10).setHidden(!this.ShowProtectItem); // Protect Item + prayerWidgets.get(11).setHidden(!this.ShowHAWK_EYE); // Hawk Eye + prayerWidgets.get(12).setHidden(!this.ShowMYSTIC_LORE); // Mystic Lore + prayerWidgets.get(13).setHidden(!this.ShowSteelSkin); // Steel Skin + prayerWidgets.get(14).setHidden(!this.ShowUltimateStrength); // Ultimate Strength + prayerWidgets.get(15).setHidden(!this.ShowIncredibleReflex); // Incredible Reflexes + prayerWidgets.get(16).setHidden(!this.ShowPTFMagic); // Protect from Magic + prayerWidgets.get(17).setHidden(!this.ShowPTFRange); // Protect from Range + prayerWidgets.get(18).setHidden(!this.ShowPTFMelee); // Protect from Melee + prayerWidgets.get(19).setHidden(!this.ShowEagle); // eagle eye + prayerWidgets.get(20).setHidden(!this.ShowMystic); // Mystic Might + prayerWidgets.get(21).setHidden(!this.ShowRETRIBUTION); // Retribution + prayerWidgets.get(22).setHidden(!this.ShowRedemption); // Redemption + prayerWidgets.get(23).setHidden(!this.ShowSmite); // Smite + prayerWidgets.get(24).setHidden(!this.ShowPreserve); // Preserve + prayerWidgets.get(25).setHidden(!this.ShowChivalry); // Chivalry + prayerWidgets.get(26).setHidden(!this.ShowPiety); // Piety + prayerWidgets.get(27).setHidden(!this.ShowRigour); // Rigour + prayerWidgets.get(28).setHidden(!this.ShowAugury); // Augury } - else if (config.getarmadylprayers()) + else if (this.getarmadylprayers) { - switch (config.armadyl()) + switch (this.armadyl) { case DISABLED: break; @@ -306,9 +368,9 @@ public class HidePrayersPlugin extends Plugin } } - else if (config.getbandosprayers()) + else if (this.getbandosprayers) { - switch (config.bandos()) + switch (this.bandos) { case DISABLED: break; @@ -329,9 +391,9 @@ public class HidePrayersPlugin extends Plugin } } - else if (config.getbarrowsprayers()) + else if (this.getbarrowsprayers) { - switch (config.barrows()) + switch (this.barrows) { case DISABLED: break; @@ -356,9 +418,9 @@ public class HidePrayersPlugin extends Plugin } } - else if (config.getcerberusprayers()) + else if (this.getcerberusprayers) { - switch (config.cerberus()) + switch (this.cerberus) { case DISABLED: break; @@ -399,9 +461,9 @@ public class HidePrayersPlugin extends Plugin } } - else if (config.getsaradominprayers()) + else if (this.getsaradominprayers) { - switch (config.saradomin()) + switch (this.saradomin) { case DISABLED: break; @@ -423,9 +485,9 @@ public class HidePrayersPlugin extends Plugin break; } } - else if (config.getvorkathprayers()) + else if (this.getvorkathprayers) { - switch (config.vorkath()) + switch (this.vorkath) { case DISABLED: break; @@ -446,9 +508,9 @@ public class HidePrayersPlugin extends Plugin } } - else if (config.getzamorakprayers()) + else if (this.getzamorakprayers) { - switch (config.zamorak()) + switch (this.zamorak) { case DISABLED: break; @@ -471,9 +533,9 @@ public class HidePrayersPlugin extends Plugin } } - else if (config.getzulrahprayers()) + else if (this.getzulrahprayers) { - switch (config.zulrah()) + switch (this.zulrah) { case DISABLED: break; @@ -496,9 +558,9 @@ public class HidePrayersPlugin extends Plugin } } - else if (config.getpvpprayers()) + else if (this.getpvpprayers) { - if (config.HideRapidHealRestore()) + if (this.HideRapidHealRestore) { prayerWidgets.get(8).setHidden(true); // Rapid Restore prayerWidgets.get(9).setHidden(true); // Rapid Heal @@ -518,7 +580,7 @@ public class HidePrayersPlugin extends Plugin prayerWidgets.get(10).setHidden(false); // Protect Item } - switch (config.pvpprayers()) + switch (this.pvpprayers) { case DISABLED: reallyHidePrayers(); @@ -651,4 +713,57 @@ public class HidePrayersPlugin extends Plugin } } } + + private void updateConfig() + { + this.showindividualprayers = config.showindividualprayers(); + this.ShowTHICK_SKIN = config.ShowTHICK_SKIN(); + this.ShowBURST_OF_STRENGTH = config.ShowBURST_OF_STRENGTH(); + this.ShowCLARITY_OF_THOUGHT = config.ShowCLARITY_OF_THOUGHT(); + this.ShowSHARP_EYE = config.ShowSHARP_EYE(); + this.ShowMYSTIC_WILL = config.ShowMYSTIC_WILL(); + this.ShowROCK_SKIN = config.ShowROCK_SKIN(); + this.ShowSUPERHUMAN_STRENGTH = config.ShowSUPERHUMAN_STRENGTH(); + this.ShowIMPROVED_REFLEXES = config.ShowIMPROVED_REFLEXES(); + this.ShowRapidRestore = config.ShowRapidRestore(); + this.ShowRapidHeal = config.ShowRapidHeal(); + this.ShowProtectItem = config.ShowProtectItem(); + this.ShowHAWK_EYE = config.ShowHAWK_EYE(); + this.ShowMYSTIC_LORE = config.ShowMYSTIC_LORE(); + this.ShowSteelSkin = config.ShowSteelSkin(); + this.ShowUltimateStrength = config.ShowUltimateStrength(); + this.ShowIncredibleReflex = config.ShowIncredibleReflex(); + this.ShowPTFMagic = config.ShowPTFMagic(); + this.ShowPTFRange = config.ShowPTFRange(); + this.ShowPTFMelee = config.ShowPTFMelee(); + this.ShowEagle = config.ShowEagle(); + this.ShowMystic = config.ShowMystic(); + this.ShowRETRIBUTION = config.ShowRETRIBUTION(); + this.ShowRedemption = config.ShowRedemption(); + this.ShowSmite = config.ShowSmite(); + this.ShowPreserve = config.ShowPreserve(); + this.ShowChivalry = config.ShowChivalry(); + this.ShowPiety = config.ShowPiety(); + this.ShowRigour = config.ShowRigour(); + this.ShowAugury = config.ShowAugury(); + this.getarmadylprayers = config.getarmadylprayers(); + this.armadyl = config.armadyl(); + this.getbarrowsprayers = config.getbarrowsprayers(); + this.barrows = config.barrows(); + this.getbandosprayers = config.getbandosprayers(); + this.bandos = config.bandos(); + this.getcerberusprayers = config.getcerberusprayers(); + this.cerberus = config.cerberus(); + this.getsaradominprayers = config.getsaradominprayers(); + this.saradomin = config.saradomin(); + this.getvorkathprayers = config.getvorkathprayers(); + this.vorkath = config.vorkath(); + this.getzamorakprayers = config.getzamorakprayers(); + this.zamorak = config.zamorak(); + this.getzulrahprayers = config.getzulrahprayers(); + this.zulrah = config.zulrah(); + this.getpvpprayers = config.getpvpprayers(); + this.pvpprayers = config.pvpprayers(); + this.HideRapidHealRestore = config.HideRapidHealRestore(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyOverlay.java index 191b7c9cf9..d4de57b30e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyOverlay.java @@ -33,6 +33,7 @@ import java.awt.Graphics2D; import java.awt.Rectangle; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.ItemDefinition; import net.runelite.api.ItemID; import net.runelite.api.widgets.Widget; @@ -41,19 +42,18 @@ import net.runelite.api.widgets.WidgetItem; import net.runelite.client.game.ItemManager; import net.runelite.client.ui.overlay.WidgetItemOverlay; +@Singleton public class HighAlchemyOverlay extends WidgetItemOverlay { private final ItemManager itemManager; - private final HighAlchemyConfig config; private final HighAlchemyPlugin plugin; private final int alchPrice; private final int alchPriceNoStaff; @Inject - public HighAlchemyOverlay(ItemManager itemManager, HighAlchemyPlugin plugin, HighAlchemyConfig config) + public HighAlchemyOverlay(final ItemManager itemManager, final HighAlchemyPlugin plugin) { this.itemManager = itemManager; - this.config = config; this.plugin = plugin; int natPrice = itemManager.getItemPrice(ItemID.NATURE_RUNE); @@ -78,13 +78,13 @@ public class HighAlchemyOverlay extends WidgetItemOverlay final int id = getNotedId(itemId); final int gePrice = getGEPrice(id); final int haPrice = getHAPrice(id); - final int materialCost = config.usingFireRunes() ? alchPriceNoStaff : alchPrice; - final int desiredProfit = config.minProfit(); + final int materialCost = plugin.isUsingFireRunes() ? alchPriceNoStaff : alchPrice; + final int desiredProfit = plugin.getMinProfit(); final int haProfit = getHAProfit(haPrice, gePrice, materialCost); if (gePrice > 0 && haPrice > 0 && haProfit >= desiredProfit) { - final Color color = config.getHighlightColor(); + final Color color = plugin.getGetHighlightColor(); if (color != null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyPlugin.java index ecfa486fed..79be6bbac4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyPlugin.java @@ -28,10 +28,12 @@ package net.runelite.client.plugins.highalchemy; import com.google.inject.Provides; +import java.awt.Color; import java.util.Arrays; import java.util.HashSet; import java.util.Set; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.events.ConfigChanged; @@ -57,7 +59,7 @@ import net.runelite.client.ui.overlay.OverlayManager; type = PluginType.UTILITY, enabledByDefault = false ) - +@Singleton public class HighAlchemyPlugin extends Plugin { private static final String CONFIG_GROUP = "highalchemy"; @@ -80,9 +82,19 @@ public class HighAlchemyPlugin extends Plugin return configManager.getConfig(HighAlchemyConfig.class); } + private boolean showBank; + private boolean showInventory; + @Getter(AccessLevel.PACKAGE) + private Color getHighlightColor; + @Getter(AccessLevel.PACKAGE) + private int minProfit; + @Getter(AccessLevel.PACKAGE) + private boolean usingFireRunes; + @Override protected void startUp() throws Exception { + updateConfig(); buildGroupList(); overlayManager.add(overlay); } @@ -98,6 +110,7 @@ public class HighAlchemyPlugin extends Plugin { if (event.getGroup().equals(CONFIG_GROUP)) { + updateConfig(); buildGroupList(); } } @@ -106,12 +119,12 @@ public class HighAlchemyPlugin extends Plugin { interfaceGroups.clear(); - if (config.showBank()) + if (this.showBank) { interfaceGroups.add(BANK_GROUP_ID); } - if (config.showInventory()) + if (this.showInventory) { Arrays.stream( new int[]{ @@ -126,4 +139,13 @@ public class HighAlchemyPlugin extends Plugin ).forEach(interfaceGroups::add); } } + + private void updateConfig() + { + this.showBank = config.showBank(); + this.showInventory = config.showInventory(); + this.getHighlightColor = config.getHighlightColor(); + this.minProfit = config.minProfit(); + this.usingFireRunes = config.usingFireRunes(); + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java index cf2de858e9..ec184a1a87 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java @@ -43,6 +43,7 @@ import java.util.List; import java.util.concurrent.ScheduledExecutorService; import javax.annotation.Nullable; import javax.inject.Inject; +import javax.inject.Singleton; import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.JPanel; @@ -95,6 +96,7 @@ import static net.runelite.http.api.hiscore.HiscoreSkill.WOODCUTTING; import net.runelite.http.api.hiscore.Skill; @Slf4j +@Singleton public class HiscorePanel extends PluginPanel { /* The maximum allowed username length in runescape accounts */ diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java index a7f7dd9b4a..a90ca7b8ba 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java @@ -35,6 +35,7 @@ import java.util.regex.Pattern; import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Provider; +import javax.inject.Singleton; import javax.swing.SwingUtilities; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; @@ -62,6 +63,7 @@ import org.apache.commons.lang3.ArrayUtils; tags = {"panel", "players"}, loadWhenOutdated = true ) +@Singleton public class HiscorePlugin extends Plugin { private static final String LOOKUP = "Lookup"; @@ -179,8 +181,6 @@ public class HiscorePlugin extends Plugin groupId == WidgetInfo.CHATBOX.getGroupId() && !KICK_OPTION.equals(option) || //prevent from adding for Kick option (interferes with the raiding party one) groupId == WidgetInfo.RAIDING_PARTY.getGroupId() || groupId == WidgetInfo.PRIVATE_CHAT_MESSAGE.getGroupId()) { - boolean after; - if (!AFTER_OPTIONS.contains(option)) { return; @@ -194,7 +194,10 @@ public class HiscorePlugin extends Plugin lookup.setParam1(event.getActionParam1()); lookup.setIdentifier(event.getIdentifier()); - insertMenuEntry(lookup, client.getMenuEntries()); + if (client != null) + { + insertMenuEntry(lookup, client.getMenuEntries()); + } } } @@ -228,7 +231,10 @@ public class HiscorePlugin extends Plugin MenuEntry[] newMenu = ObjectArrays.concat(entries, newEntry); int menuEntryCount = newMenu.length; ArrayUtils.swap(newMenu, menuEntryCount - 1, menuEntryCount - 2); - client.setMenuEntries(newMenu); + if (client != null) + { + client.setMenuEntries(newMenu); + } } private void lookupPlayer(String playerName) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/NameAutocompleter.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/NameAutocompleter.java index 3fd3fbe26d..bf23f9190f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/NameAutocompleter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/NameAutocompleter.java @@ -68,7 +68,7 @@ class NameAutocompleter implements KeyListener private Pattern autocompleteNamePattern; @Inject - private NameAutocompleter(@Nullable Client client) + private NameAutocompleter(@Nullable final Client client) { this.client = client; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java index 2e307a4992..c287fc1160 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java @@ -25,11 +25,14 @@ package net.runelite.client.plugins.hunter; import com.google.inject.Provides; +import java.awt.Color; import java.time.Instant; import java.util.HashMap; import java.util.Iterator; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; @@ -56,6 +59,7 @@ import net.runelite.client.ui.overlay.OverlayManager; description = "Show the state of your traps", tags = {"overlay", "skilling", "timers"} ) +@Singleton public class HunterPlugin extends Plugin { @Inject @@ -73,14 +77,24 @@ public class HunterPlugin extends Plugin @Inject private HunterConfig config; - @Getter + @Getter(AccessLevel.PACKAGE) private final Map traps = new HashMap<>(); - @Getter + @Getter(AccessLevel.PACKAGE) private Instant lastActionTime = Instant.ofEpochMilli(0); private WorldPoint lastTickLocalPlayerLocation; + @Getter(AccessLevel.PACKAGE) + private Color getOpenTrapColor; + @Getter(AccessLevel.PACKAGE) + private Color getFullTrapColor; + @Getter(AccessLevel.PACKAGE) + private Color getEmptyTrapColor; + @Getter(AccessLevel.PACKAGE) + private Color getTransTrapColor; + private boolean maniacalMonkeyNotify; + @Provides HunterConfig provideConfig(ConfigManager configManager) { @@ -90,6 +104,8 @@ public class HunterPlugin extends Plugin @Override protected void startUp() { + updateConfig(); + overlayManager.add(overlay); overlay.updateConfig(); } @@ -210,7 +226,7 @@ public class HunterPlugin extends Plugin myTrap.resetTimer(); lastActionTime = Instant.now(); - if (config.maniacalMonkeyNotify() && myTrap.getObjectId() == ObjectID.MONKEY_TRAP) + if (this.maniacalMonkeyNotify && myTrap.getObjectId() == ObjectID.MONKEY_TRAP) { notifier.notify("You've caught part of a monkey's tail."); } @@ -384,7 +400,17 @@ public class HunterPlugin extends Plugin { if (event.getGroup().equals("hunterplugin")) { + updateConfig(); overlay.updateConfig(); } } + + private void updateConfig() + { + this.getOpenTrapColor = config.getOpenTrapColor(); + this.getFullTrapColor = config.getFullTrapColor(); + this.getEmptyTrapColor = config.getEmptyTrapColor(); + this.getTransTrapColor = config.getTransTrapColor(); + this.maniacalMonkeyNotify = config.maniacalMonkeyNotify(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterTrap.java b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterTrap.java index 4a28288994..3312a5a4f7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterTrap.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterTrap.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.hunter; import java.time.Duration; import java.time.Instant; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import net.runelite.api.GameObject; @@ -44,23 +45,23 @@ class HunterTrap /** * The time in milliseconds when the trap was placed. */ - @Getter + @Getter(AccessLevel.PACKAGE) private Instant placedOn; /** * The state of the trap. */ - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private State state; /** * The ID of the game object this is representing */ - @Getter + @Getter(AccessLevel.PACKAGE) private int objectId; - @Getter + @Getter(AccessLevel.PACKAGE) private WorldPoint worldLocation; /** @@ -91,7 +92,7 @@ class HunterTrap * * @param gameObject The gameobject thats corresponds with this trap. */ - HunterTrap(GameObject gameObject) + HunterTrap(final GameObject gameObject) { this.state = State.OPEN; this.placedOn = Instant.now(); @@ -105,7 +106,7 @@ class HunterTrap * @return Value between 0 and 1. 0 means the trap was laid moments ago. * 1 is a trap that's about to collapse. */ - public double getTrapTimeRelative() + double getTrapTimeRelative() { Duration duration = Duration.between(placedOn, Instant.now()); return duration.compareTo(TRAP_TIME) < 0 ? (double) duration.toMillis() / TRAP_TIME.toMillis() : 1; @@ -114,7 +115,7 @@ class HunterTrap /** * Resets the time value when the trap was placed. */ - public void resetTimer() + void resetTimer() { placedOn = Instant.now(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java index 6c41519726..cb774336d4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java @@ -29,6 +29,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Perspective; import net.runelite.api.coords.LocalPoint; @@ -42,6 +43,7 @@ import net.runelite.client.ui.overlay.components.ProgressPieComponent; * Represents the overlay that shows timers on traps that are placed by the * player. */ +@Singleton public class TrapOverlay extends Overlay { /** @@ -51,7 +53,6 @@ public class TrapOverlay extends Overlay private final Client client; private final HunterPlugin plugin; - private final HunterConfig config; private Color colorOpen, colorOpenBorder; private Color colorEmpty, colorEmptyBorder; @@ -59,12 +60,11 @@ public class TrapOverlay extends Overlay private Color colorTrans, colorTransBorder; @Inject - TrapOverlay(Client client, HunterPlugin plugin, HunterConfig config) + TrapOverlay(final Client client, final HunterPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); this.plugin = plugin; - this.config = config; this.client = client; } @@ -80,13 +80,13 @@ public class TrapOverlay extends Overlay */ public void updateConfig() { - colorEmptyBorder = config.getEmptyTrapColor(); + colorEmptyBorder = plugin.getGetEmptyTrapColor(); colorEmpty = new Color(colorEmptyBorder.getRed(), colorEmptyBorder.getGreen(), colorEmptyBorder.getBlue(), 100); - colorFullBorder = config.getFullTrapColor(); + colorFullBorder = plugin.getGetFullTrapColor(); colorFull = new Color(colorFullBorder.getRed(), colorFullBorder.getGreen(), colorFullBorder.getBlue(), 100); - colorOpenBorder = config.getOpenTrapColor(); + colorOpenBorder = plugin.getGetOpenTrapColor(); colorOpen = new Color(colorOpenBorder.getRed(), colorOpenBorder.getGreen(), colorOpenBorder.getBlue(), 100); - colorTransBorder = config.getTransTrapColor(); + colorTransBorder = plugin.getGetTransTrapColor(); colorTrans = new Color(colorTransBorder.getRed(), colorTransBorder.getGreen(), colorTransBorder.getBlue(), 100); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java index 67523eebe3..610352bd86 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java @@ -27,12 +27,14 @@ package net.runelite.client.plugins.hydra; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.components.LineComponent; import net.runelite.client.ui.overlay.components.PanelComponent; +@Singleton public class BabyHydraIndicatorOverlay extends Overlay { private final BabyHydraPlugin plugin; @@ -40,7 +42,7 @@ public class BabyHydraIndicatorOverlay extends Overlay private final PanelComponent panelComponent = new PanelComponent(); @Inject - private BabyHydraIndicatorOverlay(BabyHydraPlugin plugin) + private BabyHydraIndicatorOverlay(final BabyHydraPlugin plugin) { this.plugin = plugin; setPosition(OverlayPosition.BOTTOM_RIGHT); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java index 08ea0a13c9..58456a4ef3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java @@ -28,6 +28,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.NPC; import net.runelite.api.Point; @@ -38,19 +39,17 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton public class BabyHydraOverlay extends Overlay { - private final BabyHydraConfig config; private final BabyHydraPlugin plugin; - @Inject private Client client; @Inject - private BabyHydraOverlay(BabyHydraConfig config, BabyHydraPlugin plugin) + private BabyHydraOverlay(final BabyHydraPlugin plugin) { - this.config = config; this.plugin = plugin; setLayer(OverlayLayer.ABOVE_SCENE); setPosition(OverlayPosition.DYNAMIC); @@ -73,7 +72,7 @@ public class BabyHydraOverlay extends Overlay int val = plugin.getHydras().get(hydra.getIndex()); if (val != 0) { - if (config.BoldText()) + if (plugin.isBoldText()) { graphics.setFont(FontManager.getRunescapeBoldFont()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java index dfd72f8ee1..c0c6e28536 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java @@ -28,6 +28,8 @@ import com.google.inject.Provides; import java.util.HashMap; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Actor; import net.runelite.api.Client; @@ -50,7 +52,7 @@ import net.runelite.client.ui.overlay.OverlayManager; type = PluginType.PVM, enabledByDefault = false ) - +@Singleton public class BabyHydraPlugin extends Plugin { @Inject @@ -77,23 +79,30 @@ public class BabyHydraPlugin extends Plugin return configManager.getConfig(BabyHydraConfig.class); } - @Getter + @Getter(AccessLevel.PACKAGE) private Map hydras = new HashMap<>(); - @Getter + @Getter(AccessLevel.PACKAGE) private Map hydraattacks = new HashMap<>(); - @Getter + @Getter(AccessLevel.PACKAGE) private NPC hydra; + private boolean TextIndicator; + @Getter(AccessLevel.PACKAGE) + private boolean BoldText; + private boolean PrayerHelper; + @Override protected void startUp() throws Exception { - if (config.TextIndicator()) + updateConfig(); + + if (this.TextIndicator) { overlayManager.add(hydraOverlay); } - if (config.PrayerHelper()) + if (this.PrayerHelper) { overlayManager.add(hydraPrayOverlay); overlayManager.add(hydraIndicatorOverlay); @@ -118,6 +127,8 @@ public class BabyHydraPlugin extends Plugin return; } + updateConfig(); + if (event.getKey().equals("textindicators")) { if (Boolean.parseBoolean(event.getNewValue())) @@ -241,4 +252,11 @@ public class BabyHydraPlugin extends Plugin } } } + + private void updateConfig() + { + this.TextIndicator = config.TextIndicator(); + this.BoldText = config.BoldText(); + this.PrayerHelper = config.PrayerHelper(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java index f11c6b172d..cf56196e21 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java @@ -29,6 +29,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Prayer; import net.runelite.api.SpriteID; @@ -40,6 +41,7 @@ import net.runelite.client.ui.overlay.components.ComponentConstants; import net.runelite.client.ui.overlay.components.ImageComponent; import net.runelite.client.ui.overlay.components.PanelComponent; +@Singleton public class BabyHydraPrayOverlay extends Overlay { private final BabyHydraPlugin plugin; @@ -56,7 +58,7 @@ public class BabyHydraPrayOverlay extends Overlay private Client client; @Inject - private BabyHydraPrayOverlay(BabyHydraPlugin plugin, SpriteManager spriteManager) + private BabyHydraPrayOverlay(final BabyHydraPlugin plugin, final SpriteManager spriteManager) { this.plugin = plugin; this.spriteManager = spriteManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java index e0d3925cb6..66310c8d41 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java @@ -36,6 +36,10 @@ import java.util.List; import javax.inject.Inject; //import javax.sound.sampled.LineUnavailableException; //import javax.sound.sampled.UnsupportedAudioFileException; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Setter; +import net.runelite.api.events.ConfigChanged; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -151,6 +155,7 @@ import net.runelite.client.util.PvPUtil; description = "Send a notification when going idle, or when HP/Prayer reaches a threshold", tags = {"health", "hitpoints", "notifications", "prayer", "pvp", "pker"} ) +@Singleton public class IdleNotifierPlugin extends Plugin { private static final Logger logger = LoggerFactory.getLogger(IdleNotifierPlugin.class); @@ -195,6 +200,32 @@ public class IdleNotifierPlugin extends Plugin private SkullIcon lastTickSkull = null; private boolean isFirstTick = true; + @Setter(AccessLevel.PACKAGE) + private boolean animationIdle; + private boolean animationIdleSound; + @Setter(AccessLevel.PACKAGE) + private boolean interactionIdle; + private boolean interactionIdleSound; + @Setter(AccessLevel.PACKAGE) + private boolean logoutIdle; + private boolean outOfCombatSound; + private boolean showSkullNotification; + private boolean showUnskullNotification; + @Setter(AccessLevel.PACKAGE) + private int getIdleNotificationDelay; + @Setter(AccessLevel.PACKAGE) + private int getHitpointsThreshold; + private boolean getPlayHealthSound; + @Setter(AccessLevel.PACKAGE) + private int getPrayerThreshold; + private boolean getPlayPrayerSound; + private int getOxygenThreshold; + @Setter(AccessLevel.PACKAGE) + private int getSpecEnergyThreshold; + private boolean getSpecSound; + private boolean getOverSpecEnergy; + private boolean notifyPkers; + @Provides IdleNotifierConfig provideConfig(ConfigManager configManager) { @@ -331,7 +362,7 @@ public class IdleNotifierPlugin extends Plugin private void onPlayerSpawned(PlayerSpawned event) { final Player p = event.getPlayer(); - if (config.notifyPkers()) + if (this.notifyPkers) { if (p != null) { @@ -473,7 +504,7 @@ public class IdleNotifierPlugin extends Plugin skullNotifier(); final Player local = client.getLocalPlayer(); - final Duration waitDuration = Duration.ofMillis(config.getIdleNotificationDelay()); + final Duration waitDuration = Duration.ofMillis(this.getIdleNotificationDelay); lastCombatCountdown = Math.max(lastCombatCountdown - 1, 0); if (client.getGameState() != GameState.LOGGED_IN @@ -486,7 +517,7 @@ public class IdleNotifierPlugin extends Plugin return; } - if (config.logoutIdle() && checkIdleLogout()) + if (this.logoutIdle && checkIdleLogout()) { notifier.notify("[" + local.getName() + "] is about to log out from idling too long!"); } @@ -496,20 +527,20 @@ public class IdleNotifierPlugin extends Plugin notifier.notify("[" + local.getName() + "] is about to log out from being online for 6 hours!"); } - if (config.animationIdle() && checkAnimationIdle(waitDuration, local)) + if (this.animationIdle && checkAnimationIdle(waitDuration, local)) { notifier.notify("[" + local.getName() + "] is now idle!"); - if (config.animationIdleSound()) + if (this.animationIdleSound) { soundManager.playSound(Sound.IDLE); } } - if (config.interactionIdle() && checkInteractionIdle(waitDuration, local)) + if (this.interactionIdle && checkInteractionIdle(waitDuration, local)) { if (lastInteractWasCombat) { notifier.notify("[" + local.getName() + "] is now out of combat!"); - if (config.outOfCombatSound()) + if (this.outOfCombatSound) { soundManager.playSound(Sound.OUT_OF_COMBAT); } @@ -517,7 +548,7 @@ public class IdleNotifierPlugin extends Plugin else { notifier.notify("[" + local.getName() + "] is now idle!"); - if (config.interactionIdleSound()) + if (this.interactionIdleSound) { soundManager.playSound(Sound.IDLE); } @@ -527,7 +558,7 @@ public class IdleNotifierPlugin extends Plugin if (checkLowHitpoints()) { notifier.notify("[" + local.getName() + "] has low hitpoints!"); - if (config.getPlayHealthSound()) + if (this.getPlayHealthSound) { soundManager.playSound(Sound.LOW_HEATLH); } @@ -536,7 +567,7 @@ public class IdleNotifierPlugin extends Plugin if (checkLowPrayer()) { notifier.notify("[" + local.getName() + "] has low prayer!"); - if (config.getPlayPrayerSound()) + if (this.getPlayPrayerSound) { soundManager.playSound(Sound.LOW_PRAYER); } @@ -550,7 +581,7 @@ public class IdleNotifierPlugin extends Plugin if (checkFullSpecEnergy()) { notifier.notify("[" + local.getName() + "] has restored spec energy!"); - if (config.getSpecSound()) + if (this.getSpecSound) { soundManager.playSound(Sound.RESTORED_SPECIAL_ATTACK); } @@ -561,7 +592,7 @@ public class IdleNotifierPlugin extends Plugin { int currentSpecEnergy = client.getVar(VarPlayer.SPECIAL_ATTACK_PERCENT); - int threshold = config.getSpecEnergyThreshold() * 10; + int threshold = this.getSpecEnergyThreshold * 10; if (threshold == 0) { lastSpecEnergy = currentSpecEnergy; @@ -572,7 +603,7 @@ public class IdleNotifierPlugin extends Plugin // regen was small enough. boolean notify = lastSpecEnergy < threshold && currentSpecEnergy >= threshold && currentSpecEnergy - lastSpecEnergy <= 100; - notify = (notify) || ((config.getOverSpecEnergy()) && (currentSpecEnergy >= threshold) && (currentSpecEnergy != lastSpecEnergy) && (currentSpecEnergy - lastSpecEnergy <= 100)); + notify = (notify) || ((this.getOverSpecEnergy) && (currentSpecEnergy >= threshold) && (currentSpecEnergy != lastSpecEnergy) && (currentSpecEnergy - lastSpecEnergy <= 100)); lastSpecEnergy = currentSpecEnergy; return notify; @@ -580,11 +611,11 @@ public class IdleNotifierPlugin extends Plugin private boolean checkLowOxygen() { - if (config.getOxygenThreshold() == 0) + if (this.getOxygenThreshold == 0) { return false; } - if (config.getOxygenThreshold() >= client.getVar(Varbits.OXYGEN_LEVEL) * 0.1) + if (this.getOxygenThreshold >= client.getVar(Varbits.OXYGEN_LEVEL) * 0.1) { if (!notifyOxygen) { @@ -601,13 +632,13 @@ public class IdleNotifierPlugin extends Plugin private boolean checkLowHitpoints() { - if (config.getHitpointsThreshold() == 0) + if (this.getHitpointsThreshold == 0) { return false; } - if (client.getRealSkillLevel(Skill.HITPOINTS) > config.getHitpointsThreshold()) + if (client.getRealSkillLevel(Skill.HITPOINTS) > this.getHitpointsThreshold) { - if (client.getBoostedSkillLevel(Skill.HITPOINTS) + client.getVar(Varbits.NMZ_ABSORPTION) <= config.getHitpointsThreshold()) + if (client.getBoostedSkillLevel(Skill.HITPOINTS) + client.getVar(Varbits.NMZ_ABSORPTION) <= this.getHitpointsThreshold) { if (!notifyHitpoints) { @@ -626,13 +657,13 @@ public class IdleNotifierPlugin extends Plugin private boolean checkLowPrayer() { - if (config.getPrayerThreshold() == 0) + if (this.getPrayerThreshold == 0) { return false; } - if (client.getRealSkillLevel(Skill.PRAYER) > config.getPrayerThreshold()) + if (client.getRealSkillLevel(Skill.PRAYER) > this.getPrayerThreshold) { - if (client.getBoostedSkillLevel(Skill.PRAYER) <= config.getPrayerThreshold()) + if (client.getBoostedSkillLevel(Skill.PRAYER) <= this.getPrayerThreshold) { if (!notifyPrayer) { @@ -792,11 +823,11 @@ public class IdleNotifierPlugin extends Plugin { if (!isFirstTick) { - if (config.showSkullNotification() && lastTickSkull == null && currentTickSkull == SkullIcon.SKULL) + if (this.showSkullNotification && lastTickSkull == null && currentTickSkull == SkullIcon.SKULL) { notifier.notify("[" + local.getName() + "] is now skulled!"); } - else if (config.showUnskullNotification() && lastTickSkull == SkullIcon.SKULL && currentTickSkull == null) + else if (this.showUnskullNotification && lastTickSkull == SkullIcon.SKULL && currentTickSkull == null) { notifier.notify("[" + local.getName() + "] is now unskulled!"); } @@ -809,4 +840,43 @@ public class IdleNotifierPlugin extends Plugin lastTickSkull = currentTickSkull; } } + + @Override + protected void startUp() throws Exception + { + updateConfig(); + } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("idlenotifier")) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.animationIdle = config.animationIdle(); + this.animationIdleSound = config.animationIdleSound(); + this.interactionIdle = config.interactionIdle(); + this.interactionIdleSound = config.interactionIdleSound(); + this.logoutIdle = config.logoutIdle(); + this.outOfCombatSound = config.outOfCombatSound(); + this.showSkullNotification = config.showSkullNotification(); + this.showUnskullNotification = config.showUnskullNotification(); + this.getIdleNotificationDelay = config.getIdleNotificationDelay(); + this.getHitpointsThreshold = config.getHitpointsThreshold(); + this.getPlayHealthSound = config.getPlayHealthSound(); + this.getPrayerThreshold = config.getPrayerThreshold(); + this.getPlayPrayerSound = config.getPlayPrayerSound(); + this.getOxygenThreshold = config.getOxygenThreshold(); + this.getSpecEnergyThreshold = config.getSpecEnergyThreshold(); + this.getSpecSound = config.getSpecSound(); + this.getOverSpecEnergy = config.getOverSpecEnergy(); + this.notifyPkers = config.notifyPkers(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java index c88d433254..a66ee4e270 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java @@ -4,26 +4,23 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.util.Map; import javax.inject.Inject; -import net.runelite.api.Client; +import javax.inject.Singleton; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.ui.overlay.components.PanelComponent; +@Singleton public class ImplingCounterOverlay extends Overlay { - private final Client client; private final ImplingsPlugin plugin; - private final ImplingsConfig config; private final PanelComponent panelComponent = new PanelComponent(); @Inject - public ImplingCounterOverlay(Client client, ImplingsConfig config, ImplingsPlugin plugin) + public ImplingCounterOverlay(final ImplingsPlugin plugin) { - this.client = client; - this.config = config; this.plugin = plugin; setPosition(OverlayPosition.TOP_LEFT); } @@ -31,7 +28,7 @@ public class ImplingCounterOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (!config.showCounter() || plugin.getImplings().isEmpty()) + if (!plugin.isShowSpawn() || plugin.getImplings().isEmpty()) return null; panelComponent.getChildren().clear(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingMinimapOverlay.java index ab35f9f945..cb78082865 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingMinimapOverlay.java @@ -29,6 +29,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.util.List; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.NPC; import net.runelite.api.Point; import net.runelite.client.ui.overlay.Overlay; @@ -36,18 +37,17 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton public class ImplingMinimapOverlay extends Overlay { private final ImplingsPlugin plugin; - private final ImplingsConfig config; @Inject - private ImplingMinimapOverlay(ImplingsPlugin plugin, ImplingsConfig config) + private ImplingMinimapOverlay(final ImplingsPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); this.plugin = plugin; - this.config = config; } @Override @@ -63,14 +63,14 @@ public class ImplingMinimapOverlay extends Overlay { Point impLocation = imp.getMinimapLocation(); Color color = plugin.npcToColor(imp); - if (!plugin.showNpc(imp) || impLocation == null || color == null) + if (plugin.showNpc(imp) || impLocation == null || color == null) { continue; } OverlayUtil.renderMinimapLocation(graphics, impLocation, color); - if (config.showName()) + if (plugin.isShowName()) { Point textLocation = new Point(impLocation.getX() + 1, impLocation.getY()); OverlayUtil.renderTextLocation(graphics, textLocation, imp.getName(), color); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingSpawn.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingSpawn.java index d624c02682..122c0b5583 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingSpawn.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingSpawn.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.implings; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.coords.WorldPoint; @@ -32,7 +33,7 @@ import net.runelite.api.coords.WorldPoint; * @author Juzzed */ @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) enum ImplingSpawn { //Baby spawns diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingType.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingType.java index cacac2f167..787adcc46a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingType.java @@ -24,11 +24,12 @@ */ package net.runelite.client.plugins.implings; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) enum ImplingType { BABY("Baby"), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java index d55be9f962..386284a874 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java @@ -320,15 +320,4 @@ public interface ImplingsConfig extends Config { return Color.WHITE; } - - @ConfigItem( - position = 26, - keyName = "showCounter", - name = "Show impling counter overlay", - description = "Shows how many of each impling there is nearby" - ) - default boolean showCounter() - { - return false; - } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsOverlay.java index 8b4e404bd3..47a1e42271 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsOverlay.java @@ -31,6 +31,7 @@ import java.awt.Polygon; import java.util.List; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Actor; import net.runelite.api.Client; import net.runelite.api.NPC; @@ -47,18 +48,17 @@ import net.runelite.client.ui.overlay.OverlayUtil; /** * @author robin */ +@Singleton public class ImplingsOverlay extends Overlay { private final Client client; - private final ImplingsConfig config; private final ImplingsPlugin plugin; @Inject - private ImplingsOverlay(Client client, ImplingsConfig config, ImplingsPlugin plugin) + private ImplingsOverlay(final Client client, final ImplingsPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); - this.config = config; this.client = client; this.plugin = plugin; } @@ -76,7 +76,7 @@ public class ImplingsOverlay extends Overlay for (NPC imp : implings) { Color color = plugin.npcToColor(imp); - if (!plugin.showNpc(imp) || color == null) + if (plugin.showNpc(imp) || color == null) { continue; } @@ -85,7 +85,7 @@ public class ImplingsOverlay extends Overlay } //Draw static spawns - if (config.showSpawn()) + if (plugin.isShowSpawn()) { for (ImplingSpawn spawn : ImplingSpawn.values()) { @@ -95,14 +95,14 @@ public class ImplingsOverlay extends Overlay } String impName = spawn.getType().getName(); - drawSpawn(graphics, spawn.getSpawnLocation(), impName, config.getSpawnColor()); + drawSpawn(graphics, spawn.getSpawnLocation(), impName, plugin.getGetSpawnColor()); } //Draw dynamic spawns Map dynamicSpawns = plugin.getDynamicSpawns(); for (Map.Entry dynamicSpawn : dynamicSpawns.entrySet()) { - drawDynamicSpawn(graphics, dynamicSpawn.getKey(), dynamicSpawn.getValue(), config.getDynamicSpawnColor()); + drawDynamicSpawn(graphics, dynamicSpawn.getKey(), dynamicSpawn.getValue(), plugin.getGetDynamicSpawnColor()); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java index 5ec61041da..8458b45735 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java @@ -31,10 +31,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.GameState; import net.runelite.api.NPC; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.NpcDespawned; @@ -53,13 +55,14 @@ import net.runelite.client.ui.overlay.OverlayManager; description = "Highlight nearby implings on the minimap and on-screen", tags = {"hunter", "minimap", "overlay"} ) +@Singleton public class ImplingsPlugin extends Plugin { private static final int DYNAMIC_SPAWN_NATURE_DRAGON = 1618; private static final int DYNAMIC_SPAWN_ECLECTIC = 1633; private static final int DYNAMIC_SPAWN_BABY_ESSENCE = 1634; - @Getter + @Getter(AccessLevel.PACKAGE) private Map implingCounterMap = new HashMap<>(); @Getter(AccessLevel.PACKAGE) @@ -84,6 +87,37 @@ public class ImplingsPlugin extends Plugin @Inject private ImplingsConfig config; + private boolean showBaby; + private Color getBabyColor; + private boolean showYoung; + private Color getYoungColor; + private boolean showGourmet; + private Color getGourmetColor; + private boolean showEarth; + private Color getEarthColor; + private boolean showEssence; + private Color getEssenceColor; + private boolean showEclectic; + private Color getEclecticColor; + private boolean showNature; + private Color getNatureColor; + private boolean showMagpie; + private Color getMagpieColor; + private boolean showNinja; + private Color getNinjaColor; + private boolean showDragon; + private Color getDragonColor; + private boolean showLucky; + private Color getLuckyColor; + @Getter(AccessLevel.PACKAGE) + private boolean showSpawn; + @Getter(AccessLevel.PACKAGE) + private Color getSpawnColor; + @Getter(AccessLevel.PACKAGE) + private boolean showName; + @Getter(AccessLevel.PACKAGE) + private Color getDynamicSpawnColor; + @Provides ImplingsConfig getConfig(ConfigManager configManager) { @@ -93,6 +127,8 @@ public class ImplingsPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + dynamicSpawns.put(DYNAMIC_SPAWN_NATURE_DRAGON, "T3 Nature-Lucky Dynamic"); dynamicSpawns.put(DYNAMIC_SPAWN_ECLECTIC, "T2 Eclectic Dynamic"); dynamicSpawns.put(DYNAMIC_SPAWN_BABY_ESSENCE, "T1 Baby-Essence Dynamic"); @@ -175,10 +211,10 @@ public class ImplingsPlugin extends Plugin Impling impling = Impling.findImpling(npc.getId()); if (impling == null) { - return false; + return true; } - return showImplingType(impling.getImplingType()); + return !showImplingType(impling.getImplingType()); } boolean showImplingType(ImplingType implingType) @@ -186,27 +222,27 @@ public class ImplingsPlugin extends Plugin switch (implingType) { case BABY: - return config.showBaby(); + return this.showBaby; case YOUNG: - return config.showYoung(); + return this.showYoung; case GOURMET: - return config.showGourmet(); + return this.showGourmet; case EARTH: - return config.showEarth(); + return this.showEarth; case ESSENCE: - return config.showEssence(); + return this.showEssence; case ECLECTIC: - return config.showEclectic(); + return this.showEclectic; case NATURE: - return config.showNature(); + return this.showNature; case MAGPIE: - return config.showMagpie(); + return this.showMagpie; case NINJA: - return config.showNinja(); + return this.showNinja; case DRAGON: - return config.showDragon(); + return this.showDragon; case LUCKY: - return config.showLucky(); + return this.showLucky; default: return false; } @@ -223,35 +259,76 @@ public class ImplingsPlugin extends Plugin return typeToColor(impling.getImplingType()); } - Color typeToColor(ImplingType type) + private Color typeToColor(ImplingType type) { switch (type) { case BABY: - return config.getBabyColor(); + return this.getBabyColor; case YOUNG: - return config.getYoungColor(); + return this.getYoungColor; case GOURMET: - return config.getGourmetColor(); + return this.getGourmetColor; case EARTH: - return config.getEarthColor(); + return this.getEarthColor; case ESSENCE: - return config.getEssenceColor(); + return this.getEssenceColor; case ECLECTIC: - return config.getEclecticColor(); + return this.getEclecticColor; case NATURE: - return config.getNatureColor(); + return this.getNatureColor; case MAGPIE: - return config.getMagpieColor(); + return this.getMagpieColor; case NINJA: - return config.getNinjaColor(); + return this.getNinjaColor; case DRAGON: - return config.getDragonColor(); + return this.getDragonColor; case LUCKY: - return config.getLuckyColor(); + return this.getLuckyColor; default: return null; } } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("implings")) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.showBaby = config.showBaby(); + this.getBabyColor = config.getBabyColor(); + this.showYoung = config.showYoung(); + this.getYoungColor = config.getYoungColor(); + this.showGourmet = config.showGourmet(); + this.getGourmetColor = config.getGourmetColor(); + this.showEarth = config.showEarth(); + this.getEarthColor = config.getEarthColor(); + this.showEssence = config.showEssence(); + this.getEssenceColor = config.getEssenceColor(); + this.showEclectic = config.showEclectic(); + this.getEclecticColor = config.getEclecticColor(); + this.showNature = config.showNature(); + this.getNatureColor = config.getNatureColor(); + this.showMagpie = config.showMagpie(); + this.getMagpieColor = config.getMagpieColor(); + this.showNinja = config.showNinja(); + this.getNinjaColor = config.getNinjaColor(); + this.showDragon = config.showDragon(); + this.getDragonColor = config.getDragonColor(); + this.showLucky = config.showLucky(); + this.getLuckyColor = config.getLuckyColor(); + this.showSpawn = config.showSpawn(); + this.getSpawnColor = config.getSpawnColor(); + this.showName = config.showName(); + this.getDynamicSpawnColor = config.getDynamicSpawnColor(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java index bd7c2b045e..7e6f0ece3a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java @@ -24,66 +24,66 @@ */ package net.runelite.client.plugins.inferno; +import java.awt.Color; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; -import java.awt.Color; @ConfigGroup("inferno") public interface InfernoConfig extends Config - { +{ @ConfigItem( - position = 0, - keyName = "Nibbler Overlay", - name = "Nibbler Overlay", - description = "Shows if there are any Nibblers left" + position = 0, + keyName = "Nibbler Overlay", + name = "Nibbler Overlay", + description = "Shows if there are any Nibblers left" ) default boolean displayNibblerOverlay() - { - return false; - } + { + return false; + } @ConfigItem( - position = 1, - keyName = "Prayer Helper", - name = "Prayer Helper", - description = "Tells you what to flick in how many ticks" + position = 1, + keyName = "Prayer Helper", + name = "Prayer Helper", + description = "Tells you what to flick in how many ticks" ) default boolean showPrayerHelp() - { - return false; - } + { + return false; + } @ConfigItem( - position = 2, - keyName = "waveDisplay", - name = "Wave display", - description = "Shows monsters that will spawn on the selected wave(s)." + position = 2, + keyName = "waveDisplay", + name = "Wave display", + description = "Shows monsters that will spawn on the selected wave(s)." ) default InfernoWaveDisplayMode waveDisplay() - { - return InfernoWaveDisplayMode.BOTH; - } + { + return InfernoWaveDisplayMode.BOTH; + } @ConfigItem( - position = 3, - keyName = "getWaveOverlayHeaderColor", - name = "Wave Header", - description = "Color for Wave Header" + position = 3, + keyName = "getWaveOverlayHeaderColor", + name = "Wave Header", + description = "Color for Wave Header" ) default Color getWaveOverlayHeaderColor() - { - return Color.ORANGE; - } + { + return Color.ORANGE; + } @ConfigItem( - position = 4, - keyName = "getWaveTextColor", - name = "Wave Text Color", - description = "Color for Wave Texts" + position = 4, + keyName = "getWaveTextColor", + name = "Wave Text Color", + description = "Color for Wave Texts" ) default Color getWaveTextColor() - { - return Color.WHITE; - } - } \ No newline at end of file + { + return Color.WHITE; + } +} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoInfobox.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoInfobox.java index 12b4571b09..9e1af9a978 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoInfobox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoInfobox.java @@ -27,26 +27,26 @@ package net.runelite.client.plugins.inferno; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; +import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; -import net.runelite.client.ui.overlay.components.PanelComponent; +@Singleton public class InfernoInfobox extends Overlay { private final Client client; private final InfernoPlugin plugin; - private final InfernoConfig config; private final PanelComponent panelComponent = new PanelComponent(); @Inject - public InfernoInfobox(Client client, InfernoConfig config, InfernoPlugin plugin) + public InfernoInfobox(final Client client, final InfernoPlugin plugin) { this.client = client; - this.config = config; this.plugin = plugin; setPosition(OverlayPosition.TOP_LEFT); } @@ -54,7 +54,10 @@ public class InfernoInfobox extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (!config.showPrayerHelp() || client.getMapRegions()[0] != 9043) return null; + if (!plugin.isShowPrayerHelp() || client.getMapRegions()[0] != 9043) + { + return null; + } panelComponent.getChildren().clear(); TableComponent tableComponent = new TableComponent(); @@ -68,7 +71,7 @@ public class InfernoInfobox extends Overlay } else { - tableComponent.addRow(plugin.getPriorityNPC()[i - 1].getName(), plugin.getPriorityNPC()[i - 1 ].getAttackstyle().getName()); + tableComponent.addRow(plugin.getPriorityNPC()[i - 1].getName(), plugin.getPriorityNPC()[i - 1].getAttackstyle().getName()); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadAttack.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadAttack.java index 28ae29c1cd..1451a96216 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadAttack.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadAttack.java @@ -28,26 +28,26 @@ import net.runelite.api.AnimationID; import net.runelite.api.Prayer; public enum InfernoJadAttack - { - MAGIC(AnimationID.JALTOK_JAD_MAGE_ATTACK, Prayer.PROTECT_FROM_MAGIC), - RANGE(AnimationID.JALTOK_JAD_RANGE_ATTACK, Prayer.PROTECT_FROM_MISSILES); +{ + MAGIC(AnimationID.JALTOK_JAD_MAGE_ATTACK, Prayer.PROTECT_FROM_MAGIC), + RANGE(AnimationID.JALTOK_JAD_RANGE_ATTACK, Prayer.PROTECT_FROM_MISSILES); private final int animation; private final Prayer prayer; - InfernoJadAttack(int animation, Prayer prayer) - { - this.animation = animation; - this.prayer = prayer; - } + InfernoJadAttack(final int animation, final Prayer prayer) + { + this.animation = animation; + this.prayer = prayer; + } public int getAnimation() - { - return animation; - } + { + return animation; + } public Prayer getPrayer() - { - return prayer; - } + { + return prayer; } +} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadOverlay.java index 43252b4c95..50af2fb664 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadOverlay.java @@ -29,7 +29,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.image.BufferedImage; import javax.inject.Inject; - +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.SpriteID; import net.runelite.client.game.SpriteManager; @@ -40,8 +40,9 @@ import net.runelite.client.ui.overlay.components.ComponentConstants; import net.runelite.client.ui.overlay.components.ImageComponent; import net.runelite.client.ui.overlay.components.PanelComponent; +@Singleton public class InfernoJadOverlay extends Overlay - { +{ private static final Color NOT_ACTIVATED_BACKGROUND_COLOR = new Color(150, 0, 0, 150); private final Client client; private final InfernoPlugin plugin; @@ -49,39 +50,39 @@ public class InfernoJadOverlay extends Overlay private final PanelComponent imagePanelComponent = new PanelComponent(); @Inject - private InfernoJadOverlay(Client client, InfernoPlugin plugin, SpriteManager spriteManager) - { - setPosition(OverlayPosition.BOTTOM_RIGHT); - setPriority(OverlayPriority.HIGH); - this.client = client; - this.plugin = plugin; - this.spriteManager = spriteManager; - } + private InfernoJadOverlay(final Client client, final InfernoPlugin plugin, final SpriteManager spriteManager) + { + setPosition(OverlayPosition.BOTTOM_RIGHT); + setPriority(OverlayPriority.HIGH); + this.client = client; + this.plugin = plugin; + this.spriteManager = spriteManager; + } @Override public Dimension render(Graphics2D graphics) + { + final InfernoJadAttack attack = plugin.getAttack(); + + if (attack == null) { - final InfernoJadAttack attack = plugin.getAttack(); - - if (attack == null) - { - return null; - } - - final BufferedImage prayerImage = getPrayerImage(attack); - - imagePanelComponent.getChildren().clear(); - imagePanelComponent.getChildren().add(new ImageComponent(prayerImage)); - imagePanelComponent.setBackgroundColor(client.isPrayerActive(attack.getPrayer()) - ? ComponentConstants.STANDARD_BACKGROUND_COLOR - : NOT_ACTIVATED_BACKGROUND_COLOR); - - return imagePanelComponent.render(graphics); + return null; } + final BufferedImage prayerImage = getPrayerImage(attack); + + imagePanelComponent.getChildren().clear(); + imagePanelComponent.getChildren().add(new ImageComponent(prayerImage)); + imagePanelComponent.setBackgroundColor(client.isPrayerActive(attack.getPrayer()) + ? ComponentConstants.STANDARD_BACKGROUND_COLOR + : NOT_ACTIVATED_BACKGROUND_COLOR); + + return imagePanelComponent.render(graphics); + } + private BufferedImage getPrayerImage(InfernoJadAttack attack) - { - final int prayerSpriteID = attack == InfernoJadAttack.MAGIC ? SpriteID.PRAYER_PROTECT_FROM_MAGIC : SpriteID.PRAYER_PROTECT_FROM_MISSILES; - return spriteManager.getSprite(prayerSpriteID, 0); - } + { + final int prayerSpriteID = attack == InfernoJadAttack.MAGIC ? SpriteID.PRAYER_PROTECT_FROM_MAGIC : SpriteID.PRAYER_PROTECT_FROM_MISSILES; + return spriteManager.getSprite(prayerSpriteID, 0); } +} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java index 392ec4bad6..3208dba7df 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.inferno; import java.awt.Color; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import net.runelite.api.NPC; @@ -39,10 +40,10 @@ public class InfernoNPC MELEE("Melee", Color.WHITE), RANDOM("Random", Color.ORANGE); - @Getter + @Getter(AccessLevel.PACKAGE) private String name = ""; - @Getter + @Getter(AccessLevel.PACKAGE) private Color color; Attackstyle(String s, Color c) @@ -52,44 +53,44 @@ public class InfernoNPC } } - @Getter + @Getter(AccessLevel.PACKAGE) private NPC npc; - @Getter + @Getter(AccessLevel.PACKAGE) private String name; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private Attackstyle attackstyle; - @Getter + @Getter(AccessLevel.PACKAGE) private int attackTicks; - @Getter + @Getter(AccessLevel.PACKAGE) private int priority; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private int ticksTillAttack = -1; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private boolean attacking = false; - @Getter + @Getter(AccessLevel.PACKAGE) private int attackAnimation; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean isMidAttack = false; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private int distanceToPlayer = 0; - @Getter + @Getter(AccessLevel.PACKAGE) int textLocHeight; - public InfernoNPC(NPC npc) + InfernoNPC(NPC npc) { this.npc = npc; textLocHeight = npc.getLogicalHeight() + 40; @@ -177,7 +178,7 @@ public class InfernoNPC return info; } - public void attacked() + void attacked() { ticksTillAttack = attackTicks; attacking = true; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNibblerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNibblerOverlay.java index 12d88ef2af..a55b0f9f2e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNibblerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNibblerOverlay.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.inferno; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; @@ -34,29 +35,29 @@ import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; +@Singleton public class InfernoNibblerOverlay extends Overlay { private final Client client; private final InfernoPlugin plugin; - private final InfernoConfig config; private final PanelComponent panelComponent = new PanelComponent(); @Inject - public InfernoNibblerOverlay(Client client, InfernoConfig config, InfernoPlugin plugin) + public InfernoNibblerOverlay(final Client client, final InfernoPlugin plugin) { this.client = client; - this.config = config; this.plugin = plugin; setPosition(OverlayPosition.TOP_LEFT); } - @Override public Dimension render(Graphics2D graphics) { - if (!config.displayNibblerOverlay() || plugin.getNibblers().size() == 0 || client.getMapRegions()[0] != 9043) - return null; + if (!plugin.isDisplayNibblerOverlay() || plugin.getNibblers().size() == 0 || client.getMapRegions()[0] != 9043) + { + return null; + } panelComponent.getChildren().clear(); TableComponent tableComponent = new TableComponent(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java index 0175e1f751..0d374137f7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java @@ -30,6 +30,7 @@ import java.awt.Dimension; import java.awt.Font; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.NPC; import net.runelite.api.Perspective; @@ -38,29 +39,29 @@ import net.runelite.api.coords.LocalPoint; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; -import net.runelite.client.ui.overlay.components.PanelComponent; +@Singleton public class InfernoOverlay extends Overlay { private final Client client; private final InfernoPlugin plugin; - private final InfernoConfig config; - private final PanelComponent panelComponent = new PanelComponent(); @Inject - public InfernoOverlay(Client client, InfernoConfig config, InfernoPlugin plugin) + public InfernoOverlay(final Client client, final InfernoPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); this.client = client; - this.config = config; this.plugin = plugin; } @Override public Dimension render(Graphics2D graphics) { - if (!client.isInInstancedRegion() || client.getMapRegions()[0] != 9043) return null; + if (!client.isInInstancedRegion() || client.getMapRegions()[0] != 9043) + { + return null; + } for (InfernoNPC monster : plugin.getMonsters().values()) { @@ -96,13 +97,16 @@ public class InfernoOverlay extends Overlay return; } - int x = textLocation.getX(); - int y = textLocation.getY(); + if (textLocation != null) + { + int x = textLocation.getX(); + int y = textLocation.getY(); - graphics.setColor(Color.BLACK); - graphics.drawString(text, x + 1, y + 1); + graphics.setColor(Color.BLACK); + graphics.drawString(text, x + 1, y + 1); - graphics.setColor(color); - graphics.drawString(text, x, y); + graphics.setColor(color); + graphics.drawString(text, x, y); + } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java index 8a8549c4d5..4b0112a94f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java @@ -25,13 +25,14 @@ package net.runelite.client.plugins.inferno; import com.google.inject.Provides; - +import java.awt.Color; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import javax.annotation.Nullable; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -58,12 +59,13 @@ import net.runelite.client.ui.overlay.OverlayManager; import org.apache.commons.lang3.ArrayUtils; @PluginDescriptor( - name = "Inferno", - description = "Inferno helper", - tags = {"combat", "overlay", "pve", "pvm"}, - type = PluginType.PVM + name = "Inferno", + description = "Inferno helper", + tags = {"combat", "overlay", "pve", "pvm"}, + type = PluginType.PVM ) @Slf4j +@Singleton public class InfernoPlugin extends Plugin { private static final int INFERNO_REGION = 9043; @@ -92,22 +94,21 @@ public class InfernoPlugin extends Plugin @Inject private InfernoConfig config; - @Getter + @Getter(AccessLevel.PACKAGE) private int currentWave = -1; - @Getter + @Getter(AccessLevel.PACKAGE) private Map monsters; - @Getter + @Getter(AccessLevel.PACKAGE) private Map> monsterCurrentAttackMap; - @Getter + @Getter(AccessLevel.PACKAGE) private List nibblers; - @Getter + @Getter(AccessLevel.PACKAGE) private InfernoNPC[] priorityNPC; - @Getter(AccessLevel.PACKAGE) @Nullable private InfernoJadAttack attack; @@ -120,20 +121,29 @@ public class InfernoPlugin extends Plugin private List waveMonsters; public InfernoPlugin() - { - waveMonsters = new ArrayList<>(); - } + { + waveMonsters = new ArrayList<>(); + } + + @Getter(AccessLevel.PACKAGE) + private boolean displayNibblerOverlay; + @Getter(AccessLevel.PACKAGE) + private boolean showPrayerHelp; + private InfernoWaveDisplayMode waveDisplay; + private Color getWaveOverlayHeaderColor; + private Color getWaveTextColor; @Provides InfernoConfig provideConfig(ConfigManager configManager) - { - return configManager.getConfig(InfernoConfig.class); - } + { + return configManager.getConfig(InfernoConfig.class); + } @Override protected void startUp() throws Exception { - waveOverlay.setDisplayMode(config.waveDisplay()); + updateConfig(); + waveOverlay.setDisplayMode(this.waveDisplay); if (isInInferno()) { @@ -141,7 +151,7 @@ public class InfernoPlugin extends Plugin overlayManager.add(infernoInfobox); overlayManager.add(nibblerOverlay); - if (config.waveDisplay() != InfernoWaveDisplayMode.NONE) + if (this.waveDisplay != InfernoWaveDisplayMode.NONE) { overlayManager.add(waveOverlay); } @@ -149,8 +159,8 @@ public class InfernoPlugin extends Plugin overlayManager.add(jadOverlay); } - waveOverlay.setWaveHeaderColor(config.getWaveOverlayHeaderColor()); - waveOverlay.setWaveTextColor(config.getWaveTextColor()); + waveOverlay.setWaveHeaderColor(this.getWaveOverlayHeaderColor); + waveOverlay.setWaveTextColor(this.getWaveTextColor); monsters = new HashMap<>(); monsterCurrentAttackMap = new HashMap<>(6); @@ -177,6 +187,7 @@ public class InfernoPlugin extends Plugin monsters = null; currentWaveNumber = -1; } + @Subscribe private void onConfigChanged(ConfigChanged event) { @@ -185,18 +196,20 @@ public class InfernoPlugin extends Plugin return; } + updateConfig(); + if (event.getKey().endsWith("color")) { - waveOverlay.setWaveHeaderColor(config.getWaveOverlayHeaderColor()); - waveOverlay.setWaveTextColor(config.getWaveTextColor()); + waveOverlay.setWaveHeaderColor(this.getWaveOverlayHeaderColor); + waveOverlay.setWaveTextColor(this.getWaveTextColor); } else if ("waveDisplay".equals(event.getKey())) { overlayManager.remove(waveOverlay); - waveOverlay.setDisplayMode(config.waveDisplay()); + waveOverlay.setDisplayMode(this.waveDisplay); - if (isInInferno() && config.waveDisplay() != InfernoWaveDisplayMode.NONE) + if (isInInferno() && this.waveDisplay != InfernoWaveDisplayMode.NONE) { overlayManager.add(waveOverlay); } @@ -205,40 +218,46 @@ public class InfernoPlugin extends Plugin @Subscribe public void onNpcSpawned(NpcSpawned event) + { + if (client.getMapRegions()[0] != 9043) { - if (client.getMapRegions()[0] != 9043) return; - - NPC npc = event.getNpc(); - if (isValidInfernoMob(npc)) - { - monsters.put(npc, new InfernoNPC(npc)); - log.debug(String.valueOf(monsters.size())); - } - - if (npc.getId() == NpcID.JALNIB) - { - nibblers.add(npc); - } - - final int id = event.getNpc().getId(); - - if (id == NpcID.JALTOKJAD || id == NpcID.JALTOKJAD_7704) - { - jad = event.getNpc(); - } - - final Actor actor = event.getActor(); - - if (actor != null) - { - waveMonsters.add(actor); - } + return; } + NPC npc = event.getNpc(); + if (isValidInfernoMob(npc)) + { + monsters.put(npc, new InfernoNPC(npc)); + log.debug(String.valueOf(monsters.size())); + } + + if (npc.getId() == NpcID.JALNIB) + { + nibblers.add(npc); + } + + final int id = event.getNpc().getId(); + + if (id == NpcID.JALTOKJAD || id == NpcID.JALTOKJAD_7704) + { + jad = event.getNpc(); + } + + final Actor actor = event.getActor(); + + if (actor != null) + { + waveMonsters.add(actor); + } + } + @Subscribe public void onNpcDespawned(NpcDespawned event) { - if (client.getMapRegions()[0] != 9043) return; + if (client.getMapRegions()[0] != 9043) + { + return; + } NPC npc = event.getNpc(); if (monsters.containsKey(npc)) @@ -288,7 +307,7 @@ public class InfernoPlugin extends Plugin overlayManager.add(infernoInfobox); overlayManager.add(nibblerOverlay); - if (config.waveDisplay() != InfernoWaveDisplayMode.NONE) + if (this.waveDisplay != InfernoWaveDisplayMode.NONE) { overlayManager.add(waveOverlay); } @@ -317,7 +336,10 @@ public class InfernoPlugin extends Plugin @Subscribe public void onGameTick(GameTick event) { - if (client.getMapRegions()[0] != 9043) return; + if (client.getMapRegions()[0] != 9043) + { + return; + } clearMapAndPriority(); @@ -405,7 +427,10 @@ public class InfernoPlugin extends Plugin { ArrayList monsters = monsterCurrentAttackMap.get(i + 1); - if (monsters.size() == 0) continue; + if (monsters.size() == 0) + { + continue; + } int priority = monsters.get(0).getPriority(); @@ -474,4 +499,13 @@ public class InfernoPlugin extends Plugin { return currentWaveNumber == -1 || currentWaveNumber == 69 ? -1 : currentWaveNumber + 1; } + + private void updateConfig() + { + this.displayNibblerOverlay = config.displayNibblerOverlay(); + this.showPrayerHelp = config.showPrayerHelp(); + this.waveDisplay = config.waveDisplay(); + this.getWaveOverlayHeaderColor = config.getWaveOverlayHeaderColor(); + this.getWaveTextColor = config.getWaveTextColor(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveMappings.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveMappings.java index 0e87b0c13b..eb079846cf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveMappings.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveMappings.java @@ -28,16 +28,17 @@ package net.runelite.client.plugins.inferno; import com.google.common.collect.ImmutableMap; import java.awt.Color; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; class InfernoWaveMappings { - @Getter + @Getter(AccessLevel.PACKAGE) private static final ImmutableMap waveMapping; - @Getter + @Getter(AccessLevel.PACKAGE) private static final ImmutableMap npcNameMapping; static @@ -88,7 +89,7 @@ class InfernoWaveMappings waveMapBuilder.put(42, new int[]{32, 32, 32, 240, 490}); waveMapBuilder.put(43, new int[]{32, 32, 32, 85, 240, 490}); waveMapBuilder.put(44, new int[]{32, 32, 32, 85, 85, 240, 490}); - waveMapBuilder.put(45, new int[]{32, 32, 32, 165, 240, 490 }); + waveMapBuilder.put(45, new int[]{32, 32, 32, 165, 240, 490}); waveMapBuilder.put(46, new int[]{32, 32, 32, 85, 165, 240, 490}); waveMapBuilder.put(47, new int[]{32, 32, 32, 85, 85, 165, 240, 490}); waveMapBuilder.put(48, new int[]{32, 32, 32, 165, 165, 240, 490}); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveOverlay.java index 88e3e32766..03d86509c0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveOverlay.java @@ -1,28 +1,31 @@ package net.runelite.client.plugins.inferno; -import java.awt.Color; import com.google.inject.Inject; +import com.google.inject.Singleton; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Graphics2D; +import lombok.AccessLevel; import lombok.Setter; import static net.runelite.client.plugins.inferno.InfernoWaveMappings.addWaveComponent; -import java.awt.Graphics2D; -import net.runelite.client.ui.overlay.OverlayPriority; -import net.runelite.client.ui.overlay.OverlayPosition; -import java.awt.Dimension; -import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.Overlay; +import net.runelite.client.ui.overlay.OverlayPosition; +import net.runelite.client.ui.overlay.OverlayPriority; +import net.runelite.client.ui.overlay.components.PanelComponent; +@Singleton public class InfernoWaveOverlay extends Overlay - { +{ private final InfernoPlugin plugin; private final PanelComponent panelComponent; - @Setter + @Setter(AccessLevel.PACKAGE) private Color waveHeaderColor; - @Setter + @Setter(AccessLevel.PACKAGE) private Color waveTextColor; - @Setter + @Setter(AccessLevel.PACKAGE) private InfernoWaveDisplayMode displayMode; @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java index 4311fd23e8..1578ee408b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.info; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.ClientToolbar; @@ -37,6 +38,7 @@ import net.runelite.client.util.ImageUtil; description = "Enable the Info panel", loadWhenOutdated = true ) +@Singleton public class InfoPlugin extends Plugin { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java b/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java index f24df49e17..b3e88b6a60 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.info; import java.awt.Desktop; import java.io.IOException; import java.net.URISyntaxException; +import javax.inject.Singleton; import javax.swing.BorderFactory; import javax.swing.JEditorPane; import javax.swing.event.HyperlinkEvent; @@ -35,6 +36,7 @@ import javax.swing.text.html.HTMLEditorKit; import lombok.extern.slf4j.Slf4j; @Slf4j +@Singleton public class JRichTextPane extends JEditorPane { private HyperlinkListener linkHandler; @@ -58,7 +60,7 @@ public class JRichTextPane extends JEditorPane setText(text); } - public void enableAutoLinkHandler(boolean enable) + void enableAutoLinkHandler(boolean enable) { if (enable == (linkHandler == null)) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java index 87d164b78f..2ef28d51b1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java @@ -31,6 +31,7 @@ import java.awt.Rectangle; import java.awt.image.BufferedImage; import javax.inject.Inject; import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import net.runelite.api.Client; @@ -56,7 +57,7 @@ class InstanceMapOverlay extends Overlay * this value to be 4. Changing this will break the method for rendering * complex tiles */ - static final int TILE_SIZE = 4; + private static final int TILE_SIZE = 4; /** * The size of the player's position marker on the map @@ -85,9 +86,9 @@ class InstanceMapOverlay extends Overlay private volatile boolean showMap = false; private final BackgroundComponent backgroundComponent = new BackgroundComponent(); - @Setter + @Setter(AccessLevel.PACKAGE) private boolean isCloseButtonHovered; - @Getter + @Getter(AccessLevel.PACKAGE) private Rectangle closeButtonBounds; private BufferedImage closeButtonImage; private BufferedImage closeButtonHoveredImage; @@ -103,7 +104,7 @@ class InstanceMapOverlay extends Overlay backgroundComponent.setFill(false); } - public boolean isMapShown() + boolean isMapShown() { return showMap; } @@ -114,7 +115,7 @@ class InstanceMapOverlay extends Overlay * * @param show Whether or not the map should be shown. */ - public synchronized void setShowMap(boolean show) + synchronized void setShowMap(boolean show) { showMap = show; if (showMap) @@ -128,7 +129,7 @@ class InstanceMapOverlay extends Overlay /** * Increases the viewed plane. The maximum viewedPlane is 3 */ - public synchronized void onAscend() + synchronized void onAscend() { if (viewedPlane >= MAX_PLANE) { @@ -142,7 +143,7 @@ class InstanceMapOverlay extends Overlay /** * Decreases the viewed plane. The minimum viewedPlane is 0 */ - public synchronized void onDescend() + synchronized void onDescend() { if (viewedPlane <= MIN_PLANE) { @@ -235,7 +236,7 @@ class InstanceMapOverlay extends Overlay * * @param event The game state change event */ - public void onGameStateChange(GameStateChanged event) + void onGameStateChange(GameStateChanged event) { mapImage = null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java index 38803e3c1b..d6f4cb3e17 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.instancemap; import com.google.inject.Binder; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.WidgetMenuOptionClicked; import net.runelite.api.widgets.WidgetInfo; @@ -43,6 +44,7 @@ import net.runelite.client.ui.overlay.OverlayManager; name = "Instance Map", description = "Add an instanced map, accessible by right-clicking the map button" ) +@Singleton public class InstanceMapPlugin extends Plugin { private final WidgetMenuOption openMapOption = new WidgetMenuOption("Show", "Instance Map", WidgetInfo.WORLD_MAP_OPTION); @@ -134,24 +136,24 @@ public class InstanceMapPlugin extends Plugin } } - public void showMap() + private void showMap() { overlay.setShowMap(true); openMapOption.setMenuOption("Hide"); } - public void closeMap() + void closeMap() { overlay.setShowMap(false); openMapOption.setMenuOption("Show"); } - public void ascendMap() + void ascendMap() { overlay.onAscend(); } - public void descendMap() + void descendMap() { overlay.onDescend(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/HealthbarOverride.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/HealthbarOverride.java index c0e844939a..500661a8ff 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/HealthbarOverride.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/HealthbarOverride.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.interfacestyles; import com.google.common.collect.ImmutableMap; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import static net.runelite.api.SpriteID.*; @@ -52,12 +53,12 @@ enum HealthbarOverride implements SpriteOverride FRONT_140PX(HEALTHBAR_DEFAULT_FRONT_140PX, "front_90px.png"), FRONT_160PX(HEALTHBAR_DEFAULT_FRONT_160PX, "front_90px.png"); - @Getter + @Getter(AccessLevel.PUBLIC) private final int spriteId; private final String fileName; - @Getter + @Getter(AccessLevel.PACKAGE) private int padding = 1; private static final Map MAP; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java index 6944a982d7..9758434681 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java @@ -29,6 +29,7 @@ package net.runelite.client.plugins.interfacestyles; import com.google.inject.Provides; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; @@ -57,6 +58,7 @@ import net.runelite.client.util.ImageUtil; tags = {"2005", "2010", "skin", "theme", "ui"}, enabledByDefault = false ) +@Singleton public class InterfaceStylesPlugin extends Plugin { @Inject @@ -73,6 +75,11 @@ public class InterfaceStylesPlugin extends Plugin private Sprite[] defaultCrossSprites; + private Skin skin; + private boolean hdHealthBars; + private boolean hdMenu; + private boolean rsCrossSprites; + @Provides InterfaceStylesConfig provideConfig(ConfigManager configManager) { @@ -82,6 +89,7 @@ public class InterfaceStylesPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); clientThread.invoke(this::updateAllOverrides); } @@ -102,6 +110,7 @@ public class InterfaceStylesPlugin extends Plugin { if (config.getGroup().equals("interfaceStyles")) { + updateConfig(); clientThread.invoke(this::updateAllOverrides); } } @@ -115,7 +124,7 @@ public class InterfaceStylesPlugin extends Plugin @Subscribe public void onPostHealthBar(PostHealthBar postHealthBar) { - if (!config.hdHealthBars()) + if (!this.hdHealthBars) { return; } @@ -161,7 +170,7 @@ public class InterfaceStylesPlugin extends Plugin @Subscribe public void onBeforeMenuRender(BeforeMenuRender event) { - if (config.hdMenu()) + if (this.hdMenu) { client.draw2010Menu(); event.consume(); @@ -174,9 +183,9 @@ public class InterfaceStylesPlugin extends Plugin { for (Skin skin : spriteOverride.getSkin()) { - if (skin == config.skin()) + if (skin == this.skin) { - String file = config.skin().toString() + "/" + spriteOverride.getSpriteID() + ".png"; + String file = this.skin.toString() + "/" + spriteOverride.getSpriteID() + ".png"; Sprite spritePixels = getFileSpritePixels(file); if (spriteOverride.getSpriteID() == SpriteID.COMPASS_TEXTURE) @@ -206,9 +215,9 @@ public class InterfaceStylesPlugin extends Plugin { for (WidgetOverride widgetOverride : WidgetOverride.values()) { - if (widgetOverride.getSkin() == config.skin()) + if (widgetOverride.getSkin() == this.skin) { - String file = config.skin().toString() + "/widget/" + widgetOverride.getName() + ".png"; + String file = this.skin.toString() + "/widget/" + widgetOverride.getName() + ".png"; Sprite spritePixels = getFileSpritePixels(file); if (spritePixels != null) @@ -253,7 +262,7 @@ public class InterfaceStylesPlugin extends Plugin { for (WidgetOffset widgetOffset : WidgetOffset.values()) { - if (widgetOffset.getSkin() != config.skin()) + if (widgetOffset.getSkin() != this.skin) { continue; } @@ -287,7 +296,7 @@ public class InterfaceStylesPlugin extends Plugin private void overrideHealthBars() { - if (config.hdHealthBars()) + if (this.hdHealthBars) { spriteManager.addSpriteOverrides(HealthbarOverride.values()); // Reset health bar caches to apply the override @@ -307,7 +316,7 @@ public class InterfaceStylesPlugin extends Plugin private void overrideCrossSprites() { - if (config.rsCrossSprites()) + if (this.rsCrossSprites) { // If we've already replaced them, // we don't need to replace them again @@ -387,4 +396,12 @@ public class InterfaceStylesPlugin extends Plugin client.setCompass(compass); } } + + private void updateConfig() + { + this.skin = config.skin(); + this.hdHealthBars = config.hdHealthBars(); + this.hdMenu = config.hdMenu(); + this.rsCrossSprites = config.rsCrossSprites(); + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/Skin.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/Skin.java index c041ffedc2..3e9aad9be9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/Skin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/Skin.java @@ -26,10 +26,11 @@ */ package net.runelite.client.plugins.interfacestyles; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -@Getter +@Getter(AccessLevel.PACKAGE) @AllArgsConstructor public enum Skin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/SpriteOverride.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/SpriteOverride.java index b5db7bb69c..f46a3bd50c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/SpriteOverride.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/SpriteOverride.java @@ -26,12 +26,13 @@ */ package net.runelite.client.plugins.interfacestyles; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.SpriteID; import static net.runelite.client.plugins.interfacestyles.Skin.AROUND_2005; import static net.runelite.client.plugins.interfacestyles.Skin.AROUND_2010; -@Getter +@Getter(AccessLevel.PACKAGE) enum SpriteOverride { TAB_COMBAT(SpriteID.TAB_COMBAT, AROUND_2005, AROUND_2010), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOffset.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOffset.java index 9edf17165e..920aa0a818 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOffset.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOffset.java @@ -26,10 +26,11 @@ */ package net.runelite.client.plugins.interfacestyles; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.widgets.WidgetInfo; -@Getter +@Getter(AccessLevel.PACKAGE) enum WidgetOffset { RESIZABLE_2010_COMBAT_HIGHLIGHT(Skin.AROUND_2010, WidgetInfo.RESIZABLE_VIEWPORT_COMBAT_TAB, -4, 1, null, null), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOverride.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOverride.java index 1998fb3808..0a83eb372d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOverride.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOverride.java @@ -26,10 +26,11 @@ */ package net.runelite.client.plugins.interfacestyles; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.widgets.WidgetInfo; -@Getter +@Getter(AccessLevel.PACKAGE) enum WidgetOverride { FIXED_CORNER_TOP_LEFT_2005(Skin.AROUND_2005, "1026", WidgetInfo.FIXED_VIEWPORT_COMBAT_TAB), @@ -47,7 +48,7 @@ enum WidgetOverride private String name; private WidgetInfo[] widgetInfo; - WidgetOverride(Skin skin, String name, WidgetInfo... widgetInfo) + WidgetOverride(final Skin skin, final String name, final WidgetInfo... widgetInfo) { this.skin = skin; this.name = name; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java index f9f66e10b8..4e86d634ff 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.inventorygrid; import com.google.inject.Inject; +import com.google.inject.Singleton; import java.awt.AlphaComposite; import java.awt.Dimension; import java.awt.Graphics2D; @@ -42,20 +43,21 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; +@Singleton class InventoryGridOverlay extends Overlay { private static final int INVENTORY_SIZE = 28; - private final InventoryGridConfig config; + private final InventoryGridPlugin plugin; private final Client client; private final ItemManager itemManager; @Inject - private InventoryGridOverlay(InventoryGridConfig config, Client client, ItemManager itemManager) + private InventoryGridOverlay(final InventoryGridPlugin plugin, final Client client, final ItemManager itemManager) { this.itemManager = itemManager; this.client = client; - this.config = config; + this.plugin = plugin; setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); @@ -68,7 +70,7 @@ class InventoryGridOverlay extends Overlay final Widget inventoryWidget = client.getWidget(WidgetInfo.INVENTORY); if (if1DraggingWidget == null || if1DraggingWidget != inventoryWidget - || client.getItemPressedDuration() < config.dragDelay() / Constants.CLIENT_TICK_LENGTH) + || client.getItemPressedDuration() < plugin.getDragDelay() / Constants.CLIENT_TICK_LENGTH) { return null; } @@ -83,7 +85,7 @@ class InventoryGridOverlay extends Overlay final Rectangle bounds = widgetItem.getCanvasBounds(); boolean inBounds = bounds.contains(mousePoint); - if (config.showItem() && inBounds) + if (plugin.isShowItem() && inBounds) { final WidgetItem draggedItem = inventoryWidget.getWidgetItem(client.getIf1DraggedItemIndex()); final BufferedImage draggedItemImage = itemManager.getImage(draggedItem.getId()); @@ -95,14 +97,14 @@ class InventoryGridOverlay extends Overlay graphics.setComposite(AlphaComposite.SrcOver); } - if (config.showHighlight() && inBounds) + if (plugin.isShowHighlight() && inBounds) { - graphics.setColor(config.highlightColor()); + graphics.setColor(plugin.getHighlightColor()); graphics.fill(bounds); } - else if (config.showGrid()) + else if (plugin.isShowGrid()) { - graphics.setColor(config.gridColor()); + graphics.setColor(plugin.getGridColor()); graphics.fill(bounds); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridPlugin.java index dc6b0ae372..0ab7d78067 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridPlugin.java @@ -27,7 +27,13 @@ package net.runelite.client.plugins.inventorygrid; import com.google.inject.Inject; import com.google.inject.Provides; +import com.google.inject.Singleton; +import java.awt.Color; +import lombok.AccessLevel; +import lombok.Getter; +import net.runelite.api.events.ConfigChanged; import net.runelite.client.config.ConfigManager; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; @@ -38,6 +44,7 @@ import net.runelite.client.ui.overlay.OverlayManager; tags = {"items", "overlay"}, enabledByDefault = false ) +@Singleton public class InventoryGridPlugin extends Plugin { @Inject @@ -46,9 +53,26 @@ public class InventoryGridPlugin extends Plugin @Inject private OverlayManager overlayManager; + @Inject + private InventoryGridConfig config; + + @Getter(AccessLevel.PACKAGE) + private boolean showItem; + @Getter(AccessLevel.PACKAGE) + boolean showGrid; + @Getter(AccessLevel.PACKAGE) + private boolean showHighlight; + @Getter(AccessLevel.PACKAGE) + private int dragDelay; + @Getter(AccessLevel.PACKAGE) + private Color gridColor; + @Getter(AccessLevel.PACKAGE) + private Color highlightColor; + @Override public void startUp() { + updateConfig(); overlayManager.add(overlay); } @@ -63,4 +87,23 @@ public class InventoryGridPlugin extends Plugin { return configManager.getConfig(InventoryGridConfig.class); } + + @Subscribe + public void onConfigChanged(ConfigChanged config) + { + if (config.getGroup().equals("inventorygrid")) + { + updateConfig(); + } + } + + private void updateConfig() + { + this.showItem = config.showItem(); + this.showGrid = config.showGrid(); + this.showHighlight = config.showHighlight(); + this.dragDelay = config.dragDelay(); + this.gridColor = config.gridColor(); + this.highlightColor = config.highlightColor(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupBankOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupBankOverlay.java index 1b0be390fb..95d4276a52 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupBankOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupBankOverlay.java @@ -42,21 +42,19 @@ public class InventorySetupBankOverlay extends WidgetItemOverlay { private final ItemManager itemManager; private final InventorySetupPlugin plugin; - private final InventorySetupConfig config; @Inject - public InventorySetupBankOverlay(ItemManager itemManager, InventorySetupPlugin plugin, InventorySetupConfig config) + public InventorySetupBankOverlay(ItemManager itemManager, InventorySetupPlugin plugin) { this.itemManager = itemManager; this.plugin = plugin; - this.config = config; showOnBank(); } @Override public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget) { - if (config.getBankHighlight()) + if (plugin.isGetBankHighlight()) { int[] ids = plugin.getCurrentInventorySetupIds(); if (ids == null) @@ -70,7 +68,7 @@ public class InventorySetupBankOverlay extends WidgetItemOverlay } - final Color color = config.getBankHighlightColor(); + final Color color = plugin.getGetBankHighlightColor(); if (color != null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java index fa35f2718e..a9c0b01929 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java @@ -28,6 +28,7 @@ package net.runelite.client.plugins.inventorysetups; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.google.inject.Provides; +import java.awt.Color; import java.awt.image.BufferedImage; import java.lang.reflect.Type; import java.util.ArrayList; @@ -35,8 +36,11 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; import javax.inject.Inject; +import javax.inject.Singleton; import javax.swing.JOptionPane; import javax.swing.SwingUtilities; +import lombok.AccessLevel; +import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; @@ -70,6 +74,7 @@ import net.runelite.client.util.ImageUtil; ) @Slf4j +@Singleton public class InventorySetupPlugin extends Plugin { private static final String CONFIG_GROUP = "inventorysetups"; @@ -109,9 +114,23 @@ public class InventorySetupPlugin extends Plugin private boolean highlightDifference; + private boolean getHighlightDifferences; + @Getter(AccessLevel.PUBLIC) + private Color getHighlightColor; + @Getter(AccessLevel.PUBLIC) + private boolean getStackDifference; + @Getter(AccessLevel.PUBLIC) + private boolean getVariationDifference; + @Getter(AccessLevel.PACKAGE) + private boolean getBankHighlight; + @Getter(AccessLevel.PACKAGE) + private Color getBankHighlightColor; + @Override public void startUp() { + updateConfigOptions(); + overlayManager.add(overlay); panel = new InventorySetupPluginPanel(this, itemManager); @@ -242,8 +261,9 @@ public class InventorySetupPlugin extends Plugin { if (event.getGroup().equals(CONFIG_GROUP)) { + updateConfigOptions(); // only allow highlighting if the config is enabled and the player is logged in - highlightDifference = config.getHighlightDifferences() && client.getGameState() == GameState.LOGGED_IN; + highlightDifference = this.getHighlightDifferences && client.getGameState() == GameState.LOGGED_IN; final String setupName = panel.getSelectedInventorySetup(); if (highlightDifference && !setupName.isEmpty()) { @@ -338,7 +358,7 @@ public class InventorySetupPlugin extends Plugin // set highlighting case LOGGED_IN: - highlightDifference = config.getHighlightDifferences(); + highlightDifference = this.getHighlightDifferences; break; default: @@ -433,4 +453,14 @@ public class InventorySetupPlugin extends Plugin .filter(id -> id != -1) .toArray(); } + + private void updateConfigOptions() + { + this.getHighlightDifferences = config.getHighlightDifferences(); + this.getHighlightColor = config.getHighlightColor(); + this.getStackDifference = config.getHighlightDifferences(); + this.getVariationDifference = config.getVariationDifference(); + this.getBankHighlight = config.getBankHighlight(); + this.getBankHighlightColor = config.getBankHighlightColor(); + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java index 0d5cb02f4d..6e0b8b99ba 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java @@ -28,16 +28,17 @@ package net.runelite.client.plugins.inventorysetups.ui; import java.awt.BorderLayout; import java.awt.Color; import java.util.ArrayList; +import javax.inject.Singleton; import javax.swing.JLabel; import javax.swing.JPanel; import net.runelite.client.game.AsyncBufferedImage; import net.runelite.client.game.ItemManager; import net.runelite.client.game.ItemVariationMapping; -import net.runelite.client.plugins.inventorysetups.InventorySetupConfig; import net.runelite.client.plugins.inventorysetups.InventorySetupItem; import net.runelite.client.plugins.inventorysetups.InventorySetupPlugin; import net.runelite.client.ui.ColorScheme; +@Singleton public abstract class InventorySetupContainerPanel extends JPanel { protected ItemManager itemManager; @@ -99,10 +100,9 @@ public abstract class InventorySetupContainerPanel extends JPanel // important note: do not use item names for comparisons // they are all empty to avoid clientThread usage when highlighting - final InventorySetupConfig config = plugin.getConfig(); - final Color highlightColor = config.getHighlightColor(); + final Color highlightColor = plugin.getGetHighlightColor(); - if (config.getStackDifference() && currItem.getQuantity() != savedItem.getQuantity()) + if (plugin.isGetStackDifference() && currItem.getQuantity() != savedItem.getQuantity()) { containerSlot.setBackground(highlightColor); return; @@ -111,7 +111,7 @@ public abstract class InventorySetupContainerPanel extends JPanel int currId = currItem.getId(); int checkId = savedItem.getId(); - if (!config.getVariationDifference()) + if (!plugin.isGetVariationDifference()) { currId = ItemVariationMapping.map(currId); checkId = ItemVariationMapping.map(checkId); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java index b964a205eb..2ca6687660 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java @@ -28,6 +28,7 @@ package net.runelite.client.plugins.inventorysetups.ui; import java.awt.GridLayout; import java.util.ArrayList; import java.util.HashMap; +import javax.inject.Singleton; import javax.swing.JPanel; import net.runelite.api.EquipmentInventorySlot; import net.runelite.client.game.ItemManager; @@ -36,6 +37,7 @@ import net.runelite.client.plugins.inventorysetups.InventorySetupItem; import net.runelite.client.plugins.inventorysetups.InventorySetupPlugin; import net.runelite.client.ui.ColorScheme; +@Singleton public class InventorySetupEquipmentPanel extends InventorySetupContainerPanel { private HashMap equipmentSlots; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java index 689773b517..3310b2f25c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java @@ -27,13 +27,14 @@ package net.runelite.client.plugins.inventorysetups.ui; import java.awt.GridLayout; import java.util.ArrayList; +import javax.inject.Singleton; import javax.swing.JPanel; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.inventorysetups.InventorySetup; import net.runelite.client.plugins.inventorysetups.InventorySetupItem; import net.runelite.client.plugins.inventorysetups.InventorySetupPlugin; import net.runelite.client.ui.ColorScheme; - +@Singleton public class InventorySetupInventoryPanel extends InventorySetupContainerPanel { private static final int ITEMS_PER_ROW = 4; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java index 73f0033819..339ba435a3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java @@ -34,6 +34,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; import java.util.ArrayList; +import javax.inject.Singleton; import javax.swing.Box; import javax.swing.BoxLayout; import javax.swing.ImageIcon; @@ -51,6 +52,7 @@ import net.runelite.client.ui.PluginPanel; import net.runelite.client.ui.components.PluginErrorPanel; import net.runelite.client.util.ImageUtil; +@Singleton public class InventorySetupPluginPanel extends PluginPanel { private static ImageIcon ADD_ICON; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupSlot.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupSlot.java index 0af6a142cb..bf05e88178 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupSlot.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupSlot.java @@ -27,16 +27,18 @@ package net.runelite.client.plugins.inventorysetups.ui; import java.awt.Color; import java.awt.Dimension; +import javax.inject.Singleton; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; import net.runelite.client.game.AsyncBufferedImage; -public class InventorySetupSlot extends JPanel +@Singleton +class InventorySetupSlot extends JPanel { private final JLabel imageLabel; - public InventorySetupSlot(Color color) + InventorySetupSlot(Color color) { imageLabel = new JLabel(); imageLabel.setVerticalAlignment(SwingConstants.CENTER); @@ -46,7 +48,7 @@ public class InventorySetupSlot extends JPanel } - public void setImageLabel(String toolTip, AsyncBufferedImage itemImage) + void setImageLabel(String toolTip, AsyncBufferedImage itemImage) { if (itemImage == null || toolTip == null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsOverlay.java index de7d786eb6..85560e0133 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsOverlay.java @@ -29,17 +29,19 @@ import java.awt.Graphics2D; import java.awt.Rectangle; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.widgets.WidgetItem; import net.runelite.client.game.ItemManager; import net.runelite.client.ui.overlay.WidgetItemOverlay; +@Singleton public class InventoryTagsOverlay extends WidgetItemOverlay { private final ItemManager itemManager; private final InventoryTagsPlugin plugin; @Inject - private InventoryTagsOverlay(ItemManager itemManager, InventoryTagsPlugin plugin) + private InventoryTagsOverlay(final ItemManager itemManager, final InventoryTagsPlugin plugin) { this.itemManager = itemManager; this.plugin = plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java index 23e518e1f5..4438f22e34 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java @@ -30,9 +30,11 @@ import com.google.inject.Provides; import java.awt.Color; import java.util.List; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.MenuAction; import net.runelite.api.MenuEntry; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.MenuOpened; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.WidgetMenuOptionClicked; @@ -53,6 +55,7 @@ import net.runelite.client.util.Text; tags = {"highlight", "items", "overlay", "tagging"}, enabledByDefault = false ) +@Singleton public class InventoryTagsPlugin extends Plugin { private static final String ITEM_KEY_PREFIX = "item_"; @@ -103,6 +106,11 @@ public class InventoryTagsPlugin extends Plugin private boolean editorMode; + private Color group1Color; + private Color group2Color; + private Color group3Color; + private Color group4Color; + @Provides InventoryTagsConfig provideConfig(ConfigManager configManager) { @@ -133,6 +141,7 @@ public class InventoryTagsPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); refreshInventoryMenuOptions(); overlayManager.add(overlay); } @@ -227,13 +236,13 @@ public class InventoryTagsPlugin extends Plugin switch (name) { case SETNAME_GROUP_1: - return config.getGroup1Color(); + return this.group1Color; case SETNAME_GROUP_2: - return config.getGroup2Color(); + return this.group2Color; case SETNAME_GROUP_3: - return config.getGroup3Color(); + return this.group3Color; case SETNAME_GROUP_4: - return config.getGroup4Color(); + return this.group4Color; } return null; @@ -265,4 +274,21 @@ public class InventoryTagsPlugin extends Plugin menuManager.addManagedCustomMenu(RESIZABLE_BOTTOM_LINE_INVENTORY_TAB_CONFIGURE); } } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (event.getGroup().equals("inventorytags")) + { + updateConfig(); + } + } + + private void updateConfig() + { + this.group1Color = config.getGroup1Color(); + this.group2Color = config.getGroup2Color(); + this.group3Color = config.getGroup3Color(); + this.group4Color = config.getGroup4Color(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerMode.java index 18405155ee..c6707f8701 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerMode.java @@ -24,10 +24,11 @@ */ package net.runelite.client.plugins.inventoryviewer; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; -@Getter +@Getter(AccessLevel.PACKAGE) @RequiredArgsConstructor public enum InventoryViewerMode { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java index efe6df33a0..c4d82e5a90 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java @@ -33,6 +33,7 @@ import java.awt.Point; import java.awt.Rectangle; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.api.InventoryID; @@ -50,6 +51,7 @@ import net.runelite.client.ui.overlay.components.ImageComponent; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; +@Singleton class InventoryViewerOverlay extends Overlay { private static final int INVENTORY_SIZE = 28; @@ -58,14 +60,14 @@ class InventoryViewerOverlay extends Overlay private final Client client; private final ItemManager itemManager; - private final InventoryViewerConfig config; + private final InventoryViewerPlugin plugin; private final PanelComponent wrapperComponent = new PanelComponent(); private final PanelComponent inventoryComponent = new PanelComponent(); private final TitleComponent freeSlotsComponent = TitleComponent.builder().build(); @Inject - private InventoryViewerOverlay(Client client, ItemManager itemManager, InventoryViewerConfig config) + private InventoryViewerOverlay(final Client client, final ItemManager itemManager, final InventoryViewerPlugin plugin) { setPosition(OverlayPosition.BOTTOM_RIGHT); @@ -89,13 +91,13 @@ class InventoryViewerOverlay extends Overlay this.itemManager = itemManager; this.client = client; - this.config = config; + this.plugin = plugin; } @Override public Dimension render(Graphics2D graphics) { - if (config.hideWhenInvOpen() + if (plugin.isHideWhenInvOpen() && client.getVar(VarClientInt.PLAYER_INVENTORY_OPENED) == 3) { return null; @@ -113,7 +115,7 @@ class InventoryViewerOverlay extends Overlay final Item[] items = itemContainer.getItems(); - if (config.viewerMode() == InventoryViewerMode.GROUPED) + if (plugin.getViewerMode() == InventoryViewerMode.GROUPED) { Multiset totals = HashMultiset.create(); for (Item item : items) @@ -140,7 +142,7 @@ class InventoryViewerOverlay extends Overlay } wrapperComponent.getChildren().add(inventoryComponent); - if (config.showFreeSlots()) + if (plugin.isShowFreeSlots()) { freeSlotsComponent.setText(remaining + " free"); wrapperComponent.setPreferredSize(new Dimension(Math.min(totals.elementSet().size(), 4) * (PLACEHOLDER_WIDTH + 6) + ComponentConstants.STANDARD_BORDER * 2, 0)); @@ -175,7 +177,7 @@ class InventoryViewerOverlay extends Overlay wrapperComponent.getChildren().add(inventoryComponent); - if (config.showFreeSlots()) + if (plugin.isShowFreeSlots()) { freeSlotsComponent.setText(remaining + " free"); wrapperComponent.setPreferredSize(new Dimension(4 * (PLACEHOLDER_WIDTH + 6) + ComponentConstants.STANDARD_BORDER * 2, 0)); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerPlugin.java index 71032a10c7..114809287e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerPlugin.java @@ -26,7 +26,12 @@ package net.runelite.client.plugins.inventoryviewer; import com.google.inject.Provides; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; +import net.runelite.api.events.ConfigChanged; import net.runelite.client.config.ConfigManager; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; @@ -37,6 +42,7 @@ import net.runelite.client.ui.overlay.OverlayManager; tags = {"alternate", "items", "overlay", "second"}, enabledByDefault = false ) +@Singleton public class InventoryViewerPlugin extends Plugin { static final String CONFIG_GROUP_KEY = "inventoryviewer"; @@ -47,6 +53,16 @@ public class InventoryViewerPlugin extends Plugin @Inject private OverlayManager overlayManager; + @Inject + private InventoryViewerConfig config; + + @Getter(AccessLevel.PACKAGE) + private InventoryViewerMode viewerMode; + @Getter(AccessLevel.PACKAGE) + private boolean showFreeSlots; + @Getter(AccessLevel.PACKAGE) + private boolean hideWhenInvOpen; + @Provides InventoryViewerConfig provideConfig(ConfigManager configManager) { @@ -56,12 +72,29 @@ public class InventoryViewerPlugin extends Plugin @Override public void startUp() { + updateConfig(); overlayManager.add(overlay); } + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (event.getGroup().equals(CONFIG_GROUP_KEY)) + { + updateConfig(); + } + } + @Override public void shutDown() { overlayManager.remove(overlay); } + + private void updateConfig() + { + this.viewerMode = config.viewerMode(); + this.showFreeSlots = config.showFreeSlots(); + this.hideWhenInvOpen = config.hideWhenInvOpen(); + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java index 18b9d6386b..a866064623 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java @@ -284,8 +284,8 @@ public interface ItemChargeConfig extends Config { return false; } - - + + @ConfigItem( keyName = "showSlayerBracelets", name = "Show Slayer Bracelets Charges", @@ -298,12 +298,11 @@ public interface ItemChargeConfig extends Config } - @ConfigItem( - keyName = "expeditious", - name = "", - description = "", - hidden = true + keyName = "expeditious", + name = "", + description = "", + hidden = true ) default int expeditious() { @@ -311,9 +310,9 @@ public interface ItemChargeConfig extends Config } @ConfigItem( - keyName = "expeditious", - name = "", - description = "" + keyName = "expeditious", + name = "", + description = "" ) void expeditious(int expeditious); @@ -337,10 +336,10 @@ public interface ItemChargeConfig extends Config @ConfigItem( - keyName = "xericTalisman", - name = "", - description = "", - hidden = true + keyName = "xericTalisman", + name = "", + description = "", + hidden = true ) default int xericTalisman() { @@ -348,17 +347,17 @@ public interface ItemChargeConfig extends Config } @ConfigItem( - keyName = "xericTalisman", - name = "", - description = "" + keyName = "xericTalisman", + name = "", + description = "" ) void xericTalisman(int xericTalisman); @ConfigItem( - keyName = "showSoulBearerCharges", - name = "Show Soul Bearer Charges", - description = "Configures if Soul Bearer item charge is shown", - position = 19 + keyName = "showSoulBearerCharges", + name = "Show Soul Bearer Charges", + description = "Configures if Soul Bearer item charge is shown", + position = 19 ) default boolean showSoulBearerCharges() { @@ -366,10 +365,10 @@ public interface ItemChargeConfig extends Config } @ConfigItem( - keyName = "soulBearer", - name = "", - description = "", - hidden = true + keyName = "soulBearer", + name = "", + description = "", + hidden = true ) default int soulBearer() { @@ -377,17 +376,17 @@ public interface ItemChargeConfig extends Config } @ConfigItem( - keyName = "soulBearer", - name = "", - description = "" + keyName = "soulBearer", + name = "", + description = "" ) void soulBearer(int soulBearer); @ConfigItem( - keyName = "showChronicleCharges", - name = "Show Chronicle Charges", - description = "Configures if Chronicle item charge is shown", - position = 20 + keyName = "showChronicleCharges", + name = "Show Chronicle Charges", + description = "Configures if Chronicle item charge is shown", + position = 20 ) default boolean showChronicleCharges() { @@ -395,23 +394,21 @@ public interface ItemChargeConfig extends Config } @ConfigItem( - keyName = "showXericTalismanCharges", - name = "Show Xeric's Talisman Charges", - description = "Configures if Xeric's Talisman item charge is shown", - position = 21 + keyName = "showXericTalismanCharges", + name = "Show Xeric's Talisman Charges", + description = "Configures if Xeric's Talisman item charge is shown", + position = 21 ) default boolean showXericTalismanCharges() { return false; } - - @ConfigItem( - keyName = "showrecoil", - name = "Show If Recoil is activated", - description = "Configures if Recoil is activated", - position = 22 + keyName = "showrecoil", + name = "Show If Recoil is activated", + description = "Configures if Recoil is activated", + position = 22 ) default boolean showrecoil() { @@ -419,10 +416,10 @@ public interface ItemChargeConfig extends Config } @ConfigItem( - keyName = "chronicle", - name = "", - description = "", - hidden = true + keyName = "chronicle", + name = "", + description = "", + hidden = true ) default int chronicle() { @@ -430,9 +427,9 @@ public interface ItemChargeConfig extends Config } @ConfigItem( - keyName = "chronicle", - name = "", - description = "" + keyName = "chronicle", + name = "", + description = "" ) void chronicle(int chronicle); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeInfobox.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeInfobox.java index 7ee70d44b5..82bd2e411a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeInfobox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeInfobox.java @@ -26,11 +26,12 @@ package net.runelite.client.plugins.itemcharges; import java.awt.Color; import java.awt.image.BufferedImage; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.EquipmentInventorySlot; import net.runelite.client.ui.overlay.infobox.Counter; -@Getter +@Getter(AccessLevel.PACKAGE) class ItemChargeInfobox extends Counter { private final ItemChargePlugin plugin; @@ -38,12 +39,12 @@ class ItemChargeInfobox extends Counter private final EquipmentInventorySlot slot; ItemChargeInfobox( - ItemChargePlugin plugin, - BufferedImage image, - String name, - int charges, - ItemWithSlot item, - EquipmentInventorySlot slot) + final ItemChargePlugin plugin, + final BufferedImage image, + final String name, + final int charges, + final ItemWithSlot item, + final EquipmentInventorySlot slot) { super(image, plugin, charges); setTooltip(name); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java index 31db7daad1..6253985981 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java @@ -29,6 +29,7 @@ import java.awt.Graphics2D; import java.awt.Point; import java.awt.Rectangle; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.ItemID; import net.runelite.api.widgets.WidgetItem; import static net.runelite.client.plugins.itemcharges.ItemChargeType.ABYSSAL_BRACELET; @@ -42,16 +43,15 @@ import net.runelite.client.ui.FontManager; import net.runelite.client.ui.overlay.WidgetItemOverlay; import net.runelite.client.ui.overlay.components.TextComponent; +@Singleton class ItemChargeOverlay extends WidgetItemOverlay { - private final ItemChargePlugin itemChargePlugin; - private final ItemChargeConfig config; + private final ItemChargePlugin plugin; @Inject - ItemChargeOverlay(ItemChargePlugin itemChargePlugin, ItemChargeConfig config) + ItemChargeOverlay(final ItemChargePlugin itemChargePlugin) { - this.itemChargePlugin = itemChargePlugin; - this.config = config; + this.plugin = itemChargePlugin; showOnInventory(); showOnEquipment(); } @@ -69,72 +69,72 @@ class ItemChargeOverlay extends WidgetItemOverlay int charges; if (itemId == ItemID.DODGY_NECKLACE) { - if (!config.showDodgyCount()) + if (!plugin.isShowDodgyCount()) { return; } - charges = config.dodgyNecklace(); + charges = plugin.getDodgyNecklace(); } else if (itemId == ItemID.BRACELET_OF_SLAUGHTER) { - if (!config.showSlayerBracelets()) + if (!plugin.isShowSlayerBracelets()) { return; } - charges = config.slaughter(); + charges = plugin.getSlaughter(); } else if (itemId == ItemID.EXPEDITIOUS_BRACELET) { - if (!config.showSlayerBracelets()) + if (!plugin.isShowSlayerBracelets()) { return; } - charges = config.expeditious(); + charges = plugin.getExpeditious(); } else if (itemId == ItemID.BINDING_NECKLACE) { - if (!config.showBindingNecklaceCharges()) + if (!plugin.isShowBindingNecklaceCharges()) { return; } - charges = config.bindingNecklace(); + charges = plugin.getBindingNecklace(); } else if (itemId == ItemID.XERICS_TALISMAN) { - if (!config.showXericTalismanCharges()) + if (!plugin.isShowXericTalismanCharges()) { return; } - charges = config.xericTalisman(); + charges = plugin.getXericTalisman(); } else if (itemId == ItemID.SOUL_BEARER) { - if (!config.showSoulBearerCharges()) + if (!plugin.isShowSoulBearerCharges()) { return; } - charges = config.soulBearer(); + charges = plugin.getSoulBearer(); } else if (itemId == ItemID.CHRONICLE) { - if (!config.showChronicleCharges()) + if (!plugin.isShowChronicleCharges()) { return; } - charges = config.chronicle(); + charges = plugin.getChronicle(); } else if (itemId >= ItemID.EXPLORERS_RING_1 && itemId <= ItemID.EXPLORERS_RING_4) { - if (!config.showExplorerRingCharges()) + if (!plugin.isShowExplorerRingCharges()) { return; } - charges = config.explorerRing(); + charges = plugin.getExplorerRing(); } else @@ -146,13 +146,13 @@ class ItemChargeOverlay extends WidgetItemOverlay } ItemChargeType type = chargeItem.getType(); - if ((type == TELEPORT && !config.showTeleportCharges()) - || (type == FUNGICIDE_SPRAY && !config.showFungicideCharges()) - || (type == IMPBOX && !config.showImpCharges()) - || (type == WATERCAN && !config.showWateringCanCharges()) - || (type == WATERSKIN && !config.showWaterskinCharges()) - || (type == BELLOWS && !config.showBellowCharges()) - || (type == ABYSSAL_BRACELET && !config.showAbyssalBraceletCharges())) + if ((type == TELEPORT && !plugin.isShowTeleportCharges()) + || (type == FUNGICIDE_SPRAY && !plugin.isShowFungicideCharges()) + || (type == IMPBOX && !plugin.isShowImpCharges()) + || (type == WATERCAN && !plugin.isShowWateringCanCharges()) + || (type == WATERSKIN && !plugin.isShowWaterskinCharges()) + || (type == BELLOWS && !plugin.isShowBellowCharges()) + || (type == ABYSSAL_BRACELET && !plugin.isShowAbyssalBraceletCharges())) { return; } @@ -164,14 +164,14 @@ class ItemChargeOverlay extends WidgetItemOverlay final TextComponent textComponent = new TextComponent(); textComponent.setPosition(new Point(bounds.x, bounds.y + 1 + graphics.getFontMetrics().getMaxAscent() - graphics.getFontMetrics().getMaxDescent())); textComponent.setText(charges < 0 ? "?" : String.valueOf(charges)); - textComponent.setColor(itemChargePlugin.getColor(charges)); + textComponent.setColor(plugin.getColor(charges)); textComponent.render(graphics); } private boolean displayOverlay() { - return config.showTeleportCharges() || config.showDodgyCount() || config.showFungicideCharges() - || config.showImpCharges() || config.showWateringCanCharges() || config.showWaterskinCharges() - || config.showBellowCharges() || config.showAbyssalBraceletCharges() || config.showExplorerRingCharges(); + return plugin.isShowTeleportCharges() || plugin.isShowDodgyCount() || plugin.isShowFungicideCharges() + || plugin.isShowImpCharges() || plugin.isShowWateringCanCharges() || plugin.isShowWaterskinCharges() + || plugin.isShowBellowCharges() || plugin.isShowAbyssalBraceletCharges() || plugin.isShowExplorerRingCharges(); } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java index 5267d8c0f4..16f7184da9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java @@ -32,6 +32,7 @@ import java.awt.image.BufferedImage; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ChatMessageType; @@ -69,6 +70,7 @@ import static net.runelite.api.ItemID.RING_OF_RECOIL; description = "Show number of item charges remaining", tags = {"inventory", "notifications", "overlay"} ) +@Singleton public class ItemChargePlugin extends Plugin { private static final Pattern DODGY_CHECK_PATTERN = Pattern.compile( @@ -126,8 +128,6 @@ public class ItemChargePlugin extends Plugin private static final int MAX_BINDING_CHARGES = 16; private static final int MAX_EXPLORER_RING_CHARGES = 30; - private int lastExplorerRingCharge = -1; - @Getter(AccessLevel.PACKAGE) private boolean ringOfRecoilAvailable = false; @@ -164,6 +164,65 @@ public class ItemChargePlugin extends Plugin // Limits destroy callback to once per tick private int lastCheckTick; + private Color veryLowWarningColor; + private Color lowWarningolor; + private int veryLowWarning; + private int lowWarning; + @Getter(AccessLevel.PACKAGE) + private boolean showTeleportCharges; + @Getter(AccessLevel.PACKAGE) + private boolean showDodgyCount; + private boolean dodgyNotification; + @Getter(AccessLevel.PACKAGE) + private int dodgyNecklace; + @Getter(AccessLevel.PACKAGE) + private boolean showImpCharges; + @Getter(AccessLevel.PACKAGE) + private boolean showFungicideCharges; + @Getter(AccessLevel.PACKAGE) + private boolean showWateringCanCharges; + @Getter(AccessLevel.PACKAGE) + private boolean showWaterskinCharges; + @Getter(AccessLevel.PACKAGE) + private boolean showBellowCharges; + @Getter(AccessLevel.PACKAGE) + private boolean showBasketCharges; + @Getter(AccessLevel.PACKAGE) + private boolean showSackCharges; + @Getter(AccessLevel.PACKAGE) + private boolean showAbyssalBraceletCharges; + private boolean recoilNotification; + @Getter(AccessLevel.PACKAGE) + private boolean showBindingNecklaceCharges; + @Getter(AccessLevel.PACKAGE) + private int bindingNecklace; + private boolean bindingNotification; + @Getter(AccessLevel.PACKAGE) + private boolean showExplorerRingCharges; + @Getter(AccessLevel.PACKAGE) + private int explorerRing; + private boolean showInfoboxes; + @Getter(AccessLevel.PACKAGE) + private boolean showSlayerBracelets; + @Getter(AccessLevel.PACKAGE) + private int expeditious; + @Getter(AccessLevel.PACKAGE) + private int slaughter; + @Getter(AccessLevel.PACKAGE) + private int xericTalisman; + @Getter(AccessLevel.PACKAGE) + private boolean showSoulBearerCharges; + @Getter(AccessLevel.PACKAGE) + private int soulBearer; + @Getter(AccessLevel.PACKAGE) + private boolean showChronicleCharges; + @Getter(AccessLevel.PACKAGE) + private boolean showXericTalismanCharges; + @Getter(AccessLevel.PACKAGE) + private boolean showrecoil; + @Getter(AccessLevel.PACKAGE) + private int chronicle; + @Provides ItemChargeConfig getConfig(ConfigManager configManager) { @@ -173,6 +232,8 @@ public class ItemChargePlugin extends Plugin @Override protected void startUp() { + updateConfig(); + overlayManager.add(overlay); overlayManager.add(recoilOverlay); recoilRingImage = itemManager.getImage(RING_OF_RECOIL); @@ -195,39 +256,41 @@ public class ItemChargePlugin extends Plugin return; } - if (!config.showInfoboxes()) + updateConfig(); + + if (!this.showInfoboxes) { infoBoxManager.removeIf(ItemChargeInfobox.class::isInstance); return; } - if (!config.showTeleportCharges()) + if (!this.showTeleportCharges) { removeInfobox(ItemWithSlot.TELEPORT); } - if (!config.showAbyssalBraceletCharges()) + if (!this.showAbyssalBraceletCharges) { removeInfobox(ItemWithSlot.ABYSSAL_BRACELET); } - if (!config.showDodgyCount()) + if (!this.showDodgyCount) { removeInfobox(ItemWithSlot.DODGY_NECKLACE); } - if (!config.showSlayerBracelets()) + if (!this.showSlayerBracelets) { removeInfobox(ItemWithSlot.BRACELET_OF_SLAUGHTER); removeInfobox(ItemWithSlot.EXPEDITIOUS_BRACELET); } - if (!config.showBindingNecklaceCharges()) + if (!this.showBindingNecklaceCharges) { removeInfobox(ItemWithSlot.BINDING_NECKLACE); } - if (!config.showExplorerRingCharges()) + if (!this.showExplorerRingCharges) { removeInfobox(ItemWithSlot.EXPLORER_RING); } @@ -256,7 +319,7 @@ public class ItemChargePlugin extends Plugin if (event.getType() == ChatMessageType.GAMEMESSAGE || event.getType() == ChatMessageType.SPAM) { - if (config.recoilNotification() && message.contains(RING_OF_RECOIL_BREAK_MESSAGE)) + if (this.recoilNotification && message.contains(RING_OF_RECOIL_BREAK_MESSAGE)) { notifier.notify("Your Ring of Recoil has shattered"); } @@ -286,7 +349,7 @@ public class ItemChargePlugin extends Plugin } else if (dodgyBreakMatcher.find()) { - if (config.dodgyNotification()) + if (this.dodgyNotification) { notifier.notify("Your dodgy necklace has crumbled to dust."); } @@ -295,7 +358,7 @@ public class ItemChargePlugin extends Plugin } else if (message.contains(BINDING_BREAK_TEXT)) { - if (config.bindingNotification()) + if (this.bindingNotification) { notifier.notify(BINDING_BREAK_TEXT); } @@ -305,7 +368,7 @@ public class ItemChargePlugin extends Plugin } else if (bindingNecklaceUsedMatcher.find()) { - updateBindingNecklaceCharges(config.bindingNecklace() - 1); + updateBindingNecklaceCharges(this.bindingNecklace - 1); } else if (bindingNecklaceCheckMatcher.find()) { @@ -360,40 +423,40 @@ public class ItemChargePlugin extends Plugin @Subscribe public void onItemContainerChanged(ItemContainerChanged event) { - if (event.getItemContainer() != client.getItemContainer(InventoryID.EQUIPMENT) || !config.showInfoboxes()) + if (event.getItemContainer() != client.getItemContainer(InventoryID.EQUIPMENT) || !this.showInfoboxes) { return; } final Item[] items = event.getItemContainer().getItems(); - if (config.showTeleportCharges()) + if (this.showTeleportCharges) { updateJewelleryInfobox(ItemWithSlot.TELEPORT, items); } - if (config.showDodgyCount()) + if (this.showDodgyCount) { updateJewelleryInfobox(ItemWithSlot.DODGY_NECKLACE, items); } - if (config.showAbyssalBraceletCharges()) + if (this.showAbyssalBraceletCharges) { updateJewelleryInfobox(ItemWithSlot.ABYSSAL_BRACELET, items); } - if (config.showSlayerBracelets()) + if (this.showSlayerBracelets) { updateJewelleryInfobox(ItemWithSlot.BRACELET_OF_SLAUGHTER, items); updateJewelleryInfobox(ItemWithSlot.EXPEDITIOUS_BRACELET, items); } - if (config.showBindingNecklaceCharges()) + if (this.showBindingNecklaceCharges) { updateJewelleryInfobox(ItemWithSlot.BINDING_NECKLACE, items); } - if (config.showExplorerRingCharges()) + if (this.showExplorerRingCharges) { updateJewelleryInfobox(ItemWithSlot.EXPLORER_RING, items); } @@ -410,10 +473,12 @@ public class ItemChargePlugin extends Plugin if (braceletText.contains("bracelet of slaughter")) { config.slaughter(MAX_SLAUGHTER_CHARGES); + this.slaughter = MAX_SLAUGHTER_CHARGES; } else if (braceletText.contains("expeditious bracelet")) { config.expeditious(MAX_EXPEDITIOUS_CHARGES); + this.expeditious = MAX_EXPEDITIOUS_CHARGES; } } @@ -506,7 +571,7 @@ public class ItemChargePlugin extends Plugin { if (client.getLocalPlayer().getSpotAnimation() == GraphicID.XERIC_TELEPORT) { - final int xericCharges = Math.max(config.xericTalisman() - 1, 0); + final int xericCharges = Math.max(this.xericTalisman - 1, 0); updateXericCharges(xericCharges); } } @@ -531,6 +596,7 @@ public class ItemChargePlugin extends Plugin private void onVarbitChanged(VarbitChanged event) { int explorerRingCharge = client.getVar(Varbits.EXPLORER_RING_ALCHS); + int lastExplorerRingCharge = -1; if (lastExplorerRingCharge != explorerRingCharge) { updateExplorerRingCharges(explorerRingCharge); @@ -540,8 +606,9 @@ public class ItemChargePlugin extends Plugin private void updateDodgyNecklaceCharges(final int value) { config.dodgyNecklace(value); + this.dodgyNecklace = value; - if (config.showInfoboxes() && config.showDodgyCount()) + if (this.showInfoboxes && this.showDodgyCount) { final ItemContainer itemContainer = client.getItemContainer(InventoryID.EQUIPMENT); @@ -557,8 +624,9 @@ public class ItemChargePlugin extends Plugin private void updateBraceletOfSlaughterCharges(final int value) { config.slaughter(value); + this.slaughter = value; - if (config.showInfoboxes() && config.showSlayerBracelets()) + if (this.showInfoboxes && this.showSlayerBracelets) { final ItemContainer itemContainer = client.getItemContainer(InventoryID.EQUIPMENT); @@ -574,8 +642,9 @@ public class ItemChargePlugin extends Plugin private void updateExpeditiousCharges(final int value) { config.expeditious(value); + this.expeditious = value; - if (config.showInfoboxes() && config.showSlayerBracelets()) + if (this.showInfoboxes && this.showSlayerBracelets) { final ItemContainer itemContainer = client.getItemContainer(InventoryID.EQUIPMENT); @@ -591,8 +660,9 @@ public class ItemChargePlugin extends Plugin private void updateBindingNecklaceCharges(final int value) { config.bindingNecklace(value); + this.bindingNecklace = value; - if (config.showInfoboxes() && config.showBindingNecklaceCharges()) + if (this.showInfoboxes && this.showBindingNecklaceCharges) { final ItemContainer itemContainer = client.getItemContainer(InventoryID.EQUIPMENT); @@ -608,24 +678,28 @@ public class ItemChargePlugin extends Plugin private void updateXericCharges(int xericCharges) { config.xericTalisman(xericCharges); + this.xericTalisman = xericCharges; } private void updateSoulBearerCharges(int soulBearerCharges) { config.soulBearer(soulBearerCharges); + this.soulBearer = soulBearerCharges; } private void updateChronicleCharges(int chronicleCharges) { config.chronicle(chronicleCharges); + this.chronicle = chronicleCharges; } private void updateExplorerRingCharges(final int value) { // Note: Varbit counts upwards. We count down from the maximum charges. config.explorerRing(MAX_EXPLORER_RING_CHARGES - value); + this.explorerRing = MAX_EXPLORER_RING_CHARGES - value; - if (config.showInfoboxes() && config.showExplorerRingCharges()) + if (this.showInfoboxes && this.showExplorerRingCharges) { final ItemContainer itemContainer = client.getItemContainer(InventoryID.EQUIPMENT); @@ -694,23 +768,23 @@ public class ItemChargePlugin extends Plugin { if (id == ItemID.DODGY_NECKLACE && type == ItemWithSlot.DODGY_NECKLACE) { - charges = config.dodgyNecklace(); + charges = this.dodgyNecklace; } else if (id == ItemID.BRACELET_OF_SLAUGHTER && type == ItemWithSlot.BRACELET_OF_SLAUGHTER) { - charges = config.slaughter(); + charges = this.slaughter; } else if (id == ItemID.EXPEDITIOUS_BRACELET && type == ItemWithSlot.EXPEDITIOUS_BRACELET) { - charges = config.expeditious(); + charges = this.expeditious; } else if (id == ItemID.BINDING_NECKLACE && type == ItemWithSlot.BINDING_NECKLACE) { - charges = config.bindingNecklace(); + charges = this.bindingNecklace; } else if ((id >= ItemID.EXPLORERS_RING_1 && id <= ItemID.EXPLORERS_RING_4) && type == ItemWithSlot.EXPLORER_RING) { - charges = config.explorerRing(); + charges = this.explorerRing; } } else if (itemWithCharge.getType() == type.getType()) @@ -751,14 +825,49 @@ public class ItemChargePlugin extends Plugin Color getColor(int charges) { Color color = Color.WHITE; - if (charges <= config.veryLowWarning()) + if (charges <= this.veryLowWarning) { - color = config.veryLowWarningColor(); + color = this.veryLowWarningColor; } - else if (charges <= config.lowWarning()) + else if (charges <= this.lowWarning) { - color = config.lowWarningolor(); + color = this.lowWarningolor; } return color; } + + private void updateConfig() + { + this.veryLowWarningColor = config.veryLowWarningColor(); + this.lowWarningolor = config.lowWarningolor(); + this.veryLowWarning = config.veryLowWarning(); + this.lowWarning = config.lowWarning(); + this.showTeleportCharges = config.showTeleportCharges(); + this.showDodgyCount = config.showDodgyCount(); + this.dodgyNotification = config.dodgyNotification(); + this.dodgyNecklace = config.dodgyNecklace(); + this.showImpCharges = config.showImpCharges(); + this.showFungicideCharges = config.showFungicideCharges(); + this.showWateringCanCharges = config.showWateringCanCharges(); + this.showWaterskinCharges = config.showWaterskinCharges(); + this.showBellowCharges = config.showBellowCharges(); + this.showAbyssalBraceletCharges = config.showAbyssalBraceletCharges(); + this.recoilNotification = config.recoilNotification(); + this.showBindingNecklaceCharges = config.showBindingNecklaceCharges(); + this.bindingNecklace = config.bindingNecklace(); + this.bindingNotification = config.bindingNotification(); + this.showExplorerRingCharges = config.showExplorerRingCharges(); + this.explorerRing = config.explorerRing(); + this.showInfoboxes = config.showInfoboxes(); + this.showSlayerBracelets = config.showSlayerBracelets(); + this.expeditious = config.expeditious(); + this.slaughter = config.slaughter(); + this.xericTalisman = config.xericTalisman(); + this.showSoulBearerCharges = config.showSoulBearerCharges(); + this.soulBearer = config.soulBearer(); + this.showChronicleCharges = config.showChronicleCharges(); + this.showXericTalismanCharges = config.showXericTalismanCharges(); + this.showrecoil = config.showrecoil(); + this.chronicle = config.chronicle(); + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java index af55d54fe7..57e00c2f64 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java @@ -30,7 +30,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.image.BufferedImage; import javax.inject.Inject; -import net.runelite.api.Client; +import javax.inject.Singleton; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.components.ImageComponent; @@ -38,20 +38,19 @@ import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; +@Singleton class ItemRecoilOverlay extends Overlay { private static final Color NOT_ACTIVATED_BACKGROUND_COLOR = new Color(150, 0, 0, 150); private static final Color ACTIVATED_BACKGROUND_COLOR = new Color(0, 150, 0, 150); private final ItemChargePlugin plugin; - private final ItemChargeConfig config; private final PanelComponent imagePanelComponent = new PanelComponent(); @Inject - public ItemRecoilOverlay(Client client, ItemChargePlugin plugin, ItemChargeConfig config) + public ItemRecoilOverlay(final ItemChargePlugin plugin) { setPosition(OverlayPosition.TOP_LEFT); this.plugin = plugin; - this.config = config; } @Override @@ -61,7 +60,7 @@ class ItemRecoilOverlay extends Overlay tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT); this.imagePanelComponent.getChildren().clear(); - if (config.showrecoil()) + if (plugin.isShowrecoil()) { if (plugin.isRingOfRecoilAvailable()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java index 2f2fe76469..6df317f5c6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.itemcharges; import com.google.common.collect.ImmutableMap; import java.util.Map; import javax.annotation.Nullable; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import static net.runelite.api.ItemID.ABYSSAL_BRACELET1; @@ -165,7 +166,7 @@ import static net.runelite.client.plugins.itemcharges.ItemChargeType.WATERCAN; import static net.runelite.client.plugins.itemcharges.ItemChargeType.WATERSKIN; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) enum ItemWithCharge { ABRACE1(ABYSSAL_BRACELET, ABYSSAL_BRACELET1, 1), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithSlot.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithSlot.java index 4e7aec6b52..01d37630ae 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithSlot.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithSlot.java @@ -27,10 +27,11 @@ package net.runelite.client.plugins.itemcharges; import com.google.common.collect.Sets; import java.util.Set; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.EquipmentInventorySlot; -@Getter +@Getter(AccessLevel.PACKAGE) enum ItemWithSlot { ABYSSAL_BRACELET(ItemChargeType.ABYSSAL_BRACELET, EquipmentInventorySlot.GLOVES), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java index 588a51173d..416073704f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.itemidentification; import com.google.inject.Inject; +import com.google.inject.Singleton; import java.awt.Graphics2D; import java.awt.Point; import java.awt.Rectangle; @@ -38,14 +39,15 @@ import net.runelite.client.ui.FontManager; import net.runelite.client.ui.overlay.WidgetItemOverlay; import net.runelite.client.ui.overlay.components.TextComponent; +@Singleton class ItemIdentificationOverlay extends WidgetItemOverlay { - private final ItemIdentificationConfig config; + private final ItemIdentificationPlugin plugin; @Inject - ItemIdentificationOverlay(ItemIdentificationConfig config) + ItemIdentificationOverlay(final ItemIdentificationPlugin plugin) { - this.config = config; + this.plugin = plugin; showOnInventory(); showOnBank(); showOnInterfaces(KEPT_ON_DEATH_GROUP_ID, GUIDE_PRICE_GROUP_ID, LOOTING_BAG_GROUP_ID, SEED_BOX_GROUP_ID, KINGDOM_GROUP_ID); @@ -63,19 +65,19 @@ class ItemIdentificationOverlay extends WidgetItemOverlay switch (iden.type) { case SEED: - if (!config.showSeeds()) + if (!plugin.isShowSeeds()) { return; } break; case HERB: - if (!config.showHerbs()) + if (!plugin.isShowHerbs()) { return; } break; case SAPLING: - if (!config.showSaplings()) + if (!plugin.isShowSaplings()) { return; } @@ -91,8 +93,8 @@ class ItemIdentificationOverlay extends WidgetItemOverlay { final TextComponent textComponent = new TextComponent(); textComponent.setPosition(new Point(bounds.x - 1, bounds.y + bounds.height - 1)); - textComponent.setColor(config.textColor()); - switch (config.identificationType()) + textComponent.setColor(plugin.getTextColor()); + switch (plugin.getIdentificationType()) { case SHORT: textComponent.setText(iden.shortName); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationPlugin.java index 6e4f331765..1a8e9fa293 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationPlugin.java @@ -25,8 +25,14 @@ package net.runelite.client.plugins.itemidentification; import com.google.inject.Provides; +import java.awt.Color; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; +import net.runelite.api.events.ConfigChanged; import net.runelite.client.config.ConfigManager; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; @@ -36,6 +42,7 @@ import net.runelite.client.ui.overlay.OverlayManager; description = "Show identifying text over items with difficult to distinguish sprites", enabledByDefault = false ) +@Singleton public class ItemIdentificationPlugin extends Plugin { @Inject @@ -44,6 +51,20 @@ public class ItemIdentificationPlugin extends Plugin @Inject private ItemIdentificationOverlay overlay; + @Inject + private ItemIdentificationConfig config; + + @Getter(AccessLevel.PACKAGE) + private ItemIdentificationMode identificationType; + @Getter(AccessLevel.PACKAGE) + private Color textColor; + @Getter(AccessLevel.PACKAGE) + private boolean showSeeds; + @Getter(AccessLevel.PACKAGE) + private boolean showHerbs; + @Getter(AccessLevel.PACKAGE) + private boolean showSaplings; + @Provides ItemIdentificationConfig getConfig(ConfigManager configManager) { @@ -53,6 +74,7 @@ public class ItemIdentificationPlugin extends Plugin @Override protected void startUp() { + updateConfig(); overlayManager.add(overlay); } @@ -61,4 +83,24 @@ public class ItemIdentificationPlugin extends Plugin { overlayManager.remove(overlay); } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("itemidentification")) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.identificationType = config.identificationType(); + this.textColor = config.textColor(); + this.showSeeds = config.showSeeds(); + this.showHerbs = config.showHerbs(); + this.showSaplings = config.showSaplings(); + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java index c252bc054c..cd28fbfda6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java @@ -28,6 +28,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.api.InventoryID; @@ -47,6 +48,7 @@ import net.runelite.client.ui.overlay.tooltip.TooltipManager; import net.runelite.client.util.ColorUtil; import net.runelite.client.util.StackFormatter; +@Singleton class ItemPricesOverlay extends Overlay { private static final int INVENTORY_ITEM_WIDGETID = WidgetInfo.INVENTORY.getPackedId(); @@ -54,7 +56,7 @@ class ItemPricesOverlay extends Overlay private static final int BANK_ITEM_WIDGETID = WidgetInfo.BANK_ITEM_CONTAINER.getPackedId(); private final Client client; - private final ItemPricesConfig config; + private final ItemPricesPlugin plugin; private final TooltipManager tooltipManager; private final StringBuilder itemStringBuilder = new StringBuilder(); @@ -62,11 +64,11 @@ class ItemPricesOverlay extends Overlay ItemManager itemManager; @Inject - ItemPricesOverlay(Client client, ItemPricesConfig config, TooltipManager tooltipManager) + ItemPricesOverlay(final Client client, final ItemPricesPlugin plugin, final TooltipManager tooltipManager) { setPosition(OverlayPosition.DYNAMIC); this.client = client; - this.config = config; + this.plugin = plugin; this.tooltipManager = tooltipManager; } @@ -95,7 +97,7 @@ class ItemPricesOverlay extends Overlay switch (action) { case ITEM_USE_ON_WIDGET: - if (!menuEntry.getTarget().contains("High Level Alchemy") || !config.showAlchProfit()) return null; + if (!menuEntry.getTarget().contains("High Level Alchemy") || !plugin.isShowAlchProfit()) return null; case WIDGET_DEFAULT: case ITEM_USE: case ITEM_FIRST_OPTION: @@ -107,7 +109,7 @@ class ItemPricesOverlay extends Overlay switch (groupId) { case WidgetID.INVENTORY_GROUP_ID: - if (config.hideInventory()) + if (plugin.isHideInventory()) { return null; } @@ -130,7 +132,7 @@ class ItemPricesOverlay extends Overlay private String makeValueTooltip(MenuEntry menuEntry) { // Disabling both disables all value tooltips - if (!config.showGEPrice() && !config.showHAValue()) + if (!plugin.isShowGEPrice() && !plugin.isShowHAValue()) { return null; } @@ -199,15 +201,15 @@ class ItemPricesOverlay extends Overlay int haProfit = 0; final int itemHaPrice = Math.round(itemDef.getPrice() * Constants.HIGH_ALCHEMY_MULTIPLIER); - if (config.showGEPrice()) + if (plugin.isShowGEPrice()) { gePrice = itemManager.getItemPrice(id); } - if (config.showHAValue()) + if (plugin.isShowHAValue()) { haPrice = itemManager.getAlchValue(id); } - if (gePrice > 0 && itemHaPrice > 0 && config.showAlchProfit()) + if (gePrice > 0 && itemHaPrice > 0 && plugin.isShowAlchProfit()) { haProfit = calculateHAProfit(itemHaPrice, gePrice); } @@ -227,7 +229,7 @@ class ItemPricesOverlay extends Overlay itemStringBuilder.append("EX: ") .append(StackFormatter.quantityToStackSize(gePrice * qty)) .append(" gp"); - if (config.showEA() && qty > 1) + if (plugin.isShowEA() && qty > 1) { itemStringBuilder.append(" (") .append(StackFormatter.quantityToStackSize(gePrice)) @@ -244,7 +246,7 @@ class ItemPricesOverlay extends Overlay itemStringBuilder.append("HA: ") .append(StackFormatter.quantityToStackSize(haValue * qty)) .append(" gp"); - if (config.showEA() && qty > 1) + if (plugin.isShowEA() && qty > 1) { itemStringBuilder.append(" (") .append(StackFormatter.quantityToStackSize(haValue)) @@ -260,7 +262,7 @@ class ItemPricesOverlay extends Overlay itemStringBuilder.append("HA Profit: ") .append(ColorUtil.wrapWithColorTag(String.valueOf(haProfit * qty), haColor)) .append(" gp"); - if (config.showEA() && qty > 1) + if (plugin.isShowEA() && qty > 1) { itemStringBuilder.append(" (") .append(ColorUtil.wrapWithColorTag(String.valueOf(haProfit), haColor)) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesPlugin.java index 2434faade3..302c9d8728 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesPlugin.java @@ -26,7 +26,12 @@ package net.runelite.client.plugins.itemprices; import com.google.inject.Provides; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; +import net.runelite.api.events.ConfigChanged; import net.runelite.client.config.ConfigManager; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; @@ -37,6 +42,7 @@ import net.runelite.client.ui.overlay.OverlayManager; tags = {"bank", "inventory", "overlay", "high", "alchemy", "grand", "exchange", "tooltips"}, enabledByDefault = false ) +@Singleton public class ItemPricesPlugin extends Plugin { @Inject @@ -45,6 +51,20 @@ public class ItemPricesPlugin extends Plugin @Inject private ItemPricesOverlay overlay; + @Inject + private ItemPricesConfig config; + + @Getter(AccessLevel.PACKAGE) + private boolean showGEPrice; + @Getter(AccessLevel.PACKAGE) + private boolean showHAValue; + @Getter(AccessLevel.PACKAGE) + private boolean showEA; + @Getter(AccessLevel.PACKAGE) + private boolean hideInventory; + @Getter(AccessLevel.PACKAGE) + private boolean showAlchProfit; + @Provides ItemPricesConfig getConfig(ConfigManager configManager) { @@ -54,6 +74,7 @@ public class ItemPricesPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); overlayManager.add(overlay); } @@ -62,4 +83,24 @@ public class ItemPricesPlugin extends Plugin { overlayManager.remove(overlay); } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("itemprices")) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.showGEPrice = config.showGEPrice(); + this.showHAValue = config.showHAValue(); + this.showEA = config.showEA(); + this.hideInventory = config.hideInventory(); + this.showAlchProfit = config.showAlchProfit(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/AlwaysLostItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/AlwaysLostItem.java index 37066622bc..2e9ac325cc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/AlwaysLostItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/AlwaysLostItem.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.itemskeptondeath; import com.google.common.collect.ImmutableMap; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.ItemID; @@ -36,7 +37,7 @@ import net.runelite.api.ItemID; * The white outline will be added to these items when they are lost on death. */ @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) enum AlwaysLostItem { RUNE_POUCH(ItemID.RUNE_POUCH, true), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java index a40851dc65..5afb14c931 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java @@ -28,6 +28,7 @@ package net.runelite.client.plugins.itemskeptondeath; import com.google.common.collect.ImmutableMap; import java.util.Map; import javax.annotation.Nullable; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.ItemID; @@ -37,7 +38,7 @@ import net.runelite.api.ItemID; * These are typically imbued items, such as Berserker ring (i), to help it protect over the non-imbued variants. */ @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) enum FixedPriceItem { IMBUED_BLACK_MASK_I(ItemID.BLACK_MASK_I, 5000), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java index ee761ad9a9..f6d817b54c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java @@ -33,6 +33,7 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.Constants; @@ -64,6 +65,7 @@ import net.runelite.client.util.StackFormatter; enabledByDefault = false ) @Slf4j +@Singleton public class ItemsKeptOnDeathPlugin extends Plugin { private static final int DEEP_WILDY = 20; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java index 209e86aa41..28b3e555a2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java @@ -53,25 +53,26 @@ public class ItemStatOverlay extends Overlay .aspeed(6) .build()); - @Inject private Client client; - - @Inject private ItemManager itemManager; - - @Inject private TooltipManager tooltipManager; - - @Inject private ItemStatChanges statChanges; + private ItemStatPlugin plugin; @Inject - private ItemStatConfig config; + ItemStatOverlay(Client client, ItemStatPlugin plugin, ItemManager itemManager, TooltipManager tooltipManager, ItemStatChanges itemStatChanges) + { + this.client = client; + this.itemManager = itemManager; + this.tooltipManager = tooltipManager; + this.statChanges = itemStatChanges; + this.plugin = plugin; + } @Override public Dimension render(Graphics2D graphics) { - if (client.isMenuOpen() || (!config.relative() && !config.absolute() && !config.theoretical())) + if (client.isMenuOpen() || (!plugin.isRelative() && !plugin.isAbsolute() && !plugin.isTheoretical())) { return null; } @@ -115,7 +116,7 @@ public class ItemStatOverlay extends Overlay } } - if (config.consumableStats()) + if (plugin.isConsumableStats()) { final Effect change = statChanges.get(itemId); if (change != null) @@ -137,7 +138,7 @@ public class ItemStatOverlay extends Overlay } } - if (config.equipmentStats()) + if (plugin.isEquipmentStats()) { final ItemStats stats = itemManager.getItemStats(itemId, false); @@ -161,8 +162,8 @@ public class ItemStatOverlay extends Overlay final boolean inverse, final boolean showPercent) { - final Color plus = Positivity.getColor(config, Positivity.BETTER_UNCAPPED); - final Color minus = Positivity.getColor(config, Positivity.WORSE); + final Color plus = Positivity.getColor(plugin, Positivity.BETTER_UNCAPPED); + final Color minus = Positivity.getColor(plugin, Positivity.WORSE); if (value == 0) { @@ -189,7 +190,7 @@ public class ItemStatOverlay extends Overlay private String buildStatBonusString(ItemStats s) { final StringBuilder b = new StringBuilder(); - if (config.showWeight()) + if (plugin.isShowWeight()) { b.append(getChangeString("Weight", s.getWeight(), true, false)); } @@ -257,32 +258,32 @@ public class ItemStatOverlay extends Overlay private String buildStatChangeString(StatChange c) { StringBuilder b = new StringBuilder(); - b.append(ColorUtil.colorTag(Positivity.getColor(config, c.getPositivity()))); + b.append(ColorUtil.colorTag(Positivity.getColor(plugin, c.getPositivity()))); - if (config.relative()) + if (plugin.isRelative()) { b.append(c.getFormattedRelative()); } - if (config.theoretical()) + if (plugin.isTheoretical()) { - if (config.relative()) + if (plugin.isRelative()) { b.append("/"); } b.append(c.getFormattedTheoretical()); } - if (config.absolute() && (config.relative() || config.theoretical())) + if (plugin.isAbsolute() && (plugin.isRelative() || plugin.isTheoretical())) { b.append(" ("); } - if (config.absolute()) + if (plugin.isAbsolute()) { b.append(c.getAbsolute()); } - if (config.absolute() && (config.relative() || config.theoretical())) + if (plugin.isAbsolute() && (plugin.isRelative() || plugin.isTheoretical())) { b.append(")"); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java index 2b0e476677..f94a17df0c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java @@ -30,10 +30,13 @@ import com.google.common.collect.ImmutableSet; import com.google.inject.Binder; import com.google.inject.Inject; import com.google.inject.Provides; +import java.awt.Color; import java.awt.FontMetrics; import java.util.List; import java.util.Map; import java.util.Set; +import lombok.AccessLevel; +import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.api.FontID; @@ -97,6 +100,30 @@ public class ItemStatPlugin extends Plugin private Widget itemInformationTitle; + @Getter(AccessLevel.PACKAGE) + private boolean consumableStats; + @Getter(AccessLevel.PACKAGE) + private boolean equipmentStats; + private boolean geStats; + @Getter(AccessLevel.PACKAGE) + private boolean relative; + @Getter(AccessLevel.PACKAGE) + private boolean absolute; + @Getter(AccessLevel.PACKAGE) + private boolean theoretical; + @Getter(AccessLevel.PACKAGE) + private boolean showWeight; + @Getter(AccessLevel.PACKAGE) + private Color colorBetterUncapped; + @Getter(AccessLevel.PACKAGE) + private Color colorBetterSomeCapped; + @Getter(AccessLevel.PACKAGE) + private Color colorBetterCapped; + @Getter(AccessLevel.PACKAGE) + private Color colorNoChange; + @Getter(AccessLevel.PACKAGE) + private Color colorWorse; + @Provides ItemStatConfig getConfig(ConfigManager configManager) { @@ -112,6 +139,7 @@ public class ItemStatPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); overlayManager.add(overlay); } @@ -127,6 +155,7 @@ public class ItemStatPlugin extends Plugin { if (event.getKey().equals("geStats")) { + updateConfig(); clientThread.invokeLater(this::resetGEInventory); } } @@ -134,7 +163,7 @@ public class ItemStatPlugin extends Plugin @Subscribe public void onGameTick(GameTick event) { - if (itemInformationTitle != null && config.geStats() + if (itemInformationTitle != null && this.geStats && (client.getWidget(WidgetInfo.GRAND_EXCHANGE_WINDOW_CONTAINER) == null || client.getWidget(WidgetInfo.GRAND_EXCHANGE_WINDOW_CONTAINER).isHidden())) { @@ -145,7 +174,7 @@ public class ItemStatPlugin extends Plugin @Subscribe public void onVarbitChanged(VarbitChanged event) { - if (client.getVar(VarPlayer.CURRENT_GE_ITEM) == -1 && config.geStats()) + if (client.getVar(VarPlayer.CURRENT_GE_ITEM) == -1 && this.geStats) { resetGEInventory(); } @@ -154,7 +183,7 @@ public class ItemStatPlugin extends Plugin @Subscribe public void onScriptCallbackEvent(ScriptCallbackEvent event) { - if (event.getEventName().equals("geBuilt") && config.geStats()) + if (event.getEventName().equals("geBuilt") && this.geStats) { int currentGeItem = client.getVar(VarPlayer.CURRENT_GE_ITEM); if (currentGeItem != -1 && client.getVar(Varbits.GE_OFFER_CREATION_TYPE) == 0) @@ -431,4 +460,20 @@ public class ItemStatPlugin extends Plugin return client.getWidget(WidgetInfo.FIXED_VIEWPORT_INVENTORY_CONTAINER); } } + + private void updateConfig() + { + this.consumableStats = config.consumableStats(); + this.equipmentStats = config.equipmentStats(); + this.geStats = config.geStats(); + this.relative = config.relative(); + this.absolute = config.absolute(); + this.theoretical = config.theoretical(); + this.showWeight = config.showWeight(); + this.colorBetterUncapped = config.colorBetterUncapped(); + this.colorBetterSomeCapped = config.colorBetterSomeCapped(); + this.colorBetterCapped = config.colorBetterCapped(); + this.colorNoChange = config.colorNoChange(); + this.colorWorse = config.colorWorse(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/Positivity.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/Positivity.java index d1da3c8176..ea83360a9b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/Positivity.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/Positivity.java @@ -56,20 +56,20 @@ public enum Positivity */ BETTER_UNCAPPED; - public static Color getColor(ItemStatConfig config, Positivity positivity) + public static Color getColor(ItemStatPlugin plugin, Positivity positivity) { switch (positivity) { case BETTER_UNCAPPED: - return config.colorBetterUncapped(); + return plugin.getColorBetterUncapped(); case BETTER_SOMECAPPED: - return config.colorBetterSomeCapped(); + return plugin.getColorBetterSomeCapped(); case BETTER_CAPPED: - return config.colorBetterCapped(); + return plugin.getColorBetterCapped(); case NO_CHANGE: - return config.colorNoChange(); + return plugin.getColorNoChange(); case WORSE: - return config.colorWorse(); + return plugin.getColorWorse(); default: return Color.WHITE; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java index 56cf3bbedc..d4a493769f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java @@ -30,6 +30,7 @@ import java.awt.event.KeyEvent; import java.util.HashMap; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.VarClientStr; @@ -39,6 +40,7 @@ import net.runelite.client.config.ModifierlessKeybind; import net.runelite.client.input.KeyListener; import net.runelite.client.input.MouseAdapter; +@Singleton class KeyRemappingListener extends MouseAdapter implements KeyListener { private static final Keybind ONE = new ModifierlessKeybind(KeyEvent.VK_1, 0); @@ -57,9 +59,6 @@ class KeyRemappingListener extends MouseAdapter implements KeyListener @Inject private KeyRemappingPlugin plugin; - @Inject - private KeyRemappingConfig config; - @Inject private Client client; @@ -83,24 +82,24 @@ class KeyRemappingListener extends MouseAdapter implements KeyListener if (!plugin.isTyping()) { - if (config.cameraRemap()) + if (plugin.isCameraRemap()) { - if (config.up().matches(e)) + if (plugin.getUp().matches(e)) { modified.put(e.getKeyCode(), KeyEvent.VK_UP); e.setKeyCode(KeyEvent.VK_UP); } - else if (config.down().matches(e)) + else if (plugin.getDown().matches(e)) { modified.put(e.getKeyCode(), KeyEvent.VK_DOWN); e.setKeyCode(KeyEvent.VK_DOWN); } - else if (config.left().matches(e)) + else if (plugin.getLeft().matches(e)) { modified.put(e.getKeyCode(), KeyEvent.VK_LEFT); e.setKeyCode(KeyEvent.VK_LEFT); } - else if (config.right().matches(e)) + else if (plugin.getRight().matches(e)) { modified.put(e.getKeyCode(), KeyEvent.VK_RIGHT); e.setKeyCode(KeyEvent.VK_RIGHT); @@ -110,7 +109,7 @@ class KeyRemappingListener extends MouseAdapter implements KeyListener // In addition to the above checks, the F-key remapping shouldn't // activate when dialogs are open which listen for number keys // to select options - if (config.fkeyRemap() && !plugin.isDialogOpen()) + if (plugin.isFkeyRemap() && !plugin.isDialogOpen()) { if (ONE.matches(e)) { @@ -219,27 +218,27 @@ class KeyRemappingListener extends MouseAdapter implements KeyListener { modified.remove(e.getKeyCode()); - if (config.cameraRemap()) + if (plugin.isCameraRemap()) { - if (config.up().matches(e)) + if (plugin.getUp().matches(e)) { e.setKeyCode(KeyEvent.VK_UP); } - else if (config.down().matches(e)) + else if (plugin.getDown().matches(e)) { e.setKeyCode(KeyEvent.VK_DOWN); } - else if (config.left().matches(e)) + else if (plugin.getLeft().matches(e)) { e.setKeyCode(KeyEvent.VK_LEFT); } - else if (config.right().matches(e)) + else if (plugin.getRight().matches(e)) { e.setKeyCode(KeyEvent.VK_RIGHT); } } - if (config.fkeyRemap()) + if (plugin.isFkeyRemap()) { if (ONE.matches(e)) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java index 5b38cbdc25..2d94b6e4d1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java @@ -28,6 +28,7 @@ package net.runelite.client.plugins.keyremapping; import com.google.inject.Provides; import java.awt.Color; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; @@ -43,6 +44,7 @@ import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; +import net.runelite.client.config.ModifierlessKeybind; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; @@ -56,6 +58,7 @@ import net.runelite.client.util.ColorUtil; tags = {"enter", "chat", "wasd", "camera"}, enabledByDefault = false ) +@Singleton public class KeyRemappingPlugin extends Plugin { private static final String PRESS_ENTER_TO_CHAT = "Press Enter to Chat..."; @@ -81,9 +84,25 @@ public class KeyRemappingPlugin extends Plugin @Setter(AccessLevel.PACKAGE) private boolean typing; + private boolean hideDisplayName; + @Getter(AccessLevel.PACKAGE) + private boolean cameraRemap; + @Getter(AccessLevel.PACKAGE) + private ModifierlessKeybind up; + @Getter(AccessLevel.PACKAGE) + private ModifierlessKeybind down; + @Getter(AccessLevel.PACKAGE) + private ModifierlessKeybind left; + @Getter(AccessLevel.PACKAGE) + private ModifierlessKeybind right; + @Getter(AccessLevel.PACKAGE) + private boolean fkeyRemap; + @Override protected void startUp() throws Exception { + updateConfig(); + typing = false; keyManager.registerKeyListener(inputListener); @@ -153,11 +172,13 @@ public class KeyRemappingPlugin extends Plugin @Subscribe public void onConfigChanged(ConfigChanged configChanged) { - if (!configChanged.getGroup().equals("keyremapping") || !configChanged.getKey().equals("hideDisplayName")) + if (!configChanged.getGroup().equals("keyremapping")) { return; } + updateConfig(); + clientThread.invoke(() -> { Widget chatboxInput = client.getWidget(WidgetInfo.CHATBOX_INPUT); @@ -242,7 +263,7 @@ public class KeyRemappingPlugin extends Plugin private String getWaitingText() { - if (config.hideDisplayName()) + if (this.hideDisplayName) { return PRESS_ENTER_TO_CHAT; } @@ -251,4 +272,15 @@ public class KeyRemappingPlugin extends Plugin return getPlayerNameWithIcon() + ": " + PRESS_ENTER_TO_CHAT; } } + + private void updateConfig() + { + this.hideDisplayName = config.hideDisplayName(); + this.cameraRemap = config.cameraRemap(); + this.up = config.up(); + this.down = config.down(); + this.left = config.left(); + this.right = config.right(); + this.fkeyRemap = config.fkeyRemap(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java index 8a2871125f..7c3dc3b56a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java @@ -25,14 +25,16 @@ package net.runelite.client.plugins.kingdomofmiscellania; import java.awt.image.BufferedImage; +import javax.inject.Singleton; import net.runelite.client.ui.overlay.infobox.Counter; import net.runelite.client.util.StackFormatter; +@Singleton public class KingdomCounter extends Counter { private final KingdomPlugin plugin; - KingdomCounter(BufferedImage image, KingdomPlugin plugin) + KingdomCounter(final BufferedImage image, final KingdomPlugin plugin) { super(image, plugin, plugin.getFavor()); this.plugin = plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java index 17347b3aac..e0445d6576 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java @@ -26,6 +26,8 @@ package net.runelite.client.plugins.kingdomofmiscellania; import com.google.common.collect.ImmutableSet; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; @@ -48,6 +50,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager; enabledByDefault = false ) @Slf4j +@Singleton public class KingdomPlugin extends Plugin { private static final ImmutableSet KINGDOM_REGION = ImmutableSet.of(10044, 10300); @@ -61,7 +64,7 @@ public class KingdomPlugin extends Plugin @Inject private ItemManager itemManager; - @Getter + @Getter(AccessLevel.PACKAGE) private int favor = 0, coffer = 0; private KingdomCounter counter; @@ -75,9 +78,12 @@ public class KingdomPlugin extends Plugin @Subscribe public void onVarbitChanged(VarbitChanged event) { - favor = client.getVar(Varbits.KINGDOM_FAVOR); - coffer = client.getVar(Varbits.KINGDOM_COFFER); - processInfobox(); + if (isInKingdom()) + { + favor = client.getVar(Varbits.KINGDOM_FAVOR); + coffer = client.getVar(Varbits.KINGDOM_COFFER); + processInfobox(); + } } @Subscribe diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Book.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Book.java index 49f6ccf7f9..43b31e52aa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Book.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Book.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.kourendlibrary; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ItemID; import net.runelite.client.game.AsyncBufferedImage; @@ -99,22 +100,22 @@ enum Book return BY_NAME.get(name); } - @Getter + @Getter(AccessLevel.PACKAGE) private final int item; - @Getter + @Getter(AccessLevel.PACKAGE) private final String name; - @Getter + @Getter(AccessLevel.PACKAGE) private final String shortName; - @Getter + @Getter(AccessLevel.PACKAGE) private AsyncBufferedImage icon; - @Getter + @Getter(AccessLevel.PACKAGE) private final boolean isDarkManuscript; - Book(int id, String shortName, String name) + Book(final int id, final String shortName, final String name) { this.item = id; this.isDarkManuscript = false; @@ -122,7 +123,7 @@ enum Book this.name = name; } - Book(int id) + Book(final int id) { this.item = id; this.isDarkManuscript = true; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java index 29976bc0bb..fe11faac3b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.kourendlibrary; import java.awt.Color; +import javax.inject.Singleton; import javax.swing.GroupLayout; import javax.swing.JLabel; import javax.swing.JPanel; @@ -32,11 +33,12 @@ import javax.swing.border.EmptyBorder; import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.FontManager; +@Singleton class BookPanel extends JPanel { private JLabel location = new JLabel(); - BookPanel(Book b) + BookPanel(final Book b) { setBorder(new EmptyBorder(3, 3, 3, 3)); setBackground(ColorScheme.DARK_GRAY_COLOR); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Bookcase.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Bookcase.java index ee7d7d295d..c4a95d7215 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Bookcase.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Bookcase.java @@ -29,37 +29,38 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.coords.WorldPoint; class Bookcase { - Bookcase(WorldPoint location) + Bookcase(final WorldPoint location) { this.location = location; this.index = new ArrayList<>(); } - @Getter + @Getter(AccessLevel.PACKAGE) private final WorldPoint location; - @Getter + @Getter(AccessLevel.PACKAGE) private final List index; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean isBookSet; /** * Book in this bookcase as found by the player. * Will be correct as long as isBookSet is true, unless the library has reset; */ - @Getter + @Getter(AccessLevel.PACKAGE) private Book book; /** * Books that can be in this slot. Will only be populated if library.state != SolvedState.NO_DATA */ - @Getter + @Getter(AccessLevel.PACKAGE) private Set possibleBooks = new HashSet<>(); void clearBook() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java index 5cf7910ee6..9af693fed2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.kourendlibrary; import com.google.inject.Inject; +import com.google.inject.Singleton; import java.awt.Color; import java.awt.Dimension; import java.awt.FontMetrics; @@ -50,23 +51,22 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton class KourendLibraryOverlay extends Overlay { private final static int MAXIMUM_DISTANCE = 24; private final Library library; private final Client client; - private final KourendLibraryConfig config; private final KourendLibraryPlugin plugin; @Setter(AccessLevel.PACKAGE) private boolean hidden; @Inject - private KourendLibraryOverlay(Library library, Client client, KourendLibraryConfig config, KourendLibraryPlugin plugin) + private KourendLibraryOverlay(final Library library, final Client client, final KourendLibraryPlugin plugin) { this.library = library; this.client = client; - this.config = config; this.plugin = plugin; setPosition(OverlayPosition.DYNAMIC); @@ -238,7 +238,7 @@ class KourendLibraryOverlay extends Overlay private boolean shouldHideOverlayIfDuplicateBook(@Nullable Book book) { - return config.hideDuplicateBook() + return plugin.isHideDuplicateBook() && book != null && !book.isDarkManuscript() && plugin.doesPlayerContainBook(book); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java index aea8d9b034..54e60eb415 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java @@ -30,7 +30,10 @@ import java.util.EnumSet; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.inject.Inject; +import javax.inject.Singleton; import javax.swing.SwingUtilities; +import lombok.AccessLevel; +import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.AnimationID; import net.runelite.api.ChatMessageType; @@ -65,6 +68,7 @@ import net.runelite.client.util.ImageUtil; tags = {"arceuus", "magic", "runecrafting", "overlay", "panel"} ) @Slf4j +@Singleton public class KourendLibraryPlugin extends Plugin { private static final Pattern BOOK_EXTRACTOR = Pattern.compile("'(.*)'"); @@ -101,6 +105,10 @@ public class KourendLibraryPlugin extends Plugin private WorldPoint lastBookcaseAnimatedOn = null; private EnumSet playerBooks = null; + private boolean hideButton; + @Getter(AccessLevel.PACKAGE) + private boolean hideDuplicateBook; + @Provides KourendLibraryConfig provideConfig(ConfigManager configManager) { @@ -110,6 +118,9 @@ public class KourendLibraryPlugin extends Plugin @Override protected void startUp() throws Exception { + hideButton = config.hideButton(); + hideDuplicateBook = config.hideDuplicateBook(); + Book.fillImages(itemManager); panel = injector.getInstance(KourendLibraryPanel.class); @@ -128,7 +139,7 @@ public class KourendLibraryPlugin extends Plugin updatePlayerBooks(); - if (!config.hideButton()) + if (!this.hideButton) { clientToolbar.addNavigation(navButton); } @@ -154,9 +165,12 @@ public class KourendLibraryPlugin extends Plugin return; } + this.hideButton = config.hideButton(); + this.hideDuplicateBook = config.hideDuplicateBook(); + SwingUtilities.invokeLater(() -> { - if (!config.hideButton()) + if (!this.hideButton) { clientToolbar.addNavigation(navButton); } @@ -213,7 +227,7 @@ public class KourendLibraryPlugin extends Plugin public void onGameTick(GameTick tick) { boolean inRegion = client.getLocalPlayer().getWorldLocation().getRegionID() == REGION; - if (config.hideButton() && inRegion != buttonAttached) + if (this.hideButton && inRegion != buttonAttached) { SwingUtilities.invokeLater(() -> { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java index 23afd804a5..85103e8135 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java @@ -33,6 +33,7 @@ import java.util.List; import java.util.Map; import java.util.stream.IntStream; import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.coords.WorldPoint; @@ -91,13 +92,13 @@ class Library private final int step; - @Getter + @Getter(AccessLevel.PACKAGE) private SolvedState state; - @Getter + @Getter(AccessLevel.PACKAGE) private Book customerBook; - @Getter + @Getter(AccessLevel.PACKAGE) private LibraryCustomer customer; Library() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/LibraryCustomer.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/LibraryCustomer.java index 04cb4829a1..9de04a826a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/LibraryCustomer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/LibraryCustomer.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.kourendlibrary; import java.util.HashMap; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.NpcID; @@ -35,10 +36,10 @@ enum LibraryCustomer PROFESSOR_GRACKLEBONE(NpcID.PROFESSOR_GRACKLEBONE, "Prof. Gracklebone"), SAM(NpcID.SAM_7049, "Sam"); - @Getter + @Getter(AccessLevel.PACKAGE) private final int id; - @Getter + @Getter(AccessLevel.PACKAGE) private final String name; private static final Map byId = buildIdMap(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java index cea339008b..94d1aa6c18 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java @@ -13,6 +13,7 @@ package net.runelite.client.plugins.learntoclick; import com.google.common.collect.ImmutableList; import com.google.inject.Provides; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.MenuEntry; @@ -29,7 +30,6 @@ import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; import org.apache.commons.lang3.ArrayUtils; - @PluginDescriptor( name = "Learn to Click", description = "A few modifications to prevent misclicks", @@ -37,8 +37,8 @@ import org.apache.commons.lang3.ArrayUtils; type = PluginType.PVP, enabledByDefault = false ) - @Slf4j +@Singleton public class LearnToClickPlugin extends Plugin { private static final ImmutableList ORB_WIDGETS = ImmutableList.of(WidgetInfo.MINIMAP_WORLDMAP_ORB, @@ -50,6 +50,12 @@ public class LearnToClickPlugin extends Plugin @Inject private Client client; + private boolean shouldBlockCompass; + private boolean shouldRightClickMap; + private boolean shouldRightClickXp; + private boolean shouldRightClickRetaliate; + private boolean hideOrbs; + @Provides LearnToClickConfig provideConfig(ConfigManager configManager) { @@ -59,6 +65,7 @@ public class LearnToClickPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); } @Override @@ -71,11 +78,14 @@ public class LearnToClickPlugin extends Plugin @Subscribe public void onConfigChanged(ConfigChanged event) { - if (!event.getGroup().equals("learntoclick") && !event.getKey().equals("hideOrbs")) + if (!event.getGroup().equals("learntoclick")) { return; } - if (config.hideOrbs()) + + updateConfig(); + + if (this.hideOrbs) { hideOrbWidgets(true); } @@ -89,7 +99,7 @@ public class LearnToClickPlugin extends Plugin @Subscribe public void onWidgetLoaded(WidgetLoaded event) { - if (!config.hideOrbs()) + if (!this.hideOrbs) { return; } @@ -110,10 +120,10 @@ public class LearnToClickPlugin extends Plugin MenuEntry[] menuEntries = client.getMenuEntries(); for (MenuEntry entry : menuEntries) { - if ((entry.getOption().equals("Floating") && config.shouldRightClickMap()) || - (entry.getOption().equals("Hide") && config.shouldRightClickXp()) || (entry.getOption().equals("Show") - && config.shouldRightClickXp()) || (entry.getOption().equals("Auto retaliate") - && config.shouldRightClickRetaliate())) + if ((entry.getOption().equals("Floating") && this.shouldRightClickMap) || + (entry.getOption().equals("Hide") && this.shouldRightClickXp) || (entry.getOption().equals("Show") + && this.shouldRightClickXp) || (entry.getOption().equals("Auto retaliate") + && this.shouldRightClickRetaliate)) { event.setForceRightClick(true); return; @@ -124,14 +134,14 @@ public class LearnToClickPlugin extends Plugin @Subscribe public void onMenuEntryAdded(MenuEntryAdded event) { - if ((event.getOption().equals("Floating") && config.shouldRightClickMap()) || (event.getOption().equals("Hide") - && config.shouldRightClickXp()) || (event.getOption().equals("Show") && config.shouldRightClickXp()) || - (event.getOption().equals("Auto retaliate") && config.shouldRightClickRetaliate())) + if ((event.getOption().equals("Floating") && this.shouldRightClickMap) || (event.getOption().equals("Hide") + && this.shouldRightClickXp) || (event.getOption().equals("Show") && this.shouldRightClickXp) || + (event.getOption().equals("Auto retaliate") && this.shouldRightClickRetaliate)) { forceRightClickFlag = true; } MenuEntry[] entries = client.getMenuEntries(); - if (config.shouldBlockCompass()) + if (this.shouldBlockCompass) { for (int i = entries.length - 1; i >= 0; i--) { @@ -153,4 +163,13 @@ public class LearnToClickPlugin extends Plugin { ORB_WIDGETS.forEach(widgetInfo -> client.getWidget(widgetInfo).setHidden(hidden)); } + + private void updateConfig() + { + this.shouldBlockCompass = config.shouldBlockCompass(); + this.shouldRightClickMap = config.shouldRightClickMap(); + this.shouldRightClickXp = config.shouldRightClickXp(); + this.shouldRightClickRetaliate = config.shouldRightClickRetaliate(); + this.hideOrbs = config.hideOrbs(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java index e9eb807ca8..e850169cbf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java @@ -28,14 +28,15 @@ import com.google.inject.Provides; import java.util.HashMap; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Actor; -import net.runelite.api.Client; import net.runelite.api.coords.LocalPoint; import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.ChatMessage; +import net.runelite.api.events.ConfigChanged; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; @@ -51,8 +52,8 @@ import net.runelite.client.ui.overlay.OverlayManager; type = PluginType.PVM, enabledByDefault = false ) - @Slf4j +@Singleton public class LizardmenShamanPlugin extends Plugin { private static final String SHAMAN = "Lizardman shaman"; @@ -73,8 +74,8 @@ public class LizardmenShamanPlugin extends Plugin @Inject private Notifier notifier; - @Inject - private Client client; + private boolean showTimer; + private boolean notifyOnSpawn; @Provides LizardmenShamanConfig getConfig(ConfigManager configManager) @@ -85,6 +86,9 @@ public class LizardmenShamanPlugin extends Plugin @Override protected void startUp() throws Exception { + this.showTimer = config.showTimer(); + this.notifyOnSpawn = config.notifyOnSpawn(); + overlayManager.add(overlay); } @@ -98,7 +102,7 @@ public class LizardmenShamanPlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (config.notifyOnSpawn()) + if (this.notifyOnSpawn) { if (event.getMessage().contains(MESSAGE)) { @@ -118,10 +122,22 @@ public class LizardmenShamanPlugin extends Plugin if (actor.getName().equals(SHAMAN) && actor.getAnimation() == 7157) { - if (config.showTimer()) + if (this.showTimer) { spawns.put(event.getActor().getLocalLocation(), new LizardmenShamanSpawn(8.4, null)); } } } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("shaman")) + { + return; + } + + this.showTimer = config.showTimer(); + this.notifyOnSpawn = config.notifyOnSpawn(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanSpawn.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanSpawn.java index ac52b75fce..627af82c31 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanSpawn.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanSpawn.java @@ -25,13 +25,14 @@ package net.runelite.client.plugins.lizardmenshaman; import java.time.Instant; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; -@Getter -@Setter +@Getter(AccessLevel.PACKAGE) +@Setter(AccessLevel.PACKAGE) @RequiredArgsConstructor @AllArgsConstructor class LizardmenShamanSpawn diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java index 58f5c6a73a..9d60355d6d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java @@ -30,6 +30,7 @@ import java.awt.Graphics2D; import java.time.Duration; import java.time.Instant; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Perspective; import net.runelite.api.Point; @@ -38,13 +39,14 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.components.ProgressPieComponent; +@Singleton class ShamanSpawnOverlay extends Overlay { private final Client client; private final LizardmenShamanPlugin plugin; @Inject - private ShamanSpawnOverlay(Client client, LizardmenShamanPlugin plugin) + private ShamanSpawnOverlay(final Client client, final LizardmenShamanPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java index b99efb6e62..dbf0a6df64 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java @@ -32,9 +32,11 @@ import java.awt.datatransfer.UnsupportedFlavorException; import java.awt.event.KeyEvent; import java.io.IOException; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.client.events.SessionOpen; import net.runelite.client.config.ConfigManager; @@ -50,6 +52,7 @@ import net.runelite.client.util.OSType; description = "Provides various enhancements for login screen" ) @Slf4j +@Singleton public class LoginScreenPlugin extends Plugin implements KeyListener { private static final int MAX_USERNAME_LENGTH = 254; @@ -67,9 +70,14 @@ public class LoginScreenPlugin extends Plugin implements KeyListener private String usernameCache; + private boolean syncUsername; + private boolean pasteEnabled; + private String username; + @Override protected void startUp() throws Exception { + updateConfig(); applyUsername(); keyManager.registerKeyListener(this); } @@ -77,7 +85,7 @@ public class LoginScreenPlugin extends Plugin implements KeyListener @Override protected void shutDown() throws Exception { - if (config.syncUsername()) + if (this.syncUsername) { client.getPreferences().setRememberedUsername(usernameCache); } @@ -94,7 +102,7 @@ public class LoginScreenPlugin extends Plugin implements KeyListener @Subscribe public void onGameStateChanged(GameStateChanged event) { - if (!config.syncUsername()) + if (!this.syncUsername) { return; } @@ -112,13 +120,14 @@ public class LoginScreenPlugin extends Plugin implements KeyListener username = client.getUsername(); } - if (config.username().equals(username)) + if (this.username.equals(username)) { return; } log.debug("Saving username: {}", username); config.username(username); + this.username = username; } } @@ -131,7 +140,7 @@ public class LoginScreenPlugin extends Plugin implements KeyListener private void applyUsername() { - if (!config.syncUsername()) + if (!this.syncUsername) { return; } @@ -139,7 +148,7 @@ public class LoginScreenPlugin extends Plugin implements KeyListener GameState gameState = client.getGameState(); if (gameState == GameState.LOGIN_SCREEN) { - String username = config.username(); + String username = this.username; if (Strings.isNullOrEmpty(username)) { @@ -164,7 +173,7 @@ public class LoginScreenPlugin extends Plugin implements KeyListener @Override public void keyPressed(KeyEvent e) { - if (!config.pasteEnabled() || ( + if (!this.pasteEnabled || ( client.getGameState() != GameState.LOGIN_SCREEN && client.getGameState() != GameState.LOGIN_SCREEN_AUTHENTICATOR)) { @@ -220,4 +229,22 @@ public class LoginScreenPlugin extends Plugin implements KeyListener { } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("loginscreen")) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.syncUsername = config.syncUsername(); + this.pasteEnabled = config.pasteEnabled(); + this.username = config.username(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistOverlay.java index 132c98e33c..8041ef36b0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistOverlay.java @@ -7,6 +7,7 @@ import java.awt.Polygon; import java.text.DecimalFormat; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Perspective; import net.runelite.api.Point; @@ -18,13 +19,14 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton public class LootAssistOverlay extends Overlay { private Client client; private DecimalFormat d = new DecimalFormat("##.#"); @Inject - public LootAssistOverlay(Client client) + public LootAssistOverlay(final Client client) { this.client = client; setLayer(OverlayLayer.ABOVE_SCENE); @@ -41,15 +43,17 @@ public class LootAssistOverlay extends Overlay LootPile pile = entry.getValue(); int x; int y; - try + LocalPoint lp = LocalPoint.fromWorld(client, pile.getLocation()); + if (lp != null) { - x = LocalPoint.fromWorld(client, pile.getLocation()).getSceneX(); - y = LocalPoint.fromWorld(client, pile.getLocation()).getSceneY(); + x = lp.getSceneX(); + y = lp.getSceneY(); } - catch (NullPointerException e) + else { continue; } + if (!localPoint.isInScene(client)) { continue; @@ -70,11 +74,9 @@ public class LootAssistOverlay extends Overlay client.getScene().getTiles()[client.getPlane()][x][y].getLocalLocation()); if (poly != null) { - Point textLoc = Perspective.getCanvasTextLocation(client, graphics, - LocalPoint.fromWorld(client, pile.getLocation()), + Point textLoc = Perspective.getCanvasTextLocation(client, graphics, lp, nameOverlay, graphics.getFontMetrics().getHeight() * 7); - Point timeLoc = Perspective.getCanvasTextLocation(client, graphics, - LocalPoint.fromWorld(client, pile.getLocation()), + Point timeLoc = Perspective.getCanvasTextLocation(client, graphics, lp, timeOverlay, graphics.getFontMetrics().getHeight()); OverlayUtil.renderPolygon(graphics, poly, Color.WHITE); if (timeRemaining < 5) @@ -84,8 +86,7 @@ public class LootAssistOverlay extends Overlay } if (timeRemaining < 2) { - client.setHintArrow(WorldPoint.fromLocal(client, - LocalPoint.fromWorld(client, pile.getLocation()))); + client.setHintArrow(WorldPoint.fromLocal(client, lp)); } else { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java index 7087ec423f..35e02cff98 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java @@ -1,15 +1,14 @@ package net.runelite.client.plugins.lootassist; -import com.google.inject.Provides; import java.util.concurrent.ConcurrentHashMap; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Actor; import net.runelite.api.AnimationID; import net.runelite.api.Player; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.GameStateChanged; -import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -23,7 +22,7 @@ import net.runelite.client.ui.overlay.OverlayManager; type = PluginType.PVP, enabledByDefault = false ) - +@Singleton public class LootAssistPlugin extends Plugin { @Inject @@ -34,12 +33,6 @@ public class LootAssistPlugin extends Plugin static ConcurrentHashMap lootPiles = new ConcurrentHashMap<>(); - @Provides - LootAssitConfig getConfig(ConfigManager configManager) - { - return configManager.getConfig(LootAssitConfig.class); - } - @Override protected void startUp() throws Exception { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssitConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssitConfig.java deleted file mode 100644 index 8c4d5b1a10..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssitConfig.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.runelite.client.plugins.lootassist; - -import java.awt.Color; -import net.runelite.client.config.Config; -import net.runelite.client.config.ConfigGroup; -import net.runelite.client.config.ConfigItem; - -@ConfigGroup("lootassist") -public interface LootAssitConfig extends Config -{ - @ConfigItem( - keyName = "color", - name = "Color", - description = "The Color of the tile and name overlay that indicates where loot will appear" - ) - default Color color() - { - return Color.WHITE; - } -} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootPile.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootPile.java index 32fa145088..f59e842730 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootPile.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootPile.java @@ -1,5 +1,6 @@ package net.runelite.client.plugins.lootassist; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import net.runelite.api.coords.WorldPoint; @@ -8,17 +9,17 @@ class LootPile { private static final long TIME_UNTIL_VISIBLE = 60000; - @Getter + @Getter(AccessLevel.PACKAGE) private final long timeAppearing; - @Getter + @Getter(AccessLevel.PACKAGE) private final WorldPoint location; - @Getter + @Getter(AccessLevel.PACKAGE) private final String playerName; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private boolean beingRendered = false; LootPile(WorldPoint location, String playerName) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerOverlay.java index ecfe3dc5da..c8353c0181 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerOverlay.java @@ -30,6 +30,7 @@ import java.awt.Graphics2D; import java.awt.Point; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.InventoryID; import net.runelite.api.Item; @@ -41,6 +42,7 @@ import net.runelite.client.ui.overlay.components.ComponentOrientation; import net.runelite.client.ui.overlay.components.ImageComponent; import net.runelite.client.ui.overlay.components.PanelComponent; +@Singleton public class LootingBagViewerOverlay extends Overlay { private static final int INVENTORY_SIZE = 28; @@ -57,7 +59,7 @@ public class LootingBagViewerOverlay extends Overlay private Item[] items; @Inject - private LootingBagViewerOverlay(Client client, ItemManager itemManager) + private LootingBagViewerOverlay(final Client client, final ItemManager itemManager) { setPosition(OverlayPosition.BOTTOM_RIGHT); panelComponent.setWrapping(4); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java index 69563ab2c4..a0e3591dbf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java @@ -29,6 +29,8 @@ package net.runelite.client.plugins.lootingbagviewer; import com.google.common.base.Strings; import com.google.inject.Provides; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; @@ -57,6 +59,7 @@ import net.runelite.client.ui.overlay.OverlayManager; * TODO: Write something to capture adding items to a looting bag and add its price to the current looting bag value */ @Slf4j +@Singleton // WHY IS THIS PLUGIN EVEN MERGED IT'S AGES FROM BEING DONE!?!?!?!? public class LootingBagViewerPlugin extends Plugin { @Inject @@ -77,8 +80,8 @@ public class LootingBagViewerPlugin extends Plugin @Inject private LootingBagViewerConfig config; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private int valueToShow = -1; @Provides diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerWidgetOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerWidgetOverlay.java index 00c716f2fb..d3356155c4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerWidgetOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerWidgetOverlay.java @@ -27,22 +27,21 @@ package net.runelite.client.plugins.lootingbagviewer; import java.awt.Color; import java.awt.Graphics2D; import javax.inject.Inject; -import net.runelite.api.Client; +import javax.inject.Singleton; import net.runelite.api.ItemID; import net.runelite.api.Point; import net.runelite.api.widgets.WidgetItem; import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.ui.overlay.WidgetItemOverlay; +@Singleton public class LootingBagViewerWidgetOverlay extends WidgetItemOverlay { - private Client client; private LootingBagViewerPlugin plugin; @Inject - LootingBagViewerWidgetOverlay(Client client, LootingBagViewerPlugin plugin) + LootingBagViewerWidgetOverlay(final LootingBagViewerPlugin plugin) { - this.client = client; this.plugin = plugin; showOnInventory(); } @@ -72,9 +71,6 @@ public class LootingBagViewerWidgetOverlay extends WidgetItemOverlay { switch ((int) (Math.log10(lootingBagValue) + 1)) { - case 1: - case 2: - return 8; case 3: case 4: return 6; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java index bd00e16cf3..4098bed359 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java @@ -63,7 +63,7 @@ class LootTrackerBox extends JPanel @Getter(AccessLevel.PACKAGE) private final String id; - @Getter + @Getter(AccessLevel.PACKAGE) private final List records = new ArrayList<>(); private long totalPrice; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerItem.java index feb1504681..b676924c8e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerItem.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.loottracker; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; @@ -31,15 +32,15 @@ import lombok.Setter; @AllArgsConstructor class LootTrackerItem { - @Getter + @Getter(AccessLevel.PACKAGE) private final int id; - @Getter + @Getter(AccessLevel.PACKAGE) private final String name; - @Getter + @Getter(AccessLevel.PACKAGE) private final int quantity; - @Getter + @Getter(AccessLevel.PACKAGE) private final long price; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private boolean ignored; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java index 4e5afb9637..91f9218ad9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Objects; +import javax.inject.Singleton; import javax.swing.BorderFactory; import javax.swing.BoxLayout; import javax.swing.ImageIcon; @@ -59,6 +60,7 @@ import net.runelite.client.util.StackFormatter; import net.runelite.http.api.loottracker.LootTrackerClient; @Slf4j +@Singleton class LootTrackerPanel extends PluginPanel { private static final int MAX_LOOT_BOXES = 500; @@ -137,8 +139,6 @@ class LootTrackerPanel extends PluginPanel INVISIBLE_ICON_HOVER = new ImageIcon(ImageUtil.alphaOffset(invisibleImg, -220)); } - private final JPanel displaySelector; - @Getter @Setter private LootRecordSortType lootRecordSortType = LootRecordSortType.TIMESTAMP; @@ -300,7 +300,7 @@ class LootTrackerPanel extends PluginPanel overallPanel.add(overallIcon, BorderLayout.WEST); overallPanel.add(overallInfo, BorderLayout.CENTER); - displaySelector = new JPanel(); + JPanel displaySelector = new JPanel(); displaySelector.setLayout(new GridLayout(1, 1)); displaySelector.setBorder(new EmptyBorder(2, 10, 10, 10)); displaySelector.setBackground(ColorScheme.DARKER_GRAY_COLOR); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index bea6d2d477..2f863394fe 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -57,6 +57,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; import javax.inject.Inject; +import javax.inject.Singleton; import javax.swing.SwingUtilities; import lombok.AccessLevel; import lombok.Getter; @@ -117,6 +118,7 @@ import net.runelite.http.api.loottracker.LootTrackerClient; enabledByDefault = false ) @Slf4j +@Singleton public class LootTrackerPlugin extends Plugin { // Activity/Event loot handling @@ -212,6 +214,18 @@ public class LootTrackerPlugin extends Plugin .collect(Collectors.toList()); } + private String getIgnoredItems; + private boolean saveLoot; + private boolean chestLootChat; + private boolean syncPanel; + private boolean localPersistence; + private LootRecordSortType sortType; + private boolean whitelistEnabled; + private String getWhitelist; + private boolean blacklistEnabled; + private String getBlacklist; + private boolean sendLootValueMessages; + @Provides LootTrackerConfig provideConfig(ConfigManager configManager) { @@ -253,14 +267,16 @@ public class LootTrackerPlugin extends Plugin { if (event.getGroup().equals("loottracker")) { + updateConfig(); + if (event.getKey().equals("ignoredItems")) { - ignoredItems = Text.fromCSV(config.getIgnoredItems()); + ignoredItems = Text.fromCSV(this.getIgnoredItems); SwingUtilities.invokeLater(panel::updateIgnoredRecords); } if (event.getKey().equals("sortType")) { - panel.setLootRecordSortType(config.sortType()); + panel.setLootRecordSortType(this.sortType); SwingUtilities.invokeLater(panel::rebuild); } } @@ -270,7 +286,9 @@ public class LootTrackerPlugin extends Plugin @Override protected void startUp() throws Exception { - ignoredItems = Text.fromCSV(config.getIgnoredItems()); + updateConfig(); + + ignoredItems = Text.fromCSV(this.getIgnoredItems); panel = new LootTrackerPanel(this, itemManager, config); spriteManager.getSpriteAsync(SpriteID.TAB_INVENTORY, 0, panel::loadHeaderIcon); @@ -288,7 +306,7 @@ public class LootTrackerPlugin extends Plugin AccountSession accountSession = sessionManager.getAccountSession(); LOOT_RECORDS_FILE.createNewFile(); bufferedReader = Files.newBufferedReader(LOOT_RECORDS_FILE.toPath()); - if (accountSession != null || config.localPersistence()) + if (accountSession != null || this.localPersistence) { clientThread.invokeLater(() -> @@ -303,7 +321,7 @@ public class LootTrackerPlugin extends Plugin executor.submit(() -> { - if (config.syncPanel() && lootTrackerClient != null) + if (this.syncPanel && lootTrackerClient != null) { lootTrackerClient = new LootTrackerClient(accountSession.getUuid()); try @@ -318,7 +336,7 @@ public class LootTrackerPlugin extends Plugin log.debug("Loaded {} remote data entries", lootRecords.size()); } - if (config.localPersistence()) + if (this.localPersistence) { try { @@ -367,18 +385,18 @@ public class LootTrackerPlugin extends Plugin final LootTrackerItem[] entries = buildEntries(stack(items)); String localUsername = client.getLocalPlayer().getName(); - if (config.whitelistEnabled()) + if (this.whitelistEnabled) { - final String configNpcs = config.getWhitelist().toLowerCase(); + final String configNpcs = this.getWhitelist.toLowerCase(); List whitelist = Text.fromCSV(configNpcs); if (!whitelist.contains(name.toLowerCase())) { return; } } - else if (config.blacklistEnabled()) + else if (this.blacklistEnabled) { - final String configNpcs = config.getBlacklist().toLowerCase(); + final String configNpcs = this.getBlacklist.toLowerCase(); List blacklist = Text.fromCSV(configNpcs); if (blacklist.contains(name.toLowerCase())) { @@ -390,11 +408,11 @@ public class LootTrackerPlugin extends Plugin LootRecord lootRecord = new LootRecord(name, localUsername, LootRecordType.NPC, toGameItems(items), Instant.now()); - if (lootTrackerClient != null && config.saveLoot()) + if (lootTrackerClient != null && this.saveLoot) { lootTrackerClient.submit(lootRecord); } - if (config.localPersistence()) + if (this.localPersistence) { saveLocalLootRecord(lootRecord); } @@ -412,7 +430,7 @@ public class LootTrackerPlugin extends Plugin @Subscribe public void onPlayerLootReceived(final PlayerLootReceived playerLootReceived) { - if (config.sendLootValueMessages()) + if (this.sendLootValueMessages) { if (WorldType.isDeadmanWorld(client.getWorldType()) || WorldType.isHighRiskWorld(client.getWorldType()) || WorldType.isPvpWorld(client.getWorldType()) || client.getVar(Varbits.IN_WILDERNESS) == 1) { @@ -433,11 +451,11 @@ public class LootTrackerPlugin extends Plugin SwingUtilities.invokeLater(() -> panel.add(name, localUsername, combat, entries)); LootRecord lootRecord = new LootRecord(name, localUsername, LootRecordType.PLAYER, toGameItems(items), Instant.now()); - if (lootTrackerClient != null && config.saveLoot()) + if (lootTrackerClient != null && this.saveLoot) { lootTrackerClient.submit(lootRecord); } - if (config.localPersistence() && lootTrackerClient == null) + if (this.localPersistence && lootTrackerClient == null) { saveLocalLootRecord(lootRecord); } @@ -480,7 +498,7 @@ public class LootTrackerPlugin extends Plugin return; } - if (!(event.getGroupId() == WidgetID.CLUE_SCROLL_REWARD_GROUP_ID) && config.chestLootChat()) + if (!(event.getGroupId() == WidgetID.CLUE_SCROLL_REWARD_GROUP_ID) && this.chestLootChat) { Item[] items = container.getItems(); long chestPrice = 0; @@ -523,7 +541,7 @@ public class LootTrackerPlugin extends Plugin final LootTrackerItem[] entries = buildEntries(stack(items)); SwingUtilities.invokeLater(() -> panel.add(eventType, client.getLocalPlayer().getName(), -1, entries)); - if (lootTrackerClient != null && config.saveLoot()) + if (lootTrackerClient != null && this.saveLoot) { LootRecord lootRecord = new LootRecord(eventType, client.getLocalPlayer().getName(), LootRecordType.EVENT, toGameItems(items), Instant.now()); @@ -627,11 +645,11 @@ public class LootTrackerPlugin extends Plugin client.getLocalPlayer().getCombatLevel(), entries)); LootRecord lootRecord = new LootRecord(name, client.getLocalPlayer().getName(), LootRecordType.DEATH, toGameItems(itemsLost), Instant.now()); - if (lootTrackerClient != null && config.saveLoot()) + if (lootTrackerClient != null && this.saveLoot) { lootTrackerClient.submit(lootRecord); } - if (config.localPersistence() && lootTrackerClient == null) + if (this.localPersistence && lootTrackerClient == null) { saveLocalLootRecord(lootRecord); } @@ -734,7 +752,7 @@ public class LootTrackerPlugin extends Plugin final LootTrackerItem[] entries = buildEntries(stack(items)); SwingUtilities.invokeLater(() -> panel.add(chestType, client.getLocalPlayer().getName(), -1, entries)); - if (lootTrackerClient != null && config.saveLoot()) + if (lootTrackerClient != null && this.saveLoot) { LootRecord lootRecord = new LootRecord(chestType, client.getLocalPlayer().getName(), LootRecordType.EVENT, toGameItems(items), Instant.now()); @@ -759,6 +777,7 @@ public class LootTrackerPlugin extends Plugin } config.setIgnoredItems(Text.toCSV(ignoredItemSet)); + this.getIgnoredItems = Text.toCSV(ignoredItemSet); panel.updateIgnoredRecords(); } @@ -814,4 +833,19 @@ public class LootTrackerPlugin extends Plugin return trackerRecords; } + + private void updateConfig() + { + this.getIgnoredItems = config.getIgnoredItems(); + this.saveLoot = config.saveLoot(); + this.chestLootChat = config.chestLootChat(); + this.syncPanel = config.syncPanel(); + this.localPersistence = config.localPersistence(); + this.sortType = config.sortType(); + this.whitelistEnabled = config.whitelistEnabled(); + this.getWhitelist = config.getWhitelist(); + this.blacklistEnabled = config.blacklistEnabled(); + this.getBlacklist = config.getBlacklist(); + this.sendLootValueMessages = config.sendLootValueMessages(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lowmemory/LowMemoryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lowmemory/LowMemoryPlugin.java index 41caa93ebd..589ac4e202 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lowmemory/LowMemoryPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lowmemory/LowMemoryPlugin.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.lowmemory; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.events.GameStateChanged; @@ -38,6 +39,7 @@ import net.runelite.client.plugins.PluginDescriptor; tags = {"memory", "usage", "ground", "decorations"}, enabledByDefault = false ) +@Singleton public class LowMemoryPlugin extends Plugin { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java index 2315d2e2ca..ac85314026 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.maxhit; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.InventoryID; import net.runelite.api.Item; @@ -48,7 +49,7 @@ import net.runelite.client.plugins.maxhit.calculators.RangeMaxHitCalculator; type = PluginType.UTILITY, enabledByDefault = false ) - +@Singleton public class MaxHitPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java index 53833123cb..5e440d5064 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java @@ -43,7 +43,7 @@ public class EquipmentSlotItem return this.itemIds; } - public EquipmentInventorySlot getEquipmentSlot() + EquipmentInventorySlot getEquipmentSlot() { return this.equipmentSlot; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java index 4e8490a4c4..05ce35a254 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java @@ -40,6 +40,8 @@ import java.util.Map; import java.util.Objects; import java.util.Set; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import net.runelite.api.Client; @@ -78,11 +80,25 @@ import net.runelite.client.menus.WidgetMenuOption; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; +import net.runelite.client.plugins.menuentryswapper.util.BurningAmuletMode; +import net.runelite.client.plugins.menuentryswapper.util.CombatBraceletMode; +import net.runelite.client.plugins.menuentryswapper.util.DigsitePendantMode; +import net.runelite.client.plugins.menuentryswapper.util.DuelingRingMode; import net.runelite.client.plugins.menuentryswapper.util.FairyRingMode; +import net.runelite.client.plugins.menuentryswapper.util.GamesNecklaceMode; +import net.runelite.client.plugins.menuentryswapper.util.GloryMode; import net.runelite.client.plugins.menuentryswapper.util.HouseMode; +import net.runelite.client.plugins.menuentryswapper.util.MaxCapeMode; +import net.runelite.client.plugins.menuentryswapper.util.NecklaceOfPassageMode; import net.runelite.client.plugins.menuentryswapper.util.ObeliskMode; import net.runelite.client.plugins.menuentryswapper.util.OccultAltarMode; import net.runelite.client.plugins.menuentryswapper.util.CharterOption; +import net.runelite.client.plugins.menuentryswapper.util.QuestCapeMode; +import net.runelite.client.plugins.menuentryswapper.util.RingOfWealthMode; +import net.runelite.client.plugins.menuentryswapper.util.SkillsNecklaceMode; +import net.runelite.client.plugins.menuentryswapper.util.SlayerRingMode; +import net.runelite.client.plugins.menuentryswapper.util.XericsTalismanMode; +import net.runelite.client.plugins.menuentryswapper.util.teleEquippedMode; import static net.runelite.client.util.MenuUtil.swap; import net.runelite.client.util.MiscUtils; import net.runelite.client.util.Text; @@ -95,7 +111,7 @@ import org.apache.commons.lang3.ArrayUtils; type = PluginType.UTILITY, enabledByDefault = false ) - +@Singleton public class MenuEntrySwapperPlugin extends Plugin { private static final String CONFIGURE = "Configure"; @@ -109,7 +125,7 @@ public class MenuEntrySwapperPlugin extends Plugin private static final String WALK_HERE = "WALK HERE"; private static final String CANCEL = "CANCEL"; private static final String CAST_OPTIONS_ATTACK = "CAST"; - public static final HashSet CAST_OPTIONS_KEYWORDS = new HashSet<>(); + private static final HashSet CAST_OPTIONS_KEYWORDS = new HashSet<>(); static { CAST_OPTIONS_KEYWORDS.add(CAST_OPTIONS_ATTACK); @@ -176,11 +192,139 @@ public class MenuEntrySwapperPlugin extends Plugin @Inject private ItemManager itemManager; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean configuringShiftClick = false; - @Setter + @Setter(AccessLevel.PACKAGE) private boolean shiftModifier = false; + + private boolean getWithdrawOne; + private String getWithdrawOneItems; + private boolean getWithdrawFive; + private String getWithdrawFiveItems; + private boolean getWithdrawTen; + private String getWithdrawTenItems; + private boolean getWithdrawX; + private String getWithdrawXAmount; + private String getWithdrawXItems; + private boolean getWithdrawAll; + private String getWithdrawAllItems; + private boolean swapMax; + private boolean teleEquippedCape; + private teleEquippedMode telecapeMode; + private MaxCapeMode maxMode; + private boolean getSwapArdougneCape; + private boolean getSwapConstructionCape; + private boolean getSwapCraftingCape; + private boolean getSwapMagicCape; + private boolean getSwapExplorersRing; + private boolean swapAdmire; + private boolean swapQuestCape; + private QuestCapeMode questCapeMode; + private String configCustomSwaps; + private boolean shiftClickCustomization; + private boolean swapCoalBag; + private boolean swapBirdhouseEmpty; + private boolean swapBones; + private boolean swapChase; + private boolean swapHarpoon; + private boolean swapOccult; + private OccultAltarMode swapOccultMode; + private boolean swapHomePortal; + private HouseMode swapHomePortalMode; + private boolean swapPrivate; + private boolean swapPick; + private boolean swapQuick; + private boolean swapBoxTrap; + private boolean rockCake; + private boolean swapRogueschests; + private boolean swapClimbUpDown; + private boolean swapStun; + private boolean swapSearch; + private boolean swapHardWoodGrove; + private boolean getRemoveObjects; + private String getRemovedObjects; + private boolean swapImps; + private CharterOption charterOption; + private boolean getSwapBuyOne; + private String getBuyOneItems; + private boolean getSwapBuyFive; + private String getBuyFiveItems; + private boolean getSwapBuyTen; + private String getBuyTenItems; + private boolean getSwapBuyFifty; + private String getBuyFiftyItems; + private boolean getSwapSellOne; + private String getSellOneItems; + private boolean getSwapSellFive; + private String getSellFiveItems; + private boolean getSwapSellTen; + private String getSellTenItems; + private boolean getSwapSellFifty; + private String getSellFiftyItems; + private boolean getEasyConstruction; + private String getEasyConstructionItems; + private boolean getSwapSmithing; + private boolean getSwapTanning; + private boolean getSwapSawmill; + private boolean getSwapSawmillPlanks; + private boolean getSwapPuro; + private boolean swapAssignment; + private boolean swapBankExchange; + private boolean swapContract; + private boolean swapInteract; + private boolean swapPickpocket; + private boolean swapPay; + private boolean swapAbyssTeleport; + private boolean swapTrade; + private boolean swapTravel; + private boolean swapMinigame; + private boolean swapPlank; + private boolean swapMetamorphosis; + private boolean swapEnchant; + private boolean swapFairyRing; + private FairyRingMode swapFairyRingMode; + private boolean swapObelisk; + private ObeliskMode swapObeliskMode; + private boolean swapTeleportItem; + private boolean swapWildernessLever; + private boolean swapNexus; + private boolean getGamesNecklace; + private GamesNecklaceMode getGamesNecklaceMode; + private boolean getDuelingRing; + private DuelingRingMode getDuelingRingMode; + private boolean getGlory; + private GloryMode getGloryMode; + private boolean getSkillsNecklace; + private SkillsNecklaceMode getSkillsNecklaceMode; + private boolean getNecklaceofPassage; + private NecklaceOfPassageMode getNecklaceofPassageMode; + private boolean getDigsitePendant; + private DigsitePendantMode getDigsitePendantMode; + private boolean getCombatBracelet; + private CombatBraceletMode getCombatBraceletMode; + private boolean getBurningAmulet; + private BurningAmuletMode getBurningAmuletMode; + private boolean getXericsTalisman; + private XericsTalismanMode getXericsTalismanMode; + private boolean getRingofWealth; + private RingOfWealthMode getRingofWealthMode; + private boolean getSlayerRing; + private SlayerRingMode getSlayerRingMode; + private boolean hideExamine; + private boolean hideTradeWith; + private boolean hideReport; + private boolean hideLookup; + private boolean hideNet; + private boolean hideBait; + private boolean hideDestroyRunepouch; + private boolean hideDestroyCoalbag; + private boolean hideDestroyHerbsack; + private boolean hideDestroyBoltpouch; + private boolean hideDestroyGembag; + private boolean hideDropRunecraftingPouch; + private boolean getRemoveFreezePlayerToB; + private boolean getRemoveFreezePlayerCoX; @Provides MenuEntrySwapperConfig provideConfig(ConfigManager configManager) @@ -191,6 +335,7 @@ public class MenuEntrySwapperPlugin extends Plugin @Override public void startUp() { + updateConfig(); addSwaps(); loadConstructionItems(config.getEasyConstructionItems()); @@ -218,8 +363,10 @@ public class MenuEntrySwapperPlugin extends Plugin { return; } + + updateConfig(); - loadConstructionItems(config.getEasyConstructionItems()); + loadConstructionItems(this.getEasyConstructionItems); removeSwaps(); addSwaps(); @@ -227,7 +374,7 @@ public class MenuEntrySwapperPlugin extends Plugin { if (event.getKey().equals("customSwaps")) { - loadCustomSwaps(config.customSwaps()); + loadCustomSwaps(this.configCustomSwaps); } return; @@ -235,7 +382,7 @@ public class MenuEntrySwapperPlugin extends Plugin if (event.getKey().equals("shiftClickCustomization")) { - if (config.shiftClickCustomization()) + if (this.shiftClickCustomization) { enableCustomization(); } @@ -315,7 +462,7 @@ public class MenuEntrySwapperPlugin extends Plugin return; } - loadConstructionItems(config.getEasyConstructionItems()); + loadConstructionItems(this.getEasyConstructionItems); } @Subscribe @@ -345,55 +492,55 @@ public class MenuEntrySwapperPlugin extends Plugin { String option = Text.removeTags(entry.getOption()).toLowerCase(); - if (option.contains("trade with") && config.hideTradeWith()) + if (option.contains("trade with") && this.hideTradeWith) { continue; } - if (option.contains("lookup") && config.hideLookup()) + if (option.contains("lookup") && this.hideLookup) { continue; } - if (option.contains("report") && config.hideReport()) + if (option.contains("report") && this.hideReport) { continue; } - if (option.contains("examine") && config.hideExamine()) + if (option.contains("examine") && this.hideExamine) { continue; } - if (option.contains("net") && config.hideNet()) + if (option.contains("net") && this.hideNet) { continue; } - if (option.contains("bait") && config.hideBait()) + if (option.contains("bait") && this.hideBait) { continue; } if (option.contains("destroy")) { - if (config.hideDestroyRunepouch() && entry.getTarget().contains("Rune pouch")) + if (this.hideDestroyRunepouch && entry.getTarget().contains("Rune pouch")) { continue; } - if (config.hideDestroyCoalbag() && entry.getTarget().contains("Coal bag")) + if (this.hideDestroyCoalbag && entry.getTarget().contains("Coal bag")) { continue; } - if (config.hideDestroyHerbsack() && entry.getTarget().contains("Herb sack")) + if (this.hideDestroyHerbsack && entry.getTarget().contains("Herb sack")) { continue; } - if (config.hideDestroyBoltpouch() && entry.getTarget().contains("Bolt pouch")) + if (this.hideDestroyBoltpouch && entry.getTarget().contains("Bolt pouch")) { continue; } - if (config.hideDestroyGembag() && entry.getTarget().contains("Gem bag")) + if (this.hideDestroyGembag && entry.getTarget().contains("Gem bag")) { continue; } @@ -401,8 +548,8 @@ public class MenuEntrySwapperPlugin extends Plugin if (option.contains("drop")) { - if (config.hideDropRunecraftingPouch() && ( - entry.getTarget().contains("Small pouch") + if (this.hideDropRunecraftingPouch && ( + entry.getTarget().contains("Small pouch") || entry.getTarget().contains("Medium pouch") || entry.getTarget().contains("Large pouch") || entry.getTarget().contains("Giant pouch"))) @@ -551,9 +698,9 @@ public class MenuEntrySwapperPlugin extends Plugin if (option.contains("withdraw") || option.contains("deposit")) { - if (config.getWithdrawOne()) + if (this.getWithdrawOne) { - for (String item : Text.fromCSV(config.getWithdrawOneItems())) + for (String item : Text.fromCSV(this.getWithdrawOneItems)) { if (target.equals(Text.standardize(item))) { @@ -563,9 +710,9 @@ public class MenuEntrySwapperPlugin extends Plugin } } - if (config.getWithdrawFive()) + if (this.getWithdrawFive) { - for (String item : Text.fromCSV(config.getWithdrawFiveItems())) + for (String item : Text.fromCSV(this.getWithdrawFiveItems)) { if (target.equals(Text.standardize(item))) { @@ -575,9 +722,9 @@ public class MenuEntrySwapperPlugin extends Plugin } } - if (config.getWithdrawTen()) + if (this.getWithdrawTen) { - for (String item : Text.fromCSV(config.getWithdrawTenItems())) + for (String item : Text.fromCSV(this.getWithdrawTenItems)) { if (target.equals(Text.standardize(item))) { @@ -587,21 +734,21 @@ public class MenuEntrySwapperPlugin extends Plugin } } - if (config.getWithdrawX()) + if (this.getWithdrawX) { - for (String item : Text.fromCSV(config.getWithdrawXItems())) + for (String item : Text.fromCSV(this.getWithdrawXItems)) { if (target.equals(Text.standardize(item))) { - swap(client, "Withdraw-" + config.getWithdrawXAmount(), option, target); - swap(client, "Deposit-" + config.getWithdrawXAmount(), option, target); + swap(client, "Withdraw-" + this.getWithdrawXAmount, option, target); + swap(client, "Deposit-" + this.getWithdrawXAmount, option, target); } } } - if (config.getWithdrawAll()) + if (this.getWithdrawAll) { - for (String item : Text.fromCSV(config.getWithdrawAllItems())) + for (String item : Text.fromCSV(this.getWithdrawAllItems)) { if (target.equals(Text.standardize(item))) { @@ -613,13 +760,11 @@ public class MenuEntrySwapperPlugin extends Plugin } if ((option.contains("buy") || option.contains("value")) && Arrays.stream(entries).anyMatch(menuEntry -> + menuEntry.getOption().toLowerCase().contains("buy"))) { - return menuEntry.getOption().toLowerCase().contains("buy"); - })) - { - if (config.getSwapBuyOne() && !config.getBuyOneItems().equals("")) + if (this.getSwapBuyOne && !this.getBuyOneItems.equals("")) { - for (String item : Text.fromCSV(config.getBuyOneItems())) + for (String item : Text.fromCSV(this.getBuyOneItems)) { if (target.equals(Text.standardize(item))) { @@ -628,9 +773,9 @@ public class MenuEntrySwapperPlugin extends Plugin } } - if (config.getSwapBuyFive() && !config.getBuyFiveItems().equals("")) + if (this.getSwapBuyFive && !this.getBuyFiveItems.equals("")) { - for (String item : Text.fromCSV(config.getBuyFiveItems())) + for (String item : Text.fromCSV(this.getBuyFiveItems)) { if (target.equals(Text.standardize(item))) { @@ -639,9 +784,9 @@ public class MenuEntrySwapperPlugin extends Plugin } } - if (config.getSwapBuyTen() && !config.getBuyTenItems().equals("")) + if (this.getSwapBuyTen && !this.getBuyTenItems.equals("")) { - for (String item : Text.fromCSV(config.getBuyTenItems())) + for (String item : Text.fromCSV(this.getBuyTenItems)) { if (target.equals(Text.standardize(item))) { @@ -650,9 +795,9 @@ public class MenuEntrySwapperPlugin extends Plugin } } - if (config.getSwapBuyFifty() && !config.getBuyFiftyItems().equals("")) + if (this.getSwapBuyFifty && !this.getBuyFiftyItems.equals("")) { - for (String item : Text.fromCSV(config.getBuyFiftyItems())) + for (String item : Text.fromCSV(this.getBuyFiftyItems)) { if (target.equals(Text.standardize(item))) { @@ -662,13 +807,11 @@ public class MenuEntrySwapperPlugin extends Plugin } } else if ((option.contains("sell") || option.contains("value")) && Arrays.stream(entries).anyMatch(menuEntry -> + menuEntry.getOption().toLowerCase().contains("sell"))) { - return menuEntry.getOption().toLowerCase().contains("sell"); - })) - { - if (config.getSwapSellOne() && !config.getSellOneItems().equals("")) + if (this.getSwapSellOne && !this.getSellOneItems.equals("")) { - for (String item : Text.fromCSV(config.getSellOneItems())) + for (String item : Text.fromCSV(this.getSellOneItems)) { if (target.equals(Text.standardize(item))) { @@ -677,9 +820,9 @@ public class MenuEntrySwapperPlugin extends Plugin } } - if (config.getSwapSellFive() && !Strings.isNullOrEmpty(config.getSellFiveItems())) + if (this.getSwapSellFive && !Strings.isNullOrEmpty(this.getSellFiveItems)) { - for (String item : Text.fromCSV(config.getSellFiveItems())) + for (String item : Text.fromCSV(this.getSellFiveItems)) { if (target.equals(Text.standardize(item))) { @@ -688,9 +831,9 @@ public class MenuEntrySwapperPlugin extends Plugin } } - if (config.getSwapSellTen() && !Strings.isNullOrEmpty(config.getSellTenItems())) + if (this.getSwapSellTen && !Strings.isNullOrEmpty(this.getSellTenItems)) { - for (String item : Text.fromCSV(config.getSellTenItems())) + for (String item : Text.fromCSV(this.getSellTenItems)) { if (target.equals(Text.standardize(item))) { @@ -699,9 +842,9 @@ public class MenuEntrySwapperPlugin extends Plugin } } - if (config.getSwapSellFifty() && !Strings.isNullOrEmpty(config.getSellFiftyItems())) + if (this.getSwapSellFifty && !Strings.isNullOrEmpty(this.getSellFiftyItems)) { - for (String item : Text.fromCSV(config.getSellFiftyItems())) + for (String item : Text.fromCSV(this.getSellFiftyItems)) { if (target.equals(Text.standardize(item))) { @@ -711,9 +854,9 @@ public class MenuEntrySwapperPlugin extends Plugin } } - if (config.getRemoveObjects() && !config.getRemovedObjects().equals("")) + if (this.getRemoveObjects && !this.getRemovedObjects.equals("")) { - for (String removed : Text.fromCSV(config.getRemovedObjects())) + for (String removed : Text.fromCSV(this.getRemovedObjects)) { removed = Text.standardize(removed); if (target.contains("(") && target.split(" \\(")[0].equals(removed)) @@ -737,7 +880,7 @@ public class MenuEntrySwapperPlugin extends Plugin } } - if (config.getSwapPuro() && isPuroPuro()) + if (this.getSwapPuro && isPuroPuro()) { if (event.getType() == WALK.getId()) { @@ -756,7 +899,7 @@ public class MenuEntrySwapperPlugin extends Plugin } } - else if (config.getSwapSmithing() && option.contains("smith")) + else if (this.getSwapSmithing && option.contains("smith")) { if (option.equalsIgnoreCase("Smith 1")) { @@ -768,17 +911,17 @@ public class MenuEntrySwapperPlugin extends Plugin } } - else if (config.getSwapTanning() && option.equalsIgnoreCase("Tan 1")) + else if (this.getSwapTanning && option.equalsIgnoreCase("Tan 1")) { swap(client, "Tan All", option, target); } - else if (config.getSwapSawmill() && target.equalsIgnoreCase("Sawmill operator")) + else if (this.getSwapSawmill && target.equalsIgnoreCase("Sawmill operator")) { swap(client, "Buy-plank", option, target); } - else if (config.getSwapSawmillPlanks() && option.equalsIgnoreCase("Buy 1")) + else if (this.getSwapSawmillPlanks && option.equalsIgnoreCase("Buy 1")) { swap(client, "Buy All", option, target); } @@ -788,28 +931,28 @@ public class MenuEntrySwapperPlugin extends Plugin swap(client, "Clear", option, target); } - else if (target.contains("ardougne cloak") && config.getSwapArdougneCape()) + else if (target.contains("ardougne cloak") && this.getSwapArdougneCape) { swap(client, "Kandarin Monastery", option, target); swap(client, "Monastery Teleport", option, target); } - else if (target.contains("crafting cape") && config.getSwapCraftingCape()) + else if (target.contains("crafting cape") && this.getSwapCraftingCape) { swap(client, "Teleport", option, target); } - else if (target.contains("construct. cape") && config.getSwapConstructionCape()) + else if (target.contains("construct. cape") && this.getSwapConstructionCape) { swap(client, "Tele to poh", option, target); } - else if (target.contains("magic cape") && config.getSwapMagicCape()) + else if (target.contains("magic cape") && this.getSwapMagicCape) { swap(client, "Spellbook", option, target); } - else if (target.contains("explorer's ring") && config.getSwapExplorersRing()) + else if (target.contains("explorer's ring") && this.getSwapExplorersRing) { swap(client, "Teleport", option, target); } @@ -821,7 +964,7 @@ public class MenuEntrySwapperPlugin extends Plugin return; } - if (config.swapImps() && target.contains("impling")) + if (this.swapImps && target.contains("impling")) { if (client.getItemContainer(InventoryID.BANK) != null) @@ -851,59 +994,61 @@ public class MenuEntrySwapperPlugin extends Plugin } } } - if (target.equals("eclectic impling jar")) + switch (target) { - if (client.getItemContainer(InventoryID.INVENTORY) != null) - { - for (Item i : Objects.requireNonNull(client.getItemContainer(InventoryID.INVENTORY)).getItems()) + case "eclectic impling jar": + if (client.getItemContainer(InventoryID.INVENTORY) != null) { - invItemNames.add(client.getItemDefinition((i.getId())).getName()); + for (Item i : Objects.requireNonNull(client.getItemContainer(InventoryID.INVENTORY)).getItems()) + { + invItemNames.add(client.getItemDefinition((i.getId())).getName()); + } + if ((invItemNames.contains("Clue scroll (medium)") || bankItemNames.contains("Clue scroll (medium)"))) + { + menuManager.addSwap("loot", target, "use"); + } + else + { + menuManager.removeSwaps(target); + } } - if ((invItemNames.contains("Clue scroll (medium)") || bankItemNames.contains("Clue scroll (medium)"))) + break; + case "magpie impling jar": + case "nature impling jar": + case "ninja impling jar": + if (client.getItemContainer(InventoryID.INVENTORY) != null) { - menuManager.addSwap("loot", target, "use"); + for (Item i : Objects.requireNonNull(client.getItemContainer(InventoryID.INVENTORY)).getItems()) + { + invItemNames.add(client.getItemDefinition((i.getId())).getName()); + } + if ((invItemNames.contains("Clue scroll (hard)") || bankItemNames.contains("Clue scroll (hard)"))) + { + menuManager.addSwap("loot", target, "use"); + } + else + { + menuManager.removeSwaps(target); + } } - else + break; + case "dragon impling jar": + if (client.getItemContainer(InventoryID.INVENTORY) != null) { - menuManager.removeSwaps(target); + for (Item i : Objects.requireNonNull(client.getItemContainer(InventoryID.INVENTORY)).getItems()) + { + invItemNames.add(client.getItemDefinition((i.getId())).getName()); + } + if ((invItemNames.contains("Clue scroll (elite)") || bankItemNames.contains("Clue scroll (elite)"))) + { + menuManager.addSwap("loot", target, "use"); + } + else + { + menuManager.removeSwaps(target); + } } - } - } - else if (target.equals("magpie impling jar") || (target.equals("nature impling jar")) || (target.equals("ninja impling jar"))) - { - if (client.getItemContainer(InventoryID.INVENTORY) != null) - { - for (Item i : Objects.requireNonNull(client.getItemContainer(InventoryID.INVENTORY)).getItems()) - { - invItemNames.add(client.getItemDefinition((i.getId())).getName()); - } - if ((invItemNames.contains("Clue scroll (hard)") || bankItemNames.contains("Clue scroll (hard)"))) - { - menuManager.addSwap("loot", target, "use"); - } - else - { - menuManager.removeSwaps(target); - } - } - } - else if (target.equals("dragon impling jar")) - { - if (client.getItemContainer(InventoryID.INVENTORY) != null) - { - for (Item i : Objects.requireNonNull(client.getItemContainer(InventoryID.INVENTORY)).getItems()) - { - invItemNames.add(client.getItemDefinition((i.getId())).getName()); - } - if ((invItemNames.contains("Clue scroll (elite)") || bankItemNames.contains("Clue scroll (elite)"))) - { - menuManager.addSwap("loot", target, "use"); - } - else - { - menuManager.removeSwaps(target); - } - } + break; } } @@ -918,8 +1063,8 @@ public class MenuEntrySwapperPlugin extends Plugin Player player = players[identifier]; if (player != null) { - if (((config.getRemoveFreezePlayerCoX() && client.getVar(Varbits.IN_RAID) == 1) - || (config.getRemoveFreezePlayerToB() && client.getVar(Varbits.THEATRE_OF_BLOOD) == 2)) + if (((this.getRemoveFreezePlayerCoX && client.getVar(Varbits.IN_RAID) == 1) + || (this.getRemoveFreezePlayerToB && client.getVar(Varbits.THEATRE_OF_BLOOD) == 2)) && (player.isFriend() || player.isClanMember()) && CAST_OPTIONS_KEYWORDS.contains(pOptionToReplace)) { @@ -931,27 +1076,27 @@ public class MenuEntrySwapperPlugin extends Plugin if (option.equals("talk-to")) { - if (config.swapPickpocket()) + if (this.swapPickpocket) { swap(client, "pickpocket", option, target, true); } - if (config.swapHardWoodGrove() && target.contains("rionasta")) + if (this.swapHardWoodGrove && target.contains("rionasta")) { swap(client, "send-parcel", option, target, true); } - if (config.swapBankExchange()) + if (this.swapBankExchange) { swap(client, "bank", option, target, true); swap(client, "exchange", option, target, true); } - if (config.swapContract()) + if (this.swapContract) { swap(client, "contract", option, target, true); } - if (config.swapInteract()) + if (this.swapInteract) { swap(client, "repairs", option, target, true); swap(client, "claim-slime", option, target, true); @@ -962,24 +1107,24 @@ public class MenuEntrySwapperPlugin extends Plugin } // make sure assignment swap is higher priority than trade swap for slayer masters - if (config.swapAssignment()) + if (this.swapAssignment) { swap(client, "assignment", option, target, true); } - if (config.swapPlank()) + if (this.swapPlank) { swap(client, "buy-plank", option, target, true); } - if (config.swapTrade() && (!(target.equals("trader crewmember") || target.equals("trader stan")) || config.charterOption().equals(CharterOption.TRADE))) + if (this.swapTrade && (!(target.equals("trader crewmember") || target.equals("trader stan")) || this.charterOption.equals(CharterOption.TRADE))) { swap(client, "trade", option, target, true); swap(client, "trade-with", option, target, true); swap(client, "shop", option, target, true); } - if (config.swapMinigame()) + if (this.swapMinigame) { swap(client, "story", option, target, true); swap(client, "escort", option, target, true); @@ -987,7 +1132,7 @@ public class MenuEntrySwapperPlugin extends Plugin swap(client, "start-minigame", option, target, true); } - if (config.swapTravel()) + if (this.swapTravel) { swap(client, "travel", option, target, true); swap(client, "pay-fare", option, target, true); @@ -1000,83 +1145,83 @@ public class MenuEntrySwapperPlugin extends Plugin swap(client, "follow", option, target, true); swap(client, "transport", option, target, true); - if (config.swapAbyssTeleport() && target.contains("mage of zamorak")) + if (this.swapAbyssTeleport && target.contains("mage of zamorak")) { swap(client, "teleport", option, target, true); } - if (!(target.equals("trader crewmember") || target.equals("trader stan")) || config.charterOption().equals(CharterOption.CHARTER)) + if (!(target.equals("trader crewmember") || target.equals("trader stan")) || this.charterOption.equals(CharterOption.CHARTER)) { swap(client, "charter", option, target, true); } } - if (config.swapPay()) + if (this.swapPay) { swap(client, "pay", option, target, true); swap(client, "pay (", option, target, false); } - if (config.swapQuick()) + if (this.swapQuick) { swap(client, "quick-travel", option, target, true); } - if (config.swapEnchant()) + if (this.swapEnchant) { swap(client, "enchant", option, target, true); } } - else if (config.swapWildernessLever() && target.equals("lever") && option.equals("ardougne")) + else if (this.swapWildernessLever && target.equals("lever") && option.equals("ardougne")) { swap(client, "edgeville", option, target, true); } - else if (config.swapMetamorphosis() && target.contains("baby chinchompa")) + else if (this.swapMetamorphosis && target.contains("baby chinchompa")) { swap(client, "metamorphosis", option, target, true); } - else if (config.swapStun() && target.contains("hoop snake")) + else if (this.swapStun && target.contains("hoop snake")) { swap(client, "stun", option, target, true); } - else if (config.swapTravel() && option.equals("pass") && target.equals("energy barrier")) + else if (this.swapTravel && option.equals("pass") && target.equals("energy barrier")) { swap(client, "pay-toll(2-ecto)", option, target, true); } - else if (config.swapTravel() && option.equals("open") && target.equals("gate")) + else if (this.swapTravel && option.equals("open") && target.equals("gate")) { swap(client, "pay-toll(10gp)", option, target, true); } - else if (config.swapHardWoodGrove() && option.equals("open") && target.equals("hardwood grove doors")) + else if (this.swapHardWoodGrove && option.equals("open") && target.equals("hardwood grove doors")) { swap(client, "quick-pay(100)", option, target, true); } - else if (config.swapTravel() && option.equals("inspect") && target.equals("trapdoor")) + else if (this.swapTravel && option.equals("inspect") && target.equals("trapdoor")) { swap(client, "travel", option, target, true); } - else if (config.swapHarpoon() && option.equals("cage")) + else if (this.swapHarpoon && option.equals("cage")) { swap(client, "harpoon", option, target, true); } - else if (config.swapHarpoon() && (option.equals("big net") || option.equals("net"))) + else if (this.swapHarpoon && (option.equals("big net") || option.equals("net"))) { swap(client, "harpoon", option, target, true); } - else if (config.swapOccultMode() != OccultAltarMode.VENERATE && option.equals("venerate")) + else if (this.swapOccultMode != OccultAltarMode.VENERATE && option.equals("venerate")) { - switch (config.swapOccultMode()) + switch (this.swapOccultMode) { case VENERATE: swap(client, "Venerate", option, target, true); @@ -1093,9 +1238,9 @@ public class MenuEntrySwapperPlugin extends Plugin } - else if (config.swapObeliskMode() != ObeliskMode.ACTIVATE && option.equals("activate")) + else if (this.swapObeliskMode != ObeliskMode.ACTIVATE && option.equals("activate")) { - switch (config.swapObeliskMode()) + switch (this.swapObeliskMode) { case ACTIVATE: swap(client, "activate", option, target, true); @@ -1109,9 +1254,9 @@ public class MenuEntrySwapperPlugin extends Plugin } } - else if (config.swapHomePortalMode() != HouseMode.ENTER && option.equals("enter")) + else if (this.swapHomePortalMode != HouseMode.ENTER && option.equals("enter")) { - switch (config.swapHomePortalMode()) + switch (this.swapHomePortalMode) { case HOME: swap(client, "home", option, target, true); @@ -1124,101 +1269,101 @@ public class MenuEntrySwapperPlugin extends Plugin break; } } - else if (config.swapFairyRingMode() != FairyRingMode.OFF && config.swapFairyRingMode() != FairyRingMode.ZANARIS + else if (this.swapFairyRingMode != FairyRingMode.OFF && this.swapFairyRingMode != FairyRingMode.ZANARIS && (option.equals("zanaris") || option.equals("configure") || option.equals("tree"))) { - if (config.swapFairyRingMode() == FairyRingMode.LAST_DESTINATION) + if (this.swapFairyRingMode == FairyRingMode.LAST_DESTINATION) { swap(client, "last-destination", option, target, false); } - else if (config.swapFairyRingMode() == FairyRingMode.CONFIGURE) + else if (this.swapFairyRingMode == FairyRingMode.CONFIGURE) { swap(client, "configure", option, target, false); } } - else if (config.swapFairyRingMode() == FairyRingMode.ZANARIS && option.equals("tree")) + else if (this.swapFairyRingMode == FairyRingMode.ZANARIS && option.equals("tree")) { swap(client, "zanaris", option, target, false); } - else if (config.swapBoxTrap() && (option.equals("check") || option.equals("dismantle"))) + else if (this.swapBoxTrap && (option.equals("check") || option.equals("dismantle"))) { swap(client, "reset", option, target, true); } - else if (config.swapBoxTrap() && option.equals("take")) + else if (this.swapBoxTrap && option.equals("take")) { swap(client, "lay", option, target, true); swap(client, "activate", option, target, true); } - else if (config.swapChase() && option.equals("pick-up")) + else if (this.swapChase && option.equals("pick-up")) { swap(client, "chase", option, target, true); } - else if (config.swapBirdhouseEmpty() && option.equals("interact") && target.contains("birdhouse")) + else if (this.swapBirdhouseEmpty && option.equals("interact") && target.contains("birdhouse")) { swap(client, "empty", option, target, true); } - else if (config.swapQuick() && option.equals("ring")) + else if (this.swapQuick && option.equals("ring")) { swap(client, "quick-start", option, target, true); } - else if (config.swapQuick() && option.equals("pass")) + else if (this.swapQuick && option.equals("pass")) { swap(client, "quick-pass", option, target, true); } - else if (config.swapQuick() && option.equals("open")) + else if (this.swapQuick && option.equals("open")) { swap(client, "quick-open", option, target, true); } - else if (config.swapQuick() && option.equals("enter")) + else if (this.swapQuick && option.equals("enter")) { swap(client, "quick-enter", option, target, true); } - else if (config.swapQuick() && option.equals("leave tomb")) + else if (this.swapQuick && option.equals("leave tomb")) { swap(client, "quick-leave", option, target, true); } - else if (config.swapAdmire() && option.equals("admire")) + else if (this.swapAdmire && option.equals("admire")) { swap(client, "teleport", option, target, true); swap(client, "spellbook", option, target, true); swap(client, "perks", option, target, true); } - else if (config.swapPrivate() && option.equals("shared")) + else if (this.swapPrivate && option.equals("shared")) { swap(client, "private", option, target, true); } - else if (config.swapPick() && option.equals("pick")) + else if (this.swapPick && option.equals("pick")) { swap(client, "pick-lots", option, target, true); } - else if (config.swapSearch() && (option.equals("close") || option.equals("shut"))) + else if (this.swapSearch && (option.equals("close") || option.equals("shut"))) { swap(client, "search", option, target, true); } - else if (config.swapRogueschests() && target.contains("chest")) + else if (this.swapRogueschests && target.contains("chest")) { swap(client, "search for traps", option, target, true); } - else if (config.rockCake() && option.equals("eat")) + else if (this.rockCake && option.equals("eat")) { swap(client, "guzzle", option, target, true); } - else if (config.shiftClickCustomization() && shiftModifier && !option.equals("use")) + else if (this.shiftClickCustomization && shiftModifier && !option.equals("use")) { Integer customOption = getSwapConfig(eventId); @@ -1229,20 +1374,20 @@ public class MenuEntrySwapperPlugin extends Plugin } // Put all item-related swapping after shift-click - else if (config.swapTeleportItem() && (option.equals("wear") || option.equals("wield"))) + else if (this.swapTeleportItem && (option.equals("wear") || option.equals("wield"))) { swap(client, "rub", option, target, true); swap(client, "teleport", option, target, true); } - else if (config.swapCoalBag() && option.contains("deposit") && target.equals("coal bag")) + else if (this.swapCoalBag && option.contains("deposit") && target.equals("coal bag")) { swap(client, "empty", option, target, true); } - else if (config.swapBones() && option.equals("bury")) + else if (this.swapBones && option.equals("bury")) { swap(client, "use", option, target, true); } - else if (config.swapNexus() && target.contains("portal nexus")) + else if (this.swapNexus && target.contains("portal nexus")) { swap(client, "teleport menu", option, target, true); } @@ -1308,7 +1453,7 @@ public class MenuEntrySwapperPlugin extends Plugin { if (!str.startsWith("//")) { - sb.append(str + "\n"); + sb.append(str).append("\n"); } } @@ -1370,76 +1515,76 @@ public class MenuEntrySwapperPlugin extends Plugin private void addSwaps() { - if (config.getBurningAmulet()) + if (this.getBurningAmulet) { - menuManager.addSwap("remove", "burning amulet", config.getBurningAmuletMode().toString()); + menuManager.addSwap("remove", "burning amulet", this.getBurningAmuletMode.toString()); } - if (config.teleEquippedCape()) + if (this.teleEquippedCape) { - menuManager.addSwap("remove", "tele to poh", config.telecapeMode().toString()); - menuManager.addSwap("remove", "teleport", config.telecapeMode().toString()); + menuManager.addSwap("remove", "tele to poh", this.telecapeMode.toString()); + menuManager.addSwap("remove", "teleport", this.telecapeMode.toString()); } - if (config.getCombatBracelet()) + if (this.getCombatBracelet) { - menuManager.addSwap("remove", "combat bracelet", config.getCombatBraceletMode().toString()); + menuManager.addSwap("remove", "combat bracelet", this.getCombatBraceletMode.toString()); } - if (config.getGamesNecklace()) + if (this.getGamesNecklace) { - menuManager.addSwap("remove", "games necklace", config.getGamesNecklaceMode().toString()); + menuManager.addSwap("remove", "games necklace", this.getGamesNecklaceMode.toString()); } - if (config.getDuelingRing()) + if (this.getDuelingRing) { - menuManager.addSwap("remove", "ring of dueling", config.getDuelingRingMode().toString()); + menuManager.addSwap("remove", "ring of dueling", this.getDuelingRingMode.toString()); } - if (config.getGlory()) + if (this.getGlory) { - menuManager.addSwap("remove", "amulet of glory", config.getGloryMode().toString()); - menuManager.addSwap("remove", "amulet of eternal glory", config.getGloryMode().toString()); + menuManager.addSwap("remove", "amulet of glory", this.getGloryMode.toString()); + menuManager.addSwap("remove", "amulet of eternal glory", this.getGloryMode.toString()); } - if (config.getSkillsNecklace()) + if (this.getSkillsNecklace) { - menuManager.addSwap("remove", "skills necklace", config.getSkillsNecklaceMode().toString()); + menuManager.addSwap("remove", "skills necklace", this.getSkillsNecklaceMode.toString()); } - if (config.getNecklaceofPassage()) + if (this.getNecklaceofPassage) { - menuManager.addSwap("remove", "necklace of passage", config.getNecklaceofPassageMode().toString()); + menuManager.addSwap("remove", "necklace of passage", this.getNecklaceofPassageMode.toString()); } - if (config.getDigsitePendant()) + if (this.getDigsitePendant) { - menuManager.addSwap("remove", "digsite pendant", config.getDigsitePendantMode().toString()); + menuManager.addSwap("remove", "digsite pendant", this.getDigsitePendantMode.toString()); } - if (config.getSlayerRing()) + if (this.getSlayerRing) { - menuManager.addSwap("remove", "slayer ring", config.getSlayerRingMode().toString()); - menuManager.addSwap("remove", "slayer ring (eternal)", config.getSlayerRingMode().toString()); + menuManager.addSwap("remove", "slayer ring", this.getSlayerRingMode.toString()); + menuManager.addSwap("remove", "slayer ring (eternal)", this.getSlayerRingMode.toString()); } - if (config.getXericsTalisman()) + if (this.getXericsTalisman) { - menuManager.addSwap("remove", "xeric's talisman", config.getXericsTalismanMode().toString()); + menuManager.addSwap("remove", "xeric's talisman", this.getXericsTalismanMode.toString()); } - if (config.getRingofWealth()) + if (this.getRingofWealth) { - menuManager.addSwap("remove", "ring of wealth", config.getRingofWealthMode().toString()); + menuManager.addSwap("remove", "ring of wealth", this.getRingofWealthMode.toString()); } - if (config.swapMax()) + if (this.swapMax) { - menuManager.addSwap("remove", "max cape", config.maxMode().toString()); + menuManager.addSwap("remove", "max cape", this.maxMode.toString()); } - if (config.swapQuestCape()) + if (this.swapQuestCape) { - menuManager.addSwap("remove", "quest point cape", config.questCapeMode().toString()); + menuManager.addSwap("remove", "quest point cape", this.questCapeMode.toString()); } } @@ -1509,7 +1654,7 @@ public class MenuEntrySwapperPlugin extends Plugin leftClickConstructionItems.clear(); } - if (config.getEasyConstruction() && + if (this.getEasyConstruction && !Strings.isNullOrEmpty(from) && buildingMode) { @@ -1530,7 +1675,7 @@ public class MenuEntrySwapperPlugin extends Plugin void startShift() { - if (!config.swapClimbUpDown()) + if (!this.swapClimbUpDown) { return; } @@ -1545,7 +1690,7 @@ public class MenuEntrySwapperPlugin extends Plugin void startControl() { - if (!config.swapClimbUpDown()) + if (!this.swapClimbUpDown) { return; } @@ -1600,4 +1745,135 @@ public class MenuEntrySwapperPlugin extends Plugin } return null; } + + private void updateConfig() + { + this.getWithdrawOne = config.getWithdrawOne(); + this.getWithdrawOneItems = config.getWithdrawOneItems(); + this.getWithdrawFive = config.getWithdrawFive(); + this.getWithdrawFiveItems = config.getWithdrawFiveItems(); + this.getWithdrawTen = config.getWithdrawTen(); + this.getWithdrawTenItems = config.getWithdrawTenItems(); + this.getWithdrawX = config.getWithdrawX(); + this.getWithdrawXAmount = config.getWithdrawXAmount(); + this.getWithdrawXItems = config.getWithdrawXItems(); + this.getWithdrawAll = config.getWithdrawAll(); + this.getWithdrawAllItems = config.getWithdrawAllItems(); + this.swapMax = config.swapMax(); + this.teleEquippedCape = config.teleEquippedCape(); + this.telecapeMode = config.telecapeMode(); + this.maxMode = config.maxMode(); + this.getSwapArdougneCape = config.getSwapArdougneCape(); + this.getSwapConstructionCape = config.getSwapConstructionCape(); + this.getSwapCraftingCape = config.getSwapCraftingCape(); + this.getSwapMagicCape = config.getSwapMagicCape(); + this.getSwapExplorersRing = config.getSwapExplorersRing(); + this.swapAdmire = config.swapAdmire(); + this.swapQuestCape = config.swapQuestCape(); + this.questCapeMode = config.questCapeMode(); + this.configCustomSwaps = config.customSwaps(); + this.shiftClickCustomization = config.shiftClickCustomization(); + this.swapCoalBag = config.swapCoalBag(); + this.swapBirdhouseEmpty = config.swapBirdhouseEmpty(); + this.swapBones = config.swapBones(); + this.swapChase = config.swapChase(); + this.swapHarpoon = config.swapHarpoon(); + this.swapOccult = config.swapOccult(); + this.swapOccultMode = config.swapOccultMode(); + this.swapHomePortal = config.swapHomePortal(); + this.swapHomePortalMode = config.swapHomePortalMode(); + this.swapPrivate = config.swapPrivate(); + this.swapPick = config.swapPick(); + this.swapQuick = config.swapQuick(); + this.swapBoxTrap = config.swapBoxTrap(); + this.rockCake = config.rockCake(); + this.swapRogueschests = config.swapRogueschests(); + this.swapClimbUpDown = config.swapClimbUpDown(); + this.swapStun = config.swapStun(); + this.swapSearch = config.swapSearch(); + this.swapHardWoodGrove = config.swapHardWoodGrove(); + this.getRemoveObjects = config.getRemoveObjects(); + this.getRemovedObjects = config.getRemovedObjects(); + this.swapImps = config.swapImps(); + this.charterOption = config.charterOption(); + this.getSwapBuyOne = config.getSwapBuyOne(); + this.getBuyOneItems = config.getBuyOneItems(); + this.getSwapBuyFive = config.getSwapBuyFive(); + this.getBuyFiveItems = config.getBuyFiveItems(); + this.getSwapBuyTen = config.getSwapBuyTen(); + this.getBuyTenItems = config.getBuyTenItems(); + this.getSwapBuyFifty = config.getSwapBuyFifty(); + this.getBuyFiftyItems = config.getBuyFiftyItems(); + this.getSwapSellOne = config.getSwapSellOne(); + this.getSellOneItems = config.getSellOneItems(); + this.getSwapSellFive = config.getSwapSellFive(); + this.getSellFiveItems = config.getSellFiveItems(); + this.getSwapSellTen = config.getSwapSellTen(); + this.getSellTenItems = config.getSellTenItems(); + this.getSwapSellFifty = config.getSwapSellFifty(); + this.getSellFiftyItems = config.getSellFiftyItems(); + this.getEasyConstruction = config.getEasyConstruction(); + this.getEasyConstructionItems = config.getEasyConstructionItems(); + this.getSwapSmithing = config.getSwapSmithing(); + this.getSwapTanning = config.getSwapTanning(); + this.getSwapSawmill = config.getSwapSawmill(); + this.getSwapSawmillPlanks = config.getSwapSawmillPlanks(); + this.getSwapPuro = config.getSwapPuro(); + this.swapAssignment = config.swapAssignment(); + this.swapBankExchange = config.swapBankExchange(); + this.swapContract = config.swapContract(); + this.swapInteract = config.swapInteract(); + this.swapPickpocket = config.swapPickpocket(); + this.swapPay = config.swapPay(); + this.swapAbyssTeleport = config.swapAbyssTeleport(); + this.swapTrade = config.swapTrade(); + this.swapTravel = config.swapTravel(); + this.swapMinigame = config.swapMinigame(); + this.swapPlank = config.swapPlank(); + this.swapMetamorphosis = config.swapMetamorphosis(); + this.swapEnchant = config.swapEnchant(); + this.swapFairyRing = config.swapFairyRing(); + this.swapFairyRingMode = config.swapFairyRingMode(); + this.swapObelisk = config.swapObelisk(); + this.swapObeliskMode = config.swapObeliskMode(); + this.swapTeleportItem = config.swapTeleportItem(); + this.swapWildernessLever = config.swapWildernessLever(); + this.swapNexus = config.swapNexus(); + this.getGamesNecklace = config.getGamesNecklace(); + this.getGamesNecklaceMode = config.getGamesNecklaceMode(); + this.getDuelingRing = config.getDuelingRing(); + this.getDuelingRingMode = config.getDuelingRingMode(); + this.getGlory = config.getGlory(); + this.getGloryMode = config.getGloryMode(); + this.getSkillsNecklace = config.getSkillsNecklace(); + this.getSkillsNecklaceMode = config.getSkillsNecklaceMode(); + this.getNecklaceofPassage = config.getNecklaceofPassage(); + this.getNecklaceofPassageMode = config.getNecklaceofPassageMode(); + this.getDigsitePendant = config.getDigsitePendant(); + this.getDigsitePendantMode = config.getDigsitePendantMode(); + this.getCombatBracelet = config.getCombatBracelet(); + this.getCombatBraceletMode = config.getCombatBraceletMode(); + this.getBurningAmulet = config.getBurningAmulet(); + this.getBurningAmuletMode = config.getBurningAmuletMode(); + this.getXericsTalisman = config.getXericsTalisman(); + this.getXericsTalismanMode = config.getXericsTalismanMode(); + this.getRingofWealth = config.getRingofWealth(); + this.getRingofWealthMode = config.getRingofWealthMode(); + this.getSlayerRing = config.getSlayerRing(); + this.getSlayerRingMode = config.getSlayerRingMode(); + this.hideExamine = config.hideExamine(); + this.hideTradeWith = config.hideTradeWith(); + this.hideReport = config.hideReport(); + this.hideLookup = config.hideLookup(); + this.hideNet = config.hideNet(); + this.hideBait = config.hideBait(); + this.hideDestroyRunepouch = config.hideDestroyRunepouch(); + this.hideDestroyCoalbag = config.hideDestroyCoalbag(); + this.hideDestroyHerbsack = config.hideDestroyHerbsack(); + this.hideDestroyBoltpouch = config.hideDestroyBoltpouch(); + this.hideDestroyGembag = config.hideDestroyGembag(); + this.hideDropRunecraftingPouch = config.hideDropRunecraftingPouch(); + this.getRemoveFreezePlayerToB = config.getRemoveFreezePlayerToB(); + this.getRemoveFreezePlayerCoX = config.getRemoveFreezePlayerCoX(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/ShiftClickInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/ShiftClickInputListener.java index 5df37f45b2..c258bfb30a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/ShiftClickInputListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/ShiftClickInputListener.java @@ -26,8 +26,10 @@ package net.runelite.client.plugins.menuentryswapper; import java.awt.event.KeyEvent; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.client.input.KeyListener; +@Singleton public class ShiftClickInputListener implements KeyListener { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java index 148d7e4255..766b80c434 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.metronome; import com.google.inject.Provides; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.SoundEffectVolume; import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioSystem; @@ -50,6 +51,7 @@ import net.runelite.client.plugins.PluginDescriptor; tags = {"skilling", "tick", "timers"}, enabledByDefault = false ) +@Singleton public class MetronomePlugin extends Plugin { @Inject @@ -63,6 +65,14 @@ public class MetronomePlugin extends Plugin private Clip tickClip; private Clip tockClip; + private int tickCount; + private boolean enableTock; + private int tockNumber; + private int tickOffset; + private String tickPath; + private String tockPath; + private int volume; + @Provides MetronomePluginConfiguration provideConfig(ConfigManager configManager) { @@ -90,7 +100,7 @@ public class MetronomePlugin extends Plugin Clip audioClip = AudioSystem.getClip(); audioClip.open(audioStream); FloatControl gainControl = (FloatControl) audioClip.getControl(FloatControl.Type.MASTER_GAIN); - float gainValue = (((float) config.volume()) * 40f / 100f) - 35f; + float gainValue = (((float) this.volume) * 40f / 100f) - 35f; gainControl.setValue(gainValue); return audioClip; } @@ -105,8 +115,10 @@ public class MetronomePlugin extends Plugin @Override protected void startUp() { - tickClip = GetAudioClip(config.tickPath()); - tockClip = GetAudioClip(config.tockPath()); + updateConfig(); + + tickClip = GetAudioClip(this.tickPath); + tockClip = GetAudioClip(this.tockPath); } @Override @@ -125,9 +137,16 @@ public class MetronomePlugin extends Plugin @Subscribe public void onConfigChanged(ConfigChanged event) { + if (!event.getGroup().equals("metronome")) + { + return; + } + + updateConfig(); + if (event.getKey().equals("volume")) { - float gainValue = (((float) config.volume()) * 40f / 100f) - 35f; + float gainValue = (((float) this.volume) * 40f / 100f) - 35f; FloatControl gainControlTick = (FloatControl) tickClip.getControl(FloatControl.Type.MASTER_GAIN); gainControlTick.setValue(gainValue); FloatControl gainControlTock = (FloatControl) tockClip.getControl(FloatControl.Type.MASTER_GAIN); @@ -139,7 +158,7 @@ public class MetronomePlugin extends Plugin { tickClip.close(); } - tickClip = GetAudioClip(config.tickPath()); + tickClip = GetAudioClip(this.tickPath); } if (event.getKey().equals("tockSoundFilePath")) { @@ -147,21 +166,21 @@ public class MetronomePlugin extends Plugin { tockClip.close(); } - tockClip = GetAudioClip(config.tockPath()); + tockClip = GetAudioClip(this.tockPath); } } @Subscribe public void onGameTick(GameTick tick) { - if (config.tickCount() == 0) + if (this.tickCount == 0) { return; } - if ((++tickCounter + config.tickOffset()) % config.tickCount() == 0) + if ((++tickCounter + this.tickOffset) % this.tickCount == 0) { - if (++tockCounter % config.tockNumber() == 0 & config.enableTock()) + if (++tockCounter % this.tockNumber == 0 & this.enableTock) { if (tockClip == null) { @@ -195,4 +214,15 @@ public class MetronomePlugin extends Plugin } } } + + private void updateConfig() + { + this.tickCount = config.tickCount(); + this.enableTock = config.enableTock(); + this.tockNumber = config.tockNumber(); + this.tickOffset = config.tickOffset(); + this.tickPath = config.tickPath(); + this.tockPath = config.tockPath(); + this.volume = config.volume(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapPlugin.java index d68e6f56f4..205e67d03e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapPlugin.java @@ -28,6 +28,7 @@ import com.google.inject.Provides; import java.awt.Color; import java.util.Arrays; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.Sprite; @@ -46,6 +47,7 @@ import net.runelite.client.plugins.PluginDescriptor; description = "Customize the color of minimap dots", tags = {"items", "npcs", "players"} ) +@Singleton public class MinimapPlugin extends Plugin { private static final int NUM_MAPDOTS = 6; @@ -58,6 +60,14 @@ public class MinimapPlugin extends Plugin private Sprite[] originalDotSprites; + private Color itemColor; + private Color npcColor; + private Color playerColor; + private Color friendColor; + private Color teamColor; + private Color clanColor; + private boolean hideMinimap; + @Provides private MinimapConfig provideConfig(ConfigManager configManager) { @@ -67,7 +77,9 @@ public class MinimapPlugin extends Plugin @Override protected void startUp() throws Exception { - updateMinimapWidgetVisibility(config.hideMinimap()); + updateConfig(); + + updateMinimapWidgetVisibility(this.hideMinimap); storeOriginalDots(); replaceMapDots(); } @@ -97,9 +109,11 @@ public class MinimapPlugin extends Plugin return; } + updateConfig(); + if (event.getKey().equals("hideMinimap")) { - updateMinimapWidgetVisibility(config.hideMinimap()); + updateMinimapWidgetVisibility(this.hideMinimap); return; } @@ -109,7 +123,7 @@ public class MinimapPlugin extends Plugin @Subscribe public void onWidgetHiddenChanged(WidgetHiddenChanged event) { - updateMinimapWidgetVisibility(config.hideMinimap()); + updateMinimapWidgetVisibility(this.hideMinimap); } private void updateMinimapWidgetVisibility(boolean enable) @@ -155,12 +169,13 @@ public class MinimapPlugin extends Plugin private Color[] getColors() { Color[] colors = new Color[NUM_MAPDOTS]; - colors[0] = config.itemColor(); - colors[1] = config.npcColor(); - colors[2] = config.playerColor(); - colors[3] = config.friendColor(); - colors[4] = config.teamColor(); - colors[5] = config.clanColor(); + colors[0] = this.itemColor; + colors[1] = this.npcColor; + colors[2] = this.playerColor; + colors[3] = this.friendColor; + colors[4] = this.teamColor; + colors[5] = this.clanColor; + return colors; } @@ -187,4 +202,15 @@ public class MinimapPlugin extends Plugin System.arraycopy(originalDotSprites, 0, mapDots, 0, mapDots.length); } + + private void updateConfig() + { + this.itemColor = config.itemColor(); + this.npcColor = config.npcColor(); + this.playerColor = config.playerColor(); + this.friendColor = config.friendColor(); + this.teamColor = config.teamColor(); + this.clanColor = config.clanColor(); + this.hideMinimap = config.hideMinimap(); + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningCoalBagOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningCoalBagOverlay.java index 2acbf90aa8..cdcf2ad670 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningCoalBagOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningCoalBagOverlay.java @@ -27,29 +27,29 @@ package net.runelite.client.plugins.mining; import java.awt.Color; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.ItemID; import net.runelite.api.Point; import net.runelite.api.widgets.WidgetItem; import net.runelite.client.ui.FontManager; import net.runelite.client.ui.overlay.WidgetItemOverlay; +@Singleton public class MiningCoalBagOverlay extends WidgetItemOverlay { private final MiningPlugin plugin; - private final MiningConfig config; @Inject - MiningCoalBagOverlay(MiningPlugin plugin, MiningConfig config) + MiningCoalBagOverlay(final MiningPlugin plugin) { showOnInventory(); this.plugin = plugin; - this.config = config; } @Override public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget) { - if (!config.showCoalBagOverlay() || (itemId != ItemID.COAL_BAG && itemId != ItemID.COAL_BAG_12019)) + if (!plugin.isShowCoalBagOverlay() || (itemId != ItemID.COAL_BAG && itemId != ItemID.COAL_BAG_12019)) { return; } @@ -58,6 +58,6 @@ public class MiningCoalBagOverlay extends WidgetItemOverlay graphics.setColor(Color.WHITE); Point location = itemWidget.getCanvasLocation(); - graphics.drawString(config.amountOfCoalInCoalBag() + "", location.getX(), location.getY() + 14); + graphics.drawString(plugin.getAmountOfCoalInCoalBag() + "", location.getX(), location.getY() + 14); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java index fc673f2784..f0ca9fea59 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java @@ -31,6 +31,7 @@ import java.time.Instant; import java.util.Iterator; import java.util.List; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Client; @@ -43,6 +44,7 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.components.ProgressPieComponent; +@Singleton class MiningOverlay extends Overlay { // Range of Motherlode vein respawn time not 100% confirmed but based on observation @@ -57,7 +59,7 @@ class MiningOverlay extends Overlay private final MiningPlugin plugin; @Inject - private MiningOverlay(Client client, MiningPlugin plugin) + private MiningOverlay(final Client client, final MiningPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java index f8f4ae7bc7..29f5df03e0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java @@ -34,6 +34,7 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -72,6 +73,7 @@ import net.runelite.client.ui.overlay.OverlayManager; tags = {"overlay", "skilling", "timers", "coal", "coalbag", "coal bag"}, enabledByDefault = false ) +@Singleton public class MiningPlugin extends Plugin { private static final int ROCK_DISTANCE = 14; @@ -87,7 +89,6 @@ public class MiningPlugin extends Plugin private static final String FILL_OPTION = "fill"; private static final String EMPTY_OPTION = "empty"; - @Inject private Client client; @@ -107,9 +108,17 @@ public class MiningPlugin extends Plugin private final List respawns = new ArrayList<>(); private boolean recentlyLoggedIn; + @Getter(AccessLevel.PACKAGE) + private boolean showCoalBagOverlay; + @Getter(AccessLevel.PACKAGE) + private int amountOfCoalInCoalBag; + @Override protected void startUp() { + this.showCoalBagOverlay = config.showCoalBagOverlay(); + this.amountOfCoalInCoalBag = config.amountOfCoalInCoalBag(); + overlayManager.add(miningOverlay); overlayManager.add(coalBagOverlay); } @@ -222,7 +231,11 @@ public class MiningPlugin extends Plugin } ItemContainer inventoryItemContainer = client.getItemContainer(InventoryID.INVENTORY); - Item[] inventoryItems = inventoryItemContainer.getItems(); + Item[] inventoryItems = new Item[0]; + if (inventoryItemContainer != null) + { + inventoryItems = inventoryItemContainer.getItems(); + } switch (event.getOption().toLowerCase()) { @@ -261,7 +274,7 @@ public class MiningPlugin extends Plugin Matcher matcher = COAL_BAG_AMOUNT_MESSAGE.matcher(chatMsg); if (matcher.find()) { - updateAmountOfCoalInBag(Integer.parseInt(matcher.group(1)) - config.amountOfCoalInCoalBag()); + updateAmountOfCoalInBag(Integer.parseInt(matcher.group(1)) - this.amountOfCoalInCoalBag); } } } @@ -276,11 +289,25 @@ public class MiningPlugin extends Plugin { // check for upper/lower bounds of amount of coal in a bag // 0 <= X <= 27 - config.amountOfCoalInCoalBag(Math.max(0, Math.min(FULL_COAL_BAG_AMOUNT, config.amountOfCoalInCoalBag() + delta))); + int coalbagAmount = Math.max(0, Math.min(FULL_COAL_BAG_AMOUNT, this.amountOfCoalInCoalBag + delta)); + config.amountOfCoalInCoalBag(coalbagAmount); + this.amountOfCoalInCoalBag = coalbagAmount; } private boolean inMiningGuild() { return client.getLocalPlayer().getWorldLocation().getRegionID() == MINING_GUILD_REGION; } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("mining")) + { + return; + } + + this.showCoalBagOverlay = config.showCoalBagOverlay(); + this.amountOfCoalInCoalBag = config.amountOfCoalInCoalBag(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/RockRespawn.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/RockRespawn.java index daedda8f34..6b00652af4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/RockRespawn.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/RockRespawn.java @@ -25,12 +25,13 @@ package net.runelite.client.plugins.mining; import java.time.Instant; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.coords.WorldPoint; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) class RockRespawn { private final Rock rock; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeGemOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeGemOverlay.java index 7b95147aeb..c87469b6bc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeGemOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeGemOverlay.java @@ -29,6 +29,7 @@ import java.awt.Graphics2D; import java.time.Duration; import java.time.Instant; import javax.inject.Inject; +import javax.inject.Singleton; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import net.runelite.client.ui.overlay.Overlay; import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE; @@ -38,22 +39,20 @@ import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; - +@Singleton public class MotherlodeGemOverlay extends Overlay { private final MotherlodePlugin plugin; private final MotherlodeSession motherlodeSession; - private final MotherlodeConfig config; private final PanelComponent panelComponent = new PanelComponent(); @Inject - MotherlodeGemOverlay(MotherlodePlugin plugin, MotherlodeSession motherlodeSession, MotherlodeConfig config) + MotherlodeGemOverlay(final MotherlodePlugin plugin, final MotherlodeSession motherlodeSession) { super(plugin); setPosition(OverlayPosition.TOP_LEFT); this.plugin = plugin; this.motherlodeSession = motherlodeSession; - this.config = config; getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Gem overlay")); } @@ -62,12 +61,12 @@ public class MotherlodeGemOverlay extends Overlay { MotherlodeSession session = motherlodeSession; - if (session.getLastGemFound() == null || !plugin.isInMlm() || !config.showGemsFound()) + if (session.getLastGemFound() == null || !plugin.isInMlm() || !plugin.isShowGemsFound()) { return null; } - Duration statTimeout = Duration.ofMinutes(config.statTimeout()); + Duration statTimeout = Duration.ofMinutes(plugin.getStatTimeout()); Duration sinceCut = Duration.between(session.getLastGemFound(), Instant.now()); if (sinceCut.compareTo(statTimeout) >= 0) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOreOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOreOverlay.java index 3533537987..65888c0f74 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOreOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOreOverlay.java @@ -27,33 +27,32 @@ package net.runelite.client.plugins.motherlode; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; - +@Singleton public class MotherlodeOreOverlay extends Overlay { private final MotherlodePlugin plugin; private final MotherlodeSession motherlodeSession; - private final MotherlodeConfig config; private final PanelComponent panelComponent = new PanelComponent(); @Inject - MotherlodeOreOverlay(MotherlodePlugin plugin, MotherlodeSession motherlodeSession, MotherlodeConfig config) + MotherlodeOreOverlay(final MotherlodePlugin plugin, final MotherlodeSession motherlodeSession) { setPosition(OverlayPosition.TOP_LEFT); this.plugin = plugin; this.motherlodeSession = motherlodeSession; - this.config = config; } @Override public Dimension render(Graphics2D graphics) { - if (!plugin.isInMlm() || !config.showOresFound()) + if (!plugin.isInMlm() || !plugin.isShowOresFound()) { return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOverlay.java index c43e012bfb..7bd10dd62c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOverlay.java @@ -30,7 +30,7 @@ import java.awt.Graphics2D; import java.time.Duration; import java.time.Instant; import javax.inject.Inject; -import net.runelite.api.Client; +import javax.inject.Singleton; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.components.PanelComponent; @@ -38,29 +38,26 @@ import net.runelite.client.ui.overlay.components.TitleComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; +@Singleton class MotherlodeOverlay extends Overlay { - private final Client client; private final MotherlodePlugin plugin; private final MotherlodeSession motherlodeSession; - private final MotherlodeConfig config; private final PanelComponent panelComponent = new PanelComponent(); @Inject - MotherlodeOverlay(Client client, MotherlodePlugin plugin, MotherlodeSession motherlodeSession, MotherlodeConfig config) + MotherlodeOverlay(final MotherlodePlugin plugin, final MotherlodeSession motherlodeSession) { super(plugin); setPosition(OverlayPosition.TOP_LEFT); - this.client = client; this.plugin = plugin; this.motherlodeSession = motherlodeSession; - this.config = config; } @Override public Dimension render(Graphics2D graphics) { - if (!plugin.isInMlm() || !config.showMiningStats()) + if (!plugin.isInMlm() || !plugin.isShowMiningStats()) { return null; } @@ -72,7 +69,7 @@ class MotherlodeOverlay extends Overlay return null; } - Duration statTimeout = Duration.ofMinutes(config.statTimeout()); + Duration statTimeout = Duration.ofMinutes(plugin.getStatTimeout()); Duration sinceCut = Duration.between(session.getLastPayDirtMined(), Instant.now()); if (sinceCut.compareTo(statTimeout) >= 0) @@ -82,7 +79,7 @@ class MotherlodeOverlay extends Overlay panelComponent.getChildren().clear(); - if (config.showMiningState()) + if (plugin.isShowMiningState()) { if (plugin.isMining()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java index 0e23e85a19..7e202ef3ac 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java @@ -38,6 +38,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.AnimationID; @@ -80,6 +81,7 @@ import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.ChatMessage; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameObjectChanged; import net.runelite.api.events.GameObjectDespawned; import net.runelite.api.events.GameObjectSpawned; @@ -110,6 +112,7 @@ import net.runelite.client.ui.overlay.OverlayManager; tags = {"pay", "dirt", "mining", "mlm", "skilling", "overlay"}, enabledByDefault = false ) +@Singleton public class MotherlodePlugin extends Plugin { private static final Set MOTHERLODE_MAP_REGIONS = ImmutableSet.of(14679, 14680, 14681, 14935, 14936, 14937, 15191, 15192, 15193); @@ -188,6 +191,28 @@ public class MotherlodePlugin extends Plugin private int lastAnimation = AnimationID.IDLE; private Instant lastAnimating; + @Getter(AccessLevel.PACKAGE) + private boolean showVeins; + @Getter(AccessLevel.PACKAGE) + private boolean showRockFalls; + @Getter(AccessLevel.PACKAGE) + private int statTimeout; + @Getter(AccessLevel.PACKAGE) + private boolean showSack; + @Getter(AccessLevel.PACKAGE) + private boolean showMiningStats; + @Getter(AccessLevel.PACKAGE) + private boolean showDepositsLeft; + @Getter(AccessLevel.PACKAGE) + private boolean showMiningState; + @Getter(AccessLevel.PACKAGE) + private boolean showGemsFound; + @Getter(AccessLevel.PACKAGE) + private boolean showOresFound; + private boolean notifyOnIdle; + @Getter(AccessLevel.PACKAGE) + private boolean showTargetVein; + @Provides MotherlodeConfig getConfig(ConfigManager configManager) { @@ -197,6 +222,8 @@ public class MotherlodePlugin extends Plugin @Override protected void startUp() { + updateConfig(); + overlayManager.add(overlay); overlayManager.add(rocksOverlay); overlayManager.add(motherlodeGemOverlay); @@ -311,7 +338,7 @@ public class MotherlodePlugin extends Plugin } // reset recentPayDirtMined if you haven't mined anything recently - Duration statTimeout = Duration.ofMinutes(config.statTimeout()); + Duration statTimeout = Duration.ofMinutes(this.statTimeout); Duration sinceMined = Duration.between(lastPayDirtMined, Instant.now()); if (sinceMined.compareTo(statTimeout) >= 0) @@ -467,7 +494,7 @@ public class MotherlodePlugin extends Plugin private void sendIdleNotification() { - if (!config.notifyOnIdle()) + if (!this.notifyOnIdle) { return; } @@ -703,4 +730,30 @@ public class MotherlodePlugin extends Plugin { return Perspective.getTileHeight(client, localPoint, 0) < UPPER_FLOOR_HEIGHT; } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("motherlode")) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.showVeins = config.showVeins(); + this.showRockFalls = config.showRockFalls(); + this.statTimeout = config.statTimeout(); + this.showSack = config.showSack(); + this.showMiningStats = config.showMiningStats(); + this.showDepositsLeft = config.showDepositsLeft(); + this.showMiningState = config.showMiningState(); + this.showGemsFound = config.showGemsFound(); + this.showOresFound = config.showOresFound(); + this.notifyOnIdle = config.notifyOnIdle(); + this.showTargetVein = config.showTargetVein(); + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java index bcd4d2946e..3fa2aba3dd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java @@ -32,6 +32,7 @@ import java.awt.Graphics2D; import java.awt.Polygon; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.GameObject; import net.runelite.api.Perspective; @@ -48,13 +49,13 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.util.ImageUtil; +@Singleton class MotherlodeRocksOverlay extends Overlay { private static final int MAX_DISTANCE = 2350; private final Client client; private final MotherlodePlugin plugin; - private final MotherlodeConfig config; private final BufferedImage miningIcon; private final BufferedImage targetMiningIcon; @@ -62,13 +63,12 @@ class MotherlodeRocksOverlay extends Overlay private static final Color miningIconNewColor = new Color(0, 150, 0); @Inject - MotherlodeRocksOverlay(Client client, MotherlodePlugin plugin, MotherlodeConfig config, SkillIconManager iconManager) + MotherlodeRocksOverlay(final Client client, final MotherlodePlugin plugin, final SkillIconManager iconManager) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); this.client = client; this.plugin = plugin; - this.config = config; miningIcon = iconManager.getSkillImage(Skill.MINING); targetMiningIcon = ImageUtil.recolorImage(miningIcon, miningIconNewColor, Color -> Color.getRGB() == miningIconOldColor.getRGB()); @@ -77,7 +77,7 @@ class MotherlodeRocksOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if ((!config.showVeins() && !config.showRockFalls()) || !plugin.isInMlm()) + if ((!plugin.isShowVeins() && !plugin.isShowRockFalls()) || !plugin.isInMlm()) { return null; } @@ -92,7 +92,7 @@ class MotherlodeRocksOverlay extends Overlay private void renderTiles(Graphics2D graphics, Player local) { LocalPoint localLocation = local.getLocalLocation(); - if (config.showVeins()) + if (plugin.isShowVeins()) { for (WallObject vein : plugin.getVeins()) { @@ -104,7 +104,7 @@ class MotherlodeRocksOverlay extends Overlay { if (WorldPoint.fromLocal(client, location).equals(plugin.getTargetVeinLocation()) && plugin.isMining() - && config.showTargetVein()) + && plugin.isShowTargetVein()) { renderVein(graphics, vein, true); } @@ -117,7 +117,7 @@ class MotherlodeRocksOverlay extends Overlay } } - if (config.showRockFalls()) + if (plugin.isShowRockFalls()) { for (GameObject rock : plugin.getRocks()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java index 2b53ff5bee..bf8e1d31a3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java @@ -30,6 +30,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import net.runelite.api.Varbits; @@ -45,22 +46,21 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.util.ColorUtil; +@Singleton class MotherlodeSackOverlay extends Overlay { private static final Color DANGER = new Color(150, 0, 0, 150); private final Client client; - private final MotherlodeConfig config; private final MotherlodePlugin plugin; private final PanelComponent panelComponent = new PanelComponent(); @Inject - MotherlodeSackOverlay(Client client, MotherlodeConfig config, MotherlodePlugin plugin) + MotherlodeSackOverlay(final Client client, final MotherlodePlugin plugin) { super(plugin); setPosition(OverlayPosition.TOP_LEFT); this.client = client; - this.config = config; this.plugin = plugin; getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Sack overlay")); } @@ -85,7 +85,7 @@ class MotherlodeSackOverlay extends Overlay { sack.setHidden(true); - if (config.showSack()) + if (plugin.isShowSack()) { if (plugin.getCurSackSize() >= plugin.getMaxSackSize()) { @@ -95,7 +95,7 @@ class MotherlodeSackOverlay extends Overlay tableComponent.addRow("Pay-dirt in sack:", String.valueOf(client.getVar(Varbits.SACK_NUMBER))); } - if (config.showDepositsLeft()) + if (plugin.isShowDepositsLeft()) { final Integer depositsLeft = plugin.getDepositsLeft(); Color color = Color.WHITE; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSession.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSession.java index e4d00cfda6..6a9c97d4b4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSession.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSession.java @@ -133,7 +133,7 @@ public class MotherlodeSession } } - public void incrementPayDirtMined() + void incrementPayDirtMined() { Instant now = Instant.now(); @@ -153,33 +153,28 @@ public class MotherlodeSession } } - public void resetRecent() + void resetRecent() { recentPayDirtMined = null; recentMined = 0; } - public int getPerHour() + int getPerHour() { return perHour; } - public Instant getLastPayDirtMined() + Instant getLastPayDirtMined() { return lastPayDirtMined; } - public int getTotalMined() + int getTotalMined() { return totalMined; } - public Instant getRecentPayDirtMined() - { - return recentPayDirtMined; - } - - public int getRecentMined() + int getRecentMined() { return recentMined; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java index 79700ce096..34cae5980f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java @@ -28,6 +28,7 @@ import com.google.common.base.Strings; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.MenuAction; import net.runelite.api.MenuEntry; @@ -39,19 +40,20 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.tooltip.Tooltip; import net.runelite.client.ui.overlay.tooltip.TooltipManager; +@Singleton class MouseHighlightOverlay extends Overlay { private final TooltipManager tooltipManager; private final Client client; - private final MouseHighlightConfig config; + private final MouseHighlightPlugin plugin; @Inject - MouseHighlightOverlay(Client client, TooltipManager tooltipManager, MouseHighlightConfig config) + MouseHighlightOverlay(final Client client, final TooltipManager tooltipManager, final MouseHighlightPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); this.client = client; this.tooltipManager = tooltipManager; - this.config = config; + this.plugin = plugin; } @Override @@ -105,12 +107,12 @@ class MouseHighlightOverlay extends Overlay final int childId = WidgetInfo.TO_CHILD(widgetId); final Widget widget = client.getWidget(groupId, childId); - if (!config.uiTooltip() && widget != null) + if (!plugin.isUiTooltip() && widget != null) { return null; } - if (!config.chatboxTooltip() && groupId == WidgetInfo.CHATBOX.getGroupId()) + if (!plugin.isChatboxTooltip() && groupId == WidgetInfo.CHATBOX.getGroupId()) { return null; } @@ -125,7 +127,7 @@ class MouseHighlightOverlay extends Overlay } } - if (widget == null && !config.mainTooltip()) + if (widget == null && !plugin.isMainTooltip()) { return null; } @@ -144,7 +146,7 @@ class MouseHighlightOverlay extends Overlay private boolean shouldNotRenderMenuAction(int type) { return type == MenuAction.RUNELITE_OVERLAY.getId() - || (!config.isRightClickTooltipEnabled() && isMenuActionRightClickOnly(type)); + || (!plugin.isRightClickTooltipEnabled() && isMenuActionRightClickOnly(type)); } private boolean isMenuActionRightClickOnly(int type) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java index 85f95aa6bd..ded370e957 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java @@ -26,8 +26,12 @@ package net.runelite.client.plugins.mousehighlight; import com.google.inject.Provides; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.GameState; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.WidgetLoaded; @@ -45,6 +49,7 @@ import net.runelite.client.ui.overlay.OverlayManager; description = "Render default actions as a tooltip", tags = {"actions", "overlay", "tooltip", "hide"} ) +@Singleton public class MouseHighlightPlugin extends Plugin { @Inject @@ -58,6 +63,17 @@ public class MouseHighlightPlugin extends Plugin @Inject private MouseHighlightOverlay overlay; + @Getter(AccessLevel.PACKAGE) + private boolean mainTooltip; + @Getter(AccessLevel.PACKAGE) + private boolean uiTooltip; + @Getter(AccessLevel.PACKAGE) + private boolean chatboxTooltip; + private boolean shouldHideSpells; + private boolean shouldHideCombat; + @Getter(AccessLevel.PACKAGE) + private boolean isRightClickTooltipEnabled; + @Provides MouseHighlightConfig provideConfig(ConfigManager configManager) { @@ -67,6 +83,8 @@ public class MouseHighlightPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + adjustTips(); overlayManager.add(overlay); } @@ -111,15 +129,13 @@ public class MouseHighlightPlugin extends Plugin try { - setTipHidden(WidgetInfo.SPELL_TOOLTIP, config.shouldHideSpells()); - setTipHidden(WidgetInfo.COMBAT_TOOLTIP, config.shouldHideCombat()); + setTipHidden(WidgetInfo.SPELL_TOOLTIP, this.shouldHideSpells); + setTipHidden(WidgetInfo.COMBAT_TOOLTIP, this.shouldHideCombat); } catch (Exception e) { //swallow } - - } private void resetTips() @@ -152,4 +168,24 @@ public class MouseHighlightPlugin extends Plugin widget.setHidden(hidden); } + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("motherlode")) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.mainTooltip = config.mainTooltip(); + this.uiTooltip = config.uiTooltip(); + this.chatboxTooltip = config.chatboxTooltip(); + this.shouldHideSpells = config.shouldHideSpells(); + this.shouldHideCombat = config.shouldHideCombat(); + this.isRightClickTooltipEnabled = config.isRightClickTooltipEnabled(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAInventoryOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAInventoryOverlay.java index ea99cf7f00..928522a48a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAInventoryOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAInventoryOverlay.java @@ -27,17 +27,19 @@ package net.runelite.client.plugins.mta; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.client.ui.FontManager; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; +@Singleton public class MTAInventoryOverlay extends Overlay { private final MTAPlugin plugin; @Inject - public MTAInventoryOverlay(MTAPlugin plugin) + public MTAInventoryOverlay(final MTAPlugin plugin) { this.plugin = plugin; setPosition(OverlayPosition.DYNAMIC); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAPlugin.java index 5b7d6bffa1..907f66f03d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAPlugin.java @@ -26,9 +26,9 @@ package net.runelite.client.plugins.mta; import com.google.inject.Provides; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; -import net.runelite.api.Client; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; import net.runelite.client.plugins.Plugin; @@ -44,11 +44,9 @@ import net.runelite.client.ui.overlay.OverlayManager; description = "Show helpful information for the Mage Training Arena minigame", tags = {"mta", "magic", "minigame", "overlay"} ) +@Singleton public class MTAPlugin extends Plugin { - @Inject - private Client client; - @Inject private OverlayManager overlayManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTARoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTARoom.java index a77f8170d8..6df7c96c37 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTARoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTARoom.java @@ -35,7 +35,7 @@ public abstract class MTARoom protected final MTAConfig config; @Inject - protected MTARoom(MTAConfig config) + protected MTARoom(final MTAConfig config) { this.config = config; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTASceneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTASceneOverlay.java index 5ed9a7e6b1..c9c405aa75 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTASceneOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTASceneOverlay.java @@ -27,17 +27,19 @@ package net.runelite.client.plugins.mta; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.client.ui.FontManager; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; +@Singleton public class MTASceneOverlay extends Overlay { private final MTAPlugin plugin; @Inject - public MTASceneOverlay(MTAPlugin plugin) + public MTASceneOverlay(final MTAPlugin plugin) { this.plugin = plugin; setPosition(OverlayPosition.DYNAMIC); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyItem.java index d690b7f16b..c7f45bfc50 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyItem.java @@ -43,7 +43,7 @@ public enum AlchemyItem @Getter private final String name; - AlchemyItem(String name, int id) + AlchemyItem(final String name, final int id) { this.id = id; this.name = name; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java index ff8224238f..b8bd37fa9c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java @@ -58,6 +58,7 @@ import net.runelite.api.Player; import net.runelite.api.Point; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ChatMessage; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameObjectSpawned; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; @@ -97,20 +98,24 @@ public class AlchemyRoom extends MTARoom private AlchemyItem best; private Cupboard suggestion; + private boolean alchemy; + @Inject - private AlchemyRoom(Client client, MTAConfig config, MTAPlugin plugin, ItemManager itemManager, InfoBoxManager infoBoxManager) + private AlchemyRoom(final Client client, final MTAConfig config, final MTAPlugin plugin, final ItemManager itemManager, final InfoBoxManager infoBoxManager) { super(config); this.client = client; this.plugin = plugin; this.itemManager = itemManager; this.infoBoxManager = infoBoxManager; + + this.alchemy = config.alchemy(); } @Subscribe public void onGameTick(GameTick event) { - if (!inside() || !config.alchemy()) + if (!inside() || !this.alchemy) { return; } @@ -272,6 +277,17 @@ public class AlchemyRoom extends MTARoom } } + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("mta") || !event.getKey().equals("alchemy")) + { + return; + } + + this.alchemy = config.alchemy(); + } + private void reset() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoomTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoomTimer.java index 693e0517c9..d5b23a07e9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoomTimer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoomTimer.java @@ -30,12 +30,12 @@ import net.runelite.client.plugins.Plugin; import net.runelite.client.ui.overlay.infobox.Timer; import net.runelite.client.util.ImageUtil; -public class AlchemyRoomTimer extends Timer +class AlchemyRoomTimer extends Timer { private static final int RESET_PERIOD = 42; private static BufferedImage image; - public AlchemyRoomTimer(Plugin plugin) + AlchemyRoomTimer(final Plugin plugin) { super(RESET_PERIOD, ChronoUnit.SECONDS, getResetImage(), plugin); this.setTooltip("Time until items swap"); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java index ce82dc00cc..40a46c332d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java @@ -35,6 +35,7 @@ import net.runelite.api.ItemID; import net.runelite.api.Player; import net.runelite.api.Tile; 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.ItemDespawned; @@ -51,11 +52,15 @@ public class EnchantmentRoom extends MTARoom private final Client client; private final List dragonstones = new ArrayList<>(); + private boolean enchantment; + @Inject - private EnchantmentRoom(MTAConfig config, Client client) + private EnchantmentRoom(final MTAConfig config, final Client client) { super(config); this.client = client; + + this.enchantment = config.enchantment(); } @Subscribe @@ -70,7 +75,7 @@ public class EnchantmentRoom extends MTARoom @Subscribe public void onGameTick(GameTick event) { - if (!inside() || !config.enchantment()) + if (!inside() || !this.enchantment) { return; } @@ -131,6 +136,17 @@ public class EnchantmentRoom extends MTARoom } } + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("mta") || !event.getKey().equals("enchantment")) + { + return; + } + + this.enchantment = config.enchantment(); + } + @Override public boolean inside() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardCounter.java index 59f78785c8..8db687282f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardCounter.java @@ -31,7 +31,7 @@ import net.runelite.client.ui.overlay.infobox.Counter; public class GraveyardCounter extends Counter { - GraveyardCounter(BufferedImage image, Plugin plugin) + GraveyardCounter(final BufferedImage image, final Plugin plugin) { super(image, plugin, 0); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java index 6661b141ff..2c683989c6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java @@ -35,6 +35,7 @@ import static net.runelite.api.ItemID.ANIMALS_BONES_6905; import static net.runelite.api.ItemID.ANIMALS_BONES_6906; import static net.runelite.api.ItemID.ANIMALS_BONES_6907; import net.runelite.api.Player; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.ItemContainerChanged; import net.runelite.client.eventbus.Subscribe; @@ -57,15 +58,18 @@ public class GraveyardRoom extends MTARoom private GraveyardCounter counter; + private boolean graveyard; + @Inject - private GraveyardRoom(MTAConfig config, Client client, MTAPlugin plugin, - ItemManager itemManager, InfoBoxManager infoBoxManager) + private GraveyardRoom(final MTAConfig config, final Client client, final MTAPlugin plugin, final ItemManager itemManager, final InfoBoxManager infoBoxManager) { super(config); this.client = client; this.plugin = plugin; this.itemManager = itemManager; this.infoBoxManager = infoBoxManager; + + this.graveyard = config.graveyard(); } @Override @@ -79,7 +83,7 @@ public class GraveyardRoom extends MTARoom @Subscribe public void onGameTick(GameTick tick) { - if (!inside() || !config.graveyard()) + if (!inside() || !this.graveyard) { if (this.counter != null) { @@ -113,6 +117,17 @@ public class GraveyardRoom extends MTARoom } } + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("mta") || !event.getKey().equals("graveyard")) + { + return; + } + + this.graveyard = config.graveyard(); + } + private int score(Item[] items) { int score = 0; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/Maze.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/Maze.java index bef5c1d201..77871deb92 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/Maze.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/Maze.java @@ -42,7 +42,7 @@ public enum Maze private final int walls; private final LocalPoint start; - Maze(int walls, LocalPoint start) + Maze(final int walls, final LocalPoint start) { this.walls = walls; this.start = start; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java index ae797b74cd..557792c398 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java @@ -54,6 +54,7 @@ import net.runelite.api.coords.Direction; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldArea; 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.GroundObjectSpawned; @@ -84,11 +85,15 @@ public class TelekineticRoom extends MTARoom private NPC guardian; private Maze maze; + private boolean telekinetic; + @Inject - private TelekineticRoom(MTAConfig config, Client client) + private TelekineticRoom(final MTAConfig config, final Client client) { super(config); this.client = client; + + this.telekinetic = config.telekinetic(); } public void resetRoom() @@ -133,7 +138,7 @@ public class TelekineticRoom extends MTARoom @Subscribe public void onGameTick(GameTick event) { - if (!config.telekinetic() + if (!this.telekinetic || !inside() || client.getGameState() != GameState.LOGGED_IN) { @@ -220,6 +225,17 @@ public class TelekineticRoom extends MTARoom } } + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("mta") || !event.getKey().equals("telekinetic")) + { + return; + } + + this.telekinetic = config.telekinetic(); + } + @Override public boolean inside() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java index 044e9bdb36..cf7a0ef3da 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java @@ -35,12 +35,12 @@ import net.runelite.api.Constants; public class MapLocations { - private static final List[] MULTICOMBAT = new List[Constants.MAX_Z]; - private static final List[] NOT_MULTICOMBAT = new List[Constants.MAX_Z]; - private static final List[] ROUGH_WILDERNESS = new List[Constants.MAX_Z]; + private static final List[] MULTICOMBAT = new List[Constants.MAX_Z]; + private static final List[] NOT_MULTICOMBAT = new List[Constants.MAX_Z]; + private static final List[] ROUGH_WILDERNESS = new List[Constants.MAX_Z]; private static final List[] WILDERNESS_LEVEL_LINES = new List[Constants.MAX_Z]; - private static final List[] DEADMAN_SAFE_ZONES = new List[Constants.MAX_Z]; - private static final List[] PVP_WORLD_SAFE_ZONES = new List[Constants.MAX_Z]; + private static final List[] DEADMAN_SAFE_ZONES = new List[Constants.MAX_Z]; + private static final List[] PVP_WORLD_SAFE_ZONES = new List[Constants.MAX_Z]; private static Area getArea(List shapes) { @@ -3453,7 +3453,6 @@ public class MapLocations int wildyLeftX = 2944; int wildyRightX = 3392; int wildyBottomY = 3525; - int wildyTopY = 3971; // define wilderness level lines at ground level int accumulatedY = 0; @@ -3482,9 +3481,9 @@ public class MapLocations { poly.addPoint(coords[i], coords[i + 1]); } - for (int i = 0; i < shapes.length; i++) + for (List shape : shapes) { - shapes[i].add(poly); + shape.add(poly); } } @@ -3497,17 +3496,4 @@ public class MapLocations } shapes[plane].add(poly); } - - private static void addPolygonOnPlanes(List[] shapes, int minPlane, int maxPlane, int... coords) - { - Polygon poly = new Polygon(); - for (int i = 0; i < coords.length; i += 2) - { - poly.addPoint(coords[i], coords[i + 1]); - } - for (int i = minPlane; i <= maxPlane; i++) - { - shapes[i].add(poly); - } - } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsMinimapOverlay.java index b0c1187745..5ea7f57b24 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsMinimapOverlay.java @@ -32,6 +32,7 @@ import java.awt.Rectangle; import java.awt.geom.GeneralPath; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.geometry.Geometry; import net.runelite.api.Client; import net.runelite.api.Perspective; @@ -42,6 +43,7 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; +@Singleton public class MultiIndicatorsMinimapOverlay extends Overlay { private final static int MAX_LOCAL_DRAW_LENGTH = 20 * Perspective.LOCAL_TILE_SIZE; @@ -52,9 +54,6 @@ public class MultiIndicatorsMinimapOverlay extends Overlay @Inject private MultiIndicatorsPlugin plugin; - @Inject - private MultiIndicatorsConfig config; - @Inject public MultiIndicatorsMinimapOverlay() { @@ -86,8 +85,11 @@ public class MultiIndicatorsMinimapOverlay extends Overlay path = Geometry.transformPath(path, coords -> { Point point = Perspective.localToMinimap(client, new LocalPoint((int) coords[0], (int) coords[1])); - coords[0] = point.getX(); - coords[1] = point.getY(); + if (point != null) + { + coords[0] = point.getX(); + coords[1] = point.getY(); + } }); graphics.draw(path); @@ -96,7 +98,7 @@ public class MultiIndicatorsMinimapOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (!config.showMinimapLines()) + if (!plugin.isShowMinimapLines()) { return null; } @@ -105,17 +107,17 @@ public class MultiIndicatorsMinimapOverlay extends Overlay GeneralPath pvpPath = plugin.getPvpPathToDisplay()[client.getPlane()]; GeneralPath wildernessLevelLinesPath = plugin.getWildernessLevelLinesPathToDisplay()[client.getPlane()]; - if (config.multicombatZoneVisibility() != ZoneVisibility.HIDE && multicombatPath != null) + if (plugin.getMulticombatZoneVisibility() != ZoneVisibility.HIDE && multicombatPath != null) { - renderPath(graphics, multicombatPath, getTransparentColorVersion(config.multicombatColor())); + renderPath(graphics, multicombatPath, getTransparentColorVersion(plugin.getMulticombatColor())); } - if ((config.showPvpSafeZones() || config.showDeadmanSafeZones()) && pvpPath != null) + if ((plugin.isShowPvpSafeZones() || plugin.isShowDeadmanSafeZones()) && pvpPath != null) { - renderPath(graphics, pvpPath, getTransparentColorVersion(config.safeZoneColor())); + renderPath(graphics, pvpPath, getTransparentColorVersion(plugin.getSafeZoneColor())); } - if (config.showWildernessLevelLines() && wildernessLevelLinesPath != null) + if (plugin.isShowWildernessLevelLines() && wildernessLevelLinesPath != null) { - renderPath(graphics, wildernessLevelLinesPath, getTransparentColorVersion(config.wildernessLevelLinesColor())); + renderPath(graphics, wildernessLevelLinesPath, getTransparentColorVersion(plugin.getWildernessLevelLinesColor())); } return null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java index d9268121f0..dd134690ed 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java @@ -32,6 +32,7 @@ import java.awt.Graphics2D; import java.awt.Rectangle; import java.awt.geom.GeneralPath; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.geometry.Geometry; import net.runelite.api.Client; import net.runelite.api.Perspective; @@ -42,6 +43,7 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; +@Singleton public class MultiIndicatorsOverlay extends Overlay { private final static int MAX_LOCAL_DRAW_LENGTH = 20 * Perspective.LOCAL_TILE_SIZE; @@ -52,9 +54,6 @@ public class MultiIndicatorsOverlay extends Overlay @Inject private MultiIndicatorsPlugin plugin; - @Inject - private MultiIndicatorsConfig config; - @Inject public MultiIndicatorsOverlay() { @@ -101,17 +100,17 @@ public class MultiIndicatorsOverlay extends Overlay GeneralPath pvpPath = plugin.getPvpPathToDisplay()[client.getPlane()]; GeneralPath wildernessLevelLinesPath = plugin.getWildernessLevelLinesPathToDisplay()[client.getPlane()]; - if (config.multicombatZoneVisibility() != ZoneVisibility.HIDE && multicombatPath != null) + if (plugin.getMulticombatZoneVisibility() != ZoneVisibility.HIDE && multicombatPath != null) { - renderPath(graphics, multicombatPath, getTransparentColorVersion(config.multicombatColor())); + renderPath(graphics, multicombatPath, getTransparentColorVersion(plugin.getMulticombatColor())); } - if ((config.showPvpSafeZones() || config.showDeadmanSafeZones()) && pvpPath != null) + if ((plugin.isShowPvpSafeZones() || plugin.isShowDeadmanSafeZones()) && pvpPath != null) { - renderPath(graphics, pvpPath, getTransparentColorVersion(config.safeZoneColor())); + renderPath(graphics, pvpPath, getTransparentColorVersion(plugin.getSafeZoneColor())); } - if (config.showWildernessLevelLines() && wildernessLevelLinesPath != null) + if (plugin.isShowWildernessLevelLines() && wildernessLevelLinesPath != null) { - renderPath(graphics, wildernessLevelLinesPath, getTransparentColorVersion(config.wildernessLevelLinesColor())); + renderPath(graphics, wildernessLevelLinesPath, getTransparentColorVersion(plugin.getWildernessLevelLinesColor())); } return null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java index c20fa25810..c9b025502f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java @@ -26,11 +26,14 @@ package net.runelite.client.plugins.multiindicators; import com.google.inject.Provides; +import java.awt.Color; import java.awt.Rectangle; import java.awt.geom.GeneralPath; import java.time.temporal.ChronoUnit; import java.util.Arrays; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.Constants; @@ -62,7 +65,7 @@ import net.runelite.client.ui.overlay.OverlayManager; type = PluginType.PVP, enabledByDefault = false ) - +@Singleton public class MultiIndicatorsPlugin extends Plugin { @Inject @@ -83,23 +86,40 @@ public class MultiIndicatorsPlugin extends Plugin @Inject private OverlayManager overlayManager; - @Getter + @Getter(AccessLevel.PACKAGE) private GeneralPath[] multicombatPathToDisplay; - @Getter + @Getter(AccessLevel.PACKAGE) private GeneralPath[] pvpPathToDisplay; - @Getter + @Getter(AccessLevel.PACKAGE) private GeneralPath[] wildernessLevelLinesPathToDisplay; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean inPvp; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean inDeadman; private int currentPlane; + @Getter(AccessLevel.PACKAGE) + private ZoneVisibility multicombatZoneVisibility; + @Getter(AccessLevel.PACKAGE) + private boolean showPvpSafeZones; + @Getter(AccessLevel.PACKAGE) + private boolean showDeadmanSafeZones; + @Getter(AccessLevel.PACKAGE) + private boolean showWildernessLevelLines; + @Getter(AccessLevel.PACKAGE) + private boolean showMinimapLines; + @Getter(AccessLevel.PACKAGE) + private Color multicombatColor; + @Getter(AccessLevel.PACKAGE) + private Color safeZoneColor; + @Getter(AccessLevel.PACKAGE) + private Color wildernessLevelLinesColor; + @Provides MultiIndicatorsConfig getConfig(ConfigManager configManager) { @@ -109,6 +129,8 @@ public class MultiIndicatorsPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(overlay); overlayManager.add(minimapOverlay); @@ -165,9 +187,13 @@ public class MultiIndicatorsPlugin extends Plugin private void transformWorldToLocal(float[] coords) { LocalPoint lp = LocalPoint.fromWorld(client, (int) coords[0], (int) coords[1]); - coords[0] = lp.getX() - Perspective.LOCAL_TILE_SIZE / 2; - coords[1] = lp.getY() - Perspective.LOCAL_TILE_SIZE / 2; + if (lp != null) + { + coords[0] = lp.getX() - Perspective.LOCAL_TILE_SIZE / 2; + coords[1] = lp.getY() - Perspective.LOCAL_TILE_SIZE / 2; + } } + private boolean isOpenableAt(WorldPoint wp) { int sceneX = wp.getX() - client.getBaseX(); @@ -253,7 +279,7 @@ public class MultiIndicatorsPlugin extends Plugin Constants.SCENE_SIZE - 2, Constants.SCENE_SIZE - 2); // Generate lines for multicombat zones - if (config.multicombatZoneVisibility() == ZoneVisibility.HIDE) + if (this.multicombatZoneVisibility == ZoneVisibility.HIDE) { for (int i = 0; i < multicombatPathToDisplay.length; i++) { @@ -268,7 +294,7 @@ public class MultiIndicatorsPlugin extends Plugin GeneralPath lines = new GeneralPath(MapLocations.getMulticombat(sceneRect, i)); lines = Geometry.clipPath(lines, sceneRect); - if (config.multicombatZoneVisibility() == ZoneVisibility.SHOW_IN_PVP && + if (this.multicombatZoneVisibility == ZoneVisibility.SHOW_IN_PVP && !isInDeadman() && !isInPvp()) { lines = Geometry.clipPath(lines, MapLocations.getRoughWilderness(i)); @@ -289,11 +315,11 @@ public class MultiIndicatorsPlugin extends Plugin currentPlane = i; GeneralPath safeZonePath = null; - if (config.showDeadmanSafeZones() && isInDeadman()) + if (this.showDeadmanSafeZones && isInDeadman()) { safeZonePath = new GeneralPath(MapLocations.getDeadmanSafeZones(sceneRect, i)); } - else if (config.showPvpSafeZones() && isInPvp()) + else if (this.showPvpSafeZones && isInPvp()) { safeZonePath = new GeneralPath(MapLocations.getPvpSafeZones(sceneRect, i)); } @@ -316,7 +342,7 @@ public class MultiIndicatorsPlugin extends Plugin currentPlane = i; GeneralPath wildernessLevelLinesPath = null; - if (config.showWildernessLevelLines()) + if (this.showWildernessLevelLines) { wildernessLevelLinesPath = new GeneralPath(MapLocations.getWildernessLevelLines(sceneRect, i)); } @@ -343,6 +369,13 @@ public class MultiIndicatorsPlugin extends Plugin @Subscribe public void onConfigChanged(ConfigChanged event) { + if (!event.getGroup().equals("multiindicators")) + { + return; + } + + updateConfig(); + if (event.getKey().equals("collisionDetection") || event.getKey().equals("multicombatZoneVisibility") || event.getKey().equals("deadmanSafeZones") || @@ -361,4 +394,16 @@ public class MultiIndicatorsPlugin extends Plugin findLinesInScene(); } } + + private void updateConfig() + { + this.multicombatZoneVisibility = config.multicombatZoneVisibility(); + this.showPvpSafeZones = config.showPvpSafeZones(); + this.showDeadmanSafeZones = config.showDeadmanSafeZones(); + this.showWildernessLevelLines = config.showDeadmanSafeZones(); + this.showMinimapLines = config.showMinimapLines(); + this.multicombatColor = config.multicombatColor(); + this.safeZoneColor = config.safeZoneColor(); + this.wildernessLevelLinesColor = config.wildernessLevelLinesColor(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java index 694fc83698..1974109215 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java @@ -32,6 +32,7 @@ import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.EnumDefinition; @@ -55,7 +56,7 @@ import net.runelite.client.plugins.PluginType; type = PluginType.UTILITY, enabledByDefault = false ) - +@Singleton public class MusicIndicatorPlugin extends Plugin { private static final List MUSIC_TRACK_VARPS = ImmutableList.of( diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/musiclist/MusicListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/musiclist/MusicListPlugin.java index ab38b515f9..683666c2bc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/musiclist/MusicListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/musiclist/MusicListPlugin.java @@ -29,6 +29,7 @@ import java.util.Collection; import java.util.Comparator; import java.util.stream.Collectors; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.Client; @@ -57,6 +58,7 @@ import net.runelite.client.plugins.PluginDescriptor; name = "Music List", description = "Adds search and filter for the music list" ) +@Singleton public class MusicListPlugin extends Plugin { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/AbsorptionCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/AbsorptionCounter.java index 3f91d8ee15..e6491a6205 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/AbsorptionCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/AbsorptionCounter.java @@ -26,11 +26,12 @@ package net.runelite.client.plugins.nightmarezone; import java.awt.Color; import java.awt.image.BufferedImage; +import lombok.AccessLevel; import lombok.Setter; import net.runelite.client.plugins.Plugin; import net.runelite.client.ui.overlay.infobox.Counter; -@Setter +@Setter(AccessLevel.PACKAGE) public class AbsorptionCounter extends Counter { private int threshold; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java index 5a0a58e9da..247b2f97ab 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.nightmarezone; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.ItemID; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; @@ -46,10 +47,10 @@ import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.ui.overlay.infobox.InfoBoxManager; import net.runelite.client.util.StackFormatter; +@Singleton class NightmareZoneOverlay extends Overlay { private final Client client; - private final NightmareZoneConfig config; private final NightmareZonePlugin plugin; private final InfoBoxManager infoBoxManager; private final ItemManager itemManager; @@ -59,17 +60,15 @@ class NightmareZoneOverlay extends Overlay @Inject NightmareZoneOverlay( - Client client, - NightmareZoneConfig config, - NightmareZonePlugin plugin, - InfoBoxManager infoBoxManager, - ItemManager itemManager) + final Client client, + final NightmareZonePlugin plugin, + final InfoBoxManager infoBoxManager, + final ItemManager itemManager) { super(plugin); setPosition(OverlayPosition.TOP_LEFT); setPriority(OverlayPriority.LOW); this.client = client; - this.config = config; this.plugin = plugin; this.infoBoxManager = infoBoxManager; this.itemManager = itemManager; @@ -79,7 +78,7 @@ class NightmareZoneOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (!plugin.isInNightmareZone() || !config.moveOverlay()) + if (plugin.isNotInNightmareZone() || !plugin.isMoveOverlay()) { if (absorptionCounter != null) { @@ -108,7 +107,7 @@ class NightmareZoneOverlay extends Overlay tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT); tableComponent.addRow("Points:", StackFormatter.formatNumber(client.getVar(Varbits.NMZ_POINTS))); - if (config.showtotalpoints()) + if (plugin.isShowtotalpoints()) { tableComponent.addRow("Total:", StackFormatter.formatNumber(client.getVar(VarPlayer.NMZ_REWARD_POINTS) + client.getVar(Varbits.NMZ_POINTS))); } @@ -129,7 +128,7 @@ class NightmareZoneOverlay extends Overlay absorptionCounter = null; } } - else if (config.moveOverlay()) + else if (plugin.isMoveOverlay()) { if (absorptionCounter == null) { @@ -144,9 +143,9 @@ class NightmareZoneOverlay extends Overlay private void addAbsorptionCounter(int startValue) { - absorptionCounter = new AbsorptionCounter(itemManager.getImage(ItemID.ABSORPTION_4), plugin, startValue, config.absorptionThreshold()); - absorptionCounter.setAboveThresholdColor(config.absorptionColorAboveThreshold()); - absorptionCounter.setBelowThresholdColor(config.absorptionColorBelowThreshold()); + absorptionCounter = new AbsorptionCounter(itemManager.getImage(ItemID.ABSORPTION_4), plugin, startValue, plugin.getAbsorptionThreshold()); + absorptionCounter.setAboveThresholdColor(plugin.getAbsorptionColorAboveThreshold()); + absorptionCounter.setBelowThresholdColor(plugin.getAbsorptionColorBelowThreshold()); infoBoxManager.addInfoBox(absorptionCounter); } @@ -160,9 +159,9 @@ class NightmareZoneOverlay extends Overlay { if (absorptionCounter != null) { - absorptionCounter.setAboveThresholdColor(config.absorptionColorAboveThreshold()); - absorptionCounter.setBelowThresholdColor(config.absorptionColorBelowThreshold()); - absorptionCounter.setThreshold(config.absorptionThreshold()); + absorptionCounter.setAboveThresholdColor(plugin.getAbsorptionColorAboveThreshold()); + absorptionCounter.setBelowThresholdColor(plugin.getAbsorptionColorBelowThreshold()); + absorptionCounter.setThreshold(plugin.getAbsorptionThreshold()); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java index 3d038163d7..63fffe5396 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java @@ -25,8 +25,12 @@ package net.runelite.client.plugins.nightmarezone; import com.google.inject.Provides; +import java.awt.Color; import java.util.Arrays; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.Varbits; @@ -48,6 +52,7 @@ import net.runelite.client.util.Text; description = "Show NMZ points/absorption and/or notify about expiring potions", tags = {"combat", "nmz", "minigame", "notifications"} ) +@Singleton public class NightmareZonePlugin extends Plugin { private static final int[] NMZ_MAP_REGION = {9033}; @@ -71,9 +76,28 @@ public class NightmareZonePlugin extends Plugin // above the threshold before sending notifications private boolean absorptionNotificationSend = true; + @Getter(AccessLevel.PACKAGE) + private boolean moveOverlay; + @Getter(AccessLevel.PACKAGE) + private boolean showtotalpoints; + private boolean powerSurgeNotification; + private boolean recurrentDamageNotification; + private boolean zapperNotification; + private boolean ultimateForceNotification; + private boolean overloadNotification; + private boolean absorptionNotification; + @Getter(AccessLevel.PACKAGE) + private int absorptionThreshold; + @Getter(AccessLevel.PACKAGE) + private Color absorptionColorAboveThreshold; + @Getter(AccessLevel.PACKAGE) + private Color absorptionColorBelowThreshold; + @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(overlay); overlay.removeAbsorptionCounter(); } @@ -95,6 +119,12 @@ public class NightmareZonePlugin extends Plugin @Subscribe public void onConfigChanged(ConfigChanged event) { + if (!event.getGroup().equals("nightmareZone")) + { + return; + } + + updateConfig(); overlay.updateConfig(); } @@ -107,7 +137,7 @@ public class NightmareZonePlugin extends Plugin @Subscribe public void onGameTick(GameTick event) { - if (!isInNightmareZone()) + if (isNotInNightmareZone()) { if (!absorptionNotificationSend) { @@ -116,7 +146,8 @@ public class NightmareZonePlugin extends Plugin return; } - if (config.absorptionNotification()) + + if (this.absorptionNotification) { checkAbsorption(); } @@ -126,7 +157,7 @@ public class NightmareZonePlugin extends Plugin public void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.GAMEMESSAGE - || !isInNightmareZone()) + || isNotInNightmareZone()) { return; } @@ -134,7 +165,7 @@ public class NightmareZonePlugin extends Plugin String msg = Text.removeTags(event.getMessage()); //remove color if (msg.contains("The effects of overload have worn off, and you feel normal again.")) { - if (config.overloadNotification()) + if (this.overloadNotification) { notifier.notify("Your overload has worn off"); } @@ -143,28 +174,28 @@ public class NightmareZonePlugin extends Plugin { if (msg.contains("Power surge")) { - if (config.powerSurgeNotification()) + if (this.powerSurgeNotification) { notifier.notify(msg); } } else if (msg.contains("Recurrent damage")) { - if (config.recurrentDamageNotification()) + if (this.recurrentDamageNotification) { notifier.notify(msg); } } else if (msg.contains("Zapper")) { - if (config.zapperNotification()) + if (this.zapperNotification) { notifier.notify(msg); } } else if (msg.contains("Ultimate force")) { - if (config.ultimateForceNotification()) + if (this.ultimateForceNotification) { notifier.notify(msg); } @@ -178,23 +209,38 @@ public class NightmareZonePlugin extends Plugin if (!absorptionNotificationSend) { - if (absorptionPoints < config.absorptionThreshold()) + if (absorptionPoints < this.absorptionThreshold) { - notifier.notify("Absorption points below: " + config.absorptionThreshold()); + notifier.notify("Absorption points below: " + this.absorptionThreshold); absorptionNotificationSend = true; } } else { - if (absorptionPoints > config.absorptionThreshold()) + if (absorptionPoints > this.absorptionThreshold) { absorptionNotificationSend = false; } } } - public boolean isInNightmareZone() + boolean isNotInNightmareZone() { - return Arrays.equals(client.getMapRegions(), NMZ_MAP_REGION); + return !Arrays.equals(client.getMapRegions(), NMZ_MAP_REGION); + } + + private void updateConfig() + { + this.moveOverlay = config.moveOverlay(); + this.showtotalpoints = config.showtotalpoints(); + this.powerSurgeNotification = config.powerSurgeNotification(); + this.recurrentDamageNotification = config.recurrentDamageNotification(); + this.zapperNotification = config.zapperNotification(); + this.ultimateForceNotification = config.ultimateForceNotification(); + this.overloadNotification = config.overloadNotification(); + this.absorptionNotification = config.absorptionNotification(); + this.absorptionThreshold = config.absorptionThreshold(); + this.absorptionColorAboveThreshold = config.absorptionColorAboveThreshold(); + this.absorptionColorBelowThreshold = config.absorptionColorBelowThreshold(); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPanel.java index b051cf0e5e..4092f2c15b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPanel.java @@ -29,6 +29,7 @@ import java.awt.BorderLayout; import java.awt.event.ActionEvent; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; +import javax.inject.Singleton; import javax.swing.AbstractAction; import javax.swing.BorderFactory; import javax.swing.JPanel; @@ -44,12 +45,13 @@ import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.PluginPanel; @Slf4j +@Singleton class NotesPanel extends PluginPanel { private final JTextArea notesEditor = new JTextArea(); private final UndoManager undoRedo = new UndoManager(); - void init(NotesConfig config) + void init(final NotesConfig config) { // this may or may not qualify as a hack // but this lets the editor pane expand to fill the whole parent panel diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java index c923a0eefe..e765944fbd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.notes; import com.google.inject.Provides; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.SessionOpen; @@ -42,6 +43,7 @@ import net.runelite.client.util.ImageUtil; tags = {"panel"}, loadWhenOutdated = true ) +@Singleton public class NotesPlugin extends Plugin { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/MemorizedNpc.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/MemorizedNpc.java index 404748db74..8bc34e7738 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/MemorizedNpc.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/MemorizedNpc.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import net.runelite.api.NPC; @@ -36,34 +37,34 @@ import net.runelite.api.coords.WorldPoint; class MemorizedNpc { - @Getter + @Getter(AccessLevel.PACKAGE) private int npcIndex; - @Getter + @Getter(AccessLevel.PACKAGE) private Set npcNames; - @Getter + @Getter(AccessLevel.PACKAGE) private int npcSize; /** * The time the npc died at, in game ticks, relative to the tick counter */ - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private int diedOnTick; /** * The time it takes for the npc to respawn, in game ticks */ - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private int respawnTime; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private List possibleRespawnLocations; - MemorizedNpc(NPC npc) + MemorizedNpc(final NPC npc) { this.npcNames = new HashSet<>(); this.npcNames.add(npc.getName()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java index 2e1d0cdfa4..122599d15c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java @@ -28,6 +28,7 @@ package net.runelite.client.plugins.npchighlight; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; import com.google.inject.Provides; +import java.awt.Color; import java.time.Instant; import java.util.ArrayList; import java.util.Arrays; @@ -39,6 +40,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; @@ -78,6 +80,7 @@ import net.runelite.client.util.WildcardMatcher; tags = {"highlight", "minimap", "npcs", "overlay", "respawn", "tags"} ) @Slf4j +@Singleton public class NpcIndicatorsPlugin extends Plugin { private static final int MAX_ACTOR_VIEW_RANGE = 15; @@ -179,6 +182,21 @@ public class NpcIndicatorsPlugin extends Plugin */ private boolean skipNextSpawnCheck = false; + @Getter(AccessLevel.PACKAGE) + private RenderStyle renderStyle; + @Setter(AccessLevel.PACKAGE) + private String getNpcToHighlight; + @Getter(AccessLevel.PACKAGE) + private Color getHighlightColor; + @Getter(AccessLevel.PACKAGE) + private boolean drawNames; + @Getter(AccessLevel.PACKAGE) + private boolean drawMinimapNames; + @Getter(AccessLevel.PACKAGE) + private boolean highlightMenuNames; + @Getter(AccessLevel.PACKAGE) + private boolean showRespawnTimer; + @Provides NpcIndicatorsConfig provideConfig(ConfigManager configManager) { @@ -188,6 +206,8 @@ public class NpcIndicatorsPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(npcSceneOverlay); overlayManager.add(npcMinimapOverlay); keyManager.registerKeyListener(inputListener); @@ -236,6 +256,8 @@ public class NpcIndicatorsPlugin extends Plugin return; } + updateConfig(); + highlights = getHighlights(); rebuildAllNpcs(); } @@ -261,7 +283,7 @@ public class NpcIndicatorsPlugin extends Plugin type -= MENU_ACTION_DEPRIORITIZE_OFFSET; } - if (config.highlightMenuNames() && + if (this.highlightMenuNames && NPC_MENU_ACTIONS.contains(MenuAction.of(type)) && highlightedNpcs.stream().anyMatch(npc -> npc.getIndex() == event.getIdentifier())) { @@ -490,7 +512,7 @@ public class NpcIndicatorsPlugin extends Plugin @VisibleForTesting List getHighlights() { - final String configNpcs = config.getNpcToHighlight().toLowerCase(); + final String configNpcs = this.getNpcToHighlight.toLowerCase(); if (configNpcs.isEmpty()) { @@ -619,4 +641,15 @@ public class NpcIndicatorsPlugin extends Plugin despawnedNpcsThisTick.clear(); teleportGraphicsObjectSpawnedThisTick.clear(); } + + private void updateConfig() + { + this.renderStyle = config.renderStyle(); + this.getNpcToHighlight = config.getNpcToHighlight(); + this.getHighlightColor = config.getHighlightColor(); + this.drawNames = config.drawNames(); + this.drawMinimapNames = config.drawMinimapNames(); + this.highlightMenuNames = config.highlightMenuNames(); + this.showRespawnTimer = config.showRespawnTimer(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java index 2e46b11bd7..bb5519202c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java @@ -29,7 +29,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; -import net.runelite.api.Client; +import javax.inject.Singleton; import net.runelite.api.NPC; import net.runelite.api.Point; import net.runelite.client.ui.overlay.Overlay; @@ -37,17 +37,14 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton public class NpcMinimapOverlay extends Overlay { - private final Client client; - private final NpcIndicatorsConfig config; private final NpcIndicatorsPlugin plugin; @Inject - NpcMinimapOverlay(Client client, NpcIndicatorsConfig config, NpcIndicatorsPlugin plugin) + NpcMinimapOverlay(final NpcIndicatorsPlugin plugin) { - this.client = client; - this.config = config; this.plugin = plugin; setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); @@ -58,7 +55,7 @@ public class NpcMinimapOverlay extends Overlay { for (NPC npc : plugin.getHighlightedNpcs()) { - renderNpcOverlay(graphics, npc, npc.getName(), config.getHighlightColor()); + renderNpcOverlay(graphics, npc, npc.getName(), plugin.getGetHighlightColor()); } return null; @@ -71,7 +68,7 @@ public class NpcMinimapOverlay extends Overlay { OverlayUtil.renderMinimapLocation(graphics, minimapLocation, color.darker()); - if (config.drawMinimapNames()) + if (plugin.isDrawMinimapNames()) { OverlayUtil.renderTextLocation(graphics, minimapLocation, name, color); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java index 7fd4cff995..900072d4e3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java @@ -35,6 +35,7 @@ import java.text.NumberFormat; import java.time.Instant; import java.util.Locale; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.api.NPC; @@ -50,6 +51,7 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.util.Text; +@Singleton public class NpcSceneOverlay extends Overlay { private static final Color TRANSPARENT = new Color(0, 0, 0, 0); @@ -66,15 +68,13 @@ public class NpcSceneOverlay extends Overlay } private final Client client; - private final NpcIndicatorsConfig config; private final NpcIndicatorsPlugin plugin; private final ModelOutlineRenderer modelOutliner; @Inject - NpcSceneOverlay(Client client, NpcIndicatorsConfig config, NpcIndicatorsPlugin plugin, ModelOutlineRenderer modelOutliner) + NpcSceneOverlay(final Client client, final NpcIndicatorsPlugin plugin, final ModelOutlineRenderer modelOutliner) { this.client = client; - this.config = config; this.plugin = plugin; this.modelOutliner = modelOutliner; setPosition(OverlayPosition.DYNAMIC); @@ -84,14 +84,14 @@ public class NpcSceneOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (config.showRespawnTimer()) + if (plugin.isShowRespawnTimer()) { plugin.getDeadNpcsToDisplay().forEach((id, npc) -> renderNpcRespawn(npc, graphics)); } for (NPC npc : plugin.getHighlightedNpcs()) { - renderNpcOverlay(graphics, npc, config.getHighlightColor()); + renderNpcOverlay(graphics, npc, plugin.getGetHighlightColor()); } return null; @@ -112,7 +112,7 @@ public class NpcSceneOverlay extends Overlay return; } - final Color color = config.getHighlightColor(); + final Color color = plugin.getGetHighlightColor(); final LocalPoint centerLp = new LocalPoint( lp.getX() + Perspective.LOCAL_TILE_SIZE * (npc.getNpcSize() - 1) / 2, @@ -149,7 +149,7 @@ public class NpcSceneOverlay extends Overlay private void renderNpcOverlay(Graphics2D graphics, NPC actor, Color color) { - switch (config.renderStyle()) + switch (plugin.getRenderStyle()) { case SOUTH_WEST_TILE: LocalPoint lp1 = LocalPoint.fromWorld(client, actor.getWorldLocation()); @@ -194,7 +194,7 @@ public class NpcSceneOverlay extends Overlay break; } - if (config.drawNames() && actor.getName() != null) + if (plugin.isDrawNames() && actor.getName() != null) { String npcName = Text.removeTags(actor.getName()); Point textLocation = actor.getCanvasTextLocation(graphics, npcName, actor.getLogicalHeight() + 40); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/MemorizedNPC.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/MemorizedNPC.java index 4a746e63db..01d44c8379 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/MemorizedNPC.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/MemorizedNPC.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.npcstatus; import java.awt.Color; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; @@ -39,22 +40,22 @@ class MemorizedNPC private int npcIndex; private String npcName; private int attackSpeed; - @Setter + @Setter(AccessLevel.PACKAGE) private int combatTimerEnd; - @Setter + @Setter(AccessLevel.PACKAGE) private int timeLeft; - @Setter + @Setter(AccessLevel.PACKAGE) private int flinchTimerEnd; - @Setter + @Setter(AccessLevel.PACKAGE) private Status status; - @Setter + @Setter(AccessLevel.PACKAGE) private WorldArea lastnpcarea; - @Setter + @Setter(AccessLevel.PACKAGE) private Actor lastinteracted; - @Setter + @Setter(AccessLevel.PACKAGE) private int lastspotanimation; - MemorizedNPC(NPC npc, int attackSpeed, WorldArea worldArea) + MemorizedNPC(final NPC npc, final int attackSpeed, final WorldArea worldArea) { this.npc = npc; this.npcIndex = npc.getIndex(); @@ -69,7 +70,7 @@ class MemorizedNPC this.lastspotanimation = -1; } - @Getter + @Getter(AccessLevel.PACKAGE) @AllArgsConstructor enum Status { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusConfig.java index bf0495fae5..5b0b0c97e7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusConfig.java @@ -32,9 +32,9 @@ import net.runelite.client.config.ConfigItem; public interface NpcStatusConfig extends Config { @ConfigItem( - keyName = "AttackRange", - name = "NPC Attack range", - description = "The attack range of the NPC" + keyName = "AttackRange", + name = "NPC Attack range", + description = "The attack range of the NPC" ) default int getRange() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusOverlay.java index 7b948f24c0..8814b6769a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusOverlay.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.npcstatus; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Point; import net.runelite.client.ui.overlay.Overlay; @@ -34,13 +35,14 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton public class NpcStatusOverlay extends Overlay { private final Client client; private final NpcStatusPlugin plugin; @Inject - NpcStatusOverlay(Client client, NpcStatusPlugin plugin) + NpcStatusOverlay(final Client client, final NpcStatusPlugin plugin) { this.client = client; this.plugin = plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java index 0f1a59a17a..9e6af3cc93 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java @@ -30,6 +30,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -39,6 +40,7 @@ import net.runelite.api.GraphicID; import net.runelite.api.Hitsplat; import net.runelite.api.NPC; import net.runelite.api.coords.WorldArea; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.HitsplatApplied; @@ -46,7 +48,6 @@ import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; -import net.runelite.client.game.ItemManager; import net.runelite.client.game.NPCManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -59,26 +60,34 @@ import net.runelite.client.ui.overlay.OverlayManager; tags = {"flinch", "npc"}, enabledByDefault = false ) +@Singleton public class NpcStatusPlugin extends Plugin { @Getter(AccessLevel.PACKAGE) private final Set memorizedNPCs = new HashSet<>(); + @Inject private Client client; + @Inject private OverlayManager overlayManager; - @Inject - private ItemManager itemManager; + @Inject private NPCManager npcManager; + @Inject private NpcStatusConfig config; + @Inject private NpcStatusOverlay npcStatusOverlay; + @Getter(AccessLevel.PACKAGE) private Instant lastTickUpdate; + private WorldArea lastPlayerLocation; + private int getRange; + @Provides NpcStatusConfig provideConfig(ConfigManager configManager) { @@ -88,6 +97,7 @@ public class NpcStatusPlugin extends Plugin @Override protected void startUp() throws Exception { + this.getRange = config.getRange(); overlayManager.add(npcStatusOverlay); } @@ -169,7 +179,7 @@ public class NpcStatusPlugin extends Plugin if (npc.getLastspotanimation() == GraphicID.SPLASH && npc.getNpc().getSpotAnimation() == GraphicID.SPLASH) //For splash flinching { npc.setLastspotanimation(-1); - if ((npc.getStatus() == MemorizedNPC.Status.OUT_OF_COMBAT ) || npc.getLastinteracted() == null) + if ((npc.getStatus() == MemorizedNPC.Status.OUT_OF_COMBAT) || npc.getLastinteracted() == null) { npc.setStatus(MemorizedNPC.Status.FLINCHING); npc.setCombatTimerEnd(-1); @@ -180,8 +190,8 @@ public class NpcStatusPlugin extends Plugin } } //Checks: will the NPC attack this tick? - if (((npc.getNpc().getWorldArea().canMelee(client, lastPlayerLocation) && config.getRange() == 1) //Separate mechanics for meleerange-only NPC's because they have extra collisiondata checks (fences etc.) and can't attack diagonally - || (lastPlayerLocation.hasLineOfSightTo(client, npc.getNpc().getWorldArea()) && npc.getNpc().getWorldArea().distanceTo(lastPlayerLocation) <= config.getRange() && config.getRange() > 1)) + if (((npc.getNpc().getWorldArea().canMelee(client, lastPlayerLocation) && this.getRange == 1) //Separate mechanics for meleerange-only NPC's because they have extra collisiondata checks (fences etc.) and can't attack diagonally + || (lastPlayerLocation.hasLineOfSightTo(client, npc.getNpc().getWorldArea()) && npc.getNpc().getWorldArea().distanceTo(lastPlayerLocation) <= this.getRange && this.getRange > 1)) && ((npc.getStatus() != MemorizedNPC.Status.FLINCHING && CombatTime < 9) || (npc.getStatus() == MemorizedNPC.Status.FLINCHING && FlinchTime < 2)) && npc.getNpc().getAnimation() != -1 //Failsafe, attacking NPC's always have an animation. && !(npc.getLastnpcarea().distanceTo(lastPlayerLocation) == 0 && npc.getLastnpcarea() != npc.getNpc().getWorldArea())) //Weird mechanic: NPC's can't attack on the tick they do a random move @@ -228,4 +238,15 @@ public class NpcStatusPlugin extends Plugin checkStatus(); lastPlayerLocation = client.getLocalPlayer().getWorldArea(); } + + @Subscribe + public void onConfigChanged(ConfigChanged configChanged) + { + if (!configChanged.getGroup().equals("npcstatus")) + { + return; + } + + this.getRange = config.getRange(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/AggressionTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/AggressionTimer.java index 7194d2ddd6..5a091eaabd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/AggressionTimer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/AggressionTimer.java @@ -29,6 +29,7 @@ import java.awt.image.BufferedImage; import java.time.Duration; import java.time.Instant; import java.time.temporal.ChronoUnit; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import net.runelite.client.plugins.Plugin; @@ -36,11 +37,11 @@ import net.runelite.client.ui.overlay.infobox.Timer; class AggressionTimer extends Timer { - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private boolean visible; - AggressionTimer(Duration duration, BufferedImage image, Plugin plugin, boolean visible) + AggressionTimer(final Duration duration, final BufferedImage image, final Plugin plugin, final boolean visible) { super(duration.toMillis(), ChronoUnit.MILLIS, image, plugin); setTooltip("Time until NPCs become unaggressive"); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaNotWorkingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaNotWorkingOverlay.java index 3d238cce85..533d4ae93b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaNotWorkingOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaNotWorkingOverlay.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.npcunaggroarea; import com.google.inject.Inject; +import com.google.inject.Singleton; import java.awt.Dimension; import java.awt.Graphics2D; import net.runelite.client.ui.overlay.Overlay; @@ -33,17 +34,16 @@ import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.components.LineComponent; import net.runelite.client.ui.overlay.components.PanelComponent; +@Singleton class NpcAggroAreaNotWorkingOverlay extends Overlay { private final NpcAggroAreaPlugin plugin; - private final NpcAggroAreaConfig config; private final PanelComponent panelComponent; @Inject - private NpcAggroAreaNotWorkingOverlay(NpcAggroAreaPlugin plugin, NpcAggroAreaConfig config) + private NpcAggroAreaNotWorkingOverlay(final NpcAggroAreaPlugin plugin) { this.plugin = plugin; - this.config = config; panelComponent = new PanelComponent(); panelComponent.setPreferredSize(new Dimension(150, 0)); @@ -58,7 +58,7 @@ class NpcAggroAreaNotWorkingOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (!plugin.isActive() || plugin.getSafeCenters()[1] != null || config.hideOverlayHint()) + if (!plugin.isActive() || plugin.getSafeCenters()[1] != null || plugin.isHideOverlayHint()) { return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java index 2090fca5c2..5a295e2f35 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.npcunaggroarea; +import javax.inject.Singleton; import net.runelite.api.geometry.Geometry; import java.awt.BasicStroke; import java.awt.Color; @@ -42,19 +43,18 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; +@Singleton class NpcAggroAreaOverlay extends Overlay { private static final int MAX_LOCAL_DRAW_LENGTH = 20 * Perspective.LOCAL_TILE_SIZE; private final Client client; - private final NpcAggroAreaConfig config; private final NpcAggroAreaPlugin plugin; @Inject - private NpcAggroAreaOverlay(Client client, NpcAggroAreaConfig config, NpcAggroAreaPlugin plugin) + private NpcAggroAreaOverlay(final Client client, final NpcAggroAreaPlugin plugin) { this.client = client; - this.config = config; this.plugin = plugin; setLayer(OverlayLayer.ABOVE_SCENE); @@ -76,7 +76,7 @@ class NpcAggroAreaOverlay extends Overlay return null; } - Color outlineColor = config.aggroAreaColor(); + Color outlineColor = plugin.getAggroAreaColor(); AggressionTimer timer = plugin.getCurrentTimer(); if (timer == null || Instant.now().compareTo(timer.getEndTime()) < 0) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java index d7aede1a4f..d4093c07a5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java @@ -24,6 +24,9 @@ */ package net.runelite.client.plugins.npcunaggroarea; +import java.awt.Color; +import javax.inject.Singleton; +import lombok.AccessLevel; import net.runelite.api.geometry.Geometry; import com.google.common.base.Splitter; import com.google.common.base.Strings; @@ -69,6 +72,7 @@ import net.runelite.client.util.WildcardMatcher; tags = {"highlight", "lines", "unaggro", "aggro", "aggressive", "npcs", "area", "slayer"}, enabledByDefault = false ) +@Singleton public class NpcAggroAreaPlugin extends Plugin { /* @@ -112,18 +116,28 @@ public class NpcAggroAreaPlugin extends Plugin @Inject private ConfigManager configManager; - @Getter + @Getter(AccessLevel.PACKAGE) private final WorldPoint[] safeCenters = new WorldPoint[2]; - @Getter + @Getter(AccessLevel.PACKAGE) private final GeneralPath[] linesToDisplay = new GeneralPath[Constants.MAX_Z]; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean active; - @Getter + @Getter(AccessLevel.PACKAGE) private AggressionTimer currentTimer; + private boolean alwaysActive; + private String configNpcNamePatterns; + private boolean showTimer; + private boolean showAreaLines; + @Getter(AccessLevel.PACKAGE) + private Color aggroAreaColor; + private boolean showNotWorkingOverlay; + @Getter(AccessLevel.PACKAGE) + private boolean hideOverlayHint; + private WorldPoint lastPlayerLocation; private WorldPoint previousUnknownCenter; private boolean loggingIn; @@ -139,14 +153,16 @@ public class NpcAggroAreaPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(overlay); - if (config.showNotWorkingOverlay()) + if (this.showNotWorkingOverlay) { overlayManager.add(notWorkingOverlay); notWorkingOverlayShown = true; } - npcNamePatterns = NAME_SPLITTER.splitToList(config.npcNamePatterns()); + npcNamePatterns = NAME_SPLITTER.splitToList(this.configNpcNamePatterns); recheckActive(); } @@ -203,7 +219,7 @@ public class NpcAggroAreaPlugin extends Plugin { if (currentTimer != null) { - currentTimer.setVisible(active && config.showTimer()); + currentTimer.setVisible(active && this.showTimer); } calculateLinesToDisplay(); @@ -211,7 +227,7 @@ public class NpcAggroAreaPlugin extends Plugin private void calculateLinesToDisplay() { - if (!active || !config.showAreaLines()) + if (!active || !this.showAreaLines) { Arrays.fill(linesToDisplay, null); return; @@ -241,7 +257,7 @@ public class NpcAggroAreaPlugin extends Plugin { removeTimer(); BufferedImage image = itemManager.getImage(ItemID.ENSOULED_DEMON_HEAD); - currentTimer = new AggressionTimer(duration, image, this, active && config.showTimer()); + currentTimer = new AggressionTimer(duration, image, this, active && this.showTimer); infoBoxManager.addInfoBox(currentTimer); } @@ -310,14 +326,14 @@ public class NpcAggroAreaPlugin extends Plugin private void recheckActive() { - active = config.alwaysActive(); + active = this.alwaysActive; checkAreaNpcs(client.getCachedNPCs()); } @Subscribe public void onNpcSpawned(NpcSpawned event) { - if (config.alwaysActive()) + if (this.alwaysActive) { return; } @@ -374,6 +390,13 @@ public class NpcAggroAreaPlugin extends Plugin @Subscribe public void onConfigChanged(ConfigChanged event) { + if (!event.getGroup().equals("npcUnaggroArea")) + { + return; + } + + updateConfig(); + String key = event.getKey(); switch (key) { @@ -383,7 +406,7 @@ public class NpcAggroAreaPlugin extends Plugin case "npcUnaggroShowTimer": if (currentTimer != null) { - currentTimer.setVisible(active && config.showTimer()); + currentTimer.setVisible(active && this.showTimer); } break; case "npcUnaggroCollisionDetection": @@ -391,7 +414,7 @@ public class NpcAggroAreaPlugin extends Plugin calculateLinesToDisplay(); break; case "npcUnaggroNames": - npcNamePatterns = NAME_SPLITTER.splitToList(config.npcNamePatterns()); + npcNamePatterns = NAME_SPLITTER.splitToList(this.configNpcNamePatterns); recheckActive(); break; } @@ -483,4 +506,15 @@ public class NpcAggroAreaPlugin extends Plugin break; } } + + private void updateConfig() + { + this.alwaysActive = config.alwaysActive(); + this.configNpcNamePatterns = config.npcNamePatterns(); + this.showTimer = config.showTimer(); + this.showAreaLines = config.showAreaLines(); + this.aggroAreaColor = config.aggroAreaColor(); + this.showNotWorkingOverlay = config.showNotWorkingOverlay(); + this.hideOverlayHint = config.hideOverlayHint(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsOverlay.java index a4e9aee7e9..e9ac6d354a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsOverlay.java @@ -32,6 +32,7 @@ import java.awt.Polygon; import java.awt.geom.Area; import static java.lang.Math.floor; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.DecorativeObject; import net.runelite.api.GameObject; @@ -43,20 +44,19 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton class ObjectIndicatorsOverlay extends Overlay { private static final Color TRANSPARENT = new Color(0, 0, 0, 0); private final Client client; - private final ObjectIndicatorsConfig config; private final ObjectIndicatorsPlugin plugin; private final ModelOutlineRenderer modelOutliner; @Inject - private ObjectIndicatorsOverlay(Client client, ObjectIndicatorsConfig config, ObjectIndicatorsPlugin plugin, ModelOutlineRenderer modelOutliner) + private ObjectIndicatorsOverlay(final Client client, final ObjectIndicatorsPlugin plugin, final ModelOutlineRenderer modelOutliner) { this.client = client; - this.config = config; this.plugin = plugin; this.modelOutliner = modelOutliner; setPosition(OverlayPosition.DYNAMIC); @@ -74,14 +74,14 @@ class ObjectIndicatorsOverlay extends Overlay continue; } - Color color = config.objectMarkerColor(); - int opacity = (int) floor(config.objectMarkerAlpha() * 2.55); + Color color = plugin.getObjectMarkerColor(); + int opacity = (int) floor(plugin.getObjectMarkerAlpha() * 2.55); Color objectColor = new Color(color.getRed(), color.getGreen(), color.getBlue(), opacity); - switch (config.objectMarkerRenderStyle()) + switch (plugin.getObjectMarkerRenderStyle()) { case OUTLINE: - switch (config.objectMarkerOutlineRenderStyle()) + switch (plugin.getObjectMarkerOutlineRenderStyle()) { case THIN_OUTLINE: modelOutliner.drawOutline(object, 1, objectColor); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java index adb0cb4bc5..f21d7ef067 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java @@ -29,6 +29,7 @@ import com.google.common.base.Strings; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.google.inject.Provides; +import java.awt.Color; import java.awt.event.KeyEvent; import java.util.ArrayList; import java.util.Arrays; @@ -38,6 +39,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -53,6 +55,7 @@ import net.runelite.api.Scene; import net.runelite.api.Tile; import net.runelite.api.TileObject; import net.runelite.api.coords.WorldPoint; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.DecorativeObjectDespawned; import net.runelite.api.events.DecorativeObjectSpawned; import net.runelite.api.events.FocusChanged; @@ -76,6 +79,7 @@ import net.runelite.client.ui.overlay.OverlayManager; tags = {"overlay", "objects", "mark", "marker"}, enabledByDefault = false ) +@Singleton public class ObjectIndicatorsPlugin extends Plugin implements KeyListener { private static final String CONFIG_GROUP = "objectindicators"; @@ -100,9 +104,21 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener @Inject private ObjectIndicatorsOverlay overlay; + @Inject + private ObjectIndicatorsConfig config; + @Inject private KeyManager keyManager; + @Getter(AccessLevel.PACKAGE) + private RenderStyle objectMarkerRenderStyle; + @Getter(AccessLevel.PACKAGE) + private OutlineRenderStyle objectMarkerOutlineRenderStyle; + @Getter(AccessLevel.PACKAGE) + private Color objectMarkerColor; + @Getter(AccessLevel.PACKAGE) + private int objectMarkerAlpha; + @Provides ObjectIndicatorsConfig provideConfig(ConfigManager configManager) { @@ -112,6 +128,8 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener @Override protected void startUp() { + updateConfig(); + overlayManager.add(overlay); keyManager.registerKeyListener(this); } @@ -428,4 +446,23 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener { }.getType()); } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("objectindicators")) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.objectMarkerRenderStyle = config.objectMarkerRenderStyle(); + this.objectMarkerOutlineRenderStyle = config.objectMarkerOutlineRenderStyle(); + this.objectMarkerColor = config.objectMarkerColor(); + this.objectMarkerAlpha = config.objectMarkerAlpha(); + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java index 9ca6337427..2913384345 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java @@ -32,6 +32,7 @@ import java.awt.Graphics2D; import java.awt.Point; import java.awt.Rectangle; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Actor; import net.runelite.api.Client; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; @@ -52,6 +53,7 @@ import net.runelite.client.ui.overlay.components.TitleComponent; import net.runelite.client.util.Text; import net.runelite.http.api.hiscore.HiscoreResult; +@Singleton class OpponentInfoOverlay extends Overlay { private static final Color HP_GREEN = new Color(0, 146, 54, 230); @@ -59,7 +61,6 @@ class OpponentInfoOverlay extends Overlay private final Client client; private final OpponentInfoPlugin opponentInfoPlugin; - private final OpponentInfoConfig opponentInfoConfig; private final HiscoreManager hiscoreManager; private final NPCManager npcManager; @@ -73,16 +74,14 @@ class OpponentInfoOverlay extends Overlay @Inject private OpponentInfoOverlay( - Client client, - OpponentInfoPlugin opponentInfoPlugin, - OpponentInfoConfig opponentInfoConfig, - HiscoreManager hiscoreManager, - NPCManager npcManager) + final Client client, + final OpponentInfoPlugin opponentInfoPlugin, + final HiscoreManager hiscoreManager, + final NPCManager npcManager) { super(opponentInfoPlugin); this.client = client; this.opponentInfoPlugin = opponentInfoPlugin; - this.opponentInfoConfig = opponentInfoConfig; this.hiscoreManager = hiscoreManager; this.npcManager = npcManager; @@ -164,7 +163,7 @@ class OpponentInfoOverlay extends Overlay progressBarComponent.setBackgroundColor(HP_RED); progressBarComponent.setForegroundColor(HP_GREEN); - final HitpointsDisplayStyle displayStyle = opponentInfoConfig.hitpointsDisplayStyle(); + final HitpointsDisplayStyle displayStyle = opponentInfoPlugin.getHitpointsDisplayStyle(); if ((displayStyle == HitpointsDisplayStyle.HITPOINTS || displayStyle == HitpointsDisplayStyle.BOTH) && lastMaxHealth != -1) @@ -219,7 +218,7 @@ class OpponentInfoOverlay extends Overlay } // Opponents opponent - if (opponentsOpponentName != null && opponentInfoConfig.showOpponentsOpponent()) + if (opponentsOpponentName != null && opponentInfoPlugin.isShowOpponentsOpponent()) { textWidth = Math.max(textWidth, fontMetrics.stringWidth(opponentsOpponentName)); panelComponent.setPreferredSize(new Dimension(textWidth, 0)); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java index 6e36665a8b..979633bdf7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java @@ -30,12 +30,14 @@ import java.time.Duration; import java.time.Instant; import java.util.EnumSet; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Actor; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.WorldType; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.InteractingChanged; @@ -51,6 +53,7 @@ import net.runelite.http.api.hiscore.HiscoreEndpoint; description = "Show name and hitpoints information about the NPC you are fighting", tags = {"combat", "health", "hitpoints", "npcs", "overlay"} ) +@Singleton public class OpponentInfoPlugin extends Plugin { private static final Duration WAIT = Duration.ofSeconds(5); @@ -78,6 +81,13 @@ public class OpponentInfoPlugin extends Plugin private Instant lastTime; + @Getter(AccessLevel.PACKAGE) + private boolean lookupOnInteraction; + @Getter(AccessLevel.PACKAGE) + private HitpointsDisplayStyle hitpointsDisplayStyle; + @Getter(AccessLevel.PACKAGE) + private boolean showOpponentsOpponent; + @Provides OpponentInfoConfig provideConfig(ConfigManager configManager) { @@ -87,6 +97,8 @@ public class OpponentInfoPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(opponentInfoOverlay); overlayManager.add(playerComparisonOverlay); } @@ -159,4 +171,22 @@ public class OpponentInfoPlugin extends Plugin } } } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("opponentinfo")) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.lookupOnInteraction = config.lookupOnInteraction(); + this.hitpointsDisplayStyle = config.hitpointsDisplayStyle(); + this.showOpponentsOpponent = config.showOpponentsOpponent(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/PlayerComparisonOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/PlayerComparisonOverlay.java index 867e0e6004..c89603364f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/PlayerComparisonOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/PlayerComparisonOverlay.java @@ -29,6 +29,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Actor; import net.runelite.api.Client; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; @@ -49,6 +50,7 @@ import net.runelite.client.util.Text; import net.runelite.http.api.hiscore.HiscoreResult; import net.runelite.http.api.hiscore.HiscoreSkill; +@Singleton class PlayerComparisonOverlay extends Overlay { private static final Color HIGHER_STAT_TEXT_COLOR = Color.GREEN; @@ -82,17 +84,15 @@ class PlayerComparisonOverlay extends Overlay private final Client client; private final OpponentInfoPlugin opponentInfoPlugin; - private final OpponentInfoConfig config; private final HiscoreManager hiscoreManager; private final PanelComponent panelComponent = new PanelComponent(); @Inject - private PlayerComparisonOverlay(Client client, OpponentInfoPlugin opponentInfoPlugin, OpponentInfoConfig config, HiscoreManager hiscoreManager) + private PlayerComparisonOverlay(final Client client, final OpponentInfoPlugin opponentInfoPlugin, final HiscoreManager hiscoreManager) { super(opponentInfoPlugin); this.client = client; this.opponentInfoPlugin = opponentInfoPlugin; - this.config = config; this.hiscoreManager = hiscoreManager; setPosition(OverlayPosition.BOTTOM_LEFT); @@ -103,7 +103,7 @@ class PlayerComparisonOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (!config.lookupOnInteraction()) + if (!opponentInfoPlugin.isLookupOnInteraction()) { return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPingOverlay.java index 9134c1f8d1..f7811806dd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPingOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPingOverlay.java @@ -30,6 +30,7 @@ import java.awt.Graphics2D; import java.awt.Polygon; import java.util.Iterator; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Perspective; import net.runelite.api.coords.LocalPoint; @@ -38,6 +39,7 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton class PartyPingOverlay extends Overlay { private final Client client; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java index 2d7bddc3a6..ac83ef69e1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java @@ -38,6 +38,8 @@ import java.util.UUID; import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Named; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.ChatMessageType; @@ -50,6 +52,7 @@ import net.runelite.api.SoundEffectID; import net.runelite.api.Tile; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.CommandExecuted; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.FocusChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.MenuOptionClicked; @@ -87,6 +90,7 @@ import net.runelite.http.api.ws.messages.party.UserSync; description = "Shows useful information about current party" ) @Slf4j +@Singleton public class PartyPlugin extends Plugin implements KeyListener { @Inject @@ -126,16 +130,24 @@ public class PartyPlugin extends Plugin implements KeyListener @Named("developerMode") boolean developerMode; - @Getter + @Getter(AccessLevel.PACKAGE) private final Map partyDataMap = Collections.synchronizedMap(new HashMap<>()); - @Getter + @Getter(AccessLevel.PACKAGE) private final List pendingTilePings = Collections.synchronizedList(new ArrayList<>()); private int lastHp, lastPray; private boolean hotkeyDown, doSync; private boolean sendAlert; + @Getter(AccessLevel.PACKAGE) + private boolean stats; + private boolean pings; + private boolean sounds; + private boolean messages; + @Getter(AccessLevel.PACKAGE) + private boolean recolorNames; + @Override public void configure(Binder binder) { @@ -145,6 +157,8 @@ public class PartyPlugin extends Plugin implements KeyListener @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(partyStatsOverlay); overlayManager.add(partyPingOverlay); wsClient.registerMessage(SkillUpdate.class); @@ -186,7 +200,7 @@ public class PartyPlugin extends Plugin implements KeyListener { party.changeParty(null); - if (!config.messages()) + if (!this.messages) { return; } @@ -206,7 +220,7 @@ public class PartyPlugin extends Plugin implements KeyListener @Subscribe public void onMenuOptionClicked(MenuOptionClicked event) { - if (!hotkeyDown || client.isMenuOpen() || party.getMembers().isEmpty() || !config.pings()) + if (!hotkeyDown || client.isMenuOpen() || party.getMembers().isEmpty() || !this.pings) { return; } @@ -246,14 +260,14 @@ public class PartyPlugin extends Plugin implements KeyListener @Subscribe public void onTilePing(TilePing event) { - if (config.pings()) + if (this.pings) { final PartyData partyData = getPartyData(event.getMemberId()); final Color color = partyData != null ? partyData.getColor() : Color.RED; pendingTilePings.add(new PartyTilePingData(event.getPoint(), color)); } - if (config.sounds()) + if (this.sounds) { WorldPoint point = event.getPoint(); @@ -375,7 +389,7 @@ public class PartyPlugin extends Plugin implements KeyListener { final PartyData partyData = getPartyData(event.getMemberId()); - if (partyData == null || !config.messages()) + if (partyData == null || !this.messages) { return; } @@ -427,7 +441,7 @@ public class PartyPlugin extends Plugin implements KeyListener if (removed != null) { - if (config.messages()) + if (this.messages) { final String joinMessage = new ChatMessageBuilder() .append(ChatColorType.HIGHLIGHT) @@ -546,4 +560,24 @@ public class PartyPlugin extends Plugin implements KeyListener .runeLiteFormattedMessage(helpMessage) .build()); } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("party")) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.stats = config.stats(); + this.pings = config.pings(); + this.sounds = config.sounds(); + this.messages = config.messages(); + this.recolorNames = config.recolorNames(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyStatsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyStatsOverlay.java index 693b23cb89..17c791cf19 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyStatsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyStatsOverlay.java @@ -32,6 +32,7 @@ import java.awt.Rectangle; import java.util.Map; import java.util.UUID; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.MenuAction; import net.runelite.client.plugins.party.data.PartyData; import net.runelite.client.ui.overlay.Overlay; @@ -42,6 +43,7 @@ import net.runelite.client.ui.overlay.components.ProgressBarComponent; import net.runelite.client.ui.overlay.components.TitleComponent; import net.runelite.client.ws.PartyService; +@Singleton public class PartyStatsOverlay extends Overlay { private static final Color HP_FG = new Color(0, 146, 54, 230); @@ -51,7 +53,6 @@ public class PartyStatsOverlay extends Overlay private final PartyPlugin plugin; private final PartyService party; - private final PartyConfig config; private final PanelComponent body = new PanelComponent(); @Inject @@ -60,7 +61,6 @@ public class PartyStatsOverlay extends Overlay super(plugin); this.plugin = plugin; this.party = party; - this.config = config; body.setBorder(new Rectangle()); body.setGap(new Point(0, ComponentConstants.STANDARD_BORDER / 2)); getMenuEntries().add(new OverlayMenuEntry(MenuAction.RUNELITE_OVERLAY, "Leave", "Party")); @@ -69,7 +69,7 @@ public class PartyStatsOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (!config.stats()) + if (!plugin.isStats()) { return null; } @@ -107,7 +107,7 @@ public class PartyStatsOverlay extends Overlay final TitleComponent name = TitleComponent.builder() .text(v.getName()) - .color(config.recolorNames() ? v.getColor() : Color.WHITE) + .color(plugin.isRecolorNames() ? v.getColor() : Color.WHITE) .build(); panel.getChildren().add(name); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyWorldMapPoint.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyWorldMapPoint.java index a2ae27835b..8a51f5fa0c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyWorldMapPoint.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyWorldMapPoint.java @@ -39,7 +39,7 @@ class PartyWorldMapPoint extends WorldMapPoint private BufferedImage partyImage; private PartyMember member; - PartyWorldMapPoint(WorldPoint worldPoint, PartyMember member) + PartyWorldMapPoint(final WorldPoint worldPoint, final PartyMember member) { super(worldPoint, null); this.member = member; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/Performance.java b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/Performance.java index cc81fa1bfb..25336dbb38 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/Performance.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/Performance.java @@ -24,16 +24,17 @@ */ package net.runelite.client.plugins.performancestats; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import net.runelite.http.api.ws.messages.party.PartyMemberMessage; -@Getter +@Getter(AccessLevel.PACKAGE) class Performance extends PartyMemberMessage { private static final double TICK_LENGTH = 0.6; - @Setter + @Setter(AccessLevel.PACKAGE) String username; double damageDealt = 0; @@ -43,7 +44,7 @@ class Performance extends PartyMemberMessage double highestHitTaken = 0; int lastActivityTick = -1; - @Setter + @Setter(AccessLevel.PACKAGE) double ticksSpent = 0; void addDamageDealt(double a, int currentTick) @@ -83,7 +84,7 @@ class Performance extends PartyMemberMessage ticksSpent = 0; } - double getSecondsSpent() + private double getSecondsSpent() { return Math.round(this.ticksSpent * TICK_LENGTH); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java index c2d2961034..ede483cfa1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java @@ -28,6 +28,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.MenuAction; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayMenuEntry; @@ -38,6 +39,7 @@ import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; +@Singleton public class PerformanceStatsOverlay extends Overlay { private static final String TARGET = "Performance Stats"; @@ -50,7 +52,7 @@ public class PerformanceStatsOverlay extends Overlay private final TableComponent tableComponent = new TableComponent(); @Inject - PerformanceStatsOverlay(PerformanceStatsPlugin tracker) + PerformanceStatsOverlay(final PerformanceStatsPlugin tracker) { super(tracker); setPosition(OverlayPosition.TOP_RIGHT); @@ -111,8 +113,8 @@ public class PerformanceStatsOverlay extends Overlay return new String[] { performance.getUsername(), - String.valueOf((int) Math.round(performance.getDamageDealt())) + " | " + String.valueOf((int) Math.round(performance.getHighestHitDealt())), - String.valueOf((int) Math.round(performance.getDamageTaken())) + " | " + String.valueOf((int) Math.round(performance.getHighestHitTaken())), + (int) Math.round(performance.getDamageDealt()) + " | " + String.valueOf((int) Math.round(performance.getHighestHitDealt())), + (int) Math.round(performance.getDamageTaken()) + " | " + String.valueOf((int) Math.round(performance.getHighestHitTaken())), String.valueOf(performance.getDPS()), performance.getHumanReadableSecondsSpent() }; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsPlugin.java index fa3e7fd530..41fdfedfc6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsPlugin.java @@ -31,6 +31,8 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Actor; @@ -39,6 +41,7 @@ import net.runelite.api.Client; import net.runelite.api.NPC; import net.runelite.api.Skill; import net.runelite.api.WorldType; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.ExperienceChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; @@ -72,6 +75,7 @@ import net.runelite.http.api.ws.messages.party.UserSync; enabledByDefault = false ) @Slf4j +@Singleton public class PerformanceStatsPlugin extends Plugin { // For every damage point dealt 1.33 experience is given to the player's hitpoints (base rate) @@ -105,11 +109,11 @@ public class PerformanceStatsPlugin extends Plugin @Inject private WSClient wsClient; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean enabled = false; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean paused = false; - @Getter + @Getter(AccessLevel.PACKAGE) private final Performance performance = new Performance(); // Keep track of actor last tick as sometimes getInteracting can return null when hp xp event is triggered @@ -119,8 +123,10 @@ public class PerformanceStatsPlugin extends Plugin private boolean hopping; private int pausedTicks = 0; + private int submitTimeout; + // Party System - @Getter + @Getter(AccessLevel.PACKAGE) private final Map partyDataMap = Collections.synchronizedMap(new HashMap<>()); @Provides @@ -132,6 +138,8 @@ public class PerformanceStatsPlugin extends Plugin @Override protected void startUp() { + this.submitTimeout = config.submitTimeout(); + overlayManager.add(performanceTrackerOverlay); wsClient.registerMessage(Performance.class); } @@ -266,7 +274,7 @@ public class PerformanceStatsPlugin extends Plugin performance.incrementTicksSpent(); hopping = false; - final int timeout = config.submitTimeout(); + final int timeout = this.submitTimeout; if (timeout > 0) { final double tickTimeout = timeout / GAME_TICK_SECONDS; @@ -449,4 +457,14 @@ public class PerformanceStatsPlugin extends Plugin partyDataMap.clear(); } + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("performancestats")) + { + return; + } + + this.submitTimeout = config.submitTimeout(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java index 6e9e4274bd..5ed0b19202 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java @@ -30,6 +30,7 @@ import java.time.Instant; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; @@ -44,19 +45,19 @@ public class Game private PestControlPlugin plugin; - @Getter + @Getter(AccessLevel.PACKAGE) private Portal bluePortal = new Portal(PortalColor.BLUE, WidgetPortal.BLUE); - @Getter + @Getter(AccessLevel.PACKAGE) private Portal purplePortal = new Portal(PortalColor.PURPLE, WidgetPortal.PURPLE); - @Getter + @Getter(AccessLevel.PACKAGE) private Portal yellowPortal = new Portal(PortalColor.YELLOW, WidgetPortal.YELLOW); - @Getter + @Getter(AccessLevel.PACKAGE) private Portal redPortal = new Portal(PortalColor.RED, WidgetPortal.RED); - @Getter + @Getter(AccessLevel.PACKAGE) private int shieldsDropped = 0; // Game starts with all possible rotations @@ -103,7 +104,7 @@ public class Game } } - public void lowerPortalShield(String portalColor) + void lowerPortalShield(String portalColor) { switch (portalColor.toLowerCase()) { @@ -124,7 +125,7 @@ public class Game private void lowerPortalShield(Portal portal) { - if (!portal.isShielded()) + if (portal.isNotShielded()) { return; } @@ -149,7 +150,7 @@ public class Game possibleRotations = rotations.toArray(new PortalRotation[rotations.size()]); } - public void killPortal(Portal portal) + private void killPortal(Portal portal) { if (portal.isDead()) { @@ -185,7 +186,7 @@ public class Game return false; } - public void setPortalLocations(WorldPoint squireLocation) + private void setPortalLocations(WorldPoint squireLocation) { int x = squireLocation.getX(); int y = squireLocation.getY(); @@ -198,7 +199,7 @@ public class Game portalLocationsSet = true; } - public List getPortals() + List getPortals() { List portalList = new ArrayList(); @@ -210,7 +211,7 @@ public class Game return portalList; } - public Portal getPortal(PortalColor portalColor) + Portal getPortal(PortalColor portalColor) { if (bluePortal.getColor() == portalColor) { @@ -232,7 +233,7 @@ public class Game return null; } - public Collection getNextPortals() + Collection getNextPortals() { List portals = new ArrayList<>(); @@ -249,7 +250,7 @@ public class Game return portals; } - public Collection getActivePortals() + Collection getActivePortals() { List portals = new ArrayList<>(); @@ -264,7 +265,7 @@ public class Game return portals; } - public Duration getTimeTillNextPortal() + Duration getTimeTillNextPortal() { Instant nextShieldDrop; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/GangplankOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/GangplankOverlay.java index db8abe87b7..31191088bd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/GangplankOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/GangplankOverlay.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.pestcontrol; import com.google.inject.Inject; +import com.google.inject.Singleton; import java.awt.BasicStroke; import java.awt.Color; import java.awt.Dimension; @@ -43,17 +44,16 @@ import net.runelite.client.ui.overlay.tooltip.TooltipManager; import net.runelite.client.util.ColorUtil; @Slf4j +@Singleton public class GangplankOverlay extends Overlay { private final Client client; - private final PestControlConfig config; private final PestControlPlugin plugin; private final TooltipManager tooltipManager; @Inject - GangplankOverlay(Client client, PestControlConfig config, PestControlPlugin plugin, TooltipManager toolTipManager) + GangplankOverlay(final Client client, final PestControlPlugin plugin, final TooltipManager toolTipManager) { - this.config = config; this.plugin = plugin; this.client = client; this.tooltipManager = toolTipManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/HintArrowOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/HintArrowOverlay.java index 90c81228a1..b22798f57e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/HintArrowOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/HintArrowOverlay.java @@ -30,6 +30,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.NPC; import net.runelite.api.coords.WorldPoint; @@ -37,16 +38,15 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; +@Singleton public class HintArrowOverlay extends Overlay { - private final PestControlConfig config; private final PestControlPlugin plugin; private final Client client; @Inject - HintArrowOverlay(PestControlConfig config, PestControlPlugin plugin, Client client) + HintArrowOverlay(final PestControlPlugin plugin, final Client client) { - this.config = config; this.plugin = plugin; this.client = client; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightContext.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightContext.java index 56c51fdd8d..3dfaee777b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightContext.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightContext.java @@ -25,15 +25,16 @@ package net.runelite.client.plugins.pestcontrol; import java.awt.Color; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; import net.runelite.client.plugins.pestcontrol.config.NpcHighlightStyle; @AllArgsConstructor -@Getter -@Setter -public class NpcHighlightContext +@Getter(AccessLevel.PACKAGE) +@Setter(AccessLevel.PACKAGE) +class NpcHighlightContext { private NpcHighlightStyle npcRenderStyle; private Color color; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightOverlay.java index bb8e94c175..540134714b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightOverlay.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.pestcontrol; import com.google.inject.Inject; +import com.google.inject.Singleton; import java.awt.BasicStroke; import java.awt.Color; import java.awt.Dimension; @@ -43,16 +44,15 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; @Slf4j +@Singleton public class NpcHighlightOverlay extends Overlay { - private final PestControlConfig config; private final PestControlPlugin plugin; private final Client client; @Inject - NpcHighlightOverlay(PestControlConfig config, PestControlPlugin plugin, Client client) + NpcHighlightOverlay(final PestControlPlugin plugin, final Client client) { - this.config = config; this.plugin = plugin; this.client = client; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlNpc.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlNpc.java index e1b9ef143e..50ca737592 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlNpc.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlNpc.java @@ -26,13 +26,14 @@ package net.runelite.client.plugins.pestcontrol; import com.google.common.collect.ImmutableSet; import java.util.Set; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.NpcID; -@Getter +@Getter(AccessLevel.PACKAGE) public class PestControlNpc { - @Getter + @Getter(AccessLevel.PACKAGE) private static final Set splatterIdSet = ImmutableSet.of( NpcID.SPLATTER, NpcID.SPLATTER_1690, @@ -41,7 +42,7 @@ public class PestControlNpc NpcID.SPLATTER_1693 ); - @Getter + @Getter(AccessLevel.PACKAGE) public static final Set shifterIdSet = ImmutableSet.of( NpcID.SHIFTER, NpcID.SHIFTER_1695, @@ -55,7 +56,7 @@ public class PestControlNpc NpcID.SHIFTER_1703 ); - @Getter + @Getter(AccessLevel.PACKAGE) private static final Set spinnerIdSet = ImmutableSet.of( NpcID.SPINNER, NpcID.SPINNER_1710, @@ -64,7 +65,7 @@ public class PestControlNpc NpcID.SPINNER_1713 ); - @Getter + @Getter(AccessLevel.PACKAGE) private static final Set torcherIdSet = ImmutableSet.of( NpcID.TORCHER, NpcID.TORCHER_1715, @@ -78,7 +79,7 @@ public class PestControlNpc NpcID.TORCHER_1723 ); - @Getter + @Getter(AccessLevel.PACKAGE) private static final Set defilerIdSet = ImmutableSet.of( NpcID.DEFILER, NpcID.DEFILER_1725, @@ -92,7 +93,7 @@ public class PestControlNpc NpcID.DEFILER_1733 ); - @Getter + @Getter(AccessLevel.PACKAGE) private static final Set brawlerIdSet = ImmutableSet.of( NpcID.BRAWLER, NpcID.BRAWLER_1735, @@ -101,7 +102,7 @@ public class PestControlNpc NpcID.BRAWLER_1738 ); - @Getter + @Getter(AccessLevel.PACKAGE) private static final Set ravagerIdSet = ImmutableSet.of( NpcID.RAVAGER, NpcID.RAVAGER_1705, @@ -110,7 +111,7 @@ public class PestControlNpc NpcID.RAVAGER_1708 ); - @Getter + @Getter(AccessLevel.PACKAGE) private static final Set activePortalIdSet = ImmutableSet.of( NpcID.PORTAL_1747, // Novice Purple Active NpcID.PORTAL_1748, // Novice Blue Active @@ -122,7 +123,7 @@ public class PestControlNpc NpcID.PORTAL_1742 // Intermediate Red Active ); - @Getter + @Getter(AccessLevel.PACKAGE) private static final Set shieldedPortalIdSet = ImmutableSet.of( NpcID.PORTAL_1751, // Novice Purple Shielded NpcID.PORTAL_1752, // Novice Blue Shielded @@ -134,7 +135,7 @@ public class PestControlNpc NpcID.PORTAL_1746 // Intermediate Red Shielded ); - @Getter + @Getter(AccessLevel.PACKAGE) private static final Set purplePortalIdSet = ImmutableSet.of( NpcID.PORTAL_1747, // Novice Purple Active NpcID.PORTAL_1751, // Novice Purple Shielded @@ -142,7 +143,7 @@ public class PestControlNpc NpcID.PORTAL_1743 // Intermediate Purple Shielded ); - @Getter + @Getter(AccessLevel.PACKAGE) private static final Set bluePortalIdSet = ImmutableSet.of( NpcID.PORTAL_1748, // Novice Blue Active NpcID.PORTAL_1752, // Novice Blue Shielded @@ -150,7 +151,7 @@ public class PestControlNpc NpcID.PORTAL_1744 // Intermediate Blue Shielded ); - @Getter + @Getter(AccessLevel.PACKAGE) private static final Set yellowPortalIdSet = ImmutableSet.of( NpcID.PORTAL_1749, // Novice Yellow Active NpcID.PORTAL_1753, // Novice Yellow Shielded @@ -158,7 +159,7 @@ public class PestControlNpc NpcID.PORTAL_1745 // Intermediate Yellow Shielded ); - @Getter + @Getter(AccessLevel.PACKAGE) private static final Set redPortalIdSet = ImmutableSet.of( NpcID.PORTAL_1750, // Novice Red Active NpcID.PORTAL_1754, // Novice Red Shielded @@ -166,7 +167,7 @@ public class PestControlNpc NpcID.PORTAL_1746 // Intermediate Red Shielded ); - @Getter + @Getter(AccessLevel.PACKAGE) private static final Set ingameVoidKnightIdSet = ImmutableSet.of( NpcID.VOID_KNIGHT_2950, NpcID.VOID_KNIGHT_2951, @@ -174,85 +175,85 @@ public class PestControlNpc NpcID.VOID_KNIGHT_2953 ); - @Getter + @Getter(AccessLevel.PACKAGE) private static final Integer ingameSquireId = NpcID.SQUIRE_2949; - public static boolean isSplatterId(int npcId) + static boolean isSplatterId(int npcId) { return splatterIdSet.contains(npcId); } - public static boolean isShifterId(int npcId) + static boolean isShifterId(int npcId) { return shifterIdSet.contains(npcId); } - public static boolean isSpinnerId(int npcId) + static boolean isSpinnerId(int npcId) { return brawlerIdSet.contains(npcId); } - public static boolean isTorcherId(int npcId) + static boolean isTorcherId(int npcId) { return torcherIdSet.contains(npcId); } - public static boolean isDefilerId(int npcId) + static boolean isDefilerId(int npcId) { return defilerIdSet.contains(npcId); } - public static boolean isBrawlerId(int npcId) + static boolean isBrawlerId(int npcId) { return brawlerIdSet.contains(npcId); } - public static boolean isRavagerId(int npcId) + static boolean isRavagerId(int npcId) { return ravagerIdSet.contains(npcId); } - public static boolean isIngameVoidKnightId(int npcId) + static boolean isIngameVoidKnightId(int npcId) { return ingameVoidKnightIdSet.contains(npcId); } - public static boolean isIngameSquireId(int npcId) + static boolean isIngameSquireId(int npcId) { return ingameSquireId == npcId; } - public static boolean isPortalId(int npcId) + static boolean isPortalId(int npcId) { return (isActivePortalId(npcId) || isShieldedPortalId(npcId)); } - public static boolean isActivePortalId(int npcId) + static boolean isActivePortalId(int npcId) { return activePortalIdSet.contains(npcId); } - public static boolean isShieldedPortalId(int npcId) + private static boolean isShieldedPortalId(int npcId) { return shieldedPortalIdSet.contains(npcId); } - public static boolean isPurplePortalId(int npcId) + static boolean isPurplePortalId(int npcId) { return purplePortalIdSet.contains(npcId); } - public static boolean isBluePortalId(int npcId) + static boolean isBluePortalId(int npcId) { return bluePortalIdSet.contains(npcId); } - public static boolean isYellowPortalId(int npcId) + static boolean isYellowPortalId(int npcId) { return yellowPortalIdSet.contains(npcId); } - public static boolean isRedPortalId(int npcId) + static boolean isRedPortalId(int npcId) { return redPortalIdSet.contains(npcId); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java index d3095afd5a..3329f6f520 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java @@ -27,12 +27,15 @@ package net.runelite.client.plugins.pestcontrol; import com.google.inject.Inject; import com.google.inject.Provides; +import com.google.inject.Singleton; +import java.awt.Color; import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.ChatMessageType; @@ -71,6 +74,7 @@ import net.runelite.client.util.Text; description = "Show helpful information for the Pest Control minigame", tags = {"minigame", "overlay"} ) +@Singleton public class PestControlPlugin extends Plugin { private static final int VOID_KNIGHTS_OUTPOST = 10537; @@ -86,7 +90,7 @@ public class PestControlPlugin extends Plugin private final Pattern PURCHASE_PATTERN = Pattern.compile("Remaining Void Knight Commendation Points: ([0-9]+)"); @Inject - @Getter + @Getter(AccessLevel.PACKAGE) private Client client; @Inject @@ -99,15 +103,15 @@ public class PestControlPlugin extends Plugin private InfoBoxManager infoBoxManager; @Inject - @Getter + @Getter(AccessLevel.PACKAGE) private ItemManager itemManager; @Inject - @Getter + @Getter(AccessLevel.PACKAGE) private PestControlConfig config; @Inject - @Getter + @Getter(AccessLevel.PACKAGE) private WidgetOverlay widgetOverlay; @Inject @@ -128,25 +132,25 @@ public class PestControlPlugin extends Plugin @Inject private PortalWeaknessOverlay portalWeaknessOverlay; - @Getter + @Getter(AccessLevel.PACKAGE) private Game game; - @Getter + @Getter(AccessLevel.PACKAGE) private HashMap highlightedNpcList = new HashMap<>(); - @Getter + @Getter(AccessLevel.PACKAGE) private List highlightedRepairList = new ArrayList<>(); - @Getter + @Getter(AccessLevel.PACKAGE) private Tile noviceGangplankTile; - @Getter + @Getter(AccessLevel.PACKAGE) private Tile intermediateGangplankTile; - @Getter + @Getter(AccessLevel.PACKAGE) private Tile veteranGangplankTile; - @Getter + @Getter(AccessLevel.PACKAGE) private Integer commendationPoints; private String userConfigKey; @@ -155,6 +159,21 @@ public class PestControlPlugin extends Plugin private PointsInfoboxCounter pointsInfoboxCounter; + private boolean showHintArrow; + private boolean showPortalWeakness; + private boolean highlightGangplanks; + private HighlightPortalOption portalHighlight; + private Color activePortalColor; + private Color shieldedPortalColor; + private NpcHighlightStyle highlightSpinners; + private Color spinnerColor; + private NpcHighlightStyle highlightBrawlers; + private Color brawlerColor; + private boolean highlightRepairables; + @Getter(AccessLevel.PACKAGE) + private Color repairableColor; + private boolean showPoints; + private boolean showTimeTillNextPortal; @Provides PestControlConfig provideConfig(ConfigManager configManager) @@ -165,6 +184,7 @@ public class PestControlPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); loadPlugin(); } @@ -179,6 +199,7 @@ public class PestControlPlugin extends Plugin { if (configEvent.getGroup().equals("pestcontrol")) { + updateConfig(); unloadPlugin(); loadPlugin(); } @@ -210,53 +231,53 @@ public class PestControlPlugin extends Plugin overlayManager.add(widgetOverlay); - if (config.highlightSpinners() != NpcHighlightStyle.OFF) + if (this.highlightSpinners != NpcHighlightStyle.OFF) { for (Integer npcId : PestControlNpc.getSpinnerIdSet()) { highlightedNpcList.put(npcId, new NpcHighlightContext( - config.highlightSpinners(), - config.spinnerColor(), + this.highlightSpinners, + this.spinnerColor, true )); } } - if (config.highlightBrawlers() != NpcHighlightStyle.OFF) + if (this.highlightBrawlers != NpcHighlightStyle.OFF) { for (Integer npcId : PestControlNpc.getBrawlerIdSet()) { highlightedNpcList.put(npcId, new NpcHighlightContext( - config.highlightBrawlers(), - config.brawlerColor(), + this.highlightBrawlers, + this.brawlerColor, false )); } } - if (config.portalHighlight() != HighlightPortalOption.OFF) + if (this.portalHighlight != HighlightPortalOption.OFF) { - if (config.portalHighlight() == HighlightPortalOption.ACTIVE || - config.portalHighlight() == HighlightPortalOption.ALL) + if (this.portalHighlight == HighlightPortalOption.ACTIVE || + this.portalHighlight == HighlightPortalOption.ALL) { for (Integer portalNpcId : PestControlNpc.getActivePortalIdSet()) { highlightedNpcList.put(portalNpcId, new NpcHighlightContext( NpcHighlightStyle.HULL, - config.activePortalColor(), + this.activePortalColor, false )); } } - if (config.portalHighlight() == HighlightPortalOption.SHIELDED || - config.portalHighlight() == HighlightPortalOption.ALL) + if (this.portalHighlight == HighlightPortalOption.SHIELDED || + this.portalHighlight == HighlightPortalOption.ALL) { for (Integer portalNpcId : PestControlNpc.getShieldedPortalIdSet()) { highlightedNpcList.put(portalNpcId, new NpcHighlightContext( NpcHighlightStyle.HULL, - config.shieldedPortalColor(), + this.shieldedPortalColor, false )); } @@ -268,12 +289,12 @@ public class PestControlPlugin extends Plugin overlayManager.add(npcHighlightOverlay); } - if (config.highlightRepairables()) + if (this.highlightRepairables) { overlayManager.add(repairOverlay); } - if (config.showHintArrow()) + if (this.showHintArrow) { overlayManager.add(hintArrowOverlay); @@ -283,17 +304,17 @@ public class PestControlPlugin extends Plugin } } - if (config.highlightGangplanks()) + if (this.highlightGangplanks) { overlayManager.add(gangplankOverlay); } - if (config.showTimeTillNextPortal()) + if (this.showTimeTillNextPortal) { overlayManager.add(timerOverlay); } - if (config.showPortalWeakness()) + if (this.showPortalWeakness) { overlayManager.add(portalWeaknessOverlay); } @@ -314,7 +335,7 @@ public class PestControlPlugin extends Plugin highlightedNpcList.clear(); - if (game != null && config.showHintArrow() && client.hasHintArrow()) + if (game != null && this.showHintArrow && client.hasHintArrow()) { client.clearHintArrow(); } @@ -332,7 +353,7 @@ public class PestControlPlugin extends Plugin private void handlePointsInfoboxCounter() { - if (!config.showPoints()) + if (!this.showPoints) { return; } @@ -670,4 +691,22 @@ public class PestControlPlugin extends Plugin } return false; } + + private void updateConfig() + { + this.showHintArrow = config.showHintArrow(); + this.showPortalWeakness = config.showPortalWeakness(); + this.highlightGangplanks = config.highlightGangplanks(); + this.portalHighlight = config.portalHighlight(); + this.activePortalColor = config.activePortalColor(); + this.shieldedPortalColor = config.shieldedPortalColor(); + this.highlightSpinners = config.highlightSpinners(); + this.spinnerColor = config.spinnerColor(); + this.highlightBrawlers = config.highlightBrawlers(); + this.brawlerColor = config.brawlerColor(); + this.highlightRepairables = config.highlightRepairables(); + this.repairableColor = config.repairableColor(); + this.showPoints = config.showPoints(); + this.showTimeTillNextPortal = config.showTimeTillNextPortal(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlRepairObject.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlRepairObject.java index f3a8d457dd..a3b56e009d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlRepairObject.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlRepairObject.java @@ -26,13 +26,14 @@ package net.runelite.client.plugins.pestcontrol; import com.google.common.collect.ImmutableSet; import java.util.Set; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ObjectID; -@Getter -public class PestControlRepairObject +@Getter(AccessLevel.PACKAGE) +class PestControlRepairObject { - @Getter + @Getter(AccessLevel.PACKAGE) private static final Set repairableBarricades = ImmutableSet.of( //ObjectID.BARRICADE_14224, ObjectID.BARRICADE_14227, @@ -43,7 +44,7 @@ public class PestControlRepairObject ObjectID.BARRICADE_14232 ); - @Getter + @Getter(AccessLevel.PACKAGE) private static final Set repairableGates = ImmutableSet.of( ObjectID.GATE_14238, ObjectID.GATE_14239, @@ -58,17 +59,17 @@ public class PestControlRepairObject ObjectID.GATE_14248 ); - public static boolean isRepairableBarricadeId(int objectId) + static boolean isRepairableBarricadeId(int objectId) { return repairableBarricades.contains(objectId); } - public static boolean isRepairableGateId(int objectId) + static boolean isRepairableGateId(int objectId) { return repairableGates.contains(objectId); } - public static boolean isRepairableId(int objectId) + static boolean isRepairableId(int objectId) { return isRepairableBarricadeId(objectId) || isRepairableGateId(objectId); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PointsInfoboxCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PointsInfoboxCounter.java index 1fa3155625..8555abf745 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PointsInfoboxCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PointsInfoboxCounter.java @@ -27,13 +27,10 @@ package net.runelite.client.plugins.pestcontrol; import java.awt.image.BufferedImage; import net.runelite.client.ui.overlay.infobox.Counter; -public class PointsInfoboxCounter extends Counter +class PointsInfoboxCounter extends Counter { - private final PestControlPlugin plugin; - - PointsInfoboxCounter(BufferedImage image, PestControlPlugin plugin, int count) + PointsInfoboxCounter(final BufferedImage image, final PestControlPlugin plugin, final int count) { super(image, plugin, count); - this.plugin = plugin; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Portal.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Portal.java index 2ad85a24ea..466c125002 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Portal.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Portal.java @@ -25,12 +25,13 @@ */ package net.runelite.client.plugins.pestcontrol; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import net.runelite.api.coords.WorldPoint; -@Getter -@Setter +@Getter(AccessLevel.PACKAGE) +@Setter(AccessLevel.PACKAGE) class Portal { private PortalColor color; @@ -39,15 +40,15 @@ class Portal private PortalState portalState = PortalState.SHIELDED; - public Portal(PortalColor color, WidgetPortal widget) + Portal(final PortalColor color, final WidgetPortal widget) { this.color = color; this.widget = widget; } - public boolean isShielded() + boolean isNotShielded() { - return portalState == PortalState.SHIELDED; + return portalState != PortalState.SHIELDED; } public boolean isDead() @@ -57,6 +58,6 @@ class Portal public boolean isActive() { - return (!isShielded() && !isDead()); + return (isNotShielded() && !isDead()); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalColor.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalColor.java index 07e7336c0b..8eecadbe0e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalColor.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalColor.java @@ -24,9 +24,10 @@ */ package net.runelite.client.plugins.pestcontrol; +import lombok.AccessLevel; import lombok.Getter; -@Getter +@Getter(AccessLevel.PACKAGE) public enum PortalColor { BLUE, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalRotation.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalRotation.java index b49d536bb8..d74846c551 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalRotation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalRotation.java @@ -41,7 +41,7 @@ enum PortalRotation private final PortalColor[] portals; - PortalRotation(PortalColor first, PortalColor second, PortalColor third, PortalColor fourth) + PortalRotation(final PortalColor first, final PortalColor second, final PortalColor third, final PortalColor fourth) { portals = new PortalColor[] { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalWeaknessOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalWeaknessOverlay.java index e24363ec28..7f8d94148b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalWeaknessOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalWeaknessOverlay.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.pestcontrol; import com.google.inject.Inject; +import com.google.inject.Singleton; import java.awt.AlphaComposite; import java.awt.Composite; import java.awt.Dimension; @@ -46,11 +47,9 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; @Slf4j +@Singleton public class PortalWeaknessOverlay extends Overlay { - private int zOffset = 100; - - private final PestControlConfig config; private final PestControlPlugin plugin; private final Client client; @@ -62,14 +61,12 @@ public class PortalWeaknessOverlay extends Overlay @Inject PortalWeaknessOverlay( - PestControlConfig config, - PestControlPlugin plugin, - Client client, - ItemManager itemManager, - SkillIconManager skillIconManager + final PestControlPlugin plugin, + final Client client, + final ItemManager itemManager, + final SkillIconManager skillIconManager ) { - this.config = config; this.plugin = plugin; this.client = client; @@ -96,6 +93,7 @@ public class PortalWeaknessOverlay extends Overlay // We can use any image here as it's only needed to calculate the position + int zOffset = 100; return Perspective.getCanvasImageLocation(client, localLocation, magicImage, zOffset); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/RepairOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/RepairOverlay.java index a0ee3bf09f..458337fb33 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/RepairOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/RepairOverlay.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.pestcontrol; import com.google.inject.Inject; +import com.google.inject.Singleton; import java.awt.BasicStroke; import java.awt.Color; import java.awt.Dimension; @@ -43,18 +44,17 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; +@Singleton public class RepairOverlay extends Overlay { - private final PestControlConfig config; private final PestControlPlugin plugin; private final Client client; private static final int MAX_DISTANCE = 2400; @Inject - RepairOverlay(PestControlConfig config, PestControlPlugin plugin, Client client) + RepairOverlay(final PestControlPlugin plugin, final Client client) { - this.config = config; this.plugin = plugin; this.client = client; @@ -72,7 +72,7 @@ public class RepairOverlay extends Overlay Point mousePosition = client.getMouseCanvasPosition(); Scene scene = client.getScene(); - Color color = config.repairableColor(); + Color color = plugin.getRepairableColor(); Tile[][][] tiles = scene.getTiles(); int z = client.getPlane(); @@ -119,11 +119,6 @@ public class RepairOverlay extends Overlay GroundObject groundObject = tile.getGroundObject(); if (groundObject != null) { - if (groundObject == null) - { - continue; - } - if (PestControlRepairObject.isRepairableId(groundObject.getId())) { @@ -138,11 +133,6 @@ public class RepairOverlay extends Overlay WallObject wallObject = tile.getWallObject(); if (wallObject != null) { - if (wallObject == null) - { - continue; - } - if (PestControlRepairObject.isRepairableId(wallObject.getId())) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/TimerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/TimerOverlay.java index be45fc728e..3c118c1763 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/TimerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/TimerOverlay.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.pestcontrol; import com.google.inject.Inject; +import com.google.inject.Singleton; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; @@ -38,16 +39,15 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton public class TimerOverlay extends Overlay { - private final PestControlConfig config; private final PestControlPlugin plugin; private final Client client; @Inject - TimerOverlay(PestControlConfig config, PestControlPlugin plugin, Client client) + TimerOverlay(final PestControlPlugin plugin, final Client client) { - this.config = config; this.plugin = plugin; this.client = client; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/WidgetOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/WidgetOverlay.java index 38c1582e32..b2cf073201 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/WidgetOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/WidgetOverlay.java @@ -32,6 +32,7 @@ import java.awt.FontMetrics; import java.awt.Graphics2D; import java.awt.geom.Rectangle2D; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.widgets.Widget; @@ -41,6 +42,7 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; @Slf4j +@Singleton public class WidgetOverlay extends Overlay { private final Client client; @@ -48,7 +50,7 @@ public class WidgetOverlay extends Overlay private final PestControlPlugin plugin; @Inject - public WidgetOverlay(Client client, PestControlPlugin plugin) + public WidgetOverlay(final Client client, final PestControlPlugin plugin) { this.plugin = plugin; this.client = client; @@ -57,7 +59,7 @@ public class WidgetOverlay extends Overlay setLayer(OverlayLayer.ABOVE_SCENE); } - public Integer getPortalHitpoints(PortalColor color) + Integer getPortalHitpoints(PortalColor color) { if (plugin.getGame() == null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/WidgetPortal.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/WidgetPortal.java index 7570cfb87f..f219a2425f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/WidgetPortal.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/WidgetPortal.java @@ -24,13 +24,14 @@ */ package net.runelite.client.plugins.pestcontrol; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.ToString; import net.runelite.api.widgets.WidgetInfo; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) @ToString enum WidgetPortal { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsConfig.java index 44da3efac0..af35be900e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsConfig.java @@ -35,10 +35,10 @@ import net.runelite.client.config.Stub; public interface PileIndicatorsConfig extends Config { @ConfigItem( - keyName = "playerPilesStub", - name = "Player Piles", - description = "", - position = 0 + keyName = "playerPilesStub", + name = "Player Piles", + description = "", + position = 0 ) default Stub playerPilesStub() { @@ -46,11 +46,11 @@ public interface PileIndicatorsConfig extends Config } @ConfigItem( - position = 1, - keyName = "enablePlayers", - name = "Enable Player Piling", - description = "Enable the option to highlight players when they pile.", - parent = "playerPilesStub" + position = 1, + keyName = "enablePlayers", + name = "Enable Player Piling", + description = "Enable the option to highlight players when they pile.", + parent = "playerPilesStub" ) default boolean enablePlayers() { @@ -58,11 +58,11 @@ public interface PileIndicatorsConfig extends Config } @ConfigItem( - position = 2, - keyName = "wildyOnlyPlayer", - name = "Wilderness Only", - description = "Show player piling only when in the Wilderness.", - parent = "playerPilesStub" + position = 2, + keyName = "wildyOnlyPlayer", + name = "Wilderness Only", + description = "Show player piling only when in the Wilderness.", + parent = "playerPilesStub" ) default boolean wildyOnlyPlayer() { @@ -70,11 +70,11 @@ public interface PileIndicatorsConfig extends Config } @ConfigItem( - position = 3, - keyName = "playerPileColor", - name = "Player Pile Color", - description = "Color used for player piles.", - parent = "playerPilesStub" + position = 3, + keyName = "playerPileColor", + name = "Player Pile Color", + description = "Color used for player piles.", + parent = "playerPilesStub" ) default Color playerPileColor() { @@ -82,10 +82,10 @@ public interface PileIndicatorsConfig extends Config } @ConfigItem( - keyName = "npcPilesStub", - name = "NPC Piles", - description = "", - position = 4 + keyName = "npcPilesStub", + name = "NPC Piles", + description = "", + position = 4 ) default Stub npcPilesStub() { @@ -93,11 +93,11 @@ public interface PileIndicatorsConfig extends Config } @ConfigItem( - position = 5, - keyName = "enableNPCS", - name = "Enable NPC Piling", - description = "Enable the option to highlight NPCs when they pile.", - parent = "npcPilesStub" + position = 5, + keyName = "enableNPCS", + name = "Enable NPC Piling", + description = "Enable the option to highlight NPCs when they pile.", + parent = "npcPilesStub" ) default boolean enableNPCS() { @@ -105,11 +105,11 @@ public interface PileIndicatorsConfig extends Config } @ConfigItem( - position = 6, - keyName = "npcPileColor", - name = "NPC Pile Color", - description = "Color used for NPC piles.", - parent = "npcPilesStub" + position = 6, + keyName = "npcPileColor", + name = "NPC Pile Color", + description = "Color used for NPC piles.", + parent = "npcPilesStub" ) default Color npcPileColor() { @@ -117,10 +117,10 @@ public interface PileIndicatorsConfig extends Config } @ConfigItem( - keyName = "mixedPilesStub", - name = "Mixed Piles", - description = "", - position = 7 + keyName = "mixedPilesStub", + name = "Mixed Piles", + description = "", + position = 7 ) default Stub mixedPilesStub() { @@ -128,11 +128,11 @@ public interface PileIndicatorsConfig extends Config } @ConfigItem( - position = 8, - keyName = "mixedPileColor", - name = "Mixed Pile Color", - description = "Color used for mixed piles.", - parent = "mixedPilesStub" + position = 8, + keyName = "mixedPileColor", + name = "Mixed Pile Color", + description = "Color used for mixed piles.", + parent = "mixedPilesStub" ) default Color mixedPileColor() { @@ -140,10 +140,10 @@ public interface PileIndicatorsConfig extends Config } @ConfigItem( - keyName = "pilesSizeStub", - name = "Pile size", - description = "", - position = 9 + keyName = "pilesSizeStub", + name = "Pile size", + description = "", + position = 9 ) default Stub pilesSizeStub() { @@ -151,14 +151,14 @@ public interface PileIndicatorsConfig extends Config } @Range( - min = 2 + min = 2 ) @ConfigItem( - position = 10, - keyName = "minimumPileSize", - name = "Minimum Pile Size", - description = "Any pile under this size will not show up. (Minimum: 2)", - parent = "pilesSizeStub" + position = 10, + keyName = "minimumPileSize", + name = "Minimum Pile Size", + description = "Any pile under this size will not show up. (Minimum: 2)", + parent = "pilesSizeStub" ) default int minimumPileSize() { @@ -166,10 +166,10 @@ public interface PileIndicatorsConfig extends Config } @ConfigItem( - keyName = "miscellaneousStub", - name = "Miscellaneous", - description = "", - position = 11 + keyName = "miscellaneousStub", + name = "Miscellaneous", + description = "", + position = 11 ) default Stub miscellaneousStub() { @@ -177,11 +177,11 @@ public interface PileIndicatorsConfig extends Config } @ConfigItem( - position = 12, - keyName = "numberOnly", - name = "Display Number Only", - description = "Shorten \"PILE SIZE: 1\" to \"1\"", - parent = "miscellaneousStub" + position = 12, + keyName = "numberOnly", + name = "Display Number Only", + description = "Shorten \"PILE SIZE: 1\" to \"1\"", + parent = "miscellaneousStub" ) default boolean numberOnly() { @@ -189,11 +189,11 @@ public interface PileIndicatorsConfig extends Config } @ConfigItem( - position = 13, - keyName = "drawPileTile", - name = "Draw Pile Tile", - description = "Draws the tile of the pile for best visibility.", - parent = "miscellaneousStub" + position = 13, + keyName = "drawPileTile", + name = "Draw Pile Tile", + description = "Draws the tile of the pile for best visibility.", + parent = "miscellaneousStub" ) default boolean drawPileTile() { @@ -201,11 +201,11 @@ public interface PileIndicatorsConfig extends Config } @ConfigItem( - position = 14, - keyName = "drawPileHull", - name = "Draw Pile Convex Hull", - description = "Draws the hull of the pile for best visibility.", - parent = "miscellaneousStub" + position = 14, + keyName = "drawPileHull", + name = "Draw Pile Convex Hull", + description = "Draws the hull of the pile for best visibility.", + parent = "miscellaneousStub" ) default boolean drawPileHull() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsOverlay.java index 1479c1f2fa..a1d69ccff2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsOverlay.java @@ -24,39 +24,35 @@ package net.runelite.client.plugins.pileindicators; -import net.runelite.api.Actor; -import net.runelite.api.Client; - -import javax.inject.Inject; -import java.awt.*; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Graphics2D; import java.util.ArrayList; +import javax.inject.Inject; +import javax.inject.Singleton; +import net.runelite.api.Actor; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton public class PileIndicatorsOverlay extends Overlay { - - private final Client client; private final PileIndicatorsPlugin plugin; - private final PileIndicatorsConfig config; @Inject - PileIndicatorsOverlay(final Client client, final PileIndicatorsPlugin plugin, final PileIndicatorsConfig config) + PileIndicatorsOverlay(final PileIndicatorsPlugin plugin) { super(plugin); - this.client = client; this.plugin = plugin; - this.config = config; setLayer(OverlayLayer.ABOVE_SCENE); setPosition(OverlayPosition.DYNAMIC); setPriority(OverlayPriority.HIGH); } - @Override public Dimension render(Graphics2D graphics) { @@ -73,12 +69,12 @@ public class PileIndicatorsOverlay extends Overlay { Actor actorToRender = actorArrayList.get(0); //guaranteed to have at least two players final String pileTypeStr = pileType == PileType.PLAYER_PILE ? "PLAYER" : pileType == PileType.NPC_PILE ? "NPC" : pileType == PileType.MIXED_PILE ? "MIXED" : ""; - final String text = config.numberOnly() ? "" + actorArrayList.size() : (pileTypeStr + " PILE SIZE: " + actorArrayList.size()); - if (config.drawPileTile()) + final String text = plugin.isNumberOnly() ? "" + actorArrayList.size() : (pileTypeStr + " PILE SIZE: " + actorArrayList.size()); + if (plugin.isDrawPileTile()) { OverlayUtil.renderPolygon(graphics, actorToRender.getCanvasTilePoly(), pileColor); } - if (config.drawPileHull()) + if (plugin.isDrawPileHull()) { OverlayUtil.renderPolygon(graphics, actorToRender.getConvexHull(), pileColor); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java index 2afa035caa..32e04d6612 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java @@ -24,31 +24,33 @@ package net.runelite.client.plugins.pileindicators; -import com.google.inject.Binder; import com.google.inject.Provides; +import java.awt.Color; +import java.util.ArrayList; +import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Actor; import net.runelite.api.Client; import net.runelite.api.NPC; import net.runelite.api.Player; import net.runelite.api.Varbits; +import net.runelite.api.events.ConfigChanged; import net.runelite.client.config.ConfigManager; +import net.runelite.client.eventbus.Subscribe; 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 javax.inject.Inject; -import javax.inject.Singleton; -import java.awt.*; -import java.util.ArrayList; - @PluginDescriptor( - name = "Pile Indicators", - description = "Highlight and count how many npcs/players are stacked on each other.", - tags = {"overlay", "pile", "stack", "pvp", "pvm", "pve"}, - type = PluginType.UTILITY, - enabledByDefault = false + name = "Pile Indicators", + description = "Highlight and count how many npcs/players are stacked on each other.", + tags = {"overlay", "pile", "stack", "pvp", "pvm", "pve"}, + type = PluginType.UTILITY, + enabledByDefault = false ) @Singleton @@ -68,20 +70,30 @@ public class PileIndicatorsPlugin extends Plugin @Inject private PileIndicatorsOverlay overlay; + private boolean enablePlayers; + private boolean wildyOnlyPlayer; + private Color playerPileColor; + private boolean enableNPCS; + private Color npcPileColor; + private Color mixedPileColor; + private int minimumPileSize; + @Getter(AccessLevel.PACKAGE) + private boolean numberOnly; + @Getter(AccessLevel.PACKAGE) + private boolean drawPileTile; + @Getter(AccessLevel.PACKAGE) + private boolean drawPileHull; + @Provides PileIndicatorsConfig provideConfig(ConfigManager configManager) { return configManager.getConfig(PileIndicatorsConfig.class); } - @Override - public void configure(Binder binder) - { - } - @Override protected void startUp() throws Exception { + updateConfig(); overlayManager.add(overlay); } @@ -91,13 +103,13 @@ public class PileIndicatorsPlugin extends Plugin overlayManager.remove(overlay); } - protected ArrayList> getStacks() + ArrayList> getStacks() { ArrayList> outerArrayList = new ArrayList<>(); ArrayList pileList = new ArrayList<>(); - if (config.enableNPCS()) + if (this.enableNPCS) { for (NPC npc : client.getNpcs()) { @@ -108,9 +120,9 @@ public class PileIndicatorsPlugin extends Plugin } } - if (config.enablePlayers()) + if (this.enablePlayers) { - if ((client.getVar(Varbits.IN_WILDERNESS) > 0 && config.wildyOnlyPlayer()) ^ (!config.wildyOnlyPlayer())) + if ((client.getVar(Varbits.IN_WILDERNESS) > 0 && this.wildyOnlyPlayer) ^ (!this.wildyOnlyPlayer)) { for (Player player : client.getPlayers()) { @@ -140,7 +152,7 @@ public class PileIndicatorsPlugin extends Plugin } } } - if (potentialStackArrayList.size() >= config.minimumPileSize()) + if (potentialStackArrayList.size() >= this.minimumPileSize) { outerArrayList.add(potentialStackArrayList); } @@ -149,21 +161,21 @@ public class PileIndicatorsPlugin extends Plugin return outerArrayList.size() != 0 ? outerArrayList : null; } - protected Color getColorByPileType(PileType pileType) + Color getColorByPileType(PileType pileType) { switch (pileType) { case PLAYER_PILE: - return config.playerPileColor(); + return this.playerPileColor; case NPC_PILE: - return config.npcPileColor(); + return this.npcPileColor; case MIXED_PILE: - return config.mixedPileColor(); + return this.mixedPileColor; } return null; } - protected PileType getPileType(ArrayList pile) + PileType getPileType(ArrayList pile) { PileType pileType = null; @@ -188,4 +200,29 @@ public class PileIndicatorsPlugin extends Plugin } return pileType; } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("pileindicators")) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.enablePlayers = config.enablePlayers(); + this.wildyOnlyPlayer = config.wildyOnlyPlayer(); + this.playerPileColor = config.playerPileColor(); + this.enableNPCS = config.enableNPCS(); + this.npcPileColor = config.npcPileColor(); + this.mixedPileColor = config.mixedPileColor(); + this.minimumPileSize = config.minimumPileSize(); + this.numberOnly = config.numberOnly(); + this.drawPileTile = config.drawPileTile(); + this.drawPileHull = config.drawPileHull(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsConfig.java index 47ce1fd775..754fa73414 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsConfig.java @@ -210,17 +210,17 @@ public interface PlayerIndicatorsConfig extends Config return false; } - @ConfigItem( - position = 16, - keyName = "highlightOverheadTargets", - name = "Highlights attackable players over their head", - description = "Highlights players over their head that the current player can attack based on combat/wilderness levels", - group = "Target Indicator" - ) - default boolean highlightOverheadTargets() - { - return false; - } +// @ConfigItem( +// position = 16, +// keyName = "highlightOverheadTargets", +// name = "Highlights attackable players over their head", +// description = "Highlights players over their head that the current player can attack based on combat/wilderness levels", +// group = "Target Indicator" +// ) +// default boolean highlightOverheadTargets() +// { +// return false; +// } @ConfigItem( position = 17, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsMinimapOverlay.java index e356d9b5f2..b8be4f674d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsMinimapOverlay.java @@ -45,14 +45,14 @@ import net.runelite.client.util.ImageUtil; public class PlayerIndicatorsMinimapOverlay extends Overlay { private final PlayerIndicatorsService playerIndicatorsService; - private final PlayerIndicatorsConfig config; + private final PlayerIndicatorsPlugin plugin; private final BufferedImage skullIcon = ImageUtil.getResourceStreamFromClass(PlayerIndicatorsPlugin.class, "skull.png"); @Inject - private PlayerIndicatorsMinimapOverlay(PlayerIndicatorsConfig config, PlayerIndicatorsService playerIndicatorsService) + private PlayerIndicatorsMinimapOverlay(final PlayerIndicatorsPlugin plugin, final PlayerIndicatorsService playerIndicatorsService) { - this.config = config; + this.plugin = plugin; this.playerIndicatorsService = playerIndicatorsService; setLayer(OverlayLayer.ABOVE_WIDGETS); setPosition(OverlayPosition.DYNAMIC); @@ -68,7 +68,7 @@ public class PlayerIndicatorsMinimapOverlay extends Overlay private void renderPlayerOverlay(Graphics2D graphics, Player actor, Color color) { - if (config.drawMinimapNames()) + if (plugin.isDrawMinimapNames()) { String name = actor.getName().replace('\u00A0', ' '); String tag = ""; @@ -84,20 +84,17 @@ public class PlayerIndicatorsMinimapOverlay extends Overlay if (minimapLocation != null) { - if (config.showCombatLevel()) + if (plugin.isShowCombatLevel()) { - if (config.showCombatLevel()) - { - name += "-(" + actor.getCombatLevel() + ")"; - } + name += "-(" + actor.getCombatLevel() + ")"; } - if (config.drawMinimapNames()) + if (plugin.isDrawMinimapNames()) { - if (actor.getSkullIcon() != null && config.playerSkull() && actor.getSkullIcon() == SkullIcon.SKULL) + if (actor.getSkullIcon() != null && plugin.isPlayerSkull() && actor.getSkullIcon() == SkullIcon.SKULL) { int width = graphics.getFontMetrics().stringWidth(name); int height = graphics.getFontMetrics().getHeight(); - if (config.skullLocation().equals(PlayerIndicatorsPlugin.MinimapSkullLocations.AFTER_NAME)) + if (plugin.getSkullLocation().equals(PlayerIndicatorsPlugin.MinimapSkullLocations.AFTER_NAME)) { OverlayUtil.renderImageLocation(graphics, new Point(minimapLocation.getX() + width, minimapLocation.getY() - height), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java index bd9d0bed03..8e4bc9aa9f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java @@ -57,8 +57,8 @@ public class PlayerIndicatorsOverlay extends Overlay private static final int ACTOR_HORIZONTAL_TEXT_MARGIN = 10; private final PlayerIndicatorsService playerIndicatorsService; - private final PlayerIndicatorsConfig config; private final ClanManager clanManager; + private final PlayerIndicatorsPlugin plugin; private final BufferedImage skullIcon = ImageUtil.getResourceStreamFromClass(PlayerIndicatorsPlugin.class, "skull.png"); @Inject @@ -69,10 +69,10 @@ public class PlayerIndicatorsOverlay extends Overlay private ItemManager itemManager; @Inject - private PlayerIndicatorsOverlay(PlayerIndicatorsConfig config, PlayerIndicatorsService playerIndicatorsService, - ClanManager clanManager) + private PlayerIndicatorsOverlay(final PlayerIndicatorsPlugin plugin, final PlayerIndicatorsService playerIndicatorsService, + final ClanManager clanManager) { - this.config = config; + this.plugin = plugin; this.playerIndicatorsService = playerIndicatorsService; this.clanManager = clanManager; setPosition(OverlayPosition.DYNAMIC); @@ -88,7 +88,7 @@ public class PlayerIndicatorsOverlay extends Overlay private void renderPlayerOverlay(Graphics2D graphics, Player actor, Color color) { - final PlayerNameLocation drawPlayerNamesConfig = config.playerNamePosition(); + final PlayerNameLocation drawPlayerNamesConfig = plugin.getPlayerNamePosition(); if (drawPlayerNamesConfig == PlayerNameLocation.DISABLED) { return; @@ -125,7 +125,7 @@ public class PlayerIndicatorsOverlay extends Overlay return; } - if (config.showClanRanks() && actor.isClanMember()) + if (plugin.isShowClanRanks() && actor.isClanMember()) { final ClanMemberRank rank = clanManager.getRank(name); @@ -168,18 +168,18 @@ public class PlayerIndicatorsOverlay extends Overlay name += tag; } - if (config.highlightCallers() && playerIndicatorsPlugin.isCaller(actor)) + if (plugin.isHighlightCallers() && playerIndicatorsPlugin.isCaller(actor)) { name = "[C] " + name; } - if (config.showCombatLevel()) + if (plugin.isShowCombatLevel()) { OverlayUtil.renderTextLocation(graphics, textLocation, name + " (" + actor.getCombatLevel() + ")", color); } - if (config.targetRisk() && PvPUtil.isAttackable(client, actor) && actor.getPlayerAppearance() != null) + if (plugin.isTargetRisk() && PvPUtil.isAttackable(client, actor) && actor.getPlayerAppearance() != null) { long totalValue = 0; int newValue; @@ -200,7 +200,7 @@ public class PlayerIndicatorsOverlay extends Overlay name = name + stringBuilder; } } - if (config.unchargedGlory() && actor.getPlayerAppearance() != null) + if (plugin.isUnchargedGlory() && actor.getPlayerAppearance() != null) { ItemDefinition itemComposition = itemManager.getItemDefinition(actor.getPlayerAppearance().getEquipmentId(KitType.AMULET)); if (itemComposition != null && itemComposition.getId() == 1704) //1704 is uncharged glory, to be certain @@ -209,11 +209,11 @@ public class PlayerIndicatorsOverlay extends Overlay } } - if (actor.getSkullIcon() != null && config.playerSkull() && actor.getSkullIcon() == SkullIcon.SKULL) + if (actor.getSkullIcon() != null && plugin.isPlayerSkull() && actor.getSkullIcon() == SkullIcon.SKULL) { int width = graphics.getFontMetrics().stringWidth(name); int height = graphics.getFontMetrics().getHeight(); - if (config.skullLocation().equals(PlayerIndicatorsPlugin.MinimapSkullLocations.AFTER_NAME)) + if (plugin.getSkullLocation().equals(PlayerIndicatorsPlugin.MinimapSkullLocations.AFTER_NAME)) { OverlayUtil.renderImageLocation(graphics, new Point(textLocation.getX() + width, textLocation.getY() - height), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java index 12358a2273..90ee0fb013 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java @@ -28,8 +28,10 @@ import com.google.inject.Provides; import java.awt.Color; import java.util.ArrayList; import java.util.Arrays; -import java.util.List; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; import net.runelite.api.ClanMember; import net.runelite.api.ClanMemberRank; import static net.runelite.api.ClanMemberRank.UNRANKED; @@ -67,6 +69,7 @@ import net.runelite.client.util.PvPUtil; description = "Highlight players on-screen and/or on the minimap", tags = {"highlight", "minimap", "overlay", "players", "pklite"} ) +@Singleton public class PlayerIndicatorsPlugin extends Plugin { @Inject @@ -90,6 +93,60 @@ public class PlayerIndicatorsPlugin extends Plugin @Inject private ClanManager clanManager; + @Getter(AccessLevel.PACKAGE) + private boolean highlightOwnPlayer; + @Getter(AccessLevel.PACKAGE) + private Color getOwnPlayerColor; + @Getter(AccessLevel.PACKAGE) + private boolean highlightFriends; + @Getter(AccessLevel.PACKAGE) + private Color getFriendColor; + @Getter(AccessLevel.PACKAGE) + private boolean drawClanMemberNames; + @Getter(AccessLevel.PACKAGE) + private Color getClanMemberColor; + @Getter(AccessLevel.PACKAGE) + private boolean highlightTeamMembers; + @Getter(AccessLevel.PACKAGE) + private Color getTeamMemberColor; + @Getter(AccessLevel.PACKAGE) + private boolean highlightNonClanMembers; + @Getter(AccessLevel.PACKAGE) + private Color getNonClanMemberColor; + @Getter(AccessLevel.PACKAGE) + private boolean drawTiles; + @Getter(AccessLevel.PACKAGE) + private PlayerNameLocation playerNamePosition; + @Getter(AccessLevel.PACKAGE) + private boolean drawMinimapNames; + private boolean colorPlayerMenu; + @Getter(AccessLevel.PACKAGE) + private boolean showClanRanks; + @Getter(AccessLevel.PACKAGE) + private boolean highlightTargets; + @Getter(AccessLevel.PACKAGE) + private Color getTargetColor; + @Getter(AccessLevel.PACKAGE) + private boolean showCombatLevel; + @Getter(AccessLevel.PACKAGE) + private boolean playerSkull; + @Getter(AccessLevel.PACKAGE) + private PlayerIndicatorsPlugin.MinimapSkullLocations skullLocation; + @Getter(AccessLevel.PACKAGE) + private boolean skulledTargetsOnly; + @Getter(AccessLevel.PACKAGE) + private boolean targetRisk; + private boolean useClanchatRanks; + private ClanMemberRank callerRank; + @Getter(AccessLevel.PACKAGE) + private String configCallers; + @Getter(AccessLevel.PACKAGE) + private boolean highlightCallers; + @Getter(AccessLevel.PACKAGE) + private Color callerColor; + @Getter(AccessLevel.PACKAGE) + private boolean unchargedGlory; + @Provides PlayerIndicatorsConfig provideConfig(ConfigManager configManager) { @@ -99,6 +156,8 @@ public class PlayerIndicatorsPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(playerIndicatorsOverlay); overlayManager.add(playerIndicatorsTileOverlay); overlayManager.add(playerIndicatorsMinimapOverlay); @@ -114,12 +173,18 @@ public class PlayerIndicatorsPlugin extends Plugin } private ArrayList callers = new ArrayList<>(); - private List pileList; @Subscribe - public void onConfigChanged(ConfigChanged e) + public void onConfigChanged(ConfigChanged event) { - if (config.callers() != null && !config.callers().trim().equals("")) + if (!event.getGroup().equals("playerindicators")) + { + return; + } + + updateConfig(); + + if (this.configCallers != null && !this.configCallers.trim().equals("")) { getCallerList(); } @@ -140,28 +205,27 @@ public class PlayerIndicatorsPlugin extends Plugin private void getCallerList() { callers.clear(); - if (config.useClanchatRanks() && client.getClanMembers() != null) + if (this.useClanchatRanks && client.getClanMembers() != null) { for (ClanMember clanMember : client.getClanMembers()) { - if (clanMember.getRank().getValue() > config.callerRank().getValue()) + if (clanMember.getRank().getValue() > this.callerRank.getValue()) { callers.add(clanMember.getUsername()); } } } - if (config.callers().contains(",")) + if (this.configCallers.contains(",")) { - callers.addAll(Arrays.asList(config.callers().split(","))); + callers.addAll(Arrays.asList(this.configCallers.split(","))); } else { - if (!config.callers().equals("") || config.callers().length() > 1) + if (!this.configCallers.equals("")) { - callers.add(config.callers()); + callers.add(this.configCallers); } } - pileList = Arrays.asList(new String[callers.size()]); } boolean isCaller(Player player) @@ -223,13 +287,13 @@ public class PlayerIndicatorsPlugin extends Plugin int image2 = -1; Color color = null; - if (config.colorPlayerMenu() && client.isFriended(player.getName(), false)) + if (this.colorPlayerMenu && client.isFriended(player.getName(), false)) { - color = config.getFriendColor(); + color = this.getFriendColor; } - else if (config.colorPlayerMenu() && player.isClanMember()) + else if (this.colorPlayerMenu && player.isClanMember()) { - color = config.getClanMemberColor(); + color = this.getClanMemberColor; ClanMemberRank rank = clanManager.getRank(player.getName()); if (rank != UNRANKED) @@ -237,21 +301,21 @@ public class PlayerIndicatorsPlugin extends Plugin image = clanManager.getIconNumber(rank); } } - else if (config.colorPlayerMenu() && player.getTeam() > 0 && localPlayer.getTeam() == player.getTeam()) + else if (this.colorPlayerMenu && player.getTeam() > 0 && localPlayer.getTeam() == player.getTeam()) { - color = config.getTeamMemberColor(); + color = this.getTeamMemberColor; } - else if (config.highlightNonClanMembers() && !player.isClanMember() && !player.isFriend() && !PvPUtil.isAttackable(client, player)) + else if (this.highlightNonClanMembers && !player.isClanMember() && !player.isFriend() && !PvPUtil.isAttackable(client, player)) { - color = config.getNonClanMemberColor(); + color = this.getNonClanMemberColor; } - else if (config.colorPlayerMenu() && !player.isClanMember() && client.isFriended(player.getName(), false) && PvPUtil.isAttackable(client, player)) + else if (this.colorPlayerMenu && !player.isClanMember() && client.isFriended(player.getName(), false) && PvPUtil.isAttackable(client, player)) { - color = config.getTargetColor(); + color = this.getTargetColor; } - else if (config.colorPlayerMenu() && PvPUtil.isAttackable(client, player) && !player.isClanMember() && !player.isFriend()) + else if (this.colorPlayerMenu && PvPUtil.isAttackable(client, player) && !player.isClanMember() && !player.isFriend()) { - color = config.getTargetColor(); + color = this.getTargetColor; } /* if (config.rightClickOverhead() && !player.isClanMember() && player.getOverheadIcon() != null) { @@ -280,13 +344,13 @@ public class PlayerIndicatorsPlugin extends Plugin image = 34; } }*/ - if (config.playerSkull() && !player.isClanMember() && player.getSkullIcon() != null) + if (this.playerSkull && !player.isClanMember() && player.getSkullIcon() != null) { image2 = 35; } - if (config.colorPlayerMenu() && config.highlightCallers() && this.isCaller(player)) + if (this.colorPlayerMenu && this.highlightCallers && this.isCaller(player)) { - color = config.callerColor(); + color = this.callerColor; } if (image != -1 || color != null) { @@ -294,7 +358,7 @@ public class PlayerIndicatorsPlugin extends Plugin MenuEntry lastEntry = menuEntries[menuEntries.length - 1]; - if (color != null && config.colorPlayerMenu()) + if (color != null && this.colorPlayerMenu) { // strip out existing "); }*/ - if (image2 != -1 && config.playerSkull()) + if (image2 != -1 && this.playerSkull) { lastEntry.setTarget("" + lastEntry.getTarget()); } @@ -326,4 +390,36 @@ public class PlayerIndicatorsPlugin extends Plugin BEFORE_NAME, AFTER_NAME } + + private void updateConfig() + { + this.highlightOwnPlayer = config.highlightOwnPlayer(); + this.getOwnPlayerColor = config.getOwnPlayerColor(); + this.highlightFriends = config.highlightFriends(); + this.getFriendColor = config.getFriendColor(); + this.drawClanMemberNames = config.drawClanMemberNames(); + this.getClanMemberColor = config.getClanMemberColor(); + this.highlightTeamMembers = config.highlightTeamMembers(); + this.getTeamMemberColor = config.getTeamMemberColor(); + this.highlightNonClanMembers = config.highlightNonClanMembers(); + this.getNonClanMemberColor = config.getNonClanMemberColor(); + this.drawTiles = config.drawTiles(); + this.playerNamePosition = config.playerNamePosition(); + this.drawMinimapNames = config.drawMinimapNames(); + this.colorPlayerMenu = config.colorPlayerMenu(); + this.showClanRanks = config.showClanRanks(); + this.highlightTargets = config.highlightTargets(); + this.getTargetColor = config.getTargetColor(); + this.showCombatLevel = config.showCombatLevel(); + this.playerSkull = config.playerSkull(); + this.skullLocation = config.skullLocation(); + this.skulledTargetsOnly = config.skulledTargetsOnly(); + this.targetRisk = config.targetRisk(); + this.useClanchatRanks = config.useClanchatRanks(); + this.callerRank = config.callerRank(); + this.configCallers = config.callers(); + this.highlightCallers = config.highlightCallers(); + this.callerColor = config.callerColor(); + this.unchargedGlory = config.unchargedGlory(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java index 51717af33f..90e224a044 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java @@ -36,21 +36,19 @@ import net.runelite.client.util.PvPUtil; public class PlayerIndicatorsService { private final Client client; - private final PlayerIndicatorsConfig config; - private final PlayerIndicatorsPlugin playerIndicatorsPlugin; + private final PlayerIndicatorsPlugin plugin; @Inject - private PlayerIndicatorsService(Client client, PlayerIndicatorsConfig config, PlayerIndicatorsPlugin plugin) + private PlayerIndicatorsService(final Client client, final PlayerIndicatorsPlugin plugin) { - this.config = config; this.client = client; - this.playerIndicatorsPlugin = plugin; + this.plugin = plugin; } public void forEachPlayer(final BiConsumer consumer) { - if (!config.highlightOwnPlayer() && !config.drawClanMemberNames() - && !config.highlightFriends() && !config.highlightNonClanMembers() && !config.highlightTargets() && !config.highlightCallers() && !config.highlightTeamMembers()) + if (!plugin.isHighlightOwnPlayer() && !plugin.isDrawClanMemberNames() + && !plugin.isHighlightFriends() && !plugin.isHighlightNonClanMembers() && !plugin.isHighlightTargets() && !plugin.isHighlightCallers() && !plugin.isHighlightTeamMembers()) { return; } @@ -68,43 +66,43 @@ public class PlayerIndicatorsService if (player == localPlayer) { - if (config.highlightOwnPlayer()) + if (plugin.isHighlightOwnPlayer()) { - consumer.accept(player, config.getOwnPlayerColor()); + consumer.accept(player, plugin.getGetOwnPlayerColor()); } } - else if (config.highlightFriends() && client.isFriended(player.getName(), false)) + else if (plugin.isHighlightFriends() && client.isFriended(player.getName(), false)) { - consumer.accept(player, config.getFriendColor()); + consumer.accept(player, plugin.getGetFriendColor()); } - else if (config.drawClanMemberNames() && isClanMember) + else if (plugin.isDrawClanMemberNames() && isClanMember) { - consumer.accept(player, config.getClanMemberColor()); + consumer.accept(player, plugin.getGetClanMemberColor()); } - else if (config.highlightTeamMembers() && localPlayer.getTeam() > 0 && + else if (plugin.isHighlightTeamMembers() && localPlayer.getTeam() > 0 && localPlayer.getTeam() == player.getTeam()) { - consumer.accept(player, config.getTeamMemberColor()); + consumer.accept(player, plugin.getGetTeamMemberColor()); } - else if (config.highlightNonClanMembers() && !isClanMember) + else if (plugin.isHighlightNonClanMembers() && !isClanMember) { - consumer.accept(player, config.getNonClanMemberColor()); + consumer.accept(player, plugin.getGetNonClanMemberColor()); } - else if (config.highlightTargets() && PvPUtil.isAttackable(client, player) && + else if (plugin.isHighlightTargets() && PvPUtil.isAttackable(client, player) && !client.isFriended(player.getName(), false) && !player.isClanMember()) { - if (config.skulledTargetsOnly() && player.getSkullIcon() != null) + if (plugin.isSkulledTargetsOnly() && player.getSkullIcon() != null) { - consumer.accept(player, config.getTargetColor()); + consumer.accept(player, plugin.getGetTargetColor()); } - else if (!config.skulledTargetsOnly()) + else if (!plugin.isSkulledTargetsOnly()) { - consumer.accept(player, config.getTargetColor()); + consumer.accept(player, plugin.getGetTargetColor()); } } - if (config.highlightCallers() && config.callers() != null && playerIndicatorsPlugin.isCaller(player)) + if (plugin.isHighlightCallers() && plugin.getConfigCallers() != null && plugin.isCaller(player)) { - consumer.accept(player, config.callerColor()); + consumer.accept(player, plugin.getCallerColor()); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsTileOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsTileOverlay.java index 5ae7299db6..c3b35626bf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsTileOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsTileOverlay.java @@ -29,23 +29,22 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Polygon; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton public class PlayerIndicatorsTileOverlay extends Overlay { private final PlayerIndicatorsService playerIndicatorsService; - private final PlayerIndicatorsConfig config; private final PlayerIndicatorsPlugin playerIndicatorsPlugin; @Inject - private PlayerIndicatorsTileOverlay(PlayerIndicatorsConfig config, - PlayerIndicatorsService playerIndicatorsService, PlayerIndicatorsPlugin plugin) + private PlayerIndicatorsTileOverlay(final PlayerIndicatorsService playerIndicatorsService, final PlayerIndicatorsPlugin plugin) { - this.config = config; this.playerIndicatorsService = playerIndicatorsService; this.playerIndicatorsPlugin = plugin; setLayer(OverlayLayer.ABOVE_SCENE); @@ -56,11 +55,11 @@ public class PlayerIndicatorsTileOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (!config.drawTiles() /*&& !config.drawPlayerHull()*/) + if (!playerIndicatorsPlugin.isDrawTiles() /*&& !config.drawPlayerHull()*/) { return null; } - else if (config.drawTiles()) + else { playerIndicatorsService.forEachPlayer((player, color) -> { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoCustomIndicator.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoCustomIndicator.java index bcb25d5577..906cd981fb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoCustomIndicator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoCustomIndicator.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.playerinfo; import java.awt.Color; import java.awt.Image; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.Client; @@ -37,7 +38,7 @@ import net.runelite.client.util.ColorUtil; public class PlayerInfoCustomIndicator extends InfoBox { @AllArgsConstructor - @Getter + @Getter(AccessLevel.PACKAGE) enum IndicatorType { HEALTH("Current Hitpoints"), @@ -49,14 +50,14 @@ public class PlayerInfoCustomIndicator extends InfoBox private final String description; } - private final PlayerInfoConfig config; + private final PlayerInfoPlugin plugin; private final Client client; private final IndicatorType type; - PlayerInfoCustomIndicator(Image image, PlayerInfoPlugin plugin, PlayerInfoConfig config, Client client, IndicatorType type) + PlayerInfoCustomIndicator(final Image image, final PlayerInfoPlugin plugin, final Client client, final IndicatorType type) { super(image, plugin); - this.config = config; + this.plugin = plugin; this.client = client; this.type = type; @@ -107,15 +108,15 @@ public class PlayerInfoCustomIndicator extends InfoBox if (currLvl > 1.0) { - return config.colorHigh(); + return plugin.getColorHigh(); } else if (currLvl > 0.5) { - return ColorUtil.colorLerp(config.colorMed(), config.colorHigh(), (currLvl * 2) - 1.0F); + return ColorUtil.colorLerp(plugin.getColorMed(), plugin.getColorHigh(), (currLvl * 2) - 1.0F); } else { - return ColorUtil.colorLerp(config.colorLow(), config.colorMed(), (currLvl * 2)); + return ColorUtil.colorLerp(plugin.getColorLow(), plugin.getColorMed(), (currLvl * 2)); } } @@ -125,15 +126,15 @@ public class PlayerInfoCustomIndicator extends InfoBox switch (type) { case HEALTH: - return config.enableHealth(); + return plugin.isEnableHealth(); case PRAYER: - return config.enablePrayer(); + return plugin.isEnablePrayer(); case ENERGY: - return config.enableEnergy(); + return plugin.isEnableEnergy(); case SPECIAL: - return config.enableSpec(); + return plugin.isEnableSpec(); case WORLD: - return config.enableWorld(); + return plugin.isEnableWorld(); } return false; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoPlugin.java index 2f414f22d0..285cac241c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoPlugin.java @@ -25,15 +25,17 @@ package net.runelite.client.plugins.playerinfo; import com.google.inject.Provides; +import java.awt.Color; import java.awt.image.BufferedImage; import javax.inject.Inject; import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.SpriteID; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.game.SkillIconManager; import net.runelite.client.game.SpriteManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -48,7 +50,6 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager; type = PluginType.UTILITY, enabledByDefault = false ) - @Singleton public class PlayerInfoPlugin extends Plugin { @@ -67,8 +68,22 @@ public class PlayerInfoPlugin extends Plugin @Inject private SpriteManager spriteManager; - @Inject - private SkillIconManager skillIconManager; + @Getter(AccessLevel.PACKAGE) + private boolean enableHealth; + @Getter(AccessLevel.PACKAGE) + private boolean enablePrayer; + @Getter(AccessLevel.PACKAGE) + private boolean enableEnergy; + @Getter(AccessLevel.PACKAGE) + private boolean enableSpec; + @Getter(AccessLevel.PACKAGE) + private boolean enableWorld; + @Getter(AccessLevel.PACKAGE) + private Color colorHigh; + @Getter(AccessLevel.PACKAGE) + private Color colorMed; + @Getter(AccessLevel.PACKAGE) + private Color colorLow; @Provides PlayerInfoConfig provideConfig(ConfigManager configManager) @@ -79,6 +94,8 @@ public class PlayerInfoPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + clientThread.invoke(() -> { if (client.getGameState().ordinal() < GameState.LOGIN_SCREEN.ordinal()) @@ -92,11 +109,11 @@ public class PlayerInfoPlugin extends Plugin BufferedImage combatImg = spriteManager.getSprite(SpriteID.MINIMAP_ORB_SPECIAL_ICON, 0); BufferedImage worldImg = spriteManager.getSprite(SpriteID.MINIMAP_ORB_WORLD_MAP_PLANET, 0); - infoBoxManager.addInfoBox(new PlayerInfoCustomIndicator(healthImg, this, config, client, IndicatorType.HEALTH)); - infoBoxManager.addInfoBox(new PlayerInfoCustomIndicator(prayerImg, this, config, client, IndicatorType.PRAYER)); - infoBoxManager.addInfoBox(new PlayerInfoCustomIndicator(energyImg, this, config, client, IndicatorType.ENERGY)); - infoBoxManager.addInfoBox(new PlayerInfoCustomIndicator(combatImg, this, config, client, IndicatorType.SPECIAL)); - infoBoxManager.addInfoBox(new PlayerInfoCustomIndicator(worldImg, this, config, client, IndicatorType.WORLD)); + infoBoxManager.addInfoBox(new PlayerInfoCustomIndicator(healthImg, this, client, IndicatorType.HEALTH)); + infoBoxManager.addInfoBox(new PlayerInfoCustomIndicator(prayerImg, this, client, IndicatorType.PRAYER)); + infoBoxManager.addInfoBox(new PlayerInfoCustomIndicator(energyImg, this, client, IndicatorType.ENERGY)); + infoBoxManager.addInfoBox(new PlayerInfoCustomIndicator(combatImg, this, client, IndicatorType.SPECIAL)); + infoBoxManager.addInfoBox(new PlayerInfoCustomIndicator(worldImg, this, client, IndicatorType.WORLD)); return true; }); @@ -107,4 +124,16 @@ public class PlayerInfoPlugin extends Plugin { infoBoxManager.removeIf(i -> i instanceof PlayerInfoCustomIndicator); } + + private void updateConfig() + { + this.enableHealth = config.enableHealth(); + this.enablePrayer = config.enablePrayer(); + this.enableEnergy = config.enableEnergy(); + this.enableSpec = config.enableSpec(); + this.enableWorld = config.enableWorld(); + this.colorHigh = config.colorHigh(); + this.colorMed = config.colorMed(); + this.colorLow = config.colorLow(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java index c33b63de06..9dfc3e30c7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java @@ -30,6 +30,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.GameState; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; @@ -47,6 +48,7 @@ import net.runelite.client.plugins.config.PluginListItem; tags = {"plugins", "organizer"}, type = PluginType.PLUGIN_ORGANIZER ) +@Singleton public class PluginSorterPlugin extends Plugin { //Cache the hidden plugins @@ -55,6 +57,13 @@ public class PluginSorterPlugin extends Plugin @Inject private PluginSorterConfig config; + private boolean hidePlugins; + private Color externalColor; + private Color pvmColor; + private Color pvpColor; + private Color skillingColor; + private Color utilityColor; + @Provides PluginSorterConfig provideConfig(ConfigManager configManager) { @@ -64,6 +73,7 @@ public class PluginSorterPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); updateColors(); } @@ -78,7 +88,7 @@ public class PluginSorterPlugin extends Plugin { if (gameStateChanged.getGameState() == GameState.LOGIN_SCREEN) { - if (config.hidePlugins()) + if (this.hidePlugins) { hidePlugins(); } @@ -89,9 +99,16 @@ public class PluginSorterPlugin extends Plugin @Subscribe public void onConfigChanged(ConfigChanged configChanged) { + if (!configChanged.getGroup().equals("pluginsorter")) + { + return; + } + + updateConfig(); + if (configChanged.getKey().equals("hidePlugins")) { - if (config.hidePlugins()) + if (this.hidePlugins) { hidePlugins(); } @@ -112,19 +129,19 @@ public class PluginSorterPlugin extends Plugin switch (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type()) { case EXTERNAL: - pli.nameLabel.setForeground(config.externalColor()); + pli.nameLabel.setForeground(this.externalColor); break; case PVM: - pli.nameLabel.setForeground(config.pvmColor()); + pli.nameLabel.setForeground(this.pvmColor); break; case PVP: - pli.nameLabel.setForeground(config.pvpColor()); + pli.nameLabel.setForeground(this.pvpColor); break; case SKILLING: - pli.nameLabel.setForeground(config.skillingColor()); + pli.nameLabel.setForeground(this.skillingColor); break; case UTILITY: - pli.nameLabel.setForeground(config.utilityColor()); + pli.nameLabel.setForeground(this.utilityColor); break; default: pli.nameLabel.setForeground(Color.WHITE); @@ -167,4 +184,14 @@ public class PluginSorterPlugin extends Plugin tempList.addAll(1, removedPlugins); ConfigPanel.pluginList = tempList; } + + private void updateConfig() + { + this.hidePlugins = config.hidePlugins(); + this.externalColor = config.externalColor(); + this.pvmColor = config.pvmColor(); + this.pvpColor = config.pvpColor(); + this.skillingColor = config.skillingColor(); + this.utilityColor = config.utilityColor(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poh/BurnerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/poh/BurnerOverlay.java index 16c8d4edc3..45d38e4e8c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/poh/BurnerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/poh/BurnerOverlay.java @@ -30,6 +30,7 @@ import java.awt.Graphics2D; import java.time.Duration; import java.time.Instant; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Perspective; import net.runelite.api.Point; @@ -38,26 +39,25 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.components.ProgressPieComponent; +@Singleton class BurnerOverlay extends Overlay { private final Client client; - private final PohConfig config; private final PohPlugin plugin; @Inject - private BurnerOverlay(Client client, PohConfig config, PohPlugin plugin) + private BurnerOverlay(final Client client, final PohPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); this.client = client; - this.config = config; this.plugin = plugin; } @Override public Dimension render(Graphics2D graphics) { - if (!config.showBurner()) + if (!plugin.isShowBurner()) { return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poh/IncenseBurner.java b/runelite-client/src/main/java/net/runelite/client/plugins/poh/IncenseBurner.java index c47f9bfe14..3d6acd175b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/poh/IncenseBurner.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/poh/IncenseBurner.java @@ -25,13 +25,14 @@ package net.runelite.client.plugins.poh; import java.time.Instant; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; -@Getter -@Setter +@Getter(AccessLevel.PACKAGE) +@Setter(AccessLevel.PACKAGE) @RequiredArgsConstructor @AllArgsConstructor class IncenseBurner diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohOverlay.java index 9d048e584e..6ecb5392a4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohOverlay.java @@ -30,6 +30,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.Perspective; @@ -38,6 +40,7 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; +@Singleton public class PohOverlay extends Overlay { private static final PohIcons[] PORTALS = new PohIcons[] @@ -50,20 +53,18 @@ public class PohOverlay extends Overlay private static final int MAX_DISTANCE = 2350; - @Getter + @Getter(AccessLevel.PACKAGE) private final List iconList = new ArrayList<>(); private final Client client; - private final PohConfig config; private final PohPlugin plugin; @Inject - public PohOverlay(Client client, PohConfig config, PohPlugin plugin) + public PohOverlay(final Client client, final PohPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); this.client = client; - this.config = config; this.plugin = plugin; } @@ -96,51 +97,51 @@ public class PohOverlay extends Overlay public void updateConfig() { iconList.clear(); - if (config.showPortals()) + if (plugin.isShowPortals()) { Collections.addAll(iconList, PORTALS); } - if (config.showAltar()) + if (plugin.isShowAltar()) { iconList.add(PohIcons.ALTAR); } - if (config.showGlory()) + if (plugin.isShowGlory()) { iconList.add(PohIcons.GLORY); } - if (config.showRepairStand()) + if (plugin.isShowRepairStand()) { iconList.add(PohIcons.REPAIR); } - if (config.showPools()) + if (plugin.isShowPools()) { iconList.add(PohIcons.POOLS); } - if (config.showExitPortal()) + if (plugin.isShowExitPortal()) { iconList.add(PohIcons.EXITPORTAL); } - if (config.showSpellbook()) + if (plugin.isShowSpellbook()) { iconList.add(PohIcons.SPELLBOOKALTAR); } - if (config.showJewelleryBox()) + if (plugin.isShowJewelleryBox()) { iconList.add(PohIcons.JEWELLERYBOX); } - if (config.showMagicTravel()) + if (plugin.isShowMagicTravel()) { iconList.add(PohIcons.MAGICTRAVEL); } - if (config.showPortalNexus()) + if (plugin.isShowPortalNexus()) { iconList.add(PohIcons.PORTALNEXUS); } - if (config.showDigsitePendant()) + if (plugin.isShowDigsitePendant()) { iconList.add(PohIcons.DIGSITEPENDANT); } - if (config.showXericsTalisman()) + if (plugin.isShowXericsTalisman()) { iconList.add(PohIcons.XERICSTALISMAN); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohPlugin.java index be70c9689d..c71bfad61e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohPlugin.java @@ -33,6 +33,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ScheduledExecutorService; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -71,6 +72,7 @@ import net.runelite.http.api.hiscore.Skill; tags = {"construction", "poh", "minimap", "overlay"} ) @Slf4j +@Singleton public class PohPlugin extends Plugin { static final Set BURNER_UNLIT = Sets.newHashSet(ObjectID.INCENSE_BURNER, ObjectID.INCENSE_BURNER_13210, ObjectID.INCENSE_BURNER_13212); @@ -88,6 +90,9 @@ public class PohPlugin extends Plugin @Inject private PohOverlay overlay; + @Inject + private PohConfig config; + @Inject private Client client; @@ -100,6 +105,33 @@ public class PohPlugin extends Plugin @Inject private BurnerOverlay burnerOverlay; + @Getter(AccessLevel.PACKAGE) + private boolean showPortals; + @Getter(AccessLevel.PACKAGE) + private boolean showAltar; + @Getter(AccessLevel.PACKAGE) + private boolean showGlory; + @Getter(AccessLevel.PACKAGE) + private boolean showPools; + @Getter(AccessLevel.PACKAGE) + private boolean showRepairStand; + @Getter(AccessLevel.PACKAGE) + private boolean showExitPortal; + @Getter(AccessLevel.PACKAGE) + private boolean showBurner; + @Getter(AccessLevel.PACKAGE) + private boolean showSpellbook; + @Getter(AccessLevel.PACKAGE) + private boolean showJewelleryBox; + @Getter(AccessLevel.PACKAGE) + private boolean showMagicTravel; + @Getter(AccessLevel.PACKAGE) + private boolean showPortalNexus; + @Getter(AccessLevel.PACKAGE) + private boolean showDigsitePendant; + @Getter(AccessLevel.PACKAGE) + private boolean showXericsTalisman; + @Provides PohConfig getConfig(ConfigManager configManager) { @@ -109,6 +141,8 @@ public class PohPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(overlay); overlayManager.add(burnerOverlay); overlay.updateConfig(); @@ -126,6 +160,13 @@ public class PohPlugin extends Plugin @Subscribe public void onConfigChanged(ConfigChanged event) { + if (!event.getGroup().equals("poh")) + { + return; + } + + updateConfig(); + overlay.updateConfig(); } @@ -247,4 +288,21 @@ public class PohPlugin extends Plugin incenseBurner.setCountdownTimer((200 + fmLevel) * tickLengthSeconds); incenseBurner.setRandomTimer(fmLevel * tickLengthSeconds); } + + private void updateConfig() + { + this.showPortals = config.showPortals(); + this.showAltar = config.showAltar(); + this.showGlory = config.showGlory(); + this.showPools = config.showPools(); + this.showRepairStand = config.showRepairStand(); + this.showExitPortal = config.showExitPortal(); + this.showBurner = config.showBurner(); + this.showSpellbook = config.showSpellbook(); + this.showJewelleryBox = config.showJewelleryBox(); + this.showMagicTravel = config.showMagicTravel(); + this.showPortalNexus = config.showPortalNexus(); + this.showDigsitePendant = config.showDigsitePendant(); + this.showXericsTalisman = config.showXericsTalisman(); + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonActorOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonActorOverlay.java index 020cf2e869..50fa729a60 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonActorOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonActorOverlay.java @@ -7,6 +7,7 @@ import java.awt.Graphics2D; import java.awt.image.BufferedImage; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Actor; import net.runelite.api.Client; import net.runelite.api.Constants; @@ -22,6 +23,7 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton public class PoisonActorOverlay extends Overlay { private final PoisonPlugin plugin; @@ -30,7 +32,7 @@ public class PoisonActorOverlay extends Overlay private Font font; @Inject - PoisonActorOverlay(PoisonPlugin plugin, Client client) + PoisonActorOverlay(final PoisonPlugin plugin, final Client client) { this.plugin = plugin; this.client = client; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonInfobox.java b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonInfobox.java index d7a3527a51..0810be80a9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonInfobox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonInfobox.java @@ -35,7 +35,7 @@ class PoisonInfobox extends Timer { private final PoisonPlugin plugin; - PoisonInfobox(int duration, BufferedImage image, PoisonPlugin plugin) + PoisonInfobox(final int duration, final BufferedImage image, final PoisonPlugin plugin) { super(duration, ChronoUnit.MILLIS, image, plugin); this.plugin = plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonOverlay.java index 758811f292..e709e4473a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonOverlay.java @@ -28,6 +28,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Rectangle; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Point; import net.runelite.api.widgets.Widget; @@ -38,6 +39,7 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.tooltip.Tooltip; import net.runelite.client.ui.overlay.tooltip.TooltipManager; +@Singleton class PoisonOverlay extends Overlay { private final PoisonPlugin plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java index ff39332758..abf1f4c56e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java @@ -37,6 +37,7 @@ import java.time.temporal.ChronoUnit; import java.util.HashMap; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.Getter; import net.runelite.api.Actor; import net.runelite.api.Client; @@ -69,6 +70,7 @@ import net.runelite.client.util.ImageUtil; description = "Tracks current damage values for Poison and Venom", tags = {"combat", "poison", "venom", "heart", "hp"} ) +@Singleton public class PoisonPlugin extends Plugin { private static final int POISON_TICK_MILLIS = 18000; @@ -126,6 +128,12 @@ public class PoisonPlugin extends Plugin @Getter private Map poisonedActors = new HashMap<>(); + private boolean showInfoboxes; + private boolean changeHealthIcon; + private boolean showForPlayers; + private boolean showForNpcs; + private int fontSize; + @Provides PoisonConfig getConfig(ConfigManager configManager) { @@ -135,10 +143,12 @@ public class PoisonPlugin extends Plugin @Override protected void startUp() throws Exception { - actorOverlay.setFontSize(config.fontSize()); + updateConfig(); + + actorOverlay.setFontSize(this.fontSize); overlayManager.add(poisonOverlay); - if (config.showForNpcs() || config.showForPlayers()) + if (this.showForNpcs || this.showForPlayers) { overlayManager.add(actorOverlay); } @@ -188,7 +198,7 @@ public class PoisonPlugin extends Plugin final int damage = nextDamage(poisonValue); this.lastDamage = damage; - if (config.showInfoboxes()) + if (this.showInfoboxes) { if (infobox != null) { @@ -232,8 +242,8 @@ public class PoisonPlugin extends Plugin Actor actor = event.getActor(); if (actor == client.getLocalPlayer() || - actor instanceof NPC && !config.showForNpcs() || - actor instanceof Player && !config.showForPlayers()) + actor instanceof NPC && !this.showForNpcs || + actor instanceof Player && !this.showForPlayers) { return; } @@ -313,13 +323,15 @@ public class PoisonPlugin extends Plugin return; } - if (!config.showInfoboxes() && infobox != null) + updateConfig(); + + if (!this.showInfoboxes && infobox != null) { infoBoxManager.removeInfoBox(infobox); infobox = null; } - if (config.changeHealthIcon()) + if (this.changeHealthIcon) { clientThread.invoke(this::checkHealthIcon); } @@ -332,18 +344,18 @@ public class PoisonPlugin extends Plugin { overlayManager.remove(actorOverlay); - if (!config.showForPlayers() && !config.showForNpcs()) + if (!this.showForPlayers && !this.showForNpcs) { poisonedActors.clear(); } else { - if (!config.showForNpcs()) + if (!this.showForNpcs) { poisonedActors.entrySet().removeIf(a -> a instanceof NPC); } - if (!config.showForPlayers()) + if (!this.showForPlayers) { poisonedActors.entrySet().removeIf(a -> a instanceof Player); } @@ -354,7 +366,7 @@ public class PoisonPlugin extends Plugin if (event.getKey().equals("fontsize")) { - actorOverlay.setFontSize(config.fontSize()); + actorOverlay.setFontSize(this.fontSize); } } @@ -449,7 +461,7 @@ public class PoisonPlugin extends Plugin private void checkHealthIcon() { - if (!config.changeHealthIcon()) + if (!this.changeHealthIcon) { return; } @@ -495,4 +507,13 @@ public class PoisonPlugin extends Plugin client.getSpriteOverrides().remove(SpriteID.MINIMAP_ORB_HITPOINTS_ICON); heart = null; } + + private void updateConfig() + { + this.showInfoboxes = config.showInfoboxes(); + this.changeHealthIcon = config.changeHealthIcon(); + this.showForPlayers = config.showForPlayers(); + this.showForNpcs = config.showForNpcs(); + this.fontSize = config.fontSize(); + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PlayerContainer.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PlayerContainer.java index 68f78ab065..4ff815d6cd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PlayerContainer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PlayerContainer.java @@ -38,7 +38,7 @@ public class PlayerContainer private long whenTheyAttackedMe; private int millisToExpireHighlight; - PlayerContainer(Player player, long whenTheyAttackedMe, int millisToExpireHighlight) + PlayerContainer(final Player player, final long whenTheyAttackedMe, final int millisToExpireHighlight) { this.player = player; this.whenTheyAttackedMe = whenTheyAttackedMe; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java index a0ba2445cc..07ec30fec7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java @@ -31,6 +31,7 @@ import java.awt.Polygon; import java.awt.image.BufferedImage; import java.util.ConcurrentModificationException; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.ItemDefinition; import net.runelite.api.Player; @@ -43,19 +44,18 @@ import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.util.Text; +@Singleton class PrayAgainstPlayerOverlay extends Overlay { private final PrayAgainstPlayerPlugin plugin; - private final PrayAgainstPlayerConfig config; private final Client client; @Inject - private PrayAgainstPlayerOverlay(PrayAgainstPlayerPlugin plugin, PrayAgainstPlayerConfig config, Client client) + private PrayAgainstPlayerOverlay(final PrayAgainstPlayerPlugin plugin, final Client client) { super(plugin); this.plugin = plugin; - this.config = config; this.client = client; setLayer(OverlayLayer.ABOVE_SCENE); @@ -86,21 +86,21 @@ class PrayAgainstPlayerOverlay extends Overlay { plugin.removePlayerFromPotentialContainer(container); } - if (config.drawPotentialTargetsName()) + if (plugin.isDrawPotentialTargetsName()) { - renderNameAboveHead(graphics, container.getPlayer(), config.potentialPlayerColor()); + renderNameAboveHead(graphics, container.getPlayer(), plugin.getPotentialPlayerColor()); } - if (config.drawPotentialTargetHighlight()) + if (plugin.isDrawPotentialTargetHighlight()) { - renderHighlightedPlayer(graphics, container.getPlayer(), config.potentialPlayerColor()); + renderHighlightedPlayer(graphics, container.getPlayer(), plugin.getPotentialPlayerColor()); } - if (config.drawPotentialTargetTile()) + if (plugin.isDrawPotentialTargetTile()) { - renderTileUnderPlayer(graphics, container.getPlayer(), config.potentialPlayerColor()); + renderTileUnderPlayer(graphics, container.getPlayer(), plugin.getPotentialPlayerColor()); } - if (config.drawPotentialTargetPrayAgainst()) + if (plugin.isDrawPotentialTargetPrayAgainst()) { - renderPrayAgainstOnPlayer(graphics, container.getPlayer(), config.potentialPlayerColor()); + renderPrayAgainstOnPlayer(graphics, container.getPlayer(), plugin.getPotentialPlayerColor()); } } } @@ -126,21 +126,21 @@ class PrayAgainstPlayerOverlay extends Overlay plugin.removePlayerFromAttackerContainer(container); } - if (config.drawTargetsName()) + if (plugin.isDrawTargetsName()) { - renderNameAboveHead(graphics, container.getPlayer(), config.attackerPlayerColor()); + renderNameAboveHead(graphics, container.getPlayer(), plugin.getAttackerPlayerColor()); } - if (config.drawTargetHighlight()) + if (plugin.isDrawTargetHighlight()) { - renderHighlightedPlayer(graphics, container.getPlayer(), config.attackerPlayerColor()); + renderHighlightedPlayer(graphics, container.getPlayer(), plugin.getAttackerPlayerColor()); } - if (config.drawTargetTile()) + if (plugin.isDrawTargetTile()) { - renderTileUnderPlayer(graphics, container.getPlayer(), config.attackerPlayerColor()); + renderTileUnderPlayer(graphics, container.getPlayer(), plugin.getAttackerPlayerColor()); } - if (config.drawTargetPrayAgainst()) + if (plugin.isDrawTargetPrayAgainst()) { - renderPrayAgainstOnPlayer(graphics, container.getPlayer(), config.attackerPlayerColor()); + renderPrayAgainstOnPlayer(graphics, container.getPlayer(), plugin.getAttackerPlayerColor()); } } } @@ -208,7 +208,7 @@ class PrayAgainstPlayerOverlay extends Overlay } else { - if (config.drawUnknownWeapons()) + if (plugin.isDrawUnknownWeapons()) { int itemId = player.getPlayerAppearance().getEquipmentId(KitType.WEAPON); ItemDefinition itemComposition = client.getItemDefinition(itemId); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java index 885bdd2e7d..0af7b52e28 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java @@ -31,6 +31,7 @@ import java.awt.Polygon; import java.awt.Rectangle; import java.util.ConcurrentModificationException; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Player; import net.runelite.api.widgets.Widget; @@ -41,19 +42,18 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton class PrayAgainstPlayerOverlayPrayerTab extends Overlay { private final PrayAgainstPlayerPlugin plugin; - private final PrayAgainstPlayerConfig config; private final Client client; @Inject - private PrayAgainstPlayerOverlayPrayerTab(PrayAgainstPlayerPlugin plugin, PrayAgainstPlayerConfig config, Client client) + private PrayAgainstPlayerOverlayPrayerTab(final PrayAgainstPlayerPlugin plugin, final Client client) { super(plugin); this.plugin = plugin; - this.config = config; this.client = client; setPosition(OverlayPosition.DETACHED); @@ -76,7 +76,7 @@ class PrayAgainstPlayerOverlayPrayerTab extends Overlay if (plugin.getPlayersAttackingMe() != null && plugin.getPlayersAttackingMe().size() > 0) { // no reason to show you what prayers to pray in your prayer tab if multiple people are attacking you - if ((plugin.getPlayersAttackingMe().size() == 1) && (config.drawTargetPrayAgainstPrayerTab())) + if ((plugin.getPlayersAttackingMe().size() == 1) && (plugin.isDrawTargetPrayAgainstPrayerTab())) { renderPrayerToClick(graphics, container.getPlayer()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java index bc0598a4c9..db42cc14fa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java @@ -33,12 +33,16 @@ import java.awt.image.IndexColorModel; import java.awt.image.WritableRaster; import java.util.ArrayList; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; import net.runelite.api.AnimationID; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.Player; import net.runelite.api.SpriteID; import net.runelite.api.events.AnimationChanged; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.InteractingChanged; import net.runelite.api.events.PlayerDespawned; @@ -64,6 +68,7 @@ import net.runelite.client.util.ImageUtil; * I am fully aware that there is plenty of overhead and is a MESS! * If you'd like to contribute please do! */ +@Singleton public class PrayAgainstPlayerPlugin extends Plugin { @@ -97,6 +102,37 @@ public class PrayAgainstPlayerPlugin extends Plugin @Inject private PrayAgainstPlayerConfig config; + @Getter(AccessLevel.PACKAGE) + private Color attackerPlayerColor; + @Getter(AccessLevel.PACKAGE) + private Color potentialPlayerColor; + private int attackerTargetTimeout; + private int potentialTargetTimeout; + private int newSpawnTimeout; + private boolean ignoreFriends; + private boolean ignoreClanMates; + private boolean markNewPlayer; + @Getter(AccessLevel.PACKAGE) + private boolean drawTargetPrayAgainst; + @Getter(AccessLevel.PACKAGE) + private boolean drawPotentialTargetPrayAgainst; + @Getter(AccessLevel.PACKAGE) + private boolean drawTargetPrayAgainstPrayerTab; + @Getter(AccessLevel.PACKAGE) + private boolean drawTargetsName; + @Getter(AccessLevel.PACKAGE) + private boolean drawPotentialTargetsName; + @Getter(AccessLevel.PACKAGE) + private boolean drawTargetHighlight; + @Getter(AccessLevel.PACKAGE) + private boolean drawPotentialTargetHighlight; + @Getter(AccessLevel.PACKAGE) + private boolean drawTargetTile; + @Getter(AccessLevel.PACKAGE) + private boolean drawPotentialTargetTile; + @Getter(AccessLevel.PACKAGE) + private boolean drawUnknownWeapons; + @Provides PrayAgainstPlayerConfig provideConfig(ConfigManager configManager) { @@ -115,6 +151,8 @@ public class PrayAgainstPlayerPlugin extends Plugin @Override protected void startUp() { + updateConfig(); + potentialPlayersAttackingMe = new ArrayList<>(); playersAttackingMe = new ArrayList<>(); overlayManager.add(overlay); @@ -136,11 +174,11 @@ public class PrayAgainstPlayerPlugin extends Plugin Player sourcePlayer = (Player) animationChanged.getActor(); // is the client is a friend/clan and the config is set to ignore friends/clan dont add them to list - if (client.isFriended(sourcePlayer.getName(), true) && config.ignoreFriends()) + if (client.isFriended(sourcePlayer.getName(), true) && this.ignoreFriends) { return; } - if (client.isClanMember(sourcePlayer.getName()) && config.ignoreClanMates()) + if (client.isClanMember(sourcePlayer.getName()) && this.ignoreClanMates) { return; } @@ -160,7 +198,7 @@ public class PrayAgainstPlayerPlugin extends Plugin // if he's not in the attackers list, add him if (findPlayerInAttackerList(sourcePlayer) == null) { - PlayerContainer container = new PlayerContainer(sourcePlayer, System.currentTimeMillis(), (config.attackerTargetTimeout() * 1000)); + PlayerContainer container = new PlayerContainer(sourcePlayer, System.currentTimeMillis(), (this.attackerTargetTimeout * 1000)); playersAttackingMe.add(container); } } @@ -179,16 +217,16 @@ public class PrayAgainstPlayerPlugin extends Plugin { //we're being interacted with // is the client is a friend/clan and the config is set to ignore friends/clan dont add them to list - if (client.isFriended(sourcePlayer.getName(), true) && config.ignoreFriends()) + if (client.isFriended(sourcePlayer.getName(), true) && this.ignoreFriends) { return; } - if (client.isClanMember(sourcePlayer.getName()) && config.ignoreClanMates()) + if (client.isClanMember(sourcePlayer.getName()) && this.ignoreClanMates) { return; } - PlayerContainer container = new PlayerContainer(sourcePlayer, System.currentTimeMillis(), (config.potentialTargetTimeout() * 1000)); + PlayerContainer container = new PlayerContainer(sourcePlayer, System.currentTimeMillis(), (this.potentialTargetTimeout * 1000)); potentialPlayersAttackingMe.add(container); } } @@ -212,15 +250,15 @@ public class PrayAgainstPlayerPlugin extends Plugin @Subscribe protected void onPlayerSpawned(PlayerSpawned playerSpawned) { - if (config.markNewPlayer()) + if (this.markNewPlayer) { Player p = playerSpawned.getPlayer(); - if (client.isFriended(p.getName(), true) && config.ignoreFriends()) + if (client.isFriended(p.getName(), true) && this.ignoreFriends) { return; } - if (client.isClanMember(p.getName()) && config.ignoreClanMates()) + if (client.isClanMember(p.getName()) && this.ignoreClanMates) { return; } @@ -228,7 +266,7 @@ public class PrayAgainstPlayerPlugin extends Plugin PlayerContainer container = findPlayerInPotentialList(p); if (container == null) { - container = new PlayerContainer(p, System.currentTimeMillis(), (config.newSpawnTimeout() * 1000)); + container = new PlayerContainer(p, System.currentTimeMillis(), (this.newSpawnTimeout * 1000)); potentialPlayersAttackingMe.add(container); } } @@ -274,7 +312,7 @@ public class PrayAgainstPlayerPlugin extends Plugin private void resetPlayerFromAttackerContainerTimer(PlayerContainer container) { removePlayerFromAttackerContainer(container); - PlayerContainer newContainer = new PlayerContainer(container.getPlayer(), System.currentTimeMillis(), (config.attackerTargetTimeout() * 1000)); + PlayerContainer newContainer = new PlayerContainer(container.getPlayer(), System.currentTimeMillis(), (this.attackerTargetTimeout * 1000)); playersAttackingMe.add(newContainer); } @@ -377,4 +415,36 @@ public class PrayAgainstPlayerPlugin extends Plugin return null; } + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("prayagainstplayer")) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.attackerPlayerColor = config.attackerPlayerColor(); + this.potentialPlayerColor = config.potentialPlayerColor(); + this.attackerTargetTimeout = config.attackerTargetTimeout(); + this.potentialTargetTimeout = config.potentialTargetTimeout(); + this.newSpawnTimeout = config.newSpawnTimeout(); + this.ignoreFriends = config.ignoreFriends(); + this.ignoreClanMates = config.ignoreClanMates(); + this.markNewPlayer = config.markNewPlayer(); + this.drawTargetPrayAgainst = config.drawTargetPrayAgainst(); + this.drawPotentialTargetPrayAgainst = config.drawPotentialTargetPrayAgainst(); + this.drawTargetPrayAgainstPrayerTab = config.drawTargetPrayAgainstPrayerTab(); + this.drawTargetsName = config.drawTargetsName(); + this.drawPotentialTargetsName = config.drawPotentialTargetsName(); + this.drawTargetHighlight = config.drawTargetHighlight(); + this.drawPotentialTargetHighlight = config.drawPotentialTargetHighlight(); + this.drawTargetTile = config.drawTargetTile(); + this.drawPotentialTargetTile = config.drawPotentialTargetTile(); + this.drawUnknownWeapons = config.drawUnknownWeapons(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerBarOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerBarOverlay.java index 5798698621..aa363ecb10 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerBarOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerBarOverlay.java @@ -56,16 +56,14 @@ class PrayerBarOverlay extends Overlay private static final BufferedImage HD_BACK_BAR = ImageUtil.getResourceStreamFromClass(PrayerPlugin.class, "back.png"); private final Client client; - private final PrayerConfig config; private final PrayerPlugin plugin; private boolean showingPrayerBar; @Inject - private PrayerBarOverlay(final Client client, final PrayerConfig config, final PrayerPlugin plugin) + private PrayerBarOverlay(final Client client, final PrayerPlugin plugin) { this.client = client; - this.config = config; this.plugin = plugin; setPosition(OverlayPosition.DYNAMIC); @@ -76,7 +74,7 @@ class PrayerBarOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (!config.showPrayerBar() || !showingPrayerBar) + if (!plugin.isShowPrayerBar() || !showingPrayerBar) { return null; } @@ -102,9 +100,9 @@ class PrayerBarOverlay extends Overlay // Use a sub-image to create the same effect the HD Health Bar has graphics.drawImage(HD_FRONT_BAR.getSubimage(0, 0, progressFill, barHeight), barX, barY, progressFill, barHeight, null); - if ((plugin.isPrayersActive() || config.prayerFlickAlwaysOn()) - && (config.prayerFlickLocation().equals(PrayerFlickLocation.PRAYER_BAR) - || config.prayerFlickLocation().equals(PrayerFlickLocation.BOTH))) + if ((plugin.isPrayersActive() || plugin.isPrayerFlickAlwaysOn()) + && (plugin.getPrayerFlickLocation().equals(PrayerFlickLocation.PRAYER_BAR) + || plugin.getPrayerFlickLocation().equals(PrayerFlickLocation.BOTH))) { final double t = plugin.getTickProgress(); final int halfBarWidth = (barWidth / 2) - HD_PRAYER_BAR_PADDING; @@ -132,9 +130,9 @@ class PrayerBarOverlay extends Overlay graphics.setColor(BAR_FILL_COLOR); graphics.fillRect(barX, barY, progressFill, barHeight); - if ((plugin.isPrayersActive() || config.prayerFlickAlwaysOn()) - && (config.prayerFlickLocation().equals(PrayerFlickLocation.PRAYER_BAR) - || config.prayerFlickLocation().equals(PrayerFlickLocation.BOTH))) + if ((plugin.isPrayersActive() || plugin.isPrayerFlickAlwaysOn()) + && (plugin.getPrayerFlickLocation().equals(PrayerFlickLocation.PRAYER_BAR) + || plugin.getPrayerFlickLocation().equals(PrayerFlickLocation.BOTH))) { double t = plugin.getTickProgress(); @@ -158,13 +156,13 @@ class PrayerBarOverlay extends Overlay return; } - if (config.hideIfNotPraying() && !plugin.isPrayersActive()) + if (plugin.isHideIfNotPraying() && !plugin.isPrayersActive()) { showingPrayerBar = false; return; } - if (config.hideIfOutOfCombat() && localPlayer.getHealth() == -1) + if (plugin.isHideIfOutOfCombat() && localPlayer.getHealth() == -1) { showingPrayerBar = false; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerCounter.java index c510dab82e..68f36872ce 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerCounter.java @@ -25,16 +25,17 @@ package net.runelite.client.plugins.prayer; import java.awt.Color; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.plugins.Plugin; import net.runelite.client.ui.overlay.infobox.InfoBox; class PrayerCounter extends InfoBox { - @Getter + @Getter(AccessLevel.PACKAGE) private final PrayerType prayerType; - PrayerCounter(Plugin plugin, PrayerType prayerType) + PrayerCounter(final Plugin plugin, final PrayerType prayerType) { super(null, plugin); this.prayerType = prayerType; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerDoseOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerDoseOverlay.java index c9b590a4d2..549d4d6d2e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerDoseOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerDoseOverlay.java @@ -32,6 +32,7 @@ import java.awt.Rectangle; import java.time.Duration; import java.time.Instant; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Setter; import net.runelite.api.Client; @@ -49,6 +50,7 @@ import net.runelite.client.ui.overlay.tooltip.TooltipManager; import net.runelite.client.util.ColorUtil; import org.apache.commons.lang3.StringUtils; +@Singleton class PrayerDoseOverlay extends Overlay { private static final float PULSE_TIME = 2f * Constants.GAME_TICK_LENGTH; @@ -57,7 +59,7 @@ class PrayerDoseOverlay extends Overlay private static final Color END_COLOR = new Color(0, 92, 92); private final Client client; - private final PrayerConfig config; + private final PrayerPlugin plugin; private final TooltipManager tooltipManager; private Instant startOfLastTick = Instant.now(); private boolean trackTick = true; @@ -72,11 +74,11 @@ class PrayerDoseOverlay extends Overlay private boolean hasHolyWrench; @Inject - private PrayerDoseOverlay(final Client client, final TooltipManager tooltipManager, final PrayerConfig config) + private PrayerDoseOverlay(final Client client, final TooltipManager tooltipManager, final PrayerPlugin plugin) { this.client = client; this.tooltipManager = tooltipManager; - this.config = config; + this.plugin = plugin; setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); } @@ -112,7 +114,7 @@ class PrayerDoseOverlay extends Overlay final Point mousePosition = client.getMouseCanvasPosition(); - if (config.showPrayerStatistics() && bounds.contains(mousePosition.getX(), mousePosition.getY())) + if (plugin.isShowPrayerStatistics() && bounds.contains(mousePosition.getX(), mousePosition.getY())) { final String tooltip = "Time Remaining: " + getEstimatedTimeRemaining() + "
" + @@ -121,7 +123,7 @@ class PrayerDoseOverlay extends Overlay tooltipManager.add(new Tooltip(tooltip)); } - if (!config.showPrayerDoseIndicator() || !hasPrayerRestore) + if (!plugin.isShowPrayerDoseIndicator() || !hasPrayerRestore) { return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerFlickOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerFlickOverlay.java index 6a9bfbfd61..144f443dd1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerFlickOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerFlickOverlay.java @@ -29,6 +29,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.geom.Rectangle2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; @@ -36,19 +37,18 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; +@Singleton class PrayerFlickOverlay extends Overlay { private final Client client; - private final PrayerConfig config; private final PrayerPlugin plugin; @Inject - private PrayerFlickOverlay(Client client, PrayerConfig config, PrayerPlugin plugin) + private PrayerFlickOverlay(Client client, PrayerPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); this.client = client; - this.config = config; this.plugin = plugin; } @@ -56,9 +56,9 @@ class PrayerFlickOverlay extends Overlay public Dimension render(Graphics2D graphics) { // If there are no prayers active or flick location is set to the prayer bar we don't require the flick helper - if ((!plugin.isPrayersActive() && !config.prayerFlickAlwaysOn()) - || config.prayerFlickLocation().equals(PrayerFlickLocation.NONE) - || config.prayerFlickLocation().equals(PrayerFlickLocation.PRAYER_BAR)) + if ((!plugin.isPrayersActive() && !plugin.isPrayerFlickAlwaysOn()) + || plugin.getPrayerFlickLocation().equals(PrayerFlickLocation.NONE) + || plugin.getPrayerFlickLocation().equals(PrayerFlickLocation.PRAYER_BAR)) { return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerItems.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerItems.java index 6037701014..023dd8383f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerItems.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerItems.java @@ -26,12 +26,13 @@ package net.runelite.client.plugins.prayer; import com.google.common.collect.ImmutableMap; import java.util.Map; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.ItemID; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) enum PrayerItems { // Blessings diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java index 2755703f8f..85d8111a94 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java @@ -29,6 +29,7 @@ import com.google.inject.Provides; import java.time.Duration; import java.time.Instant; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Client; @@ -53,6 +54,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager; description = "Show various information related to prayer", tags = {"combat", "flicking", "overlay"} ) +@Singleton public class PrayerPlugin extends Plugin { private final PrayerCounter[] prayerCounter = new PrayerCounter[PrayerType.values().length]; @@ -86,6 +88,23 @@ public class PrayerPlugin extends Plugin @Inject private PrayerConfig config; + @Getter(AccessLevel.PACKAGE) + private PrayerFlickLocation prayerFlickLocation; + @Getter(AccessLevel.PACKAGE) + private boolean prayerFlickAlwaysOn; + private boolean prayerIndicator; + private boolean prayerIndicatorOverheads; + @Getter(AccessLevel.PACKAGE) + private boolean showPrayerDoseIndicator; + @Getter(AccessLevel.PACKAGE) + private boolean showPrayerStatistics; + @Getter(AccessLevel.PACKAGE) + private boolean showPrayerBar; + @Getter(AccessLevel.PACKAGE) + private boolean hideIfNotPraying; + @Getter(AccessLevel.PACKAGE) + private boolean hideIfOutOfCombat; + @Provides PrayerConfig provideConfig(ConfigManager configManager) { @@ -95,6 +114,7 @@ public class PrayerPlugin extends Plugin @Override protected void startUp() { + updateConfig(); overlayManager.add(flickOverlay); overlayManager.add(doseOverlay); overlayManager.add(barOverlay); @@ -114,11 +134,12 @@ public class PrayerPlugin extends Plugin { if (event.getGroup().equals("prayer")) { - if (!config.prayerIndicator()) + updateConfig(); + if (!this.prayerIndicator) { removeIndicators(); } - else if (!config.prayerIndicatorOverheads()) + else if (!this.prayerIndicatorOverheads) { removeOverheadsIndicators(); } @@ -156,22 +177,22 @@ public class PrayerPlugin extends Plugin { prayersActive = isAnyPrayerActive(); - if (!config.prayerFlickLocation().equals(PrayerFlickLocation.NONE)) + if (!this.prayerFlickLocation.equals(PrayerFlickLocation.NONE)) { startOfLastTick = Instant.now(); } - if (config.showPrayerDoseIndicator()) + if (this.showPrayerDoseIndicator) { doseOverlay.onTick(); } - if (config.showPrayerBar()) + if (this.showPrayerBar) { barOverlay.onTick(); } - if (!config.prayerIndicator()) + if (!this.prayerIndicator) { return; } @@ -183,7 +204,7 @@ public class PrayerPlugin extends Plugin if (client.isPrayerActive(prayer)) { - if (prayerType.isOverhead() && !config.prayerIndicatorOverheads()) + if (prayerType.isOverhead() && !this.prayerIndicatorOverheads) { continue; } @@ -296,4 +317,17 @@ public class PrayerPlugin extends Plugin infoBoxManager.removeIf(entry -> entry instanceof PrayerCounter && ((PrayerCounter) entry).getPrayerType().isOverhead()); } + + private void updateConfig() + { + this.prayerFlickLocation = config.prayerFlickLocation(); + this.prayerFlickAlwaysOn = config.prayerFlickAlwaysOn(); + this.prayerIndicator = config.prayerIndicator(); + this.prayerIndicatorOverheads = config.prayerIndicatorOverheads(); + this.showPrayerDoseIndicator = config.showPrayerDoseIndicator(); + this.showPrayerStatistics = config.showPrayerStatistics(); + this.showPrayerBar = config.showPrayerBar(); + this.hideIfNotPraying = config.hideIfNotPraying(); + this.hideIfOutOfCombat = config.hideIfOutOfCombat(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerRestoreType.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerRestoreType.java index d30b790a9e..426eacf782 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerRestoreType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerRestoreType.java @@ -40,7 +40,7 @@ enum PrayerRestoreType private final int[] items; - PrayerRestoreType(int... items) + PrayerRestoreType(final int... items) { this.items = items; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerType.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerType.java index 6ef41a7676..9431f81566 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerType.java @@ -24,13 +24,14 @@ */ package net.runelite.client.plugins.prayer; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.Prayer; import net.runelite.api.SpriteID; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) enum PrayerType { THICK_SKIN("Thick Skin", Prayer.THICK_SKIN, "+5% Defence", SpriteID.PRAYER_THICK_SKIN, false), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertOverlay.java index 617cd3e611..d96f1161e6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertOverlay.java @@ -21,6 +21,7 @@ import java.awt.Dimension; import java.awt.Font; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.InventoryID; import net.runelite.api.Item; @@ -37,22 +38,23 @@ import net.runelite.client.ui.overlay.components.ImageComponent; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; +@Singleton class PrayerAlertOverlay extends Overlay { private final Client client; - private final PrayerAlertConfig config; + private final PrayerAlertPlugin plugin; private final PanelComponent panelComponent = new PanelComponent(); private final ItemManager itemManager; private final Stat prayer = Stats.PRAYER; @Inject - private PrayerAlertOverlay(Client client, PrayerAlertConfig config, ItemManager itemManager) + private PrayerAlertOverlay(final Client client, final PrayerAlertPlugin plugin, final ItemManager itemManager) { setPosition(OverlayPosition.TOP_RIGHT); setLayer(OverlayLayer.ABOVE_WIDGETS); this.client = client; - this.config = config; + this.plugin = plugin; this.itemManager = itemManager; } @@ -62,9 +64,9 @@ class PrayerAlertOverlay extends Overlay panelComponent.getChildren().clear(); int prayerLevel = getPrayerLevel(); int prayerPoints = getPrayerPoints(); - if (config.oldRenderMode()) + if (plugin.isOldRenderMode()) { - if (config.alwaysShowAlert()) + if (plugin.isAlwaysShowAlert()) { boolean drink = drinkPrayerPotion(prayerLevel, prayerPoints); if (drink) @@ -84,7 +86,7 @@ class PrayerAlertOverlay extends Overlay } else { - if (config.alwaysShowAlert()) + if (plugin.isAlwaysShowAlert()) { boolean drink = drinkPrayerPotion(prayerLevel, prayerPoints); if (drink) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertPlugin.java index abeaef0e54..edba3b0550 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertPlugin.java @@ -18,7 +18,12 @@ package net.runelite.client.plugins.prayeralert; import com.google.inject.Provides; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; +import net.runelite.api.events.ConfigChanged; import net.runelite.client.config.ConfigManager; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; @@ -31,7 +36,7 @@ import net.runelite.client.ui.overlay.OverlayManager; type = PluginType.UTILITY, enabledByDefault = false ) - +@Singleton public class PrayerAlertPlugin extends Plugin { @Inject @@ -40,6 +45,14 @@ public class PrayerAlertPlugin extends Plugin @Inject private PrayerAlertOverlay overlay; + @Inject + private PrayerAlertConfig config; + + @Getter(AccessLevel.PACKAGE) + private boolean alwaysShowAlert; + @Getter(AccessLevel.PACKAGE) + private boolean oldRenderMode; + @Provides PrayerAlertConfig provideConfig(ConfigManager configManager) { @@ -49,6 +62,9 @@ public class PrayerAlertPlugin extends Plugin @Override protected void startUp() throws Exception { + this.alwaysShowAlert = config.alwaysShowAlert(); + this.oldRenderMode = config.oldRenderMode(); + overlayManager.add(overlay); } @@ -57,4 +73,14 @@ public class PrayerAlertPlugin extends Plugin { overlayManager.remove(overlay); } + + @Subscribe + private void onConfigChanged(ConfigChanged event) + { + if (event.getGroup().equals("prayeralert")) + { + this.alwaysShowAlert = config.alwaysShowAlert(); + this.oldRenderMode = config.oldRenderMode(); + } + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilePanel.java index eb43d74f59..878ed2b220 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilePanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilePanel.java @@ -32,6 +32,7 @@ import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; +import javax.inject.Singleton; import javax.swing.BorderFactory; import javax.swing.ImageIcon; import javax.swing.JLabel; @@ -46,6 +47,7 @@ import net.runelite.client.ui.ColorScheme; import net.runelite.client.util.ImageUtil; @Slf4j +@Singleton class ProfilePanel extends JPanel { private static final ImageIcon DELETE_ICON; @@ -61,7 +63,7 @@ class ProfilePanel extends JPanel private final String loginText; private String password = null; - ProfilePanel(final Client client, String data, ProfilesConfig config, ProfilesPanel parent) + ProfilePanel(final Client client, final String data, final ProfilesConfig config, final ProfilesPanel parent) { String[] parts = data.split(":"); this.loginText = parts[1]; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java index dd420dcadb..bf0283a4a3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java @@ -51,6 +51,7 @@ import javax.crypto.SecretKeyFactory; import javax.crypto.spec.PBEKeySpec; import javax.crypto.spec.SecretKeySpec; import javax.inject.Inject; +import javax.inject.Singleton; import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.JOptionPane; @@ -66,6 +67,7 @@ import net.runelite.client.ui.FontManager; import net.runelite.client.ui.PluginPanel; @Slf4j +@Singleton class ProfilesPanel extends PluginPanel { private static final int iterations = 100000; @@ -93,7 +95,7 @@ class ProfilesPanel extends PluginPanel private GridBagConstraints c; @Inject - public ProfilesPanel(Client client, ProfilesConfig config) + public ProfilesPanel(final Client client, final ProfilesConfig config) { super(); this.client = client; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java index 3eb6f00bfc..488a511a5f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.profiles; import com.google.inject.Provides; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.events.ConfigChanged; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; @@ -44,7 +45,7 @@ import net.runelite.client.util.ImageUtil; type = PluginType.UTILITY, enabledByDefault = false ) - +@Singleton public class ProfilesPlugin extends Plugin { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverOverlay.java index 2308a9adc9..55eaede2bb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverOverlay.java @@ -37,6 +37,7 @@ import java.util.Arrays; import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.InventoryID; @@ -62,6 +63,7 @@ import net.runelite.client.ui.overlay.components.BackgroundComponent; import net.runelite.client.ui.overlay.components.TextComponent; import net.runelite.client.util.ImageUtil; +@Singleton public class PuzzleSolverOverlay extends Overlay { private static final int INFO_BOX_WIDTH = 100; @@ -73,7 +75,7 @@ public class PuzzleSolverOverlay extends Overlay private static final int DOT_MARKER_SIZE = 16; private final Client client; - private final PuzzleSolverConfig config; + private final PuzzleSolverPlugin plugin; private final ScheduledExecutorService executorService; private final SpriteManager spriteManager; @@ -86,13 +88,13 @@ public class PuzzleSolverOverlay extends Overlay private BufferedImage rightArrow; @Inject - public PuzzleSolverOverlay(Client client, PuzzleSolverConfig config, ScheduledExecutorService executorService, SpriteManager spriteManager) + public PuzzleSolverOverlay(final Client client, final PuzzleSolverPlugin plugin, final ScheduledExecutorService executorService, final SpriteManager spriteManager) { setPosition(OverlayPosition.DYNAMIC); setPriority(OverlayPriority.HIGH); setLayer(OverlayLayer.ABOVE_WIDGETS); this.client = client; - this.config = config; + this.plugin = plugin; this.executorService = executorService; this.spriteManager = spriteManager; } @@ -100,7 +102,7 @@ public class PuzzleSolverOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if ((!config.displaySolution() && !config.displayRemainingMoves()) + if ((!plugin.isDisplaySolution() && !plugin.isDisplayRemainingMoves()) || client.getGameState() != GameState.LOGGED_IN) { return null; @@ -204,7 +206,7 @@ public class PuzzleSolverOverlay extends Overlay { infoString = "Solved!"; } - else if (config.displayRemainingMoves()) + else if (plugin.isDisplayRemainingMoves()) { infoString = "Moves left: " + stepsLeft; } @@ -213,9 +215,9 @@ public class PuzzleSolverOverlay extends Overlay infoString = null; } - if (config.displaySolution()) + if (plugin.isDisplaySolution()) { - if (config.drawDots()) + if (plugin.isDrawDots()) { graphics.setColor(Color.YELLOW); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java index d0d194cf1f..378217d02e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java @@ -29,8 +29,12 @@ import com.google.inject.Provides; import java.awt.Color; import java.util.Arrays; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.WidgetLoaded; @@ -65,6 +69,7 @@ import net.runelite.client.util.Text; tags = {"clues", "scrolls", "overlay"} ) @Slf4j +@Singleton public class PuzzleSolverPlugin extends Plugin { private static final Color CORRECT_MUSEUM_PUZZLE_ANSWER_COLOR = new Color(0, 248, 128); @@ -78,14 +83,25 @@ public class PuzzleSolverPlugin extends Plugin @Inject private Client client; + @Inject + private PuzzleSolverConfig config; + private LightboxState lightbox; private LightboxState[] changes = new LightboxState[LightBox.COMBINATIONS_POWER]; private Combination lastClick; private boolean lastClickInvalid; + @Getter(AccessLevel.PACKAGE) + private boolean displaySolution; + @Getter(AccessLevel.PACKAGE) + private boolean displayRemainingMoves; + @Getter(AccessLevel.PACKAGE) + private boolean drawDots; + @Override protected void startUp() throws Exception { + updateConfig(); overlayManager.add(overlay); } @@ -280,4 +296,20 @@ public class PuzzleSolverPlugin extends Plugin } } } + + @Subscribe + private void onConfigChanged(ConfigChanged event) + { + if (event.getGroup().equals("puzzlesolver")) + { + updateConfig(); + } + } + + private void updateConfig() + { + this.displaySolution = config.displaySolution(); + this.displayRemainingMoves = config.displayRemainingMoves(); + this.drawDots = config.drawDots(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/VarrockMuseumAnswer.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/VarrockMuseumAnswer.java index 0e4307d550..985b3a6b4e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/VarrockMuseumAnswer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/VarrockMuseumAnswer.java @@ -27,13 +27,14 @@ package net.runelite.client.plugins.puzzlesolver; import com.google.common.collect.ImmutableMap; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import net.runelite.api.Client; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; -@Getter +@Getter(AccessLevel.PACKAGE) @RequiredArgsConstructor enum VarrockMuseumAnswer { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/AttackMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/AttackMode.java index 95ac199470..0f5cde0c19 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/AttackMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/AttackMode.java @@ -32,7 +32,7 @@ public enum AttackMode private final String name; - AttackMode(String name) + AttackMode(final String name) { this.name = name; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/CurrentPlayersJFrame.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/CurrentPlayersJFrame.java index 19daf25e0f..dba8be11bd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/CurrentPlayersJFrame.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/CurrentPlayersJFrame.java @@ -16,6 +16,7 @@ import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.StringSelection; import java.awt.event.ActionListener; import java.util.List; +import javax.inject.Singleton; import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JLabel; @@ -25,12 +26,11 @@ import javax.swing.JScrollPane; import net.runelite.api.Client; import net.runelite.client.ui.FontManager; -public class CurrentPlayersJFrame extends JFrame +@Singleton +class CurrentPlayersJFrame extends JFrame { - public JList currentPlayersJList; - - CurrentPlayersJFrame(Client client, PvpToolsPlugin pvpToolsPlugin, List list) + CurrentPlayersJFrame(final Client client, final PvpToolsPlugin pvpToolsPlugin, final List list) { super(); int x = client.getCanvas().getLocationOnScreen().x + client.getCanvas().getWidth(); @@ -41,7 +41,7 @@ public class CurrentPlayersJFrame extends JFrame JButton refreshJButton = new JButton("Refresh"); refreshJButton.addActionListener(pvpToolsPlugin.currentPlayersActionListener); JButton copyJButton = new JButton("Copy List"); - currentPlayersJList = new JList<>(list.toArray()); + JList currentPlayersJList = new JList<>(list.toArray()); ActionListener copyButtonActionListener = e -> { StringSelection stringSelection; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/MissingPlayersJFrame.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/MissingPlayersJFrame.java index 08831d0fca..15b34e9f25 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/MissingPlayersJFrame.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/MissingPlayersJFrame.java @@ -16,6 +16,7 @@ import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.StringSelection; import java.awt.event.ActionListener; import java.util.List; +import javax.inject.Singleton; import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JLabel; @@ -25,12 +26,11 @@ import javax.swing.JScrollPane; import net.runelite.api.Client; import net.runelite.client.ui.FontManager; -public class MissingPlayersJFrame extends JFrame +@Singleton +class MissingPlayersJFrame extends JFrame { - public JList missingPlayersJList; - - MissingPlayersJFrame(Client client, PvpToolsPlugin pvpToolsPlugin, List list) + MissingPlayersJFrame(final Client client, final PvpToolsPlugin pvpToolsPlugin, final List list) { super(); int x = client.getCanvas().getLocationOnScreen().x + client.getCanvas().getWidth(); @@ -41,7 +41,7 @@ public class MissingPlayersJFrame extends JFrame JButton refreshJButton = new JButton("Refresh"); refreshJButton.addActionListener(pvpToolsPlugin.playersButtonActionListener); JButton copyJButton = new JButton("Copy List"); - missingPlayersJList = new JList<>(list.toArray()); + JList missingPlayersJList = new JList<>(list.toArray()); ActionListener copyButtonActionListener = e -> { StringSelection stringSelection; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java index 1952838914..a620a6d8aa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java @@ -16,6 +16,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.util.Arrays; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Varbits; import net.runelite.api.WorldType; @@ -28,20 +29,19 @@ import net.runelite.client.ui.overlay.components.table.TableElement; import net.runelite.client.ui.overlay.components.table.TableRow; import org.apache.commons.lang3.ArrayUtils; +@Singleton public class PlayerCountOverlay extends Overlay { private static int[] CLAN_WARS_REGIONS = {9520, 13135, 13134, 13133, 13131, 13130, 13387, 13386}; private final PvpToolsPlugin pvpToolsPlugin; - private final PvpToolsConfig config; private final Client client; @Inject - public PlayerCountOverlay(PvpToolsPlugin pvpToolsPlugin, PvpToolsConfig pvpToolsConfig, Client client) + public PlayerCountOverlay(final PvpToolsPlugin pvpToolsPlugin, final Client client) { this.pvpToolsPlugin = pvpToolsPlugin; - this.config = pvpToolsConfig; this.client = client; setLayer(OverlayLayer.ABOVE_WIDGETS); setPriority(OverlayPriority.HIGHEST); @@ -52,7 +52,7 @@ public class PlayerCountOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (config.countPlayers()) + if (pvpToolsPlugin.isCountPlayers()) { if ((client.getVar(Varbits.IN_WILDERNESS) == 1) || WorldType.isPvpWorld(client.getWorldType()) || ArrayUtils.contains(CLAN_WARS_REGIONS, client.getMapRegions()[0]) || diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java index 7d042374ac..09e0cccdf1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java @@ -9,13 +9,11 @@ package net.runelite.client.plugins.pvptools; -import java.awt.BasicStroke; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Polygon; import javax.inject.Inject; -import net.runelite.api.Client; +import javax.inject.Singleton; import net.runelite.api.Point; import net.runelite.client.ui.FontManager; import net.runelite.client.ui.overlay.Overlay; @@ -24,18 +22,15 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton public class PvpToolsOverlay extends Overlay { private PvpToolsPlugin pvpToolsPlugin; - private PvpToolsConfig pvpToolsConfig; - private Client client; @Inject - private PvpToolsOverlay(PvpToolsConfig pvpToolsConfig, PvpToolsPlugin pvpToolsPlugin, Client client) + private PvpToolsOverlay(final PvpToolsPlugin pvpToolsPlugin) { this.pvpToolsPlugin = pvpToolsPlugin; - this.pvpToolsConfig = pvpToolsConfig; - this.client = client; setLayer(OverlayLayer.ABOVE_WIDGETS); setPriority(OverlayPriority.HIGH); setPosition(OverlayPosition.DYNAMIC); @@ -45,7 +40,7 @@ public class PvpToolsOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (pvpToolsConfig.fallInHelper()) + if (pvpToolsPlugin.isFallInHelper()) { if (pvpToolsPlugin.fallinHelperEnabled) { @@ -55,16 +50,4 @@ public class PvpToolsOverlay extends Overlay } return null; } - - private void renderPoly(Graphics2D graphics, Color color, Polygon polygon) - { - if (polygon != null) - { - graphics.setColor(color); - graphics.setStroke(new BasicStroke(2)); - graphics.draw(polygon); - graphics.setColor(new Color(color.getRed(), color.getGreen(), color.getBlue(), 20)); - graphics.fill(polygon); - } - } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java index 3156f8061c..1686cd2353 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java @@ -14,6 +14,7 @@ import java.awt.BorderLayout; import java.awt.Color; import java.awt.Font; import java.awt.GridLayout; +import javax.inject.Singleton; import javax.swing.Box; import javax.swing.JButton; import javax.swing.JLabel; @@ -27,6 +28,7 @@ import net.runelite.client.ui.FontManager; import net.runelite.client.ui.PluginPanel; @Slf4j +@Singleton public class PvpToolsPanel extends PluginPanel { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java index 4a7c393f31..2e54b09cf0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java @@ -26,6 +26,7 @@ import java.util.TreeMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.stream.Collectors; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; @@ -46,8 +47,8 @@ import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuOpened; import net.runelite.api.events.PlayerDespawned; import net.runelite.api.events.PlayerSpawned; -import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.config.ConfigManager; +import net.runelite.client.config.Keybind; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.AsyncBufferedImage; import net.runelite.client.game.ItemManager; @@ -75,7 +76,7 @@ import org.apache.commons.lang3.StringUtils; type = PluginType.PVP, enabledByDefault = false ) - +@Singleton public class PvpToolsPlugin extends Plugin { @Inject @@ -107,16 +108,13 @@ public class PvpToolsPlugin extends Plugin @Inject private ItemManager itemManager; - @Inject - private ChatMessageManager chatMessageManager; - private PvpToolsPlugin uhPvpToolsPlugin = this; private static final String WALK_HERE = "WALK HERE"; private static final String CANCEL = "CANCEL"; private static final String CAST = "CAST"; private static final String ATTACK_OPTIONS_ATTACK = "ATTACK"; - public static final HashSet ATTACK_OPTIONS_KEYWORDS = new HashSet<>(); + private static final HashSet ATTACK_OPTIONS_KEYWORDS = new HashSet<>(); static { ATTACK_OPTIONS_KEYWORDS.add(CAST); @@ -162,7 +160,25 @@ public class PvpToolsPlugin extends Plugin } }; - + @Getter(AccessLevel.PACKAGE) + private boolean countPlayers; + private boolean countOverHeads; + @Getter(AccessLevel.PACKAGE) + private boolean fallInHelper; + private Keybind hotkey; + private Keybind renderSelf; + private boolean hideAttack; + private AttackMode hideAttackMode; + private boolean hideCast; + private AttackMode hideCastMode; + private String hideCastIgnored; + private boolean attackOptionsClan; + private boolean attackOptionsFriend; + private boolean levelRangeAttackOptions; + private boolean riskCalculatorEnabled; + private boolean missingPlayersEnabled; + private boolean currentPlayersEnabled; + @Inject private ClientToolbar clientToolbar; @@ -175,7 +191,7 @@ public class PvpToolsPlugin extends Plugin /** * The HotKeyListener for the hot key assigned in the config that triggers the Fall In Helper feature */ - private final HotkeyListener fallinHotkeyListener = new HotkeyListener(() -> config.hotkey()) + private final HotkeyListener fallinHotkeyListener = new HotkeyListener(() -> this.hotkey) { public void hotkeyPressed() { @@ -183,7 +199,7 @@ public class PvpToolsPlugin extends Plugin } }; - private final HotkeyListener renderselfHotkeyListener = new HotkeyListener(() -> config.renderSelf()) + private final HotkeyListener renderselfHotkeyListener = new HotkeyListener(() -> this.renderSelf) { public void hotkeyPressed() { @@ -253,6 +269,8 @@ public class PvpToolsPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(pvpToolsOverlay); overlayManager.add(playerCountOverlay); @@ -275,17 +293,17 @@ public class PvpToolsPlugin extends Plugin clientToolbar.addNavigation(navButton); - if (config.missingPlayersEnabled()) + if (this.missingPlayersEnabled) { panel.missingPlayers.setVisible(true); } - if (config.currentPlayersEnabled()) + if (this.currentPlayersEnabled) { panel.currentPlayers.setVisible(true); } - ignoredSpells = Arrays.asList(config.hideCastIgnored().toLowerCase().split("\\s*,\\s*")); + ignoredSpells = Arrays.asList(this.hideCastIgnored.toLowerCase().split("\\s*,\\s*")); } @Override @@ -303,52 +321,54 @@ public class PvpToolsPlugin extends Plugin { if (configChanged.getGroup().equals("pvptools")) { + updateConfig(); + switch (configChanged.getKey()) { case "countPlayers": - if (config.countPlayers()) + if (this.countPlayers) { updatePlayers(); } - if (!config.countPlayers()) + if (!this.countPlayers) { panel.disablePlayerCount(); } break; case "countOverHeads": - if (config.countOverHeads()) + if (this.countOverHeads) { countOverHeads(); } - if (!config.countOverHeads()) + if (!this.countOverHeads) { panel.disablePrayerCount(); } break; case "riskCalculator": - if (config.riskCalculatorEnabled()) + if (this.riskCalculatorEnabled) { getCarriedWealth(); } - if (!config.riskCalculatorEnabled()) + if (!this.riskCalculatorEnabled) { panel.disableRiskCalculator(); } break; case "missingPlayers": - if (config.missingPlayersEnabled()) + if (this.missingPlayersEnabled) { panel.missingPlayers.setVisible(true); } break; case "currentPlayers": - if (config.currentPlayersEnabled()) + if (this.currentPlayersEnabled) { panel.currentPlayers.setVisible(true); } break; case "hideCastIgnored": - ignoredSpells = Arrays.asList(config.hideCastIgnored().toLowerCase().split("\\s*,\\s*")); + ignoredSpells = Arrays.asList(this.hideCastIgnored.toLowerCase().split("\\s*,\\s*")); break; default: break; @@ -360,7 +380,7 @@ public class PvpToolsPlugin extends Plugin public void onItemContainerChanged(ItemContainerChanged event) { if (event.getItemContainer().equals(client.getItemContainer(InventoryID.INVENTORY)) && - config.riskCalculatorEnabled()) + this.riskCalculatorEnabled) { getCarriedWealth(); } @@ -369,13 +389,13 @@ public class PvpToolsPlugin extends Plugin @Subscribe public void onGameStateChanged(GameStateChanged event) { - if (event.getGameState().equals(GameState.LOGGED_IN) && config.riskCalculatorEnabled()) + if (event.getGameState().equals(GameState.LOGGED_IN) && this.riskCalculatorEnabled) { getCarriedWealth(); } if (event.getGameState().equals(GameState.LOGGED_IN)) { - if (config.countPlayers()) + if (this.countPlayers) { updatePlayers(); } @@ -385,11 +405,11 @@ public class PvpToolsPlugin extends Plugin @Subscribe public void onPlayerSpawned(PlayerSpawned event) { - if (config.countPlayers() && PvPUtil.isAttackable(client, event.getPlayer())) + if (this.countPlayers && PvPUtil.isAttackable(client, event.getPlayer())) { updatePlayers(); } - if (config.countOverHeads()) + if (this.countOverHeads) { countOverHeads(); } @@ -398,11 +418,11 @@ public class PvpToolsPlugin extends Plugin @Subscribe public void onPlayerDespawned(PlayerDespawned event) { - if (config.countPlayers() && PvPUtil.isAttackable(client, event.getPlayer())) + if (this.countPlayers && PvPUtil.isAttackable(client, event.getPlayer())) { updatePlayers(); } - if (config.countOverHeads()) + if (this.countOverHeads) { countOverHeads(); } @@ -411,7 +431,7 @@ public class PvpToolsPlugin extends Plugin @Subscribe public void onMenuEntryAdded(MenuEntryAdded menuEntryAdded) { - if (config.attackOptionsFriend() || config.attackOptionsClan() || config.levelRangeAttackOptions()) + if (this.attackOptionsFriend || this.attackOptionsClan || this.levelRangeAttackOptions) { final String pOptionToReplace = Text.removeTags(menuEntryAdded.getOption()).toUpperCase(); @@ -438,18 +458,18 @@ public class PvpToolsPlugin extends Plugin } - if (attackHotKeyPressed && config.attackOptionsClan() || config.attackOptionsFriend() || - config.levelRangeAttackOptions()) + if (attackHotKeyPressed && this.attackOptionsClan || this.attackOptionsFriend || + this.levelRangeAttackOptions) { - if (config.attackOptionsFriend() && player.isFriend()) + if (this.attackOptionsFriend && player.isFriend()) { swap(pOptionToReplace); } - else if (config.attackOptionsClan() && player.isClanMember()) + else if (this.attackOptionsClan && player.isClanMember()) { swap(pOptionToReplace); } - else if (config.levelRangeAttackOptions() && !PvPUtil.isAttackable(client, player)) + else if (this.levelRangeAttackOptions && !PvPUtil.isAttackable(client, player)) { swap(pOptionToReplace); } @@ -490,12 +510,12 @@ public class PvpToolsPlugin extends Plugin continue; } - if (option.contains("attack") && config.hideAttack() && shouldHide(config.hideAttackMode(), player)) + if (option.contains("attack") && this.hideAttack && shouldHide(this.hideAttackMode, player)) { continue; } - else if (option.contains("cast") && config.hideCast() && shouldHide(config.hideCastMode(), player) + else if (option.contains("cast") && this.hideCast && shouldHide(this.hideCastMode, player) && !ignoredSpells.contains(StringUtils.substringBefore(target, " ->"))) { continue; @@ -555,7 +575,7 @@ public class PvpToolsPlugin extends Plugin { friendlyPlayerCount = 0; enemyPlayerCount = 0; - if (config.countPlayers()) + if (this.countPlayers) { for (Player p : client.getPlayers()) { @@ -621,7 +641,7 @@ public class PvpToolsPlugin extends Plugin */ private void getCarriedWealth() { - if (!config.riskCalculatorEnabled()) + if (!this.riskCalculatorEnabled) { return; } @@ -783,4 +803,23 @@ public class PvpToolsPlugin extends Plugin return false; } + private void updateConfig() + { + this.countPlayers = config.countPlayers(); + this.countOverHeads = config.countOverHeads(); + this.fallInHelper = config.fallInHelper(); + this.hotkey = config.hotkey(); + this.renderSelf = config.renderSelf(); + this.hideAttack = config.hideAttack(); + this.hideAttackMode = config.hideAttackMode(); + this.hideCast = config.hideCast(); + this.hideCastMode = config.hideCastMode(); + this.hideCastIgnored = config.hideCastIgnored(); + this.attackOptionsClan = config.attackOptionsClan(); + this.attackOptionsFriend = config.attackOptionsFriend(); + this.levelRangeAttackOptions = config.levelRangeAttackOptions(); + this.riskCalculatorEnabled = config.riskCalculatorEnabled(); + this.missingPlayersEnabled = config.missingPlayersEnabled(); + this.currentPlayersEnabled = config.currentPlayersEnabled(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/skull.png b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/skull.png deleted file mode 100644 index 09869ea0e1c2e15208ccac2839127b0c42ae7d6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 448 zcmV;x0YCnUP)TQr$`dK^Q$VO1C|N+GS}7rM-cVqS3WUk6_YWWGKBv zP=V5Qm_+^r-C6VwYwjxU>1Jn}*_j}y10VbCH{YB&bG`xo2_lgT05Xcy-gf2_02nnq zzkX~22m!342(_??Q>A>C!F$!N z)r!mIl0gvA_kH@l&magmylqn>k%}mtAR+)rDKNdi!r}3$vDj`kAca756&ibzlFEf# zD1?Yf29p^ElNkWusL_Iy0;PO*9T70OUnioDFbs_#$#NlQ5u|kjm5=*f06?))g%ICf zs=D4ke0di}QDM~Uuw2N+Uj@CEtQ$n5UWcPz$0Bnbp#D|OFuPW7TJmf4CdU0P#{F)* zuJ`CQ>oKVlI%g-YS;U(SZ+?RE!F4s)#0*8M;c@zAT|uE(smA%i?v|}AIW^bmx=LNC qWwx%s<%7yyLvi}zUj2Ljuki)1TS~g;MmS3V0000 bossMatches) + || plugin.isEnableRotationWhitelist() && bossCount > bossMatches) { color = Color.RED; } String bossName = room.getBoss().getName(); String bossNameLC = bossName.toLowerCase(); - if (config.showRecommendedItems()) + if (plugin.isShowRecommendedItems()) { if (plugin.getRecommendedItemsList().get(bossNameLC) != null) { @@ -331,7 +332,7 @@ public class RaidsOverlay extends Overlay } } - tableComponent.addRow(config.showRecommendedItems() ? "" : room.getType().getName(), ColorUtil.prependColorTag(bossName, color)); + tableComponent.addRow(plugin.isShowRecommendedItems() ? "" : room.getType().getName(), ColorUtil.prependColorTag(bossName, color)); break; @@ -350,11 +351,11 @@ public class RaidsOverlay extends Overlay { color = Color.RED; } - if (config.colorTightrope() && puzzleNameLC.equals("tightrope")) + if (plugin.isColorTightrope() && puzzleNameLC.equals("tightrope")) { - color = config.tightropeColor(); + color = plugin.getTightropeColor(); } - if (config.crabHandler() && puzzleNameLC.equals("crabs")) + if (plugin.isCrabHandler() && puzzleNameLC.equals("crabs")) { if (plugin.getGoodCrabs() == null) { @@ -365,33 +366,33 @@ public class RaidsOverlay extends Overlay switch (plugin.getGoodCrabs()) { case "Good Crabs": - color = config.goodCrabColor(); + color = plugin.getGoodCrabColor(); break; case "Rare Crabs": - color = config.rareCrabColor(); + color = plugin.getRareCrabColor(); break; } } } - tableComponent.addRow(config.showRecommendedItems() ? "" : room.getType().getName(), ColorUtil.prependColorTag(puzzleName, color)); + tableComponent.addRow(plugin.isShowRecommendedItems() ? "" : room.getType().getName(), ColorUtil.prependColorTag(puzzleName, color)); break; case FARMING: - if (config.showScavsFarms()) + if (plugin.isShowScavsFarms()) { tableComponent.addRow("", ColorUtil.prependColorTag(room.getType().getName(), new Color(181, 230, 29))); } break; case SCAVENGERS: - if (config.scavsBeforeOlm() && roomCount == lastScavs) + if (plugin.isScavsBeforeOlm() && roomCount == lastScavs) { - tableComponent.addRow(config.showRecommendedItems() ? "" : "OlmPrep", ColorUtil.prependColorTag("Scavs", config.scavPrepColor())); + tableComponent.addRow(plugin.isShowRecommendedItems() ? "" : "OlmPrep", ColorUtil.prependColorTag("Scavs", plugin.getScavPrepColor())); } - else if (config.scavsBeforeIce() && scavsBeforeIceRooms.contains(roomCount)) + else if (plugin.isScavsBeforeIce() && scavsBeforeIceRooms.contains(roomCount)) { - tableComponent.addRow(config.showRecommendedItems() ? "" : "IcePrep", ColorUtil.prependColorTag("Scavs", config.scavPrepColor())); + tableComponent.addRow(plugin.isShowRecommendedItems() ? "" : "IcePrep", ColorUtil.prependColorTag("Scavs", plugin.getScavPrepColor())); } - else if (config.showScavsFarms()) + else if (plugin.isShowScavsFarms()) { tableComponent.addRow("", ColorUtil.prependColorTag("Scavs", new Color(181, 230, 29))); } @@ -407,12 +408,12 @@ public class RaidsOverlay extends Overlay height = (int) panelDims.getHeight(); //add recommended items - if (config.showRecommendedItems() && imageIds.size() > 0) + if (plugin.isShowRecommendedItems() && imageIds.size() > 0) { panelImages.getChildren().clear(); Integer[] idArray = imageIds.toArray(new Integer[0]); - int imagesVerticalOffset = TITLE_COMPONENT_HEIGHT + (sharable || config.alwaysShowWorldAndCC() ? LINE_COMPONENT_HEIGHT : 0) - BORDER_OFFSET; - int imagesMaxHeight = height - 2 * BORDER_OFFSET - TITLE_COMPONENT_HEIGHT - (sharable || config.alwaysShowWorldAndCC() ? LINE_COMPONENT_HEIGHT : 0); + int imagesVerticalOffset = TITLE_COMPONENT_HEIGHT + (sharable || plugin.isAlwaysShowWorldAndCC() ? LINE_COMPONENT_HEIGHT : 0) - BORDER_OFFSET; + int imagesMaxHeight = height - 2 * BORDER_OFFSET - TITLE_COMPONENT_HEIGHT - (sharable || plugin.isAlwaysShowWorldAndCC() ? LINE_COMPONENT_HEIGHT : 0); boolean smallImages = false; panelImages.setPreferredLocation(new Point(0, imagesVerticalOffset)); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPanel.java index 0f4e8c916b..2c16219f06 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPanel.java @@ -28,16 +28,17 @@ import java.awt.BorderLayout; import java.awt.FlowLayout; import java.awt.event.ActionEvent; import javax.inject.Inject; +import javax.inject.Singleton; import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.JPanel; import net.runelite.api.Client; import net.runelite.api.GameState; -import net.runelite.client.callback.ClientThread; import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.PluginPanel; +@Singleton class RaidsPanel extends PluginPanel { @Inject @@ -45,13 +46,11 @@ class RaidsPanel extends PluginPanel @Inject private RaidsPlugin raidsPlugin; - @Inject - private ClientThread clientThread; private JButton reloadButton = new JButton("Reload Instance"); private JButton reloadScouter = new JButton("Reload Raid Overlay"); private JLabel reloadMessage = new JLabel("

Instance Reload Helper

Reloading an instance will cause your client to disconnect temporarily.
"); - void init(RaidsConfig config) + void init() { // this may or may not qualify as a hack diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPartyOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPartyOverlay.java index 85295b7083..330902c22e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPartyOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPartyOverlay.java @@ -29,6 +29,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.util.Set; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.ClanMember; import net.runelite.api.Client; import net.runelite.api.MenuAction; @@ -44,6 +45,7 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.util.ColorUtil; +@Singleton public class RaidsPartyOverlay extends Overlay { static final String PARTY_OVERLAY_RESET = "Reset missing"; @@ -56,7 +58,7 @@ public class RaidsPartyOverlay extends Overlay private RaidsPlugin plugin; @Inject - private RaidsPartyOverlay(RaidsPlugin plugin) + private RaidsPartyOverlay(final RaidsPlugin plugin) { super(plugin); setPosition(OverlayPosition.TOP_RIGHT); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java index 4ea46f01cd..fd465aa6bd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java @@ -29,6 +29,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.inject.Binder; import com.google.inject.Provides; +import java.awt.Color; import java.awt.image.BufferedImage; import java.text.DecimalFormat; import java.time.Instant; @@ -42,6 +43,8 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.ChatMessageType; @@ -101,7 +104,7 @@ import org.apache.commons.lang3.StringUtils; type = PluginType.PVM, enabledByDefault = false ) - +@Singleton @Slf4j public class RaidsPlugin extends Plugin { @@ -144,15 +147,15 @@ public class RaidsPlugin extends Plugin ); private static final String TRIPLE_PUZZLE = "SFCCPC.PCSCPF - #WSEENES#WWWNEEE"; //good crabs first rare crabs second rare crabs third private static final Pattern PUZZLES = Pattern.compile("Puzzle - (\\w+)"); - @Getter + @Getter(AccessLevel.PACKAGE) private final ArrayList roomWhitelist = new ArrayList<>(); - @Getter + @Getter(AccessLevel.PACKAGE) private final ArrayList roomBlacklist = new ArrayList<>(); - @Getter + @Getter(AccessLevel.PACKAGE) private final ArrayList rotationWhitelist = new ArrayList<>(); - @Getter + @Getter(AccessLevel.PACKAGE) private final ArrayList layoutWhitelist = new ArrayList<>(); - @Getter + @Getter(AccessLevel.PACKAGE) private final Map> recommendedItemsList = new HashMap<>(); @Inject private ChatMessageManager chatMessageManager; @@ -182,23 +185,23 @@ public class RaidsPlugin extends Plugin private ClientToolbar clientToolbar; @Inject private ItemManager itemManager; - @Getter + @Getter(AccessLevel.PACKAGE) private Raid raid; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean inRaidChambers; - @Getter + @Getter(AccessLevel.PACKAGE) private String goodCrabs; - @Getter + @Getter(AccessLevel.PACKAGE) private int startPlayerCount; - @Getter + @Getter(AccessLevel.PACKAGE) private List partyMembers = new ArrayList<>(); - @Getter + @Getter(AccessLevel.PACKAGE) private List startingPartyMembers = new ArrayList<>(); - @Getter + @Getter(AccessLevel.PACKAGE) private Set missingPartyMembers = new HashSet<>(); - @Getter + @Getter(AccessLevel.PACKAGE) private String layoutFullCode; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean raidStarted; private int upperTime = -1; private int middleTime = -1; @@ -209,6 +212,59 @@ public class RaidsPlugin extends Plugin private NavigationButton navButton; private RaidsTimer timer; + @Getter(AccessLevel.PACKAGE) + private boolean enhanceScouterTitle; + @Getter(AccessLevel.PACKAGE) + private boolean hideBackground; + private boolean raidsTimer; + private boolean pointsMessage; + private boolean ptsHr; + @Getter(AccessLevel.PACKAGE) + private boolean scoutOverlay; + private boolean scoutOverlayAtBank; + private boolean scoutOverlayInRaid; + @Getter(AccessLevel.PACKAGE) + private boolean displayFloorBreak; + @Getter(AccessLevel.PACKAGE) + private boolean showRecommendedItems; + private String recommendedItems; + @Getter(AccessLevel.PACKAGE) + private boolean alwaysShowWorldAndCC; + private boolean layoutMessage; + @Getter(AccessLevel.PACKAGE) + private boolean colorTightrope; + @Getter(AccessLevel.PACKAGE) + private Color tightropeColor; + @Getter(AccessLevel.PACKAGE) + private boolean crabHandler; + @Getter(AccessLevel.PACKAGE) + private Color goodCrabColor; + @Getter(AccessLevel.PACKAGE) + private Color rareCrabColor; + @Getter(AccessLevel.PACKAGE) + private boolean enableRotationWhitelist; + private String whitelistedRotations; + @Getter(AccessLevel.PACKAGE) + private boolean enableLayoutWhitelist; + private String whitelistedLayouts; + @Getter(AccessLevel.PACKAGE) + private boolean showScavsFarms; + @Getter(AccessLevel.PACKAGE) + private boolean scavsBeforeIce; + @Getter(AccessLevel.PACKAGE) + private boolean scavsBeforeOlm; + @Getter(AccessLevel.PACKAGE) + private Color scavPrepColor; + private String whitelistedRooms; + private String blacklistedRooms; + @Getter(AccessLevel.PACKAGE) + private boolean hideRopeless; + @Getter(AccessLevel.PACKAGE) + private boolean hideVanguards; + @Getter(AccessLevel.PACKAGE) + private boolean hideUnknownCombat; + private boolean partyDisplay; + @Provides RaidsConfig provideConfig(ConfigManager configManager) { @@ -224,9 +280,11 @@ public class RaidsPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(overlay); overlayManager.add(pointsOverlay); - if (config.partyDisplay()) + if (this.partyDisplay) { overlayManager.add(partyOverlay); } @@ -234,7 +292,7 @@ public class RaidsPlugin extends Plugin clientThread.invokeLater(() -> checkRaidPresence(true)); widgetOverlay = overlayManager.getWidgetOverlay(WidgetInfo.RAIDS_POINTS_INFOBOX); RaidsPanel panel = injector.getInstance(RaidsPanel.class); - panel.init(config); + panel.init(); final BufferedImage icon = ImageUtil.getResourceStreamFromClass(this.getClass(), "instancereloadhelper.png"); navButton = NavigationButton.builder() .tooltip("Raids Reload") @@ -251,7 +309,7 @@ public class RaidsPlugin extends Plugin overlayManager.remove(overlay); overlayManager.remove(pointsOverlay); clientToolbar.removeNavigation(navButton); - if (config.partyDisplay()) + if (this.partyDisplay) { overlayManager.remove(partyOverlay); } @@ -271,6 +329,8 @@ public class RaidsPlugin extends Plugin { return; } + + updateConfig(); if (event.getKey().equals("raidsTimer")) { @@ -280,7 +340,7 @@ public class RaidsPlugin extends Plugin if (event.getKey().equals("partyDisplay")) { - if (config.partyDisplay()) + if (this.partyDisplay) { overlayManager.add(partyOverlay); } @@ -314,7 +374,7 @@ public class RaidsPlugin extends Plugin public void onVarbitChanged(VarbitChanged event) { checkRaidPresence(false); - if (config.partyDisplay()) + if (this.partyDisplay) { updatePartyMembers(false); } @@ -330,13 +390,13 @@ public class RaidsPlugin extends Plugin if (message.startsWith(RAID_START_MESSAGE)) { - if (config.raidsTimer()) + if (this.raidsTimer) { timer = new RaidsTimer(spriteManager.getSprite(TAB_QUESTS_BROWN_RAIDING_PARTY, 0), this, Instant.now()); infoBoxManager.addInfoBox(timer); raidStarted = true; } - if (config.partyDisplay()) + if (this.partyDisplay) { // Base this on visible players since party size shows people outside the lobby // and they did not get to come on the raid @@ -373,7 +433,7 @@ public class RaidsPlugin extends Plugin int timesec = timeToSeconds(matcher.group(1)); updateTooltip(); - if (config.pointsMessage()) + if (this.pointsMessage) { int totalPoints = client.getVar(Varbits.TOTAL_POINTS); int personalPoints = client.getVar(Varbits.PERSONAL_POINTS); @@ -402,7 +462,7 @@ public class RaidsPlugin extends Plugin .type(ChatMessageType.FRIENDSCHATNOTIFICATION) .runeLiteFormattedMessage(chatMessage) .build()); - if (config.ptsHr()) + if (this.ptsHr) { String ptssolo; { @@ -456,7 +516,7 @@ public class RaidsPlugin extends Plugin @Subscribe public void onClientTick(ClientTick event) { - if (!config.raidsTimer() + if (!this.raidsTimer || !client.getGameState().equals(GameState.LOGGED_IN) || tooltip == null) { @@ -617,14 +677,14 @@ public class RaidsPlugin extends Plugin } } } - else if (!config.scoutOverlayAtBank()) + else if (!this.scoutOverlayAtBank) { setOverlayStatus(false); } } // If we left party raid was started or we left raid - if (client.getVar(VarPlayer.IN_RAID_PARTY) == -1 && (!inRaidChambers || !config.scoutOverlayInRaid())) + if (client.getVar(VarPlayer.IN_RAID_PARTY) == -1 && (!inRaidChambers || !this.scoutOverlayInRaid)) { setOverlayStatus(false); raidStarted = false; @@ -633,7 +693,7 @@ public class RaidsPlugin extends Plugin private void sendRaidLayoutMessage() { - if (!config.layoutMessage()) + if (!this.layoutMessage) { return; } @@ -679,7 +739,7 @@ public class RaidsPlugin extends Plugin return; } - if (inRaidChambers && config.raidsTimer()) + if (inRaidChambers && this.raidsTimer) { if (!infoBoxManager.getInfoBoxes().contains(timer)) { @@ -699,11 +759,11 @@ public class RaidsPlugin extends Plugin private void updateLists() { - updateList(roomWhitelist, config.whitelistedRooms()); - updateList(roomBlacklist, config.blacklistedRooms()); - updateList(rotationWhitelist, config.whitelistedRotations()); - updateList(layoutWhitelist, config.whitelistedLayouts()); - updateMap(recommendedItemsList, config.recommendedItems()); + updateList(roomWhitelist, this.whitelistedRooms); + updateList(roomBlacklist, this.blacklistedRooms); + updateList(rotationWhitelist, this.whitelistedRotations); + updateList(layoutWhitelist, this.whitelistedLayouts); + updateMap(recommendedItemsList, this.recommendedItems); } private void updateMap(Map> map, String input) @@ -1172,4 +1232,40 @@ public class RaidsPlugin extends Plugin { overlay.setScoutOverlayShown(bool); } + + private void updateConfig() + { + this.enhanceScouterTitle = config.enhanceScouterTitle(); + this.hideBackground = config.hideBackground(); + this.raidsTimer = config.raidsTimer(); + this.pointsMessage = config.pointsMessage(); + this.ptsHr = config.ptsHr(); + this.scoutOverlay = config.scoutOverlay(); + this.scoutOverlayAtBank = config.scoutOverlayAtBank(); + this.scoutOverlayInRaid = config.scoutOverlayInRaid(); + this.displayFloorBreak = config.displayFloorBreak(); + this.showRecommendedItems = config.showRecommendedItems(); + this.recommendedItems = config.recommendedItems(); + this.alwaysShowWorldAndCC = config.alwaysShowWorldAndCC(); + this.layoutMessage = config.layoutMessage(); + this.colorTightrope = config.colorTightrope(); + this.tightropeColor = config.tightropeColor(); + this.crabHandler = config.crabHandler(); + this.goodCrabColor = config.goodCrabColor(); + this.rareCrabColor = config.rareCrabColor(); + this.enableRotationWhitelist = config.enableRotationWhitelist(); + this.whitelistedRotations = config.whitelistedRotations(); + this.enableLayoutWhitelist = config.enableLayoutWhitelist(); + this.whitelistedLayouts = config.whitelistedLayouts(); + this.showScavsFarms = config.showScavsFarms(); + this.scavsBeforeIce = config.scavsBeforeIce(); + this.scavsBeforeOlm = config.scavsBeforeOlm(); + this.scavPrepColor = config.scavPrepColor(); + this.whitelistedRooms = config.whitelistedRooms(); + this.blacklistedRooms = config.blacklistedRooms(); + this.hideRopeless = config.hideRopeless(); + this.hideVanguards = config.hideVanguards(); + this.hideUnknownCombat = config.hideUnknownCombat(); + this.partyDisplay = config.partyDisplay(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPointsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPointsOverlay.java index baedb561d7..7d75264915 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPointsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPointsOverlay.java @@ -29,6 +29,7 @@ import java.awt.Graphics2D; import java.text.NumberFormat; import java.util.Locale; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import net.runelite.api.Varbits; @@ -42,6 +43,7 @@ import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; +@Singleton public class RaidsPointsOverlay extends Overlay { private static final NumberFormat UNIQUE_FORMAT = NumberFormat.getPercentInstance(Locale.ENGLISH); @@ -59,7 +61,7 @@ public class RaidsPointsOverlay extends Overlay private RaidsPlugin plugin; @Inject - private RaidsPointsOverlay(RaidsPlugin plugin) + private RaidsPointsOverlay(final RaidsPlugin plugin) { super(plugin); setPosition(OverlayPosition.TOP_RIGHT); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsTimer.java index 8e7dec1309..b1cf6600ef 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsTimer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsTimer.java @@ -30,6 +30,7 @@ import java.time.Duration; import java.time.Instant; import java.time.LocalTime; import java.time.format.DateTimeFormatter; +import lombok.AccessLevel; import lombok.Setter; import net.runelite.client.plugins.Plugin; import net.runelite.client.ui.overlay.infobox.InfoBox; @@ -44,10 +45,10 @@ public class RaidsTimer extends InfoBox private LocalTime thirdFloorTime; private LocalTime olmTime; - @Setter + @Setter(AccessLevel.PACKAGE) private boolean stopped; - RaidsTimer(BufferedImage image, Plugin plugin, Instant startTime) + RaidsTimer(final BufferedImage image, final Plugin plugin, final Instant startTime) { super(image, plugin); this.startTime = startTime; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/shortcuts/ShortcutOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/shortcuts/ShortcutOverlay.java index 30762daf39..2ba5cd8d1b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/shortcuts/ShortcutOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/shortcuts/ShortcutOverlay.java @@ -5,6 +5,7 @@ import java.awt.Graphics2D; import java.awt.Polygon; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.GameObject; import net.runelite.api.Perspective; @@ -17,20 +18,19 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; +@Singleton public class ShortcutOverlay extends Overlay { private final Client client; - private final ShortcutConfig config; private final ShortcutPlugin plugin; private final BufferedImage treeIcon; private final BufferedImage strengthIcon; private final BufferedImage miningIcon; @Inject - ShortcutOverlay(Client client, ShortcutConfig config, ShortcutPlugin plugin, SkillIconManager iconManager) + ShortcutOverlay(final Client client, final ShortcutPlugin plugin, final SkillIconManager iconManager) { this.client = client; - this.config = config; this.plugin = plugin; setPosition(OverlayPosition.DYNAMIC); setPriority(OverlayPriority.LOW); @@ -76,7 +76,7 @@ public class ShortcutOverlay extends Overlay default: name = "null"; } - if (config.highlightShortcuts()) + if (plugin.isHighlightShortcuts()) { if (name.equals("Tree")) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/shortcuts/ShortcutPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/shortcuts/ShortcutPlugin.java index 422c85225f..b8bb023e98 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/shortcuts/ShortcutPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/shortcuts/ShortcutPlugin.java @@ -2,13 +2,16 @@ package net.runelite.client.plugins.raids.shortcuts; import com.google.inject.Provides; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.TileObject; import net.runelite.api.coords.WorldPoint; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameObjectDespawned; import net.runelite.api.events.GameObjectSpawned; import net.runelite.api.events.GameTick; @@ -24,6 +27,7 @@ import net.runelite.client.ui.overlay.OverlayManager; tags = {"boulder", "cox", "raids", "highlight"} ) @Slf4j +@Singleton public class ShortcutPlugin extends Plugin { private final List shortcut = new ArrayList<>(); @@ -33,6 +37,11 @@ public class ShortcutPlugin extends Plugin private OverlayManager overlayManager; @Inject private ShortcutOverlay overlay; + @Inject + private ShortcutConfig config; + + @Getter(AccessLevel.PACKAGE) + private boolean highlightShortcuts; List getShortcut() { @@ -48,6 +57,7 @@ public class ShortcutPlugin extends Plugin @Override protected void startUp() { + this.highlightShortcuts = config.highlightShortcuts(); overlayManager.add(overlay); } @@ -80,18 +90,17 @@ public class ShortcutPlugin extends Plugin @Subscribe public void onGameTick(GameTick tick) { - if (shortcut == null) + shortcut.removeIf(object -> object.getCanvasLocation() == null); + } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("shortcut")) { return; } - Iterator it = shortcut.iterator(); - while (it.hasNext()) - { - TileObject object = it.next(); - if (object.getCanvasLocation() == null) - { - it.remove(); - } - } + + this.highlightShortcuts = config.highlightShortcuts(); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/Layout.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/Layout.java index 09357f7774..5694b2333c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/Layout.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/Layout.java @@ -26,16 +26,17 @@ package net.runelite.client.plugins.raids.solver; import java.util.ArrayList; import java.util.List; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; public class Layout { - @Getter + @Getter(AccessLevel.PUBLIC) private final List rooms = new ArrayList<>(); - @Getter - @Setter + @Getter(AccessLevel.PUBLIC) + @Setter(AccessLevel.PACKAGE) private String code; public void add(Room room) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/LayoutSolver.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/LayoutSolver.java index f53de67596..a189d78ca7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/LayoutSolver.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/LayoutSolver.java @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -50,7 +51,7 @@ import lombok.extern.slf4j.Slf4j; @Singleton public class LayoutSolver { - @Getter + @Getter(AccessLevel.PACKAGE) private static final List layouts = new ArrayList<>(); private static final Pattern regex = Pattern.compile("^([A-Z]*)\\.([A-Z]*) - #([A-Z]*)#([A-Z]*)$"); private static final String[] codes = @@ -211,7 +212,10 @@ public class LayoutSolver room = new Room(position, '¤'); room.setPrevious(lastRoom); - lastRoom.setNext(room); + if (lastRoom != null) + { + lastRoom.setNext(room); + } layout.add(room); layout.setCode(code); position += 8; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/Room.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/Room.java index 4ffa7efb60..ab231774ed 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/Room.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/Room.java @@ -24,26 +24,27 @@ */ package net.runelite.client.plugins.raids.solver; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; public class Room { - @Getter + @Getter(AccessLevel.PUBLIC) private final int position; - @Getter + @Getter(AccessLevel.PUBLIC) private final char symbol; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private Room next; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private Room previous; - Room(int position, char symbol) + Room(final int position, final char symbol) { this.position = position; this.symbol = symbol; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/RotationSolver.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/RotationSolver.java index 04e0323a5c..fe32ceaf76 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/RotationSolver.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/RotationSolver.java @@ -40,14 +40,14 @@ public class RotationSolver new Rotation<>(Arrays.asList(Boss.MYSTICS, Boss.VANGUARDS, Boss.VASA, Boss.SHAMANS, Boss.VESPULA, Boss.GUARDIANS, Boss.MUTTADILES, Boss.TEKTON)) }; - public static boolean solve(RaidRoom[] rooms) + public static void solve(RaidRoom[] rooms) { if (rooms == null) { - return false; + return; } - Rotation match = null; + Rotation match = null; Integer start = null; Integer index = null; int known = 0; @@ -69,12 +69,12 @@ public class RotationSolver if (known < 2) { - return false; + return; } if (known == rooms.length) { - return true; + return; } for (Rotation rotation : ROTATIONS) @@ -99,7 +99,7 @@ public class RotationSolver if (match != null && match != rotation) { - return false; + return; } index = i - start; @@ -110,7 +110,7 @@ public class RotationSolver if (match == null) { - return false; + return; } for (int i = 0; i < rooms.length; i++) @@ -122,16 +122,15 @@ public class RotationSolver if (rooms[i].getBoss() == null || rooms[i].getBoss() == Boss.UNKNOWN) { - rooms[i].setBoss(match.get(index + i)); + rooms[i].setBoss((Boss) match.get(index + i)); } } - return true; } private static class Rotation extends ArrayList { - Rotation(Collection bosses) + Rotation(final Collection bosses) { super(bosses); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java index e937633dc8..4f59a5c241 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java @@ -39,7 +39,7 @@ public class BatSolver private final HashSet grubsChests; - public BatSolver(ThievingRoomType roomType) + public BatSolver(final ThievingRoomType roomType) { solution = new SolutionSet(roomType); grubsChests = new HashSet<>(); @@ -185,9 +185,4 @@ public class BatSolver double chestChance = (double) (timesFound) / (double) (mostFrequentPoison); return 1. / (1 + Math.exp(5 - 10 * chestChance)); } - - public int getNumberOfEmptyChests() - { - return solution.getEmptyChests().size(); - } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ChestIdentifier.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ChestIdentifier.java index 8e9bce1dc4..8cf12f817a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ChestIdentifier.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ChestIdentifier.java @@ -31,7 +31,7 @@ import net.runelite.client.plugins.raidsthieving.ThievingChest; public class ChestIdentifier { - public ChestIdentifier(ThievingRoomType roomType) + public ChestIdentifier(final ThievingRoomType roomType) { chestIds = new HashMap<>(); switch (roomType) @@ -250,11 +250,10 @@ public class ChestIdentifier } - public int indentifyChest(ThievingChest chest) + public void indentifyChest(ThievingChest chest) { int id = chestIds.get(chest.getInstancePoint()); chest.setChestId(id); - return id; } private Map chestIds; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/SolutionSet.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/SolutionSet.java index 82c36163e4..9b0df5be86 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/SolutionSet.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/SolutionSet.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.raidsthieving.BatSolver; import java.util.Arrays; import java.util.HashSet; import java.util.Set; +import lombok.AccessLevel; import lombok.Getter; // Each Thieving room has 4 empty chests @@ -135,7 +136,7 @@ class SolutionSet new SolutionSet(ThievingRoomType.STRAIGHT, 51, 53, 56, 59) }; - SolutionSet(ThievingRoomType type) + SolutionSet(final ThievingRoomType type) { this.type = type; emptyChests = new HashSet<>(); @@ -157,9 +158,9 @@ class SolutionSet return emptyChests.contains(chestId); } - @Getter + @Getter(AccessLevel.PACKAGE) private ThievingRoomType type; - @Getter + @Getter(AccessLevel.PACKAGE) private Set emptyChests; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ThievingRoomType.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ThievingRoomType.java index 26fabe5a8c..66581b5314 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ThievingRoomType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ThievingRoomType.java @@ -38,7 +38,7 @@ public enum ThievingRoomType private final int x; private final int y; - ThievingRoomType(int x, int y) + ThievingRoomType(final int x, final int y) { this.x = x; this.y = y; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java index 077132dc61..03c34ce7c0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java @@ -30,6 +30,7 @@ import java.awt.Graphics2D; import java.util.Map; import java.util.TreeSet; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Perspective; import net.runelite.api.Point; @@ -40,25 +41,25 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.components.ProgressPieComponent; +import static net.runelite.client.util.ColorUtil.setAlphaComponent; /** * Represents the overlay that shows timers on traps that are placed by the * player. */ +@Singleton public class ChestOverlay extends Overlay { private final Client client; private final RaidsThievingPlugin plugin; - private final RaidsThievingConfig config; @Inject - ChestOverlay(Client client, RaidsThievingPlugin plugin, RaidsThievingConfig config) + ChestOverlay(final Client client, final RaidsThievingPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); this.plugin = plugin; - this.config = config; this.client = client; } @@ -97,16 +98,13 @@ public class ChestOverlay extends Overlay { if (shouldDrawChest(pos)) { - Color drawColor = new Color(config.getPotentialBatColor().getRed(), - config.getPotentialBatColor().getGreen(), - config.getPotentialBatColor().getBlue(), - getChestOpacity(pos)); + Color drawColor = new Color(setAlphaComponent(plugin.getGetPotentialBatColor().getRGB(), getChestOpacity(pos))); drawCircleOnTrap(graphics, chest, drawColor); } } if (chest.isPoison()) { - drawCircleOnTrap(graphics, chest, config.getPoisonTrapColor()); + drawCircleOnTrap(graphics, chest, plugin.getGetPoisonTrapColor()); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/InstancePoint.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/InstancePoint.java index b1ba3e0102..7b6da0a445 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/InstancePoint.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/InstancePoint.java @@ -1,6 +1,7 @@ package net.runelite.client.plugins.raidsthieving; import java.util.Objects; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.Point; @@ -9,20 +10,20 @@ import net.runelite.api.coords.WorldPoint; /** * Represents a point in the instance chunk, invariant of rotation. */ -@Getter +@Getter(AccessLevel.PACKAGE) public class InstancePoint { private static final int CHUNK_SIZE = 8; private static final double CHUNK_OFFSET = 3.5; - private InstancePoint(int x, int y, int rot) + private InstancePoint(final int x, final int y, final int rot) { this.x = x; this.y = y; this.rot = rot; } - public InstancePoint(int x, int y) + public InstancePoint(final int x, final int y) { this.x = x; this.y = y; @@ -97,7 +98,9 @@ public class InstancePoint return Objects.hash(x, y); } + @Getter(AccessLevel.PUBLIC) private int x; + @Getter(AccessLevel.PUBLIC) private int y; private int rot; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingPlugin.java index a7679b985a..5df929535f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingPlugin.java @@ -25,11 +25,14 @@ package net.runelite.client.plugins.raidsthieving; import com.google.inject.Provides; +import java.awt.Color; import java.text.MessageFormat; import java.time.Instant; import java.util.HashMap; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; @@ -60,7 +63,7 @@ import net.runelite.client.ui.overlay.OverlayManager; type = PluginType.PVM, enabledByDefault = false ) - +@Singleton public class RaidsThievingPlugin extends Plugin { @Inject @@ -78,23 +81,29 @@ public class RaidsThievingPlugin extends Plugin @Inject private RaidsThievingConfig config; - @Getter + @Getter(AccessLevel.PACKAGE) private final Map chests = new HashMap<>(); - @Getter + @Getter(AccessLevel.PACKAGE) private Instant lastActionTime = Instant.ofEpochMilli(0); private boolean inRaidChambers; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean batsFound; - @Getter + @Getter(AccessLevel.PACKAGE) private BatSolver solver; - @Getter + @Getter(AccessLevel.PACKAGE) private ChestIdentifier mapper; + @Getter(AccessLevel.PACKAGE) + private Color getPotentialBatColor; + @Getter(AccessLevel.PACKAGE) + private Color getPoisonTrapColor; + private boolean batFoundNotify; + @Provides RaidsThievingConfig provideConfig(ConfigManager configManager) @@ -105,6 +114,8 @@ public class RaidsThievingPlugin extends Plugin @Override protected void startUp() { + updateConfig(); + overlayManager.add(overlay); overlay.updateConfig(); reset(); @@ -229,6 +240,7 @@ public class RaidsThievingPlugin extends Plugin { if (event.getGroup().equals("raidsthievingplugin")) { + updateConfig(); overlay.updateConfig(); } } @@ -261,7 +273,7 @@ public class RaidsThievingPlugin extends Plugin if (chest.isEmpty() && !chest.isPoison()) { batsFound = true; - if (config.batFoundNotify()) + if (this.batFoundNotify) { notifier.notify("Bats have been found!"); } @@ -275,5 +287,12 @@ public class RaidsThievingPlugin extends Plugin { return chests.get(worldPoint).getChestId(); } + + private void updateConfig() + { + this.getPotentialBatColor = config.getPotentialBatColor(); + this.getPoisonTrapColor = config.getPoisonTrapColor(); + this.batFoundNotify = config.batFoundNotify(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ThievingChest.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ThievingChest.java index 05a58d554e..f508fc42cc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ThievingChest.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ThievingChest.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.raidsthieving; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import net.runelite.api.GameObject; @@ -32,32 +33,33 @@ import net.runelite.api.coords.WorldPoint; /** * Wrapper class for a GameObject that represents a chest in the thieving room of Chambers of Xeric. */ -@Getter +@Getter(AccessLevel.PACKAGE) public class ThievingChest { /** * If the chest has never been opened, it could have bats. */ - @Setter + @Setter(AccessLevel.PACKAGE) private boolean everOpened; /** * If the chest is empty, it could have bats. */ - @Setter + @Setter(AccessLevel.PACKAGE) private boolean empty; /** * If the chest contains a poison trap instead. */ - @Setter + @Setter(AccessLevel.PACKAGE) private boolean poison; - @Setter + @Setter(AccessLevel.PUBLIC) private int chestId; private final WorldPoint localPoint; + @Getter(AccessLevel.PUBLIC) private final InstancePoint instancePoint; /** diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterOverlay.java index bff5f7c398..c96e12c0cf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterOverlay.java @@ -33,6 +33,7 @@ import java.awt.RenderingHints; import java.awt.Stroke; import java.awt.geom.Arc2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.VarPlayer; import net.runelite.api.widgets.Widget; @@ -41,6 +42,7 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; +@Singleton public class RegenMeterOverlay extends Overlay { private static final Color HITPOINTS_COLOR = brighter(0x9B0703); @@ -48,10 +50,20 @@ public class RegenMeterOverlay extends Overlay private static final Color OVERLAY_COLOR = new Color(255, 255, 255, 60); private static final double DIAMETER = 26D; private static final int OFFSET = 27; + private static final Stroke STROKE = new BasicStroke(2f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER); private final Client client; private RegenMeterPlugin plugin; - private RegenMeterConfig config; + + private Rectangle getBounds(WidgetInfo widgetInfo) + { + Widget widget = client.getWidget(widgetInfo); + if (widget == null || widget.isHidden()) + { + return null; + } + return widget.getBounds(); + } private static Color brighter(int color) { @@ -61,13 +73,12 @@ public class RegenMeterOverlay extends Overlay } @Inject - public RegenMeterOverlay(Client client, RegenMeterPlugin plugin, RegenMeterConfig config) + public RegenMeterOverlay(final Client client, final RegenMeterPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); this.client = client; this.plugin = plugin; - this.config = config; } @Override @@ -75,20 +86,18 @@ public class RegenMeterOverlay extends Overlay { g.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE); - if (config.showHitpoints()) + if (plugin.isShowHitpoints()) { renderRegen(g, WidgetInfo.MINIMAP_HEALTH_ORB, plugin.getHitpointsPercentage(), HITPOINTS_COLOR); } - if (config.showSpecial()) + if (plugin.isShowSpecial()) { if (client.getVar(VarPlayer.SPECIAL_ATTACK_ENABLED) == 1) { - final Widget widget = client.getWidget(WidgetInfo.MINIMAP_SPEC_ORB); - - if (widget != null && !widget.isHidden()) + final Rectangle bounds = getBounds(WidgetInfo.MINIMAP_SPEC_ORB); + if (bounds != null) { - final Rectangle bounds = widget.getBounds(); g.setColor(RegenMeterOverlay.OVERLAY_COLOR); g.fillOval( bounds.x + OFFSET, @@ -105,17 +114,13 @@ public class RegenMeterOverlay extends Overlay private void renderRegen(Graphics2D g, WidgetInfo widgetInfo, double percent, Color color) { - Widget widget = client.getWidget(widgetInfo); - if (widget == null || widget.isHidden()) + final Rectangle bounds = getBounds(widgetInfo); + if (bounds != null) { - return; + Arc2D.Double arc = new Arc2D.Double(bounds.x + OFFSET, bounds.y + (bounds.height / 2 - DIAMETER / 2), DIAMETER, DIAMETER, 90.d, -360.d * percent, Arc2D.OPEN); + g.setStroke(STROKE); + g.setColor(color); + g.draw(arc); } - Rectangle bounds = widget.getBounds(); - - Arc2D.Double arc = new Arc2D.Double(bounds.x + OFFSET, bounds.y + (bounds.height / 2D - DIAMETER / 2D), DIAMETER, DIAMETER, 90.d, -360.d * percent, Arc2D.OPEN); - final Stroke STROKE = new BasicStroke(2f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER); - g.setStroke(STROKE); - g.setColor(color); - g.draw(arc); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterPlugin.java index 004441b6e3..cc5b57e8ed 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterPlugin.java @@ -29,6 +29,8 @@ package net.runelite.client.plugins.regenmeter; import com.google.inject.Provides; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.Constants; @@ -36,6 +38,7 @@ import net.runelite.api.GameState; import net.runelite.api.Prayer; import net.runelite.api.Skill; import net.runelite.api.VarPlayer; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.VarbitChanged; @@ -51,6 +54,7 @@ import net.runelite.client.ui.overlay.OverlayManager; description = "Track and show the hitpoints and special attack regeneration timers", tags = {"combat", "health", "hitpoints", "special", "attack", "overlay", "notifications"} ) +@Singleton public class RegenMeterPlugin extends Plugin { private static final int SPEC_REGEN_TICKS = 50; @@ -71,16 +75,23 @@ public class RegenMeterPlugin extends Plugin @Inject private RegenMeterConfig config; - @Getter + @Getter(AccessLevel.PACKAGE) private double hitpointsPercentage; - @Getter + @Getter(AccessLevel.PACKAGE) private double specialPercentage; private int ticksSinceSpecRegen; private int ticksSinceHPRegen; private boolean wasRapidHeal; + @Getter(AccessLevel.PACKAGE) + private boolean showHitpoints; + @Getter(AccessLevel.PACKAGE) + private boolean showSpecial; + private boolean showWhenNoChange; + private int getNotifyBeforeHpRegenSeconds; + @Provides RegenMeterConfig provideConfig(ConfigManager configManager) { @@ -90,6 +101,7 @@ public class RegenMeterPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); overlayManager.add(overlay); } @@ -146,7 +158,7 @@ public class RegenMeterPlugin extends Plugin int currentHP = client.getBoostedSkillLevel(Skill.HITPOINTS); int maxHP = client.getRealSkillLevel(Skill.HITPOINTS); - if (currentHP == maxHP && !config.showWhenNoChange()) + if (currentHP == maxHP && !this.showWhenNoChange) { hitpointsPercentage = 0; } @@ -156,7 +168,7 @@ public class RegenMeterPlugin extends Plugin hitpointsPercentage = 1 - hitpointsPercentage; } - if (config.getNotifyBeforeHpRegenSeconds() > 0 && currentHP < maxHP && shouldNotifyHpRegenThisTick(ticksPerHPRegen)) + if (this.getNotifyBeforeHpRegenSeconds > 0 && currentHP < maxHP && shouldNotifyHpRegenThisTick(ticksPerHPRegen)) { notifier.notify("[" + client.getLocalPlayer().getName() + "] regenerates their next hitpoint soon!"); } @@ -166,7 +178,24 @@ public class RegenMeterPlugin extends Plugin { // if the configured duration lies between two ticks, choose the earlier tick final int ticksBeforeHPRegen = ticksPerHPRegen - ticksSinceHPRegen; - final int notifyTick = (int) Math.ceil(config.getNotifyBeforeHpRegenSeconds() * 1000d / Constants.GAME_TICK_LENGTH); + final int notifyTick = (int) Math.ceil(this.getNotifyBeforeHpRegenSeconds * 1000d / Constants.GAME_TICK_LENGTH); return ticksBeforeHPRegen == notifyTick; } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (event.getGroup().equals("regenmeter")) + { + updateConfig(); + } + } + + private void updateConfig() + { + this.showHitpoints = config.showHitpoints(); + this.showSpecial = config.showSpecial(); + this.showWhenNoChange = config.showWhenNoChange(); + this.getNotifyBeforeHpRegenSeconds = config.getNotifyBeforeHpRegenSeconds(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPlugin.java index 2d95269eb5..deec5d3ec6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPlugin.java @@ -31,6 +31,7 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.HashTable; @@ -57,6 +58,7 @@ import net.runelite.client.plugins.PluginDescriptor; name = "Reorder Prayers", description = "Reorder the prayers displayed on the Prayer panel" ) +@Singleton public class ReorderPrayersPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java index b633a89b10..8a0f91e692 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java @@ -36,8 +36,10 @@ import java.time.format.FormatStyle; import java.time.temporal.ChronoUnit; import java.util.Date; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.GameState; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; @@ -53,6 +55,7 @@ import net.runelite.client.task.Schedule; description = "Replace the text on the Report button with the current time", tags = {"time", "utc"} ) +@Singleton public class ReportButtonPlugin extends Plugin { private static final ZoneId UTC = ZoneId.of("UTC"); @@ -73,6 +76,8 @@ public class ReportButtonPlugin extends Plugin @Inject private ReportButtonConfig config; + private TimeStyle timeStyle; + @Provides ReportButtonConfig provideConfig(ConfigManager configManager) { @@ -82,6 +87,7 @@ public class ReportButtonPlugin extends Plugin @Override public void startUp() { + this.timeStyle = config.time(); clientThread.invoke(this::updateReportButtonTime); } @@ -142,7 +148,7 @@ public class ReportButtonPlugin extends Plugin return; } - switch (config.time()) + switch (this.timeStyle) { case UTC: reportButton.setText(getUTCTime()); @@ -198,4 +204,13 @@ public class ReportButtonPlugin extends Plugin { return DATE_FORMAT.format(new Date()); } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (event.getGroup().equals("regenmeter")) + { + this.timeStyle = config.time(); + } + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/TimeStyle.java b/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/TimeStyle.java index 40095b9a4f..b67549faf8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/TimeStyle.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/TimeStyle.java @@ -35,7 +35,7 @@ public enum TimeStyle private final String name; - TimeStyle(String name) + TimeStyle(final String name) { this.name = name; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenOverlay.java index 4b5cc234e1..e76f6c4f70 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenOverlay.java @@ -29,12 +29,14 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Polygon; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.coords.LocalPoint; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; +@Singleton public class RoguesDenOverlay extends Overlay { private static final int MAX_DISTANCE = 2350; @@ -43,7 +45,7 @@ public class RoguesDenOverlay extends Overlay private final RoguesDenPlugin plugin; @Inject - public RoguesDenOverlay(Client client, RoguesDenPlugin plugin) + public RoguesDenOverlay(final Client client, final RoguesDenPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenPlugin.java index 138ee3d9ac..0d7583ea7e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenPlugin.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.roguesden; import java.util.HashMap; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Client; @@ -53,6 +54,7 @@ import net.runelite.client.ui.overlay.OverlayManager; description = "Mark tiles and clickboxes to help traverse the maze", tags = {"agility", "maze", "minigame", "overlay", "thieving"} ) +@Singleton public class RoguesDenPlugin extends Plugin { @Getter(AccessLevel.PACKAGE) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssOverlay.java index b0e2bb0b99..29ea78ad00 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssOverlay.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.runecraft; import com.google.inject.Inject; +import com.google.inject.Singleton; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; @@ -59,6 +60,7 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton class AbyssOverlay extends Overlay { private static final Dimension IMAGE_SIZE = new Dimension(15, 14); @@ -68,25 +70,23 @@ class AbyssOverlay extends Overlay private final Client client; private final RunecraftPlugin plugin; - private final RunecraftConfig config; @Inject private ItemManager itemManager; @Inject - AbyssOverlay(Client client, RunecraftPlugin plugin, RunecraftConfig config) + AbyssOverlay(final Client client, final RunecraftPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); this.client = client; this.plugin = plugin; - this.config = config; } @Override public Dimension render(Graphics2D graphics) { - if (config.showRifts()) + if (plugin.isShowRifts()) { for (DecorativeObject object : plugin.getAbyssObjects()) { @@ -94,7 +94,7 @@ class AbyssOverlay extends Overlay } } - if (config.hightlightDarkMage()) + if (plugin.isHightlightDarkMage()) { highlightDarkMage(graphics); } @@ -132,7 +132,7 @@ class AbyssOverlay extends Overlay return; } - if (config.showClickBox()) + if (plugin.isShowClickBox()) { //Draw clickbox Point mousePosition = client.getMouseCanvasPosition(); @@ -185,55 +185,55 @@ class AbyssOverlay extends Overlay public void updateConfig() { rifts.clear(); - if (config.showAir()) + if (plugin.isShowAir()) { rifts.add(AIR_RIFT); } - if (config.showBlood()) + if (plugin.isShowBlood()) { rifts.add(BLOOD_RIFT); } - if (config.showBody()) + if (plugin.isShowBody()) { rifts.add(BODY_RIFT); } - if (config.showChaos()) + if (plugin.isShowChaos()) { rifts.add(CHAOS_RIFT); } - if (config.showCosmic()) + if (plugin.isShowCosmic()) { rifts.add(COSMIC_RIFT); } - if (config.showDeath()) + if (plugin.isShowDeath()) { rifts.add(DEATH_RIFT); } - if (config.showEarth()) + if (plugin.isShowEarth()) { rifts.add(EARTH_RIFT); } - if (config.showFire()) + if (plugin.isShowFire()) { rifts.add(FIRE_RIFT); } - if (config.showLaw()) + if (plugin.isShowLaw()) { rifts.add(LAW_RIFT); } - if (config.showMind()) + if (plugin.isShowMind()) { rifts.add(MIND_RIFT); } - if (config.showNature()) + if (plugin.isShowNature()) { rifts.add(NATURE_RIFT); } - if (config.showSoul()) + if (plugin.isShowSoul()) { rifts.add(SOUL_RIFT); } - if (config.showWater()) + if (plugin.isShowWater()) { rifts.add(WATER_RIFT); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssRifts.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssRifts.java index e9546e3cee..20bc229b32 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssRifts.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssRifts.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.runecraft; import java.util.HashMap; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; import static net.runelite.api.ItemID.*; import net.runelite.api.ObjectID; @@ -46,10 +47,10 @@ public enum AbyssRifts SOUL_RIFT(ObjectID.SOUL_RIFT, SOUL_RUNE), WATER_RIFT(ObjectID.WATER_RIFT, WATER_RUNE); - @Getter + @Getter(AccessLevel.PACKAGE) private final int objectId; - @Getter + @Getter(AccessLevel.PACKAGE) private final int itemId; private static final Map rifts = new HashMap<>(); @@ -62,7 +63,7 @@ public enum AbyssRifts } } - AbyssRifts(int objectId, int itemId) + AbyssRifts(final int objectId, final int itemId) { this.objectId = objectId; this.itemId = itemId; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftOverlay.java index 91a95bb885..f78880bc84 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftOverlay.java @@ -4,24 +4,23 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; -import net.runelite.api.Client; +import javax.inject.Singleton; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.components.ComponentOrientation; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; +@Singleton public class RunecraftOverlay extends Overlay { private final RunecraftPlugin plugin; - private final Client client; private final PanelComponent panel = new PanelComponent(); @Inject - RunecraftOverlay(RunecraftPlugin plugin, Client client) + RunecraftOverlay(final RunecraftPlugin plugin) { this.plugin = plugin; - this.client = client; setPosition(OverlayPosition.CANVAS_TOP_RIGHT); panel.setOrientation(ComponentOrientation.VERTICAL); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java index b653a56fb2..f42c10102b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java @@ -31,6 +31,7 @@ import java.util.List; import java.util.Set; import java.util.stream.Stream; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ChatMessageType; @@ -69,6 +70,7 @@ import net.runelite.client.util.Text; description = "Show minimap icons and clickboxes for abyssal rifts", tags = {"abyssal", "minimap", "overlay", "rifts", "rc", "runecrafting"} ) +@Singleton public class RunecraftPlugin extends Plugin { private static final int FIRE_ALTAR = 10315; @@ -113,6 +115,43 @@ public class RunecraftPlugin extends Plugin @Inject private MenuManager menuManager; + private boolean Lavas; + @Getter(AccessLevel.PACKAGE) + private boolean essPouch; + @Getter(AccessLevel.PACKAGE) + private boolean hightlightDarkMage; + private boolean degradingNotification; + @Getter(AccessLevel.PACKAGE) + private boolean showRifts; + @Getter(AccessLevel.PACKAGE) + private boolean showAir; + @Getter(AccessLevel.PACKAGE) + private boolean showBlood; + @Getter(AccessLevel.PACKAGE) + private boolean showBody; + @Getter(AccessLevel.PACKAGE) + private boolean showChaos; + @Getter(AccessLevel.PACKAGE) + private boolean showCosmic; + @Getter(AccessLevel.PACKAGE) + private boolean showDeath; + @Getter(AccessLevel.PACKAGE) + private boolean showEarth; + @Getter(AccessLevel.PACKAGE) + private boolean showFire; + @Getter(AccessLevel.PACKAGE) + private boolean showLaw; + @Getter(AccessLevel.PACKAGE) + private boolean showMind; + @Getter(AccessLevel.PACKAGE) + private boolean showNature; + @Getter(AccessLevel.PACKAGE) + private boolean showSoul; + @Getter(AccessLevel.PACKAGE) + private boolean showWater; + @Getter(AccessLevel.PACKAGE) + private boolean showClickBox; + @Provides RunecraftConfig getConfig(ConfigManager configManager) { @@ -122,6 +161,8 @@ public class RunecraftPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(abyssOverlay); abyssOverlay.updateConfig(); overlayManager.add(runecraftOverlay); @@ -147,6 +188,8 @@ public class RunecraftPlugin extends Plugin return; } + updateConfig(); + if (event.getKey().equals("essPouch")) { addSwaps(); @@ -163,7 +206,7 @@ public class RunecraftPlugin extends Plugin return; } - if (config.degradingNotification()) + if (this.degradingNotification) { if (event.getMessage().contains(POUCH_DECAYED_MESSAGE)) { @@ -294,8 +337,8 @@ public class RunecraftPlugin extends Plugin else if (event.getItemContainer() == client.getItemContainer(InventoryID.EQUIPMENT)) { final Item[] items = event.getItemContainer().getItems(); - wearingTiara = config.Lavas() && items[EquipmentInventorySlot.HEAD.getSlotIdx()].getId() == ItemID.FIRE_TIARA; - wearingCape = config.Lavas() && items[EquipmentInventorySlot.CAPE.getSlotIdx()].getId() == ItemID.RUNECRAFT_CAPE || config.Lavas() && items[EquipmentInventorySlot.CAPE.getSlotIdx()].getId() == ItemID.RUNECRAFT_CAPET || config.Lavas() && items[EquipmentInventorySlot.CAPE.getSlotIdx()].getId() == ItemID.MAX_CAPE_13342; + wearingTiara = this.Lavas && items[EquipmentInventorySlot.HEAD.getSlotIdx()].getId() == ItemID.FIRE_TIARA; + wearingCape = this.Lavas && items[EquipmentInventorySlot.CAPE.getSlotIdx()].getId() == ItemID.RUNECRAFT_CAPE || config.Lavas() && items[EquipmentInventorySlot.CAPE.getSlotIdx()].getId() == ItemID.RUNECRAFT_CAPET || config.Lavas() && items[EquipmentInventorySlot.CAPE.getSlotIdx()].getId() == ItemID.MAX_CAPE_13342; } } @@ -338,4 +381,27 @@ public class RunecraftPlugin extends Plugin menuManager.removeSwap("deposit", "pouch", 2, 57, "fill", "pouch", 9, 1007); menuManager.removeSwap("fill", "pouch", "empty", "pouch", true, false); } + + private void updateConfig() + { + this.Lavas = config.Lavas(); + this.essPouch = config.essPouch(); + this.hightlightDarkMage = config.hightlightDarkMage(); + this.degradingNotification = config.degradingNotification(); + this.showRifts = config.showRifts(); + this.showAir = config.showAir(); + this.showBlood = config.showBlood(); + this.showBody = config.showBody(); + this.showChaos = config.showChaos(); + this.showCosmic = config.showCosmic(); + this.showDeath = config.showDeath(); + this.showEarth = config.showEarth(); + this.showFire = config.showFire(); + this.showLaw = config.showLaw(); + this.showMind = config.showMind(); + this.showNature = config.showNature(); + this.showSoul = config.showSoul(); + this.showWater = config.showWater(); + this.showClickBox = config.showClickBox(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuConfig.java index 0e44decfa0..ab4face95a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuConfig.java @@ -35,10 +35,10 @@ public interface RunedokuConfig extends Config { @ConfigItem( - position = 0, - keyName = "colorStub", - name = "Colors", - description = "" //stubs don't show descriptions when hovered over + position = 0, + keyName = "colorStub", + name = "Colors", + description = "" //stubs don't show descriptions when hovered over ) default Stub colorStub() { @@ -46,11 +46,11 @@ public interface RunedokuConfig extends Config } @ConfigItem( - position = 1, - keyName = "mindRuneColor", - name = "Mind Rune Color", - description = "Color used to highlight Mind runes.", - parent = "colorStub" + position = 1, + keyName = "mindRuneColor", + name = "Mind Rune Color", + description = "Color used to highlight Mind runes.", + parent = "colorStub" ) default Color mindRuneColor() { @@ -58,11 +58,11 @@ public interface RunedokuConfig extends Config } @ConfigItem( - position = 2, - keyName = "fireRuneColor", - name = "Fire Rune Color", - description = "Color used to highlight Fire runes.", - parent = "colorStub" + position = 2, + keyName = "fireRuneColor", + name = "Fire Rune Color", + description = "Color used to highlight Fire runes.", + parent = "colorStub" ) default Color fireRuneColor() { @@ -70,11 +70,11 @@ public interface RunedokuConfig extends Config } @ConfigItem( - position = 3, - keyName = "bodyRuneColor", - name = "Body Rune Color", - description = "Color used to highlight Body runes.", - parent = "colorStub" + position = 3, + keyName = "bodyRuneColor", + name = "Body Rune Color", + description = "Color used to highlight Body runes.", + parent = "colorStub" ) default Color bodyRuneColor() { @@ -82,11 +82,11 @@ public interface RunedokuConfig extends Config } @ConfigItem( - position = 4, - keyName = "airRuneColor", - name = "Air Rune Color", - description = "Color used to highlight Air runes.", - parent = "colorStub" + position = 4, + keyName = "airRuneColor", + name = "Air Rune Color", + description = "Color used to highlight Air runes.", + parent = "colorStub" ) default Color airRuneColor() { @@ -94,11 +94,11 @@ public interface RunedokuConfig extends Config } @ConfigItem( - position = 5, - keyName = "deathRuneColor", - name = "Death Rune Color", - description = "Color used to highlight Death runes.", - parent = "colorStub" + position = 5, + keyName = "deathRuneColor", + name = "Death Rune Color", + description = "Color used to highlight Death runes.", + parent = "colorStub" ) default Color deathRuneColor() { @@ -106,11 +106,11 @@ public interface RunedokuConfig extends Config } @ConfigItem( - position = 6, - keyName = "waterRuneColor", - name = "Water Rune Color", - description = "Color used to highlight Water runes.", - parent = "colorStub" + position = 6, + keyName = "waterRuneColor", + name = "Water Rune Color", + description = "Color used to highlight Water runes.", + parent = "colorStub" ) default Color waterRuneColor() { @@ -118,11 +118,11 @@ public interface RunedokuConfig extends Config } @ConfigItem( - position = 7, - keyName = "chaosRuneColor", - name = "Chaos Rune Color", - description = "Color used to highlight Chaos runes.", - parent = "colorStub" + position = 7, + keyName = "chaosRuneColor", + name = "Chaos Rune Color", + description = "Color used to highlight Chaos runes.", + parent = "colorStub" ) default Color chaosRuneColor() { @@ -130,11 +130,11 @@ public interface RunedokuConfig extends Config } @ConfigItem( - position = 8, - keyName = "earthRuneColor", - name = "Earth Rune Color", - description = "Color used to highlight Earth runes.", - parent = "colorStub" + position = 8, + keyName = "earthRuneColor", + name = "Earth Rune Color", + description = "Color used to highlight Earth runes.", + parent = "colorStub" ) default Color earthRuneColor() { @@ -142,11 +142,11 @@ public interface RunedokuConfig extends Config } @ConfigItem( - position = 9, - keyName = "lawRuneColor", - name = "Law Rune Color", - description = "Color used to highlight Law runes.", - parent = "colorStub" + position = 9, + keyName = "lawRuneColor", + name = "Law Rune Color", + description = "Color used to highlight Law runes.", + parent = "colorStub" ) default Color lawRuneColor() { @@ -154,10 +154,10 @@ public interface RunedokuConfig extends Config } @ConfigItem( - position = 10, - keyName = "miscFeature", - name = "Miscellaneous Features", - description = "" + position = 10, + keyName = "miscFeature", + name = "Miscellaneous Features", + description = "" ) default Stub miscFeature() { @@ -165,10 +165,10 @@ public interface RunedokuConfig extends Config } @ConfigItem( - position = 11, - keyName = "onlyHighlightSelectedPiece", - name = "Only Highlight Selected Piece", - description = "Instead of showing all, this option only show what rune you have selected." + position = 11, + keyName = "onlyHighlightSelectedPiece", + name = "Only Highlight Selected Piece", + description = "Instead of showing all, this option only show what rune you have selected." ) default boolean onlyHighlightSelectedPiece() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuOverlay.java index 5e44e55bee..0756a6d4b6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuOverlay.java @@ -30,6 +30,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.util.ArrayList; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.widgets.Widget; import net.runelite.client.ui.overlay.Overlay; @@ -41,23 +42,22 @@ import net.runelite.client.ui.overlay.OverlayUtil; /** * @author gazivodag */ +@Singleton class RunedokuOverlay extends Overlay { private final RunedokuPlugin plugin; private final Client client; private final RunedokuUtil util; - private final RunedokuConfig config; @Inject - private RunedokuOverlay(final RunedokuPlugin plugin, final Client client, final RunedokuUtil util, final RunedokuConfig config) + private RunedokuOverlay(final RunedokuPlugin plugin, final Client client, final RunedokuUtil util) { super(plugin); this.plugin = plugin; this.client = client; this.util = util; - this.config = config; setPosition(OverlayPosition.DETACHED); setLayer(OverlayLayer.ALWAYS_ON_TOP); @@ -140,7 +140,7 @@ class RunedokuOverlay extends Overlay } else { - if (!config.onlyHighlightSelectedPiece() ^ (config.onlyHighlightSelectedPiece() && util.getSelectedPiece(client) == simpleArr.get(iteration))) + if (!plugin.isOnlyHighlightSelectedPiece() ^ (plugin.isOnlyHighlightSelectedPiece() && util.getSelectedPiece(client) == simpleArr.get(iteration))) { OverlayUtil.renderPolygon(graphics, RunedokuUtil.rectangleToPolygon(squareToHighlight.getBounds()), util.sudokuPieceToColor(simpleArr.get(iteration))); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPiece.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPiece.java index 7a6f50ab08..d8e75ca1dd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPiece.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPiece.java @@ -51,7 +51,7 @@ public enum RunedokuPiece private final int pieceID; private final int pieceForSudoku; - RunedokuPiece(int pieceID, int pieceForSudoku) + RunedokuPiece(final int pieceID, final int pieceForSudoku) { this.pieceID = pieceID; this.pieceForSudoku = pieceForSudoku; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPlugin.java index e441779a7a..3fa8214b50 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPlugin.java @@ -25,11 +25,15 @@ package net.runelite.client.plugins.runedoku; import com.google.inject.Provides; +import java.awt.Color; import javax.inject.Inject; import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import net.runelite.api.Client; +import net.runelite.api.events.ConfigChanged; import net.runelite.client.config.ConfigManager; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; @@ -47,13 +51,6 @@ import net.runelite.client.ui.overlay.OverlayManager; @Singleton public class RunedokuPlugin extends Plugin { - - @Inject - private Client client; - - @Inject - RunedokuUtil util; - @Inject private OverlayManager overlayManager; @@ -63,6 +60,27 @@ public class RunedokuPlugin extends Plugin @Inject private RunedokuConfig config; + @Getter(AccessLevel.PACKAGE) + private Color mindRuneColor; + @Getter(AccessLevel.PACKAGE) + private Color fireRuneColor; + @Getter(AccessLevel.PACKAGE) + private Color bodyRuneColor; + @Getter(AccessLevel.PACKAGE) + private Color airRuneColor; + @Getter(AccessLevel.PACKAGE) + private Color deathRuneColor; + @Getter(AccessLevel.PACKAGE) + private Color waterRuneColor; + @Getter(AccessLevel.PACKAGE) + private Color chaosRuneColor; + @Getter(AccessLevel.PACKAGE) + private Color earthRuneColor; + @Getter(AccessLevel.PACKAGE) + private Color lawRuneColor; + @Getter(AccessLevel.PACKAGE) + private boolean onlyHighlightSelectedPiece; + @Provides RunedokuConfig provideConfig(ConfigManager configManager) { @@ -72,6 +90,7 @@ public class RunedokuPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); overlayManager.add(runedokuOverlay); } @@ -81,4 +100,28 @@ public class RunedokuPlugin extends Plugin overlayManager.remove(runedokuOverlay); } + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("runedoku")) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.mindRuneColor = config.mindRuneColor(); + this.fireRuneColor = config.fireRuneColor(); + this.bodyRuneColor = config.bodyRuneColor(); + this.airRuneColor = config.airRuneColor(); + this.deathRuneColor = config.deathRuneColor(); + this.waterRuneColor = config.waterRuneColor(); + this.chaosRuneColor = config.chaosRuneColor(); + this.earthRuneColor = config.earthRuneColor(); + this.lawRuneColor = config.lawRuneColor(); + this.onlyHighlightSelectedPiece = config.onlyHighlightSelectedPiece(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuUtil.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuUtil.java index 36c5ac5662..3c7b51564d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuUtil.java @@ -28,6 +28,7 @@ import java.awt.Color; import java.awt.Polygon; import java.awt.Rectangle; import java.util.ArrayList; +import java.util.Objects; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.widgets.Widget; @@ -36,12 +37,12 @@ import net.runelite.api.widgets.WidgetItem; class RunedokuUtil { - private final RunedokuConfig config; + private final RunedokuPlugin plugin; @Inject - RunedokuUtil(final RunedokuConfig config) + RunedokuUtil(final RunedokuPlugin plugin) { - this.config = config; + this.plugin = plugin; } Color sudokuPieceToColor(int i) @@ -49,23 +50,23 @@ class RunedokuUtil switch (i) { case 1: - return config.mindRuneColor(); + return plugin.getMindRuneColor(); case 2: - return config.fireRuneColor(); + return plugin.getFireRuneColor(); case 3: - return config.bodyRuneColor(); + return plugin.getBodyRuneColor(); case 4: - return config.airRuneColor(); + return plugin.getAirRuneColor(); case 5: - return config.deathRuneColor(); + return plugin.getDeathRuneColor(); case 6: - return config.waterRuneColor(); + return plugin.getWaterRuneColor(); case 7: - return config.chaosRuneColor(); + return plugin.getChaosRuneColor(); case 8: - return config.earthRuneColor(); + return plugin.getEarthRuneColor(); case 9: - return config.lawRuneColor(); + return plugin.getLawRuneColor(); default: return Color.RED; } @@ -76,23 +77,23 @@ class RunedokuUtil switch (i) { case 121: //earth - return config.earthRuneColor(); + return plugin.getEarthRuneColor(); case 122: //water - return config.waterRuneColor(); + return plugin.getWaterRuneColor(); case 123: //air - return config.airRuneColor(); + return plugin.getAirRuneColor(); case 124: //mind - return config.mindRuneColor(); + return plugin.getMindRuneColor(); case 125: //fire - return config.fireRuneColor(); + return plugin.getFireRuneColor(); case 126: //body - return config.bodyRuneColor(); + return plugin.getBodyRuneColor(); case 127: //death - return config.deathRuneColor(); + return plugin.getDeathRuneColor(); case 128: //chaos - return config.chaosRuneColor(); - case 129: //law - return config.lawRuneColor(); + return plugin.getChaosRuneColor(); + case 129: //plugin + return plugin.getLawRuneColor(); default: return Color.RED; } @@ -123,7 +124,7 @@ class RunedokuUtil * @param rect * @return */ - public static Polygon rectangleToPolygon(Rectangle rect) + static Polygon rectangleToPolygon(Rectangle rect) { int[] xpoints = {rect.x, rect.x + rect.width, rect.x + rect.width, rect.x}; int[] ypoints = {rect.y, rect.y, rect.y + rect.height, rect.y + rect.height}; @@ -164,7 +165,7 @@ class RunedokuUtil { if (item.getId() != -1) { - myArr[i][ii] = RunedokuPiece.getById(item.getId()).getPieceForSudoku(); + myArr[i][ii] = Objects.requireNonNull(RunedokuPiece.getById(item.getId())).getPieceForSudoku(); } else { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java index a6b2f339de..e763013b3e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java @@ -10,17 +10,14 @@ public class Sudoku private int[][] board; public static final int EMPTY = 0; - public static final int SIZE = 9; + private static final int SIZE = 9; - Sudoku(int[][] board) + Sudoku(final int[][] board) { this.board = new int[SIZE][SIZE]; for (int i = 0; i < SIZE; i++) { - for (int j = 0; j < SIZE; j++) - { - this.board[i][j] = board[i][j]; - } + System.arraycopy(board[i], 0, this.board[i], 0, SIZE); } } @@ -74,7 +71,7 @@ public class Sudoku return !isInRow(row, number) && !isInCol(col, number) && !isInBox(row, col, number); } - public boolean solve() + boolean solve() { for (int row = 0; row < SIZE; row++) { @@ -116,7 +113,7 @@ public class Sudoku } } - public int[][] getBoard() + int[][] getBoard() { return board; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java index 2279d2ddd8..242d7ce17e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java @@ -31,6 +31,7 @@ import com.google.inject.Provides; import java.awt.event.KeyEvent; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.events.ConfigChanged; @@ -56,7 +57,7 @@ import net.runelite.client.ui.ClientUI; description = "Configures various aspects of RuneLitePlus", type = PluginType.EXTERNAL ) - +@Singleton @Slf4j public class RuneLitePlusPlugin extends Plugin { @@ -120,14 +121,11 @@ public class RuneLitePlusPlugin extends Plugin };*/ public static boolean customPresenceEnabled = false; public static final String rlPlusDiscordApp = "560644885250572289"; - public static final String rlDiscordApp = "409416265891971072"; + private static final String rlDiscordApp = "409416265891971072"; @Inject public RuneLitePlusConfig config; - @Inject - private ConfigManager configManager; - @Inject public DiscordService discordService; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyOverlay.java index 9ca4c40d6b..258fc98211 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyOverlay.java @@ -28,6 +28,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Rectangle; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Point; import net.runelite.api.widgets.Widget; @@ -39,6 +40,7 @@ import net.runelite.client.ui.overlay.tooltip.Tooltip; import net.runelite.client.ui.overlay.tooltip.TooltipManager; import org.apache.commons.lang3.StringUtils; +@Singleton class RunEnergyOverlay extends Overlay { private final RunEnergyPlugin plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java index 52170baa4e..81ab24eb1d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.runenergy; import com.google.common.collect.ImmutableSet; import com.google.inject.Provides; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.api.EquipmentInventorySlot; @@ -145,6 +146,7 @@ import org.apache.commons.lang3.StringUtils; description = "Show various information related to run energy", tags = {"overlay", "stamina"} ) +@Singleton public class RunEnergyPlugin extends Plugin { // TODO It would be nice if we have the IDs for just the equipped variants of the Graceful set items. diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java index 8088176bd9..f61935e4b7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java @@ -29,6 +29,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.ItemID; import net.runelite.api.Point; @@ -44,6 +45,7 @@ import net.runelite.client.ui.overlay.tooltip.Tooltip; import net.runelite.client.ui.overlay.tooltip.TooltipManager; import net.runelite.client.util.ColorUtil; +@Singleton public class RunepouchOverlay extends WidgetItemOverlay { private static final Varbits[] AMOUNT_VARBITS = @@ -57,18 +59,18 @@ public class RunepouchOverlay extends WidgetItemOverlay private static final Dimension IMAGE_SIZE = new Dimension(11, 11); private final Client client; - private final RunepouchConfig config; + private final RunepouchPlugin plugin; private final TooltipManager tooltipManager; @Inject private ItemManager itemManager; @Inject - RunepouchOverlay(Client client, RunepouchConfig config, TooltipManager tooltipManager) + RunepouchOverlay(final Client client, final RunepouchPlugin plugin, final TooltipManager tooltipManager) { this.tooltipManager = tooltipManager; this.client = client; - this.config = config; + this.plugin = plugin; showOnInventory(); showOnBank(); } @@ -116,7 +118,7 @@ public class RunepouchOverlay extends WidgetItemOverlay .append(ColorUtil.wrapWithColorTag(rune.getName(), Color.YELLOW)) .append("
"); - if (config.runePouchOverlayMode() == MOUSE_HOVER) + if (plugin.getRunePouchOverlayMode() == MOUSE_HOVER) { continue; } @@ -127,18 +129,18 @@ public class RunepouchOverlay extends WidgetItemOverlay int yOffset = (1 + (graphics.getFontMetrics().getMaxAscent()) * i); graphics.setColor(Color.black); - graphics.drawString("" + formatNumber(amount), location.getX() + (config.showIcons() ? 13 : 6), + graphics.drawString("" + formatNumber(amount), location.getX() + (plugin.isShowIcons() ? 13 : 6), yLocation + yOffset); - graphics.setColor(config.fontColor()); - graphics.drawString("" + formatNumber(amount), location.getX() + (config.showIcons() ? 12 : 5), + graphics.setColor(plugin.getFontColor()); + graphics.drawString("" + formatNumber(amount), location.getX() + (plugin.isShowIcons() ? 12 : 5), yLocation + yOffset); - graphics.setColor(config.fontColor()); - graphics.drawString("" + formatNumber(amount), location.getX() + (config.showIcons() ? 11 : 4), + graphics.setColor(plugin.getFontColor()); + graphics.drawString("" + formatNumber(amount), location.getX() + (plugin.isShowIcons() ? 11 : 4), location.getY() + 12 + (graphics.getFontMetrics().getHeight() - 1) * i); - if (!config.showIcons()) + if (!plugin.isShowIcons()) { continue; } @@ -162,7 +164,7 @@ public class RunepouchOverlay extends WidgetItemOverlay if (!tooltip.isEmpty() && itemWidget.getCanvasBounds().contains(client.getMouseCanvasPosition().getX(), client.getMouseCanvasPosition().getY()) - && (config.runePouchOverlayMode() == MOUSE_HOVER || config.runePouchOverlayMode() == BOTH)) + && (plugin.getRunePouchOverlayMode() == MOUSE_HOVER || plugin.getRunePouchOverlayMode() == BOTH)) { tooltipManager.add(new Tooltip(tooltip)); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchPlugin.java index 031f0900e1..88a897d9ef 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchPlugin.java @@ -25,10 +25,17 @@ package net.runelite.client.plugins.runepouch; import com.google.inject.Provides; +import java.awt.Color; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; +import net.runelite.api.events.ConfigChanged; import net.runelite.client.config.ConfigManager; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.runepouch.config.RunePouchOverlayMode; import net.runelite.client.ui.overlay.OverlayManager; @PluginDescriptor( @@ -36,6 +43,7 @@ import net.runelite.client.ui.overlay.OverlayManager; description = "Show the contents of your rune pouch", tags = {"combat", "magic", "overlay"} ) +@Singleton public class RunepouchPlugin extends Plugin { @Inject @@ -44,6 +52,16 @@ public class RunepouchPlugin extends Plugin @Inject private RunepouchOverlay overlay; + @Inject + private RunepouchConfig config; + + @Getter(AccessLevel.PACKAGE) + private Color fontColor; + @Getter(AccessLevel.PACKAGE) + private boolean showIcons; + @Getter(AccessLevel.PACKAGE) + private RunePouchOverlayMode runePouchOverlayMode; + @Provides RunepouchConfig getConfig(ConfigManager configManager) { @@ -53,6 +71,7 @@ public class RunepouchPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); overlayManager.add(overlay); } @@ -61,4 +80,22 @@ public class RunepouchPlugin extends Plugin { overlayManager.remove(overlay); } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("runepouch")) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.fontColor = config.fontColor(); + this.showIcons = config.showIcons(); + this.runePouchOverlayMode = config.runePouchOverlayMode(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/Runes.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/Runes.java index 3031aa7b97..3185ac2741 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/Runes.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/Runes.java @@ -28,6 +28,7 @@ package net.runelite.client.plugins.runepouch; import com.google.common.collect.ImmutableMap; import java.awt.image.BufferedImage; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import static net.runelite.api.ItemID.AIR_RUNE; @@ -76,13 +77,13 @@ public enum Runes SMOKE(20, SMOKE_RUNE), WRATH(21, WRATH_RUNE); - @Getter + @Getter(AccessLevel.PACKAGE) private final int id; - @Getter + @Getter(AccessLevel.PACKAGE) private final int itemId; - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private BufferedImage image; private static final Map runes; @@ -97,7 +98,7 @@ public enum Runes runes = builder.build(); } - Runes(int id, int itemId) + Runes(final int id, final int itemId) { this.id = id; this.itemId = itemId; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotOverlay.java index a208f59dc2..bb12d9b191 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotOverlay.java @@ -13,6 +13,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Polygon; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Perspective; import net.runelite.client.ui.overlay.Overlay; @@ -21,19 +22,18 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton public class SafeSpotOverlay extends Overlay { private final Client client; private final SafeSpotPlugin safeSpotPlugin; - private final SafeSpotConfig config; @Inject - public SafeSpotOverlay(Client client, SafeSpotPlugin safeSpotPlugin, SafeSpotConfig config) + public SafeSpotOverlay(final Client client, final SafeSpotPlugin safeSpotPlugin) { this.client = client; this.safeSpotPlugin = safeSpotPlugin; - this.config = config; setPosition(OverlayPosition.DYNAMIC); setPriority(OverlayPriority.LOW); setLayer(OverlayLayer.ABOVE_SCENE); @@ -55,7 +55,7 @@ public class SafeSpotOverlay extends Overlay final Polygon poly = Perspective.getCanvasTilePoly(client, tile.getLocalLocation()); if (poly != null) { - OverlayUtil.renderPolygon(graphics, poly, config.tileColor()); + OverlayUtil.renderPolygon(graphics, poly, safeSpotPlugin.getTileColor()); } } }); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java index 5d0a6df8a3..b702b5d17f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java @@ -9,9 +9,13 @@ package net.runelite.client.plugins.safespot; import com.google.inject.Provides; +import java.awt.Color; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Actor; import net.runelite.api.Client; @@ -22,6 +26,7 @@ import net.runelite.api.Tile; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldArea; import net.runelite.api.coords.WorldPoint; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.InteractingChanged; import net.runelite.client.config.ConfigManager; @@ -38,7 +43,7 @@ import net.runelite.client.ui.overlay.OverlayManager; type = PluginType.UTILITY, enabledByDefault = false ) - +@Singleton public class SafeSpotPlugin extends Plugin { @Inject @@ -50,15 +55,20 @@ public class SafeSpotPlugin extends Plugin @Inject private SafeSpotConfig config; - @Getter + @Getter(AccessLevel.PACKAGE) private ArrayList safeSpotList; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean safeSpotsRenderable = false; private SafeSpotOverlay safeSpotOverlay; private int tickCount = 0; + private boolean playerSafeSpots; + private boolean npcSafeSpots; + @Getter(AccessLevel.PACKAGE) + private Color tileColor; + @Provides SafeSpotConfig config(ConfigManager configManager) { @@ -68,7 +78,9 @@ public class SafeSpotPlugin extends Plugin @Override protected void startUp() throws Exception { - safeSpotOverlay = new SafeSpotOverlay(client, this, config); + updateConfig(); + + safeSpotOverlay = new SafeSpotOverlay(client, this); overlayManager.add(safeSpotOverlay); } @@ -85,7 +97,7 @@ public class SafeSpotPlugin extends Plugin { return; } - if (event.getTarget() == null && (config.npcSafeSpots() || config.playerSafeSpots())) + if (event.getTarget() == null && (this.npcSafeSpots || this.playerSafeSpots)) { tickCount = 10; } @@ -96,12 +108,12 @@ public class SafeSpotPlugin extends Plugin { if (client.getLocalPlayer().getInteracting() != null) { - if (client.getLocalPlayer().getInteracting() instanceof Player && config.playerSafeSpots()) + if (client.getLocalPlayer().getInteracting() instanceof Player && this.playerSafeSpots) { safeSpotsRenderable = true; updateSafeSpots(); } - if (client.getLocalPlayer().getInteracting() instanceof NPC && config.npcSafeSpots()) + if (client.getLocalPlayer().getInteracting() instanceof NPC && this.npcSafeSpots) { safeSpotsRenderable = true; updateSafeSpots(); @@ -149,11 +161,19 @@ public class SafeSpotPlugin extends Plugin LocalPoint toPoint = LocalPoint.fromWorld(client, w); Tile fromTile = tiles[client.getPlane()][actor.getLocalLocation().getSceneX()] [actor.getLocalLocation().getSceneY()]; - Tile toTile = tiles[client.getPlane()][toPoint.getSceneX()] - [toPoint.getSceneY()]; + Tile toTile = null; + if (toPoint != null) + { + toTile = tiles[client.getPlane()][toPoint.getSceneX()] + [toPoint.getSceneY()]; + } final int plane = client.getLocalPlayer().getWorldArea().getPlane(); - int bit = client.getCollisionMaps()[plane].getFlags()[toPoint.getSceneX()][toPoint.getSceneY()]; - if (toTile.hasLineOfSightTo(fromTile) && !fromTile.hasLineOfSightTo(toTile)) + int bit = 0; + if (toPoint != null) + { + bit = Objects.requireNonNull(client.getCollisionMaps())[plane].getFlags()[toPoint.getSceneX()][toPoint.getSceneY()]; + } + if (toTile != null && toTile.hasLineOfSightTo(fromTile) && !fromTile.hasLineOfSightTo(toTile)) { if (!((bit & CollisionDataFlag.BLOCK_MOVEMENT_OBJECT) == CollisionDataFlag.BLOCK_MOVEMENT_OBJECT || (bit & CollisionDataFlag.BLOCK_MOVEMENT_FLOOR_DECORATION) @@ -167,4 +187,22 @@ public class SafeSpotPlugin extends Plugin } return safeSpotList; } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("safespot")) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.playerSafeSpots = config.playerSafeSpots(); + this.npcSafeSpots = config.npcSafeSpots(); + this.tileColor = config.tileColor(); + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerCreationOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerCreationOverlay.java index f1e0c60bde..15d7d735e7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerCreationOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerCreationOverlay.java @@ -29,11 +29,13 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Stroke; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; +@Singleton public class ScreenMarkerCreationOverlay extends Overlay { private ScreenMarkerPlugin plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java index e00114041d..93b1350999 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java @@ -25,14 +25,16 @@ package net.runelite.client.plugins.screenmarkers; import java.awt.event.MouseEvent; +import javax.inject.Singleton; import javax.swing.SwingUtilities; import net.runelite.client.input.MouseAdapter; +@Singleton public class ScreenMarkerMouseListener extends MouseAdapter { private final ScreenMarkerPlugin plugin; - ScreenMarkerMouseListener(ScreenMarkerPlugin plugin) + ScreenMarkerMouseListener(final ScreenMarkerPlugin plugin) { this.plugin = plugin; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerOverlay.java index 08857c532e..408ded39f3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerOverlay.java @@ -28,19 +28,22 @@ package net.runelite.client.plugins.screenmarkers; import java.awt.BasicStroke; import java.awt.Dimension; import java.awt.Graphics2D; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; +@Singleton public class ScreenMarkerOverlay extends Overlay { - @Getter + @Getter(AccessLevel.PUBLIC) private final ScreenMarker marker; private final ScreenMarkerRenderable screenMarkerRenderable; - ScreenMarkerOverlay(ScreenMarker marker) + ScreenMarkerOverlay(final ScreenMarker marker) { this.marker = marker; this.screenMarkerRenderable = new ScreenMarkerRenderable(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java index ff8dcf0057..ce6a8d67fa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java @@ -39,6 +39,7 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.events.ConfigChanged; @@ -58,6 +59,7 @@ import net.runelite.client.util.ImageUtil; description = "Enable drawing of screen markers on top of the client", tags = {"boxes", "overlay", "panel"} ) +@Singleton public class ScreenMarkerPlugin extends Plugin { private static final String PLUGIN_NAME = "Screen Markers"; @@ -159,7 +161,7 @@ public class ScreenMarkerPlugin extends Plugin } } - public void startCreation(Point location) + void startCreation(Point location) { currentMarker = new ScreenMarker( Instant.now().toEpochMilli(), @@ -201,7 +203,7 @@ public class ScreenMarkerPlugin extends Plugin } /* The marker area has been drawn, inform the user and unlock the confirm button */ - public void completeSelection() + void completeSelection() { pluginPanel.getCreationPanel().unlockConfirm(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerRenderable.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerRenderable.java index 95b2da1207..6182765aa4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerRenderable.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerRenderable.java @@ -38,10 +38,10 @@ import net.runelite.client.ui.overlay.components.LayoutableRenderableEntity; public class ScreenMarkerRenderable implements LayoutableRenderableEntity { @Getter(AccessLevel.PACKAGE) - @Setter + @Setter(AccessLevel.PUBLIC) private Point preferredLocation; @Getter(AccessLevel.PACKAGE) - @Setter + @Setter(AccessLevel.PUBLIC) private Dimension preferredSize; @Getter(AccessLevel.PACKAGE) @Setter(AccessLevel.PACKAGE) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerCreationPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerCreationPanel.java index 0ad6b73d4e..82197c6160 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerCreationPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerCreationPanel.java @@ -30,6 +30,7 @@ import java.awt.GridLayout; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; +import javax.inject.Singleton; import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.JPanel; @@ -40,6 +41,7 @@ import net.runelite.client.ui.FontManager; import net.runelite.client.ui.components.shadowlabel.JShadowedLabel; import net.runelite.client.util.ImageUtil; +@Singleton public class ScreenMarkerCreationPanel extends JPanel { private static final ImageIcon CONFIRM_ICON; @@ -63,7 +65,7 @@ public class ScreenMarkerCreationPanel extends JPanel CANCEL_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(ImageUtil.bufferedImageFromImage(CANCEL_ICON.getImage()), 0.6f)); } - ScreenMarkerCreationPanel(ScreenMarkerPlugin plugin) + ScreenMarkerCreationPanel(final ScreenMarkerPlugin plugin) { setBackground(ColorScheme.DARKER_GRAY_COLOR); setBorder(new EmptyBorder(8, 8, 8, 8)); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java index e934bff8b8..217922790e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java @@ -34,6 +34,7 @@ import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.awt.image.BufferedImage; +import javax.inject.Singleton; import javax.swing.BorderFactory; import javax.swing.ImageIcon; import javax.swing.JLabel; @@ -55,6 +56,7 @@ import net.runelite.client.ui.components.FlatTextField; import net.runelite.client.ui.components.colorpicker.RuneliteColorPicker; import net.runelite.client.util.ImageUtil; +@Singleton class ScreenMarkerPanel extends JPanel { private static final int DEFAULT_FILL_OPACITY = 75; @@ -144,7 +146,7 @@ class ScreenMarkerPanel extends JPanel DELETE_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(deleteImg, -100)); } - ScreenMarkerPanel(ScreenMarkerPlugin plugin, ScreenMarkerOverlay marker) + ScreenMarkerPanel(final ScreenMarkerPlugin plugin, final ScreenMarkerOverlay marker) { this.plugin = plugin; this.marker = marker; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPluginPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPluginPanel.java index 3e43abaa4d..8f3fe97d3b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPluginPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPluginPanel.java @@ -40,6 +40,7 @@ import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.border.EmptyBorder; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.plugins.screenmarkers.ScreenMarkerOverlay; import net.runelite.client.plugins.screenmarkers.ScreenMarkerPlugin; @@ -66,16 +67,16 @@ public class ScreenMarkerPluginPanel extends PluginPanel @Inject private ScreenMarkerPlugin plugin; - @Getter + @Getter(AccessLevel.PUBLIC) private Color selectedColor = DEFAULT_BORDER_COLOR; - @Getter + @Getter(AccessLevel.PUBLIC) private Color selectedFillColor = DEFAULT_FILL_COLOR; - @Getter + @Getter(AccessLevel.PUBLIC) private int selectedBorderThickness = DEFAULT_BORDER_THICKNESS; - @Getter + @Getter(AccessLevel.PUBLIC) private ScreenMarkerCreationPanel creationPanel; static diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotOverlay.java index a5fd92a862..27b4d9b392 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotOverlay.java @@ -38,6 +38,7 @@ import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.function.Consumer; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.MainBufferProvider; import net.runelite.client.ui.DrawManager; @@ -47,6 +48,7 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; +@Singleton class ScreenshotOverlay extends Overlay { private static final DateFormat DATE_FORMAT = new SimpleDateFormat("MMM. dd, yyyy"); @@ -59,7 +61,7 @@ class ScreenshotOverlay extends Overlay private final Queue> consumers = new ConcurrentLinkedQueue<>(); @Inject - private ScreenshotOverlay(Client client, DrawManager drawManager, ScreenshotPlugin plugin) + private ScreenshotOverlay(final Client client, final DrawManager drawManager, final ScreenshotPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setPriority(OverlayPriority.HIGH); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java index 9e4a5dcfaf..e1aeb37d68 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java @@ -56,10 +56,12 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.imageio.ImageIO; import javax.inject.Inject; +import javax.inject.Singleton; import javax.swing.SwingUtilities; import lombok.AccessLevel; import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; @@ -71,6 +73,7 @@ import net.runelite.api.Varbits; import net.runelite.api.WorldType; import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.ChatMessage; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.WidgetLoaded; @@ -87,6 +90,7 @@ import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.Notifier; import static net.runelite.client.RuneLite.SCREENSHOT_DIR; import net.runelite.client.config.ConfigManager; +import net.runelite.client.config.Keybind; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.PlayerLootReceived; import net.runelite.client.game.SpriteManager; @@ -119,6 +123,7 @@ import org.jetbrains.annotations.Nullable; tags = {"external", "images", "imgur", "integration", "notifications"} ) @Slf4j +@Singleton public class ScreenshotPlugin extends Plugin { private static final String IMGUR_CLIENT_ID = "30d71e5f6860809"; @@ -137,7 +142,7 @@ public class ScreenshotPlugin extends Plugin "You feel something weird sneaking into your backpack", "You have a funny feeling like you would have been followed"); - static String format(Date date) + private static String format(Date date) { synchronized (TIME_FORMAT) { @@ -194,11 +199,11 @@ public class ScreenshotPlugin extends Plugin @Getter(AccessLevel.PACKAGE) private BufferedImage reportButton; - private Map dying = new HashMap(); + private Map dying = new HashMap<>(); private NavigationButton titleBarButton; - private final HotkeyListener hotkeyListener = new HotkeyListener(() -> config.hotkey()) + private final HotkeyListener hotkeyListener = new HotkeyListener(() -> this.hotkey) { @Override public void hotkeyPressed() @@ -207,6 +212,28 @@ public class ScreenshotPlugin extends Plugin } }; + private boolean includeFrame; + @Setter(AccessLevel.PACKAGE) + private boolean displayDate; + private boolean notifyWhenTaken; + @Setter(AccessLevel.PACKAGE) + private boolean screenshotRewards; + @Setter(AccessLevel.PACKAGE) + private boolean screenshotLevels; + private boolean screenshotKingdom; + private boolean screenshotPet; + private boolean uploadScreenshot; + private boolean screenshotKills; + private boolean screenshotBossKills; + private boolean screenshotFriendDeath; + private boolean screenshotPlayerDeath; + private boolean screenshotDuels; + @Setter(AccessLevel.PACKAGE) + private boolean screenshotValuableDrop; + @Setter(AccessLevel.PACKAGE) + private boolean screenshotUntradeableDrop; + private Keybind hotkey; + @Provides ScreenshotConfig getConfig(ConfigManager configManager) { @@ -216,6 +243,8 @@ public class ScreenshotPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(screenshotOverlay); SCREENSHOT_DIR.mkdirs(); keyManager.registerKeyListener(hotkeyListener); @@ -267,7 +296,7 @@ public class ScreenshotPlugin extends Plugin @Subscribe public void onGameTick(GameTick event) { - if (config.screenshotFriendDeath()) + if (this.screenshotFriendDeath) { for (Iterator it = dying.keySet().iterator(); it.hasNext();) { @@ -317,7 +346,7 @@ public class ScreenshotPlugin extends Plugin public void onAnimationChanged(AnimationChanged e) { //this got refactored somewhere, but some things were missing - if (!config.screenshotFriendDeath() || !config.screenshotPlayerDeath()) + if (!this.screenshotFriendDeath || !this.screenshotPlayerDeath) return; if (!(e.getActor() instanceof Player)) @@ -332,7 +361,7 @@ public class ScreenshotPlugin extends Plugin if (p.getName().equals(client.getLocalPlayer().getName())) { - if (config.screenshotPlayerDeath()) + if (this.screenshotPlayerDeath) { dying.put(p, 3); return; @@ -342,7 +371,7 @@ public class ScreenshotPlugin extends Plugin return; } } - if (config.screenshotFriendDeath()) + if (this.screenshotFriendDeath) { int tob = client.getVar(Varbits.THEATRE_OF_BLOOD); @@ -357,7 +386,7 @@ public class ScreenshotPlugin extends Plugin @Subscribe public void onPlayerLootReceived(final PlayerLootReceived playerLootReceived) { - if (config.screenshotKills()) + if (this.screenshotKills) { final Player player = playerLootReceived.getPlayer(); final String name = player.getName(); @@ -427,13 +456,13 @@ public class ScreenshotPlugin extends Plugin } } - if (config.screenshotPet() && PET_MESSAGES.stream().anyMatch(chatMessage::contains)) + if (this.screenshotPet && PET_MESSAGES.stream().anyMatch(chatMessage::contains)) { String fileName = "Pet " + format(new Date()); takeScreenshot(fileName); } - if (config.screenshotBossKills() ) + if (this.screenshotBossKills ) { Matcher m = BOSSKILL_MESSAGE_PATTERN.matcher(chatMessage); if (m.matches()) @@ -445,7 +474,7 @@ public class ScreenshotPlugin extends Plugin } } - if (config.screenshotValuableDrop()) + if (this.screenshotValuableDrop) { Matcher m = VALUABLE_DROP_PATTERN.matcher(chatMessage); if (m.matches()) @@ -456,7 +485,7 @@ public class ScreenshotPlugin extends Plugin } } - if (config.screenshotUntradeableDrop()) + if (this.screenshotUntradeableDrop) { Matcher m = UNTRADEABLE_DROP_PATTERN.matcher(chatMessage); if (m.matches()) @@ -467,7 +496,7 @@ public class ScreenshotPlugin extends Plugin } } - if (config.screenshotDuels()) + if (this.screenshotDuels) { Matcher m = DUEL_END_PATTERN.matcher(chatMessage); if (m.find()) @@ -493,20 +522,20 @@ public class ScreenshotPlugin extends Plugin case CHAMBERS_OF_XERIC_REWARD_GROUP_ID: case THEATRE_OF_BLOOD_REWARD_GROUP_ID: case BARROWS_REWARD_GROUP_ID: - if (!config.screenshotRewards()) + if (!this.screenshotRewards) { return; } break; case LEVEL_UP_GROUP_ID: case DIALOG_SPRITE_GROUP_ID: - if (!config.screenshotLevels()) + if (!this.screenshotLevels) { return; } break; case KINGDOM_GROUP_ID: - if (!config.screenshotKingdom()) + if (!this.screenshotKingdom) { return; } @@ -637,7 +666,7 @@ public class ScreenshotPlugin extends Plugin executor.submit(() -> takeScreenshot(fileName, img, null)); }; - if (config.displayDate()) + if (this.displayDate) { screenshotOverlay.queueForTimestamp(imageCallback); } @@ -670,7 +699,7 @@ public class ScreenshotPlugin extends Plugin }; - if (config.displayDate()) + if (this.displayDate) { screenshotOverlay.queueForTimestamp(imageCallback); } @@ -681,7 +710,7 @@ public class ScreenshotPlugin extends Plugin } private void takeScreenshot(String fileName, Image image, @Nullable String subdirectory) { - BufferedImage screenshot = config.includeFrame() + BufferedImage screenshot = this.includeFrame ? new BufferedImage(clientUi.getWidth(), clientUi.getHeight(), BufferedImage.TYPE_INT_ARGB) : new BufferedImage(image.getWidth(null), image.getHeight(null), BufferedImage.TYPE_INT_ARGB); @@ -690,7 +719,7 @@ public class ScreenshotPlugin extends Plugin int gameOffsetX = 0; int gameOffsetY = 0; - if (config.includeFrame()) + if (this.includeFrame) { // Draw the client frame onto the screenshot try @@ -748,11 +777,11 @@ public class ScreenshotPlugin extends Plugin ImageIO.write(screenshot, "PNG", screenshotFile); - if (config.uploadScreenshot()) + if (this.uploadScreenshot) { uploadScreenshot(screenshotFile); } - else if (config.notifyWhenTaken()) + else if (this.notifyWhenTaken) { notifier.notify("A screenshot was saved to " + screenshotFile, TrayIcon.MessageType.INFO); } @@ -774,44 +803,51 @@ public class ScreenshotPlugin extends Plugin { String json = RuneLiteAPI.GSON.toJson(new ImageUploadRequest(screenshotFile)); - Request request = new Request.Builder() - .url(IMGUR_IMAGE_UPLOAD_URL) - .addHeader("Authorization", "Client-ID " + IMGUR_CLIENT_ID) - .post(RequestBody.create(JSON, json)) - .build(); - - RuneLiteAPI.CLIENT.newCall(request).enqueue(new Callback() + Request request = null; + if (IMGUR_IMAGE_UPLOAD_URL != null) { - @Override - public void onFailure(Call call, IOException ex) - { - log.warn("error uploading screenshot", ex); - } + request = new Request.Builder() + .url(IMGUR_IMAGE_UPLOAD_URL) + .addHeader("Authorization", "Client-ID " + IMGUR_CLIENT_ID) + .post(RequestBody.create(JSON, json)) + .build(); + } - @Override - public void onResponse(Call call, Response response) throws IOException + if (request != null) + { + RuneLiteAPI.CLIENT.newCall(request).enqueue(new Callback() { - try (InputStream in = response.body().byteStream()) + @Override + public void onFailure(Call call, IOException ex) { - ImageUploadResponse imageUploadResponse = RuneLiteAPI.GSON - .fromJson(new InputStreamReader(in), ImageUploadResponse.class); + log.warn("error uploading screenshot", ex); + } - if (imageUploadResponse.isSuccess()) + @Override + public void onResponse(Call call, Response response) throws IOException + { + try (InputStream in = response.body().byteStream()) { - String link = imageUploadResponse.getData().getLink(); + ImageUploadResponse imageUploadResponse = RuneLiteAPI.GSON + .fromJson(new InputStreamReader(in), ImageUploadResponse.class); - StringSelection selection = new StringSelection(link); - Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); - clipboard.setContents(selection, selection); - - if (config.notifyWhenTaken()) + if (imageUploadResponse.isSuccess()) { - notifier.notify("A screenshot was uploaded and inserted into your clipboard!", TrayIcon.MessageType.INFO); + String link = imageUploadResponse.getData().getLink(); + + StringSelection selection = new StringSelection(link); + Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + clipboard.setContents(selection, selection); + + if (notifyWhenTaken) + { + notifier.notify("A screenshot was uploaded and inserted into your clipboard!", TrayIcon.MessageType.INFO); + } } } } - } - }); + }); + } } @VisibleForTesting @@ -849,4 +885,35 @@ public class ScreenshotPlugin extends Plugin { return theatreOfBloodNumber; } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("screenshot")) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.includeFrame = config.includeFrame(); + this.displayDate = config.displayDate(); + this.notifyWhenTaken = config.notifyWhenTaken(); + this.screenshotRewards = config.screenshotRewards(); + this.screenshotLevels = config.screenshotLevels(); + this.screenshotKingdom = config.screenshotKingdom(); + this.screenshotPet = config.screenshotPet(); + this.uploadScreenshot = config.uploadScreenshot(); + this.screenshotKills = config.screenshotKills(); + this.screenshotBossKills = config.screenshotBossKills(); + this.screenshotFriendDeath = config.screenshotFriendDeath(); + this.screenshotPlayerDeath = config.screenshotPlayerDeath(); + this.screenshotDuels = config.screenshotDuels(); + this.screenshotValuableDrop = config.screenshotValuableDrop(); + this.screenshotUntradeableDrop = config.screenshotUntradeableDrop(); + this.hotkey = config.hotkey(); + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryOverlay.java index a7b0ab1bcf..6e09eef0d4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryOverlay.java @@ -32,6 +32,7 @@ import java.awt.Graphics2D; import java.awt.Polygon; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.ItemID; import net.runelite.api.NPC; import net.runelite.api.Point; @@ -40,6 +41,7 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton public class ShayzienInfirmaryOverlay extends Overlay { private final ShayzienInfirmaryPlugin plugin; @@ -47,7 +49,7 @@ public class ShayzienInfirmaryOverlay extends Overlay private BufferedImage medPackImage; @Inject - public ShayzienInfirmaryOverlay(ShayzienInfirmaryPlugin plugin, ItemManager itemManager) + public ShayzienInfirmaryOverlay(final ShayzienInfirmaryPlugin plugin, final ItemManager itemManager) { setPosition(OverlayPosition.DYNAMIC); this.plugin = plugin; @@ -58,7 +60,7 @@ public class ShayzienInfirmaryOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (!plugin.isAtInfirmary()) + if (plugin.isNotAtInfirmary()) { return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryPlugin.java index d5f38d8172..e74b268575 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryPlugin.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.shayzieninfirmary; import java.util.ArrayList; import java.util.List; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -47,11 +48,11 @@ import net.runelite.client.ui.overlay.OverlayManager; type = PluginType.UTILITY, enabledByDefault = false ) - +@Singleton public class ShayzienInfirmaryPlugin extends Plugin { @Getter(AccessLevel.PACKAGE) - private List unhealedSoldiers = new ArrayList(); + private List unhealedSoldiers = new ArrayList<>(); @Inject private OverlayManager overlayManager; @@ -87,7 +88,7 @@ public class ShayzienInfirmaryPlugin extends Plugin @Subscribe public void onGameTick(GameTick event) { - if (!isAtInfirmary()) + if (isNotAtInfirmary()) { return; } @@ -113,8 +114,8 @@ public class ShayzienInfirmaryPlugin extends Plugin return (isSoldierId(npcId) && npcId % 2 == 0); } - boolean isAtInfirmary() + boolean isNotAtInfirmary() { - return client.getLocalPlayer().getWorldLocation().getRegionID() == 6200; + return client.getLocalPlayer().getWorldLocation().getRegionID() != 6200; } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerInputListener.java index 1195966d6a..6b6560ca61 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerInputListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerInputListener.java @@ -26,8 +26,10 @@ package net.runelite.client.plugins.shiftwalker; import java.awt.event.KeyEvent; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.client.input.KeyListener; +@Singleton public class ShiftWalkerInputListener implements KeyListener { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerPlugin.java index 7197de9eaa..9b8bcbdeb6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerPlugin.java @@ -26,6 +26,8 @@ package net.runelite.client.plugins.shiftwalker; import com.google.inject.Provides; import javax.inject.Inject; +import javax.inject.Singleton; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.FocusChanged; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; @@ -45,7 +47,7 @@ import net.runelite.client.plugins.PluginType; type = PluginType.UTILITY, enabledByDefault = false ) - +@Singleton public class ShiftWalkerPlugin extends Plugin { @@ -63,6 +65,9 @@ public class ShiftWalkerPlugin extends Plugin @Inject private KeyManager keyManager; + private boolean shiftWalk; + private boolean shiftLoot; + @Provides ShiftWalkerConfig provideConfig(ConfigManager configManager) { @@ -72,6 +77,9 @@ public class ShiftWalkerPlugin extends Plugin @Override public void startUp() { + this.shiftWalk = config.shiftWalk(); + this.shiftLoot = config.shiftLoot(); + keyManager.registerKeyListener(inputListener); } @@ -92,12 +100,12 @@ public class ShiftWalkerPlugin extends Plugin void startPrioritizing() { - if (config.shiftLoot()) + if (this.shiftLoot) { menuManager.addPriorityEntry(TAKE); } - if (config.shiftWalk()) + if (this.shiftWalk) { menuManager.addPriorityEntry(WALK_HERE); } @@ -108,4 +116,16 @@ public class ShiftWalkerPlugin extends Plugin menuManager.removePriorityEntry(TAKE); menuManager.removePriorityEntry(WALK_HERE); } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("shiftwalkhere")) + { + return; + } + + this.shiftWalk = config.shiftWalk(); + this.shiftLoot = config.shiftLoot(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java index b4f6785a96..5216d24ace 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java @@ -34,6 +34,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; +import javax.inject.Singleton; import javax.swing.BorderFactory; import javax.swing.Box; import javax.swing.BoxLayout; @@ -56,6 +57,7 @@ import net.runelite.client.ui.DynamicGridLayout; import net.runelite.client.ui.FontManager; @Slf4j +@Singleton public class BankedCalculator extends JPanel { private static final DecimalFormat XP_FORMAT_COMMA = new DecimalFormat("#,###.#"); @@ -88,11 +90,11 @@ public class BankedCalculator extends JPanel private Map linkedMap = new HashMap<>(); // ItemID of item that links to the CriticalItem BankedCalculator( - SkillCalculatorPanel parent, - Client client, - UICalculatorInputArea uiInput, - SkillCalculatorConfig config, - ItemManager itemManager) + final SkillCalculatorPanel parent, + final Client client, + final UICalculatorInputArea uiInput, + final SkillCalculatorConfig config, + final ItemManager itemManager) { this.parent = parent; this.client = client; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CacheSkillData.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CacheSkillData.java index f4f54e0f52..a427b602ac 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CacheSkillData.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CacheSkillData.java @@ -35,7 +35,7 @@ class CacheSkillData { private final Map cache = new HashMap<>(); - SkillData getSkillData(String dataFile) + SkillData getSkillData(final String dataFile) { if (cache.containsKey(dataFile)) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CalculatorType.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CalculatorType.java index 1b3cbf818b..8874563113 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CalculatorType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CalculatorType.java @@ -25,12 +25,13 @@ */ package net.runelite.client.plugins.skillcalculator; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.Skill; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) public enum CalculatorType { AGILITY(Skill.AGILITY, "skill_agility.json", false), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java index 709fdff390..ca0c650c0f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java @@ -35,6 +35,7 @@ import java.text.NumberFormat; import java.util.ArrayList; import java.util.List; import java.util.Optional; +import javax.inject.Singleton; import javax.swing.BorderFactory; import javax.swing.Box; import javax.swing.JCheckBox; @@ -58,6 +59,7 @@ import net.runelite.client.ui.components.IconTextField; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +@Singleton class SkillCalculator extends JPanel { private static final int MAX_XP = 200_000_000; @@ -85,7 +87,7 @@ class SkillCalculator extends JPanel private float lastBonus = 0.0f; private CalculatorType calculatorType; - SkillCalculator(Client client, UICalculatorInputArea uiInput, SpriteManager spriteManager, ItemManager itemManager) + SkillCalculator(final Client client, final UICalculatorInputArea uiInput, final SpriteManager spriteManager, final ItemManager itemManager) { this.client = client; this.uiInput = uiInput; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java index d7f14a0492..c337470c32 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java @@ -34,6 +34,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; import java.util.Objects; +import javax.inject.Singleton; import javax.swing.ImageIcon; import javax.swing.JScrollPane; import javax.swing.SwingUtilities; @@ -51,6 +52,7 @@ import net.runelite.client.ui.components.materialtabs.MaterialTab; import net.runelite.client.ui.components.materialtabs.MaterialTabGroup; @Slf4j +@Singleton class SkillCalculatorPanel extends PluginPanel { private final SkillCalculator uiCalculator; @@ -67,7 +69,7 @@ class SkillCalculatorPanel extends PluginPanel private Map bankMap = new HashMap<>(); private GridBagConstraints c; - SkillCalculatorPanel(SkillIconManager iconManager, Client client, SkillCalculatorConfig config, SpriteManager spriteManager, ItemManager itemManager) + SkillCalculatorPanel(final SkillIconManager iconManager, final Client client, final SkillCalculatorConfig config, final SpriteManager spriteManager, final ItemManager itemManager) { super(); getScrollPane().setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java index 8cb7fbc713..e6a5316cf3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java @@ -31,6 +31,7 @@ import java.awt.image.BufferedImage; import java.util.HashMap; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import javax.swing.SwingUtilities; import lombok.Getter; import net.runelite.api.Client; @@ -60,6 +61,7 @@ import net.runelite.client.util.ImageUtil; description = "Enable the Skill Calculator panel", tags = {"panel", "skilling"} ) +@Singleton public class SkillCalculatorPlugin extends Plugin { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UIActionSlot.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UIActionSlot.java index 696fa2dfdc..819e75ad4b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UIActionSlot.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UIActionSlot.java @@ -33,6 +33,7 @@ import java.awt.GridLayout; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; +import javax.inject.Singleton; import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.JPanel; @@ -47,6 +48,7 @@ import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.FontManager; import net.runelite.client.ui.components.shadowlabel.JShadowedLabel; +@Singleton class UIActionSlot extends JPanel { private static final Border GREEN_BORDER = new CompoundBorder( diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICalculatorInputArea.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICalculatorInputArea.java index b1d9af5665..515b3997d0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICalculatorInputArea.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICalculatorInputArea.java @@ -28,16 +28,19 @@ package net.runelite.client.plugins.skillcalculator; import java.awt.BorderLayout; import java.awt.Color; import java.awt.GridLayout; +import javax.inject.Singleton; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField; import javax.swing.border.EmptyBorder; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.FontManager; import net.runelite.client.ui.components.FlatTextField; -@Getter +@Getter(AccessLevel.PACKAGE) +@Singleton class UICalculatorInputArea extends JPanel { private final JTextField uiFieldCurrentLevel; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICombinedActionSlot.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICombinedActionSlot.java index a6bc9c0d52..f84cdecb23 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICombinedActionSlot.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICombinedActionSlot.java @@ -30,6 +30,7 @@ import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; import java.awt.GridLayout; +import javax.inject.Singleton; import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.JPanel; @@ -39,13 +40,14 @@ import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.FontManager; import net.runelite.client.ui.components.shadowlabel.JShadowedLabel; +@Singleton class UICombinedActionSlot extends JPanel { private static final Dimension ICON_SIZE = new Dimension(32, 32); private final JShadowedLabel uiLabelActions; private final JShadowedLabel uiLabelTitle; - UICombinedActionSlot(SpriteManager spriteManager) + UICombinedActionSlot(final SpriteManager spriteManager) { setLayout(new BorderLayout()); setBackground(ColorScheme.DARKER_GRAY_COLOR); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java index d3109c15e6..8d2b122119 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java @@ -27,12 +27,13 @@ package net.runelite.client.plugins.skillcalculator.banked.beans; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ItemID; import net.runelite.api.Skill; import net.runelite.client.plugins.skillcalculator.banked.CriticalItem; -@Getter +@Getter(AccessLevel.PUBLIC) public enum Activity { /** @@ -350,7 +351,7 @@ public enum Activity this.preventLinked = false; } - Activity(int Icon, String name, Skill skill, int level, double xp, CriticalItem criticalItem, ActivitySecondaries secondaries, boolean preventLinked) + Activity(final int Icon, final String name, final Skill skill, final int level, final double xp, final CriticalItem criticalItem, final ActivitySecondaries secondaries, final boolean preventLinked) { this.icon = Icon; this.name = name; @@ -368,7 +369,7 @@ public enum Activity Map> map = new HashMap<>(); for (Activity item : values()) { - map.computeIfAbsent(item.getCriticalItem(), e -> new ArrayList()).add(item); + map.computeIfAbsent(item.getCriticalItem(), e -> new ArrayList<>()).add(item); } return map; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/ActivitySecondaries.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/ActivitySecondaries.java index 94a74bd6fd..0afb3cf033 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/ActivitySecondaries.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/ActivitySecondaries.java @@ -24,10 +24,11 @@ */ package net.runelite.client.plugins.skillcalculator.banked.beans; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ItemID; -@Getter +@Getter(AccessLevel.PUBLIC) public enum ActivitySecondaries { /** @@ -104,7 +105,7 @@ public enum ActivitySecondaries ; private final SecondaryItem[] items; - ActivitySecondaries(SecondaryItem... items) + ActivitySecondaries(final SecondaryItem... items) { this.items = items; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/SecondaryItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/SecondaryItem.java index 68f0042fbf..0cc728d0f9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/SecondaryItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/SecondaryItem.java @@ -24,21 +24,22 @@ */ package net.runelite.client.plugins.skillcalculator.banked.beans; +import lombok.AccessLevel; import lombok.Getter; -@Getter +@Getter(AccessLevel.PUBLIC) public class SecondaryItem { private final int id; private final int qty; - public SecondaryItem(int id, int qty) + SecondaryItem(int id, int qty) { this.id = id; this.qty = qty; } - public SecondaryItem(int id) + SecondaryItem(int id) { this(id, 1); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/ui/CriticalItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/ui/CriticalItemPanel.java index 5de2acfee0..a6af1138ef 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/ui/CriticalItemPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/ui/CriticalItemPanel.java @@ -40,6 +40,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import javax.imageio.ImageIO; +import javax.inject.Singleton; import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.JPanel; @@ -48,6 +49,7 @@ import javax.swing.SwingUtilities; import javax.swing.border.Border; import javax.swing.border.EmptyBorder; import javax.swing.border.MatteBorder; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.game.AsyncBufferedImage; import net.runelite.client.game.ItemManager; @@ -61,6 +63,7 @@ import net.runelite.client.ui.components.materialtabs.MaterialTabGroup; import net.runelite.client.ui.components.shadowlabel.JShadowedLabel; import net.runelite.client.util.StackFormatter; +@Singleton public class CriticalItemPanel extends JPanel { private static final Dimension ICON_SIZE = new Dimension(36, 36); @@ -93,9 +96,9 @@ public class CriticalItemPanel extends JPanel private final CriticalItem item; private final ItemManager itemManager; private double xp; - @Getter + @Getter(AccessLevel.PUBLIC) private int amount; - @Getter + @Getter(AccessLevel.PUBLIC) private double total; private Map linkedMap; private JShadowedLabel labelValue; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillData.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillData.java index 4c2d36aa68..0d5b1cad40 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillData.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillData.java @@ -24,9 +24,10 @@ */ package net.runelite.client.plugins.skillcalculator.beans; +import lombok.AccessLevel; import lombok.Getter; -@Getter +@Getter(AccessLevel.PUBLIC) public class SkillData { private SkillDataEntry[] actions; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataBonus.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataBonus.java index 675fcb51db..6cce75a62e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataBonus.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataBonus.java @@ -24,9 +24,10 @@ */ package net.runelite.client.plugins.skillcalculator.beans; +import lombok.AccessLevel; import lombok.Getter; -@Getter +@Getter(AccessLevel.PUBLIC) public class SkillDataBonus { private String name; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataEntry.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataEntry.java index b21188d913..05ec9c878a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataEntry.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataEntry.java @@ -24,9 +24,10 @@ */ package net.runelite.client.plugins.skillcalculator.beans; +import lombok.AccessLevel; import lombok.Getter; -@Getter +@Getter(AccessLevel.PUBLIC) public class SkillDataEntry { private String name; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPlugin.java index 55b1a37017..d91597749b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPlugin.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.skybox; import com.google.inject.Inject; +import com.google.inject.Singleton; import java.io.IOException; import net.runelite.api.Client; import net.runelite.api.GameState; @@ -42,6 +43,7 @@ import net.runelite.client.plugins.PluginDescriptor; enabledByDefault = false, tags = {"sky"} ) +@Singleton public class SkyboxPlugin extends Plugin { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/KnapsackSolver.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/KnapsackSolver.java index dc2afab56c..5cd41a1132 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/KnapsackSolver.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/KnapsackSolver.java @@ -26,7 +26,9 @@ package net.runelite.client.plugins.slayer; import java.util.ArrayList; import java.util.List; +import javax.inject.Singleton; +@Singleton class KnapsackSolver { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/NPCPresence.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/NPCPresence.java index cc28df5393..2877a4ad8f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/NPCPresence.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/NPCPresence.java @@ -1,5 +1,6 @@ package net.runelite.client.plugins.slayer; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.NPC; @@ -8,15 +9,15 @@ public class NPCPresence private static final int FADE_TIMER_START = 20; - @Getter + @Getter(AccessLevel.PACKAGE) private String name; - @Getter + @Getter(AccessLevel.PACKAGE) private int combatLevel; private int fadeTimer; - private NPCPresence(String name, int combatLevel) + private NPCPresence(final String name, final int combatLevel) { this.name = name; this.combatLevel = combatLevel; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/RenderStyle.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/RenderStyle.java index 409f4c2729..c3c0f372a2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/RenderStyle.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/RenderStyle.java @@ -13,7 +13,7 @@ public enum RenderStyle private final String name; - RenderStyle(String name) + RenderStyle(final String name) { this.name = name; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java index b27925fade..52ee0770aa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java @@ -30,12 +30,14 @@ import java.awt.Point; import java.awt.Rectangle; import java.util.Set; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.ItemID; import net.runelite.api.widgets.WidgetItem; import net.runelite.client.ui.FontManager; import net.runelite.client.ui.overlay.WidgetItemOverlay; import net.runelite.client.ui.overlay.components.TextComponent; +@Singleton class SlayerOverlay extends WidgetItemOverlay { private final static Set SLAYER_JEWELRY = ImmutableSet.of( @@ -81,14 +83,12 @@ class SlayerOverlay extends WidgetItemOverlay ItemID.SLAYER_RING_8 ); - private final SlayerConfig config; private final SlayerPlugin plugin; @Inject - private SlayerOverlay(SlayerPlugin plugin, SlayerConfig config) + private SlayerOverlay(final SlayerPlugin plugin) { this.plugin = plugin; - this.config = config; showOnInventory(); showOnEquipment(); } @@ -101,7 +101,7 @@ class SlayerOverlay extends WidgetItemOverlay return; } - if (!config.showItemOverlay()) + if (!plugin.isShowItemOverlay()) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java index b805edd030..be720fa9e3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java @@ -45,6 +45,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; import javax.inject.Inject; +import javax.inject.Singleton; import joptsimple.internal.Strings; import lombok.AccessLevel; import lombok.Getter; @@ -107,6 +108,7 @@ import net.runelite.http.api.chat.ChatClient; ) @PluginDependency(XpTrackerPlugin.class) @Slf4j +@Singleton public class SlayerPlugin extends Plugin { //Chat messages @@ -254,9 +256,39 @@ public class SlayerPlugin extends Plugin lingeringPresences.clear(); } + private boolean showInfobox; + @Getter(AccessLevel.PACKAGE) + private boolean showItemOverlay; + @Setter(AccessLevel.PACKAGE) + private boolean showSuperiorNotification; + private int statTimeout; + @Getter(AccessLevel.PACKAGE) + private boolean highlightTargets; + @Getter(AccessLevel.PACKAGE) + private RenderStyle renderStyle; + @Getter(AccessLevel.PACKAGE) + private Color getTargetColor; + @Getter(AccessLevel.PACKAGE) + private Color getSuperiorColor; + @Getter(AccessLevel.PACKAGE) + private boolean drawNames; + @Getter(AccessLevel.PACKAGE) + private boolean drawMinimapNames; + @Getter(AccessLevel.PACKAGE) + private boolean weaknessPrompt; + @Setter(AccessLevel.PACKAGE) + private boolean taskCommand; + private String taskName; + private String taskLocation; + private int amount; + private int initialAmount; + private int lastCertainAmount; + @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(overlay); overlayManager.add(targetClickboxOverlay); overlayManager.add(targetWeaknessOverlay); @@ -321,11 +353,10 @@ public class SlayerPlugin extends Plugin currentTask.setPaused(true); break; case LOGGED_IN: - if (loginTick && config.amount() != -1 - && !config.taskName().isEmpty()) + if (loginTick && this.amount != -1 + && !this.taskName.isEmpty()) { - streak = config.streak(); - setTask(config.taskName(), config.amount(), config.initialAmount(), true, config.taskLocation(), config.lastCertainAmount()); + setTask(this.taskName, this.amount, this.initialAmount, true, this.taskLocation, this.lastCertainAmount); } } } @@ -333,10 +364,20 @@ public class SlayerPlugin extends Plugin private void save() { config.amount(currentTask.getAmount()); + this.amount = currentTask.getAmount(); + config.initialAmount(currentTask.getInitialAmount()); + this.initialAmount = currentTask.getInitialAmount(); + config.taskName(currentTask.getTaskName()); + this.taskName = currentTask.getTaskName(); + config.taskLocation(currentTask.getTaskLocation()); + this.taskLocation = currentTask.getTaskLocation(); + config.lastCertainAmount(currentTask.getLastCertainAmount()); + this.lastCertainAmount = currentTask.getLastCertainAmount(); + config.streak(streak); } @@ -383,7 +424,7 @@ public class SlayerPlugin extends Plugin setPoints(client.getVar(Varbits.SLAYER_REWARD_POINTS)); - if (!config.showInfobox()) + if (!this.showInfobox) { return; } @@ -554,7 +595,7 @@ public class SlayerPlugin extends Plugin if (infoTimer != null) { Duration timeSinceInfobox = Duration.between(infoTimer, Instant.now()); - Duration statTimeout = Duration.ofMinutes(config.statTimeout()); + Duration statTimeout = Duration.ofMinutes(this.statTimeout); if (timeSinceInfobox.compareTo(statTimeout) >= 0) { @@ -610,7 +651,7 @@ public class SlayerPlugin extends Plugin return; } - if (config.showSuperiorNotification() && chatMsg.equals(CHAT_SUPERIOR_MESSAGE)) + if (this.showSuperiorNotification && chatMsg.equals(CHAT_SUPERIOR_MESSAGE)) { notifier.notify(CHAT_SUPERIOR_MESSAGE); return; @@ -728,7 +769,9 @@ public class SlayerPlugin extends Plugin return; } - if (config.showInfobox()) + updateConfig(); + + if (this.showInfobox) { clientThread.invoke(this::addCounter); } @@ -758,7 +801,7 @@ public class SlayerPlugin extends Plugin currentTask.setPaused(false); // no longer paused since xp is gained panel.updateCurrentTask(true, currentTask.isPaused(), currentTask, false); - if (!config.showInfobox()) + if (!this.showInfobox) { return; } @@ -961,7 +1004,7 @@ public class SlayerPlugin extends Plugin private void addCounter() { - if (!config.showInfobox() || counter != null || currentTask == null || Strings.isNullOrEmpty(currentTask.getTaskName())) + if (!this.showInfobox || counter != null || currentTask == null || Strings.isNullOrEmpty(currentTask.getTaskName())) { return; } @@ -1006,7 +1049,7 @@ public class SlayerPlugin extends Plugin void taskLookup(ChatMessage chatMessage, String message) { - if (!config.taskCommand()) + if (!this.taskCommand) { return; } @@ -1150,4 +1193,25 @@ public class SlayerPlugin extends Plugin this.points = points; this.cachedPoints = points; } + + private void updateConfig() + { + this.showInfobox = config.showInfobox(); + this.showItemOverlay = config.showItemOverlay(); + this.showSuperiorNotification = config.showSuperiorNotification(); + this.statTimeout = config.statTimeout(); + this.highlightTargets = config.highlightTargets(); + this.renderStyle = config.renderStyle(); + this.getTargetColor = config.getTargetColor(); + this.getSuperiorColor = config.getSuperiorColor(); + this.drawNames = config.drawNames(); + this.drawMinimapNames = config.drawMinimapNames(); + this.weaknessPrompt = config.weaknessPrompt(); + this.taskCommand = config.taskCommand(); + this.taskName = config.taskName(); + this.amount = config.amount(); + this.initialAmount = config.initialAmount(); + this.lastCertainAmount = config.lastCertainAmount(); + this.taskLocation = config.taskLocation(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerTaskPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerTaskPanel.java index 0cd238a6d3..f865237fe9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerTaskPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerTaskPanel.java @@ -8,6 +8,7 @@ import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.List; +import javax.inject.Singleton; import javax.swing.Box; import javax.swing.BoxLayout; import javax.swing.ImageIcon; @@ -23,6 +24,7 @@ import net.runelite.client.util.ColorUtil; import net.runelite.client.util.ImageUtil; import net.runelite.client.util.StackFormatter; +@Singleton public class SlayerTaskPanel extends PluginPanel { private static final long MILLIS_PER_SECOND = 1000; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetClickboxOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetClickboxOverlay.java index 12eeac7ead..b939fbdc2a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetClickboxOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetClickboxOverlay.java @@ -32,6 +32,7 @@ import java.awt.Graphics2D; import java.awt.Polygon; import java.util.Set; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.NPC; import net.runelite.api.NPCDefinition; @@ -46,20 +47,19 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.util.Text; +@Singleton public class TargetClickboxOverlay extends Overlay { private static final Color TRANSPARENT = new Color(0, 0, 0, 0); private final Client client; - private final SlayerConfig config; private final SlayerPlugin plugin; private final ModelOutlineRenderer modelOutliner; @Inject - TargetClickboxOverlay(Client client, SlayerConfig config, SlayerPlugin plugin, ModelOutlineRenderer modelOutlineRenderer) + TargetClickboxOverlay(final Client client, final SlayerPlugin plugin, final ModelOutlineRenderer modelOutlineRenderer) { this.client = client; - this.config = config; this.plugin = plugin; this.modelOutliner = modelOutlineRenderer; setPosition(OverlayPosition.DYNAMIC); @@ -69,7 +69,7 @@ public class TargetClickboxOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (config.highlightTargets()) + if (plugin.isHighlightTargets()) { Set targets = plugin.getHighlightedTargets(); for (NPC target : targets) @@ -79,11 +79,11 @@ public class TargetClickboxOverlay extends Overlay continue; } - Color coloration = config.getTargetColor(); + Color coloration = plugin.getGetTargetColor(); if (plugin.isSuperior(target.getName())) { - coloration = config.getSuperiorColor(); + coloration = plugin.getGetSuperiorColor(); } renderNpcOverlay(graphics, target, coloration); @@ -95,7 +95,7 @@ public class TargetClickboxOverlay extends Overlay private void renderNpcOverlay(Graphics2D graphics, NPC actor, Color color) { - switch (config.renderStyle()) + switch (plugin.getRenderStyle()) { case SOUTH_WEST_TILE: LocalPoint lp1 = LocalPoint.fromWorld(client, actor.getWorldLocation()); @@ -168,7 +168,7 @@ public class TargetClickboxOverlay extends Overlay break; } - if (config.drawNames()) + if (plugin.isDrawNames()) { String npcName = Text.removeTags(actor.getName()); Point textLocation = actor.getCanvasTextLocation(graphics, npcName, actor.getLogicalHeight() + 40); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetMinimapOverlay.java index ceb81e6cd2..6799c49674 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetMinimapOverlay.java @@ -31,6 +31,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.util.Set; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.NPC; import net.runelite.api.Point; import net.runelite.client.ui.overlay.Overlay; @@ -38,15 +39,14 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton public class TargetMinimapOverlay extends Overlay { - private final SlayerConfig config; private final SlayerPlugin plugin; @Inject - TargetMinimapOverlay(SlayerConfig config, SlayerPlugin plugin) + TargetMinimapOverlay(final SlayerPlugin plugin) { - this.config = config; this.plugin = plugin; setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); @@ -55,7 +55,7 @@ public class TargetMinimapOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (!config.highlightTargets()) + if (!plugin.isHighlightTargets()) { return null; } @@ -68,11 +68,11 @@ public class TargetMinimapOverlay extends Overlay continue; } - Color coloration = config.getTargetColor(); + Color coloration = plugin.getGetTargetColor(); if (plugin.isSuperior(target.getName())) { - coloration = config.getSuperiorColor(); + coloration = plugin.getGetSuperiorColor(); } renderTargetOverlay(graphics, target, target.getName(), coloration); @@ -88,7 +88,7 @@ public class TargetMinimapOverlay extends Overlay { OverlayUtil.renderMinimapLocation(graphics, minimapLocation, color); - if (config.drawMinimapNames()) + if (plugin.isDrawMinimapNames()) { OverlayUtil.renderTextLocation(graphics, minimapLocation, name, color); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetWeaknessOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetWeaknessOverlay.java index 7a113607ee..cdc86c6992 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetWeaknessOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetWeaknessOverlay.java @@ -28,6 +28,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.NPC; import net.runelite.api.Perspective; @@ -40,19 +41,18 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton class TargetWeaknessOverlay extends Overlay { private final Client client; - private final SlayerConfig config; private final SlayerPlugin plugin; private final ItemManager itemManager; private final NPCManager npcManager; @Inject - private TargetWeaknessOverlay(Client client, SlayerConfig config, SlayerPlugin plugin, ItemManager itemManager, NPCManager npcManager) + private TargetWeaknessOverlay(final Client client, final SlayerPlugin plugin, final ItemManager itemManager, final NPCManager npcManager) { this.client = client; - this.config = config; this.plugin = plugin; this.itemManager = itemManager; this.npcManager = npcManager; @@ -63,7 +63,7 @@ class TargetWeaknessOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (!config.weaknessPrompt()) + if (!plugin.isWeaknessPrompt()) { return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java index 5c32ba6e73..538c5326bc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java @@ -32,11 +32,12 @@ import static java.util.Arrays.asList; import java.util.Collections; import java.util.List; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ItemID; import net.runelite.api.NpcID; -@Getter +@Getter(AccessLevel.PACKAGE) enum Task { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskBox.java index ff3b509898..2f8776b200 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskBox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskBox.java @@ -6,6 +6,7 @@ import java.awt.Dimension; import java.awt.image.BufferedImage; import java.text.DecimalFormat; import java.util.Collections; +import javax.inject.Singleton; import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.JPanel; @@ -20,6 +21,7 @@ import net.runelite.client.ui.FontManager; import net.runelite.client.ui.components.ProgressBar; import net.runelite.client.util.StackFormatter; +@Singleton class TaskBox extends JPanel { private static final long MILLIS_PER_SECOND = 1000; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskCounter.java index 01f9b03890..ae7c2c67e4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskCounter.java @@ -30,7 +30,7 @@ import net.runelite.client.ui.overlay.infobox.Counter; class TaskCounter extends Counter { - TaskCounter(BufferedImage img, Plugin plugin, int amount) + TaskCounter(final BufferedImage img, final Plugin plugin, final int amount) { super(img, plugin, amount); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/SlayermusiqPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/SlayermusiqPlugin.java index 9584d17c34..682f39ba2f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/SlayermusiqPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/SlayermusiqPlugin.java @@ -54,6 +54,7 @@ package net.runelite.client.plugins.slayermusiq; import com.google.common.primitives.Ints; import java.util.Arrays; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.MenuAction; @@ -75,7 +76,7 @@ import net.runelite.client.util.Text; type = PluginType.UTILITY, enabledByDefault = false ) - +@Singleton @Slf4j public class SlayermusiqPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingOverlay.java index 3e9cad459d..017aef6ddd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingOverlay.java @@ -30,6 +30,7 @@ import java.awt.Graphics2D; import java.time.Duration; import java.time.Instant; import javax.inject.Inject; +import javax.inject.Singleton; import static net.runelite.api.AnimationID.SMITHING_CANNONBALL; import static net.runelite.api.AnimationID.SMITHING_SMELTING; import net.runelite.api.Client; @@ -45,6 +46,7 @@ import net.runelite.client.ui.overlay.components.TitleComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; +@Singleton class SmeltingOverlay extends Overlay { private static final int SMELT_TIMEOUT = 5; @@ -56,7 +58,7 @@ class SmeltingOverlay extends Overlay private final PanelComponent panelComponent = new PanelComponent(); @Inject - SmeltingOverlay(Client client, SmeltingPlugin plugin, XpTrackerService xpTrackerService) + SmeltingOverlay(final Client client, final SmeltingPlugin plugin, final XpTrackerService xpTrackerService) { super(plugin); this.client = client; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java index 21a3b5440b..9d821ad6ab 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java @@ -28,10 +28,12 @@ import com.google.inject.Provides; import java.time.Duration; import java.time.Instant; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ChatMessageType; import net.runelite.api.events.ChatMessage; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameTick; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; @@ -46,6 +48,7 @@ import net.runelite.client.ui.overlay.OverlayManager; description = "Show Smelting stats", tags = {"overlay", "skilling"} ) +@Singleton @PluginDependency(XpTrackerPlugin.class) public class SmeltingPlugin extends Plugin { @@ -61,6 +64,8 @@ public class SmeltingPlugin extends Plugin @Getter(AccessLevel.PACKAGE) private SmeltingSession session; + private int statTimeout; + @Provides SmeltingConfig getConfig(ConfigManager configManager) { @@ -70,6 +75,7 @@ public class SmeltingPlugin extends Plugin @Override protected void startUp() { + this.statTimeout = config.statTimeout(); session = null; overlayManager.add(overlay); } @@ -112,7 +118,7 @@ public class SmeltingPlugin extends Plugin { if (session != null) { - final Duration statTimeout = Duration.ofMinutes(config.statTimeout()); + final Duration statTimeout = Duration.ofMinutes(this.statTimeout); final Duration sinceCaught = Duration.between(session.getLastItemSmelted(), Instant.now()); if (sinceCaught.compareTo(statTimeout) >= 0) @@ -121,5 +127,16 @@ public class SmeltingPlugin extends Plugin } } } + + @Subscribe + private void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("smelting")) + { + return; + } + + this.statTimeout = config.statTimeout(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerConfig.java index 299122edf5..9b14734ebd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerConfig.java @@ -1,11 +1,10 @@ package net.runelite.client.plugins.spawntimer; +import java.awt.Color; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; -import java.awt.*; - @ConfigGroup("spawntimer") public interface SpawnTimerConfig extends Config { @@ -19,6 +18,7 @@ public interface SpawnTimerConfig extends Config { return ""; } + @ConfigItem( position = 2, keyName = "npcColor", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerOverlay.java index f823cf3308..fe00ea22af 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerOverlay.java @@ -1,40 +1,36 @@ package net.runelite.client.plugins.spawntimer; -import net.runelite.api.*; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.util.List; +import javax.inject.Inject; +import javax.inject.Singleton; +import net.runelite.api.NPC; import net.runelite.api.Point; -import net.runelite.client.plugins.spawntimer.SpawnTimerPlugin; -import net.runelite.client.plugins.spawntimer.SpawnTimerConfig; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.util.WildcardMatcher; -import javax.inject.Inject; -import java.awt.*; -import java.util.ArrayList; -import java.util.List; - +@Singleton public class SpawnTimerOverlay extends Overlay { - private final Client client; - private final SpawnTimerConfig config; private final SpawnTimerPlugin plugin; - private List highlights = new ArrayList<>(); + @Inject - SpawnTimerOverlay(Client client, SpawnTimerConfig config, SpawnTimerPlugin plugin) + SpawnTimerOverlay(final SpawnTimerPlugin plugin) { - this.client = client; - this.config = config; this.plugin = plugin; setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); } @Override - public Dimension render(Graphics2D graphics) + public Dimension render(Graphics2D graphics) { - highlights = plugin.getHighlights(); + List highlights = plugin.getHighlights(); for (thing npc : plugin.getTicks()) { if (npc == null) @@ -56,13 +52,13 @@ public class SpawnTimerOverlay extends Overlay { int tick = plugin.getCurrentTick() - npc.getTick(); String tickString = "" + tick; - renderNpcOverlay(graphics, npc.getNpc(), tickString, config.getHighlightColor()); + renderNpcOverlay(graphics, npc.getNpc(), tickString, plugin.getGetHighlightColor()); } } } return null; } - + private void renderNpcOverlay(Graphics2D graphics, NPC actor, String name, Color color) { Point textLocation = actor.getCanvasTextLocation(graphics, name, actor.getLogicalHeight() - 40); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerPlugin.java index b98a2a2541..aa1e66efd0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerPlugin.java @@ -2,11 +2,18 @@ package net.runelite.client.plugins.spawntimer; import com.google.common.annotations.VisibleForTesting; import com.google.inject.Provides; +import java.awt.Color; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; -import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.NPC; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.NpcDespawned; @@ -19,24 +26,20 @@ import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.util.Text; -import javax.inject.Inject; -import java.util.*; - @PluginDescriptor( - name = "Spawn Timer", - description = "Shows NPC'S time since spawned", - tags = {"highlight", "minimap", "npcs", "overlay", "spawn", "tags", "lyzrd"}, - type = PluginType.PVM, - enabledByDefault = false + name = "Spawn Timer", + description = "Shows NPC'S time since spawned", + tags = {"highlight", "minimap", "npcs", "overlay", "spawn", "tags", "lyzrd"}, + type = PluginType.PVM, + enabledByDefault = false ) - -public class SpawnTimerPlugin extends Plugin +@Singleton +public class SpawnTimerPlugin extends Plugin { @Inject private OverlayManager overlayManager; - @Getter(AccessLevel.PACKAGE) private final Set highlightedNpcs = new HashSet<>(); @@ -46,9 +49,6 @@ public class SpawnTimerPlugin extends Plugin @Inject private SpawnTimerOverlay SpawnTimerOverlay; - @Inject - private Client client; - @Inject private SpawnTimerConfig config; @@ -60,9 +60,17 @@ public class SpawnTimerPlugin extends Plugin @Getter(AccessLevel.PACKAGE) public int currentTick; + + private String getNpcToHighlight; + @Getter(AccessLevel.PACKAGE) + private Color getHighlightColor; + @Override protected void startUp() throws Exception { + this.getNpcToHighlight = config.getNpcToHighlight(); + this.getHighlightColor = config.getHighlightColor(); + currentTick = 0; overlayManager.add(SpawnTimerOverlay); } @@ -86,7 +94,7 @@ public class SpawnTimerPlugin extends Plugin public void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOGIN_SCREEN || - event.getGameState() == GameState.HOPPING) + event.getGameState() == GameState.HOPPING) { highlightedNpcs.clear(); ticks.clear(); @@ -114,21 +122,15 @@ public class SpawnTimerPlugin extends Plugin if (highlightedNpcs.contains(npc)) { highlightedNpcs.remove(npc); - for (Iterator iterator = ticks.iterator(); iterator.hasNext();) - { - thing t = iterator.next(); - if (t.getNpc() == npc) - { - iterator.remove(); - } - //currentTick = 0; - } + //currentTick = 0; + ticks.removeIf(t -> t.getNpc() == npc); } } + @VisibleForTesting public List getHighlights() { - final String configNpcs = config.getNpcToHighlight().toLowerCase(); + final String configNpcs = this.getNpcToHighlight.toLowerCase(); if (configNpcs.isEmpty()) { @@ -137,4 +139,16 @@ public class SpawnTimerPlugin extends Plugin return Text.fromCSV(configNpcs); } + + @Subscribe + private void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("spawntimer")) + { + return; + } + + this.getNpcToHighlight = config.getNpcToHighlight(); + this.getHighlightColor = config.getHighlightColor(); + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specbar/SpecBarPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/specbar/SpecBarPlugin.java index 086d3d397d..d58467d9f1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/specbar/SpecBarPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/specbar/SpecBarPlugin.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.specbar; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.client.eventbus.Subscribe; @@ -39,7 +40,7 @@ import net.runelite.client.plugins.PluginType; type = PluginType.PVP, enabledByDefault = false ) - +@Singleton public class SpecBarPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/Boss.java b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/Boss.java index a9b4434797..d609ed9d9b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/Boss.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/Boss.java @@ -26,11 +26,12 @@ package net.runelite.client.plugins.specialcounter; import com.google.common.collect.Sets; import java.util.Set; +import lombok.AccessLevel; import lombok.Getter; import lombok.ToString; import net.runelite.api.NpcID; -@Getter +@Getter(AccessLevel.PACKAGE) @ToString enum Boss { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounter.java index 482fb45089..b752cea058 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounter.java @@ -33,15 +33,13 @@ import net.runelite.client.ui.overlay.infobox.Counter; class SpecialCounter extends Counter { - private final SpecialCounterPlugin plugin; private SpecialWeapon weapon; @Getter(AccessLevel.PACKAGE) private final Map partySpecs = new HashMap<>(); - SpecialCounter(BufferedImage image, SpecialCounterPlugin plugin, int hitValue, SpecialWeapon weapon) + SpecialCounter(final BufferedImage image, final SpecialCounterPlugin plugin, final int hitValue, final SpecialWeapon weapon) { super(image, plugin, hitValue); - this.plugin = plugin; this.weapon = weapon; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java index 1f056ad234..fef53c1ea8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java @@ -28,6 +28,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Actor; import net.runelite.api.Client; import net.runelite.api.EquipmentInventorySlot; @@ -60,6 +61,7 @@ import org.apache.commons.lang3.ArrayUtils; tags = {"combat", "npcs", "overlay"}, enabledByDefault = false ) +@Singleton public class SpecialCounterPlugin extends Plugin { private int currentWorld = -1; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterUpdate.java b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterUpdate.java index 16eff1af25..efb8b308a8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterUpdate.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterUpdate.java @@ -30,7 +30,7 @@ import net.runelite.http.api.ws.messages.party.PartyMemberMessage; @Value @EqualsAndHashCode(callSuper = true) -public class SpecialCounterUpdate extends PartyMemberMessage +class SpecialCounterUpdate extends PartyMemberMessage { private final int npcId; private final SpecialWeapon weapon; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialWeapon.java b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialWeapon.java index 69d8d68193..ec581fe9e3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialWeapon.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialWeapon.java @@ -24,12 +24,13 @@ */ package net.runelite.client.plugins.specialcounter; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.ItemID; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) enum SpecialWeapon { DRAGON_WARHAMMER("Dragon Warhammer", ItemID.DRAGON_WARHAMMER, false), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/Spellbook.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/Spellbook.java index a0b292ca3c..eebfff8426 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/Spellbook.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/Spellbook.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.spellbook; import com.google.common.collect.ImmutableMap; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; @@ -36,10 +37,10 @@ public enum Spellbook LUNAR(2, "lunar"), ARCEUUS(3, "arceuus"); - @Getter + @Getter(AccessLevel.PACKAGE) private final int id; - @Getter + @Getter(AccessLevel.PACKAGE) private final String configKey; private static final ImmutableMap map; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookConfig.java index 9bc8e243f9..cb8a187300 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookConfig.java @@ -85,51 +85,6 @@ public interface SpellbookConfig extends Config return ""; } - @ConfigItem( - keyName = "standard", - name = "", - description = "", - hidden = true - ) - default String standard() - { - return ""; - } - - - @ConfigItem( - keyName = "ancient", - name = "", - description = "", - hidden = true - ) - default String ancient() - { - return ""; - } - - @ConfigItem( - keyName = "lunar", - name = "", - description = "", - hidden = true - ) - default String lunar() - { - return ""; - } - - @ConfigItem( - keyName = "arceuus", - name = "", - description = "", - hidden = true - ) - default String arceuus() - { - return ""; - } - @ConfigItem( keyName = "canDrag", name = "", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookDragOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookDragOverlay.java index 0066f841fe..5ac75aae56 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookDragOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookDragOverlay.java @@ -46,7 +46,7 @@ public class SpellbookDragOverlay extends Overlay private SpriteManager spriteManager; @Inject - private SpellbookDragOverlay(SpellbookPlugin plugin, Client client, SpriteManager spriteManager) + private SpellbookDragOverlay(final SpellbookPlugin plugin, final Client client, final SpriteManager spriteManager) { this.plugin = plugin; this.client = client; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookMouseListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookMouseListener.java index b4416161b3..01db4f79e5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookMouseListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookMouseListener.java @@ -26,15 +26,17 @@ package net.runelite.client.plugins.spellbook; import java.awt.event.MouseEvent; import java.awt.event.MouseWheelEvent; +import javax.inject.Singleton; import javax.swing.SwingUtilities; import net.runelite.client.input.MouseAdapter; import net.runelite.client.input.MouseWheelListener; +@Singleton public class SpellbookMouseListener extends MouseAdapter implements MouseWheelListener { private final SpellbookPlugin plugin; - SpellbookMouseListener(SpellbookPlugin plugin) + SpellbookMouseListener(final SpellbookPlugin plugin) { this.plugin = plugin; } @@ -42,7 +44,7 @@ public class SpellbookMouseListener extends MouseAdapter implements MouseWheelLi @Override public MouseEvent mouseClicked(MouseEvent event) { - if (!plugin.isOnSpellWidget(event.getPoint())) + if (plugin.isNotOnSpellWidget(event.getPoint())) { return event; } @@ -59,7 +61,7 @@ public class SpellbookMouseListener extends MouseAdapter implements MouseWheelLi @Override public MouseEvent mousePressed(MouseEvent event) { - if (!SwingUtilities.isLeftMouseButton(event) || !plugin.isOnSpellWidget(event.getPoint()) || plugin.isDragging()) + if (!SwingUtilities.isLeftMouseButton(event) || plugin.isNotOnSpellWidget(event.getPoint()) || plugin.isDragging()) { return event; } @@ -87,7 +89,7 @@ public class SpellbookMouseListener extends MouseAdapter implements MouseWheelLi @Override public MouseWheelEvent mouseWheelMoved(MouseWheelEvent event) { - if (!plugin.isOnSpellWidget(event.getPoint())) + if (plugin.isNotOnSpellWidget(event.getPoint())) { return event; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java index 5f739ab8b5..fc5d766385 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java @@ -36,6 +36,7 @@ import java.util.Map; import java.util.Objects; import java.util.Set; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; @@ -70,7 +71,7 @@ import net.runelite.client.util.Text; type = PluginType.UTILITY, enabledByDefault = false ) - +@Singleton @Slf4j public class SpellbookPlugin extends Plugin { @@ -134,6 +135,11 @@ public class SpellbookPlugin extends Plugin private Spellbook spellbook; private SpellbookMouseListener mouseListener; + private boolean enableMobile; + private boolean dragSpells; + private boolean scroll; + private int size; + private String filter; @Provides SpellbookConfig getConfig(ConfigManager configManager) @@ -144,6 +150,8 @@ public class SpellbookPlugin extends Plugin @Override protected void startUp() { + updateConfig(); + refreshMagicTabOption(); loadFilter(); mouseListener = new SpellbookMouseListener(this); @@ -177,6 +185,8 @@ public class SpellbookPlugin extends Plugin return; } + updateConfig(); + String key = event.getKey(); if ("filter".equals(key)) @@ -260,7 +270,7 @@ public class SpellbookPlugin extends Plugin mouseManager.registerMouseListener(mouseListener); tmp = new HashMap<>(); - if (config.scroll()) + if (this.scroll) { mouseManager.registerMouseWheelListener(mouseListener); } @@ -289,7 +299,7 @@ public class SpellbookPlugin extends Plugin private void refreshMagicTabOption() { clearMagicTabMenus(); - if (client.getGameState() != GameState.LOGGED_IN || !config.dragSpells()) + if (client.getGameState() != GameState.LOGGED_IN || !this.dragSpells) { return; } @@ -312,7 +322,7 @@ public class SpellbookPlugin extends Plugin public void onScriptCallbackEvent(ScriptCallbackEvent event) { if (client.getVar(Varbits.FILTER_SPELLBOOK) != 0 - || !config.enableMobile() + || !this.enableMobile || !event.getEventName().toLowerCase().contains("spell")) { return; @@ -367,7 +377,7 @@ public class SpellbookPlugin extends Plugin } else if ("resizeSpell".equals(event.getEventName())) { - int size = config.size(); + int size = this.size; int columns = clamp(FULL_WIDTH / size, 2, 3); iStack[iStackSize - 2] = size; @@ -375,7 +385,7 @@ public class SpellbookPlugin extends Plugin } else if ("setSpellAreaSize".equals(event.getEventName())) { - if (!config.dragSpells()) + if (!this.dragSpells) { return; } @@ -411,7 +421,7 @@ public class SpellbookPlugin extends Plugin } else if ("setSpellPosition".equals(event.getEventName())) { - if (!config.dragSpells()) + if (!this.dragSpells) { return; } @@ -509,7 +519,7 @@ public class SpellbookPlugin extends Plugin return WordFilterMode.CONTAINS; // but probably null soz } - boolean isOnSpellWidget(java.awt.Point point) + boolean isNotOnSpellWidget(java.awt.Point point) { Widget boundsWidget = client.getWidget(WidgetInfo.SPELLBOOK_FILTERED_BOUNDS); if (client.getVar(VarClientInt.INVENTORY_TAB) != 6 @@ -517,15 +527,15 @@ public class SpellbookPlugin extends Plugin || boundsWidget == null || !boundsWidget.getBounds().contains(point)) { - return false; + return true; } - return currentWidget(point) != null; + return currentWidget(point) == null; } private void loadFilter() { - notFilteredSpells = ImmutableSet.copyOf(Text.fromCSV(config.filter().toLowerCase())); + notFilteredSpells = ImmutableSet.copyOf(Text.fromCSV(this.filter.toLowerCase())); } void startDragging(java.awt.Point point) @@ -630,7 +640,7 @@ public class SpellbookPlugin extends Plugin { Widget clickedWidget = currentWidget(point); - if (clickedWidget == null || dragging || !config.scroll()) + if (clickedWidget == null || dragging || !this.scroll) { return; } @@ -701,6 +711,15 @@ public class SpellbookPlugin extends Plugin private int trueSize(Spell s) { - return s.getSize() * 2 + config.size(); + return s.getSize() * 2 + this.size; + } + + private void updateConfig() + { + this.enableMobile = config.enableMobile(); + this.dragSpells = config.dragSpells(); + this.scroll = config.scroll(); + this.size = config.size(); + this.filter = config.filter(); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsOverlay.java index bf2dce7138..d4d64dec42 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsOverlay.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.statusbars; import com.google.common.base.Strings; import com.google.common.primitives.Ints; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.MenuEntry; import net.runelite.api.Point; @@ -44,6 +45,7 @@ import javax.inject.Inject; import java.awt.Dimension; import java.awt.Graphics2D; +@Singleton public class StatusBarsOverlay extends Overlay { private static final int HEIGHT = 252; @@ -53,17 +55,15 @@ public class StatusBarsOverlay extends Overlay private final Client client; private final StatusBarsPlugin plugin; - private final StatusBarsConfig config; private final ItemStatChangesService itemStatService; @Inject - private StatusBarsOverlay(Client client, StatusBarsPlugin plugin, StatusBarsConfig config, ItemStatChangesService itemstatservice) + private StatusBarsOverlay(final Client client, final StatusBarsPlugin plugin, final ItemStatChangesService itemstatservice) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); this.client = client; this.plugin = plugin; - this.config = config; this.itemStatService = itemstatservice; } @@ -117,8 +117,8 @@ public class StatusBarsOverlay extends Overlay offsetRightBarY = (location.getY() - offsetRight.getY()); } - BarRenderer left = plugin.getBarRenderers().get(config.leftBarMode()); - BarRenderer right = plugin.getBarRenderers().get(config.rightBarMode()); + BarRenderer left = plugin.getBarRenderers().get(plugin.getLeftBarMode()); + BarRenderer right = plugin.getBarRenderers().get(plugin.getRightBarMode()); if (left != null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java index 93d6f94163..b2310a1acc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java @@ -28,6 +28,7 @@ import javax.inject.Inject; import com.google.common.collect.Maps; import com.google.inject.Provides; +import javax.inject.Singleton; import lombok.Getter; import java.time.Duration; import java.time.Instant; @@ -38,6 +39,7 @@ import net.runelite.api.Actor; import net.runelite.api.Client; import net.runelite.api.NPC; import net.runelite.api.NPCDefinition; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameTick; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; @@ -61,6 +63,7 @@ import java.util.Map; description = "Draws status bars next to players inventory showing currentValue and restore amounts", enabledByDefault = false ) +@Singleton @PluginDependency(ItemStatPlugin.class) public class StatusBarsPlugin extends Plugin { @@ -94,9 +97,24 @@ public class StatusBarsPlugin extends Plugin @Getter(AccessLevel.PACKAGE) private Instant lastCombatAction; + @Getter(AccessLevel.PUBLIC) + private boolean enableCounter; + @Getter(AccessLevel.PUBLIC) + private boolean enableSkillIcon; + @Getter(AccessLevel.PUBLIC) + private boolean enableRestorationBars; + @Getter(AccessLevel.PACKAGE) + private BarMode leftBarMode; + @Getter(AccessLevel.PACKAGE) + private BarMode rightBarMode; + private boolean toggleRestorationBars; + private int hideStatusBarDelay; + @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(overlay); barRenderers.put(BarMode.DISABLED, null); barRenderers.put(BarMode.HITPOINTS, hitPointsRenderer); @@ -105,7 +123,7 @@ public class StatusBarsPlugin extends Plugin barRenderers.put(BarMode.SPECIAL_ATTACK, specialAttackRenderer); } - void updateLastCombatAction() + private void updateLastCombatAction() { this.lastCombatAction = Instant.now(); } @@ -113,10 +131,9 @@ public class StatusBarsPlugin extends Plugin @Subscribe public void onGameTick(GameTick gameTick) { - if (!config.toggleRestorationBars()) + if (!this.toggleRestorationBars) { overlayManager.add(overlay); - return; } else { @@ -128,14 +145,14 @@ public class StatusBarsPlugin extends Plugin { final Actor interacting = client.getLocalPlayer().getInteracting(); final boolean isNpc = interacting instanceof NPC; - final int combatTimeout = config.hideStatusBarDelay(); + final int combatTimeout = this.hideStatusBarDelay; if (isNpc) { final NPC npc = (NPC) interacting; final NPCDefinition npcComposition = npc.getDefinition(); final List npcMenuActions = Arrays.asList(npcComposition.getActions()); - if (npcMenuActions.contains("Attack") && config.toggleRestorationBars()) + if (npcMenuActions.contains("Attack") && this.toggleRestorationBars) { updateLastCombatAction(); overlayManager.add(overlay); @@ -162,4 +179,26 @@ public class StatusBarsPlugin extends Plugin { return configManager.getConfig(StatusBarsConfig.class); } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!"statusbars".equals(event.getGroup())) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.enableCounter = config.enableCounter(); + this.enableSkillIcon = config.enableSkillIcon(); + this.enableRestorationBars = config.enableRestorationBars(); + this.leftBarMode = config.leftBarMode(); + this.rightBarMode = config.rightBarMode(); + this.toggleRestorationBars = config.toggleRestorationBars(); + this.hideStatusBarDelay = config.hideStatusBarDelay(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/Viewport.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/Viewport.java index ce4c6e86b6..ff1703e93a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/Viewport.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/Viewport.java @@ -24,12 +24,13 @@ */ package net.runelite.client.plugins.statusbars; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.Point; import net.runelite.api.widgets.WidgetInfo; -@Getter +@Getter(AccessLevel.PACKAGE) @AllArgsConstructor enum Viewport { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/config/BarMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/config/BarMode.java index 7da3d0c308..0716177fe9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/config/BarMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/config/BarMode.java @@ -24,10 +24,11 @@ */ package net.runelite.client.plugins.statusbars.config; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; -@Getter +@Getter(AccessLevel.PACKAGE) @RequiredArgsConstructor public enum BarMode { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/BarRenderer.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/BarRenderer.java index 21ed8fd96b..f721611b47 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/BarRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/BarRenderer.java @@ -27,18 +27,17 @@ package net.runelite.client.plugins.statusbars.renderer; -import lombok.AccessLevel; -import lombok.RequiredArgsConstructor; -import net.runelite.api.Client; -import net.runelite.client.plugins.statusbars.StatusBarsConfig; -import net.runelite.client.plugins.statusbars.StatusBarsOverlay; -import net.runelite.client.ui.FontManager; -import net.runelite.client.ui.overlay.components.TextComponent; - import java.awt.Color; import java.awt.Graphics2D; import java.awt.Image; import java.awt.Point; +import lombok.AccessLevel; +import lombok.RequiredArgsConstructor; +import net.runelite.api.Client; +import net.runelite.client.plugins.statusbars.StatusBarsOverlay; +import net.runelite.client.plugins.statusbars.StatusBarsPlugin; +import net.runelite.client.ui.FontManager; +import net.runelite.client.ui.overlay.components.TextComponent; @RequiredArgsConstructor(access = AccessLevel.PROTECTED) public abstract class BarRenderer @@ -56,12 +55,12 @@ public abstract class BarRenderer private static final int ICON_AND_COUNTER_OFFSET_Y = 21; private static final int OFFSET = 2; - protected final StatusBarsConfig config; - protected int maximumValue; - protected int currentValue; + protected final StatusBarsPlugin plugin; + int maximumValue; + int currentValue; protected int restore; - protected Color standardColor; - protected Color restoreColor; + Color standardColor; + Color restoreColor; protected Image icon; protected abstract void update(Client client, StatusBarsOverlay overlay); @@ -75,9 +74,9 @@ public abstract class BarRenderer final int filledHeight = getBarHeight(maximumValue, currentValue, height); graphics.setColor(standardColor); graphics.fillRect(x + PADDING, - y + PADDING + (height - filledHeight), - BAR_WIDTH - PADDING * OFFSET, - filledHeight - PADDING * OFFSET); + y + PADDING + (height - filledHeight), + BAR_WIDTH - PADDING * OFFSET, + filledHeight - PADDING * OFFSET); } private void renderIconsAndCounters(Graphics2D graphics, int x, int y) @@ -86,7 +85,7 @@ public abstract class BarRenderer final int widthOfCounter = graphics.getFontMetrics().stringWidth(counterText); final int centerText = (BAR_WIDTH - PADDING) / 2 - (widthOfCounter / 2); - if (config.enableCounter()) + if (plugin.isEnableCounter()) { graphics.setFont(FontManager.getRunescapeSmallFont()); TEXT.setText(counterText); @@ -97,7 +96,7 @@ public abstract class BarRenderer TEXT.setText(""); } - if (config.enableSkillIcon()) + if (plugin.isEnableSkillIcon()) { graphics.drawImage(icon, x + ICON_AND_COUNTER_OFFSET_X + PADDING, y + ICON_AND_COUNTER_OFFSET_Y - icon.getWidth(null), null); TEXT.setPosition(new Point(x + centerText + 1, y + SKILL_ICON_HEIGHT)); @@ -123,16 +122,16 @@ public abstract class BarRenderer filledHeight = filledHeight - overHeal + OVERHEAL_OFFSET; graphics.setColor(COLOR_OVERHEAL); graphics.fillRect(x + PADDING, - y - filledCurrentHeight + (height - filledHeight) + HEAL_OFFSET, - BAR_WIDTH - PADDING * OVERHEAL_OFFSET, - filledHeight - PADDING * OVERHEAL_OFFSET); + y - filledCurrentHeight + (height - filledHeight) + HEAL_OFFSET, + BAR_WIDTH - PADDING * OVERHEAL_OFFSET, + filledHeight - PADDING * OVERHEAL_OFFSET); } else { graphics.fillRect(x + PADDING, - y - OVERHEAL_OFFSET - filledCurrentHeight + (height - filledHeight) + HEAL_OFFSET, - BAR_WIDTH - PADDING * OVERHEAL_OFFSET, - filledHeight + OVERHEAL_OFFSET - PADDING * OVERHEAL_OFFSET); + y - OVERHEAL_OFFSET - filledCurrentHeight + (height - filledHeight) + HEAL_OFFSET, + BAR_WIDTH - PADDING * OVERHEAL_OFFSET, + filledHeight + OVERHEAL_OFFSET - PADDING * OVERHEAL_OFFSET); } } @@ -152,9 +151,13 @@ public abstract class BarRenderer { update(client, overlay); renderBar(graphics, x, y, height); - if (config.enableRestorationBars()) + if (plugin.isEnableRestorationBars()) + { renderRestore(graphics, x, y, height); - if (config.enableSkillIcon() || config.enableCounter()) + } + if (plugin.isEnableSkillIcon() || plugin.isEnableCounter()) + { renderIconsAndCounters(graphics, x, y); + } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/EnergyRenderer.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/EnergyRenderer.java index 127aa6b601..b3a1cd5141 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/EnergyRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/EnergyRenderer.java @@ -27,23 +27,24 @@ package net.runelite.client.plugins.statusbars.renderer; +import java.awt.Color; +import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.SpriteID; import net.runelite.client.game.SpriteManager; -import net.runelite.client.plugins.statusbars.StatusBarsConfig; import net.runelite.client.plugins.statusbars.StatusBarsOverlay; +import net.runelite.client.plugins.statusbars.StatusBarsPlugin; -import javax.inject.Inject; -import java.awt.Color; - +@Singleton public class EnergyRenderer extends BarRenderer { private final SpriteManager spriteManager; @Inject - public EnergyRenderer(StatusBarsConfig config, SpriteManager spriteManager) + public EnergyRenderer(final StatusBarsPlugin plugin, final SpriteManager spriteManager) { - super(config); + super(plugin); maximumValue = 100; this.spriteManager = spriteManager; standardColor = new Color(199, 174, 0, 220); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/HitPointsRenderer.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/HitPointsRenderer.java index 68e1c29548..f9976ebe27 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/HitPointsRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/HitPointsRenderer.java @@ -27,16 +27,17 @@ package net.runelite.client.plugins.statusbars.renderer; +import java.awt.Color; +import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Skill; import net.runelite.api.VarPlayer; import net.runelite.client.game.SkillIconManager; -import net.runelite.client.plugins.statusbars.StatusBarsConfig; import net.runelite.client.plugins.statusbars.StatusBarsOverlay; +import net.runelite.client.plugins.statusbars.StatusBarsPlugin; -import javax.inject.Inject; -import java.awt.Color; - +@Singleton public class HitPointsRenderer extends BarRenderer { private static final Color COLOR_STANDARD = new Color(225, 35, 0, 125); @@ -44,9 +45,9 @@ public class HitPointsRenderer extends BarRenderer private static final Color COLOR_VENOM = new Color(0, 65, 0, 150); @Inject - public HitPointsRenderer(StatusBarsConfig config, SkillIconManager iconManager) + public HitPointsRenderer(final StatusBarsPlugin plugin, final SkillIconManager iconManager) { - super(config); + super(plugin); icon = iconManager.getSkillImage(Skill.HITPOINTS, true); restoreColor = new Color(255, 112, 6, 150); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/PrayerRenderer.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/PrayerRenderer.java index 76ed6fadca..bf5eed9cf1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/PrayerRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/PrayerRenderer.java @@ -27,17 +27,18 @@ package net.runelite.client.plugins.statusbars.renderer; +import java.awt.Color; +import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Skill; import net.runelite.api.Varbits; import net.runelite.client.game.SkillIconManager; -import net.runelite.client.plugins.statusbars.StatusBarsConfig; import net.runelite.client.plugins.statusbars.StatusBarsOverlay; +import net.runelite.client.plugins.statusbars.StatusBarsPlugin; import net.runelite.client.util.ImageUtil; -import javax.inject.Inject; -import java.awt.Color; - +@Singleton public class PrayerRenderer extends BarRenderer { private static final Color COLOR_STANDARD = new Color(50, 200, 200, 175); @@ -45,9 +46,9 @@ public class PrayerRenderer extends BarRenderer private static final int SIZE = 17; @Inject - public PrayerRenderer(StatusBarsConfig config, SkillIconManager iconManager) + public PrayerRenderer(final StatusBarsPlugin plugin, final SkillIconManager iconManager) { - super(config); + super(plugin); icon = ImageUtil.resizeImage(iconManager.getSkillImage(Skill.PRAYER, true), SIZE, SIZE); restoreColor = new Color(57, 255, 186, 75); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/SpecialAttackRenderer.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/SpecialAttackRenderer.java index a2f43f1c2e..7ffeb06d2c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/SpecialAttackRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/SpecialAttackRenderer.java @@ -27,24 +27,25 @@ package net.runelite.client.plugins.statusbars.renderer; +import java.awt.Color; +import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.SpriteID; import net.runelite.api.VarPlayer; import net.runelite.client.game.SpriteManager; -import net.runelite.client.plugins.statusbars.StatusBarsConfig; import net.runelite.client.plugins.statusbars.StatusBarsOverlay; +import net.runelite.client.plugins.statusbars.StatusBarsPlugin; -import javax.inject.Inject; -import java.awt.Color; - +@Singleton public class SpecialAttackRenderer extends BarRenderer { private final SpriteManager spriteManager; @Inject - public SpecialAttackRenderer(StatusBarsConfig config, SpriteManager spriteManager) + public SpecialAttackRenderer(final StatusBarsPlugin plugin, final SpriteManager spriteManager) { - super(config); + super(plugin); maximumValue = 100; this.spriteManager = spriteManager; standardColor = restoreColor = new Color(3, 153, 0, 195); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ItemSortTypes.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ItemSortTypes.java index 80ae04b20d..11680b9456 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ItemSortTypes.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ItemSortTypes.java @@ -1,9 +1,10 @@ package net.runelite.client.plugins.stonedloottracker; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; -@Getter +@Getter(AccessLevel.PACKAGE) @RequiredArgsConstructor public enum ItemSortTypes { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/StonedLootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/StonedLootTrackerPlugin.java index ceb85fe365..3141db78e6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/StonedLootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/StonedLootTrackerPlugin.java @@ -46,6 +46,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; import javax.inject.Inject; +import javax.inject.Singleton; import javax.swing.SwingUtilities; import lombok.extern.slf4j.Slf4j; import net.runelite.api.ChatMessageType; @@ -97,7 +98,7 @@ import net.runelite.client.util.Text; type = PluginType.UTILITY, enabledByDefault = false ) - +@Singleton @Slf4j public class StonedLootTrackerPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/BossTab.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/BossTab.java index b59752f5f7..f40ca6cb94 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/BossTab.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/BossTab.java @@ -29,10 +29,11 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.TreeSet; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ItemID; -@Getter +@Getter(AccessLevel.PUBLIC) public enum BossTab { // Chest Rewards diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecord.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecord.java index 5143e79591..3a8ae0a843 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecord.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecord.java @@ -27,9 +27,10 @@ package net.runelite.client.plugins.stonedloottracker.data; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import lombok.AccessLevel; import lombok.Getter; -@Getter +@Getter(AccessLevel.PUBLIC) @Deprecated public class LootRecord { @@ -39,7 +40,7 @@ public class LootRecord private final int killCount; final Collection drops; - public LootRecord(int id, String name, int level, int kc, Collection drops) + public LootRecord(final int id, final String name, final int level, final int kc, final Collection drops) { this.id = id; this.name = name; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecordCustom.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecordCustom.java index ec208f8615..2d098b17f3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecordCustom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecordCustom.java @@ -28,9 +28,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; -@Getter +@Getter(AccessLevel.PUBLIC) public class LootRecordCustom { private final int id; @@ -39,7 +40,7 @@ public class LootRecordCustom private final int killCount; final Collection drops; - public LootRecordCustom(int id, String name, int level, int kc, Collection drops) + public LootRecordCustom(final int id, final String name, final int level, final int kc, final Collection drops) { this.id = id; this.name = name; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootTrackerItemEntry.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootTrackerItemEntry.java index c7215a4b5b..5d764ac750 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootTrackerItemEntry.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootTrackerItemEntry.java @@ -25,9 +25,10 @@ */ package net.runelite.client.plugins.stonedloottracker.data; +import lombok.AccessLevel; import lombok.Getter; -@Getter +@Getter(AccessLevel.PUBLIC) public class LootTrackerItemEntry { private final String name; @@ -39,7 +40,7 @@ public class LootTrackerItemEntry private long haTotal; private final boolean stackable; - public LootTrackerItemEntry(String name, int id, int quantity, long price, long haPrice, boolean stackable) + public LootTrackerItemEntry(final String name, final int id, final int quantity, final long price, final long haPrice, final boolean stackable) { this.name = name; this.id = id; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/Pet.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/Pet.java index 354ef2bd7c..35ff366e9c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/Pet.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/Pet.java @@ -2,10 +2,11 @@ package net.runelite.client.plugins.stonedloottracker.data; import java.util.HashMap; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ItemID; -@Getter +@Getter(AccessLevel.PUBLIC) public enum Pet { // GWD Pets @@ -46,7 +47,7 @@ public enum Pet private final String[] bossNames; private static final Map byBossName = buildBossMap(); - Pet(int id, String... bossNames) + Pet(final int id, final String... bossNames) { this.petID = id; this.bossNames = bossNames; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/UniqueItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/UniqueItem.java index 959327e293..d15a980420 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/UniqueItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/UniqueItem.java @@ -30,12 +30,13 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; import java.util.stream.Collectors; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import net.runelite.api.ItemID; @RequiredArgsConstructor -@Getter +@Getter(AccessLevel.PUBLIC) public enum UniqueItem { // Shared "Uniques" (Dropped by multiple activities) @@ -828,7 +829,7 @@ public enum UniqueItem HERBI("Herbi", ItemID.HERBI, "Herbiboar", "Pet", -1); // Shared Unique Items - UniqueItem(String n, int id, String... activities) + UniqueItem(final String n, final int id, final String... activities) { this.name = n; this.itemID = id; @@ -838,7 +839,7 @@ public enum UniqueItem } // Non-Shared Unique Items - UniqueItem(String n, int id, String a, String set, int position) + UniqueItem(final String n, final int id, final String a, final String set, final int position) { this.name = n; this.itemID = id; @@ -886,7 +887,7 @@ public enum UniqueItem String[] activities = item.getActivities(); for (String activity : activities) { - byName.computeIfAbsent(activity.toUpperCase(), e -> new ArrayList()).add(item); + byName.computeIfAbsent(activity.toUpperCase(), e -> new ArrayList<>()).add(item); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/ItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/ItemPanel.java index 4199f3b44b..b7e01d00a8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/ItemPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/ItemPanel.java @@ -30,12 +30,14 @@ import java.awt.Dimension; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.GridLayout; +import javax.inject.Singleton; import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingUtilities; import javax.swing.border.Border; import javax.swing.border.EmptyBorder; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.stonedloottracker.data.LootTrackerItemEntry; @@ -44,7 +46,8 @@ import net.runelite.client.ui.FontManager; import net.runelite.client.ui.components.shadowlabel.JShadowedLabel; import net.runelite.client.util.StackFormatter; -@Getter +@Singleton +@Getter(AccessLevel.PACKAGE) class ItemPanel extends JPanel { private static final GridBagLayout LAYOUT = new GridBagLayout(); @@ -57,7 +60,7 @@ class ItemPanel extends JPanel private LootTrackerItemEntry record; - ItemPanel(LootTrackerItemEntry record, ItemManager itemManager) + ItemPanel(final LootTrackerItemEntry record, final ItemManager itemManager) { this.record = record; this.setLayout(LAYOUT); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootGrid.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootGrid.java index b5ee9a7449..0af19c077c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootGrid.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootGrid.java @@ -28,6 +28,7 @@ import java.awt.Dimension; import java.awt.GridLayout; import java.util.ArrayList; import java.util.Arrays; +import javax.inject.Singleton; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; @@ -37,6 +38,7 @@ import net.runelite.client.plugins.stonedloottracker.data.LootTrackerItemEntry; import net.runelite.client.ui.ColorScheme; import net.runelite.client.util.StackFormatter; +@Singleton class LootGrid extends JPanel { private static final int ITEMS_PER_ROW = 5; @@ -44,7 +46,7 @@ class LootGrid extends JPanel private final LootTrackerItemEntry[] itemsToDisplay; private ItemManager itemManager; - LootGrid(LootTrackerItemEntry[] itemsToDisplay, ItemManager itemManager) + LootGrid(final LootTrackerItemEntry[] itemsToDisplay, final ItemManager itemManager) { this.itemsToDisplay = itemsToDisplay; this.itemManager = itemManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootPanel.java index c89adcaafb..089eda28d0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootPanel.java @@ -35,6 +35,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; +import javax.inject.Singleton; import javax.swing.JPanel; import javax.swing.SwingUtilities; import javax.swing.border.EmptyBorder; @@ -48,6 +49,7 @@ import net.runelite.client.plugins.stonedloottracker.data.UniqueItemPrepared; import net.runelite.client.ui.ColorScheme; @Slf4j +@Singleton class LootPanel extends JPanel { private Collection records; @@ -63,7 +65,7 @@ class LootPanel extends JPanel private boolean playbackPlaying = false; private boolean cancelPlayback = false; - LootPanel(Collection records, Map> uniqueMap, boolean hideUnqiues, ItemSortTypes sort, boolean itemBreakdown, ItemManager itemManager) + LootPanel(final Collection records, final Map> uniqueMap, final boolean hideUnqiues, final ItemSortTypes sort, final boolean itemBreakdown, final ItemManager itemManager) { this.records = (records == null ? new ArrayList<>() : records); this.uniqueMap = (uniqueMap == null ? new HashMap<>() : uniqueMap); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java index 1b6083505d..da69419947 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java @@ -33,6 +33,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; import javax.annotation.Nullable; +import javax.inject.Singleton; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; @@ -47,7 +48,8 @@ import net.runelite.client.ui.FontManager; import net.runelite.client.util.StackFormatter; import net.runelite.client.util.Text; -@Getter +@Singleton +@Getter(AccessLevel.PACKAGE) class LootTrackerBox extends JPanel { private static final int ITEMS_PER_ROW = 5; @@ -58,7 +60,7 @@ class LootTrackerBox extends JPanel @Getter(AccessLevel.PACKAGE) private final String id; - @Getter + @Getter(AccessLevel.PACKAGE) private final List records = new ArrayList<>(); private long totalPrice; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerPanel.java index 50af60e653..6ce3b3cad5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerPanel.java @@ -37,6 +37,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import javax.imageio.ImageIO; +import javax.inject.Singleton; import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.JOptionPane; @@ -56,6 +57,7 @@ import net.runelite.client.ui.PluginPanel; import net.runelite.client.ui.components.PluginErrorPanel; @Slf4j +@Singleton public class LootTrackerPanel extends PluginPanel { private static final BufferedImage ICON_DELETE; @@ -99,7 +101,7 @@ public class LootTrackerPanel extends PluginPanel private final ItemManager itemManager; private final StonedLootTrackerPlugin plugin; - public LootTrackerPanel(final ItemManager itemManager, StonedLootTrackerPlugin plugin) + public LootTrackerPanel(final ItemManager itemManager, final StonedLootTrackerPlugin plugin) { super(false); this.itemManager = itemManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/SelectionPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/SelectionPanel.java index 37acb992e0..f6e9141a3b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/SelectionPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/SelectionPanel.java @@ -36,6 +36,7 @@ import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.Set; import java.util.TreeSet; +import javax.inject.Singleton; import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.JPanel; @@ -49,7 +50,8 @@ import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.components.materialtabs.MaterialTab; import net.runelite.client.ui.components.materialtabs.MaterialTabGroup; -public class SelectionPanel extends JPanel +@Singleton +class SelectionPanel extends JPanel { private TreeSet names; private LootTrackerPanel parent; @@ -61,7 +63,7 @@ public class SelectionPanel extends JPanel private boolean configToggle; - SelectionPanel(boolean configToggle, TreeSet names, LootTrackerPanel parent, ItemManager itemManager) + SelectionPanel(final boolean configToggle, final TreeSet names, final LootTrackerPanel parent, final ItemManager itemManager) { this.names = names == null ? new TreeSet<>() : names; this.parent = parent; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/TextPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/TextPanel.java index 38529cce86..e05caac244 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/TextPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/TextPanel.java @@ -28,17 +28,20 @@ import java.awt.BorderLayout; import java.awt.Color; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; +import javax.inject.Singleton; import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; import javax.swing.border.Border; import javax.swing.border.EmptyBorder; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.ui.ColorScheme; import net.runelite.client.util.StackFormatter; -@Getter +@Singleton +@Getter(AccessLevel.PACKAGE) class TextPanel extends JPanel { private static final GridBagLayout LAYOUT = new GridBagLayout(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/UniqueItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/UniqueItemPanel.java index e5a4c38721..0bb4824668 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/UniqueItemPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/UniqueItemPanel.java @@ -32,12 +32,14 @@ import java.awt.GridBagLayout; import java.awt.image.BufferedImage; import java.util.Collection; import java.util.Map; +import javax.inject.Singleton; import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingUtilities; import javax.swing.border.Border; import javax.swing.border.EmptyBorder; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.game.AsyncBufferedImage; import net.runelite.client.game.ItemManager; @@ -46,7 +48,8 @@ import net.runelite.client.ui.ColorScheme; import net.runelite.client.util.ImageUtil; import net.runelite.client.util.StackFormatter; -@Getter +@Singleton +@Getter(AccessLevel.PACKAGE) class UniqueItemPanel extends JPanel { private ItemManager itemManager; @@ -58,7 +61,7 @@ class UniqueItemPanel extends JPanel private static final Border panelBorder = new EmptyBorder(3, 0, 3, 0); private static final Color panelBackgroundColor = ColorScheme.DARK_GRAY_COLOR; - UniqueItemPanel(Collection items, Map uniqueMap, ItemManager itemManager) + UniqueItemPanel(final Collection items, final Map uniqueMap, final ItemManager itemManager) { this.itemManager = itemManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/StretchedModePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/StretchedModePlugin.java index cbaceb550b..1d57cdb4ee 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/StretchedModePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/StretchedModePlugin.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.stretchedmode; import com.google.inject.Provides; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.ResizeableChanged; @@ -42,6 +43,7 @@ import net.runelite.client.plugins.PluginDescriptor; tags = {"resize", "ui", "interface", "stretch", "scaling", "fixed"}, enabledByDefault = false ) +@Singleton public class StretchedModePlugin extends Plugin { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/TranslateMouseListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/TranslateMouseListener.java index 4720dbe98f..c2093cb32b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/TranslateMouseListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/TranslateMouseListener.java @@ -29,15 +29,17 @@ import java.awt.Component; import java.awt.Dimension; import java.awt.event.MouseEvent; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.client.input.MouseListener; +@Singleton public class TranslateMouseListener implements MouseListener { private final Client client; @Inject - public TranslateMouseListener(Client client) + public TranslateMouseListener(final Client client) { this.client = client; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/TranslateMouseWheelListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/TranslateMouseWheelListener.java index 2fdd39ec03..e204be23cc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/TranslateMouseWheelListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/TranslateMouseWheelListener.java @@ -29,15 +29,17 @@ import java.awt.Component; import java.awt.Dimension; import java.awt.event.MouseWheelEvent; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.client.input.MouseWheelListener; +@Singleton public class TranslateMouseWheelListener implements MouseWheelListener { private final Client client; @Inject - public TranslateMouseWheelListener(Client client) + public TranslateMouseWheelListener(final Client client) { this.client = client; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/BlowpipeDartType.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/BlowpipeDartType.java index 5ab1a31652..1d625ea7e3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/BlowpipeDartType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/BlowpipeDartType.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.suppliestracker; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import static net.runelite.api.ItemID.ADAMANT_DART; @@ -45,7 +46,7 @@ public enum BlowpipeDartType ADAMANT(ADAMANT_DART), RUNE(RUNE_DART), DRAGON(DRAGON_DART); - @Getter + @Getter(AccessLevel.PACKAGE) private int dartID; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/ItemType.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/ItemType.java index 56887d9837..692b8a6233 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/ItemType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/ItemType.java @@ -25,6 +25,7 @@ */ package net.runelite.client.plugins.suppliestracker; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; @@ -41,7 +42,7 @@ public enum ItemType AMMO("Ammo"), TELEPORT("Teleports"); - @Getter + @Getter(AccessLevel.PACKAGE) private String label; /** diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/MenuAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/MenuAction.java index 76c83d1bb6..3decf36460 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/MenuAction.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/MenuAction.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.suppliestracker; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.Item; @@ -34,20 +35,20 @@ import net.runelite.api.Item; @AllArgsConstructor public class MenuAction { - @Getter + @Getter(AccessLevel.PACKAGE) private ActionType type; - @Getter + @Getter(AccessLevel.PACKAGE) private Item[] oldInventory; static class ItemAction extends MenuAction { - @Getter + @Getter(AccessLevel.PACKAGE) private int itemID; - @Getter + @Getter(AccessLevel.PACKAGE) private int slot; - ItemAction(ActionType type, Item[] oldInventory, int itemID, int slot) + ItemAction(final ActionType type, final Item[] oldInventory, final int itemID, final int slot) { super(type, oldInventory); this.itemID = itemID; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesBox.java index ee4788a3ce..b5ef601ced 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesBox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesBox.java @@ -30,6 +30,7 @@ import java.awt.Color; import java.awt.GridLayout; import java.util.ArrayList; import java.util.List; +import javax.inject.Singleton; import javax.swing.JLabel; import javax.swing.JMenuItem; import javax.swing.JPanel; @@ -78,6 +79,7 @@ import net.runelite.client.util.StackFormatter; import net.runelite.client.util.Text; import net.runelite.http.api.item.ItemPrice; +@Singleton class SuppliesBox extends JPanel { private static final int ITEMS_PER_ROW = 5; @@ -91,12 +93,12 @@ class SuppliesBox extends JPanel private final SuppliesTrackerPlugin plugin; private final SuppliesTrackerPanel panel; - @Getter + @Getter(AccessLevel.PACKAGE) private final List trackedItems = new ArrayList<>(); private long totalPrice; - @Getter + @Getter(AccessLevel.PACKAGE) private final ItemType type; SuppliesBox(final ItemManager itemManager, final String id, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerItem.java index 4333d77c8f..5347945d00 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerItem.java @@ -24,18 +24,16 @@ */ package net.runelite.client.plugins.suppliestracker; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; +@Getter(AccessLevel.PACKAGE) @AllArgsConstructor class SuppliesTrackerItem { - @Getter private int id; - @Getter private String name; - @Getter private int quantity; - @Getter private long price; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPanel.java index da19cc4842..088d2421b5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPanel.java @@ -31,6 +31,7 @@ import java.awt.GridLayout; import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.List; +import javax.inject.Singleton; import javax.swing.BoxLayout; import javax.swing.ImageIcon; import javax.swing.JLabel; @@ -46,7 +47,7 @@ import net.runelite.client.ui.components.PluginErrorPanel; import net.runelite.client.util.ColorUtil; import net.runelite.client.util.StackFormatter; - +@Singleton class SuppliesTrackerPanel extends PluginPanel { private static final String HTML_LABEL_TEMPLATE = diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java index 3731f6df9a..3fc78a6532 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java @@ -38,6 +38,7 @@ import java.util.List; import java.util.Random; import java.util.regex.Pattern; import javax.inject.Inject; +import javax.inject.Singleton; import javax.swing.SwingUtilities; import lombok.extern.slf4j.Slf4j; import static net.runelite.api.AnimationID.BLOWPIPE_ATTACK; @@ -184,7 +185,7 @@ import net.runelite.http.api.item.ItemPrice; type = PluginType.UTILITY, enabledByDefault = false ) - +@Singleton @Slf4j public class SuppliesTrackerPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairOverlay.java index e7ed05731e..01670c2fdf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairOverlay.java @@ -29,6 +29,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Polygon; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.coords.LocalPoint; @@ -36,6 +37,7 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; +@Singleton @Slf4j public class TarnsLairOverlay extends Overlay { @@ -45,7 +47,7 @@ public class TarnsLairOverlay extends Overlay private final TarnsLairPlugin plugin; @Inject - public TarnsLairOverlay(Client client, TarnsLairPlugin plugin) + public TarnsLairOverlay(final Client client, final TarnsLairPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java index b6dd13f6ad..afe425a8d9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.tarnslair; import java.util.HashMap; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -54,7 +55,7 @@ import net.runelite.client.ui.overlay.OverlayManager; type = PluginType.UTILITY, enabledByDefault = false ) - +@Singleton @Slf4j public class TarnsLairPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesOverlay.java index 9dbd2dc861..21e4ed2606 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesOverlay.java @@ -28,6 +28,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.ItemID; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import net.runelite.client.game.ItemManager; @@ -40,6 +41,7 @@ import net.runelite.client.ui.overlay.components.ComponentOrientation; import net.runelite.client.ui.overlay.components.ImageComponent; import net.runelite.client.ui.overlay.components.PanelComponent; +@Singleton public class TeamCapesOverlay extends Overlay { private final PanelComponent panelComponent = new PanelComponent(); @@ -48,7 +50,7 @@ public class TeamCapesOverlay extends Overlay private final ItemManager manager; @Inject - private TeamCapesOverlay(TeamCapesPlugin plugin, TeamCapesConfig config, ItemManager manager) + private TeamCapesOverlay(final TeamCapesPlugin plugin, final TeamCapesConfig config, final ItemManager manager) { super(plugin); setPosition(OverlayPosition.TOP_LEFT); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesPlugin.java index 61d283cbfd..f2a25b57ad 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesPlugin.java @@ -33,6 +33,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.Player; @@ -48,6 +49,7 @@ import net.runelite.client.ui.overlay.OverlayManager; tags = {"overlay", "players"}, enabledByDefault = false ) +@Singleton public class TeamCapesPlugin extends Plugin { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixExperienceOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixExperienceOverlay.java index b702556f5f..9f5669f4db 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixExperienceOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixExperienceOverlay.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.tearsofguthix; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; @@ -36,6 +37,7 @@ import java.awt.Graphics2D; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; +@Singleton class TearsOfGuthixExperienceOverlay extends Overlay { private final TearsOfGuthixPlugin plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixOverlay.java index 4c1a5569fc..be546772ab 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixOverlay.java @@ -30,12 +30,14 @@ import java.awt.Graphics2D; import java.time.Duration; import java.time.Instant; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Point; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.components.ProgressPieComponent; +@Singleton class TearsOfGuthixOverlay extends Overlay { private static final Color CYAN_ALPHA = new Color(Color.CYAN.getRed(), Color.CYAN.getGreen(), Color.CYAN.getBlue(), 100); @@ -43,7 +45,7 @@ class TearsOfGuthixOverlay extends Overlay private final TearsOfGuthixPlugin plugin; @Inject - private TearsOfGuthixOverlay(TearsOfGuthixPlugin plugin) + private TearsOfGuthixOverlay(final TearsOfGuthixPlugin plugin) { this.plugin = plugin; setPosition(OverlayPosition.DYNAMIC); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java index 9d2f1100aa..69c55e9f2f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java @@ -28,6 +28,7 @@ import java.time.Instant; import java.util.HashMap; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Client; @@ -48,6 +49,7 @@ import net.runelite.client.ui.overlay.OverlayManager; description = "Show timers for the Tears Of Guthix streams", tags = {"minigame", "overlay", "skilling", "timers", "tog"} ) +@Singleton public class TearsOfGuthixPlugin extends Plugin { private static final int TOG_REGION = 12948; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/RoomHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/RoomHandler.java index 3615d58f6d..0112708098 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/RoomHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/RoomHandler.java @@ -5,7 +5,6 @@ import java.awt.Color; import java.awt.Font; import java.awt.Graphics2D; import java.awt.Polygon; -import java.util.Iterator; import java.util.Map; import net.runelite.api.Client; import net.runelite.api.NPC; @@ -22,13 +21,11 @@ public abstract class RoomHandler protected final Client client; protected final TheatrePlugin plugin; - protected final TheatreConfig config; - public RoomHandler(Client client, TheatrePlugin plugin, TheatreConfig config) + public RoomHandler(final Client client, final TheatrePlugin plugin) { this.client = client; this.plugin = plugin; - this.config = config; } public abstract void onStart(); @@ -64,11 +61,8 @@ public abstract class RoomHandler protected void renderProjectiles(Graphics2D graphics, Map projectiles) { - - Iterator> itr = projectiles.entrySet().iterator(); - while (itr.hasNext()) + for (Map.Entry entry : projectiles.entrySet()) { - Map.Entry entry = itr.next(); int projectileId = entry.getKey().getId(); String text = entry.getValue(); int x = (int) entry.getKey().getX(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatreOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatreOverlay.java index e4dc6c2683..5237641000 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatreOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatreOverlay.java @@ -11,27 +11,21 @@ package net.runelite.client.plugins.theatre; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; -import net.runelite.api.Client; -import net.runelite.client.graphics.ModelOutlineRenderer; +import javax.inject.Singleton; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; +@Singleton public class TheatreOverlay extends Overlay { - private final Client client; private final TheatrePlugin plugin; - private final TheatreConfig config; - private final ModelOutlineRenderer modelOutline; @Inject - private TheatreOverlay(Client client, TheatrePlugin plugin, TheatreConfig config, ModelOutlineRenderer modelOutline) + private TheatreOverlay(final TheatrePlugin plugin) { - this.client = client; this.plugin = plugin; - this.config = config; - this.modelOutline = modelOutline; setPosition(OverlayPosition.DYNAMIC); setPriority(OverlayPriority.HIGH); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatrePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatrePlugin.java index 2a08416e84..26238c416b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatrePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatrePlugin.java @@ -13,6 +13,7 @@ import java.awt.Color; import java.util.LinkedList; import java.util.List; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; @@ -54,7 +55,7 @@ import net.runelite.client.ui.overlay.OverlayManager; type = PluginType.PVM, enabledByDefault = false ) - +@Singleton @Slf4j public class TheatrePlugin extends Plugin { @@ -98,6 +99,59 @@ public class TheatrePlugin extends Plugin @Inject private ModelOutlineRenderer modelOutline; + @Getter + private boolean showMaidenBloodToss; + @Getter + private boolean showMaidenBloodSpawns; + @Getter + private boolean showNyloFreezeHighlights; + @Getter + private boolean showBloatIndicator; + @Getter + private boolean showBloatHands; + @Getter + private boolean BloatFeetIndicatorRaveEdition; + @Getter + private boolean showBloatTimer; + @Getter + private boolean showNyloPillarHealth; + @Getter + private TheatreConfig.NYLOOPTION showNylocasExplosions; + @Getter + private boolean showNylocasAmount; + @Getter + private boolean highlightNyloAgros; + @Getter + private boolean showSotetsegAttacks; + @Getter + private boolean showSotetsegMaze; + @Getter + private boolean showSotetsegSolo; + @Getter + private Color mazeTileColour; + @Getter + private boolean showXarpusHeals; + @Getter + private boolean showXarpusTick; + @Getter + private boolean showVerzikAttacks; + @Getter + private boolean showVerzikYellows; + @Getter + private boolean showCrabTargets; + @Getter + private boolean VerzikTankTile; + @Getter + private boolean verzikRangeAttacks; + @Getter + private boolean extraTimers; + @Getter + private boolean p1attacks; + @Getter + private boolean p2attacks; + @Getter + private boolean p3attacks; + @Provides TheatreConfig getConfig(ConfigManager configManager) { @@ -107,14 +161,16 @@ public class TheatrePlugin extends Plugin @Override protected void startUp() { + updateConfig(); + room = TheatreRoom.UNKNOWN; - maidenHandler = new MaidenHandler(client, this, config, modelOutline); - bloatHandler = new BloatHandler(client, this, config); - nyloHandler = new NyloHandler(client, this, config); - sotetsegHandler = new SotetsegHandler(client, this, config); - xarpusHandler = new XarpusHandler(client, this, config); - verzikHandler = new VerzikHandler(client, this, config); + maidenHandler = new MaidenHandler(client, this, modelOutline); + bloatHandler = new BloatHandler(client, this); + nyloHandler = new NyloHandler(client, this); + sotetsegHandler = new SotetsegHandler(client, this); + xarpusHandler = new XarpusHandler(client, this); + verzikHandler = new VerzikHandler(client, this); overlayManager.add(overlay); } @@ -406,6 +462,11 @@ public class TheatrePlugin extends Plugin @Subscribe public void onConfigChanged(ConfigChanged event) { + if (!event.getGroup().equals("Theatre")) + { + return; + } + if (nyloHandler != null) { nyloHandler.onConfigChanged(); @@ -439,4 +500,34 @@ public class TheatrePlugin extends Plugin verzikHandler.onProjectileMoved(event); } } + + private void updateConfig() + { + this.showMaidenBloodToss = config.showMaidenBloodToss(); + this.showMaidenBloodSpawns = config.showMaidenBloodSpawns(); + this.showNyloFreezeHighlights = config.showNyloFreezeHighlights(); + this.showBloatIndicator = config.showBloatIndicator(); + this.showBloatHands = config.showBloatHands(); + this.BloatFeetIndicatorRaveEdition = config.BloatFeetIndicatorRaveEdition(); + this.showBloatTimer = config.showBloatTimer(); + this.showNyloPillarHealth = config.showNyloPillarHealth(); + this.showNylocasExplosions = config.showNylocasExplosions(); + this.showNylocasAmount = config.showNylocasAmount(); + this.highlightNyloAgros = config.highlightNyloAgros(); + this.showSotetsegAttacks = config.showSotetsegAttacks(); + this.showSotetsegMaze = config.showSotetsegMaze(); + this.showSotetsegSolo = config.showSotetsegSolo(); + this.mazeTileColour = config.mazeTileColour(); + this.showXarpusHeals = config.showXarpusHeals(); + this.showXarpusTick = config.showXarpusTick(); + this.showVerzikAttacks = config.showVerzikAttacks(); + this.showVerzikYellows = config.showVerzikYellows(); + this.showCrabTargets = config.showCrabTargets(); + this.VerzikTankTile = config.VerzikTankTile(); + this.verzikRangeAttacks = config.verzikRangeAttacks(); + this.extraTimers = config.extraTimers(); + this.p1attacks = config.p1attacks(); + this.p2attacks = config.p2attacks(); + this.p3attacks = config.p3attacks(); + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java index b62b979012..9bf1aaca87 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java @@ -18,7 +18,6 @@ import net.runelite.api.events.NpcSpawned; import net.runelite.api.events.VarbitChanged; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.theatre.RoomHandler; -import net.runelite.client.plugins.theatre.TheatreConfig; import net.runelite.client.plugins.theatre.TheatrePlugin; import net.runelite.client.plugins.theatre.TheatreRoom; @@ -34,9 +33,9 @@ public class BloatHandler extends RoomHandler @Getter(AccessLevel.PUBLIC) private BloatState bloatState; - public BloatHandler(Client client, TheatrePlugin plugin, TheatreConfig config) + public BloatHandler(final Client client, final TheatrePlugin plugin) { - super(client, plugin, config); + super(client, plugin); } @Override @@ -76,7 +75,7 @@ public class BloatHandler extends RoomHandler return; } - if (config.showBloatIndicator()) + if (plugin.isShowBloatIndicator()) { switch (bloatState) { @@ -92,7 +91,7 @@ public class BloatHandler extends RoomHandler } } - if (config.showBloatHands()) + if (plugin.isShowBloatHands()) { for (GraphicsObject object : client.getGraphicsObjects()) { @@ -100,7 +99,7 @@ public class BloatHandler extends RoomHandler if (id >= 1560 && id <= 1590) { WorldPoint point = WorldPoint.fromLocal(client, object.getLocation()); - if (!config.BloatFeetIndicatorRaveEdition()) + if (!plugin.isBloatFeetIndicatorRaveEdition()) { drawTile(graphics, point, new Color(36, 248, 229), 2, 255, 10); } @@ -113,7 +112,7 @@ public class BloatHandler extends RoomHandler } } - if (config.showBloatTimer()) + if (plugin.isShowBloatTimer()) { final String tickCounter = String.valueOf(bloatTimer); int secondConversion = (int) (bloatTimer * .6); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java index 68115623fa..d62bf8c8ea 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java @@ -20,7 +20,6 @@ import net.runelite.api.events.NpcSpawned; import net.runelite.api.events.SpotAnimationChanged; import net.runelite.client.graphics.ModelOutlineRenderer; import net.runelite.client.plugins.theatre.RoomHandler; -import net.runelite.client.plugins.theatre.TheatreConfig; import net.runelite.client.plugins.theatre.TheatreConstant; import net.runelite.client.plugins.theatre.TheatrePlugin; import net.runelite.client.plugins.theatre.TheatreRoom; @@ -68,9 +67,9 @@ public class MaidenHandler extends RoomHandler private long startTime = 0; private ModelOutlineRenderer modelOutline; - public MaidenHandler(Client client, TheatrePlugin plugin, TheatreConfig config, ModelOutlineRenderer modelOutline) + public MaidenHandler(final Client client, final TheatrePlugin plugin, final ModelOutlineRenderer modelOutline) { - super(client, plugin, config); + super(client, plugin); this.modelOutline = modelOutline; } @@ -139,7 +138,7 @@ public class MaidenHandler extends RoomHandler } } - if (config.showMaidenBloodToss()) + if (plugin.isShowMaidenBloodToss()) { for (WorldPoint point : bloodThrows) { @@ -147,7 +146,7 @@ public class MaidenHandler extends RoomHandler } } - if (config.showMaidenBloodSpawns()) + if (plugin.isShowMaidenBloodSpawns()) { for (WorldPoint point : bloodSpawnLocation) { @@ -197,7 +196,7 @@ public class MaidenHandler extends RoomHandler maiden = npc; break; case "Nylocas Matomenos": - if (!config.showNyloFreezeHighlights()) + if (!plugin.isShowNyloFreezeHighlights()) { return; } @@ -327,7 +326,7 @@ public class MaidenHandler extends RoomHandler seconds = seconds % 60; int percentage = 70 - (20 * ((wave++) - 1)); - if (config.extraTimers()) + if (plugin.isExtraTimers()) { this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'The Maiden of Sugadinti - " + percentage + "%' completed! Duration: " + minutes + ":" + twoDigitString(seconds), null); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/Nylos.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/Nylos.java index 53469f3fe4..5429f016e7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/Nylos.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/Nylos.java @@ -1,5 +1,6 @@ package net.runelite.client.plugins.theatre.rooms; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; @@ -7,12 +8,12 @@ import net.runelite.api.NPC; class Nylos { - @Getter + @Getter(AccessLevel.PUBLIC) private NPC npc; - @Getter + @Getter(AccessLevel.PUBLIC) private int npcIndex; - @Getter - @Setter + @Getter(AccessLevel.PUBLIC) + @Setter(AccessLevel.PUBLIC) private SpawnLocation spawnLocation; Nylos(NPC npc, SpawnLocation spawnLocation) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java index 13551b9ec4..6d0ccd8c03 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java @@ -24,7 +24,6 @@ import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; import net.runelite.api.events.ProjectileMoved; import net.runelite.client.plugins.theatre.RoomHandler; -import net.runelite.client.plugins.theatre.TheatreConfig; import net.runelite.client.plugins.theatre.TheatreConstant; import net.runelite.client.plugins.theatre.TheatrePlugin; import net.runelite.client.plugins.theatre.TheatreRoom; @@ -46,11 +45,10 @@ public class SotetsegHandler extends RoomHandler private List gridPath = new ArrayList<>(); private Map soteyProjectiles = new HashMap<>(); private NPC npc; - private long startTime = 0; - public SotetsegHandler(Client client, TheatrePlugin plugin, TheatreConfig config) + public SotetsegHandler(final Client client, final TheatrePlugin plugin) { - super(client, plugin, config); + super(client, plugin); } @Override @@ -76,7 +74,6 @@ public class SotetsegHandler extends RoomHandler public void reset() { - startTime = 0; npc = null; soteyProjectiles.clear(); redTiles.clear(); @@ -89,7 +86,7 @@ public class SotetsegHandler extends RoomHandler public void render(Graphics2D graphics) { - if (config.showSotetsegMaze()) + if (plugin.isShowSotetsegMaze()) { int i = 1; for (GroundObject o : redTiles.keySet()) @@ -98,7 +95,7 @@ public class SotetsegHandler extends RoomHandler if (poly != null) { - graphics.setColor(config.mazeTileColour()); + graphics.setColor(plugin.getMazeTileColour()); graphics.setStroke(new BasicStroke(2)); graphics.draw(poly); } @@ -113,15 +110,15 @@ public class SotetsegHandler extends RoomHandler } } - if (config.showSotetsegSolo()) + if (plugin.isShowSotetsegSolo()) { for (WorldPoint p : redOverworld) { - drawTile(graphics, p, config.mazeTileColour(), 2, 255, 10); + drawTile(graphics, p, plugin.getMazeTileColour(), 2, 255, 10); } } - if (config.showSotetsegAttacks()) + if (plugin.isShowSotetsegAttacks()) { Map projectileMap = new HashMap<>(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java index 0f92345fa4..9c311a236c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java @@ -25,7 +25,6 @@ import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.NpcSpawned; import net.runelite.api.events.ProjectileMoved; import net.runelite.client.plugins.theatre.RoomHandler; -import net.runelite.client.plugins.theatre.TheatreConfig; import net.runelite.client.plugins.theatre.TheatreConstant; import net.runelite.client.plugins.theatre.TheatrePlugin; import net.runelite.client.plugins.theatre.TheatreRoom; @@ -43,15 +42,13 @@ public class VerzikHandler extends RoomHandler @Getter(AccessLevel.PUBLIC) private NPC npc; private int lastId = -1; - private int autosSinceYellows; private int yellows; private boolean tornados; - private int attackTick = -1; private long startTime = 0; - public VerzikHandler(Client client, TheatrePlugin plugin, TheatreConfig config) + public VerzikHandler(final Client client, final TheatrePlugin plugin) { - super(client, plugin, config); + super(client, plugin); } @Override @@ -83,7 +80,6 @@ public class VerzikHandler extends RoomHandler this.attacksLeft = 0; this.npc = null; this.yellows = 0; - this.autosSinceYellows = 0; this.lastId = -1; this.tornados = false; this.startTime = 0; @@ -97,19 +93,19 @@ public class VerzikHandler extends RoomHandler } int id = npc.getId(); - if (config.verzikRangeAttacks()) + if (plugin.isVerzikRangeAttacks()) { for (WorldPoint p : getVerzik_RangeProjectiles().values()) { drawTile(graphics, p, Color.RED, 2, 180, 50); } } - if (config.showVerzikAttacks()) + if (plugin.isShowVerzikAttacks()) { if (id == TheatreConstant.VERZIK_ID_P1) { - if (config.p1attacks()) + if (plugin.isP1attacks()) { if (this.versikCounter >= 0) { @@ -124,7 +120,7 @@ public class VerzikHandler extends RoomHandler } else if (id == TheatreConstant.VERZIK_ID_P2) { - if (config.p2attacks()) + if (plugin.isP2attacks()) { if (this.versikCounter >= 0) { @@ -140,7 +136,7 @@ public class VerzikHandler extends RoomHandler else if (id == TheatreConstant.VERZIK_ID_P3) { - if (config.p3attacks()) + if (plugin.isP3attacks()) { Model model = npc.getModel(); if (versikCounter > 0 && versikCounter < 8) @@ -156,7 +152,7 @@ public class VerzikHandler extends RoomHandler } } - if (config.VerzikTankTile()) + if (plugin.isVerzikTankTile()) { if (id == TheatreConstant.VERZIK_ID_P3) { @@ -167,7 +163,7 @@ public class VerzikHandler extends RoomHandler } - if (config.showVerzikYellows()) + if (plugin.isShowVerzikYellows()) { if (this.yellows > 0) { @@ -186,7 +182,7 @@ public class VerzikHandler extends RoomHandler } } - if (config.showCrabTargets()) + if (plugin.isShowCrabTargets()) { Player local = client.getLocalPlayer(); if (local != null && local.getName() != null) @@ -330,7 +326,6 @@ public class VerzikHandler extends RoomHandler { this.yellows = 14; // this.versikCounter = 22; - this.autosSinceYellows = 0; System.out.println("Yellows have spawned."); break; } @@ -400,7 +395,7 @@ public class VerzikHandler extends RoomHandler long minutes = seconds / 60L; seconds = seconds % 60; - if (config.extraTimers()) + if (plugin.isExtraTimers()) { this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'The Final Challenge - Part 1' completed! Duration: " + minutes + ":" + twoDigitString(seconds), null); } @@ -413,10 +408,10 @@ public class VerzikHandler extends RoomHandler long minutes = seconds / 60L; seconds = seconds % 60; - this.attackTick = this.client.getTickCount() - 4; + int attackTick = this.client.getTickCount() - 4; this.versikCounter = -1; this.attacksLeft = 9; - if (config.extraTimers()) + if (plugin.isExtraTimers()) { this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'The Final Challenge - Part 2' completed! Duration: " + minutes + ":" + twoDigitString(seconds), null); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java index 4ff3c17ae7..46dc3bf122 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java @@ -25,7 +25,6 @@ import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; import net.runelite.client.plugins.theatre.RoomHandler; -import net.runelite.client.plugins.theatre.TheatreConfig; import net.runelite.client.plugins.theatre.TheatreConstant; import net.runelite.client.plugins.theatre.TheatrePlugin; import net.runelite.client.plugins.theatre.TheatreRoom; @@ -41,8 +40,8 @@ public class NyloHandler extends RoomHandler private Map pillars = new HashMap<>(); @Getter(AccessLevel.PUBLIC) private Map spiders = new HashMap<>(); - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private int wave = 0; private NyloOverlay overlay = null; private NyloPredictor predictor = null; @@ -50,9 +49,9 @@ public class NyloHandler extends RoomHandler private Point west = new Point(49, 56); private Point east = new Point(78, 56); - public NyloHandler(Client client, TheatrePlugin plugin, TheatreConfig config) + public NyloHandler(final Client client, final TheatrePlugin plugin) { - super(client, plugin, config); + super(client, plugin); } @Override @@ -66,9 +65,9 @@ public class NyloHandler extends RoomHandler this.reset(); this.plugin.setRoom(TheatreRoom.NYLOCAS); - if (overlay == null && config.showNylocasAmount()) + if (overlay == null && plugin.isShowNylocasAmount()) { - overlay = new NyloOverlay(client, plugin, config, this); + overlay = new NyloOverlay(client, plugin, this); plugin.getOverlayManager().add(overlay); } @@ -100,7 +99,7 @@ public class NyloHandler extends RoomHandler if (this.startTime != 0) { - if (config.extraTimers()) + if (plugin.isExtraTimers()) { this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'The Nylocas - Waves' completed! Duration: " + minutes + ":" + twoDigitString(seconds), null); } @@ -128,12 +127,12 @@ public class NyloHandler extends RoomHandler return; } - if (overlay == null && config.showNylocasAmount()) + if (overlay == null && plugin.isShowNylocasAmount()) { - overlay = new NyloOverlay(client, plugin, config, this); + overlay = new NyloOverlay(client, plugin, this); plugin.getOverlayManager().add(overlay); } - else if (overlay != null && !config.showNylocasAmount()) + else if (overlay != null && !plugin.isShowNylocasAmount()) { plugin.getOverlayManager().remove(overlay); overlay = null; @@ -148,14 +147,13 @@ public class NyloHandler extends RoomHandler double rMod = 130.0 * health / 100.0; double gMod = 255.0 * health / 100.0; double bMod = 125.0 * health / 100.0; - Color c = new Color((int) (255 - rMod), (int) (0 + gMod), (int) (0 + bMod)); - return c; + return new Color((int) (255 - rMod), (int) (0 + gMod), (int) (0 + bMod)); } public void render(Graphics2D graphics) { - if (config.showNyloPillarHealth()) + if (plugin.isShowNyloPillarHealth()) { for (NPC npc : pillars.keySet()) { @@ -170,7 +168,7 @@ public class NyloHandler extends RoomHandler } } - switch (config.showNylocasExplosions()) + switch (plugin.getShowNylocasExplosions()) { case TILE: for (NPC npc : spiders.keySet()) @@ -202,11 +200,11 @@ public class NyloHandler extends RoomHandler break; } - Set toHighlight = new HashSet(); + Set toHighlight = new HashSet<>(); - if (config.highlightNyloAgros()) + if (plugin.isHighlightNyloAgros()) { - for (NPC npc : new ArrayList(this.waveAgros)) + for (NPC npc : new ArrayList<>(this.waveAgros)) { try { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java index 9c57485f26..e6cc1324eb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java @@ -30,7 +30,6 @@ import java.awt.Graphics2D; import net.runelite.api.Client; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import net.runelite.api.NPC; -import net.runelite.client.plugins.theatre.TheatreConfig; import net.runelite.client.plugins.theatre.TheatrePlugin; import net.runelite.client.plugins.theatre.TheatreRoom; import net.runelite.client.ui.overlay.Overlay; @@ -53,7 +52,7 @@ class NyloOverlay extends Overlay private NyloHandler nylohandler; - NyloOverlay(Client client, TheatrePlugin plugin, TheatreConfig config, NyloHandler nylohandler) + NyloOverlay(final Client client, final TheatrePlugin plugin, final NyloHandler nylohandler) { super(plugin); @@ -84,17 +83,17 @@ class NyloOverlay extends Overlay String name = npc.getName(); if (name != null) { - if (name.equals("Nylocas Hagios")) + switch (name) { - hagios++; - } - else if (name.equals("Nylocas Toxobolos")) - { - toxobolos++; - } - else if (name.equals("Nylocas Ischyros")) - { - ischyros++; + case "Nylocas Hagios": + hagios++; + break; + case "Nylocas Toxobolos": + toxobolos++; + break; + case "Nylocas Ischyros": + ischyros++; + break; } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java index b9d3e19b44..b0a9720e96 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java @@ -376,8 +376,7 @@ public class NyloPredictor { if ((currentIndex + 1) < NYLOCAS_WAVES.length) { - Wave nextWave = NYLOCAS_WAVES[currentIndex + 1]; - return nextWave; + return NYLOCAS_WAVES[currentIndex + 1]; } else { @@ -393,7 +392,7 @@ public class NyloPredictor } else { - String types = ""; + StringBuilder types = new StringBuilder(); for (Nylocas nylo : wave.getSpawns()) { @@ -401,34 +400,34 @@ public class NyloPredictor { if (types.length() > 0) { - types += ", "; + types.append(", "); } switch (nylo.getType()) { case MAGE_162: - types += "Small Mage"; + types.append("Small Mage"); break; case MAGE_260: - types += "Big Mage"; + types.append("Big Mage"); break; case MELEE_162: - types += "Small Melee"; + types.append("Small Melee"); break; case MELEE_260: - types += "Big Melee"; + types.append("Big Melee"); break; case RANGE_162: - types += "Small Range"; + types.append("Small Range"); break; case RANGE_260: - types += "Big Range"; + types.append("Big Range"); break; } } } - return types.length() > 0 ? types : null; + return types.length() > 0 ? types.toString() : null; } } @@ -474,7 +473,7 @@ public class NyloPredictor @Override public boolean equals(Object object) { - if (object != null && (object instanceof Nylocas)) + if ((object instanceof Nylocas)) { Nylocas nylo = (Nylocas) object; return nylo.getType() == this.type && nylo.getSpawn() == this.spawn; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java index 2be0d90109..73772c40e6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java @@ -3,9 +3,7 @@ package net.runelite.client.plugins.theatre.rooms.xarpus; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import net.runelite.api.Client; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; -import net.runelite.client.plugins.theatre.TheatreConfig; import net.runelite.client.plugins.theatre.TheatrePlugin; import net.runelite.client.ui.overlay.Overlay; import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE; @@ -18,20 +16,13 @@ import net.runelite.client.ui.overlay.components.table.TableComponent; public class XarpusCounter extends Overlay { - - private final Client client; - private final TheatrePlugin plugin; - private final TheatreConfig config; - PanelComponent panelComponent = new PanelComponent(); + private PanelComponent panelComponent = new PanelComponent(); private XarpusHandler xarpusHandler; - public XarpusCounter(Client client, TheatrePlugin plugin, TheatreConfig config, XarpusHandler xarpushandler) + XarpusCounter(final TheatrePlugin plugin, final XarpusHandler xarpushandler) { super(plugin); - this.client = client; this.xarpusHandler = xarpushandler; - this.plugin = plugin; - this.config = config; setPosition(OverlayPosition.ABOVE_CHATBOX_RIGHT); getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Theatre xarpus overlay")); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java index d2c278806e..94467d34f8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java @@ -8,6 +8,7 @@ import java.awt.Polygon; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; @@ -23,7 +24,6 @@ import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; import net.runelite.api.events.VarbitChanged; import net.runelite.client.plugins.theatre.RoomHandler; -import net.runelite.client.plugins.theatre.TheatreConfig; import net.runelite.client.plugins.theatre.TheatreConstant; import net.runelite.client.plugins.theatre.TheatrePlugin; import net.runelite.client.plugins.theatre.TheatreRoom; @@ -36,21 +36,21 @@ public class XarpusHandler extends RoomHandler private boolean staring; private int ticksUntilShoot = 8; - @Getter + @Getter(AccessLevel.PUBLIC) private NPC npc; private long startTime = 0; private boolean up = false; - @Getter + @Getter(AccessLevel.PUBLIC) private int exhumesCount; private boolean xarpusFlag; private XarpusCounter overlay = null; - public XarpusHandler(Client client, TheatrePlugin plugin, TheatreConfig config) + public XarpusHandler(final Client client, final TheatrePlugin plugin) { - super(client, plugin, config); + super(client, plugin); } @Override @@ -66,7 +66,7 @@ public class XarpusHandler extends RoomHandler if (overlay == null) { - overlay = new XarpusCounter(client, plugin, config, this); + overlay = new XarpusCounter(plugin, this); plugin.getOverlayManager().add(overlay); } @@ -121,7 +121,7 @@ public class XarpusHandler extends RoomHandler seconds = seconds % 60; this.ticksUntilShoot = 8; - if (config.extraTimers()) + if (plugin.isExtraTimers()) { this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'Xarpus - Recovery' completed! Duration: " + minutes + ":" + twoDigitString(seconds), null); } @@ -132,7 +132,7 @@ public class XarpusHandler extends RoomHandler renderTextLocation(graphics, ticksLeftStr, 12, Font.BOLD, Color.WHITE, canvasPoint); } - if (npc.getId() == NpcID.XARPUS_8339 && config.showXarpusHeals()) + if (npc.getId() == NpcID.XARPUS_8339 && plugin.isShowXarpusHeals()) { for (GroundObject o : exhumes.keySet()) { @@ -263,7 +263,7 @@ public class XarpusHandler extends RoomHandler long minutes = seconds / 60L; seconds = seconds % 60; - if (config.extraTimers()) + if (plugin.isExtraTimers()) { this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'Xarpus - Acid' completed! Duration: " + minutes + ":" + twoDigitString(seconds), null); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/timers/RoomTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/timers/RoomTimer.java index 3a9c13252f..c01b81d990 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/timers/RoomTimer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/timers/RoomTimer.java @@ -27,7 +27,7 @@ public class RoomTimer extends Overlay @Inject - public RoomTimer(Client client, TheatrePlugin plugin) + public RoomTimer(final Client client, final TheatrePlugin plugin) { super(plugin); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingOverlay.java index abd408abb4..dece27f927 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingOverlay.java @@ -31,6 +31,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.text.DecimalFormat; import javax.inject.Inject; +import javax.inject.Singleton; import static net.runelite.api.AnimationID.BLOCK_UNARMED; import static net.runelite.api.AnimationID.PICKPOCKET_SUCCESS; import static net.runelite.api.AnimationID.THIEVING_STALL; @@ -44,6 +45,7 @@ import net.runelite.client.ui.overlay.components.TitleComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; +@Singleton public class ThievingOverlay extends Overlay { private static final DecimalFormat FORMAT = new DecimalFormat("#.#"); @@ -54,7 +56,7 @@ public class ThievingOverlay extends Overlay private final PanelComponent panelComponent = new PanelComponent(); @Inject - private ThievingOverlay(Client client, ThievingPlugin plugin, XpTrackerService xpTrackerService) + private ThievingOverlay(final Client client, final ThievingPlugin plugin, final XpTrackerService xpTrackerService) { setPosition(OverlayPosition.TOP_LEFT); this.client = client; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingPlugin.java index e1babf47fd..fa73e5b00f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingPlugin.java @@ -29,11 +29,13 @@ package net.runelite.client.plugins.thieving; import java.time.Duration; import java.time.Instant; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import com.google.inject.Provides; import net.runelite.api.ChatMessageType; import net.runelite.api.events.ChatMessage; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameTick; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; @@ -52,7 +54,7 @@ import net.runelite.client.ui.overlay.OverlayManager; type = PluginType.SKILLING, enabledByDefault = false ) - +@Singleton @PluginDependency(XpTrackerPlugin.class) public class ThievingPlugin extends Plugin { @@ -68,6 +70,8 @@ public class ThievingPlugin extends Plugin @Getter(AccessLevel.PACKAGE) private ThievingSession session; + private int statTimeout; + @Provides ThievingConfig getConfig(ConfigManager configManager) { @@ -77,6 +81,8 @@ public class ThievingPlugin extends Plugin @Override protected void startUp() throws Exception { + this.statTimeout = config.statTimeout(); + session = null; overlayManager.add(overlay); } @@ -91,12 +97,12 @@ public class ThievingPlugin extends Plugin @Subscribe public void onGameTick(GameTick gameTick) { - if (session == null || config.statTimeout() == 0) + if (session == null || this.statTimeout == 0) { return; } - Duration statTimeout = Duration.ofMinutes(config.statTimeout()); + Duration statTimeout = Duration.ofMinutes(this.statTimeout); Duration sinceCut = Duration.between(session.getLastTheivingAction(), Instant.now()); if (sinceCut.compareTo(statTimeout) >= 0) @@ -138,5 +144,16 @@ public class ThievingPlugin extends Plugin session.hasFailed(); } } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!"thieving".equals(event.getGroup())) + { + return; + } + + this.statTimeout = config.statTimeout(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingSession.java b/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingSession.java index 97cf75212f..967fd60cf4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingSession.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingSession.java @@ -30,7 +30,7 @@ import java.time.Instant; import lombok.AccessLevel; import lombok.Getter; -public class ThievingSession +class ThievingSession { @Getter(AccessLevel.PACKAGE) private Instant lastTheivingAction; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/NPCContainer.java b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/NPCContainer.java index 6edc06cead..f7a5b6ae42 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/NPCContainer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/NPCContainer.java @@ -28,6 +28,7 @@ package net.runelite.client.plugins.ticktimers; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import java.awt.Color; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -39,7 +40,7 @@ import net.runelite.api.NPCDefinition; import net.runelite.api.NpcID; import net.runelite.api.Prayer; -@Getter +@Getter(AccessLevel.PACKAGE) class NPCContainer { private NPC npc; @@ -48,14 +49,14 @@ class NPCContainer private int npcSize; private ImmutableSet animations; private int attackSpeed; - @Setter + @Setter(AccessLevel.PACKAGE) private int ticksUntilAttack; - @Setter + @Setter(AccessLevel.PACKAGE) private Actor npcInteracting; - @Setter + @Setter(AccessLevel.PACKAGE) private AttackStyle attackStyle; - NPCContainer(NPC npc, int attackSpeed) + NPCContainer(final NPC npc, final int attackSpeed) { this.npc = npc; this.npcName = npc.getName(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersConfig.java index 58b0a346cd..c61c121a2d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersConfig.java @@ -24,6 +24,7 @@ package net.runelite.client.plugins.ticktimers; import java.awt.Font; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.client.config.Config; @@ -169,7 +170,7 @@ public interface TickTimersConfig extends Config return false; } - @Getter + @Getter(AccessLevel.PACKAGE) @AllArgsConstructor enum FontStyle { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java index 2454e42a1e..25e09e077c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java @@ -28,6 +28,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -35,6 +36,7 @@ import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.NPC; import net.runelite.api.NpcID; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.NpcDespawned; @@ -54,7 +56,7 @@ import net.runelite.client.ui.overlay.OverlayManager; enabledByDefault = false, type = PluginType.PVM ) - +@Singleton @Slf4j public class TickTimersPlugin extends Plugin { @@ -78,6 +80,21 @@ public class TickTimersPlugin extends Plugin private Set npcContainer = new HashSet<>(); private boolean validRegion; + @Getter(AccessLevel.PACKAGE) + private boolean showPrayerWidgetHelper; + @Getter(AccessLevel.PACKAGE) + private boolean showHitSquares; + @Getter(AccessLevel.PACKAGE) + private boolean changeTickColor; + private boolean gwd; + private boolean dks; + @Getter(AccessLevel.PACKAGE) + private TickTimersConfig.FontStyle fontStyle; + @Getter(AccessLevel.PACKAGE) + private int textSize; + @Getter(AccessLevel.PACKAGE) + private boolean shadows; + @Provides TickTimersConfig getConfig(ConfigManager configManager) { @@ -87,6 +104,7 @@ public class TickTimersPlugin extends Plugin @Override public void startUp() { + updateConfig(); npcContainer.clear(); } @@ -147,7 +165,7 @@ public class TickTimersPlugin extends Plugin case NpcID.FLOCKLEADER_GEERIN: case NpcID.WINGMAN_SKREE: case NpcID.KREEARRA: - if (config.gwd()) + if (this.gwd) { npcContainer.add(new NPCContainer(npc, npcManager.getAttackSpeed(npc.getId()))); } @@ -155,7 +173,7 @@ public class TickTimersPlugin extends Plugin case NpcID.DAGANNOTH_REX: case NpcID.DAGANNOTH_SUPREME: case NpcID.DAGANNOTH_PRIME: - if (config.dks()) + if (this.dks) { npcContainer.add(new NPCContainer(npc, npcManager.getAttackSpeed(npc.getId()))); } @@ -238,4 +256,27 @@ public class TickTimersPlugin extends Plugin x -> x == ARMA_REGION || x == GENERAL_REGION || x == ZAMMY_REGION || x == SARA_REGION || x == WATERBITH_REGION ); } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!"TickTimers".equals(event.getGroup())) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.showPrayerWidgetHelper = config.showPrayerWidgetHelper(); + this.showHitSquares = config.showHitSquares(); + this.changeTickColor = config.changeTickColor(); + this.gwd = config.gwd(); + this.dks = config.dks(); + this.fontStyle = config.fontStyle(); + this.textSize = config.textSize(); + this.shadows = config.shadows(); + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TimersOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TimersOverlay.java index a07cf1bede..1b07158e7d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TimersOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TimersOverlay.java @@ -31,6 +31,7 @@ import java.awt.Graphics2D; import java.awt.Rectangle; import java.util.List; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Point; import net.runelite.api.coords.WorldArea; @@ -41,18 +42,17 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton public class TimersOverlay extends Overlay { private TickTimersPlugin plugin; private Client client; - private TickTimersConfig config; @Inject - TimersOverlay(TickTimersPlugin plugin, Client client, TickTimersConfig config) + TimersOverlay(final TickTimersPlugin plugin, final Client client) { this.plugin = plugin; this.client = client; - this.config = config; setPosition(OverlayPosition.DYNAMIC); setPriority(OverlayPriority.HIGHEST); setLayer(OverlayLayer.ALWAYS_ON_TOP); @@ -72,7 +72,7 @@ public class TimersOverlay extends Overlay final List hitSquares = getHitSquares(npc.getNpc().getWorldLocation(), npc.getNpcSize(), 1, false); final NPCContainer.AttackStyle attackStyle = npc.getAttackStyle(); - if (config.showHitSquares() && attackStyle.getName().equals("Melee")) + if (plugin.isShowHitSquares() && attackStyle.getName().equals("Melee")) { for (WorldPoint p : hitSquares) { @@ -86,26 +86,26 @@ public class TimersOverlay extends Overlay } final String ticksLeftStr = String.valueOf(ticksLeft); - final int font = config.fontStyle().getFont(); - final boolean shadows = config.shadows(); + final int font = plugin.getFontStyle().getFont(); + final boolean shadows = plugin.isShadows(); Color color = (ticksLeft <= 1 ? Color.WHITE : attackStyle.getColor()); - if (!config.changeTickColor()) + if (!plugin.isChangeTickColor()) { color = attackStyle.getColor(); } final Point canvasPoint = npc.getNpc().getCanvasTextLocation(graphics, Integer.toString(ticksLeft), 0); - OverlayUtil.renderTextLocation(graphics, ticksLeftStr, config.textSize(), font, color, canvasPoint, shadows, 0); + OverlayUtil.renderTextLocation(graphics, ticksLeftStr, plugin.getTextSize(), font, color, canvasPoint, shadows, 0); - if (config.showPrayerWidgetHelper() && attackStyle.getPrayer() != null) + if (plugin.isShowPrayerWidgetHelper() && attackStyle.getPrayer() != null) { Rectangle bounds = OverlayUtil.renderPrayerOverlay(graphics, client, attackStyle.getPrayer(), color); if (bounds != null) { - renderTextLocation(graphics, ticksLeftStr, 16, config.fontStyle().getFont(), color, centerPoint(bounds), shadows); + renderTextLocation(graphics, ticksLeftStr, 16, plugin.getFontStyle().getFont(), color, centerPoint(bounds), shadows); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java index 0d1022d92f..03bea0d0c1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java @@ -35,9 +35,9 @@ public interface TileIndicatorsConfig extends Config { @Alpha @ConfigItem( - keyName = "highlightDestinationColor", - name = "Color of current destination highlighting", - description = "Configures the highlight color of current destination" + keyName = "highlightDestinationColor", + name = "Color of current destination highlighting", + description = "Configures the highlight color of current destination" ) default Color highlightDestinationColor() { @@ -45,9 +45,9 @@ public interface TileIndicatorsConfig extends Config } @ConfigItem( - keyName = "highlightDestinationTile", - name = "Highlight destination tile", - description = "Highlights tile player is walking to" + keyName = "highlightDestinationTile", + name = "Highlight destination tile", + description = "Highlights tile player is walking to" ) default boolean highlightDestinationTile() { @@ -56,9 +56,9 @@ public interface TileIndicatorsConfig extends Config @Alpha @ConfigItem( - keyName = "highlightCurrentColor", - name = "Color of current tile highlighting", - description = "Configures the highlight color of current tile position" + keyName = "highlightCurrentColor", + name = "Color of current tile highlighting", + description = "Configures the highlight color of current tile position" ) default Color highlightCurrentColor() { @@ -66,9 +66,9 @@ public interface TileIndicatorsConfig extends Config } @ConfigItem( - keyName = "highlightCurrentTile", - name = "Highlight current tile", - description = "Highlights tile player is on" + keyName = "highlightCurrentTile", + name = "Highlight current tile", + description = "Highlights tile player is on" ) default boolean highlightCurrentTile() { @@ -77,9 +77,9 @@ public interface TileIndicatorsConfig extends Config @Alpha @ConfigItem( - keyName = "highlightHoveredColor", - name = "Color of current hovered highlighting", - description = "Configures the highlight color of hovered tile" + keyName = "highlightHoveredColor", + name = "Color of current hovered highlighting", + description = "Configures the highlight color of hovered tile" ) default Color highlightHoveredColor() { @@ -87,9 +87,9 @@ public interface TileIndicatorsConfig extends Config } @ConfigItem( - keyName = "highlightHoveredTile", - name = "Highlight hovered tile", - description = "Highlights tile player is hovering with mouse" + keyName = "highlightHoveredTile", + name = "Highlight hovered tile", + description = "Highlights tile player is hovering with mouse" ) default boolean highlightHoveredTile() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java index 938a842088..b7df67dd1a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java @@ -29,6 +29,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Polygon; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Perspective; import net.runelite.api.coords.LocalPoint; @@ -39,16 +40,17 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton public class TileIndicatorsOverlay extends Overlay { private final Client client; - private final TileIndicatorsConfig config; + private final TileIndicatorsPlugin plugin; @Inject - private TileIndicatorsOverlay(Client client, TileIndicatorsConfig config) + private TileIndicatorsOverlay(final Client client, final TileIndicatorsPlugin plugin) { this.client = client; - this.config = config; + this.plugin = plugin; setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); setPriority(OverlayPriority.MED); @@ -57,21 +59,21 @@ public class TileIndicatorsOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (config.highlightHoveredTile()) + if (plugin.isHighlightHoveredTile()) { // If we have tile "selected" render it if (client.getSelectedSceneTile() != null) { - renderTile(graphics, client.getSelectedSceneTile().getLocalLocation(), config.highlightHoveredColor()); + renderTile(graphics, client.getSelectedSceneTile().getLocalLocation(), plugin.getHighlightHoveredColor()); } } - if (config.highlightDestinationTile()) + if (plugin.isHighlightDestinationTile()) { - renderTile(graphics, client.getLocalDestinationLocation(), config.highlightDestinationColor()); + renderTile(graphics, client.getLocalDestinationLocation(), plugin.getHighlightDestinationColor()); } - if (config.highlightCurrentTile()) + if (plugin.isHighlightCurrentTile()) { final WorldPoint playerPos = client.getLocalPlayer().getWorldLocation(); if (playerPos == null) @@ -85,7 +87,7 @@ public class TileIndicatorsOverlay extends Overlay return null; } - renderTile(graphics, playerPosLocal, config.highlightCurrentColor()); + renderTile(graphics, playerPosLocal, plugin.getHighlightCurrentColor()); } return null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsPlugin.java index 7347c8611e..9a41a6a35b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsPlugin.java @@ -25,8 +25,14 @@ package net.runelite.client.plugins.tileindicators; import com.google.inject.Provides; +import java.awt.Color; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; +import net.runelite.api.events.ConfigChanged; import net.runelite.client.config.ConfigManager; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; @@ -37,6 +43,7 @@ import net.runelite.client.ui.overlay.OverlayManager; tags = {"highlight", "overlay"}, enabledByDefault = false ) +@Singleton public class TileIndicatorsPlugin extends Plugin { @Inject @@ -45,6 +52,22 @@ public class TileIndicatorsPlugin extends Plugin @Inject private TileIndicatorsOverlay overlay; + @Inject + private TileIndicatorsConfig config; + + @Getter(AccessLevel.PACKAGE) + private Color highlightDestinationColor; + @Getter(AccessLevel.PACKAGE) + private boolean highlightDestinationTile; + @Getter(AccessLevel.PACKAGE) + private Color highlightCurrentColor; + @Getter(AccessLevel.PACKAGE) + private boolean highlightCurrentTile; + @Getter(AccessLevel.PACKAGE) + private Color highlightHoveredColor; + @Getter(AccessLevel.PACKAGE) + private boolean highlightHoveredTile; + @Provides TileIndicatorsConfig provideConfig(ConfigManager configManager) { @@ -54,6 +77,7 @@ public class TileIndicatorsPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); overlayManager.add(overlay); } @@ -62,4 +86,25 @@ public class TileIndicatorsPlugin extends Plugin { overlayManager.remove(overlay); } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!"tileindicators".equals(event.getGroup())) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.highlightDestinationColor = config.highlightDestinationColor(); + this.highlightDestinationTile = config.highlightDestinationTile(); + this.highlightCurrentColor = config.highlightCurrentColor(); + this.highlightCurrentTile = config.highlightCurrentTile(); + this.highlightHoveredColor = config.highlightHoveredColor(); + this.highlightHoveredTile = config.highlightHoveredTile(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameIndicator.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameIndicator.java index b91f8c7080..6434ad8203 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameIndicator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameIndicator.java @@ -45,7 +45,7 @@ enum GameIndicator private final int imageId; private final GameTimerImageType imageType; - GameIndicator(int imageId, GameTimerImageType idType, String description, String text, Color textColor) + GameIndicator(final int imageId, final GameTimerImageType idType, final String description, final String text, final Color textColor) { this.imageId = imageId; this.imageType = idType; @@ -54,7 +54,7 @@ enum GameIndicator this.textColor = textColor; } - GameIndicator(int imageId, GameTimerImageType idType, String description) + GameIndicator(final int imageId, final GameTimerImageType idType, final String description) { this(imageId, idType, description, "", null); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java index dcd739fad6..53d957dcf3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java @@ -30,6 +30,7 @@ package net.runelite.client.plugins.timers; import java.awt.image.BufferedImage; import java.time.Duration; import java.time.temporal.ChronoUnit; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.GraphicID; import net.runelite.api.ItemID; @@ -75,19 +76,19 @@ enum GameTimer ANTIPOISON(ItemID.ANTIPOISON4, GameTimerImageType.ITEM, "Antipoison"), ANTIVENOM(ItemID.ANTIVENOM4, GameTimerImageType.ITEM, "Anti-venom"); - @Getter + @Getter(AccessLevel.PACKAGE) private final Duration duration; - @Getter + @Getter(AccessLevel.PACKAGE) private final Integer graphicId; - @Getter + @Getter(AccessLevel.PACKAGE) private final String description; - @Getter + @Getter(AccessLevel.PACKAGE) private final boolean removedOnDeath; private final int imageId; private final GameTimerImageType imageType; - GameTimer(int imageId, GameTimerImageType idType, String description, Integer graphicId, long time, ChronoUnit unit, boolean removedOnDeath) + GameTimer(final int imageId, final GameTimerImageType idType, final String description, final Integer graphicId, final long time, final ChronoUnit unit, final boolean removedOnDeath) { this.description = description; this.graphicId = graphicId; @@ -97,22 +98,22 @@ enum GameTimer this.removedOnDeath = removedOnDeath; } - GameTimer(int imageId, GameTimerImageType idType, String description, long time, ChronoUnit unit, boolean removeOnDeath) + GameTimer(final int imageId, final GameTimerImageType idType, final String description, final long time, final ChronoUnit unit, final boolean removeOnDeath) { this(imageId, idType, description, null, time, unit, removeOnDeath); } - GameTimer(int imageId, GameTimerImageType idType, String description, Integer graphicId, long time, ChronoUnit unit) + GameTimer(final int imageId, final GameTimerImageType idType, final String description, final Integer graphicId, final long time, final ChronoUnit unit) { this(imageId, idType, description, graphicId, time, unit, false); } - GameTimer(int imageId, GameTimerImageType idType, String description, long time, ChronoUnit unit) + GameTimer(final int imageId, final GameTimerImageType idType, final String description, final long time, final ChronoUnit unit) { this(imageId, idType, description, null, time, unit, false); } - GameTimer(int imageId, GameTimerImageType idType, String description) + GameTimer(final int imageId, final GameTimerImageType idType, final String description) { this(imageId, idType, description, null, 1, ChronoUnit.MILLIS, false); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/IndicatorIndicator.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/IndicatorIndicator.java index 9af1716f4d..395fd7ba74 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/IndicatorIndicator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/IndicatorIndicator.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.timers; import java.awt.Color; import java.awt.Image; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.plugins.Plugin; import net.runelite.client.ui.overlay.infobox.InfoBox; @@ -33,10 +34,10 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxPriority; public class IndicatorIndicator extends InfoBox { - @Getter + @Getter(AccessLevel.PACKAGE) private final GameIndicator indicator; - IndicatorIndicator(GameIndicator indicator, Image image, Plugin plugin) + IndicatorIndicator(final GameIndicator indicator, final Image image, final Plugin plugin) { super(image, plugin); this.indicator = indicator; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimerTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimerTimer.java index 0a648a43f5..5d7ffa5762 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimerTimer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimerTimer.java @@ -35,14 +35,14 @@ class TimerTimer extends Timer { private final GameTimer timer; - TimerTimer(GameTimer timer, Plugin plugin, BufferedImage image) + TimerTimer(final GameTimer timer, final Plugin plugin, final BufferedImage image) { super(timer.getDuration().toMillis(), ChronoUnit.MILLIS, image, plugin); this.timer = timer; setPriority(InfoBoxPriority.MED); } - TimerTimer(GameTimer timer, int amount, Plugin plugin, BufferedImage image) + TimerTimer(final GameTimer timer, final int amount, final Plugin plugin, final BufferedImage image) { super(timer.getDuration().toMillis() * amount, ChronoUnit.MILLIS, image, plugin); this.timer = timer; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index 8ddf85f6a9..36071cacf2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -30,6 +30,9 @@ import com.google.inject.Provides; import java.awt.image.BufferedImage; import java.util.regex.Pattern; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Actor; import net.runelite.api.AnimationID; @@ -118,6 +121,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager; tags = {"combat", "items", "magic", "potions", "prayer", "overlay", "abyssal", "sire"} ) @Slf4j +@Singleton public class TimersPlugin extends Plugin { private static final String ANTIFIRE_DRINK_MESSAGE = "You drink some of your antifire potion."; @@ -180,6 +184,26 @@ public class TimersPlugin extends Plugin @Inject private InfoBoxManager infoBoxManager; + + private boolean showHomeMinigameTeleports; + private boolean showAntiPoison; + private boolean showAntiFire; + private boolean showStamina; + private boolean showOverload; + private boolean showPrayerEnhance; + private boolean showCannon; + private boolean showMagicImbue; + private boolean showCharge; + private boolean showImbuedHeart; + private boolean showVengeance; + private boolean showVengeanceActive; + @Setter(AccessLevel.PACKAGE) + private boolean showTeleblock; + private boolean showFreezes; + private boolean showGodWarsAltar; + private boolean showSkull; + private boolean showStaffOfTheDead; + private boolean showAbyssalSireStun; @Provides TimersConfig getConfig(ConfigManager configManager) @@ -187,6 +211,12 @@ public class TimersPlugin extends Plugin return configManager.getConfig(TimersConfig.class); } + @Override + protected void startUp() throws Exception + { + updateConfig(); + } + @Override protected void shutDown() throws Exception { @@ -217,7 +247,7 @@ public class TimersPlugin extends Plugin lastRaidVarb = raidVarb; } - if (lastVengCooldownVarb != vengCooldownVarb && config.showVengeance()) + if (lastVengCooldownVarb != vengCooldownVarb && this.showVengeance) { if (vengCooldownVarb == 1) { @@ -231,7 +261,7 @@ public class TimersPlugin extends Plugin lastVengCooldownVarb = vengCooldownVarb; } - if (lastIsVengeancedVarb != isVengeancedVarb && config.showVengeanceActive()) + if (lastIsVengeancedVarb != isVengeancedVarb && this.showVengeanceActive) { if (isVengeancedVarb == 1) { @@ -261,7 +291,7 @@ public class TimersPlugin extends Plugin lastWildernessVarb = inWilderness; } - if (lastPoisonVarp != poisonVarp && config.showAntiPoison()) + if (lastPoisonVarp != poisonVarp && this.showAntiPoison) { if (nextPoisonTick - client.getTickCount() <= 0 || lastPoisonVarp == 0) { @@ -304,76 +334,83 @@ public class TimersPlugin extends Plugin @Subscribe public void onConfigChanged(ConfigChanged event) { - if (!config.showHomeMinigameTeleports()) + if (!event.getGroup().equals("timers")) + { + return; + } + + updateConfig(); + + if (!this.showHomeMinigameTeleports) { removeGameTimer(HOME_TELEPORT); removeGameTimer(MINIGAME_TELEPORT); } - if (!config.showAntiFire()) + if (!this.showAntiFire) { removeGameTimer(ANTIFIRE); removeGameTimer(EXANTIFIRE); removeGameTimer(SUPERANTIFIRE); } - if (!config.showStamina()) + if (!this.showStamina) { removeGameTimer(STAMINA); } - if (!config.showOverload()) + if (!this.showOverload) { removeGameTimer(OVERLOAD); removeGameTimer(OVERLOAD_RAID); } - if (!config.showPrayerEnhance()) + if (!this.showPrayerEnhance) { removeGameTimer(PRAYER_ENHANCE); } - if (!config.showCannon()) + if (!this.showCannon) { removeGameTimer(CANNON); } - if (!config.showMagicImbue()) + if (!this.showMagicImbue) { removeGameTimer(MAGICIMBUE); } - if (!config.showCharge()) + if (!this.showCharge) { removeGameTimer(CHARGE); } - if (!config.showImbuedHeart()) + if (!this.showImbuedHeart) { removeGameTimer(IMBUEDHEART); } - if (!config.showStaffOfTheDead()) + if (!this.showStaffOfTheDead) { removeGameTimer(STAFF_OF_THE_DEAD); } - if (!config.showVengeance()) + if (!this.showVengeance) { removeGameTimer(VENGEANCE); } - if (!config.showVengeanceActive()) + if (!this.showVengeanceActive) { removeGameIndicator(VENGEANCE_ACTIVE); } - if (!config.showTeleblock()) + if (!this.showTeleblock) { removeTbTimers(); } - if (!config.showFreezes()) + if (!this.showFreezes) { removeGameTimer(BIND); removeGameTimer(HALFBIND); @@ -397,7 +434,7 @@ public class TimersPlugin extends Plugin @Subscribe public void onMenuOptionClicked(MenuOptionClicked event) { - if (config.showStamina() + if (this.showStamina && event.getOption().contains("Drink") && (event.getIdentifier() == ItemID.STAMINA_MIX1 || event.getIdentifier() == ItemID.STAMINA_MIX2)) @@ -407,7 +444,7 @@ public class TimersPlugin extends Plugin return; } - if (config.showAntiFire() + if (this.showAntiFire && event.getOption().contains("Drink") && (event.getIdentifier() == ItemID.ANTIFIRE_MIX1 || event.getIdentifier() == ItemID.ANTIFIRE_MIX2)) @@ -417,7 +454,7 @@ public class TimersPlugin extends Plugin return; } - if (config.showAntiFire() + if (this.showAntiFire && event.getOption().contains("Drink") && (event.getIdentifier() == ItemID.EXTENDED_ANTIFIRE_MIX1 || event.getIdentifier() == ItemID.EXTENDED_ANTIFIRE_MIX2)) @@ -427,7 +464,7 @@ public class TimersPlugin extends Plugin return; } - if (config.showAntiFire() + if (this.showAntiFire && event.getOption().contains("Drink") && (event.getIdentifier() == ItemID.SUPER_ANTIFIRE_MIX1 || event.getIdentifier() == ItemID.SUPER_ANTIFIRE_MIX2)) @@ -437,7 +474,7 @@ public class TimersPlugin extends Plugin return; } - if (config.showAntiFire() + if (this.showAntiFire && event.getOption().contains("Drink") && (event.getIdentifier() == ItemID.EXTENDED_SUPER_ANTIFIRE_MIX1 || event.getIdentifier() == ItemID.EXTENDED_SUPER_ANTIFIRE_MIX2)) @@ -453,7 +490,7 @@ public class TimersPlugin extends Plugin lastTeleportClicked = teleportWidget; } - if (config.showImbuedHeart() + if (this.showImbuedHeart && event.getOption().contains("Invigorate")) { // Needs a hook as there's a few cases where potions boost the same amount as the heart @@ -469,44 +506,44 @@ public class TimersPlugin extends Plugin return; } - if (config.showStamina() && (event.getMessage().equals(STAMINA_DRINK_MESSAGE) || event.getMessage().equals(STAMINA_SHARED_DRINK_MESSAGE))) + if (this.showStamina && (event.getMessage().equals(STAMINA_DRINK_MESSAGE) || event.getMessage().equals(STAMINA_SHARED_DRINK_MESSAGE))) { createGameTimer(STAMINA); } - if (config.showStamina() && event.getMessage().equals(STAMINA_EXPIRED_MESSAGE)) + if (this.showStamina && event.getMessage().equals(STAMINA_EXPIRED_MESSAGE)) { removeGameTimer(STAMINA); } - if (config.showAntiFire() && event.getMessage().equals(ANTIFIRE_DRINK_MESSAGE)) + if (this.showAntiFire && event.getMessage().equals(ANTIFIRE_DRINK_MESSAGE)) { createGameTimer(ANTIFIRE); } - if (config.showAntiFire() && event.getMessage().equals(EXTENDED_ANTIFIRE_DRINK_MESSAGE)) + if (this.showAntiFire && event.getMessage().equals(EXTENDED_ANTIFIRE_DRINK_MESSAGE)) { createGameTimer(EXANTIFIRE); } - if (config.showGodWarsAltar() && event.getMessage().equalsIgnoreCase(GOD_WARS_ALTAR_MESSAGE))//Normal altars are "You recharge your Prayer points." while gwd is "You recharge your Prayer." + if (this.showGodWarsAltar && event.getMessage().equalsIgnoreCase(GOD_WARS_ALTAR_MESSAGE))//Normal altars are "You recharge your Prayer points." while gwd is "You recharge your Prayer." { createGameTimer(GOD_WARS_ALTAR); } - if (config.showAntiFire() && event.getMessage().equals(EXTENDED_SUPER_ANTIFIRE_DRINK_MESSAGE)) + if (this.showAntiFire && event.getMessage().equals(EXTENDED_SUPER_ANTIFIRE_DRINK_MESSAGE)) { createGameTimer(EXSUPERANTIFIRE); } - if (config.showAntiFire() && event.getMessage().equals(ANTIFIRE_EXPIRED_MESSAGE)) + if (this.showAntiFire && event.getMessage().equals(ANTIFIRE_EXPIRED_MESSAGE)) { //they have the same expired message removeGameTimer(ANTIFIRE); removeGameTimer(EXANTIFIRE); } - if (config.showOverload() && event.getMessage().startsWith("You drink some of your") && event.getMessage().contains("overload")) + if (this.showOverload && event.getMessage().startsWith("You drink some of your") && event.getMessage().contains("overload")) { if (client.getVar(Varbits.IN_RAID) == 1) { @@ -519,17 +556,17 @@ public class TimersPlugin extends Plugin } - if (config.showCannon() && (event.getMessage().equals(CANNON_FURNACE_MESSAGE) || event.getMessage().contains(CANNON_REPAIR_MESSAGE))) + if (this.showCannon && (event.getMessage().equals(CANNON_FURNACE_MESSAGE) || event.getMessage().contains(CANNON_REPAIR_MESSAGE))) { createGameTimer(CANNON); } - if (config.showCannon() && event.getMessage().equals(CANNON_PICKUP_MESSAGE)) + if (this.showCannon && event.getMessage().equals(CANNON_PICKUP_MESSAGE)) { removeGameTimer(CANNON); } - if (config.showMagicImbue() && event.getMessage().equals(MAGIC_IMBUE_MESSAGE)) + if (this.showMagicImbue && event.getMessage().equals(MAGIC_IMBUE_MESSAGE)) { createGameTimer(MAGICIMBUE); } @@ -539,7 +576,7 @@ public class TimersPlugin extends Plugin removeGameTimer(MAGICIMBUE); } - if (config.showTeleblock()) + if (this.showTeleblock) { if (FULL_TELEBLOCK_PATTERN.matcher(event.getMessage()).find()) { @@ -564,53 +601,53 @@ public class TimersPlugin extends Plugin } } - if (config.showAntiFire() && event.getMessage().contains(SUPER_ANTIFIRE_DRINK_MESSAGE)) + if (this.showAntiFire && event.getMessage().contains(SUPER_ANTIFIRE_DRINK_MESSAGE)) { createGameTimer(SUPERANTIFIRE); } - if (config.showAntiFire() && event.getMessage().equals(SUPER_ANTIFIRE_EXPIRED_MESSAGE)) + if (this.showAntiFire && event.getMessage().equals(SUPER_ANTIFIRE_EXPIRED_MESSAGE)) { removeGameTimer(SUPERANTIFIRE); } - if (config.showImbuedHeart() && event.getMessage().contains(IMBUED_HEART_NOTREADY_MESSAGE)) + if (this.showImbuedHeart && event.getMessage().contains(IMBUED_HEART_NOTREADY_MESSAGE)) { imbuedHeartClicked = false; return; } - if (config.showImbuedHeart() && event.getMessage().equals(IMBUED_HEART_READY_MESSAGE)) + if (this.showImbuedHeart && event.getMessage().equals(IMBUED_HEART_READY_MESSAGE)) { removeGameTimer(IMBUEDHEART); } - if (config.showPrayerEnhance() && event.getMessage().startsWith("You drink some of your") && event.getMessage().contains("prayer enhance")) + if (this.showPrayerEnhance && event.getMessage().startsWith("You drink some of your") && event.getMessage().contains("prayer enhance")) { createGameTimer(PRAYER_ENHANCE); } - if (config.showCharge() && event.getMessage().equals(CHARGE_MESSAGE)) + if (this.showCharge && event.getMessage().equals(CHARGE_MESSAGE)) { createGameTimer(CHARGE); } - if (config.showCharge() && event.getMessage().equals(CHARGE_EXPIRED_MESSAGE)) + if (this.showCharge && event.getMessage().equals(CHARGE_EXPIRED_MESSAGE)) { removeGameTimer(CHARGE); } - if (config.showStaffOfTheDead() && event.getMessage().contains(STAFF_OF_THE_DEAD_SPEC_MESSAGE)) + if (this.showStaffOfTheDead && event.getMessage().contains(STAFF_OF_THE_DEAD_SPEC_MESSAGE)) { createGameTimer(STAFF_OF_THE_DEAD); } - if (config.showStaffOfTheDead() && event.getMessage().contains(STAFF_OF_THE_DEAD_SPEC_EXPIRED_MESSAGE)) + if (this.showStaffOfTheDead && event.getMessage().contains(STAFF_OF_THE_DEAD_SPEC_EXPIRED_MESSAGE)) { removeGameTimer(STAFF_OF_THE_DEAD); } - if (config.showFreezes() && event.getMessage().equals(FROZEN_MESSAGE)) + if (this.showFreezes && event.getMessage().equals(FROZEN_MESSAGE)) { freezeTimer = createGameTimer(ICEBARRAGE); freezeTime = client.getTickCount(); @@ -627,7 +664,7 @@ public class TimersPlugin extends Plugin final boolean isSkulled = player.getSkullIcon() != null && player.getSkullIcon() != SkullIcon.SKULL_FIGHT_PIT; - if (isSkulled != skulledLastTick && config.showSkull()) + if (isSkulled != skulledLastTick && this.showSkull) { skulledLastTick = isSkulled; if (isSkulled) @@ -689,7 +726,7 @@ public class TimersPlugin extends Plugin { Actor actor = event.getActor(); - if (config.showAbyssalSireStun() + if (this.showAbyssalSireStun && actor instanceof NPC) { int npcId = ((NPC) actor).getId(); @@ -720,7 +757,7 @@ public class TimersPlugin extends Plugin return; } - if (config.showHomeMinigameTeleports() + if (this.showHomeMinigameTeleports && client.getLocalPlayer().getAnimation() == AnimationID.IDLE && (lastAnimation == AnimationID.BOOK_HOME_TELEPORT_5 || lastAnimation == AnimationID.COW_HOME_TELEPORT_6)) @@ -748,12 +785,12 @@ public class TimersPlugin extends Plugin return; } - if (config.showImbuedHeart() && actor.getSpotAnimation() == IMBUEDHEART.getGraphicId()) + if (this.showImbuedHeart && actor.getSpotAnimation() == IMBUEDHEART.getGraphicId()) { createGameTimer(IMBUEDHEART); } - if (config.showFreezes()) + if (this.showFreezes) { if (actor.getSpotAnimation() == BIND.getGraphicId()) { @@ -891,7 +928,7 @@ public class TimersPlugin extends Plugin { Skill skill = event.getSkill(); - if (skill != Skill.MAGIC || !config.showImbuedHeart() || !imbuedHeartClicked) + if (skill != Skill.MAGIC || !this.showImbuedHeart || !imbuedHeartClicked) { return; } @@ -960,4 +997,26 @@ public class TimersPlugin extends Plugin removeGameTimer(DMM_FULLTB); removeGameTimer(DMM_HALFTB); } + + private void updateConfig() + { + this.showHomeMinigameTeleports = config.showHomeMinigameTeleports(); + this.showAntiPoison = config.showAntiPoison(); + this.showAntiFire = config.showAntiFire(); + this.showStamina = config.showStamina(); + this.showOverload = config.showOverload(); + this.showPrayerEnhance = config.showPrayerEnhance(); + this.showCannon = config.showCannon(); + this.showMagicImbue = config.showMagicImbue(); + this.showCharge = config.showCharge(); + this.showImbuedHeart = config.showImbuedHeart(); + this.showVengeance = config.showVengeance(); + this.showVengeanceActive = config.showVengeanceActive(); + this.showTeleblock = config.showTeleblock(); + this.showFreezes = config.showFreezes(); + this.showGodWarsAltar = config.showGodWarsAltar(); + this.showSkull = config.showSkull(); + this.showStaffOfTheDead = config.showStaffOfTheDead(); + this.showAbyssalSireStun = config.showAbyssalSireStun(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java index 4379d37844..516fb5eb94 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java @@ -33,6 +33,7 @@ import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.Date; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.MessageNode; @@ -51,6 +52,7 @@ import net.runelite.client.util.ColorUtil; tags = {"timestamp"}, enabledByDefault = false ) +@Singleton public class TimestampPlugin extends Plugin { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlant.java b/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlant.java index f7dce4fbfc..0488514d89 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlant.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlant.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.tithefarm; import java.time.Duration; import java.time.Instant; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import net.runelite.api.GameObject; @@ -35,23 +36,23 @@ class TitheFarmPlant { private static final Duration PLANT_TIME = Duration.ofMinutes(1); - @Getter - @Setter + @Getter(AccessLevel.PACKAGE) + @Setter(AccessLevel.PACKAGE) private Instant planted; - @Getter + @Getter(AccessLevel.PACKAGE) private final TitheFarmPlantState state; - @Getter + @Getter(AccessLevel.PACKAGE) private final TitheFarmPlantType type; - @Getter + @Getter(AccessLevel.PACKAGE) private final GameObject gameObject; - @Getter + @Getter(AccessLevel.PACKAGE) private final WorldPoint worldLocation; - TitheFarmPlant(TitheFarmPlantState state, TitheFarmPlantType type, GameObject gameObject) + TitheFarmPlant(final TitheFarmPlantState state, final TitheFarmPlantType type, final GameObject gameObject) { this.planted = Instant.now(); this.state = state; @@ -60,7 +61,7 @@ class TitheFarmPlant this.worldLocation = gameObject.getWorldLocation(); } - public double getPlantTimeRelative() + double getPlantTimeRelative() { Duration duration = Duration.between(planted, Instant.now()); return duration.compareTo(PLANT_TIME) < 0 ? (double) duration.toMillis() / PLANT_TIME.toMillis() : 1; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlantOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlantOverlay.java index 5e39d3b452..0cf673b2dd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlantOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlantOverlay.java @@ -30,6 +30,7 @@ import java.awt.Graphics2D; import java.util.HashMap; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Perspective; import net.runelite.api.Point; @@ -40,21 +41,20 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.components.ProgressPieComponent; +@Singleton public class TitheFarmPlantOverlay extends Overlay { private final Client client; private final TitheFarmPlugin plugin; - private final TitheFarmPluginConfig config; private final Map borders = new HashMap<>(); private final Map fills = new HashMap<>(); @Inject - TitheFarmPlantOverlay(Client client, TitheFarmPlugin plugin, TitheFarmPluginConfig config) + TitheFarmPlantOverlay(final Client client, final TitheFarmPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); this.plugin = plugin; - this.config = config; this.client = client; } @@ -66,17 +66,17 @@ public class TitheFarmPlantOverlay extends Overlay borders.clear(); fills.clear(); - final Color colorUnwateredBorder = config.getColorUnwatered(); + final Color colorUnwateredBorder = plugin.getGetColorUnwatered(); final Color colorUnwatered = new Color(colorUnwateredBorder.getRed(), colorUnwateredBorder.getGreen(), colorUnwateredBorder.getBlue(), 100); borders.put(TitheFarmPlantState.UNWATERED, colorUnwateredBorder); fills.put(TitheFarmPlantState.UNWATERED, colorUnwatered); - final Color colorWateredBorder = config.getColorWatered(); + final Color colorWateredBorder = plugin.getGetColorWatered(); final Color colorWatered = new Color(colorWateredBorder.getRed(), colorWateredBorder.getGreen(), colorWateredBorder.getBlue(), 100); borders.put(TitheFarmPlantState.WATERED, colorWateredBorder); fills.put(TitheFarmPlantState.WATERED, colorWatered); - final Color colorGrownBorder = config.getColorGrown(); + final Color colorGrownBorder = plugin.getGetColorGrown(); final Color colorGrown = new Color(colorGrownBorder.getRed(), colorGrownBorder.getGreen(), colorGrownBorder.getBlue(), 100); borders.put(TitheFarmPlantState.GROWN, colorGrownBorder); fills.put(TitheFarmPlantState.GROWN, colorGrown); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlantType.java b/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlantType.java index 04a48e6eb3..61e131aa22 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlantType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlantType.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.tithefarm; import com.google.common.collect.ImmutableMap; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ObjectID; @@ -53,11 +54,11 @@ public enum TitheFarmPlantType ObjectID.LOGAVANO_PLANT_27415, ObjectID.BLIGHTED_LOGAVANO_PLANT_27416 ); - @Getter + @Getter(AccessLevel.PACKAGE) private final String name; - @Getter + @Getter(AccessLevel.PACKAGE) private final int baseId; - @Getter + @Getter(AccessLevel.PACKAGE) private final int[] objectIds; private static final Map plantTypes; @@ -77,7 +78,7 @@ public enum TitheFarmPlantType plantTypes = builder.build(); } - TitheFarmPlantType(String name, int baseId, int... objectIds) + TitheFarmPlantType(final String name, final int baseId, final int... objectIds) { this.name = name; this.baseId = baseId; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlugin.java index ae3ee54894..bc69f169fe 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlugin.java @@ -25,9 +25,12 @@ package net.runelite.client.plugins.tithefarm; import com.google.inject.Provides; +import java.awt.Color; import java.util.HashSet; import java.util.Set; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.GameObject; @@ -47,6 +50,7 @@ import net.runelite.client.ui.overlay.OverlayManager; description = "Show timers for the farming patches within the Tithe Farm minigame", tags = {"farming", "minigame", "overlay", "skilling", "timers"} ) +@Singleton public class TitheFarmPlugin extends Plugin { @Inject @@ -55,9 +59,19 @@ public class TitheFarmPlugin extends Plugin @Inject private TitheFarmPlantOverlay titheFarmOverlay; - @Getter + @Inject + private TitheFarmPluginConfig config; + + @Getter(AccessLevel.PACKAGE) private final Set plants = new HashSet<>(); + @Getter(AccessLevel.PACKAGE) + private Color getColorUnwatered; + @Getter(AccessLevel.PACKAGE) + private Color getColorWatered; + @Getter(AccessLevel.PACKAGE) + private Color getColorGrown; + @Provides TitheFarmPluginConfig getConfig(ConfigManager configManager) { @@ -67,6 +81,7 @@ public class TitheFarmPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); overlayManager.add(titheFarmOverlay); titheFarmOverlay.updateConfig(); } @@ -82,6 +97,8 @@ public class TitheFarmPlugin extends Plugin { if (event.getGroup().equals("tithefarmplugin")) { + updateConfig(); + titheFarmOverlay.updateConfig(); } } @@ -152,4 +169,11 @@ public class TitheFarmPlugin extends Plugin } return null; } + + private void updateConfig() + { + this.getColorUnwatered = config.getColorUnwatered(); + this.getColorWatered = config.getColorWatered(); + this.getColorGrown = config.getColorGrown(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java b/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java index e7795025b3..133636aa77 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java @@ -25,10 +25,12 @@ package net.runelite.client.plugins.tmorph; import com.google.inject.Provides; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.Player; import net.runelite.api.events.AnimationChanged; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameTick; import net.runelite.api.kit.KitType; import net.runelite.api.widgets.WidgetInfo; @@ -46,7 +48,7 @@ import org.apache.commons.lang3.ObjectUtils; type = PluginType.UTILITY, enabledByDefault = false ) - +@Singleton public class TMorph extends Plugin { @Inject @@ -55,27 +57,103 @@ public class TMorph extends Plugin @Inject private TMorphConfig config; + private boolean mageSwap; + private boolean rangeSwap; + private boolean meleeSwap; + private int globalAnimSwap; + private int animationSwap; + private int animationTarget; + private int MainhandMage; + private int targetMainhandMage; + private int OffhandMage; + private int targetOffhandMage; + private int HelmetMage; + private int targetHelmetMage; + private int CapeMage; + private int targetCapeMage; + private int NeckMage; + private int targetNeckMage; + private int BodyMage; + private int targetBodyMage; + private int LegsMage; + private int targetLegsMage; + private int BootsMage; + private int targetBootsMage; + private int GlovesMage; + private int targetGlovesMage; + private int MainhandRange; + private int targetMainhandRange; + private int OffhandRange; + private int targetOffhandRange; + private int HelmetRange; + private int targetHelmetRange; + private int CapeRange; + private int targetCapeRange; + private int NeckRange; + private int targetNeckRange; + private int BodyRange; + private int targetBodyRange; + private int LegsRange; + private int targetLegsRange; + private int BootsRange; + private int targetBootsRange; + private int GlovesRange; + private int targetGlovesRange; + private int MainhandMelee; + private int targetMainhandMelee; + private int OffhandMelee; + private int targetOffhandMelee; + private int HelmetMelee; + private int targetHelmetMelee; + private int CapeMelee; + private int targetCapeMelee; + private int NeckMelee; + private int targetNeckMelee; + private int BodyMelee; + private int targetBodyMelee; + private int LegsMelee; + private int targetLegsMelee; + private int BootsMelee; + private int targetBootsMelee; + private int GlovesMelee; + private int targetGlovesMelee; + @Provides TMorphConfig provideConfig(ConfigManager configManager) { return configManager.getConfig(TMorphConfig.class); } + @Override + protected void startUp() throws Exception + { + updateConfig(); + } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (event.getGroup().equals("TMorph")) + { + updateConfig(); + } + } + @Subscribe public void onAnimationChanged(AnimationChanged event) { - if (config.animationTarget() <= 0 && config.animationSwap() <= 0 && config.globalAnimSwap() > 0) + if (this.animationTarget <= 0 && this.animationSwap <= 0 && this.globalAnimSwap > 0) { if (event.getActor().getAnimation() != -1) { - event.getActor().setAnimation(config.globalAnimSwap()); + event.getActor().setAnimation(this.globalAnimSwap); } } - if (config.animationTarget() > 0 && config.animationSwap() > 0) + if (this.animationTarget > 0 && this.animationSwap > 0) { - if (event.getActor().getAnimation() == config.animationTarget()) + if (event.getActor().getAnimation() == this.animationTarget) { - event.getActor().setAnimation(config.animationSwap()); + event.getActor().setAnimation(this.animationSwap); } } } @@ -121,285 +199,349 @@ public class TMorph extends Plugin final int glovesID = ObjectUtils.defaultIfNull(player.getPlayerAppearance(). getEquipmentId(KitType.HANDS), 0); - if (config.mageSwap()) + if (this.mageSwap) { - if (config.MainhandMage() > 0) + if (this.MainhandMage > 0) { - if (config.targetMainhandMage() > 0) + if (this.targetMainhandMage > 0) { - if (mainhandID == config.targetMainhandMage()) + if (mainhandID == this.targetMainhandMage) { - player.getPlayerAppearance().getEquipmentIds()[KitType.WEAPON.getIndex()] = config.MainhandMage() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.WEAPON.getIndex()] = this.MainhandMage + 512; } } } - if (config.OffhandMage() > 0) + if (this.OffhandMage > 0) { - if (config.targetOffhandMage() > 0) + if (this.targetOffhandMage > 0) { - if (offhandID == config.targetOffhandMage()) + if (offhandID == this.targetOffhandMage) { - player.getPlayerAppearance().getEquipmentIds()[KitType.SHIELD.getIndex()] = config.OffhandMage() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.SHIELD.getIndex()] = this.OffhandMage + 512; } } } - if (config.HelmetMage() > 0) + if (this.HelmetMage > 0) { - if (config.targetHelmetMage() > 0) + if (this.targetHelmetMage > 0) { - if (helmetID == config.targetHelmetMage()) + if (helmetID == this.targetHelmetMage) { - player.getPlayerAppearance().getEquipmentIds()[KitType.HELMET.getIndex()] = config.HelmetMage() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.HELMET.getIndex()] = this.HelmetMage + 512; } } } - if (config.CapeMage() > 0) + if (this.CapeMage > 0) { - if (config.targetCapeMage() > 0) + if (this.targetCapeMage > 0) { - if (capeID == config.targetCapeMage()) + if (capeID == this.targetCapeMage) { - player.getPlayerAppearance().getEquipmentIds()[KitType.CAPE.getIndex()] = config.CapeMage() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.CAPE.getIndex()] = this.CapeMage + 512; } } } - if (config.NeckMage() > 0) + if (this.NeckMage > 0) { - if (config.targetNeckMage() > 0) + if (this.targetNeckMage > 0) { - if (neckID == config.targetNeckMage()) + if (neckID == this.targetNeckMage) { - player.getPlayerAppearance().getEquipmentIds()[KitType.AMULET.getIndex()] = config.NeckMage() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.AMULET.getIndex()] = this.NeckMage + 512; } } } - if (config.BodyMage() > 0) + if (this.BodyMage > 0) { - if (config.targetBodyMage() > 0) + if (this.targetBodyMage > 0) { - if (bodyID == config.targetBodyMage()) + if (bodyID == this.targetBodyMage) { - player.getPlayerAppearance().getEquipmentIds()[KitType.TORSO.getIndex()] = config.BodyMage() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.TORSO.getIndex()] = this.BodyMage + 512; } } } - if (config.LegsMage() > 0) + if (this.LegsMage > 0) { - if (config.targetLegsMage() > 0) + if (this.targetLegsMage > 0) { - if (legsID == config.targetLegsMage()) + if (legsID == this.targetLegsMage) { - player.getPlayerAppearance().getEquipmentIds()[KitType.LEGS.getIndex()] = config.LegsMage() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.LEGS.getIndex()] = this.LegsMage + 512; } } } - if (config.BootsMage() > 0) + if (this.BootsMage > 0) { - if (config.targetBootsMage() > 0) + if (this.targetBootsMage > 0) { - if (bootsID == config.targetBootsMage()) + if (bootsID == this.targetBootsMage) { - player.getPlayerAppearance().getEquipmentIds()[KitType.BOOTS.getIndex()] = config.BootsMage() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.BOOTS.getIndex()] = this.BootsMage + 512; } } } - if (config.GlovesMage() > 0) + if (this.GlovesMage > 0) { - if (config.targetGlovesMage() > 0) + if (this.targetGlovesMage > 0) { - if (glovesID == config.targetGlovesMage()) + if (glovesID == this.targetGlovesMage) { - player.getPlayerAppearance().getEquipmentIds()[KitType.HANDS.getIndex()] = config.GlovesMage() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.HANDS.getIndex()] = this.GlovesMage + 512; } } } } - if (config.rangeSwap()) + if (this.rangeSwap) { - if (config.MainhandRange() > 0) + if (this.MainhandRange > 0) { - if (config.targetMainhandRange() > 0) + if (this.targetMainhandRange > 0) { - if (mainhandID == config.targetMainhandRange()) + if (mainhandID == this.targetMainhandRange) { - player.getPlayerAppearance().getEquipmentIds()[KitType.WEAPON.getIndex()] = config.MainhandRange() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.WEAPON.getIndex()] = this.MainhandRange + 512; } } } - if (config.OffhandRange() > 0) + if (this.OffhandRange > 0) { - if (config.targetOffhandRange() > 0) + if (this.targetOffhandRange > 0) { - if (offhandID == config.targetOffhandRange()) + if (offhandID == this.targetOffhandRange) { - player.getPlayerAppearance().getEquipmentIds()[KitType.SHIELD.getIndex()] = config.OffhandRange() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.SHIELD.getIndex()] = this.OffhandRange + 512; } } } - if (config.HelmetRange() > 0) + if (this.HelmetRange > 0) { - if (config.targetHelmetRange() > 0) + if (this.targetHelmetRange > 0) { - if (helmetID == config.targetHelmetRange()) + if (helmetID == this.targetHelmetRange) { - player.getPlayerAppearance().getEquipmentIds()[KitType.HELMET.getIndex()] = config.HelmetRange() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.HELMET.getIndex()] = this.HelmetRange + 512; } } } - if (config.CapeRange() > 0) + if (this.CapeRange > 0) { - if (config.targetCapeRange() > 0) + if (this.targetCapeRange > 0) { - if (capeID == config.targetCapeRange()) + if (capeID == this.targetCapeRange) { - player.getPlayerAppearance().getEquipmentIds()[KitType.CAPE.getIndex()] = config.CapeRange() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.CAPE.getIndex()] = this.CapeRange + 512; } } } - if (config.NeckRange() > 0) + if (this.NeckRange > 0) { - if (config.targetNeckRange() > 0) + if (this.targetNeckRange > 0) { - if (neckID == config.targetNeckRange()) + if (neckID == this.targetNeckRange) { - player.getPlayerAppearance().getEquipmentIds()[KitType.AMULET.getIndex()] = config.NeckRange() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.AMULET.getIndex()] = this.NeckRange + 512; } } } - if (config.BodyRange() > 0) + if (this.BodyRange > 0) { - if (config.targetBodyRange() > 0) + if (this.targetBodyRange > 0) { - if (bodyID == config.targetBodyRange()) + if (bodyID == this.targetBodyRange) { - player.getPlayerAppearance().getEquipmentIds()[KitType.TORSO.getIndex()] = config.BodyRange() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.TORSO.getIndex()] = this.BodyRange + 512; } } } - if (config.LegsRange() > 0) + if (this.LegsRange > 0) { - if (config.targetLegsRange() > 0) + if (this.targetLegsRange > 0) { - if (legsID == config.targetLegsRange()) + if (legsID == this.targetLegsRange) { - player.getPlayerAppearance().getEquipmentIds()[KitType.LEGS.getIndex()] = config.LegsRange() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.LEGS.getIndex()] = this.LegsRange + 512; } } } - if (config.BootsRange() > 0) + if (this.BootsRange > 0) { - if (config.targetBootsRange() > 0) + if (this.targetBootsRange > 0) { - if (bootsID == config.targetBootsRange()) + if (bootsID == this.targetBootsRange) { - player.getPlayerAppearance().getEquipmentIds()[KitType.BOOTS.getIndex()] = config.BootsRange() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.BOOTS.getIndex()] = this.BootsRange + 512; } } } - if (config.GlovesRange() > 0) + if (this.GlovesRange > 0) { - if (config.targetGlovesRange() > 0) + if (this.targetGlovesRange > 0) { - if (glovesID == config.targetGlovesRange()) + if (glovesID == this.targetGlovesRange) { - player.getPlayerAppearance().getEquipmentIds()[KitType.HANDS.getIndex()] = config.GlovesRange() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.HANDS.getIndex()] = this.GlovesRange + 512; } } } } - if (config.meleeSwap()) + if (this.meleeSwap) { - if (config.MainhandMelee() > 0) + if (this.MainhandMelee > 0) { - if (config.targetMainhandMelee() > 0) + if (this.targetMainhandMelee > 0) { - if (mainhandID == config.targetMainhandMelee()) + if (mainhandID == this.targetMainhandMelee) { - player.getPlayerAppearance().getEquipmentIds()[KitType.WEAPON.getIndex()] = config.MainhandMelee() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.WEAPON.getIndex()] = this.MainhandMelee + 512; } } } - if (config.OffhandMelee() > 0) + if (this.OffhandMelee > 0) { - if (config.targetOffhandMelee() > 0) + if (this.targetOffhandMelee > 0) { - if (offhandID == config.targetOffhandMelee()) + if (offhandID == this.targetOffhandMelee) { - player.getPlayerAppearance().getEquipmentIds()[KitType.SHIELD.getIndex()] = config.OffhandMelee() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.SHIELD.getIndex()] = this.OffhandMelee + 512; } } } - if (config.HelmetMelee() > 0) + if (this.HelmetMelee > 0) { - if (config.targetHelmetMelee() > 0) + if (this.targetHelmetMelee > 0) { - if (helmetID == config.targetHelmetMelee()) + if (helmetID == this.targetHelmetMelee) { - player.getPlayerAppearance().getEquipmentIds()[KitType.HELMET.getIndex()] = config.HelmetMelee() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.HELMET.getIndex()] = this.HelmetMelee + 512; } } } - if (config.CapeMelee() > 0) + if (this.CapeMelee > 0) { - if (config.targetCapeMelee() > 0) + if (this.targetCapeMelee > 0) { - if (capeID == config.targetCapeMelee()) + if (capeID == this.targetCapeMelee) { - player.getPlayerAppearance().getEquipmentIds()[KitType.CAPE.getIndex()] = config.CapeMelee() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.CAPE.getIndex()] = this.CapeMelee + 512; } } } - if (config.NeckMelee() > 0) + if (this.NeckMelee > 0) { - if (config.targetNeckMelee() > 0) + if (this.targetNeckMelee > 0) { - if (neckID == config.targetNeckMelee()) + if (neckID == this.targetNeckMelee) { - player.getPlayerAppearance().getEquipmentIds()[KitType.AMULET.getIndex()] = config.NeckMelee() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.AMULET.getIndex()] = this.NeckMelee + 512; } } } - if (config.BodyMelee() > 0) + if (this.BodyMelee > 0) { - if (config.targetBodyMelee() > 0) + if (this.targetBodyMelee > 0) { - if (bodyID == config.targetBodyMelee()) + if (bodyID == this.targetBodyMelee) { - player.getPlayerAppearance().getEquipmentIds()[KitType.TORSO.getIndex()] = config.BodyMelee() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.TORSO.getIndex()] = this.BodyMelee + 512; } } } - if (config.LegsMelee() > 0) + if (this.LegsMelee > 0) { - if (config.targetLegsMelee() > 0) + if (this.targetLegsMelee > 0) { - if (legsID == config.targetLegsMelee()) + if (legsID == this.targetLegsMelee) { - player.getPlayerAppearance().getEquipmentIds()[KitType.LEGS.getIndex()] = config.LegsMelee() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.LEGS.getIndex()] = this.LegsMelee + 512; } } } - if (config.BootsMelee() > 0) + if (this.BootsMelee > 0) { - if (config.targetBootsMelee() > 0) + if (this.targetBootsMelee > 0) { - if (bootsID == config.targetBootsMelee()) + if (bootsID == this.targetBootsMelee) { - player.getPlayerAppearance().getEquipmentIds()[KitType.BOOTS.getIndex()] = config.BootsMelee() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.BOOTS.getIndex()] = this.BootsMelee + 512; } } } - if (config.GlovesMelee() > 0) + if (this.GlovesMelee > 0) { - if (config.targetGlovesMelee() > 0) + if (this.targetGlovesMelee > 0) { - if (glovesID == config.targetGlovesMelee()) + if (glovesID == this.targetGlovesMelee) { - player.getPlayerAppearance().getEquipmentIds()[KitType.HANDS.getIndex()] = config.GlovesMelee() + 512; + player.getPlayerAppearance().getEquipmentIds()[KitType.HANDS.getIndex()] = this.GlovesMelee + 512; } } } } player.getPlayerAppearance().setHash(); } + + private void updateConfig() + { + this.mageSwap = config.mageSwap(); + this.rangeSwap = config.rangeSwap(); + this.meleeSwap = config.meleeSwap(); + this.globalAnimSwap = config.globalAnimSwap(); + this.animationSwap = config.animationSwap(); + this.animationTarget = config.animationTarget(); + this.MainhandMage = config.MainhandMage(); + this.targetMainhandMage = config.targetMainhandMage(); + this.OffhandMage = config.OffhandMage(); + this.targetOffhandMage = config.targetOffhandMage(); + this.HelmetMage = config.HelmetMage(); + this.targetHelmetMage = config.targetHelmetMage(); + this.CapeMage = config.CapeMage(); + this.targetCapeMage = config.targetCapeMage(); + this.NeckMage = config.NeckMage(); + this.targetNeckMage = config.targetNeckMage(); + this.BodyMage = config.BodyMage(); + this.targetBodyMage = config.targetBodyMage(); + this.LegsMage = config.LegsMage(); + this.targetLegsMage = config.targetLegsMage(); + this.BootsMage = config.BootsMage(); + this.targetBootsMage = config.targetBootsMage(); + this.GlovesMage = config.GlovesMage(); + this.targetGlovesMage = config.targetGlovesMage(); + this.MainhandRange = config.MainhandRange(); + this.targetMainhandRange = config.targetMainhandRange(); + this.OffhandRange = config.OffhandRange(); + this.targetOffhandRange = config.targetOffhandRange(); + this.HelmetRange = config.HelmetRange(); + this.targetHelmetRange = config.targetHelmetRange(); + this.CapeRange = config.CapeRange(); + this.targetCapeRange = config.targetCapeRange(); + this.NeckRange = config.NeckRange(); + this.targetNeckRange = config.targetNeckRange(); + this.BodyRange = config.BodyRange(); + this.targetBodyRange = config.targetBodyRange(); + this.LegsRange = config.LegsRange(); + this.targetLegsRange = config.targetLegsRange(); + this.BootsRange = config.BootsRange(); + this.targetBootsRange = config.targetBootsRange(); + this.GlovesRange = config.GlovesRange(); + this.targetGlovesRange = config.targetGlovesRange(); + this.MainhandMelee = config.MainhandMelee(); + this.targetMainhandMelee = config.targetMainhandMelee(); + this.OffhandMelee = config.OffhandMelee(); + this.targetOffhandMelee = config.targetOffhandMelee(); + this.HelmetMelee = config.HelmetMelee(); + this.targetHelmetMelee = config.targetHelmetMelee(); + this.CapeMelee = config.CapeMelee(); + this.targetCapeMelee = config.targetCapeMelee(); + this.NeckMelee = config.NeckMelee(); + this.targetNeckMelee = config.targetNeckMelee(); + this.BodyMelee = config.BodyMelee(); + this.targetBodyMelee = config.targetBodyMelee(); + this.LegsMelee = config.LegsMelee(); + this.targetLegsMelee = config.targetLegsMelee(); + this.BootsMelee = config.BootsMelee(); + this.targetBootsMelee = config.targetBootsMelee(); + this.GlovesMelee = config.GlovesMelee(); + this.targetGlovesMelee = config.targetGlovesMelee(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java index 2cb2ff0de8..1202e4466b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.tobdamagecount; import java.text.DecimalFormat; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Actor; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; @@ -59,7 +60,7 @@ import net.runelite.client.plugins.PluginType; type = PluginType.PVM, enabledByDefault = false ) - +@Singleton public class DamageCounterPlugin extends Plugin { private int currentWorld = -1; @@ -329,10 +330,10 @@ public class DamageCounterPlugin extends Plugin String DeathMessage = "You have died! You did " + DAMAGEFORMAT.format(DamageCount) + " damage to " + BossName + "!"; String MessageTaken = "You have taken " + DAMAGEFORMAT.format(DamageTaken) + " damage from this fight!"; - for (int i = 0; i < ToB_Region.length; i++) + for (int value : ToB_Region) { if (WorldPoint.fromLocalInstance(client, - client.getLocalPlayer().getLocalLocation()).getRegionID() == ToB_Region[i]) + client.getLocalPlayer().getLocalLocation()).getRegionID() == value) { sendChatMessage(DeathMessage); sendChatMessage(MessageTaken); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/twitch/TwitchPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/twitch/TwitchPlugin.java index ce7b25acb3..62923981a9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/twitch/TwitchPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/twitch/TwitchPlugin.java @@ -29,6 +29,7 @@ import com.google.inject.Provides; import java.time.temporal.ChronoUnit; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; @@ -56,6 +57,7 @@ import net.runelite.client.task.Schedule; enabledByDefault = false ) @Slf4j +@Singleton public class TwitchPlugin extends Plugin implements TwitchListener, ChatboxInputListener { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/twitch/irc/Message.java b/runelite-client/src/main/java/net/runelite/client/plugins/twitch/irc/Message.java index fe990331cc..fb7945f17e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/twitch/irc/Message.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/twitch/irc/Message.java @@ -28,9 +28,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; -@Getter +@Getter(AccessLevel.PACKAGE) class Message { private final Map tags = new HashMap<>(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/twitch/irc/TwitchIRCClient.java b/runelite-client/src/main/java/net/runelite/client/plugins/twitch/irc/TwitchIRCClient.java index f76ddcaa3c..a51a38a433 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/twitch/irc/TwitchIRCClient.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/twitch/irc/TwitchIRCClient.java @@ -52,7 +52,7 @@ public class TwitchIRCClient extends Thread implements AutoCloseable private long last; private boolean pingSent; - public TwitchIRCClient(TwitchListener twitchListener, String username, String password, String channel) + public TwitchIRCClient(final TwitchListener twitchListener, final String username, final String password, final String channel) { setName("Twitch"); this.twitchListener = twitchListener; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java index 7f4ccff362..9d3179c68c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java @@ -28,6 +28,7 @@ import java.time.Instant; import java.util.HashMap; import java.util.Map; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.Getter; import net.runelite.api.Actor; import net.runelite.api.AnimationID; @@ -45,7 +46,7 @@ import net.runelite.client.ui.overlay.OverlayManager; type = PluginType.PVM, enabledByDefault = false ) - +@Singleton public class VetionPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/virtuallevels/VirtualLevelsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/virtuallevels/VirtualLevelsPlugin.java index 7be76a31b4..c9f3bb462f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/virtuallevels/VirtualLevelsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/virtuallevels/VirtualLevelsPlugin.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.virtuallevels; import com.google.inject.Provides; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Experience; import net.runelite.api.Skill; @@ -45,6 +46,7 @@ import net.runelite.client.plugins.PluginDescriptor; tags = {"skill", "total", "max"}, enabledByDefault = false ) +@Singleton public class VirtualLevelsPlugin extends Plugin { private static final String TOTAL_LEVEL_TEXT_PREFIX = "Total level:
"; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/Vorkath.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/Vorkath.java index 2691f4991d..02ae424527 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/Vorkath.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/Vorkath.java @@ -70,7 +70,7 @@ public class Vorkath * * @param newPhase the new phase Vorkath is current on */ - public void updatePhase(Phase newPhase) + void updatePhase(Phase newPhase) { Phase oldLastPhase = this.lastPhase; Phase oldCurrentPhase = this.currentPhase; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathAttack.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathAttack.java index 8e1b20daae..6a2479c57b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathAttack.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathAttack.java @@ -27,13 +27,14 @@ package net.runelite.client.plugins.vorkath; import com.google.common.collect.ImmutableMap; import java.util.Map; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.AnimationID; import net.runelite.api.ProjectileID; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) public enum VorkathAttack { /** diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java index 3b94cefe7b..af8635f8af 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java @@ -33,6 +33,7 @@ import java.awt.Graphics2D; import java.awt.geom.Arc2D; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Perspective; import net.runelite.api.Point; @@ -41,6 +42,7 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; +@Singleton public class VorkathOverlay extends Overlay { private static final Color COLOR_ICON_BACKGROUND = new Color(0, 0, 0, 128); @@ -53,7 +55,7 @@ public class VorkathOverlay extends Overlay private VorkathPlugin plugin; @Inject - public VorkathOverlay(Client client, VorkathPlugin plugin) + public VorkathOverlay(final Client client, final VorkathPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java index a694be9826..58cefc7efe 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.vorkath; import com.google.inject.Inject; +import com.google.inject.Singleton; import java.awt.image.BufferedImage; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -52,6 +53,7 @@ import org.apache.commons.lang3.ArrayUtils; type = PluginType.PVM, enabledByDefault = false ) +@Singleton @Slf4j public class VorkathPlugin extends Plugin { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/ZombifiedSpawnOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/ZombifiedSpawnOverlay.java index 50fb185532..145eb2602d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/ZombifiedSpawnOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/ZombifiedSpawnOverlay.java @@ -28,17 +28,19 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton public class ZombifiedSpawnOverlay extends Overlay { private VorkathPlugin plugin; @Inject - public ZombifiedSpawnOverlay(VorkathPlugin plugin) + public ZombifiedSpawnOverlay(final VorkathPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_SCENE); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorConfig.java index dca6ba47b3..226286ff19 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorConfig.java @@ -97,7 +97,6 @@ public interface WarIndicatorConfig extends Config ) void setActiveCallers(String key); - @ConfigItem( position = 6, keyName = "highlightSnipes", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorMiniMapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorMiniMapOverlay.java index d7fa0cc92a..3e278405e5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorMiniMapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorMiniMapOverlay.java @@ -41,12 +41,12 @@ import org.apache.commons.lang3.ArrayUtils; public class WarIndicatorMiniMapOverlay extends Overlay { private final WarIndicatorService warIndicatorService; - private final WarIndicatorConfig config; + private final WarIndicatorPlugin plugin; @Inject - private WarIndicatorMiniMapOverlay(WarIndicatorConfig config, WarIndicatorService warIndicatorService) + private WarIndicatorMiniMapOverlay(final WarIndicatorPlugin plugin, final WarIndicatorService warIndicatorService) { - this.config = config; + this.plugin = plugin; this.warIndicatorService = warIndicatorService; setLayer(OverlayLayer.ABOVE_WIDGETS); setPosition(OverlayPosition.DYNAMIC); @@ -65,10 +65,10 @@ public class WarIndicatorMiniMapOverlay extends Overlay final String name = actor.getName().replace('\u00A0', ' '); final net.runelite.api.Point minimapLocation = actor.getMinimapLocation(); - String[] callers = config.getActiveCallers().split(", "); - String[] targets = config.getTargetedSnipes().split(", "); + String[] callers = plugin.getGetActiveCallers().split(", "); + String[] targets = plugin.getGetTargetedSnipes().split(", "); - if (config.callerMinimap() && ArrayUtils.contains(callers, actor.getName())) + if (plugin.isCallerMinimap() && ArrayUtils.contains(callers, actor.getName())) { if (minimapLocation != null) { @@ -76,7 +76,7 @@ public class WarIndicatorMiniMapOverlay extends Overlay } } - if (config.snipeMinimap() && ArrayUtils.contains(targets, actor.getName())) + if (plugin.isSnipeMinimap() && ArrayUtils.contains(targets, actor.getName())) { if (minimapLocation != null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorOverlay.java index 3eb4c463de..4d24401d7d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorOverlay.java @@ -43,12 +43,12 @@ import org.apache.commons.lang3.ArrayUtils; public class WarIndicatorOverlay extends Overlay { private final WarIndicatorService warIndicatorService; - private final WarIndicatorConfig config; + private final WarIndicatorPlugin plugin; @Inject - private WarIndicatorOverlay(WarIndicatorConfig config, WarIndicatorService warIndicatorService) + private WarIndicatorOverlay(final WarIndicatorPlugin plugin, final WarIndicatorService warIndicatorService) { - this.config = config; + this.plugin = plugin; this.warIndicatorService = warIndicatorService; setLayer(OverlayLayer.ABOVE_SCENE); setPosition(OverlayPosition.DYNAMIC); @@ -64,16 +64,16 @@ public class WarIndicatorOverlay extends Overlay private void renderPlayerOverlay(Graphics2D graphics, Player actor, Color color) { - if (!config.highlightSnipes() && !config.highLightCallers()) + if (!plugin.isHighlightSnipes() && !plugin.isHighLightCallers()) { return; } Polygon poly = actor.getCanvasTilePoly(); - String[] callers = config.getActiveCallers().split(", "); - String[] targets = config.getTargetedSnipes().split(", "); + String[] callers = plugin.getGetActiveCallers().split(", "); + String[] targets = plugin.getGetTargetedSnipes().split(", "); - if (config.callerTile() && ArrayUtils.contains(callers, actor.getName())) + if (plugin.isCallerTile() && ArrayUtils.contains(callers, actor.getName())) { if (poly != null) { @@ -81,7 +81,7 @@ public class WarIndicatorOverlay extends Overlay } } - if (config.snipeTile() && ArrayUtils.contains(targets, actor.getName())) + if (plugin.isSnipeTile() && ArrayUtils.contains(targets, actor.getName())) { if (poly != null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorPlugin.java index 6e6d80a476..e3ca95d45a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorPlugin.java @@ -27,6 +27,9 @@ package net.runelite.client.plugins.warindicators; import com.google.inject.Provides; import java.awt.Color; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; import net.runelite.api.Client; import static net.runelite.api.MenuAction.FOLLOW; import static net.runelite.api.MenuAction.ITEM_USE_ON_PLAYER; @@ -42,6 +45,7 @@ import static net.runelite.api.MenuAction.SPELL_CAST_ON_PLAYER; import static net.runelite.api.MenuAction.TRADE; import net.runelite.api.MenuEntry; import net.runelite.api.Player; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.MenuEntryAdded; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; @@ -58,7 +62,7 @@ import org.apache.commons.lang3.ArrayUtils; type = PluginType.PVP, enabledByDefault = false ) - +@Singleton public class WarIndicatorPlugin extends Plugin { @Inject @@ -76,6 +80,27 @@ public class WarIndicatorPlugin extends Plugin @Inject private Client client; + @Getter(AccessLevel.PACKAGE) + private boolean highLightCallers; + @Getter(AccessLevel.PACKAGE) + private Color getCallerColor; + @Getter(AccessLevel.PACKAGE) + private boolean callerMinimap; + @Getter(AccessLevel.PACKAGE) + private boolean callerTile; + @Getter(AccessLevel.PACKAGE) + private String getActiveCallers; + @Getter(AccessLevel.PACKAGE) + private boolean highlightSnipes; + @Getter(AccessLevel.PACKAGE) + private Color getSnipeColor; + @Getter(AccessLevel.PACKAGE) + private boolean snipeMinimap; + @Getter(AccessLevel.PACKAGE) + private boolean snipeTile; + @Getter(AccessLevel.PACKAGE) + private String getTargetedSnipes; + @Provides WarIndicatorConfig provideConfig(ConfigManager configManager) { @@ -85,6 +110,8 @@ public class WarIndicatorPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(warIndicatorOverlay); overlayManager.add(warIndicatorMiniMapOverlay); } @@ -123,8 +150,8 @@ public class WarIndicatorPlugin extends Plugin Player player = null; String player2 = null; - String[] callers = config.getActiveCallers().split(", "); - String[] targets = config.getTargetedSnipes().split(", "); + String[] callers = this.getActiveCallers.split(", "); + String[] targets = this.getTargetedSnipes.split(", "); if (identifier >= 0 && identifier < players.length) { @@ -139,14 +166,14 @@ public class WarIndicatorPlugin extends Plugin Color color = null; - if (config.highLightCallers() && ArrayUtils.contains(callers, player2)) + if (this.highLightCallers && ArrayUtils.contains(callers, player2)) { - color = config.getCallerColor(); + color = this.getCallerColor; } - if (config.highlightSnipes() && ArrayUtils.contains(targets, player2)) + if (this.highlightSnipes && ArrayUtils.contains(targets, player2)) { - color = config.getSnipeColor(); + color = this.getSnipeColor; } if (color != null) @@ -167,4 +194,27 @@ public class WarIndicatorPlugin extends Plugin } } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (event.getGroup().equals("warIndicators")) + { + updateConfig(); + } + } + + private void updateConfig() + { + this.highLightCallers = config.highLightCallers(); + this.getCallerColor = config.getCallerColor(); + this.callerMinimap = config.callerMinimap(); + this.callerTile = config.callerTile(); + this.getActiveCallers = config.getActiveCallers(); + this.highlightSnipes = config.highlightSnipes(); + this.getSnipeColor = config.getSnipeColor(); + this.snipeMinimap = config.snipeMinimap(); + this.snipeTile = config.snipeTile(); + this.getTargetedSnipes = config.getTargetedSnipes(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorService.java b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorService.java index 1188dc6a12..630cbb4a47 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorService.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorService.java @@ -35,23 +35,23 @@ import net.runelite.api.Player; public class WarIndicatorService { private final Client client; - private final WarIndicatorConfig config; + private final WarIndicatorPlugin plugin; @Inject - private WarIndicatorService(Client client, WarIndicatorConfig config) + private WarIndicatorService(final Client client, final WarIndicatorPlugin plugin) { - this.config = config; + this.plugin = plugin; this.client = client; } public void forEachPlayer(final BiConsumer consumer) { - if (!config.highlightSnipes() && !config.highLightCallers()) + if (!plugin.isHighlightSnipes() && !plugin.isHighLightCallers()) { return; } - if (config.highlightSnipes()) + if (plugin.isHighlightSnipes()) { for (Player player : client.getPlayers()) { @@ -60,19 +60,19 @@ public class WarIndicatorService continue; } - String[] targets = config.getTargetedSnipes().split(", "); + String[] targets = plugin.getGetTargetedSnipes().split(", "); for (String target : targets) { if (player.getName().equalsIgnoreCase(target)) { - consumer.accept(player, config.getSnipeColor()); + consumer.accept(player, plugin.getGetSnipeColor()); } } } } - if (config.highLightCallers()) + if (plugin.isHighLightCallers()) { for (Player player : client.getPlayers()) { @@ -81,13 +81,13 @@ public class WarIndicatorService continue; } - String[] callers = config.getActiveCallers().split(", "); + String[] callers = plugin.getGetActiveCallers().split(", "); for (String caller : callers) { if (player.getName().equalsIgnoreCase(caller)) { - consumer.accept(player, config.getCallerColor()); + consumer.accept(player, plugin.getGetCallerColor()); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java index b15b87c431..d5b9d32afa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java @@ -13,7 +13,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; -import net.runelite.api.Client; +import javax.inject.Singleton; import net.runelite.api.ItemID; import net.runelite.client.game.AsyncBufferedImage; import net.runelite.client.game.ItemManager; @@ -25,10 +25,9 @@ import net.runelite.client.ui.overlay.components.ImageComponent; import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TitleComponent; +@Singleton public class WhaleWatchersGloryOverlay extends Overlay { - private Client client; - private final WhaleWatchersConfig config; private WhaleWatchersPlugin plugin; private PanelComponent panelComponent; @@ -36,10 +35,8 @@ public class WhaleWatchersGloryOverlay extends Overlay private ItemManager itemManager; @Inject - public WhaleWatchersGloryOverlay(WhaleWatchersConfig config, Client client, WhaleWatchersPlugin plugin) + public WhaleWatchersGloryOverlay(final WhaleWatchersPlugin plugin) { - this.client = client; - this.config = config; this.plugin = plugin; setLayer(OverlayLayer.ABOVE_WIDGETS); setPriority(OverlayPriority.HIGH); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersOverlay.java index 5ea462699b..a915399cab 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersOverlay.java @@ -12,6 +12,7 @@ package net.runelite.client.plugins.whalewatchers; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.MenuAction; import net.runelite.client.ui.overlay.Overlay; @@ -27,23 +28,22 @@ import net.runelite.client.ui.overlay.components.TitleComponent; * The overlay for the Damage Counter */ +@Singleton public class WhaleWatchersOverlay extends Overlay { private Client client; - private final WhaleWatchersConfig config; private WhaleWatchersPlugin plugin; private PanelComponent panelComponent; private String lastOpponent = "-"; - private final OverlayMenuEntry resetMenuEntry = new OverlayMenuEntry(MenuAction.RUNELITE_OVERLAY, - "Reset", "Damage Counter"); @Inject - public WhaleWatchersOverlay(WhaleWatchersConfig config, Client client, WhaleWatchersPlugin plugin) + public WhaleWatchersOverlay(final Client client, final WhaleWatchersPlugin plugin) { + OverlayMenuEntry resetMenuEntry = new OverlayMenuEntry(MenuAction.RUNELITE_OVERLAY, + "Reset", "Damage Counter"); this.getMenuEntries().add(resetMenuEntry); this.client = client; - this.config = config; this.plugin = plugin; setLayer(OverlayLayer.ABOVE_WIDGETS); setPriority(OverlayPriority.HIGHEST); @@ -57,14 +57,13 @@ public class WhaleWatchersOverlay extends Overlay { panelComponent.getChildren().clear(); - if (plugin.inCombat && config.showDamageCounter()) + if (plugin.inCombat && plugin.isShowDamageCounter()) { panelComponent.setOrientation(ComponentOrientation.HORIZONTAL); panelComponent.setWrapping(5); - String opp = client.getLocalPlayer().getInteracting() != null ? - client.getLocalPlayer().getInteracting().getName() : lastOpponent; - lastOpponent = opp; + lastOpponent = client.getLocalPlayer().getInteracting() != null ? + client.getLocalPlayer().getInteracting().getName() : lastOpponent; String damageTaken = "Damage Taken: " + plugin.damageTaken; String damageDealt = "Damage Dealt: " + plugin.damageDone; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java index 4d554fee56..a35c9fe846 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java @@ -16,6 +16,8 @@ import com.google.inject.Provides; import java.util.EnumSet; import java.util.Objects; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.InventoryID; @@ -50,16 +52,16 @@ import org.apache.commons.lang3.ObjectUtils; type = PluginType.PVP, enabledByDefault = false ) - +@Singleton public class WhaleWatchersPlugin extends Plugin { private static final String CONFIG_GROUP_NAME = "WhaleWatchers"; - public boolean protectItemOverlay = false; - public int damageDone = 0; - public int damageTaken = 0; - public boolean inCombat = false; + boolean protectItemOverlay = false; + int damageDone = 0; + int damageTaken = 0; + boolean inCombat = false; @Inject private Client client; @Inject @@ -75,11 +77,18 @@ public class WhaleWatchersPlugin extends Plugin @Inject private OverlayManager overlayManager; private int tickCountdown = 0; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean displaySmiteOverlay; - @Getter + @Getter(AccessLevel.PACKAGE) private boolean displayGloryOverlay; + @Getter(AccessLevel.PACKAGE) + private boolean protectItemWarning; + @Getter(AccessLevel.PACKAGE) + private boolean showDamageCounter; + private boolean smiteableWarning; + private boolean gloryWarning; + @Provides WhaleWatchersConfig getConfig(ConfigManager configManager) { @@ -101,6 +110,7 @@ public class WhaleWatchersPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); overlayManager.add(overlay); overlayManager.add(whaleWatchersProtOverlay); @@ -126,15 +136,17 @@ public class WhaleWatchersPlugin extends Plugin return; } - if (!config.protectItemWarning()) + updateConfig(); + + if (!this.protectItemWarning) { protectItemOverlay = false; } - if (!config.gloryWarning()) + if (!this.gloryWarning) { displayGloryOverlay = false; } - if (!config.smiteableWarning()) + if (!this.smiteableWarning) { displaySmiteOverlay = false; } @@ -144,7 +156,7 @@ public class WhaleWatchersPlugin extends Plugin @Subscribe public void onHitsplatApplied(HitsplatApplied event) { - if (config.showDamageCounter()) + if (this.showDamageCounter) { if (!(event.getActor() == client.getLocalPlayer() || event.getActor() == client.getLocalPlayer().getInteracting())) @@ -170,7 +182,7 @@ public class WhaleWatchersPlugin extends Plugin @Subscribe public void onItemContainerChanged(ItemContainerChanged event) { - if (config.gloryWarning() && event.getItemContainer() == client.getItemContainer(InventoryID.EQUIPMENT)) + if (this.gloryWarning && event.getItemContainer() == client.getItemContainer(InventoryID.EQUIPMENT)) { final int amuletID = ObjectUtils.defaultIfNull(client.getLocalPlayer() .getPlayerAppearance().getEquipmentId(KitType.AMULET), 0); @@ -186,7 +198,7 @@ public class WhaleWatchersPlugin extends Plugin @Subscribe public void onMenuOptionClicked(MenuOptionClicked event) { - if (config.showDamageCounter() && event.getMenuAction().equals(MenuAction.SPELL_CAST_ON_PLAYER)) + if (this.showDamageCounter && event.getMenuAction().equals(MenuAction.SPELL_CAST_ON_PLAYER)) { inCombat = true; } @@ -195,7 +207,7 @@ public class WhaleWatchersPlugin extends Plugin @Subscribe public void onVarbitChanged(VarbitChanged event) { - if (config.showDamageCounter()) + if (this.showDamageCounter) { if (client.getVar(VarPlayer.ATTACKING_PLAYER) == -1) { @@ -206,12 +218,12 @@ public class WhaleWatchersPlugin extends Plugin } } - if (config.protectItemWarning()) + if (this.protectItemWarning) { try { final SkullIcon skullIcon = Objects.requireNonNull(client.getLocalPlayer().getSkullIcon()); - final EnumSet worldTypes = client.getWorldType(); + final EnumSet worldTypes = client.getWorldType(); if (WorldType.isHighRiskWorld(worldTypes)) { protectItemOverlay = false; @@ -242,7 +254,7 @@ public class WhaleWatchersPlugin extends Plugin @Subscribe public void onGameTick(GameTick event) { - if (config.showDamageCounter()) + if (this.showDamageCounter) { if (tickCountdown > 0 && tickCountdown < 11) { @@ -255,7 +267,7 @@ public class WhaleWatchersPlugin extends Plugin } } } - if (config.smiteableWarning() && (client.getVar(Varbits.IN_WILDERNESS) == 1 || isPvpWorld(client.getWorldType()))) + if (this.smiteableWarning && (client.getVar(Varbits.IN_WILDERNESS) == 1 || isPvpWorld(client.getWorldType()))) { if (client.getLocalPlayer().getSkullIcon() != null && client.getLocalPlayer().getSkullIcon().equals(SkullIcon.SKULL)) { @@ -294,5 +306,13 @@ public class WhaleWatchersPlugin extends Plugin damageTaken = 0; damageDone = 0; } + + private void updateConfig() + { + this.protectItemWarning = config.protectItemWarning(); + this.showDamageCounter = config.showDamageCounter(); + this.smiteableWarning = config.smiteableWarning(); + this.gloryWarning = config.gloryWarning(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java index b0d7dc7cac..17de8ac9b8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java @@ -20,6 +20,7 @@ import java.awt.Graphics2D; import java.awt.Rectangle; import java.awt.Stroke; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Point; import net.runelite.client.ui.FontManager; @@ -29,19 +30,17 @@ import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayUtil; - +@Singleton public class WhaleWatchersProtOverlay extends Overlay { private Client client; - private final WhaleWatchersConfig config; private WhaleWatchersPlugin plugin; @Inject - public WhaleWatchersProtOverlay(WhaleWatchersConfig config, Client client, WhaleWatchersPlugin plugin) + public WhaleWatchersProtOverlay(final Client client, final WhaleWatchersPlugin plugin) { this.client = client; - this.config = config; this.plugin = plugin; setLayer(OverlayLayer.ABOVE_WIDGETS); setPriority(OverlayPriority.HIGH); @@ -51,7 +50,7 @@ public class WhaleWatchersProtOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (plugin.protectItemOverlay && config.protectItemWarning()) + if (plugin.protectItemOverlay && plugin.isProtectItemWarning()) { Rectangle rectangle = new Rectangle(); rectangle.setBounds(client.getCanvas().getBounds()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersSmiteableOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersSmiteableOverlay.java index 4be28dce80..0d2cd567e9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersSmiteableOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersSmiteableOverlay.java @@ -14,6 +14,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; @@ -24,6 +25,7 @@ import net.runelite.client.ui.overlay.components.TitleComponent; /** * The overlay for the smiteable warning */ +@Singleton public class WhaleWatchersSmiteableOverlay extends Overlay { private WhaleWatchersPlugin plugin; @@ -31,7 +33,7 @@ public class WhaleWatchersSmiteableOverlay extends Overlay @Inject - public WhaleWatchersSmiteableOverlay(WhaleWatchersPlugin plugin) + public WhaleWatchersSmiteableOverlay(final WhaleWatchersPlugin plugin) { this.plugin = plugin; setLayer(OverlayLayer.ABOVE_WIDGETS); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java index 8ff438b68f..b07ea0bad0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java @@ -30,6 +30,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.inject.Inject; import javax.inject.Provider; +import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.MenuAction; @@ -64,6 +65,7 @@ import okhttp3.HttpUrl; name = "Wiki", description = "Adds a Wiki button that takes you to the OSRS Wiki" ) +@Singleton public class WikiPlugin extends Plugin { private static final int[] QUESTLIST_WIDGET_IDS = new int[] diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java index 96ebec1479..0753c24338 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java @@ -75,8 +75,7 @@ public class WikiSearchChatboxTextInput extends ChatboxTextInput private String offPrediction = null; @Inject - public WikiSearchChatboxTextInput(ChatboxPanelManager chatboxPanelManager, ClientThread clientThread, - ScheduledExecutorService scheduledExecutorService, @Named("developerMode") final boolean developerMode) + public WikiSearchChatboxTextInput(final ChatboxPanelManager chatboxPanelManager, final ClientThread clientThread, final ScheduledExecutorService scheduledExecutorService, @Named("developerMode") final boolean developerMode) { super(chatboxPanelManager, clientThread); this.chatboxPanelManager = chatboxPanelManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSprite.java b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSprite.java index 188d54837b..b470dc2212 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSprite.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSprite.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.wiki; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import net.runelite.api.SpriteID; @@ -36,9 +37,9 @@ public enum WikiSprite implements SpriteOverride WIKI_SELECTED_ICON(-301, "wiki_selected.png"), FIXED_MODE_MINIMAP_CLICKMASK(SpriteID.MINIMAP_CLICK_MASK, "fixed_mode_minimap_clickmask.png"); - @Getter + @Getter(AccessLevel.PUBLIC) private final int spriteId; - @Getter + @Getter(AccessLevel.PUBLIC) private final String fileName; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsOverlay.java index 41ad66e7d2..921ed916b6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsOverlay.java @@ -12,22 +12,21 @@ package net.runelite.client.plugins.wildernesslocations; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.components.TextComponent; +@Singleton public class WildernessLocationsOverlay extends Overlay { private final WildernessLocationsPlugin plugin; private TextComponent textComponent; @Inject - private WildernessLocationsConfig wildyConfig; - - @Inject - public WildernessLocationsOverlay(WildernessLocationsPlugin plugin) + public WildernessLocationsOverlay(final WildernessLocationsPlugin plugin) { this.plugin = plugin; setLayer(OverlayLayer.ABOVE_WIDGETS); @@ -39,7 +38,7 @@ public class WildernessLocationsOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (plugin.isRenderLocation() && wildyConfig.drawOverlay()) + if (plugin.isRenderLocation() && plugin.isDrawOverlay()) { textComponent.setText(plugin.getLocationString()); return textComponent.render(graphics); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java index ba776475ed..b051211fc6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java @@ -16,6 +16,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; @@ -24,11 +26,13 @@ import net.runelite.api.VarClientStr; import net.runelite.api.Varbits; import net.runelite.api.coords.WorldArea; import net.runelite.api.coords.WorldPoint; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.VarClientStrChanged; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; +import net.runelite.client.config.Keybind; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; @@ -46,7 +50,7 @@ import net.runelite.client.util.WildernessLocation; type = PluginType.PVP, enabledByDefault = false ) - +@Singleton public class WildernessLocationsPlugin extends Plugin { @@ -79,7 +83,7 @@ public class WildernessLocationsPlugin extends Plugin private WorldPoint worldPoint = null; private final HashMap wildLocs = getLocationMap(); - private final HotkeyListener hotkeyListener = new HotkeyListener(() -> wildyConfig.keybind()) + private final HotkeyListener hotkeyListener = new HotkeyListener(() -> this.keybind) { @Override public void hotkeyPressed() @@ -88,6 +92,10 @@ public class WildernessLocationsPlugin extends Plugin } }; + @Getter(AccessLevel.PACKAGE) + private boolean drawOverlay; + private Keybind keybind; + @Provides WildernessLocationsConfig getConfig(ConfigManager configManager) { @@ -97,10 +105,25 @@ public class WildernessLocationsPlugin extends Plugin @Override protected void startUp() throws Exception { + this.drawOverlay = wildyConfig.drawOverlay(); + this.keybind = wildyConfig.keybind(); + overlayManager.add(overlay); keyManager.registerKeyListener(hotkeyListener); } + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("wildernesslocations")) + { + return; + } + + this.drawOverlay = wildyConfig.drawOverlay(); + this.keybind = wildyConfig.keybind(); + } + @Override protected void shutDown() throws Exception { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtActivity.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtActivity.java index dadca4137b..bf81e101be 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtActivity.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtActivity.java @@ -25,11 +25,12 @@ */ package net.runelite.client.plugins.wintertodt; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) enum WintertodtActivity { IDLE("IDLE"), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtInterruptType.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtInterruptType.java index db7fe0d416..582cf55ed6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtInterruptType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtInterruptType.java @@ -25,11 +25,12 @@ */ package net.runelite.client.plugins.wintertodt; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) enum WintertodtInterruptType { COLD("Damaged by Wintertodt Cold"), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtOverlay.java index 95dc4a7e42..edf894b549 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtOverlay.java @@ -29,6 +29,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import net.runelite.api.Skill; @@ -44,6 +45,7 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.util.ColorUtil; +@Singleton class WintertodtOverlay extends Overlay { @Inject @@ -53,7 +55,7 @@ class WintertodtOverlay extends Overlay private final PanelComponent panelComponent = new PanelComponent(); @Inject - private WintertodtOverlay(WintertodtPlugin plugin) + private WintertodtOverlay(final WintertodtPlugin plugin) { super(plugin); this.plugin = plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java index 0ad69971f7..a27565a015 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java @@ -26,9 +26,11 @@ package net.runelite.client.plugins.wintertodt; import com.google.inject.Provides; +import java.awt.Color; import java.time.Duration; import java.time.Instant; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -44,6 +46,7 @@ import net.runelite.api.MessageNode; import net.runelite.api.Player; import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.ChatMessage; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.ItemContainerChanged; import net.runelite.client.Notifier; @@ -52,6 +55,7 @@ import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.wintertodt.config.WintertodtNotifyMode; import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.util.ColorUtil; @@ -61,6 +65,7 @@ import net.runelite.client.util.ColorUtil; tags = {"minigame", "firemaking", "boss"} ) @Slf4j +@Singleton public class WintertodtPlugin extends Plugin { private static final int WINTERTODT_REGION = 6462; @@ -100,6 +105,9 @@ public class WintertodtPlugin extends Plugin private Instant lastActionTime; + private WintertodtNotifyMode notifyCondition; + private Color damageNotificationColor; + @Provides WintertodtConfig getConfig(ConfigManager configManager) { @@ -109,6 +117,9 @@ public class WintertodtPlugin extends Plugin @Override protected void startUp() throws Exception { + this.notifyCondition = config.notifyCondition(); + this.damageNotificationColor = config.damageNotificationColor(); + reset(); overlayManager.add(overlay); } @@ -120,6 +131,18 @@ public class WintertodtPlugin extends Plugin reset(); } + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("wintertodt")) + { + return; + } + + this.notifyCondition = config.notifyCondition(); + this.damageNotificationColor = config.damageNotificationColor(); + } + private void reset() { numRoots = 0; @@ -253,7 +276,7 @@ public class WintertodtPlugin extends Plugin wasDamaged = true; // Recolor message for damage notification - messageNode.setRuneLiteFormatMessage(ColorUtil.wrapWithColorTag(messageNode.getValue(), config.damageNotificationColor())); + messageNode.setRuneLiteFormatMessage(ColorUtil.wrapWithColorTag(messageNode.getValue(), this.damageNotificationColor)); chatMessageManager.update(messageNode); client.refreshChat(); @@ -280,7 +303,7 @@ public class WintertodtPlugin extends Plugin { boolean shouldNotify = false; - switch (config.notifyCondition()) + switch (this.notifyCondition) { case ONLY_WHEN_INTERRUPTED: if (wasInterrupted) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/config/WintertodtNotifyMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/config/WintertodtNotifyMode.java index c5a3b114fd..e5c54b7be6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/config/WintertodtNotifyMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/config/WintertodtNotifyMode.java @@ -25,10 +25,11 @@ */ package net.runelite.client.plugins.wintertodt.config; +import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; -@Getter +@Getter(AccessLevel.PACKAGE) @RequiredArgsConstructor public enum WintertodtNotifyMode { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java index 7b8a5c5f4e..709ea85378 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.woodcutting; import com.google.common.collect.ImmutableMap; import java.util.Map; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import static net.runelite.api.AnimationID.WOODCUTTING_3A_AXE; @@ -50,7 +51,7 @@ import static net.runelite.api.ItemID.STEEL_AXE; import static net.runelite.api.ItemID._3RD_AGE_AXE; @AllArgsConstructor -@Getter +@Getter(AccessLevel.PACKAGE) enum Axe { BRONZE(WOODCUTTING_BRONZE, BRONZE_AXE), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Tree.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Tree.java index befc78df8c..dfb670ac5a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Tree.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Tree.java @@ -26,18 +26,19 @@ package net.runelite.client.plugins.woodcutting; import com.google.common.collect.ImmutableMap; import java.util.Map; +import lombok.AccessLevel; import lombok.Getter; import static net.runelite.api.ObjectID.REDWOOD; import static net.runelite.api.ObjectID.REDWOOD_29670; -@Getter +@Getter(AccessLevel.PACKAGE) enum Tree { REDWOOD_TREE_SPAWN(REDWOOD, REDWOOD_29670); private final int[] treeIds; - Tree(int... treeIds) + Tree(final int... treeIds) { this.treeIds = treeIds; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingOverlay.java index 497d9695b4..0aa27918d7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingOverlay.java @@ -28,6 +28,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import net.runelite.api.Skill; @@ -41,22 +42,21 @@ import net.runelite.client.ui.overlay.components.TitleComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; +@Singleton class WoodcuttingOverlay extends Overlay { private final Client client; private final WoodcuttingPlugin plugin; - private final WoodcuttingConfig config; private final XpTrackerService xpTrackerService; private final PanelComponent panelComponent = new PanelComponent(); @Inject - private WoodcuttingOverlay(Client client, WoodcuttingPlugin plugin, WoodcuttingConfig config, XpTrackerService xpTrackerService) + private WoodcuttingOverlay(final Client client, final WoodcuttingPlugin plugin, final XpTrackerService xpTrackerService) { super(plugin); setPosition(OverlayPosition.TOP_LEFT); this.client = client; this.plugin = plugin; - this.config = config; this.xpTrackerService = xpTrackerService; getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Woodcutting overlay")); } @@ -64,7 +64,7 @@ class WoodcuttingOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (!config.showWoodcuttingStats()) + if (!plugin.isShowWoodcuttingStats()) { return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java index 28547b8921..996a13cb30 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java @@ -30,6 +30,8 @@ import java.time.Instant; import java.util.HashSet; import java.util.Set; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; @@ -38,6 +40,7 @@ import net.runelite.api.GameState; import net.runelite.api.Player; import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.ChatMessage; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameObjectChanged; import net.runelite.api.events.GameObjectDespawned; import net.runelite.api.events.GameObjectSpawned; @@ -57,6 +60,7 @@ import net.runelite.client.ui.overlay.OverlayManager; description = "Show woodcutting statistics and/or bird nest notifications", tags = {"birds", "nest", "notifications", "overlay", "skilling", "wc"} ) +@Singleton @PluginDependency(XpTrackerPlugin.class) public class WoodcuttingPlugin extends Plugin { @@ -78,15 +82,22 @@ public class WoodcuttingPlugin extends Plugin @Inject private WoodcuttingConfig config; - @Getter + @Getter(AccessLevel.PACKAGE) private WoodcuttingSession session; - @Getter + @Getter(AccessLevel.PACKAGE) private Axe axe; - @Getter + @Getter(AccessLevel.PACKAGE) private final Set treeObjects = new HashSet<>(); + private int statTimeout; + private boolean showNestNotification; + @Getter(AccessLevel.PACKAGE) + private boolean showWoodcuttingStats; + @Getter(AccessLevel.PACKAGE) + private boolean showRedwoodTrees; + @Provides WoodcuttingConfig getConfig(ConfigManager configManager) { @@ -96,6 +107,8 @@ public class WoodcuttingPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(overlay); overlayManager.add(treesOverlay); } @@ -118,7 +131,7 @@ public class WoodcuttingPlugin extends Plugin return; } - Duration statTimeout = Duration.ofMinutes(config.statTimeout()); + Duration statTimeout = Duration.ofMinutes(this.statTimeout); Duration sinceCut = Duration.between(session.getLastLogCut(), Instant.now()); if (sinceCut.compareTo(statTimeout) >= 0) @@ -143,7 +156,7 @@ public class WoodcuttingPlugin extends Plugin session.setLastLogCut(); } - if (event.getMessage().contains("A bird's nest falls out of the tree") && config.showNestNotification()) + if (event.getMessage().contains("A bird's nest falls out of the tree") && this.showNestNotification) { notifier.notify("A bird nest has spawned!"); } @@ -200,4 +213,23 @@ public class WoodcuttingPlugin extends Plugin this.axe = axe; } } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("woodcutting")) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.statTimeout = config.statTimeout(); + this.showNestNotification = config.showNestNotification(); + this.showWoodcuttingStats = config.showWoodcuttingStats(); + this.showRedwoodTrees = config.showRedwoodTrees(); + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingSession.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingSession.java index ac5d66130e..aaf2919c01 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingSession.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingSession.java @@ -26,16 +26,16 @@ package net.runelite.client.plugins.woodcutting; import java.time.Instant; -public class WoodcuttingSession +class WoodcuttingSession { private Instant lastLogCut; - public void setLastLogCut() + void setLastLogCut() { lastLogCut = Instant.now(); } - public Instant getLastLogCut() + Instant getLastLogCut() { return lastLogCut; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingTreesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingTreesOverlay.java index 2415d17f7a..cf25150169 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingTreesOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingTreesOverlay.java @@ -28,6 +28,7 @@ package net.runelite.client.plugins.woodcutting; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.GameObject; import net.runelite.client.game.ItemManager; @@ -36,18 +37,17 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; +@Singleton class WoodcuttingTreesOverlay extends Overlay { private final Client client; - private final WoodcuttingConfig config; private final ItemManager itemManager; private final WoodcuttingPlugin plugin; @Inject - private WoodcuttingTreesOverlay(final Client client, final WoodcuttingConfig config, final ItemManager itemManager, final WoodcuttingPlugin plugin) + private WoodcuttingTreesOverlay(final Client client, final ItemManager itemManager, final WoodcuttingPlugin plugin) { this.client = client; - this.config = config; this.itemManager = itemManager; this.plugin = plugin; setLayer(OverlayLayer.ABOVE_SCENE); @@ -57,7 +57,7 @@ class WoodcuttingTreesOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (plugin.getSession() == null || !config.showRedwoodTrees()) + if (plugin.getSession() == null || !plugin.isShowRedwoodTrees()) { return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java index 84abfcf9f5..1ee270ed2c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java @@ -44,6 +44,7 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import javax.imageio.ImageIO; import javax.inject.Inject; +import javax.inject.Singleton; import javax.swing.SwingUtilities; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -65,12 +66,12 @@ import net.runelite.api.events.PlayerMenuOptionClicked; import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.WorldListLoad; import net.runelite.api.widgets.WidgetInfo; -import net.runelite.client.callback.ClientThread; import net.runelite.client.chat.ChatColorType; import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.QueuedMessage; import net.runelite.client.config.ConfigManager; +import net.runelite.client.config.Keybind; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; @@ -93,6 +94,7 @@ import org.apache.commons.lang3.ArrayUtils; description = "Allows you to quickly hop worlds" ) @Slf4j +@Singleton public class WorldHopperPlugin extends Plugin { private static final int WORLD_FETCH_TIMER = 10; @@ -110,9 +112,6 @@ public class WorldHopperPlugin extends Plugin @Inject private Client client; - @Inject - private ClientThread clientThread; - @Inject private ConfigManager configManager; @@ -149,7 +148,15 @@ public class WorldHopperPlugin extends Plugin private Instant lastFetch; private boolean firstRun; - private final HotkeyListener previousKeyListener = new HotkeyListener(() -> config.previousKey()) + private Keybind previousKey; + private Keybind nextKey; + private boolean quickhopOutOfDanger; + private boolean showSidebar; + private boolean ping; + private boolean showWorldHopMessage; + private SubscriptionFilterMode subscriptionFilter; + + private final HotkeyListener previousKeyListener = new HotkeyListener(() -> this.previousKey) { @Override public void hotkeyPressed() @@ -157,7 +164,7 @@ public class WorldHopperPlugin extends Plugin hop(true); } }; - private final HotkeyListener nextKeyListener = new HotkeyListener(() -> config.nextKey()) + private final HotkeyListener nextKeyListener = new HotkeyListener(() -> this.nextKey) { @Override public void hotkeyPressed() @@ -175,6 +182,8 @@ public class WorldHopperPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + firstRun = true; keyManager.registerKeyListener(previousKeyListener); @@ -195,12 +204,12 @@ public class WorldHopperPlugin extends Plugin .panel(panel) .build(); - if (config.showSidebar()) + if (this.showSidebar) { clientToolbar.addNavigation(navButton); } - panel.setFilterMode(config.subscriptionFilter()); + panel.setFilterMode(this.subscriptionFilter); worldResultFuture = executorService.scheduleAtFixedRate(this::tick, 0, WORLD_FETCH_TIMER, TimeUnit.MINUTES); hopperExecutorService = new ExecutorServiceExceptionLogger(Executors.newSingleThreadScheduledExecutor()); @@ -232,10 +241,12 @@ public class WorldHopperPlugin extends Plugin { if (event.getGroup().equals(WorldHopperConfig.GROUP)) { + updateConfig(); + switch (event.getKey()) { case "showSidebar": - if (config.showSidebar()) + if (this.showSidebar) { clientToolbar.addNavigation(navButton); } @@ -245,7 +256,7 @@ public class WorldHopperPlugin extends Plugin } break; case "ping": - if (config.ping()) + if (this.ping) { SwingUtilities.invokeLater(() -> panel.showPing()); } @@ -255,7 +266,7 @@ public class WorldHopperPlugin extends Plugin } break; case "subscriptionFilter": - panel.setFilterMode(config.subscriptionFilter()); + panel.setFilterMode(this.subscriptionFilter); updateList(); break; } @@ -409,7 +420,7 @@ public class WorldHopperPlugin extends Plugin public void onGameStateChanged(GameStateChanged gameStateChanged) { // If the player has disabled the side bar plugin panel, do not update the UI - if (config.showSidebar() && gameStateChanged.getGameState() == GameState.LOGGED_IN) + if (this.showSidebar && gameStateChanged.getGameState() == GameState.LOGGED_IN) { if (lastWorld != client.getWorld()) { @@ -423,7 +434,7 @@ public class WorldHopperPlugin extends Plugin @Subscribe public void onWorldListLoad(WorldListLoad worldListLoad) { - if (!config.showSidebar()) + if (!this.showSidebar) { return; } @@ -516,7 +527,7 @@ public class WorldHopperPlugin extends Plugin EnumSet currentWorldTypes = currentWorld.getTypes().clone(); // Make it so you always hop out of PVP and high risk worlds - if (config.quickhopOutOfDanger()) + if (this.quickhopOutOfDanger) { currentWorldTypes.remove(WorldType.PVP); currentWorldTypes.remove(WorldType.HIGH_RISK); @@ -634,7 +645,7 @@ public class WorldHopperPlugin extends Plugin return; } - if (config.showWorldHopMessage()) + if (this.showWorldHopMessage) { String chatMessage = new ChatMessageBuilder() .append(ChatColorType.NORMAL) @@ -752,7 +763,7 @@ public class WorldHopperPlugin extends Plugin private void pingWorlds() { - if (worldResult == null || !config.showSidebar() || !config.ping()) + if (worldResult == null || !this.showSidebar || !this.ping) { return; } @@ -769,4 +780,15 @@ public class WorldHopperPlugin extends Plugin log.debug("Done pinging worlds in {}", stopwatch.elapsed()); } + + private void updateConfig() + { + this.previousKey = config.previousKey(); + this.nextKey = config.nextKey(); + this.quickhopOutOfDanger = config.quickhopOutOfDanger(); + this.showSidebar = config.showSidebar(); + this.ping = config.ping(); + this.showWorldHopMessage = config.showWorldHopMessage(); + this.subscriptionFilter = config.subscriptionFilter(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java index 27eb29b321..bb5fbda991 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java @@ -33,6 +33,7 @@ import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.List; import java.util.Map; +import javax.inject.Singleton; import javax.swing.JPanel; import javax.swing.SwingUtilities; import lombok.AccessLevel; @@ -45,6 +46,7 @@ import net.runelite.http.api.worlds.World; import net.runelite.http.api.worlds.WorldType; @Slf4j +@Singleton class WorldSwitcherPanel extends PluginPanel { private static final Color ODD_ROW = new Color(44, 44, 44); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java index 25d0cc9f9a..a1ad1e76b7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java @@ -31,6 +31,7 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.image.BufferedImage; import javax.annotation.Nonnull; +import javax.inject.Singleton; import javax.swing.BorderFactory; import javax.swing.ImageIcon; import javax.swing.JLabel; @@ -43,6 +44,7 @@ import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.FontManager; import net.runelite.client.util.ImageUtil; +@Singleton class WorldTableHeader extends JPanel { private static final ImageIcon ARROW_UP; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java index 3133a81a4f..7aa7eb12b1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java @@ -32,6 +32,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.function.BiConsumer; import java.util.function.Consumer; +import javax.inject.Singleton; import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.JMenuItem; @@ -45,6 +46,7 @@ import net.runelite.client.util.ImageUtil; import net.runelite.http.api.worlds.World; import net.runelite.http.api.worlds.WorldType; +@Singleton class WorldTableRow extends JPanel { private static final ImageIcon FLAG_AUS; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/ping/IcmpEchoReply.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/ping/IcmpEchoReply.java index 0e1cc198a3..75a7e4226c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/ping/IcmpEchoReply.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/ping/IcmpEchoReply.java @@ -47,7 +47,7 @@ public class IcmpEchoReply extends Structure public WinDef.UCHAR optionsSize; public WinDef.PVOID optionsData; - IcmpEchoReply(Pointer p) + IcmpEchoReply(final Pointer p) { super(p); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapPlugin.java index d5be4c8591..7f8a0ec744 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapPlugin.java @@ -127,6 +127,24 @@ public class WorldMapPlugin extends Plugin private int agilityLevel = 0; private int woodcuttingLevel = 0; + private boolean fairyRingTooltips; + private boolean fairyRingIcon; + private boolean agilityShortcutTooltips; + private boolean agilityShortcutLevelIcon; + private boolean normalTeleportIcon; + private boolean minigameTooltip; + private boolean ancientTeleportIcon; + private boolean lunarTeleportIcon; + private boolean arceuusTeleportIcon; + private boolean jewelleryTeleportIcon; + private boolean scrollTeleportIcon; + private boolean miscellaneousTeleportIcon; + private boolean questStartTooltips; + private boolean farmingPatchTooltips; + private boolean rareTreeTooltips; + private boolean rareTreeLevelIcon; + private boolean transportationTeleportTooltips; + @Provides WorldMapConfig provideConfig(ConfigManager configManager) { @@ -136,6 +154,7 @@ public class WorldMapPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); agilityLevel = client.getRealSkillLevel(Skill.AGILITY); woodcuttingLevel = client.getRealSkillLevel(Skill.WOODCUTTING); updateShownIcons(); @@ -164,6 +183,7 @@ public class WorldMapPlugin extends Plugin return; } + updateConfig(); updateShownIcons(); } @@ -206,13 +226,13 @@ public class WorldMapPlugin extends Plugin { worldMapPointManager.removeIf(AgilityShortcutPoint.class::isInstance); - if (config.agilityShortcutLevelIcon() || config.agilityShortcutTooltips()) + if (this.agilityShortcutLevelIcon || this.agilityShortcutTooltips) { Arrays.stream(AgilityShortcut.values()) .filter(value -> value.getWorldMapLocation() != null) .map(value -> new AgilityShortcutPoint(value, - agilityLevel > 0 && config.agilityShortcutLevelIcon() && value.getLevel() > agilityLevel ? NOPE_ICON : BLANK_ICON, - config.agilityShortcutTooltips())) + agilityLevel > 0 && this.agilityShortcutLevelIcon && value.getLevel() > agilityLevel ? NOPE_ICON : BLANK_ICON, + this.agilityShortcutTooltips)) .forEach(worldMapPointManager::add); } } @@ -221,15 +241,15 @@ public class WorldMapPlugin extends Plugin { worldMapPointManager.removeIf(RareTreePoint.class::isInstance); - if (config.rareTreeLevelIcon() || config.rareTreeTooltips()) + if (this.rareTreeLevelIcon || this.rareTreeTooltips) { Arrays.stream(RareTreeLocation.values()).forEach(rareTree -> Arrays.stream(rareTree.getLocations()) .map(point -> new RareTreePoint(point, rareTree.getTooltip(), - woodcuttingLevel > 0 && config.rareTreeLevelIcon() && + woodcuttingLevel > 0 && this.rareTreeLevelIcon && rareTree.getLevelReq() > woodcuttingLevel ? NOPE_ICON : BLANK_ICON, - config.rareTreeTooltips())) + this.rareTreeTooltips)) .forEach(worldMapPointManager::add)); } } @@ -241,17 +261,17 @@ public class WorldMapPlugin extends Plugin updateQuestStartPointIcons(); worldMapPointManager.removeIf(FairyRingPoint.class::isInstance); - if (config.fairyRingIcon() || config.fairyRingTooltips()) + if (this.fairyRingIcon || this.fairyRingTooltips) { Arrays.stream(FairyRingLocation.values()) .map(value -> new FairyRingPoint(value, - config.fairyRingIcon() ? FAIRY_TRAVEL_ICON : BLANK_ICON, - config.fairyRingTooltips())) + this.fairyRingIcon ? FAIRY_TRAVEL_ICON : BLANK_ICON, + this.fairyRingTooltips)) .forEach(worldMapPointManager::add); } worldMapPointManager.removeIf(MinigamePoint.class::isInstance); - if (config.minigameTooltip()) + if (this.minigameTooltip) { Arrays.stream(MinigameLocation.values()) .map(value -> new MinigamePoint(value, BLANK_ICON)) @@ -259,7 +279,7 @@ public class WorldMapPlugin extends Plugin } worldMapPointManager.removeIf(TransportationPoint.class::isInstance); - if (config.transportationTeleportTooltips()) + if (this.transportationTeleportTooltips) { Arrays.stream(TransportationPointLocation.values()) .map(value -> new TransportationPoint(value, BLANK_ICON)) @@ -267,7 +287,7 @@ public class WorldMapPlugin extends Plugin } worldMapPointManager.removeIf(FarmingPatchPoint.class::isInstance); - if (config.farmingPatchTooltips()) + if (this.farmingPatchTooltips) { Arrays.stream(FarmingPatchLocation.values()).forEach(location -> Arrays.stream(location.getLocations()) @@ -283,19 +303,19 @@ public class WorldMapPlugin extends Plugin switch (data.getType()) { case NORMAL_MAGIC: - return config.normalTeleportIcon(); + return this.normalTeleportIcon; case ANCIENT_MAGICKS: - return config.ancientTeleportIcon(); + return this.ancientTeleportIcon; case LUNAR_MAGIC: - return config.lunarTeleportIcon(); + return this.lunarTeleportIcon; case ARCEUUS_MAGIC: - return config.arceuusTeleportIcon(); + return this.arceuusTeleportIcon; case JEWELLERY: - return config.jewelleryTeleportIcon(); + return this.jewelleryTeleportIcon; case SCROLL: - return config.scrollTeleportIcon(); + return this.scrollTeleportIcon; case OTHER: - return config.miscellaneousTeleportIcon(); + return this.miscellaneousTeleportIcon; default: return false; } @@ -307,7 +327,7 @@ public class WorldMapPlugin extends Plugin { worldMapPointManager.removeIf(QuestStartPoint.class::isInstance); - if (!config.questStartTooltips()) + if (!this.questStartTooltips) { return; } @@ -333,11 +353,11 @@ public class WorldMapPlugin extends Plugin // Get first uncompleted quest. Else, return the last quest. Quest quest = null; - for (int i = 0; i < quests.length; i++) + for (Quest value : quests) { - if (quests[i].getState(client) != QuestState.FINISHED) + if (value.getState(client) != QuestState.FINISHED) { - quest = quests[i]; + quest = value; break; } } @@ -370,4 +390,25 @@ public class WorldMapPlugin extends Plugin return new QuestStartPoint(data.getLocation(), icon, tooltip); } + + private void updateConfig() + { + this.fairyRingTooltips = config.fairyRingTooltips(); + this.fairyRingIcon = config.fairyRingIcon(); + this.agilityShortcutTooltips = config.agilityShortcutTooltips(); + this.agilityShortcutLevelIcon = config.agilityShortcutLevelIcon(); + this.normalTeleportIcon = config.normalTeleportIcon(); + this.minigameTooltip = config.minigameTooltip(); + this.ancientTeleportIcon = config.ancientTeleportIcon(); + this.lunarTeleportIcon = config.lunarTeleportIcon(); + this.arceuusTeleportIcon = config.arceuusTeleportIcon(); + this.jewelleryTeleportIcon = config.jewelleryTeleportIcon(); + this.scrollTeleportIcon = config.scrollTeleportIcon(); + this.miscellaneousTeleportIcon = config.miscellaneousTeleportIcon(); + this.questStartTooltips = config.questStartTooltips(); + this.farmingPatchTooltips = config.farmingPatchTooltips(); + this.rareTreeTooltips = config.rareTreeTooltips(); + this.rareTreeLevelIcon = config.rareTreeLevelIcon(); + this.transportationTeleportTooltips = config.transportationTeleportTooltips(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobe.java b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobe.java index 51d0e1328d..68ffee0499 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobe.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobe.java @@ -25,13 +25,14 @@ package net.runelite.client.plugins.xpglobes; import java.time.Instant; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; import net.runelite.api.Skill; -@Getter -@Setter +@Getter(AccessLevel.PACKAGE) +@Setter(AccessLevel.PACKAGE) @AllArgsConstructor class XpGlobe { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java index 942ccd2988..4d6d53ad36 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java @@ -37,8 +37,10 @@ import java.awt.geom.Ellipse2D; import java.awt.image.BufferedImage; import java.text.DecimalFormat; import java.time.Instant; +import java.util.Comparator; import java.util.List; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.api.Client; import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG; import net.runelite.api.Point; @@ -56,6 +58,7 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.util.ColorUtil; +@Singleton public class XpGlobesOverlay extends Overlay { private static final int MINIMUM_STEP = 10; @@ -66,24 +69,22 @@ public class XpGlobesOverlay extends Overlay private final Client client; private final XpGlobesPlugin plugin; - private final XpGlobesConfig config; private final XpTrackerService xpTrackerService; private final PanelComponent xpTooltip = new PanelComponent(); private final SkillIconManager iconManager; @Inject private XpGlobesOverlay( - Client client, - XpGlobesPlugin plugin, - XpGlobesConfig config, - XpTrackerService xpTrackerService, - SkillIconManager iconManager) + final Client client, + final XpGlobesPlugin plugin, + final XpTrackerService xpTrackerService, + final SkillIconManager iconManager) { super(plugin); this.iconManager = iconManager; this.client = client; this.plugin = plugin; - this.config = config; + this.xpTrackerService = xpTrackerService; setPosition(OverlayPosition.TOP_CENTER); getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "XP Globes overlay")); @@ -99,7 +100,7 @@ public class XpGlobesOverlay extends Overlay } final List sortedXpGlobes = plugin.getXpGlobes(); - sortedXpGlobes.sort((a, b) -> a.getSkill().compareTo(b.getSkill())); + sortedXpGlobes.sort(Comparator.comparing(XpGlobe::getSkill)); int curDrawX = 0; for (final XpGlobe xpGlobe : sortedXpGlobes) @@ -107,12 +108,12 @@ public class XpGlobesOverlay extends Overlay int startXp = xpTrackerService.getStartGoalXp(xpGlobe.getSkill()); int goalXp = xpTrackerService.getEndGoalXp(xpGlobe.getSkill()); renderProgressCircle(graphics, xpGlobe, startXp, goalXp, curDrawX, 0, getBounds()); - curDrawX += MINIMUM_STEP + config.xpOrbSize(); + curDrawX += MINIMUM_STEP + plugin.getXpOrbSize(); } // Get width of markers - final int markersLength = (queueSize * (config.xpOrbSize())) + ((MINIMUM_STEP) * (queueSize - 1)); - return new Dimension(markersLength, config.xpOrbSize()); + final int markersLength = (queueSize * (plugin.getXpOrbSize())) + ((MINIMUM_STEP) * (queueSize - 1)); + return new Dimension(markersLength, plugin.getXpOrbSize()); } private double getSkillProgress(int startXp, int currentXp, int goalXp) @@ -150,7 +151,7 @@ public class XpGlobesOverlay extends Overlay drawProgressLabel(graphics, skillToDraw, startXp, goalXp, x, y); - if (config.enableTooltips()) + if (plugin.isEnableTooltips()) { drawTooltip(graphics, skillToDraw, goalXp, backgroundCircle); } @@ -161,18 +162,18 @@ public class XpGlobesOverlay extends Overlay drawProgressArc( graphics, x, y, - config.xpOrbSize(), config.xpOrbSize(), + plugin.getXpOrbSize(), plugin.getXpOrbSize(), PROGRESS_RADIUS_REMAINDER, radiusToGoalXp, 5, - config.progressOrbOutLineColor() + plugin.getProgressOrbOutLineColor() ); drawProgressArc( graphics, x, y, - config.xpOrbSize(), config.xpOrbSize(), + plugin.getXpOrbSize(), plugin.getXpOrbSize(), PROGRESS_RADIUS_START, radiusCurrentXp, - config.progressArcStrokeWidth(), - config.enableCustomArcColor() ? config.progressArcColor() : SkillColor.find(skillToDraw.getSkill()).getColor()); + plugin.getProgressArcStrokeWidth(), + plugin.isEnableCustomArcColor() ? plugin.getProgressArcColor() : SkillColor.find(skillToDraw.getSkill()).getColor()); } private void drawProgressLabel(Graphics2D graphics, XpGlobe globe, int startXp, int goalXp, int x, int y) @@ -186,8 +187,8 @@ public class XpGlobesOverlay extends Overlay String progress = (int) (getSkillProgress(startXp, globe.getCurrentXp(), goalXp)) + "%"; final FontMetrics metrics = graphics.getFontMetrics(); - int drawX = x + (config.xpOrbSize() / 2) - (metrics.stringWidth(progress) / 2); - int drawY = y + (config.xpOrbSize() / 2) + (metrics.getHeight() / 2) - metrics.getMaxDescent(); + int drawX = x + (plugin.getXpOrbSize() / 2) - (metrics.stringWidth(progress) / 2); + int drawY = y + (plugin.getXpOrbSize() / 2) + (metrics.getHeight() / 2) - metrics.getMaxDescent(); OverlayUtil.renderTextLocation(graphics, new Point(drawX, drawY), progress, Color.WHITE); } @@ -207,8 +208,8 @@ public class XpGlobesOverlay extends Overlay private Ellipse2D drawEllipse(Graphics2D graphics, int x, int y) { - graphics.setColor(config.progressOrbBackgroundColor()); - Ellipse2D ellipse = new Ellipse2D.Double(x, y, config.xpOrbSize(), config.xpOrbSize()); + graphics.setColor(plugin.getProgressOrbBackgroundColor()); + Ellipse2D ellipse = new Ellipse2D.Double(x, y, plugin.getXpOrbSize(), plugin.getXpOrbSize()); graphics.fill(ellipse); graphics.draw(ellipse); return ellipse; @@ -225,8 +226,8 @@ public class XpGlobesOverlay extends Overlay graphics.drawImage( skillImage, - x + (config.xpOrbSize() / 2) - (skillImage.getWidth() / 2), - y + (config.xpOrbSize() / 2) - (skillImage.getHeight() / 2), + x + (plugin.getXpOrbSize() / 2) - (skillImage.getWidth() / 2), + y + (plugin.getXpOrbSize() / 2) - (skillImage.getHeight() / 2), null ); } @@ -234,8 +235,8 @@ public class XpGlobesOverlay extends Overlay private void drawTooltip(Graphics2D graphics, XpGlobe mouseOverSkill, int goalXp, Ellipse2D drawnGlobe) { //draw tooltip under the globe of the mouse location - int x = (int) drawnGlobe.getX() - (TOOLTIP_RECT_SIZE_X / 2) + (config.xpOrbSize() / 2); - int y = (int) drawnGlobe.getY() + config.xpOrbSize() + 10; + int x = (int) drawnGlobe.getX() - (TOOLTIP_RECT_SIZE_X / 2) + (plugin.getXpOrbSize() / 2); + int y = (int) drawnGlobe.getY() + plugin.getXpOrbSize() + 10; // reset the timer on XpGlobe to prevent it from disappearing while hovered over it mouseOverSkill.setTime(Instant.now()); @@ -279,7 +280,7 @@ public class XpGlobesOverlay extends Overlay tableComponent.addRow(ColorUtil.prependColorTag("XP per hour:", Color.ORANGE), xpHrString); } - if (config.enableTimeToLevel()) + if (plugin.isEnableTimeToLevel()) { String timeLeft = xpTrackerService.getTimeTillGoal(mouseOverSkill.getSkill()); tableComponent.addRow(ColorUtil.prependColorTag("TimeLeft:", Color.ORANGE), timeLeft); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java index 2771c986f5..591543e137 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java @@ -25,16 +25,20 @@ package net.runelite.client.plugins.xpglobes; import com.google.inject.Provides; +import java.awt.Color; import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.Experience; import net.runelite.api.Skill; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.ExperienceChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.client.config.ConfigManager; @@ -52,6 +56,7 @@ import net.runelite.client.ui.overlay.OverlayManager; tags = {"experience", "levels", "overlay"}, enabledByDefault = false ) +@Singleton @PluginDependency(XpTrackerPlugin.class) public class XpGlobesPlugin extends Plugin { @@ -74,6 +79,25 @@ public class XpGlobesPlugin extends Plugin @Inject private XpGlobesOverlay overlay; + @Getter(AccessLevel.PACKAGE) + private boolean enableTooltips; + private boolean hideMaxed; + @Getter(AccessLevel.PACKAGE) + private boolean enableTimeToLevel; + @Getter(AccessLevel.PACKAGE) + private boolean enableCustomArcColor; + @Getter(AccessLevel.PACKAGE) + private Color progressArcColor; + @Getter(AccessLevel.PACKAGE) + private Color progressOrbOutLineColor; + @Getter(AccessLevel.PACKAGE) + private Color progressOrbBackgroundColor; + @Getter(AccessLevel.PACKAGE) + private int progressArcStrokeWidth; + @Getter(AccessLevel.PACKAGE) + private int xpOrbSize; + private int xpOrbDuration; + @Provides XpGlobesConfig getConfig(ConfigManager configManager) { @@ -83,6 +107,7 @@ public class XpGlobesPlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); overlayManager.add(overlay); } @@ -107,7 +132,7 @@ public class XpGlobesPlugin extends Plugin return; } - if (config.hideMaxed() && currentLevel >= Experience.MAX_REAL_LEVEL) + if (this.hideMaxed && currentLevel >= Experience.MAX_REAL_LEVEL) { return; } @@ -156,7 +181,7 @@ public class XpGlobesPlugin extends Plugin { XpGlobe globe = it.next(); Instant globeCreationTime = globe.getTime(); - if (currentTime.isBefore(globeCreationTime.plusSeconds(config.xpOrbDuration()))) + if (currentTime.isBefore(globeCreationTime.plusSeconds(this.xpOrbDuration))) { //if a globe is not expired, stop checking newer globes return; @@ -184,4 +209,31 @@ public class XpGlobesPlugin extends Plugin } } + + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("xpglobes")) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.enableTooltips = config.enableTooltips(); + this.hideMaxed = config.hideMaxed(); + this.enableTimeToLevel = config.enableTimeToLevel(); + this.enableCustomArcColor = config.enableCustomArcColor(); + this.progressArcColor = config.progressArcColor(); + this.progressOrbOutLineColor = config.progressOrbOutLineColor(); + this.progressOrbBackgroundColor = config.progressOrbBackgroundColor(); + this.progressArcStrokeWidth = config.progressArcStrokeWidth(); + this.xpOrbSize = config.xpOrbSize(); + this.xpOrbDuration = config.xpOrbDuration(); + + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java index d0d157c480..4b6142b1d8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java @@ -75,6 +75,7 @@ class XpInfoBox extends JPanel // Instance members private final JPanel panel; + private final XpTrackerPlugin plugin; @Getter(AccessLevel.PACKAGE) private final Skill skill; @@ -98,8 +99,6 @@ class XpInfoBox extends JPanel private final JMenuItem pauseSkill = new JMenuItem("Pause"); private final JMenuItem canvasItem = new JMenuItem(ADD_STATE); - private final XpTrackerConfig xpTrackerConfig; - private boolean paused = false; private Style style = Style.FULL; @@ -110,9 +109,9 @@ class XpInfoBox extends JPanel SIMPLE } - XpInfoBox(XpTrackerPlugin xpTrackerPlugin, XpTrackerConfig xpTrackerConfig, Client client, JPanel panel, Skill skill, SkillIconManager iconManager) + XpInfoBox(XpTrackerPlugin xpTrackerPlugin, Client client, JPanel panel, Skill skill, SkillIconManager iconManager) { - this.xpTrackerConfig = xpTrackerConfig; + this.plugin = xpTrackerPlugin; this.panel = panel; this.skill = skill; @@ -276,7 +275,7 @@ class XpInfoBox extends JPanel : "Lvl. " + xpSnapshotSingle.getEndLevel()); // Add intermediate level positions to progressBar - if (xpTrackerConfig.showIntermediateLevels() && xpSnapshotSingle.getEndLevel() - xpSnapshotSingle.getStartLevel() > 1) + if (plugin.isShowIntermediateLevels() && xpSnapshotSingle.getEndLevel() - xpSnapshotSingle.getStartLevel() > 1) { final List positions = new ArrayList<>(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBoxOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBoxOverlay.java index 2f07d07389..e31fa0a13b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBoxOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBoxOverlay.java @@ -59,7 +59,6 @@ class XpInfoBoxOverlay extends Overlay private final PanelComponent panel = new PanelComponent(); private final PanelComponent iconXpSplitPanel = new PanelComponent(); private final XpTrackerPlugin plugin; - private final XpTrackerConfig config; @Getter(AccessLevel.PACKAGE) private final Skill skill; @@ -67,13 +66,11 @@ class XpInfoBoxOverlay extends Overlay XpInfoBoxOverlay( XpTrackerPlugin plugin, - XpTrackerConfig config, Skill skill, BufferedImage icon) { super(plugin); this.plugin = plugin; - this.config = config; this.skill = skill; this.icon = icon; panel.setBorder(new Rectangle(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE)); @@ -99,7 +96,7 @@ class XpInfoBoxOverlay extends Overlay final String leftStr; final int rightNum; - switch (config.onScreenDisplayMode()) + switch (plugin.getOnScreenDisplayMode()) { case ACTIONS_DONE: leftStr = snapshot.getActionType().getLabel() + " Done"; @@ -128,7 +125,7 @@ class XpInfoBoxOverlay extends Overlay final String bottemLeftStr; final int bottomRightNum; - switch (config.onScreenDisplayModeBottom()) + switch (plugin.getOnScreenDisplayModeBottom()) { case ACTIONS_HOUR: bottemLeftStr = snapshot.getActionType().getLabel() + "/Hour"; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPanel.java index d716f12630..f456958292 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPanel.java @@ -62,7 +62,7 @@ class XpPanel extends PluginPanel /* This displays the "No exp gained" text */ private final PluginErrorPanel errorPanel = new PluginErrorPanel(); - XpPanel(XpTrackerPlugin xpTrackerPlugin, XpTrackerConfig xpTrackerConfig, Client client, SkillIconManager iconManager) + XpPanel(XpTrackerPlugin xpTrackerPlugin, Client client, SkillIconManager iconManager) { super(); @@ -134,7 +134,7 @@ class XpPanel extends PluginPanel { break; } - infoBoxes.put(skill, new XpInfoBox(xpTrackerPlugin, xpTrackerConfig, client, infoBoxPanel, skill, iconManager)); + infoBoxes.put(skill, new XpInfoBox(xpTrackerPlugin, client, infoBoxPanel, skill, iconManager)); } errorPanel.setContent("Exp trackers", "You have not gained experience yet."); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java index 68663a896f..f592cdc166 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java @@ -35,6 +35,8 @@ import java.util.EnumSet; import java.util.List; import java.util.Objects; import javax.inject.Inject; +import lombok.AccessLevel; +import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Actor; import net.runelite.api.Client; @@ -45,6 +47,7 @@ import net.runelite.api.Player; import net.runelite.api.Skill; import net.runelite.api.VarPlayer; import net.runelite.api.WorldType; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.ExperienceChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; @@ -114,6 +117,16 @@ public class XpTrackerPlugin extends Plugin private final XpState xpState = new XpState(); private final XpPauseState xpPauseState = new XpPauseState(); + private boolean hideMaxed; + private boolean pauseOnLogout; + @Getter(AccessLevel.PACKAGE) + private boolean showIntermediateLevels; + private int pauseSkillAfter; + @Getter(AccessLevel.PACKAGE) + private XpTrackerConfig.OnScreenDisplayMode onScreenDisplayMode; + @Getter(AccessLevel.PACKAGE) + private XpTrackerConfig.OnScreenDisplayModeBottom onScreenDisplayModeBottom; + @Provides XpTrackerConfig provideConfig(ConfigManager configManager) { @@ -129,7 +142,9 @@ public class XpTrackerPlugin extends Plugin @Override protected void startUp() throws Exception { - xpPanel = new XpPanel(this, xpTrackerConfig, client, skillIconManager); + updateConfig(); + + xpPanel = new XpPanel(this, client, skillIconManager); final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "/skill_icons/overall.png"); @@ -221,7 +236,7 @@ public class XpTrackerPlugin extends Plugin void addOverlay(Skill skill) { removeOverlay(skill); - overlayManager.add(new XpInfoBoxOverlay(this, xpTrackerConfig, skill, skillIconManager.getSkillImage(skill))); + overlayManager.add(new XpInfoBoxOverlay(this, skill, skillIconManager.getSkillImage(skill))); } /** @@ -314,7 +329,7 @@ public class XpTrackerPlugin extends Plugin final int startGoalXp = startGoal != null ? client.getVar(startGoal) : -1; final int endGoalXp = endGoal != null ? client.getVar(endGoal) : -1; - if (xpTrackerConfig.hideMaxed() && currentLevel >= Experience.MAX_REAL_LEVEL) + if (this.hideMaxed && currentLevel >= Experience.MAX_REAL_LEVEL) { return; } @@ -511,10 +526,10 @@ public class XpTrackerPlugin extends Plugin skillExperience = client.getSkillExperience(skill); } - xpPauseState.tickXp(skill, skillExperience, xpTrackerConfig.pauseSkillAfter()); + xpPauseState.tickXp(skill, skillExperience, this.pauseSkillAfter); } - xpPauseState.tickLogout(xpTrackerConfig.pauseOnLogout(), !GameState.LOGIN_SCREEN.equals(client.getGameState())); + xpPauseState.tickLogout(this.pauseOnLogout, !GameState.LOGIN_SCREEN.equals(client.getGameState())); if (lastTickMillis == 0) { @@ -563,4 +578,25 @@ public class XpTrackerPlugin extends Plugin pauseSkill(skill, pause); } } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("xpTracker")) + { + return; + } + + updateConfig(); + } + + private void updateConfig() + { + this.hideMaxed = xpTrackerConfig.hideMaxed(); + this.pauseOnLogout = xpTrackerConfig.pauseOnLogout(); + this.showIntermediateLevels = xpTrackerConfig.showIntermediateLevels(); + this.pauseSkillAfter = xpTrackerConfig.pauseSkillAfter(); + this.onScreenDisplayMode = xpTrackerConfig.onScreenDisplayMode(); + this.onScreenDisplayModeBottom = xpTrackerConfig.onScreenDisplayModeBottom(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ImagePanelComponent.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ImagePanelComponent.java index dae0a1e354..bb7bf6a80e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ImagePanelComponent.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ImagePanelComponent.java @@ -36,10 +36,13 @@ import java.awt.Point; import java.awt.Rectangle; import java.awt.image.BufferedImage; import javax.annotation.Nullable; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Setter; import net.runelite.client.ui.overlay.RenderableEntity; import net.runelite.client.ui.overlay.components.BackgroundComponent; +@Singleton public class ImagePanelComponent implements RenderableEntity { private static final int TOP_BORDER = 3; @@ -47,20 +50,20 @@ public class ImagePanelComponent implements RenderableEntity private static final int BOTTOM_BORDER = 6; private static final int SEPARATOR = 4; - @Setter + @Setter(AccessLevel.PUBLIC) @Nullable private String title; - @Setter + @Setter(AccessLevel.PACKAGE) private Color titleColor = Color.WHITE; - @Setter + @Setter(AccessLevel.PUBLIC) private Color backgroundColor = new Color(70, 61, 50, 156); - @Setter + @Setter(AccessLevel.PUBLIC) private BufferedImage image; - @Setter + @Setter(AccessLevel.PACKAGE) private Point position = new Point(); @Override diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/TextComponent.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/TextComponent.java index 043916c147..ed0e737ef2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/TextComponent.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/TextComponent.java @@ -32,18 +32,19 @@ import java.awt.Dimension; import java.awt.FontMetrics; import java.awt.Graphics2D; import java.awt.Point; +import lombok.AccessLevel; import lombok.Setter; import net.runelite.client.ui.overlay.RenderableEntity; public class TextComponent implements RenderableEntity { - @Setter + @Setter(AccessLevel.PACKAGE) private String text; - @Setter + @Setter(AccessLevel.PACKAGE) private Point position = new Point(); - @Setter + @Setter(AccessLevel.PACKAGE) private Color color = Color.WHITE; @Override diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahConfig.java index 2911317a38..539a15cbc8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahConfig.java @@ -36,19 +36,9 @@ import net.runelite.client.config.ConfigItem; public interface ZulrahConfig extends Config { @ConfigItem( - keyName = "enabled", - name = "Enabled", - description = "Configures whether or not zulrah overlays are displayed" - ) - default boolean enabled() - { - return true; - } - - @ConfigItem( - keyName = "sounds", - name = "Sounds Enabled", - description = "Configures whether client sounds are enabled for zulrah" + keyName = "sounds", + name = "Sounds Enabled", + description = "Configures whether client sounds are enabled for zulrah" ) default boolean sounds() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahInstance.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahInstance.java index e701cd65f6..fdbff52358 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahInstance.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahInstance.java @@ -65,7 +65,7 @@ public class ZulrahInstance private int stage; private ZulrahPhase phase; - public ZulrahInstance(NPC zulrah) + ZulrahInstance(final NPC zulrah) { this.startLocation = zulrah.getLocalLocation(); } @@ -85,12 +85,12 @@ public class ZulrahInstance this.pattern = pattern; } - public int getStage() + int getStage() { return stage; } - public void nextStage() + void nextStage() { ++stage; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java index 366d636e94..c8551b1d0f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java @@ -29,6 +29,8 @@ package net.runelite.client.plugins.zulrah; import com.google.inject.Provides; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Actor; @@ -68,6 +70,7 @@ import net.runelite.client.ui.overlay.OverlayManager; enabledByDefault = false ) @Slf4j +@Singleton public class ZulrahPlugin extends Plugin { private static final ZulrahPattern[] patterns = new ZulrahPattern[] @@ -77,7 +80,7 @@ public class ZulrahPlugin extends Plugin new ZulrahPatternC(), new ZulrahPatternD() }; - @Getter + @Getter(AccessLevel.PACKAGE) private NPC zulrah; @Inject private Client client; @@ -126,7 +129,7 @@ public class ZulrahPlugin extends Plugin @Subscribe public void onGameTick(GameTick event) { - if (!config.enabled() || client.getGameState() != GameState.LOGGED_IN) + if (client.getGameState() != GameState.LOGGED_IN) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahCurrentPhaseOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahCurrentPhaseOverlay.java index 2d7bbbcff1..26c37887e8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahCurrentPhaseOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahCurrentPhaseOverlay.java @@ -31,6 +31,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.client.plugins.zulrah.ImagePanelComponent; import net.runelite.client.plugins.zulrah.ZulrahInstance; import net.runelite.client.plugins.zulrah.ZulrahPlugin; @@ -38,15 +39,14 @@ import net.runelite.client.plugins.zulrah.phase.ZulrahPhase; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; -import net.runelite.client.ui.overlay.components.PanelComponent; +@Singleton public class ZulrahCurrentPhaseOverlay extends Overlay { private final ZulrahPlugin plugin; - private final PanelComponent imagePanelComponent = new PanelComponent(); @Inject - ZulrahCurrentPhaseOverlay(ZulrahPlugin plugin) + ZulrahCurrentPhaseOverlay(final ZulrahPlugin plugin) { setPosition(OverlayPosition.BOTTOM_RIGHT); setPriority(OverlayPriority.HIGH); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahImageManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahImageManager.java index c64736c352..b181acc041 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahImageManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahImageManager.java @@ -34,13 +34,13 @@ import net.runelite.client.plugins.zulrah.phase.ZulrahType; import net.runelite.client.util.ImageUtil; @Slf4j -public class ZulrahImageManager +class ZulrahImageManager { private static final BufferedImage[] zulrahBufferedImages = new BufferedImage[3]; private static final BufferedImage[] smallZulrahBufferedImages = new BufferedImage[3]; private static final BufferedImage[] prayerBufferedImages = new BufferedImage[2]; - public static BufferedImage getZulrahBufferedImage(ZulrahType type) + static BufferedImage getZulrahBufferedImage(ZulrahType type) { switch (type) { @@ -66,7 +66,7 @@ public class ZulrahImageManager return null; } - public static BufferedImage getSmallZulrahBufferedImage(ZulrahType type) + static BufferedImage getSmallZulrahBufferedImage(ZulrahType type) { switch (type) { @@ -92,7 +92,7 @@ public class ZulrahImageManager return null; } - public static BufferedImage getProtectionPrayerBufferedImage(Prayer prayer) + static BufferedImage getProtectionPrayerBufferedImage(Prayer prayer) { switch (prayer) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahNextPhaseOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahNextPhaseOverlay.java index 509631e9b8..ca9903302d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahNextPhaseOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahNextPhaseOverlay.java @@ -31,6 +31,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.image.BufferedImage; import javax.inject.Inject; +import javax.inject.Singleton; import net.runelite.client.plugins.zulrah.ImagePanelComponent; import net.runelite.client.plugins.zulrah.ZulrahInstance; import net.runelite.client.plugins.zulrah.ZulrahPlugin; @@ -39,12 +40,13 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; +@Singleton public class ZulrahNextPhaseOverlay extends Overlay { private final ZulrahPlugin plugin; @Inject - ZulrahNextPhaseOverlay(ZulrahPlugin plugin) + ZulrahNextPhaseOverlay(final ZulrahPlugin plugin) { setPosition(OverlayPosition.BOTTOM_RIGHT); setPriority(OverlayPriority.HIGH); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahOverlay.java index 93ce00d4bc..db8136ac24 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahOverlay.java @@ -31,11 +31,11 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.FontMetrics; import java.awt.Graphics2D; -import java.awt.Image; import java.awt.Polygon; import java.awt.image.BufferedImage; import javax.annotation.Nullable; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.Perspective; @@ -48,6 +48,7 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; @Slf4j +@Singleton public class ZulrahOverlay extends Overlay { private static final Color TILE_BORDER_COLOR = new Color(0, 0, 0, 100); @@ -57,7 +58,7 @@ public class ZulrahOverlay extends Overlay private final ZulrahPlugin plugin; @Inject - ZulrahOverlay(@Nullable Client client, ZulrahPlugin plugin) + ZulrahOverlay(final @Nullable Client client, final ZulrahPlugin plugin) { setPosition(OverlayPosition.DYNAMIC); this.client = client; @@ -121,10 +122,10 @@ public class ZulrahOverlay extends Overlay } if (nextPhase.isJad()) { - Image jadPrayerImg = ZulrahImageManager.getProtectionPrayerBufferedImage(nextPhase.getPrayer()); + BufferedImage jadPrayerImg = ZulrahImageManager.getProtectionPrayerBufferedImage(nextPhase.getPrayer()); if (jadPrayerImg != null) { - Point imageLoc = Perspective.getCanvasImageLocation(client, localTile, (BufferedImage) jadPrayerImg, 0); + Point imageLoc = Perspective.getCanvasImageLocation(client, localTile, jadPrayerImg, 0); if (imageLoc != null) { graphics.drawImage(jadPrayerImg, imageLoc.getX(), imageLoc.getY(), null); @@ -165,10 +166,10 @@ public class ZulrahOverlay extends Overlay if (phase.isJad()) { - Image jadPrayerImg = ZulrahImageManager.getProtectionPrayerBufferedImage(phase.getPrayer()); + BufferedImage jadPrayerImg = ZulrahImageManager.getProtectionPrayerBufferedImage(phase.getPrayer()); if (jadPrayerImg != null) { - Point imageLoc = Perspective.getCanvasImageLocation(client, localTile, (BufferedImage) jadPrayerImg, 0); + Point imageLoc = Perspective.getCanvasImageLocation(client, localTile, jadPrayerImg, 0); if (imageLoc != null) { graphics.drawImage(jadPrayerImg, imageLoc.getX(), imageLoc.getY(), null); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahPrayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahPrayerOverlay.java index abcd234034..cd3315f1fe 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahPrayerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahPrayerOverlay.java @@ -31,6 +31,7 @@ import java.awt.Graphics2D; import java.awt.image.BufferedImage; import javax.annotation.Nullable; import javax.inject.Inject; +import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.Prayer; @@ -42,6 +43,7 @@ import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; +@Singleton @Slf4j public class ZulrahPrayerOverlay extends Overlay { @@ -49,7 +51,7 @@ public class ZulrahPrayerOverlay extends Overlay private final ZulrahPlugin plugin; @Inject - ZulrahPrayerOverlay(@Nullable Client client, ZulrahPlugin plugin) + ZulrahPrayerOverlay(final @Nullable Client client, final ZulrahPlugin plugin) { setPosition(OverlayPosition.BOTTOM_RIGHT); setPriority(OverlayPriority.MED); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/patterns/ZulrahPattern.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/patterns/ZulrahPattern.java index 04cd35e278..caf6bcf575 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/patterns/ZulrahPattern.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/patterns/ZulrahPattern.java @@ -44,7 +44,7 @@ public abstract class ZulrahPattern add(loc, type, standLocation, false, prayer); } - protected final void addJad(ZulrahLocation loc, ZulrahType type, StandLocation standLocation, Prayer prayer) + final void addJad(ZulrahLocation loc, ZulrahType type, StandLocation standLocation, Prayer prayer) { add(loc, type, standLocation, true, prayer); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/phase/ZulrahPhase.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/phase/ZulrahPhase.java index c1fc54b7da..fdc9b2b4b3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/phase/ZulrahPhase.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/phase/ZulrahPhase.java @@ -124,11 +124,6 @@ public class ZulrahPhase return startTile; } - public ZulrahLocation getZulrahLocation() - { - return zulrahLocation; - } - public ZulrahType getType() { return type; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/ContainableFrame.java b/runelite-client/src/main/java/net/runelite/client/ui/ContainableFrame.java index 0e60a97e13..6b61a6a78f 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/ContainableFrame.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/ContainableFrame.java @@ -39,6 +39,17 @@ public class ContainableFrame extends JFrame private boolean containedInScreen; private boolean expandedClientOppositeDirection; + ContainableFrame() + { + addWindowStateListener(windowEvent -> + { + if (windowEvent.getNewState() == Frame.NORMAL) + { + revalidateMinimumSize(); + } + }); + } + public void setContainedInScreen(boolean value) { this.containedInScreen = value; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java index 38677410f2..41a3b9329a 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java @@ -27,6 +27,7 @@ package net.runelite.client.ui.overlay; import com.google.common.base.MoreObjects; import java.awt.Color; import java.awt.Dimension; +import java.awt.Font; import java.awt.Graphics2D; import java.awt.Point; import java.awt.Rectangle; @@ -44,6 +45,7 @@ import net.runelite.api.MenuAction; import net.runelite.api.MenuEntry; import net.runelite.api.events.BeforeRender; import net.runelite.api.events.ClientTick; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.FocusChanged; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; @@ -89,6 +91,12 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener private boolean isResizeable; private OverlayBounds snapCorners; + // Overlay Fonts + private Font clientFont; + private Font standardFont; + private Font tooltipFont; + private Font interfaceFont; + @Inject private OverlayRenderer( final Client client, @@ -100,10 +108,28 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener this.client = client; this.overlayManager = overlayManager; this.runeLiteConfig = runeLiteConfig; + this.updateConfig(); keyManager.registerKeyListener(this); mouseManager.registerMouseListener(this); } + private void updateConfig() + { + this.clientFont = runeLiteConfig.clientFont(); + this.standardFont = FontManager.getFontFromType(this.clientFont, runeLiteConfig.fontType()); + this.tooltipFont = FontManager.getFontFromType(this.clientFont, runeLiteConfig.tooltipFontType()); + this.interfaceFont = FontManager.getFontFromType(this.clientFont, runeLiteConfig.interfaceFontType()); + } + + @Subscribe + public void onConfigChanged(ConfigChanged event) + { + if (event.getGroup().equals("runelite")) + { + updateConfig(); + } + } + @Subscribe public void onFocusChanged(FocusChanged event) { @@ -457,15 +483,15 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener // Set font based on configuration if (position == OverlayPosition.DYNAMIC || position == OverlayPosition.DETACHED) { - subGraphics.setFont(FontManager.getFontFromType(runeLiteConfig.clientFont(), runeLiteConfig.fontType())); + subGraphics.setFont(this.standardFont); } else if (position == OverlayPosition.TOOLTIP) { - subGraphics.setFont(FontManager.getFontFromType(runeLiteConfig.clientFont(), runeLiteConfig.tooltipFontType())); + subGraphics.setFont(this.tooltipFont); } else { - subGraphics.setFont(FontManager.getFontFromType(runeLiteConfig.clientFont(), runeLiteConfig.interfaceFontType())); + subGraphics.setFont(this.interfaceFont); } subGraphics.translate(point.x, point.y); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/bank/BankCalculationTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/bank/BankCalculationTest.java index af690525c3..2736c133a5 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/bank/BankCalculationTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/bank/BankCalculationTest.java @@ -61,7 +61,7 @@ public class BankCalculationTest private BankConfig bankConfig; @Inject - private BankCalculation bankCalculation; + private BankPlugin bankplugin; @Before public void before() @@ -107,6 +107,7 @@ public class BankCalculationTest when(itemManager.getItemDefinition(ItemID.ABYSSAL_WHIP)) .thenReturn(whipComp); + BankCalculation bankCalculation = new BankCalculation(itemManager, bankplugin, client); bankCalculation.calculate(); long value = bankCalculation.getHaPrice(); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/cerberus/CerberusPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/cerberus/CerberusPluginTest.java index 4f35f7b174..daac7907de 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/cerberus/CerberusPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/cerberus/CerberusPluginTest.java @@ -71,7 +71,7 @@ public class CerberusPluginTest mockNpc(new LocalPoint(2, 5)), mockNpc(new LocalPoint(1, 5)) )); - cerberusPlugin.onGameTick(new GameTick()); + cerberusPlugin.onGameTick(GameTick.INSTANCE); // Expected sort is by lowest y first, then by lowest x assertEquals(ghosts.get(0).getLocalLocation(), new LocalPoint(0, 0)); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java index a12a8b257b..26348cbd16 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java @@ -65,16 +65,17 @@ public class ChatFilterPluginTest { Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this); - when(chatFilterConfig.filterType()).thenReturn(ChatFilterType.CENSOR_WORDS); - when(chatFilterConfig.filteredWords()).thenReturn(""); - when(chatFilterConfig.filteredRegex()).thenReturn(""); + chatFilterPlugin.setFilterType(ChatFilterType.CENSOR_WORDS); + chatFilterPlugin.setFilteredWords(""); + chatFilterPlugin.setFilteredRegex(""); + when(client.getLocalPlayer()).thenReturn(localPlayer); } @Test public void testCensorWords() { - when(chatFilterConfig.filteredWords()).thenReturn("hat"); + chatFilterPlugin.setFilteredWords("hat"); chatFilterPlugin.updateFilteredPatterns(); assertEquals("w***s up", chatFilterPlugin.censorMessage("whats up")); @@ -83,8 +84,8 @@ public class ChatFilterPluginTest @Test public void testCensorRegex() { - when(chatFilterConfig.filterType()).thenReturn(ChatFilterType.REMOVE_MESSAGE); - when(chatFilterConfig.filteredRegex()).thenReturn("5[0-9]x2\n("); + chatFilterPlugin.setFilterType(ChatFilterType.REMOVE_MESSAGE); + chatFilterPlugin.setFilteredRegex("5[0-9]x2\n("); chatFilterPlugin.updateFilteredPatterns(); assertNull(chatFilterPlugin.censorMessage("55X2 Dicing | Trusted Ranks | Huge Pay Outs!")); @@ -93,7 +94,7 @@ public class ChatFilterPluginTest @Test public void testBrokenRegex() { - when(chatFilterConfig.filteredRegex()).thenReturn("Test\n)\n73"); + chatFilterPlugin.setFilteredRegex("Test\n)\n73"); chatFilterPlugin.updateFilteredPatterns(); assertEquals("** isn't funny", chatFilterPlugin.censorMessage("73 isn't funny")); @@ -102,8 +103,8 @@ public class ChatFilterPluginTest @Test public void testCaseSensitivity() { - when(chatFilterConfig.filterType()).thenReturn(ChatFilterType.CENSOR_MESSAGE); - when(chatFilterConfig.filteredWords()).thenReturn("ReGeX!!!"); + chatFilterPlugin.setFilterType(ChatFilterType.CENSOR_MESSAGE); + chatFilterPlugin.setFilteredWords("ReGeX!!!"); chatFilterPlugin.updateFilteredPatterns(); assertEquals("Hey, everyone, I just tried to say something very silly!", @@ -113,8 +114,8 @@ public class ChatFilterPluginTest @Test public void testNonPrintableCharacters() { - when(chatFilterConfig.filterType()).thenReturn(ChatFilterType.REMOVE_MESSAGE); - when(chatFilterConfig.filteredWords()).thenReturn("test"); + chatFilterPlugin.setFilterType(ChatFilterType.REMOVE_MESSAGE); + chatFilterPlugin.setFilteredWords("test"); chatFilterPlugin.updateFilteredPatterns(); assertNull(chatFilterPlugin.censorMessage("te\u008Cst")); @@ -124,7 +125,7 @@ public class ChatFilterPluginTest public void testMessageFromFriendIsFiltered() { when(client.isFriended("Iron Mammal", false)).thenReturn(true); - when(chatFilterConfig.filterFriends()).thenReturn(true); + chatFilterPlugin.setFilterFriends(true); assertTrue(chatFilterPlugin.shouldFilterPlayerMessage("Iron Mammal")); } @@ -132,7 +133,7 @@ public class ChatFilterPluginTest public void testMessageFromFriendIsNotFiltered() { when(client.isFriended("Iron Mammal", false)).thenReturn(true); - when(chatFilterConfig.filterFriends()).thenReturn(false); + chatFilterPlugin.setFilterFriends(false); assertFalse(chatFilterPlugin.shouldFilterPlayerMessage("Iron Mammal")); } @@ -140,7 +141,7 @@ public class ChatFilterPluginTest public void testMessageFromClanIsFiltered() { when(client.isClanMember("B0aty")).thenReturn(true); - when(chatFilterConfig.filterClan()).thenReturn(true); + chatFilterPlugin.setFilterClan(true); assertTrue(chatFilterPlugin.shouldFilterPlayerMessage("B0aty")); } @@ -148,7 +149,7 @@ public class ChatFilterPluginTest public void testMessageFromClanIsNotFiltered() { when(client.isClanMember("B0aty")).thenReturn(true); - when(chatFilterConfig.filterClan()).thenReturn(false); + chatFilterPlugin.setFilterClan(false); assertFalse(chatFilterPlugin.shouldFilterPlayerMessage("B0aty")); } diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java index 6b8334e99d..5c5d4dd176 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java @@ -115,7 +115,8 @@ public class CookingPluginTest Player player = mock(Player.class); when(player.getSpotAnimation()).thenReturn(GraphicID.WINE_MAKE); - when(config.fermentTimer()).thenReturn(true); + cookingPlugin.setFermentTimer(true); + when(client.getLocalPlayer()).thenReturn(player); SpotAnimationChanged graphicChanged = new SpotAnimationChanged(); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java index 51dc7842e0..508a396e97 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java @@ -114,12 +114,12 @@ public class IdleNotifierPluginTest when(client.getLocalPlayer()).thenReturn(player); // Mock config - when(config.logoutIdle()).thenReturn(true); - when(config.animationIdle()).thenReturn(true); - when(config.interactionIdle()).thenReturn(true); - when(config.getIdleNotificationDelay()).thenReturn(0); - when(config.getHitpointsThreshold()).thenReturn(42); - when(config.getPrayerThreshold()).thenReturn(42); + plugin.setLogoutIdle(true); + plugin.setAnimationIdle(true); + plugin.setInteractionIdle(true); + plugin.setGetIdleNotificationDelay(0); + plugin.setGetHitpointsThreshold(42); + plugin.setGetPrayerThreshold(42); // Mock client when(client.getGameState()).thenReturn(GameState.LOGGED_IN); @@ -135,10 +135,10 @@ public class IdleNotifierPluginTest AnimationChanged animationChanged = new AnimationChanged(); animationChanged.setActor(player); plugin.onAnimationChanged(animationChanged); - plugin.onGameTick(new GameTick()); + plugin.onGameTick(GameTick.INSTANCE); when(player.getAnimation()).thenReturn(AnimationID.IDLE); plugin.onAnimationChanged(animationChanged); - plugin.onGameTick(new GameTick()); + plugin.onGameTick(GameTick.INSTANCE); verify(notifier).notify("[" + PLAYER_NAME + "] is now idle!"); } @@ -149,13 +149,13 @@ public class IdleNotifierPluginTest AnimationChanged animationChanged = new AnimationChanged(); animationChanged.setActor(player); plugin.onAnimationChanged(animationChanged); - plugin.onGameTick(new GameTick()); + plugin.onGameTick(GameTick.INSTANCE); when(player.getAnimation()).thenReturn(AnimationID.LOOKING_INTO); plugin.onAnimationChanged(animationChanged); - plugin.onGameTick(new GameTick()); + plugin.onGameTick(GameTick.INSTANCE); when(player.getAnimation()).thenReturn(AnimationID.IDLE); plugin.onAnimationChanged(animationChanged); - plugin.onGameTick(new GameTick()); + plugin.onGameTick(GameTick.INSTANCE); verify(notifier, times(0)).notify(any()); } @@ -166,7 +166,7 @@ public class IdleNotifierPluginTest AnimationChanged animationChanged = new AnimationChanged(); animationChanged.setActor(player); plugin.onAnimationChanged(animationChanged); - plugin.onGameTick(new GameTick()); + plugin.onGameTick(GameTick.INSTANCE); // Logout when(client.getGameState()).thenReturn(GameState.LOGIN_SCREEN); @@ -182,7 +182,7 @@ public class IdleNotifierPluginTest // Tick when(player.getAnimation()).thenReturn(AnimationID.IDLE); plugin.onAnimationChanged(animationChanged); - plugin.onGameTick(new GameTick()); + plugin.onGameTick(GameTick.INSTANCE); verify(notifier, times(0)).notify(any()); } @@ -191,10 +191,10 @@ public class IdleNotifierPluginTest { when(player.getInteracting()).thenReturn(monster); plugin.onInteractingChanged(new InteractingChanged(player, monster)); - plugin.onGameTick(new GameTick()); + plugin.onGameTick(GameTick.INSTANCE); when(player.getInteracting()).thenReturn(null); plugin.onInteractingChanged(new InteractingChanged(player, null)); - plugin.onGameTick(new GameTick()); + plugin.onGameTick(GameTick.INSTANCE); verify(notifier).notify("[" + PLAYER_NAME + "] is now out of combat!"); } @@ -203,13 +203,13 @@ public class IdleNotifierPluginTest { when(player.getInteracting()).thenReturn(monster); plugin.onInteractingChanged(new InteractingChanged(player, monster)); - plugin.onGameTick(new GameTick()); + plugin.onGameTick(GameTick.INSTANCE); when(player.getInteracting()).thenReturn(randomEvent); plugin.onInteractingChanged(new InteractingChanged(player, randomEvent)); - plugin.onGameTick(new GameTick()); + plugin.onGameTick(GameTick.INSTANCE); when(player.getInteracting()).thenReturn(null); plugin.onInteractingChanged(new InteractingChanged(player, null)); - plugin.onGameTick(new GameTick()); + plugin.onGameTick(GameTick.INSTANCE); verify(notifier, times(0)).notify(any()); } @@ -218,7 +218,7 @@ public class IdleNotifierPluginTest { plugin.onInteractingChanged(new InteractingChanged(player, monster)); when(player.getInteracting()).thenReturn(monster); - plugin.onGameTick(new GameTick()); + plugin.onGameTick(GameTick.INSTANCE); // Logout when(client.getGameState()).thenReturn(GameState.LOGIN_SCREEN); @@ -234,7 +234,7 @@ public class IdleNotifierPluginTest // Tick when(player.getInteracting()).thenReturn(null); plugin.onInteractingChanged(new InteractingChanged(player, null)); - plugin.onGameTick(new GameTick()); + plugin.onGameTick(GameTick.INSTANCE); verify(notifier, times(0)).notify(any()); } @@ -249,7 +249,7 @@ public class IdleNotifierPluginTest hitsplatApplied.setActor(player); hitsplatApplied.setHitsplat(new Hitsplat(Hitsplat.HitsplatType.DAMAGE, 0, 0)); plugin.onHitsplatApplied(hitsplatApplied); - plugin.onGameTick(new GameTick()); + plugin.onGameTick(GameTick.INSTANCE); verify(notifier, times(0)).notify(any()); } @@ -262,22 +262,22 @@ public class IdleNotifierPluginTest when(client.getKeyboardIdleTicks()).thenReturn(80_000); when(client.getMouseIdleTicks()).thenReturn(14_500); - plugin.onGameTick(new GameTick()); - plugin.onGameTick(new GameTick()); + plugin.onGameTick(GameTick.INSTANCE); + plugin.onGameTick(GameTick.INSTANCE); verify(notifier, times(1)).notify(any()); } @Test public void testSpecRegen() { - when(config.getSpecEnergyThreshold()).thenReturn(50); + plugin.setGetSpecEnergyThreshold(50); when(client.getVar(Matchers.eq(VarPlayer.SPECIAL_ATTACK_PERCENT))).thenReturn(400); // 40% - plugin.onGameTick(new GameTick()); // once to set lastSpecEnergy to 400 + plugin.onGameTick(GameTick.INSTANCE); // once to set lastSpecEnergy to 400 verify(notifier, never()).notify(any()); when(client.getVar(Matchers.eq(VarPlayer.SPECIAL_ATTACK_PERCENT))).thenReturn(500); // 50% - plugin.onGameTick(new GameTick()); + plugin.onGameTick(GameTick.INSTANCE); verify(notifier).notify(Matchers.eq("[" + PLAYER_NAME + "] has restored spec energy!")); } } \ No newline at end of file diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPluginTest.java index 87f69cceb3..fb5b92810d 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPluginTest.java @@ -37,7 +37,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import static org.mockito.Mockito.when; import org.mockito.runners.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) @@ -67,7 +66,7 @@ public class NpcIndicatorsPluginTest @Test public void getHighlights() { - when(npcIndicatorsConfig.getNpcToHighlight()).thenReturn("goblin, , zulrah , *wyvern, ,"); + npcIndicatorsPlugin.setGetNpcToHighlight("goblin, , zulrah , *wyvern, ,"); final List highlightedNpcs = npcIndicatorsPlugin.getHighlights(); assertEquals("Length of parsed NPCs is incorrect", 3, highlightedNpcs.size()); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java index 9aff61c346..4a34a86712 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java @@ -101,10 +101,10 @@ public class ScreenshotPluginTest public void before() { Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this); - when(screenshotConfig.screenshotRewards()).thenReturn(true); - when(screenshotConfig.screenshotLevels()).thenReturn(true); - when(screenshotConfig.screenshotValuableDrop()).thenReturn(true); - when(screenshotConfig.screenshotUntradeableDrop()).thenReturn(true); + screenshotPlugin.setScreenshotRewards(true); + screenshotPlugin.setScreenshotLevels(true); + screenshotPlugin.setScreenshotValuableDrop(true); + screenshotPlugin.setScreenshotUntradeableDrop(true); } @Test @@ -179,7 +179,7 @@ public class ScreenshotPluginTest event.setGroupId(LEVEL_UP_GROUP_ID); screenshotPlugin.onWidgetLoaded(event); - GameTick tick = new GameTick(); + GameTick tick = GameTick.INSTANCE; screenshotPlugin.onGameTick(tick); verify(drawManager).requestNextFrameListener(Matchers.any(Consumer.class)); @@ -202,7 +202,7 @@ public class ScreenshotPluginTest event.setGroupId(LEVEL_UP_GROUP_ID); screenshotPlugin.onWidgetLoaded(event); - GameTick tick = new GameTick(); + GameTick tick = GameTick.INSTANCE; screenshotPlugin.onGameTick(tick); verify(drawManager).requestNextFrameListener(Matchers.any(Consumer.class)); @@ -225,7 +225,7 @@ public class ScreenshotPluginTest event.setGroupId(LEVEL_UP_GROUP_ID); screenshotPlugin.onWidgetLoaded(event); - GameTick tick = new GameTick(); + GameTick tick = GameTick.INSTANCE; screenshotPlugin.onGameTick(tick); verify(drawManager).requestNextFrameListener(Matchers.any(Consumer.class)); @@ -248,7 +248,7 @@ public class ScreenshotPluginTest event.setGroupId(DIALOG_SPRITE_GROUP_ID); screenshotPlugin.onWidgetLoaded(event); - GameTick tick = new GameTick(); + GameTick tick = GameTick.INSTANCE; screenshotPlugin.onGameTick(tick); verify(drawManager).requestNextFrameListener(Matchers.any(Consumer.class)); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java index 099a76d19b..169caac2a9 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java @@ -155,7 +155,7 @@ public class SlayerPluginTest Widget npcDialog = mock(Widget.class); when(npcDialog.getText()).thenReturn(TASK_NEW); when(client.getWidget(WidgetInfo.DIALOG_NPC_TEXT)).thenReturn(npcDialog); - slayerPlugin.onGameTick(new GameTick()); + slayerPlugin.onGameTick(GameTick.INSTANCE); assertEquals("Suqahs", slayerPlugin.getCurrentTask().getTaskName()); assertEquals(231, slayerPlugin.getCurrentTask().getAmount()); @@ -167,7 +167,7 @@ public class SlayerPluginTest Widget npcDialog = mock(Widget.class); when(npcDialog.getText()).thenReturn(TASK_NEW_KONAR); when(client.getWidget(WidgetInfo.DIALOG_NPC_TEXT)).thenReturn(npcDialog); - slayerPlugin.onGameTick(new GameTick()); + slayerPlugin.onGameTick(GameTick.INSTANCE); assertEquals("Wyrms", slayerPlugin.getCurrentTask().getTaskName()); assertEquals(147, slayerPlugin.getCurrentTask().getAmount()); @@ -180,7 +180,7 @@ public class SlayerPluginTest Widget npcDialog = mock(Widget.class); when(npcDialog.getText()).thenReturn(TASK_NEW_KONAR_2); when(client.getWidget(WidgetInfo.DIALOG_NPC_TEXT)).thenReturn(npcDialog); - slayerPlugin.onGameTick(new GameTick()); + slayerPlugin.onGameTick(GameTick.INSTANCE); assertEquals("Hellhounds", slayerPlugin.getCurrentTask().getTaskName()); assertEquals(142, slayerPlugin.getCurrentTask().getAmount()); @@ -193,7 +193,7 @@ public class SlayerPluginTest Widget npcDialog = mock(Widget.class); when(npcDialog.getText()).thenReturn(TASK_NEW_KONAR_3); when(client.getWidget(WidgetInfo.DIALOG_NPC_TEXT)).thenReturn(npcDialog); - slayerPlugin.onGameTick(new GameTick()); + slayerPlugin.onGameTick(GameTick.INSTANCE); assertEquals("Trolls", slayerPlugin.getCurrentTask().getTaskName()); assertEquals(135, slayerPlugin.getCurrentTask().getAmount()); @@ -206,7 +206,7 @@ public class SlayerPluginTest Widget npcDialog = mock(Widget.class); when(npcDialog.getText()).thenReturn(TASK_NEW_FIRST); when(client.getWidget(WidgetInfo.DIALOG_NPC_TEXT)).thenReturn(npcDialog); - slayerPlugin.onGameTick(new GameTick()); + slayerPlugin.onGameTick(GameTick.INSTANCE); assertEquals("goblins", slayerPlugin.getCurrentTask().getTaskName()); assertEquals(17, slayerPlugin.getCurrentTask().getAmount()); @@ -218,7 +218,7 @@ public class SlayerPluginTest Widget npcDialog = mock(Widget.class); when(npcDialog.getText()).thenReturn(TASK_NEW_NPC_CONTACT); when(client.getWidget(WidgetInfo.DIALOG_NPC_TEXT)).thenReturn(npcDialog); - slayerPlugin.onGameTick(new GameTick()); + slayerPlugin.onGameTick(GameTick.INSTANCE); assertEquals("Suqahs", slayerPlugin.getCurrentTask().getTaskName()); assertEquals(211, slayerPlugin.getCurrentTask().getAmount()); @@ -230,7 +230,7 @@ public class SlayerPluginTest Widget npcDialog = mock(Widget.class); when(npcDialog.getText()).thenReturn(TASK_BOSS_NEW); when(client.getWidget(WidgetInfo.DIALOG_NPC_TEXT)).thenReturn(npcDialog); - slayerPlugin.onGameTick(new GameTick()); + slayerPlugin.onGameTick(GameTick.INSTANCE); assertEquals("Vet'ion", slayerPlugin.getCurrentTask().getTaskName()); assertEquals(3, slayerPlugin.getCurrentTask().getAmount()); @@ -243,7 +243,7 @@ public class SlayerPluginTest Widget npcDialog = mock(Widget.class); when(npcDialog.getText()).thenReturn(TASK_BOSS_NEW_THE); when(client.getWidget(WidgetInfo.DIALOG_NPC_TEXT)).thenReturn(npcDialog); - slayerPlugin.onGameTick(new GameTick()); + slayerPlugin.onGameTick(GameTick.INSTANCE); assertEquals("Chaos Elemental", slayerPlugin.getCurrentTask().getTaskName()); assertEquals(3, slayerPlugin.getCurrentTask().getAmount()); @@ -296,7 +296,7 @@ public class SlayerPluginTest Widget npcDialog = mock(Widget.class); when(npcDialog.getText()).thenReturn(TASK_EXISTING); when(client.getWidget(WidgetInfo.DIALOG_NPC_TEXT)).thenReturn(npcDialog); - slayerPlugin.onGameTick(new GameTick()); + slayerPlugin.onGameTick(GameTick.INSTANCE); assertEquals("suqahs", slayerPlugin.getCurrentTask().getTaskName()); assertEquals(222, slayerPlugin.getCurrentTask().getAmount()); @@ -387,11 +387,11 @@ public class SlayerPluginTest { ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "Superior", SUPERIOR_MESSAGE, null, 0); - when(slayerConfig.showSuperiorNotification()).thenReturn(true); + slayerPlugin.setShowSuperiorNotification(true); slayerPlugin.onChatMessage(chatMessageEvent); verify(notifier).notify(SUPERIOR_MESSAGE); - when(slayerConfig.showSuperiorNotification()).thenReturn(false); + slayerPlugin.setShowSuperiorNotification(false); slayerPlugin.onChatMessage(chatMessageEvent); verifyNoMoreInteractions(notifier); } @@ -405,7 +405,7 @@ public class SlayerPluginTest task.setAmount(42); task.setInitialAmount(42); - when(slayerConfig.taskCommand()).thenReturn(true); + slayerPlugin.setTaskCommand(true); when(chatClient.getTask(anyString())).thenReturn(task); ChatMessage setMessage = new ChatMessage(); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/timers/TimersPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/timers/TimersPluginTest.java index f9ba35154d..378f062de2 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/timers/TimersPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/timers/TimersPluginTest.java @@ -86,7 +86,7 @@ public class TimersPluginTest @Test public void testHalfTeleblock() { - when(timersConfig.showTeleblock()).thenReturn(true); + timersPlugin.setShowTeleblock(true); when(client.getWorldType()).thenReturn(EnumSet.of(WorldType.MEMBERS)); ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.SPAM, "", HALF_TELEBLOCK_MESSAGE, "", 0); timersPlugin.onChatMessage(chatMessage); @@ -100,7 +100,7 @@ public class TimersPluginTest @Test public void testFullTeleblock() { - when(timersConfig.showTeleblock()).thenReturn(true); + timersPlugin.setShowTeleblock(true); ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.SPAM, "", FULL_TELEBLOCK_MESSAGE, "", 0); timersPlugin.onChatMessage(chatMessage); @@ -113,7 +113,7 @@ public class TimersPluginTest @Test public void testDmmHalfTb() { - when(timersConfig.showTeleblock()).thenReturn(true); + timersPlugin.setShowTeleblock(true); when(client.getWorldType()).thenReturn(EnumSet.of(WorldType.DEADMAN)); ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.SPAM, "", DMM_HALF_TELEBLOCK_MESSAGE, "", 0); timersPlugin.onChatMessage(chatMessage); @@ -127,7 +127,7 @@ public class TimersPluginTest @Test public void testDmmFullTb() { - when(timersConfig.showTeleblock()).thenReturn(true); + timersPlugin.setShowTeleblock(true); when(client.getWorldType()).thenReturn(EnumSet.of(WorldType.DEADMAN)); ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.SPAM, "", HALF_TELEBLOCK_MESSAGE, "", 0); timersPlugin.onChatMessage(chatMessage); diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java index f25c98e263..65951bc9c5 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java @@ -251,7 +251,7 @@ public abstract class RSActorMixin implements RSActor { client.getLogger().debug("You died!"); - LocalPlayerDeath event = new LocalPlayerDeath(); + LocalPlayerDeath event = LocalPlayerDeath.INSTANCE; client.getCallbacks().post(event); } else if (this instanceof RSNPC) diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index ee569abca0..1df5621284 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -1094,14 +1094,14 @@ public abstract class RSClientMixin implements RSClient @Inject public static void canvasWidthChanged(int idx) { - client.getCallbacks().post(new CanvasSizeChanged()); + client.getCallbacks().post(CanvasSizeChanged.INSTANCE); } @FieldHook("canvasHeight") @Inject public static void canvasHeightChanged(int idx) { - client.getCallbacks().post(new CanvasSizeChanged()); + client.getCallbacks().post(CanvasSizeChanged.INSTANCE); } @Inject @@ -1272,7 +1272,7 @@ public abstract class RSClientMixin implements RSClient @Inject public static void onUsernameChanged(int idx) { - client.getCallbacks().post(new UsernameChanged()); + client.getCallbacks().post(UsernameChanged.INSTANCE); } @Override @@ -1515,7 +1515,7 @@ public abstract class RSClientMixin implements RSClient @FieldHook("cycleCntr") public static void onCycleCntrChanged(int idx) { - client.getCallbacks().post(new ClientTick()); + client.getCallbacks().post(ClientTick.INSTANCE); } @Copy("shouldLeftClickOpenMenu") diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java index 4c59a88e53..208c813667 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java @@ -496,7 +496,7 @@ public abstract class RSWidgetMixin implements RSWidget client.getLogger().trace("Posting widget position changed"); - WidgetPositioned widgetPositioned = new WidgetPositioned(); + WidgetPositioned widgetPositioned = WidgetPositioned.INSTANCE; client.getCallbacks().postDeferred(widgetPositioned); } From 6f9440d5bb919fec89a7bf8c6e12d5973cb0b271 Mon Sep 17 00:00:00 2001 From: Lucwousin Date: Fri, 5 Jul 2019 02:29:07 +0200 Subject: [PATCH 029/472] Move updateconfig to startup rather than shutdown (groundmarkers) (#886) --- .../client/plugins/groundmarkers/GroundMarkerPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java index 2566142be8..f5ed119b16 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java @@ -355,6 +355,8 @@ public class GroundMarkerPlugin extends Plugin @Override protected void startUp() { + updateConfig(); + overlayManager.add(overlay); overlayManager.add(minimapOverlay); keyManager.registerKeyListener(inputListener); @@ -364,8 +366,6 @@ public class GroundMarkerPlugin extends Plugin @Override protected void shutDown() { - updateConfig(); - overlayManager.remove(overlay); overlayManager.remove(minimapOverlay); keyManager.unregisterKeyListener(inputListener); From 1e6a5df6de60ca7e19c02846bf9ab2c36c697427 Mon Sep 17 00:00:00 2001 From: se7enAte9 <50936458+se7enAte9@users.noreply.github.com> Date: Thu, 4 Jul 2019 23:18:26 -0400 Subject: [PATCH 030/472] menumanager: fix right click/swap issues (#866) * menumanager: fix possible concurrent modification exception, add small optimization for left click entries, and cleanup * menumanager: stop entries from swapping in the right click menu if the swapFrom is already the first option * Revert "rsclientmixin: make use of edited menuopened event variables" This reverts commit d2cd11a7 * menumanager: set event entries in menuopened event to prevent conflicts * menumanager: remove type change, and improve performance * menumanager: add field to set priority level to prevent conflicts --- .../client/menus/ComparableEntry.java | 13 + .../runelite/client/menus/MenuManager.java | 275 ++++++------------ .../shiftwalker/ShiftWalkerPlugin.java | 4 +- .../net/runelite/mixins/RSClientMixin.java | 1 - 4 files changed, 110 insertions(+), 183 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/menus/ComparableEntry.java b/runelite-client/src/main/java/net/runelite/client/menus/ComparableEntry.java index a5f0f57355..171d299e72 100644 --- a/runelite-client/src/main/java/net/runelite/client/menus/ComparableEntry.java +++ b/runelite-client/src/main/java/net/runelite/client/menus/ComparableEntry.java @@ -27,6 +27,7 @@ package net.runelite.client.menus; import joptsimple.internal.Strings; import lombok.EqualsAndHashCode; import lombok.Getter; +import lombok.Setter; import net.runelite.api.MenuEntry; import static net.runelite.client.menus.MenuManager.LEVEL_PATTERN; import net.runelite.client.util.Text; @@ -52,6 +53,16 @@ public class ComparableEntry @Getter private boolean strictTarget; + /** + * If two entries are both suppose to be left click, + * the entry with the higher priority will be selected. + * This only effects left click priority entries. + */ + @Getter + @Setter + @EqualsAndHashCode.Exclude + private int priority; + public ComparableEntry(String option, String target) { this(option, target, -1, -1, true, true); @@ -70,6 +81,7 @@ public class ComparableEntry this.type = type; this.strictOption = strictOption; this.strictTarget = strictTarget; + this.priority = 0; } // This is only used for type checking, which is why it has everything but target @@ -80,6 +92,7 @@ public class ComparableEntry this.id = e.getIdentifier(); this.type = e.getType(); this.strictOption = true; + this.priority = 0; } boolean matches(MenuEntry entry) diff --git a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java index 4e4f9fb847..888e9f032e 100644 --- a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java +++ b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java @@ -34,14 +34,16 @@ import com.google.common.collect.Multimap; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Pattern; +import java.util.stream.Collectors; import javax.inject.Inject; import javax.inject.Singleton; @@ -78,7 +80,6 @@ public class MenuManager private final Client client; private final EventBus eventBus; - private final Prioritizer prioritizer; //Maps the indexes that are being used to the menu option. private final Map playerMenuIndexMap = new HashMap<>(); @@ -86,24 +87,22 @@ public class MenuManager private final Multimap managedMenuOptions = HashMultimap.create(); private final Set npcMenuOptions = new HashSet<>(); - private final Set priorityEntries = new HashSet<>(); - private final Set currentPriorityEntries = new HashSet<>(); - private final Set hiddenEntries = new HashSet<>(); - private final Set currentHiddenEntries = new HashSet<>(); - private final Map swaps = new HashMap<>(); - private final Map currentSwaps = new HashMap<>(); + private final HashSet priorityEntries = new HashSet<>(); + private HashMap currentPriorityEntries = new HashMap<>(); + private final ConcurrentHashMap safeCurrentPriorityEntries = new ConcurrentHashMap<>(); + private final HashSet hiddenEntries = new HashSet<>(); + private HashSet currentHiddenEntries = new HashSet<>(); + private final HashMap swaps = new HashMap<>(); private final LinkedHashSet entries = Sets.newLinkedHashSet(); private MenuEntry leftClickEntry = null; - private int leftClickType = -1; @Inject private MenuManager(Client client, EventBus eventBus) { this.client = client; this.eventBus = eventBus; - this.prioritizer = new Prioritizer(); } /** @@ -147,22 +146,11 @@ public class MenuManager public void onMenuOpened(MenuOpened event) { currentPriorityEntries.clear(); - currentHiddenEntries.clear(); // Need to reorder the list to normal, then rebuild with swaps MenuEntry[] oldEntries = event.getMenuEntries(); - for (MenuEntry entry : oldEntries) - { - if (entry == leftClickEntry) - { - entry.setType(leftClickType); - break; - } - } - leftClickEntry = null; - leftClickType = -1; client.sortMenuEntries(); @@ -192,7 +180,7 @@ public class MenuManager { shouldDeprioritize = true; } - currentPriorityEntries.add(entry); + currentPriorityEntries.put(entry, p); newEntries.remove(entry); continue prioritizer; } @@ -221,8 +209,8 @@ public class MenuManager } } - // Do not need to swap with itself - if (swapFrom != null && swapFrom != entry) + // Do not need to swap with itself or if the swapFrom is already the first entry + if (swapFrom != null && swapFrom != entry && swapFrom != Iterables.getLast(newEntries)) { // Deprioritize entries if the swaps are not in similar type groups if ((swapFrom.getType() >= 1000 && entry.getType() < 1000) || (entry.getType() >= 1000 && swapFrom.getType() < 1000) && !shouldDeprioritize) @@ -250,12 +238,19 @@ public class MenuManager } } - if (!priorityEntries.isEmpty()) + if (!currentPriorityEntries.isEmpty()) { - newEntries.addAll(currentPriorityEntries); + newEntries.addAll(currentPriorityEntries.entrySet().stream() + .sorted(Comparator.comparingInt(e -> e.getValue().getPriority())) + .map(Map.Entry::getKey) + .collect(Collectors.toList())); } - event.setMenuEntries(newEntries.toArray(new MenuEntry[0])); + MenuEntry[] arrayEntries = newEntries.toArray(new MenuEntry[0]); + + // Need to set the event entries to prevent conflicts + event.setMenuEntries(arrayEntries); + client.setMenuEntries(arrayEntries); } @Subscribe @@ -282,13 +277,10 @@ public class MenuManager } } - - @Subscribe public void onBeforeRender(BeforeRender event) { leftClickEntry = null; - leftClickType = -1; if (client.isMenuOpen()) { @@ -296,7 +288,6 @@ public class MenuManager } entries.clear(); - entries.addAll(Arrays.asList(client.getMenuEntries())); if (entries.size() < 2) @@ -304,56 +295,35 @@ public class MenuManager return; } - currentPriorityEntries.clear(); - currentHiddenEntries.clear(); - currentSwaps.clear(); - - prioritizer.prioritize(); - - while (prioritizer.isRunning()) + if (!hiddenEntries.isEmpty()) { - // wait - } + currentHiddenEntries.clear(); + indexHiddenEntries(entries); - entries.removeAll(currentHiddenEntries); - - - for (MenuEntry entry : currentPriorityEntries) - { - if (entries.contains(entry)) + if (!currentHiddenEntries.isEmpty()) { - leftClickEntry = entry; - leftClickType = entry.getType(); - entries.remove(leftClickEntry); - leftClickEntry.setType(MenuAction.WIDGET_DEFAULT.getId()); - entries.add(leftClickEntry); - break; + entries.removeAll(currentHiddenEntries); } } - - if (leftClickEntry == null) + if (!priorityEntries.isEmpty()) { - MenuEntry first = Iterables.getLast(entries); - - for (ComparableEntry swap : currentSwaps.keySet()) - { - if (swap.matches(first)) - { - leftClickEntry = currentSwaps.get(swap); - leftClickType = leftClickEntry.getType(); - entries.remove(leftClickEntry); - leftClickEntry.setType(MenuAction.WIDGET_DEFAULT.getId()); - entries.add(leftClickEntry); - break; - } - } + indexPriorityEntries(entries); } - client.setMenuEntries(entries.toArray(new MenuEntry[0])); + if (leftClickEntry == null && !swaps.isEmpty()) + { + indexSwapEntries(entries); + } + + if (leftClickEntry != null) + { + entries.remove(leftClickEntry); + entries.add(leftClickEntry); + client.setMenuEntries(entries.toArray(new MenuEntry[0])); + } } - public void addPlayerMenuItem(String menuText) { Preconditions.checkNotNull(menuText); @@ -458,9 +428,8 @@ public class MenuManager @Subscribe public void onMenuOptionClicked(MenuOptionClicked event) { - if (leftClickEntry != null && leftClickType != -1) + if (!client.isMenuOpen() && leftClickEntry != null) { - leftClickEntry.setType(leftClickType); event.setMenuEntry(leftClickEntry); leftClickEntry = null; } @@ -534,7 +503,7 @@ public class MenuManager /** * Adds to the set of menu entries which when present, will remove all entries except for this one */ - public void addPriorityEntry(String option, String target) + public ComparableEntry addPriorityEntry(String option, String target) { option = Text.standardize(option); target = Text.standardize(target); @@ -542,6 +511,8 @@ public class MenuManager ComparableEntry entry = new ComparableEntry(option, target); priorityEntries.add(entry); + + return entry; } public void removePriorityEntry(String option, String target) @@ -559,13 +530,15 @@ public class MenuManager * Adds to the set of menu entries which when present, will remove all entries except for this one * This method will add one with strict option, but not-strict target (contains for target, equals for option) */ - public void addPriorityEntry(String option) + public ComparableEntry addPriorityEntry(String option) { option = Text.standardize(option); ComparableEntry entry = new ComparableEntry(option, "", false); priorityEntries.add(entry); + + return entry; } public void removePriorityEntry(String option) @@ -789,115 +762,57 @@ public class MenuManager hiddenEntries.remove(entry); } - private class Prioritizer + private void indexHiddenEntries(Set entries) { - private MenuEntry[] entries; - private AtomicInteger state = new AtomicInteger(0); - - boolean isRunning() + currentHiddenEntries = entries.parallelStream().filter(entry -> { - return state.get() != 0; - } - - void prioritize() - { - if (state.get() != 0) + for (ComparableEntry p : hiddenEntries) { - return; - } - - entries = client.getMenuEntries(); - - state.set(3); - - if (!hiddenEntries.isEmpty()) - { - hiddenFinder.run(); - } - else - { - state.decrementAndGet(); - } - - if (!priorityEntries.isEmpty()) - { - priorityFinder.run(); - } - else - { - state.decrementAndGet(); - } - - if (!swaps.isEmpty()) - { - swapFinder.run(); - } - else - { - state.decrementAndGet(); - } - } - - private Thread hiddenFinder = new Thread() - { - @Override - public void run() - { - Arrays.stream(entries).parallel().forEach(entry -> + if (p.matches(entry)) { - for (ComparableEntry p : hiddenEntries) - { - if (p.matches(entry)) - { - currentHiddenEntries.add(entry); - return; - } - } - }); - state.decrementAndGet(); + return true; + } } - }; - - private Thread priorityFinder = new Thread() - { - @Override - public void run() - { - Arrays.stream(entries).parallel().forEach(entry -> - { - for (ComparableEntry p : priorityEntries) - { - if (p.matches(entry)) - { - currentPriorityEntries.add(entry); - return; - } - } - }); - - state.decrementAndGet(); - } - }; - - private Thread swapFinder = new Thread() - { - @Override - public void run() - { - Arrays.stream(entries).parallel().forEach(entry -> - { - for (Map.Entry p : swaps.entrySet()) - { - if (p.getValue().matches(entry)) - { - currentSwaps.put(p.getKey(), entry); - return; - } - } - }); - - state.decrementAndGet(); - } - }; + return false; + }).collect(Collectors.toCollection(HashSet::new)); } -} + + // This could use some optimization + private void indexPriorityEntries(Set entries) + { + safeCurrentPriorityEntries.clear(); + entries.parallelStream().forEach(entry -> + { + for (ComparableEntry p : priorityEntries) + { + if (p.matches(entry)) + { + safeCurrentPriorityEntries.put(entry, p); + break; + } + } + }); + + leftClickEntry = Iterables.getLast(safeCurrentPriorityEntries.entrySet().stream() + .sorted(Comparator.comparingInt(e -> e.getValue().getPriority())) + .map(Map.Entry::getKey) + .collect(Collectors.toList())); + } + + private void indexSwapEntries(Set entries) + { + MenuEntry first = Iterables.getLast(entries); + + leftClickEntry = entries.parallelStream().filter(entry -> + { + for (Map.Entry p : swaps.entrySet()) + { + if (p.getKey().matches(first) && p.getValue().matches(entry)) + { + return true; + } + } + return false; + }).findFirst().orElse(null); + } +} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerPlugin.java index 9b8bcbdeb6..d9464b1dd6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerPlugin.java @@ -102,12 +102,12 @@ public class ShiftWalkerPlugin extends Plugin { if (this.shiftLoot) { - menuManager.addPriorityEntry(TAKE); + menuManager.addPriorityEntry(TAKE).setPriority(100); } if (this.shiftWalk) { - menuManager.addPriorityEntry(WALK_HERE); + menuManager.addPriorityEntry(WALK_HERE).setPriority(90); } } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index 1df5621284..12ac9e5957 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -1304,7 +1304,6 @@ public abstract class RSClientMixin implements RSClient final MenuOpened event = new MenuOpened(); event.setMenuEntries(getMenuEntries()); callbacks.post(event); - client.setMenuEntries(event.getMenuEntries()); } @Inject From 7b8bd02bf89b0685326a06c13423ceb5e3dd7825 Mon Sep 17 00:00:00 2001 From: James Munson Date: Thu, 4 Jul 2019 20:45:56 -0700 Subject: [PATCH 031/472] Add ItemFinder util --- .../net/runelite/client/util/ItemFinder.java | 94 +++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 runelite-client/src/main/java/net/runelite/client/util/ItemFinder.java diff --git a/runelite-client/src/main/java/net/runelite/client/util/ItemFinder.java b/runelite-client/src/main/java/net/runelite/client/util/ItemFinder.java new file mode 100644 index 0000000000..4f62062c97 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/util/ItemFinder.java @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2018, Shaun Dreclin + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.client.util; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import javax.inject.Inject; +import net.runelite.api.Client; +import net.runelite.api.InventoryID; +import net.runelite.api.Item; +import net.runelite.api.ItemContainer; + +public class ItemFinder +{ + @Inject + private Client client; + + public List find(Container container, Match match, Integer... itemIDs) + { + ItemContainer inventory = client.getItemContainer(InventoryID.INVENTORY); + ItemContainer equipment = client.getItemContainer(InventoryID.EQUIPMENT); + List inputIDs = new ArrayList<>(Arrays.asList(itemIDs)); + List foundIDs = new ArrayList<>(); + List foundItems = new ArrayList<>(); + List items = new ArrayList<>(); + + if (inventory != null && equipment != null) + { + if (container == Container.INVENTORY || container == Container.INVENTORY_AND_EQUIPMENT) + { + items.addAll(Arrays.asList(inventory.getItems())); + } + + if (container == Container.EQUIPMENT || container == Container.INVENTORY_AND_EQUIPMENT) + { + items.addAll(Arrays.asList(equipment.getItems())); + } + + for (Item item : items) + { + if (inputIDs.contains(item.getId())) + { + foundIDs.add(item.getId()); + foundItems.add(item); + } + } + + //todo: make this work with multiples of the same item in inputIDs + if (match == Match.ALL_ITEMS && !foundIDs.containsAll(inputIDs)) + { + foundItems = Collections.emptyList(); + } + } + + return foundItems; + } + + public enum Container + { + INVENTORY, + EQUIPMENT, + INVENTORY_AND_EQUIPMENT + } + + public enum Match + { + ALL_ITEMS, + ANY_ITEM + } +} From 35fffe6299f9e674a13e93dd9c4314c4cfa76455 Mon Sep 17 00:00:00 2001 From: James Munson Date: Thu, 4 Jul 2019 21:09:27 -0700 Subject: [PATCH 032/472] removes max draw distance of ground markers --- .../plugins/groundmarkers/GroundMarkerMinimapOverlay.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerMinimapOverlay.java index b4c3b21d75..c2d2f06bb3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerMinimapOverlay.java @@ -45,7 +45,6 @@ import net.runelite.client.ui.overlay.OverlayUtil; @Singleton class GroundMarkerMinimapOverlay extends Overlay { - private static final int MAX_DRAW_DISTANCE = 16; private static final int TILE_WIDTH = 4; private static final int TILE_HEIGHT = 4; @@ -103,12 +102,6 @@ class GroundMarkerMinimapOverlay extends Overlay private void drawOnMinimap(Graphics2D graphics, WorldPoint point, Color color) { - WorldPoint playerLocation = client.getLocalPlayer().getWorldLocation(); - - if (point.distanceTo(playerLocation) >= MAX_DRAW_DISTANCE) - { - return; - } LocalPoint lp = LocalPoint.fromWorld(client, point); if (lp == null) From 4dd049edd716774695d676962adcc4515c1e9228 Mon Sep 17 00:00:00 2001 From: 7ate9 <7ate9@users.noreply.github.com`> Date: Fri, 5 Jul 2019 00:16:34 -0400 Subject: [PATCH 033/472] menumanager: fix NoElementException --- .../src/main/java/net/runelite/client/menus/MenuManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java index 888e9f032e..e4052bc110 100644 --- a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java +++ b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java @@ -796,7 +796,7 @@ public class MenuManager leftClickEntry = Iterables.getLast(safeCurrentPriorityEntries.entrySet().stream() .sorted(Comparator.comparingInt(e -> e.getValue().getPriority())) .map(Map.Entry::getKey) - .collect(Collectors.toList())); + .collect(Collectors.toList()), null); } private void indexSwapEntries(Set entries) From dfc3bb03107d55819d8e7245c0e4015cffca04d2 Mon Sep 17 00:00:00 2001 From: Zeruth Date: Fri, 5 Jul 2019 01:01:25 -0400 Subject: [PATCH 034/472] fixes varbit loss, whoopsie :p --- .../main/java/net/runelite/api/Varbits.java | 112 ++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/Varbits.java b/runelite-api/src/main/java/net/runelite/api/Varbits.java index 283509583b..5afca13486 100644 --- a/runelite-api/src/main/java/net/runelite/api/Varbits.java +++ b/runelite-api/src/main/java/net/runelite/api/Varbits.java @@ -541,6 +541,118 @@ public enum Varbits EXPLORER_RING_ALCHS(4554), EXPLORER_RING_RUNENERGY(4553), + /** + * Temple Trekking + */ + TREK_POINTS(1955), + TREK_STARTED(1956), + TREK_EVENT(1958), + TREK_STATUS(6719), + BLOAT_ENTERED_ROOM(6447), + + /** + * f2p Quest varbits, these don't hold the completion value. + */ + QUEST_DEMON_SLAYER(2561), + QUEST_GOBLIN_DIPLOMACY(2378), + QUEST_MISTHALIN_MYSTERY(3468), + QUEST_THE_CORSAIR_CURSE(6071), + QUEST_X_MARKS_THE_SPOT(8063), + + /** + * member Quest varbits, these don't hold the completion value. + */ + QUEST_ANIMAL_MAGNETISM(3185), + QUEST_BETWEEN_A_ROCK(299), + QUEST_CONTACT(3274), + QUEST_ZOGRE_FLESH_EATERS(487), + QUEST_DARKNESS_OF_HALLOWVALE(2573), + QUEST_DEATH_TO_THE_DORGESHUUN(2258), + QUEST_DESERT_TREASURE(358), + QUEST_DEVIOUS_MINDS(1465), + QUEST_EAGLES_PEAK(2780), + QUEST_ELEMENTAL_WORKSHOP_II(2639), + QUEST_ENAKHRAS_LAMENT(1560), + QUEST_ENLIGHTENED_JOURNEY(2866), + QUEST_THE_EYES_OF_GLOUPHRIE(2497), + QUEST_FAIRYTALE_I_GROWING_PAINS(1803), + QUEST_FAIRYTALE_II_CURE_A_QUEEN(2326), + QUEST_THE_FEUD(334), // 14 = able to pickpocket + QUEST_FORGETTABLE_TALE(822), + QUEST_GARDEN_OF_TRANQUILLITY(961), + QUEST_GHOSTS_AHOY(217), + QUEST_THE_GIANT_DWARF(571), + QUEST_THE_GOLEM(346), + QUEST_HORROR_FROM_THE_DEEP(34), + QUEST_ICTHLARINS_LITTLE_HELPER(418), + QUEST_IN_AID_OF_THE_MYREQUE(1990), + QUEST_THE_LOST_TRIBE(532), + QUEST_LUNAR_DIPLOMACY(2448), + QUEST_MAKING_HISTORY(1383), + QUEST_MOUNTAIN_DAUGHTER(260), + QUEST_MOURNINGS_ENDS_PART_II(1103), + QUEST_MY_ARMS_BIG_ADVENTURE(2790), + QUEST_RATCATCHERS(1404), + QUEST_RECIPE_FOR_DISASTER(1850), + QUEST_RECRUITMENT_DRIVE(657), + QUEST_ROYAL_TROUBLE(2140), + QUEST_THE_SLUG_MENACE(2610), + QUEST_SHADOW_OF_THE_STORM(1372), + QUEST_A_SOULS_BANE(2011), + QUEST_SPIRITS_OF_THE_ELID(1444), + QUEST_SWAN_SONG(2098), + QUEST_A_TAIL_OF_TWO_CATS(1028), + QUEST_TEARS_OF_GUTHIX(451), + QUEST_WANTED(1051), + QUEST_COLD_WAR(3293), + QUEST_THE_FREMENNIK_ISLES(3311), + QUEST_TOWER_OF_LIFE(3337), + QUEST_WHAT_LIES_BELOW(3523), + QUEST_OLAFS_QUEST(3534), + QUEST_ANOTHER_SLICE_OF_HAM(3550), + QUEST_DREAM_MENTOR(3618), + QUEST_GRIM_TALES(2783), + QUEST_KINGS_RANSOM(3888), + QUEST_MONKEY_MADNESS_II(5027), + QUEST_CLIENT_OF_KOUREND(5619), + QUEST_BONE_VOYAGE(5795), + QUEST_THE_QUEEN_OF_THIEVES(6037), + QUEST_THE_DEPTHS_OF_DESPAIR(6027), + QUEST_DRAGON_SLAYER_II(6104), + QUEST_TALE_OF_THE_RIGHTEOUS(6358), + QUEST_A_TASTE_OF_HOPE(6396), + QUEST_MAKING_FRIENDS_WITH_MY_ARM(6528), + QUEST_THE_ASCENT_OF_ARCEUUS(7856), + QUEST_THE_FORSAKEN_TOWER(7796), + + /** + * mini-quest varbits, these don't hold the completion value. + */ + QUEST_ARCHITECTURAL_ALLIANCE(4982), + QUEST_BEAR_YOUR_SOUL(5078), + QUEST_CURSE_OF_THE_EMPTY_LORD(821), + QUEST_ENCHANTED_KEY(1391), + QUEST_THE_GENERALS_SHADOW(3330), + QUEST_SKIPPY_AND_THE_MOGRES(1344), + QUEST_LAIR_OF_TARN_RAZORLOR(3290), + QUEST_FAMILY_PEST(5347), + QUEST_THE_MAGE_ARENA_II(6067), + + /** + * Active spellbook (see enumID) + */ + SPELLBOOK(4070), + + /** + * Spellbook filtering (1 = unfiltered, 0 = filtered) + */ + FILTER_SPELLBOOK(6718), + + /** + * POH Building mode (1 = yes, 0 = no) + */ + BUILDING_MODE(2176), + WINTERTODT_TIMER(7980); /** From 3dc92fb055b9dbc9f80310f1e4f5f8d3c5c9c5b4 Mon Sep 17 00:00:00 2001 From: Zeruth Date: Fri, 5 Jul 2019 01:27:40 -0400 Subject: [PATCH 035/472] bumps our poms --- deobfuscator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deobfuscator/pom.xml b/deobfuscator/pom.xml index babd26ed24..32ffa4c8c8 100644 --- a/deobfuscator/pom.xml +++ b/deobfuscator/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT deobfuscator From 0362a421badb220c5f9f740d50c5129a457b30c1 Mon Sep 17 00:00:00 2001 From: Zeruth Date: Fri, 5 Jul 2019 01:28:08 -0400 Subject: [PATCH 036/472] bumps our poms --- injected-client/pom.xml | 2 +- injector-plugin/pom.xml | 2 +- runescape-client/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/injected-client/pom.xml b/injected-client/pom.xml index 474adda69b..02899fa99b 100644 --- a/injected-client/pom.xml +++ b/injected-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT injected-client diff --git a/injector-plugin/pom.xml b/injector-plugin/pom.xml index a80ce1afb3..46c1477263 100644 --- a/injector-plugin/pom.xml +++ b/injector-plugin/pom.xml @@ -30,7 +30,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT net.runelite.rs diff --git a/runescape-client/pom.xml b/runescape-client/pom.xml index 04e2850dde..6c336bfb0e 100644 --- a/runescape-client/pom.xml +++ b/runescape-client/pom.xml @@ -5,7 +5,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT net.runelite.rs From 9c21a9e1aac42c4880c7ec633968c3d0581787d1 Mon Sep 17 00:00:00 2001 From: Zeruth Date: Fri, 5 Jul 2019 01:38:06 -0400 Subject: [PATCH 037/472] bumps our poms --- runelite-plugin-archetype/pom.xml | 2 +- runescape-client/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-plugin-archetype/pom.xml b/runelite-plugin-archetype/pom.xml index 1fd933b70e..15ff5ed7f8 100644 --- a/runelite-plugin-archetype/pom.xml +++ b/runelite-plugin-archetype/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT runelite-plugin-archetype diff --git a/runescape-client/pom.xml b/runescape-client/pom.xml index 6c336bfb0e..611fd54161 100644 --- a/runescape-client/pom.xml +++ b/runescape-client/pom.xml @@ -16,7 +16,7 @@ net.runelite.rs runescape-api - 1.5.28-SNAPSHOT + 1.5.29-SNAPSHOT From 608c66766b3f354a5a8ea670a5b319b6dfc63e0a Mon Sep 17 00:00:00 2001 From: James Munson Date: Thu, 4 Jul 2019 23:07:02 -0700 Subject: [PATCH 038/472] Incremental Builds --- pom.xml | 34 +++++++++++++++++++ .../resources/archetype-resources/pom.xml | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6a3fe52405..820b29c1fa 100644 --- a/pom.xml +++ b/pom.xml @@ -58,6 +58,7 @@ 3.0.0-M1 2.5.3 2.18 + 1.13.9 true true @@ -236,6 +237,11 @@ + + io.takari.maven.plugins + takari-lifecycle-plugin + ${maven.takari-lifecycle-plugin.verson} + org.apache.maven.plugins maven-compiler-plugin @@ -243,6 +249,9 @@ ${java.version} ${java.version} + + true + true @@ -328,10 +337,35 @@ maven-jar-plugin ${maven.jar.plugin.version} + + io.takari.maven.plugins + takari-lifecycle-plugin + ${maven.takari-lifecycle-plugin.verson} + + + compile + + compile + + compile + + 8 + proc + + javac + + + + org.apache.maven.plugins maven-compiler-plugin ${maven.compiler.plugin.version} + + + true + true + diff --git a/runelite-plugin-archetype/src/main/resources/archetype-resources/pom.xml b/runelite-plugin-archetype/src/main/resources/archetype-resources/pom.xml index 11882b973e..101f936b5c 100644 --- a/runelite-plugin-archetype/src/main/resources/archetype-resources/pom.xml +++ b/runelite-plugin-archetype/src/main/resources/archetype-resources/pom.xml @@ -5,7 +5,7 @@ \${groupId} \${artifactId} \${version} - jar + takari-jar UTF-8 From aa403a9b57d29d422bec9ff2ace8b94b3a82d8fb Mon Sep 17 00:00:00 2001 From: 7ate9 <7ate9@users.noreply.github.com`> Date: Fri, 5 Jul 2019 12:04:10 -0400 Subject: [PATCH 039/472] menumanager: fix slow swaps --- .../net/runelite/client/menus/MenuManager.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java index e4052bc110..8b228280be 100644 --- a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java +++ b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java @@ -287,6 +287,11 @@ public class MenuManager return; } + rebuildLeftClickMenu(); + } + + private void rebuildLeftClickMenu() + { entries.clear(); entries.addAll(Arrays.asList(client.getMenuEntries())); @@ -428,10 +433,15 @@ public class MenuManager @Subscribe public void onMenuOptionClicked(MenuOptionClicked event) { - if (!client.isMenuOpen() && leftClickEntry != null) + if (!client.isMenuOpen()) { - event.setMenuEntry(leftClickEntry); - leftClickEntry = null; + rebuildLeftClickMenu(); + + if (leftClickEntry != null) + { + event.setMenuEntry(leftClickEntry); + leftClickEntry = null; + } } if (event.getMenuAction() != MenuAction.RUNELITE) From 3da044ea3a25dbdc26dd10772f49a535f042fcdd Mon Sep 17 00:00:00 2001 From: Damen Date: Fri, 5 Jul 2019 14:25:22 -0400 Subject: [PATCH 040/472] Add Dragonfire Shield timer to timers plugin (#9234) --- .../src/main/java/net/runelite/api/AnimationID.java | 1 + .../net/runelite/client/plugins/timers/GameTimer.java | 3 ++- .../runelite/client/plugins/timers/TimersConfig.java | 10 ++++++++++ .../runelite/client/plugins/timers/TimersPlugin.java | 5 +++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/runelite-api/src/main/java/net/runelite/api/AnimationID.java b/runelite-api/src/main/java/net/runelite/api/AnimationID.java index 7aa4a7f8a3..316feda5d0 100644 --- a/runelite-api/src/main/java/net/runelite/api/AnimationID.java +++ b/runelite-api/src/main/java/net/runelite/api/AnimationID.java @@ -155,6 +155,7 @@ public final class AnimationID public static final int SAND_COLLECTION = 895; public static final int PISCARILIUS_CRANE_REPAIR = 7199; public static final int HOME_MAKE_TABLET = 4067; + public static final int DRAGONFIRE_SHIELD_SPECIAL = 6696; // NPC animations public static final int TZTOK_JAD_MAGIC_ATTACK = 2656; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java index 529103d204..40a6c97ecb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java @@ -78,7 +78,8 @@ enum GameTimer STAFF_OF_THE_DEAD(ItemID.STAFF_OF_THE_DEAD, GameTimerImageType.ITEM, "Staff of the Dead", 1, ChronoUnit.MINUTES), ABYSSAL_SIRE_STUN(ItemID.ABYSSAL_ORPHAN, GameTimerImageType.ITEM, "Abyssal Sire Stun", 30, ChronoUnit.SECONDS, true), HOME_TELEPORT(SpriteID.SPELL_LUMBRIDGE_HOME_TELEPORT, GameTimerImageType.SPRITE, "Home Teleport", 30, ChronoUnit.MINUTES), - MINIGAME_TELEPORT(SpriteID.TAB_QUESTS_RED_MINIGAMES, GameTimerImageType.SPRITE, "Minigame Teleport", 20, ChronoUnit.MINUTES); + MINIGAME_TELEPORT(SpriteID.TAB_QUESTS_RED_MINIGAMES, GameTimerImageType.SPRITE, "Minigame Teleport", 20, ChronoUnit.MINUTES), + DRAGON_FIRE_SHIELD(ItemID.DRAGONFIRE_SHIELD_11284, GameTimerImageType.ITEM, "Dragonfire Shield Special", 2, ChronoUnit.MINUTES); @Getter private final Duration duration; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersConfig.java index dd42787d73..eef5c4d613 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersConfig.java @@ -200,4 +200,14 @@ public interface TimersConfig extends Config { return true; } + + @ConfigItem( + keyName = "showDfsSpecial", + name = "Dragonfire Shield special timer", + description = "Configures whether the special attack cooldown timer for the Dragonfire Shield is displayed" + ) + default boolean showDFSSpecial() + { + return true; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index d8d4c07cee..a1b2a04f1c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -706,6 +706,11 @@ public class TimersPlugin extends Plugin } } + if (config.showDFSSpecial() && lastAnimation == AnimationID.DRAGONFIRE_SHIELD_SPECIAL) + { + createGameTimer(DRAGON_FIRE_SHIELD); + } + lastAnimation = client.getLocalPlayer().getAnimation(); } From e7bb1c1e07444b0de4ae1a1310a4b1a9b8329831 Mon Sep 17 00:00:00 2001 From: SomeBall-1 Date: Fri, 5 Jul 2019 11:26:17 -0700 Subject: [PATCH 041/472] Add option to swap Talk-to with Enchant for Eluned (#9183) --- .../menuentryswapper/MenuEntrySwapperConfig.java | 10 ++++++++++ .../menuentryswapper/MenuEntrySwapperPlugin.java | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java index 8d9ee74b8a..8fa26b7f2f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java @@ -291,4 +291,14 @@ public interface MenuEntrySwapperConfig extends Config { return true; } + + @ConfigItem( + keyName = "swapEnchant", + name = "Enchant", + description = "Swap Talk-to with Enchant for Eluned" + ) + default boolean swapEnchant() + { + return true; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java index a443fe0800..264a7b4105 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java @@ -455,6 +455,11 @@ public class MenuEntrySwapperPlugin extends Plugin { swap("quick-travel", option, target, true); } + + if (config.swapEnchant()) + { + swap("enchant", option, target, true); + } } else if (config.swapTravel() && option.equals("pass") && target.equals("energy barrier")) { From a8cf657e4c7de2a31ef130fe321930e307dbfbb4 Mon Sep 17 00:00:00 2001 From: sdburns1998 <49877861+sdburns1998@users.noreply.github.com> Date: Fri, 5 Jul 2019 20:27:51 +0200 Subject: [PATCH 042/472] Add a button to the info panel to open the log dir (and fix the discord (#894) * Add a button to the info panel to open the log dir (and fix the discord invite link) * Use user defined font * Fix versionPanel layout * Checkstyle --- .../java/net/runelite/client/RuneLite.java | 4 +-- .../client/plugins/info/InfoPanel.java | 30 +++++++++++++++--- .../client/plugins/info/folder_icon.png | Bin 0 -> 673 bytes .../client/plugins/info/wiki_icon.png | Bin 894 -> 0 bytes 4 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/info/folder_icon.png delete mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/info/wiki_icon.png diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java index f4626b10a0..862ddd2981 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java @@ -88,8 +88,8 @@ public class RuneLite public static final File PROFILES_DIR = new File(RUNELITE_DIR, "profiles"); public static final File PLUGIN_DIR = new File(RUNELITE_DIR, "plugins"); public static final File SCREENSHOT_DIR = new File(RUNELITE_DIR, "screenshots"); - static final RuneLiteSplashScreen splashScreen = new RuneLiteSplashScreen(); - + public static final File LOGS_DIR = new File(RUNELITE_DIR, "logs"); + private static final RuneLiteSplashScreen splashScreen = new RuneLiteSplashScreen(); @Getter private static Injector injector; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java index c3157b9b85..6b71f552a6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java @@ -30,10 +30,13 @@ import com.google.inject.Inject; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Cursor; +import java.awt.Desktop; import java.awt.Font; import java.awt.GridLayout; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.io.File; +import java.io.IOException; import java.util.concurrent.ScheduledExecutorService; import javax.annotation.Nullable; import javax.inject.Singleton; @@ -45,6 +48,7 @@ import javax.swing.JPanel; import javax.swing.border.EmptyBorder; import javax.swing.event.HyperlinkEvent; import net.runelite.api.Client; +import static net.runelite.client.RuneLite.LOGS_DIR; import net.runelite.client.RuneLiteProperties; import net.runelite.client.account.SessionManager; import net.runelite.client.config.ConfigManager; @@ -65,9 +69,9 @@ public class InfoPanel extends PluginPanel private static final ImageIcon ARROW_RIGHT_ICON; private static final ImageIcon GITHUB_ICON; + private static final ImageIcon FOLDER_ICON; private static final ImageIcon DISCORD_ICON; private static final ImageIcon PATREON_ICON; - private static final ImageIcon WIKI_ICON; private static final ImageIcon IMPORT_ICON; private final JLabel loggedLabel = new JLabel(); @@ -98,9 +102,9 @@ public class InfoPanel extends PluginPanel { ARROW_RIGHT_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(InfoPanel.class, "/util/arrow_right.png")); GITHUB_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(InfoPanel.class, "github_icon.png")); + FOLDER_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(InfoPanel.class, "folder_icon.png")); DISCORD_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(InfoPanel.class, "discord_icon.png")); PATREON_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(InfoPanel.class, "patreon_icon.png")); - WIKI_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(InfoPanel.class, "wiki_icon.png")); IMPORT_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(InfoPanel.class, "import_icon.png")); } @@ -161,7 +165,7 @@ public class InfoPanel extends PluginPanel actionsContainer = new JPanel(); actionsContainer.setBorder(new EmptyBorder(10, 0, 0, 0)); - actionsContainer.setLayout(new GridLayout(0, 1, 0, 10)); + actionsContainer.setLayout(new GridLayout(5, 1, 0, 10)); syncPanel = buildLinkPanel(IMPORT_ICON, "Import local settings", "to remote RuneLite account", () -> { @@ -177,7 +181,8 @@ public class InfoPanel extends PluginPanel }); actionsContainer.add(buildLinkPanel(GITHUB_ICON, "License info", "for distribution", "https://github.com/runelite-extended/runelite/blob/master/LICENSE")); - actionsContainer.add(buildLinkPanel(DISCORD_ICON, "Talk to us on our", "discord server", "https://discord.gg/s2fzu5U")); + actionsContainer.add(buildLinkPanel(FOLDER_ICON, "Open logs directory", "(for bug reports)", LOGS_DIR)); + actionsContainer.add(buildLinkPanel(DISCORD_ICON, "Talk to us on our", "discord server", "https://discord.gg/HN5gf3m")); actionsContainer.add(buildLinkPanel(PATREON_ICON, "Patreon to support", "the RuneLitePlus devs", runeLiteProperties.getPatreonLink())); /* actionsContainer.add(buildLinkPanel(WIKI_ICON, "Information about", "RuneLite and plugins", runeLiteProperties.getWikiLink()));*/ @@ -188,6 +193,23 @@ public class InfoPanel extends PluginPanel eventBus.register(this); } + /** + * Builds a link panel with a given icon, text and directory to open. + */ + private JPanel buildLinkPanel(ImageIcon icon, String topText, String bottomText, File dir) + { + return buildLinkPanel(icon, topText, bottomText, () -> + { + try + { + Desktop.getDesktop().open(dir); + } + catch (IOException ex) + { + } + }); + } + /** * Builds a link panel with a given icon, text and url to redirect to. */ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/info/folder_icon.png b/runelite-client/src/main/resources/net/runelite/client/plugins/info/folder_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..41aa88c301441011d8c5771b1636eefdf1932b54 GIT binary patch literal 673 zcmV;S0$%-zP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5&!@T5&_cPe*6Fc02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y9E;VFFSW*B00uo6?K~zXf?Uv0h1VI#q$Nx{TU?mbuvGWAN zLU;t>L0DtK){b}qds`tP#8U_xo`KEyPUqBgRZsWm8Dut2@+Eao-Fr*7n(Au&t4hsg za|!m~8s6Z;Xe>{2OHTi}XtoA-@Cqle0rM~d6R-%Ya0Jhw+%=bXFN(+E3|?RdhCEd% zat2}BHL4x=R6S8J3y*LGGqy7kmlBJ38dR$uv$i{n#7TI9Qy8?JiMS)Ni1qa9p4nw- z!npd#l#~qm%cg8)BCbtQcvGOB>$b{8!Z{?LMTz)Zioy$@#dBNLBB}BsAmO!9Cj9O$ z0uqUHE@->@)Dbn|>Z2ZWw(E%k-5}%3Ufa_bMUFmy%2kbO>pf|iDAtC10NqTEVH0!; z>3S{AEj#^R1vMI9i4o-ZMpb5@00000NkvXX Hu0mjfJlq{^ literal 0 HcmV?d00001 diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/info/wiki_icon.png b/runelite-client/src/main/resources/net/runelite/client/plugins/info/wiki_icon.png deleted file mode 100644 index ece6eea18efa998c9fc452cd0620d8a9d301e81e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 894 zcmV-^1A+XBP)CmQP3&VHn1rZ+BfsadmN2B$Yy>ETk?GbTHF{3tkEj zk>bTehrQ@ci13&O5)lQZUF>2C5=sXtf{k=#I+jw~A94(|)zy?$bQiIw!+t~K?&$7n zcJYOQo%hf4`)22z?|XrxW+K%@k|zON1yB#*3;Op-YyD@l4}?7PgZIS5c8`Iw|mvWcWUg&Moe)n%=cE;OIyB*_;fbN8`m zm#m#6nV)J=Hc5@-eUi3xp(Y)h)X+#~$HxKgb+9OT4jxFBA4MC9v=46WZ`i5 zhtKD`?eTcrEiEl2nx;M2*w_e}a|Q+mu9-Al@}2MAa3se`HXHX{U0v1jV8b*`dpJ8g z`^GBP*VotB+1YvCq}xn#+|06>g69B~0T?oTZEbBs*u`uyv+Q)I)2Xz#w?8$xh5(dF z#!fJRMgW6Ch;75+a5xg0B2~-C$jC8%OU*&aNB~y@@a-3rg82YkvI18Em_9`CG=Ni9 zU=_epswzT=bieTs{_gKM$OiFyzqRq;WdH>S5ldo)l92!o0H``da20^hR^V{}wTB3< zl?(uY!xVT9V3g!7<6Cw(9LoIsygoBC^IB1q+^noD)$MkdBW{l;xxKQo@+}gHtVE;H zwe|J&a9rF5;5vXShA&=V9Ka(X#DKi#;^N}_U@-V05{ay>uCD%ESXj`75H=x%P*wF< zFc{RGPG@FuadElJYin!6D#!2l-;mtgK6zHb@Go)w?HDCjXZ~V7DSw794c+(MYPvD|QxVap$m?^y!&6?Ctw>GaAk> zCzEc*#@iB-8S*NTzHY|GTYu65hc`0m3qs Uhggg5>i_@%07*qoM6N<$f`>Voy8r+H From 9d8c96f612d90cd5c7f2a0ee09a0c5f4572f060f Mon Sep 17 00:00:00 2001 From: James Munson Date: Fri, 5 Jul 2019 12:39:07 -0700 Subject: [PATCH 043/472] Incremental Builds --- http-api/pom.xml | 35 +++++++++++++++++++++++++++++++++++ pom.xml | 4 ++-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/http-api/pom.xml b/http-api/pom.xml index ccd886a376..8941ca7970 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -40,6 +40,7 @@ 2.2.6 nogit + 1.7 false @@ -114,5 +115,39 @@ + + + + io.takari.maven.plugins + takari-lifecycle-plugin + ${maven.takari-lifecycle-plugin.verson} + + + compile + + compile + + compile + + 8 + proc + + jdt + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.plugin.version} + + + true + true + + + + diff --git a/pom.xml b/pom.xml index 820b29c1fa..6ecea38310 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ UTF-8 1.8 - 1.18.4 + 1.18.8 8.3 1.2.3 2.8.5 @@ -352,7 +352,7 @@ 8 proc - javac + jdt From 2367f7ee1844eee52d54591cd387c63bd603e11d Mon Sep 17 00:00:00 2001 From: Lucwousin Date: Fri, 5 Jul 2019 23:10:02 +0200 Subject: [PATCH 044/472] Fix hiding player attacks in client, add option to hide cast as well (#896) Tiny bit of refactoring as well --- .../injector/raw/HidePlayerAttacks.java | 82 ++++++++++++++++++- .../main/java/net/runelite/api/Client.java | 13 ++- .../net/runelite/mixins/RSClientMixin.java | 30 ++++++- .../java/net/runelite/rs/api/RSClient.java | 2 +- .../src/main/java/BufferedSource.java | 2 +- runescape-client/src/main/java/Client.java | 4 +- runescape-client/src/main/java/FontName.java | 9 +- runescape-client/src/main/java/Model.java | 4 +- .../src/main/java/ParamKeyDefinition.java | 2 +- .../src/main/java/Projectile.java | 3 +- runescape-client/src/main/java/TilePaint.java | 23 +++--- runescape-client/src/main/java/TriBool.java | 3 +- .../src/main/java/WorldMapCacheName.java | 2 +- .../src/main/java/WorldMapEvent.java | 58 ++++++------- .../src/main/java/WorldMapRegion.java | 4 +- runescape-client/src/main/java/class16.java | 6 +- runescape-client/src/main/java/class227.java | 2 +- runescape-client/src/main/java/class25.java | 3 +- runescape-client/src/main/java/class40.java | 4 +- 19 files changed, 187 insertions(+), 69 deletions(-) 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 index 249d1e4774..e4160e7519 100644 --- a/injector-plugin/src/main/java/net/runelite/injector/raw/HidePlayerAttacks.java +++ b/injector-plugin/src/main/java/net/runelite/injector/raw/HidePlayerAttacks.java @@ -2,6 +2,7 @@ package net.runelite.injector.raw; import com.google.common.base.Stopwatch; import java.util.Iterator; +import java.util.ListIterator; import net.runelite.asm.Method; import net.runelite.asm.attributes.code.Instruction; import net.runelite.asm.attributes.code.Instructions; @@ -9,9 +10,12 @@ 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.BiPush; import net.runelite.asm.attributes.code.instructions.GetStatic; +import net.runelite.asm.attributes.code.instructions.IAnd; import net.runelite.asm.attributes.code.instructions.IfACmpEq; import net.runelite.asm.attributes.code.instructions.IfACmpNe; +import net.runelite.asm.attributes.code.instructions.IfICmpNe; import net.runelite.asm.attributes.code.instructions.IfNe; import net.runelite.asm.attributes.code.instructions.InvokeStatic; import net.runelite.asm.pool.Field; @@ -31,14 +35,28 @@ public class HidePlayerAttacks this.inject = inject; } + private Method addPlayerOptions; + private net.runelite.asm.pool.Method shouldHideAttackOptionFor; + public void inject() throws InjectionException { Stopwatch stopwatch = Stopwatch.createStarted(); - final Method addPlayerOptions = InjectUtil.findStaticMethod(inject, "addPlayerToMenu"); + addPlayerOptions = InjectUtil.findStaticMethod(inject, "addPlayerToMenu"); + shouldHideAttackOptionFor = inject.getVanilla().findClass("client").findMethod("shouldHideAttackOptionFor").getPoolMethod(); + + injectHideAttack(); + injectHideCast(); + + stopwatch.stop(); + + log.info("HidePlayerAttacks took {}", stopwatch.toString()); + } + + private void injectHideAttack() throws InjectionException + { 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 @@ -123,9 +141,65 @@ public class HidePlayerAttacks IfNe i3 = new IfNe(ins, label); ins.addInstruction(injectIdx, i3); + } - stopwatch.stop(); + private void injectHideCast() throws InjectionException + { + // LABEL before + // BIPUSH 8 + // LDC (garbage) + // GETSTATIC selectedSpellFlags + // IMUL + // BIPUSH 8 + // IAND + // IF_ICMPNE -> skip adding option + // + // <--- Inject call here + // <--- Inject comparison here (duh) + // + // add option n such - log.info("HidePlayerAttacks took {}", stopwatch.toString()); + Instructions ins = addPlayerOptions.getCode().getInstructions(); + ListIterator iterator = ins.getInstructions().listIterator(); + while (iterator.hasNext()) + { + Instruction i = iterator.next(); + if (!(i instanceof BiPush) || (byte) ((BiPush) i).getConstant() != 8) + { + continue; + } + + i = iterator.next(); + while (!(i instanceof BiPush) || (byte) ((BiPush) i).getConstant() != 8) + { + i = iterator.next(); + } + + i = iterator.next(); + if (!(i instanceof IAnd)) + { + throw new InjectionException("Yikes I didn't expect this"); + } + + i = iterator.next(); + if (!(i instanceof IfICmpNe)) + { + throw new InjectionException("Yikes I didn't expect this"); + } + + Label target = ((IfICmpNe) i).getJumps().get(0); + + // Load the player + ALoad i1 = new ALoad(ins, 0); + // Get the boolean + InvokeStatic i2 = new InvokeStatic(ins, shouldHideAttackOptionFor); + // Compare n such + IfNe i3 = new IfNe(ins, target); + + iterator.add(i1); + iterator.add(i2); + iterator.add(i3); + return; + } } } 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 3be392090f..4b0748ff0e 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -27,6 +27,7 @@ package net.runelite.api; import java.awt.Canvas; import java.awt.Dimension; import java.util.EnumSet; +import java.util.HashSet; import java.util.List; import java.util.Map; import javax.annotation.Nullable; @@ -1661,12 +1662,22 @@ public interface Client extends GameShell String getSelectedSpellName(); - boolean getIsSpellSelected(); + boolean isSpellSelected(); /** * Set whether or not player attack options will be hidden for clanmembers/friends */ void setHideFriendAttackOptions(boolean yes); + + /** + * Set whether or not player cast options will be hidden for clanmembers/friends + */ + void setHideFriendCastOptions(boolean yes); + + /** + * Set spells excluded from above hiding + */ + void setUnhiddenCasts(HashSet casts); /** * Sorts the current menu entries in the same way the client does this. diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index 12ac9e5957..aa35cd7468 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -24,6 +24,7 @@ */ package net.runelite.mixins; +import java.util.HashSet; import net.runelite.api.ChatMessageType; import net.runelite.api.ClanMember; import net.runelite.api.EnumDefinition; @@ -200,7 +201,13 @@ public abstract class RSClientMixin implements RSClient } @Inject - private static boolean hideFriendAttackOptions; + private static boolean hideFriendAttackOptions = false; + + @Inject + private static boolean hideFriendCastOptions = false; + + @Inject + private static HashSet unhiddenCasts = new HashSet(); @Inject @Override @@ -209,6 +216,20 @@ public abstract class RSClientMixin implements RSClient hideFriendAttackOptions = yes; } + @Inject + @Override + public void setHideFriendCastOptions(boolean yes) + { + hideFriendCastOptions = yes; + } + + @Inject + @Override + public void setUnhiddenCasts(HashSet casts) + { + unhiddenCasts = casts; + } + @Inject public RSClientMixin() { @@ -1577,6 +1598,13 @@ public abstract class RSClientMixin implements RSClient @Inject static boolean shouldHideAttackOptionFor(RSPlayer p) { + if (client.isSpellSelected()) + { + return hideFriendCastOptions + && (p.isFriended() || p.isClanMember()) + && !unhiddenCasts.contains(client.getSelectedSpellName()); + } + return hideFriendAttackOptions && p.isFriended() || p.isClanMember(); } } \ No newline at end of file diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index 17f88f3eb3..a17b549563 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java @@ -1012,7 +1012,7 @@ public interface RSClient extends RSGameShell, Client String getSelectedSpellName(); @Import("isSpellSelected") - boolean getIsSpellSelected(); + boolean isSpellSelected(); @Import("readSoundEffect") RSSoundEffect getTrack(RSAbstractIndexCache indexData, int id, int var0); diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index 2f5483c779..e4ac03e286 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -271,7 +271,7 @@ public class BufferedSource implements Runnable { Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; } - long var5 = FontName.method5637(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); + long var5 = FontName.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); var2.playerCycle = Client.cycle; class65.scene.method285(SoundSystem.plane, var2.x, var2.y, class32.getTileHeight(var2.size * 64 - 64 + var2.x, var2.size * 64 - 64 + var2.y, SoundSystem.plane), var2.size * 64 - 64 + 60, var2, var2.field9, var5, var2.field10); } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 10787ccfb1..4f5a6cb4e3 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -2156,7 +2156,7 @@ public final class Client extends GameShell implements Usernamed { for (var21 = 0; var21 < 104; ++var21) { for (var56 = 0; var56 < 104; ++var56) { - TilePaint.method3061(var21, var56); + TilePaint.updateItemPile(var21, var56); } } @@ -5311,7 +5311,7 @@ public final class Client extends GameShell implements Usernamed { for (var6 = Canvas.field95; var6 < Canvas.field95 + 8; ++var6) { if (groundItems[SoundSystem.plane][var37][var6] != null) { groundItems[SoundSystem.plane][var37][var6] = null; - TilePaint.method3061(var37, var6); + TilePaint.updateItemPile(var37, var6); } } } diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 7e7b4c6584..3cebc659a2 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -54,10 +54,11 @@ public class FontName { signature = "(IIIZII)J", garbageValue = "1039369805" ) - public static long method5637(int var0, int var1, int var2, boolean var3, int var4) { - long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; - if (var3) { - var5 |= 65536L; + @Export("calculateTag") + public static long calculateTag(int x, int y, int type, boolean isNotInteractable, int identifier) { + long var5 = (long)((x & 0b1111111) << 0 | (y & 0b1111111) << 7 | (type & 0b11) << 14) | ((long)identifier & 0xffffffffL) << 17; + if (isNotInteractable) { + var5 |= 0x10000L; } return var5; diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index 1d8fefe2ee..236da05475 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -1123,7 +1123,7 @@ public class Model extends Entity { int var17; if (!var1 || var10 != -5000 && var11 != -5000 && var12 != -5000) { if (var2 && NPCDefinition.method5164(modelViewportYs[var8], modelViewportYs[var16], modelViewportYs[var9], var10, var11, var12, var6)) { - Projectile.method2081(var4); + Projectile.addEntityTagAtMouse(var4); var2 = false; } @@ -1609,7 +1609,7 @@ public class Model extends Entity { if (var35) { if (this.isSingleTile) { - Projectile.method2081(var9); + Projectile.addEntityTagAtMouse(var9); } else { var31 = true; } diff --git a/runescape-client/src/main/java/ParamKeyDefinition.java b/runescape-client/src/main/java/ParamKeyDefinition.java index da1d214b1e..6e1ae779da 100644 --- a/runescape-client/src/main/java/ParamKeyDefinition.java +++ b/runescape-client/src/main/java/ParamKeyDefinition.java @@ -207,7 +207,7 @@ public class ParamKeyDefinition extends DualNode { int var23 = var22[var18][var21] + var22[var19][var20] + var22[var18][var20] + var22[var19][var21] >> 2; int var24 = (var2 << 7) + (var39 << 6); int var25 = (var3 << 7) + (var17 << 6); - long var26 = FontName.method5637(var2, var3, 2, var38.int1 == 0, var4); + long var26 = FontName.calculateTag(var2, var3, 2, var38.int1 == 0, var4); int var28 = (var5 << 6) + var6; if (var38.int3 == 1) { var28 += 256; diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index 75b778240c..f1c3efecb7 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -268,7 +268,8 @@ public final class Projectile extends Entity { } @ObfuscatedName("g") - static final void method2081(long var0) { + @Export("addEntityTagAtMouse") + static final void addEntityTagAtMouse(long var0) { ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; } diff --git a/runescape-client/src/main/java/TilePaint.java b/runescape-client/src/main/java/TilePaint.java index e42027a483..2f21f70ab0 100644 --- a/runescape-client/src/main/java/TilePaint.java +++ b/runescape-client/src/main/java/TilePaint.java @@ -68,13 +68,14 @@ public final class TilePaint { signature = "(IIB)V", garbageValue = "0" ) - static final void method3061(int var0, int var1) { + @Export("updateItemPile") + static final void updateItemPile(int var0, int var1) { NodeDeque var2 = Client.groundItems[SoundSystem.plane][var0][var1]; if (var2 == null) { class65.scene.removeGroundItemPile(SoundSystem.plane, var0, var1); } else { - long var3 = -99999999L; - GroundItem var5 = null; + long highestValue = -99999999L; + GroundItem highestValuedItem = null; GroundItem var6; for (var6 = (GroundItem)var2.last(); var6 != null; var6 = (GroundItem)var2.previous()) { @@ -84,21 +85,21 @@ public final class TilePaint { var8 *= (long)(var6.quantity + 1); } - if (var8 > var3) { - var3 = var8; - var5 = var6; + if (var8 > highestValue) { + highestValue = var8; + highestValuedItem = var6; } } - if (var5 == null) { + if (highestValuedItem == null) { class65.scene.removeGroundItemPile(SoundSystem.plane, var0, var1); } else { - var2.addLast(var5); + var2.addLast(highestValuedItem); GroundItem var11 = null; GroundItem var12 = null; for (var6 = (GroundItem)var2.last(); var6 != null; var6 = (GroundItem)var2.previous()) { - if (var5.id != var6.id) { + if (highestValuedItem.id != var6.id) { if (var11 == null) { var11 = var6; } @@ -109,8 +110,8 @@ public final class TilePaint { } } - long var9 = FontName.method5637(var0, var1, 3, false, 0); - class65.scene.newGroundItemPile(SoundSystem.plane, var0, var1, class32.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, SoundSystem.plane), var5, var9, var11, var12); + long var9 = FontName.calculateTag(var0, var1, 3, false, 0); + class65.scene.newGroundItemPile(SoundSystem.plane, var0, var1, class32.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, SoundSystem.plane), highestValuedItem, var9, var11, var12); } } diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index d15489313e..9202703d44 100644 --- a/runescape-client/src/main/java/TriBool.java +++ b/runescape-client/src/main/java/TriBool.java @@ -36,7 +36,8 @@ public class TriBool { signature = "(I)V", garbageValue = "-1009406649" ) - static void method5560() { + @Export("addTargetPlayerToScene") + static void addTargetPlayerToScene() { if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { WorldMapCacheName.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 8a9ca944f4..5f0a3c4402 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -154,7 +154,7 @@ public class WorldMapCacheName { int var2 = var0.x >> 7; int var3 = var0.y >> 7; if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { - long var4 = FontName.method5637(0, 0, 0, false, var0.index); + long var4 = FontName.calculateTag(0, 0, 0, false, var0.index); if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { var0.isUnanimated = false; var0.tileHeight = class32.getTileHeight(var0.x, var0.y, SoundSystem.plane); diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index 09242f979c..a3188d88f5 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -78,18 +78,18 @@ public class WorldMapEvent { return; } - long var10 = ViewportMouse.ViewportMouse_entityTags[var8]; - if (var6 != var10) { + long tag = ViewportMouse.ViewportMouse_entityTags[var8]; + if (var6 != tag) { label276: { - var6 = var10; - int var12 = method780(var8); + var6 = tag; + int x = method780(var8); long var13 = ViewportMouse.ViewportMouse_entityTags[var8]; - int var15 = (int)(var13 >>> 7 & 127L); - var15 = var15; + int y = (int)(var13 >>> 7 & 127L); + y = y; int var16 = GrandExchangeEvent.method80(var8); - int var17 = ClientPreferences.method1808(var8); - if (var16 == 2 && class65.scene.getObjectFlags(SoundSystem.plane, var12, var15, var10) >= 0) { - ObjectDefinition var18 = class50.getObjectDefinition(var17); + int identifier = ClientPreferences.method1808(var8); + if (var16 == 2 && class65.scene.getObjectFlags(SoundSystem.plane, x, y, tag) >= 0) { + ObjectDefinition var18 = class50.getObjectDefinition(identifier); if (var18.transforms != null) { var18 = var18.transform(); } @@ -99,10 +99,10 @@ public class WorldMapEvent { } if (Client.isItemSelected == 1) { - Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(65535) + var18.name, 1, var17, var12, var15); + Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(65535) + var18.name, 1, identifier, x, y); } else if (Client.isSpellSelected) { if ((FloorDecoration.selectedSpellFlags & 4) == 4) { - Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(65535) + var18.name, 2, var17, var12, var15); + Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(65535) + var18.name, 2, identifier, x, y); } } else { String[] var19 = var18.actions; @@ -130,12 +130,12 @@ public class WorldMapEvent { var21 = 1001; } - Tiles.insertMenuItemNoShift(var19[var20], BufferedFile.colorStartTag(65535) + var18.name, var21, var17, var12, var15); + Tiles.insertMenuItemNoShift(var19[var20], BufferedFile.colorStartTag(65535) + var18.name, var21, identifier, x, y); } } } - Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(65535) + var18.name, 1002, var18.id, var12, var15); + Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(65535) + var18.name, 1002, var18.id, x, y); } } @@ -145,7 +145,7 @@ public class WorldMapEvent { Player var32; int[] var34; if (var16 == 1) { - NPC var23 = Client.npcs[var17]; + NPC var23 = Client.npcs[identifier]; if (var23 == null) { break label276; } @@ -154,7 +154,7 @@ public class WorldMapEvent { for (var30 = 0; var30 < Client.npcCount; ++var30) { var31 = Client.npcs[Client.npcIndices[var30]]; if (var31 != null && var23 != var31 && var31.definition.size == 1 && var31.x == var23.x && var31.y == var23.y) { - Tile.addNpcToMenu(var31.definition, Client.npcIndices[var30], var12, var15); + Tile.addNpcToMenu(var31.definition, Client.npcIndices[var30], x, y); } } @@ -164,16 +164,16 @@ public class WorldMapEvent { for (var22 = 0; var22 < var30; ++var22) { var32 = Client.players[var34[var22]]; if (var32 != null && var32.x == var23.x && var32.y == var23.y) { - TotalQuantityComparator.addPlayerToMenu(var32, var34[var22], var12, var15); + TotalQuantityComparator.addPlayerToMenu(var32, var34[var22], x, y); } } } - Tile.addNpcToMenu(var23.definition, var17, var12, var15); + Tile.addNpcToMenu(var23.definition, identifier, x, y); } if (var16 == 0) { - Player var33 = Client.players[var17]; + Player var33 = Client.players[identifier]; if (var33 == null) { break label276; } @@ -182,7 +182,7 @@ public class WorldMapEvent { for (var30 = 0; var30 < Client.npcCount; ++var30) { var31 = Client.npcs[Client.npcIndices[var30]]; if (var31 != null && var31.definition.size == 1 && var33.x == var31.x && var33.y == var31.y) { - Tile.addNpcToMenu(var31.definition, Client.npcIndices[var30], var12, var15); + Tile.addNpcToMenu(var31.definition, Client.npcIndices[var30], x, y); } } @@ -192,28 +192,28 @@ public class WorldMapEvent { for (var22 = 0; var22 < var30; ++var22) { var32 = Client.players[var34[var22]]; if (var32 != null && var32 != var33 && var32.x == var33.x && var32.y == var33.y) { - TotalQuantityComparator.addPlayerToMenu(var32, var34[var22], var12, var15); + TotalQuantityComparator.addPlayerToMenu(var32, var34[var22], x, y); } } } - if (var17 != Client.combatTargetPlayerIndex) { - TotalQuantityComparator.addPlayerToMenu(var33, var17, var12, var15); + if (identifier != Client.combatTargetPlayerIndex) { + TotalQuantityComparator.addPlayerToMenu(var33, identifier, x, y); } else { - var4 = var10; + var4 = tag; } } if (var16 == 3) { - NodeDeque var35 = Client.groundItems[SoundSystem.plane][var12][var15]; + NodeDeque var35 = Client.groundItems[SoundSystem.plane][x][y]; if (var35 != null) { for (GroundItem var24 = (GroundItem)var35.first(); var24 != null; var24 = (GroundItem)var35.next()) { ItemDefinition var25 = Skills.getItemDefinition(var24.id); if (Client.isItemSelected == 1) { - Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16748608) + var25.name, 16, var24.id, var12, var15); + Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16748608) + var25.name, 16, var24.id, x, y); } else if (Client.isSpellSelected) { if ((FloorDecoration.selectedSpellFlags & 1) == 1) { - Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16748608) + var25.name, 17, var24.id, var12, var15); + Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16748608) + var25.name, 17, var24.id, x, y); } } else { String[] var26 = var25.groundActions; @@ -241,13 +241,13 @@ public class WorldMapEvent { var28 = 22; } - Tiles.insertMenuItemNoShift(var26[var27], BufferedFile.colorStartTag(16748608) + var25.name, var28, var24.id, var12, var15); + Tiles.insertMenuItemNoShift(var26[var27], BufferedFile.colorStartTag(16748608) + var25.name, var28, var24.id, x, y); } else if (var27 == 2) { - Tiles.insertMenuItemNoShift("Take", BufferedFile.colorStartTag(16748608) + var25.name, 20, var24.id, var12, var15); + Tiles.insertMenuItemNoShift("Take", BufferedFile.colorStartTag(16748608) + var25.name, 20, var24.id, x, y); } } - Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16748608) + var25.name, 1004, var24.id, var12, var15); + Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16748608) + var25.name, 1004, var24.id, x, y); } } } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 381bc708fe..1abebbf4d6 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -694,13 +694,13 @@ public class WorldMapRegion { boolean var10 = var9 >= class231.field2805.field2820 && var9 <= class231.field2804.field2820 || var9 == class231.field2806.field2820; if (var10) { ObjectDefinition var11 = class50.getObjectDefinition(var8.field199); - int var12 = var11.int1 != 0 ? -3407872 : -3355444; + int var12 = var11.int1 != 0 ? 0xffcc0000 : 0xffcccccc; if (var8.field198 == class231.field2805.field2820) { this.method422(var1, var2, var8.field202, var12); } if (var8.field198 == class231.field2813.field2820) { - this.method422(var1, var2, var8.field202, -3355444); + this.method422(var1, var2, var8.field202, 0xffcccccc); this.method422(var1, var2, var8.field202 + 1, var12); } diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 37218b7f60..3f6bfbfbe4 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -314,7 +314,7 @@ public class class16 { Client.groundItems[SoundSystem.plane][var2][var32] = null; } - TilePaint.method3061(var2, var32); + TilePaint.updateItemPile(var2, var32); } } } else if (class190.field2350 == var0) { @@ -369,7 +369,7 @@ public class class16 { } Client.groundItems[SoundSystem.plane][var3][var4].addFirst(var41); - TilePaint.method3061(var3, var4); + TilePaint.updateItemPile(var3, var4); } } } else { @@ -389,7 +389,7 @@ public class class16 { } } - TilePaint.method3061(var4, var5); + TilePaint.updateItemPile(var4, var5); } } } diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java index c6766b9d27..f0251349b1 100644 --- a/runescape-client/src/main/java/class227.java +++ b/runescape-client/src/main/java/class227.java @@ -52,7 +52,7 @@ public class class227 { int var16 = var15[var12][var14] + var15[var11][var14] + var15[var11][var13] + var15[var12][var13] >> 2; int var17 = (var1 << 7) + (var9 << 6); int var18 = (var2 << 7) + (var10 << 6); - long var19 = FontName.method5637(var1, var2, 2, var8.int1 == 0, var3); + long var19 = FontName.calculateTag(var1, var2, 2, var8.int1 == 0, var3); int var21 = var5 + (var4 << 6); if (var8.int3 == 1) { var21 += 256; diff --git a/runescape-client/src/main/java/class25.java b/runescape-client/src/main/java/class25.java index 59cad88368..c34dc39d8b 100644 --- a/runescape-client/src/main/java/class25.java +++ b/runescape-client/src/main/java/class25.java @@ -72,7 +72,8 @@ public class class25 { signature = "(I)V", garbageValue = "641029128" ) - static void method349() { + @Export("addLocalPlayerToScene") + static void addLocalPlayerToScene() { if (Client.renderSelf) { WorldMapCacheName.addPlayerToScene(Canvas.localPlayer, false); } diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java index 7cd4ebd5af..eec1fab32e 100644 --- a/runescape-client/src/main/java/class40.java +++ b/runescape-client/src/main/java/class40.java @@ -637,8 +637,8 @@ public class class40 { static final void drawEntities(int var0, int var1, int var2, int var3) { ++Client.viewportDrawCount; class229.method4514(); - class25.method349(); - TriBool.method5560(); + class25.addLocalPlayerToScene(); + TriBool.addTargetPlayerToScene(); BufferedSource.method3423(true); int var4 = Players.Players_count; int[] var5 = Players.Players_indices; From 1ec45e09d43be9f4f1ad3f51a637274551644e7a Mon Sep 17 00:00:00 2001 From: James Munson Date: Fri, 5 Jul 2019 15:19:04 -0700 Subject: [PATCH 045/472] Incremental Builds --- .../java/net/runelite/http/api/examine/ExamineClient.java | 2 +- .../java/net/runelite/http/api/ws/WebsocketGsonFactory.java | 6 +++--- .../src/main/java/net/runelite/http/api/xp/XpClient.java | 2 +- pom.xml | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java b/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java index 5997799c2e..9f25c847b9 100644 --- a/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java +++ b/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java @@ -84,7 +84,7 @@ public class ExamineClient public void onResponse(Call call, Response response) { response.close(); - logger.debug("Submitted examine info for {} {}: {}", type, id, text); + //logger.debug("Submitted examine info for {} {}: {}", type, id, text); } }); } diff --git a/http-api/src/main/java/net/runelite/http/api/ws/WebsocketGsonFactory.java b/http-api/src/main/java/net/runelite/http/api/ws/WebsocketGsonFactory.java index 589a538de3..bd6771e00c 100644 --- a/http-api/src/main/java/net/runelite/http/api/ws/WebsocketGsonFactory.java +++ b/http-api/src/main/java/net/runelite/http/api/ws/WebsocketGsonFactory.java @@ -28,7 +28,6 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.List; import net.runelite.http.api.ws.messages.Handshake; import net.runelite.http.api.ws.messages.LoginResponse; @@ -79,8 +78,9 @@ public class WebsocketGsonFactory .create(); } - public static Gson build() + public static boolean build() { - return build(factory(Collections.emptyList())); + //return build(factory(Collections.emptyList())); + return true; } } diff --git a/http-api/src/main/java/net/runelite/http/api/xp/XpClient.java b/http-api/src/main/java/net/runelite/http/api/xp/XpClient.java index c45fe2e209..81c94b747e 100644 --- a/http-api/src/main/java/net/runelite/http/api/xp/XpClient.java +++ b/http-api/src/main/java/net/runelite/http/api/xp/XpClient.java @@ -62,7 +62,7 @@ public class XpClient public void onResponse(Call call, Response response) { response.close(); - logger.debug("Submitted xp track for {}", username); + //logger.debug("Submitted xp track for {}", username); } }); } diff --git a/pom.xml b/pom.xml index 6ecea38310..27b8245644 100644 --- a/pom.xml +++ b/pom.xml @@ -349,7 +349,8 @@ compile - 8 + ${java.version} + ${java.version} proc jdt From 6ce193342bb94afc67704dec762c80d8c2255ad8 Mon Sep 17 00:00:00 2001 From: James Munson Date: Fri, 5 Jul 2019 15:19:37 -0700 Subject: [PATCH 046/472] Revert "Incremental Builds" This reverts commit 9d8c96f6 --- http-api/pom.xml | 35 ----------------------------------- pom.xml | 4 ++-- 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/http-api/pom.xml b/http-api/pom.xml index 8941ca7970..ccd886a376 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -40,7 +40,6 @@ 2.2.6 nogit - 1.7 false @@ -115,39 +114,5 @@ - - - - io.takari.maven.plugins - takari-lifecycle-plugin - ${maven.takari-lifecycle-plugin.verson} - - - compile - - compile - - compile - - 8 - proc - - jdt - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.plugin.version} - - - true - true - - - - diff --git a/pom.xml b/pom.xml index 27b8245644..057d2088d2 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ UTF-8 1.8 - 1.18.8 + 1.18.4 8.3 1.2.3 2.8.5 @@ -353,7 +353,7 @@ ${java.version} proc - jdt + javac From 7412a29a54448b1daf7da8f9f4e7aee5005591b3 Mon Sep 17 00:00:00 2001 From: James Munson Date: Fri, 5 Jul 2019 15:20:30 -0700 Subject: [PATCH 047/472] Revert "Incremental Builds" This reverts commit 9d8c96f6 --- pom.xml | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/pom.xml b/pom.xml index 057d2088d2..6a3fe52405 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,6 @@ 3.0.0-M1 2.5.3 2.18 - 1.13.9 true true @@ -237,11 +236,6 @@ - - io.takari.maven.plugins - takari-lifecycle-plugin - ${maven.takari-lifecycle-plugin.verson} - org.apache.maven.plugins maven-compiler-plugin @@ -249,9 +243,6 @@ ${java.version} ${java.version} - - true - true @@ -337,36 +328,10 @@ maven-jar-plugin ${maven.jar.plugin.version} - - io.takari.maven.plugins - takari-lifecycle-plugin - ${maven.takari-lifecycle-plugin.verson} - - - compile - - compile - - compile - - ${java.version} - ${java.version} - proc - - javac - - - - org.apache.maven.plugins maven-compiler-plugin ${maven.compiler.plugin.version} - - - true - true - From 8688a87a94ab2e441d4cec4899aa6134d7f769d4 Mon Sep 17 00:00:00 2001 From: James Munson Date: Fri, 5 Jul 2019 15:21:07 -0700 Subject: [PATCH 048/472] "Incremental Builds" --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index 6a3fe52405..912efca8b3 100644 --- a/pom.xml +++ b/pom.xml @@ -243,6 +243,10 @@ ${java.version} ${java.version} + + false From 1ac52afd4c9ca2dba4c0e8fb8cad1b3c0afaa31c Mon Sep 17 00:00:00 2001 From: James Munson Date: Fri, 5 Jul 2019 15:36:27 -0700 Subject: [PATCH 049/472] "Incremental Builds" --- .../java/net/runelite/http/api/examine/ExamineClient.java | 2 +- .../java/net/runelite/http/api/ws/WebsocketGsonFactory.java | 6 +++--- .../src/main/java/net/runelite/http/api/xp/XpClient.java | 2 +- pom.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java b/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java index 9f25c847b9..5997799c2e 100644 --- a/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java +++ b/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java @@ -84,7 +84,7 @@ public class ExamineClient public void onResponse(Call call, Response response) { response.close(); - //logger.debug("Submitted examine info for {} {}: {}", type, id, text); + logger.debug("Submitted examine info for {} {}: {}", type, id, text); } }); } diff --git a/http-api/src/main/java/net/runelite/http/api/ws/WebsocketGsonFactory.java b/http-api/src/main/java/net/runelite/http/api/ws/WebsocketGsonFactory.java index bd6771e00c..589a538de3 100644 --- a/http-api/src/main/java/net/runelite/http/api/ws/WebsocketGsonFactory.java +++ b/http-api/src/main/java/net/runelite/http/api/ws/WebsocketGsonFactory.java @@ -28,6 +28,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import net.runelite.http.api.ws.messages.Handshake; import net.runelite.http.api.ws.messages.LoginResponse; @@ -78,9 +79,8 @@ public class WebsocketGsonFactory .create(); } - public static boolean build() + public static Gson build() { - //return build(factory(Collections.emptyList())); - return true; + return build(factory(Collections.emptyList())); } } diff --git a/http-api/src/main/java/net/runelite/http/api/xp/XpClient.java b/http-api/src/main/java/net/runelite/http/api/xp/XpClient.java index 81c94b747e..c45fe2e209 100644 --- a/http-api/src/main/java/net/runelite/http/api/xp/XpClient.java +++ b/http-api/src/main/java/net/runelite/http/api/xp/XpClient.java @@ -62,7 +62,7 @@ public class XpClient public void onResponse(Call call, Response response) { response.close(); - //logger.debug("Submitted xp track for {}", username); + logger.debug("Submitted xp track for {}", username); } }); } diff --git a/pom.xml b/pom.xml index 912efca8b3..83026664b7 100644 --- a/pom.xml +++ b/pom.xml @@ -312,7 +312,7 @@ io.github.zlika - reproducible-build-maven-plugin + reproducible-build-maven-plugin//logger.debug("Submitted xp track for {}", username); ${zlika.reproducible.build.maven.plugin.version} From 842b6a7495df8a130ee7e4f010914b9178b3bdb0 Mon Sep 17 00:00:00 2001 From: James Munson Date: Fri, 5 Jul 2019 15:37:21 -0700 Subject: [PATCH 050/472] "Incremental Builds" --- pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 83026664b7..912efca8b3 100644 --- a/pom.xml +++ b/pom.xml @@ -312,7 +312,7 @@ io.github.zlika - reproducible-build-maven-plugin//logger.debug("Submitted xp track for {}", username); + reproducible-build-maven-plugin ${zlika.reproducible.build.maven.plugin.version} diff --git a/runelite-plugin-archetype/src/main/resources/archetype-resources/pom.xml b/runelite-plugin-archetype/src/main/resources/archetype-resources/pom.xml index 101f936b5c..11882b973e 100644 --- a/runelite-plugin-archetype/src/main/resources/archetype-resources/pom.xml +++ b/runelite-plugin-archetype/src/main/resources/archetype-resources/pom.xml @@ -5,7 +5,7 @@ \${groupId} \${artifactId} \${version} - takari-jar + jar UTF-8 From 189838dfd156afe11a423750f6887b707983e433 Mon Sep 17 00:00:00 2001 From: James Munson Date: Fri, 5 Jul 2019 15:55:46 -0700 Subject: [PATCH 051/472] Update maven-compiler-plugin and allow incremental compilation --- pom.xml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 912efca8b3..1a6725a618 100644 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,7 @@ UTF-8 + false 1.8 1.18.4 8.3 @@ -53,7 +54,7 @@ 0.7 3.0.2 - 3.6.1 + 3.8.1 2.17 3.0.0-M1 2.5.3 @@ -243,10 +244,6 @@ ${java.version} ${java.version} - - false From eade0e8f7298f774e57e9096efb9ba79782bca30 Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Sat, 6 Jul 2019 00:52:02 +0100 Subject: [PATCH 052/472] Fix PvP issues (#900) * fixes attack & cast options fixes clan members always showing walkhere, even when hide options is unticked. removed option from clanmanmode and added to just pvptools. removed unneccessary stuff from pvptools amended menuentryswapper to reflect the new mixins. amended mixin. * fix wilderness lines * Update PvpToolsPlugin.java --- .../clanmanmode/ClanManModeConfig.java | 11 - .../clanmanmode/ClanManModePlugin.java | 4 - .../MenuEntrySwapperPlugin.java | 93 ++----- .../MultiIndicatorsPlugin.java | 2 +- .../plugins/pvptools/PvpToolsConfig.java | 81 +----- .../plugins/pvptools/PvpToolsPlugin.java | 252 ++---------------- .../net/runelite/mixins/RSClientMixin.java | 2 +- 7 files changed, 42 insertions(+), 403 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeConfig.java index 5c39cc30d3..dc71d8108c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeConfig.java @@ -151,17 +151,6 @@ public interface ClanManModeConfig extends Config return false; } - @ConfigItem( - position = 13, - keyName = "hideatkopt", - name = "Hide attack option for clan members", - description = "Disables attack option for clan members" - ) - default boolean hideAtkOpt() - { - return false; - } - @ConfigItem( position = 14, keyName = "showclanmembers", 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 dbee4e7291..9a7d13f310 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 @@ -68,7 +68,6 @@ public class ClanManModePlugin extends Plugin overlayManager.add(ClanManModeOverlay); overlayManager.add(ClanManModeTileOverlay); overlayManager.add(ClanManModeMinimapOverlay); - client.setHideFriendAttackOptions(config.hideAtkOpt()); } @Override @@ -77,7 +76,6 @@ public class ClanManModePlugin extends Plugin overlayManager.remove(ClanManModeOverlay); overlayManager.remove(ClanManModeTileOverlay); overlayManager.remove(ClanManModeMinimapOverlay); - client.setHideFriendAttackOptions(false); clan.clear(); ticks = 0; wildernessLevel = 0; @@ -93,8 +91,6 @@ public class ClanManModePlugin extends Plugin { return; } - - client.setHideFriendAttackOptions(config.hideAtkOpt()); } @Subscribe diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java index 05ce35a254..4623594ead 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java @@ -122,14 +122,7 @@ public class MenuEntrySwapperPlugin extends Plugin private static final String CONFIG_GROUP = "shiftclick"; private static final String ITEM_KEY_PREFIX = "item_"; private static final int PURO_PURO_REGION_ID = 10307; - private static final String WALK_HERE = "WALK HERE"; - private static final String CANCEL = "CANCEL"; - private static final String CAST_OPTIONS_ATTACK = "CAST"; - private static final HashSet CAST_OPTIONS_KEYWORDS = new HashSet<>(); - static - { - CAST_OPTIONS_KEYWORDS.add(CAST_OPTIONS_ATTACK); - } + private MenuEntry[] entries; private final Set leftClickConstructionItems = new HashSet<>(); @@ -338,6 +331,8 @@ public class MenuEntrySwapperPlugin extends Plugin updateConfig(); addSwaps(); loadConstructionItems(config.getEasyConstructionItems()); + client.setHideFriendCastOptions(config.getRemoveFreezePlayerToB()); + client.setHideFriendCastOptions(config.getRemoveFreezePlayerCoX()); if (config.shiftClickCustomization()) { @@ -350,6 +345,7 @@ public class MenuEntrySwapperPlugin extends Plugin @Override public void shutDown() { + client.setHideFriendCastOptions(false); disableCustomization(); loadConstructionItems(""); loadCustomSwaps(""); // Removes all custom swaps @@ -395,6 +391,22 @@ public class MenuEntrySwapperPlugin extends Plugin { clientThread.invoke(this::resetItemDefinitionCache); } + + if (event.getKey().equals("removeFreezePlayerToB")) + { + if (this.getRemoveFreezePlayerToB && client.getVar(Varbits.THEATRE_OF_BLOOD) == 2) + { + client.setHideFriendCastOptions(config.getRemoveFreezePlayerToB()); + } + } + + if (event.getKey().equals("removeFreezePlayerCoX")) + { + if (this.getRemoveFreezePlayerCoX && client.getVar(Varbits.IN_RAID) == 1) + { + client.setHideFriendCastOptions(config.getRemoveFreezePlayerCoX()); + } + } } private void resetItemDefinitionCache() @@ -1052,28 +1064,6 @@ public class MenuEntrySwapperPlugin extends Plugin } } - //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)) - { - Player[] players = client.getCachedPlayers(); - int identifier = event.getIdentifier(); - - if (identifier >= 0 && identifier < players.length) - { - Player player = players[identifier]; - if (player != null) - { - if (((this.getRemoveFreezePlayerCoX && client.getVar(Varbits.IN_RAID) == 1) - || (this.getRemoveFreezePlayerToB && client.getVar(Varbits.THEATRE_OF_BLOOD) == 2)) - && (player.isFriend() || player.isClanMember()) - && CAST_OPTIONS_KEYWORDS.contains(pOptionToReplace)) - { - addswap(pOptionToReplace); - } - } - } - } - if (option.equals("talk-to")) { if (this.swapPickpocket) @@ -1703,49 +1693,6 @@ public class MenuEntrySwapperPlugin extends Plugin menuManager.removePriorityEntry("climb-down"); } -/** - * Swaps menu entries if the entries could be found. This places Walk Here where the top level menu option was. - * @param pOptionToReplace The String containing the Menu Option that needs to be replaced. IE: "Attack", "Chop Down". - */ - private void addswap(String pOptionToReplace) - { - MenuEntry[] entries = client.getMenuEntries(); - Integer walkHereEntry = searchIndex(entries, WALK_HERE); - Integer entryToReplace = searchIndex(entries, pOptionToReplace); - - if (walkHereEntry != null - && entryToReplace != null) - { - MenuEntry walkHereMenuEntry = entries[walkHereEntry]; - entries[walkHereEntry] = entries[entryToReplace]; - entries[entryToReplace] = walkHereMenuEntry; - client.setMenuEntries(entries); - } - } - -/** - * Finds the index of the menu that contains the verbiage we are looking for. - * @param pMenuEntries The list of {@link MenuEntry}s. - * @param pMenuEntryToSearchFor The Option in the menu to search for. - * @return The index location or null if it was not found. - */ - private Integer searchIndex(MenuEntry[] pMenuEntries, String pMenuEntryToSearchFor) - { - Integer indexLocation = 0; - - for (MenuEntry menuEntry : pMenuEntries) - { - String entryOption = Text.removeTags(menuEntry.getOption()).toUpperCase(); - - if (entryOption.equals(pMenuEntryToSearchFor)) - { - return indexLocation; - } - indexLocation++; - } - return null; - } - private void updateConfig() { this.getWithdrawOne = config.getWithdrawOne(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java index c9b025502f..9f6fb91f2b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java @@ -400,7 +400,7 @@ public class MultiIndicatorsPlugin extends Plugin this.multicombatZoneVisibility = config.multicombatZoneVisibility(); this.showPvpSafeZones = config.showPvpSafeZones(); this.showDeadmanSafeZones = config.showDeadmanSafeZones(); - this.showWildernessLevelLines = config.showDeadmanSafeZones(); + this.showWildernessLevelLines = config.showWildernessLevelLines(); this.showMinimapLines = config.showMinimapLines(); this.multicombatColor = config.multicombatColor(); this.safeZoneColor = config.safeZoneColor(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsConfig.java index c5d5d8c383..bd0b9e17e3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsConfig.java @@ -84,20 +84,6 @@ public interface PvpToolsConfig extends Config return false; } - @ConfigItem( - keyName = "hideAttackMode", - name = "Mode", - description = "", - position = 6, - group = "Right-Click Attack Options", - hidden = true, - unhide = "hideAttack" - ) - default AttackMode hideAttackMode() - { - return AttackMode.FRIENDS; - } - @ConfigItem( keyName = "hideCast", name = "Hide cast", @@ -110,70 +96,6 @@ public interface PvpToolsConfig extends Config return false; } - @ConfigItem( - keyName = "hideCastMode", - name = "Mode", - description = "", - position = 8, - group = "Right-Click Attack Options", - hidden = true, - unhide = "hideCast" - ) - default AttackMode hideCastMode() - { - return AttackMode.FRIENDS; - } - - @ConfigItem( - keyName = "hideCastIgnored", - name = "Ignored spells", - description = "Spells that should not be hidden from being cast, separated by a comma", - position = 9, - group = "Right-Click Attack Options", - hidden = true, - unhide = "hideCast" - ) - default String hideCastIgnored() - { - return "cure other, energy transfer, heal other, vengeance other"; - } - - @ConfigItem( - keyName = "attackOptionsClan", - name = "Move CC Attack Option", - description = "Moves the attack option for people in the same CC", - position = 10, - group = "Right-Click Attack Options" - ) - default boolean attackOptionsClan() - { - return false; - } - - @ConfigItem( - keyName = "attackOptionsFriend", - name = "Move Friend Attack Options", - description = "Moves the attack option for people on your friends list", - position = 11, - group = "Right-Click Attack Options" - ) - default boolean attackOptionsFriend() - { - return false; - } - - @ConfigItem( - keyName = "levelRangeAttackOptions", - name = "Moves Other Attack Options", - description = "Moves the attack option for people that are outside your level range", - position = 12, - group = "Right-Click Attack Options" - ) - default boolean levelRangeAttackOptions() - { - return false; - } - @ConfigItem( keyName = "riskCalculator", name = "Risk Calculator", @@ -206,5 +128,4 @@ public interface PvpToolsConfig extends Config { return true; } - -} +} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java index 2e54b09cf0..ad858dccf8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java @@ -15,10 +15,8 @@ import com.google.inject.Provides; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.image.BufferedImage; -import java.util.Arrays; import java.util.ArrayList; import java.util.Comparator; -import java.util.HashSet; import java.util.List; import java.util.NavigableMap; import java.util.Objects; @@ -36,15 +34,11 @@ import net.runelite.api.GameState; import net.runelite.api.InventoryID; import net.runelite.api.Item; import net.runelite.api.ItemDefinition; -import net.runelite.api.MenuEntry; import net.runelite.api.Player; import net.runelite.api.SkullIcon; import net.runelite.api.events.ConfigChanged; -import net.runelite.api.events.FocusChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.ItemContainerChanged; -import net.runelite.api.events.MenuEntryAdded; -import net.runelite.api.events.MenuOpened; import net.runelite.api.events.PlayerDespawned; import net.runelite.api.events.PlayerSpawned; import net.runelite.client.config.ConfigManager; @@ -67,7 +61,6 @@ import net.runelite.client.util.PvPUtil; import static net.runelite.client.util.StackFormatter.quantityToRSDecimalStack; import net.runelite.client.util.Text; import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.StringUtils; @PluginDescriptor( name = "PvP Tools", @@ -91,10 +84,6 @@ public class PvpToolsPlugin extends Plugin private CurrentPlayersJFrame currentPlayersJFrame; private NavigationButton navButton; - @Getter(AccessLevel.PACKAGE) - @Setter(AccessLevel.PACKAGE) - private boolean attackHotKeyPressed; - @Getter(AccessLevel.PACKAGE) @Setter(AccessLevel.PACKAGE) private boolean hideAll; @@ -110,17 +99,6 @@ public class PvpToolsPlugin extends Plugin private PvpToolsPlugin uhPvpToolsPlugin = this; - private static final String WALK_HERE = "WALK HERE"; - private static final String CANCEL = "CANCEL"; - private static final String CAST = "CAST"; - private static final String ATTACK_OPTIONS_ATTACK = "ATTACK"; - private static final HashSet ATTACK_OPTIONS_KEYWORDS = new HashSet<>(); - static - { - ATTACK_OPTIONS_KEYWORDS.add(CAST); - ATTACK_OPTIONS_KEYWORDS.add(ATTACK_OPTIONS_ATTACK); - } - /** * ActionListener for the missing cc members and refresh buttons */ @@ -167,18 +145,12 @@ public class PvpToolsPlugin extends Plugin private boolean fallInHelper; private Keybind hotkey; private Keybind renderSelf; - private boolean hideAttack; - private AttackMode hideAttackMode; - private boolean hideCast; - private AttackMode hideCastMode; - private String hideCastIgnored; - private boolean attackOptionsClan; - private boolean attackOptionsFriend; - private boolean levelRangeAttackOptions; private boolean riskCalculatorEnabled; private boolean missingPlayersEnabled; private boolean currentPlayersEnabled; - + private boolean hideAttack; + private boolean hideCast; + @Inject private ClientToolbar clientToolbar; @@ -209,7 +181,6 @@ public class PvpToolsPlugin extends Plugin private int[] overheadCount = new int[]{0, 0, 0}; - private List ignoredSpells = new ArrayList(); @Getter private int enemyPlayerCount = 0; @Getter @@ -270,10 +241,11 @@ public class PvpToolsPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - + overlayManager.add(pvpToolsOverlay); overlayManager.add(playerCountOverlay); - + client.setHideFriendAttackOptions(this.hideAttack); + client.setHideFriendCastOptions(this.hideCast); keyManager.registerKeyListener(fallinHotkeyListener); keyManager.registerKeyListener(renderselfHotkeyListener); final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "skull.png"); @@ -303,7 +275,6 @@ public class PvpToolsPlugin extends Plugin panel.currentPlayers.setVisible(true); } - ignoredSpells = Arrays.asList(this.hideCastIgnored.toLowerCase().split("\\s*,\\s*")); } @Override @@ -314,15 +285,24 @@ public class PvpToolsPlugin extends Plugin keyManager.unregisterKeyListener(fallinHotkeyListener); keyManager.unregisterKeyListener(renderselfHotkeyListener); clientToolbar.removeNavigation(navButton); + client.setHideFriendAttackOptions(false); + client.setHideFriendCastOptions(false); } @Subscribe public void onConfigChanged(ConfigChanged configChanged) { + if (!"pvptools".equals(configChanged.getGroup())) + { + return; + } + client.setHideFriendAttackOptions(this.hideAttack); + client.setHideFriendCastOptions(this.hideCast); + if (configChanged.getGroup().equals("pvptools")) { updateConfig(); - + switch (configChanged.getKey()) { case "countPlayers": @@ -367,9 +347,6 @@ public class PvpToolsPlugin extends Plugin panel.currentPlayers.setVisible(true); } break; - case "hideCastIgnored": - ignoredSpells = Arrays.asList(this.hideCastIgnored.toLowerCase().split("\\s*,\\s*")); - break; default: break; } @@ -428,115 +405,6 @@ public class PvpToolsPlugin extends Plugin } } - @Subscribe - public void onMenuEntryAdded(MenuEntryAdded menuEntryAdded) - { - if (this.attackOptionsFriend || this.attackOptionsClan || this.levelRangeAttackOptions) - { - final String pOptionToReplace = Text.removeTags(menuEntryAdded.getOption()).toUpperCase(); - - if (client.getGameState() != GameState.LOGGED_IN) - { - return; - } - - if (pOptionToReplace.equals(CANCEL) || pOptionToReplace.equals(WALK_HERE)) - { - return; - } - - Player[] players = client.getCachedPlayers(); - Player player = null; - int identifier = menuEntryAdded.getIdentifier(); - if (identifier >= 0 && identifier < players.length) - { - player = players[identifier]; - } - if (player == null) - { - return; - } - - - if (attackHotKeyPressed && this.attackOptionsClan || this.attackOptionsFriend || - this.levelRangeAttackOptions) - { - if (this.attackOptionsFriend && player.isFriend()) - { - swap(pOptionToReplace); - } - else if (this.attackOptionsClan && player.isClanMember()) - { - swap(pOptionToReplace); - } - else if (this.levelRangeAttackOptions && !PvPUtil.isAttackable(client, player)) - { - swap(pOptionToReplace); - } - } - } - } - - @Subscribe - public void onMenuOpened(MenuOpened event) - { - Player localPlayer = client.getLocalPlayer(); - - if (localPlayer == null) - { - return; - } - - List menu = new ArrayList<>(); - - for (MenuEntry entry : event.getMenuEntries()) - { - String option = Text.removeTags(entry.getOption()).toLowerCase(); - String target = Text.removeTags(entry.getTarget()).toLowerCase(); - - int identifier = entry.getIdentifier(); - - Player[] players = client.getCachedPlayers(); - Player player = null; - - if (identifier >= 0 && identifier < players.length) - { - player = players[identifier]; - } - - if (player == null) - { - menu.add(entry); - continue; - } - - if (option.contains("attack") && this.hideAttack && shouldHide(this.hideAttackMode, player)) - { - continue; - } - - else if (option.contains("cast") && this.hideCast && shouldHide(this.hideCastMode, player) - && !ignoredSpells.contains(StringUtils.substringBefore(target, " ->"))) - { - continue; - } - - menu.add(entry); - } - - client.setMenuEntries(menu.toArray(new MenuEntry[0])); - } - - @Subscribe - public void onFocusChanged(FocusChanged focusChanged) - { - if (!focusChanged.isFocused()) - { - setAttackHotKeyPressed(false); - } - } - - /** * Enables or disables the fall in helper feature */ @@ -570,7 +438,6 @@ public class PvpToolsPlugin extends Plugin panel.numMeleeJLabel.repaint(); } - private void updatePlayers() { friendlyPlayerCount = 0; @@ -727,81 +594,6 @@ public class PvpToolsPlugin extends Plugin panel.biggestItemLabel.repaint(); } - /** - * Swaps menu entries if the entries could be found. This places Walk Here where the top level menu option was. - * @param pOptionToReplace The String containing the Menu Option that needs to be replaced. IE: "Attack", "Chop Down". - */ - private void swap(String pOptionToReplace) - { - MenuEntry[] entries = client.getMenuEntries(); - Integer walkHereEntry = searchIndex(entries, WALK_HERE); - Integer entryToReplace = searchIndex(entries, pOptionToReplace); - - if (walkHereEntry != null - && entryToReplace != null) - { - MenuEntry walkHereMenuEntry = entries[walkHereEntry]; - entries[walkHereEntry] = entries[entryToReplace]; - entries[entryToReplace] = walkHereMenuEntry; - client.setMenuEntries(entries); - } - } - - /** - * Finds the index of the menu that contains the verbiage we are looking for. - * @param pMenuEntries The list of {@link MenuEntry}s. - * @param pMenuEntryToSearchFor The Option in the menu to search for. - * @return The index location or null if it was not found. - */ - private Integer searchIndex(MenuEntry[] pMenuEntries, String pMenuEntryToSearchFor) - { - Integer indexLocation = 0; - - for (MenuEntry menuEntry : pMenuEntries) - { - String entryOption = Text.removeTags(menuEntry.getOption()).toUpperCase(); - - if (entryOption.equals(pMenuEntryToSearchFor)) - { - return indexLocation; - } - indexLocation++; - } - return null; - } - - /** - * Given an AttackMode, checks whether or not a player should be hidden. - * @param mode The {@link AttackMode} the player should be checked against. - * @param player The player that should be checked. - * @return True if the player should be hidden, false otherwise. - */ - private boolean shouldHide(AttackMode mode, Player player) - { - switch (mode) - { - case CLAN: - if (player.isClanMember()) - { - return true; - } - break; - case FRIENDS: - if (player.isFriend()) - { - return true; - } - break; - case BOTH: - if (player.isClanMember() || player.isFriend()) - { - return true; - } - break; - } - - return false; - } private void updateConfig() { @@ -810,16 +602,10 @@ public class PvpToolsPlugin extends Plugin this.fallInHelper = config.fallInHelper(); this.hotkey = config.hotkey(); this.renderSelf = config.renderSelf(); - this.hideAttack = config.hideAttack(); - this.hideAttackMode = config.hideAttackMode(); - this.hideCast = config.hideCast(); - this.hideCastMode = config.hideCastMode(); - this.hideCastIgnored = config.hideCastIgnored(); - this.attackOptionsClan = config.attackOptionsClan(); - this.attackOptionsFriend = config.attackOptionsFriend(); - this.levelRangeAttackOptions = config.levelRangeAttackOptions(); this.riskCalculatorEnabled = config.riskCalculatorEnabled(); this.missingPlayersEnabled = config.missingPlayersEnabled(); this.currentPlayersEnabled = config.currentPlayersEnabled(); + this.hideAttack = config.hideAttack(); + this.hideCast = config.hideCast(); } -} +} \ No newline at end of file diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index aa35cd7468..782f01915b 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -1605,6 +1605,6 @@ public abstract class RSClientMixin implements RSClient && !unhiddenCasts.contains(client.getSelectedSpellName()); } - return hideFriendAttackOptions && p.isFriended() || p.isClanMember(); + return hideFriendAttackOptions && (p.isFriended() || p.isClanMember()); } } \ No newline at end of file From df6e82eee02679864287363b2f879c56e2747376 Mon Sep 17 00:00:00 2001 From: Tyler Bochard Date: Fri, 5 Jul 2019 17:35:22 -0700 Subject: [PATCH 053/472] Update PluginSorterPlugin.java should fix plugins being visible after a client restard. --- .../client/plugins/pluginsorter/PluginSorterPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java index 9dfc3e30c7..0bed8eb58f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java @@ -88,7 +88,7 @@ public class PluginSorterPlugin extends Plugin { if (gameStateChanged.getGameState() == GameState.LOGIN_SCREEN) { - if (this.hidePlugins) + if (config.hidePlugins()) { hidePlugins(); } From 8ccd0a1618e5fa41385758ce26874ca0b8710d3e Mon Sep 17 00:00:00 2001 From: Zeruth Date: Sat, 6 Jul 2019 01:25:18 -0400 Subject: [PATCH 054/472] fixes plugin organizer not hiding plugins when it should --- .../client/plugins/config/ConfigPanel.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java index 4d569f827c..66978819ce 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java @@ -99,6 +99,7 @@ import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginInstantiationException; import net.runelite.client.plugins.PluginManager; import net.runelite.client.plugins.PluginType; +import net.runelite.client.plugins.pluginsorter.PluginSorterConfig; import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.DynamicGridLayout; import net.runelite.client.ui.FontManager; @@ -261,6 +262,23 @@ public class ConfigPanel extends PluginPanel runeLite.nameLabel.setForeground(Color.WHITE); pluginList.add(runeLite); + List runeLitePlus = new ArrayList<>(); + // populate pluginList with all external Plugins + pluginManager.getPlugins().stream() + .filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.RUNELITPLUS)) + .forEach(plugin -> + { + final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class); + final Config config = pluginManager.getPluginConfigProxy(plugin); + final ConfigDescriptor configDescriptor = config == null ? null : configManager.getConfigDescriptor(config); + + final PluginListItem listItem = new PluginListItem(this, configManager, plugin, descriptor, config, configDescriptor); + listItem.setPinned(pinnedPlugins.contains(listItem.getName())); + runeLitePlus.add(listItem); + }); + runeLitePlus.sort(Comparator.comparing(PluginListItem::getName)); + pluginList.addAll(runeLitePlus); + List externalPlugins = new ArrayList<>(); // populate pluginList with all external Plugins pluginManager.getPlugins().stream() From a12cfd7aed039b57ea76030c5019f82db2236904 Mon Sep 17 00:00:00 2001 From: Zeruth Date: Sat, 6 Jul 2019 01:25:39 -0400 Subject: [PATCH 055/472] sheesh! --- .../runelite/client/plugins/PluginType.java | 1 + .../pluginsorter/PluginSorterPlugin.java | 30 +++++++++---------- .../runeliteplus/RuneLitePlusPlugin.java | 2 +- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/PluginType.java b/runelite-client/src/main/java/net/runelite/client/plugins/PluginType.java index 7061b6a439..8199cf0502 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/PluginType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/PluginType.java @@ -2,6 +2,7 @@ package net.runelite.client.plugins; public enum PluginType { + RUNELITPLUS, PVM, PVP, SKILLING, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java index 0bed8eb58f..8171a85130 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java @@ -36,6 +36,7 @@ import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.PluginChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; @@ -84,16 +85,21 @@ public class PluginSorterPlugin extends Plugin } @Subscribe - public void onGameStateChanged(GameStateChanged gameStateChanged) + public void onPluginChanged(PluginChanged pluginChanged) { - if (gameStateChanged.getGameState() == GameState.LOGIN_SCREEN) + validatePlugins(); + } + + public void validatePlugins() { + if (this.hidePlugins) { - if (config.hidePlugins()) - { - hidePlugins(); - } - updateColors(); + hidePlugins(); } + else + { + showPlugins(); + } + updateColors(); } @Subscribe @@ -108,16 +114,8 @@ public class PluginSorterPlugin extends Plugin if (configChanged.getKey().equals("hidePlugins")) { - if (this.hidePlugins) - { - hidePlugins(); - } - else - { - showPlugins(); - } + validatePlugins(); } - updateColors(); } private void updateColors() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java index c7a807d395..a3940747de 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java @@ -55,7 +55,7 @@ import net.runelite.client.ui.ClientUI; hidden = true, // prevent users from disabling name = "RuneLitePlus", description = "Configures various aspects of RuneLitePlus", - type = PluginType.UTILITY + type = PluginType.RUNELITPLUS ) @Singleton @Slf4j From 1f984a81ca28abf2c2c2979a1f99c3d6aab60fc2 Mon Sep 17 00:00:00 2001 From: se7enAte9 <50936458+se7enAte9@users.noreply.github.com> Date: Sat, 6 Jul 2019 08:33:40 -0400 Subject: [PATCH 056/472] menumanager: fix hidden entries (#898) --- .../main/java/net/runelite/client/menus/MenuManager.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java index 8b228280be..cf8f62744f 100644 --- a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java +++ b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java @@ -325,8 +325,13 @@ public class MenuManager { entries.remove(leftClickEntry); entries.add(leftClickEntry); - client.setMenuEntries(entries.toArray(new MenuEntry[0])); } + else if (!currentHiddenEntries.isEmpty()) + { + leftClickEntry = Iterables.getLast(entries, null); + } + + client.setMenuEntries(entries.toArray(new MenuEntry[0])); } public void addPlayerMenuItem(String menuText) From 5d506e9bdad7ec90298c363d594e92f68ee9b426 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sat, 6 Jul 2019 14:26:03 +0200 Subject: [PATCH 057/472] More rs-client refactoring --- .../src/main/java/AbstractIndexCache.java | 8 +- runescape-client/src/main/java/Actor.java | 2 +- .../src/main/java/AudioFilter.java | 12 +- runescape-client/src/main/java/Buffer.java | 11 +- runescape-client/src/main/java/Canvas.java | 24 ++-- runescape-client/src/main/java/ClanChat.java | 4 +- runescape-client/src/main/java/Client.java | 117 +++++++++--------- .../src/main/java/ClientParameter.java | 4 +- .../main/java/DevicePcmPlayerProvider.java | 14 +-- .../src/main/java/DynamicObject.java | 10 +- .../src/main/java/EnumDefinition.java | 4 +- runescape-client/src/main/java/FontName.java | 2 +- .../src/main/java/FriendsList.java | 2 +- runescape-client/src/main/java/GameShell.java | 12 +- .../src/main/java/GrandExchangeEvent.java | 4 +- .../src/main/java/GrandExchangeEvents.java | 4 +- .../src/main/java/GrandExchangeOffer.java | 2 +- .../src/main/java/HealthBarDefinition.java | 6 +- .../src/main/java/HitSplatDefinition.java | 12 +- .../src/main/java/Instrument.java | 4 +- .../src/main/java/InvDefinition.java | 2 +- .../src/main/java/ItemDefinition.java | 64 +++++----- .../src/main/java/KitDefinition.java | 51 ++++---- .../src/main/java/MenuAction.java | 4 +- .../src/main/java/MidiFileReader.java | 4 +- runescape-client/src/main/java/ModelData.java | 50 ++++---- .../src/main/java/MusicTrack.java | 2 +- .../src/main/java/NPCDefinition.java | 46 +++---- .../src/main/java/ObjectDefinition.java | 40 +++--- runescape-client/src/main/java/Occluder.java | 14 +-- .../java/{class68.java => PendingSpawn.java} | 34 +++-- runescape-client/src/main/java/Player.java | 18 +-- .../src/main/java/PlayerAppearance.java | 10 +- .../src/main/java/ScriptEvent.java | 8 +- .../src/main/java/SecureRandomCallable.java | 4 +- .../src/main/java/SequenceDefinition.java | 18 +-- .../src/main/java/SoundEffect.java | 4 +- .../src/main/java/SoundEnvelope.java | 4 +- .../main/java/SpotAnimationDefinition.java | 18 +-- runescape-client/src/main/java/Texture.java | 4 +- .../src/main/java/VarbitDefinition.java | 2 +- runescape-client/src/main/java/Varcs.java | 12 +- .../src/main/java/VarpDefinition.java | 2 +- runescape-client/src/main/java/Widget.java | 74 +++++------ .../src/main/java/WorldComparator.java | 4 +- .../src/main/java/WorldMapAreaData.java | 8 +- .../{class25.java => WorldMapDecoration.java} | 22 ++-- ...ss231.java => WorldMapDecorationType.java} | 13 +- .../src/main/java/WorldMapElement.java | 2 +- .../src/main/java/WorldMapIcon1.java | 2 +- .../src/main/java/WorldMapRegion.java | 54 ++++---- .../src/main/java/WorldMapSection0.java | 8 +- .../src/main/java/WorldMapSection1.java | 12 +- .../src/main/java/WorldMapSection2.java | 8 +- .../src/main/java/WorldMapSection3.java | 16 +-- runescape-client/src/main/java/class1.java | 8 +- runescape-client/src/main/java/class13.java | 20 +-- runescape-client/src/main/java/class15.java | 10 +- runescape-client/src/main/java/class16.java | 8 +- runescape-client/src/main/java/class171.java | 8 +- runescape-client/src/main/java/class21.java | 12 +- runescape-client/src/main/java/class238.java | 4 +- runescape-client/src/main/java/class258.java | 26 ++-- runescape-client/src/main/java/class39.java | 10 +- runescape-client/src/main/java/class40.java | 4 +- runescape-client/src/main/java/class50.java | 6 +- 66 files changed, 519 insertions(+), 493 deletions(-) rename runescape-client/src/main/java/{class68.java => PendingSpawn.java} (88%) rename runescape-client/src/main/java/{class25.java => WorldMapDecoration.java} (84%) rename runescape-client/src/main/java/{class231.java => WorldMapDecorationType.java} (93%) diff --git a/runescape-client/src/main/java/AbstractIndexCache.java b/runescape-client/src/main/java/AbstractIndexCache.java index c6c7ff1a91..8ba4da29ff 100644 --- a/runescape-client/src/main/java/AbstractIndexCache.java +++ b/runescape-client/src/main/java/AbstractIndexCache.java @@ -121,7 +121,7 @@ public abstract class AbstractIndexCache { if (var3 >= 7) { this.archiveCount = var2.method50(); } else { - this.archiveCount = var2.method43(); + this.archiveCount = var2.readUnsignedShort(); } int var5 = 0; @@ -137,7 +137,7 @@ public abstract class AbstractIndexCache { } } else { for (var7 = 0; var7 < this.archiveCount; ++var7) { - this.archiveIds[var7] = var5 += var2.method43(); + this.archiveIds[var7] = var5 += var2.readUnsignedShort(); if (this.archiveIds[var7] > var6) { var6 = this.archiveIds[var7]; } @@ -169,7 +169,7 @@ public abstract class AbstractIndexCache { } for (var7 = 0; var7 < this.archiveCount; ++var7) { - this.recordCounts[this.archiveIds[var7]] = var2.method43(); + this.recordCounts[this.archiveIds[var7]] = var2.readUnsignedShort(); } int var8; @@ -203,7 +203,7 @@ public abstract class AbstractIndexCache { this.recordIds[var8] = new int[var9]; for (var11 = 0; var11 < var9; ++var11) { - var12 = this.recordIds[var8][var11] = var5 += var2.method43(); + var12 = this.recordIds[var8][var11] = var5 += var2.readUnsignedShort(); if (var12 > var10) { var10 = var12; } diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index 1f1be493c2..8c6154c075 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -919,7 +919,7 @@ public abstract class Actor extends Entity { var13 = class204.getWidgetChild(var1, var0); if (var13 != null) { Player.method1281(); - class25.method350(var1, var0, class211.method4107(class1.getWidgetClickMask(var13)), var13.itemId); + WorldMapDecoration.method350(var1, var0, class211.method4107(class1.getWidgetClickMask(var13)), var13.itemId); Client.isItemSelected = 0; Client.selectedSpellActionName = class198.method3745(var13); if (Client.selectedSpellActionName == null) { diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index 660e6931f5..a1a4b514f1 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -104,24 +104,24 @@ public class AudioFilter { this.field36[0] = var3 >> 4; this.field36[1] = var3 & 15; if (var3 != 0) { - this.field39[0] = var1.method43(); - this.field39[1] = var1.method43(); + this.field39[0] = var1.readUnsignedShort(); + this.field39[1] = var1.readUnsignedShort(); int var4 = var1.readUnsignedByte(); int var5; int var6; for (var5 = 0; var5 < 2; ++var5) { for (var6 = 0; var6 < this.field36[var5]; ++var6) { - this.field37[var5][0][var6] = var1.method43(); - this.field38[var5][0][var6] = var1.method43(); + this.field37[var5][0][var6] = var1.readUnsignedShort(); + this.field38[var5][0][var6] = var1.readUnsignedShort(); } } for (var5 = 0; var5 < 2; ++var5) { for (var6 = 0; var6 < this.field36[var5]; ++var6) { if ((var4 & 1 << var5 * 4 << var6) != 0) { - this.field37[var5][1][var6] = var1.method43(); - this.field38[var5][1][var6] = var1.method43(); + this.field37[var5][1][var6] = var1.readUnsignedShort(); + this.field38[var5][1][var6] = var1.readUnsignedShort(); } else { this.field37[var5][1][var6] = this.field37[var5][0][var6]; this.field38[var5][1][var6] = this.field38[var5][0][var6]; diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index 0c263a1b47..57e9334b33 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -295,7 +295,8 @@ public class Buffer extends Node { signature = "(B)I", garbageValue = "-86" ) - public int method43() { + @Export("readUnsignedShort") + public int readUnsignedShort() { this.index += 2; return (this.array[this.index - 1] & 255) + ((this.array[this.index - 2] & 255) << 8); } @@ -502,7 +503,7 @@ public class Buffer extends Node { ) public int method47() { int var1 = this.array[this.index] & 255; - return var1 < 128 ? this.readUnsignedByte() - 64 : this.method43() - 49152; + return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; } @ObfuscatedName("ae") @@ -512,7 +513,7 @@ public class Buffer extends Node { ) public int method48() { int var1 = this.array[this.index] & 255; - return var1 < 128 ? this.readUnsignedByte() : this.method43() - 32768; + return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; } @ObfuscatedName("at") @@ -538,7 +539,7 @@ public class Buffer extends Node { garbageValue = "103" ) public int method50() { - return this.array[this.index] < 0 ? this.readInt() & Integer.MAX_VALUE : this.method43(); + return this.array[this.index] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); } @ObfuscatedName("ap") @@ -550,7 +551,7 @@ public class Buffer extends Node { if (this.array[this.index] < 0) { return this.readInt() & Integer.MAX_VALUE; } else { - int var1 = this.method43(); + int var1 = this.readUnsignedShort(); return var1 == 32767 ? -1 : var1; } } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index 6b70aefc8e..9f34fbbd37 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -235,27 +235,27 @@ public final class Canvas extends java.awt.Canvas { garbageValue = "-1032035944" ) static final void method855() { - for (class68 var0 = (class68)Client.field214.last(); var0 != null; var0 = (class68)Client.field214.previous()) { - if (var0.field910 > 0) { - --var0.field910; + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0.hitpoints > 0) { + --var0.hitpoints; } - if (var0.field910 == 0) { + if (var0.hitpoints == 0) { if (var0.field903 < 0 || VarbitDefinition.method4910(var0.field903, var0.field905)) { - ParamKeyDefinition.method4933(var0.field911, var0.field906, var0.field913, var0.field901, var0.field903, var0.field904, var0.field905); + ParamKeyDefinition.method4933(var0.level, var0.type, var0.x, var0.y, var0.field903, var0.field904, var0.field905); var0.remove(); } } else { - if (var0.field909 > 0) { - --var0.field909; + if (var0.delay > 0) { + --var0.delay; } - if (var0.field909 == 0 && var0.field913 >= 1 && var0.field901 >= 1 && var0.field913 <= 102 && var0.field901 <= 102 && (var0.field899 < 0 || VarbitDefinition.method4910(var0.field899, var0.field908))) { - ParamKeyDefinition.method4933(var0.field911, var0.field906, var0.field913, var0.field901, var0.field899, var0.field907, var0.field908); - var0.field909 = -1; - if (var0.field903 == var0.field899 && var0.field903 == -1) { + if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102 && (var0.id < 0 || VarbitDefinition.method4910(var0.id, var0.field908))) { + ParamKeyDefinition.method4933(var0.level, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field908); + var0.delay = -1; + if (var0.field903 == var0.id && var0.field903 == -1) { var0.remove(); - } else if (var0.field899 == var0.field903 && var0.field904 == var0.field907 && var0.field908 == var0.field905) { + } else if (var0.id == var0.field903 && var0.field904 == var0.orientation && var0.field908 == var0.field905) { var0.remove(); } } diff --git a/runescape-client/src/main/java/ClanChat.java b/runescape-client/src/main/java/ClanChat.java index 68f78b31e8..f8ffae22d0 100644 --- a/runescape-client/src/main/java/ClanChat.java +++ b/runescape-client/src/main/java/ClanChat.java @@ -133,7 +133,7 @@ public class ClanChat extends UserList { for (int var12 = 0; var12 < var7; ++var12) { ClanMate var13 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); - int var10 = var1.method43(); + int var10 = var1.readUnsignedShort(); var13.set(var10, ++this.field97 - 1); var13.rank = var1.readByte(); var1.readStringCp1252NullTerminated(); @@ -150,7 +150,7 @@ public class ClanChat extends UserList { ) public final void method78(Buffer var1) { Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - int var3 = var1.method43(); + int var3 = var1.readUnsignedShort(); byte var4 = var1.readByte(); boolean var5 = false; if (var4 == -128) { diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 4f5a6cb4e3..1b4b6b2170 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1139,7 +1139,8 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedSignature( signature = "Lje;" ) - static NodeDeque field214; + @Export("pendingSpawns") + static NodeDeque pendingSpawns; @ObfuscatedName("kk") @ObfuscatedSignature( signature = "Lje;" @@ -1417,7 +1418,7 @@ public final class Client extends GameShell implements Usernamed { field181 = 2; } else { if (field181 != 0) { - class68.drawLoadingMessage("Loading - please wait.
(100%)", true); + PendingSpawn.drawLoadingMessage("Loading - please wait.
(100%)", true); } class13.playPcmPlayers(); @@ -1917,7 +1918,7 @@ public final class Client extends GameShell implements Usernamed { var50 = 0; if (var49 != -2) { - var50 = Rasterizer3D.Rasterizer3D_colorPalette[class25.method348(var49, 96)]; + var50 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapDecoration.method348(var49, 96)]; } if (var43.rgb2 != -1) { @@ -1930,10 +1931,10 @@ public final class Client extends GameShell implements Usernamed { } var49 = WorldMapAreaData.method712(var51, var43.saturation2, var52); - var50 = Rasterizer3D.Rasterizer3D_colorPalette[class25.method348(var49, 96)]; + var50 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapDecoration.method348(var49, 96)]; } - var60.addTile(var6, var12, var18, var41, var66, var69, var30, var31, var32, var33, class15.method183(var38, var34), class15.method183(var38, var35), class15.method183(var38, var36), class15.method183(var38, var37), class25.method348(var48, var34), class25.method348(var48, var35), class25.method348(var48, var36), class25.method348(var48, var37), var40, var50); + var60.addTile(var6, var12, var18, var41, var66, var69, var30, var31, var32, var33, class15.method183(var38, var34), class15.method183(var38, var35), class15.method183(var38, var36), class15.method183(var38, var37), WorldMapDecoration.method348(var48, var34), WorldMapDecoration.method348(var48, var35), WorldMapDecoration.method348(var48, var36), WorldMapDecoration.method348(var48, var37), var40, var50); } } } @@ -2283,23 +2284,23 @@ public final class Client extends GameShell implements Usernamed { } var3 = (field178 * 50 - field177 * 50) / field178; - class68.drawLoadingMessage("Loading - please wait.
(" + var3 + "%)", false); + PendingSpawn.drawLoadingMessage("Loading - please wait.
(" + var3 + "%)", false); } else if (field181 == 2) { if (field179 > field180) { field180 = field179; } var3 = (field180 * 50 - field179 * 50) / field180 + 50; - class68.drawLoadingMessage("Loading - please wait.
(" + var3 + "%)", false); + PendingSpawn.drawLoadingMessage("Loading - please wait.
(" + var3 + "%)", false); } else { - class68.drawLoadingMessage("Loading - please wait.", false); + PendingSpawn.drawLoadingMessage("Loading - please wait.", false); } } else if (gameState == 30) { this.drawLoggedIn(); } else if (gameState == 40) { - class68.drawLoadingMessage("Connection lost
Please wait - attempting to reestablish", false); + PendingSpawn.drawLoadingMessage("Connection lost
Please wait - attempting to reestablish", false); } else if (gameState == 45) { - class68.drawLoadingMessage("Please wait...", false); + PendingSpawn.drawLoadingMessage("Please wait...", false); } } else { IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); @@ -2807,7 +2808,7 @@ public final class Client extends GameShell implements Usernamed { if (ModelData0.NetCache_currentResponse == null) { NetCache.NetCache_responseHeaderBuffer.index = 0; var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); - var12 = NetCache.NetCache_responseHeaderBuffer.method43(); + var12 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); int var14 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); var13 = NetCache.NetCache_responseHeaderBuffer.readInt(); long var15 = (long)(var12 + (var11 << 16)); @@ -3323,7 +3324,7 @@ public final class Client extends GameShell implements Usernamed { var8.packetBuffer.writeInt(Skeleton.indexCache1.hash); var8.packetBuffer.writeInt(ObjectSound.indexCache2.hash); var8.packetBuffer.writeInt(WorldMapIcon1.indexCache3.hash); - var8.packetBuffer.writeInt(class25.indexCache4.hash); + var8.packetBuffer.writeInt(WorldMapDecoration.indexCache4.hash); var8.packetBuffer.writeInt(SecureRandomFuture.indexCache5.hash); var8.packetBuffer.writeInt(UserComparator3.indexCache6.hash); var8.packetBuffer.writeInt(class40.indexCache7.hash); @@ -3452,7 +3453,7 @@ public final class Client extends GameShell implements Usernamed { packetWriter.serverPacket0Length = packetWriter.serverPacket0.length; ((AbstractSocket)var1).read(var2.array, 0, 2); var2.index = 0; - packetWriter.serverPacket0Length = var2.method43(); + packetWriter.serverPacket0Length = var2.readUnsignedShort(); try { Client var25 = TextureProvider.client; @@ -3479,7 +3480,7 @@ public final class Client extends GameShell implements Usernamed { var2.index = 0; ((AbstractSocket)var1).read(var2.array, 0, 2); var2.index = 0; - IndexCacheLoader.field407 = var2.method43(); + IndexCacheLoader.field407 = var2.readUnsignedShort(); loginState = 15; } @@ -3518,7 +3519,7 @@ public final class Client extends GameShell implements Usernamed { ((AbstractSocket)var1).read(var2.array, 0, 2); var2.index = 0; - packetWriter.serverPacket0Length = var2.method43(); + packetWriter.serverPacket0Length = var2.readUnsignedShort(); } if (((AbstractSocket)var1).available() >= packetWriter.serverPacket0Length) { @@ -3930,7 +3931,7 @@ public final class Client extends GameShell implements Usernamed { } if (rootWidgetGroup != -1) { - class231.method4517(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0); + WorldMapDecorationType.method4517(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0); } ++cycleCntr; @@ -4009,7 +4010,7 @@ public final class Client extends GameShell implements Usernamed { } else if (menuOptionsCount > 0) { var4 = field205; var9 = field206; - class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var4, var9); + WorldMapDecorationType.processTempMenuAction(UnitPriceComparator.tempMenuAction, var4, var9); UnitPriceComparator.tempMenuAction = null; } @@ -4338,7 +4339,7 @@ public final class Client extends GameShell implements Usernamed { class39.drawMenuActionTextAt(field216, field217); } } else { - var1 = class25.menuX; + var1 = WorldMapDecoration.menuX; var2 = GameShell.menuY; var3 = class214.menuWidth; var4 = AbstractWorldMapIcon.menuHeight; @@ -4372,7 +4373,7 @@ public final class Client extends GameShell implements Usernamed { var11.draw(var12, var1 + 3, var9, var10, 0); } - var7 = class25.menuX; + var7 = WorldMapDecoration.menuX; var9 = GameShell.menuY; var10 = class214.menuWidth; int var15 = AbstractWorldMapIcon.menuHeight; @@ -4428,7 +4429,7 @@ public final class Client extends GameShell implements Usernamed { if (var13.stream1 == null) { if (var13.soundEffectId >= 0) { var14 = null; - var16 = SoundEffect.readSoundEffect(class25.indexCache4, var13.soundEffectId, 0); + var16 = SoundEffect.readSoundEffect(WorldMapDecoration.indexCache4, var13.soundEffectId, 0); if (var16 != null) { var17 = var16.toRawSound().resample(MilliClock.decimator); var19 = RawPcmStream.createRawPcmStream(var17, 100, var6); @@ -4445,7 +4446,7 @@ public final class Client extends GameShell implements Usernamed { if (var13.soundEffectIds != null && (var13.field655 -= var4) <= 0) { var7 = (int)(Math.random() * (double)var13.soundEffectIds.length); var14 = null; - var16 = SoundEffect.readSoundEffect(class25.indexCache4, var13.soundEffectIds[var7], 0); + var16 = SoundEffect.readSoundEffect(WorldMapDecoration.indexCache4, var13.soundEffectIds[var7], 0); if (var16 != null) { var17 = var16.toRawSound().resample(MilliClock.decimator); var19 = RawPcmStream.createRawPcmStream(var17, 100, var6); @@ -4541,7 +4542,7 @@ public final class Client extends GameShell implements Usernamed { var1.getSocket().read(var3.array, 0, 2); var3.index = 0; - var1.serverPacket0Length = var3.method43(); + var1.serverPacket0Length = var3.readUnsignedShort(); } if (!var2.isAvailable(var1.serverPacket0Length)) { @@ -4565,7 +4566,7 @@ public final class Client extends GameShell implements Usernamed { isCameraLocked = true; class3.field1146 = var3.readUnsignedByte(); MusicPatchPcmStream.field602 = var3.readUnsignedByte(); - AbstractWorldMapIcon.field4 = var3.method43(); + AbstractWorldMapIcon.field4 = var3.readUnsignedShort(); ClientPacket.field221 = var3.readUnsignedByte(); class30.field1148 = var3.readUnsignedByte(); if (class30.field1148 >= 100) { @@ -4663,7 +4664,7 @@ public final class Client extends GameShell implements Usernamed { int var13; if (ServerPacket.field859 == var1.serverPacket0) { var37 = var3.readInt(); - var6 = var3.method43(); + var6 = var3.readUnsignedShort(); if (var37 < -70000) { var6 += 32768; } @@ -4682,10 +4683,10 @@ public final class Client extends GameShell implements Usernamed { } PlayerType.clearItemContainer(var6); - var10 = var3.method43(); + var10 = var3.readUnsignedShort(); for (var11 = 0; var11 < var10; ++var11) { - var12 = var3.method43(); + var12 = var3.readUnsignedShort(); var13 = var3.readUnsignedByte(); if (var13 == 255) { var13 = var3.method73(); @@ -4821,7 +4822,7 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field825 == var1.serverPacket0) { hintArrowType = var3.readUnsignedByte(); if (hintArrowType == 1) { - hintArrowNpcIndex = var3.method43(); + hintArrowNpcIndex = var3.readUnsignedShort(); } if (hintArrowType >= 2 && hintArrowType <= 6) { @@ -4851,13 +4852,13 @@ public final class Client extends GameShell implements Usernamed { } hintArrowType = 2; - hintArrowX = var3.method43(); - hintArrowY = var3.method43(); + hintArrowX = var3.readUnsignedShort(); + hintArrowY = var3.readUnsignedShort(); hintArrowHeight = var3.readUnsignedByte(); } if (hintArrowType == 10) { - hintArrowPlayerIndex = var3.method43(); + hintArrowPlayerIndex = var3.readUnsignedShort(); } var1.serverPacket0 = null; @@ -4899,7 +4900,7 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field809 == var1.serverPacket0) { var37 = var3.readInt(); - var6 = var3.method43(); + var6 = var3.readUnsignedShort(); if (var6 == 65535) { var6 = -1; } @@ -5008,7 +5009,7 @@ public final class Client extends GameShell implements Usernamed { } var5 = var3.method73(); - var10 = var3.method43(); + var10 = var3.readUnsignedShort(); if (var10 == 65535) { var10 = -1; } @@ -5114,7 +5115,7 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field833 == var1.serverPacket0) { var37 = var3.readInt(); - var6 = var3.method43(); + var6 = var3.readUnsignedShort(); if (var37 < -70000) { var6 += 32768; } @@ -5127,7 +5128,7 @@ public final class Client extends GameShell implements Usernamed { for (; var3.index < var1.serverPacket0Length; WorldMapManager.itemContainerSetItem(var6, var10, var11 - 1, var12)) { var10 = var3.method48(); - var11 = var3.method43(); + var11 = var3.readUnsignedShort(); var12 = 0; if (var11 != 0) { var12 = var3.readUnsignedByte(); @@ -5153,9 +5154,9 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field854 == var1.serverPacket0) { - var37 = var3.method43(); + var37 = var3.readUnsignedShort(); var6 = var3.readUnsignedByte(); - var5 = var3.method43(); + var5 = var3.readUnsignedShort(); Ignored.queueSoundEffect(var37, var6, var5); var1.serverPacket0 = null; return true; @@ -5199,7 +5200,7 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field836 == var1.serverPacket0) { World var43 = new World(); var43.host = var3.readStringCp1252NullTerminated(); - var43.id = var3.method43(); + var43.id = var3.readUnsignedShort(); var6 = var3.readInt(); var43.properties = var6; GameShell.updateGameState(45); @@ -5297,7 +5298,7 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field861 == var1.serverPacket0) { - rebootTimer = var3.method43() * 30; + rebootTimer = var3.readUnsignedShort() * 30; field124 = cycleCntr; var1.serverPacket0 = null; return true; @@ -5316,9 +5317,9 @@ public final class Client extends GameShell implements Usernamed { } } - for (class68 var45 = (class68)field214.last(); var45 != null; var45 = (class68)field214.previous()) { - if (var45.field913 >= WorldMapSection3.field1089 && var45.field913 < WorldMapSection3.field1089 + 8 && var45.field901 >= Canvas.field95 && var45.field901 < Canvas.field95 + 8 && var45.field911 == SoundSystem.plane) { - var45.field910 = 0; + for (PendingSpawn var45 = (PendingSpawn) pendingSpawns.last(); var45 != null; var45 = (PendingSpawn) pendingSpawns.previous()) { + if (var45.x >= WorldMapSection3.field1089 && var45.x < WorldMapSection3.field1089 + 8 && var45.y >= Canvas.field95 && var45.y < Canvas.field95 + 8 && var45.level == SoundSystem.plane) { + var45.hitpoints = 0; } } @@ -5354,7 +5355,7 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field843 == var1.serverPacket0) { var21 = var3.readStringCp1252NullTerminated(); var25 = var3.readLong(); - var27 = (long)var3.method43(); + var27 = (long)var3.readUnsignedShort(); var19 = (long)var3.readMedium(); var29 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte()); var23 = (var27 << 32) + var19; @@ -5426,7 +5427,7 @@ public final class Client extends GameShell implements Usernamed { isCameraLocked = true; GrandExchangeOffer.field376 = var3.readUnsignedByte(); KeyHandler.field445 = var3.readUnsignedByte(); - IndexStoreAction.field410 = var3.method43(); + IndexStoreAction.field410 = var3.readUnsignedShort(); VertexNormal.field946 = var3.readUnsignedByte(); class171.field1116 = var3.readUnsignedByte(); if (class171.field1116 >= 100) { @@ -5575,8 +5576,8 @@ public final class Client extends GameShell implements Usernamed { WidgetGroupParent var50; if (ServerPacket.field845 == var1.serverPacket0) { var37 = var3.index + var1.serverPacket0Length; - var6 = var3.method43(); - var5 = var3.method43(); + var6 = var3.readUnsignedShort(); + var5 = var3.readUnsignedShort(); if (var6 != rootWidgetGroup) { rootWidgetGroup = var6; this.method87(false); @@ -5590,7 +5591,7 @@ public final class Client extends GameShell implements Usernamed { for (; var5-- > 0; var50.keep = true) { var10 = var3.readInt(); - var11 = var3.method43(); + var11 = var3.readUnsignedShort(); var12 = var3.readUnsignedByte(); var50 = (WidgetGroupParent)widgetGroupParents.get((long)var10); if (var50 != null && var11 != var50.group) { @@ -5615,8 +5616,8 @@ public final class Client extends GameShell implements Usernamed { while (var3.index < var37) { var10 = var3.readInt(); - var11 = var3.method43(); - var12 = var3.method43(); + var11 = var3.readUnsignedShort(); + var12 = var3.readUnsignedShort(); var13 = var3.readInt(); for (int var51 = var11; var51 <= var12; ++var51) { @@ -5669,7 +5670,7 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field793 == var1.serverPacket0) { - var37 = var3.method43(); + var37 = var3.readUnsignedShort(); var6 = var3.readInt(); Varps.Varps_temp[var37] = var6; if (Varps.Varps_main[var37] != var6) { @@ -5763,7 +5764,7 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field799 == var1.serverPacket0) { var21 = var3.readStringCp1252NullTerminated(); - var25 = (long)var3.method43(); + var25 = (long)var3.readUnsignedShort(); var27 = (long)var3.readMedium(); var29 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte()); long var30 = (var25 << 32) + var27; @@ -5897,14 +5898,14 @@ public final class Client extends GameShell implements Usernamed { if (var12 != 1 && (AbstractRasterProvider.mouseCam || var12 != 4)) { var2 = MouseHandler.MouseHandler_x; var14 = MouseHandler.MouseHandler_y; - if (var2 < class25.menuX - 10 || var2 > class25.menuX + class214.menuWidth + 10 || var14 < GameShell.menuY - 10 || var14 > AbstractWorldMapIcon.menuHeight + GameShell.menuY + 10) { + if (var2 < WorldMapDecoration.menuX - 10 || var2 > WorldMapDecoration.menuX + class214.menuWidth + 10 || var14 < GameShell.menuY - 10 || var14 > AbstractWorldMapIcon.menuHeight + GameShell.menuY + 10) { isMenuOpen = false; - Players.method2112(class25.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight); + Players.method2112(WorldMapDecoration.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight); } } if (var12 == 1 || !AbstractRasterProvider.mouseCam && var12 == 4) { - var2 = class25.menuX; + var2 = WorldMapDecoration.menuX; var14 = GameShell.menuY; var7 = class214.menuWidth; var3 = MouseHandler.MouseHandler_lastPressedX; @@ -5923,7 +5924,7 @@ public final class Client extends GameShell implements Usernamed { } isMenuOpen = false; - Players.method2112(class25.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight); + Players.method2112(WorldMapDecoration.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight); } } else { var2 = menuOptionsCount - 1; @@ -5946,7 +5947,7 @@ public final class Client extends GameShell implements Usernamed { if (DevicePcmPlayerProvider.dragInventoryWidget != null && !field207 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { var12 = field205; var13 = field206; - class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var12, var13); + WorldMapDecorationType.processTempMenuAction(UnitPriceComparator.tempMenuAction, var12, var13); UnitPriceComparator.tempMenuAction = null; } @@ -6049,7 +6050,7 @@ public final class Client extends GameShell implements Usernamed { var9 = 0; } - class25.menuX = var8; + WorldMapDecoration.menuX = var8; GameShell.menuY = var9; class214.menuWidth = var3; AbstractWorldMapIcon.menuHeight = menuOptionsCount * 15 + 22; @@ -6191,7 +6192,7 @@ public final class Client extends GameShell implements Usernamed { } else if (menuOptionsCount > 0) { int var9 = widgetClickX + field110; var10 = widgetClickY + field111; - class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var9, var10); + WorldMapDecorationType.processTempMenuAction(UnitPriceComparator.tempMenuAction, var9, var10); UnitPriceComparator.tempMenuAction = null; } @@ -6368,7 +6369,7 @@ public final class Client extends GameShell implements Usernamed { field213 = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; combatTargetPlayerIndex = -1; groundItems = new NodeDeque[4][104][104]; - field214 = new NodeDeque(); + pendingSpawns = new NodeDeque(); projectiles = new NodeDeque(); graphicsObjects = new NodeDeque(); currentLevels = new int[25]; diff --git a/runescape-client/src/main/java/ClientParameter.java b/runescape-client/src/main/java/ClientParameter.java index f2c8156aea..3ca51f2f48 100644 --- a/runescape-client/src/main/java/ClientParameter.java +++ b/runescape-client/src/main/java/ClientParameter.java @@ -134,13 +134,13 @@ public class ClientParameter { byte[] var0 = FriendLoginUpdate.field356.getResponse(); Buffer var1 = new Buffer(var0); var1.readInt(); - World.worldsCount = var1.method43(); + World.worldsCount = var1.readUnsignedShort(); ItemContainer.worlds = new World[World.worldsCount]; World var2; for (int var3 = 0; var3 < World.worldsCount; var2.index = var3++) { var2 = ItemContainer.worlds[var3] = new World(); - var2.id = var1.method43(); + var2.id = var1.readUnsignedShort(); var2.properties = var1.readInt(); var2.host = var1.readStringCp1252NullTerminated(); var2.activity = var1.readStringCp1252NullTerminated(); diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index dfbf94b5c9..47738a89ea 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -72,32 +72,32 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { static void decodeSprite(byte[] var0) { Buffer var1 = new Buffer(var0); var1.index = var0.length - 2; - class328.indexedSpriteCount = var1.method43(); + class328.indexedSpriteCount = var1.readUnsignedShort(); class328.indexedSpriteOffsetXs = new int[class328.indexedSpriteCount]; class328.indexedSpriteOffsetYs = new int[class328.indexedSpriteCount]; VarbitDefinition.indexedSpriteWidths = new int[class328.indexedSpriteCount]; SecureRandomCallable.indexedSpriteHeights = new int[class328.indexedSpriteCount]; class328.spritePixels = new byte[class328.indexedSpriteCount][]; var1.index = var0.length - 7 - class328.indexedSpriteCount * 8; - class328.indexedSpriteWidth = var1.method43(); - class328.indexedSpriteHeight = var1.method43(); + class328.indexedSpriteWidth = var1.readUnsignedShort(); + class328.indexedSpriteHeight = var1.readUnsignedShort(); int var2 = (var1.readUnsignedByte() & 255) + 1; int var3; for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) { - class328.indexedSpriteOffsetXs[var3] = var1.method43(); + class328.indexedSpriteOffsetXs[var3] = var1.readUnsignedShort(); } for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) { - class328.indexedSpriteOffsetYs[var3] = var1.method43(); + class328.indexedSpriteOffsetYs[var3] = var1.readUnsignedShort(); } for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) { - VarbitDefinition.indexedSpriteWidths[var3] = var1.method43(); + VarbitDefinition.indexedSpriteWidths[var3] = var1.readUnsignedShort(); } for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) { - SecureRandomCallable.indexedSpriteHeights[var3] = var1.method43(); + SecureRandomCallable.indexedSpriteHeights[var3] = var1.readUnsignedShort(); } var1.index = var0.length - 7 - class328.indexedSpriteCount * 8 - (var2 - 1) * 3; diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index 31c8470632..905d5408e6 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -534,7 +534,7 @@ public class DynamicObject extends Entity { GameObject.field359 = var0; WorldMapLabelSize.field1041 = var1; GameShell.updateGameState(25); - class68.drawLoadingMessage("Loading - please wait.", true); + PendingSpawn.drawLoadingMessage("Loading - please wait.", true); int var3 = class50.baseX; int var4 = GraphicsObject.baseY; class50.baseX = (var0 - 6) * 8; @@ -611,10 +611,10 @@ public class DynamicObject extends Entity { } } - for (class68 var22 = (class68)Client.field214.last(); var22 != null; var22 = (class68)Client.field214.previous()) { - var22.field913 -= var5; - var22.field901 -= var6; - if (var22.field913 < 0 || var22.field901 < 0 || var22.field913 >= 104 || var22.field901 >= 104) { + for (PendingSpawn var22 = (PendingSpawn)Client.pendingSpawns.last(); var22 != null; var22 = (PendingSpawn)Client.pendingSpawns.previous()) { + var22.x -= var5; + var22.y -= var6; + if (var22.x < 0 || var22.y < 0 || var22.x >= 104 || var22.y >= 104) { var22.remove(); } } diff --git a/runescape-client/src/main/java/EnumDefinition.java b/runescape-client/src/main/java/EnumDefinition.java index c66cf81e96..dbd78a607c 100644 --- a/runescape-client/src/main/java/EnumDefinition.java +++ b/runescape-client/src/main/java/EnumDefinition.java @@ -90,7 +90,7 @@ public class EnumDefinition extends DualNode { } else { int var3; if (var2 == 5) { - this.size0 = var1.method43(); + this.size0 = var1.readUnsignedShort(); this.keys = new int[this.size0]; this.stringVals = new String[this.size0]; @@ -99,7 +99,7 @@ public class EnumDefinition extends DualNode { this.stringVals[var3] = var1.readStringCp1252NullTerminated(); } } else if (var2 == 6) { - this.size0 = var1.method43(); + this.size0 = var1.readUnsignedShort(); this.keys = new int[this.size0]; this.intVals = new int[this.size0]; diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 3cebc659a2..acb0e22e88 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -480,7 +480,7 @@ public class FontName { AbstractIndexCache.indexCache0.method8(); Skeleton.indexCache1.method8(); WorldMapIcon1.indexCache3.method8(); - class25.indexCache4.method8(); + WorldMapDecoration.indexCache4.method8(); SecureRandomFuture.indexCache5.method8(); UserComparator3.indexCache6.method8(); class40.indexCache7.method8(); diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index 76ff494389..36110033cc 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -78,7 +78,7 @@ public class FriendsList extends UserList { boolean var3 = var1.readUnsignedByte() == 1; Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - int var6 = var1.method43(); + int var6 = var1.readUnsignedShort(); int var7 = var1.readUnsignedByte(); int var8 = var1.readUnsignedByte(); boolean var9 = (var8 & 2) != 0; diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index 11d8c7dd6e..371bfe564f 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -745,9 +745,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene protected final void drawInitial(int var1, String var2, boolean var3) { try { Graphics var4 = this.canvas.getGraphics(); - if (class231.field1140 == null) { - class231.field1140 = new java.awt.Font("Helvetica", 1, 13); - class60.field1162 = this.canvas.getFontMetrics(class231.field1140); + if (WorldMapDecorationType.field1140 == null) { + WorldMapDecorationType.field1140 = new java.awt.Font("Helvetica", 1, 13); + class60.field1162 = this.canvas.getFontMetrics(WorldMapDecorationType.field1140); } if (var3) { @@ -769,7 +769,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene var6.setColor(Color.black); var6.drawRect(1, 1, 301, 31); var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); - var6.setFont(class231.field1140); + var6.setFont(WorldMapDecorationType.field1140); var6.setColor(Color.white); var6.drawString(var2, (304 - class60.field1162.stringWidth(var2)) / 2, 22); var4.drawImage(PlayerType.field730, SoundCache.canvasWidth / 2 - 152, Huffman.canvasHeight / 2 - 18, (ImageObserver)null); @@ -782,7 +782,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene var4.setColor(Color.black); var4.drawRect(var7 + 1, var8 + 1, 301, 31); var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); - var4.setFont(class231.field1140); + var4.setFont(WorldMapDecorationType.field1140); var4.setColor(Color.white); var4.drawString(var2, var7 + (304 - class60.field1162.stringWidth(var2)) / 2, var8 + 22); } @@ -799,7 +799,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene ) protected final void method113() { PlayerType.field730 = null; - class231.field1140 = null; + WorldMapDecorationType.field1140 = null; class60.field1162 = null; } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index fc5e9170a5..c4665c6534 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -37,7 +37,7 @@ public class GrandExchangeEvent { GrandExchangeEvent(Buffer var1, byte var2, int var3) { this.string1 = var1.readStringCp1252NullTerminated(); this.string2 = var1.readStringCp1252NullTerminated(); - this.world = var1.method43(); + this.world = var1.readUnsignedShort(); this.field370 = var1.readLong(); int var4 = var1.readInt(); int var5 = var1.readInt(); @@ -238,7 +238,7 @@ public class GrandExchangeEvent { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection2.getVarbit(var11); } else if (var13 == 27) { var11 = var6[var4]; - class68.method1695(var11, Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + PendingSpawn.method1695(var11, Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); } else if (var13 == 31) { RouteStrategy.Interpreter_intStackSize -= 2; if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index 78452aadf2..a880043184 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -39,7 +39,7 @@ public class GrandExchangeEvents { garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { - int var3 = var1.method43(); + int var3 = var1.readUnsignedShort(); boolean var4 = var1.readUnsignedByte() == 1; byte var5; if (var4) { @@ -48,7 +48,7 @@ public class GrandExchangeEvents { var5 = 0; } - int var6 = var1.method43(); + int var6 = var1.readUnsignedShort(); this.events = new ArrayList(var6); for (int var7 = 0; var7 < var6; ++var7) { diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index c98cd110d1..de854bdb16 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -62,7 +62,7 @@ public class GrandExchangeOffer { ) public GrandExchangeOffer(Buffer var1, boolean var2) { this.state = var1.readByte(); - this.id = var1.method43(); + this.id = var1.readUnsignedShort(); this.unitPrice = var1.readInt(); this.totalQuantity = var1.readInt(); this.currentQuantity = var1.readInt(); diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index a898b9a8d2..a60a84437d 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -132,7 +132,7 @@ public class HealthBarDefinition extends DualNode { @Export("readNext") void readNext(Buffer var1, int var2) { if (var2 == 1) { - var1.method43(); + var1.readUnsignedShort(); } else if (var2 == 2) { this.int1 = var1.readUnsignedByte(); } else if (var2 == 3) { @@ -140,7 +140,7 @@ public class HealthBarDefinition extends DualNode { } else if (var2 == 4) { this.int3 = 0; } else if (var2 == 5) { - this.int5 = var1.method43(); + this.int5 = var1.readUnsignedShort(); } else if (var2 == 6) { var1.readUnsignedByte(); } else if (var2 == 7) { @@ -148,7 +148,7 @@ public class HealthBarDefinition extends DualNode { } else if (var2 == 8) { this.spriteId2 = var1.method51(); } else if (var2 == 11) { - this.int3 = var1.method43(); + this.int3 = var1.readUnsignedShort(); } else if (var2 == 14) { this.width = var1.readUnsignedByte(); } else if (var2 == 15) { diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index a31e8cb465..4251fa3e2c 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -177,7 +177,7 @@ public class HitSplatDefinition extends DualNode { } else if (var2 == 8) { this.field395 = var1.readStringCp1252NullCircumfixed(); } else if (var2 == 9) { - this.field387 = var1.method43(); + this.field387 = var1.readUnsignedShort(); } else if (var2 == 10) { this.field393 = var1.method44(); } else if (var2 == 11) { @@ -187,21 +187,21 @@ public class HitSplatDefinition extends DualNode { } else if (var2 == 13) { this.field397 = var1.method44(); } else if (var2 == 14) { - this.field394 = var1.method43(); + this.field394 = var1.readUnsignedShort(); } else if (var2 == 17 || var2 == 18) { - this.transformVarbit = var1.method43(); + this.transformVarbit = var1.readUnsignedShort(); if (this.transformVarbit == 65535) { this.transformVarbit = -1; } - this.transformVarp = var1.method43(); + this.transformVarp = var1.readUnsignedShort(); if (this.transformVarp == 65535) { this.transformVarp = -1; } int var3 = -1; if (var2 == 18) { - var3 = var1.method43(); + var3 = var1.readUnsignedShort(); if (var3 == 65535) { var3 = -1; } @@ -211,7 +211,7 @@ public class HitSplatDefinition extends DualNode { this.transforms = new int[var4 + 2]; for (int var5 = 0; var5 <= var4; ++var5) { - this.transforms[var5] = var1.method43(); + this.transforms[var5] = var1.readUnsignedShort(); if (this.transforms[var5] == 65535) { this.transforms[var5] = -1; } diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index d8f97202b4..60c864797e 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -377,8 +377,8 @@ public class Instrument { this.delayTime = var1.method48(); this.delayDecay = var1.method48(); - this.duration = var1.method43(); - this.offset = var1.method43(); + this.duration = var1.readUnsignedShort(); + this.offset = var1.readUnsignedShort(); this.filter = new AudioFilter(); this.field421 = new SoundEnvelope(); this.filter.method27(var1, this.field421); diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index c058dbea3e..0d3f76361b 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -48,7 +48,7 @@ public class InvDefinition extends DualNode { @Export("readNext") void readNext(Buffer var1, int var2) { if (var2 == 2) { - this.size = var1.method43(); + this.size = var1.readUnsignedShort(); } } diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index 2e9fc77fde..999e16be6f 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -359,22 +359,22 @@ public class ItemDefinition extends DualNode { @Export("readNext") void readNext(Buffer var1, int var2) { if (var2 == 1) { - this.field435 = var1.method43(); + this.field435 = var1.readUnsignedShort(); } else if (var2 == 2) { this.name = var1.readStringCp1252NullTerminated(); } else if (var2 == 4) { - this.zoom2d = var1.method43(); + this.zoom2d = var1.readUnsignedShort(); } else if (var2 == 5) { - this.xan2d = var1.method43(); + this.xan2d = var1.readUnsignedShort(); } else if (var2 == 6) { - this.yan2d = var1.method43(); + this.yan2d = var1.readUnsignedShort(); } else if (var2 == 7) { - this.offsetX2d = var1.method43(); + this.offsetX2d = var1.readUnsignedShort(); if (this.offsetX2d > 32767) { this.offsetX2d -= 65536; } } else if (var2 == 8) { - this.offsetY2d = var1.method43(); + this.offsetY2d = var1.readUnsignedShort(); if (this.offsetY2d > 32767) { this.offsetY2d -= 65536; } @@ -385,15 +385,15 @@ public class ItemDefinition extends DualNode { } else if (var2 == 16) { this.isMembersOnly = true; } else if (var2 == 23) { - this.maleModel = var1.method43(); + this.maleModel = var1.readUnsignedShort(); this.maleOffset = var1.readUnsignedByte(); } else if (var2 == 24) { - this.maleModel1 = var1.method43(); + this.maleModel1 = var1.readUnsignedShort(); } else if (var2 == 25) { - this.femaleModel = var1.method43(); + this.femaleModel = var1.readUnsignedShort(); this.femaleOffset = var1.readUnsignedByte(); } else if (var2 == 26) { - this.femaleModel1 = var1.method43(); + this.femaleModel1 = var1.readUnsignedShort(); } else if (var2 >= 30 && var2 < 35) { this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { @@ -410,8 +410,8 @@ public class ItemDefinition extends DualNode { this.recolorTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.method43(); - this.recolorTo[var4] = (short)var1.method43(); + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); + this.recolorTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 == 41) { var3 = var1.readUnsignedByte(); @@ -419,45 +419,45 @@ public class ItemDefinition extends DualNode { this.retextureTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.method43(); - this.retextureTo[var4] = (short)var1.method43(); + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 == 42) { this.shiftClickIndex0 = var1.readByte(); } else if (var2 == 65) { this.isTradable = true; } else if (var2 == 78) { - this.maleModel2 = var1.method43(); + this.maleModel2 = var1.readUnsignedShort(); } else if (var2 == 79) { - this.femaleModel2 = var1.method43(); + this.femaleModel2 = var1.readUnsignedShort(); } else if (var2 == 90) { - this.maleHeadModel = var1.method43(); + this.maleHeadModel = var1.readUnsignedShort(); } else if (var2 == 91) { - this.femaleHeadModel = var1.method43(); + this.femaleHeadModel = var1.readUnsignedShort(); } else if (var2 == 92) { - this.maleHeadModel2 = var1.method43(); + this.maleHeadModel2 = var1.readUnsignedShort(); } else if (var2 == 93) { - this.femaleHeadModel2 = var1.method43(); + this.femaleHeadModel2 = var1.readUnsignedShort(); } else if (var2 == 95) { - this.zan2d = var1.method43(); + this.zan2d = var1.readUnsignedShort(); } else if (var2 == 97) { - this.note = var1.method43(); + this.note = var1.readUnsignedShort(); } else if (var2 == 98) { - this.noteTemplate = var1.method43(); + this.noteTemplate = var1.readUnsignedShort(); } else if (var2 >= 100 && var2 < 110) { if (this.field436 == null) { this.field436 = new int[10]; this.field437 = new int[10]; } - this.field436[var2 - 100] = var1.method43(); - this.field437[var2 - 100] = var1.method43(); + this.field436[var2 - 100] = var1.readUnsignedShort(); + this.field437[var2 - 100] = var1.readUnsignedShort(); } else if (var2 == 110) { - this.resizeX = var1.method43(); + this.resizeX = var1.readUnsignedShort(); } else if (var2 == 111) { - this.resizeY = var1.method43(); + this.resizeY = var1.readUnsignedShort(); } else if (var2 == 112) { - this.resizeZ = var1.method43(); + this.resizeZ = var1.readUnsignedShort(); } else if (var2 == 113) { this.ambient = var1.readByte(); } else if (var2 == 114) { @@ -465,13 +465,13 @@ public class ItemDefinition extends DualNode { } else if (var2 == 115) { this.int1 = var1.readUnsignedByte(); } else if (var2 == 139) { - this.unnotedId = var1.method43(); + this.unnotedId = var1.readUnsignedShort(); } else if (var2 == 140) { - this.notedId = var1.method43(); + this.notedId = var1.readUnsignedShort(); } else if (var2 == 148) { - this.placeholder = var1.method43(); + this.placeholder = var1.readUnsignedShort(); } else if (var2 == 149) { - this.placeholderTemplate = var1.method43(); + this.placeholderTemplate = var1.readUnsignedShort(); } else if (var2 == 249) { this.params = AbstractIndexCache.readStringIntParameters(var1, this.params); } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index 920c77abf6..619b4d5fa9 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -33,9 +33,11 @@ public class KitDefinition extends DualNode { @ObfuscatedGetter( intValue = 1619779051 ) - public int field458; + @Export("bodypartID") + public int bodypartID; @ObfuscatedName("u") - int[] field459; + @Export("modelIDs") + int[] modelIDs; @ObfuscatedName("g") @Export("recolorFrom") short[] recolorFrom; @@ -52,12 +54,13 @@ public class KitDefinition extends DualNode { @Export("archives") int[] archives; @ObfuscatedName("k") - public boolean field460; + @Export("nonSelectable") + public boolean nonSelectable; KitDefinition() { - this.field458 = -1; + this.bodypartID = -1; this.archives = new int[]{-1, -1, -1, -1, -1}; - this.field460 = false; + this.nonSelectable = false; } @ObfuscatedName("f") @@ -85,27 +88,27 @@ public class KitDefinition extends DualNode { @Export("readNext") void readNext(Buffer var1, int var2) { if (var2 == 1) { - this.field458 = var1.readUnsignedByte(); + this.bodypartID = var1.readUnsignedByte(); } else { int var3; int var4; if (var2 == 2) { var3 = var1.readUnsignedByte(); - this.field459 = new int[var3]; + this.modelIDs = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.field459[var4] = var1.method43(); + this.modelIDs[var4] = var1.readUnsignedShort(); } } else if (var2 == 3) { - this.field460 = true; + this.nonSelectable = true; } else if (var2 == 40) { var3 = var1.readUnsignedByte(); this.recolorFrom = new short[var3]; this.recolorTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.method43(); - this.recolorTo[var4] = (short)var1.method43(); + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); + this.recolorTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 == 41) { var3 = var1.readUnsignedByte(); @@ -113,11 +116,11 @@ public class KitDefinition extends DualNode { this.retextureTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.method43(); - this.retextureTo[var4] = (short)var1.method43(); + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 >= 60 && var2 < 70) { - this.archives[var2 - 60] = var1.method43(); + this.archives[var2 - 60] = var1.readUnsignedShort(); } } @@ -128,14 +131,15 @@ public class KitDefinition extends DualNode { signature = "(I)Z", garbageValue = "-1250940659" ) - public boolean method159() { - if (this.field459 == null) { + @Export("ready") + public boolean ready() { + if (this.modelIDs == null) { return true; } else { boolean var1 = true; - for (int var2 = 0; var2 < this.field459.length; ++var2) { - if (!field456.tryLoadRecord(this.field459[var2], 0)) { + for (int var2 = 0; var2 < this.modelIDs.length; ++var2) { + if (!field456.tryLoadRecord(this.modelIDs[var2], 0)) { var1 = false; } } @@ -149,14 +153,15 @@ public class KitDefinition extends DualNode { signature = "(B)Ldw;", garbageValue = "0" ) - public ModelData method160() { - if (this.field459 == null) { + @Export("getModelData") + public ModelData getModelData() { + if (this.modelIDs == null) { return null; } else { - ModelData[] var1 = new ModelData[this.field459.length]; + ModelData[] var1 = new ModelData[this.modelIDs.length]; - for (int var2 = 0; var2 < this.field459.length; ++var2) { - var1[var2] = ModelData.method2788(field456, this.field459[var2], 0); + for (int var2 = 0; var2 < this.modelIDs.length; ++var2) { + var1[var2] = ModelData.method2788(field456, this.modelIDs[var2], 0); } ModelData var4; diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 677531848f..7dea34d004 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -106,7 +106,7 @@ public class MenuAction { } } - var5 = class214.menuWidth / 2 + class25.menuX; + var5 = class214.menuWidth / 2 + WorldMapDecoration.menuX; var6 = GameShell.menuY; int var7 = class2.fontBold12.stringWidth("Choose Option"); @@ -148,7 +148,7 @@ public class MenuAction { var14 = 0; } - class25.menuX = var13; + WorldMapDecoration.menuX = var13; GameShell.menuY = var14; class214.menuWidth = var7; AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22; diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index f0a41c3311..5998804d6f 100644 --- a/runescape-client/src/main/java/MidiFileReader.java +++ b/runescape-client/src/main/java/MidiFileReader.java @@ -47,8 +47,8 @@ public class MidiFileReader { void parse(byte[] var1) { this.buffer.array = var1; this.buffer.index = 10; - int var2 = this.buffer.method43(); - this.division = this.buffer.method43(); + int var2 = this.buffer.readUnsignedShort(); + this.division = this.buffer.readUnsignedShort(); this.field493 = 500000; this.trackStarts = new int[var2]; diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index fdcb9827d3..9ae3c76bc6 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -373,8 +373,8 @@ public class ModelData extends Entity { Buffer var7 = new Buffer(var1); Buffer var8 = new Buffer(var1); var2.index = var1.length - 23; - int var9 = var2.method43(); - int var10 = var2.method43(); + int var9 = var2.readUnsignedShort(); + int var10 = var2.readUnsignedShort(); int var11 = var2.readUnsignedByte(); int var12 = var2.readUnsignedByte(); int var13 = var2.readUnsignedByte(); @@ -382,11 +382,11 @@ public class ModelData extends Entity { int var15 = var2.readUnsignedByte(); int var16 = var2.readUnsignedByte(); int var17 = var2.readUnsignedByte(); - int var18 = var2.method43(); - int var19 = var2.method43(); - int var20 = var2.method43(); - int var21 = var2.method43(); - int var22 = var2.method43(); + int var18 = var2.readUnsignedShort(); + int var19 = var2.readUnsignedShort(); + int var20 = var2.readUnsignedShort(); + int var21 = var2.readUnsignedShort(); + int var22 = var2.readUnsignedShort(); int var23 = 0; int var24 = 0; int var25 = 0; @@ -565,7 +565,7 @@ public class ModelData extends Entity { var8.index = var35; for (var49 = 0; var49 < var10; ++var49) { - this.faceColors[var49] = (short)var2.method43(); + this.faceColors[var49] = (short)var2.readUnsignedShort(); if (var12 == 1) { this.field551[var49] = var3.readByte(); } @@ -583,7 +583,7 @@ public class ModelData extends Entity { } if (var16 == 1) { - this.faceTextures[var49] = (short)(var7.method43() - 1); + this.faceTextures[var49] = (short)(var7.readUnsignedShort() - 1); } if (this.textureCoords != null && this.faceTextures[var49] != -1) { @@ -651,9 +651,9 @@ public class ModelData extends Entity { for (var53 = 0; var53 < var11; ++var53) { var54 = this.textureRenderTypes[var53] & 255; if (var54 == 0) { - this.texTriangleX[var53] = (short)var2.method43(); - this.texTriangleY[var53] = (short)var2.method43(); - this.texTriangleZ[var53] = (short)var2.method43(); + this.texTriangleX[var53] = (short)var2.readUnsignedShort(); + this.texTriangleY[var53] = (short)var2.readUnsignedShort(); + this.texTriangleZ[var53] = (short)var2.readUnsignedShort(); } } @@ -661,9 +661,9 @@ public class ModelData extends Entity { var53 = var2.readUnsignedByte(); if (var53 != 0) { new ModelData0(); - var2.method43(); - var2.method43(); - var2.method43(); + var2.readUnsignedShort(); + var2.readUnsignedShort(); + var2.readUnsignedShort(); var2.readInt(); } @@ -679,18 +679,18 @@ public class ModelData extends Entity { Buffer var7 = new Buffer(var1); Buffer var8 = new Buffer(var1); var4.index = var1.length - 18; - int var9 = var4.method43(); - int var10 = var4.method43(); + int var9 = var4.readUnsignedShort(); + int var10 = var4.readUnsignedShort(); int var11 = var4.readUnsignedByte(); int var12 = var4.readUnsignedByte(); int var13 = var4.readUnsignedByte(); int var14 = var4.readUnsignedByte(); int var15 = var4.readUnsignedByte(); int var16 = var4.readUnsignedByte(); - int var17 = var4.method43(); - int var18 = var4.method43(); - int var19 = var4.method43(); - int var20 = var4.method43(); + int var17 = var4.readUnsignedShort(); + int var18 = var4.readUnsignedShort(); + int var19 = var4.readUnsignedShort(); + int var20 = var4.readUnsignedShort(); byte var21 = 0; int var22 = var21 + var9; int var23 = var22; @@ -821,7 +821,7 @@ public class ModelData extends Entity { var8.index = var25; for (var38 = 0; var38 < var10; ++var38) { - this.faceColors[var38] = (short)var4.method43(); + this.faceColors[var38] = (short)var4.readUnsignedShort(); if (var12 == 1) { var39 = var5.readUnsignedByte(); if ((var39 & 1) == 1) { @@ -912,9 +912,9 @@ public class ModelData extends Entity { for (var42 = 0; var42 < var11; ++var42) { this.textureRenderTypes[var42] = 0; - this.texTriangleX[var42] = (short)var4.method43(); - this.texTriangleY[var42] = (short)var4.method43(); - this.texTriangleZ[var42] = (short)var4.method43(); + this.texTriangleX[var42] = (short)var4.readUnsignedShort(); + this.texTriangleY[var42] = (short)var4.readUnsignedShort(); + this.texTriangleZ[var42] = (short)var4.readUnsignedShort(); } if (this.textureCoords != null) { diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index 57a5653b29..4147ba52f9 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -22,7 +22,7 @@ public class MusicTrack extends Node { MusicTrack(Buffer var1) { var1.index = var1.array.length - 3; int var2 = var1.readUnsignedByte(); - int var3 = var1.method43(); + int var3 = var1.readUnsignedShort(); int var4 = var2 * 10 + 14; var1.index = 0; int var5 = 0; diff --git a/runescape-client/src/main/java/NPCDefinition.java b/runescape-client/src/main/java/NPCDefinition.java index f62133beee..859d5d979e 100644 --- a/runescape-client/src/main/java/NPCDefinition.java +++ b/runescape-client/src/main/java/NPCDefinition.java @@ -256,25 +256,25 @@ public class NPCDefinition extends DualNode { this.archives = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.archives[var4] = var1.method43(); + this.archives[var4] = var1.readUnsignedShort(); } } else if (var2 == 2) { this.name = var1.readStringCp1252NullTerminated(); } else if (var2 == 12) { this.size = var1.readUnsignedByte(); } else if (var2 == 13) { - this.idleSequence = var1.method43(); + this.idleSequence = var1.readUnsignedShort(); } else if (var2 == 14) { - this.walkSequence = var1.method43(); + this.walkSequence = var1.readUnsignedShort(); } else if (var2 == 15) { - this.turnLeftSequence = var1.method43(); + this.turnLeftSequence = var1.readUnsignedShort(); } else if (var2 == 16) { - this.turnRightSequence = var1.method43(); + this.turnRightSequence = var1.readUnsignedShort(); } else if (var2 == 17) { - this.walkSequence = var1.method43(); - this.walkTurnSequence = var1.method43(); - this.walkTurnLeftSequence = var1.method43(); - this.walkTurnRightSequence = var1.method43(); + this.walkSequence = var1.readUnsignedShort(); + this.walkTurnSequence = var1.readUnsignedShort(); + this.walkTurnLeftSequence = var1.readUnsignedShort(); + this.walkTurnRightSequence = var1.readUnsignedShort(); } else if (var2 >= 30 && var2 < 35) { this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { @@ -286,8 +286,8 @@ public class NPCDefinition extends DualNode { this.recolorTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.method43(); - this.recolorTo[var4] = (short)var1.method43(); + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); + this.recolorTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 == 41) { var3 = var1.readUnsignedByte(); @@ -295,24 +295,24 @@ public class NPCDefinition extends DualNode { this.retextureTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.method43(); - this.retextureTo[var4] = (short)var1.method43(); + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 == 60) { var3 = var1.readUnsignedByte(); this.field636 = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.field636[var4] = var1.method43(); + this.field636[var4] = var1.readUnsignedShort(); } } else if (var2 == 93) { this.drawMapDot = false; } else if (var2 == 95) { - this.combatLevel = var1.method43(); + this.combatLevel = var1.readUnsignedShort(); } else if (var2 == 97) { - this.widthScale = var1.method43(); + this.widthScale = var1.readUnsignedShort(); } else if (var2 == 98) { - this.heightScale = var1.method43(); + this.heightScale = var1.readUnsignedShort(); } else if (var2 == 99) { this.isVisible = true; } else if (var2 == 100) { @@ -320,9 +320,9 @@ public class NPCDefinition extends DualNode { } else if (var2 == 101) { this.field638 = var1.readByte(); } else if (var2 == 102) { - this.headIconPrayer = var1.method43(); + this.headIconPrayer = var1.readUnsignedShort(); } else if (var2 == 103) { - this.field639 = var1.method43(); + this.field639 = var1.readUnsignedShort(); } else if (var2 != 106 && var2 != 118) { if (var2 == 107) { this.isInteractable = false; @@ -334,19 +334,19 @@ public class NPCDefinition extends DualNode { this.params = AbstractIndexCache.readStringIntParameters(var1, this.params); } } else { - this.transformVarbit = var1.method43(); + this.transformVarbit = var1.readUnsignedShort(); if (this.transformVarbit == 65535) { this.transformVarbit = -1; } - this.transformVarp = var1.method43(); + this.transformVarp = var1.readUnsignedShort(); if (this.transformVarp == 65535) { this.transformVarp = -1; } var3 = -1; if (var2 == 118) { - var3 = var1.method43(); + var3 = var1.readUnsignedShort(); if (var3 == 65535) { var3 = -1; } @@ -356,7 +356,7 @@ public class NPCDefinition extends DualNode { this.transforms = new int[var4 + 2]; for (int var5 = 0; var5 <= var4; ++var5) { - this.transforms[var5] = var1.method43(); + this.transforms[var5] = var1.readUnsignedShort(); if (this.transforms[var5] == 65535) { this.transforms[var5] = -1; } diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index 546c84679e..47fa02edef 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -351,7 +351,7 @@ public class ObjectDefinition extends DualNode { this.field644 = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.field644[var4] = var1.method43(); + this.field644[var4] = var1.readUnsignedShort(); this.field645[var4] = var1.readUnsignedByte(); } } @@ -368,7 +368,7 @@ public class ObjectDefinition extends DualNode { this.field644 = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.field644[var4] = var1.method43(); + this.field644[var4] = var1.readUnsignedShort(); } } } @@ -390,7 +390,7 @@ public class ObjectDefinition extends DualNode { } else if (var2 == 23) { this.modelClipped = true; } else if (var2 == 24) { - this.animationId = var1.method43(); + this.animationId = var1.readUnsignedShort(); if (this.animationId == 65535) { this.animationId = -1; } @@ -413,8 +413,8 @@ public class ObjectDefinition extends DualNode { this.recolorTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.method43(); - this.recolorTo[var4] = (short)var1.method43(); + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); + this.recolorTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 == 41) { var3 = var1.readUnsignedByte(); @@ -422,21 +422,21 @@ public class ObjectDefinition extends DualNode { this.retextureTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.method43(); - this.retextureTo[var4] = (short)var1.method43(); + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 == 62) { this.isRotated = true; } else if (var2 == 64) { this.clipped = false; } else if (var2 == 65) { - this.modelSizeX = var1.method43(); + this.modelSizeX = var1.readUnsignedShort(); } else if (var2 == 66) { - this.modelHeight = var1.method43(); + this.modelHeight = var1.readUnsignedShort(); } else if (var2 == 67) { - this.modelSizeY = var1.method43(); + this.modelSizeY = var1.readUnsignedShort(); } else if (var2 == 68) { - this.mapSceneId = var1.method43(); + this.mapSceneId = var1.readUnsignedShort(); } else if (var2 == 69) { var1.readUnsignedByte(); } else if (var2 == 70) { @@ -453,39 +453,39 @@ public class ObjectDefinition extends DualNode { this.int3 = var1.readUnsignedByte(); } else if (var2 != 77 && var2 != 92) { if (var2 == 78) { - this.ambientSoundId = var1.method43(); + this.ambientSoundId = var1.readUnsignedShort(); this.int4 = var1.readUnsignedByte(); } else if (var2 == 79) { - this.int5 = var1.method43(); - this.int6 = var1.method43(); + this.int5 = var1.readUnsignedShort(); + this.int6 = var1.readUnsignedShort(); this.int4 = var1.readUnsignedByte(); var3 = var1.readUnsignedByte(); this.field646 = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.field646[var4] = var1.method43(); + this.field646[var4] = var1.readUnsignedShort(); } } else if (var2 == 81) { this.clipType = var1.readUnsignedByte() * 256; } else if (var2 == 82) { - this.mapIconId = var1.method43(); + this.mapIconId = var1.readUnsignedShort(); } else if (var2 == 249) { this.params = AbstractIndexCache.readStringIntParameters(var1, this.params); } } else { - this.transformVarbit = var1.method43(); + this.transformVarbit = var1.readUnsignedShort(); if (this.transformVarbit == 65535) { this.transformVarbit = -1; } - this.transformConfigId = var1.method43(); + this.transformConfigId = var1.readUnsignedShort(); if (this.transformConfigId == 65535) { this.transformConfigId = -1; } var3 = -1; if (var2 == 92) { - var3 = var1.method43(); + var3 = var1.readUnsignedShort(); if (var3 == 65535) { var3 = -1; } @@ -495,7 +495,7 @@ public class ObjectDefinition extends DualNode { this.transforms = new int[var4 + 2]; for (int var5 = 0; var5 <= var4; ++var5) { - this.transforms[var5] = var1.method43(); + this.transforms[var5] = var1.readUnsignedShort(); if (this.transforms[var5] == 65535) { this.transforms[var5] = -1; } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index 144bc43c11..0569ab5f5c 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -140,14 +140,14 @@ public final class Occluder { Script var1 = new Script(); Buffer var2 = new Buffer(var0); var2.index = var2.array.length - 2; - int var3 = var2.method43(); + int var3 = var2.readUnsignedShort(); int var4 = var2.array.length - 2 - var3 - 12; var2.index = var4; int var5 = var2.readInt(); - var1.localIntCount = var2.method43(); - var1.localStringCount = var2.method43(); - var1.intArgumentCount = var2.method43(); - var1.stringArgumentCount = var2.method43(); + var1.localIntCount = var2.readUnsignedShort(); + var1.localStringCount = var2.readUnsignedShort(); + var1.intArgumentCount = var2.readUnsignedShort(); + var1.stringArgumentCount = var2.readUnsignedShort(); int var6 = var2.readUnsignedByte(); int var7; int var8; @@ -155,7 +155,7 @@ public final class Occluder { var1.switches = var1.method302(var6); for (var7 = 0; var7 < var6; ++var7) { - var8 = var2.method43(); + var8 = var2.readUnsignedShort(); IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? World.method1759(var8) : 1); var1.switches[var7] = var9; @@ -174,7 +174,7 @@ public final class Occluder { var1.stringOperands = new String[var5]; for (var7 = 0; var2.index < var4; var1.opcodes[var7++] = var8) { - var8 = var2.method43(); + var8 = var2.readUnsignedShort(); if (var8 == 3) { var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { diff --git a/runescape-client/src/main/java/class68.java b/runescape-client/src/main/java/PendingSpawn.java similarity index 88% rename from runescape-client/src/main/java/class68.java rename to runescape-client/src/main/java/PendingSpawn.java index 6d86c0cc52..8e4e90b17d 100644 --- a/runescape-client/src/main/java/class68.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -1,30 +1,36 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("bi") -public final class class68 extends Node { +@Implements("PendingSpawn") +public final class PendingSpawn extends Node { @ObfuscatedName("m") @ObfuscatedGetter( intValue = 1439936951 ) - int field911; + @Export("level") + int level; @ObfuscatedName("f") @ObfuscatedGetter( intValue = -1471611383 ) - int field906; + @Export("type") + int type; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 1059464897 ) - int field913; + @Export("x") + int x; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -1306474107 ) - int field901; + @Export("y") + int y; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -1889242993 @@ -44,12 +50,14 @@ public final class class68 extends Node { @ObfuscatedGetter( intValue = 1986990761 ) - int field899; + @Export("id") + int id; @ObfuscatedName("e") @ObfuscatedGetter( intValue = 1768602131 ) - int field907; + @Export("orientation") + int orientation; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 1989829133 @@ -59,16 +67,18 @@ public final class class68 extends Node { @ObfuscatedGetter( intValue = -715662659 ) - int field909; + @Export("delay") + int delay; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -2141472019 ) - int field910; + @Export("hitpoints") + int hitpoints; - class68() { - this.field909 = 0; - this.field910 = -1; + PendingSpawn() { + this.delay = 0; + this.hitpoints = -1; } @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 4c3021db70..2845a48a04 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -209,7 +209,7 @@ public final class Player extends Actor { var6 = var1.readUnsignedByte(); var4[var7] = var6 + (var5 << 8); if (var7 == 0 && var4[0] == 65535) { - var3 = var1.method43(); + var3 = var1.readUnsignedShort(); break; } @@ -233,38 +233,38 @@ public final class Player extends Actor { var9[var5] = var6; } - super.idleSequence = var1.method43(); + super.idleSequence = var1.readUnsignedShort(); if (super.idleSequence == 65535) { super.idleSequence = -1; } - super.turnLeftSequence = var1.method43(); + super.turnLeftSequence = var1.readUnsignedShort(); if (super.turnLeftSequence == 65535) { super.turnLeftSequence = -1; } super.turnRightSequence = super.turnLeftSequence; - super.walkSequence = var1.method43(); + super.walkSequence = var1.readUnsignedShort(); if (super.walkSequence == 65535) { super.walkSequence = -1; } - super.walkTurnSequence = var1.method43(); + super.walkTurnSequence = var1.readUnsignedShort(); if (super.walkTurnSequence == 65535) { super.walkTurnSequence = -1; } - super.walkTurnLeftSequence = var1.method43(); + super.walkTurnLeftSequence = var1.readUnsignedShort(); if (super.walkTurnLeftSequence == 65535) { super.walkTurnLeftSequence = -1; } - super.walkTurnRightSequence = var1.method43(); + super.walkTurnRightSequence = var1.readUnsignedShort(); if (super.walkTurnRightSequence == 65535) { super.walkTurnRightSequence = -1; } - super.runSequence = var1.method43(); + super.runSequence = var1.readUnsignedShort(); if (super.runSequence == 65535) { super.runSequence = -1; } @@ -277,7 +277,7 @@ public final class Player extends Actor { } this.combatLevel = var1.readUnsignedByte(); - this.skillLevel = var1.method43(); + this.skillLevel = var1.readUnsignedShort(); this.isHidden = var1.readUnsignedByte() == 1; if (Client.gameBuild == 0 && Client.rights >= 2) { this.isHidden = false; diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java index bc18190bc9..59bb5ca93b 100644 --- a/runescape-client/src/main/java/PlayerAppearance.java +++ b/runescape-client/src/main/java/PlayerAppearance.java @@ -55,7 +55,7 @@ public class PlayerAppearance { for (int var5 = 0; var5 < 7; ++var5) { for (int var6 = 0; var6 < KitDefinition.field457; ++var6) { KitDefinition var7 = WorldMapSection1.getKitDefinition(var6); - if (var7 != null && !var7.field460 && var5 + (var3 ? 7 : 0) == var7.field458) { + if (var7 != null && !var7.nonSelectable && var5 + (var3 ? 7 : 0) == var7.bodypartID) { var1[field727[var5]] = var6 + 256; break; } @@ -99,8 +99,8 @@ public class PlayerAppearance { var4 = WorldMapSection1.getKitDefinition(var3); } while(var4 == null); - } while(var4.field460); - } while(var1 + (this.isFemale ? 7 : 0) != var4.field458); + } while(var4.nonSelectable); + } while(var1 + (this.isFemale ? 7 : 0) != var4.bodypartID); this.equipment[field727[var1]] = var3 + 256; this.setHash(); @@ -254,7 +254,7 @@ public class PlayerAppearance { int var10; for (int var11 = 0; var11 < 12; ++var11) { var10 = var7[var11]; - if (var10 >= 256 && var10 < 512 && !WorldMapSection1.getKitDefinition(var10 - 256).method159()) { + if (var10 >= 256 && var10 < 512 && !WorldMapSection1.getKitDefinition(var10 - 256).ready()) { var9 = true; } @@ -282,7 +282,7 @@ public class PlayerAppearance { var12 = var7[var13]; ModelData var14; if (var12 >= 256 && var12 < 512) { - var14 = WorldMapSection1.getKitDefinition(var12 - 256).method160(); + var14 = WorldMapSection1.getKitDefinition(var12 - 256).getModelData(); if (var14 != null) { var17[var10++] = var14; } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 328851d6dc..2238fe002f 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -195,7 +195,7 @@ public class ScriptEvent extends Node { return 1; } else if (var0 == 3304) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class231.method4523(var3).size; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapDecorationType.method4523(var3).size; return 1; } else if (var0 == 3305) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; @@ -341,9 +341,9 @@ public class ScriptEvent extends Node { garbageValue = "35" ) static final void method1179() { - for (class68 var0 = (class68)Client.field214.last(); var0 != null; var0 = (class68)Client.field214.previous()) { - if (var0.field910 == -1) { - var0.field909 = 0; + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0.hitpoints == -1) { + var0.delay = 0; class13.method165(var0); } else { var0.remove(); diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 3e02c0905e..e976ebcffa 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -86,7 +86,7 @@ public class SecureRandomCallable implements Callable { } } - var5 = class214.menuWidth / 2 + class25.menuX; + var5 = class214.menuWidth / 2 + WorldMapDecoration.menuX; var6 = GameShell.menuY; int var7 = class2.fontBold12.stringWidth("Choose Option"); @@ -128,7 +128,7 @@ public class SecureRandomCallable implements Callable { var13 = 0; } - class25.menuX = var12; + WorldMapDecoration.menuX = var12; GameShell.menuY = var13; class214.menuWidth = var7; AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22; diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index 555ecbd1df..134ea54929 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -133,25 +133,25 @@ public class SequenceDefinition extends DualNode { int var3; int var4; if (var2 == 1) { - var3 = var1.method43(); + var3 = var1.readUnsignedShort(); this.frameLengths = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.frameLengths[var4] = var1.method43(); + this.frameLengths[var4] = var1.readUnsignedShort(); } this.frameIds = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.frameIds[var4] = var1.method43(); + this.frameIds[var4] = var1.readUnsignedShort(); } for (var4 = 0; var4 < var3; ++var4) { var10000 = this.frameIds; - var10000[var4] += var1.method43() << 16; + var10000[var4] += var1.readUnsignedShort() << 16; } } else if (var2 == 2) { - this.frameCount = var1.method43(); + this.frameCount = var1.readUnsignedShort(); } else if (var2 == 3) { var3 = var1.readUnsignedByte(); this.field777 = new int[var3 + 1]; @@ -166,9 +166,9 @@ public class SequenceDefinition extends DualNode { } else if (var2 == 5) { this.field779 = var1.readUnsignedByte(); } else if (var2 == 6) { - this.shield = var1.method43(); + this.shield = var1.readUnsignedShort(); } else if (var2 == 7) { - this.weapon = var1.method43(); + this.weapon = var1.readUnsignedShort(); } else if (var2 == 8) { this.field780 = var1.readUnsignedByte(); } else if (var2 == 9) { @@ -182,12 +182,12 @@ public class SequenceDefinition extends DualNode { this.frameIds2 = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.frameIds2[var4] = var1.method43(); + this.frameIds2[var4] = var1.readUnsignedShort(); } for (var4 = 0; var4 < var3; ++var4) { var10000 = this.frameIds2; - var10000[var4] += var1.method43() << 16; + var10000[var4] += var1.readUnsignedShort() << 16; } } else if (var2 == 13) { var3 = var1.readUnsignedByte(); diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index 631add0a0c..6226bf1571 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -34,8 +34,8 @@ public class SoundEffect { } } - this.start = var1.method43(); - this.end = var1.method43(); + this.start = var1.readUnsignedShort(); + this.end = var1.readUnsignedShort(); } @ObfuscatedName("f") diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java index b5d494def3..dcbf6c0597 100644 --- a/runescape-client/src/main/java/SoundEnvelope.java +++ b/runescape-client/src/main/java/SoundEnvelope.java @@ -73,8 +73,8 @@ public class SoundEnvelope { this.phases = new int[this.segments]; for (int var2 = 0; var2 < this.segments; ++var2) { - this.durations[var2] = var1.method43(); - this.phases[var2] = var1.method43(); + this.durations[var2] = var1.readUnsignedShort(); + this.phases[var2] = var1.readUnsignedShort(); } } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index cc37a677b7..b9d3951b01 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -124,15 +124,15 @@ public class SpotAnimationDefinition extends DualNode { @Export("readNext") void readNext(Buffer var1, int var2) { if (var2 == 1) { - this.archive = var1.method43(); + this.archive = var1.readUnsignedShort(); } else if (var2 == 2) { - this.sequence = var1.method43(); + this.sequence = var1.readUnsignedShort(); } else if (var2 == 4) { - this.widthScale = var1.method43(); + this.widthScale = var1.readUnsignedShort(); } else if (var2 == 5) { - this.heightScale = var1.method43(); + this.heightScale = var1.readUnsignedShort(); } else if (var2 == 6) { - this.orientation = var1.method43(); + this.orientation = var1.readUnsignedShort(); } else if (var2 == 7) { this.field876 = var1.readUnsignedByte(); } else if (var2 == 8) { @@ -146,8 +146,8 @@ public class SpotAnimationDefinition extends DualNode { this.recolorTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.method43(); - this.recolorTo[var4] = (short)var1.method43(); + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); + this.recolorTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 == 41) { var3 = var1.readUnsignedByte(); @@ -155,8 +155,8 @@ public class SpotAnimationDefinition extends DualNode { this.retextureTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.method43(); - this.retextureTo[var4] = (short)var1.method43(); + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); } } } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index cc4f89e197..ce5b8d8384 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -41,7 +41,7 @@ public class Texture extends Node { ) Texture(Buffer var1) { this.isLoaded = false; - this.int1 = var1.method43(); + this.int1 = var1.readUnsignedShort(); this.field893 = var1.readUnsignedByte() == 1; int var2 = var1.readUnsignedByte(); if (var2 >= 1 && var2 <= 4) { @@ -49,7 +49,7 @@ public class Texture extends Node { int var3; for (var3 = 0; var3 < var2; ++var3) { - this.records[var3] = var1.method43(); + this.records[var3] = var1.readUnsignedShort(); } if (var2 > 1) { diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java index 6479d49090..3f2d265505 100644 --- a/runescape-client/src/main/java/VarbitDefinition.java +++ b/runescape-client/src/main/java/VarbitDefinition.java @@ -66,7 +66,7 @@ public class VarbitDefinition extends DualNode { @Export("readNext") void readNext(Buffer var1, int var2) { if (var2 == 1) { - this.varp = var1.method43(); + this.varp = var1.readUnsignedShort(); this.lowBit = var1.readUnsignedByte(); this.highBit = var1.readUnsignedByte(); } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index 5813666fd3..bd18c01a0c 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -285,7 +285,7 @@ public class Varcs { int var8; int var9; if (var5 >= 2) { - var9 = var25.method43(); + var9 = var25.readUnsignedShort(); var6 = 0; while (true) { @@ -293,7 +293,7 @@ public class Varcs { break label225; } - var7 = var25.method43(); + var7 = var25.readUnsignedShort(); var8 = var25.readUnsignedByte(); class3 var10 = (class3)ScriptFrame.findEnumerated(class3.method34(), var8); Object var11 = var10.method31(var25); @@ -304,17 +304,17 @@ public class Varcs { ++var6; } } else { - var9 = var25.method43(); + var9 = var25.readUnsignedShort(); for (var6 = 0; var6 < var9; ++var6) { - var7 = var25.method43(); + var7 = var25.readUnsignedShort(); var8 = var25.readInt(); if (this.intsPersistence[var7]) { this.map.put(var7, var8); } } - var6 = var25.method43(); + var6 = var25.readUnsignedShort(); var7 = 0; while (true) { @@ -322,7 +322,7 @@ public class Varcs { break label225; } - var25.method43(); + var25.readUnsignedShort(); var25.readStringCp1252NullTerminated(); ++var7; } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index 658062221e..b650c9347c 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -59,7 +59,7 @@ public class VarpDefinition extends DualNode { @Export("readNext") void readNext(Buffer var1, int var2) { if (var2 == 5) { - this.type = var1.method43(); + this.type = var1.readUnsignedShort(); } } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 46cb448535..f29255a2e9 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -792,20 +792,20 @@ public class Widget extends Node { this.isIf3 = false; this.type = var1.readUnsignedByte(); this.buttonType = var1.readUnsignedByte(); - this.contentType = var1.method43(); + this.contentType = var1.readUnsignedShort(); this.rawX = var1.method44(); this.rawY = var1.method44(); - this.rawWidth = var1.method43(); - this.rawHeight = var1.method43(); + this.rawWidth = var1.readUnsignedShort(); + this.rawHeight = var1.readUnsignedShort(); this.transparency = var1.readUnsignedByte(); - this.parentId = var1.method43(); + this.parentId = var1.readUnsignedShort(); if (this.parentId == 65535) { this.parentId = -1; } else { this.parentId += this.id & -65536; } - this.mouseOverRedirect = var1.method43(); + this.mouseOverRedirect = var1.readUnsignedShort(); if (this.mouseOverRedirect == 65535) { this.mouseOverRedirect = -1; } @@ -818,7 +818,7 @@ public class Widget extends Node { for (var3 = 0; var3 < var2; ++var3) { this.cs1Comparisons[var3] = var1.readUnsignedByte(); - this.cs1ComparisonValues[var3] = var1.method43(); + this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); } } @@ -830,11 +830,11 @@ public class Widget extends Node { this.cs1Instructions = new int[var3][]; for (var4 = 0; var4 < var3; ++var4) { - var5 = var1.method43(); + var5 = var1.readUnsignedShort(); this.cs1Instructions[var4] = new int[var5]; for (var6 = 0; var6 < var5; ++var6) { - this.cs1Instructions[var4][var6] = var1.method43(); + this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); if (this.cs1Instructions[var4][var6] == 65535) { this.cs1Instructions[var4][var6] = -1; } @@ -843,12 +843,12 @@ public class Widget extends Node { } if (this.type == 0) { - this.scrollHeight = var1.method43(); + this.scrollHeight = var1.readUnsignedShort(); this.isHidden = var1.readUnsignedByte() == 1; } if (this.type == 1) { - var1.method43(); + var1.readUnsignedShort(); var1.readUnsignedByte(); } @@ -912,7 +912,7 @@ public class Widget extends Node { this.textXAlignment = var1.readUnsignedByte(); this.textYAlignment = var1.readUnsignedByte(); this.textLineHeight = var1.readUnsignedByte(); - this.fontId = var1.method43(); + this.fontId = var1.readUnsignedShort(); if (this.fontId == 65535) { this.fontId = -1; } @@ -942,37 +942,37 @@ public class Widget extends Node { if (this.type == 6) { this.modelType = 1; - this.modelId = var1.method43(); + this.modelId = var1.readUnsignedShort(); if (this.modelId == 65535) { this.modelId = -1; } this.modelType2 = 1; - this.modelId2 = var1.method43(); + this.modelId2 = var1.readUnsignedShort(); if (this.modelId2 == 65535) { this.modelId2 = -1; } - this.sequenceId = var1.method43(); + this.sequenceId = var1.readUnsignedShort(); if (this.sequenceId == 65535) { this.sequenceId = -1; } - this.sequenceId2 = var1.method43(); + this.sequenceId2 = var1.readUnsignedShort(); if (this.sequenceId2 == 65535) { this.sequenceId2 = -1; } - this.modelZoom = var1.method43(); - this.modelAngleX = var1.method43(); - this.modelAngleY = var1.method43(); + this.modelZoom = var1.readUnsignedShort(); + this.modelAngleX = var1.readUnsignedShort(); + this.modelAngleY = var1.readUnsignedShort(); } if (this.type == 7) { this.itemIds = new int[this.rawHeight * this.rawWidth]; this.itemQuantities = new int[this.rawWidth * this.rawHeight]; this.textXAlignment = var1.readUnsignedByte(); - this.fontId = var1.method43(); + this.fontId = var1.readUnsignedShort(); if (this.fontId == 65535) { this.fontId = -1; } @@ -1004,7 +1004,7 @@ public class Widget extends Node { if (this.buttonType == 2 || this.type == 2) { this.spellActionName = var1.readStringCp1252NullTerminated(); this.spellName = var1.readStringCp1252NullTerminated(); - var4 = var1.method43() & 63; + var4 = var1.readUnsignedShort() & 63; this.clickMask |= var4 << 11; } @@ -1049,21 +1049,21 @@ public class Widget extends Node { var1.readUnsignedByte(); this.isIf3 = true; this.type = var1.readUnsignedByte(); - this.contentType = var1.method43(); + this.contentType = var1.readUnsignedShort(); this.rawX = var1.method44(); this.rawY = var1.method44(); - this.rawWidth = var1.method43(); + this.rawWidth = var1.readUnsignedShort(); if (this.type == 9) { this.rawHeight = var1.method44(); } else { - this.rawHeight = var1.method43(); + this.rawHeight = var1.readUnsignedShort(); } this.widthAlignment = var1.readByte(); this.heightAlignment = var1.readByte(); this.xAlignment = var1.readByte(); this.yAlignment = var1.readByte(); - this.parentId = var1.method43(); + this.parentId = var1.readUnsignedShort(); if (this.parentId == 65535) { this.parentId = -1; } else { @@ -1072,14 +1072,14 @@ public class Widget extends Node { this.isHidden = var1.readUnsignedByte() == 1; if (this.type == 0) { - this.scrollWidth = var1.method43(); - this.scrollHeight = var1.method43(); + this.scrollWidth = var1.readUnsignedShort(); + this.scrollHeight = var1.readUnsignedShort(); this.noClickThrough = var1.readUnsignedByte() == 1; } if (this.type == 5) { this.spriteId2 = var1.readInt(); - this.spriteAngle = var1.method43(); + this.spriteAngle = var1.readUnsignedShort(); this.spriteTiling = var1.readUnsignedByte() == 1; this.transparency = var1.readUnsignedByte(); this.outline = var1.readUnsignedByte(); @@ -1090,35 +1090,35 @@ public class Widget extends Node { if (this.type == 6) { this.modelType = 1; - this.modelId = var1.method43(); + this.modelId = var1.readUnsignedShort(); if (this.modelId == 65535) { this.modelId = -1; } this.modelOffsetX = var1.method44(); this.modelOffsetY = var1.method44(); - this.modelAngleX = var1.method43(); - this.modelAngleY = var1.method43(); - this.modelAngleZ = var1.method43(); - this.modelZoom = var1.method43(); - this.sequenceId = var1.method43(); + this.modelAngleX = var1.readUnsignedShort(); + this.modelAngleY = var1.readUnsignedShort(); + this.modelAngleZ = var1.readUnsignedShort(); + this.modelZoom = var1.readUnsignedShort(); + this.sequenceId = var1.readUnsignedShort(); if (this.sequenceId == 65535) { this.sequenceId = -1; } this.modelOrthog = var1.readUnsignedByte() == 1; - var1.method43(); + var1.readUnsignedShort(); if (this.widthAlignment != 0) { - this.field962 = var1.method43(); + this.field962 = var1.readUnsignedShort(); } if (this.heightAlignment != 0) { - var1.method43(); + var1.readUnsignedShort(); } } if (this.type == 4) { - this.fontId = var1.method43(); + this.fontId = var1.readUnsignedShort(); if (this.fontId == 65535) { this.fontId = -1; } diff --git a/runescape-client/src/main/java/WorldComparator.java b/runescape-client/src/main/java/WorldComparator.java index b186520c8a..c254ab0fe5 100644 --- a/runescape-client/src/main/java/WorldComparator.java +++ b/runescape-client/src/main/java/WorldComparator.java @@ -93,7 +93,7 @@ final class WorldComparator implements Comparator { } if ((var4 & 32) != 0) { - var5 = var0.method43(); + var5 = var0.readUnsignedShort(); if (var5 == 65535) { var5 = -1; } @@ -122,7 +122,7 @@ final class WorldComparator implements Comparator { } if ((var4 & 4) != 0) { - var3.definition = ObjectDefinition.getNpcDefinition(var0.method43()); + var3.definition = ObjectDefinition.getNpcDefinition(var0.readUnsignedShort()); var3.size = var3.definition.size; var3.field23 = var3.definition.field639; var3.walkSequence = var3.definition.walkSequence; diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 6c7931c721..92be204da6 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -23,7 +23,7 @@ public class WorldMapAreaData extends WorldMapArea { ) void method387(Buffer var1, Buffer var2, int var3, boolean var4) { this.read(var1, var3); - int var5 = var2.method43(); + int var5 = var2.readUnsignedShort(); this.field1016 = new HashSet(var5); int var6; @@ -39,7 +39,7 @@ public class WorldMapAreaData extends WorldMapArea { this.field1016.add(var7); } - var6 = var2.method43(); + var6 = var2.readUnsignedShort(); this.field1017 = new HashSet(var6); for (int var12 = 0; var12 < var6; ++var12) { @@ -64,7 +64,7 @@ public class WorldMapAreaData extends WorldMapArea { ) void method388(Buffer var1, boolean var2) { this.field1018 = new LinkedList(); - int var3 = var1.method43(); + int var3 = var1.readUnsignedShort(); for (int var4 = 0; var4 < var3; ++var4) { int var5 = var1.method51(); @@ -106,7 +106,7 @@ public class WorldMapAreaData extends WorldMapArea { garbageValue = "-1767097678" ) public static boolean method711(int var0) { - return var0 >= class231.field2810.field2820 && var0 <= class231.field2822.field2820; + return var0 >= WorldMapDecorationType.field2810.id && var0 <= WorldMapDecorationType.field2822.id; } @ObfuscatedName("u") diff --git a/runescape-client/src/main/java/class25.java b/runescape-client/src/main/java/WorldMapDecoration.java similarity index 84% rename from runescape-client/src/main/java/class25.java rename to runescape-client/src/main/java/WorldMapDecoration.java index c34dc39d8b..fd15e8530c 100644 --- a/runescape-client/src/main/java/class25.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -1,10 +1,13 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("v") -public class class25 { +@Implements("WorldMapDecoration") +public class WorldMapDecoration +{ @ObfuscatedName("dd") @ObfuscatedSignature( signature = "Lit;" @@ -21,22 +24,25 @@ public class class25 { @ObfuscatedGetter( intValue = 916624935 ) - final int field199; + @Export("objectDefinitionId") + final int objectDefinitionId; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1452888767 ) - final int field198; + @Export("decoration") + final int decoration; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -501025733 ) - final int field202; + @Export("rotation") + final int rotation; - class25(int var1, int var2, int var3) { - this.field199 = var1; - this.field198 = var2; - this.field202 = var3; + WorldMapDecoration(int var1, int var2, int var3) { + this.objectDefinitionId = var1; + this.decoration = var2; + this.rotation = var3; } @ObfuscatedName("j") diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/WorldMapDecorationType.java similarity index 93% rename from runescape-client/src/main/java/class231.java rename to runescape-client/src/main/java/WorldMapDecorationType.java index 7b7a13dd4e..fd5ef00171 100644 --- a/runescape-client/src/main/java/class231.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -1,10 +1,12 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hb") -public enum class231 implements Enumerated { +@Implements("WorldMapDecorationType") +public enum WorldMapDecorationType implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lhb;" @@ -132,14 +134,15 @@ public enum class231 implements Enumerated { @ObfuscatedGetter( intValue = 899733687 ) - public final int field2820; + @Export("id") + public final int id; @ObfuscatedSignature( signature = "(II)V", garbageValue = "0" ) - private class231(int var3, int var4) { - this.field2820 = var3; + private WorldMapDecorationType(int var3, int var4) { + this.id = var3; } @ObfuscatedName("f") @@ -149,7 +152,7 @@ public enum class231 implements Enumerated { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field2820; + return this.id; } @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index e890251192..62870b4599 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -196,7 +196,7 @@ public class WorldMapElement extends DualNode { } else if (var2 == 18) { var1.method51(); } else if (var2 == 19) { - this.category = var1.method43(); + this.category = var1.readUnsignedShort(); } else if (var2 == 21) { var1.readInt(); } else if (var2 == 22) { diff --git a/runescape-client/src/main/java/WorldMapIcon1.java b/runescape-client/src/main/java/WorldMapIcon1.java index a672e3263f..e4b4df12a8 100644 --- a/runescape-client/src/main/java/WorldMapIcon1.java +++ b/runescape-client/src/main/java/WorldMapIcon1.java @@ -126,7 +126,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { SoundEffect var10 = Client.soundEffects[var0]; if (var10 == null) { Object var2 = null; - var10 = SoundEffect.readSoundEffect(class25.indexCache4, Client.soundEffectIds[var0], 0); + var10 = SoundEffect.readSoundEffect(WorldMapDecoration.indexCache4, Client.soundEffectIds[var0], 0); if (var10 == null) { continue; } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 1abebbf4d6..4d8247b51b 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -126,16 +126,16 @@ public class WorldMapRegion { label66: for (int var7 = var2; var7 < var2 + var4; ++var7) { for (int var8 = 0; var8 < var5.field156; ++var8) { - class25[] var9 = var5.field144[var8][var6][var7]; + WorldMapDecoration[] var9 = var5.field144[var8][var6][var7]; if (var9 != null && var9.length != 0) { - class25[] var10 = var9; + WorldMapDecoration[] var10 = var9; for (int var11 = 0; var11 < var10.length; ++var11) { ObjectDefinition var12; boolean var13; label57: { - class25 var14 = var10[var11]; - var12 = class50.getObjectDefinition(var14.field199); + WorldMapDecoration var14 = var10[var11]; + var12 = class50.getObjectDefinition(var14.objectDefinitionId); if (var12.transforms != null) { int[] var15 = var12.transforms; @@ -655,14 +655,14 @@ public class WorldMapRegion { ) void method464(int var1, int var2, class21 var3, IndexedSprite[] var4) { for (int var5 = 0; var5 < var3.field156; ++var5) { - class25[] var6 = var3.field144[var5][var1][var2]; + WorldMapDecoration[] var6 = var3.field144[var5][var1][var2]; if (var6 != null && var6.length != 0) { - class25[] var7 = var6; + WorldMapDecoration[] var7 = var6; for (int var8 = 0; var8 < var7.length; ++var8) { - class25 var9 = var7[var8]; - if (WorldMapAreaData.method711(var9.field198) || class1.method19(var9.field198)) { - ObjectDefinition var10 = class50.getObjectDefinition(var9.field199); + WorldMapDecoration var9 = var7[var8]; + if (WorldMapAreaData.method711(var9.decoration) || class1.method19(var9.decoration)) { + ObjectDefinition var10 = class50.getObjectDefinition(var9.objectDefinitionId); if (var10.mapSceneId != -1) { if (var10.mapSceneId != 46 && var10.mapSceneId != 52) { var4[var10.mapSceneId].method135(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054 * 2, this.field1054 * 2); @@ -684,46 +684,46 @@ public class WorldMapRegion { ) void method465(int var1, int var2, class21 var3) { for (int var4 = 0; var4 < var3.field156; ++var4) { - class25[] var5 = var3.field144[var4][var1][var2]; + WorldMapDecoration[] var5 = var3.field144[var4][var1][var2]; if (var5 != null && var5.length != 0) { - class25[] var6 = var5; + WorldMapDecoration[] var6 = var5; for (int var7 = 0; var7 < var6.length; ++var7) { - class25 var8 = var6[var7]; - int var9 = var8.field198; - boolean var10 = var9 >= class231.field2805.field2820 && var9 <= class231.field2804.field2820 || var9 == class231.field2806.field2820; + WorldMapDecoration var8 = var6[var7]; + int var9 = var8.decoration; + boolean var10 = var9 >= WorldMapDecorationType.field2805.id && var9 <= WorldMapDecorationType.field2804.id || var9 == WorldMapDecorationType.field2806.id; if (var10) { - ObjectDefinition var11 = class50.getObjectDefinition(var8.field199); + ObjectDefinition var11 = class50.getObjectDefinition(var8.objectDefinitionId); int var12 = var11.int1 != 0 ? 0xffcc0000 : 0xffcccccc; - if (var8.field198 == class231.field2805.field2820) { - this.method422(var1, var2, var8.field202, var12); + if (var8.decoration == WorldMapDecorationType.field2805.id) { + this.method422(var1, var2, var8.rotation, var12); } - if (var8.field198 == class231.field2813.field2820) { - this.method422(var1, var2, var8.field202, 0xffcccccc); - this.method422(var1, var2, var8.field202 + 1, var12); + if (var8.decoration == WorldMapDecorationType.field2813.id) { + this.method422(var1, var2, var8.rotation, 0xffcccccc); + this.method422(var1, var2, var8.rotation + 1, var12); } - if (var8.field198 == class231.field2804.field2820) { - if (var8.field202 == 0) { + if (var8.decoration == WorldMapDecorationType.field2804.id) { + if (var8.rotation == 0) { Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1, this.field1054 * (63 - var2), 1, var12); } - if (var8.field202 == 1) { + if (var8.rotation == 1) { Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1 + this.field1054 - 1, this.field1054 * (63 - var2), 1, var12); } - if (var8.field202 == 2) { + if (var8.rotation == 2) { Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1 + this.field1054 - 1, this.field1054 * (63 - var2) + this.field1054 - 1, 1, var12); } - if (var8.field202 == 3) { + if (var8.rotation == 3) { Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1, this.field1054 * (63 - var2) + this.field1054 - 1, 1, var12); } } - if (var8.field198 == class231.field2806.field2820) { - int var13 = var8.field202 % 2; + if (var8.decoration == WorldMapDecorationType.field2806.id) { + int var13 = var8.rotation % 2; int var14; if (var13 == 0) { for (var14 = 0; var14 < this.field1054; ++var14) { diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java index a17c8d87aa..580063b608 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -170,16 +170,16 @@ public class WorldMapSection0 implements WorldMapSection { public void read(Buffer var1) { this.field1057 = var1.readUnsignedByte(); this.field1058 = var1.readUnsignedByte(); - this.field1059 = var1.method43(); + this.field1059 = var1.readUnsignedShort(); this.field1063 = var1.readUnsignedByte(); this.field1065 = var1.readUnsignedByte(); - this.field1060 = var1.method43(); + this.field1060 = var1.readUnsignedShort(); this.field1064 = var1.readUnsignedByte(); this.field1066 = var1.readUnsignedByte(); - this.field1061 = var1.method43(); + this.field1061 = var1.readUnsignedShort(); this.field1067 = var1.readUnsignedByte(); this.field1069 = var1.readUnsignedByte(); - this.field1062 = var1.method43(); + this.field1062 = var1.readUnsignedShort(); this.field1068 = var1.readUnsignedByte(); this.field1070 = var1.readUnsignedByte(); this.method423(); diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index 8c5859f173..9b7aae46ca 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -163,13 +163,13 @@ public class WorldMapSection1 implements WorldMapSection { public void read(Buffer var1) { this.field1072 = var1.readUnsignedByte(); this.field1073 = var1.readUnsignedByte(); - this.field1074 = var1.method43(); + this.field1074 = var1.readUnsignedShort(); this.field1078 = var1.readUnsignedByte(); - this.field1075 = var1.method43(); + this.field1075 = var1.readUnsignedShort(); this.field1079 = var1.readUnsignedByte(); - this.field1076 = var1.method43(); + this.field1076 = var1.readUnsignedShort(); this.field1080 = var1.readUnsignedByte(); - this.field1077 = var1.method43(); + this.field1077 = var1.readUnsignedShort(); this.field1081 = var1.readUnsignedByte(); this.method424(); } @@ -215,7 +215,7 @@ public class WorldMapSection1 implements WorldMapSection { class230.field1138 = true; Client.field166 = true; Client.field126 = -1L; - class68.method1694(); + PendingSpawn.method1694(); Client.packetWriter.method239(); Client.packetWriter.packetBuffer.index = 0; Client.packetWriter.serverPacket0 = null; @@ -272,7 +272,7 @@ public class WorldMapSection1 implements WorldMapSection { } } - Client.field214 = new NodeDeque(); + Client.pendingSpawns = new NodeDeque(); WorldMapArea.friendSystem.clear(); for (var0 = 0; var0 < VarpDefinition.field944; ++var0) { diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 593ff56c98..7be549d5f2 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -128,10 +128,10 @@ public class WorldMapSection2 implements WorldMapSection { public void read(Buffer var1) { this.field1083 = var1.readUnsignedByte(); this.field1084 = var1.readUnsignedByte(); - this.field1085 = var1.method43(); - this.field1086 = var1.method43(); - this.field1087 = var1.method43(); - this.field1088 = var1.method43(); + this.field1085 = var1.readUnsignedShort(); + this.field1086 = var1.readUnsignedShort(); + this.field1087 = var1.readUnsignedShort(); + this.field1088 = var1.readUnsignedShort(); this.method425(); } diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java index 674ae00ca1..a3dc383399 100644 --- a/runescape-client/src/main/java/WorldMapSection3.java +++ b/runescape-client/src/main/java/WorldMapSection3.java @@ -157,14 +157,14 @@ public class WorldMapSection3 implements WorldMapSection { public void read(Buffer var1) { this.field1090 = var1.readUnsignedByte(); this.field1091 = var1.readUnsignedByte(); - this.field1092 = var1.method43(); - this.field1093 = var1.method43(); - this.field1094 = var1.method43(); - this.field1095 = var1.method43(); - this.field1096 = var1.method43(); - this.field1097 = var1.method43(); - this.field1098 = var1.method43(); - this.field1099 = var1.method43(); + this.field1092 = var1.readUnsignedShort(); + this.field1093 = var1.readUnsignedShort(); + this.field1094 = var1.readUnsignedShort(); + this.field1095 = var1.readUnsignedShort(); + this.field1096 = var1.readUnsignedShort(); + this.field1097 = var1.readUnsignedShort(); + this.field1098 = var1.readUnsignedShort(); + this.field1099 = var1.readUnsignedShort(); this.method426(); } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index bb5a5df529..3f186cdad6 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -43,7 +43,7 @@ final class class1 implements class0 { garbageValue = "553036714" ) public static boolean method19(int var0) { - return var0 == class231.field2819.field2820; + return var0 == WorldMapDecorationType.field2819.id; } @ObfuscatedName("q") @@ -231,14 +231,14 @@ final class class1 implements class0 { return 1; } else if (var0 != 4211) { if (var0 == 4212) { - class231.field1139 = 0; + WorldMapDecorationType.field1139 = 0; return 1; } else { return 2; } } else { - if (AttackOption.field30 != null && class231.field1139 < WorldMapSection0.field1055) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = AttackOption.field30[++class231.field1139 - 1] & '\uffff'; + if (AttackOption.field30 != null && WorldMapDecorationType.field1139 < WorldMapSection0.field1055) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = AttackOption.field30[++WorldMapDecorationType.field1139 - 1] & '\uffff'; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index b4652f2105..4da7663662 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -51,29 +51,29 @@ public class class13 { signature = "(Lbi;I)V", garbageValue = "-527387190" ) - static final void method165(class68 var0) { + static final void method165(PendingSpawn var0) { long var1 = 0L; int var3 = -1; int var4 = 0; int var5 = 0; - if (var0.field906 == 0) { - var1 = class65.scene.method290(var0.field911, var0.field913, var0.field901); + if (var0.type == 0) { + var1 = class65.scene.method290(var0.level, var0.x, var0.y); } - if (var0.field906 == 1) { - var1 = class65.scene.method291(var0.field911, var0.field913, var0.field901); + if (var0.type == 1) { + var1 = class65.scene.method291(var0.level, var0.x, var0.y); } - if (var0.field906 == 2) { - var1 = class65.scene.method292(var0.field911, var0.field913, var0.field901); + if (var0.type == 2) { + var1 = class65.scene.method292(var0.level, var0.x, var0.y); } - if (var0.field906 == 3) { - var1 = class65.scene.getFloorDecorationTag(var0.field911, var0.field913, var0.field901); + if (var0.type == 3) { + var1 = class65.scene.getFloorDecorationTag(var0.level, var0.x, var0.y); } if (var1 != 0L) { - int var6 = class65.scene.getObjectFlags(var0.field911, var0.field913, var0.field901, var1); + int var6 = class65.scene.getObjectFlags(var0.level, var0.x, var0.y, var1); var3 = HitSplatDefinition.method4972(var1); var4 = var6 & 31; var5 = var6 >> 6 & 3; diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java index 42d91b8e84..0b07ec0546 100644 --- a/runescape-client/src/main/java/class15.java +++ b/runescape-client/src/main/java/class15.java @@ -41,10 +41,10 @@ public class class15 extends class21 { } else { super.field148 = var1.readUnsignedByte(); super.field156 = var1.readUnsignedByte(); - super.field149 = var1.method43(); - super.field146 = var1.method43(); - super.field159 = var1.method43(); - super.field147 = var1.method43(); + super.field149 = var1.readUnsignedShort(); + super.field146 = var1.readUnsignedShort(); + super.field159 = var1.readUnsignedShort(); + super.field147 = var1.readUnsignedShort(); super.field150 = var1.method51(); super.field152 = var1.method51(); } @@ -61,7 +61,7 @@ public class class15 extends class21 { super.field145 = new short[super.field156][64][64]; super.field154 = new byte[super.field156][64][64]; super.field155 = new byte[super.field156][64][64]; - super.field144 = new class25[super.field156][64][64][]; + super.field144 = new WorldMapDecoration[super.field156][64][64][]; int var2 = var1.readUnsignedByte(); if (var2 != class30.field246.field248) { throw new IllegalStateException(""); diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 3f6bfbfbe4..07eddf838a 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -112,7 +112,7 @@ public class class16 { var2 = var1.method67(); byte var13 = var1.method61(); var3 = var1.method66(); - var4 = var1.method43(); + var4 = var1.readUnsignedShort(); var5 = var1.method58(); var6 = var5 >> 2; var7 = var5 & 3; @@ -218,7 +218,7 @@ public class class16 { } if (class190.field2341 == var0) { - var31 = var1.method43(); + var31 = var1.readUnsignedShort(); var2 = var1.method58(); var32 = var1.method66(); var3 = var1.readUnsignedByte(); @@ -240,7 +240,7 @@ public class class16 { var4 = var1.readUnsignedByteNegate(); var5 = (var4 >> 4 & 7) + WorldMapSection3.field1089; var6 = (var4 & 7) + Canvas.field95; - var7 = var1.method43(); + var7 = var1.readUnsignedShort(); if (var5 >= 0 && var6 >= 0 && var5 < 103 && var6 < 103) { if (var3 == 0) { BoundaryObject var34 = class65.scene.getBoundaryObject(SoundSystem.plane, var5, var6); @@ -330,7 +330,7 @@ public class class16 { } } else if (class190.field2352 == var0) { var31 = var1.method59() * 4; - var2 = var1.method43(); + var2 = var1.readUnsignedShort(); var32 = var1.method66(); var3 = var1.method59() * 4; var4 = var1.method68(); diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index be6abab812..2ae59d52fe 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -103,7 +103,7 @@ public class class171 { Skeleton.indexCache1 = class22.newIndexCache(1, false, true, true); ObjectSound.indexCache2 = class22.newIndexCache(2, true, false, true); WorldMapIcon1.indexCache3 = class22.newIndexCache(3, false, true, true); - class25.indexCache4 = class22.newIndexCache(4, false, true, true); + WorldMapDecoration.indexCache4 = class22.newIndexCache(4, false, true, true); SecureRandomFuture.indexCache5 = class22.newIndexCache(5, true, true, true); UserComparator3.indexCache6 = class22.newIndexCache(6, true, true, true); class40.indexCache7 = class22.newIndexCache(7, false, true, true); @@ -128,7 +128,7 @@ public class class171 { var0 += Skeleton.indexCache1.method131() * 4 / 100; var0 += ObjectSound.indexCache2.method131() * 2 / 100; var0 += WorldMapIcon1.indexCache3.method131() * 2 / 100; - var0 += class25.indexCache4.method131() * 6 / 100; + var0 += WorldMapDecoration.indexCache4.method131() * 6 / 100; var0 += SecureRandomFuture.indexCache5.method131() * 4 / 100; var0 += UserComparator3.indexCache6.method131() * 2 / 100; var0 += class40.indexCache7.method131() * 56 / 100; @@ -153,7 +153,7 @@ public class class171 { } else { AbstractWorldMapIcon.method625(AbstractIndexCache.indexCache0, "Animations"); AbstractWorldMapIcon.method625(Skeleton.indexCache1, "Skeletons"); - AbstractWorldMapIcon.method625(class25.indexCache4, "Sound FX"); + AbstractWorldMapIcon.method625(WorldMapDecoration.indexCache4, "Sound FX"); AbstractWorldMapIcon.method625(SecureRandomFuture.indexCache5, "Maps"); AbstractWorldMapIcon.method625(UserComparator3.indexCache6, "Music Tracks"); AbstractWorldMapIcon.method625(class40.indexCache7, "Models"); @@ -176,7 +176,7 @@ public class class171 { var28.method174(9, 128); WorldMapCacheName.pcmPlayer0 = Players.newPcmPlayer(GameShell.taskHandler, 0, 22050); WorldMapCacheName.pcmPlayer0.setStream(var28); - NetSocket.method3537(WorldMapSection1.indexCache15, class2.indexCache14, class25.indexCache4, var28); + NetSocket.method3537(WorldMapSection1.indexCache15, class2.indexCache14, WorldMapDecoration.indexCache4, var28); AbstractIndexCache.pcmPlayer1 = Players.newPcmPlayer(GameShell.taskHandler, 1, 2048); TaskHandler.pcmStreamMixer = new PcmStreamMixer(); AbstractIndexCache.pcmPlayer1.setStream(TaskHandler.pcmStreamMixer); diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java index fcc927ce95..94984cac3c 100644 --- a/runescape-client/src/main/java/class21.java +++ b/runescape-client/src/main/java/class21.java @@ -59,7 +59,7 @@ public abstract class class21 { @ObfuscatedSignature( signature = "[[[[Lv;" ) - class25[][][][] field144; + WorldMapDecoration[][][][] field144; @ObfuscatedName("i") boolean field157; @ObfuscatedName("a") @@ -116,7 +116,7 @@ public abstract class class21 { this.field145 = (short[][][])null; this.field154 = (byte[][][])null; this.field155 = (byte[][][])null; - this.field144 = (class25[][][][])null; + this.field144 = (WorldMapDecoration[][][][])null; this.field157 = false; this.field153 = false; } @@ -183,12 +183,12 @@ public abstract class class21 { for (var8 = 0; var8 < var5; ++var8) { var9 = var3.readUnsignedByte(); if (var9 != 0) { - class25[] var14 = this.field144[var8][var1][var2] = new class25[var9]; + WorldMapDecoration[] var14 = this.field144[var8][var1][var2] = new WorldMapDecoration[var9]; for (var10 = 0; var10 < var9; ++var10) { int var12 = var3.method51(); int var13 = var3.readUnsignedByte(); - var14[var10] = new class25(var12, var13 >> 2, var13 & 3); + var14[var10] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); } } } @@ -305,7 +305,7 @@ public abstract class class21 { var3.field18 = var0.method62(); var3.field19 = var0.method66() + Client.cycle; var3.field20 = var0.method65() + Client.cycle; - var3.field21 = var0.method43(); + var3.field21 = var0.readUnsignedShort(); if (var3.field725) { var3.field15 += var3.tileX; var3.field17 += var3.tileY; @@ -413,7 +413,7 @@ public abstract class class21 { } if ((var4 & 128) != 0) { - var6 = var0.method43(); + var6 = var0.readUnsignedShort(); if (var6 == 65535) { var6 = -1; } diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java index 09f71a5c0f..6fa87ea0aa 100644 --- a/runescape-client/src/main/java/class238.java +++ b/runescape-client/src/main/java/class238.java @@ -225,7 +225,7 @@ public final class class238 { class171.method3494(var22 + 1, var9.id, var9.childIndex, var9.itemId, ""); } else if (var22 == 10) { Player.method1281(); - class25.method350(var9.id, var9.childIndex, class211.method4107(class1.getWidgetClickMask(var9)), var9.itemId); + WorldMapDecoration.method350(var9.id, var9.childIndex, class211.method4107(class1.getWidgetClickMask(var9)), var9.itemId); Client.selectedSpellActionName = class198.method3745(var9); if (Client.selectedSpellActionName == null) { Client.selectedSpellActionName = "null"; @@ -586,7 +586,7 @@ public final class class238 { } } - class231.method4517(var33.group, var12, var13, var14, var15, var10, var11); + WorldMapDecorationType.method4517(var33.group, var12, var13, var14, var15, var10, var11); } } } diff --git a/runescape-client/src/main/java/class258.java b/runescape-client/src/main/java/class258.java index 90c200d0eb..9d5e68b68a 100644 --- a/runescape-client/src/main/java/class258.java +++ b/runescape-client/src/main/java/class258.java @@ -39,29 +39,29 @@ public class class258 { garbageValue = "772902595" ) static final void method4898(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - class68 var9 = null; + PendingSpawn var9 = null; - for (class68 var10 = (class68)Client.field214.last(); var10 != null; var10 = (class68)Client.field214.previous()) { - if (var0 == var10.field911 && var10.field913 == var1 && var2 == var10.field901 && var3 == var10.field906) { + for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0 == var10.level && var10.x == var1 && var2 == var10.y && var3 == var10.type) { var9 = var10; break; } } if (var9 == null) { - var9 = new class68(); - var9.field911 = var0; - var9.field906 = var3; - var9.field913 = var1; - var9.field901 = var2; + var9 = new PendingSpawn(); + var9.level = var0; + var9.type = var3; + var9.x = var1; + var9.y = var2; class13.method165(var9); - Client.field214.addFirst(var9); + Client.pendingSpawns.addFirst(var9); } - var9.field899 = var4; + var9.id = var4; var9.field908 = var5; - var9.field907 = var6; - var9.field909 = var7; - var9.field910 = var8; + var9.orientation = var6; + var9.delay = var7; + var9.hitpoints = var8; } } diff --git a/runescape-client/src/main/java/class39.java b/runescape-client/src/main/java/class39.java index 629a66f2d6..e66798f49a 100644 --- a/runescape-client/src/main/java/class39.java +++ b/runescape-client/src/main/java/class39.java @@ -44,12 +44,12 @@ public class class39 extends class21 { } else { super.field148 = var1.readUnsignedByte(); super.field156 = var1.readUnsignedByte(); - super.field149 = var1.method43(); - super.field146 = var1.method43(); + super.field149 = var1.readUnsignedShort(); + super.field146 = var1.readUnsignedShort(); this.field318 = var1.readUnsignedByte(); this.field319 = var1.readUnsignedByte(); - super.field159 = var1.method43(); - super.field147 = var1.method43(); + super.field159 = var1.readUnsignedShort(); + super.field147 = var1.readUnsignedShort(); this.field321 = var1.readUnsignedByte(); this.field323 = var1.readUnsignedByte(); super.field150 = var1.method51(); @@ -68,7 +68,7 @@ public class class39 extends class21 { super.field145 = new short[super.field156][64][64]; super.field154 = new byte[super.field156][64][64]; super.field155 = new byte[super.field156][64][64]; - super.field144 = new class25[super.field156][64][64][]; + super.field144 = new WorldMapDecoration[super.field156][64][64][]; int var2 = var1.readUnsignedByte(); if (var2 != class30.field247.field248) { throw new IllegalStateException(""); diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java index eec1fab32e..052402ebef 100644 --- a/runescape-client/src/main/java/class40.java +++ b/runescape-client/src/main/java/class40.java @@ -637,7 +637,7 @@ public class class40 { static final void drawEntities(int var0, int var1, int var2, int var3) { ++Client.viewportDrawCount; class229.method4514(); - class25.addLocalPlayerToScene(); + WorldMapDecoration.addLocalPlayerToScene(); TriBool.addTargetPlayerToScene(); BufferedSource.method3423(true); int var4 = Players.Players_count; @@ -879,7 +879,7 @@ public class class40 { if (Client.isLoading) { Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - class68.drawLoadingMessage("Loading - please wait.", false); + PendingSpawn.drawLoadingMessage("Loading - please wait.", false); } } diff --git a/runescape-client/src/main/java/class50.java b/runescape-client/src/main/java/class50.java index 8b2c6cf343..7ffa296a42 100644 --- a/runescape-client/src/main/java/class50.java +++ b/runescape-client/src/main/java/class50.java @@ -89,7 +89,7 @@ public class class50 { if (!Client.isInInstance) { var2 = var1.method67(); var3 = var1.method66(); - int var8 = var1.method43(); + int var8 = var1.readUnsignedShort(); class190.xteaKeys = new int[var8][4]; for (var4 = 0; var4 < var8; ++var4) { @@ -131,7 +131,7 @@ public class class50 { var2 = var1.method66(); var3 = var1.method67(); boolean var15 = var1.readUnsignedByte() == 1; - var4 = var1.method43(); + var4 = var1.readUnsignedShort(); var1.importIndex(); int var16; @@ -233,7 +233,7 @@ public class class50 { } AttackOption.field30 = var2; - class231.field1139 = 0; + WorldMapDecorationType.field1139 = 0; WorldMapSection0.field1055 = var3; String[] var8 = new String[WorldMapSection0.field1055]; From d1caab6456fa044303bda6d60e3ec7389462cab0 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sat, 6 Jul 2019 14:48:31 +0200 Subject: [PATCH 058/472] Fix checkstyle in pluginsorter/configpanel --- .../net/runelite/client/plugins/config/ConfigPanel.java | 1 - .../client/plugins/pluginsorter/PluginSorterPlugin.java | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java index 66978819ce..9b4e60135b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java @@ -99,7 +99,6 @@ import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginInstantiationException; import net.runelite.client.plugins.PluginManager; import net.runelite.client.plugins.PluginType; -import net.runelite.client.plugins.pluginsorter.PluginSorterConfig; import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.DynamicGridLayout; import net.runelite.client.ui.FontManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java index 8171a85130..320475b887 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java @@ -31,9 +31,7 @@ import java.util.Iterator; import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; -import net.runelite.api.GameState; import net.runelite.api.events.ConfigChanged; -import net.runelite.api.events.GameStateChanged; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.PluginChanged; @@ -90,7 +88,8 @@ public class PluginSorterPlugin extends Plugin validatePlugins(); } - public void validatePlugins() { + private void validatePlugins() + { if (this.hidePlugins) { hidePlugins(); @@ -99,6 +98,7 @@ public class PluginSorterPlugin extends Plugin { showPlugins(); } + updateColors(); } From f8003f1d032bc674a5d9406081256e05456b6392 Mon Sep 17 00:00:00 2001 From: sdburns1998 <49877861+sdburns1998@users.noreply.github.com> Date: Sat, 6 Jul 2019 16:38:57 +0200 Subject: [PATCH 059/472] 'Globalize' RL+ config (#908) * Fix tabs in Runelite config * Move RL+ config * Move some items to runelite.properties * 'Globalize' RL+ config * Move enabling external plugins to RL+ config * Fix default presence * Fix master branch errors * Fix guicing in test * Remove non final discordAppID --- .../net/runelite/client/RuneLiteModule.java | 8 + .../runelite/client/RuneLiteProperties.java | 36 +++- .../client/config/RuneLiteConfig.java | 199 +++++++++--------- .../RuneLitePlusConfig.java | 13 +- .../client/discord/DiscordService.java | 2 +- .../runelite/client/plugins/PluginType.java | 1 - .../client/plugins/PluginWatcher.java | 12 +- .../client/plugins/config/ConfigPanel.java | 46 ++-- .../client/plugins/config/ConfigPlugin.java | 6 +- .../pluginsorter/PluginSorterPlugin.java | 12 +- .../runeliteplus/RuneLitePlusPlugin.java | 59 +----- .../client/ui/RuneLiteSplashScreen.java | 11 +- .../net/runelite/client/runelite.properties | 4 +- .../ChatNotificationsPluginTest.java | 5 + 14 files changed, 212 insertions(+), 202 deletions(-) rename runelite-client/src/main/java/net/runelite/client/{plugins/runeliteplus => config}/RuneLitePlusConfig.java (91%) diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java b/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java index af5e7e2631..ee8486811b 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java @@ -41,6 +41,7 @@ import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.config.ChatColorConfig; import net.runelite.client.config.ConfigManager; import net.runelite.client.config.RuneLiteConfig; +import net.runelite.client.config.RuneLitePlusConfig; import net.runelite.client.eventbus.EventBus; import net.runelite.client.game.ItemManager; import net.runelite.client.menus.MenuManager; @@ -117,6 +118,13 @@ public class RuneLiteModule extends AbstractModule return configManager.getConfig(RuneLiteConfig.class); } + @Provides + @Singleton + RuneLitePlusConfig providePlusConfig(ConfigManager configManager) + { + return configManager.getConfig(RuneLitePlusConfig.class); + } + @Provides @Singleton ChatColorConfig provideChatColorConfig(ConfigManager configManager) diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java b/runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java index f5b5c56da0..1fd40987ad 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java @@ -31,17 +31,18 @@ import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; -import net.runelite.client.plugins.runeliteplus.RuneLitePlusPlugin; +import net.runelite.client.config.RuneLitePlusConfig; @Singleton @Slf4j public class RuneLiteProperties { - public static String discordAppID = "409416265891971072"; private static final String RUNELITE_TITLE = "runelite.title"; private static final String RUNELITE_VERSION = "runelite.version"; + private static final String RUNELIT_VERSION = "runelit.version"; private static final String RUNESCAPE_VERSION = "runescape.version"; private static final String DISCORD_APP_ID = "runelite.discord.appid"; + private static final String DISCORD_APP_ID_PLUS = "runelite.plus.discord.appid"; private static final String DISCORD_INVITE = "runelite.discord.invite"; private static final String GITHUB_LINK = "runelite.github.link"; private static final String WIKI_LINK = "runelite.wiki.link"; @@ -50,9 +51,26 @@ public class RuneLiteProperties private final Properties properties = new Properties(); + private final RuneLitePlusConfig runeLitePlusConfig; + @Inject + public RuneLiteProperties(final RuneLitePlusConfig runeLiteConfig) + { + this.runeLitePlusConfig = runeLiteConfig; + + try (InputStream in = getClass().getResourceAsStream("runelite.properties")) + { + properties.load(in); + } + catch (IOException ex) + { + log.warn("unable to load propertries", ex); + } + } + public RuneLiteProperties() { + runeLitePlusConfig = null; try (InputStream in = getClass().getResourceAsStream("runelite.properties")) { properties.load(in); @@ -79,6 +97,11 @@ public class RuneLiteProperties return properties.getProperty(RUNELITE_VERSION); } + public String getRunelitVersion() + { + return properties.getProperty(RUNELIT_VERSION); + } + public String getRunescapeVersion() { return properties.getProperty(RUNESCAPE_VERSION); @@ -86,9 +109,14 @@ public class RuneLiteProperties public String getDiscordAppId() { - if (RuneLitePlusPlugin.customPresenceEnabled) + if (this.runeLitePlusConfig == null) { - return properties.getProperty(RuneLitePlusPlugin.rlPlusDiscordApp); + return properties.getProperty(DISCORD_APP_ID); + } + + if (this.runeLitePlusConfig.customPresence()) + { + return properties.getProperty(DISCORD_APP_ID_PLUS); } else { diff --git a/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java b/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java index b7503fb616..069483865a 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java @@ -33,10 +33,10 @@ import net.runelite.client.ui.FontManager; public interface RuneLiteConfig extends Config { @ConfigItem( - keyName = "gameSize", - name = "Game size", - description = "The game will resize to this resolution upon starting the client", - position = 10 + keyName = "gameSize", + name = "Game size", + description = "The game will resize to this resolution upon starting the client", + position = 10 ) default Dimension gameSize() { @@ -44,10 +44,10 @@ public interface RuneLiteConfig extends Config } @ConfigItem( - keyName = "automaticResizeType", - name = "Resize type", - description = "Choose how the window should resize when opening and closing panels", - position = 11 + keyName = "automaticResizeType", + name = "Resize type", + description = "Choose how the window should resize when opening and closing panels", + position = 11 ) default ExpandResizeType automaticResizeType() { @@ -55,10 +55,10 @@ public interface RuneLiteConfig extends Config } @ConfigItem( - keyName = "lockWindowSize", - name = "Lock window size", - description = "Determines if the window resizing is allowed or not", - position = 12 + keyName = "lockWindowSize", + name = "Lock window size", + description = "Determines if the window resizing is allowed or not", + position = 12 ) default boolean lockWindowSize() { @@ -66,21 +66,10 @@ public interface RuneLiteConfig extends Config } @ConfigItem( - keyName = "enablePlugins", - name = "Enable loading of external plugins", - description = "Enable loading of external plugins", - position = 10 - ) - default boolean enablePlugins() - { - return false; - } - - @ConfigItem( - keyName = "containInScreen", - name = "Contain in screen", - description = "Makes the client stay contained in the screen when attempted to move out of it.
Note: Only works if custom chrome is enabled.", - position = 13 + keyName = "containInScreen", + name = "Contain in screen", + description = "Makes the client stay contained in the screen when attempted to move out of it.
Note: Only works if custom chrome is enabled.", + position = 13 ) default boolean containInScreen() { @@ -88,10 +77,10 @@ public interface RuneLiteConfig extends Config } @ConfigItem( - keyName = "rememberScreenBounds", - name = "Remember client position", - description = "Save the position and size of the client after exiting", - position = 14 + keyName = "rememberScreenBounds", + name = "Remember client position", + description = "Save the position and size of the client after exiting", + position = 14 ) default boolean rememberScreenBounds() { @@ -99,11 +88,11 @@ public interface RuneLiteConfig extends Config } @ConfigItem( - keyName = "uiEnableCustomChrome", - name = "Enable custom window chrome", - description = "Use Runelite's custom window title and borders.", - warning = "Please restart your client after changing this setting", - position = 15 + keyName = "uiEnableCustomChrome", + name = "Enable custom window chrome", + description = "Use Runelite's custom window title and borders.", + warning = "Please restart your client after changing this setting", + position = 15 ) default boolean enableCustomChrome() { @@ -111,10 +100,10 @@ public interface RuneLiteConfig extends Config } @ConfigItem( - keyName = "gameAlwaysOnTop", - name = "Enable client always on top", - description = "The game will always be on the top of the screen", - position = 16 + keyName = "gameAlwaysOnTop", + name = "Enable client always on top", + description = "The game will always be on the top of the screen", + position = 16 ) default boolean gameAlwaysOnTop() { @@ -122,10 +111,10 @@ public interface RuneLiteConfig extends Config } @ConfigItem( - keyName = "warningOnExit", - name = "Display warning on exit", - description = "Toggles a warning popup when trying to exit the client", - position = 17 + keyName = "warningOnExit", + name = "Display warning on exit", + description = "Toggles a warning popup when trying to exit the client", + position = 17 ) default WarningOnExit warningOnExit() { @@ -133,10 +122,10 @@ public interface RuneLiteConfig extends Config } @ConfigItem( - keyName = "usernameInTitle", - name = "Show display name in title", - description = "Toggles displaying of local player's display name in client title", - position = 18 + keyName = "usernameInTitle", + name = "Show display name in title", + description = "Toggles displaying of local player's display name in client title", + position = 18 ) default boolean usernameInTitle() { @@ -144,10 +133,10 @@ public interface RuneLiteConfig extends Config } @ConfigItem( - keyName = "notificationTray", - name = "Enable tray notifications", - description = "Enables tray notifications", - position = 20 + keyName = "notificationTray", + name = "Enable tray notifications", + description = "Enables tray notifications", + position = 20 ) default boolean enableTrayNotifications() { @@ -155,10 +144,10 @@ public interface RuneLiteConfig extends Config } @ConfigItem( - keyName = "notificationRequestFocus", - name = "Request focus on notification", - description = "Toggles window focus request", - position = 21 + keyName = "notificationRequestFocus", + name = "Request focus on notification", + description = "Toggles window focus request", + position = 21 ) default boolean requestFocusOnNotification() { @@ -166,10 +155,10 @@ public interface RuneLiteConfig extends Config } @ConfigItem( - keyName = "notificationSound", - name = "Enable sound on notifications", - description = "Enables the playing of a beep sound when notifications are displayed", - position = 22 + keyName = "notificationSound", + name = "Enable sound on notifications", + description = "Enables the playing of a beep sound when notifications are displayed", + position = 22 ) default boolean enableNotificationSound() { @@ -177,10 +166,10 @@ public interface RuneLiteConfig extends Config } @ConfigItem( - keyName = "notificationGameMessage", - name = "Enable game message notifications", - description = "Puts a notification message in the chatbox", - position = 23 + keyName = "notificationGameMessage", + name = "Enable game message notifications", + description = "Puts a notification message in the chatbox", + position = 23 ) default boolean enableGameMessageNotification() { @@ -188,10 +177,10 @@ public interface RuneLiteConfig extends Config } @ConfigItem( - keyName = "notificationFlash", - name = "Enable flash notification", - description = "Flashes the game frame as a notification", - position = 24 + keyName = "notificationFlash", + name = "Enable flash notification", + description = "Flashes the game frame as a notification", + position = 24 ) default FlashNotification flashNotification() { @@ -199,10 +188,10 @@ public interface RuneLiteConfig extends Config } @ConfigItem( - keyName = "notificationFocused", - name = "Send notifications when focused", - description = "Toggles all notifications for when the client is focused", - position = 25 + keyName = "notificationFocused", + name = "Send notifications when focused", + description = "Toggles all notifications for when the client is focused", + position = 25 ) default boolean sendNotificationsWhenFocused() { @@ -221,10 +210,10 @@ public interface RuneLiteConfig extends Config } @ConfigItem( - keyName = "fontType", - name = "Dynamic Overlay Font", - description = "Configures what font type is used for in-game overlays such as player name, ground items, etc.", - position = 30 + keyName = "fontType", + name = "Dynamic Overlay Font", + description = "Configures what font type is used for in-game overlays such as player name, ground items, etc.", + position = 30 ) default FontType fontType() { @@ -232,10 +221,10 @@ public interface RuneLiteConfig extends Config } @ConfigItem( - keyName = "tooltipFontType", - name = "Tooltip Font", - description = "Configures what font type is used for in-game tooltips such as food stats, NPC names, etc.", - position = 31 + keyName = "tooltipFontType", + name = "Tooltip Font", + description = "Configures what font type is used for in-game tooltips such as food stats, NPC names, etc.", + position = 31 ) default FontType tooltipFontType() { @@ -243,10 +232,10 @@ public interface RuneLiteConfig extends Config } @ConfigItem( - keyName = "interfaceFontType", - name = "Interface Overlay Font", - description = "Configures what font type is used for in-game interface overlays such as panels, opponent info, clue scrolls etc.", - position = 32 + keyName = "interfaceFontType", + name = "Interface Overlay Font", + description = "Configures what font type is used for in-game interface overlays such as panels, opponent info, clue scrolls etc.", + position = 32 ) default FontType interfaceFontType() { @@ -254,10 +243,10 @@ public interface RuneLiteConfig extends Config } @ConfigItem( - keyName = "menuEntryShift", - name = "Require Shift for overlay menu", - description = "Overlay right-click menu will require shift to be added", - position = 33 + keyName = "menuEntryShift", + name = "Require Shift for overlay menu", + description = "Overlay right-click menu will require shift to be added", + position = 33 ) default boolean menuEntryShift() { @@ -265,10 +254,10 @@ public interface RuneLiteConfig extends Config } @ConfigItem( - keyName = "infoBoxVertical", - name = "Display infoboxes vertically", - description = "Toggles the infoboxes to display vertically", - position = 40 + keyName = "infoBoxVertical", + name = "Display infoboxes vertically", + description = "Toggles the infoboxes to display vertically", + position = 40 ) default boolean infoBoxVertical() { @@ -276,10 +265,10 @@ public interface RuneLiteConfig extends Config } @ConfigItem( - keyName = "infoBoxWrap", - name = "Infobox wrap count", - description = "Configures the amount of infoboxes shown before wrapping", - position = 41 + keyName = "infoBoxWrap", + name = "Infobox wrap count", + description = "Configures the amount of infoboxes shown before wrapping", + position = 41 ) default int infoBoxWrap() { @@ -287,22 +276,22 @@ public interface RuneLiteConfig extends Config } @ConfigItem( - keyName = "infoBoxSize", - name = "Infobox size (px)", - description = "Configures the size of each infobox in pixels", - position = 42 + keyName = "infoBoxSize", + name = "Infobox size (px)", + description = "Configures the size of each infobox in pixels", + position = 42 ) default int infoBoxSize() { return 35; } - @Range( max = 100, min = 0 ) + @Range(max = 100, min = 0) @ConfigItem( - keyName = "volume", - name = "Runelite Volume", - description = "Sets the volume of custom Runelite sounds (not the client sounds)", - position = 43 + keyName = "volume", + name = "Runelite Volume", + description = "Sets the volume of custom Runelite sounds (not the client sounds)", + position = 43 ) default int volume() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusConfig.java b/runelite-client/src/main/java/net/runelite/client/config/RuneLitePlusConfig.java similarity index 91% rename from runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusConfig.java rename to runelite-client/src/main/java/net/runelite/client/config/RuneLitePlusConfig.java index 8db739148c..b70537e3de 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/config/RuneLitePlusConfig.java @@ -24,7 +24,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ -package net.runelite.client.plugins.runeliteplus; +package net.runelite.client.config; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; @@ -81,4 +81,15 @@ public interface RuneLitePlusConfig extends Config { return false; } + + @ConfigItem( + keyName = "enablePlugins", + name = "Enable loading of external plugins", + description = "Enable loading of external plugins", + position = 10 + ) + default boolean enablePlugins() + { + return false; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java b/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java index dbf3c36ba2..8ff303b6d0 100644 --- a/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java +++ b/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java @@ -106,7 +106,7 @@ public class DiscordService implements AutoCloseable discordEventHandlers.joinGame = this::joinGame; discordEventHandlers.spectateGame = this::spectateGame; discordEventHandlers.joinRequest = this::joinRequest; - discordRPC.Discord_Initialize(RuneLiteProperties.discordAppID, discordEventHandlers, true, null); + discordRPC.Discord_Initialize(runeLiteProperties.getDiscordAppId(), discordEventHandlers, true, null); executorService.scheduleAtFixedRate(discordRPC::Discord_RunCallbacks, 0, 2, TimeUnit.SECONDS); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/PluginType.java b/runelite-client/src/main/java/net/runelite/client/plugins/PluginType.java index 8199cf0502..7061b6a439 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/PluginType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/PluginType.java @@ -2,7 +2,6 @@ package net.runelite.client.plugins; public enum PluginType { - RUNELITPLUS, PVM, PVP, SKILLING, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/PluginWatcher.java b/runelite-client/src/main/java/net/runelite/client/plugins/PluginWatcher.java index a5af91fee5..870ccaaaf7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/PluginWatcher.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/PluginWatcher.java @@ -45,7 +45,7 @@ import lombok.extern.slf4j.Slf4j; import net.runelite.client.RuneLite; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigManager; -import net.runelite.client.config.RuneLiteConfig; +import net.runelite.client.config.RuneLitePlusConfig; @Singleton @Slf4j @@ -53,7 +53,7 @@ public class PluginWatcher extends Thread { private static final File BASE = RuneLite.PLUGIN_DIR; - private final RuneLiteConfig runeliteConfig; + private final RuneLitePlusConfig runelitePlusConfig; private final PluginManager pluginManager; private final WatchService watchService; private final WatchKey watchKey; @@ -62,9 +62,9 @@ public class PluginWatcher extends Thread private ConfigManager configManager; @Inject - public PluginWatcher(RuneLiteConfig runeliteConfig, PluginManager pluginManager) throws IOException + public PluginWatcher(RuneLitePlusConfig runelitePlusConfig, PluginManager pluginManager) throws IOException { - this.runeliteConfig = runeliteConfig; + this.runelitePlusConfig = runelitePlusConfig; this.pluginManager = pluginManager; setName("Plugin Watcher"); @@ -84,7 +84,7 @@ public class PluginWatcher extends Thread @Override public void run() { - if (runeliteConfig.enablePlugins()) + if (runelitePlusConfig.enablePlugins()) { scan(); } @@ -96,7 +96,7 @@ public class PluginWatcher extends Thread WatchKey key = watchService.take(); Thread.sleep(50); - if (!runeliteConfig.enablePlugins()) + if (!runelitePlusConfig.enablePlugins()) { key.reset(); continue; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java index 9b4e60135b..b328842794 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java @@ -93,6 +93,7 @@ import net.runelite.client.config.Keybind; import net.runelite.client.config.ModifierlessKeybind; import net.runelite.client.config.Range; import net.runelite.client.config.RuneLiteConfig; +import net.runelite.client.config.RuneLitePlusConfig; import net.runelite.client.config.Stub; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -126,11 +127,13 @@ public class ConfigPanel extends PluginPanel private static final String RUNELITE_GROUP_NAME = RuneLiteConfig.class.getAnnotation(ConfigGroup.class).value(); private static final String PINNED_PLUGINS_CONFIG_KEY = "pinnedPlugins"; private static final String RUNELITE_PLUGIN = "RuneLite"; + private static final String RUNELITEPLUS_PLUGIN = "RuneLitePlus"; private static final String CHAT_COLOR_PLUGIN = "Chat Color"; private final PluginManager pluginManager; private final ConfigManager configManager; private final ScheduledExecutorService executorService; private final RuneLiteConfig runeLiteConfig; + private final RuneLitePlusConfig runeLitePlusConfig; private final ChatColorConfig chatColorConfig; public static List pluginList = new ArrayList<>(); @@ -150,13 +153,14 @@ public class ConfigPanel extends PluginPanel } ConfigPanel(PluginManager pluginManager, ConfigManager configManager, ScheduledExecutorService executorService, - RuneLiteConfig runeLiteConfig, ChatColorConfig chatColorConfig) + RuneLiteConfig runeLiteConfig, RuneLitePlusConfig runeLitePlusConfig, ChatColorConfig chatColorConfig) { super(false); this.pluginManager = pluginManager; this.configManager = configManager; this.executorService = executorService; this.runeLiteConfig = runeLiteConfig; + this.runeLitePlusConfig = runeLitePlusConfig; this.chatColorConfig = chatColorConfig; searchBar.setIcon(IconTextField.Icon.SEARCH); @@ -261,22 +265,13 @@ public class ConfigPanel extends PluginPanel runeLite.nameLabel.setForeground(Color.WHITE); pluginList.add(runeLite); - List runeLitePlus = new ArrayList<>(); - // populate pluginList with all external Plugins - pluginManager.getPlugins().stream() - .filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.RUNELITPLUS)) - .forEach(plugin -> - { - final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class); - final Config config = pluginManager.getPluginConfigProxy(plugin); - final ConfigDescriptor configDescriptor = config == null ? null : configManager.getConfigDescriptor(config); - - final PluginListItem listItem = new PluginListItem(this, configManager, plugin, descriptor, config, configDescriptor); - listItem.setPinned(pinnedPlugins.contains(listItem.getName())); - runeLitePlus.add(listItem); - }); - runeLitePlus.sort(Comparator.comparing(PluginListItem::getName)); - pluginList.addAll(runeLitePlus); + // set RuneLitePlus config on top, as it should always have been + final PluginListItem runeLitePlus = new PluginListItem(this, configManager, runeLitePlusConfig, + configManager.getConfigDescriptor(runeLitePlusConfig), + RUNELITEPLUS_PLUGIN, "RuneLitePlus client settings", "client"); + runeLitePlus.setPinned(pinnedPlugins.contains(RUNELITEPLUS_PLUGIN)); + runeLitePlus.nameLabel.setForeground(Color.WHITE); + pluginList.add(runeLitePlus); List externalPlugins = new ArrayList<>(); // populate pluginList with all external Plugins @@ -418,15 +413,18 @@ public class ConfigPanel extends PluginPanel void refreshPluginList() { - // update enabled / disabled status of all items - pluginList.forEach(listItem -> + if (pluginManager != null) { - final Plugin plugin = listItem.getPlugin(); - if (plugin != null) + // update enabled / disabled status of all items + pluginList.forEach(listItem -> { - listItem.setPluginEnabled(pluginManager.isPluginEnabled(plugin)); - } - }); + final Plugin plugin = listItem.getPlugin(); + if (plugin != null) + { + listItem.setPluginEnabled(pluginManager.isPluginEnabled(plugin)); + } + }); + } if (showingPluginList) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java index a4520ebbd1..0996eed283 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java @@ -33,6 +33,7 @@ import net.runelite.api.MenuAction; import net.runelite.client.config.ChatColorConfig; import net.runelite.client.config.ConfigManager; import net.runelite.client.config.RuneLiteConfig; +import net.runelite.client.config.RuneLitePlusConfig; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.OverlayMenuClicked; import net.runelite.client.events.PluginChanged; @@ -69,6 +70,9 @@ public class ConfigPlugin extends Plugin @Inject private RuneLiteConfig runeLiteConfig; + @Inject + private RuneLitePlusConfig runeLitePlusConfig; + @Inject private ChatColorConfig chatColorConfig; @@ -78,7 +82,7 @@ public class ConfigPlugin extends Plugin @Override protected void startUp() throws Exception { - configPanel = new ConfigPanel(pluginManager, configManager, executorService, runeLiteConfig, chatColorConfig); + configPanel = new ConfigPanel(pluginManager, configManager, executorService, runeLiteConfig, runeLitePlusConfig, chatColorConfig); final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "config_icon.png"); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java index 320475b887..3ad3f06a4e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java @@ -177,9 +177,15 @@ public class PluginSorterPlugin extends Plugin private void showPlugins() { - List tempList = new ArrayList<>(); - tempList.addAll(ConfigPanel.pluginList); - tempList.addAll(1, removedPlugins); + List tempList = new ArrayList<>(ConfigPanel.pluginList); + if (tempList.size() > 0) + { + tempList.addAll(1, removedPlugins); + } + else + { + tempList.addAll(removedPlugins); + } ConfigPanel.pluginList = tempList; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java index a3940747de..769266f69c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java @@ -26,8 +26,6 @@ */ package net.runelite.client.plugins.runeliteplus; -import com.google.inject.Provides; - import java.awt.event.KeyEvent; import javax.inject.Inject; @@ -40,22 +38,19 @@ import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.RuneLiteProperties; import net.runelite.client.callback.ClientThread; -import net.runelite.client.config.ConfigManager; +import net.runelite.client.config.RuneLitePlusConfig; import net.runelite.client.discord.DiscordService; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.input.KeyListener; import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; -import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.ClientUI; @PluginDescriptor( - loadWhenOutdated = true, // prevent users from disabling - hidden = true, // prevent users from disabling - name = "RuneLitePlus", - description = "Configures various aspects of RuneLitePlus", - type = PluginType.RUNELITPLUS + loadWhenOutdated = true, // prevent users from disabling + hidden = true, // prevent users from disabling + name = "RunelitePlus" ) @Singleton @Slf4j @@ -96,38 +91,14 @@ public class RuneLitePlusPlugin extends Plugin } } - /* Can't feed this as args to runscript? - private static final int[] widgetArgs = new int[] - { - WidgetInfo.BANK_PIN_EXIT_BUTTON.getId(), - WidgetInfo.BANK_PIN_FORGOT_BUTTON.getId(), - WidgetInfo.BANK_PIN_1.getId(), - WidgetInfo.BANK_PIN_2.getId(), - WidgetInfo.BANK_PIN_3.getId(), - WidgetInfo.BANK_PIN_4.getId(), - WidgetInfo.BANK_PIN_5.getId(), - WidgetInfo.BANK_PIN_6.getId(), - WidgetInfo.BANK_PIN_7.getId(), - WidgetInfo.BANK_PIN_8.getId(), - WidgetInfo.BANK_PIN_9.getId(), - WidgetInfo.BANK_PIN_0.getId(), - WidgetInfo.BANK_PIN_EXIT_BUTTON.getId(), - WidgetInfo.BANK_PIN_FORGOT_BUTTON.getId(), - WidgetInfo.BANK_PIN_FIRST_ENTERED.getId(), - WidgetInfo.BANK_PIN_SECOND_ENTERED.getId(), - WidgetInfo.BANK_PIN_THIRD_ENTERED.getId(), - WidgetInfo.BANK_PIN_FOURTH_ENTERED.getId(), - WidgetInfo.BANK_PIN_INSTRUCTION_TEXT.getId() - };*/ - public static boolean customPresenceEnabled = false; - public static final String rlPlusDiscordApp = "560644885250572289"; - private static final String rlDiscordApp = "409416265891971072"; + @Inject + private RuneLiteProperties runeLiteProperties; @Inject - public RuneLitePlusConfig config; + private RuneLitePlusConfig config; @Inject - public DiscordService discordService; + private DiscordService discordService; @Inject private KeyManager keyManager; @@ -138,12 +109,6 @@ public class RuneLitePlusPlugin extends Plugin @Inject private ClientThread clientThread; - @Provides - RuneLitePlusConfig getConfig(ConfigManager configManager) - { - return configManager.getConfig(RuneLitePlusConfig.class); - } - private RuneLitePlusKeyListener keyListener = new RuneLitePlusKeyListener(); private int entered = -1; private int enterIdx; @@ -156,11 +121,11 @@ public class RuneLitePlusPlugin extends Plugin { ClientUI.currentPresenceName = ("RuneLitePlus"); ClientUI.frame.setTitle(ClientUI.currentPresenceName); - RuneLiteProperties.discordAppID = rlPlusDiscordApp; - discordService.close(); - discordService.init(); } + discordService.close(); + discordService.init(); + entered = -1; enterIdx = 0; expectInput = false; @@ -180,7 +145,6 @@ public class RuneLitePlusPlugin extends Plugin { ClientUI.currentPresenceName = ("RuneLitePlus"); ClientUI.frame.setTitle(ClientUI.currentPresenceName); - RuneLiteProperties.discordAppID = rlPlusDiscordApp; discordService.close(); discordService.init(); } @@ -188,7 +152,6 @@ public class RuneLitePlusPlugin extends Plugin { ClientUI.currentPresenceName = ("RuneLite"); ClientUI.frame.setTitle(ClientUI.currentPresenceName); - RuneLiteProperties.discordAppID = rlDiscordApp; discordService.close(); discordService.init(); } diff --git a/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java b/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java index 8dbc86a701..895df62c0e 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java @@ -40,7 +40,6 @@ import javax.swing.JProgressBar; import javax.swing.SwingUtilities; import javax.swing.plaf.basic.BasicProgressBarUI; import lombok.extern.slf4j.Slf4j; -import net.runelite.client.RuneLite; import net.runelite.client.RuneLiteProperties; import net.runelite.client.util.SwingUtil; import org.pushingpixels.substance.internal.SubstanceSynapse; @@ -57,11 +56,9 @@ public class RuneLiteSplashScreen public JFrame frame; public JPanel panel = new JPanel(); - public JLabel messageLabel; - public JLabel subMessageLabel; - public JProgressBar progressBar = new JProgressBar(); - - private int currentStep; + private JLabel messageLabel; + private JLabel subMessageLabel; + private JProgressBar progressBar = new JProgressBar(); /** * This is not done in the constructor in order to avoid processing in case the user chooses to not load @@ -130,7 +127,7 @@ public class RuneLiteSplashScreen panel.add(version, versionConstraints); // version - final JLabel litVersion = new JLabel("Plus Version : " + RuneLite.RUNELIT_VERSION); + final JLabel litVersion = new JLabel("Plus Version : " + runeLiteProperties.getRunelitVersion()); litVersion.setForeground(Color.GREEN); litVersion.setFont(FontManager.getRunescapeSmallFont()); litVersion.setForeground(litVersion.getForeground().darker()); diff --git a/runelite-client/src/main/resources/net/runelite/client/runelite.properties b/runelite-client/src/main/resources/net/runelite/client/runelite.properties index 1867b78407..95807daaf6 100644 --- a/runelite-client/src/main/resources/net/runelite/client/runelite.properties +++ b/runelite-client/src/main/resources/net/runelite/client/runelite.properties @@ -2,7 +2,9 @@ runelite.title=RuneLite runelite.version=${project.version} runescape.version=${rs.version} runelite.discord.appid=409416265891971072 +runelite.plus.discord.appid=560644885250572289 runelite.discord.invite=https://discord.gg/HN5gf3m runelite.github.link=https://github.com/runelite-extended/runelite runelite.wiki.link=https://github.com/runelite-extended/runelite/wiki -runelite.patreon.link=https://www.patreon.com/RuneLitePlus \ No newline at end of file +runelite.patreon.link=https://www.patreon.com/RuneLitePlus +runelit.version =2.0.1-1 \ No newline at end of file diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java index c30c8a4e9e..b9655c884e 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java @@ -36,6 +36,7 @@ import net.runelite.api.MessageNode; import net.runelite.api.events.ChatMessage; import net.runelite.client.Notifier; import net.runelite.client.chat.ChatMessageManager; +import net.runelite.client.config.RuneLitePlusConfig; import net.runelite.client.util.Text; import static org.junit.Assert.assertEquals; import org.junit.Before; @@ -66,6 +67,10 @@ public class ChatNotificationsPluginTest @Bind private Notifier notifier; + @Mock + @Bind + private RuneLitePlusConfig runeLitePlusConfig; + @Inject private ChatNotificationsPlugin chatNotificationsPlugin; From c4ebe33dd011930aa1e02bcbda9b82bad6ec2a85 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sat, 6 Jul 2019 16:58:19 +0200 Subject: [PATCH 060/472] Add "Pay-dirt!" to motherlode mine Adds a script to send a public message --- .../main/java/net/runelite/api/ScriptID.java | 5 +++ .../plugins/motherlode/MotherlodeConfig.java | 10 +++++ .../plugins/motherlode/MotherlodePlugin.java | 45 +++++++++++++++++-- .../src/main/scripts/SendPublicMessage.rs2asm | 39 ++++++++++++++++ 4 files changed, 95 insertions(+), 4 deletions(-) create mode 100644 runelite-client/src/main/scripts/SendPublicMessage.rs2asm diff --git a/runelite-api/src/main/java/net/runelite/api/ScriptID.java b/runelite-api/src/main/java/net/runelite/api/ScriptID.java index 62acbe1454..0fdc3ad13b 100644 --- a/runelite-api/src/main/java/net/runelite/api/ScriptID.java +++ b/runelite-api/src/main/java/net/runelite/api/ScriptID.java @@ -200,4 +200,9 @@ public final class ScriptID * Join a clan, duh */ public static final int CUSTOM_JOIN_CLAN = 10690; + + /** + * Send a public message + */ + public static final int PUBLICMSG = 13337; } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeConfig.java index bc4f4269ec..3263a9c033 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeConfig.java @@ -142,4 +142,14 @@ public interface MotherlodeConfig extends Config return false; } + @ConfigItem( + keyName = "payDirtMsg", + name = "Pay-dirt!", + description = "Send a public message saying \"Pay-dirt!\" every time a dwarf says \"Pay-dirt!\"", + position = 99 + ) + default boolean payDirtMsg() + { + return false; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java index 7e202ef3ac..68c1dce8ca 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java @@ -26,6 +26,7 @@ */ package net.runelite.client.plugins.motherlode; +import com.google.common.base.Strings; import com.google.common.collect.HashMultiset; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multiset; @@ -63,6 +64,8 @@ import net.runelite.api.Item; import net.runelite.api.ItemContainer; import net.runelite.api.ItemID; import net.runelite.api.MenuAction; +import net.runelite.api.NPC; +import net.runelite.api.NpcID; import static net.runelite.api.ObjectID.DEPLETED_VEIN_26665; import static net.runelite.api.ObjectID.DEPLETED_VEIN_26666; import static net.runelite.api.ObjectID.DEPLETED_VEIN_26667; @@ -75,6 +78,7 @@ import static net.runelite.api.ObjectID.ROCKFALL; import static net.runelite.api.ObjectID.ROCKFALL_26680; import net.runelite.api.Perspective; import net.runelite.api.Player; +import net.runelite.api.ScriptID; import net.runelite.api.Varbits; import net.runelite.api.WallObject; import net.runelite.api.coords.LocalPoint; @@ -89,6 +93,7 @@ import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.MenuOptionClicked; +import net.runelite.api.events.OverheadTextChanged; import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.WallObjectChanged; import net.runelite.api.events.WallObjectDespawned; @@ -105,6 +110,7 @@ import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.task.Schedule; import net.runelite.client.ui.overlay.OverlayManager; +import net.runelite.client.util.Text; @PluginDescriptor( name = "Motherlode Mine", @@ -212,6 +218,7 @@ public class MotherlodePlugin extends Plugin private boolean notifyOnIdle; @Getter(AccessLevel.PACKAGE) private boolean showTargetVein; + private boolean payDirtMsg; @Provides MotherlodeConfig getConfig(ConfigManager configManager) @@ -321,7 +328,7 @@ public class MotherlodePlugin extends Plugin period = 1, unit = ChronoUnit.SECONDS ) - public void checkMining() + void checkMining() { if (!inMlm) { @@ -722,9 +729,6 @@ public class MotherlodePlugin extends Plugin /** * Checks if the given point is "upstairs" in the mlm. * The upper floor is actually on z=0. - * - * @param localPoint - * @return */ boolean isUpstairs(LocalPoint localPoint) { @@ -755,5 +759,38 @@ public class MotherlodePlugin extends Plugin this.showOresFound = config.showOresFound(); this.notifyOnIdle = config.notifyOnIdle(); this.showTargetVein = config.showTargetVein(); + this.payDirtMsg = config.payDirtMsg(); + } + + @Subscribe + private void onOverheadTextChanged(OverheadTextChanged event) + { + if (!payDirtMsg || Strings.isNullOrEmpty(event.getOverheadText()) || !(event.getActor() instanceof NPC)) + { + return; + } + + switch (((NPC) event.getActor()).getId()) + { + case NpcID.MINER_5606: + case NpcID.MINER_5813: + case NpcID.MINER_5814: + case NpcID.MINER_6565: + case NpcID.MINER_6567: + case NpcID.MINER_6568: + case NpcID.MINER_6569: + case NpcID.MINER_6570: + case NpcID.MINER_6571: + case NpcID.MINER_6572: + case NpcID.MINER_6645: + break; + default: + return; + } + + if ("pay-dirt!".equals(Text.standardize(event.getOverheadText()))) + { + client.runScript(ScriptID.PUBLICMSG, "Pay-dirt!"); + } } } \ No newline at end of file diff --git a/runelite-client/src/main/scripts/SendPublicMessage.rs2asm b/runelite-client/src/main/scripts/SendPublicMessage.rs2asm new file mode 100644 index 0000000000..eccfc90457 --- /dev/null +++ b/runelite-client/src/main/scripts/SendPublicMessage.rs2asm @@ -0,0 +1,39 @@ +;;; +; +; Copyright (c) 2019, Lucas +; All rights reserved. +; +; Redistribution and use in source and binary forms, with or without +; modification, are permitted provided that the following conditions are met: +; +; 1. Redistributions of source code must retain the above copyright notice, this +; list of conditions and the following disclaimer. +; 2. Redistributions in binary form must reproduce the above copyright notice, +; this list of conditions and the following disclaimer in the documentation +; and/or other materials provided with the distribution. +; +; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +; ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +; DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +; ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +; (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +; ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +; +;;;;;;;;;;;;;;;;;;;;;;;;;;; +; ; +; Send a public message ; +; ; +;;;;;;;;;;;;;;;;;;;;;;;;;;; +.id 13337 +.int_stack_count 0 +.string_stack_count 1 +.int_var_count 0 +.string_var_count 1 + sload 0 + iconst 0 + chat_sendpublic + return From 6487b9c6093df74666670a816cefb28b5b4cf97b Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Sat, 6 Jul 2019 21:37:16 +0100 Subject: [PATCH 061/472] fix pickpocket (#910) fixes left click pickpocketing --- .../plugins/menuentryswapper/MenuEntrySwapperPlugin.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java index 4623594ead..a4414ca6dc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java @@ -1063,14 +1063,19 @@ public class MenuEntrySwapperPlugin extends Plugin break; } } - - if (option.equals("talk-to")) + + if (option.equals("talk-to") || option.equals("attack")) { if (this.swapPickpocket) { swap(client, "pickpocket", option, target, true); } + } + + if (option.equals("talk-to")) + { + if (this.swapHardWoodGrove && target.contains("rionasta")) { swap(client, "send-parcel", option, target, true); From 0f256646c382f6429755378304574a4544f616a6 Mon Sep 17 00:00:00 2001 From: James Munson Date: Sat, 6 Jul 2019 15:20:36 -0700 Subject: [PATCH 062/472] only add positive supplies --- .../runelite/client/plugins/suppliestracker/ItemType.java | 2 +- .../plugins/suppliestracker/SuppliesTrackerPlugin.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/ItemType.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/ItemType.java index 692b8a6233..c372f584ea 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/ItemType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/ItemType.java @@ -66,7 +66,7 @@ public enum ItemType { return ItemType.AMMO; } - if (item.getName().contains("rune")) + if (item.getName().toLowerCase().contains("rune")) { return ItemType.RUNE; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java index 3fc78a6532..af1a6685a9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java @@ -401,7 +401,13 @@ public class SuppliesTrackerPlugin extends Plugin { quantity -= newItem.getQuantity(); } - buildEntries(oldItem.getId(), quantity); + // ensure that only positive quantities are added since it is reported + // that sometimes checkUsedRunes is called on the same tick that a player + // gains runes in their inventory + if (quantity > 0) + { + buildEntries(oldItem.getId(), quantity); + } } } } From 742bf7338d4f14b513d78006791a35db6bed504f Mon Sep 17 00:00:00 2001 From: Lucas Date: Sat, 6 Jul 2019 23:10:56 +0200 Subject: [PATCH 063/472] Add ScriptOpcodeTransformer to deob --- .../ScriptOpcodesTransformer.java | 152 ++++++ .../scriptopcodes/ScriptOpcode.java | 511 ++++++++++++++++++ .../runelite/deob/updater/UpdateMappings.java | 3 + 3 files changed, 666 insertions(+) create mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ScriptOpcodesTransformer.java create mode 100644 deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/scriptopcodes/ScriptOpcode.java diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ScriptOpcodesTransformer.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ScriptOpcodesTransformer.java new file mode 100644 index 0000000000..aa422f83bd --- /dev/null +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ScriptOpcodesTransformer.java @@ -0,0 +1,152 @@ +package net.runelite.deob.deobfuscators.transformers; + +import java.util.ListIterator; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; +import net.runelite.asm.Field; +import net.runelite.asm.Method; +import net.runelite.asm.Type; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; +import net.runelite.asm.attributes.code.instructions.GetStatic; +import net.runelite.asm.attributes.code.instructions.ILoad; +import net.runelite.asm.attributes.code.instructions.IfICmpEq; +import net.runelite.asm.attributes.code.instructions.IfICmpNe; +import net.runelite.asm.attributes.code.instructions.LDC; +import net.runelite.asm.attributes.code.instructions.PutStatic; +import net.runelite.asm.attributes.code.instructions.VReturn; +import net.runelite.asm.pool.Class; +import net.runelite.asm.signature.Signature; +import net.runelite.deob.Transformer; +import net.runelite.deob.deobfuscators.transformers.scriptopcodes.ScriptOpcode; +import org.objectweb.asm.Opcodes; +import static org.objectweb.asm.Opcodes.ACC_FINAL; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_STATIC; + +public class ScriptOpcodesTransformer implements Transformer // robots in disguise +{ + private static final String SCRIPT_OPCODES = "net/runelite/rs/ScriptOpcodes"; + + @Override + public void transform(ClassGroup group) + { + initializeOpcodesClassFile(group); + + for (ClassFile cf : group.getClasses()) + { + if (cf.getName().startsWith("net/runelite/rs")) + { + continue; + } + + for (Method m : cf.getMethods()) + { + if (!m.isStatic()) + { + continue; + } + + if (!m.getDescriptor().getArguments().contains(new Type("LScript;")) && !m.getDescriptor().getArguments().contains(new Type("LScriptEvent;"))) + { + continue; + } + + boolean varIndexIsKnownAnd0 = m.getDescriptor().getArguments().contains(new Type("LScript;")); + + Code code = m.getCode(); + Instructions ins = code.getInstructions(); + ListIterator it = ins.getInstructions().listIterator(); + + Instruction i; + while(it.hasNext()) + { + i = it.next(); + + if (!(i instanceof ILoad) || (varIndexIsKnownAnd0 && ((ILoad) i).getVariableIndex() != 0)) + { + continue; + } + + i = it.next(); + + if (!(i instanceof PushConstantInstruction) || + !(((PushConstantInstruction) i).getConstant() instanceof Number)) + { + continue; + } + + int val = ((Number) ((PushConstantInstruction) i).getConstant()).intValue(); + String name = ScriptOpcode.nameFromID(val); + + i = it.next(); + + if (name == null || !(i instanceof IfICmpNe || i instanceof IfICmpEq)) + { + continue; + } + + it.previous(); + it.previous(); + + net.runelite.asm.pool.Field pool = new net.runelite.asm.pool.Field( + new Class(SCRIPT_OPCODES), + name, + Type.INT + ); + + GetStatic getStatic = new GetStatic(ins, pool); + it.set(getStatic); + } + } + } + } + + private static void initializeOpcodesClassFile(ClassGroup group) + { + ClassFile scriptOpcodes = group.findClass(SCRIPT_OPCODES); + if (scriptOpcodes == null) + { + scriptOpcodes = new ClassFile(group); + scriptOpcodes.setName(SCRIPT_OPCODES); + scriptOpcodes.setSuperName(Type.OBJECT.getInternalName()); + scriptOpcodes.setAccess(Opcodes.ACC_PUBLIC); + group.addClass(scriptOpcodes); + } + else + { + scriptOpcodes.getFields().clear(); + } + + Method clinit = scriptOpcodes.findMethod(""); + if (clinit == null) + { + clinit = new Method(scriptOpcodes, "", new Signature("()V")); + clinit.setStatic(true); + Code code = new Code(clinit); + code.setMaxStack(1); + clinit.setCode(code); + scriptOpcodes.addMethod(clinit); + } + + Code code = clinit.getCode(); + Instructions ins = code.getInstructions(); + + for (ScriptOpcode opcode : ScriptOpcode.values()) + { + Field field = new Field(scriptOpcodes, opcode.name(), Type.INT); + field.setAccessFlags(ACC_PUBLIC | ACC_STATIC | ACC_FINAL); + field.setValue(opcode.opcode); + scriptOpcodes.addField(field); + + LDC ldc = new LDC(ins, opcode.opcode); + PutStatic put = new PutStatic(ins, field); + ins.addInstruction(0, ldc); + ins.addInstruction(1, put); + } + + ins.addInstruction(new VReturn(ins)); + } +} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/scriptopcodes/ScriptOpcode.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/scriptopcodes/ScriptOpcode.java new file mode 100644 index 0000000000..5033c63e43 --- /dev/null +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/scriptopcodes/ScriptOpcode.java @@ -0,0 +1,511 @@ +package net.runelite.deob.deobfuscators.transformers.scriptopcodes; + +import com.google.common.collect.ImmutableMap; +import java.util.Map; + +public enum ScriptOpcode +{ + // This class is pretty much the same as net.runelite.cache.script.Opcodes, and should be updated alongside that + + ICONST(0), + GET_VARP(1), + SET_VARP(2), + SCONST(3), + JUMP(6), + IF_ICMPNE(7), + IF_ICMPEQ(8), + IF_ICMPLT(9), + IF_ICMPGT(10), + RETURN(21), + GET_VARBIT(25), + SET_VARBIT(27), + IF_ICMPLE(31), + IF_ICMPGE(32), + ILOAD(33), + ISTORE(34), + SLOAD(35), + SSTORE(36), + JOIN_STRING(37), + POP_INT(38), + POP_STRING(39), + INVOKE(40), + GET_VARC_INT(42), + SET_VARC_INT(43), + DEFINE_ARRAY(44), + GET_ARRAY_INT(45), + SET_ARRAY_INT(46), + GET_VARC_STRING_OLD(47), + SET_VARC_STRING_OLD(48), + GET_VARC_STRING(49), + SET_VARC_STRING(50), + SWITCH(60), + CC_CREATE(100), + CC_DELETE(101), + CC_DELETEALL(102), + CC_FIND(200), + IF_FIND(201), + CC_SETPOSITION(1000), + CC_SETSIZE(1001), + CC_SETHIDE(1003), + CC_SETNOCLICKTHROUGH(1005), + CC_SETSCROLLPOS(1100), + CC_SETCOLOUR(1101), + CC_SETFILL(1102), + CC_SETTRANS(1103), + CC_SETLINEWID(1104), + CC_SETGRAPHIC(1105), + CC_SET2DANGLE(1106), + CC_SETTILING(1107), + CC_SETMODEL(1108), + CC_SETMODELANGLE(1109), + CC_SETMODELANIM(1110), + CC_SETMODELORTHOG(1111), + CC_SETTEXT(1112), + CC_SETTEXTFONT(1113), + CC_SETTEXTALIGN(1114), + CC_SETTEXTSHADOW(1115), + CC_SETOUTLINE(1116), + CC_SETGRAPHICSHADOW(1117), + CC_SETVFLIP(1118), + CC_SETHFLIP(1119), + CC_SETSCROLLSIZE(1120), + CC_RESUME_PAUSEBUTTON(1121), + CC_SETFILLCOLOUR(1123), + CC_SETLINEDIRECTION(1126), + CC_SETOBJECT(1200), + CC_SETNPCHEAD(1201), + CC_SETPLAYERHEAD_SELF(1202), + CC_SETOBJECT_NONUM(1205), + CC_SETOBJECT_ALWAYS_NUM(1212), + CC_SETOP(1300), + CC_SETDRAGGABLE(1301), + CC_SETDRAGGABLEBEHAVIOR(1302), + CC_SETDRAGDEADZONE(1303), + CC_SETDRAGDEADTIME(1304), + CC_SETOPBASE(1305), + CC_SETTARGETVERB(1306), + CC_CLEAROPS(1307), + CC_SETONCLICK(1400), + CC_SETONHOLD(1401), + CC_SETONRELEASE(1402), + CC_SETONMOUSEOVER(1403), + CC_SETONMOUSELEAVE(1404), + CC_SETONDRAG(1405), + CC_SETONTARGETLEAVE(1406), + CC_SETONVARTRANSMIT(1407), + CC_SETONTIMER(1408), + CC_SETONOP(1409), + CC_SETONDRAGCOMPLETE(1410), + CC_SETONCLICKREPEAT(1411), + CC_SETONMOUSEREPEAT(1412), + CC_SETONINVTRANSMIT(1414), + CC_SETONSTATTRANSMIT(1415), + CC_SETONTARGETENTER(1416), + CC_SETONSCROLLWHEEL(1417), + CC_SETONCHATTRANSMIT(1418), + CC_SETONKEY(1419), + CC_SETONFRIENDTRANSMIT(1420), + CC_SETONCLANTRANSMIT(1421), + CC_SETONMISCTRANSMIT(1422), + CC_SETONDIALOGABORT(1423), + CC_SETONSUBCHANGE(1424), + CC_SETONSTOCKTRANSMIT(1425), + CC_SETONRESIZE(1427), + CC_GETX(1500), + CC_GETY(1501), + CC_GETWIDTH(1502), + CC_GETHEIGHT(1503), + CC_GETHIDE(1504), + CC_GETLAYER(1505), + CC_GETSCROLLX(1600), + CC_GETSCROLLY(1601), + CC_GETTEXT(1602), + CC_GETSCROLLWIDTH(1603), + CC_GETSCROLLHEIGHT(1604), + CC_GETMODELZOOM(1605), + CC_GETMODELANGLE_X(1606), + CC_GETMODELANGLE_Z(1607), + CC_GETMODELANGLE_Y(1608), + CC_GETTRANS(1609), + CC_GETCOLOUR(1611), + CC_GETFILLCOLOUR(1612), + CC_GETINVOBJECT(1700), + CC_GETINVCOUNT(1701), + CC_GETID(1702), + CC_GETTARGETMASK(1800), + CC_GETOP(1801), + CC_GETOPBASE(1802), + CC_CALLONRESIZE(1927), + IF_SETPOSITION(2000), + IF_SETSIZE(2001), + IF_SETHIDE(2003), + IF_SETNOCLICKTHROUGH(2005), + IF_SETSCROLLPOS(2100), + IF_SETCOLOUR(2101), + IF_SETFILL(2102), + IF_SETTRANS(2103), + IF_SETLINEWID(2104), + IF_SETGRAPHIC(2105), + IF_SET2DANGLE(2106), + IF_SETTILING(2107), + IF_SETMODEL(2108), + IF_SETMODELANGLE(2109), + IF_SETMODELANIM(2110), + IF_SETMODELORTHOG(2111), + IF_SETTEXT(2112), + IF_SETTEXTFONT(2113), + IF_SETTEXTALIGN(2114), + IF_SETTEXTSHADOW(2115), + IF_SETOUTLINE(2116), + IF_SETGRAPHICSHADOW(2117), + IF_SETVFLIP(2118), + IF_SETHFLIP(2119), + IF_SETSCROLLSIZE(2120), + IF_RESUME_PAUSEBUTTON(2121), + IF_SETFILLCOLOUR(2123), + IF_SETLINEDIRECTION(2126), + IF_SETOBJECT(2200), + IF_SETNPCHEAD(2201), + IF_SETPLAYERHEAD_SELF(2202), + IF_SETOBJECT_NONUM(2205), + IF_SETOBJECT_ALWAYS_NUM(2212), + IF_SETOP(2300), + IF_SETDRAGGABLE(2301), + IF_SETDRAGGABLEBEHAVIOR(2302), + IF_SETDRAGDEADZONE(2303), + IF_SETDRAGDEADTIME(2304), + IF_SETOPBASE(2305), + IF_SETTARGETVERB(2306), + IF_CLEAROPS(2307), + IF_SETOPKEY(2350), + IF_SETOPTKEY(2351), + IF_SETOPKEYRATE(2352), + IF_SETOPTKEYRATE(2353), + IF_SETOPKEYIGNOREHELD(2354), + IF_SETOPTKEYIGNOREHELD(2355), + IF_SETONCLICK(2400), + IF_SETONHOLD(2401), + IF_SETONRELEASE(2402), + IF_SETONMOUSEOVER(2403), + IF_SETONMOUSELEAVE(2404), + IF_SETONDRAG(2405), + IF_SETONTARGETLEAVE(2406), + IF_SETONVARTRANSMIT(2407), + IF_SETONTIMER(2408), + IF_SETONOP(2409), + IF_SETONDRAGCOMPLETE(2410), + IF_SETONCLICKREPEAT(2411), + IF_SETONMOUSEREPEAT(2412), + IF_SETONINVTRANSMIT(2414), + IF_SETONSTATTRANSMIT(2415), + IF_SETONTARGETENTER(2416), + IF_SETONSCROLLWHEEL(2417), + IF_SETONCHATTRANSMIT(2418), + IF_SETONKEY(2419), + IF_SETONFRIENDTRANSMIT(2420), + IF_SETONCLANTRANSMIT(2421), + IF_SETONMISCTRANSMIT(2422), + IF_SETONDIALOGABORT(2423), + IF_SETONSUBCHANGE(2424), + IF_SETONSTOCKTRANSMIT(2425), + IF_SETONRESIZE(2427), + IF_GETX(2500), + IF_GETY(2501), + IF_GETWIDTH(2502), + IF_GETHEIGHT(2503), + IF_GETHIDE(2504), + IF_GETLAYER(2505), + IF_GETSCROLLX(2600), + IF_GETSCROLLY(2601), + IF_GETTEXT(2602), + IF_GETSCROLLWIDTH(2603), + IF_GETSCROLLHEIGHT(2604), + IF_GETMODELZOOM(2605), + IF_GETMODELANGLE_X(2606), + IF_GETMODELANGLE_Z(2607), + IF_GETMODELANGLE_Y(2608), + IF_GETTRANS(2609), + IF_GETCOLOUR(2611), + IF_GETFILLCOLOUR(2612), + IF_GETINVOBJECT(2700), + IF_GETINVCOUNT(2701), + IF_HASSUB(2702), + IF_GETTOP(2706), + IF_GETTARGETMASK(2800), + IF_GETOP(2801), + IF_GETOPBASE(2802), + IF_CALLONRESIZE(2927), + MES(3100), + ANIM(3101), + IF_CLOSE(3103), + RESUME_COUNTDIALOG(3104), + RESUME_NAMEDIALOG(3105), + RESUME_STRINGDIALOG(3106), + OPPLAYER(3107), + IF_DRAGPICKUP(3108), + CC_DRAGPICKUP(3109), + MOUSECAM(3110), + GETREMOVEROOFS(3111), + SETREMOVEROOFS(3112), + OPENURL(3113), + RESUME_OBJDIALOG(3115), + BUG_REPORT(3116), + SETSHIFTCLICKDROP(3117), + SETSHOWMOUSEOVERTEXT(3118), + RENDERSELF(3119), + SETSHOWMOUSECROSS(3125), + SETSHOWLOADINGMESSAGES(3126), + SETTAPTODROP(3127), + GETTAPTODROP(3128), + GETCANVASSIZE(3132), + SETHIDEUSERNAME(3141), + GETHIDEUSERNAME(3142), + SETREMEMBERUSERNAME(3143), + GETREMEMBERUSERNAME(3144), + SOUND_SYNTH(3200), + SOUND_SONG(3201), + SOUND_JINGLE(3202), + CLIENTCLOCK(3300), + INV_GETOBJ(3301), + INV_GETNUM(3302), + INV_TOTAL(3303), + INV_SIZE(3304), + STAT(3305), + STAT_BASE(3306), + STAT_XP(3307), + COORD(3308), + COORDX(3309), + COORDZ(3310), + COORDY(3311), + MAP_MEMBERS(3312), + INVOTHER_GETOBJ(3313), + INVOTHER_GETNUM(3314), + INVOTHER_TOTAL(3315), + STAFFMODLEVEL(3316), + REBOOTTIMER(3317), + MAP_WORLD(3318), + RUNENERGY_VISIBLE(3321), + RUNWEIGHT_VISIBLE(3322), + PLAYERMOD(3323), + WORLDFLAGS(3324), + MOVECOORD(3325), + ENUM_STRING(3400), + ENUM(3408), + ENUM_GETOUTPUTCOUNT(3411), + FRIEND_COUNT(3600), + FRIEND_GETNAME(3601), + FRIEND_GETWORLD(3602), + FRIEND_GETRANK(3603), + FRIEND_SETRANK(3604), + FRIEND_ADD(3605), + FRIEND_DEL(3606), + IGNORE_ADD(3607), + IGNORE_DEL(3608), + FRIEND_TEST(3609), + CLAN_GETCHATDISPLAYNAME(3611), + CLAN_GETCHATCOUNT(3612), + CLAN_GETCHATUSERNAME(3613), + CLAN_GETCHATUSERWORLD(3614), + CLAN_GETCHATUSERRANK(3615), + CLAN_GETCHATMINKICK(3616), + CLAN_KICKUSER(3617), + CLAN_GETCHATRANK(3618), + CLAN_JOINCHAT(3619), + CLAN_LEAVECHAT(3620), + IGNORE_COUNT(3621), + IGNORE_GETNAME(3622), + IGNORE_TEST(3623), + CLAN_ISSELF(3624), + CLAN_GETCHATOWNERNAME(3625), + CLAN_ISFRIEND(3626), + CLAN_ISIGNORE(3627), + STOCKMARKET_GETOFFERTYPE(3903), + STOCKMARKET_GETOFFERITEM(3904), + STOCKMARKET_GETOFFERPRICE(3905), + STOCKMARKET_GETOFFERCOUNT(3906), + STOCKMARKET_GETOFFERCOMPLETEDCOUNT(3907), + STOCKMARKET_GETOFFERCOMPLETEDGOLD(3908), + STOCKMARKET_ISOFFEREMPTY(3910), + STOCKMARKET_ISOFFERSTABLE(3911), + STOCKMARKET_ISOFFERFINISHED(3912), + STOCKMARKET_ISOFFERADDING(3913), + TRADINGPOST_SORTBY_NAME(3914), + TRADINGPOST_SORTBY_PRICE(3915), + TRADINGPOST_SORTFILTERBY_WORLD(3916), + TRADINGPOST_SORTBY_AGE(3917), + TRADINGPOST_SORTBY_COUNT(3918), + TRADINGPOST_GETTOTALOFFERS(3919), + TRADINGPOST_GETOFFERWORLD(3920), + TRADINGPOST_GETOFFERNAME(3921), + TRADINGPOST_GETOFFERPREVIOUSNAME(3922), + TRADINGPOST_GETOFFERAGE(3923), + TRADINGPOST_GETOFFERCOUNT(3924), + TRADINGPOST_GETOFFERPRICE(3925), + TRADINGPOST_GETOFFERITEM(3926), + ADD(4000), + SUB(4001), + MULTIPLY(4002), + DIV(4003), + RANDOM(4004), + RANDOMINC(4005), + INTERPOLATE(4006), + ADDPERCENT(4007), + SETBIT(4008), + CLEARBIT(4009), + TESTBIT(4010), + MOD(4011), + POW(4012), + INVPOW(4013), + AND(4014), + OR(4015), + SCALE(4018), + APPEND_NUM(4100), + APPEND(4101), + APPEND_SIGNNUM(4102), + LOWERCASE(4103), + FROMDATE(4104), + TEXT_GENDER(4105), + TOSTRING(4106), + COMPARE(4107), + PARAHEIGHT(4108), + PARAWIDTH(4109), + TEXT_SWITCH(4110), + ESCAPE(4111), + APPEND_CHAR(4112), + CHAR_ISPRINTABLE(4113), + CHAR_ISALPHANUMERIC(4114), + CHAR_ISALPHA(4115), + CHAR_ISNUMERIC(4116), + STRING_LENGTH(4117), + SUBSTRING(4118), + REMOVETAGS(4119), + STRING_INDEXOF_CHAR(4120), + STRING_INDEXOF_STRING(4121), + OC_NAME(4200), + OC_OP(4201), + OC_IOP(4202), + OC_COST(4203), + OC_STACKABLE(4204), + OC_CERT(4205), + OC_UNCERT(4206), + OC_MEMBERS(4207), + OC_PLACEHOLDER(4208), + OC_UNPLACEHOLDER(4209), + OC_FIND(4210), + OC_FINDNEXT(4211), + OC_FINDRESET(4212), + CHAT_GETFILTER_PUBLIC(5000), + CHAT_SETFILTER(5001), + CHAT_SENDABUSEREPORT(5002), + CHAT_GETHISTORY_BYTYPEANDLINE(5003), + CHAT_GETHISTORY_BYUID(5004), + CHAT_GETFILTER_PRIVATE(5005), + CHAT_SENDPUBLIC(5008), + CHAT_SENDPRIVATE(5009), + CHAT_PLAYERNAME(5015), + CHAT_GETFILTER_TRADE(5016), + CHAT_GETHISTORYLENGTH(5017), + CHAT_GETNEXTUID(5018), + CHAT_GETPREVUID(5019), + DOCHEAT(5020), + CHAT_SETMESSAGEFILTER(5021), + CHAT_GETMESSAGEFILTER(5022), + GETWINDOWMODE(5306), + SETWINDOWMODE(5307), + GETDEFAULTWINDOWMODE(5308), + SETDEFAULTWINDOWMODE(5309), + CAM_FORCEANGLE(5504), + CAM_GETANGLE_XA(5505), + CAM_GETANGLE_YA(5506), + CAM_SETFOLLOWHEIGHT(5530), + CAM_GETFOLLOWHEIGHT(5531), + LOGOUT(5630), + VIEWPORT_SETFOV(6200), + VIEWPORT_SETZOOM(6201), + VIEWPORT_CLAMPFOV(6202), + VIEWPORT_GETEFFECTIVESIZE(6203), + VIEWPORT_GETZOOM(6204), + VIEWPORT_GETFOV(6205), + WORLDLIST_FETCH(6500), + WORLDLIST_START(6501), + WORLDLIST_NEXT(6502), + WORLDLIST_SPECIFIC(6506), + WORLDLIST_SORT(6507), + SETFOLLOWEROPSLOWPRIORITY(6512), + NC_PARAM(6513), + LC_PARAM(6514), + OC_PARAM(6515), + STRUCT_PARAM(6516), + ON_MOBILE(6518), + CLIENTTYPE(6519), + BATTERYLEVEL(6524), + BATTERYCHARGING(6525), + WIFIAVAILABLE(6526), + WORLDMAP_GETMAPNAME(6601), + WORLDMAP_SETMAP(6602), + WORLDMAP_GETZOOM(6603), + WORLDMAP_SETZOOM(6604), + WORLDMAP_ISLOADED(6605), + WORLDMAP_JUMPTODISPLAYCOORD(6606), + WORLDMAP_JUMPTODISPLAYCOORD_INSTANT(6607), + WORLDMAP_JUMPTOSOURCECOORD(6608), + WORLDMAP_JUMPTOSOURCECOORD_INSTANT(6609), + WORLDMAP_GETDISPLAYPOSITION(6610), + WORLDMAP_GETCONFIGORIGIN(6611), + WORLDMAP_GETCONFIGSIZE(6612), + WORLDMAP_GETCONFIGBOUNDS(6613), + WORLDMAP_GETCONFIGZOOM(6614), + WORLDMAP_GETCURRENTMAP(6616), + WORLDMAP_GETDISPLAYCOORD(6617), + WORLDMAP_COORDINMAP(6621), + WORLDMAP_GETSIZE(6622), + WORLDMAP_PERPETUALFLASH(6628), + WORLDMAP_FLASHELEMENT(6629), + WORLDMAP_FLASHELEMENTCATEGORY(6630), + WORLDMAP_STOPCURRENTFLASHES(6631), + WORLDMAP_DISABLEELEMENTS(6632), + WORLDMAP_DISABLEELEMENT(6633), + WORLDMAP_DISABLEELEMENTCATEGORY(6634), + WORLDMAP_GETDISABLEELEMENTS(6635), + WORLDMAP_GETDISABLEELEMENT(6636), + WORLDMAP_GETDISABLEELEMENTCATEGORY(6637), + WORLDMAP_LISTELEMENT_START(6639), + WORLDMAP_LISTELEMENT_NEXT(6640), + MEC_TEXT(6693), + MEC_TEXTSIZE(6694), + MEC_CATEGORY(6695), + MEC_SPRITE(6696); + + public final int opcode; + + ScriptOpcode(int opcode) + { + this.opcode = opcode; + } + + private static final Map map; + + static + { + ImmutableMap.Builder builder = ImmutableMap.builder(); + + for (ScriptOpcode value : values()) + { + builder.put(value.opcode, value); + } + + map = builder.build(); + } + + public static String nameFromID(int opcode) + { + ScriptOpcode op = map.get(opcode); + + if (op == null) + { + return null; + } + + return op.name(); + } +} diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java b/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java index 0201caabb1..bceda1fe1b 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java +++ b/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java @@ -31,6 +31,7 @@ import net.runelite.deob.deobfuscators.mapping.AnnotationIntegrityChecker; import net.runelite.deob.deobfuscators.mapping.AnnotationMapper; import net.runelite.deob.deobfuscators.mapping.Mapper; import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.transformers.ScriptOpcodesTransformer; import net.runelite.deob.util.JarUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,6 +73,8 @@ public class UpdateMappings ParameterRenamer pr = new ParameterRenamer(group1, group2, mapping); pr.run(); + + new ScriptOpcodesTransformer().transform(group2); } public void save(File out) throws IOException From aaea8ec0d55ada6d5c83e45f59d66d7878650230 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sun, 7 Jul 2019 00:19:36 +0200 Subject: [PATCH 064/472] Replace opcode constants with ScriptOpcodes field refs in rsclient --- runescape-client/src/main/java/Canvas.java | 11 +- runescape-client/src/main/java/Decimator.java | 3 +- .../src/main/java/DynamicObject.java | 33 +- runescape-client/src/main/java/FontName.java | 59 +-- .../src/main/java/Formatting.java | 13 +- .../src/main/java/FriendSystem.java | 19 +- .../src/main/java/GrandExchangeEvent.java | 63 +-- .../src/main/java/GrandExchangeEvents.java | 25 +- runescape-client/src/main/java/LoginType.java | 4 +- .../src/main/java/OwnWorldComparator.java | 11 +- .../src/main/java/ScriptEvent.java | 73 +-- .../src/main/java/StructDefinition.java | 49 +- .../src/main/java/TextureProvider.java | 37 +- .../src/main/java/UserComparator4.java | 9 +- runescape-client/src/main/java/Varcs.java | 28 +- .../src/main/java/ViewportMouse.java | 13 +- .../src/main/java/WorldComparator.java | 7 +- .../src/main/java/WorldMapAreaData.java | 17 +- .../src/main/java/WorldMapDecoration.java | 3 +- .../src/main/java/WorldMapSectionType.java | 13 +- runescape-client/src/main/java/class1.java | 35 +- runescape-client/src/main/java/class11.java | 61 +-- runescape-client/src/main/java/class15.java | 7 +- runescape-client/src/main/java/class16.java | 7 +- runescape-client/src/main/java/class211.java | 45 +- runescape-client/src/main/java/class229.java | 13 +- runescape-client/src/main/java/class248.java | 47 +- runescape-client/src/main/java/class31.java | 31 +- runescape-client/src/main/java/class32.java | 11 +- runescape-client/src/main/java/class4.java | 55 +- runescape-client/src/main/java/class54.java | 69 +-- .../java/net/runelite/rs/ScriptOpcodes.java | 472 ++++++++++++++++++ 32 files changed, 916 insertions(+), 427 deletions(-) create mode 100644 runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index 9f34fbbd37..b3e2f4efd7 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -10,6 +10,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("ao") @Implements("Canvas") @@ -118,7 +119,7 @@ public final class Canvas extends java.awt.Canvas { int var3; int var4; Widget var6; - if (var0 == 100) { + if (var0 == ScriptOpcodes.CC_CREATE) { RouteStrategy.Interpreter_intStackSize -= 3; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -162,19 +163,19 @@ public final class Canvas extends java.awt.Canvas { } } else { Widget var5; - if (var0 == 101) { + if (var0 == ScriptOpcodes.CC_DELETE) { var5 = var2 ? WorldMapIcon1.field1030 : class12.field1111; var6 = Huffman.getWidget(var5.id); var6.children[var5.childIndex] = null; class22.method295(var6); return 1; - } else if (var0 == 102) { + } else if (var0 == ScriptOpcodes.CC_DELETEALL) { var5 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); var5.children = null; class22.method295(var5); return 1; - } else if (var0 != 200) { - if (var0 == 201) { + } else if (var0 != ScriptOpcodes.CC_FIND) { + if (var0 == ScriptOpcodes.IF_FIND) { var5 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); if (var5 != null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index c063c4d198..47aadf498d 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -3,6 +3,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("dp") @Implements("Decimator") @@ -237,7 +238,7 @@ public class Decimator { garbageValue = "-858740470" ) static int method2492(int var0, Script var1, boolean var2) { - if (var0 == 5630) { + if (var0 == ScriptOpcodes.LOGOUT) { Client.field175 = 250; return 1; } else { diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index 905d5408e6..45781a3bb1 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -6,6 +6,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("cf") @Implements("DynamicObject") @@ -208,10 +209,10 @@ public class DynamicObject extends Entity { garbageValue = "-83" ) static int method2223(int var0, Script var1, boolean var2) { - if (var0 == 5000) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.publicChatMode; return 1; - } else if (var0 == 5001) { + } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { RouteStrategy.Interpreter_intStackSize -= 3; Client.publicChatMode = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; IndexCacheLoader.field512 = WorldMapElement.method4783(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); @@ -230,7 +231,7 @@ public class DynamicObject extends Entity { String var3; int var4; int var5; - if (var0 == 5002) { + if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; RouteStrategy.Interpreter_intStackSize -= 2; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; @@ -244,7 +245,7 @@ public class DynamicObject extends Entity { return 1; } else { Message var11; - if (var0 == 5003) { + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { RouteStrategy.Interpreter_intStackSize -= 2; var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -266,7 +267,7 @@ public class DynamicObject extends Entity { } return 1; - } else if (var0 == 5004) { + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var11 = NetCache.method4708(var5); if (var11 != null) { @@ -286,7 +287,7 @@ public class DynamicObject extends Entity { } return 1; - } else if (var0 == 5005) { + } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { if (IndexCacheLoader.field512 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { @@ -296,7 +297,7 @@ public class DynamicObject extends Entity { return 1; } else { String var6; - if (var0 == 5008) { + if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = var3.toLowerCase(); @@ -423,7 +424,7 @@ public class DynamicObject extends Entity { var9.packetBuffer.method41(var9.packetBuffer.index - var10); Client.packetWriter.method241(var9); return 1; - } else if (var0 == 5009) { + } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { Interpreter.Interpreter_stringStackSize -= 2; var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; var6 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; @@ -435,30 +436,30 @@ public class DynamicObject extends Entity { var7.packetBuffer.method40(var7.packetBuffer.index - var8); Client.packetWriter.method241(var7); return 1; - } else if (var0 != 5015) { - if (var0 == 5016) { + } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.field138; return 1; - } else if (var0 == 5017) { + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WidgetGroupParent.method1174(var5); return 1; - } else if (var0 == 5018) { + } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class12.method161(var5); return 1; - } else if (var0 == 5019) { + } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SpriteMask.method4391(var5); return 1; - } else if (var0 == 5020) { + } else if (var0 == ScriptOpcodes.DOCHEAT) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; BoundaryObject.doCheat(var3); return 1; - } else if (var0 == 5021) { + } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { Client.field158 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim(); return 1; - } else if (var0 == 5022) { + } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.field158; return 1; } else if (var0 == 5023) { diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index acb0e22e88..9bb25b8305 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -2,6 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("kx") @Implements("FontName") @@ -96,7 +97,7 @@ public class FontName { garbageValue = "-1336396061" ) static int method5639(int var0, Script var1, boolean var2) { - if (var0 == 3600) { + if (var0 == ScriptOpcodes.FRIEND_COUNT) { if (WorldMapArea.friendSystem.field357 == 0) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -2; } else if (WorldMapArea.friendSystem.field357 == 1) { @@ -108,7 +109,7 @@ public class FontName { return 1; } else { int var3; - if (var0 == 3601) { + if (var0 == ScriptOpcodes.FRIEND_GETNAME) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) { Friend var6 = (Friend)WorldMapArea.friendSystem.friendsList.get(var3); @@ -120,7 +121,7 @@ public class FontName { } return 1; - } else if (var0 == 3602) { + } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)WorldMapArea.friendSystem.friendsList.get(var3)).world0; @@ -129,7 +130,7 @@ public class FontName { } return 1; - } else if (var0 == 3603) { + } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)WorldMapArea.friendSystem.friendsList.get(var3)).rank; @@ -140,33 +141,33 @@ public class FontName { return 1; } else { String var4; - if (var0 == 3604) { + if (var0 == ScriptOpcodes.FRIEND_SETRANK) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; int var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; method5638(var4, var8); return 1; - } else if (var0 == 3605) { + } else if (var0 == ScriptOpcodes.FRIEND_ADD) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - WorldMapArea.friendSystem.method103(var4); + WorldMapArea.friendSystem.addFriend(var4); return 1; - } else if (var0 == 3606) { + } else if (var0 == ScriptOpcodes.FRIEND_DEL) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; WorldMapArea.friendSystem.removeFriend(var4); return 1; - } else if (var0 == 3607) { + } else if (var0 == ScriptOpcodes.IGNORE_ADD) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - WorldMapArea.friendSystem.method105(var4); + WorldMapArea.friendSystem.addIgnore(var4); return 1; - } else if (var0 == 3608) { + } else if (var0 == ScriptOpcodes.IGNORE_DEL) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; WorldMapArea.friendSystem.removeIgnore(var4); return 1; - } else if (var0 == 3609) { + } else if (var0 == ScriptOpcodes.FRIEND_TEST) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var4 = NPCDefinition.method5161(var4); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isFriended(new Username(var4, KeyHandler.loginType), false) ? 1 : 0; return 1; - } else if (var0 == 3611) { + } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { if (PacketWriter.clanChat != null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketWriter.clanChat.name; } else { @@ -174,7 +175,7 @@ public class FontName { } return 1; - } else if (var0 == 3612) { + } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { if (PacketWriter.clanChat != null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat.size(); } else { @@ -182,7 +183,7 @@ public class FontName { } return 1; - } else if (var0 == 3613) { + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { 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(); @@ -191,7 +192,7 @@ public class FontName { } return 1; - } else if (var0 == 3614) { + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)PacketWriter.clanChat.get(var3)).world(); @@ -200,7 +201,7 @@ public class FontName { } return 1; - } else if (var0 == 3615) { + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)PacketWriter.clanChat.get(var3)).rank; @@ -209,24 +210,24 @@ public class FontName { } return 1; - } else if (var0 == 3616) { + } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null ? PacketWriter.clanChat.field96 : 0; return 1; - } else if (var0 == 3617) { + } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; IndexStoreActionHandler.method4655(var4); return 1; - } else if (var0 == 3618) { + } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null ? PacketWriter.clanChat.rank : 0; return 1; - } else if (var0 == 3619) { + } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; class31.method574(var4); return 1; - } else if (var0 == 3620) { + } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { class12.method158(); return 1; - } else if (var0 == 3621) { + } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { if (!WorldMapArea.friendSystem.method99()) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { @@ -234,7 +235,7 @@ public class FontName { } return 1; - } else if (var0 == 3622) { + } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.ignoreList.size()) { Ignored var7 = (Ignored)WorldMapArea.friendSystem.ignoreList.get(var3); @@ -246,12 +247,12 @@ public class FontName { } return 1; - } else if (var0 == 3623) { + } else if (var0 == ScriptOpcodes.IGNORE_TEST) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var4 = NPCDefinition.method5161(var4); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isIgnored(new Username(var4, KeyHandler.loginType)) ? 1 : 0; return 1; - } else if (var0 == 3624) { + } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { 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; @@ -260,7 +261,7 @@ public class FontName { } return 1; - } else if (var0 == 3625) { + } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { if (PacketWriter.clanChat != null && PacketWriter.clanChat.owner != null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketWriter.clanChat.owner; } else { @@ -268,7 +269,7 @@ public class FontName { } return 1; - } else if (var0 == 3626) { + } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && ((ClanMate)PacketWriter.clanChat.get(var3)).isFriend()) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; @@ -277,7 +278,7 @@ public class FontName { } return 1; - } else if (var0 != 3627) { + } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { if (var0 == 3628) { WorldMapArea.friendSystem.friendsList.removeComparator(); return 1; diff --git a/runescape-client/src/main/java/Formatting.java b/runescape-client/src/main/java/Formatting.java index 789f058734..77227fd4ca 100644 --- a/runescape-client/src/main/java/Formatting.java +++ b/runescape-client/src/main/java/Formatting.java @@ -2,6 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("cy") @Implements("Formatting") @@ -22,10 +23,10 @@ public class Formatting { ) static int method2023(int var0, Script var1, boolean var2) { Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; - if (var0 == 1700) { + if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemId; return 1; - } else if (var0 == 1701) { + } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { if (var3.itemId != -1) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemQuantity; } else { @@ -33,7 +34,7 @@ public class Formatting { } return 1; - } else if (var0 == 1702) { + } else if (var0 == ScriptOpcodes.CC_GETID) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.childIndex; return 1; } else { @@ -51,7 +52,7 @@ public class Formatting { int var4; int var5; EnumDefinition var9; - if (var0 == 3400) { + if (var0 == ScriptOpcodes.ENUM_STRING) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -72,8 +73,8 @@ public class Formatting { } return 1; - } else if (var0 != 3408) { - if (var0 == 3411) { + } else if (var0 != ScriptOpcodes.ENUM) { + if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var9 = Interpreter.getEnum(var3); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var9.size(); diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 911b82db63..010faa6967 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -3,6 +3,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("bh") @Implements("FriendSystem") @@ -129,13 +130,14 @@ public class FriendSystem { signature = "(Ljava/lang/String;I)V", garbageValue = "-1721017960" ) - final void method103(String var1) { + @Export("addFriend") + final void addFriend(String var1) { if (var1 != null) { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { StringBuilder var3; String var4; - if (this.method104()) { + if (this.canAddFriend()) { var3 = null; var4 = "Your friend list is full. Max of 200 for free users, and 400 for members"; WorldMapIcon1.method219(30, "", var4); @@ -174,7 +176,8 @@ public class FriendSystem { signature = "(B)Z", garbageValue = "57" ) - final boolean method104() { + @Export("canAddFriend") + final boolean canAddFriend() { return this.friendsList.isFull() || this.friendsList.size() >= 200 && Client.field209 != 1; } @@ -183,13 +186,14 @@ public class FriendSystem { signature = "(Ljava/lang/String;B)V", garbageValue = "30" ) - final void method105(String var1) { + @Export("addIgnore") + final void addIgnore(String var1) { if (var1 != null) { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { StringBuilder var3; String var4; - if (this.method106()) { + if (this.canAddIgnore()) { var3 = null; var4 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; WorldMapIcon1.method219(30, "", var4); @@ -225,7 +229,8 @@ public class FriendSystem { signature = "(B)Z", garbageValue = "120" ) - final boolean method106() { + @Export("canAddIgnore") + final boolean canAddIgnore() { return this.ignoreList.isFull() || this.ignoreList.size() >= 100 && Client.field209 != 1; } @@ -302,7 +307,7 @@ public class FriendSystem { var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; } - if (var0 == 1927) { + if (var0 == ScriptOpcodes.CC_CALLONRESIZE) { if (Interpreter.field425 >= 10) { throw new RuntimeException(); } else if (var3.field975 == null) { diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index c4665c6534..0e2a1ebe00 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -3,6 +3,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("l") @Implements("GrandExchangeEvent") @@ -190,38 +191,38 @@ public class GrandExchangeEvent { } } else if (var13 == 0) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6[var4]; - } else if (var13 == 1) { + } else if (var13 == ScriptOpcodes.GET_VARP) { var11 = var6[var4]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Varps.Varps_main[var11]; - } else if (var13 == 2) { + } else if (var13 == ScriptOpcodes.SET_VARP) { var11 = var6[var4]; Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; IndexCache.method4703(var11); - } else if (var13 == 3) { + } else if (var13 == ScriptOpcodes.SCONST) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.stringOperands[var4]; - } else if (var13 == 6) { + } else if (var13 == ScriptOpcodes.JUMP) { var4 += var6[var4]; - } else if (var13 == 7) { + } else if (var13 == ScriptOpcodes.IF_ICMPNE) { RouteStrategy.Interpreter_intStackSize -= 2; if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { var4 += var6[var4]; } - } else if (var13 == 8) { + } else if (var13 == ScriptOpcodes.IF_ICMPEQ) { RouteStrategy.Interpreter_intStackSize -= 2; if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { var4 += var6[var4]; } - } else if (var13 == 9) { + } else if (var13 == ScriptOpcodes.IF_ICMPLT) { RouteStrategy.Interpreter_intStackSize -= 2; if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { var4 += var6[var4]; } - } else if (var13 == 10) { + } else if (var13 == ScriptOpcodes.IF_ICMPGT) { RouteStrategy.Interpreter_intStackSize -= 2; if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { var4 += var6[var4]; } - } else if (var13 == 21) { + } else if (var13 == ScriptOpcodes.RETURN) { if (Interpreter.Interpreter_frameDepth == 0) { return; } @@ -233,47 +234,47 @@ public class GrandExchangeEvent { var4 = var30.pc; Username.Interpreter_intLocals = var30.intLocals; Interpreter.Interpreter_stringLocals = var30.stringLocals; - } else if (var13 == 25) { + } else if (var13 == ScriptOpcodes.GET_VARBIT) { var11 = var6[var4]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection2.getVarbit(var11); - } else if (var13 == 27) { + } else if (var13 == ScriptOpcodes.SET_VARBIT) { var11 = var6[var4]; PendingSpawn.method1695(var11, Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - } else if (var13 == 31) { + } else if (var13 == ScriptOpcodes.IF_ICMPLE) { RouteStrategy.Interpreter_intStackSize -= 2; if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { var4 += var6[var4]; } - } else if (var13 == 32) { + } else if (var13 == ScriptOpcodes.IF_ICMPGE) { RouteStrategy.Interpreter_intStackSize -= 2; if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { var4 += var6[var4]; } - } else if (var13 == 33) { + } else if (var13 == ScriptOpcodes.ILOAD) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Username.Interpreter_intLocals[var6[var4]]; - } else if (var13 == 34) { + } else if (var13 == ScriptOpcodes.ISTORE) { Username.Interpreter_intLocals[var6[var4]] = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - } else if (var13 == 35) { + } else if (var13 == ScriptOpcodes.SLOAD) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var6[var4]]; - } else if (var13 == 36) { + } else if (var13 == ScriptOpcodes.SSTORE) { Interpreter.Interpreter_stringLocals[var6[var4]] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - } else if (var13 == 37) { + } else if (var13 == ScriptOpcodes.JOIN_STRING) { var11 = var6[var4]; Interpreter.Interpreter_stringStackSize -= var11; String var29 = class277.method5356(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var11); Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var29; - } else if (var13 == 38) { + } else if (var13 == ScriptOpcodes.POP_INT) { --RouteStrategy.Interpreter_intStackSize; - } else if (var13 == 39) { + } else if (var13 == ScriptOpcodes.POP_STRING) { --Interpreter.Interpreter_stringStackSize; } else { int var15; - if (var13 != 40) { - if (var13 == 42) { + if (var13 != ScriptOpcodes.INVOKE) { + if (var13 == ScriptOpcodes.GET_VARC_INT) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class196.varcs.getInt(var6[var4]); - } else if (var13 == 43) { + } else if (var13 == ScriptOpcodes.SET_VARC_INT) { class196.varcs.setInt(var6[var4], Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - } else if (var13 == 44) { + } else if (var13 == ScriptOpcodes.DEFINE_ARRAY) { var11 = var6[var4] >> 16; var14 = var6[var4] & 65535; int var28 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; @@ -290,7 +291,7 @@ public class GrandExchangeEvent { for (var15 = 0; var15 < var28; ++var15) { Interpreter.Interpreter_arrays[var11][var15] = var33; } - } else if (var13 == 45) { + } else if (var13 == ScriptOpcodes.GET_ARRAY_INT) { var11 = var6[var4]; var14 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var11]) { @@ -298,7 +299,7 @@ public class GrandExchangeEvent { } Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var14]; - } else if (var13 == 46) { + } else if (var13 == ScriptOpcodes.SET_ARRAY_INT) { var11 = var6[var4]; RouteStrategy.Interpreter_intStackSize -= 2; var14 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; @@ -307,22 +308,22 @@ public class GrandExchangeEvent { } Interpreter.Interpreter_arrays[var11][var14] = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - } else if (var13 == 47) { + } else if (var13 == ScriptOpcodes.GET_VARC_STRING_OLD) { var12 = class196.varcs.getStringOld(var6[var4]); if (var12 == null) { var12 = "null"; } Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12; - } else if (var13 == 48) { + } else if (var13 == ScriptOpcodes.SET_VARC_STRING_OLD) { class196.varcs.setStringOld(var6[var4], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); - } else if (var13 == 49) { + } else if (var13 == ScriptOpcodes.GET_VARC_STRING) { var12 = class196.varcs.getString(var6[var4]); Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12; - } else if (var13 == 50) { + } else if (var13 == ScriptOpcodes.SET_VARC_STRING) { class196.varcs.setString(var6[var4], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); } else { - if (var13 != 60) { + if (var13 != ScriptOpcodes.SWITCH) { throw new IllegalStateException(); } diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index a880043184..f801e63adf 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -7,6 +7,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("g") @Implements("GrandExchangeEvents") @@ -109,43 +110,43 @@ public class GrandExchangeEvents { ) static int method75(int var0, Script var1, boolean var2) { Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - if (var0 == 2600) { + if (var0 == ScriptOpcodes.IF_GETSCROLLX) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollX; return 1; - } else if (var0 == 2601) { + } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollY; return 1; - } else if (var0 == 2602) { + } else if (var0 == ScriptOpcodes.IF_GETTEXT) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; return 1; - } else if (var0 == 2603) { + } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollWidth; return 1; - } else if (var0 == 2604) { + } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollHeight; return 1; - } else if (var0 == 2605) { + } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelZoom; return 1; - } else if (var0 == 2606) { + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleX; return 1; - } else if (var0 == 2607) { + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleZ; return 1; - } else if (var0 == 2608) { + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleY; return 1; - } else if (var0 == 2609) { + } else if (var0 == ScriptOpcodes.IF_GETTRANS) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.transparency; return 1; } else if (var0 == 2610) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.field960; return 1; - } else if (var0 == 2611) { + } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color; return 1; - } else if (var0 == 2612) { + } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color2; return 1; } else if (var0 == 2613) { diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index c00ed82f4c..b7bff3b2b6 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -73,7 +74,8 @@ public class LoginType { } @ObfuscatedName("toString") - public String method166() { + @Export("toString") + public String toString() { return this.field489; } diff --git a/runescape-client/src/main/java/OwnWorldComparator.java b/runescape-client/src/main/java/OwnWorldComparator.java index 4914d77bed..db30ccb06f 100644 --- a/runescape-client/src/main/java/OwnWorldComparator.java +++ b/runescape-client/src/main/java/OwnWorldComparator.java @@ -3,6 +3,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("bj") @Implements("OwnWorldComparator") @@ -51,7 +52,7 @@ public class OwnWorldComparator implements Comparator { ) static int method1285(int var0, Script var1, boolean var2) { int var3; - if (var0 == 5504) { + if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; int var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -61,13 +62,13 @@ public class OwnWorldComparator implements Comparator { } return 1; - } else if (var0 == 5505) { + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cameraPitchTarget; return 1; - } else if (var0 == 5506) { + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.minimapOrientation; return 1; - } else if (var0 == 5530) { + } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (var3 < 0) { var3 = 0; @@ -75,7 +76,7 @@ public class OwnWorldComparator implements Comparator { Client.cameraFollowHeight = var3; return 1; - } else if (var0 == 5531) { + } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cameraFollowHeight; return 1; } else { diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 2238fe002f..e2df568bf8 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -3,6 +3,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("by") @Implements("ScriptEvent") @@ -113,43 +114,43 @@ public class ScriptEvent extends Node { ) static int method1185(int var0, Script var1, boolean var2) { Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; - if (var0 == 1600) { + if (var0 == ScriptOpcodes.CC_GETSCROLLX) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollX; return 1; - } else if (var0 == 1601) { + } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollY; return 1; - } else if (var0 == 1602) { + } else if (var0 == ScriptOpcodes.CC_GETTEXT) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; return 1; - } else if (var0 == 1603) { + } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollWidth; return 1; - } else if (var0 == 1604) { + } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollHeight; return 1; - } else if (var0 == 1605) { + } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelZoom; return 1; - } else if (var0 == 1606) { + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleX; return 1; - } else if (var0 == 1607) { + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleZ; return 1; - } else if (var0 == 1608) { + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleY; return 1; - } else if (var0 == 1609) { + } else if (var0 == ScriptOpcodes.CC_GETTRANS) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.transparency; return 1; } else if (var0 == 1610) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.field960; return 1; - } else if (var0 == 1611) { + } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color; return 1; - } else if (var0 == 1612) { + } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color2; return 1; } else if (var0 == 1613) { @@ -169,88 +170,88 @@ public class ScriptEvent extends Node { garbageValue = "1256509027" ) static int method1187(int var0, Script var1, boolean var2) { - if (var0 == 3300) { + if (var0 == ScriptOpcodes.CLIENTCLOCK) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cycle; return 1; } else { int var3; int var4; - if (var0 == 3301) { + if (var0 == ScriptOpcodes.INV_GETOBJ) { 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) { + } else if (var0 == ScriptOpcodes.INV_GETNUM) { 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) { + } else if (var0 == ScriptOpcodes.INV_TOTAL) { 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) { + } else if (var0 == ScriptOpcodes.INV_SIZE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapDecorationType.method4523(var3).size; return 1; - } else if (var0 == 3305) { + } else if (var0 == ScriptOpcodes.STAT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; return 1; - } else if (var0 == 3306) { + } else if (var0 == ScriptOpcodes.STAT_BASE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.levels[var3]; return 1; - } else if (var0 == 3307) { + } else if (var0 == ScriptOpcodes.STAT_XP) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.experience[var3]; return 1; } else { int var5; - if (var0 == 3308) { + if (var0 == ScriptOpcodes.COORD) { var3 = SoundSystem.plane; var4 = (Canvas.localPlayer.x >> 7) + class50.baseX; var5 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); return 1; - } else if (var0 == 3309) { + } else if (var0 == ScriptOpcodes.COORDX) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; return 1; - } else if (var0 == 3310) { + } else if (var0 == ScriptOpcodes.COORDZ) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 >> 28; return 1; - } else if (var0 == 3311) { + } else if (var0 == ScriptOpcodes.COORDY) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 & 16383; return 1; - } else if (var0 == 3312) { + } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; return 1; - } else if (var0 == 3313) { + } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { 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) { + } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { 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) { + } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { 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) { + } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { if (Client.rights >= 2) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rights; } else { @@ -258,19 +259,19 @@ public class ScriptEvent extends Node { } return 1; - } else if (var0 == 3317) { + } else if (var0 == ScriptOpcodes.REBOOTTIMER) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rebootTimer; return 1; - } else if (var0 == 3318) { + } else if (var0 == ScriptOpcodes.MAP_WORLD) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.worldId; return 1; - } else if (var0 == 3321) { + } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.runEnergy; return 1; - } else if (var0 == 3322) { + } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.weight; return 1; - } else if (var0 == 3323) { + } else if (var0 == ScriptOpcodes.PLAYERMOD) { if (Client.field155) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; } else { @@ -278,10 +279,10 @@ public class ScriptEvent extends Node { } return 1; - } else if (var0 == 3324) { + } else if (var0 == ScriptOpcodes.WORLDFLAGS) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.worldProperties; return 1; - } else if (var0 == 3325) { + } else if (var0 == ScriptOpcodes.MOVECOORD) { RouteStrategy.Interpreter_intStackSize -= 4; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index 6a9c2c932f..bfbeb96b71 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -2,6 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("jq") @Implements("StructDefinition") @@ -111,7 +112,7 @@ public class StructDefinition extends DualNode { var4 = var2 ? WorldMapIcon1.field1030 : class12.field1111; } - if (var0 == 1100) { + if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { RouteStrategy.Interpreter_intStackSize -= 2; var4.scrollX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; if (var4.scrollX > var4.scrollWidth - var4.width) { @@ -133,40 +134,40 @@ public class StructDefinition extends DualNode { class22.method295(var4); return 1; - } else if (var0 == 1101) { + } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { var4.color = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var4); return 1; - } else if (var0 == 1102) { + } else if (var0 == ScriptOpcodes.CC_SETFILL) { var4.fill = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; class22.method295(var4); return 1; - } else if (var0 == 1103) { + } else if (var0 == ScriptOpcodes.CC_SETTRANS) { var4.transparency = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var4); return 1; - } else if (var0 == 1104) { + } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { var4.lineWid = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var4); return 1; - } else if (var0 == 1105) { + } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { var4.spriteId2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var4); return 1; - } else if (var0 == 1106) { + } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { var4.spriteAngle = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var4); return 1; - } else if (var0 == 1107) { + } else if (var0 == ScriptOpcodes.CC_SETTILING) { var4.spriteTiling = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; class22.method295(var4); return 1; - } else if (var0 == 1108) { + } else if (var0 == ScriptOpcodes.CC_SETMODEL) { var4.modelType = 1; var4.modelId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var4); return 1; - } else if (var0 == 1109) { + } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { RouteStrategy.Interpreter_intStackSize -= 6; var4.modelOffsetX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4.modelOffsetY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -178,7 +179,7 @@ public class StructDefinition extends DualNode { return 1; } else { int var5; - if (var0 == 1110) { + if (var0 == ScriptOpcodes.CC_SETMODELANIM) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (var5 != var4.sequenceId) { var4.sequenceId = var5; @@ -188,11 +189,11 @@ public class StructDefinition extends DualNode { } return 1; - } else if (var0 == 1111) { + } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { var4.modelOrthog = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; class22.method295(var4); return 1; - } else if (var0 == 1112) { + } else if (var0 == ScriptOpcodes.CC_SETTEXT) { String var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; if (!var8.equals(var4.text)) { var4.text = var8; @@ -200,38 +201,38 @@ public class StructDefinition extends DualNode { } return 1; - } else if (var0 == 1113) { + } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { var4.fontId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var4); return 1; - } else if (var0 == 1114) { + } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { RouteStrategy.Interpreter_intStackSize -= 3; var4.textXAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4.textYAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; var4.textLineHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; class22.method295(var4); return 1; - } else if (var0 == 1115) { + } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { var4.textShadowed = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; class22.method295(var4); return 1; - } else if (var0 == 1116) { + } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { var4.outline = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var4); return 1; - } else if (var0 == 1117) { + } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { var4.spriteShadow = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var4); return 1; - } else if (var0 == 1118) { + } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { var4.spriteFlipV = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; class22.method295(var4); return 1; - } else if (var0 == 1119) { + } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { var4.spriteFlipH = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; class22.method295(var4); return 1; - } else if (var0 == 1120) { + } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { RouteStrategy.Interpreter_intStackSize -= 2; var4.scrollWidth = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4.scrollHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -241,7 +242,7 @@ public class StructDefinition extends DualNode { } return 1; - } else if (var0 == 1121) { + } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { TilePaint.method3060(var4.id, var4.childIndex); Client.field127 = var4; class22.method295(var4); @@ -250,7 +251,7 @@ public class StructDefinition extends DualNode { var4.spriteId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var4); return 1; - } else if (var0 == 1123) { + } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { var4.color2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var4); return 1; @@ -269,7 +270,7 @@ public class StructDefinition extends DualNode { return 1; } else { boolean var6; - if (var0 == 1126) { + if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; var4.field961 = var6; return 1; diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java index 347ad0ba62..b6a22d12a5 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -3,6 +3,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("dl") @Implements("TextureProvider") @@ -234,7 +235,7 @@ public class TextureProvider implements TextureLoader { if (var0 == null) { return null; } else if (var0 instanceof byte[]) { - byte[] var5 = (byte[])((byte[])((byte[])var0)); + byte[] var5 = (byte[])var0; if (var1) { int var3 = var5.length; byte[] var4 = new byte[var3]; @@ -329,39 +330,39 @@ public class TextureProvider implements TextureLoader { static int method2752(int var0, Script var1, boolean var2) { int var3; int var4; - if (var0 == 4000) { + if (var0 == ScriptOpcodes.ADD) { 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) { + } else if (var0 == ScriptOpcodes.SUB) { 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) { + } else if (var0 == ScriptOpcodes.MULTIPLY) { 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) { + } else if (var0 == ScriptOpcodes.DIV) { 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) { + } else if (var0 == ScriptOpcodes.RANDOM) { 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) { + } else if (var0 == ScriptOpcodes.RANDOMINC) { 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) { + } else if (var0 == ScriptOpcodes.INTERPOLATE) { RouteStrategy.Interpreter_intStackSize -= 5; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -370,37 +371,37 @@ public class TextureProvider implements TextureLoader { int var12 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 4]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 + (var12 - var11) * (var4 - var3) / (var6 - var11); return 1; - } else if (var0 == 4007) { + } else if (var0 == ScriptOpcodes.ADDPERCENT) { 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) { + } else if (var0 == ScriptOpcodes.SETBIT) { 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) { + } else if (var0 == ScriptOpcodes.CLEARBIT) { 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) { + } else if (var0 == ScriptOpcodes.TESTBIT) { 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) { + } else if (var0 == ScriptOpcodes.MOD) { 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) { + } else if (var0 == ScriptOpcodes.POW) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -411,7 +412,7 @@ public class TextureProvider implements TextureLoader { } return 1; - } else if (var0 == 4013) { + } else if (var0 == ScriptOpcodes.INVPOW) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -441,19 +442,19 @@ public class TextureProvider implements TextureLoader { return 1; } - } else if (var0 == 4014) { + } else if (var0 == ScriptOpcodes.AND) { 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) { + } else if (var0 == ScriptOpcodes.OR) { 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) { + } else if (var0 == ScriptOpcodes.SCALE) { RouteStrategy.Interpreter_intStackSize -= 3; long var5 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; long var7 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index 98b1c71cd6..0f5758bf29 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -4,6 +4,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("ev") @Implements("UserComparator4") @@ -56,22 +57,22 @@ public class UserComparator4 implements Comparator { garbageValue = "-2050984400" ) static int method3335(int var0, Script var1, boolean var2) { - if (var0 == 5306) { + if (var0 == ScriptOpcodes.GETWINDOWMODE) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SpotAnimationDefinition.method4822(); return 1; } else { int var3; - if (var0 == 5307) { + if (var0 == ScriptOpcodes.SETWINDOWMODE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (var3 == 1 || var3 == 2) { GroundItem.method2095(var3); } return 1; - } else if (var0 == 5308) { + } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.windowMode; return 1; - } else if (var0 != 5309) { + } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { if (var0 == 5310) { --RouteStrategy.Interpreter_intStackSize; return 1; diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index bd18c01a0c..f7a988efaa 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -261,7 +261,6 @@ public class Varcs { void read() { AccessFile var1 = this.getPreferencesFile(false); - label225: { try { byte[] var2 = new byte[(int)var1.length()]; @@ -279,20 +278,18 @@ public class Varcs { } int var5 = var25.readUnsignedByte(); - if (var5 >= 0 && var5 <= 2) { + if (var5 < 0 || var5 > 2) { + return; + } + int var6; int var7; int var8; int var9; if (var5 >= 2) { var9 = var25.readUnsignedShort(); - var6 = 0; - - while (true) { - if (var6 >= var9) { - break label225; - } + for (var6 = 0; var6 < var9; ++var6) { var7 = var25.readUnsignedShort(); var8 = var25.readUnsignedByte(); class3 var10 = (class3)ScriptFrame.findEnumerated(class3.method34(), var8); @@ -300,8 +297,6 @@ public class Varcs { if (this.intsPersistence[var7]) { this.map.put(var7, var11); } - - ++var6; } } else { var9 = var25.readUnsignedShort(); @@ -315,21 +310,13 @@ public class Varcs { } var6 = var25.readUnsignedShort(); - var7 = 0; - - while (true) { - if (var7 >= var6) { - break label225; - } + for (var7 = 0; var7 < var6; ++var7) { var25.readUnsignedShort(); var25.readStringCp1252NullTerminated(); - ++var7; - } } } } catch (Exception var23) { - break label225; } finally { try { var1.close(); @@ -338,9 +325,6 @@ public class Varcs { } - return; - } - this.unwrittenChanges = false; } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index 57312a18ae..8ca879af33 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -3,6 +3,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("dm") @Implements("ViewportMouse") @@ -72,22 +73,22 @@ public class ViewportMouse { ) static int method2983(int var0, Script var1, boolean var2) { Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - if (var0 == 2500) { + if (var0 == ScriptOpcodes.IF_GETX) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.x; return 1; - } else if (var0 == 2501) { + } else if (var0 == ScriptOpcodes.IF_GETY) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.y; return 1; - } else if (var0 == 2502) { + } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.width; return 1; - } else if (var0 == 2503) { + } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.height; return 1; - } else if (var0 == 2504) { + } else if (var0 == ScriptOpcodes.IF_GETHIDE) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; return 1; - } else if (var0 == 2505) { + } else if (var0 == ScriptOpcodes.IF_GETLAYER) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.parentId; return 1; } else { diff --git a/runescape-client/src/main/java/WorldComparator.java b/runescape-client/src/main/java/WorldComparator.java index c254ab0fe5..f1ff1fc67c 100644 --- a/runescape-client/src/main/java/WorldComparator.java +++ b/runescape-client/src/main/java/WorldComparator.java @@ -3,6 +3,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("u") @Implements("WorldComparator") @@ -45,14 +46,14 @@ final class WorldComparator implements Comparator { garbageValue = "108" ) static int method68(int var0, Script var1, boolean var2) { - if (var0 == 3200) { + if (var0 == ScriptOpcodes.SOUND_SYNTH) { 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) { + } else if (var0 == ScriptOpcodes.SOUND_SONG) { AbstractUserComparator.method5437(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); return 1; - } else if (var0 == 3202) { + } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { RouteStrategy.Interpreter_intStackSize -= 2; HealthBar.method1994(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); return 1; diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 92be204da6..64fff82dd1 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -5,6 +5,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("ae") @Implements("WorldMapAreaData") @@ -135,7 +136,7 @@ public class WorldMapAreaData extends WorldMapArea { } int var5; - if (var0 == 1300) { + if (var0 == ScriptOpcodes.CC_SETOP) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] - 1; if (var5 >= 0 && var5 <= 9) { var4.setAction(var5, Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); @@ -146,28 +147,28 @@ public class WorldMapAreaData extends WorldMapArea { } } else { int var6; - if (var0 == 1301) { + if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { RouteStrategy.Interpreter_intStackSize -= 2; var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; var4.parent = class204.getWidgetChild(var5, var6); return 1; - } else if (var0 == 1302) { + } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { var4.isScrollBar = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; - } else if (var0 == 1303) { + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { var4.dragZoneSize = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; return 1; - } else if (var0 == 1304) { + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { var4.dragThreshold = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; return 1; - } else if (var0 == 1305) { + } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { var4.dataText = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; return 1; - } else if (var0 == 1306) { + } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { var4.spellActionName = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; return 1; - } else if (var0 == 1307) { + } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { var4.actions = null; return 1; } else if (var0 == 1308) { diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index fd15e8530c..ed14d0ff1f 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -6,8 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("v") @Implements("WorldMapDecoration") -public class WorldMapDecoration -{ +public class WorldMapDecoration { @ObfuscatedName("dd") @ObfuscatedSignature( signature = "Lit;" diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index 9e31cd962e..d0e2ea0201 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -4,6 +4,7 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("h") @Implements("WorldMapSectionType") @@ -100,22 +101,22 @@ public enum WorldMapSectionType implements Enumerated { ) static int method253(int var0, Script var1, boolean var2) { Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; - if (var0 == 1500) { + if (var0 == ScriptOpcodes.CC_GETX) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.x; return 1; - } else if (var0 == 1501) { + } else if (var0 == ScriptOpcodes.CC_GETY) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.y; return 1; - } else if (var0 == 1502) { + } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.width; return 1; - } else if (var0 == 1503) { + } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.height; return 1; - } else if (var0 == 1504) { + } else if (var0 == ScriptOpcodes.CC_GETHIDE) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; return 1; - } else if (var0 == 1505) { + } else if (var0 == ScriptOpcodes.CC_GETLAYER) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.parentId; return 1; } else { diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 3f186cdad6..d1d301d612 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -1,6 +1,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("f") final class class1 implements class0 { @@ -86,7 +87,7 @@ final class class1 implements class0 { var4 = var2 ? WorldMapIcon1.field1030 : class12.field1111; } - if (var0 == 1000) { + if (var0 == ScriptOpcodes.CC_SETPOSITION) { RouteStrategy.Interpreter_intStackSize -= 4; var4.rawX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4.rawY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -99,7 +100,7 @@ final class class1 implements class0 { } return 1; - } else if (var0 == 1001) { + } else if (var0 == ScriptOpcodes.CC_SETSIZE) { RouteStrategy.Interpreter_intStackSize -= 4; var4.rawWidth = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4.rawHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -112,7 +113,7 @@ final class class1 implements class0 { } return 1; - } else if (var0 == 1003) { + } else if (var0 == ScriptOpcodes.CC_SETHIDE) { boolean var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if (var5 != var4.isHidden) { var4.isHidden = var5; @@ -120,7 +121,7 @@ final class class1 implements class0 { } return 1; - } else if (var0 == 1005) { + } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { var4.noClickThrough = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else if (var0 == 1006) { @@ -138,14 +139,14 @@ final class class1 implements class0 { ) static int method16(int var0, Script var1, boolean var2) { int var3; - if (var0 == 4200) { + if (var0 == ScriptOpcodes.OC_NAME) { 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) { + if (var0 == ScriptOpcodes.OC_OP) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -157,7 +158,7 @@ final class class1 implements class0 { } return 1; - } else if (var0 == 4202) { + } else if (var0 == ScriptOpcodes.OC_IOP) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -169,17 +170,17 @@ final class class1 implements class0 { } return 1; - } else if (var0 == 4203) { + } else if (var0 == ScriptOpcodes.OC_COST) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).price; return 1; - } else if (var0 == 4204) { + } else if (var0 == ScriptOpcodes.OC_STACKABLE) { 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) { + if (var0 == ScriptOpcodes.OC_CERT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = Skills.getItemDefinition(var3); if (var6.noteTemplate == -1 && var6.note >= 0) { @@ -189,7 +190,7 @@ final class class1 implements class0 { } return 1; - } else if (var0 == 4206) { + } else if (var0 == ScriptOpcodes.OC_UNCERT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = Skills.getItemDefinition(var3); if (var6.noteTemplate >= 0 && var6.note >= 0) { @@ -199,11 +200,11 @@ final class class1 implements class0 { } return 1; - } else if (var0 == 4207) { + } else if (var0 == ScriptOpcodes.OC_MEMBERS) { 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) { + } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = Skills.getItemDefinition(var3); if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) { @@ -213,7 +214,7 @@ final class class1 implements class0 { } return 1; - } else if (var0 == 4209) { + } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = Skills.getItemDefinition(var3); if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { @@ -223,14 +224,14 @@ final class class1 implements class0 { } return 1; - } else if (var0 == 4210) { + } else if (var0 == ScriptOpcodes.OC_FIND) { String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class50.method900(var7, var4 == 1); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection0.field1055; return 1; - } else if (var0 != 4211) { - if (var0 == 4212) { + } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { + if (var0 == ScriptOpcodes.OC_FINDRESET) { WorldMapDecorationType.field1139 = 0; return 1; } else { diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java index f6646377ed..fbd4dfcf22 100644 --- a/runescape-client/src/main/java/class11.java +++ b/runescape-client/src/main/java/class11.java @@ -3,6 +3,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("k") final class class11 implements Comparator { @@ -120,63 +121,63 @@ final class class11 implements Comparator { var8 = null; } - if (var0 == 1400) { + if (var0 == ScriptOpcodes.CC_SETONCLICK) { var3.onClick = var8; - } else if (var0 == 1401) { + } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { var3.onHold = var8; - } else if (var0 == 1402) { + } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { var3.onRelease = var8; - } else if (var0 == 1403) { + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { var3.onMouseOver = var8; - } else if (var0 == 1404) { + } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { var3.onMouseLeave = var8; - } else if (var0 == 1405) { + } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { var3.onDrag = var8; - } else if (var0 == 1406) { + } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { var3.onTargetLeave = var8; - } else if (var0 == 1407) { + } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { var3.onVarTransmit = var8; var3.varTransmitTriggers = var5; - } else if (var0 == 1408) { + } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { var3.onTimer = var8; - } else if (var0 == 1409) { + } else if (var0 == ScriptOpcodes.CC_SETONOP) { var3.onOp = var8; - } else if (var0 == 1410) { + } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { var3.onDragComplete = var8; - } else if (var0 == 1411) { + } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { var3.onClickRepeat = var8; - } else if (var0 == 1412) { + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { var3.onMouseRepeat = var8; - } else if (var0 == 1414) { + } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { var3.onInvTransmit = var8; var3.invTransmitTriggers = var5; - } else if (var0 == 1415) { + } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { var3.onStatTransmit = var8; var3.statTransmitTriggers = var5; - } else if (var0 == 1416) { + } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { var3.onTargetEnter = var8; - } else if (var0 == 1417) { + } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { var3.onScroll = var8; - } else if (var0 == 1418) { + } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { var3.field970 = var8; - } else if (var0 == 1419) { + } else if (var0 == ScriptOpcodes.CC_SETONKEY) { var3.onKeyListener = var8; - } else if (var0 == 1420) { + } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { var3.field971 = var8; - } else if (var0 == 1421) { + } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { var3.field972 = var8; - } else if (var0 == 1422) { + } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { var3.field973 = var8; - } else if (var0 == 1423) { + } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { var3.onDialogAbortListener = var8; - } else if (var0 == 1424) { + } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { var3.field974 = var8; - } else if (var0 == 1425) { + } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { var3.field976 = var8; } else if (var0 == 1426) { var3.field977 = var8; } else { - if (var0 != 1427) { + if (var0 != ScriptOpcodes.CC_SETONRESIZE) { return 2; } @@ -194,11 +195,11 @@ final class class11 implements Comparator { ) static int method146(int var0, Script var1, boolean var2) { Widget var3; - if (var0 == 2700) { + if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemId; return 1; - } else if (var0 == 2701) { + } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); if (var3.itemId != -1) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemQuantity; @@ -207,7 +208,7 @@ final class class11 implements Comparator { } return 1; - } else if (var0 == 2702) { + } else if (var0 == ScriptOpcodes.IF_HASSUB) { int var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; WidgetGroupParent var5 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var4); if (var5 != null) { @@ -217,7 +218,7 @@ final class class11 implements Comparator { } return 1; - } else if (var0 == 2706) { + } else if (var0 == ScriptOpcodes.IF_GETTOP) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rootWidgetGroup; return 1; } else { diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java index 0b07ec0546..d8eb31073f 100644 --- a/runescape-client/src/main/java/class15.java +++ b/runescape-client/src/main/java/class15.java @@ -2,6 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("z") public class class15 extends class21 { @@ -121,11 +122,11 @@ public class class15 extends class21 { ) static int method182(int var0, Script var1, boolean var2) { Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - if (var0 == 2800) { + if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class211.method4107(class1.getWidgetClickMask(var3)); return 1; - } else if (var0 != 2801) { - if (var0 == 2802) { + } else if (var0 != ScriptOpcodes.IF_GETOP) { + if (var0 == ScriptOpcodes.IF_GETOPBASE) { if (var3.dataText == null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } else { diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 07eddf838a..6d20c53087 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -1,6 +1,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("j") public class class16 { @@ -62,11 +63,11 @@ public class class16 { ) static int method188(int var0, Script var1, boolean var2) { Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; - if (var0 == 1800) { + if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class211.method4107(class1.getWidgetClickMask(var3)); return 1; - } else if (var0 != 1801) { - if (var0 == 1802) { + } else if (var0 != ScriptOpcodes.CC_GETOP) { + if (var0 == ScriptOpcodes.CC_GETOPBASE) { if (var3.dataText == null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } else { diff --git a/runescape-client/src/main/java/class211.java b/runescape-client/src/main/java/class211.java index dec93d8492..f8254ed9d6 100644 --- a/runescape-client/src/main/java/class211.java +++ b/runescape-client/src/main/java/class211.java @@ -4,6 +4,7 @@ import java.util.TimeZone; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("hg") public class class211 { @@ -37,32 +38,32 @@ public class class211 { static int method4103(int var0, Script var1, boolean var2) { String var3; int var4; - if (var0 == 4100) { + if (var0 == ScriptOpcodes.APPEND_NUM) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var4; return 1; } else { String var5; - if (var0 == 4101) { + if (var0 == ScriptOpcodes.APPEND) { Interpreter.Interpreter_stringStackSize -= 2; var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var5; return 1; - } else if (var0 == 4102) { + } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; 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) { + } else if (var0 == ScriptOpcodes.LOWERCASE) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toLowerCase(); return 1; } else { int var6; int var7; - if (var0 == 4104) { + if (var0 == ScriptOpcodes.FROMDATE) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; long var14 = ((long)var7 + 11745L) * 86400000L; Interpreter.Interpreter_calendar.setTime(new Date(var14)); @@ -71,12 +72,12 @@ public class class211 { int var16 = Interpreter.Interpreter_calendar.get(1); Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.field422[var15] + "-" + var16; return 1; - } else if (var0 != 4105) { - if (var0 == 4106) { + } else if (var0 != ScriptOpcodes.TEXT_GENDER) { + if (var0 == ScriptOpcodes.TOSTRING) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Integer.toString(var7); return 1; - } else if (var0 == 4107) { + } else if (var0 == ScriptOpcodes.COMPARE) { Interpreter.Interpreter_stringStackSize -= 2; 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; @@ -84,7 +85,7 @@ public class class211 { int var8; byte[] var9; Font var10; - if (var0 == 4108) { + if (var0 == ScriptOpcodes.PARAHEIGHT) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; RouteStrategy.Interpreter_intStackSize -= 2; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; @@ -93,7 +94,7 @@ public class class211 { var10 = new Font(var9); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var10.lineCount(var3, var4); return 1; - } else if (var0 == 4109) { + } else if (var0 == ScriptOpcodes.PARAWIDTH) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; RouteStrategy.Interpreter_intStackSize -= 2; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; @@ -102,7 +103,7 @@ public class class211 { var10 = new Font(var9); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var10.lineWidth(var3, var4); return 1; - } else if (var0 == 4110) { + } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { Interpreter.Interpreter_stringStackSize -= 2; var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; @@ -113,32 +114,32 @@ public class class211 { } return 1; - } else if (var0 == 4111) { + } else if (var0 == ScriptOpcodes.ESCAPE) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); return 1; - } else if (var0 == 4112) { + } else if (var0 == ScriptOpcodes.APPEND_CHAR) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + (char)var4; return 1; - } else if (var0 == 4113) { + } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ChatChannel.method2238((char)var7) ? 1 : 0; return 1; - } else if (var0 == 4114) { + } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = VarcInt.isAlphaNumeric((char)var7) ? 1 : 0; return 1; - } else if (var0 == 4115) { + } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = UrlRequest.method3271((char)var7) ? 1 : 0; return 1; - } else if (var0 == 4116) { + } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class159.method3394((char)var7) ? 1 : 0; return 1; - } else if (var0 == 4117) { + } else if (var0 == ScriptOpcodes.STRING_LENGTH) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; if (var3 != null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.length(); @@ -147,14 +148,14 @@ public class class211 { } return 1; - } else if (var0 == 4118) { + } else if (var0 == ScriptOpcodes.SUBSTRING) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; RouteStrategy.Interpreter_intStackSize -= 2; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.substring(var4, var8); return 1; - } else if (var0 == 4119) { + } else if (var0 == ScriptOpcodes.REMOVETAGS) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; StringBuilder var11 = new StringBuilder(var3.length()); boolean var12 = false; @@ -172,12 +173,12 @@ public class class211 { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.toString(); return 1; - } else if (var0 == 4120) { + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.indexOf(var4); return 1; - } else if (var0 == 4121) { + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { Interpreter.Interpreter_stringStackSize -= 2; var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java index 6162f555a4..20a523668f 100644 --- a/runescape-client/src/main/java/class229.java +++ b/runescape-client/src/main/java/class229.java @@ -1,6 +1,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("hz") public class class229 { @@ -36,7 +37,7 @@ public class class229 { garbageValue = "1886084106" ) static int method4513(int var0, Script var1, boolean var2) { - if (var0 == 6200) { + if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { RouteStrategy.Interpreter_intStackSize -= 2; Client.field130 = (short)class161.method3395(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]); if (Client.field130 <= 0) { @@ -49,7 +50,7 @@ public class class229 { } return 1; - } else if (var0 == 6201) { + } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { RouteStrategy.Interpreter_intStackSize -= 2; Client.field150 = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; if (Client.field150 <= 0) { @@ -62,7 +63,7 @@ public class class229 { } return 1; - } else if (var0 == 6202) { + } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { RouteStrategy.Interpreter_intStackSize -= 4; Client.field135 = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; if (Client.field135 <= 0) { @@ -89,7 +90,7 @@ public class class229 { } return 1; - } else if (var0 == 6203) { + } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { if (Client.viewportWidget != null) { FontName.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.viewportWidth; @@ -100,11 +101,11 @@ public class class229 { } return 1; - } else if (var0 == 6204) { + } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.field150; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.field149; return 1; - } else if (var0 == 6205) { + } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class30.method571(Client.field130); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class30.method571(Client.field131); return 1; diff --git a/runescape-client/src/main/java/class248.java b/runescape-client/src/main/java/class248.java index b3ada630e4..f3e00fb049 100644 --- a/runescape-client/src/main/java/class248.java +++ b/runescape-client/src/main/java/class248.java @@ -2,6 +2,7 @@ import java.util.HashMap; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("iu") public class class248 { @@ -191,69 +192,69 @@ public class class248 { ) static int method4741(int var0, Script var1, boolean var2) { int var3; - if (var0 == 3903) { + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); return 1; - } else if (var0 == 3904) { + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; return 1; - } else if (var0 == 3905) { + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; return 1; - } else if (var0 == 3906) { + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; return 1; - } else if (var0 == 3907) { + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; return 1; - } else if (var0 == 3908) { + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; return 1; } else { int var4; - if (var0 == 3910) { + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4 = Client.grandExchangeOffers[var3].status(); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 == 0 ? 1 : 0; return 1; - } else if (var0 == 3911) { + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4 = Client.grandExchangeOffers[var3].status(); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 == 2 ? 1 : 0; return 1; - } else if (var0 == 3912) { + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4 = Client.grandExchangeOffers[var3].status(); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 == 5 ? 1 : 0; return 1; - } else if (var0 == 3913) { + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4 = Client.grandExchangeOffers[var3].status(); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 == 1 ? 1 : 0; return 1; } else { boolean var5; - if (var0 == 3914) { + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if (FloorDecoration.grandExchangeEvents != null) { FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field373, var5); } return 1; - } else if (var0 == 3915) { + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if (FloorDecoration.grandExchangeEvents != null) { FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field372, var5); } return 1; - } else if (var0 == 3916) { + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { RouteStrategy.Interpreter_intStackSize -= 2; var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] == 1; boolean var13 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1; @@ -263,41 +264,41 @@ public class class248 { } return 1; - } else if (var0 == 3917) { + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if (FloorDecoration.grandExchangeEvents != null) { FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field371, var5); } return 1; - } else if (var0 == 3918) { + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if (FloorDecoration.grandExchangeEvents != null) { FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field374, var5); } return 1; - } else if (var0 == 3919) { + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = FloorDecoration.grandExchangeEvents == null ? 0 : FloorDecoration.grandExchangeEvents.events.size(); return 1; } else { GrandExchangeEvent var6; - if (var0 == 3920) { + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.world; return 1; - } else if (var0 == 3921) { + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.method119(); return 1; - } else if (var0 == 3922) { + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.method120(); return 1; - } else if (var0 == 3923) { + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); long var7 = class203.currentTimeMs() - class15.field1113 - var6.field370; @@ -307,17 +308,17 @@ public class class248 { String var12 = var9 + ":" + var10 / 10 + var10 % 10 + ":" + var11 / 10 + var11 % 10; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12; return 1; - } else if (var0 == 3924) { + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.grandExchangeOffer.totalQuantity; return 1; - } else if (var0 == 3925) { + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.grandExchangeOffer.unitPrice; return 1; - } else if (var0 == 3926) { + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.grandExchangeOffer.id; diff --git a/runescape-client/src/main/java/class31.java b/runescape-client/src/main/java/class31.java index e985580e29..356692fe17 100644 --- a/runescape-client/src/main/java/class31.java +++ b/runescape-client/src/main/java/class31.java @@ -2,6 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("ac") public class class31 { @@ -55,12 +56,12 @@ public class class31 { garbageValue = "130306081" ) static int method573(int var0, Script var1, boolean var2) { - if (var0 == 6500) { + if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ClientParameter.loadWorlds() ? 1 : 0; return 1; } else { World var3; - if (var0 == 6501) { + if (var0 == ScriptOpcodes.WORLDLIST_START) { var3 = class190.method3672(); if (var3 != null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.id; @@ -79,7 +80,7 @@ public class class31 { } return 1; - } else if (var0 == 6502) { + } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { var3 = Fonts.method5647(); if (var3 != null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.id; @@ -102,7 +103,7 @@ public class class31 { World var4; int var5; int var6; - if (var0 == 6506) { + if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4 = null; @@ -130,7 +131,7 @@ public class class31 { } return 1; - } else if (var0 == 6507) { + } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { RouteStrategy.Interpreter_intStackSize -= 4; var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; boolean var9 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1; @@ -139,13 +140,13 @@ public class class31 { WorldMapSectionType.method248(var6, var9, var5, var10); return 1; } else if (var0 != 6511) { - if (var0 == 6512) { + if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else { int var7; ParamKeyDefinition var8; - if (var0 == 6513) { + if (var0 == ScriptOpcodes.NC_PARAM) { RouteStrategy.Interpreter_intStackSize -= 2; var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -157,7 +158,7 @@ public class class31 { } return 1; - } else if (var0 == 6514) { + } else if (var0 == ScriptOpcodes.LC_PARAM) { RouteStrategy.Interpreter_intStackSize -= 2; var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -169,7 +170,7 @@ public class class31 { } return 1; - } else if (var0 == 6515) { + } else if (var0 == ScriptOpcodes.OC_PARAM) { RouteStrategy.Interpreter_intStackSize -= 2; var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -181,7 +182,7 @@ public class class31 { } return 1; - } else if (var0 == 6516) { + } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { RouteStrategy.Interpreter_intStackSize -= 2; var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -193,10 +194,10 @@ public class class31 { } return 1; - } else if (var0 == 6518) { + } else if (var0 == ScriptOpcodes.ON_MOBILE) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.field162 ? 1 : 0; return 1; - } else if (var0 == 6519) { + } else if (var0 == ScriptOpcodes.CLIENTTYPE) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.clientType & 3; return 1; } else if (var0 == 6520) { @@ -211,13 +212,13 @@ public class class31 { --Interpreter.Interpreter_stringStackSize; --RouteStrategy.Interpreter_intStackSize; return 1; - } else if (var0 == 6524) { + } else if (var0 == ScriptOpcodes.BATTERYLEVEL) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; return 1; - } else if (var0 == 6525) { + } else if (var0 == ScriptOpcodes.BATTERYCHARGING) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; return 1; - } else if (var0 == 6526) { + } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; return 1; } else { diff --git a/runescape-client/src/main/java/class32.java b/runescape-client/src/main/java/class32.java index d77052c7ea..d0224db34b 100644 --- a/runescape-client/src/main/java/class32.java +++ b/runescape-client/src/main/java/class32.java @@ -1,6 +1,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("ay") public class class32 { @@ -28,12 +29,12 @@ public class class32 { } class22.method295(var3); - if (var0 != 1200 && var0 != 1205 && var0 != 1212) { - if (var0 == 1201) { + if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { + if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { var3.modelType = 2; var3.modelId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; return 1; - } else if (var0 == 1202) { + } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { var3.modelType = 3; var3.modelId = Canvas.localPlayer.appearance.getChatHeadId(); return 1; @@ -53,9 +54,9 @@ public class class32 { var3.modelOffsetX = var6.offsetX2d; var3.modelOffsetY = var6.offsetY2d; var3.modelZoom = var6.zoom2d; - if (var0 == 1205) { + if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { var3.itemQuantityMode = 0; - } else if (var0 == 1212 | 1 == var6.isStackable) { + } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { var3.itemQuantityMode = 1; } else { var3.itemQuantityMode = 2; diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 5aae33d902..11a1a4bf22 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -1,5 +1,6 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("o") final class class4 implements class0 { @@ -61,15 +62,15 @@ final class class4 implements class0 { ) static int method54(int var0, Script var1, boolean var2) { String var3; - if (var0 == 3100) { + if (var0 == ScriptOpcodes.MES) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; WorldMapIcon1.method219(0, "", var3); return 1; - } else if (var0 == 3101) { + } else if (var0 == ScriptOpcodes.ANIM) { 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) { + } else if (var0 == ScriptOpcodes.IF_CLOSE) { if (!Interpreter.field424) { Interpreter.field423 = true; } @@ -78,7 +79,7 @@ final class class4 implements class0 { } else { int var4; PacketBufferNode var5; - if (var0 == 3104) { + if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var4 = 0; if (UserComparator4.method3336(var3)) { @@ -89,14 +90,14 @@ final class class4 implements class0 { var5.packetBuffer.writeInt(var4); Client.packetWriter.method241(var5); return 1; - } else if (var0 == 3105) { + } else if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var5 = Interpreter.method1915(ClientPacket.field317, Client.packetWriter.isaacCipher); var5.packetBuffer.writeByte(var3.length() + 1); var5.packetBuffer.writeStringCp1252NullTerminated(var3); Client.packetWriter.method241(var5); return 1; - } else if (var0 == 3106) { + } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var5 = Interpreter.method1915(ClientPacket.field230, Client.packetWriter.isaacCipher); var5.packetBuffer.writeByte(var3.length() + 1); @@ -106,12 +107,12 @@ final class class4 implements class0 { } else { String var6; int var7; - if (var0 == 3107) { + if (var0 == ScriptOpcodes.OPPLAYER) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; WorldMapSection2.method583(var7, var6); return 1; - } else if (var0 == 3108) { + } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { RouteStrategy.Interpreter_intStackSize -= 3; var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; @@ -119,37 +120,37 @@ final class class4 implements class0 { Widget var11 = Huffman.getWidget(var13); Players.clickWidget(var11, var7, var4); return 1; - } else if (var0 == 3109) { + } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { RouteStrategy.Interpreter_intStackSize -= 2; var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Widget var12 = var2 ? WorldMapIcon1.field1030 : class12.field1111; Players.clickWidget(var12, var7, var4); return 1; - } else if (var0 == 3110) { + } else if (var0 == ScriptOpcodes.MOUSECAM) { AbstractRasterProvider.mouseCam = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; - } else if (var0 == 3111) { + } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.roofsHidden ? 1 : 0; return 1; - } else if (var0 == 3112) { + } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { ReflectionCheck.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; WorldMapSection0.savePreferences(); return 1; } else { boolean var8; - if (var0 == 3113) { + if (var0 == ScriptOpcodes.OPENURL) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; WorldMapCacheName.method635(var3, var8, false); return 1; - } else if (var0 == 3115) { + } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var5 = Interpreter.method1915(ClientPacket.field264, Client.packetWriter.isaacCipher); var5.packetBuffer.writeShort(var7); Client.packetWriter.method241(var5); return 1; - } else if (var0 == 3116) { + } else if (var0 == ScriptOpcodes.BUG_REPORT) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_stringStackSize -= 2; var6 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; @@ -167,13 +168,13 @@ final class class4 implements class0 { Client.packetWriter.method241(var9); return 1; } - } else if (var0 == 3117) { + } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { Client.shiftClickDrop = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; - } else if (var0 == 3118) { + } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { Client.showMouseOverText = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; - } else if (var0 == 3119) { + } else if (var0 == ScriptOpcodes.RENDERSELF) { Client.renderSelf = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else if (var0 == 3120) { @@ -211,16 +212,16 @@ final class class4 implements class0 { } else if (var0 == 3124) { Client.field210 = 0; return 1; - } else if (var0 == 3125) { + } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { Client.showMouseCross = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; - } else if (var0 == 3126) { + } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { Client.showLoadingMessages = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; - } else if (var0 == 3127) { + } else if (var0 == ScriptOpcodes.SETTAPTODROP) { WorldMapAreaData.method705(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1); return 1; - } else if (var0 == 3128) { + } else if (var0 == ScriptOpcodes.GETTAPTODROP) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class206.method4028() ? 1 : 0; return 1; } else if (var0 == 3129) { @@ -234,7 +235,7 @@ final class class4 implements class0 { } else if (var0 == 3131) { --RouteStrategy.Interpreter_intStackSize; return 1; - } else if (var0 == 3132) { + } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SoundCache.canvasWidth; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Huffman.canvasHeight; return 1; @@ -264,15 +265,15 @@ final class class4 implements class0 { Client.field151 = 3; Client.field153 = var2 ? WorldMapIcon1.field1030.id : class12.field1111.id; return 1; - } else if (var0 == 3141) { + } else if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; ReflectionCheck.clientPreferences.hideUsername = var8; WorldMapSection0.savePreferences(); return 1; - } else if (var0 == 3142) { + } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.hideUsername ? 1 : 0; return 1; - } else if (var0 == 3143) { + } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; Client.Login_isUsernameRemembered = var8; if (!var8) { @@ -281,7 +282,7 @@ final class class4 implements class0 { } return 1; - } else if (var0 == 3144) { + } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; return 1; } else if (var0 == 3145) { diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java index e4f0932858..c295c9c36d 100644 --- a/runescape-client/src/main/java/class54.java +++ b/runescape-client/src/main/java/class54.java @@ -1,6 +1,7 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("bs") public final class class54 { @@ -639,7 +640,7 @@ public final class class54 { return 1; } else { WorldMapArea var4; - if (var0 == 6601) { + if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; String var14 = ""; var4 = BufferedFile.worldMap().getMapArea(var3); @@ -649,45 +650,45 @@ public final class class54 { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var14; return 1; - } else if (var0 == 6602) { + } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; BufferedFile.worldMap().setCurrentMapAreaId(var3); return 1; - } else if (var0 == 6603) { + } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getZoomLevel(); return 1; - } else if (var0 == 6604) { + } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; BufferedFile.worldMap().setZoomLevel(var3); return 1; - } else if (var0 == 6605) { + } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isCacheLoaded() ? 1 : 0; return 1; } else { TileLocation var5; - if (var0 == 6606) { + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); BufferedFile.worldMap().setWorldMapPositionTarget(var5.x, var5.y); return 1; - } else if (var0 == 6607) { + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); BufferedFile.worldMap().method371(var5.x, var5.y); return 1; - } else if (var0 == 6608) { + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); BufferedFile.worldMap().method372(var5.plane, var5.x, var5.y); return 1; - } else if (var0 == 6609) { + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); BufferedFile.worldMap().method373(var5.plane, var5.x, var5.y); return 1; - } else if (var0 == 6610) { + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method374(); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method375(); return 1; } else { WorldMapArea var6; - if (var0 == 6611) { + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = BufferedFile.worldMap().getMapArea(var3); if (var6 == null) { @@ -697,7 +698,7 @@ public final class class54 { } return 1; - } else if (var0 == 6612) { + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = BufferedFile.worldMap().getMapArea(var3); if (var6 == null) { @@ -709,7 +710,7 @@ public final class class54 { } return 1; - } else if (var0 == 6613) { + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = BufferedFile.worldMap().getMapArea(var3); if (var6 == null) { @@ -725,7 +726,7 @@ public final class class54 { } return 1; - } else if (var0 == 6614) { + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = BufferedFile.worldMap().getMapArea(var3); if (var6 == null) { @@ -746,10 +747,10 @@ public final class class54 { } return 1; - } else if (var0 == 6616) { + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().currentMapAreaId(); return 1; - } else if (var0 == 6617) { + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); var6 = BufferedFile.worldMap().getCurrentMapArea(); if (var6 == null) { @@ -801,7 +802,7 @@ public final class class54 { var8 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); TotalQuantityComparator.method96(var3, var8, true); return 1; - } else if (var0 == 6621) { + } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var8 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); @@ -813,7 +814,7 @@ public final class class54 { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.containsCoord(var8.plane, var8.x, var8.y) ? 1 : 0; return 1; } - } else if (var0 == 6622) { + } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method377(); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method378(); return 1; @@ -841,47 +842,47 @@ public final class class54 { return 1; } else { boolean var9; - if (var0 == 6628) { + if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { var9 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; BufferedFile.worldMap().perpetualFlash(var9); return 1; - } else if (var0 == 6629) { + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; BufferedFile.worldMap().flashElement(var3); return 1; - } else if (var0 == 6630) { + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; BufferedFile.worldMap().flashCategory(var3); return 1; - } else if (var0 == 6631) { + } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { BufferedFile.worldMap().stopCurrentFlashes(); return 1; - } else if (var0 == 6632) { + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { var9 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; BufferedFile.worldMap().setElementsEnabled(var9); return 1; } else { boolean var10; - if (var0 == 6633) { + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1; BufferedFile.worldMap().disableElement(var3, var10); return 1; - } else if (var0 == 6634) { + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1; BufferedFile.worldMap().disableCategory(var3, var10); return 1; - } else if (var0 == 6635) { + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getElementsEnabled() ? 1 : 0; return 1; - } else if (var0 == 6636) { + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { 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) { + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isCategoryDisabled(var3) ? 1 : 0; return 1; @@ -899,7 +900,7 @@ public final class class54 { return 1; } else { AbstractWorldMapIcon var11; - if (var0 == 6639) { + if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { var11 = BufferedFile.worldMap().iconStart(); if (var11 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; @@ -910,7 +911,7 @@ public final class class54 { } return 1; - } else if (var0 == 6640) { + } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { var11 = BufferedFile.worldMap().iconNext(); if (var11 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; @@ -923,7 +924,7 @@ public final class class54 { return 1; } else { WorldMapElement var12; - if (var0 == 6693) { + if (var0 == ScriptOpcodes.MEC_TEXT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var12 = ViewportMouse.getWorldMapElement(var3); if (var12.field1021 == null) { @@ -933,12 +934,12 @@ public final class class54 { } return 1; - } else if (var0 == 6694) { + } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var12 = ViewportMouse.getWorldMapElement(var3); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12.textSize; return 1; - } else if (var0 == 6695) { + } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var12 = ViewportMouse.getWorldMapElement(var3); if (var12 == null) { @@ -948,7 +949,7 @@ public final class class54 { } return 1; - } else if (var0 == 6696) { + } else if (var0 == ScriptOpcodes.MEC_SPRITE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var12 = ViewportMouse.getWorldMapElement(var3); if (var12 == null) { diff --git a/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java b/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java new file mode 100644 index 0000000000..8e3084a0a7 --- /dev/null +++ b/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java @@ -0,0 +1,472 @@ +package net.runelite.rs; + +public class ScriptOpcodes { + public static final int ICONST = 0; + public static final int GET_VARP = 1; + public static final int SET_VARP = 2; + public static final int SCONST = 3; + public static final int JUMP = 6; + public static final int IF_ICMPNE = 7; + public static final int IF_ICMPEQ = 8; + public static final int IF_ICMPLT = 9; + public static final int IF_ICMPGT = 10; + public static final int RETURN = 21; + public static final int GET_VARBIT = 25; + public static final int SET_VARBIT = 27; + public static final int IF_ICMPLE = 31; + public static final int IF_ICMPGE = 32; + public static final int ILOAD = 33; + public static final int ISTORE = 34; + public static final int SLOAD = 35; + public static final int SSTORE = 36; + public static final int JOIN_STRING = 37; + public static final int POP_INT = 38; + public static final int POP_STRING = 39; + public static final int INVOKE = 40; + public static final int GET_VARC_INT = 42; + public static final int SET_VARC_INT = 43; + public static final int DEFINE_ARRAY = 44; + public static final int GET_ARRAY_INT = 45; + public static final int SET_ARRAY_INT = 46; + public static final int GET_VARC_STRING_OLD = 47; + public static final int SET_VARC_STRING_OLD = 48; + public static final int GET_VARC_STRING = 49; + public static final int SET_VARC_STRING = 50; + public static final int SWITCH = 60; + public static final int CC_CREATE = 100; + public static final int CC_DELETE = 101; + public static final int CC_DELETEALL = 102; + public static final int CC_FIND = 200; + public static final int IF_FIND = 201; + public static final int CC_SETPOSITION = 1000; + public static final int CC_SETSIZE = 1001; + public static final int CC_SETHIDE = 1003; + public static final int CC_SETNOCLICKTHROUGH = 1005; + public static final int CC_SETSCROLLPOS = 1100; + public static final int CC_SETCOLOUR = 1101; + public static final int CC_SETFILL = 1102; + public static final int CC_SETTRANS = 1103; + public static final int CC_SETLINEWID = 1104; + public static final int CC_SETGRAPHIC = 1105; + public static final int CC_SET2DANGLE = 1106; + public static final int CC_SETTILING = 1107; + public static final int CC_SETMODEL = 1108; + public static final int CC_SETMODELANGLE = 1109; + public static final int CC_SETMODELANIM = 1110; + public static final int CC_SETMODELORTHOG = 1111; + public static final int CC_SETTEXT = 1112; + public static final int CC_SETTEXTFONT = 1113; + public static final int CC_SETTEXTALIGN = 1114; + public static final int CC_SETTEXTSHADOW = 1115; + public static final int CC_SETOUTLINE = 1116; + public static final int CC_SETGRAPHICSHADOW = 1117; + public static final int CC_SETVFLIP = 1118; + public static final int CC_SETHFLIP = 1119; + public static final int CC_SETSCROLLSIZE = 1120; + public static final int CC_RESUME_PAUSEBUTTON = 1121; + public static final int CC_SETFILLCOLOUR = 1123; + public static final int CC_SETLINEDIRECTION = 1126; + public static final int CC_SETOBJECT = 1200; + public static final int CC_SETNPCHEAD = 1201; + public static final int CC_SETPLAYERHEAD_SELF = 1202; + public static final int CC_SETOBJECT_NONUM = 1205; + public static final int CC_SETOBJECT_ALWAYS_NUM = 1212; + public static final int CC_SETOP = 1300; + public static final int CC_SETDRAGGABLE = 1301; + public static final int CC_SETDRAGGABLEBEHAVIOR = 1302; + public static final int CC_SETDRAGDEADZONE = 1303; + public static final int CC_SETDRAGDEADTIME = 1304; + public static final int CC_SETOPBASE = 1305; + public static final int CC_SETTARGETVERB = 1306; + public static final int CC_CLEAROPS = 1307; + public static final int CC_SETONCLICK = 1400; + public static final int CC_SETONHOLD = 1401; + public static final int CC_SETONRELEASE = 1402; + public static final int CC_SETONMOUSEOVER = 1403; + public static final int CC_SETONMOUSELEAVE = 1404; + public static final int CC_SETONDRAG = 1405; + public static final int CC_SETONTARGETLEAVE = 1406; + public static final int CC_SETONVARTRANSMIT = 1407; + public static final int CC_SETONTIMER = 1408; + public static final int CC_SETONOP = 1409; + public static final int CC_SETONDRAGCOMPLETE = 1410; + public static final int CC_SETONCLICKREPEAT = 1411; + public static final int CC_SETONMOUSEREPEAT = 1412; + public static final int CC_SETONINVTRANSMIT = 1414; + public static final int CC_SETONSTATTRANSMIT = 1415; + public static final int CC_SETONTARGETENTER = 1416; + public static final int CC_SETONSCROLLWHEEL = 1417; + public static final int CC_SETONCHATTRANSMIT = 1418; + public static final int CC_SETONKEY = 1419; + public static final int CC_SETONFRIENDTRANSMIT = 1420; + public static final int CC_SETONCLANTRANSMIT = 1421; + public static final int CC_SETONMISCTRANSMIT = 1422; + public static final int CC_SETONDIALOGABORT = 1423; + public static final int CC_SETONSUBCHANGE = 1424; + public static final int CC_SETONSTOCKTRANSMIT = 1425; + public static final int CC_SETONRESIZE = 1427; + public static final int CC_GETX = 1500; + public static final int CC_GETY = 1501; + public static final int CC_GETWIDTH = 1502; + public static final int CC_GETHEIGHT = 1503; + public static final int CC_GETHIDE = 1504; + public static final int CC_GETLAYER = 1505; + public static final int CC_GETSCROLLX = 1600; + public static final int CC_GETSCROLLY = 1601; + public static final int CC_GETTEXT = 1602; + public static final int CC_GETSCROLLWIDTH = 1603; + public static final int CC_GETSCROLLHEIGHT = 1604; + public static final int CC_GETMODELZOOM = 1605; + public static final int CC_GETMODELANGLE_X = 1606; + public static final int CC_GETMODELANGLE_Z = 1607; + public static final int CC_GETMODELANGLE_Y = 1608; + public static final int CC_GETTRANS = 1609; + public static final int CC_GETCOLOUR = 1611; + public static final int CC_GETFILLCOLOUR = 1612; + public static final int CC_GETINVOBJECT = 1700; + public static final int CC_GETINVCOUNT = 1701; + public static final int CC_GETID = 1702; + public static final int CC_GETTARGETMASK = 1800; + public static final int CC_GETOP = 1801; + public static final int CC_GETOPBASE = 1802; + public static final int CC_CALLONRESIZE = 1927; + public static final int IF_SETPOSITION = 2000; + public static final int IF_SETSIZE = 2001; + public static final int IF_SETHIDE = 2003; + public static final int IF_SETNOCLICKTHROUGH = 2005; + public static final int IF_SETSCROLLPOS = 2100; + public static final int IF_SETCOLOUR = 2101; + public static final int IF_SETFILL = 2102; + public static final int IF_SETTRANS = 2103; + public static final int IF_SETLINEWID = 2104; + public static final int IF_SETGRAPHIC = 2105; + public static final int IF_SET2DANGLE = 2106; + public static final int IF_SETTILING = 2107; + public static final int IF_SETMODEL = 2108; + public static final int IF_SETMODELANGLE = 2109; + public static final int IF_SETMODELANIM = 2110; + public static final int IF_SETMODELORTHOG = 2111; + public static final int IF_SETTEXT = 2112; + public static final int IF_SETTEXTFONT = 2113; + public static final int IF_SETTEXTALIGN = 2114; + public static final int IF_SETTEXTSHADOW = 2115; + public static final int IF_SETOUTLINE = 2116; + public static final int IF_SETGRAPHICSHADOW = 2117; + public static final int IF_SETVFLIP = 2118; + public static final int IF_SETHFLIP = 2119; + public static final int IF_SETSCROLLSIZE = 2120; + public static final int IF_RESUME_PAUSEBUTTON = 2121; + public static final int IF_SETFILLCOLOUR = 2123; + public static final int IF_SETLINEDIRECTION = 2126; + public static final int IF_SETOBJECT = 2200; + public static final int IF_SETNPCHEAD = 2201; + public static final int IF_SETPLAYERHEAD_SELF = 2202; + public static final int IF_SETOBJECT_NONUM = 2205; + public static final int IF_SETOBJECT_ALWAYS_NUM = 2212; + public static final int IF_SETOP = 2300; + public static final int IF_SETDRAGGABLE = 2301; + public static final int IF_SETDRAGGABLEBEHAVIOR = 2302; + public static final int IF_SETDRAGDEADZONE = 2303; + public static final int IF_SETDRAGDEADTIME = 2304; + public static final int IF_SETOPBASE = 2305; + public static final int IF_SETTARGETVERB = 2306; + public static final int IF_CLEAROPS = 2307; + public static final int IF_SETOPKEY = 2350; + public static final int IF_SETOPTKEY = 2351; + public static final int IF_SETOPKEYRATE = 2352; + public static final int IF_SETOPTKEYRATE = 2353; + public static final int IF_SETOPKEYIGNOREHELD = 2354; + public static final int IF_SETOPTKEYIGNOREHELD = 2355; + public static final int IF_SETONCLICK = 2400; + public static final int IF_SETONHOLD = 2401; + public static final int IF_SETONRELEASE = 2402; + public static final int IF_SETONMOUSEOVER = 2403; + public static final int IF_SETONMOUSELEAVE = 2404; + public static final int IF_SETONDRAG = 2405; + public static final int IF_SETONTARGETLEAVE = 2406; + public static final int IF_SETONVARTRANSMIT = 2407; + public static final int IF_SETONTIMER = 2408; + public static final int IF_SETONOP = 2409; + public static final int IF_SETONDRAGCOMPLETE = 2410; + public static final int IF_SETONCLICKREPEAT = 2411; + public static final int IF_SETONMOUSEREPEAT = 2412; + public static final int IF_SETONINVTRANSMIT = 2414; + public static final int IF_SETONSTATTRANSMIT = 2415; + public static final int IF_SETONTARGETENTER = 2416; + public static final int IF_SETONSCROLLWHEEL = 2417; + public static final int IF_SETONCHATTRANSMIT = 2418; + public static final int IF_SETONKEY = 2419; + public static final int IF_SETONFRIENDTRANSMIT = 2420; + public static final int IF_SETONCLANTRANSMIT = 2421; + public static final int IF_SETONMISCTRANSMIT = 2422; + public static final int IF_SETONDIALOGABORT = 2423; + public static final int IF_SETONSUBCHANGE = 2424; + public static final int IF_SETONSTOCKTRANSMIT = 2425; + public static final int IF_SETONRESIZE = 2427; + public static final int IF_GETX = 2500; + public static final int IF_GETY = 2501; + public static final int IF_GETWIDTH = 2502; + public static final int IF_GETHEIGHT = 2503; + public static final int IF_GETHIDE = 2504; + public static final int IF_GETLAYER = 2505; + public static final int IF_GETSCROLLX = 2600; + public static final int IF_GETSCROLLY = 2601; + public static final int IF_GETTEXT = 2602; + public static final int IF_GETSCROLLWIDTH = 2603; + public static final int IF_GETSCROLLHEIGHT = 2604; + public static final int IF_GETMODELZOOM = 2605; + public static final int IF_GETMODELANGLE_X = 2606; + public static final int IF_GETMODELANGLE_Z = 2607; + public static final int IF_GETMODELANGLE_Y = 2608; + public static final int IF_GETTRANS = 2609; + public static final int IF_GETCOLOUR = 2611; + public static final int IF_GETFILLCOLOUR = 2612; + public static final int IF_GETINVOBJECT = 2700; + public static final int IF_GETINVCOUNT = 2701; + public static final int IF_HASSUB = 2702; + public static final int IF_GETTOP = 2706; + public static final int IF_GETTARGETMASK = 2800; + public static final int IF_GETOP = 2801; + public static final int IF_GETOPBASE = 2802; + public static final int IF_CALLONRESIZE = 2927; + public static final int MES = 3100; + public static final int ANIM = 3101; + public static final int IF_CLOSE = 3103; + public static final int RESUME_COUNTDIALOG = 3104; + public static final int RESUME_NAMEDIALOG = 3105; + public static final int RESUME_STRINGDIALOG = 3106; + public static final int OPPLAYER = 3107; + public static final int IF_DRAGPICKUP = 3108; + public static final int CC_DRAGPICKUP = 3109; + public static final int MOUSECAM = 3110; + public static final int GETREMOVEROOFS = 3111; + public static final int SETREMOVEROOFS = 3112; + public static final int OPENURL = 3113; + public static final int RESUME_OBJDIALOG = 3115; + public static final int BUG_REPORT = 3116; + public static final int SETSHIFTCLICKDROP = 3117; + public static final int SETSHOWMOUSEOVERTEXT = 3118; + public static final int RENDERSELF = 3119; + public static final int SETSHOWMOUSECROSS = 3125; + public static final int SETSHOWLOADINGMESSAGES = 3126; + public static final int SETTAPTODROP = 3127; + public static final int GETTAPTODROP = 3128; + public static final int GETCANVASSIZE = 3132; + public static final int SETHIDEUSERNAME = 3141; + public static final int GETHIDEUSERNAME = 3142; + public static final int SETREMEMBERUSERNAME = 3143; + public static final int GETREMEMBERUSERNAME = 3144; + public static final int SOUND_SYNTH = 3200; + public static final int SOUND_SONG = 3201; + public static final int SOUND_JINGLE = 3202; + public static final int CLIENTCLOCK = 3300; + public static final int INV_GETOBJ = 3301; + public static final int INV_GETNUM = 3302; + public static final int INV_TOTAL = 3303; + public static final int INV_SIZE = 3304; + public static final int STAT = 3305; + public static final int STAT_BASE = 3306; + public static final int STAT_XP = 3307; + public static final int COORD = 3308; + public static final int COORDX = 3309; + public static final int COORDZ = 3310; + public static final int COORDY = 3311; + public static final int MAP_MEMBERS = 3312; + public static final int INVOTHER_GETOBJ = 3313; + public static final int INVOTHER_GETNUM = 3314; + public static final int INVOTHER_TOTAL = 3315; + public static final int STAFFMODLEVEL = 3316; + public static final int REBOOTTIMER = 3317; + public static final int MAP_WORLD = 3318; + public static final int RUNENERGY_VISIBLE = 3321; + public static final int RUNWEIGHT_VISIBLE = 3322; + public static final int PLAYERMOD = 3323; + public static final int WORLDFLAGS = 3324; + public static final int MOVECOORD = 3325; + public static final int ENUM_STRING = 3400; + public static final int ENUM = 3408; + public static final int ENUM_GETOUTPUTCOUNT = 3411; + public static final int FRIEND_COUNT = 3600; + public static final int FRIEND_GETNAME = 3601; + public static final int FRIEND_GETWORLD = 3602; + public static final int FRIEND_GETRANK = 3603; + public static final int FRIEND_SETRANK = 3604; + public static final int FRIEND_ADD = 3605; + public static final int FRIEND_DEL = 3606; + public static final int IGNORE_ADD = 3607; + public static final int IGNORE_DEL = 3608; + public static final int FRIEND_TEST = 3609; + public static final int CLAN_GETCHATDISPLAYNAME = 3611; + public static final int CLAN_GETCHATCOUNT = 3612; + public static final int CLAN_GETCHATUSERNAME = 3613; + public static final int CLAN_GETCHATUSERWORLD = 3614; + public static final int CLAN_GETCHATUSERRANK = 3615; + public static final int CLAN_GETCHATMINKICK = 3616; + public static final int CLAN_KICKUSER = 3617; + public static final int CLAN_GETCHATRANK = 3618; + public static final int CLAN_JOINCHAT = 3619; + public static final int CLAN_LEAVECHAT = 3620; + public static final int IGNORE_COUNT = 3621; + public static final int IGNORE_GETNAME = 3622; + public static final int IGNORE_TEST = 3623; + public static final int CLAN_ISSELF = 3624; + public static final int CLAN_GETCHATOWNERNAME = 3625; + public static final int CLAN_ISFRIEND = 3626; + public static final int CLAN_ISIGNORE = 3627; + public static final int STOCKMARKET_GETOFFERTYPE = 3903; + public static final int STOCKMARKET_GETOFFERITEM = 3904; + public static final int STOCKMARKET_GETOFFERPRICE = 3905; + public static final int STOCKMARKET_GETOFFERCOUNT = 3906; + public static final int STOCKMARKET_GETOFFERCOMPLETEDCOUNT = 3907; + public static final int STOCKMARKET_GETOFFERCOMPLETEDGOLD = 3908; + public static final int STOCKMARKET_ISOFFEREMPTY = 3910; + public static final int STOCKMARKET_ISOFFERSTABLE = 3911; + public static final int STOCKMARKET_ISOFFERFINISHED = 3912; + public static final int STOCKMARKET_ISOFFERADDING = 3913; + public static final int TRADINGPOST_SORTBY_NAME = 3914; + public static final int TRADINGPOST_SORTBY_PRICE = 3915; + public static final int TRADINGPOST_SORTFILTERBY_WORLD = 3916; + public static final int TRADINGPOST_SORTBY_AGE = 3917; + public static final int TRADINGPOST_SORTBY_COUNT = 3918; + public static final int TRADINGPOST_GETTOTALOFFERS = 3919; + public static final int TRADINGPOST_GETOFFERWORLD = 3920; + public static final int TRADINGPOST_GETOFFERNAME = 3921; + public static final int TRADINGPOST_GETOFFERPREVIOUSNAME = 3922; + public static final int TRADINGPOST_GETOFFERAGE = 3923; + public static final int TRADINGPOST_GETOFFERCOUNT = 3924; + public static final int TRADINGPOST_GETOFFERPRICE = 3925; + public static final int TRADINGPOST_GETOFFERITEM = 3926; + public static final int ADD = 4000; + public static final int SUB = 4001; + public static final int MULTIPLY = 4002; + public static final int DIV = 4003; + public static final int RANDOM = 4004; + public static final int RANDOMINC = 4005; + public static final int INTERPOLATE = 4006; + public static final int ADDPERCENT = 4007; + public static final int SETBIT = 4008; + public static final int CLEARBIT = 4009; + public static final int TESTBIT = 4010; + public static final int MOD = 4011; + public static final int POW = 4012; + public static final int INVPOW = 4013; + public static final int AND = 4014; + public static final int OR = 4015; + public static final int SCALE = 4018; + public static final int APPEND_NUM = 4100; + public static final int APPEND = 4101; + public static final int APPEND_SIGNNUM = 4102; + public static final int LOWERCASE = 4103; + public static final int FROMDATE = 4104; + public static final int TEXT_GENDER = 4105; + public static final int TOSTRING = 4106; + public static final int COMPARE = 4107; + public static final int PARAHEIGHT = 4108; + public static final int PARAWIDTH = 4109; + public static final int TEXT_SWITCH = 4110; + public static final int ESCAPE = 4111; + public static final int APPEND_CHAR = 4112; + public static final int CHAR_ISPRINTABLE = 4113; + public static final int CHAR_ISALPHANUMERIC = 4114; + public static final int CHAR_ISALPHA = 4115; + public static final int CHAR_ISNUMERIC = 4116; + public static final int STRING_LENGTH = 4117; + public static final int SUBSTRING = 4118; + public static final int REMOVETAGS = 4119; + public static final int STRING_INDEXOF_CHAR = 4120; + public static final int STRING_INDEXOF_STRING = 4121; + public static final int OC_NAME = 4200; + public static final int OC_OP = 4201; + public static final int OC_IOP = 4202; + public static final int OC_COST = 4203; + public static final int OC_STACKABLE = 4204; + public static final int OC_CERT = 4205; + public static final int OC_UNCERT = 4206; + public static final int OC_MEMBERS = 4207; + public static final int OC_PLACEHOLDER = 4208; + public static final int OC_UNPLACEHOLDER = 4209; + public static final int OC_FIND = 4210; + public static final int OC_FINDNEXT = 4211; + public static final int OC_FINDRESET = 4212; + public static final int CHAT_GETFILTER_PUBLIC = 5000; + public static final int CHAT_SETFILTER = 5001; + public static final int CHAT_SENDABUSEREPORT = 5002; + public static final int CHAT_GETHISTORY_BYTYPEANDLINE = 5003; + public static final int CHAT_GETHISTORY_BYUID = 5004; + public static final int CHAT_GETFILTER_PRIVATE = 5005; + public static final int CHAT_SENDPUBLIC = 5008; + public static final int CHAT_SENDPRIVATE = 5009; + public static final int CHAT_PLAYERNAME = 5015; + public static final int CHAT_GETFILTER_TRADE = 5016; + public static final int CHAT_GETHISTORYLENGTH = 5017; + public static final int CHAT_GETNEXTUID = 5018; + public static final int CHAT_GETPREVUID = 5019; + public static final int DOCHEAT = 5020; + public static final int CHAT_SETMESSAGEFILTER = 5021; + public static final int CHAT_GETMESSAGEFILTER = 5022; + public static final int GETWINDOWMODE = 5306; + public static final int SETWINDOWMODE = 5307; + public static final int GETDEFAULTWINDOWMODE = 5308; + public static final int SETDEFAULTWINDOWMODE = 5309; + public static final int CAM_FORCEANGLE = 5504; + public static final int CAM_GETANGLE_XA = 5505; + public static final int CAM_GETANGLE_YA = 5506; + public static final int CAM_SETFOLLOWHEIGHT = 5530; + public static final int CAM_GETFOLLOWHEIGHT = 5531; + public static final int LOGOUT = 5630; + public static final int VIEWPORT_SETFOV = 6200; + public static final int VIEWPORT_SETZOOM = 6201; + public static final int VIEWPORT_CLAMPFOV = 6202; + public static final int VIEWPORT_GETEFFECTIVESIZE = 6203; + public static final int VIEWPORT_GETZOOM = 6204; + public static final int VIEWPORT_GETFOV = 6205; + public static final int WORLDLIST_FETCH = 6500; + public static final int WORLDLIST_START = 6501; + public static final int WORLDLIST_NEXT = 6502; + public static final int WORLDLIST_SPECIFIC = 6506; + public static final int WORLDLIST_SORT = 6507; + public static final int SETFOLLOWEROPSLOWPRIORITY = 6512; + public static final int NC_PARAM = 6513; + public static final int LC_PARAM = 6514; + public static final int OC_PARAM = 6515; + public static final int STRUCT_PARAM = 6516; + public static final int ON_MOBILE = 6518; + public static final int CLIENTTYPE = 6519; + public static final int BATTERYLEVEL = 6524; + public static final int BATTERYCHARGING = 6525; + public static final int WIFIAVAILABLE = 6526; + public static final int WORLDMAP_GETMAPNAME = 6601; + public static final int WORLDMAP_SETMAP = 6602; + public static final int WORLDMAP_GETZOOM = 6603; + public static final int WORLDMAP_SETZOOM = 6604; + public static final int WORLDMAP_ISLOADED = 6605; + public static final int WORLDMAP_JUMPTODISPLAYCOORD = 6606; + public static final int WORLDMAP_JUMPTODISPLAYCOORD_INSTANT = 6607; + public static final int WORLDMAP_JUMPTOSOURCECOORD = 6608; + public static final int WORLDMAP_JUMPTOSOURCECOORD_INSTANT = 6609; + public static final int WORLDMAP_GETDISPLAYPOSITION = 6610; + public static final int WORLDMAP_GETCONFIGORIGIN = 6611; + public static final int WORLDMAP_GETCONFIGSIZE = 6612; + public static final int WORLDMAP_GETCONFIGBOUNDS = 6613; + public static final int WORLDMAP_GETCONFIGZOOM = 6614; + public static final int WORLDMAP_GETCURRENTMAP = 6616; + public static final int WORLDMAP_GETDISPLAYCOORD = 6617; + public static final int WORLDMAP_COORDINMAP = 6621; + public static final int WORLDMAP_GETSIZE = 6622; + public static final int WORLDMAP_PERPETUALFLASH = 6628; + public static final int WORLDMAP_FLASHELEMENT = 6629; + public static final int WORLDMAP_FLASHELEMENTCATEGORY = 6630; + public static final int WORLDMAP_STOPCURRENTFLASHES = 6631; + public static final int WORLDMAP_DISABLEELEMENTS = 6632; + public static final int WORLDMAP_DISABLEELEMENT = 6633; + public static final int WORLDMAP_DISABLEELEMENTCATEGORY = 6634; + public static final int WORLDMAP_GETDISABLEELEMENTS = 6635; + public static final int WORLDMAP_GETDISABLEELEMENT = 6636; + public static final int WORLDMAP_GETDISABLEELEMENTCATEGORY = 6637; + public static final int WORLDMAP_LISTELEMENT_START = 6639; + public static final int WORLDMAP_LISTELEMENT_NEXT = 6640; + public static final int MEC_TEXT = 6693; + public static final int MEC_TEXTSIZE = 6694; + public static final int MEC_CATEGORY = 6695; + public static final int MEC_SPRITE = 6696; +} From 83660849cba6cc1bc5e120499a4a9c5ba0cce394 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sat, 6 Jul 2019 19:12:40 -0400 Subject: [PATCH 065/472] Properly capitalize 'Brother Kojo' in Watchtower clue scroll (#9297) --- .../runelite/client/plugins/cluescrolls/clues/CrypticClue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java index c2654b0e2b..4265b0d801 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java @@ -138,7 +138,7 @@ public class CrypticClue extends ClueScroll implements TextClueScroll, NpcClueSc new CrypticClue("46 is my number. My body is the colour of burnt orange and crawls among those with eight. Three mouths I have, yet I cannot eat. My blinking blue eye hides my grave.", new WorldPoint(3170, 3885, 0), "Sapphire respawn in the Spider's Nest, lvl 46 Wilderness. Dig under the sapphire spawn."), new CrypticClue("Green is the colour of my death as the winter-guise, I swoop towards the ground.", new WorldPoint(2780, 3783, 0), "Players need to slide down to where Trollweiss grows on Trollweiss Mountain."), new CrypticClue("Talk to a party-goer in Falador.", "Lucy", new WorldPoint(3046, 3382, 0), "Lucy is the bartender on the first floor of the party room."), - new CrypticClue("He knows just how easy it is to lose track of time.", "Brother Kojo", new WorldPoint(2570, 3250, 0), "Speak to brother Kojo in the Clock Tower. Answer: 22"), + new CrypticClue("He knows just how easy it is to lose track of time.", "Brother Kojo", new WorldPoint(2570, 3250, 0), "Speak to Brother Kojo in the Clock Tower. Answer: 22"), new CrypticClue("A great view - watch the rapidly drying hides get splashed. Check the box you are sitting on.", BOXES, new WorldPoint(2523, 3493, 1), "Almera's House north of Baxtorian Falls, search boxes on the first floor."), new CrypticClue("Search the Coffin in Edgeville.", COFFIN, new WorldPoint(3091, 3477, 0), "Search the coffin located by the Wilderness teleport lever."), new CrypticClue("When no weapons are at hand, then is the time to reflect. In Saradomin's name, redemption draws closer...", DRAWERS_350, new WorldPoint(2818, 3351, 0), "On Entrana, search the southern drawer in the house with the cooking range."), From 70e0d6cc342621c4f8062a0cc1a70d33aad926e5 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sun, 7 Jul 2019 00:52:37 +0200 Subject: [PATCH 066/472] Refactor --- .../transformers/ScriptOpcodesTransformer.java | 2 +- runescape-client/src/main/java/Actor.java | 2 +- .../src/main/java/BoundaryObject.java | 4 ++-- runescape-client/src/main/java/Client.java | 10 +++++----- .../src/main/java/FriendSystem.java | 18 +++++++++--------- .../src/main/java/LoginScreenAnimation.java | 2 +- .../src/main/java/WorldMapAreaData.java | 3 ++- .../src/main/java/WorldMapCacheName.java | 3 ++- .../src/main/java/WorldMapIcon1.java | 3 ++- .../src/main/java/WorldMapSection2.java | 2 +- runescape-client/src/main/java/class206.java | 4 +++- runescape-client/src/main/java/class21.java | 10 +++++----- runescape-client/src/main/java/class22.java | 2 +- runescape-client/src/main/java/class234.java | 4 +++- runescape-client/src/main/java/class4.java | 10 +++++----- runescape-client/src/main/java/class54.java | 14 +++++++------- 16 files changed, 50 insertions(+), 43 deletions(-) diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ScriptOpcodesTransformer.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ScriptOpcodesTransformer.java index aa422f83bd..3c6bb67a7c 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ScriptOpcodesTransformer.java +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ScriptOpcodesTransformer.java @@ -61,7 +61,7 @@ public class ScriptOpcodesTransformer implements Transformer // robots in disgui ListIterator it = ins.getInstructions().listIterator(); Instruction i; - while(it.hasNext()) + while (it.hasNext()) { i = it.next(); diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index 8c6154c075..e720a2944f 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -1291,7 +1291,7 @@ public abstract class Actor extends Entity { if (var2 == 1005) { var13 = Huffman.getWidget(var1); if (var13 != null && var13.itemQuantities[var0] >= 100000) { - WorldMapIcon1.method219(27, "", var13.itemQuantities[var0] + " x " + Skills.getItemDefinition(var3).name); + WorldMapIcon1.addGameMessage(27, "", var13.itemQuantities[var0] + " x " + Skills.getItemDefinition(var3).name); } else { var9 = Interpreter.method1915(ClientPacket.field246, Client.packetWriter.isaacCipher); var9.packetBuffer.writeShortLE(var3); diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index f648c7a322..4d5e10af84 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -83,9 +83,9 @@ public final class BoundaryObject { ReflectionCheck.clientPreferences.roofsHidden = !ReflectionCheck.clientPreferences.roofsHidden; WorldMapSection0.savePreferences(); if (ReflectionCheck.clientPreferences.roofsHidden) { - WorldMapIcon1.method219(99, "", "Roofs are now all hidden"); + WorldMapIcon1.addGameMessage(99, "", "Roofs are now all hidden"); } else { - WorldMapIcon1.method219(99, "", "Roofs will only be removed selectively"); + WorldMapIcon1.addGameMessage(99, "", "Roofs will only be removed selectively"); } } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 1b4b6b2170..9410707adf 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -4967,7 +4967,7 @@ public final class Client extends GameShell implements Usernamed { String var41 = var3.readStringCp1252NullTerminated(); if (!var18) { - WorldMapIcon1.method219(var37, var17, var41); + WorldMapIcon1.addGameMessage(var37, var17, var41); } var1.serverPacket0 = null; @@ -5562,7 +5562,7 @@ public final class Client extends GameShell implements Usernamed { var3.method237(var54, 0, var54.length); Buffer var52 = new Buffer(var54); var17 = var52.readStringCp1252NullTerminated(); - WorldMapCacheName.method635(var17, true, false); + WorldMapCacheName.openURL(var17, true, false); var1.serverPacket0 = null; return true; } @@ -5793,9 +5793,9 @@ public final class Client extends GameShell implements Usernamed { } if (var29.modIcon != -1) { - WorldMapIcon1.method219(var34, ItemContainer.method1170(var29.modIcon) + var21, var57); + WorldMapIcon1.addGameMessage(var34, ItemContainer.method1170(var29.modIcon) + var21, var57); } else { - WorldMapIcon1.method219(var34, var21, var57); + WorldMapIcon1.addGameMessage(var34, var21, var57); } } @@ -5823,7 +5823,7 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field827 == var1.serverPacket0) { var21 = var3.readStringCp1252NullTerminated(); var4 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3))); - WorldMapIcon1.method219(6, var21, var4); + WorldMapIcon1.addGameMessage(6, var21, var4); var1.serverPacket0 = null; return true; } diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 010faa6967..df20c9fc66 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -80,11 +80,11 @@ public class FriendSystem { for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { if ((long)var1.time < class203.currentTimeMs() / 1000L - 5L) { if (var1.world > 0) { - WorldMapIcon1.method219(5, "", var1.username + " has logged in."); + WorldMapIcon1.addGameMessage(5, "", var1.username + " has logged in."); } if (var1.world == 0) { - WorldMapIcon1.method219(5, "", var1.username + " has logged out."); + WorldMapIcon1.addGameMessage(5, "", var1.username + " has logged out."); } var1.remove(); @@ -140,25 +140,25 @@ public class FriendSystem { if (this.canAddFriend()) { var3 = null; var4 = "Your friend list is full. Max of 200 for free users, and 400 for members"; - WorldMapIcon1.method219(30, "", var4); + WorldMapIcon1.addGameMessage(30, "", var4); } else if (Canvas.localPlayer.username.equals(var2)) { var3 = null; var4 = "You can't add yourself to your own friend list"; - WorldMapIcon1.method219(30, "", var4); + WorldMapIcon1.addGameMessage(30, "", var4); } else { Object var5; if (this.isFriended(var2, false)) { var3 = (new StringBuilder()).append(var1); var5 = null; var4 = var3.append(" is already on your friend list").toString(); - WorldMapIcon1.method219(30, "", var4); + WorldMapIcon1.addGameMessage(30, "", var4); } else if (this.isIgnored(var2)) { var3 = new StringBuilder(); var5 = null; var3 = var3.append("Please remove ").append(var1); var5 = null; var4 = var3.append(" from your ignore list first").toString(); - WorldMapIcon1.method219(30, "", var4); + WorldMapIcon1.addGameMessage(30, "", var4); } else { PacketBufferNode var6 = Interpreter.method1915(ClientPacket.field310, Client.packetWriter.isaacCipher); var6.packetBuffer.writeByte(WorldMapRegion.method550(var1)); @@ -196,11 +196,11 @@ public class FriendSystem { if (this.canAddIgnore()) { var3 = null; var4 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; - WorldMapIcon1.method219(30, "", var4); + WorldMapIcon1.addGameMessage(30, "", var4); } else if (Canvas.localPlayer.username.equals(var2)) { var3 = null; var4 = "You can't add yourself to your own ignore list"; - WorldMapIcon1.method219(30, "", var4); + WorldMapIcon1.addGameMessage(30, "", var4); } else if (this.isIgnored(var2)) { class22.method294(var1); } else { @@ -211,7 +211,7 @@ public class FriendSystem { var3 = var3.append("Please remove ").append(var1); var5 = null; var4 = var3.append(" from your friend list first").toString(); - WorldMapIcon1.method219(30, "", var4); + WorldMapIcon1.addGameMessage(30, "", var4); } else { var5 = Interpreter.method1915(ClientPacket.field312, Client.packetWriter.isaacCipher); var5.packetBuffer.writeByte(WorldMapRegion.method550(var1)); diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 6d73e2b166..5d8be7021f 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -587,7 +587,7 @@ public class LoginScreenAnimation { var19 = new String(var9.array, 0, var9.index); if (class83.method2026(var19)) { - WorldMapCacheName.method635(var19, true, false); + WorldMapCacheName.openURL(var19, true, false); return 2; } else { return 5; diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 64fff82dd1..9727a79f03 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -286,7 +286,8 @@ public class WorldMapAreaData extends WorldMapArea { signature = "(ZI)V", garbageValue = "-1746120861" ) - static void method705(boolean var0) { + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { Client.tapToDrop = var0; } } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 5f0a3c4402..207c70cdd6 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -80,7 +80,8 @@ public class WorldMapCacheName { signature = "(Ljava/lang/String;ZZI)V", garbageValue = "1532180466" ) - public static void method635(String var0, boolean var1, boolean var2) { + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { if (var1) { if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { try { diff --git a/runescape-client/src/main/java/WorldMapIcon1.java b/runescape-client/src/main/java/WorldMapIcon1.java index e4b4df12a8..b1fbbf21e1 100644 --- a/runescape-client/src/main/java/WorldMapIcon1.java +++ b/runescape-client/src/main/java/WorldMapIcon1.java @@ -110,7 +110,8 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { signature = "(ILjava/lang/String;Ljava/lang/String;I)V", garbageValue = "-460290173" ) - static void method219(int var0, String var1, String var2) { + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { GrandExchangeEvents.addChatMessage(var0, var1, var2, (String)null); } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 7be549d5f2..077d62036f 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -307,7 +307,7 @@ public class WorldMapSection2 implements WorldMapSection { } if (!var4) { - WorldMapIcon1.method219(4, "", "Unable to find " + var1); + WorldMapIcon1.addGameMessage(4, "", "Unable to find " + var1); } } diff --git a/runescape-client/src/main/java/class206.java b/runescape-client/src/main/java/class206.java index 05ab4835f3..b30272a9cb 100644 --- a/runescape-client/src/main/java/class206.java +++ b/runescape-client/src/main/java/class206.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,7 +9,8 @@ public class class206 { signature = "(I)Z", garbageValue = "-1763054678" ) - static boolean method4028() { + @Export("getTapToDrop") + static boolean getTapToDrop() { return Client.tapToDrop; } } diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java index 94984cac3c..41f00afe5f 100644 --- a/runescape-client/src/main/java/class21.java +++ b/runescape-client/src/main/java/class21.java @@ -327,9 +327,9 @@ public abstract class class21 { var3.overheadText = var0.readStringCp1252NullTerminated(); if (var3.overheadText.charAt(0) == '~') { var3.overheadText = var3.overheadText.substring(1); - WorldMapIcon1.method219(2, var3.username.getName(), var3.overheadText); + WorldMapIcon1.addGameMessage(2, var3.username.getName(), var3.overheadText); } else if (var3 == Canvas.localPlayer) { - WorldMapIcon1.method219(2, var3.username.getName(), var3.overheadText); + WorldMapIcon1.addGameMessage(2, var3.username.getName(), var3.overheadText); } var3.isAutoChatting = false; @@ -396,9 +396,9 @@ public abstract class class21 { } if (var17.modIcon != -1) { - WorldMapIcon1.method219(var10, ItemContainer.method1170(var17.modIcon) + var3.username.getName(), var14); + WorldMapIcon1.addGameMessage(var10, ItemContainer.method1170(var17.modIcon) + var3.username.getName(), var14); } else { - WorldMapIcon1.method219(var10, var3.username.getName(), var14); + WorldMapIcon1.addGameMessage(var10, var3.username.getName(), var14); } } } @@ -419,7 +419,7 @@ public abstract class class21 { } var7 = var0.readUnsignedByte(); - class234.method4534(var3, var6, var7); + class234.performPlayerAnimation(var3, var6, var7); } if (var3.field725) { diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java index ca51d2e204..d721431b4d 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/class22.java @@ -73,7 +73,7 @@ public final class class22 { StringBuilder var1 = (new StringBuilder()).append(var0); Object var2 = null; String var3 = var1.append(" is already on your ignore list").toString(); - WorldMapIcon1.method219(30, "", var3); + WorldMapIcon1.addGameMessage(30, "", var3); } @ObfuscatedName("fw") diff --git a/runescape-client/src/main/java/class234.java b/runescape-client/src/main/java/class234.java index 2a129de9d2..d065094361 100644 --- a/runescape-client/src/main/java/class234.java +++ b/runescape-client/src/main/java/class234.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,7 +9,8 @@ public class class234 { signature = "(Lbr;III)V", garbageValue = "-701527010" ) - static void method4534(Player var0, int var1, int var2) { + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { if (var0.sequence == var1 && var1 != -1) { int var3 = WorldMapAreaData.getSequenceDefinition(var1).field783; if (var3 == 1) { diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 11a1a4bf22..7543a42e7a 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -64,11 +64,11 @@ final class class4 implements class0 { String var3; if (var0 == ScriptOpcodes.MES) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - WorldMapIcon1.method219(0, "", var3); + WorldMapIcon1.addGameMessage(0, "", var3); return 1; } else if (var0 == ScriptOpcodes.ANIM) { RouteStrategy.Interpreter_intStackSize -= 2; - class234.method4534(Canvas.localPlayer, Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); + class234.performPlayerAnimation(Canvas.localPlayer, Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); return 1; } else if (var0 == ScriptOpcodes.IF_CLOSE) { if (!Interpreter.field424) { @@ -142,7 +142,7 @@ final class class4 implements class0 { if (var0 == ScriptOpcodes.OPENURL) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - WorldMapCacheName.method635(var3, var8, false); + WorldMapCacheName.openURL(var3, var8, false); return 1; } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; @@ -219,10 +219,10 @@ final class class4 implements class0 { Client.showLoadingMessages = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else if (var0 == ScriptOpcodes.SETTAPTODROP) { - WorldMapAreaData.method705(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1); + WorldMapAreaData.setTapToDrop(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1); return 1; } else if (var0 == ScriptOpcodes.GETTAPTODROP) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class206.method4028() ? 1 : 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class206.getTapToDrop() ? 1 : 0; return 1; } else if (var0 == 3129) { RouteStrategy.Interpreter_intStackSize -= 2; diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java index c295c9c36d..f0e810fb17 100644 --- a/runescape-client/src/main/java/class54.java +++ b/runescape-client/src/main/java/class54.java @@ -115,7 +115,7 @@ public final class class54 { var18 = Varps.loginBoxCenter - 80; var19 = 291; if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) { - WorldMapCacheName.method635(Message.method1227("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); + WorldMapCacheName.openURL(Message.method1227("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); } var18 = Varps.loginBoxCenter + 80; @@ -182,7 +182,7 @@ public final class class54 { Login.loginIndex = 5; return; case 2: - WorldMapCacheName.method635("https://support.runescape.com/hc/en-gb", true, false); + WorldMapCacheName.openURL("https://support.runescape.com/hc/en-gb", true, false); } } } @@ -348,7 +348,7 @@ public final class class54 { } if (var1 == 1 && var2 >= Login.loginBoxX + 180 - 34 && var2 <= Login.loginBoxX + 34 + 180 && var17 >= 351 && var17 <= 363) { - WorldMapCacheName.method635(Message.method1227("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); + WorldMapCacheName.openURL(Message.method1227("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); } var20 = Login.loginBoxX + 180 + 80; @@ -418,7 +418,7 @@ public final class class54 { if (UrlRequester.field930 != null) { var13 = UrlRequester.field930.field43 / 2; if (var1 == 1 && var2 >= UrlRequester.field930.field41 - var13 && var2 <= var13 + UrlRequester.field930.field41 && var17 >= var19 - 15 && var17 < var19) { - WorldMapCacheName.method635(Message.method1227("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); + WorldMapCacheName.openURL(Message.method1227("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); } } @@ -471,7 +471,7 @@ public final class class54 { var20 = Login.loginBoxX + 180 - 80; var9 = 321; if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { - WorldMapCacheName.method635(Message.method1227("secure", true) + "m=dob/set_dob.ws", true, false); + WorldMapCacheName.openURL(Message.method1227("secure", true) + "m=dob/set_dob.ws", true, false); method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)"); Login.loginIndex = 6; return; @@ -485,7 +485,7 @@ public final class class54 { var20 = Login.loginBoxX + 180 - 80; var9 = 321; if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { - WorldMapCacheName.method635("https://www.jagex.com/terms/privacy/#eight", true, false); + WorldMapCacheName.openURL("https://www.jagex.com/terms/privacy/#eight", true, false); method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)"); Login.loginIndex = 6; return; @@ -511,7 +511,7 @@ public final class class54 { var18 = Login.loginBoxX + 180; var19 = 276; if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) { - WorldMapCacheName.method635(var21, true, false); + WorldMapCacheName.openURL(var21, true, false); method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)"); Login.loginIndex = 6; return; From 2c2f0626a73b4a17117735834e9558b700d94b45 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:02:22 +0200 Subject: [PATCH 067/472] achievementdiary: remove redundent null check --- .../plugins/achievementdiary/DiaryRequirementsPlugin.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java index bc67f82a8c..341e17a7aa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java @@ -124,10 +124,6 @@ public class DiaryRequirementsPlugin extends Plugin } Map skillRequirements = buildRequirements(requirements.getRequirements()); - if (skillRequirements == null) - { - return; - } int offset = 0; String taskBuffer = ""; From 5a0df39b4d99b9e234a4088f86c23f761597c8cf Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:04:53 +0200 Subject: [PATCH 068/472] Antidrag: combine nested if statements --- .../runelite/client/plugins/antidrag/AntiDragPlugin.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java index 3a1eddfd4c..9c625977a2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java @@ -160,13 +160,10 @@ public class AntiDragPlugin extends Plugin @Subscribe public void onFocusChanged(FocusChanged focusChanged) { - if (!this.alwaysOn) + if (!this.alwaysOn && !focusChanged.isFocused() && this.reqfocus) { - if (!focusChanged.isFocused() && this.reqfocus) - { - client.setInventoryDragDelay(DEFAULT_DELAY); - overlayManager.remove(overlay); - } + client.setInventoryDragDelay(DEFAULT_DELAY); + overlayManager.remove(overlay); } } From d2d8992d82d9885e35b4f4caf7002547cd279588 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:05:44 +0200 Subject: [PATCH 069/472] aoewarnings: Combine nested if statements --- .../client/plugins/aoewarnings/AoeWarningOverlay.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java index d70d63c4be..0b82eafdb4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java @@ -157,14 +157,12 @@ public class AoeWarningOverlay extends Overlay graphics.setColor(new Color(setAlphaComponent(plugin.getOverlayColor().getRGB(), outlineAlpha), true)); graphics.drawPolygon(tilePoly); } - if (plugin.isTickTimers()) + if (plugin.isTickTimers() && tickProgress >= 0) { - if (tickProgress >= 0) - { - OverlayUtil.renderTextLocation(graphics, Integer.toString(tickProgress), plugin.getTextSize(), - plugin.getFontStyle(), color, centerPoint(tilePoly.getBounds()), plugin.isShadows(), 0); - } + OverlayUtil.renderTextLocation(graphics, Integer.toString(tickProgress), plugin.getTextSize(), + plugin.getFontStyle(), color, centerPoint(tilePoly.getBounds()), plugin.isShadows(), 0); } + graphics.setColor(new Color(setAlphaComponent(plugin.getOverlayColor().getRGB(), fillAlpha), true)); graphics.fillPolygon(tilePoly); } From 8f070f4da7425fa42fbaebdf618e69c5f6652f63 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:07:11 +0200 Subject: [PATCH 070/472] attackstyles: comment out empty if statement --- .../client/plugins/attackstyles/AttackStylesPlugin.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java index 776cc3cd72..a8465962e0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java @@ -320,10 +320,10 @@ public class AttackStylesPlugin extends Plugin { if (warnedSkills.contains(skill)) { - if (weaponSwitch) - { - // TODO : chat message to warn players that their weapon switch also caused an unwanted attack style change - } +// if (weaponSwitch) +// { +// // TODO : chat message to warn players that their weapon switch also caused an unwanted attack style change +// } warnedSkillSelected = true; break; } From f635532b0c567982338b7416ae09465f37eb7a64 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:08:28 +0200 Subject: [PATCH 071/472] banktags: Combine nested if statements --- .../client/plugins/banktags/tabs/TabInterface.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java index d2f7a4af52..da89b7077e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java @@ -669,15 +669,11 @@ public class TabInterface updateTabIfActive(Lists.newArrayList(Text.standardize(draggedOn.getName()))); } } - else if (parent.getId() == draggedOn.getId() && parent.getId() == draggedWidget.getId()) + else if (parent.getId() == draggedOn.getId() && parent.getId() == draggedWidget.getId() && !Strings.isNullOrEmpty(draggedOn.getName())) { - // Reorder tag tabs - if (!Strings.isNullOrEmpty(draggedOn.getName())) - { - tabManager.move(draggedWidget.getName(), draggedOn.getName()); - tabManager.save(); - updateTabs(); - } + tabManager.move(draggedWidget.getName(), draggedOn.getName()); + tabManager.save(); + updateTabs(); } } else if (draggedWidget.getItemId() > 0) From 6375a8c2df8096b62e89a3278cb6c84cf9345c48 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:11:18 +0200 Subject: [PATCH 072/472] banlistplugin: Char is faster than string --- .../net/runelite/client/plugins/banlist/BanListPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java index c382e703b7..4fb399d994 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java @@ -382,8 +382,8 @@ public class BanListPlugin extends Plugin { if (x.contains("title")) { - x = x.substring(x.indexOf("title"), x.indexOf(">")); - x = x.substring(x.indexOf("=") + 2, x.length() - 1); + x = x.substring(x.indexOf("title"), x.indexOf('>')); + x = x.substring(x.indexOf('=') + 2, x.length() - 1); runeWatchArrayList.add(Text.standardize(x)); } } From d2a90b73031877d422101088302e348205022bc4 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:12:57 +0200 Subject: [PATCH 073/472] banlistplugin: Interface instead of type --- .../runelite/client/plugins/banlist/BanListPlugin.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java index 4fb399d994..3af9ea13fd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java @@ -30,6 +30,7 @@ import com.google.inject.Provides; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; @@ -84,10 +85,10 @@ public class BanListPlugin extends Plugin @Inject private ChatMessageManager chatMessageManager; - private ArrayList wdrScamArrayList = new ArrayList<>(); - private ArrayList wdrToxicArrayList = new ArrayList<>(); - private ArrayList runeWatchArrayList = new ArrayList<>(); - private ArrayList manualBans = new ArrayList<>(); + private List wdrScamArrayList = new ArrayList<>(); + private List wdrToxicArrayList = new ArrayList<>(); + private List runeWatchArrayList = new ArrayList<>(); + private List manualBans = new ArrayList<>(); @Provides BanListConfig getConfig(ConfigManager configManager) From b5cbb48575f544522901d2655ce9f3f47f414e58 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:14:42 +0200 Subject: [PATCH 074/472] banlistplugin: combine nested if statements --- .../client/plugins/banlist/BanListPlugin.java | 70 +++++++------------ 1 file changed, 26 insertions(+), 44 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java index 3af9ea13fd..916bf5f080 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java @@ -122,16 +122,13 @@ public class BanListPlugin extends Plugin @Subscribe public void onConfigChanged(ConfigChanged event) { - if (event.getGroup().equals("banlist")) + if (event.getGroup().equals("banlist")&& event.getKey().equals("bannedPlayers")) { - if (event.getKey().equals("bannedPlayers")) + for (String manual : Text.fromCSV(config.getBannedPlayers())) { - for (String manual : Text.fromCSV(config.getBannedPlayers())) + if (!manualBans.contains(manual)) { - if (!manualBans.contains(manual)) - { - manualBans.add(Text.standardize(manual)); - } + manualBans.add(Text.standardize(manual)); } } } @@ -202,24 +199,21 @@ public class BanListPlugin extends Plugin @Subscribe public void onWidgetLoaded(WidgetLoaded widgetLoaded) { - if (this.highlightInTrade) - { - if (widgetLoaded.getGroupId() == 335) - { //if trading window was loaded - clientThread.invokeLater(() -> + if (this.highlightInTrade && widgetLoaded.getGroupId() == 335) + { //if trading window was loaded + clientThread.invokeLater(() -> + { + Widget tradingWith = client.getWidget(335, 31); + String name = tradingWith.getText().replaceAll("Trading With: ", ""); + if (checkScamList(name) != null) { - Widget tradingWith = client.getWidget(335, 31); - String name = tradingWith.getText().replaceAll("Trading With: ", ""); - if (checkScamList(name) != null) - { - tradingWith.setText(tradingWith.getText().replaceAll(name, "" + name + " (Scammer)" + "")); - } - if (checkToxicList(name) != null) - { - tradingWith.setText(tradingWith.getText().replaceAll(name, "" + name + " (Toxic)" + "")); - } - }); - } + tradingWith.setText(tradingWith.getText().replaceAll(name, "" + name + " (Scammer)" + "")); + } + if (checkToxicList(name) != null) + { + tradingWith.setText(tradingWith.getText().replaceAll(name, "" + name + " (Toxic)" + "")); + } + }); } } @@ -228,28 +222,19 @@ public class BanListPlugin extends Plugin */ private ListType checkScamList(String nameToBeChecked) { - if (wdrScamArrayList.size() > 0 && this.enableWDR) + if (wdrScamArrayList.size() > 0 && this.enableWDR && wdrScamArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) { - if (wdrScamArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) - { - return ListType.WEDORAIDSSCAM_LIST; - } + return ListType.WEDORAIDSSCAM_LIST; } - if (runeWatchArrayList.size() > 0 && this.enableRuneWatch) + if (runeWatchArrayList.size() > 0 && this.enableRuneWatch && runeWatchArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) { - if (runeWatchArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) - { - return ListType.RUNEWATCH_LIST; - } + return ListType.RUNEWATCH_LIST; } - if (manualBans.size() > 0) + if (manualBans.size() > 0 && manualBans.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) { - if (manualBans.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) - { - return ListType.MANUAL_LIST; - } + return ListType.MANUAL_LIST; } return null; @@ -258,12 +243,9 @@ public class BanListPlugin extends Plugin private ListType checkToxicList(String nameToBeChecked) { - if (wdrToxicArrayList.size() > 0 && this.enableWDR) + if (wdrToxicArrayList.size() > 0 && this.enableWDR && wdrToxicArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) { - if (wdrToxicArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) - { - return ListType.WEDORAIDSTOXIC_LIST; - } + return ListType.WEDORAIDSTOXIC_LIST; } return null; From b880a9bb40e5c5562dc91effc7ebe7447ebce4e0 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:16:43 +0200 Subject: [PATCH 075/472] barbarianassault: equalsIgnoreCase --- .../client/plugins/barbarianassault/BarbarianAssaultMenu.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java index 10e56c8ac8..f72861e03b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java @@ -58,7 +58,7 @@ class BarbarianAssaultMenu private boolean isHornOptionHidden(String option) { - if (game.isInGame() && game.getRole() != null && game.getRole().getTell(game.getLastCallText()).toLowerCase().equals(option)) + if (game.isInGame() && game.getRole() != null && game.getRole().getTell(game.getLastCallText()).equalsIgnoreCase(option)) { // This will force the menu to be rebuilt after the correct tell is found // medic will be added to the menu if it wasn't there before From 4203905cceb91a491224a35fc9e2b4bf42845f06 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:18:30 +0200 Subject: [PATCH 076/472] barbarianassault: Combine nested if statements --- .../BarbarianAssaultPlugin.java | 35 ++++++------------- .../plugins/barbarianassault/Scorecard.java | 9 ++--- 2 files changed, 14 insertions(+), 30 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java index 241ea3bb0b..4f8d29fe87 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java @@ -29,7 +29,6 @@ package net.runelite.client.plugins.barbarianassault; import com.google.common.collect.ImmutableList; import com.google.inject.Provides; - import java.awt.Color; import java.awt.Font; import java.awt.event.KeyEvent; @@ -42,12 +41,10 @@ import java.util.List; import java.util.Map; import java.util.Objects; import javax.inject.Inject; - import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; - import net.runelite.api.Actor; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; @@ -760,12 +757,9 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener String name = event.getNpc().getName(); - if (name.equals("Penance Healer")) + if (name.equals("Penance Healer") && !healers.containsKey(npc.getIndex())) { - if (!healers.containsKey(npc.getIndex())) - { - healers.put(npc.getIndex(), new Healer(npc, healers.size(), stage)); - } + healers.put(npc.getIndex(), new Healer(npc, healers.size(), stage)); } } @@ -1160,16 +1154,12 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener String target = Text.removeTags(event.getTarget()).toLowerCase(); - if (getRole() == Role.HEALER) + if (getRole() == Role.HEALER && (target.startsWith("poisoned meat -> penance healer") + || target.startsWith("poisoned tofu -> penance healer") + || target.startsWith("poisoned worms -> penance healer"))) { - if (target.startsWith("poisoned meat -> penance healer") - || target.startsWith("poisoned tofu -> penance healer") - || target.startsWith("poisoned worms -> penance healer")) - { - lastHealerPoisoned = event.getIdentifier(); - poisonUsed = StringUtils.substringBefore(target.replace("oned", "."), " ->"); - return; - } + lastHealerPoisoned = event.getIdentifier(); + poisonUsed = StringUtils.substringBefore(target.replace("oned", "."), " ->"); } // INW @@ -1206,14 +1196,11 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener if (opponent == null) { - if (lastInteracted != -1) + if (lastInteracted != -1 && StringUtils.equalsIgnoreCase(poisonUsed, getRole().getListen(client)) && healers.containsKey(lastInteracted)) { - if (StringUtils.equalsIgnoreCase(poisonUsed, getRole().getListen(client)) && healers.containsKey(lastInteracted)) - { - Healer healer = healers.get(lastInteracted); - healer.setFoodRemaining(healer.getFoodRemaining() - 1); - healer.setTimeLastPoisoned(Instant.now()); - } + Healer healer = healers.get(lastInteracted); + healer.setFoodRemaining(healer.getFoodRemaining() - 1); + healer.setTimeLastPoisoned(Instant.now()); } lastInteracted = -1; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java index 2e2f6635e1..997493e694 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java @@ -67,13 +67,10 @@ public class Scorecard @Subscribe public void onChatMessage(ChatMessage chatMessage) { - if (chatMessage.getMessage().startsWith("---- Points:")) + if (chatMessage.getMessage().startsWith("---- Points:") && game.getStage() == 1) { - if (game.getStage() == 1) - { - totalPoints = new int[6]; - totalAmounts = new int[6]; - } + totalPoints = new int[6]; + totalAmounts = new int[6]; } } From d4ffdb7fa2e15e3ab5f21bea302192ea70adf43f Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:20:26 +0200 Subject: [PATCH 077/472] barbarianassault: Interface instead of type --- .../barbarianassault/BarbarianAssaultMenu.java | 3 ++- .../BarbarianAssaultPlugin.java | 18 +++++++++--------- .../plugins/barbarianassault/Scorecard.java | 3 ++- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java index f72861e03b..733f89c249 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.barbarianassault; import com.google.common.collect.Sets; +import java.util.List; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; @@ -41,7 +42,7 @@ class BarbarianAssaultMenu { private final MenuManager menuManager; private final BarbarianAssaultPlugin game; - private final ArrayList tracker = new ArrayList<>(); + private final List tracker = new ArrayList<>(); @Getter(AccessLevel.PACKAGE) @Setter(AccessLevel.PACKAGE) private boolean hornUpdated = false; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java index 4f8d29fe87..c4aedc1cbb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java @@ -183,16 +183,16 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener private Font font = null; @Getter - private final HashMap redEggs = new HashMap<>(); + private final Map redEggs = new HashMap<>(); @Getter - private final HashMap greenEggs = new HashMap<>(); + private final Map greenEggs = new HashMap<>(); @Getter - private final HashMap blueEggs = new HashMap<>(); + private final Map blueEggs = new HashMap<>(); @Getter - private final HashMap yellowEggs = new HashMap<>(); + private final Map yellowEggs = new HashMap<>(); @Getter private final Map healers = new HashMap<>(); @@ -234,9 +234,9 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener private BufferedImage torsoImage, fighterImage, healerImage, rangerImage, runnerImage; - private ArrayList deathTimes = new ArrayList<>(); + private List deathTimes = new ArrayList<>(); - private HashMap projectiles = new HashMap<>(); + private Map projectiles = new HashMap<>(); private TimerBox tickCounter; @@ -645,7 +645,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener return; } - HashMap eggMap = getEggMap(itemSpawned.getItem().getId()); + Map eggMap = getEggMap(itemSpawned.getItem().getId()); if (eggMap != null) { WorldPoint worldPoint = itemSpawned.getTile().getWorldLocation(); @@ -674,7 +674,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener // If an egg despawns due to time and the collector is standing over it, // a point will added as if the player picked it up - HashMap eggMap = getEggMap(itemId); + Map eggMap = getEggMap(itemId); if (eggMap != null) { WorldPoint worldPoint = itemDespawned.getTile().getWorldLocation(); @@ -1590,7 +1590,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener yellowEggs.clear(); } - private HashMap getEggMap(int itemID) + private Map getEggMap(int itemID) { switch (itemID) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java index 997493e694..df5b7423b4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java @@ -28,6 +28,7 @@ package net.runelite.client.plugins.barbarianassault; import java.awt.Color; import java.util.ArrayList; +import java.util.List; import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.events.ChatMessage; @@ -41,7 +42,7 @@ public class Scorecard private BarbarianAssaultPlugin game; @Getter(AccessLevel.NONE) - private ArrayList waves = new ArrayList<>(); + private List waves = new ArrayList<>(); private String[] totalDescriptions = { "A: ", "; D: ", From 9c78ac1eacfa5b770e617f87ca45e04f47fc6da5 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:22:39 +0200 Subject: [PATCH 078/472] barbarianassault: Remove usused fields --- .../barbarianassault/BarbarianAssaultPlugin.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java index c4aedc1cbb..e041e98356 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java @@ -203,7 +203,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener @Getter private String lastListenText = null; - private String lastClickedTell = null; + // private String lastClickedTell = null; private int lastCallColor = -1; @@ -213,7 +213,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener private int tickNum = 0; - private int gameTick = -1; + // private int gameTick = -1; private int inGameBit = 0; @@ -338,7 +338,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener controlDown = false; resetWave(); wave = null; - gameTick = client.getTickCount(); + // gameTick = client.getTickCount(); menu.disableSwaps(true); menu.clearHiddenMenus(); } @@ -1250,7 +1250,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener lastListenText = null; lastCallText = null; lastCallColor = -1; - lastClickedTell = null; + // lastClickedTell = null; } else { @@ -1372,12 +1372,12 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener if (newCallColor == COLOR_CALL_CALLED) { lastCallColor = COLOR_CALL_CALLED; - lastClickedTell = lastCallText; + // lastClickedTell = lastCallText; } else if (callTimer == null) { lastCallColor = COLOR_CALL_UPDATED; - lastClickedTell = null; + // lastClickedTell = null; } if (callWidget != null) From 6bd5fe0fe4865d5d380640faf8a736a6f34d4e57 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:25:03 +0200 Subject: [PATCH 079/472] barrows: Compare objects using equals --- .../net/runelite/client/plugins/barrows/BarrowsOverlay.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java index 12b3494af7..673a5d77c1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java @@ -97,7 +97,7 @@ class BarrowsOverlay extends Overlay final List players = client.getPlayers(); for (Player player : players) { - if (player == local) + if (player.equals(local)) { // Skip local player as we draw square for it later continue; From 6a35e214c2e074a48047c0dfabf9da6102231482 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:25:26 +0200 Subject: [PATCH 080/472] barrows: Combine nested if statements --- .../client/plugins/barrows/BarrowsPlugin.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java index a3bbf6461f..6b5b484f0f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java @@ -289,19 +289,16 @@ public class BarrowsPlugin extends Plugin ladders.clear(); puzzleAnswer = null; } - else if (event.getGameState() == GameState.LOGGED_IN) + else if (event.getGameState() == GameState.LOGGED_IN && client.getLocalPlayer() != null) { - if (client.getLocalPlayer() != null) + boolean isInCrypt = isInCrypt(); + if (wasInCrypt && !isInCrypt) { - boolean isInCrypt = isInCrypt(); - if (wasInCrypt && !isInCrypt) - { - stopPrayerDrainTimer(); - } - else if (!wasInCrypt && isInCrypt) - { - startPrayerDrainTimer(); - } + stopPrayerDrainTimer(); + } + else if (!wasInCrypt && isInCrypt) + { + startPrayerDrainTimer(); } } } From 6c04132d7413301f7bc808f49681c5a73b92ad63 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:26:19 +0200 Subject: [PATCH 081/472] blackjackplugin: Combine nested if statements --- .../runelite/client/plugins/blackjack/BlackjackPlugin.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java index d23a8c238c..f31100e59e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java @@ -117,12 +117,9 @@ public class BlackjackPlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (event.getType() == ChatMessageType.SPAM) + if (event.getType() == ChatMessageType.SPAM && event.getMessage().equals(SUCCESS_BLACKJACK) ^ (event.getMessage().equals(FAILED_BLACKJACK) && this.pickpocketOnAggro)) { - if (event.getMessage().equals(SUCCESS_BLACKJACK) ^ (event.getMessage().equals(FAILED_BLACKJACK) && this.pickpocketOnAggro)) - { - nextKnockOutTick = client.getTickCount() + RandomUtils.nextInt(3, 4); - } + nextKnockOutTick = client.getTickCount() + RandomUtils.nextInt(3, 4); } } } From aceaf810600bb9bb68348dd24c02cce1bd3ae4ed Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:31:46 +0200 Subject: [PATCH 082/472] cannonplugin: Combine nested if statements --- .../client/plugins/cannon/CannonPlugin.java | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java index dd229ef8c6..2c6c68ecb3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java @@ -229,14 +229,12 @@ public class CannonPlugin extends Plugin GameObject gameObject = event.getGameObject(); Player localPlayer = client.getLocalPlayer(); - if (gameObject.getId() == CANNON_BASE && !cannonPlaced) + if (gameObject.getId() == CANNON_BASE && !cannonPlaced && + localPlayer.getWorldLocation().distanceTo(gameObject.getWorldLocation()) <= 2 && + localPlayer.getAnimation() == AnimationID.BURYING_BONES) { - if (localPlayer.getWorldLocation().distanceTo(gameObject.getWorldLocation()) <= 2 - && localPlayer.getAnimation() == AnimationID.BURYING_BONES) - { - cannonPosition = gameObject.getWorldLocation(); - cannon = gameObject; - } + cannonPosition = gameObject.getWorldLocation(); + cannon = gameObject; } } @@ -250,17 +248,15 @@ public class CannonPlugin extends Plugin WorldPoint projectileLoc = WorldPoint.fromLocal(client, projectile.getX1(), projectile.getY1(), client.getPlane()); //Check to see if projectile x,y is 0 else it will continuously decrease while ball is flying. - if (projectileLoc.equals(cannonPosition) && projectile.getX() == 0 && projectile.getY() == 0) - { + if (projectileLoc.equals(cannonPosition) && projectile.getX() == 0 && projectile.getY() == 0 && // When there's a chat message about cannon reloaded/unloaded/out of ammo, // the message event runs before the projectile event. However they run // in the opposite order on the server. So if both fires in the same tick, // we don't want to update the cannonball counter if it was set to a specific // amount. - if (!skipProjectileCheckThisTick) - { - cballsLeft--; - } + !skipProjectileCheckThisTick) + { + cballsLeft--; } } } @@ -366,13 +362,10 @@ public class CannonPlugin extends Plugin { return Color.orange; } - else if (cballsLeft <= this.ammoAmount) + else if (cballsLeft <= this.ammoAmount && this.notifyAmmoLeft && !lock) { - if (this.notifyAmmoLeft && !lock) - { - notifier.notify("Your cannon has " + this.ammoAmount + " balls left!"); - lock = true; - } + notifier.notify("Your cannon has " + this.ammoAmount + " balls left!"); + lock = true; } return Color.red; From dea0d19d920b50f954c796056e8e371858f64380 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:32:55 +0200 Subject: [PATCH 083/472] chatcommandsplugin: equalsIgnoreCase --- .../client/plugins/chatcommands/ChatCommandsPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java index fcac5d54b1..13f3c02b1b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java @@ -1166,7 +1166,7 @@ public class ChatCommandsPlugin extends Plugin ItemPrice shortest = null; for (ItemPrice item : items) { - if (item.getName().toLowerCase().equals(originalInput.toLowerCase())) + if (item.getName().equalsIgnoreCase(originalInput.toLowerCase())) { return item; } From 3b801ce0b08f37634197ffcf57be857c6461dcfb Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:36:53 +0200 Subject: [PATCH 084/472] chatcommandsplugin: use logger --- .../client/plugins/chatcommands/ChatCommandsPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java index 13f3c02b1b..30bcaeb72f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java @@ -818,7 +818,7 @@ public class ChatCommandsPlugin extends Plugin } catch (IOException e) { - e.printStackTrace(); + log.error(e.toString()); } int itemId = item.getId(); From 01bf7d7c4e155fa012f8da876c25dd7376481e61 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:38:02 +0200 Subject: [PATCH 085/472] chathistoryplugin: combine nested if statements --- .../client/plugins/chathistory/ChatHistoryPlugin.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java index 86586dedf5..6b63e2c1d2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java @@ -143,13 +143,11 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener case MODPRIVATECHAT: final String name = Text.removeTags(chatMessage.getName()); // Remove to ensure uniqueness & its place in history - if (!friends.remove(name)) - { + if (!friends.remove(name) && // If the friend didn't previously exist ensure deque capacity doesn't increase by adding them - if (friends.size() >= FRIENDS_MAX_SIZE) - { - friends.remove(); - } + friends.size() >= FRIENDS_MAX_SIZE) + { + friends.remove(); } friends.add(name); // intentional fall-through From 0a0bdce375ecb697f29ea1bc0a8ae307b68e8e2b Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:39:35 +0200 Subject: [PATCH 086/472] chattranslationplugin: Combine nested if statemnets --- .../ChatTranslationPlugin.java | 91 +++++++++---------- 1 file changed, 43 insertions(+), 48 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java index 3760f5b036..d1ed549c87 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java @@ -3,8 +3,17 @@ package net.runelite.client.plugins.chattranslation; import com.google.common.collect.ImmutableList; import com.google.common.collect.ObjectArrays; import com.google.inject.Provides; +import java.awt.event.KeyEvent; +import java.util.ArrayList; +import javax.inject.Inject; +import javax.inject.Provider; import javax.inject.Singleton; -import net.runelite.api.*; +import net.runelite.api.Client; +import net.runelite.api.GameState; +import net.runelite.api.MenuAction; +import net.runelite.api.MenuEntry; +import net.runelite.api.MessageNode; +import net.runelite.api.VarClientStr; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.MenuEntryAdded; @@ -24,11 +33,6 @@ import net.runelite.client.plugins.PluginType; import net.runelite.client.util.Text; import org.apache.commons.lang3.ArrayUtils; -import javax.inject.Inject; -import javax.inject.Provider; -import java.awt.event.KeyEvent; -import java.util.ArrayList; - @PluginDescriptor( name = "Chat Translator", description = "Translates messages from one Language to another.", @@ -84,12 +88,9 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener { updateConfig(); - if (client != null) + if (client != null && this.translateOptionVisable) { - if (this.translateOptionVisable) - { - menuManager.get().addPlayerMenuItem(TRANSLATE); - } + menuManager.get().addPlayerMenuItem(TRANSLATE); } keyManager.registerKeyListener(this); @@ -99,12 +100,9 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener @Override protected void shutDown() throws Exception { - if (client != null) + if (client != null && this.translateOptionVisable) { - if (this.translateOptionVisable) - { - menuManager.get().removePlayerMenuItem(TRANSLATE); - } + menuManager.get().removePlayerMenuItem(TRANSLATE); } keyManager.unregisterKeyListener(this); @@ -246,47 +244,44 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener Widget chatboxParent = client.getWidget(WidgetInfo.CHATBOX_PARENT); - if (chatboxParent != null && chatboxParent.getOnKeyListener() != null) + if (chatboxParent != null && chatboxParent.getOnKeyListener() != null && event.getKeyCode() == 0xA) { - if (event.getKeyCode() == 0xA) + Translator translator = new Translator(); + String message = client.getVar(VarClientStr.CHATBOX_TYPED_TEXT); + + if (message.startsWith("/")) { - Translator translator = new Translator(); - String message = client.getVar(VarClientStr.CHATBOX_TYPED_TEXT); - - if (message.startsWith("/")) - { - try - { - client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, translator.translate("auto", config.playerTargetLanguage().toString(), message)); - } - catch (Exception e) - { - e.printStackTrace(); - } - return; - } - - event.consume(); - try { - //Automatically check language of message and translate to selected language. - String translation = translator.translate("auto", this.playerTargetLanguage.toString(), message); - if (translation != null) - { - client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, translation); - - clientThread.invoke(() -> - { - client.runScript(96, 0, translation); - }); - } - client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, ""); + client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, translator.translate("auto", config.playerTargetLanguage().toString(), message)); } catch (Exception e) { e.printStackTrace(); } + return; + } + + event.consume(); + + try + { + //Automatically check language of message and translate to selected language. + String translation = translator.translate("auto", this.playerTargetLanguage.toString(), message); + if (translation != null) + { + client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, translation); + + clientThread.invoke(() -> + { + client.runScript(96, 0, translation); + }); + } + client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, ""); + } + catch (Exception e) + { + e.printStackTrace(); } } } From ec6874fb5864423ccacca292f398a1d5ff49ab4b Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:40:19 +0200 Subject: [PATCH 087/472] chattranslationplugin: Use interface instead of type --- .../client/plugins/chattranslation/ChatTranslationPlugin.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java index d1ed549c87..1b4675341d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java @@ -5,6 +5,7 @@ import com.google.common.collect.ObjectArrays; import com.google.inject.Provides; import java.awt.event.KeyEvent; import java.util.ArrayList; +import java.util.List; import javax.inject.Inject; import javax.inject.Provider; import javax.inject.Singleton; @@ -47,7 +48,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener private static final ImmutableList AFTER_OPTIONS = ImmutableList.of("Message", "Add ignore", "Remove friend", "Kick"); - private ArrayList playerNames = new ArrayList<>(); + private List playerNames = new ArrayList<>(); @Inject private Client client; From e62df63099baf7b42b84110ea899edfe975c1b0e Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:41:38 +0200 Subject: [PATCH 088/472] chattranslationplugin: Remove unused variable --- .../client/plugins/chattranslation/ChatTranslationPlugin.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java index 1b4675341d..771fdfe29d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java @@ -142,8 +142,6 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener if (groupId == WidgetInfo.CHATBOX.getGroupId()) { - boolean after; - if (!AFTER_OPTIONS.contains(option)) { return; From b606644e8feaaac5aaf085731effff959359d49a Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:42:53 +0200 Subject: [PATCH 089/472] chattranslationplugin: Use logger --- .../plugins/chattranslation/ChatTranslationPlugin.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java index 771fdfe29d..7fbee20156 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java @@ -9,6 +9,7 @@ import java.util.List; import javax.inject.Inject; import javax.inject.Provider; import javax.inject.Singleton; +import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.MenuAction; @@ -41,6 +42,7 @@ import org.apache.commons.lang3.ArrayUtils; type = PluginType.UTILITY ) @Singleton +@Slf4j public class ChatTranslationPlugin extends Plugin implements KeyListener { @@ -220,7 +222,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener } catch (Exception e) { - e.printStackTrace(); + log.warn(e.toString()); } client.refreshChat(); @@ -256,7 +258,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener } catch (Exception e) { - e.printStackTrace(); + log.warn(e.toString()); } return; } @@ -280,7 +282,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener } catch (Exception e) { - e.printStackTrace(); + log.warn(e.toString()); } } } From 66833601f8c33843d6ee8cc94ed6496c1f1ec67f Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:44:19 +0200 Subject: [PATCH 090/472] clanchatplugin: Compare objects using equals --- .../net/runelite/client/plugins/clanchat/ClanChatPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java index cab4bb4b45..b7336a014a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java @@ -197,7 +197,7 @@ public class ClanChatPlugin extends Plugin for (final Player player : client.getPlayers()) { - if (player != null && player != local && memberName.equals(Text.toJagexName(player.getName()))) + if (player != null && !player.equals(local) && memberName.equals(Text.toJagexName(player.getName()))) { clanMembers.add(player); addClanCounter(); @@ -485,7 +485,7 @@ public class ClanChatPlugin extends Plugin final Player local = client.getLocalPlayer(); final Player player = event.getPlayer(); - if (player != local && player.isClanMember()) + if (!player.equals(local) && player.isClanMember()) { clanMembers.add(player); addClanCounter(); From 83d39aa86aa6a2aea6f7642aca6e3d2b7ac1ef46 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:45:31 +0200 Subject: [PATCH 091/472] clanchatplugin: Make use of the saved config var --- .../net/runelite/client/plugins/clanchat/ClanChatPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java index b7336a014a..a8da56e48d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java @@ -151,7 +151,7 @@ public class ClanChatPlugin extends Plugin public void startUp() { updateConfig(); - chats = new ArrayList<>(Text.fromCSV(config.chatsData())); + chats = new ArrayList<>(Text.fromCSV(this.chatsData)); } @Override From 92cf037677b65065c2e5ab5cfc440e7c87ca5938 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:46:30 +0200 Subject: [PATCH 092/472] clanmanmode: Use equals when comparing objects --- .../runelite/client/plugins/clanmanmode/ClanManModeService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java index ca32c5892d..dd9498468e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java @@ -44,7 +44,7 @@ public class ClanManModeService continue; } - if (player == localPlayer) + if (player.equals(localPlayer)) { continue; } From aa353c33a9ac6994585bafe7f49506d2a16da693 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 02:55:22 +0200 Subject: [PATCH 093/472] clanmanmode: Save config values --- .../ClanManModeMinimapOverlay.java | 8 +-- .../clanmanmode/ClanManModeOverlay.java | 10 ++-- .../clanmanmode/ClanManModePlugin.java | 57 +++++++++++++++++++ .../clanmanmode/ClanManModeService.java | 34 ++++++----- 4 files changed, 82 insertions(+), 27 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeMinimapOverlay.java index d0b8e79c9c..8f4a61c2b8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeMinimapOverlay.java @@ -16,12 +16,12 @@ import net.runelite.client.ui.overlay.OverlayUtil; public class ClanManModeMinimapOverlay extends Overlay { private final ClanManModeService ClanManModeService; - private final ClanManModeConfig config; + private final ClanManModePlugin plugin; @Inject - private ClanManModeMinimapOverlay(final ClanManModeConfig config, final ClanManModeService ClanManModeService) + private ClanManModeMinimapOverlay(final ClanManModePlugin plugin, final ClanManModeService ClanManModeService) { - this.config = config; + this.plugin = plugin; this.ClanManModeService = ClanManModeService; setLayer(OverlayLayer.ABOVE_WIDGETS); setPosition(OverlayPosition.DYNAMIC); @@ -39,7 +39,7 @@ public class ClanManModeMinimapOverlay extends Overlay { final String name = actor.getName().replace('\u00A0', ' '); - if (config.drawMinimapNames()) + if (plugin.isDrawMinimapNames()) { final net.runelite.api.Point minimapLocation = actor.getMinimapLocation(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeOverlay.java index e616ad7486..cd98f5fd46 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeOverlay.java @@ -17,12 +17,12 @@ import net.runelite.client.ui.overlay.OverlayUtil; public class ClanManModeOverlay extends Overlay { private final ClanManModeService ClanManModeService; - private final ClanManModeConfig config; + private final ClanManModePlugin plugin; @Inject - private ClanManModeOverlay(final ClanManModeConfig config, final ClanManModeService ClanManModeService) + private ClanManModeOverlay(final ClanManModePlugin plugin, final ClanManModeService ClanManModeService) { - this.config = config; + this.plugin = plugin; this.ClanManModeService = ClanManModeService; setPosition(OverlayPosition.DYNAMIC); setPriority(OverlayPriority.MED); @@ -37,7 +37,7 @@ public class ClanManModeOverlay extends Overlay private void renderPlayerOverlay(Graphics2D graphics, Player actor, Color color) { - if (!config.drawOverheadPlayerNames()) + if (!plugin.isDrawOverheadPlayerNames()) { return; } @@ -48,7 +48,7 @@ public class ClanManModeOverlay extends Overlay if (textLocation != null) { - if (config.getClanAttackableColor().equals(color) && config.ShowBold()) + if (plugin.getGetClanAttackableColor().equals(color) && plugin.isShowBold()) { graphics.setFont(FontManager.getRunescapeBoldFont()); } 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 9a7d13f310..7626c95c11 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 @@ -1,11 +1,14 @@ package net.runelite.client.plugins.clanmanmode; import com.google.inject.Provides; +import java.awt.Color; import java.util.Collections; import java.util.HashMap; import java.util.Map; import javax.inject.Inject; import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.Player; @@ -49,6 +52,37 @@ public class ClanManModePlugin extends Plugin @Inject private Client client; + @Getter(AccessLevel.PACKAGE) + private boolean highlightAttackable; + @Getter(AccessLevel.PACKAGE) + private Color getAttackableColor; + @Getter(AccessLevel.PACKAGE) + private boolean highlightAttacked; + @Getter(AccessLevel.PACKAGE) + private Color getClanAttackableColor; + @Getter(AccessLevel.PACKAGE) + private boolean drawTiles; + @Getter(AccessLevel.PACKAGE) + private boolean drawOverheadPlayerNames; + @Getter(AccessLevel.PACKAGE) + private boolean drawMinimapNames; + @Getter(AccessLevel.PACKAGE) + private boolean showAttackers; + @Getter(AccessLevel.PACKAGE) + private Color getAttackerColor; + @Getter(AccessLevel.PACKAGE) + private boolean ShowBold; + @Getter(AccessLevel.PACKAGE) + private boolean hideAttackable; + @Getter(AccessLevel.PACKAGE) + private int hideTime; + @Getter(AccessLevel.PACKAGE) + private boolean CalcSelfCB; + @Getter(AccessLevel.PACKAGE) + private boolean PersistentClan; + @Getter(AccessLevel.PACKAGE) + private Color getClanMemberColor; + @Provides ClanManModeConfig provideConfig(ConfigManager configManager) { @@ -65,6 +99,8 @@ public class ClanManModePlugin extends Plugin @Override protected void startUp() throws Exception { + updateConfig(); + overlayManager.add(ClanManModeOverlay); overlayManager.add(ClanManModeTileOverlay); overlayManager.add(ClanManModeMinimapOverlay); @@ -91,6 +127,8 @@ public class ClanManModePlugin extends Plugin { return; } + + updateConfig(); } @Subscribe @@ -122,4 +160,23 @@ public class ClanManModePlugin extends Plugin clanmax = Collections.max(clan.values()); } } + + private void updateConfig() + { + this.highlightAttackable = config.highlightAttackable(); + this.getAttackableColor = config.getAttackableColor(); + this.highlightAttacked = config.highlightAttacked(); + this.getClanAttackableColor = config.getClanAttackableColor(); + this.drawTiles = config.drawTiles(); + this.drawOverheadPlayerNames = config.drawOverheadPlayerNames(); + this.drawMinimapNames = config.drawMinimapNames(); + this.showAttackers = config.showAttackers(); + this.getAttackerColor = config.getAttackerColor(); + this.ShowBold = config.ShowBold(); + this.hideAttackable = config.hideAttackable(); + this.hideTime = config.hideTime(); + this.CalcSelfCB = config.CalcSelfCB(); + this.PersistentClan = config.PersistentClan(); + this.getClanMemberColor = config.getClanMemberColor(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java index dd9498468e..6b7705e974 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java @@ -16,13 +16,11 @@ import net.runelite.api.coords.WorldPoint; public class ClanManModeService { private final Client client; - private final ClanManModeConfig config; private final ClanManModePlugin plugin; @Inject - private ClanManModeService(final Client client, final ClanManModeConfig config, final ClanManModePlugin plugin) + private ClanManModeService(final Client client, final ClanManModePlugin plugin) { - this.config = config; this.client = client; this.plugin = plugin; } @@ -57,13 +55,13 @@ public class ClanManModeService interactor = ((Player) interacting); } - if (config.showAttackers()) + if (plugin.isShowAttackers()) { if (interactor != null) { if (interactor.getName().equals(localName)) { - consumer.accept(player, config.getAttackerColor()); + consumer.accept(player, plugin.getGetAttackerColor()); } } } @@ -76,7 +74,7 @@ public class ClanManModeService { plugin.clan.put(player.getName(), player.getCombatLevel()); } - if (config.highlightAttacked()) + if (plugin.isHighlightAttacked()) { if (interactor != null) { @@ -91,12 +89,12 @@ public class ClanManModeService { wildydiff = 0; } - if (config.CalcSelfCB()) + if (plugin.isCalcSelfCB()) { if (interacting.getCombatLevel() <= selfmax && interacting.getCombatLevel() - wildydiff >= selfmin && !interactor.isClanMember()) { interactors.put(interactor.getName(), player.getName()); - consumer.accept(interactor, config.getClanAttackableColor()); + consumer.accept(interactor, plugin.getGetClanAttackableColor()); } } else @@ -104,7 +102,7 @@ public class ClanManModeService if (interacting.getCombatLevel() <= maxatk && interacting.getCombatLevel() - wildydiff >= minatk && !interactor.isClanMember()) { interactors.put(interactor.getName(), player.getName()); - consumer.accept(interactor, config.getClanAttackableColor()); + consumer.accept(interactor, plugin.getGetClanAttackableColor()); } } } @@ -113,14 +111,14 @@ public class ClanManModeService } else { - if (config.PersistentClan()) + if (plugin.isPersistentClan()) { if (plugin.clan.containsKey(player.getName())) { - consumer.accept(player, config.getClanMemberColor()); + consumer.accept(player, plugin.getGetClanMemberColor()); } } - if (config.highlightAttacked()) + if (plugin.isHighlightAttacked()) { if (interactors.containsKey(player.getName())) { @@ -140,7 +138,7 @@ public class ClanManModeService { if (ainteract.getName().equals(player.getName())) { - consumer.accept(player, config.getClanAttackableColor()); + consumer.accept(player, plugin.getGetClanAttackableColor()); } else { @@ -161,9 +159,9 @@ public class ClanManModeService continue; } } - if (config.highlightAttackable()) + if (plugin.isHighlightAttackable()) { - if ((config.hideAttackable() && plugin.ticks >= config.hideTime()) || plugin.clan.containsKey(player.getName())) + if ((plugin.isHideAttackable() && plugin.ticks >= plugin.getHideTime()) || plugin.clan.containsKey(player.getName())) { continue; } @@ -176,18 +174,18 @@ public class ClanManModeService { wildydiff = 0; } - if (config.CalcSelfCB()) + if (plugin.isCalcSelfCB()) { if (player.getCombatLevel() <= selfmax && player.getCombatLevel() - wildydiff >= selfmin) { - consumer.accept(player, config.getAttackableColor()); + consumer.accept(player, plugin.getGetAttackableColor()); } } else { if (player.getCombatLevel() <= maxatk && player.getCombatLevel() - wildydiff >= minatk) { - consumer.accept(player, config.getAttackableColor()); + consumer.accept(player, plugin.getGetAttackableColor()); } } } From f691e28742d3ac6684bce34497ba42ee8870dc1b Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 03:01:22 +0200 Subject: [PATCH 094/472] clanmanmode: Combine nested if statements --- .../clanmanmode/ClanManModeService.java | 127 +++++++----------- 1 file changed, 52 insertions(+), 75 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java index 6b7705e974..10e3337a64 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java @@ -37,12 +37,7 @@ public class ClanManModeService int selfmax = localPlayer.getCombatLevel() + plugin.wildernessLevel; for (Player player : client.getPlayers()) { - if (player == null || player.getName() == null) - { - continue; - } - - if (player.equals(localPlayer)) + if (player == null || player.getName() == null || player.equals(localPlayer)) { continue; } @@ -55,15 +50,9 @@ public class ClanManModeService interactor = ((Player) interacting); } - if (plugin.isShowAttackers()) + if (plugin.isShowAttackers() && interactor != null && interactor.getName().equals(localName)) { - if (interactor != null) - { - if (interactor.getName().equals(localName)) - { - consumer.accept(player, plugin.getGetAttackerColor()); - } - } + consumer.accept(player, plugin.getGetAttackerColor()); } if (plugin.inwildy == 1) @@ -74,90 +63,78 @@ public class ClanManModeService { plugin.clan.put(player.getName(), player.getCombatLevel()); } - if (plugin.isHighlightAttacked()) + if (plugin.isHighlightAttacked() && interactor != null && !interactors.containsKey(interactor.getName())) { - if (interactor != null) + WorldPoint a = interactor.getWorldLocation(); + int underLevel = ((a.getY() - 9920) / 8) + 1; + int upperLevel = ((a.getY() - 3520) / 8) + 1; + int wildernessLevel = a.getY() > 6400 ? underLevel : upperLevel; + int wildydiff = plugin.wildernessLevel - wildernessLevel; + if (wildydiff < 0) { - if (!interactors.containsKey(interactor.getName())) + wildydiff = 0; + } + if (plugin.isCalcSelfCB()) + { + if (interacting.getCombatLevel() <= selfmax && interacting.getCombatLevel() - wildydiff >= selfmin && !interactor.isClanMember()) { - WorldPoint a = interactor.getWorldLocation(); - int underLevel = ((a.getY() - 9920) / 8) + 1; - int upperLevel = ((a.getY() - 3520) / 8) + 1; - int wildernessLevel = a.getY() > 6400 ? underLevel : upperLevel; - int wildydiff = plugin.wildernessLevel - wildernessLevel; - if (wildydiff < 0) - { - wildydiff = 0; - } - if (plugin.isCalcSelfCB()) - { - if (interacting.getCombatLevel() <= selfmax && interacting.getCombatLevel() - wildydiff >= selfmin && !interactor.isClanMember()) - { - interactors.put(interactor.getName(), player.getName()); - consumer.accept(interactor, plugin.getGetClanAttackableColor()); - } - } - else - { - if (interacting.getCombatLevel() <= maxatk && interacting.getCombatLevel() - wildydiff >= minatk && !interactor.isClanMember()) - { - interactors.put(interactor.getName(), player.getName()); - consumer.accept(interactor, plugin.getGetClanAttackableColor()); - } - } + interactors.put(interactor.getName(), player.getName()); + consumer.accept(interactor, plugin.getGetClanAttackableColor()); + } + } + else + { + if (interacting.getCombatLevel() <= maxatk && interacting.getCombatLevel() - wildydiff >= minatk && !interactor.isClanMember()) + { + interactors.put(interactor.getName(), player.getName()); + consumer.accept(interactor, plugin.getGetClanAttackableColor()); } } } } else { - if (plugin.isPersistentClan()) + if (plugin.isPersistentClan() && plugin.clan.containsKey(player.getName())) { - if (plugin.clan.containsKey(player.getName())) - { - consumer.accept(player, plugin.getGetClanMemberColor()); - } + consumer.accept(player, plugin.getGetClanMemberColor()); } - if (plugin.isHighlightAttacked()) - { - if (interactors.containsKey(player.getName())) + if (plugin.isHighlightAttacked() && interactors.containsKey(player.getName())) { - String attackername = interactors.get(player.getName()); - boolean found = false; - for (Player attacker : client.getPlayers()) + String attackername = interactors.get(player.getName()); + boolean found = false; + for (Player attacker : client.getPlayers()) + { + if (attacker == null || attacker.getName() == null) { - if (attacker == null || attacker.getName() == null) + continue; + } + if (attacker.getName().equals(attackername)) + { + found = true; + Actor ainteract = attacker.getInteracting(); + if (ainteract != null) { - continue; - } - if (attacker.getName().equals(attackername)) - { - found = true; - Actor ainteract = attacker.getInteracting(); - if (ainteract != null) + if (ainteract.getName().equals(player.getName())) { - if (ainteract.getName().equals(player.getName())) - { - consumer.accept(player, plugin.getGetClanAttackableColor()); - } - else - { - interactors.remove(player.getName()); - } + consumer.accept(player, plugin.getGetClanAttackableColor()); } else { interactors.remove(player.getName()); } - break; } + else + { + interactors.remove(player.getName()); + } + break; } - if (!found) - { - interactors.remove(player.getName()); - } - continue; } + if (!found) + { + interactors.remove(player.getName()); + } + continue; } if (plugin.isHighlightAttackable()) { From e74faa9cdffbf2c5f7d5755a08711ef43d2a48fc Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 03:05:01 +0200 Subject: [PATCH 095/472] cluescroll: hotcold: Don't access the map twice --- .../client/plugins/cluescrolls/clues/HotColdClue.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java index 219916d240..ae18259fb4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java @@ -171,11 +171,11 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat if (digLocations.size() > 10) { - for (HotColdArea area : locationCounts.keySet()) + for (Map.Entry locationCount : locationCounts.entrySet()) { panelComponent.getChildren().add(LineComponent.builder() - .left(area.getName()) - .right(Integer.toString(locationCounts.get(area))) + .left(locationCount.getKey().getName()) + .right(Integer.toString(locationCount.getValue())) .build()); } } From 706e9fbf13247bdec3b221629c4027c5e2cb4486 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 03:06:09 +0200 Subject: [PATCH 096/472] cluescroll: Combine nested if statements --- .../cluescrolls/ClueScrollOverlay.java | 9 ++--- .../plugins/cluescrolls/ClueScrollPlugin.java | 33 +++++++------------ 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java index 9347f28de5..4482996a64 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java @@ -78,13 +78,10 @@ public class ClueScrollOverlay extends Overlay clue.makeOverlayHint(panelComponent, plugin); - if (clue.isRequiresSpade() && plugin.getInventoryItems() != null) + if (clue.isRequiresSpade() && plugin.getInventoryItems() != null && !HAS_SPADE.fulfilledBy(plugin.getInventoryItems())) { - if (!HAS_SPADE.fulfilledBy(plugin.getInventoryItems())) - { - panelComponent.getChildren().add(LineComponent.builder().left("").build()); - panelComponent.getChildren().add(LineComponent.builder().left("Requires Spade!").leftColor(Color.RED).build()); - } + panelComponent.getChildren().add(LineComponent.builder().left("").build()); + panelComponent.getChildren().add(LineComponent.builder().left("Requires Spade!").leftColor(Color.RED).build()); } return panelComponent.render(graphics); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java index 98498a40fb..7b7b1e6e96 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java @@ -211,12 +211,9 @@ public class ClueScrollPlugin extends Plugin return; } - if (clue instanceof HotColdClue) + if (clue instanceof HotColdClue && ((HotColdClue) clue).update(event.getMessage(), this)) { - if (((HotColdClue) clue).update(event.getMessage(), this)) - { - worldMapPointsSet = false; - } + worldMapPointsSet = false; } if (!event.getMessage().equals("The strange device cools as you find your treasure.") @@ -272,20 +269,17 @@ public class ClueScrollPlugin extends Plugin } // if three step clue check for clue scroll pieces - if (clue instanceof ThreeStepCrypticClue) + if (clue instanceof ThreeStepCrypticClue && ((ThreeStepCrypticClue) clue).update(client, event, itemManager)) { - if (((ThreeStepCrypticClue) clue).update(client, event, itemManager)) + worldMapPointsSet = false; + npcsToMark.clear(); + + if (this.displayHintArrows) { - worldMapPointsSet = false; - npcsToMark.clear(); - - if (this.displayHintArrows) - { - client.clearHintArrow(); - } - - checkClueNPCs(clue, client.getCachedNPCs()); + client.clearHintArrow(); } + + checkClueNPCs(clue, client.getCachedNPCs()); } } @@ -483,12 +477,9 @@ public class ClueScrollPlugin extends Plugin final String text = Text.sanitizeMultilineText(clueScrollText.getText()).toLowerCase(); // Early return if this is same clue as already existing one - if (clue instanceof TextClueScroll) + if (clue instanceof TextClueScroll && ((TextClueScroll) clue).getText().equalsIgnoreCase(text)) { - if (((TextClueScroll) clue).getText().equalsIgnoreCase(text)) - { - return clue; - } + return clue; } // (This|The) anagram reveals who to speak to next: From 64d9a260a0da3eec41b83af4028664b0fb200260 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 03:19:53 +0200 Subject: [PATCH 097/472] combatcounter: Don't access map more than needed --- .../client/plugins/combatcounter/CombatOverlay.java | 9 +++++---- .../client/plugins/combatcounter/DamageOverlay.java | 10 +++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java index dd0a2cc25c..de414bc3b2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java @@ -96,17 +96,18 @@ class CombatOverlay extends Overlay return null; } - for (String name : map.keySet()) + for (Map.Entry counter : map.entrySet()) { + String name = counter.getKey(); if (client.getLocalPlayer().getName().contains(name)) { - tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getSelfColor()), ColorUtil.prependColorTag(Long.toString(map.get(name)), plugin.getSelfColor())); + tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getSelfColor()), ColorUtil.prependColorTag(Long.toString(counter.getValue()), plugin.getSelfColor())); } else { - tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getOtherColor()), ColorUtil.prependColorTag(Long.toString(map.get(name)), plugin.getOtherColor())); + tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getOtherColor()), ColorUtil.prependColorTag(Long.toString(counter.getValue()), plugin.getOtherColor())); } - total += map.get(name); + total += counter.getValue(); } if (!map.containsKey(local.getName())) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java index 0e2cd5109e..8a27e6f96b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java @@ -97,16 +97,16 @@ class DamageOverlay extends Overlay return null; } - for (String name : map.keySet()) + for (Map.Entry damage : map.entrySet()) { - String val = String.format("%.1f", map.get(name)); - if (client.getLocalPlayer().getName().contains(name)) + String val = String.format("%.1f", damage.getValue()); + if (client.getLocalPlayer().getName().contains(damage.getKey())) { - tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getSelfColor()), ColorUtil.prependColorTag(val, plugin.getSelfColor())); + tableComponent.addRow(ColorUtil.prependColorTag(damage.getKey(), plugin.getSelfColor()), ColorUtil.prependColorTag(val, plugin.getSelfColor())); } else { - tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getOtherColor()), ColorUtil.prependColorTag(val, plugin.getOtherColor())); + tableComponent.addRow(ColorUtil.prependColorTag(damage.getKey(), plugin.getOtherColor()), ColorUtil.prependColorTag(val, plugin.getOtherColor())); } } From de7244a704e87f0373a72146524747bc9c1d9af3 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 03:20:53 +0200 Subject: [PATCH 098/472] combatcounter: Use equals when comparing objects --- .../runelite/client/plugins/combatcounter/CombatCounter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java index 162aeca40a..47f6e2c19e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java @@ -316,7 +316,7 @@ public class CombatCounter extends Plugin for (NPC nearby : this.client.getNpcs()) { int distance = npc.getWorldLocation().distanceTo(nearby.getWorldLocation()); - if (distance <= 1 && npc != nearby) + if (distance <= 1 && npc.equals(nearby)) { actives.add(nearby); } From 3891c73b5b968561aad4c12fb7dff54791740449 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 03:24:17 +0200 Subject: [PATCH 099/472] combatcounter: Someones keyboard fucking broke --- .../plugins/combatcounter/CombatCounter.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java index 47f6e2c19e..9270dd0e4c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java @@ -290,7 +290,9 @@ public class CombatCounter extends Plugin ticks = 3; } if (counter.containsKey(name)) + { ticks += counter.get(name); + } counter.put(name, ticks); counter = sortByValue(counter); @@ -379,13 +381,17 @@ public class CombatCounter extends Plugin { NPCDamageCounter dc = new NPCDamageCounter(); if (this.npcDamageMap.containsKey(target)) + { dc = this.npcDamageMap.get(target); + } for (Integer tick : ticksToAdd) { List attackers = new ArrayList<>(); if (dc.attackers.containsKey(tick)) + { attackers = dc.attackers.get(tick); + } attackers.add(name); dc.attackers.put(tick, attackers); @@ -425,7 +431,9 @@ public class CombatCounter extends Plugin for (Player p : this.client.getPlayers()) { if (p.getName() != null) + { visible.put(p.getName(), p); + } } for (NPC npc : new ArrayList<>(this.npcDamageMap.keySet())) @@ -442,7 +450,9 @@ public class CombatCounter extends Plugin double totalDamage = 0d; for (Integer damage : counter.damage) + { totalDamage += damage; + } if (attackers.containsKey(-1)) { @@ -454,7 +464,9 @@ public class CombatCounter extends Plugin { double count = 0d; if (this.playerDamage.containsKey(name)) + { count = this.playerDamage.get(name); + } count += damagePerPlayer; this.playerDamage.put(name, count); @@ -475,11 +487,17 @@ public class CombatCounter extends Plugin // } for (Integer i : new ArrayList<>(attackers.keySet())) + { if (i <= -1) + { attackers.remove(i); + } + } if (attackers.isEmpty()) + { this.npcDamageMap.remove(npc); + } } this.playerDamage = sortByValue(this.playerDamage); @@ -508,20 +526,26 @@ public class CombatCounter extends Plugin NPCDamageCounter dc = new NPCDamageCounter(); if (this.npcDamageMap.containsKey(npc)) + { dc = this.npcDamageMap.get(npc); + } int delay = this.calculateBPDelay(distance); List counts = new ArrayList<>(); counts.add(delay); if (delay > 2) + { counts.add(delay - 1); + } for (int tick : counts) { List attackers = new ArrayList<>(); if (dc.attackers.containsKey(tick)) + { attackers = dc.attackers.get(tick); + } attackers.add(user); dc.attackers.put(tick, attackers); @@ -545,12 +569,16 @@ public class CombatCounter extends Plugin Actor actor = event.getActor(); if (!(actor instanceof NPC)) + { return; + } NPC npc = (NPC) actor; if (!this.npcDamageMap.containsKey(npc)) + { return; + } Hitsplat splat = event.getHitsplat(); NPCDamageCounter dc = this.npcDamageMap.get(npc); @@ -586,6 +614,7 @@ public class CombatCounter extends Plugin int distance = wpNPC.distanceTo(wpPlayer); if (size > 1) + { for (int x = 0; x < size; x++) { for (int y = 0; y < size; y++) @@ -598,6 +627,8 @@ public class CombatCounter extends Plugin } } } + } + return distance; } From 4404a8250ca6d5d3b17902b5b25bea6fc1e2b2ca Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 03:25:08 +0200 Subject: [PATCH 100/472] combatcounter: Use finals --- .../client/plugins/combatcounter/CombatCounter.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java index 9270dd0e4c..e91bd944f1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java @@ -114,7 +114,7 @@ public class CombatCounter extends Plugin return configManager.getConfig(CombatCounterConfig.class); } - private Map variables = new HashMap() + private final Map VARIABLES = new HashMap() { { this.put(422, 4); // Unarmed Punch, Block @@ -173,7 +173,7 @@ public class CombatCounter extends Plugin } }; - private List MELEE_ANIMATIONS = new ArrayList() + private final List MELEE_ANIMATIONS = new ArrayList() { { this.add(422); // Unarmed Punch, Block @@ -217,7 +217,7 @@ public class CombatCounter extends Plugin } }; - private List RANGE_ANIMATIONS = new ArrayList() + private final List RANGE_ANIMATIONS = new ArrayList() { { this.add(7552); // Armadyl Crossbow Accurate, Rapid, Longrange, Special @@ -230,7 +230,7 @@ public class CombatCounter extends Plugin } }; - private List MAGE_ANIMATIONS = new ArrayList() + private final List MAGE_ANIMATIONS = new ArrayList() { { this.add(1167); // Trident Accurate, Accurate, Longrange @@ -279,12 +279,12 @@ public class CombatCounter extends Plugin int animation = p.getAnimation(); if (animation != -1) { - if (variables.containsKey(animation)) + if (VARIABLES.containsKey(animation)) { /* * This part handles the Tick Counter. */ - long ticks = variables.get(animation); + long ticks = VARIABLES.get(animation); if (((Player) actor).getPlayerAppearance().getEquipmentId(KitType.WEAPON) == 23360) { ticks = 3; From 3720f39b21af79e4d92c0979e43759548c471429 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 03:26:12 +0200 Subject: [PATCH 101/472] combatcounter: Use logger --- .../runelite/client/plugins/combatcounter/CombatCounter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java index e91bd944f1..6d09d92c6f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java @@ -30,6 +30,7 @@ import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; +import lombok.extern.slf4j.Slf4j; import net.runelite.api.Actor; import net.runelite.api.Client; import net.runelite.api.Hitsplat; @@ -64,6 +65,7 @@ import java.util.Map; enabledByDefault = false ) @Singleton +@Slf4j public class CombatCounter extends Plugin { @@ -356,7 +358,7 @@ public class CombatCounter extends Plugin } else { - System.out.println("Unclassified Animation: " + animation); + log.debug("Unclassified Animation: {}", animation); } if (delay != -1) From 91ad3bc1735c22fd1174ebff4065a9432d9e7724 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 03:34:30 +0200 Subject: [PATCH 102/472] cluascroll: Fix clue scrolls --- .../client/plugins/cluescrolls/ClueScrollPlugin.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java index 7b7b1e6e96..9ca68259c3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java @@ -228,9 +228,9 @@ public class ClueScrollPlugin extends Plugin @Subscribe public void onMenuOptionClicked(final MenuOptionClicked event) { - if (event.getMenuAction() != null && event.getMenuAction().equals("Read")) + if ("read".equalsIgnoreCase(event.getOption())) { - final ItemDefinition itemComposition = itemManager.getItemDefinition(event.hashCode()); + final ItemDefinition itemComposition = itemManager.getItemDefinition(event.getIdentifier()); if (itemComposition != null && itemComposition.getName().startsWith("Clue scroll")) { @@ -764,7 +764,7 @@ public class ClueScrollPlugin extends Plugin textComponent.render(graphics); } - void scrollToWidget(WidgetInfo list, WidgetInfo scrollbar, Widget ... toHighlight) + void scrollToWidget(WidgetInfo list, WidgetInfo scrollbar, Widget... toHighlight) { final Widget parent = client.getWidget(list); int averageCentralY = 0; From e356cae8cb03c2526b29fa6ecb254d8783efa7c1 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 03:39:23 +0200 Subject: [PATCH 103/472] cluescroll: add back item util --- .../client/plugins/cluescrolls/ClueScrollPlugin.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java index 9ca68259c3..8d0b5aaf86 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java @@ -101,6 +101,7 @@ import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.ui.overlay.components.TextComponent; import net.runelite.client.ui.overlay.worldmap.WorldMapPointManager; import net.runelite.client.util.ImageUtil; +import net.runelite.client.util.ItemUtil; import net.runelite.client.util.Text; @PluginDescriptor( @@ -259,10 +260,8 @@ public class ClueScrollPlugin extends Plugin // Check if item was removed from inventory if (clue != null && clueItemId != null) { - final Stream items = Arrays.stream(event.getItemContainer().getItems()); - // Check if clue was removed from inventory - if (items.noneMatch(item -> itemManager.getItemDefinition(item.getId()).getId() == clueItemId)) + if (!ItemUtil.containsItemId(event.getItemContainer().getItems(), clueItemId)) { resetClue(true); } From a9b162af9ac5b3c9e02a741e6906a2515f5e7e62 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 03:42:23 +0200 Subject: [PATCH 104/472] combatlevel: Char is faster than string --- .../runelite/client/plugins/combatlevel/CombatLevelPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java index a2db038077..575f59af6f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java @@ -119,7 +119,7 @@ public class CombatLevelPlugin extends Plugin if (widgetText.contains(".")) { - combatLevelWidget.setText(widgetText.substring(0, widgetText.indexOf("."))); + combatLevelWidget.setText(widgetText.substring(0, widgetText.indexOf('.'))); } } From c5b636a2649c9c3b2107e3e0f1f5b9d4acd2d774 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 03:45:18 +0200 Subject: [PATCH 105/472] corpplugin: Use equals when comparing objects --- .../java/net/runelite/client/plugins/corp/CorpPlugin.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java index d4c815f7eb..930a71707d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java @@ -167,7 +167,7 @@ public class CorpPlugin extends Plugin { NPC npc = npcDespawned.getNpc(); - if (npc == corp) + if (npc.equals(corp)) { log.debug("Corporeal beast despawn: {}", npc); corp = null; @@ -193,7 +193,7 @@ public class CorpPlugin extends Plugin .build()); } } - else if (npc == core) + else if (npc.equals(core)) { core = null; } @@ -204,7 +204,7 @@ public class CorpPlugin extends Plugin { Actor actor = hitsplatApplied.getActor(); - if (actor != corp) + if (!actor.equals(corp)) { return; } @@ -224,7 +224,7 @@ public class CorpPlugin extends Plugin Actor source = interactingChanged.getSource(); Actor target = interactingChanged.getTarget(); - if (corp == null || target != corp) + if (!target.equals(corp)) { return; } From 4db59fa9849470af8eee9945101550d171365419 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 03:47:57 +0200 Subject: [PATCH 106/472] coxhelper: Remove usused fields and methods --- .../client/plugins/coxhelper/CoxOverlay.java | 41 +++++++++---------- .../client/plugins/coxhelper/CoxPlugin.java | 8 ++-- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxOverlay.java index 00d60e94ee..ea3a3fb0e8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxOverlay.java @@ -105,7 +105,6 @@ public class CoxOverlay extends Overlay if (plugin.isTektonTickCounter()) { ticksLeft = npcs.getTicksUntilAttack(); - int attackTicksleft = plugin.getTektonAttackTicks(); if (ticksLeft > 0) { if (ticksLeft == 1) @@ -363,26 +362,26 @@ public class CoxOverlay extends Overlay graphics.fill(poly); } - private void renderNpcOverlay(Graphics2D graphics, NPC actor, Color color, int outlineWidth, int outlineAlpha, int fillAlpha) - { - int size = 1; - NPCDefinition composition = actor.getTransformedDefinition(); - if (composition != null) - { - size = composition.getSize(); - } - LocalPoint lp = actor.getLocalLocation(); - Polygon tilePoly = Perspective.getCanvasTileAreaPoly(client, lp, size); - - if (tilePoly != null) - { - graphics.setColor(new Color(color.getRed(), color.getGreen(), color.getBlue(), outlineAlpha)); - graphics.setStroke(new BasicStroke(outlineWidth)); - graphics.draw(tilePoly); - graphics.setColor(new Color(color.getRed(), color.getGreen(), color.getBlue(), fillAlpha)); - graphics.fill(tilePoly); - } - } +// private void renderNpcOverlay(Graphics2D graphics, NPC actor, Color color, int outlineWidth, int outlineAlpha, int fillAlpha) +// { +// int size = 1; +// NPCDefinition composition = actor.getTransformedDefinition(); +// if (composition != null) +// { +// size = composition.getSize(); +// } +// LocalPoint lp = actor.getLocalLocation(); +// Polygon tilePoly = Perspective.getCanvasTileAreaPoly(client, lp, size); +// +// if (tilePoly != null) +// { +// graphics.setColor(new Color(color.getRed(), color.getGreen(), color.getBlue(), outlineAlpha)); +// graphics.setStroke(new BasicStroke(outlineWidth)); +// graphics.draw(tilePoly); +// graphics.setColor(new Color(color.getRed(), color.getGreen(), color.getBlue(), fillAlpha)); +// graphics.fill(tilePoly); +// } +// } private void renderActorOverlay(Graphics2D graphics, Actor actor, Color color, int outlineWidth, int outlineAlpha, int fillAlpha) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java index 9dc12d080f..66fbf64492 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java @@ -83,7 +83,7 @@ import net.runelite.client.util.Text; public class CoxPlugin extends Plugin { private static final int ANIMATION_ID_G1 = 430; - private static final String OLM_HAND_CRIPPLE = "The Great Olm\'s left claw clenches to protect itself temporarily."; + // private static final String OLM_HAND_CRIPPLE = "The Great Olm\'s left claw clenches to protect itself temporarily."; private static final Pattern TP_REGEX = Pattern.compile("You have been paired with (.*)! The magical power will enact soon..."); @Setter @Getter(AccessLevel.PACKAGE) @@ -92,11 +92,11 @@ public class CoxPlugin extends Plugin protected long lastPrayTime; private int sleepcount = 0; private boolean needOlm = false; - private GraphicsObject teleportObject; + // private GraphicsObject teleportObject; @Inject private Client client; - @Inject - private ChatMessageManager chatMessageManager; + // @Inject + // private ChatMessageManager chatMessageManager; @Inject private CoxOverlay coxOverlay; @Inject From 79c08b96d551e9d92235e066b451e5f63f20f3bd Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 03:51:55 +0200 Subject: [PATCH 107/472] deathindicator: Combine nested ifs --- .../plugins/deathindicator/DeathIndicatorPlugin.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java index 049e6192b9..16d755049b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java @@ -112,12 +112,9 @@ public class DeathIndicatorPlugin extends Plugin return; } - if (config.showDeathHintArrow()) + if (config.showDeathHintArrow() && !client.hasHintArrow()) { - if (!client.hasHintArrow()) - { - client.setHintArrow(new WorldPoint(config.deathLocationX(), config.deathLocationY(), config.deathLocationPlane())); - } + client.setHintArrow(new WorldPoint(config.deathLocationX(), config.deathLocationY(), config.deathLocationPlane())); } if (config.showDeathOnWorldMap()) From e979f7fc6527710d51463ffa63a0bf3bf82fe007 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 03:52:43 +0200 Subject: [PATCH 108/472] demonicgorilla: Use equals when comparing objects --- .../client/plugins/demonicgorilla/DemonicGorillaPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java index d031b501b5..ea4c665ef1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java @@ -206,7 +206,7 @@ public class DemonicGorillaPlugin extends Plugin } boolean correctPrayer = target == null || // If player is out of memory, assume prayer was correct - attackStyle == protectedStyle; + attackStyle.equals(protectedStyle); if (attackStyle == DemonicGorilla.AttackStyle.BOULDER) { From 0bc32b0d5feb8b8fdcc1b451c5d5f9ac6d417362 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 03:53:57 +0200 Subject: [PATCH 109/472] devtools: Use equals when comparing objects --- .../net/runelite/client/plugins/devtools/DevToolsOverlay.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java index 08e9df8e5b..42e0a731cd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java @@ -160,7 +160,7 @@ class DevToolsOverlay extends Overlay for (Player p : players) { - if (p != local) + if (!p.equals(local)) { String text = p.getName() + " (A: " + p.getAnimation() + ") (G: " + p.getSpotAnimation() + ")"; OverlayUtil.renderActorOverlay(graphics, p, text, BLUE); From d4066523c1314dfe4dec1baba43f79e07c0d96f4 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 03:54:57 +0200 Subject: [PATCH 110/472] devtools: Remoe unused fields --- .../java/net/runelite/client/plugins/devtools/VarInspector.java | 2 -- .../net/runelite/client/plugins/devtools/WidgetInspector.java | 2 -- 2 files changed, 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java index 74e75d23df..bea864d8bc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java @@ -86,7 +86,6 @@ class VarInspector extends JFrame private final static int MAX_LOG_ENTRIES = 10_000; private final Client client; - private final DevToolsPlugin plugin; private final EventBus eventBus; private final JPanel tracker = new JPanel(); @@ -104,7 +103,6 @@ class VarInspector extends JFrame { this.eventBus = eventBus; this.client = client; - this.plugin = plugin; setTitle("RuneLite Var Inspector"); setIconImage(ClientUI.ICON); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java index cea9a2b9c1..f622b59677 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java @@ -63,7 +63,6 @@ class WidgetInspector extends JFrame private final ClientThread clientThread; private final DevToolsConfig config; private final DevToolsOverlay overlay; - private final DevToolsPlugin plugin; private final JTree widgetTree; private final WidgetInfoTableModel infoTableModel; @@ -86,7 +85,6 @@ class WidgetInspector extends JFrame this.infoTableModel = infoTableModel; this.config = config; this.overlay = overlay; - this.plugin = plugin; eventBus.register(this); From 591a849f73622a4e887ca05a6fd422cfc08da8f5 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:01:11 +0200 Subject: [PATCH 111/472] discord: Merge nested if statements --- .../client/plugins/discord/DiscordPlugin.java | 15 ++++++--------- .../client/plugins/discord/DiscordState.java | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java index 68a10c2567..944643541d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java @@ -342,17 +342,14 @@ public class DiscordPlugin extends Plugin { final PartyMember localMember = partyService.getLocalMember(); - if (localMember != null) + if (localMember != null && discordService.getCurrentUser() != null) { - if (discordService.getCurrentUser() != null) - { - final DiscordUserInfo userInfo = new DiscordUserInfo( - discordService.getCurrentUser().userId, - discordService.getCurrentUser().avatar); + final DiscordUserInfo userInfo = new DiscordUserInfo( + discordService.getCurrentUser().userId, + discordService.getCurrentUser().avatar); - userInfo.setMemberId(localMember.getMemberId()); - wsClient.send(userInfo); - } + userInfo.setMemberId(localMember.getMemberId()); + wsClient.send(userInfo); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java index ddb554fd75..fb37f5245d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java @@ -46,7 +46,7 @@ import static net.runelite.client.ws.PartyService.PARTY_MAX; class DiscordState { @Data - private class EventWithTime + private static class EventWithTime { private final DiscordGameEventType type; private final Instant start; From e106fe36b77ace84ee446ef2bfb2e7ffc66e719b Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:02:09 +0200 Subject: [PATCH 112/472] discord: Remove unused field --- .../net/runelite/client/plugins/discord/DiscordPlugin.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java index 944643541d..abbd4e6029 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java @@ -86,8 +86,6 @@ import okhttp3.Response; @Singleton public class DiscordPlugin extends Plugin { - private static boolean discordEnabled = false; - @Inject private Client client; @@ -159,7 +157,6 @@ public class DiscordPlugin extends Plugin } wsClient.registerMessage(DiscordUserInfo.class); - discordEnabled = true; } @Override @@ -169,7 +166,6 @@ public class DiscordPlugin extends Plugin discordState.reset(); partyService.changeParty(null); wsClient.unregisterMessage(DiscordUserInfo.class); - discordEnabled = false; } @Subscribe From 0d57f8d705ccf0d095d96080156a2f0856e9a996 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:04:57 +0200 Subject: [PATCH 113/472] examine: Use logger --- .../java/net/runelite/client/plugins/examine/ExaminePlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java index 414c75a4c7..26e77760a7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java @@ -354,7 +354,7 @@ public class ExaminePlugin extends Plugin } catch (IOException e) { - e.printStackTrace(); + log.error(e.toString()); } message .append(ChatColorType.NORMAL) From d85a74c8e01758747f510d268173050cb3a5d117 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:05:57 +0200 Subject: [PATCH 114/472] fairyring: Merge nested if statements --- .../client/plugins/fairyring/FairyRingPlugin.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java index 53f6b3d575..ee66d4271f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java @@ -252,11 +252,10 @@ public class FairyRingPlugin extends Plugin return; } - if (codes != null) - { + if (codes != null && // Check to make sure the list hasn't been rebuild since we were last her // Do this by making sure the list's dynamic children are the same as when we last saw them - if (codes.stream().noneMatch(w -> + codes.stream().noneMatch(w -> { Widget codeWidget = w.getCode(); if (codeWidget == null) @@ -265,9 +264,8 @@ public class FairyRingPlugin extends Plugin } return list.getChild(codeWidget.getIndex()) == codeWidget; })) - { - codes = null; - } + { + codes = null; } if (codes == null) From 2c792ed3073c9d4622c70d0e59666492d39e6baf Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:07:06 +0200 Subject: [PATCH 115/472] fightcave: MErge nested if statements --- .../client/plugins/fightcave/FightCavePlugin.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java index a31197e700..2376f09fb6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java @@ -171,14 +171,11 @@ public class FightCavePlugin extends Plugin { updateConfig(); - if (client.getGameState() == GameState.LOGGED_IN) + if (client.getGameState() == GameState.LOGGED_IN && regionCheck()) { - if (regionCheck()) - { - validRegion = true; - overlayManager.add(waveOverlay); - overlayManager.add(fightCaveOverlay); - } + validRegion = true; + overlayManager.add(waveOverlay); + overlayManager.add(fightCaveOverlay); } } From b6fa83fcf93baf908e33b16bbcb085806bc9d0c8 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:08:18 +0200 Subject: [PATCH 116/472] flexo: Use interface instead of type --- .../java/net/runelite/client/plugins/flexo/FlexoPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java index 1cca96d9c6..2bd8470bcf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java @@ -134,9 +134,9 @@ public class FlexoPlugin extends Plugin private int scalingFactor; @Getter(AccessLevel.PACKAGE) - private ArrayList clickAreas = new ArrayList<>(); + private List clickAreas = new ArrayList<>(); @Getter(AccessLevel.PACKAGE) - private ArrayList clickPoints = new ArrayList<>(); + private List clickPoints = new ArrayList<>(); @Subscribe private void onConfigChanged(ConfigChanged event) From db29a29a74883661865c67524a6331cabf8fd691 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:10:34 +0200 Subject: [PATCH 117/472] flexo: MErge nested if statements --- .../client/plugins/flexo/FlexoPlugin.java | 54 ++++++++----------- 1 file changed, 21 insertions(+), 33 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java index 2bd8470bcf..e0e1b57b20 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java @@ -172,15 +172,12 @@ public class FlexoPlugin extends Plugin { for (NPC npc : client.getNpcs()) { - if (npc != null) + if (npc != null && npc.getConvexHull() != null) { - if (npc.getConvexHull() != null) - { - Rectangle r = FlexoMouse.getClickArea(npc.getConvexHull().getBounds()); - this.clickAreas.add(r); - java.awt.Point p = FlexoMouse.getClickPoint(r); - this.clickPoints.add(p); - } + Rectangle r = FlexoMouse.getClickArea(npc.getConvexHull().getBounds()); + this.clickAreas.add(r); + java.awt.Point p = FlexoMouse.getClickPoint(r); + this.clickPoints.add(p); } } } @@ -194,15 +191,12 @@ public class FlexoPlugin extends Plugin { for (Player player : client.getPlayers()) { - if (player != null) + if (player != null && player.getConvexHull() != null) { - if (player.getConvexHull() != null) - { - Rectangle r = FlexoMouse.getClickArea(player.getConvexHull().getBounds()); - this.clickAreas.add(r); - java.awt.Point p = FlexoMouse.getClickPoint(r); - this.clickPoints.add(p); - } + Rectangle r = FlexoMouse.getClickArea(player.getConvexHull().getBounds()); + this.clickAreas.add(r); + java.awt.Point p = FlexoMouse.getClickPoint(r); + this.clickPoints.add(p); } } } @@ -214,27 +208,21 @@ public class FlexoPlugin extends Plugin Flexo.isStretched = client.isStretchedEnabled(); Flexo.scale = this.scalingFactor; - if (flexo != null) + if (flexo != null && GroundItemsPlugin.getCollectedGroundItems() != null) { - if (GroundItemsPlugin.getCollectedGroundItems() != null) + for (GroundItem gi : GroundItemsPlugin.getCollectedGroundItems().values()) { - for (GroundItem gi : GroundItemsPlugin.getCollectedGroundItems().values()) + if (gi != null) { - if (gi != null) + LocalPoint lp = LocalPoint.fromWorld(client, gi.getLocation()); + if (lp != null && Perspective.getCanvasTilePoly(client, lp) != null) { - LocalPoint lp = LocalPoint.fromWorld(client, gi.getLocation()); - if (lp != null) - { - if (Perspective.getCanvasTilePoly(client, lp) != null) - { - Rectangle r1 = FlexoMouse.getClickArea(Perspective.getCanvasTilePoly(client, lp).getBounds()); - Rectangle r2 = FlexoMouse.getClickArea(r1); - Rectangle r3 = FlexoMouse.getClickArea(r2); - this.clickAreas.add(r3); - java.awt.Point p = FlexoMouse.getClickPoint(r3); - this.clickPoints.add(p); - } - } + Rectangle r1 = FlexoMouse.getClickArea(Perspective.getCanvasTilePoly(client, lp).getBounds()); + Rectangle r2 = FlexoMouse.getClickArea(r1); + Rectangle r3 = FlexoMouse.getClickArea(r2); + this.clickAreas.add(r3); + java.awt.Point p = FlexoMouse.getClickPoint(r3); + this.clickPoints.add(p); } } } From 9a87f7b7be989ef48ae64e5574eb952f2d95bce8 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:11:41 +0200 Subject: [PATCH 118/472] flexo: Use interface instead of type --- .../java/net/runelite/client/plugins/flexo/FlexoOverlay.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java index 811eca25bb..bb3fd371d9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java @@ -34,6 +34,7 @@ import java.awt.Point; import java.awt.Rectangle; import java.awt.geom.Line2D; import java.util.ArrayList; +import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.client.ui.overlay.Overlay; @@ -65,7 +66,7 @@ public class FlexoOverlay extends Overlay if (plugin.isDebugNPCs() || plugin.isDebugGroundItems() || plugin.isDebugPlayers()) { - ArrayList clickAreas = plugin.getClickAreas(); + List clickAreas = plugin.getClickAreas(); if (clickAreas != null) { for (Rectangle clickArea : clickAreas) @@ -77,7 +78,7 @@ public class FlexoOverlay extends Overlay } } - ArrayList clickPoints = plugin.getClickPoints(); + List clickPoints = plugin.getClickPoints(); if (clickPoints != null) { for (Point p : clickPoints) From 5a1a0e215bb10b3422c69f8a5b89bf75c26868c8 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:12:49 +0200 Subject: [PATCH 119/472] flinchingplugin: Merge nested if statements --- .../plugins/flinching/FlinchingPlugin.java | 16 +++++----------- .../plugins/flinching/FlinchingTarget.java | 7 ++----- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java index 0ed62ecd06..0a93c00a23 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java @@ -198,12 +198,9 @@ public class FlinchingPlugin extends Plugin else { FlinchingTarget currentTarget = flinchingTargets.get(hitId); - if (currentTarget != null) + if (currentTarget != null && resetOnHit) { - if (resetOnHit) - { - currentTarget.TargetHit(); - } + currentTarget.TargetHit(); } } } @@ -224,13 +221,10 @@ public class FlinchingPlugin extends Plugin NPC newTarget = (NPC) interacting; currentInteractingId = newTarget.getId(); - if (newTarget.getHealth() <= 0 || newTarget.isDead()) + if ((newTarget.getHealth() <= 0 || newTarget.isDead()) && flinchingTargets.containsKey(currentInteractingId)) { - if (flinchingTargets.containsKey(currentInteractingId)) - { - flinchingTargets.remove(currentInteractingId); - currentInteractingId = -1; - } + flinchingTargets.remove(currentInteractingId); + currentInteractingId = -1; } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java index 58d90cb247..f1d524dd4d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java @@ -63,12 +63,9 @@ public class FlinchingTarget void TargetHit() { boolean shouldHit = true; - if (usingHitDelay) + if (usingHitDelay && GetRemainingTime() > displayLength) { - if (GetRemainingTime() > displayLength) - { - shouldHit = false; - } + shouldHit = false; } if (shouldHit) From edd8035c0d24b57f9cab283277dbe87fd70082ae Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:13:59 +0200 Subject: [PATCH 120/472] freezetimers: Use interface insead of type --- .../runelite/client/plugins/freezetimers/PrayerTracker.java | 5 +++-- .../net/runelite/client/plugins/freezetimers/Timers.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java index 05806a1c24..f22f8821a3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java @@ -24,6 +24,7 @@ package net.runelite.client.plugins.freezetimers; import java.util.HashMap; +import java.util.Map; import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; @@ -40,8 +41,8 @@ public class PrayerTracker @Inject private Client client; - private HashMap> lastTick = new HashMap<>(); - private HashMap> newTick = new HashMap<>(); + private Map> lastTick = new HashMap<>(); + private Map> newTick = new HashMap<>(); public void gameTick() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java index 0d58af3127..132a69df0e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java @@ -24,6 +24,7 @@ package net.runelite.client.plugins.freezetimers; import java.util.HashMap; +import java.util.Map; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Actor; @@ -32,7 +33,7 @@ import net.runelite.api.Actor; @Singleton public class Timers { - private HashMap> timerMap = new HashMap<>(); + private Map> timerMap = new HashMap<>(); void gameTick() { From 2f4892c6a073c08e8757fe8c149f4c78132db907 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:17:03 +0200 Subject: [PATCH 121/472] gpuplugin: Use equals when comparing objects --- .../main/java/net/runelite/client/plugins/gpu/GpuPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java index 272ff27c39..c53392dc2a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java @@ -841,7 +841,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks // Re-create fbo if (lastStretchedCanvasWidth != stretchedCanvasWidth || lastStretchedCanvasHeight != stretchedCanvasHeight - || lastAntiAliasingMode != antiAliasingMode) + || !lastAntiAliasingMode.equals(antiAliasingMode)) { shutdownSceneFbo(); @@ -1012,7 +1012,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks final AnisotropicFilteringMode anisotropicFilteringMode = this.anisotropicFilteringMode; final boolean afEnabled = anisotropicFilteringMode != AnisotropicFilteringMode.DISABLED; - if (lastAnisotropicFilteringMode != anisotropicFilteringMode) + if (!lastAnisotropicFilteringMode.equals(anisotropicFilteringMode)) { if (afEnabled) { From 9e802c26887cf6a0119af6474138a0af017949fc Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:17:49 +0200 Subject: [PATCH 122/472] gpuplugin: Merge nested if statements --- .../runelite/client/plugins/gpu/SceneUploader.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java index 056e32cc39..44dfa51dfa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java @@ -126,21 +126,15 @@ class SceneUploader } GroundObject groundObject = tile.getGroundObject(); - if (groundObject != null) + if (groundObject != null && groundObject.getRenderable() instanceof Model) { - if (groundObject.getRenderable() instanceof Model) - { - ((Model) groundObject.getRenderable()).setBufferOffset(-1); - } + ((Model) groundObject.getRenderable()).setBufferOffset(-1); } DecorativeObject decorativeObject = tile.getDecorativeObject(); - if (decorativeObject != null) + if (decorativeObject != null && decorativeObject.getRenderable() instanceof Model) { - if (decorativeObject.getRenderable() instanceof Model) - { - ((Model) decorativeObject.getRenderable()).setBufferOffset(-1); - } + ((Model) decorativeObject.getRenderable()).setBufferOffset(-1); } GameObject[] gameObjects = tile.getGameObjects(); From 9ea728771362bb378956b068e9318c052e66efeb Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:19:28 +0200 Subject: [PATCH 123/472] grotesqueguardians: Merge nested if statements --- .../GrotesqueGuardiansOverlay.java | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java index ed8602718b..0568e9f16d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java @@ -99,22 +99,19 @@ class GrotesqueGuardiansOverlay extends Overlay { OverlayUtil.renderPolygon(graphics, poly, color); } - if ((plugin.isInGargs()) && (plugin.isNeedingToRun())) + if (plugin.isInGargs() && plugin.isNeedingToRun() && plugin.getDusk() != null && plugin.getDusk().getLocalLocation() != null) { - if ((plugin.getDusk() != null) && (plugin.getDusk().getLocalLocation() != null)) - { - TextComponent textComponent = new TextComponent(); - LocalPoint duskPoint; + TextComponent textComponent = new TextComponent(); + LocalPoint duskPoint; - duskPoint = new LocalPoint(plugin.getDusk().getLocalLocation().getX() + 128 * (plugin.getDusk().getTransformedDefinition().getSize() - 1) / 2, plugin.getDusk().getLocalLocation().getY() + 128 * (plugin.getDusk().getTransformedDefinition().getSize() - 1) / 2); - net.runelite.api.Point duskLoc = Perspective.getCanvasTextLocation(client, graphics, duskPoint, "RUN AWAY", 500); - if (duskLoc != null) - { - textComponent.setText("RUN AWAY"); - textComponent.setPosition(new java.awt.Point(duskLoc.getX(), duskLoc.getY())); - textComponent.setColor(Color.red); - textComponent.render(graphics); - } + duskPoint = new LocalPoint(plugin.getDusk().getLocalLocation().getX() + 128 * (plugin.getDusk().getTransformedDefinition().getSize() - 1) / 2, plugin.getDusk().getLocalLocation().getY() + 128 * (plugin.getDusk().getTransformedDefinition().getSize() - 1) / 2); + net.runelite.api.Point duskLoc = Perspective.getCanvasTextLocation(client, graphics, duskPoint, "RUN AWAY", 500); + if (duskLoc != null) + { + textComponent.setText("RUN AWAY"); + textComponent.setPosition(new java.awt.Point(duskLoc.getX(), duskLoc.getY())); + textComponent.setColor(Color.red); + textComponent.render(graphics); } } } From 199953bc727d3cbaef2651df7349efcb4b1a670c Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:20:47 +0200 Subject: [PATCH 124/472] grounditems: Some broke their keyboard --- .../plugins/grounditems/GroundItemsPlugin.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java index f2e70b9fdc..2868f9e41a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java @@ -273,7 +273,10 @@ public class GroundItemsPlugin extends Plugin { for (GroundItem item : collectedGroundItems.values()) { - if (item.getTicks() == -1) continue; + if (item.getTicks() == -1) + { + continue; + } item.setTicks(item.getTicks() - 1); } } @@ -488,21 +491,31 @@ public class GroundItemsPlugin extends Plugin if (this.rightClickHidden) { if (aHidden && bMenuType == WALK) + { return -1; + } if (bHidden && aMenuType == WALK) + { return 1; + } } // sort hidden items below non-hidden items if (aHidden && !bHidden && bMenuType != WALK) + { return -1; + } if (bHidden && !aHidden && aMenuType != WALK) + { return 1; + } // RS sorts by alch price by private, so no need to sort if config not set if (this.sortByGEPrice) + { return (getGePriceFromItemId(aId) * aQuantity) - (getGePriceFromItemId(bId) * bQuantity); + } } } @@ -867,7 +880,9 @@ public class GroundItemsPlugin extends Plugin { // so that "Prayer Potion (4)" returns 1 instead of 4 and "Coins (25)" returns 25 instead of 1 if (!itemNameIncludesQuantity || matches >= 1) + { lastMatch = matcher.group(1); + } matches++; } From f6c1ebeb2b7be4a9c47305607ed146003801cca7 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:21:33 +0200 Subject: [PATCH 125/472] grounditems: Use equals when comparing objects --- .../runelite/client/plugins/grounditems/GroundItemsOverlay.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java index 14ff283672..82fa52a8e4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java @@ -352,7 +352,7 @@ public class GroundItemsOverlay extends Overlay plugin.setHighlightBoxBounds(new SimpleEntry<>(itemHighlightBox, item)); } - boolean topItem = topGroundItem == item; + boolean topItem = topGroundItem.equals(item); // Draw background if hovering if (topItem && (mouseInBox || mouseInHiddenBox || mouseInHighlightBox)) From a966be8894c168d2c63e2ddc8fdf78b09ba433f8 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:22:12 +0200 Subject: [PATCH 126/472] grounditems: Merge nested if statements --- .../plugins/grounditems/GroundItemInputListener.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java index 4badf41ef4..ee6f137b14 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java @@ -119,14 +119,11 @@ public class GroundItemInputListener extends MouseAdapter implements KeyListener return e; } } - else if (SwingUtilities.isRightMouseButton(e)) + else if (SwingUtilities.isRightMouseButton(e) && plugin.getTextBoxBounds() != null && plugin.getTextBoxBounds().getKey().contains(mousePos)) { - if (plugin.getTextBoxBounds() != null && plugin.getTextBoxBounds().getKey().contains(mousePos)) - { - plugin.updateList(plugin.getTextBoxBounds().getValue().getName(), true); - e.consume(); - return e; - } + plugin.updateList(plugin.getTextBoxBounds().getValue().getName(), true); + e.consume(); + return e; } } From 28ba3b8223e4a6d94100290b961255dbf3bf8cf4 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:26:28 +0200 Subject: [PATCH 127/472] ammo: Final fields --- .../java/net/runelite/client/plugins/ammo/AmmoCounter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoCounter.java index 4350c80699..fe9729246c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoCounter.java @@ -39,9 +39,9 @@ class AmmoCounter extends Counter { @Getter(AccessLevel.PACKAGE) private int itemID; - private String name; - private int total; - private Instant time; + private final String name; + private final int total; + private final Instant time; private BigDecimal ammoPerHour; AmmoCounter(Plugin plugin, int itemID, int count, String name, BufferedImage image) From f4dba0101106543f67c1f1819abf4f14a86eadcf Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:27:26 +0200 Subject: [PATCH 128/472] antidrag: Method can be private --- .../net/runelite/client/plugins/antidrag/AntiDragPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java index 9c625977a2..ed6d07b6af 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java @@ -144,7 +144,7 @@ public class AntiDragPlugin extends Plugin } } - public void updateConfig() + private void updateConfig() { this.alwaysOn = config.alwaysOn(); this.keybind = config.keybind(); From b22aef51fe0bc6041ad969756d4832b691776af2 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:28:37 +0200 Subject: [PATCH 129/472] aoewarnings: Method can be private --- .../runelite/client/plugins/aoewarnings/AoeWarningPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java index 730e36b204..95ea50287e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java @@ -450,7 +450,7 @@ public class AoeWarningPlugin extends Plugin return false; } - public void updateConfig() + private void updateConfig() { this.aoeNotifyAll = config.aoeNotifyAll(); this.overlayColor = config.overlayColor(); From 028b31f3e0be07ed6531c4c5e2eede00b9233007 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:29:09 +0200 Subject: [PATCH 130/472] attackstyles: Method can be private --- .../client/plugins/attackstyles/AttackStylesPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java index a8465962e0..1a99f715af 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java @@ -269,7 +269,7 @@ public class AttackStylesPlugin extends Plugin } } - public void updateConfig() + private void updateConfig() { this.alwaysShowStyle = config.alwaysShowStyle(); this.warnForDefence = config.warnForDefence(); From 588d4352a0673505d0a409302228b179ed1ea562 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:30:00 +0200 Subject: [PATCH 131/472] bank: Method can be private --- .../main/java/net/runelite/client/plugins/bank/BankPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java index 2cf7e2b746..d5cebbd51d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java @@ -203,7 +203,7 @@ public class BankPlugin extends Plugin updateConfig(); } - public void updateConfig() + private void updateConfig() { this.showGE = config.showGE(); this.showHA = config.showHA(); From 35b8fab8f89fb0d98c580b1f69aadfd9262a615b Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:31:16 +0200 Subject: [PATCH 132/472] banktags: Metod can be private --- .../java/net/runelite/client/plugins/banktags/TagManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/TagManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/TagManager.java index c1d5ff8c11..d2ab9ead96 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/TagManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/TagManager.java @@ -66,7 +66,7 @@ public class TagManager this.clueScrollService = clueScrollService; } - String getTagString(int itemId, boolean variation) + private String getTagString(int itemId, boolean variation) { itemId = getItemId(itemId, variation); From ace36d106db2e7886de84515230988ba72880bd7 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:32:53 +0200 Subject: [PATCH 133/472] banktags: Add null checks --- .../plugins/banktags/tabs/TabInterface.java | 38 +++++++++++++------ 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java index da89b7077e..1e26d51f87 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java @@ -53,8 +53,8 @@ import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.api.InventoryID; import net.runelite.api.Item; -import net.runelite.api.ItemDefinition; import net.runelite.api.ItemContainer; +import net.runelite.api.ItemDefinition; import net.runelite.api.MenuAction; import net.runelite.api.MenuEntry; import net.runelite.api.Point; @@ -579,11 +579,14 @@ public class TabInterface if (event.getOption().startsWith(CHANGE_ICON + " (")) { ItemDefinition item = getItem(event.getActionParam0()); - int itemId = itemManager.canonicalize(item.getId()); - iconToSet.setIconItemId(itemId); - iconToSet.getIcon().setItemId(itemId); - tabManager.setIcon(iconToSet.getTag(), itemId + ""); - event.consume(); + if (item != null) + { + int itemId = itemManager.canonicalize(item.getId()); + iconToSet.setIconItemId(itemId); + iconToSet.getIcon().setItemId(itemId); + tabManager.setIcon(iconToSet.getTag(), itemId + ""); + event.consume(); + } } // Reset icon selection even when we do not clicked item with icon @@ -613,9 +616,13 @@ public class TabInterface // Add "remove" menu entry to all items in bank while tab is selected event.consume(); final ItemDefinition item = getItem(event.getActionParam0()); - final int itemId = item.getId(); - tagManager.removeTag(itemId, activeTab.getTag()); - bankSearch.search(InputType.SEARCH, TAG_SEARCH + activeTab.getTag(), true); + final int itemId; + if (item != null) + { + itemId = item.getId(); + tagManager.removeTag(itemId, activeTab.getTag()); + bankSearch.search(InputType.SEARCH, TAG_SEARCH + activeTab.getTag(), true); + } } else if (event.getMenuAction() == MenuAction.RUNELITE && ((event.getActionParam1() == WidgetInfo.BANK_DEPOSIT_INVENTORY.getId() && event.getOption().equals(TAG_INVENTORY)) @@ -1006,8 +1013,17 @@ public class TabInterface private ItemDefinition getItem(int idx) { ItemContainer bankContainer = client.getItemContainer(InventoryID.BANK); - Item item = bankContainer.getItems()[idx]; - return itemManager.getItemDefinition(item.getId()); + Item item = null; + if (bankContainer != null) + { + item = bankContainer.getItems()[idx]; + } + if (item != null) + { + return itemManager.getItemDefinition(item.getId()); + } + + return null; } private void openTag(final String tag) From 8e3b8e85ac0049e71ab7fb008c0587dc6663e054 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:34:10 +0200 Subject: [PATCH 134/472] banktags: Merge switch branches with the same code --- .../net/runelite/client/plugins/banktags/BankTagsPlugin.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java index 9b3d72fa53..11c64fd0e3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java @@ -246,10 +246,8 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyLis intStack[intStackSize - 1] = 0; break; case "hideLine": - // hide the widget for the line separator - intStack[intStackSize - 1] = 1; - break; case "hideTabText": + // hide the widget for the line separator // hide the widget for the "Tab x" text intStack[intStackSize - 1] = 1; break; From 9279b17afbc9f5eadd71ff1ecf4c2557ec4ca107 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:34:44 +0200 Subject: [PATCH 135/472] banlist: Method can be private --- .../java/net/runelite/client/plugins/banlist/BanListPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java index 916bf5f080..c2734022f3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java @@ -134,7 +134,7 @@ public class BanListPlugin extends Plugin } } - public void updateConfig() + private void updateConfig() { this.enableWDR = config.enableWDR(); this.enableRuneWatch = config.enableRuneWatch(); From 170d630e04ee99b7aa8696fc6c03f630ef5c644c Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:35:13 +0200 Subject: [PATCH 136/472] banlist: Final fields --- .../runelite/client/plugins/banlist/BanListPlugin.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java index c2734022f3..f1fad45f68 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java @@ -85,10 +85,10 @@ public class BanListPlugin extends Plugin @Inject private ChatMessageManager chatMessageManager; - private List wdrScamArrayList = new ArrayList<>(); - private List wdrToxicArrayList = new ArrayList<>(); - private List runeWatchArrayList = new ArrayList<>(); - private List manualBans = new ArrayList<>(); + private final List wdrScamArrayList = new ArrayList<>(); + private final List wdrToxicArrayList = new ArrayList<>(); + private final List runeWatchArrayList = new ArrayList<>(); + private final List manualBans = new ArrayList<>(); @Provides BanListConfig getConfig(ConfigManager configManager) From 4477664a4b2c93fbfc2b2b3eb4a70c7c822b0681 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:36:14 +0200 Subject: [PATCH 137/472] barbarianassault: Method can be private --- .../client/plugins/barbarianassault/BarbarianAssaultPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java index e041e98356..d97b5e9c79 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java @@ -449,7 +449,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener } } - public void updateConfig() + private void updateConfig() { this.swapLadder = config.swapLadder(); this.showTimer = config.showTimer(); From 61314f6a2b963a7e55f8df4a52f8febc32b4843f Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:36:42 +0200 Subject: [PATCH 138/472] barbarianassault: Final fields --- .../plugins/barbarianassault/BarbarianAssaultPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java index d97b5e9c79..0c39075df7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java @@ -234,9 +234,9 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener private BufferedImage torsoImage, fighterImage, healerImage, rangerImage, runnerImage; - private List deathTimes = new ArrayList<>(); + private final List deathTimes = new ArrayList<>(); - private Map projectiles = new HashMap<>(); + private final Map projectiles = new HashMap<>(); private TimerBox tickCounter; From b83fdf38c1b479d2b744f350aff283ea79b9a712 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:37:15 +0200 Subject: [PATCH 139/472] barrows: Metoh can be private --- .../java/net/runelite/client/plugins/barrows/BarrowsPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java index 6b5b484f0f..beeb0ba8cf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java @@ -207,7 +207,7 @@ public class BarrowsPlugin extends Plugin } } - public void updateConfig() + private void updateConfig() { this.showMinimap = config.showMinimap(); this.showBrotherLoc = config.showBrotherLoc(); From 2f2368b0c053c5e0c627df0533e4f7835df8072e Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:38:02 +0200 Subject: [PATCH 140/472] blastfurnance: Method can be private --- .../client/plugins/blastfurnace/BlastFurnacePlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java index 7c50696f55..c1afdb3bee 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java @@ -210,7 +210,7 @@ public class BlastFurnacePlugin extends Plugin } } - public void updateConfig() + private void updateConfig() { this.showBarDispenser = config.showBarDispenser(); this.showConveyorBelt = config.showConveyorBelt(); From 0b92810b1cd2e064e773302e62d466f86635abd0 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:39:03 +0200 Subject: [PATCH 141/472] boost: class can be package private --- .../net/runelite/client/plugins/boosts/StatChangeIndicator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/StatChangeIndicator.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/StatChangeIndicator.java index 5c9ef73762..946d6a6517 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/StatChangeIndicator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/StatChangeIndicator.java @@ -29,7 +29,7 @@ import java.awt.image.BufferedImage; import net.runelite.client.ui.overlay.infobox.InfoBox; import net.runelite.client.ui.overlay.infobox.InfoBoxPriority; -public class StatChangeIndicator extends InfoBox +class StatChangeIndicator extends InfoBox { private final boolean up; private final BoostsPlugin plugin; From af337b4ca12a82991c9128b00665adedc0ab0d23 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:39:28 +0200 Subject: [PATCH 142/472] boost: Final fields --- .../java/net/runelite/client/plugins/boosts/BoostsPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java index a3ea8a41de..24fe817eb5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java @@ -106,7 +106,7 @@ public class BoostsPlugin extends Plugin private int lastChangeUp = -1; private boolean preserveBeenActive = false; private long lastTickMillis; - private List boostedSkillsChanged = new ArrayList<>(); + private final List boostedSkillsChanged = new ArrayList<>(); private boolean enableSkill; @Getter(AccessLevel.PACKAGE) From cfda8561e3affa03d908b66f104673b1b69c84ff Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:41:27 +0200 Subject: [PATCH 143/472] cannon: Make class package private --- .../java/net/runelite/client/plugins/cannon/CannonCounter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonCounter.java index bd13e194be..a4b8028e47 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonCounter.java @@ -28,7 +28,7 @@ import java.awt.Color; import java.awt.image.BufferedImage; import net.runelite.client.ui.overlay.infobox.InfoBox; -public class CannonCounter extends InfoBox +class CannonCounter extends InfoBox { private final CannonPlugin plugin; From f93f71945219685adacd585a1c96b11947bc85fc Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:43:22 +0200 Subject: [PATCH 144/472] chatcommands: Class can be package private --- .../client/plugins/chatcommands/ChatKeyboardListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatKeyboardListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatKeyboardListener.java index dc9c1fffe1..d32dab3fc1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatKeyboardListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatKeyboardListener.java @@ -34,7 +34,7 @@ import net.runelite.client.callback.ClientThread; import net.runelite.client.input.KeyListener; @Singleton -public class ChatKeyboardListener implements KeyListener +class ChatKeyboardListener implements KeyListener { @Inject private ChatCommandsConfig chatCommandsConfig; From 9f2e8fb72fe5d0be7b7f0193403f152072bac591 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:44:54 +0200 Subject: [PATCH 145/472] chatnotifications: Final field --- .../plugins/chatnotifications/ChatNotificationsPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java index 0f8c5f1847..00b7cc80d4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java @@ -82,7 +82,7 @@ public class ChatNotificationsPlugin extends Plugin private Pattern highlightMatcher = null; // Private message cache used to avoid duplicate notifications from ChatHistory. - private Set privateMessageHashes = new HashSet<>(); + private final Set privateMessageHashes = new HashSet<>(); private boolean highlightOwnName; private String highlightWordsString; From a0b3c63af236588005434b38a5d9cfb77c49eb1b Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:45:46 +0200 Subject: [PATCH 146/472] chattranslation: Class can be package private --- .../net/runelite/client/plugins/chattranslation/Translator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java index 71e34d16d9..5164f13bb0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java @@ -9,7 +9,7 @@ import java.net.HttpURLConnection; import java.net.URL; import java.net.URLEncoder; -public class Translator +class Translator { public String translate(String source, String target, String message) throws Exception From 6d3a393cab06ce672a8ba9309f5baef4f11cc94e Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:46:11 +0200 Subject: [PATCH 147/472] chattranslation: Final field --- .../client/plugins/chattranslation/ChatTranslationPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java index 7fbee20156..10bd0c4f09 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java @@ -50,7 +50,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener private static final ImmutableList AFTER_OPTIONS = ImmutableList.of("Message", "Add ignore", "Remove friend", "Kick"); - private List playerNames = new ArrayList<>(); + private final List playerNames = new ArrayList<>(); @Inject private Client client; From 0731d03e3cdda3c84dc3af4fe23efb9dbec17279 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:47:01 +0200 Subject: [PATCH 148/472] chattranslation: Stringbuffer -> Stringbuilder --- .../net/runelite/client/plugins/chattranslation/Translator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java index 5164f13bb0..8ab04b3281 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java @@ -23,7 +23,7 @@ class Translator BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream())); String inputLine; - StringBuffer response = new StringBuffer(); + StringBuilder response = new StringBuilder(); while ((inputLine = in.readLine()) != null) { From b375bc329dac899847508c9f64365119921adc23 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:48:18 +0200 Subject: [PATCH 149/472] chattranslation: Replace lambda statement with lambda expression --- .../client/plugins/chattranslation/ChatTranslationPlugin.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java index 10bd0c4f09..9dcaae6540 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java @@ -274,9 +274,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, translation); clientThread.invoke(() -> - { - client.runScript(96, 0, translation); - }); + client.runScript(96, 0, translation)); } client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, ""); } From c10bfc650b2618dea1b99c0445decb6ba83bfdf8 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:48:58 +0200 Subject: [PATCH 150/472] clanchat: Final fields --- .../net/runelite/client/plugins/clanchat/ClanChatPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java index a8da56e48d..41b0db6e7d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java @@ -121,13 +121,13 @@ public class ClanChatPlugin extends Plugin return (CopyOnWriteArrayList) clanMembers.clone(); } - private static CopyOnWriteArrayList clanMembers = new CopyOnWriteArrayList<>(); + private static final CopyOnWriteArrayList clanMembers = new CopyOnWriteArrayList<>(); private ClanChatIndicator clanMemberCounter; /** * queue of temporary messages added to the client */ private final Deque clanJoinMessages = new ArrayDeque<>(); - private Map activityBuffer = new HashMap<>(); + private final Map activityBuffer = new HashMap<>(); private int clanJoinedTick; private boolean clanChatIcons; From b66039167cc5a1d3dbc85b59a5c825fab59102c9 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:49:31 +0200 Subject: [PATCH 151/472] clanmanmode: Final fields --- .../runelite/client/plugins/clanmanmode/ClanManModePlugin.java | 2 +- .../runelite/client/plugins/clanmanmode/ClanManModeService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 7626c95c11..5313fec5f8 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 @@ -94,7 +94,7 @@ public class ClanManModePlugin extends Plugin int clanmax; int inwildy; int ticks; - Map clan = new HashMap<>(); + final Map clan = new HashMap<>(); @Override protected void startUp() throws Exception diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java index 10e3337a64..02ccf87b7c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java @@ -25,7 +25,7 @@ public class ClanManModeService this.plugin = plugin; } - private Map interactors = new HashMap<>(); + private final Map interactors = new HashMap<>(); public void forEachPlayer(final BiConsumer consumer) { From 0ec10221f10be3c6f2079d7a02f31162678eb648 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:50:54 +0200 Subject: [PATCH 152/472] cluescroll: Final fields --- .../cluescrolls/clues/emote/AllRequirementsCollection.java | 2 +- .../cluescrolls/clues/emote/AnyRequirementCollection.java | 4 ++-- .../cluescrolls/clues/emote/RangeItemRequirement.java | 6 +++--- .../cluescrolls/clues/emote/SingleItemRequirement.java | 2 +- .../cluescrolls/clues/emote/SlotLimitationRequirement.java | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AllRequirementsCollection.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AllRequirementsCollection.java index 2efe470b84..aa8fde3a15 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AllRequirementsCollection.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AllRequirementsCollection.java @@ -29,7 +29,7 @@ import net.runelite.api.Item; public class AllRequirementsCollection implements ItemRequirement { - private ItemRequirement[] requirements; + private final ItemRequirement[] requirements; public AllRequirementsCollection(ItemRequirement... requirements) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AnyRequirementCollection.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AnyRequirementCollection.java index 02a713f7b0..45f1086267 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AnyRequirementCollection.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AnyRequirementCollection.java @@ -29,8 +29,8 @@ import net.runelite.api.Item; public class AnyRequirementCollection implements ItemRequirement { - private String name; - private ItemRequirement[] requirements; + private final String name; + private final ItemRequirement[] requirements; public AnyRequirementCollection(String name, ItemRequirement... requirements) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/RangeItemRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/RangeItemRequirement.java index 92d1f14de8..ae716a54b8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/RangeItemRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/RangeItemRequirement.java @@ -29,9 +29,9 @@ import net.runelite.api.Item; public class RangeItemRequirement implements ItemRequirement { - private String name; - private int startItemId; - private int endItemId; + private final String name; + private final int startItemId; + private final int endItemId; public RangeItemRequirement(String name, int startItemId, int endItemId) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SingleItemRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SingleItemRequirement.java index 834fbe7739..333da4c47b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SingleItemRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SingleItemRequirement.java @@ -30,7 +30,7 @@ import net.runelite.api.ItemDefinition; public class SingleItemRequirement implements ItemRequirement { - private int itemId; + private final int itemId; public SingleItemRequirement(int itemId) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SlotLimitationRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SlotLimitationRequirement.java index 1fae03dde5..697f6a59e5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SlotLimitationRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SlotLimitationRequirement.java @@ -30,8 +30,8 @@ import net.runelite.api.Item; public class SlotLimitationRequirement implements ItemRequirement { - private String description; - private EquipmentInventorySlot[] slots; + private final String description; + private final EquipmentInventorySlot[] slots; public SlotLimitationRequirement(String description, EquipmentInventorySlot... slots) { From 54dbb968b68bc37db18930202c567319619963de Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:51:54 +0200 Subject: [PATCH 153/472] cluescroll: Remove unused imports --- .../runelite/client/plugins/cluescrolls/ClueScrollPlugin.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java index 8d0b5aaf86..bc0c3d6526 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java @@ -36,10 +36,8 @@ import java.awt.Rectangle; import java.awt.geom.Area; import java.awt.image.BufferedImage; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Objects; -import java.util.stream.Stream; import javax.inject.Inject; import javax.inject.Singleton; import lombok.Getter; From 71b00d32ae166ef01733712ae3a8498e628bb338 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:52:35 +0200 Subject: [PATCH 154/472] combatcounter: Final fields --- .../runelite/client/plugins/combatcounter/CombatCounter.java | 4 ++-- .../client/plugins/combatcounter/NPCDamageCounter.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java index 6d09d92c6f..4c12d83363 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java @@ -89,9 +89,9 @@ public class CombatCounter extends Plugin @Getter(AccessLevel.PACKAGE) private Map counter = new HashMap<>(); - private Map blowpipe = new HashMap<>(); + private final Map blowpipe = new HashMap<>(); - private Map npcDamageMap = new HashMap<>(); + private final Map npcDamageMap = new HashMap<>(); Map playerDamage = new HashMap<>(); @Getter(AccessLevel.PACKAGE) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/NPCDamageCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/NPCDamageCounter.java index 2c5a848c89..8e9d96e24e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/NPCDamageCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/NPCDamageCounter.java @@ -10,9 +10,9 @@ import javax.inject.Singleton; class NPCDamageCounter { - Map> attackers; + final Map> attackers; - List damage; + final List damage; NPCDamageCounter() { From 6207cb1f787d15b32e40bec40278d67e0ac54299 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:54:19 +0200 Subject: [PATCH 155/472] config: (Package) private class/field/method --- .../java/net/runelite/client/plugins/config/HotkeyButton.java | 4 ++-- .../net/runelite/client/plugins/config/PluginListItem.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java index 98fc840a7c..1ec669b9da 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java @@ -34,7 +34,7 @@ import net.runelite.client.config.Keybind; import net.runelite.client.config.ModifierlessKeybind; @Singleton -public class HotkeyButton extends JButton +class HotkeyButton extends JButton { @Getter(AccessLevel.PACKAGE) private Keybind value; @@ -63,7 +63,7 @@ public class HotkeyButton extends JButton }); } - public void setValue(Keybind value) + private void setValue(Keybind value) { if (value == null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java index 22065fc7df..726652c92c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java @@ -62,7 +62,7 @@ public class PluginListItem extends JPanel private static final ImageIcon OFF_STAR; private final ConfigPanel configPanel; - public final ConfigManager configManager; + private final ConfigManager configManager; @Getter @Nullable From 049d3ec7b7d5af00854aa19e48df5fb18bb43553 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:54:44 +0200 Subject: [PATCH 156/472] config: Final fields --- .../plugins/config/DeferredDocumentChangedListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/DeferredDocumentChangedListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/DeferredDocumentChangedListener.java index c8ce0b37dc..7dbd7d73b4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/DeferredDocumentChangedListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/DeferredDocumentChangedListener.java @@ -10,8 +10,8 @@ import javax.swing.event.DocumentListener; class DeferredDocumentChangedListener implements DocumentListener { - private Timer timer; - private List listeners; + private final Timer timer; + private final List listeners; DeferredDocumentChangedListener() { From cefa24f4c3a4c44100a5dadf545f6d1c58f6b994 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:55:32 +0200 Subject: [PATCH 157/472] config: Replace lambda statement with lambda expression --- .../java/net/runelite/client/plugins/config/HotkeyButton.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java index 1ec669b9da..2146c9f9fa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java @@ -43,9 +43,7 @@ class HotkeyButton extends JButton { setValue(value); addActionListener(e -> - { - setValue(Keybind.NOT_SET); - }); + setValue(Keybind.NOT_SET)); addKeyListener(new KeyAdapter() { @Override From 5b68c80569a1aad4ddfa056b5e772d37fae678bf Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:57:51 +0200 Subject: [PATCH 158/472] config: Null checks --- .../java/net/runelite/client/plugins/config/ConfigPanel.java | 5 +++-- .../net/runelite/client/plugins/config/PluginListItem.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java index b328842794..8a8692b947 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java @@ -48,6 +48,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.Objects; import java.util.concurrent.ScheduledExecutorService; import java.util.stream.Collectors; import javax.inject.Singleton; @@ -992,7 +993,7 @@ public class ConfigPanel extends PluginPanel if (e.getStateChange() == ItemEvent.SELECTED) { changeConfiguration(listItem, config, box, cd, cid); - box.setToolTipText(box.getSelectedItem().toString()); + box.setToolTipText(Objects.requireNonNull(box.getSelectedItem()).toString()); } }); item.add(box, BorderLayout.EAST); @@ -1175,7 +1176,7 @@ public class ConfigPanel extends PluginPanel else if (component instanceof JComboBox) { JComboBox jComboBox = (JComboBox) component; - configManager.setConfiguration(cd.getGroup().value(), cid.getItem().keyName(), ((Enum) jComboBox.getSelectedItem()).name()); + configManager.setConfiguration(cd.getGroup().value(), cid.getItem().keyName(), ((Enum) Objects.requireNonNull(jComboBox.getSelectedItem())).name()); for (ConfigItemDescriptor cid2 : cd.getItems()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java index 726652c92c..505cd8adeb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java @@ -186,7 +186,7 @@ public class PluginListItem extends JPanel buttonPanel.add(configButton); // add a listener to configButton only if there are config items to show - if (config != null && !configDescriptor.getItems().stream().allMatch(item -> item.getItem().hidden())) + if (configDescriptor != null && config != null && !configDescriptor.getItems().stream().allMatch(item -> item.getItem().hidden())) { configButton.addActionListener(e -> { From 549444733d6e271073a24e959097acd8eb58ad1a Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 04:58:36 +0200 Subject: [PATCH 159/472] config: Local field --- .../java/net/runelite/client/plugins/config/PluginListItem.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java index 505cd8adeb..0a226cb72b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java @@ -62,7 +62,6 @@ public class PluginListItem extends JPanel private static final ImageIcon OFF_STAR; private final ConfigPanel configPanel; - private final ConfigManager configManager; @Getter @Nullable @@ -144,7 +143,6 @@ public class PluginListItem extends JPanel @Nullable ConfigDescriptor configDescriptor, String name, String description, String... tags) { this.configPanel = configPanel; - this.configManager = configManager; this.plugin = plugin; this.config = config; this.configDescriptor = configDescriptor; From b1655323cbe813941dcf337b4ed5fa88ee250e9b Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:00:44 +0200 Subject: [PATCH 160/472] demonicgorilla: Final fields --- .../client/plugins/demonicgorilla/DemonicGorillaOverlay.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaOverlay.java index eaaf010435..53b64457eb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaOverlay.java @@ -53,8 +53,8 @@ public class DemonicGorillaOverlay extends Overlay private static final int OVERLAY_ICON_DISTANCE = 50; private static final int OVERLAY_ICON_MARGIN = 8; - private Client client; - private DemonicGorillaPlugin plugin; + private final Client client; + private final DemonicGorillaPlugin plugin; @Inject private SkillIconManager iconManager; From f51aaa20d1601f4c3c613b29f1765554c50dc5de Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:02:43 +0200 Subject: [PATCH 161/472] discord: Method can be private --- .../java/net/runelite/client/plugins/discord/DiscordPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java index abbd4e6029..f78f7c402e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java @@ -445,7 +445,7 @@ public class DiscordPlugin extends Plugin return false; } - public void updateConfig() + private void updateConfig() { this.actionTimeout = config.actionTimeout(); this.hideElapsedTime = config.hideElapsedTime(); From 748bb27f1cf56c343d103c1fc9c1bbcebc4ad2da Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:03:07 +0200 Subject: [PATCH 162/472] discord: Final fields --- .../java/net/runelite/client/plugins/discord/DiscordPlugin.java | 2 +- .../java/net/runelite/client/plugins/discord/DiscordState.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java index f78f7c402e..cfeff83a8d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java @@ -110,7 +110,7 @@ public class DiscordPlugin extends Plugin @Inject private WSClient wsClient; - private Map skillExp = new HashMap<>(); + private final Map skillExp = new HashMap<>(); private NavigationButton discordButton; private boolean loginFlag; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java index fb37f5245d..93c3c1b28c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java @@ -57,7 +57,7 @@ class DiscordState private final List events = new ArrayList<>(); private final DiscordService discordService; private final DiscordPlugin plugin; - private PartyService party; + private final PartyService party; private final RuneLiteProperties properties; private DiscordPresence lastPresence; From 05acb2bf2c3b7085af4cc5048553ee061e57e12d Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:05:22 +0200 Subject: [PATCH 163/472] discord: Var already assigned --- .../runelite/client/plugins/discord/DiscordGameEventType.java | 1 - 1 file changed, 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java index ac5487f6a8..ea63fe7136 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java @@ -301,7 +301,6 @@ enum DiscordGameEventType this.details = training(skill); this.priority = priority; this.imageKey = imageKeyOf(skill); - this.priority = priority; this.shouldTimeout = true; } From 446bb4e39b60970ba651cb71ab12ad79ac7ca1ef Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:06:31 +0200 Subject: [PATCH 164/472] equipmentinspector: (Package) private class/method --- .../plugins/equipmentinspector/EquipmentInspectorPanel.java | 2 +- .../plugins/equipmentinspector/EquipmentInspectorPlugin.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPanel.java index b48a58e153..a930873623 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPanel.java @@ -49,7 +49,7 @@ import net.runelite.client.ui.PluginPanel; @Slf4j @Singleton -public class EquipmentInspectorPanel extends PluginPanel +class EquipmentInspectorPanel extends PluginPanel { private final static String NO_PLAYER_SELECTED = "No player selected"; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java index 10680e620b..84e784ba48 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java @@ -306,7 +306,7 @@ public class EquipmentInspectorPlugin extends Plugin } } - public void updateConfig() + private void updateConfig() { this.ShowValue = config.ShowValue(); this.protecteditems = config.protecteditems(); From 85fb0d2fe68ffc05aa875baf141517d58188c453 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:06:49 +0200 Subject: [PATCH 165/472] equipmentinspector: Final fields --- .../equipmentinspector/EquipmentInspectorPanel.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPanel.java index a930873623..967d0fb730 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPanel.java @@ -53,10 +53,10 @@ class EquipmentInspectorPanel extends PluginPanel { private final static String NO_PLAYER_SELECTED = "No player selected"; - private GridBagConstraints c; - private JPanel equipmentPanels; - private JPanel header; - private JLabel nameLabel; + private final GridBagConstraints c; + private final JPanel equipmentPanels; + private final JPanel header; + private final JLabel nameLabel; @Inject private ItemManager itemManager; From 49df9518e38eb204fdf090b40f9187c07eeb9c3b Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:07:32 +0200 Subject: [PATCH 166/472] experiencedrop: Final field --- .../runelite/client/plugins/experiencedrop/XpDropPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java index a94da44953..be5643bb68 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java @@ -103,7 +103,7 @@ public class XpDropPlugin extends Plugin private boolean hasDropped = false; private boolean correctPrayer; private Skill lastSkill = null; - private Map previousSkillExpTable = new EnumMap<>(Skill.class); + private final Map previousSkillExpTable = new EnumMap<>(Skill.class); private PrayerType currentTickPrayer; private XpDropConfig.DamageMode damageMode; From 463a93cd315f119872912b5991e257299551a3f3 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:08:07 +0200 Subject: [PATCH 167/472] experiencedrop: Stringbuilder -> String --- .../client/plugins/experiencedrop/XpDropPlugin.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java index be5643bb68..ce76c45f00 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java @@ -401,12 +401,10 @@ public class XpDropPlugin extends Plugin final String[] stringStack = client.getStringStack(); final int stringStackSize = client.getStringStackSize(); - StringBuilder builder = new StringBuilder() - .append(stringStack[stringStackSize - 1]) - .append(ColorUtil.colorTag(this.damageColor)) - .append(" (").append(damage).append(")"); - - stringStack[stringStackSize - 1] = builder.toString(); + String builder = stringStack[stringStackSize - 1] + + ColorUtil.colorTag(this.damageColor) + + " (" + damage + ")"; + stringStack[stringStackSize - 1] = builder; } } From 9a3613b33d46f3cea14b16de91bd8c3e2a3ecdc3 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:08:44 +0200 Subject: [PATCH 168/472] feed: Final fields --- .../java/net/runelite/client/plugins/feed/FeedPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java index 0366361345..59de3a4465 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java @@ -69,8 +69,8 @@ public class FeedPlugin extends Plugin private FeedPanel feedPanel; private NavigationButton navButton; - private FeedClient feedClient = new FeedClient(); - private Supplier feedSupplier = Suppliers.memoizeWithExpiration(() -> + private final FeedClient feedClient = new FeedClient(); + private final Supplier feedSupplier = Suppliers.memoizeWithExpiration(() -> { try { From ade26550abda000219dd3a68467679f05bb292f1 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:09:32 +0200 Subject: [PATCH 169/472] fightcave: Final fields --- .../client/plugins/fightcave/FightCaveContainer.java | 2 +- .../runelite/client/plugins/fightcave/FightCaveOverlay.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveContainer.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveContainer.java index 3bc482bf51..7b32f5c087 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveContainer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveContainer.java @@ -97,7 +97,7 @@ class FightCaveContainer TZTOKJAD1(NpcID.TZTOKJAD, AttackStyle.UNKNOWN, ImmutableSet.of(AnimationID.TZTOK_JAD_MAGIC_ATTACK, AnimationID.TZTOK_JAD_RANGE_ATTACK, AnimationID.TZTOK_JAD_MELEE_ATTACK), 0), TZTOKJAD2(NpcID.TZTOKJAD_6506, AttackStyle.UNKNOWN, ImmutableSet.of(AnimationID.TZTOK_JAD_MAGIC_ATTACK, AnimationID.TZTOK_JAD_RANGE_ATTACK, AnimationID.TZTOK_JAD_MELEE_ATTACK), 0); - private static ImmutableMap idMap; + private static final ImmutableMap idMap; static { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java index 4f9c675825..8cf64da3f4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java @@ -48,9 +48,9 @@ import net.runelite.client.util.ImageUtil; @Singleton public class FightCaveOverlay extends Overlay { - private FightCavePlugin plugin; - private Client client; - private SpriteManager spriteManager; + private final FightCavePlugin plugin; + private final Client client; + private final SpriteManager spriteManager; @Inject FightCaveOverlay(final Client client, final FightCavePlugin plugin, final SpriteManager spriteManager) From e06b9a1a998020f987fd44baadfd9b71fe48b47d Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:10:17 +0200 Subject: [PATCH 170/472] flexo: Remove unused import --- .../java/net/runelite/client/plugins/flexo/FlexoOverlay.java | 1 - 1 file changed, 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java index bb3fd371d9..3ead0d19d9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java @@ -33,7 +33,6 @@ import java.awt.Graphics2D; import java.awt.Point; import java.awt.Rectangle; import java.awt.geom.Line2D; -import java.util.ArrayList; import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; From 97d2008ca638b62c9caf9650087746ecd0895ce0 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:11:42 +0200 Subject: [PATCH 171/472] flinching: Final field --- .../net/runelite/client/plugins/flinching/FlinchingTarget.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java index f1d524dd4d..1838b8e886 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java @@ -45,7 +45,7 @@ public class FlinchingTarget @Getter(AccessLevel.PACKAGE) private int objectId; - private NPC targetObject; + private final NPC targetObject; @Getter(AccessLevel.PACKAGE) public WorldPoint worldLocation; From d1a4c9dc8ba7c5e15a5bf836819b6638d32392ea Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:12:06 +0200 Subject: [PATCH 172/472] fps: Final field --- .../java/net/runelite/client/plugins/fps/FpsDrawListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java index 3fdd3f6925..b729a4ad9f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java @@ -54,7 +54,7 @@ public class FpsDrawListener implements Runnable // Working set private long lastMillis = 0; - private long[] lastDelays = new long[SAMPLE_SIZE]; + private final long[] lastDelays = new long[SAMPLE_SIZE]; private int lastDelayIndex = 0; private long sleepDelay = 0; From 377bc8d3033050ea1a164629e21c88e1c7568f76 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:13:03 +0200 Subject: [PATCH 173/472] freezetimers: (Package) private class/method --- .../client/plugins/freezetimers/FreezeTimersOverlay.java | 2 +- .../client/plugins/freezetimers/FreezeTimersPlugin.java | 2 +- .../net/runelite/client/plugins/freezetimers/PrayerTracker.java | 2 +- .../java/net/runelite/client/plugins/freezetimers/Timers.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java index fe43baae47..aaf59e6b3c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java @@ -257,7 +257,7 @@ public class FreezeTimersOverlay extends Overlay xOffset); } - public void renderImageLocation(Graphics2D graphics, Point imgLoc, BufferedImage image) + private void renderImageLocation(Graphics2D graphics, Point imgLoc, BufferedImage image) { int x = imgLoc.getX(); int y = imgLoc.getY(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java index 5769c33df1..3a19f7be49 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java @@ -162,7 +162,7 @@ public class FreezeTimersPlugin extends Plugin this.remove(player); } - public void remove(Actor actor) + private void remove(Actor actor) { freezes.remove(actor.getName()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java index f22f8821a3..3254ae3629 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java @@ -35,7 +35,7 @@ import net.runelite.api.Player; @Slf4j @Singleton -public class PrayerTracker +class PrayerTracker { @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java index 132a69df0e..1da953d0e2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java @@ -31,7 +31,7 @@ import net.runelite.api.Actor; @Slf4j @Singleton -public class Timers +class Timers { private Map> timerMap = new HashMap<>(); From dfe0db76b0d2e6ddfc463639872b8aa664576c08 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:13:24 +0200 Subject: [PATCH 174/472] freezetimers: Remove empty method --- .../net/runelite/client/plugins/freezetimers/Timers.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java index 1da953d0e2..3577b9498d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java @@ -35,11 +35,6 @@ class Timers { private Map> timerMap = new HashMap<>(); - void gameTick() - { - - } - void setTimerEnd(Actor actor, TimerType type, long n) { if (!timerMap.containsKey(actor)) From b9bf5d08b1aab1a36f3eacdb44969d658d7e986a Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:13:46 +0200 Subject: [PATCH 175/472] freezetimers: Final fields --- .../client/plugins/freezetimers/FreezeTimersOverlay.java | 2 +- .../runelite/client/plugins/freezetimers/PrayerTracker.java | 4 ++-- .../java/net/runelite/client/plugins/freezetimers/Timers.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java index aaf59e6b3c..b17e2b871e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java @@ -55,7 +55,7 @@ public class FreezeTimersOverlay extends Overlay private final BufferedImage FREEZE_IMAGE = ImageUtil.getResourceStreamFromClass(getClass(), "freeze.png"); private final BufferedImage TB_IMAGE = ImageUtil.getResourceStreamFromClass(getClass(), "teleblock.png"); private final BufferedImage VENG_IMAGE = ImageUtil.getResourceStreamFromClass(getClass(), "veng.png"); - private Timers timers; + private final Timers timers; @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java index 3254ae3629..38f236567c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java @@ -41,8 +41,8 @@ class PrayerTracker @Inject private Client client; - private Map> lastTick = new HashMap<>(); - private Map> newTick = new HashMap<>(); + private final Map> lastTick = new HashMap<>(); + private final Map> newTick = new HashMap<>(); public void gameTick() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java index 3577b9498d..2d578fecab 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java @@ -33,7 +33,7 @@ import net.runelite.api.Actor; @Singleton class Timers { - private Map> timerMap = new HashMap<>(); + private final Map> timerMap = new HashMap<>(); void setTimerEnd(Actor actor, TimerType type, long n) { From 1e6ba4b6a9a75693ef079c8aec55a127c413febe Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:14:25 +0200 Subject: [PATCH 176/472] friendtagging: Final fields --- .../client/plugins/friendtagging/FriendTaggingPlugin.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java index c4c088aab3..5e550cdfb2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java @@ -63,13 +63,13 @@ public class FriendTaggingPlugin extends Plugin private static final String KEY_PREFIX = "tag_"; private static final String ADD_TAG = "Add Tag"; private static final String DELETE_TAG = "Delete Tag"; - private WidgetMenuOption friendsTabMenuOption = new WidgetMenuOption("Copy to", "clipboard", + private final WidgetMenuOption friendsTabMenuOption = new WidgetMenuOption("Copy to", "clipboard", WidgetInfo.FIXED_VIEWPORT_FRIENDS_TAB); - private WidgetMenuOption ignoreTabMenuOption = new WidgetMenuOption("Copy to", "clipboard", + private final WidgetMenuOption ignoreTabMenuOption = new WidgetMenuOption("Copy to", "clipboard", WidgetInfo.FIXED_VIEWPORT_IGNORES_TAB); - private WidgetMenuOption friendTabResizableOption = new WidgetMenuOption("Copy to", "clipboard", + private final WidgetMenuOption friendTabResizableOption = new WidgetMenuOption("Copy to", "clipboard", WidgetInfo.FIXED_VIEWPORT_FRIENDS_TAB); - private WidgetMenuOption ignoreTabResizableOption = new WidgetMenuOption("Copy to", "clipboard", + private final WidgetMenuOption ignoreTabResizableOption = new WidgetMenuOption("Copy to", "clipboard", WidgetInfo.FIXED_VIEWPORT_IGNORES_TAB); @Inject From 77ef70940bfbfde0be7151a919652723b3a3d465 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:15:57 +0200 Subject: [PATCH 177/472] grotesqueguardians: Add null checks --- .../plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java | 3 ++- .../grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java index 0568e9f16d..08e668e10a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java @@ -28,6 +28,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Polygon; +import java.util.Objects; import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.api.Client; @@ -104,7 +105,7 @@ class GrotesqueGuardiansOverlay extends Overlay TextComponent textComponent = new TextComponent(); LocalPoint duskPoint; - duskPoint = new LocalPoint(plugin.getDusk().getLocalLocation().getX() + 128 * (plugin.getDusk().getTransformedDefinition().getSize() - 1) / 2, plugin.getDusk().getLocalLocation().getY() + 128 * (plugin.getDusk().getTransformedDefinition().getSize() - 1) / 2); + duskPoint = new LocalPoint(plugin.getDusk().getLocalLocation().getX() + 128 * (Objects.requireNonNull(plugin.getDusk().getTransformedDefinition()).getSize() - 1) / 2, plugin.getDusk().getLocalLocation().getY() + 128 * (plugin.getDusk().getTransformedDefinition().getSize() - 1) / 2); net.runelite.api.Point duskLoc = Perspective.getCanvasTextLocation(client, graphics, duskPoint, "RUN AWAY", 500); if (duskLoc != null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java index 1de4b29640..ad78b78da6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java @@ -29,6 +29,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.image.BufferedImage; +import java.util.Objects; import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.api.Client; @@ -79,7 +80,7 @@ public class GrotesqueGuardiansPrayerOverlay extends Overlay imagePanelComponent.getChildren().add(new ImageComponent(prayerImage)); - LocalPoint duskPoint = new LocalPoint(dusk.getLocalLocation().getX() + 128 * (dusk.getTransformedDefinition().getSize() - 1) / 2, dusk.getLocalLocation().getY() + 128 * (dusk.getTransformedDefinition().getSize() - 1) / 2); + LocalPoint duskPoint = new LocalPoint(dusk.getLocalLocation().getX() + 128 * (Objects.requireNonNull(dusk.getTransformedDefinition()).getSize() - 1) / 2, dusk.getLocalLocation().getY() + 128 * (dusk.getTransformedDefinition().getSize() - 1) / 2); net.runelite.api.Point duskLoc = Perspective.getCanvasImageLocation(client, duskPoint, prayerImage, 400); if (duskLoc != null) { From 065e353e917073bb0ca5ca4fa7aa36789ae9acb4 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:16:26 +0200 Subject: [PATCH 178/472] grotesqueguardians: Remove redundant initializers --- .../plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java | 2 +- .../grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java index 08e668e10a..0a83e9c904 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java @@ -74,7 +74,7 @@ class GrotesqueGuardiansOverlay extends Overlay // TODO: Awaiting GraphicsObjectDespawn event to be tracked to make this more efficient. for (GraphicsObject graphicsObject : client.getGraphicsObjects()) { - Color color = null; + Color color; if (graphicsObject.getId() >= GROTESQUE_GUARDIANS_LIGHTNING_START && graphicsObject.getId() <= GROTESQUE_GUARDIANS_LIGHTNING_END) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java index ad78b78da6..bc3c398cb6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java @@ -71,7 +71,7 @@ public class GrotesqueGuardiansPrayerOverlay extends Overlay if ((plugin.isInGargs()) && (plugin.getPrayAgainst() != null) && (plugin.getDusk() != null)) { DuskAttack attack = plugin.getPrayAgainst(); - BufferedImage prayerImage = null; + BufferedImage prayerImage; prayerImage = getPrayerImage(attack); imagePanelComponent.setBackgroundColor(client .isPrayerActive(attack.getPrayer()) ? ComponentConstants.STANDARD_BACKGROUND_COLOR : NOT_ACTIVATED_BACKGROUND_COLOR); From 27d3455b64cf0f19ad3995c8b917be204bdeab42 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:17:12 +0200 Subject: [PATCH 179/472] grounditems: Package private class --- .../client/plugins/grounditems/GroundItemInputListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java index ee6f137b14..8a53d9c2dc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java @@ -36,7 +36,7 @@ import net.runelite.client.input.KeyListener; import net.runelite.client.input.MouseAdapter; @Singleton -public class GroundItemInputListener extends MouseAdapter implements KeyListener +class GroundItemInputListener extends MouseAdapter implements KeyListener { private static final int HOTKEY = KeyEvent.VK_ALT; From 9fdb02e635eada3377dfc4b97e5887dd27c32fba Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:17:41 +0200 Subject: [PATCH 180/472] grounditems: Replace for loop --- .../client/plugins/grounditems/GroundItemsPlugin.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java index 2868f9e41a..ca28c8f797 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java @@ -751,11 +751,11 @@ public class GroundItemsPlugin extends Plugin if (entries.length > 1) { MenuEntry[] newEntries = new MenuEntry[entries.length - 1]; - for (int i = 0; i < entries.length; ++i) + for (MenuEntry entry : entries) { - if (!(entries[i].getOption().equals(option) && entries[i].getTarget().equals(target))) + if (!(entry.getOption().equals(option) && entry.getTarget().equals(target))) { - newEntries[j++] = entries[i]; + newEntries[j++] = entry; } } From 246f15506ee273c2418389a69b2264d845296917 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:18:07 +0200 Subject: [PATCH 181/472] grounditems: Null check --- .../client/plugins/grounditems/GroundItemsOverlay.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java index 82fa52a8e4..40b8a7f97c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java @@ -352,7 +352,11 @@ public class GroundItemsOverlay extends Overlay plugin.setHighlightBoxBounds(new SimpleEntry<>(itemHighlightBox, item)); } - boolean topItem = topGroundItem.equals(item); + boolean topItem = false; + if (topGroundItem != null) + { + topItem = topGroundItem.equals(item); + } // Draw background if hovering if (topItem && (mouseInBox || mouseInHiddenBox || mouseInHighlightBox)) From 48ea51f82bc859a58d4269a1dfc5434c70e8045d Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:26:29 +0200 Subject: [PATCH 182/472] Revert "freezetimers: Remove empty method" This reverts commit dfe0db76b0d2e6ddfc463639872b8aa664576c08. --- .../net/runelite/client/plugins/freezetimers/Timers.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java index 2d578fecab..3a61e5ed2d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java @@ -35,6 +35,11 @@ class Timers { private final Map> timerMap = new HashMap<>(); + void gameTick() + { + + } + void setTimerEnd(Actor actor, TimerType type, long n) { if (!timerMap.containsKey(actor)) From 8a968c460363591eee219780e915b8774439aa36 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:34:25 +0200 Subject: [PATCH 183/472] Revert "coxhelper: Remove usused fields and methods" This reverts commit 4db59fa9849470af8eee9945101550d171365419. --- .../client/plugins/coxhelper/CoxOverlay.java | 41 ++++++++++--------- .../client/plugins/coxhelper/CoxPlugin.java | 8 ++-- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxOverlay.java index ea3a3fb0e8..00d60e94ee 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxOverlay.java @@ -105,6 +105,7 @@ public class CoxOverlay extends Overlay if (plugin.isTektonTickCounter()) { ticksLeft = npcs.getTicksUntilAttack(); + int attackTicksleft = plugin.getTektonAttackTicks(); if (ticksLeft > 0) { if (ticksLeft == 1) @@ -362,26 +363,26 @@ public class CoxOverlay extends Overlay graphics.fill(poly); } -// private void renderNpcOverlay(Graphics2D graphics, NPC actor, Color color, int outlineWidth, int outlineAlpha, int fillAlpha) -// { -// int size = 1; -// NPCDefinition composition = actor.getTransformedDefinition(); -// if (composition != null) -// { -// size = composition.getSize(); -// } -// LocalPoint lp = actor.getLocalLocation(); -// Polygon tilePoly = Perspective.getCanvasTileAreaPoly(client, lp, size); -// -// if (tilePoly != null) -// { -// graphics.setColor(new Color(color.getRed(), color.getGreen(), color.getBlue(), outlineAlpha)); -// graphics.setStroke(new BasicStroke(outlineWidth)); -// graphics.draw(tilePoly); -// graphics.setColor(new Color(color.getRed(), color.getGreen(), color.getBlue(), fillAlpha)); -// graphics.fill(tilePoly); -// } -// } + private void renderNpcOverlay(Graphics2D graphics, NPC actor, Color color, int outlineWidth, int outlineAlpha, int fillAlpha) + { + int size = 1; + NPCDefinition composition = actor.getTransformedDefinition(); + if (composition != null) + { + size = composition.getSize(); + } + LocalPoint lp = actor.getLocalLocation(); + Polygon tilePoly = Perspective.getCanvasTileAreaPoly(client, lp, size); + + if (tilePoly != null) + { + graphics.setColor(new Color(color.getRed(), color.getGreen(), color.getBlue(), outlineAlpha)); + graphics.setStroke(new BasicStroke(outlineWidth)); + graphics.draw(tilePoly); + graphics.setColor(new Color(color.getRed(), color.getGreen(), color.getBlue(), fillAlpha)); + graphics.fill(tilePoly); + } + } private void renderActorOverlay(Graphics2D graphics, Actor actor, Color color, int outlineWidth, int outlineAlpha, int fillAlpha) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java index 66fbf64492..9dc12d080f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java @@ -83,7 +83,7 @@ import net.runelite.client.util.Text; public class CoxPlugin extends Plugin { private static final int ANIMATION_ID_G1 = 430; - // private static final String OLM_HAND_CRIPPLE = "The Great Olm\'s left claw clenches to protect itself temporarily."; + private static final String OLM_HAND_CRIPPLE = "The Great Olm\'s left claw clenches to protect itself temporarily."; private static final Pattern TP_REGEX = Pattern.compile("You have been paired with (.*)! The magical power will enact soon..."); @Setter @Getter(AccessLevel.PACKAGE) @@ -92,11 +92,11 @@ public class CoxPlugin extends Plugin protected long lastPrayTime; private int sleepcount = 0; private boolean needOlm = false; - // private GraphicsObject teleportObject; + private GraphicsObject teleportObject; @Inject private Client client; - // @Inject - // private ChatMessageManager chatMessageManager; + @Inject + private ChatMessageManager chatMessageManager; @Inject private CoxOverlay coxOverlay; @Inject From bd7c3dccea2b641ea97d95dc085792cc25f7277a Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 05:35:18 +0200 Subject: [PATCH 184/472] banlist: Checkstyle --- .../java/net/runelite/client/plugins/banlist/BanListPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java index f1fad45f68..4ea6de2dff 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java @@ -122,7 +122,7 @@ public class BanListPlugin extends Plugin @Subscribe public void onConfigChanged(ConfigChanged event) { - if (event.getGroup().equals("banlist")&& event.getKey().equals("bannedPlayers")) + if (event.getGroup().equals("banlist") && event.getKey().equals("bannedPlayers")) { for (String manual : Text.fromCSV(config.getBannedPlayers())) { From 7e2c9e158d65c6147ef591e3a140b9b8d5dc8fd0 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Sun, 7 Jul 2019 06:02:14 +0200 Subject: [PATCH 185/472] runepouch: revert fontmanager integration (#916) --- .../net/runelite/client/plugins/runepouch/RunepouchOverlay.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java index f61935e4b7..f587c38818 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java @@ -85,7 +85,7 @@ public class RunepouchOverlay extends WidgetItemOverlay assert AMOUNT_VARBITS.length == RUNE_VARBITS.length; - graphics.setFont(FontManager.getSmallFont(graphics.getFont())); + graphics.setFont(FontManager.getRunescapeSmallFont()); Point location = itemWidget.getCanvasLocation(); StringBuilder tooltipBuilder = new StringBuilder(); From 59070bc36cda900287f3516b8a18c53e582a5a03 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 06:28:58 +0200 Subject: [PATCH 186/472] gpu: Null checks --- .../main/java/net/runelite/client/plugins/gpu/GpuPlugin.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java index c53392dc2a..e8cbcb9977 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java @@ -841,7 +841,8 @@ public class GpuPlugin extends Plugin implements DrawCallbacks // Re-create fbo if (lastStretchedCanvasWidth != stretchedCanvasWidth || lastStretchedCanvasHeight != stretchedCanvasHeight - || !lastAntiAliasingMode.equals(antiAliasingMode)) + || (lastAntiAliasingMode != null + && !lastAntiAliasingMode.equals(antiAliasingMode))) { shutdownSceneFbo(); @@ -1012,7 +1013,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks final AnisotropicFilteringMode anisotropicFilteringMode = this.anisotropicFilteringMode; final boolean afEnabled = anisotropicFilteringMode != AnisotropicFilteringMode.DISABLED; - if (!lastAnisotropicFilteringMode.equals(anisotropicFilteringMode)) + if (lastAnisotropicFilteringMode != null && !lastAnisotropicFilteringMode.equals(anisotropicFilteringMode)) { if (afEnabled) { From 1620842c9710f06f3a9821476454409b846a8cbc Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 06:29:29 +0200 Subject: [PATCH 187/472] demonicgorilla: Null check --- .../client/plugins/demonicgorilla/DemonicGorillaPlugin.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java index ea4c665ef1..9b4d7f8a21 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java @@ -206,7 +206,8 @@ public class DemonicGorillaPlugin extends Plugin } boolean correctPrayer = target == null || // If player is out of memory, assume prayer was correct - attackStyle.equals(protectedStyle); + (attackStyle != null && + attackStyle.equals(protectedStyle)); if (attackStyle == DemonicGorilla.AttackStyle.BOULDER) { From e9e59daf5787c81957e7a21f52fa766f0041b7db Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 06:29:39 +0200 Subject: [PATCH 188/472] corp: Null checks --- .../java/net/runelite/client/plugins/corp/CorpPlugin.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java index 930a71707d..20df61077a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java @@ -167,7 +167,7 @@ public class CorpPlugin extends Plugin { NPC npc = npcDespawned.getNpc(); - if (npc.equals(corp)) + if (npc != null && npc.equals(corp)) { log.debug("Corporeal beast despawn: {}", npc); corp = null; @@ -193,7 +193,7 @@ public class CorpPlugin extends Plugin .build()); } } - else if (npc.equals(core)) + else if (npc != null && npc.equals(core)) { core = null; } @@ -204,7 +204,7 @@ public class CorpPlugin extends Plugin { Actor actor = hitsplatApplied.getActor(); - if (!actor.equals(corp)) + if (actor != null && !actor.equals(corp)) { return; } @@ -224,7 +224,7 @@ public class CorpPlugin extends Plugin Actor source = interactingChanged.getSource(); Actor target = interactingChanged.getTarget(); - if (!target.equals(corp)) + if (target != null && !target.equals(corp)) { return; } From 8486a6e47fee2ea5dd5e481d47f0ab81e22ec2a6 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 06:30:00 +0200 Subject: [PATCH 189/472] clanchat: Null check --- .../net/runelite/client/plugins/clanchat/ClanChatPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java index 41b0db6e7d..ea6b78efeb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java @@ -485,7 +485,7 @@ public class ClanChatPlugin extends Plugin final Player local = client.getLocalPlayer(); final Player player = event.getPlayer(); - if (!player.equals(local) && player.isClanMember()) + if (player != null && !player.equals(local) && player.isClanMember()) { clanMembers.add(player); addClanCounter(); From 7a59c591814503bbd5fb8008148fbe01f9f1773b Mon Sep 17 00:00:00 2001 From: James Munson Date: Sat, 6 Jul 2019 23:07:26 -0700 Subject: [PATCH 190/472] removed flinching plugin, it got replaced by npc status --- .../plugins/flinching/FlinchingConfig.java | 128 -------- .../plugins/flinching/FlinchingOverlay.java | 115 ------- .../plugins/flinching/FlinchingPlugin.java | 310 ------------------ .../plugins/flinching/FlinchingTarget.java | 145 -------- .../plugins/npcstatus/NpcStatusPlugin.java | 2 + 5 files changed, 2 insertions(+), 698 deletions(-) delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingConfig.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingOverlay.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingConfig.java deleted file mode 100644 index 65900900d8..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingConfig.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Copyright (c) 2018, Fluffeh - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins.flinching; - -import java.awt.Color; -import net.runelite.client.config.Config; -import net.runelite.client.config.ConfigGroup; -import net.runelite.client.config.ConfigItem; -import net.runelite.client.config.Stub; - -@ConfigGroup("flinching") -public interface FlinchingConfig extends Config -{ - - @ConfigItem( - keyName = "flinchStub", - name = "Flinch", - description = "", - position = 1 - ) - default Stub flinchStub() - { - return new Stub(); - } - - @ConfigItem( - position = 2, - keyName = "flinchOnHitReceivedDelay", - name = "Flinch Hit Received Delay", - description = "Slightly longer delay after being attacked milliseconds", - parent = "flinchStub" - ) - default int getFlinchAttackedDelay() - { - return 6600; - } - - @ConfigItem( - position = 3, - keyName = "flinchDelay", - name = "Flinch Timer Delay", - description = "Shows the appropriate time to attack while flinching milliseconds", - parent = "flinchStub" - ) - default int getFlinchDelay() - { - return 5400; - } - - @ConfigItem( - keyName = "overlayStub", - name = "Overlay", - description = "", - position = 4 - ) - default Stub overlayStub() - { - return new Stub(); - } - - @ConfigItem( - position = 5, - keyName = "flinchOverlaySize", - name = "Overlay Diameter", - description = "Flinch overlay timer diameter", - parent = "overlayStub" - ) - default int getFlinchOverlaySize() - { - return 30; - } - - @ConfigItem( - position = 6, - keyName = "hexColorFlinch", - name = "Overlay Color", - description = "Color of flinching timer overlay", - parent = "overlayStub" - ) - default Color getFlinchOverlayColor() - { - return Color.CYAN; - } - - @ConfigItem( - position = 7, - keyName = "flinchResetOnHit", - name = "Reset on Hit", - description = "Timer resets after every attack from your character" - ) - default boolean getFlinchResetOnHit() - { - return true; - } - - @ConfigItem( - position = 8, - keyName = "flinchResetOnHitReceived", - name = "Reset on Hit Received", - description = "Timer resets when your character gets attacked" - ) - default boolean getFlinchResetOnHitReceived() - { - return true; - } -} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingOverlay.java deleted file mode 100644 index a46289ad80..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingOverlay.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (c) 2018, Fluffeh - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins.flinching; - - -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Graphics2D; -import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; -import net.runelite.api.Client; -import net.runelite.api.Perspective; -import net.runelite.api.Point; -import net.runelite.api.coords.LocalPoint; -import net.runelite.api.coords.WorldPoint; -import net.runelite.client.ui.overlay.Overlay; -import net.runelite.client.ui.overlay.OverlayLayer; -import net.runelite.client.ui.overlay.OverlayPosition; -import net.runelite.client.ui.overlay.components.ProgressPieComponent; - -@Singleton -public class FlinchingOverlay extends Overlay -{ - private final Client client; - private final FlinchingPlugin plugin; - - private Color color; - private Color borderColor; - - private int overlaySize; - - @Inject - FlinchingOverlay(Client client, FlinchingPlugin plugin) - { - setPosition(OverlayPosition.DYNAMIC); - setLayer(OverlayLayer.ABOVE_SCENE); - this.plugin = plugin; - this.client = client; - - overlaySize = this.plugin.getFlinchOverlaySize(); - } - - @Override - public Dimension render(Graphics2D graphics) - { - drawOverlays(graphics); - return null; - } - - public void updateConfig() - { - borderColor = plugin.getFlinchOverlayColor(); - color = new Color(borderColor.getRed(), borderColor.getGreen(), borderColor.getBlue(), 100); - - overlaySize = plugin.getFlinchOverlaySize(); - } - - private void drawOverlays(Graphics2D graphics) - { - for (Map.Entry entry : plugin.GetTargets().entrySet()) - { - FlinchingTarget target = entry.getValue(); - - drawFlinchTimer(graphics, target.worldLocation, target.GetRemainingTimePercent()); - } - } - - - private void drawFlinchTimer(Graphics2D graphics, WorldPoint targetLocation, double fillAmount) - { - if (targetLocation.getPlane() != client.getPlane()) - { - return; - } - - LocalPoint localLoc = LocalPoint.fromWorld(client, targetLocation); - if (localLoc == null) - { - return; - } - - Point loc = Perspective.localToCanvas(client, localLoc, client.getPlane()); - - ProgressPieComponent pie = new ProgressPieComponent(); - pie.setDiameter(overlaySize); - pie.setFill(color); - pie.setBorderColor(borderColor); - pie.setPosition(loc); - pie.setProgress(fillAmount); - pie.render(graphics); - } -} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java deleted file mode 100644 index 0ed62ecd06..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java +++ /dev/null @@ -1,310 +0,0 @@ -/* - * Copyright (c) 2018, Fluffeh - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins.flinching; - -import com.google.inject.Provides; -import java.awt.Color; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; -import lombok.AccessLevel; -import lombok.Getter; -import lombok.extern.slf4j.Slf4j; -import net.runelite.api.Actor; -import net.runelite.api.Client; -import net.runelite.api.GameState; -import net.runelite.api.NPC; -import net.runelite.api.Player; -import net.runelite.api.events.ConfigChanged; -import net.runelite.api.events.GameStateChanged; -import net.runelite.api.events.GameTick; -import net.runelite.api.events.HitsplatApplied; -import net.runelite.api.events.NpcDespawned; -import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.Subscribe; -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; - - -@Slf4j -@Singleton -@PluginDescriptor( - name = "Flinching Timer", - description = "Time your attacks while flinching", - tags = {"overlay", "flinching", "timers", "combat"}, - type = PluginType.PVM, - enabledByDefault = false -) - -public class FlinchingPlugin extends Plugin -{ - @Inject - private Client client; - - @Inject - private OverlayManager overlayManager; - - @Inject - private FlinchingConfig config; - - @Inject - private FlinchingOverlay overlay; - - private int currentWorld = -1; - - private int currentInteractingId = -1; - private final Map flinchingTargets = new HashMap<>(); - - private boolean resetOnHit = true; - private boolean resetOnHitReceived = true; - - private int getFlinchAttackedDelay; - private int getFlinchDelay; - @Getter(AccessLevel.PACKAGE) - private int flinchOverlaySize; - @Getter(AccessLevel.PACKAGE) - private Color flinchOverlayColor; - private boolean getFlinchResetOnHit; - private boolean getFlinchResetOnHitReceived; - - @Provides - FlinchingConfig provideConfig(ConfigManager configManager) - { - return configManager.getConfig(FlinchingConfig.class); - } - - @Override - protected void startUp() - { - updateConfig(); - - overlayManager.add(overlay); - - overlay.updateConfig(); - resetOnHit = this.getFlinchResetOnHit; - resetOnHitReceived = this.getFlinchResetOnHitReceived; - - ClearTargets(); - } - - @Override - protected void shutDown() - { - ClearTargets(); - } - - @Subscribe - public void onConfigChanged(ConfigChanged event) - { - if (event.getGroup().equals("flinching")) - { - updateConfig(); - - overlay.updateConfig(); - resetOnHit = this.getFlinchResetOnHit; - resetOnHitReceived = this.getFlinchResetOnHitReceived; - - for (Map.Entry integerFlinchingTargetEntry : flinchingTargets.entrySet()) - { - FlinchingTarget target = integerFlinchingTargetEntry.getValue(); - if (target != null) - { - target.SetDelayTime(this.getFlinchDelay, this.getFlinchAttackedDelay); - } - } - } - } - - @Subscribe - public void onGameStateChanged(GameStateChanged event) - { - if (event.getGameState() == GameState.LOGGED_IN) - { - if (currentWorld == -1) - { - currentWorld = client.getWorld(); - } - else if (currentWorld != client.getWorld()) - { - ClearTargets(); - } - } - } - - private void ClearTargets() - { - Iterator> it = flinchingTargets.entrySet().iterator(); - - while (it.hasNext()) - { - it.remove(); - } - } - - @Subscribe - private void onGameTick(GameTick tick) - { - if (client.getGameState() == GameState.LOGGED_IN) - { - return; - } - - TickTargets(); - checkInteracting(); - } - - @Subscribe - public void onHitsplatApplied(HitsplatApplied hitsplatApplied) - { - Actor actor = hitsplatApplied.getActor(); - - if (actor instanceof NPC) - { - NPC hitTarget = (NPC) actor; - - int hitId = hitTarget.getId(); - if (hitId == currentInteractingId) - { - if (!flinchingTargets.containsKey(hitId)) - { - TargetGained(hitTarget); - } - else - { - FlinchingTarget currentTarget = flinchingTargets.get(hitId); - if (currentTarget != null) - { - if (resetOnHit) - { - currentTarget.TargetHit(); - } - } - } - } - } - else if (resetOnHitReceived && actor == client.getLocalPlayer()) - { - PlayerHit(); - } - } - - private void checkInteracting() - { - Player localPlayer = client.getLocalPlayer(); - Actor interacting = localPlayer.getInteracting(); - - if (interacting instanceof NPC) - { - NPC newTarget = (NPC) interacting; - currentInteractingId = newTarget.getId(); - - if (newTarget.getHealth() <= 0 || newTarget.isDead()) - { - if (flinchingTargets.containsKey(currentInteractingId)) - { - flinchingTargets.remove(currentInteractingId); - currentInteractingId = -1; - } - } - } - } - - private void TickTargets() - { - Iterator> it = flinchingTargets.entrySet().iterator(); - - while (it.hasNext()) - { - FlinchingTarget target = it.next().getValue(); - if (target != null) - { - target.Tick(); - if (!target.isActive) - { - it.remove(); - } - } - else - { - it.remove(); - } - } - } - - @Subscribe - public void onNpcDespawned(NpcDespawned npcDespawned) - { - NPC actor = npcDespawned.getNpc(); - - int actorId = actor.getId(); - if (actor.isDead() && flinchingTargets.containsKey(actorId)) - { - TargetLost(actorId); - } - } - - private void TargetLost(int targetId) - { - flinchingTargets.remove(targetId); - } - - private void TargetGained(NPC _newTarget) - { - FlinchingTarget newTarget = new FlinchingTarget(_newTarget); - newTarget.SetDelayTime(config.getFlinchDelay(), config.getFlinchAttackedDelay()); - flinchingTargets.put(_newTarget.getId(), newTarget); - } - - private void PlayerHit() - { - for (Map.Entry integerFlinchingTargetEntry : flinchingTargets.entrySet()) - { - FlinchingTarget target = integerFlinchingTargetEntry.getValue(); - if (target != null) - { - target.PlayerHit(); - } - } - } - - Map GetTargets() - { - return (flinchingTargets); - } - - private void updateConfig() - { - this.getFlinchAttackedDelay = config.getFlinchAttackedDelay(); - this.getFlinchDelay = config.getFlinchDelay(); - this.flinchOverlaySize = config.getFlinchOverlaySize(); - this.flinchOverlayColor = config.getFlinchOverlayColor(); - this.getFlinchResetOnHit = config.getFlinchResetOnHit(); - this.getFlinchResetOnHitReceived = config.getFlinchResetOnHitReceived(); - } -} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java deleted file mode 100644 index 58d90cb247..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Copyright (c) 2018, Fluffeh - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins.flinching; - -import java.time.Duration; -import java.time.Instant; -import lombok.AccessLevel; -import lombok.Getter; -import net.runelite.api.NPC; -import net.runelite.api.coords.WorldPoint; - -public class FlinchingTarget -{ - private int currentDisplayLength = 5400; - - private boolean usingHitDelay = false; - - private int displayLength = 5400; - private int displayHitReceivedLength = 6600; - private Instant lastAttacked; - - public boolean isActive; - - @Getter(AccessLevel.PACKAGE) - private int objectId; - private NPC targetObject; - - @Getter(AccessLevel.PACKAGE) - public WorldPoint worldLocation; - - FlinchingTarget(NPC target) - { - isActive = true; - - this.targetObject = target; - this.lastAttacked = Instant.now(); - this.objectId = target.getId(); - this.worldLocation = target.getWorldLocation(); - } - - void TargetHit() - { - boolean shouldHit = true; - if (usingHitDelay) - { - if (GetRemainingTime() > displayLength) - { - shouldHit = false; - } - } - - if (shouldHit) - { - lastAttacked = Instant.now(); - - usingHitDelay = false; - currentDisplayLength = displayLength; - } - } - - double GetRemainingTimePercent() - { - double remainingTime = GetRemainingTime(); - double timePercent = remainingTime / currentDisplayLength; - if (timePercent < 0) - { - timePercent = 0; - } - else if (timePercent > 1) - { - timePercent = 1; - } - - return (timePercent); - } - - private double GetRemainingTime() - { - Duration duration = Duration.between(lastAttacked, Instant.now()); - return ((currentDisplayLength - ((double) duration.toMillis()))); - } - - void Tick() - { - if (targetObject == null) - { - isActive = false; - } - else - { - worldLocation = targetObject.getWorldLocation(); - - double remainingTime = GetRemainingTime(); - if (remainingTime <= 0) - { - isActive = false; - } - } - } - - void SetDelayTime(int delayTime, int delayHitReceivedTime) - { - displayLength = delayTime; - displayHitReceivedLength = delayHitReceivedTime; - - if (usingHitDelay) - { - currentDisplayLength = displayHitReceivedLength; - } - else - { - currentDisplayLength = displayLength; - } - } - - void PlayerHit() - { - usingHitDelay = true; - currentDisplayLength = displayHitReceivedLength; - - lastAttacked = Instant.now(); - } -} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java index 9e6af3cc93..61f438f638 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java @@ -51,6 +51,7 @@ import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.NPCManager; 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; @Slf4j @@ -58,6 +59,7 @@ import net.runelite.client.ui.overlay.OverlayManager; name = "NPC Status Timer", description = "Adds a timer on NPC's for their attacks and flinching.", tags = {"flinch", "npc"}, + type = PluginType.PVM, enabledByDefault = false ) @Singleton From 33e3a009ce42eeb46cbd0c5a225de93744ea210b Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 14:23:18 +0200 Subject: [PATCH 191/472] hiscores: local variables --- .../net/runelite/client/plugins/hiscore/HiscorePanel.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java index ec184a1a87..459bc20118 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java @@ -129,15 +129,11 @@ public class HiscorePanel extends PluginPanel private final List skillLabels = new ArrayList<>(); - private final JPanel statsPanel = new JPanel(); - /* Container of all the selectable endpoints (ironman, deadman, etc) */ private final MaterialTabGroup tabGroup; private final HiscoreClient hiscoreClient = new HiscoreClient(); - private HiscoreResult result; - /* The currently selected endpoint */ private HiscoreEndpoint selectedEndPoint; @@ -247,6 +243,7 @@ public class HiscorePanel extends PluginPanel // Panel that holds skill icons GridLayout stats = new GridLayout(8, 3); + JPanel statsPanel = new JPanel(); statsPanel.setLayout(stats); statsPanel.setBackground(ColorScheme.DARKER_GRAY_COLOR); statsPanel.setBorder(new EmptyBorder(5, 0, 5, 0)); @@ -371,6 +368,7 @@ public class HiscorePanel extends PluginPanel selectedEndPoint = HiscoreEndpoint.NORMAL; } + HiscoreResult result; try { log.debug("Hiscore endpoint " + selectedEndPoint.name() + " selected"); From 2b7684be8fbfc659d8d1d71b05b7cd079de5543f Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 14:24:10 +0200 Subject: [PATCH 192/472] hiscores: Null check --- .../net/runelite/client/plugins/hiscore/HiscorePanel.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java index 459bc20118..f0c7df167c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java @@ -605,7 +605,11 @@ public class HiscorePanel extends PluginPanel */ if (SKILLS.contains(skill)) { - long experience = result.getSkill(skill).getExperience(); + long experience = 0; + if (skill != null) + { + experience = result.getSkill(skill).getExperience(); + } if (experience >= 0) { int currentXp = (int) experience; From 289224785c82559d76652e30c3aab9207ad44bfc Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 14:26:01 +0200 Subject: [PATCH 193/472] hunter: Merge switch branches --- .../net/runelite/client/plugins/hunter/HunterPlugin.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java index c287fc1160..8601a91289 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java @@ -134,14 +134,6 @@ public class HunterPlugin extends Plugin * ------------------------------------------------------------------------------ */ case ObjectID.DEADFALL: // Deadfall trap placed - if (localPlayer.getWorldLocation().distanceTo(trapLocation) <= 2) - { - log.debug("Trap placed by \"{}\" on {}", localPlayer.getName(), trapLocation); - traps.put(trapLocation, new HunterTrap(gameObject)); - lastActionTime = Instant.now(); - } - break; - case ObjectID.MONKEY_TRAP: // Maniacal monkey trap placed // If player is right next to "object" trap assume that player placed the trap if (localPlayer.getWorldLocation().distanceTo(trapLocation) <= 2) From 00de080ac273a7111ae785a275581f4064a73973 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 14:31:34 +0200 Subject: [PATCH 194/472] babyhydra: Merge nested is statements --- .../hydra/BabyHydraIndicatorOverlay.java | 15 ++-- .../plugins/hydra/BabyHydraOverlay.java | 63 +++++++------ .../client/plugins/hydra/BabyHydraPlugin.java | 19 ++-- .../plugins/hydra/BabyHydraPrayOverlay.java | 90 +++++++++---------- 4 files changed, 83 insertions(+), 104 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java index 610352bd86..751db82ee1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java @@ -53,17 +53,14 @@ public class BabyHydraIndicatorOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (plugin.getHydra() != null) + if (plugin.getHydra() != null && plugin.getHydras().containsKey(plugin.getHydra().getIndex())) { - if (plugin.getHydras().containsKey(plugin.getHydra().getIndex())) + int val = plugin.getHydras().get(plugin.getHydra().getIndex()); + if (val != 0) { - int val = plugin.getHydras().get(plugin.getHydra().getIndex()); - if (val != 0) - { - panelComponent.getChildren().clear(); - panelComponent.getChildren().add(LineComponent.builder().right(Integer.toString(val)).build()); - return panelComponent.render(graphics); - } + panelComponent.getChildren().clear(); + panelComponent.getChildren().add(LineComponent.builder().right(Integer.toString(val)).build()); + return panelComponent.render(graphics); } } return null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java index 58456a4ef3..3e392cd878 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java @@ -65,52 +65,49 @@ public class BabyHydraOverlay extends Overlay { continue; } - if (hydra.getName().equalsIgnoreCase("Hydra")) + if (hydra.getName().equalsIgnoreCase("Hydra") && plugin.getHydras().containsKey(hydra.getIndex())) { - if (plugin.getHydras().containsKey(hydra.getIndex())) + int val = plugin.getHydras().get(hydra.getIndex()); + if (val != 0) { - int val = plugin.getHydras().get(hydra.getIndex()); - if (val != 0) + if (plugin.isBoldText()) { - if (plugin.isBoldText()) - { - graphics.setFont(FontManager.getRunescapeBoldFont()); - } - if (plugin.getHydraattacks().containsKey(hydra.getIndex())) - { - int attack = plugin.getHydraattacks().get(hydra.getIndex()); + graphics.setFont(FontManager.getRunescapeBoldFont()); + } + if (plugin.getHydraattacks().containsKey(hydra.getIndex())) + { + int attack = plugin.getHydraattacks().get(hydra.getIndex()); - Point textLocation = hydra.getCanvasTextLocation(graphics, "TEMP!!", hydra.getLogicalHeight() + 100); + Point textLocation = hydra.getCanvasTextLocation(graphics, "TEMP!!", hydra.getLogicalHeight() + 100); - if (textLocation != null && attack == 8261) + if (textLocation != null && attack == 8261) + { + if (val == 3) { - if (val == 3) - { - OverlayUtil.renderTextLocation(graphics, textLocation, "MAGE", Color.BLUE); - } - else - { - OverlayUtil.renderTextLocation(graphics, textLocation, "RANGE", Color.GREEN); - } + OverlayUtil.renderTextLocation(graphics, textLocation, "MAGE", Color.BLUE); } - else if (textLocation != null && attack == 8262) + else { - if (val == 3) - { - OverlayUtil.renderTextLocation(graphics, textLocation, "RANGE", Color.GREEN); - } - else - { - OverlayUtil.renderTextLocation(graphics, textLocation, "MAGE", Color.BLUE); - } + OverlayUtil.renderTextLocation(graphics, textLocation, "RANGE", Color.GREEN); } } - Point hydraPoint = hydra.getCanvasTextLocation(graphics, Integer.toString(val), hydra.getLogicalHeight() + 40); - if (hydraPoint != null) + else if (textLocation != null && attack == 8262) { - OverlayUtil.renderTextLocation(graphics, hydraPoint, Integer.toString(val), Color.WHITE); + if (val == 3) + { + OverlayUtil.renderTextLocation(graphics, textLocation, "RANGE", Color.GREEN); + } + else + { + OverlayUtil.renderTextLocation(graphics, textLocation, "MAGE", Color.BLUE); + } } } + Point hydraPoint = hydra.getCanvasTextLocation(graphics, Integer.toString(val), hydra.getLogicalHeight() + 40); + if (hydraPoint != null) + { + OverlayUtil.renderTextLocation(graphics, hydraPoint, Integer.toString(val), Color.WHITE); + } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java index c0c6e28536..8c2f0fff42 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java @@ -159,15 +159,9 @@ public class BabyHydraPlugin extends Plugin public void onNpcSpawned(NpcSpawned event) { NPC hydra = event.getNpc(); - if (hydra.getCombatLevel() != 0 && hydra.getName() != null) + if (hydra.getCombatLevel() != 0 && hydra.getName() != null && hydra.getName().equalsIgnoreCase("Hydra") && !hydras.containsKey(hydra.getIndex())) { - if (hydra.getName().equalsIgnoreCase("Hydra")) - { - if (!hydras.containsKey(hydra.getIndex())) - { - hydras.put(hydra.getIndex(), 3); - } - } + hydras.put(hydra.getIndex(), 3); } } @@ -175,13 +169,10 @@ public class BabyHydraPlugin extends Plugin public void onNpcDespawned(NpcDespawned event) { NPC hydra = event.getNpc(); - if (hydra.getCombatLevel() != 0 && hydra.getName() != null) + if (hydra.getCombatLevel() != 0 && hydra.getName() != null && hydra.getName().equalsIgnoreCase("Hydra")) { - if (hydra.getName().equalsIgnoreCase("Hydra")) - { - hydras.remove(hydra.getIndex()); - hydraattacks.remove(hydra.getIndex()); - } + hydras.remove(hydra.getIndex()); + hydraattacks.remove(hydra.getIndex()); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java index cf56196e21..193522eeb0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java @@ -78,62 +78,56 @@ public class BabyHydraPrayOverlay extends Overlay PRAY_RANGED = spriteManager.getSprite(SpriteID.PRAYER_PROTECT_FROM_MISSILES, 0); } - if (plugin.getHydra() != null) + if (plugin.getHydra() != null && plugin.getHydras().containsKey(plugin.getHydra().getIndex())) { - if (plugin.getHydras().containsKey(plugin.getHydra().getIndex())) + int val = plugin.getHydras().get(plugin.getHydra().getIndex()); + if (val != 0 && plugin.getHydraattacks().containsKey(plugin.getHydra().getIndex())) { - int val = plugin.getHydras().get(plugin.getHydra().getIndex()); - if (val != 0) + int attack = plugin.getHydraattacks().get(plugin.getHydra().getIndex()); + if (attack == 8261) { - if (plugin.getHydraattacks().containsKey(plugin.getHydra().getIndex())) + if (val == 3) { - int attack = plugin.getHydraattacks().get(plugin.getHydra().getIndex()); - if (attack == 8261) - { - if (val == 3) - { - imagePanelComponent.getChildren().clear(); - imagePanelComponent.getChildren().add(new ImageComponent(PRAY_MAGE)); - imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC) - ? ComponentConstants.STANDARD_BACKGROUND_COLOR - : NOT_ACTIVATED_BACKGROUND_COLOR); + imagePanelComponent.getChildren().clear(); + imagePanelComponent.getChildren().add(new ImageComponent(PRAY_MAGE)); + imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC) + ? ComponentConstants.STANDARD_BACKGROUND_COLOR + : NOT_ACTIVATED_BACKGROUND_COLOR); - return imagePanelComponent.render(graphics); - } - else - { - imagePanelComponent.getChildren().clear(); - imagePanelComponent.getChildren().add(new ImageComponent(PRAY_RANGED)); - imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MISSILES) - ? ComponentConstants.STANDARD_BACKGROUND_COLOR - : NOT_ACTIVATED_BACKGROUND_COLOR); + return imagePanelComponent.render(graphics); + } + else + { + imagePanelComponent.getChildren().clear(); + imagePanelComponent.getChildren().add(new ImageComponent(PRAY_RANGED)); + imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MISSILES) + ? ComponentConstants.STANDARD_BACKGROUND_COLOR + : NOT_ACTIVATED_BACKGROUND_COLOR); - return imagePanelComponent.render(graphics); - } - } - else if (attack == 8262) - { - if (val == 3) - { - imagePanelComponent.getChildren().clear(); - imagePanelComponent.getChildren().add(new ImageComponent(PRAY_RANGED)); - imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MISSILES) - ? ComponentConstants.STANDARD_BACKGROUND_COLOR - : NOT_ACTIVATED_BACKGROUND_COLOR); + return imagePanelComponent.render(graphics); + } + } + else if (attack == 8262) + { + if (val == 3) + { + imagePanelComponent.getChildren().clear(); + imagePanelComponent.getChildren().add(new ImageComponent(PRAY_RANGED)); + imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MISSILES) + ? ComponentConstants.STANDARD_BACKGROUND_COLOR + : NOT_ACTIVATED_BACKGROUND_COLOR); - return imagePanelComponent.render(graphics); - } - else - { - imagePanelComponent.getChildren().clear(); - imagePanelComponent.getChildren().add(new ImageComponent(PRAY_MAGE)); - imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC) - ? ComponentConstants.STANDARD_BACKGROUND_COLOR - : NOT_ACTIVATED_BACKGROUND_COLOR); + return imagePanelComponent.render(graphics); + } + else + { + imagePanelComponent.getChildren().clear(); + imagePanelComponent.getChildren().add(new ImageComponent(PRAY_MAGE)); + imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC) + ? ComponentConstants.STANDARD_BACKGROUND_COLOR + : NOT_ACTIVATED_BACKGROUND_COLOR); - return imagePanelComponent.render(graphics); - } - } + return imagePanelComponent.render(graphics); } } } From 19c788415f1a4b0aa57bcae446ad5afc054cd68a Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 14:32:46 +0200 Subject: [PATCH 195/472] babyhydra: These vars aren't constants --- .../plugins/hydra/BabyHydraPrayOverlay.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java index 193522eeb0..977bb80afc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java @@ -47,8 +47,8 @@ public class BabyHydraPrayOverlay extends Overlay private final BabyHydraPlugin plugin; private static final Color NOT_ACTIVATED_BACKGROUND_COLOR = new Color(150, 0, 0, 150); - private BufferedImage PRAY_MAGE; - private BufferedImage PRAY_RANGED; + private BufferedImage prayMage; + private BufferedImage prayRanged; private final PanelComponent imagePanelComponent = new PanelComponent(); @Inject @@ -69,13 +69,13 @@ public class BabyHydraPrayOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (PRAY_MAGE == null) + if (prayMage == null) { - PRAY_MAGE = spriteManager.getSprite(SpriteID.PRAYER_PROTECT_FROM_MAGIC, 0); + prayMage = spriteManager.getSprite(SpriteID.PRAYER_PROTECT_FROM_MAGIC, 0); } - if (PRAY_RANGED == null) + if (prayRanged == null) { - PRAY_RANGED = spriteManager.getSprite(SpriteID.PRAYER_PROTECT_FROM_MISSILES, 0); + prayRanged = spriteManager.getSprite(SpriteID.PRAYER_PROTECT_FROM_MISSILES, 0); } if (plugin.getHydra() != null && plugin.getHydras().containsKey(plugin.getHydra().getIndex())) @@ -89,7 +89,7 @@ public class BabyHydraPrayOverlay extends Overlay if (val == 3) { imagePanelComponent.getChildren().clear(); - imagePanelComponent.getChildren().add(new ImageComponent(PRAY_MAGE)); + imagePanelComponent.getChildren().add(new ImageComponent(prayMage)); imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC) ? ComponentConstants.STANDARD_BACKGROUND_COLOR : NOT_ACTIVATED_BACKGROUND_COLOR); @@ -99,7 +99,7 @@ public class BabyHydraPrayOverlay extends Overlay else { imagePanelComponent.getChildren().clear(); - imagePanelComponent.getChildren().add(new ImageComponent(PRAY_RANGED)); + imagePanelComponent.getChildren().add(new ImageComponent(prayRanged)); imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MISSILES) ? ComponentConstants.STANDARD_BACKGROUND_COLOR : NOT_ACTIVATED_BACKGROUND_COLOR); @@ -112,7 +112,7 @@ public class BabyHydraPrayOverlay extends Overlay if (val == 3) { imagePanelComponent.getChildren().clear(); - imagePanelComponent.getChildren().add(new ImageComponent(PRAY_RANGED)); + imagePanelComponent.getChildren().add(new ImageComponent(prayRanged)); imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MISSILES) ? ComponentConstants.STANDARD_BACKGROUND_COLOR : NOT_ACTIVATED_BACKGROUND_COLOR); @@ -122,7 +122,7 @@ public class BabyHydraPrayOverlay extends Overlay else { imagePanelComponent.getChildren().clear(); - imagePanelComponent.getChildren().add(new ImageComponent(PRAY_MAGE)); + imagePanelComponent.getChildren().add(new ImageComponent(prayMage)); imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC) ? ComponentConstants.STANDARD_BACKGROUND_COLOR : NOT_ACTIVATED_BACKGROUND_COLOR); From 483ad23a7570e74947962700fc8438489bd0d493 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 14:35:20 +0200 Subject: [PATCH 196/472] idlenotifier: Merge nested if statements --- .../idlenotifier/IdleNotifierPlugin.java | 115 +++--------------- 1 file changed, 16 insertions(+), 99 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java index 66310c8d41..72d64cc20b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java @@ -27,100 +27,18 @@ package net.runelite.client.plugins.idlenotifier; import com.google.inject.Provides; import java.awt.TrayIcon; -//import java.io.IOException; import java.time.Duration; import java.time.Instant; import java.util.Arrays; import java.util.EnumSet; import java.util.List; import javax.inject.Inject; -//import javax.sound.sampled.LineUnavailableException; -//import javax.sound.sampled.UnsupportedAudioFileException; import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Setter; -import net.runelite.api.events.ConfigChanged; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import net.runelite.api.Actor; import net.runelite.api.AnimationID; -import static net.runelite.api.AnimationID.COOKING_FIRE; -import static net.runelite.api.AnimationID.COOKING_RANGE; -import static net.runelite.api.AnimationID.COOKING_WINE; -import static net.runelite.api.AnimationID.CRAFTING_BATTLESTAVES; -import static net.runelite.api.AnimationID.CRAFTING_GLASSBLOWING; -import static net.runelite.api.AnimationID.CRAFTING_LEATHER; -import static net.runelite.api.AnimationID.CRAFTING_POTTERS_WHEEL; -import static net.runelite.api.AnimationID.CRAFTING_POTTERY_OVEN; -import static net.runelite.api.AnimationID.CRAFTING_SPINNING; -import static net.runelite.api.AnimationID.DENSE_ESSENCE_CHIPPING; -import static net.runelite.api.AnimationID.DENSE_ESSENCE_CHISELING; -import static net.runelite.api.AnimationID.FARMING_MIX_ULTRACOMPOST; -import static net.runelite.api.AnimationID.FISHING_CRUSHING_INFERNAL_EELS; -import static net.runelite.api.AnimationID.FISHING_CUTTING_SACRED_EELS; -import static net.runelite.api.AnimationID.FLETCHING_BOW_CUTTING; -import static net.runelite.api.AnimationID.FLETCHING_STRING_MAGIC_LONGBOW; -import static net.runelite.api.AnimationID.FLETCHING_STRING_MAGIC_SHORTBOW; -import static net.runelite.api.AnimationID.FLETCHING_STRING_MAPLE_LONGBOW; -import static net.runelite.api.AnimationID.FLETCHING_STRING_MAPLE_SHORTBOW; -import static net.runelite.api.AnimationID.FLETCHING_STRING_NORMAL_LONGBOW; -import static net.runelite.api.AnimationID.FLETCHING_STRING_NORMAL_SHORTBOW; -import static net.runelite.api.AnimationID.FLETCHING_STRING_OAK_LONGBOW; -import static net.runelite.api.AnimationID.FLETCHING_STRING_OAK_SHORTBOW; -import static net.runelite.api.AnimationID.FLETCHING_STRING_WILLOW_LONGBOW; -import static net.runelite.api.AnimationID.FLETCHING_STRING_WILLOW_SHORTBOW; -import static net.runelite.api.AnimationID.FLETCHING_STRING_YEW_LONGBOW; -import static net.runelite.api.AnimationID.FLETCHING_STRING_YEW_SHORTBOW; -import static net.runelite.api.AnimationID.GEM_CUTTING_AMETHYST; -import static net.runelite.api.AnimationID.GEM_CUTTING_DIAMOND; -import static net.runelite.api.AnimationID.GEM_CUTTING_EMERALD; -import static net.runelite.api.AnimationID.GEM_CUTTING_JADE; -import static net.runelite.api.AnimationID.GEM_CUTTING_OPAL; -import static net.runelite.api.AnimationID.GEM_CUTTING_REDTOPAZ; -import static net.runelite.api.AnimationID.GEM_CUTTING_RUBY; -import static net.runelite.api.AnimationID.GEM_CUTTING_SAPPHIRE; -import static net.runelite.api.AnimationID.HERBLORE_MAKE_TAR; -import static net.runelite.api.AnimationID.HERBLORE_PESTLE_AND_MORTAR; -import static net.runelite.api.AnimationID.HERBLORE_POTIONMAKING; -import static net.runelite.api.AnimationID.HOME_MAKE_TABLET; -import static net.runelite.api.AnimationID.IDLE; -import static net.runelite.api.AnimationID.MAGIC_CHARGING_ORBS; -import static net.runelite.api.AnimationID.MAGIC_ENCHANTING_AMULET_1; -import static net.runelite.api.AnimationID.MAGIC_ENCHANTING_AMULET_2; -import static net.runelite.api.AnimationID.MAGIC_ENCHANTING_AMULET_3; -import static net.runelite.api.AnimationID.MAGIC_ENCHANTING_JEWELRY; -import static net.runelite.api.AnimationID.MAGIC_LUNAR_PLANK_MAKE; -import static net.runelite.api.AnimationID.MAGIC_LUNAR_SHARED; -import static net.runelite.api.AnimationID.MAGIC_LUNAR_STRING_JEWELRY; -import static net.runelite.api.AnimationID.MAGIC_MAKE_TABLET; -import static net.runelite.api.AnimationID.MINING_3A_PICKAXE; -import static net.runelite.api.AnimationID.MINING_ADAMANT_PICKAXE; -import static net.runelite.api.AnimationID.MINING_BLACK_PICKAXE; -import static net.runelite.api.AnimationID.MINING_BRONZE_PICKAXE; -import static net.runelite.api.AnimationID.MINING_DRAGON_PICKAXE; -import static net.runelite.api.AnimationID.MINING_DRAGON_PICKAXE_ORN; -import static net.runelite.api.AnimationID.MINING_INFERNAL_PICKAXE; -import static net.runelite.api.AnimationID.MINING_IRON_PICKAXE; -import static net.runelite.api.AnimationID.MINING_MITHRIL_PICKAXE; -import static net.runelite.api.AnimationID.MINING_RUNE_PICKAXE; -import static net.runelite.api.AnimationID.MINING_STEEL_PICKAXE; -import static net.runelite.api.AnimationID.PISCARILIUS_CRANE_REPAIR; -import static net.runelite.api.AnimationID.SAND_COLLECTION; -import static net.runelite.api.AnimationID.SMITHING_ANVIL; -import static net.runelite.api.AnimationID.SMITHING_CANNONBALL; -import static net.runelite.api.AnimationID.SMITHING_SMELTING; -import static net.runelite.api.AnimationID.USING_GILDED_ALTAR; -import static net.runelite.api.AnimationID.WOODCUTTING_3A_AXE; -import static net.runelite.api.AnimationID.WOODCUTTING_ADAMANT; -import static net.runelite.api.AnimationID.WOODCUTTING_BLACK; -import static net.runelite.api.AnimationID.WOODCUTTING_BRONZE; -import static net.runelite.api.AnimationID.WOODCUTTING_DRAGON; -import static net.runelite.api.AnimationID.WOODCUTTING_INFERNAL; -import static net.runelite.api.AnimationID.WOODCUTTING_IRON; -import static net.runelite.api.AnimationID.WOODCUTTING_MITHRIL; -import static net.runelite.api.AnimationID.WOODCUTTING_RUNE; -import static net.runelite.api.AnimationID.WOODCUTTING_STEEL; +import static net.runelite.api.AnimationID.*; import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.api.GameState; @@ -135,12 +53,13 @@ import net.runelite.api.VarPlayer; import net.runelite.api.Varbits; import net.runelite.api.WorldType; import net.runelite.api.events.AnimationChanged; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; -import net.runelite.api.events.SpotAnimationChanged; import net.runelite.api.events.HitsplatApplied; import net.runelite.api.events.InteractingChanged; import net.runelite.api.events.PlayerSpawned; +import net.runelite.api.events.SpotAnimationChanged; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; @@ -149,6 +68,12 @@ import net.runelite.client.game.SoundManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.util.PvPUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +//import java.io.IOException; +//import javax.sound.sampled.LineUnavailableException; +//import javax.sound.sampled.UnsupportedAudioFileException; @PluginDescriptor( name = "Idle Notifier", @@ -362,22 +287,14 @@ public class IdleNotifierPlugin extends Plugin private void onPlayerSpawned(PlayerSpawned event) { final Player p = event.getPlayer(); - if (this.notifyPkers) + if (this.notifyPkers && p != null && p != client.getLocalPlayer() + && PvPUtil.isAttackable(client, p) && !client.isFriended(p.getName(), false) + && !client.isClanMember(p.getName())) { - if (p != null) - { - if (p != client.getLocalPlayer()) - { - if (PvPUtil.isAttackable(client, p) && !client.isFriended(p.getName(), false) - && !client.isClanMember(p.getName())) - { - String playerName = p.getName(); - int combat = p.getCombatLevel(); - notifier.notify("PK'er warning! A level " + combat + " player named " + playerName + - " appeared!", TrayIcon.MessageType.WARNING); - } - } - } + String playerName = p.getName(); + int combat = p.getCombatLevel(); + notifier.notify("PK'er warning! A level " + combat + " player named " + playerName + + " appeared!", TrayIcon.MessageType.WARNING); } } From 83cdef8968b59d1b06f56ee9eadfd921afc13379 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 14:36:01 +0200 Subject: [PATCH 197/472] idlenotifier: Remove unused field --- .../client/plugins/idlenotifier/IdleNotifierPlugin.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java index 72d64cc20b..ebf89c6846 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java @@ -83,8 +83,6 @@ import org.slf4j.LoggerFactory; @Singleton public class IdleNotifierPlugin extends Plugin { - private static final Logger logger = LoggerFactory.getLogger(IdleNotifierPlugin.class); - // This must be more than 500 client ticks (10 seconds) before you get AFK kicked private static final int LOGOUT_WARNING_MILLIS = (4 * 60 + 40) * 1000; // 4 minutes and 40 seconds private static final int COMBAT_WARNING_MILLIS = 19 * 60 * 1000; // 19 minutes From 7ec7c596ac9429c8a23d233fb7170f2377866584 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 14:37:12 +0200 Subject: [PATCH 198/472] implings: If should have curly braces --- .../runelite/client/plugins/implings/ImplingCounterOverlay.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java index a66ee4e270..6b429da714 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java @@ -29,7 +29,9 @@ public class ImplingCounterOverlay extends Overlay public Dimension render(Graphics2D graphics) { if (!plugin.isShowSpawn() || plugin.getImplings().isEmpty()) + { return null; + } panelComponent.getChildren().clear(); From ad70f31acf0ee2c76ab005d891d10c8cd986e0e9 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 14:38:20 +0200 Subject: [PATCH 199/472] inferno: Remove redundant initializer --- .../java/net/runelite/client/plugins/inferno/InfernoNPC.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java index 3208dba7df..1bcd8702f9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java @@ -41,7 +41,7 @@ public class InfernoNPC RANDOM("Random", Color.ORANGE); @Getter(AccessLevel.PACKAGE) - private String name = ""; + private String name; @Getter(AccessLevel.PACKAGE) private Color color; From 1aa8107b5103fc8b88c9843fab005449eafebf0d Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 14:38:59 +0200 Subject: [PATCH 200/472] inferno: method can be private --- .../net/runelite/client/plugins/inferno/InfernoOverlay.java | 2 +- .../java/net/runelite/client/plugins/inferno/InfernoPlugin.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java index 0d374137f7..75f6587bc5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java @@ -88,7 +88,7 @@ public class InfernoOverlay extends Overlay } // renders text location - public static void renderTextLocation(Graphics2D graphics, InfernoNPC actor, String text, Color color) + private static void renderTextLocation(Graphics2D graphics, InfernoNPC actor, String text, Color color) { graphics.setFont(new Font("Arial", Font.BOLD, 15)); Point textLocation = actor.getNpc().getCanvasTextLocation(graphics, text, actor.textLocHeight + 40); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java index 4b0112a94f..736654f7fb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java @@ -120,7 +120,7 @@ public class InfernoPlugin extends Plugin private List waveMonsters; - public InfernoPlugin() + private InfernoPlugin() { waveMonsters = new ArrayList<>(); } From fb90fec07098b8d20637e133c7eb09a96a5fc3ee Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 14:39:24 +0200 Subject: [PATCH 201/472] inferno: Final field --- .../java/net/runelite/client/plugins/inferno/InfernoPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java index 736654f7fb..4bcf1f03cf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java @@ -118,7 +118,7 @@ public class InfernoPlugin extends Plugin @Getter(AccessLevel.PACKAGE) private int currentWaveNumber; - private List waveMonsters; + private final List waveMonsters; private InfernoPlugin() { From 2f32c50353372d24cafd016040af917668a0aefd Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 14:41:11 +0200 Subject: [PATCH 202/472] info: Merge nested if statements --- .../runelite/client/plugins/info/InfoPanel.java | 7 ++----- .../client/plugins/info/JRichTextPane.java | 17 +++++++---------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java index 6b71f552a6..9227aba3af 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java @@ -147,12 +147,9 @@ public class InfoPanel extends PluginPanel emailLabel.enableAutoLinkHandler(false); emailLabel.addHyperlinkListener(e -> { - if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType()) && e.getURL() != null) + if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType()) && e.getURL() != null && e.getURL().toString().equals(RUNELITE_LOGIN)) { - if (e.getURL().toString().equals(RUNELITE_LOGIN)) - { - executor.execute(sessionManager::login); - } + executor.execute(sessionManager::login); } }); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java b/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java index b3e88b6a60..e86007d0b0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java @@ -68,18 +68,15 @@ public class JRichTextPane extends JEditorPane { linkHandler = e -> { - if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType()) && e.getURL() != null) + if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType()) && e.getURL() != null && Desktop.isDesktopSupported()) { - if (Desktop.isDesktopSupported()) + try { - try - { - Desktop.getDesktop().browse(e.getURL().toURI()); - } - catch (URISyntaxException | IOException ex) - { - log.warn("Error opening link", ex); - } + Desktop.getDesktop().browse(e.getURL().toURI()); + } + catch (URISyntaxException | IOException ex) + { + log.warn("Error opening link", ex); } } }; From 8ea8f7c8458b1076c979b7cc9d8ba2936700d7ae Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 14:42:03 +0200 Subject: [PATCH 203/472] instancemap: Package private class --- .../client/plugins/instancemap/InstanceMapInputListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapInputListener.java index ae75a638ac..6e6cbd9732 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapInputListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapInputListener.java @@ -34,7 +34,7 @@ import net.runelite.client.input.KeyListener; import net.runelite.client.input.MouseAdapter; import net.runelite.client.input.MouseWheelListener; -public class InstanceMapInputListener extends MouseAdapter implements KeyListener, MouseWheelListener +class InstanceMapInputListener extends MouseAdapter implements KeyListener, MouseWheelListener { @Inject private InstanceMapPlugin plugin; From d6285235cb836d90c09dae22e686a113bef88c4d Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 14:45:38 +0200 Subject: [PATCH 204/472] inventorygrid: Use equals when comparing objects --- .../client/plugins/inventorygrid/InventoryGridOverlay.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java index 4e86d634ff..9309861a98 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java @@ -69,7 +69,7 @@ class InventoryGridOverlay extends Overlay final Widget if1DraggingWidget = client.getIf1DraggedWidget(); final Widget inventoryWidget = client.getWidget(WidgetInfo.INVENTORY); - if (if1DraggingWidget == null || if1DraggingWidget != inventoryWidget + if (if1DraggingWidget == null || if1DraggingWidget.equals(inventoryWidget) || client.getItemPressedDuration() < plugin.getDragDelay() / Constants.CLIENT_TICK_LENGTH) { return null; From d4ffa23601cba6f86fd9b448c9e13fc1a94dae41 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 14:47:22 +0200 Subject: [PATCH 205/472] inventorysetups: Package private class --- .../inventorysetups/ui/InventorySetupContainerPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java index 6e0b8b99ba..191402683f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java @@ -39,7 +39,7 @@ import net.runelite.client.plugins.inventorysetups.InventorySetupPlugin; import net.runelite.client.ui.ColorScheme; @Singleton -public abstract class InventorySetupContainerPanel extends JPanel +abstract class InventorySetupContainerPanel extends JPanel { protected ItemManager itemManager; From db1df81bdd1d06975525897807a3f957c0e596eb Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 14:47:44 +0200 Subject: [PATCH 206/472] inventorysetups: Final fields --- .../plugins/inventorysetups/InventorySetupPlugin.java | 2 +- .../inventorysetups/ui/InventorySetupContainerPanel.java | 2 +- .../inventorysetups/ui/InventorySetupPluginPanel.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java index a9c0b01929..940dbb0a7d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java @@ -108,7 +108,7 @@ public class InventorySetupPlugin extends Plugin private InventorySetupPluginPanel panel; - private Map inventorySetups = new HashMap<>(); + private final Map inventorySetups = new HashMap<>(); private NavigationButton navButton; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java index 191402683f..6798d679f2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java @@ -41,7 +41,7 @@ import net.runelite.client.ui.ColorScheme; @Singleton abstract class InventorySetupContainerPanel extends JPanel { - protected ItemManager itemManager; + protected final ItemManager itemManager; private final InventorySetupPlugin plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java index 339ba435a3..75e5719f83 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java @@ -55,10 +55,10 @@ import net.runelite.client.util.ImageUtil; @Singleton public class InventorySetupPluginPanel extends PluginPanel { - private static ImageIcon ADD_ICON; - private static ImageIcon ADD_HOVER_ICON; - private static ImageIcon REMOVE_ICON; - private static ImageIcon REMOVE_HOVER_ICON; + private static final ImageIcon ADD_ICON; + private static final ImageIcon ADD_HOVER_ICON; + private static final ImageIcon REMOVE_ICON; + private static final ImageIcon REMOVE_HOVER_ICON; private final JPanel noSetupsPanel; private final JPanel invEqPanel; From f0bf873429ba9f7e899a5bb5949d8ed76a29f519 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 14:54:35 +0200 Subject: [PATCH 207/472] inventorysetups: Use interface instead of type --- .../plugins/inventorysetups/InventorySetup.java | 5 +++-- .../inventorysetups/InventorySetupPlugin.java | 13 +++++++------ .../ui/InventorySetupContainerPanel.java | 3 ++- .../ui/InventorySetupEquipmentPanel.java | 10 ++++++---- .../ui/InventorySetupInventoryPanel.java | 9 +++++---- .../ui/InventorySetupPluginPanel.java | 7 ++++--- 6 files changed, 27 insertions(+), 20 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java index e49e8b1512..207616cfd8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.inventorysetups; import java.util.ArrayList; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; @@ -33,7 +34,7 @@ import lombok.Getter; public class InventorySetup { @Getter - private ArrayList inventory; + private List inventory; @Getter - private ArrayList equipment; + private List equipment; } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java index 940dbb0a7d..f7d8cba390 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java @@ -33,6 +33,7 @@ import java.awt.image.BufferedImage; import java.lang.reflect.Type; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Objects; import javax.inject.Inject; @@ -205,8 +206,8 @@ public class InventorySetupPlugin extends Plugin clientThread.invoke(() -> { - ArrayList inv = getNormalizedContainer(InventoryID.INVENTORY); - ArrayList eqp = getNormalizedContainer(InventoryID.EQUIPMENT); + List inv = getNormalizedContainer(InventoryID.INVENTORY); + List eqp = getNormalizedContainer(InventoryID.EQUIPMENT); final InventorySetup invSetup = new InventorySetup(inv, eqp); SwingUtilities.invokeLater(() -> @@ -333,13 +334,13 @@ public class InventorySetupPlugin extends Plugin if (container == client.getItemContainer(InventoryID.INVENTORY)) { - ArrayList normContainer = getNormalizedContainer(InventoryID.INVENTORY); + List normContainer = getNormalizedContainer(InventoryID.INVENTORY); final InventorySetup setup = inventorySetups.get(selectedInventorySetup); panel.highlightDifferences(normContainer, setup, InventoryID.INVENTORY); } else if (container == client.getItemContainer(InventoryID.EQUIPMENT)) { - ArrayList normContainer = getNormalizedContainer(InventoryID.EQUIPMENT); + List normContainer = getNormalizedContainer(InventoryID.EQUIPMENT); final InventorySetup setup = inventorySetups.get(selectedInventorySetup); panel.highlightDifferences(normContainer, setup, InventoryID.EQUIPMENT); } @@ -371,13 +372,13 @@ public class InventorySetupPlugin extends Plugin } } - public ArrayList getNormalizedContainer(final InventoryID id) + public List getNormalizedContainer(final InventoryID id) { assert id == InventoryID.INVENTORY || id == InventoryID.EQUIPMENT : "invalid inventory ID"; final ItemContainer container = client.getItemContainer(id); - ArrayList newContainer = new ArrayList<>(); + List newContainer = new ArrayList<>(); Item[] items = null; if (container != null) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java index 6798d679f2..43935a3927 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java @@ -28,6 +28,7 @@ package net.runelite.client.plugins.inventorysetups.ui; import java.awt.BorderLayout; import java.awt.Color; import java.util.ArrayList; +import java.util.List; import javax.inject.Singleton; import javax.swing.JLabel; import javax.swing.JPanel; @@ -73,7 +74,7 @@ abstract class InventorySetupContainerPanel extends JPanel void setContainerSlot(int index, final InventorySetupSlot containerSlot, - final ArrayList items) + final List items) { if (index >= items.size() || items.get(index).getId() == -1) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java index 2ca6687660..5bd5cbf323 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java @@ -28,6 +28,8 @@ package net.runelite.client.plugins.inventorysetups.ui; import java.awt.GridLayout; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; +import java.util.Map; import javax.inject.Singleton; import javax.swing.JPanel; import net.runelite.api.EquipmentInventorySlot; @@ -40,7 +42,7 @@ import net.runelite.client.ui.ColorScheme; @Singleton public class InventorySetupEquipmentPanel extends InventorySetupContainerPanel { - private HashMap equipmentSlots; + private Map equipmentSlots; InventorySetupEquipmentPanel(final ItemManager itemManager, final InventorySetupPlugin plugin) { @@ -80,7 +82,7 @@ public class InventorySetupEquipmentPanel extends InventorySetupContainerPanel void setEquipmentSetupSlots(final InventorySetup setup) { - final ArrayList equipment = setup.getEquipment(); + final List equipment = setup.getEquipment(); for (final EquipmentInventorySlot slot : EquipmentInventorySlot.values()) { @@ -93,9 +95,9 @@ public class InventorySetupEquipmentPanel extends InventorySetupContainerPanel } - void highlightDifferences(final ArrayList currEquipment, final InventorySetup inventorySetup) + void highlightDifferences(final List currEquipment, final InventorySetup inventorySetup) { - final ArrayList equipToCheck = inventorySetup.getEquipment(); + final List equipToCheck = inventorySetup.getEquipment(); assert currEquipment.size() == equipToCheck.size() : "size mismatch"; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java index 3310b2f25c..fecaf28ce5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.inventorysetups.ui; import java.awt.GridLayout; import java.util.ArrayList; +import java.util.List; import javax.inject.Singleton; import javax.swing.JPanel; import net.runelite.client.game.ItemManager; @@ -40,7 +41,7 @@ public class InventorySetupInventoryPanel extends InventorySetupContainerPanel private static final int ITEMS_PER_ROW = 4; private static final int NUM_INVENTORY_ITEMS = 28; - private ArrayList inventorySlots; + private List inventorySlots; InventorySetupInventoryPanel(final ItemManager itemManager, final InventorySetupPlugin plugin) { @@ -67,7 +68,7 @@ public class InventorySetupInventoryPanel extends InventorySetupContainerPanel void setInventorySetupSlots(final InventorySetup setup) { - ArrayList inventory = setup.getInventory(); + List inventory = setup.getInventory(); for (int i = 0; i < NUM_INVENTORY_ITEMS; i++) { @@ -79,10 +80,10 @@ public class InventorySetupInventoryPanel extends InventorySetupContainerPanel } - void highlightDifferentSlots(final ArrayList currInventory, final InventorySetup inventorySetup) + void highlightDifferentSlots(final List currInventory, final InventorySetup inventorySetup) { - final ArrayList inventoryToCheck = inventorySetup.getInventory(); + final List inventoryToCheck = inventorySetup.getInventory(); assert currInventory.size() == inventoryToCheck.size() : "size mismatch"; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java index 75e5719f83..33ef53a442 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java @@ -34,6 +34,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; import java.util.ArrayList; +import java.util.List; import javax.inject.Singleton; import javax.swing.Box; import javax.swing.BoxLayout; @@ -254,8 +255,8 @@ public class InventorySetupPluginPanel extends PluginPanel if (plugin.getHighlightDifference()) { - final ArrayList normInv = plugin.getNormalizedContainer(InventoryID.INVENTORY); - final ArrayList normEqp = plugin.getNormalizedContainer(InventoryID.EQUIPMENT); + final List normInv = plugin.getNormalizedContainer(InventoryID.INVENTORY); + final List normEqp = plugin.getNormalizedContainer(InventoryID.EQUIPMENT); highlightDifferences(normInv, inventorySetup, InventoryID.INVENTORY); highlightDifferences(normEqp, inventorySetup, InventoryID.EQUIPMENT); @@ -287,7 +288,7 @@ public class InventorySetupPluginPanel extends PluginPanel repaint(); } - public void highlightDifferences(final ArrayList container, + public void highlightDifferences(final List container, final InventorySetup setupToCheck, final InventoryID type) { From 228283c9d39bd5c0ff3e12be31c893ca319f2b5d Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 14:55:39 +0200 Subject: [PATCH 208/472] inventorysetups: Private/protected field/method --- .../inventorysetups/ui/InventorySetupContainerPanel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java index 43935a3927..9b8198d134 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java @@ -42,7 +42,7 @@ import net.runelite.client.ui.ColorScheme; @Singleton abstract class InventorySetupContainerPanel extends JPanel { - protected final ItemManager itemManager; + private final ItemManager itemManager; private final InventorySetupPlugin plugin; @@ -128,5 +128,5 @@ abstract class InventorySetupContainerPanel extends JPanel containerSlot.setBackground(ColorScheme.DARKER_GRAY_COLOR); } - abstract public void setupContainerPanel(final JPanel containerSlotsPanel); + protected abstract void setupContainerPanel(final JPanel containerSlotsPanel); } \ No newline at end of file From 51a6383ba4dead9f41fff83e03214336ccadcc3f Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 14:56:29 +0200 Subject: [PATCH 209/472] inventorysetups: Remove unused imports --- .../runelite/client/plugins/inventorysetups/InventorySetup.java | 1 - .../plugins/inventorysetups/ui/InventorySetupContainerPanel.java | 1 - .../plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java | 1 - .../plugins/inventorysetups/ui/InventorySetupPluginPanel.java | 1 - 4 files changed, 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java index 207616cfd8..8e8761e1f3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java @@ -25,7 +25,6 @@ */ package net.runelite.client.plugins.inventorysetups; -import java.util.ArrayList; import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java index 9b8198d134..794f7217b8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java @@ -27,7 +27,6 @@ package net.runelite.client.plugins.inventorysetups.ui; import java.awt.BorderLayout; import java.awt.Color; -import java.util.ArrayList; import java.util.List; import javax.inject.Singleton; import javax.swing.JLabel; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java index 5bd5cbf323..6802ecee8a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java @@ -26,7 +26,6 @@ package net.runelite.client.plugins.inventorysetups.ui; import java.awt.GridLayout; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java index 33ef53a442..77d99029ed 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java @@ -33,7 +33,6 @@ import java.awt.event.ItemEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; -import java.util.ArrayList; import java.util.List; import javax.inject.Singleton; import javax.swing.Box; From 40c52fa589ab31a26294677a46cfed52bf1cf146 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:00:10 +0200 Subject: [PATCH 210/472] itemcharges: Final field --- .../runelite/client/plugins/itemcharges/ItemChargePlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java index 16f7184da9..648b517d74 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java @@ -88,7 +88,7 @@ public class ItemChargePlugin extends Plugin private static final Pattern DODGY_BREAK_PATTERN = Pattern.compile( "Your dodgy necklace protects you\\..*It then crumbles to dust\\."); private static final String RING_OF_RECOIL_BREAK_MESSAGE = "Your Ring of Recoil has shattered."; - private static Pattern BINDING_CHECK_PATTERN = Pattern.compile( + private static final Pattern BINDING_CHECK_PATTERN = Pattern.compile( "You have ([0-9]+|one) charges? left before your Binding necklace disintegrates."); private static final Pattern BINDING_USED_PATTERN = Pattern.compile( "You bind the temple's power into (mud|lava|steam|dust|smoke|mist) runes\\."); From fbf1f53892110670db8b0bea643513bca7a8ce07 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:01:07 +0200 Subject: [PATCH 211/472] itemcharges: Merge nested if statements --- .../plugins/itemcharges/ItemChargePlugin.java | 9 +++------ .../plugins/itemcharges/ItemRecoilOverlay.java | 18 ++++++++---------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java index 648b517d74..0cf44d6f25 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java @@ -567,13 +567,10 @@ public class ItemChargePlugin extends Plugin @Subscribe public void onSpotAnimationChanged(SpotAnimationChanged event) { - if (event.getActor() == client.getLocalPlayer()) + if (event.getActor() == client.getLocalPlayer() && client.getLocalPlayer().getSpotAnimation() == GraphicID.XERIC_TELEPORT) { - if (client.getLocalPlayer().getSpotAnimation() == GraphicID.XERIC_TELEPORT) - { - final int xericCharges = Math.max(this.xericTalisman - 1, 0); - updateXericCharges(xericCharges); - } + final int xericCharges = Math.max(this.xericTalisman - 1, 0); + updateXericCharges(xericCharges); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java index 57e00c2f64..bc37d03b27 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java @@ -60,19 +60,17 @@ class ItemRecoilOverlay extends Overlay tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT); this.imagePanelComponent.getChildren().clear(); - if (plugin.isShowrecoil()) + if (plugin.isShowrecoil() && plugin.isRingOfRecoilAvailable()) { - if (plugin.isRingOfRecoilAvailable()) - { - BufferedImage recoilImage = plugin.getRecoilRingImage(); - imagePanelComponent.setBackgroundColor(plugin - .isRingOfRecoilEquipped() ? ACTIVATED_BACKGROUND_COLOR : NOT_ACTIVATED_BACKGROUND_COLOR); - imagePanelComponent.getChildren().add(new ImageComponent(recoilImage)); + BufferedImage recoilImage = plugin.getRecoilRingImage(); + imagePanelComponent.setBackgroundColor(plugin + .isRingOfRecoilEquipped() ? ACTIVATED_BACKGROUND_COLOR : NOT_ACTIVATED_BACKGROUND_COLOR); + imagePanelComponent.getChildren().add(new ImageComponent(recoilImage)); - imagePanelComponent.getChildren().add(tableComponent); - return imagePanelComponent.render(graphics); - } + imagePanelComponent.getChildren().add(tableComponent); + return imagePanelComponent.render(graphics); } + return null; } } \ No newline at end of file From b4d6f8f1459508f4e5c36c9cebdcc0c3fab0be19 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:02:12 +0200 Subject: [PATCH 212/472] itemidentification: Private field --- .../client/plugins/itemidentification/ItemIdentification.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java index d2e9913bbf..c1ccaada8e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java @@ -90,7 +90,7 @@ enum ItemIdentification final Type type; final String medName; final String shortName; - final int[] itemIDs; + private final int[] itemIDs; ItemIdentification(Type type, String medName, String shortName, int... ids) { From 5e3fbeed3880a7cbfeb5bb0197e35396f4ca29da Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:03:17 +0200 Subject: [PATCH 213/472] itemprices: If statement must use braces --- .../client/plugins/itemprices/ItemPricesOverlay.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java index cd28fbfda6..7ae5d58c2a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java @@ -97,7 +97,10 @@ class ItemPricesOverlay extends Overlay switch (action) { case ITEM_USE_ON_WIDGET: - if (!menuEntry.getTarget().contains("High Level Alchemy") || !plugin.isShowAlchProfit()) return null; + if (!menuEntry.getTarget().contains("High Level Alchemy") || !plugin.isShowAlchProfit()) + { + return null; + } case WIDGET_DEFAULT: case ITEM_USE: case ITEM_FIRST_OPTION: From a434196e5694b7a60bd7e9e287fd018b604cb491 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:04:27 +0200 Subject: [PATCH 214/472] itemstats: Final fields --- .../client/plugins/itemstats/ItemStatOverlay.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java index 28b3e555a2..a9a3c766ee 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java @@ -53,11 +53,11 @@ public class ItemStatOverlay extends Overlay .aspeed(6) .build()); - private Client client; - private ItemManager itemManager; - private TooltipManager tooltipManager; - private ItemStatChanges statChanges; - private ItemStatPlugin plugin; + private final Client client; + private final ItemManager itemManager; + private final TooltipManager tooltipManager; + private final ItemStatChanges statChanges; + private final ItemStatPlugin plugin; @Inject ItemStatOverlay(Client client, ItemStatPlugin plugin, ItemManager itemManager, TooltipManager tooltipManager, ItemStatChanges itemStatChanges) From 66ba2d3ba09002c05e215085515368ff110e6dfb Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:05:08 +0200 Subject: [PATCH 215/472] itemstats: Protected methods --- .../java/net/runelite/client/plugins/itemstats/FoodBase.java | 2 +- .../java/net/runelite/client/plugins/itemstats/StatBoost.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/FoodBase.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/FoodBase.java index 83409af0ce..b8aaf11616 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/FoodBase.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/FoodBase.java @@ -28,7 +28,7 @@ import net.runelite.client.plugins.itemstats.stats.Stats; public abstract class FoodBase extends StatBoost { - public FoodBase() + protected FoodBase() { super(Stats.HITPOINTS, false); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/StatBoost.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/StatBoost.java index ad40c469a4..5d55a70694 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/StatBoost.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/StatBoost.java @@ -38,13 +38,13 @@ public abstract class StatBoost extends SingleEffect @Setter private boolean boost; - public StatBoost(Stat stat, boolean boost) + protected StatBoost(Stat stat, boolean boost) { this.stat = stat; this.boost = boost; } - public abstract int heals(Client client); + protected abstract int heals(Client client); @Override public StatChange effect(Client client) From cb3608cf3b49fdf7dc32da24bfff5301fac297f5 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:07:06 +0200 Subject: [PATCH 216/472] itemstats: Remove pre-sized to array call --- .../runelite/client/plugins/itemstats/special/SpicyStew.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/special/SpicyStew.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/special/SpicyStew.java index 25b7f019f8..a2baa6a09e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/special/SpicyStew.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/special/SpicyStew.java @@ -103,7 +103,7 @@ public class SpicyStew implements Effect } StatsChanges changesReturn = new StatsChanges(4); - changesReturn.setStatChanges(changes.toArray(new StatChange[changes.size()])); + changesReturn.setStatChanges(changes.toArray(new StatChange[0])); return changesReturn; } From 6ed83272573133bb3d7bf625b20675395c3fcee6 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:07:52 +0200 Subject: [PATCH 217/472] itemstats: Replace sambda with method reference --- .../client/plugins/itemstats/potions/SaradominBrew.java | 2 +- .../runelite/client/plugins/itemstats/potions/SuperRestore.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SaradominBrew.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SaradominBrew.java index d4ee16fa1a..ae816900cc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SaradominBrew.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SaradominBrew.java @@ -77,7 +77,7 @@ public class SaradominBrew implements Effect ) ).toArray(StatChange[]::new)); changes.setPositivity(Stream.of(changes.getStatChanges()) - .map(sc -> sc.getPositivity()) + .map(StatChange::getPositivity) .max(Comparator.comparing(Enum::ordinal)).get()); return changes; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SuperRestore.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SuperRestore.java index d8180ae9e0..3ddcf0b137 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SuperRestore.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SuperRestore.java @@ -87,7 +87,7 @@ public class SuperRestore implements Effect return calc.effect(client); }) ).toArray(StatChange[]::new)); - changes.setPositivity(Stream.of(changes.getStatChanges()).map(sc -> sc.getPositivity()).max(Comparator.comparing(Enum::ordinal)).get()); + changes.setPositivity(Stream.of(changes.getStatChanges()).map(StatChange::getPositivity).max(Comparator.comparing(Enum::ordinal)).get()); return changes; } From a67920956bdbabed494d5e119f1b6753aab7b718 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:09:06 +0200 Subject: [PATCH 218/472] itemstats: hasHolyWrench is always false at this point --- .../runelite/client/plugins/itemstats/potions/PrayerPotion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/PrayerPotion.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/PrayerPotion.java index bd2fbfa4b6..47198e4a29 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/PrayerPotion.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/PrayerPotion.java @@ -63,7 +63,7 @@ public class PrayerPotion extends StatBoost final int ring = ItemUtil.safeGetItemIdAtIndex(equip, EquipmentInventorySlot.RING.getSlotIdx()); final int cape = ItemUtil.safeGetItemIdAtIndex(equip, EquipmentInventorySlot.CAPE.getSlotIdx()); - hasHolyWrench |= ring == ItemID.RING_OF_THE_GODS_I; + hasHolyWrench = ring == ItemID.RING_OF_THE_GODS_I; hasHolyWrench |= HOLY_WRENCH_IDS.contains(cape); } if (!hasHolyWrench) From 7739448a32e1181c3ba5b9ffe80963ef183d9804 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:16:15 +0200 Subject: [PATCH 219/472] keyremapping: Merge nested if statements --- .../keyremapping/KeyRemappingPlugin.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java index 2d94b6e4d1..a269a80c8f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java @@ -197,12 +197,9 @@ public class KeyRemappingPlugin extends Plugin { case SCRIPT_EVENT_SET_CHATBOX_INPUT: Widget chatboxInput = client.getWidget(WidgetInfo.CHATBOX_INPUT); - if (chatboxInput != null) + if (chatboxInput != null && chatboxFocused() && !typing) { - if (chatboxFocused() && !typing) - { - chatboxInput.setText(getWaitingText()); - } + chatboxInput.setText(getWaitingText()); } break; case SCRIPT_EVENT_BLOCK_CHAT_INPUT: @@ -230,14 +227,11 @@ public class KeyRemappingPlugin extends Plugin void unlockChat() { Widget chatboxInput = client.getWidget(WidgetInfo.CHATBOX_INPUT); - if (chatboxInput != null) + if (chatboxInput != null && client.getGameState() == GameState.LOGGED_IN) { - if (client.getGameState() == GameState.LOGGED_IN) - { - final boolean isChatboxTransparent = client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1; - final Color textColor = isChatboxTransparent ? JagexColors.CHAT_TYPED_TEXT_TRANSPARENT_BACKGROUND : JagexColors.CHAT_TYPED_TEXT_OPAQUE_BACKGROUND; - chatboxInput.setText(getPlayerNameWithIcon() + ": " + ColorUtil.wrapWithColorTag(client.getVar(VarClientStr.CHATBOX_TYPED_TEXT) + "*", textColor)); - } + final boolean isChatboxTransparent = client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1; + final Color textColor = isChatboxTransparent ? JagexColors.CHAT_TYPED_TEXT_TRANSPARENT_BACKGROUND : JagexColors.CHAT_TYPED_TEXT_OPAQUE_BACKGROUND; + chatboxInput.setText(getPlayerNameWithIcon() + ": " + ColorUtil.wrapWithColorTag(client.getVar(VarClientStr.CHATBOX_TYPED_TEXT) + "*", textColor)); } } From 9f09c8230e39ff7fffe01ea36add0ca51cbaf67f Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:16:54 +0200 Subject: [PATCH 220/472] kingdomofmiscellania: Package private class --- .../client/plugins/kingdomofmiscellania/KingdomCounter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java index 7c3dc3b56a..b48a0af346 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java @@ -30,7 +30,7 @@ import net.runelite.client.ui.overlay.infobox.Counter; import net.runelite.client.util.StackFormatter; @Singleton -public class KingdomCounter extends Counter +class KingdomCounter extends Counter { private final KingdomPlugin plugin; From 35528f8dba82248e829b6dd036229b23bbd7bdeb Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:17:45 +0200 Subject: [PATCH 221/472] kourendlibrary: Private constructor --- .../net/runelite/client/plugins/kourendlibrary/Library.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java index 85103e8135..aeb90c878b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java @@ -101,7 +101,7 @@ class Library @Getter(AccessLevel.PACKAGE) private LibraryCustomer customer; - Library() + private Library() { populateBooks(); step = byIndex.size() / Book.values().length; From 6e6af3d1ef32bf8b738cbfed7fb9291df65e298e Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:18:59 +0200 Subject: [PATCH 222/472] kourendlibrary: Final field --- .../net/runelite/client/plugins/kourendlibrary/BookPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java index fe11faac3b..857c50cef3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java @@ -36,7 +36,7 @@ import net.runelite.client.ui.FontManager; @Singleton class BookPanel extends JPanel { - private JLabel location = new JLabel(); + private final JLabel location = new JLabel(); BookPanel(final Book b) { From 167a68aaac7dbb0dd79e2b85f091bc100a552b00 Mon Sep 17 00:00:00 2001 From: 7ate9 <7ate9@users.noreply.github.com`> Date: Sun, 7 Jul 2019 09:19:00 -0400 Subject: [PATCH 223/472] menuoptionclicked: add isauthentic field --- .../api/events/MenuOptionClicked.java | 15 +++++++++++++++ .../runelite/client/menus/MenuManager.java | 2 +- .../net/runelite/mixins/RSClientMixin.java | 19 +++++++++++++++++-- .../java/net/runelite/rs/api/RSClient.java | 3 +-- 4 files changed, 34 insertions(+), 5 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java b/runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java index 2180458228..848beb4b84 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java +++ b/runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java @@ -24,7 +24,9 @@ */ package net.runelite.api.events; +import lombok.AccessLevel; import lombok.Data; +import lombok.Setter; import net.runelite.api.MenuAction; import net.runelite.api.MenuEntry; @@ -45,6 +47,13 @@ public class MenuOptionClicked public MenuOptionClicked(MenuEntry entry) { menuEntry = entry; + authentic = true; + } + + public MenuOptionClicked(MenuEntry entry, boolean authentic) + { + menuEntry = entry; + this.authentic = authentic; } /** @@ -129,4 +138,10 @@ public class MenuOptionClicked { this.consumed = true; } + + /** + * Whether or not the event is authentic. + */ + @Setter(AccessLevel.PRIVATE) + private boolean authentic; } diff --git a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java index cf8f62744f..5ff9277e18 100644 --- a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java +++ b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java @@ -438,7 +438,7 @@ public class MenuManager @Subscribe public void onMenuOptionClicked(MenuOptionClicked event) { - if (!client.isMenuOpen()) + if (!client.isMenuOpen() && event.isAuthentic()) { rebuildLeftClickMenu(); diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index 782f01915b..36f9216026 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -1253,9 +1253,16 @@ public abstract class RSClientMixin implements RSClient @Replace("menuAction") static void rl$menuAction(int actionParam, int widgetId, int menuAction, int id, String menuOption, String menuTarget, int var6, int var7) { + boolean authentic = true; + if (menuTarget != null && menuTarget.startsWith("!AUTHENTIC")) + { + authentic = false; + menuTarget = menuTarget.substring(10); + } + if (printMenuActions && client.getLogger().isDebugEnabled()) { - client.getLogger().debug("Menuaction: {} {} {} {} {} {} {} {}", actionParam, widgetId, menuAction, id, menuOption, menuTarget, var6, var7); + client.getLogger().debug("Menuaction: {} {} {} {} {} {} {} {} {}", actionParam, widgetId, menuAction, id, menuOption, menuTarget, var6, var7, authentic); } /* Along the way, the RuneScape client may change a menuAction by incrementing it with 2000. @@ -1275,7 +1282,8 @@ public abstract class RSClientMixin implements RSClient actionParam, widgetId, false - ) + ), + authentic ); client.getCallbacks().post(menuOptionClicked); @@ -1289,6 +1297,13 @@ public abstract class RSClientMixin implements RSClient menuOptionClicked.getIdentifier(), menuOptionClicked.getOption(), menuOptionClicked.getTarget(), var6, var7); } + @Override + @Inject + public void invokeMenuAction(int actionParam, int widgetId, int menuAction, int id, String menuOption, String menuTarget, int var6, int var7) + { + client.sendMenuAction(actionParam, widgetId, menuAction, id, menuOption, "!AUTHENTIC" + menuTarget, var6, var7); + } + @FieldHook("Login_username") @Inject public static void onUsernameChanged(int idx) diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index a17b549563..71b4b2d1e8 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java @@ -390,8 +390,7 @@ public interface RSClient extends RSGameShell, Client RSSprite createItemSprite(int itemId, int quantity, int thickness, int borderColor, int stackable, boolean noted); @Import("menuAction") - @Override - void invokeMenuAction(int n2, int n3, int n4, int n5, String string, String string2, int n6, int n7); + void sendMenuAction(int n2, int n3, int n4, int n5, String string, String string2, int n6, int n7); @Import("decodeSprite") void decodeSprite(byte[] data); From 04197f3d6b4b46a22bbe6bf3fcc6f992d2b31eb7 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:19:34 +0200 Subject: [PATCH 224/472] kourendlibrary: Simplify stream --- .../client/plugins/kourendlibrary/KourendLibraryPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java index 90900667f1..f4cdc332d1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java @@ -151,7 +151,7 @@ class KourendLibraryPanel extends PluginPanel } else { - e.getValue().setLocation("" + locs.stream().collect(Collectors.joining("
")) + ""); + e.getValue().setLocation("" + String.join("
", locs) + ""); } } }); From b61c98e2a3c6e20fa221eabf1a785e71073fbcd0 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:20:21 +0200 Subject: [PATCH 225/472] kourendlibrary: Null check --- .../client/plugins/kourendlibrary/KourendLibraryOverlay.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java index 9af693fed2..2b40c99f95 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java @@ -228,7 +228,10 @@ class KourendLibraryOverlay extends Overlay Point screen = Perspective.localToCanvas(client, local, client.getPlane(), n.getLogicalHeight()); if (screen != null) { - g.drawImage(b.getIcon(), screen.getX() - (b.getIcon().getWidth() / 2), screen.getY() - b.getIcon().getHeight(), null); + if (b != null) + { + g.drawImage(b.getIcon(), screen.getX() - (b.getIcon().getWidth() / 2), screen.getY() - b.getIcon().getHeight(), null); + } } }); } From 60bb8b700193479ffcbecff518d099a4b6958174 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:20:53 +0200 Subject: [PATCH 226/472] kourendlibrary: Method is always inverted --- .../kourendlibrary/KourendLibraryOverlay.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java index 2b40c99f95..fb60cb0262 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java @@ -138,7 +138,7 @@ class KourendLibraryOverlay extends Overlay Color color = bookIsKnown ? Color.ORANGE : Color.WHITE; // Render the poly on the floor - if (!(bookIsKnown && book == null) && (library.getState() == SolvedState.NO_DATA || book != null || !possible.isEmpty()) && !shouldHideOverlayIfDuplicateBook(book)) + if (!(bookIsKnown && book == null) && (library.getState() == SolvedState.NO_DATA || book != null || !possible.isEmpty()) && shouldShowOverlayIfDuplicateBook(book)) { Polygon poly = getCanvasTilePoly(client, localBookcase); if (poly != null) @@ -151,7 +151,7 @@ class KourendLibraryOverlay extends Overlay // If the book is singled out, render the text and the book's icon if (bookIsKnown) { - if (book != null && !shouldHideOverlayIfDuplicateBook(book)) + if (book != null && shouldShowOverlayIfDuplicateBook(book)) { FontMetrics fm = g.getFontMetrics(); Rectangle2D bounds = fm.getStringBounds(book.getShortName(), g); @@ -239,11 +239,11 @@ class KourendLibraryOverlay extends Overlay return null; } - private boolean shouldHideOverlayIfDuplicateBook(@Nullable Book book) + private boolean shouldShowOverlayIfDuplicateBook(@Nullable Book book) { - return plugin.isHideDuplicateBook() - && book != null - && !book.isDarkManuscript() - && plugin.doesPlayerContainBook(book); + return !plugin.isHideDuplicateBook() + || book == null + || book.isDarkManuscript() + || !plugin.doesPlayerContainBook(book); } } From a5acf9b5c9f07368bd96f3d2487b8cb5b849afa6 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:23:54 +0200 Subject: [PATCH 227/472] lizardmenshaman: Merge nested if statements --- .../lizardmenshaman/LizardmenShamanPlugin.java | 14 ++++---------- .../lizardmenshaman/ShamanSpawnOverlay.java | 7 ++----- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java index e850169cbf..8a55f1fc21 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java @@ -102,12 +102,9 @@ public class LizardmenShamanPlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (this.notifyOnSpawn) + if (this.notifyOnSpawn && event.getMessage().contains(MESSAGE)) { - if (event.getMessage().contains(MESSAGE)) - { - notifier.notify(MESSAGE); - } + notifier.notify(MESSAGE); } } @@ -120,12 +117,9 @@ public class LizardmenShamanPlugin extends Plugin return; } - if (actor.getName().equals(SHAMAN) && actor.getAnimation() == 7157) + if (actor.getName().equals(SHAMAN) && actor.getAnimation() == 7157 && this.showTimer) { - if (this.showTimer) - { - spawns.put(event.getActor().getLocalLocation(), new LizardmenShamanSpawn(8.4, null)); - } + spawns.put(event.getActor().getLocalLocation(), new LizardmenShamanSpawn(8.4, null)); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java index 9d60355d6d..2ccc721ddf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java @@ -63,12 +63,9 @@ class ShamanSpawnOverlay extends Overlay final long startCountdown = Duration.between(spawn.getStart(), now).getSeconds(); final double certainSec = spawn.getCountdownTimer() - startCountdown; - if (certainSec <= 0) + if (certainSec <= 0 && spawn.getEnd() == null) { - if (spawn.getEnd() == null) - { - spawn.setEnd(Instant.now()); - } + spawn.setEnd(Instant.now()); } final ProgressPieComponent pieComponent = new ProgressPieComponent(); From 1a11677ff380c8ec7e7ff9d5393981c7c0768a6f Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:24:51 +0200 Subject: [PATCH 228/472] lootassist: Final fields --- .../runelite/client/plugins/lootassist/LootAssistOverlay.java | 4 ++-- .../runelite/client/plugins/lootassist/LootAssistPlugin.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistOverlay.java index 8041ef36b0..2aa5705337 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistOverlay.java @@ -22,8 +22,8 @@ import net.runelite.client.ui.overlay.OverlayUtil; @Singleton public class LootAssistOverlay extends Overlay { - private Client client; - private DecimalFormat d = new DecimalFormat("##.#"); + private final Client client; + private final DecimalFormat d = new DecimalFormat("##.#"); @Inject public LootAssistOverlay(final Client client) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java index 35e02cff98..b896912eec 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java @@ -31,7 +31,7 @@ public class LootAssistPlugin extends Plugin @Inject LootAssistOverlay lootAssistOverlay; - static ConcurrentHashMap lootPiles = new ConcurrentHashMap<>(); + static final ConcurrentHashMap lootPiles = new ConcurrentHashMap<>(); @Override protected void startUp() throws Exception From 3d19fce65ba78291983baf9f2aa7f9ddc2361f89 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:26:15 +0200 Subject: [PATCH 229/472] loottracker: Local field --- .../runelite/client/plugins/loottracker/LootTrackerPlugin.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index 2f863394fe..2cdad56baf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -175,7 +175,6 @@ public class LootTrackerPlugin extends Plugin private Multiset inventorySnapshot; @Getter(AccessLevel.PACKAGE) private LootTrackerClient lootTrackerClient; - private BufferedReader bufferedReader; private JsonStreamParser jsonStreamParser; private static Collection stack(Collection items) @@ -305,7 +304,7 @@ public class LootTrackerPlugin extends Plugin AccountSession accountSession = sessionManager.getAccountSession(); LOOT_RECORDS_FILE.createNewFile(); - bufferedReader = Files.newBufferedReader(LOOT_RECORDS_FILE.toPath()); + BufferedReader bufferedReader = Files.newBufferedReader(LOOT_RECORDS_FILE.toPath()); if (accountSession != null || this.localPersistence) { From cc90f6fc8f52c77444519d37f3f59154a8fc7ebc Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:26:53 +0200 Subject: [PATCH 230/472] loottracker: Method can be private --- .../runelite/client/plugins/loottracker/LootTrackerPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index 2cdad56baf..4255112251 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -817,7 +817,7 @@ public class LootTrackerPlugin extends Plugin .toArray(LootTrackerItem[]::new); } - public Collection convertToLootTrackerRecord(final Collection records) + private Collection convertToLootTrackerRecord(final Collection records) { Collection trackerRecords = new ArrayList<>(); for (LootRecord record : records) From eaf46de860f0c4c12e6dd015ec04cf25e3398c27 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:27:07 +0200 Subject: [PATCH 231/472] loottracker: Final fields --- .../runelite/client/plugins/loottracker/LootTrackerBox.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java index 4098bed359..8dbdb20123 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java @@ -67,8 +67,8 @@ class LootTrackerBox extends JPanel private final List records = new ArrayList<>(); private long totalPrice; - private boolean hideIgnoredItems; - private BiConsumer onItemToggle; + private final boolean hideIgnoredItems; + private final BiConsumer onItemToggle; LootTrackerBox( final ItemManager itemManager, From 1c62a8ef0abda442049943532e03f6df33d1d51d Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:27:41 +0200 Subject: [PATCH 232/472] loottracker: Remove explicit types --- .../client/plugins/loottracker/LootTrackerPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index 4255112251..cdcfff42d0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -146,7 +146,7 @@ public class LootTrackerPlugin extends Plugin 11062 // Camelot ); // Player deaths - public static HashSet usernameSet = new HashSet(Arrays.stream(new String[]{"All Records"}).collect(Collectors.toList())); + public static HashSet usernameSet = new HashSet<>(Arrays.stream(new String[]{"All Records"}).collect(Collectors.toList())); @Inject public Client client; @VisibleForTesting @@ -371,7 +371,7 @@ public class LootTrackerPlugin extends Plugin { clientToolbar.removeNavigation(navButton); lootTrackerClient = null; - lootRecords = new ArrayList(); + lootRecords = new ArrayList<>(); } @Subscribe From d25e8e97311e86af7a97016cccc02bb38f92c809 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:28:17 +0200 Subject: [PATCH 233/472] loottracker: Null checks --- .../client/plugins/loottracker/LootTrackerPlugin.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index cdcfff42d0..cc82e8dae6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -51,6 +51,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.concurrent.ScheduledExecutorService; import java.util.regex.Matcher; @@ -322,7 +323,10 @@ public class LootTrackerPlugin extends Plugin if (this.syncPanel && lootTrackerClient != null) { - lootTrackerClient = new LootTrackerClient(accountSession.getUuid()); + if (accountSession != null) + { + lootTrackerClient = new LootTrackerClient(accountSession.getUuid()); + } try { lootRecords = lootTrackerClient.get(); @@ -628,7 +632,7 @@ public class LootTrackerPlugin extends Plugin Multiset currentInventory = HashMultiset.create(); if (inventory != null) { - Arrays.stream(client.getItemContainer(InventoryID.INVENTORY).getItems()) + Arrays.stream(Objects.requireNonNull(client.getItemContainer(InventoryID.INVENTORY)).getItems()) .forEach(item -> currentInventory.add(item.getId(), item.getQuantity())); } From 8e169be53c5cc074f2531e7704f732a823e6b684 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:28:45 +0200 Subject: [PATCH 234/472] loottracker: Remove redundant initializer --- .../runelite/client/plugins/loottracker/LootTrackerPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index cc82e8dae6..e3408ac50f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -620,7 +620,7 @@ public class LootTrackerPlugin extends Plugin if (pvpDeath && RESPAWN_REGIONS.contains(client.getLocalPlayer().getWorldLocation().getRegionID())) { - Multiset snapshot = HashMultiset.create(); + Multiset snapshot; snapshot = inventorySnapshot; deathInventorySnapshot(); if (inventorySnapshot != snapshot) From 0cbfaf259a55ca374514b789a83409c038061a9c Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:31:27 +0200 Subject: [PATCH 235/472] loottracker: Cleanup --- .../client/plugins/loottracker/LootTrackerPlugin.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index e3408ac50f..ac2f457072 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -33,7 +33,6 @@ import com.google.common.collect.Multiset; import com.google.common.collect.Multisets; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.google.gson.JsonStreamParser; import com.google.gson.reflect.TypeToken; import com.google.inject.Provides; import java.awt.image.BufferedImage; @@ -146,12 +145,10 @@ public class LootTrackerPlugin extends Plugin 12342, // Edgeville 11062 // Camelot ); - // Player deaths - public static HashSet usernameSet = new HashSet<>(Arrays.stream(new String[]{"All Records"}).collect(Collectors.toList())); @Inject public Client client; @VisibleForTesting - public Collection lootRecords = new ArrayList<>(); + private Collection lootRecords = new ArrayList<>(); private boolean pvpDeath = false; @Inject private ClientToolbar clientToolbar; @@ -176,7 +173,6 @@ public class LootTrackerPlugin extends Plugin private Multiset inventorySnapshot; @Getter(AccessLevel.PACKAGE) private LootTrackerClient lootTrackerClient; - private JsonStreamParser jsonStreamParser; private static Collection stack(Collection items) { @@ -305,7 +301,7 @@ public class LootTrackerPlugin extends Plugin AccountSession accountSession = sessionManager.getAccountSession(); LOOT_RECORDS_FILE.createNewFile(); - BufferedReader bufferedReader = Files.newBufferedReader(LOOT_RECORDS_FILE.toPath()); + // BufferedReader bufferedReader = Files.newBufferedReader(LOOT_RECORDS_FILE.toPath()); if (accountSession != null || this.localPersistence) { @@ -616,8 +612,6 @@ public class LootTrackerPlugin extends Plugin @Subscribe public void onItemContainerChanged(ItemContainerChanged event) { - final ItemContainer itemContainer = event.getItemContainer(); - if (pvpDeath && RESPAWN_REGIONS.contains(client.getLocalPlayer().getWorldLocation().getRegionID())) { Multiset snapshot; From 2de768179f42b256269425a4629424f0aed84435 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:33:19 +0200 Subject: [PATCH 236/472] maxhit: Static inner class --- .../java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java index ac85314026..b711aa37a5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java @@ -108,7 +108,7 @@ public class MaxHitPlugin extends Plugin equipYourCharacter.setText(maxHitText); } - private class MaxHit + private static class MaxHit { private final double maxMeleeHit; private final double maxRangeHit; From 3f7021798e8d500001baea34e8d98a2d43aab13c Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:35:25 +0200 Subject: [PATCH 237/472] maxhit: Use interface instead of type --- .../plugins/maxhit/calculators/MaxHitCalculator.java | 5 +++-- .../client/plugins/maxhit/config/CustomFormulaConfig.java | 7 ++++--- .../plugins/maxhit/config/EquipmentBonusConfig.java | 2 +- .../plugins/maxhit/equipment/EquipmentSlotItem.java | 8 ++++---- .../maxhit/requirements/AutocastSpellRequirement.java | 6 +++--- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/calculators/MaxHitCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/calculators/MaxHitCalculator.java index c868d3b25a..ce0e468770 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/calculators/MaxHitCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/calculators/MaxHitCalculator.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.maxhit.calculators; import java.util.ArrayList; +import java.util.List; import java.util.function.BiFunction; import net.runelite.api.Client; import net.runelite.api.Item; @@ -97,9 +98,9 @@ public abstract class MaxHitCalculator double applyEquipmentBonus(double maxhit, EquipmentBonusConfig.BonusType bonusType) { double bonus = 1; - ArrayList addList = new ArrayList<>(); + List addList = new ArrayList<>(); - ArrayList equipmentBonuses = EquipmentBonusConfig.getBonusByType(bonusType); + List equipmentBonuses = EquipmentBonusConfig.getBonusByType(bonusType); for (EquipmentBonusConfig equipmentBonus : equipmentBonuses) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/CustomFormulaConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/CustomFormulaConfig.java index 51ec9c6234..3e51821336 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/CustomFormulaConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/CustomFormulaConfig.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.maxhit.config; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.List; import java.util.function.BiFunction; import net.runelite.api.Client; import net.runelite.api.EquipmentInventorySlot; @@ -205,10 +206,10 @@ public enum CustomFormulaConfig ); private final MaxHitCalculator.CombatMethod requiredCombatMethod; - private final ArrayList requirements; + private final List requirements; private final BiFunction customFormula; - CustomFormulaConfig(MaxHitCalculator.CombatMethod requiredCombatMethod, ArrayList requirements, BiFunction customFormula) + CustomFormulaConfig(MaxHitCalculator.CombatMethod requiredCombatMethod, List requirements, BiFunction customFormula) { this.requiredCombatMethod = requiredCombatMethod; this.requirements = requirements; @@ -225,7 +226,7 @@ public enum CustomFormulaConfig return customFormula; } - public ArrayList getRequirements() + public List getRequirements() { return this.requirements; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/EquipmentBonusConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/EquipmentBonusConfig.java index 86915c66a8..015566d5e0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/EquipmentBonusConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/EquipmentBonusConfig.java @@ -376,7 +376,7 @@ public enum EquipmentBonusConfig this.operation = operation; } - public static ArrayList getBonusByType(BonusType bonusType) + public static List getBonusByType(BonusType bonusType) { if (!bonusTypes.containsKey(bonusType)) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java index 5e440d5064..1bd3d6c861 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java @@ -24,21 +24,21 @@ */ package net.runelite.client.plugins.maxhit.equipment; -import java.util.ArrayList; +import java.util.List; import net.runelite.api.EquipmentInventorySlot; public class EquipmentSlotItem { private final EquipmentInventorySlot equipmentSlot; - private final ArrayList itemIds; + private final List itemIds; - public EquipmentSlotItem(EquipmentInventorySlot equipmentSlot, ArrayList itemIds) + public EquipmentSlotItem(EquipmentInventorySlot equipmentSlot, List itemIds) { this.equipmentSlot = equipmentSlot; this.itemIds = itemIds; } - public ArrayList getItems() + public List getItems() { return this.itemIds; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/requirements/AutocastSpellRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/requirements/AutocastSpellRequirement.java index e6e771281e..5e933a3e61 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/requirements/AutocastSpellRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/requirements/AutocastSpellRequirement.java @@ -24,7 +24,7 @@ */ package net.runelite.client.plugins.maxhit.requirements; -import java.util.ArrayList; +import java.util.List; import net.runelite.api.Client; import net.runelite.api.Varbits; import net.runelite.client.plugins.maxhit.config.SpellBaseDamageConfig; @@ -32,9 +32,9 @@ import net.runelite.client.plugins.maxhit.config.SpellBaseDamageConfig; public class AutocastSpellRequirement implements Requirement { - private final ArrayList autocastSpells; + private final List autocastSpells; - public AutocastSpellRequirement(ArrayList autocastSpells) + public AutocastSpellRequirement(List autocastSpells) { this.autocastSpells = autocastSpells; } From 09dd674d564547658d52f220b1914ce7dd88a3ee Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:38:07 +0200 Subject: [PATCH 238/472] menuentryswapper: Remove unused fields --- .../plugins/menuentryswapper/MenuEntrySwapperPlugin.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java index a4414ca6dc..06dee1c828 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java @@ -221,9 +221,7 @@ public class MenuEntrySwapperPlugin extends Plugin private boolean swapBones; private boolean swapChase; private boolean swapHarpoon; - private boolean swapOccult; private OccultAltarMode swapOccultMode; - private boolean swapHomePortal; private HouseMode swapHomePortalMode; private boolean swapPrivate; private boolean swapPick; @@ -275,9 +273,7 @@ public class MenuEntrySwapperPlugin extends Plugin private boolean swapPlank; private boolean swapMetamorphosis; private boolean swapEnchant; - private boolean swapFairyRing; private FairyRingMode swapFairyRingMode; - private boolean swapObelisk; private ObeliskMode swapObeliskMode; private boolean swapTeleportItem; private boolean swapWildernessLever; @@ -1730,9 +1726,7 @@ public class MenuEntrySwapperPlugin extends Plugin this.swapBones = config.swapBones(); this.swapChase = config.swapChase(); this.swapHarpoon = config.swapHarpoon(); - this.swapOccult = config.swapOccult(); this.swapOccultMode = config.swapOccultMode(); - this.swapHomePortal = config.swapHomePortal(); this.swapHomePortalMode = config.swapHomePortalMode(); this.swapPrivate = config.swapPrivate(); this.swapPick = config.swapPick(); @@ -1784,9 +1778,7 @@ public class MenuEntrySwapperPlugin extends Plugin this.swapPlank = config.swapPlank(); this.swapMetamorphosis = config.swapMetamorphosis(); this.swapEnchant = config.swapEnchant(); - this.swapFairyRing = config.swapFairyRing(); this.swapFairyRingMode = config.swapFairyRingMode(); - this.swapObelisk = config.swapObelisk(); this.swapObeliskMode = config.swapObeliskMode(); this.swapTeleportItem = config.swapTeleportItem(); this.swapWildernessLever = config.swapWildernessLever(); From 5348b39e4b4e9a9eb7ec37ec808f096a97cb949d Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:38:34 +0200 Subject: [PATCH 239/472] menuentryswapper: Package private class --- .../plugins/menuentryswapper/ShiftClickInputListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/ShiftClickInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/ShiftClickInputListener.java index c258bfb30a..6a44185c4f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/ShiftClickInputListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/ShiftClickInputListener.java @@ -30,7 +30,7 @@ import javax.inject.Singleton; import net.runelite.client.input.KeyListener; @Singleton -public class ShiftClickInputListener implements KeyListener +class ShiftClickInputListener implements KeyListener { @Inject private MenuEntrySwapperPlugin plugin; From 08097ddb4768b01595f8bc2b8c8ebd54974cfaf6 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:38:56 +0200 Subject: [PATCH 240/472] menuentryswapper: Append calls --- .../net/runelite/client/plugins/menuentryswapper/Parse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/Parse.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/Parse.java index d4e9785f5f..e063efa2a9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/Parse.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/Parse.java @@ -38,7 +38,7 @@ public class Parse { if (!str.startsWith("//")) { - sb.append(str + "\n"); + sb.append(str).append("\n"); } } From a2d1632434e9656ac0451be357a00199b0a6941a Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:40:03 +0200 Subject: [PATCH 241/472] metronome: Remove redundant initializer --- .../net/runelite/client/plugins/metronome/MetronomePlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java index 766b80c434..9817a8888a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java @@ -84,7 +84,7 @@ public class MetronomePlugin extends Plugin File audioFile = new File(path); if (audioFile.exists()) { - AudioInputStream audioStream = null; + AudioInputStream audioStream; try { audioStream = AudioSystem.getAudioInputStream(audioFile); From 458241bc31bee49db3159970f068206ee1e49498 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:40:16 +0200 Subject: [PATCH 242/472] metronome: Remove unused code --- .../net/runelite/client/plugins/metronome/MetronomePlugin.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java index 9817a8888a..8b74571f31 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java @@ -93,8 +93,7 @@ public class MetronomePlugin extends Plugin { return null; } - AudioFormat audioFormat = audioStream.getFormat(); - DataLine.Info audioInfo = new DataLine.Info(Clip.class, audioFormat); + try { Clip audioClip = AudioSystem.getClip(); From 0d8909c5b66ac6c7427321bb719e614a0e8322ff Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:41:34 +0200 Subject: [PATCH 243/472] minimap: Package private class --- .../java/net/runelite/client/plugins/minimap/MinimapDot.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapDot.java b/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapDot.java index 33e15bb3bd..6de0afb579 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapDot.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapDot.java @@ -28,7 +28,7 @@ import java.awt.Color; import net.runelite.api.Client; import net.runelite.api.Sprite; -public class MinimapDot +class MinimapDot { private static final int MAP_DOT_WIDTH = 4; private static final int MAP_DOT_HEIGHT = 5; From 9bf16aa89d54d85d730e867a6dbc16d8789f23cd Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:42:32 +0200 Subject: [PATCH 244/472] minimap: Method can be private --- .../java/net/runelite/client/plugins/mining/MiningPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java index 29f5df03e0..c9fc460f23 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java @@ -285,7 +285,7 @@ public class MiningPlugin extends Plugin * @param delta How much to add/subtract from the amount. * Supply a negative number to subtract, or positive number to add. */ - protected void updateAmountOfCoalInBag(int delta) + private void updateAmountOfCoalInBag(int delta) { // check for upper/lower bounds of amount of coal in a bag // 0 <= X <= 27 From 7b74282fb73161af2bfb19b1d7ba7c998478f954 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:42:57 +0200 Subject: [PATCH 245/472] minimap: Unused field --- .../java/net/runelite/client/plugins/mining/MiningPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java index c9fc460f23..f114f276ff 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java @@ -76,7 +76,7 @@ import net.runelite.client.ui.overlay.OverlayManager; @Singleton public class MiningPlugin extends Plugin { - private static final int ROCK_DISTANCE = 14; + // private static final int ROCK_DISTANCE = 14; private static final int MINING_GUILD_REGION = 12183; private static final Pattern COAL_BAG_EMPTY_MESSAGE = Pattern.compile("^The coal bag is (now )?empty\\.$"); From 923caeda88f82c61b4889dab58631cf7eb4018d1 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:44:15 +0200 Subject: [PATCH 246/472] motherlode: Merge nested if statements --- .../motherlode/MotherlodeRocksOverlay.java | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java index 3fa2aba3dd..6b672967dc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java @@ -97,21 +97,17 @@ class MotherlodeRocksOverlay extends Overlay for (WallObject vein : plugin.getVeins()) { LocalPoint location = vein.getLocalLocation(); - if (localLocation.distanceTo(location) <= MAX_DISTANCE) + if (localLocation.distanceTo(location) <= MAX_DISTANCE && plugin.isUpstairs(localLocation) == plugin.isUpstairs(vein.getLocalLocation())) { - // Only draw veins on the same level - if (plugin.isUpstairs(localLocation) == plugin.isUpstairs(vein.getLocalLocation())) + if (WorldPoint.fromLocal(client, location).equals(plugin.getTargetVeinLocation()) + && plugin.isMining() + && plugin.isShowTargetVein()) { - if (WorldPoint.fromLocal(client, location).equals(plugin.getTargetVeinLocation()) - && plugin.isMining() - && plugin.isShowTargetVein()) - { - renderVein(graphics, vein, true); - } - else - { - renderVein(graphics, vein, false); - } + renderVein(graphics, vein, true); + } + else + { + renderVein(graphics, vein, false); } } } From 5a11f1eddff27266d2f10cf4fa6529f0d3481062 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:45:16 +0200 Subject: [PATCH 247/472] mta: Package private class --- .../runelite/client/plugins/mta/graveyard/GraveyardCounter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardCounter.java index 8db687282f..c3be2bc51f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardCounter.java @@ -29,7 +29,7 @@ import java.awt.image.BufferedImage; import net.runelite.client.plugins.Plugin; import net.runelite.client.ui.overlay.infobox.Counter; -public class GraveyardCounter extends Counter +class GraveyardCounter extends Counter { GraveyardCounter(final BufferedImage image, final Plugin plugin) { From 6b644f92cd9bced85bbb21758a772d3031b29b91 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:46:49 +0200 Subject: [PATCH 248/472] mta: Null checks --- .../plugins/mta/alchemy/AlchemyRoom.java | 5 ++++- .../mta/telekinetic/TelekineticRoom.java | 21 ++++++++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java index b8bd37fa9c..5a273fb3ad 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java @@ -249,7 +249,10 @@ public class AlchemyRoom extends MTARoom Cupboard clicked = getClicked(); if (clicked.alchemyItem != alchemyItem) { - fill(clicked, alchemyItem); + if (alchemyItem != null) + { + fill(clicked, alchemyItem); + } } } else if (message.equals(EMPTY)) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java index 557792c398..76c463621e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java @@ -286,7 +286,11 @@ public class TelekineticRoom extends MTARoom Direction next = moves.pop(); WorldArea areaNext = getIndicatorLine(next); - WorldPoint nearestNext = nearest(areaNext, current); + WorldPoint nearestNext = null; + if (areaNext != null) + { + nearestNext = nearest(areaNext, current); + } if (moves.isEmpty()) { @@ -298,9 +302,20 @@ public class TelekineticRoom extends MTARoom Direction after = moves.peek(); moves.push(next); WorldArea areaAfter = getIndicatorLine(after); - WorldPoint nearestAfter = nearest(areaAfter, nearestNext); + WorldPoint nearestAfter = null; + if (areaAfter != null) + { + nearestAfter = nearest(areaAfter, nearestNext); + } - return nearest(areaNext, nearestAfter); + if (areaNext != null) + { + return nearest(areaNext, nearestAfter); + } + else + { + return nearestAfter; + } } private static int manhattan(WorldPoint point1, WorldPoint point2) From 31990d7a4d28f4d61b4811ebda0798b45bdc7cc9 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:48:00 +0200 Subject: [PATCH 249/472] mta: Use equals when comparing objects --- .../net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java | 4 ++-- .../client/plugins/mta/telekinetic/TelekineticRoom.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java index 5a273fb3ad..94e020bc9c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java @@ -121,7 +121,7 @@ public class AlchemyRoom extends MTARoom } AlchemyItem bestItem = getBest(); - if (best == null || best != bestItem) + if (best == null || !best.equals(bestItem)) { if (best != null) { @@ -396,7 +396,7 @@ public class AlchemyRoom extends MTARoom continue; } - if (alchemyItem == best) + if (alchemyItem.equals(best)) { client.setHintArrow(object.getWorldLocation()); found = true; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java index 76c463621e..2023ff3166 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java @@ -219,7 +219,7 @@ public class TelekineticRoom extends MTARoom { NPC npc = event.getNpc(); - if (npc == guardian) + if (npc.equals(guardian)) { guardian = null; } From 43f48afd5ee5ed4dcb99bbc6e6ae040ba16c3ddd Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:49:20 +0200 Subject: [PATCH 250/472] mta: Merge nested if statements --- .../plugins/mta/alchemy/AlchemyRoom.java | 69 +++++++------------ .../plugins/mta/graveyard/GraveyardRoom.java | 9 +-- 2 files changed, 27 insertions(+), 51 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java index 94e020bc9c..186497182f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java @@ -37,22 +37,7 @@ import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.GameObject; import net.runelite.api.GameState; -import static net.runelite.api.ObjectID.CUPBOARD_23678; -import static net.runelite.api.ObjectID.CUPBOARD_23679; -import static net.runelite.api.ObjectID.CUPBOARD_23680; -import static net.runelite.api.ObjectID.CUPBOARD_23681; -import static net.runelite.api.ObjectID.CUPBOARD_23682; -import static net.runelite.api.ObjectID.CUPBOARD_23683; -import static net.runelite.api.ObjectID.CUPBOARD_23684; -import static net.runelite.api.ObjectID.CUPBOARD_23685; -import static net.runelite.api.ObjectID.CUPBOARD_23686; -import static net.runelite.api.ObjectID.CUPBOARD_23687; -import static net.runelite.api.ObjectID.CUPBOARD_23688; -import static net.runelite.api.ObjectID.CUPBOARD_23689; -import static net.runelite.api.ObjectID.CUPBOARD_23690; -import static net.runelite.api.ObjectID.CUPBOARD_23691; -import static net.runelite.api.ObjectID.CUPBOARD_23692; -import static net.runelite.api.ObjectID.CUPBOARD_23693; +import static net.runelite.api.ObjectID.*; import net.runelite.api.Perspective; import net.runelite.api.Player; import net.runelite.api.Point; @@ -240,43 +225,37 @@ public class AlchemyRoom extends MTARoom String message = wrapper.getMessage(); - if (wrapper.getType() == ChatMessageType.GAMEMESSAGE) + if (wrapper.getType() == ChatMessageType.GAMEMESSAGE && message.contains(YOU_FOUND)) { - if (message.contains(YOU_FOUND)) + String item = message.replace(YOU_FOUND, "").trim(); + AlchemyItem alchemyItem = AlchemyItem.find(item); + Cupboard clicked = getClicked(); + if (clicked.alchemyItem != alchemyItem && alchemyItem != null) { - String item = message.replace(YOU_FOUND, "").trim(); - AlchemyItem alchemyItem = AlchemyItem.find(item); - Cupboard clicked = getClicked(); - if (clicked.alchemyItem != alchemyItem) - { - if (alchemyItem != null) - { - fill(clicked, alchemyItem); - } - } + fill(clicked, alchemyItem); } - else if (message.equals(EMPTY)) + } + else if (message.equals(EMPTY)) + { + Cupboard clicked = getClicked(); + + int idx = Arrays.asList(cupboards).indexOf(clicked); + for (int i = -2; i <= 2; ++i) { - Cupboard clicked = getClicked(); - - int idx = Arrays.asList(cupboards).indexOf(clicked); - for (int i = -2; i <= 2; ++i) + int j = (idx + i) % 8; + if (j < 0) { - int j = (idx + i) % 8; - if (j < 0) - { - j = 8 + j; - } - - Cupboard cupboard = cupboards[j]; - if (cupboard != null && cupboard.alchemyItem == AlchemyItem.UNKNOWN) - { - cupboard.alchemyItem = AlchemyItem.POSSIBLY_EMPTY; - } + j = 8 + j; } - clicked.alchemyItem = AlchemyItem.EMPTY; + Cupboard cupboard = cupboards[j]; + if (cupboard != null && cupboard.alchemyItem == AlchemyItem.UNKNOWN) + { + cupboard.alchemyItem = AlchemyItem.POSSIBLY_EMPTY; + } } + + clicked.alchemyItem = AlchemyItem.EMPTY; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java index 2c683989c6..5cfe0f16fa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java @@ -83,13 +83,10 @@ public class GraveyardRoom extends MTARoom @Subscribe public void onGameTick(GameTick tick) { - if (!inside() || !this.graveyard) + if ((!inside() || !this.graveyard) && this.counter != null) { - if (this.counter != null) - { - infoBoxManager.removeIf(e -> e instanceof GraveyardCounter); - this.counter = null; - } + infoBoxManager.removeIf(e -> e instanceof GraveyardCounter); + this.counter = null; } } From a88fa3b88574fd21ebac5eaefe75f2d56889fa90 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:50:14 +0200 Subject: [PATCH 251/472] multiindicators: Package private class --- .../runelite/client/plugins/multiindicators/MapLocations.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java index cf7a0ef3da..7bf5da3df2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java @@ -33,7 +33,7 @@ import java.util.ArrayList; import java.util.List; import net.runelite.api.Constants; -public class MapLocations +class MapLocations { private static final List[] MULTICOMBAT = new List[Constants.MAX_Z]; private static final List[] NOT_MULTICOMBAT = new List[Constants.MAX_Z]; From e6643bb468bbea6e6eee6215317f2142b16fd6d6 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:51:09 +0200 Subject: [PATCH 252/472] multiindicators: Null check --- .../plugins/multiindicators/MultiIndicatorsOverlay.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java index dd134690ed..74573f97a4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java @@ -86,8 +86,11 @@ public class MultiIndicatorsOverlay extends Overlay path = Geometry.transformPath(path, coords -> { Point point = Perspective.localToCanvas(client, new LocalPoint((int) coords[0], (int) coords[1]), client.getPlane()); - coords[0] = point.getX(); - coords[1] = point.getY(); + if (point != null) + { + coords[0] = point.getX(); + coords[1] = point.getY(); + } }); graphics.draw(path); From 8c8a71666323853f2c775e891aa187f8c915a06f Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:54:44 +0200 Subject: [PATCH 253/472] npchighlight: Null check --- .../client/plugins/npchighlight/NpcSceneOverlay.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java index 900072d4e3..5f0d3100a2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java @@ -153,7 +153,11 @@ public class NpcSceneOverlay extends Overlay { case SOUTH_WEST_TILE: LocalPoint lp1 = LocalPoint.fromWorld(client, actor.getWorldLocation()); - Polygon tilePoly1 = Perspective.getCanvasTilePoly(client, lp1); + Polygon tilePoly1 = null; + if (lp1 != null) + { + tilePoly1 = Perspective.getCanvasTilePoly(client, lp1); + } renderPoly(graphics, color, tilePoly1); break; From 8cd89cbbb238c70bd6eabdc02f3be699193226aa Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:56:05 +0200 Subject: [PATCH 254/472] npchighlight: Merge nested if statements --- .../npchighlight/NpcIndicatorsPlugin.java | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java index 122599d15c..a65fbf0b4c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java @@ -562,13 +562,10 @@ public class NpcIndicatorsPlugin extends Plugin { for (NPC npc : despawnedNpcsThisTick) { - if (!teleportGraphicsObjectSpawnedThisTick.isEmpty()) + if (!teleportGraphicsObjectSpawnedThisTick.isEmpty() && teleportGraphicsObjectSpawnedThisTick.contains(npc.getWorldLocation())) { - if (teleportGraphicsObjectSpawnedThisTick.contains(npc.getWorldLocation())) - { - // NPC teleported away, so we don't want to add the respawn timer - continue; - } + // NPC teleported away, so we don't want to add the respawn timer + continue; } if (isInViewRange(client.getLocalPlayer().getWorldLocation(), npc.getWorldLocation())) @@ -590,14 +587,12 @@ public class NpcIndicatorsPlugin extends Plugin for (NPC npc : spawnedNpcsThisTick) { - if (!teleportGraphicsObjectSpawnedThisTick.isEmpty()) + if (!teleportGraphicsObjectSpawnedThisTick.isEmpty() && + (teleportGraphicsObjectSpawnedThisTick.contains(npc.getWorldLocation()) || + teleportGraphicsObjectSpawnedThisTick.contains(getWorldLocationBehind(npc)))) { - if (teleportGraphicsObjectSpawnedThisTick.contains(npc.getWorldLocation()) || - teleportGraphicsObjectSpawnedThisTick.contains(getWorldLocationBehind(npc))) - { - // NPC teleported here, so we don't want to update the respawn timer - continue; - } + // NPC teleported here, so we don't want to update the respawn timer + continue; } if (lastPlayerLocation != null && isInViewRange(lastPlayerLocation, npc.getWorldLocation())) From 739b4dad06e3086a9d81cfc0606038cf66f1aa77 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:57:04 +0200 Subject: [PATCH 255/472] npcstatus: Merge nested if statements --- .../plugins/npcstatus/NpcStatusPlugin.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java index 9e6af3cc93..cfb3d6ed34 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java @@ -146,21 +146,19 @@ public class NpcStatusPlugin extends Plugin return; } final Hitsplat hitsplat = event.getHitsplat(); - if (hitsplat.getHitsplatType() == Hitsplat.HitsplatType.DAMAGE || hitsplat.getHitsplatType() == Hitsplat.HitsplatType.BLOCK) + if ((hitsplat.getHitsplatType() == Hitsplat.HitsplatType.DAMAGE || hitsplat.getHitsplatType() == Hitsplat.HitsplatType.BLOCK) && event.getActor() instanceof NPC) { - if (event.getActor() instanceof NPC) + for (MemorizedNPC mn : memorizedNPCs) { - for (MemorizedNPC mn : memorizedNPCs) + if (mn.getStatus() == MemorizedNPC.Status.OUT_OF_COMBAT || (mn.getStatus() == MemorizedNPC.Status.IN_COMBAT && mn.getCombatTimerEnd() - client.getTickCount() < 1) || mn.getLastinteracted() == null) { - if (mn.getStatus() == MemorizedNPC.Status.OUT_OF_COMBAT || (mn.getStatus() == MemorizedNPC.Status.IN_COMBAT && mn.getCombatTimerEnd() - client.getTickCount() < 1) || mn.getLastinteracted() == null) - { - mn.setStatus(MemorizedNPC.Status.FLINCHING); - mn.setCombatTimerEnd(-1); - mn.setFlinchTimerEnd(client.getTickCount() + mn.getAttackSpeed() / 2 + 1); - } + mn.setStatus(MemorizedNPC.Status.FLINCHING); + mn.setCombatTimerEnd(-1); + mn.setFlinchTimerEnd(client.getTickCount() + mn.getAttackSpeed() / 2 + 1); } } } + } private void checkStatus() From ef256b40c7f81e58a17d53d6647521536adc1b2e Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:57:59 +0200 Subject: [PATCH 256/472] npcunaggroarea: Null check --- .../client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java index 5a295e2f35..47e205109c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java @@ -110,8 +110,11 @@ class NpcAggroAreaOverlay extends Overlay path = Geometry.transformPath(path, coords -> { Point point = Perspective.localToCanvas(client, new LocalPoint((int) coords[0], (int) coords[1]), client.getPlane()); - coords[0] = point.getX(); - coords[1] = point.getY(); + if (point != null) + { + coords[0] = point.getX(); + coords[1] = point.getY(); + } }); graphics.draw(path); From 44e2ab21cf78f2ea586b8e6d4b6df3810027b321 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:58:59 +0200 Subject: [PATCH 257/472] npcunaggroarea: Merge nested if statements --- .../npcunaggroarea/NpcAggroAreaPlugin.java | 46 ++++++++----------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java index d4093c07a5..5d1b77040f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java @@ -24,13 +24,10 @@ */ package net.runelite.client.plugins.npcunaggroarea; -import java.awt.Color; -import javax.inject.Singleton; -import lombok.AccessLevel; -import net.runelite.api.geometry.Geometry; import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.inject.Provides; +import java.awt.Color; import java.awt.Polygon; import java.awt.Rectangle; import java.awt.geom.Area; @@ -41,6 +38,8 @@ import java.time.Instant; import java.util.Arrays; import java.util.List; import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; @@ -56,6 +55,7 @@ import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.NpcSpawned; +import net.runelite.api.geometry.Geometry; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.ItemManager; @@ -345,20 +345,17 @@ public class NpcAggroAreaPlugin extends Plugin public void onGameTick(GameTick event) { WorldPoint newLocation = client.getLocalPlayer().getWorldLocation(); - if (lastPlayerLocation != null) + if (lastPlayerLocation != null && safeCenters[1] == null && newLocation.distanceTo2D(lastPlayerLocation) > SAFE_AREA_RADIUS * 4) { - if (safeCenters[1] == null && newLocation.distanceTo2D(lastPlayerLocation) > SAFE_AREA_RADIUS * 4) - { - safeCenters[0] = null; - safeCenters[1] = newLocation; - resetTimer(); - calculateLinesToDisplay(); + safeCenters[0] = null; + safeCenters[1] = newLocation; + resetTimer(); + calculateLinesToDisplay(); - // We don't know where the previous area was, so if the player e.g. - // entered a dungeon and then goes back out, he/she may enter the previous - // area which is unknown and would make the plugin inaccurate - previousUnknownCenter = lastPlayerLocation; - } + // We don't know where the previous area was, so if the player e.g. + // entered a dungeon and then goes back out, he/she may enter the previous + // area which is unknown and would make the plugin inaccurate + previousUnknownCenter = lastPlayerLocation; } if (safeCenters[0] == null && previousUnknownCenter != null && @@ -371,17 +368,14 @@ public class NpcAggroAreaPlugin extends Plugin calculateLinesToDisplay(); } - if (safeCenters[1] != null) + if (safeCenters[1] != null && Arrays.stream(safeCenters).noneMatch( + x -> x != null && x.distanceTo2D(newLocation) <= SAFE_AREA_RADIUS)) { - if (Arrays.stream(safeCenters).noneMatch( - x -> x != null && x.distanceTo2D(newLocation) <= SAFE_AREA_RADIUS)) - { - safeCenters[0] = safeCenters[1]; - safeCenters[1] = newLocation; - resetTimer(); - calculateLinesToDisplay(); - previousUnknownCenter = null; - } + safeCenters[0] = safeCenters[1]; + safeCenters[1] = newLocation; + resetTimer(); + calculateLinesToDisplay(); + previousUnknownCenter = null; } lastPlayerLocation = newLocation; From d99f39d62d96b633b0371e47e1ce2b331237851c Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 16:00:21 +0200 Subject: [PATCH 258/472] objectindicators: Merge nested if statements --- .../objectindicators/ObjectIndicatorsPlugin.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java index f21d7ef067..0f20e4c8df 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java @@ -332,13 +332,11 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener for (ObjectPoint objectPoint : objectPoints) { if ((worldPoint.getX() & (REGION_SIZE - 1)) == objectPoint.getRegionX() - && (worldPoint.getY() & (REGION_SIZE - 1)) == objectPoint.getRegionY()) + && (worldPoint.getY() & (REGION_SIZE - 1)) == objectPoint.getRegionY() + && objectPoint.getName().equals(client.getObjectDefinition(object.getId()).getName())) { - if (objectPoint.getName().equals(client.getObjectDefinition(object.getId()).getName())) - { - objects.add(object); - break; - } + objects.add(object); + break; } } } From 121ace86d12a3603d3ce25f1437cd8508ca73989 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 16:01:12 +0200 Subject: [PATCH 259/472] opponentinfo: Merge nested if statements --- .../client/plugins/opponentinfo/OpponentInfoPlugin.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java index 979633bdf7..e65b070674 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java @@ -163,13 +163,12 @@ public class OpponentInfoPlugin extends Plugin { if (lastOpponent != null && lastTime != null - && client.getLocalPlayer().getInteracting() == null) + && client.getLocalPlayer().getInteracting() == null + && Duration.between(lastTime, Instant.now()).compareTo(WAIT) > 0) { - if (Duration.between(lastTime, Instant.now()).compareTo(WAIT) > 0) - { - lastOpponent = null; - } + lastOpponent = null; } + } @Subscribe From b259c9ec805e8e5cae88e2c97eb6555681c54a15 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 16:13:08 +0200 Subject: [PATCH 260/472] imports: Checkstyle --- .../client/plugins/idlenotifier/IdleNotifierPlugin.java | 2 -- .../client/plugins/kourendlibrary/KourendLibraryPanel.java | 1 - .../runelite/client/plugins/loottracker/LootTrackerPlugin.java | 1 - .../net/runelite/client/plugins/metronome/MetronomePlugin.java | 2 -- 4 files changed, 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java index ebf89c6846..10a72b7667 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java @@ -68,8 +68,6 @@ import net.runelite.client.game.SoundManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.util.PvPUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; //import java.io.IOException; //import javax.sound.sampled.LineUnavailableException; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java index f4cdc332d1..aba91b0911 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java @@ -36,7 +36,6 @@ import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import java.util.stream.Collectors; import java.util.stream.Stream; import javax.inject.Singleton; import javax.swing.ImageIcon; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index ac2f457072..de5a6cab2b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -36,7 +36,6 @@ import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import com.google.inject.Provides; import java.awt.image.BufferedImage; -import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; import java.io.FileNotFoundException; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java index 8b74571f31..5ba3246d87 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java @@ -32,8 +32,6 @@ import net.runelite.api.SoundEffectVolume; import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioSystem; import javax.sound.sampled.Clip; -import javax.sound.sampled.DataLine; -import javax.sound.sampled.AudioFormat; import javax.sound.sampled.FloatControl; import java.io.File; import net.runelite.api.Client; From 89a3a33a250962dd1709596efd34b78c4b395ccc Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 16:24:41 +0200 Subject: [PATCH 261/472] Revert "kourendlibrary: Private constructor" This reverts commit 35528f8dba82248e829b6dd036229b23bbd7bdeb. --- .../net/runelite/client/plugins/kourendlibrary/Library.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java index aeb90c878b..85103e8135 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java @@ -101,7 +101,7 @@ class Library @Getter(AccessLevel.PACKAGE) private LibraryCustomer customer; - private Library() + Library() { populateBooks(); step = byIndex.size() / Book.values().length; From fc014de372a0b3bf1e1c4b3cf27a818c98097702 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 16:29:17 +0200 Subject: [PATCH 262/472] inferno: Fix constructor acces level --- .../java/net/runelite/client/plugins/inferno/InfernoPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java index 4bcf1f03cf..9230985b1b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java @@ -120,7 +120,7 @@ public class InfernoPlugin extends Plugin private final List waveMonsters; - private InfernoPlugin() + public InfernoPlugin() { waveMonsters = new ArrayList<>(); } From eeb08c4adbe73a8dc609c46fb6ec6facbbaa0590 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:33:26 +0200 Subject: [PATCH 263/472] party: Package private class --- .../net/runelite/client/plugins/party/PartyPluginService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPluginService.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPluginService.java index c0548dadbf..bc9b22b1eb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPluginService.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPluginService.java @@ -28,7 +28,7 @@ import java.util.UUID; import javax.annotation.Nullable; import net.runelite.client.plugins.party.data.PartyData; -public interface PartyPluginService +interface PartyPluginService { /** * Get the party data for a party member From 5fb3f4c994d60bf27a99035f52c11d62f3a158c8 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:33:47 +0200 Subject: [PATCH 264/472] party: Final field --- .../net/runelite/client/plugins/party/PartyWorldMapPoint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyWorldMapPoint.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyWorldMapPoint.java index 8a51f5fa0c..a81979c779 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyWorldMapPoint.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyWorldMapPoint.java @@ -37,7 +37,7 @@ class PartyWorldMapPoint extends WorldMapPoint private static final BufferedImage ARROW = ImageUtil.getResourceStreamFromClass(PartyWorldMapPoint.class, "/util/clue_arrow.png"); private BufferedImage partyImage; - private PartyMember member; + private final PartyMember member; PartyWorldMapPoint(final WorldPoint worldPoint, final PartyMember member) { From d6bd37a69d7382750d22fccdf728da8f58260068 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:34:50 +0200 Subject: [PATCH 265/472] performancestats: Remove unnecessary calls --- .../plugins/performancestats/PerformanceStatsOverlay.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java index ede483cfa1..d4a6c6634b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java @@ -113,8 +113,8 @@ public class PerformanceStatsOverlay extends Overlay return new String[] { performance.getUsername(), - (int) Math.round(performance.getDamageDealt()) + " | " + String.valueOf((int) Math.round(performance.getHighestHitDealt())), - (int) Math.round(performance.getDamageTaken()) + " | " + String.valueOf((int) Math.round(performance.getHighestHitTaken())), + (int) Math.round(performance.getDamageDealt()) + " | " + (int) Math.round(performance.getHighestHitDealt()), + (int) Math.round(performance.getDamageTaken()) + " | " + (int) Math.round(performance.getHighestHitTaken()), String.valueOf(performance.getDPS()), performance.getHumanReadableSecondsSpent() }; From aee3bcd42dcfb1a0d862f9e8d959c56f79a8a5b0 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:35:35 +0200 Subject: [PATCH 266/472] pestcontrol: Remove explicit type --- .../main/java/net/runelite/client/plugins/pestcontrol/Game.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java index 5ed0b19202..49b84fe2de 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java @@ -201,7 +201,7 @@ public class Game List getPortals() { - List portalList = new ArrayList(); + List portalList = new ArrayList<>(); portalList.add(getPurplePortal()); portalList.add(getBluePortal()); From 5ebef01e81b3ad15d17eb14d425a42ebcbd44bd4 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:36:10 +0200 Subject: [PATCH 267/472] pestcontrol: Remove pre-sized array --- .../main/java/net/runelite/client/plugins/pestcontrol/Game.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java index 49b84fe2de..a40471a341 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java @@ -147,7 +147,7 @@ public class Game } } - possibleRotations = rotations.toArray(new PortalRotation[rotations.size()]); + possibleRotations = rotations.toArray(new PortalRotation[0]); } private void killPortal(Portal portal) From 826db719ca408e0e4bebb6283fc5340763d846c1 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:36:45 +0200 Subject: [PATCH 268/472] pestcontrol: Remove redundant initializer --- .../client/plugins/pestcontrol/NpcHighlightContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightContext.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightContext.java index 3dfaee777b..049f649de0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightContext.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightContext.java @@ -38,5 +38,5 @@ class NpcHighlightContext { private NpcHighlightStyle npcRenderStyle; private Color color; - private boolean showNpcName = false; + private boolean showNpcName; } From 381b56392656a180c5c8c000e08761e7c356e686 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:37:08 +0200 Subject: [PATCH 269/472] pestcontrol: Final fields --- .../net/runelite/client/plugins/pestcontrol/Game.java | 6 +++--- .../plugins/pestcontrol/PortalWeaknessOverlay.java | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java index a40471a341..9f330f6088 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java @@ -41,9 +41,9 @@ import net.runelite.api.events.GameTick; @Slf4j public class Game { - private Client client; + private final Client client; - private PestControlPlugin plugin; + private final PestControlPlugin plugin; @Getter(AccessLevel.PACKAGE) private Portal bluePortal = new Portal(PortalColor.BLUE, WidgetPortal.BLUE); @@ -66,7 +66,7 @@ public class Game private boolean portalLocationsSet = false; - private Instant startTime = Instant.now(); + private final Instant startTime = Instant.now(); public Game(Client client, PestControlPlugin plugin) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalWeaknessOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalWeaknessOverlay.java index 7f8d94148b..941f851b6c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalWeaknessOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalWeaknessOverlay.java @@ -53,11 +53,11 @@ public class PortalWeaknessOverlay extends Overlay private final PestControlPlugin plugin; private final Client client; - private BufferedImage magicImage; - private BufferedImage rangedImage; - private BufferedImage stabImage; - private BufferedImage slashImage; - private BufferedImage crushImage; + private final BufferedImage magicImage; + private final BufferedImage rangedImage; + private final BufferedImage stabImage; + private final BufferedImage slashImage; + private final BufferedImage crushImage; @Inject PortalWeaknessOverlay( From 41a4d46d806861e07633c333699eaf6f93144c18 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:37:45 +0200 Subject: [PATCH 270/472] pestcontrol: Return value is never used --- .../java/net/runelite/client/plugins/pestcontrol/Game.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java index 9f330f6088..64deb7876d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java @@ -162,7 +162,7 @@ public class Game portal.setPortalState(PortalState.DEAD); } - private boolean loadPortalLocations() + private void loadPortalLocations() { NPC squire = null; @@ -180,10 +180,8 @@ public class Game log.debug("In-game Squire found: {}", squire); setPortalLocations(squire.getWorldLocation()); - return true; } - return false; } private void setPortalLocations(WorldPoint squireLocation) From 4e64b0114e8f37177f98e5879734422095530911 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:39:32 +0200 Subject: [PATCH 271/472] pileindicators: Use interface instead of type --- .../plugins/pileindicators/PileIndicatorsOverlay.java | 6 +++--- .../plugins/pileindicators/PileIndicatorsPlugin.java | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsOverlay.java index a1d69ccff2..1fe970e620 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsOverlay.java @@ -27,7 +27,7 @@ package net.runelite.client.plugins.pileindicators; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.util.ArrayList; +import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.api.Actor; @@ -56,11 +56,11 @@ public class PileIndicatorsOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - ArrayList> stackList = plugin.getStacks(); + List> stackList = plugin.getStacks(); if (stackList != null) { - for (ArrayList actorArrayList : stackList) + for (List actorArrayList : stackList) { PileType pileType = plugin.getPileType(actorArrayList); Color pileColor = plugin.getColorByPileType(pileType); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java index 32e04d6612..c886770474 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.pileindicators; import com.google.inject.Provides; import java.awt.Color; import java.util.ArrayList; +import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; import lombok.AccessLevel; @@ -103,11 +104,11 @@ public class PileIndicatorsPlugin extends Plugin overlayManager.remove(overlay); } - ArrayList> getStacks() + List> getStacks() { - ArrayList> outerArrayList = new ArrayList<>(); + List> outerArrayList = new ArrayList<>(); - ArrayList pileList = new ArrayList<>(); + List pileList = new ArrayList<>(); if (this.enableNPCS) { @@ -175,7 +176,7 @@ public class PileIndicatorsPlugin extends Plugin return null; } - PileType getPileType(ArrayList pile) + PileType getPileType(List pile) { PileType pileType = null; From fe8023f8b12a140ca90939ac2eeabb69bf0d1683 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:40:13 +0200 Subject: [PATCH 272/472] pileindicators: Merge nested if statements --- .../pileindicators/PileIndicatorsPlugin.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java index c886770474..50e04c26ee 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java @@ -121,16 +121,13 @@ public class PileIndicatorsPlugin extends Plugin } } - if (this.enablePlayers) + if (this.enablePlayers && (client.getVar(Varbits.IN_WILDERNESS) > 0 && this.wildyOnlyPlayer) ^ (!this.wildyOnlyPlayer)) { - if ((client.getVar(Varbits.IN_WILDERNESS) > 0 && this.wildyOnlyPlayer) ^ (!this.wildyOnlyPlayer)) + for (Player player : client.getPlayers()) { - for (Player player : client.getPlayers()) + if (player != null) { - if (player != null) - { - pileList.add(player); - } + pileList.add(player); } } } @@ -145,12 +142,9 @@ public class PileIndicatorsPlugin extends Plugin ArrayList potentialStackArrayList = new ArrayList<>(); for (Actor actorToCompareTo : pileList) { - if (!potentialStackArrayList.contains(actorToCompareTo)) + if (!potentialStackArrayList.contains(actorToCompareTo) && actor.getWorldLocation().distanceTo(actorToCompareTo.getWorldLocation()) == 0) { - if (actor.getWorldLocation().distanceTo(actorToCompareTo.getWorldLocation()) == 0) - { - potentialStackArrayList.add(actorToCompareTo); - } + potentialStackArrayList.add(actorToCompareTo); } } if (potentialStackArrayList.size() >= this.minimumPileSize) From 21b7d04539ab6b5fc1b9b85c6622bc50257dc3d6 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:41:19 +0200 Subject: [PATCH 273/472] playerindicators: Use equals when comparing objects --- .../plugins/playerindicators/PlayerIndicatorsService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java index 90e224a044..54a2589782 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java @@ -64,7 +64,7 @@ public class PlayerIndicatorsService boolean isClanMember = player.isClanMember(); - if (player == localPlayer) + if (player.equals(localPlayer)) { if (plugin.isHighlightOwnPlayer()) { From cd193c4dd77ff5dc2fac0dc554d5f860a71a8b21 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:41:42 +0200 Subject: [PATCH 274/472] playerindicators: Use interface instead of type --- .../plugins/playerindicators/PlayerIndicatorsPlugin.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java index 90ee0fb013..8bbdf54fa8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java @@ -28,6 +28,7 @@ import com.google.inject.Provides; import java.awt.Color; import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; import lombok.AccessLevel; @@ -172,7 +173,7 @@ public class PlayerIndicatorsPlugin extends Plugin overlayManager.remove(playerIndicatorsMinimapOverlay); } - private ArrayList callers = new ArrayList<>(); + private List callers = new ArrayList<>(); @Subscribe public void onConfigChanged(ConfigChanged event) From 4646cfa7ef2d5a35d2f8027b41f20abf279f2e58 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:43:24 +0200 Subject: [PATCH 275/472] pluginsorter: Final field --- .../client/plugins/pluginsorter/PluginSorterPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java index 3ad3f06a4e..c2f09c8371 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java @@ -51,7 +51,7 @@ import net.runelite.client.plugins.config.PluginListItem; public class PluginSorterPlugin extends Plugin { //Cache the hidden plugins - private static List removedPlugins = new ArrayList<>(); + private static final List removedPlugins = new ArrayList<>(); @Inject private PluginSorterConfig config; From a82d3f08c47c114c230972aaf3dfbfe7f8acd472 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:44:57 +0200 Subject: [PATCH 276/472] poison: Use equals when comparing objects --- .../java/net/runelite/client/plugins/poison/PoisonPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java index abf1f4c56e..ef0a03b5e8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java @@ -488,7 +488,7 @@ public class PoisonPlugin extends Plugin } // Only update sprites when the heart icon actually changes - if (newHeart != heart) + if (newHeart != null && !newHeart.equals(heart)) { heart = newHeart; client.getWidgetSpriteCache().reset(); From e92e09dd4f7dc3463e374266bec79ae2665a397c Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:45:46 +0200 Subject: [PATCH 277/472] prayagainstplayer: Weaponname can never be null here --- .../runelite/client/plugins/prayagainstplayer/WeaponType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java index d312a0ee8c..a0393d2a24 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java @@ -54,7 +54,7 @@ enum WeaponType { return WEAPON_MELEE; } - if (weaponNameGivenLowerCase == null || weaponNameGivenLowerCase.toLowerCase().contains("null")) + if (weaponNameGivenLowerCase.toLowerCase().contains("null")) { return WEAPON_MELEE; } From 0ef00827c969c912a2ed47c33ec51830fc63d722 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:46:07 +0200 Subject: [PATCH 278/472] prayagainstplayer: Final fields --- .../client/plugins/prayagainstplayer/PlayerContainer.java | 6 +++--- .../client/plugins/prayagainstplayer/WeaponType.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PlayerContainer.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PlayerContainer.java index 4ff815d6cd..338fcd4357 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PlayerContainer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PlayerContainer.java @@ -34,9 +34,9 @@ import net.runelite.api.Player; public class PlayerContainer { - private Player player; - private long whenTheyAttackedMe; - private int millisToExpireHighlight; + private final Player player; + private final long whenTheyAttackedMe; + private final int millisToExpireHighlight; PlayerContainer(final Player player, final long whenTheyAttackedMe, final int millisToExpireHighlight) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java index a0393d2a24..d6078e556e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java @@ -87,7 +87,7 @@ enum WeaponType } - private static String[] meleeWeaponNames = { + private static final String[] meleeWeaponNames = { "sword", "scimitar", "dagger", @@ -119,7 +119,7 @@ enum WeaponType "bulwark" }; - private static String[] rangedWeaponNames = { + private static final String[] rangedWeaponNames = { "bow", "blowpipe", "xil-ul", @@ -130,7 +130,7 @@ enum WeaponType "ballista" }; - private static String[] magicWeaponNames = { + private static final String[] magicWeaponNames = { "staff", "trident", "wand", From 3c7d6eb56469edcd3f3b330578cd012053e0a4c1 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:47:12 +0200 Subject: [PATCH 279/472] prayagainstplayer: Use interface instead of type --- .../prayagainstplayer/PrayAgainstPlayerPlugin.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java index db42cc14fa..375d1e155b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java @@ -32,6 +32,7 @@ import java.awt.image.ColorModel; import java.awt.image.IndexColorModel; import java.awt.image.WritableRaster; import java.util.ArrayList; +import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; import lombok.AccessLevel; @@ -81,8 +82,8 @@ public class PrayAgainstPlayerPlugin extends Plugin private static final Color PROTECTION_ICON_OUTLINE_COLOR = new Color(33, 33, 33); private final BufferedImage[] ProtectionIcons = new BufferedImage[PROTECTION_ICONS.length]; - private ArrayList potentialPlayersAttackingMe; - private ArrayList playersAttackingMe; + private List potentialPlayersAttackingMe; + private List playersAttackingMe; @Inject private Client client; @@ -347,12 +348,12 @@ public class PrayAgainstPlayerPlugin extends Plugin } } - ArrayList getPotentialPlayersAttackingMe() + List getPotentialPlayersAttackingMe() { return potentialPlayersAttackingMe; } - ArrayList getPlayersAttackingMe() + List getPlayersAttackingMe() { return playersAttackingMe; } From beb1e828d22f2f210cab07a35b8913e4255cc18f Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:48:04 +0200 Subject: [PATCH 280/472] prayagainstplayer: Remove unused var --- .../plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java index 375d1e155b..6e40c5ebe9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java @@ -361,9 +361,7 @@ public class PrayAgainstPlayerPlugin extends Plugin //All of the methods below are from the Zulrah plugin!!! Credits to it's respective owner private void loadProtectionIcons() { - int curPosition = 0; - - for (int i = 0; i < PROTECTION_ICONS.length; i++, curPosition++) + for (int i = 0; i < PROTECTION_ICONS.length; i++) { final int resource = PROTECTION_ICONS[i]; ProtectionIcons[i] = rgbaToIndexedBufferedImage(ProtectionIconFromSprite(spriteManager.getSprite(resource, 0))); From f371a0f80cb1ec55bfed73f3781c743ff9dbfdb6 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:48:59 +0200 Subject: [PATCH 281/472] prayagainstplayer: Merge nested if statements --- .../PrayAgainstPlayerOverlayPrayerTab.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java index 0af7b52e28..c4380983f3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java @@ -73,13 +73,10 @@ class PrayAgainstPlayerOverlayPrayerTab extends Overlay { for (PlayerContainer container : plugin.getPlayersAttackingMe()) { - if (plugin.getPlayersAttackingMe() != null && plugin.getPlayersAttackingMe().size() > 0) + if (plugin.getPlayersAttackingMe() != null && plugin.getPlayersAttackingMe().size() == 1 && + plugin.isDrawTargetPrayAgainstPrayerTab()) { - // no reason to show you what prayers to pray in your prayer tab if multiple people are attacking you - if ((plugin.getPlayersAttackingMe().size() == 1) && (plugin.isDrawTargetPrayAgainstPrayerTab())) - { - renderPrayerToClick(graphics, container.getPlayer()); - } + renderPrayerToClick(graphics, container.getPlayer()); } } } From 5df29be71de7995eef2514e6acfeb52a37b69fb6 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:50:29 +0200 Subject: [PATCH 282/472] prayer: Inline double var --- .../net/runelite/client/plugins/prayer/PrayerFlickOverlay.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerFlickOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerFlickOverlay.java index 144f443dd1..56e4dc1660 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerFlickOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerFlickOverlay.java @@ -77,14 +77,13 @@ class PrayerFlickOverlay extends Overlay //Purposefully using height twice here as the bounds of the prayer orb includes the number sticking out the side int orbInnerHeight = (int) bounds.getHeight(); - int orbInnerWidth = orbInnerHeight; int orbInnerX = (int) (bounds.getX() + 24);//x pos of the inside of the prayer orb int orbInnerY = (int) (bounds.getY() - 1);//y pos of the inside of the prayer orb double t = plugin.getTickProgress(); - int xOffset = (int) (-Math.cos(t) * orbInnerWidth / 2) + orbInnerWidth / 2; + int xOffset = (int) (-Math.cos(t) * orbInnerHeight / 2) + orbInnerHeight / 2; int indicatorHeight = (int) (Math.sin(t) * orbInnerHeight); int yOffset = (orbInnerHeight / 2) - (indicatorHeight / 2); From c28a01edcfee9a3a24fbd68c9d5a16de48caed41 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:51:55 +0200 Subject: [PATCH 283/472] prayer: Use equals when comparing objects --- .../java/net/runelite/client/plugins/prayer/PrayerPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java index 85d8111a94..1dae89f203 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java @@ -153,7 +153,7 @@ public class PrayerPlugin extends Plugin final ItemContainer inventory = client.getItemContainer(InventoryID.INVENTORY); final ItemContainer equipment = client.getItemContainer(InventoryID.EQUIPMENT); - if (container == inventory || container == equipment) + if (container != null && (container.equals(inventory) || container.equals(equipment))) { doseOverlay.setHasHolyWrench(false); doseOverlay.setHasPrayerRestore(false); From 770c1775532f742ffbcb5d537cc6fe18e1f71ab8 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:52:50 +0200 Subject: [PATCH 284/472] profiles: Final field --- .../net/runelite/client/plugins/profiles/ProfilesPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java index bf0283a4a3..66a4f5530f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java @@ -92,7 +92,7 @@ class ProfilesPanel extends PluginPanel private final JPasswordField txtAccountLogin = new JPasswordField(ACCOUNT_USERNAME); private final JPasswordField txtPasswordLogin = new JPasswordField(PASSWORD_LABEL); private final JPanel profilesPanel = new JPanel(); - private GridBagConstraints c; + private final GridBagConstraints c; @Inject public ProfilesPanel(final Client client, final ProfilesConfig config) From b1720a256c26223409d7e9391b81f4eca6317a15 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:53:55 +0200 Subject: [PATCH 285/472] profiles: Use loggerl --- .../net/runelite/client/plugins/profiles/ProfilePanel.java | 2 +- .../net/runelite/client/plugins/profiles/ProfilesPanel.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilePanel.java index 878ed2b220..352ee7677f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilePanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilePanel.java @@ -103,7 +103,7 @@ class ProfilePanel extends JPanel } catch (InvalidKeySpecException | NoSuchAlgorithmException ex) { - ex.printStackTrace(); + log.error(e.toString()); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java index 66a4f5530f..60835272a2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java @@ -346,7 +346,7 @@ class ProfilesPanel extends PluginPanel } catch (InvalidKeySpecException | NoSuchAlgorithmException ex) { - ex.printStackTrace(); + log.error(e.toString()); } this.addAccount(data); @@ -552,7 +552,7 @@ class ProfilesPanel extends PluginPanel } catch (NoSuchAlgorithmException | IllegalBlockSizeException | InvalidKeyException | BadPaddingException | NoSuchPaddingException e) { - e.printStackTrace(); + log.error(e.toString()); } return new byte[0]; } @@ -568,7 +568,7 @@ class ProfilesPanel extends PluginPanel } catch (NoSuchAlgorithmException | IllegalBlockSizeException | InvalidKeyException | BadPaddingException | NoSuchPaddingException e) { - e.printStackTrace(); + log.error(e.toString()); } return ""; } From a1b233056b55cc71110e34566d3f18ec519c2677 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:54:26 +0200 Subject: [PATCH 286/472] profiles: Merge nested if statements --- .../client/plugins/profiles/ProfilesPlugin.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java index 488a511a5f..b79187fa6a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java @@ -87,14 +87,11 @@ public class ProfilesPlugin extends Plugin @Subscribe private void onConfigChanged(ConfigChanged event) throws Exception { - if (event.getGroup().equals("profiles")) + if (event.getGroup().equals("profiles") && event.getKey().equals("rememberPassword")) { - if (event.getKey().equals("rememberPassword")) - { - panel = injector.getInstance(ProfilesPanel.class); - this.shutDown(); - this.startUp(); - } + panel = injector.getInstance(ProfilesPanel.class); + this.shutDown(); + this.startUp(); } } From 622fe2e06e4ecd0a0d300326baf36b6fb821875c Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:55:23 +0200 Subject: [PATCH 287/472] puzzlesolver: Method can be private --- .../client/plugins/puzzlesolver/lightbox/LightboxSolver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/lightbox/LightboxSolver.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/lightbox/LightboxSolver.java index e7aae71dcc..9dcf6b4a7a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/lightbox/LightboxSolver.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/lightbox/LightboxSolver.java @@ -29,7 +29,7 @@ public class LightboxSolver private LightboxState initial; private final LightboxState[] switches = new LightboxState[LightBox.COMBINATIONS_POWER]; - static boolean isBitSet(int num, int bit) + private static boolean isBitSet(int num, int bit) { return ((num >>> bit) & 1) != 0; } From adbe42183868063636f49eb090ca96f6cde56e85 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:57:02 +0200 Subject: [PATCH 288/472] puzzlesolver: Final fields --- .../client/plugins/puzzlesolver/PuzzleSolverPlugin.java | 2 +- .../client/plugins/puzzlesolver/solver/PuzzleSolver.java | 4 ++-- .../plugins/puzzlesolver/solver/pathfinding/IDAStarMM.java | 6 +++--- .../plugins/puzzlesolver/solver/pathfinding/Pathfinder.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java index 378217d02e..331a7a6205 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java @@ -87,7 +87,7 @@ public class PuzzleSolverPlugin extends Plugin private PuzzleSolverConfig config; private LightboxState lightbox; - private LightboxState[] changes = new LightboxState[LightBox.COMBINATIONS_POWER]; + private final LightboxState[] changes = new LightboxState[LightBox.COMBINATIONS_POWER]; private Combination lastClick; private boolean lastClickInvalid; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleSolver.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleSolver.java index 6e156a62ce..5270bcd452 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleSolver.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleSolver.java @@ -37,8 +37,8 @@ public class PuzzleSolver implements Runnable private static final Duration MAX_WAIT_DURATION = Duration.ofMillis(1500); - private Pathfinder pathfinder; - private PuzzleState startState; + private final Pathfinder pathfinder; + private final PuzzleState startState; private List solution; private int position; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/IDAStarMM.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/IDAStarMM.java index 331c883a18..86877c2327 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/IDAStarMM.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/IDAStarMM.java @@ -51,9 +51,9 @@ import net.runelite.client.plugins.puzzlesolver.solver.heuristics.Heuristic; public class IDAStarMM extends IDAStar { private PuzzleState currentState; - private List stateList = new ArrayList<>(); - private List> validRowNumbers = new ArrayList<>(); - private List> validColumnNumbers = new ArrayList<>(); + private final List stateList = new ArrayList<>(); + private final List> validRowNumbers = new ArrayList<>(); + private final List> validColumnNumbers = new ArrayList<>(); public IDAStarMM(Heuristic heuristic) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/Pathfinder.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/Pathfinder.java index c8715253f9..d742f327cb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/Pathfinder.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/Pathfinder.java @@ -31,7 +31,7 @@ import net.runelite.client.plugins.puzzlesolver.solver.heuristics.Heuristic; public abstract class Pathfinder { - private Heuristic heuristic; + private final Heuristic heuristic; Pathfinder(Heuristic heuristic) { From 50bac46b359d310fc114eda908244019480058bb Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:58:49 +0200 Subject: [PATCH 289/472] puzzlesolver: Merge nested if statements --- .../puzzlesolver/solver/PuzzleState.java | 68 ++++++++----------- 1 file changed, 28 insertions(+), 40 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleState.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleState.java index 74d346cd29..0946c504ab 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleState.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleState.java @@ -84,67 +84,55 @@ public class PuzzleState int emptyPieceY = emptyPiece / DIMENSION; // Move left if there is space to the left - if (emptyPieceX > 0) + if (emptyPieceX > 0 && (parent == null || parent.emptyPiece != emptyPiece - 1)) { - if (parent == null || parent.emptyPiece != emptyPiece - 1) - { - PuzzleState state = new PuzzleState(this); - state.parent = this; + PuzzleState state = new PuzzleState(this); + state.parent = this; - state.pieces[emptyPiece - 1] = BLANK_TILE_VALUE; - state.pieces[emptyPiece] = pieces[emptyPiece - 1]; - state.emptyPiece--; + state.pieces[emptyPiece - 1] = BLANK_TILE_VALUE; + state.pieces[emptyPiece] = pieces[emptyPiece - 1]; + state.emptyPiece--; - moves.add(state); - } + moves.add(state); } // Move right if there is space to the right - if (emptyPieceX < DIMENSION - 1) + if (emptyPieceX < DIMENSION - 1 && (parent == null || parent.emptyPiece != emptyPiece + 1)) { - if (parent == null || parent.emptyPiece != emptyPiece + 1) - { - PuzzleState state = new PuzzleState(this); - state.parent = this; + PuzzleState state = new PuzzleState(this); + state.parent = this; - state.pieces[emptyPiece + 1] = BLANK_TILE_VALUE; - state.pieces[emptyPiece] = pieces[emptyPiece + 1]; - state.emptyPiece++; + state.pieces[emptyPiece + 1] = BLANK_TILE_VALUE; + state.pieces[emptyPiece] = pieces[emptyPiece + 1]; + state.emptyPiece++; - moves.add(state); - } + moves.add(state); } // Move up if there is space upwards - if (emptyPieceY > 0) + if (emptyPieceY > 0 && (parent == null || parent.emptyPiece != emptyPiece - DIMENSION)) { - if (parent == null || parent.emptyPiece != emptyPiece - DIMENSION) - { - PuzzleState state = new PuzzleState(this); - state.parent = this; + PuzzleState state = new PuzzleState(this); + state.parent = this; - state.pieces[emptyPiece - DIMENSION] = BLANK_TILE_VALUE; - state.pieces[emptyPiece] = pieces[emptyPiece - DIMENSION]; - state.emptyPiece -= DIMENSION; + state.pieces[emptyPiece - DIMENSION] = BLANK_TILE_VALUE; + state.pieces[emptyPiece] = pieces[emptyPiece - DIMENSION]; + state.emptyPiece -= DIMENSION; - moves.add(state); - } + moves.add(state); } // Move down if there is space downwards - if (emptyPieceY < DIMENSION - 1) + if (emptyPieceY < DIMENSION - 1 && (parent == null || parent.emptyPiece != emptyPiece + DIMENSION)) { - if (parent == null || parent.emptyPiece != emptyPiece + DIMENSION) - { - PuzzleState state = new PuzzleState(this); - state.parent = this; + PuzzleState state = new PuzzleState(this); + state.parent = this; - state.pieces[emptyPiece + DIMENSION] = BLANK_TILE_VALUE; - state.pieces[emptyPiece] = pieces[emptyPiece + DIMENSION]; - state.emptyPiece += DIMENSION; + state.pieces[emptyPiece + DIMENSION] = BLANK_TILE_VALUE; + state.pieces[emptyPiece] = pieces[emptyPiece + DIMENSION]; + state.emptyPiece += DIMENSION; - moves.add(state); - } + moves.add(state); } return moves; From 815248b75ac8e3d9c4fe543c899bb09da06d8d9d Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 17:59:55 +0200 Subject: [PATCH 290/472] pvptools: Package private class --- .../net/runelite/client/plugins/pvptools/PvpToolsPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java index 1686cd2353..b412c1a22e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java @@ -29,7 +29,7 @@ import net.runelite.client.ui.PluginPanel; @Slf4j @Singleton -public class PvpToolsPanel extends PluginPanel +class PvpToolsPanel extends PluginPanel { private final JLabel loggedLabel = new JLabel(); From 85264649db3d79ccba12e92be69ca05b9d0a4f19 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:00:14 +0200 Subject: [PATCH 291/472] pvptools: Final fields --- .../plugins/pvptools/PlayerCountOverlay.java | 2 +- .../plugins/pvptools/PvpToolsOverlay.java | 2 +- .../plugins/pvptools/PvpToolsPanel.java | 24 +++++++++---------- .../plugins/pvptools/PvpToolsPlugin.java | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java index a620a6d8aa..389c553af8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java @@ -32,7 +32,7 @@ import org.apache.commons.lang3.ArrayUtils; @Singleton public class PlayerCountOverlay extends Overlay { - private static int[] CLAN_WARS_REGIONS = {9520, 13135, 13134, 13133, 13131, 13130, 13387, 13386}; + private static final int[] CLAN_WARS_REGIONS = {9520, 13135, 13134, 13133, 13131, 13130, 13387, 13386}; private final PvpToolsPlugin pvpToolsPlugin; private final Client client; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java index 09e0cccdf1..5b8a3f7f1c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java @@ -25,7 +25,7 @@ import net.runelite.client.ui.overlay.OverlayUtil; @Singleton public class PvpToolsOverlay extends Overlay { - private PvpToolsPlugin pvpToolsPlugin; + private final PvpToolsPlugin pvpToolsPlugin; @Inject private PvpToolsOverlay(final PvpToolsPlugin pvpToolsPlugin) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java index b412c1a22e..c64dacff12 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java @@ -34,18 +34,18 @@ class PvpToolsPanel extends PluginPanel private final JLabel loggedLabel = new JLabel(); private final JRichTextPane emailLabel = new JRichTextPane(); - JLabel numCC = new JLabel(); - JLabel numOther = new JLabel(); - JLabel numMageJLabel = new JLabel(" "); - JLabel numRangeJLabel = new JLabel(" "); - JLabel numMeleeJLabel = new JLabel(" "); - JLabel totalRiskLabel = new JLabel(" "); - JLabel riskProtectingItem = new JLabel(" "); - JLabel biggestItemLabel = new JLabel("Protected Item: "); - JButton missingPlayers = new JButton("Show missing CC members"); - JButton currentPlayers = new JButton("Show current CC members"); - private JLabel numBrews = new JLabel(); - private JPanel missingPlayersPanel = new JPanel(); + final JLabel numCC = new JLabel(); + final JLabel numOther = new JLabel(); + final JLabel numMageJLabel = new JLabel(" "); + final JLabel numRangeJLabel = new JLabel(" "); + final JLabel numMeleeJLabel = new JLabel(" "); + final JLabel totalRiskLabel = new JLabel(" "); + final JLabel riskProtectingItem = new JLabel(" "); + final JLabel biggestItemLabel = new JLabel("Protected Item: "); + final JButton missingPlayers = new JButton("Show missing CC members"); + final JButton currentPlayers = new JButton("Show current CC members"); + private final JLabel numBrews = new JLabel(); + private final JPanel missingPlayersPanel = new JPanel(); public static String htmlLabel(String key, String value) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java index ad858dccf8..c3bc84aef1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java @@ -97,7 +97,7 @@ public class PvpToolsPlugin extends Plugin @Inject private ItemManager itemManager; - private PvpToolsPlugin uhPvpToolsPlugin = this; + private final PvpToolsPlugin uhPvpToolsPlugin = this; /** * ActionListener for the missing cc members and refresh buttons From 8ff950ff3d2ed1d082a738f97d0501dedc9f4138 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:03:01 +0200 Subject: [PATCH 292/472] pvptools: Merge nested if statements --- .../plugins/pvptools/PlayerCountOverlay.java | 34 ++++++----- .../plugins/pvptools/PvpToolsOverlay.java | 9 +-- .../plugins/pvptools/PvpToolsPlugin.java | 57 +++++++------------ 3 files changed, 39 insertions(+), 61 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java index 389c553af8..8924e5e9df 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java @@ -52,25 +52,23 @@ public class PlayerCountOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (pvpToolsPlugin.isCountPlayers()) - { - if ((client.getVar(Varbits.IN_WILDERNESS) == 1) || WorldType.isPvpWorld(client.getWorldType()) + if (pvpToolsPlugin.isCountPlayers() && + (client.getVar(Varbits.IN_WILDERNESS) == 1 || WorldType.isPvpWorld(client.getWorldType()) || ArrayUtils.contains(CLAN_WARS_REGIONS, client.getMapRegions()[0]) || - WorldType.isDeadmanWorld(client.getWorldType())) - { - // Make this stop showing up when its not relevant - TableComponent tableComponent = new TableComponent(); - TableElement[] firstRowElements = { - TableElement.builder().content("Friendly").color(Color.GREEN).build(), - TableElement.builder().content(String.valueOf(pvpToolsPlugin.getFriendlyPlayerCount())).build()}; - TableRow firstRow = TableRow.builder().elements(Arrays.asList(firstRowElements)).build(); - TableElement[] secondRowElements = { - TableElement.builder().content("Enemy").color(Color.RED).build(), - TableElement.builder().content(String.valueOf(pvpToolsPlugin.getEnemyPlayerCount())).build()}; - TableRow secondRow = TableRow.builder().elements(Arrays.asList(secondRowElements)).build(); - tableComponent.addRows(firstRow, secondRow); - return tableComponent.render(graphics); - } + WorldType.isDeadmanWorld(client.getWorldType()))) + { + // Make this stop showing up when its not relevant + TableComponent tableComponent = new TableComponent(); + TableElement[] firstRowElements = { + TableElement.builder().content("Friendly").color(Color.GREEN).build(), + TableElement.builder().content(String.valueOf(pvpToolsPlugin.getFriendlyPlayerCount())).build()}; + TableRow firstRow = TableRow.builder().elements(Arrays.asList(firstRowElements)).build(); + TableElement[] secondRowElements = { + TableElement.builder().content("Enemy").color(Color.RED).build(), + TableElement.builder().content(String.valueOf(pvpToolsPlugin.getEnemyPlayerCount())).build()}; + TableRow secondRow = TableRow.builder().elements(Arrays.asList(secondRowElements)).build(); + tableComponent.addRows(firstRow, secondRow); + return tableComponent.render(graphics); } return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java index 5b8a3f7f1c..5aceb68fa7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java @@ -40,13 +40,10 @@ public class PvpToolsOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (pvpToolsPlugin.isFallInHelper()) + if (pvpToolsPlugin.isFallInHelper() && pvpToolsPlugin.fallinHelperEnabled) { - if (pvpToolsPlugin.fallinHelperEnabled) - { - graphics.setFont(FontManager.getRunescapeFont().deriveFont(28)); - OverlayUtil.renderTextLocation(graphics, new Point(200, 80), "FALL IN HELPER ENABLED", Color.YELLOW); - } + graphics.setFont(FontManager.getRunescapeFont().deriveFont(28)); + OverlayUtil.renderTextLocation(graphics, new Point(200, 80), "FALL IN HELPER ENABLED", Color.YELLOW); } return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java index c3bc84aef1..b0b7d100f4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java @@ -195,12 +195,9 @@ public class PvpToolsPlugin extends Plugin if (!Objects.isNull(clanMember)) { List arrayList = ccMembers.stream().map(player -> Text.removeTags(Text.standardize(player.getName()))).collect(Collectors.toList()); - if (!arrayList.contains(Text.removeTags(Text.standardize(clanMember.getUsername())))) + if (!arrayList.contains(Text.removeTags(Text.standardize(clanMember.getUsername()))) && !missingMembers.contains(clanMember.getUsername())) { - if (!missingMembers.contains(clanMember.getUsername())) - { - missingMembers.add("[W" + clanMember.getWorld() + "] - " + clanMember.getUsername()); - } + missingMembers.add("[W" + clanMember.getWorld() + "] - " + clanMember.getUsername()); } } } @@ -217,12 +214,9 @@ public class PvpToolsPlugin extends Plugin if (!Objects.isNull(clanMember)) { List arrayList = ccMembers.stream().map(player -> Text.removeTags(Text.standardize(player.getName()))).collect(Collectors.toList()); - if (arrayList.contains(Text.removeTags(Text.standardize(clanMember.getUsername())))) + if (arrayList.contains(Text.removeTags(Text.standardize(clanMember.getUsername()))) && !currentMembers.contains(clanMember.getUsername())) { - if (!currentMembers.contains(clanMember.getUsername())) - { - currentMembers.add(clanMember.getUsername()); - } + currentMembers.add(clanMember.getUsername()); } } } @@ -370,12 +364,9 @@ public class PvpToolsPlugin extends Plugin { getCarriedWealth(); } - if (event.getGameState().equals(GameState.LOGGED_IN)) + if (event.getGameState().equals(GameState.LOGGED_IN) && this.countPlayers) { - if (this.countPlayers) - { - updatePlayers(); - } + updatePlayers(); } } @@ -478,25 +469,20 @@ public class PvpToolsPlugin extends Plugin overheadCount = new int[]{0, 0, 0}; for (Player p : client.getPlayers()) { - if (Objects.nonNull(p)) + if (Objects.nonNull(p) && PvPUtil.isAttackable(client, p) && + !p.isClanMember() && !(p.getOverheadIcon() == null)) { - if (PvPUtil.isAttackable(client, p)) + switch (p.getOverheadIcon()) { - if (!p.isClanMember() && !(p.getOverheadIcon() == null)) - { - switch (p.getOverheadIcon()) - { - case MAGIC: - overheadCount[0]++; - break; - case RANGED: - overheadCount[1]++; - break; - case MELEE: - overheadCount[2]++; - break; - } - } + case MAGIC: + overheadCount[0]++; + break; + case RANGED: + overheadCount[1]++; + break; + case MELEE: + overheadCount[2]++; + break; } } } @@ -548,12 +534,9 @@ public class PvpToolsPlugin extends Plugin panel.totalRiskLabel.repaint(); int itemLimit = 0; - if (client.getLocalPlayer().getSkullIcon() != null) + if (client.getLocalPlayer().getSkullIcon() != null && client.getLocalPlayer().getSkullIcon() == SkullIcon.SKULL) { - if (client.getLocalPlayer().getSkullIcon() == SkullIcon.SKULL) - { - itemLimit = 1; - } + itemLimit = 1; } if (client.getLocalPlayer().getSkullIcon() == null) { From 5d9f132365a56a16ad528486369cba4696f11e88 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:03:54 +0200 Subject: [PATCH 293/472] pyramidplunder: Remove unused fields --- .../pyramidplunder/PyramidPlunderPlugin.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java index 7c75d11ff7..cf73974cdc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java @@ -90,21 +90,21 @@ public class PyramidPlunderPlugin extends Plugin static final int CLOSED_DOOR = TOMB_DOOR_20948; static final int OPENED_DOOR = TOMB_DOOR_20949; - // Next 2 are in here for anyone who wants to spend more time on this - private static final Set LOOTABLE = ImmutableSet.of( - GRAND_GOLD_CHEST, - SARCOPHAGUS_21255, - URN_21261, - URN_21262, - URN_21263 - ); - private static final Set LOOTED = ImmutableSet.of( - OPENED_GOLD_CHEST, - SARCOPHAGUS_21256, - URN_21265, - URN_21266, - URN_21267 - ); +// // Next 2 are in here for anyone who wants to spend more time on this +// private static final Set LOOTABLE = ImmutableSet.of( +// GRAND_GOLD_CHEST, +// SARCOPHAGUS_21255, +// URN_21261, +// URN_21262, +// URN_21263 +// ); +// private static final Set LOOTED = ImmutableSet.of( +// OPENED_GOLD_CHEST, +// SARCOPHAGUS_21256, +// URN_21265, +// URN_21266, +// URN_21267 +// ); private static final Set DOOR_WALL_IDS = ImmutableSet.of( 26618, 26619, 26620, 26621 ); From af2b0e019b284e7c8fee0148720abcbb9df93695 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:05:09 +0200 Subject: [PATCH 294/472] questlist: Use equals when comparing objects --- .../net/runelite/client/plugins/questlist/QuestListPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java index 3d9bd03579..a7e0dbf03f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java @@ -359,7 +359,7 @@ public class QuestListPlugin extends Plugin else { // Otherwise hide if it doesn't match the filter state - hidden = currentFilterState != QuestState.ALL && questState != currentFilterState; + hidden = currentFilterState != QuestState.ALL && questState != null && !questState.equals(currentFilterState); } quest.setHidden(hidden); From 479dbd14c585deb7010fc07f063a73430e3d5106 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:05:52 +0200 Subject: [PATCH 295/472] questlist: Merge nested if statements --- .../plugins/questlist/QuestListPlugin.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java index a7e0dbf03f..2f0fb9b415 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java @@ -182,12 +182,9 @@ public class QuestListPlugin extends Plugin @Subscribe public void onVarClientIntChanged(VarClientIntChanged varClientIntChanged) { - if (varClientIntChanged.getIndex() == VarClientInt.INVENTORY_TAB.getIndex()) + if (varClientIntChanged.getIndex() == VarClientInt.INVENTORY_TAB.getIndex() && isChatboxOpen() && isNotOnQuestTab()) { - if (isChatboxOpen() && isNotOnQuestTab()) - { - chatboxPanelManager.close(); - } + chatboxPanelManager.close(); } } @@ -314,11 +311,10 @@ public class QuestListPlugin extends Plugin Collection quests = questSet.get(questContainer); - if (quests != null) - { + if (quests != null && // Check to make sure the list hasn't been rebuild since we were last her // Do this by making sure the list's dynamic children are the same as when we last saw them - if (quests.stream().noneMatch(w -> + quests.stream().noneMatch(w -> { Widget codeWidget = w.getQuest(); if (codeWidget == null) @@ -327,9 +323,8 @@ public class QuestListPlugin extends Plugin } return list.getChild(codeWidget.getIndex()) == codeWidget; })) - { - quests = null; - } + { + quests = null; } if (quests == null) From ae438912b7995d9281b2e7a6dc57eccb588ff9f5 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:06:54 +0200 Subject: [PATCH 296/472] raids: Remove unused initializer --- .../java/net/runelite/client/plugins/raids/RaidsOverlay.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java index 4c4afc9bec..50250ea014 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java @@ -161,7 +161,7 @@ public class RaidsOverlay extends Overlay boolean vanguards = false; boolean unknownCombat = false; String puzzles = ""; - String roomName = ""; + String roomName; for (Room layoutRoom : plugin.getRaid().getLayout().getRooms()) { int position = layoutRoom.getPosition(); From 605fe3a4fb4676db05f0534e8b32ae44db746098 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:07:20 +0200 Subject: [PATCH 297/472] raids: Null checks --- .../java/net/runelite/client/plugins/raids/RaidsOverlay.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java index 50250ea014..7b79556b85 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java @@ -33,6 +33,7 @@ import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import javax.inject.Inject; import javax.inject.Singleton; @@ -177,7 +178,7 @@ public class RaidsOverlay extends Overlay case COMBAT: combatCount++; roomName = room.getBoss().getName(); - switch (RaidRoom.Boss.fromString(roomName)) + switch (Objects.requireNonNull(RaidRoom.Boss.fromString(roomName))) { case VANGUARDS: vanguards = true; @@ -189,7 +190,7 @@ public class RaidsOverlay extends Overlay break; case PUZZLE: roomName = room.getPuzzle().getName(); - switch (RaidRoom.Puzzle.fromString(roomName)) + switch (Objects.requireNonNull(RaidRoom.Puzzle.fromString(roomName))) { case CRABS: crabs = true; From 9d369ea09d4fe2c59876834b112c9435d0be1d44 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:07:42 +0200 Subject: [PATCH 298/472] raids: string concat append --- .../java/net/runelite/client/plugins/raids/RaidsPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java index fd465aa6bd..0445912108 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java @@ -1103,7 +1103,7 @@ public class RaidsPlugin extends Plugin StringBuilder builder = new StringBuilder(); if (seconds >= 3600) { - builder.append((int) Math.floor(seconds / 3600) + ";"); + builder.append((int) Math.floor(seconds / 3600)).append(";"); } seconds %= 3600; if (builder.toString().equals("")) From 9a21040fa38fdebd3c29ba31cee135a3b2bb80ba Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:08:01 +0200 Subject: [PATCH 299/472] raids: Remove pre-sized array --- .../src/main/java/net/runelite/client/plugins/raids/Raid.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java index dfc56c30c4..33e4ebbd24 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java @@ -109,7 +109,7 @@ public class Raid } } - return combatRooms.toArray(new RaidRoom[combatRooms.size()]); + return combatRooms.toArray(new RaidRoom[0]); } String getRotationString() From 4f0aee61fcd29477f3dd78ea8e0cdc8a361b7150 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:08:20 +0200 Subject: [PATCH 300/472] raids: Final fields --- .../net/runelite/client/plugins/raids/RaidsOverlay.java | 4 ++-- .../java/net/runelite/client/plugins/raids/RaidsPanel.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java index 7b79556b85..bdd4814220 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java @@ -76,8 +76,8 @@ public class RaidsOverlay extends Overlay private final ItemManager itemManager; private final SpriteManager spriteManager; private final PanelComponent panelImages = new PanelComponent(); - private Client client; - private RaidsPlugin plugin; + private final Client client; + private final RaidsPlugin plugin; @Setter(AccessLevel.PACKAGE) private boolean sharable = false; @Getter(AccessLevel.PACKAGE) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPanel.java index 2c16219f06..a053396af6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPanel.java @@ -46,9 +46,9 @@ class RaidsPanel extends PluginPanel @Inject private RaidsPlugin raidsPlugin; - private JButton reloadButton = new JButton("Reload Instance"); - private JButton reloadScouter = new JButton("Reload Raid Overlay"); - private JLabel reloadMessage = new JLabel("

Instance Reload Helper

Reloading an instance will cause your client to disconnect temporarily.
"); + private final JButton reloadButton = new JButton("Reload Instance"); + private final JButton reloadScouter = new JButton("Reload Raid Overlay"); + private final JLabel reloadMessage = new JLabel("

Instance Reload Helper

Reloading an instance will cause your client to disconnect temporarily.
"); void init() { From 80e88bd52998cde900f7eb6b2e9c74c7693b0a60 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:09:59 +0200 Subject: [PATCH 301/472] raids: Use equals when comparing objects --- .../java/net/runelite/client/plugins/raids/RaidsPlugin.java | 2 +- .../runelite/client/plugins/raids/solver/RotationSolver.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java index 0445912108..ed3435ca9a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java @@ -818,7 +818,7 @@ public class RaidsPlugin extends Plugin { list.clear(); - if (list == rotationWhitelist) + if (list.equals(rotationWhitelist)) { Matcher m = ROTATION_REGEX.matcher(input); while (m.find()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/RotationSolver.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/RotationSolver.java index fe32ceaf76..e53a7326c0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/RotationSolver.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/RotationSolver.java @@ -97,7 +97,7 @@ public class RotationSolver } } - if (match != null && match != rotation) + if (match != null && match.equals(rotation)) { return; } From 4a0fffd3459e39eb828b6492d0bfdbfafc93da72 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:10:43 +0200 Subject: [PATCH 302/472] raids: use interface instead of type --- .../net/runelite/client/plugins/raids/RaidsPlugin.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java index ed3435ca9a..d0de393b47 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java @@ -148,13 +148,13 @@ public class RaidsPlugin extends Plugin private static final String TRIPLE_PUZZLE = "SFCCPC.PCSCPF - #WSEENES#WWWNEEE"; //good crabs first rare crabs second rare crabs third private static final Pattern PUZZLES = Pattern.compile("Puzzle - (\\w+)"); @Getter(AccessLevel.PACKAGE) - private final ArrayList roomWhitelist = new ArrayList<>(); + private final List roomWhitelist = new ArrayList<>(); @Getter(AccessLevel.PACKAGE) - private final ArrayList roomBlacklist = new ArrayList<>(); + private final List roomBlacklist = new ArrayList<>(); @Getter(AccessLevel.PACKAGE) - private final ArrayList rotationWhitelist = new ArrayList<>(); + private final List rotationWhitelist = new ArrayList<>(); @Getter(AccessLevel.PACKAGE) - private final ArrayList layoutWhitelist = new ArrayList<>(); + private final List layoutWhitelist = new ArrayList<>(); @Getter(AccessLevel.PACKAGE) private final Map> recommendedItemsList = new HashMap<>(); @Inject @@ -814,7 +814,7 @@ public class RaidsPlugin extends Plugin } } - private void updateList(ArrayList list, String input) + private void updateList(List list, String input) { list.clear(); From e586eaabb987cac9ad9d3bc22f7555d88b3406db Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:11:21 +0200 Subject: [PATCH 303/472] raids: Merge nested if statements --- .../net/runelite/client/plugins/raids/RaidsOverlay.java | 7 ++----- .../net/runelite/client/plugins/raids/RaidsPlugin.java | 8 +++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java index bdd4814220..4ccbc18ee8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java @@ -325,12 +325,9 @@ public class RaidsOverlay extends Overlay String bossName = room.getBoss().getName(); String bossNameLC = bossName.toLowerCase(); - if (plugin.isShowRecommendedItems()) + if (plugin.isShowRecommendedItems() && plugin.getRecommendedItemsList().get(bossNameLC) != null) { - if (plugin.getRecommendedItemsList().get(bossNameLC) != null) - { - imageIds.addAll(plugin.getRecommendedItemsList().get(bossNameLC)); - } + imageIds.addAll(plugin.getRecommendedItemsList().get(bossNameLC)); } tableComponent.addRow(plugin.isShowRecommendedItems() ? "" : room.getType().getName(), ColorUtil.prependColorTag(bossName, color)); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java index d0de393b47..ee8574f198 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java @@ -1218,12 +1218,10 @@ public class RaidsPlugin extends Plugin { if (raid.getRotationString().toLowerCase().equals("vasa,tekton,vespula") && raid.getFullRotationString().toLowerCase().contains("crabs") - && raid.getFullRotationString().toLowerCase().contains("tightrope")) + && raid.getFullRotationString().toLowerCase().contains("tightrope") + && goodCrabs != null) { - if (goodCrabs != null) - { - return goodCrabs; - } + return goodCrabs; } return null; } From bfade7ed1e6417428f7fc2513360c52f580d1b49 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:13:53 +0200 Subject: [PATCH 304/472] raids: Ignore case methods --- .../net/runelite/client/plugins/raids/RaidsPlugin.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java index ee8574f198..688091c523 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java @@ -96,6 +96,7 @@ import net.runelite.client.ui.overlay.tooltip.TooltipManager; import net.runelite.client.util.ImageUtil; import net.runelite.client.util.Text; import org.apache.commons.lang3.StringUtils; +import static org.apache.commons.lang3.StringUtils.containsIgnoreCase; @PluginDescriptor( name = "CoX Scouter", @@ -1216,9 +1217,9 @@ public class RaidsPlugin extends Plugin String recordRaid() { - if (raid.getRotationString().toLowerCase().equals("vasa,tekton,vespula") - && raid.getFullRotationString().toLowerCase().contains("crabs") - && raid.getFullRotationString().toLowerCase().contains("tightrope") + if (raid.getRotationString().equalsIgnoreCase("vasa,tekton,vespula") + && containsIgnoreCase(raid.getFullRotationString(), "crabs") + && containsIgnoreCase(raid.getFullRotationString(), "tightrope") && goodCrabs != null) { return goodCrabs; From 6d093db66d16e41d75f65146dc05b7e84e097c0c Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:15:07 +0200 Subject: [PATCH 305/472] raids: Fix inefficient use of StringBuilder --- .../java/net/runelite/client/plugins/raids/RaidsPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java index 688091c523..6794ebe2cb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java @@ -1107,7 +1107,7 @@ public class RaidsPlugin extends Plugin builder.append((int) Math.floor(seconds / 3600)).append(";"); } seconds %= 3600; - if (builder.toString().equals("")) + if (builder.length() == 0) { builder.append((int) Math.floor(seconds / 60)); } From db978d6c67680bf75edd27342ef085a21147b603 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:16:17 +0200 Subject: [PATCH 306/472] raidsthieving: use interface instead of type --- .../client/plugins/raidsthieving/BatSolver/BatSolver.java | 7 ++++--- .../client/plugins/raidsthieving/ChestOverlay.java | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java index 4f59a5c241..5a338979f8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.TreeSet; import static net.runelite.client.plugins.raidsthieving.BatSolver.SolutionSet.SOLUTION_SETS; @@ -37,7 +38,7 @@ public class BatSolver private Map numberOfSolutionsWithPoison; private final SolutionSet solution; - private final HashSet grubsChests; + private final Set grubsChests; public BatSolver(final ThievingRoomType roomType) { @@ -59,9 +60,9 @@ public class BatSolver calculateChanceOfPoison(); } - public TreeSet matchSolutions() + public Set matchSolutions() { - TreeSet possibleEmptyChests = new TreeSet<>(); + Set possibleEmptyChests = new TreeSet<>(); for (SolutionSet knownSolution : SolutionSet.SOLUTION_SETS) { if (knownSolution.getType() == solution.getType() && matchSolution(knownSolution)) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java index 03c34ce7c0..c2f037646b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java @@ -28,7 +28,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import java.util.Map; -import java.util.TreeSet; +import java.util.Set; import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.api.Client; @@ -120,7 +120,7 @@ public class ChestOverlay extends Overlay BatSolver solver = plugin.getSolver(); if (solver != null && chestId != -1) { - TreeSet matches = solver.matchSolutions(); + Set matches = solver.matchSolutions(); return matches.contains(chestId) || matches.size() == 0; } return true; From 78c724f93377615303122aaa2dc40064a2cc94ec Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:16:41 +0200 Subject: [PATCH 307/472] raidsthieving: Merge nested if statements --- .../client/plugins/raidsthieving/ChestOverlay.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java index c2f037646b..4ac35ebf47 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java @@ -94,13 +94,10 @@ public class ChestOverlay extends Overlay if (chest != null) { - if (!plugin.isBatsFound() && !chest.isEverOpened()) + if (!plugin.isBatsFound() && !chest.isEverOpened() && shouldDrawChest(pos)) { - if (shouldDrawChest(pos)) - { - Color drawColor = new Color(setAlphaComponent(plugin.getGetPotentialBatColor().getRGB(), getChestOpacity(pos))); - drawCircleOnTrap(graphics, chest, drawColor); - } + Color drawColor = new Color(setAlphaComponent(plugin.getGetPotentialBatColor().getRGB(), getChestOpacity(pos))); + drawCircleOnTrap(graphics, chest, drawColor); } if (chest.isPoison()) { From 529f85b63514ca0c2b871ee39b13ebb78bd9a991 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:17:17 +0200 Subject: [PATCH 308/472] raidsthieving: (Package) private class/method --- .../client/plugins/raidsthieving/BatSolver/BatSolver.java | 2 +- .../client/plugins/raidsthieving/RaidsThievingConstants.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java index 5a338979f8..efef1cb773 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java @@ -101,7 +101,7 @@ public class BatSolver return matchesAll && everMatched; } - public ThievingRoomType getType() + private ThievingRoomType getType() { return solution.getType(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingConstants.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingConstants.java index 8ab527ebe8..a898ef4df0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingConstants.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingConstants.java @@ -24,7 +24,7 @@ */ package net.runelite.client.plugins.raidsthieving; -public class RaidsThievingConstants +class RaidsThievingConstants { static final int CLOSED_CHEST_ID = 29742; static final int OPEN_EMPTY_CHEST = 29743; From 1c0a68726b952e090adff19d09c9c5cb7b3f99eb Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:17:28 +0200 Subject: [PATCH 309/472] raidsthieving: Final field --- .../client/plugins/raidsthieving/BatSolver/ChestIdentifier.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ChestIdentifier.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ChestIdentifier.java index 8cf12f817a..9e25a8b5d0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ChestIdentifier.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ChestIdentifier.java @@ -256,5 +256,5 @@ public class ChestIdentifier chest.setChestId(id); } - private Map chestIds; + private final Map chestIds; } From 9e3347c79b130cc23ab601ec648d772404f08a8e Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:18:03 +0200 Subject: [PATCH 310/472] regenmeter: Final field --- .../runelite/client/plugins/regenmeter/RegenMeterOverlay.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterOverlay.java index c96e12c0cf..f95edccb1b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterOverlay.java @@ -53,7 +53,7 @@ public class RegenMeterOverlay extends Overlay private static final Stroke STROKE = new BasicStroke(2f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER); private final Client client; - private RegenMeterPlugin plugin; + private final RegenMeterPlugin plugin; private Rectangle getBounds(WidgetInfo widgetInfo) { From e9ee63c1895747a0a17c192df8aed37dbf0c125c Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:20:00 +0200 Subject: [PATCH 311/472] roguesden: Use interface instead of type --- .../runelite/client/plugins/roguesden/RoguesDenPlugin.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenPlugin.java index 0d7583ea7e..163682223b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenPlugin.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.roguesden; import java.util.HashMap; +import java.util.Map; import javax.inject.Inject; import javax.inject.Singleton; import lombok.AccessLevel; @@ -58,10 +59,10 @@ import net.runelite.client.ui.overlay.OverlayManager; public class RoguesDenPlugin extends Plugin { @Getter(AccessLevel.PACKAGE) - private final HashMap obstaclesHull = new HashMap<>(); + private final Map obstaclesHull = new HashMap<>(); @Getter(AccessLevel.PACKAGE) - private final HashMap obstaclesTile = new HashMap<>(); + private final Map obstaclesTile = new HashMap<>(); @Getter(AccessLevel.PACKAGE) private boolean hasGem; From d1922f2c3377d4725449b4feb81b75022e06a75b Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:21:46 +0200 Subject: [PATCH 312/472] roguesden: Package final fields --- .../java/net/runelite/client/plugins/roguesden/Obstacles.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/Obstacles.java b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/Obstacles.java index e518f4814b..59c2c9428e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/Obstacles.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/Obstacles.java @@ -42,7 +42,7 @@ import static net.runelite.api.ObjectID.WALL_7249; class Obstacles { - public static final Set OBSTACLE_IDS_HULL = Sets.newHashSet( + static final Set OBSTACLE_IDS_HULL = Sets.newHashSet( SPINNING_BLADES_7224, CONTORTION_BARS, PENDULUM, @@ -52,7 +52,7 @@ class Obstacles NULL_7235 /*Wall safe*/ ); - public static final Set OBSTACLE_IDS_TILE = Sets.newHashSet( + static final Set OBSTACLE_IDS_TILE = Sets.newHashSet( FLOOR, /*Floor spikes*/ WALL_7228, /*Wall spikes*/ WALL_7229, /*Wall spears*/ From 34fad662dc9bc597d6a0f039a7e638d28207c589 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:25:02 +0200 Subject: [PATCH 313/472] runecraft: Metoh can be private --- .../net/runelite/client/plugins/runecraft/AbyssOverlay.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssOverlay.java index 29ea78ad00..aafce938f3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssOverlay.java @@ -163,7 +163,7 @@ class AbyssOverlay extends Overlay } } - public BufferedImage getImage(AbyssRifts rift) + private BufferedImage getImage(AbyssRifts rift) { BufferedImage image = abyssIcons.get(rift); if (image != null) From 8f3435efd3f941d98b4a9ad5117e9485f927e3bf Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:27:15 +0200 Subject: [PATCH 314/472] runecraft: Merge nested if statements --- .../runelite/client/plugins/runecraft/RunecraftPlugin.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java index f42c10102b..252d09c209 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java @@ -206,12 +206,9 @@ public class RunecraftPlugin extends Plugin return; } - if (this.degradingNotification) + if (this.degradingNotification && event.getMessage().contains(POUCH_DECAYED_MESSAGE)) { - if (event.getMessage().contains(POUCH_DECAYED_MESSAGE)) - { - notifier.notify(POUCH_DECAYED_NOTIFICATION_MESSAGE); - } + notifier.notify(POUCH_DECAYED_NOTIFICATION_MESSAGE); } } From d5241f93e11606c04e9e36fd72add0c2685133e5 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:27:44 +0200 Subject: [PATCH 315/472] runecraft: Use equals when comparing objects --- .../net/runelite/client/plugins/runecraft/RunecraftPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java index 252d09c209..29f3ae2523 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java @@ -353,7 +353,7 @@ public class RunecraftPlugin extends Plugin public void onNpcDespawned(NpcDespawned event) { final NPC npc = event.getNpc(); - if (npc == darkMage) + if (npc != null && npc.equals(darkMage)) { darkMage = null; } From ae7e7261bfdc2d3faf16e817c2f431c64d9bf8c2 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:28:45 +0200 Subject: [PATCH 316/472] runedoku: (Package) private class/method --- .../net/runelite/client/plugins/runedoku/RunedokuPiece.java | 2 +- .../java/net/runelite/client/plugins/runedoku/Sudoku.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPiece.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPiece.java index d8e75ca1dd..d19b5845b1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPiece.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPiece.java @@ -57,7 +57,7 @@ public enum RunedokuPiece this.pieceForSudoku = pieceForSudoku; } - int getId() + private int getId() { return pieceID; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java index e763013b3e..69a404ee4c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java @@ -5,11 +5,11 @@ package net.runelite.client.plugins.runedoku; * * @author ? */ -public class Sudoku +class Sudoku { private int[][] board; - public static final int EMPTY = 0; + private static final int EMPTY = 0; private static final int SIZE = 9; Sudoku(final int[][] board) From 9a1a783546c237c27742ad195b26d1e3356bb630 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:29:05 +0200 Subject: [PATCH 317/472] runedoku: Final field --- .../main/java/net/runelite/client/plugins/runedoku/Sudoku.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java index 69a404ee4c..22656e5b47 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java @@ -8,7 +8,7 @@ package net.runelite.client.plugins.runedoku; class Sudoku { - private int[][] board; + private final int[][] board; private static final int EMPTY = 0; private static final int SIZE = 9; From aa3fc15e70a61b0ae57bcec528dedf39b3687814 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:30:11 +0200 Subject: [PATCH 318/472] runedoku: Remove debugging --- .../net/runelite/client/plugins/runedoku/Sudoku.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java index 22656e5b47..53711c8dc4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java @@ -102,17 +102,6 @@ class Sudoku return true; } - public void display() - { - for (int i = 0; i < SIZE; i++) - { - for (int j = 0; j < SIZE; j++) - { - System.out.print(" " + board[i][j]); - } - } - } - int[][] getBoard() { return board; From 6f20997fa281ed8b7fcedf01ab15b66eeea1d71c Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:30:27 +0200 Subject: [PATCH 319/472] runedoku: Merge nested if statements --- .../client/plugins/runedoku/RunedokuOverlay.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuOverlay.java index 0756a6d4b6..34607e0048 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuOverlay.java @@ -70,17 +70,13 @@ class RunedokuOverlay extends Overlay final Widget sudokuScreen = client.getWidget(288, 131); - if (sudokuScreen != null) + if (sudokuScreen != null && !sudokuScreen.isHidden()) { - if (!sudokuScreen.isHidden()) - { - Sudoku sudoku = new Sudoku(util.createTable(client)); - boolean solved = sudoku.solve(); - - renderReferenceRunes(graphics, solved); - renderSolvedPuzzle(graphics, sudoku, solved); - } + Sudoku sudoku = new Sudoku(util.createTable(client)); + boolean solved = sudoku.solve(); + renderReferenceRunes(graphics, solved); + renderSolvedPuzzle(graphics, sudoku, solved); } return null; From 76e55ee7ca1e20905c41fd7c5ed5f1b50d0dc5eb Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:31:06 +0200 Subject: [PATCH 320/472] runedoku: Use interface instead of type --- .../runelite/client/plugins/runedoku/RunedokuOverlay.java | 4 ++-- .../net/runelite/client/plugins/runedoku/RunedokuUtil.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuOverlay.java index 34607e0048..593151484a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuOverlay.java @@ -28,7 +28,7 @@ import java.awt.Color; import static java.awt.Color.RED; import java.awt.Dimension; import java.awt.Graphics2D; -import java.util.ArrayList; +import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.api.Client; @@ -122,7 +122,7 @@ class RunedokuOverlay extends Overlay */ private void renderSolvedPuzzle(Graphics2D graphics, Sudoku sudoku, boolean solved) { - ArrayList simpleArr = util.makeSimple(sudoku.getBoard()); + List simpleArr = util.makeSimple(sudoku.getBoard()); //highlight each cell to tell you which piece to place int iteration = 0; for (int i = 10; i < 91; i++) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuUtil.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuUtil.java index 3c7b51564d..1687eb5a05 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuUtil.java @@ -28,6 +28,7 @@ import java.awt.Color; import java.awt.Polygon; import java.awt.Rectangle; import java.util.ArrayList; +import java.util.List; import java.util.Objects; import javax.inject.Inject; import net.runelite.api.Client; @@ -105,9 +106,9 @@ class RunedokuUtil * @param board * @return */ - ArrayList makeSimple(int[][] board) + List makeSimple(int[][] board) { - ArrayList list = new ArrayList<>(); + List list = new ArrayList<>(); for (int i = 0; i < 9; i++) { for (int ii = 0; ii < 9; ii++) From 6108e3a6360ab0a5c3ce60105b14afdb16b19f14 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:31:49 +0200 Subject: [PATCH 321/472] runeliteplus: Final field --- .../client/plugins/runeliteplus/RuneLitePlusPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java index 769266f69c..f5a506bea6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java @@ -109,7 +109,7 @@ public class RuneLitePlusPlugin extends Plugin @Inject private ClientThread clientThread; - private RuneLitePlusKeyListener keyListener = new RuneLitePlusKeyListener(); + private final RuneLitePlusKeyListener keyListener = new RuneLitePlusKeyListener(); private int entered = -1; private int enterIdx; private boolean expectInput; From 63f081e8a8446cb80ed3edd5e5fb1c87f0cbe251 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:32:21 +0200 Subject: [PATCH 322/472] runeliteplus: Remove unused field --- .../client/plugins/runeliteplus/RuneLitePlusPlugin.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java index f5a506bea6..cf011407f2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java @@ -36,7 +36,6 @@ import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetInfo; -import net.runelite.client.RuneLiteProperties; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.RuneLitePlusConfig; import net.runelite.client.discord.DiscordService; @@ -91,9 +90,6 @@ public class RuneLitePlusPlugin extends Plugin } } - @Inject - private RuneLiteProperties runeLiteProperties; - @Inject private RuneLitePlusConfig config; From 71a1bf765dcc35e092dcf7c3518b771798b07740 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:33:39 +0200 Subject: [PATCH 323/472] runenergy: Don't save the value and return --- .../net/runelite/client/plugins/runenergy/RunEnergyPlugin.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java index 81ab24eb1d..8ef9debda1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java @@ -335,7 +335,6 @@ public class RunEnergyPlugin extends Plugin } // Calculate the number of seconds left - final double secondsLeft = (100 - client.getEnergy()) / recoverRate; - return (int) secondsLeft; + return (int) ((100 - client.getEnergy()) / recoverRate); } } From 45dad209475ae746c4f92f3f894095730ae8ddfb Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:36:13 +0200 Subject: [PATCH 324/472] safespot: Merge nested if statements --- .../plugins/safespot/SafeSpotOverlay.java | 22 +++++++------------ .../plugins/safespot/SafeSpotPlugin.java | 12 +++++----- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotOverlay.java index bb12d9b191..2eedef5440 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotOverlay.java @@ -42,25 +42,19 @@ public class SafeSpotOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (safeSpotPlugin.isSafeSpotsRenderable()) + if (safeSpotPlugin.isSafeSpotsRenderable() && safeSpotPlugin.getSafeSpotList() != null && safeSpotPlugin.getSafeSpotList().size() > 0) { - if (safeSpotPlugin.getSafeSpotList() != null) + safeSpotPlugin.getSafeSpotList().forEach(tile -> { - if (safeSpotPlugin.getSafeSpotList().size() > 0) + if (tile != null && tile.getLocalLocation() != null) { - safeSpotPlugin.getSafeSpotList().forEach(tile -> + final Polygon poly = Perspective.getCanvasTilePoly(client, tile.getLocalLocation()); + if (poly != null) { - if (tile != null && tile.getLocalLocation() != null) - { - final Polygon poly = Perspective.getCanvasTilePoly(client, tile.getLocalLocation()); - if (poly != null) - { - OverlayUtil.renderPolygon(graphics, poly, safeSpotPlugin.getTileColor()); - } - } - }); + OverlayUtil.renderPolygon(graphics, poly, safeSpotPlugin.getTileColor()); + } } - } + }); } return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java index b702b5d17f..50c48503e2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java @@ -173,16 +173,14 @@ public class SafeSpotPlugin extends Plugin { bit = Objects.requireNonNull(client.getCollisionMaps())[plane].getFlags()[toPoint.getSceneX()][toPoint.getSceneY()]; } - if (toTile != null && toTile.hasLineOfSightTo(fromTile) && !fromTile.hasLineOfSightTo(toTile)) - { - if (!((bit & CollisionDataFlag.BLOCK_MOVEMENT_OBJECT) == CollisionDataFlag.BLOCK_MOVEMENT_OBJECT || + if (toTile != null && toTile.hasLineOfSightTo(fromTile) && !fromTile.hasLineOfSightTo(toTile) && + (!((bit & CollisionDataFlag.BLOCK_MOVEMENT_OBJECT) == CollisionDataFlag.BLOCK_MOVEMENT_OBJECT || (bit & CollisionDataFlag.BLOCK_MOVEMENT_FLOOR_DECORATION) == CollisionDataFlag.BLOCK_MOVEMENT_FLOOR_DECORATION || (bit & CollisionDataFlag.BLOCK_MOVEMENT_FLOOR) == CollisionDataFlag.BLOCK_MOVEMENT_FLOOR || - (bit & CollisionDataFlag.BLOCK_MOVEMENT_FULL) == CollisionDataFlag.BLOCK_MOVEMENT_FULL)) - { - safeSpotList.add(toTile); - } + (bit & CollisionDataFlag.BLOCK_MOVEMENT_FULL) == CollisionDataFlag.BLOCK_MOVEMENT_FULL))) + { + safeSpotList.add(toTile); } } return safeSpotList; From 9606448e4c9a3ca7e13a0e6fa5860ad4f1a35f6e Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:36:41 +0200 Subject: [PATCH 325/472] safespot: Use interface instead of type --- .../runelite/client/plugins/safespot/SafeSpotPlugin.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java index 50c48503e2..4332d38aa2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java @@ -56,7 +56,7 @@ public class SafeSpotPlugin extends Plugin private SafeSpotConfig config; @Getter(AccessLevel.PACKAGE) - private ArrayList safeSpotList; + private List safeSpotList; @Getter(AccessLevel.PACKAGE) private boolean safeSpotsRenderable = false; @@ -152,9 +152,9 @@ public class SafeSpotPlugin extends Plugin * @param worldPoints - Worldpoints in the current scene * @return an ArrayList of Tiles where current player can attack actor but actor cannot attack local player */ - private ArrayList getSafeSpotList(Actor actor, List worldPoints) + private List getSafeSpotList(Actor actor, List worldPoints) { - ArrayList safeSpotList = new ArrayList<>(); + List safeSpotList = new ArrayList<>(); Tile[][][] tiles = client.getScene().getTiles(); for (WorldPoint w : worldPoints) { From 1a833f6fbca0eb5bdcff5fd61cf78fd307e1c675 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:37:08 +0200 Subject: [PATCH 326/472] screenmarkers: Final fields --- .../plugins/screenmarkers/ScreenMarkerCreationOverlay.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerCreationOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerCreationOverlay.java index 15d7d735e7..4bb242a575 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerCreationOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerCreationOverlay.java @@ -38,7 +38,7 @@ import net.runelite.client.ui.overlay.OverlayPriority; @Singleton public class ScreenMarkerCreationOverlay extends Overlay { - private ScreenMarkerPlugin plugin; + private final ScreenMarkerPlugin plugin; @Inject private ScreenMarkerCreationOverlay(final ScreenMarkerPlugin plugin) From 2a6b222c2b493f3c3169249768fb9a3086733a98 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:37:28 +0200 Subject: [PATCH 327/472] screenmarkers: Access levels --- .../client/plugins/screenmarkers/ScreenMarkerMouseListener.java | 2 +- .../plugins/screenmarkers/ui/ScreenMarkerPluginPanel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java index 93b1350999..3bb1d8e28e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java @@ -30,7 +30,7 @@ import javax.swing.SwingUtilities; import net.runelite.client.input.MouseAdapter; @Singleton -public class ScreenMarkerMouseListener extends MouseAdapter +class ScreenMarkerMouseListener extends MouseAdapter { private final ScreenMarkerPlugin plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPluginPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPluginPanel.java index 8f3fe97d3b..5be2693d28 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPluginPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPluginPanel.java @@ -86,7 +86,7 @@ public class ScreenMarkerPluginPanel extends PluginPanel ADD_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(addIcon, 0.53f)); } - public void init() + private void init() { setLayout(new BorderLayout()); setBorder(new EmptyBorder(10, 10, 10, 10)); From 42fbfe6227e3512dd87229c99079b9e2dbe4864c Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:38:17 +0200 Subject: [PATCH 328/472] screenshot: Final field --- .../runelite/client/plugins/screenshot/ScreenshotPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java index e1aeb37d68..453c7f4597 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java @@ -199,7 +199,7 @@ public class ScreenshotPlugin extends Plugin @Getter(AccessLevel.PACKAGE) private BufferedImage reportButton; - private Map dying = new HashMap<>(); + private final Map dying = new HashMap<>(); private NavigationButton titleBarButton; From 5da11e22ecd17e378abe27603fbca1f99e2e42d0 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:39:35 +0200 Subject: [PATCH 329/472] shiftwalker: Acces levels --- .../shiftwalker/ShiftWalkerGroups.java | 32 ------------------- .../shiftwalker/ShiftWalkerInputListener.java | 2 +- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerGroups.java diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerGroups.java b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerGroups.java deleted file mode 100644 index c417f413b8..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerGroups.java +++ /dev/null @@ -1,32 +0,0 @@ -package net.runelite.client.plugins.shiftwalker; - -// import java.util.HashSet; - -public final class ShiftWalkerGroups -{ - /*//Specific Targets to limit the walking to - private static final String BOX_TRAP = "BOX TRAP"; - private static final String BOX_TRAP_SHAKING = "SHAKING BOX"; - - //Specific menu options to replace - private static final String BOX_TRAP_DISMANTLE = "DISMANTLE"; - private static final String BOX_TRAP_CHECK = "CHECK"; - - private static final String ATTACK_OPTIONS_ATTACK = "ATTACK"; - - public static final HashSet BOX_TRAP_TARGETS = new HashSet<>(); - public static final HashSet BOX_TRAP_KEYWORDS = new HashSet<>(); - public static final HashSet ATTACK_OPTIONS_KEYWORDS = new HashSet<>(); - - static - { - BOX_TRAP_TARGETS.add(BOX_TRAP); - BOX_TRAP_TARGETS.add(BOX_TRAP_SHAKING); - - BOX_TRAP_KEYWORDS.add(BOX_TRAP_DISMANTLE); - BOX_TRAP_KEYWORDS.add(BOX_TRAP_CHECK); - - ATTACK_OPTIONS_KEYWORDS.add(ATTACK_OPTIONS_ATTACK); - }*/ - -} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerInputListener.java index 6b6560ca61..b48841dc16 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerInputListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerInputListener.java @@ -30,7 +30,7 @@ import javax.inject.Singleton; import net.runelite.client.input.KeyListener; @Singleton -public class ShiftWalkerInputListener implements KeyListener +class ShiftWalkerInputListener implements KeyListener { @Inject From ee776e3f0da886f863674078d5a6d4cb9f33dd5f Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:41:12 +0200 Subject: [PATCH 330/472] skillcalculator: Use equals when comparing objects --- .../client/plugins/skillcalculator/BankedCalculator.java | 2 +- .../client/plugins/skillcalculator/SkillCalculator.java | 2 +- .../client/plugins/skillcalculator/SkillCalculatorPanel.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java index 5216d24ace..ae5ce3e111 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java @@ -438,7 +438,7 @@ public class BankedCalculator extends JPanel { // This is triggered on every click so don't update if activity didn't actually change Activity cur = activityMap.get(i); - if (cur == a) + if (cur != null && cur.equals(a)) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java index ca0c650c0f..de8b340c08 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java @@ -270,7 +270,7 @@ class SkillCalculator extends JPanel for (JCheckBox checkBox : uiCheckBoxList) { - if (checkBox != uiCheckBox) + if (checkBox != null && !checkBox.equals(uiCheckBox)) { checkBox.setSelected(false); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java index c337470c32..bef7020240 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java @@ -123,7 +123,7 @@ class SkillCalculatorPanel extends PluginPanel MaterialTab tab = new MaterialTab(icon, skillGroup, null); tab.setOnSelectEvent(() -> { - if (currentCalc == calculatorType) + if (currentCalc != null && currentCalc.equals(calculatorType)) { return true; } From 59cbfcf7feabbf9ffb3ce57de4231cf5e345dd8a Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:44:07 +0200 Subject: [PATCH 331/472] skillcalculator: Use interface instead of type --- .../skillcalculator/BankedCalculator.java | 4 ++-- .../skillcalculator/SkillCalculator.java | 2 +- .../skillcalculator/SkillCalculatorPanel.java | 3 ++- .../skillcalculator/banked/CriticalItem.java | 17 +++++++++-------- .../skillcalculator/banked/beans/Activity.java | 9 +++++---- .../banked/ui/CriticalItemPanel.java | 3 +-- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java index ae5ce3e111..d76fec32a7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java @@ -256,7 +256,7 @@ public class BankedCalculator extends JPanel private void calculatedBankedMaps() { // Grab all CriticalItems for this skill - ArrayList items = CriticalItem.getBySkillName(currentSkill); + List items = CriticalItem.getBySkillName(currentSkill); // Loop over all Critical Items for this skill and determine how many are in the bank for (CriticalItem item : items) @@ -414,7 +414,7 @@ public class BankedCalculator extends JPanel for (String category : CriticalItem.getSkillCategories(currentSkill)) { - ArrayList items = CriticalItem.getItemsForSkillCategories(currentSkill, category); + List items = CriticalItem.getItemsForSkillCategories(currentSkill, category); for (CriticalItem item : items) { Integer amount = bankMap.get(item.getItemID()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java index de8b340c08..e0b614a95a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java @@ -74,7 +74,7 @@ class SkillCalculator extends JPanel @Getter(AccessLevel.PACKAGE) private final UICombinedActionSlot combinedActionSlot; @Getter(AccessLevel.PACKAGE) - private final ArrayList combinedActionSlots = new ArrayList<>(); + private final List combinedActionSlots = new ArrayList<>(); private final List bonusCheckBoxes = new ArrayList<>(); private final IconTextField searchBar = new IconTextField(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java index bef7020240..ff5e9eda1d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java @@ -32,6 +32,7 @@ import java.awt.GridBagLayout; import java.awt.GridLayout; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Objects; import javax.inject.Singleton; @@ -64,7 +65,7 @@ class SkillCalculatorPanel extends PluginPanel private final MaterialTabGroup skillGroup; private final MaterialTabGroup tabGroup; private String currentTab; - private ArrayList tabs = new ArrayList<>(); + private List tabs = new ArrayList<>(); @Getter private Map bankMap = new HashMap<>(); private GridBagConstraints c; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/CriticalItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/CriticalItem.java index 688a00d3c6..983526c59a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/CriticalItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/CriticalItem.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.skillcalculator.banked; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import lombok.Getter; @@ -320,9 +321,9 @@ public enum CriticalItem } // Builds a Map to reduce looping frequency - private static Map> buildSkillItemMap() + private static Map> buildSkillItemMap() { - Map> map = new HashMap<>(); + Map> map = new HashMap<>(); for (CriticalItem item : values()) { map.computeIfAbsent(item.getSkill(), e -> new ArrayList<>()).add(item); @@ -331,9 +332,9 @@ public enum CriticalItem return map; } - private static final Map> bySkillName = buildSkillItemMap(); + private static final Map> bySkillName = buildSkillItemMap(); - public static ArrayList getBySkillName(Skill skill) + public static List getBySkillName(Skill skill) { return bySkillName.get(skill); } @@ -358,9 +359,9 @@ public enum CriticalItem } // Builds a Map to reduce looping frequency - private static Map> buildItemSkillCategoryMap() + private static Map> buildItemSkillCategoryMap() { - Map> map = new HashMap<>(); + Map> map = new HashMap<>(); for (CriticalItem item : values()) { String key = item.getCategory() + item.skill.getName(); @@ -370,9 +371,9 @@ public enum CriticalItem return map; } - private static final Map> itemsBySkillCategory = buildItemSkillCategoryMap(); + private static final Map> itemsBySkillCategory = buildItemSkillCategoryMap(); - public static ArrayList getItemsForSkillCategories(Skill skill, String category) + public static List getItemsForSkillCategories(Skill skill, String category) { return itemsBySkillCategory.get(category + skill.getName()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java index 8d2b122119..080dad9cb9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.skillcalculator.banked.beans; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import lombok.AccessLevel; import lombok.Getter; @@ -377,7 +378,7 @@ public enum Activity private static final Map> byCriticalItem = buildItemMap(); - public static ArrayList getByCriticalItem(CriticalItem item) + public static List getByCriticalItem(CriticalItem item) { return byCriticalItem.getOrDefault(item, new ArrayList<>()); @@ -390,10 +391,10 @@ public enum Activity * @param limitLevel Level to check Activitiy requirements against. -1 or 0 value disables limits * @return an empty list if no activities */ - public static ArrayList getByCriticalItem(CriticalItem item, int limitLevel) + public static List getByCriticalItem(CriticalItem item, int limitLevel) { - ArrayList activities = getByCriticalItem(item); - ArrayList l = new ArrayList<>(); + List activities = getByCriticalItem(item); + List l = new ArrayList<>(); if (limitLevel <= 0) { return l; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/ui/CriticalItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/ui/CriticalItemPanel.java index a6af1138ef..1b12419ec0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/ui/CriticalItemPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/ui/CriticalItemPanel.java @@ -36,7 +36,6 @@ import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; import java.io.IOException; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.List; import java.util.Map; import javax.imageio.ImageIO; @@ -298,7 +297,7 @@ public class CriticalItemPanel extends JPanel private JPanel createActivitiesPanel() { - ArrayList activities = Activity.getByCriticalItem(item); + List activities = Activity.getByCriticalItem(item); if (activities == null || activities.size() == 1) { return null; From d14e20017b2190ccbf15f3823a64c290b88ac748 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:45:06 +0200 Subject: [PATCH 332/472] skillcalculator: Merge nested if statements --- .../skillcalculator/BankedCalculator.java | 36 ++++++++----------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java index d76fec32a7..a2c10206cd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java @@ -331,12 +331,9 @@ public class BankedCalculator extends JPanel } // One activity and rewards no xp ignore. - if (activities.size() == 1) + if (activities.size() == 1 && activities.get(0).getXp() <= 0) { - if (activities.get(0).getXp() <= 0) - { - return; - } + return; } } @@ -448,19 +445,16 @@ public class BankedCalculator extends JPanel // If had a previous selection and this item links to another check for item prevention change. // If there are changes adjust the Linked panel quantity as well - if (cur != null && i.getLinkedItemId() != -1) + if (cur != null && i.getLinkedItemId() != -1 && cur.isPreventLinked() != a.isPreventLinked()) { - if (cur.isPreventLinked() != a.isPreventLinked()) + CriticalItem linked = CriticalItem.getByItemId(i.getLinkedItemId()); + CriticalItemPanel l = panelMap.get(linked); + if (l != null) { - CriticalItem linked = CriticalItem.getByItemId(i.getLinkedItemId()); - CriticalItemPanel l = panelMap.get(linked); - if (l != null) - { - l.updateLinkedMap(getLinkedTotalMap(linked)); - int amount = config.limitedBankedSecondaries() ? limitToActivitySecondaries(a, l.getAmount()) : l.getAmount(); - l.updateAmount(amount, false); - l.recalculate(); - } + l.updateLinkedMap(getLinkedTotalMap(linked)); + int amount = config.limitedBankedSecondaries() ? limitToActivitySecondaries(a, l.getAmount()) : l.getAmount(); + l.updateAmount(amount, false); + l.recalculate(); } } @@ -500,13 +494,11 @@ public class BankedCalculator extends JPanel // This item has an activity selected and its preventing linked functionality? Activity selected = activityMap.get(i); - if (selected != null && selected.isPreventLinked()) - { + if (selected != null && selected.isPreventLinked() // If initial request is for this item - if (!first) - { - return map; - } + && !first) + { + return map; } // Add self to map From 774f1d9f0d6768a05afcb1d3654399f261dd51ad Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:46:07 +0200 Subject: [PATCH 333/472] skillcalculator: Final fields --- .../skillcalculator/BankedCalculator.java | 16 ++++++++-------- .../skillcalculator/SkillCalculatorPanel.java | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java index a2c10206cd..d47af41fee 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java @@ -77,17 +77,17 @@ public class BankedCalculator extends JPanel private Skill currentSkill; private double totalBankedXp = 0.0f; - private JLabel totalLabel = new JLabel(); - private JPanel detailConfigContainer; - private JPanel detailContainer; + private final JLabel totalLabel = new JLabel(); + private final JPanel detailConfigContainer; + private final JPanel detailContainer; // Banked Experience magic private Map bankMap = new HashMap<>(); - private Map categoryMap = new HashMap<>(); // Check if CriticalItem Category is enabled - private Map panelMap = new HashMap<>(); - private Map criticalMap = new HashMap<>(); // Quantity of CriticalItem inside bankMap - private Map activityMap = new HashMap<>(); // Selected Activity used for calculating xp - private Map linkedMap = new HashMap<>(); // ItemID of item that links to the CriticalItem + private final Map categoryMap = new HashMap<>(); // Check if CriticalItem Category is enabled + private final Map panelMap = new HashMap<>(); + private final Map criticalMap = new HashMap<>(); // Quantity of CriticalItem inside bankMap + private final Map activityMap = new HashMap<>(); // Selected Activity used for calculating xp + private final Map linkedMap = new HashMap<>(); // ItemID of item that links to the CriticalItem BankedCalculator( final SkillCalculatorPanel parent, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java index ff5e9eda1d..79684db069 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java @@ -65,10 +65,10 @@ class SkillCalculatorPanel extends PluginPanel private final MaterialTabGroup skillGroup; private final MaterialTabGroup tabGroup; private String currentTab; - private List tabs = new ArrayList<>(); + private final List tabs = new ArrayList<>(); @Getter private Map bankMap = new HashMap<>(); - private GridBagConstraints c; + private final GridBagConstraints c; SkillCalculatorPanel(final SkillIconManager iconManager, final Client client, final SkillCalculatorConfig config, final SpriteManager spriteManager, final ItemManager itemManager) { From 083488c5eba5cd86e2b9c0430f1067ba99a93dbe Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:46:36 +0200 Subject: [PATCH 334/472] skillcalculator: Null check --- .../client/plugins/skillcalculator/BankedCalculator.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java index d47af41fee..fcbd8e89f1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java @@ -539,7 +539,12 @@ public class BankedCalculator extends JPanel if (oldMapFlag) { CalculatorType calc = CalculatorType.getBySkill(currentSkill); - SwingUtilities.invokeLater(() -> openBanked(calc)); + SwingUtilities.invokeLater(() -> { + if (calc != null) + { + openBanked(calc); + } + }); return; } From 5a84107ebb6e5e393083df8a3427405f21a297ab Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Sun, 7 Jul 2019 19:20:42 +0100 Subject: [PATCH 335/472] npcunaggroarea: add notification when timer runs out --- .../npcunaggroarea/NpcAggroAreaConfig.java | 11 +++++++++ .../npcunaggroarea/NpcAggroAreaOverlay.java | 4 ++++ .../npcunaggroarea/NpcAggroAreaPlugin.java | 24 +++++++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java index 38cb016c63..46593c4d32 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java @@ -115,4 +115,15 @@ public interface NpcAggroAreaConfig extends Config { return false; } + + @ConfigItem( + keyName = "sendNotification", + name = "Send notification", + description = "Send a notification when the timer runs out", + position = 7 + ) + default boolean sendNotification() + { + return false; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java index 5a295e2f35..c9c1c4fae2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java @@ -86,6 +86,10 @@ class NpcAggroAreaOverlay extends Overlay outlineColor.getBlue(), 100); } + else + { + plugin.doNotification(); + } renderPath(graphics, lines, outlineColor); return null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java index d4093c07a5..af60fb56ed 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.npcunaggroarea; import java.awt.Color; import javax.inject.Singleton; import lombok.AccessLevel; +import net.runelite.api.Player; import net.runelite.api.geometry.Geometry; import com.google.common.base.Splitter; import com.google.common.base.Strings; @@ -56,6 +57,7 @@ import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.NpcSpawned; +import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.ItemManager; @@ -116,6 +118,9 @@ public class NpcAggroAreaPlugin extends Plugin @Inject private ConfigManager configManager; + @Inject + private Notifier notifier; + @Getter(AccessLevel.PACKAGE) private final WorldPoint[] safeCenters = new WorldPoint[2]; @@ -137,12 +142,15 @@ public class NpcAggroAreaPlugin extends Plugin private boolean showNotWorkingOverlay; @Getter(AccessLevel.PACKAGE) private boolean hideOverlayHint; + @Getter(AccessLevel.PACKAGE) + private boolean sendNotification; private WorldPoint lastPlayerLocation; private WorldPoint previousUnknownCenter; private boolean loggingIn; private List npcNamePatterns; private boolean notWorkingOverlayShown = false; + private boolean hasSentNotification = false; @Provides NpcAggroAreaConfig provideConfig(ConfigManager configManager) @@ -259,6 +267,7 @@ public class NpcAggroAreaPlugin extends Plugin BufferedImage image = itemManager.getImage(ItemID.ENSOULED_DEMON_HEAD); currentTimer = new AggressionTimer(duration, image, this, active && this.showTimer); infoBoxManager.addInfoBox(currentTimer); + hasSentNotification = false; } private void resetTimer() @@ -417,6 +426,9 @@ public class NpcAggroAreaPlugin extends Plugin npcNamePatterns = NAME_SPLITTER.splitToList(this.configNpcNamePatterns); recheckActive(); break; + case "sendNotification": + hasSentNotification = false; + break; } } @@ -507,6 +519,17 @@ public class NpcAggroAreaPlugin extends Plugin } } + void doNotification() + { + if (hasSentNotification) + { + return; + } + final Player local = client.getLocalPlayer(); + hasSentNotification = true; + notifier.notify("[" + local.getName() + "]'s aggression timer has run out!"); + } + private void updateConfig() { this.alwaysActive = config.alwaysActive(); @@ -516,5 +539,6 @@ public class NpcAggroAreaPlugin extends Plugin this.aggroAreaColor = config.aggroAreaColor(); this.showNotWorkingOverlay = config.showNotWorkingOverlay(); this.hideOverlayHint = config.hideOverlayHint(); + this.sendNotification = config.sendNotification(); } } From b40646bf7e60d3f3a25ac5aeec55a320edac4bf7 Mon Sep 17 00:00:00 2001 From: 7ate9 <7ate9@users.noreply.github.com`> Date: Sun, 7 Jul 2019 14:57:57 -0400 Subject: [PATCH 336/472] fps: fix rejectedexecutionexception --- .../client/plugins/fps/FpsPlugin.java | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java index 686b09c152..fb8bffc9d6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java @@ -36,6 +36,7 @@ import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.FocusChanged; +import net.runelite.api.events.GameStateChanged; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; @@ -93,6 +94,10 @@ public class FpsPlugin extends Plugin private final ScheduledExecutorService pingExecutorService = new ExecutorServiceExceptionLogger(Executors.newSingleThreadScheduledExecutor()); + private boolean loaded = false; + + private boolean shutdown; + @Getter(AccessLevel.PACKAGE) private FpsLimitMode limitMode; @@ -128,6 +133,12 @@ public class FpsPlugin extends Plugin overlay.onFocusChanged(event); } + @Subscribe + public void onGameStateChanged(GameStateChanged event) + { + shutdown = event.getGameState() != GameState.LOGGED_IN; + } + @Override protected void startUp() throws Exception { @@ -137,7 +148,13 @@ public class FpsPlugin extends Plugin overlayManager.add(overlay); drawManager.registerEveryFrameListener(drawListener); drawListener.reloadConfig(); - pingExecutorService.scheduleAtFixedRate(this::getPingToCurrentWorld, 5, 5, TimeUnit.SECONDS); + shutdown = client.getGameState() != GameState.LOGGED_IN; + + if (!loaded) + { + pingExecutorService.scheduleAtFixedRate(this::getPingToCurrentWorld, 5, 5, TimeUnit.SECONDS); + loaded = true; + } } @Override @@ -145,12 +162,12 @@ public class FpsPlugin extends Plugin { overlayManager.remove(overlay); drawManager.unregisterEveryFrameListener(drawListener); - pingExecutorService.shutdown(); + shutdown = true; } private void getPingToCurrentWorld() { - if (client.getGameState().equals(GameState.LOGGED_IN) && drawPing) + if (!shutdown && drawPing) { ping = Ping.ping(String.format("oldschool%d.runescape.com", client.getWorld() - 300)); } From 388d484c0e9bc51a31de6c18750f4c468c6eb804 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:02:00 +0200 Subject: [PATCH 337/472] slayer: Final fields --- .../net/runelite/client/plugins/slayer/SlayerPlugin.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java index be720fa9e3..2c9e181905 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java @@ -142,7 +142,7 @@ public class SlayerPlugin extends Plugin // Superiors @VisibleForTesting - static List SUPERIOR_SLAYER_MONSTERS = Arrays.asList( + static final List SUPERIOR_SLAYER_MONSTERS = Arrays.asList( "crushing hand", "chasm crawler", "screaming banshee", @@ -239,10 +239,10 @@ public class SlayerPlugin extends Plugin private int cachedPoints; private Instant infoTimer; private List targetNames = new ArrayList<>(); - private List targetIds = new ArrayList<>(); + private final List targetIds = new ArrayList<>(); private boolean checkAsTokens = true; - private List lingeringPresences = new ArrayList<>(); + private final List lingeringPresences = new ArrayList<>(); private SlayerXpDropLookup slayerXpDropLookup = null; private SlayerTaskPanel panel; From 4b912a9b2d93596acb16755aa7108f4232882b52 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:05:16 +0200 Subject: [PATCH 338/472] slayer: Return value instead of storig and returning --- .../main/java/net/runelite/client/plugins/slayer/TaskBox.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskBox.java index 2f8776b200..75e7c8327a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskBox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskBox.java @@ -277,8 +277,8 @@ class TaskBox extends JPanel return Long.MAX_VALUE; } double timePerKill = ((double) taskData.getElapsedTime()) / ((double) killsInElapsedTime); - double remainingTime = timePerKill * taskData.getAmount(); - return (long) remainingTime; + + return (long) timePerKill * taskData.getAmount(); } private static String htmlLabel(long timeMillis) From 56013c550b62281b2859c55d2e176e478d1190f6 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:07:06 +0200 Subject: [PATCH 339/472] slayermusiq: Final fields --- .../runelite/client/plugins/slayermusiq/QuestGuideLinks.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/QuestGuideLinks.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/QuestGuideLinks.java index 59b1b31e8c..e14b883286 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/QuestGuideLinks.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/QuestGuideLinks.java @@ -159,8 +159,8 @@ class QuestGuideLinks private static class Link { - private String questName; - private String url; + private final String questName; + private final String url; Link(String questName, String url) { From 0cac974e45588d1924e5892f3967504f13913050 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:08:20 +0200 Subject: [PATCH 340/472] spawntimer: Package private class --- .../main/java/net/runelite/client/plugins/spawntimer/thing.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/thing.java b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/thing.java index 45095c18f7..f90e7b271e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/thing.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/thing.java @@ -2,7 +2,7 @@ package net.runelite.client.plugins.spawntimer; import net.runelite.api.NPC; -public class thing +class thing { private NPC npc; private int tick; From a12523327041bc43f4faf4713d50c766e77da974 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:09:26 +0200 Subject: [PATCH 341/472] specialcounter: Merge nested if statements --- .../specialcounter/SpecialCounterPlugin.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java index fef53c1ea8..3f164f87b0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java @@ -159,20 +159,17 @@ public class SpecialCounterPlugin extends Plugin int deltaExperience = hpXp - specialHitpointsExperience; specialHitpointsExperience = -1; - if (deltaExperience > 0) + if (deltaExperience > 0 && specialWeapon != null) { - if (specialWeapon != null) + int hit = getHit(specialWeapon, deltaExperience); + + updateCounter(specialWeapon, null, hit); + + if (!party.getMembers().isEmpty()) { - int hit = getHit(specialWeapon, deltaExperience); - - updateCounter(specialWeapon, null, hit); - - if (!party.getMembers().isEmpty()) - { - final SpecialCounterUpdate specialCounterUpdate = new SpecialCounterUpdate(interactingId, specialWeapon, hit); - specialCounterUpdate.setMemberId(party.getLocalMember().getMemberId()); - wsClient.send(specialCounterUpdate); - } + final SpecialCounterUpdate specialCounterUpdate = new SpecialCounterUpdate(interactingId, specialWeapon, hit); + specialCounterUpdate.setMemberId(party.getLocalMember().getMemberId()); + wsClient.send(specialCounterUpdate); } } } From e87a5e95b548feba190d20f7a8609cebc4f4e1f0 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:09:52 +0200 Subject: [PATCH 342/472] spellbook: Final fields --- .../client/plugins/spellbook/SpellbookDragOverlay.java | 6 +++--- .../runelite/client/plugins/spellbook/SpellbookPlugin.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookDragOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookDragOverlay.java index 5ac75aae56..4bb3a8cacc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookDragOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookDragOverlay.java @@ -41,9 +41,9 @@ import net.runelite.client.ui.overlay.OverlayPriority; @Singleton public class SpellbookDragOverlay extends Overlay { - private SpellbookPlugin plugin; - private Client client; - private SpriteManager spriteManager; + private final SpellbookPlugin plugin; + private final Client client; + private final SpriteManager spriteManager; @Inject private SpellbookDragOverlay(final SpellbookPlugin plugin, final Client client, final SpriteManager spriteManager) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java index fc5d766385..a6eae0b652 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java @@ -129,7 +129,7 @@ public class SpellbookPlugin extends Plugin @Getter private Point draggingLocation; - private Map spells = new HashMap<>(); + private final Map spells = new HashMap<>(); private Map tmp = null; private ImmutableSet notFilteredSpells; private Spellbook spellbook; From 8ba41631d1c996931fe923e253ce2598557b6598 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:10:13 +0200 Subject: [PATCH 343/472] spellbook: Package private class --- .../client/plugins/spellbook/SpellbookMouseListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookMouseListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookMouseListener.java index 01db4f79e5..562bf74679 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookMouseListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookMouseListener.java @@ -32,7 +32,7 @@ import net.runelite.client.input.MouseAdapter; import net.runelite.client.input.MouseWheelListener; @Singleton -public class SpellbookMouseListener extends MouseAdapter implements MouseWheelListener +class SpellbookMouseListener extends MouseAdapter implements MouseWheelListener { private final SpellbookPlugin plugin; From 98214d8a4c6862dcd2949d82f7c1ee1b9be67203 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:11:50 +0200 Subject: [PATCH 344/472] spellbook: Use entrySet instead of accessing the map multiple times --- .../runelite/client/plugins/spellbook/SpellbookPlugin.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java index a6eae0b652..0502330b79 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java @@ -586,11 +586,11 @@ public class SpellbookPlugin extends Plugin { ImmutableSet tmp = ImmutableSet.copyOf(notFilteredSpells); - for (int id : spells.keySet()) + for (Map.Entry spell : spells.entrySet()) { - Widget w = client.getWidget(WidgetInfo.TO_GROUP(id), WidgetInfo.TO_CHILD(id)); // y tho let me just plop in id + Widget w = client.getWidget(WidgetInfo.TO_GROUP(spell.getKey()), WidgetInfo.TO_CHILD(spell.getKey())); // y tho let me just plop in id - if (w == null || !w.getBounds().contains(point) || !isUnfiltered(spells.get(id).getName(), tmp)) + if (w == null || !w.getBounds().contains(point) || !isUnfiltered(spell.getValue().getName(), tmp)) { continue; } From 727ee541f5ac67a989446a23413d5d5e0ec44c02 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:12:36 +0200 Subject: [PATCH 345/472] statusbars: Package private fields --- .../client/plugins/statusbars/renderer/BarRenderer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/BarRenderer.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/BarRenderer.java index f721611b47..7dc607c57b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/BarRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/BarRenderer.java @@ -58,10 +58,10 @@ public abstract class BarRenderer protected final StatusBarsPlugin plugin; int maximumValue; int currentValue; - protected int restore; + int restore; Color standardColor; Color restoreColor; - protected Image icon; + Image icon; protected abstract void update(Client client, StatusBarsOverlay overlay); From e9923cf9631475fce3147bd0af28ba16e2b4faf7 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:13:10 +0200 Subject: [PATCH 346/472] statusbars: cerWidget is always false here --- .../client/plugins/statusbars/StatusBarsOverlay.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsOverlay.java index d4d64dec42..014a1a1fdb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsOverlay.java @@ -90,10 +90,14 @@ public class StatusBarsOverlay extends Overlay } } - if (curViewport == null || curWidget.isHidden()) + if (curViewport == null) { return null; } + else + { + curWidget.isHidden(); + } final Point offsetLeft = curViewport.getOffsetLeft(); final Point offsetRight = curViewport.getOffsetRight(); From ab203bf57db23b5ed6e7daf148714fe7621ebc8a Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:13:47 +0200 Subject: [PATCH 347/472] statusbars: Merge nested if statements --- .../client/plugins/statusbars/StatusBarsPlugin.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java index b2310a1acc..1936f87664 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java @@ -158,12 +158,9 @@ public class StatusBarsPlugin extends Plugin overlayManager.add(overlay); } } - else if (lastCombatAction != null) + else if (lastCombatAction != null && Duration.between(getLastCombatAction(), Instant.now()).getSeconds() > combatTimeout) { - if (Duration.between(getLastCombatAction(), Instant.now()).getSeconds() > combatTimeout) - { - overlayManager.remove(overlay); - } + overlayManager.remove(overlay); } } From 7808d638b412a7d9c56f14b743634aa2786f659d Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:15:26 +0200 Subject: [PATCH 348/472] stonedloottracker: Final fields --- .../stonedloottracker/StonedLootTrackerPlugin.java | 6 +++--- .../plugins/stonedloottracker/ui/LootGrid.java | 2 +- .../plugins/stonedloottracker/ui/LootPanel.java | 12 ++++++------ .../plugins/stonedloottracker/ui/SelectionPanel.java | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/StonedLootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/StonedLootTrackerPlugin.java index 3141db78e6..51ff22c241 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/StonedLootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/StonedLootTrackerPlugin.java @@ -161,9 +161,9 @@ public class StonedLootTrackerPlugin extends Plugin private NavigationButton navButton; private String eventType; - private Multimap lootRecordMultimap = ArrayListMultimap.create(); - private Multimap uniques = ArrayListMultimap.create(); - private Map killCountMap = new HashMap<>(); + private final Multimap lootRecordMultimap = ArrayListMultimap.create(); + private final Multimap uniques = ArrayListMultimap.create(); + private final Map killCountMap = new HashMap<>(); // key = name, value=current killCount private boolean loaded = false; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootGrid.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootGrid.java index 0af19c077c..6457c73aa6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootGrid.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootGrid.java @@ -44,7 +44,7 @@ class LootGrid extends JPanel private static final int ITEMS_PER_ROW = 5; private static final Dimension ITEM_SIZE = new Dimension(40, 40); private final LootTrackerItemEntry[] itemsToDisplay; - private ItemManager itemManager; + private final ItemManager itemManager; LootGrid(final LootTrackerItemEntry[] itemsToDisplay, final ItemManager itemManager) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootPanel.java index 089eda28d0..3d8a53af28 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootPanel.java @@ -52,12 +52,12 @@ import net.runelite.client.ui.ColorScheme; @Singleton class LootPanel extends JPanel { - private Collection records; - private Map> uniqueMap; - private boolean hideUniques; - private ItemSortTypes sortType; - private boolean itemBreakdown; - private ItemManager itemManager; + private final Collection records; + private final Map> uniqueMap; + private final boolean hideUniques; + private final ItemSortTypes sortType; + private final boolean itemBreakdown; + private final ItemManager itemManager; // Consolidate LTItemEntries stored by ItemID private Map consolidated; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/SelectionPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/SelectionPanel.java index f6e9141a3b..feb2dd6e1f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/SelectionPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/SelectionPanel.java @@ -53,15 +53,15 @@ import net.runelite.client.ui.components.materialtabs.MaterialTabGroup; @Singleton class SelectionPanel extends JPanel { - private TreeSet names; - private LootTrackerPanel parent; - private ItemManager itemManager; + private final TreeSet names; + private final LootTrackerPanel parent; + private final ItemManager itemManager; private final static Color BACKGROUND_COLOR = ColorScheme.DARK_GRAY_COLOR; private final static Color BUTTON_COLOR = ColorScheme.DARKER_GRAY_COLOR; private final static Color BUTTON_HOVER_COLOR = ColorScheme.DARKER_GRAY_HOVER_COLOR; - private boolean configToggle; + private final boolean configToggle; SelectionPanel(final boolean configToggle, final TreeSet names, final LootTrackerPanel parent, final ItemManager itemManager) { From 5e0a1ca968817d83498f6ee58a62b3c059544570 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:15:55 +0200 Subject: [PATCH 349/472] stonedloottracker: Return value is never used --- .../stonedloottracker/data/LootRecordWriter.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecordWriter.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecordWriter.java index 3a03546606..13b001151c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecordWriter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecordWriter.java @@ -124,7 +124,7 @@ public class LootRecordWriter return data; } - public synchronized boolean addLootTrackerRecord(LootRecordCustom rec) + public synchronized void addLootTrackerRecord(LootRecordCustom rec) { // Grab file String fileName = npcNameToFileName(rec.getName()); @@ -141,17 +141,15 @@ public class LootRecordWriter file.newLine(); file.close(); bus.post(new LootTrackerRecordStored(rec)); - return true; } catch (IOException ioe) { log.warn("Error writing loot data to file {}: {}", fileName, ioe.getMessage()); - return false; } } // Mostly used to adjust previous loot entries such as adding pet drops/abyssal sire drops - public synchronized boolean writeLootTrackerFile(String npcName, Collection loots) + public synchronized void writeLootTrackerFile(String npcName, Collection loots) { String fileName = npcNameToFileName(npcName); File lootFile = new File(playerFolder, fileName); @@ -168,16 +166,14 @@ public class LootRecordWriter } file.close(); - return true; } catch (IOException ioe) { log.warn("Error rewriting loot data to file {}: {}", fileName, ioe.getMessage()); - return false; } } - public synchronized boolean deleteLootTrackerRecords(String npcName) + public synchronized void deleteLootTrackerRecords(String npcName) { String fileName = npcNameToFileName(npcName); @@ -186,12 +182,10 @@ public class LootRecordWriter if (lootFile.delete()) { log.debug("Deleted loot file: {}", fileName); - return true; } else { log.debug("Couldn't delete file: {}", fileName); - return false; } } From 17e24250a703ddc1eebebd83d444837ab0498713 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:16:54 +0200 Subject: [PATCH 350/472] stonedloottracker: Static fields --- .../client/plugins/stonedloottracker/ui/UniqueItemPanel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/UniqueItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/UniqueItemPanel.java index 0bb4824668..e4aa3be03b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/UniqueItemPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/UniqueItemPanel.java @@ -54,8 +54,8 @@ class UniqueItemPanel extends JPanel { private ItemManager itemManager; - private final float alphaMissing = 0.35f; - private final float alphaHas = 1.0f; + private final static float alphaMissing = 0.35f; + private final static float alphaHas = 1.0f; private static final Dimension panelSize = new Dimension(215, 50); private static final Border panelBorder = new EmptyBorder(3, 0, 3, 0); From 0fea9c08edd70dad77ff23a6c8b00b45d06c79a1 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:21:57 +0200 Subject: [PATCH 351/472] stonedloottracker: Use interface instead of type --- .../StonedLootTrackerPlugin.java | 3 ++- .../plugins/stonedloottracker/data/BossTab.java | 9 +++++---- .../stonedloottracker/data/UniqueItem.java | 17 +++++++++-------- .../plugins/stonedloottracker/ui/LootGrid.java | 4 ++-- .../plugins/stonedloottracker/ui/LootPanel.java | 3 ++- .../stonedloottracker/ui/LootTrackerBox.java | 4 ++-- .../stonedloottracker/ui/SelectionPanel.java | 8 ++++---- 7 files changed, 26 insertions(+), 22 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/StonedLootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/StonedLootTrackerPlugin.java index 51ff22c241..6ba61372c2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/StonedLootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/StonedLootTrackerPlugin.java @@ -41,6 +41,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -572,7 +573,7 @@ public class StonedLootTrackerPlugin extends Plugin writer.deleteLootTrackerRecords(name); } - public TreeSet getNames() + public Set getNames() { return new TreeSet<>(lootRecordMultimap.keySet()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/BossTab.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/BossTab.java index f40ca6cb94..12179a35de 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/BossTab.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/BossTab.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.stonedloottracker.data; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeSet; @@ -120,14 +121,14 @@ public enum BossTab } // By Category Name - private static final Map> byCategoryName = buildCategoryMap(); - public static ArrayList getByCategoryName(String name) + private static final Map> byCategoryName = buildCategoryMap(); + public static List getByCategoryName(String name) { return byCategoryName.get(name.toUpperCase()); } - private static Map> buildCategoryMap() + private static Map> buildCategoryMap() { - Map> map = new HashMap<>(); + Map> map = new HashMap<>(); for (BossTab tab : values()) { map.computeIfAbsent(tab.getCategory().toUpperCase(), e -> new ArrayList<>()).add(tab); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/UniqueItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/UniqueItem.java index d15a980420..7af2acf699 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/UniqueItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/UniqueItem.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import java.util.stream.Collectors; import lombok.AccessLevel; @@ -874,14 +875,14 @@ public enum UniqueItem } // Returns an array of UniqueItems by an individual `activities` name - private static final Map> byActivityName = buildActivityMap(); - public static ArrayList getByActivityName(String name) + private static final Map> byActivityName = buildActivityMap(); + public static List getByActivityName(String name) { return byActivityName.get(name.toUpperCase()); } - private static Map> buildActivityMap() + private static Map> buildActivityMap() { - Map> byName = new HashMap<>(); + Map> byName = new HashMap<>(); for (UniqueItem item : values()) { String[] activities = item.getActivities(); @@ -897,14 +898,14 @@ public enum UniqueItem // Return an array of UniqueItems by `setName` // Unused ATM - private static final Map> bySetName = buildSetMap(); - public static ArrayList getBySetName(String name) + private static final Map> bySetName = buildSetMap(); + public static List getBySetName(String name) { return bySetName.get(name.toUpperCase()); } - private static Map> buildSetMap() + private static Map> buildSetMap() { - Map> byName = new HashMap<>(); + Map> byName = new HashMap<>(); for (UniqueItem item : values()) { byName.computeIfAbsent(item.getSetName().toUpperCase(), e -> new ArrayList<>()).add(item); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootGrid.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootGrid.java index 6457c73aa6..33927c6ffe 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootGrid.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootGrid.java @@ -26,8 +26,8 @@ package net.runelite.client.plugins.stonedloottracker.ui; import java.awt.Dimension; import java.awt.GridLayout; -import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import javax.inject.Singleton; import javax.swing.JLabel; import javax.swing.JPanel; @@ -62,7 +62,7 @@ class LootGrid extends JPanel */ private void buildItems() { - ArrayList items = LootTrackerBox.dedupeClues(Arrays.asList(itemsToDisplay)); + List items = LootTrackerBox.dedupeClues(Arrays.asList(itemsToDisplay)); // Calculates how many rows need to be display to fit all items final int rowSize = LootTrackerBox.rowSize(items.size()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootPanel.java index 3d8a53af28..5abe89d05c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootPanel.java @@ -32,6 +32,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; @@ -187,7 +188,7 @@ class LootPanel extends JPanel Collection itemsToDisplay = new ArrayList<>(); - ArrayList items = LootTrackerBox.dedupeClues(new ArrayList<>(consolidated.values())); + List items = LootTrackerBox.dedupeClues(new ArrayList<>(consolidated.values())); for (LootTrackerItemEntry item : items) { totalValue += item.getTotal(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java index da69419947..9618536cc0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java @@ -184,9 +184,9 @@ class LootTrackerBox extends JPanel repaint(); } - static ArrayList dedupeClues(List items) + static List dedupeClues(List items) { - final ArrayList newItems = new ArrayList<>(); + final List newItems = new ArrayList<>(); int eliteClues = 0; int hardClues = 0; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/SelectionPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/SelectionPanel.java index feb2dd6e1f..510fa4491b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/SelectionPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/SelectionPanel.java @@ -33,7 +33,7 @@ import java.awt.Image; import java.awt.Insets; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.util.ArrayList; +import java.util.List; import java.util.Set; import java.util.TreeSet; import javax.inject.Singleton; @@ -53,7 +53,7 @@ import net.runelite.client.ui.components.materialtabs.MaterialTabGroup; @Singleton class SelectionPanel extends JPanel { - private final TreeSet names; + private final Set names; private final LootTrackerPanel parent; private final ItemManager itemManager; @@ -63,7 +63,7 @@ class SelectionPanel extends JPanel private final boolean configToggle; - SelectionPanel(final boolean configToggle, final TreeSet names, final LootTrackerPanel parent, final ItemManager itemManager) + SelectionPanel(final boolean configToggle, final Set names, final LootTrackerPanel parent, final ItemManager itemManager) { this.names = names == null ? new TreeSet<>() : names; this.parent = parent; @@ -168,7 +168,7 @@ class SelectionPanel extends JPanel name.setForeground(Color.WHITE); name.setVerticalAlignment(SwingConstants.CENTER); - ArrayList categoryTabs = BossTab.getByCategoryName(categoryName); + List categoryTabs = BossTab.getByCategoryName(categoryName); for (BossTab tab : categoryTabs) { // Create tab (with hover effects/text) From 2973c340c20167363c1741dcab041ae01f86eaff Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:22:49 +0200 Subject: [PATCH 352/472] suppliestracker: Final fields --- .../plugins/suppliestracker/SuppliesTrackerPlugin.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java index 3fc78a6532..d4daecb2c3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java @@ -221,9 +221,9 @@ public class SuppliesTrackerPlugin extends Plugin private static final int[] RUNE_IDS = new int[]{AIR_RUNE, WATER_RUNE, EARTH_RUNE, MIND_RUNE, BODY_RUNE, COSMIC_RUNE, CHAOS_RUNE, NATURE_RUNE, LAW_RUNE, DEATH_RUNE, ASTRAL_RUNE, BLOOD_RUNE, SOUL_RUNE, WRATH_RUNE, MIST_RUNE, DUST_RUNE, MUD_RUNE, SMOKE_RUNE, STEAM_RUNE, LAVA_RUNE}; //Hold Supply Data - private static HashMap suppliesEntry = new HashMap<>(); + private static final HashMap suppliesEntry = new HashMap<>(); private ItemContainer old; - private Deque actionStack = new ArrayDeque<>(); + private final Deque actionStack = new ArrayDeque<>(); private int ammoId = 0; private int ammoAmount = 0; private int thrownId = 0; @@ -234,7 +234,7 @@ public class SuppliesTrackerPlugin extends Plugin private int mainHand = 0; private SuppliesTrackerPanel panel; private NavigationButton navButton; - private String[] RAIDS_CONSUMABLES = new String[]{"xeric's", "elder", "twisted", "revitalisation", "overload", "prayer enhance", "pysk", "suphi", "leckish", "brawk", "mycil", "roqed", "kyren", "guanic", "prael", "giral", "phluxia", "kryket", "murng", "psykk"}; + private final String[] RAIDS_CONSUMABLES = new String[]{"xeric's", "elder", "twisted", "revitalisation", "overload", "prayer enhance", "pysk", "suphi", "leckish", "brawk", "mycil", "roqed", "kyren", "guanic", "prael", "giral", "phluxia", "kryket", "murng", "psykk"}; private int attackStyleVarbit = -1; private int ticks = 0; From 26589b5837fe4e381e1745626fc5763c8b39c86c Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:23:40 +0200 Subject: [PATCH 353/472] suppliestracker: Merge nested if statements --- .../SuppliesTrackerPlugin.java | 127 ++---------------- 1 file changed, 11 insertions(+), 116 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java index d4daecb2c3..4967431a44 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java @@ -48,113 +48,10 @@ import net.runelite.api.Client; import net.runelite.api.EquipmentInventorySlot; import net.runelite.api.InventoryID; import net.runelite.api.Item; -import net.runelite.api.ItemDefinition; import net.runelite.api.ItemContainer; +import net.runelite.api.ItemDefinition; import net.runelite.api.ItemID; -import static net.runelite.api.ItemID.ACCUMULATOR_MAX_CAPE; -import static net.runelite.api.ItemID.ADAMANT_DART; -import static net.runelite.api.ItemID.ADAMANT_KNIFE; -import static net.runelite.api.ItemID.ADAMANT_THROWNAXE; -import static net.runelite.api.ItemID.ADMIRAL_PIE; -import static net.runelite.api.ItemID.AIR_RUNE; -import static net.runelite.api.ItemID.ANCHOVY_PIZZA; -import static net.runelite.api.ItemID.APPLE_PIE; -import static net.runelite.api.ItemID.ASSEMBLER_MAX_CAPE; -import static net.runelite.api.ItemID.ASTRAL_RUNE; -import static net.runelite.api.ItemID.AVAS_ACCUMULATOR; -import static net.runelite.api.ItemID.AVAS_ASSEMBLER; -import static net.runelite.api.ItemID.AVAS_ATTRACTOR; -import static net.runelite.api.ItemID.BLACK_CHINCHOMPA; -import static net.runelite.api.ItemID.BLACK_DART; -import static net.runelite.api.ItemID.BLACK_KNIFE; -import static net.runelite.api.ItemID.BLOOD_RUNE; -import static net.runelite.api.ItemID.BODY_RUNE; -import static net.runelite.api.ItemID.BOTANICAL_PIE; -import static net.runelite.api.ItemID.BRONZE_DART; -import static net.runelite.api.ItemID.BRONZE_KNIFE; -import static net.runelite.api.ItemID.BRONZE_THROWNAXE; -import static net.runelite.api.ItemID.CAKE; -import static net.runelite.api.ItemID.CANNONBALL; -import static net.runelite.api.ItemID.CHAOS_RUNE; -import static net.runelite.api.ItemID.CHINCHOMPA_10033; -import static net.runelite.api.ItemID.CHOCOLATE_CAKE; -import static net.runelite.api.ItemID.CHOCOLATE_SLICE; -import static net.runelite.api.ItemID.COINS_995; -import static net.runelite.api.ItemID.COSMIC_RUNE; -import static net.runelite.api.ItemID.DEATH_RUNE; -import static net.runelite.api.ItemID.DRAGON_DART; -import static net.runelite.api.ItemID.DRAGON_KNIFE; -import static net.runelite.api.ItemID.DRAGON_KNIFEP; -import static net.runelite.api.ItemID.DRAGON_KNIFEP_22808; -import static net.runelite.api.ItemID.DRAGON_KNIFEP_22810; -import static net.runelite.api.ItemID.DRAGON_KNIFE_22812; -import static net.runelite.api.ItemID.DRAGON_KNIFE_22814; -import static net.runelite.api.ItemID.DRAGON_THROWNAXE; -import static net.runelite.api.ItemID.DUST_RUNE; -import static net.runelite.api.ItemID.EARTH_RUNE; -import static net.runelite.api.ItemID.FIRE_RUNE; -import static net.runelite.api.ItemID.FISH_PIE; -import static net.runelite.api.ItemID.GARDEN_PIE; -import static net.runelite.api.ItemID.HALF_AN_ADMIRAL_PIE; -import static net.runelite.api.ItemID.HALF_AN_APPLE_PIE; -import static net.runelite.api.ItemID.HALF_A_BOTANICAL_PIE; -import static net.runelite.api.ItemID.HALF_A_FISH_PIE; -import static net.runelite.api.ItemID.HALF_A_GARDEN_PIE; -import static net.runelite.api.ItemID.HALF_A_MEAT_PIE; -import static net.runelite.api.ItemID.HALF_A_MUSHROOM_PIE; -import static net.runelite.api.ItemID.HALF_A_REDBERRY_PIE; -import static net.runelite.api.ItemID.HALF_A_SUMMER_PIE; -import static net.runelite.api.ItemID.HALF_A_WILD_PIE; -import static net.runelite.api.ItemID.IRON_DART; -import static net.runelite.api.ItemID.IRON_KNIFE; -import static net.runelite.api.ItemID.IRON_THROWNAXE; -import static net.runelite.api.ItemID.LAVA_RUNE; -import static net.runelite.api.ItemID.LAW_RUNE; -import static net.runelite.api.ItemID.MEAT_PIE; -import static net.runelite.api.ItemID.MEAT_PIZZA; -import static net.runelite.api.ItemID.MIND_RUNE; -import static net.runelite.api.ItemID.MIST_RUNE; -import static net.runelite.api.ItemID.MITHRIL_DART; -import static net.runelite.api.ItemID.MITHRIL_KNIFE; -import static net.runelite.api.ItemID.MITHRIL_THROWNAXE; -import static net.runelite.api.ItemID.MUD_RUNE; -import static net.runelite.api.ItemID.MUSHROOM_PIE; -import static net.runelite.api.ItemID.NATURE_RUNE; -import static net.runelite.api.ItemID.PINEAPPLE_PIZZA; -import static net.runelite.api.ItemID.PLAIN_PIZZA; -import static net.runelite.api.ItemID.RANGING_CAPE; -import static net.runelite.api.ItemID.REDBERRY_PIE; -import static net.runelite.api.ItemID.RED_CHINCHOMPA_10034; -import static net.runelite.api.ItemID.RUNE_DART; -import static net.runelite.api.ItemID.RUNE_KNIFE; -import static net.runelite.api.ItemID.RUNE_THROWNAXE; -import static net.runelite.api.ItemID.SANGUINESTI_STAFF; -import static net.runelite.api.ItemID.SANGUINESTI_STAFF_UNCHARGED; -import static net.runelite.api.ItemID.SLICE_OF_CAKE; -import static net.runelite.api.ItemID.SMOKE_RUNE; -import static net.runelite.api.ItemID.SOUL_RUNE; -import static net.runelite.api.ItemID.STEAM_RUNE; -import static net.runelite.api.ItemID.STEEL_DART; -import static net.runelite.api.ItemID.STEEL_KNIFE; -import static net.runelite.api.ItemID.STEEL_THROWNAXE; -import static net.runelite.api.ItemID.SUMMER_PIE; -import static net.runelite.api.ItemID.TRIDENT_OF_THE_SEAS; -import static net.runelite.api.ItemID.TRIDENT_OF_THE_SEAS_E; -import static net.runelite.api.ItemID.TRIDENT_OF_THE_SEAS_FULL; -import static net.runelite.api.ItemID.TRIDENT_OF_THE_SWAMP; -import static net.runelite.api.ItemID.TRIDENT_OF_THE_SWAMP_E; -import static net.runelite.api.ItemID.UNCHARGED_TOXIC_TRIDENT; -import static net.runelite.api.ItemID.UNCHARGED_TOXIC_TRIDENT_E; -import static net.runelite.api.ItemID.WATER_RUNE; -import static net.runelite.api.ItemID.WILD_PIE; -import static net.runelite.api.ItemID.WRATH_RUNE; -import static net.runelite.api.ItemID.ZULRAHS_SCALES; -import static net.runelite.api.ItemID._12_ANCHOVY_PIZZA; -import static net.runelite.api.ItemID._12_MEAT_PIZZA; -import static net.runelite.api.ItemID._12_PINEAPPLE_PIZZA; -import static net.runelite.api.ItemID._12_PLAIN_PIZZA; -import static net.runelite.api.ItemID._23_CAKE; -import static net.runelite.api.ItemID._23_CHOCOLATE_CAKE; +import static net.runelite.api.ItemID.*; import net.runelite.api.Player; import net.runelite.api.VarPlayer; import net.runelite.api.events.AnimationChanged; @@ -604,9 +501,8 @@ public class SuppliesTrackerPlugin extends Plugin // Create pattern to find eat/drink at beginning Pattern eatPattern = Pattern.compile(EAT_PATTERN); Pattern drinkPattern = Pattern.compile(DRINK_PATTERN); - if (eatPattern.matcher(event.getTarget().toLowerCase()).find() || drinkPattern.matcher(event.getTarget().toLowerCase()).find()) - { - if (actionStack.stream().noneMatch(a -> + if ((eatPattern.matcher(event.getTarget().toLowerCase()).find() || drinkPattern.matcher(event.getTarget().toLowerCase()).find()) && + actionStack.stream().noneMatch(a -> { if (a instanceof MenuAction.ItemAction) { @@ -615,15 +511,14 @@ public class SuppliesTrackerPlugin extends Plugin } return false; })) + { + old = client.getItemContainer(InventoryID.INVENTORY); + int slot = event.getActionParam0(); + if (old.getItems() != null) { - old = client.getItemContainer(InventoryID.INVENTORY); - int slot = event.getActionParam0(); - if (old.getItems() != null) - { - int pushItem = old.getItems()[event.getActionParam0()].getId(); - MenuAction newAction = new MenuAction.ItemAction(CONSUMABLE, old.getItems(), pushItem, slot); - actionStack.push(newAction); - } + int pushItem = old.getItems()[event.getActionParam0()].getId(); + MenuAction newAction = new MenuAction.ItemAction(CONSUMABLE, old.getItems(), pushItem, slot); + actionStack.push(newAction); } } From 4f19bc29bea102e8a6d14904ac9f36433a1f0229 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:24:04 +0200 Subject: [PATCH 354/472] suppliestracker: Use inteface instead of type --- .../client/plugins/suppliestracker/SuppliesTrackerPlugin.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java index 4967431a44..ea2616fdb9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java @@ -35,6 +35,7 @@ import java.util.ArrayDeque; import java.util.Deque; import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Random; import java.util.regex.Pattern; import javax.inject.Inject; @@ -118,7 +119,7 @@ public class SuppliesTrackerPlugin extends Plugin private static final int[] RUNE_IDS = new int[]{AIR_RUNE, WATER_RUNE, EARTH_RUNE, MIND_RUNE, BODY_RUNE, COSMIC_RUNE, CHAOS_RUNE, NATURE_RUNE, LAW_RUNE, DEATH_RUNE, ASTRAL_RUNE, BLOOD_RUNE, SOUL_RUNE, WRATH_RUNE, MIST_RUNE, DUST_RUNE, MUD_RUNE, SMOKE_RUNE, STEAM_RUNE, LAVA_RUNE}; //Hold Supply Data - private static final HashMap suppliesEntry = new HashMap<>(); + private static final Map suppliesEntry = new HashMap<>(); private ItemContainer old; private final Deque actionStack = new ArrayDeque<>(); private int ammoId = 0; From 6bc9a5b182fd6d27597e734aeda621ca6b8f2f04 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:27:05 +0200 Subject: [PATCH 355/472] tarnslair: Interface instead of type --- .../runelite/client/plugins/tarnslair/TarnsLairPlugin.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java index afe425a8d9..fc2bbff2f7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java @@ -25,6 +25,7 @@ package net.runelite.client.plugins.tarnslair; import java.util.HashMap; +import java.util.Map; import javax.inject.Inject; import javax.inject.Singleton; import lombok.AccessLevel; @@ -63,13 +64,13 @@ public class TarnsLairPlugin extends Plugin private static final int TARNS_LAIR_SOUTH_REGION = 12615; @Getter(AccessLevel.PACKAGE) - private final HashMap staircases = new HashMap<>(); + private final Map staircases = new HashMap<>(); @Getter(AccessLevel.PACKAGE) - private final HashMap wallTraps = new HashMap<>(); + private final Map wallTraps = new HashMap<>(); @Getter(AccessLevel.PACKAGE) - private final HashMap floorTraps = new HashMap<>(); + private final Map floorTraps = new HashMap<>(); @Getter(AccessLevel.PACKAGE) private boolean inLair; From 3e8c24c77389a0a18e1607b552eadc350a3fb0a4 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:27:56 +0200 Subject: [PATCH 356/472] tearsofguthix: Merge nested if statements --- .../plugins/tearsofguthix/TearsOfGuthixPlugin.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java index 69c55e9f2f..56740fdd0a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java @@ -125,13 +125,11 @@ public class TearsOfGuthixPlugin extends Plugin { DecorativeObject object = event.getDecorativeObject(); - if (object.getId() == ObjectID.BLUE_TEARS || - object.getId() == ObjectID.BLUE_TEARS_6665) + if ((object.getId() == ObjectID.BLUE_TEARS || + object.getId() == ObjectID.BLUE_TEARS_6665) && + client.getLocalPlayer().getWorldLocation().getRegionID() == TOG_REGION) { - if (client.getLocalPlayer().getWorldLocation().getRegionID() == TOG_REGION) - { - streams.put(event.getDecorativeObject(), Instant.now()); - } + streams.put(event.getDecorativeObject(), Instant.now()); } } From 2cdb4ef7ecb5c689895fb6f1f83dd065c825c471 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:28:41 +0200 Subject: [PATCH 357/472] theatre: Null check --- .../client/plugins/theatre/rooms/nylocas/NyloHandler.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java index 46dc3bf122..c56251e82f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java @@ -163,7 +163,11 @@ public class NyloHandler extends RoomHandler LocalPoint lp = LocalPoint.fromWorld(client, p.getX() + 1, p.getY() + 1); Color c = this.healthColorCode(health); - Point canvasPoint = Perspective.localToCanvas(client, lp, client.getPlane(), 65); + Point canvasPoint = null; + if (lp != null) + { + canvasPoint = Perspective.localToCanvas(client, lp, client.getPlane(), 65); + } renderTextLocation(graphics, healthStr, 13, Font.BOLD, c, canvasPoint); } } From 312f16752181e303580afbeb45c06bcae8c261d8 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:29:30 +0200 Subject: [PATCH 358/472] theatre: Remove explicit types --- .../client/plugins/theatre/rooms/nylocas/NyloHandler.java | 4 ++-- .../client/plugins/theatre/rooms/nylocas/NyloPredictor.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java index c56251e82f..d267776b63 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java @@ -34,8 +34,8 @@ public class NyloHandler extends RoomHandler public long startTime = 0L; int startTick = 0; - ArrayList waveSpawns = new ArrayList(); - ArrayList waveAgros = new ArrayList(); + ArrayList waveSpawns = new ArrayList<>(); + ArrayList waveAgros = new ArrayList<>(); @Getter(AccessLevel.PUBLIC) private Map pillars = new HashMap<>(); @Getter(AccessLevel.PUBLIC) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java index b0a9720e96..0aea4d2149 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java @@ -51,7 +51,7 @@ public class NyloPredictor int eastBound = 77; int southBound = 42; private NyloHandler handler; - private Map currentSpawns = new HashMap(); + private Map currentSpawns = new HashMap<>(); private int currentIndex = -1; NyloPredictor(Client client, NyloHandler handler) @@ -126,7 +126,7 @@ public class NyloPredictor Wave checkWave = NYLOCAS_WAVES[i]; List queue = new ArrayList<>(currentSpawns.keySet()); - HashMap npcs = new HashMap(); + HashMap npcs = new HashMap<>(); boolean found = true; for (Nylocas nylocas : checkWave.getSpawns()) From e70cefbb601818c2db3fb00c8073afbb09843631 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:29:47 +0200 Subject: [PATCH 359/472] theatre: Final fields --- .../client/plugins/theatre/rooms/MaidenHandler.java | 12 ++++++------ .../plugins/theatre/rooms/SotetsegHandler.java | 10 +++++----- .../plugins/theatre/rooms/nylocas/NyloHandler.java | 4 ++-- .../plugins/theatre/rooms/nylocas/NyloOverlay.java | 2 +- .../plugins/theatre/rooms/nylocas/NyloPredictor.java | 12 ++++++------ .../plugins/theatre/rooms/xarpus/XarpusCounter.java | 4 ++-- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java index d62bf8c8ea..62ffeb2e54 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java @@ -54,18 +54,18 @@ public class MaidenHandler extends RoomHandler ); private static final Color TRANSPARENT = new Color(0, 0, 0, 0); private static final Color FREEZE = new Color(0, 226, 255, 255); - private List bloodThrows = new ArrayList<>(); - private List bloodSpawns = new ArrayList<>(); + private final List bloodThrows = new ArrayList<>(); + private final List bloodSpawns = new ArrayList<>(); private List bloodSpawnLocation = new ArrayList<>(); - private List bloodSpawnTarget = new ArrayList<>(); + private final List bloodSpawnTarget = new ArrayList<>(); private NPC maiden; private String nyloCall; - private Set nylos = new HashSet<>(); - private List healers = new ArrayList<>(); + private final Set nylos = new HashSet<>(); + private final List healers = new ArrayList<>(); private int healerCount = 0; private int wave = 1; private long startTime = 0; - private ModelOutlineRenderer modelOutline; + private final ModelOutlineRenderer modelOutline; public MaidenHandler(final Client client, final TheatrePlugin plugin, final ModelOutlineRenderer modelOutline) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java index 6d0ccd8c03..d960fc8edc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java @@ -39,11 +39,11 @@ public class SotetsegHandler extends RoomHandler private int playerY; @Getter(AccessLevel.PUBLIC) private List redOverworld = new ArrayList<>(); - private List blackOverworld = new ArrayList<>(); - private List blackUnderworld = new ArrayList<>(); - private List redUnderworld = new ArrayList<>(); - private List gridPath = new ArrayList<>(); - private Map soteyProjectiles = new HashMap<>(); + private final List blackOverworld = new ArrayList<>(); + private final List blackUnderworld = new ArrayList<>(); + private final List redUnderworld = new ArrayList<>(); + private final List gridPath = new ArrayList<>(); + private final Map soteyProjectiles = new HashMap<>(); private NPC npc; public SotetsegHandler(final Client client, final TheatrePlugin plugin) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java index d267776b63..30868de7e8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java @@ -34,8 +34,8 @@ public class NyloHandler extends RoomHandler public long startTime = 0L; int startTick = 0; - ArrayList waveSpawns = new ArrayList<>(); - ArrayList waveAgros = new ArrayList<>(); + final ArrayList waveSpawns = new ArrayList<>(); + final ArrayList waveAgros = new ArrayList<>(); @Getter(AccessLevel.PUBLIC) private Map pillars = new HashMap<>(); @Getter(AccessLevel.PUBLIC) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java index e6cc1324eb..d7e2703b93 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java @@ -50,7 +50,7 @@ class NyloOverlay extends Overlay private final TheatrePlugin plugin; private final PanelComponent panelComponent = new PanelComponent(); - private NyloHandler nylohandler; + private final NyloHandler nylohandler; NyloOverlay(final Client client, final TheatrePlugin plugin, final NyloHandler nylohandler) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java index 0aea4d2149..3b3cee1db8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java @@ -46,12 +46,12 @@ public class NyloPredictor new Wave(new Nylocas(NylocasType.RANGE_260, Spawn.WEST), new Nylocas(NylocasType.MAGE_162, Spawn.SOUTH), new Nylocas(NylocasType.MELEE_162, Spawn.SOUTH), new Nylocas(NylocasType.MAGE_260, Spawn.EAST)), new Wave(new Nylocas(NylocasType.MELEE_162, Spawn.WEST), new Nylocas(NylocasType.RANGE_162, Spawn.WEST), new Nylocas(NylocasType.MAGE_162, Spawn.SOUTH), new Nylocas(NylocasType.MELEE_162, Spawn.SOUTH), new Nylocas(NylocasType.RANGE_162, Spawn.EAST), new Nylocas(NylocasType.MAGE_162, Spawn.EAST)) }; - public Client client; + public final Client client; int westBound = 50; int eastBound = 77; int southBound = 42; - private NyloHandler handler; - private Map currentSpawns = new HashMap<>(); + private final NyloHandler handler; + private final Map currentSpawns = new HashMap<>(); private int currentIndex = -1; NyloPredictor(Client client, NyloHandler handler) @@ -451,8 +451,8 @@ public class NyloPredictor public static class Nylocas { - private NylocasType type; - private Spawn spawn; + private final NylocasType type; + private final Spawn spawn; public Nylocas(NylocasType type, Spawn spawn) { @@ -486,7 +486,7 @@ public class NyloPredictor public static class Wave { - private Nylocas[] spawns; + private final Nylocas[] spawns; public Wave(Nylocas... nylocas) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java index 73772c40e6..630fba9c40 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java @@ -16,8 +16,8 @@ import net.runelite.client.ui.overlay.components.table.TableComponent; public class XarpusCounter extends Overlay { - private PanelComponent panelComponent = new PanelComponent(); - private XarpusHandler xarpusHandler; + private final PanelComponent panelComponent = new PanelComponent(); + private final XarpusHandler xarpusHandler; XarpusCounter(final TheatrePlugin plugin, final XarpusHandler xarpushandler) { From 422ed5ead6290fc62f0bc58cce1f639ac3ef6667 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:30:12 +0200 Subject: [PATCH 360/472] theatre: Access levels --- .../runelite/client/plugins/theatre/RoomHandler.java | 2 +- .../client/plugins/theatre/rooms/BloatHandler.java | 2 +- .../client/plugins/theatre/rooms/MaidenHandler.java | 2 +- .../plugins/theatre/rooms/SotetsegHandler.java | 2 +- .../client/plugins/theatre/rooms/VerzikHandler.java | 2 +- .../plugins/theatre/rooms/nylocas/NyloHandler.java | 2 +- .../plugins/theatre/rooms/nylocas/NyloPredictor.java | 12 ++++++------ .../plugins/theatre/rooms/xarpus/XarpusCounter.java | 2 +- .../plugins/theatre/rooms/xarpus/XarpusHandler.java | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/RoomHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/RoomHandler.java index 0112708098..5d007a342c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/RoomHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/RoomHandler.java @@ -22,7 +22,7 @@ public abstract class RoomHandler protected final Client client; protected final TheatrePlugin plugin; - public RoomHandler(final Client client, final TheatrePlugin plugin) + protected RoomHandler(final Client client, final TheatrePlugin plugin) { this.client = client; this.plugin = plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java index 9bf1aaca87..01c681c254 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java @@ -59,7 +59,7 @@ public class BloatHandler extends RoomHandler System.out.println("Stopping Bloat Room"); } - public void reset() + private void reset() { bloat = null; bloatFlag = false; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java index 62ffeb2e54..a41fadfbae 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java @@ -94,7 +94,7 @@ public class MaidenHandler extends RoomHandler log.debug("Stopping Maiden Room"); } - public void reset() + private void reset() { this.bloodThrows.clear(); this.bloodSpawns.clear(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java index d960fc8edc..2bd588bba6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java @@ -72,7 +72,7 @@ public class SotetsegHandler extends RoomHandler System.out.println("Stopping Sotetseg Room"); } - public void reset() + private void reset() { npc = null; soteyProjectiles.clear(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java index 9c311a236c..e268743d21 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java @@ -72,7 +72,7 @@ public class VerzikHandler extends RoomHandler System.out.println("Stopping Verzik Room"); } - public void reset() + private void reset() { this.redCrabsTimer = 13; this.Verzik_RangeProjectiles.clear(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java index 30868de7e8..f27c201c30 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java @@ -107,7 +107,7 @@ public class NyloHandler extends RoomHandler System.out.println("Stopping Nylocas Room"); } - public void reset() + private void reset() { this.pillars.clear(); this.spiders.clear(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java index 3b3cee1db8..07cf4b7b9f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java @@ -46,7 +46,7 @@ public class NyloPredictor new Wave(new Nylocas(NylocasType.RANGE_260, Spawn.WEST), new Nylocas(NylocasType.MAGE_162, Spawn.SOUTH), new Nylocas(NylocasType.MELEE_162, Spawn.SOUTH), new Nylocas(NylocasType.MAGE_260, Spawn.EAST)), new Wave(new Nylocas(NylocasType.MELEE_162, Spawn.WEST), new Nylocas(NylocasType.RANGE_162, Spawn.WEST), new Nylocas(NylocasType.MAGE_162, Spawn.SOUTH), new Nylocas(NylocasType.MELEE_162, Spawn.SOUTH), new Nylocas(NylocasType.RANGE_162, Spawn.EAST), new Nylocas(NylocasType.MAGE_162, Spawn.EAST)) }; - public final Client client; + private final Client client; int westBound = 50; int eastBound = 77; int southBound = 42; @@ -454,18 +454,18 @@ public class NyloPredictor private final NylocasType type; private final Spawn spawn; - public Nylocas(NylocasType type, Spawn spawn) + Nylocas(NylocasType type, Spawn spawn) { this.type = type; this.spawn = spawn; } - public NylocasType getType() + NylocasType getType() { return this.type; } - public Spawn getSpawn() + Spawn getSpawn() { return this.spawn; } @@ -488,12 +488,12 @@ public class NyloPredictor private final Nylocas[] spawns; - public Wave(Nylocas... nylocas) + Wave(Nylocas... nylocas) { this.spawns = nylocas; } - public Nylocas[] getSpawns() + Nylocas[] getSpawns() { return this.spawns; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java index 630fba9c40..f6ee089e31 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java @@ -14,7 +14,7 @@ import net.runelite.client.ui.overlay.components.TitleComponent; import net.runelite.client.ui.overlay.components.table.TableAlignment; import net.runelite.client.ui.overlay.components.table.TableComponent; -public class XarpusCounter extends Overlay +class XarpusCounter extends Overlay { private final PanelComponent panelComponent = new PanelComponent(); private final XarpusHandler xarpusHandler; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java index 94467d34f8..81797fb01d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java @@ -88,7 +88,7 @@ public class XarpusHandler extends RoomHandler System.out.println("Stopping Xarpus Room"); } - public void reset() + private void reset() { exhumesCount = 0; xarpusFlag = false; From c12232a4cb487179d6b05fe9197263c5e28f9919 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:30:40 +0200 Subject: [PATCH 361/472] theatre: Local fields --- .../plugins/theatre/rooms/nylocas/NyloHandler.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java index f27c201c30..6ae962952d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java @@ -45,9 +45,6 @@ public class NyloHandler extends RoomHandler private int wave = 0; private NyloOverlay overlay = null; private NyloPredictor predictor = null; - private Point south = new Point(64, 41); - private Point west = new Point(49, 56); - private Point east = new Point(78, 56); public NyloHandler(final Client client, final TheatrePlugin plugin) { @@ -401,9 +398,9 @@ public class NyloHandler extends RoomHandler int centerX = minX + 5; int centerY = minY + 5; - south = new Point(centerX + 1, centerY - 14); - east = new Point(centerX + 15, centerY); - west = new Point(centerX - 14, centerY); + Point south = new Point(centerX + 1, centerY - 14); + Point east = new Point(centerX + 15, centerY); + Point west = new Point(centerX - 14, centerY); if (this.predictor != null) { From d668d4113abc5df1be83804c3be286d6b10548c6 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:35:45 +0200 Subject: [PATCH 362/472] theatre: Use efficient entrySets --- .../plugins/theatre/rooms/nylocas/NyloHandler.java | 12 ++++++------ .../plugins/theatre/rooms/nylocas/NyloPredictor.java | 12 ++++++------ .../plugins/theatre/rooms/xarpus/XarpusHandler.java | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java index 6ae962952d..4c88656972 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java @@ -152,11 +152,11 @@ public class NyloHandler extends RoomHandler { if (plugin.isShowNyloPillarHealth()) { - for (NPC npc : pillars.keySet()) + for (Map.Entry pillars : pillars.entrySet()) { - final int health = pillars.get(npc); + final int health = pillars.getValue(); final String healthStr = health + "%"; - WorldPoint p = npc.getWorldLocation(); + WorldPoint p = pillars.getKey().getWorldLocation(); LocalPoint lp = LocalPoint.fromWorld(client, p.getX() + 1, p.getY() + 1); Color c = this.healthColorCode(health); @@ -172,15 +172,15 @@ public class NyloHandler extends RoomHandler switch (plugin.getShowNylocasExplosions()) { case TILE: - for (NPC npc : spiders.keySet()) + for (Map.Entry spiders : spiders.entrySet()) { - int ticksLeft = spiders.get(npc); + int ticksLeft = spiders.getValue(); if (ticksLeft > -1 && ticksLeft < 6) { Color color = new Color(255, 255, 0, 180); int outlineWidth = 2; int outlineAlpha = 150; - renderNpcOverlay(graphics, npc, color, outlineWidth, outlineAlpha, 15); + renderNpcOverlay(graphics, spiders.getKey(), color, outlineWidth, outlineAlpha, 15); } } break; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java index 07cf4b7b9f..e6700dd057 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java @@ -152,18 +152,18 @@ public class NyloPredictor handler.setWave(currentIndex); System.out.println("Nylocas Wave #" + currentIndex + " has spawned @ " + (this.client.getTickCount() - this.handler.startTick) + " | " + npcs.size() + " size."); - for (NPC npc : npcs.keySet()) + for (Map.Entry nylocas : npcs.entrySet()) { - Nylocas nylo = npcs.get(npc); + Nylocas nylo = nylocas.getValue(); - if (!this.handler.waveSpawns.contains(npc)) + if (!this.handler.waveSpawns.contains(nylocas.getKey())) { - this.handler.waveSpawns.add(npc); + this.handler.waveSpawns.add(nylocas.getKey()); } - if (this.isAgressive(nylo.getType(), nylo.getSpawn(), currentIndex) && !this.handler.waveAgros.contains(npc)) + if (this.isAgressive(nylo.getType(), nylo.getSpawn(), currentIndex) && !this.handler.waveAgros.contains(nylocas.getKey())) { - this.handler.waveAgros.add(npc); + this.handler.waveAgros.add(nylocas.getKey()); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java index 81797fb01d..777d28b691 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java @@ -134,9 +134,9 @@ public class XarpusHandler extends RoomHandler if (npc.getId() == NpcID.XARPUS_8339 && plugin.isShowXarpusHeals()) { - for (GroundObject o : exhumes.keySet()) + for (Map.Entry exhum : exhumes.entrySet()) { - Polygon poly = o.getCanvasTilePoly(); + Polygon poly = exhum.getKey().getCanvasTilePoly(); if (poly != null) { Color c = new Color(0, 255, 0, 130); @@ -144,8 +144,8 @@ public class XarpusHandler extends RoomHandler graphics.setStroke(new BasicStroke(1)); graphics.draw(poly); - String count = Integer.toString(exhumes.get(o) + 1); - LocalPoint lp = o.getLocalLocation(); + String count = Integer.toString(exhum.getValue() + 1); + LocalPoint lp = exhum.getKey().getLocalLocation(); Point point = Perspective.getCanvasTextLocation(client, graphics, lp, count, 0); if (point != null) { From 951c2d4050e53567c1368a66d165e58161de72a9 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:37:00 +0200 Subject: [PATCH 363/472] theatre: Use interface instead of type --- .../client/plugins/theatre/rooms/nylocas/NyloHandler.java | 5 +++-- .../net/runelite/client/plugins/theatre/timers/Timeable.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java index 4c88656972..82b1cc6401 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java @@ -8,6 +8,7 @@ import java.awt.Polygon; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.regex.Matcher; @@ -34,8 +35,8 @@ public class NyloHandler extends RoomHandler public long startTime = 0L; int startTick = 0; - final ArrayList waveSpawns = new ArrayList<>(); - final ArrayList waveAgros = new ArrayList<>(); + final List waveSpawns = new ArrayList<>(); + final List waveAgros = new ArrayList<>(); @Getter(AccessLevel.PUBLIC) private Map pillars = new HashMap<>(); @Getter(AccessLevel.PUBLIC) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/timers/Timeable.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/timers/Timeable.java index 04c5a1a6c5..250fdca506 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/timers/Timeable.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/timers/Timeable.java @@ -1,8 +1,8 @@ package net.runelite.client.plugins.theatre.timers; -import java.util.HashMap; +import java.util.Map; public interface Timeable { - HashMap getTimes(); + Map getTimes(); } \ No newline at end of file From 5a32de3039e7ef9c5ed73fb356d0794d09064a32 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:37:33 +0200 Subject: [PATCH 364/472] theatre: Remove unused local vars --- .../runelite/client/plugins/theatre/rooms/VerzikHandler.java | 2 -- .../client/plugins/theatre/rooms/nylocas/NyloHandler.java | 4 ---- 2 files changed, 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java index e268743d21..9ffa2e7b2a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java @@ -138,7 +138,6 @@ public class VerzikHandler extends RoomHandler { if (plugin.isP3attacks()) { - Model model = npc.getModel(); if (versikCounter > 0 && versikCounter < 8) { String str = Math.max(versikCounter, 0) + "";// + " | " + model.getModelHeight();// + " | " + model.getRadius(); @@ -408,7 +407,6 @@ public class VerzikHandler extends RoomHandler long minutes = seconds / 60L; seconds = seconds % 60; - int attackTick = this.client.getTickCount() - 4; this.versikCounter = -1; this.attacksLeft = 9; if (plugin.isExtraTimers()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java index 82b1cc6401..01928ac611 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java @@ -399,10 +399,6 @@ public class NyloHandler extends RoomHandler int centerX = minX + 5; int centerY = minY + 5; - Point south = new Point(centerX + 1, centerY - 14); - Point east = new Point(centerX + 15, centerY); - Point west = new Point(centerX - 14, centerY); - if (this.predictor != null) { this.predictor.southBound = centerY - 12; From 92594308948a85d57e976de3adf3c1c41129b105 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:40:59 +0200 Subject: [PATCH 365/472] theatre: MErge nested if statements --- .../plugins/theatre/rooms/BloatHandler.java | 9 +- .../plugins/theatre/rooms/MaidenHandler.java | 7 +- .../plugins/theatre/rooms/VerzikHandler.java | 85 +++++++------------ .../theatre/rooms/nylocas/NyloHandler.java | 32 +++---- .../theatre/rooms/xarpus/XarpusHandler.java | 51 ++++++----- 5 files changed, 75 insertions(+), 109 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java index 01c681c254..843321c897 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java @@ -134,13 +134,10 @@ public class BloatHandler extends RoomHandler @Subscribe public void onVarbitChanged(VarbitChanged event) { - if (client.getVar(Varbits.BLOAT_DOOR) == 1) + if (client.getVar(Varbits.BLOAT_DOOR) == 1 && !bloatFlag) { - if (!bloatFlag) - { - bloatTimer = 0; - bloatFlag = true; - } + bloatTimer = 0; + bloatFlag = true; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java index a41fadfbae..af76b8c921 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java @@ -240,12 +240,9 @@ public class MaidenHandler extends RoomHandler { NPC npc = event.getNpc(); - if (npc.getName() != null && npc.getName().equals("Nylocas Matomenos")) + if (npc.getName() != null && npc.getName().equals("Nylocas Matomenos") && npc.getId() == -1) { - if (npc.getId() == -1) - { - nylos.removeIf(c -> c.getNpc() == npc); - } + nylos.removeIf(c -> c.getNpc() == npc); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java index 9ffa2e7b2a..597887591e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java @@ -105,78 +105,60 @@ public class VerzikHandler extends RoomHandler if (id == TheatreConstant.VERZIK_ID_P1) { - if (plugin.isP1attacks()) + if (plugin.isP1attacks() && this.versikCounter >= 0) { - if (this.versikCounter >= 0) - { - String str = Integer.toString(versikCounter); + String str = Integer.toString(versikCounter); - LocalPoint lp = npc.getLocalLocation(); - Point point = Perspective.getCanvasTextLocation(client, graphics, lp, str, 0); + LocalPoint lp = npc.getLocalLocation(); + Point point = Perspective.getCanvasTextLocation(client, graphics, lp, str, 0); - renderTextLocation(graphics, str, 20, Font.BOLD, Color.CYAN, point); - } + renderTextLocation(graphics, str, 20, Font.BOLD, Color.CYAN, point); } } else if (id == TheatreConstant.VERZIK_ID_P2) { - if (plugin.isP2attacks()) + if (plugin.isP2attacks() && this.versikCounter >= 0) { - if (this.versikCounter >= 0) - { - String str = Integer.toString(versikCounter); + String str = Integer.toString(versikCounter); - LocalPoint lp = npc.getLocalLocation(); - Point point = Perspective.getCanvasTextLocation(client, graphics, lp, str, 0); + LocalPoint lp = npc.getLocalLocation(); + Point point = Perspective.getCanvasTextLocation(client, graphics, lp, str, 0); - renderTextLocation(graphics, str, 20, Font.BOLD, Color.CYAN, point); - } + renderTextLocation(graphics, str, 20, Font.BOLD, Color.CYAN, point); } } - else if (id == TheatreConstant.VERZIK_ID_P3) + else if (id == TheatreConstant.VERZIK_ID_P3 && plugin.isP3attacks() && versikCounter > 0 && versikCounter < 8) { - if (plugin.isP3attacks()) - { - if (versikCounter > 0 && versikCounter < 8) - { - String str = Math.max(versikCounter, 0) + "";// + " | " + model.getModelHeight();// + " | " + model.getRadius(); + String str = Math.max(versikCounter, 0) + "";// + " | " + model.getModelHeight();// + " | " + model.getRadius(); - LocalPoint lp = npc.getLocalLocation(); - Point point = Perspective.getCanvasTextLocation(client, graphics, lp, str, 0); + LocalPoint lp = npc.getLocalLocation(); + Point point = Perspective.getCanvasTextLocation(client, graphics, lp, str, 0); - renderTextLocation(graphics, str, 15, Font.BOLD, Color.WHITE, point); - } - } + renderTextLocation(graphics, str, 15, Font.BOLD, Color.WHITE, point); } } - if (plugin.isVerzikTankTile()) + if (plugin.isVerzikTankTile() && id == TheatreConstant.VERZIK_ID_P3) { - if (id == TheatreConstant.VERZIK_ID_P3) - { - WorldPoint wp = new WorldPoint(npc.getWorldLocation().getX() + 3, npc.getWorldLocation().getY() + 3, client.getPlane()); - drawTile2(graphics, wp, new Color(75, 0, 130), 2, 255, 0); - //renderNpcOverlay(graphics, boss, new Color(75, 0, 130), 1, 255, 0); - } - + WorldPoint wp = new WorldPoint(npc.getWorldLocation().getX() + 3, npc.getWorldLocation().getY() + 3, client.getPlane()); + drawTile2(graphics, wp, new Color(75, 0, 130), 2, 255, 0); + //renderNpcOverlay(graphics, boss, new Color(75, 0, 130), 1, 255, 0); } - if (plugin.isShowVerzikYellows()) - { - if (this.yellows > 0) - { - String text = Integer.toString(this.yellows); - for (GraphicsObject object : client.getGraphicsObjects()) + if (plugin.isShowVerzikYellows() && this.yellows > 0) + { + String text = Integer.toString(this.yellows); + + for (GraphicsObject object : client.getGraphicsObjects()) + { + if (object.getId() == TheatreConstant.GRAPHIC_ID_YELLOWS) { - if (object.getId() == TheatreConstant.GRAPHIC_ID_YELLOWS) - { - drawTile(graphics, WorldPoint.fromLocal(client, object.getLocation()), Color.YELLOW, 3, 255, 0); - LocalPoint lp = object.getLocation(); - Point point = Perspective.getCanvasTextLocation(client, graphics, lp, text, 0); - renderTextLocation(graphics, text, 12, Font.BOLD, Color.WHITE, point); - } + drawTile(graphics, WorldPoint.fromLocal(client, object.getLocation()), Color.YELLOW, 3, 255, 0); + LocalPoint lp = object.getLocation(); + Point point = Perspective.getCanvasTextLocation(client, graphics, lp, text, 0); + renderTextLocation(graphics, text, 12, Font.BOLD, Color.WHITE, point); } } } @@ -336,12 +318,9 @@ public class VerzikHandler extends RoomHandler this.yellows--; } - if (npc != null) + if (npc != null && npc.getAnimation() == 8117) { - if (npc.getAnimation() == 8117) - { - redCrabsTimer = redCrabsTimer - 1; - } + redCrabsTimer = redCrabsTimer - 1; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java index 01928ac611..3e8b5c1485 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java @@ -95,12 +95,9 @@ public class NyloHandler extends RoomHandler long minutes = seconds / 60L; seconds = seconds % 60; - if (this.startTime != 0) + if (this.startTime != 0 && plugin.isExtraTimers()) { - if (plugin.isExtraTimers()) - { - this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'The Nylocas - Waves' completed! Duration: " + minutes + ":" + twoDigitString(seconds), null); - } + this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'The Nylocas - Waves' completed! Duration: " + minutes + ":" + twoDigitString(seconds), null); } System.out.println("Stopping Nylocas Room"); } @@ -267,26 +264,23 @@ public class NyloHandler extends RoomHandler this.pillars.put(npc, 100); this.recalculateLocal(); } - else if (npc.getName() != null) + else if (npc.getName() != null && this.plugin.getRoom() == TheatreRoom.NYLOCAS) { - if (this.plugin.getRoom() == TheatreRoom.NYLOCAS) + Pattern p = Pattern.compile("Nylocas (Hagios|Toxobolos|Ischyros)"); + Matcher m = p.matcher(npc.getName()); + if (m.matches()) { - Pattern p = Pattern.compile("Nylocas (Hagios|Toxobolos|Ischyros)"); - Matcher m = p.matcher(npc.getName()); - if (m.matches()) - { - this.spiders.put(npc, 52); + this.spiders.put(npc, 52); - if (this.predictor != null) - { - this.predictor.onNpcSpawned(event); - } - } - else if (npc.getName().equals("Nylocas Vasilias")) + if (this.predictor != null) { - this.onStop(); + this.predictor.onNpcSpawned(event); } } + else if (npc.getName().equals("Nylocas Vasilias")) + { + this.onStop(); + } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java index 777d28b691..4583d05a3a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java @@ -158,35 +158,34 @@ public class XarpusHandler extends RoomHandler public void onVarbitChanged(VarbitChanged event) { - if (client.getVar(Varbits.MULTICOMBAT_AREA) == 1 || client.getVarbitValue(client.getVarps(), TheatreConstant.DOOR_VARP) == 2) + if ((client.getVar(Varbits.MULTICOMBAT_AREA) == 1 || + client.getVarbitValue(client.getVarps(), TheatreConstant.DOOR_VARP) == 2) && + !xarpusFlag) { - if (!xarpusFlag) + int players = client.getPlayers().size(); + + if (players == 5) { - int players = client.getPlayers().size(); - - if (players == 5) - { - exhumesCount = 18; - } - else if (players == 4) - { - exhumesCount = 15; - } - else if (players == 3) - { - exhumesCount = 12; - } - else if (players == 2) - { - exhumesCount = 9; - } - else - { - exhumesCount = 7; - } - - xarpusFlag = true; + exhumesCount = 18; } + else if (players == 4) + { + exhumesCount = 15; + } + else if (players == 3) + { + exhumesCount = 12; + } + else if (players == 2) + { + exhumesCount = 9; + } + else + { + exhumesCount = 7; + } + + xarpusFlag = true; } } From 1e7401a6dda4e0389c453a79811ad0f60eb89b45 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:41:47 +0200 Subject: [PATCH 366/472] theatre: Remove debugging --- .../runelite/client/plugins/theatre/rooms/BloatHandler.java | 2 -- .../client/plugins/theatre/rooms/SotetsegHandler.java | 2 -- .../runelite/client/plugins/theatre/rooms/VerzikHandler.java | 3 --- .../client/plugins/theatre/rooms/nylocas/NyloHandler.java | 2 -- .../client/plugins/theatre/rooms/nylocas/NyloPredictor.java | 4 ---- .../client/plugins/theatre/rooms/xarpus/XarpusHandler.java | 4 ---- 6 files changed, 17 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java index 843321c897..f7c262c853 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java @@ -48,7 +48,6 @@ public class BloatHandler extends RoomHandler this.reset(); this.plugin.setRoom(TheatreRoom.BLOAT); - System.out.println("Starting Bloat Room"); } @Override @@ -56,7 +55,6 @@ public class BloatHandler extends RoomHandler { this.reset(); this.plugin.setRoom(TheatreRoom.UNKNOWN); - System.out.println("Stopping Bloat Room"); } private void reset() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java index 2bd588bba6..ae6aabfcf3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java @@ -61,7 +61,6 @@ public class SotetsegHandler extends RoomHandler this.reset(); this.plugin.setRoom(TheatreRoom.SOTETSEG); - System.out.println("Starting Sotetseg Room"); } @Override @@ -69,7 +68,6 @@ public class SotetsegHandler extends RoomHandler { this.reset(); this.plugin.setRoom(TheatreRoom.UNKNOWN); - System.out.println("Stopping Sotetseg Room"); } private void reset() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java index 597887591e..71e26b585b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java @@ -61,7 +61,6 @@ public class VerzikHandler extends RoomHandler this.reset(); this.plugin.setRoom(TheatreRoom.VERSIK); - System.out.println("Starting Verzik Room"); } @Override @@ -69,7 +68,6 @@ public class VerzikHandler extends RoomHandler { this.reset(); this.plugin.setRoom(TheatreRoom.UNKNOWN); - System.out.println("Stopping Verzik Room"); } private void reset() @@ -307,7 +305,6 @@ public class VerzikHandler extends RoomHandler { this.yellows = 14; // this.versikCounter = 22; - System.out.println("Yellows have spawned."); break; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java index 3e8b5c1485..e16ba749e9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java @@ -69,7 +69,6 @@ public class NyloHandler extends RoomHandler plugin.getOverlayManager().add(overlay); } - System.out.println("Starting Nylocas Room"); this.startTime = System.currentTimeMillis(); this.startTick = this.client.getTickCount(); } @@ -99,7 +98,6 @@ public class NyloHandler extends RoomHandler { this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'The Nylocas - Waves' completed! Duration: " + minutes + ":" + twoDigitString(seconds), null); } - System.out.println("Stopping Nylocas Room"); } private void reset() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java index e6700dd057..40226ac167 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java @@ -108,8 +108,6 @@ public class NyloPredictor type = NylocasType.valueOf("MELEE_" + level); } - System.out.println(npc.getName() + " | " + npc.getCombatLevel() + " | (" + lp.getSceneX() + ", " + lp.getSceneY() + ") | (" + westBound + ", " + eastBound + ", " + southBound + ") | " + type + " | " + spawn); - if (spawn == null || type == null) { return; @@ -150,7 +148,6 @@ public class NyloPredictor currentSpawns.clear(); handler.setWave(currentIndex); - System.out.println("Nylocas Wave #" + currentIndex + " has spawned @ " + (this.client.getTickCount() - this.handler.startTick) + " | " + npcs.size() + " size."); for (Map.Entry nylocas : npcs.entrySet()) { @@ -220,7 +217,6 @@ public class NyloPredictor } } - System.out.printf("%d\t%d\t%d\t%d\t%d\t%d\t%d\n", elapsedTicks, mage_count, mage_level, range_count, range_level, melee_count, melee_level); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java index 4583d05a3a..36c7cf918e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java @@ -69,8 +69,6 @@ public class XarpusHandler extends RoomHandler overlay = new XarpusCounter(plugin, this); plugin.getOverlayManager().add(overlay); } - - System.out.println("Starting Xarpus Room"); } @Override @@ -84,8 +82,6 @@ public class XarpusHandler extends RoomHandler plugin.getOverlayManager().remove(overlay); overlay = null; } - - System.out.println("Stopping Xarpus Room"); } private void reset() From 3a9d42babf292ff7124413b75c3a5d2141e68093 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:42:41 +0200 Subject: [PATCH 367/472] ticktimers: Final fields --- .../net/runelite/client/plugins/ticktimers/NPCContainer.java | 2 +- .../net/runelite/client/plugins/ticktimers/TimersOverlay.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/NPCContainer.java b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/NPCContainer.java index f7a5b6ae42..d0a1328c88 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/NPCContainer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/NPCContainer.java @@ -110,7 +110,7 @@ class NPCContainer DAGANNOTH_SUPREME(NpcID.DAGANNOTH_SUPREME, AttackStyle.RANGE, ImmutableSet.of(AnimationID.DAG_SUPREME)), DAGANNOTH_PRIME(NpcID.DAGANNOTH_PRIME, AttackStyle.MAGE, ImmutableSet.of(AnimationID.DAG_PRIME)); - private static ImmutableMap idMap; + private static final ImmutableMap idMap; static { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TimersOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TimersOverlay.java index 1b07158e7d..2063625a2c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TimersOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TimersOverlay.java @@ -45,8 +45,8 @@ import net.runelite.client.ui.overlay.OverlayUtil; @Singleton public class TimersOverlay extends Overlay { - private TickTimersPlugin plugin; - private Client client; + private final TickTimersPlugin plugin; + private final Client client; @Inject TimersOverlay(final TickTimersPlugin plugin, final Client client) From 99ea565d0a92a4fe2a43810a375cb3f40685e17c Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:43:16 +0200 Subject: [PATCH 368/472] ticktimers: Merge nested if statement --- .../client/plugins/ticktimers/TickTimersPlugin.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java index 25e09e077c..b801e83a40 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java @@ -239,12 +239,9 @@ public class TickTimersPlugin extends Plugin for (int anims : npcs.getAnimations()) { - if (anims == npcs.getNpc().getAnimation()) + if (anims == npcs.getNpc().getAnimation() && npcs.getTicksUntilAttack() < 1) { - if (npcs.getTicksUntilAttack() < 1) - { - npcs.setTicksUntilAttack(npcs.getAttackSpeed()); - } + npcs.setTicksUntilAttack(npcs.getAttackSpeed()); } } } From eeeafb93b7f56756de9fc4a7b92b78a46e858d07 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sun, 7 Jul 2019 06:24:17 +0200 Subject: [PATCH 369/472] Rename AbstractIndexCache to be more accurate --- ...Mixin.java => RSAbstractArchiveMixin.java} | 14 +- .../net/runelite/mixins/RSClientMixin.java | 4 +- .../java/net/runelite/mixins/SpriteMixin.java | 6 +- ...IndexCache.java => RSAbstractArchive.java} | 4 +- .../api/{RSIndexCache.java => RSArchive.java} | 2 +- .../java/net/runelite/rs/api/RSClient.java | 8 +- ...ctIndexCache.java => AbstractArchive.java} | 404 +++++++++--------- .../main/java/AbstractByteArrayCopier.java | 4 +- .../src/main/java/AbstractUserComparator.java | 2 +- .../src/main/java/AbstractWorldMapIcon.java | 2 +- runescape-client/src/main/java/Actor.java | 8 +- .../java/{IndexCache.java => Archive.java} | 63 +-- .../src/main/java/BufferedSource.java | 2 +- .../src/main/java/ByteArrayPool.java | 2 +- runescape-client/src/main/java/Canvas.java | 6 +- runescape-client/src/main/java/Client.java | 49 +-- .../src/main/java/DynamicObject.java | 8 +- .../src/main/java/EnumDefinition.java | 2 +- .../src/main/java/FloorDecoration.java | 34 +- runescape-client/src/main/java/FontName.java | 2 +- runescape-client/src/main/java/Fonts.java | 14 +- .../src/main/java/Formatting.java | 2 +- runescape-client/src/main/java/Frames.java | 8 +- runescape-client/src/main/java/GameShell.java | 4 +- .../src/main/java/GrandExchangeEvent.java | 2 +- .../src/main/java/GroundItemPile.java | 4 +- .../src/main/java/GzipDecompressor.java | 2 +- .../src/main/java/HealthBarDefinition.java | 4 +- .../src/main/java/HitSplatDefinition.java | 6 +- .../src/main/java/IndexCacheLoader.java | 18 +- .../src/main/java/IndexStoreAction.java | 2 +- .../src/main/java/Interpreter.java | 2 +- .../src/main/java/InvDefinition.java | 5 +- .../src/main/java/IsaacCipher.java | 2 +- .../src/main/java/ItemContainer.java | 10 +- .../src/main/java/ItemDefinition.java | 16 +- .../src/main/java/KitDefinition.java | 8 +- runescape-client/src/main/java/Login.java | 8 +- .../src/main/java/LoginScreenAnimation.java | 2 +- .../src/main/java/MenuAction.java | 6 +- runescape-client/src/main/java/Message.java | 2 +- .../src/main/java/MidiPcmStream.java | 2 +- runescape-client/src/main/java/ModelData.java | 4 +- .../src/main/java/MusicSample.java | 10 +- .../src/main/java/MusicTrack.java | 4 +- runescape-client/src/main/java/NPC.java | 2 +- .../src/main/java/NPCDefinition.java | 10 +- runescape-client/src/main/java/NetCache.java | 4 +- .../src/main/java/NetFileRequest.java | 2 +- runescape-client/src/main/java/NetSocket.java | 2 +- .../src/main/java/ObjectDefinition.java | 14 +- .../src/main/java/ObjectSound.java | 2 +- runescape-client/src/main/java/Occluder.java | 2 +- .../src/main/java/OverlayDefinition.java | 2 +- .../src/main/java/PacketBuffer.java | 2 +- .../src/main/java/ParamKeyDefinition.java | 2 +- runescape-client/src/main/java/Player.java | 2 +- .../src/main/java/RectangleMode.java | 2 +- .../src/main/java/RouteStrategy.java | 4 +- .../src/main/java/SecureRandomCallable.java | 2 +- .../src/main/java/SecureRandomFuture.java | 2 +- .../src/main/java/SequenceDefinition.java | 6 +- runescape-client/src/main/java/Skeleton.java | 2 +- runescape-client/src/main/java/Skills.java | 2 +- .../src/main/java/SoundCache.java | 6 +- .../src/main/java/SoundEffect.java | 4 +- .../src/main/java/SoundSystem.java | 2 +- .../main/java/SpotAnimationDefinition.java | 4 +- runescape-client/src/main/java/SpriteIds.java | 8 +- .../src/main/java/SpriteMask.java | 4 +- runescape-client/src/main/java/Strings.java | 6 +- .../src/main/java/StructDefinition.java | 4 +- .../src/main/java/StudioGame.java | 2 +- runescape-client/src/main/java/Texture.java | 4 +- .../src/main/java/TextureProvider.java | 6 +- .../src/main/java/UnderlayDefinition.java | 2 +- .../src/main/java/UnitPriceComparator.java | 2 +- .../src/main/java/UserComparator3.java | 2 +- .../src/main/java/VarbitDefinition.java | 2 +- runescape-client/src/main/java/VarcInt.java | 2 +- runescape-client/src/main/java/Varcs.java | 2 +- .../src/main/java/VarpDefinition.java | 2 +- runescape-client/src/main/java/Varps.java | 2 +- runescape-client/src/main/java/Widget.java | 4 +- .../src/main/java/WidgetGroupParent.java | 4 +- runescape-client/src/main/java/WorldMap.java | 18 +- .../src/main/java/WorldMapAreaData.java | 2 +- .../src/main/java/WorldMapDecoration.java | 4 +- .../src/main/java/WorldMapDecorationType.java | 6 +- .../src/main/java/WorldMapElement.java | 2 +- .../src/main/java/WorldMapIcon1.java | 2 +- .../main/java/WorldMapIndexCacheLoader.java | 10 +- .../src/main/java/WorldMapLabelSize.java | 2 +- .../src/main/java/WorldMapManager.java | 18 +- .../src/main/java/WorldMapRegion.java | 12 +- .../src/main/java/WorldMapSection1.java | 4 +- .../src/main/java/WorldMapSection3.java | 2 +- runescape-client/src/main/java/class1.java | 2 +- runescape-client/src/main/java/class13.java | 4 +- runescape-client/src/main/java/class16.java | 2 +- runescape-client/src/main/java/class171.java | 102 ++--- runescape-client/src/main/java/class2.java | 20 +- runescape-client/src/main/java/class204.java | 6 +- runescape-client/src/main/java/class21.java | 4 +- runescape-client/src/main/java/class211.java | 4 +- runescape-client/src/main/java/class214.java | 6 +- runescape-client/src/main/java/class22.java | 6 +- runescape-client/src/main/java/class229.java | 2 +- runescape-client/src/main/java/class238.java | 2 +- runescape-client/src/main/java/class27.java | 2 +- runescape-client/src/main/java/class30.java | 4 +- runescape-client/src/main/java/class322.java | 2 +- runescape-client/src/main/java/class4.java | 2 +- runescape-client/src/main/java/class40.java | 2 +- runescape-client/src/main/java/class50.java | 12 +- runescape-client/src/main/java/class54.java | 2 +- runescape-client/src/main/java/class60.java | 2 +- runescape-client/src/main/java/class83.java | 2 +- 118 files changed, 594 insertions(+), 591 deletions(-) rename runelite-mixins/src/main/java/net/runelite/mixins/{RSAbstractIndexCacheMixin.java => RSAbstractArchiveMixin.java} (89%) rename runescape-api/src/main/java/net/runelite/rs/api/{RSAbstractIndexCache.java => RSAbstractArchive.java} (65%) rename runescape-api/src/main/java/net/runelite/rs/api/{RSIndexCache.java => RSArchive.java} (64%) rename runescape-client/src/main/java/{AbstractIndexCache.java => AbstractArchive.java} (56%) rename runescape-client/src/main/java/{IndexCache.java => Archive.java} (88%) diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractIndexCacheMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractArchiveMixin.java similarity index 89% rename from runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractIndexCacheMixin.java rename to runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractArchiveMixin.java index 444be65691..5b83be84c9 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractIndexCacheMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractArchiveMixin.java @@ -15,12 +15,12 @@ import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Replace; import net.runelite.api.mixins.Shadow; import org.slf4j.Logger; -import net.runelite.rs.api.RSAbstractIndexCache; +import net.runelite.rs.api.RSAbstractArchive; import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSIndexCache; +import net.runelite.rs.api.RSArchive; -@Mixin(RSAbstractIndexCache.class) -public abstract class RSAbstractIndexCacheMixin implements RSAbstractIndexCache +@Mixin(RSAbstractArchive.class) +public abstract class RSAbstractArchiveMixin implements RSAbstractArchive { @Shadow("client") private static RSClient client; @@ -35,14 +35,14 @@ public abstract class RSAbstractIndexCacheMixin implements RSAbstractIndexCache return overlayOutdated; } - @Copy("takeRecord") + @Copy("takeFile") abstract byte[] rs$getConfigData(int archiveId, int fileId); - @Replace("takeRecord") + @Replace("takeFile") public byte[] rl$getConfigData(int archiveId, int fileId) { byte[] rsData = rs$getConfigData(archiveId, fileId); - RSIndexCache indexData = (RSIndexCache) this; + RSArchive indexData = (RSArchive) this; if (!OverlayIndex.hasOverlay(indexData.getIndex(), archiveId)) { diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index 782f01915b..6923447978 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -112,7 +112,7 @@ import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Replace; import net.runelite.api.mixins.Shadow; import org.slf4j.Logger; -import net.runelite.rs.api.RSAbstractIndexCache; +import net.runelite.rs.api.RSAbstractArchive; import net.runelite.rs.api.RSChatChannel; import net.runelite.rs.api.RSClanChat; import net.runelite.rs.api.RSClient; @@ -1464,7 +1464,7 @@ public abstract class RSClientMixin implements RSClient @Override public RSSprite[] getSprites(IndexDataBase source, int archiveId, int fileId) { - RSAbstractIndexCache rsSource = (RSAbstractIndexCache) source; + RSAbstractArchive rsSource = (RSAbstractArchive) source; byte[] configData = rsSource.getConfigData(archiveId, fileId); if (configData == null) { diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java index 6bb2f91a8b..b08827b18a 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java @@ -7,7 +7,7 @@ import net.runelite.api.mixins.Copy; import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Replace; -import net.runelite.rs.api.RSAbstractIndexCache; +import net.runelite.rs.api.RSAbstractArchive; import net.runelite.rs.api.RSClient; import net.runelite.rs.api.RSSprite; @@ -35,13 +35,13 @@ public abstract class SpriteMixin implements RSClient } @Copy("readSprite") - public static RSSprite rs$loadSprite(RSAbstractIndexCache var0, int var1, int var2) + public static RSSprite rs$loadSprite(RSAbstractArchive var0, int var1, int var2) { throw new RuntimeException(); } @Replace("readSprite") - public static RSSprite rl$loadSprite(RSAbstractIndexCache var0, int var1, int var2) + public static RSSprite rl$loadSprite(RSAbstractArchive var0, int var1, int var2) { Sprite sprite = spriteOverrides.get(var1); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractIndexCache.java b/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java similarity index 65% rename from runescape-api/src/main/java/net/runelite/rs/api/RSAbstractIndexCache.java rename to runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java index f561f1e562..052bc4ee74 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractIndexCache.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java @@ -3,8 +3,8 @@ package net.runelite.rs.api; import net.runelite.api.IndexDataBase; import net.runelite.mapping.Import; -public interface RSAbstractIndexCache extends IndexDataBase +public interface RSAbstractArchive extends IndexDataBase { - @Import("takeRecord") + @Import("takeFile") byte[] getConfigData(int archiveId, int fileId); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIndexCache.java b/runescape-api/src/main/java/net/runelite/rs/api/RSArchive.java similarity index 64% rename from runescape-api/src/main/java/net/runelite/rs/api/RSIndexCache.java rename to runescape-api/src/main/java/net/runelite/rs/api/RSArchive.java index bf68b6cba4..25f1cb2cef 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSIndexCache.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSArchive.java @@ -2,7 +2,7 @@ package net.runelite.rs.api; import net.runelite.mapping.Import; -public interface RSIndexCache extends RSAbstractIndexCache +public interface RSArchive extends RSAbstractArchive { @Import("index") int getIndex(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index a17b549563..df17fc3b39 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java @@ -443,11 +443,11 @@ public interface RSClient extends RSGameShell, Client @Import("indexCache8") @Override - RSAbstractIndexCache getIndexSprites(); + RSAbstractArchive getIndexSprites(); @Import("indexCache12") @Override - RSAbstractIndexCache getIndexScripts(); + RSAbstractArchive getIndexScripts(); @Import("widgetClickMasks") @Override @@ -1015,7 +1015,7 @@ public interface RSClient extends RSGameShell, Client boolean isSpellSelected(); @Import("readSoundEffect") - RSSoundEffect getTrack(RSAbstractIndexCache indexData, int id, int var0); + RSSoundEffect getTrack(RSAbstractArchive indexData, int id, int var0); @Import("createRawPcmStream") RSRawPcmStream createRawPcmStream(RSRawSound audioNode, int var0, int volume); @@ -1024,7 +1024,7 @@ public interface RSClient extends RSGameShell, Client RSPcmStreamMixer getSoundEffectAudioQueue(); @Import("indexCache4") - RSAbstractIndexCache getIndexCache4(); + RSAbstractArchive getIndexCache4(); @Import("decimator") RSDecimator getSoundEffectResampler(); diff --git a/runescape-client/src/main/java/AbstractIndexCache.java b/runescape-client/src/main/java/AbstractArchive.java similarity index 56% rename from runescape-client/src/main/java/AbstractIndexCache.java rename to runescape-client/src/main/java/AbstractArchive.java index 8ba4da29ff..2d7243c121 100644 --- a/runescape-client/src/main/java/AbstractIndexCache.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -6,8 +6,8 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ir") -@Implements("AbstractIndexCache") -public abstract class AbstractIndexCache { +@Implements("AbstractArchive") +public abstract class AbstractArchive { @ObfuscatedName("qb") @ObfuscatedSignature( signature = "Lco;" @@ -38,52 +38,52 @@ public abstract class AbstractIndexCache { signature = "Lit;" ) @Export("indexCache0") - static IndexCache indexCache0; + static Archive indexCache0; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1694798923 ) - @Export("archiveCount") - int archiveCount; + @Export("groupCount") + int groupCount; @ObfuscatedName("q") - @Export("archiveIds") - int[] archiveIds; + @Export("groupIds") + int[] groupIds; @ObfuscatedName("w") - @Export("archiveNameHashes") - int[] archiveNameHashes; + @Export("groupNameHashes") + int[] groupNameHashes; @ObfuscatedName("o") @ObfuscatedSignature( signature = "Llv;" ) - @Export("archiveNameHashTable") - IntHashTable archiveNameHashTable; + @Export("groupNameHashTable") + IntHashTable groupNameHashTable; @ObfuscatedName("u") - @Export("archiveCrcs") - int[] archiveCrcs; + @Export("groupCrcs") + int[] groupCrcs; @ObfuscatedName("g") - @Export("archiveVersions") - int[] archiveVersions; + @Export("groupVersions") + int[] groupVersions; @ObfuscatedName("l") - @Export("recordCounts") - int[] recordCounts; + @Export("fileCounts") + int[] fileCounts; @ObfuscatedName("e") - @Export("recordIds") - int[][] recordIds; + @Export("fileIds") + int[][] fileIds; @ObfuscatedName("x") - @Export("recordNameHashes") - int[][] recordNameHashes; + @Export("fileNameHashes") + int[][] fileNameHashes; @ObfuscatedName("d") @ObfuscatedSignature( signature = "[Llv;" ) - @Export("recordNameHashTables") - IntHashTable[] recordNameHashTables; + @Export("fileNameHashTables") + IntHashTable[] fileNameHashTables; @ObfuscatedName("k") - @Export("archives") - Object[] archives; + @Export("groups") + Object[] groups; @ObfuscatedName("n") - @Export("records") - Object[][] records; + @Export("files") + Object[][] files; @ObfuscatedName("a") @ObfuscatedGetter( intValue = -530370811 @@ -91,15 +91,15 @@ public abstract class AbstractIndexCache { @Export("hash") public int hash; @ObfuscatedName("z") - @Export("releaseArchives") - boolean releaseArchives; + @Export("releaseGroups") + boolean releaseGroups; @ObfuscatedName("j") - @Export("shallowRecords") - boolean shallowRecords; + @Export("shallowFiles") + boolean shallowFiles; - AbstractIndexCache(boolean var1, boolean var2) { - this.releaseArchives = var1; - this.shallowRecords = var2; + AbstractArchive(boolean var1, boolean var2) { + this.releaseGroups = var1; + this.shallowFiles = var2; } @ObfuscatedName("m") @@ -107,8 +107,8 @@ public abstract class AbstractIndexCache { signature = "([BB)V", garbageValue = "0" ) - @Export("setIndexReference") - void setIndexReference(byte[] var1) { + @Export("decodeIndex") + void decodeIndex(byte[] var1) { this.hash = WallDecoration.method3257(var1, var1.length); Buffer var2 = new Buffer(Strings.decompressBytes(var1)); int var3 = var2.readUnsignedByte(); @@ -119,57 +119,57 @@ public abstract class AbstractIndexCache { int var4 = var2.readUnsignedByte(); if (var3 >= 7) { - this.archiveCount = var2.method50(); + this.groupCount = var2.method50(); } else { - this.archiveCount = var2.readUnsignedShort(); + this.groupCount = var2.readUnsignedShort(); } int var5 = 0; int var6 = -1; - this.archiveIds = new int[this.archiveCount]; + this.groupIds = new int[this.groupCount]; int var7; if (var3 >= 7) { - for (var7 = 0; var7 < this.archiveCount; ++var7) { - this.archiveIds[var7] = var5 += var2.method50(); - if (this.archiveIds[var7] > var6) { - var6 = this.archiveIds[var7]; + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.groupIds[var7] = var5 += var2.method50(); + if (this.groupIds[var7] > var6) { + var6 = this.groupIds[var7]; } } } else { - for (var7 = 0; var7 < this.archiveCount; ++var7) { - this.archiveIds[var7] = var5 += var2.readUnsignedShort(); - if (this.archiveIds[var7] > var6) { - var6 = this.archiveIds[var7]; + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.groupIds[var7] = var5 += var2.readUnsignedShort(); + if (this.groupIds[var7] > var6) { + var6 = this.groupIds[var7]; } } } - this.archiveCrcs = new int[var6 + 1]; - this.archiveVersions = new int[var6 + 1]; - this.recordCounts = new int[var6 + 1]; - this.recordIds = new int[var6 + 1][]; - this.archives = new Object[var6 + 1]; - this.records = new Object[var6 + 1][]; + this.groupCrcs = new int[var6 + 1]; + this.groupVersions = new int[var6 + 1]; + this.fileCounts = new int[var6 + 1]; + this.fileIds = new int[var6 + 1][]; + this.groups = new Object[var6 + 1]; + this.files = new Object[var6 + 1][]; if (var4 != 0) { - this.archiveNameHashes = new int[var6 + 1]; + this.groupNameHashes = new int[var6 + 1]; - for (var7 = 0; var7 < this.archiveCount; ++var7) { - this.archiveNameHashes[this.archiveIds[var7]] = var2.readInt(); + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.groupNameHashes[this.groupIds[var7]] = var2.readInt(); } - this.archiveNameHashTable = new IntHashTable(this.archiveNameHashes); + this.groupNameHashTable = new IntHashTable(this.groupNameHashes); } - for (var7 = 0; var7 < this.archiveCount; ++var7) { - this.archiveCrcs[this.archiveIds[var7]] = var2.readInt(); + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.groupCrcs[this.groupIds[var7]] = var2.readInt(); } - for (var7 = 0; var7 < this.archiveCount; ++var7) { - this.archiveVersions[this.archiveIds[var7]] = var2.readInt(); + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.groupVersions[this.groupIds[var7]] = var2.readInt(); } - for (var7 = 0; var7 < this.archiveCount; ++var7) { - this.recordCounts[this.archiveIds[var7]] = var2.readUnsignedShort(); + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.fileCounts[this.groupIds[var7]] = var2.readUnsignedShort(); } int var8; @@ -178,55 +178,55 @@ public abstract class AbstractIndexCache { int var11; int var12; if (var3 >= 7) { - for (var7 = 0; var7 < this.archiveCount; ++var7) { - var8 = this.archiveIds[var7]; - var9 = this.recordCounts[var8]; + for (var7 = 0; var7 < this.groupCount; ++var7) { + var8 = this.groupIds[var7]; + var9 = this.fileCounts[var8]; var5 = 0; var10 = -1; - this.recordIds[var8] = new int[var9]; + this.fileIds[var8] = new int[var9]; for (var11 = 0; var11 < var9; ++var11) { - var12 = this.recordIds[var8][var11] = var5 += var2.method50(); + var12 = this.fileIds[var8][var11] = var5 += var2.method50(); if (var12 > var10) { var10 = var12; } } - this.records[var8] = new Object[var10 + 1]; + this.files[var8] = new Object[var10 + 1]; } } else { - for (var7 = 0; var7 < this.archiveCount; ++var7) { - var8 = this.archiveIds[var7]; - var9 = this.recordCounts[var8]; + for (var7 = 0; var7 < this.groupCount; ++var7) { + var8 = this.groupIds[var7]; + var9 = this.fileCounts[var8]; var5 = 0; var10 = -1; - this.recordIds[var8] = new int[var9]; + this.fileIds[var8] = new int[var9]; for (var11 = 0; var11 < var9; ++var11) { - var12 = this.recordIds[var8][var11] = var5 += var2.readUnsignedShort(); + var12 = this.fileIds[var8][var11] = var5 += var2.readUnsignedShort(); if (var12 > var10) { var10 = var12; } } - this.records[var8] = new Object[var10 + 1]; + this.files[var8] = new Object[var10 + 1]; } } if (var4 != 0) { - this.recordNameHashes = new int[var6 + 1][]; - this.recordNameHashTables = new IntHashTable[var6 + 1]; + this.fileNameHashes = new int[var6 + 1][]; + this.fileNameHashTables = new IntHashTable[var6 + 1]; - for (var7 = 0; var7 < this.archiveCount; ++var7) { - var8 = this.archiveIds[var7]; - var9 = this.recordCounts[var8]; - this.recordNameHashes[var8] = new int[this.records[var8].length]; + for (var7 = 0; var7 < this.groupCount; ++var7) { + var8 = this.groupIds[var7]; + var9 = this.fileCounts[var8]; + this.fileNameHashes[var8] = new int[this.files[var8].length]; for (var10 = 0; var10 < var9; ++var10) { - this.recordNameHashes[var8][this.recordIds[var8][var10]] = var2.readInt(); + this.fileNameHashes[var8][this.fileIds[var8][var10]] = var2.readInt(); } - this.recordNameHashTables[var8] = new IntHashTable(this.recordNameHashes[var8]); + this.fileNameHashTables[var8] = new IntHashTable(this.fileNameHashes[var8]); } } @@ -248,9 +248,9 @@ public abstract class AbstractIndexCache { signature = "(III)[B", garbageValue = "1945577069" ) - @Export("takeRecord") - public byte[] takeRecord(int var1, int var2) { - return this.takeRecordEncrypted(var1, var2, (int[])null); + @Export("takeFile") + public byte[] takeFile(int group, int file) { + return this.takeFileEncrypted(group, file, (int[])null); } @ObfuscatedName("w") @@ -258,23 +258,23 @@ public abstract class AbstractIndexCache { signature = "(II[II)[B", garbageValue = "-1363136655" ) - @Export("takeRecordEncrypted") - public byte[] takeRecordEncrypted(int var1, int var2, int[] var3) { - if (var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) { - if (this.records[var1][var2] == null) { - boolean var4 = this.buildRecords(var1, var3); + @Export("takeFileEncrypted") + public byte[] takeFileEncrypted(int group, int file, int[] xteaKey) { + if (group >= 0 && group < this.files.length && this.files[group] != null && file >= 0 && file < this.files[group].length) { + if (this.files[group][file] == null) { + boolean var4 = this.buildFiles(group, xteaKey); if (!var4) { - this.loadArchive(var1); - var4 = this.buildRecords(var1, var3); + this.loadGroup(group); + var4 = this.buildFiles(group, xteaKey); if (!var4) { return null; } } } - byte[] var5 = TextureProvider.byteArrayFromObject(this.records[var1][var2], false); - if (this.shallowRecords) { - this.records[var1][var2] = null; + byte[] var5 = TextureProvider.byteArrayFromObject(this.files[group][file], false); + if (this.shallowFiles) { + this.files[group][file] = null; } return var5; @@ -288,16 +288,16 @@ public abstract class AbstractIndexCache { signature = "(III)Z", garbageValue = "-1822260214" ) - @Export("tryLoadRecord") - public boolean tryLoadRecord(int var1, int var2) { - if (var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) { - if (this.records[var1][var2] != null) { + @Export("tryLoadFile") + public boolean tryLoadFile(int group, int file) { + if (group >= 0 && group < this.files.length && this.files[group] != null && file >= 0 && file < this.files[group].length) { + if (this.files[group][file] != null) { return true; - } else if (this.archives[var1] != null) { + } else if (this.groups[group] != null) { return true; } else { - this.loadArchive(var1); - return this.archives[var1] != null; + this.loadGroup(group); + return this.groups[group] != null; } } else { return false; @@ -310,10 +310,10 @@ public abstract class AbstractIndexCache { garbageValue = "-1923759754" ) public boolean method1(int var1) { - if (this.records.length == 1) { - return this.tryLoadRecord(0, var1); - } else if (this.records[var1].length == 1) { - return this.tryLoadRecord(var1, 0); + if (this.files.length == 1) { + return this.tryLoadFile(0, var1); + } else if (this.files[var1].length == 1) { + return this.tryLoadFile(var1, 0); } else { throw new RuntimeException(); } @@ -324,13 +324,13 @@ public abstract class AbstractIndexCache { signature = "(II)Z", garbageValue = "-374594123" ) - @Export("tryLoadArchive") - public boolean tryLoadArchive(int var1) { - if (this.archives[var1] != null) { + @Export("tryLoadGroup") + public boolean tryLoadGroup(int group) { + if (this.groups[group] != null) { return true; } else { - this.loadArchive(var1); - return this.archives[var1] != null; + this.loadGroup(group); + return this.groups[group] != null; } } @@ -342,11 +342,11 @@ public abstract class AbstractIndexCache { public boolean method2() { boolean var1 = true; - for (int var2 = 0; var2 < this.archiveIds.length; ++var2) { - int var3 = this.archiveIds[var2]; - if (this.archives[var3] == null) { - this.loadArchive(var3); - if (this.archives[var3] == null) { + for (int var2 = 0; var2 < this.groupIds.length; ++var2) { + int var3 = this.groupIds[var2]; + if (this.groups[var3] == null) { + this.loadGroup(var3); + if (this.groups[var3] == null) { var1 = false; } } @@ -360,9 +360,9 @@ public abstract class AbstractIndexCache { signature = "(II)I", garbageValue = "-1809769865" ) - @Export("archiveLoadPercent") - int archiveLoadPercent(int var1) { - return this.archives[var1] != null ? 100 : 0; + @Export("groupLoadPercent") + int groupLoadPercent(int var1) { + return this.groups[var1] != null ? 100 : 0; } @ObfuscatedName("x") @@ -370,12 +370,12 @@ public abstract class AbstractIndexCache { signature = "(IS)[B", garbageValue = "-10015" ) - @Export("takeRecordFlat") - public byte[] takeRecordFlat(int var1) { - if (this.records.length == 1) { - return this.takeRecord(0, var1); - } else if (this.records[var1].length == 1) { - return this.takeRecord(var1, 0); + @Export("takeFileFlat") + public byte[] takeFileFlat(int groupOrFile) { + if (this.files.length == 1) { + return this.takeFile(0, groupOrFile); + } else if (this.files[groupOrFile].length == 1) { + return this.takeFile(groupOrFile, 0); } else { throw new RuntimeException(); } @@ -386,21 +386,21 @@ public abstract class AbstractIndexCache { signature = "(III)[B", garbageValue = "-755739011" ) - @Export("getRecord") - public byte[] getRecord(int var1, int var2) { - if (var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) { - if (this.records[var1][var2] == null) { - boolean var3 = this.buildRecords(var1, (int[])null); + @Export("getFile") + public byte[] getFile(int group, int file) { + if (group >= 0 && group < this.files.length && this.files[group] != null && file >= 0 && file < this.files[group].length) { + if (this.files[group][file] == null) { + boolean var3 = this.buildFiles(group, (int[])null); if (!var3) { - this.loadArchive(var1); - var3 = this.buildRecords(var1, (int[])null); + this.loadGroup(group); + var3 = this.buildFiles(group, (int[])null); if (!var3) { return null; } } } - byte[] var4 = TextureProvider.byteArrayFromObject(this.records[var1][var2], false); + byte[] var4 = TextureProvider.byteArrayFromObject(this.files[group][file], false); return var4; } else { return null; @@ -412,12 +412,12 @@ public abstract class AbstractIndexCache { signature = "(IB)[B", garbageValue = "68" ) - @Export("getRecordFlat") - public byte[] getRecordFlat(int var1) { - if (this.records.length == 1) { - return this.getRecord(0, var1); - } else if (this.records[var1].length == 1) { - return this.getRecord(var1, 0); + @Export("getFileFlat") + public byte[] getFileFlat(int groupOrFile) { + if (this.files.length == 1) { + return this.getFile(0, groupOrFile); + } else if (this.files[groupOrFile].length == 1) { + return this.getFile(groupOrFile, 0); } else { throw new RuntimeException(); } @@ -428,8 +428,8 @@ public abstract class AbstractIndexCache { signature = "(II)V", garbageValue = "-1829145107" ) - @Export("loadArchive") - void loadArchive(int var1) { + @Export("loadGroup") + void loadGroup(int group) { } @ObfuscatedName("j") @@ -438,7 +438,7 @@ public abstract class AbstractIndexCache { garbageValue = "28" ) public int[] method3(int var1) { - return var1 >= 0 && var1 < this.recordIds.length ? this.recordIds[var1] : null; + return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; } @ObfuscatedName("s") @@ -447,7 +447,7 @@ public abstract class AbstractIndexCache { garbageValue = "1178362496" ) public int method4(int var1) { - return this.records[var1].length; + return this.files[var1].length; } @ObfuscatedName("t") @@ -456,7 +456,7 @@ public abstract class AbstractIndexCache { garbageValue = "1702434573" ) public int method5() { - return this.records.length; + return this.files.length; } @ObfuscatedName("y") @@ -465,8 +465,8 @@ public abstract class AbstractIndexCache { garbageValue = "38" ) public void method6() { - for (int var1 = 0; var1 < this.archives.length; ++var1) { - this.archives[var1] = null; + for (int var1 = 0; var1 < this.groups.length; ++var1) { + this.groups[var1] = null; } } @@ -477,8 +477,8 @@ public abstract class AbstractIndexCache { garbageValue = "330258899" ) public void method7(int var1) { - for (int var2 = 0; var2 < this.records[var1].length; ++var2) { - this.records[var1][var2] = null; + for (int var2 = 0; var2 < this.files[var1].length; ++var2) { + this.files[var1][var2] = null; } } @@ -489,10 +489,10 @@ public abstract class AbstractIndexCache { garbageValue = "-709581639" ) public void method8() { - for (int var1 = 0; var1 < this.records.length; ++var1) { - if (this.records[var1] != null) { - for (int var2 = 0; var2 < this.records[var1].length; ++var2) { - this.records[var1][var2] = null; + for (int var1 = 0; var1 < this.files.length; ++var1) { + if (this.files[var1] != null) { + for (int var2 = 0; var2 < this.files[var1].length; ++var2) { + this.files[var1][var2] = null; } } } @@ -504,14 +504,14 @@ public abstract class AbstractIndexCache { signature = "(I[II)Z", garbageValue = "-1835696874" ) - @Export("buildRecords") - boolean buildRecords(int var1, int[] var2) { - if (this.archives[var1] == null) { + @Export("buildFiles") + boolean buildFiles(int group, int[] xteaKey) { + if (this.groups[group] == null) { return false; } else { - int var3 = this.recordCounts[var1]; - int[] var4 = this.recordIds[var1]; - Object[] var5 = this.records[var1]; + int var3 = this.fileCounts[group]; + int[] var4 = this.fileIds[group]; + Object[] var5 = this.files[group]; boolean var6 = true; for (int var7 = 0; var7 < var3; ++var7) { @@ -525,17 +525,17 @@ public abstract class AbstractIndexCache { return true; } else { byte[] var18; - if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { - var18 = TextureProvider.byteArrayFromObject(this.archives[var1], false); + if (xteaKey == null || xteaKey[0] == 0 && xteaKey[1] == 0 && xteaKey[2] == 0 && xteaKey[3] == 0) { + var18 = TextureProvider.byteArrayFromObject(this.groups[group], false); } else { - var18 = TextureProvider.byteArrayFromObject(this.archives[var1], true); + var18 = TextureProvider.byteArrayFromObject(this.groups[group], true); Buffer var8 = new Buffer(var18); - var8.xteaDecrypt(var2, 5, var8.array.length); + var8.xteaDecrypt(xteaKey, 5, var8.array.length); } byte[] var19 = Strings.decompressBytes(var18); - if (this.releaseArchives) { - this.archives[var1] = null; + if (this.releaseGroups) { + this.groups[group] = null; } if (var3 > 1) { @@ -580,13 +580,13 @@ public abstract class AbstractIndexCache { } for (var14 = 0; var14 < var3; ++var14) { - if (!this.shallowRecords) { + if (!this.shallowFiles) { var5[var4[var14]] = Projectile.byteArrayToObject(var20[var14], false); } else { var5[var4[var14]] = var20[var14]; } } - } else if (!this.shallowRecords) { + } else if (!this.shallowFiles) { var5[var4[0]] = Projectile.byteArrayToObject(var19, false); } else { var5[var4[0]] = var19; @@ -602,10 +602,10 @@ public abstract class AbstractIndexCache { signature = "(Ljava/lang/String;I)I", garbageValue = "-224510300" ) - @Export("getArchiveId") - public int getArchiveId(String var1) { - var1 = var1.toLowerCase(); - return this.archiveNameHashTable.get(Client.hashString(var1)); + @Export("getGroupId") + public int getGroupId(String groupName) { + groupName = groupName.toLowerCase(); + return this.groupNameHashTable.get(Client.hashString(groupName)); } @ObfuscatedName("v") @@ -613,10 +613,10 @@ public abstract class AbstractIndexCache { signature = "(ILjava/lang/String;I)I", garbageValue = "-443631072" ) - @Export("getRecordId") - public int getRecordId(int var1, String var2) { - var2 = var2.toLowerCase(); - return this.recordNameHashTables[var1].get(Client.hashString(var2)); + @Export("getFileId") + public int getFileId(int group, String fileName) { + fileName = fileName.toLowerCase(); + return this.fileNameHashTables[group].get(Client.hashString(fileName)); } @ObfuscatedName("ag") @@ -627,11 +627,11 @@ public abstract class AbstractIndexCache { public boolean method9(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.archiveNameHashTable.get(Client.hashString(var1)); + int var3 = this.groupNameHashTable.get(Client.hashString(var1)); if (var3 < 0) { return false; } else { - int var4 = this.recordNameHashTables[var3].get(Client.hashString(var2)); + int var4 = this.fileNameHashTables[var3].get(Client.hashString(var2)); return var4 >= 0; } } @@ -641,13 +641,13 @@ public abstract class AbstractIndexCache { signature = "(Ljava/lang/String;Ljava/lang/String;S)[B", garbageValue = "-22726" ) - @Export("takeRecordByNames") - public byte[] takeRecordByNames(String var1, String var2) { - var1 = var1.toLowerCase(); - var2 = var2.toLowerCase(); - int var3 = this.archiveNameHashTable.get(Client.hashString(var1)); - int var4 = this.recordNameHashTables[var3].get(Client.hashString(var2)); - return this.takeRecord(var3, var4); + @Export("takeFileByNames") + public byte[] takeFileByNames(String groupName, String fileName) { + groupName = groupName.toLowerCase(); + fileName = fileName.toLowerCase(); + int var3 = this.groupNameHashTable.get(Client.hashString(groupName)); + int var4 = this.fileNameHashTables[var3].get(Client.hashString(fileName)); + return this.takeFile(var3, var4); } @ObfuscatedName("aj") @@ -655,13 +655,13 @@ public abstract class AbstractIndexCache { signature = "(Ljava/lang/String;Ljava/lang/String;I)Z", garbageValue = "2140743930" ) - @Export("tryLoadRecordByNames") - public boolean tryLoadRecordByNames(String var1, String var2) { - var1 = var1.toLowerCase(); - var2 = var2.toLowerCase(); - int var3 = this.archiveNameHashTable.get(Client.hashString(var1)); - int var4 = this.recordNameHashTables[var3].get(Client.hashString(var2)); - return this.tryLoadRecord(var3, var4); + @Export("tryLoadFileByNames") + public boolean tryLoadFileByNames(String groupName, String fileName) { + groupName = groupName.toLowerCase(); + fileName = fileName.toLowerCase(); + int var3 = this.groupNameHashTable.get(Client.hashString(groupName)); + int var4 = this.fileNameHashTables[var3].get(Client.hashString(fileName)); + return this.tryLoadFile(var3, var4); } @ObfuscatedName("av") @@ -669,11 +669,11 @@ public abstract class AbstractIndexCache { signature = "(Ljava/lang/String;I)Z", garbageValue = "-1282569336" ) - @Export("tryLoadArchiveByName") - public boolean tryLoadArchiveByName(String var1) { - var1 = var1.toLowerCase(); - int var2 = this.archiveNameHashTable.get(Client.hashString(var1)); - return this.tryLoadArchive(var2); + @Export("tryLoadGroupByName") + public boolean tryLoadGroupByName(String groupName) { + groupName = groupName.toLowerCase(); + int var2 = this.groupNameHashTable.get(Client.hashString(groupName)); + return this.tryLoadGroup(var2); } @ObfuscatedName("ar") @@ -683,7 +683,7 @@ public abstract class AbstractIndexCache { ) public void method10(String var1) { var1 = var1.toLowerCase(); - int var2 = this.archiveNameHashTable.get(Client.hashString(var1)); + int var2 = this.groupNameHashTable.get(Client.hashString(var1)); if (var2 >= 0) { this.vmethod129(var2); } @@ -695,11 +695,11 @@ public abstract class AbstractIndexCache { signature = "(Ljava/lang/String;I)I", garbageValue = "-1645224643" ) - @Export("archiveLoadPercentByName") - public int archiveLoadPercentByName(String var1) { - var1 = var1.toLowerCase(); - int var2 = this.archiveNameHashTable.get(Client.hashString(var1)); - return this.archiveLoadPercent(var2); + @Export("groupLoadPercentByName") + public int groupLoadPercentByName(String groupName) { + groupName = groupName.toLowerCase(); + int var2 = this.groupNameHashTable.get(Client.hashString(groupName)); + return this.groupLoadPercent(var2); } @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 87e40aa100..b94849ba66 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -13,7 +13,7 @@ public abstract class AbstractByteArrayCopier { @ObfuscatedSignature( signature = "Lit;" ) - static IndexCache field0; + static Archive field0; @ObfuscatedName("m") @ObfuscatedSignature( @@ -42,7 +42,7 @@ public abstract class AbstractByteArrayCopier { if (var1 != null) { return var1; } else { - byte[] var2 = VarcInt.field942.takeRecord(19, var0); + byte[] var2 = VarcInt.field942.takeFile(19, var0); var1 = new VarcInt(); if (var2 != null) { var1.method354(new Buffer(var2)); diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 0d2b77c0d2..9031a63059 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -48,7 +48,7 @@ public abstract class AbstractUserComparator implements Comparator { class214.field1129 = 1; class214.field1130 = null; } else if (var0 != -1 && var0 != Client.field112 && Client.field128 != 0 && !Client.field107) { - IndexCache var1 = UserComparator3.indexCache6; + Archive var1 = UserComparator3.indexCache6; int var2 = Client.field128; class214.field1129 = 1; class214.field1130 = var1; diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index b6ed56b3b4..16874b170e 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -162,7 +162,7 @@ public abstract class AbstractWorldMapIcon { signature = "(Lit;Ljava/lang/String;I)V", garbageValue = "-1018878027" ) - static void method625(IndexCache var0, String var1) { + static void method625(Archive var0, String var1) { IndexCacheLoader var2 = new IndexCacheLoader(var0, var1); Client.indexCacheLoaders.add(var2); Client.field140 += var2.field408; diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index e720a2944f..57b27c3a67 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -478,7 +478,7 @@ public abstract class Actor extends Entity { if (var7 != null) { var8 = var7; } else { - byte[] var9 = HealthBarDefinition.field379.takeRecord(33, var1); + byte[] var9 = HealthBarDefinition.field379.takeFile(33, var1); var7 = new HealthBarDefinition(); if (var9 != null) { var7.read(new Buffer(var9)); @@ -540,7 +540,7 @@ public abstract class Actor extends Entity { if (var2 != null) { var3 = var2; } else { - byte[] var4 = HealthBarDefinition.field379.takeRecord(33, var1); + byte[] var4 = HealthBarDefinition.field379.takeFile(33, var1); var2 = new HealthBarDefinition(); if (var4 != null) { var2.read(new Buffer(var4)); @@ -949,7 +949,7 @@ public abstract class Actor extends Entity { if (var15.cs1Instructions != null && var15.cs1Instructions[0][0] == 5) { var17 = var15.cs1Instructions[0][1]; Varps.Varps_main[var17] = 1 - Varps.Varps_main[var17]; - IndexCache.method4703(var17); + Archive.method4703(var17); } } else if (var2 == 29) { var8 = Interpreter.method1915(ClientPacket.field291, Client.packetWriter.isaacCipher); @@ -960,7 +960,7 @@ public abstract class Actor extends Entity { var17 = var15.cs1Instructions[0][1]; if (Varps.Varps_main[var17] != var15.cs1ComparisonValues[0]) { Varps.Varps_main[var17] = var15.cs1ComparisonValues[0]; - IndexCache.method4703(var17); + Archive.method4703(var17); } } } else if (var2 == 30) { diff --git a/runescape-client/src/main/java/IndexCache.java b/runescape-client/src/main/java/Archive.java similarity index 88% rename from runescape-client/src/main/java/IndexCache.java rename to runescape-client/src/main/java/Archive.java index 20676bbfbe..b7d51a67f1 100644 --- a/runescape-client/src/main/java/IndexCache.java +++ b/runescape-client/src/main/java/Archive.java @@ -6,8 +6,8 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("it") -@Implements("IndexCache") -public class IndexCache extends AbstractIndexCache { +@Implements("Archive") +public class Archive extends AbstractArchive { @ObfuscatedName("aj") @Export("IndexCache_crc") static CRC32 IndexCache_crc; @@ -57,7 +57,7 @@ public class IndexCache extends AbstractIndexCache { @ObfuscatedSignature( signature = "(Lff;Lff;IZZZ)V" ) - public IndexCache(IndexStore var1, IndexStore var2, int var3, boolean var4, boolean var5, boolean var6) { + public Archive(IndexStore var1, IndexStore var2, int var3, boolean var4, boolean var5, boolean var6) { super(var4, var5); this.field403 = false; this.field404 = false; @@ -73,7 +73,7 @@ public class IndexCache extends AbstractIndexCache { int var9 = Players.NetCache_reference.readInt(); this.loadIndexReference(var8, var9); } else { - PacketBuffer.requestNetFile((IndexCache)null, 255, 255, 0, (byte)0, true); + PacketBuffer.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); NetCache.NetCache_indexCaches[var7] = this; } @@ -99,9 +99,9 @@ public class IndexCache extends AbstractIndexCache { signature = "(II)I", garbageValue = "-1809769865" ) - @Export("archiveLoadPercent") - int archiveLoadPercent(int var1) { - return super.archives[var1] != null ? 100 : (this.validArchives[var1] ? 100 : class54.method1086(this.index, var1)); + @Export("groupLoadPercent") + int groupLoadPercent(int var1) { + return super.groups[var1] != null ? 100 : (this.validArchives[var1] ? 100 : class54.method1086(this.index, var1)); } @ObfuscatedName("z") @@ -109,15 +109,15 @@ public class IndexCache extends AbstractIndexCache { signature = "(II)V", garbageValue = "-1829145107" ) - @Export("loadArchive") - void loadArchive(int var1) { - if (this.indexStore != null && this.validArchives != null && this.validArchives[var1]) { + @Export("loadGroup") + void loadGroup(int group) { + if (this.indexStore != null && this.validArchives != null && this.validArchives[group]) { IndexStore var2 = this.indexStore; byte[] var3 = null; NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { for (IndexStoreAction var6 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.last(); var6 != null; var6 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.previous()) { - if (var6.key == (long)var1 && var2 == var6.indexStore && var6.type == 0) { + if (var6.key == (long) group && var2 == var6.indexStore && var6.type == 0) { var3 = var6.data; break; } @@ -125,13 +125,13 @@ public class IndexCache extends AbstractIndexCache { } if (var3 != null) { - this.load(var2, var1, var3, true); + this.load(var2, group, var3, true); } else { - byte[] var5 = var2.read(var1); - this.load(var2, var1, var5, true); + byte[] var5 = var2.read(group); + this.load(var2, group, var5, true); } } else { - PacketBuffer.requestNetFile(this, this.index, var1, super.archiveCrcs[var1], (byte)2, true); + PacketBuffer.requestNetFile(this, this.index, group, super.groupCrcs[group], (byte)2, true); } } @@ -150,10 +150,11 @@ public class IndexCache extends AbstractIndexCache { signature = "(I)I", garbageValue = "1671499504" ) - public int method131() { + @Export("percentage") + public int percentage() { if (this.field403) { return 100; - } else if (super.archives != null) { + } else if (super.groups != null) { return 99; } else { int var1 = class54.method1086(255, this.index); @@ -216,18 +217,18 @@ public class IndexCache extends AbstractIndexCache { Widget.method4499(this.index, var2, this.referenceStore); } - this.setIndexReference(var2); + this.decodeIndex(var2); this.loadAllLocal(); } else { - var2[var2.length - 2] = (byte)(super.archiveVersions[var1] >> 8); - var2[var2.length - 1] = (byte)super.archiveVersions[var1]; + var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); + var2[var2.length - 1] = (byte)super.groupVersions[var1]; if (this.indexStore != null) { Widget.method4499(var1, var2, this.indexStore); this.validArchives[var1] = true; } if (var4) { - super.archives[var1] = Projectile.byteArrayToObject(var2, false); + super.groups[var1] = Projectile.byteArrayToObject(var2, false); } } @@ -266,7 +267,7 @@ public class IndexCache extends AbstractIndexCache { if (var8 != this.indexReferenceVersion) { PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true); } else { - this.setIndexReference(var3); + this.decodeIndex(var3); this.loadAllLocal(); } } @@ -282,23 +283,23 @@ public class IndexCache extends AbstractIndexCache { IndexCache_crc.update(var3, 0, var3.length - 2); var5 = (int)IndexCache_crc.getValue(); int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); - if (var5 == super.archiveCrcs[var2] && var6 == super.archiveVersions[var2]) { + if (var5 == super.groupCrcs[var2] && var6 == super.groupVersions[var2]) { this.validArchives[var2] = true; if (var4) { - super.archives[var2] = Projectile.byteArrayToObject(var3, false); + super.groups[var2] = Projectile.byteArrayToObject(var3, false); } } else { this.validArchives[var2] = false; if (this.field404 || var4) { - PacketBuffer.requestNetFile(this, this.index, var2, super.archiveCrcs[var2], (byte)2, var4); + PacketBuffer.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } } } else { this.validArchives[var2] = false; if (this.field404 || var4) { - PacketBuffer.requestNetFile(this, this.index, var2, super.archiveCrcs[var2], (byte)2, var4); + PacketBuffer.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } } @@ -312,7 +313,7 @@ public class IndexCache extends AbstractIndexCache { ) @Export("loadAllLocal") void loadAllLocal() { - this.validArchives = new boolean[super.archives.length]; + this.validArchives = new boolean[super.groups.length]; int var1; for (var1 = 0; var1 < this.validArchives.length; ++var1) { @@ -325,7 +326,7 @@ public class IndexCache extends AbstractIndexCache { this.field405 = -1; for (var1 = 0; var1 < this.validArchives.length; ++var1) { - if (super.recordCounts[var1] > 0) { + if (super.fileCounts[var1] > 0) { NPC.method2009(var1, this.indexStore, this); this.field405 = var1; } @@ -367,10 +368,10 @@ public class IndexCache extends AbstractIndexCache { int var2 = 0; int var3; - for (var3 = 0; var3 < super.archives.length; ++var3) { - if (super.recordCounts[var3] > 0) { + for (var3 = 0; var3 < super.groups.length; ++var3) { + if (super.fileCounts[var3] > 0) { var1 += 100; - var2 += this.archiveLoadPercent(var3); + var2 += this.groupLoadPercent(var3); } } diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index e4ac03e286..0f7ba7377b 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -14,7 +14,7 @@ public class BufferedSource implements Runnable { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field54; + public static AbstractArchive field54; @ObfuscatedName("m") @Export("thread") Thread thread; diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index ca26e844a9..794223d4ef 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -41,7 +41,7 @@ public class ByteArrayPool { signature = "Lit;" ) @Export("indexCache13") - static IndexCache indexCache13; + static Archive indexCache13; @ObfuscatedName("f") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index b3e2f4efd7..79705785be 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -218,9 +218,9 @@ public final class Canvas extends java.awt.Canvas { signature = "(ILir;Ljava/lang/String;Ljava/lang/String;IZS)V", garbageValue = "-9124" ) - public static void method858(int var0, AbstractIndexCache var1, String var2, String var3, int var4, boolean var5) { - int var6 = var1.getArchiveId(var2); - int var7 = var1.getRecordId(var6, var3); + public static void method858(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) { + int var6 = var1.getGroupId(var2); + int var7 = var1.getFileId(var6, var3); class214.field1129 = 1; class214.field1130 = var1; class30.musicTrackArchiveId = var6; diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 9410707adf..d2712f716f 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1299,7 +1299,8 @@ public final class Client extends GameShell implements Usernamed { signature = "(I)V", garbageValue = "1445885427" ) - protected final void vmethod112() { + @Export("packetHandler") + protected final void packetHandler() { ++cycle; this.doCycleJs5(); class3.method41(); @@ -1376,7 +1377,7 @@ public final class Client extends GameShell implements Usernamed { int var4; for (var4 = 0; var4 < class40.regionLandArchives.length; ++var4) { if (IndexCacheLoader.regionMapArchiveIds[var4] != -1 && class40.regionLandArchives[var4] == null) { - class40.regionLandArchives[var4] = SecureRandomFuture.indexCache5.takeRecord(IndexCacheLoader.regionMapArchiveIds[var4], 0); + class40.regionLandArchives[var4] = SecureRandomFuture.indexCache5.takeFile(IndexCacheLoader.regionMapArchiveIds[var4], 0); if (class40.regionLandArchives[var4] == null) { var3 = false; ++field177; @@ -1384,7 +1385,7 @@ public final class Client extends GameShell implements Usernamed { } if (MouseHandler.regionLandArchiveIds[var4] != -1 && HealthBarUpdate.regionMapArchives[var4] == null) { - HealthBarUpdate.regionMapArchives[var4] = SecureRandomFuture.indexCache5.takeRecordEncrypted(MouseHandler.regionLandArchiveIds[var4], 0, class190.xteaKeys[var4]); + HealthBarUpdate.regionMapArchives[var4] = SecureRandomFuture.indexCache5.takeFileEncrypted(MouseHandler.regionLandArchiveIds[var4], 0, class190.xteaKeys[var4]); if (HealthBarUpdate.regionMapArchives[var4] == null) { var3 = false; ++field177; @@ -1843,7 +1844,7 @@ public final class Client extends GameShell implements Usernamed { if (var43 != null) { var45 = var43; } else { - byte[] var46 = OverlayDefinition.field663.takeRecord(4, var42); + byte[] var46 = OverlayDefinition.field663.takeFile(4, var42); var43 = new OverlayDefinition(); if (var46 != null) { var43.read(new Buffer(var46), var42); @@ -1880,7 +1881,7 @@ public final class Client extends GameShell implements Usernamed { if (var68 != null) { var43 = var68; } else { - byte[] var47 = OverlayDefinition.field663.takeRecord(4, var67); + byte[] var47 = OverlayDefinition.field663.takeFile(4, var67); var68 = new OverlayDefinition(); if (var47 != null) { var68.read(new Buffer(var47), var67); @@ -2359,8 +2360,8 @@ public final class Client extends GameShell implements Usernamed { WorldMapCacheName.pcmPlayer0.shutdown(); } - if (AbstractIndexCache.pcmPlayer1 != null) { - AbstractIndexCache.pcmPlayer1.shutdown(); + if (AbstractArchive.pcmPlayer1 != null) { + AbstractArchive.pcmPlayer1.shutdown(); } if (NetCache.NetCache_socket != null) { @@ -2687,7 +2688,7 @@ public final class Client extends GameShell implements Usernamed { worldId = Integer.parseInt(var5); break; case 14: - AbstractIndexCache.field2 = Integer.parseInt(var5); + AbstractArchive.field2 = Integer.parseInt(var5); break; case 15: gameBuild = Integer.parseInt(var5); @@ -2866,7 +2867,7 @@ public final class Client extends GameShell implements Usernamed { Players.NetCache_reference = class22.NetCache_responseArchiveBuffer; for (var12 = 0; var12 < 256; ++var12) { - IndexCache var22 = NetCache.NetCache_indexCaches[var12]; + Archive var22 = NetCache.NetCache_indexCaches[var12]; if (var22 != null) { Players.NetCache_reference.index = var12 * 8 + 5; var13 = Players.NetCache_reference.readInt(); @@ -3196,8 +3197,8 @@ public final class Client extends GameShell implements Usernamed { WorldMapCacheName.pcmPlayer0.method242(); } - if (AbstractIndexCache.pcmPlayer1 != null) { - AbstractIndexCache.pcmPlayer1.method242(); + if (AbstractArchive.pcmPlayer1 != null) { + AbstractArchive.pcmPlayer1.method242(); } var16 = true; @@ -3211,8 +3212,8 @@ public final class Client extends GameShell implements Usernamed { WorldMapCacheName.pcmPlayer0.method242(); } - if (AbstractIndexCache.pcmPlayer1 != null) { - AbstractIndexCache.pcmPlayer1.method242(); + if (AbstractArchive.pcmPlayer1 != null) { + AbstractArchive.pcmPlayer1.method242(); } if (var4 != 0) { @@ -3314,13 +3315,13 @@ public final class Client extends GameShell implements Usernamed { var8.packetBuffer.writeShort(Huffman.canvasHeight); Varps.method4400(var8.packetBuffer); var8.packetBuffer.writeStringCp1252NullTerminated(class21.field1123); - var8.packetBuffer.writeInt(AbstractIndexCache.field2); + var8.packetBuffer.writeInt(AbstractArchive.field2); Buffer var11 = new Buffer(WorldMapLabelSize.platformInfo.size()); WorldMapLabelSize.platformInfo.write(var11); var8.packetBuffer.method38(var11.array, 0, var11.array.length); var8.packetBuffer.writeByte(clientType); var8.packetBuffer.writeInt(0); - var8.packetBuffer.writeInt(AbstractIndexCache.indexCache0.hash); + var8.packetBuffer.writeInt(AbstractArchive.indexCache0.hash); var8.packetBuffer.writeInt(Skeleton.indexCache1.hash); var8.packetBuffer.writeInt(ObjectSound.indexCache2.hash); var8.packetBuffer.writeInt(WorldMapIcon1.indexCache3.hash); @@ -4220,7 +4221,7 @@ public final class Client extends GameShell implements Usernamed { var34 = Huffman.getWidget(var23.parentId); } while(var34 == null || var34.children == null || var23.childIndex >= var34.children.length || var23 != var34.children[var23.childIndex]); - AbstractIndexCache.runScript(var24); + AbstractArchive.runScript(var24); } } @@ -4232,7 +4233,7 @@ public final class Client extends GameShell implements Usernamed { var34 = Huffman.getWidget(var23.parentId); } while(var34 == null || var34.children == null || var23.childIndex >= var34.children.length || var23 != var34.children[var23.childIndex]); - AbstractIndexCache.runScript(var24); + AbstractArchive.runScript(var24); } } @@ -4244,7 +4245,7 @@ public final class Client extends GameShell implements Usernamed { var34 = Huffman.getWidget(var23.parentId); } while(var34 == null || var34.children == null || var23.childIndex >= var34.children.length || var23 != var34.children[var23.childIndex]); - AbstractIndexCache.runScript(var24); + AbstractArchive.runScript(var24); } } @@ -4751,7 +4752,7 @@ public final class Client extends GameShell implements Usernamed { Varps.Varps_main[var6] = var39; } - IndexCache.method4703(var6); + Archive.method4703(var6); field121[++field123 - 1 & 31] = var6; var1.serverPacket0 = null; return true; @@ -5066,7 +5067,7 @@ public final class Client extends GameShell implements Usernamed { var46[0] = new Integer(var3.readInt()); ScriptEvent var49 = new ScriptEvent(); var49.args0 = var46; - AbstractIndexCache.runScript(var49); + AbstractArchive.runScript(var49); var1.serverPacket0 = null; return true; } @@ -5677,7 +5678,7 @@ public final class Client extends GameShell implements Usernamed { Varps.Varps_main[var37] = var6; } - IndexCache.method4703(var37); + Archive.method4703(var37); field121[++field123 - 1 & 31] = var37; var1.serverPacket0 = null; return true; @@ -5709,7 +5710,7 @@ public final class Client extends GameShell implements Usernamed { for (var37 = 0; var37 < Varps.Varps_main.length; ++var37) { if (Varps.Varps_temp[var37] != Varps.Varps_main[var37]) { Varps.Varps_main[var37] = Varps.Varps_temp[var37]; - IndexCache.method4703(var37); + Archive.method4703(var37); field121[++field123 - 1 & 31] = var37; } } @@ -6140,7 +6141,7 @@ public final class Client extends GameShell implements Usernamed { var8.mouseX = var6; var8.mouseY = var7; var8.args0 = clickedWidget.onDrag; - AbstractIndexCache.runScript(var8); + AbstractArchive.runScript(var8); } if (MouseHandler.MouseHandler_currentButton == 0) { @@ -6153,7 +6154,7 @@ public final class Client extends GameShell implements Usernamed { var8.mouseY = var7; var8.dragTarget = draggedOnWidget; var8.args0 = clickedWidget.onDragComplete; - AbstractIndexCache.runScript(var8); + AbstractArchive.runScript(var8); } if (draggedOnWidget != null) { diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index 45781a3bb1..ec577df93e 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -491,14 +491,14 @@ public class DynamicObject extends Entity { ) protected static int method2222() { int var0 = 0; - if (AbstractIndexCache.garbageCollector == null || !AbstractIndexCache.garbageCollector.isValid()) { + if (AbstractArchive.garbageCollector == null || !AbstractArchive.garbageCollector.isValid()) { try { Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); while (var1.hasNext()) { GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); if (var2.isValid()) { - AbstractIndexCache.garbageCollector = var2; + AbstractArchive.garbageCollector = var2; GameShell.garbageCollectorLastCheckTimeMs = -1L; GameShell.garbageCollectorLastCollectionTime = -1L; } @@ -507,9 +507,9 @@ public class DynamicObject extends Entity { } } - if (AbstractIndexCache.garbageCollector != null) { + if (AbstractArchive.garbageCollector != null) { long var10 = class203.currentTimeMs(); - long var3 = AbstractIndexCache.garbageCollector.getCollectionTime(); + long var3 = AbstractArchive.garbageCollector.getCollectionTime(); if (GameShell.garbageCollectorLastCollectionTime != -1L) { long var5 = var3 - GameShell.garbageCollectorLastCollectionTime; long var7 = var10 - GameShell.garbageCollectorLastCheckTimeMs; diff --git a/runescape-client/src/main/java/EnumDefinition.java b/runescape-client/src/main/java/EnumDefinition.java index dbd78a607c..66bd5d7647 100644 --- a/runescape-client/src/main/java/EnumDefinition.java +++ b/runescape-client/src/main/java/EnumDefinition.java @@ -12,7 +12,7 @@ public class EnumDefinition extends DualNode { signature = "Lir;" ) @Export("EnumDefinition_indexCache") - public static AbstractIndexCache EnumDefinition_indexCache; + public static AbstractArchive EnumDefinition_indexCache; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index 83b04eb080..b5f03505cc 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -61,57 +61,57 @@ public final class FloorDecoration { signature = "(Lir;Lir;I)I", garbageValue = "-1749538901" ) - static int method2853(AbstractIndexCache var0, AbstractIndexCache var1) { + static int method2853(AbstractArchive var0, AbstractArchive var1) { int var2 = 0; - if (var0.tryLoadRecordByNames("title.jpg", "")) { + if (var0.tryLoadFileByNames("title.jpg", "")) { ++var2; } - if (var1.tryLoadRecordByNames("logo", "")) { + if (var1.tryLoadFileByNames("logo", "")) { ++var2; } - if (var1.tryLoadRecordByNames("logo_deadman_mode", "")) { + if (var1.tryLoadFileByNames("logo_deadman_mode", "")) { ++var2; } - if (var1.tryLoadRecordByNames("titlebox", "")) { + if (var1.tryLoadFileByNames("titlebox", "")) { ++var2; } - if (var1.tryLoadRecordByNames("titlebutton", "")) { + if (var1.tryLoadFileByNames("titlebutton", "")) { ++var2; } - if (var1.tryLoadRecordByNames("runes", "")) { + if (var1.tryLoadFileByNames("runes", "")) { ++var2; } - if (var1.tryLoadRecordByNames("title_mute", "")) { + if (var1.tryLoadFileByNames("title_mute", "")) { ++var2; } - if (var1.tryLoadRecordByNames("options_radio_buttons,0", "")) { + if (var1.tryLoadFileByNames("options_radio_buttons,0", "")) { ++var2; } - if (var1.tryLoadRecordByNames("options_radio_buttons,2", "")) { + if (var1.tryLoadFileByNames("options_radio_buttons,2", "")) { ++var2; } - if (var1.tryLoadRecordByNames("options_radio_buttons,4", "")) { + if (var1.tryLoadFileByNames("options_radio_buttons,4", "")) { ++var2; } - if (var1.tryLoadRecordByNames("options_radio_buttons,6", "")) { + if (var1.tryLoadFileByNames("options_radio_buttons,6", "")) { ++var2; } - var1.tryLoadRecordByNames("sl_back", ""); - var1.tryLoadRecordByNames("sl_flags", ""); - var1.tryLoadRecordByNames("sl_arrows", ""); - var1.tryLoadRecordByNames("sl_stars", ""); - var1.tryLoadRecordByNames("sl_button", ""); + var1.tryLoadFileByNames("sl_back", ""); + var1.tryLoadFileByNames("sl_flags", ""); + var1.tryLoadFileByNames("sl_arrows", ""); + var1.tryLoadFileByNames("sl_stars", ""); + var1.tryLoadFileByNames("sl_button", ""); return var2; } } diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 9bb25b8305..3f876c0605 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -478,7 +478,7 @@ public class FontName { class157.method3382(); ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); Script.Script_cached.clear(); - AbstractIndexCache.indexCache0.method8(); + AbstractArchive.indexCache0.method8(); Skeleton.indexCache1.method8(); WorldMapIcon1.indexCache3.method8(); WorldMapDecoration.indexCache4.method8(); diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index dd41db27c5..7d97edc6f7 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -25,12 +25,12 @@ public class Fonts { @ObfuscatedSignature( signature = "Lir;" ) - AbstractIndexCache field351; + AbstractArchive field351; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - AbstractIndexCache field352; + AbstractArchive field352; @ObfuscatedName("q") @Export("map") HashMap map; @@ -38,7 +38,7 @@ public class Fonts { @ObfuscatedSignature( signature = "(Lir;Lir;)V" ) - public Fonts(AbstractIndexCache var1, AbstractIndexCache var2) { + public Fonts(AbstractArchive var1, AbstractArchive var2) { this.field351 = var1; this.field352 = var2; this.map = new HashMap(); @@ -59,11 +59,11 @@ public class Fonts { if (this.map.containsKey(var5)) { var2.put(var5, this.map.get(var5)); } else { - AbstractIndexCache var6 = this.field351; - AbstractIndexCache var7 = this.field352; + AbstractArchive var6 = this.field351; + AbstractArchive var7 = this.field352; String var8 = var5.field349; - int var9 = var6.getArchiveId(var8); - int var10 = var6.getRecordId(var9, ""); + int var9 = var6.getGroupId(var8); + int var10 = var6.getFileId(var9, ""); Font var11 = SpriteIds.method5823(var6, var7, var9, var10); if (var11 != null) { this.map.put(var5, var11); diff --git a/runescape-client/src/main/java/Formatting.java b/runescape-client/src/main/java/Formatting.java index 77227fd4ca..dd3cd2ee5c 100644 --- a/runescape-client/src/main/java/Formatting.java +++ b/runescape-client/src/main/java/Formatting.java @@ -14,7 +14,7 @@ public class Formatting { signature = "Lit;" ) @Export("indexCache12") - static IndexCache indexCache12; + static Archive indexCache12; @ObfuscatedName("s") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index 434c8880c6..809513ef75 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -26,14 +26,14 @@ public class Frames extends DualNode { signature = "(Lir;Lir;IZ)V", garbageValue = "0" ) - public Frames(AbstractIndexCache var1, AbstractIndexCache var2, int var3, boolean var4) { + public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { NodeDeque var5 = new NodeDeque(); int var6 = var1.method4(var3); this.frames = new Animation[var6]; int[] var7 = var1.method3(var3); for (int var8 = 0; var8 < var7.length; ++var8) { - byte[] var9 = var1.takeRecord(var3, var7[var8]); + byte[] var9 = var1.takeFile(var3, var7[var8]); Skeleton var10 = null; int var11 = (var9[0] & 255) << 8 | var9[1] & 255; @@ -45,7 +45,7 @@ public class Frames extends DualNode { } if (var10 == null) { - byte[] var13 = var2.getRecord(var11, 0); + byte[] var13 = var2.getFile(var11, 0); var10 = new Skeleton(var11, var13); var5.addFirst(var10); } @@ -70,7 +70,7 @@ public class Frames extends DualNode { signature = "(Lir;I)V", garbageValue = "1204337492" ) - public static void method3241(AbstractIndexCache var0) { + public static void method3241(AbstractArchive var0) { VarcInt.field942 = var0; } diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index 371bfe564f..96c8b98a20 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -598,7 +598,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene class230.field1138 = hasFocus; } - this.vmethod112(); + this.packetHandler(); } @ObfuscatedName("ar") @@ -718,7 +718,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(I)V", garbageValue = "1445885427" ) - protected abstract void vmethod112(); + protected abstract void packetHandler(); @ObfuscatedName("ab") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index 0e2a1ebe00..28158757fe 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -197,7 +197,7 @@ public class GrandExchangeEvent { } else if (var13 == ScriptOpcodes.SET_VARP) { var11 = var6[var4]; Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - IndexCache.method4703(var11); + Archive.method4703(var11); } else if (var13 == ScriptOpcodes.SCONST) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.stringOperands[var4]; } else if (var13 == ScriptOpcodes.JUMP) { diff --git a/runescape-client/src/main/java/GroundItemPile.java b/runescape-client/src/main/java/GroundItemPile.java index dbbc9aa6d2..095db79c18 100644 --- a/runescape-client/src/main/java/GroundItemPile.java +++ b/runescape-client/src/main/java/GroundItemPile.java @@ -71,7 +71,7 @@ public final class GroundItemPile { public static boolean loadWidgetGroup(int var0) { if (Widget.loadedWidgetGroups[var0]) { return true; - } else if (!Widget.Widget_indexCache.tryLoadArchive(var0)) { + } else if (!Widget.Widget_indexCache.tryLoadGroup(var0)) { return false; } else { int var1 = Widget.Widget_indexCache.method4(var0); @@ -85,7 +85,7 @@ public final class GroundItemPile { for (int var2 = 0; var2 < var1; ++var2) { if (Widget.widgets[var0][var2] == null) { - byte[] var3 = Widget.Widget_indexCache.takeRecord(var0, var2); + byte[] var3 = Widget.Widget_indexCache.takeFile(var0, var2); if (var3 != null) { Widget.widgets[var0][var2] = new Widget(); Widget.widgets[var0][var2].id = var2 + (var0 << 16); diff --git a/runescape-client/src/main/java/GzipDecompressor.java b/runescape-client/src/main/java/GzipDecompressor.java index 2c1a5225b7..71887acd38 100644 --- a/runescape-client/src/main/java/GzipDecompressor.java +++ b/runescape-client/src/main/java/GzipDecompressor.java @@ -60,7 +60,7 @@ public class GzipDecompressor { if (var1 != null) { return var1; } else { - byte[] var2 = StructDefinition.field885.takeRecord(34, var0); + byte[] var2 = StructDefinition.field885.takeFile(34, var0); var1 = new StructDefinition(); if (var2 != null) { var1.read(new Buffer(var2)); diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index a60a84437d..1c6a8614da 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -11,12 +11,12 @@ public class HealthBarDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field379; + public static AbstractArchive field379; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field380; + public static AbstractArchive field380; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 4251fa3e2c..b33ca4df3e 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -11,17 +11,17 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - static AbstractIndexCache field382; + static AbstractArchive field382; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - static AbstractIndexCache field383; + static AbstractArchive field383; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lir;" ) - static AbstractIndexCache field384; + static AbstractArchive field384; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/IndexCacheLoader.java b/runescape-client/src/main/java/IndexCacheLoader.java index c4c05568d9..00fc3b8ad2 100644 --- a/runescape-client/src/main/java/IndexCacheLoader.java +++ b/runescape-client/src/main/java/IndexCacheLoader.java @@ -33,7 +33,7 @@ public class IndexCacheLoader { signature = "Lit;" ) @Export("indexCache") - final IndexCache indexCache; + final Archive indexCache; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 1459455501 @@ -48,7 +48,7 @@ public class IndexCacheLoader { @ObfuscatedSignature( signature = "(Lit;Ljava/lang/String;)V" ) - IndexCacheLoader(IndexCache var1, String var2) { + IndexCacheLoader(Archive var1, String var2) { this.field409 = 0; this.indexCache = var1; this.field408 = var1.method5(); @@ -95,14 +95,14 @@ public class IndexCacheLoader { class30.worldSelectBackSprites = class2.method20(WorldMapSection3.indexCache8, "sl_back", ""); } - IndexCache var11; + Archive var11; int var12; int var13; IndexedSprite[] var14; if (Frames.worldSelectFlagSprites == null) { var11 = WorldMapSection3.indexCache8; - var13 = var11.getArchiveId("sl_flags"); - var12 = var11.getRecordId(var13, ""); + var13 = var11.getGroupId("sl_flags"); + var12 = var11.getFileId(var13, ""); if (!SpriteMask.loadSprite(var11, var13, var12)) { var14 = null; } else { @@ -114,8 +114,8 @@ public class IndexCacheLoader { if (AttackOption.worldSelectArrows == null) { var11 = WorldMapSection3.indexCache8; - var13 = var11.getArchiveId("sl_arrows"); - var12 = var11.getRecordId(var13, ""); + var13 = var11.getGroupId("sl_arrows"); + var12 = var11.getFileId(var13, ""); if (!SpriteMask.loadSprite(var11, var13, var12)) { var14 = null; } else { @@ -127,8 +127,8 @@ public class IndexCacheLoader { if (UrlRequest.worldSelectStars == null) { var11 = WorldMapSection3.indexCache8; - var13 = var11.getArchiveId("sl_stars"); - var12 = var11.getRecordId(var13, ""); + var13 = var11.getGroupId("sl_stars"); + var12 = var11.getFileId(var13, ""); if (!SpriteMask.loadSprite(var11, var13, var12)) { var14 = null; } else { diff --git a/runescape-client/src/main/java/IndexStoreAction.java b/runescape-client/src/main/java/IndexStoreAction.java index c8b7bdd8da..7ee3684610 100644 --- a/runescape-client/src/main/java/IndexStoreAction.java +++ b/runescape-client/src/main/java/IndexStoreAction.java @@ -43,7 +43,7 @@ public class IndexStoreAction extends Node { signature = "Lit;" ) @Export("indexCache") - IndexCache indexCache; + Archive indexCache; @ObfuscatedName("fn") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index 80135fddbd..b0cdeff51c 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -105,7 +105,7 @@ public class Interpreter { if (var1 != null) { return var1; } else { - byte[] var2 = EnumDefinition.EnumDefinition_indexCache.takeRecord(8, var0); + byte[] var2 = EnumDefinition.EnumDefinition_indexCache.takeFile(8, var0); var1 = new EnumDefinition(); if (var2 != null) { var1.read(new Buffer(var2)); diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index 0d3f76361b..b5a0acbc9b 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -11,7 +11,8 @@ public class InvDefinition extends DualNode { @ObfuscatedSignature( signature = "Ler;" ) - static EvictingDualNodeHashTable field427; + @Export("InvDefinition_cached") + static EvictingDualNodeHashTable InvDefinition_cached; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 1358868971 @@ -63,6 +64,6 @@ public class InvDefinition extends DualNode { } static { - field427 = new EvictingDualNodeHashTable(64); + InvDefinition_cached = new EvictingDualNodeHashTable(64); } } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index a1f33c11cd..cef1307128 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -238,7 +238,7 @@ public final class IsaacCipher { signature = "(Lir;Lir;I)V", garbageValue = "75867683" ) - public static void method4082(AbstractIndexCache var0, AbstractIndexCache var1) { + public static void method4082(AbstractArchive var0, AbstractArchive var1) { NPCDefinition.NpcDefinition_indexCache = var0; NPCDefinition.NpcDefinition_modelIndexCache = var1; } diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index 4404e399d1..b29e3ea6c9 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -22,7 +22,7 @@ public class ItemContainer extends Node { @ObfuscatedSignature( signature = "Lit;" ) - static IndexCache field434; + static Archive field434; @ObfuscatedName("f") @Export("ids") int[] ids; @@ -55,18 +55,18 @@ public class ItemContainer extends Node { if (var1 != null) { return var1; } else { - AbstractIndexCache var2 = SequenceDefinition.field773; - AbstractIndexCache var3 = SequenceDefinition.field774; + AbstractArchive var2 = SequenceDefinition.field773; + AbstractArchive var3 = SequenceDefinition.field774; boolean var4 = true; int[] var5 = var2.method3(var0); for (int var6 = 0; var6 < var5.length; ++var6) { - byte[] var7 = var2.getRecord(var0, var5[var6]); + byte[] var7 = var2.getFile(var0, var5[var6]); if (var7 == null) { var4 = false; } else { int var8 = (var7[0] & 255) << 8 | var7[1] & 255; - byte[] var9 = var3.getRecord(var8, 0); + byte[] var9 = var3.getFile(var8, 0); if (var9 == null) { var4 = false; } diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index 999e16be6f..e4ff114373 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -12,13 +12,13 @@ public class ItemDefinition extends DualNode { signature = "Lir;" ) @Export("ItemDefinition_indexCache") - public static AbstractIndexCache ItemDefinition_indexCache; + public static AbstractArchive ItemDefinition_indexCache; @ObfuscatedName("g") @ObfuscatedSignature( signature = "Lir;" ) @Export("ItemDefinition_modelIndexCache") - public static AbstractIndexCache ItemDefinition_modelIndexCache; + public static AbstractArchive ItemDefinition_modelIndexCache; @ObfuscatedName("x") @ObfuscatedSignature( signature = "Ler;" @@ -473,7 +473,7 @@ public class ItemDefinition extends DualNode { } else if (var2 == 149) { this.placeholderTemplate = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = AbstractIndexCache.readStringIntParameters(var1, this.params); + this.params = AbstractArchive.readStringIntParameters(var1, this.params); } } @@ -710,15 +710,15 @@ public class ItemDefinition extends DualNode { return true; } else { boolean var5 = true; - if (!ItemDefinition_modelIndexCache.tryLoadRecord(var2, 0)) { + if (!ItemDefinition_modelIndexCache.tryLoadFile(var2, 0)) { var5 = false; } - if (var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadFile(var3, 0)) { var5 = false; } - if (var4 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var4, 0)) { + if (var4 != -1 && !ItemDefinition_modelIndexCache.tryLoadFile(var4, 0)) { var5 = false; } @@ -799,11 +799,11 @@ public class ItemDefinition extends DualNode { return true; } else { boolean var4 = true; - if (!ItemDefinition_modelIndexCache.tryLoadRecord(var2, 0)) { + if (!ItemDefinition_modelIndexCache.tryLoadFile(var2, 0)) { var4 = false; } - if (var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadFile(var3, 0)) { var4 = false; } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index 619b4d5fa9..4705d9db1f 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -12,12 +12,12 @@ public class KitDefinition extends DualNode { signature = "Lir;" ) @Export("KitDefinition_indexCache") - public static AbstractIndexCache KitDefinition_indexCache; + public static AbstractArchive KitDefinition_indexCache; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field456; + public static AbstractArchive field456; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 235389995 @@ -139,7 +139,7 @@ public class KitDefinition extends DualNode { boolean var1 = true; for (int var2 = 0; var2 < this.modelIDs.length; ++var2) { - if (!field456.tryLoadRecord(this.modelIDs[var2], 0)) { + if (!field456.tryLoadFile(this.modelIDs[var2], 0)) { var1 = false; } } @@ -197,7 +197,7 @@ public class KitDefinition extends DualNode { boolean var1 = true; for (int var2 = 0; var2 < 5; ++var2) { - if (this.archives[var2] != -1 && !field456.tryLoadRecord(this.archives[var2], 0)) { + if (this.archives[var2] != -1 && !field456.tryLoadFile(this.archives[var2], 0)) { var1 = false; } } diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 646b5a23a1..f36bf739c3 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -140,15 +140,15 @@ public class Login { signature = "Lit;" ) @Export("indexCache11") - static IndexCache indexCache11; + static Archive indexCache11; @ObfuscatedName("m") @ObfuscatedSignature( signature = "(Lir;II)Lhl;", garbageValue = "-1625685874" ) - static MusicPatch method2045(AbstractIndexCache var0, int var1) { - byte[] var2 = var0.takeRecordFlat(var1); + static MusicPatch method2045(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); return var2 == null ? null : new MusicPatch(var2); } @@ -186,7 +186,7 @@ public class Login { signature = "(Lir;IIIZB)V", garbageValue = "45" ) - public static void method2076(AbstractIndexCache var0, int var1, int var2, int var3, boolean var4) { + public static void method2076(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { class214.field1129 = 1; class214.field1130 = var0; class30.musicTrackArchiveId = var1; diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 5d8be7021f..062a7b3b5c 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -616,7 +616,7 @@ public class LoginScreenAnimation { if (var1 != null) { return var1; } else { - byte[] var2 = HitSplatDefinition.field382.takeRecord(32, var0); + byte[] var2 = HitSplatDefinition.field382.takeFile(32, var0); var1 = new HitSplatDefinition(); if (var2 != null) { var1.read(new Buffer(var2)); diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 7dea34d004..9e439052a6 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -47,9 +47,9 @@ public class MenuAction { garbageValue = "0" ) @Export("loadIndexedSpriteByName") - public static IndexedSprite loadIndexedSpriteByName(AbstractIndexCache var0, String var1, String var2) { - int var3 = var0.getArchiveId(var1); - int var4 = var0.getRecordId(var3, var2); + public static IndexedSprite loadIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); IndexedSprite var5; if (!SpriteMask.loadSprite(var0, var3, var4)) { var5 = null; diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 30ac47dfcb..024118663b 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -467,6 +467,6 @@ public class Message extends DualNode { } String var4 = "runescape.com"; - return var2 + var0 + "." + var4 + "/l=" + Client.language + "/a=" + AbstractIndexCache.field2 + var3 + "/"; + return var2 + var0 + "." + var4 + "/l=" + Client.language + "/a=" + AbstractArchive.field2 + var3 + "/"; } } diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java index eec4788edf..69bacc7cec 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -150,7 +150,7 @@ public class MidiPcmStream extends PcmStream { garbageValue = "-324121369" ) @Export("loadMusicTrack") - public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractIndexCache var2, SoundCache var3, int var4) { + public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { var1.method226(); boolean var5 = true; int[] var6 = null; diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index 9ae3c76bc6..7aed6dfdd3 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -1606,8 +1606,8 @@ public class ModelData extends Entity { @ObfuscatedSignature( signature = "(Lir;II)Ldw;" ) - public static ModelData method2788(AbstractIndexCache var0, int var1, int var2) { - byte[] var3 = var0.takeRecord(var1, var2); + public static ModelData method2788(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); return var3 == null ? null : new ModelData(var3); } diff --git a/runescape-client/src/main/java/MusicSample.java b/runescape-client/src/main/java/MusicSample.java index 99bd23e94c..f20f348b1d 100644 --- a/runescape-client/src/main/java/MusicSample.java +++ b/runescape-client/src/main/java/MusicSample.java @@ -597,9 +597,9 @@ public class MusicSample extends Node { @ObfuscatedSignature( signature = "(Lir;)Z" ) - static boolean method2343(AbstractIndexCache var0) { + static boolean method2343(AbstractArchive var0) { if (!field610) { - byte[] var1 = var0.takeRecord(0, 0); + byte[] var1 = var0.takeFile(0, 0); if (var1 == null) { return false; } @@ -616,12 +616,12 @@ public class MusicSample extends Node { signature = "(Lir;II)Lcd;" ) @Export("readMusicSample") - static MusicSample readMusicSample(AbstractIndexCache var0, int var1, int var2) { + static MusicSample readMusicSample(AbstractArchive var0, int var1, int var2) { if (!method2343(var0)) { - var0.tryLoadRecord(var1, var2); + var0.tryLoadFile(var1, var2); return null; } else { - byte[] var3 = var0.takeRecord(var1, var2); + byte[] var3 = var0.takeFile(var1, var2); return var3 == null ? null : new MusicSample(var3); } } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index 4147ba52f9..deb18fb6d6 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -427,8 +427,8 @@ public class MusicTrack extends Node { signature = "(Lir;II)Lhe;" ) @Export("readTrack") - public static MusicTrack readTrack(AbstractIndexCache var0, int var1, int var2) { - byte[] var3 = var0.takeRecord(var1, var2); + public static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); return var3 == null ? null : new MusicTrack(new Buffer(var3)); } } diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index 81857313b4..ef834cae34 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -167,7 +167,7 @@ public final class NPC extends Actor { signature = "(ILff;Lit;B)V", garbageValue = "-51" ) - static void method2009(int var0, IndexStore var1, IndexCache var2) { + static void method2009(int var0, IndexStore var1, Archive var2) { IndexStoreAction var3 = new IndexStoreAction(); var3.type = 1; var3.key = (long)var0; diff --git a/runescape-client/src/main/java/NPCDefinition.java b/runescape-client/src/main/java/NPCDefinition.java index 859d5d979e..d8d600a4a6 100644 --- a/runescape-client/src/main/java/NPCDefinition.java +++ b/runescape-client/src/main/java/NPCDefinition.java @@ -17,13 +17,13 @@ public class NPCDefinition extends DualNode { signature = "Lir;" ) @Export("NpcDefinition_indexCache") - static AbstractIndexCache NpcDefinition_indexCache; + static AbstractArchive NpcDefinition_indexCache; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) @Export("NpcDefinition_modelIndexCache") - static AbstractIndexCache NpcDefinition_modelIndexCache; + static AbstractArchive NpcDefinition_modelIndexCache; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Ler;" @@ -331,7 +331,7 @@ public class NPCDefinition extends DualNode { } else if (var2 == 111) { this.isFollower = true; } else if (var2 == 249) { - this.params = AbstractIndexCache.readStringIntParameters(var1, this.params); + this.params = AbstractArchive.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -383,7 +383,7 @@ public class NPCDefinition extends DualNode { boolean var6 = false; for (int var7 = 0; var7 < this.archives.length; ++var7) { - if (!NpcDefinition_modelIndexCache.tryLoadRecord(this.archives[var7], 0)) { + if (!NpcDefinition_modelIndexCache.tryLoadFile(this.archives[var7], 0)) { var6 = true; } } @@ -457,7 +457,7 @@ public class NPCDefinition extends DualNode { boolean var1 = false; for (int var2 = 0; var2 < this.field636.length; ++var2) { - if (!NpcDefinition_modelIndexCache.tryLoadRecord(this.field636[var2], 0)) { + if (!NpcDefinition_modelIndexCache.tryLoadFile(this.field636[var2], 0)) { var1 = true; } } diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index a4c6dfc5c5..5bbfcd0e0f 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -97,7 +97,7 @@ public class NetCache { signature = "[Lit;" ) @Export("NetCache_indexCaches") - public static IndexCache[] NetCache_indexCaches; + public static Archive[] NetCache_indexCaches; @ObfuscatedName("b") public static byte field631; @ObfuscatedName("c") @@ -136,7 +136,7 @@ public class NetCache { NetCache_responseHeaderBuffer = new Buffer(8); field630 = 0; NetCache_crc = new CRC32(); - NetCache_indexCaches = new IndexCache[256]; + NetCache_indexCaches = new Archive[256]; field631 = 0; NetCache_crcMismatches = 0; NetCache_ioExceptions = 0; diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index 03b741230c..f9baebe987 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -12,7 +12,7 @@ public class NetFileRequest extends DualNode { signature = "Lit;" ) @Export("indexCache") - public IndexCache indexCache; + public Archive indexCache; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1487103265 diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index ae8947b0d5..ca8c6ed7c8 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -536,7 +536,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { signature = "(Lir;Lir;Lir;Lhm;I)Z", garbageValue = "-590103687" ) - public static boolean method3537(AbstractIndexCache var0, AbstractIndexCache var1, AbstractIndexCache var2, MidiPcmStream var3) { + public static boolean method3537(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) { class1.field1105 = var0; class214.field1127 = var1; class214.field1128 = var2; diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index 47fa02edef..05dc5fc2d7 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -15,12 +15,12 @@ public class ObjectDefinition extends DualNode { signature = "Lir;" ) @Export("ObjectDefinition_indexCache") - static AbstractIndexCache ObjectDefinition_indexCache; + static AbstractArchive ObjectDefinition_indexCache; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lir;" ) - static AbstractIndexCache field640; + static AbstractArchive field640; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Ler;" @@ -470,7 +470,7 @@ public class ObjectDefinition extends DualNode { } else if (var2 == 82) { this.mapIconId = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = AbstractIndexCache.readStringIntParameters(var1, this.params); + this.params = AbstractArchive.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -515,7 +515,7 @@ public class ObjectDefinition extends DualNode { if (this.field645 != null) { for (int var4 = 0; var4 < this.field645.length; ++var4) { if (this.field645[var4] == var1) { - return field640.tryLoadRecord(this.field644[var4] & 65535, 0); + return field640.tryLoadFile(this.field644[var4] & 65535, 0); } } @@ -528,7 +528,7 @@ public class ObjectDefinition extends DualNode { boolean var2 = true; for (int var3 = 0; var3 < this.field644.length; ++var3) { - var2 &= field640.tryLoadRecord(this.field644[var3] & 65535, 0); + var2 &= field640.tryLoadFile(this.field644[var3] & 65535, 0); } return var2; @@ -547,7 +547,7 @@ public class ObjectDefinition extends DualNode { boolean var1 = true; for (int var2 = 0; var2 < this.field644.length; ++var2) { - var1 &= field640.tryLoadRecord(this.field644[var2] & 65535, 0); + var1 &= field640.tryLoadFile(this.field644[var2] & 65535, 0); } return var1; @@ -907,7 +907,7 @@ public class ObjectDefinition extends DualNode { if (var1 != null) { return var1; } else { - byte[] var2 = NPCDefinition.NpcDefinition_indexCache.takeRecord(9, var0); + byte[] var2 = NPCDefinition.NpcDefinition_indexCache.takeFile(9, var0); var1 = new NPCDefinition(); var1.id = var0; if (var2 != null) { diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java index 1fb50a8cb5..76d0d30733 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -18,7 +18,7 @@ public final class ObjectSound extends Node { signature = "Lit;" ) @Export("indexCache2") - static IndexCache indexCache2; + static Archive indexCache2; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 647270745 diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index 0569ab5f5c..10b0bdbfb4 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -119,7 +119,7 @@ public final class Occluder { if (var1 != null) { return var1; } else { - byte[] var2 = VarbitDefinition.VarbitDefinition_indexCache.takeRecord(14, var0); + byte[] var2 = VarbitDefinition.VarbitDefinition_indexCache.takeFile(14, var0); var1 = new VarbitDefinition(); if (var2 != null) { var1.read(new Buffer(var2)); diff --git a/runescape-client/src/main/java/OverlayDefinition.java b/runescape-client/src/main/java/OverlayDefinition.java index 63a376eb61..4a8488a530 100644 --- a/runescape-client/src/main/java/OverlayDefinition.java +++ b/runescape-client/src/main/java/OverlayDefinition.java @@ -11,7 +11,7 @@ public class OverlayDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field663; + public static AbstractArchive field663; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index b4985caf88..43b237d5c7 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -175,7 +175,7 @@ public final class PacketBuffer extends Buffer { garbageValue = "-1562700981" ) @Export("requestNetFile") - static void requestNetFile(IndexCache var0, int var1, int var2, int var3, byte var4, boolean var5) { + static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { long var6 = (long)((var1 << 16) + var2); NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); if (var8 == null) { diff --git a/runescape-client/src/main/java/ParamKeyDefinition.java b/runescape-client/src/main/java/ParamKeyDefinition.java index 6e1ae779da..79e24fed2e 100644 --- a/runescape-client/src/main/java/ParamKeyDefinition.java +++ b/runescape-client/src/main/java/ParamKeyDefinition.java @@ -11,7 +11,7 @@ public class ParamKeyDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field679; + public static AbstractArchive field679; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 2845a48a04..52f8e3af95 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -526,7 +526,7 @@ public final class Player extends Actor { ScriptEvent var1 = new ScriptEvent(); var1.widget = var0; var1.args0 = var0.onTargetLeave; - AbstractIndexCache.runScript(var1); + AbstractArchive.runScript(var1); } Client.isSpellSelected = false; diff --git a/runescape-client/src/main/java/RectangleMode.java b/runescape-client/src/main/java/RectangleMode.java index 53928a6045..a47d78b510 100644 --- a/runescape-client/src/main/java/RectangleMode.java +++ b/runescape-client/src/main/java/RectangleMode.java @@ -59,7 +59,7 @@ public enum RectangleMode implements Enumerated { signature = "(Lir;Lir;ZB)V", garbageValue = "1" ) - public static void method6028(AbstractIndexCache var0, AbstractIndexCache var1, boolean var2) { + public static void method6028(AbstractArchive var0, AbstractArchive var1, boolean var2) { ObjectDefinition.ObjectDefinition_indexCache = var0; ObjectDefinition.field640 = var1; ObjectDefinition.ObjectDefinition_isLowDetail = var2; diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index 23ce144181..eee9d2ab63 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -73,8 +73,8 @@ public abstract class RouteStrategy { garbageValue = "-602741260" ) @Export("loadSpriteFlat") - static boolean loadSpriteFlat(AbstractIndexCache var0, int var1) { - byte[] var2 = var0.takeRecordFlat(var1); + static boolean loadSpriteFlat(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); if (var2 == null) { return false; } else { diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index e976ebcffa..42cdac2b24 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -36,7 +36,7 @@ public class SecureRandomCallable implements Callable { if (var1 != null) { return var1; } else { - byte[] var2 = VarpDefinition.field943.takeRecord(16, var0); + byte[] var2 = VarpDefinition.field943.takeFile(16, var0); var1 = new VarpDefinition(); if (var2 != null) { var1.read(new Buffer(var2)); diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index 378872b26b..a5ab41ae75 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -22,7 +22,7 @@ public class SecureRandomFuture { signature = "Lit;" ) @Export("indexCache5") - static IndexCache indexCache5; + static Archive indexCache5; @ObfuscatedName("jn") @ObfuscatedSignature( signature = "Ldl;" diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index 134ea54929..68c330388b 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -12,17 +12,17 @@ public class SequenceDefinition extends DualNode { signature = "Lir;" ) @Export("SequenceDefinition_indexCache") - public static AbstractIndexCache SequenceDefinition_indexCache; + public static AbstractArchive SequenceDefinition_indexCache; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field773; + public static AbstractArchive field773; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field774; + public static AbstractArchive field774; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index 1f17947b6a..eefc146760 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -17,7 +17,7 @@ public class Skeleton extends Node { signature = "Lit;" ) @Export("indexCache1") - static IndexCache indexCache1; + static Archive indexCache1; @ObfuscatedName("m") @ObfuscatedGetter( intValue = -1634889691 diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index a35cc48a35..ab7356b395 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -26,7 +26,7 @@ public class Skills { if (var1 != null) { return var1; } else { - byte[] var2 = ItemDefinition.ItemDefinition_indexCache.takeRecord(10, var0); + byte[] var2 = ItemDefinition.ItemDefinition_indexCache.takeFile(10, var0); var1 = new ItemDefinition(); var1.id = var0; if (var2 != null) { diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java index 273e1d1d91..e27628c686 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -18,13 +18,13 @@ public class SoundCache { signature = "Lir;" ) @Export("soundEffectIndex") - AbstractIndexCache soundEffectIndex; + AbstractArchive soundEffectIndex; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) @Export("musicSampleIndex") - AbstractIndexCache musicSampleIndex; + AbstractArchive musicSampleIndex; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lld;" @@ -41,7 +41,7 @@ public class SoundCache { @ObfuscatedSignature( signature = "(Lir;Lir;)V" ) - public SoundCache(AbstractIndexCache var1, AbstractIndexCache var2) { + public SoundCache(AbstractArchive var1, AbstractArchive var2) { this.musicSamples = new NodeHashTable(256); this.rawSounds = new NodeHashTable(256); this.soundEffectIndex = var1; diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index 6226bf1571..a0568f7435 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -126,8 +126,8 @@ public class SoundEffect { signature = "(Lir;II)Lci;" ) @Export("readSoundEffect") - public static SoundEffect readSoundEffect(AbstractIndexCache var0, int var1, int var2) { - byte[] var3 = var0.takeRecord(var1, var2); + public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); return var3 == null ? null : new SoundEffect(new Buffer(var3)); } } diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java index e80bd0db1f..aa77ace319 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -50,7 +50,7 @@ public class SoundSystem implements Runnable { if (var1 != null) { return var1; } else { - byte[] var2 = Formatting.indexCache12.takeRecord(var0, 0); + byte[] var2 = Formatting.indexCache12.takeFile(var0, 0); if (var2 == null) { return null; } else { diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index b9d3951b01..1917bb2f86 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -12,13 +12,13 @@ public class SpotAnimationDefinition extends DualNode { signature = "Lir;" ) @Export("SpotAnimationDefinition_indexCache") - public static AbstractIndexCache SpotAnimationDefinition_indexCache; + public static AbstractArchive SpotAnimationDefinition_indexCache; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) @Export("SpotAnimationDefinition_modelIndexCache") - public static AbstractIndexCache SpotAnimationDefinition_modelIndexCache; + public static AbstractArchive SpotAnimationDefinition_modelIndexCache; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/SpriteIds.java b/runescape-client/src/main/java/SpriteIds.java index a21e1d23ec..d1580be415 100644 --- a/runescape-client/src/main/java/SpriteIds.java +++ b/runescape-client/src/main/java/SpriteIds.java @@ -92,8 +92,8 @@ public class SpriteIds { garbageValue = "1764356022" ) @Export("read") - public void read(AbstractIndexCache var1) { - byte[] var2 = var1.takeRecordFlat(class311.field3810.field3809); + public void read(AbstractArchive var1) { + byte[] var2 = var1.takeFileFlat(class311.field3810.field3809); Buffer var3 = new Buffer(var2); while (true) { @@ -127,11 +127,11 @@ public class SpriteIds { signature = "(Lir;Lir;III)Lkk;", garbageValue = "195396240" ) - public static Font method5823(AbstractIndexCache var0, AbstractIndexCache var1, int var2, int var3) { + public static Font method5823(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { if (!SpriteMask.loadSprite(var0, var2, var3)) { return null; } else { - byte[] var4 = var1.takeRecord(var2, var3); + byte[] var4 = var1.takeFile(var2, var3); Font var5; if (var4 == null) { var5 = null; diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index e14649895e..48dbd00210 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -96,8 +96,8 @@ public class SpriteMask extends DualNode { garbageValue = "1" ) @Export("loadSprite") - public static boolean loadSprite(AbstractIndexCache var0, int var1, int var2) { - byte[] var3 = var0.takeRecord(var1, var2); + public static boolean loadSprite(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); if (var3 == null) { return false; } else { diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index 07e4155771..b09dcca747 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -27,21 +27,21 @@ public class Strings { Buffer var1 = new Buffer(var0); int var2 = var1.readUnsignedByte(); int var3 = var1.readInt(); - if (var3 >= 0 && (AbstractIndexCache.field1 == 0 || var3 <= AbstractIndexCache.field1)) { + if (var3 >= 0 && (AbstractArchive.field1 == 0 || var3 <= AbstractArchive.field1)) { if (var2 == 0) { byte[] var6 = new byte[var3]; var1.method46(var6, 0, var3); return var6; } else { int var4 = var1.readInt(); - if (var4 < 0 || AbstractIndexCache.field1 != 0 && var4 > AbstractIndexCache.field1) { + if (var4 < 0 || AbstractArchive.field1 != 0 && var4 > AbstractArchive.field1) { throw new RuntimeException(); } else { byte[] var5 = new byte[var4]; if (var2 == 1) { Bzip2Decompressor.Bzip2Decompressor_decompress(var5, var4, var0, var3, 9); } else { - AbstractIndexCache.gzipDecompressor.decompress(var1, var5); + AbstractArchive.gzipDecompressor.decompress(var1, var5); } return var5; diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index bfbeb96b71..0f8a462be8 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -11,7 +11,7 @@ public class StructDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field885; + public static AbstractArchive field885; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" @@ -58,7 +58,7 @@ public class StructDefinition extends DualNode { @Export("readNext") void readNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = AbstractIndexCache.readStringIntParameters(var1, this.params); + this.params = AbstractArchive.readStringIntParameters(var1, this.params); } } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index 8a6694afac..d2c5457236 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -73,7 +73,7 @@ public enum StudioGame implements Enumerated { if (var1 != null) { return var1; } else { - byte[] var2 = UnderlayDefinition.UnderlayDefinition_indexCache.takeRecord(1, var0); + byte[] var2 = UnderlayDefinition.UnderlayDefinition_indexCache.takeFile(1, var0); var1 = new UnderlayDefinition(); if (var2 != null) { var1.read(new Buffer(var2), var0); diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index ce5b8d8384..8c52add844 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -86,10 +86,10 @@ public class Texture extends Node { @ObfuscatedSignature( signature = "(DILir;)Z" ) - boolean method320(double var1, int var3, AbstractIndexCache var4) { + boolean method320(double var1, int var3, AbstractArchive var4) { int var5; for (var5 = 0; var5 < this.records.length; ++var5) { - if (var4.getRecordFlat(this.records[var5]) == null) { + if (var4.getFileFlat(this.records[var5]) == null) { return false; } } diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java index b6a22d12a5..b9cbae14c1 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -52,12 +52,12 @@ public class TextureProvider implements TextureLoader { signature = "Lir;" ) @Export("indexCache") - AbstractIndexCache indexCache; + AbstractArchive indexCache; @ObfuscatedSignature( signature = "(Lir;Lir;IDI)V" ) - public TextureProvider(AbstractIndexCache var1, AbstractIndexCache var2, int var3, double var4, int var6) { + public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { this.deque = new NodeDeque(); this.remaining = 0; this.brightness0 = 1.0D; @@ -72,7 +72,7 @@ public class TextureProvider implements TextureLoader { this.textures = new Texture[var1.method4(0)]; for (int var9 = 0; var9 < var8; ++var9) { - Buffer var10 = new Buffer(var1.takeRecord(0, var7[var9])); + Buffer var10 = new Buffer(var1.takeFile(0, var7[var9])); this.textures[var7[var9]] = new Texture(var10); } diff --git a/runescape-client/src/main/java/UnderlayDefinition.java b/runescape-client/src/main/java/UnderlayDefinition.java index 8ebdfe0da9..43c1a593c9 100644 --- a/runescape-client/src/main/java/UnderlayDefinition.java +++ b/runescape-client/src/main/java/UnderlayDefinition.java @@ -12,7 +12,7 @@ public class UnderlayDefinition extends DualNode { signature = "Lir;" ) @Export("UnderlayDefinition_indexCache") - static AbstractIndexCache UnderlayDefinition_indexCache; + static AbstractArchive UnderlayDefinition_indexCache; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/UnitPriceComparator.java b/runescape-client/src/main/java/UnitPriceComparator.java index d1c09b9fe3..d0d4a05c66 100644 --- a/runescape-client/src/main/java/UnitPriceComparator.java +++ b/runescape-client/src/main/java/UnitPriceComparator.java @@ -45,7 +45,7 @@ final class UnitPriceComparator implements Comparator { signature = "(Lir;B)V", garbageValue = "23" ) - public static void method135(AbstractIndexCache var0) { + public static void method135(AbstractArchive var0) { VarbitDefinition.VarbitDefinition_indexCache = var0; } diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index d016050749..93f8e81b87 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -11,7 +11,7 @@ public class UserComparator3 extends AbstractUserComparator { signature = "Lit;" ) @Export("indexCache6") - static IndexCache indexCache6; + static Archive indexCache6; @ObfuscatedName("fl") @ObfuscatedSignature( signature = "Lfm;" diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java index 3f2d265505..ba5e343e14 100644 --- a/runescape-client/src/main/java/VarbitDefinition.java +++ b/runescape-client/src/main/java/VarbitDefinition.java @@ -12,7 +12,7 @@ public class VarbitDefinition extends DualNode { signature = "Lir;" ) @Export("VarbitDefinition_indexCache") - static AbstractIndexCache VarbitDefinition_indexCache; + static AbstractArchive VarbitDefinition_indexCache; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index 359502ebb5..572b8c0a4d 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -11,7 +11,7 @@ public class VarcInt extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - static AbstractIndexCache field942; + static AbstractArchive field942; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index f7a988efaa..a78e68a7f1 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -356,7 +356,7 @@ public class Varcs { signature = "(Lir;I)V", garbageValue = "321265868" ) - public static void method2160(AbstractIndexCache var0) { + public static void method2160(AbstractArchive var0) { OverlayDefinition.field663 = var0; } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index b650c9347c..c688b4fbee 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -11,7 +11,7 @@ public class VarpDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field943; + public static AbstractArchive field943; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 510774535 diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index 57745938a0..799664d180 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -28,7 +28,7 @@ public class Varps { signature = "(Lir;I)V", garbageValue = "2111080001" ) - public static void method4393(AbstractIndexCache var0) { + public static void method4393(AbstractArchive var0) { UnderlayDefinition.UnderlayDefinition_indexCache = var0; } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index f29255a2e9..c94e666cfe 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -27,12 +27,12 @@ public class Widget extends Node { signature = "Lir;" ) @Export("Widget_indexCache") - public static AbstractIndexCache Widget_indexCache; + public static AbstractArchive Widget_indexCache; @ObfuscatedName("d") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field955; + public static AbstractArchive field955; @ObfuscatedName("n") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/WidgetGroupParent.java b/runescape-client/src/main/java/WidgetGroupParent.java index 19c90b5d88..ad949b8a8a 100644 --- a/runescape-client/src/main/java/WidgetGroupParent.java +++ b/runescape-client/src/main/java/WidgetGroupParent.java @@ -49,11 +49,11 @@ public class WidgetGroupParent extends Node { return var2; } else { String var3 = String.valueOf(var0); - int var4 = Formatting.indexCache12.getArchiveId(var3); + int var4 = Formatting.indexCache12.getGroupId(var3); if (var4 == -1) { return null; } else { - byte[] var5 = Formatting.indexCache12.takeRecordFlat(var4); + byte[] var5 = Formatting.indexCache12.takeFileFlat(var4); if (var5 != null) { if (var5.length <= 1) { return null; diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 323886684a..a8939dfe2e 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -35,17 +35,17 @@ public class WorldMap { @ObfuscatedSignature( signature = "Lir;" ) - AbstractIndexCache field989; + AbstractArchive field989; @ObfuscatedName("l") @ObfuscatedSignature( signature = "Lir;" ) - AbstractIndexCache field990; + AbstractArchive field990; @ObfuscatedName("e") @ObfuscatedSignature( signature = "Lir;" ) - AbstractIndexCache field991; + AbstractArchive field991; @ObfuscatedName("n") @ObfuscatedSignature( signature = "Lkk;" @@ -312,7 +312,7 @@ public class WorldMap { garbageValue = "1887817097" ) @Export("init") - public void init(AbstractIndexCache var1, AbstractIndexCache var2, AbstractIndexCache var3, Font var4, HashMap var5, IndexedSprite[] var6) { + public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) { this.mapSceneSprites = var6; this.field989 = var1; this.field990 = var2; @@ -323,12 +323,12 @@ public class WorldMap { this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); this.cacheLoader = new WorldMapIndexCacheLoader(var1); - int var7 = this.field989.getArchiveId(WorldMapCacheName.WorldMapCacheName_details.name); + int var7 = this.field989.getGroupId(WorldMapCacheName.WorldMapCacheName_details.name); int[] var8 = this.field989.method3(var7); this.mapAreas = new HashMap(var8.length); for (int var9 = 0; var9 < var8.length; ++var9) { - Buffer var10 = new Buffer(this.field989.takeRecord(var7, var8[var9])); + Buffer var10 = new Buffer(this.field989.takeFile(var7, var8[var9])); WorldMapArea var11 = new WorldMapArea(); var11.read(var10, var8[var9]); this.mapAreas.put(var11.archiveName(), var11); @@ -370,7 +370,7 @@ public class WorldMap { AbstractWorldMapIcon var13; ScriptEvent var14; WorldMapEvent var15; - for (var12 = var10.iterator(); var12.hasNext(); AbstractIndexCache.runScript(var14)) { + for (var12 = var10.iterator(); var12.hasNext(); AbstractArchive.runScript(var14)) { var13 = (AbstractWorldMapIcon)var12.next(); var11.add(var13); var14 = new ScriptEvent(); @@ -392,7 +392,7 @@ public class WorldMap { var15 = new WorldMapEvent(var13.vmethod395(), var13.coord1, var13.coord2); var14.setArgs(new Object[]{var15, var1, var2}); var14.setType(16); - AbstractIndexCache.runScript(var14); + AbstractArchive.runScript(var14); } } @@ -1327,7 +1327,7 @@ public class WorldMap { var5.setType(14); } - AbstractIndexCache.runScript(var5); + AbstractArchive.runScript(var5); } @ObfuscatedName("bx") diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 9727a79f03..6fe7e0c410 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -89,7 +89,7 @@ public class WorldMapAreaData extends WorldMapArea { if (var1 != null) { return var1; } else { - byte[] var2 = SequenceDefinition.SequenceDefinition_indexCache.takeRecord(12, var0); + byte[] var2 = SequenceDefinition.SequenceDefinition_indexCache.takeFile(12, var0); var1 = new SequenceDefinition(); if (var2 != null) { var1.read(new Buffer(var2)); diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index ed14d0ff1f..40356c54f5 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -12,7 +12,7 @@ public class WorldMapDecoration { signature = "Lit;" ) @Export("indexCache4") - static IndexCache indexCache4; + static Archive indexCache4; @ObfuscatedName("kw") @ObfuscatedGetter( intValue = -12041645 @@ -96,7 +96,7 @@ public class WorldMapDecoration { ScriptEvent var5 = new ScriptEvent(); var5.widget = var4; var5.args0 = var4.onTargetEnter; - AbstractIndexCache.runScript(var5); + AbstractArchive.runScript(var5); } Client.field157 = var3; diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index fd5ef00171..7eb4d7707b 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -161,17 +161,17 @@ public enum WorldMapDecorationType implements Enumerated { garbageValue = "1" ) public static InvDefinition method4523(int var0) { - InvDefinition var1 = (InvDefinition)InvDefinition.field427.get((long)var0); + InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); if (var1 != null) { return var1; } else { - byte[] var2 = class4.field1158.takeRecord(5, var0); + byte[] var2 = class4.field1158.takeFile(5, var0); var1 = new InvDefinition(); if (var2 != null) { var1.read(new Buffer(var2)); } - InvDefinition.field427.put(var1, (long)var0); + InvDefinition.InvDefinition_cached.put(var1, (long)var0); return var1; } } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index 62870b4599..4cf0df629b 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -11,7 +11,7 @@ public class WorldMapElement extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field1019; + public static AbstractArchive field1019; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Ler;" diff --git a/runescape-client/src/main/java/WorldMapIcon1.java b/runescape-client/src/main/java/WorldMapIcon1.java index b1fbbf21e1..4ce75a7560 100644 --- a/runescape-client/src/main/java/WorldMapIcon1.java +++ b/runescape-client/src/main/java/WorldMapIcon1.java @@ -18,7 +18,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { signature = "Lit;" ) @Export("indexCache3") - static IndexCache indexCache3; + static Archive indexCache3; @ObfuscatedName("ec") @Export("secureRandom") static SecureRandom secureRandom; diff --git a/runescape-client/src/main/java/WorldMapIndexCacheLoader.java b/runescape-client/src/main/java/WorldMapIndexCacheLoader.java index 7dadbb8aac..891978276e 100644 --- a/runescape-client/src/main/java/WorldMapIndexCacheLoader.java +++ b/runescape-client/src/main/java/WorldMapIndexCacheLoader.java @@ -15,7 +15,7 @@ public class WorldMapIndexCacheLoader { signature = "Lir;" ) @Export("indexCache") - AbstractIndexCache indexCache; + AbstractArchive indexCache; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 624113115 @@ -29,7 +29,7 @@ public class WorldMapIndexCacheLoader { @ObfuscatedSignature( signature = "(Lir;)V" ) - WorldMapIndexCacheLoader(AbstractIndexCache var1) { + WorldMapIndexCacheLoader(AbstractArchive var1) { this.percentLoaded0 = 0; this.isLoaded0 = false; this.indexCache = var1; @@ -59,7 +59,7 @@ public class WorldMapIndexCacheLoader { @Export("load") int load() { if (this.percentLoaded0 < 33) { - if (!this.indexCache.tryLoadRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, this.cacheName)) { + if (!this.indexCache.tryLoadFileByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, this.cacheName)) { return this.percentLoaded0; } @@ -67,7 +67,7 @@ public class WorldMapIndexCacheLoader { } if (this.percentLoaded0 == 33) { - if (this.indexCache.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName) && !this.indexCache.tryLoadRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName)) { + if (this.indexCache.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName) && !this.indexCache.tryLoadFileByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName)) { return this.percentLoaded0; } @@ -75,7 +75,7 @@ public class WorldMapIndexCacheLoader { } if (this.percentLoaded0 == 66) { - if (!this.indexCache.tryLoadRecordByNames(this.cacheName, WorldMapCacheName.WorldMapCacheName_labels.name)) { + if (!this.indexCache.tryLoadFileByNames(this.cacheName, WorldMapCacheName.WorldMapCacheName_labels.name)) { return this.percentLoaded0; } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index 18cb501ec4..bb5eeeeb11 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -35,7 +35,7 @@ public class WorldMapLabelSize { @ObfuscatedSignature( signature = "Lit;" ) - static IndexCache field1040; + static Archive field1040; @ObfuscatedName("fi") @ObfuscatedGetter( intValue = 1577759565 diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index e15da8096e..b7fc8eccab 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -51,12 +51,12 @@ public final class WorldMapManager { @ObfuscatedSignature( signature = "Lir;" ) - final AbstractIndexCache field1046; + final AbstractArchive field1046; @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lir;" ) - final AbstractIndexCache field1047; + final AbstractArchive field1047; @ObfuscatedName("d") @Export("fonts") final HashMap fonts; @@ -91,7 +91,7 @@ public final class WorldMapManager { @ObfuscatedSignature( signature = "([Llq;Ljava/util/HashMap;Lir;Lir;)V" ) - public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractIndexCache var3, AbstractIndexCache var4) { + public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { this.isLoaded0 = false; this.loadStarted = false; this.field1045 = new HashMap(); @@ -108,15 +108,15 @@ public final class WorldMapManager { garbageValue = "32" ) @Export("load") - public void load(AbstractIndexCache var1, String var2, boolean var3) { + public void load(AbstractArchive var1, String var2, boolean var3) { if (!this.loadStarted) { this.isLoaded0 = false; this.loadStarted = true; System.nanoTime(); - int var4 = var1.getArchiveId(WorldMapCacheName.WorldMapCacheName_details.name); - int var5 = var1.getRecordId(var4, var2); - Buffer var6 = new Buffer(var1.takeRecordByNames(WorldMapCacheName.WorldMapCacheName_details.name, var2)); - Buffer var7 = new Buffer(var1.takeRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, var2)); + int var4 = var1.getGroupId(WorldMapCacheName.WorldMapCacheName_details.name); + int var5 = var1.getFileId(var4, var2); + Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.WorldMapCacheName_details.name, var2)); + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, var2)); System.nanoTime(); System.nanoTime(); this.mapAreaData = new WorldMapAreaData(); @@ -165,7 +165,7 @@ public final class WorldMapManager { System.nanoTime(); System.nanoTime(); if (var1.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2)) { - byte[] var18 = var1.takeRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2); + byte[] var18 = var1.takeFileByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2); this.overviewSprite = class27.convertJpgToSprite(var18); } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 4d8247b51b..560007ff66 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -252,7 +252,7 @@ public class WorldMapRegion { signature = "(Lir;B)Z", garbageValue = "2" ) - boolean method409(AbstractIndexCache var1) { + boolean method409(AbstractArchive var1) { if (this.field239 != null) { this.field239.method263(var1); if (this.field239.method271()) { @@ -289,7 +289,7 @@ public class WorldMapRegion { signature = "(ILad;[Llq;Lir;Lir;I)V", garbageValue = "518389076" ) - void method455(int var1, class40 var2, IndexedSprite[] var3, AbstractIndexCache var4, AbstractIndexCache var5) { + void method455(int var1, class40 var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { this.field1054 = var1; if ((this.field239 != null || !this.field1052.isEmpty()) && class13.method164(this.x, this.y, var1) == null) { boolean var6 = true; @@ -301,9 +301,9 @@ public class WorldMapRegion { var7 = ((class21)this.field1052.getFirst()).field150; } - var6 &= var5.tryLoadArchive(var7); + var6 &= var5.tryLoadGroup(var7); if (var6) { - byte[] var8 = var5.takeRecordFlat(var7); + byte[] var8 = var5.takeFileFlat(var7); class27 var9 = SecureRandomCallable.method1145(var8); Sprite var10 = new Sprite(this.field1054 * 64, this.field1054 * 64); var10.setRaster(); @@ -449,7 +449,7 @@ public class WorldMapRegion { if (var11 != null) { var12 = var11; } else { - byte[] var13 = OverlayDefinition.field663.takeRecord(4, var7); + byte[] var13 = OverlayDefinition.field663.takeFile(4, var7); var11 = new OverlayDefinition(); if (var13 != null) { var11.read(new Buffer(var13), var7); @@ -554,7 +554,7 @@ public class WorldMapRegion { if (var8 != null) { var9 = var8; } else { - byte[] var10 = OverlayDefinition.field663.takeRecord(4, var6); + byte[] var10 = OverlayDefinition.field663.takeFile(4, var6); var8 = new OverlayDefinition(); if (var10 != null) { var8.read(new Buffer(var10), var6); diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index 9b7aae46ca..a0a4f653cc 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -15,7 +15,7 @@ public class WorldMapSection1 implements WorldMapSection { signature = "Lit;" ) @Export("indexCache15") - static IndexCache indexCache15; + static Archive indexCache15; @ObfuscatedName("ey") @ObfuscatedGetter( intValue = -1516124929 @@ -193,7 +193,7 @@ public class WorldMapSection1 implements WorldMapSection { if (var1 != null) { return var1; } else { - byte[] var2 = KitDefinition.KitDefinition_indexCache.takeRecord(3, var0); + byte[] var2 = KitDefinition.KitDefinition_indexCache.takeFile(3, var0); var1 = new KitDefinition(); if (var2 != null) { var1.read(new Buffer(var2)); diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java index a3dc383399..99fdb5df3b 100644 --- a/runescape-client/src/main/java/WorldMapSection3.java +++ b/runescape-client/src/main/java/WorldMapSection3.java @@ -15,7 +15,7 @@ public class WorldMapSection3 implements WorldMapSection { signature = "Lit;" ) @Export("indexCache8") - static IndexCache indexCache8; + static Archive indexCache8; @ObfuscatedName("go") @ObfuscatedGetter( intValue = -948290091 diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index d1d301d612..701c9fb048 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -9,7 +9,7 @@ final class class1 implements class0 { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field1105; + public static AbstractArchive field1105; @ObfuscatedName("m") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index 4da7663662..4706aa5295 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -36,8 +36,8 @@ public class class13 { ) @Export("playPcmPlayers") static final void playPcmPlayers() { - if (AbstractIndexCache.pcmPlayer1 != null) { - AbstractIndexCache.pcmPlayer1.run(); + if (AbstractArchive.pcmPlayer1 != null) { + AbstractArchive.pcmPlayer1.run(); } if (WorldMapCacheName.pcmPlayer0 != null) { diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 6d20c53087..3811b9d99d 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -22,7 +22,7 @@ public class class16 { signature = "Lit;" ) @Export("indexCache10") - static IndexCache indexCache10; + static Archive indexCache10; @ObfuscatedName("ga") @ObfuscatedSignature( signature = "[Lln;" diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index 2ae59d52fe..19f4b14541 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -99,7 +99,7 @@ public class class171 { Login.Login_loadingPercent = 10; Client.titleLoadingStage = 30; } else if (Client.titleLoadingStage == 30) { - AbstractIndexCache.indexCache0 = class22.newIndexCache(0, false, true, true); + AbstractArchive.indexCache0 = class22.newIndexCache(0, false, true, true); Skeleton.indexCache1 = class22.newIndexCache(1, false, true, true); ObjectSound.indexCache2 = class22.newIndexCache(2, true, false, true); WorldMapIcon1.indexCache3 = class22.newIndexCache(3, false, true, true); @@ -124,25 +124,25 @@ public class class171 { Client.titleLoadingStage = 40; } else if (Client.titleLoadingStage == 40) { byte var1 = 0; - var0 = var1 + AbstractIndexCache.indexCache0.method131() * 4 / 100; - var0 += Skeleton.indexCache1.method131() * 4 / 100; - var0 += ObjectSound.indexCache2.method131() * 2 / 100; - var0 += WorldMapIcon1.indexCache3.method131() * 2 / 100; - var0 += WorldMapDecoration.indexCache4.method131() * 6 / 100; - var0 += SecureRandomFuture.indexCache5.method131() * 4 / 100; - var0 += UserComparator3.indexCache6.method131() * 2 / 100; - var0 += class40.indexCache7.method131() * 56 / 100; - var0 += WorldMapSection3.indexCache8.method131() * 2 / 100; - var0 += class238.indexCache9.method131() * 2 / 100; - var0 += class16.indexCache10.method131() * 2 / 100; - var0 += Login.indexCache11.method131() * 2 / 100; - var0 += Formatting.indexCache12.method131() * 2 / 100; - var0 += ByteArrayPool.indexCache13.method131() * 2 / 100; - var0 += class2.indexCache14.method131() * 2 / 100; - var0 += WorldMapSection1.indexCache15.method131() * 2 / 100; - var0 += ItemContainer.field434.method131() / 100; - var0 += WorldMapLabelSize.field1040.method131() / 100; - var0 += AbstractByteArrayCopier.field0.method131() / 100; + var0 = var1 + AbstractArchive.indexCache0.percentage() * 4 / 100; + var0 += Skeleton.indexCache1.percentage() * 4 / 100; + var0 += ObjectSound.indexCache2.percentage() * 2 / 100; + var0 += WorldMapIcon1.indexCache3.percentage() * 2 / 100; + var0 += WorldMapDecoration.indexCache4.percentage() * 6 / 100; + var0 += SecureRandomFuture.indexCache5.percentage() * 4 / 100; + var0 += UserComparator3.indexCache6.percentage() * 2 / 100; + var0 += class40.indexCache7.percentage() * 56 / 100; + var0 += WorldMapSection3.indexCache8.percentage() * 2 / 100; + var0 += class238.indexCache9.percentage() * 2 / 100; + var0 += class16.indexCache10.percentage() * 2 / 100; + var0 += Login.indexCache11.percentage() * 2 / 100; + var0 += Formatting.indexCache12.percentage() * 2 / 100; + var0 += ByteArrayPool.indexCache13.percentage() * 2 / 100; + var0 += class2.indexCache14.percentage() * 2 / 100; + var0 += WorldMapSection1.indexCache15.percentage() * 2 / 100; + var0 += ItemContainer.field434.percentage() / 100; + var0 += WorldMapLabelSize.field1040.percentage() / 100; + var0 += AbstractByteArrayCopier.field0.percentage() / 100; var0 += class22.indexCache16.method130() && class22.indexCache16.method2() ? 1 : 0; if (var0 != 100) { if (var0 != 0) { @@ -151,7 +151,7 @@ public class class171 { Login.Login_loadingPercent = 30; } else { - AbstractWorldMapIcon.method625(AbstractIndexCache.indexCache0, "Animations"); + AbstractWorldMapIcon.method625(AbstractArchive.indexCache0, "Animations"); AbstractWorldMapIcon.method625(Skeleton.indexCache1, "Skeletons"); AbstractWorldMapIcon.method625(WorldMapDecoration.indexCache4, "Sound FX"); AbstractWorldMapIcon.method625(SecureRandomFuture.indexCache5, "Maps"); @@ -177,9 +177,9 @@ public class class171 { WorldMapCacheName.pcmPlayer0 = Players.newPcmPlayer(GameShell.taskHandler, 0, 22050); WorldMapCacheName.pcmPlayer0.setStream(var28); NetSocket.method3537(WorldMapSection1.indexCache15, class2.indexCache14, WorldMapDecoration.indexCache4, var28); - AbstractIndexCache.pcmPlayer1 = Players.newPcmPlayer(GameShell.taskHandler, 1, 2048); + AbstractArchive.pcmPlayer1 = Players.newPcmPlayer(GameShell.taskHandler, 1, 2048); TaskHandler.pcmStreamMixer = new PcmStreamMixer(); - AbstractIndexCache.pcmPlayer1.setStream(TaskHandler.pcmStreamMixer); + AbstractArchive.pcmPlayer1.setStream(TaskHandler.pcmStreamMixer); MilliClock.decimator = new Decimator(22050, class309.PcmPlayer_sampleRate); Login.Login_loadingText = "Prepared sound engine"; Login.Login_loadingPercent = 35; @@ -218,7 +218,7 @@ public class class171 { Client.titleLoadingStage = 70; } } else { - IndexCache var30; + Archive var30; if (Client.titleLoadingStage == 70) { if (!ObjectSound.indexCache2.method2()) { Login.Login_loadingText = "Loading config - " + ObjectSound.indexCache2.loadPercent() + "%"; @@ -226,8 +226,8 @@ public class class171 { } else { Varcs.method2160(ObjectSound.indexCache2); Varps.method4393(ObjectSound.indexCache2); - IndexCache var31 = ObjectSound.indexCache2; - IndexCache var33 = class40.indexCache7; + Archive var31 = ObjectSound.indexCache2; + Archive var33 = class40.indexCache7; KitDefinition.KitDefinition_indexCache = var31; KitDefinition.field456 = var33; KitDefinition.field457 = KitDefinition.KitDefinition_indexCache.method4(3); @@ -235,8 +235,8 @@ public class class171 { IsaacCipher.method4082(ObjectSound.indexCache2, class40.indexCache7); var30 = ObjectSound.indexCache2; StructDefinition.field885 = var30; - IndexCache var5 = ObjectSound.indexCache2; - IndexCache var6 = class40.indexCache7; + Archive var5 = ObjectSound.indexCache2; + Archive var6 = class40.indexCache7; boolean var7 = Client.isMembersWorld; Font var8 = ScriptEvent.fontPlain11; ItemDefinition.ItemDefinition_indexCache = var5; @@ -244,52 +244,52 @@ public class class171 { class30.inMembersWorld = var7; class83.field1167 = ItemDefinition.ItemDefinition_indexCache.method4(10); class204.field1122 = var8; - IndexCache var9 = ObjectSound.indexCache2; - IndexCache var10 = AbstractIndexCache.indexCache0; - IndexCache var11 = Skeleton.indexCache1; + Archive var9 = ObjectSound.indexCache2; + Archive var10 = AbstractArchive.indexCache0; + Archive var11 = Skeleton.indexCache1; SequenceDefinition.SequenceDefinition_indexCache = var9; SequenceDefinition.field773 = var10; SequenceDefinition.field774 = var11; - IndexCache var12 = ObjectSound.indexCache2; - IndexCache var13 = class40.indexCache7; + Archive var12 = ObjectSound.indexCache2; + Archive var13 = class40.indexCache7; SpotAnimationDefinition.SpotAnimationDefinition_indexCache = var12; SpotAnimationDefinition.SpotAnimationDefinition_modelIndexCache = var13; UnitPriceComparator.method135(ObjectSound.indexCache2); - IndexCache var14 = ObjectSound.indexCache2; + Archive var14 = ObjectSound.indexCache2; VarpDefinition.field943 = var14; VarpDefinition.field944 = VarpDefinition.field943.method4(16); - IndexCache var15 = WorldMapIcon1.indexCache3; - IndexCache var16 = class40.indexCache7; - IndexCache var17 = WorldMapSection3.indexCache8; - IndexCache var18 = ByteArrayPool.indexCache13; + Archive var15 = WorldMapIcon1.indexCache3; + Archive var16 = class40.indexCache7; + Archive var17 = WorldMapSection3.indexCache8; + Archive var18 = ByteArrayPool.indexCache13; Widget.Widget_indexCache = var15; BufferedSource.field54 = var16; Widget.field955 = var17; class27.field1143 = var18; Widget.widgets = new Widget[Widget.Widget_indexCache.method5()][]; Widget.loadedWidgetGroups = new boolean[Widget.Widget_indexCache.method5()]; - IndexCache var19 = ObjectSound.indexCache2; + Archive var19 = ObjectSound.indexCache2; class4.field1158 = var19; - IndexCache var20 = ObjectSound.indexCache2; + Archive var20 = ObjectSound.indexCache2; EnumDefinition.EnumDefinition_indexCache = var20; Frames.method3241(ObjectSound.indexCache2); - IndexCache var21 = ObjectSound.indexCache2; + Archive var21 = ObjectSound.indexCache2; ParamKeyDefinition.field679 = var21; class196.varcs = new Varcs(); class60.method1172(ObjectSound.indexCache2, WorldMapSection3.indexCache8, ByteArrayPool.indexCache13); - IndexCache var22 = ObjectSound.indexCache2; - IndexCache var23 = WorldMapSection3.indexCache8; + Archive var22 = ObjectSound.indexCache2; + Archive var23 = WorldMapSection3.indexCache8; HealthBarDefinition.field379 = var22; HealthBarDefinition.field380 = var23; - IndexCache var24 = ObjectSound.indexCache2; - IndexCache var25 = WorldMapSection3.indexCache8; + Archive var24 = ObjectSound.indexCache2; + Archive var25 = WorldMapSection3.indexCache8; WorldMapElement.field1019 = var25; if (var24.method2()) { UserComparator4.WorldMapElement_count = var24.method4(35); Widget.WorldMapElement_cached = new WorldMapElement[UserComparator4.WorldMapElement_count]; for (int var26 = 0; var26 < UserComparator4.WorldMapElement_count; ++var26) { - byte[] var27 = var24.takeRecord(35, var26); + byte[] var27 = var24.takeFile(35, var26); Widget.WorldMapElement_cached[var26] = new WorldMapElement(var26); if (var27 != null) { Widget.WorldMapElement_cached[var26].read(new Buffer(var27)); @@ -487,11 +487,11 @@ public class class171 { Login.Login_loadingPercent = 92; Client.titleLoadingStage = 120; } else if (Client.titleLoadingStage == 120) { - if (!class16.indexCache10.tryLoadRecordByNames("huffman", "")) { + if (!class16.indexCache10.tryLoadFileByNames("huffman", "")) { Login.Login_loadingText = "Loading wordpack - 0%"; Login.Login_loadingPercent = 94; } else { - Huffman var37 = new Huffman(class16.indexCache10.takeRecordByNames("huffman", "")); + Huffman var37 = new Huffman(class16.indexCache10.takeFileByNames("huffman", "")); class303.huffman = var37; Login.Login_loadingText = "Loaded wordpack"; Login.Login_loadingPercent = 94; @@ -514,8 +514,8 @@ public class class171 { } } else if (Client.titleLoadingStage == 140) { Login.Login_loadingPercent = 100; - if (!ItemContainer.field434.tryLoadArchiveByName(WorldMapCacheName.WorldMapCacheName_details.name)) { - Login.Login_loadingText = "Loading world map - " + ItemContainer.field434.archiveLoadPercentByName(WorldMapCacheName.WorldMapCacheName_details.name) / 10 + "%"; + if (!ItemContainer.field434.tryLoadGroupByName(WorldMapCacheName.WorldMapCacheName_details.name)) { + Login.Login_loadingText = "Loading world map - " + ItemContainer.field434.groupLoadPercentByName(WorldMapCacheName.WorldMapCacheName_details.name) / 10 + "%"; } else { if (class60.worldMap0 == null) { class60.worldMap0 = new WorldMap(); @@ -547,7 +547,7 @@ public class class171 { var6.opIndex = var0; var6.targetName = var4; var6.args0 = var5.onOp; - AbstractIndexCache.runScript(var6); + AbstractArchive.runScript(var6); } boolean var11 = true; diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index 2fc08b58ab..26be24396c 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -10,7 +10,7 @@ final class class2 implements class0 { signature = "Lit;" ) @Export("indexCache14") - static IndexCache indexCache14; + static Archive indexCache14; @ObfuscatedName("ee") @ObfuscatedGetter( intValue = -753026759 @@ -56,7 +56,7 @@ final class class2 implements class0 { signature = "(Lir;Lir;ZII)V", garbageValue = "-1535318699" ) - static void method27(AbstractIndexCache var0, AbstractIndexCache var1, boolean var2, int var3) { + static void method27(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { if (Login.field465) { if (var3 == 4) { Login.loginIndex = 4; @@ -64,7 +64,7 @@ final class class2 implements class0 { } else { Login.loginIndex = var3; Rasterizer2D.Rasterizer2D_clear(); - byte[] var4 = var0.takeRecordByNames("title.jpg", ""); + byte[] var4 = var0.takeFileByNames("title.jpg", ""); Login.leftTitleSprite = class27.convertJpgToSprite(var4); Fonts.rightTitleSprite = Login.leftTitleSprite.copy(); if ((Client.worldProperties & 536870912) != 0) { @@ -75,8 +75,8 @@ final class class2 implements class0 { Login.titleboxSprite = MenuAction.loadIndexedSpriteByName(var1, "titlebox", ""); IndexCacheLoader.titlebuttonSprite = MenuAction.loadIndexedSpriteByName(var1, "titlebutton", ""); - int var5 = var1.getArchiveId("runes"); - int var6 = var1.getRecordId(var5, ""); + int var5 = var1.getGroupId("runes"); + int var6 = var1.getFileId(var5, ""); IndexedSprite[] var7; if (!SpriteMask.loadSprite(var1, var5, var6)) { var7 = null; @@ -85,8 +85,8 @@ final class class2 implements class0 { } WorldMapEvent.runesSprite = var7; - var6 = var1.getArchiveId("title_mute"); - int var8 = var1.getRecordId(var6, ""); + var6 = var1.getGroupId("title_mute"); + int var8 = var1.getFileId(var6, ""); IndexedSprite[] var9; if (!SpriteMask.loadSprite(var1, var6, var8)) { var9 = null; @@ -134,9 +134,9 @@ final class class2 implements class0 { signature = "(Lir;Ljava/lang/String;Ljava/lang/String;B)[Lln;", garbageValue = "0" ) - public static Sprite[] method20(AbstractIndexCache var0, String var1, String var2) { - int var3 = var0.getArchiveId(var1); - int var4 = var0.getRecordId(var3, var2); + public static Sprite[] method20(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); Sprite[] var5; if (!SpriteMask.loadSprite(var0, var3, var4)) { var5 = null; diff --git a/runescape-client/src/main/java/class204.java b/runescape-client/src/main/java/class204.java index 4f769cbdf6..4014951a80 100644 --- a/runescape-client/src/main/java/class204.java +++ b/runescape-client/src/main/java/class204.java @@ -30,9 +30,9 @@ public class class204 { signature = "(Lir;Ljava/lang/String;Ljava/lang/String;IZB)V", garbageValue = "0" ) - public static void method4011(AbstractIndexCache var0, String var1, String var2, int var3, boolean var4) { - int var5 = var0.getArchiveId(var1); - int var6 = var0.getRecordId(var5, var2); + public static void method4011(AbstractArchive var0, String var1, String var2, int var3, boolean var4) { + int var5 = var0.getGroupId(var1); + int var6 = var0.getFileId(var5, var2); Login.method2076(var0, var5, var6, var3, var4); } diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java index 41f00afe5f..8fcf3e0641 100644 --- a/runescape-client/src/main/java/class21.java +++ b/runescape-client/src/main/java/class21.java @@ -94,9 +94,9 @@ public abstract class class21 { signature = "(Lir;B)V", garbageValue = "-108" ) - void method263(AbstractIndexCache var1) { + void method263(AbstractArchive var1) { if (!this.method271()) { - byte[] var2 = var1.takeRecord(this.field150, this.field152); + byte[] var2 = var1.takeFile(this.field150, this.field152); if (var2 != null) { this.vmethod715(new Buffer(var2)); this.field157 = true; diff --git a/runescape-client/src/main/java/class211.java b/runescape-client/src/main/java/class211.java index f8254ed9d6..c614fe5651 100644 --- a/runescape-client/src/main/java/class211.java +++ b/runescape-client/src/main/java/class211.java @@ -90,7 +90,7 @@ public class class211 { RouteStrategy.Interpreter_intStackSize -= 2; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var9 = ByteArrayPool.indexCache13.takeRecord(var8, 0); + var9 = ByteArrayPool.indexCache13.takeFile(var8, 0); var10 = new Font(var9); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var10.lineCount(var3, var4); return 1; @@ -99,7 +99,7 @@ public class class211 { RouteStrategy.Interpreter_intStackSize -= 2; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var9 = ByteArrayPool.indexCache13.takeRecord(var8, 0); + var9 = ByteArrayPool.indexCache13.takeFile(var8, 0); var10 = new Font(var9); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var10.lineWidth(var3, var4); return 1; diff --git a/runescape-client/src/main/java/class214.java b/runescape-client/src/main/java/class214.java index e57819a221..39911f035c 100644 --- a/runescape-client/src/main/java/class214.java +++ b/runescape-client/src/main/java/class214.java @@ -9,12 +9,12 @@ public class class214 { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field1127; + public static AbstractArchive field1127; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field1128; + public static AbstractArchive field1128; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lhm;" @@ -30,7 +30,7 @@ public class class214 { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field1130; + public static AbstractArchive field1130; @ObfuscatedName("k") static int[] field1131; @ObfuscatedName("ko") diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java index d721431b4d..6c68ec13e6 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/class22.java @@ -22,7 +22,7 @@ public final class class22 { signature = "Lit;" ) @Export("indexCache16") - static IndexCache indexCache16; + static Archive indexCache16; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 1976624405 @@ -82,13 +82,13 @@ public final class class22 { garbageValue = "-15" ) @Export("newIndexCache") - static IndexCache newIndexCache(int var0, boolean var1, boolean var2, boolean var3) { + static Archive newIndexCache(int var0, boolean var1, boolean var2, boolean var3) { IndexStore var4 = null; if (class168.dat2File != null) { var4 = new IndexStore(var0, class168.dat2File, IndexStoreAction.idxFiles[var0], 1000000); } - return new IndexCache(var4, Fonts.indexStore255, var0, var1, var2, var3); + return new Archive(var4, Fonts.indexStore255, var0, var1, var2, var3); } @ObfuscatedName("jp") diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java index 20a523668f..db894b0a3c 100644 --- a/runescape-client/src/main/java/class229.java +++ b/runescape-client/src/main/java/class229.java @@ -19,7 +19,7 @@ public class class229 { if (var1 != null) { return var1; } else { - byte[] var2 = ParamKeyDefinition.field679.takeRecord(11, var0); + byte[] var2 = ParamKeyDefinition.field679.takeFile(11, var0); var1 = new ParamKeyDefinition(); if (var2 != null) { var1.read(new Buffer(var2)); diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java index 6fa87ea0aa..16c8acfc8e 100644 --- a/runescape-client/src/main/java/class238.java +++ b/runescape-client/src/main/java/class238.java @@ -9,7 +9,7 @@ public final class class238 { signature = "Lit;" ) @Export("indexCache9") - static IndexCache indexCache9; + static Archive indexCache9; @ObfuscatedName("im") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java index 1bc9f8323c..f9786265b1 100644 --- a/runescape-client/src/main/java/class27.java +++ b/runescape-client/src/main/java/class27.java @@ -13,7 +13,7 @@ public final class class27 { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field1143; + public static AbstractArchive field1143; @ObfuscatedName("f") final int[] field225; diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java index 0fe6164fd8..2d632c4474 100644 --- a/runescape-client/src/main/java/class30.java +++ b/runescape-client/src/main/java/class30.java @@ -95,7 +95,7 @@ public class class30 { var6 = new ScriptEvent(); var6.widget = var3; var6.args0 = var3.onDialogAbortListener; - AbstractIndexCache.runScript(var6); + AbstractArchive.runScript(var6); } if (var1 == 1 && var3.field974 != null) { @@ -109,7 +109,7 @@ public class class30 { var6 = new ScriptEvent(); var6.widget = var3; var6.args0 = var3.field974; - AbstractIndexCache.runScript(var6); + AbstractArchive.runScript(var6); } } } diff --git a/runescape-client/src/main/java/class322.java b/runescape-client/src/main/java/class322.java index cd12bd2e00..6e9164fb42 100644 --- a/runescape-client/src/main/java/class322.java +++ b/runescape-client/src/main/java/class322.java @@ -17,7 +17,7 @@ public class class322 { garbageValue = "-2000477161" ) @Export("readSprite") - public static Sprite readSprite(AbstractIndexCache var0, int var1, int var2) { + public static Sprite readSprite(AbstractArchive var0, int var1, int var2) { return !SpriteMask.loadSprite(var0, var1, var2) ? null : class258.method4900(); } diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 7543a42e7a..d5ef01167d 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -8,7 +8,7 @@ final class class4 implements class0 { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractIndexCache field1158; + public static AbstractArchive field1158; @ObfuscatedName("m") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java index 052402ebef..46263eb734 100644 --- a/runescape-client/src/main/java/class40.java +++ b/runescape-client/src/main/java/class40.java @@ -10,7 +10,7 @@ public class class40 { signature = "Lit;" ) @Export("indexCache7") - static IndexCache indexCache7; + static Archive indexCache7; @ObfuscatedName("gs") @Export("regionLandArchives") static byte[][] regionLandArchives; diff --git a/runescape-client/src/main/java/class50.java b/runescape-client/src/main/java/class50.java index 7ffa296a42..12f0681409 100644 --- a/runescape-client/src/main/java/class50.java +++ b/runescape-client/src/main/java/class50.java @@ -31,7 +31,7 @@ public class class50 { if (var1 != null) { return var1; } else { - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_indexCache.takeRecord(13, var0); + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_indexCache.takeFile(13, var0); var1 = new SpotAnimationDefinition(); var1.id = var0; if (var2 != null) { @@ -54,7 +54,7 @@ public class class50 { if (var1 != null) { return var1; } else { - byte[] var2 = ObjectDefinition.ObjectDefinition_indexCache.takeRecord(6, var0); + byte[] var2 = ObjectDefinition.ObjectDefinition_indexCache.takeFile(6, var0); var1 = new ObjectDefinition(); var1.id = var0; if (var2 != null) { @@ -119,8 +119,8 @@ public class class50 { var7 = var6 + (var5 << 8); if (!var9 || var6 != 49 && var6 != 149 && var6 != 147 && var5 != 50 && (var5 != 49 || var6 != 47)) { class308.regions[var8] = var7; - IndexCacheLoader.regionMapArchiveIds[var8] = SecureRandomFuture.indexCache5.getArchiveId("m" + var5 + "_" + var6); - MouseHandler.regionLandArchiveIds[var8] = SecureRandomFuture.indexCache5.getArchiveId("l" + var5 + "_" + var6); + IndexCacheLoader.regionMapArchiveIds[var8] = SecureRandomFuture.indexCache5.getGroupId("m" + var5 + "_" + var6); + MouseHandler.regionLandArchiveIds[var8] = SecureRandomFuture.indexCache5.getGroupId("l" + var5 + "_" + var6); ++var8; } } @@ -185,8 +185,8 @@ public class class50 { class308.regions[var4] = var12; var13 = var12 >> 8 & 255; int var14 = var12 & 255; - IndexCacheLoader.regionMapArchiveIds[var4] = SecureRandomFuture.indexCache5.getArchiveId("m" + var13 + "_" + var14); - MouseHandler.regionLandArchiveIds[var4] = SecureRandomFuture.indexCache5.getArchiveId("l" + var13 + "_" + var14); + IndexCacheLoader.regionMapArchiveIds[var4] = SecureRandomFuture.indexCache5.getGroupId("m" + var13 + "_" + var14); + MouseHandler.regionLandArchiveIds[var4] = SecureRandomFuture.indexCache5.getGroupId("l" + var13 + "_" + var14); ++var4; } } diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java index f0e810fb17..19050be122 100644 --- a/runescape-client/src/main/java/class54.java +++ b/runescape-client/src/main/java/class54.java @@ -57,7 +57,7 @@ public final class class54 { } long var15 = class203.currentTimeMs(); - if (AbstractIndexCache.method4585() && -1L == Login.field472) { + if (AbstractArchive.method4585() && -1L == Login.field472) { Login.field472 = var15; if (Login.field472 > Login.field471) { Login.field471 = Login.field472; diff --git a/runescape-client/src/main/java/class60.java b/runescape-client/src/main/java/class60.java index 1fe5e4fdba..d02a243340 100644 --- a/runescape-client/src/main/java/class60.java +++ b/runescape-client/src/main/java/class60.java @@ -19,7 +19,7 @@ public class class60 { signature = "(Lir;Lir;Lir;I)V", garbageValue = "1583108922" ) - public static void method1172(AbstractIndexCache var0, AbstractIndexCache var1, AbstractIndexCache var2) { + public static void method1172(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { HitSplatDefinition.field382 = var0; HitSplatDefinition.field383 = var1; HitSplatDefinition.field384 = var2; diff --git a/runescape-client/src/main/java/class83.java b/runescape-client/src/main/java/class83.java index 89a1da6b66..b6afdbadba 100644 --- a/runescape-client/src/main/java/class83.java +++ b/runescape-client/src/main/java/class83.java @@ -50,7 +50,7 @@ public class class83 { signature = "(Lir;II)Llq;", garbageValue = "1413048059" ) - public static IndexedSprite method2028(AbstractIndexCache var0, int var1) { + public static IndexedSprite method2028(AbstractArchive var0, int var1) { return !RouteStrategy.loadSpriteFlat(var0, var1) ? null : ServerPacket.createIndexedSprite(); } From b81aa9468556cd30e7ec986cc7bc0409a1b593e9 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sun, 7 Jul 2019 06:35:37 +0200 Subject: [PATCH 370/472] Rename IndexStore to be more accurate, rename rest in Archive --- runescape-client/src/main/java/Archive.java | 90 ++++++++-------- .../{IndexStore.java => ArchiveDisk.java} | 101 +++++++++--------- runescape-client/src/main/java/Client.java | 2 +- runescape-client/src/main/java/Fonts.java | 4 +- .../src/main/java/IndexStoreAction.java | 4 +- .../main/java/IndexStoreActionHandler.java | 4 +- runescape-client/src/main/java/NPC.java | 4 +- runescape-client/src/main/java/NetSocket.java | 2 +- runescape-client/src/main/java/Widget.java | 4 +- runescape-client/src/main/java/class22.java | 6 +- runescape-client/src/main/java/class3.java | 2 +- 11 files changed, 112 insertions(+), 111 deletions(-) rename runescape-client/src/main/java/{IndexStore.java => ArchiveDisk.java} (85%) diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index b7d51a67f1..fd51f42bab 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -15,14 +15,14 @@ public class Archive extends AbstractArchive { @ObfuscatedSignature( signature = "Lff;" ) - @Export("indexStore") - IndexStore indexStore; + @Export("archiveDisk") + ArchiveDisk archiveDisk; @ObfuscatedName("r") @ObfuscatedSignature( signature = "Lff;" ) - @Export("referenceStore") - IndexStore referenceStore; + @Export("masterDisk") + ArchiveDisk masterDisk; @ObfuscatedName("p") @ObfuscatedGetter( intValue = -1579549759 @@ -34,20 +34,20 @@ public class Archive extends AbstractArchive { @ObfuscatedName("ag") boolean field404; @ObfuscatedName("aq") - @Export("validArchives") - volatile boolean[] validArchives; + @Export("validGroups") + volatile boolean[] validGroups; @ObfuscatedName("av") @ObfuscatedGetter( intValue = 1472870917 ) - @Export("indexReferenceCrc") - int indexReferenceCrc; + @Export("indexCrc") + int indexCrc; @ObfuscatedName("ar") @ObfuscatedGetter( intValue = -785528219 ) - @Export("indexReferenceVersion") - int indexReferenceVersion; + @Export("indexVersion") + int indexVersion; @ObfuscatedName("ac") @ObfuscatedGetter( intValue = -1884661133 @@ -57,13 +57,13 @@ public class Archive extends AbstractArchive { @ObfuscatedSignature( signature = "(Lff;Lff;IZZZ)V" ) - public Archive(IndexStore var1, IndexStore var2, int var3, boolean var4, boolean var5, boolean var6) { + public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) { super(var4, var5); this.field403 = false; this.field404 = false; this.field405 = -1; - this.indexStore = var1; - this.referenceStore = var2; + this.archiveDisk = var1; + this.masterDisk = var2; this.index = var3; this.field404 = var6; int var7 = this.index; @@ -101,7 +101,7 @@ public class Archive extends AbstractArchive { ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { - return super.groups[var1] != null ? 100 : (this.validArchives[var1] ? 100 : class54.method1086(this.index, var1)); + return super.groups[var1] != null ? 100 : (this.validGroups[var1] ? 100 : class54.method1086(this.index, var1)); } @ObfuscatedName("z") @@ -111,13 +111,13 @@ public class Archive extends AbstractArchive { ) @Export("loadGroup") void loadGroup(int group) { - if (this.indexStore != null && this.validArchives != null && this.validArchives[group]) { - IndexStore var2 = this.indexStore; + if (this.archiveDisk != null && this.validGroups != null && this.validGroups[group]) { + ArchiveDisk var2 = this.archiveDisk; byte[] var3 = null; NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { for (IndexStoreAction var6 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.last(); var6 != null; var6 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.previous()) { - if (var6.key == (long) group && var2 == var6.indexStore && var6.type == 0) { + if (var6.key == (long) group && var2 == var6.archiveDisk && var6.type == 0) { var3 = var6.data; break; } @@ -173,16 +173,16 @@ public class Archive extends AbstractArchive { ) @Export("loadIndexReference") public void loadIndexReference(int var1, int var2) { - this.indexReferenceCrc = var1; - this.indexReferenceVersion = var2; - if (this.referenceStore != null) { + this.indexCrc = var1; + this.indexVersion = var2; + if (this.masterDisk != null) { int var3 = this.index; - IndexStore var4 = this.referenceStore; + ArchiveDisk var4 = this.masterDisk; byte[] var5 = null; NodeDeque var6 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { for (IndexStoreAction var8 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.last(); var8 != null; var8 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.previous()) { - if (var8.key == (long)var3 && var4 == var8.indexStore && var8.type == 0) { + if (var8.key == (long)var3 && var4 == var8.archiveDisk && var8.type == 0) { var5 = var8.data; break; } @@ -196,7 +196,7 @@ public class Archive extends AbstractArchive { this.load(var4, var3, var7, true); } } else { - PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true); + PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } } @@ -213,8 +213,8 @@ public class Archive extends AbstractArchive { throw new RuntimeException(); } - if (this.referenceStore != null) { - Widget.method4499(this.index, var2, this.referenceStore); + if (this.masterDisk != null) { + Widget.method4499(this.index, var2, this.masterDisk); } this.decodeIndex(var2); @@ -222,9 +222,9 @@ public class Archive extends AbstractArchive { } else { var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); var2[var2.length - 1] = (byte)super.groupVersions[var1]; - if (this.indexStore != null) { - Widget.method4499(var1, var2, this.indexStore); - this.validArchives[var1] = true; + if (this.archiveDisk != null) { + Widget.method4499(var1, var2, this.archiveDisk); + this.validGroups[var1] = true; } if (var4) { @@ -240,19 +240,19 @@ public class Archive extends AbstractArchive { garbageValue = "-2045340856" ) @Export("load") - void load(IndexStore var1, int var2, byte[] var3, boolean var4) { + void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { int var5; - if (var1 == this.referenceStore) { + if (var1 == this.masterDisk) { if (this.field403) { throw new RuntimeException(); } else if (var3 == null) { - PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true); + PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } else { IndexCache_crc.reset(); IndexCache_crc.update(var3, 0, var3.length); var5 = (int)IndexCache_crc.getValue(); - if (var5 != this.indexReferenceCrc) { - PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true); + if (var5 != this.indexCrc) { + PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } else { Buffer var9 = new Buffer(Strings.decompressBytes(var3)); int var7 = var9.readUnsignedByte(); @@ -264,8 +264,8 @@ public class Archive extends AbstractArchive { var8 = var9.readInt(); } - if (var8 != this.indexReferenceVersion) { - PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true); + if (var8 != this.indexVersion) { + PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } else { this.decodeIndex(var3); this.loadAllLocal(); @@ -284,20 +284,20 @@ public class Archive extends AbstractArchive { var5 = (int)IndexCache_crc.getValue(); int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); if (var5 == super.groupCrcs[var2] && var6 == super.groupVersions[var2]) { - this.validArchives[var2] = true; + this.validGroups[var2] = true; if (var4) { super.groups[var2] = Projectile.byteArrayToObject(var3, false); } } else { - this.validArchives[var2] = false; + this.validGroups[var2] = false; if (this.field404 || var4) { PacketBuffer.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } } } else { - this.validArchives[var2] = false; + this.validGroups[var2] = false; if (this.field404 || var4) { PacketBuffer.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } @@ -313,21 +313,21 @@ public class Archive extends AbstractArchive { ) @Export("loadAllLocal") void loadAllLocal() { - this.validArchives = new boolean[super.groups.length]; + this.validGroups = new boolean[super.groups.length]; int var1; - for (var1 = 0; var1 < this.validArchives.length; ++var1) { - this.validArchives[var1] = false; + for (var1 = 0; var1 < this.validGroups.length; ++var1) { + this.validGroups[var1] = false; } - if (this.indexStore == null) { + if (this.archiveDisk == null) { this.field403 = true; } else { this.field405 = -1; - for (var1 = 0; var1 < this.validArchives.length; ++var1) { + for (var1 = 0; var1 < this.validGroups.length; ++var1) { if (super.fileCounts[var1] > 0) { - NPC.method2009(var1, this.indexStore, this); + NPC.method2009(var1, this.archiveDisk, this); this.field405 = var1; } } @@ -345,7 +345,7 @@ public class Archive extends AbstractArchive { garbageValue = "0" ) public boolean method132(int var1) { - return this.validArchives[var1]; + return this.validGroups[var1]; } @ObfuscatedName("df") diff --git a/runescape-client/src/main/java/IndexStore.java b/runescape-client/src/main/java/ArchiveDisk.java similarity index 85% rename from runescape-client/src/main/java/IndexStore.java rename to runescape-client/src/main/java/ArchiveDisk.java index 673372a309..97909cc912 100644 --- a/runescape-client/src/main/java/IndexStore.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -7,8 +7,9 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ff") -@Implements("IndexStore") -public final class IndexStore { +@Implements("ArchiveDisk") +public final class ArchiveDisk +{ @ObfuscatedName("m") @Export("IndexStore_buffer") static byte[] IndexStore_buffer; @@ -16,20 +17,20 @@ public final class IndexStore { @ObfuscatedSignature( signature = "Ldy;" ) - @Export("dataFile") - BufferedFile dataFile; + @Export("datFile") + BufferedFile datFile; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Ldy;" ) - @Export("indexFile") - BufferedFile indexFile; + @Export("idxFile") + BufferedFile idxFile; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -1982523283 ) - @Export("index") - int index; + @Export("archive") + int archive; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -748616567 @@ -40,13 +41,13 @@ public final class IndexStore { @ObfuscatedSignature( signature = "(ILdy;Ldy;I)V" ) - public IndexStore(int var1, BufferedFile var2, BufferedFile var3, int var4) { - this.dataFile = null; - this.indexFile = null; + public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { + this.datFile = null; + this.idxFile = null; this.maxEntrySize = 65000; - this.index = var1; - this.dataFile = var2; - this.indexFile = var3; + this.archive = var1; + this.datFile = var2; + this.idxFile = var3; this.maxEntrySize = var4; } @@ -57,28 +58,28 @@ public final class IndexStore { ) @Export("read") public byte[] read(int var1) { - BufferedFile var2 = this.dataFile; - synchronized(this.dataFile) { + BufferedFile var2 = this.datFile; + synchronized(this.datFile) { byte[] var10000; try { Object var4; - if (this.indexFile.length() < (long)(var1 * 6 + 6)) { + if (this.idxFile.length() < (long)(var1 * 6 + 6)) { var4 = null; - var10000 = (byte[])((byte[])var4); + var10000 = ((byte[])var4); return var10000; } - this.indexFile.seek((long)(var1 * 6)); - this.indexFile.read(IndexStore_buffer, 0, 6); + this.idxFile.seek((long)(var1 * 6)); + this.idxFile.read(IndexStore_buffer, 0, 6); int var5 = ((IndexStore_buffer[0] & 255) << 16) + (IndexStore_buffer[2] & 255) + ((IndexStore_buffer[1] & 255) << 8); int var6 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8); if (var5 < 0 || var5 > this.maxEntrySize) { var4 = null; - var10000 = (byte[])((byte[])var4); + var10000 = ((byte[])var4); return var10000; } - if (var6 > 0 && (long)var6 <= this.dataFile.length() / 520L) { + if (var6 > 0 && (long)var6 <= this.datFile.length() / 520L) { byte[] var7 = new byte[var5]; int var8 = 0; int var9 = 0; @@ -86,23 +87,23 @@ public final class IndexStore { while (var8 < var5) { if (var6 == 0) { var4 = null; - var10000 = (byte[])((byte[])var4); + var10000 = ((byte[])var4); return var10000; } - this.dataFile.seek((long)(var6 * 520)); + this.datFile.seek((long)(var6 * 520)); int var10 = var5 - var8; if (var10 > 512) { var10 = 512; } - this.dataFile.read(IndexStore_buffer, 0, var10 + 8); + this.datFile.read(IndexStore_buffer, 0, var10 + 8); int var11 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8); int var12 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8); int var13 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255); int var14 = IndexStore_buffer[7] & 255; - if (var11 == var1 && var9 == var12 && var14 == this.index) { - if (var13 >= 0 && (long)var13 <= this.dataFile.length() / 520L) { + if (var11 == var1 && var9 == var12 && var14 == this.archive) { + if (var13 >= 0 && (long)var13 <= this.datFile.length() / 520L) { for (int var15 = 0; var15 < var10; ++var15) { var7[var8++] = IndexStore_buffer[var15 + 8]; } @@ -113,12 +114,12 @@ public final class IndexStore { } var4 = null; - var10000 = (byte[])((byte[])var4); + var10000 = ((byte[])var4); return var10000; } var4 = null; - var10000 = (byte[])((byte[])var4); + var10000 = ((byte[])var4); return var10000; } @@ -127,7 +128,7 @@ public final class IndexStore { } var4 = null; - var10000 = (byte[])((byte[])var4); + var10000 = ((byte[])var4); } catch (IOException var17) { return null; } @@ -143,8 +144,8 @@ public final class IndexStore { ) @Export("write") public boolean write(int var1, byte[] var2, int var3) { - BufferedFile var4 = this.dataFile; - synchronized(this.dataFile) { + BufferedFile var4 = this.datFile; + synchronized(this.datFile) { if (var3 >= 0 && var3 <= this.maxEntrySize) { boolean var6 = this.write0(var1, var2, var3, true); if (!var6) { @@ -165,29 +166,29 @@ public final class IndexStore { ) @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { - BufferedFile var5 = this.dataFile; - synchronized(this.dataFile) { + BufferedFile var5 = this.datFile; + synchronized(this.datFile) { try { int var7; boolean var8; boolean var10000; if (var4) { - if (this.indexFile.length() < (long)(var1 * 6 + 6)) { + if (this.idxFile.length() < (long)(var1 * 6 + 6)) { var8 = false; var10000 = var8; return var10000; } - this.indexFile.seek((long)(var1 * 6)); - this.indexFile.read(IndexStore_buffer, 0, 6); + this.idxFile.seek((long)(var1 * 6)); + this.idxFile.read(IndexStore_buffer, 0, 6); var7 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8); - if (var7 <= 0 || (long)var7 > this.dataFile.length() / 520L) { + if (var7 <= 0 || (long)var7 > this.datFile.length() / 520L) { var8 = false; var10000 = var8; return var10000; } } else { - var7 = (int)((this.dataFile.length() + 519L) / 520L); + var7 = (int)((this.datFile.length() + 519L) / 520L); if (var7 == 0) { var7 = 1; } @@ -199,8 +200,8 @@ public final class IndexStore { IndexStore_buffer[3] = (byte)(var7 >> 16); IndexStore_buffer[4] = (byte)(var7 >> 8); IndexStore_buffer[5] = (byte)var7; - this.indexFile.seek((long)(var1 * 6)); - this.indexFile.write(IndexStore_buffer, 0, 6); + this.idxFile.seek((long)(var1 * 6)); + this.idxFile.write(IndexStore_buffer, 0, 6); int var9 = 0; int var10 = 0; @@ -210,10 +211,10 @@ public final class IndexStore { int var11 = 0; int var12; if (var4) { - this.dataFile.seek((long)(var7 * 520)); + this.datFile.seek((long)(var7 * 520)); try { - this.dataFile.read(IndexStore_buffer, 0, 8); + this.datFile.read(IndexStore_buffer, 0, 8); } catch (EOFException var16) { break label129; } @@ -222,13 +223,13 @@ public final class IndexStore { int var13 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8); var11 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255); int var14 = IndexStore_buffer[7] & 255; - if (var12 != var1 || var13 != var10 || var14 != this.index) { + if (var12 != var1 || var13 != var10 || var14 != this.archive) { var8 = false; var10000 = var8; return var10000; } - if (var11 < 0 || (long)var11 > this.dataFile.length() / 520L) { + if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) { var8 = false; var10000 = var8; return var10000; @@ -237,7 +238,7 @@ public final class IndexStore { if (var11 == 0) { var4 = false; - var11 = (int)((this.dataFile.length() + 519L) / 520L); + var11 = (int)((this.datFile.length() + 519L) / 520L); if (var11 == 0) { ++var11; } @@ -258,15 +259,15 @@ public final class IndexStore { IndexStore_buffer[4] = (byte)(var11 >> 16); IndexStore_buffer[5] = (byte)(var11 >> 8); IndexStore_buffer[6] = (byte)var11; - IndexStore_buffer[7] = (byte)this.index; - this.dataFile.seek((long)(var7 * 520)); - this.dataFile.write(IndexStore_buffer, 0, 8); + IndexStore_buffer[7] = (byte)this.archive; + this.datFile.seek((long)(var7 * 520)); + this.datFile.write(IndexStore_buffer, 0, 8); var12 = var3 - var9; if (var12 > 512) { var12 = 512; } - this.dataFile.write(var2, var9, var12); + this.datFile.write(var2, var9, var12); var9 += var12; var7 = var11; ++var10; diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index d2712f716f..9ad504ccf6 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1277,7 +1277,7 @@ public final class Client extends GameShell implements Usernamed { this.setUpKeyboard(); this.setUpMouse(); class16.mouseWheel = this.mouseWheel(); - Fonts.indexStore255 = new IndexStore(255, class168.dat2File, class168.idx255File, 500000); + Fonts.archiveDisk255 = new ArchiveDisk(255, class168.dat2File, class168.idx255File, 500000); ReflectionCheck.clientPreferences = class306.method5780(); this.setUpClipboard(); String var1 = Ignored.field402; diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index 7d97edc6f7..89c728e522 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -11,8 +11,8 @@ public class Fonts { @ObfuscatedSignature( signature = "Lff;" ) - @Export("indexStore255") - static IndexStore indexStore255; + @Export("archiveDisk255") + static ArchiveDisk archiveDisk255; @ObfuscatedName("o") static byte[][][] field350; @ObfuscatedName("l") diff --git a/runescape-client/src/main/java/IndexStoreAction.java b/runescape-client/src/main/java/IndexStoreAction.java index 7ee3684610..f0fdb720c6 100644 --- a/runescape-client/src/main/java/IndexStoreAction.java +++ b/runescape-client/src/main/java/IndexStoreAction.java @@ -36,8 +36,8 @@ public class IndexStoreAction extends Node { @ObfuscatedSignature( signature = "Lff;" ) - @Export("indexStore") - IndexStore indexStore; + @Export("archiveDisk") + ArchiveDisk archiveDisk; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lit;" diff --git a/runescape-client/src/main/java/IndexStoreActionHandler.java b/runescape-client/src/main/java/IndexStoreActionHandler.java index 608fb79d1e..7588e57bd5 100644 --- a/runescape-client/src/main/java/IndexStoreActionHandler.java +++ b/runescape-client/src/main/java/IndexStoreActionHandler.java @@ -42,13 +42,13 @@ public class IndexStoreActionHandler implements Runnable { Object var3; if (var2 != null) { if (var2.type == 0) { - var2.indexStore.write((int)var2.key, var2.data, var2.data.length); + var2.archiveDisk.write((int)var2.key, var2.data, var2.data.length); var1 = IndexStoreActionHandler_requestQueue; synchronized(IndexStoreActionHandler_requestQueue) { var2.remove(); } } else if (var2.type == 1) { - var2.data = var2.indexStore.read((int)var2.key); + var2.data = var2.archiveDisk.read((int)var2.key); var1 = IndexStoreActionHandler_requestQueue; synchronized(IndexStoreActionHandler_requestQueue) { IndexStoreActionHandler_responseQueue.addFirst(var2); diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index ef834cae34..0a569b4511 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -167,11 +167,11 @@ public final class NPC extends Actor { signature = "(ILff;Lit;B)V", garbageValue = "-51" ) - static void method2009(int var0, IndexStore var1, Archive var2) { + static void method2009(int var0, ArchiveDisk var1, Archive var2) { IndexStoreAction var3 = new IndexStoreAction(); var3.type = 1; var3.key = (long)var0; - var3.indexStore = var1; + var3.archiveDisk = var1; var3.indexCache = var2; NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index ca8c6ed7c8..da8f4dd6b9 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -438,7 +438,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { } else if (var2 == 2) { var18 = WorldMapSection2.method593(var0, var1, var3, var4); } else { - var18 = IndexStore.method3585(var0, var1, var2, var3, var4); + var18 = ArchiveDisk.method3585(var0, var1, var2, var3, var4); } var8 = var0 - 64; diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index c94e666cfe..ea9b67341f 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -1529,12 +1529,12 @@ public class Widget extends Node { signature = "(I[BLff;I)V", garbageValue = "-1287305716" ) - static void method4499(int var0, byte[] var1, IndexStore var2) { + static void method4499(int var0, byte[] var1, ArchiveDisk var2) { IndexStoreAction var3 = new IndexStoreAction(); var3.type = 0; var3.key = (long)var0; var3.data = var1; - var3.indexStore = var2; + var3.archiveDisk = var2; NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.addFirst(var3); diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java index 6c68ec13e6..4169842e0d 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/class22.java @@ -83,12 +83,12 @@ public final class class22 { ) @Export("newIndexCache") static Archive newIndexCache(int var0, boolean var1, boolean var2, boolean var3) { - IndexStore var4 = null; + ArchiveDisk var4 = null; if (class168.dat2File != null) { - var4 = new IndexStore(var0, class168.dat2File, IndexStoreAction.idxFiles[var0], 1000000); + var4 = new ArchiveDisk(var0, class168.dat2File, IndexStoreAction.idxFiles[var0], 1000000); } - return new Archive(var4, Fonts.indexStore255, var0, var1, var2, var3); + return new Archive(var4, Fonts.archiveDisk255, var0, var1, var2, var3); } @ObfuscatedName("jp") diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index 85d54a219a..71c2945ebe 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -107,7 +107,7 @@ public class class3 implements Enumerated { return; } - var1.indexCache.load(var1.indexStore, (int)var1.key, var1.data, false); + var1.indexCache.load(var1.archiveDisk, (int)var1.key, var1.data, false); } } From 13a42e47408cf83c4793fc10b360f95ff5ae518d Mon Sep 17 00:00:00 2001 From: Lucas Date: Sun, 7 Jul 2019 06:44:39 +0200 Subject: [PATCH 371/472] name DefaultsGroup --- runescape-client/src/main/java/Decimator.java | 6 +++--- .../java/{class311.java => DefaultsGroup.java} | 17 +++++++++++------ runescape-client/src/main/java/SpriteIds.java | 2 +- .../src/main/java/StructDefinition.java | 2 +- 4 files changed, 16 insertions(+), 11 deletions(-) rename runescape-client/src/main/java/{class311.java => DefaultsGroup.java} (70%) diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index 47aadf498d..229c6bbeb6 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -212,10 +212,10 @@ public class Decimator { ViewportMouse.field951 = (var16 + var10) / 2; ViewportMouse.field952 = (var13 + var12) / 2; ViewportMouse.field953 = (var17 - var9) / 2; - class311.field1156 = (var16 - var10) / 2; + DefaultsGroup.field1156 = (var16 - var10) / 2; Skeleton.field874 = (var13 - var12) / 2; GraphicsObject.field377 = Math.abs(ViewportMouse.field953); - ViewportMouse.field954 = Math.abs(class311.field1156); + ViewportMouse.field954 = Math.abs(DefaultsGroup.field1156); class248.field1142 = Math.abs(Skeleton.field874); } @@ -228,7 +228,7 @@ public class Decimator { var9 = AccessFile.field7 - var5; var10 = ViewportMouse.field951 - var6; var11 = ViewportMouse.field952 - var7; - return Math.abs(var9) > var8 + GraphicsObject.field377 ? false : (Math.abs(var10) > var12 + ViewportMouse.field954 ? false : (Math.abs(var11) > var13 + class248.field1142 ? false : (Math.abs(var11 * class311.field1156 - var10 * Skeleton.field874) > var13 * ViewportMouse.field954 + var12 * class248.field1142 ? false : (Math.abs(var9 * Skeleton.field874 - var11 * ViewportMouse.field953) > var8 * class248.field1142 + var13 * GraphicsObject.field377 ? false : Math.abs(var10 * ViewportMouse.field953 - var9 * class311.field1156) <= var8 * ViewportMouse.field954 + var12 * GraphicsObject.field377)))); + return Math.abs(var9) > var8 + GraphicsObject.field377 ? false : (Math.abs(var10) > var12 + ViewportMouse.field954 ? false : (Math.abs(var11) > var13 + class248.field1142 ? false : (Math.abs(var11 * DefaultsGroup.field1156 - var10 * Skeleton.field874) > var13 * ViewportMouse.field954 + var12 * class248.field1142 ? false : (Math.abs(var9 * Skeleton.field874 - var11 * ViewportMouse.field953) > var8 * class248.field1142 + var13 * GraphicsObject.field377 ? false : Math.abs(var10 * ViewportMouse.field953 - var9 * DefaultsGroup.field1156) <= var8 * ViewportMouse.field954 + var12 * GraphicsObject.field377)))); } } diff --git a/runescape-client/src/main/java/class311.java b/runescape-client/src/main/java/DefaultsGroup.java similarity index 70% rename from runescape-client/src/main/java/class311.java rename to runescape-client/src/main/java/DefaultsGroup.java index df7d2a1fa4..e02abf6d73 100644 --- a/runescape-client/src/main/java/class311.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -1,14 +1,18 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ka") -public class class311 { +@Implements("DefaultsGroup") +public class DefaultsGroup +{ @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lka;" ) - static final class311 field3810; + static final DefaultsGroup field3810; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -2077113503 @@ -18,10 +22,11 @@ public class class311 { @ObfuscatedGetter( intValue = -800980069 ) - final int field3809; + @Export("group") + final int group; - class311(int var1) { - this.field3809 = var1; + DefaultsGroup(int var1) { + this.group = var1; } @ObfuscatedName("m") @@ -34,6 +39,6 @@ public class class311 { } static { - field3810 = new class311(3); + field3810 = new DefaultsGroup(3); } } diff --git a/runescape-client/src/main/java/SpriteIds.java b/runescape-client/src/main/java/SpriteIds.java index d1580be415..62d6048213 100644 --- a/runescape-client/src/main/java/SpriteIds.java +++ b/runescape-client/src/main/java/SpriteIds.java @@ -93,7 +93,7 @@ public class SpriteIds { ) @Export("read") public void read(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(class311.field3810.field3809); + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3810.group); Buffer var3 = new Buffer(var2); while (true) { diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index 0f8a462be8..b76149f043 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -261,7 +261,7 @@ public class StructDefinition extends DualNode { return 1; } else if (var0 == 1125) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - RectangleMode var7 = (RectangleMode)ScriptFrame.findEnumerated(class311.method5822(), var5); + RectangleMode var7 = (RectangleMode)ScriptFrame.findEnumerated(DefaultsGroup.method5822(), var5); if (var7 != null) { var4.rectangleMode = var7; class22.method295(var4); From 558d3e8d663c2a957908ec2913e6eb25c11eef04 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sun, 7 Jul 2019 08:17:19 +0200 Subject: [PATCH 372/472] IndexCacheLoader -> ArchiveLoader, read -> decode --- .../mixins/RSHealthBarDefinitionMixin.java | 2 +- .../java/net/runelite/rs/api/RSClient.java | 6 +- .../net/runelite/rs/api/RSEnumDefinition.java | 4 +- .../src/main/java/AbstractArchive.java | 6 +- .../main/java/AbstractByteArrayCopier.java | 2 +- .../src/main/java/AbstractUserComparator.java | 2 +- .../src/main/java/AbstractWorldMapIcon.java | 2 +- runescape-client/src/main/java/Actor.java | 4 +- runescape-client/src/main/java/Archive.java | 4 +- ...dexCacheLoader.java => ArchiveLoader.java} | 29 +-- .../src/main/java/ByteArrayPool.java | 4 +- runescape-client/src/main/java/Client.java | 72 +++--- .../src/main/java/DynamicObject.java | 12 +- .../src/main/java/EnumDefinition.java | 64 ++--- runescape-client/src/main/java/FontName.java | 24 +- .../src/main/java/Formatting.java | 20 +- runescape-client/src/main/java/GameShell.java | 7 +- .../src/main/java/GrandExchangeOffer.java | 2 +- .../src/main/java/GroundItemPile.java | 6 +- .../src/main/java/GzipDecompressor.java | 2 +- runescape-client/src/main/java/HealthBar.java | 2 +- .../src/main/java/HealthBarDefinition.java | 10 +- .../src/main/java/HitSplatDefinition.java | 10 +- .../src/main/java/IndexStoreAction.java | 4 +- .../src/main/java/Interpreter.java | 4 +- .../src/main/java/InvDefinition.java | 10 +- .../src/main/java/IsaacCipher.java | 2 +- .../src/main/java/ItemDefinition.java | 14 +- .../src/main/java/KitDefinition.java | 14 +- runescape-client/src/main/java/Login.java | 4 +- .../src/main/java/LoginScreenAnimation.java | 2 +- runescape-client/src/main/java/NPC.java | 2 +- .../src/main/java/NPCDefinition.java | 14 +- runescape-client/src/main/java/NetCache.java | 6 +- .../src/main/java/NetFileRequest.java | 4 +- .../src/main/java/ObjectDefinition.java | 18 +- .../src/main/java/ObjectSound.java | 4 +- runescape-client/src/main/java/Occluder.java | 4 +- .../src/main/java/OverlayDefinition.java | 10 +- .../src/main/java/PacketBuffer.java | 2 +- .../src/main/java/ParamKeyDefinition.java | 10 +- .../src/main/java/PlayerAppearance.java | 8 +- .../src/main/java/RectangleMode.java | 2 +- .../src/main/java/SecureRandomCallable.java | 2 +- .../src/main/java/SecureRandomFuture.java | 4 +- .../src/main/java/SequenceDefinition.java | 14 +- runescape-client/src/main/java/Skeleton.java | 4 +- runescape-client/src/main/java/Skills.java | 4 +- .../src/main/java/SoundSystem.java | 2 +- .../main/java/SpotAnimationDefinition.java | 14 +- .../src/main/java/StructDefinition.java | 10 +- .../src/main/java/StudioGame.java | 4 +- .../src/main/java/TextureProvider.java | 10 +- .../src/main/java/UnderlayDefinition.java | 14 +- .../src/main/java/UnitPriceComparator.java | 2 +- .../src/main/java/UserComparator3.java | 4 +- .../src/main/java/VarbitDefinition.java | 14 +- runescape-client/src/main/java/Varcs.java | 6 +- .../src/main/java/VarpDefinition.java | 10 +- runescape-client/src/main/java/Varps.java | 2 +- runescape-client/src/main/java/Widget.java | 4 +- .../src/main/java/WidgetGroupParent.java | 4 +- runescape-client/src/main/java/WorldMap.java | 80 +++---- .../src/main/java/WorldMapArchiveLoader.java | 109 +++++++++ .../src/main/java/WorldMapAreaData.java | 4 +- .../src/main/java/WorldMapDecoration.java | 4 +- .../src/main/java/WorldMapDecorationType.java | 2 +- .../src/main/java/WorldMapElement.java | 10 +- .../src/main/java/WorldMapIcon1.java | 8 +- .../main/java/WorldMapIndexCacheLoader.java | 108 --------- .../src/main/java/WorldMapRegion.java | 4 +- .../src/main/java/WorldMapSection1.java | 8 +- .../src/main/java/WorldMapSection3.java | 4 +- runescape-client/src/main/java/class16.java | 4 +- runescape-client/src/main/java/class171.java | 222 +++++++++--------- runescape-client/src/main/java/class2.java | 8 +- runescape-client/src/main/java/class211.java | 4 +- runescape-client/src/main/java/class22.java | 4 +- runescape-client/src/main/java/class229.java | 2 +- runescape-client/src/main/java/class238.java | 4 +- runescape-client/src/main/java/class3.java | 2 +- runescape-client/src/main/java/class40.java | 4 +- runescape-client/src/main/java/class50.java | 20 +- runescape-client/src/main/java/class54.java | 2 +- runescape-client/src/main/java/class80.java | 2 +- 85 files changed, 592 insertions(+), 589 deletions(-) rename runescape-client/src/main/java/{IndexCacheLoader.java => ArchiveLoader.java} (98%) create mode 100644 runescape-client/src/main/java/WorldMapArchiveLoader.java delete mode 100644 runescape-client/src/main/java/WorldMapIndexCacheLoader.java diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSHealthBarDefinitionMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSHealthBarDefinitionMixin.java index f6f31abdf6..383892e7b5 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSHealthBarDefinitionMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSHealthBarDefinitionMixin.java @@ -15,7 +15,7 @@ public abstract class RSHealthBarDefinitionMixin implements RSHealthBarDefinitio @Shadow("client") private static RSClient client; - @MethodHook(value = "read", end = true) + @MethodHook(value = "decode", end = true) @Inject public void onRead(RSBuffer buffer) { diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index df17fc3b39..ac5660a71d 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java @@ -441,11 +441,11 @@ public interface RSClient extends RSGameShell, Client @Import("indexedSpritePalette") void setIndexedSpritePalette(int[] indexedSpritePalette); - @Import("indexCache8") + @Import("archive8") @Override RSAbstractArchive getIndexSprites(); - @Import("indexCache12") + @Import("archive12") @Override RSAbstractArchive getIndexScripts(); @@ -1023,7 +1023,7 @@ public interface RSClient extends RSGameShell, Client @Import("pcmStreamMixer") RSPcmStreamMixer getSoundEffectAudioQueue(); - @Import("indexCache4") + @Import("archive4") RSAbstractArchive getIndexCache4(); @Import("decimator") diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSEnumDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSEnumDefinition.java index 0e4206e29a..494cdfb111 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSEnumDefinition.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSEnumDefinition.java @@ -13,13 +13,13 @@ public interface RSEnumDefinition extends EnumDefinition, RSDualNode @Override int[] getIntVals(); - @Import("stringVals") + @Import("strVals") @Override String[] getStringVals(); @Import("defaultInt") int getDefaultInt(); - @Import("defaultString") + @Import("defaultStr") String getDefaultString(); } diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index 2d7243c121..aa4a94469a 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -37,8 +37,8 @@ public abstract class AbstractArchive { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache0") - static Archive indexCache0; + @Export("archive0") + static Archive archive0; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1694798923 @@ -750,7 +750,7 @@ public abstract class AbstractArchive { static boolean method4585() { if (Client.indexCacheLoaders != null && Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) { while (Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) { - IndexCacheLoader var0 = (IndexCacheLoader)Client.indexCacheLoaders.get(Client.indexCacheLoaderIndex); + ArchiveLoader var0 = (ArchiveLoader)Client.indexCacheLoaders.get(Client.indexCacheLoaderIndex); if (!var0.method134()) { return false; } diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index b94849ba66..cd7c6c4c6f 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -61,7 +61,7 @@ public abstract class AbstractByteArrayCopier { @Export("unloadWidgetGroup") public static void unloadWidgetGroup(int var0) { if (var0 != -1 && Widget.loadedWidgetGroups[var0]) { - Widget.Widget_indexCache.method7(var0); + Widget.Widget_archive.method7(var0); if (Widget.widgets[var0] != null) { boolean var1 = true; diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 9031a63059..654adba8db 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -48,7 +48,7 @@ public abstract class AbstractUserComparator implements Comparator { class214.field1129 = 1; class214.field1130 = null; } else if (var0 != -1 && var0 != Client.field112 && Client.field128 != 0 && !Client.field107) { - Archive var1 = UserComparator3.indexCache6; + Archive var1 = UserComparator3.archive6; int var2 = Client.field128; class214.field1129 = 1; class214.field1130 = var1; diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index 16874b170e..b23e13f811 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -163,7 +163,7 @@ public abstract class AbstractWorldMapIcon { garbageValue = "-1018878027" ) static void method625(Archive var0, String var1) { - IndexCacheLoader var2 = new IndexCacheLoader(var0, var1); + ArchiveLoader var2 = new ArchiveLoader(var0, var1); Client.indexCacheLoaders.add(var2); Client.field140 += var2.field408; } diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index 57b27c3a67..f81a1526e4 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -481,7 +481,7 @@ public abstract class Actor extends Entity { byte[] var9 = HealthBarDefinition.field379.takeFile(33, var1); var7 = new HealthBarDefinition(); if (var9 != null) { - var7.read(new Buffer(var9)); + var7.decode(new Buffer(var9)); } HealthBarDefinition.HealthBarDefinition_cached.put(var7, (long)var1); @@ -543,7 +543,7 @@ public abstract class Actor extends Entity { byte[] var4 = HealthBarDefinition.field379.takeFile(33, var1); var2 = new HealthBarDefinition(); if (var4 != null) { - var2.read(new Buffer(var4)); + var2.decode(new Buffer(var4)); } HealthBarDefinition.HealthBarDefinition_cached.put(var2, (long)var1); diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index fd51f42bab..dca408935e 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -74,7 +74,7 @@ public class Archive extends AbstractArchive { this.loadIndexReference(var8, var9); } else { PacketBuffer.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); - NetCache.NetCache_indexCaches[var7] = this; + NetCache.NetCache_archives[var7] = this; } } @@ -448,7 +448,7 @@ public class Archive extends AbstractArchive { if (var3 != Client.field128) { if (Client.field128 == 0 && Client.field112 != -1) { - Login.method2076(UserComparator3.indexCache6, Client.field112, 0, var3, false); + Login.method2076(UserComparator3.archive6, Client.field112, 0, var3, false); Client.field107 = false; } else if (var3 == 0) { class214.midiPcmStream.clear(); diff --git a/runescape-client/src/main/java/IndexCacheLoader.java b/runescape-client/src/main/java/ArchiveLoader.java similarity index 98% rename from runescape-client/src/main/java/IndexCacheLoader.java rename to runescape-client/src/main/java/ArchiveLoader.java index 00fc3b8ad2..28e4095285 100644 --- a/runescape-client/src/main/java/IndexCacheLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -5,8 +5,9 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("bd") -@Implements("IndexCacheLoader") -public class IndexCacheLoader { +@Implements("ArchiveLoader") +public class ArchiveLoader +{ @ObfuscatedName("pf") @ObfuscatedSignature( signature = "Lko;" @@ -32,8 +33,8 @@ public class IndexCacheLoader { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache") - final Archive indexCache; + @Export("archive") + final Archive archive; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 1459455501 @@ -48,9 +49,9 @@ public class IndexCacheLoader { @ObfuscatedSignature( signature = "(Lit;Ljava/lang/String;)V" ) - IndexCacheLoader(Archive var1, String var2) { + ArchiveLoader(Archive var1, String var2) { this.field409 = 0; - this.indexCache = var1; + this.archive = var1; this.field408 = var1.method5(); } @@ -63,7 +64,7 @@ public class IndexCacheLoader { this.field409 = 0; for (int var1 = 0; var1 < this.field408; ++var1) { - if (!this.indexCache.method133(var1) || this.indexCache.method132(var1)) { + if (!this.archive.method133(var1) || this.archive.method132(var1)) { ++this.field409; } } @@ -92,7 +93,7 @@ public class IndexCacheLoader { boolean var20; if (Login.worldSelectOpen) { if (class30.worldSelectBackSprites == null) { - class30.worldSelectBackSprites = class2.method20(WorldMapSection3.indexCache8, "sl_back", ""); + class30.worldSelectBackSprites = class2.method20(WorldMapSection3.archive8, "sl_back", ""); } Archive var11; @@ -100,7 +101,7 @@ public class IndexCacheLoader { int var13; IndexedSprite[] var14; if (Frames.worldSelectFlagSprites == null) { - var11 = WorldMapSection3.indexCache8; + var11 = WorldMapSection3.archive8; var13 = var11.getGroupId("sl_flags"); var12 = var11.getFileId(var13, ""); if (!SpriteMask.loadSprite(var11, var13, var12)) { @@ -113,7 +114,7 @@ public class IndexCacheLoader { } if (AttackOption.worldSelectArrows == null) { - var11 = WorldMapSection3.indexCache8; + var11 = WorldMapSection3.archive8; var13 = var11.getGroupId("sl_arrows"); var12 = var11.getFileId(var13, ""); if (!SpriteMask.loadSprite(var11, var13, var12)) { @@ -126,7 +127,7 @@ public class IndexCacheLoader { } if (UrlRequest.worldSelectStars == null) { - var11 = WorldMapSection3.indexCache8; + var11 = WorldMapSection3.archive8; var13 = var11.getGroupId("sl_stars"); var12 = var11.getFileId(var13, ""); if (!SpriteMask.loadSprite(var11, var13, var12)) { @@ -139,11 +140,11 @@ public class IndexCacheLoader { } if (SecureRandomFuture.worldSelectLeftSprite == null) { - SecureRandomFuture.worldSelectLeftSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.indexCache8, "leftarrow", ""); + SecureRandomFuture.worldSelectLeftSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.archive8, "leftarrow", ""); } if (NetSocket.worldSelectRightSprite == null) { - NetSocket.worldSelectRightSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.indexCache8, "rightarrow", ""); + NetSocket.worldSelectRightSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.archive8, "rightarrow", ""); } Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); @@ -698,7 +699,7 @@ public class IndexCacheLoader { var1.drawCentered("Click to switch", var39 / 2 + var10, var42 / 2 + var34 + 12, 16777215, 0); } } else { - class277.field1144 = MenuAction.loadIndexedSpriteByName(WorldMapSection3.indexCache8, "sl_button", ""); + class277.field1144 = MenuAction.loadIndexedSpriteByName(WorldMapSection3.archive8, "sl_button", ""); } } } diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index 794223d4ef..2e8ad5df4a 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -40,8 +40,8 @@ public class ByteArrayPool { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache13") - static Archive indexCache13; + @Export("archive13") + static Archive archive13; @ObfuscatedName("f") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 9ad504ccf6..cd2c02e115 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1272,7 +1272,7 @@ public final class Client extends GameShell implements Usernamed { PlayerAppearance.field726 = class226.field1132; class229.field1137 = class226.field1133; class227.field1136 = class226.field1134; - IndexCacheLoader.field406 = class226.field1135; + ArchiveLoader.field406 = class226.field1135; TriBool.urlRequester = new UrlRequester(); this.setUpKeyboard(); this.setUpMouse(); @@ -1376,8 +1376,8 @@ public final class Client extends GameShell implements Usernamed { int var4; for (var4 = 0; var4 < class40.regionLandArchives.length; ++var4) { - if (IndexCacheLoader.regionMapArchiveIds[var4] != -1 && class40.regionLandArchives[var4] == null) { - class40.regionLandArchives[var4] = SecureRandomFuture.indexCache5.takeFile(IndexCacheLoader.regionMapArchiveIds[var4], 0); + if (ArchiveLoader.regionMapArchiveIds[var4] != -1 && class40.regionLandArchives[var4] == null) { + class40.regionLandArchives[var4] = SecureRandomFuture.archive5.takeFile(ArchiveLoader.regionMapArchiveIds[var4], 0); if (class40.regionLandArchives[var4] == null) { var3 = false; ++field177; @@ -1385,7 +1385,7 @@ public final class Client extends GameShell implements Usernamed { } if (MouseHandler.regionLandArchiveIds[var4] != -1 && HealthBarUpdate.regionMapArchives[var4] == null) { - HealthBarUpdate.regionMapArchives[var4] = SecureRandomFuture.indexCache5.takeFileEncrypted(MouseHandler.regionLandArchiveIds[var4], 0, class190.xteaKeys[var4]); + HealthBarUpdate.regionMapArchives[var4] = SecureRandomFuture.archive5.takeFileEncrypted(MouseHandler.regionLandArchiveIds[var4], 0, class190.xteaKeys[var4]); if (HealthBarUpdate.regionMapArchives[var4] == null) { var3 = false; ++field177; @@ -1847,7 +1847,7 @@ public final class Client extends GameShell implements Usernamed { byte[] var46 = OverlayDefinition.field663.takeFile(4, var42); var43 = new OverlayDefinition(); if (var46 != null) { - var43.read(new Buffer(var46), var42); + var43.decode(new Buffer(var46), var42); } var43.init(); @@ -1884,7 +1884,7 @@ public final class Client extends GameShell implements Usernamed { byte[] var47 = OverlayDefinition.field663.takeFile(4, var67); var68 = new OverlayDefinition(); if (var47 != null) { - var68.read(new Buffer(var47), var67); + var68.decode(new Buffer(var47), var67); } var68.init(); @@ -2181,8 +2181,8 @@ public final class Client extends GameShell implements Usernamed { for (var8 = var21 - 1; var8 <= var56 + 1; ++var8) { for (var9 = var57 - 1; var9 <= var58 + 1; ++var9) { if (var8 < var21 || var8 > var56 || var9 < var57 || var9 > var58) { - SecureRandomFuture.indexCache5.method10("m" + var8 + "_" + var9); - SecureRandomFuture.indexCache5.method10("l" + var8 + "_" + var9); + SecureRandomFuture.archive5.method10("m" + var8 + "_" + var9); + SecureRandomFuture.archive5.method10("l" + var8 + "_" + var9); } } } @@ -2274,10 +2274,10 @@ public final class Client extends GameShell implements Usernamed { if (gameState == 0) { this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); } else if (gameState == 5) { - IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); + ArchiveLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); } else if (gameState != 10 && gameState != 11) { if (gameState == 20) { - IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); + ArchiveLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); } else if (gameState == 25) { if (field181 == 1) { if (field177 > field178) { @@ -2304,7 +2304,7 @@ public final class Client extends GameShell implements Usernamed { PendingSpawn.drawLoadingMessage("Please wait...", false); } } else { - IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); + ArchiveLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); } if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { @@ -2867,7 +2867,7 @@ public final class Client extends GameShell implements Usernamed { Players.NetCache_reference = class22.NetCache_responseArchiveBuffer; for (var12 = 0; var12 < 256; ++var12) { - Archive var22 = NetCache.NetCache_indexCaches[var12]; + Archive var22 = NetCache.NetCache_archives[var12]; if (var22 != null) { Players.NetCache_reference.index = var12 * 8 + 5; var13 = Players.NetCache_reference.readInt(); @@ -2894,7 +2894,7 @@ public final class Client extends GameShell implements Usernamed { NetCache.NetCache_crcMismatches = 0; NetCache.NetCache_ioExceptions = 0; - ModelData0.NetCache_currentResponse.indexCache.write((int)(ModelData0.NetCache_currentResponse.key & 65535L), class22.NetCache_responseArchiveBuffer.array, 16711680L == (ModelData0.NetCache_currentResponse.key & 16711680L), WorldComparator.field988); + ModelData0.NetCache_currentResponse.archive.write((int)(ModelData0.NetCache_currentResponse.key & 65535L), class22.NetCache_responseArchiveBuffer.array, 16711680L == (ModelData0.NetCache_currentResponse.key & 16711680L), WorldComparator.field988); } ModelData0.NetCache_currentResponse.remove(); @@ -3321,24 +3321,24 @@ public final class Client extends GameShell implements Usernamed { var8.packetBuffer.method38(var11.array, 0, var11.array.length); var8.packetBuffer.writeByte(clientType); var8.packetBuffer.writeInt(0); - var8.packetBuffer.writeInt(AbstractArchive.indexCache0.hash); - var8.packetBuffer.writeInt(Skeleton.indexCache1.hash); - var8.packetBuffer.writeInt(ObjectSound.indexCache2.hash); - var8.packetBuffer.writeInt(WorldMapIcon1.indexCache3.hash); - var8.packetBuffer.writeInt(WorldMapDecoration.indexCache4.hash); - var8.packetBuffer.writeInt(SecureRandomFuture.indexCache5.hash); - var8.packetBuffer.writeInt(UserComparator3.indexCache6.hash); - var8.packetBuffer.writeInt(class40.indexCache7.hash); - var8.packetBuffer.writeInt(WorldMapSection3.indexCache8.hash); - var8.packetBuffer.writeInt(class238.indexCache9.hash); - var8.packetBuffer.writeInt(class16.indexCache10.hash); - var8.packetBuffer.writeInt(Login.indexCache11.hash); - var8.packetBuffer.writeInt(Formatting.indexCache12.hash); - var8.packetBuffer.writeInt(ByteArrayPool.indexCache13.hash); - var8.packetBuffer.writeInt(class2.indexCache14.hash); - var8.packetBuffer.writeInt(WorldMapSection1.indexCache15.hash); + var8.packetBuffer.writeInt(AbstractArchive.archive0.hash); + var8.packetBuffer.writeInt(Skeleton.archive1.hash); + var8.packetBuffer.writeInt(ObjectSound.archive2.hash); + var8.packetBuffer.writeInt(WorldMapIcon1.archive3.hash); + var8.packetBuffer.writeInt(WorldMapDecoration.archive4.hash); + var8.packetBuffer.writeInt(SecureRandomFuture.archive5.hash); + var8.packetBuffer.writeInt(UserComparator3.archive6.hash); + var8.packetBuffer.writeInt(class40.archive7.hash); + var8.packetBuffer.writeInt(WorldMapSection3.archive8.hash); + var8.packetBuffer.writeInt(class238.archive9.hash); + var8.packetBuffer.writeInt(class16.archive10.hash); + var8.packetBuffer.writeInt(Login.archive11.hash); + var8.packetBuffer.writeInt(Formatting.archive12.hash); + var8.packetBuffer.writeInt(ByteArrayPool.archive13.hash); + var8.packetBuffer.writeInt(class2.archive14.hash); + var8.packetBuffer.writeInt(WorldMapSection1.archive15.hash); var8.packetBuffer.writeInt(0); - var8.packetBuffer.writeInt(class22.indexCache16.hash); + var8.packetBuffer.writeInt(class22.archive16.hash); var8.packetBuffer.writeInt(WorldMapLabelSize.field1040.hash); var8.packetBuffer.writeInt(ItemContainer.field434.hash); var8.packetBuffer.writeInt(AbstractByteArrayCopier.field0.hash); @@ -3481,13 +3481,13 @@ public final class Client extends GameShell implements Usernamed { var2.index = 0; ((AbstractSocket)var1).read(var2.array, 0, 2); var2.index = 0; - IndexCacheLoader.field407 = var2.readUnsignedShort(); + ArchiveLoader.field407 = var2.readUnsignedShort(); loginState = 15; } - if (loginState == 15 && ((AbstractSocket)var1).available() >= IndexCacheLoader.field407) { + if (loginState == 15 && ((AbstractSocket)var1).available() >= ArchiveLoader.field407) { var2.index = 0; - ((AbstractSocket)var1).read(var2.array, 0, IndexCacheLoader.field407); + ((AbstractSocket)var1).read(var2.array, 0, ArchiveLoader.field407); var2.index = 0; String var18 = var2.readStringCp1252NullTerminated(); String var22 = var2.readStringCp1252NullTerminated(); @@ -4430,7 +4430,7 @@ public final class Client extends GameShell implements Usernamed { if (var13.stream1 == null) { if (var13.soundEffectId >= 0) { var14 = null; - var16 = SoundEffect.readSoundEffect(WorldMapDecoration.indexCache4, var13.soundEffectId, 0); + var16 = SoundEffect.readSoundEffect(WorldMapDecoration.archive4, var13.soundEffectId, 0); if (var16 != null) { var17 = var16.toRawSound().resample(MilliClock.decimator); var19 = RawPcmStream.createRawPcmStream(var17, 100, var6); @@ -4447,7 +4447,7 @@ public final class Client extends GameShell implements Usernamed { if (var13.soundEffectIds != null && (var13.field655 -= var4) <= 0) { var7 = (int)(Math.random() * (double)var13.soundEffectIds.length); var14 = null; - var16 = SoundEffect.readSoundEffect(WorldMapDecoration.indexCache4, var13.soundEffectIds[var7], 0); + var16 = SoundEffect.readSoundEffect(WorldMapDecoration.archive4, var13.soundEffectIds[var7], 0); if (var16 != null) { var17 = var16.toRawSound().resample(MilliClock.decimator); var19 = RawPcmStream.createRawPcmStream(var17, 100, var6); @@ -4976,7 +4976,7 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field857 == var1.serverPacket0) { - IndexCacheLoader.field512 = WorldMapElement.method4783(var3.readUnsignedByte()); + ArchiveLoader.field512 = WorldMapElement.method4783(var3.readUnsignedByte()); var1.serverPacket0 = null; return true; } diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index ec577df93e..f6f30e3b2c 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -215,15 +215,15 @@ public class DynamicObject extends Entity { } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { 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; + ArchiveLoader.field512 = WorldMapElement.method4783(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); + if (ArchiveLoader.field512 == null) { + ArchiveLoader.field512 = class310.field3805; } Client.field138 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; PacketBufferNode var15 = Interpreter.method1915(ClientPacket.field237, Client.packetWriter.isaacCipher); var15.packetBuffer.writeByte(Client.publicChatMode); - var15.packetBuffer.writeByte(IndexCacheLoader.field512.field3804); + var15.packetBuffer.writeByte(ArchiveLoader.field512.field3804); var15.packetBuffer.writeByte(Client.field138); Client.packetWriter.method241(var15); return 1; @@ -288,10 +288,10 @@ public class DynamicObject extends Entity { return 1; } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { - if (IndexCacheLoader.field512 == null) { + if (ArchiveLoader.field512 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = IndexCacheLoader.field512.field3804; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ArchiveLoader.field512.field3804; } return 1; diff --git a/runescape-client/src/main/java/EnumDefinition.java b/runescape-client/src/main/java/EnumDefinition.java index 66bd5d7647..428f82137e 100644 --- a/runescape-client/src/main/java/EnumDefinition.java +++ b/runescape-client/src/main/java/EnumDefinition.java @@ -11,8 +11,8 @@ public class EnumDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("EnumDefinition_indexCache") - public static AbstractArchive EnumDefinition_indexCache; + @Export("EnumDefinition_archive") + public static AbstractArchive EnumDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" @@ -20,14 +20,14 @@ public class EnumDefinition extends DualNode { @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; @ObfuscatedName("q") - @Export("keyType") - public char keyType; + @Export("inputType") + public char inputType; @ObfuscatedName("w") - @Export("valType") - public char valType; + @Export("outputType") + public char outputType; @ObfuscatedName("o") - @Export("defaultString") - public String defaultString; + @Export("defaultStr") + public String defaultStr; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 1948115527 @@ -38,8 +38,8 @@ public class EnumDefinition extends DualNode { @ObfuscatedGetter( intValue = -12324053 ) - @Export("size0") - public int size0; + @Export("outputCount") + public int outputCount; @ObfuscatedName("l") @Export("keys") public int[] keys; @@ -47,12 +47,12 @@ public class EnumDefinition extends DualNode { @Export("intVals") public int[] intVals; @ObfuscatedName("x") - @Export("stringVals") - public String[] stringVals; + @Export("strVals") + public String[] strVals; EnumDefinition() { - this.defaultString = "null"; - this.size0 = 0; + this.defaultStr = "null"; + this.outputCount = 0; } @ObfuscatedName("f") @@ -60,15 +60,15 @@ public class EnumDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "-230039710" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -77,33 +77,33 @@ public class EnumDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-1255400805" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.keyType = (char)var1.readUnsignedByte(); + this.inputType = (char)var1.readUnsignedByte(); } else if (var2 == 2) { - this.valType = (char)var1.readUnsignedByte(); + this.outputType = (char)var1.readUnsignedByte(); } else if (var2 == 3) { - this.defaultString = var1.readStringCp1252NullTerminated(); + this.defaultStr = var1.readStringCp1252NullTerminated(); } else if (var2 == 4) { this.defaultInt = var1.readInt(); } else { int var3; if (var2 == 5) { - this.size0 = var1.readUnsignedShort(); - this.keys = new int[this.size0]; - this.stringVals = new String[this.size0]; + this.outputCount = var1.readUnsignedShort(); + this.keys = new int[this.outputCount]; + this.strVals = new String[this.outputCount]; - for (var3 = 0; var3 < this.size0; ++var3) { + for (var3 = 0; var3 < this.outputCount; ++var3) { this.keys[var3] = var1.readInt(); - this.stringVals[var3] = var1.readStringCp1252NullTerminated(); + this.strVals[var3] = var1.readStringCp1252NullTerminated(); } } else if (var2 == 6) { - this.size0 = var1.readUnsignedShort(); - this.keys = new int[this.size0]; - this.intVals = new int[this.size0]; + this.outputCount = var1.readUnsignedShort(); + this.keys = new int[this.outputCount]; + this.intVals = new int[this.outputCount]; - for (var3 = 0; var3 < this.size0; ++var3) { + for (var3 = 0; var3 < this.outputCount; ++var3) { this.keys[var3] = var1.readInt(); this.intVals[var3] = var1.readInt(); } @@ -119,7 +119,7 @@ public class EnumDefinition extends DualNode { ) @Export("size") public int size() { - return this.size0; + return this.outputCount; } static { diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 3f876c0605..e2eb1e8f48 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -478,18 +478,18 @@ public class FontName { class157.method3382(); ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); Script.Script_cached.clear(); - AbstractArchive.indexCache0.method8(); - Skeleton.indexCache1.method8(); - WorldMapIcon1.indexCache3.method8(); - WorldMapDecoration.indexCache4.method8(); - SecureRandomFuture.indexCache5.method8(); - UserComparator3.indexCache6.method8(); - class40.indexCache7.method8(); - WorldMapSection3.indexCache8.method8(); - class238.indexCache9.method8(); - class16.indexCache10.method8(); - Login.indexCache11.method8(); - Formatting.indexCache12.method8(); + AbstractArchive.archive0.method8(); + Skeleton.archive1.method8(); + WorldMapIcon1.archive3.method8(); + WorldMapDecoration.archive4.method8(); + SecureRandomFuture.archive5.method8(); + UserComparator3.archive6.method8(); + class40.archive7.method8(); + WorldMapSection3.archive8.method8(); + class238.archive9.method8(); + class16.archive10.method8(); + Login.archive11.method8(); + Formatting.archive12.method8(); } @ObfuscatedName("gg") diff --git a/runescape-client/src/main/java/Formatting.java b/runescape-client/src/main/java/Formatting.java index dd3cd2ee5c..54a9d21e40 100644 --- a/runescape-client/src/main/java/Formatting.java +++ b/runescape-client/src/main/java/Formatting.java @@ -13,8 +13,8 @@ public class Formatting { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache12") - static Archive indexCache12; + @Export("archive12") + static Archive archive12; @ObfuscatedName("s") @ObfuscatedSignature( @@ -57,19 +57,19 @@ public class Formatting { var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; var9 = Interpreter.getEnum(var3); - if (var9.valType != 's') { + if (var9.outputType != 's') { } - for (var5 = 0; var5 < var9.size0; ++var5) { + for (var5 = 0; var5 < var9.outputCount; ++var5) { if (var4 == var9.keys[var5]) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.stringVals[var5]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.strVals[var5]; var9 = null; break; } } if (var9 != null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.defaultString; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.defaultStr; } return 1; @@ -89,11 +89,11 @@ public class Formatting { int var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3]; EnumDefinition var7 = Interpreter.getEnum(var6); - if (var3 == var7.keyType && var4 == var7.valType) { - for (int var8 = 0; var8 < var7.size0; ++var8) { + if (var3 == var7.inputType && var4 == var7.outputType) { + for (int var8 = 0; var8 < var7.outputCount; ++var8) { if (var5 == var7.keys[var8]) { if (var4 == 115) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.stringVals[var8]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.strVals[var8]; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.intVals[var8]; } @@ -105,7 +105,7 @@ public class Formatting { if (var7 != null) { if (var4 == 115) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.defaultString; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.defaultStr; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.defaultInt; } diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index 96c8b98a20..f8117a3898 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -718,6 +718,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(I)V", garbageValue = "1445885427" ) + @Export("packetHandler") protected abstract void packetHandler(); @ObfuscatedName("ab") @@ -1064,14 +1065,14 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene if (var0 != 5 && var0 != 10) { if (var0 == 20) { - class2.method27(class16.indexCache10, WorldMapSection3.indexCache8, true, Client.gameState == 11 ? 4 : 0); + class2.method27(class16.archive10, WorldMapSection3.archive8, true, Client.gameState == 11 ? 4 : 0); } else if (var0 == 11) { - class2.method27(class16.indexCache10, WorldMapSection3.indexCache8, false, 4); + class2.method27(class16.archive10, WorldMapSection3.archive8, false, 4); } else { class80.method2015(); } } else { - class2.method27(class16.indexCache10, WorldMapSection3.indexCache8, true, 0); + class2.method27(class16.archive10, WorldMapSection3.archive8, true, 0); } Client.gameState = var0; diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index de854bdb16..c04163439b 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -143,7 +143,7 @@ public class GrandExchangeOffer { int var0 = 0; for (int var1 = 0; var1 <= Client.indexCacheLoaderIndex; ++var1) { - var0 += ((IndexCacheLoader)Client.indexCacheLoaders.get(var1)).field409; + var0 += ((ArchiveLoader)Client.indexCacheLoaders.get(var1)).field409; } return var0 * 10000 / Client.field140; diff --git a/runescape-client/src/main/java/GroundItemPile.java b/runescape-client/src/main/java/GroundItemPile.java index 095db79c18..6c8c2ea2b5 100644 --- a/runescape-client/src/main/java/GroundItemPile.java +++ b/runescape-client/src/main/java/GroundItemPile.java @@ -71,10 +71,10 @@ public final class GroundItemPile { public static boolean loadWidgetGroup(int var0) { if (Widget.loadedWidgetGroups[var0]) { return true; - } else if (!Widget.Widget_indexCache.tryLoadGroup(var0)) { + } else if (!Widget.Widget_archive.tryLoadGroup(var0)) { return false; } else { - int var1 = Widget.Widget_indexCache.method4(var0); + int var1 = Widget.Widget_archive.method4(var0); if (var1 == 0) { Widget.loadedWidgetGroups[var0] = true; return true; @@ -85,7 +85,7 @@ public final class GroundItemPile { for (int var2 = 0; var2 < var1; ++var2) { if (Widget.widgets[var0][var2] == null) { - byte[] var3 = Widget.Widget_indexCache.takeFile(var0, var2); + byte[] var3 = Widget.Widget_archive.takeFile(var0, var2); if (var3 != null) { Widget.widgets[var0][var2] = new Widget(); Widget.widgets[var0][var2].id = var2 + (var0 << 16); diff --git a/runescape-client/src/main/java/GzipDecompressor.java b/runescape-client/src/main/java/GzipDecompressor.java index 71887acd38..d7a03ede82 100644 --- a/runescape-client/src/main/java/GzipDecompressor.java +++ b/runescape-client/src/main/java/GzipDecompressor.java @@ -63,7 +63,7 @@ public class GzipDecompressor { byte[] var2 = StructDefinition.field885.takeFile(34, var0); var1 = new StructDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } var1.init(); diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index 30b7bcba53..04391a34ef 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -177,7 +177,7 @@ public class HealthBar extends Node { ) static void method1994(int var0, int var1) { if (Client.field128 != 0 && var0 != -1) { - Login.method2076(Login.indexCache11, var0, 0, Client.field128, false); + Login.method2076(Login.archive11, var0, 0, Client.field128, false); Client.field107 = true; } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index 1c6a8614da..67f7ab1206 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -112,15 +112,15 @@ public class HealthBarDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "280763431" ) - @Export("read") - public void read(Buffer var1) { + @Export("decode") + public void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -129,8 +129,8 @@ public class HealthBarDefinition extends DualNode { signature = "(Lgr;IB)V", garbageValue = "10" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { var1.readUnsignedShort(); } else if (var2 == 2) { diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index b33ca4df3e..42e62f6a01 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -141,15 +141,15 @@ public class HitSplatDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "1963348982" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -158,8 +158,8 @@ public class HitSplatDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "1789835753" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { this.fontId = var1.method51(); } else if (var2 == 2) { diff --git a/runescape-client/src/main/java/IndexStoreAction.java b/runescape-client/src/main/java/IndexStoreAction.java index f0fdb720c6..cec172fa81 100644 --- a/runescape-client/src/main/java/IndexStoreAction.java +++ b/runescape-client/src/main/java/IndexStoreAction.java @@ -42,8 +42,8 @@ public class IndexStoreAction extends Node { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache") - Archive indexCache; + @Export("archive") + Archive archive; @ObfuscatedName("fn") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index b0cdeff51c..6fe4a6179e 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -105,10 +105,10 @@ public class Interpreter { if (var1 != null) { return var1; } else { - byte[] var2 = EnumDefinition.EnumDefinition_indexCache.takeFile(8, var0); + byte[] var2 = EnumDefinition.EnumDefinition_archive.takeFile(8, var0); var1 = new EnumDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } EnumDefinition.EnumDefinition_cached.put(var1, (long)var0); diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index b5a0acbc9b..51524ccff0 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -29,15 +29,15 @@ public class InvDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "628080573" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -46,8 +46,8 @@ public class InvDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "1763455566" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 2) { this.size = var1.readUnsignedShort(); } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index cef1307128..b41a453923 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -239,7 +239,7 @@ public final class IsaacCipher { garbageValue = "75867683" ) public static void method4082(AbstractArchive var0, AbstractArchive var1) { - NPCDefinition.NpcDefinition_indexCache = var0; + NPCDefinition.NpcDefinition_archive = var0; NPCDefinition.NpcDefinition_modelIndexCache = var1; } diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index e4ff114373..e2ca5be334 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -11,8 +11,8 @@ public class ItemDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("ItemDefinition_indexCache") - public static AbstractArchive ItemDefinition_indexCache; + @Export("ItemDefinition_archive") + public static AbstractArchive ItemDefinition_archive; @ObfuscatedName("g") @ObfuscatedSignature( signature = "Lir;" @@ -339,15 +339,15 @@ public class ItemDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "-781492560" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -356,8 +356,8 @@ public class ItemDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-1975780739" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { this.field435 = var1.readUnsignedShort(); } else if (var2 == 2) { diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index 4705d9db1f..b61c3e7fb7 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -11,8 +11,8 @@ public class KitDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("KitDefinition_indexCache") - public static AbstractArchive KitDefinition_indexCache; + @Export("KitDefinition_archive") + public static AbstractArchive KitDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" @@ -68,15 +68,15 @@ public class KitDefinition extends DualNode { signature = "(Lgr;S)V", garbageValue = "22753" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -85,8 +85,8 @@ public class KitDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-1828581673" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { this.bodypartID = var1.readUnsignedByte(); } else { diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index f36bf739c3..3394eeb850 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -139,8 +139,8 @@ public class Login { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache11") - static Archive indexCache11; + @Export("archive11") + static Archive archive11; @ObfuscatedName("m") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 062a7b3b5c..bf939fbb2d 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -619,7 +619,7 @@ public class LoginScreenAnimation { byte[] var2 = HitSplatDefinition.field382.takeFile(32, var0); var1 = new HitSplatDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index 0a569b4511..acb5b8050a 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -172,7 +172,7 @@ public final class NPC extends Actor { var3.type = 1; var3.key = (long)var0; var3.archiveDisk = var1; - var3.indexCache = var2; + var3.archive = var2; NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.addFirst(var3); diff --git a/runescape-client/src/main/java/NPCDefinition.java b/runescape-client/src/main/java/NPCDefinition.java index d8d600a4a6..4a7f41026f 100644 --- a/runescape-client/src/main/java/NPCDefinition.java +++ b/runescape-client/src/main/java/NPCDefinition.java @@ -16,8 +16,8 @@ public class NPCDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("NpcDefinition_indexCache") - static AbstractArchive NpcDefinition_indexCache; + @Export("NpcDefinition_archive") + static AbstractArchive NpcDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" @@ -230,15 +230,15 @@ public class NPCDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "-893102766" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -247,8 +247,8 @@ public class NPCDefinition extends DualNode { signature = "(Lgr;IB)V", garbageValue = "-98" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { int var3; int var4; if (var2 == 1) { diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index 5bbfcd0e0f..8373742355 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -96,8 +96,8 @@ public class NetCache { @ObfuscatedSignature( signature = "[Lit;" ) - @Export("NetCache_indexCaches") - public static Archive[] NetCache_indexCaches; + @Export("NetCache_archives") + public static Archive[] NetCache_archives; @ObfuscatedName("b") public static byte field631; @ObfuscatedName("c") @@ -136,7 +136,7 @@ public class NetCache { NetCache_responseHeaderBuffer = new Buffer(8); field630 = 0; NetCache_crc = new CRC32(); - NetCache_indexCaches = new Archive[256]; + NetCache_archives = new Archive[256]; field631 = 0; NetCache_crcMismatches = 0; NetCache_ioExceptions = 0; diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index f9baebe987..153578f827 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -11,8 +11,8 @@ public class NetFileRequest extends DualNode { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache") - public Archive indexCache; + @Export("archive") + public Archive archive; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1487103265 diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index 05dc5fc2d7..54d1ed474d 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -14,8 +14,8 @@ public class ObjectDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("ObjectDefinition_indexCache") - static AbstractArchive ObjectDefinition_indexCache; + @Export("ObjectDefinition_archive") + static AbstractArchive ObjectDefinition_archive; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lir;" @@ -320,15 +320,15 @@ public class ObjectDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "1210669830" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -337,8 +337,8 @@ public class ObjectDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-2044409717" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { int var3; int var4; if (var2 == 1) { @@ -907,11 +907,11 @@ public class ObjectDefinition extends DualNode { if (var1 != null) { return var1; } else { - byte[] var2 = NPCDefinition.NpcDefinition_indexCache.takeFile(9, var0); + byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0); var1 = new NPCDefinition(); var1.id = var0; if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } var1.init(); diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java index 76d0d30733..f9a0dde47d 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -17,8 +17,8 @@ public final class ObjectSound extends Node { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache2") - static Archive indexCache2; + @Export("archive2") + static Archive archive2; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 647270745 diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index 10b0bdbfb4..645db55beb 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -119,10 +119,10 @@ public final class Occluder { if (var1 != null) { return var1; } else { - byte[] var2 = VarbitDefinition.VarbitDefinition_indexCache.takeFile(14, var0); + byte[] var2 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0); var1 = new VarbitDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } VarbitDefinition.VarbitDefinition_cached.put(var1, (long)var0); diff --git a/runescape-client/src/main/java/OverlayDefinition.java b/runescape-client/src/main/java/OverlayDefinition.java index 4a8488a530..ae466a6f8c 100644 --- a/runescape-client/src/main/java/OverlayDefinition.java +++ b/runescape-client/src/main/java/OverlayDefinition.java @@ -103,15 +103,15 @@ public class OverlayDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-424203051" ) - @Export("read") - public void read(Buffer var1, int var2) { + @Export("decode") + public void decode(Buffer var1, int var2) { while (true) { int var3 = var1.readUnsignedByte(); if (var3 == 0) { return; } - this.readNext(var1, var3, var2); + this.decodeNext(var1, var3, var2); } } @@ -120,8 +120,8 @@ public class OverlayDefinition extends DualNode { signature = "(Lgr;III)V", garbageValue = "2094105763" ) - @Export("readNext") - void readNext(Buffer var1, int var2, int var3) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2, int var3) { if (var2 == 1) { this.rgb = var1.readMedium(); } else if (var2 == 2) { diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index 43b237d5c7..b4717ab040 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -198,7 +198,7 @@ public final class PacketBuffer extends Buffer { } var8 = new NetFileRequest(); - var8.indexCache = var0; + var8.archive = var0; var8.crc = var3; var8.padding = var4; if (var5) { diff --git a/runescape-client/src/main/java/ParamKeyDefinition.java b/runescape-client/src/main/java/ParamKeyDefinition.java index 79e24fed2e..1b721ed1c0 100644 --- a/runescape-client/src/main/java/ParamKeyDefinition.java +++ b/runescape-client/src/main/java/ParamKeyDefinition.java @@ -52,15 +52,15 @@ public class ParamKeyDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "-975533635" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -69,8 +69,8 @@ public class ParamKeyDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "1664350313" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { this.type = class14.method171(var1.readByte()); } else if (var2 == 2) { diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java index 59bb5ca93b..46059675b7 100644 --- a/runescape-client/src/main/java/PlayerAppearance.java +++ b/runescape-client/src/main/java/PlayerAppearance.java @@ -303,8 +303,8 @@ public class PlayerAppearance { var18.recolor(field726[var12], class229.field1137[var12][this.bodyColors[var12]]); } - if (this.bodyColors[var12] < IndexCacheLoader.field406[var12].length) { - var18.recolor(class227.field1136[var12], IndexCacheLoader.field406[var12][this.bodyColors[var12]]); + if (this.bodyColors[var12] < ArchiveLoader.field406[var12].length) { + var18.recolor(class227.field1136[var12], ArchiveLoader.field406[var12][this.bodyColors[var12]]); } } @@ -387,8 +387,8 @@ public class PlayerAppearance { var8.recolor(field726[var4], class229.field1137[var4][this.bodyColors[var4]]); } - if (this.bodyColors[var4] < IndexCacheLoader.field406[var4].length) { - var8.recolor(class227.field1136[var4], IndexCacheLoader.field406[var4][this.bodyColors[var4]]); + if (this.bodyColors[var4] < ArchiveLoader.field406[var4].length) { + var8.recolor(class227.field1136[var4], ArchiveLoader.field406[var4][this.bodyColors[var4]]); } } diff --git a/runescape-client/src/main/java/RectangleMode.java b/runescape-client/src/main/java/RectangleMode.java index a47d78b510..8ff42d1569 100644 --- a/runescape-client/src/main/java/RectangleMode.java +++ b/runescape-client/src/main/java/RectangleMode.java @@ -60,7 +60,7 @@ public enum RectangleMode implements Enumerated { garbageValue = "1" ) public static void method6028(AbstractArchive var0, AbstractArchive var1, boolean var2) { - ObjectDefinition.ObjectDefinition_indexCache = var0; + ObjectDefinition.ObjectDefinition_archive = var0; ObjectDefinition.field640 = var1; ObjectDefinition.ObjectDefinition_isLowDetail = var2; } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 42cdac2b24..6c7a0c4cd5 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -39,7 +39,7 @@ public class SecureRandomCallable implements Callable { byte[] var2 = VarpDefinition.field943.takeFile(16, var0); var1 = new VarpDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index a5ab41ae75..ee7a481b1e 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -21,8 +21,8 @@ public class SecureRandomFuture { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache5") - static Archive indexCache5; + @Export("archive5") + static Archive archive5; @ObfuscatedName("jn") @ObfuscatedSignature( signature = "Ldl;" diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index 68c330388b..1e9f773a7b 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -11,8 +11,8 @@ public class SequenceDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("SequenceDefinition_indexCache") - public static AbstractArchive SequenceDefinition_indexCache; + @Export("SequenceDefinition_archive") + public static AbstractArchive SequenceDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" @@ -110,15 +110,15 @@ public class SequenceDefinition extends DualNode { signature = "(Lgr;S)V", garbageValue = "259" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -127,8 +127,8 @@ public class SequenceDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "154075720" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { int[] var10000; int var3; int var4; diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index eefc146760..b13a804770 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -16,8 +16,8 @@ public class Skeleton extends Node { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache1") - static Archive indexCache1; + @Export("archive1") + static Archive archive1; @ObfuscatedName("m") @ObfuscatedGetter( intValue = -1634889691 diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index ab7356b395..f75dc4b94d 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -26,11 +26,11 @@ public class Skills { if (var1 != null) { return var1; } else { - byte[] var2 = ItemDefinition.ItemDefinition_indexCache.takeFile(10, var0); + byte[] var2 = ItemDefinition.ItemDefinition_archive.takeFile(10, var0); var1 = new ItemDefinition(); var1.id = var0; if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } var1.post(); diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java index aa77ace319..201dcdb11a 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -50,7 +50,7 @@ public class SoundSystem implements Runnable { if (var1 != null) { return var1; } else { - byte[] var2 = Formatting.indexCache12.takeFile(var0, 0); + byte[] var2 = Formatting.archive12.takeFile(var0, 0); if (var2 == null) { return null; } else { diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index 1917bb2f86..13b1a45b76 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -11,8 +11,8 @@ public class SpotAnimationDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("SpotAnimationDefinition_indexCache") - public static AbstractArchive SpotAnimationDefinition_indexCache; + @Export("SpotAnimationDefinition_archive") + public static AbstractArchive SpotAnimationDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" @@ -104,15 +104,15 @@ public class SpotAnimationDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "906815828" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -121,8 +121,8 @@ public class SpotAnimationDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "2099681848" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { this.archive = var1.readUnsignedShort(); } else if (var2 == 2) { diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index b76149f043..2873f91beb 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -38,15 +38,15 @@ public class StructDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "853330780" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -55,8 +55,8 @@ public class StructDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-2035893488" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 249) { this.params = AbstractArchive.readStringIntParameters(var1, this.params); } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index d2c5457236..ed1891e7b1 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -73,10 +73,10 @@ public enum StudioGame implements Enumerated { if (var1 != null) { return var1; } else { - byte[] var2 = UnderlayDefinition.UnderlayDefinition_indexCache.takeFile(1, var0); + byte[] var2 = UnderlayDefinition.UnderlayDefinition_archive.takeFile(1, var0); var1 = new UnderlayDefinition(); if (var2 != null) { - var1.read(new Buffer(var2), var0); + var1.decode(new Buffer(var2), var0); } var1.init(); diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java index b9cbae14c1..ce191608a9 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -51,8 +51,8 @@ public class TextureProvider implements TextureLoader { @ObfuscatedSignature( signature = "Lir;" ) - @Export("indexCache") - AbstractArchive indexCache; + @Export("archive") + AbstractArchive archive; @ObfuscatedSignature( signature = "(Lir;Lir;IDI)V" @@ -62,7 +62,7 @@ public class TextureProvider implements TextureLoader { this.remaining = 0; this.brightness0 = 1.0D; this.textureSize = 128; - this.indexCache = var2; + this.archive = var2; this.capacity = var3; this.remaining = this.capacity; this.brightness0 = var4; @@ -96,7 +96,7 @@ public class TextureProvider implements TextureLoader { for (int var7 = 0; var7 < var6.length; ++var7) { int var8 = var6[var7]; - if (this.indexCache.method1(var8)) { + if (this.archive.method1(var8)) { ++var2; } } @@ -132,7 +132,7 @@ public class TextureProvider implements TextureLoader { return var2.pixels; } - boolean var3 = var2.method320(this.brightness0, this.textureSize, this.indexCache); + boolean var3 = var2.method320(this.brightness0, this.textureSize, this.archive); if (var3) { if (this.remaining == 0) { Texture var4 = (Texture)this.deque.removeFirst(); diff --git a/runescape-client/src/main/java/UnderlayDefinition.java b/runescape-client/src/main/java/UnderlayDefinition.java index 43c1a593c9..4cd48e1922 100644 --- a/runescape-client/src/main/java/UnderlayDefinition.java +++ b/runescape-client/src/main/java/UnderlayDefinition.java @@ -11,8 +11,8 @@ public class UnderlayDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("UnderlayDefinition_indexCache") - static AbstractArchive UnderlayDefinition_indexCache; + @Export("UnderlayDefinition_archive") + static AbstractArchive UnderlayDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" @@ -69,15 +69,15 @@ public class UnderlayDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-336010991" ) - @Export("read") - void read(Buffer var1, int var2) { + @Export("decode") + void decode(Buffer var1, int var2) { while (true) { int var3 = var1.readUnsignedByte(); if (var3 == 0) { return; } - this.readNext(var1, var3, var2); + this.decodeNext(var1, var3, var2); } } @@ -86,8 +86,8 @@ public class UnderlayDefinition extends DualNode { signature = "(Lgr;III)V", garbageValue = "137131494" ) - @Export("readNext") - void readNext(Buffer var1, int var2, int var3) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2, int var3) { if (var2 == 1) { this.rgb = var1.readMedium(); } diff --git a/runescape-client/src/main/java/UnitPriceComparator.java b/runescape-client/src/main/java/UnitPriceComparator.java index d0d4a05c66..1ebfa9ecc5 100644 --- a/runescape-client/src/main/java/UnitPriceComparator.java +++ b/runescape-client/src/main/java/UnitPriceComparator.java @@ -46,7 +46,7 @@ final class UnitPriceComparator implements Comparator { garbageValue = "23" ) public static void method135(AbstractArchive var0) { - VarbitDefinition.VarbitDefinition_indexCache = var0; + VarbitDefinition.VarbitDefinition_archive = var0; } @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index 93f8e81b87..193ca517ab 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -10,8 +10,8 @@ public class UserComparator3 extends AbstractUserComparator { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache6") - static Archive indexCache6; + @Export("archive6") + static Archive archive6; @ObfuscatedName("fl") @ObfuscatedSignature( signature = "Lfm;" diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java index ba5e343e14..0b6544715c 100644 --- a/runescape-client/src/main/java/VarbitDefinition.java +++ b/runescape-client/src/main/java/VarbitDefinition.java @@ -11,8 +11,8 @@ public class VarbitDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("VarbitDefinition_indexCache") - static AbstractArchive VarbitDefinition_indexCache; + @Export("VarbitDefinition_archive") + static AbstractArchive VarbitDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" @@ -46,15 +46,15 @@ public class VarbitDefinition extends DualNode { signature = "(Lgr;I)V", garbageValue = "-1888757206" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -63,8 +63,8 @@ public class VarbitDefinition extends DualNode { signature = "(Lgr;IB)V", garbageValue = "-76" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { this.varp = var1.readUnsignedShort(); this.lowBit = var1.readUnsignedByte(); diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index a78e68a7f1..fbbe1b9c74 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -33,7 +33,7 @@ public class Varcs { Varcs() { this.unwrittenChanges = false; - int var1 = ObjectSound.indexCache2.method4(19); + int var1 = ObjectSound.archive2.method4(19); this.map = new HashMap(); this.intsPersistence = new boolean[var1]; @@ -44,8 +44,8 @@ public class Varcs { } var2 = 0; - if (ObjectSound.indexCache2.method133(15)) { - var2 = ObjectSound.indexCache2.method4(15); + if (ObjectSound.archive2.method133(15)) { + var2 = ObjectSound.archive2.method4(15); } this.strings = new String[var2]; diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index c688b4fbee..93e4af9d40 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -39,15 +39,15 @@ public class VarpDefinition extends DualNode { signature = "(Lgr;B)V", garbageValue = "-41" ) - @Export("read") - void read(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -56,8 +56,8 @@ public class VarpDefinition extends DualNode { signature = "(Lgr;II)V", garbageValue = "-1859920822" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 5) { this.type = var1.readUnsignedShort(); } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index 799664d180..99b0479857 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -29,7 +29,7 @@ public class Varps { garbageValue = "2111080001" ) public static void method4393(AbstractArchive var0) { - UnderlayDefinition.UnderlayDefinition_indexCache = var0; + UnderlayDefinition.UnderlayDefinition_archive = var0; } @ObfuscatedName("ki") diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index ea9b67341f..9eae4d88ed 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -26,8 +26,8 @@ public class Widget extends Node { @ObfuscatedSignature( signature = "Lir;" ) - @Export("Widget_indexCache") - public static AbstractArchive Widget_indexCache; + @Export("Widget_archive") + public static AbstractArchive Widget_archive; @ObfuscatedName("d") @ObfuscatedSignature( signature = "Lir;" diff --git a/runescape-client/src/main/java/WidgetGroupParent.java b/runescape-client/src/main/java/WidgetGroupParent.java index ad949b8a8a..bfe06d2a39 100644 --- a/runescape-client/src/main/java/WidgetGroupParent.java +++ b/runescape-client/src/main/java/WidgetGroupParent.java @@ -49,11 +49,11 @@ public class WidgetGroupParent extends Node { return var2; } else { String var3 = String.valueOf(var0); - int var4 = Formatting.indexCache12.getGroupId(var3); + int var4 = Formatting.archive12.getGroupId(var3); if (var4 == -1) { return null; } else { - byte[] var5 = Formatting.indexCache12.takeFileFlat(var4); + byte[] var5 = Formatting.archive12.takeFileFlat(var4); if (var5 != null) { if (var5.length <= 1) { return null; diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index a8939dfe2e..44dcb1f492 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -74,8 +74,8 @@ public class WorldMap { @ObfuscatedSignature( signature = "Lag;" ) - @Export("currentMapArea0") - WorldMapArea currentMapArea0; + @Export("currentMapArea") + WorldMapArea currentMapArea; @ObfuscatedName("t") @ObfuscatedSignature( signature = "Lag;" @@ -92,7 +92,7 @@ public class WorldMap { signature = "Lls;" ) @Export("cacheLoader") - WorldMapIndexCacheLoader cacheLoader; + WorldMapArchiveLoader cacheLoader; @ObfuscatedName("b") @ObfuscatedGetter( intValue = 1711576969 @@ -322,7 +322,7 @@ public class WorldMap { this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_small, var5.get(fontNameVerdana11)); this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); - this.cacheLoader = new WorldMapIndexCacheLoader(var1); + this.cacheLoader = new WorldMapArchiveLoader(var1); int var7 = this.field989.getGroupId(WorldMapCacheName.WorldMapCacheName_details.name); int[] var8 = this.field989.method3(var7); this.mapAreas = new HashMap(var8.length); @@ -357,7 +357,7 @@ public class WorldMap { ) @Export("onCycle") public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) { - if (this.cacheLoader.isLoaded()) { + if (this.cacheLoader.getIsLoaded()) { this.smoothZoom(); this.method363(); if (var3) { @@ -437,10 +437,10 @@ public class WorldMap { @ObfuscatedName("o") void method362(int var1, int var2, boolean var3, long var4) { - if (this.currentMapArea0 != null) { + if (this.currentMapArea != null) { int var6 = (int)((float)this.worldMapX + ((float)(var1 - this.worldMapDisplayX) - (float)this.method377() * this.zoom / 2.0F) / this.zoom); int var7 = (int)((float)this.worldMapY - ((float)(var2 - this.worldMapDisplayY) - (float)this.method378() * this.zoom / 2.0F) / this.zoom); - this.mouseCoord = this.currentMapArea0.coord(var6 + this.currentMapArea0.minX() * 64, var7 + this.currentMapArea0.minY() * 64); + this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.minX() * 64, var7 + this.currentMapArea.minY() * 64); if (this.mouseCoord != null && var3) { int var8; int var9; @@ -631,7 +631,7 @@ public class WorldMap { ) @Export("currentMapAreaId") public int currentMapAreaId() { - return this.currentMapArea0 == null ? -1 : this.currentMapArea0.id(); + return this.currentMapArea == null ? -1 : this.currentMapArea.id(); } @ObfuscatedName("s") @@ -641,7 +641,7 @@ public class WorldMap { ) @Export("getCurrentMapArea") public WorldMapArea getCurrentMapArea() { - return this.currentMapArea0; + return this.currentMapArea; } @ObfuscatedName("t") @@ -651,7 +651,7 @@ public class WorldMap { ) @Export("setCurrentMapArea") void setCurrentMapArea(WorldMapArea var1) { - if (this.currentMapArea0 == null || var1 != this.currentMapArea0) { + if (this.currentMapArea == null || var1 != this.currentMapArea) { this.initializeWorldMap(var1); this.jump(-1, -1, -1); } @@ -665,9 +665,9 @@ public class WorldMap { ) @Export("initializeWorldMap") void initializeWorldMap(WorldMapArea var1) { - this.currentMapArea0 = var1; + this.currentMapArea = var1; this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.field990, this.field991); - this.cacheLoader.reset(this.currentMapArea0.archiveName()); + this.cacheLoader.reset(this.currentMapArea.archiveName()); } @ObfuscatedName("h") @@ -677,11 +677,11 @@ public class WorldMap { ) public void method367(WorldMapArea var1, TileLocation var2, TileLocation var3, boolean var4) { if (var1 != null) { - if (this.currentMapArea0 == null || var1 != this.currentMapArea0) { + if (this.currentMapArea == null || var1 != this.currentMapArea) { this.initializeWorldMap(var1); } - if (!var4 && this.currentMapArea0.containsCoord(var2.plane, var2.x, var2.y)) { + if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { this.jump(var2.plane, var2.x, var2.y); } else { this.jump(var3.plane, var3.x, var3.y); @@ -697,16 +697,16 @@ public class WorldMap { ) @Export("jump") void jump(int var1, int var2, int var3) { - if (this.currentMapArea0 != null) { - int[] var4 = this.currentMapArea0.position(var1, var2, var3); + if (this.currentMapArea != null) { + int[] var4 = this.currentMapArea.position(var1, var2, var3); if (var4 == null) { - var4 = this.currentMapArea0.position(this.currentMapArea0.originPlane(), this.currentMapArea0.originX(), this.currentMapArea0.originY()); + var4 = this.currentMapArea.position(this.currentMapArea.originPlane(), this.currentMapArea.originX(), this.currentMapArea.originY()); } - this.setWorldMapPosition(var4[0] - this.currentMapArea0.minX() * 64, var4[1] - this.currentMapArea0.minY() * 64, true); + this.setWorldMapPosition(var4[0] - this.currentMapArea.minX() * 64, var4[1] - this.currentMapArea.minY() * 64, true); this.worldMapTargetX = -1; this.worldMapTargetY = -1; - this.zoom = this.method370(this.currentMapArea0.zoom()); + this.zoom = this.method370(this.currentMapArea.zoom()); this.zoomTarget = this.zoom; this.field1009 = null; this.iconIterator = null; @@ -726,12 +726,12 @@ public class WorldMap { Rasterizer2D.Rasterizer2D_getClipArray(var6); Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); - int var7 = this.cacheLoader.percentLoaded(); + int var7 = this.cacheLoader.getPercentLoaded(); if (var7 < 100) { this.drawLoading(var1, var2, var3, var4, var7); } else { if (!this.worldMapManager.isLoaded()) { - this.worldMapManager.load(this.field989, this.currentMapArea0.archiveName(), Client.isMembersWorld); + this.worldMapManager.load(this.field989, this.currentMapArea.archiveName(), Client.isMembersWorld); if (!this.worldMapManager.isLoaded()) { return; } @@ -835,9 +835,9 @@ public class WorldMap { ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4) { - if (this.cacheLoader.isLoaded()) { + if (this.cacheLoader.getIsLoaded()) { if (!this.worldMapManager.isLoaded()) { - this.worldMapManager.load(this.field989, this.currentMapArea0.archiveName(), Client.isMembersWorld); + this.worldMapManager.load(this.field989, this.currentMapArea.archiveName(), Client.isMembersWorld); if (!this.worldMapManager.isLoaded()) { return; } @@ -910,7 +910,7 @@ public class WorldMap { ) @Export("isCacheLoaded") public boolean isCacheLoaded() { - return this.cacheLoader.isLoaded(); + return this.cacheLoader.getIsLoaded(); } @ObfuscatedName("ah") @@ -939,9 +939,9 @@ public class WorldMap { ) @Export("setWorldMapPositionTarget") public void setWorldMapPositionTarget(int var1, int var2) { - if (this.currentMapArea0 != null && this.currentMapArea0.containsPosition(var1, var2)) { - this.worldMapTargetX = var1 - this.currentMapArea0.minX() * 64; - this.worldMapTargetY = var2 - this.currentMapArea0.minY() * 64; + if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { + this.worldMapTargetX = var1 - this.currentMapArea.minX() * 64; + this.worldMapTargetY = var2 - this.currentMapArea.minY() * 64; } } @@ -952,8 +952,8 @@ public class WorldMap { garbageValue = "-2147142500" ) public void method371(int var1, int var2) { - if (this.currentMapArea0 != null) { - this.setWorldMapPosition(var1 - this.currentMapArea0.minX() * 64, var2 - this.currentMapArea0.minY() * 64, true); + if (this.currentMapArea != null) { + this.setWorldMapPosition(var1 - this.currentMapArea.minX() * 64, var2 - this.currentMapArea.minY() * 64, true); this.worldMapTargetX = -1; this.worldMapTargetY = -1; } @@ -966,8 +966,8 @@ public class WorldMap { garbageValue = "-40" ) public void method372(int var1, int var2, int var3) { - if (this.currentMapArea0 != null) { - int[] var4 = this.currentMapArea0.position(var1, var2, var3); + if (this.currentMapArea != null) { + int[] var4 = this.currentMapArea.position(var1, var2, var3); if (var4 != null) { this.setWorldMapPositionTarget(var4[0], var4[1]); } @@ -981,8 +981,8 @@ public class WorldMap { garbageValue = "1808854561" ) public void method373(int var1, int var2, int var3) { - if (this.currentMapArea0 != null) { - int[] var4 = this.currentMapArea0.position(var1, var2, var3); + if (this.currentMapArea != null) { + int[] var4 = this.currentMapArea.position(var1, var2, var3); if (var4 != null) { this.method371(var4[0], var4[1]); } @@ -996,7 +996,7 @@ public class WorldMap { garbageValue = "-659556919" ) public int method374() { - return this.currentMapArea0 == null ? -1 : this.worldMapX + this.currentMapArea0.minX() * 64; + return this.currentMapArea == null ? -1 : this.worldMapX + this.currentMapArea.minX() * 64; } @ObfuscatedName("at") @@ -1005,7 +1005,7 @@ public class WorldMap { garbageValue = "1893257871" ) public int method375() { - return this.currentMapArea0 == null ? -1 : this.worldMapY + this.currentMapArea0.minY() * 64; + return this.currentMapArea == null ? -1 : this.worldMapY + this.currentMapArea.minY() * 64; } @ObfuscatedName("ad") @@ -1014,7 +1014,7 @@ public class WorldMap { garbageValue = "-2005824064" ) public TileLocation method376() { - return this.currentMapArea0 == null ? null : this.currentMapArea0.coord(this.method374(), this.method375()); + return this.currentMapArea == null ? null : this.currentMapArea.coord(this.method374(), this.method375()); } @ObfuscatedName("ap") @@ -1229,7 +1229,7 @@ public class WorldMap { garbageValue = "-73" ) public void method384(int var1, int var2, int var3, int var4, int var5, int var6) { - if (this.cacheLoader.isLoaded()) { + if (this.cacheLoader.getIsLoaded()) { int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); List var9 = this.worldMapManager.method403(this.worldMapX - var7 / 2 - 1, this.worldMapY - var8 / 2 - 1, var7 / 2 + this.worldMapX + 1, var8 / 2 + this.worldMapY + 1, var1, var2, var3, var4, var5, var6); @@ -1264,11 +1264,11 @@ public class WorldMap { garbageValue = "333454230" ) public TileLocation method385(int var1, TileLocation var2) { - if (!this.cacheLoader.isLoaded()) { + if (!this.cacheLoader.getIsLoaded()) { return null; } else if (!this.worldMapManager.isLoaded()) { return null; - } else if (!this.currentMapArea0.containsPosition(var2.x, var2.y)) { + } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { return null; } else { HashMap var3 = this.worldMapManager.buildIcons(); @@ -1337,7 +1337,7 @@ public class WorldMap { ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { - if (!this.cacheLoader.isLoaded()) { + if (!this.cacheLoader.getIsLoaded()) { return null; } else if (!this.worldMapManager.isLoaded()) { return null; diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java new file mode 100644 index 0000000000..3ff6dbd111 --- /dev/null +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -0,0 +1,109 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ls") +@Implements("WorldMapArchiveLoader") +public class WorldMapArchiveLoader +{ + @ObfuscatedName("o") + @Export("cacheName") + String cacheName; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lir;" + ) + @Export("archive") + AbstractArchive archive; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 624113115 + ) + @Export("percentLoaded") + int percentLoaded; + @ObfuscatedName("l") + @Export("isLoaded") + boolean isLoaded; + + @ObfuscatedSignature( + signature = "(Lir;)V" + ) + WorldMapArchiveLoader(AbstractArchive var1) { + this.percentLoaded = 0; + this.isLoaded = false; + this.archive = var1; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "-1867776989" + ) + @Export("reset") + void reset(String cacheName) { + if (cacheName != null && !cacheName.isEmpty() && cacheName != this.cacheName) { + this.cacheName = cacheName; + this.percentLoaded = 0; + this.isLoaded = false; + this.load(); + } + + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "2019633217" + ) + @Export("load") + int load() { + if (this.percentLoaded < 33) { + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, this.cacheName)) { + return this.percentLoaded; + } + + this.percentLoaded = 33; + } + + if (this.percentLoaded == 33) { + if (this.archive.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName)) { + return this.percentLoaded; + } + + this.percentLoaded = 66; + } + + if (this.percentLoaded == 66) { + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.WorldMapCacheName_labels.name)) { + return this.percentLoaded; + } + + this.percentLoaded = 100; + this.isLoaded = true; + } + + return this.percentLoaded; + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(S)Z", + garbageValue = "-16324" + ) + @Export("getIsLoaded") + boolean getIsLoaded() { + return this.isLoaded; + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "1342963007" + ) + @Export("getPercentLoaded") + int getPercentLoaded() { + return this.percentLoaded; + } +} diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 6fe7e0c410..d7be52abaf 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -89,10 +89,10 @@ public class WorldMapAreaData extends WorldMapArea { if (var1 != null) { return var1; } else { - byte[] var2 = SequenceDefinition.SequenceDefinition_indexCache.takeFile(12, var0); + byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); var1 = new SequenceDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } var1.init(); diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index 40356c54f5..ba3cfb9896 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -11,8 +11,8 @@ public class WorldMapDecoration { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache4") - static Archive indexCache4; + @Export("archive4") + static Archive archive4; @ObfuscatedName("kw") @ObfuscatedGetter( intValue = -12041645 diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index 7eb4d7707b..d85621cd3d 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -168,7 +168,7 @@ public enum WorldMapDecorationType implements Enumerated { byte[] var2 = class4.field1158.takeFile(5, var0); var1 = new InvDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } InvDefinition.InvDefinition_cached.put(var1, (long)var0); diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index 4cf0df629b..2f54152343 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -123,15 +123,15 @@ public class WorldMapElement extends DualNode { signature = "(Lgr;B)V", garbageValue = "81" ) - @Export("read") - public void read(Buffer var1) { + @Export("decode") + public void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.readNext(var1, var2); + this.decodeNext(var1, var2); } } @@ -140,8 +140,8 @@ public class WorldMapElement extends DualNode { signature = "(Lgr;II)V", garbageValue = "-1197630144" ) - @Export("readNext") - void readNext(Buffer var1, int var2) { + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { if (var2 == 1) { this.sprite1 = var1.method51(); } else if (var2 == 2) { diff --git a/runescape-client/src/main/java/WorldMapIcon1.java b/runescape-client/src/main/java/WorldMapIcon1.java index 4ce75a7560..0931561556 100644 --- a/runescape-client/src/main/java/WorldMapIcon1.java +++ b/runescape-client/src/main/java/WorldMapIcon1.java @@ -17,8 +17,8 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache3") - static Archive indexCache3; + @Export("archive3") + static Archive archive3; @ObfuscatedName("ec") @Export("secureRandom") static SecureRandom secureRandom; @@ -127,7 +127,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { SoundEffect var10 = Client.soundEffects[var0]; if (var10 == null) { Object var2 = null; - var10 = SoundEffect.readSoundEffect(WorldMapDecoration.indexCache4, Client.soundEffectIds[var0], 0); + var10 = SoundEffect.readSoundEffect(WorldMapDecoration.archive4, Client.soundEffectIds[var0], 0); if (var10 == null) { continue; } @@ -202,7 +202,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { if (!var9) { if (Client.field128 != 0 && Client.field112 != -1) { - Login.method2076(UserComparator3.indexCache6, Client.field112, 0, Client.field128, false); + Login.method2076(UserComparator3.archive6, Client.field112, 0, Client.field128, false); } Client.field107 = false; diff --git a/runescape-client/src/main/java/WorldMapIndexCacheLoader.java b/runescape-client/src/main/java/WorldMapIndexCacheLoader.java deleted file mode 100644 index 891978276e..0000000000 --- a/runescape-client/src/main/java/WorldMapIndexCacheLoader.java +++ /dev/null @@ -1,108 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ls") -@Implements("WorldMapIndexCacheLoader") -public class WorldMapIndexCacheLoader { - @ObfuscatedName("o") - @Export("cacheName") - String cacheName; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lir;" - ) - @Export("indexCache") - AbstractArchive indexCache; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 624113115 - ) - @Export("percentLoaded0") - int percentLoaded0; - @ObfuscatedName("l") - @Export("isLoaded0") - boolean isLoaded0; - - @ObfuscatedSignature( - signature = "(Lir;)V" - ) - WorldMapIndexCacheLoader(AbstractArchive var1) { - this.percentLoaded0 = 0; - this.isLoaded0 = false; - this.indexCache = var1; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-1867776989" - ) - @Export("reset") - void reset(String var1) { - if (var1 != null && !var1.isEmpty() && var1 != this.cacheName) { - this.cacheName = var1; - this.percentLoaded0 = 0; - this.isLoaded0 = false; - this.load(); - } - - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "2019633217" - ) - @Export("load") - int load() { - if (this.percentLoaded0 < 33) { - if (!this.indexCache.tryLoadFileByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, this.cacheName)) { - return this.percentLoaded0; - } - - this.percentLoaded0 = 33; - } - - if (this.percentLoaded0 == 33) { - if (this.indexCache.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName) && !this.indexCache.tryLoadFileByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName)) { - return this.percentLoaded0; - } - - this.percentLoaded0 = 66; - } - - if (this.percentLoaded0 == 66) { - if (!this.indexCache.tryLoadFileByNames(this.cacheName, WorldMapCacheName.WorldMapCacheName_labels.name)) { - return this.percentLoaded0; - } - - this.percentLoaded0 = 100; - this.isLoaded0 = true; - } - - return this.percentLoaded0; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(S)Z", - garbageValue = "-16324" - ) - @Export("isLoaded") - boolean isLoaded() { - return this.isLoaded0; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1342963007" - ) - @Export("percentLoaded") - int percentLoaded() { - return this.percentLoaded0; - } -} diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 560007ff66..af00b8f310 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -452,7 +452,7 @@ public class WorldMapRegion { byte[] var13 = OverlayDefinition.field663.takeFile(4, var7); var11 = new OverlayDefinition(); if (var13 != null) { - var11.read(new Buffer(var13), var7); + var11.decode(new Buffer(var13), var7); } var11.init(); @@ -557,7 +557,7 @@ public class WorldMapRegion { byte[] var10 = OverlayDefinition.field663.takeFile(4, var6); var8 = new OverlayDefinition(); if (var10 != null) { - var8.read(new Buffer(var10), var6); + var8.decode(new Buffer(var10), var6); } var8.init(); diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index a0a4f653cc..946af931f3 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -14,8 +14,8 @@ public class WorldMapSection1 implements WorldMapSection { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache15") - static Archive indexCache15; + @Export("archive15") + static Archive archive15; @ObfuscatedName("ey") @ObfuscatedGetter( intValue = -1516124929 @@ -193,10 +193,10 @@ public class WorldMapSection1 implements WorldMapSection { if (var1 != null) { return var1; } else { - byte[] var2 = KitDefinition.KitDefinition_indexCache.takeFile(3, var0); + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); var1 = new KitDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } KitDefinition.KitDefinition_cached.put(var1, (long)var0); diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java index 99fdb5df3b..e6e82503ab 100644 --- a/runescape-client/src/main/java/WorldMapSection3.java +++ b/runescape-client/src/main/java/WorldMapSection3.java @@ -14,8 +14,8 @@ public class WorldMapSection3 implements WorldMapSection { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache8") - static Archive indexCache8; + @Export("archive8") + static Archive archive8; @ObfuscatedName("go") @ObfuscatedGetter( intValue = -948290091 diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 3811b9d99d..d6b51aa347 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -21,8 +21,8 @@ public class class16 { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache10") - static Archive indexCache10; + @Export("archive10") + static Archive archive10; @ObfuscatedName("ga") @ObfuscatedSignature( signature = "[Lln;" diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index 19f4b14541..9d7b8b34d5 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -99,23 +99,23 @@ public class class171 { Login.Login_loadingPercent = 10; Client.titleLoadingStage = 30; } else if (Client.titleLoadingStage == 30) { - AbstractArchive.indexCache0 = class22.newIndexCache(0, false, true, true); - Skeleton.indexCache1 = class22.newIndexCache(1, false, true, true); - ObjectSound.indexCache2 = class22.newIndexCache(2, true, false, true); - WorldMapIcon1.indexCache3 = class22.newIndexCache(3, false, true, true); - WorldMapDecoration.indexCache4 = class22.newIndexCache(4, false, true, true); - SecureRandomFuture.indexCache5 = class22.newIndexCache(5, true, true, true); - UserComparator3.indexCache6 = class22.newIndexCache(6, true, true, true); - class40.indexCache7 = class22.newIndexCache(7, false, true, true); - WorldMapSection3.indexCache8 = class22.newIndexCache(8, false, true, true); - class238.indexCache9 = class22.newIndexCache(9, false, true, true); - class16.indexCache10 = class22.newIndexCache(10, false, true, true); - Login.indexCache11 = class22.newIndexCache(11, false, true, true); - Formatting.indexCache12 = class22.newIndexCache(12, false, true, true); - ByteArrayPool.indexCache13 = class22.newIndexCache(13, true, false, true); - class2.indexCache14 = class22.newIndexCache(14, false, true, true); - WorldMapSection1.indexCache15 = class22.newIndexCache(15, false, true, true); - class22.indexCache16 = class22.newIndexCache(17, true, true, true); + AbstractArchive.archive0 = class22.newIndexCache(0, false, true, true); + Skeleton.archive1 = class22.newIndexCache(1, false, true, true); + ObjectSound.archive2 = class22.newIndexCache(2, true, false, true); + WorldMapIcon1.archive3 = class22.newIndexCache(3, false, true, true); + WorldMapDecoration.archive4 = class22.newIndexCache(4, false, true, true); + SecureRandomFuture.archive5 = class22.newIndexCache(5, true, true, true); + UserComparator3.archive6 = class22.newIndexCache(6, true, true, true); + class40.archive7 = class22.newIndexCache(7, false, true, true); + WorldMapSection3.archive8 = class22.newIndexCache(8, false, true, true); + class238.archive9 = class22.newIndexCache(9, false, true, true); + class16.archive10 = class22.newIndexCache(10, false, true, true); + Login.archive11 = class22.newIndexCache(11, false, true, true); + Formatting.archive12 = class22.newIndexCache(12, false, true, true); + ByteArrayPool.archive13 = class22.newIndexCache(13, true, false, true); + class2.archive14 = class22.newIndexCache(14, false, true, true); + WorldMapSection1.archive15 = class22.newIndexCache(15, false, true, true); + class22.archive16 = class22.newIndexCache(17, true, true, true); WorldMapLabelSize.field1040 = class22.newIndexCache(18, false, true, true); ItemContainer.field434 = class22.newIndexCache(19, false, true, true); AbstractByteArrayCopier.field0 = class22.newIndexCache(20, false, true, true); @@ -124,26 +124,26 @@ public class class171 { Client.titleLoadingStage = 40; } else if (Client.titleLoadingStage == 40) { byte var1 = 0; - var0 = var1 + AbstractArchive.indexCache0.percentage() * 4 / 100; - var0 += Skeleton.indexCache1.percentage() * 4 / 100; - var0 += ObjectSound.indexCache2.percentage() * 2 / 100; - var0 += WorldMapIcon1.indexCache3.percentage() * 2 / 100; - var0 += WorldMapDecoration.indexCache4.percentage() * 6 / 100; - var0 += SecureRandomFuture.indexCache5.percentage() * 4 / 100; - var0 += UserComparator3.indexCache6.percentage() * 2 / 100; - var0 += class40.indexCache7.percentage() * 56 / 100; - var0 += WorldMapSection3.indexCache8.percentage() * 2 / 100; - var0 += class238.indexCache9.percentage() * 2 / 100; - var0 += class16.indexCache10.percentage() * 2 / 100; - var0 += Login.indexCache11.percentage() * 2 / 100; - var0 += Formatting.indexCache12.percentage() * 2 / 100; - var0 += ByteArrayPool.indexCache13.percentage() * 2 / 100; - var0 += class2.indexCache14.percentage() * 2 / 100; - var0 += WorldMapSection1.indexCache15.percentage() * 2 / 100; + var0 = var1 + AbstractArchive.archive0.percentage() * 4 / 100; + var0 += Skeleton.archive1.percentage() * 4 / 100; + var0 += ObjectSound.archive2.percentage() * 2 / 100; + var0 += WorldMapIcon1.archive3.percentage() * 2 / 100; + var0 += WorldMapDecoration.archive4.percentage() * 6 / 100; + var0 += SecureRandomFuture.archive5.percentage() * 4 / 100; + var0 += UserComparator3.archive6.percentage() * 2 / 100; + var0 += class40.archive7.percentage() * 56 / 100; + var0 += WorldMapSection3.archive8.percentage() * 2 / 100; + var0 += class238.archive9.percentage() * 2 / 100; + var0 += class16.archive10.percentage() * 2 / 100; + var0 += Login.archive11.percentage() * 2 / 100; + var0 += Formatting.archive12.percentage() * 2 / 100; + var0 += ByteArrayPool.archive13.percentage() * 2 / 100; + var0 += class2.archive14.percentage() * 2 / 100; + var0 += WorldMapSection1.archive15.percentage() * 2 / 100; var0 += ItemContainer.field434.percentage() / 100; var0 += WorldMapLabelSize.field1040.percentage() / 100; var0 += AbstractByteArrayCopier.field0.percentage() / 100; - var0 += class22.indexCache16.method130() && class22.indexCache16.method2() ? 1 : 0; + var0 += class22.archive16.method130() && class22.archive16.method2() ? 1 : 0; if (var0 != 100) { if (var0 != 0) { Login.Login_loadingText = "Checking for updates - " + var0 + "%"; @@ -151,21 +151,21 @@ public class class171 { Login.Login_loadingPercent = 30; } else { - AbstractWorldMapIcon.method625(AbstractArchive.indexCache0, "Animations"); - AbstractWorldMapIcon.method625(Skeleton.indexCache1, "Skeletons"); - AbstractWorldMapIcon.method625(WorldMapDecoration.indexCache4, "Sound FX"); - AbstractWorldMapIcon.method625(SecureRandomFuture.indexCache5, "Maps"); - AbstractWorldMapIcon.method625(UserComparator3.indexCache6, "Music Tracks"); - AbstractWorldMapIcon.method625(class40.indexCache7, "Models"); - AbstractWorldMapIcon.method625(WorldMapSection3.indexCache8, "Sprites"); - AbstractWorldMapIcon.method625(Login.indexCache11, "Music Jingles"); - AbstractWorldMapIcon.method625(class2.indexCache14, "Music Samples"); - AbstractWorldMapIcon.method625(WorldMapSection1.indexCache15, "Music Patches"); + AbstractWorldMapIcon.method625(AbstractArchive.archive0, "Animations"); + AbstractWorldMapIcon.method625(Skeleton.archive1, "Skeletons"); + AbstractWorldMapIcon.method625(WorldMapDecoration.archive4, "Sound FX"); + AbstractWorldMapIcon.method625(SecureRandomFuture.archive5, "Maps"); + AbstractWorldMapIcon.method625(UserComparator3.archive6, "Music Tracks"); + AbstractWorldMapIcon.method625(class40.archive7, "Models"); + AbstractWorldMapIcon.method625(WorldMapSection3.archive8, "Sprites"); + AbstractWorldMapIcon.method625(Login.archive11, "Music Jingles"); + AbstractWorldMapIcon.method625(class2.archive14, "Music Samples"); + AbstractWorldMapIcon.method625(WorldMapSection1.archive15, "Music Patches"); AbstractWorldMapIcon.method625(ItemContainer.field434, "World Map"); AbstractWorldMapIcon.method625(WorldMapLabelSize.field1040, "World Map Geography"); AbstractWorldMapIcon.method625(AbstractByteArrayCopier.field0, "World Map Ground"); class211.spriteIds = new SpriteIds(); - class211.spriteIds.read(class22.indexCache16); + class211.spriteIds.read(class22.archive16); Login.Login_loadingText = "Loaded update list"; Login.Login_loadingPercent = 30; Client.titleLoadingStage = 45; @@ -176,7 +176,7 @@ public class class171 { var28.method174(9, 128); WorldMapCacheName.pcmPlayer0 = Players.newPcmPlayer(GameShell.taskHandler, 0, 22050); WorldMapCacheName.pcmPlayer0.setStream(var28); - NetSocket.method3537(WorldMapSection1.indexCache15, class2.indexCache14, WorldMapDecoration.indexCache4, var28); + NetSocket.method3537(WorldMapSection1.archive15, class2.archive14, WorldMapDecoration.archive4, var28); AbstractArchive.pcmPlayer1 = Players.newPcmPlayer(GameShell.taskHandler, 1, 2048); TaskHandler.pcmStreamMixer = new PcmStreamMixer(); AbstractArchive.pcmPlayer1.setStream(TaskHandler.pcmStreamMixer); @@ -184,7 +184,7 @@ public class class171 { Login.Login_loadingText = "Prepared sound engine"; Login.Login_loadingPercent = 35; Client.titleLoadingStage = 50; - WorldMapElement.fonts = new Fonts(WorldMapSection3.indexCache8, ByteArrayPool.indexCache13); + WorldMapElement.fonts = new Fonts(WorldMapSection3.archive8, ByteArrayPool.archive13); } else { int var29; if (Client.titleLoadingStage == 50) { @@ -206,7 +206,7 @@ public class class171 { Client.titleLoadingStage = 60; } } else if (Client.titleLoadingStage == 60) { - var0 = FloorDecoration.method2853(class16.indexCache10, WorldMapSection3.indexCache8); + var0 = FloorDecoration.method2853(class16.archive10, WorldMapSection3.archive8); var29 = class3.method36(); if (var0 < var29) { Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var29 + "%"; @@ -220,69 +220,69 @@ public class class171 { } else { Archive var30; if (Client.titleLoadingStage == 70) { - if (!ObjectSound.indexCache2.method2()) { - Login.Login_loadingText = "Loading config - " + ObjectSound.indexCache2.loadPercent() + "%"; + if (!ObjectSound.archive2.method2()) { + Login.Login_loadingText = "Loading config - " + ObjectSound.archive2.loadPercent() + "%"; Login.Login_loadingPercent = 60; } else { - Varcs.method2160(ObjectSound.indexCache2); - Varps.method4393(ObjectSound.indexCache2); - Archive var31 = ObjectSound.indexCache2; - Archive var33 = class40.indexCache7; - KitDefinition.KitDefinition_indexCache = var31; + Varcs.method2160(ObjectSound.archive2); + Varps.method4393(ObjectSound.archive2); + Archive var31 = ObjectSound.archive2; + Archive var33 = class40.archive7; + KitDefinition.KitDefinition_archive = var31; KitDefinition.field456 = var33; - KitDefinition.field457 = KitDefinition.KitDefinition_indexCache.method4(3); - RectangleMode.method6028(ObjectSound.indexCache2, class40.indexCache7, Client.isLowDetail); - IsaacCipher.method4082(ObjectSound.indexCache2, class40.indexCache7); - var30 = ObjectSound.indexCache2; + KitDefinition.field457 = KitDefinition.KitDefinition_archive.method4(3); + RectangleMode.method6028(ObjectSound.archive2, class40.archive7, Client.isLowDetail); + IsaacCipher.method4082(ObjectSound.archive2, class40.archive7); + var30 = ObjectSound.archive2; StructDefinition.field885 = var30; - Archive var5 = ObjectSound.indexCache2; - Archive var6 = class40.indexCache7; + Archive var5 = ObjectSound.archive2; + Archive var6 = class40.archive7; boolean var7 = Client.isMembersWorld; Font var8 = ScriptEvent.fontPlain11; - ItemDefinition.ItemDefinition_indexCache = var5; + ItemDefinition.ItemDefinition_archive = var5; ItemDefinition.ItemDefinition_modelIndexCache = var6; class30.inMembersWorld = var7; - class83.field1167 = ItemDefinition.ItemDefinition_indexCache.method4(10); + class83.field1167 = ItemDefinition.ItemDefinition_archive.method4(10); class204.field1122 = var8; - Archive var9 = ObjectSound.indexCache2; - Archive var10 = AbstractArchive.indexCache0; - Archive var11 = Skeleton.indexCache1; - SequenceDefinition.SequenceDefinition_indexCache = var9; + Archive var9 = ObjectSound.archive2; + Archive var10 = AbstractArchive.archive0; + Archive var11 = Skeleton.archive1; + SequenceDefinition.SequenceDefinition_archive = var9; SequenceDefinition.field773 = var10; SequenceDefinition.field774 = var11; - Archive var12 = ObjectSound.indexCache2; - Archive var13 = class40.indexCache7; - SpotAnimationDefinition.SpotAnimationDefinition_indexCache = var12; + Archive var12 = ObjectSound.archive2; + Archive var13 = class40.archive7; + SpotAnimationDefinition.SpotAnimationDefinition_archive = var12; SpotAnimationDefinition.SpotAnimationDefinition_modelIndexCache = var13; - UnitPriceComparator.method135(ObjectSound.indexCache2); - Archive var14 = ObjectSound.indexCache2; + UnitPriceComparator.method135(ObjectSound.archive2); + Archive var14 = ObjectSound.archive2; VarpDefinition.field943 = var14; VarpDefinition.field944 = VarpDefinition.field943.method4(16); - Archive var15 = WorldMapIcon1.indexCache3; - Archive var16 = class40.indexCache7; - Archive var17 = WorldMapSection3.indexCache8; - Archive var18 = ByteArrayPool.indexCache13; - Widget.Widget_indexCache = var15; + Archive var15 = WorldMapIcon1.archive3; + Archive var16 = class40.archive7; + Archive var17 = WorldMapSection3.archive8; + Archive var18 = ByteArrayPool.archive13; + Widget.Widget_archive = var15; BufferedSource.field54 = var16; Widget.field955 = var17; class27.field1143 = var18; - Widget.widgets = new Widget[Widget.Widget_indexCache.method5()][]; - Widget.loadedWidgetGroups = new boolean[Widget.Widget_indexCache.method5()]; - Archive var19 = ObjectSound.indexCache2; + Widget.widgets = new Widget[Widget.Widget_archive.method5()][]; + Widget.loadedWidgetGroups = new boolean[Widget.Widget_archive.method5()]; + Archive var19 = ObjectSound.archive2; class4.field1158 = var19; - Archive var20 = ObjectSound.indexCache2; - EnumDefinition.EnumDefinition_indexCache = var20; - Frames.method3241(ObjectSound.indexCache2); - Archive var21 = ObjectSound.indexCache2; + Archive var20 = ObjectSound.archive2; + EnumDefinition.EnumDefinition_archive = var20; + Frames.method3241(ObjectSound.archive2); + Archive var21 = ObjectSound.archive2; ParamKeyDefinition.field679 = var21; class196.varcs = new Varcs(); - class60.method1172(ObjectSound.indexCache2, WorldMapSection3.indexCache8, ByteArrayPool.indexCache13); - Archive var22 = ObjectSound.indexCache2; - Archive var23 = WorldMapSection3.indexCache8; + class60.method1172(ObjectSound.archive2, WorldMapSection3.archive8, ByteArrayPool.archive13); + Archive var22 = ObjectSound.archive2; + Archive var23 = WorldMapSection3.archive8; HealthBarDefinition.field379 = var22; HealthBarDefinition.field380 = var23; - Archive var24 = ObjectSound.indexCache2; - Archive var25 = WorldMapSection3.indexCache8; + Archive var24 = ObjectSound.archive2; + Archive var25 = WorldMapSection3.archive8; WorldMapElement.field1019 = var25; if (var24.method2()) { UserComparator4.WorldMapElement_count = var24.method4(35); @@ -292,7 +292,7 @@ public class class171 { byte[] var27 = var24.takeFile(35, var26); Widget.WorldMapElement_cached[var26] = new WorldMapElement(var26); if (var27 != null) { - Widget.WorldMapElement_cached[var26].read(new Buffer(var27)); + Widget.WorldMapElement_cached[var26].decode(new Buffer(var27)); Widget.WorldMapElement_cached[var26].method389(); } } @@ -305,13 +305,13 @@ public class class171 { } else if (Client.titleLoadingStage == 80) { var0 = 0; if (UnitPriceComparator.compass == null) { - UnitPriceComparator.compass = class322.readSprite(WorldMapSection3.indexCache8, class211.spriteIds.field878, 0); + UnitPriceComparator.compass = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field878, 0); } else { ++var0; } if (FaceNormal.field345 == null) { - FaceNormal.field345 = class322.readSprite(WorldMapSection3.indexCache8, class211.spriteIds.field879, 0); + FaceNormal.field345 = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field879, 0); } else { ++var0; } @@ -319,7 +319,7 @@ public class class171 { IndexedSprite[] var32; int var34; if (class192.mapSceneSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.mapScenes; if (!SpriteMask.loadSprite(var30, var34, 0)) { var32 = null; @@ -334,7 +334,7 @@ public class class171 { Sprite[] var35; if (class15.headIconPkSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.headIconsPk; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; @@ -348,7 +348,7 @@ public class class171 { } if (ClientPreferences.headIconPrayerSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.headIconsPrayer; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; @@ -362,7 +362,7 @@ public class class171 { } if (Player.headIconHintSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.headIconsHint; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; @@ -376,7 +376,7 @@ public class class171 { } if (class16.mapMarkerSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.mapMarkers; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; @@ -390,7 +390,7 @@ public class class171 { } if (KeyHandler.crossSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.crosses; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; @@ -404,7 +404,7 @@ public class class171 { } if (class39.mapDotSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.mapDots; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; @@ -418,7 +418,7 @@ public class class171 { } if (class32.scrollBarSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.scrollBars; if (!SpriteMask.loadSprite(var30, var34, 0)) { var32 = null; @@ -432,7 +432,7 @@ public class class171 { } if (WorldMapSectionType.modIconSprites == null) { - var30 = WorldMapSection3.indexCache8; + var30 = WorldMapSection3.archive8; var34 = class211.spriteIds.modIcons; if (!SpriteMask.loadSprite(var30, var34, 0)) { var32 = null; @@ -461,11 +461,11 @@ public class class171 { Client.titleLoadingStage = 90; } } else if (Client.titleLoadingStage == 90) { - if (!class238.indexCache9.method2()) { + if (!class238.archive9.method2()) { Login.Login_loadingText = "Loading textures - 0%"; Login.Login_loadingPercent = 90; } else { - SecureRandomFuture.textureProvider = new TextureProvider(class238.indexCache9, WorldMapSection3.indexCache8, 20, 0.8D, Client.isLowDetail ? 64 : 128); + SecureRandomFuture.textureProvider = new TextureProvider(class238.archive9, WorldMapSection3.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128); Rasterizer3D.Rasterizer3D_setTextureLoader(SecureRandomFuture.textureProvider); Rasterizer3D.Rasterizer3D_setBrightness(0.8D); Client.titleLoadingStage = 100; @@ -487,25 +487,25 @@ public class class171 { Login.Login_loadingPercent = 92; Client.titleLoadingStage = 120; } else if (Client.titleLoadingStage == 120) { - if (!class16.indexCache10.tryLoadFileByNames("huffman", "")) { + if (!class16.archive10.tryLoadFileByNames("huffman", "")) { Login.Login_loadingText = "Loading wordpack - 0%"; Login.Login_loadingPercent = 94; } else { - Huffman var37 = new Huffman(class16.indexCache10.takeFileByNames("huffman", "")); + Huffman var37 = new Huffman(class16.archive10.takeFileByNames("huffman", "")); class303.huffman = var37; Login.Login_loadingText = "Loaded wordpack"; Login.Login_loadingPercent = 94; Client.titleLoadingStage = 130; } } else if (Client.titleLoadingStage == 130) { - if (!WorldMapIcon1.indexCache3.method2()) { - Login.Login_loadingText = "Loading interfaces - " + WorldMapIcon1.indexCache3.loadPercent() * 4 / 5 + "%"; + if (!WorldMapIcon1.archive3.method2()) { + Login.Login_loadingText = "Loading interfaces - " + WorldMapIcon1.archive3.loadPercent() * 4 / 5 + "%"; Login.Login_loadingPercent = 96; - } else if (!Formatting.indexCache12.method2()) { - Login.Login_loadingText = "Loading interfaces - " + (80 + Formatting.indexCache12.loadPercent() / 6) + "%"; + } else if (!Formatting.archive12.method2()) { + Login.Login_loadingText = "Loading interfaces - " + (80 + Formatting.archive12.loadPercent() / 6) + "%"; Login.Login_loadingPercent = 96; - } else if (!ByteArrayPool.indexCache13.method2()) { - Login.Login_loadingText = "Loading interfaces - " + (96 + ByteArrayPool.indexCache13.loadPercent() / 50) + "%"; + } else if (!ByteArrayPool.archive13.method2()) { + Login.Login_loadingText = "Loading interfaces - " + (96 + ByteArrayPool.archive13.loadPercent() / 50) + "%"; Login.Login_loadingPercent = 96; } else { Login.Login_loadingText = "Loaded interfaces"; diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index 26be24396c..988d364e39 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -9,8 +9,8 @@ final class class2 implements class0 { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache14") - static Archive indexCache14; + @Export("archive14") + static Archive archive14; @ObfuscatedName("ee") @ObfuscatedGetter( intValue = -753026759 @@ -74,7 +74,7 @@ final class class2 implements class0 { } Login.titleboxSprite = MenuAction.loadIndexedSpriteByName(var1, "titlebox", ""); - IndexCacheLoader.titlebuttonSprite = MenuAction.loadIndexedSpriteByName(var1, "titlebutton", ""); + ArchiveLoader.titlebuttonSprite = MenuAction.loadIndexedSpriteByName(var1, "titlebutton", ""); int var5 = var1.getGroupId("runes"); int var6 = var1.getFileId(var5, ""); IndexedSprite[] var7; @@ -112,7 +112,7 @@ final class class2 implements class0 { Login.field470 = true; Login.worldSelectOpen = false; if (!ReflectionCheck.clientPreferences.titleMusicDisabled) { - Canvas.method858(2, UserComparator3.indexCache6, "scape main", "", 255, false); + Canvas.method858(2, UserComparator3.archive6, "scape main", "", 255, false); } else { AbstractSocket.method3488(2); } diff --git a/runescape-client/src/main/java/class211.java b/runescape-client/src/main/java/class211.java index c614fe5651..cca70bcd88 100644 --- a/runescape-client/src/main/java/class211.java +++ b/runescape-client/src/main/java/class211.java @@ -90,7 +90,7 @@ public class class211 { RouteStrategy.Interpreter_intStackSize -= 2; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var9 = ByteArrayPool.indexCache13.takeFile(var8, 0); + var9 = ByteArrayPool.archive13.takeFile(var8, 0); var10 = new Font(var9); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var10.lineCount(var3, var4); return 1; @@ -99,7 +99,7 @@ public class class211 { RouteStrategy.Interpreter_intStackSize -= 2; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var9 = ByteArrayPool.indexCache13.takeFile(var8, 0); + var9 = ByteArrayPool.archive13.takeFile(var8, 0); var10 = new Font(var9); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var10.lineWidth(var3, var4); return 1; diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java index 4169842e0d..435fc8e614 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/class22.java @@ -21,8 +21,8 @@ public final class class22 { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache16") - static Archive indexCache16; + @Export("archive16") + static Archive archive16; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 1976624405 diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java index db894b0a3c..e78ec72e7f 100644 --- a/runescape-client/src/main/java/class229.java +++ b/runescape-client/src/main/java/class229.java @@ -22,7 +22,7 @@ public class class229 { byte[] var2 = ParamKeyDefinition.field679.takeFile(11, var0); var1 = new ParamKeyDefinition(); if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } var1.init(); diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java index 16c8acfc8e..8ca962085e 100644 --- a/runescape-client/src/main/java/class238.java +++ b/runescape-client/src/main/java/class238.java @@ -8,8 +8,8 @@ public final class class238 { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache9") - static Archive indexCache9; + @Export("archive9") + static Archive archive9; @ObfuscatedName("im") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index 71c2945ebe..85ef654b94 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -107,7 +107,7 @@ public class class3 implements Enumerated { return; } - var1.indexCache.load(var1.archiveDisk, (int)var1.key, var1.data, false); + var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); } } diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java index 46263eb734..57733ec6fe 100644 --- a/runescape-client/src/main/java/class40.java +++ b/runescape-client/src/main/java/class40.java @@ -9,8 +9,8 @@ public class class40 { @ObfuscatedSignature( signature = "Lit;" ) - @Export("indexCache7") - static Archive indexCache7; + @Export("archive7") + static Archive archive7; @ObfuscatedName("gs") @Export("regionLandArchives") static byte[][] regionLandArchives; diff --git a/runescape-client/src/main/java/class50.java b/runescape-client/src/main/java/class50.java index 12f0681409..e0bee6db6f 100644 --- a/runescape-client/src/main/java/class50.java +++ b/runescape-client/src/main/java/class50.java @@ -31,11 +31,11 @@ public class class50 { if (var1 != null) { return var1; } else { - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_indexCache.takeFile(13, var0); + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); var1 = new SpotAnimationDefinition(); var1.id = var0; if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); @@ -54,11 +54,11 @@ public class class50 { if (var1 != null) { return var1; } else { - byte[] var2 = ObjectDefinition.ObjectDefinition_indexCache.takeFile(6, var0); + byte[] var2 = ObjectDefinition.ObjectDefinition_archive.takeFile(6, var0); var1 = new ObjectDefinition(); var1.id = var0; if (var2 != null) { - var1.read(new Buffer(var2)); + var1.decode(new Buffer(var2)); } var1.init(); @@ -99,7 +99,7 @@ public class class50 { } class308.regions = new int[var8]; - IndexCacheLoader.regionMapArchiveIds = new int[var8]; + ArchiveLoader.regionMapArchiveIds = new int[var8]; MouseHandler.regionLandArchiveIds = new int[var8]; class40.regionLandArchives = new byte[var8][]; HealthBarUpdate.regionMapArchives = new byte[var8][]; @@ -119,8 +119,8 @@ public class class50 { var7 = var6 + (var5 << 8); if (!var9 || var6 != 49 && var6 != 149 && var6 != 147 && var5 != 50 && (var5 != 49 || var6 != 47)) { class308.regions[var8] = var7; - IndexCacheLoader.regionMapArchiveIds[var8] = SecureRandomFuture.indexCache5.getGroupId("m" + var5 + "_" + var6); - MouseHandler.regionLandArchiveIds[var8] = SecureRandomFuture.indexCache5.getGroupId("l" + var5 + "_" + var6); + ArchiveLoader.regionMapArchiveIds[var8] = SecureRandomFuture.archive5.getGroupId("m" + var5 + "_" + var6); + MouseHandler.regionLandArchiveIds[var8] = SecureRandomFuture.archive5.getGroupId("l" + var5 + "_" + var6); ++var8; } } @@ -158,7 +158,7 @@ public class class50 { } class308.regions = new int[var4]; - IndexCacheLoader.regionMapArchiveIds = new int[var4]; + ArchiveLoader.regionMapArchiveIds = new int[var4]; MouseHandler.regionLandArchiveIds = new int[var4]; class40.regionLandArchives = new byte[var4][]; HealthBarUpdate.regionMapArchives = new byte[var4][]; @@ -185,8 +185,8 @@ public class class50 { class308.regions[var4] = var12; var13 = var12 >> 8 & 255; int var14 = var12 & 255; - IndexCacheLoader.regionMapArchiveIds[var4] = SecureRandomFuture.indexCache5.getGroupId("m" + var13 + "_" + var14); - MouseHandler.regionLandArchiveIds[var4] = SecureRandomFuture.indexCache5.getGroupId("l" + var13 + "_" + var14); + ArchiveLoader.regionMapArchiveIds[var4] = SecureRandomFuture.archive5.getGroupId("m" + var13 + "_" + var14); + MouseHandler.regionLandArchiveIds[var4] = SecureRandomFuture.archive5.getGroupId("l" + var13 + "_" + var14); ++var4; } } diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java index 19050be122..2ce7ee8d41 100644 --- a/runescape-client/src/main/java/class54.java +++ b/runescape-client/src/main/java/class54.java @@ -43,7 +43,7 @@ public final class class54 { ReflectionCheck.clientPreferences.titleMusicDisabled = !ReflectionCheck.clientPreferences.titleMusicDisabled; WorldMapSection0.savePreferences(); if (!ReflectionCheck.clientPreferences.titleMusicDisabled) { - class204.method4011(UserComparator3.indexCache6, "scape main", "", 255, false); + class204.method4011(UserComparator3.archive6, "scape main", "", 255, false); } else { class214.midiPcmStream.clear(); class214.field1129 = 1; diff --git a/runescape-client/src/main/java/class80.java b/runescape-client/src/main/java/class80.java index c98f5a904b..360e9b06c2 100644 --- a/runescape-client/src/main/java/class80.java +++ b/runescape-client/src/main/java/class80.java @@ -17,7 +17,7 @@ public class class80 { static void method2015() { if (Login.field465) { Login.titleboxSprite = null; - IndexCacheLoader.titlebuttonSprite = null; + ArchiveLoader.titlebuttonSprite = null; WorldMapEvent.runesSprite = null; Login.leftTitleSprite = null; Fonts.rightTitleSprite = null; From 74391362093f286078c1a254352375be253dff72 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sun, 7 Jul 2019 08:31:15 +0200 Subject: [PATCH 373/472] More IndexX renaming --- .../src/main/java/AbstractArchive.java | 8 +-- .../src/main/java/AbstractWorldMapIcon.java | 2 +- runescape-client/src/main/java/Archive.java | 30 +++++------ ...toreAction.java => ArchiveDiskAction.java} | 4 +- ...ler.java => ArchiveDiskActionHandler.java} | 52 +++++++++---------- runescape-client/src/main/java/Client.java | 28 +++++----- runescape-client/src/main/java/Decimator.java | 2 +- runescape-client/src/main/java/FontName.java | 2 +- runescape-client/src/main/java/Frames.java | 4 +- .../src/main/java/GrandExchangeOffer.java | 6 +-- .../src/main/java/IsaacCipher.java | 2 +- .../src/main/java/ItemDefinition.java | 28 +++++----- runescape-client/src/main/java/NPC.java | 24 ++++----- .../src/main/java/NPCDefinition.java | 12 ++--- .../src/main/java/RunException.java | 10 ++-- .../main/java/SpotAnimationDefinition.java | 6 +-- runescape-client/src/main/java/Widget.java | 24 ++++----- runescape-client/src/main/java/class171.java | 44 ++++++++-------- runescape-client/src/main/java/class22.java | 6 +-- runescape-client/src/main/java/class3.java | 8 +-- runescape-client/src/main/java/class54.java | 38 +++++++------- runescape-client/src/main/java/class65.java | 2 +- 22 files changed, 171 insertions(+), 171 deletions(-) rename runescape-client/src/main/java/{IndexStoreAction.java => ArchiveDiskAction.java} (97%) rename runescape-client/src/main/java/{IndexStoreActionHandler.java => ArchiveDiskActionHandler.java} (57%) diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index aa4a94469a..2bd08bf4ac 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -748,14 +748,14 @@ public abstract class AbstractArchive { garbageValue = "308670894" ) static boolean method4585() { - if (Client.indexCacheLoaders != null && Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) { - while (Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) { - ArchiveLoader var0 = (ArchiveLoader)Client.indexCacheLoaders.get(Client.indexCacheLoaderIndex); + if (Client.archiveLoaders != null && Client.archiveLoaderArchive < Client.archiveLoaders.size()) { + while (Client.archiveLoaderArchive < Client.archiveLoaders.size()) { + ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoaderArchive); if (!var0.method134()) { return false; } - ++Client.indexCacheLoaderIndex; + ++Client.archiveLoaderArchive; } return true; diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index b23e13f811..69638b9260 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -164,7 +164,7 @@ public abstract class AbstractWorldMapIcon { ) static void method625(Archive var0, String var1) { ArchiveLoader var2 = new ArchiveLoader(var0, var1); - Client.indexCacheLoaders.add(var2); + Client.archiveLoaders.add(var2); Client.field140 += var2.field408; } } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index dca408935e..fc6e29e9d1 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -9,8 +9,8 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Archive") public class Archive extends AbstractArchive { @ObfuscatedName("aj") - @Export("IndexCache_crc") - static CRC32 IndexCache_crc; + @Export("Archive_crc") + static CRC32 Archive_crc; @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lff;" @@ -114,9 +114,9 @@ public class Archive extends AbstractArchive { if (this.archiveDisk != null && this.validGroups != null && this.validGroups[group]) { ArchiveDisk var2 = this.archiveDisk; byte[] var3 = null; - NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { - for (IndexStoreAction var6 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.last(); var6 != null; var6 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.previous()) { + NodeDeque var4 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + for (ArchiveDiskAction var6 = (ArchiveDiskAction) ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction) ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { if (var6.key == (long) group && var2 == var6.archiveDisk && var6.type == 0) { var3 = var6.data; break; @@ -179,9 +179,9 @@ public class Archive extends AbstractArchive { int var3 = this.index; ArchiveDisk var4 = this.masterDisk; byte[] var5 = null; - NodeDeque var6 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { - for (IndexStoreAction var8 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.last(); var8 != null; var8 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.previous()) { + NodeDeque var6 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + for (ArchiveDiskAction var8 = (ArchiveDiskAction) ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction) ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { if (var8.key == (long)var3 && var4 == var8.archiveDisk && var8.type == 0) { var5 = var8.data; break; @@ -248,9 +248,9 @@ public class Archive extends AbstractArchive { } else if (var3 == null) { PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } else { - IndexCache_crc.reset(); - IndexCache_crc.update(var3, 0, var3.length); - var5 = (int)IndexCache_crc.getValue(); + Archive_crc.reset(); + Archive_crc.update(var3, 0, var3.length); + var5 = (int)Archive_crc.getValue(); if (var5 != this.indexCrc) { PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } else { @@ -279,9 +279,9 @@ public class Archive extends AbstractArchive { } if (var3 != null && var3.length > 2) { - IndexCache_crc.reset(); - IndexCache_crc.update(var3, 0, var3.length - 2); - var5 = (int)IndexCache_crc.getValue(); + Archive_crc.reset(); + Archive_crc.update(var3, 0, var3.length - 2); + var5 = (int)Archive_crc.getValue(); int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); if (var5 == super.groupCrcs[var2] && var6 == super.groupVersions[var2]) { this.validGroups[var2] = true; @@ -549,6 +549,6 @@ public class Archive extends AbstractArchive { } static { - IndexCache_crc = new CRC32(); + Archive_crc = new CRC32(); } } diff --git a/runescape-client/src/main/java/IndexStoreAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java similarity index 97% rename from runescape-client/src/main/java/IndexStoreAction.java rename to runescape-client/src/main/java/ArchiveDiskAction.java index cec172fa81..d2470fc62b 100644 --- a/runescape-client/src/main/java/IndexStoreAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ik") -@Implements("IndexStoreAction") -public class IndexStoreAction extends Node { +@Implements("ArchiveDiskAction") +public class ArchiveDiskAction extends Node { @ObfuscatedName("rt") @ObfuscatedGetter( intValue = -1086790653 diff --git a/runescape-client/src/main/java/IndexStoreActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java similarity index 57% rename from runescape-client/src/main/java/IndexStoreActionHandler.java rename to runescape-client/src/main/java/ArchiveDiskActionHandler.java index 7588e57bd5..3e12c3d7da 100644 --- a/runescape-client/src/main/java/IndexStoreActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -5,61 +5,61 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("iv") -@Implements("IndexStoreActionHandler") -public class IndexStoreActionHandler implements Runnable { +@Implements("ArchiveDiskActionHandler") +public class ArchiveDiskActionHandler implements Runnable { @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lje;" ) - @Export("IndexStoreActionHandler_requestQueue") - static NodeDeque IndexStoreActionHandler_requestQueue; + @Export("ArchiveDiskActionHandler_requestQueue") + static NodeDeque ArchiveDiskActionHandler_requestQueue; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lje;" ) - @Export("IndexStoreActionHandler_responseQueue") - static NodeDeque IndexStoreActionHandler_responseQueue; + @Export("ArchiveDiskActionHandler_responseQueue") + static NodeDeque ArchiveDiskActionHandler_responseQueue; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -1282224505 ) static int field412; @ObfuscatedName("w") - @Export("IndexStoreActionHandler_lock") - static Object IndexStoreActionHandler_lock; + @Export("ArchiveDiskActionHandler_lock") + static Object ArchiveDiskActionHandler_lock; @Export("run") @ObfuscatedName("run") public void run() { try { while (true) { - NodeDeque var1 = IndexStoreActionHandler_requestQueue; - IndexStoreAction var2; - synchronized(IndexStoreActionHandler_requestQueue) { - var2 = (IndexStoreAction)IndexStoreActionHandler_requestQueue.last(); + NodeDeque var1 = ArchiveDiskActionHandler_requestQueue; + ArchiveDiskAction var2; + synchronized(ArchiveDiskActionHandler_requestQueue) { + var2 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); } Object var3; if (var2 != null) { if (var2.type == 0) { var2.archiveDisk.write((int)var2.key, var2.data, var2.data.length); - var1 = IndexStoreActionHandler_requestQueue; - synchronized(IndexStoreActionHandler_requestQueue) { + var1 = ArchiveDiskActionHandler_requestQueue; + synchronized(ArchiveDiskActionHandler_requestQueue) { var2.remove(); } } else if (var2.type == 1) { var2.data = var2.archiveDisk.read((int)var2.key); - var1 = IndexStoreActionHandler_requestQueue; - synchronized(IndexStoreActionHandler_requestQueue) { - IndexStoreActionHandler_responseQueue.addFirst(var2); + var1 = ArchiveDiskActionHandler_requestQueue; + synchronized(ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler_responseQueue.addFirst(var2); } } - var3 = IndexStoreActionHandler_lock; - synchronized(IndexStoreActionHandler_lock) { + var3 = ArchiveDiskActionHandler_lock; + synchronized(ArchiveDiskActionHandler_lock) { if (field412 <= 1) { field412 = 0; - IndexStoreActionHandler_lock.notifyAll(); + ArchiveDiskActionHandler_lock.notifyAll(); return; } @@ -67,11 +67,11 @@ public class IndexStoreActionHandler implements Runnable { } } else { class203.method4010(100L); - var3 = IndexStoreActionHandler_lock; - synchronized(IndexStoreActionHandler_lock) { + var3 = ArchiveDiskActionHandler_lock; + synchronized(ArchiveDiskActionHandler_lock) { if (field412 <= 1) { field412 = 0; - IndexStoreActionHandler_lock.notifyAll(); + ArchiveDiskActionHandler_lock.notifyAll(); return; } @@ -100,9 +100,9 @@ public class IndexStoreActionHandler implements Runnable { } static { - IndexStoreActionHandler_requestQueue = new NodeDeque(); - IndexStoreActionHandler_responseQueue = new NodeDeque(); + ArchiveDiskActionHandler_requestQueue = new NodeDeque(); + ArchiveDiskActionHandler_responseQueue = new NodeDeque(); field412 = 0; - IndexStoreActionHandler_lock = new Object(); + ArchiveDiskActionHandler_lock = new Object(); } } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index cd2c02e115..7cd196191d 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -253,8 +253,8 @@ public final class Client extends GameShell implements Usernamed { @Export("soundEffectIds") static int[] soundEffectIds; @ObfuscatedName("sy") - @Export("indexCacheLoaders") - static ArrayList indexCacheLoaders; + @Export("archiveLoaders") + static ArrayList archiveLoaders; @ObfuscatedName("sl") @ObfuscatedGetter( intValue = -1605855913 @@ -270,8 +270,8 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -1546210597 ) - @Export("indexCacheLoaderIndex") - static int indexCacheLoaderIndex; + @Export("archiveLoaderArchive") + static int archiveLoaderArchive; @ObfuscatedName("qn") @Export("queuedSoundEffectLoops") static int[] queuedSoundEffectLoops; @@ -2378,7 +2378,7 @@ public final class Client extends GameShell implements Usernamed { class168.dat2File.close(); for (int var9 = 0; var9 < class168.idxCount; ++var9) { - IndexStoreAction.idxFiles[var9].close(); + ArchiveDiskAction.idxFiles[var9].close(); } class168.idx255File.close(); @@ -2600,10 +2600,10 @@ public final class Client extends GameShell implements Usernamed { Interpreter.method1976(); class168.dat2File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); class168.idx255File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); - IndexStoreAction.idxFiles = new BufferedFile[class168.idxCount]; + ArchiveDiskAction.idxFiles = new BufferedFile[class168.idxCount]; for (int var35 = 0; var35 < class168.idxCount; ++var35) { - IndexStoreAction.idxFiles[var35] = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx" + var35), "rw", 1048576L), 6000, 0); + ArchiveDiskAction.idxFiles[var35] = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx" + var35), "rw", 1048576L), 6000, 0); } } catch (Exception var23) { NPCDefinition.sendStackTrace((String)null, var23); @@ -3899,11 +3899,11 @@ public final class Client extends GameShell implements Usernamed { field137 = 0; while (Decimator.method2490() && field137 < 128) { - if (rights >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && IndexStoreAction.field411 == 66) { + if (rights >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && ArchiveDiskAction.field411 == 66) { String var22 = KeyHandler.method839(); TextureProvider.client.clipboardSetString(var22); } else if (oculusOrbState != 1 || GzipDecompressor.field378 <= 0) { - field145[field137] = IndexStoreAction.field411; + field145[field137] = ArchiveDiskAction.field411; field146[field137] = GzipDecompressor.field378; ++field137; } @@ -4121,7 +4121,7 @@ public final class Client extends GameShell implements Usernamed { var4 = GrandExchangeOffer.field376 * 128 + 64; var9 = KeyHandler.field445 * 128 + 64; - var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - IndexStoreAction.field410; + var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - ArchiveDiskAction.field410; var11 = var4 - WorldMapSection1.cameraX; var12 = var10 - GrandExchangeEvents.cameraY; var13 = var9 - class11.cameraZ; @@ -5428,13 +5428,13 @@ public final class Client extends GameShell implements Usernamed { isCameraLocked = true; GrandExchangeOffer.field376 = var3.readUnsignedByte(); KeyHandler.field445 = var3.readUnsignedByte(); - IndexStoreAction.field410 = var3.readUnsignedShort(); + ArchiveDiskAction.field410 = var3.readUnsignedShort(); VertexNormal.field946 = var3.readUnsignedByte(); class171.field1116 = var3.readUnsignedByte(); if (class171.field1116 >= 100) { var37 = GrandExchangeOffer.field376 * 128 + 64; var6 = KeyHandler.field445 * 128 + 64; - var5 = class32.getTileHeight(var37, var6, SoundSystem.plane) - IndexStoreAction.field410; + var5 = class32.getTileHeight(var37, var6, SoundSystem.plane) - ArchiveDiskAction.field410; var10 = var37 - WorldMapSection1.cameraX; var11 = var5 - GrandExchangeEvents.cameraY; var12 = var6 - class11.cameraZ; @@ -6511,8 +6511,8 @@ public final class Client extends GameShell implements Usernamed { grandExchangeOffers = new GrandExchangeOffer[8]; field159 = new OwnWorldComparator(); field104 = -1; - indexCacheLoaders = new ArrayList(10); - indexCacheLoaderIndex = 0; + archiveLoaders = new ArrayList(10); + archiveLoaderArchive = 0; field140 = 0; field895 = new class65(); field113 = new int[50]; diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index 229c6bbeb6..eede8d2877 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -159,7 +159,7 @@ public class Decimator { if (KeyHandler.field453 == KeyHandler.field455) { return false; } else { - IndexStoreAction.field411 = KeyHandler.field450[KeyHandler.field453]; + ArchiveDiskAction.field411 = KeyHandler.field450[KeyHandler.field453]; GzipDecompressor.field378 = KeyHandler.field449[KeyHandler.field453]; KeyHandler.field453 = KeyHandler.field453 + 1 & 127; return true; diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index e2eb1e8f48..66f09c3b9b 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -215,7 +215,7 @@ public class FontName { return 1; } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - IndexStoreActionHandler.method4655(var4); + ArchiveDiskActionHandler.method4655(var4); return 1; } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null ? PacketWriter.clanChat.rank : 0; diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index 809513ef75..7666c5d4de 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -7,8 +7,8 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Frames") public class Frames extends DualNode { @ObfuscatedName("o") - @Export("IndexStoreActionHandler_thread") - static Thread IndexStoreActionHandler_thread; + @Export("ArchiveDiskActionHandler_thread") + static Thread ArchiveDiskActionHandler_thread; @ObfuscatedName("bc") @ObfuscatedSignature( signature = "[Llq;" diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index c04163439b..e88a74d43f 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -139,11 +139,11 @@ public class GrandExchangeOffer { garbageValue = "50" ) static int method101() { - if (Client.indexCacheLoaders != null && Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) { + if (Client.archiveLoaders != null && Client.archiveLoaderArchive < Client.archiveLoaders.size()) { int var0 = 0; - for (int var1 = 0; var1 <= Client.indexCacheLoaderIndex; ++var1) { - var0 += ((ArchiveLoader)Client.indexCacheLoaders.get(var1)).field409; + for (int var1 = 0; var1 <= Client.archiveLoaderArchive; ++var1) { + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).field409; } return var0 * 10000 / Client.field140; diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index b41a453923..032efe9275 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -240,7 +240,7 @@ public final class IsaacCipher { ) public static void method4082(AbstractArchive var0, AbstractArchive var1) { NPCDefinition.NpcDefinition_archive = var0; - NPCDefinition.NpcDefinition_modelIndexCache = var1; + NPCDefinition.NpcDefinition_modelArchive = var1; } @ObfuscatedName("fl") diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index e2ca5be334..f19226a6d2 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -17,8 +17,8 @@ public class ItemDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("ItemDefinition_modelIndexCache") - public static AbstractArchive ItemDefinition_modelIndexCache; + @Export("ItemDefinition_modelArchive") + public static AbstractArchive ItemDefinition_modelArchive; @ObfuscatedName("x") @ObfuscatedSignature( signature = "Ler;" @@ -590,7 +590,7 @@ public class ItemDefinition extends DualNode { } } - ModelData var4 = ModelData.method2788(ItemDefinition_modelIndexCache, this.field435, 0); + ModelData var4 = ModelData.method2788(ItemDefinition_modelArchive, this.field435, 0); if (var4 == null) { return null; } else { @@ -639,7 +639,7 @@ public class ItemDefinition extends DualNode { if (var5 != null) { return var5; } else { - ModelData var6 = ModelData.method2788(ItemDefinition_modelIndexCache, this.field435, 0); + ModelData var6 = ModelData.method2788(ItemDefinition_modelArchive, this.field435, 0); if (var6 == null) { return null; } else { @@ -710,15 +710,15 @@ public class ItemDefinition extends DualNode { return true; } else { boolean var5 = true; - if (!ItemDefinition_modelIndexCache.tryLoadFile(var2, 0)) { + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var5 = false; } - if (var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadFile(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var5 = false; } - if (var4 != -1 && !ItemDefinition_modelIndexCache.tryLoadFile(var4, 0)) { + if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { var5 = false; } @@ -744,11 +744,11 @@ public class ItemDefinition extends DualNode { if (var2 == -1) { return null; } else { - ModelData var5 = ModelData.method2788(ItemDefinition_modelIndexCache, var2, 0); + ModelData var5 = ModelData.method2788(ItemDefinition_modelArchive, var2, 0); if (var3 != -1) { - ModelData var6 = ModelData.method2788(ItemDefinition_modelIndexCache, var3, 0); + ModelData var6 = ModelData.method2788(ItemDefinition_modelArchive, var3, 0); if (var4 != -1) { - ModelData var7 = ModelData.method2788(ItemDefinition_modelIndexCache, var4, 0); + ModelData var7 = ModelData.method2788(ItemDefinition_modelArchive, var4, 0); ModelData[] var8 = new ModelData[]{var5, var6, var7}; var5 = new ModelData(var8, 3); } else { @@ -799,11 +799,11 @@ public class ItemDefinition extends DualNode { return true; } else { boolean var4 = true; - if (!ItemDefinition_modelIndexCache.tryLoadFile(var2, 0)) { + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var4 = false; } - if (var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadFile(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var4 = false; } @@ -827,9 +827,9 @@ public class ItemDefinition extends DualNode { if (var2 == -1) { return null; } else { - ModelData var4 = ModelData.method2788(ItemDefinition_modelIndexCache, var2, 0); + ModelData var4 = ModelData.method2788(ItemDefinition_modelArchive, var2, 0); if (var3 != -1) { - ModelData var5 = ModelData.method2788(ItemDefinition_modelIndexCache, var3, 0); + ModelData var5 = ModelData.method2788(ItemDefinition_modelArchive, var3, 0); ModelData[] var6 = new ModelData[]{var4, var5}; var4 = new ModelData(var6, 2); } diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index acb5b8050a..5ff51015fb 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -168,26 +168,26 @@ public final class NPC extends Actor { garbageValue = "-51" ) static void method2009(int var0, ArchiveDisk var1, Archive var2) { - IndexStoreAction var3 = new IndexStoreAction(); + ArchiveDiskAction var3 = new ArchiveDiskAction(); var3.type = 1; var3.key = (long)var0; var3.archiveDisk = var1; var3.archive = var2; - NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { - IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.addFirst(var3); + NodeDeque var4 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); } - Object var5 = IndexStoreActionHandler.IndexStoreActionHandler_lock; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) { - if (IndexStoreActionHandler.field412 == 0) { - Frames.IndexStoreActionHandler_thread = new Thread(new IndexStoreActionHandler()); - Frames.IndexStoreActionHandler_thread.setDaemon(true); - Frames.IndexStoreActionHandler_thread.start(); - Frames.IndexStoreActionHandler_thread.setPriority(5); + Object var5 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field412 == 0) { + Frames.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + Frames.ArchiveDiskActionHandler_thread.setDaemon(true); + Frames.ArchiveDiskActionHandler_thread.start(); + Frames.ArchiveDiskActionHandler_thread.setPriority(5); } - IndexStoreActionHandler.field412 = 600; + ArchiveDiskActionHandler.field412 = 600; } } } diff --git a/runescape-client/src/main/java/NPCDefinition.java b/runescape-client/src/main/java/NPCDefinition.java index 4a7f41026f..7a6ec0a6bd 100644 --- a/runescape-client/src/main/java/NPCDefinition.java +++ b/runescape-client/src/main/java/NPCDefinition.java @@ -22,8 +22,8 @@ public class NPCDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("NpcDefinition_modelIndexCache") - static AbstractArchive NpcDefinition_modelIndexCache; + @Export("NpcDefinition_modelArchive") + static AbstractArchive NpcDefinition_modelArchive; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Ler;" @@ -383,7 +383,7 @@ public class NPCDefinition extends DualNode { boolean var6 = false; for (int var7 = 0; var7 < this.archives.length; ++var7) { - if (!NpcDefinition_modelIndexCache.tryLoadFile(this.archives[var7], 0)) { + if (!NpcDefinition_modelArchive.tryLoadFile(this.archives[var7], 0)) { var6 = true; } } @@ -396,7 +396,7 @@ public class NPCDefinition extends DualNode { int var8; for (var8 = 0; var8 < this.archives.length; ++var8) { - var12[var8] = ModelData.method2788(NpcDefinition_modelIndexCache, this.archives[var8], 0); + var12[var8] = ModelData.method2788(NpcDefinition_modelArchive, this.archives[var8], 0); } ModelData var9; @@ -457,7 +457,7 @@ public class NPCDefinition extends DualNode { boolean var1 = false; for (int var2 = 0; var2 < this.field636.length; ++var2) { - if (!NpcDefinition_modelIndexCache.tryLoadFile(this.field636[var2], 0)) { + if (!NpcDefinition_modelArchive.tryLoadFile(this.field636[var2], 0)) { var1 = true; } } @@ -468,7 +468,7 @@ public class NPCDefinition extends DualNode { ModelData[] var6 = new ModelData[this.field636.length]; for (int var3 = 0; var3 < this.field636.length; ++var3) { - var6[var3] = ModelData.method2788(NpcDefinition_modelIndexCache, this.field636[var3], 0); + var6[var3] = ModelData.method2788(NpcDefinition_modelArchive, this.field636[var3], 0); } ModelData var7; diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index 64669fbe91..628262c29a 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -52,13 +52,13 @@ public class RunException extends RuntimeException { garbageValue = "-2146928006" ) public static void method3431() { - Object var0 = IndexStoreActionHandler.IndexStoreActionHandler_lock; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) { - if (IndexStoreActionHandler.field412 != 0) { - IndexStoreActionHandler.field412 = 1; + Object var0 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field412 != 0) { + ArchiveDiskActionHandler.field412 = 1; try { - IndexStoreActionHandler.IndexStoreActionHandler_lock.wait(); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); } catch (InterruptedException var4) { } } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index 13b1a45b76..f2f467aa57 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -17,8 +17,8 @@ public class SpotAnimationDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("SpotAnimationDefinition_modelIndexCache") - public static AbstractArchive SpotAnimationDefinition_modelIndexCache; + @Export("SpotAnimationDefinition_modelArchive") + public static AbstractArchive SpotAnimationDefinition_modelArchive; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Ler;" @@ -172,7 +172,7 @@ public class SpotAnimationDefinition extends DualNode { public final Model getModel(int var1) { Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); if (var2 == null) { - ModelData var3 = ModelData.method2788(SpotAnimationDefinition_modelIndexCache, this.archive, 0); + ModelData var3 = ModelData.method2788(SpotAnimationDefinition_modelArchive, this.archive, 0); if (var3 == null) { return null; } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 9eae4d88ed..7bf87b052d 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -1530,26 +1530,26 @@ public class Widget extends Node { garbageValue = "-1287305716" ) static void method4499(int var0, byte[] var1, ArchiveDisk var2) { - IndexStoreAction var3 = new IndexStoreAction(); + ArchiveDiskAction var3 = new ArchiveDiskAction(); var3.type = 0; var3.key = (long)var0; var3.data = var1; var3.archiveDisk = var2; - NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { - IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.addFirst(var3); + NodeDeque var4 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); } - Object var5 = IndexStoreActionHandler.IndexStoreActionHandler_lock; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) { - if (IndexStoreActionHandler.field412 == 0) { - Frames.IndexStoreActionHandler_thread = new Thread(new IndexStoreActionHandler()); - Frames.IndexStoreActionHandler_thread.setDaemon(true); - Frames.IndexStoreActionHandler_thread.start(); - Frames.IndexStoreActionHandler_thread.setPriority(5); + Object var5 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field412 == 0) { + Frames.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + Frames.ArchiveDiskActionHandler_thread.setDaemon(true); + Frames.ArchiveDiskActionHandler_thread.start(); + Frames.ArchiveDiskActionHandler_thread.setPriority(5); } - IndexStoreActionHandler.field412 = 600; + ArchiveDiskActionHandler.field412 = 600; } } diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index 9d7b8b34d5..ac8fb28183 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -99,26 +99,26 @@ public class class171 { Login.Login_loadingPercent = 10; Client.titleLoadingStage = 30; } else if (Client.titleLoadingStage == 30) { - AbstractArchive.archive0 = class22.newIndexCache(0, false, true, true); - Skeleton.archive1 = class22.newIndexCache(1, false, true, true); - ObjectSound.archive2 = class22.newIndexCache(2, true, false, true); - WorldMapIcon1.archive3 = class22.newIndexCache(3, false, true, true); - WorldMapDecoration.archive4 = class22.newIndexCache(4, false, true, true); - SecureRandomFuture.archive5 = class22.newIndexCache(5, true, true, true); - UserComparator3.archive6 = class22.newIndexCache(6, true, true, true); - class40.archive7 = class22.newIndexCache(7, false, true, true); - WorldMapSection3.archive8 = class22.newIndexCache(8, false, true, true); - class238.archive9 = class22.newIndexCache(9, false, true, true); - class16.archive10 = class22.newIndexCache(10, false, true, true); - Login.archive11 = class22.newIndexCache(11, false, true, true); - Formatting.archive12 = class22.newIndexCache(12, false, true, true); - ByteArrayPool.archive13 = class22.newIndexCache(13, true, false, true); - class2.archive14 = class22.newIndexCache(14, false, true, true); - WorldMapSection1.archive15 = class22.newIndexCache(15, false, true, true); - class22.archive16 = class22.newIndexCache(17, true, true, true); - WorldMapLabelSize.field1040 = class22.newIndexCache(18, false, true, true); - ItemContainer.field434 = class22.newIndexCache(19, false, true, true); - AbstractByteArrayCopier.field0 = class22.newIndexCache(20, false, true, true); + AbstractArchive.archive0 = class22.newArchive(0, false, true, true); + Skeleton.archive1 = class22.newArchive(1, false, true, true); + ObjectSound.archive2 = class22.newArchive(2, true, false, true); + WorldMapIcon1.archive3 = class22.newArchive(3, false, true, true); + WorldMapDecoration.archive4 = class22.newArchive(4, false, true, true); + SecureRandomFuture.archive5 = class22.newArchive(5, true, true, true); + UserComparator3.archive6 = class22.newArchive(6, true, true, true); + class40.archive7 = class22.newArchive(7, false, true, true); + WorldMapSection3.archive8 = class22.newArchive(8, false, true, true); + class238.archive9 = class22.newArchive(9, false, true, true); + class16.archive10 = class22.newArchive(10, false, true, true); + Login.archive11 = class22.newArchive(11, false, true, true); + Formatting.archive12 = class22.newArchive(12, false, true, true); + ByteArrayPool.archive13 = class22.newArchive(13, true, false, true); + class2.archive14 = class22.newArchive(14, false, true, true); + WorldMapSection1.archive15 = class22.newArchive(15, false, true, true); + class22.archive16 = class22.newArchive(17, true, true, true); + WorldMapLabelSize.field1040 = class22.newArchive(18, false, true, true); + ItemContainer.field434 = class22.newArchive(19, false, true, true); + AbstractByteArrayCopier.field0 = class22.newArchive(20, false, true, true); Login.Login_loadingText = "Connecting to update server"; Login.Login_loadingPercent = 20; Client.titleLoadingStage = 40; @@ -240,7 +240,7 @@ public class class171 { boolean var7 = Client.isMembersWorld; Font var8 = ScriptEvent.fontPlain11; ItemDefinition.ItemDefinition_archive = var5; - ItemDefinition.ItemDefinition_modelIndexCache = var6; + ItemDefinition.ItemDefinition_modelArchive = var6; class30.inMembersWorld = var7; class83.field1167 = ItemDefinition.ItemDefinition_archive.method4(10); class204.field1122 = var8; @@ -253,7 +253,7 @@ public class class171 { Archive var12 = ObjectSound.archive2; Archive var13 = class40.archive7; SpotAnimationDefinition.SpotAnimationDefinition_archive = var12; - SpotAnimationDefinition.SpotAnimationDefinition_modelIndexCache = var13; + SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var13; UnitPriceComparator.method135(ObjectSound.archive2); Archive var14 = ObjectSound.archive2; VarpDefinition.field943 = var14; diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java index 435fc8e614..8be09c4624 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/class22.java @@ -81,11 +81,11 @@ public final class class22 { signature = "(IZZZB)Lit;", garbageValue = "-15" ) - @Export("newIndexCache") - static Archive newIndexCache(int var0, boolean var1, boolean var2, boolean var3) { + @Export("newArchive") + static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { ArchiveDisk var4 = null; if (class168.dat2File != null) { - var4 = new ArchiveDisk(var0, class168.dat2File, IndexStoreAction.idxFiles[var0], 1000000); + var4 = new ArchiveDisk(var0, class168.dat2File, ArchiveDiskAction.idxFiles[var0], 1000000); } return new Archive(var4, Fonts.archiveDisk255, var0, var1, var2, var3); diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index 85ef654b94..1127161470 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -97,10 +97,10 @@ public class class3 implements Enumerated { ) public static void method41() { while (true) { - NodeDeque var0 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; - IndexStoreAction var1; - synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { - var1 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_responseQueue.removeLast(); + NodeDeque var0 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue; + ArchiveDiskAction var1; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + var1 = (ArchiveDiskAction) ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); } if (var1 == null) { diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java index 2ce7ee8d41..98eca77335 100644 --- a/runescape-client/src/main/java/class54.java +++ b/runescape-client/src/main/java/class54.java @@ -107,7 +107,7 @@ public final class class54 { boolean var8 = false; while (Decimator.method2490()) { - if (IndexStoreAction.field411 == 84) { + if (ArchiveDiskAction.field411 == 84) { var8 = true; } } @@ -253,7 +253,7 @@ public final class class54 { } } - if (IndexStoreAction.field411 == 13) { + if (ArchiveDiskAction.field411 == 13) { Login.loginIndex = 0; Login.Login_username = ""; Login.Login_password = ""; @@ -261,11 +261,11 @@ public final class class54 { Login.otp = ""; Login.field470 = true; } else if (Login.currentLoginField == 0) { - if (IndexStoreAction.field411 == 85 && Login.Login_username.length() > 0) { + if (ArchiveDiskAction.field411 == 85 && Login.Login_username.length() > 0) { Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); } - if (IndexStoreAction.field411 == 84 || IndexStoreAction.field411 == 80) { + if (ArchiveDiskAction.field411 == 84 || ArchiveDiskAction.field411 == 80) { Login.currentLoginField = 1; } @@ -273,15 +273,15 @@ public final class class54 { Login.Login_username = Login.Login_username + GzipDecompressor.field378; } } else if (Login.currentLoginField == 1) { - if (IndexStoreAction.field411 == 85 && Login.Login_password.length() > 0) { + if (ArchiveDiskAction.field411 == 85 && Login.Login_password.length() > 0) { Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); } - if (IndexStoreAction.field411 == 84 || IndexStoreAction.field411 == 80) { + if (ArchiveDiskAction.field411 == 84 || ArchiveDiskAction.field411 == 80) { Login.currentLoginField = 0; } - if (IndexStoreAction.field411 == 84) { + if (ArchiveDiskAction.field411 == 84) { Login.Login_username = Login.Login_username.trim(); if (Login.Login_username.length() == 0) { method1089("", "Please enter your username/email address.", ""); @@ -370,18 +370,18 @@ public final class class54 { } } - if (IndexStoreAction.field411 == 13) { + if (ArchiveDiskAction.field411 == 13) { Login.loginIndex = 0; Login.Login_username = ""; Login.Login_password = ""; class13.otpInt = 0; Login.otp = ""; } else { - if (IndexStoreAction.field411 == 85 && Login.otp.length() > 0) { + if (ArchiveDiskAction.field411 == 85 && Login.otp.length() > 0) { Login.otp = Login.otp.substring(0, Login.otp.length() - 1); } - if (IndexStoreAction.field411 == 84) { + if (ArchiveDiskAction.field411 == 84) { Login.otp.trim(); if (Login.otp.length() != 6) { method1089("", "Please enter a 6-digit PIN.", ""); @@ -432,14 +432,14 @@ public final class class54 { } } - if (IndexStoreAction.field411 == 13) { + if (ArchiveDiskAction.field411 == 13) { MouseHandler.method1084(true); } else { - if (IndexStoreAction.field411 == 85 && Login.Login_username.length() > 0) { + if (ArchiveDiskAction.field411 == 85 && Login.Login_username.length() > 0) { Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); } - if (IndexStoreAction.field411 == 84) { + if (ArchiveDiskAction.field411 == 84) { NPCDefinition.method5162(); return; } @@ -461,7 +461,7 @@ public final class class54 { return; } - } while(IndexStoreAction.field411 != 84 && IndexStoreAction.field411 != 13); + } while(ArchiveDiskAction.field411 != 84 && ArchiveDiskAction.field411 != 13); MouseHandler.method1084(true); } @@ -527,9 +527,9 @@ public final class class54 { } } else { while (Decimator.method2490()) { - if (IndexStoreAction.field411 == 84) { + if (ArchiveDiskAction.field411 == 84) { MouseHandler.method1084(false); - } else if (IndexStoreAction.field411 == 13) { + } else if (ArchiveDiskAction.field411 == 13) { Login.loginIndex = 0; } } @@ -597,16 +597,16 @@ public final class class54 { break; } - if (IndexStoreAction.field411 == 13) { + if (ArchiveDiskAction.field411 == 13) { FontName.closeWorldSelect(); break; } - if (IndexStoreAction.field411 == 96) { + if (ArchiveDiskAction.field411 == 96) { if (Login.worldSelectPage > 0 && SecureRandomFuture.worldSelectLeftSprite != null) { --Login.worldSelectPage; } - } else if (IndexStoreAction.field411 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && NetSocket.worldSelectRightSprite != null) { + } else if (ArchiveDiskAction.field411 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && NetSocket.worldSelectRightSprite != null) { ++Login.worldSelectPage; } } diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java index 9d498f0f79..3cfc38e0eb 100644 --- a/runescape-client/src/main/java/class65.java +++ b/runescape-client/src/main/java/class65.java @@ -232,7 +232,7 @@ public class class65 extends RouteStrategy { var0.method23(); } - IndexStoreAction.method4553(var0); + ArchiveDiskAction.method4553(var0); ChatChannel.method2225(var0); } } From c92553f86f8458e4d5f41b168c5a70dd86700da3 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sun, 7 Jul 2019 08:53:22 +0200 Subject: [PATCH 374/472] More renaming --- .../java/net/runelite/rs/api/RSClient.java | 2 +- ...roupParent.java => RSInterfaceParent.java} | 2 +- .../src/main/java/AbstractWorldMapIcon.java | 6 +-- runescape-client/src/main/java/Actor.java | 2 +- .../src/main/java/ArchiveDisk.java | 4 +- runescape-client/src/main/java/Buffer.java | 4 +- runescape-client/src/main/java/Client.java | 52 +++++++++---------- .../java/{TileLocation.java => Coord.java} | 15 +++--- .../main/java/DevicePcmPlayerProvider.java | 2 +- .../src/main/java/DynamicObject.java | 2 +- .../src/main/java/FaceNormal.java | 4 +- ...ition.java => FloorOverlayDefinition.java} | 10 ++-- ...tion.java => FloorUnderlayDefinition.java} | 10 ++-- runescape-client/src/main/java/Fonts.java | 2 +- .../{SpriteIds.java => GraphicsDefaults.java} | 11 ++-- .../src/main/java/HitSplatDefinition.java | 2 +- ...tGroupParent.java => InterfaceParent.java} | 6 +-- .../src/main/java/KitDefinition.java | 2 +- .../src/main/java/MenuAction.java | 2 +- runescape-client/src/main/java/Message.java | 4 +- .../src/main/java/MouseRecorder.java | 6 +-- .../src/main/java/NetFileRequest.java | 2 +- runescape-client/src/main/java/NetSocket.java | 6 +-- .../src/main/java/SecureRandomCallable.java | 6 +-- .../src/main/java/StudioGame.java | 12 ++--- runescape-client/src/main/java/Tile.java | 2 +- .../main/java/TotalQuantityComparator.java | 4 +- runescape-client/src/main/java/Varcs.java | 2 +- runescape-client/src/main/java/Varps.java | 2 +- runescape-client/src/main/java/Widget.java | 2 +- runescape-client/src/main/java/WorldMap.java | 10 ++-- .../src/main/java/WorldMapArea.java | 10 ++-- .../src/main/java/WorldMapAreaData.java | 4 +- .../src/main/java/WorldMapElement.java | 2 +- .../src/main/java/WorldMapEvent.java | 6 +-- .../src/main/java/WorldMapIcon1.java | 2 +- .../src/main/java/WorldMapIcon2.java | 2 +- .../src/main/java/WorldMapLabelSize.java | 2 +- .../src/main/java/WorldMapRegion.java | 38 +++++++------- .../src/main/java/WorldMapSection.java | 2 +- .../src/main/java/WorldMapSection0.java | 4 +- .../src/main/java/WorldMapSection1.java | 8 +-- .../src/main/java/WorldMapSection2.java | 8 +-- .../src/main/java/WorldMapSection3.java | 4 +- runescape-client/src/main/java/class11.java | 2 +- runescape-client/src/main/java/class12.java | 2 +- runescape-client/src/main/java/class171.java | 28 +++++----- runescape-client/src/main/java/class211.java | 4 +- runescape-client/src/main/java/class238.java | 2 +- runescape-client/src/main/java/class30.java | 2 +- runescape-client/src/main/java/class39.java | 2 +- runescape-client/src/main/java/class4.java | 2 +- runescape-client/src/main/java/class54.java | 28 +++++----- runescape-client/src/main/java/class65.java | 2 +- 54 files changed, 183 insertions(+), 181 deletions(-) rename runescape-api/src/main/java/net/runelite/rs/api/{RSWidgetGroupParent.java => RSInterfaceParent.java} (70%) rename runescape-client/src/main/java/{TileLocation.java => Coord.java} (85%) rename runescape-client/src/main/java/{OverlayDefinition.java => FloorOverlayDefinition.java} (97%) rename runescape-client/src/main/java/{UnderlayDefinition.java => FloorUnderlayDefinition.java} (96%) rename runescape-client/src/main/java/{SpriteIds.java => GraphicsDefaults.java} (96%) rename runescape-client/src/main/java/{WidgetGroupParent.java => InterfaceParent.java} (96%) diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index ac5660a71d..84cab26673 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java @@ -453,7 +453,7 @@ public interface RSClient extends RSGameShell, Client @Override RSNodeHashTable getWidgetFlags(); - @Import("widgetGroupParents") + @Import("interfaceParents") @Override RSNodeHashTable getComponentTable(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidgetGroupParent.java b/runescape-api/src/main/java/net/runelite/rs/api/RSInterfaceParent.java similarity index 70% rename from runescape-api/src/main/java/net/runelite/rs/api/RSWidgetGroupParent.java rename to runescape-api/src/main/java/net/runelite/rs/api/RSInterfaceParent.java index 34c867e031..f89d359baf 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidgetGroupParent.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSInterfaceParent.java @@ -3,7 +3,7 @@ package net.runelite.rs.api; import net.runelite.api.WidgetNode; import net.runelite.mapping.Import; -public interface RSWidgetGroupParent extends RSNode, WidgetNode +public interface RSInterfaceParent extends RSNode, WidgetNode { @Import("group") @Override diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index 69638b9260..4e4e90f7e0 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -23,13 +23,13 @@ public abstract class AbstractWorldMapIcon { signature = "Lhu;" ) @Export("coord2") - public final TileLocation coord2; + public final Coord coord2; @ObfuscatedName("l") @ObfuscatedSignature( signature = "Lhu;" ) @Export("coord1") - public final TileLocation coord1; + public final Coord coord1; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -521086143 @@ -44,7 +44,7 @@ public abstract class AbstractWorldMapIcon { @ObfuscatedSignature( signature = "(Lhu;Lhu;)V" ) - AbstractWorldMapIcon(TileLocation var1, TileLocation var2) { + AbstractWorldMapIcon(Coord var1, Coord var2) { this.coord1 = var1; this.coord2 = var2; } diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index f81a1526e4..f064ca4096 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -1306,7 +1306,7 @@ public abstract class Actor extends Entity { if (var2 != 1007) { if (var2 == 1008 || var2 == 1011 || var2 == 1010 || var2 == 1009 || var2 == 1012) { - class60.worldMap0.menuAction(var2, var3, new TileLocation(var0), new TileLocation(var1)); + class60.worldMap0.menuAction(var2, var3, new Coord(var0), new Coord(var1)); } break label415; } diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index 97909cc912..7652cd2c19 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -316,7 +316,7 @@ public final class ArchiveDisk int var15 = var5 - var4.xInset; int var16 = var6 - var4.yInset; if (var3.vmethod3644(var2, var5, var6, var4)) { - WidgetGroupParent.field986 = var5; + InterfaceParent.field986 = var5; UrlRequester.field929 = var6; return true; } @@ -485,7 +485,7 @@ public final class ArchiveDisk } } - WidgetGroupParent.field986 = var5; + InterfaceParent.field986 = var5; UrlRequester.field929 = var6; return false; } diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index 57e9334b33..6657730bd2 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -388,7 +388,7 @@ public class Buffer extends Node { } int var2 = this.index - var1 - 1; - return var2 == 0 ? "" : WidgetGroupParent.decodeStringCp1252(this.array, var1, var2); + return var2 == 0 ? "" : InterfaceParent.decodeStringCp1252(this.array, var1, var2); } @ObfuscatedName("ak") @@ -408,7 +408,7 @@ public class Buffer extends Node { } int var3 = this.index - var2 - 1; - return var3 == 0 ? "" : WidgetGroupParent.decodeStringCp1252(this.array, var2, var3); + return var3 == 0 ? "" : InterfaceParent.decodeStringCp1252(this.array, var2, var3); } } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 7cd196191d..a2f64f0c5e 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -103,8 +103,8 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedSignature( signature = "Lld;" ) - @Export("widgetGroupParents") - static NodeHashTable widgetGroupParents; + @Export("interfaceParents") + static NodeHashTable interfaceParents; @ObfuscatedName("oy") @Export("rootWidgetXs") static int[] rootWidgetXs; @@ -1732,7 +1732,7 @@ public final class Client extends GameShell implements Usernamed { for (var13 = 0; var13 < 104; ++var13) { var14 = var12 + 5; int var10002; - UnderlayDefinition var29; + FloorUnderlayDefinition var29; if (var14 >= 0 && var14 < 104) { var15 = Tiles.field908[var6][var14][var13] & 255; if (var15 > 0) { @@ -1830,7 +1830,7 @@ public final class Client extends GameShell implements Usernamed { var39 = WorldMapAreaData.method712(var40, var41, var42); } - OverlayDefinition var43; + FloorOverlayDefinition var43; if (var6 > 0) { boolean var44 = true; if (var28 == 0 && class32.field1157[var6][var12][var18] != 0) { @@ -1839,19 +1839,19 @@ public final class Client extends GameShell implements Usernamed { if (var65 > 0) { var42 = var65 - 1; - var43 = (OverlayDefinition)OverlayDefinition.field664.get((long)var42); - OverlayDefinition var45; + var43 = (FloorOverlayDefinition) FloorOverlayDefinition.field664.get((long)var42); + FloorOverlayDefinition var45; if (var43 != null) { var45 = var43; } else { - byte[] var46 = OverlayDefinition.field663.takeFile(4, var42); - var43 = new OverlayDefinition(); + byte[] var46 = FloorOverlayDefinition.field663.takeFile(4, var42); + var43 = new FloorOverlayDefinition(); if (var46 != null) { var43.decode(new Buffer(var46), var42); } - var43.init(); - OverlayDefinition.field664.put(var43, (long)var42); + var43.postDecode(); + FloorOverlayDefinition.field664.put(var43, (long)var42); var45 = var43; } @@ -1877,18 +1877,18 @@ public final class Client extends GameShell implements Usernamed { var41 = class32.field1157[var6][var12][var18] + 1; byte var66 = class307.field1155[var6][var12][var18]; int var67 = var65 - 1; - OverlayDefinition var68 = (OverlayDefinition)OverlayDefinition.field664.get((long)var67); + FloorOverlayDefinition var68 = (FloorOverlayDefinition) FloorOverlayDefinition.field664.get((long)var67); if (var68 != null) { var43 = var68; } else { - byte[] var47 = OverlayDefinition.field663.takeFile(4, var67); - var68 = new OverlayDefinition(); + byte[] var47 = FloorOverlayDefinition.field663.takeFile(4, var67); + var68 = new FloorOverlayDefinition(); if (var47 != null) { var68.decode(new Buffer(var47), var67); } - var68.init(); - OverlayDefinition.field664.put(var68, (long)var67); + var68.postDecode(); + FloorOverlayDefinition.field664.put(var68, (long)var67); var43 = var68; } @@ -5226,19 +5226,19 @@ public final class Client extends GameShell implements Usernamed { return true; } - WidgetGroupParent var22; + InterfaceParent var22; if (ServerPacket.field871 == var1.serverPacket0) { var37 = var3.readInt(); var6 = var3.readInt(); - WidgetGroupParent var48 = (WidgetGroupParent)widgetGroupParents.get((long)var6); - var22 = (WidgetGroupParent)widgetGroupParents.get((long)var37); + InterfaceParent var48 = (InterfaceParent)interfaceParents.get((long)var6); + var22 = (InterfaceParent)interfaceParents.get((long)var37); if (var22 != null) { MenuAction.closeWidgetGroup(var22, var48 == null || var48.group != var22.group); } if (var48 != null) { var48.remove(); - widgetGroupParents.put(var48, (long)var37); + interfaceParents.put(var48, (long)var37); } var15 = Huffman.getWidget(var6); @@ -5574,7 +5574,7 @@ public final class Client extends GameShell implements Usernamed { return true; } - WidgetGroupParent var50; + InterfaceParent var50; if (ServerPacket.field845 == var1.serverPacket0) { var37 = var3.index + var1.serverPacket0Length; var6 = var3.readUnsignedShort(); @@ -5594,7 +5594,7 @@ public final class Client extends GameShell implements Usernamed { var10 = var3.readInt(); var11 = var3.readUnsignedShort(); var12 = var3.readUnsignedByte(); - var50 = (WidgetGroupParent)widgetGroupParents.get((long)var10); + var50 = (InterfaceParent)interfaceParents.get((long)var10); if (var50 != null && var11 != var50.group) { MenuAction.closeWidgetGroup(var50, true); var50 = null; @@ -5605,7 +5605,7 @@ public final class Client extends GameShell implements Usernamed { } } - for (var22 = (WidgetGroupParent)widgetGroupParents.first(); var22 != null; var22 = (WidgetGroupParent)widgetGroupParents.next()) { + for (var22 = (InterfaceParent)interfaceParents.first(); var22 != null; var22 = (InterfaceParent)interfaceParents.next()) { if (var22.keep) { var22.keep = false; } else { @@ -5692,7 +5692,7 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field798 == var1.serverPacket0) { var37 = var3.readInt(); - var50 = (WidgetGroupParent)widgetGroupParents.get((long)var37); + var50 = (InterfaceParent)interfaceParents.get((long)var37); if (var50 != null) { MenuAction.closeWidgetGroup(var50, true); } @@ -5753,7 +5753,7 @@ public final class Client extends GameShell implements Usernamed { var37 = var3.method58(); var6 = var3.method72(); var5 = var3.method67(); - var22 = (WidgetGroupParent)widgetGroupParents.get((long)var6); + var22 = (InterfaceParent)interfaceParents.get((long)var6); if (var22 != null) { MenuAction.closeWidgetGroup(var22, var5 != var22.group); } @@ -6093,7 +6093,7 @@ public final class Client extends GameShell implements Usernamed { } WorldMapSection3.alignWidgetSize(var1, var3, var4, false); - OverlayDefinition.alignWidgetPosition(var1, var3, var4); + FloorOverlayDefinition.alignWidgetPosition(var1, var3, var4); } @ObfuscatedName("jh") @@ -6402,7 +6402,7 @@ public final class Client extends GameShell implements Usernamed { selectedSpellActionName = null; selectedSpellName = null; rootWidgetGroup = -1; - widgetGroupParents = new NodeHashTable(8); + interfaceParents = new NodeHashTable(8); field151 = 0; field153 = -1; chatEffects = 0; diff --git a/runescape-client/src/main/java/TileLocation.java b/runescape-client/src/main/java/Coord.java similarity index 85% rename from runescape-client/src/main/java/TileLocation.java rename to runescape-client/src/main/java/Coord.java index 20e031a17f..71ee061844 100644 --- a/runescape-client/src/main/java/TileLocation.java +++ b/runescape-client/src/main/java/Coord.java @@ -5,8 +5,9 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hu") -@Implements("TileLocation") -public class TileLocation { +@Implements("Coord") +public class Coord +{ @ObfuscatedName("m") @ObfuscatedGetter( intValue = 503621925 @@ -29,19 +30,19 @@ public class TileLocation { @ObfuscatedSignature( signature = "(Lhu;)V" ) - public TileLocation(TileLocation var1) { + public Coord(Coord var1) { this.plane = var1.plane; this.x = var1.x; this.y = var1.y; } - public TileLocation(int var1, int var2, int var3) { + public Coord(int var1, int var2, int var3) { this.plane = var1; this.x = var2; this.y = var3; } - public TileLocation(int var1) { + public Coord(int var1) { if (var1 == -1) { this.plane = -1; } else { @@ -68,7 +69,7 @@ public class TileLocation { garbageValue = "-1" ) @Export("equals0") - boolean equals0(TileLocation var1) { + boolean equals0(Coord var1) { return this.plane != var1.plane ? false : (this.x != var1.x ? false : this.y == var1.y); } @@ -84,7 +85,7 @@ public class TileLocation { @ObfuscatedName("equals") public boolean method326(Object var1) { - return this == var1 ? true : (!(var1 instanceof TileLocation) ? false : this.equals0((TileLocation)var1)); + return this == var1 ? true : (!(var1 instanceof Coord) ? false : this.equals0((Coord)var1)); } @ObfuscatedName("hashCode") diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index 47738a89ea..b690a94ca8 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -333,7 +333,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { drawWidgetGroup(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); } - WidgetGroupParent var23 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var10.id); + InterfaceParent var23 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); if (var23 != null) { Interpreter.drawWidgets(var23.group, var15, var16, var17, var18, var12, var13, var11); } diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index f6f30e3b2c..7a1b959161 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -442,7 +442,7 @@ public class DynamicObject extends Entity { return 1; } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WidgetGroupParent.method1174(var5); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = InterfaceParent.method1174(var5); return 1; } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java index 4257d4d4b5..865938be90 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -42,12 +42,12 @@ public class FaceNormal { ) static Script method3236(int var0, int var1, int var2) { int var3 = UnitPriceComparator.method125(var1, var0); - Script var4 = WidgetGroupParent.method1175(var3, var0); + Script var4 = InterfaceParent.method1175(var3, var0); if (var4 != null) { return var4; } else { var3 = PacketBuffer.method4081(var2, var0); - var4 = WidgetGroupParent.method1175(var3, var0); + var4 = InterfaceParent.method1175(var3, var0); return var4 != null ? var4 : null; } } diff --git a/runescape-client/src/main/java/OverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java similarity index 97% rename from runescape-client/src/main/java/OverlayDefinition.java rename to runescape-client/src/main/java/FloorOverlayDefinition.java index ae466a6f8c..c68eb780f1 100644 --- a/runescape-client/src/main/java/OverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("jf") -@Implements("OverlayDefinition") -public class OverlayDefinition extends DualNode { +@Implements("FloorOverlayDefinition") +public class FloorOverlayDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lir;" @@ -74,7 +74,7 @@ public class OverlayDefinition extends DualNode { @Export("lightness2") public int lightness2; - public OverlayDefinition() { + public FloorOverlayDefinition() { this.rgb = 0; this.texture = -1; this.field665 = true; @@ -86,8 +86,8 @@ public class OverlayDefinition extends DualNode { signature = "(I)V", garbageValue = "867788548" ) - @Export("init") - public void init() { + @Export("postDecode") + public void postDecode() { if (this.rgb2 != -1) { this.setHsl(this.rgb2); this.hue2 = this.hue; diff --git a/runescape-client/src/main/java/UnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java similarity index 96% rename from runescape-client/src/main/java/UnderlayDefinition.java rename to runescape-client/src/main/java/FloorUnderlayDefinition.java index 4cd48e1922..ad42db9f0f 100644 --- a/runescape-client/src/main/java/UnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ih") -@Implements("UnderlayDefinition") -public class UnderlayDefinition extends DualNode { +@Implements("FloorUnderlayDefinition") +public class FloorUnderlayDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lir;" @@ -50,7 +50,7 @@ public class UnderlayDefinition extends DualNode { @Export("hueMultiplier") public int hueMultiplier; - UnderlayDefinition() { + FloorUnderlayDefinition() { this.rgb = 0; } @@ -59,8 +59,8 @@ public class UnderlayDefinition extends DualNode { signature = "(I)V", garbageValue = "-782326269" ) - @Export("init") - void init() { + @Export("postDecode") + void postDecode() { this.setHsl(this.rgb); } diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index 89c728e522..60de7ff47b 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -64,7 +64,7 @@ public class Fonts { String var8 = var5.field349; int var9 = var6.getGroupId(var8); int var10 = var6.getFileId(var9, ""); - Font var11 = SpriteIds.method5823(var6, var7, var9, var10); + Font var11 = GraphicsDefaults.method5823(var6, var7, var9, var10); if (var11 != null) { this.map.put(var5, var11); var2.put(var5, var11); diff --git a/runescape-client/src/main/java/SpriteIds.java b/runescape-client/src/main/java/GraphicsDefaults.java similarity index 96% rename from runescape-client/src/main/java/SpriteIds.java rename to runescape-client/src/main/java/GraphicsDefaults.java index 62d6048213..15fc466c2f 100644 --- a/runescape-client/src/main/java/SpriteIds.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -5,8 +5,9 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("lg") -@Implements("SpriteIds") -public class SpriteIds { +@Implements("GraphicsDefaults") +public class GraphicsDefaults +{ @ObfuscatedName("m") @ObfuscatedGetter( intValue = 1673796151 @@ -72,7 +73,7 @@ public class SpriteIds { @Export("modIcons") public int modIcons; - public SpriteIds() { + public GraphicsDefaults() { this.field878 = -1; this.field879 = -1; this.mapScenes = -1; @@ -91,8 +92,8 @@ public class SpriteIds { signature = "(Lir;I)V", garbageValue = "1764356022" ) - @Export("read") - public void read(AbstractArchive var1) { + @Export("decode") + public void decode(AbstractArchive var1) { byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3810.group); Buffer var3 = new Buffer(var2); diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 42e62f6a01..4dd5c6279b 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -371,7 +371,7 @@ public class HitSplatDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = SpriteIds.method5823(field383, field384, this.fontId, 0); + var1 = GraphicsDefaults.method5823(field383, field384, this.fontId, 0); if (var1 != null) { HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); } diff --git a/runescape-client/src/main/java/WidgetGroupParent.java b/runescape-client/src/main/java/InterfaceParent.java similarity index 96% rename from runescape-client/src/main/java/WidgetGroupParent.java rename to runescape-client/src/main/java/InterfaceParent.java index bfe06d2a39..c18871f91d 100644 --- a/runescape-client/src/main/java/WidgetGroupParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("bx") -@Implements("WidgetGroupParent") -public class WidgetGroupParent extends Node { +@Implements("InterfaceParent") +public class InterfaceParent extends Node { @ObfuscatedName("px") @ObfuscatedSignature( signature = "Lln;" @@ -34,7 +34,7 @@ public class WidgetGroupParent extends Node { @Export("keep") boolean keep; - WidgetGroupParent() { + InterfaceParent() { this.keep = false; } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index b61c3e7fb7..8048dd8f77 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -252,7 +252,7 @@ public class KitDefinition extends DualNode { byte[] var3 = new byte[var2]; var0.index += class303.huffman.method128(var0.array, var0.index, var3, 0, var2); - String var4 = WidgetGroupParent.decodeStringCp1252(var3, 0, var2); + String var4 = InterfaceParent.decodeStringCp1252(var3, 0, var2); var1 = var4; } catch (Exception var5) { var1 = "Cabbage"; diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 9e439052a6..c574af3a5a 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -66,7 +66,7 @@ public class MenuAction { garbageValue = "1537219807" ) @Export("closeWidgetGroup") - static final void closeWidgetGroup(WidgetGroupParent var0, boolean var1) { + static final void closeWidgetGroup(InterfaceParent var0, boolean var1) { int var2 = var0.group; int var3 = (int)var0.key; var0.remove(); diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 024118663b..334f8a3b34 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -376,7 +376,7 @@ public class Message extends DualNode { if (SoundSystem.plane != Client.field125) { Client.field125 = SoundSystem.plane; int var0 = SoundSystem.plane; - int[] var1 = WidgetGroupParent.sceneMinimapSprite.pixels; + int[] var1 = InterfaceParent.sceneMinimapSprite.pixels; int var2 = var1.length; int var3; @@ -404,7 +404,7 @@ public class Message extends DualNode { var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; - WidgetGroupParent.sceneMinimapSprite.setRaster(); + InterfaceParent.sceneMinimapSprite.setRaster(); int var6; for (var5 = 1; var5 < 103; ++var5) { diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index 01c8725cbb..9ef1e9e603 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -96,7 +96,7 @@ public class MouseRecorder implements Runnable { var10 = var4; } - int[] var20 = WidgetGroupParent.sceneMinimapSprite.pixels; + int[] var20 = InterfaceParent.sceneMinimapSprite.pixels; var12 = var1 * 4 + (103 - var2) * 2048 + 24624; var11 = HitSplatDefinition.method4972(var5); ObjectDefinition var15 = class50.getObjectDefinition(var11); @@ -198,7 +198,7 @@ public class MouseRecorder implements Runnable { var22 = 15597568; } - int[] var26 = WidgetGroupParent.sceneMinimapSprite.pixels; + int[] var26 = InterfaceParent.sceneMinimapSprite.pixels; var17 = var1 * 4 + (103 - var2) * 2048 + 24624; if (var8 != 0 && var8 != 2) { var26[var17] = var22; @@ -275,7 +275,7 @@ public class MouseRecorder implements Runnable { int var5 = Client.minimapOrientation & 2047; int var6 = Canvas.localPlayer.x / 32 + 48; int var7 = 464 - Canvas.localPlayer.y / 32; - WidgetGroupParent.sceneMinimapSprite.method315(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); + InterfaceParent.sceneMinimapSprite.method315(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); int var8; int var9; diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index 153578f827..6a2b99a04e 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -42,7 +42,7 @@ public class NetFileRequest extends DualNode { method4555(var3.children, var3.id); } - WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var3.id); + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); if (var4 != null) { ClientPreferences.method1809(var4.group); } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index da8f4dd6b9..0bb6fbcfc5 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -357,7 +357,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { var15 = var9 - var4.xInset; var16 = var10 - var4.yInset; if (var3.vmethod3644(1, var9, var10, var4)) { - WidgetGroupParent.field986 = var9; + InterfaceParent.field986 = var9; UrlRequester.field929 = var10; var25 = true; break label226; @@ -429,7 +429,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - WidgetGroupParent.field986 = var9; + InterfaceParent.field986 = var9; UrlRequester.field929 = var10; var25 = false; } @@ -443,7 +443,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { var8 = var0 - 64; var9 = var1 - 64; - var10 = WidgetGroupParent.field986; + var10 = InterfaceParent.field986; var19 = UrlRequester.field929; if (!var18) { var20 = Integer.MAX_VALUE; diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 6c7a0c4cd5..0a89391dd2 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -52,11 +52,11 @@ public class SecureRandomCallable implements Callable { signature = "(IIII)Lbx;", garbageValue = "329127611" ) - static final WidgetGroupParent method1143(int var0, int var1, int var2) { - WidgetGroupParent var3 = new WidgetGroupParent(); + static final InterfaceParent method1143(int var0, int var1, int var2) { + InterfaceParent var3 = new InterfaceParent(); var3.group = var1; var3.type = var2; - Client.widgetGroupParents.put(var3, (long)var0); + Client.interfaceParents.put(var3, (long)var0); DevicePcmPlayerProvider.method845(var1); Widget var4 = Huffman.getWidget(var0); class22.method295(var4); diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index ed1891e7b1..c5a78386cc 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -68,19 +68,19 @@ public enum StudioGame implements Enumerated { signature = "(II)Lih;", garbageValue = "-2058685786" ) - public static UnderlayDefinition method4550(int var0) { - UnderlayDefinition var1 = (UnderlayDefinition)UnderlayDefinition.UnderlayDefinition_cached.get((long)var0); + public static FloorUnderlayDefinition method4550(int var0) { + FloorUnderlayDefinition var1 = (FloorUnderlayDefinition) FloorUnderlayDefinition.UnderlayDefinition_cached.get((long)var0); if (var1 != null) { return var1; } else { - byte[] var2 = UnderlayDefinition.UnderlayDefinition_archive.takeFile(1, var0); - var1 = new UnderlayDefinition(); + byte[] var2 = FloorUnderlayDefinition.UnderlayDefinition_archive.takeFile(1, var0); + var1 = new FloorUnderlayDefinition(); if (var2 != null) { var1.decode(new Buffer(var2), var0); } - var1.init(); - UnderlayDefinition.UnderlayDefinition_cached.put(var1, (long)var0); + var1.postDecode(); + FloorUnderlayDefinition.UnderlayDefinition_cached.put(var1, (long)var0); return var1; } } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index 679acac7ce..39cf89f93d 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -146,7 +146,7 @@ public final class Tile extends Node { garbageValue = "-1899580455" ) public static void method2867() { - UnderlayDefinition.UnderlayDefinition_cached.clear(); + FloorUnderlayDefinition.UnderlayDefinition_cached.clear(); } @ObfuscatedName("is") diff --git a/runescape-client/src/main/java/TotalQuantityComparator.java b/runescape-client/src/main/java/TotalQuantityComparator.java index 7437594cb0..a78820009f 100644 --- a/runescape-client/src/main/java/TotalQuantityComparator.java +++ b/runescape-client/src/main/java/TotalQuantityComparator.java @@ -109,12 +109,12 @@ final class TotalQuantityComparator implements Comparator { signature = "(ILhu;ZI)V", garbageValue = "466862614" ) - static void method96(int var0, TileLocation var1, boolean var2) { + static void method96(int var0, Coord var1, boolean var2) { WorldMapArea var3 = BufferedFile.worldMap().getMapArea(var0); int var4 = Canvas.localPlayer.plane; int var5 = (Canvas.localPlayer.x >> 7) + class50.baseX; int var6 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY; - TileLocation var7 = new TileLocation(var4, var5, var6); + Coord var7 = new Coord(var4, var5, var6); BufferedFile.worldMap().method367(var3, var7, var1, var2); } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index fbbe1b9c74..67c0d35728 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -357,7 +357,7 @@ public class Varcs { garbageValue = "321265868" ) public static void method2160(AbstractArchive var0) { - OverlayDefinition.field663 = var0; + FloorOverlayDefinition.field663 = var0; } @ObfuscatedName("q") diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index 99b0479857..4b1cfbf893 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -29,7 +29,7 @@ public class Varps { garbageValue = "2111080001" ) public static void method4393(AbstractArchive var0) { - UnderlayDefinition.UnderlayDefinition_archive = var0; + FloorUnderlayDefinition.UnderlayDefinition_archive = var0; } @ObfuscatedName("ki") diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 7bf87b052d..8bfdce511a 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -1318,7 +1318,7 @@ public class Widget extends Node { if (var1 != null) { return var1; } else { - var1 = SpriteIds.method5823(field955, class27.field1143, this.fontId, 0); + var1 = GraphicsDefaults.method5823(field955, class27.field1143, this.fontId, 0); if (var1 != null) { Widget_cachedFonts.put(var1, (long)this.fontId); } else { diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 44dcb1f492..fdb8bb87f4 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -242,7 +242,7 @@ public class WorldMap { signature = "Lhu;" ) @Export("mouseCoord") - TileLocation mouseCoord; + Coord mouseCoord; @ObfuscatedName("bc") @Export("showCoord") public boolean showCoord; @@ -675,7 +675,7 @@ public class WorldMap { signature = "(Lag;Lhu;Lhu;ZI)V", garbageValue = "-1430939646" ) - public void method367(WorldMapArea var1, TileLocation var2, TileLocation var3, boolean var4) { + public void method367(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { if (var1 != null) { if (this.currentMapArea == null || var1 != this.currentMapArea) { this.initializeWorldMap(var1); @@ -1013,7 +1013,7 @@ public class WorldMap { signature = "(I)Lhu;", garbageValue = "-2005824064" ) - public TileLocation method376() { + public Coord method376() { return this.currentMapArea == null ? null : this.currentMapArea.coord(this.method374(), this.method375()); } @@ -1263,7 +1263,7 @@ public class WorldMap { signature = "(ILhu;I)Lhu;", garbageValue = "333454230" ) - public TileLocation method385(int var1, TileLocation var2) { + public Coord method385(int var1, Coord var2) { if (!this.cacheLoader.getIsLoaded()) { return null; } else if (!this.worldMapManager.isLoaded()) { @@ -1306,7 +1306,7 @@ public class WorldMap { garbageValue = "94" ) @Export("menuAction") - public void menuAction(int var1, int var2, TileLocation var3, TileLocation var4) { + public void menuAction(int var1, int var2, Coord var3, Coord var4) { ScriptEvent var5 = new ScriptEvent(); WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); var5.setArgs(new Object[]{var6}); diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index 0d20341aaa..8b576be1f7 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -49,7 +49,7 @@ public class WorldMapArea { signature = "Lhu;" ) @Export("origin0") - TileLocation origin0; + Coord origin0; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 1238532539 @@ -103,7 +103,7 @@ public class WorldMapArea { this.id0 = var2; this.archiveName0 = var1.readStringCp1252NullTerminated(); this.name0 = var1.readStringCp1252NullTerminated(); - this.origin0 = new TileLocation(var1.readInt()); + this.origin0 = new Coord(var1.readInt()); this.field1015 = var1.readInt(); var1.readUnsignedByte(); this.isMain0 = var1.readUnsignedByte() == 1; @@ -223,7 +223,7 @@ public class WorldMapArea { garbageValue = "1509069978" ) @Export("coord") - public TileLocation coord(int var1, int var2) { + public Coord coord(int var1, int var2) { Iterator var3 = this.sections.iterator(); while (var3.hasNext()) { @@ -387,8 +387,8 @@ public class WorldMapArea { garbageValue = "-1411761003" ) @Export("origin") - public TileLocation origin() { - return new TileLocation(this.origin0); + public Coord origin() { + return new Coord(this.origin0); } @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index d7be52abaf..7d8cb23a4f 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -69,10 +69,10 @@ public class WorldMapAreaData extends WorldMapArea { for (int var4 = 0; var4 < var3; ++var4) { int var5 = var1.method51(); - TileLocation var6 = new TileLocation(var1.readInt()); + Coord var6 = new Coord(var1.readInt()); boolean var7 = var1.readUnsignedByte() == 1; if (var2 || !var7) { - this.field1018.add(new WorldMapIcon1((TileLocation)null, var6, var5, (WorldMapLabel)null)); + this.field1018.add(new WorldMapIcon1((Coord)null, var6, var5, (WorldMapLabel)null)); } } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index 2f54152343..c944c25f41 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -216,7 +216,7 @@ public class WorldMapElement extends DualNode { class266[] var6 = new class266[]{class266.field3527, class266.field3526, class266.field3529}; this.field3287 = (class266)ScriptFrame.findEnumerated(var6, var1.readUnsignedByte()); } else if (var2 == 30) { - this.field3301 = (class249)ScriptFrame.findEnumerated(UnderlayDefinition.method4839(), var1.readUnsignedByte()); + this.field3301 = (class249)ScriptFrame.findEnumerated(FloorUnderlayDefinition.method4839(), var1.readUnsignedByte()); } } } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index a3188d88f5..02aee7929e 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -24,18 +24,18 @@ public class WorldMapEvent { signature = "Lhu;" ) @Export("coord1") - public TileLocation coord1; + public Coord coord1; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lhu;" ) @Export("coord2") - public TileLocation coord2; + public Coord coord2; @ObfuscatedSignature( signature = "(ILhu;Lhu;)V" ) - public WorldMapEvent(int var1, TileLocation var2, TileLocation var3) { + public WorldMapEvent(int var1, Coord var2, Coord var3) { this.mapElement = var1; this.coord1 = var2; this.coord2 = var3; diff --git a/runescape-client/src/main/java/WorldMapIcon1.java b/runescape-client/src/main/java/WorldMapIcon1.java index 0931561556..5841b7388b 100644 --- a/runescape-client/src/main/java/WorldMapIcon1.java +++ b/runescape-client/src/main/java/WorldMapIcon1.java @@ -53,7 +53,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { @ObfuscatedSignature( signature = "(Lhu;Lhu;ILaj;)V" ) - WorldMapIcon1(TileLocation var1, TileLocation var2, int var3, WorldMapLabel var4) { + WorldMapIcon1(Coord var1, Coord var2, int var3, WorldMapLabel var4) { super(var1, var2); this.field1031 = var3; this.label0 = var4; diff --git a/runescape-client/src/main/java/WorldMapIcon2.java b/runescape-client/src/main/java/WorldMapIcon2.java index baf78223a7..450dc4d60a 100644 --- a/runescape-client/src/main/java/WorldMapIcon2.java +++ b/runescape-client/src/main/java/WorldMapIcon2.java @@ -44,7 +44,7 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { @ObfuscatedSignature( signature = "(Lhu;Lhu;ILav;)V" ) - WorldMapIcon2(TileLocation var1, TileLocation var2, int var3, WorldMapRegion var4) { + WorldMapIcon2(Coord var1, Coord var2, int var3, WorldMapRegion var4) { super(var1, var2); this.field1034 = var3; this.field1035 = var4; diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index bb5eeeeb11..bba1ada73f 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -108,7 +108,7 @@ public class WorldMapLabelSize { PacketBufferNode var0 = Interpreter.method1915(ClientPacket.field242, Client.packetWriter.isaacCipher); Client.packetWriter.method241(var0); - for (WidgetGroupParent var1 = (WidgetGroupParent)Client.widgetGroupParents.first(); var1 != null; var1 = (WidgetGroupParent)Client.widgetGroupParents.next()) { + for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { if (var1.type == 0 || var1.type == 3) { MenuAction.closeWidgetGroup(var1, true); } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index af00b8f310..3ffd09acb5 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -173,13 +173,13 @@ public class WorldMapRegion { garbageValue = "-896662600" ) void method479(ObjectDefinition var1, int var2, int var3, int var4, class21 var5) { - TileLocation var6 = new TileLocation(var2, var3 + this.x * 64, this.y * 64 + var4); - TileLocation var7 = null; + Coord var6 = new Coord(var2, var3 + this.x * 64, this.y * 64 + var4); + Coord var7 = null; if (this.field239 != null) { - var7 = new TileLocation(this.field239.field148 + var2, var3 + this.field239.field149 * 64, var4 + this.field239.field146 * 64); + var7 = new Coord(this.field239.field148 + var2, var3 + this.field239.field149 * 64, var4 + this.field239.field146 * 64); } else { class39 var8 = (class39)var5; - var7 = new TileLocation(var2 + var8.field148, var3 + var8.field149 * 64 + var8.method717() * 8, var4 + var8.field146 * 64 + var8.method718() * 8); + var7 = new Coord(var2 + var8.field148, var3 + var8.field149 * 64 + var8.method717() * 8, var4 + var8.field146 * 64 + var8.method718() * 8); } Object var10; @@ -190,7 +190,7 @@ public class WorldMapRegion { var10 = new WorldMapIcon1(var7, var6, var9.field1020, this.method420(var9)); } - this.iconsMap.put(new TileLocation(0, var3, var4), var10); + this.iconsMap.put(new Coord(0, var3, var4), var10); } @ObfuscatedName("e") @@ -444,19 +444,19 @@ public class WorldMapRegion { int var9; if (var7 != -1) { int var10 = this.field1053; - OverlayDefinition var11 = (OverlayDefinition)OverlayDefinition.field664.get((long)var7); - OverlayDefinition var12; + FloorOverlayDefinition var11 = (FloorOverlayDefinition) FloorOverlayDefinition.field664.get((long)var7); + FloorOverlayDefinition var12; if (var11 != null) { var12 = var11; } else { - byte[] var13 = OverlayDefinition.field663.takeFile(4, var7); - var11 = new OverlayDefinition(); + byte[] var13 = FloorOverlayDefinition.field663.takeFile(4, var7); + var11 = new FloorOverlayDefinition(); if (var13 != null) { var11.decode(new Buffer(var13), var7); } - var11.init(); - OverlayDefinition.field664.put(var11, (long)var7); + var11.postDecode(); + FloorOverlayDefinition.field664.put(var11, (long)var7); var12 = var11; } @@ -549,19 +549,19 @@ public class WorldMapRegion { int var6 = var3.field145[var5][var1][var2] - 1; if (var6 > -1) { int var7 = this.field1053; - OverlayDefinition var8 = (OverlayDefinition)OverlayDefinition.field664.get((long)var6); - OverlayDefinition var9; + FloorOverlayDefinition var8 = (FloorOverlayDefinition) FloorOverlayDefinition.field664.get((long)var6); + FloorOverlayDefinition var9; if (var8 != null) { var9 = var8; } else { - byte[] var10 = OverlayDefinition.field663.takeFile(4, var6); - var8 = new OverlayDefinition(); + byte[] var10 = FloorOverlayDefinition.field663.takeFile(4, var6); + var8 = new FloorOverlayDefinition(); if (var10 != null) { var8.decode(new Buffer(var10), var6); } - var8.init(); - OverlayDefinition.field664.put(var8, (long)var6); + var8.postDecode(); + FloorOverlayDefinition.field664.put(var8, (long)var6); var9 = var8; } @@ -754,7 +754,7 @@ public class WorldMapRegion { while (var7.hasNext()) { Entry var8 = (Entry)var7.next(); - TileLocation var9 = (TileLocation)var8.getKey(); + Coord var9 = (Coord)var8.getKey(); int var10 = (int)((float)var1 + var5 * (float)var9.x - var6); int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); @@ -1102,7 +1102,7 @@ public class WorldMapRegion { Widget var6 = var0[var5]; if (var6 != null && var6.parentId == var1) { WorldMapSection3.alignWidgetSize(var6, var2, var3, var4); - OverlayDefinition.alignWidgetPosition(var6, var2, var3); + FloorOverlayDefinition.alignWidgetPosition(var6, var2, var3); if (var6.scrollX > var6.scrollWidth - var6.width) { var6.scrollX = var6.scrollWidth - var6.width; } diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index 8765e6c253..c2e18f2b79 100644 --- a/runescape-client/src/main/java/WorldMapSection.java +++ b/runescape-client/src/main/java/WorldMapSection.java @@ -44,7 +44,7 @@ public interface WorldMapSection { garbageValue = "-1916486802" ) @Export("coord") - TileLocation coord(int var1, int var2); + Coord coord(int var1, int var2); @ObfuscatedName("u") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java index 580063b608..9314fc62b0 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -151,13 +151,13 @@ public class WorldMapSection0 implements WorldMapSection { garbageValue = "-1916486802" ) @Export("coord") - public TileLocation coord(int var1, int var2) { + public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; } else { int var3 = this.field1059 * 64 - this.field1061 * 64 + (this.field1063 * 8 - this.field1067 * 8) + var1; int var4 = this.field1060 * 64 - this.field1062 * 64 + var2 + (this.field1064 * 8 - this.field1068 * 8); - return new TileLocation(this.field1057, var3, var4); + return new Coord(this.field1057, var3, var4); } } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index 946af931f3..fc4f397d84 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -144,13 +144,13 @@ public class WorldMapSection1 implements WorldMapSection { garbageValue = "-1916486802" ) @Export("coord") - public TileLocation coord(int var1, int var2) { + public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; } else { int var3 = this.field1074 * 64 - this.field1076 * 64 + (this.field1078 * 8 - this.field1080 * 8) + var1; int var4 = this.field1075 * 64 - this.field1077 * 64 + var2 + (this.field1079 * 8 - this.field1081 * 8); - return new TileLocation(this.field1072, var3, var4); + return new Coord(this.field1072, var3, var4); } } @@ -289,12 +289,12 @@ public class WorldMapSection1 implements WorldMapSection { AbstractByteArrayCopier.unloadWidgetGroup(Client.rootWidgetGroup); } - for (WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.first(); var4 != null; var4 = (WidgetGroupParent)Client.widgetGroupParents.next()) { + for (InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.first(); var4 != null; var4 = (InterfaceParent)Client.interfaceParents.next()) { MenuAction.closeWidgetGroup(var4, true); } Client.rootWidgetGroup = -1; - Client.widgetGroupParents = new NodeHashTable(8); + Client.interfaceParents = new NodeHashTable(8); Client.field127 = null; Client.menuOptionsCount = 0; Client.isMenuOpen = false; diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 077d62036f..66d056e8d5 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -109,13 +109,13 @@ public class WorldMapSection2 implements WorldMapSection { garbageValue = "-1916486802" ) @Export("coord") - public TileLocation coord(int var1, int var2) { + public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; } else { int var3 = this.field1085 * 64 - this.field1087 * 64 + var1; int var4 = this.field1086 * 64 - this.field1088 * 64 + var2; - return new TileLocation(this.field1083, var3, var4); + return new Coord(this.field1083, var3, var4); } } @@ -188,7 +188,7 @@ public class WorldMapSection2 implements WorldMapSection { int var17 = var4 - var3.xInset; int var18 = var5 - var3.yInset; if (var2.vmethod3644(2, var4, var5, var3)) { - WidgetGroupParent.field986 = var4; + InterfaceParent.field986 = var4; UrlRequester.field929 = var5; return true; } @@ -259,7 +259,7 @@ public class WorldMapSection2 implements WorldMapSection { } } - WidgetGroupParent.field986 = var4; + InterfaceParent.field986 = var4; UrlRequester.field929 = var5; return false; } diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java index e6e82503ab..36dae56494 100644 --- a/runescape-client/src/main/java/WorldMapSection3.java +++ b/runescape-client/src/main/java/WorldMapSection3.java @@ -138,13 +138,13 @@ public class WorldMapSection3 implements WorldMapSection { garbageValue = "-1916486802" ) @Export("coord") - public TileLocation coord(int var1, int var2) { + public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; } else { int var3 = this.field1092 * 64 - this.field1096 * 64 + var1; int var4 = this.field1093 * 64 - this.field1097 * 64 + var2; - return new TileLocation(this.field1090, var3, var4); + return new Coord(this.field1090, var3, var4); } } diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java index fbd4dfcf22..ac2e1454bf 100644 --- a/runescape-client/src/main/java/class11.java +++ b/runescape-client/src/main/java/class11.java @@ -210,7 +210,7 @@ final class class11 implements Comparator { return 1; } else if (var0 == ScriptOpcodes.IF_HASSUB) { int var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - WidgetGroupParent var5 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var4); + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var4); if (var5 != null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; } else { diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java index e39aafbbb2..fa118448dd 100644 --- a/runescape-client/src/main/java/class12.java +++ b/runescape-client/src/main/java/class12.java @@ -123,7 +123,7 @@ final class class12 implements Comparator { garbageValue = "1731524026" ) static void method159() { - for (WidgetGroupParent var0 = (WidgetGroupParent)Client.widgetGroupParents.first(); var0 != null; var0 = (WidgetGroupParent)Client.widgetGroupParents.next()) { + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { int var1 = var0.group; if (GroundItemPile.loadWidgetGroup(var1)) { boolean var2 = true; diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index ac8fb28183..c5f2bf99c2 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -90,7 +90,7 @@ public class class171 { Client.collisionMaps[var0] = new CollisionMap(104, 104); } - WidgetGroupParent.sceneMinimapSprite = new Sprite(512, 512); + InterfaceParent.sceneMinimapSprite = new Sprite(512, 512); Login.Login_loadingText = "Starting game engine..."; Login.Login_loadingPercent = 5; Client.titleLoadingStage = 20; @@ -164,8 +164,8 @@ public class class171 { AbstractWorldMapIcon.method625(ItemContainer.field434, "World Map"); AbstractWorldMapIcon.method625(WorldMapLabelSize.field1040, "World Map Geography"); AbstractWorldMapIcon.method625(AbstractByteArrayCopier.field0, "World Map Ground"); - class211.spriteIds = new SpriteIds(); - class211.spriteIds.read(class22.archive16); + class211.graphicsDefaults = new GraphicsDefaults(); + class211.graphicsDefaults.decode(class22.archive16); Login.Login_loadingText = "Loaded update list"; Login.Login_loadingPercent = 30; Client.titleLoadingStage = 45; @@ -305,13 +305,13 @@ public class class171 { } else if (Client.titleLoadingStage == 80) { var0 = 0; if (UnitPriceComparator.compass == null) { - UnitPriceComparator.compass = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field878, 0); + UnitPriceComparator.compass = class322.readSprite(WorldMapSection3.archive8, class211.graphicsDefaults.field878, 0); } else { ++var0; } if (FaceNormal.field345 == null) { - FaceNormal.field345 = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field879, 0); + FaceNormal.field345 = class322.readSprite(WorldMapSection3.archive8, class211.graphicsDefaults.field879, 0); } else { ++var0; } @@ -320,7 +320,7 @@ public class class171 { int var34; if (class192.mapSceneSprites == null) { var30 = WorldMapSection3.archive8; - var34 = class211.spriteIds.mapScenes; + var34 = class211.graphicsDefaults.mapScenes; if (!SpriteMask.loadSprite(var30, var34, 0)) { var32 = null; } else { @@ -335,7 +335,7 @@ public class class171 { Sprite[] var35; if (class15.headIconPkSprites == null) { var30 = WorldMapSection3.archive8; - var34 = class211.spriteIds.headIconsPk; + var34 = class211.graphicsDefaults.headIconsPk; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; } else { @@ -349,7 +349,7 @@ public class class171 { if (ClientPreferences.headIconPrayerSprites == null) { var30 = WorldMapSection3.archive8; - var34 = class211.spriteIds.headIconsPrayer; + var34 = class211.graphicsDefaults.headIconsPrayer; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; } else { @@ -363,7 +363,7 @@ public class class171 { if (Player.headIconHintSprites == null) { var30 = WorldMapSection3.archive8; - var34 = class211.spriteIds.headIconsHint; + var34 = class211.graphicsDefaults.headIconsHint; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; } else { @@ -377,7 +377,7 @@ public class class171 { if (class16.mapMarkerSprites == null) { var30 = WorldMapSection3.archive8; - var34 = class211.spriteIds.mapMarkers; + var34 = class211.graphicsDefaults.mapMarkers; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; } else { @@ -391,7 +391,7 @@ public class class171 { if (KeyHandler.crossSprites == null) { var30 = WorldMapSection3.archive8; - var34 = class211.spriteIds.crosses; + var34 = class211.graphicsDefaults.crosses; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; } else { @@ -405,7 +405,7 @@ public class class171 { if (class39.mapDotSprites == null) { var30 = WorldMapSection3.archive8; - var34 = class211.spriteIds.mapDots; + var34 = class211.graphicsDefaults.mapDots; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; } else { @@ -419,7 +419,7 @@ public class class171 { if (class32.scrollBarSprites == null) { var30 = WorldMapSection3.archive8; - var34 = class211.spriteIds.scrollBars; + var34 = class211.graphicsDefaults.scrollBars; if (!SpriteMask.loadSprite(var30, var34, 0)) { var32 = null; } else { @@ -433,7 +433,7 @@ public class class171 { if (WorldMapSectionType.modIconSprites == null) { var30 = WorldMapSection3.archive8; - var34 = class211.spriteIds.modIcons; + var34 = class211.graphicsDefaults.modIcons; if (!SpriteMask.loadSprite(var30, var34, 0)) { var32 = null; } else { diff --git a/runescape-client/src/main/java/class211.java b/runescape-client/src/main/java/class211.java index cca70bcd88..681b83f9f8 100644 --- a/runescape-client/src/main/java/class211.java +++ b/runescape-client/src/main/java/class211.java @@ -18,8 +18,8 @@ public class class211 { @ObfuscatedSignature( signature = "Llg;" ) - @Export("spriteIds") - static SpriteIds spriteIds; + @Export("graphicsDefaults") + static GraphicsDefaults graphicsDefaults; @ObfuscatedName("m") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java index 8ca962085e..b6780fe65f 100644 --- a/runescape-client/src/main/java/class238.java +++ b/runescape-client/src/main/java/class238.java @@ -566,7 +566,7 @@ public final class class238 { updateWidgetGroup(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); } - WidgetGroupParent var33 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var9.id); + InterfaceParent var33 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); if (var33 != null) { if (var33.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { for (var32 = (ScriptEvent)Client.scriptEvents.last(); var32 != null; var32 = (ScriptEvent)Client.scriptEvents.previous()) { diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java index 2d632c4474..fa41337bba 100644 --- a/runescape-client/src/main/java/class30.java +++ b/runescape-client/src/main/java/class30.java @@ -84,7 +84,7 @@ public class class30 { method570(var3.children, var1); } - WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var3.id); + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); if (var4 != null) { GrandExchangeEvents.method74(var4.group, var1); } diff --git a/runescape-client/src/main/java/class39.java b/runescape-client/src/main/java/class39.java index e66798f49a..0ace680c70 100644 --- a/runescape-client/src/main/java/class39.java +++ b/runescape-client/src/main/java/class39.java @@ -810,7 +810,7 @@ public class class39 extends class21 { WorldMapRegion.notRevalidateWidgetScroll(var1.children, var1.id, var3, var4, var2); } - WidgetGroupParent var5 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var1.id); + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); if (var5 != null) { int var6 = var5.group; if (GroundItemPile.loadWidgetGroup(var6)) { diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index d5ef01167d..659262007e 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -52,7 +52,7 @@ final class class4 implements class0 { garbageValue = "-843046456" ) public static void method55() { - OverlayDefinition.field664.clear(); + FloorOverlayDefinition.field664.clear(); } @ObfuscatedName("v") diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java index 98eca77335..075817ea75 100644 --- a/runescape-client/src/main/java/class54.java +++ b/runescape-client/src/main/java/class54.java @@ -665,21 +665,21 @@ public final class class54 { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isCacheLoaded() ? 1 : 0; return 1; } else { - TileLocation var5; + Coord var5; if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { - var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); BufferedFile.worldMap().setWorldMapPositionTarget(var5.x, var5.y); return 1; } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { - var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); BufferedFile.worldMap().method371(var5.x, var5.y); return 1; } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { - var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); BufferedFile.worldMap().method372(var5.plane, var5.x, var5.y); return 1; } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { - var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); BufferedFile.worldMap().method373(var5.plane, var5.x, var5.y); return 1; } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { @@ -751,7 +751,7 @@ public final class class54 { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().currentMapAreaId(); return 1; } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { - var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); var6 = BufferedFile.worldMap().getCurrentMapArea(); if (var6 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; @@ -770,9 +770,9 @@ public final class class54 { return 1; } } else { - TileLocation var7; + Coord var7; if (var0 == 6618) { - var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); var6 = BufferedFile.worldMap().getCurrentMapArea(); if (var6 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; @@ -789,23 +789,23 @@ public final class class54 { return 1; } } else { - TileLocation var8; + Coord var8; if (var0 == 6619) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; - var8 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); + var8 = new Coord(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); TotalQuantityComparator.method96(var3, var8, false); return 1; } else if (var0 == 6620) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; - var8 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); + var8 = new Coord(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); TotalQuantityComparator.method96(var3, var8, true); return 1; } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; - var8 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); + var8 = new Coord(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); var4 = BufferedFile.worldMap().getMapArea(var3); if (var4 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; @@ -819,7 +819,7 @@ public final class class54 { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method378(); return 1; } else if (var0 == 6623) { - var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); var6 = BufferedFile.worldMap().mapAreaAtCoord(var5.plane, var5.x, var5.y); if (var6 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; @@ -889,7 +889,7 @@ public final class class54 { } else if (var0 == 6638) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; - var8 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); + var8 = new Coord(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); var7 = BufferedFile.worldMap().method385(var3, var8); if (var7 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java index 3cfc38e0eb..07f0173d39 100644 --- a/runescape-client/src/main/java/class65.java +++ b/runescape-client/src/main/java/class65.java @@ -33,7 +33,7 @@ public class class65 extends RouteStrategy { ) static final void method1232(Actor var0, int var1) { if (var0.field19 > Client.cycle) { - SpriteIds.method5828(var0); + GraphicsDefaults.method5828(var0); } else { int var2; int var3; From e1a815eddd83600b31ef0589c8ca99068025885d Mon Sep 17 00:00:00 2001 From: Lucas Date: Sun, 7 Jul 2019 12:15:54 +0200 Subject: [PATCH 375/472] Make updatemappings parameter renamer work, add importmappings parameter renamer, more refactoring --- .../deob/updater/ParameterRenamer.java | 37 +- .../net/runelite/runesuite/HookClass.java | 1 - .../net/runelite/runesuite/HookField.java | 1 - .../net/runelite/runesuite/HookImporter.java | 91 +- .../net/runelite/runesuite/HookMethod.java | 5 +- .../java/net/runelite/runesuite/hooks.json | 72775 +++++++++------- .../net/runelite/injector/InjectUtil.java | 27 + .../injector/raw/DrawAfterWidgets.java | 8 +- .../net/runelite/injector/raw/RenderDraw.java | 6 +- .../java/net/runelite/mixins/CameraMixin.java | 2 +- .../net/runelite/mixins/RSClientMixin.java | 8 +- .../net/runelite/mixins/RSTextureMixin.java | 4 +- .../java/net/runelite/rs/api/RSActor.java | 2 +- .../java/net/runelite/rs/api/RSClient.java | 12 +- .../java/net/runelite/rs/api/RSEntity.java | 2 +- .../net/runelite/rs/api/RSNPCDefinition.java | 2 +- .../java/net/runelite/rs/api/RSScene.java | 2 +- .../runelite/rs/api/RSVarbitDefinition.java | 6 +- .../java/net/runelite/rs/api/RSWidget.java | 6 +- .../java/net/runelite/rs/api/RSWorldMap.java | 2 +- .../main/java/AbstractByteArrayCopier.java | 20 +- .../src/main/java/AbstractSocket.java | 2 +- .../src/main/java/AbstractUserComparator.java | 2 +- runescape-client/src/main/java/Actor.java | 24 +- runescape-client/src/main/java/Archive.java | 6 +- .../src/main/java/ArchiveDisk.java | 70 +- .../src/main/java/ArchiveDiskAction.java | 4 +- .../src/main/java/BoundaryObject.java | 2 +- runescape-client/src/main/java/Canvas.java | 6 +- runescape-client/src/main/java/Client.java | 110 +- .../src/main/java/ClientPreferences.java | 4 +- .../main/java/DevicePcmPlayerProvider.java | 12 +- runescape-client/src/main/java/Entity.java | 6 +- .../main/java/FloorUnderlayDefinition.java | 10 +- runescape-client/src/main/java/Fonts.java | 4 +- .../src/main/java/FriendSystem.java | 2 +- runescape-client/src/main/java/GameShell.java | 14 +- .../src/main/java/GrandExchangeEvents.java | 8 +- .../src/main/java/GroundItemPile.java | 24 +- .../src/main/java/GzipDecompressor.java | 2 +- runescape-client/src/main/java/Huffman.java | 6 +- .../src/main/java/Interpreter.java | 6 +- .../src/main/java/InvDefinition.java | 2 +- .../src/main/java/ItemDefinition.java | 20 +- .../src/main/java/KitDefinition.java | 36 +- runescape-client/src/main/java/Login.java | 2 +- .../src/main/java/MenuAction.java | 10 +- runescape-client/src/main/java/Model.java | 4 +- .../src/main/java/MouseRecorder.java | 2 +- runescape-client/src/main/java/NPC.java | 2 +- .../src/main/java/NPCDefinition.java | 54 +- .../src/main/java/NetFileRequest.java | 2 +- .../src/main/java/ObjectDefinition.java | 22 +- .../src/main/java/OwnWorldComparator.java | 12 +- ...eyDefinition.java => ParamDefinition.java} | 36 +- .../src/main/java/PendingSpawn.java | 6 +- runescape-client/src/main/java/Player.java | 30 +- runescape-client/src/main/java/Scene.java | 76 +- .../src/main/java/ScriptEvent.java | 4 +- .../src/main/java/SecureRandomCallable.java | 6 +- .../src/main/java/SequenceDefinition.java | 4 +- runescape-client/src/main/java/Skills.java | 8 +- .../src/main/java/StructDefinition.java | 6 +- .../src/main/java/StudioGame.java | 6 +- runescape-client/src/main/java/Texture.java | 4 +- .../src/main/java/TextureProvider.java | 2 +- runescape-client/src/main/java/Tile.java | 2 +- .../src/main/java/UserComparator5.java | 2 +- .../src/main/java/VarbitDefinition.java | 18 +- runescape-client/src/main/java/Varps.java | 2 +- runescape-client/src/main/java/Widget.java | 16 +- .../src/main/java/WorldComparator.java | 8 +- runescape-client/src/main/java/WorldMap.java | 8 +- .../src/main/java/WorldMapAreaData.java | 2 +- .../src/main/java/WorldMapCacheName.java | 2 +- .../src/main/java/WorldMapDecorationType.java | 4 +- .../src/main/java/WorldMapIcon1.java | 2 +- .../src/main/java/WorldMapLabelSize.java | 2 +- .../src/main/java/WorldMapRegion.java | 4 +- .../src/main/java/WorldMapSection1.java | 10 +- .../src/main/java/WorldMapSection2.java | 6 +- .../src/main/java/WorldMapSection3.java | 4 +- runescape-client/src/main/java/class1.java | 4 +- runescape-client/src/main/java/class11.java | 6 +- runescape-client/src/main/java/class12.java | 4 +- runescape-client/src/main/java/class171.java | 32 +- runescape-client/src/main/java/class211.java | 4 +- runescape-client/src/main/java/class22.java | 4 +- runescape-client/src/main/java/class229.java | 14 +- runescape-client/src/main/java/class238.java | 12 +- runescape-client/src/main/java/class3.java | 8 +- runescape-client/src/main/java/class30.java | 8 +- runescape-client/src/main/java/class31.java | 26 +- runescape-client/src/main/java/class39.java | 4 +- runescape-client/src/main/java/class40.java | 6 +- runescape-client/src/main/java/class50.java | 2 +- runescape-client/src/main/java/class54.java | 16 +- runescape-client/src/main/java/class65.java | 8 +- 98 files changed, 41069 insertions(+), 32880 deletions(-) rename runescape-client/src/main/java/{ParamKeyDefinition.java => ParamDefinition.java} (96%) diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/ParameterRenamer.java b/deobfuscator/src/main/java/net/runelite/deob/updater/ParameterRenamer.java index 4b2dbc78d0..dee849b75b 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/ParameterRenamer.java +++ b/deobfuscator/src/main/java/net/runelite/deob/updater/ParameterRenamer.java @@ -24,9 +24,12 @@ */ package net.runelite.deob.updater; +import java.util.List; import net.runelite.asm.ClassFile; import net.runelite.asm.ClassGroup; import net.runelite.asm.Method; +import net.runelite.asm.attributes.code.LocalVariable; +import net.runelite.asm.attributes.code.Parameter; import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; public class ParameterRenamer @@ -49,9 +52,39 @@ public class ParameterRenamer for (Method sourceM : sourceCF.getMethods()) { Method destM = (Method) mapping.get(sourceM); - if (destM != null) + if (sourceM.getParameters() != null && !sourceM.getParameters().isEmpty() && destM.getParameters().size() >= 1) { - destM.setParameters(sourceM.getParameters()); + List oldParams = destM.getParameters(); + for (int i = 0; i < sourceM.getParameters().size(); i++) + { + String name = sourceM.getParameters().get(i).getName(); + if (name.matches("arg[0-9]") || name.length() <= 2 && (name.charAt(0) != 'x' || name.charAt(0) != 'y')) + { + continue; + } + + Parameter oldParam = oldParams.get(i); + LocalVariable oldVar = oldParam.getLocalVariable(); + + Parameter newParam = new Parameter(name, oldParam.getAccess()); + oldParams.set(i, newParam); + + if (oldVar == null) + { + continue; + } + + LocalVariable newVar = new LocalVariable( + name, + oldVar.getDesc(), + oldVar.getSignature(), + oldVar.getStart(), + oldVar.getEnd(), + oldVar.getIndex() + ); + + newParam.setLocalVariable(newVar); + } } } } diff --git a/deobfuscator/src/test/java/net/runelite/runesuite/HookClass.java b/deobfuscator/src/test/java/net/runelite/runesuite/HookClass.java index 5b7caf9d80..bec9caf813 100644 --- a/deobfuscator/src/test/java/net/runelite/runesuite/HookClass.java +++ b/deobfuscator/src/test/java/net/runelite/runesuite/HookClass.java @@ -8,7 +8,6 @@ public class HookClass @SerializedName("class") String clazz; String name; - int access; List fields; List methods; } diff --git a/deobfuscator/src/test/java/net/runelite/runesuite/HookField.java b/deobfuscator/src/test/java/net/runelite/runesuite/HookField.java index c5219be785..d7db94eab6 100644 --- a/deobfuscator/src/test/java/net/runelite/runesuite/HookField.java +++ b/deobfuscator/src/test/java/net/runelite/runesuite/HookField.java @@ -5,7 +5,6 @@ public class HookField String field; String owner; String name; - int access; @Override public String toString() diff --git a/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java b/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java index c4a7892a1f..6f262f105f 100644 --- a/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java +++ b/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java @@ -39,6 +39,8 @@ import net.runelite.asm.Type; import net.runelite.asm.attributes.Annotations; import net.runelite.asm.attributes.annotation.Annotation; import net.runelite.asm.attributes.annotation.Element; +import net.runelite.asm.attributes.code.LocalVariable; +import net.runelite.asm.attributes.code.Parameter; import net.runelite.asm.signature.Signature; import net.runelite.asm.signature.util.VirtualMethods; import static net.runelite.deob.DeobAnnotations.EXPORT; @@ -97,7 +99,7 @@ public class HookImporter @Ignore public void importHooks() { - int classes = 0, fields = 0, methods = 0, access = 0; + int classes = 0, fields = 0, methods = 0, params = 0; NameMappings mappings = new NameMappings(); for (HookClass hc : hooks) @@ -107,12 +109,6 @@ public class HookImporter assert cf != null; - if (cf.getAccess() != hc.access) - { - cf.setAccess(hc.access); - ++access; - } - String implementsName = getAnnotation(cf.getAnnotations(), IMPLEMENTS); if (implementsName.isEmpty()) { @@ -122,23 +118,28 @@ public class HookImporter ++classes; } + if (!implementsName.isEmpty() && !implementsName.equals(hc.clazz)) + { + logger.info("Runestar calls class {} {}, while we call it {}", hc.name, hc.clazz, implementsName); + } + for (HookField fh : hc.fields) { + if (fh.field.startsWith("__")) + { + continue; + } + ClassFile cf2 = findClassWithObfuscatedName(fh.owner); assert cf2 != null; Field f = findFieldWithObfuscatedName(cf2, fh.name); if (f == null) { + logger.warn("Missing field {}", fh); // inlined constant maybe? continue; } - if (f.getAccessFlags() != fh.access) - { - f.setAccessFlags(fh.access); - ++access; - } - String exportedName = getAnnotation(f.getAnnotations(), EXPORT); if (exportedName.isEmpty()) { @@ -155,11 +156,20 @@ public class HookImporter mappings.map(f.getPoolField(), deobfuscatedFieldName); ++fields; } + + if (!exportedName.isEmpty() && !exportedName.equals(fh.field)) + { + logger.info("Runestar calls field {}.{} {}, while we call it {}", fh.owner, fh.name, fh.field, exportedName); + } } outer: for (HookMethod hm : hc.methods) { + if (hm.method.startsWith("__")) + { + continue; + } ClassFile cf2 = findClassWithObfuscatedName(hm.owner); assert cf2 != null; @@ -171,10 +181,40 @@ public class HookImporter continue; } - if (m.getAccessFlags() != hm.access) + if (hm.parameters != null && !hm.parameters.isEmpty() && m.getParameters().size() >= 1) { - m.setAccessFlags(hm.access); - ++access; + List oldParams = m.getParameters(); + for (int i = 0; i < hm.parameters.size(); i++) + { + String name = hm.parameters.get(i); + if (name.matches("arg[0-9]") || name.length() <= 2 && (name.charAt(0) != 'x' || name.charAt(0) != 'y')) + { + continue; + } + + Parameter oldParam = oldParams.get(i); + LocalVariable oldVar = oldParam.getLocalVariable(); + + Parameter newParam = new Parameter(name, oldParam.getAccess()); + oldParams.set(i, newParam); + params++; + + if (oldVar == null) + { + continue; + } + + LocalVariable newVar = new LocalVariable( + name, + oldVar.getDesc(), + oldVar.getSignature(), + oldVar.getStart(), + oldVar.getEnd(), + oldVar.getIndex() + ); + + newParam.setLocalVariable(newVar); + } } // maybe only the base class method is exported @@ -184,6 +224,10 @@ public class HookImporter String exportedName = getAnnotation(method.getAnnotations(), EXPORT); if (!exportedName.isEmpty()) { + if (!exportedName.equals(hm.method)) + { + logger.info("Runestar calls {}.{} {}, while we call it {}", hm.owner, hm.name, hm.method, exportedName); + } continue outer; } } @@ -198,7 +242,7 @@ public class HookImporter Renamer renamer = new Renamer(mappings); renamer.run(group); - logger.info("Imported {} classes, {} fields, {} methods, {} access levels", classes, fields, methods, access); + logger.info("Imported {} classes, {} fields, {} methods, {} params", classes, fields, methods, params); } private ClassFile findClassWithObfuscatedName(String name) @@ -259,8 +303,7 @@ public class HookImporter { for (Element e : a.getElements()) { - String str = (String) e.getValue(); - return str; + return (String) e.getValue(); } } @@ -270,13 +313,13 @@ public class HookImporter private Signature getObfuscatedMethodSignature(Method method) { String sig = getAnnotation(method.getAnnotations(), OBFUSCATED_SIGNATURE); - if (sig.isEmpty() == false) - { - return new Signature(sig); // if it is annotated, use that - } - else + if (sig.isEmpty()) { return method.getDescriptor(); } + else + { + return new Signature(sig); // if it is annotated, use that + } } } diff --git a/deobfuscator/src/test/java/net/runelite/runesuite/HookMethod.java b/deobfuscator/src/test/java/net/runelite/runesuite/HookMethod.java index 849c0d01c7..172917a565 100644 --- a/deobfuscator/src/test/java/net/runelite/runesuite/HookMethod.java +++ b/deobfuscator/src/test/java/net/runelite/runesuite/HookMethod.java @@ -1,12 +1,13 @@ package net.runelite.runesuite; +import java.util.List; + public class HookMethod { String method; String owner; String name; - int access; - String[] parameters; + List parameters; String descriptor; @Override diff --git a/deobfuscator/src/test/java/net/runelite/runesuite/hooks.json b/deobfuscator/src/test/java/net/runelite/runesuite/hooks.json index e36464b4e9..609a346a24 100644 --- a/deobfuscator/src/test/java/net/runelite/runesuite/hooks.json +++ b/deobfuscator/src/test/java/net/runelite/runesuite/hooks.json @@ -1,32344 +1,40431 @@ -[ { - "class" : "UrlRequest", - "name" : "ey", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "isDone0", - "owner" : "ey", - "name" : "f", - "access" : 64, - "descriptor" : "Z" - }, { - "field" : "response0", - "owner" : "ey", - "name" : "q", - "access" : 64, - "descriptor" : "[B" - }, { - "field" : "url", - "owner" : "ey", - "name" : "m", - "access" : 16, - "descriptor" : "Ljava/net/URL;" - } ], - "methods" : [ { - "method" : "getResponse", - "owner" : "ey", - "name" : "f", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)[B" - }, { - "method" : "isDone", - "owner" : "ey", - "name" : "m", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/net/URL;)V" - } ] -}, { - "class" : "ClientParameter", - "name" : "ji", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "id", - "owner" : "ji", - "name" : "y", - "access" : 17, - "descriptor" : "Ljava/lang/String;" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/lang/String;Ljava/lang/String;)V" - } ] -}, { - "class" : "Usernamed", - "name" : "ky", - "super" : "java.lang.Object", - "access" : 1537, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ { - "method" : "username", - "owner" : "ky", - "name" : "kr", - "access" : 1025, - "descriptor" : "(B)Lkp;" - } ], - "constructors" : [ ] -}, { - "class" : "WorldMapLabel", - "name" : "aj", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "height", - "owner" : "aj", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -85027761 - }, { - "field" : "size", - "owner" : "aj", - "name" : "w", - "access" : 0, - "descriptor" : "Ls;" - }, { - "field" : "text", - "owner" : "aj", - "name" : "m", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "width", - "owner" : "aj", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : -471061617 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/lang/String;IILs;)V" - } ] -}, { - "class" : "Canvas", - "name" : "ao", - "super" : "java.awt.Canvas", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "component", - "owner" : "ao", - "name" : "m", - "access" : 0, - "descriptor" : "Ljava/awt/Component;" - } ], - "methods" : [ { - "method" : "paint", - "owner" : "ao", - "name" : "paint", - "access" : 17, - "parameters" : [ "g" ], - "descriptor" : "(Ljava/awt/Graphics;)V" - }, { - "method" : "update", - "owner" : "ao", - "name" : "update", - "access" : 17, - "parameters" : [ "g" ], - "descriptor" : "(Ljava/awt/Graphics;)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/awt/Component;)V" - } ] -}, { - "class" : "SoundEnvelope", - "name" : "de", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "amplitude", - "owner" : "de", - "name" : "d", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "durations", - "owner" : "de", - "name" : "f", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "end", - "owner" : "de", - "name" : "o", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "form", - "owner" : "de", - "name" : "u", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "max", - "owner" : "de", - "name" : "k", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "phaseIndex", - "owner" : "de", - "name" : "l", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "phases", - "owner" : "de", - "name" : "q", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "segments", - "owner" : "de", - "name" : "m", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "start", - "owner" : "de", - "name" : "w", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "step", - "owner" : "de", - "name" : "e", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "ticks", - "owner" : "de", - "name" : "g", - "access" : 0, - "descriptor" : "I" - } ], - "methods" : [ { - "method" : "decode", - "owner" : "de", - "name" : "m", - "access" : 16, - "parameters" : [ "buffer" ], - "descriptor" : "(Lgr;)V" - }, { - "method" : "decodeSegments", - "owner" : "de", - "name" : "f", - "access" : 16, - "parameters" : [ "buffer" ], - "descriptor" : "(Lgr;)V" - }, { - "method" : "doStep", - "owner" : "de", - "name" : "w", - "access" : 16, - "parameters" : [ "n" ], - "descriptor" : "(I)I" - }, { - "method" : "reset", - "owner" : "de", - "name" : "q", - "access" : 16, - "parameters" : [ ], - "descriptor" : "()V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "ServerPacket", - "name" : "ge", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "id", - "owner" : "ge", - "name" : "cu", - "access" : 17, - "descriptor" : "I", - "decoder" : 1117211673 - }, { - "field" : "length", - "owner" : "ge", - "name" : "cb", - "access" : 17, - "descriptor" : "I", - "decoder" : 947096829 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(II)V" - } ] -}, { - "class" : "ModelData0", - "name" : "ed", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "SecureRandomFuture", - "name" : "cn", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "executor", - "owner" : "cn", - "name" : "m", - "access" : 0, - "descriptor" : "Ljava/util/concurrent/ExecutorService;" - }, { - "field" : "future", - "owner" : "cn", - "name" : "f", - "access" : 0, - "descriptor" : "Ljava/util/concurrent/Future;" - } ], - "methods" : [ { - "method" : "get", - "owner" : "cn", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Ljava/security/SecureRandom;" - }, { - "method" : "isDone", - "owner" : "cn", - "name" : "f", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "shutdown", - "owner" : "cn", - "name" : "m", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "Task", - "name" : "fm", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "intArgument", - "owner" : "fm", - "name" : "g", - "access" : 1, - "descriptor" : "I" - }, { - "field" : "next", - "owner" : "fm", - "name" : "m", - "access" : 0, - "descriptor" : "Lfm;" - }, { - "field" : "objectArgument", - "owner" : "fm", - "name" : "l", - "access" : 0, - "descriptor" : "Ljava/lang/Object;" - }, { - "field" : "result", - "owner" : "fm", - "name" : "e", - "access" : 65, - "descriptor" : "Ljava/lang/Object;" - }, { - "field" : "status", - "owner" : "fm", - "name" : "o", - "access" : 65, - "descriptor" : "I" - }, { - "field" : "type", - "owner" : "fm", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : -1097728571 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "Clock", - "name" : "fa", - "super" : "java.lang.Object", - "access" : 1057, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ { - "method" : "mark", - "owner" : "fa", - "name" : "m", - "access" : 1025, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "wait", - "owner" : "fa", - "name" : "f", - "access" : 1025, - "parameters" : [ "cycleMs", "minSleepMs" ], - "descriptor" : "(III)I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "ServerBuild", - "name" : "iy", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "id", - "owner" : "iy", - "name" : "u", - "access" : 17, - "descriptor" : "I", - "decoder" : -947415971 - }, { - "field" : "name", - "owner" : "iy", - "name" : "o", - "access" : 17, - "descriptor" : "Ljava/lang/String;" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/lang/String;I)V" - } ] -}, { - "class" : "Formatting", - "name" : "cy", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "Decimator", - "name" : "dp", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "inputRate", - "owner" : "dp", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : -1376358157 - }, { - "field" : "outputRate", - "owner" : "dp", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : -876645877 - }, { - "field" : "table", - "owner" : "dp", - "name" : "u", - "access" : 0, - "descriptor" : "[[I" - } ], - "methods" : [ { - "method" : "resample", - "owner" : "dp", - "name" : "m", - "access" : 0, - "descriptor" : "([BI)[B" - }, { - "method" : "scalePosition", - "owner" : "dp", - "name" : "q", - "access" : 0, - "parameters" : [ "position" ], - "descriptor" : "(IB)I" - }, { - "method" : "scaleRate", - "owner" : "dp", - "name" : "f", - "access" : 0, - "parameters" : [ "rate" ], - "descriptor" : "(II)I" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(II)V" - } ] -}, { - "class" : "AbstractByteArrayCopier", - "name" : "gu", - "super" : "java.lang.Object", - "access" : 1057, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ { - "method" : "get", - "owner" : "gu", - "name" : "m", - "access" : 1024, - "parameters" : [ ], - "descriptor" : "(I)[B" - }, { - "method" : "set", - "owner" : "gu", - "name" : "f", - "access" : 1024, - "parameters" : [ "array" ], - "descriptor" : "([BI)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "Varcs", - "name" : "ch", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "intsPersistence", - "owner" : "ch", - "name" : "q", - "access" : 0, - "descriptor" : "[Z" - }, { - "field" : "lastWriteTimeMs", - "owner" : "ch", - "name" : "g", - "access" : 0, - "descriptor" : "J", - "decoder" : 4836824701467349417 - }, { - "field" : "map", - "owner" : "ch", - "name" : "w", - "access" : 0, - "descriptor" : "Ljava/util/Map;" - }, { - "field" : "strings", - "owner" : "ch", - "name" : "o", - "access" : 0, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "unwrittenChanges", - "owner" : "ch", - "name" : "u", - "access" : 0, - "descriptor" : "Z" - } ], - "methods" : [ { - "method" : "clearTransient", - "owner" : "ch", - "name" : "g", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "getInt", - "owner" : "ch", - "name" : "f", - "access" : 0, - "parameters" : [ "index" ], - "descriptor" : "(IB)I" - }, { - "method" : "getPreferencesFile", - "owner" : "ch", - "name" : "l", - "access" : 0, - "descriptor" : "(ZB)Ldk;" - }, { - "method" : "getString", - "owner" : "ch", - "name" : "w", - "access" : 0, - "parameters" : [ "index" ], - "descriptor" : "(II)Ljava/lang/String;" - }, { - "method" : "getStringOld", - "owner" : "ch", - "name" : "u", - "access" : 0, - "parameters" : [ "index" ], - "descriptor" : "(IB)Ljava/lang/String;" - }, { - "method" : "hasUnwrittenChanges", - "owner" : "ch", - "name" : "a", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "read", - "owner" : "ch", - "name" : "x", - "access" : 0, - "descriptor" : "(I)V" - }, { - "method" : "setInt", - "owner" : "ch", - "name" : "m", - "access" : 0, - "parameters" : [ "index", "n" ], - "descriptor" : "(III)V" - }, { - "method" : "setString", - "owner" : "ch", - "name" : "q", - "access" : 0, - "parameters" : [ "index", "s" ], - "descriptor" : "(ILjava/lang/String;I)V" - }, { - "method" : "setStringOld", - "owner" : "ch", - "name" : "o", - "access" : 0, - "parameters" : [ "index", "s" ], - "descriptor" : "(ILjava/lang/String;B)V" - }, { - "method" : "tryWrite", - "owner" : "ch", - "name" : "d", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "write", - "owner" : "ch", - "name" : "e", - "access" : 0, - "descriptor" : "(I)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "DevicePcmPlayer", - "name" : "ax", - "super" : "co", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "byteSamples", - "owner" : "ax", - "name" : "w", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "capacity2", - "owner" : "ax", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -106586673 - }, { - "field" : "format", - "owner" : "ax", - "name" : "m", - "access" : 0, - "descriptor" : "Ljavax/sound/sampled/AudioFormat;" - }, { - "field" : "line", - "owner" : "ax", - "name" : "f", - "access" : 0, - "descriptor" : "Ljavax/sound/sampled/SourceDataLine;" - } ], - "methods" : [ { - "method" : "close", - "owner" : "ax", - "name" : "o", - "access" : 4, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "discard", - "owner" : "ax", - "name" : "u", - "access" : 4, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "init", - "owner" : "ax", - "name" : "m", - "access" : 4, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "open", - "owner" : "ax", - "name" : "f", - "access" : 4, - "parameters" : [ "bufferSize" ], - "descriptor" : "(II)V" - }, { - "method" : "position", - "owner" : "ax", - "name" : "q", - "access" : 4, - "parameters" : [ ], - "descriptor" : "(B)I" - }, { - "method" : "write", - "owner" : "ax", - "name" : "w", - "access" : 4, - "parameters" : [ ], - "descriptor" : "()V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "ClientPacket", - "name" : "gs", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "gb" ], - "fields" : [ { - "field" : "id", - "owner" : "gs", - "name" : "cd", - "access" : 16, - "descriptor" : "I", - "decoder" : -286923745 - }, { - "field" : "length", - "owner" : "gs", - "name" : "cx", - "access" : 16, - "descriptor" : "I", - "decoder" : -1759434223 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(II)V" - } ] -}, { - "class" : "Node", - "name" : "gw", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "key", - "owner" : "gw", - "name" : "cl", - "access" : 1, - "descriptor" : "J" - }, { - "field" : "next", - "owner" : "gw", - "name" : "cz", - "access" : 1, - "descriptor" : "Lgw;" - }, { - "field" : "previous", - "owner" : "gw", - "name" : "ct", - "access" : 1, - "descriptor" : "Lgw;" - } ], - "methods" : [ { - "method" : "hasNext", - "owner" : "gw", - "name" : "eg", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Z" - }, { - "method" : "remove", - "owner" : "gw", - "name" : "es", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "NodeHashTable", - "name" : "ld", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "buckets", - "owner" : "ld", - "name" : "f", - "access" : 0, - "descriptor" : "[Lgw;" - }, { - "field" : "current", - "owner" : "ld", - "name" : "w", - "access" : 0, - "descriptor" : "Lgw;" - }, { - "field" : "currentGet", - "owner" : "ld", - "name" : "q", - "access" : 0, - "descriptor" : "Lgw;" - }, { - "field" : "index", - "owner" : "ld", - "name" : "o", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "size", - "owner" : "ld", - "name" : "m", - "access" : 0, - "descriptor" : "I" - } ], - "methods" : [ { - "method" : "clear", - "owner" : "ld", - "name" : "q", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "first", - "owner" : "ld", - "name" : "w", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Lgw;" - }, { - "method" : "get", - "owner" : "ld", - "name" : "m", - "access" : 1, - "parameters" : [ "key" ], - "descriptor" : "(J)Lgw;" - }, { - "method" : "next", - "owner" : "ld", - "name" : "o", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Lgw;" - }, { - "method" : "put", - "owner" : "ld", - "name" : "f", - "access" : 1, - "parameters" : [ "node", "key" ], - "descriptor" : "(Lgw;J)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(I)V" - } ] -}, { - "class" : "TilePaint", - "name" : "eb", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "isFlat", - "owner" : "eb", - "name" : "u", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "neColor", - "owner" : "eb", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -1668262341 - }, { - "field" : "nwColor", - "owner" : "eb", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : -1057776035 - }, { - "field" : "rgb", - "owner" : "eb", - "name" : "g", - "access" : 0, - "descriptor" : "I", - "decoder" : 2097947337 - }, { - "field" : "seColor", - "owner" : "eb", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : -1875844515 - }, { - "field" : "swColor", - "owner" : "eb", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : 181759449 - }, { - "field" : "texture", - "owner" : "eb", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : 463308567 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(IIIIIIZ)V" - } ] -}, { - "class" : "MenuAction", - "name" : "cs", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "action", - "owner" : "cs", - "name" : "o", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "argument0", - "owner" : "cs", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : -2057883817 - }, { - "field" : "argument1", - "owner" : "cs", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : 305977315 - }, { - "field" : "argument2", - "owner" : "cs", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 1764645917 - }, { - "field" : "opcode", - "owner" : "cs", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -1483856253 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "GzipDecompressor", - "name" : "go", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "inflater", - "owner" : "go", - "name" : "m", - "access" : 0, - "descriptor" : "Ljava/util/zip/Inflater;" - } ], - "methods" : [ { - "method" : "decompress", - "owner" : "go", - "name" : "m", - "access" : 1, - "descriptor" : "(Lgr;[BB)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - }, { - "access" : 0, - "descriptor" : "(III)V" - } ] -}, { - "class" : "SoundCache", - "name" : "dt", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "musicSampleIndex", - "owner" : "dt", - "name" : "f", - "access" : 0, - "descriptor" : "Lir;" - }, { - "field" : "musicSamples", - "owner" : "dt", - "name" : "q", - "access" : 0, - "descriptor" : "Lld;" - }, { - "field" : "rawSounds", - "owner" : "dt", - "name" : "w", - "access" : 0, - "descriptor" : "Lld;" - }, { - "field" : "soundEffectIndex", - "owner" : "dt", - "name" : "m", - "access" : 0, - "descriptor" : "Lir;" - } ], - "methods" : [ { - "method" : "getMusicSample", - "owner" : "dt", - "name" : "w", - "access" : 1, - "descriptor" : "(I[II)Lcx;" - }, { - "method" : "getMusicSample0", - "owner" : "dt", - "name" : "f", - "access" : 0, - "descriptor" : "(II[II)Lcx;" - }, { - "method" : "getSoundEffect", - "owner" : "dt", - "name" : "q", - "access" : 1, - "descriptor" : "(I[IB)Lcx;" - }, { - "method" : "getSoundEffect0", - "owner" : "dt", - "name" : "m", - "access" : 0, - "descriptor" : "(II[IS)Lcx;" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Lir;Lir;)V" - } ] -}, { - "class" : "Strings", - "name" : "id", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "GrandExchangeEvents", - "name" : "g", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "events", - "owner" : "g", - "name" : "m", - "access" : 17, - "descriptor" : "Ljava/util/List;" - } ], - "methods" : [ { - "method" : "sort", - "owner" : "g", - "name" : "m", - "access" : 1, - "descriptor" : "(Ljava/util/Comparator;ZI)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Lgr;Z)V" - } ] -}, { - "class" : "ObjectNode", - "name" : "fk", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "obj", - "owner" : "fk", - "name" : "m", - "access" : 17, - "descriptor" : "Ljava/lang/Object;" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Ljava/lang/Object;)V" - } ] -}, { - "class" : "NodeDeque", - "name" : "je", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "current", - "owner" : "je", - "name" : "f", - "access" : 0, - "descriptor" : "Lgw;" - }, { - "field" : "sentinel", - "owner" : "je", - "name" : "m", - "access" : 1, - "descriptor" : "Lgw;" - } ], - "methods" : [ { - "method" : "addFirst", - "owner" : "je", - "name" : "f", - "access" : 1, - "parameters" : [ "node" ], - "descriptor" : "(Lgw;)V" - }, { - "method" : "addLast", - "owner" : "je", - "name" : "q", - "access" : 1, - "parameters" : [ "node" ], - "descriptor" : "(Lgw;)V" - }, { - "method" : "clear", - "owner" : "je", - "name" : "m", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "first", - "owner" : "je", - "name" : "l", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Lgw;" - }, { - "method" : "last", - "owner" : "je", - "name" : "g", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Lgw;" - }, { - "method" : "next", - "owner" : "je", - "name" : "x", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Lgw;" - }, { - "method" : "previous", - "owner" : "je", - "name" : "e", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Lgw;" - }, { - "method" : "removeFirst", - "owner" : "je", - "name" : "u", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Lgw;" - }, { - "method" : "removeLast", - "owner" : "je", - "name" : "o", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Lgw;" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "Bzip2Decompressor", - "name" : "gk", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "IntegerNode", - "name" : "gn", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "integer", - "owner" : "gn", - "name" : "m", - "access" : 1, - "descriptor" : "I" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(I)V" - } ] -}, { - "class" : "HealthBarUpdate", - "name" : "bg", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "cycle", - "owner" : "bg", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : 2103089795 - }, { - "field" : "cycleOffset", - "owner" : "bg", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : -1876302639 - }, { - "field" : "health", - "owner" : "bg", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 1821995313 - }, { - "field" : "health2", - "owner" : "bg", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -820353645 - } ], - "methods" : [ { - "method" : "set", - "owner" : "bg", - "name" : "m", - "access" : 0, - "descriptor" : "(IIIII)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(IIII)V" - } ] -}, { - "class" : "ItemContainer", - "name" : "bc", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "ids", - "owner" : "bc", - "name" : "f", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "quantities", - "owner" : "bc", - "name" : "q", - "access" : 0, - "descriptor" : "[I" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "WorldMapCacheName", - "name" : "aw", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "name", - "owner" : "aw", - "name" : "u", - "access" : 17, - "descriptor" : "Ljava/lang/String;" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/lang/String;)V" - } ] -}, { - "class" : "AbstractSound", - "name" : "dd", - "super" : "gw", - "access" : 1057, - "interfaces" : [ ], - "fields" : [ { - "field" : "position", - "owner" : "dd", - "name" : "u", - "access" : 0, - "descriptor" : "I" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "ByteArrayPool", - "name" : "gi", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "AbstractSocket", - "name" : "fu", - "super" : "java.lang.Object", - "access" : 1057, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ { - "method" : "available", - "owner" : "fu", - "name" : "q", - "access" : 1025, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "close", - "owner" : "fu", - "name" : "g", - "access" : 1025, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "isAvailable", - "owner" : "fu", - "name" : "f", - "access" : 1025, - "parameters" : [ "length" ], - "descriptor" : "(II)Z" - }, { - "method" : "read", - "owner" : "fu", - "name" : "o", - "access" : 1025, - "parameters" : [ "dst", "dstIndex", "length" ], - "descriptor" : "([BIII)I" - }, { - "method" : "readUnsignedByte", - "owner" : "fu", - "name" : "w", - "access" : 1025, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "write", - "owner" : "fu", - "name" : "u", - "access" : 1025, - "parameters" : [ "src", "srcIndex", "length" ], - "descriptor" : "([BIIB)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "Skeleton", - "name" : "ek", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "count", - "owner" : "ek", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 1875841677 - }, { - "field" : "id", - "owner" : "ek", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : -1634889691 - }, { - "field" : "labels", - "owner" : "ek", - "name" : "w", - "access" : 0, - "descriptor" : "[[I" - }, { - "field" : "transformTypes", - "owner" : "ek", - "name" : "q", - "access" : 0, - "descriptor" : "[I" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(I[B)V" - } ] -}, { - "class" : "TriBool", - "name" : "kd", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "StudioGame", - "name" : "is", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "gc" ], - "fields" : [ { - "field" : "id", - "owner" : "is", - "name" : "l", - "access" : 16, - "descriptor" : "I", - "decoder" : -1688917715 - }, { - "field" : "name", - "owner" : "is", - "name" : "g", - "access" : 17, - "descriptor" : "Ljava/lang/String;" - } ], - "methods" : [ { - "method" : "ordinal", - "owner" : "is", - "name" : "f", - "access" : 1, - "descriptor" : "(B)I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/lang/String;Ljava/lang/String;I)V" - } ] -}, { - "class" : "Varps", - "name" : "hv", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "WorldMapSection", - "name" : "ab", - "super" : "java.lang.Object", - "access" : 1537, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ { - "method" : "containsCoord", - "owner" : "ab", - "name" : "f", - "access" : 1025, - "parameters" : [ "plane", "x", "y" ], - "descriptor" : "(IIIB)Z" - }, { - "method" : "containsPosition", - "owner" : "ab", - "name" : "q", - "access" : 1025, - "parameters" : [ "x", "y" ], - "descriptor" : "(IIB)Z" - }, { - "method" : "coord", - "owner" : "ab", - "name" : "o", - "access" : 1025, - "parameters" : [ "x", "y" ], - "descriptor" : "(III)Lhu;" - }, { - "method" : "expandBounds", - "owner" : "ab", - "name" : "m", - "access" : 1025, - "parameters" : [ "area" ], - "descriptor" : "(Lag;I)V" - }, { - "method" : "position", - "owner" : "ab", - "name" : "w", - "access" : 1025, - "parameters" : [ "plane", "x", "y" ], - "descriptor" : "(IIII)[I" - }, { - "method" : "read", - "owner" : "ab", - "name" : "u", - "access" : 1025, - "parameters" : [ "buffer" ], - "descriptor" : "(Lgr;B)V" - } ], - "constructors" : [ ] -}, { - "class" : "Buddy", - "name" : "ke", - "super" : "js", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "int2", - "owner" : "ke", - "name" : "u", - "access" : 1, - "descriptor" : "I", - "decoder" : 120689297 - }, { - "field" : "rank", - "owner" : "ke", - "name" : "g", - "access" : 1, - "descriptor" : "I", - "decoder" : -304954565 - }, { - "field" : "world0", - "owner" : "ke", - "name" : "o", - "access" : 1, - "descriptor" : "I", - "decoder" : 429472919 - } ], - "methods" : [ { - "method" : "hasWorld", - "owner" : "ke", - "name" : "au", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "set", - "owner" : "ke", - "name" : "an", - "access" : 0, - "descriptor" : "(IIS)V" - }, { - "method" : "world", - "owner" : "ke", - "name" : "az", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "RunException", - "name" : "fx", - "super" : "java.lang.RuntimeException", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "string", - "owner" : "fx", - "name" : "o", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "throwable", - "owner" : "fx", - "name" : "u", - "access" : 0, - "descriptor" : "Ljava/lang/Throwable;" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/lang/Throwable;Ljava/lang/String;)V" - } ] -}, { - "class" : "AbstractRasterProvider", - "name" : "lp", - "super" : "java.lang.Object", - "access" : 1057, - "interfaces" : [ ], - "fields" : [ { - "field" : "height", - "owner" : "lp", - "name" : "o", - "access" : 1, - "descriptor" : "I", - "decoder" : -239960145 - }, { - "field" : "pixels", - "owner" : "lp", - "name" : "q", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "width", - "owner" : "lp", - "name" : "w", - "access" : 1, - "descriptor" : "I", - "decoder" : -560298363 - } ], - "methods" : [ { - "method" : "apply", - "owner" : "lp", - "name" : "b", - "access" : 17, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "draw", - "owner" : "lp", - "name" : "q", - "access" : 1025, - "parameters" : [ "x", "y", "width", "height" ], - "descriptor" : "(IIIIB)V" - }, { - "method" : "drawFull", - "owner" : "lp", - "name" : "f", - "access" : 1025, - "parameters" : [ "x", "y" ], - "descriptor" : "(III)V" - } ], - "constructors" : [ { - "access" : 4, - "descriptor" : "()V" - } ] -}, { - "class" : "WorldMapEvent", - "name" : "ap", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "coord1", - "owner" : "ap", - "name" : "f", - "access" : 1, - "descriptor" : "Lhu;" - }, { - "field" : "coord2", - "owner" : "ap", - "name" : "q", - "access" : 1, - "descriptor" : "Lhu;" - }, { - "field" : "mapElement", - "owner" : "ap", - "name" : "m", - "access" : 1, - "descriptor" : "I", - "decoder" : 264384233 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(ILhu;Lhu;)V" - } ] -}, { - "class" : "DualNode", - "name" : "fn", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "keyDual", - "owner" : "fn", - "name" : "cg", - "access" : 1, - "descriptor" : "J" - }, { - "field" : "nextDual", - "owner" : "fn", - "name" : "cp", - "access" : 1, - "descriptor" : "Lfn;" - }, { - "field" : "previousDual", - "owner" : "fn", - "name" : "cf", - "access" : 1, - "descriptor" : "Lfn;" - } ], - "methods" : [ { - "method" : "removeDual", - "owner" : "fn", - "name" : "cg", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "ClientPacketMarker", - "name" : "gb", - "super" : "java.lang.Object", - "access" : 1537, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "ByteArrayNode", - "name" : "gp", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "byteArray", - "owner" : "gp", - "name" : "m", - "access" : 1, - "descriptor" : "[B" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 1, - "descriptor" : "([B)V" - } ] -}, { - "class" : "ClanMate", - "name" : "jk", - "super" : "ke", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "isFriend0", - "owner" : "jk", - "name" : "m", - "access" : 0, - "descriptor" : "Lkd;" - }, { - "field" : "isIgnored0", - "owner" : "jk", - "name" : "f", - "access" : 0, - "descriptor" : "Lkd;" - } ], - "methods" : [ { - "method" : "clearIsFriend", - "owner" : "jk", - "name" : "m", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "clearIsIgnored", - "owner" : "jk", - "name" : "w", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "fillIsFriend", - "owner" : "jk", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "fillIsIgnored", - "owner" : "jk", - "name" : "u", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "isFriend", - "owner" : "jk", - "name" : "f", - "access" : 17, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "isIgnored", - "owner" : "jk", - "name" : "o", - "access" : 17, - "parameters" : [ ], - "descriptor" : "(I)Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "Login", - "name" : "cu", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "HealthBar", - "name" : "cr", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "definition", - "owner" : "cr", - "name" : "q", - "access" : 0, - "descriptor" : "Lii;" - }, { - "field" : "updates", - "owner" : "cr", - "name" : "w", - "access" : 0, - "descriptor" : "Lja;" - } ], - "methods" : [ { - "method" : "get", - "owner" : "cr", - "name" : "f", - "access" : 0, - "parameters" : [ "cycle" ], - "descriptor" : "(II)Lbg;" - }, { - "method" : "isEmpty", - "owner" : "cr", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "put", - "owner" : "cr", - "name" : "m", - "access" : 0, - "descriptor" : "(IIIIB)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Lii;)V" - } ] -}, { - "class" : "RasterProvider", - "name" : "ai", - "super" : "lp", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "component0", - "owner" : "ai", - "name" : "m", - "access" : 0, - "descriptor" : "Ljava/awt/Component;" - }, { - "field" : "image", - "owner" : "ai", - "name" : "f", - "access" : 0, - "descriptor" : "Ljava/awt/Image;" - } ], - "methods" : [ { - "method" : "draw", - "owner" : "ai", - "name" : "q", - "access" : 17, - "parameters" : [ "x", "y", "width", "height" ], - "descriptor" : "(IIIIB)V" - }, { - "method" : "draw0", - "owner" : "ai", - "name" : "o", - "access" : 16, - "parameters" : [ "graphics", "x", "y", "width", "height" ], - "descriptor" : "(Ljava/awt/Graphics;IIIIB)V" - }, { - "method" : "drawFull", - "owner" : "ai", - "name" : "f", - "access" : 17, - "parameters" : [ "x", "y" ], - "descriptor" : "(III)V" - }, { - "method" : "drawFull0", - "owner" : "ai", - "name" : "w", - "access" : 16, - "parameters" : [ "graphics", "x", "y" ], - "descriptor" : "(Ljava/awt/Graphics;III)V" - }, { - "method" : "setComponent", - "owner" : "ai", - "name" : "m", - "access" : 16, - "descriptor" : "(Ljava/awt/Component;B)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(IILjava/awt/Component;)V" - } ] -}, { - "class" : "Enumerated", - "name" : "gc", - "super" : "java.lang.Object", - "access" : 1537, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ { - "method" : "ordinal", - "owner" : "gc", - "name" : "f", - "access" : 1025, - "parameters" : [ ], - "descriptor" : "(B)I" - } ], - "constructors" : [ ] -}, { - "class" : "Message", - "name" : "bm", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "count", - "owner" : "bm", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : 1597147817 - }, { - "field" : "cycle", - "owner" : "bm", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 1164592791 - }, { - "field" : "isFromFriend0", - "owner" : "bm", - "name" : "u", - "access" : 0, - "descriptor" : "Lkd;" - }, { - "field" : "isFromIgnored0", - "owner" : "bm", - "name" : "g", - "access" : 0, - "descriptor" : "Lkd;" - }, { - "field" : "prefix", - "owner" : "bm", - "name" : "l", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "sender", - "owner" : "bm", - "name" : "w", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "senderUsername", - "owner" : "bm", - "name" : "o", - "access" : 0, - "descriptor" : "Lkp;" - }, { - "field" : "text", - "owner" : "bm", - "name" : "e", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "type", - "owner" : "bm", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : 1223792995 - } ], - "methods" : [ { - "method" : "clearIsFromFriend", - "owner" : "bm", - "name" : "f", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "clearIsFromIgnored", - "owner" : "bm", - "name" : "o", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "fillIsFromFriend", - "owner" : "bm", - "name" : "w", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "fillIsFromIgnored", - "owner" : "bm", - "name" : "g", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(S)V" - }, { - "method" : "fillSenderUsername", - "owner" : "bm", - "name" : "l", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "isFromFriend", - "owner" : "bm", - "name" : "q", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "isFromIgnored", - "owner" : "bm", - "name" : "u", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(B)Z" - }, { - "method" : "set", - "owner" : "bm", - "name" : "m", - "access" : 0, - "parameters" : [ "type", "sender", "prefix", "text" ], - "descriptor" : "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" - } ] -}, { - "class" : "Rasterizer2D", - "name" : "lf", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ { - "access" : 4, - "descriptor" : "()V" - } ] -}, { - "class" : "NanoClock", - "name" : "fp", - "super" : "fa", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "lastTimeNano", - "owner" : "fp", - "name" : "m", - "access" : 0, - "descriptor" : "J", - "decoder" : 7586221391557635221 - } ], - "methods" : [ { - "method" : "mark", - "owner" : "fp", - "name" : "m", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "wait", - "owner" : "fp", - "name" : "f", - "access" : 1, - "parameters" : [ "cycleMs", "minSleepMs" ], - "descriptor" : "(III)I" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "DirectByteArrayCopier", - "name" : "gv", - "super" : "gu", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "directBuffer", - "owner" : "gv", - "name" : "m", - "access" : 0, - "descriptor" : "Ljava/nio/ByteBuffer;" - } ], - "methods" : [ { - "method" : "get", - "owner" : "gv", - "name" : "m", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)[B" - }, { - "method" : "set", - "owner" : "gv", - "name" : "f", - "access" : 0, - "parameters" : [ "array" ], - "descriptor" : "([BI)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "MouseWheel", - "name" : "fv", - "super" : "java.lang.Object", - "access" : 1537, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ { - "method" : "useRotation", - "owner" : "fv", - "name" : "q", - "access" : 1025, - "parameters" : [ ], - "descriptor" : "(I)I" - } ], - "constructors" : [ ] -}, { - "class" : "ReflectionCheck", - "name" : "lw", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "arguments", - "owner" : "lw", - "name" : "m", - "access" : 0, - "descriptor" : "[[[B" - }, { - "field" : "creationErrors", - "owner" : "lw", - "name" : "u", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "fields", - "owner" : "lw", - "name" : "g", - "access" : 0, - "descriptor" : "[Ljava/lang/reflect/Field;" - }, { - "field" : "id", - "owner" : "lw", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -1955146989 - }, { - "field" : "intReplaceValues", - "owner" : "lw", - "name" : "f", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "methods", - "owner" : "lw", - "name" : "l", - "access" : 0, - "descriptor" : "[Ljava/lang/reflect/Method;" - }, { - "field" : "operations", - "owner" : "lw", - "name" : "o", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "size", - "owner" : "lw", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : -1091722075 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "FriendLoginUpdate", - "name" : "kn", - "super" : "gh", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "time", - "owner" : "kn", - "name" : "q", - "access" : 1, - "descriptor" : "I", - "decoder" : -1390885889 - }, { - "field" : "username", - "owner" : "kn", - "name" : "w", - "access" : 1, - "descriptor" : "Lkp;" - }, { - "field" : "world", - "owner" : "kn", - "name" : "o", - "access" : 1, - "descriptor" : "S" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Lkp;I)V" - } ] -}, { - "class" : "WidgetGroupParent", - "name" : "bx", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "group", - "owner" : "bx", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : -707461797 - }, { - "field" : "keep", - "owner" : "bx", - "name" : "q", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "type", - "owner" : "bx", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 1712037041 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "WorldMapIndexCacheLoader", - "name" : "ls", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "cacheName", - "owner" : "ls", - "name" : "o", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "indexCache", - "owner" : "ls", - "name" : "u", - "access" : 0, - "descriptor" : "Lir;" - }, { - "field" : "isLoaded0", - "owner" : "ls", - "name" : "l", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "percentLoaded0", - "owner" : "ls", - "name" : "g", - "access" : 0, - "descriptor" : "I", - "decoder" : 624113115 - } ], - "methods" : [ { - "method" : "isLoaded", - "owner" : "ls", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(S)Z" - }, { - "method" : "load", - "owner" : "ls", - "name" : "f", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "percentLoaded", - "owner" : "ls", - "name" : "w", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "reset", - "owner" : "ls", - "name" : "m", - "access" : 0, - "parameters" : [ "cacheName" ], - "descriptor" : "(Ljava/lang/String;I)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Lir;)V" - } ] -}, { - "class" : "NetCache", - "name" : "iq", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "EnumDefinition", - "name" : "jw", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "defaultInt", - "owner" : "jw", - "name" : "u", - "access" : 1, - "descriptor" : "I", - "decoder" : 1948115527 - }, { - "field" : "defaultString", - "owner" : "jw", - "name" : "o", - "access" : 1, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "intVals", - "owner" : "jw", - "name" : "e", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "keyType", - "owner" : "jw", - "name" : "q", - "access" : 1, - "descriptor" : "C" - }, { - "field" : "keys", - "owner" : "jw", - "name" : "l", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "size0", - "owner" : "jw", - "name" : "g", - "access" : 1, - "descriptor" : "I", - "decoder" : -12324053 - }, { - "field" : "stringVals", - "owner" : "jw", - "name" : "x", - "access" : 1, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "valType", - "owner" : "jw", - "name" : "w", - "access" : 1, - "descriptor" : "C" - } ], - "methods" : [ { - "method" : "read", - "owner" : "jw", - "name" : "f", - "access" : 0, - "descriptor" : "(Lgr;I)V" - }, { - "method" : "readNext", - "owner" : "jw", - "name" : "q", - "access" : 0, - "descriptor" : "(Lgr;II)V" - }, { - "method" : "size", - "owner" : "jw", - "name" : "w", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "DemotingHashTable", - "name" : "ec", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "capacity", - "owner" : "ec", - "name" : "m", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "hashTable", - "owner" : "ec", - "name" : "q", - "access" : 0, - "descriptor" : "Llh;" - }, { - "field" : "queue", - "owner" : "ec", - "name" : "w", - "access" : 0, - "descriptor" : "Ljc;" - }, { - "field" : "remaining", - "owner" : "ec", - "name" : "f", - "access" : 0, - "descriptor" : "I" - } ], - "methods" : [ { - "method" : "clear", - "owner" : "ec", - "name" : "u", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "demote", - "owner" : "ec", - "name" : "o", - "access" : 1, - "parameters" : [ "softeningLevel" ], - "descriptor" : "(I)V" - }, { - "method" : "get", - "owner" : "ec", - "name" : "m", - "access" : 1, - "parameters" : [ "key" ], - "descriptor" : "(J)Ljava/lang/Object;" - }, { - "method" : "put", - "owner" : "ec", - "name" : "w", - "access" : 1, - "parameters" : [ "value", "key", "size" ], - "descriptor" : "(Ljava/lang/Object;JI)V" - }, { - "method" : "remove", - "owner" : "ec", - "name" : "f", - "access" : 0, - "parameters" : [ "key" ], - "descriptor" : "(J)V" - }, { - "method" : "removeWrapper", - "owner" : "ec", - "name" : "q", - "access" : 0, - "parameters" : [ "wrapper" ], - "descriptor" : "(Leu;)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(II)V" - } ] -}, { - "class" : "Wrapper", - "name" : "eu", - "super" : "fn", - "access" : 1057, - "interfaces" : [ ], - "fields" : [ { - "field" : "size", - "owner" : "eu", - "name" : "f", - "access" : 16, - "descriptor" : "I" - } ], - "methods" : [ { - "method" : "get", - "owner" : "eu", - "name" : "m", - "access" : 1024, - "parameters" : [ ], - "descriptor" : "()Ljava/lang/Object;" - }, { - "method" : "isSoft", - "owner" : "eu", - "name" : "f", - "access" : 1024, - "parameters" : [ ], - "descriptor" : "()Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(I)V" - } ] -}, { - "class" : "UserList", - "name" : "km", - "super" : "java.lang.Object", - "access" : 1057, - "interfaces" : [ ], - "fields" : [ { - "field" : "array", - "owner" : "km", - "name" : "u", - "access" : 0, - "descriptor" : "[Ljs;" - }, { - "field" : "capacity", - "owner" : "km", - "name" : "w", - "access" : 16, - "descriptor" : "I", - "decoder" : -2119868987 - }, { - "field" : "comparator", - "owner" : "km", - "name" : "e", - "access" : 0, - "descriptor" : "Ljava/util/Comparator;" - }, { - "field" : "previousUsernamesMap", - "owner" : "km", - "name" : "l", - "access" : 0, - "descriptor" : "Ljava/util/HashMap;" - }, { - "field" : "size0", - "owner" : "km", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : -280101247 - }, { - "field" : "usernamesMap", - "owner" : "km", - "name" : "g", - "access" : 0, - "descriptor" : "Ljava/util/HashMap;" - } ], - "methods" : [ { - "method" : "addComparator", - "owner" : "km", - "name" : "al", - "access" : 17, - "parameters" : [ "c" ], - "descriptor" : "(Ljava/util/Comparator;B)V" - }, { - "method" : "addLast", - "owner" : "km", - "name" : "ag", - "access" : 0, - "parameters" : [ "username", "previousUsername" ], - "descriptor" : "(Lkp;Lkp;I)Ljs;" - }, { - "method" : "addLastNoPreviousUsername", - "owner" : "km", - "name" : "v", - "access" : 0, - "parameters" : [ "username" ], - "descriptor" : "(Lkp;I)Ljs;" - }, { - "method" : "arrayAddLast", - "owner" : "km", - "name" : "ay", - "access" : 16, - "parameters" : [ "user" ], - "descriptor" : "(Ljs;I)V" - }, { - "method" : "arrayRemove", - "owner" : "km", - "name" : "ak", - "access" : 16, - "parameters" : [ "index" ], - "descriptor" : "(II)V" - }, { - "method" : "changeName", - "owner" : "km", - "name" : "av", - "access" : 16, - "parameters" : [ "user", "username", "previousUsername" ], - "descriptor" : "(Ljs;Lkp;Lkp;B)V" - }, { - "method" : "clear", - "owner" : "km", - "name" : "z", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "contains", - "owner" : "km", - "name" : "t", - "access" : 1, - "parameters" : [ "username" ], - "descriptor" : "(Lkp;I)Z" - }, { - "method" : "get", - "owner" : "km", - "name" : "aq", - "access" : 17, - "parameters" : [ "index" ], - "descriptor" : "(II)Ljs;" - }, { - "method" : "getByCurrentUsername", - "owner" : "km", - "name" : "h", - "access" : 0, - "parameters" : [ "username" ], - "descriptor" : "(Lkp;I)Ljs;" - }, { - "method" : "getByPreviousUsername", - "owner" : "km", - "name" : "b", - "access" : 0, - "parameters" : [ "previousUsername" ], - "descriptor" : "(Lkp;I)Ljs;" - }, { - "method" : "getByUsername", - "owner" : "km", - "name" : "y", - "access" : 1, - "parameters" : [ "username" ], - "descriptor" : "(Lkp;I)Ljs;" - }, { - "method" : "indexOf", - "owner" : "km", - "name" : "ar", - "access" : 16, - "parameters" : [ "user" ], - "descriptor" : "(Ljs;I)I" - }, { - "method" : "isFull", - "owner" : "km", - "name" : "s", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "mapPut", - "owner" : "km", - "name" : "ah", - "access" : 16, - "parameters" : [ "user" ], - "descriptor" : "(Ljs;B)V" - }, { - "method" : "mapRemove", - "owner" : "km", - "name" : "ac", - "access" : 16, - "parameters" : [ "user" ], - "descriptor" : "(Ljs;S)V" - }, { - "method" : "newInstance", - "owner" : "km", - "name" : "m", - "access" : 1024, - "parameters" : [ ], - "descriptor" : "(I)Ljs;" - }, { - "method" : "newTypedArray", - "owner" : "km", - "name" : "f", - "access" : 1024, - "parameters" : [ "size" ], - "descriptor" : "(II)[Ljs;" - }, { - "method" : "remove", - "owner" : "km", - "name" : "p", - "access" : 16, - "parameters" : [ "user" ], - "descriptor" : "(Ljs;I)V" - }, { - "method" : "removeByUsername", - "owner" : "km", - "name" : "c", - "access" : 17, - "parameters" : [ "username" ], - "descriptor" : "(Lkp;S)Z" - }, { - "method" : "removeComparator", - "owner" : "km", - "name" : "aw", - "access" : 17, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "size", - "owner" : "km", - "name" : "j", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "sort", - "owner" : "km", - "name" : "aj", - "access" : 17, - "parameters" : [ ], - "descriptor" : "(I)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(I)V" - } ] -}, { - "class" : "Animation", - "name" : "dz", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "hasAlphaTransform", - "owner" : "dz", - "name" : "d", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "skeleton", - "owner" : "dz", - "name" : "o", - "access" : 0, - "descriptor" : "Lek;" - }, { - "field" : "transformCount", - "owner" : "dz", - "name" : "u", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "transformSkeletonLabels", - "owner" : "dz", - "name" : "g", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "transformXs", - "owner" : "dz", - "name" : "l", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "transformYs", - "owner" : "dz", - "name" : "e", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "transformZs", - "owner" : "dz", - "name" : "x", - "access" : 0, - "descriptor" : "[I" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "([BLek;)V" - } ] -}, { - "class" : "ParamKeyDefinition", - "name" : "jb", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "isMembersOnly", - "owner" : "jb", - "name" : "u", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "keyInt", - "owner" : "jb", - "name" : "w", - "access" : 1, - "descriptor" : "I", - "decoder" : 1133042753 - }, { - "field" : "keyString", - "owner" : "jb", - "name" : "o", - "access" : 1, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "type", - "owner" : "jb", - "name" : "q", - "access" : 0, - "descriptor" : "C" - } ], - "methods" : [ { - "method" : "init", - "owner" : "jb", - "name" : "f", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "isString", - "owner" : "jb", - "name" : "o", - "access" : 1, - "descriptor" : "(I)Z" - }, { - "method" : "read", - "owner" : "jb", - "name" : "q", - "access" : 0, - "descriptor" : "(Lgr;I)V" - }, { - "method" : "readNext", - "owner" : "jb", - "name" : "w", - "access" : 0, - "descriptor" : "(Lgr;II)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "NetFileRequest", - "name" : "iz", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "crc", - "owner" : "iz", - "name" : "f", - "access" : 1, - "descriptor" : "I", - "decoder" : 1487103265 - }, { - "field" : "indexCache", - "owner" : "iz", - "name" : "m", - "access" : 1, - "descriptor" : "Lit;" - }, { - "field" : "padding", - "owner" : "iz", - "name" : "q", - "access" : 1, - "descriptor" : "B" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "DualNodeDeque", - "name" : "jp", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "sentinel", - "owner" : "jp", - "name" : "m", - "access" : 0, - "descriptor" : "Lfn;" - } ], - "methods" : [ { - "method" : "addFirst", - "owner" : "jp", - "name" : "m", - "access" : 1, - "descriptor" : "(Lfn;)V" - }, { - "method" : "addLast", - "owner" : "jp", - "name" : "f", - "access" : 1, - "descriptor" : "(Lfn;)V" - }, { - "method" : "clear", - "owner" : "jp", - "name" : "u", - "access" : 1, - "descriptor" : "()V" - }, { - "method" : "last", - "owner" : "jp", - "name" : "o", - "access" : 1, - "descriptor" : "()Lfn;" - }, { - "method" : "removeLast", - "owner" : "jp", - "name" : "w", - "access" : 1, - "descriptor" : "()Lfn;" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "LoginPacket", - "name" : "gl", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "gb" ], - "fields" : [ { - "field" : "id", - "owner" : "gl", - "name" : "u", - "access" : 17, - "descriptor" : "I", - "decoder" : 1743806243 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(II)V" - } ] -}, { - "class" : "Skills", - "name" : "hc", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "AbstractFont", - "name" : "kt", - "super" : "lf", - "access" : 1057, - "interfaces" : [ ], - "fields" : [ { - "field" : "advances", - "owner" : "kt", - "name" : "f", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "ascent", - "owner" : "kt", - "name" : "g", - "access" : 1, - "descriptor" : "I" - }, { - "field" : "heights", - "owner" : "kt", - "name" : "w", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "kerning", - "owner" : "kt", - "name" : "d", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "leftBearings", - "owner" : "kt", - "name" : "o", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "maxAscent", - "owner" : "kt", - "name" : "l", - "access" : 1, - "descriptor" : "I" - }, { - "field" : "maxDescent", - "owner" : "kt", - "name" : "e", - "access" : 1, - "descriptor" : "I" - }, { - "field" : "pixels", - "owner" : "kt", - "name" : "m", - "access" : 0, - "descriptor" : "[[B" - }, { - "field" : "topBearings", - "owner" : "kt", - "name" : "u", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "widths", - "owner" : "kt", - "name" : "q", - "access" : 0, - "descriptor" : "[I" - } ], - "methods" : [ { - "method" : "breakLines", - "owner" : "kt", - "name" : "a", - "access" : 1, - "parameters" : [ "s", "lineWidths", "linesDst" ], - "descriptor" : "(Ljava/lang/String;[I[Ljava/lang/String;)I" - }, { - "method" : "calculateLineJustification", - "owner" : "kt", - "name" : "ar", - "access" : 0, - "parameters" : [ "s", "lineWidth" ], - "descriptor" : "(Ljava/lang/String;I)V" - }, { - "method" : "charWidth", - "owner" : "kt", - "name" : "x", - "access" : 0, - "parameters" : [ "c" ], - "descriptor" : "(C)I" - }, { - "method" : "decodeTag", - "owner" : "kt", - "name" : "av", - "access" : 0, - "parameters" : [ "s" ], - "descriptor" : "(Ljava/lang/String;)V" - }, { - "method" : "draw", - "owner" : "kt", - "name" : "t", - "access" : 1, - "parameters" : [ "s", "x", "y", "color", "shadow" ], - "descriptor" : "(Ljava/lang/String;IIII)V" - }, { - "method" : "draw0", - "owner" : "kt", - "name" : "ac", - "access" : 0, - "parameters" : [ "s", "x", "y" ], - "descriptor" : "(Ljava/lang/String;II)V" - }, { - "method" : "drawAlpha", - "owner" : "kt", - "name" : "y", - "access" : 1, - "parameters" : [ "s", "x", "y", "color", "shadow", "alpha" ], - "descriptor" : "(Ljava/lang/String;IIIII)V" - }, { - "method" : "drawCentered", - "owner" : "kt", - "name" : "b", - "access" : 1, - "parameters" : [ "s", "x", "y", "color", "shadow" ], - "descriptor" : "(Ljava/lang/String;IIII)V" - }, { - "method" : "drawCenteredShake", - "owner" : "kt", - "name" : "ag", - "access" : 1, - "parameters" : [ "s", "x", "y", "color", "shadow", "seed", "seed2" ], - "descriptor" : "(Ljava/lang/String;IIIIII)V" - }, { - "method" : "drawCenteredWave", - "owner" : "kt", - "name" : "p", - "access" : 1, - "parameters" : [ "s", "x", "y", "color", "shadow", "seed" ], - "descriptor" : "(Ljava/lang/String;IIIII)V" - }, { - "method" : "drawCenteredWave2", - "owner" : "kt", - "name" : "v", - "access" : 1, - "parameters" : [ "s", "x", "y", "color", "shadow", "seed" ], - "descriptor" : "(Ljava/lang/String;IIIII)V" - }, { - "method" : "drawGlyph", - "owner" : "kt", - "name" : "m", - "access" : 1024, - "parameters" : [ "pixels", "x", "y", "width", "height", "color" ], - "descriptor" : "([BIIIII)V" - }, { - "method" : "drawGlyphAlpha", - "owner" : "kt", - "name" : "f", - "access" : 1024, - "parameters" : [ "pixels", "x", "y", "width", "height", "color", "alpha" ], - "descriptor" : "([BIIIIII)V" - }, { - "method" : "drawLines", - "owner" : "kt", - "name" : "c", - "access" : 1, - "parameters" : [ "s", "x", "y", "width", "height", "color", "shadow", "xAlignment", "yAlignment", "lineHeight" ], - "descriptor" : "(Ljava/lang/String;IIIIIIIII)I" - }, { - "method" : "drawRandomAlphaAndSpacing", - "owner" : "kt", - "name" : "aq", - "access" : 1, - "parameters" : [ "s", "x", "y", "color", "shadow", "seed" ], - "descriptor" : "(Ljava/lang/String;IIIII)V" - }, { - "method" : "drawRightAligned", - "owner" : "kt", - "name" : "h", - "access" : 1, - "parameters" : [ "s", "x", "y", "color", "shadow" ], - "descriptor" : "(Ljava/lang/String;IIII)V" - }, { - "method" : "drawWithOffsets0", - "owner" : "kt", - "name" : "ay", - "access" : 0, - "parameters" : [ "s", "x", "y", "xs", "ys" ], - "descriptor" : "(Ljava/lang/String;II[I[I)V" - }, { - "method" : "lineCount", - "owner" : "kt", - "name" : "j", - "access" : 1, - "parameters" : [ "s", "lineWidth" ], - "descriptor" : "(Ljava/lang/String;I)I" - }, { - "method" : "lineWidth", - "owner" : "kt", - "name" : "z", - "access" : 1, - "parameters" : [ "s", "lineWidth" ], - "descriptor" : "(Ljava/lang/String;I)I" - }, { - "method" : "readMetrics", - "owner" : "kt", - "name" : "l", - "access" : 0, - "parameters" : [ "bytes" ], - "descriptor" : "([B)V" - }, { - "method" : "reset", - "owner" : "kt", - "name" : "aj", - "access" : 0, - "parameters" : [ "color", "shadow" ], - "descriptor" : "(II)V" - }, { - "method" : "stringWidth", - "owner" : "kt", - "name" : "d", - "access" : 1, - "parameters" : [ "s" ], - "descriptor" : "(Ljava/lang/String;)I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "([B[I[I[I[I[I[[B)V" - }, { - "access" : 0, - "descriptor" : "([B)V" - } ] -}, { - "class" : "UnderlayDefinition", - "name" : "ih", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "hue", - "owner" : "ih", - "name" : "w", - "access" : 1, - "descriptor" : "I", - "decoder" : -1465372343 - }, { - "field" : "hueMultiplier", - "owner" : "ih", - "name" : "g", - "access" : 1, - "descriptor" : "I", - "decoder" : 1484542081 - }, { - "field" : "lightness", - "owner" : "ih", - "name" : "u", - "access" : 1, - "descriptor" : "I", - "decoder" : -1691813081 - }, { - "field" : "rgb", - "owner" : "ih", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -635678213 - }, { - "field" : "saturation", - "owner" : "ih", - "name" : "o", - "access" : 1, - "descriptor" : "I", - "decoder" : 2031118785 - } ], - "methods" : [ { - "method" : "init", - "owner" : "ih", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "read", - "owner" : "ih", - "name" : "w", - "access" : 0, - "descriptor" : "(Lgr;II)V" - }, { - "method" : "readNext", - "owner" : "ih", - "name" : "o", - "access" : 0, - "descriptor" : "(Lgr;III)V" - }, { - "method" : "setHsl", - "owner" : "ih", - "name" : "u", - "access" : 0, - "parameters" : [ "rgb" ], - "descriptor" : "(IB)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "IntHashTable", - "name" : "lv", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "array", - "owner" : "lv", - "name" : "m", - "access" : 0, - "descriptor" : "[I" - } ], - "methods" : [ { - "method" : "get", - "owner" : "lv", - "name" : "m", - "access" : 1, - "descriptor" : "(II)I" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "([I)V" - } ] -}, { - "class" : "VarbitDefinition", - "name" : "ia", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "highBit", - "owner" : "ia", - "name" : "o", - "access" : 1, - "descriptor" : "I", - "decoder" : -1710935305 - }, { - "field" : "lowBit", - "owner" : "ia", - "name" : "w", - "access" : 1, - "descriptor" : "I", - "decoder" : -870948181 - }, { - "field" : "varp", - "owner" : "ia", - "name" : "q", - "access" : 1, - "descriptor" : "I", - "decoder" : 1552575189 - } ], - "methods" : [ { - "method" : "read", - "owner" : "ia", - "name" : "q", - "access" : 0, - "descriptor" : "(Lgr;I)V" - }, { - "method" : "readNext", - "owner" : "ia", - "name" : "w", - "access" : 0, - "descriptor" : "(Lgr;IB)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "IndexStore", - "name" : "ff", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "dataFile", - "owner" : "ff", - "name" : "f", - "access" : 0, - "descriptor" : "Ldy;" - }, { - "field" : "index", - "owner" : "ff", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : -1982523283 - }, { - "field" : "indexFile", - "owner" : "ff", - "name" : "q", - "access" : 0, - "descriptor" : "Ldy;" - }, { - "field" : "maxEntrySize", - "owner" : "ff", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : -748616567 - } ], - "methods" : [ { - "method" : "read", - "owner" : "ff", - "name" : "m", - "access" : 1, - "parameters" : [ "entry" ], - "descriptor" : "(II)[B" - }, { - "method" : "write", - "owner" : "ff", - "name" : "f", - "access" : 1, - "descriptor" : "(I[BII)Z" - }, { - "method" : "write0", - "owner" : "ff", - "name" : "q", - "access" : 0, - "descriptor" : "(I[BIZI)Z" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(ILdy;Ldy;I)V" - } ] -}, { - "class" : "Entity", - "name" : "ex", - "super" : "fn", - "access" : 1057, - "interfaces" : [ ], - "fields" : [ { - "field" : "height", - "owner" : "ex", - "name" : "cw", - "access" : 1, - "descriptor" : "I", - "decoder" : 849583845 - } ], - "methods" : [ { - "method" : "draw", - "owner" : "ex", - "name" : "cy", - "access" : 0, - "parameters" : [ "yaw", "cameraPitchSine", "cameraPitchCosine", "cameraYawSine", "cameraYawCosine", "x", "y", "z", "tag" ], - "descriptor" : "(IIIIIIIIJ)V" - }, { - "method" : "getModel", - "owner" : "ex", - "name" : "e", - "access" : 4, - "parameters" : [ ], - "descriptor" : "(I)Ldu;" - } ], - "constructors" : [ { - "access" : 4, - "descriptor" : "()V" - } ] -}, { - "class" : "DirectWrapper", - "name" : "ew", - "super" : "eu", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "obj", - "owner" : "ew", - "name" : "m", - "access" : 0, - "descriptor" : "Ljava/lang/Object;" - } ], - "methods" : [ { - "method" : "get", - "owner" : "ew", - "name" : "m", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()Ljava/lang/Object;" - }, { - "method" : "isSoft", - "owner" : "ew", - "name" : "f", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/lang/Object;I)V" - } ] -}, { - "class" : "FloorDecoration", - "name" : "do", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "entity", - "owner" : "do", - "name" : "o", - "access" : 1, - "descriptor" : "Lex;" - }, { - "field" : "flags", - "owner" : "do", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : -1241982749 - }, { - "field" : "tag", - "owner" : "do", - "name" : "m", - "access" : 1, - "descriptor" : "J", - "decoder" : -5063688075016130813 - }, { - "field" : "tileHeight", - "owner" : "do", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : -1358154703 - }, { - "field" : "x", - "owner" : "do", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : 1309467119 - }, { - "field" : "y", - "owner" : "do", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : 318503957 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "InvDefinition", - "name" : "ib", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "size", - "owner" : "ib", - "name" : "q", - "access" : 1, - "descriptor" : "I", - "decoder" : 1358868971 - } ], - "methods" : [ { - "method" : "read", - "owner" : "ib", - "name" : "f", - "access" : 0, - "descriptor" : "(Lgr;I)V" - }, { - "method" : "readNext", - "owner" : "ib", - "name" : "q", - "access" : 0, - "descriptor" : "(Lgr;II)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "BoundaryObject", - "name" : "ej", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "entity1", - "owner" : "ej", - "name" : "u", - "access" : 1, - "descriptor" : "Lex;" - }, { - "field" : "entity2", - "owner" : "ej", - "name" : "g", - "access" : 1, - "descriptor" : "Lex;" - }, { - "field" : "flags", - "owner" : "ej", - "name" : "e", - "access" : 0, - "descriptor" : "I", - "decoder" : -693868549 - }, { - "field" : "orientationA", - "owner" : "ej", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : 1724480965 - }, { - "field" : "orientationB", - "owner" : "ej", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : -969316473 - }, { - "field" : "tag", - "owner" : "ej", - "name" : "l", - "access" : 1, - "descriptor" : "J", - "decoder" : -4401157754236673285 - }, { - "field" : "tileHeight", - "owner" : "ej", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : -9307913 - }, { - "field" : "x", - "owner" : "ej", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 860688417 - }, { - "field" : "y", - "owner" : "ej", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -260081891 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "Interpreter", - "name" : "bv", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "PcmPlayerProvider", - "name" : "cz", - "super" : "java.lang.Object", - "access" : 1537, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ { - "method" : "player", - "owner" : "cz", - "name" : "m", - "access" : 1025, - "descriptor" : "(B)Lco;" - } ], - "constructors" : [ ] -}, { - "class" : "SpriteMask", - "name" : "hp", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "height", - "owner" : "hp", - "name" : "f", - "access" : 17, - "descriptor" : "I", - "decoder" : -193097093 - }, { - "field" : "width", - "owner" : "hp", - "name" : "m", - "access" : 17, - "descriptor" : "I", - "decoder" : 574541221 - }, { - "field" : "xStarts", - "owner" : "hp", - "name" : "w", - "access" : 17, - "descriptor" : "[I" - }, { - "field" : "xWidths", - "owner" : "hp", - "name" : "q", - "access" : 17, - "descriptor" : "[I" - } ], - "methods" : [ { - "method" : "contains", - "owner" : "hp", - "name" : "m", - "access" : 1, - "parameters" : [ "x", "y" ], - "descriptor" : "(III)Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(II[I[II)V" - } ] -}, { - "class" : "Tiles", - "name" : "bq", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "ChatChannel", - "name" : "cp", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "count", - "owner" : "cp", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : 612486877 - }, { - "field" : "messages", - "owner" : "cp", - "name" : "f", - "access" : 0, - "descriptor" : "[Lbm;" - } ], - "methods" : [ { - "method" : "addMessage", - "owner" : "cp", - "name" : "m", - "access" : 0, - "parameters" : [ "type", "sender", "text", "prefix" ], - "descriptor" : "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbm;" - }, { - "method" : "getMessage", - "owner" : "cp", - "name" : "f", - "access" : 0, - "parameters" : [ "index" ], - "descriptor" : "(II)Lbm;" - }, { - "method" : "size", - "owner" : "cp", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "PlatformInfoProvider", - "name" : "lm", - "super" : "java.lang.Object", - "access" : 1537, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ { - "method" : "get", - "owner" : "lm", - "name" : "m", - "access" : 1025, - "parameters" : [ ], - "descriptor" : "(I)Llb;" - } ], - "constructors" : [ ] -}, { - "class" : "IgnoreList", - "name" : "kj", - "super" : "km", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "loginType", - "owner" : "kj", - "name" : "q", - "access" : 16, - "descriptor" : "Llx;" - } ], - "methods" : [ { - "method" : "newInstance", - "owner" : "kj", - "name" : "m", - "access" : 0, - "descriptor" : "(I)Ljs;" - }, { - "method" : "newTypedArray", - "owner" : "kj", - "name" : "f", - "access" : 0, - "descriptor" : "(II)[Ljs;" - }, { - "method" : "read", - "owner" : "kj", - "name" : "q", - "access" : 1, - "parameters" : [ "buffer", "n" ], - "descriptor" : "(Lgr;IB)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Llx;)V" - } ] -}, { - "class" : "WallDecoration", - "name" : "eq", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "entity1", - "owner" : "eq", - "name" : "l", - "access" : 1, - "descriptor" : "Lex;" - }, { - "field" : "entity2", - "owner" : "eq", - "name" : "e", - "access" : 1, - "descriptor" : "Lex;" - }, { - "field" : "flags", - "owner" : "eq", - "name" : "d", - "access" : 0, - "descriptor" : "I", - "decoder" : -1164153171 - }, { - "field" : "int7", - "owner" : "eq", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : -303827911 - }, { - "field" : "orientation", - "owner" : "eq", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : -183359389 - }, { - "field" : "tag", - "owner" : "eq", - "name" : "x", - "access" : 1, - "descriptor" : "J", - "decoder" : 3167575053900974839 - }, { - "field" : "tileHeight", - "owner" : "eq", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : 1781638945 - }, { - "field" : "x", - "owner" : "eq", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 1411967127 - }, { - "field" : "xOffset", - "owner" : "eq", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : 1927462659 - }, { - "field" : "y", - "owner" : "eq", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -629971645 - }, { - "field" : "yOffset", - "owner" : "eq", - "name" : "g", - "access" : 0, - "descriptor" : "I", - "decoder" : -1531207607 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "DynamicObject", - "name" : "cf", - "super" : "ex", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "cycleStart", - "owner" : "cf", - "name" : "e", - "access" : 0, - "descriptor" : "I", - "decoder" : -1596313489 - }, { - "field" : "frame", - "owner" : "cf", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : -2017547185 - }, { - "field" : "id", - "owner" : "cf", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : 1369707199 - }, { - "field" : "orientation", - "owner" : "cf", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : 141031459 - }, { - "field" : "plane", - "owner" : "cf", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : 844945979 - }, { - "field" : "sequenceDefinition", - "owner" : "cf", - "name" : "g", - "access" : 0, - "descriptor" : "Ljh;" - }, { - "field" : "type", - "owner" : "cf", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 1713856147 - }, { - "field" : "x", - "owner" : "cf", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : -351084819 - }, { - "field" : "y", - "owner" : "cf", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : -126308963 - } ], - "methods" : [ { - "method" : "getModel", - "owner" : "cf", - "name" : "e", - "access" : 20, - "parameters" : [ ], - "descriptor" : "(I)Ldu;" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(IIIIIIIZLex;)V" - } ] -}, { - "class" : "StructDefinition", - "name" : "jq", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "params", - "owner" : "jq", - "name" : "q", - "access" : 0, - "descriptor" : "Llh;" - } ], - "methods" : [ { - "method" : "getIntParam", - "owner" : "jq", - "name" : "o", - "access" : 1, - "descriptor" : "(IIB)I" - }, { - "method" : "getStringParam", - "owner" : "jq", - "name" : "u", - "access" : 1, - "descriptor" : "(ILjava/lang/String;I)Ljava/lang/String;" - }, { - "method" : "init", - "owner" : "jq", - "name" : "f", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "read", - "owner" : "jq", - "name" : "q", - "access" : 0, - "descriptor" : "(Lgr;I)V" - }, { - "method" : "readNext", - "owner" : "jq", - "name" : "w", - "access" : 0, - "descriptor" : "(Lgr;II)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "SoftWrapper", - "name" : "ef", - "super" : "eu", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "ref", - "owner" : "ef", - "name" : "m", - "access" : 0, - "descriptor" : "Ljava/lang/ref/SoftReference;" - } ], - "methods" : [ { - "method" : "get", - "owner" : "ef", - "name" : "m", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()Ljava/lang/Object;" - }, { - "method" : "isSoft", - "owner" : "ef", - "name" : "f", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/lang/Object;I)V" - } ] -}, { - "class" : "DesktopPlatformInfoProvider", - "name" : "lu", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "lm" ], - "fields" : [ ], - "methods" : [ { - "method" : "get", - "owner" : "lu", - "name" : "m", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Llb;" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "GroundItem", - "name" : "ck", - "super" : "ex", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "id", - "owner" : "ck", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : 893970699 - }, { - "field" : "quantity", - "owner" : "ck", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 454094667 - } ], - "methods" : [ { - "method" : "getModel", - "owner" : "ck", - "name" : "e", - "access" : 20, - "parameters" : [ ], - "descriptor" : "(I)Ldu;" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "VarpDefinition", - "name" : "ix", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "type", - "owner" : "ix", - "name" : "w", - "access" : 1, - "descriptor" : "I", - "decoder" : -1792568421 - } ], - "methods" : [ { - "method" : "read", - "owner" : "ix", - "name" : "f", - "access" : 0, - "descriptor" : "(Lgr;B)V" - }, { - "method" : "readNext", - "owner" : "ix", - "name" : "q", - "access" : 0, - "descriptor" : "(Lgr;II)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "Rasterizer3D", - "name" : "et", - "super" : "lf", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "AttackOption", - "name" : "cj", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "gc" ], - "fields" : [ { - "field" : "id", - "owner" : "cj", - "name" : "o", - "access" : 16, - "descriptor" : "I", - "decoder" : -1461217963 - } ], - "methods" : [ { - "method" : "ordinal", - "owner" : "cj", - "name" : "f", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(I)V" - } ] -}, { - "class" : "GroundItemPile", - "name" : "dr", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "first", - "owner" : "dr", - "name" : "o", - "access" : 0, - "descriptor" : "Lex;" - }, { - "field" : "height", - "owner" : "dr", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : -1659262853 - }, { - "field" : "second", - "owner" : "dr", - "name" : "m", - "access" : 0, - "descriptor" : "Lex;" - }, { - "field" : "tag", - "owner" : "dr", - "name" : "g", - "access" : 0, - "descriptor" : "J", - "decoder" : -3696674445500472687 - }, { - "field" : "third", - "owner" : "dr", - "name" : "u", - "access" : 0, - "descriptor" : "Lex;" - }, { - "field" : "tileHeight", - "owner" : "dr", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : -325682933 - }, { - "field" : "x", - "owner" : "dr", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -1363136655 - }, { - "field" : "y", - "owner" : "dr", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : 968072997 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "Font", - "name" : "kk", - "super" : "kt", - "access" : 49, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ { - "method" : "drawGlyph", - "owner" : "kk", - "name" : "m", - "access" : 16, - "descriptor" : "([BIIIII)V" - }, { - "method" : "drawGlyphAlpha", - "owner" : "kk", - "name" : "f", - "access" : 16, - "descriptor" : "([BIIIIII)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "([B[I[I[I[I[I[[B)V" - }, { - "access" : 1, - "descriptor" : "([B)V" - } ] -}, { - "class" : "Messages", - "name" : "cw", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "Frames", - "name" : "en", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "frames", - "owner" : "en", - "name" : "m", - "access" : 0, - "descriptor" : "[Ldz;" - } ], - "methods" : [ { - "method" : "hasAlphaTransform", - "owner" : "en", - "name" : "m", - "access" : 1, - "parameters" : [ "frame" ], - "descriptor" : "(II)Z" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Lir;Lir;IZ)V" - } ] -}, { - "class" : "ScriptFrame", - "name" : "bn", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "intLocals", - "owner" : "bn", - "name" : "q", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "pc", - "owner" : "bn", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : -1715361849 - }, { - "field" : "script", - "owner" : "bn", - "name" : "m", - "access" : 0, - "descriptor" : "Lcg;" - }, { - "field" : "stringLocals", - "owner" : "bn", - "name" : "w", - "access" : 0, - "descriptor" : "[Ljava/lang/String;" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "GraphicsObject", - "name" : "bw", - "super" : "ex", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "cycleStart", - "owner" : "bw", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : -1245488067 - }, { - "field" : "frame", - "owner" : "bw", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : 1541221595 - }, { - "field" : "frameCycle", - "owner" : "bw", - "name" : "e", - "access" : 0, - "descriptor" : "I", - "decoder" : -1950327625 - }, { - "field" : "height", - "owner" : "bw", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : 1156757009 - }, { - "field" : "id", - "owner" : "bw", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : -289084031 - }, { - "field" : "isFinished", - "owner" : "bw", - "name" : "x", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "plane", - "owner" : "bw", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : 432847573 - }, { - "field" : "sequenceDefinition", - "owner" : "bw", - "name" : "g", - "access" : 0, - "descriptor" : "Ljh;" - }, { - "field" : "x", - "owner" : "bw", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : -1189549567 - }, { - "field" : "y", - "owner" : "bw", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : 1416438985 - } ], - "methods" : [ { - "method" : "advance", - "owner" : "bw", - "name" : "m", - "access" : 16, - "parameters" : [ "cycles" ], - "descriptor" : "(II)V" - }, { - "method" : "getModel", - "owner" : "bw", - "name" : "e", - "access" : 20, - "parameters" : [ ], - "descriptor" : "(I)Ldu;" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(IIIIIII)V" - } ] -}, { - "class" : "IndexStoreAction", - "name" : "ik", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "data", - "owner" : "ik", - "name" : "f", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "indexCache", - "owner" : "ik", - "name" : "w", - "access" : 0, - "descriptor" : "Lit;" - }, { - "field" : "indexStore", - "owner" : "ik", - "name" : "q", - "access" : 0, - "descriptor" : "Lff;" - }, { - "field" : "type", - "owner" : "ik", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : -1942326733 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "Projectile", - "name" : "cb", - "super" : "ex", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "accelerationZ", - "owner" : "cb", - "name" : "y", - "access" : 0, - "descriptor" : "D" - }, { - "field" : "cycleEnd", - "owner" : "cb", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : 2121946763 - }, { - "field" : "cycleStart", - "owner" : "cb", - "name" : "g", - "access" : 0, - "descriptor" : "I", - "decoder" : 358196599 - }, { - "field" : "frame", - "owner" : "cb", - "name" : "r", - "access" : 0, - "descriptor" : "I", - "decoder" : -377214997 - }, { - "field" : "frameCycle", - "owner" : "cb", - "name" : "p", - "access" : 0, - "descriptor" : "I", - "decoder" : -742871951 - }, { - "field" : "id", - "owner" : "cb", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : 2111080001 - }, { - "field" : "int3", - "owner" : "cb", - "name" : "e", - "access" : 0, - "descriptor" : "I", - "decoder" : -769539171 - }, { - "field" : "int4", - "owner" : "cb", - "name" : "x", - "access" : 0, - "descriptor" : "I", - "decoder" : -2074328969 - }, { - "field" : "int5", - "owner" : "cb", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : -675081925 - }, { - "field" : "isMoving", - "owner" : "cb", - "name" : "k", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "pitch", - "owner" : "cb", - "name" : "b", - "access" : 0, - "descriptor" : "I", - "decoder" : -2072120189 - }, { - "field" : "plane", - "owner" : "cb", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : -1038876505 - }, { - "field" : "sequenceDefinition", - "owner" : "cb", - "name" : "c", - "access" : 0, - "descriptor" : "Ljh;" - }, { - "field" : "sourceX", - "owner" : "cb", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : 1652455041 - }, { - "field" : "sourceY", - "owner" : "cb", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : -1421996173 - }, { - "field" : "sourceZ", - "owner" : "cb", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : -4446033 - }, { - "field" : "speed", - "owner" : "cb", - "name" : "s", - "access" : 0, - "descriptor" : "D" - }, { - "field" : "speedX", - "owner" : "cb", - "name" : "z", - "access" : 0, - "descriptor" : "D" - }, { - "field" : "speedY", - "owner" : "cb", - "name" : "j", - "access" : 0, - "descriptor" : "D" - }, { - "field" : "speedZ", - "owner" : "cb", - "name" : "t", - "access" : 0, - "descriptor" : "D" - }, { - "field" : "targetIndex", - "owner" : "cb", - "name" : "d", - "access" : 0, - "descriptor" : "I", - "decoder" : 551413977 - }, { - "field" : "x", - "owner" : "cb", - "name" : "n", - "access" : 0, - "descriptor" : "D" - }, { - "field" : "y", - "owner" : "cb", - "name" : "i", - "access" : 0, - "descriptor" : "D" - }, { - "field" : "yaw", - "owner" : "cb", - "name" : "h", - "access" : 0, - "descriptor" : "I", - "decoder" : 1281680175 - }, { - "field" : "z", - "owner" : "cb", - "name" : "a", - "access" : 0, - "descriptor" : "D" - } ], - "methods" : [ { - "method" : "advance", - "owner" : "cb", - "name" : "f", - "access" : 16, - "parameters" : [ "cycles" ], - "descriptor" : "(II)V" - }, { - "method" : "getModel", - "owner" : "cb", - "name" : "e", - "access" : 20, - "parameters" : [ ], - "descriptor" : "(I)Ldu;" - }, { - "method" : "setDestination", - "owner" : "cb", - "name" : "m", - "access" : 16, - "parameters" : [ "x", "y", "height", "cycle" ], - "descriptor" : "(IIIII)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(IIIIIIIIIII)V" - } ] -}, { - "class" : "DevicePcmPlayerProvider", - "name" : "az", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "cz" ], - "fields" : [ ], - "methods" : [ { - "method" : "player", - "owner" : "az", - "name" : "m", - "access" : 1, - "descriptor" : "(B)Lco;" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "ViewportMouse", - "name" : "dm", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "Players", - "name" : "cq", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ ], - "constructors" : [ ] -}, { - "class" : "WorldComparator", - "name" : "u", - "super" : "java.lang.Object", - "access" : 48, - "interfaces" : [ "java.util.Comparator" ], - "fields" : [ ], - "methods" : [ { - "method" : "__m_0", - "owner" : "u", - "name" : "m", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ll;Ll;I)I" - }, { - "method" : "__compare_1", - "owner" : "u", - "name" : "compare", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" - }, { - "method" : "__equals_2", - "owner" : "u", - "name" : "equals", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/lang/Object;)Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "GrandExchangeEvent", - "name" : "l", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "grandExchangeOffer", - "owner" : "l", - "name" : "q", - "access" : 17, - "descriptor" : "Lx;" - }, { - "field" : "string1", - "owner" : "l", - "name" : "w", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "string2", - "owner" : "l", - "name" : "o", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "world", - "owner" : "l", - "name" : "m", - "access" : 17, - "descriptor" : "I", - "decoder" : -633089807 - }, { - "field" : "__f", - "owner" : "l", - "name" : "f", - "access" : 17, - "descriptor" : "J", - "decoder" : -6503890758391257651 - } ], - "methods" : [ { - "method" : "__m_3", - "owner" : "l", - "name" : "m", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Ljava/lang/String;" - }, { - "method" : "__f_4", - "owner" : "l", - "name" : "f", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Ljava/lang/String;" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Lgr;BI)V" - } ] -}, { - "class" : "TotalQuantityComparator", - "name" : "e", - "super" : "java.lang.Object", - "access" : 48, - "interfaces" : [ "java.util.Comparator" ], - "fields" : [ ], - "methods" : [ { - "method" : "__m_5", - "owner" : "e", - "name" : "m", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ll;Ll;I)I" - }, { - "method" : "__compare_6", - "owner" : "e", - "name" : "compare", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" - }, { - "method" : "__equals_7", - "owner" : "e", - "name" : "equals", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/lang/Object;)Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "GrandExchangeOffer", - "name" : "x", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "currentPrice", - "owner" : "x", - "name" : "u", - "access" : 1, - "descriptor" : "I", - "decoder" : 396420073 - }, { - "field" : "currentQuantity", - "owner" : "x", - "name" : "o", - "access" : 1, - "descriptor" : "I", - "decoder" : 1413132419 - }, { - "field" : "id", - "owner" : "x", - "name" : "f", - "access" : 1, - "descriptor" : "I", - "decoder" : 1136727241 - }, { - "field" : "state", - "owner" : "x", - "name" : "m", - "access" : 0, - "descriptor" : "B" - }, { - "field" : "totalQuantity", - "owner" : "x", - "name" : "w", - "access" : 1, - "descriptor" : "I", - "decoder" : 562564821 - }, { - "field" : "unitPrice", - "owner" : "x", - "name" : "q", - "access" : 1, - "descriptor" : "I", - "decoder" : -1627453165 - } ], - "methods" : [ { - "method" : "status", - "owner" : "x", - "name" : "q", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "type", - "owner" : "x", - "name" : "w", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__f_8", - "owner" : "x", - "name" : "f", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/lang/Integer;I)V" - }, { - "method" : "__o_9", - "owner" : "x", - "name" : "o", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(II)V" - }, { - "method" : "__u_10", - "owner" : "x", - "name" : "u", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(II)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - }, { - "access" : 1, - "descriptor" : "(Lgr;Z)V" - } ] -}, { - "class" : "UnitPriceComparator", - "name" : "d", - "super" : "java.lang.Object", - "access" : 48, - "interfaces" : [ "java.util.Comparator" ], - "fields" : [ ], - "methods" : [ { - "method" : "__m_11", - "owner" : "d", - "name" : "m", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ll;Ll;I)I" - }, { - "method" : "__compare_12", - "owner" : "d", - "name" : "compare", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" - }, { - "method" : "__equals_13", - "owner" : "d", - "name" : "equals", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/lang/Object;)Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "WorldMapLabelSize", - "name" : "s", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__o", - "owner" : "s", - "name" : "o", - "access" : 16, - "descriptor" : "I", - "decoder" : 707828941 - }, { - "field" : "__u", - "owner" : "s", - "name" : "u", - "access" : 16, - "descriptor" : "I", - "decoder" : -422937451 - }, { - "field" : "__w", - "owner" : "s", - "name" : "w", - "access" : 16, - "descriptor" : "I", - "decoder" : 1252293513 - } ], - "methods" : [ { - "method" : "__f_14", - "owner" : "s", - "name" : "f", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(FI)Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(III)V" - } ] -}, { - "class" : "WorldMapIcon1", - "name" : "t", - "super" : "ak", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "label0", - "owner" : "t", - "name" : "f", - "access" : 16, - "descriptor" : "Laj;" - }, { - "field" : "__m", - "owner" : "t", - "name" : "m", - "access" : 16, - "descriptor" : "I", - "decoder" : -1722323621 - }, { - "field" : "__q", - "owner" : "t", - "name" : "q", - "access" : 16, - "descriptor" : "I", - "decoder" : 364253793 - }, { - "field" : "__w", - "owner" : "t", - "name" : "w", - "access" : 16, - "descriptor" : "I", - "decoder" : -362031241 - } ], - "methods" : [ { - "method" : "__m_15", - "owner" : "t", - "name" : "m", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__f_16", - "owner" : "t", - "name" : "f", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Laj;" - }, { - "method" : "__q_17", - "owner" : "t", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)I" - }, { - "method" : "__w_18", - "owner" : "t", - "name" : "w", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Lhu;Lhu;ILaj;)V" - } ] -}, { - "class" : "WorldMapSection0", - "name" : "y", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "ab" ], - "fields" : [ { - "field" : "__d", - "owner" : "y", - "name" : "d", - "access" : 0, - "descriptor" : "I", - "decoder" : -799353317 - }, { - "field" : "__e", - "owner" : "y", - "name" : "e", - "access" : 0, - "descriptor" : "I", - "decoder" : -1022177315 - }, { - "field" : "__f", - "owner" : "y", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 1299225715 - }, { - "field" : "__g", - "owner" : "y", - "name" : "g", - "access" : 0, - "descriptor" : "I", - "decoder" : -150870205 - }, { - "field" : "__i", - "owner" : "y", - "name" : "i", - "access" : 0, - "descriptor" : "I", - "decoder" : 1345061881 - }, { - "field" : "__k", - "owner" : "y", - "name" : "k", - "access" : 0, - "descriptor" : "I", - "decoder" : -1388959491 - }, { - "field" : "__l", - "owner" : "y", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : 1009718107 - }, { - "field" : "__m", - "owner" : "y", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : -2011838881 - }, { - "field" : "__n", - "owner" : "y", - "name" : "n", - "access" : 0, - "descriptor" : "I", - "decoder" : -1657956317 - }, { - "field" : "__o", - "owner" : "y", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : -671345527 - }, { - "field" : "__q", - "owner" : "y", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : 82600709 - }, { - "field" : "__u", - "owner" : "y", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : 529427495 - }, { - "field" : "__w", - "owner" : "y", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : -477370575 - }, { - "field" : "__x", - "owner" : "y", - "name" : "x", - "access" : 0, - "descriptor" : "I", - "decoder" : -1397517463 - } ], - "methods" : [ { - "method" : "__m_19", - "owner" : "y", - "name" : "m", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Lag;I)V" - }, { - "method" : "__f_20", - "owner" : "y", - "name" : "f", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(IIIB)Z" - }, { - "method" : "__q_21", - "owner" : "y", - "name" : "q", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(IIB)Z" - }, { - "method" : "__w_22", - "owner" : "y", - "name" : "w", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(IIII)[I" - }, { - "method" : "__o_23", - "owner" : "y", - "name" : "o", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(III)Lhu;" - }, { - "method" : "__u_24", - "owner" : "y", - "name" : "u", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Lgr;B)V" - }, { - "method" : "__g_25", - "owner" : "y", - "name" : "g", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "WorldMapSectionType", - "name" : "h", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "gc" ], - "fields" : [ { - "field" : "id", - "owner" : "h", - "name" : "u", - "access" : 16, - "descriptor" : "B" - }, { - "field" : "type", - "owner" : "h", - "name" : "o", - "access" : 16, - "descriptor" : "I", - "decoder" : 738759853 - } ], - "methods" : [ { - "method" : "__f_26", - "owner" : "h", - "name" : "f", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(IB)V" - } ] -}, { - "class" : "WorldMapIcon2", - "name" : "r", - "super" : "ak", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "label0", - "owner" : "r", - "name" : "w", - "access" : 0, - "descriptor" : "Laj;" - }, { - "field" : "__o", - "owner" : "r", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : 927871683 - }, { - "field" : "__q", - "owner" : "r", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -25914375 - }, { - "field" : "__u", - "owner" : "r", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : -1431936619 - }, { - "field" : "__f", - "owner" : "r", - "name" : "f", - "access" : 16, - "descriptor" : "Lav;" - }, { - "field" : "__m", - "owner" : "r", - "name" : "m", - "access" : 16, - "descriptor" : "I", - "decoder" : -985436813 - } ], - "methods" : [ { - "method" : "__z_27", - "owner" : "r", - "name" : "z", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__m_28", - "owner" : "r", - "name" : "m", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__f_29", - "owner" : "r", - "name" : "f", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Laj;" - }, { - "method" : "__q_30", - "owner" : "r", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)I" - }, { - "method" : "__w_31", - "owner" : "r", - "name" : "w", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Lhu;Lhu;ILav;)V" - } ] -}, { - "class" : "WorldMapSection3", - "name" : "p", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "ab" ], - "fields" : [ { - "field" : "__e", - "owner" : "p", - "name" : "e", - "access" : 0, - "descriptor" : "I", - "decoder" : 395786901 - }, { - "field" : "__f", - "owner" : "p", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : -1622972483 - }, { - "field" : "__g", - "owner" : "p", - "name" : "g", - "access" : 0, - "descriptor" : "I", - "decoder" : 1016557381 - }, { - "field" : "__l", - "owner" : "p", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : 884736611 - }, { - "field" : "__m", - "owner" : "p", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : 1389733201 - }, { - "field" : "__o", - "owner" : "p", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : 1257151629 - }, { - "field" : "__q", - "owner" : "p", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : 702057599 - }, { - "field" : "__u", - "owner" : "p", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : -1351623663 - }, { - "field" : "__w", - "owner" : "p", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : -1068088609 - }, { - "field" : "__x", - "owner" : "p", - "name" : "x", - "access" : 0, - "descriptor" : "I", - "decoder" : -627081155 - } ], - "methods" : [ { - "method" : "__m_32", - "owner" : "p", - "name" : "m", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Lag;I)V" - }, { - "method" : "__f_33", - "owner" : "p", - "name" : "f", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(IIIB)Z" - }, { - "method" : "__q_34", - "owner" : "p", - "name" : "q", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(IIB)Z" - }, { - "method" : "__w_35", - "owner" : "p", - "name" : "w", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(IIII)[I" - }, { - "method" : "__o_36", - "owner" : "p", - "name" : "o", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(III)Lhu;" - }, { - "method" : "__u_37", - "owner" : "p", - "name" : "u", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Lgr;B)V" - }, { - "method" : "__g_38", - "owner" : "p", - "name" : "g", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "WorldMapArea", - "name" : "ag", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "archiveName0", - "owner" : "ag", - "name" : "f", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "id0", - "owner" : "ag", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : 1232579503 - }, { - "field" : "isMain0", - "owner" : "ag", - "name" : "d", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "maxX0", - "owner" : "ag", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : 225384859 - }, { - "field" : "maxY0", - "owner" : "ag", - "name" : "x", - "access" : 0, - "descriptor" : "I", - "decoder" : 1025105175 - }, { - "field" : "minX0", - "owner" : "ag", - "name" : "g", - "access" : 0, - "descriptor" : "I", - "decoder" : 1238532539 - }, { - "field" : "minY0", - "owner" : "ag", - "name" : "e", - "access" : 0, - "descriptor" : "I", - "decoder" : 963380367 - }, { - "field" : "name0", - "owner" : "ag", - "name" : "q", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "origin0", - "owner" : "ag", - "name" : "u", - "access" : 0, - "descriptor" : "Lhu;" - }, { - "field" : "sections", - "owner" : "ag", - "name" : "k", - "access" : 0, - "descriptor" : "Ljava/util/LinkedList;" - }, { - "field" : "zoom0", - "owner" : "ag", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : 196514055 - }, { - "field" : "__w", - "owner" : "ag", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : 986239133 - } ], - "methods" : [ { - "method" : "archiveName", - "owner" : "ag", - "name" : "x", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)Ljava/lang/String;" - }, { - "method" : "containsCoord", - "owner" : "ag", - "name" : "q", - "access" : 1, - "parameters" : [ "plane", "x", "y" ], - "descriptor" : "(IIII)Z" - }, { - "method" : "containsPosition", - "owner" : "ag", - "name" : "w", - "access" : 1, - "parameters" : [ "x", "y" ], - "descriptor" : "(III)Z" - }, { - "method" : "coord", - "owner" : "ag", - "name" : "u", - "access" : 1, - "parameters" : [ "x", "y" ], - "descriptor" : "(III)Lhu;" - }, { - "method" : "id", - "owner" : "ag", - "name" : "l", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "isMain", - "owner" : "ag", - "name" : "e", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)Z" - }, { - "method" : "maxX", - "owner" : "ag", - "name" : "s", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)I" - }, { - "method" : "maxY", - "owner" : "ag", - "name" : "y", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "minX", - "owner" : "ag", - "name" : "j", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)I" - }, { - "method" : "minY", - "owner" : "ag", - "name" : "t", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "name", - "owner" : "ag", - "name" : "d", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)Ljava/lang/String;" - }, { - "method" : "origin", - "owner" : "ag", - "name" : "p", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Lhu;" - }, { - "method" : "originPlane", - "owner" : "ag", - "name" : "b", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "originX", - "owner" : "ag", - "name" : "h", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)I" - }, { - "method" : "originY", - "owner" : "ag", - "name" : "c", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "position", - "owner" : "ag", - "name" : "o", - "access" : 1, - "parameters" : [ "plane", "x", "y" ], - "descriptor" : "(IIII)[I" - }, { - "method" : "read", - "owner" : "ag", - "name" : "m", - "access" : 1, - "descriptor" : "(Lgr;II)V" - }, { - "method" : "readWorldMapSection", - "owner" : "ag", - "name" : "f", - "access" : 0, - "descriptor" : "(Lgr;S)Lab;" - }, { - "method" : "setBounds", - "owner" : "ag", - "name" : "g", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "zoom", - "owner" : "ag", - "name" : "z", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__a_39", - "owner" : "ag", - "name" : "a", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)I" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "WorldMapRegion", - "name" : "av", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "fonts", - "owner" : "av", - "name" : "i", - "access" : 16, - "descriptor" : "Ljava/util/HashMap;" - }, { - "field" : "iconsList", - "owner" : "av", - "name" : "k", - "access" : 0, - "descriptor" : "Ljava/util/List;" - }, { - "field" : "iconsMap", - "owner" : "av", - "name" : "n", - "access" : 0, - "descriptor" : "Ljava/util/HashMap;" - }, { - "field" : "x", - "owner" : "av", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : -1061363609 - }, { - "field" : "y", - "owner" : "av", - "name" : "g", - "access" : 0, - "descriptor" : "I", - "decoder" : 2099407363 - }, { - "field" : "__d", - "owner" : "av", - "name" : "d", - "access" : 0, - "descriptor" : "I", - "decoder" : 415972873 - }, { - "field" : "__x", - "owner" : "av", - "name" : "x", - "access" : 0, - "descriptor" : "I", - "decoder" : -120515153 - }, { - "field" : "__e", - "owner" : "av", - "name" : "e", - "access" : 0, - "descriptor" : "Ljava/util/LinkedList;" - } ], - "methods" : [ { - "method" : "icons", - "owner" : "av", - "name" : "at", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Ljava/util/List;" - }, { - "method" : "__w_40", - "owner" : "av", - "name" : "w", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(IIIB)V" - }, { - "method" : "__u_41", - "owner" : "av", - "name" : "u", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljava/util/HashSet;Ljava/util/List;B)V" - }, { - "method" : "__e_42", - "owner" : "av", - "name" : "e", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "__x_43", - "owner" : "av", - "name" : "x", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/util/List;I)V" - }, { - "method" : "__d_44", - "owner" : "av", - "name" : "d", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__a_45", - "owner" : "av", - "name" : "a", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(Lir;B)Z" - }, { - "method" : "__j_46", - "owner" : "av", - "name" : "j", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], - "descriptor" : "(IIILjava/util/HashSet;I)V" - }, { - "method" : "__s_47", - "owner" : "av", - "name" : "s", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(Ljava/util/HashSet;IIB)V" - }, { - "method" : "__aq_48", - "owner" : "av", - "name" : "aq", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], - "descriptor" : "(IILjava/util/HashSet;IB)V" - }, { - "method" : "__aj_49", - "owner" : "av", - "name" : "aj", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(Ljava/util/HashSet;III)V" - }, { - "method" : "__av_50", - "owner" : "av", - "name" : "av", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], - "descriptor" : "(Lic;IIIIB)V" - }, { - "method" : "__ar_51", - "owner" : "av", - "name" : "ar", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], - "descriptor" : "(Lak;IIFI)V" - }, { - "method" : "__ac_52", - "owner" : "av", - "name" : "ac", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(Lic;III)V" - }, { - "method" : "__ay_53", - "owner" : "av", - "name" : "ay", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], - "descriptor" : "(Lak;Lic;IIFI)V" - }, { - "method" : "__ah_54", - "owner" : "av", - "name" : "ah", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], - "descriptor" : "(IILjava/util/HashSet;IB)V" - }, { - "method" : "__al_55", - "owner" : "av", - "name" : "al", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(II)Laj;" - }, { - "method" : "__ab_56", - "owner" : "av", - "name" : "ab", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(Lic;B)Laj;" - }, { - "method" : "__ae_57", - "owner" : "av", - "name" : "ae", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], - "descriptor" : "(IIIIII)Ljava/util/List;" - }, { - "method" : "__ad_58", - "owner" : "av", - "name" : "ad", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], - "descriptor" : "(IIIII)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(IIILjava/util/HashMap;)V" - } ] -}, { - "class" : "WorldMapSection2", - "name" : "ah", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "ab" ], - "fields" : [ { - "field" : "__f", - "owner" : "ah", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : -245382089 - }, { - "field" : "__m", - "owner" : "ah", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : -1561552223 - }, { - "field" : "__o", - "owner" : "ah", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : 982234927 - }, { - "field" : "__q", - "owner" : "ah", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -1024859679 - }, { - "field" : "__u", - "owner" : "ah", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : -1272330125 - }, { - "field" : "__w", - "owner" : "ah", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : 40495485 - } ], - "methods" : [ { - "method" : "__m_59", - "owner" : "ah", - "name" : "m", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Lag;I)V" - }, { - "method" : "__f_60", - "owner" : "ah", - "name" : "f", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(IIIB)Z" - }, { - "method" : "__q_61", - "owner" : "ah", - "name" : "q", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(IIB)Z" - }, { - "method" : "__w_62", - "owner" : "ah", - "name" : "w", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(IIII)[I" - }, { - "method" : "__o_63", - "owner" : "ah", - "name" : "o", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(III)Lhu;" - }, { - "method" : "__u_64", - "owner" : "ah", - "name" : "u", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Lgr;B)V" - }, { - "method" : "__g_65", - "owner" : "ah", - "name" : "g", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "AbstractWorldMapIcon", - "name" : "ak", - "super" : "java.lang.Object", - "access" : 1057, - "interfaces" : [ ], - "fields" : [ { - "field" : "coord1", - "owner" : "ak", - "name" : "l", - "access" : 17, - "descriptor" : "Lhu;" - }, { - "field" : "coord2", - "owner" : "ak", - "name" : "g", - "access" : 17, - "descriptor" : "Lhu;" - }, { - "field" : "__e", - "owner" : "ak", - "name" : "e", - "access" : 0, - "descriptor" : "I", - "decoder" : -521086143 - }, { - "field" : "__x", - "owner" : "ak", - "name" : "x", - "access" : 0, - "descriptor" : "I", - "decoder" : -1065362217 - } ], - "methods" : [ { - "method" : "element", - "owner" : "ak", - "name" : "m", - "access" : 1025, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "label", - "owner" : "ak", - "name" : "f", - "access" : 1024, - "parameters" : [ ], - "descriptor" : "(I)Laj;" - }, { - "method" : "__y_66", - "owner" : "ak", - "name" : "y", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(IIB)Z" - }, { - "method" : "__h_67", - "owner" : "ak", - "name" : "h", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "__b_68", - "owner" : "ak", - "name" : "b", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(III)Z" - }, { - "method" : "__c_69", - "owner" : "ak", - "name" : "c", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(III)Z" - }, { - "method" : "__w_70", - "owner" : "ak", - "name" : "w", - "access" : 1024, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__q_71", - "owner" : "ak", - "name" : "q", - "access" : 1024, - "parameters" : [ ], - "descriptor" : "(B)I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Lhu;Lhu;)V" - } ] -}, { - "class" : "WorldMapManager", - "name" : "al", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "fonts", - "owner" : "al", - "name" : "d", - "access" : 16, - "descriptor" : "Ljava/util/HashMap;" - }, { - "field" : "icons", - "owner" : "al", - "name" : "o", - "access" : 0, - "descriptor" : "Ljava/util/HashMap;" - }, { - "field" : "isLoaded0", - "owner" : "al", - "name" : "m", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "loadStarted", - "owner" : "al", - "name" : "f", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "mapAreaData", - "owner" : "al", - "name" : "q", - "access" : 0, - "descriptor" : "Lae;" - }, { - "field" : "mapSceneSprites", - "owner" : "al", - "name" : "l", - "access" : 0, - "descriptor" : "[Llq;" - }, { - "field" : "overviewSprite", - "owner" : "al", - "name" : "w", - "access" : 0, - "descriptor" : "Lln;" - }, { - "field" : "regions", - "owner" : "al", - "name" : "u", - "access" : 0, - "descriptor" : "[[Lav;" - }, { - "field" : "__a", - "owner" : "al", - "name" : "a", - "access" : 0, - "descriptor" : "I", - "decoder" : -395718741 - }, { - "field" : "__i", - "owner" : "al", - "name" : "i", - "access" : 0, - "descriptor" : "I", - "decoder" : 1729323633 - }, { - "field" : "__k", - "owner" : "al", - "name" : "k", - "access" : 0, - "descriptor" : "I", - "decoder" : -1459928419 - }, { - "field" : "__n", - "owner" : "al", - "name" : "n", - "access" : 0, - "descriptor" : "I", - "decoder" : 1364441271 - }, { - "field" : "__g", - "owner" : "al", - "name" : "g", - "access" : 0, - "descriptor" : "Ljava/util/HashMap;" - }, { - "field" : "__e", - "owner" : "al", - "name" : "e", - "access" : 16, - "descriptor" : "Lir;" - }, { - "field" : "__x", - "owner" : "al", - "name" : "x", - "access" : 16, - "descriptor" : "Lir;" - }, { - "field" : "__z", - "owner" : "al", - "name" : "z", - "access" : 1, - "descriptor" : "I", - "decoder" : 1085359673 - } ], - "methods" : [ { - "method" : "buildIcons", - "owner" : "al", - "name" : "e", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Ljava/util/HashMap;" - }, { - "method" : "buildIcons0", - "owner" : "al", - "name" : "x", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "clearIcons", - "owner" : "al", - "name" : "f", - "access" : 17, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "drawOverview", - "owner" : "al", - "name" : "o", - "access" : 1, - "descriptor" : "(IIIILjava/util/HashSet;III)V" - }, { - "method" : "isLoaded", - "owner" : "al", - "name" : "l", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "load", - "owner" : "al", - "name" : "m", - "access" : 1, - "parameters" : [ "indexCache", "cacheName", "isMembersWorld" ], - "descriptor" : "(Lir;Ljava/lang/String;ZB)V" - }, { - "method" : "__q_72", - "owner" : "al", - "name" : "q", - "access" : 17, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7" ], - "descriptor" : "(IIIIIIIII)V" - }, { - "method" : "__w_73", - "owner" : "al", - "name" : "w", - "access" : 17, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7", "arg8", "arg9", "arg10", "arg11", "arg12" ], - "descriptor" : "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZB)V" - }, { - "method" : "__u_74", - "owner" : "al", - "name" : "u", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7", "arg8", "arg9" ], - "descriptor" : "(IIIIIIIIIII)Ljava/util/List;" - }, { - "method" : "__d_75", - "owner" : "al", - "name" : "d", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(III)F" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "([Llq;Ljava/util/HashMap;Lir;Lir;)V" - } ] -}, { - "class" : "WorldMapAreaData", - "name" : "ae", - "super" : "ag", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__i", - "owner" : "ae", - "name" : "i", - "access" : 0, - "descriptor" : "Ljava/util/HashSet;" - }, { - "field" : "__n", - "owner" : "ae", - "name" : "n", - "access" : 0, - "descriptor" : "Ljava/util/HashSet;" - }, { - "field" : "__a", - "owner" : "ae", - "name" : "a", - "access" : 0, - "descriptor" : "Ljava/util/List;" - } ], - "methods" : [ { - "method" : "__ce_76", - "owner" : "ae", - "name" : "ce", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], - "descriptor" : "(Lgr;Lgr;IZI)V" - }, { - "method" : "__cy_77", - "owner" : "ae", - "name" : "cy", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Lgr;ZB)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "WorldMapSection1", - "name" : "as", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "ab" ], - "fields" : [ { - "field" : "__e", - "owner" : "as", - "name" : "e", - "access" : 0, - "descriptor" : "I", - "decoder" : -1797724181 - }, { - "field" : "__f", - "owner" : "as", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 1483447179 - }, { - "field" : "__g", - "owner" : "as", - "name" : "g", - "access" : 0, - "descriptor" : "I", - "decoder" : 1526007343 - }, { - "field" : "__l", - "owner" : "as", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : -890169045 - }, { - "field" : "__m", - "owner" : "as", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : -1971304641 - }, { - "field" : "__o", - "owner" : "as", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : -1513010233 - }, { - "field" : "__q", - "owner" : "as", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -1875803617 - }, { - "field" : "__u", - "owner" : "as", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : -1383826035 - }, { - "field" : "__w", - "owner" : "as", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : 284566685 - }, { - "field" : "__x", - "owner" : "as", - "name" : "x", - "access" : 0, - "descriptor" : "I", - "decoder" : 325777555 - } ], - "methods" : [ { - "method" : "__m_78", - "owner" : "as", - "name" : "m", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Lag;I)V" - }, { - "method" : "__f_79", - "owner" : "as", - "name" : "f", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(IIIB)Z" - }, { - "method" : "__q_80", - "owner" : "as", - "name" : "q", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(IIB)Z" - }, { - "method" : "__w_81", - "owner" : "as", - "name" : "w", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(IIII)[I" - }, { - "method" : "__o_82", - "owner" : "as", - "name" : "o", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(III)Lhu;" - }, { - "method" : "__u_83", - "owner" : "as", - "name" : "u", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Lgr;B)V" - }, { - "method" : "__g_84", - "owner" : "as", - "name" : "g", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "MouseWheelHandler", - "name" : "am", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ "fv", "java.awt.event.MouseWheelListener" ], - "fields" : [ { - "field" : "rotation", - "owner" : "am", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : -182252389 - } ], - "methods" : [ { - "method" : "addTo", - "owner" : "am", - "name" : "m", - "access" : 0, - "parameters" : [ "component" ], - "descriptor" : "(Ljava/awt/Component;B)V" - }, { - "method" : "removeFrom", - "owner" : "am", - "name" : "f", - "access" : 0, - "parameters" : [ "component" ], - "descriptor" : "(Ljava/awt/Component;I)V" - }, { - "method" : "useRotation", - "owner" : "am", - "name" : "q", - "access" : 33, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__mouseWheelMoved_85", - "owner" : "am", - "name" : "mouseWheelMoved", - "access" : 33, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/awt/event/MouseWheelEvent;)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "KeyHandler", - "name" : "an", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ "java.awt.event.KeyListener", "java.awt.event.FocusListener" ], - "fields" : [ ], - "methods" : [ { - "method" : "keyPressed", - "owner" : "an", - "name" : "keyPressed", - "access" : 49, - "parameters" : [ "ke" ], - "descriptor" : "(Ljava/awt/event/KeyEvent;)V" - }, { - "method" : "__keyReleased_86", - "owner" : "an", - "name" : "keyReleased", - "access" : 49, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/awt/event/KeyEvent;)V" - }, { - "method" : "__keyTyped_87", - "owner" : "an", - "name" : "keyTyped", - "access" : 17, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/awt/event/KeyEvent;)V" - }, { - "method" : "__focusGained_88", - "owner" : "an", - "name" : "focusGained", - "access" : 17, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/awt/event/FocusEvent;)V" - }, { - "method" : "__focusLost_89", - "owner" : "an", - "name" : "focusLost", - "access" : 49, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/awt/event/FocusEvent;)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "GameShell", - "name" : "ba", - "super" : "java.applet.Applet", - "access" : 1057, - "interfaces" : [ "java.lang.Runnable", "java.awt.event.FocusListener", "java.awt.event.WindowListener" ], - "fields" : [ { - "field" : "canvas", - "owner" : "ba", - "name" : "ay", - "access" : 0, - "descriptor" : "Ljava/awt/Canvas;" - }, { - "field" : "canvasSetTimeMs", - "owner" : "ba", - "name" : "ae", - "access" : 64, - "descriptor" : "J", - "decoder" : 956221087975405011 - }, { - "field" : "canvasX", - "owner" : "ba", - "name" : "b", - "access" : 0, - "descriptor" : "I", - "decoder" : 781373219 - }, { - "field" : "canvasY", - "owner" : "ba", - "name" : "c", - "access" : 0, - "descriptor" : "I", - "decoder" : 198681537 - }, { - "field" : "clipboard", - "owner" : "ba", - "name" : "as", - "access" : 0, - "descriptor" : "Ljava/awt/datatransfer/Clipboard;" - }, { - "field" : "contentHeight", - "owner" : "ba", - "name" : "h", - "access" : 4, - "descriptor" : "I", - "decoder" : -628781469 - }, { - "field" : "contentHeight0", - "owner" : "ba", - "name" : "ag", - "access" : 0, - "descriptor" : "I", - "decoder" : -2057041525 - }, { - "field" : "contentWidth", - "owner" : "ba", - "name" : "t", - "access" : 4, - "descriptor" : "I", - "decoder" : -1854329683 - }, { - "field" : "contentWidth0", - "owner" : "ba", - "name" : "v", - "access" : 0, - "descriptor" : "I", - "decoder" : 740831949 - }, { - "field" : "eventQueue", - "owner" : "ba", - "name" : "am", - "access" : 16, - "descriptor" : "Ljava/awt/EventQueue;" - }, { - "field" : "frame", - "owner" : "ba", - "name" : "ac", - "access" : 0, - "descriptor" : "Ljava/awt/Frame;" - }, { - "field" : "hasErrored", - "owner" : "ba", - "name" : "g", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "isCanvasInvalid", - "owner" : "ba", - "name" : "ab", - "access" : 64, - "descriptor" : "Z" - }, { - "field" : "mouseWheelHandler", - "owner" : "ba", - "name" : "ap", - "access" : 0, - "descriptor" : "Lam;" - }, { - "field" : "stopTimeMs", - "owner" : "ba", - "name" : "o", - "access" : 8, - "descriptor" : "J", - "decoder" : 5666519919949401915 - }, { - "field" : "__al", - "owner" : "ba", - "name" : "al", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "__aj", - "owner" : "ba", - "name" : "aj", - "access" : 0, - "descriptor" : "I", - "decoder" : 1911308233 - }, { - "field" : "__aq", - "owner" : "ba", - "name" : "aq", - "access" : 0, - "descriptor" : "I", - "decoder" : -2071955075 - }, { - "field" : "__ah", - "owner" : "ba", - "name" : "ah", - "access" : 64, - "descriptor" : "Z" - } ], - "methods" : [ { - "method" : "addCanvas", - "owner" : "ba", - "name" : "aq", - "access" : 48, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "checkHost", - "owner" : "ba", - "name" : "aj", - "access" : 20, - "parameters" : [ ], - "descriptor" : "(B)Z" - }, { - "method" : "clearBackground", - "owner" : "ba", - "name" : "p", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "clipboardSetString", - "owner" : "ba", - "name" : "x", - "access" : 4, - "parameters" : [ "s" ], - "descriptor" : "(Ljava/lang/String;I)V" - }, { - "method" : "container", - "owner" : "ba", - "name" : "as", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Ljava/awt/Container;" - }, { - "method" : "drawInitial", - "owner" : "ba", - "name" : "at", - "access" : 20, - "descriptor" : "(ILjava/lang/String;ZB)V" - }, { - "method" : "error", - "owner" : "ba", - "name" : "ap", - "access" : 4, - "parameters" : [ "type" ], - "descriptor" : "(Ljava/lang/String;B)V" - }, { - "method" : "focusGained", - "owner" : "ba", - "name" : "focusGained", - "access" : 17, - "descriptor" : "(Ljava/awt/event/FocusEvent;)V" - }, { - "method" : "getFrameContentBounds", - "owner" : "ba", - "name" : "am", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Lla;" - }, { - "method" : "hasFrame", - "owner" : "ba", - "name" : "an", - "access" : 20, - "parameters" : [ ], - "descriptor" : "(B)Z" - }, { - "method" : "kill", - "owner" : "ba", - "name" : "ah", - "access" : 48, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "kill0", - "owner" : "ba", - "name" : "ae", - "access" : 1028, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "mouseWheel", - "owner" : "ba", - "name" : "l", - "access" : 4, - "parameters" : [ ], - "descriptor" : "(B)Lfv;" - }, { - "method" : "paint", - "owner" : "ba", - "name" : "paint", - "access" : 49, - "parameters" : [ "g" ], - "descriptor" : "(Ljava/awt/Graphics;)V" - }, { - "method" : "replaceCanvas", - "owner" : "ba", - "name" : "v", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "run", - "owner" : "ba", - "name" : "run", - "access" : 1, - "descriptor" : "()V" - }, { - "method" : "setUp", - "owner" : "ba", - "name" : "aw", - "access" : 1028, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "setUpClipboard", - "owner" : "ba", - "name" : "e", - "access" : 4, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "setUpKeyboard", - "owner" : "ba", - "name" : "d", - "access" : 20, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "setUpMouse", - "owner" : "ba", - "name" : "a", - "access" : 20, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "startThread", - "owner" : "ba", - "name" : "ag", - "access" : 20, - "parameters" : [ "width", "height", "revision" ], - "descriptor" : "(IIII)V" - }, { - "method" : "update", - "owner" : "ba", - "name" : "update", - "access" : 17, - "parameters" : [ "g" ], - "descriptor" : "(Ljava/awt/Graphics;)V" - }, { - "method" : "__u_90", - "owner" : "ba", - "name" : "u", - "access" : 20, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(IIB)V" - }, { - "method" : "__g_91", - "owner" : "ba", - "name" : "g", - "access" : 16, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/lang/Object;I)V" - }, { - "method" : "__z_92", - "owner" : "ba", - "name" : "z", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__av_93", - "owner" : "ba", - "name" : "av", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "__ar_94", - "owner" : "ba", - "name" : "ar", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "__ac_95", - "owner" : "ba", - "name" : "ac", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__ay_96", - "owner" : "ba", - "name" : "ay", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__start_97", - "owner" : "ba", - "name" : "start", - "access" : 17, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__stop_98", - "owner" : "ba", - "name" : "stop", - "access" : 17, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__destroy_99", - "owner" : "ba", - "name" : "destroy", - "access" : 17, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__focusLost_100", - "owner" : "ba", - "name" : "focusLost", - "access" : 17, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/awt/event/FocusEvent;)V" - }, { - "method" : "__windowActivated_101", - "owner" : "ba", - "name" : "windowActivated", - "access" : 17, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/awt/event/WindowEvent;)V" - }, { - "method" : "__windowClosed_102", - "owner" : "ba", - "name" : "windowClosed", - "access" : 17, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/awt/event/WindowEvent;)V" - }, { - "method" : "__windowClosing_103", - "owner" : "ba", - "name" : "windowClosing", - "access" : 17, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/awt/event/WindowEvent;)V" - }, { - "method" : "__windowDeactivated_104", - "owner" : "ba", - "name" : "windowDeactivated", - "access" : 17, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/awt/event/WindowEvent;)V" - }, { - "method" : "__windowDeiconified_105", - "owner" : "ba", - "name" : "windowDeiconified", - "access" : 17, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/awt/event/WindowEvent;)V" - }, { - "method" : "__windowIconified_106", - "owner" : "ba", - "name" : "windowIconified", - "access" : 17, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/awt/event/WindowEvent;)V" - }, { - "method" : "__windowOpened_107", - "owner" : "ba", - "name" : "windowOpened", - "access" : 17, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/awt/event/WindowEvent;)V" - }, { - "method" : "__ad_108", - "owner" : "ba", - "name" : "ad", - "access" : 20, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__init_109", - "owner" : "ba", - "name" : "init", - "access" : 1025, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__au_110", - "owner" : "ba", - "name" : "au", - "access" : 1028, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__al_111", - "owner" : "ba", - "name" : "al", - "access" : 1028, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__ab_112", - "owner" : "ba", - "name" : "ab", - "access" : 1028, - "parameters" : [ "arg0" ], - "descriptor" : "(ZI)V" - }, { - "method" : "__j_113", - "owner" : "ba", - "name" : "j", - "access" : 1028, - "parameters" : [ ], - "descriptor" : "(I)V" - } ], - "constructors" : [ { - "access" : 4, - "descriptor" : "()V" - } ] -}, { - "class" : "MouseHandler", - "name" : "bb", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "java.awt.event.MouseListener", "java.awt.event.MouseMotionListener", "java.awt.event.FocusListener" ], - "fields" : [ ], - "methods" : [ { - "method" : "getButton", - "owner" : "bb", - "name" : "f", - "access" : 16, - "parameters" : [ "mouseEvent" ], - "descriptor" : "(Ljava/awt/event/MouseEvent;I)I" - }, { - "method" : "mouseMoved", - "owner" : "bb", - "name" : "mouseMoved", - "access" : 49, - "descriptor" : "(Ljava/awt/event/MouseEvent;)V" - }, { - "method" : "mousePressed", - "owner" : "bb", - "name" : "mousePressed", - "access" : 49, - "descriptor" : "(Ljava/awt/event/MouseEvent;)V" - }, { - "method" : "__mouseReleased_114", - "owner" : "bb", - "name" : "mouseReleased", - "access" : 49, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/awt/event/MouseEvent;)V" - }, { - "method" : "__mouseClicked_115", - "owner" : "bb", - "name" : "mouseClicked", - "access" : 17, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/awt/event/MouseEvent;)V" - }, { - "method" : "__mouseEntered_116", - "owner" : "bb", - "name" : "mouseEntered", - "access" : 49, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/awt/event/MouseEvent;)V" - }, { - "method" : "__mouseExited_117", - "owner" : "bb", - "name" : "mouseExited", - "access" : 49, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/awt/event/MouseEvent;)V" - }, { - "method" : "__mouseDragged_118", - "owner" : "bb", - "name" : "mouseDragged", - "access" : 49, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/awt/event/MouseEvent;)V" - }, { - "method" : "__focusGained_119", - "owner" : "bb", - "name" : "focusGained", - "access" : 17, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/awt/event/FocusEvent;)V" - }, { - "method" : "__focusLost_120", - "owner" : "bb", - "name" : "focusLost", - "access" : 49, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/awt/event/FocusEvent;)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "SecureRandomCallable", - "name" : "bk", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "java.util.concurrent.Callable" ], - "fields" : [ ], - "methods" : [ { - "method" : "__call_121", - "owner" : "bk", - "name" : "call", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Ljava/lang/Object;" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "IndexCacheLoader", - "name" : "bd", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "indexCache", - "owner" : "bd", - "name" : "f", - "access" : 16, - "descriptor" : "Lit;" - }, { - "field" : "__w", - "owner" : "bd", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : 782003089 - }, { - "field" : "__q", - "owner" : "bd", - "name" : "q", - "access" : 16, - "descriptor" : "I", - "decoder" : 1459455501 - } ], - "methods" : [ { - "method" : "__m_122", - "owner" : "bd", - "name" : "m", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Lit;Ljava/lang/String;)V" - } ] -}, { - "class" : "ScriptEvent", - "name" : "by", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "args0", - "owner" : "by", - "name" : "m", - "access" : 0, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "boolean1", - "owner" : "by", - "name" : "f", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "dragTarget", - "owner" : "by", - "name" : "g", - "access" : 0, - "descriptor" : "Lho;" - }, { - "field" : "keyPressed", - "owner" : "by", - "name" : "e", - "access" : 0, - "descriptor" : "I", - "decoder" : 327085889 - }, { - "field" : "keyTyped", - "owner" : "by", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : -1330602393 - }, { - "field" : "mouseX", - "owner" : "by", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : 488198377 - }, { - "field" : "mouseY", - "owner" : "by", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : 95719815 - }, { - "field" : "opIndex", - "owner" : "by", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : -1089993721 - }, { - "field" : "targetName", - "owner" : "by", - "name" : "x", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "type0", - "owner" : "by", - "name" : "k", - "access" : 0, - "descriptor" : "I", - "decoder" : -161292529 - }, { - "field" : "widget", - "owner" : "by", - "name" : "q", - "access" : 0, - "descriptor" : "Lho;" - }, { - "field" : "__d", - "owner" : "by", - "name" : "d", - "access" : 0, - "descriptor" : "I", - "decoder" : -2138736593 - } ], - "methods" : [ { - "method" : "setArgs", - "owner" : "by", - "name" : "m", - "access" : 1, - "parameters" : [ "args" ], - "descriptor" : "([Ljava/lang/Object;I)V" - }, { - "method" : "setType", - "owner" : "by", - "name" : "f", - "access" : 1, - "parameters" : [ "type" ], - "descriptor" : "(IB)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "MouseRecorder", - "name" : "bu", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "java.lang.Runnable" ], - "fields" : [ { - "field" : "index", - "owner" : "bu", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : 973045825 - }, { - "field" : "isRunning", - "owner" : "bu", - "name" : "m", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "lock", - "owner" : "bu", - "name" : "f", - "access" : 0, - "descriptor" : "Ljava/lang/Object;" - }, { - "field" : "millis", - "owner" : "bu", - "name" : "u", - "access" : 0, - "descriptor" : "[J" - }, { - "field" : "xs", - "owner" : "bu", - "name" : "w", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "ys", - "owner" : "bu", - "name" : "o", - "access" : 0, - "descriptor" : "[I" - } ], - "methods" : [ { - "method" : "__run_123", - "owner" : "bu", - "name" : "run", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "Player", - "name" : "br", - "super" : "bz", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "actions", - "owner" : "br", - "name" : "u", - "access" : 0, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "animationCycleEnd", - "owner" : "br", - "name" : "d", - "access" : 0, - "descriptor" : "I", - "decoder" : -359981047 - }, { - "field" : "animationCycleStart", - "owner" : "br", - "name" : "x", - "access" : 0, - "descriptor" : "I", - "decoder" : -351876137 - }, { - "field" : "appearance", - "owner" : "br", - "name" : "f", - "access" : 0, - "descriptor" : "Lhi;" - }, { - "field" : "combatLevel", - "owner" : "br", - "name" : "g", - "access" : 0, - "descriptor" : "I", - "decoder" : 984869133 - }, { - "field" : "headIconPk", - "owner" : "br", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : 2021372599 - }, { - "field" : "headIconPrayer", - "owner" : "br", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : -793415473 - }, { - "field" : "index", - "owner" : "br", - "name" : "r", - "access" : 0, - "descriptor" : "I", - "decoder" : 1486240677 - }, { - "field" : "isFriend", - "owner" : "br", - "name" : "p", - "access" : 0, - "descriptor" : "Lkd;" - }, { - "field" : "isHidden", - "owner" : "br", - "name" : "b", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "isInClanChat", - "owner" : "br", - "name" : "v", - "access" : 0, - "descriptor" : "Lkd;" - }, { - "field" : "isUnanimated", - "owner" : "br", - "name" : "y", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "model0", - "owner" : "br", - "name" : "a", - "access" : 0, - "descriptor" : "Ldu;" - }, { - "field" : "plane", - "owner" : "br", - "name" : "c", - "access" : 0, - "descriptor" : "I", - "decoder" : 1332604413 - }, { - "field" : "skillLevel", - "owner" : "br", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : -1136542281 - }, { - "field" : "team", - "owner" : "br", - "name" : "h", - "access" : 0, - "descriptor" : "I", - "decoder" : 91041167 - }, { - "field" : "tileHeight", - "owner" : "br", - "name" : "e", - "access" : 0, - "descriptor" : "I", - "decoder" : 1989338999 - }, { - "field" : "tileHeight2", - "owner" : "br", - "name" : "n", - "access" : 0, - "descriptor" : "I", - "decoder" : -1624108131 - }, { - "field" : "tileX", - "owner" : "br", - "name" : "aq", - "access" : 0, - "descriptor" : "I", - "decoder" : -539678769 - }, { - "field" : "tileY", - "owner" : "br", - "name" : "aj", - "access" : 0, - "descriptor" : "I", - "decoder" : 702193221 - }, { - "field" : "username", - "owner" : "br", - "name" : "m", - "access" : 0, - "descriptor" : "Lkp;" - }, { - "field" : "__ag", - "owner" : "br", - "name" : "ag", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "__i", - "owner" : "br", - "name" : "i", - "access" : 0, - "descriptor" : "I", - "decoder" : -1771431457 - }, { - "field" : "__j", - "owner" : "br", - "name" : "j", - "access" : 0, - "descriptor" : "I", - "decoder" : 224552403 - }, { - "field" : "__k", - "owner" : "br", - "name" : "k", - "access" : 0, - "descriptor" : "I", - "decoder" : 665272587 - }, { - "field" : "__s", - "owner" : "br", - "name" : "s", - "access" : 0, - "descriptor" : "I", - "decoder" : 305969541 - }, { - "field" : "__t", - "owner" : "br", - "name" : "t", - "access" : 0, - "descriptor" : "I", - "decoder" : 892671055 - }, { - "field" : "__z", - "owner" : "br", - "name" : "z", - "access" : 0, - "descriptor" : "I", - "decoder" : 1610462047 - } ], - "methods" : [ { - "method" : "getModel", - "owner" : "br", - "name" : "e", - "access" : 20, - "parameters" : [ ], - "descriptor" : "(I)Ldu;" - }, { - "method" : "isVisible", - "owner" : "br", - "name" : "z", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(B)Z" - }, { - "method" : "read", - "owner" : "br", - "name" : "m", - "access" : 16, - "parameters" : [ "buffer" ], - "descriptor" : "(Lgr;I)V" - }, { - "method" : "resetPath", - "owner" : "br", - "name" : "d", - "access" : 0, - "parameters" : [ "x", "y" ], - "descriptor" : "(III)V" - }, { - "method" : "transformedSize", - "owner" : "br", - "name" : "l", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__f_124", - "owner" : "br", - "name" : "f", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)Z" - }, { - "method" : "__q_125", - "owner" : "br", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__w_126", - "owner" : "br", - "name" : "w", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__o_127", - "owner" : "br", - "name" : "o", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)Z" - }, { - "method" : "__u_128", - "owner" : "br", - "name" : "u", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__g_129", - "owner" : "br", - "name" : "g", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__x_130", - "owner" : "br", - "name" : "x", - "access" : 16, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(IIBI)V" - }, { - "method" : "__a_131", - "owner" : "br", - "name" : "a", - "access" : 16, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(IIBI)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "OwnWorldComparator", - "name" : "bj", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "java.util.Comparator" ], - "fields" : [ { - "field" : "__m", - "owner" : "bj", - "name" : "m", - "access" : 0, - "descriptor" : "Z" - } ], - "methods" : [ { - "method" : "__m_132", - "owner" : "bj", - "name" : "m", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ll;Ll;B)I" - }, { - "method" : "__compare_133", - "owner" : "bj", - "name" : "compare", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" - }, { - "method" : "__equals_134", - "owner" : "bj", - "name" : "equals", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/lang/Object;)Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "Actor", - "name" : "bz", - "super" : "ex", - "access" : 1057, - "interfaces" : [ ], - "fields" : [ { - "field" : "defaultHeight", - "owner" : "bz", - "name" : "cy", - "access" : 0, - "descriptor" : "I", - "decoder" : 1003085333 - }, { - "field" : "false0", - "owner" : "bz", - "name" : "bd", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "healthBars", - "owner" : "bz", - "name" : "bn", - "access" : 0, - "descriptor" : "Lja;" - }, { - "field" : "heightOffset", - "owner" : "bz", - "name" : "bp", - "access" : 0, - "descriptor" : "I", - "decoder" : -779457309 - }, { - "field" : "hitSplatCount", - "owner" : "bz", - "name" : "af", - "access" : 0, - "descriptor" : "B" - }, { - "field" : "hitSplatCycles", - "owner" : "bz", - "name" : "bb", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "hitSplatTypes", - "owner" : "bz", - "name" : "ai", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "hitSplatTypes2", - "owner" : "bz", - "name" : "bs", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "hitSplatValues", - "owner" : "bz", - "name" : "ba", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "hitSplatValues2", - "owner" : "bz", - "name" : "bq", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "idleSequence", - "owner" : "bz", - "name" : "aw", - "access" : 0, - "descriptor" : "I", - "decoder" : -299122235 - }, { - "field" : "isAutoChatting", - "owner" : "bz", - "name" : "an", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "movementFrame", - "owner" : "bz", - "name" : "bx", - "access" : 0, - "descriptor" : "I", - "decoder" : -1119758739 - }, { - "field" : "movementFrameCycle", - "owner" : "bz", - "name" : "by", - "access" : 0, - "descriptor" : "I", - "decoder" : -1646413227 - }, { - "field" : "movementSequence", - "owner" : "bz", - "name" : "bo", - "access" : 0, - "descriptor" : "I", - "decoder" : 1614854211 - }, { - "field" : "npcCycle", - "owner" : "bz", - "name" : "ce", - "access" : 0, - "descriptor" : "I", - "decoder" : 2051334073 - }, { - "field" : "orientation", - "owner" : "bz", - "name" : "cs", - "access" : 0, - "descriptor" : "I", - "decoder" : -1189634367 - }, { - "field" : "overheadText", - "owner" : "bz", - "name" : "am", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "overheadTextColor", - "owner" : "bz", - "name" : "ao", - "access" : 0, - "descriptor" : "I", - "decoder" : -1905191799 - }, { - "field" : "overheadTextCyclesRemaining", - "owner" : "bz", - "name" : "au", - "access" : 0, - "descriptor" : "I", - "decoder" : 137508815 - }, { - "field" : "overheadTextEffect", - "owner" : "bz", - "name" : "aa", - "access" : 0, - "descriptor" : "I", - "decoder" : 541000549 - }, { - "field" : "pathLength", - "owner" : "bz", - "name" : "cu", - "access" : 0, - "descriptor" : "I", - "decoder" : -2033082375 - }, { - "field" : "pathTraversed", - "owner" : "bz", - "name" : "cn", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "pathX", - "owner" : "bz", - "name" : "cb", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "pathY", - "owner" : "bz", - "name" : "ck", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "playerCycle", - "owner" : "bz", - "name" : "ak", - "access" : 0, - "descriptor" : "I", - "decoder" : 141226463 - }, { - "field" : "runSequence", - "owner" : "bz", - "name" : "as", - "access" : 0, - "descriptor" : "I", - "decoder" : 1708570917 - }, { - "field" : "sequence", - "owner" : "bz", - "name" : "bu", - "access" : 0, - "descriptor" : "I", - "decoder" : 323216015 - }, { - "field" : "sequenceDelay", - "owner" : "bz", - "name" : "br", - "access" : 0, - "descriptor" : "I", - "decoder" : -134491649 - }, { - "field" : "sequenceFrame", - "owner" : "bz", - "name" : "bm", - "access" : 0, - "descriptor" : "I", - "decoder" : 1425662251 - }, { - "field" : "sequenceFrameCycle", - "owner" : "bz", - "name" : "bl", - "access" : 0, - "descriptor" : "I", - "decoder" : -1753867715 - }, { - "field" : "size", - "owner" : "bz", - "name" : "ah", - "access" : 0, - "descriptor" : "I", - "decoder" : -1357622739 - }, { - "field" : "spotAnimation", - "owner" : "bz", - "name" : "bi", - "access" : 0, - "descriptor" : "I", - "decoder" : -220610999 - }, { - "field" : "spotAnimationFrame", - "owner" : "bz", - "name" : "bz", - "access" : 0, - "descriptor" : "I", - "decoder" : -2125404733 - }, { - "field" : "spotAnimationFrameCycle", - "owner" : "bz", - "name" : "bg", - "access" : 0, - "descriptor" : "I", - "decoder" : 330334599 - }, { - "field" : "targetIndex", - "owner" : "bz", - "name" : "bk", - "access" : 0, - "descriptor" : "I", - "decoder" : -1387109107 - }, { - "field" : "turnLeftSequence", - "owner" : "bz", - "name" : "al", - "access" : 0, - "descriptor" : "I", - "decoder" : -831787909 - }, { - "field" : "turnRightSequence", - "owner" : "bz", - "name" : "ab", - "access" : 0, - "descriptor" : "I", - "decoder" : 1788714977 - }, { - "field" : "walkSequence", - "owner" : "bz", - "name" : "ae", - "access" : 0, - "descriptor" : "I", - "decoder" : -2075997699 - }, { - "field" : "walkTurnLeftSequence", - "owner" : "bz", - "name" : "ad", - "access" : 0, - "descriptor" : "I", - "decoder" : -568830521 - }, { - "field" : "walkTurnRightSequence", - "owner" : "bz", - "name" : "ap", - "access" : 0, - "descriptor" : "I", - "decoder" : -257240117 - }, { - "field" : "walkTurnSequence", - "owner" : "bz", - "name" : "at", - "access" : 0, - "descriptor" : "I", - "decoder" : -1598871111 - }, { - "field" : "x", - "owner" : "bz", - "name" : "av", - "access" : 0, - "descriptor" : "I", - "decoder" : -1573449469 - }, { - "field" : "y", - "owner" : "bz", - "name" : "ar", - "access" : 0, - "descriptor" : "I", - "decoder" : 676600595 - }, { - "field" : "__ay", - "owner" : "bz", - "name" : "ay", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "__az", - "owner" : "bz", - "name" : "az", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "__ac", - "owner" : "bz", - "name" : "ac", - "access" : 0, - "descriptor" : "I", - "decoder" : 1439711403 - }, { - "field" : "__bc", - "owner" : "bz", - "name" : "bc", - "access" : 0, - "descriptor" : "I", - "decoder" : 139384875 - }, { - "field" : "__be", - "owner" : "bz", - "name" : "be", - "access" : 0, - "descriptor" : "I", - "decoder" : 837989037 - }, { - "field" : "__bf", - "owner" : "bz", - "name" : "bf", - "access" : 0, - "descriptor" : "I", - "decoder" : 2121599561 - }, { - "field" : "__bh", - "owner" : "bz", - "name" : "bh", - "access" : 0, - "descriptor" : "I", - "decoder" : 280591281 - }, { - "field" : "__bj", - "owner" : "bz", - "name" : "bj", - "access" : 0, - "descriptor" : "I", - "decoder" : -1523249259 - }, { - "field" : "__bt", - "owner" : "bz", - "name" : "bt", - "access" : 0, - "descriptor" : "I", - "decoder" : 886371765 - }, { - "field" : "__bv", - "owner" : "bz", - "name" : "bv", - "access" : 0, - "descriptor" : "I", - "decoder" : -1857513783 - }, { - "field" : "__bw", - "owner" : "bz", - "name" : "bw", - "access" : 0, - "descriptor" : "I", - "decoder" : -1630403001 - }, { - "field" : "__ch", - "owner" : "bz", - "name" : "ch", - "access" : 0, - "descriptor" : "I", - "decoder" : 1584102533 - }, { - "field" : "__cj", - "owner" : "bz", - "name" : "cj", - "access" : 0, - "descriptor" : "I", - "decoder" : -336931157 - }, { - "field" : "__cm", - "owner" : "bz", - "name" : "cm", - "access" : 0, - "descriptor" : "I", - "decoder" : 1252341007 - }, { - "field" : "__cq", - "owner" : "bz", - "name" : "cq", - "access" : 0, - "descriptor" : "I", - "decoder" : -1583514013 - }, { - "field" : "__cr", - "owner" : "bz", - "name" : "cr", - "access" : 0, - "descriptor" : "I", - "decoder" : 1367256299 - }, { - "field" : "__cv", - "owner" : "bz", - "name" : "cv", - "access" : 0, - "descriptor" : "I", - "decoder" : -1723834619 - } ], - "methods" : [ { - "method" : "addHealthBar", - "owner" : "bz", - "name" : "bq", - "access" : 16, - "parameters" : [ "healthBarDefinition", "cycle", "n0", "n1", "n2", "n3" ], - "descriptor" : "(IIIIIIB)V" - }, { - "method" : "addHitSplat", - "owner" : "bz", - "name" : "bs", - "access" : 16, - "parameters" : [ "type", "value", "type2", "value2", "cycle", "cycle2" ], - "descriptor" : "(IIIIIII)V" - }, { - "method" : "isVisible", - "owner" : "bz", - "name" : "z", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)Z" - }, { - "method" : "removeHealthBar", - "owner" : "bz", - "name" : "bn", - "access" : 16, - "parameters" : [ "healthBarDefinition" ], - "descriptor" : "(IS)V" - }, { - "method" : "__bb_143", - "owner" : "bz", - "name" : "bb", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(I)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "World", - "name" : "bt", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "activity", - "owner" : "bt", - "name" : "a", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "host", - "owner" : "bt", - "name" : "i", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "id", - "owner" : "bt", - "name" : "d", - "access" : 0, - "descriptor" : "I", - "decoder" : -144265493 - }, { - "field" : "index", - "owner" : "bt", - "name" : "j", - "access" : 0, - "descriptor" : "I", - "decoder" : 1147427427 - }, { - "field" : "location", - "owner" : "bt", - "name" : "z", - "access" : 0, - "descriptor" : "I", - "decoder" : 1942858323 - }, { - "field" : "population", - "owner" : "bt", - "name" : "n", - "access" : 0, - "descriptor" : "I", - "decoder" : 1863464125 - }, { - "field" : "properties", - "owner" : "bt", - "name" : "k", - "access" : 0, - "descriptor" : "I", - "decoder" : 956991319 - } ], - "methods" : [ { - "method" : "__e_144", - "owner" : "bt", - "name" : "e", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "__x_145", - "owner" : "bt", - "name" : "x", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)Z" - }, { - "method" : "__d_146", - "owner" : "bt", - "name" : "d", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "__a_147", - "owner" : "bt", - "name" : "a", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "__z_148", - "owner" : "bt", - "name" : "z", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)Z" - }, { - "method" : "__j_149", - "owner" : "bt", - "name" : "j", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "ClientPreferences", - "name" : "bf", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "hideUsername", - "owner" : "bf", - "name" : "g", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "parameters", - "owner" : "bf", - "name" : "l", - "access" : 0, - "descriptor" : "Ljava/util/LinkedHashMap;" - }, { - "field" : "rememberedUsername", - "owner" : "bf", - "name" : "u", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "roofsHidden", - "owner" : "bf", - "name" : "q", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "titleMusicDisabled", - "owner" : "bf", - "name" : "w", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "windowMode", - "owner" : "bf", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : -359530975 - } ], - "methods" : [ { - "method" : "toBuffer", - "owner" : "bf", - "name" : "f", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Lgr;" - }, { - "method" : "__m_150", - "owner" : "bf", - "name" : "m", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(ZI)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - }, { - "access" : 0, - "descriptor" : "(Lgr;)V" - } ] -}, { - "class" : "FriendSystem", - "name" : "bh", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "friendsList", - "owner" : "bh", - "name" : "o", - "access" : 17, - "descriptor" : "Lkg;" - }, { - "field" : "ignoreList", - "owner" : "bh", - "name" : "u", - "access" : 17, - "descriptor" : "Lkj;" - }, { - "field" : "loginType", - "owner" : "bh", - "name" : "w", - "access" : 16, - "descriptor" : "Llx;" - }, { - "field" : "__g", - "owner" : "bh", - "name" : "g", - "access" : 0, - "descriptor" : "I", - "decoder" : 1477282369 - } ], - "methods" : [ { - "method" : "clear", - "owner" : "bh", - "name" : "o", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "removeFriend", - "owner" : "bh", - "name" : "z", - "access" : 16, - "parameters" : [ "name" ], - "descriptor" : "(Ljava/lang/String;I)V" - }, { - "method" : "removeIgnore", - "owner" : "bh", - "name" : "j", - "access" : 16, - "parameters" : [ "name" ], - "descriptor" : "(Ljava/lang/String;I)V" - }, { - "method" : "__m_151", - "owner" : "bh", - "name" : "m", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)Z" - }, { - "method" : "__f_152", - "owner" : "bh", - "name" : "f", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__q_153", - "owner" : "bh", - "name" : "q", - "access" : 16, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Lgr;II)V" - }, { - "method" : "__w_154", - "owner" : "bh", - "name" : "w", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__u_155", - "owner" : "bh", - "name" : "u", - "access" : 16, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Lkp;ZI)Z" - }, { - "method" : "__g_156", - "owner" : "bh", - "name" : "g", - "access" : 16, - "parameters" : [ "arg0" ], - "descriptor" : "(Lkp;I)Z" - }, { - "method" : "__l_157", - "owner" : "bh", - "name" : "l", - "access" : 16, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/lang/String;I)V" - }, { - "method" : "__e_158", - "owner" : "bh", - "name" : "e", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(B)Z" - }, { - "method" : "__x_159", - "owner" : "bh", - "name" : "x", - "access" : 16, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/lang/String;B)V" - }, { - "method" : "__a_160", - "owner" : "bh", - "name" : "a", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(B)Z" - }, { - "method" : "__t_161", - "owner" : "bh", - "name" : "t", - "access" : 16, - "parameters" : [ "arg0" ], - "descriptor" : "(Lkp;S)Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Llx;)V" - } ] -}, { - "class" : "ObjectSound", - "name" : "be", - "super" : "gw", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "obj", - "owner" : "be", - "name" : "a", - "access" : 0, - "descriptor" : "Ljr;" - }, { - "field" : "soundEffectId", - "owner" : "be", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : -731474443 - }, { - "field" : "soundEffectIds", - "owner" : "be", - "name" : "k", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "stream1", - "owner" : "be", - "name" : "e", - "access" : 0, - "descriptor" : "Lds;" - }, { - "field" : "stream2", - "owner" : "be", - "name" : "i", - "access" : 0, - "descriptor" : "Lds;" - }, { - "field" : "__d", - "owner" : "be", - "name" : "d", - "access" : 0, - "descriptor" : "I", - "decoder" : 1748890449 - }, { - "field" : "__f", - "owner" : "be", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 647270745 - }, { - "field" : "__g", - "owner" : "be", - "name" : "g", - "access" : 0, - "descriptor" : "I", - "decoder" : 1344558633 - }, { - "field" : "__n", - "owner" : "be", - "name" : "n", - "access" : 0, - "descriptor" : "I", - "decoder" : -1041508847 - }, { - "field" : "__o", - "owner" : "be", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : -211591209 - }, { - "field" : "__q", - "owner" : "be", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -800464493 - }, { - "field" : "__u", - "owner" : "be", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : 512258949 - }, { - "field" : "__w", - "owner" : "be", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : -85911525 - }, { - "field" : "__x", - "owner" : "be", - "name" : "x", - "access" : 0, - "descriptor" : "I", - "decoder" : -1608400407 - } ], - "methods" : [ { - "method" : "set", - "owner" : "be", - "name" : "f", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "Npc", - "name" : "cv", - "super" : "bz", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "definition", - "owner" : "cv", - "name" : "m", - "access" : 0, - "descriptor" : "Ljz;" - } ], - "methods" : [ { - "method" : "getModel", - "owner" : "cv", - "name" : "e", - "access" : 20, - "parameters" : [ ], - "descriptor" : "(I)Ldu;" - }, { - "method" : "isVisible", - "owner" : "cv", - "name" : "z", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(B)Z" - }, { - "method" : "__m_162", - "owner" : "cv", - "name" : "m", - "access" : 16, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(IBI)V" - }, { - "method" : "__f_163", - "owner" : "cv", - "name" : "f", - "access" : 16, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(IIZI)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "Script", - "name" : "cg", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "intArgumentCount", - "owner" : "cg", - "name" : "g", - "access" : 0, - "descriptor" : "I", - "decoder" : -1077473933 - }, { - "field" : "intOperands", - "owner" : "cg", - "name" : "q", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "localIntCount", - "owner" : "cg", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : 1952727759 - }, { - "field" : "localStringCount", - "owner" : "cg", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : -1124477681 - }, { - "field" : "opcodes", - "owner" : "cg", - "name" : "f", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "stringArgumentCount", - "owner" : "cg", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : -503680987 - }, { - "field" : "stringOperands", - "owner" : "cg", - "name" : "w", - "access" : 0, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "switches", - "owner" : "cg", - "name" : "e", - "access" : 0, - "descriptor" : "[Llh;" - } ], - "methods" : [ { - "method" : "__o_164", - "owner" : "cg", - "name" : "o", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(II)[Llh;" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "PacketWriter", - "name" : "cl", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "buffer", - "owner" : "cl", - "name" : "w", - "access" : 0, - "descriptor" : "Lgr;" - }, { - "field" : "isaacCipher", - "owner" : "cl", - "name" : "o", - "access" : 1, - "descriptor" : "Lhn;" - }, { - "field" : "packetBuffer", - "owner" : "cl", - "name" : "u", - "access" : 0, - "descriptor" : "Lhx;" - }, { - "field" : "packetBufferNodes", - "owner" : "cl", - "name" : "f", - "access" : 0, - "descriptor" : "Lja;" - }, { - "field" : "serverPacket0", - "owner" : "cl", - "name" : "g", - "access" : 0, - "descriptor" : "Lge;" - }, { - "field" : "serverPacket0Length", - "owner" : "cl", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : -1986766063 - }, { - "field" : "socket0", - "owner" : "cl", - "name" : "m", - "access" : 0, - "descriptor" : "Lfu;" - }, { - "field" : "__e", - "owner" : "cl", - "name" : "e", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "__i", - "owner" : "cl", - "name" : "i", - "access" : 0, - "descriptor" : "Lge;" - }, { - "field" : "__k", - "owner" : "cl", - "name" : "k", - "access" : 0, - "descriptor" : "Lge;" - }, { - "field" : "__n", - "owner" : "cl", - "name" : "n", - "access" : 0, - "descriptor" : "Lge;" - }, { - "field" : "__d", - "owner" : "cl", - "name" : "d", - "access" : 0, - "descriptor" : "I", - "decoder" : 1672229609 - }, { - "field" : "__q", - "owner" : "cl", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -1028046199 - }, { - "field" : "__x", - "owner" : "cl", - "name" : "x", - "access" : 0, - "descriptor" : "I", - "decoder" : 120570975 - } ], - "methods" : [ { - "method" : "close", - "owner" : "cl", - "name" : "o", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "getSocket", - "owner" : "cl", - "name" : "g", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Lfu;" - }, { - "method" : "removeSocket", - "owner" : "cl", - "name" : "u", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "setSocket", - "owner" : "cl", - "name" : "w", - "access" : 0, - "parameters" : [ "socket" ], - "descriptor" : "(Lfu;B)V" - }, { - "method" : "__m_165", - "owner" : "cl", - "name" : "m", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__f_166", - "owner" : "cl", - "name" : "f", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__q_167", - "owner" : "cl", - "name" : "q", - "access" : 17, - "parameters" : [ "arg0" ], - "descriptor" : "(Lgg;I)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "PcmStreamMixer", - "name" : "ct", - "super" : "dc", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "subStreams", - "owner" : "ct", - "name" : "m", - "access" : 0, - "descriptor" : "Lje;" - }, { - "field" : "__o", - "owner" : "ct", - "name" : "o", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__q", - "owner" : "ct", - "name" : "q", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__f", - "owner" : "ct", - "name" : "f", - "access" : 0, - "descriptor" : "Lje;" - } ], - "methods" : [ { - "method" : "addSubStream", - "owner" : "ct", - "name" : "m", - "access" : 49, - "parameters" : [ "subStream" ], - "descriptor" : "(Ldc;)V" - }, { - "method" : "firstSubStream", - "owner" : "ct", - "name" : "u", - "access" : 4, - "parameters" : [ ], - "descriptor" : "()Ldc;" - }, { - "method" : "nextSubStream", - "owner" : "ct", - "name" : "g", - "access" : 4, - "parameters" : [ ], - "descriptor" : "()Ldc;" - }, { - "method" : "removeSubStream", - "owner" : "ct", - "name" : "f", - "access" : 49, - "parameters" : [ "subStream" ], - "descriptor" : "(Ldc;)V" - }, { - "method" : "skipSubStreams", - "owner" : "ct", - "name" : "a", - "access" : 0, - "parameters" : [ "length" ], - "descriptor" : "(I)V" - }, { - "method" : "updateSubStreams", - "owner" : "ct", - "name" : "x", - "access" : 0, - "parameters" : [ "buffer", "start", "end" ], - "descriptor" : "([III)V" - }, { - "method" : "__q_168", - "owner" : "ct", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__w_169", - "owner" : "ct", - "name" : "w", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Lgw;Ldf;)V" - }, { - "method" : "__o_170", - "owner" : "ct", - "name" : "o", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(Ldf;)V" - }, { - "method" : "__l_171", - "owner" : "ct", - "name" : "l", - "access" : 4, - "parameters" : [ ], - "descriptor" : "()I" - }, { - "method" : "__e_172", - "owner" : "ct", - "name" : "e", - "access" : 49, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "([III)V" - }, { - "method" : "__d_173", - "owner" : "ct", - "name" : "d", - "access" : 49, - "parameters" : [ "arg0" ], - "descriptor" : "(I)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "SoundEffect", - "name" : "ci", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "end", - "owner" : "ci", - "name" : "w", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "instruments", - "owner" : "ci", - "name" : "f", - "access" : 0, - "descriptor" : "[Ldb;" - }, { - "field" : "start", - "owner" : "ci", - "name" : "q", - "access" : 0, - "descriptor" : "I" - } ], - "methods" : [ { - "method" : "mix", - "owner" : "ci", - "name" : "w", - "access" : 16, - "parameters" : [ ], - "descriptor" : "()[B" - }, { - "method" : "toRawSound", - "owner" : "ci", - "name" : "f", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Lcx;" - }, { - "method" : "__q_174", - "owner" : "ci", - "name" : "q", - "access" : 17, - "parameters" : [ ], - "descriptor" : "()I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Lgr;)V" - } ] -}, { - "class" : "MusicSample", - "name" : "cd", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "end", - "owner" : "cd", - "name" : "o", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "sampleCount", - "owner" : "cd", - "name" : "q", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "sampleRate", - "owner" : "cd", - "name" : "f", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "samples", - "owner" : "cd", - "name" : "ac", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "start", - "owner" : "cd", - "name" : "w", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__b", - "owner" : "cd", - "name" : "b", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "__u", - "owner" : "cd", - "name" : "u", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "__m", - "owner" : "cd", - "name" : "m", - "access" : 0, - "descriptor" : "[[B" - }, { - "field" : "__t", - "owner" : "cd", - "name" : "t", - "access" : 0, - "descriptor" : "[F" - }, { - "field" : "__ah", - "owner" : "cd", - "name" : "ah", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__ay", - "owner" : "cd", - "name" : "ay", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__h", - "owner" : "cd", - "name" : "h", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__y", - "owner" : "cd", - "name" : "y", - "access" : 0, - "descriptor" : "I" - } ], - "methods" : [ { - "method" : "read", - "owner" : "cd", - "name" : "o", - "access" : 0, - "descriptor" : "([B)V" - }, { - "method" : "toRawSound", - "owner" : "cd", - "name" : "x", - "access" : 0, - "descriptor" : "([I)Lcx;" - }, { - "method" : "__g_175", - "owner" : "cd", - "name" : "g", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(I)[F" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "([B)V" - } ] -}, { - "class" : "RawSound", - "name" : "cx", - "super" : "dd", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "end", - "owner" : "cx", - "name" : "w", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "sampleRate", - "owner" : "cx", - "name" : "m", - "access" : 1, - "descriptor" : "I" - }, { - "field" : "samples", - "owner" : "cx", - "name" : "f", - "access" : 1, - "descriptor" : "[B" - }, { - "field" : "start", - "owner" : "cx", - "name" : "q", - "access" : 1, - "descriptor" : "I" - }, { - "field" : "__o", - "owner" : "cx", - "name" : "o", - "access" : 1, - "descriptor" : "Z" - } ], - "methods" : [ { - "method" : "resample", - "owner" : "cx", - "name" : "m", - "access" : 1, - "parameters" : [ "decimator" ], - "descriptor" : "(Ldp;)Lcx;" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(I[BII)V" - }, { - "access" : 0, - "descriptor" : "(I[BIIZ)V" - } ] -}, { - "class" : "PcmPlayer", - "name" : "co", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "capacity", - "owner" : "co", - "name" : "s", - "access" : 0, - "descriptor" : "I", - "decoder" : -1671644011 - }, { - "field" : "frequency", - "owner" : "co", - "name" : "t", - "access" : 0, - "descriptor" : "I", - "decoder" : 951871565 - }, { - "field" : "nextPosition", - "owner" : "co", - "name" : "r", - "access" : 0, - "descriptor" : "I", - "decoder" : -1586398263 - }, { - "field" : "retryTimeMs", - "owner" : "co", - "name" : "h", - "access" : 0, - "descriptor" : "J", - "decoder" : -200656835998283411 - }, { - "field" : "samples", - "owner" : "co", - "name" : "i", - "access" : 4, - "descriptor" : "[I" - }, { - "field" : "stream0", - "owner" : "co", - "name" : "a", - "access" : 0, - "descriptor" : "Ldc;" - }, { - "field" : "timeMs", - "owner" : "co", - "name" : "j", - "access" : 0, - "descriptor" : "J", - "decoder" : -8124323644430480811 - }, { - "field" : "__v", - "owner" : "co", - "name" : "v", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "__ah", - "owner" : "co", - "name" : "ah", - "access" : 0, - "descriptor" : "[Ldc;" - }, { - "field" : "__ay", - "owner" : "co", - "name" : "ay", - "access" : 0, - "descriptor" : "[Ldc;" - }, { - "field" : "__ac", - "owner" : "co", - "name" : "ac", - "access" : 0, - "descriptor" : "I", - "decoder" : -645495803 - }, { - "field" : "__b", - "owner" : "co", - "name" : "b", - "access" : 0, - "descriptor" : "I", - "decoder" : 48658021 - }, { - "field" : "__c", - "owner" : "co", - "name" : "c", - "access" : 0, - "descriptor" : "I", - "decoder" : 1624619697 - }, { - "field" : "__y", - "owner" : "co", - "name" : "y", - "access" : 0, - "descriptor" : "I", - "decoder" : 1907203055 - }, { - "field" : "__z", - "owner" : "co", - "name" : "z", - "access" : 0, - "descriptor" : "I", - "decoder" : 1125788887 - }, { - "field" : "__p", - "owner" : "co", - "name" : "p", - "access" : 0, - "descriptor" : "J", - "decoder" : -8188447292076890879 - } ], - "methods" : [ { - "method" : "close", - "owner" : "co", - "name" : "o", - "access" : 4, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "discard", - "owner" : "co", - "name" : "u", - "access" : 4, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "fill", - "owner" : "co", - "name" : "aw", - "access" : 16, - "parameters" : [ "buffer", "length" ], - "descriptor" : "([II)V" - }, { - "method" : "init", - "owner" : "co", - "name" : "m", - "access" : 4, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "open", - "owner" : "co", - "name" : "f", - "access" : 4, - "parameters" : [ "bufferSize" ], - "descriptor" : "(II)V" - }, { - "method" : "position", - "owner" : "co", - "name" : "q", - "access" : 4, - "parameters" : [ ], - "descriptor" : "(B)I" - }, { - "method" : "run", - "owner" : "co", - "name" : "ar", - "access" : 49, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "setStream", - "owner" : "co", - "name" : "av", - "access" : 49, - "parameters" : [ "stream" ], - "descriptor" : "(Ldc;I)V" - }, { - "method" : "shutdown", - "owner" : "co", - "name" : "ah", - "access" : 49, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "skip", - "owner" : "co", - "name" : "ak", - "access" : 16, - "parameters" : [ "length" ], - "descriptor" : "(II)V" - }, { - "method" : "tryDiscard", - "owner" : "co", - "name" : "ay", - "access" : 49, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "write", - "owner" : "co", - "name" : "w", - "access" : 4, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__ac_176", - "owner" : "co", - "name" : "ac", - "access" : 17, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__ab_177", - "owner" : "co", - "name" : "ab", - "access" : 16, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ldc;II)V" - } ], - "constructors" : [ { - "access" : 4, - "descriptor" : "()V" - } ] -}, { - "class" : "SoundSystem", - "name" : "dx", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "java.lang.Runnable" ], - "fields" : [ { - "field" : "players", - "owner" : "dx", - "name" : "m", - "access" : 64, - "descriptor" : "[Lco;" - } ], - "methods" : [ { - "method" : "__run_178", - "owner" : "dx", - "name" : "run", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "PcmStreamMixerListener", - "name" : "df", - "super" : "gw", - "access" : 1057, - "interfaces" : [ ], - "fields" : [ { - "field" : "__m", - "owner" : "df", - "name" : "m", - "access" : 0, - "descriptor" : "I" - } ], - "methods" : [ { - "method" : "remove2", - "owner" : "df", - "name" : "m", - "access" : 1024, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "update", - "owner" : "df", - "name" : "f", - "access" : 1024, - "parameters" : [ "mixer" ], - "descriptor" : "(Lct;)I" - } ], - "constructors" : [ ] -}, { - "class" : "RawPcmStream", - "name" : "ds", - "super" : "dc", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "end", - "owner" : "ds", - "name" : "d", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "start", - "owner" : "ds", - "name" : "x", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__k", - "owner" : "ds", - "name" : "k", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "__a", - "owner" : "ds", - "name" : "a", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__e", - "owner" : "ds", - "name" : "e", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__f", - "owner" : "ds", - "name" : "f", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__g", - "owner" : "ds", - "name" : "g", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__i", - "owner" : "ds", - "name" : "i", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__l", - "owner" : "ds", - "name" : "l", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__m", - "owner" : "ds", - "name" : "m", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__n", - "owner" : "ds", - "name" : "n", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__o", - "owner" : "ds", - "name" : "o", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__q", - "owner" : "ds", - "name" : "q", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__u", - "owner" : "ds", - "name" : "u", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__z", - "owner" : "ds", - "name" : "z", - "access" : 0, - "descriptor" : "I" - } ], - "methods" : [ { - "method" : "__az_179", - "owner" : "ds", - "name" : "az", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()I" - }, { - "method" : "__o_180", - "owner" : "ds", - "name" : "o", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__x_181", - "owner" : "ds", - "name" : "x", - "access" : 33, - "parameters" : [ "arg0" ], - "descriptor" : "(I)V" - }, { - "method" : "__a_182", - "owner" : "ds", - "name" : "a", - "access" : 33, - "parameters" : [ "arg0" ], - "descriptor" : "(I)V" - }, { - "method" : "__z_183", - "owner" : "ds", - "name" : "z", - "access" : 32, - "parameters" : [ "arg0" ], - "descriptor" : "(I)V" - }, { - "method" : "__j_184", - "owner" : "ds", - "name" : "j", - "access" : 32, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(II)V" - }, { - "method" : "__s_185", - "owner" : "ds", - "name" : "s", - "access" : 33, - "parameters" : [ ], - "descriptor" : "()I" - }, { - "method" : "__t_186", - "owner" : "ds", - "name" : "t", - "access" : 33, - "parameters" : [ ], - "descriptor" : "()I" - }, { - "method" : "__y_187", - "owner" : "ds", - "name" : "y", - "access" : 33, - "parameters" : [ "arg0" ], - "descriptor" : "(I)V" - }, { - "method" : "__h_188", - "owner" : "ds", - "name" : "h", - "access" : 33, - "parameters" : [ "arg0" ], - "descriptor" : "(Z)V" - }, { - "method" : "__b_189", - "owner" : "ds", - "name" : "b", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__c_190", - "owner" : "ds", - "name" : "c", - "access" : 33, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(II)V" - }, { - "method" : "__p_191", - "owner" : "ds", - "name" : "p", - "access" : 33, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(III)V" - }, { - "method" : "__v_192", - "owner" : "ds", - "name" : "v", - "access" : 33, - "parameters" : [ "arg0" ], - "descriptor" : "(I)V" - }, { - "method" : "__ah_193", - "owner" : "ds", - "name" : "ah", - "access" : 33, - "parameters" : [ "arg0" ], - "descriptor" : "(I)V" - }, { - "method" : "__ab_194", - "owner" : "ds", - "name" : "ab", - "access" : 33, - "parameters" : [ ], - "descriptor" : "()I" - }, { - "method" : "__ae_195", - "owner" : "ds", - "name" : "ae", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Z" - }, { - "method" : "__at_196", - "owner" : "ds", - "name" : "at", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Z" - }, { - "method" : "__u_197", - "owner" : "ds", - "name" : "u", - "access" : 4, - "parameters" : [ ], - "descriptor" : "()Ldc;" - }, { - "method" : "__g_198", - "owner" : "ds", - "name" : "g", - "access" : 4, - "parameters" : [ ], - "descriptor" : "()Ldc;" - }, { - "method" : "__l_199", - "owner" : "ds", - "name" : "l", - "access" : 4, - "parameters" : [ ], - "descriptor" : "()I" - }, { - "method" : "__e_200", - "owner" : "ds", - "name" : "e", - "access" : 33, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "([III)V" - }, { - "method" : "__d_201", - "owner" : "ds", - "name" : "d", - "access" : 33, - "parameters" : [ "arg0" ], - "descriptor" : "(I)V" - }, { - "method" : "__ad_202", - "owner" : "ds", - "name" : "ad", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], - "descriptor" : "([IIIII)I" - }, { - "method" : "__ap_203", - "owner" : "ds", - "name" : "ap", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], - "descriptor" : "([IIIII)I" - }, { - "method" : "__au_204", - "owner" : "ds", - "name" : "au", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Lcx;II)V" - }, { - "access" : 0, - "descriptor" : "(Lcx;III)V" - } ] -}, { - "class" : "AudioFilter", - "name" : "di", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__m", - "owner" : "di", - "name" : "m", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__o", - "owner" : "di", - "name" : "o", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__q", - "owner" : "di", - "name" : "q", - "access" : 0, - "descriptor" : "[[[I" - }, { - "field" : "__w", - "owner" : "di", - "name" : "w", - "access" : 0, - "descriptor" : "[[[I" - } ], - "methods" : [ { - "method" : "__m_205", - "owner" : "di", - "name" : "m", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(IIF)F" - }, { - "method" : "__q_206", - "owner" : "di", - "name" : "q", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(IIF)F" - }, { - "method" : "__w_207", - "owner" : "di", - "name" : "w", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(IF)I" - }, { - "method" : "__o_208", - "owner" : "di", - "name" : "o", - "access" : 16, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Lgr;Lde;)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "PcmStream", - "name" : "dc", - "super" : "gw", - "access" : 1057, - "interfaces" : [ ], - "fields" : [ { - "field" : "active", - "owner" : "dc", - "name" : "w", - "access" : 64, - "descriptor" : "Z" - }, { - "field" : "after", - "owner" : "dc", - "name" : "j", - "access" : 0, - "descriptor" : "Ldc;" - }, { - "field" : "sound", - "owner" : "dc", - "name" : "t", - "access" : 0, - "descriptor" : "Ldd;" - }, { - "field" : "__s", - "owner" : "dc", - "name" : "s", - "access" : 0, - "descriptor" : "I" - } ], - "methods" : [ { - "method" : "fill", - "owner" : "dc", - "name" : "e", - "access" : 1028, - "parameters" : [ "buffer", "start", "end" ], - "descriptor" : "([III)V" - }, { - "method" : "firstSubStream", - "owner" : "dc", - "name" : "u", - "access" : 1028, - "parameters" : [ ], - "descriptor" : "()Ldc;" - }, { - "method" : "nextSubStream", - "owner" : "dc", - "name" : "g", - "access" : 1028, - "parameters" : [ ], - "descriptor" : "()Ldc;" - }, { - "method" : "skip", - "owner" : "dc", - "name" : "d", - "access" : 1028, - "parameters" : [ "length" ], - "descriptor" : "(I)V" - }, { - "method" : "update", - "owner" : "dc", - "name" : "ef", - "access" : 16, - "parameters" : [ "buffer", "start", "end" ], - "descriptor" : "([III)V" - }, { - "method" : "__az_209", - "owner" : "dc", - "name" : "az", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()I" - }, { - "method" : "__l_210", - "owner" : "dc", - "name" : "l", - "access" : 1028, - "parameters" : [ ], - "descriptor" : "()I" - } ], - "constructors" : [ { - "access" : 4, - "descriptor" : "()V" - } ] -}, { - "class" : "Instrument", - "name" : "db", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "delayDecay", - "owner" : "db", - "name" : "n", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "delayTime", - "owner" : "db", - "name" : "k", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "duration", - "owner" : "db", - "name" : "z", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "filter", - "owner" : "db", - "name" : "i", - "access" : 0, - "descriptor" : "Ldi;" - }, { - "field" : "offset", - "owner" : "db", - "name" : "j", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "oscillatorDelays", - "owner" : "db", - "name" : "d", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "oscillatorPitch", - "owner" : "db", - "name" : "x", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "oscillatorVolume", - "owner" : "db", - "name" : "e", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__a", - "owner" : "db", - "name" : "a", - "access" : 0, - "descriptor" : "Lde;" - }, { - "field" : "__f", - "owner" : "db", - "name" : "f", - "access" : 0, - "descriptor" : "Lde;" - }, { - "field" : "__g", - "owner" : "db", - "name" : "g", - "access" : 0, - "descriptor" : "Lde;" - }, { - "field" : "__l", - "owner" : "db", - "name" : "l", - "access" : 0, - "descriptor" : "Lde;" - }, { - "field" : "__m", - "owner" : "db", - "name" : "m", - "access" : 0, - "descriptor" : "Lde;" - }, { - "field" : "__o", - "owner" : "db", - "name" : "o", - "access" : 0, - "descriptor" : "Lde;" - }, { - "field" : "__q", - "owner" : "db", - "name" : "q", - "access" : 0, - "descriptor" : "Lde;" - }, { - "field" : "__u", - "owner" : "db", - "name" : "u", - "access" : 0, - "descriptor" : "Lde;" - }, { - "field" : "__w", - "owner" : "db", - "name" : "w", - "access" : 0, - "descriptor" : "Lde;" - } ], - "methods" : [ { - "method" : "decode", - "owner" : "db", - "name" : "q", - "access" : 16, - "parameters" : [ "buffer" ], - "descriptor" : "(Lgr;)V" - }, { - "method" : "evaluateWave", - "owner" : "db", - "name" : "f", - "access" : 16, - "descriptor" : "(III)I" - }, { - "method" : "synthesize", - "owner" : "db", - "name" : "m", - "access" : 16, - "descriptor" : "(II)[I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "BufferedFile", - "name" : "dy", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "accessFile", - "owner" : "dy", - "name" : "m", - "access" : 0, - "descriptor" : "Ldk;" - }, { - "field" : "capacity", - "owner" : "dy", - "name" : "x", - "access" : 0, - "descriptor" : "J", - "decoder" : 2663146692618913943 - }, { - "field" : "readBuffer", - "owner" : "dy", - "name" : "f", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "writeBuffer", - "owner" : "dy", - "name" : "o", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "__g", - "owner" : "dy", - "name" : "g", - "access" : 0, - "descriptor" : "I", - "decoder" : -1558233611 - }, { - "field" : "__w", - "owner" : "dy", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : -846810907 - }, { - "field" : "__d", - "owner" : "dy", - "name" : "d", - "access" : 0, - "descriptor" : "J", - "decoder" : 5720856138805191881 - }, { - "field" : "__e", - "owner" : "dy", - "name" : "e", - "access" : 0, - "descriptor" : "J", - "decoder" : -3728247331531750871 - }, { - "field" : "__l", - "owner" : "dy", - "name" : "l", - "access" : 0, - "descriptor" : "J", - "decoder" : -6819476051574242871 - }, { - "field" : "__q", - "owner" : "dy", - "name" : "q", - "access" : 0, - "descriptor" : "J", - "decoder" : -7773729680030815835 - }, { - "field" : "__u", - "owner" : "dy", - "name" : "u", - "access" : 0, - "descriptor" : "J", - "decoder" : 5249231081498323007 - } ], - "methods" : [ { - "method" : "close", - "owner" : "dy", - "name" : "m", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "flush", - "owner" : "dy", - "name" : "l", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "length", - "owner" : "dy", - "name" : "q", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)J" - }, { - "method" : "load", - "owner" : "dy", - "name" : "u", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "read", - "owner" : "dy", - "name" : "o", - "access" : 1, - "parameters" : [ "dst", "dstIndex", "length" ], - "descriptor" : "([BIIB)V" - }, { - "method" : "readFill", - "owner" : "dy", - "name" : "w", - "access" : 1, - "parameters" : [ "dst" ], - "descriptor" : "([BI)V" - }, { - "method" : "seek", - "owner" : "dy", - "name" : "f", - "access" : 1, - "parameters" : [ "index" ], - "descriptor" : "(J)V" - }, { - "method" : "write", - "owner" : "dy", - "name" : "g", - "access" : 1, - "parameters" : [ "src", "srcIndex", "length" ], - "descriptor" : "([BIII)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Ldk;II)V" - } ] -}, { - "class" : "AccessFile", - "name" : "dk", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "capacity", - "owner" : "dk", - "name" : "f", - "access" : 0, - "descriptor" : "J", - "decoder" : -5849841282281477349 - }, { - "field" : "file", - "owner" : "dk", - "name" : "m", - "access" : 0, - "descriptor" : "Ljava/io/RandomAccessFile;" - }, { - "field" : "index", - "owner" : "dk", - "name" : "q", - "access" : 0, - "descriptor" : "J", - "decoder" : 7465414039279036117 - } ], - "methods" : [ { - "method" : "close", - "owner" : "dk", - "name" : "q", - "access" : 17, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "closeSync", - "owner" : "dk", - "name" : "w", - "access" : 17, - "parameters" : [ "sync" ], - "descriptor" : "(ZI)V" - }, { - "method" : "length", - "owner" : "dk", - "name" : "o", - "access" : 17, - "parameters" : [ ], - "descriptor" : "(I)J" - }, { - "method" : "read", - "owner" : "dk", - "name" : "u", - "access" : 17, - "parameters" : [ "dst", "dstIndex", "length" ], - "descriptor" : "([BIII)I" - }, { - "method" : "seek", - "owner" : "dk", - "name" : "m", - "access" : 16, - "parameters" : [ "index" ], - "descriptor" : "(J)V" - }, { - "method" : "write", - "owner" : "dk", - "name" : "f", - "access" : 17, - "parameters" : [ "src", "srcIndex", "length" ], - "descriptor" : "([BIIB)V" - }, { - "method" : "__finalize_211", - "owner" : "dk", - "name" : "finalize", - "access" : 4, - "parameters" : [ ], - "descriptor" : "()V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Ljava/io/File;Ljava/lang/String;J)V" - } ] -}, { - "class" : "TextureProvider", - "name" : "dl", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "ei" ], - "fields" : [ { - "field" : "brightness0", - "owner" : "dl", - "name" : "o", - "access" : 0, - "descriptor" : "D" - }, { - "field" : "capacity", - "owner" : "dl", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : 762273989 - }, { - "field" : "deque", - "owner" : "dl", - "name" : "f", - "access" : 0, - "descriptor" : "Lje;" - }, { - "field" : "indexCache", - "owner" : "dl", - "name" : "g", - "access" : 0, - "descriptor" : "Lir;" - }, { - "field" : "remaining", - "owner" : "dl", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : 1130378699 - }, { - "field" : "textureSize", - "owner" : "dl", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : 1124790219 - }, { - "field" : "textures", - "owner" : "dl", - "name" : "m", - "access" : 0, - "descriptor" : "[Ldh;" - } ], - "methods" : [ { - "method" : "animate", - "owner" : "dl", - "name" : "l", - "access" : 1, - "parameters" : [ "n" ], - "descriptor" : "(II)V" - }, { - "method" : "clear", - "owner" : "dl", - "name" : "g", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "isLowDetail", - "owner" : "dl", - "name" : "u", - "access" : 1, - "descriptor" : "(II)Z" - }, { - "method" : "load", - "owner" : "dl", - "name" : "q", - "access" : 1, - "descriptor" : "(II)[I" - }, { - "method" : "setBrightness", - "owner" : "dl", - "name" : "f", - "access" : 1, - "parameters" : [ "brightness" ], - "descriptor" : "(D)V" - }, { - "method" : "__m_212", - "owner" : "dl", - "name" : "m", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__w_213", - "owner" : "dl", - "name" : "w", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(II)I" - }, { - "method" : "__o_214", - "owner" : "dl", - "name" : "o", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(IB)Z" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Lir;Lir;IDI)V" - } ] -}, { - "class" : "ModelData", - "name" : "dw", - "super" : "ex", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "faceAlphas", - "owner" : "dw", - "name" : "d", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "faceColors", - "owner" : "dw", - "name" : "n", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "faceCount", - "owner" : "dw", - "name" : "o", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "faceLabelsAlpha", - "owner" : "dw", - "name" : "r", - "access" : 0, - "descriptor" : "[[I" - }, { - "field" : "faceNormals", - "owner" : "dw", - "name" : "p", - "access" : 0, - "descriptor" : "[Lel;" - }, { - "field" : "faceTextures", - "owner" : "dw", - "name" : "i", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "indices1", - "owner" : "dw", - "name" : "u", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "indices2", - "owner" : "dw", - "name" : "g", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "indices3", - "owner" : "dw", - "name" : "l", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "isBoundsCalculated", - "owner" : "dw", - "name" : "av", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "vertexLabels", - "owner" : "dw", - "name" : "c", - "access" : 0, - "descriptor" : "[[I" - }, { - "field" : "verticesCount", - "owner" : "dw", - "name" : "m", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "verticesX", - "owner" : "dw", - "name" : "f", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "verticesY", - "owner" : "dw", - "name" : "q", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "verticesZ", - "owner" : "dw", - "name" : "w", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__a", - "owner" : "dw", - "name" : "a", - "access" : 0, - "descriptor" : "B" - }, { - "field" : "__e", - "owner" : "dw", - "name" : "e", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "__j", - "owner" : "dw", - "name" : "j", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "__k", - "owner" : "dw", - "name" : "k", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "__x", - "owner" : "dw", - "name" : "x", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "__ag", - "owner" : "dw", - "name" : "ag", - "access" : 0, - "descriptor" : "[Ldq;" - }, { - "field" : "__v", - "owner" : "dw", - "name" : "v", - "access" : 0, - "descriptor" : "[Ldq;" - }, { - "field" : "__ac", - "owner" : "dw", - "name" : "ac", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__ah", - "owner" : "dw", - "name" : "ah", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__ak", - "owner" : "dw", - "name" : "ak", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__ar", - "owner" : "dw", - "name" : "ar", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__ay", - "owner" : "dw", - "name" : "ay", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__z", - "owner" : "dw", - "name" : "z", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__b", - "owner" : "dw", - "name" : "b", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__h", - "owner" : "dw", - "name" : "h", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__s", - "owner" : "dw", - "name" : "s", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "__t", - "owner" : "dw", - "name" : "t", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "__y", - "owner" : "dw", - "name" : "y", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "__aj", - "owner" : "dw", - "name" : "aj", - "access" : 1, - "descriptor" : "S" - }, { - "field" : "__aq", - "owner" : "dw", - "name" : "aq", - "access" : 1, - "descriptor" : "S" - } ], - "methods" : [ { - "method" : "invalidate", - "owner" : "dw", - "name" : "b", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "recolor", - "owner" : "dw", - "name" : "j", - "access" : 1, - "parameters" : [ "from", "to" ], - "descriptor" : "(SS)V" - }, { - "method" : "retexture", - "owner" : "dw", - "name" : "s", - "access" : 1, - "parameters" : [ "from", "to" ], - "descriptor" : "(SS)V" - }, { - "method" : "toModel", - "owner" : "dw", - "name" : "v", - "access" : 17, - "parameters" : [ "a", "b", "c", "d", "e" ], - "descriptor" : "(IIIII)Ldu;" - }, { - "method" : "__f_215", - "owner" : "dw", - "name" : "f", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "([B)V" - }, { - "method" : "__q_216", - "owner" : "dw", - "name" : "q", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "([B)V" - }, { - "method" : "__w_217", - "owner" : "dw", - "name" : "w", - "access" : 16, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ldw;I)I" - }, { - "method" : "__o_218", - "owner" : "dw", - "name" : "o", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Ldw;" - }, { - "method" : "__u_219", - "owner" : "dw", - "name" : "u", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], - "descriptor" : "([[IIIIZI)Ldw;" - }, { - "method" : "__g_220", - "owner" : "dw", - "name" : "g", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__l_221", - "owner" : "dw", - "name" : "l", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__x_222", - "owner" : "dw", - "name" : "x", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__d_223", - "owner" : "dw", - "name" : "d", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__a_224", - "owner" : "dw", - "name" : "a", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(I)V" - }, { - "method" : "__z_225", - "owner" : "dw", - "name" : "z", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(III)V" - }, { - "method" : "__t_226", - "owner" : "dw", - "name" : "t", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__y_227", - "owner" : "dw", - "name" : "y", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(III)V" - }, { - "method" : "__h_228", - "owner" : "dw", - "name" : "h", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__c_229", - "owner" : "dw", - "name" : "c", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - }, { - "access" : 0, - "descriptor" : "([B)V" - }, { - "access" : 1, - "descriptor" : "([Ldw;I)V" - }, { - "access" : 1, - "descriptor" : "(Ldw;ZZZZ)V" - } ] -}, { - "class" : "TileModel", - "name" : "dv", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "isFlat", - "owner" : "dv", - "name" : "d", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "overlayRgb", - "owner" : "dv", - "name" : "a", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "rotation", - "owner" : "dv", - "name" : "n", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "shape", - "owner" : "dv", - "name" : "k", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "underlayRgb", - "owner" : "dv", - "name" : "i", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__e", - "owner" : "dv", - "name" : "e", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__f", - "owner" : "dv", - "name" : "f", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__g", - "owner" : "dv", - "name" : "g", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__l", - "owner" : "dv", - "name" : "l", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__m", - "owner" : "dv", - "name" : "m", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__o", - "owner" : "dv", - "name" : "o", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__q", - "owner" : "dv", - "name" : "q", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__u", - "owner" : "dv", - "name" : "u", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__w", - "owner" : "dv", - "name" : "w", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__x", - "owner" : "dv", - "name" : "x", - "access" : 0, - "descriptor" : "[I" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(IIIIIIIIIIIIIIIIIII)V" - } ] -}, { - "class" : "Texture", - "name" : "dh", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "animationDirection", - "owner" : "dh", - "name" : "d", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "animationSpeed", - "owner" : "dh", - "name" : "k", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "int1", - "owner" : "dh", - "name" : "o", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "isLoaded", - "owner" : "dh", - "name" : "i", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "pixels", - "owner" : "dh", - "name" : "n", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "records", - "owner" : "dh", - "name" : "g", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__u", - "owner" : "dh", - "name" : "u", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "__e", - "owner" : "dh", - "name" : "e", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__l", - "owner" : "dh", - "name" : "l", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__x", - "owner" : "dh", - "name" : "x", - "access" : 0, - "descriptor" : "[I" - } ], - "methods" : [ { - "method" : "animate", - "owner" : "dh", - "name" : "q", - "access" : 0, - "parameters" : [ "n" ], - "descriptor" : "(I)V" - }, { - "method" : "reset", - "owner" : "dh", - "name" : "f", - "access" : 0, - "descriptor" : "()V" - }, { - "method" : "__m_230", - "owner" : "dh", - "name" : "m", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(DILir;)Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Lgr;)V" - } ] -}, { - "class" : "Tile", - "name" : "dj", - "super" : "gw", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "boundaryObject", - "owner" : "dj", - "name" : "g", - "access" : 0, - "descriptor" : "Lej;" - }, { - "field" : "drawGameObjectEdges", - "owner" : "dj", - "name" : "t", - "access" : 0, - "descriptor" : "I", - "decoder" : 769252193 - }, { - "field" : "drawGameObjects", - "owner" : "dj", - "name" : "s", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "drawPrimary", - "owner" : "dj", - "name" : "z", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "drawSecondary", - "owner" : "dj", - "name" : "j", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "floorDecoration", - "owner" : "dj", - "name" : "e", - "access" : 0, - "descriptor" : "Ldo;" - }, { - "field" : "gameObjectEdgeMasks", - "owner" : "dj", - "name" : "n", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "gameObjects", - "owner" : "dj", - "name" : "k", - "access" : 0, - "descriptor" : "[Leh;" - }, { - "field" : "gameObjectsCount", - "owner" : "dj", - "name" : "d", - "access" : 0, - "descriptor" : "I", - "decoder" : -792635627 - }, { - "field" : "gameObjectsEdgeMask", - "owner" : "dj", - "name" : "i", - "access" : 0, - "descriptor" : "I", - "decoder" : 1192947815 - }, { - "field" : "groundItemPile", - "owner" : "dj", - "name" : "x", - "access" : 0, - "descriptor" : "Ldr;" - }, { - "field" : "linkedBelowTile", - "owner" : "dj", - "name" : "c", - "access" : 0, - "descriptor" : "Ldj;" - }, { - "field" : "minPlane", - "owner" : "dj", - "name" : "a", - "access" : 0, - "descriptor" : "I", - "decoder" : -1078135311 - }, { - "field" : "model", - "owner" : "dj", - "name" : "u", - "access" : 0, - "descriptor" : "Ldv;" - }, { - "field" : "originalPlane", - "owner" : "dj", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : 507854577 - }, { - "field" : "paint", - "owner" : "dj", - "name" : "o", - "access" : 0, - "descriptor" : "Leb;" - }, { - "field" : "plane", - "owner" : "dj", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : 1065165981 - }, { - "field" : "wallDecoration", - "owner" : "dj", - "name" : "l", - "access" : 0, - "descriptor" : "Leq;" - }, { - "field" : "x", - "owner" : "dj", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 103024387 - }, { - "field" : "y", - "owner" : "dj", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -561562755 - }, { - "field" : "__b", - "owner" : "dj", - "name" : "b", - "access" : 0, - "descriptor" : "I", - "decoder" : 2030010491 - }, { - "field" : "__h", - "owner" : "dj", - "name" : "h", - "access" : 0, - "descriptor" : "I", - "decoder" : -172066661 - }, { - "field" : "__y", - "owner" : "dj", - "name" : "y", - "access" : 0, - "descriptor" : "I", - "decoder" : 1724493981 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(III)V" - } ] -}, { - "class" : "Model", - "name" : "du", - "super" : "ex", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "bottomY", - "owner" : "du", - "name" : "aj", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "boundsType", - "owner" : "du", - "name" : "aq", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "diameter", - "owner" : "du", - "name" : "ar", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "faceAlphas", - "owner" : "du", - "name" : "j", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "faceColors1", - "owner" : "du", - "name" : "n", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "faceColors2", - "owner" : "du", - "name" : "i", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "faceColors3", - "owner" : "du", - "name" : "a", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "faceLabelsAlpha", - "owner" : "du", - "name" : "v", - "access" : 0, - "descriptor" : "[[I" - }, { - "field" : "faceTextures", - "owner" : "du", - "name" : "t", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "indices1", - "owner" : "du", - "name" : "x", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "indices2", - "owner" : "du", - "name" : "d", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "indices3", - "owner" : "du", - "name" : "k", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "indicesCount", - "owner" : "du", - "name" : "e", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "isSingleTile", - "owner" : "du", - "name" : "ag", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "radius", - "owner" : "du", - "name" : "ac", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "vertexLabels", - "owner" : "du", - "name" : "p", - "access" : 0, - "descriptor" : "[[I" - }, { - "field" : "verticesCount", - "owner" : "du", - "name" : "o", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "verticesX", - "owner" : "du", - "name" : "u", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "verticesY", - "owner" : "du", - "name" : "g", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "verticesZ", - "owner" : "du", - "name" : "l", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "xMid", - "owner" : "du", - "name" : "ay", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "xMidOffset", - "owner" : "du", - "name" : "aw", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "xzRadius", - "owner" : "du", - "name" : "av", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "yMid", - "owner" : "du", - "name" : "ah", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "yMidOffset", - "owner" : "du", - "name" : "al", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "zMid", - "owner" : "du", - "name" : "ak", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "zMidOffset", - "owner" : "du", - "name" : "ab", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__y", - "owner" : "du", - "name" : "y", - "access" : 0, - "descriptor" : "B" - }, { - "field" : "__s", - "owner" : "du", - "name" : "s", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "__z", - "owner" : "du", - "name" : "z", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "__h", - "owner" : "du", - "name" : "h", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__b", - "owner" : "du", - "name" : "b", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__c", - "owner" : "du", - "name" : "c", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__r", - "owner" : "du", - "name" : "r", - "access" : 0, - "descriptor" : "[I" - } ], - "methods" : [ { - "method" : "animate", - "owner" : "du", - "name" : "d", - "access" : 1, - "parameters" : [ "frames", "frame" ], - "descriptor" : "(Len;I)V", - "finalArgument" : -2 - }, { - "method" : "animate2", - "owner" : "du", - "name" : "a", - "access" : 1, - "descriptor" : "(Len;ILen;I[I)V" - }, { - "method" : "calculateBoundingBox", - "owner" : "du", - "name" : "o", - "access" : 0, - "parameters" : [ "yaw" ], - "descriptor" : "(I)V" - }, { - "method" : "calculateBoundsCylinder", - "owner" : "du", - "name" : "u", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "copy0", - "owner" : "du", - "name" : "w", - "access" : 0, - "descriptor" : "(ZLdu;[B)Ldu;" - }, { - "method" : "draw", - "owner" : "du", - "name" : "cy", - "access" : 0, - "parameters" : [ "yaw", "cameraPitchSine", "cameraPitchCosine", "cameraYawSine", "cameraYawCosine", "x", "y", "z", "tag" ], - "descriptor" : "(IIIIIIIIJ)V" - }, { - "method" : "draw0", - "owner" : "du", - "name" : "v", - "access" : 16, - "descriptor" : "(ZZZJ)V" - }, { - "method" : "offsetBy", - "owner" : "du", - "name" : "h", - "access" : 1, - "parameters" : [ "x", "y", "z" ], - "descriptor" : "(III)V" - }, { - "method" : "resetBounds", - "owner" : "du", - "name" : "x", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "rotateY180", - "owner" : "du", - "name" : "s", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "rotateY270Ccw", - "owner" : "du", - "name" : "t", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "rotateY90Ccw", - "owner" : "du", - "name" : "j", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "rotateZ", - "owner" : "du", - "name" : "y", - "access" : 1, - "parameters" : [ "pitch" ], - "descriptor" : "(I)V" - }, { - "method" : "scale", - "owner" : "du", - "name" : "b", - "access" : 1, - "parameters" : [ "x", "y", "z" ], - "descriptor" : "(III)V" - }, { - "method" : "toSharedSequenceModel", - "owner" : "du", - "name" : "f", - "access" : 1, - "parameters" : [ "b" ], - "descriptor" : "(Z)Ldu;" - }, { - "method" : "toSharedSpotAnimationModel", - "owner" : "du", - "name" : "q", - "access" : 1, - "parameters" : [ "b" ], - "descriptor" : "(Z)Ldu;" - }, { - "method" : "transform", - "owner" : "du", - "name" : "z", - "access" : 0, - "parameters" : [ "type", "labels", "tx", "ty", "tz" ], - "descriptor" : "(I[IIII)V" - }, { - "method" : "__m_231", - "owner" : "du", - "name" : "m", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], - "descriptor" : "([[IIIIZI)Ldu;" - }, { - "method" : "__g_232", - "owner" : "du", - "name" : "g", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__l_233", - "owner" : "du", - "name" : "l", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()I" - }, { - "method" : "__c_234", - "owner" : "du", - "name" : "c", - "access" : 17, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6" ], - "descriptor" : "(IIIIIII)V" - }, { - "method" : "__p_235", - "owner" : "du", - "name" : "p", - "access" : 17, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7" ], - "descriptor" : "(IIIIIIII)V" - }, { - "method" : "__ag_236", - "owner" : "du", - "name" : "ag", - "access" : 16, - "parameters" : [ "arg0" ], - "descriptor" : "(I)V" - }, { - "method" : "__aq_237", - "owner" : "du", - "name" : "aq", - "access" : 16, - "parameters" : [ "arg0" ], - "descriptor" : "(I)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - }, { - "access" : 1, - "descriptor" : "([Ldu;I)V" - } ] -}, { - "class" : "VertexNormal", - "name" : "dq", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__f", - "owner" : "dq", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : -1493845293 - }, { - "field" : "__m", - "owner" : "dq", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : 1414310131 - }, { - "field" : "__q", - "owner" : "dq", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : 1575149515 - }, { - "field" : "__w", - "owner" : "dq", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : -487323631 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - }, { - "access" : 0, - "descriptor" : "(Ldq;)V" - } ] -}, { - "class" : "Scene", - "name" : "em", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "minPlane", - "owner" : "em", - "name" : "g", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "planes", - "owner" : "em", - "name" : "f", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "tempGameObjects", - "owner" : "em", - "name" : "e", - "access" : 0, - "descriptor" : "[Leh;" - }, { - "field" : "tempGameObjectsCount", - "owner" : "em", - "name" : "l", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "tileHeights", - "owner" : "em", - "name" : "o", - "access" : 0, - "descriptor" : "[[[I" - }, { - "field" : "tiles", - "owner" : "em", - "name" : "u", - "access" : 0, - "descriptor" : "[[[Ldj;" - }, { - "field" : "xSize", - "owner" : "em", - "name" : "q", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "ySize", - "owner" : "em", - "name" : "w", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__bd", - "owner" : "em", - "name" : "bd", - "access" : 0, - "descriptor" : "[[I" - }, { - "field" : "__bk", - "owner" : "em", - "name" : "bk", - "access" : 0, - "descriptor" : "[[I" - }, { - "field" : "__x", - "owner" : "em", - "name" : "x", - "access" : 0, - "descriptor" : "[[[I" - } ], - "methods" : [ { - "method" : "addTile", - "owner" : "em", - "name" : "u", - "access" : 1, - "descriptor" : "(IIIIIIIIIIIIIIIIIIII)V" - }, { - "method" : "clear", - "owner" : "em", - "name" : "m", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "clearTempGameObjects", - "owner" : "em", - "name" : "s", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "draw", - "owner" : "em", - "name" : "az", - "access" : 1, - "parameters" : [ "x", "y", "z", "pitch", "yaw", "plane" ], - "descriptor" : "(IIIIII)V" - }, { - "method" : "drawTile", - "owner" : "em", - "name" : "au", - "access" : 0, - "parameters" : [ "tile", "b" ], - "descriptor" : "(Ldj;Z)V" - }, { - "method" : "drawTileMinimap", - "owner" : "em", - "name" : "ae", - "access" : 1, - "parameters" : [ "pixels", "index", "width", "plane", "x", "y" ], - "descriptor" : "([IIIIII)V" - }, { - "method" : "getBoundaryObject", - "owner" : "em", - "name" : "ag", - "access" : 1, - "parameters" : [ "plane", "x", "y" ], - "descriptor" : "(III)Lej;" - }, { - "method" : "getFloorDecoration", - "owner" : "em", - "name" : "av", - "access" : 1, - "parameters" : [ "plane", "x", "y" ], - "descriptor" : "(III)Ldo;" - }, { - "method" : "getFloorDecorationTag", - "owner" : "em", - "name" : "ah", - "access" : 1, - "parameters" : [ "plane", "x", "y" ], - "descriptor" : "(III)J" - }, { - "method" : "getObjectFlags", - "owner" : "em", - "name" : "ak", - "access" : 1, - "parameters" : [ "plane", "x", "y", "id" ], - "descriptor" : "(IIIJ)I" - }, { - "method" : "getWallDecoration", - "owner" : "em", - "name" : "aq", - "access" : 1, - "parameters" : [ "plane", "x", "y" ], - "descriptor" : "(III)Leq;" - }, { - "method" : "init", - "owner" : "em", - "name" : "f", - "access" : 1, - "parameters" : [ "minPlane" ], - "descriptor" : "(I)V" - }, { - "method" : "menuOpen", - "owner" : "em", - "name" : "ap", - "access" : 1, - "parameters" : [ "plane", "screenX", "screenY", "b" ], - "descriptor" : "(IIIZ)V" - }, { - "method" : "newBoundaryObject", - "owner" : "em", - "name" : "e", - "access" : 1, - "parameters" : [ "plane", "x", "y", "tileHeight", "entity1", "entity2", "orientationA", "orientationB", "tag", "flags" ], - "descriptor" : "(IIIILex;Lex;IIJI)V" - }, { - "method" : "newFloorDecoration", - "owner" : "em", - "name" : "g", - "access" : 1, - "parameters" : [ "plane", "x", "y", "tileHeight", "entity", "tag", "flags" ], - "descriptor" : "(IIIILex;JI)V" - }, { - "method" : "newGameObject", - "owner" : "em", - "name" : "j", - "access" : 0, - "parameters" : [ "plane", "startX", "startY", "sizeX", "sizeY", "centerX", "centerY", "height", "entity", "orientation", "isTemp", "tag", "flags" ], - "descriptor" : "(IIIIIIIILex;IZJI)Z" - }, { - "method" : "newGroundItemPile", - "owner" : "em", - "name" : "l", - "access" : 1, - "parameters" : [ "plane", "x", "y", "tileHeight", "first", "tag", "second", "third" ], - "descriptor" : "(IIIILex;JLex;Lex;)V" - }, { - "method" : "newWallDecoration", - "owner" : "em", - "name" : "x", - "access" : 1, - "parameters" : [ "plane", "x", "y", "tileHeight", "entity1", "entity2", "orientation", "int7", "xOffset", "yOffset", "tag", "flags" ], - "descriptor" : "(IIIILex;Lex;IIIIJI)V" - }, { - "method" : "occlude", - "owner" : "em", - "name" : "ai", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "removeBoundaryObject", - "owner" : "em", - "name" : "h", - "access" : 1, - "parameters" : [ "plane", "x", "y" ], - "descriptor" : "(III)V" - }, { - "method" : "removeFloorDecoration", - "owner" : "em", - "name" : "p", - "access" : 1, - "parameters" : [ "plane", "x", "y" ], - "descriptor" : "(III)V" - }, { - "method" : "removeGameObject", - "owner" : "em", - "name" : "t", - "access" : 0, - "parameters" : [ "gameObject" ], - "descriptor" : "(Leh;)V" - }, { - "method" : "removeGroundItemPile", - "owner" : "em", - "name" : "v", - "access" : 1, - "parameters" : [ "plane", "x", "y" ], - "descriptor" : "(III)V" - }, { - "method" : "removeWallDecoration", - "owner" : "em", - "name" : "b", - "access" : 1, - "parameters" : [ "plane", "x", "y" ], - "descriptor" : "(III)V" - }, { - "method" : "setLinkBelow", - "owner" : "em", - "name" : "q", - "access" : 1, - "parameters" : [ "x", "y" ], - "descriptor" : "(II)V" - }, { - "method" : "setTileMinPlane", - "owner" : "em", - "name" : "o", - "access" : 1, - "parameters" : [ "plane", "x", "y", "minPlane" ], - "descriptor" : "(IIII)V" - }, { - "method" : "__d_238", - "owner" : "em", - "name" : "d", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7", "arg8", "arg9" ], - "descriptor" : "(IIIIIILex;IJI)Z" - }, { - "method" : "__a_239", - "owner" : "em", - "name" : "a", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7", "arg8" ], - "descriptor" : "(IIIIILex;IJZ)Z" - }, { - "method" : "__z_240", - "owner" : "em", - "name" : "z", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7", "arg8", "arg9", "arg10", "arg11" ], - "descriptor" : "(IIIIILex;IJIIII)Z" - }, { - "method" : "__y_241", - "owner" : "em", - "name" : "y", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], - "descriptor" : "(IIII)V" - }, { - "method" : "__c_242", - "owner" : "em", - "name" : "c", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(III)V" - }, { - "method" : "__aj_243", - "owner" : "em", - "name" : "aj", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(III)Leh;" - }, { - "method" : "__ar_244", - "owner" : "em", - "name" : "ar", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(III)J" - }, { - "method" : "__ac_245", - "owner" : "em", - "name" : "ac", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(III)J" - }, { - "method" : "__ay_246", - "owner" : "em", - "name" : "ay", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(III)J" - }, { - "method" : "__aw_247", - "owner" : "em", - "name" : "aw", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(III)V" - }, { - "method" : "__al_248", - "owner" : "em", - "name" : "al", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], - "descriptor" : "(Ldw;III)V" - }, { - "method" : "__ab_249", - "owner" : "em", - "name" : "ab", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], - "descriptor" : "(Ldw;IIIII)V" - }, { - "method" : "__as_250", - "owner" : "em", - "name" : "as", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__ao_251", - "owner" : "em", - "name" : "ao", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7" ], - "descriptor" : "(Leb;IIIIIII)V" - }, { - "method" : "__aa_252", - "owner" : "em", - "name" : "aa", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6" ], - "descriptor" : "(Ldv;IIIIII)V" - }, { - "method" : "__ba_253", - "owner" : "em", - "name" : "ba", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(III)Z" - }, { - "method" : "__bb_254", - "owner" : "em", - "name" : "bb", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], - "descriptor" : "(IIII)Z" - }, { - "method" : "__bs_255", - "owner" : "em", - "name" : "bs", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], - "descriptor" : "(IIII)Z" - }, { - "method" : "__bq_256", - "owner" : "em", - "name" : "bq", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], - "descriptor" : "(IIIIII)Z" - }, { - "method" : "__bn_257", - "owner" : "em", - "name" : "bn", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(III)Z" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(III[[[I)V" - } ] -}, { - "class" : "FaceNormal", - "name" : "el", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__f", - "owner" : "el", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : -1376860893 - }, { - "field" : "__m", - "owner" : "el", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : -2074333261 - }, { - "field" : "__q", - "owner" : "el", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : 2619977 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "TextureLoader", - "name" : "ei", - "super" : "java.lang.Object", - "access" : 1537, - "interfaces" : [ ], - "fields" : [ ], - "methods" : [ { - "method" : "isLowDetail", - "owner" : "ei", - "name" : "u", - "access" : 1025, - "descriptor" : "(II)Z" - }, { - "method" : "load", - "owner" : "ei", - "name" : "q", - "access" : 1025, - "descriptor" : "(II)[I" - }, { - "method" : "__w_258", - "owner" : "ei", - "name" : "w", - "access" : 1025, - "parameters" : [ "arg0" ], - "descriptor" : "(II)I" - }, { - "method" : "__o_259", - "owner" : "ei", - "name" : "o", - "access" : 1025, - "parameters" : [ "arg0" ], - "descriptor" : "(IB)Z" - } ], - "constructors" : [ ] -}, { - "class" : "Occluder", - "name" : "ee", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "maxTileX", - "owner" : "ee", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : -13700523 - }, { - "field" : "maxTileY", - "owner" : "ee", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : 1501977891 - }, { - "field" : "maxX", - "owner" : "ee", - "name" : "g", - "access" : 0, - "descriptor" : "I", - "decoder" : -2141305127 - }, { - "field" : "maxY", - "owner" : "ee", - "name" : "d", - "access" : 0, - "descriptor" : "I", - "decoder" : -1114046315 - }, { - "field" : "maxZ", - "owner" : "ee", - "name" : "e", - "access" : 0, - "descriptor" : "I", - "decoder" : -1805075909 - }, { - "field" : "minTileX", - "owner" : "ee", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : -691483983 - }, { - "field" : "minTileY", - "owner" : "ee", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : 768402657 - }, { - "field" : "minX", - "owner" : "ee", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : -1824663821 - }, { - "field" : "minY", - "owner" : "ee", - "name" : "x", - "access" : 0, - "descriptor" : "I", - "decoder" : 842961497 - }, { - "field" : "minZ", - "owner" : "ee", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : -41239751 - }, { - "field" : "type", - "owner" : "ee", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : -806776509 - }, { - "field" : "__a", - "owner" : "ee", - "name" : "a", - "access" : 0, - "descriptor" : "I", - "decoder" : -1527021367 - }, { - "field" : "__i", - "owner" : "ee", - "name" : "i", - "access" : 0, - "descriptor" : "I", - "decoder" : 1324959981 - }, { - "field" : "__j", - "owner" : "ee", - "name" : "j", - "access" : 0, - "descriptor" : "I", - "decoder" : -373839103 - }, { - "field" : "__k", - "owner" : "ee", - "name" : "k", - "access" : 0, - "descriptor" : "I", - "decoder" : 826041747 - }, { - "field" : "__n", - "owner" : "ee", - "name" : "n", - "access" : 0, - "descriptor" : "I", - "decoder" : -407777817 - }, { - "field" : "__s", - "owner" : "ee", - "name" : "s", - "access" : 0, - "descriptor" : "I", - "decoder" : -1334433969 - }, { - "field" : "__z", - "owner" : "ee", - "name" : "z", - "access" : 0, - "descriptor" : "I", - "decoder" : -570391007 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "GameObject", - "name" : "eh", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "centerX", - "owner" : "eh", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : 109300811 - }, { - "field" : "centerY", - "owner" : "eh", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : 714046631 - }, { - "field" : "endX", - "owner" : "eh", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : -379698951 - }, { - "field" : "endY", - "owner" : "eh", - "name" : "x", - "access" : 0, - "descriptor" : "I", - "decoder" : -607228629 - }, { - "field" : "entity", - "owner" : "eh", - "name" : "u", - "access" : 1, - "descriptor" : "Lex;" - }, { - "field" : "flags", - "owner" : "eh", - "name" : "i", - "access" : 0, - "descriptor" : "I", - "decoder" : -161115901 - }, { - "field" : "height", - "owner" : "eh", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -1791908691 - }, { - "field" : "lastDrawn", - "owner" : "eh", - "name" : "k", - "access" : 0, - "descriptor" : "I", - "decoder" : -1043687633 - }, { - "field" : "orientation", - "owner" : "eh", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : 1393658667 - }, { - "field" : "plane", - "owner" : "eh", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 2095667225 - }, { - "field" : "startX", - "owner" : "eh", - "name" : "g", - "access" : 0, - "descriptor" : "I", - "decoder" : -1017836867 - }, { - "field" : "startY", - "owner" : "eh", - "name" : "e", - "access" : 0, - "descriptor" : "I", - "decoder" : -1519796265 - }, { - "field" : "tag", - "owner" : "eh", - "name" : "n", - "access" : 1, - "descriptor" : "J", - "decoder" : -114546124748632877 - }, { - "field" : "__d", - "owner" : "eh", - "name" : "d", - "access" : 0, - "descriptor" : "I", - "decoder" : 1941106389 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "UrlRequester", - "name" : "eo", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "java.lang.Runnable" ], - "fields" : [ { - "field" : "isClosed", - "owner" : "eo", - "name" : "f", - "access" : 64, - "descriptor" : "Z" - }, { - "field" : "requests", - "owner" : "eo", - "name" : "q", - "access" : 0, - "descriptor" : "Ljava/util/Queue;" - }, { - "field" : "thread", - "owner" : "eo", - "name" : "m", - "access" : 16, - "descriptor" : "Ljava/lang/Thread;" - } ], - "methods" : [ { - "method" : "close", - "owner" : "eo", - "name" : "f", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(S)V" - }, { - "method" : "request", - "owner" : "eo", - "name" : "m", - "access" : 1, - "parameters" : [ "url" ], - "descriptor" : "(Ljava/net/URL;I)Ley;" - }, { - "method" : "__run_260", - "owner" : "eo", - "name" : "run", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "EvictingDualNodeHashTable", - "name" : "er", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "capacity", - "owner" : "er", - "name" : "f", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "deque", - "owner" : "er", - "name" : "o", - "access" : 0, - "descriptor" : "Ljp;" - }, { - "field" : "hashTable", - "owner" : "er", - "name" : "w", - "access" : 0, - "descriptor" : "Lld;" - }, { - "field" : "remainingCapacity", - "owner" : "er", - "name" : "q", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__m", - "owner" : "er", - "name" : "m", - "access" : 0, - "descriptor" : "Lfn;" - } ], - "methods" : [ { - "method" : "clear", - "owner" : "er", - "name" : "w", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "get", - "owner" : "er", - "name" : "m", - "access" : 1, - "parameters" : [ "key" ], - "descriptor" : "(J)Lfn;" - }, { - "method" : "put", - "owner" : "er", - "name" : "q", - "access" : 1, - "parameters" : [ "value", "key" ], - "descriptor" : "(Lfn;J)V" - }, { - "method" : "remove", - "owner" : "er", - "name" : "f", - "access" : 1, - "parameters" : [ "key" ], - "descriptor" : "(J)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(I)V" - } ] -}, { - "class" : "UserComparator4", - "name" : "ev", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "java.util.Comparator" ], - "fields" : [ { - "field" : "__m", - "owner" : "ev", - "name" : "m", - "access" : 16, - "descriptor" : "Z" - } ], - "methods" : [ { - "method" : "__m_261", - "owner" : "ev", - "name" : "m", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Lke;Lke;I)I" - }, { - "method" : "__compare_262", - "owner" : "ev", - "name" : "compare", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" - }, { - "method" : "__equals_263", - "owner" : "ev", - "name" : "equals", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/lang/Object;)Z" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Z)V" - } ] -}, { - "class" : "UserComparator9", - "name" : "ea", - "super" : "kf", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__m", - "owner" : "ea", - "name" : "m", - "access" : 16, - "descriptor" : "Z" - } ], - "methods" : [ { - "method" : "__m_264", - "owner" : "ea", - "name" : "m", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Lke;Lke;I)I" - }, { - "method" : "__compare_265", - "owner" : "ea", - "name" : "compare", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Z)V" - } ] -}, { - "class" : "UserComparator8", - "name" : "es", - "super" : "kf", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__m", - "owner" : "es", - "name" : "m", - "access" : 16, - "descriptor" : "Z" - } ], - "methods" : [ { - "method" : "__m_266", - "owner" : "es", - "name" : "m", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Lke;Lke;B)I" - }, { - "method" : "__compare_267", - "owner" : "es", - "name" : "compare", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Z)V" - } ] -}, { - "class" : "UserComparator10", - "name" : "eg", - "super" : "kf", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__m", - "owner" : "eg", - "name" : "m", - "access" : 16, - "descriptor" : "Z" - } ], - "methods" : [ { - "method" : "__m_268", - "owner" : "eg", - "name" : "m", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Lke;Lke;B)I" - }, { - "method" : "__compare_269", - "owner" : "eg", - "name" : "compare", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Z)V" - } ] -}, { - "class" : "UserComparator7", - "name" : "ez", - "super" : "kf", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__m", - "owner" : "ez", - "name" : "m", - "access" : 16, - "descriptor" : "Z" - } ], - "methods" : [ { - "method" : "__m_270", - "owner" : "ez", - "name" : "m", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Lke;Lke;I)I" - }, { - "method" : "__compare_271", - "owner" : "ez", - "name" : "compare", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Z)V" - } ] -}, { - "class" : "UserComparator5", - "name" : "ep", - "super" : "kf", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__m", - "owner" : "ep", - "name" : "m", - "access" : 16, - "descriptor" : "Z" - } ], - "methods" : [ { - "method" : "__m_272", - "owner" : "ep", - "name" : "m", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Lke;Lke;B)I" - }, { - "method" : "__compare_273", - "owner" : "ep", - "name" : "compare", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Z)V" - } ] -}, { - "class" : "UserComparator3", - "name" : "fq", - "super" : "kf", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__m", - "owner" : "fq", - "name" : "m", - "access" : 16, - "descriptor" : "Z" - } ], - "methods" : [ { - "method" : "__m_274", - "owner" : "fq", - "name" : "m", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Lke;Lke;I)I" - }, { - "method" : "__compare_275", - "owner" : "fq", - "name" : "compare", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Z)V" - } ] -}, { - "class" : "UserComparator6", - "name" : "fg", - "super" : "kf", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__m", - "owner" : "fg", - "name" : "m", - "access" : 16, - "descriptor" : "Z" - } ], - "methods" : [ { - "method" : "__m_276", - "owner" : "fg", - "name" : "m", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Lke;Lke;I)I" - }, { - "method" : "__compare_277", - "owner" : "fg", - "name" : "compare", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Z)V" - } ] -}, { - "class" : "MilliClock", - "name" : "fd", - "super" : "fa", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__f", - "owner" : "fd", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 1940981129 - }, { - "field" : "__o", - "owner" : "fd", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : 250272357 - }, { - "field" : "__q", - "owner" : "fd", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : 1217137493 - }, { - "field" : "__u", - "owner" : "fd", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : 576555527 - }, { - "field" : "__w", - "owner" : "fd", - "name" : "w", - "access" : 0, - "descriptor" : "J", - "decoder" : -8372744267470318611 - }, { - "field" : "__m", - "owner" : "fd", - "name" : "m", - "access" : 0, - "descriptor" : "[J" - } ], - "methods" : [ { - "method" : "mark", - "owner" : "fd", - "name" : "m", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "wait", - "owner" : "fd", - "name" : "f", - "access" : 1, - "parameters" : [ "cycleMs", "minSleepMs" ], - "descriptor" : "(III)I" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "BufferedSource", - "name" : "fh", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "java.lang.Runnable" ], - "fields" : [ { - "field" : "buffer", - "owner" : "fh", - "name" : "w", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "capacity", - "owner" : "fh", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : -1970062431 - }, { - "field" : "exception", - "owner" : "fh", - "name" : "g", - "access" : 0, - "descriptor" : "Ljava/io/IOException;" - }, { - "field" : "inputStream", - "owner" : "fh", - "name" : "f", - "access" : 0, - "descriptor" : "Ljava/io/InputStream;" - }, { - "field" : "limit", - "owner" : "fh", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : 1507905677 - }, { - "field" : "position", - "owner" : "fh", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : 267006153 - }, { - "field" : "thread", - "owner" : "fh", - "name" : "m", - "access" : 0, - "descriptor" : "Ljava/lang/Thread;" - } ], - "methods" : [ { - "method" : "available", - "owner" : "fh", - "name" : "f", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "close", - "owner" : "fh", - "name" : "o", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "isAvailable", - "owner" : "fh", - "name" : "m", - "access" : 0, - "parameters" : [ "length" ], - "descriptor" : "(II)Z" - }, { - "method" : "read", - "owner" : "fh", - "name" : "w", - "access" : 0, - "parameters" : [ "dst", "dstIndex", "length" ], - "descriptor" : "([BIIB)I" - }, { - "method" : "readUnsignedByte", - "owner" : "fh", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__run_278", - "owner" : "fh", - "name" : "run", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/io/InputStream;I)V" - } ] -}, { - "class" : "TaskHandler", - "name" : "fz", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "java.lang.Runnable" ], - "fields" : [ { - "field" : "current", - "owner" : "fz", - "name" : "q", - "access" : 0, - "descriptor" : "Lfm;" - }, { - "field" : "isClosed", - "owner" : "fz", - "name" : "u", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "task0", - "owner" : "fz", - "name" : "w", - "access" : 0, - "descriptor" : "Lfm;" - }, { - "field" : "thread", - "owner" : "fz", - "name" : "o", - "access" : 0, - "descriptor" : "Ljava/lang/Thread;" - } ], - "methods" : [ { - "method" : "close", - "owner" : "fz", - "name" : "m", - "access" : 17, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "newSocketTask", - "owner" : "fz", - "name" : "q", - "access" : 17, - "descriptor" : "(Ljava/lang/String;II)Lfm;" - }, { - "method" : "newTask", - "owner" : "fz", - "name" : "f", - "access" : 16, - "descriptor" : "(IIILjava/lang/Object;I)Lfm;" - }, { - "method" : "newThreadTask", - "owner" : "fz", - "name" : "w", - "access" : 17, - "descriptor" : "(Ljava/lang/Runnable;II)Lfm;" - }, { - "method" : "__run_279", - "owner" : "fz", - "name" : "run", - "access" : 17, - "parameters" : [ ], - "descriptor" : "()V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "BufferedNetSocket", - "name" : "ft", - "super" : "fu", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "sink", - "owner" : "ft", - "name" : "q", - "access" : 0, - "descriptor" : "Lfr;" - }, { - "field" : "socket", - "owner" : "ft", - "name" : "m", - "access" : 0, - "descriptor" : "Ljava/net/Socket;" - }, { - "field" : "source", - "owner" : "ft", - "name" : "f", - "access" : 0, - "descriptor" : "Lfh;" - } ], - "methods" : [ { - "method" : "available", - "owner" : "ft", - "name" : "q", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "close", - "owner" : "ft", - "name" : "g", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "isAvailable", - "owner" : "ft", - "name" : "f", - "access" : 1, - "parameters" : [ "length" ], - "descriptor" : "(II)Z" - }, { - "method" : "read", - "owner" : "ft", - "name" : "o", - "access" : 1, - "parameters" : [ "dst", "dstIndex", "length" ], - "descriptor" : "([BIII)I" - }, { - "method" : "readUnsignedByte", - "owner" : "ft", - "name" : "w", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "write", - "owner" : "ft", - "name" : "u", - "access" : 1, - "parameters" : [ "src", "srcIndex", "length" ], - "descriptor" : "([BIIB)V" - }, { - "method" : "__finalize_280", - "owner" : "ft", - "name" : "finalize", - "access" : 4, - "parameters" : [ ], - "descriptor" : "()V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/net/Socket;II)V" - } ] -}, { - "class" : "NetSocket", - "name" : "fb", - "super" : "fu", - "access" : 49, - "interfaces" : [ "java.lang.Runnable" ], - "fields" : [ { - "field" : "array", - "owner" : "fb", - "name" : "g", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "exceptionWriting", - "owner" : "fb", - "name" : "x", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "inputStream", - "owner" : "fb", - "name" : "m", - "access" : 0, - "descriptor" : "Ljava/io/InputStream;" - }, { - "field" : "isClosed", - "owner" : "fb", - "name" : "w", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "outputStream", - "owner" : "fb", - "name" : "f", - "access" : 0, - "descriptor" : "Ljava/io/OutputStream;" - }, { - "field" : "socket", - "owner" : "fb", - "name" : "q", - "access" : 0, - "descriptor" : "Ljava/net/Socket;" - }, { - "field" : "task", - "owner" : "fb", - "name" : "u", - "access" : 0, - "descriptor" : "Lfm;" - }, { - "field" : "taskHandler", - "owner" : "fb", - "name" : "o", - "access" : 0, - "descriptor" : "Lfz;" - }, { - "field" : "__e", - "owner" : "fb", - "name" : "e", - "access" : 0, - "descriptor" : "I", - "decoder" : 2057244853 - }, { - "field" : "__l", - "owner" : "fb", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : -738185459 - }, { - "field" : "__d", - "owner" : "fb", - "name" : "d", - "access" : 16, - "descriptor" : "I", - "decoder" : -1644762957 - }, { - "field" : "__k", - "owner" : "fb", - "name" : "k", - "access" : 16, - "descriptor" : "I", - "decoder" : -782964015 - } ], - "methods" : [ { - "method" : "available", - "owner" : "fb", - "name" : "q", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "close", - "owner" : "fb", - "name" : "g", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "finalize", - "owner" : "fb", - "name" : "finalize", - "access" : 4, - "descriptor" : "()V" - }, { - "method" : "isAvailable", - "owner" : "fb", - "name" : "f", - "access" : 1, - "parameters" : [ "length" ], - "descriptor" : "(II)Z" - }, { - "method" : "read", - "owner" : "fb", - "name" : "o", - "access" : 1, - "parameters" : [ "dst", "dstIndex", "length" ], - "descriptor" : "([BIII)I" - }, { - "method" : "readUnsignedByte", - "owner" : "fb", - "name" : "w", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "write", - "owner" : "fb", - "name" : "u", - "access" : 1, - "parameters" : [ "src", "srcIndex", "length" ], - "descriptor" : "([BIIB)V" - }, { - "method" : "write0", - "owner" : "fb", - "name" : "ay", - "access" : 0, - "parameters" : [ "src", "srcIndex", "length" ], - "descriptor" : "([BIIB)V" - }, { - "method" : "__run_281", - "owner" : "fb", - "name" : "run", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Ljava/net/Socket;Lfz;I)V" - } ] -}, { - "class" : "BufferedSink", - "name" : "fr", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "java.lang.Runnable" ], - "fields" : [ { - "field" : "buffer", - "owner" : "fr", - "name" : "w", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "capacity", - "owner" : "fr", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : 1805563727 - }, { - "field" : "exception", - "owner" : "fr", - "name" : "g", - "access" : 0, - "descriptor" : "Ljava/io/IOException;" - }, { - "field" : "isClosed0", - "owner" : "fr", - "name" : "l", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "limit", - "owner" : "fr", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : 1028856279 - }, { - "field" : "outputStream", - "owner" : "fr", - "name" : "f", - "access" : 0, - "descriptor" : "Ljava/io/OutputStream;" - }, { - "field" : "position", - "owner" : "fr", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : 315461309 - }, { - "field" : "thread", - "owner" : "fr", - "name" : "m", - "access" : 0, - "descriptor" : "Ljava/lang/Thread;" - } ], - "methods" : [ { - "method" : "close", - "owner" : "fr", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "isClosed", - "owner" : "fr", - "name" : "m", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "write", - "owner" : "fr", - "name" : "f", - "access" : 0, - "parameters" : [ "src", "srcIndex", "length" ], - "descriptor" : "([BIIB)V" - }, { - "method" : "__run_282", - "owner" : "fr", - "name" : "run", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/io/OutputStream;I)V" - } ] -}, { - "class" : "CollisionMap", - "name" : "fy", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "flags", - "owner" : "fy", - "name" : "ab", - "access" : 1, - "descriptor" : "[[I" - }, { - "field" : "xInset", - "owner" : "fy", - "name" : "ah", - "access" : 0, - "descriptor" : "I", - "decoder" : 264774249 - }, { - "field" : "xSize", - "owner" : "fy", - "name" : "aw", - "access" : 0, - "descriptor" : "I", - "decoder" : 674483785 - }, { - "field" : "yInset", - "owner" : "fy", - "name" : "ak", - "access" : 0, - "descriptor" : "I", - "decoder" : -1037712787 - }, { - "field" : "ySize", - "owner" : "fy", - "name" : "al", - "access" : 0, - "descriptor" : "I", - "decoder" : -871458249 - } ], - "methods" : [ { - "method" : "clear", - "owner" : "fy", - "name" : "m", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__f_283", - "owner" : "fy", - "name" : "f", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], - "descriptor" : "(IIIIZB)V" - }, { - "method" : "__q_284", - "owner" : "fy", - "name" : "q", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], - "descriptor" : "(IIIIZI)V" - }, { - "method" : "__w_285", - "owner" : "fy", - "name" : "w", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(III)V" - }, { - "method" : "__o_286", - "owner" : "fy", - "name" : "o", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(III)V" - }, { - "method" : "__u_287", - "owner" : "fy", - "name" : "u", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(IIII)V" - }, { - "method" : "__g_288", - "owner" : "fy", - "name" : "g", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], - "descriptor" : "(IIIIZB)V" - }, { - "method" : "__l_289", - "owner" : "fy", - "name" : "l", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], - "descriptor" : "(IIIIIZB)V" - }, { - "method" : "__e_290", - "owner" : "fy", - "name" : "e", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(IIII)V" - }, { - "method" : "__x_291", - "owner" : "fy", - "name" : "x", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(IIB)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(II)V" - } ] -}, { - "class" : "Link", - "name" : "gh", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__f", - "owner" : "gh", - "name" : "f", - "access" : 1, - "descriptor" : "Lgh;" - }, { - "field" : "__m", - "owner" : "gh", - "name" : "m", - "access" : 1, - "descriptor" : "Lgh;" - } ], - "methods" : [ { - "method" : "remove", - "owner" : "gh", - "name" : "m", - "access" : 1, - "descriptor" : "()V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "PacketBufferNode", - "name" : "gg", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "packetBuffer", - "owner" : "gg", - "name" : "q", - "access" : 1, - "descriptor" : "Lhx;" - }, { - "field" : "__m", - "owner" : "gg", - "name" : "m", - "access" : 1, - "descriptor" : "Lgs;" - }, { - "field" : "__f", - "owner" : "gg", - "name" : "f", - "access" : 1, - "descriptor" : "I", - "decoder" : 1433542775 - }, { - "field" : "__w", - "owner" : "gg", - "name" : "w", - "access" : 1, - "descriptor" : "I", - "decoder" : -2051819203 - } ], - "methods" : [ { - "method" : "__f_292", - "owner" : "gg", - "name" : "f", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "Huffman", - "name" : "gd", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__f", - "owner" : "gd", - "name" : "f", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "__m", - "owner" : "gd", - "name" : "m", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__q", - "owner" : "gd", - "name" : "q", - "access" : 0, - "descriptor" : "[I" - } ], - "methods" : [ { - "method" : "__m_293", - "owner" : "gd", - "name" : "m", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], - "descriptor" : "([BII[BIB)I" - }, { - "method" : "__f_294", - "owner" : "gd", - "name" : "f", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], - "descriptor" : "([BI[BIII)I" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "([B)V" - } ] -}, { - "class" : "Bzip2State", - "name" : "gt", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "__ag", - "owner" : "gt", - "name" : "ag", - "access" : 0, - "descriptor" : "[Z" - }, { - "field" : "__aq", - "owner" : "gt", - "name" : "aq", - "access" : 0, - "descriptor" : "[Z" - }, { - "field" : "__i", - "owner" : "gt", - "name" : "i", - "access" : 0, - "descriptor" : "B" - }, { - "field" : "__ac", - "owner" : "gt", - "name" : "ac", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "__aj", - "owner" : "gt", - "name" : "aj", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "__av", - "owner" : "gt", - "name" : "av", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "__ay", - "owner" : "gt", - "name" : "ay", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "__g", - "owner" : "gt", - "name" : "g", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "__x", - "owner" : "gt", - "name" : "x", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "__ah", - "owner" : "gt", - "name" : "ah", - "access" : 0, - "descriptor" : "[[B" - }, { - "field" : "__a", - "owner" : "gt", - "name" : "a", - "access" : 0, - "descriptor" : "I", - "decoder" : -1994129645 - }, { - "field" : "__ae", - "owner" : "gt", - "name" : "ae", - "access" : 0, - "descriptor" : "I", - "decoder" : 444639767 - }, { - "field" : "__c", - "owner" : "gt", - "name" : "c", - "access" : 0, - "descriptor" : "I", - "decoder" : -557334365 - }, { - "field" : "__d", - "owner" : "gt", - "name" : "d", - "access" : 0, - "descriptor" : "I", - "decoder" : -861462251 - }, { - "field" : "__e", - "owner" : "gt", - "name" : "e", - "access" : 0, - "descriptor" : "I", - "decoder" : -473971741 - }, { - "field" : "__h", - "owner" : "gt", - "name" : "h", - "access" : 0, - "descriptor" : "I", - "decoder" : -1981923611 - }, { - "field" : "__j", - "owner" : "gt", - "name" : "j", - "access" : 0, - "descriptor" : "I", - "decoder" : -1987934943 - }, { - "field" : "__k", - "owner" : "gt", - "name" : "k", - "access" : 0, - "descriptor" : "I", - "decoder" : 594179173 - }, { - "field" : "__l", - "owner" : "gt", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : -1510817847 - }, { - "field" : "__n", - "owner" : "gt", - "name" : "n", - "access" : 0, - "descriptor" : "I", - "decoder" : 1860254567 - }, { - "field" : "__s", - "owner" : "gt", - "name" : "s", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__t", - "owner" : "gt", - "name" : "t", - "access" : 0, - "descriptor" : "I", - "decoder" : 1502359789 - }, { - "field" : "__v", - "owner" : "gt", - "name" : "v", - "access" : 0, - "descriptor" : "I", - "decoder" : -886333045 - }, { - "field" : "__y", - "owner" : "gt", - "name" : "y", - "access" : 0, - "descriptor" : "I", - "decoder" : -953353963 - }, { - "field" : "__z", - "owner" : "gt", - "name" : "z", - "access" : 0, - "descriptor" : "I", - "decoder" : -1793367959 - }, { - "field" : "__ab", - "owner" : "gt", - "name" : "ab", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__ar", - "owner" : "gt", - "name" : "ar", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__b", - "owner" : "gt", - "name" : "b", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__r", - "owner" : "gt", - "name" : "r", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__ak", - "owner" : "gt", - "name" : "ak", - "access" : 0, - "descriptor" : "[[I" - }, { - "field" : "__al", - "owner" : "gt", - "name" : "al", - "access" : 0, - "descriptor" : "[[I" - }, { - "field" : "__aw", - "owner" : "gt", - "name" : "aw", - "access" : 0, - "descriptor" : "[[I" - }, { - "field" : "__f", - "owner" : "gt", - "name" : "f", - "access" : 16, - "descriptor" : "I" - }, { - "field" : "__m", - "owner" : "gt", - "name" : "m", - "access" : 16, - "descriptor" : "I" - }, { - "field" : "__o", - "owner" : "gt", - "name" : "o", - "access" : 16, - "descriptor" : "I" - }, { - "field" : "__q", - "owner" : "gt", - "name" : "q", - "access" : 16, - "descriptor" : "I" - }, { - "field" : "__u", - "owner" : "gt", - "name" : "u", - "access" : 16, - "descriptor" : "I" - }, { - "field" : "__w", - "owner" : "gt", - "name" : "w", - "access" : 16, - "descriptor" : "I" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "Buffer", - "name" : "gr", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "array", - "owner" : "gr", - "name" : "m", - "access" : 1, - "descriptor" : "[B" - }, { - "field" : "index", - "owner" : "gr", - "name" : "f", - "access" : 1, - "descriptor" : "I", - "decoder" : -271438207 - } ], - "methods" : [ { - "method" : "encryptRsa", - "owner" : "gr", - "name" : "ao", - "access" : 1, - "descriptor" : "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V" - }, { - "method" : "readBoolean", - "owner" : "gr", - "name" : "ac", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "readByte", - "owner" : "gr", - "name" : "v", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)B" - }, { - "method" : "readInt", - "owner" : "gr", - "name" : "av", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "readLong", - "owner" : "gr", - "name" : "ar", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)J" - }, { - "method" : "readMedium", - "owner" : "gr", - "name" : "aj", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "readStringCp1252NullCircumfixed", - "owner" : "gr", - "name" : "ak", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Ljava/lang/String;" - }, { - "method" : "readStringCp1252NullTerminated", - "owner" : "gr", - "name" : "ah", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Ljava/lang/String;" - }, { - "method" : "readStringCp1252NullTerminatedOrNull", - "owner" : "gr", - "name" : "ay", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Ljava/lang/String;" - }, { - "method" : "readUnsignedByte", - "owner" : "gr", - "name" : "p", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)I" - }, { - "method" : "readUnsignedByteNegate", - "owner" : "gr", - "name" : "bs", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "writeBoolean", - "owner" : "gr", - "name" : "e", - "access" : 1, - "parameters" : [ "value" ], - "descriptor" : "(ZB)V" - }, { - "method" : "writeByte", - "owner" : "gr", - "name" : "q", - "access" : 1, - "parameters" : [ "value" ], - "descriptor" : "(II)V" - }, { - "method" : "writeInt", - "owner" : "gr", - "name" : "u", - "access" : 1, - "parameters" : [ "value" ], - "descriptor" : "(II)V" - }, { - "method" : "writeIntLE", - "owner" : "gr", - "name" : "bi", - "access" : 1, - "parameters" : [ "value" ], - "descriptor" : "(IB)V" - }, { - "method" : "writeIntLE16", - "owner" : "gr", - "name" : "bg", - "access" : 1, - "parameters" : [ "value" ], - "descriptor" : "(II)V" - }, { - "method" : "writeIntME", - "owner" : "gr", - "name" : "bz", - "access" : 1, - "parameters" : [ "value" ], - "descriptor" : "(IB)V" - }, { - "method" : "writeLong", - "owner" : "gr", - "name" : "l", - "access" : 1, - "parameters" : [ "n" ], - "descriptor" : "(J)V" - }, { - "method" : "writeLongMedium", - "owner" : "gr", - "name" : "g", - "access" : 1, - "parameters" : [ "n" ], - "descriptor" : "(J)V" - }, { - "method" : "writeMedium", - "owner" : "gr", - "name" : "o", - "access" : 1, - "parameters" : [ "value" ], - "descriptor" : "(IB)V" - }, { - "method" : "writeShort", - "owner" : "gr", - "name" : "w", - "access" : 1, - "parameters" : [ "value" ], - "descriptor" : "(IB)V" - }, { - "method" : "writeShortLE", - "owner" : "gr", - "name" : "bc", - "access" : 1, - "parameters" : [ "value" ], - "descriptor" : "(IB)V" - }, { - "method" : "writeSmartByteShort", - "owner" : "gr", - "name" : "b", - "access" : 1, - "parameters" : [ "value" ], - "descriptor" : "(II)V" - }, { - "method" : "writeStringCp1252NullCircumfixed", - "owner" : "gr", - "name" : "z", - "access" : 1, - "parameters" : [ "string" ], - "descriptor" : "(Ljava/lang/String;S)V" - }, { - "method" : "writeStringCp1252NullTerminated", - "owner" : "gr", - "name" : "d", - "access" : 1, - "parameters" : [ "string" ], - "descriptor" : "(Ljava/lang/String;B)V" - }, { - "method" : "xteaDecrypt", - "owner" : "gr", - "name" : "au", - "access" : 1, - "parameters" : [ "xteaKey", "start", "end" ], - "descriptor" : "([IIII)V" - }, { - "method" : "xteaDecryptAll", - "owner" : "gr", - "name" : "an", - "access" : 1, - "parameters" : [ "xteaKey" ], - "descriptor" : "([II)V" - }, { - "method" : "xteaEncrypt", - "owner" : "gr", - "name" : "az", - "access" : 1, - "parameters" : [ "xteaKey", "start", "end" ], - "descriptor" : "([IIII)V" - }, { - "method" : "xteaEncryptAll", - "owner" : "gr", - "name" : "am", - "access" : 1, - "parameters" : [ "xteaKey" ], - "descriptor" : "([IB)V" - }, { - "method" : "__f_295", - "owner" : "gr", - "name" : "f", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(S)V" - }, { - "method" : "__j_296", - "owner" : "gr", - "name" : "j", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/lang/CharSequence;B)V" - }, { - "method" : "__s_297", - "owner" : "gr", - "name" : "s", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "([BIII)V" - }, { - "method" : "__t_298", - "owner" : "gr", - "name" : "t", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(II)V" - }, { - "method" : "__y_299", - "owner" : "gr", - "name" : "y", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(II)V" - }, { - "method" : "__h_300", - "owner" : "gr", - "name" : "h", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(II)V" - }, { - "method" : "__c_301", - "owner" : "gr", - "name" : "c", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(II)V" - }, { - "method" : "__ag_302", - "owner" : "gr", - "name" : "ag", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)I" - }, { - "method" : "__aq_303", - "owner" : "gr", - "name" : "aq", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)I" - }, { - "method" : "__aw_304", - "owner" : "gr", - "name" : "aw", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)Ljava/lang/String;" - }, { - "method" : "__al_305", - "owner" : "gr", - "name" : "al", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "([BIIB)V" - }, { - "method" : "__ab_306", - "owner" : "gr", - "name" : "ab", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)I" - }, { - "method" : "__ae_307", - "owner" : "gr", - "name" : "ae", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__at_308", - "owner" : "gr", - "name" : "at", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__ad_309", - "owner" : "gr", - "name" : "ad", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)I" - }, { - "method" : "__ap_310", - "owner" : "gr", - "name" : "ap", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__as_311", - "owner" : "gr", - "name" : "as", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__aa_312", - "owner" : "gr", - "name" : "aa", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(II)I" - }, { - "method" : "__ax_313", - "owner" : "gr", - "name" : "ax", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)Z" - }, { - "method" : "__af_314", - "owner" : "gr", - "name" : "af", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(IB)V" - }, { - "method" : "__ai_315", - "owner" : "gr", - "name" : "ai", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(II)V" - }, { - "method" : "__ba_316", - "owner" : "gr", - "name" : "ba", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(IB)V" - }, { - "method" : "__bb_317", - "owner" : "gr", - "name" : "bb", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__bq_318", - "owner" : "gr", - "name" : "bq", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__bn_319", - "owner" : "gr", - "name" : "bn", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)B" - }, { - "method" : "__bk_320", - "owner" : "gr", - "name" : "bk", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)B" - }, { - "method" : "__bd_321", - "owner" : "gr", - "name" : "bd", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)B" - }, { - "method" : "__bo_322", - "owner" : "gr", - "name" : "bo", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(II)V" - }, { - "method" : "__bx_323", - "owner" : "gr", - "name" : "bx", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(IB)V" - }, { - "method" : "__by_324", - "owner" : "gr", - "name" : "by", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__bu_325", - "owner" : "gr", - "name" : "bu", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__bm_326", - "owner" : "gr", - "name" : "bm", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)I" - }, { - "method" : "__bl_327", - "owner" : "gr", - "name" : "bl", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)I" - }, { - "method" : "__br_328", - "owner" : "gr", - "name" : "br", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__bj_329", - "owner" : "gr", - "name" : "bj", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__bt_330", - "owner" : "gr", - "name" : "bt", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__bp_331", - "owner" : "gr", - "name" : "bp", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__bf_332", - "owner" : "gr", - "name" : "bf", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)I" - }, { - "method" : "__bh_333", - "owner" : "gr", - "name" : "bh", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "([BIII)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(I)V" - }, { - "access" : 1, - "descriptor" : "([B)V" - } ] -}, { - "class" : "PacketBuffer", - "name" : "hx", - "super" : "gr", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "bitIndex", - "owner" : "hx", - "name" : "d", - "access" : 0, - "descriptor" : "I", - "decoder" : -1048718919 - }, { - "field" : "isaacCipher0", - "owner" : "hx", - "name" : "e", - "access" : 0, - "descriptor" : "Lhn;" - } ], - "methods" : [ { - "method" : "bitsRemaining", - "owner" : "hx", - "name" : "jr", - "access" : 1, - "parameters" : [ "index" ], - "descriptor" : "(II)I" - }, { - "method" : "exportIndex", - "owner" : "hx", - "name" : "jm", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "importIndex", - "owner" : "hx", - "name" : "jq", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "newIsaacCipher", - "owner" : "hx", - "name" : "io", - "access" : 1, - "parameters" : [ "array" ], - "descriptor" : "([II)V" - }, { - "method" : "readBits", - "owner" : "hx", - "name" : "jw", - "access" : 1, - "parameters" : [ "bits" ], - "descriptor" : "(II)I" - }, { - "method" : "readByteIsaac", - "owner" : "hx", - "name" : "ii", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "readSmartByteShortIsaac", - "owner" : "hx", - "name" : "ia", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "setIsaacCipher", - "owner" : "hx", - "name" : "ih", - "access" : 1, - "parameters" : [ "isaacCipher" ], - "descriptor" : "(Lhn;B)V" - }, { - "method" : "writeByteIsaac", - "owner" : "hx", - "name" : "im", - "access" : 1, - "parameters" : [ "b" ], - "descriptor" : "(IS)V" - }, { - "method" : "__ig_334", - "owner" : "hx", - "name" : "ig", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)Z" - }, { - "method" : "__jb_335", - "owner" : "hx", - "name" : "jb", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "([BIII)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(I)V" - } ] -}, { - "class" : "IsaacCipher", - "name" : "hn", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "__e", - "owner" : "hn", - "name" : "e", - "access" : 0, - "descriptor" : "I", - "decoder" : -689202647 - }, { - "field" : "__g", - "owner" : "hn", - "name" : "g", - "access" : 0, - "descriptor" : "I", - "decoder" : -1670027699 - }, { - "field" : "__l", - "owner" : "hn", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : -325762649 - }, { - "field" : "__w", - "owner" : "hn", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : 1514845493 - }, { - "field" : "__o", - "owner" : "hn", - "name" : "o", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__u", - "owner" : "hn", - "name" : "u", - "access" : 0, - "descriptor" : "[I" - } ], - "methods" : [ { - "method" : "__m_336", - "owner" : "hn", - "name" : "m", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__f_337", - "owner" : "hn", - "name" : "f", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__q_338", - "owner" : "hn", - "name" : "q", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "__w_339", - "owner" : "hn", - "name" : "w", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(I)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "([I)V" - } ] -}, { - "class" : "MusicPatchNode2", - "name" : "hd", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__f", - "owner" : "hd", - "name" : "f", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "__m", - "owner" : "hd", - "name" : "m", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "__e", - "owner" : "hd", - "name" : "e", - "access" : 0, - "descriptor" : "I", - "decoder" : 1984131473 - }, { - "field" : "__g", - "owner" : "hd", - "name" : "g", - "access" : 0, - "descriptor" : "I", - "decoder" : 391670135 - }, { - "field" : "__l", - "owner" : "hd", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : 320761691 - }, { - "field" : "__o", - "owner" : "hd", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : -1455145595 - }, { - "field" : "__q", - "owner" : "hd", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : 140046797 - }, { - "field" : "__u", - "owner" : "hd", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : 1577527995 - }, { - "field" : "__w", - "owner" : "hd", - "name" : "w", - "access" : 0, - "descriptor" : "I", - "decoder" : -249046051 - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "MidiPcmStream", - "name" : "hm", - "super" : "dc", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "midiFile", - "owner" : "hm", - "name" : "aq", - "access" : 0, - "descriptor" : "Lhs;" - }, { - "field" : "musicPatches", - "owner" : "hm", - "name" : "m", - "access" : 0, - "descriptor" : "Lld;" - }, { - "field" : "patchStream", - "owner" : "hm", - "name" : "ah", - "access" : 0, - "descriptor" : "Lhq;" - }, { - "field" : "track", - "owner" : "hm", - "name" : "av", - "access" : 0, - "descriptor" : "I", - "decoder" : 1450922835 - }, { - "field" : "trackLength", - "owner" : "hm", - "name" : "ar", - "access" : 0, - "descriptor" : "I", - "decoder" : 713752539 - }, { - "field" : "__aj", - "owner" : "hm", - "name" : "aj", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "__ag", - "owner" : "hm", - "name" : "ag", - "access" : 0, - "descriptor" : "[[Lha;" - }, { - "field" : "__v", - "owner" : "hm", - "name" : "v", - "access" : 0, - "descriptor" : "[[Lha;" - }, { - "field" : "__f", - "owner" : "hm", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 335918727 - }, { - "field" : "__q", - "owner" : "hm", - "name" : "q", - "access" : 0, - "descriptor" : "I", - "decoder" : 2095480747 - }, { - "field" : "__b", - "owner" : "hm", - "name" : "b", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__c", - "owner" : "hm", - "name" : "c", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__d", - "owner" : "hm", - "name" : "d", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__e", - "owner" : "hm", - "name" : "e", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__g", - "owner" : "hm", - "name" : "g", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__h", - "owner" : "hm", - "name" : "h", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__k", - "owner" : "hm", - "name" : "k", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__l", - "owner" : "hm", - "name" : "l", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__n", - "owner" : "hm", - "name" : "n", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__o", - "owner" : "hm", - "name" : "o", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__p", - "owner" : "hm", - "name" : "p", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__r", - "owner" : "hm", - "name" : "r", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__u", - "owner" : "hm", - "name" : "u", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__x", - "owner" : "hm", - "name" : "x", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__y", - "owner" : "hm", - "name" : "y", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__ac", - "owner" : "hm", - "name" : "ac", - "access" : 0, - "descriptor" : "J", - "decoder" : -7547625335559871937 - }, { - "field" : "__ay", - "owner" : "hm", - "name" : "ay", - "access" : 0, - "descriptor" : "J", - "decoder" : 3736036110499628937 - } ], - "methods" : [ { - "method" : "clear", - "owner" : "hm", - "name" : "a", - "access" : 33, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "clearAll", - "owner" : "hm", - "name" : "w", - "access" : 33, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "isReady", - "owner" : "hm", - "name" : "z", - "access" : 33, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "loadMusicTrack", - "owner" : "hm", - "name" : "q", - "access" : 33, - "parameters" : [ "musicTrack", "i", "s", "frequency" ], - "descriptor" : "(Lhe;Lir;Ldt;II)Z" - }, { - "method" : "removeAll", - "owner" : "hm", - "name" : "o", - "access" : 33, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "setMusicTrack", - "owner" : "hm", - "name" : "x", - "access" : 33, - "parameters" : [ "musicTrack", "b" ], - "descriptor" : "(Lhe;ZI)V" - }, { - "method" : "__m_340", - "owner" : "hm", - "name" : "m", - "access" : 33, - "parameters" : [ "arg0" ], - "descriptor" : "(IB)V" - }, { - "method" : "__f_341", - "owner" : "hm", - "name" : "f", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__j_342", - "owner" : "hm", - "name" : "j", - "access" : 33, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(III)V" - }, { - "method" : "__s_343", - "owner" : "hm", - "name" : "s", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(III)V" - }, { - "method" : "__t_344", - "owner" : "hm", - "name" : "t", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(III)V" - }, { - "method" : "__y_345", - "owner" : "hm", - "name" : "y", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(IIIB)V" - }, { - "method" : "__h_346", - "owner" : "hm", - "name" : "h", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Lha;ZI)V" - }, { - "method" : "__b_347", - "owner" : "hm", - "name" : "b", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(IIII)V" - }, { - "method" : "__c_348", - "owner" : "hm", - "name" : "c", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(IIII)V" - }, { - "method" : "__p_349", - "owner" : "hm", - "name" : "p", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(IIB)V" - }, { - "method" : "__v_350", - "owner" : "hm", - "name" : "v", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(IIB)V" - }, { - "method" : "__ah_351", - "owner" : "hm", - "name" : "ah", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(II)V" - }, { - "method" : "__ab_352", - "owner" : "hm", - "name" : "ab", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(II)V" - }, { - "method" : "__ae_353", - "owner" : "hm", - "name" : "ae", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(II)V" - }, { - "method" : "__at_354", - "owner" : "hm", - "name" : "at", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__ad_355", - "owner" : "hm", - "name" : "ad", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(II)V" - }, { - "method" : "__ap_356", - "owner" : "hm", - "name" : "ap", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(II)V" - }, { - "method" : "__au_357", - "owner" : "hm", - "name" : "au", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(II)V" - }, { - "method" : "__ao_358", - "owner" : "hm", - "name" : "ao", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(III)V" - }, { - "method" : "__aa_359", - "owner" : "hm", - "name" : "aa", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(Lha;I)I" - }, { - "method" : "__ax_360", - "owner" : "hm", - "name" : "ax", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(Lha;I)I" - }, { - "method" : "__af_361", - "owner" : "hm", - "name" : "af", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(Lha;I)I" - }, { - "method" : "__u_362", - "owner" : "hm", - "name" : "u", - "access" : 36, - "parameters" : [ ], - "descriptor" : "()Ldc;" - }, { - "method" : "__g_363", - "owner" : "hm", - "name" : "g", - "access" : 36, - "parameters" : [ ], - "descriptor" : "()Ldc;" - }, { - "method" : "__l_364", - "owner" : "hm", - "name" : "l", - "access" : 36, - "parameters" : [ ], - "descriptor" : "()I" - }, { - "method" : "__e_365", - "owner" : "hm", - "name" : "e", - "access" : 36, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "([III)V" - }, { - "method" : "__d_366", - "owner" : "hm", - "name" : "d", - "access" : 36, - "parameters" : [ "arg0" ], - "descriptor" : "(I)V" - }, { - "method" : "__ai_367", - "owner" : "hm", - "name" : "ai", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "__ba_368", - "owner" : "hm", - "name" : "ba", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(Lha;I)Z" - }, { - "method" : "__bb_369", - "owner" : "hm", - "name" : "bb", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], - "descriptor" : "(Lha;[IIII)Z" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "MusicPatchNode", - "name" : "ha", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "patch", - "owner" : "ha", - "name" : "f", - "access" : 0, - "descriptor" : "Lhl;" - }, { - "field" : "rawSound", - "owner" : "ha", - "name" : "q", - "access" : 0, - "descriptor" : "Lcx;" - }, { - "field" : "stream", - "owner" : "ha", - "name" : "t", - "access" : 0, - "descriptor" : "Lds;" - }, { - "field" : "__w", - "owner" : "ha", - "name" : "w", - "access" : 0, - "descriptor" : "Lhd;" - }, { - "field" : "__a", - "owner" : "ha", - "name" : "a", - "access" : 0, - "descriptor" : "I", - "decoder" : -2083252379 - }, { - "field" : "__b", - "owner" : "ha", - "name" : "b", - "access" : 0, - "descriptor" : "I", - "decoder" : 1359854411 - }, { - "field" : "__d", - "owner" : "ha", - "name" : "d", - "access" : 0, - "descriptor" : "I", - "decoder" : -852988281 - }, { - "field" : "__e", - "owner" : "ha", - "name" : "e", - "access" : 0, - "descriptor" : "I", - "decoder" : -471899285 - }, { - "field" : "__g", - "owner" : "ha", - "name" : "g", - "access" : 0, - "descriptor" : "I", - "decoder" : -836502917 - }, { - "field" : "__i", - "owner" : "ha", - "name" : "i", - "access" : 0, - "descriptor" : "I", - "decoder" : -2136855685 - }, { - "field" : "__j", - "owner" : "ha", - "name" : "j", - "access" : 0, - "descriptor" : "I", - "decoder" : 173672931 - }, { - "field" : "__k", - "owner" : "ha", - "name" : "k", - "access" : 0, - "descriptor" : "I", - "decoder" : -439388365 - }, { - "field" : "__l", - "owner" : "ha", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : -308599455 - }, { - "field" : "__m", - "owner" : "ha", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : 801157533 - }, { - "field" : "__n", - "owner" : "ha", - "name" : "n", - "access" : 0, - "descriptor" : "I", - "decoder" : 476852577 - }, { - "field" : "__o", - "owner" : "ha", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : -2058553171 - }, { - "field" : "__s", - "owner" : "ha", - "name" : "s", - "access" : 0, - "descriptor" : "I", - "decoder" : 219840779 - }, { - "field" : "__u", - "owner" : "ha", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : 62958303 - }, { - "field" : "__x", - "owner" : "ha", - "name" : "x", - "access" : 0, - "descriptor" : "I", - "decoder" : -1520706641 - }, { - "field" : "__y", - "owner" : "ha", - "name" : "y", - "access" : 0, - "descriptor" : "I", - "decoder" : -666877449 - }, { - "field" : "__z", - "owner" : "ha", - "name" : "z", - "access" : 0, - "descriptor" : "I", - "decoder" : 1605236771 - } ], - "methods" : [ { - "method" : "__m_370", - "owner" : "ha", - "name" : "m", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "MidiFileReader", - "name" : "hs", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "buffer", - "owner" : "hs", - "name" : "m", - "access" : 0, - "descriptor" : "Lgr;" - }, { - "field" : "division", - "owner" : "hs", - "name" : "f", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "trackLengths", - "owner" : "hs", - "name" : "o", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "trackPositions", - "owner" : "hs", - "name" : "w", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "trackStarts", - "owner" : "hs", - "name" : "q", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__g", - "owner" : "hs", - "name" : "g", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "__u", - "owner" : "hs", - "name" : "u", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__e", - "owner" : "hs", - "name" : "e", - "access" : 0, - "descriptor" : "J" - } ], - "methods" : [ { - "method" : "clear", - "owner" : "hs", - "name" : "f", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "getPrioritizedTrack", - "owner" : "hs", - "name" : "z", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()I" - }, { - "method" : "gotoTrack", - "owner" : "hs", - "name" : "o", - "access" : 0, - "parameters" : [ "trackId" ], - "descriptor" : "(I)V" - }, { - "method" : "isDone", - "owner" : "hs", - "name" : "j", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()Z" - }, { - "method" : "isReady", - "owner" : "hs", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()Z" - }, { - "method" : "markTrackPosition", - "owner" : "hs", - "name" : "u", - "access" : 0, - "parameters" : [ "trackId" ], - "descriptor" : "(I)V" - }, { - "method" : "parse", - "owner" : "hs", - "name" : "m", - "access" : 0, - "parameters" : [ "midi" ], - "descriptor" : "([B)V" - }, { - "method" : "readMessage", - "owner" : "hs", - "name" : "e", - "access" : 0, - "parameters" : [ "trackId" ], - "descriptor" : "(I)I" - }, { - "method" : "readMessage0", - "owner" : "hs", - "name" : "x", - "access" : 0, - "parameters" : [ "trackId" ], - "descriptor" : "(I)I" - }, { - "method" : "readTrackLength", - "owner" : "hs", - "name" : "l", - "access" : 0, - "parameters" : [ "trackId" ], - "descriptor" : "(I)V" - }, { - "method" : "reset", - "owner" : "hs", - "name" : "s", - "access" : 0, - "descriptor" : "(J)V" - }, { - "method" : "setTrackDone", - "owner" : "hs", - "name" : "g", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "trackCount", - "owner" : "hs", - "name" : "w", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()I" - }, { - "method" : "__d_371", - "owner" : "hs", - "name" : "d", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(II)I" - }, { - "method" : "__a_372", - "owner" : "hs", - "name" : "a", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(I)J" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - }, { - "access" : 0, - "descriptor" : "([B)V" - } ] -}, { - "class" : "MusicPatch", - "name" : "hl", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "rawSounds", - "owner" : "hl", - "name" : "f", - "access" : 0, - "descriptor" : "[Lcx;" - }, { - "field" : "__g", - "owner" : "hl", - "name" : "g", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "__o", - "owner" : "hl", - "name" : "o", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "__w", - "owner" : "hl", - "name" : "w", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "__u", - "owner" : "hl", - "name" : "u", - "access" : 0, - "descriptor" : "[Lhd;" - }, { - "field" : "__m", - "owner" : "hl", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : 574200865 - }, { - "field" : "__l", - "owner" : "hl", - "name" : "l", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__q", - "owner" : "hl", - "name" : "q", - "access" : 0, - "descriptor" : "[S" - } ], - "methods" : [ { - "method" : "clear", - "owner" : "hl", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "__f_373", - "owner" : "hl", - "name" : "f", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(Ldt;[B[II)Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "([B)V" - } ] -}, { - "class" : "MusicPatchPcmStream", - "name" : "hq", - "super" : "dc", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "mixer", - "owner" : "hq", - "name" : "q", - "access" : 0, - "descriptor" : "Lct;" - }, { - "field" : "queue", - "owner" : "hq", - "name" : "f", - "access" : 0, - "descriptor" : "Lje;" - }, { - "field" : "superStream", - "owner" : "hq", - "name" : "m", - "access" : 0, - "descriptor" : "Lhm;" - } ], - "methods" : [ { - "method" : "__u_374", - "owner" : "hq", - "name" : "u", - "access" : 4, - "parameters" : [ ], - "descriptor" : "()Ldc;" - }, { - "method" : "__g_375", - "owner" : "hq", - "name" : "g", - "access" : 4, - "parameters" : [ ], - "descriptor" : "()Ldc;" - }, { - "method" : "__l_376", - "owner" : "hq", - "name" : "l", - "access" : 4, - "parameters" : [ ], - "descriptor" : "()I" - }, { - "method" : "__e_377", - "owner" : "hq", - "name" : "e", - "access" : 4, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "([III)V" - }, { - "method" : "__d_378", - "owner" : "hq", - "name" : "d", - "access" : 4, - "parameters" : [ "arg0" ], - "descriptor" : "(I)V" - }, { - "method" : "__m_379", - "owner" : "hq", - "name" : "m", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], - "descriptor" : "(Lha;[IIIII)V" - }, { - "method" : "__f_380", - "owner" : "hq", - "name" : "f", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Lha;II)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Lhm;)V" - } ] -}, { - "class" : "MusicTrack", - "name" : "he", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "midi", - "owner" : "he", - "name" : "f", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "table", - "owner" : "he", - "name" : "m", - "access" : 0, - "descriptor" : "Lld;" - } ], - "methods" : [ { - "method" : "clear", - "owner" : "he", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__f_381", - "owner" : "he", - "name" : "f", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Lgr;)V" - } ] -}, { - "class" : "TileLocation", - "name" : "hu", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "plane", - "owner" : "hu", - "name" : "m", - "access" : 1, - "descriptor" : "I", - "decoder" : 503621925 - }, { - "field" : "x", - "owner" : "hu", - "name" : "f", - "access" : 1, - "descriptor" : "I", - "decoder" : 1225620013 - }, { - "field" : "y", - "owner" : "hu", - "name" : "q", - "access" : 1, - "descriptor" : "I", - "decoder" : 154740833 - } ], - "methods" : [ { - "method" : "equals0", - "owner" : "hu", - "name" : "f", - "access" : 0, - "parameters" : [ "other" ], - "descriptor" : "(Lhu;B)Z" - }, { - "method" : "packed", - "owner" : "hu", - "name" : "m", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "toString0", - "owner" : "hu", - "name" : "q", - "access" : 0, - "parameters" : [ "separator" ], - "descriptor" : "(Ljava/lang/String;I)Ljava/lang/String;" - }, { - "method" : "__equals_382", - "owner" : "hu", - "name" : "equals", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/lang/Object;)Z" - }, { - "method" : "__hashCode_383", - "owner" : "hu", - "name" : "hashCode", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()I" - }, { - "method" : "__toString_384", - "owner" : "hu", - "name" : "toString", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Ljava/lang/String;" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(III)V" - }, { - "access" : 1, - "descriptor" : "(Lhu;)V" - }, { - "access" : 1, - "descriptor" : "(I)V" - } ] -}, { - "class" : "PlayerAppearance", - "name" : "hi", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "bodyColors", - "owner" : "hi", - "name" : "f", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "equipment", - "owner" : "hi", - "name" : "m", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "isFemale", - "owner" : "hi", - "name" : "q", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "npcTransformId", - "owner" : "hi", - "name" : "w", - "access" : 1, - "descriptor" : "I", - "decoder" : 1676934923 - }, { - "field" : "__o", - "owner" : "hi", - "name" : "o", - "access" : 0, - "descriptor" : "J", - "decoder" : -3506189412688081513 - }, { - "field" : "__u", - "owner" : "hi", - "name" : "u", - "access" : 0, - "descriptor" : "J", - "decoder" : 8217880921734028425 - } ], - "methods" : [ { - "method" : "getChatHeadId", - "owner" : "hi", - "name" : "e", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)I" - }, { - "method" : "getModel", - "owner" : "hi", - "name" : "g", - "access" : 1, - "descriptor" : "(Ljh;ILjh;II)Ldu;" - }, { - "method" : "getModelData", - "owner" : "hi", - "name" : "l", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Ldw;" - }, { - "method" : "__m_385", - "owner" : "hi", - "name" : "m", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], - "descriptor" : "([I[IZII)V" - }, { - "method" : "__f_386", - "owner" : "hi", - "name" : "f", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(IZI)V" - }, { - "method" : "__q_387", - "owner" : "hi", - "name" : "q", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(IZI)V" - }, { - "method" : "__w_388", - "owner" : "hi", - "name" : "w", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(ZB)V" - }, { - "method" : "__o_389", - "owner" : "hi", - "name" : "o", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Lgr;I)V" - }, { - "method" : "__u_390", - "owner" : "hi", - "name" : "u", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "Widget", - "name" : "ho", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "actions", - "owner" : "ho", - "name" : "dx", - "access" : 1, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "buttonText", - "owner" : "ho", - "name" : "ec", - "access" : 1, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "buttonType", - "owner" : "ho", - "name" : "b", - "access" : 1, - "descriptor" : "I", - "decoder" : 1412102151 - }, { - "field" : "childIndex", - "owner" : "ho", - "name" : "y", - "access" : 1, - "descriptor" : "I", - "decoder" : -648033351 - }, { - "field" : "children", - "owner" : "ho", - "name" : "ep", - "access" : 1, - "descriptor" : "[Lho;" - }, { - "field" : "clickMask", - "owner" : "ho", - "name" : "cw", - "access" : 1, - "descriptor" : "I", - "decoder" : 1856618959 - }, { - "field" : "color", - "owner" : "ho", - "name" : "am", - "access" : 1, - "descriptor" : "I", - "decoder" : -2022638615 - }, { - "field" : "color2", - "owner" : "ho", - "name" : "an", - "access" : 1, - "descriptor" : "I", - "decoder" : -365781561 - }, { - "field" : "contentType", - "owner" : "ho", - "name" : "c", - "access" : 1, - "descriptor" : "I", - "decoder" : -581762425 - }, { - "field" : "cs1ComparisonValues", - "owner" : "ho", - "name" : "er", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "cs1Comparisons", - "owner" : "ho", - "name" : "ey", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "cs1Instructions", - "owner" : "ho", - "name" : "eo", - "access" : 1, - "descriptor" : "[[I" - }, { - "field" : "cycle", - "owner" : "ho", - "name" : "fd", - "access" : 1, - "descriptor" : "I", - "decoder" : -1995006949 - }, { - "field" : "dataText", - "owner" : "ho", - "name" : "de", - "access" : 1, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "dragThreshold", - "owner" : "ho", - "name" : "df", - "access" : 1, - "descriptor" : "I", - "decoder" : -1021798347 - }, { - "field" : "dragZoneSize", - "owner" : "ho", - "name" : "dn", - "access" : 1, - "descriptor" : "I", - "decoder" : 2092800189 - }, { - "field" : "fill", - "owner" : "ho", - "name" : "ao", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "fontId", - "owner" : "ho", - "name" : "cr", - "access" : 1, - "descriptor" : "I", - "decoder" : 1435746863 - }, { - "field" : "hasListener", - "owner" : "ho", - "name" : "ds", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "height", - "owner" : "ho", - "name" : "ak", - "access" : 1, - "descriptor" : "I", - "decoder" : 1656646737 - }, { - "field" : "heightAlignment", - "owner" : "ho", - "name" : "ag", - "access" : 1, - "descriptor" : "I", - "decoder" : -709256449 - }, { - "field" : "id", - "owner" : "ho", - "name" : "t", - "access" : 1, - "descriptor" : "I", - "decoder" : -941148335 - }, { - "field" : "invTransmitTriggers", - "owner" : "ho", - "name" : "du", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "inventorySprites", - "owner" : "ho", - "name" : "cq", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "inventoryXOffsets", - "owner" : "ho", - "name" : "ck", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "inventoryYOffsets", - "owner" : "ho", - "name" : "cn", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "isHidden", - "owner" : "ho", - "name" : "ae", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "isIf3", - "owner" : "ho", - "name" : "s", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "isScrollBar", - "owner" : "ho", - "name" : "da", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "itemActions", - "owner" : "ho", - "name" : "ch", - "access" : 1, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "itemId", - "owner" : "ho", - "name" : "ea", - "access" : 1, - "descriptor" : "I", - "decoder" : 1248629915 - }, { - "field" : "itemIds", - "owner" : "ho", - "name" : "ef", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "itemQuantities", - "owner" : "ho", - "name" : "ev", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "itemQuantity", - "owner" : "ho", - "name" : "es", - "access" : 1, - "descriptor" : "I", - "decoder" : 340244859 - }, { - "field" : "lineWid", - "owner" : "ho", - "name" : "ai", - "access" : 1, - "descriptor" : "I", - "decoder" : -110526699 - }, { - "field" : "modelAngleX", - "owner" : "ho", - "name" : "bz", - "access" : 1, - "descriptor" : "I", - "decoder" : 2044722063 - }, { - "field" : "modelAngleY", - "owner" : "ho", - "name" : "bg", - "access" : 1, - "descriptor" : "I", - "decoder" : -1253859481 - }, { - "field" : "modelAngleZ", - "owner" : "ho", - "name" : "bt", - "access" : 1, - "descriptor" : "I", - "decoder" : -692411223 - }, { - "field" : "modelFrame", - "owner" : "ho", - "name" : "eg", - "access" : 1, - "descriptor" : "I", - "decoder" : -431656963 - }, { - "field" : "modelFrameCycle", - "owner" : "ho", - "name" : "ez", - "access" : 1, - "descriptor" : "I", - "decoder" : -95117407 - }, { - "field" : "modelId", - "owner" : "ho", - "name" : "by", - "access" : 1, - "descriptor" : "I", - "decoder" : -2013625215 - }, { - "field" : "modelId2", - "owner" : "ho", - "name" : "bm", - "access" : 0, - "descriptor" : "I", - "decoder" : -201557389 - }, { - "field" : "modelOffsetX", - "owner" : "ho", - "name" : "bj", - "access" : 1, - "descriptor" : "I", - "decoder" : -459670781 - }, { - "field" : "modelOffsetY", - "owner" : "ho", - "name" : "bi", - "access" : 1, - "descriptor" : "I", - "decoder" : -2018053063 - }, { - "field" : "modelOrthog", - "owner" : "ho", - "name" : "be", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "modelType", - "owner" : "ho", - "name" : "bx", - "access" : 1, - "descriptor" : "I", - "decoder" : 630750753 - }, { - "field" : "modelType2", - "owner" : "ho", - "name" : "bu", - "access" : 0, - "descriptor" : "I", - "decoder" : 138222099 - }, { - "field" : "modelZoom", - "owner" : "ho", - "name" : "bp", - "access" : 1, - "descriptor" : "I", - "decoder" : -2133338643 - }, { - "field" : "mouseOverColor", - "owner" : "ho", - "name" : "az", - "access" : 1, - "descriptor" : "I", - "decoder" : -1831692129 - }, { - "field" : "mouseOverColor2", - "owner" : "ho", - "name" : "au", - "access" : 1, - "descriptor" : "I", - "decoder" : 1236161275 - }, { - "field" : "mouseOverRedirect", - "owner" : "ho", - "name" : "ew", - "access" : 1, - "descriptor" : "I", - "decoder" : -1390352887 - }, { - "field" : "noClickThrough", - "owner" : "ho", - "name" : "fx", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "onClick", - "owner" : "ho", - "name" : "dc", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "onClickRepeat", - "owner" : "ho", - "name" : "dg", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "onDrag", - "owner" : "ho", - "name" : "dr", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "onDragComplete", - "owner" : "ho", - "name" : "dw", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "onHold", - "owner" : "ho", - "name" : "dd", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "onInvTransmit", - "owner" : "ho", - "name" : "dj", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "onLoad", - "owner" : "ho", - "name" : "di", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "onMouseLeave", - "owner" : "ho", - "name" : "dl", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "onMouseOver", - "owner" : "ho", - "name" : "dy", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "onMouseRepeat", - "owner" : "ho", - "name" : "dk", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "onOp", - "owner" : "ho", - "name" : "eb", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "onRelease", - "owner" : "ho", - "name" : "db", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "onScroll", - "owner" : "ho", - "name" : "ek", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "onStatTransmit", - "owner" : "ho", - "name" : "dm", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "onTargetEnter", - "owner" : "ho", - "name" : "dv", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "onTargetLeave", - "owner" : "ho", - "name" : "do", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "onTimer", - "owner" : "ho", - "name" : "et", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "onVarTransmit", - "owner" : "ho", - "name" : "dh", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "outline", - "owner" : "ho", - "name" : "bk", - "access" : 1, - "descriptor" : "I", - "decoder" : -594884327 - }, { - "field" : "paddingX", - "owner" : "ho", - "name" : "cu", - "access" : 1, - "descriptor" : "I", - "decoder" : -23173063 - }, { - "field" : "paddingY", - "owner" : "ho", - "name" : "cb", - "access" : 1, - "descriptor" : "I", - "decoder" : 720760323 - }, { - "field" : "parent", - "owner" : "ho", - "name" : "dt", - "access" : 1, - "descriptor" : "Lho;" - }, { - "field" : "parentId", - "owner" : "ho", - "name" : "ab", - "access" : 1, - "descriptor" : "I", - "decoder" : -617209253 - }, { - "field" : "rawHeight", - "owner" : "ho", - "name" : "ar", - "access" : 1, - "descriptor" : "I", - "decoder" : 1202342839 - }, { - "field" : "rawWidth", - "owner" : "ho", - "name" : "av", - "access" : 1, - "descriptor" : "I", - "decoder" : -2001402777 - }, { - "field" : "rawX", - "owner" : "ho", - "name" : "aq", - "access" : 1, - "descriptor" : "I", - "decoder" : -872904863 - }, { - "field" : "rawY", - "owner" : "ho", - "name" : "aj", - "access" : 1, - "descriptor" : "I", - "decoder" : -1814696937 - }, { - "field" : "rectangleMode", - "owner" : "ho", - "name" : "aa", - "access" : 1, - "descriptor" : "Llj;" - }, { - "field" : "rootIndex", - "owner" : "ho", - "name" : "fp", - "access" : 1, - "descriptor" : "I", - "decoder" : 365867737 - }, { - "field" : "scrollHeight", - "owner" : "ho", - "name" : "as", - "access" : 1, - "descriptor" : "I", - "decoder" : -867175629 - }, { - "field" : "scrollWidth", - "owner" : "ho", - "name" : "ap", - "access" : 1, - "descriptor" : "I", - "decoder" : -623790443 - }, { - "field" : "scrollX", - "owner" : "ho", - "name" : "at", - "access" : 1, - "descriptor" : "I", - "decoder" : 2090399935 - }, { - "field" : "scrollY", - "owner" : "ho", - "name" : "ad", - "access" : 1, - "descriptor" : "I", - "decoder" : -537618643 - }, { - "field" : "sequenceId", - "owner" : "ho", - "name" : "bl", - "access" : 1, - "descriptor" : "I", - "decoder" : -1423753745 - }, { - "field" : "sequenceId2", - "owner" : "ho", - "name" : "br", - "access" : 1, - "descriptor" : "I", - "decoder" : -856053301 - }, { - "field" : "spellActionName", - "owner" : "ho", - "name" : "dp", - "access" : 1, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "spellName", - "owner" : "ho", - "name" : "eu", - "access" : 1, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "spriteAngle", - "owner" : "ho", - "name" : "bq", - "access" : 1, - "descriptor" : "I", - "decoder" : -1361791123 - }, { - "field" : "spriteFlipH", - "owner" : "ho", - "name" : "bo", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "spriteFlipV", - "owner" : "ho", - "name" : "bc", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "spriteId", - "owner" : "ho", - "name" : "bs", - "access" : 1, - "descriptor" : "I", - "decoder" : 1573420153 - }, { - "field" : "spriteId2", - "owner" : "ho", - "name" : "bb", - "access" : 1, - "descriptor" : "I", - "decoder" : -1074168553 - }, { - "field" : "spriteShadow", - "owner" : "ho", - "name" : "bd", - "access" : 1, - "descriptor" : "I", - "decoder" : 215797483 - }, { - "field" : "spriteTiling", - "owner" : "ho", - "name" : "bn", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "statTransmitTriggers", - "owner" : "ho", - "name" : "dq", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "text", - "owner" : "ho", - "name" : "cv", - "access" : 1, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "text2", - "owner" : "ho", - "name" : "ce", - "access" : 1, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "textLineHeight", - "owner" : "ho", - "name" : "cy", - "access" : 1, - "descriptor" : "I", - "decoder" : 1401272343 - }, { - "field" : "textShadowed", - "owner" : "ho", - "name" : "cj", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "textXAlignment", - "owner" : "ho", - "name" : "cs", - "access" : 1, - "descriptor" : "I", - "decoder" : 1527989635 - }, { - "field" : "textYAlignment", - "owner" : "ho", - "name" : "cm", - "access" : 1, - "descriptor" : "I", - "decoder" : 1271997981 - }, { - "field" : "transparency", - "owner" : "ho", - "name" : "ax", - "access" : 1, - "descriptor" : "I", - "decoder" : -638557371 - }, { - "field" : "type", - "owner" : "ho", - "name" : "h", - "access" : 1, - "descriptor" : "I", - "decoder" : 1521310729 - }, { - "field" : "varTransmitTriggers", - "owner" : "ho", - "name" : "dz", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "width", - "owner" : "ho", - "name" : "ah", - "access" : 1, - "descriptor" : "I", - "decoder" : 1716081883 - }, { - "field" : "widthAlignment", - "owner" : "ho", - "name" : "v", - "access" : 1, - "descriptor" : "I", - "decoder" : 1628640897 - }, { - "field" : "x", - "owner" : "ho", - "name" : "ac", - "access" : 1, - "descriptor" : "I", - "decoder" : 1271321381 - }, { - "field" : "xAlignment", - "owner" : "ho", - "name" : "r", - "access" : 1, - "descriptor" : "I", - "decoder" : 523318277 - }, { - "field" : "y", - "owner" : "ho", - "name" : "ay", - "access" : 1, - "descriptor" : "I", - "decoder" : 1492291497 - }, { - "field" : "yAlignment", - "owner" : "ho", - "name" : "p", - "access" : 1, - "descriptor" : "I", - "decoder" : 1300531185 - }, { - "field" : "__ba", - "owner" : "ho", - "name" : "ba", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "__bv", - "owner" : "ho", - "name" : "bv", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "__cg", - "owner" : "ho", - "name" : "cg", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "__fm", - "owner" : "ho", - "name" : "fm", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "__fq", - "owner" : "ho", - "name" : "fq", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "__fw", - "owner" : "ho", - "name" : "fw", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "__fz", - "owner" : "ho", - "name" : "fz", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "__cf", - "owner" : "ho", - "name" : "cf", - "access" : 1, - "descriptor" : "[[B" - }, { - "field" : "__cp", - "owner" : "ho", - "name" : "cp", - "access" : 1, - "descriptor" : "[[B" - }, { - "field" : "__af", - "owner" : "ho", - "name" : "af", - "access" : 1, - "descriptor" : "I", - "decoder" : -1853255291 - }, { - "field" : "__al", - "owner" : "ho", - "name" : "al", - "access" : 1, - "descriptor" : "I", - "decoder" : -1047989223 - }, { - "field" : "__aw", - "owner" : "ho", - "name" : "aw", - "access" : 1, - "descriptor" : "I", - "decoder" : 206556853 - }, { - "field" : "__bf", - "owner" : "ho", - "name" : "bf", - "access" : 1, - "descriptor" : "I", - "decoder" : -1692331135 - }, { - "field" : "__bh", - "owner" : "ho", - "name" : "bh", - "access" : 1, - "descriptor" : "I", - "decoder" : 727421593 - }, { - "field" : "__bw", - "owner" : "ho", - "name" : "bw", - "access" : 1, - "descriptor" : "I", - "decoder" : -1658511475 - }, { - "field" : "__fc", - "owner" : "ho", - "name" : "fc", - "access" : 1, - "descriptor" : "I", - "decoder" : 209458049 - }, { - "field" : "__fg", - "owner" : "ho", - "name" : "fg", - "access" : 1, - "descriptor" : "I", - "decoder" : -1520351537 - }, { - "field" : "__fj", - "owner" : "ho", - "name" : "fj", - "access" : 1, - "descriptor" : "I", - "decoder" : 876695207 - }, { - "field" : "__fl", - "owner" : "ho", - "name" : "fl", - "access" : 1, - "descriptor" : "I", - "decoder" : -672198209 - }, { - "field" : "__cc", - "owner" : "ho", - "name" : "cc", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "__ci", - "owner" : "ho", - "name" : "ci", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "__fh", - "owner" : "ho", - "name" : "fh", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "__ed", - "owner" : "ho", - "name" : "ed", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "__ee", - "owner" : "ho", - "name" : "ee", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "__eh", - "owner" : "ho", - "name" : "eh", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "__ei", - "owner" : "ho", - "name" : "ei", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "__ej", - "owner" : "ho", - "name" : "ej", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "__el", - "owner" : "ho", - "name" : "el", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "__em", - "owner" : "ho", - "name" : "em", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "__en", - "owner" : "ho", - "name" : "en", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "__eq", - "owner" : "ho", - "name" : "eq", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "__ex", - "owner" : "ho", - "name" : "ex", - "access" : 1, - "descriptor" : "[Ljava/lang/Object;" - } ], - "methods" : [ { - "method" : "decode", - "owner" : "ho", - "name" : "u", - "access" : 0, - "parameters" : [ "buffer" ], - "descriptor" : "(Lgr;I)V" - }, { - "method" : "decodeLegacy", - "owner" : "ho", - "name" : "o", - "access" : 0, - "parameters" : [ "buffer" ], - "descriptor" : "(Lgr;I)V" - }, { - "method" : "getFont", - "owner" : "ho", - "name" : "d", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)Lkk;" - }, { - "method" : "getInventorySprite", - "owner" : "ho", - "name" : "a", - "access" : 1, - "descriptor" : "(II)Lln;" - }, { - "method" : "getModel", - "owner" : "ho", - "name" : "z", - "access" : 1, - "parameters" : [ "sequence", "frame", "b", "appearance" ], - "descriptor" : "(Ljh;IZLhi;I)Ldu;" - }, { - "method" : "getSprite", - "owner" : "ho", - "name" : "x", - "access" : 1, - "parameters" : [ "b" ], - "descriptor" : "(ZI)Lln;" - }, { - "method" : "getSpriteMask", - "owner" : "ho", - "name" : "j", - "access" : 1, - "parameters" : [ "b" ], - "descriptor" : "(ZB)Lhp;" - }, { - "method" : "readListener", - "owner" : "ho", - "name" : "g", - "access" : 0, - "parameters" : [ "buffer" ], - "descriptor" : "(Lgr;I)[Ljava/lang/Object;" - }, { - "method" : "readListenerTriggers", - "owner" : "ho", - "name" : "l", - "access" : 0, - "parameters" : [ "buffer" ], - "descriptor" : "(Lgr;B)[I" - }, { - "method" : "setAction", - "owner" : "ho", - "name" : "t", - "access" : 1, - "parameters" : [ "index", "s" ], - "descriptor" : "(ILjava/lang/String;B)V" - }, { - "method" : "swapItems", - "owner" : "ho", - "name" : "e", - "access" : 1, - "parameters" : [ "indexA", "indexB" ], - "descriptor" : "(III)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "PlayerType", - "name" : "ij", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "gc" ], - "fields" : [ { - "field" : "id", - "owner" : "ij", - "name" : "g", - "access" : 16, - "descriptor" : "I", - "decoder" : 1999564657 - }, { - "field" : "isPrivileged", - "owner" : "ij", - "name" : "e", - "access" : 17, - "descriptor" : "Z" - }, { - "field" : "isUser", - "owner" : "ij", - "name" : "x", - "access" : 17, - "descriptor" : "Z" - }, { - "field" : "modIcon", - "owner" : "ij", - "name" : "l", - "access" : 17, - "descriptor" : "I", - "decoder" : 613822977 - } ], - "methods" : [ { - "method" : "__f_391", - "owner" : "ij", - "name" : "f", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(IIZZZ)V" - } ] -}, { - "class" : "AbstractIndexCache", - "name" : "ir", - "super" : "java.lang.Object", - "access" : 1057, - "interfaces" : [ ], - "fields" : [ { - "field" : "archiveCount", - "owner" : "ir", - "name" : "f", - "access" : 0, - "descriptor" : "I", - "decoder" : 1694798923 - }, { - "field" : "archiveCrcs", - "owner" : "ir", - "name" : "u", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "archiveIds", - "owner" : "ir", - "name" : "q", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "archiveNameHashTable", - "owner" : "ir", - "name" : "o", - "access" : 0, - "descriptor" : "Llv;" - }, { - "field" : "archiveNameHashes", - "owner" : "ir", - "name" : "w", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "archiveVersions", - "owner" : "ir", - "name" : "g", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "archives", - "owner" : "ir", - "name" : "k", - "access" : 0, - "descriptor" : "[Ljava/lang/Object;" - }, { - "field" : "hash", - "owner" : "ir", - "name" : "a", - "access" : 1, - "descriptor" : "I", - "decoder" : -530370811 - }, { - "field" : "recordCounts", - "owner" : "ir", - "name" : "l", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "recordIds", - "owner" : "ir", - "name" : "e", - "access" : 0, - "descriptor" : "[[I" - }, { - "field" : "recordNameHashTables", - "owner" : "ir", - "name" : "d", - "access" : 0, - "descriptor" : "[Llv;" - }, { - "field" : "recordNameHashes", - "owner" : "ir", - "name" : "x", - "access" : 0, - "descriptor" : "[[I" - }, { - "field" : "records", - "owner" : "ir", - "name" : "n", - "access" : 0, - "descriptor" : "[[Ljava/lang/Object;" - }, { - "field" : "releaseArchives", - "owner" : "ir", - "name" : "z", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "shallowRecords", - "owner" : "ir", - "name" : "j", - "access" : 0, - "descriptor" : "Z" - } ], - "methods" : [ { - "method" : "archiveLoadPercent", - "owner" : "ir", - "name" : "e", - "access" : 0, - "descriptor" : "(II)I" - }, { - "method" : "archiveLoadPercentByName", - "owner" : "ir", - "name" : "ac", - "access" : 1, - "parameters" : [ "archiveName" ], - "descriptor" : "(Ljava/lang/String;I)I" - }, { - "method" : "buildRecords", - "owner" : "ir", - "name" : "c", - "access" : 0, - "parameters" : [ "archive", "xteaKey" ], - "descriptor" : "(I[II)Z" - }, { - "method" : "getArchiveId", - "owner" : "ir", - "name" : "p", - "access" : 1, - "parameters" : [ "archiveName" ], - "descriptor" : "(Ljava/lang/String;I)I" - }, { - "method" : "getRecord", - "owner" : "ir", - "name" : "d", - "access" : 1, - "parameters" : [ "archive", "record" ], - "descriptor" : "(III)[B" - }, { - "method" : "getRecordFlat", - "owner" : "ir", - "name" : "a", - "access" : 1, - "parameters" : [ "archiveOrRecord" ], - "descriptor" : "(IB)[B" - }, { - "method" : "getRecordId", - "owner" : "ir", - "name" : "v", - "access" : 1, - "parameters" : [ "archiveId", "recordName" ], - "descriptor" : "(ILjava/lang/String;I)I" - }, { - "method" : "loadArchive", - "owner" : "ir", - "name" : "z", - "access" : 0, - "descriptor" : "(II)V" - }, { - "method" : "setIndexReference", - "owner" : "ir", - "name" : "m", - "access" : 0, - "descriptor" : "([BB)V" - }, { - "method" : "takeRecord", - "owner" : "ir", - "name" : "q", - "access" : 1, - "parameters" : [ "archive", "record" ], - "descriptor" : "(III)[B" - }, { - "method" : "takeRecordByNames", - "owner" : "ir", - "name" : "aq", - "access" : 1, - "parameters" : [ "archiveName", "recordName" ], - "descriptor" : "(Ljava/lang/String;Ljava/lang/String;S)[B" - }, { - "method" : "takeRecordEncrypted", - "owner" : "ir", - "name" : "w", - "access" : 1, - "parameters" : [ "archive", "record", "xteaKey" ], - "descriptor" : "(II[II)[B" - }, { - "method" : "takeRecordFlat", - "owner" : "ir", - "name" : "x", - "access" : 1, - "parameters" : [ "archiveOrRecord" ], - "descriptor" : "(IS)[B" - }, { - "method" : "tryLoadArchive", - "owner" : "ir", - "name" : "g", - "access" : 1, - "parameters" : [ "archive" ], - "descriptor" : "(II)Z" - }, { - "method" : "tryLoadArchiveByName", - "owner" : "ir", - "name" : "av", - "access" : 1, - "parameters" : [ "archiveName" ], - "descriptor" : "(Ljava/lang/String;I)Z" - }, { - "method" : "tryLoadRecord", - "owner" : "ir", - "name" : "o", - "access" : 1, - "parameters" : [ "archive", "record" ], - "descriptor" : "(III)Z" - }, { - "method" : "tryLoadRecordByNames", - "owner" : "ir", - "name" : "aj", - "access" : 1, - "parameters" : [ "archiveName", "recordName" ], - "descriptor" : "(Ljava/lang/String;Ljava/lang/String;I)Z" - }, { - "method" : "__f_392", - "owner" : "ir", - "name" : "f", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(II)V" - }, { - "method" : "__u_393", - "owner" : "ir", - "name" : "u", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(II)Z" - }, { - "method" : "__l_394", - "owner" : "ir", - "name" : "l", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "__j_395", - "owner" : "ir", - "name" : "j", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(IB)[I" - }, { - "method" : "__s_396", - "owner" : "ir", - "name" : "s", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(II)I" - }, { - "method" : "__t_397", - "owner" : "ir", - "name" : "t", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__y_398", - "owner" : "ir", - "name" : "y", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "__h_399", - "owner" : "ir", - "name" : "h", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(II)V" - }, { - "method" : "__b_400", - "owner" : "ir", - "name" : "b", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__ag_401", - "owner" : "ir", - "name" : "ag", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljava/lang/String;Ljava/lang/String;B)Z" - }, { - "method" : "__ar_402", - "owner" : "ir", - "name" : "ar", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/lang/String;B)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(ZZ)V" - } ] -}, { - "class" : "IndexStoreActionHandler", - "name" : "iv", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "java.lang.Runnable" ], - "fields" : [ ], - "methods" : [ { - "method" : "__run_403", - "owner" : "iv", - "name" : "run", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "IndexCache", - "name" : "it", - "super" : "ir", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "index", - "owner" : "it", - "name" : "p", - "access" : 0, - "descriptor" : "I", - "decoder" : -1579549759 - }, { - "field" : "indexReferenceCrc", - "owner" : "it", - "name" : "av", - "access" : 0, - "descriptor" : "I", - "decoder" : 1472870917 - }, { - "field" : "indexReferenceVersion", - "owner" : "it", - "name" : "ar", - "access" : 0, - "descriptor" : "I", - "decoder" : -785528219 - }, { - "field" : "indexStore", - "owner" : "it", - "name" : "c", - "access" : 0, - "descriptor" : "Lff;" - }, { - "field" : "referenceStore", - "owner" : "it", - "name" : "r", - "access" : 0, - "descriptor" : "Lff;" - }, { - "field" : "validArchives", - "owner" : "it", - "name" : "aq", - "access" : 64, - "descriptor" : "[Z" - }, { - "field" : "__ag", - "owner" : "it", - "name" : "ag", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "__ac", - "owner" : "it", - "name" : "ac", - "access" : 0, - "descriptor" : "I", - "decoder" : -1884661133 - }, { - "field" : "__v", - "owner" : "it", - "name" : "v", - "access" : 64, - "descriptor" : "Z" - } ], - "methods" : [ { - "method" : "archiveLoadPercent", - "owner" : "it", - "name" : "e", - "access" : 0, - "descriptor" : "(II)I" - }, { - "method" : "load", - "owner" : "it", - "name" : "dx", - "access" : 0, - "descriptor" : "(Lff;I[BZI)V" - }, { - "method" : "loadAllLocal", - "owner" : "it", - "name" : "dt", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "loadArchive", - "owner" : "it", - "name" : "z", - "access" : 0, - "descriptor" : "(II)V" - }, { - "method" : "loadIndexReference", - "owner" : "it", - "name" : "co", - "access" : 1, - "descriptor" : "(III)V" - }, { - "method" : "loadPercent", - "owner" : "it", - "name" : "da", - "access" : 1, - "descriptor" : "(I)I" - }, { - "method" : "write", - "owner" : "it", - "name" : "de", - "access" : 1, - "descriptor" : "(I[BZZB)V" - }, { - "method" : "__cx_404", - "owner" : "it", - "name" : "cx", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "__ca_405", - "owner" : "it", - "name" : "ca", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__f_406", - "owner" : "it", - "name" : "f", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(II)V" - }, { - "method" : "__dn_407", - "owner" : "it", - "name" : "dn", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(IB)Z" - }, { - "method" : "__df_408", - "owner" : "it", - "name" : "df", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(II)Z" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Lff;Lff;IZZZ)V" - } ] -}, { - "class" : "WorldMapElement", - "name" : "ic", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "category", - "owner" : "ic", - "name" : "c", - "access" : 1, - "descriptor" : "I", - "decoder" : -653112729 - }, { - "field" : "sprite1", - "owner" : "ic", - "name" : "u", - "access" : 1, - "descriptor" : "I", - "decoder" : 2012857993 - }, { - "field" : "sprite2", - "owner" : "ic", - "name" : "g", - "access" : 0, - "descriptor" : "I", - "decoder" : -322924875 - }, { - "field" : "string1", - "owner" : "ic", - "name" : "n", - "access" : 1, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "strings", - "owner" : "ic", - "name" : "k", - "access" : 1, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "textSize", - "owner" : "ic", - "name" : "x", - "access" : 1, - "descriptor" : "I", - "decoder" : 1184517129 - }, { - "field" : "__b", - "owner" : "ic", - "name" : "b", - "access" : 0, - "descriptor" : "[B" - }, { - "field" : "__a", - "owner" : "ic", - "name" : "a", - "access" : 0, - "descriptor" : "I", - "decoder" : 1336803515 - }, { - "field" : "__j", - "owner" : "ic", - "name" : "j", - "access" : 0, - "descriptor" : "I", - "decoder" : -1007121521 - }, { - "field" : "__s", - "owner" : "ic", - "name" : "s", - "access" : 0, - "descriptor" : "I", - "decoder" : -1209054101 - }, { - "field" : "__z", - "owner" : "ic", - "name" : "z", - "access" : 0, - "descriptor" : "I", - "decoder" : -1825795359 - }, { - "field" : "__h", - "owner" : "ic", - "name" : "h", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__i", - "owner" : "ic", - "name" : "i", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__e", - "owner" : "ic", - "name" : "e", - "access" : 1, - "descriptor" : "I", - "decoder" : -231067 - }, { - "field" : "__l", - "owner" : "ic", - "name" : "l", - "access" : 1, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__o", - "owner" : "ic", - "name" : "o", - "access" : 17, - "descriptor" : "I", - "decoder" : -1579051565 - } ], - "methods" : [ { - "method" : "getSprite", - "owner" : "ic", - "name" : "o", - "access" : 1, - "parameters" : [ "b" ], - "descriptor" : "(ZI)Lln;" - }, { - "method" : "getSprite0", - "owner" : "ic", - "name" : "u", - "access" : 0, - "parameters" : [ "id" ], - "descriptor" : "(IB)Lln;" - }, { - "method" : "read", - "owner" : "ic", - "name" : "f", - "access" : 1, - "parameters" : [ "buffer" ], - "descriptor" : "(Lgr;B)V" - }, { - "method" : "readNext", - "owner" : "ic", - "name" : "q", - "access" : 0, - "parameters" : [ "buffer", "opcode" ], - "descriptor" : "(Lgr;II)V" - }, { - "method" : "__w_409", - "owner" : "ic", - "name" : "w", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__g_410", - "owner" : "ic", - "name" : "g", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(I)V" - } ] -}, { - "class" : "VarcInt", - "name" : "iw", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "persist", - "owner" : "iw", - "name" : "q", - "access" : 1, - "descriptor" : "Z" - } ], - "methods" : [ { - "method" : "__q_411", - "owner" : "iw", - "name" : "q", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(Lgr;I)V" - }, { - "method" : "__w_412", - "owner" : "iw", - "name" : "w", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Lgr;II)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "SpotAnimationDefinition", - "name" : "io", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "archive", - "owner" : "io", - "name" : "u", - "access" : 0, - "descriptor" : "I", - "decoder" : -2065492247 - }, { - "field" : "heightScale", - "owner" : "io", - "name" : "n", - "access" : 0, - "descriptor" : "I", - "decoder" : 1199960995 - }, { - "field" : "id", - "owner" : "io", - "name" : "o", - "access" : 0, - "descriptor" : "I", - "decoder" : -713866165 - }, { - "field" : "orientation", - "owner" : "io", - "name" : "i", - "access" : 0, - "descriptor" : "I", - "decoder" : 1650590363 - }, { - "field" : "recolorFrom", - "owner" : "io", - "name" : "l", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "recolorTo", - "owner" : "io", - "name" : "e", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "retextureFrom", - "owner" : "io", - "name" : "x", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "retextureTo", - "owner" : "io", - "name" : "d", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "sequence", - "owner" : "io", - "name" : "g", - "access" : 1, - "descriptor" : "I", - "decoder" : 1580078789 - }, { - "field" : "widthScale", - "owner" : "io", - "name" : "k", - "access" : 0, - "descriptor" : "I", - "decoder" : 680796997 - }, { - "field" : "__a", - "owner" : "io", - "name" : "a", - "access" : 0, - "descriptor" : "I", - "decoder" : -20619847 - }, { - "field" : "__z", - "owner" : "io", - "name" : "z", - "access" : 0, - "descriptor" : "I", - "decoder" : 1866148625 - } ], - "methods" : [ { - "method" : "getModel", - "owner" : "io", - "name" : "w", - "access" : 17, - "descriptor" : "(II)Ldu;" - }, { - "method" : "read", - "owner" : "io", - "name" : "f", - "access" : 0, - "parameters" : [ "buffer" ], - "descriptor" : "(Lgr;I)V" - }, { - "method" : "readNext", - "owner" : "io", - "name" : "q", - "access" : 0, - "parameters" : [ "buffer", "n" ], - "descriptor" : "(Lgr;II)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "KitDefinition", - "name" : "im", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "archives", - "owner" : "im", - "name" : "d", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "recolorFrom", - "owner" : "im", - "name" : "g", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "recolorTo", - "owner" : "im", - "name" : "l", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "retextureFrom", - "owner" : "im", - "name" : "e", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "retextureTo", - "owner" : "im", - "name" : "x", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "__u", - "owner" : "im", - "name" : "u", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__k", - "owner" : "im", - "name" : "k", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "__o", - "owner" : "im", - "name" : "o", - "access" : 1, - "descriptor" : "I", - "decoder" : 1619779051 - } ], - "methods" : [ { - "method" : "read", - "owner" : "im", - "name" : "f", - "access" : 0, - "descriptor" : "(Lgr;S)V" - }, { - "method" : "readNext", - "owner" : "im", - "name" : "q", - "access" : 0, - "descriptor" : "(Lgr;II)V" - }, { - "method" : "__w_413", - "owner" : "im", - "name" : "w", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "__o_414", - "owner" : "im", - "name" : "o", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)Ldw;" - }, { - "method" : "__u_415", - "owner" : "im", - "name" : "u", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "__g_416", - "owner" : "im", - "name" : "g", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)Ldw;" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "HealthBarDefinition", - "name" : "ii", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "int1", - "owner" : "ii", - "name" : "l", - "access" : 1, - "descriptor" : "I", - "decoder" : 390656615 - }, { - "field" : "int2", - "owner" : "ii", - "name" : "e", - "access" : 1, - "descriptor" : "I", - "decoder" : 1890433231 - }, { - "field" : "int3", - "owner" : "ii", - "name" : "x", - "access" : 1, - "descriptor" : "I", - "decoder" : -1180353973 - }, { - "field" : "int4", - "owner" : "ii", - "name" : "d", - "access" : 1, - "descriptor" : "I", - "decoder" : -1956457117 - }, { - "field" : "int5", - "owner" : "ii", - "name" : "k", - "access" : 1, - "descriptor" : "I", - "decoder" : -642961053 - }, { - "field" : "spriteId1", - "owner" : "ii", - "name" : "n", - "access" : 0, - "descriptor" : "I", - "decoder" : 1310001257 - }, { - "field" : "spriteId2", - "owner" : "ii", - "name" : "i", - "access" : 0, - "descriptor" : "I", - "decoder" : -1707680631 - }, { - "field" : "width", - "owner" : "ii", - "name" : "a", - "access" : 1, - "descriptor" : "I", - "decoder" : -354704697 - }, { - "field" : "widthPadding", - "owner" : "ii", - "name" : "z", - "access" : 1, - "descriptor" : "I", - "decoder" : 166567703 - }, { - "field" : "__o", - "owner" : "ii", - "name" : "o", - "access" : 1, - "descriptor" : "I", - "decoder" : 1515955705 - } ], - "methods" : [ { - "method" : "getSprite1", - "owner" : "ii", - "name" : "q", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)Lln;" - }, { - "method" : "getSprite2", - "owner" : "ii", - "name" : "w", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)Lln;" - }, { - "method" : "read", - "owner" : "ii", - "name" : "m", - "access" : 1, - "descriptor" : "(Lgr;I)V" - }, { - "method" : "readNext", - "owner" : "ii", - "name" : "f", - "access" : 0, - "descriptor" : "(Lgr;IB)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "HitSplatDefinition", - "name" : "jm", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "fontId", - "owner" : "jm", - "name" : "k", - "access" : 0, - "descriptor" : "I", - "decoder" : 431076793 - }, { - "field" : "transformVarbit", - "owner" : "jm", - "name" : "v", - "access" : 0, - "descriptor" : "I", - "decoder" : 516423393 - }, { - "field" : "transformVarp", - "owner" : "jm", - "name" : "ag", - "access" : 0, - "descriptor" : "I", - "decoder" : -1841054487 - }, { - "field" : "transforms", - "owner" : "jm", - "name" : "p", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "__a", - "owner" : "jm", - "name" : "a", - "access" : 0, - "descriptor" : "I", - "decoder" : -1533306389 - }, { - "field" : "__j", - "owner" : "jm", - "name" : "j", - "access" : 0, - "descriptor" : "I", - "decoder" : 1683792491 - }, { - "field" : "__s", - "owner" : "jm", - "name" : "s", - "access" : 0, - "descriptor" : "I", - "decoder" : 1845590719 - }, { - "field" : "__z", - "owner" : "jm", - "name" : "z", - "access" : 0, - "descriptor" : "I", - "decoder" : -1677628889 - }, { - "field" : "__b", - "owner" : "jm", - "name" : "b", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__c", - "owner" : "jm", - "name" : "c", - "access" : 1, - "descriptor" : "I", - "decoder" : 1003116765 - }, { - "field" : "__h", - "owner" : "jm", - "name" : "h", - "access" : 1, - "descriptor" : "I", - "decoder" : 199815415 - }, { - "field" : "__i", - "owner" : "jm", - "name" : "i", - "access" : 1, - "descriptor" : "I", - "decoder" : -102270561 - }, { - "field" : "__n", - "owner" : "jm", - "name" : "n", - "access" : 1, - "descriptor" : "I", - "decoder" : -1151968735 - }, { - "field" : "__r", - "owner" : "jm", - "name" : "r", - "access" : 1, - "descriptor" : "I", - "decoder" : 1498880475 - }, { - "field" : "__t", - "owner" : "jm", - "name" : "t", - "access" : 1, - "descriptor" : "I", - "decoder" : -389283589 - }, { - "field" : "__y", - "owner" : "jm", - "name" : "y", - "access" : 1, - "descriptor" : "I", - "decoder" : 1751286975 - } ], - "methods" : [ { - "method" : "getFont", - "owner" : "jm", - "name" : "d", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Lkk;" - }, { - "method" : "getString", - "owner" : "jm", - "name" : "u", - "access" : 1, - "parameters" : [ "n" ], - "descriptor" : "(IS)Ljava/lang/String;" - }, { - "method" : "read", - "owner" : "jm", - "name" : "q", - "access" : 0, - "descriptor" : "(Lgr;I)V" - }, { - "method" : "readNext", - "owner" : "jm", - "name" : "w", - "access" : 0, - "descriptor" : "(Lgr;II)V" - }, { - "method" : "transform", - "owner" : "jm", - "name" : "o", - "access" : 17, - "parameters" : [ ], - "descriptor" : "(B)Ljm;" - }, { - "method" : "__g_417", - "owner" : "jm", - "name" : "g", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Lln;" - }, { - "method" : "__l_418", - "owner" : "jm", - "name" : "l", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)Lln;" - }, { - "method" : "__e_419", - "owner" : "jm", - "name" : "e", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)Lln;" - }, { - "method" : "__x_420", - "owner" : "jm", - "name" : "x", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Lln;" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "ObjectDefinition", - "name" : "jr", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "actions", - "owner" : "jr", - "name" : "aj", - "access" : 1, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "ambient", - "owner" : "jr", - "name" : "ag", - "access" : 0, - "descriptor" : "I", - "decoder" : 533219139 - }, { - "field" : "ambientSoundId", - "owner" : "jr", - "name" : "az", - "access" : 1, - "descriptor" : "I", - "decoder" : 374616127 - }, { - "field" : "animationId", - "owner" : "jr", - "name" : "p", - "access" : 1, - "descriptor" : "I", - "decoder" : -1018236769 - }, { - "field" : "boolean1", - "owner" : "jr", - "name" : "y", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "boolean2", - "owner" : "jr", - "name" : "at", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "clipType", - "owner" : "jr", - "name" : "b", - "access" : 0, - "descriptor" : "I", - "decoder" : -268374709 - }, { - "field" : "clipped", - "owner" : "jr", - "name" : "ay", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "contrast", - "owner" : "jr", - "name" : "aq", - "access" : 0, - "descriptor" : "I", - "decoder" : -216646581 - }, { - "field" : "id", - "owner" : "jr", - "name" : "e", - "access" : 1, - "descriptor" : "I", - "decoder" : -2034835389 - }, { - "field" : "int1", - "owner" : "jr", - "name" : "h", - "access" : 1, - "descriptor" : "I", - "decoder" : 1419333853 - }, { - "field" : "int2", - "owner" : "jr", - "name" : "v", - "access" : 1, - "descriptor" : "I", - "decoder" : 713665805 - }, { - "field" : "int3", - "owner" : "jr", - "name" : "ap", - "access" : 1, - "descriptor" : "I", - "decoder" : 1455451843 - }, { - "field" : "int4", - "owner" : "jr", - "name" : "au", - "access" : 1, - "descriptor" : "I", - "decoder" : -1990510197 - }, { - "field" : "int5", - "owner" : "jr", - "name" : "ao", - "access" : 1, - "descriptor" : "I", - "decoder" : -1519592967 - }, { - "field" : "int6", - "owner" : "jr", - "name" : "aa", - "access" : 1, - "descriptor" : "I", - "decoder" : 1201773735 - }, { - "field" : "interactType", - "owner" : "jr", - "name" : "t", - "access" : 1, - "descriptor" : "I", - "decoder" : -553719901 - }, { - "field" : "isRotated", - "owner" : "jr", - "name" : "ac", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "isSolid", - "owner" : "jr", - "name" : "ad", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "mapIconId", - "owner" : "jr", - "name" : "av", - "access" : 1, - "descriptor" : "I", - "decoder" : -1737602209 - }, { - "field" : "mapSceneId", - "owner" : "jr", - "name" : "ar", - "access" : 1, - "descriptor" : "I", - "decoder" : -324183669 - }, { - "field" : "modelClipped", - "owner" : "jr", - "name" : "r", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "modelHeight", - "owner" : "jr", - "name" : "ak", - "access" : 0, - "descriptor" : "I", - "decoder" : 511434049 - }, { - "field" : "modelSizeX", - "owner" : "jr", - "name" : "ah", - "access" : 0, - "descriptor" : "I", - "decoder" : -1509832827 - }, { - "field" : "modelSizeY", - "owner" : "jr", - "name" : "aw", - "access" : 0, - "descriptor" : "I", - "decoder" : 1746573233 - }, { - "field" : "name", - "owner" : "jr", - "name" : "k", - "access" : 1, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "nonFlatShading", - "owner" : "jr", - "name" : "c", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "offsetHeight", - "owner" : "jr", - "name" : "ab", - "access" : 0, - "descriptor" : "I", - "decoder" : -1720702573 - }, { - "field" : "offsetX", - "owner" : "jr", - "name" : "al", - "access" : 0, - "descriptor" : "I", - "decoder" : 967376007 - }, { - "field" : "offsetY", - "owner" : "jr", - "name" : "ae", - "access" : 0, - "descriptor" : "I", - "decoder" : 818611483 - }, { - "field" : "params", - "owner" : "jr", - "name" : "af", - "access" : 0, - "descriptor" : "Llh;" - }, { - "field" : "recolorFrom", - "owner" : "jr", - "name" : "n", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "recolorTo", - "owner" : "jr", - "name" : "i", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "retextureFrom", - "owner" : "jr", - "name" : "a", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "retextureTo", - "owner" : "jr", - "name" : "z", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "sizeX", - "owner" : "jr", - "name" : "j", - "access" : 1, - "descriptor" : "I", - "decoder" : 998026479 - }, { - "field" : "sizeY", - "owner" : "jr", - "name" : "s", - "access" : 1, - "descriptor" : "I", - "decoder" : -301273619 - }, { - "field" : "transformConfigId", - "owner" : "jr", - "name" : "an", - "access" : 0, - "descriptor" : "I", - "decoder" : -2119965579 - }, { - "field" : "transformVarbit", - "owner" : "jr", - "name" : "am", - "access" : 0, - "descriptor" : "I", - "decoder" : 1136644531 - }, { - "field" : "transforms", - "owner" : "jr", - "name" : "as", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "__d", - "owner" : "jr", - "name" : "d", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__x", - "owner" : "jr", - "name" : "x", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__ax", - "owner" : "jr", - "name" : "ax", - "access" : 1, - "descriptor" : "[I" - } ], - "methods" : [ { - "method" : "getIntParam", - "owner" : "jr", - "name" : "z", - "access" : 1, - "descriptor" : "(IIB)I" - }, { - "method" : "getModel", - "owner" : "jr", - "name" : "e", - "access" : 17, - "descriptor" : "(II[[IIIIB)Ldu;" - }, { - "method" : "getModelData", - "owner" : "jr", - "name" : "d", - "access" : 16, - "parameters" : [ "n", "m" ], - "descriptor" : "(IIB)Ldw;" - }, { - "method" : "getModelDynamic", - "owner" : "jr", - "name" : "x", - "access" : 17, - "descriptor" : "(II[[IIIILjh;II)Ldu;" - }, { - "method" : "getStringParam", - "owner" : "jr", - "name" : "j", - "access" : 1, - "descriptor" : "(ILjava/lang/String;I)Ljava/lang/String;" - }, { - "method" : "init", - "owner" : "jr", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "read", - "owner" : "jr", - "name" : "w", - "access" : 0, - "descriptor" : "(Lgr;I)V" - }, { - "method" : "readNext", - "owner" : "jr", - "name" : "o", - "access" : 0, - "descriptor" : "(Lgr;II)V" - }, { - "method" : "transform", - "owner" : "jr", - "name" : "a", - "access" : 17, - "parameters" : [ ], - "descriptor" : "(B)Ljr;" - }, { - "method" : "__u_421", - "owner" : "jr", - "name" : "u", - "access" : 17, - "parameters" : [ "arg0" ], - "descriptor" : "(II)Z" - }, { - "method" : "__g_422", - "owner" : "jr", - "name" : "g", - "access" : 17, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "__l_423", - "owner" : "jr", - "name" : "l", - "access" : 17, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], - "descriptor" : "(II[[IIIIS)Lex;" - }, { - "method" : "__t_424", - "owner" : "jr", - "name" : "t", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "ItemDefinition", - "name" : "jv", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "ambient", - "owner" : "jv", - "name" : "ba", - "access" : 1, - "descriptor" : "I", - "decoder" : 738319589 - }, { - "field" : "contrast", - "owner" : "jv", - "name" : "bb", - "access" : 1, - "descriptor" : "I", - "decoder" : -1984887305 - }, { - "field" : "femaleHeadModel", - "owner" : "jv", - "name" : "am", - "access" : 0, - "descriptor" : "I", - "decoder" : 1709659237 - }, { - "field" : "femaleHeadModel2", - "owner" : "jv", - "name" : "an", - "access" : 0, - "descriptor" : "I", - "decoder" : 106668727 - }, { - "field" : "femaleModel", - "owner" : "jv", - "name" : "al", - "access" : 0, - "descriptor" : "I", - "decoder" : 886682223 - }, { - "field" : "femaleModel1", - "owner" : "jv", - "name" : "ab", - "access" : 0, - "descriptor" : "I", - "decoder" : 154223105 - }, { - "field" : "femaleModel2", - "owner" : "jv", - "name" : "ad", - "access" : 0, - "descriptor" : "I", - "decoder" : -771136925 - }, { - "field" : "femaleOffset", - "owner" : "jv", - "name" : "ae", - "access" : 0, - "descriptor" : "I", - "decoder" : -1619361485 - }, { - "field" : "groundActions", - "owner" : "jv", - "name" : "av", - "access" : 1, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "id", - "owner" : "jv", - "name" : "i", - "access" : 1, - "descriptor" : "I", - "decoder" : -590103687 - }, { - "field" : "int1", - "owner" : "jv", - "name" : "bs", - "access" : 1, - "descriptor" : "I", - "decoder" : -1057008657 - }, { - "field" : "inventoryActions", - "owner" : "jv", - "name" : "ar", - "access" : 1, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "isMembersOnly", - "owner" : "jv", - "name" : "aj", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "isStackable", - "owner" : "jv", - "name" : "ag", - "access" : 1, - "descriptor" : "I", - "decoder" : -237597001 - }, { - "field" : "isTradable", - "owner" : "jv", - "name" : "bn", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "maleHeadModel", - "owner" : "jv", - "name" : "ap", - "access" : 0, - "descriptor" : "I", - "decoder" : -650184697 - }, { - "field" : "maleHeadModel2", - "owner" : "jv", - "name" : "as", - "access" : 0, - "descriptor" : "I", - "decoder" : 548044049 - }, { - "field" : "maleModel", - "owner" : "jv", - "name" : "ah", - "access" : 0, - "descriptor" : "I", - "decoder" : 939367983 - }, { - "field" : "maleModel1", - "owner" : "jv", - "name" : "ak", - "access" : 0, - "descriptor" : "I", - "decoder" : 140643039 - }, { - "field" : "maleModel2", - "owner" : "jv", - "name" : "at", - "access" : 0, - "descriptor" : "I", - "decoder" : -691559863 - }, { - "field" : "maleOffset", - "owner" : "jv", - "name" : "aw", - "access" : 0, - "descriptor" : "I", - "decoder" : -1378899027 - }, { - "field" : "name", - "owner" : "jv", - "name" : "z", - "access" : 1, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "note", - "owner" : "jv", - "name" : "ao", - "access" : 1, - "descriptor" : "I", - "decoder" : 619422509 - }, { - "field" : "noteTemplate", - "owner" : "jv", - "name" : "aa", - "access" : 1, - "descriptor" : "I", - "decoder" : -2121346423 - }, { - "field" : "notedId", - "owner" : "jv", - "name" : "bd", - "access" : 0, - "descriptor" : "I", - "decoder" : -1969719185 - }, { - "field" : "offsetX2d", - "owner" : "jv", - "name" : "p", - "access" : 1, - "descriptor" : "I", - "decoder" : -533708435 - }, { - "field" : "offsetY2d", - "owner" : "jv", - "name" : "v", - "access" : 1, - "descriptor" : "I", - "decoder" : -2130350563 - }, { - "field" : "params", - "owner" : "jv", - "name" : "bq", - "access" : 0, - "descriptor" : "Llh;" - }, { - "field" : "placeholder", - "owner" : "jv", - "name" : "bc", - "access" : 1, - "descriptor" : "I", - "decoder" : 807815565 - }, { - "field" : "placeholderTemplate", - "owner" : "jv", - "name" : "bo", - "access" : 1, - "descriptor" : "I", - "decoder" : -1854342455 - }, { - "field" : "price", - "owner" : "jv", - "name" : "aq", - "access" : 1, - "descriptor" : "I", - "decoder" : -343501105 - }, { - "field" : "recolorFrom", - "owner" : "jv", - "name" : "j", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "recolorTo", - "owner" : "jv", - "name" : "s", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "resizeX", - "owner" : "jv", - "name" : "ax", - "access" : 0, - "descriptor" : "I", - "decoder" : 69034859 - }, { - "field" : "resizeY", - "owner" : "jv", - "name" : "af", - "access" : 0, - "descriptor" : "I", - "decoder" : -17174497 - }, { - "field" : "resizeZ", - "owner" : "jv", - "name" : "ai", - "access" : 0, - "descriptor" : "I", - "decoder" : 1395132907 - }, { - "field" : "retextureFrom", - "owner" : "jv", - "name" : "t", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "retextureTo", - "owner" : "jv", - "name" : "y", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "shiftClickIndex0", - "owner" : "jv", - "name" : "ay", - "access" : 0, - "descriptor" : "I", - "decoder" : 881309855 - }, { - "field" : "unnotedId", - "owner" : "jv", - "name" : "bk", - "access" : 0, - "descriptor" : "I", - "decoder" : 700576005 - }, { - "field" : "xan2d", - "owner" : "jv", - "name" : "b", - "access" : 1, - "descriptor" : "I", - "decoder" : 880150839 - }, { - "field" : "yan2d", - "owner" : "jv", - "name" : "c", - "access" : 1, - "descriptor" : "I", - "decoder" : 507808107 - }, { - "field" : "zan2d", - "owner" : "jv", - "name" : "r", - "access" : 1, - "descriptor" : "I", - "decoder" : 551313257 - }, { - "field" : "zoom2d", - "owner" : "jv", - "name" : "h", - "access" : 1, - "descriptor" : "I", - "decoder" : 278037959 - }, { - "field" : "__a", - "owner" : "jv", - "name" : "a", - "access" : 0, - "descriptor" : "I", - "decoder" : 1070080857 - }, { - "field" : "__au", - "owner" : "jv", - "name" : "au", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__az", - "owner" : "jv", - "name" : "az", - "access" : 0, - "descriptor" : "[I" - } ], - "methods" : [ { - "method" : "getIntParam", - "owner" : "jv", - "name" : "y", - "access" : 1, - "descriptor" : "(IIS)I" - }, { - "method" : "getModel", - "owner" : "jv", - "name" : "e", - "access" : 17, - "parameters" : [ "quantity" ], - "descriptor" : "(II)Ldu;" - }, { - "method" : "getShiftClickIndex", - "owner" : "jv", - "name" : "b", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "getStringParam", - "owner" : "jv", - "name" : "h", - "access" : 1, - "descriptor" : "(ILjava/lang/String;I)Ljava/lang/String;" - }, { - "method" : "read", - "owner" : "jv", - "name" : "q", - "access" : 0, - "descriptor" : "(Lgr;I)V" - }, { - "method" : "readNext", - "owner" : "jv", - "name" : "w", - "access" : 0, - "descriptor" : "(Lgr;II)V" - }, { - "method" : "__f_425", - "owner" : "jv", - "name" : "f", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__o_426", - "owner" : "jv", - "name" : "o", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljv;Ljv;I)V" - }, { - "method" : "__u_427", - "owner" : "jv", - "name" : "u", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljv;Ljv;I)V" - }, { - "method" : "__g_428", - "owner" : "jv", - "name" : "g", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljv;Ljv;I)V" - }, { - "method" : "__l_429", - "owner" : "jv", - "name" : "l", - "access" : 17, - "parameters" : [ "arg0" ], - "descriptor" : "(II)Ldw;" - }, { - "method" : "__x_430", - "owner" : "jv", - "name" : "x", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(IB)Ljv;" - }, { - "method" : "__z_431", - "owner" : "jv", - "name" : "z", - "access" : 17, - "parameters" : [ "arg0" ], - "descriptor" : "(ZI)Z" - }, { - "method" : "__j_432", - "owner" : "jv", - "name" : "j", - "access" : 17, - "parameters" : [ "arg0" ], - "descriptor" : "(ZB)Ldw;" - }, { - "method" : "__s_433", - "owner" : "jv", - "name" : "s", - "access" : 17, - "parameters" : [ "arg0" ], - "descriptor" : "(ZI)Z" - }, { - "method" : "__t_434", - "owner" : "jv", - "name" : "t", - "access" : 17, - "parameters" : [ "arg0" ], - "descriptor" : "(ZI)Ldw;" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "NpcDefinition", - "name" : "jz", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "actions", - "owner" : "jz", - "name" : "h", - "access" : 1, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "archives", - "owner" : "jz", - "name" : "l", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "combatLevel", - "owner" : "jz", - "name" : "c", - "access" : 1, - "descriptor" : "I", - "decoder" : 1192179847 - }, { - "field" : "drawMapDot", - "owner" : "jz", - "name" : "b", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "headIconPrayer", - "owner" : "jz", - "name" : "aj", - "access" : 1, - "descriptor" : "I", - "decoder" : 235824283 - }, { - "field" : "heightScale", - "owner" : "jz", - "name" : "p", - "access" : 0, - "descriptor" : "I", - "decoder" : 1390683537 - }, { - "field" : "id", - "owner" : "jz", - "name" : "o", - "access" : 1, - "descriptor" : "I", - "decoder" : -1937346627 - }, { - "field" : "idleSequence", - "owner" : "jz", - "name" : "x", - "access" : 1, - "descriptor" : "I", - "decoder" : 275200787 - }, { - "field" : "isFollower", - "owner" : "jz", - "name" : "aw", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "isInteractable", - "owner" : "jz", - "name" : "ah", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "name", - "owner" : "jz", - "name" : "u", - "access" : 1, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "params", - "owner" : "jz", - "name" : "al", - "access" : 0, - "descriptor" : "Llh;" - }, { - "field" : "recolorFrom", - "owner" : "jz", - "name" : "j", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "recolorTo", - "owner" : "jz", - "name" : "s", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "retextureFrom", - "owner" : "jz", - "name" : "t", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "retextureTo", - "owner" : "jz", - "name" : "y", - "access" : 0, - "descriptor" : "[S" - }, { - "field" : "size", - "owner" : "jz", - "name" : "g", - "access" : 1, - "descriptor" : "I", - "decoder" : -1541308911 - }, { - "field" : "transformVarbit", - "owner" : "jz", - "name" : "ac", - "access" : 0, - "descriptor" : "I", - "decoder" : 1011388197 - }, { - "field" : "transformVarp", - "owner" : "jz", - "name" : "ay", - "access" : 0, - "descriptor" : "I", - "decoder" : 1631362233 - }, { - "field" : "transforms", - "owner" : "jz", - "name" : "ar", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "turnLeftSequence", - "owner" : "jz", - "name" : "d", - "access" : 1, - "descriptor" : "I", - "decoder" : 819690597 - }, { - "field" : "turnRightSequence", - "owner" : "jz", - "name" : "k", - "access" : 1, - "descriptor" : "I", - "decoder" : 1311553413 - }, { - "field" : "walkSequence", - "owner" : "jz", - "name" : "n", - "access" : 1, - "descriptor" : "I", - "decoder" : -284110917 - }, { - "field" : "walkTurnLeftSequence", - "owner" : "jz", - "name" : "a", - "access" : 1, - "descriptor" : "I", - "decoder" : -1213774321 - }, { - "field" : "walkTurnRightSequence", - "owner" : "jz", - "name" : "z", - "access" : 1, - "descriptor" : "I", - "decoder" : -96930503 - }, { - "field" : "walkTurnSequence", - "owner" : "jz", - "name" : "i", - "access" : 1, - "descriptor" : "I", - "decoder" : 1952230339 - }, { - "field" : "widthScale", - "owner" : "jz", - "name" : "r", - "access" : 0, - "descriptor" : "I", - "decoder" : -1469219067 - }, { - "field" : "__ag", - "owner" : "jz", - "name" : "ag", - "access" : 0, - "descriptor" : "I", - "decoder" : -1235927151 - }, { - "field" : "__aq", - "owner" : "jz", - "name" : "aq", - "access" : 0, - "descriptor" : "I", - "decoder" : 1962875903 - }, { - "field" : "__e", - "owner" : "jz", - "name" : "e", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__ak", - "owner" : "jz", - "name" : "ak", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "__v", - "owner" : "jz", - "name" : "v", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "__av", - "owner" : "jz", - "name" : "av", - "access" : 1, - "descriptor" : "I", - "decoder" : -506638747 - } ], - "methods" : [ { - "method" : "getIntParam", - "owner" : "jz", - "name" : "x", - "access" : 1, - "descriptor" : "(III)I" - }, { - "method" : "getModel", - "owner" : "jz", - "name" : "u", - "access" : 17, - "parameters" : [ "s1", "n1", "s2", "n2" ], - "descriptor" : "(Ljh;ILjh;II)Ldu;" - }, { - "method" : "getModelData", - "owner" : "jz", - "name" : "g", - "access" : 17, - "parameters" : [ ], - "descriptor" : "(I)Ldw;" - }, { - "method" : "getStringParam", - "owner" : "jz", - "name" : "d", - "access" : 1, - "descriptor" : "(ILjava/lang/String;I)Ljava/lang/String;" - }, { - "method" : "init", - "owner" : "jz", - "name" : "q", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "read", - "owner" : "jz", - "name" : "w", - "access" : 0, - "descriptor" : "(Lgr;I)V" - }, { - "method" : "readNext", - "owner" : "jz", - "name" : "o", - "access" : 0, - "descriptor" : "(Lgr;IB)V" - }, { - "method" : "transform", - "owner" : "jz", - "name" : "l", - "access" : 17, - "parameters" : [ ], - "descriptor" : "(B)Ljz;" - }, { - "method" : "__e_435", - "owner" : "jz", - "name" : "e", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Z" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "OverlayDefinition", - "name" : "jf", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "hue", - "owner" : "jf", - "name" : "g", - "access" : 1, - "descriptor" : "I", - "decoder" : 2013422835 - }, { - "field" : "hue2", - "owner" : "jf", - "name" : "x", - "access" : 1, - "descriptor" : "I", - "decoder" : -122393061 - }, { - "field" : "lightness", - "owner" : "jf", - "name" : "e", - "access" : 1, - "descriptor" : "I", - "decoder" : -624223733 - }, { - "field" : "lightness2", - "owner" : "jf", - "name" : "k", - "access" : 1, - "descriptor" : "I", - "decoder" : 127639041 - }, { - "field" : "rgb", - "owner" : "jf", - "name" : "q", - "access" : 1, - "descriptor" : "I", - "decoder" : -111851793 - }, { - "field" : "rgb2", - "owner" : "jf", - "name" : "u", - "access" : 1, - "descriptor" : "I", - "decoder" : 528865753 - }, { - "field" : "saturation", - "owner" : "jf", - "name" : "l", - "access" : 1, - "descriptor" : "I", - "decoder" : -1719896767 - }, { - "field" : "saturation2", - "owner" : "jf", - "name" : "d", - "access" : 1, - "descriptor" : "I", - "decoder" : 1514187401 - }, { - "field" : "texture", - "owner" : "jf", - "name" : "w", - "access" : 1, - "descriptor" : "I", - "decoder" : 733377225 - }, { - "field" : "__o", - "owner" : "jf", - "name" : "o", - "access" : 1, - "descriptor" : "Z" - } ], - "methods" : [ { - "method" : "init", - "owner" : "jf", - "name" : "f", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "read", - "owner" : "jf", - "name" : "q", - "access" : 1, - "descriptor" : "(Lgr;II)V" - }, { - "method" : "readNext", - "owner" : "jf", - "name" : "w", - "access" : 0, - "descriptor" : "(Lgr;III)V" - }, { - "method" : "setHsl", - "owner" : "jf", - "name" : "o", - "access" : 0, - "parameters" : [ "rgb" ], - "descriptor" : "(II)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "SequenceDefinition", - "name" : "jh", - "super" : "fn", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "frameCount", - "owner" : "jh", - "name" : "x", - "access" : 1, - "descriptor" : "I", - "decoder" : -736885973 - }, { - "field" : "frameIds", - "owner" : "jh", - "name" : "u", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "frameIds2", - "owner" : "jh", - "name" : "g", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "frameLengths", - "owner" : "jh", - "name" : "l", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "shield", - "owner" : "jh", - "name" : "i", - "access" : 1, - "descriptor" : "I", - "decoder" : -1308226131 - }, { - "field" : "weapon", - "owner" : "jh", - "name" : "a", - "access" : 1, - "descriptor" : "I", - "decoder" : -1629538741 - }, { - "field" : "__d", - "owner" : "jh", - "name" : "d", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__k", - "owner" : "jh", - "name" : "k", - "access" : 1, - "descriptor" : "Z" - }, { - "field" : "__j", - "owner" : "jh", - "name" : "j", - "access" : 1, - "descriptor" : "I", - "decoder" : 1339014215 - }, { - "field" : "__n", - "owner" : "jh", - "name" : "n", - "access" : 1, - "descriptor" : "I", - "decoder" : 1309695045 - }, { - "field" : "__s", - "owner" : "jh", - "name" : "s", - "access" : 1, - "descriptor" : "I", - "decoder" : 2012242069 - }, { - "field" : "__t", - "owner" : "jh", - "name" : "t", - "access" : 1, - "descriptor" : "I", - "decoder" : 1147391369 - }, { - "field" : "__z", - "owner" : "jh", - "name" : "z", - "access" : 1, - "descriptor" : "I", - "decoder" : -28345361 - }, { - "field" : "__e", - "owner" : "jh", - "name" : "e", - "access" : 1, - "descriptor" : "[I" - } ], - "methods" : [ { - "method" : "animateObject", - "owner" : "jh", - "name" : "u", - "access" : 0, - "parameters" : [ "model", "frame", "orientation" ], - "descriptor" : "(Ldu;IIB)Ldu;" - }, { - "method" : "animateSequence", - "owner" : "jh", - "name" : "o", - "access" : 1, - "parameters" : [ "model", "frame" ], - "descriptor" : "(Ldu;II)Ldu;" - }, { - "method" : "animateSequence2", - "owner" : "jh", - "name" : "l", - "access" : 1, - "parameters" : [ "model", "frame", "sequence", "sequenceFrame" ], - "descriptor" : "(Ldu;ILjh;II)Ldu;" - }, { - "method" : "animateSpotAnimation", - "owner" : "jh", - "name" : "g", - "access" : 0, - "parameters" : [ "model", "frame" ], - "descriptor" : "(Ldu;II)Ldu;" - }, { - "method" : "animateWidget", - "owner" : "jh", - "name" : "e", - "access" : 1, - "parameters" : [ "model", "frame" ], - "descriptor" : "(Ldu;II)Ldu;" - }, { - "method" : "init", - "owner" : "jh", - "name" : "w", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "read", - "owner" : "jh", - "name" : "f", - "access" : 0, - "descriptor" : "(Lgr;S)V" - }, { - "method" : "readNext", - "owner" : "jh", - "name" : "q", - "access" : 0, - "descriptor" : "(Lgr;II)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "IterableNodeDeque", - "name" : "ja", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "java.lang.Iterable" ], - "fields" : [ { - "field" : "current", - "owner" : "ja", - "name" : "f", - "access" : 0, - "descriptor" : "Lgw;" - }, { - "field" : "sentinel", - "owner" : "ja", - "name" : "m", - "access" : 0, - "descriptor" : "Lgw;" - } ], - "methods" : [ { - "method" : "addFirst", - "owner" : "ja", - "name" : "f", - "access" : 1, - "parameters" : [ "node" ], - "descriptor" : "(Lgw;)V" - }, { - "method" : "addLast", - "owner" : "ja", - "name" : "q", - "access" : 1, - "parameters" : [ "node" ], - "descriptor" : "(Lgw;)V" - }, { - "method" : "clear", - "owner" : "ja", - "name" : "m", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "isEmpty", - "owner" : "ja", - "name" : "l", - "access" : 1, - "descriptor" : "()Z" - }, { - "method" : "last", - "owner" : "ja", - "name" : "o", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Lgw;" - }, { - "method" : "previous", - "owner" : "ja", - "name" : "g", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Lgw;" - }, { - "method" : "previousOrLast", - "owner" : "ja", - "name" : "u", - "access" : 0, - "parameters" : [ "node" ], - "descriptor" : "(Lgw;)Lgw;" - }, { - "method" : "__iterator_436", - "owner" : "ja", - "name" : "iterator", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Ljava/util/Iterator;" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "LinkDeque", - "name" : "jy", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__f", - "owner" : "jy", - "name" : "f", - "access" : 0, - "descriptor" : "Lgh;" - }, { - "field" : "__m", - "owner" : "jy", - "name" : "m", - "access" : 0, - "descriptor" : "Lgh;" - } ], - "methods" : [ { - "method" : "__m_437", - "owner" : "jy", - "name" : "m", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Lgh;)V" - }, { - "method" : "__f_438", - "owner" : "jy", - "name" : "f", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Lgh;" - }, { - "method" : "__q_439", - "owner" : "jy", - "name" : "q", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Lgh;" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "IterableDualNodeQueueIterator", - "name" : "jl", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "java.util.Iterator" ], - "fields" : [ { - "field" : "queue", - "owner" : "jl", - "name" : "m", - "access" : 0, - "descriptor" : "Ljc;" - }, { - "field" : "__f", - "owner" : "jl", - "name" : "f", - "access" : 0, - "descriptor" : "Lfn;" - }, { - "field" : "__q", - "owner" : "jl", - "name" : "q", - "access" : 0, - "descriptor" : "Lfn;" - } ], - "methods" : [ { - "method" : "__next_440", - "owner" : "jl", - "name" : "next", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Ljava/lang/Object;" - }, { - "method" : "__hasNext_441", - "owner" : "jl", - "name" : "hasNext", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Z" - }, { - "method" : "__remove_442", - "owner" : "jl", - "name" : "remove", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljc;)V" - } ] -}, { - "class" : "IterableNodeDequeDescendingIterator", - "name" : "jt", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "java.util.Iterator" ], - "fields" : [ { - "field" : "deque", - "owner" : "jt", - "name" : "m", - "access" : 0, - "descriptor" : "Lja;" - }, { - "field" : "__f", - "owner" : "jt", - "name" : "f", - "access" : 0, - "descriptor" : "Lgw;" - }, { - "field" : "__q", - "owner" : "jt", - "name" : "q", - "access" : 0, - "descriptor" : "Lgw;" - } ], - "methods" : [ { - "method" : "__u_443", - "owner" : "jt", - "name" : "u", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(Lja;)V" - }, { - "method" : "__g_444", - "owner" : "jt", - "name" : "g", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__next_445", - "owner" : "jt", - "name" : "next", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Ljava/lang/Object;" - }, { - "method" : "__hasNext_446", - "owner" : "jt", - "name" : "hasNext", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Z" - }, { - "method" : "__remove_447", - "owner" : "jt", - "name" : "remove", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Lja;)V" - } ] -}, { - "class" : "IterableDualNodeQueue", - "name" : "jc", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "java.lang.Iterable" ], - "fields" : [ { - "field" : "head", - "owner" : "jc", - "name" : "f", - "access" : 0, - "descriptor" : "Lfn;" - }, { - "field" : "sentinel", - "owner" : "jc", - "name" : "m", - "access" : 1, - "descriptor" : "Lfn;" - } ], - "methods" : [ { - "method" : "add", - "owner" : "jc", - "name" : "f", - "access" : 1, - "descriptor" : "(Lfn;)V" - }, { - "method" : "clear", - "owner" : "jc", - "name" : "m", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__q_448", - "owner" : "jc", - "name" : "q", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Lfn;" - }, { - "method" : "__w_449", - "owner" : "jc", - "name" : "w", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Lfn;" - }, { - "method" : "__o_450", - "owner" : "jc", - "name" : "o", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(Lfn;)Lfn;" - }, { - "method" : "__u_451", - "owner" : "jc", - "name" : "u", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Lfn;" - }, { - "method" : "__iterator_452", - "owner" : "jc", - "name" : "iterator", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Ljava/util/Iterator;" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "Timer", - "name" : "jo", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__e", - "owner" : "jo", - "name" : "e", - "access" : 0, - "descriptor" : "I", - "decoder" : 978183419 - }, { - "field" : "__g", - "owner" : "jo", - "name" : "g", - "access" : 0, - "descriptor" : "I", - "decoder" : -500639955 - }, { - "field" : "__l", - "owner" : "jo", - "name" : "l", - "access" : 0, - "descriptor" : "I", - "decoder" : 2043109577 - }, { - "field" : "__x", - "owner" : "jo", - "name" : "x", - "access" : 0, - "descriptor" : "I", - "decoder" : 1684916659 - }, { - "field" : "__f", - "owner" : "jo", - "name" : "f", - "access" : 0, - "descriptor" : "J", - "decoder" : -8166664055136527097 - }, { - "field" : "__m", - "owner" : "jo", - "name" : "m", - "access" : 0, - "descriptor" : "J", - "decoder" : 6181704275746246665 - }, { - "field" : "__o", - "owner" : "jo", - "name" : "o", - "access" : 0, - "descriptor" : "J", - "decoder" : -5820022560321695785 - }, { - "field" : "__u", - "owner" : "jo", - "name" : "u", - "access" : 0, - "descriptor" : "J", - "decoder" : -7044840680232740733 - }, { - "field" : "__w", - "owner" : "jo", - "name" : "w", - "access" : 0, - "descriptor" : "J", - "decoder" : -6206176920376957899 - }, { - "field" : "__q", - "owner" : "jo", - "name" : "q", - "access" : 1, - "descriptor" : "Z" - } ], - "methods" : [ { - "method" : "write", - "owner" : "jo", - "name" : "g", - "access" : 1, - "parameters" : [ "buffer" ], - "descriptor" : "(Lgr;I)V" - }, { - "method" : "__m_453", - "owner" : "jo", - "name" : "m", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__f_454", - "owner" : "jo", - "name" : "f", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "__q_455", - "owner" : "jo", - "name" : "q", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(II)V" - }, { - "method" : "__w_456", - "owner" : "jo", - "name" : "w", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__o_457", - "owner" : "jo", - "name" : "o", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(S)V" - }, { - "method" : "__u_458", - "owner" : "jo", - "name" : "u", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "User", - "name" : "js", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "java.lang.Comparable" ], - "fields" : [ { - "field" : "previousUsername", - "owner" : "js", - "name" : "w", - "access" : 0, - "descriptor" : "Lkp;" - }, { - "field" : "username0", - "owner" : "js", - "name" : "q", - "access" : 0, - "descriptor" : "Lkp;" - } ], - "methods" : [ { - "method" : "compareTo0", - "owner" : "js", - "name" : "aj", - "access" : 1, - "parameters" : [ "other" ], - "descriptor" : "(Ljs;I)I" - }, { - "method" : "name", - "owner" : "js", - "name" : "v", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)Ljava/lang/String;" - }, { - "method" : "previousName", - "owner" : "js", - "name" : "ag", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Ljava/lang/String;" - }, { - "method" : "set", - "owner" : "js", - "name" : "aq", - "access" : 0, - "parameters" : [ "username", "previousUsername" ], - "descriptor" : "(Lkp;Lkp;I)V" - }, { - "method" : "username", - "owner" : "js", - "name" : "p", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Lkp;" - }, { - "method" : "__compareTo_459", - "owner" : "js", - "name" : "compareTo", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/lang/Object;)I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "AbstractUserComparator", - "name" : "kf", - "super" : "java.lang.Object", - "access" : 1057, - "interfaces" : [ "java.util.Comparator" ], - "fields" : [ { - "field" : "__f", - "owner" : "kf", - "name" : "f", - "access" : 0, - "descriptor" : "Ljava/util/Comparator;" - } ], - "methods" : [ { - "method" : "__e_460", - "owner" : "kf", - "name" : "e", - "access" : 16, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/util/Comparator;B)V" - }, { - "method" : "__x_461", - "owner" : "kf", - "name" : "x", - "access" : 20, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljs;Ljs;I)I" - }, { - "method" : "__equals_462", - "owner" : "kf", - "name" : "equals", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/lang/Object;)Z" - } ], - "constructors" : [ { - "access" : 4, - "descriptor" : "()V" - } ] -}, { - "class" : "Ignored", - "name" : "ks", - "super" : "js", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "id", - "owner" : "ks", - "name" : "m", - "access" : 0, - "descriptor" : "I", - "decoder" : 344024525 - } ], - "methods" : [ { - "method" : "compareTo00", - "owner" : "ks", - "name" : "m", - "access" : 0, - "parameters" : [ "other" ], - "descriptor" : "(Lks;I)I" - }, { - "method" : "__aj_463", - "owner" : "ks", - "name" : "aj", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljs;I)I" - }, { - "method" : "__compareTo_464", - "owner" : "ks", - "name" : "compareTo", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/lang/Object;)I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "FriendsList", - "name" : "kg", - "super" : "km", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "friendLoginUpdates", - "owner" : "kg", - "name" : "d", - "access" : 1, - "descriptor" : "Ljy;" - }, { - "field" : "loginType", - "owner" : "kg", - "name" : "q", - "access" : 16, - "descriptor" : "Llx;" - }, { - "field" : "__x", - "owner" : "kg", - "name" : "x", - "access" : 0, - "descriptor" : "I", - "decoder" : -217526077 - } ], - "methods" : [ { - "method" : "newInstance", - "owner" : "kg", - "name" : "m", - "access" : 0, - "descriptor" : "(I)Ljs;" - }, { - "method" : "newTypedArray", - "owner" : "kg", - "name" : "f", - "access" : 0, - "descriptor" : "(II)[Ljs;" - }, { - "method" : "read", - "owner" : "kg", - "name" : "x", - "access" : 1, - "parameters" : [ "buffer", "n" ], - "descriptor" : "(Lgr;IB)V" - }, { - "method" : "__q_465", - "owner" : "kg", - "name" : "q", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Lkp;ZI)Z" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Llx;)V" - } ] -}, { - "class" : "Username", - "name" : "kp", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "java.lang.Comparable" ], - "fields" : [ { - "field" : "cleanName", - "owner" : "kp", - "name" : "f", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "name0", - "owner" : "kp", - "name" : "m", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - } ], - "methods" : [ { - "method" : "compareTo0", - "owner" : "kp", - "name" : "q", - "access" : 1, - "parameters" : [ "other" ], - "descriptor" : "(Lkp;B)I" - }, { - "method" : "hasCleanName", - "owner" : "kp", - "name" : "f", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "name", - "owner" : "kp", - "name" : "m", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Ljava/lang/String;" - }, { - "method" : "__equals_466", - "owner" : "kp", - "name" : "equals", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/lang/Object;)Z" - }, { - "method" : "__hashCode_467", - "owner" : "kp", - "name" : "hashCode", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()I" - }, { - "method" : "__toString_468", - "owner" : "kp", - "name" : "toString", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Ljava/lang/String;" - }, { - "method" : "__compareTo_469", - "owner" : "kp", - "name" : "compareTo", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/lang/Object;)I" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Ljava/lang/String;Llx;)V" - } ] -}, { - "class" : "Friend", - "name" : "kq", - "super" : "ke", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__f", - "owner" : "kq", - "name" : "f", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "__m", - "owner" : "kq", - "name" : "m", - "access" : 0, - "descriptor" : "Z" - } ], - "methods" : [ { - "method" : "compareTo00", - "owner" : "kq", - "name" : "m", - "access" : 0, - "parameters" : [ "other" ], - "descriptor" : "(Lkq;I)I" - }, { - "method" : "__aj_470", - "owner" : "kq", - "name" : "aj", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljs;I)I" - }, { - "method" : "__compareTo_471", - "owner" : "kq", - "name" : "compareTo", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/lang/Object;)I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "ClanChat", - "name" : "kv", - "super" : "km", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "localUser", - "owner" : "kv", - "name" : "q", - "access" : 16, - "descriptor" : "Lky;" - }, { - "field" : "loginType", - "owner" : "kv", - "name" : "f", - "access" : 16, - "descriptor" : "Llx;" - }, { - "field" : "name", - "owner" : "kv", - "name" : "x", - "access" : 1, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "owner", - "owner" : "kv", - "name" : "d", - "access" : 1, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "rank", - "owner" : "kv", - "name" : "n", - "access" : 1, - "descriptor" : "I", - "decoder" : -1534670751 - }, { - "field" : "__i", - "owner" : "kv", - "name" : "i", - "access" : 0, - "descriptor" : "I", - "decoder" : 386706253 - }, { - "field" : "__k", - "owner" : "kv", - "name" : "k", - "access" : 1, - "descriptor" : "B" - } ], - "methods" : [ { - "method" : "clearFriends", - "owner" : "kv", - "name" : "cg", - "access" : 17, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "clearIgnoreds", - "owner" : "kv", - "name" : "cf", - "access" : 17, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "newInstance", - "owner" : "kv", - "name" : "m", - "access" : 0, - "descriptor" : "(I)Ljs;" - }, { - "method" : "newTypedArray", - "owner" : "kv", - "name" : "f", - "access" : 0, - "descriptor" : "(II)[Ljs;" - }, { - "method" : "readUpdate", - "owner" : "kv", - "name" : "d", - "access" : 17, - "parameters" : [ "buffer" ], - "descriptor" : "(Lgr;I)V" - }, { - "method" : "__q_472", - "owner" : "kv", - "name" : "q", - "access" : 16, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/lang/String;I)V" - }, { - "method" : "__x_473", - "owner" : "kv", - "name" : "x", - "access" : 16, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/lang/String;B)V" - }, { - "method" : "__a_474", - "owner" : "kv", - "name" : "a", - "access" : 17, - "parameters" : [ "arg0" ], - "descriptor" : "(Lgr;B)V" - }, { - "method" : "__cp_475", - "owner" : "kv", - "name" : "cp", - "access" : 16, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljk;I)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Llx;Lky;)V" - } ] -}, { - "class" : "FontName", - "name" : "kx", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__g", - "owner" : "kx", - "name" : "g", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - } ], - "methods" : [ ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Ljava/lang/String;)V" - } ] -}, { - "class" : "Fonts", - "name" : "kz", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "map", - "owner" : "kz", - "name" : "q", - "access" : 0, - "descriptor" : "Ljava/util/HashMap;" - }, { - "field" : "__f", - "owner" : "kz", - "name" : "f", - "access" : 0, - "descriptor" : "Lir;" - }, { - "field" : "__m", - "owner" : "kz", - "name" : "m", - "access" : 0, - "descriptor" : "Lir;" - } ], - "methods" : [ { - "method" : "createMap", - "owner" : "kz", - "name" : "m", - "access" : 1, - "descriptor" : "([Lkx;I)Ljava/util/HashMap;" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Lir;Lir;)V" - } ] -}, { - "class" : "SpriteIds", - "name" : "lg", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "crosses", - "owner" : "lg", - "name" : "l", - "access" : 1, - "descriptor" : "I", - "decoder" : 536911453 - }, { - "field" : "headIconsHint", - "owner" : "lg", - "name" : "u", - "access" : 1, - "descriptor" : "I", - "decoder" : 185111653 - }, { - "field" : "headIconsPk", - "owner" : "lg", - "name" : "w", - "access" : 1, - "descriptor" : "I", - "decoder" : -1052769237 - }, { - "field" : "headIconsPrayer", - "owner" : "lg", - "name" : "o", - "access" : 1, - "descriptor" : "I", - "decoder" : -1744250043 - }, { - "field" : "mapDots", - "owner" : "lg", - "name" : "e", - "access" : 1, - "descriptor" : "I", - "decoder" : -1114417319 - }, { - "field" : "mapMarkers", - "owner" : "lg", - "name" : "g", - "access" : 1, - "descriptor" : "I", - "decoder" : -1217061337 - }, { - "field" : "mapScenes", - "owner" : "lg", - "name" : "q", - "access" : 1, - "descriptor" : "I", - "decoder" : -104203005 - }, { - "field" : "modIcons", - "owner" : "lg", - "name" : "d", - "access" : 1, - "descriptor" : "I", - "decoder" : 2043130323 - }, { - "field" : "scrollBars", - "owner" : "lg", - "name" : "x", - "access" : 1, - "descriptor" : "I", - "decoder" : -919662109 - }, { - "field" : "__f", - "owner" : "lg", - "name" : "f", - "access" : 1, - "descriptor" : "I", - "decoder" : 159591367 - }, { - "field" : "__m", - "owner" : "lg", - "name" : "m", - "access" : 1, - "descriptor" : "I", - "decoder" : 1673796151 - } ], - "methods" : [ { - "method" : "read", - "owner" : "lg", - "name" : "m", - "access" : 1, - "parameters" : [ "index" ], - "descriptor" : "(Lir;I)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "UserComparator1", - "name" : "ly", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "java.util.Comparator" ], - "fields" : [ { - "field" : "__m", - "owner" : "ly", - "name" : "m", - "access" : 16, - "descriptor" : "Z" - } ], - "methods" : [ { - "method" : "__m_476", - "owner" : "ly", - "name" : "m", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljs;Ljs;B)I" - }, { - "method" : "__compare_477", - "owner" : "ly", - "name" : "compare", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" - }, { - "method" : "__equals_478", - "owner" : "ly", - "name" : "equals", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/lang/Object;)Z" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Z)V" - } ] -}, { - "class" : "UserComparator2", - "name" : "li", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "java.util.Comparator" ], - "fields" : [ { - "field" : "__m", - "owner" : "li", - "name" : "m", - "access" : 16, - "descriptor" : "Z" - } ], - "methods" : [ { - "method" : "__m_479", - "owner" : "li", - "name" : "m", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljs;Ljs;I)I" - }, { - "method" : "__compare_480", - "owner" : "li", - "name" : "compare", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" - }, { - "method" : "__equals_481", - "owner" : "li", - "name" : "equals", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(Ljava/lang/Object;)Z" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(Z)V" - } ] -}, { - "class" : "IterableNodeHashTable", - "name" : "lh", - "super" : "java.lang.Object", - "access" : 49, - "interfaces" : [ "java.lang.Iterable" ], - "fields" : [ { - "field" : "buckets", - "owner" : "lh", - "name" : "f", - "access" : 0, - "descriptor" : "[Lgw;" - }, { - "field" : "current", - "owner" : "lh", - "name" : "w", - "access" : 0, - "descriptor" : "Lgw;" - }, { - "field" : "currentGet", - "owner" : "lh", - "name" : "q", - "access" : 0, - "descriptor" : "Lgw;" - }, { - "field" : "index", - "owner" : "lh", - "name" : "o", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "size", - "owner" : "lh", - "name" : "m", - "access" : 0, - "descriptor" : "I" - } ], - "methods" : [ { - "method" : "clear", - "owner" : "lh", - "name" : "q", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "first", - "owner" : "lh", - "name" : "w", - "access" : 1, - "descriptor" : "()Lgw;" - }, { - "method" : "get", - "owner" : "lh", - "name" : "m", - "access" : 1, - "descriptor" : "(J)Lgw;" - }, { - "method" : "next", - "owner" : "lh", - "name" : "o", - "access" : 1, - "descriptor" : "()Lgw;" - }, { - "method" : "put", - "owner" : "lh", - "name" : "f", - "access" : 1, - "descriptor" : "(Lgw;J)V" - }, { - "method" : "__iterator_482", - "owner" : "lh", - "name" : "iterator", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Ljava/util/Iterator;" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(I)V" - } ] -}, { - "class" : "IterableNodeHashTableIterator", - "name" : "lk", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "java.util.Iterator" ], - "fields" : [ { - "field" : "hashTable", - "owner" : "lk", - "name" : "m", - "access" : 0, - "descriptor" : "Llh;" - }, { - "field" : "__f", - "owner" : "lk", - "name" : "f", - "access" : 0, - "descriptor" : "Lgw;" - }, { - "field" : "__w", - "owner" : "lk", - "name" : "w", - "access" : 0, - "descriptor" : "Lgw;" - }, { - "field" : "__q", - "owner" : "lk", - "name" : "q", - "access" : 0, - "descriptor" : "I" - } ], - "methods" : [ { - "method" : "__u_483", - "owner" : "lk", - "name" : "u", - "access" : 0, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__next_484", - "owner" : "lk", - "name" : "next", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Ljava/lang/Object;" - }, { - "method" : "__hasNext_485", - "owner" : "lk", - "name" : "hasNext", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Z" - }, { - "method" : "__remove_486", - "owner" : "lk", - "name" : "remove", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(Llh;)V" - } ] -}, { - "class" : "Bounds", - "name" : "la", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__f", - "owner" : "la", - "name" : "f", - "access" : 1, - "descriptor" : "I", - "decoder" : -1887298731 - }, { - "field" : "__m", - "owner" : "la", - "name" : "m", - "access" : 1, - "descriptor" : "I", - "decoder" : -2004088829 - }, { - "field" : "__q", - "owner" : "la", - "name" : "q", - "access" : 1, - "descriptor" : "I", - "decoder" : 2001187823 - }, { - "field" : "__w", - "owner" : "la", - "name" : "w", - "access" : 1, - "descriptor" : "I", - "decoder" : 1377856837 - } ], - "methods" : [ { - "method" : "__m_487", - "owner" : "la", - "name" : "m", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(IIB)V" - }, { - "method" : "__f_488", - "owner" : "la", - "name" : "f", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(III)V" - }, { - "method" : "__toString_489", - "owner" : "la", - "name" : "toString", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Ljava/lang/String;" - }, { - "method" : "__q_490", - "owner" : "la", - "name" : "q", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Lla;Lla;I)V" - }, { - "method" : "__w_491", - "owner" : "la", - "name" : "w", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Lla;Lla;I)V" - }, { - "method" : "__o_492", - "owner" : "la", - "name" : "o", - "access" : 0, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(Lla;Lla;S)V" - }, { - "method" : "__u_493", - "owner" : "la", - "name" : "u", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__g_494", - "owner" : "la", - "name" : "g", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)I" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "(II)V" - }, { - "access" : 1, - "descriptor" : "(IIII)V" - } ] -}, { - "class" : "RectangleMode", - "name" : "lj", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ "gc" ], - "fields" : [ { - "field" : "id", - "owner" : "lj", - "name" : "w", - "access" : 17, - "descriptor" : "I", - "decoder" : -1391612747 - }, { - "field" : "id2", - "owner" : "lj", - "name" : "o", - "access" : 16, - "descriptor" : "I", - "decoder" : -1204297807 - } ], - "methods" : [ { - "method" : "__f_495", - "owner" : "lj", - "name" : "f", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)I" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(II)V" - } ] -}, { - "class" : "IndexedSprite", - "name" : "lq", - "super" : "lf", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "height", - "owner" : "lq", - "name" : "l", - "access" : 1, - "descriptor" : "I" - }, { - "field" : "palette", - "owner" : "lq", - "name" : "f", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "pixels", - "owner" : "lq", - "name" : "m", - "access" : 1, - "descriptor" : "[B" - }, { - "field" : "subHeight", - "owner" : "lq", - "name" : "w", - "access" : 1, - "descriptor" : "I" - }, { - "field" : "subWidth", - "owner" : "lq", - "name" : "q", - "access" : 1, - "descriptor" : "I" - }, { - "field" : "width", - "owner" : "lq", - "name" : "g", - "access" : 1, - "descriptor" : "I" - }, { - "field" : "xOffset", - "owner" : "lq", - "name" : "o", - "access" : 1, - "descriptor" : "I" - }, { - "field" : "yOffset", - "owner" : "lq", - "name" : "u", - "access" : 1, - "descriptor" : "I" - } ], - "methods" : [ { - "method" : "normalize", - "owner" : "lq", - "name" : "m", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "shiftColors", - "owner" : "lq", - "name" : "f", - "access" : 1, - "parameters" : [ "r", "g", "b" ], - "descriptor" : "(III)V" - }, { - "method" : "__q_496", - "owner" : "lq", - "name" : "q", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(II)V" - }, { - "method" : "__o_497", - "owner" : "lq", - "name" : "o", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], - "descriptor" : "(IIII)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - } ] -}, { - "class" : "Sprite", - "name" : "ln", - "super" : "lf", - "access" : 49, - "interfaces" : [ ], - "fields" : [ { - "field" : "height", - "owner" : "ln", - "name" : "g", - "access" : 1, - "descriptor" : "I" - }, { - "field" : "pixels", - "owner" : "ln", - "name" : "m", - "access" : 1, - "descriptor" : "[I" - }, { - "field" : "subHeight", - "owner" : "ln", - "name" : "q", - "access" : 1, - "descriptor" : "I" - }, { - "field" : "subWidth", - "owner" : "ln", - "name" : "f", - "access" : 1, - "descriptor" : "I" - }, { - "field" : "width", - "owner" : "ln", - "name" : "u", - "access" : 1, - "descriptor" : "I" - }, { - "field" : "xOffset", - "owner" : "ln", - "name" : "o", - "access" : 0, - "descriptor" : "I" - }, { - "field" : "yOffset", - "owner" : "ln", - "name" : "w", - "access" : 1, - "descriptor" : "I" - } ], - "methods" : [ { - "method" : "copy", - "owner" : "ln", - "name" : "m", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Lln;" - }, { - "method" : "copyNormalized", - "owner" : "ln", - "name" : "f", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Lln;" - }, { - "method" : "normalize", - "owner" : "ln", - "name" : "w", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__q_498", - "owner" : "ln", - "name" : "q", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__o_499", - "owner" : "ln", - "name" : "o", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(I)V" - }, { - "method" : "__u_500", - "owner" : "ln", - "name" : "u", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__g_501", - "owner" : "ln", - "name" : "g", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "__l_502", - "owner" : "ln", - "name" : "l", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(I)V" - }, { - "method" : "__e_503", - "owner" : "ln", - "name" : "e", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(I)V" - }, { - "method" : "__x_504", - "owner" : "ln", - "name" : "x", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(II)V" - }, { - "method" : "__a_505", - "owner" : "ln", - "name" : "a", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(II)V" - }, { - "method" : "__j_506", - "owner" : "ln", - "name" : "j", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], - "descriptor" : "(IIII)V" - }, { - "method" : "__t_507", - "owner" : "ln", - "name" : "t", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], - "descriptor" : "(IIII)V" - }, { - "method" : "__h_508", - "owner" : "ln", - "name" : "h", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(III)V" - }, { - "method" : "__c_509", - "owner" : "ln", - "name" : "c", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], - "descriptor" : "(IIIII)V" - }, { - "method" : "__v_510", - "owner" : "ln", - "name" : "v", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(III)V" - }, { - "method" : "__aj_511", - "owner" : "ln", - "name" : "aj", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], - "descriptor" : "(IIIII)V" - }, { - "method" : "__ac_512", - "owner" : "ln", - "name" : "ac", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7" ], - "descriptor" : "(IIIIII[I[I)V" - }, { - "method" : "__ay_513", - "owner" : "ln", - "name" : "ay", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7", "arg8", "arg9" ], - "descriptor" : "(IIIIIIII[I[I)V" - }, { - "method" : "__ah_514", - "owner" : "ln", - "name" : "ah", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7" ], - "descriptor" : "(IIIIIIDI)V" - }, { - "method" : "__ak_515", - "owner" : "ln", - "name" : "ak", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], - "descriptor" : "(IIII)V" - }, { - "method" : "__aw_516", - "owner" : "ln", - "name" : "aw", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], - "descriptor" : "(IIIIII)V" - }, { - "method" : "__al_517", - "owner" : "ln", - "name" : "al", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], - "descriptor" : "(IIII)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "()V" - }, { - "access" : 1, - "descriptor" : "(II)V" - }, { - "access" : 1, - "descriptor" : "([III)V" - } ] -}, { - "class" : "PlatformInfo", - "name" : "lb", - "super" : "gw", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__ah", - "owner" : "lb", - "name" : "ah", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "__at", - "owner" : "lb", - "name" : "at", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "__ab", - "owner" : "lb", - "name" : "ab", - "access" : 0, - "descriptor" : "I", - "decoder" : -1667177301 - }, { - "field" : "__ad", - "owner" : "lb", - "name" : "ad", - "access" : 0, - "descriptor" : "I", - "decoder" : -1765017 - }, { - "field" : "__ae", - "owner" : "lb", - "name" : "ae", - "access" : 0, - "descriptor" : "I", - "decoder" : 385109109 - }, { - "field" : "__af", - "owner" : "lb", - "name" : "af", - "access" : 0, - "descriptor" : "I", - "decoder" : 1955966365 - }, { - "field" : "__ai", - "owner" : "lb", - "name" : "ai", - "access" : 0, - "descriptor" : "I", - "decoder" : 1196598207 - }, { - "field" : "__ak", - "owner" : "lb", - "name" : "ak", - "access" : 0, - "descriptor" : "I", - "decoder" : 703904161 - }, { - "field" : "__al", - "owner" : "lb", - "name" : "al", - "access" : 0, - "descriptor" : "I", - "decoder" : 2097018521 - }, { - "field" : "__am", - "owner" : "lb", - "name" : "am", - "access" : 0, - "descriptor" : "I", - "decoder" : 30207059 - }, { - "field" : "__an", - "owner" : "lb", - "name" : "an", - "access" : 0, - "descriptor" : "I", - "decoder" : 890109053 - }, { - "field" : "__ap", - "owner" : "lb", - "name" : "ap", - "access" : 0, - "descriptor" : "I", - "decoder" : -817941105 - }, { - "field" : "__aw", - "owner" : "lb", - "name" : "aw", - "access" : 0, - "descriptor" : "I", - "decoder" : 467004305 - }, { - "field" : "__ax", - "owner" : "lb", - "name" : "ax", - "access" : 0, - "descriptor" : "I", - "decoder" : 871094255 - }, { - "field" : "__ay", - "owner" : "lb", - "name" : "ay", - "access" : 0, - "descriptor" : "I", - "decoder" : 1318366785 - }, { - "field" : "__ba", - "owner" : "lb", - "name" : "ba", - "access" : 0, - "descriptor" : "I", - "decoder" : -170839105 - }, { - "field" : "__bn", - "owner" : "lb", - "name" : "bn", - "access" : 0, - "descriptor" : "I", - "decoder" : 1466207635 - }, { - "field" : "__bq", - "owner" : "lb", - "name" : "bq", - "access" : 0, - "descriptor" : "[I" - }, { - "field" : "__aa", - "owner" : "lb", - "name" : "aa", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__ao", - "owner" : "lb", - "name" : "ao", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__au", - "owner" : "lb", - "name" : "au", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__az", - "owner" : "lb", - "name" : "az", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__bb", - "owner" : "lb", - "name" : "bb", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__bk", - "owner" : "lb", - "name" : "bk", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__bs", - "owner" : "lb", - "name" : "bs", - "access" : 0, - "descriptor" : "Ljava/lang/String;" - } ], - "methods" : [ { - "method" : "size", - "owner" : "lb", - "name" : "f", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "write", - "owner" : "lb", - "name" : "m", - "access" : 1, - "parameters" : [ "buffer" ], - "descriptor" : "(Lgr;I)V" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(IZIIIIIZIIIILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIIILjava/lang/String;Ljava/lang/String;[IILjava/lang/String;)V" - } ] -}, { - "class" : "WorldMap", - "name" : "lz", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "cacheLoader", - "owner" : "lz", - "name" : "h", - "access" : 0, - "descriptor" : "Lls;" - }, { - "field" : "currentMapArea0", - "owner" : "lz", - "name" : "s", - "access" : 0, - "descriptor" : "Lag;" - }, { - "field" : "elementsDisabled", - "owner" : "lz", - "name" : "ai", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "enabledCategories", - "owner" : "lz", - "name" : "aa", - "access" : 0, - "descriptor" : "Ljava/util/HashSet;" - }, { - "field" : "enabledElements", - "owner" : "lz", - "name" : "ao", - "access" : 0, - "descriptor" : "Ljava/util/HashSet;" - }, { - "field" : "flashingElements", - "owner" : "lz", - "name" : "ak", - "access" : 0, - "descriptor" : "Ljava/util/HashSet;" - }, { - "field" : "font", - "owner" : "lz", - "name" : "n", - "access" : 0, - "descriptor" : "Lkk;" - }, { - "field" : "fonts", - "owner" : "lz", - "name" : "i", - "access" : 0, - "descriptor" : "Ljava/util/HashMap;" - }, { - "field" : "iconIterator", - "owner" : "lz", - "name" : "bn", - "access" : 0, - "descriptor" : "Ljava/util/Iterator;" - }, { - "field" : "mainMapArea", - "owner" : "lz", - "name" : "j", - "access" : 0, - "descriptor" : "Lag;" - }, { - "field" : "mapAreas", - "owner" : "lz", - "name" : "z", - "access" : 0, - "descriptor" : "Ljava/util/HashMap;" - }, { - "field" : "mapSceneSprites", - "owner" : "lz", - "name" : "a", - "access" : 0, - "descriptor" : "[Llq;" - }, { - "field" : "mouseCoord", - "owner" : "lz", - "name" : "bd", - "access" : 0, - "descriptor" : "Lhu;" - }, { - "field" : "perpetualFlash0", - "owner" : "lz", - "name" : "ah", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "sprite", - "owner" : "lz", - "name" : "bo", - "access" : 0, - "descriptor" : "Lln;" - }, { - "field" : "worldMapManager", - "owner" : "lz", - "name" : "y", - "access" : 0, - "descriptor" : "Lal;" - }, { - "field" : "zoom", - "owner" : "lz", - "name" : "v", - "access" : 0, - "descriptor" : "F" - }, { - "field" : "zoomTarget", - "owner" : "lz", - "name" : "ag", - "access" : 0, - "descriptor" : "F" - }, { - "field" : "__t", - "owner" : "lz", - "name" : "t", - "access" : 0, - "descriptor" : "Lag;" - }, { - "field" : "__an", - "owner" : "lz", - "name" : "an", - "access" : 0, - "descriptor" : "Z" - }, { - "field" : "__ab", - "owner" : "lz", - "name" : "ab", - "access" : 0, - "descriptor" : "I", - "decoder" : -1979665983 - }, { - "field" : "__ac", - "owner" : "lz", - "name" : "ac", - "access" : 0, - "descriptor" : "I", - "decoder" : -1653084915 - }, { - "field" : "__ad", - "owner" : "lz", - "name" : "ad", - "access" : 0, - "descriptor" : "I", - "decoder" : -988933407 - }, { - "field" : "__ae", - "owner" : "lz", - "name" : "ae", - "access" : 0, - "descriptor" : "I", - "decoder" : 547126547 - }, { - "field" : "__aj", - "owner" : "lz", - "name" : "aj", - "access" : 0, - "descriptor" : "I", - "decoder" : -1140942239 - }, { - "field" : "__al", - "owner" : "lz", - "name" : "al", - "access" : 0, - "descriptor" : "I", - "decoder" : 2064651113 - }, { - "field" : "__am", - "owner" : "lz", - "name" : "am", - "access" : 0, - "descriptor" : "I", - "decoder" : -869889187 - }, { - "field" : "__aq", - "owner" : "lz", - "name" : "aq", - "access" : 0, - "descriptor" : "I", - "decoder" : -1469654441 - }, { - "field" : "__ar", - "owner" : "lz", - "name" : "ar", - "access" : 0, - "descriptor" : "I", - "decoder" : -298919797 - }, { - "field" : "__as", - "owner" : "lz", - "name" : "as", - "access" : 0, - "descriptor" : "I", - "decoder" : -969094439 - }, { - "field" : "__at", - "owner" : "lz", - "name" : "at", - "access" : 0, - "descriptor" : "I", - "decoder" : -815748997 - }, { - "field" : "__av", - "owner" : "lz", - "name" : "av", - "access" : 0, - "descriptor" : "I", - "decoder" : -1301477687 - }, { - "field" : "__aw", - "owner" : "lz", - "name" : "aw", - "access" : 0, - "descriptor" : "I", - "decoder" : -1683910031 - }, { - "field" : "__ay", - "owner" : "lz", - "name" : "ay", - "access" : 0, - "descriptor" : "I", - "decoder" : 1664740569 - }, { - "field" : "__b", - "owner" : "lz", - "name" : "b", - "access" : 0, - "descriptor" : "I", - "decoder" : 1711576969 - }, { - "field" : "__ba", - "owner" : "lz", - "name" : "ba", - "access" : 0, - "descriptor" : "I", - "decoder" : -237734529 - }, { - "field" : "__bm", - "owner" : "lz", - "name" : "bm", - "access" : 0, - "descriptor" : "I", - "decoder" : -1774424249 - }, { - "field" : "__bu", - "owner" : "lz", - "name" : "bu", - "access" : 0, - "descriptor" : "I", - "decoder" : 2064728623 - }, { - "field" : "__bx", - "owner" : "lz", - "name" : "bx", - "access" : 0, - "descriptor" : "I", - "decoder" : 2031417343 - }, { - "field" : "__by", - "owner" : "lz", - "name" : "by", - "access" : 0, - "descriptor" : "I", - "decoder" : 754899959 - }, { - "field" : "__c", - "owner" : "lz", - "name" : "c", - "access" : 0, - "descriptor" : "I", - "decoder" : 1318118645 - }, { - "field" : "__p", - "owner" : "lz", - "name" : "p", - "access" : 0, - "descriptor" : "I", - "decoder" : -56022357 - }, { - "field" : "__r", - "owner" : "lz", - "name" : "r", - "access" : 0, - "descriptor" : "I", - "decoder" : -89657613 - }, { - "field" : "__e", - "owner" : "lz", - "name" : "e", - "access" : 0, - "descriptor" : "Lir;" - }, { - "field" : "__g", - "owner" : "lz", - "name" : "g", - "access" : 0, - "descriptor" : "Lir;" - }, { - "field" : "__l", - "owner" : "lz", - "name" : "l", - "access" : 0, - "descriptor" : "Lir;" - }, { - "field" : "__af", - "owner" : "lz", - "name" : "af", - "access" : 0, - "descriptor" : "Ljava/util/HashSet;" - }, { - "field" : "__ax", - "owner" : "lz", - "name" : "ax", - "access" : 0, - "descriptor" : "Ljava/util/HashSet;" - }, { - "field" : "__bk", - "owner" : "lz", - "name" : "bk", - "access" : 0, - "descriptor" : "Ljava/util/HashSet;" - }, { - "field" : "__bq", - "owner" : "lz", - "name" : "bq", - "access" : 0, - "descriptor" : "Ljava/util/List;" - }, { - "field" : "__ap", - "owner" : "lz", - "name" : "ap", - "access" : 0, - "descriptor" : "J", - "decoder" : -4747643242047040283 - }, { - "field" : "__bs", - "owner" : "lz", - "name" : "bs", - "access" : 16, - "descriptor" : "[I" - }, { - "field" : "__bc", - "owner" : "lz", - "name" : "bc", - "access" : 1, - "descriptor" : "Z" - } ], - "methods" : [ { - "method" : "currentMapAreaId", - "owner" : "lz", - "name" : "j", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "disableCategory", - "owner" : "lz", - "name" : "bb", - "access" : 1, - "descriptor" : "(IZI)V" - }, { - "method" : "disableElement", - "owner" : "lz", - "name" : "ba", - "access" : 1, - "descriptor" : "(IZI)V" - }, { - "method" : "draw", - "owner" : "lz", - "name" : "c", - "access" : 1, - "parameters" : [ "x", "y", "width", "height", "cycle" ], - "descriptor" : "(IIIIII)V" - }, { - "method" : "drawLoading", - "owner" : "lz", - "name" : "aj", - "access" : 0, - "descriptor" : "(IIIIIB)V" - }, { - "method" : "drawOverview", - "owner" : "lz", - "name" : "ag", - "access" : 1, - "parameters" : [ "x", "y", "width", "height" ], - "descriptor" : "(IIIIB)V" - }, { - "method" : "flashCategory", - "owner" : "lz", - "name" : "ax", - "access" : 1, - "descriptor" : "(IB)V" - }, { - "method" : "flashElement", - "owner" : "lz", - "name" : "aa", - "access" : 1, - "descriptor" : "(II)V" - }, { - "method" : "getCurrentMapArea", - "owner" : "lz", - "name" : "s", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Lag;" - }, { - "method" : "getElementsEnabled", - "owner" : "lz", - "name" : "bs", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)Z" - }, { - "method" : "getMapArea", - "owner" : "lz", - "name" : "ah", - "access" : 1, - "parameters" : [ "id" ], - "descriptor" : "(II)Lag;" - }, { - "method" : "getZoomLevel", - "owner" : "lz", - "name" : "ar", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)I" - }, { - "method" : "iconNext", - "owner" : "lz", - "name" : "by", - "access" : 1, - "descriptor" : "(B)Lak;" - }, { - "method" : "iconStart", - "owner" : "lz", - "name" : "bx", - "access" : 1, - "descriptor" : "(I)Lak;" - }, { - "method" : "init", - "owner" : "lz", - "name" : "m", - "access" : 1, - "descriptor" : "(Lir;Lir;Lir;Lkk;Ljava/util/HashMap;[Llq;I)V" - }, { - "method" : "initializeWorldMapManager", - "owner" : "lz", - "name" : "y", - "access" : 0, - "parameters" : [ "mapArea" ], - "descriptor" : "(Lag;I)V" - }, { - "method" : "isCacheLoaded", - "owner" : "lz", - "name" : "ay", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(S)Z" - }, { - "method" : "isCategoryDisabled", - "owner" : "lz", - "name" : "bn", - "access" : 1, - "descriptor" : "(II)Z" - }, { - "method" : "isElementDisabled", - "owner" : "lz", - "name" : "bq", - "access" : 1, - "descriptor" : "(IB)Z" - }, { - "method" : "jump", - "owner" : "lz", - "name" : "b", - "access" : 0, - "parameters" : [ "plane", "x", "y" ], - "descriptor" : "(IIII)V" - }, { - "method" : "loadCache", - "owner" : "lz", - "name" : "ac", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "mapAreaAtCoord", - "owner" : "lz", - "name" : "d", - "access" : 1, - "parameters" : [ "plane", "x", "y" ], - "descriptor" : "(IIII)Lag;" - }, { - "method" : "menuAction", - "owner" : "lz", - "name" : "bo", - "access" : 1, - "parameters" : [ "a", "b", "c", "d" ], - "descriptor" : "(IILhu;Lhu;B)V" - }, { - "method" : "onCycle", - "owner" : "lz", - "name" : "q", - "access" : 1, - "parameters" : [ "a", "b", "c", "d", "e", "f", "g" ], - "descriptor" : "(IIZIIIIB)V" - }, { - "method" : "perpetualFlash", - "owner" : "lz", - "name" : "ao", - "access" : 1, - "descriptor" : "(ZI)V" - }, { - "method" : "setCurrentMapArea", - "owner" : "lz", - "name" : "t", - "access" : 0, - "parameters" : [ "mapArea" ], - "descriptor" : "(Lag;B)V" - }, { - "method" : "setCurrentMapAreaId", - "owner" : "lz", - "name" : "z", - "access" : 1, - "parameters" : [ "id" ], - "descriptor" : "(II)V" - }, { - "method" : "setElementsEnabled", - "owner" : "lz", - "name" : "ai", - "access" : 1, - "descriptor" : "(ZI)V" - }, { - "method" : "setZoomLevel", - "owner" : "lz", - "name" : "aq", - "access" : 1, - "parameters" : [ "zoom" ], - "descriptor" : "(II)V" - }, { - "method" : "smoothZoom", - "owner" : "lz", - "name" : "u", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "stopCurrentFlashes", - "owner" : "lz", - "name" : "af", - "access" : 1, - "descriptor" : "(I)V" - }, { - "method" : "__f_518", - "owner" : "lz", - "name" : "f", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__w_519", - "owner" : "lz", - "name" : "w", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], - "descriptor" : "(IIZZS)V" - }, { - "method" : "__o_520", - "owner" : "lz", - "name" : "o", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], - "descriptor" : "(IIZJ)V" - }, { - "method" : "__g_521", - "owner" : "lz", - "name" : "g", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__l_522", - "owner" : "lz", - "name" : "l", - "access" : 16, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(IIZI)V" - }, { - "method" : "__e_523", - "owner" : "lz", - "name" : "e", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "__x_524", - "owner" : "lz", - "name" : "x", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "__a_525", - "owner" : "lz", - "name" : "a", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], - "descriptor" : "(IIIZI)V" - }, { - "method" : "__h_526", - "owner" : "lz", - "name" : "h", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], - "descriptor" : "(Lag;Lhu;Lhu;ZI)V" - }, { - "method" : "__p_527", - "owner" : "lz", - "name" : "p", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], - "descriptor" : "(IIIIIII)Z" - }, { - "method" : "__v_528", - "owner" : "lz", - "name" : "v", - "access" : 0, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], - "descriptor" : "(IIIIIII)V" - }, { - "method" : "__av_529", - "owner" : "lz", - "name" : "av", - "access" : 0, - "parameters" : [ "arg0" ], - "descriptor" : "(IB)F" - }, { - "method" : "__ak_530", - "owner" : "lz", - "name" : "ak", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(III)V" - }, { - "method" : "__aw_531", - "owner" : "lz", - "name" : "aw", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(III)V" - }, { - "method" : "__al_532", - "owner" : "lz", - "name" : "al", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(IIIB)V" - }, { - "method" : "__ab_533", - "owner" : "lz", - "name" : "ab", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2" ], - "descriptor" : "(IIII)V" - }, { - "method" : "__ae_534", - "owner" : "lz", - "name" : "ae", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__at_535", - "owner" : "lz", - "name" : "at", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__ad_536", - "owner" : "lz", - "name" : "ad", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)Lhu;" - }, { - "method" : "__ap_537", - "owner" : "lz", - "name" : "ap", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__as_538", - "owner" : "lz", - "name" : "as", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)I" - }, { - "method" : "__am_539", - "owner" : "lz", - "name" : "am", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(II)V" - }, { - "method" : "__an_540", - "owner" : "lz", - "name" : "an", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__az_541", - "owner" : "lz", - "name" : "az", - "access" : 1, - "parameters" : [ "arg0" ], - "descriptor" : "(II)V" - }, { - "method" : "__au_542", - "owner" : "lz", - "name" : "au", - "access" : 1, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__bk_543", - "owner" : "lz", - "name" : "bk", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__bd_544", - "owner" : "lz", - "name" : "bd", - "access" : 1, - "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], - "descriptor" : "(IIIIIIB)V" - }, { - "method" : "__bc_545", - "owner" : "lz", - "name" : "bc", - "access" : 1, - "parameters" : [ "arg0", "arg1" ], - "descriptor" : "(ILhu;I)Lhu;" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -}, { - "class" : "LoginType", - "name" : "lx", - "super" : "java.lang.Object", - "access" : 33, - "interfaces" : [ ], - "fields" : [ { - "field" : "__d", - "owner" : "lx", - "name" : "d", - "access" : 16, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__x", - "owner" : "lx", - "name" : "x", - "access" : 17, - "descriptor" : "I", - "decoder" : -1916729379 - } ], - "methods" : [ { - "method" : "__toString_546", - "owner" : "lx", - "name" : "toString", - "access" : 1, - "parameters" : [ ], - "descriptor" : "()Ljava/lang/String;" - } ], - "constructors" : [ { - "access" : 0, - "descriptor" : "(IILjava/lang/String;Ljava/lang/String;)V" - }, { - "access" : 0, - "descriptor" : "(IILjava/lang/String;Ljava/lang/String;Z[Llx;)V" - } ] -}, { - "class" : "Client", - "name" : "client", - "super" : "ba", - "access" : 49, - "interfaces" : [ "ky" ], - "fields" : [ { - "field" : "AbstractFont_alpha", - "owner" : "kt", - "name" : "s", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "AbstractFont_color", - "owner" : "kt", - "name" : "j", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "AbstractFont_justificationCurrent", - "owner" : "kt", - "name" : "y", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "AbstractFont_justificationTotal", - "owner" : "kt", - "name" : "t", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "AbstractFont_lines", - "owner" : "kt", - "name" : "b", - "access" : 8, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "AbstractFont_modIconSprites", - "owner" : "kt", - "name" : "x", - "access" : 9, - "descriptor" : "[Llq;" - }, { - "field" : "AbstractFont_previousColor", - "owner" : "kt", - "name" : "z", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "AbstractFont_previousShadow", - "owner" : "kt", - "name" : "i", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "AbstractFont_random", - "owner" : "kt", - "name" : "h", - "access" : 8, - "descriptor" : "Ljava/util/Random;" - }, { - "field" : "AbstractFont_shadow", - "owner" : "kt", - "name" : "a", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "AbstractFont_strike", - "owner" : "kt", - "name" : "k", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "AbstractFont_underline", - "owner" : "kt", - "name" : "n", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "AttackOption_alwaysRightClick", - "owner" : "cj", - "name" : "f", - "access" : 24, - "descriptor" : "Lcj;" - }, { - "field" : "AttackOption_dependsOnCombatLevels", - "owner" : "cj", - "name" : "m", - "access" : 24, - "descriptor" : "Lcj;" - }, { - "field" : "AttackOption_hidden", - "owner" : "cj", - "name" : "w", - "access" : 24, - "descriptor" : "Lcj;" - }, { - "field" : "AttackOption_leftClickWhereAvailable", - "owner" : "cj", - "name" : "q", - "access" : 24, - "descriptor" : "Lcj;" - }, { - "field" : "ByteArrayPool_large", - "owner" : "gi", - "name" : "u", - "access" : 8, - "descriptor" : "[[B" - }, { - "field" : "ByteArrayPool_largeCount", - "owner" : "gi", - "name" : "q", - "access" : 8, - "descriptor" : "I", - "decoder" : -971800905 - }, { - "field" : "ByteArrayPool_medium", - "owner" : "gi", - "name" : "o", - "access" : 8, - "descriptor" : "[[B" - }, { - "field" : "ByteArrayPool_mediumCount", - "owner" : "gi", - "name" : "f", - "access" : 8, - "descriptor" : "I", - "decoder" : 2121641763 - }, { - "field" : "ByteArrayPool_small", - "owner" : "gi", - "name" : "w", - "access" : 8, - "descriptor" : "[[B" - }, { - "field" : "ByteArrayPool_smallCount", - "owner" : "gi", - "name" : "m", - "access" : 8, - "descriptor" : "I", - "decoder" : -791125441 - }, { - "field" : "Bzip2Decompressor_state", - "owner" : "gk", - "name" : "l", - "access" : 8, - "descriptor" : "Lgt;" - }, { - "field" : "EnumDefinition_cached", - "owner" : "jw", - "name" : "f", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "EnumDefinition_indexCache", - "owner" : "jw", - "name" : "m", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "FontName_bold12", - "owner" : "kx", - "name" : "q", - "access" : 25, - "descriptor" : "Lkx;" - }, { - "field" : "FontName_plain11", - "owner" : "kx", - "name" : "m", - "access" : 25, - "descriptor" : "Lkx;" - }, { - "field" : "FontName_plain12", - "owner" : "kx", - "name" : "f", - "access" : 25, - "descriptor" : "Lkx;" - }, { - "field" : "FontName_verdana11", - "owner" : "kx", - "name" : "w", - "access" : 25, - "descriptor" : "Lkx;" - }, { - "field" : "FontName_verdana13", - "owner" : "kx", - "name" : "o", - "access" : 25, - "descriptor" : "Lkx;" - }, { - "field" : "FontName_verdana15", - "owner" : "kx", - "name" : "u", - "access" : 25, - "descriptor" : "Lkx;" - }, { - "field" : "Formatting_colorEndTag", - "owner" : "cy", - "name" : "l", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Formatting_comma", - "owner" : "cy", - "name" : "f", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Formatting_lineBreakTag", - "owner" : "cy", - "name" : "g", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Formatting_pipe", - "owner" : "cy", - "name" : "q", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Formatting_rightArrow", - "owner" : "cy", - "name" : "u", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Formatting_rightParenthesis", - "owner" : "cy", - "name" : "o", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Formatting_spaceLeftParenthesis", - "owner" : "cy", - "name" : "w", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Formatting_true", - "owner" : "cy", - "name" : "m", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "HealthBarDefinition_cached", - "owner" : "ii", - "name" : "q", - "access" : 9, - "descriptor" : "Ler;" - }, { - "field" : "HealthBarDefinition_cachedSprites", - "owner" : "ii", - "name" : "w", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "HitSplatDefinition_cached", - "owner" : "jm", - "name" : "w", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "HitSplatDefinition_cachedFonts", - "owner" : "jm", - "name" : "u", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "IndexCache_crc", - "owner" : "it", - "name" : "aj", - "access" : 8, - "descriptor" : "Ljava/util/zip/CRC32;" - }, { - "field" : "IndexStoreActionHandler_lock", - "owner" : "iv", - "name" : "w", - "access" : 8, - "descriptor" : "Ljava/lang/Object;" - }, { - "field" : "IndexStoreActionHandler_requestQueue", - "owner" : "iv", - "name" : "m", - "access" : 8, - "descriptor" : "Lje;" - }, { - "field" : "IndexStoreActionHandler_responseQueue", - "owner" : "iv", - "name" : "f", - "access" : 8, - "descriptor" : "Lje;" - }, { - "field" : "IndexStoreActionHandler_thread", - "owner" : "en", - "name" : "o", - "access" : 8, - "descriptor" : "Ljava/lang/Thread;" - }, { - "field" : "IndexStore_buffer", - "owner" : "ff", - "name" : "m", - "access" : 8, - "descriptor" : "[B" - }, { - "field" : "Instrument_delays", - "owner" : "db", - "name" : "c", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "Instrument_noise", - "owner" : "db", - "name" : "t", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "Instrument_phases", - "owner" : "db", - "name" : "b", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "Instrument_pitchBaseSteps", - "owner" : "db", - "name" : "v", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "Instrument_pitchSteps", - "owner" : "db", - "name" : "p", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "Instrument_samples", - "owner" : "db", - "name" : "s", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "Instrument_sine", - "owner" : "db", - "name" : "y", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "Instrument_volumeSteps", - "owner" : "db", - "name" : "r", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "Interpreter_arrayLengths", - "owner" : "bv", - "name" : "o", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "Interpreter_arrays", - "owner" : "bv", - "name" : "u", - "access" : 8, - "descriptor" : "[[I" - }, { - "field" : "Interpreter_calendar", - "owner" : "bv", - "name" : "a", - "access" : 8, - "descriptor" : "Ljava/util/Calendar;" - }, { - "field" : "Interpreter_frameDepth", - "owner" : "bv", - "name" : "d", - "access" : 8, - "descriptor" : "I", - "decoder" : 545127349 - }, { - "field" : "Interpreter_frames", - "owner" : "bv", - "name" : "k", - "access" : 8, - "descriptor" : "[Lbn;" - }, { - "field" : "Interpreter_intLocals", - "owner" : "kp", - "name" : "q", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "Interpreter_intStack", - "owner" : "bv", - "name" : "g", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "Interpreter_intStackSize", - "owner" : "fe", - "name" : "l", - "access" : 8, - "descriptor" : "I", - "decoder" : -1237576843 - }, { - "field" : "Interpreter_stringLocals", - "owner" : "bv", - "name" : "w", - "access" : 8, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "Interpreter_stringStack", - "owner" : "bv", - "name" : "e", - "access" : 8, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "Interpreter_stringStackSize", - "owner" : "bv", - "name" : "x", - "access" : 8, - "descriptor" : "I", - "decoder" : -114766123 - }, { - "field" : "ItemDefinition_cached", - "owner" : "jv", - "name" : "x", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "ItemDefinition_cachedModels", - "owner" : "jv", - "name" : "d", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "ItemDefinition_indexCache", - "owner" : "jv", - "name" : "u", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "ItemDefinition_modelIndexCache", - "owner" : "jv", - "name" : "g", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "KeyHandler_idleCycles", - "owner" : "an", - "name" : "ci", - "access" : 73, - "descriptor" : "I", - "decoder" : -474146073 - }, { - "field" : "KeyHandler_instance", - "owner" : "an", - "name" : "m", - "access" : 9, - "descriptor" : "Lan;" - }, { - "field" : "KeyHandler_keyCodes", - "owner" : "an", - "name" : "cd", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "KeyHandler_pressedKeys", - "owner" : "an", - "name" : "cb", - "access" : 9, - "descriptor" : "[Z" - }, { - "field" : "KitDefinition_cached", - "owner" : "im", - "name" : "w", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "KitDefinition_indexCache", - "owner" : "im", - "name" : "m", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "Login_isUsernameRemembered", - "owner" : "client", - "name" : "ew", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "Login_loadingPercent", - "owner" : "cu", - "name" : "b", - "access" : 8, - "descriptor" : "I", - "decoder" : -1514610183 - }, { - "field" : "Login_loadingText", - "owner" : "cu", - "name" : "c", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Login_password", - "owner" : "cu", - "name" : "ap", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Login_response0", - "owner" : "cu", - "name" : "al", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Login_response1", - "owner" : "cu", - "name" : "ab", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Login_response2", - "owner" : "cu", - "name" : "ae", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Login_response3", - "owner" : "cu", - "name" : "at", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Login_username", - "owner" : "cu", - "name" : "ad", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Messages_channels", - "owner" : "cw", - "name" : "m", - "access" : 24, - "descriptor" : "Ljava/util/Map;" - }, { - "field" : "Messages_count", - "owner" : "cw", - "name" : "w", - "access" : 8, - "descriptor" : "I", - "decoder" : -1168497831 - }, { - "field" : "Messages_hashTable", - "owner" : "cw", - "name" : "f", - "access" : 24, - "descriptor" : "Llh;" - }, { - "field" : "Messages_queue", - "owner" : "cw", - "name" : "q", - "access" : 24, - "descriptor" : "Ljc;" - }, { - "field" : "ModelData_cosine", - "owner" : "dw", - "name" : "at", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "ModelData_sine", - "owner" : "dw", - "name" : "ae", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "Model_cosine", - "owner" : "du", - "name" : "bl", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "Model_sharedSequenceModel", - "owner" : "du", - "name" : "m", - "access" : 8, - "descriptor" : "Ldu;" - }, { - "field" : "Model_sharedSequenceModelFaceAlphas", - "owner" : "du", - "name" : "f", - "access" : 8, - "descriptor" : "[B" - }, { - "field" : "Model_sharedSpotAnimationModel", - "owner" : "du", - "name" : "q", - "access" : 8, - "descriptor" : "Ldu;" - }, { - "field" : "Model_sharedSpotAnimationModelFaceAlphas", - "owner" : "du", - "name" : "w", - "access" : 8, - "descriptor" : "[B" - }, { - "field" : "Model_sine", - "owner" : "du", - "name" : "bm", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "Model_transformTempX", - "owner" : "du", - "name" : "bd", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Model_transformTempY", - "owner" : "du", - "name" : "bc", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Model_transformTempZ", - "owner" : "du", - "name" : "bo", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "MouseHandler_currentButton", - "owner" : "bb", - "name" : "d", - "access" : 9, - "descriptor" : "I", - "decoder" : -2044247305 - }, { - "field" : "MouseHandler_currentButton0", - "owner" : "bb", - "name" : "u", - "access" : 73, - "descriptor" : "I", - "decoder" : 642308075 - }, { - "field" : "MouseHandler_idleCycles", - "owner" : "bb", - "name" : "o", - "access" : 73, - "descriptor" : "I", - "decoder" : -1080652669 - }, { - "field" : "MouseHandler_instance", - "owner" : "bb", - "name" : "w", - "access" : 9, - "descriptor" : "Lbb;" - }, { - "field" : "MouseHandler_lastButton", - "owner" : "bb", - "name" : "s", - "access" : 9, - "descriptor" : "I", - "decoder" : 2126310249 - }, { - "field" : "MouseHandler_lastButton0", - "owner" : "bb", - "name" : "i", - "access" : 73, - "descriptor" : "I", - "decoder" : 590718769 - }, { - "field" : "MouseHandler_lastPressedTimeMillis", - "owner" : "bb", - "name" : "h", - "access" : 9, - "descriptor" : "J", - "decoder" : 3806612340723844439 - }, { - "field" : "MouseHandler_lastPressedTimeMillis0", - "owner" : "bb", - "name" : "j", - "access" : 73, - "descriptor" : "J", - "decoder" : 3555003757894628243 - }, { - "field" : "MouseHandler_lastPressedX", - "owner" : "bb", - "name" : "t", - "access" : 9, - "descriptor" : "I", - "decoder" : -1853704165 - }, { - "field" : "MouseHandler_lastPressedX0", - "owner" : "bb", - "name" : "a", - "access" : 73, - "descriptor" : "I", - "decoder" : -813801905 - }, { - "field" : "MouseHandler_lastPressedY", - "owner" : "bb", - "name" : "y", - "access" : 9, - "descriptor" : "I", - "decoder" : 1876967757 - }, { - "field" : "MouseHandler_lastPressedY0", - "owner" : "bb", - "name" : "z", - "access" : 73, - "descriptor" : "I", - "decoder" : 14138669 - }, { - "field" : "MouseHandler_millis", - "owner" : "bb", - "name" : "n", - "access" : 9, - "descriptor" : "J", - "decoder" : -7587574528523107151 - }, { - "field" : "MouseHandler_millis0", - "owner" : "bb", - "name" : "e", - "access" : 73, - "descriptor" : "J", - "decoder" : -5429651987476437823 - }, { - "field" : "MouseHandler_x", - "owner" : "bb", - "name" : "k", - "access" : 9, - "descriptor" : "I", - "decoder" : -649043937 - }, { - "field" : "MouseHandler_x0", - "owner" : "bb", - "name" : "g", - "access" : 73, - "descriptor" : "I", - "decoder" : 1048471439 - }, { - "field" : "MouseHandler_y", - "owner" : "bb", - "name" : "x", - "access" : 9, - "descriptor" : "I", - "decoder" : 1291011547 - }, { - "field" : "MouseHandler_y0", - "owner" : "bb", - "name" : "l", - "access" : 73, - "descriptor" : "I", - "decoder" : 2000222973 - }, { - "field" : "NetCache_crc", - "owner" : "iq", - "name" : "t", - "access" : 9, - "descriptor" : "Ljava/util/zip/CRC32;" - }, { - "field" : "NetCache_crcMismatches", - "owner" : "iq", - "name" : "c", - "access" : 9, - "descriptor" : "I", - "decoder" : -1404585009 - }, { - "field" : "NetCache_currentResponse", - "owner" : "ed", - "name" : "i", - "access" : 9, - "descriptor" : "Liz;" - }, { - "field" : "NetCache_indexCaches", - "owner" : "iq", - "name" : "h", - "access" : 9, - "descriptor" : "[Lit;" - }, { - "field" : "NetCache_ioExceptions", - "owner" : "iq", - "name" : "r", - "access" : 9, - "descriptor" : "I", - "decoder" : -1141619871 - }, { - "field" : "NetCache_pendingPriorityResponses", - "owner" : "iq", - "name" : "u", - "access" : 9, - "descriptor" : "Lld;" - }, { - "field" : "NetCache_pendingPriorityResponsesCount", - "owner" : "iq", - "name" : "g", - "access" : 9, - "descriptor" : "I", - "decoder" : 516430597 - }, { - "field" : "NetCache_pendingPriorityWrites", - "owner" : "iq", - "name" : "w", - "access" : 9, - "descriptor" : "Lld;" - }, { - "field" : "NetCache_pendingPriorityWritesCount", - "owner" : "iq", - "name" : "o", - "access" : 9, - "descriptor" : "I", - "decoder" : 1495729287 - }, { - "field" : "NetCache_pendingResponses", - "owner" : "iq", - "name" : "d", - "access" : 9, - "descriptor" : "Lld;" - }, { - "field" : "NetCache_pendingResponsesCount", - "owner" : "iq", - "name" : "k", - "access" : 9, - "descriptor" : "I", - "decoder" : -1627751389 - }, { - "field" : "NetCache_pendingWrites", - "owner" : "iq", - "name" : "e", - "access" : 9, - "descriptor" : "Lld;" - }, { - "field" : "NetCache_pendingWritesCount", - "owner" : "iq", - "name" : "x", - "access" : 9, - "descriptor" : "I", - "decoder" : -1592359229 - }, { - "field" : "NetCache_pendingWritesQueue", - "owner" : "iq", - "name" : "l", - "access" : 9, - "descriptor" : "Ljp;" - }, { - "field" : "NetCache_reference", - "owner" : "cq", - "name" : "y", - "access" : 9, - "descriptor" : "Lgr;" - }, { - "field" : "NetCache_responseArchiveBuffer", - "owner" : "c", - "name" : "z", - "access" : 9, - "descriptor" : "Lgr;" - }, { - "field" : "NetCache_responseHeaderBuffer", - "owner" : "iq", - "name" : "a", - "access" : 9, - "descriptor" : "Lgr;" - }, { - "field" : "NetCache_socket", - "owner" : "iq", - "name" : "m", - "access" : 9, - "descriptor" : "Lfu;" - }, { - "field" : "NpcDefinition_cached", - "owner" : "jz", - "name" : "q", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "NpcDefinition_cachedModels", - "owner" : "jz", - "name" : "w", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "NpcDefinition_indexCache", - "owner" : "jz", - "name" : "m", - "access" : 8, - "descriptor" : "Lir;" - }, { - "field" : "NpcDefinition_modelIndexCache", - "owner" : "jz", - "name" : "f", - "access" : 8, - "descriptor" : "Lir;" - }, { - "field" : "ObjectDefinition_cached", - "owner" : "jr", - "name" : "w", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "ObjectDefinition_cachedModels", - "owner" : "jr", - "name" : "g", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "ObjectDefinition_indexCache", - "owner" : "jr", - "name" : "f", - "access" : 8, - "descriptor" : "Lir;" - }, { - "field" : "ObjectDefinition_isLowDetail", - "owner" : "jr", - "name" : "m", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "PacketBuffer_masks", - "owner" : "hx", - "name" : "x", - "access" : 24, - "descriptor" : "[I" - }, { - "field" : "ParamKeyDefinition_cached", - "owner" : "jb", - "name" : "f", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "PcmPlayer_sampleRate", - "owner" : "kl", - "name" : "o", - "access" : 9, - "descriptor" : "I", - "decoder" : 147524751 - }, { - "field" : "PlayerAppearance_cachedModels", - "owner" : "hi", - "name" : "k", - "access" : 9, - "descriptor" : "Ler;" - }, { - "field" : "PlayerType_hardcoreIronman", - "owner" : "ij", - "name" : "u", - "access" : 24, - "descriptor" : "Lij;" - }, { - "field" : "PlayerType_ironman", - "owner" : "ij", - "name" : "w", - "access" : 24, - "descriptor" : "Lij;" - }, { - "field" : "PlayerType_jagexModerator", - "owner" : "ij", - "name" : "q", - "access" : 24, - "descriptor" : "Lij;" - }, { - "field" : "PlayerType_normal", - "owner" : "ij", - "name" : "m", - "access" : 24, - "descriptor" : "Lij;" - }, { - "field" : "PlayerType_playerModerator", - "owner" : "ij", - "name" : "f", - "access" : 24, - "descriptor" : "Lij;" - }, { - "field" : "PlayerType_ultimateIronman", - "owner" : "ij", - "name" : "o", - "access" : 24, - "descriptor" : "Lij;" - }, { - "field" : "Players_count", - "owner" : "cq", - "name" : "u", - "access" : 8, - "descriptor" : "I", - "decoder" : -766468303 - }, { - "field" : "Players_indices", - "owner" : "cq", - "name" : "g", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "Players_orientations", - "owner" : "cq", - "name" : "d", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "Players_regions", - "owner" : "cq", - "name" : "x", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "Players_targetIndices", - "owner" : "cq", - "name" : "k", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "Rasterizer2D_height", - "owner" : "lf", - "name" : "av", - "access" : 9, - "descriptor" : "I" - }, { - "field" : "Rasterizer2D_pixels", - "owner" : "lf", - "name" : "aq", - "access" : 9, - "descriptor" : "[I" - }, { - "field" : "Rasterizer2D_width", - "owner" : "lf", - "name" : "aj", - "access" : 9, - "descriptor" : "I" - }, { - "field" : "Rasterizer2D_xClipEnd", - "owner" : "lf", - "name" : "ah", - "access" : 9, - "descriptor" : "I" - }, { - "field" : "Rasterizer2D_xClipStart", - "owner" : "lf", - "name" : "ay", - "access" : 9, - "descriptor" : "I" - }, { - "field" : "Rasterizer2D_yClipEnd", - "owner" : "lf", - "name" : "ac", - "access" : 9, - "descriptor" : "I" - }, { - "field" : "Rasterizer2D_yClipStart", - "owner" : "lf", - "name" : "ar", - "access" : 9, - "descriptor" : "I" - }, { - "field" : "Rasterizer3D_alpha", - "owner" : "et", - "name" : "o", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Rasterizer3D_clipHeight", - "owner" : "et", - "name" : "z", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Rasterizer3D_clipMidX", - "owner" : "et", - "name" : "n", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Rasterizer3D_clipMidX2", - "owner" : "et", - "name" : "s", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Rasterizer3D_clipMidY", - "owner" : "et", - "name" : "i", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Rasterizer3D_clipMidY2", - "owner" : "et", - "name" : "y", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Rasterizer3D_clipNegativeMidX", - "owner" : "et", - "name" : "j", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Rasterizer3D_clipNegativeMidY", - "owner" : "et", - "name" : "t", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Rasterizer3D_clipWidth", - "owner" : "et", - "name" : "a", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Rasterizer3D_colorPalette", - "owner" : "et", - "name" : "b", - "access" : 9, - "descriptor" : "[I" - }, { - "field" : "Rasterizer3D_cosine", - "owner" : "et", - "name" : "ag", - "access" : 9, - "descriptor" : "[I" - }, { - "field" : "Rasterizer3D_isLowDetailTexture", - "owner" : "et", - "name" : "q", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "Rasterizer3D_rowOffsets", - "owner" : "et", - "name" : "h", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "Rasterizer3D_sine", - "owner" : "et", - "name" : "v", - "access" : 9, - "descriptor" : "[I" - }, { - "field" : "Rasterizer3D_textureLoader", - "owner" : "et", - "name" : "c", - "access" : 9, - "descriptor" : "Lei;" - }, { - "field" : "Rasterizer3D_zoom", - "owner" : "et", - "name" : "k", - "access" : 9, - "descriptor" : "I" - }, { - "field" : "Scene_cameraPitchCosine", - "owner" : "em", - "name" : "aq", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_cameraPitchSine", - "owner" : "em", - "name" : "ag", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_cameraX", - "owner" : "em", - "name" : "r", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_cameraXTile", - "owner" : "em", - "name" : "b", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_cameraXTileMax", - "owner" : "em", - "name" : "t", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_cameraXTileMin", - "owner" : "em", - "name" : "s", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_cameraY", - "owner" : "em", - "name" : "p", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_cameraYTile", - "owner" : "em", - "name" : "c", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_cameraYTileMax", - "owner" : "em", - "name" : "h", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_cameraYTileMin", - "owner" : "em", - "name" : "y", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_cameraYawCosine", - "owner" : "em", - "name" : "av", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_cameraYawSine", - "owner" : "em", - "name" : "aj", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_cameraZ", - "owner" : "em", - "name" : "v", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_currentOccluders", - "owner" : "em", - "name" : "an", - "access" : 8, - "descriptor" : "[Lee;" - }, { - "field" : "Scene_currentOccludersCount", - "owner" : "em", - "name" : "am", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_drawnCount", - "owner" : "em", - "name" : "j", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_isLowDetail", - "owner" : "em", - "name" : "m", - "access" : 9, - "descriptor" : "Z" - }, { - "field" : "Scene_plane", - "owner" : "em", - "name" : "z", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_planeOccluderCounts", - "owner" : "em", - "name" : "ap", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "Scene_planeOccluders", - "owner" : "em", - "name" : "as", - "access" : 8, - "descriptor" : "[[Lee;" - }, { - "field" : "Scene_selectedPlane", - "owner" : "em", - "name" : "ay", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_selectedScreenX", - "owner" : "em", - "name" : "ah", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_selectedScreenY", - "owner" : "em", - "name" : "ak", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_selectedX", - "owner" : "em", - "name" : "aw", - "access" : 9, - "descriptor" : "I" - }, { - "field" : "Scene_selectedY", - "owner" : "em", - "name" : "al", - "access" : 9, - "descriptor" : "I" - }, { - "field" : "Scene_tilesDeque", - "owner" : "em", - "name" : "az", - "access" : 8, - "descriptor" : "Lje;" - }, { - "field" : "Scene_viewportXCenter", - "owner" : "em", - "name" : "bx", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_viewportXMax", - "owner" : "em", - "name" : "bl", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_viewportXMin", - "owner" : "em", - "name" : "bu", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_viewportYCenter", - "owner" : "em", - "name" : "by", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_viewportYMax", - "owner" : "em", - "name" : "br", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Scene_viewportYMin", - "owner" : "em", - "name" : "bm", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "Script_cached", - "owner" : "cg", - "name" : "m", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "SequenceDefinition_cached", - "owner" : "jh", - "name" : "w", - "access" : 9, - "descriptor" : "Ler;" - }, { - "field" : "SequenceDefinition_indexCache", - "owner" : "jh", - "name" : "m", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "Skills_enabled", - "owner" : "hc", - "name" : "f", - "access" : 25, - "descriptor" : "[Z" - }, { - "field" : "Skills_experienceTable", - "owner" : "hc", - "name" : "q", - "access" : 9, - "descriptor" : "[I" - }, { - "field" : "SpotAnimationDefinition_cached", - "owner" : "io", - "name" : "q", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "SpotAnimationDefinition_cachedModels", - "owner" : "io", - "name" : "w", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "SpotAnimationDefinition_indexCache", - "owner" : "io", - "name" : "m", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "SpotAnimationDefinition_modelIndexCache", - "owner" : "io", - "name" : "f", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "Sprite_cached", - "owner" : "jv", - "name" : "k", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "Strings_almostEverywhere", - "owner" : "id", - "name" : "hw", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_andTheProtectItemPrayerWontWork", - "owner" : "id", - "name" : "hj", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_attack", - "owner" : "id", - "name" : "fq", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_cancel", - "owner" : "id", - "name" : "iz", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_checkingForUpdates", - "owner" : "id", - "name" : "s", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_chooseOption", - "owner" : "id", - "name" : "fw", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_close", - "owner" : "id", - "name" : "fd", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_connectingToServer", - "owner" : "id", - "name" : "if", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_connectingToUpdateServer", - "owner" : "id", - "name" : "j", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_connectionLost", - "owner" : "id", - "name" : "n", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_continue", - "owner" : "id", - "name" : "g", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_drop", - "owner" : "id", - "name" : "q", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_examine", - "owner" : "id", - "name" : "ep", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_existingUser", - "owner" : "id", - "name" : "is", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_fromYourFriendListFirst", - "owner" : "id", - "name" : "fe", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_fromYourIgnoreListFirst", - "owner" : "id", - "name" : "fy", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_hasLoggedIn", - "owner" : "id", - "name" : "ea", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_hasLoggedOut", - "owner" : "id", - "name" : "es", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_hidden", - "owner" : "id", - "name" : "w", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_isAlreadyOnYourFriendList", - "owner" : "id", - "name" : "fo", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_level", - "owner" : "id", - "name" : "fl", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_loadedConfig", - "owner" : "id", - "name" : "v", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_loadedFonts", - "owner" : "id", - "name" : "b", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_loadedInputHandler", - "owner" : "id", - "name" : "ar", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_loadedInterfaces", - "owner" : "id", - "name" : "ak", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_loadedSprites", - "owner" : "id", - "name" : "aq", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_loadedTextures", - "owner" : "id", - "name" : "av", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_loadedTitleScreen", - "owner" : "id", - "name" : "r", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_loadedUpdateList", - "owner" : "id", - "name" : "t", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_loadedWordpack", - "owner" : "id", - "name" : "ay", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_loadedWorldMap", - "owner" : "id", - "name" : "al", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_loading", - "owner" : "id", - "name" : "kq", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_loadingConfig", - "owner" : "id", - "name" : "p", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_loadingFonts", - "owner" : "id", - "name" : "h", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_loadingInterfaces", - "owner" : "id", - "name" : "ah", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_loadingPleaseWait", - "owner" : "id", - "name" : "k", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_loadingSprites", - "owner" : "id", - "name" : "ag", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_loadingTextures", - "owner" : "id", - "name" : "aj", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_loadingTitleScreen", - "owner" : "id", - "name" : "c", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_loadingWordpack", - "owner" : "id", - "name" : "ac", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_loadingWorldMap", - "owner" : "id", - "name" : "aw", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_login", - "owner" : "id", - "name" : "ie", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_membersObject", - "owner" : "id", - "name" : "m", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_moreOptions", - "owner" : "id", - "name" : "fg", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_newUser", - "owner" : "id", - "name" : "iy", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_notWorkOnThisWorld", - "owner" : "id", - "name" : "hu", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_null", - "owner" : "id", - "name" : "e", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_ok", - "owner" : "id", - "name" : "o", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_password", - "owner" : "id", - "name" : "in", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_pin", - "owner" : "id", - "name" : "il", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_playersCanAttackEachOther", - "owner" : "id", - "name" : "he", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_playersCanAttackEachOtherAlmostEverywhere", - "owner" : "id", - "name" : "ht", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_pleaseEnterYourPassword", - "owner" : "id", - "name" : "dh", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_pleaseEnterYourUsername", - "owner" : "id", - "name" : "dw", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_pleaseRemoveFriend", - "owner" : "id", - "name" : "fi", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_pleaseRemoveIgnore", - "owner" : "id", - "name" : "fr", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_pleaseWait", - "owner" : "id", - "name" : "fp", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_pleaseWaitAttemptingToReestablish", - "owner" : "id", - "name" : "i", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_preparedSoundEngine", - "owner" : "id", - "name" : "y", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_preparedVisibilityMap", - "owner" : "id", - "name" : "z", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_select", - "owner" : "id", - "name" : "u", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_skill", - "owner" : "id", - "name" : "fj", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_space", - "owner" : "id", - "name" : "fh", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_startingGameEngine", - "owner" : "id", - "name" : "a", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_take", - "owner" : "id", - "name" : "f", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_theProtectItemPrayerWill", - "owner" : "id", - "name" : "hv", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_thisIsABetaWorld", - "owner" : "id", - "name" : "ho", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_thisIsAHighRiskPvpWorld", - "owner" : "id", - "name" : "hi", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_thisIsAHighRiskWorld", - "owner" : "id", - "name" : "hp", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_thisIsAPvpWorld", - "owner" : "id", - "name" : "hq", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_unableToFind", - "owner" : "id", - "name" : "eg", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_use", - "owner" : "id", - "name" : "ez", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_walkHere", - "owner" : "id", - "name" : "fc", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_warning", - "owner" : "id", - "name" : "hl", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_welcomeToRuneScape", - "owner" : "id", - "name" : "ij", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_yourFriendListIsFull", - "owner" : "id", - "name" : "fu", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_yourIgnoreListIsFull", - "owner" : "id", - "name" : "ft", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Strings_yourNormalAccountWillNotBeAffected", - "owner" : "id", - "name" : "hz", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "Texture_animatedPixels", - "owner" : "dh", - "name" : "a", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "Tiles_heights", - "owner" : "bq", - "name" : "m", - "access" : 8, - "descriptor" : "[[[I" - }, { - "field" : "Tiles_minPlane", - "owner" : "bq", - "name" : "q", - "access" : 8, - "descriptor" : "I", - "decoder" : -1454618167 - }, { - "field" : "Tiles_renderFlags", - "owner" : "bq", - "name" : "f", - "access" : 8, - "descriptor" : "[[[B" - }, { - "field" : "TriBool_false", - "owner" : "kd", - "name" : "q", - "access" : 25, - "descriptor" : "Lkd;" - }, { - "field" : "TriBool_true", - "owner" : "kd", - "name" : "f", - "access" : 25, - "descriptor" : "Lkd;" - }, { - "field" : "TriBool_unknown", - "owner" : "kd", - "name" : "m", - "access" : 25, - "descriptor" : "Lkd;" - }, { - "field" : "UnderlayDefinition_cached", - "owner" : "ih", - "name" : "f", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "UnderlayDefinition_indexCache", - "owner" : "ih", - "name" : "m", - "access" : 8, - "descriptor" : "Lir;" - }, { - "field" : "VarbitDefinition_cached", - "owner" : "ia", - "name" : "f", - "access" : 9, - "descriptor" : "Ler;" - }, { - "field" : "VarbitDefinition_indexCache", - "owner" : "ia", - "name" : "m", - "access" : 8, - "descriptor" : "Lir;" - }, { - "field" : "VarpDefinition_cached", - "owner" : "ix", - "name" : "q", - "access" : 9, - "descriptor" : "Ler;" - }, { - "field" : "Varps_main", - "owner" : "hv", - "name" : "q", - "access" : 9, - "descriptor" : "[I" - }, { - "field" : "Varps_masks", - "owner" : "hv", - "name" : "m", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "Varps_temp", - "owner" : "hv", - "name" : "f", - "access" : 9, - "descriptor" : "[I" - }, { - "field" : "ViewportMouse_entityCount", - "owner" : "dm", - "name" : "i", - "access" : 9, - "descriptor" : "I", - "decoder" : -2140977119 - }, { - "field" : "ViewportMouse_entityTags", - "owner" : "dm", - "name" : "a", - "access" : 9, - "descriptor" : "[J" - }, { - "field" : "ViewportMouse_false0", - "owner" : "dm", - "name" : "w", - "access" : 9, - "descriptor" : "Z" - }, { - "field" : "ViewportMouse_isInViewport", - "owner" : "dm", - "name" : "m", - "access" : 9, - "descriptor" : "Z" - }, { - "field" : "ViewportMouse_x", - "owner" : "dm", - "name" : "f", - "access" : 9, - "descriptor" : "I", - "decoder" : 1891197573 - }, { - "field" : "ViewportMouse_y", - "owner" : "dm", - "name" : "q", - "access" : 9, - "descriptor" : "I", - "decoder" : 1535565231 - }, { - "field" : "Widget_cachedFonts", - "owner" : "ho", - "name" : "a", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "Widget_cachedModels", - "owner" : "ho", - "name" : "i", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "Widget_indexCache", - "owner" : "ho", - "name" : "e", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "WorldMapCacheName_area", - "owner" : "aw", - "name" : "w", - "access" : 24, - "descriptor" : "Law;" - }, { - "field" : "WorldMapCacheName_compositeMap", - "owner" : "aw", - "name" : "f", - "access" : 25, - "descriptor" : "Law;" - }, { - "field" : "WorldMapCacheName_compositeTexture", - "owner" : "aw", - "name" : "q", - "access" : 25, - "descriptor" : "Law;" - }, { - "field" : "WorldMapCacheName_details", - "owner" : "aw", - "name" : "m", - "access" : 25, - "descriptor" : "Law;" - }, { - "field" : "WorldMapCacheName_labels", - "owner" : "aw", - "name" : "o", - "access" : 25, - "descriptor" : "Law;" - }, { - "field" : "WorldMapElement_cached", - "owner" : "ho", - "name" : "f", - "access" : 9, - "descriptor" : "[Lic;" - }, { - "field" : "WorldMapElement_cachedSprites", - "owner" : "ic", - "name" : "w", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "WorldMapElement_count", - "owner" : "ev", - "name" : "q", - "access" : 9, - "descriptor" : "I", - "decoder" : -112939189 - }, { - "field" : "WorldMapLabelSize_large", - "owner" : "s", - "name" : "q", - "access" : 25, - "descriptor" : "Ls;" - }, { - "field" : "WorldMapLabelSize_medium", - "owner" : "s", - "name" : "f", - "access" : 25, - "descriptor" : "Ls;" - }, { - "field" : "WorldMapLabelSize_small", - "owner" : "s", - "name" : "m", - "access" : 25, - "descriptor" : "Ls;" - }, { - "field" : "applet", - "owner" : "fx", - "name" : "m", - "access" : 9, - "descriptor" : "Ljava/applet/Applet;" - }, { - "field" : "base37Table", - "owner" : "ku", - "name" : "m", - "access" : 25, - "descriptor" : "[C" - }, { - "field" : "baseX", - "owner" : "af", - "name" : "ff", - "access" : 8, - "descriptor" : "I", - "decoder" : -790717597 - }, { - "field" : "baseY", - "owner" : "bw", - "name" : "fr", - "access" : 8, - "descriptor" : "I", - "decoder" : -438288575 - }, { - "field" : "cacheDirectoryLocations", - "owner" : "ah", - "name" : "j", - "access" : 9, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "cameraPitch", - "owner" : "t", - "name" : "hq", - "access" : 8, - "descriptor" : "I", - "decoder" : 490189491 - }, { - "field" : "cameraX", - "owner" : "as", - "name" : "ha", - "access" : 8, - "descriptor" : "I", - "decoder" : 1052834531 - }, { - "field" : "cameraY", - "owner" : "g", - "name" : "hs", - "access" : 8, - "descriptor" : "I", - "decoder" : 1326137897 - }, { - "field" : "cameraYaw", - "owner" : "ha", - "name" : "he", - "access" : 8, - "descriptor" : "I", - "decoder" : 2069364655 - }, { - "field" : "cameraZ", - "owner" : "k", - "name" : "hl", - "access" : 8, - "descriptor" : "I", - "decoder" : -1945589829 - }, { - "field" : "canvasHeight", - "owner" : "gd", - "name" : "p", - "access" : 9, - "descriptor" : "I", - "decoder" : -842662451 - }, { - "field" : "canvasWidth", - "owner" : "dt", - "name" : "r", - "access" : 9, - "descriptor" : "I", - "decoder" : 1784515731 - }, { - "field" : "chatEffects", - "owner" : "client", - "name" : "mg", - "access" : 8, - "descriptor" : "I", - "decoder" : 247245677 - }, { - "field" : "clDat", - "owner" : "lc", - "name" : "w", - "access" : 9, - "descriptor" : "Ljava/io/File;" - }, { - "field" : "clanChat", - "owner" : "cl", - "name" : "pg", - "access" : 8, - "descriptor" : "Lkv;" - }, { - "field" : "clickedWidget", - "owner" : "client", - "name" : "mc", - "access" : 8, - "descriptor" : "Lho;" - }, { - "field" : "clickedWidgetParent", - "owner" : "client", - "name" : "mr", - "access" : 8, - "descriptor" : "Lho;" - }, { - "field" : "client", - "owner" : "dl", - "name" : "af", - "access" : 8, - "descriptor" : "Lclient;" - }, { - "field" : "clientPreferences", - "owner" : "lw", - "name" : "su", - "access" : 8, - "descriptor" : "Lbf;" - }, { - "field" : "clientType", - "owner" : "client", - "name" : "bm", - "access" : 8, - "descriptor" : "I", - "decoder" : 1678472241 - }, { - "field" : "clock", - "owner" : "fg", - "name" : "n", - "access" : 8, - "descriptor" : "Lfa;" - }, { - "field" : "collisionMaps", - "owner" : "client", - "name" : "w", - "access" : 8, - "descriptor" : "[Lfy;" - }, { - "field" : "combatTargetPlayerIndex", - "owner" : "client", - "name" : "kx", - "access" : 8, - "descriptor" : "I", - "decoder" : -1309758309 - }, { - "field" : "cp1252AsciiExtension", - "owner" : "kr", - "name" : "m", - "access" : 25, - "descriptor" : "[C" - }, { - "field" : "crossSprites", - "owner" : "an", - "name" : "gx", - "access" : 8, - "descriptor" : "[Lln;" - }, { - "field" : "currentLevels", - "owner" : "client", - "name" : "ki", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "currentTimeMsLast", - "owner" : "ed", - "name" : "m", - "access" : 8, - "descriptor" : "J", - "decoder" : 3311945626287518857 - }, { - "field" : "currentTimeMsOffset", - "owner" : "ga", - "name" : "f", - "access" : 8, - "descriptor" : "J", - "decoder" : -6166028446082638015 - }, { - "field" : "cycle", - "owner" : "client", - "name" : "cu", - "access" : 8, - "descriptor" : "I", - "decoder" : 1909006131 - }, { - "field" : "dat2File", - "owner" : "fs", - "name" : "n", - "access" : 9, - "descriptor" : "Ldy;" - }, { - "field" : "decimator", - "owner" : "fd", - "name" : "qi", - "access" : 8, - "descriptor" : "Ldp;" - }, { - "field" : "destinationX", - "owner" : "client", - "name" : "pd", - "access" : 8, - "descriptor" : "I", - "decoder" : -362336323 - }, { - "field" : "destinationY", - "owner" : "client", - "name" : "pk", - "access" : 8, - "descriptor" : "I", - "decoder" : 1298845031 - }, { - "field" : "directBufferUnavailable", - "owner" : "gu", - "name" : "f", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "displayFps", - "owner" : "client", - "name" : "cg", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "dragInventoryWidget", - "owner" : "az", - "name" : "jf", - "access" : 8, - "descriptor" : "Lho;" - }, { - "field" : "dragItemSlotDestination", - "owner" : "client", - "name" : "jy", - "access" : 8, - "descriptor" : "I", - "decoder" : -836653679 - }, { - "field" : "dragItemSlotSource", - "owner" : "client", - "name" : "jp", - "access" : 8, - "descriptor" : "I", - "decoder" : 485534011 - }, { - "field" : "experience", - "owner" : "client", - "name" : "kb", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "followerIndex", - "owner" : "client", - "name" : "ml", - "access" : 8, - "descriptor" : "I", - "decoder" : 1602665191 - }, { - "field" : "followerOpsLowPriority", - "owner" : "client", - "name" : "lw", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "fontBold12", - "owner" : "q", - "name" : "fo", - "access" : 8, - "descriptor" : "Lkk;" - }, { - "field" : "fontNameVerdana11", - "owner" : "lz", - "name" : "x", - "access" : 24, - "descriptor" : "Lkx;" - }, { - "field" : "fontNameVerdana13", - "owner" : "lz", - "name" : "d", - "access" : 24, - "descriptor" : "Lkx;" - }, { - "field" : "fontNameVerdana15", - "owner" : "lz", - "name" : "k", - "access" : 24, - "descriptor" : "Lkx;" - }, { - "field" : "fontPlain11", - "owner" : "by", - "name" : "fv", - "access" : 8, - "descriptor" : "Lkk;" - }, { - "field" : "fontPlain12", - "owner" : "az", - "name" : "fu", - "access" : 8, - "descriptor" : "Lkk;" - }, { - "field" : "fonts", - "owner" : "ic", - "name" : "fs", - "access" : 8, - "descriptor" : "Lkz;" - }, { - "field" : "fontsMap", - "owner" : "client", - "name" : "ft", - "access" : 8, - "descriptor" : "Ljava/util/HashMap;" - }, { - "field" : "fps", - "owner" : "ba", - "name" : "k", - "access" : 12, - "descriptor" : "I", - "decoder" : 1789653893 - }, { - "field" : "friendSystem", - "owner" : "ag", - "name" : "rc", - "access" : 9, - "descriptor" : "Lbh;" - }, { - "field" : "gameBuild", - "owner" : "client", - "name" : "bq", - "access" : 8, - "descriptor" : "I", - "decoder" : 1186004739 - }, { - "field" : "gameDrawingMode", - "owner" : "client", - "name" : "oz", - "access" : 8, - "descriptor" : "I", - "decoder" : -12672775 - }, { - "field" : "gameObjects", - "owner" : "em", - "name" : "ar", - "access" : 8, - "descriptor" : "[Leh;" - }, { - "field" : "gameShell", - "owner" : "ba", - "name" : "f", - "access" : 8, - "descriptor" : "Lba;" - }, { - "field" : "gameState", - "owner" : "client", - "name" : "br", - "access" : 8, - "descriptor" : "I", - "decoder" : 244995961 - }, { - "field" : "garbageCollector", - "owner" : "ir", - "name" : "au", - "access" : 8, - "descriptor" : "Ljava/lang/management/GarbageCollectorMXBean;" - }, { - "field" : "garbageCollectorLastCheckTimeMs", - "owner" : "ba", - "name" : "aa", - "access" : 8, - "descriptor" : "J", - "decoder" : -3607118089363666005 - }, { - "field" : "garbageCollectorLastCollectionTime", - "owner" : "ba", - "name" : "ao", - "access" : 8, - "descriptor" : "J", - "decoder" : 1013162399149344707 - }, { - "field" : "grandExchangeEvents", - "owner" : "do", - "name" : "sm", - "access" : 8, - "descriptor" : "Lg;" - }, { - "field" : "grandExchangeOffers", - "owner" : "client", - "name" : "sb", - "access" : 8, - "descriptor" : "[Lx;" - }, { - "field" : "graphicsObjects", - "owner" : "client", - "name" : "kt", - "access" : 8, - "descriptor" : "Lje;" - }, { - "field" : "groundItems", - "owner" : "client", - "name" : "kz", - "access" : 8, - "descriptor" : "[[[Lje;" - }, { - "field" : "gzipDecompressor", - "owner" : "ir", - "name" : "i", - "access" : 8, - "descriptor" : "Lgo;" - }, { - "field" : "hasFocus", - "owner" : "ba", - "name" : "an", - "access" : 72, - "descriptor" : "Z" - }, { - "field" : "headIconHintSprites", - "owner" : "br", - "name" : "gi", - "access" : 8, - "descriptor" : "[Lln;" - }, { - "field" : "headIconPkSprites", - "owner" : "z", - "name" : "gt", - "access" : 8, - "descriptor" : "[Lln;" - }, { - "field" : "headIconPrayerSprites", - "owner" : "bf", - "name" : "gr", - "access" : 8, - "descriptor" : "[Lln;" - }, { - "field" : "hintArrowHeight", - "owner" : "client", - "name" : "ci", - "access" : 8, - "descriptor" : "I", - "decoder" : -627650567 - }, { - "field" : "hintArrowNpcIndex", - "owner" : "client", - "name" : "cl", - "access" : 8, - "descriptor" : "I", - "decoder" : 1485594821 - }, { - "field" : "hintArrowPlayerIndex", - "owner" : "client", - "name" : "ct", - "access" : 8, - "descriptor" : "I", - "decoder" : -1036874153 - }, { - "field" : "hintArrowSubX", - "owner" : "client", - "name" : "cd", - "access" : 8, - "descriptor" : "I", - "decoder" : 749254081 - }, { - "field" : "hintArrowSubY", - "owner" : "client", - "name" : "cx", - "access" : 8, - "descriptor" : "I", - "decoder" : 1393270633 - }, { - "field" : "hintArrowType", - "owner" : "client", - "name" : "cp", - "access" : 8, - "descriptor" : "I", - "decoder" : -871534943 - }, { - "field" : "hintArrowX", - "owner" : "client", - "name" : "cz", - "access" : 8, - "descriptor" : "I", - "decoder" : -1757834373 - }, { - "field" : "hintArrowY", - "owner" : "client", - "name" : "cc", - "access" : 8, - "descriptor" : "I", - "decoder" : -123748133 - }, { - "field" : "huffman", - "owner" : "ki", - "name" : "m", - "access" : 9, - "descriptor" : "Lgd;" - }, { - "field" : "idx255File", - "owner" : "fs", - "name" : "i", - "access" : 9, - "descriptor" : "Ldy;" - }, { - "field" : "idxCount", - "owner" : "fs", - "name" : "u", - "access" : 9, - "descriptor" : "I", - "decoder" : -2051451755 - }, { - "field" : "idxFiles", - "owner" : "ik", - "name" : "a", - "access" : 9, - "descriptor" : "[Ldy;" - }, { - "field" : "indexCache0", - "owner" : "ir", - "name" : "di", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache1", - "owner" : "ek", - "name" : "dc", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache10", - "owner" : "j", - "name" : "dv", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache11", - "owner" : "cu", - "name" : "do", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache12", - "owner" : "cy", - "name" : "dh", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache13", - "owner" : "gi", - "name" : "dz", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache14", - "owner" : "q", - "name" : "dj", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache15", - "owner" : "as", - "name" : "du", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache16", - "owner" : "c", - "name" : "eb", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache2", - "owner" : "be", - "name" : "dg", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache3", - "owner" : "t", - "name" : "db", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache4", - "owner" : "v", - "name" : "dd", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache5", - "owner" : "cn", - "name" : "dy", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache6", - "owner" : "fq", - "name" : "dk", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache7", - "owner" : "ad", - "name" : "dl", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache8", - "owner" : "p", - "name" : "dr", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCache9", - "owner" : "il", - "name" : "dw", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "indexCacheLoaderIndex", - "owner" : "client", - "name" : "sq", - "access" : 8, - "descriptor" : "I", - "decoder" : -1546210597 - }, { - "field" : "indexCacheLoaders", - "owner" : "client", - "name" : "sy", - "access" : 8, - "descriptor" : "Ljava/util/ArrayList;" - }, { - "field" : "indexStore255", - "owner" : "kz", - "name" : "sc", - "access" : 8, - "descriptor" : "Lff;" - }, { - "field" : "instanceChunkTemplates", - "owner" : "client", - "name" : "gq", - "access" : 8, - "descriptor" : "[[[I" - }, { - "field" : "isCameraLocked", - "owner" : "client", - "name" : "qz", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "isDraggingWidget", - "owner" : "client", - "name" : "ny", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "isInInstance", - "owner" : "client", - "name" : "gg", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "isItemSelected", - "owner" : "client", - "name" : "lz", - "access" : 8, - "descriptor" : "I", - "decoder" : 1630772923 - }, { - "field" : "isKilled", - "owner" : "ba", - "name" : "u", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "isLoading", - "owner" : "client", - "name" : "cj", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "isLowDetail", - "owner" : "client", - "name" : "bc", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "isMembersWorld", - "owner" : "client", - "name" : "bd", - "access" : 9, - "descriptor" : "Z" - }, { - "field" : "isMenuOpen", - "owner" : "client", - "name" : "kc", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "isResizable", - "owner" : "client", - "name" : "or", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "isSpellSelected", - "owner" : "client", - "name" : "lv", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "isStereo", - "owner" : "co", - "name" : "u", - "access" : 12, - "descriptor" : "Z" - }, { - "field" : "itemContainers", - "owner" : "bc", - "name" : "m", - "access" : 8, - "descriptor" : "Lld;" - }, { - "field" : "itemDragDuration", - "owner" : "client", - "name" : "jt", - "access" : 8, - "descriptor" : "I", - "decoder" : 1486366835 - }, { - "field" : "javaVendor", - "owner" : "fz", - "name" : "m", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "javaVersion", - "owner" : "fz", - "name" : "f", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "js5ConnectState", - "owner" : "client", - "name" : "da", - "access" : 8, - "descriptor" : "I", - "decoder" : -1431050759 - }, { - "field" : "js5Errors", - "owner" : "client", - "name" : "ek", - "access" : 8, - "descriptor" : "I", - "decoder" : 1791955261 - }, { - "field" : "js5Socket", - "owner" : "cf", - "name" : "df", - "access" : 8, - "descriptor" : "Lfu;" - }, { - "field" : "js5SocketTask", - "owner" : "hr", - "name" : "dn", - "access" : 8, - "descriptor" : "Lfm;" - }, { - "field" : "js5StartTimeMs", - "owner" : "eh", - "name" : "ds", - "access" : 8, - "descriptor" : "J", - "decoder" : -6104270600047501055 - }, { - "field" : "language", - "owner" : "client", - "name" : "bo", - "access" : 8, - "descriptor" : "I", - "decoder" : 2068355509 - }, { - "field" : "levels", - "owner" : "client", - "name" : "kr", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "loadedWidgetGroups", - "owner" : "ho", - "name" : "l", - "access" : 9, - "descriptor" : "[Z" - }, { - "field" : "localPlayer", - "owner" : "ao", - "name" : "jk", - "access" : 8, - "descriptor" : "Lbr;" - }, { - "field" : "localPlayerIndex", - "owner" : "client", - "name" : "ji", - "access" : 8, - "descriptor" : "I", - "decoder" : -1869532553 - }, { - "field" : "localPlayerName", - "owner" : "fx", - "name" : "f", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "loginState", - "owner" : "client", - "name" : "ed", - "access" : 8, - "descriptor" : "I", - "decoder" : -163579343 - }, { - "field" : "loginType", - "owner" : "an", - "name" : "bk", - "access" : 8, - "descriptor" : "Llx;" - }, { - "field" : "mapDotSprites", - "owner" : "at", - "name" : "gu", - "access" : 8, - "descriptor" : "[Lln;" - }, { - "field" : "mapIconCount", - "owner" : "client", - "name" : "pi", - "access" : 8, - "descriptor" : "I", - "decoder" : 864673321 - }, { - "field" : "mapIconXs", - "owner" : "client", - "name" : "ps", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "mapIconYs", - "owner" : "client", - "name" : "pw", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "mapIcons", - "owner" : "client", - "name" : "po", - "access" : 8, - "descriptor" : "[Lln;" - }, { - "field" : "mapMarkerSprites", - "owner" : "j", - "name" : "ga", - "access" : 8, - "descriptor" : "[Lln;" - }, { - "field" : "mapSceneSprites", - "owner" : "gq", - "name" : "gv", - "access" : 8, - "descriptor" : "[Llq;" - }, { - "field" : "menuActions", - "owner" : "client", - "name" : "ld", - "access" : 8, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "menuArguments0", - "owner" : "client", - "name" : "lk", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "menuArguments1", - "owner" : "client", - "name" : "ly", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "menuArguments2", - "owner" : "client", - "name" : "li", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "menuHeight", - "owner" : "ak", - "name" : "ka", - "access" : 8, - "descriptor" : "I", - "decoder" : -1734004743 - }, { - "field" : "menuOpcodes", - "owner" : "client", - "name" : "lh", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "menuOptionsCount", - "owner" : "client", - "name" : "ll", - "access" : 8, - "descriptor" : "I", - "decoder" : -1749538901 - }, { - "field" : "menuShiftClick", - "owner" : "client", - "name" : "lt", - "access" : 8, - "descriptor" : "[Z" - }, { - "field" : "menuTargetNames", - "owner" : "client", - "name" : "la", - "access" : 8, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "menuWidth", - "owner" : "hf", - "name" : "ko", - "access" : 8, - "descriptor" : "I", - "decoder" : 2079315667 - }, { - "field" : "menuX", - "owner" : "v", - "name" : "kw", - "access" : 8, - "descriptor" : "I", - "decoder" : -12041645 - }, { - "field" : "menuY", - "owner" : "ba", - "name" : "kl", - "access" : 8, - "descriptor" : "I", - "decoder" : 1875936371 - }, { - "field" : "midiPcmStream", - "owner" : "hf", - "name" : "w", - "access" : 9, - "descriptor" : "Lhm;" - }, { - "field" : "minimapOrientation", - "owner" : "client", - "name" : "hp", - "access" : 8, - "descriptor" : "I", - "decoder" : -1163038981 - }, { - "field" : "minimapState", - "owner" : "client", - "name" : "qm", - "access" : 8, - "descriptor" : "I", - "decoder" : -137788125 - }, { - "field" : "modIconSprites", - "owner" : "h", - "name" : "gc", - "access" : 8, - "descriptor" : "[Llq;" - }, { - "field" : "modelViewportXs", - "owner" : "du", - "name" : "ap", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "modelViewportYs", - "owner" : "du", - "name" : "as", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "mouseCrossColor", - "owner" : "client", - "name" : "jm", - "access" : 8, - "descriptor" : "I", - "decoder" : 233318639 - }, { - "field" : "mouseCrossState", - "owner" : "client", - "name" : "jw", - "access" : 8, - "descriptor" : "I", - "decoder" : -1302827103 - }, { - "field" : "mouseCrossX", - "owner" : "client", - "name" : "jb", - "access" : 8, - "descriptor" : "I", - "decoder" : 202604997 - }, { - "field" : "mouseCrossY", - "owner" : "client", - "name" : "jq", - "access" : 8, - "descriptor" : "I", - "decoder" : -1984048653 - }, { - "field" : "mouseLastLastPressedTimeMillis", - "owner" : "client", - "name" : "cb", - "access" : 8, - "descriptor" : "J", - "decoder" : -8445874050676184263 - }, { - "field" : "mouseRecorder", - "owner" : "cb", - "name" : "ck", - "access" : 8, - "descriptor" : "Lbu;" - }, { - "field" : "mouseWheel", - "owner" : "j", - "name" : "ol", - "access" : 8, - "descriptor" : "Lfv;" - }, { - "field" : "mouseWheelRotation", - "owner" : "client", - "name" : "oe", - "access" : 8, - "descriptor" : "I", - "decoder" : -1628183831 - }, { - "field" : "mousedOverWidgetIf1", - "owner" : "fa", - "name" : "lu", - "access" : 8, - "descriptor" : "Lho;" - }, { - "field" : "musicTrack", - "owner" : "i", - "name" : "k", - "access" : 9, - "descriptor" : "Lhe;" - }, { - "field" : "musicTrackArchiveId", - "owner" : "ar", - "name" : "g", - "access" : 9, - "descriptor" : "I", - "decoder" : -18917723 - }, { - "field" : "musicTrackBoolean", - "owner" : "lj", - "name" : "d", - "access" : 9, - "descriptor" : "Z" - }, { - "field" : "musicTrackFileId", - "owner" : "x", - "name" : "l", - "access" : 9, - "descriptor" : "I", - "decoder" : -812708185 - }, { - "field" : "npcAttackOption", - "owner" : "client", - "name" : "de", - "access" : 8, - "descriptor" : "Lcj;" - }, { - "field" : "npcCount", - "owner" : "client", - "name" : "ep", - "access" : 8, - "descriptor" : "I", - "decoder" : -1569269731 - }, { - "field" : "npcIndices", - "owner" : "client", - "name" : "fq", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "npcs", - "owner" : "client", - "name" : "ez", - "access" : 8, - "descriptor" : "[Lcv;" - }, { - "field" : "objectSounds", - "owner" : "be", - "name" : "m", - "access" : 8, - "descriptor" : "Lje;" - }, { - "field" : "osName", - "owner" : "ju", - "name" : "b", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "osNameLowerCase", - "owner" : "p", - "name" : "h", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "overheadText", - "owner" : "client", - "name" : "ih", - "access" : 8, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "overheadTextAscents", - "owner" : "client", - "name" : "ip", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "overheadTextColors", - "owner" : "client", - "name" : "ic", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "overheadTextCount", - "owner" : "client", - "name" : "ir", - "access" : 8, - "descriptor" : "I", - "decoder" : 616180377 - }, { - "field" : "overheadTextCyclesRemaining", - "owner" : "client", - "name" : "io", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "overheadTextEffects", - "owner" : "client", - "name" : "iw", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "overheadTextLimit", - "owner" : "client", - "name" : "iv", - "access" : 8, - "descriptor" : "I", - "decoder" : 1889277277 - }, { - "field" : "overheadTextXOffsets", - "owner" : "client", - "name" : "ib", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "overheadTextXs", - "owner" : "client", - "name" : "iq", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "overheadTextYs", - "owner" : "client", - "name" : "iu", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "packetBufferNodes", - "owner" : "gg", - "name" : "o", - "access" : 9, - "descriptor" : "[Lgg;" - }, { - "field" : "packetWriter", - "owner" : "client", - "name" : "fj", - "access" : 25, - "descriptor" : "Lcl;" - }, { - "field" : "pcmPlayer0", - "owner" : "aw", - "name" : "qu", - "access" : 8, - "descriptor" : "Lco;" - }, { - "field" : "pcmPlayer1", - "owner" : "ir", - "name" : "qb", - "access" : 8, - "descriptor" : "Lco;" - }, { - "field" : "pcmPlayerCount", - "owner" : "cu", - "name" : "e", - "access" : 8, - "descriptor" : "I", - "decoder" : -184301597 - }, { - "field" : "pcmPlayerProvider", - "owner" : "bl", - "name" : "n", - "access" : 9, - "descriptor" : "Lcz;" - }, { - "field" : "pcmStreamMixer", - "owner" : "fz", - "name" : "qr", - "access" : 8, - "descriptor" : "Lct;" - }, { - "field" : "plane", - "owner" : "dx", - "name" : "jg", - "access" : 8, - "descriptor" : "I", - "decoder" : -631434243 - }, { - "field" : "platformInfo", - "owner" : "s", - "name" : "st", - "access" : 8, - "descriptor" : "Llb;" - }, { - "field" : "platformInfoProvider", - "owner" : "client", - "name" : "sk", - "access" : 8, - "descriptor" : "Llm;" - }, { - "field" : "playerAttackOption", - "owner" : "client", - "name" : "co", - "access" : 8, - "descriptor" : "Lcj;" - }, { - "field" : "playerMenuActions", - "owner" : "client", - "name" : "kq", - "access" : 8, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "playerMenuOpcodes", - "owner" : "client", - "name" : "kp", - "access" : 24, - "descriptor" : "[I" - }, { - "field" : "players", - "owner" : "client", - "name" : "jd", - "access" : 8, - "descriptor" : "[Lbr;" - }, { - "field" : "port1", - "owner" : "q", - "name" : "ee", - "access" : 8, - "descriptor" : "I", - "decoder" : -753026759 - }, { - "field" : "port2", - "owner" : "ag", - "name" : "eq", - "access" : 8, - "descriptor" : "I", - "decoder" : -256520591 - }, { - "field" : "port3", - "owner" : "ga", - "name" : "eh", - "access" : 8, - "descriptor" : "I", - "decoder" : 994298267 - }, { - "field" : "projectiles", - "owner" : "client", - "name" : "kk", - "access" : 8, - "descriptor" : "Lje;" - }, { - "field" : "publicChatMode", - "owner" : "client", - "name" : "pt", - "access" : 8, - "descriptor" : "I", - "decoder" : -1802494233 - }, { - "field" : "randomDat", - "owner" : "fs", - "name" : "k", - "access" : 9, - "descriptor" : "Ldy;" - }, { - "field" : "rasterProvider", - "owner" : "gz", - "name" : "ad", - "access" : 9, - "descriptor" : "Llp;" - }, { - "field" : "rebootTimer", - "owner" : "client", - "name" : "cf", - "access" : 8, - "descriptor" : "I", - "decoder" : -1792536059 - }, { - "field" : "reflectionChecks", - "owner" : "le", - "name" : "m", - "access" : 9, - "descriptor" : "Lja;" - }, { - "field" : "regionLandArchiveIds", - "owner" : "bb", - "name" : "gb", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "regionLandArchives", - "owner" : "ad", - "name" : "gs", - "access" : 8, - "descriptor" : "[[B" - }, { - "field" : "regionMapArchiveIds", - "owner" : "bd", - "name" : "gw", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "regionMapArchives", - "owner" : "bg", - "name" : "gl", - "access" : 8, - "descriptor" : "[[B" - }, { - "field" : "regions", - "owner" : "kw", - "name" : "gn", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "renderSelf", - "owner" : "client", - "name" : "js", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "revision", - "owner" : "fx", - "name" : "q", - "access" : 9, - "descriptor" : "I", - "decoder" : -787495321 - }, { - "field" : "rights", - "owner" : "client", - "name" : "mw", - "access" : 8, - "descriptor" : "I", - "decoder" : 821563709 - }, { - "field" : "rootWidgetCount", - "owner" : "client", - "name" : "os", - "access" : 8, - "descriptor" : "I", - "decoder" : -546798303 - }, { - "field" : "rootWidgetGroup", - "owner" : "client", - "name" : "mm", - "access" : 8, - "descriptor" : "I", - "decoder" : -783816509 - }, { - "field" : "rootWidgetHeights", - "owner" : "client", - "name" : "ox", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "rootWidgetWidths", - "owner" : "client", - "name" : "oj", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "rootWidgetXs", - "owner" : "client", - "name" : "oy", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "rootWidgetYs", - "owner" : "client", - "name" : "oi", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "runEnergy", - "owner" : "client", - "name" : "mi", - "access" : 8, - "descriptor" : "I", - "decoder" : 933910819 - }, { - "field" : "scene", - "owner" : "bl", - "name" : "gf", - "access" : 8, - "descriptor" : "Lem;" - }, { - "field" : "sceneMinimapSprite", - "owner" : "bx", - "name" : "px", - "access" : 8, - "descriptor" : "Lln;" - }, { - "field" : "scriptEvents", - "owner" : "client", - "name" : "og", - "access" : 8, - "descriptor" : "Lje;" - }, { - "field" : "scrollBarSprites", - "owner" : "ay", - "name" : "gj", - "access" : 8, - "descriptor" : "[Llq;" - }, { - "field" : "secureRandom", - "owner" : "t", - "name" : "ec", - "access" : 8, - "descriptor" : "Ljava/security/SecureRandom;" - }, { - "field" : "secureRandomFuture", - "owner" : "client", - "name" : "eu", - "access" : 8, - "descriptor" : "Lcn;" - }, { - "field" : "selectedItemId", - "owner" : "cs", - "name" : "iz", - "access" : 8, - "descriptor" : "I", - "decoder" : -2062450631 - }, { - "field" : "selectedItemName", - "owner" : "client", - "name" : "it", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "selectedItemSlot", - "owner" : "ii", - "name" : "lx", - "access" : 8, - "descriptor" : "I", - "decoder" : 1912123225 - }, { - "field" : "selectedItemWidget", - "owner" : "ge", - "name" : "ix", - "access" : 8, - "descriptor" : "I", - "decoder" : -1645409107 - }, { - "field" : "selectedSpellActionName", - "owner" : "client", - "name" : "mk", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "selectedSpellFlags", - "owner" : "do", - "name" : "my", - "access" : 8, - "descriptor" : "I", - "decoder" : -1344682613 - }, { - "field" : "selectedSpellName", - "owner" : "client", - "name" : "mu", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "serverBuild", - "owner" : "z", - "name" : "bs", - "access" : 8, - "descriptor" : "Liy;" - }, { - "field" : "shiftClickDrop", - "owner" : "client", - "name" : "lf", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "showLoadingMessages", - "owner" : "client", - "name" : "jj", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "showMouseCross", - "owner" : "client", - "name" : "jr", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "showMouseOverText", - "owner" : "client", - "name" : "lj", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "socketTask", - "owner" : "fq", - "name" : "fl", - "access" : 8, - "descriptor" : "Lfm;" - }, { - "field" : "soundCache", - "owner" : "kc", - "name" : "n", - "access" : 9, - "descriptor" : "Ldt;" - }, { - "field" : "soundEffectCount", - "owner" : "client", - "name" : "qa", - "access" : 8, - "descriptor" : "I", - "decoder" : -1481002083 - }, { - "field" : "soundEffectIds", - "owner" : "client", - "name" : "qv", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "soundEffects", - "owner" : "client", - "name" : "qe", - "access" : 8, - "descriptor" : "[Lci;" - }, { - "field" : "soundSystem", - "owner" : "cw", - "name" : "x", - "access" : 8, - "descriptor" : "Ldx;" - }, { - "field" : "soundSystemExecutor", - "owner" : "kq", - "name" : "l", - "access" : 8, - "descriptor" : "Ljava/util/concurrent/ScheduledExecutorService;" - }, { - "field" : "spriteIds", - "owner" : "hg", - "name" : "em", - "access" : 8, - "descriptor" : "Llg;" - }, { - "field" : "studioGame", - "owner" : "c", - "name" : "bn", - "access" : 8, - "descriptor" : "Lis;" - }, { - "field" : "tapToDrop", - "owner" : "client", - "name" : "lp", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "taskHandler", - "owner" : "ba", - "name" : "m", - "access" : 12, - "descriptor" : "Lfz;" - }, { - "field" : "tempMenuAction", - "owner" : "d", - "name" : "lr", - "access" : 8, - "descriptor" : "Lcs;" - }, { - "field" : "textureProvider", - "owner" : "cn", - "name" : "jn", - "access" : 8, - "descriptor" : "Ldl;" - }, { - "field" : "tileLastDrawnActor", - "owner" : "client", - "name" : "im", - "access" : 8, - "descriptor" : "[[I" - }, { - "field" : "timer", - "owner" : "client", - "name" : "fm", - "access" : 8, - "descriptor" : "Ljo;" - }, { - "field" : "titleLoadingStage", - "owner" : "client", - "name" : "dt", - "access" : 8, - "descriptor" : "I", - "decoder" : -1520594673 - }, { - "field" : "urlRequester", - "owner" : "kd", - "name" : "fz", - "access" : 8, - "descriptor" : "Leo;" - }, { - "field" : "useBufferedSocket", - "owner" : "client", - "name" : "fx", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "userHomeDirectory", - "owner" : "as", - "name" : "c", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "varcs", - "owner" : "gy", - "name" : "of", - "access" : 8, - "descriptor" : "Lch;" - }, { - "field" : "viewportDrawCount", - "owner" : "client", - "name" : "ii", - "access" : 8, - "descriptor" : "I", - "decoder" : 289477221 - }, { - "field" : "viewportHeight", - "owner" : "client", - "name" : "rx", - "access" : 8, - "descriptor" : "I", - "decoder" : -629885193 - }, { - "field" : "viewportOffsetX", - "owner" : "client", - "name" : "rr", - "access" : 8, - "descriptor" : "I", - "decoder" : 386331251 - }, { - "field" : "viewportOffsetY", - "owner" : "client", - "name" : "rn", - "access" : 8, - "descriptor" : "I", - "decoder" : 992721193 - }, { - "field" : "viewportTempX", - "owner" : "client", - "name" : "ig", - "access" : 8, - "descriptor" : "I", - "decoder" : 424442889 - }, { - "field" : "viewportTempY", - "owner" : "client", - "name" : "ia", - "access" : 8, - "descriptor" : "I", - "decoder" : -81902865 - }, { - "field" : "viewportWidget", - "owner" : "client", - "name" : "mx", - "access" : 8, - "descriptor" : "Lho;" - }, { - "field" : "viewportWidth", - "owner" : "client", - "name" : "ry", - "access" : 8, - "descriptor" : "I", - "decoder" : 2035623995 - }, { - "field" : "viewportZoom", - "owner" : "client", - "name" : "rz", - "access" : 8, - "descriptor" : "I", - "decoder" : 541065633 - }, { - "field" : "visibilityMap", - "owner" : "em", - "name" : "bc", - "access" : 8, - "descriptor" : "[[[[Z" - }, { - "field" : "visibleTiles", - "owner" : "em", - "name" : "bo", - "access" : 8, - "descriptor" : "[[Z" - }, { - "field" : "weight", - "owner" : "client", - "name" : "mv", - "access" : 8, - "descriptor" : "I", - "decoder" : 36001423 - }, { - "field" : "widgetClickMasks", - "owner" : "client", - "name" : "on", - "access" : 8, - "descriptor" : "Lld;" - }, { - "field" : "widgetClickX", - "owner" : "client", - "name" : "mt", - "access" : 8, - "descriptor" : "I", - "decoder" : -1972775883 - }, { - "field" : "widgetClickY", - "owner" : "client", - "name" : "me", - "access" : 8, - "descriptor" : "I", - "decoder" : 1052276727 - }, { - "field" : "widgetDragDuration", - "owner" : "bu", - "name" : "no", - "access" : 8, - "descriptor" : "I", - "decoder" : 2059180753 - }, { - "field" : "widgetGroupParents", - "owner" : "client", - "name" : "mj", - "access" : 8, - "descriptor" : "Lld;" - }, { - "field" : "widgets", - "owner" : "ho", - "name" : "g", - "access" : 9, - "descriptor" : "[[Lho;" - }, { - "field" : "worldHost", - "owner" : "af", - "name" : "ei", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "worldId", - "owner" : "client", - "name" : "ba", - "access" : 9, - "descriptor" : "I", - "decoder" : 1412639841 - }, { - "field" : "worldMap0", - "owner" : "bo", - "name" : "sz", - "access" : 8, - "descriptor" : "Llz;" - }, { - "field" : "worldMapEvent", - "owner" : "z", - "name" : "j", - "access" : 8, - "descriptor" : "Lap;" - }, { - "field" : "worldProperties", - "owner" : "client", - "name" : "bb", - "access" : 8, - "descriptor" : "I", - "decoder" : 352819683 - }, { - "field" : "worlds", - "owner" : "bc", - "name" : "o", - "access" : 8, - "descriptor" : "[Lbt;" - }, { - "field" : "worldsCount", - "owner" : "bt", - "name" : "u", - "access" : 8, - "descriptor" : "I", - "decoder" : 233222155 - }, { - "field" : "worldsUrl", - "owner" : "iy", - "name" : "bx", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "xteaKeys", - "owner" : "gf", - "name" : "ge", - "access" : 8, - "descriptor" : "[[I" - }, { - "field" : "__f_m", - "owner" : "f", - "name" : "m", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "__w_qs", - "owner" : "w", - "name" : "qs", - "access" : 8, - "descriptor" : "I", - "decoder" : 1608439891 - }, { - "field" : "__o_m", - "owner" : "o", - "name" : "m", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "__u_n", - "owner" : "u", - "name" : "n", - "access" : 9, - "descriptor" : "Z" - }, { - "field" : "__g_f", - "owner" : "g", - "name" : "f", - "access" : 9, - "descriptor" : "Ljava/util/Comparator;" - }, { - "field" : "__g_o", - "owner" : "g", - "name" : "o", - "access" : 9, - "descriptor" : "Ljava/util/Comparator;" - }, { - "field" : "__g_q", - "owner" : "g", - "name" : "q", - "access" : 9, - "descriptor" : "Ljava/util/Comparator;" - }, { - "field" : "__g_w", - "owner" : "g", - "name" : "w", - "access" : 9, - "descriptor" : "Ljava/util/Comparator;" - }, { - "field" : "__g_z", - "owner" : "g", - "name" : "z", - "access" : 8, - "descriptor" : "I", - "decoder" : -1605454211 - }, { - "field" : "__x_rg", - "owner" : "x", - "name" : "rg", - "access" : 8, - "descriptor" : "I", - "decoder" : -1286287981 - }, { - "field" : "__d_gz", - "owner" : "d", - "name" : "gz", - "access" : 8, - "descriptor" : "Lln;" - }, { - "field" : "__n_n", - "owner" : "n", - "name" : "n", - "access" : 8, - "descriptor" : "Lho;" - }, { - "field" : "__i_af", - "owner" : "i", - "name" : "af", - "access" : 8, - "descriptor" : "I", - "decoder" : -1810047523 - }, { - "field" : "__i_x", - "owner" : "i", - "name" : "x", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__z_si", - "owner" : "z", - "name" : "si", - "access" : 8, - "descriptor" : "J", - "decoder" : 3423502126894795079 - }, { - "field" : "__s_fi", - "owner" : "s", - "name" : "fi", - "access" : 8, - "descriptor" : "I", - "decoder" : 1577759565 - }, { - "field" : "__s_dq", - "owner" : "s", - "name" : "dq", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "__t_i", - "owner" : "t", - "name" : "i", - "access" : 8, - "descriptor" : "Lho;" - }, { - "field" : "__y_sn", - "owner" : "y", - "name" : "sn", - "access" : 8, - "descriptor" : "I", - "decoder" : -1946112139 - }, { - "field" : "__y_p", - "owner" : "y", - "name" : "p", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__h_n", - "owner" : "h", - "name" : "n", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__h_e", - "owner" : "h", - "name" : "e", - "access" : 8, - "descriptor" : "Llq;" - }, { - "field" : "__h_f", - "owner" : "h", - "name" : "f", - "access" : 24, - "descriptor" : "Lh;" - }, { - "field" : "__h_m", - "owner" : "h", - "name" : "m", - "access" : 24, - "descriptor" : "Lh;" - }, { - "field" : "__h_q", - "owner" : "h", - "name" : "q", - "access" : 24, - "descriptor" : "Lh;" - }, { - "field" : "__h_w", - "owner" : "h", - "name" : "w", - "access" : 24, - "descriptor" : "Lh;" - }, { - "field" : "__b_by", - "owner" : "b", - "name" : "by", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__p_go", - "owner" : "p", - "name" : "go", - "access" : 8, - "descriptor" : "I", - "decoder" : -948290091 - }, { - "field" : "__aq_k", - "owner" : "aq", - "name" : "k", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "__aj_e", - "owner" : "aj", - "name" : "e", - "access" : 9, - "descriptor" : "I", - "decoder" : -1536028937 - }, { - "field" : "__av_o", - "owner" : "av", - "name" : "o", - "access" : 9, - "descriptor" : "Lec;" - }, { - "field" : "__ar_l", - "owner" : "ar", - "name" : "l", - "access" : 9, - "descriptor" : "Z" - }, { - "field" : "__ar_qw", - "owner" : "ar", - "name" : "qw", - "access" : 8, - "descriptor" : "I", - "decoder" : -1555836449 - }, { - "field" : "__ar_bd", - "owner" : "ar", - "name" : "bd", - "access" : 8, - "descriptor" : "[Lln;" - }, { - "field" : "__ay_u", - "owner" : "ay", - "name" : "u", - "access" : 8, - "descriptor" : "[[[B" - }, { - "field" : "__ah_l", - "owner" : "ah", - "name" : "l", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__ak_qj", - "owner" : "ak", - "name" : "qj", - "access" : 8, - "descriptor" : "I", - "decoder" : -1942470229 - }, { - "field" : "__ap_w", - "owner" : "ap", - "name" : "w", - "access" : 8, - "descriptor" : "[Llq;" - }, { - "field" : "__as_ey", - "owner" : "as", - "name" : "ey", - "access" : 8, - "descriptor" : "I", - "decoder" : -1516124929 - }, { - "field" : "__an_cl", - "owner" : "an", - "name" : "cl", - "access" : 9, - "descriptor" : "I", - "decoder" : -674534717 - }, { - "field" : "__an_cp", - "owner" : "an", - "name" : "cp", - "access" : 9, - "descriptor" : "[I" - }, { - "field" : "__an_cg", - "owner" : "an", - "name" : "cg", - "access" : 8, - "descriptor" : "[C" - }, { - "field" : "__an_cc", - "owner" : "an", - "name" : "cc", - "access" : 8, - "descriptor" : "I", - "decoder" : -1942898885 - }, { - "field" : "__an_ch", - "owner" : "an", - "name" : "ch", - "access" : 8, - "descriptor" : "I", - "decoder" : 1112094745 - }, { - "field" : "__an_ct", - "owner" : "an", - "name" : "ct", - "access" : 8, - "descriptor" : "I", - "decoder" : -93280591 - }, { - "field" : "__an_cw", - "owner" : "an", - "name" : "cw", - "access" : 8, - "descriptor" : "I", - "decoder" : -1208053825 - }, { - "field" : "__an_cz", - "owner" : "an", - "name" : "cz", - "access" : 8, - "descriptor" : "I", - "decoder" : 2066759739 - }, { - "field" : "__an_ra", - "owner" : "an", - "name" : "ra", - "access" : 8, - "descriptor" : "I", - "decoder" : -817957995 - }, { - "field" : "__an_cf", - "owner" : "an", - "name" : "cf", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__an_cq", - "owner" : "an", - "name" : "cq", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__an_i", - "owner" : "an", - "name" : "i", - "access" : 8, - "descriptor" : "Llq;" - }, { - "field" : "__an_x", - "owner" : "an", - "name" : "x", - "access" : 8, - "descriptor" : "[Llq;" - }, { - "field" : "__ao_s", - "owner" : "ao", - "name" : "s", - "access" : 9, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "__ao_gk", - "owner" : "ao", - "name" : "gk", - "access" : 8, - "descriptor" : "I", - "decoder" : -1131782991 - }, { - "field" : "__af_m", - "owner" : "af", - "name" : "m", - "access" : 9, - "descriptor" : "Ljava/applet/Applet;" - }, { - "field" : "__af_f", - "owner" : "af", - "name" : "f", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__ba_aw", - "owner" : "ba", - "name" : "aw", - "access" : 8, - "descriptor" : "I", - "decoder" : -1042005999 - }, { - "field" : "__ba_d", - "owner" : "ba", - "name" : "d", - "access" : 8, - "descriptor" : "I", - "decoder" : 425367827 - }, { - "field" : "__ba_e", - "owner" : "ba", - "name" : "e", - "access" : 8, - "descriptor" : "I", - "decoder" : -1698831905 - }, { - "field" : "__ba_l", - "owner" : "ba", - "name" : "l", - "access" : 8, - "descriptor" : "I", - "decoder" : -1179083285 - }, { - "field" : "__ba_q", - "owner" : "ba", - "name" : "q", - "access" : 8, - "descriptor" : "I", - "decoder" : -281664295 - }, { - "field" : "__ba_s", - "owner" : "ba", - "name" : "s", - "access" : 8, - "descriptor" : "I", - "decoder" : -2078849253 - }, { - "field" : "__ba_a", - "owner" : "ba", - "name" : "a", - "access" : 8, - "descriptor" : "[J" - }, { - "field" : "__ba_j", - "owner" : "ba", - "name" : "j", - "access" : 8, - "descriptor" : "[J" - }, { - "field" : "__bb_hz", - "owner" : "bb", - "name" : "hz", - "access" : 8, - "descriptor" : "I", - "decoder" : -215744973 - }, { - "field" : "__bs_nb", - "owner" : "bs", - "name" : "nb", - "access" : 8, - "descriptor" : "I", - "decoder" : -1247107945 - }, { - "field" : "__bq_l", - "owner" : "bq", - "name" : "l", - "access" : 8, - "descriptor" : "[[[B" - }, { - "field" : "__bq_w", - "owner" : "bq", - "name" : "w", - "access" : 8, - "descriptor" : "[[[B" - }, { - "field" : "__bq_p", - "owner" : "bq", - "name" : "p", - "access" : 8, - "descriptor" : "I", - "decoder" : -2142579405 - }, { - "field" : "__bq_v", - "owner" : "bq", - "name" : "v", - "access" : 8, - "descriptor" : "I", - "decoder" : 834543729 - }, { - "field" : "__bq_a", - "owner" : "bq", - "name" : "a", - "access" : 8, - "descriptor" : "[[[I" - }, { - "field" : "__bq_b", - "owner" : "bq", - "name" : "b", - "access" : 24, - "descriptor" : "[I" - }, { - "field" : "__bq_c", - "owner" : "bq", - "name" : "c", - "access" : 24, - "descriptor" : "[I" - }, { - "field" : "__bq_h", - "owner" : "bq", - "name" : "h", - "access" : 24, - "descriptor" : "[I" - }, { - "field" : "__bq_r", - "owner" : "bq", - "name" : "r", - "access" : 24, - "descriptor" : "[I" - }, { - "field" : "__bq_t", - "owner" : "bq", - "name" : "t", - "access" : 24, - "descriptor" : "[I" - }, { - "field" : "__bq_y", - "owner" : "bq", - "name" : "y", - "access" : 24, - "descriptor" : "[I" - }, { - "field" : "__bk_g", - "owner" : "bk", - "name" : "g", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__bd_x", - "owner" : "bd", - "name" : "x", - "access" : 9, - "descriptor" : "[[S" - }, { - "field" : "__bd_er", - "owner" : "bd", - "name" : "er", - "access" : 8, - "descriptor" : "I", - "decoder" : 636454135 - }, { - "field" : "__bd_u", - "owner" : "bd", - "name" : "u", - "access" : 8, - "descriptor" : "Llq;" - }, { - "field" : "__bc_dm", - "owner" : "bc", - "name" : "dm", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "__bo_ar", - "owner" : "bo", - "name" : "ar", - "access" : 8, - "descriptor" : "Ljava/awt/FontMetrics;" - }, { - "field" : "__bx_o", - "owner" : "bx", - "name" : "o", - "access" : 8, - "descriptor" : "I", - "decoder" : -992379173 - }, { - "field" : "__by_hb", - "owner" : "by", - "name" : "hb", - "access" : 8, - "descriptor" : "I", - "decoder" : -1218466245 - }, { - "field" : "__bu_hy", - "owner" : "bu", - "name" : "hy", - "access" : 8, - "descriptor" : "I", - "decoder" : 1075569245 - }, { - "field" : "__bm_i", - "owner" : "bm", - "name" : "i", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__client_il", - "owner" : "client", - "name" : "il", - "access" : 9, - "descriptor" : "I", - "decoder" : -1063713523 - }, { - "field" : "__client_ss", - "owner" : "client", - "name" : "ss", - "access" : 9, - "descriptor" : "I", - "decoder" : -451622431 - }, { - "field" : "__client_sj", - "owner" : "client", - "name" : "sj", - "access" : 8, - "descriptor" : "Lbj;" - }, { - "field" : "__client_ai", - "owner" : "client", - "name" : "ai", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__client_bl", - "owner" : "client", - "name" : "bl", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__client_cw", - "owner" : "client", - "name" : "cw", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__client_fh", - "owner" : "client", - "name" : "fh", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__client_hh", - "owner" : "client", - "name" : "hh", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__client_ij", - "owner" : "client", - "name" : "ij", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__client_is", - "owner" : "client", - "name" : "is", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__client_jl", - "owner" : "client", - "name" : "jl", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__client_mn", - "owner" : "client", - "name" : "mn", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__client_nn", - "owner" : "client", - "name" : "nn", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__client_nt", - "owner" : "client", - "name" : "nt", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__client_qq", - "owner" : "client", - "name" : "qq", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__client_kv", - "owner" : "client", - "name" : "kv", - "access" : 8, - "descriptor" : "[Z" - }, { - "field" : "__client_od", - "owner" : "client", - "name" : "od", - "access" : 8, - "descriptor" : "[Z" - }, { - "field" : "__client_oq", - "owner" : "client", - "name" : "oq", - "access" : 8, - "descriptor" : "[Z" - }, { - "field" : "__client_ot", - "owner" : "client", - "name" : "ot", - "access" : 8, - "descriptor" : "[Z" - }, { - "field" : "__client_rh", - "owner" : "client", - "name" : "rh", - "access" : 8, - "descriptor" : "[Z" - }, { - "field" : "__client_ev", - "owner" : "client", - "name" : "ev", - "access" : 8, - "descriptor" : "[B" - }, { - "field" : "__client_ru", - "owner" : "client", - "name" : "ru", - "access" : 8, - "descriptor" : "Lhi;" - }, { - "field" : "__client_md", - "owner" : "client", - "name" : "md", - "access" : 8, - "descriptor" : "Lho;" - }, { - "field" : "__client_mo", - "owner" : "client", - "name" : "mo", - "access" : 8, - "descriptor" : "Lho;" - }, { - "field" : "__client_cn", - "owner" : "client", - "name" : "cn", - "access" : 8, - "descriptor" : "I", - "decoder" : -1731573291 - }, { - "field" : "__client_cq", - "owner" : "client", - "name" : "cq", - "access" : 8, - "descriptor" : "I", - "decoder" : -1313705721 - }, { - "field" : "__client_dp", - "owner" : "client", - "name" : "dp", - "access" : 8, - "descriptor" : "I", - "decoder" : 1154760205 - }, { - "field" : "__client_ej", - "owner" : "client", - "name" : "ej", - "access" : 8, - "descriptor" : "I", - "decoder" : -964416527 - }, { - "field" : "__client_el", - "owner" : "client", - "name" : "el", - "access" : 8, - "descriptor" : "I", - "decoder" : 689094231 - }, { - "field" : "__client_eo", - "owner" : "client", - "name" : "eo", - "access" : 8, - "descriptor" : "I", - "decoder" : -447055355 - }, { - "field" : "__client_ex", - "owner" : "client", - "name" : "ex", - "access" : 8, - "descriptor" : "I", - "decoder" : 755300107 - }, { - "field" : "__client_fd", - "owner" : "client", - "name" : "fd", - "access" : 8, - "descriptor" : "I", - "decoder" : -1050480853 - }, { - "field" : "__client_fe", - "owner" : "client", - "name" : "fe", - "access" : 8, - "descriptor" : "I", - "decoder" : 829228151 - }, { - "field" : "__client_fk", - "owner" : "client", - "name" : "fk", - "access" : 8, - "descriptor" : "I", - "decoder" : 8470625 - }, { - "field" : "__client_fn", - "owner" : "client", - "name" : "fn", - "access" : 8, - "descriptor" : "I", - "decoder" : -597100741 - }, { - "field" : "__client_fw", - "owner" : "client", - "name" : "fw", - "access" : 8, - "descriptor" : "I", - "decoder" : 516059665 - }, { - "field" : "__client_gh", - "owner" : "client", - "name" : "gh", - "access" : 8, - "descriptor" : "I", - "decoder" : -1456975367 - }, { - "field" : "__client_gp", - "owner" : "client", - "name" : "gp", - "access" : 8, - "descriptor" : "I", - "decoder" : 685418907 - }, { - "field" : "__client_gy", - "owner" : "client", - "name" : "gy", - "access" : 8, - "descriptor" : "I", - "decoder" : -134014371 - }, { - "field" : "__client_hc", - "owner" : "client", - "name" : "hc", - "access" : 8, - "descriptor" : "I", - "decoder" : -441913785 - }, { - "field" : "__client_hd", - "owner" : "client", - "name" : "hd", - "access" : 8, - "descriptor" : "I", - "decoder" : 438998245 - }, { - "field" : "__client_hg", - "owner" : "client", - "name" : "hg", - "access" : 8, - "descriptor" : "I", - "decoder" : 1658018867 - }, { - "field" : "__client_hi", - "owner" : "client", - "name" : "hi", - "access" : 8, - "descriptor" : "I", - "decoder" : 402871301 - }, { - "field" : "__client_hj", - "owner" : "client", - "name" : "hj", - "access" : 8, - "descriptor" : "I", - "decoder" : -1420078475 - }, { - "field" : "__client_hk", - "owner" : "client", - "name" : "hk", - "access" : 8, - "descriptor" : "I", - "decoder" : -1149138989 - }, { - "field" : "__client_hn", - "owner" : "client", - "name" : "hn", - "access" : 8, - "descriptor" : "I", - "decoder" : -516933613 - }, { - "field" : "__client_ho", - "owner" : "client", - "name" : "ho", - "access" : 8, - "descriptor" : "I", - "decoder" : 1005832199 - }, { - "field" : "__client_hr", - "owner" : "client", - "name" : "hr", - "access" : 8, - "descriptor" : "I", - "decoder" : 1664350313 - }, { - "field" : "__client_ht", - "owner" : "client", - "name" : "ht", - "access" : 8, - "descriptor" : "I", - "decoder" : 1502058429 - }, { - "field" : "__client_hu", - "owner" : "client", - "name" : "hu", - "access" : 8, - "descriptor" : "I", - "decoder" : -480633777 - }, { - "field" : "__client_hv", - "owner" : "client", - "name" : "hv", - "access" : 8, - "descriptor" : "I", - "decoder" : 218086227 - }, { - "field" : "__client_hw", - "owner" : "client", - "name" : "hw", - "access" : 8, - "descriptor" : "I", - "decoder" : 410614005 - }, { - "field" : "__client_hx", - "owner" : "client", - "name" : "hx", - "access" : 8, - "descriptor" : "I", - "decoder" : -1406125895 - }, { - "field" : "__client_ie", - "owner" : "client", - "name" : "ie", - "access" : 8, - "descriptor" : "I", - "decoder" : 236939601 - }, { - "field" : "__client_if", - "owner" : "client", - "name" : "if", - "access" : 8, - "descriptor" : "I", - "decoder" : -952172003 - }, { - "field" : "__client_ik", - "owner" : "client", - "name" : "ik", - "access" : 8, - "descriptor" : "I", - "decoder" : 910983131 - }, { - "field" : "__client_in", - "owner" : "client", - "name" : "in", - "access" : 8, - "descriptor" : "I", - "decoder" : 351193663 - }, { - "field" : "__client_iy", - "owner" : "client", - "name" : "iy", - "access" : 8, - "descriptor" : "I", - "decoder" : -1213062413 - }, { - "field" : "__client_ja", - "owner" : "client", - "name" : "ja", - "access" : 8, - "descriptor" : "I", - "decoder" : 813973829 - }, { - "field" : "__client_jc", - "owner" : "client", - "name" : "jc", - "access" : 8, - "descriptor" : "I", - "decoder" : 1084498299 - }, { - "field" : "__client_je", - "owner" : "client", - "name" : "je", - "access" : 8, - "descriptor" : "I", - "decoder" : 1959822241 - }, { - "field" : "__client_jo", - "owner" : "client", - "name" : "jo", - "access" : 8, - "descriptor" : "I", - "decoder" : -836962805 - }, { - "field" : "__client_ju", - "owner" : "client", - "name" : "ju", - "access" : 8, - "descriptor" : "I", - "decoder" : 1691923909 - }, { - "field" : "__client_jz", - "owner" : "client", - "name" : "jz", - "access" : 8, - "descriptor" : "I", - "decoder" : -1267243587 - }, { - "field" : "__client_ke", - "owner" : "client", - "name" : "ke", - "access" : 8, - "descriptor" : "I", - "decoder" : -1208823721 - }, { - "field" : "__client_ku", - "owner" : "client", - "name" : "ku", - "access" : 8, - "descriptor" : "I", - "decoder" : -898263359 - }, { - "field" : "__client_ky", - "owner" : "client", - "name" : "ky", - "access" : 8, - "descriptor" : "I", - "decoder" : -64320473 - }, { - "field" : "__client_lb", - "owner" : "client", - "name" : "lb", - "access" : 8, - "descriptor" : "I", - "decoder" : 699084605 - }, { - "field" : "__client_lc", - "owner" : "client", - "name" : "lc", - "access" : 8, - "descriptor" : "I", - "decoder" : 196309625 - }, { - "field" : "__client_ln", - "owner" : "client", - "name" : "ln", - "access" : 8, - "descriptor" : "I", - "decoder" : 885052255 - }, { - "field" : "__client_lq", - "owner" : "client", - "name" : "lq", - "access" : 8, - "descriptor" : "I", - "decoder" : 26099827 - }, { - "field" : "__client_ls", - "owner" : "client", - "name" : "ls", - "access" : 8, - "descriptor" : "I", - "decoder" : -274968037 - }, { - "field" : "__client_mb", - "owner" : "client", - "name" : "mb", - "access" : 8, - "descriptor" : "I", - "decoder" : 1694810089 - }, { - "field" : "__client_mf", - "owner" : "client", - "name" : "mf", - "access" : 8, - "descriptor" : "I", - "decoder" : -1715020411 - }, { - "field" : "__client_mh", - "owner" : "client", - "name" : "mh", - "access" : 8, - "descriptor" : "I", - "decoder" : 535219347 - }, { - "field" : "__client_ms", - "owner" : "client", - "name" : "ms", - "access" : 8, - "descriptor" : "I", - "decoder" : 2128395635 - }, { - "field" : "__client_na", - "owner" : "client", - "name" : "na", - "access" : 8, - "descriptor" : "I", - "decoder" : -934082817 - }, { - "field" : "__client_nc", - "owner" : "client", - "name" : "nc", - "access" : 8, - "descriptor" : "I", - "decoder" : 344308849 - }, { - "field" : "__client_nd", - "owner" : "client", - "name" : "nd", - "access" : 8, - "descriptor" : "I", - "decoder" : 760022015 - }, { - "field" : "__client_ng", - "owner" : "client", - "name" : "ng", - "access" : 8, - "descriptor" : "I", - "decoder" : -1379876433 - }, { - "field" : "__client_nh", - "owner" : "client", - "name" : "nh", - "access" : 8, - "descriptor" : "I", - "decoder" : -278874973 - }, { - "field" : "__client_ni", - "owner" : "client", - "name" : "ni", - "access" : 8, - "descriptor" : "I", - "decoder" : 1990512261 - }, { - "field" : "__client_nk", - "owner" : "client", - "name" : "nk", - "access" : 8, - "descriptor" : "I", - "decoder" : 1019025247 - }, { - "field" : "__client_nl", - "owner" : "client", - "name" : "nl", - "access" : 8, - "descriptor" : "I", - "decoder" : 1939745821 - }, { - "field" : "__client_np", - "owner" : "client", - "name" : "np", - "access" : 8, - "descriptor" : "I", - "decoder" : 1881890525 - }, { - "field" : "__client_nq", - "owner" : "client", - "name" : "nq", - "access" : 8, - "descriptor" : "I", - "decoder" : 1467519791 - }, { - "field" : "__client_ns", - "owner" : "client", - "name" : "ns", - "access" : 8, - "descriptor" : "I", - "decoder" : 743073293 - }, { - "field" : "__client_nv", - "owner" : "client", - "name" : "nv", - "access" : 8, - "descriptor" : "I", - "decoder" : -758575207 - }, { - "field" : "__client_nw", - "owner" : "client", - "name" : "nw", - "access" : 8, - "descriptor" : "I", - "decoder" : -843739713 - }, { - "field" : "__client_nx", - "owner" : "client", - "name" : "nx", - "access" : 8, - "descriptor" : "I", - "decoder" : 1132932607 - }, { - "field" : "__client_oo", - "owner" : "client", - "name" : "oo", - "access" : 8, - "descriptor" : "I", - "decoder" : 1348053843 - }, { - "field" : "__client_pb", - "owner" : "client", - "name" : "pb", - "access" : 8, - "descriptor" : "I", - "decoder" : 1230692157 - }, { - "field" : "__client_ph", - "owner" : "client", - "name" : "ph", - "access" : 8, - "descriptor" : "I", - "decoder" : 587773171 - }, { - "field" : "__client_pl", - "owner" : "client", - "name" : "pl", - "access" : 8, - "descriptor" : "I", - "decoder" : -1362734353 - }, { - "field" : "__client_pm", - "owner" : "client", - "name" : "pm", - "access" : 8, - "descriptor" : "I", - "decoder" : -460406997 - }, { - "field" : "__client_qc", - "owner" : "client", - "name" : "qc", - "access" : 8, - "descriptor" : "I", - "decoder" : -818676431 - }, { - "field" : "__client_qf", - "owner" : "client", - "name" : "qf", - "access" : 8, - "descriptor" : "I", - "decoder" : 1365951359 - }, { - "field" : "__client_qp", - "owner" : "client", - "name" : "qp", - "access" : 8, - "descriptor" : "I", - "decoder" : -1352723865 - }, { - "field" : "__client_qy", - "owner" : "client", - "name" : "qy", - "access" : 8, - "descriptor" : "I", - "decoder" : -34294211 - }, { - "field" : "__client_sd", - "owner" : "client", - "name" : "sd", - "access" : 8, - "descriptor" : "I", - "decoder" : 944933439 - }, { - "field" : "__client_sl", - "owner" : "client", - "name" : "sl", - "access" : 8, - "descriptor" : "I", - "decoder" : -1605855913 - }, { - "field" : "__client_sx", - "owner" : "client", - "name" : "sx", - "access" : 8, - "descriptor" : "I", - "decoder" : 206275573 - }, { - "field" : "__client_fg", - "owner" : "client", - "name" : "fg", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__client_kd", - "owner" : "client", - "name" : "kd", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__client_kn", - "owner" : "client", - "name" : "kn", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__client_nf", - "owner" : "client", - "name" : "nf", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__client_nr", - "owner" : "client", - "name" : "nr", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__client_nz", - "owner" : "client", - "name" : "nz", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__client_pn", - "owner" : "client", - "name" : "pn", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__client_pq", - "owner" : "client", - "name" : "pq", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__client_pv", - "owner" : "client", - "name" : "pv", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__client_qd", - "owner" : "client", - "name" : "qd", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__client_qk", - "owner" : "client", - "name" : "qk", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__client_qn", - "owner" : "client", - "name" : "qn", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__client_rd", - "owner" : "client", - "name" : "rd", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__client_rj", - "owner" : "client", - "name" : "rj", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__client_rk", - "owner" : "client", - "name" : "rk", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__client_rl", - "owner" : "client", - "name" : "rl", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__client_th", - "owner" : "client", - "name" : "th", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__client_tp", - "owner" : "client", - "name" : "tp", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__client_pz", - "owner" : "client", - "name" : "pz", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__client_kh", - "owner" : "client", - "name" : "kh", - "access" : 8, - "descriptor" : "Lje;" - }, { - "field" : "__client_oc", - "owner" : "client", - "name" : "oc", - "access" : 8, - "descriptor" : "Lje;" - }, { - "field" : "__client_oh", - "owner" : "client", - "name" : "oh", - "access" : 8, - "descriptor" : "Lje;" - }, { - "field" : "__client_ch", - "owner" : "client", - "name" : "ch", - "access" : 8, - "descriptor" : "J", - "decoder" : -6574384275386813769 - }, { - "field" : "__client_oa", - "owner" : "client", - "name" : "oa", - "access" : 8, - "descriptor" : "J", - "decoder" : 8818983958751331899 - }, { - "field" : "__client_pp", - "owner" : "client", - "name" : "pp", - "access" : 8, - "descriptor" : "J", - "decoder" : -1704358328771670975 - }, { - "field" : "__client_pu", - "owner" : "client", - "name" : "pu", - "access" : 8, - "descriptor" : "[J" - }, { - "field" : "__client_rb", - "owner" : "client", - "name" : "rb", - "access" : 8, - "descriptor" : "S" - }, { - "field" : "__client_re", - "owner" : "client", - "name" : "re", - "access" : 8, - "descriptor" : "S" - }, { - "field" : "__client_ri", - "owner" : "client", - "name" : "ri", - "access" : 8, - "descriptor" : "S" - }, { - "field" : "__client_rm", - "owner" : "client", - "name" : "rm", - "access" : 8, - "descriptor" : "S" - }, { - "field" : "__client_rp", - "owner" : "client", - "name" : "rp", - "access" : 8, - "descriptor" : "S" - }, { - "field" : "__client_rs", - "owner" : "client", - "name" : "rs", - "access" : 8, - "descriptor" : "S" - }, { - "field" : "__client_rv", - "owner" : "client", - "name" : "rv", - "access" : 8, - "descriptor" : "S" - }, { - "field" : "__client_rw", - "owner" : "client", - "name" : "rw", - "access" : 8, - "descriptor" : "S" - }, { - "field" : "__client_gd", - "owner" : "client", - "name" : "gd", - "access" : 24, - "descriptor" : "[I" - }, { - "field" : "__bt_g", - "owner" : "bt", - "name" : "g", - "access" : 8, - "descriptor" : "I", - "decoder" : 1143875805 - }, { - "field" : "__bt_e", - "owner" : "bt", - "name" : "e", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__bt_l", - "owner" : "bt", - "name" : "l", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__bf_m", - "owner" : "bf", - "name" : "m", - "access" : 8, - "descriptor" : "I", - "decoder" : 1548448409 - }, { - "field" : "__bv_s", - "owner" : "bv", - "name" : "s", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__bv_t", - "owner" : "bv", - "name" : "t", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__bv_y", - "owner" : "bv", - "name" : "y", - "access" : 8, - "descriptor" : "I", - "decoder" : -1019558835 - }, { - "field" : "__bv_r", - "owner" : "bv", - "name" : "r", - "access" : 24, - "descriptor" : "D" - }, { - "field" : "__bv_z", - "owner" : "bv", - "name" : "z", - "access" : 24, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "__bw_d", - "owner" : "bw", - "name" : "d", - "access" : 8, - "descriptor" : "I", - "decoder" : -1807262579 - }, { - "field" : "__bw_k", - "owner" : "bw", - "name" : "k", - "access" : 8, - "descriptor" : "Llq;" - }, { - "field" : "__ce_o", - "owner" : "ce", - "name" : "o", - "access" : 24, - "descriptor" : "Ljava/math/BigInteger;" - }, { - "field" : "__ce_u", - "owner" : "ce", - "name" : "u", - "access" : 24, - "descriptor" : "Ljava/math/BigInteger;" - }, { - "field" : "__cy_d", - "owner" : "cy", - "name" : "d", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__cm_e", - "owner" : "cm", - "name" : "e", - "access" : 9, - "descriptor" : "I", - "decoder" : 533653621 - }, { - "field" : "__cm_f", - "owner" : "cm", - "name" : "f", - "access" : 24, - "descriptor" : "Ljava/math/BigInteger;" - }, { - "field" : "__cm_m", - "owner" : "cm", - "name" : "m", - "access" : 24, - "descriptor" : "Ljava/math/BigInteger;" - }, { - "field" : "__cj_ay", - "owner" : "cj", - "name" : "ay", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__cj_bo", - "owner" : "cj", - "name" : "bo", - "access" : 8, - "descriptor" : "[Llq;" - }, { - "field" : "__cj_sp", - "owner" : "cj", - "name" : "sp", - "access" : 8, - "descriptor" : "[S" - }, { - "field" : "__cu_aa", - "owner" : "cu", - "name" : "aa", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__cu_ax", - "owner" : "cu", - "name" : "ax", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__cu_ba", - "owner" : "cu", - "name" : "ba", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__cu_bk", - "owner" : "cu", - "name" : "bk", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__cu_f", - "owner" : "cu", - "name" : "f", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__cu_ac", - "owner" : "cu", - "name" : "ac", - "access" : 8, - "descriptor" : "I", - "decoder" : 1677133239 - }, { - "field" : "__cu_aj", - "owner" : "cu", - "name" : "aj", - "access" : 8, - "descriptor" : "I", - "decoder" : 1077910071 - }, { - "field" : "__cu_aw", - "owner" : "cu", - "name" : "aw", - "access" : 8, - "descriptor" : "I", - "decoder" : 1861681835 - }, { - "field" : "__cu_bb", - "owner" : "cu", - "name" : "bb", - "access" : 8, - "descriptor" : "I", - "decoder" : 1769484271 - }, { - "field" : "__cu_bj", - "owner" : "cu", - "name" : "bj", - "access" : 8, - "descriptor" : "I", - "decoder" : 1548722671 - }, { - "field" : "__cu_bl", - "owner" : "cu", - "name" : "bl", - "access" : 8, - "descriptor" : "I", - "decoder" : 1431381579 - }, { - "field" : "__cu_br", - "owner" : "cu", - "name" : "br", - "access" : 8, - "descriptor" : "I", - "decoder" : -376233039 - }, { - "field" : "__cu_q", - "owner" : "cu", - "name" : "q", - "access" : 8, - "descriptor" : "I", - "decoder" : 1606541885 - }, { - "field" : "__cu_y", - "owner" : "cu", - "name" : "y", - "access" : 8, - "descriptor" : "I", - "decoder" : 932541923 - }, { - "field" : "__cu_ai", - "owner" : "cu", - "name" : "ai", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__cu_bq", - "owner" : "cu", - "name" : "bq", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__cu_bs", - "owner" : "cu", - "name" : "bs", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__cu_g", - "owner" : "cu", - "name" : "g", - "access" : 8, - "descriptor" : "Lln;" - }, { - "field" : "__cu_bi", - "owner" : "cu", - "name" : "bi", - "access" : 8, - "descriptor" : "J", - "decoder" : 803647694904294325 - }, { - "field" : "__cu_bz", - "owner" : "cu", - "name" : "bz", - "access" : 8, - "descriptor" : "J", - "decoder" : -3234258972092460093 - }, { - "field" : "__cu_d", - "owner" : "cu", - "name" : "d", - "access" : 8, - "descriptor" : "Llq;" - }, { - "field" : "__cu_o", - "owner" : "cu", - "name" : "o", - "access" : 8, - "descriptor" : "Llq;" - }, { - "field" : "__cn_bu", - "owner" : "cn", - "name" : "bu", - "access" : 8, - "descriptor" : "Llq;" - }, { - "field" : "__cq_q", - "owner" : "cq", - "name" : "q", - "access" : 8, - "descriptor" : "[B" - }, { - "field" : "__cq_w", - "owner" : "cq", - "name" : "w", - "access" : 8, - "descriptor" : "[B" - }, { - "field" : "__cq_a", - "owner" : "cq", - "name" : "a", - "access" : 8, - "descriptor" : "Lgr;" - }, { - "field" : "__cq_o", - "owner" : "cq", - "name" : "o", - "access" : 8, - "descriptor" : "[Lgr;" - }, { - "field" : "__cq_l", - "owner" : "cq", - "name" : "l", - "access" : 8, - "descriptor" : "I", - "decoder" : 945250525 - }, { - "field" : "__cq_n", - "owner" : "cq", - "name" : "n", - "access" : 8, - "descriptor" : "I", - "decoder" : -22568397 - }, { - "field" : "__cq_e", - "owner" : "cq", - "name" : "e", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__cq_i", - "owner" : "cq", - "name" : "i", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__cd_s", - "owner" : "cd", - "name" : "s", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__cd_z", - "owner" : "cd", - "name" : "z", - "access" : 8, - "descriptor" : "[Z" - }, { - "field" : "__cd_g", - "owner" : "cd", - "name" : "g", - "access" : 8, - "descriptor" : "[B" - }, { - "field" : "__cd_ag", - "owner" : "cd", - "name" : "ag", - "access" : 8, - "descriptor" : "[F" - }, { - "field" : "__cd_aj", - "owner" : "cd", - "name" : "aj", - "access" : 8, - "descriptor" : "[F" - }, { - "field" : "__cd_aq", - "owner" : "cd", - "name" : "aq", - "access" : 8, - "descriptor" : "[F" - }, { - "field" : "__cd_c", - "owner" : "cd", - "name" : "c", - "access" : 8, - "descriptor" : "[F" - }, { - "field" : "__cd_p", - "owner" : "cd", - "name" : "p", - "access" : 8, - "descriptor" : "[F" - }, { - "field" : "__cd_r", - "owner" : "cd", - "name" : "r", - "access" : 8, - "descriptor" : "[F" - }, { - "field" : "__cd_v", - "owner" : "cd", - "name" : "v", - "access" : 8, - "descriptor" : "[F" - }, { - "field" : "__cd_d", - "owner" : "cd", - "name" : "d", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "__cd_e", - "owner" : "cd", - "name" : "e", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "__cd_l", - "owner" : "cd", - "name" : "l", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "__cd_x", - "owner" : "cd", - "name" : "x", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "__cd_ar", - "owner" : "cd", - "name" : "ar", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__cd_av", - "owner" : "cd", - "name" : "av", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__cd_j", - "owner" : "cd", - "name" : "j", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__ca_k", - "owner" : "ca", - "name" : "k", - "access" : 8, - "descriptor" : "[Z" - }, { - "field" : "__ca_d", - "owner" : "ca", - "name" : "d", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__ca_x", - "owner" : "ca", - "name" : "x", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__ca_f", - "owner" : "ca", - "name" : "f", - "access" : 24, - "descriptor" : "[F" - }, { - "field" : "__ca_m", - "owner" : "ca", - "name" : "m", - "access" : 24, - "descriptor" : "[I" - }, { - "field" : "__di_l", - "owner" : "di", - "name" : "l", - "access" : 8, - "descriptor" : "F" - }, { - "field" : "__di_u", - "owner" : "di", - "name" : "u", - "access" : 8, - "descriptor" : "[[F" - }, { - "field" : "__di_e", - "owner" : "di", - "name" : "e", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "__di_g", - "owner" : "di", - "name" : "g", - "access" : 8, - "descriptor" : "[[I" - }, { - "field" : "__dk_lm", - "owner" : "dk", - "name" : "lm", - "access" : 8, - "descriptor" : "Lho;" - }, { - "field" : "__dk_o", - "owner" : "dk", - "name" : "o", - "access" : 8, - "descriptor" : "I", - "decoder" : -1762891465 - }, { - "field" : "__dr_ao", - "owner" : "dr", - "name" : "ao", - "access" : 8, - "descriptor" : "I", - "decoder" : -704675849 - }, { - "field" : "__dw_ab", - "owner" : "dw", - "name" : "ab", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "__dw_al", - "owner" : "dw", - "name" : "al", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__dw_aw", - "owner" : "dw", - "name" : "aw", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__dv_j", - "owner" : "dv", - "name" : "j", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__dv_s", - "owner" : "dv", - "name" : "s", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__dv_t", - "owner" : "dv", - "name" : "t", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__dv_y", - "owner" : "dv", - "name" : "y", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__dv_z", - "owner" : "dv", - "name" : "z", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__dv_b", - "owner" : "dv", - "name" : "b", - "access" : 24, - "descriptor" : "[[I" - }, { - "field" : "__dv_h", - "owner" : "dv", - "name" : "h", - "access" : 24, - "descriptor" : "[[I" - }, { - "field" : "__dz_f", - "owner" : "dz", - "name" : "f", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__dz_m", - "owner" : "dz", - "name" : "m", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__dz_q", - "owner" : "dz", - "name" : "q", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__dz_w", - "owner" : "dz", - "name" : "w", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__du_bx", - "owner" : "du", - "name" : "bx", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__du_ad", - "owner" : "du", - "name" : "ad", - "access" : 8, - "descriptor" : "[Z" - }, { - "field" : "__du_at", - "owner" : "du", - "name" : "at", - "access" : 8, - "descriptor" : "[Z" - }, { - "field" : "__du_aa", - "owner" : "du", - "name" : "aa", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__du_af", - "owner" : "du", - "name" : "af", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__du_am", - "owner" : "du", - "name" : "am", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__du_an", - "owner" : "du", - "name" : "an", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__du_au", - "owner" : "du", - "name" : "au", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__du_az", - "owner" : "du", - "name" : "az", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__du_ba", - "owner" : "du", - "name" : "ba", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__du_bb", - "owner" : "du", - "name" : "bb", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__du_bj", - "owner" : "du", - "name" : "bj", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__du_bk", - "owner" : "du", - "name" : "bk", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__du_bn", - "owner" : "du", - "name" : "bn", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__du_bq", - "owner" : "du", - "name" : "bq", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__du_br", - "owner" : "du", - "name" : "br", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__du_bs", - "owner" : "du", - "name" : "bs", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__du_ai", - "owner" : "du", - "name" : "ai", - "access" : 8, - "descriptor" : "[[I" - }, { - "field" : "__du_ax", - "owner" : "du", - "name" : "ax", - "access" : 8, - "descriptor" : "[[I" - }, { - "field" : "__dm_g", - "owner" : "dm", - "name" : "g", - "access" : 8, - "descriptor" : "I", - "decoder" : 262104267 - }, { - "field" : "__dm_k", - "owner" : "dm", - "name" : "k", - "access" : 8, - "descriptor" : "I", - "decoder" : -852671813 - }, { - "field" : "__dm_l", - "owner" : "dm", - "name" : "l", - "access" : 8, - "descriptor" : "I", - "decoder" : -2071972829 - }, { - "field" : "__dm_u", - "owner" : "dm", - "name" : "u", - "access" : 8, - "descriptor" : "I", - "decoder" : 1135175963 - }, { - "field" : "__dq_pe", - "owner" : "dq", - "name" : "pe", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__dq_rq", - "owner" : "dq", - "name" : "rq", - "access" : 8, - "descriptor" : "I", - "decoder" : 1351620693 - }, { - "field" : "__et_w", - "owner" : "et", - "name" : "w", - "access" : 9, - "descriptor" : "Z" - }, { - "field" : "__et_f", - "owner" : "et", - "name" : "f", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__et_m", - "owner" : "et", - "name" : "m", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__et_p", - "owner" : "et", - "name" : "p", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__et_r", - "owner" : "et", - "name" : "r", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__eb_ah", - "owner" : "eb", - "name" : "ah", - "access" : 8, - "descriptor" : "Lla;" - }, { - "field" : "__ek_x", - "owner" : "ek", - "name" : "x", - "access" : 8, - "descriptor" : "I", - "decoder" : 2096389021 - }, { - "field" : "__em_ab", - "owner" : "em", - "name" : "ab", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__em_ac", - "owner" : "em", - "name" : "ac", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__em_a", - "owner" : "em", - "name" : "a", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "__em_ad", - "owner" : "em", - "name" : "ad", - "access" : 8, - "descriptor" : "I" - }, { - "field" : "__em_aa", - "owner" : "em", - "name" : "aa", - "access" : 24, - "descriptor" : "[I" - }, { - "field" : "__em_af", - "owner" : "em", - "name" : "af", - "access" : 24, - "descriptor" : "[I" - }, { - "field" : "__em_ai", - "owner" : "em", - "name" : "ai", - "access" : 24, - "descriptor" : "[I" - }, { - "field" : "__em_ao", - "owner" : "em", - "name" : "ao", - "access" : 24, - "descriptor" : "[I" - }, { - "field" : "__em_au", - "owner" : "em", - "name" : "au", - "access" : 24, - "descriptor" : "[I" - }, { - "field" : "__em_ax", - "owner" : "em", - "name" : "ax", - "access" : 24, - "descriptor" : "[I" - }, { - "field" : "__em_ba", - "owner" : "em", - "name" : "ba", - "access" : 24, - "descriptor" : "[I" - }, { - "field" : "__ej_jv", - "owner" : "ej", - "name" : "jv", - "access" : 8, - "descriptor" : "Lho;" - }, { - "field" : "__el_x", - "owner" : "el", - "name" : "x", - "access" : 9, - "descriptor" : "I", - "decoder" : 422473713 - }, { - "field" : "__el_gm", - "owner" : "el", - "name" : "gm", - "access" : 8, - "descriptor" : "Lln;" - }, { - "field" : "__en_bc", - "owner" : "en", - "name" : "bc", - "access" : 8, - "descriptor" : "[Llq;" - }, { - "field" : "__eh_fy", - "owner" : "eh", - "name" : "fy", - "access" : 8, - "descriptor" : "I", - "decoder" : -457229589 - }, { - "field" : "__eo_u", - "owner" : "eo", - "name" : "u", - "access" : 8, - "descriptor" : "I", - "decoder" : -883931753 - }, { - "field" : "__eo_ak", - "owner" : "eo", - "name" : "ak", - "access" : 8, - "descriptor" : "Lla;" - }, { - "field" : "__ey_bx", - "owner" : "ey", - "name" : "bx", - "access" : 8, - "descriptor" : "[Llq;" - }, { - "field" : "__fw_nm", - "owner" : "fw", - "name" : "nm", - "access" : 8, - "descriptor" : "I", - "decoder" : 1006519291 - }, { - "field" : "__fg_jh", - "owner" : "fg", - "name" : "jh", - "access" : 8, - "descriptor" : "Lho;" - }, { - "field" : "__fh_x", - "owner" : "fh", - "name" : "x", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "__fx_w", - "owner" : "fx", - "name" : "w", - "access" : 9, - "descriptor" : "I", - "decoder" : 121013503 - }, { - "field" : "__fs_o", - "owner" : "fs", - "name" : "o", - "access" : 9, - "descriptor" : "Ljava/io/File;" - }, { - "field" : "__fs_au", - "owner" : "fs", - "name" : "au", - "access" : 8, - "descriptor" : "I", - "decoder" : 1181569415 - }, { - "field" : "__fo_m", - "owner" : "fo", - "name" : "m", - "access" : 9, - "descriptor" : "Z" - }, { - "field" : "__fo_f", - "owner" : "fo", - "name" : "f", - "access" : 9, - "descriptor" : "Ljava/io/File;" - }, { - "field" : "__fo_ro", - "owner" : "fo", - "name" : "ro", - "access" : 8, - "descriptor" : "I", - "decoder" : -852697585 - }, { - "field" : "__fo_q", - "owner" : "fo", - "name" : "q", - "access" : 8, - "descriptor" : "Ljava/util/Hashtable;" - }, { - "field" : "__fb_bm", - "owner" : "fb", - "name" : "bm", - "access" : 8, - "descriptor" : "Llq;" - }, { - "field" : "__fi_e", - "owner" : "fi", - "name" : "e", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__fi_l", - "owner" : "fi", - "name" : "l", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__fi_q", - "owner" : "fi", - "name" : "q", - "access" : 8, - "descriptor" : "[[I" - }, { - "field" : "__fi_w", - "owner" : "fi", - "name" : "w", - "access" : 8, - "descriptor" : "[[I" - }, { - "field" : "__fe_e", - "owner" : "fe", - "name" : "e", - "access" : 8, - "descriptor" : "[[[B" - }, { - "field" : "__ge_a", - "owner" : "ge", - "name" : "a", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_aa", - "owner" : "ge", - "name" : "aa", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_ab", - "owner" : "ge", - "name" : "ab", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_ac", - "owner" : "ge", - "name" : "ac", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_ad", - "owner" : "ge", - "name" : "ad", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_ae", - "owner" : "ge", - "name" : "ae", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_af", - "owner" : "ge", - "name" : "af", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_ag", - "owner" : "ge", - "name" : "ag", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_ah", - "owner" : "ge", - "name" : "ah", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_ai", - "owner" : "ge", - "name" : "ai", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_aj", - "owner" : "ge", - "name" : "aj", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_ak", - "owner" : "ge", - "name" : "ak", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_al", - "owner" : "ge", - "name" : "al", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_am", - "owner" : "ge", - "name" : "am", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_an", - "owner" : "ge", - "name" : "an", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_ao", - "owner" : "ge", - "name" : "ao", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_ap", - "owner" : "ge", - "name" : "ap", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_aq", - "owner" : "ge", - "name" : "aq", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_ar", - "owner" : "ge", - "name" : "ar", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_as", - "owner" : "ge", - "name" : "as", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_at", - "owner" : "ge", - "name" : "at", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_au", - "owner" : "ge", - "name" : "au", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_av", - "owner" : "ge", - "name" : "av", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_aw", - "owner" : "ge", - "name" : "aw", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_ax", - "owner" : "ge", - "name" : "ax", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_ay", - "owner" : "ge", - "name" : "ay", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_az", - "owner" : "ge", - "name" : "az", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_b", - "owner" : "ge", - "name" : "b", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_ba", - "owner" : "ge", - "name" : "ba", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_bb", - "owner" : "ge", - "name" : "bb", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_bc", - "owner" : "ge", - "name" : "bc", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_bd", - "owner" : "ge", - "name" : "bd", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_be", - "owner" : "ge", - "name" : "be", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_bf", - "owner" : "ge", - "name" : "bf", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_bg", - "owner" : "ge", - "name" : "bg", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_bh", - "owner" : "ge", - "name" : "bh", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_bi", - "owner" : "ge", - "name" : "bi", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_bj", - "owner" : "ge", - "name" : "bj", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_bk", - "owner" : "ge", - "name" : "bk", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_bl", - "owner" : "ge", - "name" : "bl", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_bm", - "owner" : "ge", - "name" : "bm", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_bn", - "owner" : "ge", - "name" : "bn", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_bo", - "owner" : "ge", - "name" : "bo", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_bp", - "owner" : "ge", - "name" : "bp", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_bq", - "owner" : "ge", - "name" : "bq", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_br", - "owner" : "ge", - "name" : "br", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_bs", - "owner" : "ge", - "name" : "bs", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_bt", - "owner" : "ge", - "name" : "bt", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_bu", - "owner" : "ge", - "name" : "bu", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_bv", - "owner" : "ge", - "name" : "bv", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_bw", - "owner" : "ge", - "name" : "bw", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_bx", - "owner" : "ge", - "name" : "bx", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_by", - "owner" : "ge", - "name" : "by", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_bz", - "owner" : "ge", - "name" : "bz", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_c", - "owner" : "ge", - "name" : "c", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_ce", - "owner" : "ge", - "name" : "ce", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_cj", - "owner" : "ge", - "name" : "cj", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_cm", - "owner" : "ge", - "name" : "cm", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_cr", - "owner" : "ge", - "name" : "cr", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_cs", - "owner" : "ge", - "name" : "cs", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_cv", - "owner" : "ge", - "name" : "cv", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_cy", - "owner" : "ge", - "name" : "cy", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_d", - "owner" : "ge", - "name" : "d", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_e", - "owner" : "ge", - "name" : "e", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_f", - "owner" : "ge", - "name" : "f", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_g", - "owner" : "ge", - "name" : "g", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_h", - "owner" : "ge", - "name" : "h", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_i", - "owner" : "ge", - "name" : "i", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_j", - "owner" : "ge", - "name" : "j", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_k", - "owner" : "ge", - "name" : "k", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_l", - "owner" : "ge", - "name" : "l", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_m", - "owner" : "ge", - "name" : "m", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_n", - "owner" : "ge", - "name" : "n", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_o", - "owner" : "ge", - "name" : "o", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_p", - "owner" : "ge", - "name" : "p", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_q", - "owner" : "ge", - "name" : "q", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_r", - "owner" : "ge", - "name" : "r", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_s", - "owner" : "ge", - "name" : "s", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_t", - "owner" : "ge", - "name" : "t", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_u", - "owner" : "ge", - "name" : "u", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_v", - "owner" : "ge", - "name" : "v", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_w", - "owner" : "ge", - "name" : "w", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_x", - "owner" : "ge", - "name" : "x", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_y", - "owner" : "ge", - "name" : "y", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__ge_z", - "owner" : "ge", - "name" : "z", - "access" : 25, - "descriptor" : "Lge;" - }, { - "field" : "__gs_a", - "owner" : "gs", - "name" : "a", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_aa", - "owner" : "gs", - "name" : "aa", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_ab", - "owner" : "gs", - "name" : "ab", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_ac", - "owner" : "gs", - "name" : "ac", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_ad", - "owner" : "gs", - "name" : "ad", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_ae", - "owner" : "gs", - "name" : "ae", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_af", - "owner" : "gs", - "name" : "af", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_ag", - "owner" : "gs", - "name" : "ag", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_ah", - "owner" : "gs", - "name" : "ah", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_ai", - "owner" : "gs", - "name" : "ai", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_aj", - "owner" : "gs", - "name" : "aj", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_ak", - "owner" : "gs", - "name" : "ak", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_al", - "owner" : "gs", - "name" : "al", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_an", - "owner" : "gs", - "name" : "an", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_ao", - "owner" : "gs", - "name" : "ao", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_ap", - "owner" : "gs", - "name" : "ap", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_aq", - "owner" : "gs", - "name" : "aq", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_ar", - "owner" : "gs", - "name" : "ar", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_as", - "owner" : "gs", - "name" : "as", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_at", - "owner" : "gs", - "name" : "at", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_au", - "owner" : "gs", - "name" : "au", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_av", - "owner" : "gs", - "name" : "av", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_aw", - "owner" : "gs", - "name" : "aw", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_ax", - "owner" : "gs", - "name" : "ax", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_ay", - "owner" : "gs", - "name" : "ay", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_az", - "owner" : "gs", - "name" : "az", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_b", - "owner" : "gs", - "name" : "b", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_ba", - "owner" : "gs", - "name" : "ba", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_bb", - "owner" : "gs", - "name" : "bb", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_bc", - "owner" : "gs", - "name" : "bc", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_bd", - "owner" : "gs", - "name" : "bd", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_be", - "owner" : "gs", - "name" : "be", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_bf", - "owner" : "gs", - "name" : "bf", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_bg", - "owner" : "gs", - "name" : "bg", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_bh", - "owner" : "gs", - "name" : "bh", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_bi", - "owner" : "gs", - "name" : "bi", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_bj", - "owner" : "gs", - "name" : "bj", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_bk", - "owner" : "gs", - "name" : "bk", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_bl", - "owner" : "gs", - "name" : "bl", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_bm", - "owner" : "gs", - "name" : "bm", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_bn", - "owner" : "gs", - "name" : "bn", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_bo", - "owner" : "gs", - "name" : "bo", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_bp", - "owner" : "gs", - "name" : "bp", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_bq", - "owner" : "gs", - "name" : "bq", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_br", - "owner" : "gs", - "name" : "br", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_bs", - "owner" : "gs", - "name" : "bs", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_bt", - "owner" : "gs", - "name" : "bt", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_bu", - "owner" : "gs", - "name" : "bu", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_bv", - "owner" : "gs", - "name" : "bv", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_bw", - "owner" : "gs", - "name" : "bw", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_bx", - "owner" : "gs", - "name" : "bx", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_by", - "owner" : "gs", - "name" : "by", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_bz", - "owner" : "gs", - "name" : "bz", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_c", - "owner" : "gs", - "name" : "c", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_cb", - "owner" : "gs", - "name" : "cb", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_cc", - "owner" : "gs", - "name" : "cc", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_ce", - "owner" : "gs", - "name" : "ce", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_cf", - "owner" : "gs", - "name" : "cf", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_cg", - "owner" : "gs", - "name" : "cg", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_ch", - "owner" : "gs", - "name" : "ch", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_cj", - "owner" : "gs", - "name" : "cj", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_ck", - "owner" : "gs", - "name" : "ck", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_cl", - "owner" : "gs", - "name" : "cl", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_cm", - "owner" : "gs", - "name" : "cm", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_cn", - "owner" : "gs", - "name" : "cn", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_cp", - "owner" : "gs", - "name" : "cp", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_cq", - "owner" : "gs", - "name" : "cq", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_cr", - "owner" : "gs", - "name" : "cr", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_cs", - "owner" : "gs", - "name" : "cs", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_ct", - "owner" : "gs", - "name" : "ct", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_cu", - "owner" : "gs", - "name" : "cu", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_cv", - "owner" : "gs", - "name" : "cv", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_cw", - "owner" : "gs", - "name" : "cw", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_cy", - "owner" : "gs", - "name" : "cy", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_cz", - "owner" : "gs", - "name" : "cz", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_d", - "owner" : "gs", - "name" : "d", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_e", - "owner" : "gs", - "name" : "e", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_f", - "owner" : "gs", - "name" : "f", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_g", - "owner" : "gs", - "name" : "g", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_h", - "owner" : "gs", - "name" : "h", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_i", - "owner" : "gs", - "name" : "i", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_j", - "owner" : "gs", - "name" : "j", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_k", - "owner" : "gs", - "name" : "k", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_l", - "owner" : "gs", - "name" : "l", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_m", - "owner" : "gs", - "name" : "m", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_n", - "owner" : "gs", - "name" : "n", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_o", - "owner" : "gs", - "name" : "o", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_p", - "owner" : "gs", - "name" : "p", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_q", - "owner" : "gs", - "name" : "q", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_r", - "owner" : "gs", - "name" : "r", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_s", - "owner" : "gs", - "name" : "s", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_t", - "owner" : "gs", - "name" : "t", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_u", - "owner" : "gs", - "name" : "u", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_v", - "owner" : "gs", - "name" : "v", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_w", - "owner" : "gs", - "name" : "w", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_x", - "owner" : "gs", - "name" : "x", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_y", - "owner" : "gs", - "name" : "y", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_z", - "owner" : "gs", - "name" : "z", - "access" : 25, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_qh", - "owner" : "gs", - "name" : "qh", - "access" : 8, - "descriptor" : "I", - "decoder" : 1076448827 - }, { - "field" : "__gs_am", - "owner" : "gs", - "name" : "am", - "access" : 24, - "descriptor" : "Lgs;" - }, { - "field" : "__gs_ci", - "owner" : "gs", - "name" : "ci", - "access" : 24, - "descriptor" : "Lgs;" - }, { - "field" : "__gl_m", - "owner" : "gl", - "name" : "m", - "access" : 25, - "descriptor" : "Lgl;" - }, { - "field" : "__gl_q", - "owner" : "gl", - "name" : "q", - "access" : 25, - "descriptor" : "Lgl;" - }, { - "field" : "__gl_w", - "owner" : "gl", - "name" : "w", - "access" : 25, - "descriptor" : "Lgl;" - }, { - "field" : "__gl_f", - "owner" : "gl", - "name" : "f", - "access" : 24, - "descriptor" : "Lgl;" - }, { - "field" : "__gl_o", - "owner" : "gl", - "name" : "o", - "access" : 24, - "descriptor" : "Lgl;" - }, { - "field" : "__gl_g", - "owner" : "gl", - "name" : "g", - "access" : 24, - "descriptor" : "[Lgl;" - }, { - "field" : "__gg_u", - "owner" : "gg", - "name" : "u", - "access" : 9, - "descriptor" : "I", - "decoder" : -1583654139 - }, { - "field" : "__gd_e", - "owner" : "gd", - "name" : "e", - "access" : 8, - "descriptor" : "[[I" - }, { - "field" : "__go_ck", - "owner" : "go", - "name" : "ck", - "access" : 9, - "descriptor" : "C" - }, { - "field" : "__gr_q", - "owner" : "gr", - "name" : "q", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__gr_o", - "owner" : "gr", - "name" : "o", - "access" : 8, - "descriptor" : "[J" - }, { - "field" : "__gi_g", - "owner" : "gi", - "name" : "g", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__gx_n", - "owner" : "gx", - "name" : "n", - "access" : 9, - "descriptor" : "Lkk;" - }, { - "field" : "__gx_d", - "owner" : "gx", - "name" : "d", - "access" : 24, - "descriptor" : "[I" - }, { - "field" : "__gx_x", - "owner" : "gx", - "name" : "x", - "access" : 24, - "descriptor" : "[I" - }, { - "field" : "__gu_et", - "owner" : "gu", - "name" : "et", - "access" : 8, - "descriptor" : "Lit;" - }, { - "field" : "__hx_z", - "owner" : "hx", - "name" : "z", - "access" : 9, - "descriptor" : "I", - "decoder" : 701739159 - }, { - "field" : "__hg_q", - "owner" : "hg", - "name" : "q", - "access" : 8, - "descriptor" : "Ljava/util/Calendar;" - }, { - "field" : "__hg_f", - "owner" : "hg", - "name" : "f", - "access" : 24, - "descriptor" : "[Ljava/lang/String;" - }, { - "field" : "__hg_m", - "owner" : "hg", - "name" : "m", - "access" : 24, - "descriptor" : "[[Ljava/lang/String;" - }, { - "field" : "__hd_fc", - "owner" : "hd", - "name" : "fc", - "access" : 8, - "descriptor" : "J", - "decoder" : -6780258776884306463 - }, { - "field" : "__hf_o", - "owner" : "hf", - "name" : "o", - "access" : 9, - "descriptor" : "I", - "decoder" : -848833001 - }, { - "field" : "__hf_f", - "owner" : "hf", - "name" : "f", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "__hf_q", - "owner" : "hf", - "name" : "q", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "__hf_u", - "owner" : "hf", - "name" : "u", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "__hf_k", - "owner" : "hf", - "name" : "k", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__hs_x", - "owner" : "hs", - "name" : "x", - "access" : 24, - "descriptor" : "[B" - }, { - "field" : "__hq_qg", - "owner" : "hq", - "name" : "qg", - "access" : 8, - "descriptor" : "I", - "decoder" : -1367955455 - }, { - "field" : "__hv_h", - "owner" : "hv", - "name" : "h", - "access" : 8, - "descriptor" : "I", - "decoder" : 120772859 - }, { - "field" : "__hi_g", - "owner" : "hi", - "name" : "g", - "access" : 9, - "descriptor" : "[S" - }, { - "field" : "__hi_d", - "owner" : "hi", - "name" : "d", - "access" : 24, - "descriptor" : "[I" - }, { - "field" : "__ht_m", - "owner" : "ht", - "name" : "m", - "access" : 25, - "descriptor" : "[S" - }, { - "field" : "__ht_q", - "owner" : "ht", - "name" : "q", - "access" : 25, - "descriptor" : "[S" - }, { - "field" : "__ht_f", - "owner" : "ht", - "name" : "f", - "access" : 25, - "descriptor" : "[[S" - }, { - "field" : "__ht_w", - "owner" : "ht", - "name" : "w", - "access" : 25, - "descriptor" : "[[S" - }, { - "field" : "__hj_e", - "owner" : "hj", - "name" : "e", - "access" : 9, - "descriptor" : "[S" - }, { - "field" : "__ho_j", - "owner" : "ho", - "name" : "j", - "access" : 9, - "descriptor" : "Z" - }, { - "field" : "__ho_d", - "owner" : "ho", - "name" : "d", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "__ho_n", - "owner" : "ho", - "name" : "n", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "__ho_z", - "owner" : "ho", - "name" : "z", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "__hz_l", - "owner" : "hz", - "name" : "l", - "access" : 9, - "descriptor" : "[[S" - }, { - "field" : "__hy_az", - "owner" : "hy", - "name" : "az", - "access" : 12, - "descriptor" : "Z" - }, { - "field" : "__hb_sg", - "owner" : "hb", - "name" : "sg", - "access" : 8, - "descriptor" : "I", - "decoder" : -745071109 - }, { - "field" : "__hb_av", - "owner" : "hb", - "name" : "av", - "access" : 8, - "descriptor" : "Ljava/awt/Font;" - }, { - "field" : "__hc_ef", - "owner" : "hc", - "name" : "ef", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__id_aa", - "owner" : "id", - "name" : "aa", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ad", - "owner" : "id", - "name" : "ad", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ae", - "owner" : "id", - "name" : "ae", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_af", - "owner" : "id", - "name" : "af", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ai", - "owner" : "id", - "name" : "ai", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_am", - "owner" : "id", - "name" : "am", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_an", - "owner" : "id", - "name" : "an", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ao", - "owner" : "id", - "name" : "ao", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ap", - "owner" : "id", - "name" : "ap", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_as", - "owner" : "id", - "name" : "as", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_at", - "owner" : "id", - "name" : "at", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_au", - "owner" : "id", - "name" : "au", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ax", - "owner" : "id", - "name" : "ax", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_az", - "owner" : "id", - "name" : "az", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ba", - "owner" : "id", - "name" : "ba", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_bb", - "owner" : "id", - "name" : "bb", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_bc", - "owner" : "id", - "name" : "bc", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_bd", - "owner" : "id", - "name" : "bd", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_be", - "owner" : "id", - "name" : "be", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_bf", - "owner" : "id", - "name" : "bf", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_bg", - "owner" : "id", - "name" : "bg", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_bh", - "owner" : "id", - "name" : "bh", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_bi", - "owner" : "id", - "name" : "bi", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_bj", - "owner" : "id", - "name" : "bj", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_bk", - "owner" : "id", - "name" : "bk", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_bl", - "owner" : "id", - "name" : "bl", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_bm", - "owner" : "id", - "name" : "bm", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_bn", - "owner" : "id", - "name" : "bn", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_bo", - "owner" : "id", - "name" : "bo", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_bp", - "owner" : "id", - "name" : "bp", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_bq", - "owner" : "id", - "name" : "bq", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_br", - "owner" : "id", - "name" : "br", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_bs", - "owner" : "id", - "name" : "bs", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_bt", - "owner" : "id", - "name" : "bt", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_bu", - "owner" : "id", - "name" : "bu", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_bv", - "owner" : "id", - "name" : "bv", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_bw", - "owner" : "id", - "name" : "bw", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_bx", - "owner" : "id", - "name" : "bx", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_by", - "owner" : "id", - "name" : "by", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_bz", - "owner" : "id", - "name" : "bz", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ca", - "owner" : "id", - "name" : "ca", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_cb", - "owner" : "id", - "name" : "cb", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_cc", - "owner" : "id", - "name" : "cc", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_cd", - "owner" : "id", - "name" : "cd", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ce", - "owner" : "id", - "name" : "ce", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_cf", - "owner" : "id", - "name" : "cf", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_cg", - "owner" : "id", - "name" : "cg", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ch", - "owner" : "id", - "name" : "ch", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ci", - "owner" : "id", - "name" : "ci", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_cj", - "owner" : "id", - "name" : "cj", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ck", - "owner" : "id", - "name" : "ck", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_cl", - "owner" : "id", - "name" : "cl", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_cm", - "owner" : "id", - "name" : "cm", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_cn", - "owner" : "id", - "name" : "cn", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_co", - "owner" : "id", - "name" : "co", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_cp", - "owner" : "id", - "name" : "cp", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_cq", - "owner" : "id", - "name" : "cq", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_cr", - "owner" : "id", - "name" : "cr", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_cs", - "owner" : "id", - "name" : "cs", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ct", - "owner" : "id", - "name" : "ct", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_cu", - "owner" : "id", - "name" : "cu", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_cv", - "owner" : "id", - "name" : "cv", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_cw", - "owner" : "id", - "name" : "cw", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_cx", - "owner" : "id", - "name" : "cx", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_cy", - "owner" : "id", - "name" : "cy", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_cz", - "owner" : "id", - "name" : "cz", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_d", - "owner" : "id", - "name" : "d", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_da", - "owner" : "id", - "name" : "da", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_db", - "owner" : "id", - "name" : "db", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_dc", - "owner" : "id", - "name" : "dc", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_dd", - "owner" : "id", - "name" : "dd", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_de", - "owner" : "id", - "name" : "de", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_df", - "owner" : "id", - "name" : "df", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_dg", - "owner" : "id", - "name" : "dg", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_di", - "owner" : "id", - "name" : "di", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_dj", - "owner" : "id", - "name" : "dj", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_dk", - "owner" : "id", - "name" : "dk", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_dl", - "owner" : "id", - "name" : "dl", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_dm", - "owner" : "id", - "name" : "dm", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_dn", - "owner" : "id", - "name" : "dn", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_do", - "owner" : "id", - "name" : "do", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_dp", - "owner" : "id", - "name" : "dp", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_dq", - "owner" : "id", - "name" : "dq", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_dr", - "owner" : "id", - "name" : "dr", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ds", - "owner" : "id", - "name" : "ds", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_dt", - "owner" : "id", - "name" : "dt", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_du", - "owner" : "id", - "name" : "du", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_dv", - "owner" : "id", - "name" : "dv", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_dx", - "owner" : "id", - "name" : "dx", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_dy", - "owner" : "id", - "name" : "dy", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_dz", - "owner" : "id", - "name" : "dz", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_eb", - "owner" : "id", - "name" : "eb", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ec", - "owner" : "id", - "name" : "ec", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ed", - "owner" : "id", - "name" : "ed", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ee", - "owner" : "id", - "name" : "ee", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ef", - "owner" : "id", - "name" : "ef", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_eh", - "owner" : "id", - "name" : "eh", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ei", - "owner" : "id", - "name" : "ei", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ej", - "owner" : "id", - "name" : "ej", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ek", - "owner" : "id", - "name" : "ek", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_el", - "owner" : "id", - "name" : "el", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_em", - "owner" : "id", - "name" : "em", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_en", - "owner" : "id", - "name" : "en", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_eo", - "owner" : "id", - "name" : "eo", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_eq", - "owner" : "id", - "name" : "eq", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_er", - "owner" : "id", - "name" : "er", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_et", - "owner" : "id", - "name" : "et", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_eu", - "owner" : "id", - "name" : "eu", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ev", - "owner" : "id", - "name" : "ev", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ew", - "owner" : "id", - "name" : "ew", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ex", - "owner" : "id", - "name" : "ex", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ey", - "owner" : "id", - "name" : "ey", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_fa", - "owner" : "id", - "name" : "fa", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_fb", - "owner" : "id", - "name" : "fb", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ff", - "owner" : "id", - "name" : "ff", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_fk", - "owner" : "id", - "name" : "fk", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_fm", - "owner" : "id", - "name" : "fm", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_fn", - "owner" : "id", - "name" : "fn", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_fs", - "owner" : "id", - "name" : "fs", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_fv", - "owner" : "id", - "name" : "fv", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_fx", - "owner" : "id", - "name" : "fx", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_fz", - "owner" : "id", - "name" : "fz", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ga", - "owner" : "id", - "name" : "ga", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gb", - "owner" : "id", - "name" : "gb", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gc", - "owner" : "id", - "name" : "gc", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gd", - "owner" : "id", - "name" : "gd", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ge", - "owner" : "id", - "name" : "ge", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gf", - "owner" : "id", - "name" : "gf", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gg", - "owner" : "id", - "name" : "gg", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gh", - "owner" : "id", - "name" : "gh", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gi", - "owner" : "id", - "name" : "gi", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gj", - "owner" : "id", - "name" : "gj", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gk", - "owner" : "id", - "name" : "gk", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gl", - "owner" : "id", - "name" : "gl", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gm", - "owner" : "id", - "name" : "gm", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gn", - "owner" : "id", - "name" : "gn", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_go", - "owner" : "id", - "name" : "go", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gp", - "owner" : "id", - "name" : "gp", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gq", - "owner" : "id", - "name" : "gq", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gr", - "owner" : "id", - "name" : "gr", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gs", - "owner" : "id", - "name" : "gs", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gt", - "owner" : "id", - "name" : "gt", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gu", - "owner" : "id", - "name" : "gu", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gv", - "owner" : "id", - "name" : "gv", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gw", - "owner" : "id", - "name" : "gw", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gx", - "owner" : "id", - "name" : "gx", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gy", - "owner" : "id", - "name" : "gy", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_gz", - "owner" : "id", - "name" : "gz", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ha", - "owner" : "id", - "name" : "ha", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_hb", - "owner" : "id", - "name" : "hb", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_hc", - "owner" : "id", - "name" : "hc", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_hd", - "owner" : "id", - "name" : "hd", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_hf", - "owner" : "id", - "name" : "hf", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_hg", - "owner" : "id", - "name" : "hg", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_hh", - "owner" : "id", - "name" : "hh", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_hk", - "owner" : "id", - "name" : "hk", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_hm", - "owner" : "id", - "name" : "hm", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_hn", - "owner" : "id", - "name" : "hn", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_hr", - "owner" : "id", - "name" : "hr", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_hs", - "owner" : "id", - "name" : "hs", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_hx", - "owner" : "id", - "name" : "hx", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_hy", - "owner" : "id", - "name" : "hy", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ia", - "owner" : "id", - "name" : "ia", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ib", - "owner" : "id", - "name" : "ib", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ic", - "owner" : "id", - "name" : "ic", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_id", - "owner" : "id", - "name" : "id", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ig", - "owner" : "id", - "name" : "ig", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ih", - "owner" : "id", - "name" : "ih", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ii", - "owner" : "id", - "name" : "ii", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ik", - "owner" : "id", - "name" : "ik", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_im", - "owner" : "id", - "name" : "im", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_io", - "owner" : "id", - "name" : "io", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ip", - "owner" : "id", - "name" : "ip", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_iq", - "owner" : "id", - "name" : "iq", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ir", - "owner" : "id", - "name" : "ir", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_it", - "owner" : "id", - "name" : "it", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_iu", - "owner" : "id", - "name" : "iu", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_iv", - "owner" : "id", - "name" : "iv", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_iw", - "owner" : "id", - "name" : "iw", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ix", - "owner" : "id", - "name" : "ix", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ja", - "owner" : "id", - "name" : "ja", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_jb", - "owner" : "id", - "name" : "jb", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_jc", - "owner" : "id", - "name" : "jc", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_jd", - "owner" : "id", - "name" : "jd", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_je", - "owner" : "id", - "name" : "je", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_jf", - "owner" : "id", - "name" : "jf", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_jg", - "owner" : "id", - "name" : "jg", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_jh", - "owner" : "id", - "name" : "jh", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ji", - "owner" : "id", - "name" : "ji", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_jj", - "owner" : "id", - "name" : "jj", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_jk", - "owner" : "id", - "name" : "jk", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_jl", - "owner" : "id", - "name" : "jl", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_jm", - "owner" : "id", - "name" : "jm", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_jn", - "owner" : "id", - "name" : "jn", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_jo", - "owner" : "id", - "name" : "jo", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_jp", - "owner" : "id", - "name" : "jp", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_jq", - "owner" : "id", - "name" : "jq", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_jr", - "owner" : "id", - "name" : "jr", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_js", - "owner" : "id", - "name" : "js", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_jt", - "owner" : "id", - "name" : "jt", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ju", - "owner" : "id", - "name" : "ju", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_jv", - "owner" : "id", - "name" : "jv", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_jw", - "owner" : "id", - "name" : "jw", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_jx", - "owner" : "id", - "name" : "jx", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_jy", - "owner" : "id", - "name" : "jy", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_jz", - "owner" : "id", - "name" : "jz", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_kd", - "owner" : "id", - "name" : "kd", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ke", - "owner" : "id", - "name" : "ke", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_kf", - "owner" : "id", - "name" : "kf", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_kg", - "owner" : "id", - "name" : "kg", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_kj", - "owner" : "id", - "name" : "kj", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_km", - "owner" : "id", - "name" : "km", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_kp", - "owner" : "id", - "name" : "kp", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ks", - "owner" : "id", - "name" : "ks", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_kv", - "owner" : "id", - "name" : "kv", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ky", - "owner" : "id", - "name" : "ky", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_l", - "owner" : "id", - "name" : "l", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_x", - "owner" : "id", - "name" : "x", - "access" : 9, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__id_ab", - "owner" : "id", - "name" : "ab", - "access" : 8, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__ij_ak", - "owner" : "ij", - "name" : "ak", - "access" : 8, - "descriptor" : "Ljava/awt/Image;" - }, { - "field" : "__iy_f", - "owner" : "iy", - "name" : "f", - "access" : 25, - "descriptor" : "Liy;" - }, { - "field" : "__iy_m", - "owner" : "iy", - "name" : "m", - "access" : 25, - "descriptor" : "Liy;" - }, { - "field" : "__iy_q", - "owner" : "iy", - "name" : "q", - "access" : 25, - "descriptor" : "Liy;" - }, { - "field" : "__iy_w", - "owner" : "iy", - "name" : "w", - "access" : 25, - "descriptor" : "Liy;" - }, { - "field" : "__iy_lo", - "owner" : "iy", - "name" : "lo", - "access" : 8, - "descriptor" : "I", - "decoder" : -365366303 - }, { - "field" : "__is_u", - "owner" : "is", - "name" : "u", - "access" : 25, - "descriptor" : "Lis;" - }, { - "field" : "__is_f", - "owner" : "is", - "name" : "f", - "access" : 24, - "descriptor" : "Lis;" - }, { - "field" : "__is_m", - "owner" : "is", - "name" : "m", - "access" : 24, - "descriptor" : "Lis;" - }, { - "field" : "__is_o", - "owner" : "is", - "name" : "o", - "access" : 24, - "descriptor" : "Lis;" - }, { - "field" : "__is_q", - "owner" : "is", - "name" : "q", - "access" : 24, - "descriptor" : "Lis;" - }, { - "field" : "__is_w", - "owner" : "is", - "name" : "w", - "access" : 24, - "descriptor" : "Lis;" - }, { - "field" : "__ik_cn", - "owner" : "ik", - "name" : "cn", - "access" : 9, - "descriptor" : "I", - "decoder" : -1753937079 - }, { - "field" : "__ik_rt", - "owner" : "ik", - "name" : "rt", - "access" : 8, - "descriptor" : "I", - "decoder" : -1086790653 - }, { - "field" : "__ir_bu", - "owner" : "ir", - "name" : "bu", - "access" : 8, - "descriptor" : "I", - "decoder" : 334735939 - }, { - "field" : "__ir_s", - "owner" : "ir", - "name" : "s", - "access" : 8, - "descriptor" : "I", - "decoder" : -244224193 - }, { - "field" : "__iv_q", - "owner" : "iv", - "name" : "q", - "access" : 8, - "descriptor" : "I", - "decoder" : -1282224505 - }, { - "field" : "__iq_b", - "owner" : "iq", - "name" : "b", - "access" : 9, - "descriptor" : "B" - }, { - "field" : "__iq_f", - "owner" : "iq", - "name" : "f", - "access" : 9, - "descriptor" : "I", - "decoder" : 948359621 - }, { - "field" : "__iq_j", - "owner" : "iq", - "name" : "j", - "access" : 9, - "descriptor" : "I", - "decoder" : 840549915 - }, { - "field" : "__iq_q", - "owner" : "iq", - "name" : "q", - "access" : 9, - "descriptor" : "J", - "decoder" : -4580427166942649525 - }, { - "field" : "__iu_n", - "owner" : "iu", - "name" : "n", - "access" : 8, - "descriptor" : "I", - "decoder" : 662119345 - }, { - "field" : "__iu_e", - "owner" : "iu", - "name" : "e", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__ib_f", - "owner" : "ib", - "name" : "f", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "__ix_f", - "owner" : "ix", - "name" : "f", - "access" : 9, - "descriptor" : "I", - "decoder" : 510774535 - }, { - "field" : "__ix_m", - "owner" : "ix", - "name" : "m", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "__ic_m", - "owner" : "ic", - "name" : "m", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "__iw_f", - "owner" : "iw", - "name" : "f", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "__iw_m", - "owner" : "iw", - "name" : "m", - "access" : 8, - "descriptor" : "Lir;" - }, { - "field" : "__im_q", - "owner" : "im", - "name" : "q", - "access" : 9, - "descriptor" : "I", - "decoder" : 235389995 - }, { - "field" : "__im_f", - "owner" : "im", - "name" : "f", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "__ii_f", - "owner" : "ii", - "name" : "f", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "__ii_m", - "owner" : "ii", - "name" : "m", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "__ia_u", - "owner" : "ia", - "name" : "u", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__jb_m", - "owner" : "jb", - "name" : "m", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "__jq_f", - "owner" : "jq", - "name" : "f", - "access" : 9, - "descriptor" : "Ler;" - }, { - "field" : "__jq_m", - "owner" : "jq", - "name" : "m", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "__jm_o", - "owner" : "jm", - "name" : "o", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "__jm_f", - "owner" : "jm", - "name" : "f", - "access" : 8, - "descriptor" : "Lir;" - }, { - "field" : "__jm_m", - "owner" : "jm", - "name" : "m", - "access" : 8, - "descriptor" : "Lir;" - }, { - "field" : "__jm_q", - "owner" : "jm", - "name" : "q", - "access" : 8, - "descriptor" : "Lir;" - }, { - "field" : "__jr_o", - "owner" : "jr", - "name" : "o", - "access" : 9, - "descriptor" : "Ler;" - }, { - "field" : "__jr_l", - "owner" : "jr", - "name" : "l", - "access" : 8, - "descriptor" : "[Ldw;" - }, { - "field" : "__jr_u", - "owner" : "jr", - "name" : "u", - "access" : 8, - "descriptor" : "Ler;" - }, { - "field" : "__jr_q", - "owner" : "jr", - "name" : "q", - "access" : 8, - "descriptor" : "Lir;" - }, { - "field" : "__jf_f", - "owner" : "jf", - "name" : "f", - "access" : 9, - "descriptor" : "Ler;" - }, { - "field" : "__jf_m", - "owner" : "jf", - "name" : "m", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "__jh_o", - "owner" : "jh", - "name" : "o", - "access" : 9, - "descriptor" : "Ler;" - }, { - "field" : "__jh_f", - "owner" : "jh", - "name" : "f", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "__jh_q", - "owner" : "jh", - "name" : "q", - "access" : 9, - "descriptor" : "Lir;" - }, { - "field" : "__jn_by", - "owner" : "jn", - "name" : "by", - "access" : 8, - "descriptor" : "Llq;" - }, { - "field" : "__jx_ne", - "owner" : "jx", - "name" : "ne", - "access" : 8, - "descriptor" : "[Lho;" - }, { - "field" : "__ji_i", - "owner" : "ji", - "name" : "i", - "access" : 25, - "descriptor" : "Lji;" - }, { - "field" : "__ji_n", - "owner" : "ji", - "name" : "n", - "access" : 25, - "descriptor" : "Lji;" - }, { - "field" : "__ji_fp", - "owner" : "ji", - "name" : "fp", - "access" : 8, - "descriptor" : "Lfu;" - }, { - "field" : "__ji_a", - "owner" : "ji", - "name" : "a", - "access" : 24, - "descriptor" : "Lji;" - }, { - "field" : "__ji_d", - "owner" : "ji", - "name" : "d", - "access" : 24, - "descriptor" : "Lji;" - }, { - "field" : "__ji_e", - "owner" : "ji", - "name" : "e", - "access" : 24, - "descriptor" : "Lji;" - }, { - "field" : "__ji_f", - "owner" : "ji", - "name" : "f", - "access" : 24, - "descriptor" : "Lji;" - }, { - "field" : "__ji_g", - "owner" : "ji", - "name" : "g", - "access" : 24, - "descriptor" : "Lji;" - }, { - "field" : "__ji_j", - "owner" : "ji", - "name" : "j", - "access" : 24, - "descriptor" : "Lji;" - }, { - "field" : "__ji_k", - "owner" : "ji", - "name" : "k", - "access" : 24, - "descriptor" : "Lji;" - }, { - "field" : "__ji_l", - "owner" : "ji", - "name" : "l", - "access" : 24, - "descriptor" : "Lji;" - }, { - "field" : "__ji_m", - "owner" : "ji", - "name" : "m", - "access" : 24, - "descriptor" : "Lji;" - }, { - "field" : "__ji_o", - "owner" : "ji", - "name" : "o", - "access" : 24, - "descriptor" : "Lji;" - }, { - "field" : "__ji_q", - "owner" : "ji", - "name" : "q", - "access" : 24, - "descriptor" : "Lji;" - }, { - "field" : "__ji_s", - "owner" : "ji", - "name" : "s", - "access" : 24, - "descriptor" : "Lji;" - }, { - "field" : "__ji_t", - "owner" : "ji", - "name" : "t", - "access" : 24, - "descriptor" : "Lji;" - }, { - "field" : "__ji_u", - "owner" : "ji", - "name" : "u", - "access" : 24, - "descriptor" : "Lji;" - }, { - "field" : "__ji_w", - "owner" : "ji", - "name" : "w", - "access" : 24, - "descriptor" : "Lji;" - }, { - "field" : "__ji_x", - "owner" : "ji", - "name" : "x", - "access" : 24, - "descriptor" : "Lji;" - }, { - "field" : "__ji_z", - "owner" : "ji", - "name" : "z", - "access" : 24, - "descriptor" : "Lji;" - }, { - "field" : "__ks_at", - "owner" : "ks", - "name" : "at", - "access" : 12, - "descriptor" : "Ljava/lang/String;" - }, { - "field" : "__kn_x", - "owner" : "kn", - "name" : "x", - "access" : 8, - "descriptor" : "Ley;" - }, { - "field" : "__kz_o", - "owner" : "kz", - "name" : "o", - "access" : 8, - "descriptor" : "[[[B" - }, { - "field" : "__kz_l", - "owner" : "kz", - "name" : "l", - "access" : 8, - "descriptor" : "Lln;" - }, { - "field" : "__kb_q", - "owner" : "kb", - "name" : "q", - "access" : 24, - "descriptor" : "[C" - }, { - "field" : "__kb_w", - "owner" : "kb", - "name" : "w", - "access" : 24, - "descriptor" : "[C" - }, { - "field" : "__kc_m", - "owner" : "kc", - "name" : "m", - "access" : 9, - "descriptor" : "[C" - }, { - "field" : "__kc_g", - "owner" : "kc", - "name" : "g", - "access" : 8, - "descriptor" : "[[[B" - }, { - "field" : "__kc_f", - "owner" : "kc", - "name" : "f", - "access" : 8, - "descriptor" : "[C" - }, { - "field" : "__kc_q", - "owner" : "kc", - "name" : "q", - "access" : 8, - "descriptor" : "[C" - }, { - "field" : "__kc_w", - "owner" : "kc", - "name" : "w", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__kw_n", - "owner" : "kw", - "name" : "n", - "access" : 8, - "descriptor" : "Llq;" - }, { - "field" : "__ka_e", - "owner" : "ka", - "name" : "e", - "access" : 8, - "descriptor" : "I", - "decoder" : -2077113503 - }, { - "field" : "__lp_ca", - "owner" : "lp", - "name" : "ca", - "access" : 8, - "descriptor" : "Z" - }, { - "field" : "__lj_m", - "owner" : "lj", - "name" : "m", - "access" : 25, - "descriptor" : "Llj;" - }, { - "field" : "__lj_f", - "owner" : "lj", - "name" : "f", - "access" : 24, - "descriptor" : "Llj;" - }, { - "field" : "__lj_q", - "owner" : "lj", - "name" : "q", - "access" : 24, - "descriptor" : "Llj;" - }, { - "field" : "__lr_e", - "owner" : "lr", - "name" : "e", - "access" : 8, - "descriptor" : "[[B" - }, { - "field" : "__lr_f", - "owner" : "lr", - "name" : "f", - "access" : 8, - "descriptor" : "I", - "decoder" : 161627197 - }, { - "field" : "__lr_m", - "owner" : "lr", - "name" : "m", - "access" : 8, - "descriptor" : "I", - "decoder" : -1119867679 - }, { - "field" : "__lr_q", - "owner" : "lr", - "name" : "q", - "access" : 8, - "descriptor" : "I", - "decoder" : -76329055 - }, { - "field" : "__lr_l", - "owner" : "lr", - "name" : "l", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__lr_o", - "owner" : "lr", - "name" : "o", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__lr_w", - "owner" : "lr", - "name" : "w", - "access" : 8, - "descriptor" : "[I" - }, { - "field" : "__lx_e", - "owner" : "lx", - "name" : "e", - "access" : 25, - "descriptor" : "Llx;" - }, { - "field" : "__lx_m", - "owner" : "lx", - "name" : "m", - "access" : 25, - "descriptor" : "Llx;" - }, { - "field" : "__lx_f", - "owner" : "lx", - "name" : "f", - "access" : 24, - "descriptor" : "Llx;" - }, { - "field" : "__lx_g", - "owner" : "lx", - "name" : "g", - "access" : 24, - "descriptor" : "Llx;" - }, { - "field" : "__lx_l", - "owner" : "lx", - "name" : "l", - "access" : 24, - "descriptor" : "Llx;" - }, { - "field" : "__lx_o", - "owner" : "lx", - "name" : "o", - "access" : 24, - "descriptor" : "Llx;" - }, { - "field" : "__lx_q", - "owner" : "lx", - "name" : "q", - "access" : 24, - "descriptor" : "Llx;" - }, { - "field" : "__lx_u", - "owner" : "lx", - "name" : "u", - "access" : 24, - "descriptor" : "Llx;" - }, { - "field" : "__lx_w", - "owner" : "lx", - "name" : "w", - "access" : 24, - "descriptor" : "Llx;" - } ], - "methods" : [ { - "method" : "AbstractFont_drawGlyph", - "owner" : "kt", - "name" : "ah", - "access" : 8, - "parameters" : [ "pixels", "x", "y", "width", "height", "color" ], - "descriptor" : "([BIIIII)V" - }, { - "method" : "AbstractFont_drawGlyphAlpha", - "owner" : "kt", - "name" : "aw", - "access" : 8, - "parameters" : [ "pixels", "x", "y", "width", "height", "color", "alpha" ], - "descriptor" : "([BIIIIII)V" - }, { - "method" : "AbstractFont_placeGlyph", - "owner" : "kt", - "name" : "ak", - "access" : 8, - "descriptor" : "([I[BIIIIIII)V" - }, { - "method" : "AbstractFont_placeGlyphAlpha", - "owner" : "kt", - "name" : "al", - "access" : 8, - "descriptor" : "([I[BIIIIIIII)V" - }, { - "method" : "ByteArrayPool_get", - "owner" : "gi", - "name" : "f", - "access" : 40, - "descriptor" : "(IZI)[B" - }, { - "method" : "Bzip2Decompressor_decompress", - "owner" : "gk", - "name" : "m", - "access" : 9, - "descriptor" : "([BI[BII)I" - }, { - "method" : "IterableNodeDeque_addBefore", - "owner" : "ja", - "name" : "w", - "access" : 9, - "parameters" : [ "node", "old" ], - "descriptor" : "(Lgw;Lgw;)V" - }, { - "method" : "PcmStream_disable", - "owner" : "hm", - "name" : "al", - "access" : 24, - "parameters" : [ "stream" ], - "descriptor" : "(Ldc;B)V" - }, { - "method" : "Rasterizer2D_clear", - "owner" : "lf", - "name" : "dd", - "access" : 9, - "descriptor" : "()V" - }, { - "method" : "Rasterizer2D_drawHorizontalLine", - "owner" : "lf", - "name" : "dj", - "access" : 9, - "parameters" : [ "x", "y", "length", "color" ], - "descriptor" : "(IIII)V" - }, { - "method" : "Rasterizer2D_drawHorizontalLineAlpha", - "owner" : "lf", - "name" : "du", - "access" : 8, - "parameters" : [ "x", "y", "length", "rgb", "alpha" ], - "descriptor" : "(IIIII)V" - }, { - "method" : "Rasterizer2D_drawLine", - "owner" : "lf", - "name" : "et", - "access" : 9, - "parameters" : [ "x0", "y0", "x1", "y1", "color" ], - "descriptor" : "(IIIII)V" - }, { - "method" : "Rasterizer2D_drawRectangle", - "owner" : "lf", - "name" : "dh", - "access" : 9, - "parameters" : [ "x", "y", "width", "height", "color" ], - "descriptor" : "(IIIII)V" - }, { - "method" : "Rasterizer2D_drawRectangleAlpha", - "owner" : "lf", - "name" : "dz", - "access" : 9, - "parameters" : [ "x", "y", "width", "height", "rgb", "alpha" ], - "descriptor" : "(IIIIII)V" - }, { - "method" : "Rasterizer2D_drawVerticalLine", - "owner" : "lf", - "name" : "dm", - "access" : 9, - "parameters" : [ "x", "y", "length", "color" ], - "descriptor" : "(IIII)V" - }, { - "method" : "Rasterizer2D_drawVerticalLineAlpha", - "owner" : "lf", - "name" : "dq", - "access" : 8, - "parameters" : [ "x", "y", "length", "rgb", "alpha" ], - "descriptor" : "(IIIII)V" - }, { - "method" : "Rasterizer2D_expandClip", - "owner" : "lf", - "name" : "dc", - "access" : 9, - "parameters" : [ "xStart", "yStart", "xEnd", "yEnd" ], - "descriptor" : "(IIII)V" - }, { - "method" : "Rasterizer2D_fillRectangle", - "owner" : "lf", - "name" : "dr", - "access" : 9, - "parameters" : [ "x", "y", "width", "height", "color" ], - "descriptor" : "(IIIII)V" - }, { - "method" : "Rasterizer2D_getClipArray", - "owner" : "lf", - "name" : "dg", - "access" : 9, - "parameters" : [ "dst" ], - "descriptor" : "([I)V" - }, { - "method" : "Rasterizer2D_replace", - "owner" : "lf", - "name" : "dp", - "access" : 9, - "parameters" : [ "pixels", "width", "height" ], - "descriptor" : "([III)V" - }, { - "method" : "Rasterizer2D_resetClip", - "owner" : "lf", - "name" : "ds", - "access" : 9, - "descriptor" : "()V" - }, { - "method" : "Rasterizer2D_setClip", - "owner" : "lf", - "name" : "di", - "access" : 9, - "parameters" : [ "xStart", "yStart", "xEnd", "yEnd" ], - "descriptor" : "(IIII)V" - }, { - "method" : "Rasterizer2D_setClipArray", - "owner" : "lf", - "name" : "db", - "access" : 9, - "parameters" : [ "src" ], - "descriptor" : "([I)V" - }, { - "method" : "Rasterizer2D_setPixel", - "owner" : "lf", - "name" : "eb", - "access" : 8, - "parameters" : [ "x", "y", "color" ], - "descriptor" : "(III)V" - }, { - "method" : "Rasterizer3D_brighten", - "owner" : "et", - "name" : "l", - "access" : 8, - "parameters" : [ "rgb", "brightness" ], - "descriptor" : "(ID)I" - }, { - "method" : "Rasterizer3D_buildPalette", - "owner" : "et", - "name" : "g", - "access" : 24, - "parameters" : [ "brightness", "hsMin", "hsMax" ], - "descriptor" : "(DII)V" - }, { - "method" : "Rasterizer3D_method1", - "owner" : "et", - "name" : "m", - "access" : 25, - "descriptor" : "()V" - }, { - "method" : "Rasterizer3D_method3", - "owner" : "et", - "name" : "q", - "access" : 25, - "descriptor" : "()V" - }, { - "method" : "Rasterizer3D_setBrightness", - "owner" : "et", - "name" : "u", - "access" : 25, - "parameters" : [ "brightness" ], - "descriptor" : "(D)V" - }, { - "method" : "Rasterizer3D_setClip", - "owner" : "et", - "name" : "f", - "access" : 24, - "parameters" : [ "xStart", "yStart", "xEnd", "yEnd" ], - "descriptor" : "(IIII)V" - }, { - "method" : "Rasterizer3D_setTextureLoader", - "owner" : "et", - "name" : "o", - "access" : 25, - "parameters" : [ "textureLoader" ], - "descriptor" : "(Lei;)V" - }, { - "method" : "Scene_addOccluder", - "owner" : "em", - "name" : "w", - "access" : 9, - "descriptor" : "(IIIIIIII)V" - }, { - "method" : "Scene_buildVisiblityMap", - "owner" : "em", - "name" : "at", - "access" : 9, - "parameters" : [ "a", "b", "c", "viewportWidth", "viewportHeight" ], - "descriptor" : "([IIIII)V" - }, { - "method" : "addMessage", - "owner" : "g", - "name" : "f", - "access" : 8, - "parameters" : [ "type", "sender", "text", "prefix" ], - "descriptor" : "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V" - }, { - "method" : "addNpcToMenu", - "owner" : "dj", - "name" : "is", - "access" : 24, - "parameters" : [ "npc", "menuArg0", "menuArg1", "menuArg2" ], - "descriptor" : "(Ljz;IIIB)V" - }, { - "method" : "addPlayerToMenu", - "owner" : "e", - "name" : "ik", - "access" : 24, - "parameters" : [ "player", "menuArg0", "menuArg1", "menuArg2" ], - "descriptor" : "(Lbr;IIII)V" - }, { - "method" : "addPlayerToScene", - "owner" : "aw", - "name" : "gk", - "access" : 8, - "parameters" : [ "player", "b" ], - "descriptor" : "(Lbr;ZI)V" - }, { - "method" : "alignWidget", - "owner" : "client", - "name" : "ip", - "access" : 0, - "parameters" : [ "widget" ], - "descriptor" : "(Lho;B)V" - }, { - "method" : "alignWidgetPosition", - "owner" : "jf", - "name" : "iw", - "access" : 8, - "parameters" : [ "widget", "parentWidth", "parentHeight" ], - "descriptor" : "(Lho;IIB)V" - }, { - "method" : "alignWidgetSize", - "owner" : "p", - "name" : "ic", - "access" : 8, - "parameters" : [ "widget", "parentWidth", "parentHeight", "b" ], - "descriptor" : "(Lho;IIZB)V" - }, { - "method" : "byteArrayFromObject", - "owner" : "dl", - "name" : "u", - "access" : 9, - "parameters" : [ "o", "copyArray" ], - "descriptor" : "(Ljava/lang/Object;ZB)[B" - }, { - "method" : "byteArrayToObject", - "owner" : "cb", - "name" : "o", - "access" : 9, - "parameters" : [ "bytes", "copyArray" ], - "descriptor" : "([BZB)Ljava/lang/Object;" - }, { - "method" : "charToByteCp1252", - "owner" : "cr", - "name" : "m", - "access" : 9, - "parameters" : [ "c" ], - "descriptor" : "(CI)B" - }, { - "method" : "clearIntArray", - "owner" : "hh", - "name" : "x", - "access" : 9, - "descriptor" : "([III)V" - }, { - "method" : "clickWidget", - "owner" : "cq", - "name" : "jf", - "access" : 24, - "parameters" : [ "widget", "x", "y" ], - "descriptor" : "(Lho;III)V" - }, { - "method" : "closeWidgetGroup", - "owner" : "cs", - "name" : "jd", - "access" : 24, - "parameters" : [ "w", "b" ], - "descriptor" : "(Lbx;ZI)V" - }, { - "method" : "colorStartTag", - "owner" : "dy", - "name" : "f", - "access" : 8, - "parameters" : [ "color" ], - "descriptor" : "(II)Ljava/lang/String;" - }, { - "method" : "compareWorlds", - "owner" : "aj", - "name" : "u", - "access" : 8, - "parameters" : [ "w0", "w1", "mode", "b" ], - "descriptor" : "(Lbt;Lbt;IZI)I" - }, { - "method" : "currentTimeMs", - "owner" : "ga", - "name" : "m", - "access" : 41, - "parameters" : [ ], - "descriptor" : "(I)J" - }, { - "method" : "decodeStringCp1252", - "owner" : "bx", - "name" : "o", - "access" : 9, - "parameters" : [ "src", "srcStart", "length" ], - "descriptor" : "([BIII)Ljava/lang/String;" - }, { - "method" : "decompressBytes", - "owner" : "id", - "name" : "ay", - "access" : 24, - "descriptor" : "([BI)[B" - }, { - "method" : "doCycle", - "owner" : "client", - "name" : "al", - "access" : 20, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "doCycleJs5", - "owner" : "client", - "name" : "ef", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "doCycleJs5Connect", - "owner" : "client", - "name" : "ev", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "doCycleLoggedIn", - "owner" : "client", - "name" : "fx", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "doCycleLoggedOut", - "owner" : "client", - "name" : "fg", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(B)V" - }, { - "method" : "draw", - "owner" : "client", - "name" : "ab", - "access" : 20, - "descriptor" : "(ZI)V" - }, { - "method" : "drawActor2d", - "owner" : "at", - "name" : "gr", - "access" : 24, - "parameters" : [ "actor", "a", "b", "c", "d", "e" ], - "descriptor" : "(Lbz;IIIIIB)V" - }, { - "method" : "drawLoadingMessage", - "owner" : "bi", - "name" : "gl", - "access" : 24, - "descriptor" : "(Ljava/lang/String;ZI)V" - }, { - "method" : "drawLoggedIn", - "owner" : "client", - "name" : "gs", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "drawTitle", - "owner" : "bd", - "name" : "x", - "access" : 8, - "descriptor" : "(Lkk;Lkk;Lkk;I)V" - }, { - "method" : "drawWidgetGroup", - "owner" : "az", - "name" : "ir", - "access" : 24, - "descriptor" : "([Lho;IIIIIIIII)V" - }, { - "method" : "encodeStringCp1252", - "owner" : "dt", - "name" : "w", - "access" : 9, - "parameters" : [ "src", "srcStart", "srcEnd", "dst", "dstStart" ], - "descriptor" : "(Ljava/lang/CharSequence;II[BII)I" - }, { - "method" : "escapeBrackets", - "owner" : "kt", - "name" : "s", - "access" : 9, - "parameters" : [ "s" ], - "descriptor" : "(Ljava/lang/String;)Ljava/lang/String;" - }, { - "method" : "findEnumerated", - "owner" : "bn", - "name" : "m", - "access" : 9, - "parameters" : [ "values", "ordinal" ], - "descriptor" : "([Lgc;II)Lgc;" - }, { - "method" : "getFrames", - "owner" : "bc", - "name" : "x", - "access" : 8, - "parameters" : [ "id" ], - "descriptor" : "(II)Len;" - }, { - "method" : "getHitSplatDefinition", - "owner" : "bp", - "name" : "f", - "access" : 9, - "parameters" : [ "id" ], - "descriptor" : "(II)Ljm;" - }, { - "method" : "getItemDefinition", - "owner" : "hc", - "name" : "m", - "access" : 9, - "parameters" : [ "id" ], - "descriptor" : "(II)Ljv;" - }, { - "method" : "getItemSprite", - "owner" : "ht", - "name" : "d", - "access" : 25, - "parameters" : [ "id", "quantity", "n0", "n1", "n2", "b0" ], - "descriptor" : "(IIIIIZI)Lln;" - }, { - "method" : "getKitDefinition", - "owner" : "as", - "name" : "m", - "access" : 9, - "descriptor" : "(II)Lim;" - }, { - "method" : "getNpcDefinition", - "owner" : "jr", - "name" : "f", - "access" : 9, - "parameters" : [ "id" ], - "descriptor" : "(II)Ljz;" - }, { - "method" : "getObjectDefinition", - "owner" : "af", - "name" : "f", - "access" : 9, - "parameters" : [ "id" ], - "descriptor" : "(II)Ljr;" - }, { - "method" : "getParamKeyDefinition", - "owner" : "hz", - "name" : "m", - "access" : 9, - "parameters" : [ "id" ], - "descriptor" : "(IB)Ljb;" - }, { - "method" : "getPreferencesFile", - "owner" : "gl", - "name" : "q", - "access" : 9, - "descriptor" : "(Ljava/lang/String;Ljava/lang/String;ZS)Ldk;" - }, { - "method" : "getSequenceDefinition", - "owner" : "ae", - "name" : "m", - "access" : 9, - "descriptor" : "(II)Ljh;" - }, { - "method" : "getSpotAnimationDefinition", - "owner" : "af", - "name" : "m", - "access" : 9, - "descriptor" : "(IB)Lio;" - }, { - "method" : "getTileHeight", - "owner" : "ay", - "name" : "gu", - "access" : 24, - "descriptor" : "(IIII)I" - }, { - "method" : "getVarbit", - "owner" : "ah", - "name" : "m", - "access" : 9, - "parameters" : [ "id" ], - "descriptor" : "(II)I" - }, { - "method" : "getWidget", - "owner" : "gd", - "name" : "m", - "access" : 9, - "parameters" : [ "id" ], - "descriptor" : "(IB)Lho;" - }, { - "method" : "getWidgetChild", - "owner" : "gx", - "name" : "f", - "access" : 9, - "descriptor" : "(III)Lho;" - }, { - "method" : "getWidgetClickMask", - "owner" : "f", - "name" : "kp", - "access" : 8, - "parameters" : [ "widget" ], - "descriptor" : "(Lho;I)I" - }, { - "method" : "getWorldMapElement", - "owner" : "dm", - "name" : "m", - "access" : 9, - "parameters" : [ "id" ], - "descriptor" : "(IB)Lic;" - }, { - "method" : "hashString", - "owner" : "client", - "name" : "l", - "access" : 9, - "parameters" : [ "chars" ], - "descriptor" : "(Ljava/lang/CharSequence;I)I" - }, { - "method" : "init", - "owner" : "client", - "name" : "init", - "access" : 17, - "parameters" : [ ], - "descriptor" : "()V" - }, { - "method" : "insertMenuItem", - "owner" : "j", - "name" : "il", - "access" : 24, - "parameters" : [ "action", "targetName", "opcode", "arg0", "arg1", "arg2", "b" ], - "descriptor" : "(Ljava/lang/String;Ljava/lang/String;IIIIZB)V" - }, { - "method" : "itemContainerSetItem", - "owner" : "al", - "name" : "w", - "access" : 8, - "parameters" : [ "itemContainerId", "index", "itemId", "itemQuantity" ], - "descriptor" : "(IIIII)V" - }, { - "method" : "js5Error", - "owner" : "client", - "name" : "ea", - "access" : 0, - "parameters" : [ "code" ], - "descriptor" : "(IS)V" - }, { - "method" : "kill0", - "owner" : "client", - "name" : "ae", - "access" : 20, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "loadClassFromDescriptor", - "owner" : "iw", - "name" : "w", - "access" : 8, - "parameters" : [ "descriptor" ], - "descriptor" : "(Ljava/lang/String;I)Ljava/lang/Class;" - }, { - "method" : "loadRegions", - "owner" : "af", - "name" : "gc", - "access" : 24, - "parameters" : [ "isInInstance", "packetBuffer" ], - "descriptor" : "(ZLhx;B)V" - }, { - "method" : "loadTerrain", - "owner" : "e", - "name" : "o", - "access" : 24, - "parameters" : [ "buffer", "plane", "x", "y", "x0", "y0", "n" ], - "descriptor" : "(Lgr;IIIIIIB)V" - }, { - "method" : "loadWidgetGroup", - "owner" : "dr", - "name" : "q", - "access" : 9, - "parameters" : [ "widgetGroup" ], - "descriptor" : "(IB)Z" - }, { - "method" : "loadWorlds", - "owner" : "ji", - "name" : "m", - "access" : 8, - "parameters" : [ ], - "descriptor" : "(I)Z" - }, { - "method" : "menuAction", - "owner" : "bz", - "name" : "hb", - "access" : 24, - "parameters" : [ "argument1", "argument2", "opcode", "argument0", "action", "targetName", "mouseX", "mouseY" ], - "descriptor" : "(IIIILjava/lang/String;Ljava/lang/String;III)V" - }, { - "method" : "newIndexCache", - "owner" : "c", - "name" : "fw", - "access" : 8, - "descriptor" : "(IZZZB)Lit;" - }, { - "method" : "newPcmPlayer", - "owner" : "cq", - "name" : "aj", - "access" : 25, - "descriptor" : "(Lfz;III)Lco;" - }, { - "method" : "newScript", - "owner" : "ee", - "name" : "w", - "access" : 8, - "parameters" : [ "bytes" ], - "descriptor" : "([BI)Lcg;" - }, { - "method" : "openMenu", - "owner" : "client", - "name" : "hj", - "access" : 16, - "parameters" : [ "x", "y" ], - "descriptor" : "(IIB)V" - }, { - "method" : "queueSoundEffect", - "owner" : "ks", - "name" : "fv", - "access" : 8, - "descriptor" : "(IIIB)V" - }, { - "method" : "readMusicSample", - "owner" : "cd", - "name" : "e", - "access" : 8, - "descriptor" : "(Lir;II)Lcd;" - }, { - "method" : "readSoundEffect", - "owner" : "ci", - "name" : "m", - "access" : 9, - "descriptor" : "(Lir;II)Lci;" - }, { - "method" : "readSprite", - "owner" : "le", - "name" : "m", - "access" : 9, - "parameters" : [ "indexCache", "index", "record" ], - "descriptor" : "(Lir;III)Lln;" - }, { - "method" : "readStringIntParameters", - "owner" : "ir", - "name" : "m", - "access" : 24, - "parameters" : [ "buffer", "hashTable" ], - "descriptor" : "(Lgr;Llh;I)Llh;" - }, { - "method" : "readTrack", - "owner" : "he", - "name" : "m", - "access" : 9, - "descriptor" : "(Lir;II)Lhe;" - }, { - "method" : "requestNetFile", - "owner" : "hx", - "name" : "f", - "access" : 8, - "descriptor" : "(Lit;IIIBZI)V" - }, { - "method" : "runCs1", - "owner" : "il", - "name" : "im", - "access" : 24, - "parameters" : [ "widget" ], - "descriptor" : "(Lho;I)Z" - }, { - "method" : "runScript", - "owner" : "ir", - "name" : "m", - "access" : 9, - "parameters" : [ "scriptEvent" ], - "descriptor" : "(Lby;S)V" - }, { - "method" : "runScript0", - "owner" : "l", - "name" : "f", - "access" : 8, - "parameters" : [ "scriptEvent", "n" ], - "descriptor" : "(Lby;II)V" - }, { - "method" : "sendStackTrace", - "owner" : "jz", - "name" : "m", - "access" : 9, - "descriptor" : "(Ljava/lang/String;Ljava/lang/Throwable;I)V" - }, { - "method" : "setUp", - "owner" : "client", - "name" : "aw", - "access" : 20, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "setViewportShape", - "owner" : "kx", - "name" : "gg", - "access" : 24, - "parameters" : [ "x", "y", "width", "height", "clear" ], - "descriptor" : "(IIIIZI)V" - }, { - "method" : "updateExternalPlayer", - "owner" : "ie", - "name" : "o", - "access" : 8, - "descriptor" : "(Lhx;II)Z" - }, { - "method" : "updateGameState", - "owner" : "ba", - "name" : "ec", - "access" : 8, - "parameters" : [ "gameState" ], - "descriptor" : "(IB)V" - }, { - "method" : "updatePlayer", - "owner" : "k", - "name" : "m", - "access" : 24, - "descriptor" : "(Lhx;B)V" - }, { - "method" : "updateWidgetGroup", - "owner" : "il", - "name" : "jr", - "access" : 24, - "parameters" : [ "widgets", "parentId", "a", "b", "c", "d", "x", "y" ], - "descriptor" : "([Lho;IIIIIIII)V" - }, { - "method" : "username", - "owner" : "client", - "name" : "kr", - "access" : 1, - "descriptor" : "(B)Lkp;" - }, { - "method" : "worldMap", - "owner" : "dy", - "name" : "er", - "access" : 8, - "descriptor" : "(I)Llz;" - }, { - "method" : "worldToMinimap", - "owner" : "ep", - "name" : "jk", - "access" : 24, - "descriptor" : "(IIIILln;Lhp;I)V" - }, { - "method" : "worldToScreen", - "owner" : "aj", - "name" : "gx", - "access" : 24, - "descriptor" : "(IIII)V" - }, { - "method" : "__au_135", - "owner" : "client", - "name" : "au", - "access" : 20, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__j_136", - "owner" : "client", - "name" : "j", - "access" : 20, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__ge_137", - "owner" : "client", - "name" : "ge", - "access" : 0, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__hg_138", - "owner" : "client", - "name" : "hg", - "access" : 16, - "parameters" : [ "arg0" ], - "descriptor" : "(Lcl;I)Z" - }, { - "method" : "__hi_139", - "owner" : "client", - "name" : "hi", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(I)V" - }, { - "method" : "__ht_140", - "owner" : "client", - "name" : "ht", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(B)Z" - }, { - "method" : "__iu_141", - "owner" : "client", - "name" : "iu", - "access" : 16, - "parameters" : [ "arg0" ], - "descriptor" : "(ZI)V" - }, { - "method" : "__jh_142", - "owner" : "client", - "name" : "jh", - "access" : 16, - "parameters" : [ ], - "descriptor" : "(I)V" - } ], - "constructors" : [ { - "access" : 1, - "descriptor" : "()V" - } ] -} ] \ No newline at end of file +[ + { + "access": 1057, + "class": "AbstractArchive", + "constructors": [ + { + "access": 0, + "descriptor": "(ZZ)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": 1694798923, + "descriptor": "I", + "field": "groupCount", + "name": "f", + "owner": "ir" + }, + { + "access": 0, + "descriptor": "Llv;", + "field": "groupNameHashTable", + "name": "o", + "owner": "ir" + }, + { + "access": 0, + "descriptor": "Z", + "field": "releaseGroups", + "name": "z", + "owner": "ir" + }, + { + "access": 0, + "descriptor": "Z", + "field": "shallowFiles", + "name": "j", + "owner": "ir" + }, + { + "access": 0, + "descriptor": "[I", + "field": "fileCounts", + "name": "l", + "owner": "ir" + }, + { + "access": 0, + "descriptor": "[I", + "field": "groupCrcs", + "name": "u", + "owner": "ir" + }, + { + "access": 0, + "descriptor": "[I", + "field": "groupIds", + "name": "q", + "owner": "ir" + }, + { + "access": 0, + "descriptor": "[I", + "field": "groupNameHashes", + "name": "w", + "owner": "ir" + }, + { + "access": 0, + "descriptor": "[I", + "field": "groupVersions", + "name": "g", + "owner": "ir" + }, + { + "access": 0, + "descriptor": "[Ljava/lang/Object;", + "field": "groups", + "name": "k", + "owner": "ir" + }, + { + "access": 0, + "descriptor": "[Llv;", + "field": "fileNameHashTables", + "name": "d", + "owner": "ir" + }, + { + "access": 0, + "descriptor": "[[I", + "field": "fileIds", + "name": "e", + "owner": "ir" + }, + { + "access": 0, + "descriptor": "[[I", + "field": "fileNameHashes", + "name": "x", + "owner": "ir" + }, + { + "access": 0, + "descriptor": "[[Ljava/lang/Object;", + "field": "files", + "name": "n", + "owner": "ir" + }, + { + "access": 1, + "decoder": -530370811, + "descriptor": "I", + "field": "hash", + "name": "a", + "owner": "ir" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(II)I", + "method": "groupLoadPercent", + "name": "e", + "owner": "ir" + }, + { + "access": 0, + "descriptor": "(II)V", + "method": "__f_392", + "name": "f", + "owner": "ir", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "(II)V", + "method": "loadGroup", + "name": "z", + "owner": "ir" + }, + { + "access": 0, + "descriptor": "(I[II)Z", + "method": "buildFiles", + "name": "c", + "owner": "ir", + "parameters": [ + "group", + "xteaKey" + ] + }, + { + "access": 0, + "descriptor": "([BB)V", + "method": "decodeIndex", + "name": "m", + "owner": "ir" + }, + { + "access": 1, + "descriptor": "(B)V", + "method": "__y_398", + "name": "y", + "owner": "ir", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__t_397", + "name": "t", + "owner": "ir", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "__b_400", + "name": "b", + "owner": "ir", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)Z", + "method": "__l_394", + "name": "l", + "owner": "ir", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(IB)[B", + "method": "getFileFlat", + "name": "a", + "owner": "ir", + "parameters": [ + "groupOrFile" + ] + }, + { + "access": 1, + "descriptor": "(IB)[I", + "method": "__j_395", + "name": "j", + "owner": "ir", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(II)I", + "method": "__s_396", + "name": "s", + "owner": "ir", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(II)V", + "method": "__h_399", + "name": "h", + "owner": "ir", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(II)Z", + "method": "__u_393", + "name": "u", + "owner": "ir", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(II)Z", + "method": "tryLoadGroup", + "name": "g", + "owner": "ir", + "parameters": [ + "group" + ] + }, + { + "access": 1, + "descriptor": "(III)Z", + "method": "tryLoadFile", + "name": "o", + "owner": "ir", + "parameters": [ + "file", + "group" + ] + }, + { + "access": 1, + "descriptor": "(III)[B", + "method": "getFile", + "name": "d", + "owner": "ir", + "parameters": [ + "file", + "group" + ] + }, + { + "access": 1, + "descriptor": "(III)[B", + "method": "takeFile", + "name": "q", + "owner": "ir", + "parameters": [ + "file", + "group" + ] + }, + { + "access": 1, + "descriptor": "(II[II)[B", + "method": "takeFileEncrypted", + "name": "w", + "owner": "ir", + "parameters": [ + "file", + "group", + "xteaKey" + ] + }, + { + "access": 1, + "descriptor": "(ILjava/lang/String;I)I", + "method": "getFileId", + "name": "v", + "owner": "ir", + "parameters": [ + "fileName", + "group" + ] + }, + { + "access": 1, + "descriptor": "(IS)[B", + "method": "takeFileFlat", + "name": "x", + "owner": "ir", + "parameters": [ + "groupOrFile" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/String;B)V", + "method": "__ar_402", + "name": "ar", + "owner": "ir", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/String;I)I", + "method": "getGroupId", + "name": "p", + "owner": "ir", + "parameters": [ + "groupName" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/String;I)I", + "method": "groupLoadPercentByName", + "name": "ac", + "owner": "ir", + "parameters": [ + "groupName" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/String;I)Z", + "method": "tryLoadGroupByName", + "name": "av", + "owner": "ir", + "parameters": [ + "groupName" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/String;Ljava/lang/String;B)Z", + "method": "__ag_401", + "name": "ag", + "owner": "ir", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/String;Ljava/lang/String;I)Z", + "method": "tryLoadFileByNames", + "name": "aj", + "owner": "ir", + "parameters": [ + "fileName", + "groupName" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/String;Ljava/lang/String;S)[B", + "method": "takeFileByNames", + "name": "aq", + "owner": "ir", + "parameters": [ + "fileName", + "groupName" + ] + } + ], + "name": "ir", + "super": "java.lang.Object" + }, + { + "access": 1057, + "class": "AbstractByteArrayCopier", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [], + "interfaces": [], + "methods": [ + { + "access": 1024, + "descriptor": "(I)[B", + "method": "get", + "name": "m", + "owner": "gu", + "parameters": [] + }, + { + "access": 1024, + "descriptor": "([BI)V", + "method": "set", + "name": "f", + "owner": "gu", + "parameters": [ + "array" + ] + } + ], + "name": "gu", + "super": "java.lang.Object" + }, + { + "access": 1057, + "class": "AbstractFont", + "constructors": [ + { + "access": 0, + "descriptor": "([B)V" + }, + { + "access": 0, + "descriptor": "([B[I[I[I[I[I[[B)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "[B", + "field": "kerning", + "name": "d", + "owner": "kt" + }, + { + "access": 0, + "descriptor": "[I", + "field": "advances", + "name": "f", + "owner": "kt" + }, + { + "access": 0, + "descriptor": "[I", + "field": "heights", + "name": "w", + "owner": "kt" + }, + { + "access": 0, + "descriptor": "[I", + "field": "leftBearings", + "name": "o", + "owner": "kt" + }, + { + "access": 0, + "descriptor": "[I", + "field": "topBearings", + "name": "u", + "owner": "kt" + }, + { + "access": 0, + "descriptor": "[I", + "field": "widths", + "name": "q", + "owner": "kt" + }, + { + "access": 0, + "descriptor": "[[B", + "field": "pixels", + "name": "m", + "owner": "kt" + }, + { + "access": 1, + "descriptor": "I", + "field": "ascent", + "name": "g", + "owner": "kt" + }, + { + "access": 1, + "descriptor": "I", + "field": "maxAscent", + "name": "l", + "owner": "kt" + }, + { + "access": 1, + "descriptor": "I", + "field": "maxDescent", + "name": "e", + "owner": "kt" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(C)I", + "method": "charWidth", + "name": "x", + "owner": "kt", + "parameters": [ + "c" + ] + }, + { + "access": 0, + "descriptor": "(II)V", + "method": "reset", + "name": "aj", + "owner": "kt", + "parameters": [ + "color", + "shadow" + ] + }, + { + "access": 0, + "descriptor": "(Ljava/lang/String;)V", + "method": "decodeTag", + "name": "av", + "owner": "kt", + "parameters": [ + "s" + ] + }, + { + "access": 0, + "descriptor": "(Ljava/lang/String;I)V", + "method": "calculateLineJustification", + "name": "ar", + "owner": "kt", + "parameters": [ + "lineWidth", + "s" + ] + }, + { + "access": 0, + "descriptor": "(Ljava/lang/String;II)V", + "method": "draw0", + "name": "ac", + "owner": "kt", + "parameters": [ + "s", + "x", + "y" + ] + }, + { + "access": 0, + "descriptor": "(Ljava/lang/String;II[I[I)V", + "method": "drawWithOffsets0", + "name": "ay", + "owner": "kt", + "parameters": [ + "s", + "x", + "xs", + "y", + "ys" + ] + }, + { + "access": 0, + "descriptor": "([B)V", + "method": "readMetrics", + "name": "l", + "owner": "kt", + "parameters": [ + "bytes" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/String;)I", + "method": "stringWidth", + "name": "d", + "owner": "kt", + "parameters": [ + "s" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/String;I)I", + "method": "lineCount", + "name": "j", + "owner": "kt", + "parameters": [ + "lineWidth", + "s" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/String;I)I", + "method": "lineWidth", + "name": "z", + "owner": "kt", + "parameters": [ + "lineWidth", + "s" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/String;IIII)V", + "method": "draw", + "name": "t", + "owner": "kt", + "parameters": [ + "color", + "s", + "shadow", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/String;IIII)V", + "method": "drawCentered", + "name": "b", + "owner": "kt", + "parameters": [ + "color", + "s", + "shadow", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/String;IIII)V", + "method": "drawRightAligned", + "name": "h", + "owner": "kt", + "parameters": [ + "color", + "s", + "shadow", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/String;IIIII)V", + "method": "drawAlpha", + "name": "y", + "owner": "kt", + "parameters": [ + "alpha", + "color", + "s", + "shadow", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/String;IIIII)V", + "method": "drawCenteredWave", + "name": "p", + "owner": "kt", + "parameters": [ + "color", + "s", + "seed", + "shadow", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/String;IIIII)V", + "method": "drawCenteredWave2", + "name": "v", + "owner": "kt", + "parameters": [ + "color", + "s", + "seed", + "shadow", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/String;IIIII)V", + "method": "drawRandomAlphaAndSpacing", + "name": "aq", + "owner": "kt", + "parameters": [ + "color", + "s", + "seed", + "shadow", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/String;IIIIII)V", + "method": "drawCenteredShake", + "name": "ag", + "owner": "kt", + "parameters": [ + "color", + "s", + "seed", + "seed2", + "shadow", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/String;IIIIIIIII)I", + "method": "drawLines", + "name": "c", + "owner": "kt", + "parameters": [ + "color", + "height", + "lineHeight", + "s", + "shadow", + "width", + "x", + "xAlignment", + "y", + "yAlignment" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/String;[I[Ljava/lang/String;)I", + "method": "breakLines", + "name": "a", + "owner": "kt", + "parameters": [ + "lineWidths", + "linesDst", + "s" + ] + }, + { + "access": 1024, + "descriptor": "([BIIIII)V", + "method": "drawGlyph", + "name": "m", + "owner": "kt", + "parameters": [ + "color", + "height", + "pixels", + "width", + "x", + "y" + ] + }, + { + "access": 1024, + "descriptor": "([BIIIIII)V", + "method": "drawGlyphAlpha", + "name": "f", + "owner": "kt", + "parameters": [ + "alpha", + "color", + "height", + "pixels", + "width", + "x", + "y" + ] + } + ], + "name": "kt", + "super": "lf" + }, + { + "access": 1057, + "class": "AbstractRasterProvider", + "constructors": [ + { + "access": 4, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 1, + "decoder": -239960145, + "descriptor": "I", + "field": "height", + "name": "o", + "owner": "lp" + }, + { + "access": 1, + "decoder": -560298363, + "descriptor": "I", + "field": "width", + "name": "w", + "owner": "lp" + }, + { + "access": 1, + "descriptor": "[I", + "field": "pixels", + "name": "q", + "owner": "lp" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1025, + "descriptor": "(III)V", + "method": "drawFull", + "name": "f", + "owner": "lp", + "parameters": [ + "x", + "y" + ] + }, + { + "access": 1025, + "descriptor": "(IIIIB)V", + "method": "draw", + "name": "q", + "owner": "lp", + "parameters": [ + "height", + "width", + "x", + "y" + ] + }, + { + "access": 17, + "descriptor": "(I)V", + "method": "apply", + "name": "b", + "owner": "lp", + "parameters": [] + } + ], + "name": "lp", + "super": "java.lang.Object" + }, + { + "access": 1057, + "class": "AbstractSocket", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [], + "interfaces": [], + "methods": [ + { + "access": 1025, + "descriptor": "(I)I", + "method": "available", + "name": "q", + "owner": "fu", + "parameters": [] + }, + { + "access": 1025, + "descriptor": "(I)I", + "method": "readUnsignedByte", + "name": "w", + "owner": "fu", + "parameters": [] + }, + { + "access": 1025, + "descriptor": "(I)V", + "method": "close", + "name": "g", + "owner": "fu", + "parameters": [] + }, + { + "access": 1025, + "descriptor": "(II)Z", + "method": "isAvailable", + "name": "f", + "owner": "fu", + "parameters": [ + "length" + ] + }, + { + "access": 1025, + "descriptor": "([BIIB)V", + "method": "write", + "name": "u", + "owner": "fu", + "parameters": [ + "length", + "src", + "srcIndex" + ] + }, + { + "access": 1025, + "descriptor": "([BIII)I", + "method": "read", + "name": "o", + "owner": "fu", + "parameters": [ + "dst", + "dstIndex", + "length" + ] + } + ], + "name": "fu", + "super": "java.lang.Object" + }, + { + "access": 1057, + "class": "AbstractSound", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "I", + "field": "position", + "name": "u", + "owner": "dd" + } + ], + "interfaces": [], + "methods": [], + "name": "dd", + "super": "gw" + }, + { + "access": 1057, + "class": "AbstractUserComparator", + "constructors": [ + { + "access": 4, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Ljava/util/Comparator;", + "field": "__f", + "name": "f", + "owner": "kf" + } + ], + "interfaces": [ + "java.util.Comparator" + ], + "methods": [ + { + "access": 1, + "descriptor": "(Ljava/lang/Object;)Z", + "method": "__equals_462", + "name": "equals", + "owner": "kf", + "parameters": [ + "arg0" + ] + }, + { + "access": 16, + "descriptor": "(Ljava/util/Comparator;B)V", + "method": "__e_460", + "name": "e", + "owner": "kf", + "parameters": [ + "arg0" + ] + }, + { + "access": 20, + "descriptor": "(Ljs;Ljs;I)I", + "method": "__x_461", + "name": "x", + "owner": "kf", + "parameters": [ + "arg0", + "arg1" + ] + } + ], + "name": "kf", + "super": "java.lang.Object" + }, + { + "access": 1057, + "class": "AbstractWorldMapIcon", + "constructors": [ + { + "access": 0, + "descriptor": "(Lhu;Lhu;)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1065362217, + "descriptor": "I", + "field": "__x", + "name": "x", + "owner": "ak" + }, + { + "access": 0, + "decoder": -521086143, + "descriptor": "I", + "field": "__e", + "name": "e", + "owner": "ak" + }, + { + "access": 17, + "descriptor": "Lhu;", + "field": "coord1", + "name": "l", + "owner": "ak" + }, + { + "access": 17, + "descriptor": "Lhu;", + "field": "coord2", + "name": "g", + "owner": "ak" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)Z", + "method": "__h_67", + "name": "h", + "owner": "ak", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(IIB)Z", + "method": "__y_66", + "name": "y", + "owner": "ak", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 0, + "descriptor": "(III)Z", + "method": "__b_68", + "name": "b", + "owner": "ak", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 0, + "descriptor": "(III)Z", + "method": "__c_69", + "name": "c", + "owner": "ak", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1024, + "descriptor": "(B)I", + "method": "__q_71", + "name": "q", + "owner": "ak", + "parameters": [] + }, + { + "access": 1024, + "descriptor": "(I)I", + "method": "__w_70", + "name": "w", + "owner": "ak", + "parameters": [] + }, + { + "access": 1024, + "descriptor": "(I)Laj;", + "method": "label", + "name": "f", + "owner": "ak", + "parameters": [] + }, + { + "access": 1025, + "descriptor": "(I)I", + "method": "element", + "name": "m", + "owner": "ak", + "parameters": [] + } + ], + "name": "ak", + "super": "java.lang.Object" + }, + { + "access": 1057, + "class": "Actor", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1119758739, + "descriptor": "I", + "field": "movementFrame", + "name": "bx", + "owner": "bz" + }, + { + "access": 0, + "decoder": -1189634367, + "descriptor": "I", + "field": "orientation", + "name": "cs", + "owner": "bz" + }, + { + "access": 0, + "decoder": -134491649, + "descriptor": "I", + "field": "sequenceDelay", + "name": "br", + "owner": "bz" + }, + { + "access": 0, + "decoder": -1357622739, + "descriptor": "I", + "field": "size", + "name": "ah", + "owner": "bz" + }, + { + "access": 0, + "decoder": -1387109107, + "descriptor": "I", + "field": "targetIndex", + "name": "bk", + "owner": "bz" + }, + { + "access": 0, + "decoder": -1523249259, + "descriptor": "I", + "field": "__bj", + "name": "bj", + "owner": "bz" + }, + { + "access": 0, + "decoder": -1573449469, + "descriptor": "I", + "field": "x", + "name": "av", + "owner": "bz" + }, + { + "access": 0, + "decoder": -1583514013, + "descriptor": "I", + "field": "__cq", + "name": "cq", + "owner": "bz" + }, + { + "access": 0, + "decoder": -1598871111, + "descriptor": "I", + "field": "walkBackSequence", + "name": "at", + "owner": "bz" + }, + { + "access": 0, + "decoder": -1630403001, + "descriptor": "I", + "field": "__bw", + "name": "bw", + "owner": "bz" + }, + { + "access": 0, + "decoder": -1646413227, + "descriptor": "I", + "field": "movementFrameCycle", + "name": "by", + "owner": "bz" + }, + { + "access": 0, + "decoder": -1723834619, + "descriptor": "I", + "field": "__cv", + "name": "cv", + "owner": "bz" + }, + { + "access": 0, + "decoder": -1753867715, + "descriptor": "I", + "field": "sequenceFrameCycle", + "name": "bl", + "owner": "bz" + }, + { + "access": 0, + "decoder": -1857513783, + "descriptor": "I", + "field": "__bv", + "name": "bv", + "owner": "bz" + }, + { + "access": 0, + "decoder": -1905191799, + "descriptor": "I", + "field": "overheadTextColor", + "name": "ao", + "owner": "bz" + }, + { + "access": 0, + "decoder": -2033082375, + "descriptor": "I", + "field": "pathLength", + "name": "cu", + "owner": "bz" + }, + { + "access": 0, + "decoder": -2075997699, + "descriptor": "I", + "field": "walkSequence", + "name": "ae", + "owner": "bz" + }, + { + "access": 0, + "decoder": -2125404733, + "descriptor": "I", + "field": "spotAnimationFrame", + "name": "bz", + "owner": "bz" + }, + { + "access": 0, + "decoder": -220610999, + "descriptor": "I", + "field": "spotAnimation", + "name": "bi", + "owner": "bz" + }, + { + "access": 0, + "decoder": -257240117, + "descriptor": "I", + "field": "walkRightSequence", + "name": "ap", + "owner": "bz" + }, + { + "access": 0, + "decoder": -299122235, + "descriptor": "I", + "field": "readySequence", + "name": "aw", + "owner": "bz" + }, + { + "access": 0, + "decoder": -336931157, + "descriptor": "I", + "field": "__cj", + "name": "cj", + "owner": "bz" + }, + { + "access": 0, + "decoder": -568830521, + "descriptor": "I", + "field": "walkLeftSequence", + "name": "ad", + "owner": "bz" + }, + { + "access": 0, + "decoder": -779457309, + "descriptor": "I", + "field": "heightOffset", + "name": "bp", + "owner": "bz" + }, + { + "access": 0, + "decoder": -831787909, + "descriptor": "I", + "field": "turnLeftSequence", + "name": "al", + "owner": "bz" + }, + { + "access": 0, + "decoder": 1003085333, + "descriptor": "I", + "field": "defaultHeight", + "name": "cy", + "owner": "bz" + }, + { + "access": 0, + "decoder": 1252341007, + "descriptor": "I", + "field": "__cm", + "name": "cm", + "owner": "bz" + }, + { + "access": 0, + "decoder": 1367256299, + "descriptor": "I", + "field": "__cr", + "name": "cr", + "owner": "bz" + }, + { + "access": 0, + "decoder": 137508815, + "descriptor": "I", + "field": "overheadTextCyclesRemaining", + "name": "au", + "owner": "bz" + }, + { + "access": 0, + "decoder": 139384875, + "descriptor": "I", + "field": "__bc", + "name": "bc", + "owner": "bz" + }, + { + "access": 0, + "decoder": 141226463, + "descriptor": "I", + "field": "playerCycle", + "name": "ak", + "owner": "bz" + }, + { + "access": 0, + "decoder": 1425662251, + "descriptor": "I", + "field": "sequenceFrame", + "name": "bm", + "owner": "bz" + }, + { + "access": 0, + "decoder": 1439711403, + "descriptor": "I", + "field": "__ac", + "name": "ac", + "owner": "bz" + }, + { + "access": 0, + "decoder": 1584102533, + "descriptor": "I", + "field": "__ch", + "name": "ch", + "owner": "bz" + }, + { + "access": 0, + "decoder": 1614854211, + "descriptor": "I", + "field": "movementSequence", + "name": "bo", + "owner": "bz" + }, + { + "access": 0, + "decoder": 1708570917, + "descriptor": "I", + "field": "runSequence", + "name": "as", + "owner": "bz" + }, + { + "access": 0, + "decoder": 1788714977, + "descriptor": "I", + "field": "turnRightSequence", + "name": "ab", + "owner": "bz" + }, + { + "access": 0, + "decoder": 2051334073, + "descriptor": "I", + "field": "npcCycle", + "name": "ce", + "owner": "bz" + }, + { + "access": 0, + "decoder": 2121599561, + "descriptor": "I", + "field": "__bf", + "name": "bf", + "owner": "bz" + }, + { + "access": 0, + "decoder": 280591281, + "descriptor": "I", + "field": "__bh", + "name": "bh", + "owner": "bz" + }, + { + "access": 0, + "decoder": 323216015, + "descriptor": "I", + "field": "sequence", + "name": "bu", + "owner": "bz" + }, + { + "access": 0, + "decoder": 330334599, + "descriptor": "I", + "field": "spotAnimationFrameCycle", + "name": "bg", + "owner": "bz" + }, + { + "access": 0, + "decoder": 541000549, + "descriptor": "I", + "field": "overheadTextEffect", + "name": "aa", + "owner": "bz" + }, + { + "access": 0, + "decoder": 676600595, + "descriptor": "I", + "field": "y", + "name": "ar", + "owner": "bz" + }, + { + "access": 0, + "decoder": 837989037, + "descriptor": "I", + "field": "__be", + "name": "be", + "owner": "bz" + }, + { + "access": 0, + "decoder": 886371765, + "descriptor": "I", + "field": "__bt", + "name": "bt", + "owner": "bz" + }, + { + "access": 0, + "descriptor": "B", + "field": "hitmarkCount", + "name": "af", + "owner": "bz" + }, + { + "access": 0, + "descriptor": "Lja;", + "field": "healthBars", + "name": "bn", + "owner": "bz" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "overheadText", + "name": "am", + "owner": "bz" + }, + { + "access": 0, + "descriptor": "Z", + "field": "__ay", + "name": "ay", + "owner": "bz" + }, + { + "access": 0, + "descriptor": "Z", + "field": "__az", + "name": "az", + "owner": "bz" + }, + { + "access": 0, + "descriptor": "Z", + "field": "false0", + "name": "bd", + "owner": "bz" + }, + { + "access": 0, + "descriptor": "Z", + "field": "isAutoChatting", + "name": "an", + "owner": "bz" + }, + { + "access": 0, + "descriptor": "[B", + "field": "pathTraversed", + "name": "cn", + "owner": "bz" + }, + { + "access": 0, + "descriptor": "[I", + "field": "hitmarkCycles", + "name": "bb", + "owner": "bz" + }, + { + "access": 0, + "descriptor": "[I", + "field": "hitmarkTypes", + "name": "ai", + "owner": "bz" + }, + { + "access": 0, + "descriptor": "[I", + "field": "hitmarkTypes2", + "name": "bs", + "owner": "bz" + }, + { + "access": 0, + "descriptor": "[I", + "field": "hitmarkValues", + "name": "ba", + "owner": "bz" + }, + { + "access": 0, + "descriptor": "[I", + "field": "hitmarkValues2", + "name": "bq", + "owner": "bz" + }, + { + "access": 0, + "descriptor": "[I", + "field": "pathX", + "name": "cb", + "owner": "bz" + }, + { + "access": 0, + "descriptor": "[I", + "field": "pathY", + "name": "ck", + "owner": "bz" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(B)Z", + "method": "isVisible", + "name": "z", + "owner": "bz", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(I)V", + "method": "__bb_143", + "name": "bb", + "owner": "bz", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(IIIIIIB)V", + "method": "addHealthBar", + "name": "bq", + "owner": "bz", + "parameters": [ + "cycle", + "healthBarDefinition", + "n0", + "n1", + "n2", + "n3" + ] + }, + { + "access": 16, + "descriptor": "(IIIIIII)V", + "method": "addHitmark", + "name": "bs", + "owner": "bz", + "parameters": [ + "cycle", + "cycle2", + "type", + "type2", + "value", + "value2" + ] + }, + { + "access": 16, + "descriptor": "(IS)V", + "method": "removeHealthBar", + "name": "bn", + "owner": "bz", + "parameters": [ + "healthBarDefinition" + ] + } + ], + "name": "bz", + "super": "ex" + }, + { + "access": 1057, + "class": "Clock", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [], + "interfaces": [], + "methods": [ + { + "access": 1025, + "descriptor": "(B)V", + "method": "mark", + "name": "m", + "owner": "fa", + "parameters": [] + }, + { + "access": 1025, + "descriptor": "(III)I", + "method": "wait", + "name": "f", + "owner": "fa", + "parameters": [ + "cycleMs", + "minSleepMs" + ] + } + ], + "name": "fa", + "super": "java.lang.Object" + }, + { + "access": 1057, + "class": "Entity", + "constructors": [ + { + "access": 4, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 1, + "decoder": 849583845, + "descriptor": "I", + "field": "height", + "name": "cw", + "owner": "ex" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(IIIIIIIIJ)V", + "method": "draw", + "name": "cy", + "owner": "ex", + "parameters": [ + "cameraPitchCosine", + "cameraPitchSine", + "cameraYawCosine", + "cameraYawSine", + "tag", + "x", + "y", + "yaw", + "z" + ] + }, + { + "access": 4, + "descriptor": "(I)Ldu;", + "method": "getModel", + "name": "e", + "owner": "ex", + "parameters": [] + } + ], + "name": "ex", + "super": "fn" + }, + { + "access": 1057, + "class": "GameShell", + "constructors": [ + { + "access": 4, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -2057041525, + "descriptor": "I", + "field": "contentHeight0", + "name": "ag", + "owner": "ba" + }, + { + "access": 0, + "decoder": -2071955075, + "descriptor": "I", + "field": "__aq", + "name": "aq", + "owner": "ba" + }, + { + "access": 0, + "decoder": 1911308233, + "descriptor": "I", + "field": "__aj", + "name": "aj", + "owner": "ba" + }, + { + "access": 0, + "decoder": 198681537, + "descriptor": "I", + "field": "canvasY", + "name": "c", + "owner": "ba" + }, + { + "access": 0, + "decoder": 740831949, + "descriptor": "I", + "field": "contentWidth0", + "name": "v", + "owner": "ba" + }, + { + "access": 0, + "decoder": 781373219, + "descriptor": "I", + "field": "canvasX", + "name": "b", + "owner": "ba" + }, + { + "access": 0, + "descriptor": "Lam;", + "field": "mouseWheelHandler", + "name": "ap", + "owner": "ba" + }, + { + "access": 0, + "descriptor": "Ljava/awt/Canvas;", + "field": "canvas", + "name": "ay", + "owner": "ba" + }, + { + "access": 0, + "descriptor": "Ljava/awt/Frame;", + "field": "frame", + "name": "ac", + "owner": "ba" + }, + { + "access": 0, + "descriptor": "Ljava/awt/datatransfer/Clipboard;", + "field": "clipboard", + "name": "as", + "owner": "ba" + }, + { + "access": 0, + "descriptor": "Z", + "field": "__al", + "name": "al", + "owner": "ba" + }, + { + "access": 0, + "descriptor": "Z", + "field": "hasErrored", + "name": "g", + "owner": "ba" + }, + { + "access": 16, + "descriptor": "Ljava/awt/EventQueue;", + "field": "eventQueue", + "name": "am", + "owner": "ba" + }, + { + "access": 4, + "decoder": -1854329683, + "descriptor": "I", + "field": "contentWidth", + "name": "t", + "owner": "ba" + }, + { + "access": 4, + "decoder": -628781469, + "descriptor": "I", + "field": "contentHeight", + "name": "h", + "owner": "ba" + }, + { + "access": 64, + "decoder": 956221087975405000, + "descriptor": "J", + "field": "canvasSetTimeMs", + "name": "ae", + "owner": "ba" + }, + { + "access": 64, + "descriptor": "Z", + "field": "__ah", + "name": "ah", + "owner": "ba" + }, + { + "access": 64, + "descriptor": "Z", + "field": "isCanvasInvalid", + "name": "ab", + "owner": "ba" + }, + { + "access": 8, + "decoder": 5666519919949402000, + "descriptor": "J", + "field": "stopTimeMs", + "name": "o", + "owner": "ba" + } + ], + "interfaces": [ + "java.awt.event.FocusListener", + "java.awt.event.WindowListener", + "java.lang.Runnable" + ], + "methods": [ + { + "access": 0, + "descriptor": "(B)V", + "method": "__ar_94", + "name": "ar", + "owner": "ba", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(B)V", + "method": "__av_93", + "name": "av", + "owner": "ba", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(B)V", + "method": "clearBackground", + "name": "p", + "owner": "ba", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)Ljava/awt/Container;", + "method": "container", + "name": "as", + "owner": "ba", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)Lla;", + "method": "getFrameContentBounds", + "name": "am", + "owner": "ba", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "run", + "name": "run", + "owner": "ba" + }, + { + "access": 1025, + "descriptor": "()V", + "method": "__init_109", + "name": "init", + "owner": "ba", + "parameters": [] + }, + { + "access": 1028, + "descriptor": "(I)V", + "method": "__al_111", + "name": "al", + "owner": "ba", + "parameters": [] + }, + { + "access": 1028, + "descriptor": "(I)V", + "method": "__au_110", + "name": "au", + "owner": "ba", + "parameters": [] + }, + { + "access": 1028, + "descriptor": "(I)V", + "method": "__j_113", + "name": "j", + "owner": "ba", + "parameters": [] + }, + { + "access": 1028, + "descriptor": "(I)V", + "method": "kill0", + "name": "ae", + "owner": "ba", + "parameters": [] + }, + { + "access": 1028, + "descriptor": "(I)V", + "method": "setUp", + "name": "aw", + "owner": "ba", + "parameters": [] + }, + { + "access": 1028, + "descriptor": "(ZI)V", + "method": "__ab_112", + "name": "ab", + "owner": "ba", + "parameters": [ + "arg0" + ] + }, + { + "access": 16, + "descriptor": "(I)V", + "method": "__ac_95", + "name": "ac", + "owner": "ba", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(I)V", + "method": "__ay_96", + "name": "ay", + "owner": "ba", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(I)V", + "method": "__z_92", + "name": "z", + "owner": "ba", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(I)V", + "method": "replaceCanvas", + "name": "v", + "owner": "ba", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(Ljava/lang/Object;I)V", + "method": "__g_91", + "name": "g", + "owner": "ba", + "parameters": [ + "arg0" + ] + }, + { + "access": 17, + "descriptor": "()V", + "method": "__destroy_99", + "name": "destroy", + "owner": "ba", + "parameters": [] + }, + { + "access": 17, + "descriptor": "()V", + "method": "__start_97", + "name": "start", + "owner": "ba", + "parameters": [] + }, + { + "access": 17, + "descriptor": "()V", + "method": "__stop_98", + "name": "stop", + "owner": "ba", + "parameters": [] + }, + { + "access": 17, + "descriptor": "(Ljava/awt/Graphics;)V", + "method": "update", + "name": "update", + "owner": "ba", + "parameters": [ + "g" + ] + }, + { + "access": 17, + "descriptor": "(Ljava/awt/event/FocusEvent;)V", + "method": "__focusLost_100", + "name": "focusLost", + "owner": "ba", + "parameters": [ + "arg0" + ] + }, + { + "access": 17, + "descriptor": "(Ljava/awt/event/FocusEvent;)V", + "method": "focusGained", + "name": "focusGained", + "owner": "ba" + }, + { + "access": 17, + "descriptor": "(Ljava/awt/event/WindowEvent;)V", + "method": "__windowActivated_101", + "name": "windowActivated", + "owner": "ba", + "parameters": [ + "arg0" + ] + }, + { + "access": 17, + "descriptor": "(Ljava/awt/event/WindowEvent;)V", + "method": "__windowClosed_102", + "name": "windowClosed", + "owner": "ba", + "parameters": [ + "arg0" + ] + }, + { + "access": 17, + "descriptor": "(Ljava/awt/event/WindowEvent;)V", + "method": "__windowClosing_103", + "name": "windowClosing", + "owner": "ba", + "parameters": [ + "arg0" + ] + }, + { + "access": 17, + "descriptor": "(Ljava/awt/event/WindowEvent;)V", + "method": "__windowDeactivated_104", + "name": "windowDeactivated", + "owner": "ba", + "parameters": [ + "arg0" + ] + }, + { + "access": 17, + "descriptor": "(Ljava/awt/event/WindowEvent;)V", + "method": "__windowDeiconified_105", + "name": "windowDeiconified", + "owner": "ba", + "parameters": [ + "arg0" + ] + }, + { + "access": 17, + "descriptor": "(Ljava/awt/event/WindowEvent;)V", + "method": "__windowIconified_106", + "name": "windowIconified", + "owner": "ba", + "parameters": [ + "arg0" + ] + }, + { + "access": 17, + "descriptor": "(Ljava/awt/event/WindowEvent;)V", + "method": "__windowOpened_107", + "name": "windowOpened", + "owner": "ba", + "parameters": [ + "arg0" + ] + }, + { + "access": 20, + "descriptor": "(B)Z", + "method": "checkHost", + "name": "aj", + "owner": "ba", + "parameters": [] + }, + { + "access": 20, + "descriptor": "(B)Z", + "method": "hasFrame", + "name": "an", + "owner": "ba", + "parameters": [] + }, + { + "access": 20, + "descriptor": "(I)V", + "method": "__ad_108", + "name": "ad", + "owner": "ba", + "parameters": [] + }, + { + "access": 20, + "descriptor": "(I)V", + "method": "setUpKeyboard", + "name": "d", + "owner": "ba", + "parameters": [] + }, + { + "access": 20, + "descriptor": "(I)V", + "method": "setUpMouse", + "name": "a", + "owner": "ba", + "parameters": [] + }, + { + "access": 20, + "descriptor": "(IIB)V", + "method": "__u_90", + "name": "u", + "owner": "ba", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 20, + "descriptor": "(IIII)V", + "method": "startThread", + "name": "ag", + "owner": "ba", + "parameters": [ + "height", + "revision", + "width" + ] + }, + { + "access": 20, + "descriptor": "(ILjava/lang/String;ZB)V", + "method": "drawInitial", + "name": "at", + "owner": "ba" + }, + { + "access": 4, + "descriptor": "(B)Lfv;", + "method": "mouseWheel", + "name": "l", + "owner": "ba", + "parameters": [] + }, + { + "access": 4, + "descriptor": "(I)V", + "method": "setUpClipboard", + "name": "e", + "owner": "ba", + "parameters": [] + }, + { + "access": 4, + "descriptor": "(Ljava/lang/String;B)V", + "method": "error", + "name": "ap", + "owner": "ba", + "parameters": [ + "type" + ] + }, + { + "access": 4, + "descriptor": "(Ljava/lang/String;I)V", + "method": "clipboardSetString", + "name": "x", + "owner": "ba", + "parameters": [ + "s" + ] + }, + { + "access": 48, + "descriptor": "(B)V", + "method": "addCanvas", + "name": "aq", + "owner": "ba", + "parameters": [] + }, + { + "access": 48, + "descriptor": "(I)V", + "method": "kill", + "name": "ah", + "owner": "ba", + "parameters": [] + }, + { + "access": 49, + "descriptor": "(Ljava/awt/Graphics;)V", + "method": "paint", + "name": "paint", + "owner": "ba", + "parameters": [ + "g" + ] + } + ], + "name": "ba", + "super": "java.applet.Applet" + }, + { + "access": 1057, + "class": "PcmStream", + "constructors": [ + { + "access": 4, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "I", + "field": "__s", + "name": "s", + "owner": "dc" + }, + { + "access": 0, + "descriptor": "Ldc;", + "field": "after", + "name": "j", + "owner": "dc" + }, + { + "access": 0, + "descriptor": "Ldd;", + "field": "sound", + "name": "t", + "owner": "dc" + }, + { + "access": 64, + "descriptor": "Z", + "field": "active", + "name": "w", + "owner": "dc" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "()I", + "method": "__az_209", + "name": "az", + "owner": "dc", + "parameters": [] + }, + { + "access": 1028, + "descriptor": "()I", + "method": "__l_210", + "name": "l", + "owner": "dc", + "parameters": [] + }, + { + "access": 1028, + "descriptor": "()Ldc;", + "method": "firstSubStream", + "name": "u", + "owner": "dc", + "parameters": [] + }, + { + "access": 1028, + "descriptor": "()Ldc;", + "method": "nextSubStream", + "name": "g", + "owner": "dc", + "parameters": [] + }, + { + "access": 1028, + "descriptor": "(I)V", + "method": "skip", + "name": "d", + "owner": "dc", + "parameters": [ + "length" + ] + }, + { + "access": 1028, + "descriptor": "([III)V", + "method": "fill", + "name": "e", + "owner": "dc", + "parameters": [ + "buffer", + "end", + "start" + ] + }, + { + "access": 16, + "descriptor": "([III)V", + "method": "update", + "name": "ef", + "owner": "dc", + "parameters": [ + "buffer", + "end", + "start" + ] + } + ], + "name": "dc", + "super": "gw" + }, + { + "access": 1057, + "class": "PcmStreamMixerListener", + "constructors": [], + "fields": [ + { + "access": 0, + "descriptor": "I", + "field": "__m", + "name": "m", + "owner": "df" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1024, + "descriptor": "()V", + "method": "remove2", + "name": "m", + "owner": "df", + "parameters": [] + }, + { + "access": 1024, + "descriptor": "(Lct;)I", + "method": "update", + "name": "f", + "owner": "df", + "parameters": [ + "mixer" + ] + } + ], + "name": "df", + "super": "gw" + }, + { + "access": 1057, + "class": "UserList", + "constructors": [ + { + "access": 0, + "descriptor": "(I)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -280101247, + "descriptor": "I", + "field": "size0", + "name": "o", + "owner": "km" + }, + { + "access": 0, + "descriptor": "Ljava/util/Comparator;", + "field": "comparator", + "name": "e", + "owner": "km" + }, + { + "access": 0, + "descriptor": "Ljava/util/HashMap;", + "field": "previousUsernamesMap", + "name": "l", + "owner": "km" + }, + { + "access": 0, + "descriptor": "Ljava/util/HashMap;", + "field": "usernamesMap", + "name": "g", + "owner": "km" + }, + { + "access": 0, + "descriptor": "[Ljs;", + "field": "array", + "name": "u", + "owner": "km" + }, + { + "access": 16, + "decoder": -2119868987, + "descriptor": "I", + "field": "capacity", + "name": "w", + "owner": "km" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lkp;I)Ljs;", + "method": "addLastNoPreviousUsername", + "name": "v", + "owner": "km", + "parameters": [ + "username" + ] + }, + { + "access": 0, + "descriptor": "(Lkp;I)Ljs;", + "method": "getByCurrentUsername", + "name": "h", + "owner": "km", + "parameters": [ + "username" + ] + }, + { + "access": 0, + "descriptor": "(Lkp;I)Ljs;", + "method": "getByPreviousUsername", + "name": "b", + "owner": "km", + "parameters": [ + "previousUsername" + ] + }, + { + "access": 0, + "descriptor": "(Lkp;Lkp;I)Ljs;", + "method": "addLast", + "name": "ag", + "owner": "km", + "parameters": [ + "previousUsername", + "username" + ] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "size", + "name": "j", + "owner": "km", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "clear", + "name": "z", + "owner": "km", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)Z", + "method": "isFull", + "name": "s", + "owner": "km", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(Lkp;I)Ljs;", + "method": "getByUsername", + "name": "y", + "owner": "km", + "parameters": [ + "username" + ] + }, + { + "access": 1, + "descriptor": "(Lkp;I)Z", + "method": "contains", + "name": "t", + "owner": "km", + "parameters": [ + "username" + ] + }, + { + "access": 1024, + "descriptor": "(I)Ljs;", + "method": "newInstance", + "name": "m", + "owner": "km", + "parameters": [] + }, + { + "access": 1024, + "descriptor": "(II)[Ljs;", + "method": "newTypedArray", + "name": "f", + "owner": "km", + "parameters": [ + "size" + ] + }, + { + "access": 16, + "descriptor": "(II)V", + "method": "arrayRemove", + "name": "ak", + "owner": "km", + "parameters": [ + "index" + ] + }, + { + "access": 16, + "descriptor": "(Ljs;B)V", + "method": "mapPut", + "name": "ah", + "owner": "km", + "parameters": [ + "user" + ] + }, + { + "access": 16, + "descriptor": "(Ljs;I)I", + "method": "indexOf", + "name": "ar", + "owner": "km", + "parameters": [ + "user" + ] + }, + { + "access": 16, + "descriptor": "(Ljs;I)V", + "method": "arrayAddLast", + "name": "ay", + "owner": "km", + "parameters": [ + "user" + ] + }, + { + "access": 16, + "descriptor": "(Ljs;I)V", + "method": "remove", + "name": "p", + "owner": "km", + "parameters": [ + "user" + ] + }, + { + "access": 16, + "descriptor": "(Ljs;Lkp;Lkp;B)V", + "method": "changeName", + "name": "av", + "owner": "km", + "parameters": [ + "previousUsername", + "user", + "username" + ] + }, + { + "access": 16, + "descriptor": "(Ljs;S)V", + "method": "mapRemove", + "name": "ac", + "owner": "km", + "parameters": [ + "user" + ] + }, + { + "access": 17, + "descriptor": "(I)V", + "method": "removeComparator", + "name": "aw", + "owner": "km", + "parameters": [] + }, + { + "access": 17, + "descriptor": "(I)V", + "method": "sort", + "name": "aj", + "owner": "km", + "parameters": [] + }, + { + "access": 17, + "descriptor": "(II)Ljs;", + "method": "get", + "name": "aq", + "owner": "km", + "parameters": [ + "index" + ] + }, + { + "access": 17, + "descriptor": "(Ljava/util/Comparator;B)V", + "method": "addComparator", + "name": "al", + "owner": "km", + "parameters": [ + "c" + ] + }, + { + "access": 17, + "descriptor": "(Lkp;S)Z", + "method": "removeByUsername", + "name": "c", + "owner": "km", + "parameters": [ + "username" + ] + } + ], + "name": "km", + "super": "java.lang.Object" + }, + { + "access": 1057, + "class": "Wrapper", + "constructors": [ + { + "access": 0, + "descriptor": "(I)V" + } + ], + "fields": [ + { + "access": 16, + "descriptor": "I", + "field": "size", + "name": "f", + "owner": "eu" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1024, + "descriptor": "()Ljava/lang/Object;", + "method": "get", + "name": "m", + "owner": "eu", + "parameters": [] + }, + { + "access": 1024, + "descriptor": "()Z", + "method": "isSoft", + "name": "f", + "owner": "eu", + "parameters": [] + } + ], + "name": "eu", + "super": "fn" + }, + { + "access": 1537, + "class": "ClientPacketMarker", + "constructors": [], + "fields": [], + "interfaces": [], + "methods": [], + "name": "gb", + "super": "java.lang.Object" + }, + { + "access": 1537, + "class": "Enumerated", + "constructors": [], + "fields": [], + "interfaces": [], + "methods": [ + { + "access": 1025, + "descriptor": "(B)I", + "method": "ordinal", + "name": "f", + "owner": "gc", + "parameters": [] + } + ], + "name": "gc", + "super": "java.lang.Object" + }, + { + "access": 1537, + "class": "MouseWheel", + "constructors": [], + "fields": [], + "interfaces": [], + "methods": [ + { + "access": 1025, + "descriptor": "(I)I", + "method": "useRotation", + "name": "q", + "owner": "fv", + "parameters": [] + } + ], + "name": "fv", + "super": "java.lang.Object" + }, + { + "access": 1537, + "class": "PcmPlayerProvider", + "constructors": [], + "fields": [], + "interfaces": [], + "methods": [ + { + "access": 1025, + "descriptor": "(B)Lco;", + "method": "player", + "name": "m", + "owner": "cz" + } + ], + "name": "cz", + "super": "java.lang.Object" + }, + { + "access": 1537, + "class": "PlatformInfoProvider", + "constructors": [], + "fields": [], + "interfaces": [], + "methods": [ + { + "access": 1025, + "descriptor": "(I)Llb;", + "method": "get", + "name": "m", + "owner": "lm", + "parameters": [] + } + ], + "name": "lm", + "super": "java.lang.Object" + }, + { + "access": 1537, + "class": "TextureLoader", + "constructors": [], + "fields": [], + "interfaces": [], + "methods": [ + { + "access": 1025, + "descriptor": "(IB)Z", + "method": "__o_259", + "name": "o", + "owner": "ei", + "parameters": [ + "arg0" + ] + }, + { + "access": 1025, + "descriptor": "(II)I", + "method": "__w_258", + "name": "w", + "owner": "ei", + "parameters": [ + "arg0" + ] + }, + { + "access": 1025, + "descriptor": "(II)Z", + "method": "isLowDetail", + "name": "u", + "owner": "ei" + }, + { + "access": 1025, + "descriptor": "(II)[I", + "method": "load", + "name": "q", + "owner": "ei" + } + ], + "name": "ei", + "super": "java.lang.Object" + }, + { + "access": 1537, + "class": "Usernamed", + "constructors": [], + "fields": [], + "interfaces": [], + "methods": [ + { + "access": 1025, + "descriptor": "(B)Lkp;", + "method": "username", + "name": "kr", + "owner": "ky" + } + ], + "name": "ky", + "super": "java.lang.Object" + }, + { + "access": 1537, + "class": "WorldMapSection", + "constructors": [], + "fields": [], + "interfaces": [], + "methods": [ + { + "access": 1025, + "descriptor": "(IIB)Z", + "method": "containsPosition", + "name": "q", + "owner": "ab", + "parameters": [ + "x", + "y" + ] + }, + { + "access": 1025, + "descriptor": "(III)Lhu;", + "method": "coord", + "name": "o", + "owner": "ab", + "parameters": [ + "x", + "y" + ] + }, + { + "access": 1025, + "descriptor": "(IIIB)Z", + "method": "containsCoord", + "name": "f", + "owner": "ab", + "parameters": [ + "plane", + "x", + "y" + ] + }, + { + "access": 1025, + "descriptor": "(IIII)[I", + "method": "position", + "name": "w", + "owner": "ab", + "parameters": [ + "plane", + "x", + "y" + ] + }, + { + "access": 1025, + "descriptor": "(Lag;I)V", + "method": "expandBounds", + "name": "m", + "owner": "ab", + "parameters": [ + "area" + ] + }, + { + "access": 1025, + "descriptor": "(Lgr;B)V", + "method": "read", + "name": "u", + "owner": "ab", + "parameters": [ + "buffer" + ] + } + ], + "name": "ab", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "Animation", + "constructors": [ + { + "access": 0, + "descriptor": "([BLek;)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "I", + "field": "transformCount", + "name": "u", + "owner": "dz" + }, + { + "access": 0, + "descriptor": "Lek;", + "field": "skeleton", + "name": "o", + "owner": "dz" + }, + { + "access": 0, + "descriptor": "Z", + "field": "hasAlphaTransform", + "name": "d", + "owner": "dz" + }, + { + "access": 0, + "descriptor": "[I", + "field": "transformSkeletonLabels", + "name": "g", + "owner": "dz" + }, + { + "access": 0, + "descriptor": "[I", + "field": "transformXs", + "name": "l", + "owner": "dz" + }, + { + "access": 0, + "descriptor": "[I", + "field": "transformYs", + "name": "e", + "owner": "dz" + }, + { + "access": 0, + "descriptor": "[I", + "field": "transformZs", + "name": "x", + "owner": "dz" + } + ], + "interfaces": [], + "methods": [], + "name": "dz", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "Archive", + "constructors": [ + { + "access": 1, + "descriptor": "(Lff;Lff;IZZZ)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1579549759, + "descriptor": "I", + "field": "index", + "name": "p", + "owner": "it" + }, + { + "access": 0, + "decoder": -1884661133, + "descriptor": "I", + "field": "__ac", + "name": "ac", + "owner": "it" + }, + { + "access": 0, + "decoder": -785528219, + "descriptor": "I", + "field": "indexVersion", + "name": "ar", + "owner": "it" + }, + { + "access": 0, + "decoder": 1472870917, + "descriptor": "I", + "field": "indexCrc", + "name": "av", + "owner": "it" + }, + { + "access": 0, + "descriptor": "Lff;", + "field": "archiveDisk", + "name": "c", + "owner": "it" + }, + { + "access": 0, + "descriptor": "Lff;", + "field": "masterDisk", + "name": "r", + "owner": "it" + }, + { + "access": 0, + "descriptor": "Z", + "field": "__ag", + "name": "ag", + "owner": "it" + }, + { + "access": 64, + "descriptor": "Z", + "field": "__v", + "name": "v", + "owner": "it" + }, + { + "access": 64, + "descriptor": "[Z", + "field": "validGroups", + "name": "aq", + "owner": "it" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)V", + "method": "loadAllLocal", + "name": "dt", + "owner": "it", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(II)I", + "method": "groupLoadPercent", + "name": "e", + "owner": "it" + }, + { + "access": 0, + "descriptor": "(II)V", + "method": "__f_406", + "name": "f", + "owner": "it", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "(II)V", + "method": "loadGroup", + "name": "z", + "owner": "it" + }, + { + "access": 0, + "descriptor": "(Lff;I[BZI)V", + "method": "load", + "name": "dx", + "owner": "it" + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__ca_405", + "name": "ca", + "owner": "it", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "loadPercent", + "name": "da", + "owner": "it" + }, + { + "access": 1, + "descriptor": "(I)Z", + "method": "__cx_404", + "name": "cx", + "owner": "it", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(IB)Z", + "method": "__dn_407", + "name": "dn", + "owner": "it", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(II)Z", + "method": "__df_408", + "name": "df", + "owner": "it", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(III)V", + "method": "loadIndex", + "name": "co", + "owner": "it" + }, + { + "access": 1, + "descriptor": "(I[BZZB)V", + "method": "write", + "name": "de", + "owner": "it" + } + ], + "name": "it", + "super": "ir" + }, + { + "access": 33, + "class": "ArchiveDiskAction", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1942326733, + "descriptor": "I", + "field": "type", + "name": "m", + "owner": "ik" + }, + { + "access": 0, + "descriptor": "Lff;", + "field": "archiveDisk", + "name": "q", + "owner": "ik" + }, + { + "access": 0, + "descriptor": "Lit;", + "field": "archive", + "name": "w", + "owner": "ik" + }, + { + "access": 0, + "descriptor": "[B", + "field": "data", + "name": "f", + "owner": "ik" + } + ], + "interfaces": [], + "methods": [], + "name": "ik", + "super": "gw" + }, + { + "access": 33, + "class": "ArchiveDiskActionHandler", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [], + "interfaces": [ + "java.lang.Runnable" + ], + "methods": [ + { + "access": 1, + "descriptor": "()V", + "method": "__run_403", + "name": "run", + "owner": "iv", + "parameters": [] + } + ], + "name": "iv", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "ArchiveLoader", + "constructors": [ + { + "access": 0, + "descriptor": "(Lit;Ljava/lang/String;)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": 782003089, + "descriptor": "I", + "field": "__w", + "name": "w", + "owner": "bd" + }, + { + "access": 16, + "decoder": 1459455501, + "descriptor": "I", + "field": "__q", + "name": "q", + "owner": "bd" + }, + { + "access": 16, + "descriptor": "Lit;", + "field": "archive", + "name": "f", + "owner": "bd" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)Z", + "method": "__m_122", + "name": "m", + "owner": "bd", + "parameters": [] + } + ], + "name": "bd", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "AttackOption", + "constructors": [ + { + "access": 0, + "descriptor": "(I)V" + } + ], + "fields": [ + { + "access": 16, + "decoder": -1461217963, + "descriptor": "I", + "field": "id", + "name": "o", + "owner": "cj" + } + ], + "interfaces": [ + "gc" + ], + "methods": [ + { + "access": 1, + "descriptor": "(B)I", + "method": "ordinal", + "name": "f", + "owner": "cj", + "parameters": [] + } + ], + "name": "cj", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "AudioFilter", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "[I", + "field": "__m", + "name": "m", + "owner": "di" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__o", + "name": "o", + "owner": "di" + }, + { + "access": 0, + "descriptor": "[[[I", + "field": "__q", + "name": "q", + "owner": "di" + }, + { + "access": 0, + "descriptor": "[[[I", + "field": "__w", + "name": "w", + "owner": "di" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(IF)I", + "method": "__w_207", + "name": "w", + "owner": "di", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 0, + "descriptor": "(IIF)F", + "method": "__m_205", + "name": "m", + "owner": "di", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 0, + "descriptor": "(IIF)F", + "method": "__q_206", + "name": "q", + "owner": "di", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 16, + "descriptor": "(Lgr;Lde;)V", + "method": "__o_208", + "name": "o", + "owner": "di", + "parameters": [ + "arg0", + "arg1" + ] + } + ], + "name": "di", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "Bounds", + "constructors": [ + { + "access": 1, + "descriptor": "(II)V" + }, + { + "access": 1, + "descriptor": "(IIII)V" + } + ], + "fields": [ + { + "access": 1, + "decoder": -1887298731, + "descriptor": "I", + "field": "__f", + "name": "f", + "owner": "la" + }, + { + "access": 1, + "decoder": -2004088829, + "descriptor": "I", + "field": "__m", + "name": "m", + "owner": "la" + }, + { + "access": 1, + "decoder": 1377856837, + "descriptor": "I", + "field": "__w", + "name": "w", + "owner": "la" + }, + { + "access": 1, + "decoder": 2001187823, + "descriptor": "I", + "field": "__q", + "name": "q", + "owner": "la" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(B)I", + "method": "__g_494", + "name": "g", + "owner": "la", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)I", + "method": "__u_493", + "name": "u", + "owner": "la", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(Lla;Lla;I)V", + "method": "__w_491", + "name": "w", + "owner": "la", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 0, + "descriptor": "(Lla;Lla;S)V", + "method": "__o_492", + "name": "o", + "owner": "la", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "()Ljava/lang/String;", + "method": "__toString_489", + "name": "toString", + "owner": "la", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(IIB)V", + "method": "__m_487", + "name": "m", + "owner": "la", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(III)V", + "method": "__f_488", + "name": "f", + "owner": "la", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(Lla;Lla;I)V", + "method": "__q_490", + "name": "q", + "owner": "la", + "parameters": [ + "arg0", + "arg1" + ] + } + ], + "name": "la", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "Buddy", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 1, + "decoder": -304954565, + "descriptor": "I", + "field": "rank", + "name": "g", + "owner": "ke" + }, + { + "access": 1, + "decoder": 120689297, + "descriptor": "I", + "field": "int2", + "name": "u", + "owner": "ke" + }, + { + "access": 1, + "decoder": 429472919, + "descriptor": "I", + "field": "world0", + "name": "o", + "owner": "ke" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(IIS)V", + "method": "set", + "name": "an", + "owner": "ke" + }, + { + "access": 1, + "descriptor": "(B)I", + "method": "world", + "name": "az", + "owner": "ke", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)Z", + "method": "hasWorld", + "name": "au", + "owner": "ke", + "parameters": [] + } + ], + "name": "ke", + "super": "js" + }, + { + "access": 33, + "class": "Buffer", + "constructors": [ + { + "access": 1, + "descriptor": "(I)V" + }, + { + "access": 1, + "descriptor": "([B)V" + } + ], + "fields": [ + { + "access": 1, + "decoder": -271438207, + "descriptor": "I", + "field": "index", + "name": "f", + "owner": "gr" + }, + { + "access": 1, + "descriptor": "[B", + "field": "array", + "name": "m", + "owner": "gr" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "(B)I", + "method": "__ab_306", + "name": "ab", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(B)I", + "method": "__ad_309", + "name": "ad", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(B)I", + "method": "__ag_302", + "name": "ag", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(B)I", + "method": "__aq_303", + "name": "aq", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(B)I", + "method": "__bf_332", + "name": "bf", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(B)I", + "method": "__bl_327", + "name": "bl", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(B)I", + "method": "__bm_326", + "name": "bm", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(B)I", + "method": "readUnsignedByte", + "name": "p", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(B)Ljava/lang/String;", + "method": "__aw_304", + "name": "aw", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(B)Z", + "method": "__ax_313", + "name": "ax", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)B", + "method": "__bd_321", + "name": "bd", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)B", + "method": "__bk_320", + "name": "bk", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)B", + "method": "__bn_319", + "name": "bn", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)B", + "method": "readByte", + "name": "v", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__ae_307", + "name": "ae", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__ap_310", + "name": "ap", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__as_311", + "name": "as", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__at_308", + "name": "at", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__bb_317", + "name": "bb", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__bj_329", + "name": "bj", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__bp_331", + "name": "bp", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__bq_318", + "name": "bq", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__br_328", + "name": "br", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__bt_330", + "name": "bt", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__bu_325", + "name": "bu", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__by_324", + "name": "by", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "readInt", + "name": "av", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "readMedium", + "name": "aj", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "readUnsignedByteNegate", + "name": "bs", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)J", + "method": "readLong", + "name": "ar", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)Ljava/lang/String;", + "method": "readStringCp1252NullCircumfixed", + "name": "ak", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)Ljava/lang/String;", + "method": "readStringCp1252NullTerminated", + "name": "ah", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)Ljava/lang/String;", + "method": "readStringCp1252NullTerminatedOrNull", + "name": "ay", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)Z", + "method": "readBoolean", + "name": "ac", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(IB)V", + "method": "__af_314", + "name": "af", + "owner": "gr", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(IB)V", + "method": "__ba_316", + "name": "ba", + "owner": "gr", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(IB)V", + "method": "__bx_323", + "name": "bx", + "owner": "gr", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(IB)V", + "method": "writeIntLE", + "name": "bi", + "owner": "gr", + "parameters": [ + "value" + ] + }, + { + "access": 1, + "descriptor": "(IB)V", + "method": "writeIntME", + "name": "bz", + "owner": "gr", + "parameters": [ + "value" + ] + }, + { + "access": 1, + "descriptor": "(IB)V", + "method": "writeMedium", + "name": "o", + "owner": "gr", + "parameters": [ + "value" + ] + }, + { + "access": 1, + "descriptor": "(IB)V", + "method": "writeShort", + "name": "w", + "owner": "gr", + "parameters": [ + "value" + ] + }, + { + "access": 1, + "descriptor": "(IB)V", + "method": "writeShortLE", + "name": "bc", + "owner": "gr", + "parameters": [ + "value" + ] + }, + { + "access": 1, + "descriptor": "(II)I", + "method": "__aa_312", + "name": "aa", + "owner": "gr", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(II)V", + "method": "__ai_315", + "name": "ai", + "owner": "gr", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(II)V", + "method": "__bo_322", + "name": "bo", + "owner": "gr", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(II)V", + "method": "__c_301", + "name": "c", + "owner": "gr", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(II)V", + "method": "__h_300", + "name": "h", + "owner": "gr", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(II)V", + "method": "__t_298", + "name": "t", + "owner": "gr", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(II)V", + "method": "__y_299", + "name": "y", + "owner": "gr", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(II)V", + "method": "writeByte", + "name": "q", + "owner": "gr", + "parameters": [ + "value" + ] + }, + { + "access": 1, + "descriptor": "(II)V", + "method": "writeInt", + "name": "u", + "owner": "gr", + "parameters": [ + "value" + ] + }, + { + "access": 1, + "descriptor": "(II)V", + "method": "writeIntLE16", + "name": "bg", + "owner": "gr", + "parameters": [ + "value" + ] + }, + { + "access": 1, + "descriptor": "(II)V", + "method": "writeSmartByteShort", + "name": "b", + "owner": "gr", + "parameters": [ + "value" + ] + }, + { + "access": 1, + "descriptor": "(J)V", + "method": "writeLong", + "name": "l", + "owner": "gr", + "parameters": [ + "n" + ] + }, + { + "access": 1, + "descriptor": "(J)V", + "method": "writeLongMedium", + "name": "g", + "owner": "gr", + "parameters": [ + "n" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/CharSequence;B)V", + "method": "__j_296", + "name": "j", + "owner": "gr", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/String;B)V", + "method": "writeStringCp1252NullTerminated", + "name": "d", + "owner": "gr", + "parameters": [ + "string" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/String;S)V", + "method": "writeStringCp1252NullCircumfixed", + "name": "z", + "owner": "gr", + "parameters": [ + "string" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", + "method": "encryptRsa", + "name": "ao", + "owner": "gr" + }, + { + "access": 1, + "descriptor": "(S)V", + "method": "__f_295", + "name": "f", + "owner": "gr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(ZB)V", + "method": "writeBoolean", + "name": "e", + "owner": "gr", + "parameters": [ + "value" + ] + }, + { + "access": 1, + "descriptor": "([BIIB)V", + "method": "__al_305", + "name": "al", + "owner": "gr", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "([BIII)V", + "method": "__bh_333", + "name": "bh", + "owner": "gr", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "([BIII)V", + "method": "__s_297", + "name": "s", + "owner": "gr", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "([IB)V", + "method": "xteaEncryptAll", + "name": "am", + "owner": "gr", + "parameters": [ + "xteaKey" + ] + }, + { + "access": 1, + "descriptor": "([II)V", + "method": "xteaDecryptAll", + "name": "an", + "owner": "gr", + "parameters": [ + "xteaKey" + ] + }, + { + "access": 1, + "descriptor": "([IIII)V", + "method": "xteaDecrypt", + "name": "au", + "owner": "gr", + "parameters": [ + "end", + "start", + "xteaKey" + ] + }, + { + "access": 1, + "descriptor": "([IIII)V", + "method": "xteaEncrypt", + "name": "az", + "owner": "gr", + "parameters": [ + "end", + "start", + "xteaKey" + ] + } + ], + "name": "gr", + "super": "gw" + }, + { + "access": 33, + "class": "BufferedFile", + "constructors": [ + { + "access": 1, + "descriptor": "(Ldk;II)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1558233611, + "descriptor": "I", + "field": "__g", + "name": "g", + "owner": "dy" + }, + { + "access": 0, + "decoder": -3728247331531751000, + "descriptor": "J", + "field": "__e", + "name": "e", + "owner": "dy" + }, + { + "access": 0, + "decoder": -6819476051574243000, + "descriptor": "J", + "field": "__l", + "name": "l", + "owner": "dy" + }, + { + "access": 0, + "decoder": -7773729680030816000, + "descriptor": "J", + "field": "__q", + "name": "q", + "owner": "dy" + }, + { + "access": 0, + "decoder": -846810907, + "descriptor": "I", + "field": "__w", + "name": "w", + "owner": "dy" + }, + { + "access": 0, + "decoder": 2663146692618914000, + "descriptor": "J", + "field": "capacity", + "name": "x", + "owner": "dy" + }, + { + "access": 0, + "decoder": 5249231081498323000, + "descriptor": "J", + "field": "__u", + "name": "u", + "owner": "dy" + }, + { + "access": 0, + "decoder": 5720856138805192000, + "descriptor": "J", + "field": "__d", + "name": "d", + "owner": "dy" + }, + { + "access": 0, + "descriptor": "Ldk;", + "field": "accessFile", + "name": "m", + "owner": "dy" + }, + { + "access": 0, + "descriptor": "[B", + "field": "readBuffer", + "name": "f", + "owner": "dy" + }, + { + "access": 0, + "descriptor": "[B", + "field": "writeBuffer", + "name": "o", + "owner": "dy" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)V", + "method": "flush", + "name": "l", + "owner": "dy", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "load", + "name": "u", + "owner": "dy", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(B)J", + "method": "length", + "name": "q", + "owner": "dy", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "close", + "name": "m", + "owner": "dy", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(J)V", + "method": "seek", + "name": "f", + "owner": "dy", + "parameters": [ + "index" + ] + }, + { + "access": 1, + "descriptor": "([BI)V", + "method": "readFill", + "name": "w", + "owner": "dy", + "parameters": [ + "dst" + ] + }, + { + "access": 1, + "descriptor": "([BIIB)V", + "method": "read", + "name": "o", + "owner": "dy", + "parameters": [ + "dst", + "dstIndex", + "length" + ] + }, + { + "access": 1, + "descriptor": "([BIII)V", + "method": "write", + "name": "g", + "owner": "dy", + "parameters": [ + "length", + "src", + "srcIndex" + ] + } + ], + "name": "dy", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "BufferedNetSocket", + "constructors": [ + { + "access": 0, + "descriptor": "(Ljava/net/Socket;II)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Lfh;", + "field": "source", + "name": "f", + "owner": "ft" + }, + { + "access": 0, + "descriptor": "Lfr;", + "field": "sink", + "name": "q", + "owner": "ft" + }, + { + "access": 0, + "descriptor": "Ljava/net/Socket;", + "field": "socket", + "name": "m", + "owner": "ft" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "(I)I", + "method": "available", + "name": "q", + "owner": "ft", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "readUnsignedByte", + "name": "w", + "owner": "ft", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "close", + "name": "g", + "owner": "ft", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(II)Z", + "method": "isAvailable", + "name": "f", + "owner": "ft", + "parameters": [ + "length" + ] + }, + { + "access": 1, + "descriptor": "([BIIB)V", + "method": "write", + "name": "u", + "owner": "ft", + "parameters": [ + "length", + "src", + "srcIndex" + ] + }, + { + "access": 1, + "descriptor": "([BIII)I", + "method": "read", + "name": "o", + "owner": "ft", + "parameters": [ + "dst", + "dstIndex", + "length" + ] + }, + { + "access": 4, + "descriptor": "()V", + "method": "__finalize_280", + "name": "finalize", + "owner": "ft", + "parameters": [] + } + ], + "name": "ft", + "super": "fu" + }, + { + "access": 33, + "class": "BufferedSink", + "constructors": [ + { + "access": 0, + "descriptor": "(Ljava/io/OutputStream;I)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": 1028856279, + "descriptor": "I", + "field": "limit", + "name": "u", + "owner": "fr" + }, + { + "access": 0, + "decoder": 1805563727, + "descriptor": "I", + "field": "capacity", + "name": "q", + "owner": "fr" + }, + { + "access": 0, + "decoder": 315461309, + "descriptor": "I", + "field": "position", + "name": "o", + "owner": "fr" + }, + { + "access": 0, + "descriptor": "Ljava/io/IOException;", + "field": "exception", + "name": "g", + "owner": "fr" + }, + { + "access": 0, + "descriptor": "Ljava/io/OutputStream;", + "field": "outputStream", + "name": "f", + "owner": "fr" + }, + { + "access": 0, + "descriptor": "Ljava/lang/Thread;", + "field": "thread", + "name": "m", + "owner": "fr" + }, + { + "access": 0, + "descriptor": "Z", + "field": "isClosed0", + "name": "l", + "owner": "fr" + }, + { + "access": 0, + "descriptor": "[B", + "field": "buffer", + "name": "w", + "owner": "fr" + } + ], + "interfaces": [ + "java.lang.Runnable" + ], + "methods": [ + { + "access": 0, + "descriptor": "(I)V", + "method": "close", + "name": "q", + "owner": "fr", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)Z", + "method": "isClosed", + "name": "m", + "owner": "fr", + "parameters": [] + }, + { + "access": 0, + "descriptor": "([BIIB)V", + "method": "write", + "name": "f", + "owner": "fr", + "parameters": [ + "length", + "src", + "srcIndex" + ] + }, + { + "access": 1, + "descriptor": "()V", + "method": "__run_282", + "name": "run", + "owner": "fr", + "parameters": [] + } + ], + "name": "fr", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "BufferedSource", + "constructors": [ + { + "access": 0, + "descriptor": "(Ljava/io/InputStream;I)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1970062431, + "descriptor": "I", + "field": "capacity", + "name": "q", + "owner": "fh" + }, + { + "access": 0, + "decoder": 1507905677, + "descriptor": "I", + "field": "limit", + "name": "u", + "owner": "fh" + }, + { + "access": 0, + "decoder": 267006153, + "descriptor": "I", + "field": "position", + "name": "o", + "owner": "fh" + }, + { + "access": 0, + "descriptor": "Ljava/io/IOException;", + "field": "exception", + "name": "g", + "owner": "fh" + }, + { + "access": 0, + "descriptor": "Ljava/io/InputStream;", + "field": "inputStream", + "name": "f", + "owner": "fh" + }, + { + "access": 0, + "descriptor": "Ljava/lang/Thread;", + "field": "thread", + "name": "m", + "owner": "fh" + }, + { + "access": 0, + "descriptor": "[B", + "field": "buffer", + "name": "w", + "owner": "fh" + } + ], + "interfaces": [ + "java.lang.Runnable" + ], + "methods": [ + { + "access": 0, + "descriptor": "(I)I", + "method": "available", + "name": "f", + "owner": "fh", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)I", + "method": "readUnsignedByte", + "name": "q", + "owner": "fh", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "close", + "name": "o", + "owner": "fh", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(II)Z", + "method": "isAvailable", + "name": "m", + "owner": "fh", + "parameters": [ + "length" + ] + }, + { + "access": 0, + "descriptor": "([BIIB)I", + "method": "read", + "name": "w", + "owner": "fh", + "parameters": [ + "dst", + "dstIndex", + "length" + ] + }, + { + "access": 1, + "descriptor": "()V", + "method": "__run_278", + "name": "run", + "owner": "fh", + "parameters": [] + } + ], + "name": "fh", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "ByteArrayNode", + "constructors": [ + { + "access": 1, + "descriptor": "([B)V" + } + ], + "fields": [ + { + "access": 1, + "descriptor": "[B", + "field": "byteArray", + "name": "m", + "owner": "gp" + } + ], + "interfaces": [], + "methods": [], + "name": "gp", + "super": "gw" + }, + { + "access": 33, + "class": "ByteArrayPool", + "constructors": [], + "fields": [], + "interfaces": [], + "methods": [], + "name": "gi", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "ChatChannel", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": 612486877, + "descriptor": "I", + "field": "count", + "name": "q", + "owner": "cp" + }, + { + "access": 0, + "descriptor": "[Lbm;", + "field": "messages", + "name": "f", + "owner": "cp" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)I", + "method": "size", + "name": "q", + "owner": "cp", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(II)Lbm;", + "method": "getMessage", + "name": "f", + "owner": "cp", + "parameters": [ + "index" + ] + }, + { + "access": 0, + "descriptor": "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbm;", + "method": "addMessage", + "name": "m", + "owner": "cp", + "parameters": [ + "prefix", + "sender", + "text", + "type" + ] + } + ], + "name": "cp", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "ClanChat", + "constructors": [ + { + "access": 1, + "descriptor": "(Llx;Lky;)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": 386706253, + "descriptor": "I", + "field": "__i", + "name": "i", + "owner": "kv" + }, + { + "access": 1, + "decoder": -1534670751, + "descriptor": "I", + "field": "rank", + "name": "n", + "owner": "kv" + }, + { + "access": 1, + "descriptor": "B", + "field": "minKick", + "name": "k", + "owner": "kv" + }, + { + "access": 1, + "descriptor": "Ljava/lang/String;", + "field": "name", + "name": "x", + "owner": "kv" + }, + { + "access": 1, + "descriptor": "Ljava/lang/String;", + "field": "owner", + "name": "d", + "owner": "kv" + }, + { + "access": 16, + "descriptor": "Lky;", + "field": "localUser", + "name": "q", + "owner": "kv" + }, + { + "access": 16, + "descriptor": "Llx;", + "field": "loginType", + "name": "f", + "owner": "kv" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)Ljs;", + "method": "newInstance", + "name": "m", + "owner": "kv" + }, + { + "access": 0, + "descriptor": "(II)[Ljs;", + "method": "newTypedArray", + "name": "f", + "owner": "kv" + }, + { + "access": 16, + "descriptor": "(Ljava/lang/String;B)V", + "method": "__x_473", + "name": "x", + "owner": "kv", + "parameters": [ + "arg0" + ] + }, + { + "access": 16, + "descriptor": "(Ljava/lang/String;I)V", + "method": "__q_472", + "name": "q", + "owner": "kv", + "parameters": [ + "arg0" + ] + }, + { + "access": 16, + "descriptor": "(Ljk;I)V", + "method": "__cp_475", + "name": "cp", + "owner": "kv", + "parameters": [ + "arg0" + ] + }, + { + "access": 17, + "descriptor": "(B)V", + "method": "clearIgnoreds", + "name": "cf", + "owner": "kv", + "parameters": [] + }, + { + "access": 17, + "descriptor": "(I)V", + "method": "clearFriends", + "name": "cg", + "owner": "kv", + "parameters": [] + }, + { + "access": 17, + "descriptor": "(Lgr;B)V", + "method": "__a_474", + "name": "a", + "owner": "kv", + "parameters": [ + "arg0" + ] + }, + { + "access": 17, + "descriptor": "(Lgr;I)V", + "method": "readUpdate", + "name": "d", + "owner": "kv", + "parameters": [ + "buffer" + ] + } + ], + "name": "kv", + "super": "km" + }, + { + "access": 33, + "class": "ClanMate", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Lkd;", + "field": "isFriend0", + "name": "m", + "owner": "jk" + }, + { + "access": 0, + "descriptor": "Lkd;", + "field": "isIgnored0", + "name": "f", + "owner": "jk" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)V", + "method": "clearIsFriend", + "name": "m", + "owner": "jk", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "clearIsIgnored", + "name": "w", + "owner": "jk", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "fillIsFriend", + "name": "q", + "owner": "jk", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "fillIsIgnored", + "name": "u", + "owner": "jk", + "parameters": [] + }, + { + "access": 17, + "descriptor": "(I)Z", + "method": "isFriend", + "name": "f", + "owner": "jk", + "parameters": [] + }, + { + "access": 17, + "descriptor": "(I)Z", + "method": "isIgnored", + "name": "o", + "owner": "jk", + "parameters": [] + } + ], + "name": "jk", + "super": "ke" + }, + { + "access": 33, + "class": "ClientPacket", + "constructors": [ + { + "access": 0, + "descriptor": "(II)V" + } + ], + "fields": [ + { + "access": 16, + "decoder": -1759434223, + "descriptor": "I", + "field": "length", + "name": "cx", + "owner": "gs" + }, + { + "access": 16, + "decoder": -286923745, + "descriptor": "I", + "field": "id", + "name": "cd", + "owner": "gs" + } + ], + "interfaces": [ + "gb" + ], + "methods": [], + "name": "gs", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "ClientParameter", + "constructors": [ + { + "access": 0, + "descriptor": "(Ljava/lang/String;Ljava/lang/String;)V" + } + ], + "fields": [ + { + "access": 17, + "descriptor": "Ljava/lang/String;", + "field": "id", + "name": "y", + "owner": "ji" + } + ], + "interfaces": [], + "methods": [], + "name": "ji", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "ClientPreferences", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + }, + { + "access": 0, + "descriptor": "(Lgr;)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -359530975, + "descriptor": "I", + "field": "windowMode", + "name": "o", + "owner": "bf" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "rememberedUsername", + "name": "u", + "owner": "bf" + }, + { + "access": 0, + "descriptor": "Ljava/util/LinkedHashMap;", + "field": "parameters", + "name": "l", + "owner": "bf" + }, + { + "access": 0, + "descriptor": "Z", + "field": "hideUsername", + "name": "g", + "owner": "bf" + }, + { + "access": 0, + "descriptor": "Z", + "field": "roofsHidden", + "name": "q", + "owner": "bf" + }, + { + "access": 0, + "descriptor": "Z", + "field": "titleMusicDisabled", + "name": "w", + "owner": "bf" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)Lgr;", + "method": "toBuffer", + "name": "f", + "owner": "bf", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(ZI)V", + "method": "__m_150", + "name": "m", + "owner": "bf", + "parameters": [ + "arg0" + ] + } + ], + "name": "bf", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "CollisionMap", + "constructors": [ + { + "access": 1, + "descriptor": "(II)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1037712787, + "descriptor": "I", + "field": "yInset", + "name": "ak", + "owner": "fy" + }, + { + "access": 0, + "decoder": -871458249, + "descriptor": "I", + "field": "ySize", + "name": "al", + "owner": "fy" + }, + { + "access": 0, + "decoder": 264774249, + "descriptor": "I", + "field": "xInset", + "name": "ah", + "owner": "fy" + }, + { + "access": 0, + "decoder": 674483785, + "descriptor": "I", + "field": "xSize", + "name": "aw", + "owner": "fy" + }, + { + "access": 1, + "descriptor": "[[I", + "field": "flags", + "name": "ab", + "owner": "fy" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(IIII)V", + "method": "__e_290", + "name": "e", + "owner": "fy", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 0, + "descriptor": "(IIII)V", + "method": "__u_287", + "name": "u", + "owner": "fy", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "clear", + "name": "m", + "owner": "fy", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(IIB)V", + "method": "__x_291", + "name": "x", + "owner": "fy", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(III)V", + "method": "__o_286", + "name": "o", + "owner": "fy", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(III)V", + "method": "__w_285", + "name": "w", + "owner": "fy", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(IIIIIZB)V", + "method": "__l_289", + "name": "l", + "owner": "fy", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4", + "arg5" + ] + }, + { + "access": 1, + "descriptor": "(IIIIZB)V", + "method": "__f_283", + "name": "f", + "owner": "fy", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4" + ] + }, + { + "access": 1, + "descriptor": "(IIIIZB)V", + "method": "__g_288", + "name": "g", + "owner": "fy", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4" + ] + }, + { + "access": 1, + "descriptor": "(IIIIZI)V", + "method": "__q_284", + "name": "q", + "owner": "fy", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4" + ] + } + ], + "name": "fy", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "Component", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -201557389, + "descriptor": "I", + "field": "modelId2", + "name": "bm", + "owner": "ho" + }, + { + "access": 0, + "decoder": 138222099, + "descriptor": "I", + "field": "modelType2", + "name": "bu", + "owner": "ho" + }, + { + "access": 1, + "decoder": -1021798347, + "descriptor": "I", + "field": "dragThreshold", + "name": "df", + "owner": "ho" + }, + { + "access": 1, + "decoder": -1047989223, + "descriptor": "I", + "field": "__al", + "name": "al", + "owner": "ho" + }, + { + "access": 1, + "decoder": -1074168553, + "descriptor": "I", + "field": "spriteId2", + "name": "bb", + "owner": "ho" + }, + { + "access": 1, + "decoder": -110526699, + "descriptor": "I", + "field": "lineWid", + "name": "ai", + "owner": "ho" + }, + { + "access": 1, + "decoder": -1253859481, + "descriptor": "I", + "field": "modelAngleY", + "name": "bg", + "owner": "ho" + }, + { + "access": 1, + "decoder": -1361791123, + "descriptor": "I", + "field": "spriteAngle", + "name": "bq", + "owner": "ho" + }, + { + "access": 1, + "decoder": -1390352887, + "descriptor": "I", + "field": "mouseOverRedirect", + "name": "ew", + "owner": "ho" + }, + { + "access": 1, + "decoder": -1423753745, + "descriptor": "I", + "field": "sequenceId", + "name": "bl", + "owner": "ho" + }, + { + "access": 1, + "decoder": -1520351537, + "descriptor": "I", + "field": "__fg", + "name": "fg", + "owner": "ho" + }, + { + "access": 1, + "decoder": -1658511475, + "descriptor": "I", + "field": "__bw", + "name": "bw", + "owner": "ho" + }, + { + "access": 1, + "decoder": -1692331135, + "descriptor": "I", + "field": "__bf", + "name": "bf", + "owner": "ho" + }, + { + "access": 1, + "decoder": -1814696937, + "descriptor": "I", + "field": "rawY", + "name": "aj", + "owner": "ho" + }, + { + "access": 1, + "decoder": -1831692129, + "descriptor": "I", + "field": "mouseOverColor", + "name": "az", + "owner": "ho" + }, + { + "access": 1, + "decoder": -1853255291, + "descriptor": "I", + "field": "__af", + "name": "af", + "owner": "ho" + }, + { + "access": 1, + "decoder": -1995006949, + "descriptor": "I", + "field": "cycle", + "name": "fd", + "owner": "ho" + }, + { + "access": 1, + "decoder": -2001402777, + "descriptor": "I", + "field": "rawWidth", + "name": "av", + "owner": "ho" + }, + { + "access": 1, + "decoder": -2013625215, + "descriptor": "I", + "field": "modelId", + "name": "by", + "owner": "ho" + }, + { + "access": 1, + "decoder": -2018053063, + "descriptor": "I", + "field": "modelOffsetY", + "name": "bi", + "owner": "ho" + }, + { + "access": 1, + "decoder": -2022638615, + "descriptor": "I", + "field": "color", + "name": "am", + "owner": "ho" + }, + { + "access": 1, + "decoder": -2133338643, + "descriptor": "I", + "field": "modelZoom", + "name": "bp", + "owner": "ho" + }, + { + "access": 1, + "decoder": -23173063, + "descriptor": "I", + "field": "paddingX", + "name": "cu", + "owner": "ho" + }, + { + "access": 1, + "decoder": -365781561, + "descriptor": "I", + "field": "color2", + "name": "an", + "owner": "ho" + }, + { + "access": 1, + "decoder": -431656963, + "descriptor": "I", + "field": "modelFrame", + "name": "eg", + "owner": "ho" + }, + { + "access": 1, + "decoder": -459670781, + "descriptor": "I", + "field": "modelOffsetX", + "name": "bj", + "owner": "ho" + }, + { + "access": 1, + "decoder": -537618643, + "descriptor": "I", + "field": "scrollY", + "name": "ad", + "owner": "ho" + }, + { + "access": 1, + "decoder": -581762425, + "descriptor": "I", + "field": "clientCode", + "name": "c", + "owner": "ho" + }, + { + "access": 1, + "decoder": -594884327, + "descriptor": "I", + "field": "outline", + "name": "bk", + "owner": "ho" + }, + { + "access": 1, + "decoder": -617209253, + "descriptor": "I", + "field": "parentId", + "name": "ab", + "owner": "ho" + }, + { + "access": 1, + "decoder": -623790443, + "descriptor": "I", + "field": "scrollWidth", + "name": "ap", + "owner": "ho" + }, + { + "access": 1, + "decoder": -638557371, + "descriptor": "I", + "field": "transparency", + "name": "ax", + "owner": "ho" + }, + { + "access": 1, + "decoder": -648033351, + "descriptor": "I", + "field": "childIndex", + "name": "y", + "owner": "ho" + }, + { + "access": 1, + "decoder": -672198209, + "descriptor": "I", + "field": "__fl", + "name": "fl", + "owner": "ho" + }, + { + "access": 1, + "decoder": -692411223, + "descriptor": "I", + "field": "modelAngleZ", + "name": "bt", + "owner": "ho" + }, + { + "access": 1, + "decoder": -709256449, + "descriptor": "I", + "field": "heightAlignment", + "name": "ag", + "owner": "ho" + }, + { + "access": 1, + "decoder": -856053301, + "descriptor": "I", + "field": "sequenceId2", + "name": "br", + "owner": "ho" + }, + { + "access": 1, + "decoder": -867175629, + "descriptor": "I", + "field": "scrollHeight", + "name": "as", + "owner": "ho" + }, + { + "access": 1, + "decoder": -872904863, + "descriptor": "I", + "field": "rawX", + "name": "aq", + "owner": "ho" + }, + { + "access": 1, + "decoder": -941148335, + "descriptor": "I", + "field": "id", + "name": "t", + "owner": "ho" + }, + { + "access": 1, + "decoder": -95117407, + "descriptor": "I", + "field": "modelFrameCycle", + "name": "ez", + "owner": "ho" + }, + { + "access": 1, + "decoder": 1202342839, + "descriptor": "I", + "field": "rawHeight", + "name": "ar", + "owner": "ho" + }, + { + "access": 1, + "decoder": 1236161275, + "descriptor": "I", + "field": "mouseOverColor2", + "name": "au", + "owner": "ho" + }, + { + "access": 1, + "decoder": 1248629915, + "descriptor": "I", + "field": "itemId", + "name": "ea", + "owner": "ho" + }, + { + "access": 1, + "decoder": 1271321381, + "descriptor": "I", + "field": "x", + "name": "ac", + "owner": "ho" + }, + { + "access": 1, + "decoder": 1271997981, + "descriptor": "I", + "field": "textYAlignment", + "name": "cm", + "owner": "ho" + }, + { + "access": 1, + "decoder": 1300531185, + "descriptor": "I", + "field": "yAlignment", + "name": "p", + "owner": "ho" + }, + { + "access": 1, + "decoder": 1401272343, + "descriptor": "I", + "field": "textLineHeight", + "name": "cy", + "owner": "ho" + }, + { + "access": 1, + "decoder": 1412102151, + "descriptor": "I", + "field": "buttonType", + "name": "b", + "owner": "ho" + }, + { + "access": 1, + "decoder": 1435746863, + "descriptor": "I", + "field": "fontId", + "name": "cr", + "owner": "ho" + }, + { + "access": 1, + "decoder": 1492291497, + "descriptor": "I", + "field": "y", + "name": "ay", + "owner": "ho" + }, + { + "access": 1, + "decoder": 1521310729, + "descriptor": "I", + "field": "type", + "name": "h", + "owner": "ho" + }, + { + "access": 1, + "decoder": 1527989635, + "descriptor": "I", + "field": "textXAlignment", + "name": "cs", + "owner": "ho" + }, + { + "access": 1, + "decoder": 1573420153, + "descriptor": "I", + "field": "spriteId", + "name": "bs", + "owner": "ho" + }, + { + "access": 1, + "decoder": 1628640897, + "descriptor": "I", + "field": "widthAlignment", + "name": "v", + "owner": "ho" + }, + { + "access": 1, + "decoder": 1656646737, + "descriptor": "I", + "field": "height", + "name": "ak", + "owner": "ho" + }, + { + "access": 1, + "decoder": 1716081883, + "descriptor": "I", + "field": "width", + "name": "ah", + "owner": "ho" + }, + { + "access": 1, + "decoder": 1856618959, + "descriptor": "I", + "field": "clickMask", + "name": "cw", + "owner": "ho" + }, + { + "access": 1, + "decoder": 2044722063, + "descriptor": "I", + "field": "modelAngleX", + "name": "bz", + "owner": "ho" + }, + { + "access": 1, + "decoder": 206556853, + "descriptor": "I", + "field": "__aw", + "name": "aw", + "owner": "ho" + }, + { + "access": 1, + "decoder": 2090399935, + "descriptor": "I", + "field": "scrollX", + "name": "at", + "owner": "ho" + }, + { + "access": 1, + "decoder": 2092800189, + "descriptor": "I", + "field": "dragZoneSize", + "name": "dn", + "owner": "ho" + }, + { + "access": 1, + "decoder": 209458049, + "descriptor": "I", + "field": "__fc", + "name": "fc", + "owner": "ho" + }, + { + "access": 1, + "decoder": 215797483, + "descriptor": "I", + "field": "spriteShadow", + "name": "bd", + "owner": "ho" + }, + { + "access": 1, + "decoder": 340244859, + "descriptor": "I", + "field": "itemQuantity", + "name": "es", + "owner": "ho" + }, + { + "access": 1, + "decoder": 365867737, + "descriptor": "I", + "field": "rootIndex", + "name": "fp", + "owner": "ho" + }, + { + "access": 1, + "decoder": 523318277, + "descriptor": "I", + "field": "xAlignment", + "name": "r", + "owner": "ho" + }, + { + "access": 1, + "decoder": 630750753, + "descriptor": "I", + "field": "modelType", + "name": "bx", + "owner": "ho" + }, + { + "access": 1, + "decoder": 720760323, + "descriptor": "I", + "field": "paddingY", + "name": "cb", + "owner": "ho" + }, + { + "access": 1, + "decoder": 727421593, + "descriptor": "I", + "field": "__bh", + "name": "bh", + "owner": "ho" + }, + { + "access": 1, + "decoder": 876695207, + "descriptor": "I", + "field": "__fj", + "name": "fj", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Lho;", + "field": "parent", + "name": "dt", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Ljava/lang/String;", + "field": "buttonText", + "name": "ec", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Ljava/lang/String;", + "field": "dataText", + "name": "de", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Ljava/lang/String;", + "field": "spellActionName", + "name": "dp", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Ljava/lang/String;", + "field": "spellName", + "name": "eu", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Ljava/lang/String;", + "field": "text", + "name": "cv", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Ljava/lang/String;", + "field": "text2", + "name": "ce", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Llj;", + "field": "rectangleMode", + "name": "aa", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Z", + "field": "__ba", + "name": "ba", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Z", + "field": "__cg", + "name": "cg", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Z", + "field": "__fm", + "name": "fm", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Z", + "field": "__fq", + "name": "fq", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Z", + "field": "__fw", + "name": "fw", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Z", + "field": "__fz", + "name": "fz", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Z", + "field": "fill", + "name": "ao", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Z", + "field": "hasListener", + "name": "ds", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Z", + "field": "isHidden", + "name": "ae", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Z", + "field": "isIf3", + "name": "s", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Z", + "field": "isScrollBar", + "name": "da", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Z", + "field": "modelOrthog", + "name": "be", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Z", + "field": "modelTransparency", + "name": "bv", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Z", + "field": "noClickThrough", + "name": "fx", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Z", + "field": "spriteFlipH", + "name": "bo", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Z", + "field": "spriteFlipV", + "name": "bc", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Z", + "field": "spriteTiling", + "name": "bn", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "Z", + "field": "textShadowed", + "name": "cj", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[I", + "field": "__cc", + "name": "cc", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[I", + "field": "__ci", + "name": "ci", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[I", + "field": "__fh", + "name": "fh", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[I", + "field": "cs1ComparisonValues", + "name": "er", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[I", + "field": "cs1Comparisons", + "name": "ey", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[I", + "field": "invTransmitTriggers", + "name": "du", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[I", + "field": "inventorySprites", + "name": "cq", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[I", + "field": "inventoryXOffsets", + "name": "ck", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[I", + "field": "inventoryYOffsets", + "name": "cn", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[I", + "field": "itemIds", + "name": "ef", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[I", + "field": "itemQuantities", + "name": "ev", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[I", + "field": "statTransmitTriggers", + "name": "dq", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[I", + "field": "varTransmitTriggers", + "name": "dz", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Lho;", + "field": "children", + "name": "ep", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "__ee", + "name": "ee", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "__eh", + "name": "eh", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onChatTransmit", + "name": "em", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onClanTransmit", + "name": "ej", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onClick", + "name": "dc", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onClickRepeat", + "name": "dg", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onDialogAbort", + "name": "en", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onDrag", + "name": "dr", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onDragComplete", + "name": "dw", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onFriendTransmit", + "name": "ex", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onHold", + "name": "dd", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onInvTransmit", + "name": "dj", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onKey", + "name": "ed", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onLoad", + "name": "di", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onMiscTransmit", + "name": "el", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onMouseLeave", + "name": "dl", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onMouseOver", + "name": "dy", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onMouseRepeat", + "name": "dk", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onOp", + "name": "eb", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onRelease", + "name": "db", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onScrollWheel", + "name": "ek", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onStatTransmit", + "name": "dm", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onStockTransmit", + "name": "eq", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onSubChange", + "name": "ei", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onTargetEnter", + "name": "dv", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onTargetLeave", + "name": "do", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onTimer", + "name": "et", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/Object;", + "field": "onVarTransmit", + "name": "dh", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/String;", + "field": "actions", + "name": "dx", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/String;", + "field": "itemActions", + "name": "ch", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[[B", + "field": "__cf", + "name": "cf", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[[B", + "field": "__cp", + "name": "cp", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "[[I", + "field": "cs1Instructions", + "name": "eo", + "owner": "ho" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lgr;B)[I", + "method": "readListenerTriggers", + "name": "l", + "owner": "ho", + "parameters": [ + "buffer" + ] + }, + { + "access": 0, + "descriptor": "(Lgr;I)V", + "method": "decode", + "name": "u", + "owner": "ho", + "parameters": [ + "buffer" + ] + }, + { + "access": 0, + "descriptor": "(Lgr;I)V", + "method": "decodeLegacy", + "name": "o", + "owner": "ho", + "parameters": [ + "buffer" + ] + }, + { + "access": 0, + "descriptor": "(Lgr;I)[Ljava/lang/Object;", + "method": "readListener", + "name": "g", + "owner": "ho", + "parameters": [ + "buffer" + ] + }, + { + "access": 1, + "descriptor": "(B)Lkk;", + "method": "getFont", + "name": "d", + "owner": "ho", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(II)Lln;", + "method": "getInventorySprite", + "name": "a", + "owner": "ho" + }, + { + "access": 1, + "descriptor": "(III)V", + "method": "swapItems", + "name": "e", + "owner": "ho", + "parameters": [ + "indexA", + "indexB" + ] + }, + { + "access": 1, + "descriptor": "(ILjava/lang/String;B)V", + "method": "setAction", + "name": "t", + "owner": "ho", + "parameters": [ + "index", + "s" + ] + }, + { + "access": 1, + "descriptor": "(Ljh;IZLhi;I)Ldu;", + "method": "getModel", + "name": "z", + "owner": "ho", + "parameters": [ + "appearance", + "b", + "frame", + "sequence" + ] + }, + { + "access": 1, + "descriptor": "(ZB)Lhp;", + "method": "getSpriteMask", + "name": "j", + "owner": "ho", + "parameters": [ + "b" + ] + }, + { + "access": 1, + "descriptor": "(ZI)Lln;", + "method": "getSprite", + "name": "x", + "owner": "ho", + "parameters": [ + "b" + ] + } + ], + "name": "ho", + "super": "gw" + }, + { + "access": 33, + "class": "Coord", + "constructors": [ + { + "access": 1, + "descriptor": "(I)V" + }, + { + "access": 1, + "descriptor": "(III)V" + }, + { + "access": 1, + "descriptor": "(Lhu;)V" + } + ], + "fields": [ + { + "access": 1, + "decoder": 1225620013, + "descriptor": "I", + "field": "x", + "name": "f", + "owner": "hu" + }, + { + "access": 1, + "decoder": 154740833, + "descriptor": "I", + "field": "z", + "name": "q", + "owner": "hu" + }, + { + "access": 1, + "decoder": 503621925, + "descriptor": "I", + "field": "y", + "name": "m", + "owner": "hu" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lhu;B)Z", + "method": "equals0", + "name": "f", + "owner": "hu", + "parameters": [ + "other" + ] + }, + { + "access": 0, + "descriptor": "(Ljava/lang/String;I)Ljava/lang/String;", + "method": "toString0", + "name": "q", + "owner": "hu", + "parameters": [ + "separator" + ] + }, + { + "access": 1, + "descriptor": "()I", + "method": "__hashCode_383", + "name": "hashCode", + "owner": "hu", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()Ljava/lang/String;", + "method": "__toString_384", + "name": "toString", + "owner": "hu", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "packed", + "name": "m", + "owner": "hu", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;)Z", + "method": "__equals_382", + "name": "equals", + "owner": "hu", + "parameters": [ + "arg0" + ] + } + ], + "name": "hu", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "Decimator", + "constructors": [ + { + "access": 1, + "descriptor": "(II)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1376358157, + "descriptor": "I", + "field": "inputRate", + "name": "w", + "owner": "dp" + }, + { + "access": 0, + "decoder": -876645877, + "descriptor": "I", + "field": "outputRate", + "name": "o", + "owner": "dp" + }, + { + "access": 0, + "descriptor": "[[I", + "field": "table", + "name": "u", + "owner": "dp" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(IB)I", + "method": "scalePosition", + "name": "q", + "owner": "dp", + "parameters": [ + "position" + ] + }, + { + "access": 0, + "descriptor": "(II)I", + "method": "scaleRate", + "name": "f", + "owner": "dp", + "parameters": [ + "rate" + ] + }, + { + "access": 0, + "descriptor": "([BI)[B", + "method": "resample", + "name": "m", + "owner": "dp" + } + ], + "name": "dp", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "DefaultsGroup", + "constructors": [ + { + "access": 0, + "descriptor": "(I)V" + } + ], + "fields": [ + { + "access": 16, + "decoder": -800980069, + "descriptor": "I", + "field": "group", + "name": "f", + "owner": "ka" + } + ], + "interfaces": [], + "methods": [], + "name": "ka", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "DesktopPlatformInfoProvider", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [], + "interfaces": [ + "lm" + ], + "methods": [ + { + "access": 1, + "descriptor": "(I)Llb;", + "method": "get", + "name": "m", + "owner": "lu", + "parameters": [] + } + ], + "name": "lu", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "DevicePcmPlayer", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -106586673, + "descriptor": "I", + "field": "capacity2", + "name": "q", + "owner": "ax" + }, + { + "access": 0, + "descriptor": "Ljavax/sound/sampled/AudioFormat;", + "field": "format", + "name": "m", + "owner": "ax" + }, + { + "access": 0, + "descriptor": "Ljavax/sound/sampled/SourceDataLine;", + "field": "line", + "name": "f", + "owner": "ax" + }, + { + "access": 0, + "descriptor": "[B", + "field": "byteSamples", + "name": "w", + "owner": "ax" + } + ], + "interfaces": [], + "methods": [ + { + "access": 4, + "descriptor": "()V", + "method": "write", + "name": "w", + "owner": "ax", + "parameters": [] + }, + { + "access": 4, + "descriptor": "(B)I", + "method": "position", + "name": "q", + "owner": "ax", + "parameters": [] + }, + { + "access": 4, + "descriptor": "(I)V", + "method": "close", + "name": "o", + "owner": "ax", + "parameters": [] + }, + { + "access": 4, + "descriptor": "(I)V", + "method": "discard", + "name": "u", + "owner": "ax", + "parameters": [] + }, + { + "access": 4, + "descriptor": "(I)V", + "method": "init", + "name": "m", + "owner": "ax", + "parameters": [] + }, + { + "access": 4, + "descriptor": "(II)V", + "method": "open", + "name": "f", + "owner": "ax", + "parameters": [ + "bufferSize" + ] + } + ], + "name": "ax", + "super": "co" + }, + { + "access": 33, + "class": "DevicePcmPlayerProvider", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [], + "interfaces": [ + "cz" + ], + "methods": [ + { + "access": 1, + "descriptor": "(B)Lco;", + "method": "player", + "name": "m", + "owner": "az" + } + ], + "name": "az", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "DirectByteArrayCopier", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Ljava/nio/ByteBuffer;", + "field": "directBuffer", + "name": "m", + "owner": "gv" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)[B", + "method": "get", + "name": "m", + "owner": "gv", + "parameters": [] + }, + { + "access": 0, + "descriptor": "([BI)V", + "method": "set", + "name": "f", + "owner": "gv", + "parameters": [ + "array" + ] + } + ], + "name": "gv", + "super": "gu" + }, + { + "access": 33, + "class": "DirectWrapper", + "constructors": [ + { + "access": 0, + "descriptor": "(Ljava/lang/Object;I)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Ljava/lang/Object;", + "field": "obj", + "name": "m", + "owner": "ew" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "()Ljava/lang/Object;", + "method": "get", + "name": "m", + "owner": "ew", + "parameters": [] + }, + { + "access": 0, + "descriptor": "()Z", + "method": "isSoft", + "name": "f", + "owner": "ew", + "parameters": [] + } + ], + "name": "ew", + "super": "eu" + }, + { + "access": 33, + "class": "DualNode", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 1, + "descriptor": "J", + "field": "keyDual", + "name": "cg", + "owner": "fn" + }, + { + "access": 1, + "descriptor": "Lfn;", + "field": "nextDual", + "name": "cp", + "owner": "fn" + }, + { + "access": 1, + "descriptor": "Lfn;", + "field": "previousDual", + "name": "cf", + "owner": "fn" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "()V", + "method": "removeDual", + "name": "cg", + "owner": "fn", + "parameters": [] + } + ], + "name": "fn", + "super": "gw" + }, + { + "access": 33, + "class": "DynamicObject", + "constructors": [ + { + "access": 0, + "descriptor": "(IIIIIIIZLex;)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -126308963, + "descriptor": "I", + "field": "y", + "name": "u", + "owner": "cf" + }, + { + "access": 0, + "decoder": -1596313489, + "descriptor": "I", + "field": "cycleStart", + "name": "e", + "owner": "cf" + }, + { + "access": 0, + "decoder": -2017547185, + "descriptor": "I", + "field": "frame", + "name": "l", + "owner": "cf" + }, + { + "access": 0, + "decoder": -351084819, + "descriptor": "I", + "field": "x", + "name": "o", + "owner": "cf" + }, + { + "access": 0, + "decoder": 1369707199, + "descriptor": "I", + "field": "id", + "name": "m", + "owner": "cf" + }, + { + "access": 0, + "decoder": 141031459, + "descriptor": "I", + "field": "orientation", + "name": "q", + "owner": "cf" + }, + { + "access": 0, + "decoder": 1713856147, + "descriptor": "I", + "field": "type", + "name": "f", + "owner": "cf" + }, + { + "access": 0, + "decoder": 844945979, + "descriptor": "I", + "field": "plane", + "name": "w", + "owner": "cf" + }, + { + "access": 0, + "descriptor": "Ljh;", + "field": "sequenceDefinition", + "name": "g", + "owner": "cf" + } + ], + "interfaces": [], + "methods": [ + { + "access": 20, + "descriptor": "(I)Ldu;", + "method": "getModel", + "name": "e", + "owner": "cf", + "parameters": [] + } + ], + "name": "cf", + "super": "ex" + }, + { + "access": 33, + "class": "EnumDefinition", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 1, + "decoder": -12324053, + "descriptor": "I", + "field": "outputcount", + "name": "g", + "owner": "jw" + }, + { + "access": 1, + "decoder": 1948115527, + "descriptor": "I", + "field": "defaultint", + "name": "u", + "owner": "jw" + }, + { + "access": 1, + "descriptor": "C", + "field": "inputtype", + "name": "q", + "owner": "jw" + }, + { + "access": 1, + "descriptor": "C", + "field": "outputtype", + "name": "w", + "owner": "jw" + }, + { + "access": 1, + "descriptor": "Ljava/lang/String;", + "field": "defaultstr", + "name": "o", + "owner": "jw" + }, + { + "access": 1, + "descriptor": "[I", + "field": "intvals", + "name": "e", + "owner": "jw" + }, + { + "access": 1, + "descriptor": "[I", + "field": "keys", + "name": "l", + "owner": "jw" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/String;", + "field": "strvals", + "name": "x", + "owner": "jw" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lgr;I)V", + "method": "decode", + "name": "f", + "owner": "jw" + }, + { + "access": 0, + "descriptor": "(Lgr;II)V", + "method": "decode0", + "name": "q", + "owner": "jw" + }, + { + "access": 1, + "descriptor": "(B)I", + "method": "size", + "name": "w", + "owner": "jw", + "parameters": [] + } + ], + "name": "jw", + "super": "fn" + }, + { + "access": 33, + "class": "FaceNormal", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1376860893, + "descriptor": "I", + "field": "__f", + "name": "f", + "owner": "el" + }, + { + "access": 0, + "decoder": -2074333261, + "descriptor": "I", + "field": "__m", + "name": "m", + "owner": "el" + }, + { + "access": 0, + "decoder": 2619977, + "descriptor": "I", + "field": "__q", + "name": "q", + "owner": "el" + } + ], + "interfaces": [], + "methods": [], + "name": "el", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "FloorOverlayDefinition", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 1, + "decoder": -111851793, + "descriptor": "I", + "field": "rgb", + "name": "q", + "owner": "jf" + }, + { + "access": 1, + "decoder": -122393061, + "descriptor": "I", + "field": "hue2", + "name": "x", + "owner": "jf" + }, + { + "access": 1, + "decoder": -1719896767, + "descriptor": "I", + "field": "saturation", + "name": "l", + "owner": "jf" + }, + { + "access": 1, + "decoder": -624223733, + "descriptor": "I", + "field": "lightness", + "name": "e", + "owner": "jf" + }, + { + "access": 1, + "decoder": 127639041, + "descriptor": "I", + "field": "lightness2", + "name": "k", + "owner": "jf" + }, + { + "access": 1, + "decoder": 1514187401, + "descriptor": "I", + "field": "saturation2", + "name": "d", + "owner": "jf" + }, + { + "access": 1, + "decoder": 2013422835, + "descriptor": "I", + "field": "hue", + "name": "g", + "owner": "jf" + }, + { + "access": 1, + "decoder": 528865753, + "descriptor": "I", + "field": "rgb2", + "name": "u", + "owner": "jf" + }, + { + "access": 1, + "decoder": 733377225, + "descriptor": "I", + "field": "texture", + "name": "w", + "owner": "jf" + }, + { + "access": 1, + "descriptor": "Z", + "field": "__o", + "name": "o", + "owner": "jf" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(II)V", + "method": "setHsl", + "name": "o", + "owner": "jf", + "parameters": [ + "rgb" + ] + }, + { + "access": 0, + "descriptor": "(Lgr;III)V", + "method": "decode0", + "name": "w", + "owner": "jf" + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "postDecode", + "name": "f", + "owner": "jf", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(Lgr;II)V", + "method": "decode", + "name": "q", + "owner": "jf" + } + ], + "name": "jf", + "super": "fn" + }, + { + "access": 33, + "class": "FloorUnderlayDefinition", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -635678213, + "descriptor": "I", + "field": "rgb", + "name": "q", + "owner": "ih" + }, + { + "access": 1, + "decoder": -1465372343, + "descriptor": "I", + "field": "hue", + "name": "w", + "owner": "ih" + }, + { + "access": 1, + "decoder": -1691813081, + "descriptor": "I", + "field": "lightness", + "name": "u", + "owner": "ih" + }, + { + "access": 1, + "decoder": 1484542081, + "descriptor": "I", + "field": "hueMultiplier", + "name": "g", + "owner": "ih" + }, + { + "access": 1, + "decoder": 2031118785, + "descriptor": "I", + "field": "saturation", + "name": "o", + "owner": "ih" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)V", + "method": "postDecode", + "name": "q", + "owner": "ih", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(IB)V", + "method": "setHsl", + "name": "u", + "owner": "ih", + "parameters": [ + "rgb" + ] + }, + { + "access": 0, + "descriptor": "(Lgr;II)V", + "method": "decode", + "name": "w", + "owner": "ih" + }, + { + "access": 0, + "descriptor": "(Lgr;III)V", + "method": "decode0", + "name": "o", + "owner": "ih" + } + ], + "name": "ih", + "super": "fn" + }, + { + "access": 33, + "class": "FontName", + "constructors": [ + { + "access": 0, + "descriptor": "(Ljava/lang/String;)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "__g", + "name": "g", + "owner": "kx" + } + ], + "interfaces": [], + "methods": [], + "name": "kx", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "Fonts", + "constructors": [ + { + "access": 1, + "descriptor": "(Lir;Lir;)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Lir;", + "field": "__f", + "name": "f", + "owner": "kz" + }, + { + "access": 0, + "descriptor": "Lir;", + "field": "__m", + "name": "m", + "owner": "kz" + }, + { + "access": 0, + "descriptor": "Ljava/util/HashMap;", + "field": "map", + "name": "q", + "owner": "kz" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "([Lkx;I)Ljava/util/HashMap;", + "method": "createMap", + "name": "m", + "owner": "kz" + } + ], + "name": "kz", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "Formatting", + "constructors": [], + "fields": [], + "interfaces": [], + "methods": [], + "name": "cy", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "Frames", + "constructors": [ + { + "access": 1, + "descriptor": "(Lir;Lir;IZ)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "[Ldz;", + "field": "frames", + "name": "m", + "owner": "en" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "(II)Z", + "method": "hasAlphaTransform", + "name": "m", + "owner": "en", + "parameters": [ + "frame" + ] + } + ], + "name": "en", + "super": "fn" + }, + { + "access": 33, + "class": "Friend", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Z", + "field": "__f", + "name": "f", + "owner": "kq" + }, + { + "access": 0, + "descriptor": "Z", + "field": "__m", + "name": "m", + "owner": "kq" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lkq;I)I", + "method": "compareTo00", + "name": "m", + "owner": "kq", + "parameters": [ + "other" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;)I", + "method": "__compareTo_467", + "name": "compareTo", + "owner": "kq", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(Ljs;I)I", + "method": "__aj_466", + "name": "aj", + "owner": "kq", + "parameters": [ + "arg0" + ] + } + ], + "name": "kq", + "super": "ke" + }, + { + "access": 33, + "class": "FriendLoginUpdate", + "constructors": [ + { + "access": 0, + "descriptor": "(Lkp;I)V" + } + ], + "fields": [ + { + "access": 1, + "decoder": -1390885889, + "descriptor": "I", + "field": "time", + "name": "q", + "owner": "kn" + }, + { + "access": 1, + "descriptor": "Lkp;", + "field": "username", + "name": "w", + "owner": "kn" + }, + { + "access": 1, + "descriptor": "S", + "field": "world", + "name": "o", + "owner": "kn" + } + ], + "interfaces": [], + "methods": [], + "name": "kn", + "super": "gh" + }, + { + "access": 33, + "class": "FriendSystem", + "constructors": [ + { + "access": 0, + "descriptor": "(Llx;)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": 1477282369, + "descriptor": "I", + "field": "__g", + "name": "g", + "owner": "bh" + }, + { + "access": 16, + "descriptor": "Llx;", + "field": "loginType", + "name": "w", + "owner": "bh" + }, + { + "access": 17, + "descriptor": "Lkg;", + "field": "friendsList", + "name": "o", + "owner": "bh" + }, + { + "access": 17, + "descriptor": "Lkj;", + "field": "ignoreList", + "name": "u", + "owner": "bh" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(B)Z", + "method": "__m_151", + "name": "m", + "owner": "bh", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(B)Z", + "method": "__a_160", + "name": "a", + "owner": "bh", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(B)Z", + "method": "__e_158", + "name": "e", + "owner": "bh", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(I)V", + "method": "__f_152", + "name": "f", + "owner": "bh", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(I)V", + "method": "__w_154", + "name": "w", + "owner": "bh", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(I)V", + "method": "clear", + "name": "o", + "owner": "bh", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(Lgr;II)V", + "method": "__q_153", + "name": "q", + "owner": "bh", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 16, + "descriptor": "(Ljava/lang/String;B)V", + "method": "__x_159", + "name": "x", + "owner": "bh", + "parameters": [ + "arg0" + ] + }, + { + "access": 16, + "descriptor": "(Ljava/lang/String;I)V", + "method": "__l_157", + "name": "l", + "owner": "bh", + "parameters": [ + "arg0" + ] + }, + { + "access": 16, + "descriptor": "(Ljava/lang/String;I)V", + "method": "removeFriend", + "name": "z", + "owner": "bh", + "parameters": [ + "name" + ] + }, + { + "access": 16, + "descriptor": "(Ljava/lang/String;I)V", + "method": "removeIgnore", + "name": "j", + "owner": "bh", + "parameters": [ + "name" + ] + }, + { + "access": 16, + "descriptor": "(Lkp;I)Z", + "method": "__g_156", + "name": "g", + "owner": "bh", + "parameters": [ + "arg0" + ] + }, + { + "access": 16, + "descriptor": "(Lkp;S)Z", + "method": "__t_161", + "name": "t", + "owner": "bh", + "parameters": [ + "arg0" + ] + }, + { + "access": 16, + "descriptor": "(Lkp;ZI)Z", + "method": "__u_155", + "name": "u", + "owner": "bh", + "parameters": [ + "arg0", + "arg1" + ] + } + ], + "name": "bh", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "FriendsList", + "constructors": [ + { + "access": 1, + "descriptor": "(Llx;)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -217526077, + "descriptor": "I", + "field": "__x", + "name": "x", + "owner": "kg" + }, + { + "access": 1, + "descriptor": "Ljy;", + "field": "friendLoginUpdates", + "name": "d", + "owner": "kg" + }, + { + "access": 16, + "descriptor": "Llx;", + "field": "loginType", + "name": "q", + "owner": "kg" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)Ljs;", + "method": "newInstance", + "name": "m", + "owner": "kg" + }, + { + "access": 0, + "descriptor": "(II)[Ljs;", + "method": "newTypedArray", + "name": "f", + "owner": "kg" + }, + { + "access": 1, + "descriptor": "(Lgr;IB)V", + "method": "read", + "name": "x", + "owner": "kg", + "parameters": [ + "buffer", + "n" + ] + }, + { + "access": 1, + "descriptor": "(Lkp;ZI)Z", + "method": "__q_461", + "name": "q", + "owner": "kg", + "parameters": [ + "arg0", + "arg1" + ] + } + ], + "name": "kg", + "super": "km" + }, + { + "access": 33, + "class": "GrandExchangeEvent", + "constructors": [ + { + "access": 0, + "descriptor": "(Lgr;BI)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "string1", + "name": "w", + "owner": "l" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "string2", + "name": "o", + "owner": "l" + }, + { + "access": 17, + "decoder": -633089807, + "descriptor": "I", + "field": "world", + "name": "m", + "owner": "l" + }, + { + "access": 17, + "decoder": -6503890758391258000, + "descriptor": "J", + "field": "__f", + "name": "f", + "owner": "l" + }, + { + "access": 17, + "descriptor": "Lx;", + "field": "grandExchangeOffer", + "name": "q", + "owner": "l" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "(I)Ljava/lang/String;", + "method": "__f_4", + "name": "f", + "owner": "l", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)Ljava/lang/String;", + "method": "__m_3", + "name": "m", + "owner": "l", + "parameters": [] + } + ], + "name": "l", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "GrandExchangeEvents", + "constructors": [ + { + "access": 1, + "descriptor": "(Lgr;Z)V" + } + ], + "fields": [ + { + "access": 17, + "descriptor": "Ljava/util/List;", + "field": "events", + "name": "m", + "owner": "g" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "(Ljava/util/Comparator;ZI)V", + "method": "sort", + "name": "m", + "owner": "g" + } + ], + "name": "g", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "GrandExchangeOffer", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + }, + { + "access": 1, + "descriptor": "(Lgr;Z)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "B", + "field": "state", + "name": "m", + "owner": "x" + }, + { + "access": 1, + "decoder": -1627453165, + "descriptor": "I", + "field": "unitPrice", + "name": "q", + "owner": "x" + }, + { + "access": 1, + "decoder": 1136727241, + "descriptor": "I", + "field": "id", + "name": "f", + "owner": "x" + }, + { + "access": 1, + "decoder": 1413132419, + "descriptor": "I", + "field": "currentQuantity", + "name": "o", + "owner": "x" + }, + { + "access": 1, + "decoder": 396420073, + "descriptor": "I", + "field": "currentPrice", + "name": "u", + "owner": "x" + }, + { + "access": 1, + "decoder": 562564821, + "descriptor": "I", + "field": "totalQuantity", + "name": "w", + "owner": "x" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(II)V", + "method": "__o_9", + "name": "o", + "owner": "x", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "(II)V", + "method": "__u_10", + "name": "u", + "owner": "x", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "(Ljava/lang/Integer;I)V", + "method": "__f_8", + "name": "f", + "owner": "x", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "status", + "name": "q", + "owner": "x", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "type", + "name": "w", + "owner": "x", + "parameters": [] + } + ], + "name": "x", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "GraphicsDefaults", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 1, + "decoder": -104203005, + "descriptor": "I", + "field": "mapScenes", + "name": "q", + "owner": "lg" + }, + { + "access": 1, + "decoder": -1052769237, + "descriptor": "I", + "field": "headIconsPk", + "name": "w", + "owner": "lg" + }, + { + "access": 1, + "decoder": -1114417319, + "descriptor": "I", + "field": "mapDots", + "name": "e", + "owner": "lg" + }, + { + "access": 1, + "decoder": -1217061337, + "descriptor": "I", + "field": "mapMarkers", + "name": "g", + "owner": "lg" + }, + { + "access": 1, + "decoder": -1744250043, + "descriptor": "I", + "field": "headIconsPrayer", + "name": "o", + "owner": "lg" + }, + { + "access": 1, + "decoder": -919662109, + "descriptor": "I", + "field": "scrollBars", + "name": "x", + "owner": "lg" + }, + { + "access": 1, + "decoder": 159591367, + "descriptor": "I", + "field": "__f", + "name": "f", + "owner": "lg" + }, + { + "access": 1, + "decoder": 1673796151, + "descriptor": "I", + "field": "__m", + "name": "m", + "owner": "lg" + }, + { + "access": 1, + "decoder": 185111653, + "descriptor": "I", + "field": "headIconsHint", + "name": "u", + "owner": "lg" + }, + { + "access": 1, + "decoder": 2043130323, + "descriptor": "I", + "field": "modIcons", + "name": "d", + "owner": "lg" + }, + { + "access": 1, + "decoder": 536911453, + "descriptor": "I", + "field": "crosses", + "name": "l", + "owner": "lg" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "(Lir;I)V", + "method": "decode", + "name": "m", + "owner": "lg", + "parameters": [ + "index" + ] + } + ], + "name": "lg", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "GzipDecompressor", + "constructors": [ + { + "access": 0, + "descriptor": "(III)V" + }, + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Ljava/util/zip/Inflater;", + "field": "inflater", + "name": "m", + "owner": "go" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "(Lgr;[BB)V", + "method": "decompress", + "name": "m", + "owner": "go" + } + ], + "name": "go", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "HealthBar", + "constructors": [ + { + "access": 0, + "descriptor": "(Lii;)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Lii;", + "field": "definition", + "name": "q", + "owner": "cr" + }, + { + "access": 0, + "descriptor": "Lja;", + "field": "updates", + "name": "w", + "owner": "cr" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)Z", + "method": "isEmpty", + "name": "q", + "owner": "cr", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(II)Lbg;", + "method": "get", + "name": "f", + "owner": "cr", + "parameters": [ + "cycle" + ] + }, + { + "access": 0, + "descriptor": "(IIIIB)V", + "method": "put", + "name": "m", + "owner": "cr" + } + ], + "name": "cr", + "super": "gw" + }, + { + "access": 33, + "class": "HealthBarDefinition", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1707680631, + "descriptor": "I", + "field": "spriteId2", + "name": "i", + "owner": "ii" + }, + { + "access": 0, + "decoder": 1310001257, + "descriptor": "I", + "field": "spriteId1", + "name": "n", + "owner": "ii" + }, + { + "access": 1, + "decoder": -1180353973, + "descriptor": "I", + "field": "int3", + "name": "x", + "owner": "ii" + }, + { + "access": 1, + "decoder": -1956457117, + "descriptor": "I", + "field": "int4", + "name": "d", + "owner": "ii" + }, + { + "access": 1, + "decoder": -354704697, + "descriptor": "I", + "field": "width", + "name": "a", + "owner": "ii" + }, + { + "access": 1, + "decoder": -642961053, + "descriptor": "I", + "field": "int5", + "name": "k", + "owner": "ii" + }, + { + "access": 1, + "decoder": 1515955705, + "descriptor": "I", + "field": "__o", + "name": "o", + "owner": "ii" + }, + { + "access": 1, + "decoder": 166567703, + "descriptor": "I", + "field": "widthPadding", + "name": "z", + "owner": "ii" + }, + { + "access": 1, + "decoder": 1890433231, + "descriptor": "I", + "field": "int2", + "name": "e", + "owner": "ii" + }, + { + "access": 1, + "decoder": 390656615, + "descriptor": "I", + "field": "int1", + "name": "l", + "owner": "ii" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lgr;IB)V", + "method": "decode0", + "name": "f", + "owner": "ii" + }, + { + "access": 1, + "descriptor": "(B)Lln;", + "method": "getSprite1", + "name": "q", + "owner": "ii", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(B)Lln;", + "method": "getSprite2", + "name": "w", + "owner": "ii", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(Lgr;I)V", + "method": "decode", + "name": "m", + "owner": "ii" + } + ], + "name": "ii", + "super": "fn" + }, + { + "access": 33, + "class": "HealthBarUpdate", + "constructors": [ + { + "access": 0, + "descriptor": "(IIII)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1876302639, + "descriptor": "I", + "field": "cycleOffset", + "name": "w", + "owner": "bg" + }, + { + "access": 0, + "decoder": -820353645, + "descriptor": "I", + "field": "health2", + "name": "q", + "owner": "bg" + }, + { + "access": 0, + "decoder": 1821995313, + "descriptor": "I", + "field": "health", + "name": "f", + "owner": "bg" + }, + { + "access": 0, + "decoder": 2103089795, + "descriptor": "I", + "field": "cycle", + "name": "m", + "owner": "bg" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(IIIII)V", + "method": "set", + "name": "m", + "owner": "bg" + } + ], + "name": "bg", + "super": "gw" + }, + { + "access": 33, + "class": "HitmarkDefinition", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1533306389, + "descriptor": "I", + "field": "__a", + "name": "a", + "owner": "jm" + }, + { + "access": 0, + "decoder": -1677628889, + "descriptor": "I", + "field": "__z", + "name": "z", + "owner": "jm" + }, + { + "access": 0, + "decoder": -1841054487, + "descriptor": "I", + "field": "transformVarp", + "name": "ag", + "owner": "jm" + }, + { + "access": 0, + "decoder": 1683792491, + "descriptor": "I", + "field": "__j", + "name": "j", + "owner": "jm" + }, + { + "access": 0, + "decoder": 1845590719, + "descriptor": "I", + "field": "__s", + "name": "s", + "owner": "jm" + }, + { + "access": 0, + "decoder": 431076793, + "descriptor": "I", + "field": "fontId", + "name": "k", + "owner": "jm" + }, + { + "access": 0, + "decoder": 516423393, + "descriptor": "I", + "field": "transformVarbit", + "name": "v", + "owner": "jm" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "__b", + "name": "b", + "owner": "jm" + }, + { + "access": 1, + "decoder": -102270561, + "descriptor": "I", + "field": "__i", + "name": "i", + "owner": "jm" + }, + { + "access": 1, + "decoder": -1151968735, + "descriptor": "I", + "field": "__n", + "name": "n", + "owner": "jm" + }, + { + "access": 1, + "decoder": -389283589, + "descriptor": "I", + "field": "__t", + "name": "t", + "owner": "jm" + }, + { + "access": 1, + "decoder": 1003116765, + "descriptor": "I", + "field": "__c", + "name": "c", + "owner": "jm" + }, + { + "access": 1, + "decoder": 1498880475, + "descriptor": "I", + "field": "__r", + "name": "r", + "owner": "jm" + }, + { + "access": 1, + "decoder": 1751286975, + "descriptor": "I", + "field": "__y", + "name": "y", + "owner": "jm" + }, + { + "access": 1, + "decoder": 199815415, + "descriptor": "I", + "field": "__h", + "name": "h", + "owner": "jm" + }, + { + "access": 1, + "descriptor": "[I", + "field": "transforms", + "name": "p", + "owner": "jm" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lgr;I)V", + "method": "decode", + "name": "q", + "owner": "jm" + }, + { + "access": 0, + "descriptor": "(Lgr;II)V", + "method": "decode0", + "name": "w", + "owner": "jm" + }, + { + "access": 1, + "descriptor": "(B)Lln;", + "method": "__e_419", + "name": "e", + "owner": "jm", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(B)Lln;", + "method": "__l_418", + "name": "l", + "owner": "jm", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)Lkk;", + "method": "getFont", + "name": "d", + "owner": "jm", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)Lln;", + "method": "__g_417", + "name": "g", + "owner": "jm", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)Lln;", + "method": "__x_420", + "name": "x", + "owner": "jm", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(IS)Ljava/lang/String;", + "method": "getString", + "name": "u", + "owner": "jm", + "parameters": [ + "n" + ] + }, + { + "access": 17, + "descriptor": "(B)Ljm;", + "method": "transform", + "name": "o", + "owner": "jm", + "parameters": [] + } + ], + "name": "jm", + "super": "fn" + }, + { + "access": 33, + "class": "Huffman", + "constructors": [ + { + "access": 1, + "descriptor": "([B)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "[B", + "field": "__f", + "name": "f", + "owner": "gd" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__m", + "name": "m", + "owner": "gd" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__q", + "name": "q", + "owner": "gd" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "([BII[BIB)I", + "method": "__m_293", + "name": "m", + "owner": "gd", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4" + ] + }, + { + "access": 1, + "descriptor": "([BI[BIII)I", + "method": "__f_294", + "name": "f", + "owner": "gd", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4" + ] + } + ], + "name": "gd", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "IgnoreList", + "constructors": [ + { + "access": 1, + "descriptor": "(Llx;)V" + } + ], + "fields": [ + { + "access": 16, + "descriptor": "Llx;", + "field": "loginType", + "name": "q", + "owner": "kj" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)Ljs;", + "method": "newInstance", + "name": "m", + "owner": "kj" + }, + { + "access": 0, + "descriptor": "(II)[Ljs;", + "method": "newTypedArray", + "name": "f", + "owner": "kj" + }, + { + "access": 1, + "descriptor": "(Lgr;IB)V", + "method": "read", + "name": "q", + "owner": "kj", + "parameters": [ + "buffer", + "n" + ] + } + ], + "name": "kj", + "super": "km" + }, + { + "access": 33, + "class": "Ignored", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": 344024525, + "descriptor": "I", + "field": "id", + "name": "m", + "owner": "ks" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lks;I)I", + "method": "compareTo00", + "name": "m", + "owner": "ks", + "parameters": [ + "other" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;)I", + "method": "__compareTo_460", + "name": "compareTo", + "owner": "ks", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(Ljs;I)I", + "method": "__aj_459", + "name": "aj", + "owner": "ks", + "parameters": [ + "arg0" + ] + } + ], + "name": "ks", + "super": "js" + }, + { + "access": 33, + "class": "Instrument", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "I", + "field": "delayDecay", + "name": "n", + "owner": "db" + }, + { + "access": 0, + "descriptor": "I", + "field": "delayTime", + "name": "k", + "owner": "db" + }, + { + "access": 0, + "descriptor": "I", + "field": "duration", + "name": "z", + "owner": "db" + }, + { + "access": 0, + "descriptor": "I", + "field": "offset", + "name": "j", + "owner": "db" + }, + { + "access": 0, + "descriptor": "Lde;", + "field": "__a", + "name": "a", + "owner": "db" + }, + { + "access": 0, + "descriptor": "Lde;", + "field": "__f", + "name": "f", + "owner": "db" + }, + { + "access": 0, + "descriptor": "Lde;", + "field": "__g", + "name": "g", + "owner": "db" + }, + { + "access": 0, + "descriptor": "Lde;", + "field": "__l", + "name": "l", + "owner": "db" + }, + { + "access": 0, + "descriptor": "Lde;", + "field": "__m", + "name": "m", + "owner": "db" + }, + { + "access": 0, + "descriptor": "Lde;", + "field": "__o", + "name": "o", + "owner": "db" + }, + { + "access": 0, + "descriptor": "Lde;", + "field": "__q", + "name": "q", + "owner": "db" + }, + { + "access": 0, + "descriptor": "Lde;", + "field": "__u", + "name": "u", + "owner": "db" + }, + { + "access": 0, + "descriptor": "Lde;", + "field": "__w", + "name": "w", + "owner": "db" + }, + { + "access": 0, + "descriptor": "Ldi;", + "field": "filter", + "name": "i", + "owner": "db" + }, + { + "access": 0, + "descriptor": "[I", + "field": "oscillatorDelays", + "name": "d", + "owner": "db" + }, + { + "access": 0, + "descriptor": "[I", + "field": "oscillatorPitch", + "name": "x", + "owner": "db" + }, + { + "access": 0, + "descriptor": "[I", + "field": "oscillatorVolume", + "name": "e", + "owner": "db" + } + ], + "interfaces": [], + "methods": [ + { + "access": 16, + "descriptor": "(II)[I", + "method": "synthesize", + "name": "m", + "owner": "db" + }, + { + "access": 16, + "descriptor": "(III)I", + "method": "evaluateWave", + "name": "f", + "owner": "db" + }, + { + "access": 16, + "descriptor": "(Lgr;)V", + "method": "decode", + "name": "q", + "owner": "db", + "parameters": [ + "buffer" + ] + } + ], + "name": "db", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "IntHashTable", + "constructors": [ + { + "access": 1, + "descriptor": "([I)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "[I", + "field": "array", + "name": "m", + "owner": "lv" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "(II)I", + "method": "get", + "name": "m", + "owner": "lv" + } + ], + "name": "lv", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "IntegerNode", + "constructors": [ + { + "access": 1, + "descriptor": "(I)V" + } + ], + "fields": [ + { + "access": 1, + "descriptor": "I", + "field": "integer", + "name": "m", + "owner": "gn" + } + ], + "interfaces": [], + "methods": [], + "name": "gn", + "super": "gw" + }, + { + "access": 33, + "class": "InterfaceParent", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -707461797, + "descriptor": "I", + "field": "itf", + "name": "m", + "owner": "bx" + }, + { + "access": 0, + "decoder": 1712037041, + "descriptor": "I", + "field": "type", + "name": "f", + "owner": "bx" + }, + { + "access": 0, + "descriptor": "Z", + "field": "keep", + "name": "q", + "owner": "bx" + } + ], + "interfaces": [], + "methods": [], + "name": "bx", + "super": "gw" + }, + { + "access": 33, + "class": "Interpreter", + "constructors": [], + "fields": [], + "interfaces": [], + "methods": [], + "name": "bv", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "InvDefinition", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 1, + "decoder": 1358868971, + "descriptor": "I", + "field": "size", + "name": "q", + "owner": "ib" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lgr;I)V", + "method": "decode", + "name": "f", + "owner": "ib" + }, + { + "access": 0, + "descriptor": "(Lgr;II)V", + "method": "decode0", + "name": "q", + "owner": "ib" + } + ], + "name": "ib", + "super": "fn" + }, + { + "access": 33, + "class": "ItemContainer", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "[I", + "field": "ids", + "name": "f", + "owner": "bc" + }, + { + "access": 0, + "descriptor": "[I", + "field": "quantities", + "name": "q", + "owner": "bc" + } + ], + "interfaces": [], + "methods": [], + "name": "bc", + "super": "gw" + }, + { + "access": 33, + "class": "ItemDefinition", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1378899027, + "descriptor": "I", + "field": "manwearyoff", + "name": "aw", + "owner": "jv" + }, + { + "access": 0, + "decoder": -1619361485, + "descriptor": "I", + "field": "womanwearyoff", + "name": "ae", + "owner": "jv" + }, + { + "access": 0, + "decoder": -17174497, + "descriptor": "I", + "field": "resizey", + "name": "af", + "owner": "jv" + }, + { + "access": 0, + "decoder": -1969719185, + "descriptor": "I", + "field": "boughttemplate", + "name": "bd", + "owner": "jv" + }, + { + "access": 0, + "decoder": -650184697, + "descriptor": "I", + "field": "manhead", + "name": "ap", + "owner": "jv" + }, + { + "access": 0, + "decoder": -691559863, + "descriptor": "I", + "field": "manwear3", + "name": "at", + "owner": "jv" + }, + { + "access": 0, + "decoder": -771136925, + "descriptor": "I", + "field": "womanwear3", + "name": "ad", + "owner": "jv" + }, + { + "access": 0, + "decoder": 106668727, + "descriptor": "I", + "field": "womanhead2", + "name": "an", + "owner": "jv" + }, + { + "access": 0, + "decoder": 1070080857, + "descriptor": "I", + "field": "model", + "name": "a", + "owner": "jv" + }, + { + "access": 0, + "decoder": 1395132907, + "descriptor": "I", + "field": "resizez", + "name": "ai", + "owner": "jv" + }, + { + "access": 0, + "decoder": 140643039, + "descriptor": "I", + "field": "manwear2", + "name": "ak", + "owner": "jv" + }, + { + "access": 0, + "decoder": 154223105, + "descriptor": "I", + "field": "womanwear2", + "name": "ab", + "owner": "jv" + }, + { + "access": 0, + "decoder": 1709659237, + "descriptor": "I", + "field": "womanhead", + "name": "am", + "owner": "jv" + }, + { + "access": 0, + "decoder": 548044049, + "descriptor": "I", + "field": "manhead2", + "name": "as", + "owner": "jv" + }, + { + "access": 0, + "decoder": 69034859, + "descriptor": "I", + "field": "resizex", + "name": "ax", + "owner": "jv" + }, + { + "access": 0, + "decoder": 700576005, + "descriptor": "I", + "field": "boughtlink", + "name": "bk", + "owner": "jv" + }, + { + "access": 0, + "decoder": 881309855, + "descriptor": "I", + "field": "shiftclickindex", + "name": "ay", + "owner": "jv" + }, + { + "access": 0, + "decoder": 886682223, + "descriptor": "I", + "field": "womanwear", + "name": "al", + "owner": "jv" + }, + { + "access": 0, + "decoder": 939367983, + "descriptor": "I", + "field": "manwear", + "name": "ah", + "owner": "jv" + }, + { + "access": 0, + "descriptor": "Llh;", + "field": "params", + "name": "bq", + "owner": "jv" + }, + { + "access": 0, + "descriptor": "[I", + "field": "countco", + "name": "au", + "owner": "jv" + }, + { + "access": 0, + "descriptor": "[I", + "field": "countobj", + "name": "az", + "owner": "jv" + }, + { + "access": 0, + "descriptor": "[S", + "field": "recol_d", + "name": "s", + "owner": "jv" + }, + { + "access": 0, + "descriptor": "[S", + "field": "recol_s", + "name": "j", + "owner": "jv" + }, + { + "access": 0, + "descriptor": "[S", + "field": "retex_d", + "name": "y", + "owner": "jv" + }, + { + "access": 0, + "descriptor": "[S", + "field": "retex_s", + "name": "t", + "owner": "jv" + }, + { + "access": 1, + "decoder": -1057008657, + "descriptor": "I", + "field": "team", + "name": "bs", + "owner": "jv" + }, + { + "access": 1, + "decoder": -1854342455, + "descriptor": "I", + "field": "placeholdertemplate", + "name": "bo", + "owner": "jv" + }, + { + "access": 1, + "decoder": -1984887305, + "descriptor": "I", + "field": "contrast", + "name": "bb", + "owner": "jv" + }, + { + "access": 1, + "decoder": -2121346423, + "descriptor": "I", + "field": "certtemplate", + "name": "aa", + "owner": "jv" + }, + { + "access": 1, + "decoder": -2130350563, + "descriptor": "I", + "field": "yof2d", + "name": "v", + "owner": "jv" + }, + { + "access": 1, + "decoder": -237597001, + "descriptor": "I", + "field": "stackable", + "name": "ag", + "owner": "jv" + }, + { + "access": 1, + "decoder": -343501105, + "descriptor": "I", + "field": "cost", + "name": "aq", + "owner": "jv" + }, + { + "access": 1, + "decoder": -533708435, + "descriptor": "I", + "field": "xof2d", + "name": "p", + "owner": "jv" + }, + { + "access": 1, + "decoder": -590103687, + "descriptor": "I", + "field": "id", + "name": "i", + "owner": "jv" + }, + { + "access": 1, + "decoder": 278037959, + "descriptor": "I", + "field": "zoom2d", + "name": "h", + "owner": "jv" + }, + { + "access": 1, + "decoder": 507808107, + "descriptor": "I", + "field": "yan2d", + "name": "c", + "owner": "jv" + }, + { + "access": 1, + "decoder": 551313257, + "descriptor": "I", + "field": "zan2d", + "name": "r", + "owner": "jv" + }, + { + "access": 1, + "decoder": 619422509, + "descriptor": "I", + "field": "certlink", + "name": "ao", + "owner": "jv" + }, + { + "access": 1, + "decoder": 738319589, + "descriptor": "I", + "field": "ambient", + "name": "ba", + "owner": "jv" + }, + { + "access": 1, + "decoder": 807815565, + "descriptor": "I", + "field": "placeholderlink", + "name": "bc", + "owner": "jv" + }, + { + "access": 1, + "decoder": 880150839, + "descriptor": "I", + "field": "xan2d", + "name": "b", + "owner": "jv" + }, + { + "access": 1, + "descriptor": "Ljava/lang/String;", + "field": "name", + "name": "z", + "owner": "jv" + }, + { + "access": 1, + "descriptor": "Z", + "field": "members", + "name": "aj", + "owner": "jv" + }, + { + "access": 1, + "descriptor": "Z", + "field": "stockmarket", + "name": "bn", + "owner": "jv" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/String;", + "field": "iop", + "name": "ar", + "owner": "jv" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/String;", + "field": "op", + "name": "av", + "owner": "jv" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)V", + "method": "__f_425", + "name": "f", + "owner": "jv", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(Lgr;I)V", + "method": "decode", + "name": "q", + "owner": "jv" + }, + { + "access": 0, + "descriptor": "(Lgr;II)V", + "method": "decode0", + "name": "w", + "owner": "jv" + }, + { + "access": 0, + "descriptor": "(Ljv;Ljv;I)V", + "method": "genBought", + "name": "u", + "owner": "jv", + "parameters": [ + "link", + "template" + ] + }, + { + "access": 0, + "descriptor": "(Ljv;Ljv;I)V", + "method": "genCert", + "name": "o", + "owner": "jv", + "parameters": [ + "link", + "template" + ] + }, + { + "access": 0, + "descriptor": "(Ljv;Ljv;I)V", + "method": "genPlaceholder", + "name": "g", + "owner": "jv", + "parameters": [ + "link", + "template" + ] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "getShiftClickIndex", + "name": "b", + "owner": "jv", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(IB)Ljv;", + "method": "getCountObj", + "name": "x", + "owner": "jv", + "parameters": [ + "quantity" + ] + }, + { + "access": 1, + "descriptor": "(IIS)I", + "method": "getIntParam", + "name": "y", + "owner": "jv" + }, + { + "access": 1, + "descriptor": "(ILjava/lang/String;I)Ljava/lang/String;", + "method": "getStringParam", + "name": "h", + "owner": "jv" + }, + { + "access": 17, + "descriptor": "(II)Ldu;", + "method": "getModel", + "name": "e", + "owner": "jv", + "parameters": [ + "quantity" + ] + }, + { + "access": 17, + "descriptor": "(II)Ldw;", + "method": "__l_426", + "name": "l", + "owner": "jv", + "parameters": [ + "arg0" + ] + }, + { + "access": 17, + "descriptor": "(ZB)Ldw;", + "method": "__j_428", + "name": "j", + "owner": "jv", + "parameters": [ + "arg0" + ] + }, + { + "access": 17, + "descriptor": "(ZI)Ldw;", + "method": "__t_430", + "name": "t", + "owner": "jv", + "parameters": [ + "arg0" + ] + }, + { + "access": 17, + "descriptor": "(ZI)Z", + "method": "__s_429", + "name": "s", + "owner": "jv", + "parameters": [ + "arg0" + ] + }, + { + "access": 17, + "descriptor": "(ZI)Z", + "method": "__z_427", + "name": "z", + "owner": "jv", + "parameters": [ + "arg0" + ] + } + ], + "name": "jv", + "super": "fn" + }, + { + "access": 33, + "class": "IterableDualNodeQueue", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Lfn;", + "field": "head", + "name": "f", + "owner": "jc" + }, + { + "access": 1, + "descriptor": "Lfn;", + "field": "sentinel", + "name": "m", + "owner": "jc" + } + ], + "interfaces": [ + "java.lang.Iterable" + ], + "methods": [ + { + "access": 0, + "descriptor": "(Lfn;)Lfn;", + "method": "__o_446", + "name": "o", + "owner": "jc", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "()Lfn;", + "method": "__q_444", + "name": "q", + "owner": "jc", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()Lfn;", + "method": "__u_447", + "name": "u", + "owner": "jc", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()Lfn;", + "method": "__w_445", + "name": "w", + "owner": "jc", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()Ljava/util/Iterator;", + "method": "__iterator_448", + "name": "iterator", + "owner": "jc", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "clear", + "name": "m", + "owner": "jc", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(Lfn;)V", + "method": "add", + "name": "f", + "owner": "jc" + } + ], + "name": "jc", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "IterableDualNodeQueueIterator", + "constructors": [ + { + "access": 0, + "descriptor": "(Ljc;)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Lfn;", + "field": "__f", + "name": "f", + "owner": "jl" + }, + { + "access": 0, + "descriptor": "Lfn;", + "field": "__q", + "name": "q", + "owner": "jl" + }, + { + "access": 0, + "descriptor": "Ljc;", + "field": "queue", + "name": "m", + "owner": "jl" + } + ], + "interfaces": [ + "java.util.Iterator" + ], + "methods": [ + { + "access": 1, + "descriptor": "()Ljava/lang/Object;", + "method": "__next_436", + "name": "next", + "owner": "jl", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "__remove_438", + "name": "remove", + "owner": "jl", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()Z", + "method": "__hasNext_437", + "name": "hasNext", + "owner": "jl", + "parameters": [] + } + ], + "name": "jl", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "IterableNodeDeque", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Lgw;", + "field": "current", + "name": "f", + "owner": "ja" + }, + { + "access": 0, + "descriptor": "Lgw;", + "field": "sentinel", + "name": "m", + "owner": "ja" + } + ], + "interfaces": [ + "java.lang.Iterable" + ], + "methods": [ + { + "access": 0, + "descriptor": "(Lgw;)Lgw;", + "method": "previousOrLast", + "name": "u", + "owner": "ja", + "parameters": [ + "node" + ] + }, + { + "access": 1, + "descriptor": "()Lgw;", + "method": "last", + "name": "o", + "owner": "ja", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()Lgw;", + "method": "previous", + "name": "g", + "owner": "ja", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()Ljava/util/Iterator;", + "method": "__iterator_432", + "name": "iterator", + "owner": "ja", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "clear", + "name": "m", + "owner": "ja", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()Z", + "method": "isEmpty", + "name": "l", + "owner": "ja" + }, + { + "access": 1, + "descriptor": "(Lgw;)V", + "method": "addFirst", + "name": "f", + "owner": "ja", + "parameters": [ + "node" + ] + }, + { + "access": 1, + "descriptor": "(Lgw;)V", + "method": "addLast", + "name": "q", + "owner": "ja", + "parameters": [ + "node" + ] + } + ], + "name": "ja", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "IterableNodeDequeDescendingIterator", + "constructors": [ + { + "access": 0, + "descriptor": "(Lja;)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Lgw;", + "field": "__f", + "name": "f", + "owner": "jt" + }, + { + "access": 0, + "descriptor": "Lgw;", + "field": "__q", + "name": "q", + "owner": "jt" + }, + { + "access": 0, + "descriptor": "Lja;", + "field": "deque", + "name": "m", + "owner": "jt" + } + ], + "interfaces": [ + "java.util.Iterator" + ], + "methods": [ + { + "access": 0, + "descriptor": "()V", + "method": "__g_440", + "name": "g", + "owner": "jt", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(Lja;)V", + "method": "__u_439", + "name": "u", + "owner": "jt", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "()Ljava/lang/Object;", + "method": "__next_441", + "name": "next", + "owner": "jt", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "__remove_443", + "name": "remove", + "owner": "jt", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()Z", + "method": "__hasNext_442", + "name": "hasNext", + "owner": "jt", + "parameters": [] + } + ], + "name": "jt", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "IterableNodeHashTableIterator", + "constructors": [ + { + "access": 0, + "descriptor": "(Llh;)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "I", + "field": "__q", + "name": "q", + "owner": "lk" + }, + { + "access": 0, + "descriptor": "Lgw;", + "field": "__f", + "name": "f", + "owner": "lk" + }, + { + "access": 0, + "descriptor": "Lgw;", + "field": "__w", + "name": "w", + "owner": "lk" + }, + { + "access": 0, + "descriptor": "Llh;", + "field": "hashTable", + "name": "m", + "owner": "lk" + } + ], + "interfaces": [ + "java.util.Iterator" + ], + "methods": [ + { + "access": 0, + "descriptor": "()V", + "method": "__u_479", + "name": "u", + "owner": "lk", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()Ljava/lang/Object;", + "method": "__next_480", + "name": "next", + "owner": "lk", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "__remove_482", + "name": "remove", + "owner": "lk", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()Z", + "method": "__hasNext_481", + "name": "hasNext", + "owner": "lk", + "parameters": [] + } + ], + "name": "lk", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "KitDefinition", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "[I", + "field": "models", + "name": "d", + "owner": "im" + }, + { + "access": 0, + "descriptor": "[I", + "field": "models2", + "name": "u", + "owner": "im" + }, + { + "access": 0, + "descriptor": "[S", + "field": "recol_d", + "name": "l", + "owner": "im" + }, + { + "access": 0, + "descriptor": "[S", + "field": "recol_s", + "name": "g", + "owner": "im" + }, + { + "access": 0, + "descriptor": "[S", + "field": "retex_d", + "name": "x", + "owner": "im" + }, + { + "access": 0, + "descriptor": "[S", + "field": "retex_s", + "name": "e", + "owner": "im" + }, + { + "access": 1, + "decoder": 1619779051, + "descriptor": "I", + "field": "bodyPart", + "name": "o", + "owner": "im" + }, + { + "access": 1, + "descriptor": "Z", + "field": "__k", + "name": "k", + "owner": "im" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lgr;II)V", + "method": "decode0", + "name": "q", + "owner": "im" + }, + { + "access": 0, + "descriptor": "(Lgr;S)V", + "method": "decode", + "name": "f", + "owner": "im" + }, + { + "access": 1, + "descriptor": "(B)Ldw;", + "method": "__g_416", + "name": "g", + "owner": "im", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(B)Ldw;", + "method": "__o_414", + "name": "o", + "owner": "im", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)Z", + "method": "__u_415", + "name": "u", + "owner": "im", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)Z", + "method": "__w_413", + "name": "w", + "owner": "im", + "parameters": [] + } + ], + "name": "im", + "super": "fn" + }, + { + "access": 33, + "class": "Link", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 1, + "descriptor": "Lgh;", + "field": "__f", + "name": "f", + "owner": "gh" + }, + { + "access": 1, + "descriptor": "Lgh;", + "field": "__m", + "name": "m", + "owner": "gh" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "()V", + "method": "remove", + "name": "m", + "owner": "gh" + } + ], + "name": "gh", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "LinkDeque", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Lgh;", + "field": "__f", + "name": "f", + "owner": "jy" + }, + { + "access": 0, + "descriptor": "Lgh;", + "field": "__m", + "name": "m", + "owner": "jy" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "()Lgh;", + "method": "__f_434", + "name": "f", + "owner": "jy", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()Lgh;", + "method": "__q_435", + "name": "q", + "owner": "jy", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(Lgh;)V", + "method": "__m_433", + "name": "m", + "owner": "jy", + "parameters": [ + "arg0" + ] + } + ], + "name": "jy", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "Login", + "constructors": [], + "fields": [], + "interfaces": [], + "methods": [], + "name": "cu", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "LoginPacket", + "constructors": [ + { + "access": 0, + "descriptor": "(II)V" + } + ], + "fields": [ + { + "access": 17, + "decoder": 1743806243, + "descriptor": "I", + "field": "id", + "name": "u", + "owner": "gl" + } + ], + "interfaces": [ + "gb" + ], + "methods": [], + "name": "gl", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "LoginType", + "constructors": [ + { + "access": 0, + "descriptor": "(IILjava/lang/String;Ljava/lang/String;)V" + }, + { + "access": 0, + "descriptor": "(IILjava/lang/String;Ljava/lang/String;Z[Llx;)V" + } + ], + "fields": [ + { + "access": 16, + "descriptor": "Ljava/lang/String;", + "field": "__d", + "name": "d", + "owner": "lx" + }, + { + "access": 17, + "decoder": -1916729379, + "descriptor": "I", + "field": "__x", + "name": "x", + "owner": "lx" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "()Ljava/lang/String;", + "method": "__toString_542", + "name": "toString", + "owner": "lx", + "parameters": [] + } + ], + "name": "lx", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "MenuAction", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1483856253, + "descriptor": "I", + "field": "opcode", + "name": "q", + "owner": "cs" + }, + { + "access": 0, + "decoder": -2057883817, + "descriptor": "I", + "field": "argument0", + "name": "w", + "owner": "cs" + }, + { + "access": 0, + "decoder": 1764645917, + "descriptor": "I", + "field": "argument2", + "name": "f", + "owner": "cs" + }, + { + "access": 0, + "decoder": 305977315, + "descriptor": "I", + "field": "argument1", + "name": "m", + "owner": "cs" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "action", + "name": "o", + "owner": "cs" + } + ], + "interfaces": [], + "methods": [], + "name": "cs", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "Message", + "constructors": [ + { + "access": 0, + "descriptor": "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": 1164592791, + "descriptor": "I", + "field": "cycle", + "name": "f", + "owner": "bm" + }, + { + "access": 0, + "decoder": 1223792995, + "descriptor": "I", + "field": "type", + "name": "q", + "owner": "bm" + }, + { + "access": 0, + "decoder": 1597147817, + "descriptor": "I", + "field": "count", + "name": "m", + "owner": "bm" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "prefix", + "name": "l", + "owner": "bm" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "sender", + "name": "w", + "owner": "bm" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "text", + "name": "e", + "owner": "bm" + }, + { + "access": 0, + "descriptor": "Lkd;", + "field": "isFromFriend0", + "name": "u", + "owner": "bm" + }, + { + "access": 0, + "descriptor": "Lkd;", + "field": "isFromIgnored0", + "name": "g", + "owner": "bm" + }, + { + "access": 0, + "descriptor": "Lkp;", + "field": "senderUsername", + "name": "o", + "owner": "bm" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)V", + "method": "clearIsFromFriend", + "name": "f", + "owner": "bm", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "clearIsFromIgnored", + "name": "o", + "owner": "bm", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "fillIsFromFriend", + "name": "w", + "owner": "bm", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", + "method": "set", + "name": "m", + "owner": "bm", + "parameters": [ + "prefix", + "sender", + "text", + "type" + ] + }, + { + "access": 0, + "descriptor": "(S)V", + "method": "fillIsFromIgnored", + "name": "g", + "owner": "bm", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(B)V", + "method": "fillSenderUsername", + "name": "l", + "owner": "bm", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(B)Z", + "method": "isFromIgnored", + "name": "u", + "owner": "bm", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(I)Z", + "method": "isFromFriend", + "name": "q", + "owner": "bm", + "parameters": [] + } + ], + "name": "bm", + "super": "fn" + }, + { + "access": 33, + "class": "Messages", + "constructors": [], + "fields": [], + "interfaces": [], + "methods": [], + "name": "cw", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "MidiFileReader", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + }, + { + "access": 0, + "descriptor": "([B)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "I", + "field": "__g", + "name": "g", + "owner": "hs" + }, + { + "access": 0, + "descriptor": "I", + "field": "division", + "name": "f", + "owner": "hs" + }, + { + "access": 0, + "descriptor": "J", + "field": "__e", + "name": "e", + "owner": "hs" + }, + { + "access": 0, + "descriptor": "Lgr;", + "field": "buffer", + "name": "m", + "owner": "hs" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__u", + "name": "u", + "owner": "hs" + }, + { + "access": 0, + "descriptor": "[I", + "field": "trackLengths", + "name": "o", + "owner": "hs" + }, + { + "access": 0, + "descriptor": "[I", + "field": "trackPositions", + "name": "w", + "owner": "hs" + }, + { + "access": 0, + "descriptor": "[I", + "field": "trackStarts", + "name": "q", + "owner": "hs" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "()I", + "method": "getPrioritizedTrack", + "name": "z", + "owner": "hs", + "parameters": [] + }, + { + "access": 0, + "descriptor": "()I", + "method": "trackCount", + "name": "w", + "owner": "hs", + "parameters": [] + }, + { + "access": 0, + "descriptor": "()V", + "method": "clear", + "name": "f", + "owner": "hs", + "parameters": [] + }, + { + "access": 0, + "descriptor": "()V", + "method": "setTrackDone", + "name": "g", + "owner": "hs", + "parameters": [] + }, + { + "access": 0, + "descriptor": "()Z", + "method": "isDone", + "name": "j", + "owner": "hs", + "parameters": [] + }, + { + "access": 0, + "descriptor": "()Z", + "method": "isReady", + "name": "q", + "owner": "hs", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)I", + "method": "readMessage", + "name": "e", + "owner": "hs", + "parameters": [ + "trackId" + ] + }, + { + "access": 0, + "descriptor": "(I)I", + "method": "readMessage0", + "name": "x", + "owner": "hs", + "parameters": [ + "trackId" + ] + }, + { + "access": 0, + "descriptor": "(I)J", + "method": "__a_372", + "name": "a", + "owner": "hs", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "gotoTrack", + "name": "o", + "owner": "hs", + "parameters": [ + "trackId" + ] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "markTrackPosition", + "name": "u", + "owner": "hs", + "parameters": [ + "trackId" + ] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "readTrackLength", + "name": "l", + "owner": "hs", + "parameters": [ + "trackId" + ] + }, + { + "access": 0, + "descriptor": "(II)I", + "method": "__d_371", + "name": "d", + "owner": "hs", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 0, + "descriptor": "(J)V", + "method": "reset", + "name": "s", + "owner": "hs" + }, + { + "access": 0, + "descriptor": "([B)V", + "method": "parse", + "name": "m", + "owner": "hs", + "parameters": [ + "midi" + ] + } + ], + "name": "hs", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "MidiPcmStream", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -7547625335559871000, + "descriptor": "J", + "field": "__ac", + "name": "ac", + "owner": "hm" + }, + { + "access": 0, + "decoder": 1450922835, + "descriptor": "I", + "field": "track", + "name": "av", + "owner": "hm" + }, + { + "access": 0, + "decoder": 2095480747, + "descriptor": "I", + "field": "__q", + "name": "q", + "owner": "hm" + }, + { + "access": 0, + "decoder": 335918727, + "descriptor": "I", + "field": "__f", + "name": "f", + "owner": "hm" + }, + { + "access": 0, + "decoder": 3736036110499629000, + "descriptor": "J", + "field": "__ay", + "name": "ay", + "owner": "hm" + }, + { + "access": 0, + "decoder": 713752539, + "descriptor": "I", + "field": "trackLength", + "name": "ar", + "owner": "hm" + }, + { + "access": 0, + "descriptor": "Lhq;", + "field": "patchStream", + "name": "ah", + "owner": "hm" + }, + { + "access": 0, + "descriptor": "Lhs;", + "field": "midiFile", + "name": "aq", + "owner": "hm" + }, + { + "access": 0, + "descriptor": "Lld;", + "field": "musicPatches", + "name": "m", + "owner": "hm" + }, + { + "access": 0, + "descriptor": "Z", + "field": "__aj", + "name": "aj", + "owner": "hm" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__b", + "name": "b", + "owner": "hm" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__c", + "name": "c", + "owner": "hm" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__d", + "name": "d", + "owner": "hm" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__e", + "name": "e", + "owner": "hm" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__g", + "name": "g", + "owner": "hm" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__h", + "name": "h", + "owner": "hm" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__k", + "name": "k", + "owner": "hm" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__l", + "name": "l", + "owner": "hm" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__n", + "name": "n", + "owner": "hm" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__o", + "name": "o", + "owner": "hm" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__p", + "name": "p", + "owner": "hm" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__r", + "name": "r", + "owner": "hm" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__u", + "name": "u", + "owner": "hm" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__x", + "name": "x", + "owner": "hm" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__y", + "name": "y", + "owner": "hm" + }, + { + "access": 0, + "descriptor": "[[Lha;", + "field": "__ag", + "name": "ag", + "owner": "hm" + }, + { + "access": 0, + "descriptor": "[[Lha;", + "field": "__v", + "name": "v", + "owner": "hm" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(B)V", + "method": "__ai_367", + "name": "ai", + "owner": "hm", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "__at_354", + "name": "at", + "owner": "hm", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(II)V", + "method": "__ab_352", + "name": "ab", + "owner": "hm", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "(II)V", + "method": "__ad_355", + "name": "ad", + "owner": "hm", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "(II)V", + "method": "__ae_353", + "name": "ae", + "owner": "hm", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "(II)V", + "method": "__ah_351", + "name": "ah", + "owner": "hm", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "(II)V", + "method": "__ap_356", + "name": "ap", + "owner": "hm", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "(II)V", + "method": "__au_357", + "name": "au", + "owner": "hm", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "(IIB)V", + "method": "__p_349", + "name": "p", + "owner": "hm", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 0, + "descriptor": "(IIB)V", + "method": "__v_350", + "name": "v", + "owner": "hm", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 0, + "descriptor": "(III)V", + "method": "__ao_358", + "name": "ao", + "owner": "hm", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 0, + "descriptor": "(III)V", + "method": "__s_343", + "name": "s", + "owner": "hm", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 0, + "descriptor": "(III)V", + "method": "__t_344", + "name": "t", + "owner": "hm", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 0, + "descriptor": "(IIIB)V", + "method": "__y_345", + "name": "y", + "owner": "hm", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 0, + "descriptor": "(IIII)V", + "method": "__b_347", + "name": "b", + "owner": "hm", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 0, + "descriptor": "(IIII)V", + "method": "__c_348", + "name": "c", + "owner": "hm", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 0, + "descriptor": "(Lha;I)I", + "method": "__aa_359", + "name": "aa", + "owner": "hm", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "(Lha;I)I", + "method": "__af_361", + "name": "af", + "owner": "hm", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "(Lha;I)I", + "method": "__ax_360", + "name": "ax", + "owner": "hm", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "(Lha;I)Z", + "method": "__ba_368", + "name": "ba", + "owner": "hm", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "(Lha;ZI)V", + "method": "__h_346", + "name": "h", + "owner": "hm", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 0, + "descriptor": "(Lha;[IIII)Z", + "method": "__bb_369", + "name": "bb", + "owner": "hm", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3" + ] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__f_341", + "name": "f", + "owner": "hm", + "parameters": [] + }, + { + "access": 33, + "descriptor": "(B)V", + "method": "clearAll", + "name": "w", + "owner": "hm", + "parameters": [] + }, + { + "access": 33, + "descriptor": "(B)V", + "method": "removeAll", + "name": "o", + "owner": "hm", + "parameters": [] + }, + { + "access": 33, + "descriptor": "(I)V", + "method": "clear", + "name": "a", + "owner": "hm", + "parameters": [] + }, + { + "access": 33, + "descriptor": "(I)Z", + "method": "isReady", + "name": "z", + "owner": "hm", + "parameters": [] + }, + { + "access": 33, + "descriptor": "(IB)V", + "method": "__m_340", + "name": "m", + "owner": "hm", + "parameters": [ + "arg0" + ] + }, + { + "access": 33, + "descriptor": "(III)V", + "method": "__j_342", + "name": "j", + "owner": "hm", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 33, + "descriptor": "(Lhe;Lir;Ldt;II)Z", + "method": "loadMusicTrack", + "name": "q", + "owner": "hm", + "parameters": [ + "frequency", + "i", + "musicTrack", + "s" + ] + }, + { + "access": 33, + "descriptor": "(Lhe;ZI)V", + "method": "setMusicTrack", + "name": "x", + "owner": "hm", + "parameters": [ + "b", + "musicTrack" + ] + }, + { + "access": 36, + "descriptor": "()I", + "method": "__l_364", + "name": "l", + "owner": "hm", + "parameters": [] + }, + { + "access": 36, + "descriptor": "()Ldc;", + "method": "__g_363", + "name": "g", + "owner": "hm", + "parameters": [] + }, + { + "access": 36, + "descriptor": "()Ldc;", + "method": "__u_362", + "name": "u", + "owner": "hm", + "parameters": [] + }, + { + "access": 36, + "descriptor": "(I)V", + "method": "__d_366", + "name": "d", + "owner": "hm", + "parameters": [ + "arg0" + ] + }, + { + "access": 36, + "descriptor": "([III)V", + "method": "__e_365", + "name": "e", + "owner": "hm", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + } + ], + "name": "hm", + "super": "dc" + }, + { + "access": 33, + "class": "MilliClock", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -8372744267470319000, + "descriptor": "J", + "field": "__w", + "name": "w", + "owner": "fd" + }, + { + "access": 0, + "decoder": 1217137493, + "descriptor": "I", + "field": "__q", + "name": "q", + "owner": "fd" + }, + { + "access": 0, + "decoder": 1940981129, + "descriptor": "I", + "field": "__f", + "name": "f", + "owner": "fd" + }, + { + "access": 0, + "decoder": 250272357, + "descriptor": "I", + "field": "__o", + "name": "o", + "owner": "fd" + }, + { + "access": 0, + "decoder": 576555527, + "descriptor": "I", + "field": "__u", + "name": "u", + "owner": "fd" + }, + { + "access": 0, + "descriptor": "[J", + "field": "__m", + "name": "m", + "owner": "fd" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "(B)V", + "method": "mark", + "name": "m", + "owner": "fd", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(III)I", + "method": "wait", + "name": "f", + "owner": "fd", + "parameters": [ + "cycleMs", + "minSleepMs" + ] + } + ], + "name": "fd", + "super": "fa" + }, + { + "access": 33, + "class": "Model", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + }, + { + "access": 1, + "descriptor": "([Ldu;I)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "B", + "field": "__y", + "name": "y", + "owner": "du" + }, + { + "access": 0, + "descriptor": "I", + "field": "__h", + "name": "h", + "owner": "du" + }, + { + "access": 0, + "descriptor": "I", + "field": "bottomY", + "name": "aj", + "owner": "du" + }, + { + "access": 0, + "descriptor": "I", + "field": "boundsType", + "name": "aq", + "owner": "du" + }, + { + "access": 0, + "descriptor": "I", + "field": "diameter", + "name": "ar", + "owner": "du" + }, + { + "access": 0, + "descriptor": "I", + "field": "indicesCount", + "name": "e", + "owner": "du" + }, + { + "access": 0, + "descriptor": "I", + "field": "radius", + "name": "ac", + "owner": "du" + }, + { + "access": 0, + "descriptor": "I", + "field": "verticesCount", + "name": "o", + "owner": "du" + }, + { + "access": 0, + "descriptor": "I", + "field": "xMid", + "name": "ay", + "owner": "du" + }, + { + "access": 0, + "descriptor": "I", + "field": "xMidOffset", + "name": "aw", + "owner": "du" + }, + { + "access": 0, + "descriptor": "I", + "field": "xzRadius", + "name": "av", + "owner": "du" + }, + { + "access": 0, + "descriptor": "I", + "field": "yMid", + "name": "ah", + "owner": "du" + }, + { + "access": 0, + "descriptor": "I", + "field": "yMidOffset", + "name": "al", + "owner": "du" + }, + { + "access": 0, + "descriptor": "I", + "field": "zMid", + "name": "ak", + "owner": "du" + }, + { + "access": 0, + "descriptor": "I", + "field": "zMidOffset", + "name": "ab", + "owner": "du" + }, + { + "access": 0, + "descriptor": "[B", + "field": "__s", + "name": "s", + "owner": "du" + }, + { + "access": 0, + "descriptor": "[B", + "field": "__z", + "name": "z", + "owner": "du" + }, + { + "access": 0, + "descriptor": "[B", + "field": "faceAlphas", + "name": "j", + "owner": "du" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__b", + "name": "b", + "owner": "du" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__c", + "name": "c", + "owner": "du" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__r", + "name": "r", + "owner": "du" + }, + { + "access": 0, + "descriptor": "[I", + "field": "faceColors1", + "name": "n", + "owner": "du" + }, + { + "access": 0, + "descriptor": "[I", + "field": "faceColors2", + "name": "i", + "owner": "du" + }, + { + "access": 0, + "descriptor": "[I", + "field": "faceColors3", + "name": "a", + "owner": "du" + }, + { + "access": 0, + "descriptor": "[I", + "field": "indices1", + "name": "x", + "owner": "du" + }, + { + "access": 0, + "descriptor": "[I", + "field": "indices2", + "name": "d", + "owner": "du" + }, + { + "access": 0, + "descriptor": "[I", + "field": "indices3", + "name": "k", + "owner": "du" + }, + { + "access": 0, + "descriptor": "[I", + "field": "verticesX", + "name": "u", + "owner": "du" + }, + { + "access": 0, + "descriptor": "[I", + "field": "verticesY", + "name": "g", + "owner": "du" + }, + { + "access": 0, + "descriptor": "[I", + "field": "verticesZ", + "name": "l", + "owner": "du" + }, + { + "access": 0, + "descriptor": "[S", + "field": "faceTextures", + "name": "t", + "owner": "du" + }, + { + "access": 0, + "descriptor": "[[I", + "field": "faceLabelsAlpha", + "name": "v", + "owner": "du" + }, + { + "access": 0, + "descriptor": "[[I", + "field": "vertexLabels", + "name": "p", + "owner": "du" + }, + { + "access": 1, + "descriptor": "Z", + "field": "isSingleTile", + "name": "ag", + "owner": "du" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "()V", + "method": "__g_232", + "name": "g", + "owner": "du", + "parameters": [] + }, + { + "access": 0, + "descriptor": "()V", + "method": "resetBounds", + "name": "x", + "owner": "du", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "calculateBoundingBox", + "name": "o", + "owner": "du", + "parameters": [ + "yaw" + ] + }, + { + "access": 0, + "descriptor": "(IIIIIIIIJ)V", + "method": "draw", + "name": "cy", + "owner": "du", + "parameters": [ + "cameraPitchCosine", + "cameraPitchSine", + "cameraYawCosine", + "cameraYawSine", + "tag", + "x", + "y", + "yaw", + "z" + ] + }, + { + "access": 0, + "descriptor": "(I[IIII)V", + "method": "transform", + "name": "z", + "owner": "du", + "parameters": [ + "labels", + "tx", + "ty", + "type", + "tz" + ] + }, + { + "access": 0, + "descriptor": "(ZLdu;[B)Ldu;", + "method": "copy0", + "name": "w", + "owner": "du" + }, + { + "access": 1, + "descriptor": "()I", + "method": "__l_233", + "name": "l", + "owner": "du", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "calculateBoundsCylinder", + "name": "u", + "owner": "du", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "rotateY180", + "name": "s", + "owner": "du", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "rotateY270Ccw", + "name": "t", + "owner": "du", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "rotateY90Ccw", + "name": "j", + "owner": "du", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "rotateZ", + "name": "y", + "owner": "du", + "parameters": [ + "pitch" + ] + }, + { + "access": 1, + "descriptor": "(III)V", + "method": "offsetBy", + "name": "h", + "owner": "du", + "parameters": [ + "x", + "y", + "z" + ] + }, + { + "access": 1, + "descriptor": "(III)V", + "method": "scale", + "name": "b", + "owner": "du", + "parameters": [ + "x", + "y", + "z" + ] + }, + { + "access": 1, + "descriptor": "(Len;I)V", + "finalArgument": -2, + "method": "animate", + "name": "d", + "owner": "du", + "parameters": [ + "frame", + "frames" + ] + }, + { + "access": 1, + "descriptor": "(Len;ILen;I[I)V", + "method": "animate2", + "name": "a", + "owner": "du" + }, + { + "access": 1, + "descriptor": "(Z)Ldu;", + "method": "toSharedSequenceModel", + "name": "f", + "owner": "du", + "parameters": [ + "b" + ] + }, + { + "access": 1, + "descriptor": "(Z)Ldu;", + "method": "toSharedSpotAnimationModel", + "name": "q", + "owner": "du", + "parameters": [ + "b" + ] + }, + { + "access": 1, + "descriptor": "([[IIIIZI)Ldu;", + "method": "__m_231", + "name": "m", + "owner": "du", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4", + "arg5" + ] + }, + { + "access": 16, + "descriptor": "(I)V", + "method": "__ag_236", + "name": "ag", + "owner": "du", + "parameters": [ + "arg0" + ] + }, + { + "access": 16, + "descriptor": "(I)V", + "method": "__aq_237", + "name": "aq", + "owner": "du", + "parameters": [ + "arg0" + ] + }, + { + "access": 16, + "descriptor": "(ZZZJ)V", + "method": "draw0", + "name": "v", + "owner": "du" + }, + { + "access": 17, + "descriptor": "(IIIIIII)V", + "method": "__c_234", + "name": "c", + "owner": "du", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4", + "arg5", + "arg6" + ] + }, + { + "access": 17, + "descriptor": "(IIIIIIII)V", + "method": "__p_235", + "name": "p", + "owner": "du", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4", + "arg5", + "arg6", + "arg7" + ] + } + ], + "name": "du", + "super": "ex" + }, + { + "access": 33, + "class": "ModelData", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + }, + { + "access": 0, + "descriptor": "([B)V" + }, + { + "access": 1, + "descriptor": "(Ldw;ZZZZ)V" + }, + { + "access": 1, + "descriptor": "([Ldw;I)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "B", + "field": "__a", + "name": "a", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "I", + "field": "__ac", + "name": "ac", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "I", + "field": "__ah", + "name": "ah", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "I", + "field": "__ak", + "name": "ak", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "I", + "field": "__ar", + "name": "ar", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "I", + "field": "__ay", + "name": "ay", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "I", + "field": "__z", + "name": "z", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "I", + "field": "faceCount", + "name": "o", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "I", + "field": "verticesCount", + "name": "m", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "Z", + "field": "isBoundsCalculated", + "name": "av", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[B", + "field": "__e", + "name": "e", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[B", + "field": "__j", + "name": "j", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[B", + "field": "__k", + "name": "k", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[B", + "field": "__x", + "name": "x", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[B", + "field": "faceAlphas", + "name": "d", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__b", + "name": "b", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__h", + "name": "h", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[I", + "field": "indices1", + "name": "u", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[I", + "field": "indices2", + "name": "g", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[I", + "field": "indices3", + "name": "l", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[I", + "field": "verticesX", + "name": "f", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[I", + "field": "verticesY", + "name": "q", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[I", + "field": "verticesZ", + "name": "w", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[Ldq;", + "field": "__ag", + "name": "ag", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[Ldq;", + "field": "__v", + "name": "v", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[Lel;", + "field": "faceNormals", + "name": "p", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[S", + "field": "__s", + "name": "s", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[S", + "field": "__t", + "name": "t", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[S", + "field": "__y", + "name": "y", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[S", + "field": "faceColors", + "name": "n", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[S", + "field": "faceTextures", + "name": "i", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[[I", + "field": "faceLabelsAlpha", + "name": "r", + "owner": "dw" + }, + { + "access": 0, + "descriptor": "[[I", + "field": "vertexLabels", + "name": "c", + "owner": "dw" + }, + { + "access": 1, + "descriptor": "S", + "field": "__aj", + "name": "aj", + "owner": "dw" + }, + { + "access": 1, + "descriptor": "S", + "field": "__aq", + "name": "aq", + "owner": "dw" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "()V", + "method": "__c_229", + "name": "c", + "owner": "dw", + "parameters": [] + }, + { + "access": 0, + "descriptor": "()V", + "method": "__g_220", + "name": "g", + "owner": "dw", + "parameters": [] + }, + { + "access": 0, + "descriptor": "()V", + "method": "invalidate", + "name": "b", + "owner": "dw", + "parameters": [] + }, + { + "access": 0, + "descriptor": "([B)V", + "method": "__f_215", + "name": "f", + "owner": "dw", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "([B)V", + "method": "__q_216", + "name": "q", + "owner": "dw", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "()Ldw;", + "method": "__o_218", + "name": "o", + "owner": "dw", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "__d_223", + "name": "d", + "owner": "dw", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "__h_228", + "name": "h", + "owner": "dw", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "__l_221", + "name": "l", + "owner": "dw", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "__t_226", + "name": "t", + "owner": "dw", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "__x_222", + "name": "x", + "owner": "dw", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "__a_224", + "name": "a", + "owner": "dw", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(III)V", + "method": "__y_227", + "name": "y", + "owner": "dw", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "(III)V", + "method": "__z_225", + "name": "z", + "owner": "dw", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "(SS)V", + "method": "recolor", + "name": "j", + "owner": "dw", + "parameters": [ + "from", + "to" + ] + }, + { + "access": 1, + "descriptor": "(SS)V", + "method": "retexture", + "name": "s", + "owner": "dw", + "parameters": [ + "from", + "to" + ] + }, + { + "access": 1, + "descriptor": "([[IIIIZI)Ldw;", + "method": "__u_219", + "name": "u", + "owner": "dw", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4", + "arg5" + ] + }, + { + "access": 16, + "descriptor": "(Ldw;I)I", + "method": "__w_217", + "name": "w", + "owner": "dw", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 17, + "descriptor": "(IIIII)Ldu;", + "method": "toModel", + "name": "v", + "owner": "dw", + "parameters": [ + "a", + "b", + "c", + "d", + "e" + ] + } + ], + "name": "dw", + "super": "ex" + }, + { + "access": 33, + "class": "ModelData0", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [], + "interfaces": [], + "methods": [], + "name": "ed", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "MouseHandler", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [], + "interfaces": [ + "java.awt.event.FocusListener", + "java.awt.event.MouseListener", + "java.awt.event.MouseMotionListener" + ], + "methods": [ + { + "access": 16, + "descriptor": "(Ljava/awt/event/MouseEvent;I)I", + "method": "getButton", + "name": "f", + "owner": "bb", + "parameters": [ + "mouseEvent" + ] + }, + { + "access": 17, + "descriptor": "(Ljava/awt/event/FocusEvent;)V", + "method": "__focusGained_119", + "name": "focusGained", + "owner": "bb", + "parameters": [ + "arg0" + ] + }, + { + "access": 17, + "descriptor": "(Ljava/awt/event/MouseEvent;)V", + "method": "__mouseClicked_115", + "name": "mouseClicked", + "owner": "bb", + "parameters": [ + "arg0" + ] + }, + { + "access": 49, + "descriptor": "(Ljava/awt/event/FocusEvent;)V", + "method": "__focusLost_120", + "name": "focusLost", + "owner": "bb", + "parameters": [ + "arg0" + ] + }, + { + "access": 49, + "descriptor": "(Ljava/awt/event/MouseEvent;)V", + "method": "__mouseDragged_118", + "name": "mouseDragged", + "owner": "bb", + "parameters": [ + "arg0" + ] + }, + { + "access": 49, + "descriptor": "(Ljava/awt/event/MouseEvent;)V", + "method": "__mouseEntered_116", + "name": "mouseEntered", + "owner": "bb", + "parameters": [ + "arg0" + ] + }, + { + "access": 49, + "descriptor": "(Ljava/awt/event/MouseEvent;)V", + "method": "__mouseExited_117", + "name": "mouseExited", + "owner": "bb", + "parameters": [ + "arg0" + ] + }, + { + "access": 49, + "descriptor": "(Ljava/awt/event/MouseEvent;)V", + "method": "__mouseReleased_114", + "name": "mouseReleased", + "owner": "bb", + "parameters": [ + "arg0" + ] + }, + { + "access": 49, + "descriptor": "(Ljava/awt/event/MouseEvent;)V", + "method": "mouseMoved", + "name": "mouseMoved", + "owner": "bb" + }, + { + "access": 49, + "descriptor": "(Ljava/awt/event/MouseEvent;)V", + "method": "mousePressed", + "name": "mousePressed", + "owner": "bb" + } + ], + "name": "bb", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "MouseRecorder", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": 973045825, + "descriptor": "I", + "field": "index", + "name": "q", + "owner": "bu" + }, + { + "access": 0, + "descriptor": "Ljava/lang/Object;", + "field": "lock", + "name": "f", + "owner": "bu" + }, + { + "access": 0, + "descriptor": "Z", + "field": "isRunning", + "name": "m", + "owner": "bu" + }, + { + "access": 0, + "descriptor": "[I", + "field": "xs", + "name": "w", + "owner": "bu" + }, + { + "access": 0, + "descriptor": "[I", + "field": "ys", + "name": "o", + "owner": "bu" + }, + { + "access": 0, + "descriptor": "[J", + "field": "millis", + "name": "u", + "owner": "bu" + } + ], + "interfaces": [ + "java.lang.Runnable" + ], + "methods": [ + { + "access": 1, + "descriptor": "()V", + "method": "__run_123", + "name": "run", + "owner": "bu", + "parameters": [] + } + ], + "name": "bu", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "MusicPatch", + "constructors": [ + { + "access": 0, + "descriptor": "([B)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": 574200865, + "descriptor": "I", + "field": "__m", + "name": "m", + "owner": "hl" + }, + { + "access": 0, + "descriptor": "[B", + "field": "__g", + "name": "g", + "owner": "hl" + }, + { + "access": 0, + "descriptor": "[B", + "field": "__o", + "name": "o", + "owner": "hl" + }, + { + "access": 0, + "descriptor": "[B", + "field": "__w", + "name": "w", + "owner": "hl" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__l", + "name": "l", + "owner": "hl" + }, + { + "access": 0, + "descriptor": "[Lcx;", + "field": "rawSounds", + "name": "f", + "owner": "hl" + }, + { + "access": 0, + "descriptor": "[Lhd;", + "field": "__u", + "name": "u", + "owner": "hl" + }, + { + "access": 0, + "descriptor": "[S", + "field": "__q", + "name": "q", + "owner": "hl" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(B)V", + "method": "clear", + "name": "q", + "owner": "hl", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(Ldt;[B[II)Z", + "method": "__f_373", + "name": "f", + "owner": "hl", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + } + ], + "name": "hl", + "super": "gw" + }, + { + "access": 33, + "class": "MusicPatchNode", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1520706641, + "descriptor": "I", + "field": "__x", + "name": "x", + "owner": "ha" + }, + { + "access": 0, + "decoder": -2058553171, + "descriptor": "I", + "field": "__o", + "name": "o", + "owner": "ha" + }, + { + "access": 0, + "decoder": -2083252379, + "descriptor": "I", + "field": "__a", + "name": "a", + "owner": "ha" + }, + { + "access": 0, + "decoder": -2136855685, + "descriptor": "I", + "field": "__i", + "name": "i", + "owner": "ha" + }, + { + "access": 0, + "decoder": -308599455, + "descriptor": "I", + "field": "__l", + "name": "l", + "owner": "ha" + }, + { + "access": 0, + "decoder": -439388365, + "descriptor": "I", + "field": "__k", + "name": "k", + "owner": "ha" + }, + { + "access": 0, + "decoder": -471899285, + "descriptor": "I", + "field": "__e", + "name": "e", + "owner": "ha" + }, + { + "access": 0, + "decoder": -666877449, + "descriptor": "I", + "field": "__y", + "name": "y", + "owner": "ha" + }, + { + "access": 0, + "decoder": -836502917, + "descriptor": "I", + "field": "__g", + "name": "g", + "owner": "ha" + }, + { + "access": 0, + "decoder": -852988281, + "descriptor": "I", + "field": "__d", + "name": "d", + "owner": "ha" + }, + { + "access": 0, + "decoder": 1359854411, + "descriptor": "I", + "field": "__b", + "name": "b", + "owner": "ha" + }, + { + "access": 0, + "decoder": 1605236771, + "descriptor": "I", + "field": "__z", + "name": "z", + "owner": "ha" + }, + { + "access": 0, + "decoder": 173672931, + "descriptor": "I", + "field": "__j", + "name": "j", + "owner": "ha" + }, + { + "access": 0, + "decoder": 219840779, + "descriptor": "I", + "field": "__s", + "name": "s", + "owner": "ha" + }, + { + "access": 0, + "decoder": 476852577, + "descriptor": "I", + "field": "__n", + "name": "n", + "owner": "ha" + }, + { + "access": 0, + "decoder": 62958303, + "descriptor": "I", + "field": "__u", + "name": "u", + "owner": "ha" + }, + { + "access": 0, + "decoder": 801157533, + "descriptor": "I", + "field": "__m", + "name": "m", + "owner": "ha" + }, + { + "access": 0, + "descriptor": "Lcx;", + "field": "rawSound", + "name": "q", + "owner": "ha" + }, + { + "access": 0, + "descriptor": "Lds;", + "field": "stream", + "name": "t", + "owner": "ha" + }, + { + "access": 0, + "descriptor": "Lhd;", + "field": "__w", + "name": "w", + "owner": "ha" + }, + { + "access": 0, + "descriptor": "Lhl;", + "field": "patch", + "name": "f", + "owner": "ha" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(B)V", + "method": "__m_370", + "name": "m", + "owner": "ha", + "parameters": [] + } + ], + "name": "ha", + "super": "gw" + }, + { + "access": 33, + "class": "MusicPatchNode2", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1455145595, + "descriptor": "I", + "field": "__o", + "name": "o", + "owner": "hd" + }, + { + "access": 0, + "decoder": -249046051, + "descriptor": "I", + "field": "__w", + "name": "w", + "owner": "hd" + }, + { + "access": 0, + "decoder": 140046797, + "descriptor": "I", + "field": "__q", + "name": "q", + "owner": "hd" + }, + { + "access": 0, + "decoder": 1577527995, + "descriptor": "I", + "field": "__u", + "name": "u", + "owner": "hd" + }, + { + "access": 0, + "decoder": 1984131473, + "descriptor": "I", + "field": "__e", + "name": "e", + "owner": "hd" + }, + { + "access": 0, + "decoder": 320761691, + "descriptor": "I", + "field": "__l", + "name": "l", + "owner": "hd" + }, + { + "access": 0, + "decoder": 391670135, + "descriptor": "I", + "field": "__g", + "name": "g", + "owner": "hd" + }, + { + "access": 0, + "descriptor": "[B", + "field": "__f", + "name": "f", + "owner": "hd" + }, + { + "access": 0, + "descriptor": "[B", + "field": "__m", + "name": "m", + "owner": "hd" + } + ], + "interfaces": [], + "methods": [], + "name": "hd", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "MusicPatchPcmStream", + "constructors": [ + { + "access": 0, + "descriptor": "(Lhm;)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Lct;", + "field": "mixer", + "name": "q", + "owner": "hq" + }, + { + "access": 0, + "descriptor": "Lhm;", + "field": "superStream", + "name": "m", + "owner": "hq" + }, + { + "access": 0, + "descriptor": "Lje;", + "field": "queue", + "name": "f", + "owner": "hq" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lha;II)V", + "method": "__f_380", + "name": "f", + "owner": "hq", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 0, + "descriptor": "(Lha;[IIIII)V", + "method": "__m_379", + "name": "m", + "owner": "hq", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4" + ] + }, + { + "access": 4, + "descriptor": "()I", + "method": "__l_376", + "name": "l", + "owner": "hq", + "parameters": [] + }, + { + "access": 4, + "descriptor": "()Ldc;", + "method": "__g_375", + "name": "g", + "owner": "hq", + "parameters": [] + }, + { + "access": 4, + "descriptor": "()Ldc;", + "method": "__u_374", + "name": "u", + "owner": "hq", + "parameters": [] + }, + { + "access": 4, + "descriptor": "(I)V", + "method": "__d_378", + "name": "d", + "owner": "hq", + "parameters": [ + "arg0" + ] + }, + { + "access": 4, + "descriptor": "([III)V", + "method": "__e_377", + "name": "e", + "owner": "hq", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + } + ], + "name": "hq", + "super": "dc" + }, + { + "access": 33, + "class": "MusicSample", + "constructors": [ + { + "access": 0, + "descriptor": "([B)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "I", + "field": "__ah", + "name": "ah", + "owner": "cd" + }, + { + "access": 0, + "descriptor": "I", + "field": "__ay", + "name": "ay", + "owner": "cd" + }, + { + "access": 0, + "descriptor": "I", + "field": "__h", + "name": "h", + "owner": "cd" + }, + { + "access": 0, + "descriptor": "I", + "field": "__y", + "name": "y", + "owner": "cd" + }, + { + "access": 0, + "descriptor": "I", + "field": "end", + "name": "o", + "owner": "cd" + }, + { + "access": 0, + "descriptor": "I", + "field": "sampleCount", + "name": "q", + "owner": "cd" + }, + { + "access": 0, + "descriptor": "I", + "field": "sampleRate", + "name": "f", + "owner": "cd" + }, + { + "access": 0, + "descriptor": "I", + "field": "start", + "name": "w", + "owner": "cd" + }, + { + "access": 0, + "descriptor": "Z", + "field": "__b", + "name": "b", + "owner": "cd" + }, + { + "access": 0, + "descriptor": "Z", + "field": "__u", + "name": "u", + "owner": "cd" + }, + { + "access": 0, + "descriptor": "[B", + "field": "samples", + "name": "ac", + "owner": "cd" + }, + { + "access": 0, + "descriptor": "[F", + "field": "__t", + "name": "t", + "owner": "cd" + }, + { + "access": 0, + "descriptor": "[[B", + "field": "__m", + "name": "m", + "owner": "cd" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)[F", + "method": "__g_175", + "name": "g", + "owner": "cd", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "([B)V", + "method": "read", + "name": "o", + "owner": "cd" + }, + { + "access": 0, + "descriptor": "([I)Lcx;", + "method": "toRawSound", + "name": "x", + "owner": "cd" + } + ], + "name": "cd", + "super": "gw" + }, + { + "access": 33, + "class": "MusicTrack", + "constructors": [ + { + "access": 0, + "descriptor": "(Lgr;)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Lld;", + "field": "table", + "name": "m", + "owner": "he" + }, + { + "access": 0, + "descriptor": "[B", + "field": "midi", + "name": "f", + "owner": "he" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "()V", + "method": "__f_381", + "name": "f", + "owner": "he", + "parameters": [] + }, + { + "access": 0, + "descriptor": "()V", + "method": "clear", + "name": "q", + "owner": "he", + "parameters": [] + } + ], + "name": "he", + "super": "gw" + }, + { + "access": 33, + "class": "NanoClock", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": 7586221391557635000, + "descriptor": "J", + "field": "lastTimeNano", + "name": "m", + "owner": "fp" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "(B)V", + "method": "mark", + "name": "m", + "owner": "fp", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(III)I", + "method": "wait", + "name": "f", + "owner": "fp", + "parameters": [ + "cycleMs", + "minSleepMs" + ] + } + ], + "name": "fp", + "super": "fa" + }, + { + "access": 33, + "class": "NetCache", + "constructors": [], + "fields": [], + "interfaces": [], + "methods": [], + "name": "iq", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "NetFileRequest", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 1, + "decoder": 1487103265, + "descriptor": "I", + "field": "crc", + "name": "f", + "owner": "iz" + }, + { + "access": 1, + "descriptor": "B", + "field": "padding", + "name": "q", + "owner": "iz" + }, + { + "access": 1, + "descriptor": "Lit;", + "field": "archive", + "name": "m", + "owner": "iz" + } + ], + "interfaces": [], + "methods": [], + "name": "iz", + "super": "fn" + }, + { + "access": 33, + "class": "Node", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 1, + "descriptor": "J", + "field": "key", + "name": "cl", + "owner": "gw" + }, + { + "access": 1, + "descriptor": "Lgw;", + "field": "next", + "name": "cz", + "owner": "gw" + }, + { + "access": 1, + "descriptor": "Lgw;", + "field": "previous", + "name": "ct", + "owner": "gw" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "()V", + "method": "remove", + "name": "es", + "owner": "gw", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()Z", + "method": "hasNext", + "name": "eg", + "owner": "gw", + "parameters": [] + } + ], + "name": "gw", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "NodeDeque", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Lgw;", + "field": "current", + "name": "f", + "owner": "je" + }, + { + "access": 1, + "descriptor": "Lgw;", + "field": "sentinel", + "name": "m", + "owner": "je" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "()Lgw;", + "method": "first", + "name": "l", + "owner": "je", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()Lgw;", + "method": "last", + "name": "g", + "owner": "je", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()Lgw;", + "method": "next", + "name": "x", + "owner": "je", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()Lgw;", + "method": "previous", + "name": "e", + "owner": "je", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()Lgw;", + "method": "removeFirst", + "name": "u", + "owner": "je", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()Lgw;", + "method": "removeLast", + "name": "o", + "owner": "je", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "clear", + "name": "m", + "owner": "je", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(Lgw;)V", + "method": "addFirst", + "name": "f", + "owner": "je", + "parameters": [ + "node" + ] + }, + { + "access": 1, + "descriptor": "(Lgw;)V", + "method": "addLast", + "name": "q", + "owner": "je", + "parameters": [ + "node" + ] + } + ], + "name": "je", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "NpcDefinition", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1235927151, + "descriptor": "I", + "field": "__ag", + "name": "ag", + "owner": "jz" + }, + { + "access": 0, + "decoder": -1469219067, + "descriptor": "I", + "field": "resizeh", + "name": "r", + "owner": "jz" + }, + { + "access": 0, + "decoder": 1011388197, + "descriptor": "I", + "field": "transformVarbit", + "name": "ac", + "owner": "jz" + }, + { + "access": 0, + "decoder": 1390683537, + "descriptor": "I", + "field": "resizev", + "name": "p", + "owner": "jz" + }, + { + "access": 0, + "decoder": 1631362233, + "descriptor": "I", + "field": "transformVarp", + "name": "ay", + "owner": "jz" + }, + { + "access": 0, + "decoder": 1962875903, + "descriptor": "I", + "field": "__aq", + "name": "aq", + "owner": "jz" + }, + { + "access": 0, + "descriptor": "Llh;", + "field": "params", + "name": "al", + "owner": "jz" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__e", + "name": "e", + "owner": "jz" + }, + { + "access": 0, + "descriptor": "[I", + "field": "models", + "name": "l", + "owner": "jz" + }, + { + "access": 0, + "descriptor": "[S", + "field": "recol_d", + "name": "s", + "owner": "jz" + }, + { + "access": 0, + "descriptor": "[S", + "field": "recol_s", + "name": "j", + "owner": "jz" + }, + { + "access": 0, + "descriptor": "[S", + "field": "retex_d", + "name": "y", + "owner": "jz" + }, + { + "access": 0, + "descriptor": "[S", + "field": "retex_s", + "name": "t", + "owner": "jz" + }, + { + "access": 1, + "decoder": -1213774321, + "descriptor": "I", + "field": "walkleftanim", + "name": "a", + "owner": "jz" + }, + { + "access": 1, + "decoder": -1541308911, + "descriptor": "I", + "field": "size", + "name": "g", + "owner": "jz" + }, + { + "access": 1, + "decoder": -1937346627, + "descriptor": "I", + "field": "id", + "name": "o", + "owner": "jz" + }, + { + "access": 1, + "decoder": -284110917, + "descriptor": "I", + "field": "walkanim", + "name": "n", + "owner": "jz" + }, + { + "access": 1, + "decoder": -506638747, + "descriptor": "I", + "field": "__av", + "name": "av", + "owner": "jz" + }, + { + "access": 1, + "decoder": -96930503, + "descriptor": "I", + "field": "walkrightanim", + "name": "z", + "owner": "jz" + }, + { + "access": 1, + "decoder": 1192179847, + "descriptor": "I", + "field": "combatLevel", + "name": "c", + "owner": "jz" + }, + { + "access": 1, + "decoder": 1311553413, + "descriptor": "I", + "field": "turnrightanim", + "name": "k", + "owner": "jz" + }, + { + "access": 1, + "decoder": 1952230339, + "descriptor": "I", + "field": "walkbackanim", + "name": "i", + "owner": "jz" + }, + { + "access": 1, + "decoder": 235824283, + "descriptor": "I", + "field": "headIconPrayer", + "name": "aj", + "owner": "jz" + }, + { + "access": 1, + "decoder": 275200787, + "descriptor": "I", + "field": "readyanim", + "name": "x", + "owner": "jz" + }, + { + "access": 1, + "decoder": 819690597, + "descriptor": "I", + "field": "turnleftanim", + "name": "d", + "owner": "jz" + }, + { + "access": 1, + "descriptor": "Ljava/lang/String;", + "field": "name", + "name": "u", + "owner": "jz" + }, + { + "access": 1, + "descriptor": "Z", + "field": "__ak", + "name": "ak", + "owner": "jz" + }, + { + "access": 1, + "descriptor": "Z", + "field": "__v", + "name": "v", + "owner": "jz" + }, + { + "access": 1, + "descriptor": "Z", + "field": "drawMapDot", + "name": "b", + "owner": "jz" + }, + { + "access": 1, + "descriptor": "Z", + "field": "isFollower", + "name": "aw", + "owner": "jz" + }, + { + "access": 1, + "descriptor": "Z", + "field": "isInteractable", + "name": "ah", + "owner": "jz" + }, + { + "access": 1, + "descriptor": "[I", + "field": "transforms", + "name": "ar", + "owner": "jz" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/String;", + "field": "op", + "name": "h", + "owner": "jz" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)V", + "method": "postDecode", + "name": "q", + "owner": "jz", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(Lgr;I)V", + "method": "decode", + "name": "w", + "owner": "jz" + }, + { + "access": 0, + "descriptor": "(Lgr;IB)V", + "method": "decode0", + "name": "o", + "owner": "jz" + }, + { + "access": 1, + "descriptor": "(I)Z", + "method": "__e_431", + "name": "e", + "owner": "jz", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(III)I", + "method": "getIntParam", + "name": "x", + "owner": "jz" + }, + { + "access": 1, + "descriptor": "(ILjava/lang/String;I)Ljava/lang/String;", + "method": "getStringParam", + "name": "d", + "owner": "jz" + }, + { + "access": 17, + "descriptor": "(B)Ljz;", + "method": "transform", + "name": "l", + "owner": "jz", + "parameters": [] + }, + { + "access": 17, + "descriptor": "(I)Ldw;", + "method": "getModelData", + "name": "g", + "owner": "jz", + "parameters": [] + }, + { + "access": 17, + "descriptor": "(Ljh;ILjh;II)Ldu;", + "method": "getModel", + "name": "u", + "owner": "jz", + "parameters": [ + "n1", + "n2", + "s1", + "s2" + ] + } + ], + "name": "jz", + "super": "fn" + }, + { + "access": 33, + "class": "ObjectDefinition", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1509832827, + "descriptor": "I", + "field": "modelSizeX", + "name": "ah", + "owner": "jr" + }, + { + "access": 0, + "decoder": -1720702573, + "descriptor": "I", + "field": "offsetHeight", + "name": "ab", + "owner": "jr" + }, + { + "access": 0, + "decoder": -2119965579, + "descriptor": "I", + "field": "transformVarp", + "name": "an", + "owner": "jr" + }, + { + "access": 0, + "decoder": -216646581, + "descriptor": "I", + "field": "contrast", + "name": "aq", + "owner": "jr" + }, + { + "access": 0, + "decoder": -268374709, + "descriptor": "I", + "field": "clipType", + "name": "b", + "owner": "jr" + }, + { + "access": 0, + "decoder": 1136644531, + "descriptor": "I", + "field": "transformVarbit", + "name": "am", + "owner": "jr" + }, + { + "access": 0, + "decoder": 1746573233, + "descriptor": "I", + "field": "modelSizeY", + "name": "aw", + "owner": "jr" + }, + { + "access": 0, + "decoder": 511434049, + "descriptor": "I", + "field": "modelHeight", + "name": "ak", + "owner": "jr" + }, + { + "access": 0, + "decoder": 533219139, + "descriptor": "I", + "field": "ambient", + "name": "ag", + "owner": "jr" + }, + { + "access": 0, + "decoder": 818611483, + "descriptor": "I", + "field": "offsetY", + "name": "ae", + "owner": "jr" + }, + { + "access": 0, + "decoder": 967376007, + "descriptor": "I", + "field": "offsetX", + "name": "al", + "owner": "jr" + }, + { + "access": 0, + "descriptor": "Llh;", + "field": "params", + "name": "af", + "owner": "jr" + }, + { + "access": 0, + "descriptor": "Z", + "field": "isRotated", + "name": "ac", + "owner": "jr" + }, + { + "access": 0, + "descriptor": "Z", + "field": "isSolid", + "name": "ad", + "owner": "jr" + }, + { + "access": 0, + "descriptor": "Z", + "field": "nonFlatShading", + "name": "c", + "owner": "jr" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__d", + "name": "d", + "owner": "jr" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__x", + "name": "x", + "owner": "jr" + }, + { + "access": 0, + "descriptor": "[S", + "field": "recol_d", + "name": "i", + "owner": "jr" + }, + { + "access": 0, + "descriptor": "[S", + "field": "recol_s", + "name": "n", + "owner": "jr" + }, + { + "access": 0, + "descriptor": "[S", + "field": "retex_d", + "name": "z", + "owner": "jr" + }, + { + "access": 0, + "descriptor": "[S", + "field": "retex_s", + "name": "a", + "owner": "jr" + }, + { + "access": 1, + "decoder": -1018236769, + "descriptor": "I", + "field": "animationId", + "name": "p", + "owner": "jr" + }, + { + "access": 1, + "decoder": -1519592967, + "descriptor": "I", + "field": "int5", + "name": "ao", + "owner": "jr" + }, + { + "access": 1, + "decoder": -1737602209, + "descriptor": "I", + "field": "mapIconId", + "name": "av", + "owner": "jr" + }, + { + "access": 1, + "decoder": -1990510197, + "descriptor": "I", + "field": "int4", + "name": "au", + "owner": "jr" + }, + { + "access": 1, + "decoder": -2034835389, + "descriptor": "I", + "field": "id", + "name": "e", + "owner": "jr" + }, + { + "access": 1, + "decoder": -301273619, + "descriptor": "I", + "field": "sizeY", + "name": "s", + "owner": "jr" + }, + { + "access": 1, + "decoder": -324183669, + "descriptor": "I", + "field": "mapSceneId", + "name": "ar", + "owner": "jr" + }, + { + "access": 1, + "decoder": -553719901, + "descriptor": "I", + "field": "interactType", + "name": "t", + "owner": "jr" + }, + { + "access": 1, + "decoder": 1201773735, + "descriptor": "I", + "field": "int6", + "name": "aa", + "owner": "jr" + }, + { + "access": 1, + "decoder": 1419333853, + "descriptor": "I", + "field": "int1", + "name": "h", + "owner": "jr" + }, + { + "access": 1, + "decoder": 1455451843, + "descriptor": "I", + "field": "int3", + "name": "ap", + "owner": "jr" + }, + { + "access": 1, + "decoder": 374616127, + "descriptor": "I", + "field": "ambientSoundId", + "name": "az", + "owner": "jr" + }, + { + "access": 1, + "decoder": 713665805, + "descriptor": "I", + "field": "int2", + "name": "v", + "owner": "jr" + }, + { + "access": 1, + "decoder": 998026479, + "descriptor": "I", + "field": "sizeX", + "name": "j", + "owner": "jr" + }, + { + "access": 1, + "descriptor": "Ljava/lang/String;", + "field": "name", + "name": "k", + "owner": "jr" + }, + { + "access": 1, + "descriptor": "Z", + "field": "boolean1", + "name": "y", + "owner": "jr" + }, + { + "access": 1, + "descriptor": "Z", + "field": "boolean2", + "name": "at", + "owner": "jr" + }, + { + "access": 1, + "descriptor": "Z", + "field": "clipped", + "name": "ay", + "owner": "jr" + }, + { + "access": 1, + "descriptor": "Z", + "field": "modelClipped", + "name": "r", + "owner": "jr" + }, + { + "access": 1, + "descriptor": "[I", + "field": "__ax", + "name": "ax", + "owner": "jr" + }, + { + "access": 1, + "descriptor": "[I", + "field": "transforms", + "name": "as", + "owner": "jr" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/String;", + "field": "op", + "name": "aj", + "owner": "jr" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)V", + "method": "postDecode", + "name": "q", + "owner": "jr", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(Lgr;I)V", + "method": "decode", + "name": "w", + "owner": "jr" + }, + { + "access": 0, + "descriptor": "(Lgr;II)V", + "method": "decode0", + "name": "o", + "owner": "jr" + }, + { + "access": 1, + "descriptor": "(I)Z", + "method": "__t_424", + "name": "t", + "owner": "jr", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(IIB)I", + "method": "getIntParam", + "name": "z", + "owner": "jr" + }, + { + "access": 1, + "descriptor": "(ILjava/lang/String;I)Ljava/lang/String;", + "method": "getStringParam", + "name": "j", + "owner": "jr" + }, + { + "access": 16, + "descriptor": "(IIB)Ldw;", + "method": "getModelData", + "name": "d", + "owner": "jr", + "parameters": [ + "m", + "n" + ] + }, + { + "access": 17, + "descriptor": "(B)Ljr;", + "method": "transform", + "name": "a", + "owner": "jr", + "parameters": [] + }, + { + "access": 17, + "descriptor": "(I)Z", + "method": "__g_422", + "name": "g", + "owner": "jr", + "parameters": [] + }, + { + "access": 17, + "descriptor": "(II)Z", + "method": "__u_421", + "name": "u", + "owner": "jr", + "parameters": [ + "arg0" + ] + }, + { + "access": 17, + "descriptor": "(II[[IIIIB)Ldu;", + "method": "getModel", + "name": "e", + "owner": "jr" + }, + { + "access": 17, + "descriptor": "(II[[IIIILjh;II)Ldu;", + "method": "getModelDynamic", + "name": "x", + "owner": "jr" + }, + { + "access": 17, + "descriptor": "(II[[IIIIS)Lex;", + "method": "__l_423", + "name": "l", + "owner": "jr", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4", + "arg5" + ] + } + ], + "name": "jr", + "super": "fn" + }, + { + "access": 33, + "class": "ObjectNode", + "constructors": [ + { + "access": 1, + "descriptor": "(Ljava/lang/Object;)V" + } + ], + "fields": [ + { + "access": 17, + "descriptor": "Ljava/lang/Object;", + "field": "obj", + "name": "m", + "owner": "fk" + } + ], + "interfaces": [], + "methods": [], + "name": "fk", + "super": "gw" + }, + { + "access": 33, + "class": "OwnWorldComparator", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Z", + "field": "__m", + "name": "m", + "owner": "bj" + } + ], + "interfaces": [ + "java.util.Comparator" + ], + "methods": [ + { + "access": 0, + "descriptor": "(Ll;Ll;B)I", + "method": "__m_132", + "name": "m", + "owner": "bj", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;)Z", + "method": "__equals_134", + "name": "equals", + "owner": "bj", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", + "method": "__compare_133", + "name": "compare", + "owner": "bj", + "parameters": [ + "arg0", + "arg1" + ] + } + ], + "name": "bj", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "PacketBufferNode", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 1, + "decoder": -2051819203, + "descriptor": "I", + "field": "__w", + "name": "w", + "owner": "gg" + }, + { + "access": 1, + "decoder": 1433542775, + "descriptor": "I", + "field": "__f", + "name": "f", + "owner": "gg" + }, + { + "access": 1, + "descriptor": "Lgs;", + "field": "__m", + "name": "m", + "owner": "gg" + }, + { + "access": 1, + "descriptor": "Lhx;", + "field": "packetBuffer", + "name": "q", + "owner": "gg" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "(I)V", + "method": "__f_292", + "name": "f", + "owner": "gg", + "parameters": [] + } + ], + "name": "gg", + "super": "gw" + }, + { + "access": 33, + "class": "PacketWriter", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1028046199, + "descriptor": "I", + "field": "__q", + "name": "q", + "owner": "cl" + }, + { + "access": 0, + "decoder": -1986766063, + "descriptor": "I", + "field": "serverPacket0Length", + "name": "l", + "owner": "cl" + }, + { + "access": 0, + "decoder": 120570975, + "descriptor": "I", + "field": "__x", + "name": "x", + "owner": "cl" + }, + { + "access": 0, + "decoder": 1672229609, + "descriptor": "I", + "field": "__d", + "name": "d", + "owner": "cl" + }, + { + "access": 0, + "descriptor": "Lfu;", + "field": "socket0", + "name": "m", + "owner": "cl" + }, + { + "access": 0, + "descriptor": "Lge;", + "field": "__i", + "name": "i", + "owner": "cl" + }, + { + "access": 0, + "descriptor": "Lge;", + "field": "__k", + "name": "k", + "owner": "cl" + }, + { + "access": 0, + "descriptor": "Lge;", + "field": "__n", + "name": "n", + "owner": "cl" + }, + { + "access": 0, + "descriptor": "Lge;", + "field": "serverPacket0", + "name": "g", + "owner": "cl" + }, + { + "access": 0, + "descriptor": "Lgr;", + "field": "buffer", + "name": "w", + "owner": "cl" + }, + { + "access": 0, + "descriptor": "Lhx;", + "field": "packetBuffer", + "name": "u", + "owner": "cl" + }, + { + "access": 0, + "descriptor": "Lja;", + "field": "packetBufferNodes", + "name": "f", + "owner": "cl" + }, + { + "access": 0, + "descriptor": "Z", + "field": "__e", + "name": "e", + "owner": "cl" + }, + { + "access": 1, + "descriptor": "Lhn;", + "field": "isaacCipher", + "name": "o", + "owner": "cl" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(B)V", + "method": "removeSocket", + "name": "u", + "owner": "cl", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)Lfu;", + "method": "getSocket", + "name": "g", + "owner": "cl", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "close", + "name": "o", + "owner": "cl", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(Lfu;B)V", + "method": "setSocket", + "name": "w", + "owner": "cl", + "parameters": [ + "socket" + ] + }, + { + "access": 16, + "descriptor": "(I)V", + "method": "__f_166", + "name": "f", + "owner": "cl", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(I)V", + "method": "__m_165", + "name": "m", + "owner": "cl", + "parameters": [] + }, + { + "access": 17, + "descriptor": "(Lgg;I)V", + "method": "__q_167", + "name": "q", + "owner": "cl", + "parameters": [ + "arg0" + ] + } + ], + "name": "cl", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "ParamDefinition", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "C", + "field": "type", + "name": "q", + "owner": "jb" + }, + { + "access": 0, + "descriptor": "Z", + "field": "autodisable", + "name": "u", + "owner": "jb" + }, + { + "access": 1, + "decoder": 1133042753, + "descriptor": "I", + "field": "defaultint", + "name": "w", + "owner": "jb" + }, + { + "access": 1, + "descriptor": "Ljava/lang/String;", + "field": "defaultstr", + "name": "o", + "owner": "jb" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(B)V", + "method": "postDecode", + "name": "f", + "owner": "jb", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(Lgr;I)V", + "method": "decode", + "name": "q", + "owner": "jb" + }, + { + "access": 0, + "descriptor": "(Lgr;II)V", + "method": "decode0", + "name": "w", + "owner": "jb" + }, + { + "access": 1, + "descriptor": "(I)Z", + "method": "isString", + "name": "o", + "owner": "jb" + } + ], + "name": "jb", + "super": "fn" + }, + { + "access": 33, + "class": "PcmPlayer", + "constructors": [ + { + "access": 4, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1586398263, + "descriptor": "I", + "field": "nextPosition", + "name": "r", + "owner": "co" + }, + { + "access": 0, + "decoder": -1671644011, + "descriptor": "I", + "field": "capacity", + "name": "s", + "owner": "co" + }, + { + "access": 0, + "decoder": -200656835998283420, + "descriptor": "J", + "field": "retryTimeMs", + "name": "h", + "owner": "co" + }, + { + "access": 0, + "decoder": -645495803, + "descriptor": "I", + "field": "__ac", + "name": "ac", + "owner": "co" + }, + { + "access": 0, + "decoder": -8124323644430480000, + "descriptor": "J", + "field": "timeMs", + "name": "j", + "owner": "co" + }, + { + "access": 0, + "decoder": -8188447292076891000, + "descriptor": "J", + "field": "__p", + "name": "p", + "owner": "co" + }, + { + "access": 0, + "decoder": 1125788887, + "descriptor": "I", + "field": "__z", + "name": "z", + "owner": "co" + }, + { + "access": 0, + "decoder": 1624619697, + "descriptor": "I", + "field": "__c", + "name": "c", + "owner": "co" + }, + { + "access": 0, + "decoder": 1907203055, + "descriptor": "I", + "field": "__y", + "name": "y", + "owner": "co" + }, + { + "access": 0, + "decoder": 48658021, + "descriptor": "I", + "field": "__b", + "name": "b", + "owner": "co" + }, + { + "access": 0, + "decoder": 951871565, + "descriptor": "I", + "field": "frequency", + "name": "t", + "owner": "co" + }, + { + "access": 0, + "descriptor": "Ldc;", + "field": "stream0", + "name": "a", + "owner": "co" + }, + { + "access": 0, + "descriptor": "Z", + "field": "__v", + "name": "v", + "owner": "co" + }, + { + "access": 0, + "descriptor": "[Ldc;", + "field": "__ah", + "name": "ah", + "owner": "co" + }, + { + "access": 0, + "descriptor": "[Ldc;", + "field": "__ay", + "name": "ay", + "owner": "co" + }, + { + "access": 4, + "descriptor": "[I", + "field": "samples", + "name": "i", + "owner": "co" + } + ], + "interfaces": [], + "methods": [ + { + "access": 16, + "descriptor": "(II)V", + "method": "skip", + "name": "ak", + "owner": "co", + "parameters": [ + "length" + ] + }, + { + "access": 16, + "descriptor": "(Ldc;II)V", + "method": "__ab_177", + "name": "ab", + "owner": "co", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 16, + "descriptor": "([II)V", + "method": "fill", + "name": "aw", + "owner": "co", + "parameters": [ + "buffer", + "length" + ] + }, + { + "access": 17, + "descriptor": "(I)V", + "method": "__ac_176", + "name": "ac", + "owner": "co", + "parameters": [] + }, + { + "access": 4, + "descriptor": "()V", + "method": "write", + "name": "w", + "owner": "co", + "parameters": [] + }, + { + "access": 4, + "descriptor": "(B)I", + "method": "position", + "name": "q", + "owner": "co", + "parameters": [] + }, + { + "access": 4, + "descriptor": "(I)V", + "method": "close", + "name": "o", + "owner": "co", + "parameters": [] + }, + { + "access": 4, + "descriptor": "(I)V", + "method": "discard", + "name": "u", + "owner": "co", + "parameters": [] + }, + { + "access": 4, + "descriptor": "(I)V", + "method": "init", + "name": "m", + "owner": "co", + "parameters": [] + }, + { + "access": 4, + "descriptor": "(II)V", + "method": "open", + "name": "f", + "owner": "co", + "parameters": [ + "bufferSize" + ] + }, + { + "access": 49, + "descriptor": "(B)V", + "method": "tryDiscard", + "name": "ay", + "owner": "co", + "parameters": [] + }, + { + "access": 49, + "descriptor": "(I)V", + "method": "run", + "name": "ar", + "owner": "co", + "parameters": [] + }, + { + "access": 49, + "descriptor": "(I)V", + "method": "shutdown", + "name": "ah", + "owner": "co", + "parameters": [] + }, + { + "access": 49, + "descriptor": "(Ldc;I)V", + "method": "setStream", + "name": "av", + "owner": "co", + "parameters": [ + "stream" + ] + } + ], + "name": "co", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "PcmStreamMixer", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "I", + "field": "__o", + "name": "o", + "owner": "ct" + }, + { + "access": 0, + "descriptor": "I", + "field": "__q", + "name": "q", + "owner": "ct" + }, + { + "access": 0, + "descriptor": "Lje;", + "field": "__f", + "name": "f", + "owner": "ct" + }, + { + "access": 0, + "descriptor": "Lje;", + "field": "subStreams", + "name": "m", + "owner": "ct" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "()V", + "method": "__q_168", + "name": "q", + "owner": "ct", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "skipSubStreams", + "name": "a", + "owner": "ct", + "parameters": [ + "length" + ] + }, + { + "access": 0, + "descriptor": "(Ldf;)V", + "method": "__o_170", + "name": "o", + "owner": "ct", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "(Lgw;Ldf;)V", + "method": "__w_169", + "name": "w", + "owner": "ct", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 0, + "descriptor": "([III)V", + "method": "updateSubStreams", + "name": "x", + "owner": "ct", + "parameters": [ + "buffer", + "end", + "start" + ] + }, + { + "access": 4, + "descriptor": "()I", + "method": "__l_171", + "name": "l", + "owner": "ct", + "parameters": [] + }, + { + "access": 4, + "descriptor": "()Ldc;", + "method": "firstSubStream", + "name": "u", + "owner": "ct", + "parameters": [] + }, + { + "access": 4, + "descriptor": "()Ldc;", + "method": "nextSubStream", + "name": "g", + "owner": "ct", + "parameters": [] + }, + { + "access": 49, + "descriptor": "(I)V", + "method": "__d_173", + "name": "d", + "owner": "ct", + "parameters": [ + "arg0" + ] + }, + { + "access": 49, + "descriptor": "(Ldc;)V", + "method": "addSubStream", + "name": "m", + "owner": "ct", + "parameters": [ + "subStream" + ] + }, + { + "access": 49, + "descriptor": "(Ldc;)V", + "method": "removeSubStream", + "name": "f", + "owner": "ct", + "parameters": [ + "subStream" + ] + }, + { + "access": 49, + "descriptor": "([III)V", + "method": "__e_172", + "name": "e", + "owner": "ct", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + } + ], + "name": "ct", + "super": "dc" + }, + { + "access": 33, + "class": "PlatformInfo", + "constructors": [ + { + "access": 0, + "descriptor": "(IZIIIIIZIIIILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIIILjava/lang/String;Ljava/lang/String;[IILjava/lang/String;)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1667177301, + "descriptor": "I", + "field": "__ab", + "name": "ab", + "owner": "lb" + }, + { + "access": 0, + "decoder": -170839105, + "descriptor": "I", + "field": "__ba", + "name": "ba", + "owner": "lb" + }, + { + "access": 0, + "decoder": -1765017, + "descriptor": "I", + "field": "__ad", + "name": "ad", + "owner": "lb" + }, + { + "access": 0, + "decoder": -817941105, + "descriptor": "I", + "field": "__ap", + "name": "ap", + "owner": "lb" + }, + { + "access": 0, + "decoder": 1196598207, + "descriptor": "I", + "field": "__ai", + "name": "ai", + "owner": "lb" + }, + { + "access": 0, + "decoder": 1318366785, + "descriptor": "I", + "field": "__ay", + "name": "ay", + "owner": "lb" + }, + { + "access": 0, + "decoder": 1466207635, + "descriptor": "I", + "field": "__bn", + "name": "bn", + "owner": "lb" + }, + { + "access": 0, + "decoder": 1955966365, + "descriptor": "I", + "field": "__af", + "name": "af", + "owner": "lb" + }, + { + "access": 0, + "decoder": 2097018521, + "descriptor": "I", + "field": "__al", + "name": "al", + "owner": "lb" + }, + { + "access": 0, + "decoder": 30207059, + "descriptor": "I", + "field": "__am", + "name": "am", + "owner": "lb" + }, + { + "access": 0, + "decoder": 385109109, + "descriptor": "I", + "field": "__ae", + "name": "ae", + "owner": "lb" + }, + { + "access": 0, + "decoder": 467004305, + "descriptor": "I", + "field": "__aw", + "name": "aw", + "owner": "lb" + }, + { + "access": 0, + "decoder": 703904161, + "descriptor": "I", + "field": "__ak", + "name": "ak", + "owner": "lb" + }, + { + "access": 0, + "decoder": 871094255, + "descriptor": "I", + "field": "__ax", + "name": "ax", + "owner": "lb" + }, + { + "access": 0, + "decoder": 890109053, + "descriptor": "I", + "field": "__an", + "name": "an", + "owner": "lb" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "__aa", + "name": "aa", + "owner": "lb" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "__ao", + "name": "ao", + "owner": "lb" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "__au", + "name": "au", + "owner": "lb" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "__az", + "name": "az", + "owner": "lb" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "__bb", + "name": "bb", + "owner": "lb" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "__bk", + "name": "bk", + "owner": "lb" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "__bs", + "name": "bs", + "owner": "lb" + }, + { + "access": 0, + "descriptor": "Z", + "field": "__ah", + "name": "ah", + "owner": "lb" + }, + { + "access": 0, + "descriptor": "Z", + "field": "__at", + "name": "at", + "owner": "lb" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__bq", + "name": "bq", + "owner": "lb" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "(I)I", + "method": "size", + "name": "f", + "owner": "lb", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(Lgr;I)V", + "method": "write", + "name": "m", + "owner": "lb", + "parameters": [ + "buffer" + ] + } + ], + "name": "lb", + "super": "gw" + }, + { + "access": 33, + "class": "PlayerAppearance", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -3506189412688081400, + "descriptor": "J", + "field": "__o", + "name": "o", + "owner": "hi" + }, + { + "access": 0, + "decoder": 8217880921734028000, + "descriptor": "J", + "field": "__u", + "name": "u", + "owner": "hi" + }, + { + "access": 0, + "descriptor": "[I", + "field": "bodyColors", + "name": "f", + "owner": "hi" + }, + { + "access": 0, + "descriptor": "[I", + "field": "equipment", + "name": "m", + "owner": "hi" + }, + { + "access": 1, + "decoder": 1676934923, + "descriptor": "I", + "field": "npcTransformId", + "name": "w", + "owner": "hi" + }, + { + "access": 1, + "descriptor": "Z", + "field": "isFemale", + "name": "q", + "owner": "hi" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(B)V", + "method": "__u_390", + "name": "u", + "owner": "hi", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)Ldw;", + "method": "getModelData", + "name": "l", + "owner": "hi", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(B)I", + "method": "getChatHeadId", + "name": "e", + "owner": "hi", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(IZI)V", + "method": "__f_386", + "name": "f", + "owner": "hi", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(IZI)V", + "method": "__q_387", + "name": "q", + "owner": "hi", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(Lgr;I)V", + "method": "__o_389", + "name": "o", + "owner": "hi", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(Ljh;ILjh;II)Ldu;", + "method": "getModel", + "name": "g", + "owner": "hi" + }, + { + "access": 1, + "descriptor": "(ZB)V", + "method": "__w_388", + "name": "w", + "owner": "hi", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "([I[IZII)V", + "method": "__m_385", + "name": "m", + "owner": "hi", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3" + ] + } + ], + "name": "hi", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "PlayerType", + "constructors": [ + { + "access": 0, + "descriptor": "(IIZZZ)V" + } + ], + "fields": [ + { + "access": 16, + "decoder": 1999564657, + "descriptor": "I", + "field": "id", + "name": "g", + "owner": "ij" + }, + { + "access": 17, + "decoder": 613822977, + "descriptor": "I", + "field": "modIcon", + "name": "l", + "owner": "ij" + }, + { + "access": 17, + "descriptor": "Z", + "field": "isPrivileged", + "name": "e", + "owner": "ij" + }, + { + "access": 17, + "descriptor": "Z", + "field": "isUser", + "name": "x", + "owner": "ij" + } + ], + "interfaces": [ + "gc" + ], + "methods": [ + { + "access": 1, + "descriptor": "(B)I", + "method": "__f_391", + "name": "f", + "owner": "ij", + "parameters": [] + } + ], + "name": "ij", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "Players", + "constructors": [], + "fields": [], + "interfaces": [], + "methods": [], + "name": "cq", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "Rasterizer2D", + "constructors": [ + { + "access": 4, + "descriptor": "()V" + } + ], + "fields": [], + "interfaces": [], + "methods": [], + "name": "lf", + "super": "fn" + }, + { + "access": 33, + "class": "Rasterizer3D", + "constructors": [], + "fields": [], + "interfaces": [], + "methods": [], + "name": "et", + "super": "lf" + }, + { + "access": 33, + "class": "RawPcmStream", + "constructors": [ + { + "access": 0, + "descriptor": "(Lcx;II)V" + }, + { + "access": 0, + "descriptor": "(Lcx;III)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "I", + "field": "__a", + "name": "a", + "owner": "ds" + }, + { + "access": 0, + "descriptor": "I", + "field": "__e", + "name": "e", + "owner": "ds" + }, + { + "access": 0, + "descriptor": "I", + "field": "__f", + "name": "f", + "owner": "ds" + }, + { + "access": 0, + "descriptor": "I", + "field": "__g", + "name": "g", + "owner": "ds" + }, + { + "access": 0, + "descriptor": "I", + "field": "__i", + "name": "i", + "owner": "ds" + }, + { + "access": 0, + "descriptor": "I", + "field": "__l", + "name": "l", + "owner": "ds" + }, + { + "access": 0, + "descriptor": "I", + "field": "__m", + "name": "m", + "owner": "ds" + }, + { + "access": 0, + "descriptor": "I", + "field": "__n", + "name": "n", + "owner": "ds" + }, + { + "access": 0, + "descriptor": "I", + "field": "__o", + "name": "o", + "owner": "ds" + }, + { + "access": 0, + "descriptor": "I", + "field": "__q", + "name": "q", + "owner": "ds" + }, + { + "access": 0, + "descriptor": "I", + "field": "__u", + "name": "u", + "owner": "ds" + }, + { + "access": 0, + "descriptor": "I", + "field": "__z", + "name": "z", + "owner": "ds" + }, + { + "access": 0, + "descriptor": "I", + "field": "end", + "name": "d", + "owner": "ds" + }, + { + "access": 0, + "descriptor": "I", + "field": "start", + "name": "x", + "owner": "ds" + }, + { + "access": 0, + "descriptor": "Z", + "field": "__k", + "name": "k", + "owner": "ds" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "()I", + "method": "__az_179", + "name": "az", + "owner": "ds", + "parameters": [] + }, + { + "access": 0, + "descriptor": "()V", + "method": "__b_189", + "name": "b", + "owner": "ds", + "parameters": [] + }, + { + "access": 0, + "descriptor": "()V", + "method": "__o_180", + "name": "o", + "owner": "ds", + "parameters": [] + }, + { + "access": 0, + "descriptor": "()Z", + "method": "__au_204", + "name": "au", + "owner": "ds", + "parameters": [] + }, + { + "access": 0, + "descriptor": "([IIIII)I", + "method": "__ad_202", + "name": "ad", + "owner": "ds", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4" + ] + }, + { + "access": 0, + "descriptor": "([IIIII)I", + "method": "__ap_203", + "name": "ap", + "owner": "ds", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4" + ] + }, + { + "access": 1, + "descriptor": "()Z", + "method": "__ae_195", + "name": "ae", + "owner": "ds", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()Z", + "method": "__at_196", + "name": "at", + "owner": "ds", + "parameters": [] + }, + { + "access": 32, + "descriptor": "(I)V", + "method": "__z_183", + "name": "z", + "owner": "ds", + "parameters": [ + "arg0" + ] + }, + { + "access": 32, + "descriptor": "(II)V", + "method": "__j_184", + "name": "j", + "owner": "ds", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 33, + "descriptor": "()I", + "method": "__ab_194", + "name": "ab", + "owner": "ds", + "parameters": [] + }, + { + "access": 33, + "descriptor": "()I", + "method": "__s_185", + "name": "s", + "owner": "ds", + "parameters": [] + }, + { + "access": 33, + "descriptor": "()I", + "method": "__t_186", + "name": "t", + "owner": "ds", + "parameters": [] + }, + { + "access": 33, + "descriptor": "(I)V", + "method": "__a_182", + "name": "a", + "owner": "ds", + "parameters": [ + "arg0" + ] + }, + { + "access": 33, + "descriptor": "(I)V", + "method": "__ah_193", + "name": "ah", + "owner": "ds", + "parameters": [ + "arg0" + ] + }, + { + "access": 33, + "descriptor": "(I)V", + "method": "__d_201", + "name": "d", + "owner": "ds", + "parameters": [ + "arg0" + ] + }, + { + "access": 33, + "descriptor": "(I)V", + "method": "__v_192", + "name": "v", + "owner": "ds", + "parameters": [ + "arg0" + ] + }, + { + "access": 33, + "descriptor": "(I)V", + "method": "__x_181", + "name": "x", + "owner": "ds", + "parameters": [ + "arg0" + ] + }, + { + "access": 33, + "descriptor": "(I)V", + "method": "__y_187", + "name": "y", + "owner": "ds", + "parameters": [ + "arg0" + ] + }, + { + "access": 33, + "descriptor": "(II)V", + "method": "__c_190", + "name": "c", + "owner": "ds", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 33, + "descriptor": "(III)V", + "method": "__p_191", + "name": "p", + "owner": "ds", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 33, + "descriptor": "(Z)V", + "method": "__h_188", + "name": "h", + "owner": "ds", + "parameters": [ + "arg0" + ] + }, + { + "access": 33, + "descriptor": "([III)V", + "method": "__e_200", + "name": "e", + "owner": "ds", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 4, + "descriptor": "()I", + "method": "__l_199", + "name": "l", + "owner": "ds", + "parameters": [] + }, + { + "access": 4, + "descriptor": "()Ldc;", + "method": "__g_198", + "name": "g", + "owner": "ds", + "parameters": [] + }, + { + "access": 4, + "descriptor": "()Ldc;", + "method": "__u_197", + "name": "u", + "owner": "ds", + "parameters": [] + } + ], + "name": "ds", + "super": "dc" + }, + { + "access": 33, + "class": "RawSound", + "constructors": [ + { + "access": 0, + "descriptor": "(I[BII)V" + }, + { + "access": 0, + "descriptor": "(I[BIIZ)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "I", + "field": "end", + "name": "w", + "owner": "cx" + }, + { + "access": 1, + "descriptor": "I", + "field": "sampleRate", + "name": "m", + "owner": "cx" + }, + { + "access": 1, + "descriptor": "I", + "field": "start", + "name": "q", + "owner": "cx" + }, + { + "access": 1, + "descriptor": "Z", + "field": "__o", + "name": "o", + "owner": "cx" + }, + { + "access": 1, + "descriptor": "[B", + "field": "samples", + "name": "f", + "owner": "cx" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "(Ldp;)Lcx;", + "method": "resample", + "name": "m", + "owner": "cx", + "parameters": [ + "decimator" + ] + } + ], + "name": "cx", + "super": "dd" + }, + { + "access": 33, + "class": "RectangleMode", + "constructors": [ + { + "access": 0, + "descriptor": "(II)V" + } + ], + "fields": [ + { + "access": 16, + "decoder": -1204297807, + "descriptor": "I", + "field": "id2", + "name": "o", + "owner": "lj" + }, + { + "access": 17, + "decoder": -1391612747, + "descriptor": "I", + "field": "id", + "name": "w", + "owner": "lj" + } + ], + "interfaces": [ + "gc" + ], + "methods": [ + { + "access": 1, + "descriptor": "(B)I", + "method": "__f_491", + "name": "f", + "owner": "lj", + "parameters": [] + } + ], + "name": "lj", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "ReflectionCheck", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1091722075, + "descriptor": "I", + "field": "size", + "name": "w", + "owner": "lw" + }, + { + "access": 0, + "decoder": -1955146989, + "descriptor": "I", + "field": "id", + "name": "q", + "owner": "lw" + }, + { + "access": 0, + "descriptor": "[I", + "field": "creationErrors", + "name": "u", + "owner": "lw" + }, + { + "access": 0, + "descriptor": "[I", + "field": "intReplaceValues", + "name": "f", + "owner": "lw" + }, + { + "access": 0, + "descriptor": "[I", + "field": "operations", + "name": "o", + "owner": "lw" + }, + { + "access": 0, + "descriptor": "[Ljava/lang/reflect/Field;", + "field": "fields", + "name": "g", + "owner": "lw" + }, + { + "access": 0, + "descriptor": "[Ljava/lang/reflect/Method;", + "field": "methods", + "name": "l", + "owner": "lw" + }, + { + "access": 0, + "descriptor": "[[[B", + "field": "arguments", + "name": "m", + "owner": "lw" + } + ], + "interfaces": [], + "methods": [], + "name": "lw", + "super": "gw" + }, + { + "access": 33, + "class": "RunException", + "constructors": [ + { + "access": 0, + "descriptor": "(Ljava/lang/Throwable;Ljava/lang/String;)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "string", + "name": "o", + "owner": "fx" + }, + { + "access": 0, + "descriptor": "Ljava/lang/Throwable;", + "field": "throwable", + "name": "u", + "owner": "fx" + } + ], + "interfaces": [], + "methods": [], + "name": "fx", + "super": "java.lang.RuntimeException" + }, + { + "access": 33, + "class": "Scene", + "constructors": [ + { + "access": 1, + "descriptor": "(III[[[I)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "I", + "field": "minPlane", + "name": "g", + "owner": "em" + }, + { + "access": 0, + "descriptor": "I", + "field": "planes", + "name": "f", + "owner": "em" + }, + { + "access": 0, + "descriptor": "I", + "field": "tempGameObjectsCount", + "name": "l", + "owner": "em" + }, + { + "access": 0, + "descriptor": "I", + "field": "xSize", + "name": "q", + "owner": "em" + }, + { + "access": 0, + "descriptor": "I", + "field": "ySize", + "name": "w", + "owner": "em" + }, + { + "access": 0, + "descriptor": "[Leh;", + "field": "tempGameObjects", + "name": "e", + "owner": "em" + }, + { + "access": 0, + "descriptor": "[[I", + "field": "__bd", + "name": "bd", + "owner": "em" + }, + { + "access": 0, + "descriptor": "[[I", + "field": "__bk", + "name": "bk", + "owner": "em" + }, + { + "access": 0, + "descriptor": "[[[I", + "field": "__x", + "name": "x", + "owner": "em" + }, + { + "access": 0, + "descriptor": "[[[I", + "field": "tileHeights", + "name": "o", + "owner": "em" + }, + { + "access": 0, + "descriptor": "[[[Ldj;", + "field": "tiles", + "name": "u", + "owner": "em" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "()V", + "method": "occlude", + "name": "ai", + "owner": "em", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(III)Z", + "method": "__ba_253", + "name": "ba", + "owner": "em", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 0, + "descriptor": "(III)Z", + "method": "__bn_257", + "name": "bn", + "owner": "em", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 0, + "descriptor": "(IIII)Z", + "method": "__bb_254", + "name": "bb", + "owner": "em", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3" + ] + }, + { + "access": 0, + "descriptor": "(IIII)Z", + "method": "__bs_255", + "name": "bs", + "owner": "em", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3" + ] + }, + { + "access": 0, + "descriptor": "(IIIIII)Z", + "method": "__bq_256", + "name": "bq", + "owner": "em", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4", + "arg5" + ] + }, + { + "access": 0, + "descriptor": "(IIIIIIIILex;IZJI)Z", + "method": "newGameObject", + "name": "j", + "owner": "em", + "parameters": [ + "centerX", + "centerY", + "entity", + "flags", + "height", + "isTemp", + "orientation", + "plane", + "sizeX", + "sizeY", + "startX", + "startY", + "tag" + ] + }, + { + "access": 0, + "descriptor": "(Ldj;Z)V", + "method": "drawTile", + "name": "au", + "owner": "em", + "parameters": [ + "b", + "tile" + ] + }, + { + "access": 0, + "descriptor": "(Ldv;IIIIII)V", + "method": "__aa_252", + "name": "aa", + "owner": "em", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4", + "arg5", + "arg6" + ] + }, + { + "access": 0, + "descriptor": "(Ldw;III)V", + "method": "__al_248", + "name": "al", + "owner": "em", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3" + ] + }, + { + "access": 0, + "descriptor": "(Ldw;IIIII)V", + "method": "__ab_249", + "name": "ab", + "owner": "em", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4", + "arg5" + ] + }, + { + "access": 0, + "descriptor": "(Leb;IIIIIII)V", + "method": "__ao_251", + "name": "ao", + "owner": "em", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4", + "arg5", + "arg6", + "arg7" + ] + }, + { + "access": 0, + "descriptor": "(Leh;)V", + "method": "removeGameObject", + "name": "t", + "owner": "em", + "parameters": [ + "gameObject" + ] + }, + { + "access": 1, + "descriptor": "()V", + "method": "__as_250", + "name": "as", + "owner": "em", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "clear", + "name": "m", + "owner": "em", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "clearTempGameObjects", + "name": "s", + "owner": "em", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "init", + "name": "f", + "owner": "em", + "parameters": [ + "minPlane" + ] + }, + { + "access": 1, + "descriptor": "(II)V", + "method": "setLinkBelow", + "name": "q", + "owner": "em", + "parameters": [ + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(III)J", + "method": "__ac_245", + "name": "ac", + "owner": "em", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "(III)J", + "method": "__ar_244", + "name": "ar", + "owner": "em", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "(III)J", + "method": "__ay_246", + "name": "ay", + "owner": "em", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "(III)J", + "method": "getFloorDecorationTag", + "name": "ah", + "owner": "em", + "parameters": [ + "plane", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(III)Ldo;", + "method": "getFloorDecoration", + "name": "av", + "owner": "em", + "parameters": [ + "plane", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(III)Leh;", + "method": "__aj_243", + "name": "aj", + "owner": "em", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "(III)Lej;", + "method": "getBoundaryObject", + "name": "ag", + "owner": "em", + "parameters": [ + "plane", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(III)Leq;", + "method": "getWallDecoration", + "name": "aq", + "owner": "em", + "parameters": [ + "plane", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(III)V", + "method": "__aw_247", + "name": "aw", + "owner": "em", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "(III)V", + "method": "__c_242", + "name": "c", + "owner": "em", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "(III)V", + "method": "removeBoundaryObject", + "name": "h", + "owner": "em", + "parameters": [ + "plane", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(III)V", + "method": "removeFloorDecoration", + "name": "p", + "owner": "em", + "parameters": [ + "plane", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(III)V", + "method": "removeGroundItemPile", + "name": "v", + "owner": "em", + "parameters": [ + "plane", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(III)V", + "method": "removeWallDecoration", + "name": "b", + "owner": "em", + "parameters": [ + "plane", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(IIII)V", + "method": "__y_241", + "name": "y", + "owner": "em", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3" + ] + }, + { + "access": 1, + "descriptor": "(IIII)V", + "method": "setTileMinPlane", + "name": "o", + "owner": "em", + "parameters": [ + "minPlane", + "plane", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(IIIIII)V", + "method": "draw", + "name": "az", + "owner": "em", + "parameters": [ + "pitch", + "plane", + "x", + "y", + "yaw", + "z" + ] + }, + { + "access": 1, + "descriptor": "(IIIIIIIIIIIIIIIIIIII)V", + "method": "addTile", + "name": "u", + "owner": "em" + }, + { + "access": 1, + "descriptor": "(IIIIIILex;IJI)Z", + "method": "__d_238", + "name": "d", + "owner": "em", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4", + "arg5", + "arg6", + "arg7", + "arg8", + "arg9" + ] + }, + { + "access": 1, + "descriptor": "(IIIIILex;IJIIII)Z", + "method": "__z_240", + "name": "z", + "owner": "em", + "parameters": [ + "arg0", + "arg1", + "arg10", + "arg11", + "arg2", + "arg3", + "arg4", + "arg5", + "arg6", + "arg7", + "arg8", + "arg9" + ] + }, + { + "access": 1, + "descriptor": "(IIIIILex;IJZ)Z", + "method": "__a_239", + "name": "a", + "owner": "em", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4", + "arg5", + "arg6", + "arg7", + "arg8" + ] + }, + { + "access": 1, + "descriptor": "(IIIILex;JI)V", + "method": "newFloorDecoration", + "name": "g", + "owner": "em", + "parameters": [ + "entity", + "flags", + "plane", + "tag", + "tileHeight", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(IIIILex;JLex;Lex;)V", + "method": "newGroundItemPile", + "name": "l", + "owner": "em", + "parameters": [ + "first", + "plane", + "second", + "tag", + "third", + "tileHeight", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(IIIILex;Lex;IIIIJI)V", + "method": "newWallDecoration", + "name": "x", + "owner": "em", + "parameters": [ + "entity1", + "entity2", + "flags", + "int7", + "orientation", + "plane", + "tag", + "tileHeight", + "x", + "xOffset", + "y", + "yOffset" + ] + }, + { + "access": 1, + "descriptor": "(IIIILex;Lex;IIJI)V", + "method": "newBoundaryObject", + "name": "e", + "owner": "em", + "parameters": [ + "entity1", + "entity2", + "flags", + "orientationA", + "orientationB", + "plane", + "tag", + "tileHeight", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(IIIJ)I", + "method": "getObjectFlags", + "name": "ak", + "owner": "em", + "parameters": [ + "id", + "plane", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(IIIZ)V", + "method": "menuOpen", + "name": "ap", + "owner": "em", + "parameters": [ + "b", + "plane", + "screenX", + "screenY" + ] + }, + { + "access": 1, + "descriptor": "([IIIIII)V", + "method": "drawTileMinimap", + "name": "ae", + "owner": "em", + "parameters": [ + "index", + "pixels", + "plane", + "width", + "x", + "y" + ] + } + ], + "name": "em", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "Script", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1077473933, + "descriptor": "I", + "field": "intArgumentCount", + "name": "g", + "owner": "cg" + }, + { + "access": 0, + "decoder": -1124477681, + "descriptor": "I", + "field": "localStringCount", + "name": "u", + "owner": "cg" + }, + { + "access": 0, + "decoder": -503680987, + "descriptor": "I", + "field": "stringArgumentCount", + "name": "l", + "owner": "cg" + }, + { + "access": 0, + "decoder": 1952727759, + "descriptor": "I", + "field": "localIntCount", + "name": "o", + "owner": "cg" + }, + { + "access": 0, + "descriptor": "[I", + "field": "intOperands", + "name": "q", + "owner": "cg" + }, + { + "access": 0, + "descriptor": "[I", + "field": "opcodes", + "name": "f", + "owner": "cg" + }, + { + "access": 0, + "descriptor": "[Ljava/lang/String;", + "field": "stringOperands", + "name": "w", + "owner": "cg" + }, + { + "access": 0, + "descriptor": "[Llh;", + "field": "switches", + "name": "e", + "owner": "cg" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(II)[Llh;", + "method": "__o_164", + "name": "o", + "owner": "cg", + "parameters": [ + "arg0" + ] + } + ], + "name": "cg", + "super": "fn" + }, + { + "access": 33, + "class": "ScriptEvent", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1089993721, + "descriptor": "I", + "field": "opIndex", + "name": "u", + "owner": "by" + }, + { + "access": 0, + "decoder": -1330602393, + "descriptor": "I", + "field": "keyPressed", + "name": "l", + "owner": "by" + }, + { + "access": 0, + "decoder": -161292529, + "descriptor": "I", + "field": "type0", + "name": "k", + "owner": "by" + }, + { + "access": 0, + "decoder": -2138736593, + "descriptor": "I", + "field": "__d", + "name": "d", + "owner": "by" + }, + { + "access": 0, + "decoder": 327085889, + "descriptor": "I", + "field": "keyTyped", + "name": "e", + "owner": "by" + }, + { + "access": 0, + "decoder": 488198377, + "descriptor": "I", + "field": "mouseX", + "name": "w", + "owner": "by" + }, + { + "access": 0, + "decoder": 95719815, + "descriptor": "I", + "field": "mouseY", + "name": "o", + "owner": "by" + }, + { + "access": 0, + "descriptor": "Lho;", + "field": "component", + "name": "q", + "owner": "by" + }, + { + "access": 0, + "descriptor": "Lho;", + "field": "dragTarget", + "name": "g", + "owner": "by" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "targetName", + "name": "x", + "owner": "by" + }, + { + "access": 0, + "descriptor": "Z", + "field": "boolean1", + "name": "f", + "owner": "by" + }, + { + "access": 0, + "descriptor": "[Ljava/lang/Object;", + "field": "args0", + "name": "m", + "owner": "by" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "(IB)V", + "method": "setType", + "name": "f", + "owner": "by", + "parameters": [ + "type" + ] + }, + { + "access": 1, + "descriptor": "([Ljava/lang/Object;I)V", + "method": "setArgs", + "name": "m", + "owner": "by", + "parameters": [ + "args" + ] + } + ], + "name": "by", + "super": "gw" + }, + { + "access": 33, + "class": "ScriptFrame", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1715361849, + "descriptor": "I", + "field": "pc", + "name": "f", + "owner": "bn" + }, + { + "access": 0, + "descriptor": "Lcg;", + "field": "script", + "name": "m", + "owner": "bn" + }, + { + "access": 0, + "descriptor": "[I", + "field": "intLocals", + "name": "q", + "owner": "bn" + }, + { + "access": 0, + "descriptor": "[Ljava/lang/String;", + "field": "stringLocals", + "name": "w", + "owner": "bn" + } + ], + "interfaces": [], + "methods": [], + "name": "bn", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "SecureRandomCallable", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [], + "interfaces": [ + "java.util.concurrent.Callable" + ], + "methods": [ + { + "access": 1, + "descriptor": "()Ljava/lang/Object;", + "method": "__call_121", + "name": "call", + "owner": "bk", + "parameters": [] + } + ], + "name": "bk", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "SecureRandomFuture", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Ljava/util/concurrent/ExecutorService;", + "field": "executor", + "name": "m", + "owner": "cn" + }, + { + "access": 0, + "descriptor": "Ljava/util/concurrent/Future;", + "field": "future", + "name": "f", + "owner": "cn" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)Ljava/security/SecureRandom;", + "method": "get", + "name": "q", + "owner": "cn", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "shutdown", + "name": "m", + "owner": "cn", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)Z", + "method": "isDone", + "name": "f", + "owner": "cn", + "parameters": [] + } + ], + "name": "cn", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "SequenceDefinition", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "[I", + "field": "__d", + "name": "d", + "owner": "jh" + }, + { + "access": 0, + "descriptor": "[I", + "field": "frameIds2", + "name": "g", + "owner": "jh" + }, + { + "access": 1, + "decoder": -1308226131, + "descriptor": "I", + "field": "shield", + "name": "i", + "owner": "jh" + }, + { + "access": 1, + "decoder": -1629538741, + "descriptor": "I", + "field": "weapon", + "name": "a", + "owner": "jh" + }, + { + "access": 1, + "decoder": -28345361, + "descriptor": "I", + "field": "__z", + "name": "z", + "owner": "jh" + }, + { + "access": 1, + "decoder": -736885973, + "descriptor": "I", + "field": "frameCount", + "name": "x", + "owner": "jh" + }, + { + "access": 1, + "decoder": 1147391369, + "descriptor": "I", + "field": "__t", + "name": "t", + "owner": "jh" + }, + { + "access": 1, + "decoder": 1309695045, + "descriptor": "I", + "field": "__n", + "name": "n", + "owner": "jh" + }, + { + "access": 1, + "decoder": 1339014215, + "descriptor": "I", + "field": "__j", + "name": "j", + "owner": "jh" + }, + { + "access": 1, + "decoder": 2012242069, + "descriptor": "I", + "field": "__s", + "name": "s", + "owner": "jh" + }, + { + "access": 1, + "descriptor": "Z", + "field": "__k", + "name": "k", + "owner": "jh" + }, + { + "access": 1, + "descriptor": "[I", + "field": "__e", + "name": "e", + "owner": "jh" + }, + { + "access": 1, + "descriptor": "[I", + "field": "frameIds", + "name": "u", + "owner": "jh" + }, + { + "access": 1, + "descriptor": "[I", + "field": "frameLengths", + "name": "l", + "owner": "jh" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(B)V", + "method": "postDecode", + "name": "w", + "owner": "jh", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(Ldu;II)Ldu;", + "method": "animateSpotAnimation", + "name": "g", + "owner": "jh", + "parameters": [ + "frame", + "model" + ] + }, + { + "access": 0, + "descriptor": "(Ldu;IIB)Ldu;", + "method": "animateObject", + "name": "u", + "owner": "jh", + "parameters": [ + "frame", + "model", + "orientation" + ] + }, + { + "access": 0, + "descriptor": "(Lgr;II)V", + "method": "decode0", + "name": "q", + "owner": "jh" + }, + { + "access": 0, + "descriptor": "(Lgr;S)V", + "method": "decode", + "name": "f", + "owner": "jh" + }, + { + "access": 1, + "descriptor": "(Ldu;II)Ldu;", + "method": "animateComponent", + "name": "e", + "owner": "jh", + "parameters": [ + "frame", + "model" + ] + }, + { + "access": 1, + "descriptor": "(Ldu;II)Ldu;", + "method": "animateSequence", + "name": "o", + "owner": "jh", + "parameters": [ + "frame", + "model" + ] + }, + { + "access": 1, + "descriptor": "(Ldu;ILjh;II)Ldu;", + "method": "animateSequence2", + "name": "l", + "owner": "jh", + "parameters": [ + "frame", + "model", + "sequence", + "sequenceFrame" + ] + } + ], + "name": "jh", + "super": "fn" + }, + { + "access": 33, + "class": "ServerBuild", + "constructors": [ + { + "access": 0, + "descriptor": "(Ljava/lang/String;I)V" + } + ], + "fields": [ + { + "access": 17, + "decoder": -947415971, + "descriptor": "I", + "field": "id", + "name": "u", + "owner": "iy" + }, + { + "access": 17, + "descriptor": "Ljava/lang/String;", + "field": "name", + "name": "o", + "owner": "iy" + } + ], + "interfaces": [], + "methods": [], + "name": "iy", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "ServerPacket", + "constructors": [ + { + "access": 0, + "descriptor": "(II)V" + } + ], + "fields": [ + { + "access": 17, + "decoder": 1117211673, + "descriptor": "I", + "field": "id", + "name": "cu", + "owner": "ge" + }, + { + "access": 17, + "decoder": 947096829, + "descriptor": "I", + "field": "length", + "name": "cb", + "owner": "ge" + } + ], + "interfaces": [], + "methods": [], + "name": "ge", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "Skeleton", + "constructors": [ + { + "access": 0, + "descriptor": "(I[B)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1634889691, + "descriptor": "I", + "field": "id", + "name": "m", + "owner": "ek" + }, + { + "access": 0, + "decoder": 1875841677, + "descriptor": "I", + "field": "count", + "name": "f", + "owner": "ek" + }, + { + "access": 0, + "descriptor": "[I", + "field": "transformTypes", + "name": "q", + "owner": "ek" + }, + { + "access": 0, + "descriptor": "[[I", + "field": "labels", + "name": "w", + "owner": "ek" + } + ], + "interfaces": [], + "methods": [], + "name": "ek", + "super": "gw" + }, + { + "access": 33, + "class": "Skills", + "constructors": [], + "fields": [], + "interfaces": [], + "methods": [], + "name": "hc", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "SoftWrapper", + "constructors": [ + { + "access": 0, + "descriptor": "(Ljava/lang/Object;I)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Ljava/lang/ref/SoftReference;", + "field": "ref", + "name": "m", + "owner": "ef" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "()Ljava/lang/Object;", + "method": "get", + "name": "m", + "owner": "ef", + "parameters": [] + }, + { + "access": 0, + "descriptor": "()Z", + "method": "isSoft", + "name": "f", + "owner": "ef", + "parameters": [] + } + ], + "name": "ef", + "super": "eu" + }, + { + "access": 33, + "class": "SoundCache", + "constructors": [ + { + "access": 1, + "descriptor": "(Lir;Lir;)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Lir;", + "field": "musicSampleIndex", + "name": "f", + "owner": "dt" + }, + { + "access": 0, + "descriptor": "Lir;", + "field": "soundEffectIndex", + "name": "m", + "owner": "dt" + }, + { + "access": 0, + "descriptor": "Lld;", + "field": "musicSamples", + "name": "q", + "owner": "dt" + }, + { + "access": 0, + "descriptor": "Lld;", + "field": "rawSounds", + "name": "w", + "owner": "dt" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(II[II)Lcx;", + "method": "getMusicSample0", + "name": "f", + "owner": "dt" + }, + { + "access": 0, + "descriptor": "(II[IS)Lcx;", + "method": "getSoundEffect0", + "name": "m", + "owner": "dt" + }, + { + "access": 1, + "descriptor": "(I[IB)Lcx;", + "method": "getSoundEffect", + "name": "q", + "owner": "dt" + }, + { + "access": 1, + "descriptor": "(I[II)Lcx;", + "method": "getMusicSample", + "name": "w", + "owner": "dt" + } + ], + "name": "dt", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "SoundEffect", + "constructors": [ + { + "access": 0, + "descriptor": "(Lgr;)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "I", + "field": "end", + "name": "w", + "owner": "ci" + }, + { + "access": 0, + "descriptor": "I", + "field": "start", + "name": "q", + "owner": "ci" + }, + { + "access": 0, + "descriptor": "[Ldb;", + "field": "instruments", + "name": "f", + "owner": "ci" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "()Lcx;", + "method": "toRawSound", + "name": "f", + "owner": "ci", + "parameters": [] + }, + { + "access": 16, + "descriptor": "()[B", + "method": "mix", + "name": "w", + "owner": "ci", + "parameters": [] + }, + { + "access": 17, + "descriptor": "()I", + "method": "__q_174", + "name": "q", + "owner": "ci", + "parameters": [] + } + ], + "name": "ci", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "SoundEnvelope", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "I", + "field": "amplitude", + "name": "d", + "owner": "de" + }, + { + "access": 0, + "descriptor": "I", + "field": "end", + "name": "o", + "owner": "de" + }, + { + "access": 0, + "descriptor": "I", + "field": "form", + "name": "u", + "owner": "de" + }, + { + "access": 0, + "descriptor": "I", + "field": "max", + "name": "k", + "owner": "de" + }, + { + "access": 0, + "descriptor": "I", + "field": "phaseIndex", + "name": "l", + "owner": "de" + }, + { + "access": 0, + "descriptor": "I", + "field": "segments", + "name": "m", + "owner": "de" + }, + { + "access": 0, + "descriptor": "I", + "field": "start", + "name": "w", + "owner": "de" + }, + { + "access": 0, + "descriptor": "I", + "field": "step", + "name": "e", + "owner": "de" + }, + { + "access": 0, + "descriptor": "I", + "field": "ticks", + "name": "g", + "owner": "de" + }, + { + "access": 0, + "descriptor": "[I", + "field": "durations", + "name": "f", + "owner": "de" + }, + { + "access": 0, + "descriptor": "[I", + "field": "phases", + "name": "q", + "owner": "de" + } + ], + "interfaces": [], + "methods": [ + { + "access": 16, + "descriptor": "()V", + "method": "reset", + "name": "q", + "owner": "de", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(I)I", + "method": "doStep", + "name": "w", + "owner": "de", + "parameters": [ + "n" + ] + }, + { + "access": 16, + "descriptor": "(Lgr;)V", + "method": "decode", + "name": "m", + "owner": "de", + "parameters": [ + "buffer" + ] + }, + { + "access": 16, + "descriptor": "(Lgr;)V", + "method": "decodeSegments", + "name": "f", + "owner": "de", + "parameters": [ + "buffer" + ] + } + ], + "name": "de", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "SoundSystem", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 64, + "descriptor": "[Lco;", + "field": "players", + "name": "m", + "owner": "dx" + } + ], + "interfaces": [ + "java.lang.Runnable" + ], + "methods": [ + { + "access": 1, + "descriptor": "()V", + "method": "__run_178", + "name": "run", + "owner": "dx", + "parameters": [] + } + ], + "name": "dx", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "SpotAnimationDefinition", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -20619847, + "descriptor": "I", + "field": "__a", + "name": "a", + "owner": "io" + }, + { + "access": 0, + "decoder": -2065492247, + "descriptor": "I", + "field": "model", + "name": "u", + "owner": "io" + }, + { + "access": 0, + "decoder": -713866165, + "descriptor": "I", + "field": "id", + "name": "o", + "owner": "io" + }, + { + "access": 0, + "decoder": 1199960995, + "descriptor": "I", + "field": "resizev", + "name": "n", + "owner": "io" + }, + { + "access": 0, + "decoder": 1650590363, + "descriptor": "I", + "field": "orientation", + "name": "i", + "owner": "io" + }, + { + "access": 0, + "decoder": 1866148625, + "descriptor": "I", + "field": "__z", + "name": "z", + "owner": "io" + }, + { + "access": 0, + "decoder": 680796997, + "descriptor": "I", + "field": "resizeh", + "name": "k", + "owner": "io" + }, + { + "access": 0, + "descriptor": "[S", + "field": "recol_d", + "name": "e", + "owner": "io" + }, + { + "access": 0, + "descriptor": "[S", + "field": "recol_s", + "name": "l", + "owner": "io" + }, + { + "access": 0, + "descriptor": "[S", + "field": "retex_d", + "name": "d", + "owner": "io" + }, + { + "access": 0, + "descriptor": "[S", + "field": "retex_s", + "name": "x", + "owner": "io" + }, + { + "access": 1, + "decoder": 1580078789, + "descriptor": "I", + "field": "sequence", + "name": "g", + "owner": "io" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lgr;I)V", + "method": "decode", + "name": "f", + "owner": "io", + "parameters": [ + "buffer" + ] + }, + { + "access": 0, + "descriptor": "(Lgr;II)V", + "method": "decode0", + "name": "q", + "owner": "io", + "parameters": [ + "buffer", + "n" + ] + }, + { + "access": 17, + "descriptor": "(II)Ldu;", + "method": "getModel", + "name": "w", + "owner": "io" + } + ], + "name": "io", + "super": "fn" + }, + { + "access": 33, + "class": "SpriteMask", + "constructors": [ + { + "access": 0, + "descriptor": "(II[I[II)V" + } + ], + "fields": [ + { + "access": 17, + "decoder": -193097093, + "descriptor": "I", + "field": "height", + "name": "f", + "owner": "hp" + }, + { + "access": 17, + "decoder": 574541221, + "descriptor": "I", + "field": "width", + "name": "m", + "owner": "hp" + }, + { + "access": 17, + "descriptor": "[I", + "field": "xStarts", + "name": "w", + "owner": "hp" + }, + { + "access": 17, + "descriptor": "[I", + "field": "xWidths", + "name": "q", + "owner": "hp" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "(III)Z", + "method": "contains", + "name": "m", + "owner": "hp", + "parameters": [ + "x", + "y" + ] + } + ], + "name": "hp", + "super": "fn" + }, + { + "access": 33, + "class": "Strings", + "constructors": [], + "fields": [], + "interfaces": [], + "methods": [], + "name": "id", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "StructDefinition", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Llh;", + "field": "params", + "name": "q", + "owner": "jq" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(B)V", + "method": "postDecode", + "name": "f", + "owner": "jq", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(Lgr;I)V", + "method": "decode", + "name": "q", + "owner": "jq" + }, + { + "access": 0, + "descriptor": "(Lgr;II)V", + "method": "decode0", + "name": "w", + "owner": "jq" + }, + { + "access": 1, + "descriptor": "(IIB)I", + "method": "getIntParam", + "name": "o", + "owner": "jq" + }, + { + "access": 1, + "descriptor": "(ILjava/lang/String;I)Ljava/lang/String;", + "method": "getStringParam", + "name": "u", + "owner": "jq" + } + ], + "name": "jq", + "super": "fn" + }, + { + "access": 33, + "class": "StudioGame", + "constructors": [ + { + "access": 0, + "descriptor": "(Ljava/lang/String;Ljava/lang/String;I)V" + } + ], + "fields": [ + { + "access": 16, + "decoder": -1688917715, + "descriptor": "I", + "field": "id", + "name": "l", + "owner": "is" + }, + { + "access": 17, + "descriptor": "Ljava/lang/String;", + "field": "name", + "name": "g", + "owner": "is" + } + ], + "interfaces": [ + "gc" + ], + "methods": [ + { + "access": 1, + "descriptor": "(B)I", + "method": "ordinal", + "name": "f", + "owner": "is" + } + ], + "name": "is", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "Task", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1097728571, + "descriptor": "I", + "field": "type", + "name": "u", + "owner": "fm" + }, + { + "access": 0, + "descriptor": "Lfm;", + "field": "next", + "name": "m", + "owner": "fm" + }, + { + "access": 0, + "descriptor": "Ljava/lang/Object;", + "field": "objectArgument", + "name": "l", + "owner": "fm" + }, + { + "access": 1, + "descriptor": "I", + "field": "intArgument", + "name": "g", + "owner": "fm" + }, + { + "access": 65, + "descriptor": "I", + "field": "status", + "name": "o", + "owner": "fm" + }, + { + "access": 65, + "descriptor": "Ljava/lang/Object;", + "field": "result", + "name": "e", + "owner": "fm" + } + ], + "interfaces": [], + "methods": [], + "name": "fm", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "TaskHandler", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Lfm;", + "field": "current", + "name": "q", + "owner": "fz" + }, + { + "access": 0, + "descriptor": "Lfm;", + "field": "task0", + "name": "w", + "owner": "fz" + }, + { + "access": 0, + "descriptor": "Ljava/lang/Thread;", + "field": "thread", + "name": "o", + "owner": "fz" + }, + { + "access": 0, + "descriptor": "Z", + "field": "isClosed", + "name": "u", + "owner": "fz" + } + ], + "interfaces": [ + "java.lang.Runnable" + ], + "methods": [ + { + "access": 16, + "descriptor": "(IIILjava/lang/Object;I)Lfm;", + "method": "newTask", + "name": "f", + "owner": "fz" + }, + { + "access": 17, + "descriptor": "()V", + "method": "__run_279", + "name": "run", + "owner": "fz", + "parameters": [] + }, + { + "access": 17, + "descriptor": "(I)V", + "method": "close", + "name": "m", + "owner": "fz", + "parameters": [] + }, + { + "access": 17, + "descriptor": "(Ljava/lang/Runnable;II)Lfm;", + "method": "newThreadTask", + "name": "w", + "owner": "fz" + }, + { + "access": 17, + "descriptor": "(Ljava/lang/String;II)Lfm;", + "method": "newSocketTask", + "name": "q", + "owner": "fz" + } + ], + "name": "fz", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "Texture", + "constructors": [ + { + "access": 0, + "descriptor": "(Lgr;)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "I", + "field": "animationDirection", + "name": "d", + "owner": "dh" + }, + { + "access": 0, + "descriptor": "I", + "field": "animationSpeed", + "name": "k", + "owner": "dh" + }, + { + "access": 0, + "descriptor": "I", + "field": "int1", + "name": "o", + "owner": "dh" + }, + { + "access": 0, + "descriptor": "Z", + "field": "__u", + "name": "u", + "owner": "dh" + }, + { + "access": 0, + "descriptor": "Z", + "field": "isLoaded", + "name": "i", + "owner": "dh" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__e", + "name": "e", + "owner": "dh" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__l", + "name": "l", + "owner": "dh" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__x", + "name": "x", + "owner": "dh" + }, + { + "access": 0, + "descriptor": "[I", + "field": "files", + "name": "g", + "owner": "dh" + }, + { + "access": 0, + "descriptor": "[I", + "field": "pixels", + "name": "n", + "owner": "dh" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "()V", + "method": "reset", + "name": "f", + "owner": "dh" + }, + { + "access": 0, + "descriptor": "(DILir;)Z", + "method": "__m_230", + "name": "m", + "owner": "dh", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "animate", + "name": "q", + "owner": "dh", + "parameters": [ + "n" + ] + } + ], + "name": "dh", + "super": "gw" + }, + { + "access": 33, + "class": "TextureProvider", + "constructors": [ + { + "access": 1, + "descriptor": "(Lir;Lir;IDI)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": 1124790219, + "descriptor": "I", + "field": "textureSize", + "name": "u", + "owner": "dl" + }, + { + "access": 0, + "decoder": 1130378699, + "descriptor": "I", + "field": "remaining", + "name": "w", + "owner": "dl" + }, + { + "access": 0, + "decoder": 762273989, + "descriptor": "I", + "field": "capacity", + "name": "q", + "owner": "dl" + }, + { + "access": 0, + "descriptor": "D", + "field": "brightness0", + "name": "o", + "owner": "dl" + }, + { + "access": 0, + "descriptor": "Lir;", + "field": "archive", + "name": "g", + "owner": "dl" + }, + { + "access": 0, + "descriptor": "Lje;", + "field": "deque", + "name": "f", + "owner": "dl" + }, + { + "access": 0, + "descriptor": "[Ldh;", + "field": "textures", + "name": "m", + "owner": "dl" + } + ], + "interfaces": [ + "ei" + ], + "methods": [ + { + "access": 1, + "descriptor": "(D)V", + "method": "setBrightness", + "name": "f", + "owner": "dl", + "parameters": [ + "brightness" + ] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__m_212", + "name": "m", + "owner": "dl", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "clear", + "name": "g", + "owner": "dl", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(IB)Z", + "method": "__o_214", + "name": "o", + "owner": "dl", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(II)I", + "method": "__w_213", + "name": "w", + "owner": "dl", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(II)V", + "method": "animate", + "name": "l", + "owner": "dl", + "parameters": [ + "n" + ] + }, + { + "access": 1, + "descriptor": "(II)Z", + "method": "isLowDetail", + "name": "u", + "owner": "dl" + }, + { + "access": 1, + "descriptor": "(II)[I", + "method": "load", + "name": "q", + "owner": "dl" + } + ], + "name": "dl", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "Timer", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -500639955, + "descriptor": "I", + "field": "__g", + "name": "g", + "owner": "jo" + }, + { + "access": 0, + "decoder": -5820022560321696000, + "descriptor": "J", + "field": "__o", + "name": "o", + "owner": "jo" + }, + { + "access": 0, + "decoder": -6206176920376958000, + "descriptor": "J", + "field": "__w", + "name": "w", + "owner": "jo" + }, + { + "access": 0, + "decoder": -7044840680232741000, + "descriptor": "J", + "field": "__u", + "name": "u", + "owner": "jo" + }, + { + "access": 0, + "decoder": -8166664055136527000, + "descriptor": "J", + "field": "__f", + "name": "f", + "owner": "jo" + }, + { + "access": 0, + "decoder": 1684916659, + "descriptor": "I", + "field": "__x", + "name": "x", + "owner": "jo" + }, + { + "access": 0, + "decoder": 2043109577, + "descriptor": "I", + "field": "__l", + "name": "l", + "owner": "jo" + }, + { + "access": 0, + "decoder": 6181704275746247000, + "descriptor": "J", + "field": "__m", + "name": "m", + "owner": "jo" + }, + { + "access": 0, + "decoder": 978183419, + "descriptor": "I", + "field": "__e", + "name": "e", + "owner": "jo" + }, + { + "access": 1, + "descriptor": "Z", + "field": "__q", + "name": "q", + "owner": "jo" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "(B)V", + "method": "__f_450", + "name": "f", + "owner": "jo", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "__m_449", + "name": "m", + "owner": "jo", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "__u_454", + "name": "u", + "owner": "jo", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "__w_452", + "name": "w", + "owner": "jo", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(II)V", + "method": "__q_451", + "name": "q", + "owner": "jo", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(Lgr;I)V", + "method": "write", + "name": "g", + "owner": "jo", + "parameters": [ + "buffer" + ] + }, + { + "access": 1, + "descriptor": "(S)V", + "method": "__o_453", + "name": "o", + "owner": "jo", + "parameters": [] + } + ], + "name": "jo", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "TriBool", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [], + "interfaces": [], + "methods": [], + "name": "kd", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "UrlRequest", + "constructors": [ + { + "access": 0, + "descriptor": "(Ljava/net/URL;)V" + } + ], + "fields": [ + { + "access": 16, + "descriptor": "Ljava/net/URL;", + "field": "url", + "name": "m", + "owner": "ey" + }, + { + "access": 64, + "descriptor": "Z", + "field": "isDone0", + "name": "f", + "owner": "ey" + }, + { + "access": 64, + "descriptor": "[B", + "field": "response0", + "name": "q", + "owner": "ey" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "(B)[B", + "method": "getResponse", + "name": "f", + "owner": "ey", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)Z", + "method": "isDone", + "name": "m", + "owner": "ey", + "parameters": [] + } + ], + "name": "ey", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "UrlRequester", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Ljava/util/Queue;", + "field": "requests", + "name": "q", + "owner": "eo" + }, + { + "access": 16, + "descriptor": "Ljava/lang/Thread;", + "field": "thread", + "name": "m", + "owner": "eo" + }, + { + "access": 64, + "descriptor": "Z", + "field": "isClosed", + "name": "f", + "owner": "eo" + } + ], + "interfaces": [ + "java.lang.Runnable" + ], + "methods": [ + { + "access": 1, + "descriptor": "()V", + "method": "__run_260", + "name": "run", + "owner": "eo", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(Ljava/net/URL;I)Ley;", + "method": "request", + "name": "m", + "owner": "eo", + "parameters": [ + "url" + ] + }, + { + "access": 1, + "descriptor": "(S)V", + "method": "close", + "name": "f", + "owner": "eo", + "parameters": [] + } + ], + "name": "eo", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "User", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Lkp;", + "field": "previousUsername", + "name": "w", + "owner": "js" + }, + { + "access": 0, + "descriptor": "Lkp;", + "field": "username0", + "name": "q", + "owner": "js" + } + ], + "interfaces": [ + "java.lang.Comparable" + ], + "methods": [ + { + "access": 0, + "descriptor": "(Lkp;Lkp;I)V", + "method": "set", + "name": "aq", + "owner": "js", + "parameters": [ + "previousUsername", + "username" + ] + }, + { + "access": 1, + "descriptor": "(B)Ljava/lang/String;", + "method": "name", + "name": "v", + "owner": "js", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)Ljava/lang/String;", + "method": "previousName", + "name": "ag", + "owner": "js", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)Lkp;", + "method": "username", + "name": "p", + "owner": "js", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;)I", + "method": "__compareTo_455", + "name": "compareTo", + "owner": "js", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(Ljs;I)I", + "method": "compareTo0", + "name": "aj", + "owner": "js", + "parameters": [ + "other" + ] + } + ], + "name": "js", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "UserComparator1", + "constructors": [ + { + "access": 1, + "descriptor": "(Z)V" + } + ], + "fields": [ + { + "access": 16, + "descriptor": "Z", + "field": "__m", + "name": "m", + "owner": "ly" + } + ], + "interfaces": [ + "java.util.Comparator" + ], + "methods": [ + { + "access": 0, + "descriptor": "(Ljs;Ljs;B)I", + "method": "__m_472", + "name": "m", + "owner": "ly", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;)Z", + "method": "__equals_474", + "name": "equals", + "owner": "ly", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", + "method": "__compare_473", + "name": "compare", + "owner": "ly", + "parameters": [ + "arg0", + "arg1" + ] + } + ], + "name": "ly", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "UserComparator10", + "constructors": [ + { + "access": 1, + "descriptor": "(Z)V" + } + ], + "fields": [ + { + "access": 16, + "descriptor": "Z", + "field": "__m", + "name": "m", + "owner": "eg" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lke;Lke;B)I", + "method": "__m_268", + "name": "m", + "owner": "eg", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", + "method": "__compare_269", + "name": "compare", + "owner": "eg", + "parameters": [ + "arg0", + "arg1" + ] + } + ], + "name": "eg", + "super": "kf" + }, + { + "access": 33, + "class": "UserComparator2", + "constructors": [ + { + "access": 1, + "descriptor": "(Z)V" + } + ], + "fields": [ + { + "access": 16, + "descriptor": "Z", + "field": "__m", + "name": "m", + "owner": "li" + } + ], + "interfaces": [ + "java.util.Comparator" + ], + "methods": [ + { + "access": 0, + "descriptor": "(Ljs;Ljs;I)I", + "method": "__m_475", + "name": "m", + "owner": "li", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;)Z", + "method": "__equals_477", + "name": "equals", + "owner": "li", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", + "method": "__compare_476", + "name": "compare", + "owner": "li", + "parameters": [ + "arg0", + "arg1" + ] + } + ], + "name": "li", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "UserComparator3", + "constructors": [ + { + "access": 1, + "descriptor": "(Z)V" + } + ], + "fields": [ + { + "access": 16, + "descriptor": "Z", + "field": "__m", + "name": "m", + "owner": "fq" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lke;Lke;I)I", + "method": "__m_274", + "name": "m", + "owner": "fq", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", + "method": "__compare_275", + "name": "compare", + "owner": "fq", + "parameters": [ + "arg0", + "arg1" + ] + } + ], + "name": "fq", + "super": "kf" + }, + { + "access": 33, + "class": "UserComparator4", + "constructors": [ + { + "access": 1, + "descriptor": "(Z)V" + } + ], + "fields": [ + { + "access": 16, + "descriptor": "Z", + "field": "__m", + "name": "m", + "owner": "ev" + } + ], + "interfaces": [ + "java.util.Comparator" + ], + "methods": [ + { + "access": 0, + "descriptor": "(Lke;Lke;I)I", + "method": "__m_261", + "name": "m", + "owner": "ev", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;)Z", + "method": "__equals_263", + "name": "equals", + "owner": "ev", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", + "method": "__compare_262", + "name": "compare", + "owner": "ev", + "parameters": [ + "arg0", + "arg1" + ] + } + ], + "name": "ev", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "UserComparator5", + "constructors": [ + { + "access": 1, + "descriptor": "(Z)V" + } + ], + "fields": [ + { + "access": 16, + "descriptor": "Z", + "field": "__m", + "name": "m", + "owner": "ep" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lke;Lke;B)I", + "method": "__m_272", + "name": "m", + "owner": "ep", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", + "method": "__compare_273", + "name": "compare", + "owner": "ep", + "parameters": [ + "arg0", + "arg1" + ] + } + ], + "name": "ep", + "super": "kf" + }, + { + "access": 33, + "class": "UserComparator6", + "constructors": [ + { + "access": 1, + "descriptor": "(Z)V" + } + ], + "fields": [ + { + "access": 16, + "descriptor": "Z", + "field": "__m", + "name": "m", + "owner": "fg" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lke;Lke;I)I", + "method": "__m_276", + "name": "m", + "owner": "fg", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", + "method": "__compare_277", + "name": "compare", + "owner": "fg", + "parameters": [ + "arg0", + "arg1" + ] + } + ], + "name": "fg", + "super": "kf" + }, + { + "access": 33, + "class": "UserComparator7", + "constructors": [ + { + "access": 1, + "descriptor": "(Z)V" + } + ], + "fields": [ + { + "access": 16, + "descriptor": "Z", + "field": "__m", + "name": "m", + "owner": "ez" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lke;Lke;I)I", + "method": "__m_270", + "name": "m", + "owner": "ez", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", + "method": "__compare_271", + "name": "compare", + "owner": "ez", + "parameters": [ + "arg0", + "arg1" + ] + } + ], + "name": "ez", + "super": "kf" + }, + { + "access": 33, + "class": "UserComparator8", + "constructors": [ + { + "access": 1, + "descriptor": "(Z)V" + } + ], + "fields": [ + { + "access": 16, + "descriptor": "Z", + "field": "__m", + "name": "m", + "owner": "es" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lke;Lke;B)I", + "method": "__m_266", + "name": "m", + "owner": "es", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", + "method": "__compare_267", + "name": "compare", + "owner": "es", + "parameters": [ + "arg0", + "arg1" + ] + } + ], + "name": "es", + "super": "kf" + }, + { + "access": 33, + "class": "UserComparator9", + "constructors": [ + { + "access": 1, + "descriptor": "(Z)V" + } + ], + "fields": [ + { + "access": 16, + "descriptor": "Z", + "field": "__m", + "name": "m", + "owner": "ea" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lke;Lke;I)I", + "method": "__m_264", + "name": "m", + "owner": "ea", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", + "method": "__compare_265", + "name": "compare", + "owner": "ea", + "parameters": [ + "arg0", + "arg1" + ] + } + ], + "name": "ea", + "super": "kf" + }, + { + "access": 33, + "class": "Username", + "constructors": [ + { + "access": 1, + "descriptor": "(Ljava/lang/String;Llx;)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "cleanName", + "name": "f", + "owner": "kp" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "name0", + "name": "m", + "owner": "kp" + } + ], + "interfaces": [ + "java.lang.Comparable" + ], + "methods": [ + { + "access": 1, + "descriptor": "()I", + "method": "__hashCode_463", + "name": "hashCode", + "owner": "kp", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()Ljava/lang/String;", + "method": "__toString_464", + "name": "toString", + "owner": "kp", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)Ljava/lang/String;", + "method": "name", + "name": "m", + "owner": "kp", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)Z", + "method": "hasCleanName", + "name": "f", + "owner": "kp", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;)I", + "method": "__compareTo_465", + "name": "compareTo", + "owner": "kp", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;)Z", + "method": "__equals_462", + "name": "equals", + "owner": "kp", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(Lkp;B)I", + "method": "compareTo0", + "name": "q", + "owner": "kp", + "parameters": [ + "other" + ] + } + ], + "name": "kp", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "VarbitDefinition", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 1, + "decoder": -1710935305, + "descriptor": "I", + "field": "endBit", + "name": "o", + "owner": "ia" + }, + { + "access": 1, + "decoder": -870948181, + "descriptor": "I", + "field": "startBit", + "name": "w", + "owner": "ia" + }, + { + "access": 1, + "decoder": 1552575189, + "descriptor": "I", + "field": "baseVar", + "name": "q", + "owner": "ia" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lgr;I)V", + "method": "decode", + "name": "q", + "owner": "ia" + }, + { + "access": 0, + "descriptor": "(Lgr;IB)V", + "method": "decode0", + "name": "w", + "owner": "ia" + } + ], + "name": "ia", + "super": "fn" + }, + { + "access": 33, + "class": "VarcInt", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 1, + "descriptor": "Z", + "field": "persist", + "name": "q", + "owner": "iw" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lgr;I)V", + "method": "__q_411", + "name": "q", + "owner": "iw", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "(Lgr;II)V", + "method": "__w_412", + "name": "w", + "owner": "iw", + "parameters": [ + "arg0", + "arg1" + ] + } + ], + "name": "iw", + "super": "fn" + }, + { + "access": 33, + "class": "Varcs", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": 4836824701467349000, + "descriptor": "J", + "field": "lastWriteTimeMs", + "name": "g", + "owner": "ch" + }, + { + "access": 0, + "descriptor": "Ljava/util/Map;", + "field": "map", + "name": "w", + "owner": "ch" + }, + { + "access": 0, + "descriptor": "Z", + "field": "unwrittenChanges", + "name": "u", + "owner": "ch" + }, + { + "access": 0, + "descriptor": "[Ljava/lang/String;", + "field": "strings", + "name": "o", + "owner": "ch" + }, + { + "access": 0, + "descriptor": "[Z", + "field": "intsPersistence", + "name": "q", + "owner": "ch" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)V", + "method": "clearTransient", + "name": "g", + "owner": "ch", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "read", + "name": "x", + "owner": "ch" + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "tryWrite", + "name": "d", + "owner": "ch", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "write", + "name": "e", + "owner": "ch" + }, + { + "access": 0, + "descriptor": "(I)Z", + "method": "hasUnwrittenChanges", + "name": "a", + "owner": "ch", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(IB)I", + "method": "getInt", + "name": "f", + "owner": "ch", + "parameters": [ + "index" + ] + }, + { + "access": 0, + "descriptor": "(IB)Ljava/lang/String;", + "method": "getStringOld", + "name": "u", + "owner": "ch", + "parameters": [ + "index" + ] + }, + { + "access": 0, + "descriptor": "(II)Ljava/lang/String;", + "method": "getString", + "name": "w", + "owner": "ch", + "parameters": [ + "index" + ] + }, + { + "access": 0, + "descriptor": "(III)V", + "method": "setInt", + "name": "m", + "owner": "ch", + "parameters": [ + "index", + "n" + ] + }, + { + "access": 0, + "descriptor": "(ILjava/lang/String;B)V", + "method": "setStringOld", + "name": "o", + "owner": "ch", + "parameters": [ + "index", + "s" + ] + }, + { + "access": 0, + "descriptor": "(ILjava/lang/String;I)V", + "method": "setString", + "name": "q", + "owner": "ch", + "parameters": [ + "index", + "s" + ] + }, + { + "access": 0, + "descriptor": "(ZB)Ldk;", + "method": "getPreferencesFile", + "name": "l", + "owner": "ch" + } + ], + "name": "ch", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "VarpDefinition", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 1, + "decoder": -1792568421, + "descriptor": "I", + "field": "type", + "name": "w", + "owner": "ix" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lgr;B)V", + "method": "decode", + "name": "f", + "owner": "ix" + }, + { + "access": 0, + "descriptor": "(Lgr;II)V", + "method": "decode0", + "name": "q", + "owner": "ix" + } + ], + "name": "ix", + "super": "fn" + }, + { + "access": 33, + "class": "Varps", + "constructors": [], + "fields": [], + "interfaces": [], + "methods": [], + "name": "hv", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "VertexNormal", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + }, + { + "access": 0, + "descriptor": "(Ldq;)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1493845293, + "descriptor": "I", + "field": "__f", + "name": "f", + "owner": "dq" + }, + { + "access": 0, + "decoder": -487323631, + "descriptor": "I", + "field": "__w", + "name": "w", + "owner": "dq" + }, + { + "access": 0, + "decoder": 1414310131, + "descriptor": "I", + "field": "__m", + "name": "m", + "owner": "dq" + }, + { + "access": 0, + "decoder": 1575149515, + "descriptor": "I", + "field": "__q", + "name": "q", + "owner": "dq" + } + ], + "interfaces": [], + "methods": [], + "name": "dq", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "ViewportMouse", + "constructors": [], + "fields": [], + "interfaces": [], + "methods": [], + "name": "dm", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "World", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -144265493, + "descriptor": "I", + "field": "id", + "name": "d", + "owner": "bt" + }, + { + "access": 0, + "decoder": 1147427427, + "descriptor": "I", + "field": "index", + "name": "j", + "owner": "bt" + }, + { + "access": 0, + "decoder": 1863464125, + "descriptor": "I", + "field": "population", + "name": "n", + "owner": "bt" + }, + { + "access": 0, + "decoder": 1942858323, + "descriptor": "I", + "field": "location", + "name": "z", + "owner": "bt" + }, + { + "access": 0, + "decoder": 956991319, + "descriptor": "I", + "field": "properties", + "name": "k", + "owner": "bt" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "activity", + "name": "a", + "owner": "bt" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "host", + "name": "i", + "owner": "bt" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(B)Z", + "method": "__x_145", + "name": "x", + "owner": "bt", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(B)Z", + "method": "__z_148", + "name": "z", + "owner": "bt", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)Z", + "method": "__a_147", + "name": "a", + "owner": "bt", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)Z", + "method": "__d_146", + "name": "d", + "owner": "bt", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)Z", + "method": "__e_144", + "name": "e", + "owner": "bt", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)Z", + "method": "__j_149", + "name": "j", + "owner": "bt", + "parameters": [] + } + ], + "name": "bt", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "WorldMap", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1140942239, + "descriptor": "I", + "field": "__aj", + "name": "aj", + "owner": "lz" + }, + { + "access": 0, + "decoder": -1301477687, + "descriptor": "I", + "field": "__av", + "name": "av", + "owner": "lz" + }, + { + "access": 0, + "decoder": -1469654441, + "descriptor": "I", + "field": "__aq", + "name": "aq", + "owner": "lz" + }, + { + "access": 0, + "decoder": -1653084915, + "descriptor": "I", + "field": "__ac", + "name": "ac", + "owner": "lz" + }, + { + "access": 0, + "decoder": -1683910031, + "descriptor": "I", + "field": "__aw", + "name": "aw", + "owner": "lz" + }, + { + "access": 0, + "decoder": -1774424249, + "descriptor": "I", + "field": "__bm", + "name": "bm", + "owner": "lz" + }, + { + "access": 0, + "decoder": -1979665983, + "descriptor": "I", + "field": "__ab", + "name": "ab", + "owner": "lz" + }, + { + "access": 0, + "decoder": -237734529, + "descriptor": "I", + "field": "__ba", + "name": "ba", + "owner": "lz" + }, + { + "access": 0, + "decoder": -298919797, + "descriptor": "I", + "field": "__ar", + "name": "ar", + "owner": "lz" + }, + { + "access": 0, + "decoder": -4747643242047041000, + "descriptor": "J", + "field": "__ap", + "name": "ap", + "owner": "lz" + }, + { + "access": 0, + "decoder": -56022357, + "descriptor": "I", + "field": "__p", + "name": "p", + "owner": "lz" + }, + { + "access": 0, + "decoder": -815748997, + "descriptor": "I", + "field": "__at", + "name": "at", + "owner": "lz" + }, + { + "access": 0, + "decoder": -869889187, + "descriptor": "I", + "field": "__am", + "name": "am", + "owner": "lz" + }, + { + "access": 0, + "decoder": -89657613, + "descriptor": "I", + "field": "__r", + "name": "r", + "owner": "lz" + }, + { + "access": 0, + "decoder": -969094439, + "descriptor": "I", + "field": "__as", + "name": "as", + "owner": "lz" + }, + { + "access": 0, + "decoder": -988933407, + "descriptor": "I", + "field": "__ad", + "name": "ad", + "owner": "lz" + }, + { + "access": 0, + "decoder": 1318118645, + "descriptor": "I", + "field": "__c", + "name": "c", + "owner": "lz" + }, + { + "access": 0, + "decoder": 1664740569, + "descriptor": "I", + "field": "__ay", + "name": "ay", + "owner": "lz" + }, + { + "access": 0, + "decoder": 1711576969, + "descriptor": "I", + "field": "__b", + "name": "b", + "owner": "lz" + }, + { + "access": 0, + "decoder": 2031417343, + "descriptor": "I", + "field": "__bx", + "name": "bx", + "owner": "lz" + }, + { + "access": 0, + "decoder": 2064651113, + "descriptor": "I", + "field": "__al", + "name": "al", + "owner": "lz" + }, + { + "access": 0, + "decoder": 2064728623, + "descriptor": "I", + "field": "__bu", + "name": "bu", + "owner": "lz" + }, + { + "access": 0, + "decoder": 547126547, + "descriptor": "I", + "field": "__ae", + "name": "ae", + "owner": "lz" + }, + { + "access": 0, + "decoder": 754899959, + "descriptor": "I", + "field": "__by", + "name": "by", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "F", + "field": "zoom", + "name": "v", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "F", + "field": "zoomTarget", + "name": "ag", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Lag;", + "field": "__t", + "name": "t", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Lag;", + "field": "currentMapArea0", + "name": "s", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Lag;", + "field": "mainMapArea", + "name": "j", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Lal;", + "field": "worldMapManager", + "name": "y", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Lhu;", + "field": "mouseCoord", + "name": "bd", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Lir;", + "field": "__e", + "name": "e", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Lir;", + "field": "__g", + "name": "g", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Lir;", + "field": "__l", + "name": "l", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Ljava/util/HashMap;", + "field": "fonts", + "name": "i", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Ljava/util/HashMap;", + "field": "mapAreas", + "name": "z", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Ljava/util/HashSet;", + "field": "__af", + "name": "af", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Ljava/util/HashSet;", + "field": "__ax", + "name": "ax", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Ljava/util/HashSet;", + "field": "__bk", + "name": "bk", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Ljava/util/HashSet;", + "field": "enabledCategories", + "name": "aa", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Ljava/util/HashSet;", + "field": "enabledElements", + "name": "ao", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Ljava/util/HashSet;", + "field": "flashingElements", + "name": "ak", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Ljava/util/Iterator;", + "field": "iconIterator", + "name": "bn", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Ljava/util/List;", + "field": "__bq", + "name": "bq", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Lkk;", + "field": "font", + "name": "n", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Lln;", + "field": "sprite", + "name": "bo", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Lls;", + "field": "cacheLoader", + "name": "h", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Z", + "field": "__an", + "name": "an", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Z", + "field": "elementsDisabled", + "name": "ai", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "Z", + "field": "perpetualFlash0", + "name": "ah", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "[Llq;", + "field": "mapSceneSprites", + "name": "a", + "owner": "lz" + }, + { + "access": 1, + "descriptor": "Z", + "field": "__bc", + "name": "bc", + "owner": "lz" + }, + { + "access": 16, + "descriptor": "[I", + "field": "__bs", + "name": "bs", + "owner": "lz" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)V", + "method": "__bk_539", + "name": "bk", + "owner": "lz", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "__g_517", + "name": "g", + "owner": "lz", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "smoothZoom", + "name": "u", + "owner": "lz", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)Z", + "method": "__x_520", + "name": "x", + "owner": "lz", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(IB)F", + "method": "__av_525", + "name": "av", + "owner": "lz", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "(IIII)V", + "method": "jump", + "name": "b", + "owner": "lz", + "parameters": [ + "plane", + "x", + "y" + ] + }, + { + "access": 0, + "descriptor": "(IIIIIB)V", + "method": "drawLoading", + "name": "aj", + "owner": "lz" + }, + { + "access": 0, + "descriptor": "(IIIIIII)V", + "method": "__v_524", + "name": "v", + "owner": "lz", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4", + "arg5" + ] + }, + { + "access": 0, + "descriptor": "(IIIIIII)Z", + "method": "__p_523", + "name": "p", + "owner": "lz", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4", + "arg5" + ] + }, + { + "access": 0, + "descriptor": "(IIZJ)V", + "method": "__o_516", + "name": "o", + "owner": "lz", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3" + ] + }, + { + "access": 0, + "descriptor": "(Lag;B)V", + "method": "setCurrentMapArea", + "name": "t", + "owner": "lz", + "parameters": [ + "mapArea" + ] + }, + { + "access": 0, + "descriptor": "(Lag;I)V", + "method": "initializeWorldMapManager", + "name": "y", + "owner": "lz", + "parameters": [ + "mapArea" + ] + }, + { + "access": 1, + "descriptor": "(B)I", + "method": "getZoomLevel", + "name": "ar", + "owner": "lz", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(B)Lak;", + "method": "iconNext", + "name": "by", + "owner": "lz" + }, + { + "access": 1, + "descriptor": "(B)V", + "method": "loadCache", + "name": "ac", + "owner": "lz", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(B)Z", + "method": "getElementsEnabled", + "name": "bs", + "owner": "lz", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__ae_530", + "name": "ae", + "owner": "lz", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__ap_533", + "name": "ap", + "owner": "lz", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__as_534", + "name": "as", + "owner": "lz", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__at_531", + "name": "at", + "owner": "lz", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "currentMapAreaId", + "name": "j", + "owner": "lz", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)Lag;", + "method": "getCurrentMapArea", + "name": "s", + "owner": "lz", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)Lak;", + "method": "iconStart", + "name": "bx", + "owner": "lz" + }, + { + "access": 1, + "descriptor": "(I)Lhu;", + "method": "__ad_532", + "name": "ad", + "owner": "lz", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "__an_536", + "name": "an", + "owner": "lz", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "__au_538", + "name": "au", + "owner": "lz", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "__f_514", + "name": "f", + "owner": "lz", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "stopCurrentFlashes", + "name": "af", + "owner": "lz" + }, + { + "access": 1, + "descriptor": "(IB)V", + "method": "flashCategory", + "name": "ax", + "owner": "lz" + }, + { + "access": 1, + "descriptor": "(IB)Z", + "method": "isElementDisabled", + "name": "bq", + "owner": "lz" + }, + { + "access": 1, + "descriptor": "(II)Lag;", + "method": "getMapArea", + "name": "ah", + "owner": "lz", + "parameters": [ + "id" + ] + }, + { + "access": 1, + "descriptor": "(II)V", + "method": "__am_535", + "name": "am", + "owner": "lz", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(II)V", + "method": "__az_537", + "name": "az", + "owner": "lz", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(II)V", + "method": "flashElement", + "name": "aa", + "owner": "lz" + }, + { + "access": 1, + "descriptor": "(II)V", + "method": "setCurrentMapAreaId", + "name": "z", + "owner": "lz", + "parameters": [ + "id" + ] + }, + { + "access": 1, + "descriptor": "(II)V", + "method": "setZoomLevel", + "name": "aq", + "owner": "lz", + "parameters": [ + "zoom" + ] + }, + { + "access": 1, + "descriptor": "(II)Z", + "method": "isCategoryDisabled", + "name": "bn", + "owner": "lz" + }, + { + "access": 1, + "descriptor": "(III)V", + "method": "__ak_526", + "name": "ak", + "owner": "lz", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(III)V", + "method": "__aw_527", + "name": "aw", + "owner": "lz", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(IIIB)V", + "method": "__al_528", + "name": "al", + "owner": "lz", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "(IIII)Lag;", + "method": "mapAreaAtCoord", + "name": "d", + "owner": "lz", + "parameters": [ + "plane", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(IIII)V", + "method": "__ab_529", + "name": "ab", + "owner": "lz", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "(IIIIB)V", + "method": "drawOverview", + "name": "ag", + "owner": "lz", + "parameters": [ + "height", + "width", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(IIIIII)V", + "method": "draw", + "name": "c", + "owner": "lz", + "parameters": [ + "cycle", + "height", + "width", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(IIIIIIB)V", + "method": "__bd_540", + "name": "bd", + "owner": "lz", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4", + "arg5" + ] + }, + { + "access": 1, + "descriptor": "(IIIZI)V", + "method": "__a_521", + "name": "a", + "owner": "lz", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3" + ] + }, + { + "access": 1, + "descriptor": "(IILhu;Lhu;B)V", + "method": "menuAction", + "name": "bo", + "owner": "lz", + "parameters": [ + "a", + "b", + "c", + "d" + ] + }, + { + "access": 1, + "descriptor": "(IIZIIIIB)V", + "method": "onCycle", + "name": "q", + "owner": "lz", + "parameters": [ + "a", + "b", + "c", + "d", + "e", + "f", + "g" + ] + }, + { + "access": 1, + "descriptor": "(IIZZS)V", + "method": "__w_515", + "name": "w", + "owner": "lz", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3" + ] + }, + { + "access": 1, + "descriptor": "(ILhu;I)Lhu;", + "method": "__bc_541", + "name": "bc", + "owner": "lz", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(IZI)V", + "method": "disableCategory", + "name": "bb", + "owner": "lz" + }, + { + "access": 1, + "descriptor": "(IZI)V", + "method": "disableElement", + "name": "ba", + "owner": "lz" + }, + { + "access": 1, + "descriptor": "(Lag;Lhu;Lhu;ZI)V", + "method": "__h_522", + "name": "h", + "owner": "lz", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3" + ] + }, + { + "access": 1, + "descriptor": "(Lir;Lir;Lir;Lkk;Ljava/util/HashMap;[Llq;I)V", + "method": "init", + "name": "m", + "owner": "lz" + }, + { + "access": 1, + "descriptor": "(S)Z", + "method": "isCacheLoaded", + "name": "ay", + "owner": "lz", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(ZI)V", + "method": "perpetualFlash", + "name": "ao", + "owner": "lz" + }, + { + "access": 1, + "descriptor": "(ZI)V", + "method": "setElementsEnabled", + "name": "ai", + "owner": "lz" + }, + { + "access": 16, + "descriptor": "(B)V", + "method": "__e_519", + "name": "e", + "owner": "lz", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(IIZI)V", + "method": "__l_518", + "name": "l", + "owner": "lz", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + } + ], + "name": "lz", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "WorldMapArchiveLoader", + "constructors": [ + { + "access": 0, + "descriptor": "(Lir;)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": 624113115, + "descriptor": "I", + "field": "percentLoaded", + "name": "g", + "owner": "ls" + }, + { + "access": 0, + "descriptor": "Lir;", + "field": "archive", + "name": "u", + "owner": "ls" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "cacheName", + "name": "o", + "owner": "ls" + }, + { + "access": 0, + "descriptor": "Z", + "field": "isLoaded", + "name": "l", + "owner": "ls" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)I", + "method": "load", + "name": "f", + "owner": "ls", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)I", + "method": "percentLoaded", + "name": "w", + "owner": "ls", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(Ljava/lang/String;I)V", + "method": "reset", + "name": "m", + "owner": "ls", + "parameters": [ + "cacheName" + ] + }, + { + "access": 0, + "descriptor": "(S)Z", + "method": "isLoaded", + "name": "q", + "owner": "ls", + "parameters": [] + } + ], + "name": "ls", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "WorldMapArea", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": 1025105175, + "descriptor": "I", + "field": "maxY0", + "name": "x", + "owner": "ag" + }, + { + "access": 0, + "decoder": 1232579503, + "descriptor": "I", + "field": "id0", + "name": "m", + "owner": "ag" + }, + { + "access": 0, + "decoder": 1238532539, + "descriptor": "I", + "field": "minX0", + "name": "g", + "owner": "ag" + }, + { + "access": 0, + "decoder": 196514055, + "descriptor": "I", + "field": "zoom0", + "name": "o", + "owner": "ag" + }, + { + "access": 0, + "decoder": 225384859, + "descriptor": "I", + "field": "maxX0", + "name": "l", + "owner": "ag" + }, + { + "access": 0, + "decoder": 963380367, + "descriptor": "I", + "field": "minY0", + "name": "e", + "owner": "ag" + }, + { + "access": 0, + "decoder": 986239133, + "descriptor": "I", + "field": "__w", + "name": "w", + "owner": "ag" + }, + { + "access": 0, + "descriptor": "Lhu;", + "field": "origin0", + "name": "u", + "owner": "ag" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "archiveName0", + "name": "f", + "owner": "ag" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "name0", + "name": "q", + "owner": "ag" + }, + { + "access": 0, + "descriptor": "Ljava/util/LinkedList;", + "field": "sections", + "name": "k", + "owner": "ag" + }, + { + "access": 0, + "descriptor": "Z", + "field": "isMain0", + "name": "d", + "owner": "ag" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(B)V", + "method": "setBounds", + "name": "g", + "owner": "ag", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)I", + "method": "__a_39", + "name": "a", + "owner": "ag", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(Lgr;S)Lab;", + "method": "readWorldMapSection", + "name": "f", + "owner": "ag" + }, + { + "access": 1, + "descriptor": "(B)I", + "method": "maxX", + "name": "s", + "owner": "ag", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(B)I", + "method": "minX", + "name": "j", + "owner": "ag", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(B)I", + "method": "originX", + "name": "h", + "owner": "ag", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(B)Ljava/lang/String;", + "method": "archiveName", + "name": "x", + "owner": "ag", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(B)Ljava/lang/String;", + "method": "name", + "name": "d", + "owner": "ag", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(B)Z", + "method": "isMain", + "name": "e", + "owner": "ag", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "id", + "name": "l", + "owner": "ag", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "maxY", + "name": "y", + "owner": "ag", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "minY", + "name": "t", + "owner": "ag", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "originPlane", + "name": "b", + "owner": "ag", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "originY", + "name": "c", + "owner": "ag", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "zoom", + "name": "z", + "owner": "ag", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)Lhu;", + "method": "origin", + "name": "p", + "owner": "ag", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(III)Lhu;", + "method": "coord", + "name": "u", + "owner": "ag", + "parameters": [ + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(III)Z", + "method": "containsPosition", + "name": "w", + "owner": "ag", + "parameters": [ + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(IIII)Z", + "method": "containsCoord", + "name": "q", + "owner": "ag", + "parameters": [ + "plane", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(IIII)[I", + "method": "position", + "name": "o", + "owner": "ag", + "parameters": [ + "plane", + "x", + "y" + ] + }, + { + "access": 1, + "descriptor": "(Lgr;II)V", + "method": "read", + "name": "m", + "owner": "ag" + } + ], + "name": "ag", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "WorldMapAreaData", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Ljava/util/HashSet;", + "field": "__i", + "name": "i", + "owner": "ae" + }, + { + "access": 0, + "descriptor": "Ljava/util/HashSet;", + "field": "__n", + "name": "n", + "owner": "ae" + }, + { + "access": 0, + "descriptor": "Ljava/util/List;", + "field": "__a", + "name": "a", + "owner": "ae" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(Lgr;Lgr;IZI)V", + "method": "__ce_76", + "name": "ce", + "owner": "ae", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3" + ] + }, + { + "access": 0, + "descriptor": "(Lgr;ZB)V", + "method": "__cy_77", + "name": "cy", + "owner": "ae", + "parameters": [ + "arg0", + "arg1" + ] + } + ], + "name": "ae", + "super": "ag" + }, + { + "access": 33, + "class": "WorldMapCacheName", + "constructors": [ + { + "access": 0, + "descriptor": "(Ljava/lang/String;)V" + } + ], + "fields": [ + { + "access": 17, + "descriptor": "Ljava/lang/String;", + "field": "name", + "name": "u", + "owner": "aw" + } + ], + "interfaces": [], + "methods": [], + "name": "aw", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "WorldMapElement", + "constructors": [ + { + "access": 1, + "descriptor": "(I)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1007121521, + "descriptor": "I", + "field": "__j", + "name": "j", + "owner": "ic" + }, + { + "access": 0, + "decoder": -1209054101, + "descriptor": "I", + "field": "__s", + "name": "s", + "owner": "ic" + }, + { + "access": 0, + "decoder": -1825795359, + "descriptor": "I", + "field": "__z", + "name": "z", + "owner": "ic" + }, + { + "access": 0, + "decoder": -322924875, + "descriptor": "I", + "field": "sprite2", + "name": "g", + "owner": "ic" + }, + { + "access": 0, + "decoder": 1336803515, + "descriptor": "I", + "field": "__a", + "name": "a", + "owner": "ic" + }, + { + "access": 0, + "descriptor": "[B", + "field": "__b", + "name": "b", + "owner": "ic" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__h", + "name": "h", + "owner": "ic" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__i", + "name": "i", + "owner": "ic" + }, + { + "access": 1, + "decoder": -231067, + "descriptor": "I", + "field": "__e", + "name": "e", + "owner": "ic" + }, + { + "access": 1, + "decoder": -653112729, + "descriptor": "I", + "field": "category", + "name": "c", + "owner": "ic" + }, + { + "access": 1, + "decoder": 1184517129, + "descriptor": "I", + "field": "textSize", + "name": "x", + "owner": "ic" + }, + { + "access": 1, + "decoder": 2012857993, + "descriptor": "I", + "field": "sprite1", + "name": "u", + "owner": "ic" + }, + { + "access": 1, + "descriptor": "Ljava/lang/String;", + "field": "__l", + "name": "l", + "owner": "ic" + }, + { + "access": 1, + "descriptor": "Ljava/lang/String;", + "field": "string1", + "name": "n", + "owner": "ic" + }, + { + "access": 1, + "descriptor": "[Ljava/lang/String;", + "field": "strings", + "name": "k", + "owner": "ic" + }, + { + "access": 17, + "decoder": -1579051565, + "descriptor": "I", + "field": "__o", + "name": "o", + "owner": "ic" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(IB)Lln;", + "method": "getSprite0", + "name": "u", + "owner": "ic", + "parameters": [ + "id" + ] + }, + { + "access": 0, + "descriptor": "(Lgr;II)V", + "method": "decode0", + "name": "q", + "owner": "ic", + "parameters": [ + "buffer", + "opcode" + ] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__g_410", + "name": "g", + "owner": "ic", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "__w_409", + "name": "w", + "owner": "ic", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(Lgr;B)V", + "method": "decode", + "name": "f", + "owner": "ic", + "parameters": [ + "buffer" + ] + }, + { + "access": 1, + "descriptor": "(ZI)Lln;", + "method": "getSprite", + "name": "o", + "owner": "ic", + "parameters": [ + "b" + ] + } + ], + "name": "ic", + "super": "fn" + }, + { + "access": 33, + "class": "WorldMapEvent", + "constructors": [ + { + "access": 1, + "descriptor": "(ILhu;Lhu;)V" + } + ], + "fields": [ + { + "access": 1, + "decoder": 264384233, + "descriptor": "I", + "field": "mapElement", + "name": "m", + "owner": "ap" + }, + { + "access": 1, + "descriptor": "Lhu;", + "field": "coord1", + "name": "f", + "owner": "ap" + }, + { + "access": 1, + "descriptor": "Lhu;", + "field": "coord2", + "name": "q", + "owner": "ap" + } + ], + "interfaces": [], + "methods": [], + "name": "ap", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "WorldMapIcon1", + "constructors": [ + { + "access": 0, + "descriptor": "(Lhu;Lhu;ILaj;)V" + } + ], + "fields": [ + { + "access": 16, + "decoder": -1722323621, + "descriptor": "I", + "field": "__m", + "name": "m", + "owner": "t" + }, + { + "access": 16, + "decoder": -362031241, + "descriptor": "I", + "field": "__w", + "name": "w", + "owner": "t" + }, + { + "access": 16, + "decoder": 364253793, + "descriptor": "I", + "field": "__q", + "name": "q", + "owner": "t" + }, + { + "access": 16, + "descriptor": "Laj;", + "field": "label0", + "name": "f", + "owner": "t" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(B)I", + "method": "__q_17", + "name": "q", + "owner": "t", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)I", + "method": "__w_18", + "name": "w", + "owner": "t", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)Laj;", + "method": "__f_16", + "name": "f", + "owner": "t", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__m_15", + "name": "m", + "owner": "t", + "parameters": [] + } + ], + "name": "t", + "super": "ak" + }, + { + "access": 33, + "class": "WorldMapIcon2", + "constructors": [ + { + "access": 0, + "descriptor": "(Lhu;Lhu;ILav;)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1431936619, + "descriptor": "I", + "field": "__u", + "name": "u", + "owner": "r" + }, + { + "access": 0, + "decoder": -25914375, + "descriptor": "I", + "field": "__q", + "name": "q", + "owner": "r" + }, + { + "access": 0, + "decoder": 927871683, + "descriptor": "I", + "field": "__o", + "name": "o", + "owner": "r" + }, + { + "access": 0, + "descriptor": "Laj;", + "field": "label0", + "name": "w", + "owner": "r" + }, + { + "access": 16, + "decoder": -985436813, + "descriptor": "I", + "field": "__m", + "name": "m", + "owner": "r" + }, + { + "access": 16, + "descriptor": "Lav;", + "field": "__f", + "name": "f", + "owner": "r" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(B)I", + "method": "__q_30", + "name": "q", + "owner": "r", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)I", + "method": "__w_31", + "name": "w", + "owner": "r", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)Laj;", + "method": "__f_29", + "name": "f", + "owner": "r", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "__z_27", + "name": "z", + "owner": "r", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "__m_28", + "name": "m", + "owner": "r", + "parameters": [] + } + ], + "name": "r", + "super": "ak" + }, + { + "access": 33, + "class": "WorldMapLabel", + "constructors": [ + { + "access": 0, + "descriptor": "(Ljava/lang/String;IILs;)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -471061617, + "descriptor": "I", + "field": "width", + "name": "f", + "owner": "aj" + }, + { + "access": 0, + "decoder": -85027761, + "descriptor": "I", + "field": "height", + "name": "q", + "owner": "aj" + }, + { + "access": 0, + "descriptor": "Ljava/lang/String;", + "field": "text", + "name": "m", + "owner": "aj" + }, + { + "access": 0, + "descriptor": "Ls;", + "field": "size", + "name": "w", + "owner": "aj" + } + ], + "interfaces": [], + "methods": [], + "name": "aj", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "WorldMapLabelSize", + "constructors": [ + { + "access": 0, + "descriptor": "(III)V" + } + ], + "fields": [ + { + "access": 16, + "decoder": -422937451, + "descriptor": "I", + "field": "__u", + "name": "u", + "owner": "s" + }, + { + "access": 16, + "decoder": 1252293513, + "descriptor": "I", + "field": "__w", + "name": "w", + "owner": "s" + }, + { + "access": 16, + "decoder": 707828941, + "descriptor": "I", + "field": "__o", + "name": "o", + "owner": "s" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(FI)Z", + "method": "__f_14", + "name": "f", + "owner": "s", + "parameters": [ + "arg0" + ] + } + ], + "name": "s", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "WorldMapRegion", + "constructors": [ + { + "access": 0, + "descriptor": "(IIILjava/util/HashMap;)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1061363609, + "descriptor": "I", + "field": "x", + "name": "u", + "owner": "av" + }, + { + "access": 0, + "decoder": -120515153, + "descriptor": "I", + "field": "__x", + "name": "x", + "owner": "av" + }, + { + "access": 0, + "decoder": 2099407363, + "descriptor": "I", + "field": "y", + "name": "g", + "owner": "av" + }, + { + "access": 0, + "decoder": 415972873, + "descriptor": "I", + "field": "__d", + "name": "d", + "owner": "av" + }, + { + "access": 0, + "descriptor": "Ljava/util/HashMap;", + "field": "iconsMap", + "name": "n", + "owner": "av" + }, + { + "access": 0, + "descriptor": "Ljava/util/LinkedList;", + "field": "__e", + "name": "e", + "owner": "av" + }, + { + "access": 0, + "descriptor": "Ljava/util/List;", + "field": "iconsList", + "name": "k", + "owner": "av" + }, + { + "access": 16, + "descriptor": "Ljava/util/HashMap;", + "field": "fonts", + "name": "i", + "owner": "av" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(B)V", + "method": "__e_42", + "name": "e", + "owner": "av", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)Ljava/util/List;", + "method": "icons", + "name": "at", + "owner": "av", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "__d_44", + "name": "d", + "owner": "av", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(II)Laj;", + "method": "__al_55", + "name": "al", + "owner": "av", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "(IIIB)V", + "method": "__w_40", + "name": "w", + "owner": "av", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 0, + "descriptor": "(IIIII)V", + "method": "__ad_58", + "name": "ad", + "owner": "av", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3" + ] + }, + { + "access": 0, + "descriptor": "(IIIIII)Ljava/util/List;", + "method": "__ae_57", + "name": "ae", + "owner": "av", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4" + ] + }, + { + "access": 0, + "descriptor": "(IIILjava/util/HashSet;I)V", + "method": "__j_46", + "name": "j", + "owner": "av", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3" + ] + }, + { + "access": 0, + "descriptor": "(IILjava/util/HashSet;IB)V", + "method": "__ah_54", + "name": "ah", + "owner": "av", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3" + ] + }, + { + "access": 0, + "descriptor": "(IILjava/util/HashSet;IB)V", + "method": "__aq_48", + "name": "aq", + "owner": "av", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3" + ] + }, + { + "access": 0, + "descriptor": "(Lak;IIFI)V", + "method": "__ar_51", + "name": "ar", + "owner": "av", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3" + ] + }, + { + "access": 0, + "descriptor": "(Lak;Lic;IIFI)V", + "method": "__ay_53", + "name": "ay", + "owner": "av", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4" + ] + }, + { + "access": 0, + "descriptor": "(Lic;B)Laj;", + "method": "__ab_56", + "name": "ab", + "owner": "av", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "(Lic;III)V", + "method": "__ac_52", + "name": "ac", + "owner": "av", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 0, + "descriptor": "(Lic;IIIIB)V", + "method": "__av_50", + "name": "av", + "owner": "av", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4" + ] + }, + { + "access": 0, + "descriptor": "(Lir;B)Z", + "method": "__a_45", + "name": "a", + "owner": "av", + "parameters": [ + "arg0" + ] + }, + { + "access": 0, + "descriptor": "(Ljava/util/HashSet;IIB)V", + "method": "__s_47", + "name": "s", + "owner": "av", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 0, + "descriptor": "(Ljava/util/HashSet;III)V", + "method": "__aj_49", + "name": "aj", + "owner": "av", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 0, + "descriptor": "(Ljava/util/HashSet;Ljava/util/List;B)V", + "method": "__u_41", + "name": "u", + "owner": "av", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 0, + "descriptor": "(Ljava/util/List;I)V", + "method": "__x_43", + "name": "x", + "owner": "av", + "parameters": [ + "arg0" + ] + } + ], + "name": "av", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "WorldMapSection0", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1022177315, + "descriptor": "I", + "field": "__e", + "name": "e", + "owner": "y" + }, + { + "access": 0, + "decoder": -1388959491, + "descriptor": "I", + "field": "__k", + "name": "k", + "owner": "y" + }, + { + "access": 0, + "decoder": -1397517463, + "descriptor": "I", + "field": "__x", + "name": "x", + "owner": "y" + }, + { + "access": 0, + "decoder": -150870205, + "descriptor": "I", + "field": "__g", + "name": "g", + "owner": "y" + }, + { + "access": 0, + "decoder": -1657956317, + "descriptor": "I", + "field": "__n", + "name": "n", + "owner": "y" + }, + { + "access": 0, + "decoder": -2011838881, + "descriptor": "I", + "field": "__m", + "name": "m", + "owner": "y" + }, + { + "access": 0, + "decoder": -477370575, + "descriptor": "I", + "field": "__w", + "name": "w", + "owner": "y" + }, + { + "access": 0, + "decoder": -671345527, + "descriptor": "I", + "field": "__o", + "name": "o", + "owner": "y" + }, + { + "access": 0, + "decoder": -799353317, + "descriptor": "I", + "field": "__d", + "name": "d", + "owner": "y" + }, + { + "access": 0, + "decoder": 1009718107, + "descriptor": "I", + "field": "__l", + "name": "l", + "owner": "y" + }, + { + "access": 0, + "decoder": 1299225715, + "descriptor": "I", + "field": "__f", + "name": "f", + "owner": "y" + }, + { + "access": 0, + "decoder": 1345061881, + "descriptor": "I", + "field": "__i", + "name": "i", + "owner": "y" + }, + { + "access": 0, + "decoder": 529427495, + "descriptor": "I", + "field": "__u", + "name": "u", + "owner": "y" + }, + { + "access": 0, + "decoder": 82600709, + "descriptor": "I", + "field": "__q", + "name": "q", + "owner": "y" + } + ], + "interfaces": [ + "ab" + ], + "methods": [ + { + "access": 0, + "descriptor": "(I)V", + "method": "__g_25", + "name": "g", + "owner": "y", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(IIB)Z", + "method": "__q_21", + "name": "q", + "owner": "y", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(III)Lhu;", + "method": "__o_23", + "name": "o", + "owner": "y", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(IIIB)Z", + "method": "__f_20", + "name": "f", + "owner": "y", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "(IIII)[I", + "method": "__w_22", + "name": "w", + "owner": "y", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "(Lag;I)V", + "method": "__m_19", + "name": "m", + "owner": "y", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(Lgr;B)V", + "method": "__u_24", + "name": "u", + "owner": "y", + "parameters": [ + "arg0" + ] + } + ], + "name": "y", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "WorldMapSection1", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1383826035, + "descriptor": "I", + "field": "__u", + "name": "u", + "owner": "as" + }, + { + "access": 0, + "decoder": -1513010233, + "descriptor": "I", + "field": "__o", + "name": "o", + "owner": "as" + }, + { + "access": 0, + "decoder": -1797724181, + "descriptor": "I", + "field": "__e", + "name": "e", + "owner": "as" + }, + { + "access": 0, + "decoder": -1875803617, + "descriptor": "I", + "field": "__q", + "name": "q", + "owner": "as" + }, + { + "access": 0, + "decoder": -1971304641, + "descriptor": "I", + "field": "__m", + "name": "m", + "owner": "as" + }, + { + "access": 0, + "decoder": -890169045, + "descriptor": "I", + "field": "__l", + "name": "l", + "owner": "as" + }, + { + "access": 0, + "decoder": 1483447179, + "descriptor": "I", + "field": "__f", + "name": "f", + "owner": "as" + }, + { + "access": 0, + "decoder": 1526007343, + "descriptor": "I", + "field": "__g", + "name": "g", + "owner": "as" + }, + { + "access": 0, + "decoder": 284566685, + "descriptor": "I", + "field": "__w", + "name": "w", + "owner": "as" + }, + { + "access": 0, + "decoder": 325777555, + "descriptor": "I", + "field": "__x", + "name": "x", + "owner": "as" + } + ], + "interfaces": [ + "ab" + ], + "methods": [ + { + "access": 0, + "descriptor": "(I)V", + "method": "__g_84", + "name": "g", + "owner": "as", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(IIB)Z", + "method": "__q_80", + "name": "q", + "owner": "as", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(III)Lhu;", + "method": "__o_82", + "name": "o", + "owner": "as", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(IIIB)Z", + "method": "__f_79", + "name": "f", + "owner": "as", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "(IIII)[I", + "method": "__w_81", + "name": "w", + "owner": "as", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "(Lag;I)V", + "method": "__m_78", + "name": "m", + "owner": "as", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(Lgr;B)V", + "method": "__u_83", + "name": "u", + "owner": "as", + "parameters": [ + "arg0" + ] + } + ], + "name": "as", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "WorldMapSection2", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1024859679, + "descriptor": "I", + "field": "__q", + "name": "q", + "owner": "ah" + }, + { + "access": 0, + "decoder": -1272330125, + "descriptor": "I", + "field": "__u", + "name": "u", + "owner": "ah" + }, + { + "access": 0, + "decoder": -1561552223, + "descriptor": "I", + "field": "__m", + "name": "m", + "owner": "ah" + }, + { + "access": 0, + "decoder": -245382089, + "descriptor": "I", + "field": "__f", + "name": "f", + "owner": "ah" + }, + { + "access": 0, + "decoder": 40495485, + "descriptor": "I", + "field": "__w", + "name": "w", + "owner": "ah" + }, + { + "access": 0, + "decoder": 982234927, + "descriptor": "I", + "field": "__o", + "name": "o", + "owner": "ah" + } + ], + "interfaces": [ + "ab" + ], + "methods": [ + { + "access": 0, + "descriptor": "(I)V", + "method": "__g_65", + "name": "g", + "owner": "ah", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(IIB)Z", + "method": "__q_61", + "name": "q", + "owner": "ah", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(III)Lhu;", + "method": "__o_63", + "name": "o", + "owner": "ah", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(IIIB)Z", + "method": "__f_60", + "name": "f", + "owner": "ah", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "(IIII)[I", + "method": "__w_62", + "name": "w", + "owner": "ah", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "(Lag;I)V", + "method": "__m_59", + "name": "m", + "owner": "ah", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(Lgr;B)V", + "method": "__u_64", + "name": "u", + "owner": "ah", + "parameters": [ + "arg0" + ] + } + ], + "name": "ah", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "WorldMapSection3", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1068088609, + "descriptor": "I", + "field": "__w", + "name": "w", + "owner": "p" + }, + { + "access": 0, + "decoder": -1351623663, + "descriptor": "I", + "field": "__u", + "name": "u", + "owner": "p" + }, + { + "access": 0, + "decoder": -1622972483, + "descriptor": "I", + "field": "__f", + "name": "f", + "owner": "p" + }, + { + "access": 0, + "decoder": -627081155, + "descriptor": "I", + "field": "__x", + "name": "x", + "owner": "p" + }, + { + "access": 0, + "decoder": 1016557381, + "descriptor": "I", + "field": "__g", + "name": "g", + "owner": "p" + }, + { + "access": 0, + "decoder": 1257151629, + "descriptor": "I", + "field": "__o", + "name": "o", + "owner": "p" + }, + { + "access": 0, + "decoder": 1389733201, + "descriptor": "I", + "field": "__m", + "name": "m", + "owner": "p" + }, + { + "access": 0, + "decoder": 395786901, + "descriptor": "I", + "field": "__e", + "name": "e", + "owner": "p" + }, + { + "access": 0, + "decoder": 702057599, + "descriptor": "I", + "field": "__q", + "name": "q", + "owner": "p" + }, + { + "access": 0, + "decoder": 884736611, + "descriptor": "I", + "field": "__l", + "name": "l", + "owner": "p" + } + ], + "interfaces": [ + "ab" + ], + "methods": [ + { + "access": 0, + "descriptor": "(B)V", + "method": "__g_38", + "name": "g", + "owner": "p", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(IIB)Z", + "method": "__q_34", + "name": "q", + "owner": "p", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(III)Lhu;", + "method": "__o_36", + "name": "o", + "owner": "p", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(IIIB)Z", + "method": "__f_33", + "name": "f", + "owner": "p", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "(IIII)[I", + "method": "__w_35", + "name": "w", + "owner": "p", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "(Lag;I)V", + "method": "__m_32", + "name": "m", + "owner": "p", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(Lgr;B)V", + "method": "__u_37", + "name": "u", + "owner": "p", + "parameters": [ + "arg0" + ] + } + ], + "name": "p", + "super": "java.lang.Object" + }, + { + "access": 33, + "class": "WorldMapSectionType", + "constructors": [ + { + "access": 0, + "descriptor": "(IB)V" + } + ], + "fields": [ + { + "access": 16, + "decoder": 738759853, + "descriptor": "I", + "field": "type", + "name": "o", + "owner": "h" + }, + { + "access": 16, + "descriptor": "B", + "field": "id", + "name": "u", + "owner": "h" + } + ], + "interfaces": [ + "gc" + ], + "methods": [ + { + "access": 1, + "descriptor": "(B)I", + "method": "__f_26", + "name": "f", + "owner": "h", + "parameters": [] + } + ], + "name": "h", + "super": "java.lang.Object" + }, + { + "access": 48, + "class": "TotalQuantityComparator", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [], + "interfaces": [ + "java.util.Comparator" + ], + "methods": [ + { + "access": 0, + "descriptor": "(Ll;Ll;I)I", + "method": "__m_5", + "name": "m", + "owner": "e", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;)Z", + "method": "__equals_7", + "name": "equals", + "owner": "e", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", + "method": "__compare_6", + "name": "compare", + "owner": "e", + "parameters": [ + "arg0", + "arg1" + ] + } + ], + "name": "e", + "super": "java.lang.Object" + }, + { + "access": 48, + "class": "UnitPriceComparator", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [], + "interfaces": [ + "java.util.Comparator" + ], + "methods": [ + { + "access": 0, + "descriptor": "(Ll;Ll;I)I", + "method": "__m_11", + "name": "m", + "owner": "d", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;)Z", + "method": "__equals_13", + "name": "equals", + "owner": "d", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", + "method": "__compare_12", + "name": "compare", + "owner": "d", + "parameters": [ + "arg0", + "arg1" + ] + } + ], + "name": "d", + "super": "java.lang.Object" + }, + { + "access": 48, + "class": "WorldComparator", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [], + "interfaces": [ + "java.util.Comparator" + ], + "methods": [ + { + "access": 0, + "descriptor": "(Ll;Ll;I)I", + "method": "__m_0", + "name": "m", + "owner": "u", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;)Z", + "method": "__equals_2", + "name": "equals", + "owner": "u", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", + "method": "__compare_1", + "name": "compare", + "owner": "u", + "parameters": [ + "arg0", + "arg1" + ] + } + ], + "name": "u", + "super": "java.lang.Object" + }, + { + "access": 49, + "class": "AccessFile", + "constructors": [ + { + "access": 1, + "descriptor": "(Ljava/io/File;Ljava/lang/String;J)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -5849841282281477000, + "descriptor": "J", + "field": "capacity", + "name": "f", + "owner": "dk" + }, + { + "access": 0, + "decoder": 7465414039279036000, + "descriptor": "J", + "field": "index", + "name": "q", + "owner": "dk" + }, + { + "access": 0, + "descriptor": "Ljava/io/RandomAccessFile;", + "field": "file", + "name": "m", + "owner": "dk" + } + ], + "interfaces": [], + "methods": [ + { + "access": 16, + "descriptor": "(J)V", + "method": "seek", + "name": "m", + "owner": "dk", + "parameters": [ + "index" + ] + }, + { + "access": 17, + "descriptor": "(I)J", + "method": "length", + "name": "o", + "owner": "dk", + "parameters": [] + }, + { + "access": 17, + "descriptor": "(I)V", + "method": "close", + "name": "q", + "owner": "dk", + "parameters": [] + }, + { + "access": 17, + "descriptor": "(ZI)V", + "method": "closeSync", + "name": "w", + "owner": "dk", + "parameters": [ + "sync" + ] + }, + { + "access": 17, + "descriptor": "([BIIB)V", + "method": "write", + "name": "f", + "owner": "dk", + "parameters": [ + "length", + "src", + "srcIndex" + ] + }, + { + "access": 17, + "descriptor": "([BIII)I", + "method": "read", + "name": "u", + "owner": "dk", + "parameters": [ + "dst", + "dstIndex", + "length" + ] + }, + { + "access": 4, + "descriptor": "()V", + "method": "__finalize_211", + "name": "finalize", + "owner": "dk", + "parameters": [] + } + ], + "name": "dk", + "super": "java.lang.Object" + }, + { + "access": 49, + "class": "ArchiveDisk", + "constructors": [ + { + "access": 1, + "descriptor": "(ILdy;Ldy;I)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1982523283, + "descriptor": "I", + "field": "archive", + "name": "w", + "owner": "ff" + }, + { + "access": 0, + "decoder": -748616567, + "descriptor": "I", + "field": "maxEntrySize", + "name": "o", + "owner": "ff" + }, + { + "access": 0, + "descriptor": "Ldy;", + "field": "datFile", + "name": "f", + "owner": "ff" + }, + { + "access": 0, + "descriptor": "Ldy;", + "field": "idxFile", + "name": "q", + "owner": "ff" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I[BIZI)Z", + "method": "write0", + "name": "q", + "owner": "ff" + }, + { + "access": 1, + "descriptor": "(II)[B", + "method": "read", + "name": "m", + "owner": "ff", + "parameters": [ + "entry" + ] + }, + { + "access": 1, + "descriptor": "(I[BII)Z", + "method": "write", + "name": "f", + "owner": "ff" + } + ], + "name": "ff", + "super": "java.lang.Object" + }, + { + "access": 49, + "class": "BoundaryObject", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -260081891, + "descriptor": "I", + "field": "y", + "name": "q", + "owner": "ej" + }, + { + "access": 0, + "decoder": -693868549, + "descriptor": "I", + "field": "flags", + "name": "e", + "owner": "ej" + }, + { + "access": 0, + "decoder": -9307913, + "descriptor": "I", + "field": "tileHeight", + "name": "m", + "owner": "ej" + }, + { + "access": 0, + "decoder": -969316473, + "descriptor": "I", + "field": "orientationB", + "name": "o", + "owner": "ej" + }, + { + "access": 0, + "decoder": 1724480965, + "descriptor": "I", + "field": "orientationA", + "name": "w", + "owner": "ej" + }, + { + "access": 0, + "decoder": 860688417, + "descriptor": "I", + "field": "x", + "name": "f", + "owner": "ej" + }, + { + "access": 1, + "decoder": -4401157754236673500, + "descriptor": "J", + "field": "tag", + "name": "l", + "owner": "ej" + }, + { + "access": 1, + "descriptor": "Lex;", + "field": "entity1", + "name": "u", + "owner": "ej" + }, + { + "access": 1, + "descriptor": "Lex;", + "field": "entity2", + "name": "g", + "owner": "ej" + } + ], + "interfaces": [], + "methods": [], + "name": "ej", + "super": "java.lang.Object" + }, + { + "access": 49, + "class": "Bzip2Decompressor", + "constructors": [], + "fields": [], + "interfaces": [], + "methods": [], + "name": "gk", + "super": "java.lang.Object" + }, + { + "access": 49, + "class": "Bzip2State", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1510817847, + "descriptor": "I", + "field": "__l", + "name": "l", + "owner": "gt" + }, + { + "access": 0, + "decoder": -1793367959, + "descriptor": "I", + "field": "__z", + "name": "z", + "owner": "gt" + }, + { + "access": 0, + "decoder": -1981923611, + "descriptor": "I", + "field": "__h", + "name": "h", + "owner": "gt" + }, + { + "access": 0, + "decoder": -1987934943, + "descriptor": "I", + "field": "__j", + "name": "j", + "owner": "gt" + }, + { + "access": 0, + "decoder": -1994129645, + "descriptor": "I", + "field": "__a", + "name": "a", + "owner": "gt" + }, + { + "access": 0, + "decoder": -473971741, + "descriptor": "I", + "field": "__e", + "name": "e", + "owner": "gt" + }, + { + "access": 0, + "decoder": -557334365, + "descriptor": "I", + "field": "__c", + "name": "c", + "owner": "gt" + }, + { + "access": 0, + "decoder": -861462251, + "descriptor": "I", + "field": "__d", + "name": "d", + "owner": "gt" + }, + { + "access": 0, + "decoder": -886333045, + "descriptor": "I", + "field": "__v", + "name": "v", + "owner": "gt" + }, + { + "access": 0, + "decoder": -953353963, + "descriptor": "I", + "field": "__y", + "name": "y", + "owner": "gt" + }, + { + "access": 0, + "decoder": 1502359789, + "descriptor": "I", + "field": "__t", + "name": "t", + "owner": "gt" + }, + { + "access": 0, + "decoder": 1860254567, + "descriptor": "I", + "field": "__n", + "name": "n", + "owner": "gt" + }, + { + "access": 0, + "decoder": 444639767, + "descriptor": "I", + "field": "__ae", + "name": "ae", + "owner": "gt" + }, + { + "access": 0, + "decoder": 594179173, + "descriptor": "I", + "field": "__k", + "name": "k", + "owner": "gt" + }, + { + "access": 0, + "descriptor": "B", + "field": "__i", + "name": "i", + "owner": "gt" + }, + { + "access": 0, + "descriptor": "I", + "field": "__s", + "name": "s", + "owner": "gt" + }, + { + "access": 0, + "descriptor": "[B", + "field": "__ac", + "name": "ac", + "owner": "gt" + }, + { + "access": 0, + "descriptor": "[B", + "field": "__aj", + "name": "aj", + "owner": "gt" + }, + { + "access": 0, + "descriptor": "[B", + "field": "__av", + "name": "av", + "owner": "gt" + }, + { + "access": 0, + "descriptor": "[B", + "field": "__ay", + "name": "ay", + "owner": "gt" + }, + { + "access": 0, + "descriptor": "[B", + "field": "__g", + "name": "g", + "owner": "gt" + }, + { + "access": 0, + "descriptor": "[B", + "field": "__x", + "name": "x", + "owner": "gt" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__ab", + "name": "ab", + "owner": "gt" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__ar", + "name": "ar", + "owner": "gt" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__b", + "name": "b", + "owner": "gt" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__r", + "name": "r", + "owner": "gt" + }, + { + "access": 0, + "descriptor": "[Z", + "field": "__ag", + "name": "ag", + "owner": "gt" + }, + { + "access": 0, + "descriptor": "[Z", + "field": "__aq", + "name": "aq", + "owner": "gt" + }, + { + "access": 0, + "descriptor": "[[B", + "field": "__ah", + "name": "ah", + "owner": "gt" + }, + { + "access": 0, + "descriptor": "[[I", + "field": "__ak", + "name": "ak", + "owner": "gt" + }, + { + "access": 0, + "descriptor": "[[I", + "field": "__al", + "name": "al", + "owner": "gt" + }, + { + "access": 0, + "descriptor": "[[I", + "field": "__aw", + "name": "aw", + "owner": "gt" + }, + { + "access": 16, + "descriptor": "I", + "field": "__f", + "name": "f", + "owner": "gt" + }, + { + "access": 16, + "descriptor": "I", + "field": "__m", + "name": "m", + "owner": "gt" + }, + { + "access": 16, + "descriptor": "I", + "field": "__o", + "name": "o", + "owner": "gt" + }, + { + "access": 16, + "descriptor": "I", + "field": "__q", + "name": "q", + "owner": "gt" + }, + { + "access": 16, + "descriptor": "I", + "field": "__u", + "name": "u", + "owner": "gt" + }, + { + "access": 16, + "descriptor": "I", + "field": "__w", + "name": "w", + "owner": "gt" + } + ], + "interfaces": [], + "methods": [], + "name": "gt", + "super": "java.lang.Object" + }, + { + "access": 49, + "class": "Canvas", + "constructors": [ + { + "access": 0, + "descriptor": "(Ljava/awt/Component;)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Ljava/awt/Component;", + "field": "component", + "name": "m", + "owner": "ao" + } + ], + "interfaces": [], + "methods": [ + { + "access": 17, + "descriptor": "(Ljava/awt/Graphics;)V", + "method": "paint", + "name": "paint", + "owner": "ao", + "parameters": [ + "g" + ] + }, + { + "access": 17, + "descriptor": "(Ljava/awt/Graphics;)V", + "method": "update", + "name": "update", + "owner": "ao", + "parameters": [ + "g" + ] + } + ], + "name": "ao", + "super": "java.awt.Canvas" + }, + { + "access": 49, + "class": "Client", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 12, + "decoder": 1789653893, + "descriptor": "I", + "field": "fps", + "name": "k", + "owner": "ba" + }, + { + "access": 12, + "descriptor": "Lfz;", + "field": "taskHandler", + "name": "m", + "owner": "ba" + }, + { + "access": 12, + "descriptor": "Ljava/lang/String;", + "field": "__ks_at", + "name": "at", + "owner": "ks" + }, + { + "access": 12, + "descriptor": "Z", + "field": "__hy_az", + "name": "az", + "owner": "hy" + }, + { + "access": 12, + "descriptor": "Z", + "field": "isStereo", + "name": "u", + "owner": "co" + }, + { + "access": 24, + "descriptor": "D", + "field": "__bv_r", + "name": "r", + "owner": "bv" + }, + { + "access": 24, + "descriptor": "Law;", + "field": "WorldMapCacheName_area", + "name": "w", + "owner": "aw" + }, + { + "access": 24, + "descriptor": "Lcj;", + "field": "AttackOption_alwaysRightClick", + "name": "f", + "owner": "cj" + }, + { + "access": 24, + "descriptor": "Lcj;", + "field": "AttackOption_dependsOnCombatLevels", + "name": "m", + "owner": "cj" + }, + { + "access": 24, + "descriptor": "Lcj;", + "field": "AttackOption_hidden", + "name": "w", + "owner": "cj" + }, + { + "access": 24, + "descriptor": "Lcj;", + "field": "AttackOption_leftClickWhereAvailable", + "name": "q", + "owner": "cj" + }, + { + "access": 24, + "descriptor": "Lgl;", + "field": "__gl_f", + "name": "f", + "owner": "gl" + }, + { + "access": 24, + "descriptor": "Lgl;", + "field": "__gl_o", + "name": "o", + "owner": "gl" + }, + { + "access": 24, + "descriptor": "Lgs;", + "field": "__gs_am", + "name": "am", + "owner": "gs" + }, + { + "access": 24, + "descriptor": "Lgs;", + "field": "__gs_ci", + "name": "ci", + "owner": "gs" + }, + { + "access": 24, + "descriptor": "Lh;", + "field": "__h_f", + "name": "f", + "owner": "h" + }, + { + "access": 24, + "descriptor": "Lh;", + "field": "__h_m", + "name": "m", + "owner": "h" + }, + { + "access": 24, + "descriptor": "Lh;", + "field": "__h_q", + "name": "q", + "owner": "h" + }, + { + "access": 24, + "descriptor": "Lh;", + "field": "__h_w", + "name": "w", + "owner": "h" + }, + { + "access": 24, + "descriptor": "Lij;", + "field": "PlayerType_hardcoreIronman", + "name": "u", + "owner": "ij" + }, + { + "access": 24, + "descriptor": "Lij;", + "field": "PlayerType_ironman", + "name": "w", + "owner": "ij" + }, + { + "access": 24, + "descriptor": "Lij;", + "field": "PlayerType_jagexModerator", + "name": "q", + "owner": "ij" + }, + { + "access": 24, + "descriptor": "Lij;", + "field": "PlayerType_normal", + "name": "m", + "owner": "ij" + }, + { + "access": 24, + "descriptor": "Lij;", + "field": "PlayerType_playerModerator", + "name": "f", + "owner": "ij" + }, + { + "access": 24, + "descriptor": "Lij;", + "field": "PlayerType_ultimateIronman", + "name": "o", + "owner": "ij" + }, + { + "access": 24, + "descriptor": "Lis;", + "field": "__is_f", + "name": "f", + "owner": "is" + }, + { + "access": 24, + "descriptor": "Lis;", + "field": "__is_m", + "name": "m", + "owner": "is" + }, + { + "access": 24, + "descriptor": "Lis;", + "field": "__is_o", + "name": "o", + "owner": "is" + }, + { + "access": 24, + "descriptor": "Lis;", + "field": "__is_q", + "name": "q", + "owner": "is" + }, + { + "access": 24, + "descriptor": "Lis;", + "field": "__is_w", + "name": "w", + "owner": "is" + }, + { + "access": 24, + "descriptor": "Ljava/math/BigInteger;", + "field": "__ce_o", + "name": "o", + "owner": "ce" + }, + { + "access": 24, + "descriptor": "Ljava/math/BigInteger;", + "field": "__ce_u", + "name": "u", + "owner": "ce" + }, + { + "access": 24, + "descriptor": "Ljava/math/BigInteger;", + "field": "__cm_f", + "name": "f", + "owner": "cm" + }, + { + "access": 24, + "descriptor": "Ljava/math/BigInteger;", + "field": "__cm_m", + "name": "m", + "owner": "cm" + }, + { + "access": 24, + "descriptor": "Ljava/util/Map;", + "field": "Messages_channels", + "name": "m", + "owner": "cw" + }, + { + "access": 24, + "descriptor": "Ljc;", + "field": "Messages_queue", + "name": "q", + "owner": "cw" + }, + { + "access": 24, + "descriptor": "Lji;", + "field": "__ji_a", + "name": "a", + "owner": "ji" + }, + { + "access": 24, + "descriptor": "Lji;", + "field": "__ji_d", + "name": "d", + "owner": "ji" + }, + { + "access": 24, + "descriptor": "Lji;", + "field": "__ji_e", + "name": "e", + "owner": "ji" + }, + { + "access": 24, + "descriptor": "Lji;", + "field": "__ji_f", + "name": "f", + "owner": "ji" + }, + { + "access": 24, + "descriptor": "Lji;", + "field": "__ji_g", + "name": "g", + "owner": "ji" + }, + { + "access": 24, + "descriptor": "Lji;", + "field": "__ji_j", + "name": "j", + "owner": "ji" + }, + { + "access": 24, + "descriptor": "Lji;", + "field": "__ji_k", + "name": "k", + "owner": "ji" + }, + { + "access": 24, + "descriptor": "Lji;", + "field": "__ji_l", + "name": "l", + "owner": "ji" + }, + { + "access": 24, + "descriptor": "Lji;", + "field": "__ji_m", + "name": "m", + "owner": "ji" + }, + { + "access": 24, + "descriptor": "Lji;", + "field": "__ji_o", + "name": "o", + "owner": "ji" + }, + { + "access": 24, + "descriptor": "Lji;", + "field": "__ji_q", + "name": "q", + "owner": "ji" + }, + { + "access": 24, + "descriptor": "Lji;", + "field": "__ji_s", + "name": "s", + "owner": "ji" + }, + { + "access": 24, + "descriptor": "Lji;", + "field": "__ji_t", + "name": "t", + "owner": "ji" + }, + { + "access": 24, + "descriptor": "Lji;", + "field": "__ji_u", + "name": "u", + "owner": "ji" + }, + { + "access": 24, + "descriptor": "Lji;", + "field": "__ji_w", + "name": "w", + "owner": "ji" + }, + { + "access": 24, + "descriptor": "Lji;", + "field": "__ji_x", + "name": "x", + "owner": "ji" + }, + { + "access": 24, + "descriptor": "Lji;", + "field": "__ji_z", + "name": "z", + "owner": "ji" + }, + { + "access": 24, + "descriptor": "Lka;", + "field": "DefaultsGroup_graphics", + "name": "m", + "owner": "ka" + }, + { + "access": 24, + "descriptor": "Lkx;", + "field": "fontNameVerdana11", + "name": "x", + "owner": "lz" + }, + { + "access": 24, + "descriptor": "Lkx;", + "field": "fontNameVerdana13", + "name": "d", + "owner": "lz" + }, + { + "access": 24, + "descriptor": "Lkx;", + "field": "fontNameVerdana15", + "name": "k", + "owner": "lz" + }, + { + "access": 24, + "descriptor": "Llh;", + "field": "Messages_hashTable", + "name": "f", + "owner": "cw" + }, + { + "access": 24, + "descriptor": "Llj;", + "field": "__lj_f", + "name": "f", + "owner": "lj" + }, + { + "access": 24, + "descriptor": "Llj;", + "field": "__lj_q", + "name": "q", + "owner": "lj" + }, + { + "access": 24, + "descriptor": "Llx;", + "field": "__lx_f", + "name": "f", + "owner": "lx" + }, + { + "access": 24, + "descriptor": "Llx;", + "field": "__lx_g", + "name": "g", + "owner": "lx" + }, + { + "access": 24, + "descriptor": "Llx;", + "field": "__lx_l", + "name": "l", + "owner": "lx" + }, + { + "access": 24, + "descriptor": "Llx;", + "field": "__lx_o", + "name": "o", + "owner": "lx" + }, + { + "access": 24, + "descriptor": "Llx;", + "field": "__lx_q", + "name": "q", + "owner": "lx" + }, + { + "access": 24, + "descriptor": "Llx;", + "field": "__lx_u", + "name": "u", + "owner": "lx" + }, + { + "access": 24, + "descriptor": "Llx;", + "field": "__lx_w", + "name": "w", + "owner": "lx" + }, + { + "access": 24, + "descriptor": "[B", + "field": "__hs_x", + "name": "x", + "owner": "hs" + }, + { + "access": 24, + "descriptor": "[C", + "field": "__kb_q", + "name": "q", + "owner": "kb" + }, + { + "access": 24, + "descriptor": "[C", + "field": "__kb_w", + "name": "w", + "owner": "kb" + }, + { + "access": 24, + "descriptor": "[F", + "field": "__ca_f", + "name": "f", + "owner": "ca" + }, + { + "access": 24, + "descriptor": "[I", + "field": "PacketBuffer_masks", + "name": "x", + "owner": "hx" + }, + { + "access": 24, + "descriptor": "[I", + "field": "__bq_b", + "name": "b", + "owner": "bq" + }, + { + "access": 24, + "descriptor": "[I", + "field": "__bq_c", + "name": "c", + "owner": "bq" + }, + { + "access": 24, + "descriptor": "[I", + "field": "__bq_h", + "name": "h", + "owner": "bq" + }, + { + "access": 24, + "descriptor": "[I", + "field": "__bq_r", + "name": "r", + "owner": "bq" + }, + { + "access": 24, + "descriptor": "[I", + "field": "__bq_t", + "name": "t", + "owner": "bq" + }, + { + "access": 24, + "descriptor": "[I", + "field": "__bq_y", + "name": "y", + "owner": "bq" + }, + { + "access": 24, + "descriptor": "[I", + "field": "__ca_m", + "name": "m", + "owner": "ca" + }, + { + "access": 24, + "descriptor": "[I", + "field": "__client_gd", + "name": "gd", + "owner": "client" + }, + { + "access": 24, + "descriptor": "[I", + "field": "__em_aa", + "name": "aa", + "owner": "em" + }, + { + "access": 24, + "descriptor": "[I", + "field": "__em_af", + "name": "af", + "owner": "em" + }, + { + "access": 24, + "descriptor": "[I", + "field": "__em_ai", + "name": "ai", + "owner": "em" + }, + { + "access": 24, + "descriptor": "[I", + "field": "__em_ao", + "name": "ao", + "owner": "em" + }, + { + "access": 24, + "descriptor": "[I", + "field": "__em_au", + "name": "au", + "owner": "em" + }, + { + "access": 24, + "descriptor": "[I", + "field": "__em_ax", + "name": "ax", + "owner": "em" + }, + { + "access": 24, + "descriptor": "[I", + "field": "__em_ba", + "name": "ba", + "owner": "em" + }, + { + "access": 24, + "descriptor": "[I", + "field": "__gx_d", + "name": "d", + "owner": "gx" + }, + { + "access": 24, + "descriptor": "[I", + "field": "__gx_x", + "name": "x", + "owner": "gx" + }, + { + "access": 24, + "descriptor": "[I", + "field": "__hi_d", + "name": "d", + "owner": "hi" + }, + { + "access": 24, + "descriptor": "[I", + "field": "playerMenuOpcodes", + "name": "kp", + "owner": "client" + }, + { + "access": 24, + "descriptor": "[Lgl;", + "field": "__gl_g", + "name": "g", + "owner": "gl" + }, + { + "access": 24, + "descriptor": "[Ljava/lang/String;", + "field": "__bv_z", + "name": "z", + "owner": "bv" + }, + { + "access": 24, + "descriptor": "[Ljava/lang/String;", + "field": "__hg_f", + "name": "f", + "owner": "hg" + }, + { + "access": 24, + "descriptor": "[[I", + "field": "__dv_b", + "name": "b", + "owner": "dv" + }, + { + "access": 24, + "descriptor": "[[I", + "field": "__dv_h", + "name": "h", + "owner": "dv" + }, + { + "access": 24, + "descriptor": "[[Ljava/lang/String;", + "field": "__hg_m", + "name": "m", + "owner": "hg" + }, + { + "access": 25, + "descriptor": "Law;", + "field": "WorldMapCacheName_compositeMap", + "name": "f", + "owner": "aw" + }, + { + "access": 25, + "descriptor": "Law;", + "field": "WorldMapCacheName_compositeTexture", + "name": "q", + "owner": "aw" + }, + { + "access": 25, + "descriptor": "Law;", + "field": "WorldMapCacheName_details", + "name": "m", + "owner": "aw" + }, + { + "access": 25, + "descriptor": "Law;", + "field": "WorldMapCacheName_labels", + "name": "o", + "owner": "aw" + }, + { + "access": 25, + "descriptor": "Lcl;", + "field": "packetWriter", + "name": "fj", + "owner": "client" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_a", + "name": "a", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_aa", + "name": "aa", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_ab", + "name": "ab", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_ac", + "name": "ac", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_ad", + "name": "ad", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_ae", + "name": "ae", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_af", + "name": "af", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_ag", + "name": "ag", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_ah", + "name": "ah", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_ai", + "name": "ai", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_aj", + "name": "aj", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_ak", + "name": "ak", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_al", + "name": "al", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_am", + "name": "am", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_an", + "name": "an", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_ao", + "name": "ao", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_ap", + "name": "ap", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_aq", + "name": "aq", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_ar", + "name": "ar", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_as", + "name": "as", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_at", + "name": "at", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_au", + "name": "au", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_av", + "name": "av", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_aw", + "name": "aw", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_ax", + "name": "ax", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_ay", + "name": "ay", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_az", + "name": "az", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_b", + "name": "b", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_ba", + "name": "ba", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_bb", + "name": "bb", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_bc", + "name": "bc", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_bd", + "name": "bd", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_be", + "name": "be", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_bf", + "name": "bf", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_bg", + "name": "bg", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_bh", + "name": "bh", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_bi", + "name": "bi", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_bj", + "name": "bj", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_bk", + "name": "bk", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_bl", + "name": "bl", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_bm", + "name": "bm", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_bn", + "name": "bn", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_bo", + "name": "bo", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_bp", + "name": "bp", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_bq", + "name": "bq", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_br", + "name": "br", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_bs", + "name": "bs", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_bt", + "name": "bt", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_bu", + "name": "bu", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_bv", + "name": "bv", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_bw", + "name": "bw", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_bx", + "name": "bx", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_by", + "name": "by", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_bz", + "name": "bz", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_c", + "name": "c", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_ce", + "name": "ce", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_cj", + "name": "cj", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_cm", + "name": "cm", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_cr", + "name": "cr", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_cs", + "name": "cs", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_cv", + "name": "cv", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_cy", + "name": "cy", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_d", + "name": "d", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_e", + "name": "e", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_f", + "name": "f", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_g", + "name": "g", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_h", + "name": "h", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_i", + "name": "i", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_j", + "name": "j", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_k", + "name": "k", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_l", + "name": "l", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_m", + "name": "m", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_n", + "name": "n", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_o", + "name": "o", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_p", + "name": "p", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_q", + "name": "q", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_r", + "name": "r", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_s", + "name": "s", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_t", + "name": "t", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_u", + "name": "u", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_v", + "name": "v", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_w", + "name": "w", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_x", + "name": "x", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_y", + "name": "y", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lge;", + "field": "__ge_z", + "name": "z", + "owner": "ge" + }, + { + "access": 25, + "descriptor": "Lgl;", + "field": "__gl_m", + "name": "m", + "owner": "gl" + }, + { + "access": 25, + "descriptor": "Lgl;", + "field": "__gl_q", + "name": "q", + "owner": "gl" + }, + { + "access": 25, + "descriptor": "Lgl;", + "field": "__gl_w", + "name": "w", + "owner": "gl" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_a", + "name": "a", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_aa", + "name": "aa", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_ab", + "name": "ab", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_ac", + "name": "ac", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_ad", + "name": "ad", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_ae", + "name": "ae", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_af", + "name": "af", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_ag", + "name": "ag", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_ah", + "name": "ah", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_ai", + "name": "ai", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_aj", + "name": "aj", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_ak", + "name": "ak", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_al", + "name": "al", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_an", + "name": "an", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_ao", + "name": "ao", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_ap", + "name": "ap", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_aq", + "name": "aq", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_ar", + "name": "ar", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_as", + "name": "as", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_at", + "name": "at", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_au", + "name": "au", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_av", + "name": "av", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_aw", + "name": "aw", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_ax", + "name": "ax", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_ay", + "name": "ay", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_az", + "name": "az", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_b", + "name": "b", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_ba", + "name": "ba", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_bb", + "name": "bb", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_bc", + "name": "bc", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_bd", + "name": "bd", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_be", + "name": "be", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_bf", + "name": "bf", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_bg", + "name": "bg", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_bh", + "name": "bh", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_bi", + "name": "bi", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_bj", + "name": "bj", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_bk", + "name": "bk", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_bl", + "name": "bl", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_bm", + "name": "bm", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_bn", + "name": "bn", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_bo", + "name": "bo", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_bp", + "name": "bp", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_bq", + "name": "bq", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_br", + "name": "br", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_bs", + "name": "bs", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_bt", + "name": "bt", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_bu", + "name": "bu", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_bv", + "name": "bv", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_bw", + "name": "bw", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_bx", + "name": "bx", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_by", + "name": "by", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_bz", + "name": "bz", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_c", + "name": "c", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_cb", + "name": "cb", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_cc", + "name": "cc", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_ce", + "name": "ce", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_cf", + "name": "cf", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_cg", + "name": "cg", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_ch", + "name": "ch", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_cj", + "name": "cj", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_ck", + "name": "ck", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_cl", + "name": "cl", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_cm", + "name": "cm", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_cn", + "name": "cn", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_cp", + "name": "cp", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_cq", + "name": "cq", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_cr", + "name": "cr", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_cs", + "name": "cs", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_ct", + "name": "ct", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_cu", + "name": "cu", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_cv", + "name": "cv", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_cw", + "name": "cw", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_cy", + "name": "cy", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_cz", + "name": "cz", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_d", + "name": "d", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_e", + "name": "e", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_f", + "name": "f", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_g", + "name": "g", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_h", + "name": "h", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_i", + "name": "i", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_j", + "name": "j", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_k", + "name": "k", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_l", + "name": "l", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_m", + "name": "m", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_n", + "name": "n", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_o", + "name": "o", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_p", + "name": "p", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_q", + "name": "q", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_r", + "name": "r", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_s", + "name": "s", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_t", + "name": "t", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_u", + "name": "u", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_v", + "name": "v", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_w", + "name": "w", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_x", + "name": "x", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_y", + "name": "y", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lgs;", + "field": "__gs_z", + "name": "z", + "owner": "gs" + }, + { + "access": 25, + "descriptor": "Lis;", + "field": "__is_u", + "name": "u", + "owner": "is" + }, + { + "access": 25, + "descriptor": "Liy;", + "field": "__iy_f", + "name": "f", + "owner": "iy" + }, + { + "access": 25, + "descriptor": "Liy;", + "field": "__iy_m", + "name": "m", + "owner": "iy" + }, + { + "access": 25, + "descriptor": "Liy;", + "field": "__iy_q", + "name": "q", + "owner": "iy" + }, + { + "access": 25, + "descriptor": "Liy;", + "field": "__iy_w", + "name": "w", + "owner": "iy" + }, + { + "access": 25, + "descriptor": "Lji;", + "field": "__ji_i", + "name": "i", + "owner": "ji" + }, + { + "access": 25, + "descriptor": "Lji;", + "field": "__ji_n", + "name": "n", + "owner": "ji" + }, + { + "access": 25, + "descriptor": "Lkd;", + "field": "TriBool_false", + "name": "q", + "owner": "kd" + }, + { + "access": 25, + "descriptor": "Lkd;", + "field": "TriBool_true", + "name": "f", + "owner": "kd" + }, + { + "access": 25, + "descriptor": "Lkd;", + "field": "TriBool_unknown", + "name": "m", + "owner": "kd" + }, + { + "access": 25, + "descriptor": "Lkx;", + "field": "FontName_bold12", + "name": "q", + "owner": "kx" + }, + { + "access": 25, + "descriptor": "Lkx;", + "field": "FontName_plain11", + "name": "m", + "owner": "kx" + }, + { + "access": 25, + "descriptor": "Lkx;", + "field": "FontName_plain12", + "name": "f", + "owner": "kx" + }, + { + "access": 25, + "descriptor": "Lkx;", + "field": "FontName_verdana11", + "name": "w", + "owner": "kx" + }, + { + "access": 25, + "descriptor": "Lkx;", + "field": "FontName_verdana13", + "name": "o", + "owner": "kx" + }, + { + "access": 25, + "descriptor": "Lkx;", + "field": "FontName_verdana15", + "name": "u", + "owner": "kx" + }, + { + "access": 25, + "descriptor": "Llj;", + "field": "__lj_m", + "name": "m", + "owner": "lj" + }, + { + "access": 25, + "descriptor": "Llx;", + "field": "__lx_e", + "name": "e", + "owner": "lx" + }, + { + "access": 25, + "descriptor": "Llx;", + "field": "__lx_m", + "name": "m", + "owner": "lx" + }, + { + "access": 25, + "descriptor": "Ls;", + "field": "WorldMapLabelSize_large", + "name": "q", + "owner": "s" + }, + { + "access": 25, + "descriptor": "Ls;", + "field": "WorldMapLabelSize_medium", + "name": "f", + "owner": "s" + }, + { + "access": 25, + "descriptor": "Ls;", + "field": "WorldMapLabelSize_small", + "name": "m", + "owner": "s" + }, + { + "access": 25, + "descriptor": "[C", + "field": "base37Table", + "name": "m", + "owner": "ku" + }, + { + "access": 25, + "descriptor": "[C", + "field": "cp1252AsciiExtension", + "name": "m", + "owner": "kr" + }, + { + "access": 25, + "descriptor": "[S", + "field": "__ht_m", + "name": "m", + "owner": "ht" + }, + { + "access": 25, + "descriptor": "[S", + "field": "__ht_q", + "name": "q", + "owner": "ht" + }, + { + "access": 25, + "descriptor": "[Z", + "field": "Skills_enabled", + "name": "f", + "owner": "hc" + }, + { + "access": 25, + "descriptor": "[[S", + "field": "__ht_f", + "name": "f", + "owner": "ht" + }, + { + "access": 25, + "descriptor": "[[S", + "field": "__ht_w", + "name": "w", + "owner": "ht" + }, + { + "access": 72, + "descriptor": "Z", + "field": "hasFocus", + "name": "an", + "owner": "ba" + }, + { + "access": 73, + "decoder": -1080652669, + "descriptor": "I", + "field": "MouseHandler_idleCycles", + "name": "o", + "owner": "bb" + }, + { + "access": 73, + "decoder": -474146073, + "descriptor": "I", + "field": "KeyHandler_idleCycles", + "name": "ci", + "owner": "an" + }, + { + "access": 73, + "decoder": -5429651987476438000, + "descriptor": "J", + "field": "MouseHandler_millis0", + "name": "e", + "owner": "bb" + }, + { + "access": 73, + "decoder": -813801905, + "descriptor": "I", + "field": "MouseHandler_lastPressedX0", + "name": "a", + "owner": "bb" + }, + { + "access": 73, + "decoder": 1048471439, + "descriptor": "I", + "field": "MouseHandler_x0", + "name": "g", + "owner": "bb" + }, + { + "access": 73, + "decoder": 14138669, + "descriptor": "I", + "field": "MouseHandler_lastPressedY0", + "name": "z", + "owner": "bb" + }, + { + "access": 73, + "decoder": 2000222973, + "descriptor": "I", + "field": "MouseHandler_y0", + "name": "l", + "owner": "bb" + }, + { + "access": 73, + "decoder": 3555003757894628400, + "descriptor": "J", + "field": "MouseHandler_lastPressedTimeMillis0", + "name": "j", + "owner": "bb" + }, + { + "access": 73, + "decoder": 590718769, + "descriptor": "I", + "field": "MouseHandler_lastButton0", + "name": "i", + "owner": "bb" + }, + { + "access": 73, + "decoder": 642308075, + "descriptor": "I", + "field": "MouseHandler_currentButton0", + "name": "u", + "owner": "bb" + }, + { + "access": 8, + "decoder": -1019558835, + "descriptor": "I", + "field": "__bv_y", + "name": "y", + "owner": "bv" + }, + { + "access": 8, + "decoder": -1036874153, + "descriptor": "I", + "field": "hintArrowPlayerIndex", + "name": "ct", + "owner": "client" + }, + { + "access": 8, + "decoder": -1042005999, + "descriptor": "I", + "field": "__ba_aw", + "name": "aw", + "owner": "ba" + }, + { + "access": 8, + "decoder": -1050480853, + "descriptor": "I", + "field": "__client_fd", + "name": "fd", + "owner": "client" + }, + { + "access": 8, + "decoder": -1086790653, + "descriptor": "I", + "field": "__ik_rt", + "name": "rt", + "owner": "ik" + }, + { + "access": 8, + "decoder": -1119867679, + "descriptor": "I", + "field": "__lr_m", + "name": "m", + "owner": "lr" + }, + { + "access": 8, + "decoder": -1131782991, + "descriptor": "I", + "field": "__ao_gk", + "name": "gk", + "owner": "ao" + }, + { + "access": 8, + "decoder": -114766123, + "descriptor": "I", + "field": "Interpreter_stringStackSize", + "name": "x", + "owner": "bv" + }, + { + "access": 8, + "decoder": -1149138989, + "descriptor": "I", + "field": "__client_hk", + "name": "hk", + "owner": "client" + }, + { + "access": 8, + "decoder": -1163038981, + "descriptor": "I", + "field": "camAngleY", + "name": "hp", + "owner": "client" + }, + { + "access": 8, + "decoder": -1168497831, + "descriptor": "I", + "field": "Messages_count", + "name": "w", + "owner": "cw" + }, + { + "access": 8, + "decoder": -1179083285, + "descriptor": "I", + "field": "__ba_l", + "name": "l", + "owner": "ba" + }, + { + "access": 8, + "decoder": -12041645, + "descriptor": "I", + "field": "menuX", + "name": "kw", + "owner": "v" + }, + { + "access": 8, + "decoder": -1208053825, + "descriptor": "I", + "field": "__an_cw", + "name": "cw", + "owner": "an" + }, + { + "access": 8, + "decoder": -1208823721, + "descriptor": "I", + "field": "__client_ke", + "name": "ke", + "owner": "client" + }, + { + "access": 8, + "decoder": -1213062413, + "descriptor": "I", + "field": "__client_iy", + "name": "iy", + "owner": "client" + }, + { + "access": 8, + "decoder": -1218466245, + "descriptor": "I", + "field": "__by_hb", + "name": "hb", + "owner": "by" + }, + { + "access": 8, + "decoder": -123748133, + "descriptor": "I", + "field": "hintArrowY", + "name": "cc", + "owner": "client" + }, + { + "access": 8, + "decoder": -1237576843, + "descriptor": "I", + "field": "Interpreter_intStackSize", + "name": "l", + "owner": "fe" + }, + { + "access": 8, + "decoder": -1247107945, + "descriptor": "I", + "field": "__bs_nb", + "name": "nb", + "owner": "bs" + }, + { + "access": 8, + "decoder": -1267243587, + "descriptor": "I", + "field": "__client_jz", + "name": "jz", + "owner": "client" + }, + { + "access": 8, + "decoder": -12672775, + "descriptor": "I", + "field": "gameDrawingMode", + "name": "oz", + "owner": "client" + }, + { + "access": 8, + "decoder": -1282224505, + "descriptor": "I", + "field": "__iv_q", + "name": "q", + "owner": "iv" + }, + { + "access": 8, + "decoder": -1286287981, + "descriptor": "I", + "field": "__x_rg", + "name": "rg", + "owner": "x" + }, + { + "access": 8, + "decoder": -1302827103, + "descriptor": "I", + "field": "mouseCrossState", + "name": "jw", + "owner": "client" + }, + { + "access": 8, + "decoder": -1309758309, + "descriptor": "I", + "field": "combatTargetPlayerIndex", + "name": "kx", + "owner": "client" + }, + { + "access": 8, + "decoder": -1313705721, + "descriptor": "I", + "field": "__client_cq", + "name": "cq", + "owner": "client" + }, + { + "access": 8, + "decoder": -134014371, + "descriptor": "I", + "field": "__client_gy", + "name": "gy", + "owner": "client" + }, + { + "access": 8, + "decoder": -1344682613, + "descriptor": "I", + "field": "selectedSpellFlags", + "name": "my", + "owner": "do" + }, + { + "access": 8, + "decoder": -1352723865, + "descriptor": "I", + "field": "__client_qp", + "name": "qp", + "owner": "client" + }, + { + "access": 8, + "decoder": -1362734353, + "descriptor": "I", + "field": "__client_pl", + "name": "pl", + "owner": "client" + }, + { + "access": 8, + "decoder": -1367955455, + "descriptor": "I", + "field": "__hq_qg", + "name": "qg", + "owner": "hq" + }, + { + "access": 8, + "decoder": -137788125, + "descriptor": "I", + "field": "minimapState", + "name": "qm", + "owner": "client" + }, + { + "access": 8, + "decoder": -1379876433, + "descriptor": "I", + "field": "__client_ng", + "name": "ng", + "owner": "client" + }, + { + "access": 8, + "decoder": -1406125895, + "descriptor": "I", + "field": "__client_hx", + "name": "hx", + "owner": "client" + }, + { + "access": 8, + "decoder": -1420078475, + "descriptor": "I", + "field": "__client_hj", + "name": "hj", + "owner": "client" + }, + { + "access": 8, + "decoder": -1431050759, + "descriptor": "I", + "field": "js5ConnectState", + "name": "da", + "owner": "client" + }, + { + "access": 8, + "decoder": -1454618167, + "descriptor": "I", + "field": "Tiles_minPlane", + "name": "q", + "owner": "bq" + }, + { + "access": 8, + "decoder": -1456975367, + "descriptor": "I", + "field": "__client_gh", + "name": "gh", + "owner": "client" + }, + { + "access": 8, + "decoder": -1481002083, + "descriptor": "I", + "field": "soundEffectCount", + "name": "qa", + "owner": "client" + }, + { + "access": 8, + "decoder": -1514610183, + "descriptor": "I", + "field": "Login_loadingPercent", + "name": "b", + "owner": "cu" + }, + { + "access": 8, + "decoder": -1516124929, + "descriptor": "I", + "field": "__as_ey", + "name": "ey", + "owner": "as" + }, + { + "access": 8, + "decoder": -1520594673, + "descriptor": "I", + "field": "titleLoadingStage", + "name": "dt", + "owner": "client" + }, + { + "access": 8, + "decoder": -1546210597, + "descriptor": "I", + "field": "archiveLoaderArchive", + "name": "sq", + "owner": "client" + }, + { + "access": 8, + "decoder": -1555836449, + "descriptor": "I", + "field": "__ar_qw", + "name": "qw", + "owner": "ar" + }, + { + "access": 8, + "decoder": -1569269731, + "descriptor": "I", + "field": "npcCount", + "name": "ep", + "owner": "client" + }, + { + "access": 8, + "decoder": -1605454211, + "descriptor": "I", + "field": "__g_z", + "name": "z", + "owner": "g" + }, + { + "access": 8, + "decoder": -1605855913, + "descriptor": "I", + "field": "__client_sl", + "name": "sl", + "owner": "client" + }, + { + "access": 8, + "decoder": -1628183831, + "descriptor": "I", + "field": "mouseWheelRotation", + "name": "oe", + "owner": "client" + }, + { + "access": 8, + "decoder": -163579343, + "descriptor": "I", + "field": "loginState", + "name": "ed", + "owner": "client" + }, + { + "access": 8, + "decoder": -1645409107, + "descriptor": "I", + "field": "selectedItemComponent", + "name": "ix", + "owner": "ge" + }, + { + "access": 8, + "decoder": -1698831905, + "descriptor": "I", + "field": "__ba_e", + "name": "e", + "owner": "ba" + }, + { + "access": 8, + "decoder": -1704358328771671000, + "descriptor": "J", + "field": "__client_pp", + "name": "pp", + "owner": "client" + }, + { + "access": 8, + "decoder": -1715020411, + "descriptor": "I", + "field": "__client_mf", + "name": "mf", + "owner": "client" + }, + { + "access": 8, + "decoder": -1731573291, + "descriptor": "I", + "field": "__client_cn", + "name": "cn", + "owner": "client" + }, + { + "access": 8, + "decoder": -1734004743, + "descriptor": "I", + "field": "menuHeight", + "name": "ka", + "owner": "ak" + }, + { + "access": 8, + "decoder": -1749538901, + "descriptor": "I", + "field": "menuOptionsCount", + "name": "ll", + "owner": "client" + }, + { + "access": 8, + "decoder": -1757834373, + "descriptor": "I", + "field": "hintArrowX", + "name": "cz", + "owner": "client" + }, + { + "access": 8, + "decoder": -1762891465, + "descriptor": "I", + "field": "__dk_o", + "name": "o", + "owner": "dk" + }, + { + "access": 8, + "decoder": -1792536059, + "descriptor": "I", + "field": "rebootTimer", + "name": "cf", + "owner": "client" + }, + { + "access": 8, + "decoder": -1802494233, + "descriptor": "I", + "field": "publicChatMode", + "name": "pt", + "owner": "client" + }, + { + "access": 8, + "decoder": -1807262579, + "descriptor": "I", + "field": "__bw_d", + "name": "d", + "owner": "bw" + }, + { + "access": 8, + "decoder": -1810047523, + "descriptor": "I", + "field": "__i_af", + "name": "af", + "owner": "i" + }, + { + "access": 8, + "decoder": -184301597, + "descriptor": "I", + "field": "pcmPlayerCount", + "name": "e", + "owner": "cu" + }, + { + "access": 8, + "decoder": -1869532553, + "descriptor": "I", + "field": "localPlayerIndex", + "name": "ji", + "owner": "client" + }, + { + "access": 8, + "decoder": -1942470229, + "descriptor": "I", + "field": "__ak_qj", + "name": "qj", + "owner": "ak" + }, + { + "access": 8, + "decoder": -1942898885, + "descriptor": "I", + "field": "__an_cc", + "name": "cc", + "owner": "an" + }, + { + "access": 8, + "decoder": -1945589829, + "descriptor": "I", + "field": "cameraZ", + "name": "hl", + "owner": "k" + }, + { + "access": 8, + "decoder": -1946112139, + "descriptor": "I", + "field": "__y_sn", + "name": "sn", + "owner": "y" + }, + { + "access": 8, + "decoder": -1972775883, + "descriptor": "I", + "field": "componentClickX", + "name": "mt", + "owner": "client" + }, + { + "access": 8, + "decoder": -1984048653, + "descriptor": "I", + "field": "mouseCrossY", + "name": "jq", + "owner": "client" + }, + { + "access": 8, + "decoder": -2062450631, + "descriptor": "I", + "field": "selectedItemId", + "name": "iz", + "owner": "cs" + }, + { + "access": 8, + "decoder": -2071972829, + "descriptor": "I", + "field": "__dm_l", + "name": "l", + "owner": "dm" + }, + { + "access": 8, + "decoder": -2077113503, + "descriptor": "I", + "field": "__ka_e", + "name": "e", + "owner": "ka" + }, + { + "access": 8, + "decoder": -2078849253, + "descriptor": "I", + "field": "__ba_s", + "name": "s", + "owner": "ba" + }, + { + "access": 8, + "decoder": -2142579405, + "descriptor": "I", + "field": "__bq_p", + "name": "p", + "owner": "bq" + }, + { + "access": 8, + "decoder": -215744973, + "descriptor": "I", + "field": "__bb_hz", + "name": "hz", + "owner": "bb" + }, + { + "access": 8, + "decoder": -22568397, + "descriptor": "I", + "field": "__cq_n", + "name": "n", + "owner": "cq" + }, + { + "access": 8, + "decoder": -244224193, + "descriptor": "I", + "field": "__ir_s", + "name": "s", + "owner": "ir" + }, + { + "access": 8, + "decoder": -256520591, + "descriptor": "I", + "field": "port2", + "name": "eq", + "owner": "ag" + }, + { + "access": 8, + "decoder": -274968037, + "descriptor": "I", + "field": "__client_ls", + "name": "ls", + "owner": "client" + }, + { + "access": 8, + "decoder": -278874973, + "descriptor": "I", + "field": "__client_nh", + "name": "nh", + "owner": "client" + }, + { + "access": 8, + "decoder": -281664295, + "descriptor": "I", + "field": "__ba_q", + "name": "q", + "owner": "ba" + }, + { + "access": 8, + "decoder": -3234258972092460000, + "descriptor": "J", + "field": "__cu_bz", + "name": "bz", + "owner": "cu" + }, + { + "access": 8, + "decoder": -34294211, + "descriptor": "I", + "field": "__client_qy", + "name": "qy", + "owner": "client" + }, + { + "access": 8, + "decoder": -3607118089363666000, + "descriptor": "J", + "field": "garbageCollectorLastCheckTimeMs", + "name": "aa", + "owner": "ba" + }, + { + "access": 8, + "decoder": -362336323, + "descriptor": "I", + "field": "destinationX", + "name": "pd", + "owner": "client" + }, + { + "access": 8, + "decoder": -365366303, + "descriptor": "I", + "field": "__iy_lo", + "name": "lo", + "owner": "iy" + }, + { + "access": 8, + "decoder": -376233039, + "descriptor": "I", + "field": "__cu_br", + "name": "br", + "owner": "cu" + }, + { + "access": 8, + "decoder": -438288575, + "descriptor": "I", + "field": "baseY", + "name": "fr", + "owner": "bw" + }, + { + "access": 8, + "decoder": -441913785, + "descriptor": "I", + "field": "__client_hc", + "name": "hc", + "owner": "client" + }, + { + "access": 8, + "decoder": -447055355, + "descriptor": "I", + "field": "__client_eo", + "name": "eo", + "owner": "client" + }, + { + "access": 8, + "decoder": -457229589, + "descriptor": "I", + "field": "__eh_fy", + "name": "fy", + "owner": "eh" + }, + { + "access": 8, + "decoder": -460406997, + "descriptor": "I", + "field": "__client_pm", + "name": "pm", + "owner": "client" + }, + { + "access": 8, + "decoder": -480633777, + "descriptor": "I", + "field": "__client_hu", + "name": "hu", + "owner": "client" + }, + { + "access": 8, + "decoder": -516933613, + "descriptor": "I", + "field": "__client_hn", + "name": "hn", + "owner": "client" + }, + { + "access": 8, + "decoder": -546798303, + "descriptor": "I", + "field": "rootComponentCount", + "name": "os", + "owner": "client" + }, + { + "access": 8, + "decoder": -597100741, + "descriptor": "I", + "field": "__client_fn", + "name": "fn", + "owner": "client" + }, + { + "access": 8, + "decoder": -6104270600047501000, + "descriptor": "J", + "field": "js5StartTimeMs", + "name": "ds", + "owner": "eh" + }, + { + "access": 8, + "decoder": -6166028446082638000, + "descriptor": "J", + "field": "currentTimeMsOffset", + "name": "f", + "owner": "ga" + }, + { + "access": 8, + "decoder": -627650567, + "descriptor": "I", + "field": "hintArrowHeight", + "name": "ci", + "owner": "client" + }, + { + "access": 8, + "decoder": -629885193, + "descriptor": "I", + "field": "viewportHeight", + "name": "rx", + "owner": "client" + }, + { + "access": 8, + "decoder": -631434243, + "descriptor": "I", + "field": "plane", + "name": "jg", + "owner": "dx" + }, + { + "access": 8, + "decoder": -64320473, + "descriptor": "I", + "field": "__client_ky", + "name": "ky", + "owner": "client" + }, + { + "access": 8, + "decoder": -6574384275386813000, + "descriptor": "J", + "field": "__client_ch", + "name": "ch", + "owner": "client" + }, + { + "access": 8, + "decoder": -6780258776884307000, + "descriptor": "J", + "field": "__hd_fc", + "name": "fc", + "owner": "hd" + }, + { + "access": 8, + "decoder": -704675849, + "descriptor": "I", + "field": "__dr_ao", + "name": "ao", + "owner": "dr" + }, + { + "access": 8, + "decoder": -745071109, + "descriptor": "I", + "field": "__hb_sg", + "name": "sg", + "owner": "hb" + }, + { + "access": 8, + "decoder": -753026759, + "descriptor": "I", + "field": "port1", + "name": "ee", + "owner": "q" + }, + { + "access": 8, + "decoder": -758575207, + "descriptor": "I", + "field": "__client_nv", + "name": "nv", + "owner": "client" + }, + { + "access": 8, + "decoder": -76329055, + "descriptor": "I", + "field": "__lr_q", + "name": "q", + "owner": "lr" + }, + { + "access": 8, + "decoder": -766468303, + "descriptor": "I", + "field": "Players_count", + "name": "u", + "owner": "cq" + }, + { + "access": 8, + "decoder": -783816509, + "descriptor": "I", + "field": "rootInterface", + "name": "mm", + "owner": "client" + }, + { + "access": 8, + "decoder": -790717597, + "descriptor": "I", + "field": "baseX", + "name": "ff", + "owner": "af" + }, + { + "access": 8, + "decoder": -791125441, + "descriptor": "I", + "field": "ByteArrayPool_smallCount", + "name": "m", + "owner": "gi" + }, + { + "access": 8, + "decoder": -817957995, + "descriptor": "I", + "field": "__an_ra", + "name": "ra", + "owner": "an" + }, + { + "access": 8, + "decoder": -818676431, + "descriptor": "I", + "field": "__client_qc", + "name": "qc", + "owner": "client" + }, + { + "access": 8, + "decoder": -81902865, + "descriptor": "I", + "field": "viewportTempY", + "name": "ia", + "owner": "client" + }, + { + "access": 8, + "decoder": -836653679, + "descriptor": "I", + "field": "dragItemSlotDestination", + "name": "jy", + "owner": "client" + }, + { + "access": 8, + "decoder": -836962805, + "descriptor": "I", + "field": "__client_jo", + "name": "jo", + "owner": "client" + }, + { + "access": 8, + "decoder": -843739713, + "descriptor": "I", + "field": "__client_nw", + "name": "nw", + "owner": "client" + }, + { + "access": 8, + "decoder": -8445874050676184000, + "descriptor": "J", + "field": "mouseLastLastPressedTimeMillis", + "name": "cb", + "owner": "client" + }, + { + "access": 8, + "decoder": -852671813, + "descriptor": "I", + "field": "__dm_k", + "name": "k", + "owner": "dm" + }, + { + "access": 8, + "decoder": -852697585, + "descriptor": "I", + "field": "__fo_ro", + "name": "ro", + "owner": "fo" + }, + { + "access": 8, + "decoder": -871534943, + "descriptor": "I", + "field": "hintArrowType", + "name": "cp", + "owner": "client" + }, + { + "access": 8, + "decoder": -883931753, + "descriptor": "I", + "field": "__eo_u", + "name": "u", + "owner": "eo" + }, + { + "access": 8, + "decoder": -898263359, + "descriptor": "I", + "field": "__client_ku", + "name": "ku", + "owner": "client" + }, + { + "access": 8, + "decoder": -93280591, + "descriptor": "I", + "field": "__an_ct", + "name": "ct", + "owner": "an" + }, + { + "access": 8, + "decoder": -934082817, + "descriptor": "I", + "field": "__client_na", + "name": "na", + "owner": "client" + }, + { + "access": 8, + "decoder": -948290091, + "descriptor": "I", + "field": "__p_go", + "name": "go", + "owner": "p" + }, + { + "access": 8, + "decoder": -952172003, + "descriptor": "I", + "field": "__client_if", + "name": "if", + "owner": "client" + }, + { + "access": 8, + "decoder": -964416527, + "descriptor": "I", + "field": "__client_ej", + "name": "ej", + "owner": "client" + }, + { + "access": 8, + "decoder": -971800905, + "descriptor": "I", + "field": "ByteArrayPool_largeCount", + "name": "q", + "owner": "gi" + }, + { + "access": 8, + "decoder": -992379173, + "descriptor": "I", + "field": "__bx_o", + "name": "o", + "owner": "bx" + }, + { + "access": 8, + "decoder": 1005832199, + "descriptor": "I", + "field": "camFollowHeight", + "name": "ho", + "owner": "client" + }, + { + "access": 8, + "decoder": 1006519291, + "descriptor": "I", + "field": "__fw_nm", + "name": "nm", + "owner": "fw" + }, + { + "access": 8, + "decoder": 1013162399149344800, + "descriptor": "J", + "field": "garbageCollectorLastCollectionTime", + "name": "ao", + "owner": "ba" + }, + { + "access": 8, + "decoder": 1019025247, + "descriptor": "I", + "field": "__client_nk", + "name": "nk", + "owner": "client" + }, + { + "access": 8, + "decoder": 1052276727, + "descriptor": "I", + "field": "componentClickY", + "name": "me", + "owner": "client" + }, + { + "access": 8, + "decoder": 1052834531, + "descriptor": "I", + "field": "cameraX", + "name": "ha", + "owner": "as" + }, + { + "access": 8, + "decoder": 1075569245, + "descriptor": "I", + "field": "__bu_hy", + "name": "hy", + "owner": "bu" + }, + { + "access": 8, + "decoder": 1076448827, + "descriptor": "I", + "field": "__gs_qh", + "name": "qh", + "owner": "gs" + }, + { + "access": 8, + "decoder": 1077910071, + "descriptor": "I", + "field": "__cu_aj", + "name": "aj", + "owner": "cu" + }, + { + "access": 8, + "decoder": 1084498299, + "descriptor": "I", + "field": "__client_jc", + "name": "jc", + "owner": "client" + }, + { + "access": 8, + "decoder": 1112094745, + "descriptor": "I", + "field": "__an_ch", + "name": "ch", + "owner": "an" + }, + { + "access": 8, + "decoder": 1132932607, + "descriptor": "I", + "field": "__client_nx", + "name": "nx", + "owner": "client" + }, + { + "access": 8, + "decoder": 1135175963, + "descriptor": "I", + "field": "__dm_u", + "name": "u", + "owner": "dm" + }, + { + "access": 8, + "decoder": 1143875805, + "descriptor": "I", + "field": "__bt_g", + "name": "g", + "owner": "bt" + }, + { + "access": 8, + "decoder": 1154760205, + "descriptor": "I", + "field": "__client_dp", + "name": "dp", + "owner": "client" + }, + { + "access": 8, + "decoder": 1181569415, + "descriptor": "I", + "field": "__fs_au", + "name": "au", + "owner": "fs" + }, + { + "access": 8, + "decoder": 1186004739, + "descriptor": "I", + "field": "gameBuild", + "name": "bq", + "owner": "client" + }, + { + "access": 8, + "decoder": 120772859, + "descriptor": "I", + "field": "__hv_h", + "name": "h", + "owner": "hv" + }, + { + "access": 8, + "decoder": 1230692157, + "descriptor": "I", + "field": "__client_pb", + "name": "pb", + "owner": "client" + }, + { + "access": 8, + "decoder": 1298845031, + "descriptor": "I", + "field": "destinationY", + "name": "pk", + "owner": "client" + }, + { + "access": 8, + "decoder": 1326137897, + "descriptor": "I", + "field": "cameraY", + "name": "hs", + "owner": "g" + }, + { + "access": 8, + "decoder": 1348053843, + "descriptor": "I", + "field": "__client_oo", + "name": "oo", + "owner": "client" + }, + { + "access": 8, + "decoder": 1351620693, + "descriptor": "I", + "field": "__dq_rq", + "name": "rq", + "owner": "dq" + }, + { + "access": 8, + "decoder": 1365951359, + "descriptor": "I", + "field": "__client_qf", + "name": "qf", + "owner": "client" + }, + { + "access": 8, + "decoder": 1393270633, + "descriptor": "I", + "field": "hintArrowSubY", + "name": "cx", + "owner": "client" + }, + { + "access": 8, + "decoder": 1431381579, + "descriptor": "I", + "field": "__cu_bl", + "name": "bl", + "owner": "cu" + }, + { + "access": 8, + "decoder": 1467519791, + "descriptor": "I", + "field": "__client_nq", + "name": "nq", + "owner": "client" + }, + { + "access": 8, + "decoder": 1485594821, + "descriptor": "I", + "field": "hintArrowNpcIndex", + "name": "cl", + "owner": "client" + }, + { + "access": 8, + "decoder": 1486366835, + "descriptor": "I", + "field": "itemDragDuration", + "name": "jt", + "owner": "client" + }, + { + "access": 8, + "decoder": 1502058429, + "descriptor": "I", + "field": "__client_ht", + "name": "ht", + "owner": "client" + }, + { + "access": 8, + "decoder": 1548448409, + "descriptor": "I", + "field": "__bf_m", + "name": "m", + "owner": "bf" + }, + { + "access": 8, + "decoder": 1548722671, + "descriptor": "I", + "field": "__cu_bj", + "name": "bj", + "owner": "cu" + }, + { + "access": 8, + "decoder": 1577759565, + "descriptor": "I", + "field": "__s_fi", + "name": "fi", + "owner": "s" + }, + { + "access": 8, + "decoder": 1602665191, + "descriptor": "I", + "field": "followerIndex", + "name": "ml", + "owner": "client" + }, + { + "access": 8, + "decoder": 1606541885, + "descriptor": "I", + "field": "__cu_q", + "name": "q", + "owner": "cu" + }, + { + "access": 8, + "decoder": 1608439891, + "descriptor": "I", + "field": "__w_qs", + "name": "qs", + "owner": "w" + }, + { + "access": 8, + "decoder": 161627197, + "descriptor": "I", + "field": "__lr_f", + "name": "f", + "owner": "lr" + }, + { + "access": 8, + "decoder": 1630772923, + "descriptor": "I", + "field": "isItemSelected", + "name": "lz", + "owner": "client" + }, + { + "access": 8, + "decoder": 1658018867, + "descriptor": "I", + "field": "__client_hg", + "name": "hg", + "owner": "client" + }, + { + "access": 8, + "decoder": 1664350313, + "descriptor": "I", + "field": "__client_hr", + "name": "hr", + "owner": "client" + }, + { + "access": 8, + "decoder": 1677133239, + "descriptor": "I", + "field": "__cu_ac", + "name": "ac", + "owner": "cu" + }, + { + "access": 8, + "decoder": 1678472241, + "descriptor": "I", + "field": "clientType", + "name": "bm", + "owner": "client" + }, + { + "access": 8, + "decoder": 1691923909, + "descriptor": "I", + "field": "__client_ju", + "name": "ju", + "owner": "client" + }, + { + "access": 8, + "decoder": 1694810089, + "descriptor": "I", + "field": "__client_mb", + "name": "mb", + "owner": "client" + }, + { + "access": 8, + "decoder": 1769484271, + "descriptor": "I", + "field": "__cu_bb", + "name": "bb", + "owner": "cu" + }, + { + "access": 8, + "decoder": 1791955261, + "descriptor": "I", + "field": "js5Errors", + "name": "ek", + "owner": "client" + }, + { + "access": 8, + "decoder": 1861681835, + "descriptor": "I", + "field": "__cu_aw", + "name": "aw", + "owner": "cu" + }, + { + "access": 8, + "decoder": 1875936371, + "descriptor": "I", + "field": "menuY", + "name": "kl", + "owner": "ba" + }, + { + "access": 8, + "decoder": 1881890525, + "descriptor": "I", + "field": "__client_np", + "name": "np", + "owner": "client" + }, + { + "access": 8, + "decoder": 1889277277, + "descriptor": "I", + "field": "overheadTextLimit", + "name": "iv", + "owner": "client" + }, + { + "access": 8, + "decoder": 1909006131, + "descriptor": "I", + "field": "cycle", + "name": "cu", + "owner": "client" + }, + { + "access": 8, + "decoder": 1912123225, + "descriptor": "I", + "field": "selectedItemSlot", + "name": "lx", + "owner": "ii" + }, + { + "access": 8, + "decoder": 1939745821, + "descriptor": "I", + "field": "__client_nl", + "name": "nl", + "owner": "client" + }, + { + "access": 8, + "decoder": 1959822241, + "descriptor": "I", + "field": "__client_je", + "name": "je", + "owner": "client" + }, + { + "access": 8, + "decoder": 196309625, + "descriptor": "I", + "field": "__client_lc", + "name": "lc", + "owner": "client" + }, + { + "access": 8, + "decoder": 1990512261, + "descriptor": "I", + "field": "__client_ni", + "name": "ni", + "owner": "client" + }, + { + "access": 8, + "decoder": 202604997, + "descriptor": "I", + "field": "mouseCrossX", + "name": "jb", + "owner": "client" + }, + { + "access": 8, + "decoder": 2035623995, + "descriptor": "I", + "field": "viewportWidth", + "name": "ry", + "owner": "client" + }, + { + "access": 8, + "decoder": 2059180753, + "descriptor": "I", + "field": "componentDragDuration", + "name": "no", + "owner": "bu" + }, + { + "access": 8, + "decoder": 206275573, + "descriptor": "I", + "field": "__client_sx", + "name": "sx", + "owner": "client" + }, + { + "access": 8, + "decoder": 2066759739, + "descriptor": "I", + "field": "__an_cz", + "name": "cz", + "owner": "an" + }, + { + "access": 8, + "decoder": 2068355509, + "descriptor": "I", + "field": "language", + "name": "bo", + "owner": "client" + }, + { + "access": 8, + "decoder": 2069364655, + "descriptor": "I", + "field": "cameraYaw", + "name": "he", + "owner": "ha" + }, + { + "access": 8, + "decoder": 2079315667, + "descriptor": "I", + "field": "menuWidth", + "name": "ko", + "owner": "hf" + }, + { + "access": 8, + "decoder": 2096389021, + "descriptor": "I", + "field": "__ek_x", + "name": "x", + "owner": "ek" + }, + { + "access": 8, + "decoder": 2121641763, + "descriptor": "I", + "field": "ByteArrayPool_mediumCount", + "name": "f", + "owner": "gi" + }, + { + "access": 8, + "decoder": 2128395635, + "descriptor": "I", + "field": "__client_ms", + "name": "ms", + "owner": "client" + }, + { + "access": 8, + "decoder": 218086227, + "descriptor": "I", + "field": "__client_hv", + "name": "hv", + "owner": "client" + }, + { + "access": 8, + "decoder": 233222155, + "descriptor": "I", + "field": "worldsCount", + "name": "u", + "owner": "bt" + }, + { + "access": 8, + "decoder": 233318639, + "descriptor": "I", + "field": "mouseCrossColor", + "name": "jm", + "owner": "client" + }, + { + "access": 8, + "decoder": 236939601, + "descriptor": "I", + "field": "__client_ie", + "name": "ie", + "owner": "client" + }, + { + "access": 8, + "decoder": 244995961, + "descriptor": "I", + "field": "gameState", + "name": "br", + "owner": "client" + }, + { + "access": 8, + "decoder": 247245677, + "descriptor": "I", + "field": "chatEffects", + "name": "mg", + "owner": "client" + }, + { + "access": 8, + "decoder": 26099827, + "descriptor": "I", + "field": "__client_lq", + "name": "lq", + "owner": "client" + }, + { + "access": 8, + "decoder": 262104267, + "descriptor": "I", + "field": "__dm_g", + "name": "g", + "owner": "dm" + }, + { + "access": 8, + "decoder": 289477221, + "descriptor": "I", + "field": "viewportDrawCount", + "name": "ii", + "owner": "client" + }, + { + "access": 8, + "decoder": 3311945626287518700, + "descriptor": "J", + "field": "currentTimeMsLast", + "name": "m", + "owner": "ed" + }, + { + "access": 8, + "decoder": 334735939, + "descriptor": "I", + "field": "__ir_bu", + "name": "bu", + "owner": "ir" + }, + { + "access": 8, + "decoder": 3423502126894795300, + "descriptor": "J", + "field": "__z_si", + "name": "si", + "owner": "z" + }, + { + "access": 8, + "decoder": 344308849, + "descriptor": "I", + "field": "__client_nc", + "name": "nc", + "owner": "client" + }, + { + "access": 8, + "decoder": 351193663, + "descriptor": "I", + "field": "__client_in", + "name": "in", + "owner": "client" + }, + { + "access": 8, + "decoder": 352819683, + "descriptor": "I", + "field": "worldProperties", + "name": "bb", + "owner": "client" + }, + { + "access": 8, + "decoder": 36001423, + "descriptor": "I", + "field": "weight", + "name": "mv", + "owner": "client" + }, + { + "access": 8, + "decoder": 386331251, + "descriptor": "I", + "field": "viewportOffsetX", + "name": "rr", + "owner": "client" + }, + { + "access": 8, + "decoder": 402871301, + "descriptor": "I", + "field": "__client_hi", + "name": "hi", + "owner": "client" + }, + { + "access": 8, + "decoder": 410614005, + "descriptor": "I", + "field": "camAngleX", + "name": "hw", + "owner": "client" + }, + { + "access": 8, + "decoder": 424442889, + "descriptor": "I", + "field": "viewportTempX", + "name": "ig", + "owner": "client" + }, + { + "access": 8, + "decoder": 425367827, + "descriptor": "I", + "field": "__ba_d", + "name": "d", + "owner": "ba" + }, + { + "access": 8, + "decoder": 438998245, + "descriptor": "I", + "field": "__client_hd", + "name": "hd", + "owner": "client" + }, + { + "access": 8, + "decoder": 485534011, + "descriptor": "I", + "field": "dragItemSlotSource", + "name": "jp", + "owner": "client" + }, + { + "access": 8, + "decoder": 490189491, + "descriptor": "I", + "field": "cameraPitch", + "name": "hq", + "owner": "t" + }, + { + "access": 8, + "decoder": 516059665, + "descriptor": "I", + "field": "__client_fw", + "name": "fw", + "owner": "client" + }, + { + "access": 8, + "decoder": 535219347, + "descriptor": "I", + "field": "__client_mh", + "name": "mh", + "owner": "client" + }, + { + "access": 8, + "decoder": 541065633, + "descriptor": "I", + "field": "viewportZoom", + "name": "rz", + "owner": "client" + }, + { + "access": 8, + "decoder": 545127349, + "descriptor": "I", + "field": "Interpreter_frameDepth", + "name": "d", + "owner": "bv" + }, + { + "access": 8, + "decoder": 587773171, + "descriptor": "I", + "field": "__client_ph", + "name": "ph", + "owner": "client" + }, + { + "access": 8, + "decoder": 616180377, + "descriptor": "I", + "field": "overheadTextCount", + "name": "ir", + "owner": "client" + }, + { + "access": 8, + "decoder": 636454135, + "descriptor": "I", + "field": "__bd_er", + "name": "er", + "owner": "bd" + }, + { + "access": 8, + "decoder": 662119345, + "descriptor": "I", + "field": "__iu_n", + "name": "n", + "owner": "iu" + }, + { + "access": 8, + "decoder": 685418907, + "descriptor": "I", + "field": "__client_gp", + "name": "gp", + "owner": "client" + }, + { + "access": 8, + "decoder": 689094231, + "descriptor": "I", + "field": "__client_el", + "name": "el", + "owner": "client" + }, + { + "access": 8, + "decoder": 699084605, + "descriptor": "I", + "field": "__client_lb", + "name": "lb", + "owner": "client" + }, + { + "access": 8, + "decoder": 743073293, + "descriptor": "I", + "field": "__client_ns", + "name": "ns", + "owner": "client" + }, + { + "access": 8, + "decoder": 749254081, + "descriptor": "I", + "field": "hintArrowSubX", + "name": "cd", + "owner": "client" + }, + { + "access": 8, + "decoder": 755300107, + "descriptor": "I", + "field": "__client_ex", + "name": "ex", + "owner": "client" + }, + { + "access": 8, + "decoder": 760022015, + "descriptor": "I", + "field": "__client_nd", + "name": "nd", + "owner": "client" + }, + { + "access": 8, + "decoder": 803647694904294300, + "descriptor": "J", + "field": "__cu_bi", + "name": "bi", + "owner": "cu" + }, + { + "access": 8, + "decoder": 813973829, + "descriptor": "I", + "field": "__client_ja", + "name": "ja", + "owner": "client" + }, + { + "access": 8, + "decoder": 821563709, + "descriptor": "I", + "field": "staffModLevel", + "name": "mw", + "owner": "client" + }, + { + "access": 8, + "decoder": 829228151, + "descriptor": "I", + "field": "__client_fe", + "name": "fe", + "owner": "client" + }, + { + "access": 8, + "decoder": 834543729, + "descriptor": "I", + "field": "__bq_v", + "name": "v", + "owner": "bq" + }, + { + "access": 8, + "decoder": 8470625, + "descriptor": "I", + "field": "__client_fk", + "name": "fk", + "owner": "client" + }, + { + "access": 8, + "decoder": 864673321, + "descriptor": "I", + "field": "mapIconCount", + "name": "pi", + "owner": "client" + }, + { + "access": 8, + "decoder": 8818983958751332000, + "descriptor": "J", + "field": "__client_oa", + "name": "oa", + "owner": "client" + }, + { + "access": 8, + "decoder": 885052255, + "descriptor": "I", + "field": "__client_ln", + "name": "ln", + "owner": "client" + }, + { + "access": 8, + "decoder": 910983131, + "descriptor": "I", + "field": "__client_ik", + "name": "ik", + "owner": "client" + }, + { + "access": 8, + "decoder": 932541923, + "descriptor": "I", + "field": "__cu_y", + "name": "y", + "owner": "cu" + }, + { + "access": 8, + "decoder": 933910819, + "descriptor": "I", + "field": "runEnergy", + "name": "mi", + "owner": "client" + }, + { + "access": 8, + "decoder": 944933439, + "descriptor": "I", + "field": "__client_sd", + "name": "sd", + "owner": "client" + }, + { + "access": 8, + "decoder": 945250525, + "descriptor": "I", + "field": "__cq_l", + "name": "l", + "owner": "cq" + }, + { + "access": 8, + "decoder": 992721193, + "descriptor": "I", + "field": "viewportOffsetY", + "name": "rn", + "owner": "client" + }, + { + "access": 8, + "decoder": 994298267, + "descriptor": "I", + "field": "port3", + "name": "eh", + "owner": "ga" + }, + { + "access": 8, + "descriptor": "F", + "field": "__di_l", + "name": "l", + "owner": "di" + }, + { + "access": 8, + "descriptor": "I", + "field": "AbstractFont_alpha", + "name": "s", + "owner": "kt" + }, + { + "access": 8, + "descriptor": "I", + "field": "AbstractFont_color", + "name": "j", + "owner": "kt" + }, + { + "access": 8, + "descriptor": "I", + "field": "AbstractFont_justificationCurrent", + "name": "y", + "owner": "kt" + }, + { + "access": 8, + "descriptor": "I", + "field": "AbstractFont_justificationTotal", + "name": "t", + "owner": "kt" + }, + { + "access": 8, + "descriptor": "I", + "field": "AbstractFont_previousColor", + "name": "z", + "owner": "kt" + }, + { + "access": 8, + "descriptor": "I", + "field": "AbstractFont_previousShadow", + "name": "i", + "owner": "kt" + }, + { + "access": 8, + "descriptor": "I", + "field": "AbstractFont_shadow", + "name": "a", + "owner": "kt" + }, + { + "access": 8, + "descriptor": "I", + "field": "AbstractFont_strike", + "name": "k", + "owner": "kt" + }, + { + "access": 8, + "descriptor": "I", + "field": "AbstractFont_underline", + "name": "n", + "owner": "kt" + }, + { + "access": 8, + "descriptor": "I", + "field": "Model_transformTempX", + "name": "bd", + "owner": "du" + }, + { + "access": 8, + "descriptor": "I", + "field": "Model_transformTempY", + "name": "bc", + "owner": "du" + }, + { + "access": 8, + "descriptor": "I", + "field": "Model_transformTempZ", + "name": "bo", + "owner": "du" + }, + { + "access": 8, + "descriptor": "I", + "field": "Rasterizer3D_alpha", + "name": "o", + "owner": "et" + }, + { + "access": 8, + "descriptor": "I", + "field": "Rasterizer3D_clipHeight", + "name": "z", + "owner": "et" + }, + { + "access": 8, + "descriptor": "I", + "field": "Rasterizer3D_clipMidX", + "name": "n", + "owner": "et" + }, + { + "access": 8, + "descriptor": "I", + "field": "Rasterizer3D_clipMidX2", + "name": "s", + "owner": "et" + }, + { + "access": 8, + "descriptor": "I", + "field": "Rasterizer3D_clipMidY", + "name": "i", + "owner": "et" + }, + { + "access": 8, + "descriptor": "I", + "field": "Rasterizer3D_clipMidY2", + "name": "y", + "owner": "et" + }, + { + "access": 8, + "descriptor": "I", + "field": "Rasterizer3D_clipNegativeMidX", + "name": "j", + "owner": "et" + }, + { + "access": 8, + "descriptor": "I", + "field": "Rasterizer3D_clipNegativeMidY", + "name": "t", + "owner": "et" + }, + { + "access": 8, + "descriptor": "I", + "field": "Rasterizer3D_clipWidth", + "name": "a", + "owner": "et" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_cameraPitchCosine", + "name": "aq", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_cameraPitchSine", + "name": "ag", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_cameraX", + "name": "r", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_cameraXTile", + "name": "b", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_cameraXTileMax", + "name": "t", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_cameraXTileMin", + "name": "s", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_cameraY", + "name": "p", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_cameraYTile", + "name": "c", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_cameraYTileMax", + "name": "h", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_cameraYTileMin", + "name": "y", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_cameraYawCosine", + "name": "av", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_cameraYawSine", + "name": "aj", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_cameraZ", + "name": "v", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_currentOccludersCount", + "name": "am", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_drawnCount", + "name": "j", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_plane", + "name": "z", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_selectedPlane", + "name": "ay", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_selectedScreenX", + "name": "ah", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_selectedScreenY", + "name": "ak", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_viewportXCenter", + "name": "bx", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_viewportXMax", + "name": "bl", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_viewportXMin", + "name": "bu", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_viewportYCenter", + "name": "by", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_viewportYMax", + "name": "br", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "Scene_viewportYMin", + "name": "bm", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "__cd_d", + "name": "d", + "owner": "cd" + }, + { + "access": 8, + "descriptor": "I", + "field": "__cd_e", + "name": "e", + "owner": "cd" + }, + { + "access": 8, + "descriptor": "I", + "field": "__cd_l", + "name": "l", + "owner": "cd" + }, + { + "access": 8, + "descriptor": "I", + "field": "__cd_x", + "name": "x", + "owner": "cd" + }, + { + "access": 8, + "descriptor": "I", + "field": "__di_e", + "name": "e", + "owner": "di" + }, + { + "access": 8, + "descriptor": "I", + "field": "__dw_ab", + "name": "ab", + "owner": "dw" + }, + { + "access": 8, + "descriptor": "I", + "field": "__em_a", + "name": "a", + "owner": "em" + }, + { + "access": 8, + "descriptor": "I", + "field": "__em_ad", + "name": "ad", + "owner": "em" + }, + { + "access": 8, + "descriptor": "Lap;", + "field": "worldMapEvent", + "name": "j", + "owner": "z" + }, + { + "access": 8, + "descriptor": "Lba;", + "field": "gameShell", + "name": "f", + "owner": "ba" + }, + { + "access": 8, + "descriptor": "Lbf;", + "field": "clientPreferences", + "name": "su", + "owner": "lw" + }, + { + "access": 8, + "descriptor": "Lbj;", + "field": "__client_sj", + "name": "sj", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Lbr;", + "field": "localPlayer", + "name": "jk", + "owner": "ao" + }, + { + "access": 8, + "descriptor": "Lbu;", + "field": "mouseRecorder", + "name": "ck", + "owner": "cb" + }, + { + "access": 8, + "descriptor": "Lch;", + "field": "varcs", + "name": "of", + "owner": "gy" + }, + { + "access": 8, + "descriptor": "Lcj;", + "field": "npcAttackOption", + "name": "de", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Lcj;", + "field": "playerAttackOption", + "name": "co", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Lclient;", + "field": "client", + "name": "af", + "owner": "dl" + }, + { + "access": 8, + "descriptor": "Lcn;", + "field": "secureRandomFuture", + "name": "eu", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Lco;", + "field": "pcmPlayer0", + "name": "qu", + "owner": "aw" + }, + { + "access": 8, + "descriptor": "Lco;", + "field": "pcmPlayer1", + "name": "qb", + "owner": "ir" + }, + { + "access": 8, + "descriptor": "Lcs;", + "field": "tempMenuAction", + "name": "lr", + "owner": "d" + }, + { + "access": 8, + "descriptor": "Lct;", + "field": "pcmStreamMixer", + "name": "qr", + "owner": "fz" + }, + { + "access": 8, + "descriptor": "Ldl;", + "field": "textureProvider", + "name": "jn", + "owner": "cn" + }, + { + "access": 8, + "descriptor": "Ldp;", + "field": "decimator", + "name": "qi", + "owner": "fd" + }, + { + "access": 8, + "descriptor": "Ldu;", + "field": "Model_sharedSequenceModel", + "name": "m", + "owner": "du" + }, + { + "access": 8, + "descriptor": "Ldu;", + "field": "Model_sharedSpotAnimationModel", + "name": "q", + "owner": "du" + }, + { + "access": 8, + "descriptor": "Ldx;", + "field": "soundSystem", + "name": "x", + "owner": "cw" + }, + { + "access": 8, + "descriptor": "Lem;", + "field": "scene", + "name": "gf", + "owner": "bl" + }, + { + "access": 8, + "descriptor": "Leo;", + "field": "urlRequester", + "name": "fz", + "owner": "kd" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "Component_cachedFonts", + "name": "a", + "owner": "ho" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "Component_cachedModels", + "name": "i", + "owner": "ho" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "EnumDefinition_cached", + "name": "f", + "owner": "jw" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "FloorUnderlayDefinition_cached", + "name": "f", + "owner": "ih" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "HealthBarDefinition_cachedSprites", + "name": "w", + "owner": "ii" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "HitmarkDefinition_cached", + "name": "w", + "owner": "jm" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "HitmarkDefinition_cachedFonts", + "name": "u", + "owner": "jm" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "ItemDefinition_cached", + "name": "x", + "owner": "jv" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "ItemDefinition_cachedModels", + "name": "d", + "owner": "jv" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "KitDefinition_cached", + "name": "w", + "owner": "im" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "NpcDefinition_cached", + "name": "q", + "owner": "jz" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "NpcDefinition_cachedModels", + "name": "w", + "owner": "jz" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "ObjectDefinition_cached", + "name": "w", + "owner": "jr" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "ObjectDefinition_cachedModels", + "name": "g", + "owner": "jr" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "ParamDefinition_cached", + "name": "f", + "owner": "jb" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "Script_cached", + "name": "m", + "owner": "cg" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "SpotAnimationDefinition_cached", + "name": "q", + "owner": "io" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "SpotAnimationDefinition_cachedModels", + "name": "w", + "owner": "io" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "Sprite_cached", + "name": "k", + "owner": "jv" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "WorldMapElement_cachedSprites", + "name": "w", + "owner": "ic" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "__ho_n", + "name": "n", + "owner": "ho" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "__ho_z", + "name": "z", + "owner": "ho" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "__ib_f", + "name": "f", + "owner": "ib" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "__iw_f", + "name": "f", + "owner": "iw" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "__jm_o", + "name": "o", + "owner": "jm" + }, + { + "access": 8, + "descriptor": "Ler;", + "field": "__jr_u", + "name": "u", + "owner": "jr" + }, + { + "access": 8, + "descriptor": "Ley;", + "field": "__kn_x", + "name": "x", + "owner": "kn" + }, + { + "access": 8, + "descriptor": "Lfa;", + "field": "clock", + "name": "n", + "owner": "fg" + }, + { + "access": 8, + "descriptor": "Lff;", + "field": "masterDisk", + "name": "sc", + "owner": "kz" + }, + { + "access": 8, + "descriptor": "Lfm;", + "field": "js5SocketTask", + "name": "dn", + "owner": "hr" + }, + { + "access": 8, + "descriptor": "Lfm;", + "field": "socketTask", + "name": "fl", + "owner": "fq" + }, + { + "access": 8, + "descriptor": "Lfu;", + "field": "__ji_fp", + "name": "fp", + "owner": "ji" + }, + { + "access": 8, + "descriptor": "Lfu;", + "field": "js5Socket", + "name": "df", + "owner": "cf" + }, + { + "access": 8, + "descriptor": "Lfv;", + "field": "mouseWheel", + "name": "ol", + "owner": "j" + }, + { + "access": 8, + "descriptor": "Lg;", + "field": "grandExchangeEvents", + "name": "sm", + "owner": "do" + }, + { + "access": 8, + "descriptor": "Lgo;", + "field": "gzipDecompressor", + "name": "i", + "owner": "ir" + }, + { + "access": 8, + "descriptor": "Lgr;", + "field": "__cq_a", + "name": "a", + "owner": "cq" + }, + { + "access": 8, + "descriptor": "Lgt;", + "field": "Bzip2Decompressor_state", + "name": "l", + "owner": "gk" + }, + { + "access": 8, + "descriptor": "Lhi;", + "field": "__client_ru", + "name": "ru", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Lho;", + "field": "__client_md", + "name": "md", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Lho;", + "field": "__client_mo", + "name": "mo", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Lho;", + "field": "__dk_lm", + "name": "lm", + "owner": "dk" + }, + { + "access": 8, + "descriptor": "Lho;", + "field": "__ej_jv", + "name": "jv", + "owner": "ej" + }, + { + "access": 8, + "descriptor": "Lho;", + "field": "__fg_jh", + "name": "jh", + "owner": "fg" + }, + { + "access": 8, + "descriptor": "Lho;", + "field": "__n_n", + "name": "n", + "owner": "n" + }, + { + "access": 8, + "descriptor": "Lho;", + "field": "__t_i", + "name": "i", + "owner": "t" + }, + { + "access": 8, + "descriptor": "Lho;", + "field": "clickedComponent", + "name": "mc", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Lho;", + "field": "clickedComponentParent", + "name": "mr", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Lho;", + "field": "dragInventoryComponent", + "name": "jf", + "owner": "az" + }, + { + "access": 8, + "descriptor": "Lho;", + "field": "mousedOverComponentIf1", + "name": "lu", + "owner": "fa" + }, + { + "access": 8, + "descriptor": "Lho;", + "field": "viewportComponent", + "name": "mx", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Lir;", + "field": "FloorFloorUnderlayDefinition_archive", + "name": "m", + "owner": "ih" + }, + { + "access": 8, + "descriptor": "Lir;", + "field": "NpcDefinition_archive", + "name": "m", + "owner": "jz" + }, + { + "access": 8, + "descriptor": "Lir;", + "field": "NpcDefinition_modelArchive", + "name": "f", + "owner": "jz" + }, + { + "access": 8, + "descriptor": "Lir;", + "field": "ObjectDefinition_archive", + "name": "f", + "owner": "jr" + }, + { + "access": 8, + "descriptor": "Lir;", + "field": "VarbitDefinition_archive", + "name": "m", + "owner": "ia" + }, + { + "access": 8, + "descriptor": "Lir;", + "field": "__iw_m", + "name": "m", + "owner": "iw" + }, + { + "access": 8, + "descriptor": "Lir;", + "field": "__jm_f", + "name": "f", + "owner": "jm" + }, + { + "access": 8, + "descriptor": "Lir;", + "field": "__jm_m", + "name": "m", + "owner": "jm" + }, + { + "access": 8, + "descriptor": "Lir;", + "field": "__jm_q", + "name": "q", + "owner": "jm" + }, + { + "access": 8, + "descriptor": "Lir;", + "field": "__jr_q", + "name": "q", + "owner": "jr" + }, + { + "access": 8, + "descriptor": "Lis;", + "field": "studioGame", + "name": "bn", + "owner": "c" + }, + { + "access": 8, + "descriptor": "Lit;", + "field": "__bc_dm", + "name": "dm", + "owner": "bc" + }, + { + "access": 8, + "descriptor": "Lit;", + "field": "__gu_et", + "name": "et", + "owner": "gu" + }, + { + "access": 8, + "descriptor": "Lit;", + "field": "__s_dq", + "name": "dq", + "owner": "s" + }, + { + "access": 8, + "descriptor": "Lit;", + "field": "archive0", + "name": "di", + "owner": "ir" + }, + { + "access": 8, + "descriptor": "Lit;", + "field": "archive1", + "name": "dc", + "owner": "ek" + }, + { + "access": 8, + "descriptor": "Lit;", + "field": "archive10", + "name": "dv", + "owner": "j" + }, + { + "access": 8, + "descriptor": "Lit;", + "field": "archive11", + "name": "do", + "owner": "cu" + }, + { + "access": 8, + "descriptor": "Lit;", + "field": "archive12", + "name": "dh", + "owner": "cy" + }, + { + "access": 8, + "descriptor": "Lit;", + "field": "archive13", + "name": "dz", + "owner": "gi" + }, + { + "access": 8, + "descriptor": "Lit;", + "field": "archive14", + "name": "dj", + "owner": "q" + }, + { + "access": 8, + "descriptor": "Lit;", + "field": "archive15", + "name": "du", + "owner": "as" + }, + { + "access": 8, + "descriptor": "Lit;", + "field": "archive16", + "name": "eb", + "owner": "c" + }, + { + "access": 8, + "descriptor": "Lit;", + "field": "archive2", + "name": "dg", + "owner": "be" + }, + { + "access": 8, + "descriptor": "Lit;", + "field": "archive3", + "name": "db", + "owner": "t" + }, + { + "access": 8, + "descriptor": "Lit;", + "field": "archive4", + "name": "dd", + "owner": "v" + }, + { + "access": 8, + "descriptor": "Lit;", + "field": "archive5", + "name": "dy", + "owner": "cn" + }, + { + "access": 8, + "descriptor": "Lit;", + "field": "archive6", + "name": "dk", + "owner": "fq" + }, + { + "access": 8, + "descriptor": "Lit;", + "field": "archive7", + "name": "dl", + "owner": "ad" + }, + { + "access": 8, + "descriptor": "Lit;", + "field": "archive8", + "name": "dr", + "owner": "p" + }, + { + "access": 8, + "descriptor": "Lit;", + "field": "archive9", + "name": "dw", + "owner": "il" + }, + { + "access": 8, + "descriptor": "Liy;", + "field": "serverBuild", + "name": "bs", + "owner": "z" + }, + { + "access": 8, + "descriptor": "Ljava/awt/Font;", + "field": "__hb_av", + "name": "av", + "owner": "hb" + }, + { + "access": 8, + "descriptor": "Ljava/awt/FontMetrics;", + "field": "__bo_ar", + "name": "ar", + "owner": "bo" + }, + { + "access": 8, + "descriptor": "Ljava/awt/Image;", + "field": "__ij_ak", + "name": "ak", + "owner": "ij" + }, + { + "access": 8, + "descriptor": "Ljava/lang/Object;", + "field": "ArchiveDiskActionHandler_lock", + "name": "w", + "owner": "iv" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "Formatting_colorEndTag", + "name": "l", + "owner": "cy" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "Formatting_comma", + "name": "f", + "owner": "cy" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "Formatting_lineBreakTag", + "name": "g", + "owner": "cy" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "Formatting_pipe", + "name": "q", + "owner": "cy" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "Formatting_rightArrow", + "name": "u", + "owner": "cy" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "Formatting_rightParenthesis", + "name": "o", + "owner": "cy" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "Formatting_spaceLeftParenthesis", + "name": "w", + "owner": "cy" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "Formatting_true", + "name": "m", + "owner": "cy" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "Login_loadingText", + "name": "c", + "owner": "cu" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "Login_password", + "name": "ap", + "owner": "cu" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "Login_response0", + "name": "al", + "owner": "cu" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "Login_response1", + "name": "ab", + "owner": "cu" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "Login_response2", + "name": "ae", + "owner": "cu" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "Login_response3", + "name": "at", + "owner": "cu" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "Login_username", + "name": "ad", + "owner": "cu" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "__b_by", + "name": "by", + "owner": "b" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "__cj_ay", + "name": "ay", + "owner": "cj" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "__client_pz", + "name": "pz", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "__cu_ai", + "name": "ai", + "owner": "cu" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "__cu_bq", + "name": "bq", + "owner": "cu" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "__cu_bs", + "name": "bs", + "owner": "cu" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "__id_ab", + "name": "ab", + "owner": "id" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "selectedItemName", + "name": "it", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "selectedSpellActionName", + "name": "mk", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "selectedSpellName", + "name": "mu", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "worldHost", + "name": "ei", + "owner": "af" + }, + { + "access": 8, + "descriptor": "Ljava/lang/String;", + "field": "worldsUrl", + "name": "bx", + "owner": "iy" + }, + { + "access": 8, + "descriptor": "Ljava/lang/Thread;", + "field": "ArchiveDiskActionHandler_thread", + "name": "o", + "owner": "en" + }, + { + "access": 8, + "descriptor": "Ljava/lang/management/GarbageCollectorMXBean;", + "field": "garbageCollector", + "name": "au", + "owner": "ir" + }, + { + "access": 8, + "descriptor": "Ljava/security/SecureRandom;", + "field": "secureRandom", + "name": "ec", + "owner": "t" + }, + { + "access": 8, + "descriptor": "Ljava/util/ArrayList;", + "field": "archiveLoaders", + "name": "sy", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Ljava/util/Calendar;", + "field": "Interpreter_calendar", + "name": "a", + "owner": "bv" + }, + { + "access": 8, + "descriptor": "Ljava/util/Calendar;", + "field": "__hg_q", + "name": "q", + "owner": "hg" + }, + { + "access": 8, + "descriptor": "Ljava/util/HashMap;", + "field": "fontsMap", + "name": "ft", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Ljava/util/Hashtable;", + "field": "__fo_q", + "name": "q", + "owner": "fo" + }, + { + "access": 8, + "descriptor": "Ljava/util/Random;", + "field": "AbstractFont_random", + "name": "h", + "owner": "kt" + }, + { + "access": 8, + "descriptor": "Ljava/util/concurrent/ScheduledExecutorService;", + "field": "soundSystemExecutor", + "name": "l", + "owner": "kq" + }, + { + "access": 8, + "descriptor": "Ljava/util/zip/CRC32;", + "field": "Archive_crc", + "name": "aj", + "owner": "it" + }, + { + "access": 8, + "descriptor": "Lje;", + "field": "ArchiveDiskActionHandler_requestQueue", + "name": "m", + "owner": "iv" + }, + { + "access": 8, + "descriptor": "Lje;", + "field": "ArchiveDiskActionHandler_responseQueue", + "name": "f", + "owner": "iv" + }, + { + "access": 8, + "descriptor": "Lje;", + "field": "Scene_tilesDeque", + "name": "az", + "owner": "em" + }, + { + "access": 8, + "descriptor": "Lje;", + "field": "__client_kh", + "name": "kh", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Lje;", + "field": "__client_oc", + "name": "oc", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Lje;", + "field": "__client_oh", + "name": "oh", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Lje;", + "field": "graphicsObjects", + "name": "kt", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Lje;", + "field": "objectSounds", + "name": "m", + "owner": "be" + }, + { + "access": 8, + "descriptor": "Lje;", + "field": "projectiles", + "name": "kk", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Lje;", + "field": "scriptEvents", + "name": "og", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Ljo;", + "field": "timer", + "name": "fm", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Lkk;", + "field": "fontBold12", + "name": "fo", + "owner": "q" + }, + { + "access": 8, + "descriptor": "Lkk;", + "field": "fontPlain11", + "name": "fv", + "owner": "by" + }, + { + "access": 8, + "descriptor": "Lkk;", + "field": "fontPlain12", + "name": "fu", + "owner": "az" + }, + { + "access": 8, + "descriptor": "Lkv;", + "field": "clanChat", + "name": "pg", + "owner": "cl" + }, + { + "access": 8, + "descriptor": "Lkz;", + "field": "fonts", + "name": "fs", + "owner": "ic" + }, + { + "access": 8, + "descriptor": "Lla;", + "field": "__eb_ah", + "name": "ah", + "owner": "eb" + }, + { + "access": 8, + "descriptor": "Lla;", + "field": "__eo_ak", + "name": "ak", + "owner": "eo" + }, + { + "access": 8, + "descriptor": "Llb;", + "field": "platformInfo", + "name": "st", + "owner": "s" + }, + { + "access": 8, + "descriptor": "Lld;", + "field": "componentClickMasks", + "name": "on", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Lld;", + "field": "interfaceParents", + "name": "mj", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Lld;", + "field": "itemContainers", + "name": "m", + "owner": "bc" + }, + { + "access": 8, + "descriptor": "Llg;", + "field": "spriteIds", + "name": "em", + "owner": "hg" + }, + { + "access": 8, + "descriptor": "Llm;", + "field": "platformInfoProvider", + "name": "sk", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Lln;", + "field": "__cu_g", + "name": "g", + "owner": "cu" + }, + { + "access": 8, + "descriptor": "Lln;", + "field": "__d_gz", + "name": "gz", + "owner": "d" + }, + { + "access": 8, + "descriptor": "Lln;", + "field": "__el_gm", + "name": "gm", + "owner": "el" + }, + { + "access": 8, + "descriptor": "Lln;", + "field": "__kz_l", + "name": "l", + "owner": "kz" + }, + { + "access": 8, + "descriptor": "Lln;", + "field": "sceneMinimapSprite", + "name": "px", + "owner": "bx" + }, + { + "access": 8, + "descriptor": "Llq;", + "field": "__an_i", + "name": "i", + "owner": "an" + }, + { + "access": 8, + "descriptor": "Llq;", + "field": "__bd_u", + "name": "u", + "owner": "bd" + }, + { + "access": 8, + "descriptor": "Llq;", + "field": "__bw_k", + "name": "k", + "owner": "bw" + }, + { + "access": 8, + "descriptor": "Llq;", + "field": "__cn_bu", + "name": "bu", + "owner": "cn" + }, + { + "access": 8, + "descriptor": "Llq;", + "field": "__cu_d", + "name": "d", + "owner": "cu" + }, + { + "access": 8, + "descriptor": "Llq;", + "field": "__cu_o", + "name": "o", + "owner": "cu" + }, + { + "access": 8, + "descriptor": "Llq;", + "field": "__fb_bm", + "name": "bm", + "owner": "fb" + }, + { + "access": 8, + "descriptor": "Llq;", + "field": "__h_e", + "name": "e", + "owner": "h" + }, + { + "access": 8, + "descriptor": "Llq;", + "field": "__jn_by", + "name": "by", + "owner": "jn" + }, + { + "access": 8, + "descriptor": "Llq;", + "field": "__kw_n", + "name": "n", + "owner": "kw" + }, + { + "access": 8, + "descriptor": "Llx;", + "field": "loginType", + "name": "bk", + "owner": "an" + }, + { + "access": 8, + "descriptor": "Llz;", + "field": "worldMap0", + "name": "sz", + "owner": "bo" + }, + { + "access": 8, + "descriptor": "S", + "field": "__client_rb", + "name": "rb", + "owner": "client" + }, + { + "access": 8, + "descriptor": "S", + "field": "__client_re", + "name": "re", + "owner": "client" + }, + { + "access": 8, + "descriptor": "S", + "field": "__client_ri", + "name": "ri", + "owner": "client" + }, + { + "access": 8, + "descriptor": "S", + "field": "__client_rm", + "name": "rm", + "owner": "client" + }, + { + "access": 8, + "descriptor": "S", + "field": "__client_rp", + "name": "rp", + "owner": "client" + }, + { + "access": 8, + "descriptor": "S", + "field": "__client_rs", + "name": "rs", + "owner": "client" + }, + { + "access": 8, + "descriptor": "S", + "field": "__client_rv", + "name": "rv", + "owner": "client" + }, + { + "access": 8, + "descriptor": "S", + "field": "__client_rw", + "name": "rw", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "Login_isUsernameRemembered", + "name": "ew", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "ObjectDefinition_isLowDetail", + "name": "m", + "owner": "jr" + }, + { + "access": 8, + "descriptor": "Z", + "field": "Rasterizer3D_isLowDetailTexture", + "name": "q", + "owner": "et" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__bv_s", + "name": "s", + "owner": "bv" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__bv_t", + "name": "t", + "owner": "bv" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__cd_s", + "name": "s", + "owner": "cd" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__client_ai", + "name": "ai", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__client_bl", + "name": "bl", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__client_cw", + "name": "cw", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__client_fh", + "name": "fh", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__client_hh", + "name": "hh", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__client_ij", + "name": "ij", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__client_is", + "name": "is", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__client_jl", + "name": "jl", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__client_nn", + "name": "nn", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__client_nt", + "name": "nt", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__client_qq", + "name": "qq", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__cu_aa", + "name": "aa", + "owner": "cu" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__cu_ax", + "name": "ax", + "owner": "cu" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__cu_ba", + "name": "ba", + "owner": "cu" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__cu_bk", + "name": "bk", + "owner": "cu" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__cu_f", + "name": "f", + "owner": "cu" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__dq_pe", + "name": "pe", + "owner": "dq" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__du_bx", + "name": "bx", + "owner": "du" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__em_ab", + "name": "ab", + "owner": "em" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__em_ac", + "name": "ac", + "owner": "em" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__et_f", + "name": "f", + "owner": "et" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__et_m", + "name": "m", + "owner": "et" + }, + { + "access": 8, + "descriptor": "Z", + "field": "__lp_ca", + "name": "ca", + "owner": "lp" + }, + { + "access": 8, + "descriptor": "Z", + "field": "directBufferUnavailable", + "name": "f", + "owner": "gu" + }, + { + "access": 8, + "descriptor": "Z", + "field": "displayFps", + "name": "cg", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "followerOpsLowPriority", + "name": "lw", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "isCameraLocked", + "name": "qz", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "isDraggingComponent", + "name": "ny", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "isInInstance", + "name": "gg", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "isKilled", + "name": "u", + "owner": "ba" + }, + { + "access": 8, + "descriptor": "Z", + "field": "isLoading", + "name": "cj", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "isLowDetail", + "name": "bc", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "isMenuOpen", + "name": "kc", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "isResizable", + "name": "or", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "isSpellSelected", + "name": "lv", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "playerMod", + "name": "mn", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "renderSelf", + "name": "js", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "shiftClickDrop", + "name": "lf", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "showLoadingMessages", + "name": "jj", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "showMouseCross", + "name": "jr", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "showMouseOverText", + "name": "lj", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "tapToDrop", + "name": "lp", + "owner": "client" + }, + { + "access": 8, + "descriptor": "Z", + "field": "useBufferedSocket", + "name": "fx", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[B", + "field": "ArchiveDisk_buffer", + "name": "m", + "owner": "ff" + }, + { + "access": 8, + "descriptor": "[B", + "field": "Model_sharedSequenceModelFaceAlphas", + "name": "f", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[B", + "field": "Model_sharedSpotAnimationModelFaceAlphas", + "name": "w", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[B", + "field": "__cd_g", + "name": "g", + "owner": "cd" + }, + { + "access": 8, + "descriptor": "[B", + "field": "__client_ev", + "name": "ev", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[B", + "field": "__cq_q", + "name": "q", + "owner": "cq" + }, + { + "access": 8, + "descriptor": "[B", + "field": "__cq_w", + "name": "w", + "owner": "cq" + }, + { + "access": 8, + "descriptor": "[C", + "field": "__an_cg", + "name": "cg", + "owner": "an" + }, + { + "access": 8, + "descriptor": "[C", + "field": "__kc_f", + "name": "f", + "owner": "kc" + }, + { + "access": 8, + "descriptor": "[C", + "field": "__kc_q", + "name": "q", + "owner": "kc" + }, + { + "access": 8, + "descriptor": "[F", + "field": "__cd_ag", + "name": "ag", + "owner": "cd" + }, + { + "access": 8, + "descriptor": "[F", + "field": "__cd_aj", + "name": "aj", + "owner": "cd" + }, + { + "access": 8, + "descriptor": "[F", + "field": "__cd_aq", + "name": "aq", + "owner": "cd" + }, + { + "access": 8, + "descriptor": "[F", + "field": "__cd_c", + "name": "c", + "owner": "cd" + }, + { + "access": 8, + "descriptor": "[F", + "field": "__cd_p", + "name": "p", + "owner": "cd" + }, + { + "access": 8, + "descriptor": "[F", + "field": "__cd_r", + "name": "r", + "owner": "cd" + }, + { + "access": 8, + "descriptor": "[F", + "field": "__cd_v", + "name": "v", + "owner": "cd" + }, + { + "access": 8, + "descriptor": "[I", + "field": "Instrument_delays", + "name": "c", + "owner": "db" + }, + { + "access": 8, + "descriptor": "[I", + "field": "Instrument_noise", + "name": "t", + "owner": "db" + }, + { + "access": 8, + "descriptor": "[I", + "field": "Instrument_phases", + "name": "b", + "owner": "db" + }, + { + "access": 8, + "descriptor": "[I", + "field": "Instrument_pitchBaseSteps", + "name": "v", + "owner": "db" + }, + { + "access": 8, + "descriptor": "[I", + "field": "Instrument_pitchSteps", + "name": "p", + "owner": "db" + }, + { + "access": 8, + "descriptor": "[I", + "field": "Instrument_samples", + "name": "s", + "owner": "db" + }, + { + "access": 8, + "descriptor": "[I", + "field": "Instrument_sine", + "name": "y", + "owner": "db" + }, + { + "access": 8, + "descriptor": "[I", + "field": "Instrument_volumeSteps", + "name": "r", + "owner": "db" + }, + { + "access": 8, + "descriptor": "[I", + "field": "Interpreter_arrayLengths", + "name": "o", + "owner": "bv" + }, + { + "access": 8, + "descriptor": "[I", + "field": "Interpreter_intLocals", + "name": "q", + "owner": "kp" + }, + { + "access": 8, + "descriptor": "[I", + "field": "Interpreter_intStack", + "name": "g", + "owner": "bv" + }, + { + "access": 8, + "descriptor": "[I", + "field": "KeyHandler_keyCodes", + "name": "cd", + "owner": "an" + }, + { + "access": 8, + "descriptor": "[I", + "field": "ModelData_cosine", + "name": "at", + "owner": "dw" + }, + { + "access": 8, + "descriptor": "[I", + "field": "ModelData_sine", + "name": "ae", + "owner": "dw" + }, + { + "access": 8, + "descriptor": "[I", + "field": "Model_cosine", + "name": "bl", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[I", + "field": "Model_sine", + "name": "bm", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[I", + "field": "Players_indices", + "name": "g", + "owner": "cq" + }, + { + "access": 8, + "descriptor": "[I", + "field": "Players_orientations", + "name": "d", + "owner": "cq" + }, + { + "access": 8, + "descriptor": "[I", + "field": "Players_regions", + "name": "x", + "owner": "cq" + }, + { + "access": 8, + "descriptor": "[I", + "field": "Players_targetIndices", + "name": "k", + "owner": "cq" + }, + { + "access": 8, + "descriptor": "[I", + "field": "Rasterizer3D_rowOffsets", + "name": "h", + "owner": "et" + }, + { + "access": 8, + "descriptor": "[I", + "field": "Scene_planeOccluderCounts", + "name": "ap", + "owner": "em" + }, + { + "access": 8, + "descriptor": "[I", + "field": "Texture_animatedPixels", + "name": "a", + "owner": "dh" + }, + { + "access": 8, + "descriptor": "[I", + "field": "Varps_masks", + "name": "m", + "owner": "hv" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__ah_l", + "name": "l", + "owner": "ah" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__an_cf", + "name": "cf", + "owner": "an" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__an_cq", + "name": "cq", + "owner": "an" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__bk_g", + "name": "g", + "owner": "bk" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__bm_i", + "name": "i", + "owner": "bm" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__bt_e", + "name": "e", + "owner": "bt" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__bt_l", + "name": "l", + "owner": "bt" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__ca_d", + "name": "d", + "owner": "ca" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__ca_x", + "name": "x", + "owner": "ca" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__cd_ar", + "name": "ar", + "owner": "cd" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__cd_av", + "name": "av", + "owner": "cd" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__cd_j", + "name": "j", + "owner": "cd" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__client_fg", + "name": "fg", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__client_kd", + "name": "kd", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__client_kn", + "name": "kn", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__client_nf", + "name": "nf", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__client_nr", + "name": "nr", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__client_nz", + "name": "nz", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__client_pn", + "name": "pn", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__client_pq", + "name": "pq", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__client_pv", + "name": "pv", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__client_qd", + "name": "qd", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__client_qk", + "name": "qk", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__client_qn", + "name": "qn", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__client_rd", + "name": "rd", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__client_rj", + "name": "rj", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__client_rk", + "name": "rk", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__client_rl", + "name": "rl", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__client_th", + "name": "th", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__client_tp", + "name": "tp", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__cq_e", + "name": "e", + "owner": "cq" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__cq_i", + "name": "i", + "owner": "cq" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__cy_d", + "name": "d", + "owner": "cy" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__du_aa", + "name": "aa", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__du_af", + "name": "af", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__du_am", + "name": "am", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__du_an", + "name": "an", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__du_au", + "name": "au", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__du_az", + "name": "az", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__du_ba", + "name": "ba", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__du_bb", + "name": "bb", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__du_bj", + "name": "bj", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__du_bk", + "name": "bk", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__du_bn", + "name": "bn", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__du_bq", + "name": "bq", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__du_br", + "name": "br", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__du_bs", + "name": "bs", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__dv_j", + "name": "j", + "owner": "dv" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__dv_s", + "name": "s", + "owner": "dv" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__dv_t", + "name": "t", + "owner": "dv" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__dv_y", + "name": "y", + "owner": "dv" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__dv_z", + "name": "z", + "owner": "dv" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__dw_al", + "name": "al", + "owner": "dw" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__dw_aw", + "name": "aw", + "owner": "dw" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__dz_f", + "name": "f", + "owner": "dz" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__dz_m", + "name": "m", + "owner": "dz" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__dz_q", + "name": "q", + "owner": "dz" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__dz_w", + "name": "w", + "owner": "dz" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__et_p", + "name": "p", + "owner": "et" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__et_r", + "name": "r", + "owner": "et" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__fi_e", + "name": "e", + "owner": "fi" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__fi_l", + "name": "l", + "owner": "fi" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__gi_g", + "name": "g", + "owner": "gi" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__gr_q", + "name": "q", + "owner": "gr" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__h_n", + "name": "n", + "owner": "h" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__hc_ef", + "name": "ef", + "owner": "hc" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__hf_k", + "name": "k", + "owner": "hf" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__i_x", + "name": "x", + "owner": "i" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__ia_u", + "name": "u", + "owner": "ia" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__iu_e", + "name": "e", + "owner": "iu" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__kc_w", + "name": "w", + "owner": "kc" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__lr_l", + "name": "l", + "owner": "lr" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__lr_o", + "name": "o", + "owner": "lr" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__lr_w", + "name": "w", + "owner": "lr" + }, + { + "access": 8, + "descriptor": "[I", + "field": "__y_p", + "name": "p", + "owner": "y" + }, + { + "access": 8, + "descriptor": "[I", + "field": "currentLevels", + "name": "ki", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "experience", + "name": "kb", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "levels", + "name": "kr", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "mapIconXs", + "name": "ps", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "mapIconYs", + "name": "pw", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "menuArguments0", + "name": "lk", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "menuArguments1", + "name": "ly", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "menuArguments2", + "name": "li", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "menuOpcodes", + "name": "lh", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "modelViewportXs", + "name": "ap", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[I", + "field": "modelViewportYs", + "name": "as", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[I", + "field": "npcIndices", + "name": "fq", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "overheadTextAscents", + "name": "ip", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "overheadTextColors", + "name": "ic", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "overheadTextCyclesRemaining", + "name": "io", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "overheadTextEffects", + "name": "iw", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "overheadTextXOffsets", + "name": "ib", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "overheadTextXs", + "name": "iq", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "overheadTextYs", + "name": "iu", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "regionLandArchiveIds", + "name": "gb", + "owner": "bb" + }, + { + "access": 8, + "descriptor": "[I", + "field": "regionMapArchiveIds", + "name": "gw", + "owner": "bd" + }, + { + "access": 8, + "descriptor": "[I", + "field": "regions", + "name": "gn", + "owner": "kw" + }, + { + "access": 8, + "descriptor": "[I", + "field": "rootComponentHeights", + "name": "ox", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "rootComponentWidths", + "name": "oj", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "rootComponentXs", + "name": "oy", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "rootComponentYs", + "name": "oi", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[I", + "field": "soundEffectIds", + "name": "qv", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[J", + "field": "__ba_a", + "name": "a", + "owner": "ba" + }, + { + "access": 8, + "descriptor": "[J", + "field": "__ba_j", + "name": "j", + "owner": "ba" + }, + { + "access": 8, + "descriptor": "[J", + "field": "__client_pu", + "name": "pu", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[J", + "field": "__gr_o", + "name": "o", + "owner": "gr" + }, + { + "access": 8, + "descriptor": "[Lbn;", + "field": "Interpreter_frames", + "name": "k", + "owner": "bv" + }, + { + "access": 8, + "descriptor": "[Lbr;", + "field": "players", + "name": "jd", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[Lbt;", + "field": "worlds", + "name": "o", + "owner": "bc" + }, + { + "access": 8, + "descriptor": "[Lci;", + "field": "soundEffects", + "name": "qe", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[Lcv;", + "field": "npcs", + "name": "ez", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[Ldw;", + "field": "__jr_l", + "name": "l", + "owner": "jr" + }, + { + "access": 8, + "descriptor": "[Lee;", + "field": "Scene_currentOccluders", + "name": "an", + "owner": "em" + }, + { + "access": 8, + "descriptor": "[Leh;", + "field": "gameObjects", + "name": "ar", + "owner": "em" + }, + { + "access": 8, + "descriptor": "[Lfy;", + "field": "collisionMaps", + "name": "w", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[Lgr;", + "field": "__cq_o", + "name": "o", + "owner": "cq" + }, + { + "access": 8, + "descriptor": "[Lho;", + "field": "__jx_ne", + "name": "ne", + "owner": "jx" + }, + { + "access": 8, + "descriptor": "[Ljava/lang/String;", + "field": "AbstractFont_lines", + "name": "b", + "owner": "kt" + }, + { + "access": 8, + "descriptor": "[Ljava/lang/String;", + "field": "Interpreter_stringLocals", + "name": "w", + "owner": "bv" + }, + { + "access": 8, + "descriptor": "[Ljava/lang/String;", + "field": "Interpreter_stringStack", + "name": "e", + "owner": "bv" + }, + { + "access": 8, + "descriptor": "[Ljava/lang/String;", + "field": "menuActions", + "name": "ld", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[Ljava/lang/String;", + "field": "menuTargetNames", + "name": "la", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[Ljava/lang/String;", + "field": "overheadText", + "name": "ih", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[Ljava/lang/String;", + "field": "playerMenuActions", + "name": "kq", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[Lln;", + "field": "__ar_bd", + "name": "bd", + "owner": "ar" + }, + { + "access": 8, + "descriptor": "[Lln;", + "field": "crossSprites", + "name": "gx", + "owner": "an" + }, + { + "access": 8, + "descriptor": "[Lln;", + "field": "headIconHintSprites", + "name": "gi", + "owner": "br" + }, + { + "access": 8, + "descriptor": "[Lln;", + "field": "headIconPkSprites", + "name": "gt", + "owner": "z" + }, + { + "access": 8, + "descriptor": "[Lln;", + "field": "headIconPrayerSprites", + "name": "gr", + "owner": "bf" + }, + { + "access": 8, + "descriptor": "[Lln;", + "field": "mapDotSprites", + "name": "gu", + "owner": "at" + }, + { + "access": 8, + "descriptor": "[Lln;", + "field": "mapIcons", + "name": "po", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[Lln;", + "field": "mapMarkerSprites", + "name": "ga", + "owner": "j" + }, + { + "access": 8, + "descriptor": "[Llq;", + "field": "__an_x", + "name": "x", + "owner": "an" + }, + { + "access": 8, + "descriptor": "[Llq;", + "field": "__ap_w", + "name": "w", + "owner": "ap" + }, + { + "access": 8, + "descriptor": "[Llq;", + "field": "__cj_bo", + "name": "bo", + "owner": "cj" + }, + { + "access": 8, + "descriptor": "[Llq;", + "field": "__en_bc", + "name": "bc", + "owner": "en" + }, + { + "access": 8, + "descriptor": "[Llq;", + "field": "__ey_bx", + "name": "bx", + "owner": "ey" + }, + { + "access": 8, + "descriptor": "[Llq;", + "field": "mapSceneSprites", + "name": "gv", + "owner": "gq" + }, + { + "access": 8, + "descriptor": "[Llq;", + "field": "modIconSprites", + "name": "gc", + "owner": "h" + }, + { + "access": 8, + "descriptor": "[Llq;", + "field": "scrollBarSprites", + "name": "gj", + "owner": "ay" + }, + { + "access": 8, + "descriptor": "[Lx;", + "field": "grandExchangeOffers", + "name": "sb", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[S", + "field": "__cj_sp", + "name": "sp", + "owner": "cj" + }, + { + "access": 8, + "descriptor": "[Z", + "field": "__ca_k", + "name": "k", + "owner": "ca" + }, + { + "access": 8, + "descriptor": "[Z", + "field": "__cd_z", + "name": "z", + "owner": "cd" + }, + { + "access": 8, + "descriptor": "[Z", + "field": "__client_kv", + "name": "kv", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[Z", + "field": "__client_od", + "name": "od", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[Z", + "field": "__client_oq", + "name": "oq", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[Z", + "field": "__client_ot", + "name": "ot", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[Z", + "field": "__client_rh", + "name": "rh", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[Z", + "field": "__du_ad", + "name": "ad", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[Z", + "field": "__du_at", + "name": "at", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[Z", + "field": "menuShiftClick", + "name": "lt", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[[B", + "field": "ByteArrayPool_large", + "name": "u", + "owner": "gi" + }, + { + "access": 8, + "descriptor": "[[B", + "field": "ByteArrayPool_medium", + "name": "o", + "owner": "gi" + }, + { + "access": 8, + "descriptor": "[[B", + "field": "ByteArrayPool_small", + "name": "w", + "owner": "gi" + }, + { + "access": 8, + "descriptor": "[[B", + "field": "__lr_e", + "name": "e", + "owner": "lr" + }, + { + "access": 8, + "descriptor": "[[B", + "field": "regionLandArchives", + "name": "gs", + "owner": "ad" + }, + { + "access": 8, + "descriptor": "[[B", + "field": "regionMapArchives", + "name": "gl", + "owner": "bg" + }, + { + "access": 8, + "descriptor": "[[F", + "field": "__di_u", + "name": "u", + "owner": "di" + }, + { + "access": 8, + "descriptor": "[[I", + "field": "Interpreter_arrays", + "name": "u", + "owner": "bv" + }, + { + "access": 8, + "descriptor": "[[I", + "field": "__di_g", + "name": "g", + "owner": "di" + }, + { + "access": 8, + "descriptor": "[[I", + "field": "__du_ai", + "name": "ai", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[[I", + "field": "__du_ax", + "name": "ax", + "owner": "du" + }, + { + "access": 8, + "descriptor": "[[I", + "field": "__fi_q", + "name": "q", + "owner": "fi" + }, + { + "access": 8, + "descriptor": "[[I", + "field": "__fi_w", + "name": "w", + "owner": "fi" + }, + { + "access": 8, + "descriptor": "[[I", + "field": "__gd_e", + "name": "e", + "owner": "gd" + }, + { + "access": 8, + "descriptor": "[[I", + "field": "tileLastDrawnActor", + "name": "im", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[[I", + "field": "xteaKeys", + "name": "ge", + "owner": "gf" + }, + { + "access": 8, + "descriptor": "[[Lee;", + "field": "Scene_planeOccluders", + "name": "as", + "owner": "em" + }, + { + "access": 8, + "descriptor": "[[Z", + "field": "visibleTiles", + "name": "bo", + "owner": "em" + }, + { + "access": 8, + "descriptor": "[[[B", + "field": "Tiles_renderFlags", + "name": "f", + "owner": "bq" + }, + { + "access": 8, + "descriptor": "[[[B", + "field": "__ay_u", + "name": "u", + "owner": "ay" + }, + { + "access": 8, + "descriptor": "[[[B", + "field": "__bq_l", + "name": "l", + "owner": "bq" + }, + { + "access": 8, + "descriptor": "[[[B", + "field": "__bq_w", + "name": "w", + "owner": "bq" + }, + { + "access": 8, + "descriptor": "[[[B", + "field": "__fe_e", + "name": "e", + "owner": "fe" + }, + { + "access": 8, + "descriptor": "[[[B", + "field": "__kc_g", + "name": "g", + "owner": "kc" + }, + { + "access": 8, + "descriptor": "[[[B", + "field": "__kz_o", + "name": "o", + "owner": "kz" + }, + { + "access": 8, + "descriptor": "[[[I", + "field": "Tiles_heights", + "name": "m", + "owner": "bq" + }, + { + "access": 8, + "descriptor": "[[[I", + "field": "__bq_a", + "name": "a", + "owner": "bq" + }, + { + "access": 8, + "descriptor": "[[[I", + "field": "instanceChunkTemplates", + "name": "gq", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[[[Lje;", + "field": "groundItems", + "name": "kz", + "owner": "client" + }, + { + "access": 8, + "descriptor": "[[[[Z", + "field": "visibilityMap", + "name": "bc", + "owner": "em" + }, + { + "access": 9, + "decoder": -1063713523, + "descriptor": "I", + "field": "__client_il", + "name": "il", + "owner": "client" + }, + { + "access": 9, + "decoder": -112939189, + "descriptor": "I", + "field": "WorldMapElement_count", + "name": "q", + "owner": "ev" + }, + { + "access": 9, + "decoder": -1141619871, + "descriptor": "I", + "field": "NetCache_ioExceptions", + "name": "r", + "owner": "iq" + }, + { + "access": 9, + "decoder": -1404585009, + "descriptor": "I", + "field": "NetCache_crcMismatches", + "name": "c", + "owner": "iq" + }, + { + "access": 9, + "decoder": -1536028937, + "descriptor": "I", + "field": "__aj_e", + "name": "e", + "owner": "aj" + }, + { + "access": 9, + "decoder": -1583654139, + "descriptor": "I", + "field": "__gg_u", + "name": "u", + "owner": "gg" + }, + { + "access": 9, + "decoder": -1592359229, + "descriptor": "I", + "field": "NetCache_pendingWritesCount", + "name": "x", + "owner": "iq" + }, + { + "access": 9, + "decoder": -1627751389, + "descriptor": "I", + "field": "NetCache_pendingResponsesCount", + "name": "k", + "owner": "iq" + }, + { + "access": 9, + "decoder": -1753937079, + "descriptor": "I", + "field": "__ik_cn", + "name": "cn", + "owner": "ik" + }, + { + "access": 9, + "decoder": -1853704165, + "descriptor": "I", + "field": "MouseHandler_lastPressedX", + "name": "t", + "owner": "bb" + }, + { + "access": 9, + "decoder": -18917723, + "descriptor": "I", + "field": "musicTrackGroupId", + "name": "g", + "owner": "ar" + }, + { + "access": 9, + "decoder": -2044247305, + "descriptor": "I", + "field": "MouseHandler_currentButton", + "name": "d", + "owner": "bb" + }, + { + "access": 9, + "decoder": -2051451755, + "descriptor": "I", + "field": "idxCount", + "name": "u", + "owner": "fs" + }, + { + "access": 9, + "decoder": -2140977119, + "descriptor": "I", + "field": "ViewportMouse_entityCount", + "name": "i", + "owner": "dm" + }, + { + "access": 9, + "decoder": -451622431, + "descriptor": "I", + "field": "__client_ss", + "name": "ss", + "owner": "client" + }, + { + "access": 9, + "decoder": -4580427166942649300, + "descriptor": "J", + "field": "__iq_q", + "name": "q", + "owner": "iq" + }, + { + "access": 9, + "decoder": -649043937, + "descriptor": "I", + "field": "MouseHandler_x", + "name": "k", + "owner": "bb" + }, + { + "access": 9, + "decoder": -674534717, + "descriptor": "I", + "field": "__an_cl", + "name": "cl", + "owner": "an" + }, + { + "access": 9, + "decoder": -7587574528523107000, + "descriptor": "J", + "field": "MouseHandler_millis", + "name": "n", + "owner": "bb" + }, + { + "access": 9, + "decoder": -787495321, + "descriptor": "I", + "field": "revision", + "name": "q", + "owner": "fx" + }, + { + "access": 9, + "decoder": -812708185, + "descriptor": "I", + "field": "musicTrackFileId", + "name": "l", + "owner": "x" + }, + { + "access": 9, + "decoder": -842662451, + "descriptor": "I", + "field": "canvasHeight", + "name": "p", + "owner": "gd" + }, + { + "access": 9, + "decoder": -848833001, + "descriptor": "I", + "field": "__hf_o", + "name": "o", + "owner": "hf" + }, + { + "access": 9, + "decoder": 121013503, + "descriptor": "I", + "field": "__fx_w", + "name": "w", + "owner": "fx" + }, + { + "access": 9, + "decoder": 1291011547, + "descriptor": "I", + "field": "MouseHandler_y", + "name": "x", + "owner": "bb" + }, + { + "access": 9, + "decoder": 1412639841, + "descriptor": "I", + "field": "worldId", + "name": "ba", + "owner": "client" + }, + { + "access": 9, + "decoder": 147524751, + "descriptor": "I", + "field": "PcmPlayer_sampleRate", + "name": "o", + "owner": "kl" + }, + { + "access": 9, + "decoder": 1495729287, + "descriptor": "I", + "field": "NetCache_pendingPriorityWritesCount", + "name": "o", + "owner": "iq" + }, + { + "access": 9, + "decoder": 1535565231, + "descriptor": "I", + "field": "ViewportMouse_y", + "name": "q", + "owner": "dm" + }, + { + "access": 9, + "decoder": 1784515731, + "descriptor": "I", + "field": "canvasWidth", + "name": "r", + "owner": "dt" + }, + { + "access": 9, + "decoder": 1876967757, + "descriptor": "I", + "field": "MouseHandler_lastPressedY", + "name": "y", + "owner": "bb" + }, + { + "access": 9, + "decoder": 1891197573, + "descriptor": "I", + "field": "ViewportMouse_x", + "name": "f", + "owner": "dm" + }, + { + "access": 9, + "decoder": 2126310249, + "descriptor": "I", + "field": "MouseHandler_lastButton", + "name": "s", + "owner": "bb" + }, + { + "access": 9, + "decoder": 235389995, + "descriptor": "I", + "field": "__im_q", + "name": "q", + "owner": "im" + }, + { + "access": 9, + "decoder": 3806612340723844600, + "descriptor": "J", + "field": "MouseHandler_lastPressedTimeMillis", + "name": "h", + "owner": "bb" + }, + { + "access": 9, + "decoder": 422473713, + "descriptor": "I", + "field": "__el_x", + "name": "x", + "owner": "el" + }, + { + "access": 9, + "decoder": 510774535, + "descriptor": "I", + "field": "__ix_f", + "name": "f", + "owner": "ix" + }, + { + "access": 9, + "decoder": 516430597, + "descriptor": "I", + "field": "NetCache_pendingPriorityResponsesCount", + "name": "g", + "owner": "iq" + }, + { + "access": 9, + "decoder": 533653621, + "descriptor": "I", + "field": "__cm_e", + "name": "e", + "owner": "cm" + }, + { + "access": 9, + "decoder": 701739159, + "descriptor": "I", + "field": "__hx_z", + "name": "z", + "owner": "hx" + }, + { + "access": 9, + "decoder": 840549915, + "descriptor": "I", + "field": "__iq_j", + "name": "j", + "owner": "iq" + }, + { + "access": 9, + "decoder": 948359621, + "descriptor": "I", + "field": "__iq_f", + "name": "f", + "owner": "iq" + }, + { + "access": 9, + "descriptor": "B", + "field": "__iq_b", + "name": "b", + "owner": "iq" + }, + { + "access": 9, + "descriptor": "C", + "field": "__go_ck", + "name": "ck", + "owner": "go" + }, + { + "access": 9, + "descriptor": "I", + "field": "Rasterizer2D_height", + "name": "av", + "owner": "lf" + }, + { + "access": 9, + "descriptor": "I", + "field": "Rasterizer2D_width", + "name": "aj", + "owner": "lf" + }, + { + "access": 9, + "descriptor": "I", + "field": "Rasterizer2D_xClipEnd", + "name": "ah", + "owner": "lf" + }, + { + "access": 9, + "descriptor": "I", + "field": "Rasterizer2D_xClipStart", + "name": "ay", + "owner": "lf" + }, + { + "access": 9, + "descriptor": "I", + "field": "Rasterizer2D_yClipEnd", + "name": "ac", + "owner": "lf" + }, + { + "access": 9, + "descriptor": "I", + "field": "Rasterizer2D_yClipStart", + "name": "ar", + "owner": "lf" + }, + { + "access": 9, + "descriptor": "I", + "field": "Rasterizer3D_zoom", + "name": "k", + "owner": "et" + }, + { + "access": 9, + "descriptor": "I", + "field": "Scene_selectedX", + "name": "aw", + "owner": "em" + }, + { + "access": 9, + "descriptor": "I", + "field": "Scene_selectedY", + "name": "al", + "owner": "em" + }, + { + "access": 9, + "descriptor": "Lan;", + "field": "KeyHandler_instance", + "name": "m", + "owner": "an" + }, + { + "access": 9, + "descriptor": "Lbb;", + "field": "MouseHandler_instance", + "name": "w", + "owner": "bb" + }, + { + "access": 9, + "descriptor": "Lbh;", + "field": "friendSystem", + "name": "rc", + "owner": "ag" + }, + { + "access": 9, + "descriptor": "Lcz;", + "field": "pcmPlayerProvider", + "name": "n", + "owner": "bl" + }, + { + "access": 9, + "descriptor": "Ldt;", + "field": "soundCache", + "name": "n", + "owner": "kc" + }, + { + "access": 9, + "descriptor": "Ldy;", + "field": "dat2File", + "name": "n", + "owner": "fs" + }, + { + "access": 9, + "descriptor": "Ldy;", + "field": "idx255File", + "name": "i", + "owner": "fs" + }, + { + "access": 9, + "descriptor": "Ldy;", + "field": "randomDat", + "name": "k", + "owner": "fs" + }, + { + "access": 9, + "descriptor": "Lec;", + "field": "__av_o", + "name": "o", + "owner": "av" + }, + { + "access": 9, + "descriptor": "Lei;", + "field": "Rasterizer3D_textureLoader", + "name": "c", + "owner": "et" + }, + { + "access": 9, + "descriptor": "Ler;", + "field": "HealthBarDefinition_cached", + "name": "q", + "owner": "ii" + }, + { + "access": 9, + "descriptor": "Ler;", + "field": "PlayerAppearance_cachedModels", + "name": "k", + "owner": "hi" + }, + { + "access": 9, + "descriptor": "Ler;", + "field": "SequenceDefinition_cached", + "name": "w", + "owner": "jh" + }, + { + "access": 9, + "descriptor": "Ler;", + "field": "VarbitDefinition_cached", + "name": "f", + "owner": "ia" + }, + { + "access": 9, + "descriptor": "Ler;", + "field": "VarpDefinition_cached", + "name": "q", + "owner": "ix" + }, + { + "access": 9, + "descriptor": "Ler;", + "field": "__jf_f", + "name": "f", + "owner": "jf" + }, + { + "access": 9, + "descriptor": "Ler;", + "field": "__jh_o", + "name": "o", + "owner": "jh" + }, + { + "access": 9, + "descriptor": "Ler;", + "field": "__jq_f", + "name": "f", + "owner": "jq" + }, + { + "access": 9, + "descriptor": "Ler;", + "field": "__jr_o", + "name": "o", + "owner": "jr" + }, + { + "access": 9, + "descriptor": "Lfu;", + "field": "NetCache_socket", + "name": "m", + "owner": "iq" + }, + { + "access": 9, + "descriptor": "Lgd;", + "field": "huffman", + "name": "m", + "owner": "ki" + }, + { + "access": 9, + "descriptor": "Lgr;", + "field": "NetCache_reference", + "name": "y", + "owner": "cq" + }, + { + "access": 9, + "descriptor": "Lgr;", + "field": "NetCache_responseArchiveBuffer", + "name": "z", + "owner": "c" + }, + { + "access": 9, + "descriptor": "Lgr;", + "field": "NetCache_responseHeaderBuffer", + "name": "a", + "owner": "iq" + }, + { + "access": 9, + "descriptor": "Lhe;", + "field": "musicTrack", + "name": "k", + "owner": "i" + }, + { + "access": 9, + "descriptor": "Lhm;", + "field": "midiPcmStream", + "name": "w", + "owner": "hf" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "Component_archive", + "name": "e", + "owner": "ho" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "EnumDefinition_archive", + "name": "m", + "owner": "jw" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "ItemDefinition_archive", + "name": "u", + "owner": "jv" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "ItemDefinition_modelArchive", + "name": "g", + "owner": "jv" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "KitDefinition_archive", + "name": "m", + "owner": "im" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "SequenceDefinition_archive", + "name": "m", + "owner": "jh" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "SpotAnimationDefinition_archive", + "name": "m", + "owner": "io" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "SpotAnimationDefinition_modelArchive", + "name": "f", + "owner": "io" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "__aq_k", + "name": "k", + "owner": "aq" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "__f_m", + "name": "m", + "owner": "f" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "__fh_x", + "name": "x", + "owner": "fh" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "__hf_f", + "name": "f", + "owner": "hf" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "__hf_q", + "name": "q", + "owner": "hf" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "__hf_u", + "name": "u", + "owner": "hf" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "__ho_d", + "name": "d", + "owner": "ho" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "__ic_m", + "name": "m", + "owner": "ic" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "__ii_f", + "name": "f", + "owner": "ii" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "__ii_m", + "name": "m", + "owner": "ii" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "__im_f", + "name": "f", + "owner": "im" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "__ix_m", + "name": "m", + "owner": "ix" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "__jb_m", + "name": "m", + "owner": "jb" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "__jf_m", + "name": "m", + "owner": "jf" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "__jh_f", + "name": "f", + "owner": "jh" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "__jh_q", + "name": "q", + "owner": "jh" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "__jq_m", + "name": "m", + "owner": "jq" + }, + { + "access": 9, + "descriptor": "Lir;", + "field": "__o_m", + "name": "m", + "owner": "o" + }, + { + "access": 9, + "descriptor": "Liz;", + "field": "NetCache_currentResponse", + "name": "i", + "owner": "ed" + }, + { + "access": 9, + "descriptor": "Lja;", + "field": "reflectionChecks", + "name": "m", + "owner": "le" + }, + { + "access": 9, + "descriptor": "Ljava/applet/Applet;", + "field": "__af_m", + "name": "m", + "owner": "af" + }, + { + "access": 9, + "descriptor": "Ljava/applet/Applet;", + "field": "applet", + "name": "m", + "owner": "fx" + }, + { + "access": 9, + "descriptor": "Ljava/io/File;", + "field": "__fo_f", + "name": "f", + "owner": "fo" + }, + { + "access": 9, + "descriptor": "Ljava/io/File;", + "field": "__fs_o", + "name": "o", + "owner": "fs" + }, + { + "access": 9, + "descriptor": "Ljava/io/File;", + "field": "clDat", + "name": "w", + "owner": "lc" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_almostEverywhere", + "name": "hw", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_andTheProtectItemPrayerWontWork", + "name": "hj", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_attack", + "name": "fq", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_cancel", + "name": "iz", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_checkingForUpdates", + "name": "s", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_chooseOption", + "name": "fw", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_close", + "name": "fd", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_connectingToServer", + "name": "if", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_connectingToUpdateServer", + "name": "j", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_connectionLost", + "name": "n", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_continue", + "name": "g", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_drop", + "name": "q", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_examine", + "name": "ep", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_existingUser", + "name": "is", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_fromYourFriendListFirst", + "name": "fe", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_fromYourIgnoreListFirst", + "name": "fy", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_hasLoggedIn", + "name": "ea", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_hasLoggedOut", + "name": "es", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_hidden", + "name": "w", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_isAlreadyOnYourFriendList", + "name": "fo", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_level", + "name": "fl", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_loadedConfig", + "name": "v", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_loadedFonts", + "name": "b", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_loadedInputHandler", + "name": "ar", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_loadedInterfaces", + "name": "ak", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_loadedSprites", + "name": "aq", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_loadedTextures", + "name": "av", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_loadedTitleScreen", + "name": "r", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_loadedUpdateList", + "name": "t", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_loadedWordpack", + "name": "ay", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_loadedWorldMap", + "name": "al", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_loading", + "name": "kq", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_loadingConfig", + "name": "p", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_loadingFonts", + "name": "h", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_loadingInterfaces", + "name": "ah", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_loadingPleaseWait", + "name": "k", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_loadingSprites", + "name": "ag", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_loadingTextures", + "name": "aj", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_loadingTitleScreen", + "name": "c", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_loadingWordpack", + "name": "ac", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_loadingWorldMap", + "name": "aw", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_login", + "name": "ie", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_membersObject", + "name": "m", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_moreOptions", + "name": "fg", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_newUser", + "name": "iy", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_notWorkOnThisWorld", + "name": "hu", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_null", + "name": "e", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_ok", + "name": "o", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_password", + "name": "in", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_pin", + "name": "il", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_playersCanAttackEachOther", + "name": "he", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_playersCanAttackEachOtherAlmostEverywhere", + "name": "ht", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_pleaseEnterYourPassword", + "name": "dh", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_pleaseEnterYourUsername", + "name": "dw", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_pleaseRemoveFriend", + "name": "fi", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_pleaseRemoveIgnore", + "name": "fr", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_pleaseWait", + "name": "fp", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_pleaseWaitAttemptingToReestablish", + "name": "i", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_preparedSoundEngine", + "name": "y", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_preparedVisibilityMap", + "name": "z", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_select", + "name": "u", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_skill", + "name": "fj", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_space", + "name": "fh", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_startingGameEngine", + "name": "a", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_take", + "name": "f", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_theProtectItemPrayerWill", + "name": "hv", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_thisIsABetaWorld", + "name": "ho", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_thisIsAHighRiskPvpWorld", + "name": "hi", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_thisIsAHighRiskWorld", + "name": "hp", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_thisIsAPvpWorld", + "name": "hq", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_unableToFind", + "name": "eg", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_use", + "name": "ez", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_walkHere", + "name": "fc", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_warning", + "name": "hl", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_welcomeToRuneScape", + "name": "ij", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_yourFriendListIsFull", + "name": "fu", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_yourIgnoreListIsFull", + "name": "ft", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "Strings_yourNormalAccountWillNotBeAffected", + "name": "hz", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__af_f", + "name": "f", + "owner": "af" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_aa", + "name": "aa", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ad", + "name": "ad", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ae", + "name": "ae", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_af", + "name": "af", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ai", + "name": "ai", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_am", + "name": "am", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_an", + "name": "an", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ao", + "name": "ao", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ap", + "name": "ap", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_as", + "name": "as", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_at", + "name": "at", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_au", + "name": "au", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ax", + "name": "ax", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_az", + "name": "az", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ba", + "name": "ba", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_bb", + "name": "bb", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_bc", + "name": "bc", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_bd", + "name": "bd", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_be", + "name": "be", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_bf", + "name": "bf", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_bg", + "name": "bg", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_bh", + "name": "bh", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_bi", + "name": "bi", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_bj", + "name": "bj", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_bk", + "name": "bk", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_bl", + "name": "bl", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_bm", + "name": "bm", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_bn", + "name": "bn", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_bo", + "name": "bo", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_bp", + "name": "bp", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_bq", + "name": "bq", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_br", + "name": "br", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_bs", + "name": "bs", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_bt", + "name": "bt", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_bu", + "name": "bu", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_bv", + "name": "bv", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_bw", + "name": "bw", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_bx", + "name": "bx", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_by", + "name": "by", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_bz", + "name": "bz", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ca", + "name": "ca", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_cb", + "name": "cb", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_cc", + "name": "cc", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_cd", + "name": "cd", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ce", + "name": "ce", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_cf", + "name": "cf", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_cg", + "name": "cg", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ch", + "name": "ch", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ci", + "name": "ci", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_cj", + "name": "cj", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ck", + "name": "ck", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_cl", + "name": "cl", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_cm", + "name": "cm", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_cn", + "name": "cn", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_co", + "name": "co", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_cp", + "name": "cp", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_cq", + "name": "cq", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_cr", + "name": "cr", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_cs", + "name": "cs", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ct", + "name": "ct", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_cu", + "name": "cu", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_cv", + "name": "cv", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_cw", + "name": "cw", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_cx", + "name": "cx", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_cy", + "name": "cy", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_cz", + "name": "cz", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_d", + "name": "d", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_da", + "name": "da", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_db", + "name": "db", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_dc", + "name": "dc", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_dd", + "name": "dd", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_de", + "name": "de", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_df", + "name": "df", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_dg", + "name": "dg", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_di", + "name": "di", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_dj", + "name": "dj", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_dk", + "name": "dk", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_dl", + "name": "dl", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_dm", + "name": "dm", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_dn", + "name": "dn", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_do", + "name": "do", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_dp", + "name": "dp", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_dq", + "name": "dq", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_dr", + "name": "dr", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ds", + "name": "ds", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_dt", + "name": "dt", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_du", + "name": "du", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_dv", + "name": "dv", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_dx", + "name": "dx", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_dy", + "name": "dy", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_dz", + "name": "dz", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_eb", + "name": "eb", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ec", + "name": "ec", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ed", + "name": "ed", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ee", + "name": "ee", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ef", + "name": "ef", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_eh", + "name": "eh", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ei", + "name": "ei", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ej", + "name": "ej", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ek", + "name": "ek", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_el", + "name": "el", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_em", + "name": "em", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_en", + "name": "en", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_eo", + "name": "eo", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_eq", + "name": "eq", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_er", + "name": "er", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_et", + "name": "et", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_eu", + "name": "eu", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ev", + "name": "ev", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ew", + "name": "ew", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ex", + "name": "ex", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ey", + "name": "ey", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_fa", + "name": "fa", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_fb", + "name": "fb", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ff", + "name": "ff", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_fk", + "name": "fk", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_fm", + "name": "fm", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_fn", + "name": "fn", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_fs", + "name": "fs", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_fv", + "name": "fv", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_fx", + "name": "fx", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_fz", + "name": "fz", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ga", + "name": "ga", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gb", + "name": "gb", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gc", + "name": "gc", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gd", + "name": "gd", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ge", + "name": "ge", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gf", + "name": "gf", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gg", + "name": "gg", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gh", + "name": "gh", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gi", + "name": "gi", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gj", + "name": "gj", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gk", + "name": "gk", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gl", + "name": "gl", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gm", + "name": "gm", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gn", + "name": "gn", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_go", + "name": "go", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gp", + "name": "gp", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gq", + "name": "gq", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gr", + "name": "gr", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gs", + "name": "gs", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gt", + "name": "gt", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gu", + "name": "gu", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gv", + "name": "gv", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gw", + "name": "gw", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gx", + "name": "gx", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gy", + "name": "gy", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_gz", + "name": "gz", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ha", + "name": "ha", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_hb", + "name": "hb", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_hc", + "name": "hc", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_hd", + "name": "hd", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_hf", + "name": "hf", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_hg", + "name": "hg", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_hh", + "name": "hh", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_hk", + "name": "hk", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_hm", + "name": "hm", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_hn", + "name": "hn", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_hr", + "name": "hr", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_hs", + "name": "hs", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_hx", + "name": "hx", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_hy", + "name": "hy", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ia", + "name": "ia", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ib", + "name": "ib", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ic", + "name": "ic", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_id", + "name": "id", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ig", + "name": "ig", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ih", + "name": "ih", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ii", + "name": "ii", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ik", + "name": "ik", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_im", + "name": "im", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_io", + "name": "io", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ip", + "name": "ip", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_iq", + "name": "iq", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ir", + "name": "ir", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_it", + "name": "it", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_iu", + "name": "iu", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_iv", + "name": "iv", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_iw", + "name": "iw", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ix", + "name": "ix", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ja", + "name": "ja", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_jb", + "name": "jb", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_jc", + "name": "jc", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_jd", + "name": "jd", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_je", + "name": "je", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_jf", + "name": "jf", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_jg", + "name": "jg", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_jh", + "name": "jh", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ji", + "name": "ji", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_jj", + "name": "jj", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_jk", + "name": "jk", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_jl", + "name": "jl", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_jm", + "name": "jm", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_jn", + "name": "jn", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_jo", + "name": "jo", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_jp", + "name": "jp", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_jq", + "name": "jq", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_jr", + "name": "jr", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_js", + "name": "js", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_jt", + "name": "jt", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ju", + "name": "ju", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_jv", + "name": "jv", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_jw", + "name": "jw", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_jx", + "name": "jx", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_jy", + "name": "jy", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_jz", + "name": "jz", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_kd", + "name": "kd", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ke", + "name": "ke", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_kf", + "name": "kf", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_kg", + "name": "kg", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_kj", + "name": "kj", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_km", + "name": "km", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_kp", + "name": "kp", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ks", + "name": "ks", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_kv", + "name": "kv", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_ky", + "name": "ky", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_l", + "name": "l", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "__id_x", + "name": "x", + "owner": "id" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "javaVendor", + "name": "m", + "owner": "fz" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "javaVersion", + "name": "f", + "owner": "fz" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "localPlayerName", + "name": "f", + "owner": "fx" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "osName", + "name": "b", + "owner": "ju" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "osNameLowerCase", + "name": "h", + "owner": "p" + }, + { + "access": 9, + "descriptor": "Ljava/lang/String;", + "field": "userHomeDirectory", + "name": "c", + "owner": "as" + }, + { + "access": 9, + "descriptor": "Ljava/util/Comparator;", + "field": "__g_f", + "name": "f", + "owner": "g" + }, + { + "access": 9, + "descriptor": "Ljava/util/Comparator;", + "field": "__g_o", + "name": "o", + "owner": "g" + }, + { + "access": 9, + "descriptor": "Ljava/util/Comparator;", + "field": "__g_q", + "name": "q", + "owner": "g" + }, + { + "access": 9, + "descriptor": "Ljava/util/Comparator;", + "field": "__g_w", + "name": "w", + "owner": "g" + }, + { + "access": 9, + "descriptor": "Ljava/util/zip/CRC32;", + "field": "NetCache_crc", + "name": "t", + "owner": "iq" + }, + { + "access": 9, + "descriptor": "Ljp;", + "field": "NetCache_pendingWritesQueue", + "name": "l", + "owner": "iq" + }, + { + "access": 9, + "descriptor": "Lkk;", + "field": "__gx_n", + "name": "n", + "owner": "gx" + }, + { + "access": 9, + "descriptor": "Lld;", + "field": "NetCache_pendingPriorityResponses", + "name": "u", + "owner": "iq" + }, + { + "access": 9, + "descriptor": "Lld;", + "field": "NetCache_pendingPriorityWrites", + "name": "w", + "owner": "iq" + }, + { + "access": 9, + "descriptor": "Lld;", + "field": "NetCache_pendingResponses", + "name": "d", + "owner": "iq" + }, + { + "access": 9, + "descriptor": "Lld;", + "field": "NetCache_pendingWrites", + "name": "e", + "owner": "iq" + }, + { + "access": 9, + "descriptor": "Llp;", + "field": "rasterProvider", + "name": "ad", + "owner": "gz" + }, + { + "access": 9, + "descriptor": "Z", + "field": "Scene_isLowDetail", + "name": "m", + "owner": "em" + }, + { + "access": 9, + "descriptor": "Z", + "field": "ViewportMouse_false0", + "name": "w", + "owner": "dm" + }, + { + "access": 9, + "descriptor": "Z", + "field": "ViewportMouse_isInViewport", + "name": "m", + "owner": "dm" + }, + { + "access": 9, + "descriptor": "Z", + "field": "__ar_l", + "name": "l", + "owner": "ar" + }, + { + "access": 9, + "descriptor": "Z", + "field": "__et_w", + "name": "w", + "owner": "et" + }, + { + "access": 9, + "descriptor": "Z", + "field": "__fo_m", + "name": "m", + "owner": "fo" + }, + { + "access": 9, + "descriptor": "Z", + "field": "__ho_j", + "name": "j", + "owner": "ho" + }, + { + "access": 9, + "descriptor": "Z", + "field": "__u_n", + "name": "n", + "owner": "u" + }, + { + "access": 9, + "descriptor": "Z", + "field": "isMembersWorld", + "name": "bd", + "owner": "client" + }, + { + "access": 9, + "descriptor": "Z", + "field": "musicTrackBoolean", + "name": "d", + "owner": "lj" + }, + { + "access": 9, + "descriptor": "[C", + "field": "__kc_m", + "name": "m", + "owner": "kc" + }, + { + "access": 9, + "descriptor": "[I", + "field": "Rasterizer2D_pixels", + "name": "aq", + "owner": "lf" + }, + { + "access": 9, + "descriptor": "[I", + "field": "Rasterizer3D_colorPalette", + "name": "b", + "owner": "et" + }, + { + "access": 9, + "descriptor": "[I", + "field": "Rasterizer3D_cosine", + "name": "ag", + "owner": "et" + }, + { + "access": 9, + "descriptor": "[I", + "field": "Rasterizer3D_sine", + "name": "v", + "owner": "et" + }, + { + "access": 9, + "descriptor": "[I", + "field": "Skills_experienceTable", + "name": "q", + "owner": "hc" + }, + { + "access": 9, + "descriptor": "[I", + "field": "Varps_main", + "name": "q", + "owner": "hv" + }, + { + "access": 9, + "descriptor": "[I", + "field": "Varps_temp", + "name": "f", + "owner": "hv" + }, + { + "access": 9, + "descriptor": "[I", + "field": "__an_cp", + "name": "cp", + "owner": "an" + }, + { + "access": 9, + "descriptor": "[J", + "field": "ViewportMouse_entityTags", + "name": "a", + "owner": "dm" + }, + { + "access": 9, + "descriptor": "[Ldy;", + "field": "idxFiles", + "name": "a", + "owner": "ik" + }, + { + "access": 9, + "descriptor": "[Lgg;", + "field": "packetBufferNodes", + "name": "o", + "owner": "gg" + }, + { + "access": 9, + "descriptor": "[Lic;", + "field": "WorldMapElement_cached", + "name": "f", + "owner": "ho" + }, + { + "access": 9, + "descriptor": "[Lit;", + "field": "NetCache_archives", + "name": "h", + "owner": "iq" + }, + { + "access": 9, + "descriptor": "[Ljava/lang/String;", + "field": "__ao_s", + "name": "s", + "owner": "ao" + }, + { + "access": 9, + "descriptor": "[Ljava/lang/String;", + "field": "cacheDirectoryLocations", + "name": "j", + "owner": "ah" + }, + { + "access": 9, + "descriptor": "[Llq;", + "field": "AbstractFont_modIconSprites", + "name": "x", + "owner": "kt" + }, + { + "access": 9, + "descriptor": "[S", + "field": "__hi_g", + "name": "g", + "owner": "hi" + }, + { + "access": 9, + "descriptor": "[S", + "field": "__hj_e", + "name": "e", + "owner": "hj" + }, + { + "access": 9, + "descriptor": "[Z", + "field": "KeyHandler_pressedKeys", + "name": "cb", + "owner": "an" + }, + { + "access": 9, + "descriptor": "[Z", + "field": "loadedInterfaces", + "name": "l", + "owner": "ho" + }, + { + "access": 9, + "descriptor": "[[Lho;", + "field": "interfaceComponents", + "name": "g", + "owner": "ho" + }, + { + "access": 9, + "descriptor": "[[S", + "field": "__bd_x", + "name": "x", + "owner": "bd" + }, + { + "access": 9, + "descriptor": "[[S", + "field": "__hz_l", + "name": "l", + "owner": "hz" + } + ], + "interfaces": [ + "ky" + ], + "methods": [ + { + "access": 0, + "descriptor": "(B)V", + "method": "doCycleJs5", + "name": "ef", + "owner": "client", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(B)V", + "method": "doCycleJs5Connect", + "name": "ev", + "owner": "client", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "__ge_137", + "name": "ge", + "owner": "client", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(IS)V", + "method": "js5Error", + "name": "ea", + "owner": "client", + "parameters": [ + "code" + ] + }, + { + "access": 0, + "descriptor": "(Lho;B)V", + "method": "alignComponent", + "name": "ip", + "owner": "client", + "parameters": [ + "component" + ] + }, + { + "access": 1, + "descriptor": "(B)Lkp;", + "method": "username", + "name": "kr", + "owner": "client" + }, + { + "access": 16, + "descriptor": "(B)V", + "method": "doCycleLoggedOut", + "name": "fg", + "owner": "client", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(B)Z", + "method": "__ht_140", + "name": "ht", + "owner": "client", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(I)V", + "method": "__hi_139", + "name": "hi", + "owner": "client", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(I)V", + "method": "__jh_142", + "name": "jh", + "owner": "client", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(I)V", + "method": "doCycleLoggedIn", + "name": "fx", + "owner": "client", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(I)V", + "method": "drawLoggedIn", + "name": "gs", + "owner": "client", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(IIB)V", + "method": "openMenu", + "name": "hj", + "owner": "client", + "parameters": [ + "x", + "y" + ] + }, + { + "access": 16, + "descriptor": "(Lcl;I)Z", + "method": "__hg_138", + "name": "hg", + "owner": "client", + "parameters": [ + "arg0" + ] + }, + { + "access": 16, + "descriptor": "(ZI)V", + "method": "__iu_141", + "name": "iu", + "owner": "client", + "parameters": [ + "arg0" + ] + }, + { + "access": 17, + "descriptor": "()V", + "method": "init", + "name": "init", + "owner": "client", + "parameters": [] + }, + { + "access": 20, + "descriptor": "(I)V", + "method": "__au_135", + "name": "au", + "owner": "client", + "parameters": [] + }, + { + "access": 20, + "descriptor": "(I)V", + "method": "__j_136", + "name": "j", + "owner": "client", + "parameters": [] + }, + { + "access": 20, + "descriptor": "(I)V", + "method": "doCycle", + "name": "al", + "owner": "client", + "parameters": [] + }, + { + "access": 20, + "descriptor": "(I)V", + "method": "kill0", + "name": "ae", + "owner": "client", + "parameters": [] + }, + { + "access": 20, + "descriptor": "(I)V", + "method": "setUp", + "name": "aw", + "owner": "client", + "parameters": [] + }, + { + "access": 20, + "descriptor": "(ZI)V", + "method": "draw", + "name": "ab", + "owner": "client" + }, + { + "access": 24, + "descriptor": "(DII)V", + "method": "Rasterizer3D_buildPalette", + "name": "g", + "owner": "et", + "parameters": [ + "brightness", + "hsMax", + "hsMin" + ] + }, + { + "access": 24, + "descriptor": "(IIII)I", + "method": "getTileHeight", + "name": "gu", + "owner": "ay" + }, + { + "access": 24, + "descriptor": "(IIII)V", + "method": "Rasterizer3D_setClip", + "name": "f", + "owner": "et", + "parameters": [ + "xEnd", + "xStart", + "yEnd", + "yStart" + ] + }, + { + "access": 24, + "descriptor": "(IIII)V", + "method": "worldToScreen", + "name": "gx", + "owner": "aj" + }, + { + "access": 24, + "descriptor": "(IIIILjava/lang/String;Ljava/lang/String;III)V", + "method": "menuAction", + "name": "hb", + "owner": "bz", + "parameters": [ + "action", + "argument0", + "argument1", + "argument2", + "mouseX", + "mouseY", + "opcode", + "targetName" + ] + }, + { + "access": 24, + "descriptor": "(IIIILln;Lhp;I)V", + "method": "worldToMinimap", + "name": "jk", + "owner": "ep" + }, + { + "access": 24, + "descriptor": "(IIIIZI)V", + "method": "setViewportShape", + "name": "gg", + "owner": "kx", + "parameters": [ + "clear", + "height", + "width", + "x", + "y" + ] + }, + { + "access": 24, + "descriptor": "(Lbr;IIII)V", + "method": "addPlayerToMenu", + "name": "ik", + "owner": "e", + "parameters": [ + "menuArg0", + "menuArg1", + "menuArg2", + "player" + ] + }, + { + "access": 24, + "descriptor": "(Lbx;ZI)V", + "method": "closeInterface", + "name": "jd", + "owner": "cs", + "parameters": [ + "b", + "w" + ] + }, + { + "access": 24, + "descriptor": "(Lbz;IIIIIB)V", + "method": "drawActor2d", + "name": "gr", + "owner": "at", + "parameters": [ + "a", + "actor", + "b", + "c", + "d", + "e" + ] + }, + { + "access": 24, + "descriptor": "(Ldc;B)V", + "method": "PcmStream_disable", + "name": "al", + "owner": "hm", + "parameters": [ + "stream" + ] + }, + { + "access": 24, + "descriptor": "(Lgr;IIIIIIB)V", + "method": "loadTerrain", + "name": "o", + "owner": "e", + "parameters": [ + "buffer", + "n", + "plane", + "x", + "x0", + "y", + "y0" + ] + }, + { + "access": 24, + "descriptor": "(Lgr;Llh;I)Llh;", + "method": "readStringIntParameters", + "name": "m", + "owner": "ir", + "parameters": [ + "buffer", + "hashTable" + ] + }, + { + "access": 24, + "descriptor": "(Lho;I)Z", + "method": "runCs1", + "name": "im", + "owner": "il", + "parameters": [ + "component" + ] + }, + { + "access": 24, + "descriptor": "(Lho;III)V", + "method": "clickComponent", + "name": "jf", + "owner": "cq", + "parameters": [ + "component", + "x", + "y" + ] + }, + { + "access": 24, + "descriptor": "(Lhx;B)V", + "method": "updatePlayer", + "name": "m", + "owner": "k" + }, + { + "access": 24, + "descriptor": "(Ljava/lang/String;Ljava/lang/String;IIIIZB)V", + "method": "insertMenuItem", + "name": "il", + "owner": "j", + "parameters": [ + "action", + "arg0", + "arg1", + "arg2", + "b", + "opcode", + "targetName" + ] + }, + { + "access": 24, + "descriptor": "(Ljava/lang/String;ZI)V", + "method": "drawLoadingMessage", + "name": "gl", + "owner": "bi" + }, + { + "access": 24, + "descriptor": "(Ljz;IIIB)V", + "method": "addNpcToMenu", + "name": "is", + "owner": "dj", + "parameters": [ + "menuArg0", + "menuArg1", + "menuArg2", + "npc" + ] + }, + { + "access": 24, + "descriptor": "(ZLhx;B)V", + "method": "loadRegions", + "name": "gc", + "owner": "af", + "parameters": [ + "isInInstance", + "packetBuffer" + ] + }, + { + "access": 24, + "descriptor": "([BI)[B", + "method": "decompressBytes", + "name": "ay", + "owner": "id" + }, + { + "access": 24, + "descriptor": "([Lho;IIIIIIII)V", + "method": "updateInterface", + "name": "jr", + "owner": "il", + "parameters": [ + "a", + "b", + "c", + "components", + "d", + "parentId", + "x", + "y" + ] + }, + { + "access": 24, + "descriptor": "([Lho;IIIIIIIII)V", + "method": "drawInterface", + "name": "ir", + "owner": "az" + }, + { + "access": 25, + "descriptor": "()V", + "method": "Rasterizer3D_method1", + "name": "m", + "owner": "et" + }, + { + "access": 25, + "descriptor": "()V", + "method": "Rasterizer3D_method3", + "name": "q", + "owner": "et" + }, + { + "access": 25, + "descriptor": "(D)V", + "method": "Rasterizer3D_setBrightness", + "name": "u", + "owner": "et", + "parameters": [ + "brightness" + ] + }, + { + "access": 25, + "descriptor": "(IIIIIZI)Lln;", + "method": "getItemSprite", + "name": "d", + "owner": "ht", + "parameters": [ + "b0", + "id", + "n0", + "n1", + "n2", + "quantity" + ] + }, + { + "access": 25, + "descriptor": "(Lei;)V", + "method": "Rasterizer3D_setTextureLoader", + "name": "o", + "owner": "et", + "parameters": [ + "textureLoader" + ] + }, + { + "access": 25, + "descriptor": "(Lfz;III)Lco;", + "method": "newPcmPlayer", + "name": "aj", + "owner": "cq" + }, + { + "access": 40, + "descriptor": "(IZI)[B", + "method": "ByteArrayPool_get", + "name": "f", + "owner": "gi" + }, + { + "access": 41, + "descriptor": "(I)J", + "method": "currentTimeMs", + "name": "m", + "owner": "ga", + "parameters": [] + }, + { + "access": 8, + "descriptor": "(I)Llz;", + "method": "worldMap", + "name": "er", + "owner": "dy" + }, + { + "access": 8, + "descriptor": "(I)Z", + "method": "loadWorlds", + "name": "m", + "owner": "ji", + "parameters": [] + }, + { + "access": 8, + "descriptor": "(IB)V", + "method": "updateGameState", + "name": "ec", + "owner": "ba", + "parameters": [ + "gameState" + ] + }, + { + "access": 8, + "descriptor": "(ID)I", + "method": "Rasterizer3D_brighten", + "name": "l", + "owner": "et", + "parameters": [ + "brightness", + "rgb" + ] + }, + { + "access": 8, + "descriptor": "(II)Len;", + "method": "getFrames", + "name": "x", + "owner": "bc", + "parameters": [ + "id" + ] + }, + { + "access": 8, + "descriptor": "(II)Ljava/lang/String;", + "method": "colorStartTag", + "name": "f", + "owner": "dy", + "parameters": [ + "color" + ] + }, + { + "access": 8, + "descriptor": "(III)V", + "method": "Rasterizer2D_setPixel", + "name": "eb", + "owner": "lf", + "parameters": [ + "color", + "x", + "y" + ] + }, + { + "access": 8, + "descriptor": "(IIIB)V", + "method": "queueSoundEffect", + "name": "fv", + "owner": "ks" + }, + { + "access": 8, + "descriptor": "(IIIII)V", + "method": "Rasterizer2D_drawHorizontalLineAlpha", + "name": "du", + "owner": "lf", + "parameters": [ + "alpha", + "length", + "rgb", + "x", + "y" + ] + }, + { + "access": 8, + "descriptor": "(IIIII)V", + "method": "Rasterizer2D_drawVerticalLineAlpha", + "name": "dq", + "owner": "lf", + "parameters": [ + "alpha", + "length", + "rgb", + "x", + "y" + ] + }, + { + "access": 8, + "descriptor": "(IIIII)V", + "method": "itemContainerSetItem", + "name": "w", + "owner": "al", + "parameters": [ + "index", + "itemContainerId", + "itemId", + "itemQuantity" + ] + }, + { + "access": 8, + "descriptor": "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + "method": "addMessage", + "name": "f", + "owner": "g", + "parameters": [ + "prefix", + "sender", + "text", + "type" + ] + }, + { + "access": 8, + "descriptor": "(IZZZB)Lit;", + "method": "newArchive", + "name": "fw", + "owner": "c" + }, + { + "access": 8, + "descriptor": "(Lbr;ZI)V", + "method": "addPlayerToScene", + "name": "gk", + "owner": "aw", + "parameters": [ + "b", + "player" + ] + }, + { + "access": 8, + "descriptor": "(Lbt;Lbt;IZI)I", + "method": "compareWorlds", + "name": "u", + "owner": "aj", + "parameters": [ + "b", + "mode", + "w0", + "w1" + ] + }, + { + "access": 8, + "descriptor": "(Lby;II)V", + "method": "runScript0", + "name": "f", + "owner": "l", + "parameters": [ + "n", + "scriptEvent" + ] + }, + { + "access": 8, + "descriptor": "(Lho;I)I", + "method": "getComponentClickMask", + "name": "kp", + "owner": "f", + "parameters": [ + "component" + ] + }, + { + "access": 8, + "descriptor": "(Lho;IIB)V", + "method": "alignComponentPosition", + "name": "iw", + "owner": "jf", + "parameters": [ + "component", + "parentHeight", + "parentWidth" + ] + }, + { + "access": 8, + "descriptor": "(Lho;IIZB)V", + "method": "alignComponentSize", + "name": "ic", + "owner": "p", + "parameters": [ + "b", + "component", + "parentHeight", + "parentWidth" + ] + }, + { + "access": 8, + "descriptor": "(Lhx;II)Z", + "method": "updateExternalPlayer", + "name": "o", + "owner": "ie" + }, + { + "access": 8, + "descriptor": "(Lir;II)Lcd;", + "method": "readMusicSample", + "name": "e", + "owner": "cd" + }, + { + "access": 8, + "descriptor": "(Lit;IIIBZI)V", + "method": "requestNetFile", + "name": "f", + "owner": "hx" + }, + { + "access": 8, + "descriptor": "(Ljava/lang/String;I)Ljava/lang/Class;", + "method": "loadClassFromDescriptor", + "name": "w", + "owner": "iw", + "parameters": [ + "descriptor" + ] + }, + { + "access": 8, + "descriptor": "(Lkk;Lkk;Lkk;I)V", + "method": "drawTitle", + "name": "x", + "owner": "bd" + }, + { + "access": 8, + "descriptor": "([BI)Lcg;", + "method": "newScript", + "name": "w", + "owner": "ee", + "parameters": [ + "bytes" + ] + }, + { + "access": 8, + "descriptor": "([BIIIII)V", + "method": "AbstractFont_drawGlyph", + "name": "ah", + "owner": "kt", + "parameters": [ + "color", + "height", + "pixels", + "width", + "x", + "y" + ] + }, + { + "access": 8, + "descriptor": "([BIIIIII)V", + "method": "AbstractFont_drawGlyphAlpha", + "name": "aw", + "owner": "kt", + "parameters": [ + "alpha", + "color", + "height", + "pixels", + "width", + "x", + "y" + ] + }, + { + "access": 8, + "descriptor": "([I[BIIIIIII)V", + "method": "AbstractFont_placeGlyph", + "name": "ak", + "owner": "kt" + }, + { + "access": 8, + "descriptor": "([I[BIIIIIIII)V", + "method": "AbstractFont_placeGlyphAlpha", + "name": "al", + "owner": "kt" + }, + { + "access": 9, + "descriptor": "()V", + "method": "Rasterizer2D_clear", + "name": "dd", + "owner": "lf" + }, + { + "access": 9, + "descriptor": "()V", + "method": "Rasterizer2D_resetClip", + "name": "ds", + "owner": "lf" + }, + { + "access": 9, + "descriptor": "(CI)B", + "method": "charToByteCp1252", + "name": "m", + "owner": "cr", + "parameters": [ + "c" + ] + }, + { + "access": 9, + "descriptor": "(IB)Lho;", + "method": "getInterfaceComponent", + "name": "m", + "owner": "gd", + "parameters": [ + "id" + ] + }, + { + "access": 9, + "descriptor": "(IB)Lic;", + "method": "getWorldMapElement", + "name": "m", + "owner": "dm", + "parameters": [ + "id" + ] + }, + { + "access": 9, + "descriptor": "(IB)Lio;", + "method": "getSpotAnimationDefinition", + "name": "m", + "owner": "af" + }, + { + "access": 9, + "descriptor": "(IB)Ljb;", + "method": "getParamDefinition", + "name": "m", + "owner": "hz", + "parameters": [ + "id" + ] + }, + { + "access": 9, + "descriptor": "(IB)Z", + "method": "loadInterface", + "name": "q", + "owner": "dr", + "parameters": [ + "itf" + ] + }, + { + "access": 9, + "descriptor": "(II)I", + "method": "getVarbit", + "name": "m", + "owner": "ah", + "parameters": [ + "id" + ] + }, + { + "access": 9, + "descriptor": "(II)Lim;", + "method": "getKitDefinition", + "name": "m", + "owner": "as" + }, + { + "access": 9, + "descriptor": "(II)Ljh;", + "method": "getSequenceDefinition", + "name": "m", + "owner": "ae" + }, + { + "access": 9, + "descriptor": "(II)Ljm;", + "method": "getHitmarkDefinition", + "name": "f", + "owner": "bp", + "parameters": [ + "id" + ] + }, + { + "access": 9, + "descriptor": "(II)Ljr;", + "method": "getObjectDefinition", + "name": "f", + "owner": "af", + "parameters": [ + "id" + ] + }, + { + "access": 9, + "descriptor": "(II)Ljv;", + "method": "getItemDefinition", + "name": "m", + "owner": "hc", + "parameters": [ + "id" + ] + }, + { + "access": 9, + "descriptor": "(II)Ljz;", + "method": "getNpcDefinition", + "name": "f", + "owner": "jr", + "parameters": [ + "id" + ] + }, + { + "access": 9, + "descriptor": "(III)Lho;", + "method": "getComponentChild", + "name": "f", + "owner": "gx" + }, + { + "access": 9, + "descriptor": "(IIII)V", + "method": "Rasterizer2D_drawHorizontalLine", + "name": "dj", + "owner": "lf", + "parameters": [ + "color", + "length", + "x", + "y" + ] + }, + { + "access": 9, + "descriptor": "(IIII)V", + "method": "Rasterizer2D_drawVerticalLine", + "name": "dm", + "owner": "lf", + "parameters": [ + "color", + "length", + "x", + "y" + ] + }, + { + "access": 9, + "descriptor": "(IIII)V", + "method": "Rasterizer2D_expandClip", + "name": "dc", + "owner": "lf", + "parameters": [ + "xEnd", + "xStart", + "yEnd", + "yStart" + ] + }, + { + "access": 9, + "descriptor": "(IIII)V", + "method": "Rasterizer2D_setClip", + "name": "di", + "owner": "lf", + "parameters": [ + "xEnd", + "xStart", + "yEnd", + "yStart" + ] + }, + { + "access": 9, + "descriptor": "(IIIII)V", + "method": "Rasterizer2D_drawLine", + "name": "et", + "owner": "lf", + "parameters": [ + "color", + "x0", + "x1", + "y0", + "y1" + ] + }, + { + "access": 9, + "descriptor": "(IIIII)V", + "method": "Rasterizer2D_drawRectangle", + "name": "dh", + "owner": "lf", + "parameters": [ + "color", + "height", + "width", + "x", + "y" + ] + }, + { + "access": 9, + "descriptor": "(IIIII)V", + "method": "Rasterizer2D_fillRectangle", + "name": "dr", + "owner": "lf", + "parameters": [ + "color", + "height", + "width", + "x", + "y" + ] + }, + { + "access": 9, + "descriptor": "(IIIIII)V", + "method": "Rasterizer2D_drawRectangleAlpha", + "name": "dz", + "owner": "lf", + "parameters": [ + "alpha", + "height", + "rgb", + "width", + "x", + "y" + ] + }, + { + "access": 9, + "descriptor": "(IIIIIIII)V", + "method": "Scene_addOccluder", + "name": "w", + "owner": "em" + }, + { + "access": 9, + "descriptor": "(Lby;S)V", + "method": "runScript", + "name": "m", + "owner": "ir", + "parameters": [ + "scriptEvent" + ] + }, + { + "access": 9, + "descriptor": "(Lgw;Lgw;)V", + "method": "IterableNodeDeque_addBefore", + "name": "w", + "owner": "ja", + "parameters": [ + "node", + "old" + ] + }, + { + "access": 9, + "descriptor": "(Lir;II)Lci;", + "method": "readSoundEffect", + "name": "m", + "owner": "ci" + }, + { + "access": 9, + "descriptor": "(Lir;II)Lhe;", + "method": "readTrack", + "name": "m", + "owner": "he" + }, + { + "access": 9, + "descriptor": "(Lir;III)Lln;", + "method": "readSprite", + "name": "m", + "owner": "le", + "parameters": [ + "archive", + "file", + "group" + ] + }, + { + "access": 9, + "descriptor": "(Ljava/lang/CharSequence;I)I", + "method": "hashString", + "name": "l", + "owner": "client", + "parameters": [ + "chars" + ] + }, + { + "access": 9, + "descriptor": "(Ljava/lang/CharSequence;II[BII)I", + "method": "encodeStringCp1252", + "name": "w", + "owner": "dt", + "parameters": [ + "dst", + "dstStart", + "src", + "srcEnd", + "srcStart" + ] + }, + { + "access": 9, + "descriptor": "(Ljava/lang/Object;ZB)[B", + "method": "byteArrayFromObject", + "name": "u", + "owner": "dl", + "parameters": [ + "copyArray", + "o" + ] + }, + { + "access": 9, + "descriptor": "(Ljava/lang/String;)Ljava/lang/String;", + "method": "escapeBrackets", + "name": "s", + "owner": "kt", + "parameters": [ + "s" + ] + }, + { + "access": 9, + "descriptor": "(Ljava/lang/String;Ljava/lang/String;ZS)Ldk;", + "method": "getPreferencesFile", + "name": "q", + "owner": "gl" + }, + { + "access": 9, + "descriptor": "([BIII)Ljava/lang/String;", + "method": "decodeStringCp1252", + "name": "o", + "owner": "bx", + "parameters": [ + "length", + "src", + "srcStart" + ] + }, + { + "access": 9, + "descriptor": "([BI[BII)I", + "method": "Bzip2Decompressor_decompress", + "name": "m", + "owner": "gk" + }, + { + "access": 9, + "descriptor": "([BZB)Ljava/lang/Object;", + "method": "byteArrayToObject", + "name": "o", + "owner": "cb", + "parameters": [ + "bytes", + "copyArray" + ] + }, + { + "access": 9, + "descriptor": "([I)V", + "method": "Rasterizer2D_getClipArray", + "name": "dg", + "owner": "lf", + "parameters": [ + "dst" + ] + }, + { + "access": 9, + "descriptor": "([I)V", + "method": "Rasterizer2D_setClipArray", + "name": "db", + "owner": "lf", + "parameters": [ + "src" + ] + }, + { + "access": 9, + "descriptor": "([III)V", + "method": "Rasterizer2D_replace", + "name": "dp", + "owner": "lf", + "parameters": [ + "height", + "pixels", + "width" + ] + }, + { + "access": 9, + "descriptor": "([III)V", + "method": "clearIntArray", + "name": "x", + "owner": "hh" + }, + { + "access": 9, + "descriptor": "([IIIII)V", + "method": "Scene_buildVisiblityMap", + "name": "at", + "owner": "em", + "parameters": [ + "a", + "b", + "c", + "viewportHeight", + "viewportWidth" + ] + }, + { + "access": 9, + "descriptor": "([Lgc;II)Lgc;", + "method": "findEnumerated", + "name": "m", + "owner": "bn", + "parameters": [ + "ordinal", + "values" + ] + } + ], + "name": "client", + "super": "ba" + }, + { + "access": 49, + "class": "DemotingHashTable", + "constructors": [ + { + "access": 1, + "descriptor": "(II)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "I", + "field": "capacity", + "name": "m", + "owner": "ec" + }, + { + "access": 0, + "descriptor": "I", + "field": "remaining", + "name": "f", + "owner": "ec" + }, + { + "access": 0, + "descriptor": "Ljc;", + "field": "queue", + "name": "w", + "owner": "ec" + }, + { + "access": 0, + "descriptor": "Llh;", + "field": "hashTable", + "name": "q", + "owner": "ec" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(J)V", + "method": "remove", + "name": "f", + "owner": "ec", + "parameters": [ + "key" + ] + }, + { + "access": 0, + "descriptor": "(Leu;)V", + "method": "removeWrapper", + "name": "q", + "owner": "ec", + "parameters": [ + "wrapper" + ] + }, + { + "access": 1, + "descriptor": "()V", + "method": "clear", + "name": "u", + "owner": "ec", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "demote", + "name": "o", + "owner": "ec", + "parameters": [ + "softeningLevel" + ] + }, + { + "access": 1, + "descriptor": "(J)Ljava/lang/Object;", + "method": "get", + "name": "m", + "owner": "ec", + "parameters": [ + "key" + ] + }, + { + "access": 1, + "descriptor": "(Ljava/lang/Object;JI)V", + "method": "put", + "name": "w", + "owner": "ec", + "parameters": [ + "key", + "size", + "value" + ] + } + ], + "name": "ec", + "super": "java.lang.Object" + }, + { + "access": 49, + "class": "DualNodeDeque", + "constructors": [ + { + "access": 1, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Lfn;", + "field": "sentinel", + "name": "m", + "owner": "jp" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "()Lfn;", + "method": "last", + "name": "o", + "owner": "jp" + }, + { + "access": 1, + "descriptor": "()Lfn;", + "method": "removeLast", + "name": "w", + "owner": "jp" + }, + { + "access": 1, + "descriptor": "()V", + "method": "clear", + "name": "u", + "owner": "jp" + }, + { + "access": 1, + "descriptor": "(Lfn;)V", + "method": "addFirst", + "name": "m", + "owner": "jp" + }, + { + "access": 1, + "descriptor": "(Lfn;)V", + "method": "addLast", + "name": "f", + "owner": "jp" + } + ], + "name": "jp", + "super": "java.lang.Object" + }, + { + "access": 49, + "class": "EvictingDualNodeHashTable", + "constructors": [ + { + "access": 1, + "descriptor": "(I)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "I", + "field": "capacity", + "name": "f", + "owner": "er" + }, + { + "access": 0, + "descriptor": "I", + "field": "remainingCapacity", + "name": "q", + "owner": "er" + }, + { + "access": 0, + "descriptor": "Lfn;", + "field": "__m", + "name": "m", + "owner": "er" + }, + { + "access": 0, + "descriptor": "Ljp;", + "field": "deque", + "name": "o", + "owner": "er" + }, + { + "access": 0, + "descriptor": "Lld;", + "field": "hashTable", + "name": "w", + "owner": "er" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "()V", + "method": "clear", + "name": "w", + "owner": "er", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(J)Lfn;", + "method": "get", + "name": "m", + "owner": "er", + "parameters": [ + "key" + ] + }, + { + "access": 1, + "descriptor": "(J)V", + "method": "remove", + "name": "f", + "owner": "er", + "parameters": [ + "key" + ] + }, + { + "access": 1, + "descriptor": "(Lfn;J)V", + "method": "put", + "name": "q", + "owner": "er", + "parameters": [ + "key", + "value" + ] + } + ], + "name": "er", + "super": "java.lang.Object" + }, + { + "access": 49, + "class": "FloorDecoration", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1241982749, + "descriptor": "I", + "field": "flags", + "name": "u", + "owner": "do" + }, + { + "access": 0, + "decoder": -1358154703, + "descriptor": "I", + "field": "tileHeight", + "name": "f", + "owner": "do" + }, + { + "access": 0, + "decoder": 1309467119, + "descriptor": "I", + "field": "x", + "name": "q", + "owner": "do" + }, + { + "access": 0, + "decoder": 318503957, + "descriptor": "I", + "field": "y", + "name": "w", + "owner": "do" + }, + { + "access": 1, + "decoder": -5063688075016131000, + "descriptor": "J", + "field": "tag", + "name": "m", + "owner": "do" + }, + { + "access": 1, + "descriptor": "Lex;", + "field": "entity", + "name": "o", + "owner": "do" + } + ], + "interfaces": [], + "methods": [], + "name": "do", + "super": "java.lang.Object" + }, + { + "access": 49, + "class": "Font", + "constructors": [ + { + "access": 1, + "descriptor": "([B)V" + }, + { + "access": 1, + "descriptor": "([B[I[I[I[I[I[[B)V" + } + ], + "fields": [], + "interfaces": [], + "methods": [ + { + "access": 16, + "descriptor": "([BIIIII)V", + "method": "drawGlyph", + "name": "m", + "owner": "kk" + }, + { + "access": 16, + "descriptor": "([BIIIIII)V", + "method": "drawGlyphAlpha", + "name": "f", + "owner": "kk" + } + ], + "name": "kk", + "super": "kt" + }, + { + "access": 49, + "class": "GameObject", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1017836867, + "descriptor": "I", + "field": "startX", + "name": "g", + "owner": "eh" + }, + { + "access": 0, + "decoder": -1043687633, + "descriptor": "I", + "field": "lastDrawn", + "name": "k", + "owner": "eh" + }, + { + "access": 0, + "decoder": -1519796265, + "descriptor": "I", + "field": "startY", + "name": "e", + "owner": "eh" + }, + { + "access": 0, + "decoder": -161115901, + "descriptor": "I", + "field": "flags", + "name": "i", + "owner": "eh" + }, + { + "access": 0, + "decoder": -1791908691, + "descriptor": "I", + "field": "height", + "name": "q", + "owner": "eh" + }, + { + "access": 0, + "decoder": -379698951, + "descriptor": "I", + "field": "endX", + "name": "l", + "owner": "eh" + }, + { + "access": 0, + "decoder": -607228629, + "descriptor": "I", + "field": "endY", + "name": "x", + "owner": "eh" + }, + { + "access": 0, + "decoder": 109300811, + "descriptor": "I", + "field": "centerX", + "name": "w", + "owner": "eh" + }, + { + "access": 0, + "decoder": 1393658667, + "descriptor": "I", + "field": "orientation", + "name": "m", + "owner": "eh" + }, + { + "access": 0, + "decoder": 1941106389, + "descriptor": "I", + "field": "__d", + "name": "d", + "owner": "eh" + }, + { + "access": 0, + "decoder": 2095667225, + "descriptor": "I", + "field": "plane", + "name": "f", + "owner": "eh" + }, + { + "access": 0, + "decoder": 714046631, + "descriptor": "I", + "field": "centerY", + "name": "o", + "owner": "eh" + }, + { + "access": 1, + "decoder": -114546124748632880, + "descriptor": "J", + "field": "tag", + "name": "n", + "owner": "eh" + }, + { + "access": 1, + "descriptor": "Lex;", + "field": "entity", + "name": "u", + "owner": "eh" + } + ], + "interfaces": [], + "methods": [], + "name": "eh", + "super": "java.lang.Object" + }, + { + "access": 49, + "class": "GraphicsObject", + "constructors": [ + { + "access": 0, + "descriptor": "(IIIIIII)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1189549567, + "descriptor": "I", + "field": "x", + "name": "w", + "owner": "bw" + }, + { + "access": 0, + "decoder": -1245488067, + "descriptor": "I", + "field": "cycleStart", + "name": "f", + "owner": "bw" + }, + { + "access": 0, + "decoder": -1950327625, + "descriptor": "I", + "field": "frameCycle", + "name": "e", + "owner": "bw" + }, + { + "access": 0, + "decoder": -289084031, + "descriptor": "I", + "field": "id", + "name": "m", + "owner": "bw" + }, + { + "access": 0, + "decoder": 1156757009, + "descriptor": "I", + "field": "height", + "name": "u", + "owner": "bw" + }, + { + "access": 0, + "decoder": 1416438985, + "descriptor": "I", + "field": "y", + "name": "o", + "owner": "bw" + }, + { + "access": 0, + "decoder": 1541221595, + "descriptor": "I", + "field": "frame", + "name": "l", + "owner": "bw" + }, + { + "access": 0, + "decoder": 432847573, + "descriptor": "I", + "field": "plane", + "name": "q", + "owner": "bw" + }, + { + "access": 0, + "descriptor": "Ljh;", + "field": "sequenceDefinition", + "name": "g", + "owner": "bw" + }, + { + "access": 0, + "descriptor": "Z", + "field": "isFinished", + "name": "x", + "owner": "bw" + } + ], + "interfaces": [], + "methods": [ + { + "access": 16, + "descriptor": "(II)V", + "method": "advance", + "name": "m", + "owner": "bw", + "parameters": [ + "cycles" + ] + }, + { + "access": 20, + "descriptor": "(I)Ldu;", + "method": "getModel", + "name": "e", + "owner": "bw", + "parameters": [] + } + ], + "name": "bw", + "super": "ex" + }, + { + "access": 49, + "class": "GroundItem", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": 454094667, + "descriptor": "I", + "field": "quantity", + "name": "f", + "owner": "ck" + }, + { + "access": 0, + "decoder": 893970699, + "descriptor": "I", + "field": "id", + "name": "m", + "owner": "ck" + } + ], + "interfaces": [], + "methods": [ + { + "access": 20, + "descriptor": "(I)Ldu;", + "method": "getModel", + "name": "e", + "owner": "ck", + "parameters": [] + } + ], + "name": "ck", + "super": "ex" + }, + { + "access": 49, + "class": "GroundItemPile", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1363136655, + "descriptor": "I", + "field": "x", + "name": "q", + "owner": "dr" + }, + { + "access": 0, + "decoder": -1659262853, + "descriptor": "I", + "field": "height", + "name": "l", + "owner": "dr" + }, + { + "access": 0, + "decoder": -325682933, + "descriptor": "I", + "field": "tileHeight", + "name": "f", + "owner": "dr" + }, + { + "access": 0, + "decoder": -3696674445500473000, + "descriptor": "J", + "field": "tag", + "name": "g", + "owner": "dr" + }, + { + "access": 0, + "decoder": 968072997, + "descriptor": "I", + "field": "y", + "name": "w", + "owner": "dr" + }, + { + "access": 0, + "descriptor": "Lex;", + "field": "first", + "name": "o", + "owner": "dr" + }, + { + "access": 0, + "descriptor": "Lex;", + "field": "second", + "name": "m", + "owner": "dr" + }, + { + "access": 0, + "descriptor": "Lex;", + "field": "third", + "name": "u", + "owner": "dr" + } + ], + "interfaces": [], + "methods": [], + "name": "dr", + "super": "java.lang.Object" + }, + { + "access": 49, + "class": "IndexedSprite", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 1, + "descriptor": "I", + "field": "height", + "name": "l", + "owner": "lq" + }, + { + "access": 1, + "descriptor": "I", + "field": "subHeight", + "name": "w", + "owner": "lq" + }, + { + "access": 1, + "descriptor": "I", + "field": "subWidth", + "name": "q", + "owner": "lq" + }, + { + "access": 1, + "descriptor": "I", + "field": "width", + "name": "g", + "owner": "lq" + }, + { + "access": 1, + "descriptor": "I", + "field": "xOffset", + "name": "o", + "owner": "lq" + }, + { + "access": 1, + "descriptor": "I", + "field": "yOffset", + "name": "u", + "owner": "lq" + }, + { + "access": 1, + "descriptor": "[B", + "field": "pixels", + "name": "m", + "owner": "lq" + }, + { + "access": 1, + "descriptor": "[I", + "field": "palette", + "name": "f", + "owner": "lq" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "()V", + "method": "normalize", + "name": "m", + "owner": "lq", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(II)V", + "method": "__q_492", + "name": "q", + "owner": "lq", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(III)V", + "method": "shiftColors", + "name": "f", + "owner": "lq", + "parameters": [ + "b", + "g", + "r" + ] + }, + { + "access": 1, + "descriptor": "(IIII)V", + "method": "__o_493", + "name": "o", + "owner": "lq", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3" + ] + } + ], + "name": "lq", + "super": "lf" + }, + { + "access": 49, + "class": "IsaacCipher", + "constructors": [ + { + "access": 1, + "descriptor": "([I)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1670027699, + "descriptor": "I", + "field": "__g", + "name": "g", + "owner": "hn" + }, + { + "access": 0, + "decoder": -325762649, + "descriptor": "I", + "field": "__l", + "name": "l", + "owner": "hn" + }, + { + "access": 0, + "decoder": -689202647, + "descriptor": "I", + "field": "__e", + "name": "e", + "owner": "hn" + }, + { + "access": 0, + "decoder": 1514845493, + "descriptor": "I", + "field": "__w", + "name": "w", + "owner": "hn" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__o", + "name": "o", + "owner": "hn" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__u", + "name": "u", + "owner": "hn" + } + ], + "interfaces": [], + "methods": [ + { + "access": 16, + "descriptor": "(B)V", + "method": "__q_338", + "name": "q", + "owner": "hn", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(I)I", + "method": "__f_337", + "name": "f", + "owner": "hn", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(I)I", + "method": "__m_336", + "name": "m", + "owner": "hn", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(I)V", + "method": "__w_339", + "name": "w", + "owner": "hn", + "parameters": [] + } + ], + "name": "hn", + "super": "java.lang.Object" + }, + { + "access": 49, + "class": "IterableNodeHashTable", + "constructors": [ + { + "access": 1, + "descriptor": "(I)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "I", + "field": "index", + "name": "o", + "owner": "lh" + }, + { + "access": 0, + "descriptor": "I", + "field": "size", + "name": "m", + "owner": "lh" + }, + { + "access": 0, + "descriptor": "Lgw;", + "field": "current", + "name": "w", + "owner": "lh" + }, + { + "access": 0, + "descriptor": "Lgw;", + "field": "currentGet", + "name": "q", + "owner": "lh" + }, + { + "access": 0, + "descriptor": "[Lgw;", + "field": "buckets", + "name": "f", + "owner": "lh" + } + ], + "interfaces": [ + "java.lang.Iterable" + ], + "methods": [ + { + "access": 1, + "descriptor": "()Lgw;", + "method": "first", + "name": "w", + "owner": "lh" + }, + { + "access": 1, + "descriptor": "()Lgw;", + "method": "next", + "name": "o", + "owner": "lh" + }, + { + "access": 1, + "descriptor": "()Ljava/util/Iterator;", + "method": "__iterator_478", + "name": "iterator", + "owner": "lh", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "clear", + "name": "q", + "owner": "lh", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(J)Lgw;", + "method": "get", + "name": "m", + "owner": "lh" + }, + { + "access": 1, + "descriptor": "(Lgw;J)V", + "method": "put", + "name": "f", + "owner": "lh" + } + ], + "name": "lh", + "super": "java.lang.Object" + }, + { + "access": 49, + "class": "KeyHandler", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [], + "interfaces": [ + "java.awt.event.FocusListener", + "java.awt.event.KeyListener" + ], + "methods": [ + { + "access": 17, + "descriptor": "(Ljava/awt/event/FocusEvent;)V", + "method": "__focusGained_88", + "name": "focusGained", + "owner": "an", + "parameters": [ + "arg0" + ] + }, + { + "access": 17, + "descriptor": "(Ljava/awt/event/KeyEvent;)V", + "method": "__keyTyped_87", + "name": "keyTyped", + "owner": "an", + "parameters": [ + "arg0" + ] + }, + { + "access": 49, + "descriptor": "(Ljava/awt/event/FocusEvent;)V", + "method": "__focusLost_89", + "name": "focusLost", + "owner": "an", + "parameters": [ + "arg0" + ] + }, + { + "access": 49, + "descriptor": "(Ljava/awt/event/KeyEvent;)V", + "method": "__keyReleased_86", + "name": "keyReleased", + "owner": "an", + "parameters": [ + "arg0" + ] + }, + { + "access": 49, + "descriptor": "(Ljava/awt/event/KeyEvent;)V", + "method": "keyPressed", + "name": "keyPressed", + "owner": "an", + "parameters": [ + "ke" + ] + } + ], + "name": "an", + "super": "java.lang.Object" + }, + { + "access": 49, + "class": "MouseWheelHandler", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -182252389, + "descriptor": "I", + "field": "rotation", + "name": "m", + "owner": "am" + } + ], + "interfaces": [ + "fv", + "java.awt.event.MouseWheelListener" + ], + "methods": [ + { + "access": 0, + "descriptor": "(Ljava/awt/Component;B)V", + "method": "addTo", + "name": "m", + "owner": "am", + "parameters": [ + "component" + ] + }, + { + "access": 0, + "descriptor": "(Ljava/awt/Component;I)V", + "method": "removeFrom", + "name": "f", + "owner": "am", + "parameters": [ + "component" + ] + }, + { + "access": 33, + "descriptor": "(I)I", + "method": "useRotation", + "name": "q", + "owner": "am", + "parameters": [] + }, + { + "access": 33, + "descriptor": "(Ljava/awt/event/MouseWheelEvent;)V", + "method": "__mouseWheelMoved_85", + "name": "mouseWheelMoved", + "owner": "am", + "parameters": [ + "arg0" + ] + } + ], + "name": "am", + "super": "java.lang.Object" + }, + { + "access": 49, + "class": "NetSocket", + "constructors": [ + { + "access": 1, + "descriptor": "(Ljava/net/Socket;Lfz;I)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -738185459, + "descriptor": "I", + "field": "__l", + "name": "l", + "owner": "fb" + }, + { + "access": 0, + "decoder": 2057244853, + "descriptor": "I", + "field": "__e", + "name": "e", + "owner": "fb" + }, + { + "access": 0, + "descriptor": "Lfm;", + "field": "task", + "name": "u", + "owner": "fb" + }, + { + "access": 0, + "descriptor": "Lfz;", + "field": "taskHandler", + "name": "o", + "owner": "fb" + }, + { + "access": 0, + "descriptor": "Ljava/io/InputStream;", + "field": "inputStream", + "name": "m", + "owner": "fb" + }, + { + "access": 0, + "descriptor": "Ljava/io/OutputStream;", + "field": "outputStream", + "name": "f", + "owner": "fb" + }, + { + "access": 0, + "descriptor": "Ljava/net/Socket;", + "field": "socket", + "name": "q", + "owner": "fb" + }, + { + "access": 0, + "descriptor": "Z", + "field": "exceptionWriting", + "name": "x", + "owner": "fb" + }, + { + "access": 0, + "descriptor": "Z", + "field": "isClosed", + "name": "w", + "owner": "fb" + }, + { + "access": 0, + "descriptor": "[B", + "field": "array", + "name": "g", + "owner": "fb" + }, + { + "access": 16, + "decoder": -1644762957, + "descriptor": "I", + "field": "__d", + "name": "d", + "owner": "fb" + }, + { + "access": 16, + "decoder": -782964015, + "descriptor": "I", + "field": "__k", + "name": "k", + "owner": "fb" + } + ], + "interfaces": [ + "java.lang.Runnable" + ], + "methods": [ + { + "access": 0, + "descriptor": "([BIIB)V", + "method": "write0", + "name": "ay", + "owner": "fb", + "parameters": [ + "length", + "src", + "srcIndex" + ] + }, + { + "access": 1, + "descriptor": "()V", + "method": "__run_281", + "name": "run", + "owner": "fb", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "available", + "name": "q", + "owner": "fb", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "readUnsignedByte", + "name": "w", + "owner": "fb", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "close", + "name": "g", + "owner": "fb", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(II)Z", + "method": "isAvailable", + "name": "f", + "owner": "fb", + "parameters": [ + "length" + ] + }, + { + "access": 1, + "descriptor": "([BIIB)V", + "method": "write", + "name": "u", + "owner": "fb", + "parameters": [ + "length", + "src", + "srcIndex" + ] + }, + { + "access": 1, + "descriptor": "([BIII)I", + "method": "read", + "name": "o", + "owner": "fb", + "parameters": [ + "dst", + "dstIndex", + "length" + ] + }, + { + "access": 4, + "descriptor": "()V", + "method": "finalize", + "name": "finalize", + "owner": "fb" + } + ], + "name": "fb", + "super": "fu" + }, + { + "access": 49, + "class": "NodeHashTable", + "constructors": [ + { + "access": 1, + "descriptor": "(I)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "I", + "field": "index", + "name": "o", + "owner": "ld" + }, + { + "access": 0, + "descriptor": "I", + "field": "size", + "name": "m", + "owner": "ld" + }, + { + "access": 0, + "descriptor": "Lgw;", + "field": "current", + "name": "w", + "owner": "ld" + }, + { + "access": 0, + "descriptor": "Lgw;", + "field": "currentGet", + "name": "q", + "owner": "ld" + }, + { + "access": 0, + "descriptor": "[Lgw;", + "field": "buckets", + "name": "f", + "owner": "ld" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "()Lgw;", + "method": "first", + "name": "w", + "owner": "ld", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()Lgw;", + "method": "next", + "name": "o", + "owner": "ld", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "clear", + "name": "q", + "owner": "ld", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(J)Lgw;", + "method": "get", + "name": "m", + "owner": "ld", + "parameters": [ + "key" + ] + }, + { + "access": 1, + "descriptor": "(Lgw;J)V", + "method": "put", + "name": "f", + "owner": "ld", + "parameters": [ + "key", + "node" + ] + } + ], + "name": "ld", + "super": "java.lang.Object" + }, + { + "access": 49, + "class": "Npc", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Ljz;", + "field": "definition", + "name": "m", + "owner": "cv" + } + ], + "interfaces": [], + "methods": [ + { + "access": 16, + "descriptor": "(B)Z", + "method": "isVisible", + "name": "z", + "owner": "cv", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(IBI)V", + "method": "__m_162", + "name": "m", + "owner": "cv", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 16, + "descriptor": "(IIZI)V", + "method": "__f_163", + "name": "f", + "owner": "cv", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 20, + "descriptor": "(I)Ldu;", + "method": "getModel", + "name": "e", + "owner": "cv", + "parameters": [] + } + ], + "name": "cv", + "super": "bz" + }, + { + "access": 49, + "class": "ObjectSound", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1041508847, + "descriptor": "I", + "field": "__n", + "name": "n", + "owner": "be" + }, + { + "access": 0, + "decoder": -1608400407, + "descriptor": "I", + "field": "__x", + "name": "x", + "owner": "be" + }, + { + "access": 0, + "decoder": -211591209, + "descriptor": "I", + "field": "__o", + "name": "o", + "owner": "be" + }, + { + "access": 0, + "decoder": -731474443, + "descriptor": "I", + "field": "soundEffectId", + "name": "l", + "owner": "be" + }, + { + "access": 0, + "decoder": -800464493, + "descriptor": "I", + "field": "__q", + "name": "q", + "owner": "be" + }, + { + "access": 0, + "decoder": -85911525, + "descriptor": "I", + "field": "__w", + "name": "w", + "owner": "be" + }, + { + "access": 0, + "decoder": 1344558633, + "descriptor": "I", + "field": "__g", + "name": "g", + "owner": "be" + }, + { + "access": 0, + "decoder": 1748890449, + "descriptor": "I", + "field": "__d", + "name": "d", + "owner": "be" + }, + { + "access": 0, + "decoder": 512258949, + "descriptor": "I", + "field": "__u", + "name": "u", + "owner": "be" + }, + { + "access": 0, + "decoder": 647270745, + "descriptor": "I", + "field": "__f", + "name": "f", + "owner": "be" + }, + { + "access": 0, + "descriptor": "Lds;", + "field": "stream1", + "name": "e", + "owner": "be" + }, + { + "access": 0, + "descriptor": "Lds;", + "field": "stream2", + "name": "i", + "owner": "be" + }, + { + "access": 0, + "descriptor": "Ljr;", + "field": "obj", + "name": "a", + "owner": "be" + }, + { + "access": 0, + "descriptor": "[I", + "field": "soundEffectIds", + "name": "k", + "owner": "be" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(I)V", + "method": "set", + "name": "f", + "owner": "be", + "parameters": [] + } + ], + "name": "be", + "super": "gw" + }, + { + "access": 49, + "class": "Occluder", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1114046315, + "descriptor": "I", + "field": "maxY", + "name": "d", + "owner": "ee" + }, + { + "access": 0, + "decoder": -1334433969, + "descriptor": "I", + "field": "__s", + "name": "s", + "owner": "ee" + }, + { + "access": 0, + "decoder": -13700523, + "descriptor": "I", + "field": "maxTileX", + "name": "f", + "owner": "ee" + }, + { + "access": 0, + "decoder": -1527021367, + "descriptor": "I", + "field": "__a", + "name": "a", + "owner": "ee" + }, + { + "access": 0, + "decoder": -1805075909, + "descriptor": "I", + "field": "maxZ", + "name": "e", + "owner": "ee" + }, + { + "access": 0, + "decoder": -1824663821, + "descriptor": "I", + "field": "minX", + "name": "u", + "owner": "ee" + }, + { + "access": 0, + "decoder": -2141305127, + "descriptor": "I", + "field": "maxX", + "name": "g", + "owner": "ee" + }, + { + "access": 0, + "decoder": -373839103, + "descriptor": "I", + "field": "__j", + "name": "j", + "owner": "ee" + }, + { + "access": 0, + "decoder": -407777817, + "descriptor": "I", + "field": "__n", + "name": "n", + "owner": "ee" + }, + { + "access": 0, + "decoder": -41239751, + "descriptor": "I", + "field": "minZ", + "name": "l", + "owner": "ee" + }, + { + "access": 0, + "decoder": -570391007, + "descriptor": "I", + "field": "__z", + "name": "z", + "owner": "ee" + }, + { + "access": 0, + "decoder": -691483983, + "descriptor": "I", + "field": "minTileX", + "name": "m", + "owner": "ee" + }, + { + "access": 0, + "decoder": -806776509, + "descriptor": "I", + "field": "type", + "name": "o", + "owner": "ee" + }, + { + "access": 0, + "decoder": 1324959981, + "descriptor": "I", + "field": "__i", + "name": "i", + "owner": "ee" + }, + { + "access": 0, + "decoder": 1501977891, + "descriptor": "I", + "field": "maxTileY", + "name": "w", + "owner": "ee" + }, + { + "access": 0, + "decoder": 768402657, + "descriptor": "I", + "field": "minTileY", + "name": "q", + "owner": "ee" + }, + { + "access": 0, + "decoder": 826041747, + "descriptor": "I", + "field": "__k", + "name": "k", + "owner": "ee" + }, + { + "access": 0, + "decoder": 842961497, + "descriptor": "I", + "field": "minY", + "name": "x", + "owner": "ee" + } + ], + "interfaces": [], + "methods": [], + "name": "ee", + "super": "java.lang.Object" + }, + { + "access": 49, + "class": "PacketBuffer", + "constructors": [ + { + "access": 1, + "descriptor": "(I)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1048718919, + "descriptor": "I", + "field": "bitIndex", + "name": "d", + "owner": "hx" + }, + { + "access": 0, + "descriptor": "Lhn;", + "field": "isaacCipher0", + "name": "e", + "owner": "hx" + } + ], + "interfaces": [], + "methods": [ + { + "access": 1, + "descriptor": "(B)Z", + "method": "__ig_334", + "name": "ig", + "owner": "hx", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "readByteIsaac", + "name": "ii", + "owner": "hx", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)I", + "method": "readSmartByteShortIsaac", + "name": "ia", + "owner": "hx", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "exportIndex", + "name": "jm", + "owner": "hx", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "importIndex", + "name": "jq", + "owner": "hx", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(II)I", + "method": "bitsRemaining", + "name": "jr", + "owner": "hx", + "parameters": [ + "index" + ] + }, + { + "access": 1, + "descriptor": "(II)I", + "method": "readBits", + "name": "jw", + "owner": "hx", + "parameters": [ + "bits" + ] + }, + { + "access": 1, + "descriptor": "(IS)V", + "method": "writeByteIsaac", + "name": "im", + "owner": "hx", + "parameters": [ + "b" + ] + }, + { + "access": 1, + "descriptor": "(Lhn;B)V", + "method": "setIsaacCipher", + "name": "ih", + "owner": "hx", + "parameters": [ + "isaacCipher" + ] + }, + { + "access": 1, + "descriptor": "([BIII)V", + "method": "__jb_335", + "name": "jb", + "owner": "hx", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "([II)V", + "method": "newIsaacCipher", + "name": "io", + "owner": "hx", + "parameters": [ + "array" + ] + } + ], + "name": "hx", + "super": "gr" + }, + { + "access": 49, + "class": "Player", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1136542281, + "descriptor": "I", + "field": "skillLevel", + "name": "l", + "owner": "br" + }, + { + "access": 0, + "decoder": -1624108131, + "descriptor": "I", + "field": "tileHeight2", + "name": "n", + "owner": "br" + }, + { + "access": 0, + "decoder": -1771431457, + "descriptor": "I", + "field": "__i", + "name": "i", + "owner": "br" + }, + { + "access": 0, + "decoder": -351876137, + "descriptor": "I", + "field": "animationCycleStart", + "name": "x", + "owner": "br" + }, + { + "access": 0, + "decoder": -359981047, + "descriptor": "I", + "field": "animationCycleEnd", + "name": "d", + "owner": "br" + }, + { + "access": 0, + "decoder": -539678769, + "descriptor": "I", + "field": "tileX", + "name": "aq", + "owner": "br" + }, + { + "access": 0, + "decoder": -793415473, + "descriptor": "I", + "field": "headIconPrayer", + "name": "w", + "owner": "br" + }, + { + "access": 0, + "decoder": 1332604413, + "descriptor": "I", + "field": "plane", + "name": "c", + "owner": "br" + }, + { + "access": 0, + "decoder": 1486240677, + "descriptor": "I", + "field": "index", + "name": "r", + "owner": "br" + }, + { + "access": 0, + "decoder": 1610462047, + "descriptor": "I", + "field": "__z", + "name": "z", + "owner": "br" + }, + { + "access": 0, + "decoder": 1989338999, + "descriptor": "I", + "field": "tileHeight", + "name": "e", + "owner": "br" + }, + { + "access": 0, + "decoder": 2021372599, + "descriptor": "I", + "field": "headIconPk", + "name": "q", + "owner": "br" + }, + { + "access": 0, + "decoder": 224552403, + "descriptor": "I", + "field": "__j", + "name": "j", + "owner": "br" + }, + { + "access": 0, + "decoder": 305969541, + "descriptor": "I", + "field": "__s", + "name": "s", + "owner": "br" + }, + { + "access": 0, + "decoder": 665272587, + "descriptor": "I", + "field": "__k", + "name": "k", + "owner": "br" + }, + { + "access": 0, + "decoder": 702193221, + "descriptor": "I", + "field": "tileY", + "name": "aj", + "owner": "br" + }, + { + "access": 0, + "decoder": 892671055, + "descriptor": "I", + "field": "__t", + "name": "t", + "owner": "br" + }, + { + "access": 0, + "decoder": 91041167, + "descriptor": "I", + "field": "team", + "name": "h", + "owner": "br" + }, + { + "access": 0, + "decoder": 984869133, + "descriptor": "I", + "field": "combatLevel", + "name": "g", + "owner": "br" + }, + { + "access": 0, + "descriptor": "Ldu;", + "field": "model0", + "name": "a", + "owner": "br" + }, + { + "access": 0, + "descriptor": "Lhi;", + "field": "appearance", + "name": "f", + "owner": "br" + }, + { + "access": 0, + "descriptor": "Lkd;", + "field": "isFriend", + "name": "p", + "owner": "br" + }, + { + "access": 0, + "descriptor": "Lkd;", + "field": "isInClanChat", + "name": "v", + "owner": "br" + }, + { + "access": 0, + "descriptor": "Lkp;", + "field": "username", + "name": "m", + "owner": "br" + }, + { + "access": 0, + "descriptor": "Z", + "field": "__ag", + "name": "ag", + "owner": "br" + }, + { + "access": 0, + "descriptor": "Z", + "field": "isHidden", + "name": "b", + "owner": "br" + }, + { + "access": 0, + "descriptor": "Z", + "field": "isUnanimated", + "name": "y", + "owner": "br" + }, + { + "access": 0, + "descriptor": "[Ljava/lang/String;", + "field": "actions", + "name": "u", + "owner": "br" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(B)Z", + "method": "__f_124", + "name": "f", + "owner": "br", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(B)Z", + "method": "__o_127", + "name": "o", + "owner": "br", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)I", + "method": "transformedSize", + "name": "l", + "owner": "br", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "__g_129", + "name": "g", + "owner": "br", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "__q_125", + "name": "q", + "owner": "br", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "__u_128", + "name": "u", + "owner": "br", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(I)V", + "method": "__w_126", + "name": "w", + "owner": "br", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(III)V", + "method": "resetPath", + "name": "d", + "owner": "br", + "parameters": [ + "x", + "y" + ] + }, + { + "access": 16, + "descriptor": "(B)Z", + "method": "isVisible", + "name": "z", + "owner": "br", + "parameters": [] + }, + { + "access": 16, + "descriptor": "(IIBI)V", + "method": "__a_131", + "name": "a", + "owner": "br", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 16, + "descriptor": "(IIBI)V", + "method": "__x_130", + "name": "x", + "owner": "br", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 16, + "descriptor": "(Lgr;I)V", + "method": "read", + "name": "m", + "owner": "br", + "parameters": [ + "buffer" + ] + }, + { + "access": 20, + "descriptor": "(I)Ldu;", + "method": "getModel", + "name": "e", + "owner": "br", + "parameters": [] + } + ], + "name": "br", + "super": "bz" + }, + { + "access": 49, + "class": "Projectile", + "constructors": [ + { + "access": 0, + "descriptor": "(IIIIIIIIIII)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1038876505, + "descriptor": "I", + "field": "plane", + "name": "f", + "owner": "cb" + }, + { + "access": 0, + "decoder": -1421996173, + "descriptor": "I", + "field": "sourceY", + "name": "w", + "owner": "cb" + }, + { + "access": 0, + "decoder": -2072120189, + "descriptor": "I", + "field": "pitch", + "name": "b", + "owner": "cb" + }, + { + "access": 0, + "decoder": -2074328969, + "descriptor": "I", + "field": "int4", + "name": "x", + "owner": "cb" + }, + { + "access": 0, + "decoder": -377214997, + "descriptor": "I", + "field": "frame", + "name": "r", + "owner": "cb" + }, + { + "access": 0, + "decoder": -4446033, + "descriptor": "I", + "field": "sourceZ", + "name": "o", + "owner": "cb" + }, + { + "access": 0, + "decoder": -675081925, + "descriptor": "I", + "field": "int5", + "name": "u", + "owner": "cb" + }, + { + "access": 0, + "decoder": -742871951, + "descriptor": "I", + "field": "frameCycle", + "name": "p", + "owner": "cb" + }, + { + "access": 0, + "decoder": -769539171, + "descriptor": "I", + "field": "int3", + "name": "e", + "owner": "cb" + }, + { + "access": 0, + "decoder": 1281680175, + "descriptor": "I", + "field": "yaw", + "name": "h", + "owner": "cb" + }, + { + "access": 0, + "decoder": 1652455041, + "descriptor": "I", + "field": "sourceX", + "name": "q", + "owner": "cb" + }, + { + "access": 0, + "decoder": 2111080001, + "descriptor": "I", + "field": "id", + "name": "m", + "owner": "cb" + }, + { + "access": 0, + "decoder": 2121946763, + "descriptor": "I", + "field": "cycleEnd", + "name": "l", + "owner": "cb" + }, + { + "access": 0, + "decoder": 358196599, + "descriptor": "I", + "field": "cycleStart", + "name": "g", + "owner": "cb" + }, + { + "access": 0, + "decoder": 551413977, + "descriptor": "I", + "field": "targetIndex", + "name": "d", + "owner": "cb" + }, + { + "access": 0, + "descriptor": "D", + "field": "accelerationZ", + "name": "y", + "owner": "cb" + }, + { + "access": 0, + "descriptor": "D", + "field": "speed", + "name": "s", + "owner": "cb" + }, + { + "access": 0, + "descriptor": "D", + "field": "speedX", + "name": "z", + "owner": "cb" + }, + { + "access": 0, + "descriptor": "D", + "field": "speedY", + "name": "j", + "owner": "cb" + }, + { + "access": 0, + "descriptor": "D", + "field": "speedZ", + "name": "t", + "owner": "cb" + }, + { + "access": 0, + "descriptor": "D", + "field": "x", + "name": "n", + "owner": "cb" + }, + { + "access": 0, + "descriptor": "D", + "field": "y", + "name": "i", + "owner": "cb" + }, + { + "access": 0, + "descriptor": "D", + "field": "z", + "name": "a", + "owner": "cb" + }, + { + "access": 0, + "descriptor": "Ljh;", + "field": "sequenceDefinition", + "name": "c", + "owner": "cb" + }, + { + "access": 0, + "descriptor": "Z", + "field": "isMoving", + "name": "k", + "owner": "cb" + } + ], + "interfaces": [], + "methods": [ + { + "access": 16, + "descriptor": "(II)V", + "method": "advance", + "name": "f", + "owner": "cb", + "parameters": [ + "cycles" + ] + }, + { + "access": 16, + "descriptor": "(IIIII)V", + "method": "setDestination", + "name": "m", + "owner": "cb", + "parameters": [ + "cycle", + "height", + "x", + "y" + ] + }, + { + "access": 20, + "descriptor": "(I)Ldu;", + "method": "getModel", + "name": "e", + "owner": "cb", + "parameters": [] + } + ], + "name": "cb", + "super": "ex" + }, + { + "access": 49, + "class": "RasterProvider", + "constructors": [ + { + "access": 0, + "descriptor": "(IILjava/awt/Component;)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "Ljava/awt/Component;", + "field": "component0", + "name": "m", + "owner": "ai" + }, + { + "access": 0, + "descriptor": "Ljava/awt/Image;", + "field": "image", + "name": "f", + "owner": "ai" + } + ], + "interfaces": [], + "methods": [ + { + "access": 16, + "descriptor": "(Ljava/awt/Component;B)V", + "method": "setComponent", + "name": "m", + "owner": "ai" + }, + { + "access": 16, + "descriptor": "(Ljava/awt/Graphics;III)V", + "method": "drawFull0", + "name": "w", + "owner": "ai", + "parameters": [ + "graphics", + "x", + "y" + ] + }, + { + "access": 16, + "descriptor": "(Ljava/awt/Graphics;IIIIB)V", + "method": "draw0", + "name": "o", + "owner": "ai", + "parameters": [ + "graphics", + "height", + "width", + "x", + "y" + ] + }, + { + "access": 17, + "descriptor": "(III)V", + "method": "drawFull", + "name": "f", + "owner": "ai", + "parameters": [ + "x", + "y" + ] + }, + { + "access": 17, + "descriptor": "(IIIIB)V", + "method": "draw", + "name": "q", + "owner": "ai", + "parameters": [ + "height", + "width", + "x", + "y" + ] + } + ], + "name": "ai", + "super": "lp" + }, + { + "access": 49, + "class": "Sprite", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + }, + { + "access": 1, + "descriptor": "(II)V" + }, + { + "access": 1, + "descriptor": "([III)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "I", + "field": "xOffset", + "name": "o", + "owner": "ln" + }, + { + "access": 1, + "descriptor": "I", + "field": "height", + "name": "g", + "owner": "ln" + }, + { + "access": 1, + "descriptor": "I", + "field": "subHeight", + "name": "q", + "owner": "ln" + }, + { + "access": 1, + "descriptor": "I", + "field": "subWidth", + "name": "f", + "owner": "ln" + }, + { + "access": 1, + "descriptor": "I", + "field": "width", + "name": "u", + "owner": "ln" + }, + { + "access": 1, + "descriptor": "I", + "field": "yOffset", + "name": "w", + "owner": "ln" + }, + { + "access": 1, + "descriptor": "[I", + "field": "pixels", + "name": "m", + "owner": "ln" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(IIIIII)V", + "method": "__aw_512", + "name": "aw", + "owner": "ln", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4", + "arg5" + ] + }, + { + "access": 1, + "descriptor": "()Lln;", + "method": "copy", + "name": "m", + "owner": "ln", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()Lln;", + "method": "copyNormalized", + "name": "f", + "owner": "ln", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "__g_497", + "name": "g", + "owner": "ln", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "__q_494", + "name": "q", + "owner": "ln", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "__u_496", + "name": "u", + "owner": "ln", + "parameters": [] + }, + { + "access": 1, + "descriptor": "()V", + "method": "normalize", + "name": "w", + "owner": "ln", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "__e_499", + "name": "e", + "owner": "ln", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "__l_498", + "name": "l", + "owner": "ln", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(I)V", + "method": "__o_495", + "name": "o", + "owner": "ln", + "parameters": [ + "arg0" + ] + }, + { + "access": 1, + "descriptor": "(II)V", + "method": "__a_501", + "name": "a", + "owner": "ln", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(II)V", + "method": "__x_500", + "name": "x", + "owner": "ln", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(III)V", + "method": "__h_504", + "name": "h", + "owner": "ln", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "(III)V", + "method": "__v_506", + "name": "v", + "owner": "ln", + "parameters": [ + "arg0", + "arg1", + "arg2" + ] + }, + { + "access": 1, + "descriptor": "(IIII)V", + "method": "__ak_511", + "name": "ak", + "owner": "ln", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3" + ] + }, + { + "access": 1, + "descriptor": "(IIII)V", + "method": "__al_513", + "name": "al", + "owner": "ln", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3" + ] + }, + { + "access": 1, + "descriptor": "(IIII)V", + "method": "__j_502", + "name": "j", + "owner": "ln", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3" + ] + }, + { + "access": 1, + "descriptor": "(IIII)V", + "method": "__t_503", + "name": "t", + "owner": "ln", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3" + ] + }, + { + "access": 1, + "descriptor": "(IIIII)V", + "method": "__aj_507", + "name": "aj", + "owner": "ln", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4" + ] + }, + { + "access": 1, + "descriptor": "(IIIII)V", + "method": "__c_505", + "name": "c", + "owner": "ln", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4" + ] + }, + { + "access": 1, + "descriptor": "(IIIIIIDI)V", + "method": "__ah_510", + "name": "ah", + "owner": "ln", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4", + "arg5", + "arg6", + "arg7" + ] + }, + { + "access": 1, + "descriptor": "(IIIIIIII[I[I)V", + "method": "__ay_509", + "name": "ay", + "owner": "ln", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4", + "arg5", + "arg6", + "arg7", + "arg8", + "arg9" + ] + }, + { + "access": 1, + "descriptor": "(IIIIII[I[I)V", + "method": "__ac_508", + "name": "ac", + "owner": "ln", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4", + "arg5", + "arg6", + "arg7" + ] + } + ], + "name": "ln", + "super": "lf" + }, + { + "access": 49, + "class": "Tile", + "constructors": [ + { + "access": 0, + "descriptor": "(III)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1078135311, + "descriptor": "I", + "field": "minPlane", + "name": "a", + "owner": "dj" + }, + { + "access": 0, + "decoder": -172066661, + "descriptor": "I", + "field": "__h", + "name": "h", + "owner": "dj" + }, + { + "access": 0, + "decoder": -561562755, + "descriptor": "I", + "field": "y", + "name": "q", + "owner": "dj" + }, + { + "access": 0, + "decoder": -792635627, + "descriptor": "I", + "field": "gameObjectsCount", + "name": "d", + "owner": "dj" + }, + { + "access": 0, + "decoder": 103024387, + "descriptor": "I", + "field": "x", + "name": "f", + "owner": "dj" + }, + { + "access": 0, + "decoder": 1065165981, + "descriptor": "I", + "field": "plane", + "name": "m", + "owner": "dj" + }, + { + "access": 0, + "decoder": 1192947815, + "descriptor": "I", + "field": "gameObjectsEdgeMask", + "name": "i", + "owner": "dj" + }, + { + "access": 0, + "decoder": 1724493981, + "descriptor": "I", + "field": "__y", + "name": "y", + "owner": "dj" + }, + { + "access": 0, + "decoder": 2030010491, + "descriptor": "I", + "field": "__b", + "name": "b", + "owner": "dj" + }, + { + "access": 0, + "decoder": 507854577, + "descriptor": "I", + "field": "originalPlane", + "name": "w", + "owner": "dj" + }, + { + "access": 0, + "decoder": 769252193, + "descriptor": "I", + "field": "drawGameObjectEdges", + "name": "t", + "owner": "dj" + }, + { + "access": 0, + "descriptor": "Ldj;", + "field": "linkedBelowTile", + "name": "c", + "owner": "dj" + }, + { + "access": 0, + "descriptor": "Ldo;", + "field": "floorDecoration", + "name": "e", + "owner": "dj" + }, + { + "access": 0, + "descriptor": "Ldr;", + "field": "groundItemPile", + "name": "x", + "owner": "dj" + }, + { + "access": 0, + "descriptor": "Ldv;", + "field": "model", + "name": "u", + "owner": "dj" + }, + { + "access": 0, + "descriptor": "Leb;", + "field": "paint", + "name": "o", + "owner": "dj" + }, + { + "access": 0, + "descriptor": "Lej;", + "field": "boundaryObject", + "name": "g", + "owner": "dj" + }, + { + "access": 0, + "descriptor": "Leq;", + "field": "wallDecoration", + "name": "l", + "owner": "dj" + }, + { + "access": 0, + "descriptor": "Z", + "field": "drawGameObjects", + "name": "s", + "owner": "dj" + }, + { + "access": 0, + "descriptor": "Z", + "field": "drawPrimary", + "name": "z", + "owner": "dj" + }, + { + "access": 0, + "descriptor": "Z", + "field": "drawSecondary", + "name": "j", + "owner": "dj" + }, + { + "access": 0, + "descriptor": "[I", + "field": "gameObjectEdgeMasks", + "name": "n", + "owner": "dj" + }, + { + "access": 0, + "descriptor": "[Leh;", + "field": "gameObjects", + "name": "k", + "owner": "dj" + } + ], + "interfaces": [], + "methods": [], + "name": "dj", + "super": "gw" + }, + { + "access": 49, + "class": "TileModel", + "constructors": [ + { + "access": 0, + "descriptor": "(IIIIIIIIIIIIIIIIIII)V" + } + ], + "fields": [ + { + "access": 0, + "descriptor": "I", + "field": "overlayRgb", + "name": "a", + "owner": "dv" + }, + { + "access": 0, + "descriptor": "I", + "field": "rotation", + "name": "n", + "owner": "dv" + }, + { + "access": 0, + "descriptor": "I", + "field": "shape", + "name": "k", + "owner": "dv" + }, + { + "access": 0, + "descriptor": "I", + "field": "underlayRgb", + "name": "i", + "owner": "dv" + }, + { + "access": 0, + "descriptor": "Z", + "field": "isFlat", + "name": "d", + "owner": "dv" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__e", + "name": "e", + "owner": "dv" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__f", + "name": "f", + "owner": "dv" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__g", + "name": "g", + "owner": "dv" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__l", + "name": "l", + "owner": "dv" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__m", + "name": "m", + "owner": "dv" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__o", + "name": "o", + "owner": "dv" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__q", + "name": "q", + "owner": "dv" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__u", + "name": "u", + "owner": "dv" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__w", + "name": "w", + "owner": "dv" + }, + { + "access": 0, + "descriptor": "[I", + "field": "__x", + "name": "x", + "owner": "dv" + } + ], + "interfaces": [], + "methods": [], + "name": "dv", + "super": "java.lang.Object" + }, + { + "access": 49, + "class": "TilePaint", + "constructors": [ + { + "access": 0, + "descriptor": "(IIIIIIZ)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1057776035, + "descriptor": "I", + "field": "nwColor", + "name": "w", + "owner": "eb" + }, + { + "access": 0, + "decoder": -1668262341, + "descriptor": "I", + "field": "neColor", + "name": "q", + "owner": "eb" + }, + { + "access": 0, + "decoder": -1875844515, + "descriptor": "I", + "field": "seColor", + "name": "f", + "owner": "eb" + }, + { + "access": 0, + "decoder": 181759449, + "descriptor": "I", + "field": "swColor", + "name": "m", + "owner": "eb" + }, + { + "access": 0, + "decoder": 2097947337, + "descriptor": "I", + "field": "rgb", + "name": "g", + "owner": "eb" + }, + { + "access": 0, + "decoder": 463308567, + "descriptor": "I", + "field": "texture", + "name": "o", + "owner": "eb" + }, + { + "access": 0, + "descriptor": "Z", + "field": "isFlat", + "name": "u", + "owner": "eb" + } + ], + "interfaces": [], + "methods": [], + "name": "eb", + "super": "java.lang.Object" + }, + { + "access": 49, + "class": "Tiles", + "constructors": [], + "fields": [], + "interfaces": [], + "methods": [], + "name": "bq", + "super": "java.lang.Object" + }, + { + "access": 49, + "class": "WallDecoration", + "constructors": [ + { + "access": 0, + "descriptor": "()V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1164153171, + "descriptor": "I", + "field": "flags", + "name": "d", + "owner": "eq" + }, + { + "access": 0, + "decoder": -1531207607, + "descriptor": "I", + "field": "yOffset", + "name": "g", + "owner": "eq" + }, + { + "access": 0, + "decoder": -183359389, + "descriptor": "I", + "field": "orientation", + "name": "w", + "owner": "eq" + }, + { + "access": 0, + "decoder": -303827911, + "descriptor": "I", + "field": "int7", + "name": "o", + "owner": "eq" + }, + { + "access": 0, + "decoder": -629971645, + "descriptor": "I", + "field": "y", + "name": "q", + "owner": "eq" + }, + { + "access": 0, + "decoder": 1411967127, + "descriptor": "I", + "field": "x", + "name": "f", + "owner": "eq" + }, + { + "access": 0, + "decoder": 1781638945, + "descriptor": "I", + "field": "tileHeight", + "name": "m", + "owner": "eq" + }, + { + "access": 0, + "decoder": 1927462659, + "descriptor": "I", + "field": "xOffset", + "name": "u", + "owner": "eq" + }, + { + "access": 1, + "decoder": 3167575053900974600, + "descriptor": "J", + "field": "tag", + "name": "x", + "owner": "eq" + }, + { + "access": 1, + "descriptor": "Lex;", + "field": "entity1", + "name": "l", + "owner": "eq" + }, + { + "access": 1, + "descriptor": "Lex;", + "field": "entity2", + "name": "e", + "owner": "eq" + } + ], + "interfaces": [], + "methods": [], + "name": "eq", + "super": "java.lang.Object" + }, + { + "access": 49, + "class": "WorldMapManager", + "constructors": [ + { + "access": 1, + "descriptor": "([Llq;Ljava/util/HashMap;Lir;Lir;)V" + } + ], + "fields": [ + { + "access": 0, + "decoder": -1459928419, + "descriptor": "I", + "field": "__k", + "name": "k", + "owner": "al" + }, + { + "access": 0, + "decoder": -395718741, + "descriptor": "I", + "field": "__a", + "name": "a", + "owner": "al" + }, + { + "access": 0, + "decoder": 1364441271, + "descriptor": "I", + "field": "__n", + "name": "n", + "owner": "al" + }, + { + "access": 0, + "decoder": 1729323633, + "descriptor": "I", + "field": "__i", + "name": "i", + "owner": "al" + }, + { + "access": 0, + "descriptor": "Lae;", + "field": "mapAreaData", + "name": "q", + "owner": "al" + }, + { + "access": 0, + "descriptor": "Ljava/util/HashMap;", + "field": "__g", + "name": "g", + "owner": "al" + }, + { + "access": 0, + "descriptor": "Ljava/util/HashMap;", + "field": "icons", + "name": "o", + "owner": "al" + }, + { + "access": 0, + "descriptor": "Lln;", + "field": "overviewSprite", + "name": "w", + "owner": "al" + }, + { + "access": 0, + "descriptor": "Z", + "field": "isLoaded0", + "name": "m", + "owner": "al" + }, + { + "access": 0, + "descriptor": "Z", + "field": "loadStarted", + "name": "f", + "owner": "al" + }, + { + "access": 0, + "descriptor": "[Llq;", + "field": "mapSceneSprites", + "name": "l", + "owner": "al" + }, + { + "access": 0, + "descriptor": "[[Lav;", + "field": "regions", + "name": "u", + "owner": "al" + }, + { + "access": 1, + "decoder": 1085359673, + "descriptor": "I", + "field": "__z", + "name": "z", + "owner": "al" + }, + { + "access": 16, + "descriptor": "Lir;", + "field": "__e", + "name": "e", + "owner": "al" + }, + { + "access": 16, + "descriptor": "Lir;", + "field": "__x", + "name": "x", + "owner": "al" + }, + { + "access": 16, + "descriptor": "Ljava/util/HashMap;", + "field": "fonts", + "name": "d", + "owner": "al" + } + ], + "interfaces": [], + "methods": [ + { + "access": 0, + "descriptor": "(B)V", + "method": "buildIcons0", + "name": "x", + "owner": "al", + "parameters": [] + }, + { + "access": 0, + "descriptor": "(III)F", + "method": "__d_75", + "name": "d", + "owner": "al", + "parameters": [ + "arg0", + "arg1" + ] + }, + { + "access": 1, + "descriptor": "(I)Ljava/util/HashMap;", + "method": "buildIcons", + "name": "e", + "owner": "al", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(I)Z", + "method": "isLoaded", + "name": "l", + "owner": "al", + "parameters": [] + }, + { + "access": 1, + "descriptor": "(IIIIIIIIIII)Ljava/util/List;", + "method": "__u_74", + "name": "u", + "owner": "al", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4", + "arg5", + "arg6", + "arg7", + "arg8", + "arg9" + ] + }, + { + "access": 1, + "descriptor": "(IIIILjava/util/HashSet;III)V", + "method": "drawOverview", + "name": "o", + "owner": "al" + }, + { + "access": 1, + "descriptor": "(Lir;Ljava/lang/String;ZB)V", + "method": "load", + "name": "m", + "owner": "al", + "parameters": [ + "cacheName", + "archive", + "isMembersWorld" + ] + }, + { + "access": 17, + "descriptor": "(B)V", + "method": "clearIcons", + "name": "f", + "owner": "al", + "parameters": [] + }, + { + "access": 17, + "descriptor": "(IIIIIIIII)V", + "method": "__q_72", + "name": "q", + "owner": "al", + "parameters": [ + "arg0", + "arg1", + "arg2", + "arg3", + "arg4", + "arg5", + "arg6", + "arg7" + ] + }, + { + "access": 17, + "descriptor": "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZB)V", + "method": "__w_73", + "name": "w", + "owner": "al", + "parameters": [ + "arg0", + "arg1", + "arg10", + "arg11", + "arg12", + "arg2", + "arg3", + "arg4", + "arg5", + "arg6", + "arg7", + "arg8", + "arg9" + ] + } + ], + "name": "al", + "super": "java.lang.Object" + } +] \ No newline at end of file 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 e00b76428a..1f0275110c 100644 --- a/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java +++ b/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java @@ -27,6 +27,33 @@ public class InjectUtil public static Method findMethod(Inject inject, String name) throws InjectionException { + return findMethod(inject, name, null); + } + + public static Method findMethod(Inject inject, String name, String hint) throws InjectionException + { + if (hint != null) + { + ClassFile c = inject.getDeobfuscated().findClass(hint); + + if (c == null) + { + throw new InjectionException("Class " + hint + " doesn't exist. (check capitalization)"); + } + + Method deob = c.findMethod(name); + + if (deob != null) + { + String obfuscatedName = DeobAnnotations.getObfuscatedName(deob.getAnnotations()); + Signature obfuscatedSignature = DeobAnnotations.getObfuscatedSignature(deob); + + ClassFile ob = inject.toObClass(c); + + return ob.findMethod(obfuscatedName, (obfuscatedSignature != null) ? obfuscatedSignature : deob.getDescriptor()); + } + } + for (ClassFile c : inject.getDeobfuscated().getClasses()) { for (Method m : c.getMethods()) diff --git a/injector-plugin/src/main/java/net/runelite/injector/raw/DrawAfterWidgets.java b/injector-plugin/src/main/java/net/runelite/injector/raw/DrawAfterWidgets.java index e2250b894e..5b6f6fbd50 100644 --- a/injector-plugin/src/main/java/net/runelite/injector/raw/DrawAfterWidgets.java +++ b/injector-plugin/src/main/java/net/runelite/injector/raw/DrawAfterWidgets.java @@ -76,8 +76,8 @@ public class DrawAfterWidgets @Export("drawLoggedIn") final void drawLoggedIn() { - if(rootWidgetGroup != -1) { - ClientPreferences.method1809(rootWidgetGroup); + if(rootInterface != -1) { + ClientPreferences.method1809(rootInterface); } int var1; @@ -94,9 +94,9 @@ public class DrawAfterWidgets __client_lq = -1; __client_ln = -1; UserComparator6.__fg_jh = null; - if(rootWidgetGroup != -1) { + if(rootInterface != -1) { rootWidgetCount = 0; - Interpreter.method1977(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0, -1); + Interpreter.method1977(rootInterface, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0, -1); } < -- here appearantly diff --git a/injector-plugin/src/main/java/net/runelite/injector/raw/RenderDraw.java b/injector-plugin/src/main/java/net/runelite/injector/raw/RenderDraw.java index 25cccfc653..a3d71a4e4e 100644 --- a/injector-plugin/src/main/java/net/runelite/injector/raw/RenderDraw.java +++ b/injector-plugin/src/main/java/net/runelite/injector/raw/RenderDraw.java @@ -21,7 +21,7 @@ public class RenderDraw private static final Logger log = LoggerFactory.getLogger(RenderDraw.class); private static final net.runelite.asm.pool.Method renderDraw = new net.runelite.asm.pool.Method( new Class("net.runelite.client.callback.Hooks"), - "renderDraw", + "draw", new Signature("(Lnet/runelite/api/Renderable;IIIIIIIIJ)V") ); private final Inject inject; @@ -36,7 +36,7 @@ public class RenderDraw Stopwatch stopwatch = Stopwatch.createStarted(); net.runelite.asm.Method obmethod = findMethod(inject, "drawTile"); - Method renderDraw = findMethod(inject, "renderDraw").getPoolMethod(); + Method renderDraw = findMethod(inject, "draw", "Entity").getPoolMethod(); Instructions ins = obmethod.getCode().getInstructions(); replace(ins, renderDraw); @@ -69,7 +69,7 @@ public class RenderDraw } else if (count != 21) { - log.warn("Found {} renderDraws while 21 were expected. Rev update?", count); + log.warn("Found {} draws while 21 were expected. Rev update?", count); } else { diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/CameraMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/CameraMixin.java index 4c231426b6..ee8c0e1bed 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/CameraMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/CameraMixin.java @@ -66,7 +66,7 @@ public abstract class CameraMixin implements RSClient } } - @FieldHook("cameraPitchTarget") + @FieldHook("camAngleX") @Inject static void onCameraPitchTargetChanged(int idx) { diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index 6923447978..f0b2fe58d2 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -1335,7 +1335,7 @@ public abstract class RSClientMixin implements RSClient } @Inject - @MethodHook(value = "addChatMessage", end = true) + @MethodHook(value = "addMessage", end = true) public static void onAddChatMessage(int type, String name, String message, String sender) { Logger logger = client.getLogger(); @@ -1355,13 +1355,13 @@ public abstract class RSClientMixin implements RSClient } @Inject - @MethodHook("methodDraw") - public void methodDraw(boolean var1) + @MethodHook("draw") + public void draw(boolean var1) { callbacks.clientMainLoop(); } - @MethodHook("drawWidgetGroup") + @MethodHook("drawInterface") @Inject public static void renderWidgetLayer(Widget[] widgets, int parentId, int minX, int minY, int maxX, int maxY, int x, int y, int var8) { diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureMixin.java index b273fec9a6..6715cba2e4 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureMixin.java @@ -44,10 +44,10 @@ public abstract class RSTextureMixin implements RSTexture @Inject private float rl$v; - @Copy("Texture_animate") + @Copy("animate") public abstract void rs$animate(int diff); - @Replace("Texture_animate") + @Replace("animate") public void rl$animate(int diff) { // The client animates textures by cycling the backing pixels of the texture each fram diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java b/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java index 24cc729f68..bc094b0f91 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java @@ -100,7 +100,7 @@ public interface RSActor extends RSEntity, Actor // Idle animation - @Import("idleSequence") + @Import("readySequence") @Override void setIdlePoseAnimation(int animation); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index 84cab26673..4d3393c094 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java @@ -84,7 +84,7 @@ public interface RSClient extends RSGameShell, Client @Override int getFPS(); - @Import("minimapOrientation") + @Import("camAngleY") @Override int getMapAngle(); @@ -187,7 +187,7 @@ public interface RSClient extends RSGameShell, Client @Override void setDraggedOnWidget(Widget widget); - @Import("widgets") + @Import("interfaceComponents") RSWidget[][] getWidgets(); /** @@ -328,7 +328,7 @@ public interface RSClient extends RSGameShell, Client @Override RSWorld[] getWorldList(); - @Import("addChatMessage") + @Import("addMessage") void addChatMessage(int type, String name, String message, String sender); @Override @@ -514,7 +514,7 @@ public interface RSClient extends RSGameShell, Client * Get the widget top group. widgets[topGroup] contains widgets with * parentId -1, which are the widget roots. */ - @Import("rootWidgetGroup") + @Import("rootInterface") int getWidgetRoot(); @Import("WorldMapElement_cached") @@ -662,10 +662,10 @@ public interface RSClient extends RSGameShell, Client * * (1) JAU - Jagex Angle Unit; 1/1024 of a revolution */ - @Import("cameraPitchTarget") + @Import("camAngleX") int getCameraPitchTarget(); - @Import("cameraPitchTarget") + @Import("camAngleX") void setCameraPitchTarget(int pitch); @Import("Scene_cameraPitchSine") diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSEntity.java b/runescape-api/src/main/java/net/runelite/rs/api/RSEntity.java index 89229d0fb6..0392a0dbbf 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSEntity.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSEntity.java @@ -40,7 +40,7 @@ public interface RSEntity extends RSNode, Renderable @Override RSModel getModel(); - @Import("renderDraw") + @Import("draw") @Override void draw(int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y, int z, long hash); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNPCDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNPCDefinition.java index fef328c669..7e6fd4ba16 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSNPCDefinition.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSNPCDefinition.java @@ -9,7 +9,7 @@ public interface RSNPCDefinition extends NPCDefinition @Override String getName(); - @Import("archives") + @Import("models") @Override int[] getModels(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java b/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java index 0949305e33..0b2705397d 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java @@ -34,6 +34,6 @@ public interface RSScene extends Scene @Import("ySize") int getMaxZ(); - @Import("Scene_minPlane") + @Import("minPlane") int getMinLevel(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSVarbitDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSVarbitDefinition.java index 2624226dd5..947106c183 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSVarbitDefinition.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSVarbitDefinition.java @@ -4,12 +4,12 @@ import net.runelite.mapping.Import; public interface RSVarbitDefinition extends RSDualNode { - @Import("varp") + @Import("baseVar") int getIndex(); - @Import("lowBit") + @Import("startBit") int getLeastSignificantBit(); - @Import("highBit") + @Import("endBit") int getMostSignificantBit(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java index f8134a75b5..85c45da695 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java @@ -312,7 +312,7 @@ public interface RSWidget extends Widget @Override void setHasListener(boolean hasListener); - @Import("onKeyListener") + @Import("onKey") @Override Object[] getOnKeyListener(); @@ -320,11 +320,11 @@ public interface RSWidget extends Widget @Override Object[] getOnLoadListener(); - @Import("onDialogAbortListener") + @Import("onDialogAbort") @Override void setOnDialogAbortListener(Object... args); - @Import("onKeyListener") + @Import("onKey") @Override void setOnKeyListener(Object... args); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java index eb7f92d551..c13e58d668 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java @@ -43,7 +43,7 @@ public interface RSWorldMap extends RenderOverview @Override RSWorldMapManager getWorldMapManager(); - @Import("initializeWorldMap") + @Import("initializeWorldMapManager") @Override void initializeWorldMap(WorldMapData var1); diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index cd7c6c4c6f..541d5d657f 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -58,17 +58,17 @@ public abstract class AbstractByteArrayCopier { signature = "(II)V", garbageValue = "-1941491045" ) - @Export("unloadWidgetGroup") - public static void unloadWidgetGroup(int var0) { - if (var0 != -1 && Widget.loadedWidgetGroups[var0]) { + @Export("unloadInterface") + public static void unloadInterface(int var0) { + if (var0 != -1 && Widget.loadedInterfaces[var0]) { Widget.Widget_archive.method7(var0); - if (Widget.widgets[var0] != null) { + if (Widget.interfaceComponents[var0] != null) { boolean var1 = true; - for (int var2 = 0; var2 < Widget.widgets[var0].length; ++var2) { - if (Widget.widgets[var0][var2] != null) { - if (Widget.widgets[var0][var2].type != 2) { - Widget.widgets[var0][var2] = null; + for (int var2 = 0; var2 < Widget.interfaceComponents[var0].length; ++var2) { + if (Widget.interfaceComponents[var0][var2] != null) { + if (Widget.interfaceComponents[var0][var2].type != 2) { + Widget.interfaceComponents[var0][var2] = null; } else { var1 = false; } @@ -76,10 +76,10 @@ public abstract class AbstractByteArrayCopier { } if (var1) { - Widget.widgets[var0] = null; + Widget.interfaceComponents[var0] = null; } - Widget.loadedWidgetGroups[var0] = false; + Widget.loadedInterfaces[var0] = false; } } diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java index 0c7a6326c8..1e66754c59 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -63,7 +63,7 @@ public abstract class AbstractSocket { public static void method3488(int var0) { class214.field1129 = 1; class214.field1130 = null; - class30.musicTrackArchiveId = -1; + class30.musicTrackGroupId = -1; GrandExchangeOffer.musicTrackFileId = -1; WorldMapLabel.field1039 = 0; RectangleMode.musicTrackBoolean = false; diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 654adba8db..9f2d053651 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -52,7 +52,7 @@ public abstract class AbstractUserComparator implements Comparator { int var2 = Client.field128; class214.field1129 = 1; class214.field1130 = var1; - class30.musicTrackArchiveId = var0; + class30.musicTrackGroupId = var0; GrandExchangeOffer.musicTrackFileId = 0; WorldMapLabel.field1039 = var2; RectangleMode.musicTrackBoolean = false; diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index f064ca4096..165e826ca9 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -42,8 +42,8 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = -299122235 ) - @Export("idleSequence") - int idleSequence; + @Export("readySequence") + int readySequence; @ObfuscatedName("al") @ObfuscatedGetter( intValue = -831787909 @@ -66,20 +66,20 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = -1598871111 ) - @Export("walkTurnSequence") - int walkTurnSequence; + @Export("walkBackSequence") + int walkBackSequence; @ObfuscatedName("ad") @ObfuscatedGetter( intValue = -568830521 ) - @Export("walkTurnLeftSequence") - int walkTurnLeftSequence; + @Export("walkLeftSequence") + int walkLeftSequence; @ObfuscatedName("ap") @ObfuscatedGetter( intValue = -257240117 ) - @Export("walkTurnRightSequence") - int walkTurnRightSequence; + @Export("walkRightSequence") + int walkRightSequence; @ObfuscatedName("as") @ObfuscatedGetter( intValue = 1708570917 @@ -318,13 +318,13 @@ public abstract class Actor extends Entity { Actor() { this.field10 = false; this.size = 1; - this.idleSequence = -1; + this.readySequence = -1; this.turnLeftSequence = -1; this.turnRightSequence = -1; this.walkSequence = -1; - this.walkTurnSequence = -1; - this.walkTurnLeftSequence = -1; - this.walkTurnRightSequence = -1; + this.walkBackSequence = -1; + this.walkLeftSequence = -1; + this.walkRightSequence = -1; this.runSequence = -1; this.overheadText = null; this.field11 = false; diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index fc6e29e9d1..aa99584f22 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -71,7 +71,7 @@ public class Archive extends AbstractArchive { Players.NetCache_reference.index = var7 * 8 + 5; int var8 = Players.NetCache_reference.readInt(); int var9 = Players.NetCache_reference.readInt(); - this.loadIndexReference(var8, var9); + this.loadIndex(var8, var9); } else { PacketBuffer.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); NetCache.NetCache_archives[var7] = this; @@ -171,8 +171,8 @@ public class Archive extends AbstractArchive { signature = "(III)V", garbageValue = "-1621053520" ) - @Export("loadIndexReference") - public void loadIndexReference(int var1, int var2) { + @Export("loadIndex") + public void loadIndex(int var1, int var2) { this.indexCrc = var1; this.indexVersion = var2; if (this.masterDisk != null) { diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index 7652cd2c19..24608e765e 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -11,8 +11,8 @@ import net.runelite.mapping.ObfuscatedSignature; public final class ArchiveDisk { @ObfuscatedName("m") - @Export("IndexStore_buffer") - static byte[] IndexStore_buffer; + @Export("ArchiveDisk_buffer") + static byte[] ArchiveDisk_buffer; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ldy;" @@ -70,9 +70,9 @@ public final class ArchiveDisk } this.idxFile.seek((long)(var1 * 6)); - this.idxFile.read(IndexStore_buffer, 0, 6); - int var5 = ((IndexStore_buffer[0] & 255) << 16) + (IndexStore_buffer[2] & 255) + ((IndexStore_buffer[1] & 255) << 8); - int var6 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8); + this.idxFile.read(ArchiveDisk_buffer, 0, 6); + int var5 = ((ArchiveDisk_buffer[0] & 255) << 16) + (ArchiveDisk_buffer[2] & 255) + ((ArchiveDisk_buffer[1] & 255) << 8); + int var6 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); if (var5 < 0 || var5 > this.maxEntrySize) { var4 = null; var10000 = ((byte[])var4); @@ -97,15 +97,15 @@ public final class ArchiveDisk var10 = 512; } - this.datFile.read(IndexStore_buffer, 0, var10 + 8); - int var11 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8); - int var12 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8); - int var13 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255); - int var14 = IndexStore_buffer[7] & 255; + this.datFile.read(ArchiveDisk_buffer, 0, var10 + 8); + int var11 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); + int var12 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); + int var13 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); + int var14 = ArchiveDisk_buffer[7] & 255; if (var11 == var1 && var9 == var12 && var14 == this.archive) { if (var13 >= 0 && (long)var13 <= this.datFile.length() / 520L) { for (int var15 = 0; var15 < var10; ++var15) { - var7[var8++] = IndexStore_buffer[var15 + 8]; + var7[var8++] = ArchiveDisk_buffer[var15 + 8]; } var6 = var13; @@ -180,8 +180,8 @@ public final class ArchiveDisk } this.idxFile.seek((long)(var1 * 6)); - this.idxFile.read(IndexStore_buffer, 0, 6); - var7 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8); + this.idxFile.read(ArchiveDisk_buffer, 0, 6); + var7 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); if (var7 <= 0 || (long)var7 > this.datFile.length() / 520L) { var8 = false; var10000 = var8; @@ -194,14 +194,14 @@ public final class ArchiveDisk } } - IndexStore_buffer[0] = (byte)(var3 >> 16); - IndexStore_buffer[1] = (byte)(var3 >> 8); - IndexStore_buffer[2] = (byte)var3; - IndexStore_buffer[3] = (byte)(var7 >> 16); - IndexStore_buffer[4] = (byte)(var7 >> 8); - IndexStore_buffer[5] = (byte)var7; + ArchiveDisk_buffer[0] = (byte)(var3 >> 16); + ArchiveDisk_buffer[1] = (byte)(var3 >> 8); + ArchiveDisk_buffer[2] = (byte)var3; + ArchiveDisk_buffer[3] = (byte)(var7 >> 16); + ArchiveDisk_buffer[4] = (byte)(var7 >> 8); + ArchiveDisk_buffer[5] = (byte)var7; this.idxFile.seek((long)(var1 * 6)); - this.idxFile.write(IndexStore_buffer, 0, 6); + this.idxFile.write(ArchiveDisk_buffer, 0, 6); int var9 = 0; int var10 = 0; @@ -214,15 +214,15 @@ public final class ArchiveDisk this.datFile.seek((long)(var7 * 520)); try { - this.datFile.read(IndexStore_buffer, 0, 8); + this.datFile.read(ArchiveDisk_buffer, 0, 8); } catch (EOFException var16) { break label129; } - var12 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8); - int var13 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8); - var11 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255); - int var14 = IndexStore_buffer[7] & 255; + var12 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); + int var13 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); + var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); + int var14 = ArchiveDisk_buffer[7] & 255; if (var12 != var1 || var13 != var10 || var14 != this.archive) { var8 = false; var10000 = var8; @@ -252,16 +252,16 @@ public final class ArchiveDisk var11 = 0; } - IndexStore_buffer[0] = (byte)(var1 >> 8); - IndexStore_buffer[1] = (byte)var1; - IndexStore_buffer[2] = (byte)(var10 >> 8); - IndexStore_buffer[3] = (byte)var10; - IndexStore_buffer[4] = (byte)(var11 >> 16); - IndexStore_buffer[5] = (byte)(var11 >> 8); - IndexStore_buffer[6] = (byte)var11; - IndexStore_buffer[7] = (byte)this.archive; + ArchiveDisk_buffer[0] = (byte)(var1 >> 8); + ArchiveDisk_buffer[1] = (byte)var1; + ArchiveDisk_buffer[2] = (byte)(var10 >> 8); + ArchiveDisk_buffer[3] = (byte)var10; + ArchiveDisk_buffer[4] = (byte)(var11 >> 16); + ArchiveDisk_buffer[5] = (byte)(var11 >> 8); + ArchiveDisk_buffer[6] = (byte)var11; + ArchiveDisk_buffer[7] = (byte)this.archive; this.datFile.seek((long)(var7 * 520)); - this.datFile.write(IndexStore_buffer, 0, 8); + this.datFile.write(ArchiveDisk_buffer, 0, 8); var12 = var3 - var9; if (var12 > 512) { var12 = 512; @@ -491,6 +491,6 @@ public final class ArchiveDisk } static { - IndexStore_buffer = new byte[520]; + ArchiveDisk_buffer = new byte[520]; } } diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java index d2470fc62b..ab50457c36 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -94,7 +94,7 @@ public class ArchiveDiskAction extends Node { var5 = false; } - if (var0.movementSequence == var0.idleSequence && (var0.field22 > 25 || var5)) { + if (var0.movementSequence == var0.readySequence && (var0.field22 > 25 || var5)) { if (var0.turnLeftSequence != -1) { var0.movementSequence = var0.turnLeftSequence; } else { @@ -109,7 +109,7 @@ public class ArchiveDiskAction extends Node { var5 = false; } - if (var0.movementSequence == var0.idleSequence && (var0.field22 > 25 || var5)) { + if (var0.movementSequence == var0.readySequence && (var0.field22 > 25 || var5)) { if (var0.turnRightSequence != -1) { var0.movementSequence = var0.turnRightSequence; } else { diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index 4d5e10af84..217a8415c8 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -101,7 +101,7 @@ public final class BoundaryObject { Client.showMouseOverText = !Client.showMouseOverText; } - if (Client.rights >= 2) { + if (Client.staffModLevel >= 2) { if (var0.equalsIgnoreCase("errortest")) { throw new RuntimeException(); } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index 79705785be..c4b82e87ce 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -223,7 +223,7 @@ public final class Canvas extends java.awt.Canvas { int var7 = var1.getFileId(var6, var3); class214.field1129 = 1; class214.field1130 = var1; - class30.musicTrackArchiveId = var6; + class30.musicTrackGroupId = var6; GrandExchangeOffer.musicTrackFileId = var7; WorldMapLabel.field1039 = var4; RectangleMode.musicTrackBoolean = var5; @@ -243,7 +243,7 @@ public final class Canvas extends java.awt.Canvas { if (var0.hitpoints == 0) { if (var0.field903 < 0 || VarbitDefinition.method4910(var0.field903, var0.field905)) { - ParamKeyDefinition.method4933(var0.level, var0.type, var0.x, var0.y, var0.field903, var0.field904, var0.field905); + ParamDefinition.method4933(var0.level, var0.type, var0.x, var0.y, var0.field903, var0.field904, var0.field905); var0.remove(); } } else { @@ -252,7 +252,7 @@ public final class Canvas extends java.awt.Canvas { } if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102 && (var0.id < 0 || VarbitDefinition.method4910(var0.id, var0.field908))) { - ParamKeyDefinition.method4933(var0.level, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field908); + ParamDefinition.method4933(var0.level, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field908); var0.delay = -1; if (var0.field903 == var0.id && var0.field903 == -1) { var0.remove(); diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index a2f64f0c5e..647011e1b9 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -18,8 +18,8 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -783816509 ) - @Export("rootWidgetGroup") - static int rootWidgetGroup; + @Export("rootInterface") + static int rootInterface; @ObfuscatedName("mc") @ObfuscatedSignature( signature = "Lho;" @@ -132,8 +132,8 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 821563709 ) - @Export("rights") - static int rights; + @Export("staffModLevel") + static int staffModLevel; @ObfuscatedName("oi") @Export("rootWidgetYs") static int[] rootWidgetYs; @@ -860,14 +860,14 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 410614005 ) - @Export("cameraPitchTarget") - static int cameraPitchTarget; + @Export("camAngleX") + static int camAngleX; @ObfuscatedName("hp") @ObfuscatedGetter( intValue = -1163038981 ) - @Export("minimapOrientation") - static int minimapOrientation; + @Export("camAngleY") + static int camAngleY; @ObfuscatedName("hv") @ObfuscatedGetter( intValue = 218086227 @@ -898,8 +898,8 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 1005832199 ) - @Export("cameraFollowHeight") - static int cameraFollowHeight; + @Export("camFollowHeight") + static int camFollowHeight; @ObfuscatedName("hc") @ObfuscatedGetter( intValue = -441913785 @@ -1252,7 +1252,7 @@ public final class Client extends GameShell implements Usernamed { protected final void vmethod107() { field99 = class203.currentTimeMs() + 500L; this.method84(); - if (rootWidgetGroup != -1) { + if (rootInterface != -1) { this.method87(true); } @@ -1277,7 +1277,7 @@ public final class Client extends GameShell implements Usernamed { this.setUpKeyboard(); this.setUpMouse(); class16.mouseWheel = this.mouseWheel(); - Fonts.archiveDisk255 = new ArchiveDisk(255, class168.dat2File, class168.idx255File, 500000); + Fonts.masterDisk = new ArchiveDisk(255, class168.dat2File, class168.idx255File, 500000); ReflectionCheck.clientPreferences = class306.method5780(); this.setUpClipboard(); String var1 = Ignored.field402; @@ -1299,8 +1299,8 @@ public final class Client extends GameShell implements Usernamed { signature = "(I)V", garbageValue = "1445885427" ) - @Export("packetHandler") - protected final void packetHandler() { + @Export("doCycle") + protected final void doCycle() { ++cycle; this.doCycleJs5(); class3.method41(); @@ -2214,14 +2214,14 @@ public final class Client extends GameShell implements Usernamed { signature = "(ZI)V", garbageValue = "106302203" ) - @Export("methodDraw") - protected final void methodDraw(boolean var1) { + @Export("draw") + protected final void draw(boolean var1) { boolean var2; label139: { try { if (class214.field1129 == 2) { if (class13.musicTrack == null) { - class13.musicTrack = MusicTrack.readTrack(class214.field1130, class30.musicTrackArchiveId, GrandExchangeOffer.musicTrackFileId); + class13.musicTrack = MusicTrack.readTrack(class214.field1130, class30.musicTrackGroupId, GrandExchangeOffer.musicTrackFileId); if (class13.musicTrack == null) { var2 = false; break label139; @@ -2872,7 +2872,7 @@ public final class Client extends GameShell implements Usernamed { Players.NetCache_reference.index = var12 * 8 + 5; var13 = Players.NetCache_reference.readInt(); int var23 = Players.NetCache_reference.readInt(); - var22.loadIndexReference(var13, var23); + var22.loadIndex(var13, var23); } } } else { @@ -3436,7 +3436,7 @@ public final class Client extends GameShell implements Usernamed { } WorldMapSection0.savePreferences(); - rights = ((AbstractSocket)var1).readUnsignedByte(); + staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); field155 = ((AbstractSocket)var1).readUnsignedByte() == 1; localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); localPlayerIndex <<= 8; @@ -3817,8 +3817,8 @@ public final class Client extends GameShell implements Usernamed { field200 = 20; field201 = false; var6 = Interpreter.method1915(ClientPacket.field261, packetWriter.isaacCipher); - var6.packetBuffer.method64(cameraPitchTarget); - var6.packetBuffer.writeShortLE(minimapOrientation); + var6.packetBuffer.method64(camAngleX); + var6.packetBuffer.writeShortLE(camAngleY); packetWriter.method241(var6); } @@ -3899,7 +3899,7 @@ public final class Client extends GameShell implements Usernamed { field137 = 0; while (Decimator.method2490() && field137 < 128) { - if (rights >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && ArchiveDiskAction.field411 == 66) { + if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && ArchiveDiskAction.field411 == 66) { String var22 = KeyHandler.method839(); TextureProvider.client.clipboardSetString(var22); } else if (oculusOrbState != 1 || GzipDecompressor.field378 <= 0) { @@ -3931,8 +3931,8 @@ public final class Client extends GameShell implements Usernamed { mouseWheelRotation = 0; } - if (rootWidgetGroup != -1) { - WorldMapDecorationType.method4517(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0); + if (rootInterface != -1) { + WorldMapDecorationType.method4517(rootInterface, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0); } ++cycleCntr; @@ -4295,8 +4295,8 @@ public final class Client extends GameShell implements Usernamed { ) @Export("drawLoggedIn") final void drawLoggedIn() { - if (rootWidgetGroup != -1) { - ClientPreferences.method1809(rootWidgetGroup); + if (rootInterface != -1) { + ClientPreferences.method1809(rootInterface); } int var1; @@ -4313,9 +4313,9 @@ public final class Client extends GameShell implements Usernamed { field216 = -1; field217 = -1; UserComparator6.field937 = null; - if (rootWidgetGroup != -1) { + if (rootInterface != -1) { rootWidgetCount = 0; - Interpreter.drawWidgets(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0, -1); + Interpreter.drawWidgets(rootInterface, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0, -1); } Rasterizer2D.Rasterizer2D_resetClip(); @@ -4781,10 +4781,10 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field873 == var1.serverPacket0) { var37 = var3.method67(); - rootWidgetGroup = var37; + rootInterface = var37; this.method87(false); DevicePcmPlayerProvider.method845(var37); - WorldMapSection3.runWidgetOnLoadListener(rootWidgetGroup); + WorldMapSection3.runWidgetOnLoadListener(rootInterface); for (var6 = 0; var6 < 100; ++var6) { field100[var6] = true; @@ -4891,8 +4891,8 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field841 == var1.serverPacket0) { - if (rootWidgetGroup != -1) { - GrandExchangeEvents.method74(rootWidgetGroup, 0); + if (rootInterface != -1) { + GrandExchangeEvents.method74(rootInterface, 0); } var1.serverPacket0 = null; @@ -5176,7 +5176,7 @@ public final class Client extends GameShell implements Usernamed { class22.method295(var16); this.alignWidget(var16); if (var16.type == 0) { - class39.revalidateWidgetScroll(Widget.widgets[var37 >> 16], var16, false); + class39.revalidateWidgetScroll(Widget.interfaceComponents[var37 >> 16], var16, false); } } @@ -5233,7 +5233,7 @@ public final class Client extends GameShell implements Usernamed { InterfaceParent var48 = (InterfaceParent)interfaceParents.get((long)var6); var22 = (InterfaceParent)interfaceParents.get((long)var37); if (var22 != null) { - MenuAction.closeWidgetGroup(var22, var48 == null || var48.group != var22.group); + MenuAction.closeInterface(var22, var48 == null || var48.group != var22.group); } if (var48 != null) { @@ -5249,11 +5249,11 @@ public final class Client extends GameShell implements Usernamed { var15 = Huffman.getWidget(var37); if (var15 != null) { class22.method295(var15); - class39.revalidateWidgetScroll(Widget.widgets[var15.id >>> 16], var15, true); + class39.revalidateWidgetScroll(Widget.interfaceComponents[var15.id >>> 16], var15, true); } - if (rootWidgetGroup != -1) { - GrandExchangeEvents.method74(rootWidgetGroup, 1); + if (rootInterface != -1) { + GrandExchangeEvents.method74(rootInterface, 1); } var1.serverPacket0 = null; @@ -5378,9 +5378,9 @@ public final class Client extends GameShell implements Usernamed { field156 = (field156 + 1) % 100; String var55 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3))); if (var29.modIcon != -1) { - GrandExchangeEvents.addChatMessage(9, ItemContainer.method1170(var29.modIcon) + var21, var55, Clock.method3534(var25)); + GrandExchangeEvents.addMessage(9, ItemContainer.method1170(var29.modIcon) + var21, var55, Clock.method3534(var25)); } else { - GrandExchangeEvents.addChatMessage(9, var21, var55, Clock.method3534(var25)); + GrandExchangeEvents.addMessage(9, var21, var55, Clock.method3534(var25)); } } @@ -5579,11 +5579,11 @@ public final class Client extends GameShell implements Usernamed { var37 = var3.index + var1.serverPacket0Length; var6 = var3.readUnsignedShort(); var5 = var3.readUnsignedShort(); - if (var6 != rootWidgetGroup) { - rootWidgetGroup = var6; + if (var6 != rootInterface) { + rootInterface = var6; this.method87(false); - DevicePcmPlayerProvider.method845(rootWidgetGroup); - WorldMapSection3.runWidgetOnLoadListener(rootWidgetGroup); + DevicePcmPlayerProvider.method845(rootInterface); + WorldMapSection3.runWidgetOnLoadListener(rootInterface); for (var10 = 0; var10 < 100; ++var10) { field100[var10] = true; @@ -5596,7 +5596,7 @@ public final class Client extends GameShell implements Usernamed { var12 = var3.readUnsignedByte(); var50 = (InterfaceParent)interfaceParents.get((long)var10); if (var50 != null && var11 != var50.group) { - MenuAction.closeWidgetGroup(var50, true); + MenuAction.closeInterface(var50, true); var50 = null; } @@ -5609,7 +5609,7 @@ public final class Client extends GameShell implements Usernamed { if (var22.keep) { var22.keep = false; } else { - MenuAction.closeWidgetGroup(var22, true); + MenuAction.closeInterface(var22, true); } } @@ -5694,7 +5694,7 @@ public final class Client extends GameShell implements Usernamed { var37 = var3.readInt(); var50 = (InterfaceParent)interfaceParents.get((long)var37); if (var50 != null) { - MenuAction.closeWidgetGroup(var50, true); + MenuAction.closeInterface(var50, true); } if (field127 != null) { @@ -5755,7 +5755,7 @@ public final class Client extends GameShell implements Usernamed { var5 = var3.method67(); var22 = (InterfaceParent)interfaceParents.get((long)var6); if (var22 != null) { - MenuAction.closeWidgetGroup(var22, var5 != var22.group); + MenuAction.closeInterface(var22, var5 != var22.group); } SecureRandomCallable.method1143(var6, var5, var37); @@ -6065,11 +6065,11 @@ public final class Client extends GameShell implements Usernamed { garbageValue = "-271438207" ) final void method87(boolean var1) { - int var2 = rootWidgetGroup; + int var2 = rootInterface; int var3 = SoundCache.canvasWidth; int var4 = Huffman.canvasHeight; - if (GroundItemPile.loadWidgetGroup(var2)) { - WorldMapRegion.notRevalidateWidgetScroll(Widget.widgets[var2], -1, var3, var4, var1); + if (GroundItemPile.loadInterface(var2)) { + WorldMapRegion.notRevalidateWidgetScroll(Widget.interfaceComponents[var2], -1, var3, var4, var1); } } @@ -6310,14 +6310,14 @@ public final class Client extends GameShell implements Usernamed { field187 = 7759444; field188 = false; field189 = 0; - cameraPitchTarget = 128; - minimapOrientation = 0; + camAngleX = 128; + camAngleY = 0; field190 = 0; field191 = 0; field192 = 0; field193 = 0; oculusOrbState = 0; - cameraFollowHeight = 50; + camFollowHeight = 50; field194 = 0; field195 = 0; field196 = 0; @@ -6401,7 +6401,7 @@ public final class Client extends GameShell implements Usernamed { field157 = -1; selectedSpellActionName = null; selectedSpellName = null; - rootWidgetGroup = -1; + rootInterface = -1; interfaceParents = new NodeHashTable(8); field151 = 0; field153 = -1; @@ -6410,7 +6410,7 @@ public final class Client extends GameShell implements Usernamed { field127 = null; runEnergy = 0; weight = 0; - rights = 0; + staffModLevel = 0; followerIndex = -1; field155 = false; viewportWidget = null; diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index 6383e1ba8e..3abd42b636 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -149,8 +149,8 @@ public class ClientPreferences { garbageValue = "0" ) static final void method1809(int var0) { - if (GroundItemPile.loadWidgetGroup(var0)) { - NetFileRequest.method4555(Widget.widgets[var0], -1); + if (GroundItemPile.loadInterface(var0)) { + NetFileRequest.method4555(Widget.interfaceComponents[var0], -1); } } diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index b690a94ca8..9b46288631 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -149,8 +149,8 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { signature = "([Lho;IIIIIIIII)V", garbageValue = "-1516599170" ) - @Export("drawWidgetGroup") - static final void drawWidgetGroup(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + @Export("drawInterface") + static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); Rasterizer3D.Rasterizer3D_method1(); @@ -328,9 +328,9 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } } - drawWidgetGroup(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); if (var10.children != null) { - drawWidgetGroup(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); } InterfaceParent var23 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); @@ -781,8 +781,8 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { garbageValue = "-1666917204" ) static final void method845(int var0) { - if (GroundItemPile.loadWidgetGroup(var0)) { - Widget[] var1 = Widget.widgets[var0]; + if (GroundItemPile.loadInterface(var0)) { + Widget[] var1 = Widget.interfaceComponents[var0]; for (int var2 = 0; var2 < var1.length; ++var2) { Widget var3 = var1[var2]; diff --git a/runescape-client/src/main/java/Entity.java b/runescape-client/src/main/java/Entity.java index e0778c1f42..2886344d41 100644 --- a/runescape-client/src/main/java/Entity.java +++ b/runescape-client/src/main/java/Entity.java @@ -29,12 +29,12 @@ public abstract class Entity extends DualNode { } @ObfuscatedName("cy") - @Export("renderDraw") - void renderDraw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { + @Export("draw") + void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { Model var11 = this.getModel(); if (var11 != null) { this.height = var11.height; - var11.renderDraw(var1, var2, var3, var4, var5, var6, var7, var8, var9); + var11.draw(var1, var2, var3, var4, var5, var6, var7, var8, var9); } } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index ad42db9f0f..2d06743ef8 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -11,14 +11,14 @@ public class FloorUnderlayDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("UnderlayDefinition_archive") - static AbstractArchive UnderlayDefinition_archive; + @Export("FloorUnderlayDefinition_archive") + static AbstractArchive FloorUnderlayDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" ) - @Export("UnderlayDefinition_cached") - static EvictingDualNodeHashTable UnderlayDefinition_cached; + @Export("FloorUnderlayDefinition_cached") + static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -635678213 @@ -181,6 +181,6 @@ public class FloorUnderlayDefinition extends DualNode { } static { - UnderlayDefinition_cached = new EvictingDualNodeHashTable(64); + FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64); } } diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index 60de7ff47b..81cb67cf78 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -11,8 +11,8 @@ public class Fonts { @ObfuscatedSignature( signature = "Lff;" ) - @Export("archiveDisk255") - static ArchiveDisk archiveDisk255; + @Export("masterDisk") + static ArchiveDisk masterDisk; @ObfuscatedName("o") static byte[][][] field350; @ObfuscatedName("l") diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index df20c9fc66..0df652b880 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -332,6 +332,6 @@ public class FriendSystem { ) @Export("jmodCheck") public static boolean jmodCheck() { - return Client.rights >= 2; + return Client.staffModLevel >= 2; } } diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index f8117a3898..0285a383e9 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -598,7 +598,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene class230.field1138 = hasFocus; } - this.packetHandler(); + this.doCycle(); } @ObfuscatedName("ar") @@ -635,7 +635,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } this.method110(); - this.methodDraw(this.field369); + this.draw(this.field369); if (this.field369) { this.clearBackground(); } @@ -718,16 +718,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(I)V", garbageValue = "1445885427" ) - @Export("packetHandler") - protected abstract void packetHandler(); + @Export("doCycle") + protected abstract void doCycle(); @ObfuscatedName("ab") @ObfuscatedSignature( signature = "(ZI)V", garbageValue = "106302203" ) - @Export("methodDraw") - protected abstract void methodDraw(boolean var1); + @Export("draw") + protected abstract void draw(boolean var1); @ObfuscatedName("ae") @ObfuscatedSignature( @@ -1001,7 +1001,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public final void windowOpened(WindowEvent var1) { } - @ObfuscatedName("init") + @ObfuscatedName("postDecode") public abstract void vmethod117(); @ObfuscatedName("stop") diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index f801e63adf..011fa3a829 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -78,8 +78,8 @@ public class GrandExchangeEvents { signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", garbageValue = "1601363438" ) - @Export("addChatMessage") - static void addChatMessage(int var0, String var1, String var2, String var3) { + @Export("addMessage") + static void addMessage(int var0, String var1, String var2, String var3) { ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); if (var4 == null) { var4 = new ChatChannel(); @@ -166,8 +166,8 @@ public class GrandExchangeEvents { garbageValue = "-635606409" ) static final void method74(int var0, int var1) { - if (GroundItemPile.loadWidgetGroup(var0)) { - class30.method570(Widget.widgets[var0], var1); + if (GroundItemPile.loadInterface(var0)) { + class30.method570(Widget.interfaceComponents[var0], var1); } } diff --git a/runescape-client/src/main/java/GroundItemPile.java b/runescape-client/src/main/java/GroundItemPile.java index 6c8c2ea2b5..5bf3db6b4a 100644 --- a/runescape-client/src/main/java/GroundItemPile.java +++ b/runescape-client/src/main/java/GroundItemPile.java @@ -67,38 +67,38 @@ public final class GroundItemPile { signature = "(IB)Z", garbageValue = "-60" ) - @Export("loadWidgetGroup") - public static boolean loadWidgetGroup(int var0) { - if (Widget.loadedWidgetGroups[var0]) { + @Export("loadInterface") + public static boolean loadInterface(int var0) { + if (Widget.loadedInterfaces[var0]) { return true; } else if (!Widget.Widget_archive.tryLoadGroup(var0)) { return false; } else { int var1 = Widget.Widget_archive.method4(var0); if (var1 == 0) { - Widget.loadedWidgetGroups[var0] = true; + Widget.loadedInterfaces[var0] = true; return true; } else { - if (Widget.widgets[var0] == null) { - Widget.widgets[var0] = new Widget[var1]; + if (Widget.interfaceComponents[var0] == null) { + Widget.interfaceComponents[var0] = new Widget[var1]; } for (int var2 = 0; var2 < var1; ++var2) { - if (Widget.widgets[var0][var2] == null) { + if (Widget.interfaceComponents[var0][var2] == null) { byte[] var3 = Widget.Widget_archive.takeFile(var0, var2); if (var3 != null) { - Widget.widgets[var0][var2] = new Widget(); - Widget.widgets[var0][var2].id = var2 + (var0 << 16); + Widget.interfaceComponents[var0][var2] = new Widget(); + Widget.interfaceComponents[var0][var2].id = var2 + (var0 << 16); if (var3[0] == -1) { - Widget.widgets[var0][var2].decode(new Buffer(var3)); + Widget.interfaceComponents[var0][var2].decode(new Buffer(var3)); } else { - Widget.widgets[var0][var2].decodeLegacy(new Buffer(var3)); + Widget.interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); } } } } - Widget.loadedWidgetGroups[var0] = true; + Widget.loadedInterfaces[var0] = true; return true; } } diff --git a/runescape-client/src/main/java/GzipDecompressor.java b/runescape-client/src/main/java/GzipDecompressor.java index d7a03ede82..f44d3f8c94 100644 --- a/runescape-client/src/main/java/GzipDecompressor.java +++ b/runescape-client/src/main/java/GzipDecompressor.java @@ -66,7 +66,7 @@ public class GzipDecompressor { var1.decode(new Buffer(var2)); } - var1.init(); + var1.postDecode(); StructDefinition.field886.put(var1, (long)var0); return var1; } diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index b8de92c5b8..3ec70bc75d 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -307,14 +307,14 @@ public class Huffman { public static Widget getWidget(int var0) { int var1 = var0 >> 16; int var2 = var0 & 65535; - if (Widget.widgets[var1] == null || Widget.widgets[var1][var2] == null) { - boolean var3 = GroundItemPile.loadWidgetGroup(var1); + if (Widget.interfaceComponents[var1] == null || Widget.interfaceComponents[var1][var2] == null) { + boolean var3 = GroundItemPile.loadInterface(var1); if (!var3) { return null; } } - return Widget.widgets[var1][var2]; + return Widget.interfaceComponents[var1][var2]; } @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index 6fe4a6179e..328d7db1b9 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -187,11 +187,11 @@ public class Interpreter { ) @Export("drawWidgets") static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (GroundItemPile.loadWidgetGroup(var0)) { + if (GroundItemPile.loadInterface(var0)) { class279.field1145 = null; - DevicePcmPlayerProvider.drawWidgetGroup(Widget.widgets[var0], -1, var1, var2, var3, var4, var5, var6, var7); + DevicePcmPlayerProvider.drawInterface(Widget.interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); if (class279.field1145 != null) { - DevicePcmPlayerProvider.drawWidgetGroup(class279.field1145, -1412584499, var1, var2, var3, var4, class54.field1161, class157.field1114, var7); + DevicePcmPlayerProvider.drawInterface(class279.field1145, -1412584499, var1, var2, var3, var4, class54.field1161, class157.field1114, var7); class279.field1145 = null; } } else if (var7 != -1) { diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index 51524ccff0..a762466103 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -60,7 +60,7 @@ public class InvDefinition extends DualNode { garbageValue = "-121177696" ) public static void method4754() { - ParamKeyDefinition.ParamKeyDefinition_cached.clear(); + ParamDefinition.ParamDefinition_cached.clear(); } static { diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index f19226a6d2..4cbd72177b 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -124,8 +124,8 @@ public class ItemDefinition extends DualNode { @ObfuscatedGetter( intValue = 881309855 ) - @Export("shiftClickIndex0") - int shiftClickIndex0; + @Export("shiftClickIndex") + int shiftClickIndex; @ObfuscatedName("ah") @ObfuscatedGetter( intValue = 939367983 @@ -248,8 +248,8 @@ public class ItemDefinition extends DualNode { @ObfuscatedGetter( intValue = -1057008657 ) - @Export("int1") - public int int1; + @Export("team") + public int team; @ObfuscatedName("bq") @ObfuscatedSignature( signature = "Llh;" @@ -297,7 +297,7 @@ public class ItemDefinition extends DualNode { this.isMembersOnly = false; this.groundActions = new String[]{null, null, "Take", null, null}; this.inventoryActions = new String[]{null, null, null, null, "Drop"}; - this.shiftClickIndex0 = -2; + this.shiftClickIndex = -2; this.maleModel = -1; this.maleModel1 = -1; this.maleOffset = 0; @@ -317,7 +317,7 @@ public class ItemDefinition extends DualNode { this.resizeZ = 128; this.ambient = 0; this.contrast = 0; - this.int1 = 0; + this.team = 0; this.isTradable = false; this.unnotedId = -1; this.notedId = -1; @@ -423,7 +423,7 @@ public class ItemDefinition extends DualNode { this.retextureTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 == 42) { - this.shiftClickIndex0 = var1.readByte(); + this.shiftClickIndex = var1.readByte(); } else if (var2 == 65) { this.isTradable = true; } else if (var2 == 78) { @@ -463,7 +463,7 @@ public class ItemDefinition extends DualNode { } else if (var2 == 114) { this.contrast = var1.readByte(); } else if (var2 == 115) { - this.int1 = var1.readUnsignedByte(); + this.team = var1.readUnsignedByte(); } else if (var2 == 139) { this.unnotedId = var1.readUnsignedShort(); } else if (var2 == 140) { @@ -532,7 +532,7 @@ public class ItemDefinition extends DualNode { this.maleHeadModel2 = var2.maleHeadModel2; this.femaleHeadModel = var2.femaleHeadModel; this.femaleHeadModel2 = var2.femaleHeadModel2; - this.int1 = var2.int1; + this.team = var2.team; this.groundActions = var2.groundActions; this.inventoryActions = new String[5]; if (var2.inventoryActions != null) { @@ -891,7 +891,7 @@ public class ItemDefinition extends DualNode { ) @Export("getShiftClickIndex") public int getShiftClickIndex() { - return this.shiftClickIndex0 != -1 && this.inventoryActions != null ? (this.shiftClickIndex0 >= 0 ? (this.inventoryActions[this.shiftClickIndex0] != null ? this.shiftClickIndex0 : -1) : ("Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1)) : -1; + return this.shiftClickIndex != -1 && this.inventoryActions != null ? (this.shiftClickIndex >= 0 ? (this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex : -1) : ("Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1)) : -1; } static { diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index 8048dd8f77..2aac8708a3 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -36,8 +36,8 @@ public class KitDefinition extends DualNode { @Export("bodypartID") public int bodypartID; @ObfuscatedName("u") - @Export("modelIDs") - int[] modelIDs; + @Export("models2") + int[] models2; @ObfuscatedName("g") @Export("recolorFrom") short[] recolorFrom; @@ -51,15 +51,15 @@ public class KitDefinition extends DualNode { @Export("retextureTo") short[] retextureTo; @ObfuscatedName("d") - @Export("archives") - int[] archives; + @Export("models") + int[] models; @ObfuscatedName("k") @Export("nonSelectable") public boolean nonSelectable; KitDefinition() { this.bodypartID = -1; - this.archives = new int[]{-1, -1, -1, -1, -1}; + this.models = new int[]{-1, -1, -1, -1, -1}; this.nonSelectable = false; } @@ -94,10 +94,10 @@ public class KitDefinition extends DualNode { int var4; if (var2 == 2) { var3 = var1.readUnsignedByte(); - this.modelIDs = new int[var3]; + this.models2 = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.modelIDs[var4] = var1.readUnsignedShort(); + this.models2[var4] = var1.readUnsignedShort(); } } else if (var2 == 3) { this.nonSelectable = true; @@ -120,7 +120,7 @@ public class KitDefinition extends DualNode { this.retextureTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 >= 60 && var2 < 70) { - this.archives[var2 - 60] = var1.readUnsignedShort(); + this.models[var2 - 60] = var1.readUnsignedShort(); } } @@ -133,13 +133,13 @@ public class KitDefinition extends DualNode { ) @Export("ready") public boolean ready() { - if (this.modelIDs == null) { + if (this.models2 == null) { return true; } else { boolean var1 = true; - for (int var2 = 0; var2 < this.modelIDs.length; ++var2) { - if (!field456.tryLoadFile(this.modelIDs[var2], 0)) { + for (int var2 = 0; var2 < this.models2.length; ++var2) { + if (!field456.tryLoadFile(this.models2[var2], 0)) { var1 = false; } } @@ -155,13 +155,13 @@ public class KitDefinition extends DualNode { ) @Export("getModelData") public ModelData getModelData() { - if (this.modelIDs == null) { + if (this.models2 == null) { return null; } else { - ModelData[] var1 = new ModelData[this.modelIDs.length]; + ModelData[] var1 = new ModelData[this.models2.length]; - for (int var2 = 0; var2 < this.modelIDs.length; ++var2) { - var1[var2] = ModelData.method2788(field456, this.modelIDs[var2], 0); + for (int var2 = 0; var2 < this.models2.length; ++var2) { + var1[var2] = ModelData.method2788(field456, this.models2[var2], 0); } ModelData var4; @@ -197,7 +197,7 @@ public class KitDefinition extends DualNode { boolean var1 = true; for (int var2 = 0; var2 < 5; ++var2) { - if (this.archives[var2] != -1 && !field456.tryLoadFile(this.archives[var2], 0)) { + if (this.models[var2] != -1 && !field456.tryLoadFile(this.models[var2], 0)) { var1 = false; } } @@ -215,8 +215,8 @@ public class KitDefinition extends DualNode { int var2 = 0; for (int var3 = 0; var3 < 5; ++var3) { - if (this.archives[var3] != -1) { - var1[var2++] = ModelData.method2788(field456, this.archives[var3], 0); + if (this.models[var3] != -1) { + var1[var2++] = ModelData.method2788(field456, this.models[var3], 0); } } diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 3394eeb850..75aa7d03e9 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -189,7 +189,7 @@ public class Login { public static void method2076(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { class214.field1129 = 1; class214.field1130 = var0; - class30.musicTrackArchiveId = var1; + class30.musicTrackGroupId = var1; GrandExchangeOffer.musicTrackFileId = var2; WorldMapLabel.field1039 = var3; RectangleMode.musicTrackBoolean = var4; diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index c574af3a5a..4712119a3f 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -65,13 +65,13 @@ public class MenuAction { signature = "(Lbx;ZI)V", garbageValue = "1537219807" ) - @Export("closeWidgetGroup") - static final void closeWidgetGroup(InterfaceParent var0, boolean var1) { + @Export("closeInterface") + static final void closeInterface(InterfaceParent var0, boolean var1) { int var2 = var0.group; int var3 = (int)var0.key; var0.remove(); if (var1) { - AbstractByteArrayCopier.unloadWidgetGroup(var2); + AbstractByteArrayCopier.unloadInterface(var2); } for (IntegerNode var4 = (IntegerNode)Client.widgetClickMasks.first(); var4 != null; var4 = (IntegerNode)Client.widgetClickMasks.next()) { @@ -152,8 +152,8 @@ public class MenuAction { GameShell.menuY = var14; class214.menuWidth = var7; AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22; - if (Client.rootWidgetGroup != -1) { - GrandExchangeEvents.method74(Client.rootWidgetGroup, 1); + if (Client.rootInterface != -1) { + GrandExchangeEvents.method74(Client.rootInterface, 1); } } diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index 236da05475..c3b75ed38f 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -1527,8 +1527,8 @@ public class Model extends Entity { } @ObfuscatedName("cy") - @Export("renderDraw") - void renderDraw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { + @Export("draw") + void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { field529[0] = -1; if (this.boundsType != 1) { this.calculateBoundsCylinder(); diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index 9ef1e9e603..488b96e0c2 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -272,7 +272,7 @@ public class MouseRecorder implements Runnable { if (var4 != null) { Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); if (Client.minimapState != 2 && Client.minimapState != 5) { - int var5 = Client.minimapOrientation & 2047; + int var5 = Client.camAngleY & 2047; int var6 = Canvas.localPlayer.x / 32 + 48; int var7 = 464 - Canvas.localPlayer.y / 32; InterfaceParent.sceneMinimapSprite.method315(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index 5ff51015fb..b8f9870ea3 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -127,7 +127,7 @@ public final class NPC extends Actor { return null; } else { SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapAreaData.getSequenceDefinition(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence == -1 || super.movementSequence == super.idleSequence && var1 != null ? null : WorldMapAreaData.getSequenceDefinition(super.movementSequence); + SequenceDefinition var2 = super.movementSequence == -1 || super.movementSequence == super.readySequence && var1 != null ? null : WorldMapAreaData.getSequenceDefinition(super.movementSequence); Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); if (var3 == null) { return null; diff --git a/runescape-client/src/main/java/NPCDefinition.java b/runescape-client/src/main/java/NPCDefinition.java index 7a6ec0a6bd..4f473abdf5 100644 --- a/runescape-client/src/main/java/NPCDefinition.java +++ b/runescape-client/src/main/java/NPCDefinition.java @@ -52,16 +52,16 @@ public class NPCDefinition extends DualNode { @Export("size") public int size; @ObfuscatedName("l") - @Export("archives") - int[] archives; + @Export("models") + int[] models; @ObfuscatedName("e") int[] field636; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 275200787 ) - @Export("idleSequence") - public int idleSequence; + @Export("readySequence") + public int readySequence; @ObfuscatedName("d") @ObfuscatedGetter( intValue = 819690597 @@ -84,20 +84,20 @@ public class NPCDefinition extends DualNode { @ObfuscatedGetter( intValue = 1952230339 ) - @Export("walkTurnSequence") - public int walkTurnSequence; + @Export("walkBackSequence") + public int walkBackSequence; @ObfuscatedName("a") @ObfuscatedGetter( intValue = -1213774321 ) - @Export("walkTurnLeftSequence") - public int walkTurnLeftSequence; + @Export("walkLeftSequence") + public int walkLeftSequence; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -96930503 ) - @Export("walkTurnRightSequence") - public int walkTurnRightSequence; + @Export("walkRightSequence") + public int walkRightSequence; @ObfuscatedName("j") @Export("recolorFrom") short[] recolorFrom; @@ -192,13 +192,13 @@ public class NPCDefinition extends DualNode { NPCDefinition() { this.name = "null"; this.size = 1; - this.idleSequence = -1; + this.readySequence = -1; this.turnLeftSequence = -1; this.turnRightSequence = -1; this.walkSequence = -1; - this.walkTurnSequence = -1; - this.walkTurnLeftSequence = -1; - this.walkTurnRightSequence = -1; + this.walkBackSequence = -1; + this.walkLeftSequence = -1; + this.walkRightSequence = -1; this.actions = new String[5]; this.drawMapDot = true; this.combatLevel = -1; @@ -221,8 +221,8 @@ public class NPCDefinition extends DualNode { signature = "(I)V", garbageValue = "482179419" ) - @Export("init") - void init() { + @Export("postDecode") + void postDecode() { } @ObfuscatedName("w") @@ -253,17 +253,17 @@ public class NPCDefinition extends DualNode { int var4; if (var2 == 1) { var3 = var1.readUnsignedByte(); - this.archives = new int[var3]; + this.models = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.archives[var4] = var1.readUnsignedShort(); + this.models[var4] = var1.readUnsignedShort(); } } else if (var2 == 2) { this.name = var1.readStringCp1252NullTerminated(); } else if (var2 == 12) { this.size = var1.readUnsignedByte(); } else if (var2 == 13) { - this.idleSequence = var1.readUnsignedShort(); + this.readySequence = var1.readUnsignedShort(); } else if (var2 == 14) { this.walkSequence = var1.readUnsignedShort(); } else if (var2 == 15) { @@ -272,9 +272,9 @@ public class NPCDefinition extends DualNode { this.turnRightSequence = var1.readUnsignedShort(); } else if (var2 == 17) { this.walkSequence = var1.readUnsignedShort(); - this.walkTurnSequence = var1.readUnsignedShort(); - this.walkTurnLeftSequence = var1.readUnsignedShort(); - this.walkTurnRightSequence = var1.readUnsignedShort(); + this.walkBackSequence = var1.readUnsignedShort(); + this.walkLeftSequence = var1.readUnsignedShort(); + this.walkRightSequence = var1.readUnsignedShort(); } else if (var2 >= 30 && var2 < 35) { this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { @@ -382,8 +382,8 @@ public class NPCDefinition extends DualNode { if (var5 == null) { boolean var6 = false; - for (int var7 = 0; var7 < this.archives.length; ++var7) { - if (!NpcDefinition_modelArchive.tryLoadFile(this.archives[var7], 0)) { + for (int var7 = 0; var7 < this.models.length; ++var7) { + if (!NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) { var6 = true; } } @@ -392,11 +392,11 @@ public class NPCDefinition extends DualNode { return null; } - ModelData[] var12 = new ModelData[this.archives.length]; + ModelData[] var12 = new ModelData[this.models.length]; int var8; - for (var8 = 0; var8 < this.archives.length; ++var8) { - var12[var8] = ModelData.method2788(NpcDefinition_modelArchive, this.archives[var8], 0); + for (var8 = 0; var8 < this.models.length; ++var8) { + var12[var8] = ModelData.method2788(NpcDefinition_modelArchive, this.models[var8], 0); } ModelData var9; diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index 6a2b99a04e..da43e7940b 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -96,7 +96,7 @@ public class NetFileRequest extends DualNode { ) static final void method4554(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { if (var4 != null) { - int var6 = Client.minimapOrientation & 2047; + int var6 = Client.camAngleY & 2047; int var7 = var3 * var3 + var2 * var2; if (var7 <= 6400) { int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index 54d1ed474d..5a90300641 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -218,8 +218,8 @@ public class ObjectDefinition extends DualNode { @ObfuscatedGetter( intValue = -2119965579 ) - @Export("transformConfigId") - int transformConfigId; + @Export("transformVarp") + int transformVarp; @ObfuscatedName("az") @ObfuscatedGetter( intValue = 374616127 @@ -282,7 +282,7 @@ public class ObjectDefinition extends DualNode { this.isSolid = false; this.int3 = -1; this.transformVarbit = -1; - this.transformConfigId = -1; + this.transformVarp = -1; this.ambientSoundId = -1; this.int4 = 0; this.int5 = 0; @@ -294,8 +294,8 @@ public class ObjectDefinition extends DualNode { signature = "(I)V", garbageValue = "-245255765" ) - @Export("init") - void init() { + @Export("postDecode") + void postDecode() { if (this.int1 == -1) { this.int1 = 0; if (this.field644 != null && (this.field645 == null || this.field645[0] == 10)) { @@ -478,9 +478,9 @@ public class ObjectDefinition extends DualNode { this.transformVarbit = -1; } - this.transformConfigId = var1.readUnsignedShort(); - if (this.transformConfigId == 65535) { - this.transformConfigId = -1; + this.transformVarp = var1.readUnsignedShort(); + if (this.transformVarp == 65535) { + this.transformVarp = -1; } var3 = -1; @@ -827,8 +827,8 @@ public class ObjectDefinition extends DualNode { int var1 = -1; if (this.transformVarbit != -1) { var1 = WorldMapSection2.getVarbit(this.transformVarbit); - } else if (this.transformConfigId != -1) { - var1 = Varps.Varps_main[this.transformConfigId]; + } else if (this.transformVarp != -1) { + var1 = Varps.Varps_main[this.transformVarp]; } int var2; @@ -914,7 +914,7 @@ public class ObjectDefinition extends DualNode { var1.decode(new Buffer(var2)); } - var1.init(); + var1.postDecode(); NPCDefinition.NpcDefinition_cached.put(var1, (long)var0); return var1; } diff --git a/runescape-client/src/main/java/OwnWorldComparator.java b/runescape-client/src/main/java/OwnWorldComparator.java index db30ccb06f..6066ee60cd 100644 --- a/runescape-client/src/main/java/OwnWorldComparator.java +++ b/runescape-client/src/main/java/OwnWorldComparator.java @@ -57,16 +57,16 @@ public class OwnWorldComparator implements Comparator { 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; + Client.camAngleX = var3; + Client.camAngleY = var4; } return 1; } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cameraPitchTarget; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.camAngleX; return 1; } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.minimapOrientation; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.camAngleY; return 1; } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; @@ -74,10 +74,10 @@ public class OwnWorldComparator implements Comparator { var3 = 0; } - Client.cameraFollowHeight = var3; + Client.camFollowHeight = var3; return 1; } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cameraFollowHeight; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.camFollowHeight; return 1; } else { return 2; diff --git a/runescape-client/src/main/java/ParamKeyDefinition.java b/runescape-client/src/main/java/ParamDefinition.java similarity index 96% rename from runescape-client/src/main/java/ParamKeyDefinition.java rename to runescape-client/src/main/java/ParamDefinition.java index 1b721ed1c0..f0d36e45d5 100644 --- a/runescape-client/src/main/java/ParamKeyDefinition.java +++ b/runescape-client/src/main/java/ParamDefinition.java @@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("jb") -@Implements("ParamKeyDefinition") -public class ParamKeyDefinition extends DualNode { +@Implements("ParamDefinition") +public class ParamDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lir;" @@ -16,8 +16,8 @@ public class ParamKeyDefinition extends DualNode { @ObfuscatedSignature( signature = "Ler;" ) - @Export("ParamKeyDefinition_cached") - static EvictingDualNodeHashTable ParamKeyDefinition_cached; + @Export("ParamDefinition_cached") + static EvictingDualNodeHashTable ParamDefinition_cached; @ObfuscatedName("q") @Export("type") char type; @@ -25,17 +25,17 @@ public class ParamKeyDefinition extends DualNode { @ObfuscatedGetter( intValue = 1133042753 ) - @Export("keyInt") - public int keyInt; + @Export("defaultInt") + public int defaultInt; @ObfuscatedName("o") - @Export("keyString") - public String keyString; + @Export("defaultStr") + public String defaultStr; @ObfuscatedName("u") - @Export("isMembersOnly") - boolean isMembersOnly; + @Export("autoDisable") + boolean autoDisable; - ParamKeyDefinition() { - this.isMembersOnly = true; + ParamDefinition() { + this.autoDisable = true; } @ObfuscatedName("f") @@ -43,8 +43,8 @@ public class ParamKeyDefinition extends DualNode { signature = "(B)V", garbageValue = "121" ) - @Export("init") - void init() { + @Export("postDecode") + void postDecode() { } @ObfuscatedName("q") @@ -74,11 +74,11 @@ public class ParamKeyDefinition extends DualNode { if (var2 == 1) { this.type = class14.method171(var1.readByte()); } else if (var2 == 2) { - this.keyInt = var1.readInt(); + this.defaultInt = var1.readInt(); } else if (var2 == 4) { - this.isMembersOnly = false; + this.autoDisable = false; } else if (var2 == 5) { - this.keyString = var1.readStringCp1252NullTerminated(); + this.defaultStr = var1.readStringCp1252NullTerminated(); } } @@ -391,6 +391,6 @@ public class ParamKeyDefinition extends DualNode { } static { - ParamKeyDefinition_cached = new EvictingDualNodeHashTable(64); + ParamDefinition_cached = new EvictingDualNodeHashTable(64); } } diff --git a/runescape-client/src/main/java/PendingSpawn.java b/runescape-client/src/main/java/PendingSpawn.java index 8e4e90b17d..b37305c175 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -97,9 +97,9 @@ public final class PendingSpawn extends Node { ) public static void method1695(int var0, int var1) { VarbitDefinition var2 = Occluder.method3255(var0); - int var3 = var2.varp; - int var4 = var2.lowBit; - int var5 = var2.highBit; + int var3 = var2.baseVar; + int var4 = var2.startBit; + int var5 = var2.endBit; int var6 = Varps.Varps_masks[var5 - var4]; if (var1 < 0 || var1 > var6) { var1 = 0; diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 52f8e3af95..dcb1e0dc4e 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -214,7 +214,7 @@ public final class Player extends Actor { } if (var4[var7] >= 512) { - int var8 = Skills.getItemDefinition(var4[var7] - 512).int1; + int var8 = Skills.getItemDefinition(var4[var7] - 512).team; if (var8 != 0) { this.team = var8; } @@ -233,9 +233,9 @@ public final class Player extends Actor { var9[var5] = var6; } - super.idleSequence = var1.readUnsignedShort(); - if (super.idleSequence == 65535) { - super.idleSequence = -1; + super.readySequence = var1.readUnsignedShort(); + if (super.readySequence == 65535) { + super.readySequence = -1; } super.turnLeftSequence = var1.readUnsignedShort(); @@ -249,19 +249,19 @@ public final class Player extends Actor { super.walkSequence = -1; } - super.walkTurnSequence = var1.readUnsignedShort(); - if (super.walkTurnSequence == 65535) { - super.walkTurnSequence = -1; + super.walkBackSequence = var1.readUnsignedShort(); + if (super.walkBackSequence == 65535) { + super.walkBackSequence = -1; } - super.walkTurnLeftSequence = var1.readUnsignedShort(); - if (super.walkTurnLeftSequence == 65535) { - super.walkTurnLeftSequence = -1; + super.walkLeftSequence = var1.readUnsignedShort(); + if (super.walkLeftSequence == 65535) { + super.walkLeftSequence = -1; } - super.walkTurnRightSequence = var1.readUnsignedShort(); - if (super.walkTurnRightSequence == 65535) { - super.walkTurnRightSequence = -1; + super.walkRightSequence = var1.readUnsignedShort(); + if (super.walkRightSequence == 65535) { + super.walkRightSequence = -1; } super.runSequence = var1.readUnsignedShort(); @@ -279,7 +279,7 @@ public final class Player extends Actor { this.combatLevel = var1.readUnsignedByte(); this.skillLevel = var1.readUnsignedShort(); this.isHidden = var1.readUnsignedByte() == 1; - if (Client.gameBuild == 0 && Client.rights >= 2) { + if (Client.gameBuild == 0 && Client.staffModLevel >= 2) { this.isHidden = false; } @@ -379,7 +379,7 @@ public final class Player extends Actor { return null; } else { SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapAreaData.getSequenceDefinition(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.idleSequence != super.movementSequence || var1 == null) ? WorldMapAreaData.getSequenceDefinition(super.movementSequence) : null; + SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.readySequence != super.movementSequence || var1 == null) ? WorldMapAreaData.getSequenceDefinition(super.movementSequence) : null; Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); if (var3 == null) { return null; diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index 3fee0d60ae..9a55cda333 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -61,8 +61,8 @@ public class Scene { @ObfuscatedSignature( signature = "[Leh;" ) - @Export("Scene_gameObjects") - static GameObject[] Scene_gameObjects; + @Export("gameObjects") + static GameObject[] gameObjects; @ObfuscatedName("ac") @Export("checkClick") static boolean checkClick; @@ -168,8 +168,8 @@ public class Scene { @Export("tiles") Tile[][][] tiles; @ObfuscatedName("g") - @Export("Scene_minPlane") - int Scene_minPlane; + @Export("minPlane") + int minPlane; @ObfuscatedName("l") @Export("tempGameObjectsCount") int tempGameObjectsCount; @@ -187,7 +187,7 @@ public class Scene { int[][] field771; public Scene(int var1, int var2, int var3, int[][][] var4) { - this.Scene_minPlane = 0; + this.minPlane = 0; this.tempGameObjectsCount = 0; this.tempGameObjects = new GameObject[5000]; this.field770 = new int[][]{{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1}, {0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1}, {1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1}, {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1}}; @@ -228,8 +228,8 @@ public class Scene { this.tempGameObjectsCount = 0; - for (var1 = 0; var1 < Scene_gameObjects.length; ++var1) { - Scene_gameObjects[var1] = null; + for (var1 = 0; var1 < gameObjects.length; ++var1) { + gameObjects[var1] = null; } } @@ -237,7 +237,7 @@ public class Scene { @ObfuscatedName("f") @Export("init") public void init(int var1) { - this.Scene_minPlane = var1; + this.minPlane = var1; for (int var2 = 0; var2 < this.xSize; ++var2) { for (int var3 = 0; var3 < this.ySize; ++var3) { @@ -1100,7 +1100,7 @@ public class Scene { Tile[][] var8; int var9; int var10; - for (var7 = this.Scene_minPlane; var7 < this.planes; ++var7) { + for (var7 = this.minPlane; var7 < this.planes; ++var7) { var8 = this.tiles[var7]; for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { @@ -1132,7 +1132,7 @@ public class Scene { Tile var14; int var15; int var16; - for (var7 = this.Scene_minPlane; var7 < this.planes; ++var7) { + for (var7 = this.minPlane; var7 < this.planes; ++var7) { var8 = this.tiles[var7]; for (var9 = -25; var9 <= 0; ++var9) { @@ -1183,7 +1183,7 @@ public class Scene { } } - for (var7 = this.Scene_minPlane; var7 < this.planes; ++var7) { + for (var7 = this.minPlane; var7 < this.planes; ++var7) { var8 = this.tiles[var7]; for (var9 = -25; var9 <= 0; ++var9) { @@ -1342,13 +1342,13 @@ public class Scene { var16 = var9.boundaryObject; if (var16 != null) { - var16.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var16.x - Scene_cameraX, var16.tileHeight - Scene_cameraY, var16.y - Scene_cameraZ, var16.tag); + var16.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var16.x - Scene_cameraX, var16.tileHeight - Scene_cameraY, var16.y - Scene_cameraZ, var16.tag); } for (var10 = 0; var10 < var9.gameObjectsCount; ++var10) { var17 = var9.gameObjects[var10]; if (var17 != null) { - var17.entity.renderDraw(var17.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var17.centerX - Scene_cameraX, var17.height - Scene_cameraY, var17.centerY - Scene_cameraZ, var17.tag); + var17.entity.draw(var17.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var17.centerX - Scene_cameraX, var17.height - Scene_cameraY, var17.centerY - Scene_cameraZ, var17.tag); } } } @@ -1411,17 +1411,17 @@ public class Scene { } if ((var23.orientationA & var10) != 0 && !this.method298(var7, var4, var5, var23.orientationA)) { - var23.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); + var23.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } if ((var23.orientationB & var10) != 0 && !this.method298(var7, var4, var5, var23.orientationB)) { - var23.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); + var23.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } } if (var24 != null && !this.method299(var7, var4, var5, var24.entity1.height)) { if ((var24.orientation & var10) != 0) { - var24.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var24.x - Scene_cameraX + var24.xOffset, var24.tileHeight - Scene_cameraY, var24.y - Scene_cameraZ + var24.yOffset, var24.tag); + var24.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var24.x - Scene_cameraX + var24.xOffset, var24.tileHeight - Scene_cameraY, var24.y - Scene_cameraZ + var24.yOffset, var24.tag); } else if (var24.orientation == 256) { var11 = var24.x - Scene_cameraX; var12 = var24.tileHeight - Scene_cameraY; @@ -1441,9 +1441,9 @@ public class Scene { } if (var25 < var19) { - var24.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var24.xOffset, var12, var13 + var24.yOffset, var24.tag); + var24.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var24.xOffset, var12, var13 + var24.yOffset, var24.tag); } else if (var24.entity2 != null) { - var24.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var12, var13, var24.tag); + var24.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var12, var13, var24.tag); } } } @@ -1451,21 +1451,21 @@ public class Scene { if (var20) { FloorDecoration var34 = var3.floorDecoration; if (var34 != null) { - var34.entity.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var34.x - Scene_cameraX, var34.tileHeight - Scene_cameraY, var34.y - Scene_cameraZ, var34.tag); + var34.entity.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var34.x - Scene_cameraX, var34.tileHeight - Scene_cameraY, var34.y - Scene_cameraZ, var34.tag); } GroundItemPile var26 = var3.groundItemPile; if (var26 != null && var26.height == 0) { if (var26.second != null) { - var26.second.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag); + var26.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag); } if (var26.third != null) { - var26.third.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag); + var26.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag); } if (var26.first != null) { - var26.first.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag); + var26.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag); } } } @@ -1516,7 +1516,7 @@ public class Scene { if (var20) { var16 = var3.boundaryObject; if (!this.method298(var7, var4, var5, var16.orientationA)) { - var16.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var16.x - Scene_cameraX, var16.tileHeight - Scene_cameraY, var16.y - Scene_cameraZ, var16.tag); + var16.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var16.x - Scene_cameraX, var16.tileHeight - Scene_cameraY, var16.y - Scene_cameraZ, var16.tag); } var3.drawGameObjectEdges = 0; @@ -1570,7 +1570,7 @@ public class Scene { } } - Scene_gameObjects[var21++] = var17; + gameObjects[var21++] = var17; var14 = Scene_cameraXTile - var17.startX; var11 = var17.endX - Scene_cameraXTile; if (var11 > var14) { @@ -1593,7 +1593,7 @@ public class Scene { GameObject var33; for (var14 = 0; var14 < var21; ++var14) { - var33 = Scene_gameObjects[var14]; + var33 = gameObjects[var14]; if (var33.lastDrawn != Scene_drawnCount) { if (var33.field360 > var10) { var10 = var33.field360; @@ -1601,8 +1601,8 @@ public class Scene { } else if (var10 == var33.field360) { var12 = var33.centerX - Scene_cameraX; var13 = var33.centerY - Scene_cameraZ; - var18 = Scene_gameObjects[var15].centerX - Scene_cameraX; - var19 = Scene_gameObjects[var15].centerY - Scene_cameraZ; + var18 = gameObjects[var15].centerX - Scene_cameraX; + var19 = gameObjects[var15].centerY - Scene_cameraZ; if (var12 * var12 + var13 * var13 > var18 * var18 + var19 * var19) { var15 = var14; } @@ -1614,10 +1614,10 @@ public class Scene { break; } - var33 = Scene_gameObjects[var15]; + var33 = gameObjects[var15]; var33.lastDrawn = Scene_drawnCount; if (!this.method300(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) { - var33.entity.renderDraw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); + var33.entity.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); } for (var11 = var33.startX; var11 <= var33.endX; ++var11) { @@ -1676,15 +1676,15 @@ public class Scene { GroundItemPile var28 = var3.groundItemPile; if (var28 != null && var28.height != 0) { if (var28.second != null) { - var28.second.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag); + var28.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag); } if (var28.third != null) { - var28.third.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag); + var28.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag); } if (var28.first != null) { - var28.first.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag); + var28.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag); } } @@ -1692,7 +1692,7 @@ public class Scene { WallDecoration var29 = var3.wallDecoration; if (var29 != null && !this.method299(var7, var4, var5, var29.entity1.height)) { if ((var29.orientation & var3.field899) != 0) { - var29.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); + var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); } else if (var29.orientation == 256) { var10 = var29.x - Scene_cameraX; var15 = var29.tileHeight - Scene_cameraY; @@ -1711,9 +1711,9 @@ public class Scene { } if (var13 >= var12) { - var29.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10 + var29.xOffset, var15, var14 + var29.yOffset, var29.tag); + var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10 + var29.xOffset, var15, var14 + var29.yOffset, var29.tag); } else if (var29.entity2 != null) { - var29.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10, var15, var14, var29.tag); + var29.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10, var15, var14, var29.tag); } } } @@ -1721,11 +1721,11 @@ public class Scene { BoundaryObject var31 = var3.boundaryObject; if (var31 != null) { if ((var31.orientationB & var3.field899) != 0 && !this.method298(var7, var4, var5, var31.orientationB)) { - var31.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); + var31.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } if ((var31.orientationA & var3.field899) != 0 && !this.method298(var7, var4, var5, var31.orientationA)) { - var31.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); + var31.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } } } @@ -2560,7 +2560,7 @@ public class Scene { Scene_isLowDetail = true; tileUpdateCount = 0; Scene_plane = 0; - Scene_gameObjects = new GameObject[100]; + gameObjects = new GameObject[100]; checkClick = false; Scene_selectedPlane = 0; Scene_selectedScreenX = 0; diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index e2df568bf8..8ca4152491 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -252,8 +252,8 @@ public class ScriptEvent extends Node { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class1.method18(var3, var4); return 1; } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { - if (Client.rights >= 2) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rights; + if (Client.staffModLevel >= 2) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.staffModLevel; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 0a89391dd2..22a36b63d4 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -132,10 +132,10 @@ public class SecureRandomCallable implements Callable { GameShell.menuY = var13; class214.menuWidth = var7; AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22; - class39.revalidateWidgetScroll(Widget.widgets[var0 >> 16], var4, false); + class39.revalidateWidgetScroll(Widget.interfaceComponents[var0 >> 16], var4, false); WorldMapSection3.runWidgetOnLoadListener(var1); - if (Client.rootWidgetGroup != -1) { - GrandExchangeEvents.method74(Client.rootWidgetGroup, 1); + if (Client.rootInterface != -1) { + GrandExchangeEvents.method74(Client.rootInterface, 1); } return var3; diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index 1e9f773a7b..b8c180e6fb 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -205,8 +205,8 @@ public class SequenceDefinition extends DualNode { signature = "(B)V", garbageValue = "1" ) - @Export("init") - void init() { + @Export("postDecode") + void postDecode() { if (this.field781 == -1) { if (this.field777 != null) { this.field781 = 2; diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index f75dc4b94d..586d0e674f 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -51,14 +51,14 @@ public class Skills { var1.isTradable = false; var1.groundActions = null; var1.inventoryActions = null; - var1.shiftClickIndex0 = -1; - var1.int1 = 0; + var1.shiftClickIndex = -1; + var1.team = 0; if (var1.params != null) { boolean var3 = false; for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { - ParamKeyDefinition var5 = class229.getParamKeyDefinition((int)var4.key); - if (var5.isMembersOnly) { + ParamDefinition var5 = class229.getParamDefinition((int)var4.key); + if (var5.autoDisable) { var4.remove(); } else { var3 = true; diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index 2873f91beb..eea4b8bdae 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -29,8 +29,8 @@ public class StructDefinition extends DualNode { signature = "(B)V", garbageValue = "-16" ) - @Export("init") - void init() { + @Export("postDecode") + void postDecode() { } @ObfuscatedName("q") @@ -238,7 +238,7 @@ public class StructDefinition extends DualNode { var4.scrollHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; class22.method295(var4); if (var3 != -1 && var4.type == 0) { - class39.revalidateWidgetScroll(Widget.widgets[var3 >> 16], var4, false); + class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false); } return 1; diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index c5a78386cc..b86fc415ec 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -69,18 +69,18 @@ public enum StudioGame implements Enumerated { garbageValue = "-2058685786" ) public static FloorUnderlayDefinition method4550(int var0) { - FloorUnderlayDefinition var1 = (FloorUnderlayDefinition) FloorUnderlayDefinition.UnderlayDefinition_cached.get((long)var0); + FloorUnderlayDefinition var1 = (FloorUnderlayDefinition) FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); if (var1 != null) { return var1; } else { - byte[] var2 = FloorUnderlayDefinition.UnderlayDefinition_archive.takeFile(1, var0); + byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); var1 = new FloorUnderlayDefinition(); if (var2 != null) { var1.decode(new Buffer(var2), var0); } var1.postDecode(); - FloorUnderlayDefinition.UnderlayDefinition_cached.put(var1, (long)var0); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); return var1; } } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index 8c52add844..99c20b1185 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -184,8 +184,8 @@ public class Texture extends Node { } @ObfuscatedName("q") - @Export("Texture_animate") - void Texture_animate(int var1) { + @Export("animate") + void animate(int var1) { if (this.pixels != null) { short var2; int var3; diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java index ce191608a9..4e8252ffb7 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -205,7 +205,7 @@ public class TextureProvider implements TextureLoader { for (int var2 = 0; var2 < this.textures.length; ++var2) { Texture var3 = this.textures[var2]; if (var3 != null && var3.animationDirection != 0 && var3.isLoaded) { - var3.Texture_animate(var1); + var3.animate(var1); var3.isLoaded = false; } } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index 39cf89f93d..43aa68bb91 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -146,7 +146,7 @@ public final class Tile extends Node { garbageValue = "-1899580455" ) public static void method2867() { - FloorUnderlayDefinition.UnderlayDefinition_cached.clear(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); } @ObfuscatedName("is") diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index 7ef94fba67..49da2bb4f8 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -45,7 +45,7 @@ public class UserComparator5 extends AbstractUserComparator { static final void worldToMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { int var6 = var3 * var3 + var2 * var2; if (var6 > 4225 && var6 < 90000) { - int var7 = Client.minimapOrientation & 2047; + int var7 = Client.camAngleY & 2047; int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; int var10 = var3 * var8 + var9 * var2 >> 16; diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java index 0b6544715c..f1b032e4fb 100644 --- a/runescape-client/src/main/java/VarbitDefinition.java +++ b/runescape-client/src/main/java/VarbitDefinition.java @@ -26,20 +26,20 @@ public class VarbitDefinition extends DualNode { @ObfuscatedGetter( intValue = 1552575189 ) - @Export("varp") - public int varp; + @Export("baseVar") + public int baseVar; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -870948181 ) - @Export("lowBit") - public int lowBit; + @Export("startBit") + public int startBit; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -1710935305 ) - @Export("highBit") - public int highBit; + @Export("endBit") + public int endBit; @ObfuscatedName("q") @ObfuscatedSignature( @@ -66,9 +66,9 @@ public class VarbitDefinition extends DualNode { @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.varp = var1.readUnsignedShort(); - this.lowBit = var1.readUnsignedByte(); - this.highBit = var1.readUnsignedByte(); + this.baseVar = var1.readUnsignedShort(); + this.startBit = var1.readUnsignedByte(); + this.endBit = var1.readUnsignedByte(); } } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index 4b1cfbf893..a18fcda29b 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -29,7 +29,7 @@ public class Varps { garbageValue = "2111080001" ) public static void method4393(AbstractArchive var0) { - FloorUnderlayDefinition.UnderlayDefinition_archive = var0; + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; } @ObfuscatedName("ki") diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 8bfdce511a..eee06e912c 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -17,11 +17,11 @@ public class Widget extends Node { @ObfuscatedSignature( signature = "[[Lho;" ) - @Export("widgets") - public static Widget[][] widgets; + @Export("interfaceComponents") + public static Widget[][] interfaceComponents; @ObfuscatedName("l") - @Export("loadedWidgetGroups") - public static boolean[] loadedWidgetGroups; + @Export("loadedInterfaces") + public static boolean[] loadedInterfaces; @ObfuscatedName("e") @ObfuscatedSignature( signature = "Lir;" @@ -562,8 +562,8 @@ public class Widget extends Node { @ObfuscatedName("em") public Object[] field970; @ObfuscatedName("ed") - @Export("onKeyListener") - public Object[] onKeyListener; + @Export("onKey") + public Object[] onKey; @ObfuscatedName("ex") public Object[] field971; @ObfuscatedName("ej") @@ -571,8 +571,8 @@ public class Widget extends Node { @ObfuscatedName("el") public Object[] field973; @ObfuscatedName("en") - @Export("onDialogAbortListener") - public Object[] onDialogAbortListener; + @Export("onDialogAbort") + public Object[] onDialogAbort; @ObfuscatedName("ei") public Object[] field974; @ObfuscatedName("ee") diff --git a/runescape-client/src/main/java/WorldComparator.java b/runescape-client/src/main/java/WorldComparator.java index f1ff1fc67c..5a9fd666ae 100644 --- a/runescape-client/src/main/java/WorldComparator.java +++ b/runescape-client/src/main/java/WorldComparator.java @@ -127,10 +127,10 @@ final class WorldComparator implements Comparator { var3.size = var3.definition.size; var3.field23 = var3.definition.field639; var3.walkSequence = var3.definition.walkSequence; - var3.walkTurnSequence = var3.definition.walkTurnSequence; - var3.walkTurnLeftSequence = var3.definition.walkTurnLeftSequence; - var3.walkTurnRightSequence = var3.definition.walkTurnRightSequence; - var3.idleSequence = var3.definition.idleSequence; + var3.walkBackSequence = var3.definition.walkBackSequence; + var3.walkLeftSequence = var3.definition.walkLeftSequence; + var3.walkRightSequence = var3.definition.walkRightSequence; + var3.readySequence = var3.definition.readySequence; var3.turnLeftSequence = var3.definition.turnLeftSequence; var3.turnRightSequence = var3.definition.turnRightSequence; } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index fdb8bb87f4..ab67905eaf 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -652,7 +652,7 @@ public class WorldMap { @Export("setCurrentMapArea") void setCurrentMapArea(WorldMapArea var1) { if (this.currentMapArea == null || var1 != this.currentMapArea) { - this.initializeWorldMap(var1); + this.initializeWorldMapManager(var1); this.jump(-1, -1, -1); } @@ -663,8 +663,8 @@ public class WorldMap { signature = "(Lag;I)V", garbageValue = "-1072205896" ) - @Export("initializeWorldMap") - void initializeWorldMap(WorldMapArea var1) { + @Export("initializeWorldMapManager") + void initializeWorldMapManager(WorldMapArea var1) { this.currentMapArea = var1; this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.field990, this.field991); this.cacheLoader.reset(this.currentMapArea.archiveName()); @@ -678,7 +678,7 @@ public class WorldMap { public void method367(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { if (var1 != null) { if (this.currentMapArea == null || var1 != this.currentMapArea) { - this.initializeWorldMap(var1); + this.initializeWorldMapManager(var1); } if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 7d8cb23a4f..6aa284a9ff 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -95,7 +95,7 @@ public class WorldMapAreaData extends WorldMapArea { var1.decode(new Buffer(var2)); } - var1.init(); + var1.postDecode(); SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); return var1; } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 207c70cdd6..a08306244e 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -148,7 +148,7 @@ public class WorldMapCacheName { static void addPlayerToScene(Player var0, boolean var1) { if (var0 != null && var0.isVisible() && !var0.isHidden) { var0.isUnanimated = false; - if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) { + if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.readySequence) { var0.isUnanimated = true; } diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index d85621cd3d..fbe474bd51 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -192,8 +192,8 @@ public enum WorldMapDecorationType implements Enumerated { garbageValue = "1521012895" ) static final void method4517(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (GroundItemPile.loadWidgetGroup(var0)) { - class238.updateWidgetGroup(Widget.widgets[var0], -1, var1, var2, var3, var4, var5, var6); + if (GroundItemPile.loadInterface(var0)) { + class238.updateInterface(Widget.interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); } } diff --git a/runescape-client/src/main/java/WorldMapIcon1.java b/runescape-client/src/main/java/WorldMapIcon1.java index 5841b7388b..b22d71e9ad 100644 --- a/runescape-client/src/main/java/WorldMapIcon1.java +++ b/runescape-client/src/main/java/WorldMapIcon1.java @@ -112,7 +112,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { ) @Export("addGameMessage") static void addGameMessage(int var0, String var1, String var2) { - GrandExchangeEvents.addChatMessage(var0, var1, var2, (String)null); + GrandExchangeEvents.addMessage(var0, var1, var2, (String)null); } @ObfuscatedName("fz") diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index bba1ada73f..05ebdd1621 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -110,7 +110,7 @@ public class WorldMapLabelSize { for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { if (var1.type == 0 || var1.type == 3) { - MenuAction.closeWidgetGroup(var1, true); + MenuAction.closeInterface(var1, true); } } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 3ffd09acb5..cd5e892ed1 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -1061,7 +1061,7 @@ public class WorldMapRegion { if (var3.contains(var4, var5)) { var4 -= var3.width / 2; var5 -= var3.height / 2; - int var6 = Client.minimapOrientation & 2047; + int var6 = Client.camAngleY & 2047; int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; int var9 = var4 * var8 + var7 * var5 >> 11; @@ -1075,7 +1075,7 @@ public class WorldMapRegion { var13.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); var13.packetBuffer.writeByte(var4); var13.packetBuffer.writeByte(var5); - var13.packetBuffer.writeShort(Client.minimapOrientation); + var13.packetBuffer.writeShort(Client.camAngleY); var13.packetBuffer.writeByte(57); var13.packetBuffer.writeByte(0); var13.packetBuffer.writeByte(0); diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index fc4f397d84..201ac1b868 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -234,7 +234,7 @@ public class WorldMapSection1 implements WorldMapSection { Client.isItemSelected = 0; Client.isSpellSelected = false; Client.soundEffectCount = 0; - Client.minimapOrientation = 0; + Client.camAngleY = 0; Client.oculusOrbState = 0; ClientParameter.field3645 = null; Client.minimapState = 0; @@ -285,15 +285,15 @@ public class WorldMapSection1 implements WorldMapSection { class196.varcs.clearTransient(); Client.followerIndex = -1; - if (Client.rootWidgetGroup != -1) { - AbstractByteArrayCopier.unloadWidgetGroup(Client.rootWidgetGroup); + if (Client.rootInterface != -1) { + AbstractByteArrayCopier.unloadInterface(Client.rootInterface); } for (InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.first(); var4 != null; var4 = (InterfaceParent)Client.interfaceParents.next()) { - MenuAction.closeWidgetGroup(var4, true); + MenuAction.closeInterface(var4, true); } - Client.rootWidgetGroup = -1; + Client.rootInterface = -1; Client.interfaceParents = new NodeHashTable(8); Client.field127 = null; Client.menuOptionsCount = 0; diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 66d056e8d5..9ace770508 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -151,9 +151,9 @@ public class WorldMapSection2 implements WorldMapSection { @Export("getVarbit") public static int getVarbit(int var0) { VarbitDefinition var1 = Occluder.method3255(var0); - int var2 = var1.varp; - int var3 = var1.lowBit; - int var4 = var1.highBit; + int var2 = var1.baseVar; + int var3 = var1.startBit; + int var4 = var1.endBit; int var5 = Varps.Varps_masks[var4 - var3]; return Varps.Varps_main[var2] >> var3 & var5; } diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java index 36dae56494..e6072c6d25 100644 --- a/runescape-client/src/main/java/WorldMapSection3.java +++ b/runescape-client/src/main/java/WorldMapSection3.java @@ -200,8 +200,8 @@ public class WorldMapSection3 implements WorldMapSection { ) @Export("runWidgetOnLoadListener") static void runWidgetOnLoadListener(int var0) { - if (var0 != -1 && GroundItemPile.loadWidgetGroup(var0)) { - Widget[] var1 = Widget.widgets[var0]; + if (var0 != -1 && GroundItemPile.loadInterface(var0)) { + Widget[] var1 = Widget.interfaceComponents[var0]; for (int var2 = 0; var2 < var1.length; ++var2) { Widget var3 = var1[var2]; diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 701c9fb048..3aa2e06c56 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -96,7 +96,7 @@ final class class1 implements class0 { class22.method295(var4); TextureProvider.client.alignWidget(var4); if (var3 != -1 && var4.type == 0) { - class39.revalidateWidgetScroll(Widget.widgets[var3 >> 16], var4, false); + class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false); } return 1; @@ -109,7 +109,7 @@ final class class1 implements class0 { class22.method295(var4); TextureProvider.client.alignWidget(var4); if (var3 != -1 && var4.type == 0) { - class39.revalidateWidgetScroll(Widget.widgets[var3 >> 16], var4, false); + class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false); } return 1; diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java index ac2e1454bf..badbef64d7 100644 --- a/runescape-client/src/main/java/class11.java +++ b/runescape-client/src/main/java/class11.java @@ -161,7 +161,7 @@ final class class11 implements Comparator { } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { var3.field970 = var8; } else if (var0 == ScriptOpcodes.CC_SETONKEY) { - var3.onKeyListener = var8; + var3.onKey = var8; } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { var3.field971 = var8; } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { @@ -169,7 +169,7 @@ final class class11 implements Comparator { } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { var3.field973 = var8; } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { - var3.onDialogAbortListener = var8; + var3.onDialogAbort = var8; } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { var3.field974 = var8; } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { @@ -219,7 +219,7 @@ final class class11 implements Comparator { return 1; } else if (var0 == ScriptOpcodes.IF_GETTOP) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rootWidgetGroup; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rootInterface; return 1; } else { return 2; diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java index fa118448dd..dbe1615663 100644 --- a/runescape-client/src/main/java/class12.java +++ b/runescape-client/src/main/java/class12.java @@ -125,9 +125,9 @@ final class class12 implements Comparator { static void method159() { for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { int var1 = var0.group; - if (GroundItemPile.loadWidgetGroup(var1)) { + if (GroundItemPile.loadInterface(var1)) { boolean var2 = true; - Widget[] var3 = Widget.widgets[var1]; + Widget[] var3 = Widget.interfaceComponents[var1]; int var4; for (var4 = 0; var4 < var3.length; ++var4) { diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index c5f2bf99c2..e5cc8b1886 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -164,8 +164,8 @@ public class class171 { AbstractWorldMapIcon.method625(ItemContainer.field434, "World Map"); AbstractWorldMapIcon.method625(WorldMapLabelSize.field1040, "World Map Geography"); AbstractWorldMapIcon.method625(AbstractByteArrayCopier.field0, "World Map Ground"); - class211.graphicsDefaults = new GraphicsDefaults(); - class211.graphicsDefaults.decode(class22.archive16); + class211.spriteIds = new GraphicsDefaults(); + class211.spriteIds.decode(class22.archive16); Login.Login_loadingText = "Loaded update list"; Login.Login_loadingPercent = 30; Client.titleLoadingStage = 45; @@ -266,15 +266,15 @@ public class class171 { BufferedSource.field54 = var16; Widget.field955 = var17; class27.field1143 = var18; - Widget.widgets = new Widget[Widget.Widget_archive.method5()][]; - Widget.loadedWidgetGroups = new boolean[Widget.Widget_archive.method5()]; + Widget.interfaceComponents = new Widget[Widget.Widget_archive.method5()][]; + Widget.loadedInterfaces = new boolean[Widget.Widget_archive.method5()]; Archive var19 = ObjectSound.archive2; class4.field1158 = var19; Archive var20 = ObjectSound.archive2; EnumDefinition.EnumDefinition_archive = var20; Frames.method3241(ObjectSound.archive2); Archive var21 = ObjectSound.archive2; - ParamKeyDefinition.field679 = var21; + ParamDefinition.field679 = var21; class196.varcs = new Varcs(); class60.method1172(ObjectSound.archive2, WorldMapSection3.archive8, ByteArrayPool.archive13); Archive var22 = ObjectSound.archive2; @@ -305,13 +305,13 @@ public class class171 { } else if (Client.titleLoadingStage == 80) { var0 = 0; if (UnitPriceComparator.compass == null) { - UnitPriceComparator.compass = class322.readSprite(WorldMapSection3.archive8, class211.graphicsDefaults.field878, 0); + UnitPriceComparator.compass = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field878, 0); } else { ++var0; } if (FaceNormal.field345 == null) { - FaceNormal.field345 = class322.readSprite(WorldMapSection3.archive8, class211.graphicsDefaults.field879, 0); + FaceNormal.field345 = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field879, 0); } else { ++var0; } @@ -320,7 +320,7 @@ public class class171 { int var34; if (class192.mapSceneSprites == null) { var30 = WorldMapSection3.archive8; - var34 = class211.graphicsDefaults.mapScenes; + var34 = class211.spriteIds.mapScenes; if (!SpriteMask.loadSprite(var30, var34, 0)) { var32 = null; } else { @@ -335,7 +335,7 @@ public class class171 { Sprite[] var35; if (class15.headIconPkSprites == null) { var30 = WorldMapSection3.archive8; - var34 = class211.graphicsDefaults.headIconsPk; + var34 = class211.spriteIds.headIconsPk; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; } else { @@ -349,7 +349,7 @@ public class class171 { if (ClientPreferences.headIconPrayerSprites == null) { var30 = WorldMapSection3.archive8; - var34 = class211.graphicsDefaults.headIconsPrayer; + var34 = class211.spriteIds.headIconsPrayer; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; } else { @@ -363,7 +363,7 @@ public class class171 { if (Player.headIconHintSprites == null) { var30 = WorldMapSection3.archive8; - var34 = class211.graphicsDefaults.headIconsHint; + var34 = class211.spriteIds.headIconsHint; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; } else { @@ -377,7 +377,7 @@ public class class171 { if (class16.mapMarkerSprites == null) { var30 = WorldMapSection3.archive8; - var34 = class211.graphicsDefaults.mapMarkers; + var34 = class211.spriteIds.mapMarkers; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; } else { @@ -391,7 +391,7 @@ public class class171 { if (KeyHandler.crossSprites == null) { var30 = WorldMapSection3.archive8; - var34 = class211.graphicsDefaults.crosses; + var34 = class211.spriteIds.crosses; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; } else { @@ -405,7 +405,7 @@ public class class171 { if (class39.mapDotSprites == null) { var30 = WorldMapSection3.archive8; - var34 = class211.graphicsDefaults.mapDots; + var34 = class211.spriteIds.mapDots; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; } else { @@ -419,7 +419,7 @@ public class class171 { if (class32.scrollBarSprites == null) { var30 = WorldMapSection3.archive8; - var34 = class211.graphicsDefaults.scrollBars; + var34 = class211.spriteIds.scrollBars; if (!SpriteMask.loadSprite(var30, var34, 0)) { var32 = null; } else { @@ -433,7 +433,7 @@ public class class171 { if (WorldMapSectionType.modIconSprites == null) { var30 = WorldMapSection3.archive8; - var34 = class211.graphicsDefaults.modIcons; + var34 = class211.spriteIds.modIcons; if (!SpriteMask.loadSprite(var30, var34, 0)) { var32 = null; } else { diff --git a/runescape-client/src/main/java/class211.java b/runescape-client/src/main/java/class211.java index 681b83f9f8..7832a23c92 100644 --- a/runescape-client/src/main/java/class211.java +++ b/runescape-client/src/main/java/class211.java @@ -18,8 +18,8 @@ public class class211 { @ObfuscatedSignature( signature = "Llg;" ) - @Export("graphicsDefaults") - static GraphicsDefaults graphicsDefaults; + @Export("spriteIds") + static GraphicsDefaults spriteIds; @ObfuscatedName("m") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java index 8be09c4624..ea8a07849e 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/class22.java @@ -88,7 +88,7 @@ public final class class22 { var4 = new ArchiveDisk(var0, class168.dat2File, ArchiveDiskAction.idxFiles[var0], 1000000); } - return new Archive(var4, Fonts.archiveDisk255, var0, var1, var2, var3); + return new Archive(var4, Fonts.masterDisk, var0, var1, var2, var3); } @ObfuscatedName("jp") @@ -112,7 +112,7 @@ public final class class22 { SpriteMask var4 = var0.getSpriteMask(false); if (var4 != null) { if (Client.minimapState < 3) { - UnitPriceComparator.compass.method315(var1, var2, var4.width, var4.height, 25, 25, Client.minimapOrientation, 256, var4.xStarts, var4.xWidths); + UnitPriceComparator.compass.method315(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); } else { Rasterizer2D.method5948(var1, var2, 0, var4.xStarts, var4.xWidths); } diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java index e78ec72e7f..615739165b 100644 --- a/runescape-client/src/main/java/class229.java +++ b/runescape-client/src/main/java/class229.java @@ -13,20 +13,20 @@ public class class229 { signature = "(IB)Ljb;", garbageValue = "-41" ) - @Export("getParamKeyDefinition") - public static ParamKeyDefinition getParamKeyDefinition(int var0) { - ParamKeyDefinition var1 = (ParamKeyDefinition)ParamKeyDefinition.ParamKeyDefinition_cached.get((long)var0); + @Export("getParamDefinition") + public static ParamDefinition getParamDefinition(int var0) { + ParamDefinition var1 = (ParamDefinition) ParamDefinition.ParamDefinition_cached.get((long)var0); if (var1 != null) { return var1; } else { - byte[] var2 = ParamKeyDefinition.field679.takeFile(11, var0); - var1 = new ParamKeyDefinition(); + byte[] var2 = ParamDefinition.field679.takeFile(11, var0); + var1 = new ParamDefinition(); if (var2 != null) { var1.decode(new Buffer(var2)); } - var1.init(); - ParamKeyDefinition.ParamKeyDefinition_cached.put(var1, (long)var0); + var1.postDecode(); + ParamDefinition.ParamDefinition_cached.put(var1, (long)var0); return var1; } } diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java index b6780fe65f..bbc75db01f 100644 --- a/runescape-client/src/main/java/class238.java +++ b/runescape-client/src/main/java/class238.java @@ -50,8 +50,8 @@ public final class class238 { signature = "([Lho;IIIIIIII)V", garbageValue = "1706481742" ) - @Export("updateWidgetGroup") - static final void updateWidgetGroup(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + @Export("updateInterface") + static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { for (int var8 = 0; var8 < var0.length; ++var8) { Widget var9 = var0[var8]; if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class1.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { @@ -525,13 +525,13 @@ public final class class238 { } var9.field980 = Client.cycleCntr; - if (var9.onKeyListener != null) { + if (var9.onKey != null) { for (var35 = 0; var35 < Client.field137; ++var35) { ScriptEvent var27 = new ScriptEvent(); var27.widget = var9; var27.keyTyped = Client.field145[var35]; var27.keyPressed = Client.field146[var35]; - var27.args0 = var9.onKeyListener; + var27.args0 = var9.onKey; Client.scriptEvents.addFirst(var27); } } @@ -561,9 +561,9 @@ public final class class238 { } if (var9.type == 0) { - updateWidgetGroup(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); + updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); if (var9.children != null) { - updateWidgetGroup(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); + updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); } InterfaceParent var33 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index 1127161470..a144cb7a8c 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -289,10 +289,10 @@ public class class3 implements Enumerated { } var15.walkSequence = var15.definition.walkSequence; - var15.walkTurnSequence = var15.definition.walkTurnSequence; - var15.walkTurnLeftSequence = var15.definition.walkTurnLeftSequence; - var15.walkTurnRightSequence = var15.definition.walkTurnRightSequence; - var15.idleSequence = var15.definition.idleSequence; + var15.walkBackSequence = var15.definition.walkBackSequence; + var15.walkLeftSequence = var15.definition.walkLeftSequence; + var15.walkRightSequence = var15.definition.walkRightSequence; + var15.readySequence = var15.definition.readySequence; var15.turnLeftSequence = var15.definition.turnLeftSequence; var15.turnRightSequence = var15.definition.turnRightSequence; var15.method228(Canvas.localPlayer.pathX[0] + var5, Canvas.localPlayer.pathY[0] + var8, var12 == 1); diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java index fa41337bba..77d9e00f00 100644 --- a/runescape-client/src/main/java/class30.java +++ b/runescape-client/src/main/java/class30.java @@ -24,8 +24,8 @@ public class class30 { @ObfuscatedGetter( intValue = -18917723 ) - @Export("musicTrackArchiveId") - public static int musicTrackArchiveId; + @Export("musicTrackGroupId") + public static int musicTrackGroupId; @ObfuscatedName("l") @Export("inMembersWorld") public static boolean inMembersWorld; @@ -91,10 +91,10 @@ public class class30 { } ScriptEvent var6; - if (var1 == 0 && var3.onDialogAbortListener != null) { + if (var1 == 0 && var3.onDialogAbort != null) { var6 = new ScriptEvent(); var6.widget = var3; - var6.args0 = var3.onDialogAbortListener; + var6.args0 = var3.onDialogAbort; AbstractArchive.runScript(var6); } diff --git a/runescape-client/src/main/java/class31.java b/runescape-client/src/main/java/class31.java index 356692fe17..4d678dc0bb 100644 --- a/runescape-client/src/main/java/class31.java +++ b/runescape-client/src/main/java/class31.java @@ -145,16 +145,16 @@ public class class31 { return 1; } else { int var7; - ParamKeyDefinition var8; + ParamDefinition var8; if (var0 == ScriptOpcodes.NC_PARAM) { RouteStrategy.Interpreter_intStackSize -= 2; var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var8 = class229.getParamKeyDefinition(var7); + var8 = class229.getParamDefinition(var7); if (var8.isString()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ObjectDefinition.getNpcDefinition(var6).getStringParam(var7, var8.keyString); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ObjectDefinition.getNpcDefinition(var6).getStringParam(var7, var8.defaultStr); } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ObjectDefinition.getNpcDefinition(var6).getIntParam(var7, var8.keyInt); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ObjectDefinition.getNpcDefinition(var6).getIntParam(var7, var8.defaultInt); } return 1; @@ -162,11 +162,11 @@ public class class31 { RouteStrategy.Interpreter_intStackSize -= 2; var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var8 = class229.getParamKeyDefinition(var7); + var8 = class229.getParamDefinition(var7); if (var8.isString()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class50.getObjectDefinition(var6).getStringParam(var7, var8.keyString); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class50.getObjectDefinition(var6).getStringParam(var7, var8.defaultStr); } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class50.getObjectDefinition(var6).getIntParam(var7, var8.keyInt); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class50.getObjectDefinition(var6).getIntParam(var7, var8.defaultInt); } return 1; @@ -174,11 +174,11 @@ public class class31 { RouteStrategy.Interpreter_intStackSize -= 2; var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var8 = class229.getParamKeyDefinition(var7); + var8 = class229.getParamDefinition(var7); if (var8.isString()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Skills.getItemDefinition(var6).getStringParam(var7, var8.keyString); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Skills.getItemDefinition(var6).getStringParam(var7, var8.defaultStr); } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var6).getIntParam(var7, var8.keyInt); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var6).getIntParam(var7, var8.defaultInt); } return 1; @@ -186,11 +186,11 @@ public class class31 { RouteStrategy.Interpreter_intStackSize -= 2; var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var8 = class229.getParamKeyDefinition(var7); + var8 = class229.getParamDefinition(var7); if (var8.isString()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = GzipDecompressor.method3702(var6).getStringParam(var7, var8.keyString); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = GzipDecompressor.method3702(var6).getStringParam(var7, var8.defaultStr); } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GzipDecompressor.method3702(var6).getIntParam(var7, var8.keyInt); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GzipDecompressor.method3702(var6).getIntParam(var7, var8.defaultInt); } return 1; diff --git a/runescape-client/src/main/java/class39.java b/runescape-client/src/main/java/class39.java index 0ace680c70..f3a61b0a8d 100644 --- a/runescape-client/src/main/java/class39.java +++ b/runescape-client/src/main/java/class39.java @@ -813,8 +813,8 @@ public class class39 extends class21 { InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); if (var5 != null) { int var6 = var5.group; - if (GroundItemPile.loadWidgetGroup(var6)) { - WorldMapRegion.notRevalidateWidgetScroll(Widget.widgets[var6], -1, var3, var4, var2); + if (GroundItemPile.loadInterface(var6)) { + WorldMapRegion.notRevalidateWidgetScroll(Widget.interfaceComponents[var6], -1, var3, var4, var2); } } diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java index 57733ec6fe..47beb72c59 100644 --- a/runescape-client/src/main/java/class40.java +++ b/runescape-client/src/main/java/class40.java @@ -716,7 +716,7 @@ public class class40 { int var22; int var24; if (!Client.isCameraLocked) { - var4 = Client.cameraPitchTarget; + var4 = Client.camAngleX; if (Client.field202 / 256 > var4) { var4 = Client.field202 / 256; } @@ -725,7 +725,7 @@ public class class40 { var4 = Client.field142[4] + 128; } - var15 = Client.minimapOrientation & 2047; + var15 = Client.camAngleY & 2047; var6 = MouseHandler.oculusOrbFocalPointX; var22 = MouseRecorder.field566; var24 = ScriptEvent.oculusOrbFocalPointY; @@ -760,7 +760,7 @@ public class class40 { class11.cameraZ = var24 - var16; WorldMapIcon1.cameraPitch = var4; MusicPatchNode.cameraYaw = var15; - if (Client.oculusOrbState == 1 && Client.rights >= 2 && Client.cycle % 50 == 0 && (MouseHandler.oculusOrbFocalPointX >> 7 != Canvas.localPlayer.x >> 7 || ScriptEvent.oculusOrbFocalPointY >> 7 != Canvas.localPlayer.y >> 7)) { + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (MouseHandler.oculusOrbFocalPointX >> 7 != Canvas.localPlayer.x >> 7 || ScriptEvent.oculusOrbFocalPointY >> 7 != Canvas.localPlayer.y >> 7)) { var17 = Canvas.localPlayer.plane; var18 = (MouseHandler.oculusOrbFocalPointX >> 7) + class50.baseX; var19 = (ScriptEvent.oculusOrbFocalPointY >> 7) + GraphicsObject.baseY; diff --git a/runescape-client/src/main/java/class50.java b/runescape-client/src/main/java/class50.java index e0bee6db6f..5016653145 100644 --- a/runescape-client/src/main/java/class50.java +++ b/runescape-client/src/main/java/class50.java @@ -61,7 +61,7 @@ public class class50 { var1.decode(new Buffer(var2)); } - var1.init(); + var1.postDecode(); if (var1.isSolid) { var1.interactType = 0; var1.boolean1 = false; diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java index 075817ea75..ca6d82db8b 100644 --- a/runescape-client/src/main/java/class54.java +++ b/runescape-client/src/main/java/class54.java @@ -1046,14 +1046,14 @@ public final class class54 { Client.field202 += (var6 - Client.field202) / 80; } - MouseRecorder.field566 = class32.getTileHeight(Canvas.localPlayer.x, Canvas.localPlayer.y, SoundSystem.plane) - Client.cameraFollowHeight; + MouseRecorder.field566 = class32.getTileHeight(Canvas.localPlayer.x, Canvas.localPlayer.y, SoundSystem.plane) - Client.camFollowHeight; } else if (Client.oculusOrbState == 1) { if (Client.field199 && Canvas.localPlayer != null) { var0 = Canvas.localPlayer.pathX[0]; var1 = Canvas.localPlayer.pathY[0]; if (var0 >= 0 && var1 >= 0 && var0 < 104 && var1 < 104) { MouseHandler.oculusOrbFocalPointX = Canvas.localPlayer.x; - var2 = class32.getTileHeight(Canvas.localPlayer.x, Canvas.localPlayer.y, SoundSystem.plane) - Client.cameraFollowHeight; + var2 = class32.getTileHeight(Canvas.localPlayer.x, Canvas.localPlayer.y, SoundSystem.plane) - Client.camFollowHeight; if (var2 < MouseRecorder.field566) { MouseRecorder.field566 = var2; } @@ -1167,14 +1167,14 @@ public final class class54 { Client.field192 = MouseHandler.MouseHandler_x; } - Client.minimapOrientation = Client.field190 / 2 + Client.minimapOrientation & 2047; - Client.cameraPitchTarget += Client.field191 / 2; - if (Client.cameraPitchTarget < 128) { - Client.cameraPitchTarget = 128; + Client.camAngleY = Client.field190 / 2 + Client.camAngleY & 2047; + Client.camAngleX += Client.field191 / 2; + if (Client.camAngleX < 128) { + Client.camAngleX = 128; } - if (Client.cameraPitchTarget > 383) { - Client.cameraPitchTarget = 383; + if (Client.camAngleX > 383) { + Client.camAngleX = 383; } } diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java index 07f0173d39..ae0ceac3db 100644 --- a/runescape-client/src/main/java/class65.java +++ b/runescape-client/src/main/java/class65.java @@ -56,7 +56,7 @@ public class class65 extends RouteStrategy { var0.orientation = var0.field21; var0.field9 = var0.orientation; } else { - var0.movementSequence = var0.idleSequence; + var0.movementSequence = var0.readySequence; if (var0.pathLength == 0) { var0.field24 = 0; } else { @@ -107,13 +107,13 @@ public class class65 extends RouteStrategy { var6 -= 2048; } - int var8 = var0.walkTurnSequence; + int var8 = var0.walkBackSequence; if (var6 >= -256 && var6 <= 256) { var8 = var0.walkSequence; } else if (var6 >= 256 && var6 < 768) { - var8 = var0.walkTurnRightSequence; + var8 = var0.walkRightSequence; } else if (var6 >= -768 && var6 <= -256) { - var8 = var0.walkTurnLeftSequence; + var8 = var0.walkLeftSequence; } if (var8 == -1) { From e2aac6d899f0eeb76e04a41a02f310695d928138 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sun, 7 Jul 2019 15:10:50 +0200 Subject: [PATCH 376/472] More refactoring (tm) --- .../deob/updater/UpdateMappingsTest.java | 14 + .../net/runelite/runesuite/HookImporter.java | 2 +- .../java/net/runelite/runesuite/hooks.json | 72794 +++++++--------- .../java/net/runelite/api/PacketBuffer.java | 29 - .../net/runelite/api/widgets/WidgetType.java | 6 + .../net/runelite/mixins/RSClientMixin.java | 6 +- .../java/net/runelite/rs/api/RSClient.java | 2 +- .../net/runelite/rs/api/RSPacketBuffer.java | 4 +- .../src/main/java/AbstractArchive.java | 24 +- .../main/java/AbstractByteArrayCopier.java | 2 +- .../src/main/java/AbstractFont.java | 314 +- .../src/main/java/AbstractRasterProvider.java | 4 +- .../src/main/java/AbstractSocket.java | 6 +- .../src/main/java/AbstractWorldMapIcon.java | 12 +- .../src/main/java/AccessFile.java | 22 +- runescape-client/src/main/java/Actor.java | 782 +- runescape-client/src/main/java/Archive.java | 44 +- .../src/main/java/ArchiveDisk.java | 495 +- .../src/main/java/ArchiveLoader.java | 649 +- .../src/main/java/AudioFilter.java | 40 +- runescape-client/src/main/java/Buffer.java | 122 +- .../src/main/java/BufferedFile.java | 116 +- .../src/main/java/BufferedNetSocket.java | 12 +- .../src/main/java/BufferedSink.java | 74 +- .../src/main/java/BufferedSource.java | 30 +- .../src/main/java/Bzip2Decompressor.java | 140 +- runescape-client/src/main/java/Canvas.java | 58 +- .../src/main/java/ChatChannel.java | 10 +- runescape-client/src/main/java/ClanChat.java | 21 +- runescape-client/src/main/java/Client.java | 1567 +- runescape-client/src/main/java/Clock.java | 24 +- .../src/main/java/CollisionMap.java | 20 +- runescape-client/src/main/java/Coord.java | 11 +- runescape-client/src/main/java/Decimator.java | 12 +- .../src/main/java/DefaultsGroup.java | 8 +- .../src/main/java/DemotingHashTable.java | 34 +- .../src/main/java/DevicePcmPlayer.java | 10 +- .../main/java/DevicePcmPlayerProvider.java | 116 +- .../src/main/java/DirectByteArrayCopier.java | 6 +- .../src/main/java/DynamicObject.java | 290 +- runescape-client/src/main/java/Entity.java | 4 +- .../main/java/EvictingDualNodeHashTable.java | 14 +- .../src/main/java/FloorOverlayDefinition.java | 54 +- .../main/java/FloorUnderlayDefinition.java | 8 +- runescape-client/src/main/java/FontName.java | 66 +- .../src/main/java/Formatting.java | 44 +- runescape-client/src/main/java/Frames.java | 4 +- runescape-client/src/main/java/Friend.java | 4 +- .../src/main/java/FriendSystem.java | 20 +- .../src/main/java/FriendsList.java | 24 +- runescape-client/src/main/java/GameShell.java | 36 +- .../src/main/java/GrandExchangeEvent.java | 30 +- .../src/main/java/GrandExchangeEvents.java | 12 +- .../src/main/java/GraphicsDefaults.java | 9 +- .../src/main/java/GraphicsObject.java | 4 +- .../src/main/java/GroundItemPile.java | 28 +- runescape-client/src/main/java/HealthBar.java | 124 +- .../src/main/java/IgnoreList.java | 12 +- runescape-client/src/main/java/Ignored.java | 4 +- .../src/main/java/Instrument.java | 116 +- .../src/main/java/InterfaceParent.java | 8 +- .../src/main/java/ItemDefinition.java | 167 +- .../src/main/java/IterableNodeDeque.java | 48 +- .../src/main/java/IterableNodeHashTable.java | 15 +- .../java/IterableNodeHashTableIterator.java | 17 +- runescape-client/src/main/java/Message.java | 28 +- .../src/main/java/MidiFileReader.java | 88 +- .../src/main/java/MidiPcmStream.java | 78 +- .../src/main/java/MilliClock.java | 18 +- runescape-client/src/main/java/Model.java | 251 +- runescape-client/src/main/java/ModelData.java | 64 +- .../src/main/java/MouseHandler.java | 6 +- .../src/main/java/MouseRecorder.java | 53 +- .../src/main/java/MouseWheelHandler.java | 8 +- .../src/main/java/MusicPatchPcmStream.java | 16 +- .../src/main/java/MusicSample.java | 167 +- runescape-client/src/main/java/NPC.java | 2 +- runescape-client/src/main/java/NanoClock.java | 6 +- runescape-client/src/main/java/NetSocket.java | 189 +- runescape-client/src/main/java/NodeDeque.java | 28 +- .../src/main/java/NodeHashTable.java | 39 +- .../src/main/java/ObjectDefinition.java | 12 +- runescape-client/src/main/java/Occluder.java | 4 +- .../src/main/java/PacketBuffer.java | 24 +- .../src/main/java/PacketWriter.java | 4 +- .../src/main/java/ParamDefinition.java | 32 +- runescape-client/src/main/java/PcmPlayer.java | 24 +- runescape-client/src/main/java/PcmStream.java | 12 +- .../src/main/java/PcmStreamMixer.java | 20 +- .../src/main/java/PlatformInfo.java | 54 +- runescape-client/src/main/java/Player.java | 48 +- runescape-client/src/main/java/Players.java | 12 +- .../src/main/java/Projectile.java | 36 +- .../src/main/java/RasterProvider.java | 22 +- .../src/main/java/Rasterizer2D.java | 320 +- .../src/main/java/Rasterizer3D.java | 124 +- .../src/main/java/RawPcmStream.java | 6 +- runescape-client/src/main/java/RawSound.java | 12 +- runescape-client/src/main/java/Scene.java | 422 +- .../src/main/java/ScriptEvent.java | 12 +- .../src/main/java/ScriptFrame.java | 6 +- .../src/main/java/SequenceDefinition.java | 150 +- .../src/main/java/ServerPacket.java | 2 +- runescape-client/src/main/java/Skills.java | 6 +- .../src/main/java/SoundCache.java | 64 +- .../src/main/java/SoundEffect.java | 4 +- .../src/main/java/SoundEnvelope.java | 18 +- .../main/java/SpotAnimationDefinition.java | 34 +- runescape-client/src/main/java/Sprite.java | 49 +- .../src/main/java/SpriteMask.java | 8 +- runescape-client/src/main/java/Strings.java | 40 +- .../src/main/java/StructDefinition.java | 2 +- .../src/main/java/StudioGame.java | 2 +- .../src/main/java/TextureProvider.java | 80 +- runescape-client/src/main/java/Tile.java | 38 +- runescape-client/src/main/java/TilePaint.java | 18 +- runescape-client/src/main/java/Timer.java | 16 +- .../main/java/TotalQuantityComparator.java | 70 +- .../src/main/java/UrlRequester.java | 4 +- runescape-client/src/main/java/User.java | 12 +- .../src/main/java/UserComparator9.java | 2 +- runescape-client/src/main/java/UserList.java | 86 +- runescape-client/src/main/java/Username.java | 4 +- runescape-client/src/main/java/VarcInt.java | 4 +- runescape-client/src/main/java/Varcs.java | 226 +- runescape-client/src/main/java/Widget.java | 363 +- runescape-client/src/main/java/WorldMap.java | 158 +- .../src/main/java/WorldMapArchiveLoader.java | 3 +- .../src/main/java/WorldMapArea.java | 68 +- .../src/main/java/WorldMapCacheName.java | 36 +- .../src/main/java/WorldMapElement.java | 110 +- .../src/main/java/WorldMapEvent.java | 98 +- .../src/main/java/WorldMapIcon1.java | 88 +- .../src/main/java/WorldMapIcon2.java | 6 +- .../src/main/java/WorldMapLabel.java | 8 +- .../src/main/java/WorldMapManager.java | 62 +- .../src/main/java/WorldMapRegion.java | 20 +- .../src/main/java/WorldMapSection.java | 12 +- .../src/main/java/WorldMapSection2.java | 112 +- .../src/main/java/WorldMapSection3.java | 48 +- runescape-client/src/main/java/class1.java | 6 +- runescape-client/src/main/java/class11.java | 12 +- runescape-client/src/main/java/class16.java | 52 +- runescape-client/src/main/java/class204.java | 12 +- runescape-client/src/main/java/class21.java | 10 +- runescape-client/src/main/java/class226.java | 20 +- runescape-client/src/main/java/class227.java | 313 +- runescape-client/src/main/java/class229.java | 2 +- runescape-client/src/main/java/class238.java | 325 +- runescape-client/src/main/java/class258.java | 2 +- runescape-client/src/main/java/class3.java | 2 +- runescape-client/src/main/java/class30.java | 4 +- runescape-client/src/main/java/class322.java | 4 +- runescape-client/src/main/java/class39.java | 212 +- runescape-client/src/main/java/class4.java | 16 +- runescape-client/src/main/java/class40.java | 130 +- runescape-client/src/main/java/class48.java | 21 +- runescape-client/src/main/java/class50.java | 30 +- runescape-client/src/main/java/class54.java | 80 +- 159 files changed, 38213 insertions(+), 46222 deletions(-) delete mode 100644 runelite-api/src/main/java/net/runelite/api/PacketBuffer.java diff --git a/deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java b/deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java index 332e2e31b0..bb34282e22 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java @@ -37,6 +37,7 @@ import net.runelite.deob.deobfuscators.mapping.AnnotationIntegrityChecker; import net.runelite.deob.deobfuscators.mapping.AnnotationMapper; import net.runelite.deob.deobfuscators.mapping.Mapper; import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.transformers.ScriptOpcodesTransformer; import net.runelite.deob.util.JarUtil; import org.junit.Assert; import org.junit.Ignore; @@ -87,6 +88,19 @@ public class UpdateMappingsTest check(group1, group2); } + @Test + @Ignore + public void testScriptopcodes() throws Exception + { + File client = new File("C:\\Users\\Lucas\\IdeaProjects\\runelitexxx\\client.jar"); + + ClassGroup group = JarUtil.loadJar(client); + + new ScriptOpcodesTransformer().transform(group); + + JarUtil.saveJar(group, new File("C:/Users/Lucas/Desktop/Apapapapapap.jar")); + } + private void unannotate(ClassGroup group) { for (ClassFile cf : group.getClasses()) diff --git a/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java b/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java index 6f262f105f..5c78be64f1 100644 --- a/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java +++ b/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java @@ -187,7 +187,7 @@ public class HookImporter for (int i = 0; i < hm.parameters.size(); i++) { String name = hm.parameters.get(i); - if (name.matches("arg[0-9]") || name.length() <= 2 && (name.charAt(0) != 'x' || name.charAt(0) != 'y')) + if (name.matches("arg[0-9]") || name.length() <= 2 && (name.charAt(0) != 'x' && name.charAt(0) != 'y')) { continue; } diff --git a/deobfuscator/src/test/java/net/runelite/runesuite/hooks.json b/deobfuscator/src/test/java/net/runelite/runesuite/hooks.json index 609a346a24..56b4ddb42b 100644 --- a/deobfuscator/src/test/java/net/runelite/runesuite/hooks.json +++ b/deobfuscator/src/test/java/net/runelite/runesuite/hooks.json @@ -1,40431 +1,32363 @@ -[ - { - "access": 1057, - "class": "AbstractArchive", - "constructors": [ - { - "access": 0, - "descriptor": "(ZZ)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": 1694798923, - "descriptor": "I", - "field": "groupCount", - "name": "f", - "owner": "ir" - }, - { - "access": 0, - "descriptor": "Llv;", - "field": "groupNameHashTable", - "name": "o", - "owner": "ir" - }, - { - "access": 0, - "descriptor": "Z", - "field": "releaseGroups", - "name": "z", - "owner": "ir" - }, - { - "access": 0, - "descriptor": "Z", - "field": "shallowFiles", - "name": "j", - "owner": "ir" - }, - { - "access": 0, - "descriptor": "[I", - "field": "fileCounts", - "name": "l", - "owner": "ir" - }, - { - "access": 0, - "descriptor": "[I", - "field": "groupCrcs", - "name": "u", - "owner": "ir" - }, - { - "access": 0, - "descriptor": "[I", - "field": "groupIds", - "name": "q", - "owner": "ir" - }, - { - "access": 0, - "descriptor": "[I", - "field": "groupNameHashes", - "name": "w", - "owner": "ir" - }, - { - "access": 0, - "descriptor": "[I", - "field": "groupVersions", - "name": "g", - "owner": "ir" - }, - { - "access": 0, - "descriptor": "[Ljava/lang/Object;", - "field": "groups", - "name": "k", - "owner": "ir" - }, - { - "access": 0, - "descriptor": "[Llv;", - "field": "fileNameHashTables", - "name": "d", - "owner": "ir" - }, - { - "access": 0, - "descriptor": "[[I", - "field": "fileIds", - "name": "e", - "owner": "ir" - }, - { - "access": 0, - "descriptor": "[[I", - "field": "fileNameHashes", - "name": "x", - "owner": "ir" - }, - { - "access": 0, - "descriptor": "[[Ljava/lang/Object;", - "field": "files", - "name": "n", - "owner": "ir" - }, - { - "access": 1, - "decoder": -530370811, - "descriptor": "I", - "field": "hash", - "name": "a", - "owner": "ir" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(II)I", - "method": "groupLoadPercent", - "name": "e", - "owner": "ir" - }, - { - "access": 0, - "descriptor": "(II)V", - "method": "__f_392", - "name": "f", - "owner": "ir", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "(II)V", - "method": "loadGroup", - "name": "z", - "owner": "ir" - }, - { - "access": 0, - "descriptor": "(I[II)Z", - "method": "buildFiles", - "name": "c", - "owner": "ir", - "parameters": [ - "group", - "xteaKey" - ] - }, - { - "access": 0, - "descriptor": "([BB)V", - "method": "decodeIndex", - "name": "m", - "owner": "ir" - }, - { - "access": 1, - "descriptor": "(B)V", - "method": "__y_398", - "name": "y", - "owner": "ir", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__t_397", - "name": "t", - "owner": "ir", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "__b_400", - "name": "b", - "owner": "ir", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)Z", - "method": "__l_394", - "name": "l", - "owner": "ir", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(IB)[B", - "method": "getFileFlat", - "name": "a", - "owner": "ir", - "parameters": [ - "groupOrFile" - ] - }, - { - "access": 1, - "descriptor": "(IB)[I", - "method": "__j_395", - "name": "j", - "owner": "ir", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(II)I", - "method": "__s_396", - "name": "s", - "owner": "ir", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(II)V", - "method": "__h_399", - "name": "h", - "owner": "ir", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(II)Z", - "method": "__u_393", - "name": "u", - "owner": "ir", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(II)Z", - "method": "tryLoadGroup", - "name": "g", - "owner": "ir", - "parameters": [ - "group" - ] - }, - { - "access": 1, - "descriptor": "(III)Z", - "method": "tryLoadFile", - "name": "o", - "owner": "ir", - "parameters": [ - "file", - "group" - ] - }, - { - "access": 1, - "descriptor": "(III)[B", - "method": "getFile", - "name": "d", - "owner": "ir", - "parameters": [ - "file", - "group" - ] - }, - { - "access": 1, - "descriptor": "(III)[B", - "method": "takeFile", - "name": "q", - "owner": "ir", - "parameters": [ - "file", - "group" - ] - }, - { - "access": 1, - "descriptor": "(II[II)[B", - "method": "takeFileEncrypted", - "name": "w", - "owner": "ir", - "parameters": [ - "file", - "group", - "xteaKey" - ] - }, - { - "access": 1, - "descriptor": "(ILjava/lang/String;I)I", - "method": "getFileId", - "name": "v", - "owner": "ir", - "parameters": [ - "fileName", - "group" - ] - }, - { - "access": 1, - "descriptor": "(IS)[B", - "method": "takeFileFlat", - "name": "x", - "owner": "ir", - "parameters": [ - "groupOrFile" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/String;B)V", - "method": "__ar_402", - "name": "ar", - "owner": "ir", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/String;I)I", - "method": "getGroupId", - "name": "p", - "owner": "ir", - "parameters": [ - "groupName" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/String;I)I", - "method": "groupLoadPercentByName", - "name": "ac", - "owner": "ir", - "parameters": [ - "groupName" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/String;I)Z", - "method": "tryLoadGroupByName", - "name": "av", - "owner": "ir", - "parameters": [ - "groupName" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/String;Ljava/lang/String;B)Z", - "method": "__ag_401", - "name": "ag", - "owner": "ir", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/String;Ljava/lang/String;I)Z", - "method": "tryLoadFileByNames", - "name": "aj", - "owner": "ir", - "parameters": [ - "fileName", - "groupName" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/String;Ljava/lang/String;S)[B", - "method": "takeFileByNames", - "name": "aq", - "owner": "ir", - "parameters": [ - "fileName", - "groupName" - ] - } - ], - "name": "ir", - "super": "java.lang.Object" - }, - { - "access": 1057, - "class": "AbstractByteArrayCopier", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [], - "interfaces": [], - "methods": [ - { - "access": 1024, - "descriptor": "(I)[B", - "method": "get", - "name": "m", - "owner": "gu", - "parameters": [] - }, - { - "access": 1024, - "descriptor": "([BI)V", - "method": "set", - "name": "f", - "owner": "gu", - "parameters": [ - "array" - ] - } - ], - "name": "gu", - "super": "java.lang.Object" - }, - { - "access": 1057, - "class": "AbstractFont", - "constructors": [ - { - "access": 0, - "descriptor": "([B)V" - }, - { - "access": 0, - "descriptor": "([B[I[I[I[I[I[[B)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "[B", - "field": "kerning", - "name": "d", - "owner": "kt" - }, - { - "access": 0, - "descriptor": "[I", - "field": "advances", - "name": "f", - "owner": "kt" - }, - { - "access": 0, - "descriptor": "[I", - "field": "heights", - "name": "w", - "owner": "kt" - }, - { - "access": 0, - "descriptor": "[I", - "field": "leftBearings", - "name": "o", - "owner": "kt" - }, - { - "access": 0, - "descriptor": "[I", - "field": "topBearings", - "name": "u", - "owner": "kt" - }, - { - "access": 0, - "descriptor": "[I", - "field": "widths", - "name": "q", - "owner": "kt" - }, - { - "access": 0, - "descriptor": "[[B", - "field": "pixels", - "name": "m", - "owner": "kt" - }, - { - "access": 1, - "descriptor": "I", - "field": "ascent", - "name": "g", - "owner": "kt" - }, - { - "access": 1, - "descriptor": "I", - "field": "maxAscent", - "name": "l", - "owner": "kt" - }, - { - "access": 1, - "descriptor": "I", - "field": "maxDescent", - "name": "e", - "owner": "kt" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(C)I", - "method": "charWidth", - "name": "x", - "owner": "kt", - "parameters": [ - "c" - ] - }, - { - "access": 0, - "descriptor": "(II)V", - "method": "reset", - "name": "aj", - "owner": "kt", - "parameters": [ - "color", - "shadow" - ] - }, - { - "access": 0, - "descriptor": "(Ljava/lang/String;)V", - "method": "decodeTag", - "name": "av", - "owner": "kt", - "parameters": [ - "s" - ] - }, - { - "access": 0, - "descriptor": "(Ljava/lang/String;I)V", - "method": "calculateLineJustification", - "name": "ar", - "owner": "kt", - "parameters": [ - "lineWidth", - "s" - ] - }, - { - "access": 0, - "descriptor": "(Ljava/lang/String;II)V", - "method": "draw0", - "name": "ac", - "owner": "kt", - "parameters": [ - "s", - "x", - "y" - ] - }, - { - "access": 0, - "descriptor": "(Ljava/lang/String;II[I[I)V", - "method": "drawWithOffsets0", - "name": "ay", - "owner": "kt", - "parameters": [ - "s", - "x", - "xs", - "y", - "ys" - ] - }, - { - "access": 0, - "descriptor": "([B)V", - "method": "readMetrics", - "name": "l", - "owner": "kt", - "parameters": [ - "bytes" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/String;)I", - "method": "stringWidth", - "name": "d", - "owner": "kt", - "parameters": [ - "s" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/String;I)I", - "method": "lineCount", - "name": "j", - "owner": "kt", - "parameters": [ - "lineWidth", - "s" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/String;I)I", - "method": "lineWidth", - "name": "z", - "owner": "kt", - "parameters": [ - "lineWidth", - "s" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/String;IIII)V", - "method": "draw", - "name": "t", - "owner": "kt", - "parameters": [ - "color", - "s", - "shadow", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/String;IIII)V", - "method": "drawCentered", - "name": "b", - "owner": "kt", - "parameters": [ - "color", - "s", - "shadow", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/String;IIII)V", - "method": "drawRightAligned", - "name": "h", - "owner": "kt", - "parameters": [ - "color", - "s", - "shadow", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/String;IIIII)V", - "method": "drawAlpha", - "name": "y", - "owner": "kt", - "parameters": [ - "alpha", - "color", - "s", - "shadow", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/String;IIIII)V", - "method": "drawCenteredWave", - "name": "p", - "owner": "kt", - "parameters": [ - "color", - "s", - "seed", - "shadow", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/String;IIIII)V", - "method": "drawCenteredWave2", - "name": "v", - "owner": "kt", - "parameters": [ - "color", - "s", - "seed", - "shadow", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/String;IIIII)V", - "method": "drawRandomAlphaAndSpacing", - "name": "aq", - "owner": "kt", - "parameters": [ - "color", - "s", - "seed", - "shadow", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/String;IIIIII)V", - "method": "drawCenteredShake", - "name": "ag", - "owner": "kt", - "parameters": [ - "color", - "s", - "seed", - "seed2", - "shadow", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/String;IIIIIIIII)I", - "method": "drawLines", - "name": "c", - "owner": "kt", - "parameters": [ - "color", - "height", - "lineHeight", - "s", - "shadow", - "width", - "x", - "xAlignment", - "y", - "yAlignment" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/String;[I[Ljava/lang/String;)I", - "method": "breakLines", - "name": "a", - "owner": "kt", - "parameters": [ - "lineWidths", - "linesDst", - "s" - ] - }, - { - "access": 1024, - "descriptor": "([BIIIII)V", - "method": "drawGlyph", - "name": "m", - "owner": "kt", - "parameters": [ - "color", - "height", - "pixels", - "width", - "x", - "y" - ] - }, - { - "access": 1024, - "descriptor": "([BIIIIII)V", - "method": "drawGlyphAlpha", - "name": "f", - "owner": "kt", - "parameters": [ - "alpha", - "color", - "height", - "pixels", - "width", - "x", - "y" - ] - } - ], - "name": "kt", - "super": "lf" - }, - { - "access": 1057, - "class": "AbstractRasterProvider", - "constructors": [ - { - "access": 4, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 1, - "decoder": -239960145, - "descriptor": "I", - "field": "height", - "name": "o", - "owner": "lp" - }, - { - "access": 1, - "decoder": -560298363, - "descriptor": "I", - "field": "width", - "name": "w", - "owner": "lp" - }, - { - "access": 1, - "descriptor": "[I", - "field": "pixels", - "name": "q", - "owner": "lp" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1025, - "descriptor": "(III)V", - "method": "drawFull", - "name": "f", - "owner": "lp", - "parameters": [ - "x", - "y" - ] - }, - { - "access": 1025, - "descriptor": "(IIIIB)V", - "method": "draw", - "name": "q", - "owner": "lp", - "parameters": [ - "height", - "width", - "x", - "y" - ] - }, - { - "access": 17, - "descriptor": "(I)V", - "method": "apply", - "name": "b", - "owner": "lp", - "parameters": [] - } - ], - "name": "lp", - "super": "java.lang.Object" - }, - { - "access": 1057, - "class": "AbstractSocket", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [], - "interfaces": [], - "methods": [ - { - "access": 1025, - "descriptor": "(I)I", - "method": "available", - "name": "q", - "owner": "fu", - "parameters": [] - }, - { - "access": 1025, - "descriptor": "(I)I", - "method": "readUnsignedByte", - "name": "w", - "owner": "fu", - "parameters": [] - }, - { - "access": 1025, - "descriptor": "(I)V", - "method": "close", - "name": "g", - "owner": "fu", - "parameters": [] - }, - { - "access": 1025, - "descriptor": "(II)Z", - "method": "isAvailable", - "name": "f", - "owner": "fu", - "parameters": [ - "length" - ] - }, - { - "access": 1025, - "descriptor": "([BIIB)V", - "method": "write", - "name": "u", - "owner": "fu", - "parameters": [ - "length", - "src", - "srcIndex" - ] - }, - { - "access": 1025, - "descriptor": "([BIII)I", - "method": "read", - "name": "o", - "owner": "fu", - "parameters": [ - "dst", - "dstIndex", - "length" - ] - } - ], - "name": "fu", - "super": "java.lang.Object" - }, - { - "access": 1057, - "class": "AbstractSound", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "I", - "field": "position", - "name": "u", - "owner": "dd" - } - ], - "interfaces": [], - "methods": [], - "name": "dd", - "super": "gw" - }, - { - "access": 1057, - "class": "AbstractUserComparator", - "constructors": [ - { - "access": 4, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Ljava/util/Comparator;", - "field": "__f", - "name": "f", - "owner": "kf" - } - ], - "interfaces": [ - "java.util.Comparator" - ], - "methods": [ - { - "access": 1, - "descriptor": "(Ljava/lang/Object;)Z", - "method": "__equals_462", - "name": "equals", - "owner": "kf", - "parameters": [ - "arg0" - ] - }, - { - "access": 16, - "descriptor": "(Ljava/util/Comparator;B)V", - "method": "__e_460", - "name": "e", - "owner": "kf", - "parameters": [ - "arg0" - ] - }, - { - "access": 20, - "descriptor": "(Ljs;Ljs;I)I", - "method": "__x_461", - "name": "x", - "owner": "kf", - "parameters": [ - "arg0", - "arg1" - ] - } - ], - "name": "kf", - "super": "java.lang.Object" - }, - { - "access": 1057, - "class": "AbstractWorldMapIcon", - "constructors": [ - { - "access": 0, - "descriptor": "(Lhu;Lhu;)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1065362217, - "descriptor": "I", - "field": "__x", - "name": "x", - "owner": "ak" - }, - { - "access": 0, - "decoder": -521086143, - "descriptor": "I", - "field": "__e", - "name": "e", - "owner": "ak" - }, - { - "access": 17, - "descriptor": "Lhu;", - "field": "coord1", - "name": "l", - "owner": "ak" - }, - { - "access": 17, - "descriptor": "Lhu;", - "field": "coord2", - "name": "g", - "owner": "ak" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)Z", - "method": "__h_67", - "name": "h", - "owner": "ak", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(IIB)Z", - "method": "__y_66", - "name": "y", - "owner": "ak", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 0, - "descriptor": "(III)Z", - "method": "__b_68", - "name": "b", - "owner": "ak", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 0, - "descriptor": "(III)Z", - "method": "__c_69", - "name": "c", - "owner": "ak", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1024, - "descriptor": "(B)I", - "method": "__q_71", - "name": "q", - "owner": "ak", - "parameters": [] - }, - { - "access": 1024, - "descriptor": "(I)I", - "method": "__w_70", - "name": "w", - "owner": "ak", - "parameters": [] - }, - { - "access": 1024, - "descriptor": "(I)Laj;", - "method": "label", - "name": "f", - "owner": "ak", - "parameters": [] - }, - { - "access": 1025, - "descriptor": "(I)I", - "method": "element", - "name": "m", - "owner": "ak", - "parameters": [] - } - ], - "name": "ak", - "super": "java.lang.Object" - }, - { - "access": 1057, - "class": "Actor", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1119758739, - "descriptor": "I", - "field": "movementFrame", - "name": "bx", - "owner": "bz" - }, - { - "access": 0, - "decoder": -1189634367, - "descriptor": "I", - "field": "orientation", - "name": "cs", - "owner": "bz" - }, - { - "access": 0, - "decoder": -134491649, - "descriptor": "I", - "field": "sequenceDelay", - "name": "br", - "owner": "bz" - }, - { - "access": 0, - "decoder": -1357622739, - "descriptor": "I", - "field": "size", - "name": "ah", - "owner": "bz" - }, - { - "access": 0, - "decoder": -1387109107, - "descriptor": "I", - "field": "targetIndex", - "name": "bk", - "owner": "bz" - }, - { - "access": 0, - "decoder": -1523249259, - "descriptor": "I", - "field": "__bj", - "name": "bj", - "owner": "bz" - }, - { - "access": 0, - "decoder": -1573449469, - "descriptor": "I", - "field": "x", - "name": "av", - "owner": "bz" - }, - { - "access": 0, - "decoder": -1583514013, - "descriptor": "I", - "field": "__cq", - "name": "cq", - "owner": "bz" - }, - { - "access": 0, - "decoder": -1598871111, - "descriptor": "I", - "field": "walkBackSequence", - "name": "at", - "owner": "bz" - }, - { - "access": 0, - "decoder": -1630403001, - "descriptor": "I", - "field": "__bw", - "name": "bw", - "owner": "bz" - }, - { - "access": 0, - "decoder": -1646413227, - "descriptor": "I", - "field": "movementFrameCycle", - "name": "by", - "owner": "bz" - }, - { - "access": 0, - "decoder": -1723834619, - "descriptor": "I", - "field": "__cv", - "name": "cv", - "owner": "bz" - }, - { - "access": 0, - "decoder": -1753867715, - "descriptor": "I", - "field": "sequenceFrameCycle", - "name": "bl", - "owner": "bz" - }, - { - "access": 0, - "decoder": -1857513783, - "descriptor": "I", - "field": "__bv", - "name": "bv", - "owner": "bz" - }, - { - "access": 0, - "decoder": -1905191799, - "descriptor": "I", - "field": "overheadTextColor", - "name": "ao", - "owner": "bz" - }, - { - "access": 0, - "decoder": -2033082375, - "descriptor": "I", - "field": "pathLength", - "name": "cu", - "owner": "bz" - }, - { - "access": 0, - "decoder": -2075997699, - "descriptor": "I", - "field": "walkSequence", - "name": "ae", - "owner": "bz" - }, - { - "access": 0, - "decoder": -2125404733, - "descriptor": "I", - "field": "spotAnimationFrame", - "name": "bz", - "owner": "bz" - }, - { - "access": 0, - "decoder": -220610999, - "descriptor": "I", - "field": "spotAnimation", - "name": "bi", - "owner": "bz" - }, - { - "access": 0, - "decoder": -257240117, - "descriptor": "I", - "field": "walkRightSequence", - "name": "ap", - "owner": "bz" - }, - { - "access": 0, - "decoder": -299122235, - "descriptor": "I", - "field": "readySequence", - "name": "aw", - "owner": "bz" - }, - { - "access": 0, - "decoder": -336931157, - "descriptor": "I", - "field": "__cj", - "name": "cj", - "owner": "bz" - }, - { - "access": 0, - "decoder": -568830521, - "descriptor": "I", - "field": "walkLeftSequence", - "name": "ad", - "owner": "bz" - }, - { - "access": 0, - "decoder": -779457309, - "descriptor": "I", - "field": "heightOffset", - "name": "bp", - "owner": "bz" - }, - { - "access": 0, - "decoder": -831787909, - "descriptor": "I", - "field": "turnLeftSequence", - "name": "al", - "owner": "bz" - }, - { - "access": 0, - "decoder": 1003085333, - "descriptor": "I", - "field": "defaultHeight", - "name": "cy", - "owner": "bz" - }, - { - "access": 0, - "decoder": 1252341007, - "descriptor": "I", - "field": "__cm", - "name": "cm", - "owner": "bz" - }, - { - "access": 0, - "decoder": 1367256299, - "descriptor": "I", - "field": "__cr", - "name": "cr", - "owner": "bz" - }, - { - "access": 0, - "decoder": 137508815, - "descriptor": "I", - "field": "overheadTextCyclesRemaining", - "name": "au", - "owner": "bz" - }, - { - "access": 0, - "decoder": 139384875, - "descriptor": "I", - "field": "__bc", - "name": "bc", - "owner": "bz" - }, - { - "access": 0, - "decoder": 141226463, - "descriptor": "I", - "field": "playerCycle", - "name": "ak", - "owner": "bz" - }, - { - "access": 0, - "decoder": 1425662251, - "descriptor": "I", - "field": "sequenceFrame", - "name": "bm", - "owner": "bz" - }, - { - "access": 0, - "decoder": 1439711403, - "descriptor": "I", - "field": "__ac", - "name": "ac", - "owner": "bz" - }, - { - "access": 0, - "decoder": 1584102533, - "descriptor": "I", - "field": "__ch", - "name": "ch", - "owner": "bz" - }, - { - "access": 0, - "decoder": 1614854211, - "descriptor": "I", - "field": "movementSequence", - "name": "bo", - "owner": "bz" - }, - { - "access": 0, - "decoder": 1708570917, - "descriptor": "I", - "field": "runSequence", - "name": "as", - "owner": "bz" - }, - { - "access": 0, - "decoder": 1788714977, - "descriptor": "I", - "field": "turnRightSequence", - "name": "ab", - "owner": "bz" - }, - { - "access": 0, - "decoder": 2051334073, - "descriptor": "I", - "field": "npcCycle", - "name": "ce", - "owner": "bz" - }, - { - "access": 0, - "decoder": 2121599561, - "descriptor": "I", - "field": "__bf", - "name": "bf", - "owner": "bz" - }, - { - "access": 0, - "decoder": 280591281, - "descriptor": "I", - "field": "__bh", - "name": "bh", - "owner": "bz" - }, - { - "access": 0, - "decoder": 323216015, - "descriptor": "I", - "field": "sequence", - "name": "bu", - "owner": "bz" - }, - { - "access": 0, - "decoder": 330334599, - "descriptor": "I", - "field": "spotAnimationFrameCycle", - "name": "bg", - "owner": "bz" - }, - { - "access": 0, - "decoder": 541000549, - "descriptor": "I", - "field": "overheadTextEffect", - "name": "aa", - "owner": "bz" - }, - { - "access": 0, - "decoder": 676600595, - "descriptor": "I", - "field": "y", - "name": "ar", - "owner": "bz" - }, - { - "access": 0, - "decoder": 837989037, - "descriptor": "I", - "field": "__be", - "name": "be", - "owner": "bz" - }, - { - "access": 0, - "decoder": 886371765, - "descriptor": "I", - "field": "__bt", - "name": "bt", - "owner": "bz" - }, - { - "access": 0, - "descriptor": "B", - "field": "hitmarkCount", - "name": "af", - "owner": "bz" - }, - { - "access": 0, - "descriptor": "Lja;", - "field": "healthBars", - "name": "bn", - "owner": "bz" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "overheadText", - "name": "am", - "owner": "bz" - }, - { - "access": 0, - "descriptor": "Z", - "field": "__ay", - "name": "ay", - "owner": "bz" - }, - { - "access": 0, - "descriptor": "Z", - "field": "__az", - "name": "az", - "owner": "bz" - }, - { - "access": 0, - "descriptor": "Z", - "field": "false0", - "name": "bd", - "owner": "bz" - }, - { - "access": 0, - "descriptor": "Z", - "field": "isAutoChatting", - "name": "an", - "owner": "bz" - }, - { - "access": 0, - "descriptor": "[B", - "field": "pathTraversed", - "name": "cn", - "owner": "bz" - }, - { - "access": 0, - "descriptor": "[I", - "field": "hitmarkCycles", - "name": "bb", - "owner": "bz" - }, - { - "access": 0, - "descriptor": "[I", - "field": "hitmarkTypes", - "name": "ai", - "owner": "bz" - }, - { - "access": 0, - "descriptor": "[I", - "field": "hitmarkTypes2", - "name": "bs", - "owner": "bz" - }, - { - "access": 0, - "descriptor": "[I", - "field": "hitmarkValues", - "name": "ba", - "owner": "bz" - }, - { - "access": 0, - "descriptor": "[I", - "field": "hitmarkValues2", - "name": "bq", - "owner": "bz" - }, - { - "access": 0, - "descriptor": "[I", - "field": "pathX", - "name": "cb", - "owner": "bz" - }, - { - "access": 0, - "descriptor": "[I", - "field": "pathY", - "name": "ck", - "owner": "bz" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(B)Z", - "method": "isVisible", - "name": "z", - "owner": "bz", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(I)V", - "method": "__bb_143", - "name": "bb", - "owner": "bz", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(IIIIIIB)V", - "method": "addHealthBar", - "name": "bq", - "owner": "bz", - "parameters": [ - "cycle", - "healthBarDefinition", - "n0", - "n1", - "n2", - "n3" - ] - }, - { - "access": 16, - "descriptor": "(IIIIIII)V", - "method": "addHitmark", - "name": "bs", - "owner": "bz", - "parameters": [ - "cycle", - "cycle2", - "type", - "type2", - "value", - "value2" - ] - }, - { - "access": 16, - "descriptor": "(IS)V", - "method": "removeHealthBar", - "name": "bn", - "owner": "bz", - "parameters": [ - "healthBarDefinition" - ] - } - ], - "name": "bz", - "super": "ex" - }, - { - "access": 1057, - "class": "Clock", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [], - "interfaces": [], - "methods": [ - { - "access": 1025, - "descriptor": "(B)V", - "method": "mark", - "name": "m", - "owner": "fa", - "parameters": [] - }, - { - "access": 1025, - "descriptor": "(III)I", - "method": "wait", - "name": "f", - "owner": "fa", - "parameters": [ - "cycleMs", - "minSleepMs" - ] - } - ], - "name": "fa", - "super": "java.lang.Object" - }, - { - "access": 1057, - "class": "Entity", - "constructors": [ - { - "access": 4, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 1, - "decoder": 849583845, - "descriptor": "I", - "field": "height", - "name": "cw", - "owner": "ex" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(IIIIIIIIJ)V", - "method": "draw", - "name": "cy", - "owner": "ex", - "parameters": [ - "cameraPitchCosine", - "cameraPitchSine", - "cameraYawCosine", - "cameraYawSine", - "tag", - "x", - "y", - "yaw", - "z" - ] - }, - { - "access": 4, - "descriptor": "(I)Ldu;", - "method": "getModel", - "name": "e", - "owner": "ex", - "parameters": [] - } - ], - "name": "ex", - "super": "fn" - }, - { - "access": 1057, - "class": "GameShell", - "constructors": [ - { - "access": 4, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -2057041525, - "descriptor": "I", - "field": "contentHeight0", - "name": "ag", - "owner": "ba" - }, - { - "access": 0, - "decoder": -2071955075, - "descriptor": "I", - "field": "__aq", - "name": "aq", - "owner": "ba" - }, - { - "access": 0, - "decoder": 1911308233, - "descriptor": "I", - "field": "__aj", - "name": "aj", - "owner": "ba" - }, - { - "access": 0, - "decoder": 198681537, - "descriptor": "I", - "field": "canvasY", - "name": "c", - "owner": "ba" - }, - { - "access": 0, - "decoder": 740831949, - "descriptor": "I", - "field": "contentWidth0", - "name": "v", - "owner": "ba" - }, - { - "access": 0, - "decoder": 781373219, - "descriptor": "I", - "field": "canvasX", - "name": "b", - "owner": "ba" - }, - { - "access": 0, - "descriptor": "Lam;", - "field": "mouseWheelHandler", - "name": "ap", - "owner": "ba" - }, - { - "access": 0, - "descriptor": "Ljava/awt/Canvas;", - "field": "canvas", - "name": "ay", - "owner": "ba" - }, - { - "access": 0, - "descriptor": "Ljava/awt/Frame;", - "field": "frame", - "name": "ac", - "owner": "ba" - }, - { - "access": 0, - "descriptor": "Ljava/awt/datatransfer/Clipboard;", - "field": "clipboard", - "name": "as", - "owner": "ba" - }, - { - "access": 0, - "descriptor": "Z", - "field": "__al", - "name": "al", - "owner": "ba" - }, - { - "access": 0, - "descriptor": "Z", - "field": "hasErrored", - "name": "g", - "owner": "ba" - }, - { - "access": 16, - "descriptor": "Ljava/awt/EventQueue;", - "field": "eventQueue", - "name": "am", - "owner": "ba" - }, - { - "access": 4, - "decoder": -1854329683, - "descriptor": "I", - "field": "contentWidth", - "name": "t", - "owner": "ba" - }, - { - "access": 4, - "decoder": -628781469, - "descriptor": "I", - "field": "contentHeight", - "name": "h", - "owner": "ba" - }, - { - "access": 64, - "decoder": 956221087975405000, - "descriptor": "J", - "field": "canvasSetTimeMs", - "name": "ae", - "owner": "ba" - }, - { - "access": 64, - "descriptor": "Z", - "field": "__ah", - "name": "ah", - "owner": "ba" - }, - { - "access": 64, - "descriptor": "Z", - "field": "isCanvasInvalid", - "name": "ab", - "owner": "ba" - }, - { - "access": 8, - "decoder": 5666519919949402000, - "descriptor": "J", - "field": "stopTimeMs", - "name": "o", - "owner": "ba" - } - ], - "interfaces": [ - "java.awt.event.FocusListener", - "java.awt.event.WindowListener", - "java.lang.Runnable" - ], - "methods": [ - { - "access": 0, - "descriptor": "(B)V", - "method": "__ar_94", - "name": "ar", - "owner": "ba", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(B)V", - "method": "__av_93", - "name": "av", - "owner": "ba", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(B)V", - "method": "clearBackground", - "name": "p", - "owner": "ba", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)Ljava/awt/Container;", - "method": "container", - "name": "as", - "owner": "ba", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)Lla;", - "method": "getFrameContentBounds", - "name": "am", - "owner": "ba", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "run", - "name": "run", - "owner": "ba" - }, - { - "access": 1025, - "descriptor": "()V", - "method": "__init_109", - "name": "init", - "owner": "ba", - "parameters": [] - }, - { - "access": 1028, - "descriptor": "(I)V", - "method": "__al_111", - "name": "al", - "owner": "ba", - "parameters": [] - }, - { - "access": 1028, - "descriptor": "(I)V", - "method": "__au_110", - "name": "au", - "owner": "ba", - "parameters": [] - }, - { - "access": 1028, - "descriptor": "(I)V", - "method": "__j_113", - "name": "j", - "owner": "ba", - "parameters": [] - }, - { - "access": 1028, - "descriptor": "(I)V", - "method": "kill0", - "name": "ae", - "owner": "ba", - "parameters": [] - }, - { - "access": 1028, - "descriptor": "(I)V", - "method": "setUp", - "name": "aw", - "owner": "ba", - "parameters": [] - }, - { - "access": 1028, - "descriptor": "(ZI)V", - "method": "__ab_112", - "name": "ab", - "owner": "ba", - "parameters": [ - "arg0" - ] - }, - { - "access": 16, - "descriptor": "(I)V", - "method": "__ac_95", - "name": "ac", - "owner": "ba", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(I)V", - "method": "__ay_96", - "name": "ay", - "owner": "ba", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(I)V", - "method": "__z_92", - "name": "z", - "owner": "ba", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(I)V", - "method": "replaceCanvas", - "name": "v", - "owner": "ba", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(Ljava/lang/Object;I)V", - "method": "__g_91", - "name": "g", - "owner": "ba", - "parameters": [ - "arg0" - ] - }, - { - "access": 17, - "descriptor": "()V", - "method": "__destroy_99", - "name": "destroy", - "owner": "ba", - "parameters": [] - }, - { - "access": 17, - "descriptor": "()V", - "method": "__start_97", - "name": "start", - "owner": "ba", - "parameters": [] - }, - { - "access": 17, - "descriptor": "()V", - "method": "__stop_98", - "name": "stop", - "owner": "ba", - "parameters": [] - }, - { - "access": 17, - "descriptor": "(Ljava/awt/Graphics;)V", - "method": "update", - "name": "update", - "owner": "ba", - "parameters": [ - "g" - ] - }, - { - "access": 17, - "descriptor": "(Ljava/awt/event/FocusEvent;)V", - "method": "__focusLost_100", - "name": "focusLost", - "owner": "ba", - "parameters": [ - "arg0" - ] - }, - { - "access": 17, - "descriptor": "(Ljava/awt/event/FocusEvent;)V", - "method": "focusGained", - "name": "focusGained", - "owner": "ba" - }, - { - "access": 17, - "descriptor": "(Ljava/awt/event/WindowEvent;)V", - "method": "__windowActivated_101", - "name": "windowActivated", - "owner": "ba", - "parameters": [ - "arg0" - ] - }, - { - "access": 17, - "descriptor": "(Ljava/awt/event/WindowEvent;)V", - "method": "__windowClosed_102", - "name": "windowClosed", - "owner": "ba", - "parameters": [ - "arg0" - ] - }, - { - "access": 17, - "descriptor": "(Ljava/awt/event/WindowEvent;)V", - "method": "__windowClosing_103", - "name": "windowClosing", - "owner": "ba", - "parameters": [ - "arg0" - ] - }, - { - "access": 17, - "descriptor": "(Ljava/awt/event/WindowEvent;)V", - "method": "__windowDeactivated_104", - "name": "windowDeactivated", - "owner": "ba", - "parameters": [ - "arg0" - ] - }, - { - "access": 17, - "descriptor": "(Ljava/awt/event/WindowEvent;)V", - "method": "__windowDeiconified_105", - "name": "windowDeiconified", - "owner": "ba", - "parameters": [ - "arg0" - ] - }, - { - "access": 17, - "descriptor": "(Ljava/awt/event/WindowEvent;)V", - "method": "__windowIconified_106", - "name": "windowIconified", - "owner": "ba", - "parameters": [ - "arg0" - ] - }, - { - "access": 17, - "descriptor": "(Ljava/awt/event/WindowEvent;)V", - "method": "__windowOpened_107", - "name": "windowOpened", - "owner": "ba", - "parameters": [ - "arg0" - ] - }, - { - "access": 20, - "descriptor": "(B)Z", - "method": "checkHost", - "name": "aj", - "owner": "ba", - "parameters": [] - }, - { - "access": 20, - "descriptor": "(B)Z", - "method": "hasFrame", - "name": "an", - "owner": "ba", - "parameters": [] - }, - { - "access": 20, - "descriptor": "(I)V", - "method": "__ad_108", - "name": "ad", - "owner": "ba", - "parameters": [] - }, - { - "access": 20, - "descriptor": "(I)V", - "method": "setUpKeyboard", - "name": "d", - "owner": "ba", - "parameters": [] - }, - { - "access": 20, - "descriptor": "(I)V", - "method": "setUpMouse", - "name": "a", - "owner": "ba", - "parameters": [] - }, - { - "access": 20, - "descriptor": "(IIB)V", - "method": "__u_90", - "name": "u", - "owner": "ba", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 20, - "descriptor": "(IIII)V", - "method": "startThread", - "name": "ag", - "owner": "ba", - "parameters": [ - "height", - "revision", - "width" - ] - }, - { - "access": 20, - "descriptor": "(ILjava/lang/String;ZB)V", - "method": "drawInitial", - "name": "at", - "owner": "ba" - }, - { - "access": 4, - "descriptor": "(B)Lfv;", - "method": "mouseWheel", - "name": "l", - "owner": "ba", - "parameters": [] - }, - { - "access": 4, - "descriptor": "(I)V", - "method": "setUpClipboard", - "name": "e", - "owner": "ba", - "parameters": [] - }, - { - "access": 4, - "descriptor": "(Ljava/lang/String;B)V", - "method": "error", - "name": "ap", - "owner": "ba", - "parameters": [ - "type" - ] - }, - { - "access": 4, - "descriptor": "(Ljava/lang/String;I)V", - "method": "clipboardSetString", - "name": "x", - "owner": "ba", - "parameters": [ - "s" - ] - }, - { - "access": 48, - "descriptor": "(B)V", - "method": "addCanvas", - "name": "aq", - "owner": "ba", - "parameters": [] - }, - { - "access": 48, - "descriptor": "(I)V", - "method": "kill", - "name": "ah", - "owner": "ba", - "parameters": [] - }, - { - "access": 49, - "descriptor": "(Ljava/awt/Graphics;)V", - "method": "paint", - "name": "paint", - "owner": "ba", - "parameters": [ - "g" - ] - } - ], - "name": "ba", - "super": "java.applet.Applet" - }, - { - "access": 1057, - "class": "PcmStream", - "constructors": [ - { - "access": 4, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "I", - "field": "__s", - "name": "s", - "owner": "dc" - }, - { - "access": 0, - "descriptor": "Ldc;", - "field": "after", - "name": "j", - "owner": "dc" - }, - { - "access": 0, - "descriptor": "Ldd;", - "field": "sound", - "name": "t", - "owner": "dc" - }, - { - "access": 64, - "descriptor": "Z", - "field": "active", - "name": "w", - "owner": "dc" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "()I", - "method": "__az_209", - "name": "az", - "owner": "dc", - "parameters": [] - }, - { - "access": 1028, - "descriptor": "()I", - "method": "__l_210", - "name": "l", - "owner": "dc", - "parameters": [] - }, - { - "access": 1028, - "descriptor": "()Ldc;", - "method": "firstSubStream", - "name": "u", - "owner": "dc", - "parameters": [] - }, - { - "access": 1028, - "descriptor": "()Ldc;", - "method": "nextSubStream", - "name": "g", - "owner": "dc", - "parameters": [] - }, - { - "access": 1028, - "descriptor": "(I)V", - "method": "skip", - "name": "d", - "owner": "dc", - "parameters": [ - "length" - ] - }, - { - "access": 1028, - "descriptor": "([III)V", - "method": "fill", - "name": "e", - "owner": "dc", - "parameters": [ - "buffer", - "end", - "start" - ] - }, - { - "access": 16, - "descriptor": "([III)V", - "method": "update", - "name": "ef", - "owner": "dc", - "parameters": [ - "buffer", - "end", - "start" - ] - } - ], - "name": "dc", - "super": "gw" - }, - { - "access": 1057, - "class": "PcmStreamMixerListener", - "constructors": [], - "fields": [ - { - "access": 0, - "descriptor": "I", - "field": "__m", - "name": "m", - "owner": "df" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1024, - "descriptor": "()V", - "method": "remove2", - "name": "m", - "owner": "df", - "parameters": [] - }, - { - "access": 1024, - "descriptor": "(Lct;)I", - "method": "update", - "name": "f", - "owner": "df", - "parameters": [ - "mixer" - ] - } - ], - "name": "df", - "super": "gw" - }, - { - "access": 1057, - "class": "UserList", - "constructors": [ - { - "access": 0, - "descriptor": "(I)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -280101247, - "descriptor": "I", - "field": "size0", - "name": "o", - "owner": "km" - }, - { - "access": 0, - "descriptor": "Ljava/util/Comparator;", - "field": "comparator", - "name": "e", - "owner": "km" - }, - { - "access": 0, - "descriptor": "Ljava/util/HashMap;", - "field": "previousUsernamesMap", - "name": "l", - "owner": "km" - }, - { - "access": 0, - "descriptor": "Ljava/util/HashMap;", - "field": "usernamesMap", - "name": "g", - "owner": "km" - }, - { - "access": 0, - "descriptor": "[Ljs;", - "field": "array", - "name": "u", - "owner": "km" - }, - { - "access": 16, - "decoder": -2119868987, - "descriptor": "I", - "field": "capacity", - "name": "w", - "owner": "km" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lkp;I)Ljs;", - "method": "addLastNoPreviousUsername", - "name": "v", - "owner": "km", - "parameters": [ - "username" - ] - }, - { - "access": 0, - "descriptor": "(Lkp;I)Ljs;", - "method": "getByCurrentUsername", - "name": "h", - "owner": "km", - "parameters": [ - "username" - ] - }, - { - "access": 0, - "descriptor": "(Lkp;I)Ljs;", - "method": "getByPreviousUsername", - "name": "b", - "owner": "km", - "parameters": [ - "previousUsername" - ] - }, - { - "access": 0, - "descriptor": "(Lkp;Lkp;I)Ljs;", - "method": "addLast", - "name": "ag", - "owner": "km", - "parameters": [ - "previousUsername", - "username" - ] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "size", - "name": "j", - "owner": "km", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "clear", - "name": "z", - "owner": "km", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)Z", - "method": "isFull", - "name": "s", - "owner": "km", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(Lkp;I)Ljs;", - "method": "getByUsername", - "name": "y", - "owner": "km", - "parameters": [ - "username" - ] - }, - { - "access": 1, - "descriptor": "(Lkp;I)Z", - "method": "contains", - "name": "t", - "owner": "km", - "parameters": [ - "username" - ] - }, - { - "access": 1024, - "descriptor": "(I)Ljs;", - "method": "newInstance", - "name": "m", - "owner": "km", - "parameters": [] - }, - { - "access": 1024, - "descriptor": "(II)[Ljs;", - "method": "newTypedArray", - "name": "f", - "owner": "km", - "parameters": [ - "size" - ] - }, - { - "access": 16, - "descriptor": "(II)V", - "method": "arrayRemove", - "name": "ak", - "owner": "km", - "parameters": [ - "index" - ] - }, - { - "access": 16, - "descriptor": "(Ljs;B)V", - "method": "mapPut", - "name": "ah", - "owner": "km", - "parameters": [ - "user" - ] - }, - { - "access": 16, - "descriptor": "(Ljs;I)I", - "method": "indexOf", - "name": "ar", - "owner": "km", - "parameters": [ - "user" - ] - }, - { - "access": 16, - "descriptor": "(Ljs;I)V", - "method": "arrayAddLast", - "name": "ay", - "owner": "km", - "parameters": [ - "user" - ] - }, - { - "access": 16, - "descriptor": "(Ljs;I)V", - "method": "remove", - "name": "p", - "owner": "km", - "parameters": [ - "user" - ] - }, - { - "access": 16, - "descriptor": "(Ljs;Lkp;Lkp;B)V", - "method": "changeName", - "name": "av", - "owner": "km", - "parameters": [ - "previousUsername", - "user", - "username" - ] - }, - { - "access": 16, - "descriptor": "(Ljs;S)V", - "method": "mapRemove", - "name": "ac", - "owner": "km", - "parameters": [ - "user" - ] - }, - { - "access": 17, - "descriptor": "(I)V", - "method": "removeComparator", - "name": "aw", - "owner": "km", - "parameters": [] - }, - { - "access": 17, - "descriptor": "(I)V", - "method": "sort", - "name": "aj", - "owner": "km", - "parameters": [] - }, - { - "access": 17, - "descriptor": "(II)Ljs;", - "method": "get", - "name": "aq", - "owner": "km", - "parameters": [ - "index" - ] - }, - { - "access": 17, - "descriptor": "(Ljava/util/Comparator;B)V", - "method": "addComparator", - "name": "al", - "owner": "km", - "parameters": [ - "c" - ] - }, - { - "access": 17, - "descriptor": "(Lkp;S)Z", - "method": "removeByUsername", - "name": "c", - "owner": "km", - "parameters": [ - "username" - ] - } - ], - "name": "km", - "super": "java.lang.Object" - }, - { - "access": 1057, - "class": "Wrapper", - "constructors": [ - { - "access": 0, - "descriptor": "(I)V" - } - ], - "fields": [ - { - "access": 16, - "descriptor": "I", - "field": "size", - "name": "f", - "owner": "eu" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1024, - "descriptor": "()Ljava/lang/Object;", - "method": "get", - "name": "m", - "owner": "eu", - "parameters": [] - }, - { - "access": 1024, - "descriptor": "()Z", - "method": "isSoft", - "name": "f", - "owner": "eu", - "parameters": [] - } - ], - "name": "eu", - "super": "fn" - }, - { - "access": 1537, - "class": "ClientPacketMarker", - "constructors": [], - "fields": [], - "interfaces": [], - "methods": [], - "name": "gb", - "super": "java.lang.Object" - }, - { - "access": 1537, - "class": "Enumerated", - "constructors": [], - "fields": [], - "interfaces": [], - "methods": [ - { - "access": 1025, - "descriptor": "(B)I", - "method": "ordinal", - "name": "f", - "owner": "gc", - "parameters": [] - } - ], - "name": "gc", - "super": "java.lang.Object" - }, - { - "access": 1537, - "class": "MouseWheel", - "constructors": [], - "fields": [], - "interfaces": [], - "methods": [ - { - "access": 1025, - "descriptor": "(I)I", - "method": "useRotation", - "name": "q", - "owner": "fv", - "parameters": [] - } - ], - "name": "fv", - "super": "java.lang.Object" - }, - { - "access": 1537, - "class": "PcmPlayerProvider", - "constructors": [], - "fields": [], - "interfaces": [], - "methods": [ - { - "access": 1025, - "descriptor": "(B)Lco;", - "method": "player", - "name": "m", - "owner": "cz" - } - ], - "name": "cz", - "super": "java.lang.Object" - }, - { - "access": 1537, - "class": "PlatformInfoProvider", - "constructors": [], - "fields": [], - "interfaces": [], - "methods": [ - { - "access": 1025, - "descriptor": "(I)Llb;", - "method": "get", - "name": "m", - "owner": "lm", - "parameters": [] - } - ], - "name": "lm", - "super": "java.lang.Object" - }, - { - "access": 1537, - "class": "TextureLoader", - "constructors": [], - "fields": [], - "interfaces": [], - "methods": [ - { - "access": 1025, - "descriptor": "(IB)Z", - "method": "__o_259", - "name": "o", - "owner": "ei", - "parameters": [ - "arg0" - ] - }, - { - "access": 1025, - "descriptor": "(II)I", - "method": "__w_258", - "name": "w", - "owner": "ei", - "parameters": [ - "arg0" - ] - }, - { - "access": 1025, - "descriptor": "(II)Z", - "method": "isLowDetail", - "name": "u", - "owner": "ei" - }, - { - "access": 1025, - "descriptor": "(II)[I", - "method": "load", - "name": "q", - "owner": "ei" - } - ], - "name": "ei", - "super": "java.lang.Object" - }, - { - "access": 1537, - "class": "Usernamed", - "constructors": [], - "fields": [], - "interfaces": [], - "methods": [ - { - "access": 1025, - "descriptor": "(B)Lkp;", - "method": "username", - "name": "kr", - "owner": "ky" - } - ], - "name": "ky", - "super": "java.lang.Object" - }, - { - "access": 1537, - "class": "WorldMapSection", - "constructors": [], - "fields": [], - "interfaces": [], - "methods": [ - { - "access": 1025, - "descriptor": "(IIB)Z", - "method": "containsPosition", - "name": "q", - "owner": "ab", - "parameters": [ - "x", - "y" - ] - }, - { - "access": 1025, - "descriptor": "(III)Lhu;", - "method": "coord", - "name": "o", - "owner": "ab", - "parameters": [ - "x", - "y" - ] - }, - { - "access": 1025, - "descriptor": "(IIIB)Z", - "method": "containsCoord", - "name": "f", - "owner": "ab", - "parameters": [ - "plane", - "x", - "y" - ] - }, - { - "access": 1025, - "descriptor": "(IIII)[I", - "method": "position", - "name": "w", - "owner": "ab", - "parameters": [ - "plane", - "x", - "y" - ] - }, - { - "access": 1025, - "descriptor": "(Lag;I)V", - "method": "expandBounds", - "name": "m", - "owner": "ab", - "parameters": [ - "area" - ] - }, - { - "access": 1025, - "descriptor": "(Lgr;B)V", - "method": "read", - "name": "u", - "owner": "ab", - "parameters": [ - "buffer" - ] - } - ], - "name": "ab", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "Animation", - "constructors": [ - { - "access": 0, - "descriptor": "([BLek;)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "I", - "field": "transformCount", - "name": "u", - "owner": "dz" - }, - { - "access": 0, - "descriptor": "Lek;", - "field": "skeleton", - "name": "o", - "owner": "dz" - }, - { - "access": 0, - "descriptor": "Z", - "field": "hasAlphaTransform", - "name": "d", - "owner": "dz" - }, - { - "access": 0, - "descriptor": "[I", - "field": "transformSkeletonLabels", - "name": "g", - "owner": "dz" - }, - { - "access": 0, - "descriptor": "[I", - "field": "transformXs", - "name": "l", - "owner": "dz" - }, - { - "access": 0, - "descriptor": "[I", - "field": "transformYs", - "name": "e", - "owner": "dz" - }, - { - "access": 0, - "descriptor": "[I", - "field": "transformZs", - "name": "x", - "owner": "dz" - } - ], - "interfaces": [], - "methods": [], - "name": "dz", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "Archive", - "constructors": [ - { - "access": 1, - "descriptor": "(Lff;Lff;IZZZ)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1579549759, - "descriptor": "I", - "field": "index", - "name": "p", - "owner": "it" - }, - { - "access": 0, - "decoder": -1884661133, - "descriptor": "I", - "field": "__ac", - "name": "ac", - "owner": "it" - }, - { - "access": 0, - "decoder": -785528219, - "descriptor": "I", - "field": "indexVersion", - "name": "ar", - "owner": "it" - }, - { - "access": 0, - "decoder": 1472870917, - "descriptor": "I", - "field": "indexCrc", - "name": "av", - "owner": "it" - }, - { - "access": 0, - "descriptor": "Lff;", - "field": "archiveDisk", - "name": "c", - "owner": "it" - }, - { - "access": 0, - "descriptor": "Lff;", - "field": "masterDisk", - "name": "r", - "owner": "it" - }, - { - "access": 0, - "descriptor": "Z", - "field": "__ag", - "name": "ag", - "owner": "it" - }, - { - "access": 64, - "descriptor": "Z", - "field": "__v", - "name": "v", - "owner": "it" - }, - { - "access": 64, - "descriptor": "[Z", - "field": "validGroups", - "name": "aq", - "owner": "it" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)V", - "method": "loadAllLocal", - "name": "dt", - "owner": "it", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(II)I", - "method": "groupLoadPercent", - "name": "e", - "owner": "it" - }, - { - "access": 0, - "descriptor": "(II)V", - "method": "__f_406", - "name": "f", - "owner": "it", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "(II)V", - "method": "loadGroup", - "name": "z", - "owner": "it" - }, - { - "access": 0, - "descriptor": "(Lff;I[BZI)V", - "method": "load", - "name": "dx", - "owner": "it" - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__ca_405", - "name": "ca", - "owner": "it", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "loadPercent", - "name": "da", - "owner": "it" - }, - { - "access": 1, - "descriptor": "(I)Z", - "method": "__cx_404", - "name": "cx", - "owner": "it", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(IB)Z", - "method": "__dn_407", - "name": "dn", - "owner": "it", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(II)Z", - "method": "__df_408", - "name": "df", - "owner": "it", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(III)V", - "method": "loadIndex", - "name": "co", - "owner": "it" - }, - { - "access": 1, - "descriptor": "(I[BZZB)V", - "method": "write", - "name": "de", - "owner": "it" - } - ], - "name": "it", - "super": "ir" - }, - { - "access": 33, - "class": "ArchiveDiskAction", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1942326733, - "descriptor": "I", - "field": "type", - "name": "m", - "owner": "ik" - }, - { - "access": 0, - "descriptor": "Lff;", - "field": "archiveDisk", - "name": "q", - "owner": "ik" - }, - { - "access": 0, - "descriptor": "Lit;", - "field": "archive", - "name": "w", - "owner": "ik" - }, - { - "access": 0, - "descriptor": "[B", - "field": "data", - "name": "f", - "owner": "ik" - } - ], - "interfaces": [], - "methods": [], - "name": "ik", - "super": "gw" - }, - { - "access": 33, - "class": "ArchiveDiskActionHandler", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [], - "interfaces": [ - "java.lang.Runnable" - ], - "methods": [ - { - "access": 1, - "descriptor": "()V", - "method": "__run_403", - "name": "run", - "owner": "iv", - "parameters": [] - } - ], - "name": "iv", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "ArchiveLoader", - "constructors": [ - { - "access": 0, - "descriptor": "(Lit;Ljava/lang/String;)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": 782003089, - "descriptor": "I", - "field": "__w", - "name": "w", - "owner": "bd" - }, - { - "access": 16, - "decoder": 1459455501, - "descriptor": "I", - "field": "__q", - "name": "q", - "owner": "bd" - }, - { - "access": 16, - "descriptor": "Lit;", - "field": "archive", - "name": "f", - "owner": "bd" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)Z", - "method": "__m_122", - "name": "m", - "owner": "bd", - "parameters": [] - } - ], - "name": "bd", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "AttackOption", - "constructors": [ - { - "access": 0, - "descriptor": "(I)V" - } - ], - "fields": [ - { - "access": 16, - "decoder": -1461217963, - "descriptor": "I", - "field": "id", - "name": "o", - "owner": "cj" - } - ], - "interfaces": [ - "gc" - ], - "methods": [ - { - "access": 1, - "descriptor": "(B)I", - "method": "ordinal", - "name": "f", - "owner": "cj", - "parameters": [] - } - ], - "name": "cj", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "AudioFilter", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "[I", - "field": "__m", - "name": "m", - "owner": "di" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__o", - "name": "o", - "owner": "di" - }, - { - "access": 0, - "descriptor": "[[[I", - "field": "__q", - "name": "q", - "owner": "di" - }, - { - "access": 0, - "descriptor": "[[[I", - "field": "__w", - "name": "w", - "owner": "di" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(IF)I", - "method": "__w_207", - "name": "w", - "owner": "di", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 0, - "descriptor": "(IIF)F", - "method": "__m_205", - "name": "m", - "owner": "di", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 0, - "descriptor": "(IIF)F", - "method": "__q_206", - "name": "q", - "owner": "di", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 16, - "descriptor": "(Lgr;Lde;)V", - "method": "__o_208", - "name": "o", - "owner": "di", - "parameters": [ - "arg0", - "arg1" - ] - } - ], - "name": "di", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "Bounds", - "constructors": [ - { - "access": 1, - "descriptor": "(II)V" - }, - { - "access": 1, - "descriptor": "(IIII)V" - } - ], - "fields": [ - { - "access": 1, - "decoder": -1887298731, - "descriptor": "I", - "field": "__f", - "name": "f", - "owner": "la" - }, - { - "access": 1, - "decoder": -2004088829, - "descriptor": "I", - "field": "__m", - "name": "m", - "owner": "la" - }, - { - "access": 1, - "decoder": 1377856837, - "descriptor": "I", - "field": "__w", - "name": "w", - "owner": "la" - }, - { - "access": 1, - "decoder": 2001187823, - "descriptor": "I", - "field": "__q", - "name": "q", - "owner": "la" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(B)I", - "method": "__g_494", - "name": "g", - "owner": "la", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)I", - "method": "__u_493", - "name": "u", - "owner": "la", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(Lla;Lla;I)V", - "method": "__w_491", - "name": "w", - "owner": "la", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 0, - "descriptor": "(Lla;Lla;S)V", - "method": "__o_492", - "name": "o", - "owner": "la", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "()Ljava/lang/String;", - "method": "__toString_489", - "name": "toString", - "owner": "la", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(IIB)V", - "method": "__m_487", - "name": "m", - "owner": "la", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(III)V", - "method": "__f_488", - "name": "f", - "owner": "la", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(Lla;Lla;I)V", - "method": "__q_490", - "name": "q", - "owner": "la", - "parameters": [ - "arg0", - "arg1" - ] - } - ], - "name": "la", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "Buddy", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 1, - "decoder": -304954565, - "descriptor": "I", - "field": "rank", - "name": "g", - "owner": "ke" - }, - { - "access": 1, - "decoder": 120689297, - "descriptor": "I", - "field": "int2", - "name": "u", - "owner": "ke" - }, - { - "access": 1, - "decoder": 429472919, - "descriptor": "I", - "field": "world0", - "name": "o", - "owner": "ke" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(IIS)V", - "method": "set", - "name": "an", - "owner": "ke" - }, - { - "access": 1, - "descriptor": "(B)I", - "method": "world", - "name": "az", - "owner": "ke", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)Z", - "method": "hasWorld", - "name": "au", - "owner": "ke", - "parameters": [] - } - ], - "name": "ke", - "super": "js" - }, - { - "access": 33, - "class": "Buffer", - "constructors": [ - { - "access": 1, - "descriptor": "(I)V" - }, - { - "access": 1, - "descriptor": "([B)V" - } - ], - "fields": [ - { - "access": 1, - "decoder": -271438207, - "descriptor": "I", - "field": "index", - "name": "f", - "owner": "gr" - }, - { - "access": 1, - "descriptor": "[B", - "field": "array", - "name": "m", - "owner": "gr" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "(B)I", - "method": "__ab_306", - "name": "ab", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(B)I", - "method": "__ad_309", - "name": "ad", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(B)I", - "method": "__ag_302", - "name": "ag", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(B)I", - "method": "__aq_303", - "name": "aq", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(B)I", - "method": "__bf_332", - "name": "bf", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(B)I", - "method": "__bl_327", - "name": "bl", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(B)I", - "method": "__bm_326", - "name": "bm", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(B)I", - "method": "readUnsignedByte", - "name": "p", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(B)Ljava/lang/String;", - "method": "__aw_304", - "name": "aw", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(B)Z", - "method": "__ax_313", - "name": "ax", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)B", - "method": "__bd_321", - "name": "bd", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)B", - "method": "__bk_320", - "name": "bk", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)B", - "method": "__bn_319", - "name": "bn", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)B", - "method": "readByte", - "name": "v", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__ae_307", - "name": "ae", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__ap_310", - "name": "ap", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__as_311", - "name": "as", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__at_308", - "name": "at", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__bb_317", - "name": "bb", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__bj_329", - "name": "bj", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__bp_331", - "name": "bp", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__bq_318", - "name": "bq", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__br_328", - "name": "br", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__bt_330", - "name": "bt", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__bu_325", - "name": "bu", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__by_324", - "name": "by", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "readInt", - "name": "av", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "readMedium", - "name": "aj", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "readUnsignedByteNegate", - "name": "bs", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)J", - "method": "readLong", - "name": "ar", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)Ljava/lang/String;", - "method": "readStringCp1252NullCircumfixed", - "name": "ak", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)Ljava/lang/String;", - "method": "readStringCp1252NullTerminated", - "name": "ah", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)Ljava/lang/String;", - "method": "readStringCp1252NullTerminatedOrNull", - "name": "ay", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)Z", - "method": "readBoolean", - "name": "ac", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(IB)V", - "method": "__af_314", - "name": "af", - "owner": "gr", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(IB)V", - "method": "__ba_316", - "name": "ba", - "owner": "gr", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(IB)V", - "method": "__bx_323", - "name": "bx", - "owner": "gr", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(IB)V", - "method": "writeIntLE", - "name": "bi", - "owner": "gr", - "parameters": [ - "value" - ] - }, - { - "access": 1, - "descriptor": "(IB)V", - "method": "writeIntME", - "name": "bz", - "owner": "gr", - "parameters": [ - "value" - ] - }, - { - "access": 1, - "descriptor": "(IB)V", - "method": "writeMedium", - "name": "o", - "owner": "gr", - "parameters": [ - "value" - ] - }, - { - "access": 1, - "descriptor": "(IB)V", - "method": "writeShort", - "name": "w", - "owner": "gr", - "parameters": [ - "value" - ] - }, - { - "access": 1, - "descriptor": "(IB)V", - "method": "writeShortLE", - "name": "bc", - "owner": "gr", - "parameters": [ - "value" - ] - }, - { - "access": 1, - "descriptor": "(II)I", - "method": "__aa_312", - "name": "aa", - "owner": "gr", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(II)V", - "method": "__ai_315", - "name": "ai", - "owner": "gr", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(II)V", - "method": "__bo_322", - "name": "bo", - "owner": "gr", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(II)V", - "method": "__c_301", - "name": "c", - "owner": "gr", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(II)V", - "method": "__h_300", - "name": "h", - "owner": "gr", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(II)V", - "method": "__t_298", - "name": "t", - "owner": "gr", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(II)V", - "method": "__y_299", - "name": "y", - "owner": "gr", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(II)V", - "method": "writeByte", - "name": "q", - "owner": "gr", - "parameters": [ - "value" - ] - }, - { - "access": 1, - "descriptor": "(II)V", - "method": "writeInt", - "name": "u", - "owner": "gr", - "parameters": [ - "value" - ] - }, - { - "access": 1, - "descriptor": "(II)V", - "method": "writeIntLE16", - "name": "bg", - "owner": "gr", - "parameters": [ - "value" - ] - }, - { - "access": 1, - "descriptor": "(II)V", - "method": "writeSmartByteShort", - "name": "b", - "owner": "gr", - "parameters": [ - "value" - ] - }, - { - "access": 1, - "descriptor": "(J)V", - "method": "writeLong", - "name": "l", - "owner": "gr", - "parameters": [ - "n" - ] - }, - { - "access": 1, - "descriptor": "(J)V", - "method": "writeLongMedium", - "name": "g", - "owner": "gr", - "parameters": [ - "n" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/CharSequence;B)V", - "method": "__j_296", - "name": "j", - "owner": "gr", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/String;B)V", - "method": "writeStringCp1252NullTerminated", - "name": "d", - "owner": "gr", - "parameters": [ - "string" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/String;S)V", - "method": "writeStringCp1252NullCircumfixed", - "name": "z", - "owner": "gr", - "parameters": [ - "string" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", - "method": "encryptRsa", - "name": "ao", - "owner": "gr" - }, - { - "access": 1, - "descriptor": "(S)V", - "method": "__f_295", - "name": "f", - "owner": "gr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(ZB)V", - "method": "writeBoolean", - "name": "e", - "owner": "gr", - "parameters": [ - "value" - ] - }, - { - "access": 1, - "descriptor": "([BIIB)V", - "method": "__al_305", - "name": "al", - "owner": "gr", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "([BIII)V", - "method": "__bh_333", - "name": "bh", - "owner": "gr", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "([BIII)V", - "method": "__s_297", - "name": "s", - "owner": "gr", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "([IB)V", - "method": "xteaEncryptAll", - "name": "am", - "owner": "gr", - "parameters": [ - "xteaKey" - ] - }, - { - "access": 1, - "descriptor": "([II)V", - "method": "xteaDecryptAll", - "name": "an", - "owner": "gr", - "parameters": [ - "xteaKey" - ] - }, - { - "access": 1, - "descriptor": "([IIII)V", - "method": "xteaDecrypt", - "name": "au", - "owner": "gr", - "parameters": [ - "end", - "start", - "xteaKey" - ] - }, - { - "access": 1, - "descriptor": "([IIII)V", - "method": "xteaEncrypt", - "name": "az", - "owner": "gr", - "parameters": [ - "end", - "start", - "xteaKey" - ] - } - ], - "name": "gr", - "super": "gw" - }, - { - "access": 33, - "class": "BufferedFile", - "constructors": [ - { - "access": 1, - "descriptor": "(Ldk;II)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1558233611, - "descriptor": "I", - "field": "__g", - "name": "g", - "owner": "dy" - }, - { - "access": 0, - "decoder": -3728247331531751000, - "descriptor": "J", - "field": "__e", - "name": "e", - "owner": "dy" - }, - { - "access": 0, - "decoder": -6819476051574243000, - "descriptor": "J", - "field": "__l", - "name": "l", - "owner": "dy" - }, - { - "access": 0, - "decoder": -7773729680030816000, - "descriptor": "J", - "field": "__q", - "name": "q", - "owner": "dy" - }, - { - "access": 0, - "decoder": -846810907, - "descriptor": "I", - "field": "__w", - "name": "w", - "owner": "dy" - }, - { - "access": 0, - "decoder": 2663146692618914000, - "descriptor": "J", - "field": "capacity", - "name": "x", - "owner": "dy" - }, - { - "access": 0, - "decoder": 5249231081498323000, - "descriptor": "J", - "field": "__u", - "name": "u", - "owner": "dy" - }, - { - "access": 0, - "decoder": 5720856138805192000, - "descriptor": "J", - "field": "__d", - "name": "d", - "owner": "dy" - }, - { - "access": 0, - "descriptor": "Ldk;", - "field": "accessFile", - "name": "m", - "owner": "dy" - }, - { - "access": 0, - "descriptor": "[B", - "field": "readBuffer", - "name": "f", - "owner": "dy" - }, - { - "access": 0, - "descriptor": "[B", - "field": "writeBuffer", - "name": "o", - "owner": "dy" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)V", - "method": "flush", - "name": "l", - "owner": "dy", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "load", - "name": "u", - "owner": "dy", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(B)J", - "method": "length", - "name": "q", - "owner": "dy", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "close", - "name": "m", - "owner": "dy", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(J)V", - "method": "seek", - "name": "f", - "owner": "dy", - "parameters": [ - "index" - ] - }, - { - "access": 1, - "descriptor": "([BI)V", - "method": "readFill", - "name": "w", - "owner": "dy", - "parameters": [ - "dst" - ] - }, - { - "access": 1, - "descriptor": "([BIIB)V", - "method": "read", - "name": "o", - "owner": "dy", - "parameters": [ - "dst", - "dstIndex", - "length" - ] - }, - { - "access": 1, - "descriptor": "([BIII)V", - "method": "write", - "name": "g", - "owner": "dy", - "parameters": [ - "length", - "src", - "srcIndex" - ] - } - ], - "name": "dy", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "BufferedNetSocket", - "constructors": [ - { - "access": 0, - "descriptor": "(Ljava/net/Socket;II)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Lfh;", - "field": "source", - "name": "f", - "owner": "ft" - }, - { - "access": 0, - "descriptor": "Lfr;", - "field": "sink", - "name": "q", - "owner": "ft" - }, - { - "access": 0, - "descriptor": "Ljava/net/Socket;", - "field": "socket", - "name": "m", - "owner": "ft" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "(I)I", - "method": "available", - "name": "q", - "owner": "ft", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "readUnsignedByte", - "name": "w", - "owner": "ft", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "close", - "name": "g", - "owner": "ft", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(II)Z", - "method": "isAvailable", - "name": "f", - "owner": "ft", - "parameters": [ - "length" - ] - }, - { - "access": 1, - "descriptor": "([BIIB)V", - "method": "write", - "name": "u", - "owner": "ft", - "parameters": [ - "length", - "src", - "srcIndex" - ] - }, - { - "access": 1, - "descriptor": "([BIII)I", - "method": "read", - "name": "o", - "owner": "ft", - "parameters": [ - "dst", - "dstIndex", - "length" - ] - }, - { - "access": 4, - "descriptor": "()V", - "method": "__finalize_280", - "name": "finalize", - "owner": "ft", - "parameters": [] - } - ], - "name": "ft", - "super": "fu" - }, - { - "access": 33, - "class": "BufferedSink", - "constructors": [ - { - "access": 0, - "descriptor": "(Ljava/io/OutputStream;I)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": 1028856279, - "descriptor": "I", - "field": "limit", - "name": "u", - "owner": "fr" - }, - { - "access": 0, - "decoder": 1805563727, - "descriptor": "I", - "field": "capacity", - "name": "q", - "owner": "fr" - }, - { - "access": 0, - "decoder": 315461309, - "descriptor": "I", - "field": "position", - "name": "o", - "owner": "fr" - }, - { - "access": 0, - "descriptor": "Ljava/io/IOException;", - "field": "exception", - "name": "g", - "owner": "fr" - }, - { - "access": 0, - "descriptor": "Ljava/io/OutputStream;", - "field": "outputStream", - "name": "f", - "owner": "fr" - }, - { - "access": 0, - "descriptor": "Ljava/lang/Thread;", - "field": "thread", - "name": "m", - "owner": "fr" - }, - { - "access": 0, - "descriptor": "Z", - "field": "isClosed0", - "name": "l", - "owner": "fr" - }, - { - "access": 0, - "descriptor": "[B", - "field": "buffer", - "name": "w", - "owner": "fr" - } - ], - "interfaces": [ - "java.lang.Runnable" - ], - "methods": [ - { - "access": 0, - "descriptor": "(I)V", - "method": "close", - "name": "q", - "owner": "fr", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)Z", - "method": "isClosed", - "name": "m", - "owner": "fr", - "parameters": [] - }, - { - "access": 0, - "descriptor": "([BIIB)V", - "method": "write", - "name": "f", - "owner": "fr", - "parameters": [ - "length", - "src", - "srcIndex" - ] - }, - { - "access": 1, - "descriptor": "()V", - "method": "__run_282", - "name": "run", - "owner": "fr", - "parameters": [] - } - ], - "name": "fr", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "BufferedSource", - "constructors": [ - { - "access": 0, - "descriptor": "(Ljava/io/InputStream;I)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1970062431, - "descriptor": "I", - "field": "capacity", - "name": "q", - "owner": "fh" - }, - { - "access": 0, - "decoder": 1507905677, - "descriptor": "I", - "field": "limit", - "name": "u", - "owner": "fh" - }, - { - "access": 0, - "decoder": 267006153, - "descriptor": "I", - "field": "position", - "name": "o", - "owner": "fh" - }, - { - "access": 0, - "descriptor": "Ljava/io/IOException;", - "field": "exception", - "name": "g", - "owner": "fh" - }, - { - "access": 0, - "descriptor": "Ljava/io/InputStream;", - "field": "inputStream", - "name": "f", - "owner": "fh" - }, - { - "access": 0, - "descriptor": "Ljava/lang/Thread;", - "field": "thread", - "name": "m", - "owner": "fh" - }, - { - "access": 0, - "descriptor": "[B", - "field": "buffer", - "name": "w", - "owner": "fh" - } - ], - "interfaces": [ - "java.lang.Runnable" - ], - "methods": [ - { - "access": 0, - "descriptor": "(I)I", - "method": "available", - "name": "f", - "owner": "fh", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)I", - "method": "readUnsignedByte", - "name": "q", - "owner": "fh", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "close", - "name": "o", - "owner": "fh", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(II)Z", - "method": "isAvailable", - "name": "m", - "owner": "fh", - "parameters": [ - "length" - ] - }, - { - "access": 0, - "descriptor": "([BIIB)I", - "method": "read", - "name": "w", - "owner": "fh", - "parameters": [ - "dst", - "dstIndex", - "length" - ] - }, - { - "access": 1, - "descriptor": "()V", - "method": "__run_278", - "name": "run", - "owner": "fh", - "parameters": [] - } - ], - "name": "fh", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "ByteArrayNode", - "constructors": [ - { - "access": 1, - "descriptor": "([B)V" - } - ], - "fields": [ - { - "access": 1, - "descriptor": "[B", - "field": "byteArray", - "name": "m", - "owner": "gp" - } - ], - "interfaces": [], - "methods": [], - "name": "gp", - "super": "gw" - }, - { - "access": 33, - "class": "ByteArrayPool", - "constructors": [], - "fields": [], - "interfaces": [], - "methods": [], - "name": "gi", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "ChatChannel", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": 612486877, - "descriptor": "I", - "field": "count", - "name": "q", - "owner": "cp" - }, - { - "access": 0, - "descriptor": "[Lbm;", - "field": "messages", - "name": "f", - "owner": "cp" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)I", - "method": "size", - "name": "q", - "owner": "cp", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(II)Lbm;", - "method": "getMessage", - "name": "f", - "owner": "cp", - "parameters": [ - "index" - ] - }, - { - "access": 0, - "descriptor": "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbm;", - "method": "addMessage", - "name": "m", - "owner": "cp", - "parameters": [ - "prefix", - "sender", - "text", - "type" - ] - } - ], - "name": "cp", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "ClanChat", - "constructors": [ - { - "access": 1, - "descriptor": "(Llx;Lky;)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": 386706253, - "descriptor": "I", - "field": "__i", - "name": "i", - "owner": "kv" - }, - { - "access": 1, - "decoder": -1534670751, - "descriptor": "I", - "field": "rank", - "name": "n", - "owner": "kv" - }, - { - "access": 1, - "descriptor": "B", - "field": "minKick", - "name": "k", - "owner": "kv" - }, - { - "access": 1, - "descriptor": "Ljava/lang/String;", - "field": "name", - "name": "x", - "owner": "kv" - }, - { - "access": 1, - "descriptor": "Ljava/lang/String;", - "field": "owner", - "name": "d", - "owner": "kv" - }, - { - "access": 16, - "descriptor": "Lky;", - "field": "localUser", - "name": "q", - "owner": "kv" - }, - { - "access": 16, - "descriptor": "Llx;", - "field": "loginType", - "name": "f", - "owner": "kv" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)Ljs;", - "method": "newInstance", - "name": "m", - "owner": "kv" - }, - { - "access": 0, - "descriptor": "(II)[Ljs;", - "method": "newTypedArray", - "name": "f", - "owner": "kv" - }, - { - "access": 16, - "descriptor": "(Ljava/lang/String;B)V", - "method": "__x_473", - "name": "x", - "owner": "kv", - "parameters": [ - "arg0" - ] - }, - { - "access": 16, - "descriptor": "(Ljava/lang/String;I)V", - "method": "__q_472", - "name": "q", - "owner": "kv", - "parameters": [ - "arg0" - ] - }, - { - "access": 16, - "descriptor": "(Ljk;I)V", - "method": "__cp_475", - "name": "cp", - "owner": "kv", - "parameters": [ - "arg0" - ] - }, - { - "access": 17, - "descriptor": "(B)V", - "method": "clearIgnoreds", - "name": "cf", - "owner": "kv", - "parameters": [] - }, - { - "access": 17, - "descriptor": "(I)V", - "method": "clearFriends", - "name": "cg", - "owner": "kv", - "parameters": [] - }, - { - "access": 17, - "descriptor": "(Lgr;B)V", - "method": "__a_474", - "name": "a", - "owner": "kv", - "parameters": [ - "arg0" - ] - }, - { - "access": 17, - "descriptor": "(Lgr;I)V", - "method": "readUpdate", - "name": "d", - "owner": "kv", - "parameters": [ - "buffer" - ] - } - ], - "name": "kv", - "super": "km" - }, - { - "access": 33, - "class": "ClanMate", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Lkd;", - "field": "isFriend0", - "name": "m", - "owner": "jk" - }, - { - "access": 0, - "descriptor": "Lkd;", - "field": "isIgnored0", - "name": "f", - "owner": "jk" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)V", - "method": "clearIsFriend", - "name": "m", - "owner": "jk", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "clearIsIgnored", - "name": "w", - "owner": "jk", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "fillIsFriend", - "name": "q", - "owner": "jk", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "fillIsIgnored", - "name": "u", - "owner": "jk", - "parameters": [] - }, - { - "access": 17, - "descriptor": "(I)Z", - "method": "isFriend", - "name": "f", - "owner": "jk", - "parameters": [] - }, - { - "access": 17, - "descriptor": "(I)Z", - "method": "isIgnored", - "name": "o", - "owner": "jk", - "parameters": [] - } - ], - "name": "jk", - "super": "ke" - }, - { - "access": 33, - "class": "ClientPacket", - "constructors": [ - { - "access": 0, - "descriptor": "(II)V" - } - ], - "fields": [ - { - "access": 16, - "decoder": -1759434223, - "descriptor": "I", - "field": "length", - "name": "cx", - "owner": "gs" - }, - { - "access": 16, - "decoder": -286923745, - "descriptor": "I", - "field": "id", - "name": "cd", - "owner": "gs" - } - ], - "interfaces": [ - "gb" - ], - "methods": [], - "name": "gs", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "ClientParameter", - "constructors": [ - { - "access": 0, - "descriptor": "(Ljava/lang/String;Ljava/lang/String;)V" - } - ], - "fields": [ - { - "access": 17, - "descriptor": "Ljava/lang/String;", - "field": "id", - "name": "y", - "owner": "ji" - } - ], - "interfaces": [], - "methods": [], - "name": "ji", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "ClientPreferences", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - }, - { - "access": 0, - "descriptor": "(Lgr;)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -359530975, - "descriptor": "I", - "field": "windowMode", - "name": "o", - "owner": "bf" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "rememberedUsername", - "name": "u", - "owner": "bf" - }, - { - "access": 0, - "descriptor": "Ljava/util/LinkedHashMap;", - "field": "parameters", - "name": "l", - "owner": "bf" - }, - { - "access": 0, - "descriptor": "Z", - "field": "hideUsername", - "name": "g", - "owner": "bf" - }, - { - "access": 0, - "descriptor": "Z", - "field": "roofsHidden", - "name": "q", - "owner": "bf" - }, - { - "access": 0, - "descriptor": "Z", - "field": "titleMusicDisabled", - "name": "w", - "owner": "bf" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)Lgr;", - "method": "toBuffer", - "name": "f", - "owner": "bf", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(ZI)V", - "method": "__m_150", - "name": "m", - "owner": "bf", - "parameters": [ - "arg0" - ] - } - ], - "name": "bf", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "CollisionMap", - "constructors": [ - { - "access": 1, - "descriptor": "(II)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1037712787, - "descriptor": "I", - "field": "yInset", - "name": "ak", - "owner": "fy" - }, - { - "access": 0, - "decoder": -871458249, - "descriptor": "I", - "field": "ySize", - "name": "al", - "owner": "fy" - }, - { - "access": 0, - "decoder": 264774249, - "descriptor": "I", - "field": "xInset", - "name": "ah", - "owner": "fy" - }, - { - "access": 0, - "decoder": 674483785, - "descriptor": "I", - "field": "xSize", - "name": "aw", - "owner": "fy" - }, - { - "access": 1, - "descriptor": "[[I", - "field": "flags", - "name": "ab", - "owner": "fy" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(IIII)V", - "method": "__e_290", - "name": "e", - "owner": "fy", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 0, - "descriptor": "(IIII)V", - "method": "__u_287", - "name": "u", - "owner": "fy", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "clear", - "name": "m", - "owner": "fy", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(IIB)V", - "method": "__x_291", - "name": "x", - "owner": "fy", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(III)V", - "method": "__o_286", - "name": "o", - "owner": "fy", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(III)V", - "method": "__w_285", - "name": "w", - "owner": "fy", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(IIIIIZB)V", - "method": "__l_289", - "name": "l", - "owner": "fy", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4", - "arg5" - ] - }, - { - "access": 1, - "descriptor": "(IIIIZB)V", - "method": "__f_283", - "name": "f", - "owner": "fy", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4" - ] - }, - { - "access": 1, - "descriptor": "(IIIIZB)V", - "method": "__g_288", - "name": "g", - "owner": "fy", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4" - ] - }, - { - "access": 1, - "descriptor": "(IIIIZI)V", - "method": "__q_284", - "name": "q", - "owner": "fy", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4" - ] - } - ], - "name": "fy", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "Component", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -201557389, - "descriptor": "I", - "field": "modelId2", - "name": "bm", - "owner": "ho" - }, - { - "access": 0, - "decoder": 138222099, - "descriptor": "I", - "field": "modelType2", - "name": "bu", - "owner": "ho" - }, - { - "access": 1, - "decoder": -1021798347, - "descriptor": "I", - "field": "dragThreshold", - "name": "df", - "owner": "ho" - }, - { - "access": 1, - "decoder": -1047989223, - "descriptor": "I", - "field": "__al", - "name": "al", - "owner": "ho" - }, - { - "access": 1, - "decoder": -1074168553, - "descriptor": "I", - "field": "spriteId2", - "name": "bb", - "owner": "ho" - }, - { - "access": 1, - "decoder": -110526699, - "descriptor": "I", - "field": "lineWid", - "name": "ai", - "owner": "ho" - }, - { - "access": 1, - "decoder": -1253859481, - "descriptor": "I", - "field": "modelAngleY", - "name": "bg", - "owner": "ho" - }, - { - "access": 1, - "decoder": -1361791123, - "descriptor": "I", - "field": "spriteAngle", - "name": "bq", - "owner": "ho" - }, - { - "access": 1, - "decoder": -1390352887, - "descriptor": "I", - "field": "mouseOverRedirect", - "name": "ew", - "owner": "ho" - }, - { - "access": 1, - "decoder": -1423753745, - "descriptor": "I", - "field": "sequenceId", - "name": "bl", - "owner": "ho" - }, - { - "access": 1, - "decoder": -1520351537, - "descriptor": "I", - "field": "__fg", - "name": "fg", - "owner": "ho" - }, - { - "access": 1, - "decoder": -1658511475, - "descriptor": "I", - "field": "__bw", - "name": "bw", - "owner": "ho" - }, - { - "access": 1, - "decoder": -1692331135, - "descriptor": "I", - "field": "__bf", - "name": "bf", - "owner": "ho" - }, - { - "access": 1, - "decoder": -1814696937, - "descriptor": "I", - "field": "rawY", - "name": "aj", - "owner": "ho" - }, - { - "access": 1, - "decoder": -1831692129, - "descriptor": "I", - "field": "mouseOverColor", - "name": "az", - "owner": "ho" - }, - { - "access": 1, - "decoder": -1853255291, - "descriptor": "I", - "field": "__af", - "name": "af", - "owner": "ho" - }, - { - "access": 1, - "decoder": -1995006949, - "descriptor": "I", - "field": "cycle", - "name": "fd", - "owner": "ho" - }, - { - "access": 1, - "decoder": -2001402777, - "descriptor": "I", - "field": "rawWidth", - "name": "av", - "owner": "ho" - }, - { - "access": 1, - "decoder": -2013625215, - "descriptor": "I", - "field": "modelId", - "name": "by", - "owner": "ho" - }, - { - "access": 1, - "decoder": -2018053063, - "descriptor": "I", - "field": "modelOffsetY", - "name": "bi", - "owner": "ho" - }, - { - "access": 1, - "decoder": -2022638615, - "descriptor": "I", - "field": "color", - "name": "am", - "owner": "ho" - }, - { - "access": 1, - "decoder": -2133338643, - "descriptor": "I", - "field": "modelZoom", - "name": "bp", - "owner": "ho" - }, - { - "access": 1, - "decoder": -23173063, - "descriptor": "I", - "field": "paddingX", - "name": "cu", - "owner": "ho" - }, - { - "access": 1, - "decoder": -365781561, - "descriptor": "I", - "field": "color2", - "name": "an", - "owner": "ho" - }, - { - "access": 1, - "decoder": -431656963, - "descriptor": "I", - "field": "modelFrame", - "name": "eg", - "owner": "ho" - }, - { - "access": 1, - "decoder": -459670781, - "descriptor": "I", - "field": "modelOffsetX", - "name": "bj", - "owner": "ho" - }, - { - "access": 1, - "decoder": -537618643, - "descriptor": "I", - "field": "scrollY", - "name": "ad", - "owner": "ho" - }, - { - "access": 1, - "decoder": -581762425, - "descriptor": "I", - "field": "clientCode", - "name": "c", - "owner": "ho" - }, - { - "access": 1, - "decoder": -594884327, - "descriptor": "I", - "field": "outline", - "name": "bk", - "owner": "ho" - }, - { - "access": 1, - "decoder": -617209253, - "descriptor": "I", - "field": "parentId", - "name": "ab", - "owner": "ho" - }, - { - "access": 1, - "decoder": -623790443, - "descriptor": "I", - "field": "scrollWidth", - "name": "ap", - "owner": "ho" - }, - { - "access": 1, - "decoder": -638557371, - "descriptor": "I", - "field": "transparency", - "name": "ax", - "owner": "ho" - }, - { - "access": 1, - "decoder": -648033351, - "descriptor": "I", - "field": "childIndex", - "name": "y", - "owner": "ho" - }, - { - "access": 1, - "decoder": -672198209, - "descriptor": "I", - "field": "__fl", - "name": "fl", - "owner": "ho" - }, - { - "access": 1, - "decoder": -692411223, - "descriptor": "I", - "field": "modelAngleZ", - "name": "bt", - "owner": "ho" - }, - { - "access": 1, - "decoder": -709256449, - "descriptor": "I", - "field": "heightAlignment", - "name": "ag", - "owner": "ho" - }, - { - "access": 1, - "decoder": -856053301, - "descriptor": "I", - "field": "sequenceId2", - "name": "br", - "owner": "ho" - }, - { - "access": 1, - "decoder": -867175629, - "descriptor": "I", - "field": "scrollHeight", - "name": "as", - "owner": "ho" - }, - { - "access": 1, - "decoder": -872904863, - "descriptor": "I", - "field": "rawX", - "name": "aq", - "owner": "ho" - }, - { - "access": 1, - "decoder": -941148335, - "descriptor": "I", - "field": "id", - "name": "t", - "owner": "ho" - }, - { - "access": 1, - "decoder": -95117407, - "descriptor": "I", - "field": "modelFrameCycle", - "name": "ez", - "owner": "ho" - }, - { - "access": 1, - "decoder": 1202342839, - "descriptor": "I", - "field": "rawHeight", - "name": "ar", - "owner": "ho" - }, - { - "access": 1, - "decoder": 1236161275, - "descriptor": "I", - "field": "mouseOverColor2", - "name": "au", - "owner": "ho" - }, - { - "access": 1, - "decoder": 1248629915, - "descriptor": "I", - "field": "itemId", - "name": "ea", - "owner": "ho" - }, - { - "access": 1, - "decoder": 1271321381, - "descriptor": "I", - "field": "x", - "name": "ac", - "owner": "ho" - }, - { - "access": 1, - "decoder": 1271997981, - "descriptor": "I", - "field": "textYAlignment", - "name": "cm", - "owner": "ho" - }, - { - "access": 1, - "decoder": 1300531185, - "descriptor": "I", - "field": "yAlignment", - "name": "p", - "owner": "ho" - }, - { - "access": 1, - "decoder": 1401272343, - "descriptor": "I", - "field": "textLineHeight", - "name": "cy", - "owner": "ho" - }, - { - "access": 1, - "decoder": 1412102151, - "descriptor": "I", - "field": "buttonType", - "name": "b", - "owner": "ho" - }, - { - "access": 1, - "decoder": 1435746863, - "descriptor": "I", - "field": "fontId", - "name": "cr", - "owner": "ho" - }, - { - "access": 1, - "decoder": 1492291497, - "descriptor": "I", - "field": "y", - "name": "ay", - "owner": "ho" - }, - { - "access": 1, - "decoder": 1521310729, - "descriptor": "I", - "field": "type", - "name": "h", - "owner": "ho" - }, - { - "access": 1, - "decoder": 1527989635, - "descriptor": "I", - "field": "textXAlignment", - "name": "cs", - "owner": "ho" - }, - { - "access": 1, - "decoder": 1573420153, - "descriptor": "I", - "field": "spriteId", - "name": "bs", - "owner": "ho" - }, - { - "access": 1, - "decoder": 1628640897, - "descriptor": "I", - "field": "widthAlignment", - "name": "v", - "owner": "ho" - }, - { - "access": 1, - "decoder": 1656646737, - "descriptor": "I", - "field": "height", - "name": "ak", - "owner": "ho" - }, - { - "access": 1, - "decoder": 1716081883, - "descriptor": "I", - "field": "width", - "name": "ah", - "owner": "ho" - }, - { - "access": 1, - "decoder": 1856618959, - "descriptor": "I", - "field": "clickMask", - "name": "cw", - "owner": "ho" - }, - { - "access": 1, - "decoder": 2044722063, - "descriptor": "I", - "field": "modelAngleX", - "name": "bz", - "owner": "ho" - }, - { - "access": 1, - "decoder": 206556853, - "descriptor": "I", - "field": "__aw", - "name": "aw", - "owner": "ho" - }, - { - "access": 1, - "decoder": 2090399935, - "descriptor": "I", - "field": "scrollX", - "name": "at", - "owner": "ho" - }, - { - "access": 1, - "decoder": 2092800189, - "descriptor": "I", - "field": "dragZoneSize", - "name": "dn", - "owner": "ho" - }, - { - "access": 1, - "decoder": 209458049, - "descriptor": "I", - "field": "__fc", - "name": "fc", - "owner": "ho" - }, - { - "access": 1, - "decoder": 215797483, - "descriptor": "I", - "field": "spriteShadow", - "name": "bd", - "owner": "ho" - }, - { - "access": 1, - "decoder": 340244859, - "descriptor": "I", - "field": "itemQuantity", - "name": "es", - "owner": "ho" - }, - { - "access": 1, - "decoder": 365867737, - "descriptor": "I", - "field": "rootIndex", - "name": "fp", - "owner": "ho" - }, - { - "access": 1, - "decoder": 523318277, - "descriptor": "I", - "field": "xAlignment", - "name": "r", - "owner": "ho" - }, - { - "access": 1, - "decoder": 630750753, - "descriptor": "I", - "field": "modelType", - "name": "bx", - "owner": "ho" - }, - { - "access": 1, - "decoder": 720760323, - "descriptor": "I", - "field": "paddingY", - "name": "cb", - "owner": "ho" - }, - { - "access": 1, - "decoder": 727421593, - "descriptor": "I", - "field": "__bh", - "name": "bh", - "owner": "ho" - }, - { - "access": 1, - "decoder": 876695207, - "descriptor": "I", - "field": "__fj", - "name": "fj", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Lho;", - "field": "parent", - "name": "dt", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Ljava/lang/String;", - "field": "buttonText", - "name": "ec", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Ljava/lang/String;", - "field": "dataText", - "name": "de", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Ljava/lang/String;", - "field": "spellActionName", - "name": "dp", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Ljava/lang/String;", - "field": "spellName", - "name": "eu", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Ljava/lang/String;", - "field": "text", - "name": "cv", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Ljava/lang/String;", - "field": "text2", - "name": "ce", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Llj;", - "field": "rectangleMode", - "name": "aa", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Z", - "field": "__ba", - "name": "ba", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Z", - "field": "__cg", - "name": "cg", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Z", - "field": "__fm", - "name": "fm", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Z", - "field": "__fq", - "name": "fq", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Z", - "field": "__fw", - "name": "fw", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Z", - "field": "__fz", - "name": "fz", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Z", - "field": "fill", - "name": "ao", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Z", - "field": "hasListener", - "name": "ds", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Z", - "field": "isHidden", - "name": "ae", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Z", - "field": "isIf3", - "name": "s", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Z", - "field": "isScrollBar", - "name": "da", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Z", - "field": "modelOrthog", - "name": "be", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Z", - "field": "modelTransparency", - "name": "bv", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Z", - "field": "noClickThrough", - "name": "fx", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Z", - "field": "spriteFlipH", - "name": "bo", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Z", - "field": "spriteFlipV", - "name": "bc", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Z", - "field": "spriteTiling", - "name": "bn", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "Z", - "field": "textShadowed", - "name": "cj", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[I", - "field": "__cc", - "name": "cc", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[I", - "field": "__ci", - "name": "ci", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[I", - "field": "__fh", - "name": "fh", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[I", - "field": "cs1ComparisonValues", - "name": "er", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[I", - "field": "cs1Comparisons", - "name": "ey", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[I", - "field": "invTransmitTriggers", - "name": "du", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[I", - "field": "inventorySprites", - "name": "cq", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[I", - "field": "inventoryXOffsets", - "name": "ck", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[I", - "field": "inventoryYOffsets", - "name": "cn", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[I", - "field": "itemIds", - "name": "ef", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[I", - "field": "itemQuantities", - "name": "ev", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[I", - "field": "statTransmitTriggers", - "name": "dq", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[I", - "field": "varTransmitTriggers", - "name": "dz", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Lho;", - "field": "children", - "name": "ep", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "__ee", - "name": "ee", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "__eh", - "name": "eh", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onChatTransmit", - "name": "em", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onClanTransmit", - "name": "ej", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onClick", - "name": "dc", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onClickRepeat", - "name": "dg", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onDialogAbort", - "name": "en", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onDrag", - "name": "dr", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onDragComplete", - "name": "dw", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onFriendTransmit", - "name": "ex", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onHold", - "name": "dd", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onInvTransmit", - "name": "dj", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onKey", - "name": "ed", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onLoad", - "name": "di", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onMiscTransmit", - "name": "el", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onMouseLeave", - "name": "dl", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onMouseOver", - "name": "dy", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onMouseRepeat", - "name": "dk", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onOp", - "name": "eb", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onRelease", - "name": "db", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onScrollWheel", - "name": "ek", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onStatTransmit", - "name": "dm", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onStockTransmit", - "name": "eq", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onSubChange", - "name": "ei", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onTargetEnter", - "name": "dv", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onTargetLeave", - "name": "do", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onTimer", - "name": "et", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/Object;", - "field": "onVarTransmit", - "name": "dh", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/String;", - "field": "actions", - "name": "dx", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/String;", - "field": "itemActions", - "name": "ch", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[[B", - "field": "__cf", - "name": "cf", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[[B", - "field": "__cp", - "name": "cp", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "[[I", - "field": "cs1Instructions", - "name": "eo", - "owner": "ho" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lgr;B)[I", - "method": "readListenerTriggers", - "name": "l", - "owner": "ho", - "parameters": [ - "buffer" - ] - }, - { - "access": 0, - "descriptor": "(Lgr;I)V", - "method": "decode", - "name": "u", - "owner": "ho", - "parameters": [ - "buffer" - ] - }, - { - "access": 0, - "descriptor": "(Lgr;I)V", - "method": "decodeLegacy", - "name": "o", - "owner": "ho", - "parameters": [ - "buffer" - ] - }, - { - "access": 0, - "descriptor": "(Lgr;I)[Ljava/lang/Object;", - "method": "readListener", - "name": "g", - "owner": "ho", - "parameters": [ - "buffer" - ] - }, - { - "access": 1, - "descriptor": "(B)Lkk;", - "method": "getFont", - "name": "d", - "owner": "ho", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(II)Lln;", - "method": "getInventorySprite", - "name": "a", - "owner": "ho" - }, - { - "access": 1, - "descriptor": "(III)V", - "method": "swapItems", - "name": "e", - "owner": "ho", - "parameters": [ - "indexA", - "indexB" - ] - }, - { - "access": 1, - "descriptor": "(ILjava/lang/String;B)V", - "method": "setAction", - "name": "t", - "owner": "ho", - "parameters": [ - "index", - "s" - ] - }, - { - "access": 1, - "descriptor": "(Ljh;IZLhi;I)Ldu;", - "method": "getModel", - "name": "z", - "owner": "ho", - "parameters": [ - "appearance", - "b", - "frame", - "sequence" - ] - }, - { - "access": 1, - "descriptor": "(ZB)Lhp;", - "method": "getSpriteMask", - "name": "j", - "owner": "ho", - "parameters": [ - "b" - ] - }, - { - "access": 1, - "descriptor": "(ZI)Lln;", - "method": "getSprite", - "name": "x", - "owner": "ho", - "parameters": [ - "b" - ] - } - ], - "name": "ho", - "super": "gw" - }, - { - "access": 33, - "class": "Coord", - "constructors": [ - { - "access": 1, - "descriptor": "(I)V" - }, - { - "access": 1, - "descriptor": "(III)V" - }, - { - "access": 1, - "descriptor": "(Lhu;)V" - } - ], - "fields": [ - { - "access": 1, - "decoder": 1225620013, - "descriptor": "I", - "field": "x", - "name": "f", - "owner": "hu" - }, - { - "access": 1, - "decoder": 154740833, - "descriptor": "I", - "field": "z", - "name": "q", - "owner": "hu" - }, - { - "access": 1, - "decoder": 503621925, - "descriptor": "I", - "field": "y", - "name": "m", - "owner": "hu" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lhu;B)Z", - "method": "equals0", - "name": "f", - "owner": "hu", - "parameters": [ - "other" - ] - }, - { - "access": 0, - "descriptor": "(Ljava/lang/String;I)Ljava/lang/String;", - "method": "toString0", - "name": "q", - "owner": "hu", - "parameters": [ - "separator" - ] - }, - { - "access": 1, - "descriptor": "()I", - "method": "__hashCode_383", - "name": "hashCode", - "owner": "hu", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()Ljava/lang/String;", - "method": "__toString_384", - "name": "toString", - "owner": "hu", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "packed", - "name": "m", - "owner": "hu", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;)Z", - "method": "__equals_382", - "name": "equals", - "owner": "hu", - "parameters": [ - "arg0" - ] - } - ], - "name": "hu", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "Decimator", - "constructors": [ - { - "access": 1, - "descriptor": "(II)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1376358157, - "descriptor": "I", - "field": "inputRate", - "name": "w", - "owner": "dp" - }, - { - "access": 0, - "decoder": -876645877, - "descriptor": "I", - "field": "outputRate", - "name": "o", - "owner": "dp" - }, - { - "access": 0, - "descriptor": "[[I", - "field": "table", - "name": "u", - "owner": "dp" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(IB)I", - "method": "scalePosition", - "name": "q", - "owner": "dp", - "parameters": [ - "position" - ] - }, - { - "access": 0, - "descriptor": "(II)I", - "method": "scaleRate", - "name": "f", - "owner": "dp", - "parameters": [ - "rate" - ] - }, - { - "access": 0, - "descriptor": "([BI)[B", - "method": "resample", - "name": "m", - "owner": "dp" - } - ], - "name": "dp", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "DefaultsGroup", - "constructors": [ - { - "access": 0, - "descriptor": "(I)V" - } - ], - "fields": [ - { - "access": 16, - "decoder": -800980069, - "descriptor": "I", - "field": "group", - "name": "f", - "owner": "ka" - } - ], - "interfaces": [], - "methods": [], - "name": "ka", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "DesktopPlatformInfoProvider", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [], - "interfaces": [ - "lm" - ], - "methods": [ - { - "access": 1, - "descriptor": "(I)Llb;", - "method": "get", - "name": "m", - "owner": "lu", - "parameters": [] - } - ], - "name": "lu", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "DevicePcmPlayer", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -106586673, - "descriptor": "I", - "field": "capacity2", - "name": "q", - "owner": "ax" - }, - { - "access": 0, - "descriptor": "Ljavax/sound/sampled/AudioFormat;", - "field": "format", - "name": "m", - "owner": "ax" - }, - { - "access": 0, - "descriptor": "Ljavax/sound/sampled/SourceDataLine;", - "field": "line", - "name": "f", - "owner": "ax" - }, - { - "access": 0, - "descriptor": "[B", - "field": "byteSamples", - "name": "w", - "owner": "ax" - } - ], - "interfaces": [], - "methods": [ - { - "access": 4, - "descriptor": "()V", - "method": "write", - "name": "w", - "owner": "ax", - "parameters": [] - }, - { - "access": 4, - "descriptor": "(B)I", - "method": "position", - "name": "q", - "owner": "ax", - "parameters": [] - }, - { - "access": 4, - "descriptor": "(I)V", - "method": "close", - "name": "o", - "owner": "ax", - "parameters": [] - }, - { - "access": 4, - "descriptor": "(I)V", - "method": "discard", - "name": "u", - "owner": "ax", - "parameters": [] - }, - { - "access": 4, - "descriptor": "(I)V", - "method": "init", - "name": "m", - "owner": "ax", - "parameters": [] - }, - { - "access": 4, - "descriptor": "(II)V", - "method": "open", - "name": "f", - "owner": "ax", - "parameters": [ - "bufferSize" - ] - } - ], - "name": "ax", - "super": "co" - }, - { - "access": 33, - "class": "DevicePcmPlayerProvider", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [], - "interfaces": [ - "cz" - ], - "methods": [ - { - "access": 1, - "descriptor": "(B)Lco;", - "method": "player", - "name": "m", - "owner": "az" - } - ], - "name": "az", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "DirectByteArrayCopier", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Ljava/nio/ByteBuffer;", - "field": "directBuffer", - "name": "m", - "owner": "gv" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)[B", - "method": "get", - "name": "m", - "owner": "gv", - "parameters": [] - }, - { - "access": 0, - "descriptor": "([BI)V", - "method": "set", - "name": "f", - "owner": "gv", - "parameters": [ - "array" - ] - } - ], - "name": "gv", - "super": "gu" - }, - { - "access": 33, - "class": "DirectWrapper", - "constructors": [ - { - "access": 0, - "descriptor": "(Ljava/lang/Object;I)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Ljava/lang/Object;", - "field": "obj", - "name": "m", - "owner": "ew" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "()Ljava/lang/Object;", - "method": "get", - "name": "m", - "owner": "ew", - "parameters": [] - }, - { - "access": 0, - "descriptor": "()Z", - "method": "isSoft", - "name": "f", - "owner": "ew", - "parameters": [] - } - ], - "name": "ew", - "super": "eu" - }, - { - "access": 33, - "class": "DualNode", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 1, - "descriptor": "J", - "field": "keyDual", - "name": "cg", - "owner": "fn" - }, - { - "access": 1, - "descriptor": "Lfn;", - "field": "nextDual", - "name": "cp", - "owner": "fn" - }, - { - "access": 1, - "descriptor": "Lfn;", - "field": "previousDual", - "name": "cf", - "owner": "fn" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "()V", - "method": "removeDual", - "name": "cg", - "owner": "fn", - "parameters": [] - } - ], - "name": "fn", - "super": "gw" - }, - { - "access": 33, - "class": "DynamicObject", - "constructors": [ - { - "access": 0, - "descriptor": "(IIIIIIIZLex;)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -126308963, - "descriptor": "I", - "field": "y", - "name": "u", - "owner": "cf" - }, - { - "access": 0, - "decoder": -1596313489, - "descriptor": "I", - "field": "cycleStart", - "name": "e", - "owner": "cf" - }, - { - "access": 0, - "decoder": -2017547185, - "descriptor": "I", - "field": "frame", - "name": "l", - "owner": "cf" - }, - { - "access": 0, - "decoder": -351084819, - "descriptor": "I", - "field": "x", - "name": "o", - "owner": "cf" - }, - { - "access": 0, - "decoder": 1369707199, - "descriptor": "I", - "field": "id", - "name": "m", - "owner": "cf" - }, - { - "access": 0, - "decoder": 141031459, - "descriptor": "I", - "field": "orientation", - "name": "q", - "owner": "cf" - }, - { - "access": 0, - "decoder": 1713856147, - "descriptor": "I", - "field": "type", - "name": "f", - "owner": "cf" - }, - { - "access": 0, - "decoder": 844945979, - "descriptor": "I", - "field": "plane", - "name": "w", - "owner": "cf" - }, - { - "access": 0, - "descriptor": "Ljh;", - "field": "sequenceDefinition", - "name": "g", - "owner": "cf" - } - ], - "interfaces": [], - "methods": [ - { - "access": 20, - "descriptor": "(I)Ldu;", - "method": "getModel", - "name": "e", - "owner": "cf", - "parameters": [] - } - ], - "name": "cf", - "super": "ex" - }, - { - "access": 33, - "class": "EnumDefinition", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 1, - "decoder": -12324053, - "descriptor": "I", - "field": "outputcount", - "name": "g", - "owner": "jw" - }, - { - "access": 1, - "decoder": 1948115527, - "descriptor": "I", - "field": "defaultint", - "name": "u", - "owner": "jw" - }, - { - "access": 1, - "descriptor": "C", - "field": "inputtype", - "name": "q", - "owner": "jw" - }, - { - "access": 1, - "descriptor": "C", - "field": "outputtype", - "name": "w", - "owner": "jw" - }, - { - "access": 1, - "descriptor": "Ljava/lang/String;", - "field": "defaultstr", - "name": "o", - "owner": "jw" - }, - { - "access": 1, - "descriptor": "[I", - "field": "intvals", - "name": "e", - "owner": "jw" - }, - { - "access": 1, - "descriptor": "[I", - "field": "keys", - "name": "l", - "owner": "jw" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/String;", - "field": "strvals", - "name": "x", - "owner": "jw" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lgr;I)V", - "method": "decode", - "name": "f", - "owner": "jw" - }, - { - "access": 0, - "descriptor": "(Lgr;II)V", - "method": "decode0", - "name": "q", - "owner": "jw" - }, - { - "access": 1, - "descriptor": "(B)I", - "method": "size", - "name": "w", - "owner": "jw", - "parameters": [] - } - ], - "name": "jw", - "super": "fn" - }, - { - "access": 33, - "class": "FaceNormal", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1376860893, - "descriptor": "I", - "field": "__f", - "name": "f", - "owner": "el" - }, - { - "access": 0, - "decoder": -2074333261, - "descriptor": "I", - "field": "__m", - "name": "m", - "owner": "el" - }, - { - "access": 0, - "decoder": 2619977, - "descriptor": "I", - "field": "__q", - "name": "q", - "owner": "el" - } - ], - "interfaces": [], - "methods": [], - "name": "el", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "FloorOverlayDefinition", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 1, - "decoder": -111851793, - "descriptor": "I", - "field": "rgb", - "name": "q", - "owner": "jf" - }, - { - "access": 1, - "decoder": -122393061, - "descriptor": "I", - "field": "hue2", - "name": "x", - "owner": "jf" - }, - { - "access": 1, - "decoder": -1719896767, - "descriptor": "I", - "field": "saturation", - "name": "l", - "owner": "jf" - }, - { - "access": 1, - "decoder": -624223733, - "descriptor": "I", - "field": "lightness", - "name": "e", - "owner": "jf" - }, - { - "access": 1, - "decoder": 127639041, - "descriptor": "I", - "field": "lightness2", - "name": "k", - "owner": "jf" - }, - { - "access": 1, - "decoder": 1514187401, - "descriptor": "I", - "field": "saturation2", - "name": "d", - "owner": "jf" - }, - { - "access": 1, - "decoder": 2013422835, - "descriptor": "I", - "field": "hue", - "name": "g", - "owner": "jf" - }, - { - "access": 1, - "decoder": 528865753, - "descriptor": "I", - "field": "rgb2", - "name": "u", - "owner": "jf" - }, - { - "access": 1, - "decoder": 733377225, - "descriptor": "I", - "field": "texture", - "name": "w", - "owner": "jf" - }, - { - "access": 1, - "descriptor": "Z", - "field": "__o", - "name": "o", - "owner": "jf" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(II)V", - "method": "setHsl", - "name": "o", - "owner": "jf", - "parameters": [ - "rgb" - ] - }, - { - "access": 0, - "descriptor": "(Lgr;III)V", - "method": "decode0", - "name": "w", - "owner": "jf" - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "postDecode", - "name": "f", - "owner": "jf", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(Lgr;II)V", - "method": "decode", - "name": "q", - "owner": "jf" - } - ], - "name": "jf", - "super": "fn" - }, - { - "access": 33, - "class": "FloorUnderlayDefinition", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -635678213, - "descriptor": "I", - "field": "rgb", - "name": "q", - "owner": "ih" - }, - { - "access": 1, - "decoder": -1465372343, - "descriptor": "I", - "field": "hue", - "name": "w", - "owner": "ih" - }, - { - "access": 1, - "decoder": -1691813081, - "descriptor": "I", - "field": "lightness", - "name": "u", - "owner": "ih" - }, - { - "access": 1, - "decoder": 1484542081, - "descriptor": "I", - "field": "hueMultiplier", - "name": "g", - "owner": "ih" - }, - { - "access": 1, - "decoder": 2031118785, - "descriptor": "I", - "field": "saturation", - "name": "o", - "owner": "ih" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)V", - "method": "postDecode", - "name": "q", - "owner": "ih", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(IB)V", - "method": "setHsl", - "name": "u", - "owner": "ih", - "parameters": [ - "rgb" - ] - }, - { - "access": 0, - "descriptor": "(Lgr;II)V", - "method": "decode", - "name": "w", - "owner": "ih" - }, - { - "access": 0, - "descriptor": "(Lgr;III)V", - "method": "decode0", - "name": "o", - "owner": "ih" - } - ], - "name": "ih", - "super": "fn" - }, - { - "access": 33, - "class": "FontName", - "constructors": [ - { - "access": 0, - "descriptor": "(Ljava/lang/String;)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "__g", - "name": "g", - "owner": "kx" - } - ], - "interfaces": [], - "methods": [], - "name": "kx", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "Fonts", - "constructors": [ - { - "access": 1, - "descriptor": "(Lir;Lir;)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Lir;", - "field": "__f", - "name": "f", - "owner": "kz" - }, - { - "access": 0, - "descriptor": "Lir;", - "field": "__m", - "name": "m", - "owner": "kz" - }, - { - "access": 0, - "descriptor": "Ljava/util/HashMap;", - "field": "map", - "name": "q", - "owner": "kz" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "([Lkx;I)Ljava/util/HashMap;", - "method": "createMap", - "name": "m", - "owner": "kz" - } - ], - "name": "kz", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "Formatting", - "constructors": [], - "fields": [], - "interfaces": [], - "methods": [], - "name": "cy", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "Frames", - "constructors": [ - { - "access": 1, - "descriptor": "(Lir;Lir;IZ)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "[Ldz;", - "field": "frames", - "name": "m", - "owner": "en" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "(II)Z", - "method": "hasAlphaTransform", - "name": "m", - "owner": "en", - "parameters": [ - "frame" - ] - } - ], - "name": "en", - "super": "fn" - }, - { - "access": 33, - "class": "Friend", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Z", - "field": "__f", - "name": "f", - "owner": "kq" - }, - { - "access": 0, - "descriptor": "Z", - "field": "__m", - "name": "m", - "owner": "kq" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lkq;I)I", - "method": "compareTo00", - "name": "m", - "owner": "kq", - "parameters": [ - "other" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;)I", - "method": "__compareTo_467", - "name": "compareTo", - "owner": "kq", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(Ljs;I)I", - "method": "__aj_466", - "name": "aj", - "owner": "kq", - "parameters": [ - "arg0" - ] - } - ], - "name": "kq", - "super": "ke" - }, - { - "access": 33, - "class": "FriendLoginUpdate", - "constructors": [ - { - "access": 0, - "descriptor": "(Lkp;I)V" - } - ], - "fields": [ - { - "access": 1, - "decoder": -1390885889, - "descriptor": "I", - "field": "time", - "name": "q", - "owner": "kn" - }, - { - "access": 1, - "descriptor": "Lkp;", - "field": "username", - "name": "w", - "owner": "kn" - }, - { - "access": 1, - "descriptor": "S", - "field": "world", - "name": "o", - "owner": "kn" - } - ], - "interfaces": [], - "methods": [], - "name": "kn", - "super": "gh" - }, - { - "access": 33, - "class": "FriendSystem", - "constructors": [ - { - "access": 0, - "descriptor": "(Llx;)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": 1477282369, - "descriptor": "I", - "field": "__g", - "name": "g", - "owner": "bh" - }, - { - "access": 16, - "descriptor": "Llx;", - "field": "loginType", - "name": "w", - "owner": "bh" - }, - { - "access": 17, - "descriptor": "Lkg;", - "field": "friendsList", - "name": "o", - "owner": "bh" - }, - { - "access": 17, - "descriptor": "Lkj;", - "field": "ignoreList", - "name": "u", - "owner": "bh" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(B)Z", - "method": "__m_151", - "name": "m", - "owner": "bh", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(B)Z", - "method": "__a_160", - "name": "a", - "owner": "bh", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(B)Z", - "method": "__e_158", - "name": "e", - "owner": "bh", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(I)V", - "method": "__f_152", - "name": "f", - "owner": "bh", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(I)V", - "method": "__w_154", - "name": "w", - "owner": "bh", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(I)V", - "method": "clear", - "name": "o", - "owner": "bh", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(Lgr;II)V", - "method": "__q_153", - "name": "q", - "owner": "bh", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 16, - "descriptor": "(Ljava/lang/String;B)V", - "method": "__x_159", - "name": "x", - "owner": "bh", - "parameters": [ - "arg0" - ] - }, - { - "access": 16, - "descriptor": "(Ljava/lang/String;I)V", - "method": "__l_157", - "name": "l", - "owner": "bh", - "parameters": [ - "arg0" - ] - }, - { - "access": 16, - "descriptor": "(Ljava/lang/String;I)V", - "method": "removeFriend", - "name": "z", - "owner": "bh", - "parameters": [ - "name" - ] - }, - { - "access": 16, - "descriptor": "(Ljava/lang/String;I)V", - "method": "removeIgnore", - "name": "j", - "owner": "bh", - "parameters": [ - "name" - ] - }, - { - "access": 16, - "descriptor": "(Lkp;I)Z", - "method": "__g_156", - "name": "g", - "owner": "bh", - "parameters": [ - "arg0" - ] - }, - { - "access": 16, - "descriptor": "(Lkp;S)Z", - "method": "__t_161", - "name": "t", - "owner": "bh", - "parameters": [ - "arg0" - ] - }, - { - "access": 16, - "descriptor": "(Lkp;ZI)Z", - "method": "__u_155", - "name": "u", - "owner": "bh", - "parameters": [ - "arg0", - "arg1" - ] - } - ], - "name": "bh", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "FriendsList", - "constructors": [ - { - "access": 1, - "descriptor": "(Llx;)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -217526077, - "descriptor": "I", - "field": "__x", - "name": "x", - "owner": "kg" - }, - { - "access": 1, - "descriptor": "Ljy;", - "field": "friendLoginUpdates", - "name": "d", - "owner": "kg" - }, - { - "access": 16, - "descriptor": "Llx;", - "field": "loginType", - "name": "q", - "owner": "kg" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)Ljs;", - "method": "newInstance", - "name": "m", - "owner": "kg" - }, - { - "access": 0, - "descriptor": "(II)[Ljs;", - "method": "newTypedArray", - "name": "f", - "owner": "kg" - }, - { - "access": 1, - "descriptor": "(Lgr;IB)V", - "method": "read", - "name": "x", - "owner": "kg", - "parameters": [ - "buffer", - "n" - ] - }, - { - "access": 1, - "descriptor": "(Lkp;ZI)Z", - "method": "__q_461", - "name": "q", - "owner": "kg", - "parameters": [ - "arg0", - "arg1" - ] - } - ], - "name": "kg", - "super": "km" - }, - { - "access": 33, - "class": "GrandExchangeEvent", - "constructors": [ - { - "access": 0, - "descriptor": "(Lgr;BI)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "string1", - "name": "w", - "owner": "l" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "string2", - "name": "o", - "owner": "l" - }, - { - "access": 17, - "decoder": -633089807, - "descriptor": "I", - "field": "world", - "name": "m", - "owner": "l" - }, - { - "access": 17, - "decoder": -6503890758391258000, - "descriptor": "J", - "field": "__f", - "name": "f", - "owner": "l" - }, - { - "access": 17, - "descriptor": "Lx;", - "field": "grandExchangeOffer", - "name": "q", - "owner": "l" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "(I)Ljava/lang/String;", - "method": "__f_4", - "name": "f", - "owner": "l", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)Ljava/lang/String;", - "method": "__m_3", - "name": "m", - "owner": "l", - "parameters": [] - } - ], - "name": "l", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "GrandExchangeEvents", - "constructors": [ - { - "access": 1, - "descriptor": "(Lgr;Z)V" - } - ], - "fields": [ - { - "access": 17, - "descriptor": "Ljava/util/List;", - "field": "events", - "name": "m", - "owner": "g" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "(Ljava/util/Comparator;ZI)V", - "method": "sort", - "name": "m", - "owner": "g" - } - ], - "name": "g", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "GrandExchangeOffer", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - }, - { - "access": 1, - "descriptor": "(Lgr;Z)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "B", - "field": "state", - "name": "m", - "owner": "x" - }, - { - "access": 1, - "decoder": -1627453165, - "descriptor": "I", - "field": "unitPrice", - "name": "q", - "owner": "x" - }, - { - "access": 1, - "decoder": 1136727241, - "descriptor": "I", - "field": "id", - "name": "f", - "owner": "x" - }, - { - "access": 1, - "decoder": 1413132419, - "descriptor": "I", - "field": "currentQuantity", - "name": "o", - "owner": "x" - }, - { - "access": 1, - "decoder": 396420073, - "descriptor": "I", - "field": "currentPrice", - "name": "u", - "owner": "x" - }, - { - "access": 1, - "decoder": 562564821, - "descriptor": "I", - "field": "totalQuantity", - "name": "w", - "owner": "x" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(II)V", - "method": "__o_9", - "name": "o", - "owner": "x", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "(II)V", - "method": "__u_10", - "name": "u", - "owner": "x", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "(Ljava/lang/Integer;I)V", - "method": "__f_8", - "name": "f", - "owner": "x", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "status", - "name": "q", - "owner": "x", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "type", - "name": "w", - "owner": "x", - "parameters": [] - } - ], - "name": "x", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "GraphicsDefaults", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 1, - "decoder": -104203005, - "descriptor": "I", - "field": "mapScenes", - "name": "q", - "owner": "lg" - }, - { - "access": 1, - "decoder": -1052769237, - "descriptor": "I", - "field": "headIconsPk", - "name": "w", - "owner": "lg" - }, - { - "access": 1, - "decoder": -1114417319, - "descriptor": "I", - "field": "mapDots", - "name": "e", - "owner": "lg" - }, - { - "access": 1, - "decoder": -1217061337, - "descriptor": "I", - "field": "mapMarkers", - "name": "g", - "owner": "lg" - }, - { - "access": 1, - "decoder": -1744250043, - "descriptor": "I", - "field": "headIconsPrayer", - "name": "o", - "owner": "lg" - }, - { - "access": 1, - "decoder": -919662109, - "descriptor": "I", - "field": "scrollBars", - "name": "x", - "owner": "lg" - }, - { - "access": 1, - "decoder": 159591367, - "descriptor": "I", - "field": "__f", - "name": "f", - "owner": "lg" - }, - { - "access": 1, - "decoder": 1673796151, - "descriptor": "I", - "field": "__m", - "name": "m", - "owner": "lg" - }, - { - "access": 1, - "decoder": 185111653, - "descriptor": "I", - "field": "headIconsHint", - "name": "u", - "owner": "lg" - }, - { - "access": 1, - "decoder": 2043130323, - "descriptor": "I", - "field": "modIcons", - "name": "d", - "owner": "lg" - }, - { - "access": 1, - "decoder": 536911453, - "descriptor": "I", - "field": "crosses", - "name": "l", - "owner": "lg" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "(Lir;I)V", - "method": "decode", - "name": "m", - "owner": "lg", - "parameters": [ - "index" - ] - } - ], - "name": "lg", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "GzipDecompressor", - "constructors": [ - { - "access": 0, - "descriptor": "(III)V" - }, - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Ljava/util/zip/Inflater;", - "field": "inflater", - "name": "m", - "owner": "go" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "(Lgr;[BB)V", - "method": "decompress", - "name": "m", - "owner": "go" - } - ], - "name": "go", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "HealthBar", - "constructors": [ - { - "access": 0, - "descriptor": "(Lii;)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Lii;", - "field": "definition", - "name": "q", - "owner": "cr" - }, - { - "access": 0, - "descriptor": "Lja;", - "field": "updates", - "name": "w", - "owner": "cr" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)Z", - "method": "isEmpty", - "name": "q", - "owner": "cr", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(II)Lbg;", - "method": "get", - "name": "f", - "owner": "cr", - "parameters": [ - "cycle" - ] - }, - { - "access": 0, - "descriptor": "(IIIIB)V", - "method": "put", - "name": "m", - "owner": "cr" - } - ], - "name": "cr", - "super": "gw" - }, - { - "access": 33, - "class": "HealthBarDefinition", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1707680631, - "descriptor": "I", - "field": "spriteId2", - "name": "i", - "owner": "ii" - }, - { - "access": 0, - "decoder": 1310001257, - "descriptor": "I", - "field": "spriteId1", - "name": "n", - "owner": "ii" - }, - { - "access": 1, - "decoder": -1180353973, - "descriptor": "I", - "field": "int3", - "name": "x", - "owner": "ii" - }, - { - "access": 1, - "decoder": -1956457117, - "descriptor": "I", - "field": "int4", - "name": "d", - "owner": "ii" - }, - { - "access": 1, - "decoder": -354704697, - "descriptor": "I", - "field": "width", - "name": "a", - "owner": "ii" - }, - { - "access": 1, - "decoder": -642961053, - "descriptor": "I", - "field": "int5", - "name": "k", - "owner": "ii" - }, - { - "access": 1, - "decoder": 1515955705, - "descriptor": "I", - "field": "__o", - "name": "o", - "owner": "ii" - }, - { - "access": 1, - "decoder": 166567703, - "descriptor": "I", - "field": "widthPadding", - "name": "z", - "owner": "ii" - }, - { - "access": 1, - "decoder": 1890433231, - "descriptor": "I", - "field": "int2", - "name": "e", - "owner": "ii" - }, - { - "access": 1, - "decoder": 390656615, - "descriptor": "I", - "field": "int1", - "name": "l", - "owner": "ii" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lgr;IB)V", - "method": "decode0", - "name": "f", - "owner": "ii" - }, - { - "access": 1, - "descriptor": "(B)Lln;", - "method": "getSprite1", - "name": "q", - "owner": "ii", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(B)Lln;", - "method": "getSprite2", - "name": "w", - "owner": "ii", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(Lgr;I)V", - "method": "decode", - "name": "m", - "owner": "ii" - } - ], - "name": "ii", - "super": "fn" - }, - { - "access": 33, - "class": "HealthBarUpdate", - "constructors": [ - { - "access": 0, - "descriptor": "(IIII)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1876302639, - "descriptor": "I", - "field": "cycleOffset", - "name": "w", - "owner": "bg" - }, - { - "access": 0, - "decoder": -820353645, - "descriptor": "I", - "field": "health2", - "name": "q", - "owner": "bg" - }, - { - "access": 0, - "decoder": 1821995313, - "descriptor": "I", - "field": "health", - "name": "f", - "owner": "bg" - }, - { - "access": 0, - "decoder": 2103089795, - "descriptor": "I", - "field": "cycle", - "name": "m", - "owner": "bg" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(IIIII)V", - "method": "set", - "name": "m", - "owner": "bg" - } - ], - "name": "bg", - "super": "gw" - }, - { - "access": 33, - "class": "HitmarkDefinition", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1533306389, - "descriptor": "I", - "field": "__a", - "name": "a", - "owner": "jm" - }, - { - "access": 0, - "decoder": -1677628889, - "descriptor": "I", - "field": "__z", - "name": "z", - "owner": "jm" - }, - { - "access": 0, - "decoder": -1841054487, - "descriptor": "I", - "field": "transformVarp", - "name": "ag", - "owner": "jm" - }, - { - "access": 0, - "decoder": 1683792491, - "descriptor": "I", - "field": "__j", - "name": "j", - "owner": "jm" - }, - { - "access": 0, - "decoder": 1845590719, - "descriptor": "I", - "field": "__s", - "name": "s", - "owner": "jm" - }, - { - "access": 0, - "decoder": 431076793, - "descriptor": "I", - "field": "fontId", - "name": "k", - "owner": "jm" - }, - { - "access": 0, - "decoder": 516423393, - "descriptor": "I", - "field": "transformVarbit", - "name": "v", - "owner": "jm" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "__b", - "name": "b", - "owner": "jm" - }, - { - "access": 1, - "decoder": -102270561, - "descriptor": "I", - "field": "__i", - "name": "i", - "owner": "jm" - }, - { - "access": 1, - "decoder": -1151968735, - "descriptor": "I", - "field": "__n", - "name": "n", - "owner": "jm" - }, - { - "access": 1, - "decoder": -389283589, - "descriptor": "I", - "field": "__t", - "name": "t", - "owner": "jm" - }, - { - "access": 1, - "decoder": 1003116765, - "descriptor": "I", - "field": "__c", - "name": "c", - "owner": "jm" - }, - { - "access": 1, - "decoder": 1498880475, - "descriptor": "I", - "field": "__r", - "name": "r", - "owner": "jm" - }, - { - "access": 1, - "decoder": 1751286975, - "descriptor": "I", - "field": "__y", - "name": "y", - "owner": "jm" - }, - { - "access": 1, - "decoder": 199815415, - "descriptor": "I", - "field": "__h", - "name": "h", - "owner": "jm" - }, - { - "access": 1, - "descriptor": "[I", - "field": "transforms", - "name": "p", - "owner": "jm" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lgr;I)V", - "method": "decode", - "name": "q", - "owner": "jm" - }, - { - "access": 0, - "descriptor": "(Lgr;II)V", - "method": "decode0", - "name": "w", - "owner": "jm" - }, - { - "access": 1, - "descriptor": "(B)Lln;", - "method": "__e_419", - "name": "e", - "owner": "jm", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(B)Lln;", - "method": "__l_418", - "name": "l", - "owner": "jm", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)Lkk;", - "method": "getFont", - "name": "d", - "owner": "jm", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)Lln;", - "method": "__g_417", - "name": "g", - "owner": "jm", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)Lln;", - "method": "__x_420", - "name": "x", - "owner": "jm", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(IS)Ljava/lang/String;", - "method": "getString", - "name": "u", - "owner": "jm", - "parameters": [ - "n" - ] - }, - { - "access": 17, - "descriptor": "(B)Ljm;", - "method": "transform", - "name": "o", - "owner": "jm", - "parameters": [] - } - ], - "name": "jm", - "super": "fn" - }, - { - "access": 33, - "class": "Huffman", - "constructors": [ - { - "access": 1, - "descriptor": "([B)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "[B", - "field": "__f", - "name": "f", - "owner": "gd" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__m", - "name": "m", - "owner": "gd" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__q", - "name": "q", - "owner": "gd" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "([BII[BIB)I", - "method": "__m_293", - "name": "m", - "owner": "gd", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4" - ] - }, - { - "access": 1, - "descriptor": "([BI[BIII)I", - "method": "__f_294", - "name": "f", - "owner": "gd", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4" - ] - } - ], - "name": "gd", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "IgnoreList", - "constructors": [ - { - "access": 1, - "descriptor": "(Llx;)V" - } - ], - "fields": [ - { - "access": 16, - "descriptor": "Llx;", - "field": "loginType", - "name": "q", - "owner": "kj" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)Ljs;", - "method": "newInstance", - "name": "m", - "owner": "kj" - }, - { - "access": 0, - "descriptor": "(II)[Ljs;", - "method": "newTypedArray", - "name": "f", - "owner": "kj" - }, - { - "access": 1, - "descriptor": "(Lgr;IB)V", - "method": "read", - "name": "q", - "owner": "kj", - "parameters": [ - "buffer", - "n" - ] - } - ], - "name": "kj", - "super": "km" - }, - { - "access": 33, - "class": "Ignored", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": 344024525, - "descriptor": "I", - "field": "id", - "name": "m", - "owner": "ks" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lks;I)I", - "method": "compareTo00", - "name": "m", - "owner": "ks", - "parameters": [ - "other" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;)I", - "method": "__compareTo_460", - "name": "compareTo", - "owner": "ks", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(Ljs;I)I", - "method": "__aj_459", - "name": "aj", - "owner": "ks", - "parameters": [ - "arg0" - ] - } - ], - "name": "ks", - "super": "js" - }, - { - "access": 33, - "class": "Instrument", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "I", - "field": "delayDecay", - "name": "n", - "owner": "db" - }, - { - "access": 0, - "descriptor": "I", - "field": "delayTime", - "name": "k", - "owner": "db" - }, - { - "access": 0, - "descriptor": "I", - "field": "duration", - "name": "z", - "owner": "db" - }, - { - "access": 0, - "descriptor": "I", - "field": "offset", - "name": "j", - "owner": "db" - }, - { - "access": 0, - "descriptor": "Lde;", - "field": "__a", - "name": "a", - "owner": "db" - }, - { - "access": 0, - "descriptor": "Lde;", - "field": "__f", - "name": "f", - "owner": "db" - }, - { - "access": 0, - "descriptor": "Lde;", - "field": "__g", - "name": "g", - "owner": "db" - }, - { - "access": 0, - "descriptor": "Lde;", - "field": "__l", - "name": "l", - "owner": "db" - }, - { - "access": 0, - "descriptor": "Lde;", - "field": "__m", - "name": "m", - "owner": "db" - }, - { - "access": 0, - "descriptor": "Lde;", - "field": "__o", - "name": "o", - "owner": "db" - }, - { - "access": 0, - "descriptor": "Lde;", - "field": "__q", - "name": "q", - "owner": "db" - }, - { - "access": 0, - "descriptor": "Lde;", - "field": "__u", - "name": "u", - "owner": "db" - }, - { - "access": 0, - "descriptor": "Lde;", - "field": "__w", - "name": "w", - "owner": "db" - }, - { - "access": 0, - "descriptor": "Ldi;", - "field": "filter", - "name": "i", - "owner": "db" - }, - { - "access": 0, - "descriptor": "[I", - "field": "oscillatorDelays", - "name": "d", - "owner": "db" - }, - { - "access": 0, - "descriptor": "[I", - "field": "oscillatorPitch", - "name": "x", - "owner": "db" - }, - { - "access": 0, - "descriptor": "[I", - "field": "oscillatorVolume", - "name": "e", - "owner": "db" - } - ], - "interfaces": [], - "methods": [ - { - "access": 16, - "descriptor": "(II)[I", - "method": "synthesize", - "name": "m", - "owner": "db" - }, - { - "access": 16, - "descriptor": "(III)I", - "method": "evaluateWave", - "name": "f", - "owner": "db" - }, - { - "access": 16, - "descriptor": "(Lgr;)V", - "method": "decode", - "name": "q", - "owner": "db", - "parameters": [ - "buffer" - ] - } - ], - "name": "db", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "IntHashTable", - "constructors": [ - { - "access": 1, - "descriptor": "([I)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "[I", - "field": "array", - "name": "m", - "owner": "lv" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "(II)I", - "method": "get", - "name": "m", - "owner": "lv" - } - ], - "name": "lv", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "IntegerNode", - "constructors": [ - { - "access": 1, - "descriptor": "(I)V" - } - ], - "fields": [ - { - "access": 1, - "descriptor": "I", - "field": "integer", - "name": "m", - "owner": "gn" - } - ], - "interfaces": [], - "methods": [], - "name": "gn", - "super": "gw" - }, - { - "access": 33, - "class": "InterfaceParent", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -707461797, - "descriptor": "I", - "field": "itf", - "name": "m", - "owner": "bx" - }, - { - "access": 0, - "decoder": 1712037041, - "descriptor": "I", - "field": "type", - "name": "f", - "owner": "bx" - }, - { - "access": 0, - "descriptor": "Z", - "field": "keep", - "name": "q", - "owner": "bx" - } - ], - "interfaces": [], - "methods": [], - "name": "bx", - "super": "gw" - }, - { - "access": 33, - "class": "Interpreter", - "constructors": [], - "fields": [], - "interfaces": [], - "methods": [], - "name": "bv", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "InvDefinition", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 1, - "decoder": 1358868971, - "descriptor": "I", - "field": "size", - "name": "q", - "owner": "ib" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lgr;I)V", - "method": "decode", - "name": "f", - "owner": "ib" - }, - { - "access": 0, - "descriptor": "(Lgr;II)V", - "method": "decode0", - "name": "q", - "owner": "ib" - } - ], - "name": "ib", - "super": "fn" - }, - { - "access": 33, - "class": "ItemContainer", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "[I", - "field": "ids", - "name": "f", - "owner": "bc" - }, - { - "access": 0, - "descriptor": "[I", - "field": "quantities", - "name": "q", - "owner": "bc" - } - ], - "interfaces": [], - "methods": [], - "name": "bc", - "super": "gw" - }, - { - "access": 33, - "class": "ItemDefinition", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1378899027, - "descriptor": "I", - "field": "manwearyoff", - "name": "aw", - "owner": "jv" - }, - { - "access": 0, - "decoder": -1619361485, - "descriptor": "I", - "field": "womanwearyoff", - "name": "ae", - "owner": "jv" - }, - { - "access": 0, - "decoder": -17174497, - "descriptor": "I", - "field": "resizey", - "name": "af", - "owner": "jv" - }, - { - "access": 0, - "decoder": -1969719185, - "descriptor": "I", - "field": "boughttemplate", - "name": "bd", - "owner": "jv" - }, - { - "access": 0, - "decoder": -650184697, - "descriptor": "I", - "field": "manhead", - "name": "ap", - "owner": "jv" - }, - { - "access": 0, - "decoder": -691559863, - "descriptor": "I", - "field": "manwear3", - "name": "at", - "owner": "jv" - }, - { - "access": 0, - "decoder": -771136925, - "descriptor": "I", - "field": "womanwear3", - "name": "ad", - "owner": "jv" - }, - { - "access": 0, - "decoder": 106668727, - "descriptor": "I", - "field": "womanhead2", - "name": "an", - "owner": "jv" - }, - { - "access": 0, - "decoder": 1070080857, - "descriptor": "I", - "field": "model", - "name": "a", - "owner": "jv" - }, - { - "access": 0, - "decoder": 1395132907, - "descriptor": "I", - "field": "resizez", - "name": "ai", - "owner": "jv" - }, - { - "access": 0, - "decoder": 140643039, - "descriptor": "I", - "field": "manwear2", - "name": "ak", - "owner": "jv" - }, - { - "access": 0, - "decoder": 154223105, - "descriptor": "I", - "field": "womanwear2", - "name": "ab", - "owner": "jv" - }, - { - "access": 0, - "decoder": 1709659237, - "descriptor": "I", - "field": "womanhead", - "name": "am", - "owner": "jv" - }, - { - "access": 0, - "decoder": 548044049, - "descriptor": "I", - "field": "manhead2", - "name": "as", - "owner": "jv" - }, - { - "access": 0, - "decoder": 69034859, - "descriptor": "I", - "field": "resizex", - "name": "ax", - "owner": "jv" - }, - { - "access": 0, - "decoder": 700576005, - "descriptor": "I", - "field": "boughtlink", - "name": "bk", - "owner": "jv" - }, - { - "access": 0, - "decoder": 881309855, - "descriptor": "I", - "field": "shiftclickindex", - "name": "ay", - "owner": "jv" - }, - { - "access": 0, - "decoder": 886682223, - "descriptor": "I", - "field": "womanwear", - "name": "al", - "owner": "jv" - }, - { - "access": 0, - "decoder": 939367983, - "descriptor": "I", - "field": "manwear", - "name": "ah", - "owner": "jv" - }, - { - "access": 0, - "descriptor": "Llh;", - "field": "params", - "name": "bq", - "owner": "jv" - }, - { - "access": 0, - "descriptor": "[I", - "field": "countco", - "name": "au", - "owner": "jv" - }, - { - "access": 0, - "descriptor": "[I", - "field": "countobj", - "name": "az", - "owner": "jv" - }, - { - "access": 0, - "descriptor": "[S", - "field": "recol_d", - "name": "s", - "owner": "jv" - }, - { - "access": 0, - "descriptor": "[S", - "field": "recol_s", - "name": "j", - "owner": "jv" - }, - { - "access": 0, - "descriptor": "[S", - "field": "retex_d", - "name": "y", - "owner": "jv" - }, - { - "access": 0, - "descriptor": "[S", - "field": "retex_s", - "name": "t", - "owner": "jv" - }, - { - "access": 1, - "decoder": -1057008657, - "descriptor": "I", - "field": "team", - "name": "bs", - "owner": "jv" - }, - { - "access": 1, - "decoder": -1854342455, - "descriptor": "I", - "field": "placeholdertemplate", - "name": "bo", - "owner": "jv" - }, - { - "access": 1, - "decoder": -1984887305, - "descriptor": "I", - "field": "contrast", - "name": "bb", - "owner": "jv" - }, - { - "access": 1, - "decoder": -2121346423, - "descriptor": "I", - "field": "certtemplate", - "name": "aa", - "owner": "jv" - }, - { - "access": 1, - "decoder": -2130350563, - "descriptor": "I", - "field": "yof2d", - "name": "v", - "owner": "jv" - }, - { - "access": 1, - "decoder": -237597001, - "descriptor": "I", - "field": "stackable", - "name": "ag", - "owner": "jv" - }, - { - "access": 1, - "decoder": -343501105, - "descriptor": "I", - "field": "cost", - "name": "aq", - "owner": "jv" - }, - { - "access": 1, - "decoder": -533708435, - "descriptor": "I", - "field": "xof2d", - "name": "p", - "owner": "jv" - }, - { - "access": 1, - "decoder": -590103687, - "descriptor": "I", - "field": "id", - "name": "i", - "owner": "jv" - }, - { - "access": 1, - "decoder": 278037959, - "descriptor": "I", - "field": "zoom2d", - "name": "h", - "owner": "jv" - }, - { - "access": 1, - "decoder": 507808107, - "descriptor": "I", - "field": "yan2d", - "name": "c", - "owner": "jv" - }, - { - "access": 1, - "decoder": 551313257, - "descriptor": "I", - "field": "zan2d", - "name": "r", - "owner": "jv" - }, - { - "access": 1, - "decoder": 619422509, - "descriptor": "I", - "field": "certlink", - "name": "ao", - "owner": "jv" - }, - { - "access": 1, - "decoder": 738319589, - "descriptor": "I", - "field": "ambient", - "name": "ba", - "owner": "jv" - }, - { - "access": 1, - "decoder": 807815565, - "descriptor": "I", - "field": "placeholderlink", - "name": "bc", - "owner": "jv" - }, - { - "access": 1, - "decoder": 880150839, - "descriptor": "I", - "field": "xan2d", - "name": "b", - "owner": "jv" - }, - { - "access": 1, - "descriptor": "Ljava/lang/String;", - "field": "name", - "name": "z", - "owner": "jv" - }, - { - "access": 1, - "descriptor": "Z", - "field": "members", - "name": "aj", - "owner": "jv" - }, - { - "access": 1, - "descriptor": "Z", - "field": "stockmarket", - "name": "bn", - "owner": "jv" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/String;", - "field": "iop", - "name": "ar", - "owner": "jv" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/String;", - "field": "op", - "name": "av", - "owner": "jv" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)V", - "method": "__f_425", - "name": "f", - "owner": "jv", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(Lgr;I)V", - "method": "decode", - "name": "q", - "owner": "jv" - }, - { - "access": 0, - "descriptor": "(Lgr;II)V", - "method": "decode0", - "name": "w", - "owner": "jv" - }, - { - "access": 0, - "descriptor": "(Ljv;Ljv;I)V", - "method": "genBought", - "name": "u", - "owner": "jv", - "parameters": [ - "link", - "template" - ] - }, - { - "access": 0, - "descriptor": "(Ljv;Ljv;I)V", - "method": "genCert", - "name": "o", - "owner": "jv", - "parameters": [ - "link", - "template" - ] - }, - { - "access": 0, - "descriptor": "(Ljv;Ljv;I)V", - "method": "genPlaceholder", - "name": "g", - "owner": "jv", - "parameters": [ - "link", - "template" - ] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "getShiftClickIndex", - "name": "b", - "owner": "jv", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(IB)Ljv;", - "method": "getCountObj", - "name": "x", - "owner": "jv", - "parameters": [ - "quantity" - ] - }, - { - "access": 1, - "descriptor": "(IIS)I", - "method": "getIntParam", - "name": "y", - "owner": "jv" - }, - { - "access": 1, - "descriptor": "(ILjava/lang/String;I)Ljava/lang/String;", - "method": "getStringParam", - "name": "h", - "owner": "jv" - }, - { - "access": 17, - "descriptor": "(II)Ldu;", - "method": "getModel", - "name": "e", - "owner": "jv", - "parameters": [ - "quantity" - ] - }, - { - "access": 17, - "descriptor": "(II)Ldw;", - "method": "__l_426", - "name": "l", - "owner": "jv", - "parameters": [ - "arg0" - ] - }, - { - "access": 17, - "descriptor": "(ZB)Ldw;", - "method": "__j_428", - "name": "j", - "owner": "jv", - "parameters": [ - "arg0" - ] - }, - { - "access": 17, - "descriptor": "(ZI)Ldw;", - "method": "__t_430", - "name": "t", - "owner": "jv", - "parameters": [ - "arg0" - ] - }, - { - "access": 17, - "descriptor": "(ZI)Z", - "method": "__s_429", - "name": "s", - "owner": "jv", - "parameters": [ - "arg0" - ] - }, - { - "access": 17, - "descriptor": "(ZI)Z", - "method": "__z_427", - "name": "z", - "owner": "jv", - "parameters": [ - "arg0" - ] - } - ], - "name": "jv", - "super": "fn" - }, - { - "access": 33, - "class": "IterableDualNodeQueue", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Lfn;", - "field": "head", - "name": "f", - "owner": "jc" - }, - { - "access": 1, - "descriptor": "Lfn;", - "field": "sentinel", - "name": "m", - "owner": "jc" - } - ], - "interfaces": [ - "java.lang.Iterable" - ], - "methods": [ - { - "access": 0, - "descriptor": "(Lfn;)Lfn;", - "method": "__o_446", - "name": "o", - "owner": "jc", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "()Lfn;", - "method": "__q_444", - "name": "q", - "owner": "jc", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()Lfn;", - "method": "__u_447", - "name": "u", - "owner": "jc", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()Lfn;", - "method": "__w_445", - "name": "w", - "owner": "jc", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()Ljava/util/Iterator;", - "method": "__iterator_448", - "name": "iterator", - "owner": "jc", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "clear", - "name": "m", - "owner": "jc", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(Lfn;)V", - "method": "add", - "name": "f", - "owner": "jc" - } - ], - "name": "jc", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "IterableDualNodeQueueIterator", - "constructors": [ - { - "access": 0, - "descriptor": "(Ljc;)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Lfn;", - "field": "__f", - "name": "f", - "owner": "jl" - }, - { - "access": 0, - "descriptor": "Lfn;", - "field": "__q", - "name": "q", - "owner": "jl" - }, - { - "access": 0, - "descriptor": "Ljc;", - "field": "queue", - "name": "m", - "owner": "jl" - } - ], - "interfaces": [ - "java.util.Iterator" - ], - "methods": [ - { - "access": 1, - "descriptor": "()Ljava/lang/Object;", - "method": "__next_436", - "name": "next", - "owner": "jl", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "__remove_438", - "name": "remove", - "owner": "jl", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()Z", - "method": "__hasNext_437", - "name": "hasNext", - "owner": "jl", - "parameters": [] - } - ], - "name": "jl", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "IterableNodeDeque", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Lgw;", - "field": "current", - "name": "f", - "owner": "ja" - }, - { - "access": 0, - "descriptor": "Lgw;", - "field": "sentinel", - "name": "m", - "owner": "ja" - } - ], - "interfaces": [ - "java.lang.Iterable" - ], - "methods": [ - { - "access": 0, - "descriptor": "(Lgw;)Lgw;", - "method": "previousOrLast", - "name": "u", - "owner": "ja", - "parameters": [ - "node" - ] - }, - { - "access": 1, - "descriptor": "()Lgw;", - "method": "last", - "name": "o", - "owner": "ja", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()Lgw;", - "method": "previous", - "name": "g", - "owner": "ja", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()Ljava/util/Iterator;", - "method": "__iterator_432", - "name": "iterator", - "owner": "ja", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "clear", - "name": "m", - "owner": "ja", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()Z", - "method": "isEmpty", - "name": "l", - "owner": "ja" - }, - { - "access": 1, - "descriptor": "(Lgw;)V", - "method": "addFirst", - "name": "f", - "owner": "ja", - "parameters": [ - "node" - ] - }, - { - "access": 1, - "descriptor": "(Lgw;)V", - "method": "addLast", - "name": "q", - "owner": "ja", - "parameters": [ - "node" - ] - } - ], - "name": "ja", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "IterableNodeDequeDescendingIterator", - "constructors": [ - { - "access": 0, - "descriptor": "(Lja;)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Lgw;", - "field": "__f", - "name": "f", - "owner": "jt" - }, - { - "access": 0, - "descriptor": "Lgw;", - "field": "__q", - "name": "q", - "owner": "jt" - }, - { - "access": 0, - "descriptor": "Lja;", - "field": "deque", - "name": "m", - "owner": "jt" - } - ], - "interfaces": [ - "java.util.Iterator" - ], - "methods": [ - { - "access": 0, - "descriptor": "()V", - "method": "__g_440", - "name": "g", - "owner": "jt", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(Lja;)V", - "method": "__u_439", - "name": "u", - "owner": "jt", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "()Ljava/lang/Object;", - "method": "__next_441", - "name": "next", - "owner": "jt", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "__remove_443", - "name": "remove", - "owner": "jt", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()Z", - "method": "__hasNext_442", - "name": "hasNext", - "owner": "jt", - "parameters": [] - } - ], - "name": "jt", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "IterableNodeHashTableIterator", - "constructors": [ - { - "access": 0, - "descriptor": "(Llh;)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "I", - "field": "__q", - "name": "q", - "owner": "lk" - }, - { - "access": 0, - "descriptor": "Lgw;", - "field": "__f", - "name": "f", - "owner": "lk" - }, - { - "access": 0, - "descriptor": "Lgw;", - "field": "__w", - "name": "w", - "owner": "lk" - }, - { - "access": 0, - "descriptor": "Llh;", - "field": "hashTable", - "name": "m", - "owner": "lk" - } - ], - "interfaces": [ - "java.util.Iterator" - ], - "methods": [ - { - "access": 0, - "descriptor": "()V", - "method": "__u_479", - "name": "u", - "owner": "lk", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()Ljava/lang/Object;", - "method": "__next_480", - "name": "next", - "owner": "lk", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "__remove_482", - "name": "remove", - "owner": "lk", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()Z", - "method": "__hasNext_481", - "name": "hasNext", - "owner": "lk", - "parameters": [] - } - ], - "name": "lk", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "KitDefinition", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "[I", - "field": "models", - "name": "d", - "owner": "im" - }, - { - "access": 0, - "descriptor": "[I", - "field": "models2", - "name": "u", - "owner": "im" - }, - { - "access": 0, - "descriptor": "[S", - "field": "recol_d", - "name": "l", - "owner": "im" - }, - { - "access": 0, - "descriptor": "[S", - "field": "recol_s", - "name": "g", - "owner": "im" - }, - { - "access": 0, - "descriptor": "[S", - "field": "retex_d", - "name": "x", - "owner": "im" - }, - { - "access": 0, - "descriptor": "[S", - "field": "retex_s", - "name": "e", - "owner": "im" - }, - { - "access": 1, - "decoder": 1619779051, - "descriptor": "I", - "field": "bodyPart", - "name": "o", - "owner": "im" - }, - { - "access": 1, - "descriptor": "Z", - "field": "__k", - "name": "k", - "owner": "im" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lgr;II)V", - "method": "decode0", - "name": "q", - "owner": "im" - }, - { - "access": 0, - "descriptor": "(Lgr;S)V", - "method": "decode", - "name": "f", - "owner": "im" - }, - { - "access": 1, - "descriptor": "(B)Ldw;", - "method": "__g_416", - "name": "g", - "owner": "im", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(B)Ldw;", - "method": "__o_414", - "name": "o", - "owner": "im", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)Z", - "method": "__u_415", - "name": "u", - "owner": "im", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)Z", - "method": "__w_413", - "name": "w", - "owner": "im", - "parameters": [] - } - ], - "name": "im", - "super": "fn" - }, - { - "access": 33, - "class": "Link", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 1, - "descriptor": "Lgh;", - "field": "__f", - "name": "f", - "owner": "gh" - }, - { - "access": 1, - "descriptor": "Lgh;", - "field": "__m", - "name": "m", - "owner": "gh" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "()V", - "method": "remove", - "name": "m", - "owner": "gh" - } - ], - "name": "gh", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "LinkDeque", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Lgh;", - "field": "__f", - "name": "f", - "owner": "jy" - }, - { - "access": 0, - "descriptor": "Lgh;", - "field": "__m", - "name": "m", - "owner": "jy" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "()Lgh;", - "method": "__f_434", - "name": "f", - "owner": "jy", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()Lgh;", - "method": "__q_435", - "name": "q", - "owner": "jy", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(Lgh;)V", - "method": "__m_433", - "name": "m", - "owner": "jy", - "parameters": [ - "arg0" - ] - } - ], - "name": "jy", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "Login", - "constructors": [], - "fields": [], - "interfaces": [], - "methods": [], - "name": "cu", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "LoginPacket", - "constructors": [ - { - "access": 0, - "descriptor": "(II)V" - } - ], - "fields": [ - { - "access": 17, - "decoder": 1743806243, - "descriptor": "I", - "field": "id", - "name": "u", - "owner": "gl" - } - ], - "interfaces": [ - "gb" - ], - "methods": [], - "name": "gl", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "LoginType", - "constructors": [ - { - "access": 0, - "descriptor": "(IILjava/lang/String;Ljava/lang/String;)V" - }, - { - "access": 0, - "descriptor": "(IILjava/lang/String;Ljava/lang/String;Z[Llx;)V" - } - ], - "fields": [ - { - "access": 16, - "descriptor": "Ljava/lang/String;", - "field": "__d", - "name": "d", - "owner": "lx" - }, - { - "access": 17, - "decoder": -1916729379, - "descriptor": "I", - "field": "__x", - "name": "x", - "owner": "lx" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "()Ljava/lang/String;", - "method": "__toString_542", - "name": "toString", - "owner": "lx", - "parameters": [] - } - ], - "name": "lx", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "MenuAction", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1483856253, - "descriptor": "I", - "field": "opcode", - "name": "q", - "owner": "cs" - }, - { - "access": 0, - "decoder": -2057883817, - "descriptor": "I", - "field": "argument0", - "name": "w", - "owner": "cs" - }, - { - "access": 0, - "decoder": 1764645917, - "descriptor": "I", - "field": "argument2", - "name": "f", - "owner": "cs" - }, - { - "access": 0, - "decoder": 305977315, - "descriptor": "I", - "field": "argument1", - "name": "m", - "owner": "cs" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "action", - "name": "o", - "owner": "cs" - } - ], - "interfaces": [], - "methods": [], - "name": "cs", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "Message", - "constructors": [ - { - "access": 0, - "descriptor": "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": 1164592791, - "descriptor": "I", - "field": "cycle", - "name": "f", - "owner": "bm" - }, - { - "access": 0, - "decoder": 1223792995, - "descriptor": "I", - "field": "type", - "name": "q", - "owner": "bm" - }, - { - "access": 0, - "decoder": 1597147817, - "descriptor": "I", - "field": "count", - "name": "m", - "owner": "bm" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "prefix", - "name": "l", - "owner": "bm" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "sender", - "name": "w", - "owner": "bm" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "text", - "name": "e", - "owner": "bm" - }, - { - "access": 0, - "descriptor": "Lkd;", - "field": "isFromFriend0", - "name": "u", - "owner": "bm" - }, - { - "access": 0, - "descriptor": "Lkd;", - "field": "isFromIgnored0", - "name": "g", - "owner": "bm" - }, - { - "access": 0, - "descriptor": "Lkp;", - "field": "senderUsername", - "name": "o", - "owner": "bm" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)V", - "method": "clearIsFromFriend", - "name": "f", - "owner": "bm", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "clearIsFromIgnored", - "name": "o", - "owner": "bm", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "fillIsFromFriend", - "name": "w", - "owner": "bm", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", - "method": "set", - "name": "m", - "owner": "bm", - "parameters": [ - "prefix", - "sender", - "text", - "type" - ] - }, - { - "access": 0, - "descriptor": "(S)V", - "method": "fillIsFromIgnored", - "name": "g", - "owner": "bm", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(B)V", - "method": "fillSenderUsername", - "name": "l", - "owner": "bm", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(B)Z", - "method": "isFromIgnored", - "name": "u", - "owner": "bm", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(I)Z", - "method": "isFromFriend", - "name": "q", - "owner": "bm", - "parameters": [] - } - ], - "name": "bm", - "super": "fn" - }, - { - "access": 33, - "class": "Messages", - "constructors": [], - "fields": [], - "interfaces": [], - "methods": [], - "name": "cw", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "MidiFileReader", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - }, - { - "access": 0, - "descriptor": "([B)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "I", - "field": "__g", - "name": "g", - "owner": "hs" - }, - { - "access": 0, - "descriptor": "I", - "field": "division", - "name": "f", - "owner": "hs" - }, - { - "access": 0, - "descriptor": "J", - "field": "__e", - "name": "e", - "owner": "hs" - }, - { - "access": 0, - "descriptor": "Lgr;", - "field": "buffer", - "name": "m", - "owner": "hs" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__u", - "name": "u", - "owner": "hs" - }, - { - "access": 0, - "descriptor": "[I", - "field": "trackLengths", - "name": "o", - "owner": "hs" - }, - { - "access": 0, - "descriptor": "[I", - "field": "trackPositions", - "name": "w", - "owner": "hs" - }, - { - "access": 0, - "descriptor": "[I", - "field": "trackStarts", - "name": "q", - "owner": "hs" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "()I", - "method": "getPrioritizedTrack", - "name": "z", - "owner": "hs", - "parameters": [] - }, - { - "access": 0, - "descriptor": "()I", - "method": "trackCount", - "name": "w", - "owner": "hs", - "parameters": [] - }, - { - "access": 0, - "descriptor": "()V", - "method": "clear", - "name": "f", - "owner": "hs", - "parameters": [] - }, - { - "access": 0, - "descriptor": "()V", - "method": "setTrackDone", - "name": "g", - "owner": "hs", - "parameters": [] - }, - { - "access": 0, - "descriptor": "()Z", - "method": "isDone", - "name": "j", - "owner": "hs", - "parameters": [] - }, - { - "access": 0, - "descriptor": "()Z", - "method": "isReady", - "name": "q", - "owner": "hs", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)I", - "method": "readMessage", - "name": "e", - "owner": "hs", - "parameters": [ - "trackId" - ] - }, - { - "access": 0, - "descriptor": "(I)I", - "method": "readMessage0", - "name": "x", - "owner": "hs", - "parameters": [ - "trackId" - ] - }, - { - "access": 0, - "descriptor": "(I)J", - "method": "__a_372", - "name": "a", - "owner": "hs", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "gotoTrack", - "name": "o", - "owner": "hs", - "parameters": [ - "trackId" - ] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "markTrackPosition", - "name": "u", - "owner": "hs", - "parameters": [ - "trackId" - ] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "readTrackLength", - "name": "l", - "owner": "hs", - "parameters": [ - "trackId" - ] - }, - { - "access": 0, - "descriptor": "(II)I", - "method": "__d_371", - "name": "d", - "owner": "hs", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 0, - "descriptor": "(J)V", - "method": "reset", - "name": "s", - "owner": "hs" - }, - { - "access": 0, - "descriptor": "([B)V", - "method": "parse", - "name": "m", - "owner": "hs", - "parameters": [ - "midi" - ] - } - ], - "name": "hs", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "MidiPcmStream", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -7547625335559871000, - "descriptor": "J", - "field": "__ac", - "name": "ac", - "owner": "hm" - }, - { - "access": 0, - "decoder": 1450922835, - "descriptor": "I", - "field": "track", - "name": "av", - "owner": "hm" - }, - { - "access": 0, - "decoder": 2095480747, - "descriptor": "I", - "field": "__q", - "name": "q", - "owner": "hm" - }, - { - "access": 0, - "decoder": 335918727, - "descriptor": "I", - "field": "__f", - "name": "f", - "owner": "hm" - }, - { - "access": 0, - "decoder": 3736036110499629000, - "descriptor": "J", - "field": "__ay", - "name": "ay", - "owner": "hm" - }, - { - "access": 0, - "decoder": 713752539, - "descriptor": "I", - "field": "trackLength", - "name": "ar", - "owner": "hm" - }, - { - "access": 0, - "descriptor": "Lhq;", - "field": "patchStream", - "name": "ah", - "owner": "hm" - }, - { - "access": 0, - "descriptor": "Lhs;", - "field": "midiFile", - "name": "aq", - "owner": "hm" - }, - { - "access": 0, - "descriptor": "Lld;", - "field": "musicPatches", - "name": "m", - "owner": "hm" - }, - { - "access": 0, - "descriptor": "Z", - "field": "__aj", - "name": "aj", - "owner": "hm" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__b", - "name": "b", - "owner": "hm" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__c", - "name": "c", - "owner": "hm" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__d", - "name": "d", - "owner": "hm" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__e", - "name": "e", - "owner": "hm" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__g", - "name": "g", - "owner": "hm" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__h", - "name": "h", - "owner": "hm" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__k", - "name": "k", - "owner": "hm" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__l", - "name": "l", - "owner": "hm" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__n", - "name": "n", - "owner": "hm" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__o", - "name": "o", - "owner": "hm" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__p", - "name": "p", - "owner": "hm" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__r", - "name": "r", - "owner": "hm" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__u", - "name": "u", - "owner": "hm" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__x", - "name": "x", - "owner": "hm" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__y", - "name": "y", - "owner": "hm" - }, - { - "access": 0, - "descriptor": "[[Lha;", - "field": "__ag", - "name": "ag", - "owner": "hm" - }, - { - "access": 0, - "descriptor": "[[Lha;", - "field": "__v", - "name": "v", - "owner": "hm" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(B)V", - "method": "__ai_367", - "name": "ai", - "owner": "hm", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "__at_354", - "name": "at", - "owner": "hm", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(II)V", - "method": "__ab_352", - "name": "ab", - "owner": "hm", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "(II)V", - "method": "__ad_355", - "name": "ad", - "owner": "hm", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "(II)V", - "method": "__ae_353", - "name": "ae", - "owner": "hm", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "(II)V", - "method": "__ah_351", - "name": "ah", - "owner": "hm", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "(II)V", - "method": "__ap_356", - "name": "ap", - "owner": "hm", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "(II)V", - "method": "__au_357", - "name": "au", - "owner": "hm", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "(IIB)V", - "method": "__p_349", - "name": "p", - "owner": "hm", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 0, - "descriptor": "(IIB)V", - "method": "__v_350", - "name": "v", - "owner": "hm", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 0, - "descriptor": "(III)V", - "method": "__ao_358", - "name": "ao", - "owner": "hm", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 0, - "descriptor": "(III)V", - "method": "__s_343", - "name": "s", - "owner": "hm", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 0, - "descriptor": "(III)V", - "method": "__t_344", - "name": "t", - "owner": "hm", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 0, - "descriptor": "(IIIB)V", - "method": "__y_345", - "name": "y", - "owner": "hm", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 0, - "descriptor": "(IIII)V", - "method": "__b_347", - "name": "b", - "owner": "hm", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 0, - "descriptor": "(IIII)V", - "method": "__c_348", - "name": "c", - "owner": "hm", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 0, - "descriptor": "(Lha;I)I", - "method": "__aa_359", - "name": "aa", - "owner": "hm", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "(Lha;I)I", - "method": "__af_361", - "name": "af", - "owner": "hm", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "(Lha;I)I", - "method": "__ax_360", - "name": "ax", - "owner": "hm", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "(Lha;I)Z", - "method": "__ba_368", - "name": "ba", - "owner": "hm", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "(Lha;ZI)V", - "method": "__h_346", - "name": "h", - "owner": "hm", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 0, - "descriptor": "(Lha;[IIII)Z", - "method": "__bb_369", - "name": "bb", - "owner": "hm", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3" - ] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__f_341", - "name": "f", - "owner": "hm", - "parameters": [] - }, - { - "access": 33, - "descriptor": "(B)V", - "method": "clearAll", - "name": "w", - "owner": "hm", - "parameters": [] - }, - { - "access": 33, - "descriptor": "(B)V", - "method": "removeAll", - "name": "o", - "owner": "hm", - "parameters": [] - }, - { - "access": 33, - "descriptor": "(I)V", - "method": "clear", - "name": "a", - "owner": "hm", - "parameters": [] - }, - { - "access": 33, - "descriptor": "(I)Z", - "method": "isReady", - "name": "z", - "owner": "hm", - "parameters": [] - }, - { - "access": 33, - "descriptor": "(IB)V", - "method": "__m_340", - "name": "m", - "owner": "hm", - "parameters": [ - "arg0" - ] - }, - { - "access": 33, - "descriptor": "(III)V", - "method": "__j_342", - "name": "j", - "owner": "hm", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 33, - "descriptor": "(Lhe;Lir;Ldt;II)Z", - "method": "loadMusicTrack", - "name": "q", - "owner": "hm", - "parameters": [ - "frequency", - "i", - "musicTrack", - "s" - ] - }, - { - "access": 33, - "descriptor": "(Lhe;ZI)V", - "method": "setMusicTrack", - "name": "x", - "owner": "hm", - "parameters": [ - "b", - "musicTrack" - ] - }, - { - "access": 36, - "descriptor": "()I", - "method": "__l_364", - "name": "l", - "owner": "hm", - "parameters": [] - }, - { - "access": 36, - "descriptor": "()Ldc;", - "method": "__g_363", - "name": "g", - "owner": "hm", - "parameters": [] - }, - { - "access": 36, - "descriptor": "()Ldc;", - "method": "__u_362", - "name": "u", - "owner": "hm", - "parameters": [] - }, - { - "access": 36, - "descriptor": "(I)V", - "method": "__d_366", - "name": "d", - "owner": "hm", - "parameters": [ - "arg0" - ] - }, - { - "access": 36, - "descriptor": "([III)V", - "method": "__e_365", - "name": "e", - "owner": "hm", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - } - ], - "name": "hm", - "super": "dc" - }, - { - "access": 33, - "class": "MilliClock", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -8372744267470319000, - "descriptor": "J", - "field": "__w", - "name": "w", - "owner": "fd" - }, - { - "access": 0, - "decoder": 1217137493, - "descriptor": "I", - "field": "__q", - "name": "q", - "owner": "fd" - }, - { - "access": 0, - "decoder": 1940981129, - "descriptor": "I", - "field": "__f", - "name": "f", - "owner": "fd" - }, - { - "access": 0, - "decoder": 250272357, - "descriptor": "I", - "field": "__o", - "name": "o", - "owner": "fd" - }, - { - "access": 0, - "decoder": 576555527, - "descriptor": "I", - "field": "__u", - "name": "u", - "owner": "fd" - }, - { - "access": 0, - "descriptor": "[J", - "field": "__m", - "name": "m", - "owner": "fd" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "(B)V", - "method": "mark", - "name": "m", - "owner": "fd", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(III)I", - "method": "wait", - "name": "f", - "owner": "fd", - "parameters": [ - "cycleMs", - "minSleepMs" - ] - } - ], - "name": "fd", - "super": "fa" - }, - { - "access": 33, - "class": "Model", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - }, - { - "access": 1, - "descriptor": "([Ldu;I)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "B", - "field": "__y", - "name": "y", - "owner": "du" - }, - { - "access": 0, - "descriptor": "I", - "field": "__h", - "name": "h", - "owner": "du" - }, - { - "access": 0, - "descriptor": "I", - "field": "bottomY", - "name": "aj", - "owner": "du" - }, - { - "access": 0, - "descriptor": "I", - "field": "boundsType", - "name": "aq", - "owner": "du" - }, - { - "access": 0, - "descriptor": "I", - "field": "diameter", - "name": "ar", - "owner": "du" - }, - { - "access": 0, - "descriptor": "I", - "field": "indicesCount", - "name": "e", - "owner": "du" - }, - { - "access": 0, - "descriptor": "I", - "field": "radius", - "name": "ac", - "owner": "du" - }, - { - "access": 0, - "descriptor": "I", - "field": "verticesCount", - "name": "o", - "owner": "du" - }, - { - "access": 0, - "descriptor": "I", - "field": "xMid", - "name": "ay", - "owner": "du" - }, - { - "access": 0, - "descriptor": "I", - "field": "xMidOffset", - "name": "aw", - "owner": "du" - }, - { - "access": 0, - "descriptor": "I", - "field": "xzRadius", - "name": "av", - "owner": "du" - }, - { - "access": 0, - "descriptor": "I", - "field": "yMid", - "name": "ah", - "owner": "du" - }, - { - "access": 0, - "descriptor": "I", - "field": "yMidOffset", - "name": "al", - "owner": "du" - }, - { - "access": 0, - "descriptor": "I", - "field": "zMid", - "name": "ak", - "owner": "du" - }, - { - "access": 0, - "descriptor": "I", - "field": "zMidOffset", - "name": "ab", - "owner": "du" - }, - { - "access": 0, - "descriptor": "[B", - "field": "__s", - "name": "s", - "owner": "du" - }, - { - "access": 0, - "descriptor": "[B", - "field": "__z", - "name": "z", - "owner": "du" - }, - { - "access": 0, - "descriptor": "[B", - "field": "faceAlphas", - "name": "j", - "owner": "du" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__b", - "name": "b", - "owner": "du" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__c", - "name": "c", - "owner": "du" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__r", - "name": "r", - "owner": "du" - }, - { - "access": 0, - "descriptor": "[I", - "field": "faceColors1", - "name": "n", - "owner": "du" - }, - { - "access": 0, - "descriptor": "[I", - "field": "faceColors2", - "name": "i", - "owner": "du" - }, - { - "access": 0, - "descriptor": "[I", - "field": "faceColors3", - "name": "a", - "owner": "du" - }, - { - "access": 0, - "descriptor": "[I", - "field": "indices1", - "name": "x", - "owner": "du" - }, - { - "access": 0, - "descriptor": "[I", - "field": "indices2", - "name": "d", - "owner": "du" - }, - { - "access": 0, - "descriptor": "[I", - "field": "indices3", - "name": "k", - "owner": "du" - }, - { - "access": 0, - "descriptor": "[I", - "field": "verticesX", - "name": "u", - "owner": "du" - }, - { - "access": 0, - "descriptor": "[I", - "field": "verticesY", - "name": "g", - "owner": "du" - }, - { - "access": 0, - "descriptor": "[I", - "field": "verticesZ", - "name": "l", - "owner": "du" - }, - { - "access": 0, - "descriptor": "[S", - "field": "faceTextures", - "name": "t", - "owner": "du" - }, - { - "access": 0, - "descriptor": "[[I", - "field": "faceLabelsAlpha", - "name": "v", - "owner": "du" - }, - { - "access": 0, - "descriptor": "[[I", - "field": "vertexLabels", - "name": "p", - "owner": "du" - }, - { - "access": 1, - "descriptor": "Z", - "field": "isSingleTile", - "name": "ag", - "owner": "du" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "()V", - "method": "__g_232", - "name": "g", - "owner": "du", - "parameters": [] - }, - { - "access": 0, - "descriptor": "()V", - "method": "resetBounds", - "name": "x", - "owner": "du", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "calculateBoundingBox", - "name": "o", - "owner": "du", - "parameters": [ - "yaw" - ] - }, - { - "access": 0, - "descriptor": "(IIIIIIIIJ)V", - "method": "draw", - "name": "cy", - "owner": "du", - "parameters": [ - "cameraPitchCosine", - "cameraPitchSine", - "cameraYawCosine", - "cameraYawSine", - "tag", - "x", - "y", - "yaw", - "z" - ] - }, - { - "access": 0, - "descriptor": "(I[IIII)V", - "method": "transform", - "name": "z", - "owner": "du", - "parameters": [ - "labels", - "tx", - "ty", - "type", - "tz" - ] - }, - { - "access": 0, - "descriptor": "(ZLdu;[B)Ldu;", - "method": "copy0", - "name": "w", - "owner": "du" - }, - { - "access": 1, - "descriptor": "()I", - "method": "__l_233", - "name": "l", - "owner": "du", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "calculateBoundsCylinder", - "name": "u", - "owner": "du", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "rotateY180", - "name": "s", - "owner": "du", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "rotateY270Ccw", - "name": "t", - "owner": "du", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "rotateY90Ccw", - "name": "j", - "owner": "du", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "rotateZ", - "name": "y", - "owner": "du", - "parameters": [ - "pitch" - ] - }, - { - "access": 1, - "descriptor": "(III)V", - "method": "offsetBy", - "name": "h", - "owner": "du", - "parameters": [ - "x", - "y", - "z" - ] - }, - { - "access": 1, - "descriptor": "(III)V", - "method": "scale", - "name": "b", - "owner": "du", - "parameters": [ - "x", - "y", - "z" - ] - }, - { - "access": 1, - "descriptor": "(Len;I)V", - "finalArgument": -2, - "method": "animate", - "name": "d", - "owner": "du", - "parameters": [ - "frame", - "frames" - ] - }, - { - "access": 1, - "descriptor": "(Len;ILen;I[I)V", - "method": "animate2", - "name": "a", - "owner": "du" - }, - { - "access": 1, - "descriptor": "(Z)Ldu;", - "method": "toSharedSequenceModel", - "name": "f", - "owner": "du", - "parameters": [ - "b" - ] - }, - { - "access": 1, - "descriptor": "(Z)Ldu;", - "method": "toSharedSpotAnimationModel", - "name": "q", - "owner": "du", - "parameters": [ - "b" - ] - }, - { - "access": 1, - "descriptor": "([[IIIIZI)Ldu;", - "method": "__m_231", - "name": "m", - "owner": "du", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4", - "arg5" - ] - }, - { - "access": 16, - "descriptor": "(I)V", - "method": "__ag_236", - "name": "ag", - "owner": "du", - "parameters": [ - "arg0" - ] - }, - { - "access": 16, - "descriptor": "(I)V", - "method": "__aq_237", - "name": "aq", - "owner": "du", - "parameters": [ - "arg0" - ] - }, - { - "access": 16, - "descriptor": "(ZZZJ)V", - "method": "draw0", - "name": "v", - "owner": "du" - }, - { - "access": 17, - "descriptor": "(IIIIIII)V", - "method": "__c_234", - "name": "c", - "owner": "du", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4", - "arg5", - "arg6" - ] - }, - { - "access": 17, - "descriptor": "(IIIIIIII)V", - "method": "__p_235", - "name": "p", - "owner": "du", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4", - "arg5", - "arg6", - "arg7" - ] - } - ], - "name": "du", - "super": "ex" - }, - { - "access": 33, - "class": "ModelData", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - }, - { - "access": 0, - "descriptor": "([B)V" - }, - { - "access": 1, - "descriptor": "(Ldw;ZZZZ)V" - }, - { - "access": 1, - "descriptor": "([Ldw;I)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "B", - "field": "__a", - "name": "a", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "I", - "field": "__ac", - "name": "ac", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "I", - "field": "__ah", - "name": "ah", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "I", - "field": "__ak", - "name": "ak", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "I", - "field": "__ar", - "name": "ar", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "I", - "field": "__ay", - "name": "ay", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "I", - "field": "__z", - "name": "z", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "I", - "field": "faceCount", - "name": "o", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "I", - "field": "verticesCount", - "name": "m", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "Z", - "field": "isBoundsCalculated", - "name": "av", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[B", - "field": "__e", - "name": "e", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[B", - "field": "__j", - "name": "j", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[B", - "field": "__k", - "name": "k", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[B", - "field": "__x", - "name": "x", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[B", - "field": "faceAlphas", - "name": "d", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__b", - "name": "b", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__h", - "name": "h", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[I", - "field": "indices1", - "name": "u", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[I", - "field": "indices2", - "name": "g", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[I", - "field": "indices3", - "name": "l", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[I", - "field": "verticesX", - "name": "f", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[I", - "field": "verticesY", - "name": "q", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[I", - "field": "verticesZ", - "name": "w", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[Ldq;", - "field": "__ag", - "name": "ag", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[Ldq;", - "field": "__v", - "name": "v", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[Lel;", - "field": "faceNormals", - "name": "p", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[S", - "field": "__s", - "name": "s", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[S", - "field": "__t", - "name": "t", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[S", - "field": "__y", - "name": "y", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[S", - "field": "faceColors", - "name": "n", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[S", - "field": "faceTextures", - "name": "i", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[[I", - "field": "faceLabelsAlpha", - "name": "r", - "owner": "dw" - }, - { - "access": 0, - "descriptor": "[[I", - "field": "vertexLabels", - "name": "c", - "owner": "dw" - }, - { - "access": 1, - "descriptor": "S", - "field": "__aj", - "name": "aj", - "owner": "dw" - }, - { - "access": 1, - "descriptor": "S", - "field": "__aq", - "name": "aq", - "owner": "dw" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "()V", - "method": "__c_229", - "name": "c", - "owner": "dw", - "parameters": [] - }, - { - "access": 0, - "descriptor": "()V", - "method": "__g_220", - "name": "g", - "owner": "dw", - "parameters": [] - }, - { - "access": 0, - "descriptor": "()V", - "method": "invalidate", - "name": "b", - "owner": "dw", - "parameters": [] - }, - { - "access": 0, - "descriptor": "([B)V", - "method": "__f_215", - "name": "f", - "owner": "dw", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "([B)V", - "method": "__q_216", - "name": "q", - "owner": "dw", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "()Ldw;", - "method": "__o_218", - "name": "o", - "owner": "dw", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "__d_223", - "name": "d", - "owner": "dw", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "__h_228", - "name": "h", - "owner": "dw", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "__l_221", - "name": "l", - "owner": "dw", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "__t_226", - "name": "t", - "owner": "dw", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "__x_222", - "name": "x", - "owner": "dw", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "__a_224", - "name": "a", - "owner": "dw", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(III)V", - "method": "__y_227", - "name": "y", - "owner": "dw", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "(III)V", - "method": "__z_225", - "name": "z", - "owner": "dw", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "(SS)V", - "method": "recolor", - "name": "j", - "owner": "dw", - "parameters": [ - "from", - "to" - ] - }, - { - "access": 1, - "descriptor": "(SS)V", - "method": "retexture", - "name": "s", - "owner": "dw", - "parameters": [ - "from", - "to" - ] - }, - { - "access": 1, - "descriptor": "([[IIIIZI)Ldw;", - "method": "__u_219", - "name": "u", - "owner": "dw", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4", - "arg5" - ] - }, - { - "access": 16, - "descriptor": "(Ldw;I)I", - "method": "__w_217", - "name": "w", - "owner": "dw", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 17, - "descriptor": "(IIIII)Ldu;", - "method": "toModel", - "name": "v", - "owner": "dw", - "parameters": [ - "a", - "b", - "c", - "d", - "e" - ] - } - ], - "name": "dw", - "super": "ex" - }, - { - "access": 33, - "class": "ModelData0", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [], - "interfaces": [], - "methods": [], - "name": "ed", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "MouseHandler", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [], - "interfaces": [ - "java.awt.event.FocusListener", - "java.awt.event.MouseListener", - "java.awt.event.MouseMotionListener" - ], - "methods": [ - { - "access": 16, - "descriptor": "(Ljava/awt/event/MouseEvent;I)I", - "method": "getButton", - "name": "f", - "owner": "bb", - "parameters": [ - "mouseEvent" - ] - }, - { - "access": 17, - "descriptor": "(Ljava/awt/event/FocusEvent;)V", - "method": "__focusGained_119", - "name": "focusGained", - "owner": "bb", - "parameters": [ - "arg0" - ] - }, - { - "access": 17, - "descriptor": "(Ljava/awt/event/MouseEvent;)V", - "method": "__mouseClicked_115", - "name": "mouseClicked", - "owner": "bb", - "parameters": [ - "arg0" - ] - }, - { - "access": 49, - "descriptor": "(Ljava/awt/event/FocusEvent;)V", - "method": "__focusLost_120", - "name": "focusLost", - "owner": "bb", - "parameters": [ - "arg0" - ] - }, - { - "access": 49, - "descriptor": "(Ljava/awt/event/MouseEvent;)V", - "method": "__mouseDragged_118", - "name": "mouseDragged", - "owner": "bb", - "parameters": [ - "arg0" - ] - }, - { - "access": 49, - "descriptor": "(Ljava/awt/event/MouseEvent;)V", - "method": "__mouseEntered_116", - "name": "mouseEntered", - "owner": "bb", - "parameters": [ - "arg0" - ] - }, - { - "access": 49, - "descriptor": "(Ljava/awt/event/MouseEvent;)V", - "method": "__mouseExited_117", - "name": "mouseExited", - "owner": "bb", - "parameters": [ - "arg0" - ] - }, - { - "access": 49, - "descriptor": "(Ljava/awt/event/MouseEvent;)V", - "method": "__mouseReleased_114", - "name": "mouseReleased", - "owner": "bb", - "parameters": [ - "arg0" - ] - }, - { - "access": 49, - "descriptor": "(Ljava/awt/event/MouseEvent;)V", - "method": "mouseMoved", - "name": "mouseMoved", - "owner": "bb" - }, - { - "access": 49, - "descriptor": "(Ljava/awt/event/MouseEvent;)V", - "method": "mousePressed", - "name": "mousePressed", - "owner": "bb" - } - ], - "name": "bb", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "MouseRecorder", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": 973045825, - "descriptor": "I", - "field": "index", - "name": "q", - "owner": "bu" - }, - { - "access": 0, - "descriptor": "Ljava/lang/Object;", - "field": "lock", - "name": "f", - "owner": "bu" - }, - { - "access": 0, - "descriptor": "Z", - "field": "isRunning", - "name": "m", - "owner": "bu" - }, - { - "access": 0, - "descriptor": "[I", - "field": "xs", - "name": "w", - "owner": "bu" - }, - { - "access": 0, - "descriptor": "[I", - "field": "ys", - "name": "o", - "owner": "bu" - }, - { - "access": 0, - "descriptor": "[J", - "field": "millis", - "name": "u", - "owner": "bu" - } - ], - "interfaces": [ - "java.lang.Runnable" - ], - "methods": [ - { - "access": 1, - "descriptor": "()V", - "method": "__run_123", - "name": "run", - "owner": "bu", - "parameters": [] - } - ], - "name": "bu", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "MusicPatch", - "constructors": [ - { - "access": 0, - "descriptor": "([B)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": 574200865, - "descriptor": "I", - "field": "__m", - "name": "m", - "owner": "hl" - }, - { - "access": 0, - "descriptor": "[B", - "field": "__g", - "name": "g", - "owner": "hl" - }, - { - "access": 0, - "descriptor": "[B", - "field": "__o", - "name": "o", - "owner": "hl" - }, - { - "access": 0, - "descriptor": "[B", - "field": "__w", - "name": "w", - "owner": "hl" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__l", - "name": "l", - "owner": "hl" - }, - { - "access": 0, - "descriptor": "[Lcx;", - "field": "rawSounds", - "name": "f", - "owner": "hl" - }, - { - "access": 0, - "descriptor": "[Lhd;", - "field": "__u", - "name": "u", - "owner": "hl" - }, - { - "access": 0, - "descriptor": "[S", - "field": "__q", - "name": "q", - "owner": "hl" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(B)V", - "method": "clear", - "name": "q", - "owner": "hl", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(Ldt;[B[II)Z", - "method": "__f_373", - "name": "f", - "owner": "hl", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - } - ], - "name": "hl", - "super": "gw" - }, - { - "access": 33, - "class": "MusicPatchNode", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1520706641, - "descriptor": "I", - "field": "__x", - "name": "x", - "owner": "ha" - }, - { - "access": 0, - "decoder": -2058553171, - "descriptor": "I", - "field": "__o", - "name": "o", - "owner": "ha" - }, - { - "access": 0, - "decoder": -2083252379, - "descriptor": "I", - "field": "__a", - "name": "a", - "owner": "ha" - }, - { - "access": 0, - "decoder": -2136855685, - "descriptor": "I", - "field": "__i", - "name": "i", - "owner": "ha" - }, - { - "access": 0, - "decoder": -308599455, - "descriptor": "I", - "field": "__l", - "name": "l", - "owner": "ha" - }, - { - "access": 0, - "decoder": -439388365, - "descriptor": "I", - "field": "__k", - "name": "k", - "owner": "ha" - }, - { - "access": 0, - "decoder": -471899285, - "descriptor": "I", - "field": "__e", - "name": "e", - "owner": "ha" - }, - { - "access": 0, - "decoder": -666877449, - "descriptor": "I", - "field": "__y", - "name": "y", - "owner": "ha" - }, - { - "access": 0, - "decoder": -836502917, - "descriptor": "I", - "field": "__g", - "name": "g", - "owner": "ha" - }, - { - "access": 0, - "decoder": -852988281, - "descriptor": "I", - "field": "__d", - "name": "d", - "owner": "ha" - }, - { - "access": 0, - "decoder": 1359854411, - "descriptor": "I", - "field": "__b", - "name": "b", - "owner": "ha" - }, - { - "access": 0, - "decoder": 1605236771, - "descriptor": "I", - "field": "__z", - "name": "z", - "owner": "ha" - }, - { - "access": 0, - "decoder": 173672931, - "descriptor": "I", - "field": "__j", - "name": "j", - "owner": "ha" - }, - { - "access": 0, - "decoder": 219840779, - "descriptor": "I", - "field": "__s", - "name": "s", - "owner": "ha" - }, - { - "access": 0, - "decoder": 476852577, - "descriptor": "I", - "field": "__n", - "name": "n", - "owner": "ha" - }, - { - "access": 0, - "decoder": 62958303, - "descriptor": "I", - "field": "__u", - "name": "u", - "owner": "ha" - }, - { - "access": 0, - "decoder": 801157533, - "descriptor": "I", - "field": "__m", - "name": "m", - "owner": "ha" - }, - { - "access": 0, - "descriptor": "Lcx;", - "field": "rawSound", - "name": "q", - "owner": "ha" - }, - { - "access": 0, - "descriptor": "Lds;", - "field": "stream", - "name": "t", - "owner": "ha" - }, - { - "access": 0, - "descriptor": "Lhd;", - "field": "__w", - "name": "w", - "owner": "ha" - }, - { - "access": 0, - "descriptor": "Lhl;", - "field": "patch", - "name": "f", - "owner": "ha" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(B)V", - "method": "__m_370", - "name": "m", - "owner": "ha", - "parameters": [] - } - ], - "name": "ha", - "super": "gw" - }, - { - "access": 33, - "class": "MusicPatchNode2", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1455145595, - "descriptor": "I", - "field": "__o", - "name": "o", - "owner": "hd" - }, - { - "access": 0, - "decoder": -249046051, - "descriptor": "I", - "field": "__w", - "name": "w", - "owner": "hd" - }, - { - "access": 0, - "decoder": 140046797, - "descriptor": "I", - "field": "__q", - "name": "q", - "owner": "hd" - }, - { - "access": 0, - "decoder": 1577527995, - "descriptor": "I", - "field": "__u", - "name": "u", - "owner": "hd" - }, - { - "access": 0, - "decoder": 1984131473, - "descriptor": "I", - "field": "__e", - "name": "e", - "owner": "hd" - }, - { - "access": 0, - "decoder": 320761691, - "descriptor": "I", - "field": "__l", - "name": "l", - "owner": "hd" - }, - { - "access": 0, - "decoder": 391670135, - "descriptor": "I", - "field": "__g", - "name": "g", - "owner": "hd" - }, - { - "access": 0, - "descriptor": "[B", - "field": "__f", - "name": "f", - "owner": "hd" - }, - { - "access": 0, - "descriptor": "[B", - "field": "__m", - "name": "m", - "owner": "hd" - } - ], - "interfaces": [], - "methods": [], - "name": "hd", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "MusicPatchPcmStream", - "constructors": [ - { - "access": 0, - "descriptor": "(Lhm;)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Lct;", - "field": "mixer", - "name": "q", - "owner": "hq" - }, - { - "access": 0, - "descriptor": "Lhm;", - "field": "superStream", - "name": "m", - "owner": "hq" - }, - { - "access": 0, - "descriptor": "Lje;", - "field": "queue", - "name": "f", - "owner": "hq" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lha;II)V", - "method": "__f_380", - "name": "f", - "owner": "hq", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 0, - "descriptor": "(Lha;[IIIII)V", - "method": "__m_379", - "name": "m", - "owner": "hq", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4" - ] - }, - { - "access": 4, - "descriptor": "()I", - "method": "__l_376", - "name": "l", - "owner": "hq", - "parameters": [] - }, - { - "access": 4, - "descriptor": "()Ldc;", - "method": "__g_375", - "name": "g", - "owner": "hq", - "parameters": [] - }, - { - "access": 4, - "descriptor": "()Ldc;", - "method": "__u_374", - "name": "u", - "owner": "hq", - "parameters": [] - }, - { - "access": 4, - "descriptor": "(I)V", - "method": "__d_378", - "name": "d", - "owner": "hq", - "parameters": [ - "arg0" - ] - }, - { - "access": 4, - "descriptor": "([III)V", - "method": "__e_377", - "name": "e", - "owner": "hq", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - } - ], - "name": "hq", - "super": "dc" - }, - { - "access": 33, - "class": "MusicSample", - "constructors": [ - { - "access": 0, - "descriptor": "([B)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "I", - "field": "__ah", - "name": "ah", - "owner": "cd" - }, - { - "access": 0, - "descriptor": "I", - "field": "__ay", - "name": "ay", - "owner": "cd" - }, - { - "access": 0, - "descriptor": "I", - "field": "__h", - "name": "h", - "owner": "cd" - }, - { - "access": 0, - "descriptor": "I", - "field": "__y", - "name": "y", - "owner": "cd" - }, - { - "access": 0, - "descriptor": "I", - "field": "end", - "name": "o", - "owner": "cd" - }, - { - "access": 0, - "descriptor": "I", - "field": "sampleCount", - "name": "q", - "owner": "cd" - }, - { - "access": 0, - "descriptor": "I", - "field": "sampleRate", - "name": "f", - "owner": "cd" - }, - { - "access": 0, - "descriptor": "I", - "field": "start", - "name": "w", - "owner": "cd" - }, - { - "access": 0, - "descriptor": "Z", - "field": "__b", - "name": "b", - "owner": "cd" - }, - { - "access": 0, - "descriptor": "Z", - "field": "__u", - "name": "u", - "owner": "cd" - }, - { - "access": 0, - "descriptor": "[B", - "field": "samples", - "name": "ac", - "owner": "cd" - }, - { - "access": 0, - "descriptor": "[F", - "field": "__t", - "name": "t", - "owner": "cd" - }, - { - "access": 0, - "descriptor": "[[B", - "field": "__m", - "name": "m", - "owner": "cd" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)[F", - "method": "__g_175", - "name": "g", - "owner": "cd", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "([B)V", - "method": "read", - "name": "o", - "owner": "cd" - }, - { - "access": 0, - "descriptor": "([I)Lcx;", - "method": "toRawSound", - "name": "x", - "owner": "cd" - } - ], - "name": "cd", - "super": "gw" - }, - { - "access": 33, - "class": "MusicTrack", - "constructors": [ - { - "access": 0, - "descriptor": "(Lgr;)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Lld;", - "field": "table", - "name": "m", - "owner": "he" - }, - { - "access": 0, - "descriptor": "[B", - "field": "midi", - "name": "f", - "owner": "he" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "()V", - "method": "__f_381", - "name": "f", - "owner": "he", - "parameters": [] - }, - { - "access": 0, - "descriptor": "()V", - "method": "clear", - "name": "q", - "owner": "he", - "parameters": [] - } - ], - "name": "he", - "super": "gw" - }, - { - "access": 33, - "class": "NanoClock", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": 7586221391557635000, - "descriptor": "J", - "field": "lastTimeNano", - "name": "m", - "owner": "fp" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "(B)V", - "method": "mark", - "name": "m", - "owner": "fp", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(III)I", - "method": "wait", - "name": "f", - "owner": "fp", - "parameters": [ - "cycleMs", - "minSleepMs" - ] - } - ], - "name": "fp", - "super": "fa" - }, - { - "access": 33, - "class": "NetCache", - "constructors": [], - "fields": [], - "interfaces": [], - "methods": [], - "name": "iq", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "NetFileRequest", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 1, - "decoder": 1487103265, - "descriptor": "I", - "field": "crc", - "name": "f", - "owner": "iz" - }, - { - "access": 1, - "descriptor": "B", - "field": "padding", - "name": "q", - "owner": "iz" - }, - { - "access": 1, - "descriptor": "Lit;", - "field": "archive", - "name": "m", - "owner": "iz" - } - ], - "interfaces": [], - "methods": [], - "name": "iz", - "super": "fn" - }, - { - "access": 33, - "class": "Node", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 1, - "descriptor": "J", - "field": "key", - "name": "cl", - "owner": "gw" - }, - { - "access": 1, - "descriptor": "Lgw;", - "field": "next", - "name": "cz", - "owner": "gw" - }, - { - "access": 1, - "descriptor": "Lgw;", - "field": "previous", - "name": "ct", - "owner": "gw" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "()V", - "method": "remove", - "name": "es", - "owner": "gw", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()Z", - "method": "hasNext", - "name": "eg", - "owner": "gw", - "parameters": [] - } - ], - "name": "gw", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "NodeDeque", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Lgw;", - "field": "current", - "name": "f", - "owner": "je" - }, - { - "access": 1, - "descriptor": "Lgw;", - "field": "sentinel", - "name": "m", - "owner": "je" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "()Lgw;", - "method": "first", - "name": "l", - "owner": "je", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()Lgw;", - "method": "last", - "name": "g", - "owner": "je", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()Lgw;", - "method": "next", - "name": "x", - "owner": "je", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()Lgw;", - "method": "previous", - "name": "e", - "owner": "je", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()Lgw;", - "method": "removeFirst", - "name": "u", - "owner": "je", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()Lgw;", - "method": "removeLast", - "name": "o", - "owner": "je", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "clear", - "name": "m", - "owner": "je", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(Lgw;)V", - "method": "addFirst", - "name": "f", - "owner": "je", - "parameters": [ - "node" - ] - }, - { - "access": 1, - "descriptor": "(Lgw;)V", - "method": "addLast", - "name": "q", - "owner": "je", - "parameters": [ - "node" - ] - } - ], - "name": "je", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "NpcDefinition", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1235927151, - "descriptor": "I", - "field": "__ag", - "name": "ag", - "owner": "jz" - }, - { - "access": 0, - "decoder": -1469219067, - "descriptor": "I", - "field": "resizeh", - "name": "r", - "owner": "jz" - }, - { - "access": 0, - "decoder": 1011388197, - "descriptor": "I", - "field": "transformVarbit", - "name": "ac", - "owner": "jz" - }, - { - "access": 0, - "decoder": 1390683537, - "descriptor": "I", - "field": "resizev", - "name": "p", - "owner": "jz" - }, - { - "access": 0, - "decoder": 1631362233, - "descriptor": "I", - "field": "transformVarp", - "name": "ay", - "owner": "jz" - }, - { - "access": 0, - "decoder": 1962875903, - "descriptor": "I", - "field": "__aq", - "name": "aq", - "owner": "jz" - }, - { - "access": 0, - "descriptor": "Llh;", - "field": "params", - "name": "al", - "owner": "jz" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__e", - "name": "e", - "owner": "jz" - }, - { - "access": 0, - "descriptor": "[I", - "field": "models", - "name": "l", - "owner": "jz" - }, - { - "access": 0, - "descriptor": "[S", - "field": "recol_d", - "name": "s", - "owner": "jz" - }, - { - "access": 0, - "descriptor": "[S", - "field": "recol_s", - "name": "j", - "owner": "jz" - }, - { - "access": 0, - "descriptor": "[S", - "field": "retex_d", - "name": "y", - "owner": "jz" - }, - { - "access": 0, - "descriptor": "[S", - "field": "retex_s", - "name": "t", - "owner": "jz" - }, - { - "access": 1, - "decoder": -1213774321, - "descriptor": "I", - "field": "walkleftanim", - "name": "a", - "owner": "jz" - }, - { - "access": 1, - "decoder": -1541308911, - "descriptor": "I", - "field": "size", - "name": "g", - "owner": "jz" - }, - { - "access": 1, - "decoder": -1937346627, - "descriptor": "I", - "field": "id", - "name": "o", - "owner": "jz" - }, - { - "access": 1, - "decoder": -284110917, - "descriptor": "I", - "field": "walkanim", - "name": "n", - "owner": "jz" - }, - { - "access": 1, - "decoder": -506638747, - "descriptor": "I", - "field": "__av", - "name": "av", - "owner": "jz" - }, - { - "access": 1, - "decoder": -96930503, - "descriptor": "I", - "field": "walkrightanim", - "name": "z", - "owner": "jz" - }, - { - "access": 1, - "decoder": 1192179847, - "descriptor": "I", - "field": "combatLevel", - "name": "c", - "owner": "jz" - }, - { - "access": 1, - "decoder": 1311553413, - "descriptor": "I", - "field": "turnrightanim", - "name": "k", - "owner": "jz" - }, - { - "access": 1, - "decoder": 1952230339, - "descriptor": "I", - "field": "walkbackanim", - "name": "i", - "owner": "jz" - }, - { - "access": 1, - "decoder": 235824283, - "descriptor": "I", - "field": "headIconPrayer", - "name": "aj", - "owner": "jz" - }, - { - "access": 1, - "decoder": 275200787, - "descriptor": "I", - "field": "readyanim", - "name": "x", - "owner": "jz" - }, - { - "access": 1, - "decoder": 819690597, - "descriptor": "I", - "field": "turnleftanim", - "name": "d", - "owner": "jz" - }, - { - "access": 1, - "descriptor": "Ljava/lang/String;", - "field": "name", - "name": "u", - "owner": "jz" - }, - { - "access": 1, - "descriptor": "Z", - "field": "__ak", - "name": "ak", - "owner": "jz" - }, - { - "access": 1, - "descriptor": "Z", - "field": "__v", - "name": "v", - "owner": "jz" - }, - { - "access": 1, - "descriptor": "Z", - "field": "drawMapDot", - "name": "b", - "owner": "jz" - }, - { - "access": 1, - "descriptor": "Z", - "field": "isFollower", - "name": "aw", - "owner": "jz" - }, - { - "access": 1, - "descriptor": "Z", - "field": "isInteractable", - "name": "ah", - "owner": "jz" - }, - { - "access": 1, - "descriptor": "[I", - "field": "transforms", - "name": "ar", - "owner": "jz" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/String;", - "field": "op", - "name": "h", - "owner": "jz" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)V", - "method": "postDecode", - "name": "q", - "owner": "jz", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(Lgr;I)V", - "method": "decode", - "name": "w", - "owner": "jz" - }, - { - "access": 0, - "descriptor": "(Lgr;IB)V", - "method": "decode0", - "name": "o", - "owner": "jz" - }, - { - "access": 1, - "descriptor": "(I)Z", - "method": "__e_431", - "name": "e", - "owner": "jz", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(III)I", - "method": "getIntParam", - "name": "x", - "owner": "jz" - }, - { - "access": 1, - "descriptor": "(ILjava/lang/String;I)Ljava/lang/String;", - "method": "getStringParam", - "name": "d", - "owner": "jz" - }, - { - "access": 17, - "descriptor": "(B)Ljz;", - "method": "transform", - "name": "l", - "owner": "jz", - "parameters": [] - }, - { - "access": 17, - "descriptor": "(I)Ldw;", - "method": "getModelData", - "name": "g", - "owner": "jz", - "parameters": [] - }, - { - "access": 17, - "descriptor": "(Ljh;ILjh;II)Ldu;", - "method": "getModel", - "name": "u", - "owner": "jz", - "parameters": [ - "n1", - "n2", - "s1", - "s2" - ] - } - ], - "name": "jz", - "super": "fn" - }, - { - "access": 33, - "class": "ObjectDefinition", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1509832827, - "descriptor": "I", - "field": "modelSizeX", - "name": "ah", - "owner": "jr" - }, - { - "access": 0, - "decoder": -1720702573, - "descriptor": "I", - "field": "offsetHeight", - "name": "ab", - "owner": "jr" - }, - { - "access": 0, - "decoder": -2119965579, - "descriptor": "I", - "field": "transformVarp", - "name": "an", - "owner": "jr" - }, - { - "access": 0, - "decoder": -216646581, - "descriptor": "I", - "field": "contrast", - "name": "aq", - "owner": "jr" - }, - { - "access": 0, - "decoder": -268374709, - "descriptor": "I", - "field": "clipType", - "name": "b", - "owner": "jr" - }, - { - "access": 0, - "decoder": 1136644531, - "descriptor": "I", - "field": "transformVarbit", - "name": "am", - "owner": "jr" - }, - { - "access": 0, - "decoder": 1746573233, - "descriptor": "I", - "field": "modelSizeY", - "name": "aw", - "owner": "jr" - }, - { - "access": 0, - "decoder": 511434049, - "descriptor": "I", - "field": "modelHeight", - "name": "ak", - "owner": "jr" - }, - { - "access": 0, - "decoder": 533219139, - "descriptor": "I", - "field": "ambient", - "name": "ag", - "owner": "jr" - }, - { - "access": 0, - "decoder": 818611483, - "descriptor": "I", - "field": "offsetY", - "name": "ae", - "owner": "jr" - }, - { - "access": 0, - "decoder": 967376007, - "descriptor": "I", - "field": "offsetX", - "name": "al", - "owner": "jr" - }, - { - "access": 0, - "descriptor": "Llh;", - "field": "params", - "name": "af", - "owner": "jr" - }, - { - "access": 0, - "descriptor": "Z", - "field": "isRotated", - "name": "ac", - "owner": "jr" - }, - { - "access": 0, - "descriptor": "Z", - "field": "isSolid", - "name": "ad", - "owner": "jr" - }, - { - "access": 0, - "descriptor": "Z", - "field": "nonFlatShading", - "name": "c", - "owner": "jr" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__d", - "name": "d", - "owner": "jr" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__x", - "name": "x", - "owner": "jr" - }, - { - "access": 0, - "descriptor": "[S", - "field": "recol_d", - "name": "i", - "owner": "jr" - }, - { - "access": 0, - "descriptor": "[S", - "field": "recol_s", - "name": "n", - "owner": "jr" - }, - { - "access": 0, - "descriptor": "[S", - "field": "retex_d", - "name": "z", - "owner": "jr" - }, - { - "access": 0, - "descriptor": "[S", - "field": "retex_s", - "name": "a", - "owner": "jr" - }, - { - "access": 1, - "decoder": -1018236769, - "descriptor": "I", - "field": "animationId", - "name": "p", - "owner": "jr" - }, - { - "access": 1, - "decoder": -1519592967, - "descriptor": "I", - "field": "int5", - "name": "ao", - "owner": "jr" - }, - { - "access": 1, - "decoder": -1737602209, - "descriptor": "I", - "field": "mapIconId", - "name": "av", - "owner": "jr" - }, - { - "access": 1, - "decoder": -1990510197, - "descriptor": "I", - "field": "int4", - "name": "au", - "owner": "jr" - }, - { - "access": 1, - "decoder": -2034835389, - "descriptor": "I", - "field": "id", - "name": "e", - "owner": "jr" - }, - { - "access": 1, - "decoder": -301273619, - "descriptor": "I", - "field": "sizeY", - "name": "s", - "owner": "jr" - }, - { - "access": 1, - "decoder": -324183669, - "descriptor": "I", - "field": "mapSceneId", - "name": "ar", - "owner": "jr" - }, - { - "access": 1, - "decoder": -553719901, - "descriptor": "I", - "field": "interactType", - "name": "t", - "owner": "jr" - }, - { - "access": 1, - "decoder": 1201773735, - "descriptor": "I", - "field": "int6", - "name": "aa", - "owner": "jr" - }, - { - "access": 1, - "decoder": 1419333853, - "descriptor": "I", - "field": "int1", - "name": "h", - "owner": "jr" - }, - { - "access": 1, - "decoder": 1455451843, - "descriptor": "I", - "field": "int3", - "name": "ap", - "owner": "jr" - }, - { - "access": 1, - "decoder": 374616127, - "descriptor": "I", - "field": "ambientSoundId", - "name": "az", - "owner": "jr" - }, - { - "access": 1, - "decoder": 713665805, - "descriptor": "I", - "field": "int2", - "name": "v", - "owner": "jr" - }, - { - "access": 1, - "decoder": 998026479, - "descriptor": "I", - "field": "sizeX", - "name": "j", - "owner": "jr" - }, - { - "access": 1, - "descriptor": "Ljava/lang/String;", - "field": "name", - "name": "k", - "owner": "jr" - }, - { - "access": 1, - "descriptor": "Z", - "field": "boolean1", - "name": "y", - "owner": "jr" - }, - { - "access": 1, - "descriptor": "Z", - "field": "boolean2", - "name": "at", - "owner": "jr" - }, - { - "access": 1, - "descriptor": "Z", - "field": "clipped", - "name": "ay", - "owner": "jr" - }, - { - "access": 1, - "descriptor": "Z", - "field": "modelClipped", - "name": "r", - "owner": "jr" - }, - { - "access": 1, - "descriptor": "[I", - "field": "__ax", - "name": "ax", - "owner": "jr" - }, - { - "access": 1, - "descriptor": "[I", - "field": "transforms", - "name": "as", - "owner": "jr" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/String;", - "field": "op", - "name": "aj", - "owner": "jr" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)V", - "method": "postDecode", - "name": "q", - "owner": "jr", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(Lgr;I)V", - "method": "decode", - "name": "w", - "owner": "jr" - }, - { - "access": 0, - "descriptor": "(Lgr;II)V", - "method": "decode0", - "name": "o", - "owner": "jr" - }, - { - "access": 1, - "descriptor": "(I)Z", - "method": "__t_424", - "name": "t", - "owner": "jr", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(IIB)I", - "method": "getIntParam", - "name": "z", - "owner": "jr" - }, - { - "access": 1, - "descriptor": "(ILjava/lang/String;I)Ljava/lang/String;", - "method": "getStringParam", - "name": "j", - "owner": "jr" - }, - { - "access": 16, - "descriptor": "(IIB)Ldw;", - "method": "getModelData", - "name": "d", - "owner": "jr", - "parameters": [ - "m", - "n" - ] - }, - { - "access": 17, - "descriptor": "(B)Ljr;", - "method": "transform", - "name": "a", - "owner": "jr", - "parameters": [] - }, - { - "access": 17, - "descriptor": "(I)Z", - "method": "__g_422", - "name": "g", - "owner": "jr", - "parameters": [] - }, - { - "access": 17, - "descriptor": "(II)Z", - "method": "__u_421", - "name": "u", - "owner": "jr", - "parameters": [ - "arg0" - ] - }, - { - "access": 17, - "descriptor": "(II[[IIIIB)Ldu;", - "method": "getModel", - "name": "e", - "owner": "jr" - }, - { - "access": 17, - "descriptor": "(II[[IIIILjh;II)Ldu;", - "method": "getModelDynamic", - "name": "x", - "owner": "jr" - }, - { - "access": 17, - "descriptor": "(II[[IIIIS)Lex;", - "method": "__l_423", - "name": "l", - "owner": "jr", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4", - "arg5" - ] - } - ], - "name": "jr", - "super": "fn" - }, - { - "access": 33, - "class": "ObjectNode", - "constructors": [ - { - "access": 1, - "descriptor": "(Ljava/lang/Object;)V" - } - ], - "fields": [ - { - "access": 17, - "descriptor": "Ljava/lang/Object;", - "field": "obj", - "name": "m", - "owner": "fk" - } - ], - "interfaces": [], - "methods": [], - "name": "fk", - "super": "gw" - }, - { - "access": 33, - "class": "OwnWorldComparator", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Z", - "field": "__m", - "name": "m", - "owner": "bj" - } - ], - "interfaces": [ - "java.util.Comparator" - ], - "methods": [ - { - "access": 0, - "descriptor": "(Ll;Ll;B)I", - "method": "__m_132", - "name": "m", - "owner": "bj", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;)Z", - "method": "__equals_134", - "name": "equals", - "owner": "bj", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", - "method": "__compare_133", - "name": "compare", - "owner": "bj", - "parameters": [ - "arg0", - "arg1" - ] - } - ], - "name": "bj", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "PacketBufferNode", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 1, - "decoder": -2051819203, - "descriptor": "I", - "field": "__w", - "name": "w", - "owner": "gg" - }, - { - "access": 1, - "decoder": 1433542775, - "descriptor": "I", - "field": "__f", - "name": "f", - "owner": "gg" - }, - { - "access": 1, - "descriptor": "Lgs;", - "field": "__m", - "name": "m", - "owner": "gg" - }, - { - "access": 1, - "descriptor": "Lhx;", - "field": "packetBuffer", - "name": "q", - "owner": "gg" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "(I)V", - "method": "__f_292", - "name": "f", - "owner": "gg", - "parameters": [] - } - ], - "name": "gg", - "super": "gw" - }, - { - "access": 33, - "class": "PacketWriter", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1028046199, - "descriptor": "I", - "field": "__q", - "name": "q", - "owner": "cl" - }, - { - "access": 0, - "decoder": -1986766063, - "descriptor": "I", - "field": "serverPacket0Length", - "name": "l", - "owner": "cl" - }, - { - "access": 0, - "decoder": 120570975, - "descriptor": "I", - "field": "__x", - "name": "x", - "owner": "cl" - }, - { - "access": 0, - "decoder": 1672229609, - "descriptor": "I", - "field": "__d", - "name": "d", - "owner": "cl" - }, - { - "access": 0, - "descriptor": "Lfu;", - "field": "socket0", - "name": "m", - "owner": "cl" - }, - { - "access": 0, - "descriptor": "Lge;", - "field": "__i", - "name": "i", - "owner": "cl" - }, - { - "access": 0, - "descriptor": "Lge;", - "field": "__k", - "name": "k", - "owner": "cl" - }, - { - "access": 0, - "descriptor": "Lge;", - "field": "__n", - "name": "n", - "owner": "cl" - }, - { - "access": 0, - "descriptor": "Lge;", - "field": "serverPacket0", - "name": "g", - "owner": "cl" - }, - { - "access": 0, - "descriptor": "Lgr;", - "field": "buffer", - "name": "w", - "owner": "cl" - }, - { - "access": 0, - "descriptor": "Lhx;", - "field": "packetBuffer", - "name": "u", - "owner": "cl" - }, - { - "access": 0, - "descriptor": "Lja;", - "field": "packetBufferNodes", - "name": "f", - "owner": "cl" - }, - { - "access": 0, - "descriptor": "Z", - "field": "__e", - "name": "e", - "owner": "cl" - }, - { - "access": 1, - "descriptor": "Lhn;", - "field": "isaacCipher", - "name": "o", - "owner": "cl" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(B)V", - "method": "removeSocket", - "name": "u", - "owner": "cl", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)Lfu;", - "method": "getSocket", - "name": "g", - "owner": "cl", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "close", - "name": "o", - "owner": "cl", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(Lfu;B)V", - "method": "setSocket", - "name": "w", - "owner": "cl", - "parameters": [ - "socket" - ] - }, - { - "access": 16, - "descriptor": "(I)V", - "method": "__f_166", - "name": "f", - "owner": "cl", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(I)V", - "method": "__m_165", - "name": "m", - "owner": "cl", - "parameters": [] - }, - { - "access": 17, - "descriptor": "(Lgg;I)V", - "method": "__q_167", - "name": "q", - "owner": "cl", - "parameters": [ - "arg0" - ] - } - ], - "name": "cl", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "ParamDefinition", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "C", - "field": "type", - "name": "q", - "owner": "jb" - }, - { - "access": 0, - "descriptor": "Z", - "field": "autodisable", - "name": "u", - "owner": "jb" - }, - { - "access": 1, - "decoder": 1133042753, - "descriptor": "I", - "field": "defaultint", - "name": "w", - "owner": "jb" - }, - { - "access": 1, - "descriptor": "Ljava/lang/String;", - "field": "defaultstr", - "name": "o", - "owner": "jb" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(B)V", - "method": "postDecode", - "name": "f", - "owner": "jb", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(Lgr;I)V", - "method": "decode", - "name": "q", - "owner": "jb" - }, - { - "access": 0, - "descriptor": "(Lgr;II)V", - "method": "decode0", - "name": "w", - "owner": "jb" - }, - { - "access": 1, - "descriptor": "(I)Z", - "method": "isString", - "name": "o", - "owner": "jb" - } - ], - "name": "jb", - "super": "fn" - }, - { - "access": 33, - "class": "PcmPlayer", - "constructors": [ - { - "access": 4, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1586398263, - "descriptor": "I", - "field": "nextPosition", - "name": "r", - "owner": "co" - }, - { - "access": 0, - "decoder": -1671644011, - "descriptor": "I", - "field": "capacity", - "name": "s", - "owner": "co" - }, - { - "access": 0, - "decoder": -200656835998283420, - "descriptor": "J", - "field": "retryTimeMs", - "name": "h", - "owner": "co" - }, - { - "access": 0, - "decoder": -645495803, - "descriptor": "I", - "field": "__ac", - "name": "ac", - "owner": "co" - }, - { - "access": 0, - "decoder": -8124323644430480000, - "descriptor": "J", - "field": "timeMs", - "name": "j", - "owner": "co" - }, - { - "access": 0, - "decoder": -8188447292076891000, - "descriptor": "J", - "field": "__p", - "name": "p", - "owner": "co" - }, - { - "access": 0, - "decoder": 1125788887, - "descriptor": "I", - "field": "__z", - "name": "z", - "owner": "co" - }, - { - "access": 0, - "decoder": 1624619697, - "descriptor": "I", - "field": "__c", - "name": "c", - "owner": "co" - }, - { - "access": 0, - "decoder": 1907203055, - "descriptor": "I", - "field": "__y", - "name": "y", - "owner": "co" - }, - { - "access": 0, - "decoder": 48658021, - "descriptor": "I", - "field": "__b", - "name": "b", - "owner": "co" - }, - { - "access": 0, - "decoder": 951871565, - "descriptor": "I", - "field": "frequency", - "name": "t", - "owner": "co" - }, - { - "access": 0, - "descriptor": "Ldc;", - "field": "stream0", - "name": "a", - "owner": "co" - }, - { - "access": 0, - "descriptor": "Z", - "field": "__v", - "name": "v", - "owner": "co" - }, - { - "access": 0, - "descriptor": "[Ldc;", - "field": "__ah", - "name": "ah", - "owner": "co" - }, - { - "access": 0, - "descriptor": "[Ldc;", - "field": "__ay", - "name": "ay", - "owner": "co" - }, - { - "access": 4, - "descriptor": "[I", - "field": "samples", - "name": "i", - "owner": "co" - } - ], - "interfaces": [], - "methods": [ - { - "access": 16, - "descriptor": "(II)V", - "method": "skip", - "name": "ak", - "owner": "co", - "parameters": [ - "length" - ] - }, - { - "access": 16, - "descriptor": "(Ldc;II)V", - "method": "__ab_177", - "name": "ab", - "owner": "co", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 16, - "descriptor": "([II)V", - "method": "fill", - "name": "aw", - "owner": "co", - "parameters": [ - "buffer", - "length" - ] - }, - { - "access": 17, - "descriptor": "(I)V", - "method": "__ac_176", - "name": "ac", - "owner": "co", - "parameters": [] - }, - { - "access": 4, - "descriptor": "()V", - "method": "write", - "name": "w", - "owner": "co", - "parameters": [] - }, - { - "access": 4, - "descriptor": "(B)I", - "method": "position", - "name": "q", - "owner": "co", - "parameters": [] - }, - { - "access": 4, - "descriptor": "(I)V", - "method": "close", - "name": "o", - "owner": "co", - "parameters": [] - }, - { - "access": 4, - "descriptor": "(I)V", - "method": "discard", - "name": "u", - "owner": "co", - "parameters": [] - }, - { - "access": 4, - "descriptor": "(I)V", - "method": "init", - "name": "m", - "owner": "co", - "parameters": [] - }, - { - "access": 4, - "descriptor": "(II)V", - "method": "open", - "name": "f", - "owner": "co", - "parameters": [ - "bufferSize" - ] - }, - { - "access": 49, - "descriptor": "(B)V", - "method": "tryDiscard", - "name": "ay", - "owner": "co", - "parameters": [] - }, - { - "access": 49, - "descriptor": "(I)V", - "method": "run", - "name": "ar", - "owner": "co", - "parameters": [] - }, - { - "access": 49, - "descriptor": "(I)V", - "method": "shutdown", - "name": "ah", - "owner": "co", - "parameters": [] - }, - { - "access": 49, - "descriptor": "(Ldc;I)V", - "method": "setStream", - "name": "av", - "owner": "co", - "parameters": [ - "stream" - ] - } - ], - "name": "co", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "PcmStreamMixer", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "I", - "field": "__o", - "name": "o", - "owner": "ct" - }, - { - "access": 0, - "descriptor": "I", - "field": "__q", - "name": "q", - "owner": "ct" - }, - { - "access": 0, - "descriptor": "Lje;", - "field": "__f", - "name": "f", - "owner": "ct" - }, - { - "access": 0, - "descriptor": "Lje;", - "field": "subStreams", - "name": "m", - "owner": "ct" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "()V", - "method": "__q_168", - "name": "q", - "owner": "ct", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "skipSubStreams", - "name": "a", - "owner": "ct", - "parameters": [ - "length" - ] - }, - { - "access": 0, - "descriptor": "(Ldf;)V", - "method": "__o_170", - "name": "o", - "owner": "ct", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "(Lgw;Ldf;)V", - "method": "__w_169", - "name": "w", - "owner": "ct", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 0, - "descriptor": "([III)V", - "method": "updateSubStreams", - "name": "x", - "owner": "ct", - "parameters": [ - "buffer", - "end", - "start" - ] - }, - { - "access": 4, - "descriptor": "()I", - "method": "__l_171", - "name": "l", - "owner": "ct", - "parameters": [] - }, - { - "access": 4, - "descriptor": "()Ldc;", - "method": "firstSubStream", - "name": "u", - "owner": "ct", - "parameters": [] - }, - { - "access": 4, - "descriptor": "()Ldc;", - "method": "nextSubStream", - "name": "g", - "owner": "ct", - "parameters": [] - }, - { - "access": 49, - "descriptor": "(I)V", - "method": "__d_173", - "name": "d", - "owner": "ct", - "parameters": [ - "arg0" - ] - }, - { - "access": 49, - "descriptor": "(Ldc;)V", - "method": "addSubStream", - "name": "m", - "owner": "ct", - "parameters": [ - "subStream" - ] - }, - { - "access": 49, - "descriptor": "(Ldc;)V", - "method": "removeSubStream", - "name": "f", - "owner": "ct", - "parameters": [ - "subStream" - ] - }, - { - "access": 49, - "descriptor": "([III)V", - "method": "__e_172", - "name": "e", - "owner": "ct", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - } - ], - "name": "ct", - "super": "dc" - }, - { - "access": 33, - "class": "PlatformInfo", - "constructors": [ - { - "access": 0, - "descriptor": "(IZIIIIIZIIIILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIIILjava/lang/String;Ljava/lang/String;[IILjava/lang/String;)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1667177301, - "descriptor": "I", - "field": "__ab", - "name": "ab", - "owner": "lb" - }, - { - "access": 0, - "decoder": -170839105, - "descriptor": "I", - "field": "__ba", - "name": "ba", - "owner": "lb" - }, - { - "access": 0, - "decoder": -1765017, - "descriptor": "I", - "field": "__ad", - "name": "ad", - "owner": "lb" - }, - { - "access": 0, - "decoder": -817941105, - "descriptor": "I", - "field": "__ap", - "name": "ap", - "owner": "lb" - }, - { - "access": 0, - "decoder": 1196598207, - "descriptor": "I", - "field": "__ai", - "name": "ai", - "owner": "lb" - }, - { - "access": 0, - "decoder": 1318366785, - "descriptor": "I", - "field": "__ay", - "name": "ay", - "owner": "lb" - }, - { - "access": 0, - "decoder": 1466207635, - "descriptor": "I", - "field": "__bn", - "name": "bn", - "owner": "lb" - }, - { - "access": 0, - "decoder": 1955966365, - "descriptor": "I", - "field": "__af", - "name": "af", - "owner": "lb" - }, - { - "access": 0, - "decoder": 2097018521, - "descriptor": "I", - "field": "__al", - "name": "al", - "owner": "lb" - }, - { - "access": 0, - "decoder": 30207059, - "descriptor": "I", - "field": "__am", - "name": "am", - "owner": "lb" - }, - { - "access": 0, - "decoder": 385109109, - "descriptor": "I", - "field": "__ae", - "name": "ae", - "owner": "lb" - }, - { - "access": 0, - "decoder": 467004305, - "descriptor": "I", - "field": "__aw", - "name": "aw", - "owner": "lb" - }, - { - "access": 0, - "decoder": 703904161, - "descriptor": "I", - "field": "__ak", - "name": "ak", - "owner": "lb" - }, - { - "access": 0, - "decoder": 871094255, - "descriptor": "I", - "field": "__ax", - "name": "ax", - "owner": "lb" - }, - { - "access": 0, - "decoder": 890109053, - "descriptor": "I", - "field": "__an", - "name": "an", - "owner": "lb" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "__aa", - "name": "aa", - "owner": "lb" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "__ao", - "name": "ao", - "owner": "lb" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "__au", - "name": "au", - "owner": "lb" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "__az", - "name": "az", - "owner": "lb" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "__bb", - "name": "bb", - "owner": "lb" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "__bk", - "name": "bk", - "owner": "lb" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "__bs", - "name": "bs", - "owner": "lb" - }, - { - "access": 0, - "descriptor": "Z", - "field": "__ah", - "name": "ah", - "owner": "lb" - }, - { - "access": 0, - "descriptor": "Z", - "field": "__at", - "name": "at", - "owner": "lb" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__bq", - "name": "bq", - "owner": "lb" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "(I)I", - "method": "size", - "name": "f", - "owner": "lb", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(Lgr;I)V", - "method": "write", - "name": "m", - "owner": "lb", - "parameters": [ - "buffer" - ] - } - ], - "name": "lb", - "super": "gw" - }, - { - "access": 33, - "class": "PlayerAppearance", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -3506189412688081400, - "descriptor": "J", - "field": "__o", - "name": "o", - "owner": "hi" - }, - { - "access": 0, - "decoder": 8217880921734028000, - "descriptor": "J", - "field": "__u", - "name": "u", - "owner": "hi" - }, - { - "access": 0, - "descriptor": "[I", - "field": "bodyColors", - "name": "f", - "owner": "hi" - }, - { - "access": 0, - "descriptor": "[I", - "field": "equipment", - "name": "m", - "owner": "hi" - }, - { - "access": 1, - "decoder": 1676934923, - "descriptor": "I", - "field": "npcTransformId", - "name": "w", - "owner": "hi" - }, - { - "access": 1, - "descriptor": "Z", - "field": "isFemale", - "name": "q", - "owner": "hi" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(B)V", - "method": "__u_390", - "name": "u", - "owner": "hi", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)Ldw;", - "method": "getModelData", - "name": "l", - "owner": "hi", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(B)I", - "method": "getChatHeadId", - "name": "e", - "owner": "hi", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(IZI)V", - "method": "__f_386", - "name": "f", - "owner": "hi", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(IZI)V", - "method": "__q_387", - "name": "q", - "owner": "hi", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(Lgr;I)V", - "method": "__o_389", - "name": "o", - "owner": "hi", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(Ljh;ILjh;II)Ldu;", - "method": "getModel", - "name": "g", - "owner": "hi" - }, - { - "access": 1, - "descriptor": "(ZB)V", - "method": "__w_388", - "name": "w", - "owner": "hi", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "([I[IZII)V", - "method": "__m_385", - "name": "m", - "owner": "hi", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3" - ] - } - ], - "name": "hi", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "PlayerType", - "constructors": [ - { - "access": 0, - "descriptor": "(IIZZZ)V" - } - ], - "fields": [ - { - "access": 16, - "decoder": 1999564657, - "descriptor": "I", - "field": "id", - "name": "g", - "owner": "ij" - }, - { - "access": 17, - "decoder": 613822977, - "descriptor": "I", - "field": "modIcon", - "name": "l", - "owner": "ij" - }, - { - "access": 17, - "descriptor": "Z", - "field": "isPrivileged", - "name": "e", - "owner": "ij" - }, - { - "access": 17, - "descriptor": "Z", - "field": "isUser", - "name": "x", - "owner": "ij" - } - ], - "interfaces": [ - "gc" - ], - "methods": [ - { - "access": 1, - "descriptor": "(B)I", - "method": "__f_391", - "name": "f", - "owner": "ij", - "parameters": [] - } - ], - "name": "ij", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "Players", - "constructors": [], - "fields": [], - "interfaces": [], - "methods": [], - "name": "cq", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "Rasterizer2D", - "constructors": [ - { - "access": 4, - "descriptor": "()V" - } - ], - "fields": [], - "interfaces": [], - "methods": [], - "name": "lf", - "super": "fn" - }, - { - "access": 33, - "class": "Rasterizer3D", - "constructors": [], - "fields": [], - "interfaces": [], - "methods": [], - "name": "et", - "super": "lf" - }, - { - "access": 33, - "class": "RawPcmStream", - "constructors": [ - { - "access": 0, - "descriptor": "(Lcx;II)V" - }, - { - "access": 0, - "descriptor": "(Lcx;III)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "I", - "field": "__a", - "name": "a", - "owner": "ds" - }, - { - "access": 0, - "descriptor": "I", - "field": "__e", - "name": "e", - "owner": "ds" - }, - { - "access": 0, - "descriptor": "I", - "field": "__f", - "name": "f", - "owner": "ds" - }, - { - "access": 0, - "descriptor": "I", - "field": "__g", - "name": "g", - "owner": "ds" - }, - { - "access": 0, - "descriptor": "I", - "field": "__i", - "name": "i", - "owner": "ds" - }, - { - "access": 0, - "descriptor": "I", - "field": "__l", - "name": "l", - "owner": "ds" - }, - { - "access": 0, - "descriptor": "I", - "field": "__m", - "name": "m", - "owner": "ds" - }, - { - "access": 0, - "descriptor": "I", - "field": "__n", - "name": "n", - "owner": "ds" - }, - { - "access": 0, - "descriptor": "I", - "field": "__o", - "name": "o", - "owner": "ds" - }, - { - "access": 0, - "descriptor": "I", - "field": "__q", - "name": "q", - "owner": "ds" - }, - { - "access": 0, - "descriptor": "I", - "field": "__u", - "name": "u", - "owner": "ds" - }, - { - "access": 0, - "descriptor": "I", - "field": "__z", - "name": "z", - "owner": "ds" - }, - { - "access": 0, - "descriptor": "I", - "field": "end", - "name": "d", - "owner": "ds" - }, - { - "access": 0, - "descriptor": "I", - "field": "start", - "name": "x", - "owner": "ds" - }, - { - "access": 0, - "descriptor": "Z", - "field": "__k", - "name": "k", - "owner": "ds" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "()I", - "method": "__az_179", - "name": "az", - "owner": "ds", - "parameters": [] - }, - { - "access": 0, - "descriptor": "()V", - "method": "__b_189", - "name": "b", - "owner": "ds", - "parameters": [] - }, - { - "access": 0, - "descriptor": "()V", - "method": "__o_180", - "name": "o", - "owner": "ds", - "parameters": [] - }, - { - "access": 0, - "descriptor": "()Z", - "method": "__au_204", - "name": "au", - "owner": "ds", - "parameters": [] - }, - { - "access": 0, - "descriptor": "([IIIII)I", - "method": "__ad_202", - "name": "ad", - "owner": "ds", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4" - ] - }, - { - "access": 0, - "descriptor": "([IIIII)I", - "method": "__ap_203", - "name": "ap", - "owner": "ds", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4" - ] - }, - { - "access": 1, - "descriptor": "()Z", - "method": "__ae_195", - "name": "ae", - "owner": "ds", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()Z", - "method": "__at_196", - "name": "at", - "owner": "ds", - "parameters": [] - }, - { - "access": 32, - "descriptor": "(I)V", - "method": "__z_183", - "name": "z", - "owner": "ds", - "parameters": [ - "arg0" - ] - }, - { - "access": 32, - "descriptor": "(II)V", - "method": "__j_184", - "name": "j", - "owner": "ds", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 33, - "descriptor": "()I", - "method": "__ab_194", - "name": "ab", - "owner": "ds", - "parameters": [] - }, - { - "access": 33, - "descriptor": "()I", - "method": "__s_185", - "name": "s", - "owner": "ds", - "parameters": [] - }, - { - "access": 33, - "descriptor": "()I", - "method": "__t_186", - "name": "t", - "owner": "ds", - "parameters": [] - }, - { - "access": 33, - "descriptor": "(I)V", - "method": "__a_182", - "name": "a", - "owner": "ds", - "parameters": [ - "arg0" - ] - }, - { - "access": 33, - "descriptor": "(I)V", - "method": "__ah_193", - "name": "ah", - "owner": "ds", - "parameters": [ - "arg0" - ] - }, - { - "access": 33, - "descriptor": "(I)V", - "method": "__d_201", - "name": "d", - "owner": "ds", - "parameters": [ - "arg0" - ] - }, - { - "access": 33, - "descriptor": "(I)V", - "method": "__v_192", - "name": "v", - "owner": "ds", - "parameters": [ - "arg0" - ] - }, - { - "access": 33, - "descriptor": "(I)V", - "method": "__x_181", - "name": "x", - "owner": "ds", - "parameters": [ - "arg0" - ] - }, - { - "access": 33, - "descriptor": "(I)V", - "method": "__y_187", - "name": "y", - "owner": "ds", - "parameters": [ - "arg0" - ] - }, - { - "access": 33, - "descriptor": "(II)V", - "method": "__c_190", - "name": "c", - "owner": "ds", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 33, - "descriptor": "(III)V", - "method": "__p_191", - "name": "p", - "owner": "ds", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 33, - "descriptor": "(Z)V", - "method": "__h_188", - "name": "h", - "owner": "ds", - "parameters": [ - "arg0" - ] - }, - { - "access": 33, - "descriptor": "([III)V", - "method": "__e_200", - "name": "e", - "owner": "ds", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 4, - "descriptor": "()I", - "method": "__l_199", - "name": "l", - "owner": "ds", - "parameters": [] - }, - { - "access": 4, - "descriptor": "()Ldc;", - "method": "__g_198", - "name": "g", - "owner": "ds", - "parameters": [] - }, - { - "access": 4, - "descriptor": "()Ldc;", - "method": "__u_197", - "name": "u", - "owner": "ds", - "parameters": [] - } - ], - "name": "ds", - "super": "dc" - }, - { - "access": 33, - "class": "RawSound", - "constructors": [ - { - "access": 0, - "descriptor": "(I[BII)V" - }, - { - "access": 0, - "descriptor": "(I[BIIZ)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "I", - "field": "end", - "name": "w", - "owner": "cx" - }, - { - "access": 1, - "descriptor": "I", - "field": "sampleRate", - "name": "m", - "owner": "cx" - }, - { - "access": 1, - "descriptor": "I", - "field": "start", - "name": "q", - "owner": "cx" - }, - { - "access": 1, - "descriptor": "Z", - "field": "__o", - "name": "o", - "owner": "cx" - }, - { - "access": 1, - "descriptor": "[B", - "field": "samples", - "name": "f", - "owner": "cx" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "(Ldp;)Lcx;", - "method": "resample", - "name": "m", - "owner": "cx", - "parameters": [ - "decimator" - ] - } - ], - "name": "cx", - "super": "dd" - }, - { - "access": 33, - "class": "RectangleMode", - "constructors": [ - { - "access": 0, - "descriptor": "(II)V" - } - ], - "fields": [ - { - "access": 16, - "decoder": -1204297807, - "descriptor": "I", - "field": "id2", - "name": "o", - "owner": "lj" - }, - { - "access": 17, - "decoder": -1391612747, - "descriptor": "I", - "field": "id", - "name": "w", - "owner": "lj" - } - ], - "interfaces": [ - "gc" - ], - "methods": [ - { - "access": 1, - "descriptor": "(B)I", - "method": "__f_491", - "name": "f", - "owner": "lj", - "parameters": [] - } - ], - "name": "lj", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "ReflectionCheck", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1091722075, - "descriptor": "I", - "field": "size", - "name": "w", - "owner": "lw" - }, - { - "access": 0, - "decoder": -1955146989, - "descriptor": "I", - "field": "id", - "name": "q", - "owner": "lw" - }, - { - "access": 0, - "descriptor": "[I", - "field": "creationErrors", - "name": "u", - "owner": "lw" - }, - { - "access": 0, - "descriptor": "[I", - "field": "intReplaceValues", - "name": "f", - "owner": "lw" - }, - { - "access": 0, - "descriptor": "[I", - "field": "operations", - "name": "o", - "owner": "lw" - }, - { - "access": 0, - "descriptor": "[Ljava/lang/reflect/Field;", - "field": "fields", - "name": "g", - "owner": "lw" - }, - { - "access": 0, - "descriptor": "[Ljava/lang/reflect/Method;", - "field": "methods", - "name": "l", - "owner": "lw" - }, - { - "access": 0, - "descriptor": "[[[B", - "field": "arguments", - "name": "m", - "owner": "lw" - } - ], - "interfaces": [], - "methods": [], - "name": "lw", - "super": "gw" - }, - { - "access": 33, - "class": "RunException", - "constructors": [ - { - "access": 0, - "descriptor": "(Ljava/lang/Throwable;Ljava/lang/String;)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "string", - "name": "o", - "owner": "fx" - }, - { - "access": 0, - "descriptor": "Ljava/lang/Throwable;", - "field": "throwable", - "name": "u", - "owner": "fx" - } - ], - "interfaces": [], - "methods": [], - "name": "fx", - "super": "java.lang.RuntimeException" - }, - { - "access": 33, - "class": "Scene", - "constructors": [ - { - "access": 1, - "descriptor": "(III[[[I)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "I", - "field": "minPlane", - "name": "g", - "owner": "em" - }, - { - "access": 0, - "descriptor": "I", - "field": "planes", - "name": "f", - "owner": "em" - }, - { - "access": 0, - "descriptor": "I", - "field": "tempGameObjectsCount", - "name": "l", - "owner": "em" - }, - { - "access": 0, - "descriptor": "I", - "field": "xSize", - "name": "q", - "owner": "em" - }, - { - "access": 0, - "descriptor": "I", - "field": "ySize", - "name": "w", - "owner": "em" - }, - { - "access": 0, - "descriptor": "[Leh;", - "field": "tempGameObjects", - "name": "e", - "owner": "em" - }, - { - "access": 0, - "descriptor": "[[I", - "field": "__bd", - "name": "bd", - "owner": "em" - }, - { - "access": 0, - "descriptor": "[[I", - "field": "__bk", - "name": "bk", - "owner": "em" - }, - { - "access": 0, - "descriptor": "[[[I", - "field": "__x", - "name": "x", - "owner": "em" - }, - { - "access": 0, - "descriptor": "[[[I", - "field": "tileHeights", - "name": "o", - "owner": "em" - }, - { - "access": 0, - "descriptor": "[[[Ldj;", - "field": "tiles", - "name": "u", - "owner": "em" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "()V", - "method": "occlude", - "name": "ai", - "owner": "em", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(III)Z", - "method": "__ba_253", - "name": "ba", - "owner": "em", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 0, - "descriptor": "(III)Z", - "method": "__bn_257", - "name": "bn", - "owner": "em", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 0, - "descriptor": "(IIII)Z", - "method": "__bb_254", - "name": "bb", - "owner": "em", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3" - ] - }, - { - "access": 0, - "descriptor": "(IIII)Z", - "method": "__bs_255", - "name": "bs", - "owner": "em", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3" - ] - }, - { - "access": 0, - "descriptor": "(IIIIII)Z", - "method": "__bq_256", - "name": "bq", - "owner": "em", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4", - "arg5" - ] - }, - { - "access": 0, - "descriptor": "(IIIIIIIILex;IZJI)Z", - "method": "newGameObject", - "name": "j", - "owner": "em", - "parameters": [ - "centerX", - "centerY", - "entity", - "flags", - "height", - "isTemp", - "orientation", - "plane", - "sizeX", - "sizeY", - "startX", - "startY", - "tag" - ] - }, - { - "access": 0, - "descriptor": "(Ldj;Z)V", - "method": "drawTile", - "name": "au", - "owner": "em", - "parameters": [ - "b", - "tile" - ] - }, - { - "access": 0, - "descriptor": "(Ldv;IIIIII)V", - "method": "__aa_252", - "name": "aa", - "owner": "em", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4", - "arg5", - "arg6" - ] - }, - { - "access": 0, - "descriptor": "(Ldw;III)V", - "method": "__al_248", - "name": "al", - "owner": "em", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3" - ] - }, - { - "access": 0, - "descriptor": "(Ldw;IIIII)V", - "method": "__ab_249", - "name": "ab", - "owner": "em", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4", - "arg5" - ] - }, - { - "access": 0, - "descriptor": "(Leb;IIIIIII)V", - "method": "__ao_251", - "name": "ao", - "owner": "em", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4", - "arg5", - "arg6", - "arg7" - ] - }, - { - "access": 0, - "descriptor": "(Leh;)V", - "method": "removeGameObject", - "name": "t", - "owner": "em", - "parameters": [ - "gameObject" - ] - }, - { - "access": 1, - "descriptor": "()V", - "method": "__as_250", - "name": "as", - "owner": "em", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "clear", - "name": "m", - "owner": "em", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "clearTempGameObjects", - "name": "s", - "owner": "em", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "init", - "name": "f", - "owner": "em", - "parameters": [ - "minPlane" - ] - }, - { - "access": 1, - "descriptor": "(II)V", - "method": "setLinkBelow", - "name": "q", - "owner": "em", - "parameters": [ - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(III)J", - "method": "__ac_245", - "name": "ac", - "owner": "em", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "(III)J", - "method": "__ar_244", - "name": "ar", - "owner": "em", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "(III)J", - "method": "__ay_246", - "name": "ay", - "owner": "em", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "(III)J", - "method": "getFloorDecorationTag", - "name": "ah", - "owner": "em", - "parameters": [ - "plane", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(III)Ldo;", - "method": "getFloorDecoration", - "name": "av", - "owner": "em", - "parameters": [ - "plane", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(III)Leh;", - "method": "__aj_243", - "name": "aj", - "owner": "em", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "(III)Lej;", - "method": "getBoundaryObject", - "name": "ag", - "owner": "em", - "parameters": [ - "plane", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(III)Leq;", - "method": "getWallDecoration", - "name": "aq", - "owner": "em", - "parameters": [ - "plane", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(III)V", - "method": "__aw_247", - "name": "aw", - "owner": "em", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "(III)V", - "method": "__c_242", - "name": "c", - "owner": "em", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "(III)V", - "method": "removeBoundaryObject", - "name": "h", - "owner": "em", - "parameters": [ - "plane", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(III)V", - "method": "removeFloorDecoration", - "name": "p", - "owner": "em", - "parameters": [ - "plane", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(III)V", - "method": "removeGroundItemPile", - "name": "v", - "owner": "em", - "parameters": [ - "plane", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(III)V", - "method": "removeWallDecoration", - "name": "b", - "owner": "em", - "parameters": [ - "plane", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(IIII)V", - "method": "__y_241", - "name": "y", - "owner": "em", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3" - ] - }, - { - "access": 1, - "descriptor": "(IIII)V", - "method": "setTileMinPlane", - "name": "o", - "owner": "em", - "parameters": [ - "minPlane", - "plane", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(IIIIII)V", - "method": "draw", - "name": "az", - "owner": "em", - "parameters": [ - "pitch", - "plane", - "x", - "y", - "yaw", - "z" - ] - }, - { - "access": 1, - "descriptor": "(IIIIIIIIIIIIIIIIIIII)V", - "method": "addTile", - "name": "u", - "owner": "em" - }, - { - "access": 1, - "descriptor": "(IIIIIILex;IJI)Z", - "method": "__d_238", - "name": "d", - "owner": "em", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4", - "arg5", - "arg6", - "arg7", - "arg8", - "arg9" - ] - }, - { - "access": 1, - "descriptor": "(IIIIILex;IJIIII)Z", - "method": "__z_240", - "name": "z", - "owner": "em", - "parameters": [ - "arg0", - "arg1", - "arg10", - "arg11", - "arg2", - "arg3", - "arg4", - "arg5", - "arg6", - "arg7", - "arg8", - "arg9" - ] - }, - { - "access": 1, - "descriptor": "(IIIIILex;IJZ)Z", - "method": "__a_239", - "name": "a", - "owner": "em", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4", - "arg5", - "arg6", - "arg7", - "arg8" - ] - }, - { - "access": 1, - "descriptor": "(IIIILex;JI)V", - "method": "newFloorDecoration", - "name": "g", - "owner": "em", - "parameters": [ - "entity", - "flags", - "plane", - "tag", - "tileHeight", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(IIIILex;JLex;Lex;)V", - "method": "newGroundItemPile", - "name": "l", - "owner": "em", - "parameters": [ - "first", - "plane", - "second", - "tag", - "third", - "tileHeight", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(IIIILex;Lex;IIIIJI)V", - "method": "newWallDecoration", - "name": "x", - "owner": "em", - "parameters": [ - "entity1", - "entity2", - "flags", - "int7", - "orientation", - "plane", - "tag", - "tileHeight", - "x", - "xOffset", - "y", - "yOffset" - ] - }, - { - "access": 1, - "descriptor": "(IIIILex;Lex;IIJI)V", - "method": "newBoundaryObject", - "name": "e", - "owner": "em", - "parameters": [ - "entity1", - "entity2", - "flags", - "orientationA", - "orientationB", - "plane", - "tag", - "tileHeight", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(IIIJ)I", - "method": "getObjectFlags", - "name": "ak", - "owner": "em", - "parameters": [ - "id", - "plane", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(IIIZ)V", - "method": "menuOpen", - "name": "ap", - "owner": "em", - "parameters": [ - "b", - "plane", - "screenX", - "screenY" - ] - }, - { - "access": 1, - "descriptor": "([IIIIII)V", - "method": "drawTileMinimap", - "name": "ae", - "owner": "em", - "parameters": [ - "index", - "pixels", - "plane", - "width", - "x", - "y" - ] - } - ], - "name": "em", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "Script", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1077473933, - "descriptor": "I", - "field": "intArgumentCount", - "name": "g", - "owner": "cg" - }, - { - "access": 0, - "decoder": -1124477681, - "descriptor": "I", - "field": "localStringCount", - "name": "u", - "owner": "cg" - }, - { - "access": 0, - "decoder": -503680987, - "descriptor": "I", - "field": "stringArgumentCount", - "name": "l", - "owner": "cg" - }, - { - "access": 0, - "decoder": 1952727759, - "descriptor": "I", - "field": "localIntCount", - "name": "o", - "owner": "cg" - }, - { - "access": 0, - "descriptor": "[I", - "field": "intOperands", - "name": "q", - "owner": "cg" - }, - { - "access": 0, - "descriptor": "[I", - "field": "opcodes", - "name": "f", - "owner": "cg" - }, - { - "access": 0, - "descriptor": "[Ljava/lang/String;", - "field": "stringOperands", - "name": "w", - "owner": "cg" - }, - { - "access": 0, - "descriptor": "[Llh;", - "field": "switches", - "name": "e", - "owner": "cg" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(II)[Llh;", - "method": "__o_164", - "name": "o", - "owner": "cg", - "parameters": [ - "arg0" - ] - } - ], - "name": "cg", - "super": "fn" - }, - { - "access": 33, - "class": "ScriptEvent", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1089993721, - "descriptor": "I", - "field": "opIndex", - "name": "u", - "owner": "by" - }, - { - "access": 0, - "decoder": -1330602393, - "descriptor": "I", - "field": "keyPressed", - "name": "l", - "owner": "by" - }, - { - "access": 0, - "decoder": -161292529, - "descriptor": "I", - "field": "type0", - "name": "k", - "owner": "by" - }, - { - "access": 0, - "decoder": -2138736593, - "descriptor": "I", - "field": "__d", - "name": "d", - "owner": "by" - }, - { - "access": 0, - "decoder": 327085889, - "descriptor": "I", - "field": "keyTyped", - "name": "e", - "owner": "by" - }, - { - "access": 0, - "decoder": 488198377, - "descriptor": "I", - "field": "mouseX", - "name": "w", - "owner": "by" - }, - { - "access": 0, - "decoder": 95719815, - "descriptor": "I", - "field": "mouseY", - "name": "o", - "owner": "by" - }, - { - "access": 0, - "descriptor": "Lho;", - "field": "component", - "name": "q", - "owner": "by" - }, - { - "access": 0, - "descriptor": "Lho;", - "field": "dragTarget", - "name": "g", - "owner": "by" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "targetName", - "name": "x", - "owner": "by" - }, - { - "access": 0, - "descriptor": "Z", - "field": "boolean1", - "name": "f", - "owner": "by" - }, - { - "access": 0, - "descriptor": "[Ljava/lang/Object;", - "field": "args0", - "name": "m", - "owner": "by" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "(IB)V", - "method": "setType", - "name": "f", - "owner": "by", - "parameters": [ - "type" - ] - }, - { - "access": 1, - "descriptor": "([Ljava/lang/Object;I)V", - "method": "setArgs", - "name": "m", - "owner": "by", - "parameters": [ - "args" - ] - } - ], - "name": "by", - "super": "gw" - }, - { - "access": 33, - "class": "ScriptFrame", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1715361849, - "descriptor": "I", - "field": "pc", - "name": "f", - "owner": "bn" - }, - { - "access": 0, - "descriptor": "Lcg;", - "field": "script", - "name": "m", - "owner": "bn" - }, - { - "access": 0, - "descriptor": "[I", - "field": "intLocals", - "name": "q", - "owner": "bn" - }, - { - "access": 0, - "descriptor": "[Ljava/lang/String;", - "field": "stringLocals", - "name": "w", - "owner": "bn" - } - ], - "interfaces": [], - "methods": [], - "name": "bn", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "SecureRandomCallable", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [], - "interfaces": [ - "java.util.concurrent.Callable" - ], - "methods": [ - { - "access": 1, - "descriptor": "()Ljava/lang/Object;", - "method": "__call_121", - "name": "call", - "owner": "bk", - "parameters": [] - } - ], - "name": "bk", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "SecureRandomFuture", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Ljava/util/concurrent/ExecutorService;", - "field": "executor", - "name": "m", - "owner": "cn" - }, - { - "access": 0, - "descriptor": "Ljava/util/concurrent/Future;", - "field": "future", - "name": "f", - "owner": "cn" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)Ljava/security/SecureRandom;", - "method": "get", - "name": "q", - "owner": "cn", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "shutdown", - "name": "m", - "owner": "cn", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)Z", - "method": "isDone", - "name": "f", - "owner": "cn", - "parameters": [] - } - ], - "name": "cn", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "SequenceDefinition", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "[I", - "field": "__d", - "name": "d", - "owner": "jh" - }, - { - "access": 0, - "descriptor": "[I", - "field": "frameIds2", - "name": "g", - "owner": "jh" - }, - { - "access": 1, - "decoder": -1308226131, - "descriptor": "I", - "field": "shield", - "name": "i", - "owner": "jh" - }, - { - "access": 1, - "decoder": -1629538741, - "descriptor": "I", - "field": "weapon", - "name": "a", - "owner": "jh" - }, - { - "access": 1, - "decoder": -28345361, - "descriptor": "I", - "field": "__z", - "name": "z", - "owner": "jh" - }, - { - "access": 1, - "decoder": -736885973, - "descriptor": "I", - "field": "frameCount", - "name": "x", - "owner": "jh" - }, - { - "access": 1, - "decoder": 1147391369, - "descriptor": "I", - "field": "__t", - "name": "t", - "owner": "jh" - }, - { - "access": 1, - "decoder": 1309695045, - "descriptor": "I", - "field": "__n", - "name": "n", - "owner": "jh" - }, - { - "access": 1, - "decoder": 1339014215, - "descriptor": "I", - "field": "__j", - "name": "j", - "owner": "jh" - }, - { - "access": 1, - "decoder": 2012242069, - "descriptor": "I", - "field": "__s", - "name": "s", - "owner": "jh" - }, - { - "access": 1, - "descriptor": "Z", - "field": "__k", - "name": "k", - "owner": "jh" - }, - { - "access": 1, - "descriptor": "[I", - "field": "__e", - "name": "e", - "owner": "jh" - }, - { - "access": 1, - "descriptor": "[I", - "field": "frameIds", - "name": "u", - "owner": "jh" - }, - { - "access": 1, - "descriptor": "[I", - "field": "frameLengths", - "name": "l", - "owner": "jh" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(B)V", - "method": "postDecode", - "name": "w", - "owner": "jh", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(Ldu;II)Ldu;", - "method": "animateSpotAnimation", - "name": "g", - "owner": "jh", - "parameters": [ - "frame", - "model" - ] - }, - { - "access": 0, - "descriptor": "(Ldu;IIB)Ldu;", - "method": "animateObject", - "name": "u", - "owner": "jh", - "parameters": [ - "frame", - "model", - "orientation" - ] - }, - { - "access": 0, - "descriptor": "(Lgr;II)V", - "method": "decode0", - "name": "q", - "owner": "jh" - }, - { - "access": 0, - "descriptor": "(Lgr;S)V", - "method": "decode", - "name": "f", - "owner": "jh" - }, - { - "access": 1, - "descriptor": "(Ldu;II)Ldu;", - "method": "animateComponent", - "name": "e", - "owner": "jh", - "parameters": [ - "frame", - "model" - ] - }, - { - "access": 1, - "descriptor": "(Ldu;II)Ldu;", - "method": "animateSequence", - "name": "o", - "owner": "jh", - "parameters": [ - "frame", - "model" - ] - }, - { - "access": 1, - "descriptor": "(Ldu;ILjh;II)Ldu;", - "method": "animateSequence2", - "name": "l", - "owner": "jh", - "parameters": [ - "frame", - "model", - "sequence", - "sequenceFrame" - ] - } - ], - "name": "jh", - "super": "fn" - }, - { - "access": 33, - "class": "ServerBuild", - "constructors": [ - { - "access": 0, - "descriptor": "(Ljava/lang/String;I)V" - } - ], - "fields": [ - { - "access": 17, - "decoder": -947415971, - "descriptor": "I", - "field": "id", - "name": "u", - "owner": "iy" - }, - { - "access": 17, - "descriptor": "Ljava/lang/String;", - "field": "name", - "name": "o", - "owner": "iy" - } - ], - "interfaces": [], - "methods": [], - "name": "iy", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "ServerPacket", - "constructors": [ - { - "access": 0, - "descriptor": "(II)V" - } - ], - "fields": [ - { - "access": 17, - "decoder": 1117211673, - "descriptor": "I", - "field": "id", - "name": "cu", - "owner": "ge" - }, - { - "access": 17, - "decoder": 947096829, - "descriptor": "I", - "field": "length", - "name": "cb", - "owner": "ge" - } - ], - "interfaces": [], - "methods": [], - "name": "ge", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "Skeleton", - "constructors": [ - { - "access": 0, - "descriptor": "(I[B)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1634889691, - "descriptor": "I", - "field": "id", - "name": "m", - "owner": "ek" - }, - { - "access": 0, - "decoder": 1875841677, - "descriptor": "I", - "field": "count", - "name": "f", - "owner": "ek" - }, - { - "access": 0, - "descriptor": "[I", - "field": "transformTypes", - "name": "q", - "owner": "ek" - }, - { - "access": 0, - "descriptor": "[[I", - "field": "labels", - "name": "w", - "owner": "ek" - } - ], - "interfaces": [], - "methods": [], - "name": "ek", - "super": "gw" - }, - { - "access": 33, - "class": "Skills", - "constructors": [], - "fields": [], - "interfaces": [], - "methods": [], - "name": "hc", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "SoftWrapper", - "constructors": [ - { - "access": 0, - "descriptor": "(Ljava/lang/Object;I)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Ljava/lang/ref/SoftReference;", - "field": "ref", - "name": "m", - "owner": "ef" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "()Ljava/lang/Object;", - "method": "get", - "name": "m", - "owner": "ef", - "parameters": [] - }, - { - "access": 0, - "descriptor": "()Z", - "method": "isSoft", - "name": "f", - "owner": "ef", - "parameters": [] - } - ], - "name": "ef", - "super": "eu" - }, - { - "access": 33, - "class": "SoundCache", - "constructors": [ - { - "access": 1, - "descriptor": "(Lir;Lir;)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Lir;", - "field": "musicSampleIndex", - "name": "f", - "owner": "dt" - }, - { - "access": 0, - "descriptor": "Lir;", - "field": "soundEffectIndex", - "name": "m", - "owner": "dt" - }, - { - "access": 0, - "descriptor": "Lld;", - "field": "musicSamples", - "name": "q", - "owner": "dt" - }, - { - "access": 0, - "descriptor": "Lld;", - "field": "rawSounds", - "name": "w", - "owner": "dt" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(II[II)Lcx;", - "method": "getMusicSample0", - "name": "f", - "owner": "dt" - }, - { - "access": 0, - "descriptor": "(II[IS)Lcx;", - "method": "getSoundEffect0", - "name": "m", - "owner": "dt" - }, - { - "access": 1, - "descriptor": "(I[IB)Lcx;", - "method": "getSoundEffect", - "name": "q", - "owner": "dt" - }, - { - "access": 1, - "descriptor": "(I[II)Lcx;", - "method": "getMusicSample", - "name": "w", - "owner": "dt" - } - ], - "name": "dt", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "SoundEffect", - "constructors": [ - { - "access": 0, - "descriptor": "(Lgr;)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "I", - "field": "end", - "name": "w", - "owner": "ci" - }, - { - "access": 0, - "descriptor": "I", - "field": "start", - "name": "q", - "owner": "ci" - }, - { - "access": 0, - "descriptor": "[Ldb;", - "field": "instruments", - "name": "f", - "owner": "ci" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "()Lcx;", - "method": "toRawSound", - "name": "f", - "owner": "ci", - "parameters": [] - }, - { - "access": 16, - "descriptor": "()[B", - "method": "mix", - "name": "w", - "owner": "ci", - "parameters": [] - }, - { - "access": 17, - "descriptor": "()I", - "method": "__q_174", - "name": "q", - "owner": "ci", - "parameters": [] - } - ], - "name": "ci", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "SoundEnvelope", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "I", - "field": "amplitude", - "name": "d", - "owner": "de" - }, - { - "access": 0, - "descriptor": "I", - "field": "end", - "name": "o", - "owner": "de" - }, - { - "access": 0, - "descriptor": "I", - "field": "form", - "name": "u", - "owner": "de" - }, - { - "access": 0, - "descriptor": "I", - "field": "max", - "name": "k", - "owner": "de" - }, - { - "access": 0, - "descriptor": "I", - "field": "phaseIndex", - "name": "l", - "owner": "de" - }, - { - "access": 0, - "descriptor": "I", - "field": "segments", - "name": "m", - "owner": "de" - }, - { - "access": 0, - "descriptor": "I", - "field": "start", - "name": "w", - "owner": "de" - }, - { - "access": 0, - "descriptor": "I", - "field": "step", - "name": "e", - "owner": "de" - }, - { - "access": 0, - "descriptor": "I", - "field": "ticks", - "name": "g", - "owner": "de" - }, - { - "access": 0, - "descriptor": "[I", - "field": "durations", - "name": "f", - "owner": "de" - }, - { - "access": 0, - "descriptor": "[I", - "field": "phases", - "name": "q", - "owner": "de" - } - ], - "interfaces": [], - "methods": [ - { - "access": 16, - "descriptor": "()V", - "method": "reset", - "name": "q", - "owner": "de", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(I)I", - "method": "doStep", - "name": "w", - "owner": "de", - "parameters": [ - "n" - ] - }, - { - "access": 16, - "descriptor": "(Lgr;)V", - "method": "decode", - "name": "m", - "owner": "de", - "parameters": [ - "buffer" - ] - }, - { - "access": 16, - "descriptor": "(Lgr;)V", - "method": "decodeSegments", - "name": "f", - "owner": "de", - "parameters": [ - "buffer" - ] - } - ], - "name": "de", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "SoundSystem", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 64, - "descriptor": "[Lco;", - "field": "players", - "name": "m", - "owner": "dx" - } - ], - "interfaces": [ - "java.lang.Runnable" - ], - "methods": [ - { - "access": 1, - "descriptor": "()V", - "method": "__run_178", - "name": "run", - "owner": "dx", - "parameters": [] - } - ], - "name": "dx", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "SpotAnimationDefinition", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -20619847, - "descriptor": "I", - "field": "__a", - "name": "a", - "owner": "io" - }, - { - "access": 0, - "decoder": -2065492247, - "descriptor": "I", - "field": "model", - "name": "u", - "owner": "io" - }, - { - "access": 0, - "decoder": -713866165, - "descriptor": "I", - "field": "id", - "name": "o", - "owner": "io" - }, - { - "access": 0, - "decoder": 1199960995, - "descriptor": "I", - "field": "resizev", - "name": "n", - "owner": "io" - }, - { - "access": 0, - "decoder": 1650590363, - "descriptor": "I", - "field": "orientation", - "name": "i", - "owner": "io" - }, - { - "access": 0, - "decoder": 1866148625, - "descriptor": "I", - "field": "__z", - "name": "z", - "owner": "io" - }, - { - "access": 0, - "decoder": 680796997, - "descriptor": "I", - "field": "resizeh", - "name": "k", - "owner": "io" - }, - { - "access": 0, - "descriptor": "[S", - "field": "recol_d", - "name": "e", - "owner": "io" - }, - { - "access": 0, - "descriptor": "[S", - "field": "recol_s", - "name": "l", - "owner": "io" - }, - { - "access": 0, - "descriptor": "[S", - "field": "retex_d", - "name": "d", - "owner": "io" - }, - { - "access": 0, - "descriptor": "[S", - "field": "retex_s", - "name": "x", - "owner": "io" - }, - { - "access": 1, - "decoder": 1580078789, - "descriptor": "I", - "field": "sequence", - "name": "g", - "owner": "io" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lgr;I)V", - "method": "decode", - "name": "f", - "owner": "io", - "parameters": [ - "buffer" - ] - }, - { - "access": 0, - "descriptor": "(Lgr;II)V", - "method": "decode0", - "name": "q", - "owner": "io", - "parameters": [ - "buffer", - "n" - ] - }, - { - "access": 17, - "descriptor": "(II)Ldu;", - "method": "getModel", - "name": "w", - "owner": "io" - } - ], - "name": "io", - "super": "fn" - }, - { - "access": 33, - "class": "SpriteMask", - "constructors": [ - { - "access": 0, - "descriptor": "(II[I[II)V" - } - ], - "fields": [ - { - "access": 17, - "decoder": -193097093, - "descriptor": "I", - "field": "height", - "name": "f", - "owner": "hp" - }, - { - "access": 17, - "decoder": 574541221, - "descriptor": "I", - "field": "width", - "name": "m", - "owner": "hp" - }, - { - "access": 17, - "descriptor": "[I", - "field": "xStarts", - "name": "w", - "owner": "hp" - }, - { - "access": 17, - "descriptor": "[I", - "field": "xWidths", - "name": "q", - "owner": "hp" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "(III)Z", - "method": "contains", - "name": "m", - "owner": "hp", - "parameters": [ - "x", - "y" - ] - } - ], - "name": "hp", - "super": "fn" - }, - { - "access": 33, - "class": "Strings", - "constructors": [], - "fields": [], - "interfaces": [], - "methods": [], - "name": "id", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "StructDefinition", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Llh;", - "field": "params", - "name": "q", - "owner": "jq" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(B)V", - "method": "postDecode", - "name": "f", - "owner": "jq", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(Lgr;I)V", - "method": "decode", - "name": "q", - "owner": "jq" - }, - { - "access": 0, - "descriptor": "(Lgr;II)V", - "method": "decode0", - "name": "w", - "owner": "jq" - }, - { - "access": 1, - "descriptor": "(IIB)I", - "method": "getIntParam", - "name": "o", - "owner": "jq" - }, - { - "access": 1, - "descriptor": "(ILjava/lang/String;I)Ljava/lang/String;", - "method": "getStringParam", - "name": "u", - "owner": "jq" - } - ], - "name": "jq", - "super": "fn" - }, - { - "access": 33, - "class": "StudioGame", - "constructors": [ - { - "access": 0, - "descriptor": "(Ljava/lang/String;Ljava/lang/String;I)V" - } - ], - "fields": [ - { - "access": 16, - "decoder": -1688917715, - "descriptor": "I", - "field": "id", - "name": "l", - "owner": "is" - }, - { - "access": 17, - "descriptor": "Ljava/lang/String;", - "field": "name", - "name": "g", - "owner": "is" - } - ], - "interfaces": [ - "gc" - ], - "methods": [ - { - "access": 1, - "descriptor": "(B)I", - "method": "ordinal", - "name": "f", - "owner": "is" - } - ], - "name": "is", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "Task", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1097728571, - "descriptor": "I", - "field": "type", - "name": "u", - "owner": "fm" - }, - { - "access": 0, - "descriptor": "Lfm;", - "field": "next", - "name": "m", - "owner": "fm" - }, - { - "access": 0, - "descriptor": "Ljava/lang/Object;", - "field": "objectArgument", - "name": "l", - "owner": "fm" - }, - { - "access": 1, - "descriptor": "I", - "field": "intArgument", - "name": "g", - "owner": "fm" - }, - { - "access": 65, - "descriptor": "I", - "field": "status", - "name": "o", - "owner": "fm" - }, - { - "access": 65, - "descriptor": "Ljava/lang/Object;", - "field": "result", - "name": "e", - "owner": "fm" - } - ], - "interfaces": [], - "methods": [], - "name": "fm", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "TaskHandler", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Lfm;", - "field": "current", - "name": "q", - "owner": "fz" - }, - { - "access": 0, - "descriptor": "Lfm;", - "field": "task0", - "name": "w", - "owner": "fz" - }, - { - "access": 0, - "descriptor": "Ljava/lang/Thread;", - "field": "thread", - "name": "o", - "owner": "fz" - }, - { - "access": 0, - "descriptor": "Z", - "field": "isClosed", - "name": "u", - "owner": "fz" - } - ], - "interfaces": [ - "java.lang.Runnable" - ], - "methods": [ - { - "access": 16, - "descriptor": "(IIILjava/lang/Object;I)Lfm;", - "method": "newTask", - "name": "f", - "owner": "fz" - }, - { - "access": 17, - "descriptor": "()V", - "method": "__run_279", - "name": "run", - "owner": "fz", - "parameters": [] - }, - { - "access": 17, - "descriptor": "(I)V", - "method": "close", - "name": "m", - "owner": "fz", - "parameters": [] - }, - { - "access": 17, - "descriptor": "(Ljava/lang/Runnable;II)Lfm;", - "method": "newThreadTask", - "name": "w", - "owner": "fz" - }, - { - "access": 17, - "descriptor": "(Ljava/lang/String;II)Lfm;", - "method": "newSocketTask", - "name": "q", - "owner": "fz" - } - ], - "name": "fz", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "Texture", - "constructors": [ - { - "access": 0, - "descriptor": "(Lgr;)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "I", - "field": "animationDirection", - "name": "d", - "owner": "dh" - }, - { - "access": 0, - "descriptor": "I", - "field": "animationSpeed", - "name": "k", - "owner": "dh" - }, - { - "access": 0, - "descriptor": "I", - "field": "int1", - "name": "o", - "owner": "dh" - }, - { - "access": 0, - "descriptor": "Z", - "field": "__u", - "name": "u", - "owner": "dh" - }, - { - "access": 0, - "descriptor": "Z", - "field": "isLoaded", - "name": "i", - "owner": "dh" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__e", - "name": "e", - "owner": "dh" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__l", - "name": "l", - "owner": "dh" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__x", - "name": "x", - "owner": "dh" - }, - { - "access": 0, - "descriptor": "[I", - "field": "files", - "name": "g", - "owner": "dh" - }, - { - "access": 0, - "descriptor": "[I", - "field": "pixels", - "name": "n", - "owner": "dh" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "()V", - "method": "reset", - "name": "f", - "owner": "dh" - }, - { - "access": 0, - "descriptor": "(DILir;)Z", - "method": "__m_230", - "name": "m", - "owner": "dh", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "animate", - "name": "q", - "owner": "dh", - "parameters": [ - "n" - ] - } - ], - "name": "dh", - "super": "gw" - }, - { - "access": 33, - "class": "TextureProvider", - "constructors": [ - { - "access": 1, - "descriptor": "(Lir;Lir;IDI)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": 1124790219, - "descriptor": "I", - "field": "textureSize", - "name": "u", - "owner": "dl" - }, - { - "access": 0, - "decoder": 1130378699, - "descriptor": "I", - "field": "remaining", - "name": "w", - "owner": "dl" - }, - { - "access": 0, - "decoder": 762273989, - "descriptor": "I", - "field": "capacity", - "name": "q", - "owner": "dl" - }, - { - "access": 0, - "descriptor": "D", - "field": "brightness0", - "name": "o", - "owner": "dl" - }, - { - "access": 0, - "descriptor": "Lir;", - "field": "archive", - "name": "g", - "owner": "dl" - }, - { - "access": 0, - "descriptor": "Lje;", - "field": "deque", - "name": "f", - "owner": "dl" - }, - { - "access": 0, - "descriptor": "[Ldh;", - "field": "textures", - "name": "m", - "owner": "dl" - } - ], - "interfaces": [ - "ei" - ], - "methods": [ - { - "access": 1, - "descriptor": "(D)V", - "method": "setBrightness", - "name": "f", - "owner": "dl", - "parameters": [ - "brightness" - ] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__m_212", - "name": "m", - "owner": "dl", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "clear", - "name": "g", - "owner": "dl", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(IB)Z", - "method": "__o_214", - "name": "o", - "owner": "dl", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(II)I", - "method": "__w_213", - "name": "w", - "owner": "dl", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(II)V", - "method": "animate", - "name": "l", - "owner": "dl", - "parameters": [ - "n" - ] - }, - { - "access": 1, - "descriptor": "(II)Z", - "method": "isLowDetail", - "name": "u", - "owner": "dl" - }, - { - "access": 1, - "descriptor": "(II)[I", - "method": "load", - "name": "q", - "owner": "dl" - } - ], - "name": "dl", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "Timer", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -500639955, - "descriptor": "I", - "field": "__g", - "name": "g", - "owner": "jo" - }, - { - "access": 0, - "decoder": -5820022560321696000, - "descriptor": "J", - "field": "__o", - "name": "o", - "owner": "jo" - }, - { - "access": 0, - "decoder": -6206176920376958000, - "descriptor": "J", - "field": "__w", - "name": "w", - "owner": "jo" - }, - { - "access": 0, - "decoder": -7044840680232741000, - "descriptor": "J", - "field": "__u", - "name": "u", - "owner": "jo" - }, - { - "access": 0, - "decoder": -8166664055136527000, - "descriptor": "J", - "field": "__f", - "name": "f", - "owner": "jo" - }, - { - "access": 0, - "decoder": 1684916659, - "descriptor": "I", - "field": "__x", - "name": "x", - "owner": "jo" - }, - { - "access": 0, - "decoder": 2043109577, - "descriptor": "I", - "field": "__l", - "name": "l", - "owner": "jo" - }, - { - "access": 0, - "decoder": 6181704275746247000, - "descriptor": "J", - "field": "__m", - "name": "m", - "owner": "jo" - }, - { - "access": 0, - "decoder": 978183419, - "descriptor": "I", - "field": "__e", - "name": "e", - "owner": "jo" - }, - { - "access": 1, - "descriptor": "Z", - "field": "__q", - "name": "q", - "owner": "jo" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "(B)V", - "method": "__f_450", - "name": "f", - "owner": "jo", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "__m_449", - "name": "m", - "owner": "jo", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "__u_454", - "name": "u", - "owner": "jo", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "__w_452", - "name": "w", - "owner": "jo", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(II)V", - "method": "__q_451", - "name": "q", - "owner": "jo", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(Lgr;I)V", - "method": "write", - "name": "g", - "owner": "jo", - "parameters": [ - "buffer" - ] - }, - { - "access": 1, - "descriptor": "(S)V", - "method": "__o_453", - "name": "o", - "owner": "jo", - "parameters": [] - } - ], - "name": "jo", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "TriBool", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [], - "interfaces": [], - "methods": [], - "name": "kd", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "UrlRequest", - "constructors": [ - { - "access": 0, - "descriptor": "(Ljava/net/URL;)V" - } - ], - "fields": [ - { - "access": 16, - "descriptor": "Ljava/net/URL;", - "field": "url", - "name": "m", - "owner": "ey" - }, - { - "access": 64, - "descriptor": "Z", - "field": "isDone0", - "name": "f", - "owner": "ey" - }, - { - "access": 64, - "descriptor": "[B", - "field": "response0", - "name": "q", - "owner": "ey" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "(B)[B", - "method": "getResponse", - "name": "f", - "owner": "ey", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)Z", - "method": "isDone", - "name": "m", - "owner": "ey", - "parameters": [] - } - ], - "name": "ey", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "UrlRequester", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Ljava/util/Queue;", - "field": "requests", - "name": "q", - "owner": "eo" - }, - { - "access": 16, - "descriptor": "Ljava/lang/Thread;", - "field": "thread", - "name": "m", - "owner": "eo" - }, - { - "access": 64, - "descriptor": "Z", - "field": "isClosed", - "name": "f", - "owner": "eo" - } - ], - "interfaces": [ - "java.lang.Runnable" - ], - "methods": [ - { - "access": 1, - "descriptor": "()V", - "method": "__run_260", - "name": "run", - "owner": "eo", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(Ljava/net/URL;I)Ley;", - "method": "request", - "name": "m", - "owner": "eo", - "parameters": [ - "url" - ] - }, - { - "access": 1, - "descriptor": "(S)V", - "method": "close", - "name": "f", - "owner": "eo", - "parameters": [] - } - ], - "name": "eo", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "User", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Lkp;", - "field": "previousUsername", - "name": "w", - "owner": "js" - }, - { - "access": 0, - "descriptor": "Lkp;", - "field": "username0", - "name": "q", - "owner": "js" - } - ], - "interfaces": [ - "java.lang.Comparable" - ], - "methods": [ - { - "access": 0, - "descriptor": "(Lkp;Lkp;I)V", - "method": "set", - "name": "aq", - "owner": "js", - "parameters": [ - "previousUsername", - "username" - ] - }, - { - "access": 1, - "descriptor": "(B)Ljava/lang/String;", - "method": "name", - "name": "v", - "owner": "js", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)Ljava/lang/String;", - "method": "previousName", - "name": "ag", - "owner": "js", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)Lkp;", - "method": "username", - "name": "p", - "owner": "js", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;)I", - "method": "__compareTo_455", - "name": "compareTo", - "owner": "js", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(Ljs;I)I", - "method": "compareTo0", - "name": "aj", - "owner": "js", - "parameters": [ - "other" - ] - } - ], - "name": "js", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "UserComparator1", - "constructors": [ - { - "access": 1, - "descriptor": "(Z)V" - } - ], - "fields": [ - { - "access": 16, - "descriptor": "Z", - "field": "__m", - "name": "m", - "owner": "ly" - } - ], - "interfaces": [ - "java.util.Comparator" - ], - "methods": [ - { - "access": 0, - "descriptor": "(Ljs;Ljs;B)I", - "method": "__m_472", - "name": "m", - "owner": "ly", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;)Z", - "method": "__equals_474", - "name": "equals", - "owner": "ly", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", - "method": "__compare_473", - "name": "compare", - "owner": "ly", - "parameters": [ - "arg0", - "arg1" - ] - } - ], - "name": "ly", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "UserComparator10", - "constructors": [ - { - "access": 1, - "descriptor": "(Z)V" - } - ], - "fields": [ - { - "access": 16, - "descriptor": "Z", - "field": "__m", - "name": "m", - "owner": "eg" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lke;Lke;B)I", - "method": "__m_268", - "name": "m", - "owner": "eg", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", - "method": "__compare_269", - "name": "compare", - "owner": "eg", - "parameters": [ - "arg0", - "arg1" - ] - } - ], - "name": "eg", - "super": "kf" - }, - { - "access": 33, - "class": "UserComparator2", - "constructors": [ - { - "access": 1, - "descriptor": "(Z)V" - } - ], - "fields": [ - { - "access": 16, - "descriptor": "Z", - "field": "__m", - "name": "m", - "owner": "li" - } - ], - "interfaces": [ - "java.util.Comparator" - ], - "methods": [ - { - "access": 0, - "descriptor": "(Ljs;Ljs;I)I", - "method": "__m_475", - "name": "m", - "owner": "li", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;)Z", - "method": "__equals_477", - "name": "equals", - "owner": "li", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", - "method": "__compare_476", - "name": "compare", - "owner": "li", - "parameters": [ - "arg0", - "arg1" - ] - } - ], - "name": "li", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "UserComparator3", - "constructors": [ - { - "access": 1, - "descriptor": "(Z)V" - } - ], - "fields": [ - { - "access": 16, - "descriptor": "Z", - "field": "__m", - "name": "m", - "owner": "fq" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lke;Lke;I)I", - "method": "__m_274", - "name": "m", - "owner": "fq", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", - "method": "__compare_275", - "name": "compare", - "owner": "fq", - "parameters": [ - "arg0", - "arg1" - ] - } - ], - "name": "fq", - "super": "kf" - }, - { - "access": 33, - "class": "UserComparator4", - "constructors": [ - { - "access": 1, - "descriptor": "(Z)V" - } - ], - "fields": [ - { - "access": 16, - "descriptor": "Z", - "field": "__m", - "name": "m", - "owner": "ev" - } - ], - "interfaces": [ - "java.util.Comparator" - ], - "methods": [ - { - "access": 0, - "descriptor": "(Lke;Lke;I)I", - "method": "__m_261", - "name": "m", - "owner": "ev", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;)Z", - "method": "__equals_263", - "name": "equals", - "owner": "ev", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", - "method": "__compare_262", - "name": "compare", - "owner": "ev", - "parameters": [ - "arg0", - "arg1" - ] - } - ], - "name": "ev", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "UserComparator5", - "constructors": [ - { - "access": 1, - "descriptor": "(Z)V" - } - ], - "fields": [ - { - "access": 16, - "descriptor": "Z", - "field": "__m", - "name": "m", - "owner": "ep" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lke;Lke;B)I", - "method": "__m_272", - "name": "m", - "owner": "ep", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", - "method": "__compare_273", - "name": "compare", - "owner": "ep", - "parameters": [ - "arg0", - "arg1" - ] - } - ], - "name": "ep", - "super": "kf" - }, - { - "access": 33, - "class": "UserComparator6", - "constructors": [ - { - "access": 1, - "descriptor": "(Z)V" - } - ], - "fields": [ - { - "access": 16, - "descriptor": "Z", - "field": "__m", - "name": "m", - "owner": "fg" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lke;Lke;I)I", - "method": "__m_276", - "name": "m", - "owner": "fg", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", - "method": "__compare_277", - "name": "compare", - "owner": "fg", - "parameters": [ - "arg0", - "arg1" - ] - } - ], - "name": "fg", - "super": "kf" - }, - { - "access": 33, - "class": "UserComparator7", - "constructors": [ - { - "access": 1, - "descriptor": "(Z)V" - } - ], - "fields": [ - { - "access": 16, - "descriptor": "Z", - "field": "__m", - "name": "m", - "owner": "ez" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lke;Lke;I)I", - "method": "__m_270", - "name": "m", - "owner": "ez", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", - "method": "__compare_271", - "name": "compare", - "owner": "ez", - "parameters": [ - "arg0", - "arg1" - ] - } - ], - "name": "ez", - "super": "kf" - }, - { - "access": 33, - "class": "UserComparator8", - "constructors": [ - { - "access": 1, - "descriptor": "(Z)V" - } - ], - "fields": [ - { - "access": 16, - "descriptor": "Z", - "field": "__m", - "name": "m", - "owner": "es" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lke;Lke;B)I", - "method": "__m_266", - "name": "m", - "owner": "es", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", - "method": "__compare_267", - "name": "compare", - "owner": "es", - "parameters": [ - "arg0", - "arg1" - ] - } - ], - "name": "es", - "super": "kf" - }, - { - "access": 33, - "class": "UserComparator9", - "constructors": [ - { - "access": 1, - "descriptor": "(Z)V" - } - ], - "fields": [ - { - "access": 16, - "descriptor": "Z", - "field": "__m", - "name": "m", - "owner": "ea" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lke;Lke;I)I", - "method": "__m_264", - "name": "m", - "owner": "ea", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", - "method": "__compare_265", - "name": "compare", - "owner": "ea", - "parameters": [ - "arg0", - "arg1" - ] - } - ], - "name": "ea", - "super": "kf" - }, - { - "access": 33, - "class": "Username", - "constructors": [ - { - "access": 1, - "descriptor": "(Ljava/lang/String;Llx;)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "cleanName", - "name": "f", - "owner": "kp" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "name0", - "name": "m", - "owner": "kp" - } - ], - "interfaces": [ - "java.lang.Comparable" - ], - "methods": [ - { - "access": 1, - "descriptor": "()I", - "method": "__hashCode_463", - "name": "hashCode", - "owner": "kp", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()Ljava/lang/String;", - "method": "__toString_464", - "name": "toString", - "owner": "kp", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)Ljava/lang/String;", - "method": "name", - "name": "m", - "owner": "kp", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)Z", - "method": "hasCleanName", - "name": "f", - "owner": "kp", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;)I", - "method": "__compareTo_465", - "name": "compareTo", - "owner": "kp", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;)Z", - "method": "__equals_462", - "name": "equals", - "owner": "kp", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(Lkp;B)I", - "method": "compareTo0", - "name": "q", - "owner": "kp", - "parameters": [ - "other" - ] - } - ], - "name": "kp", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "VarbitDefinition", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 1, - "decoder": -1710935305, - "descriptor": "I", - "field": "endBit", - "name": "o", - "owner": "ia" - }, - { - "access": 1, - "decoder": -870948181, - "descriptor": "I", - "field": "startBit", - "name": "w", - "owner": "ia" - }, - { - "access": 1, - "decoder": 1552575189, - "descriptor": "I", - "field": "baseVar", - "name": "q", - "owner": "ia" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lgr;I)V", - "method": "decode", - "name": "q", - "owner": "ia" - }, - { - "access": 0, - "descriptor": "(Lgr;IB)V", - "method": "decode0", - "name": "w", - "owner": "ia" - } - ], - "name": "ia", - "super": "fn" - }, - { - "access": 33, - "class": "VarcInt", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 1, - "descriptor": "Z", - "field": "persist", - "name": "q", - "owner": "iw" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lgr;I)V", - "method": "__q_411", - "name": "q", - "owner": "iw", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "(Lgr;II)V", - "method": "__w_412", - "name": "w", - "owner": "iw", - "parameters": [ - "arg0", - "arg1" - ] - } - ], - "name": "iw", - "super": "fn" - }, - { - "access": 33, - "class": "Varcs", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": 4836824701467349000, - "descriptor": "J", - "field": "lastWriteTimeMs", - "name": "g", - "owner": "ch" - }, - { - "access": 0, - "descriptor": "Ljava/util/Map;", - "field": "map", - "name": "w", - "owner": "ch" - }, - { - "access": 0, - "descriptor": "Z", - "field": "unwrittenChanges", - "name": "u", - "owner": "ch" - }, - { - "access": 0, - "descriptor": "[Ljava/lang/String;", - "field": "strings", - "name": "o", - "owner": "ch" - }, - { - "access": 0, - "descriptor": "[Z", - "field": "intsPersistence", - "name": "q", - "owner": "ch" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)V", - "method": "clearTransient", - "name": "g", - "owner": "ch", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "read", - "name": "x", - "owner": "ch" - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "tryWrite", - "name": "d", - "owner": "ch", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "write", - "name": "e", - "owner": "ch" - }, - { - "access": 0, - "descriptor": "(I)Z", - "method": "hasUnwrittenChanges", - "name": "a", - "owner": "ch", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(IB)I", - "method": "getInt", - "name": "f", - "owner": "ch", - "parameters": [ - "index" - ] - }, - { - "access": 0, - "descriptor": "(IB)Ljava/lang/String;", - "method": "getStringOld", - "name": "u", - "owner": "ch", - "parameters": [ - "index" - ] - }, - { - "access": 0, - "descriptor": "(II)Ljava/lang/String;", - "method": "getString", - "name": "w", - "owner": "ch", - "parameters": [ - "index" - ] - }, - { - "access": 0, - "descriptor": "(III)V", - "method": "setInt", - "name": "m", - "owner": "ch", - "parameters": [ - "index", - "n" - ] - }, - { - "access": 0, - "descriptor": "(ILjava/lang/String;B)V", - "method": "setStringOld", - "name": "o", - "owner": "ch", - "parameters": [ - "index", - "s" - ] - }, - { - "access": 0, - "descriptor": "(ILjava/lang/String;I)V", - "method": "setString", - "name": "q", - "owner": "ch", - "parameters": [ - "index", - "s" - ] - }, - { - "access": 0, - "descriptor": "(ZB)Ldk;", - "method": "getPreferencesFile", - "name": "l", - "owner": "ch" - } - ], - "name": "ch", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "VarpDefinition", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 1, - "decoder": -1792568421, - "descriptor": "I", - "field": "type", - "name": "w", - "owner": "ix" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lgr;B)V", - "method": "decode", - "name": "f", - "owner": "ix" - }, - { - "access": 0, - "descriptor": "(Lgr;II)V", - "method": "decode0", - "name": "q", - "owner": "ix" - } - ], - "name": "ix", - "super": "fn" - }, - { - "access": 33, - "class": "Varps", - "constructors": [], - "fields": [], - "interfaces": [], - "methods": [], - "name": "hv", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "VertexNormal", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - }, - { - "access": 0, - "descriptor": "(Ldq;)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1493845293, - "descriptor": "I", - "field": "__f", - "name": "f", - "owner": "dq" - }, - { - "access": 0, - "decoder": -487323631, - "descriptor": "I", - "field": "__w", - "name": "w", - "owner": "dq" - }, - { - "access": 0, - "decoder": 1414310131, - "descriptor": "I", - "field": "__m", - "name": "m", - "owner": "dq" - }, - { - "access": 0, - "decoder": 1575149515, - "descriptor": "I", - "field": "__q", - "name": "q", - "owner": "dq" - } - ], - "interfaces": [], - "methods": [], - "name": "dq", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "ViewportMouse", - "constructors": [], - "fields": [], - "interfaces": [], - "methods": [], - "name": "dm", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "World", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -144265493, - "descriptor": "I", - "field": "id", - "name": "d", - "owner": "bt" - }, - { - "access": 0, - "decoder": 1147427427, - "descriptor": "I", - "field": "index", - "name": "j", - "owner": "bt" - }, - { - "access": 0, - "decoder": 1863464125, - "descriptor": "I", - "field": "population", - "name": "n", - "owner": "bt" - }, - { - "access": 0, - "decoder": 1942858323, - "descriptor": "I", - "field": "location", - "name": "z", - "owner": "bt" - }, - { - "access": 0, - "decoder": 956991319, - "descriptor": "I", - "field": "properties", - "name": "k", - "owner": "bt" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "activity", - "name": "a", - "owner": "bt" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "host", - "name": "i", - "owner": "bt" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(B)Z", - "method": "__x_145", - "name": "x", - "owner": "bt", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(B)Z", - "method": "__z_148", - "name": "z", - "owner": "bt", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)Z", - "method": "__a_147", - "name": "a", - "owner": "bt", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)Z", - "method": "__d_146", - "name": "d", - "owner": "bt", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)Z", - "method": "__e_144", - "name": "e", - "owner": "bt", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)Z", - "method": "__j_149", - "name": "j", - "owner": "bt", - "parameters": [] - } - ], - "name": "bt", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "WorldMap", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1140942239, - "descriptor": "I", - "field": "__aj", - "name": "aj", - "owner": "lz" - }, - { - "access": 0, - "decoder": -1301477687, - "descriptor": "I", - "field": "__av", - "name": "av", - "owner": "lz" - }, - { - "access": 0, - "decoder": -1469654441, - "descriptor": "I", - "field": "__aq", - "name": "aq", - "owner": "lz" - }, - { - "access": 0, - "decoder": -1653084915, - "descriptor": "I", - "field": "__ac", - "name": "ac", - "owner": "lz" - }, - { - "access": 0, - "decoder": -1683910031, - "descriptor": "I", - "field": "__aw", - "name": "aw", - "owner": "lz" - }, - { - "access": 0, - "decoder": -1774424249, - "descriptor": "I", - "field": "__bm", - "name": "bm", - "owner": "lz" - }, - { - "access": 0, - "decoder": -1979665983, - "descriptor": "I", - "field": "__ab", - "name": "ab", - "owner": "lz" - }, - { - "access": 0, - "decoder": -237734529, - "descriptor": "I", - "field": "__ba", - "name": "ba", - "owner": "lz" - }, - { - "access": 0, - "decoder": -298919797, - "descriptor": "I", - "field": "__ar", - "name": "ar", - "owner": "lz" - }, - { - "access": 0, - "decoder": -4747643242047041000, - "descriptor": "J", - "field": "__ap", - "name": "ap", - "owner": "lz" - }, - { - "access": 0, - "decoder": -56022357, - "descriptor": "I", - "field": "__p", - "name": "p", - "owner": "lz" - }, - { - "access": 0, - "decoder": -815748997, - "descriptor": "I", - "field": "__at", - "name": "at", - "owner": "lz" - }, - { - "access": 0, - "decoder": -869889187, - "descriptor": "I", - "field": "__am", - "name": "am", - "owner": "lz" - }, - { - "access": 0, - "decoder": -89657613, - "descriptor": "I", - "field": "__r", - "name": "r", - "owner": "lz" - }, - { - "access": 0, - "decoder": -969094439, - "descriptor": "I", - "field": "__as", - "name": "as", - "owner": "lz" - }, - { - "access": 0, - "decoder": -988933407, - "descriptor": "I", - "field": "__ad", - "name": "ad", - "owner": "lz" - }, - { - "access": 0, - "decoder": 1318118645, - "descriptor": "I", - "field": "__c", - "name": "c", - "owner": "lz" - }, - { - "access": 0, - "decoder": 1664740569, - "descriptor": "I", - "field": "__ay", - "name": "ay", - "owner": "lz" - }, - { - "access": 0, - "decoder": 1711576969, - "descriptor": "I", - "field": "__b", - "name": "b", - "owner": "lz" - }, - { - "access": 0, - "decoder": 2031417343, - "descriptor": "I", - "field": "__bx", - "name": "bx", - "owner": "lz" - }, - { - "access": 0, - "decoder": 2064651113, - "descriptor": "I", - "field": "__al", - "name": "al", - "owner": "lz" - }, - { - "access": 0, - "decoder": 2064728623, - "descriptor": "I", - "field": "__bu", - "name": "bu", - "owner": "lz" - }, - { - "access": 0, - "decoder": 547126547, - "descriptor": "I", - "field": "__ae", - "name": "ae", - "owner": "lz" - }, - { - "access": 0, - "decoder": 754899959, - "descriptor": "I", - "field": "__by", - "name": "by", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "F", - "field": "zoom", - "name": "v", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "F", - "field": "zoomTarget", - "name": "ag", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Lag;", - "field": "__t", - "name": "t", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Lag;", - "field": "currentMapArea0", - "name": "s", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Lag;", - "field": "mainMapArea", - "name": "j", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Lal;", - "field": "worldMapManager", - "name": "y", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Lhu;", - "field": "mouseCoord", - "name": "bd", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Lir;", - "field": "__e", - "name": "e", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Lir;", - "field": "__g", - "name": "g", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Lir;", - "field": "__l", - "name": "l", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Ljava/util/HashMap;", - "field": "fonts", - "name": "i", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Ljava/util/HashMap;", - "field": "mapAreas", - "name": "z", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Ljava/util/HashSet;", - "field": "__af", - "name": "af", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Ljava/util/HashSet;", - "field": "__ax", - "name": "ax", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Ljava/util/HashSet;", - "field": "__bk", - "name": "bk", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Ljava/util/HashSet;", - "field": "enabledCategories", - "name": "aa", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Ljava/util/HashSet;", - "field": "enabledElements", - "name": "ao", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Ljava/util/HashSet;", - "field": "flashingElements", - "name": "ak", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Ljava/util/Iterator;", - "field": "iconIterator", - "name": "bn", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Ljava/util/List;", - "field": "__bq", - "name": "bq", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Lkk;", - "field": "font", - "name": "n", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Lln;", - "field": "sprite", - "name": "bo", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Lls;", - "field": "cacheLoader", - "name": "h", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Z", - "field": "__an", - "name": "an", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Z", - "field": "elementsDisabled", - "name": "ai", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "Z", - "field": "perpetualFlash0", - "name": "ah", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "[Llq;", - "field": "mapSceneSprites", - "name": "a", - "owner": "lz" - }, - { - "access": 1, - "descriptor": "Z", - "field": "__bc", - "name": "bc", - "owner": "lz" - }, - { - "access": 16, - "descriptor": "[I", - "field": "__bs", - "name": "bs", - "owner": "lz" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)V", - "method": "__bk_539", - "name": "bk", - "owner": "lz", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "__g_517", - "name": "g", - "owner": "lz", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "smoothZoom", - "name": "u", - "owner": "lz", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)Z", - "method": "__x_520", - "name": "x", - "owner": "lz", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(IB)F", - "method": "__av_525", - "name": "av", - "owner": "lz", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "(IIII)V", - "method": "jump", - "name": "b", - "owner": "lz", - "parameters": [ - "plane", - "x", - "y" - ] - }, - { - "access": 0, - "descriptor": "(IIIIIB)V", - "method": "drawLoading", - "name": "aj", - "owner": "lz" - }, - { - "access": 0, - "descriptor": "(IIIIIII)V", - "method": "__v_524", - "name": "v", - "owner": "lz", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4", - "arg5" - ] - }, - { - "access": 0, - "descriptor": "(IIIIIII)Z", - "method": "__p_523", - "name": "p", - "owner": "lz", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4", - "arg5" - ] - }, - { - "access": 0, - "descriptor": "(IIZJ)V", - "method": "__o_516", - "name": "o", - "owner": "lz", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3" - ] - }, - { - "access": 0, - "descriptor": "(Lag;B)V", - "method": "setCurrentMapArea", - "name": "t", - "owner": "lz", - "parameters": [ - "mapArea" - ] - }, - { - "access": 0, - "descriptor": "(Lag;I)V", - "method": "initializeWorldMapManager", - "name": "y", - "owner": "lz", - "parameters": [ - "mapArea" - ] - }, - { - "access": 1, - "descriptor": "(B)I", - "method": "getZoomLevel", - "name": "ar", - "owner": "lz", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(B)Lak;", - "method": "iconNext", - "name": "by", - "owner": "lz" - }, - { - "access": 1, - "descriptor": "(B)V", - "method": "loadCache", - "name": "ac", - "owner": "lz", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(B)Z", - "method": "getElementsEnabled", - "name": "bs", - "owner": "lz", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__ae_530", - "name": "ae", - "owner": "lz", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__ap_533", - "name": "ap", - "owner": "lz", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__as_534", - "name": "as", - "owner": "lz", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__at_531", - "name": "at", - "owner": "lz", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "currentMapAreaId", - "name": "j", - "owner": "lz", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)Lag;", - "method": "getCurrentMapArea", - "name": "s", - "owner": "lz", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)Lak;", - "method": "iconStart", - "name": "bx", - "owner": "lz" - }, - { - "access": 1, - "descriptor": "(I)Lhu;", - "method": "__ad_532", - "name": "ad", - "owner": "lz", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "__an_536", - "name": "an", - "owner": "lz", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "__au_538", - "name": "au", - "owner": "lz", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "__f_514", - "name": "f", - "owner": "lz", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "stopCurrentFlashes", - "name": "af", - "owner": "lz" - }, - { - "access": 1, - "descriptor": "(IB)V", - "method": "flashCategory", - "name": "ax", - "owner": "lz" - }, - { - "access": 1, - "descriptor": "(IB)Z", - "method": "isElementDisabled", - "name": "bq", - "owner": "lz" - }, - { - "access": 1, - "descriptor": "(II)Lag;", - "method": "getMapArea", - "name": "ah", - "owner": "lz", - "parameters": [ - "id" - ] - }, - { - "access": 1, - "descriptor": "(II)V", - "method": "__am_535", - "name": "am", - "owner": "lz", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(II)V", - "method": "__az_537", - "name": "az", - "owner": "lz", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(II)V", - "method": "flashElement", - "name": "aa", - "owner": "lz" - }, - { - "access": 1, - "descriptor": "(II)V", - "method": "setCurrentMapAreaId", - "name": "z", - "owner": "lz", - "parameters": [ - "id" - ] - }, - { - "access": 1, - "descriptor": "(II)V", - "method": "setZoomLevel", - "name": "aq", - "owner": "lz", - "parameters": [ - "zoom" - ] - }, - { - "access": 1, - "descriptor": "(II)Z", - "method": "isCategoryDisabled", - "name": "bn", - "owner": "lz" - }, - { - "access": 1, - "descriptor": "(III)V", - "method": "__ak_526", - "name": "ak", - "owner": "lz", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(III)V", - "method": "__aw_527", - "name": "aw", - "owner": "lz", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(IIIB)V", - "method": "__al_528", - "name": "al", - "owner": "lz", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "(IIII)Lag;", - "method": "mapAreaAtCoord", - "name": "d", - "owner": "lz", - "parameters": [ - "plane", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(IIII)V", - "method": "__ab_529", - "name": "ab", - "owner": "lz", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "(IIIIB)V", - "method": "drawOverview", - "name": "ag", - "owner": "lz", - "parameters": [ - "height", - "width", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(IIIIII)V", - "method": "draw", - "name": "c", - "owner": "lz", - "parameters": [ - "cycle", - "height", - "width", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(IIIIIIB)V", - "method": "__bd_540", - "name": "bd", - "owner": "lz", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4", - "arg5" - ] - }, - { - "access": 1, - "descriptor": "(IIIZI)V", - "method": "__a_521", - "name": "a", - "owner": "lz", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3" - ] - }, - { - "access": 1, - "descriptor": "(IILhu;Lhu;B)V", - "method": "menuAction", - "name": "bo", - "owner": "lz", - "parameters": [ - "a", - "b", - "c", - "d" - ] - }, - { - "access": 1, - "descriptor": "(IIZIIIIB)V", - "method": "onCycle", - "name": "q", - "owner": "lz", - "parameters": [ - "a", - "b", - "c", - "d", - "e", - "f", - "g" - ] - }, - { - "access": 1, - "descriptor": "(IIZZS)V", - "method": "__w_515", - "name": "w", - "owner": "lz", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3" - ] - }, - { - "access": 1, - "descriptor": "(ILhu;I)Lhu;", - "method": "__bc_541", - "name": "bc", - "owner": "lz", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(IZI)V", - "method": "disableCategory", - "name": "bb", - "owner": "lz" - }, - { - "access": 1, - "descriptor": "(IZI)V", - "method": "disableElement", - "name": "ba", - "owner": "lz" - }, - { - "access": 1, - "descriptor": "(Lag;Lhu;Lhu;ZI)V", - "method": "__h_522", - "name": "h", - "owner": "lz", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3" - ] - }, - { - "access": 1, - "descriptor": "(Lir;Lir;Lir;Lkk;Ljava/util/HashMap;[Llq;I)V", - "method": "init", - "name": "m", - "owner": "lz" - }, - { - "access": 1, - "descriptor": "(S)Z", - "method": "isCacheLoaded", - "name": "ay", - "owner": "lz", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(ZI)V", - "method": "perpetualFlash", - "name": "ao", - "owner": "lz" - }, - { - "access": 1, - "descriptor": "(ZI)V", - "method": "setElementsEnabled", - "name": "ai", - "owner": "lz" - }, - { - "access": 16, - "descriptor": "(B)V", - "method": "__e_519", - "name": "e", - "owner": "lz", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(IIZI)V", - "method": "__l_518", - "name": "l", - "owner": "lz", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - } - ], - "name": "lz", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "WorldMapArchiveLoader", - "constructors": [ - { - "access": 0, - "descriptor": "(Lir;)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": 624113115, - "descriptor": "I", - "field": "percentLoaded", - "name": "g", - "owner": "ls" - }, - { - "access": 0, - "descriptor": "Lir;", - "field": "archive", - "name": "u", - "owner": "ls" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "cacheName", - "name": "o", - "owner": "ls" - }, - { - "access": 0, - "descriptor": "Z", - "field": "isLoaded", - "name": "l", - "owner": "ls" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)I", - "method": "load", - "name": "f", - "owner": "ls", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)I", - "method": "percentLoaded", - "name": "w", - "owner": "ls", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(Ljava/lang/String;I)V", - "method": "reset", - "name": "m", - "owner": "ls", - "parameters": [ - "cacheName" - ] - }, - { - "access": 0, - "descriptor": "(S)Z", - "method": "isLoaded", - "name": "q", - "owner": "ls", - "parameters": [] - } - ], - "name": "ls", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "WorldMapArea", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": 1025105175, - "descriptor": "I", - "field": "maxY0", - "name": "x", - "owner": "ag" - }, - { - "access": 0, - "decoder": 1232579503, - "descriptor": "I", - "field": "id0", - "name": "m", - "owner": "ag" - }, - { - "access": 0, - "decoder": 1238532539, - "descriptor": "I", - "field": "minX0", - "name": "g", - "owner": "ag" - }, - { - "access": 0, - "decoder": 196514055, - "descriptor": "I", - "field": "zoom0", - "name": "o", - "owner": "ag" - }, - { - "access": 0, - "decoder": 225384859, - "descriptor": "I", - "field": "maxX0", - "name": "l", - "owner": "ag" - }, - { - "access": 0, - "decoder": 963380367, - "descriptor": "I", - "field": "minY0", - "name": "e", - "owner": "ag" - }, - { - "access": 0, - "decoder": 986239133, - "descriptor": "I", - "field": "__w", - "name": "w", - "owner": "ag" - }, - { - "access": 0, - "descriptor": "Lhu;", - "field": "origin0", - "name": "u", - "owner": "ag" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "archiveName0", - "name": "f", - "owner": "ag" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "name0", - "name": "q", - "owner": "ag" - }, - { - "access": 0, - "descriptor": "Ljava/util/LinkedList;", - "field": "sections", - "name": "k", - "owner": "ag" - }, - { - "access": 0, - "descriptor": "Z", - "field": "isMain0", - "name": "d", - "owner": "ag" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(B)V", - "method": "setBounds", - "name": "g", - "owner": "ag", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)I", - "method": "__a_39", - "name": "a", - "owner": "ag", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(Lgr;S)Lab;", - "method": "readWorldMapSection", - "name": "f", - "owner": "ag" - }, - { - "access": 1, - "descriptor": "(B)I", - "method": "maxX", - "name": "s", - "owner": "ag", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(B)I", - "method": "minX", - "name": "j", - "owner": "ag", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(B)I", - "method": "originX", - "name": "h", - "owner": "ag", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(B)Ljava/lang/String;", - "method": "archiveName", - "name": "x", - "owner": "ag", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(B)Ljava/lang/String;", - "method": "name", - "name": "d", - "owner": "ag", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(B)Z", - "method": "isMain", - "name": "e", - "owner": "ag", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "id", - "name": "l", - "owner": "ag", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "maxY", - "name": "y", - "owner": "ag", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "minY", - "name": "t", - "owner": "ag", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "originPlane", - "name": "b", - "owner": "ag", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "originY", - "name": "c", - "owner": "ag", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "zoom", - "name": "z", - "owner": "ag", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)Lhu;", - "method": "origin", - "name": "p", - "owner": "ag", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(III)Lhu;", - "method": "coord", - "name": "u", - "owner": "ag", - "parameters": [ - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(III)Z", - "method": "containsPosition", - "name": "w", - "owner": "ag", - "parameters": [ - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(IIII)Z", - "method": "containsCoord", - "name": "q", - "owner": "ag", - "parameters": [ - "plane", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(IIII)[I", - "method": "position", - "name": "o", - "owner": "ag", - "parameters": [ - "plane", - "x", - "y" - ] - }, - { - "access": 1, - "descriptor": "(Lgr;II)V", - "method": "read", - "name": "m", - "owner": "ag" - } - ], - "name": "ag", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "WorldMapAreaData", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Ljava/util/HashSet;", - "field": "__i", - "name": "i", - "owner": "ae" - }, - { - "access": 0, - "descriptor": "Ljava/util/HashSet;", - "field": "__n", - "name": "n", - "owner": "ae" - }, - { - "access": 0, - "descriptor": "Ljava/util/List;", - "field": "__a", - "name": "a", - "owner": "ae" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(Lgr;Lgr;IZI)V", - "method": "__ce_76", - "name": "ce", - "owner": "ae", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3" - ] - }, - { - "access": 0, - "descriptor": "(Lgr;ZB)V", - "method": "__cy_77", - "name": "cy", - "owner": "ae", - "parameters": [ - "arg0", - "arg1" - ] - } - ], - "name": "ae", - "super": "ag" - }, - { - "access": 33, - "class": "WorldMapCacheName", - "constructors": [ - { - "access": 0, - "descriptor": "(Ljava/lang/String;)V" - } - ], - "fields": [ - { - "access": 17, - "descriptor": "Ljava/lang/String;", - "field": "name", - "name": "u", - "owner": "aw" - } - ], - "interfaces": [], - "methods": [], - "name": "aw", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "WorldMapElement", - "constructors": [ - { - "access": 1, - "descriptor": "(I)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1007121521, - "descriptor": "I", - "field": "__j", - "name": "j", - "owner": "ic" - }, - { - "access": 0, - "decoder": -1209054101, - "descriptor": "I", - "field": "__s", - "name": "s", - "owner": "ic" - }, - { - "access": 0, - "decoder": -1825795359, - "descriptor": "I", - "field": "__z", - "name": "z", - "owner": "ic" - }, - { - "access": 0, - "decoder": -322924875, - "descriptor": "I", - "field": "sprite2", - "name": "g", - "owner": "ic" - }, - { - "access": 0, - "decoder": 1336803515, - "descriptor": "I", - "field": "__a", - "name": "a", - "owner": "ic" - }, - { - "access": 0, - "descriptor": "[B", - "field": "__b", - "name": "b", - "owner": "ic" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__h", - "name": "h", - "owner": "ic" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__i", - "name": "i", - "owner": "ic" - }, - { - "access": 1, - "decoder": -231067, - "descriptor": "I", - "field": "__e", - "name": "e", - "owner": "ic" - }, - { - "access": 1, - "decoder": -653112729, - "descriptor": "I", - "field": "category", - "name": "c", - "owner": "ic" - }, - { - "access": 1, - "decoder": 1184517129, - "descriptor": "I", - "field": "textSize", - "name": "x", - "owner": "ic" - }, - { - "access": 1, - "decoder": 2012857993, - "descriptor": "I", - "field": "sprite1", - "name": "u", - "owner": "ic" - }, - { - "access": 1, - "descriptor": "Ljava/lang/String;", - "field": "__l", - "name": "l", - "owner": "ic" - }, - { - "access": 1, - "descriptor": "Ljava/lang/String;", - "field": "string1", - "name": "n", - "owner": "ic" - }, - { - "access": 1, - "descriptor": "[Ljava/lang/String;", - "field": "strings", - "name": "k", - "owner": "ic" - }, - { - "access": 17, - "decoder": -1579051565, - "descriptor": "I", - "field": "__o", - "name": "o", - "owner": "ic" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(IB)Lln;", - "method": "getSprite0", - "name": "u", - "owner": "ic", - "parameters": [ - "id" - ] - }, - { - "access": 0, - "descriptor": "(Lgr;II)V", - "method": "decode0", - "name": "q", - "owner": "ic", - "parameters": [ - "buffer", - "opcode" - ] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__g_410", - "name": "g", - "owner": "ic", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "__w_409", - "name": "w", - "owner": "ic", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(Lgr;B)V", - "method": "decode", - "name": "f", - "owner": "ic", - "parameters": [ - "buffer" - ] - }, - { - "access": 1, - "descriptor": "(ZI)Lln;", - "method": "getSprite", - "name": "o", - "owner": "ic", - "parameters": [ - "b" - ] - } - ], - "name": "ic", - "super": "fn" - }, - { - "access": 33, - "class": "WorldMapEvent", - "constructors": [ - { - "access": 1, - "descriptor": "(ILhu;Lhu;)V" - } - ], - "fields": [ - { - "access": 1, - "decoder": 264384233, - "descriptor": "I", - "field": "mapElement", - "name": "m", - "owner": "ap" - }, - { - "access": 1, - "descriptor": "Lhu;", - "field": "coord1", - "name": "f", - "owner": "ap" - }, - { - "access": 1, - "descriptor": "Lhu;", - "field": "coord2", - "name": "q", - "owner": "ap" - } - ], - "interfaces": [], - "methods": [], - "name": "ap", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "WorldMapIcon1", - "constructors": [ - { - "access": 0, - "descriptor": "(Lhu;Lhu;ILaj;)V" - } - ], - "fields": [ - { - "access": 16, - "decoder": -1722323621, - "descriptor": "I", - "field": "__m", - "name": "m", - "owner": "t" - }, - { - "access": 16, - "decoder": -362031241, - "descriptor": "I", - "field": "__w", - "name": "w", - "owner": "t" - }, - { - "access": 16, - "decoder": 364253793, - "descriptor": "I", - "field": "__q", - "name": "q", - "owner": "t" - }, - { - "access": 16, - "descriptor": "Laj;", - "field": "label0", - "name": "f", - "owner": "t" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(B)I", - "method": "__q_17", - "name": "q", - "owner": "t", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)I", - "method": "__w_18", - "name": "w", - "owner": "t", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)Laj;", - "method": "__f_16", - "name": "f", - "owner": "t", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__m_15", - "name": "m", - "owner": "t", - "parameters": [] - } - ], - "name": "t", - "super": "ak" - }, - { - "access": 33, - "class": "WorldMapIcon2", - "constructors": [ - { - "access": 0, - "descriptor": "(Lhu;Lhu;ILav;)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1431936619, - "descriptor": "I", - "field": "__u", - "name": "u", - "owner": "r" - }, - { - "access": 0, - "decoder": -25914375, - "descriptor": "I", - "field": "__q", - "name": "q", - "owner": "r" - }, - { - "access": 0, - "decoder": 927871683, - "descriptor": "I", - "field": "__o", - "name": "o", - "owner": "r" - }, - { - "access": 0, - "descriptor": "Laj;", - "field": "label0", - "name": "w", - "owner": "r" - }, - { - "access": 16, - "decoder": -985436813, - "descriptor": "I", - "field": "__m", - "name": "m", - "owner": "r" - }, - { - "access": 16, - "descriptor": "Lav;", - "field": "__f", - "name": "f", - "owner": "r" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(B)I", - "method": "__q_30", - "name": "q", - "owner": "r", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)I", - "method": "__w_31", - "name": "w", - "owner": "r", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)Laj;", - "method": "__f_29", - "name": "f", - "owner": "r", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "__z_27", - "name": "z", - "owner": "r", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "__m_28", - "name": "m", - "owner": "r", - "parameters": [] - } - ], - "name": "r", - "super": "ak" - }, - { - "access": 33, - "class": "WorldMapLabel", - "constructors": [ - { - "access": 0, - "descriptor": "(Ljava/lang/String;IILs;)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -471061617, - "descriptor": "I", - "field": "width", - "name": "f", - "owner": "aj" - }, - { - "access": 0, - "decoder": -85027761, - "descriptor": "I", - "field": "height", - "name": "q", - "owner": "aj" - }, - { - "access": 0, - "descriptor": "Ljava/lang/String;", - "field": "text", - "name": "m", - "owner": "aj" - }, - { - "access": 0, - "descriptor": "Ls;", - "field": "size", - "name": "w", - "owner": "aj" - } - ], - "interfaces": [], - "methods": [], - "name": "aj", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "WorldMapLabelSize", - "constructors": [ - { - "access": 0, - "descriptor": "(III)V" - } - ], - "fields": [ - { - "access": 16, - "decoder": -422937451, - "descriptor": "I", - "field": "__u", - "name": "u", - "owner": "s" - }, - { - "access": 16, - "decoder": 1252293513, - "descriptor": "I", - "field": "__w", - "name": "w", - "owner": "s" - }, - { - "access": 16, - "decoder": 707828941, - "descriptor": "I", - "field": "__o", - "name": "o", - "owner": "s" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(FI)Z", - "method": "__f_14", - "name": "f", - "owner": "s", - "parameters": [ - "arg0" - ] - } - ], - "name": "s", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "WorldMapRegion", - "constructors": [ - { - "access": 0, - "descriptor": "(IIILjava/util/HashMap;)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1061363609, - "descriptor": "I", - "field": "x", - "name": "u", - "owner": "av" - }, - { - "access": 0, - "decoder": -120515153, - "descriptor": "I", - "field": "__x", - "name": "x", - "owner": "av" - }, - { - "access": 0, - "decoder": 2099407363, - "descriptor": "I", - "field": "y", - "name": "g", - "owner": "av" - }, - { - "access": 0, - "decoder": 415972873, - "descriptor": "I", - "field": "__d", - "name": "d", - "owner": "av" - }, - { - "access": 0, - "descriptor": "Ljava/util/HashMap;", - "field": "iconsMap", - "name": "n", - "owner": "av" - }, - { - "access": 0, - "descriptor": "Ljava/util/LinkedList;", - "field": "__e", - "name": "e", - "owner": "av" - }, - { - "access": 0, - "descriptor": "Ljava/util/List;", - "field": "iconsList", - "name": "k", - "owner": "av" - }, - { - "access": 16, - "descriptor": "Ljava/util/HashMap;", - "field": "fonts", - "name": "i", - "owner": "av" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(B)V", - "method": "__e_42", - "name": "e", - "owner": "av", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)Ljava/util/List;", - "method": "icons", - "name": "at", - "owner": "av", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "__d_44", - "name": "d", - "owner": "av", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(II)Laj;", - "method": "__al_55", - "name": "al", - "owner": "av", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "(IIIB)V", - "method": "__w_40", - "name": "w", - "owner": "av", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 0, - "descriptor": "(IIIII)V", - "method": "__ad_58", - "name": "ad", - "owner": "av", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3" - ] - }, - { - "access": 0, - "descriptor": "(IIIIII)Ljava/util/List;", - "method": "__ae_57", - "name": "ae", - "owner": "av", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4" - ] - }, - { - "access": 0, - "descriptor": "(IIILjava/util/HashSet;I)V", - "method": "__j_46", - "name": "j", - "owner": "av", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3" - ] - }, - { - "access": 0, - "descriptor": "(IILjava/util/HashSet;IB)V", - "method": "__ah_54", - "name": "ah", - "owner": "av", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3" - ] - }, - { - "access": 0, - "descriptor": "(IILjava/util/HashSet;IB)V", - "method": "__aq_48", - "name": "aq", - "owner": "av", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3" - ] - }, - { - "access": 0, - "descriptor": "(Lak;IIFI)V", - "method": "__ar_51", - "name": "ar", - "owner": "av", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3" - ] - }, - { - "access": 0, - "descriptor": "(Lak;Lic;IIFI)V", - "method": "__ay_53", - "name": "ay", - "owner": "av", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4" - ] - }, - { - "access": 0, - "descriptor": "(Lic;B)Laj;", - "method": "__ab_56", - "name": "ab", - "owner": "av", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "(Lic;III)V", - "method": "__ac_52", - "name": "ac", - "owner": "av", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 0, - "descriptor": "(Lic;IIIIB)V", - "method": "__av_50", - "name": "av", - "owner": "av", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4" - ] - }, - { - "access": 0, - "descriptor": "(Lir;B)Z", - "method": "__a_45", - "name": "a", - "owner": "av", - "parameters": [ - "arg0" - ] - }, - { - "access": 0, - "descriptor": "(Ljava/util/HashSet;IIB)V", - "method": "__s_47", - "name": "s", - "owner": "av", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 0, - "descriptor": "(Ljava/util/HashSet;III)V", - "method": "__aj_49", - "name": "aj", - "owner": "av", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 0, - "descriptor": "(Ljava/util/HashSet;Ljava/util/List;B)V", - "method": "__u_41", - "name": "u", - "owner": "av", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 0, - "descriptor": "(Ljava/util/List;I)V", - "method": "__x_43", - "name": "x", - "owner": "av", - "parameters": [ - "arg0" - ] - } - ], - "name": "av", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "WorldMapSection0", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1022177315, - "descriptor": "I", - "field": "__e", - "name": "e", - "owner": "y" - }, - { - "access": 0, - "decoder": -1388959491, - "descriptor": "I", - "field": "__k", - "name": "k", - "owner": "y" - }, - { - "access": 0, - "decoder": -1397517463, - "descriptor": "I", - "field": "__x", - "name": "x", - "owner": "y" - }, - { - "access": 0, - "decoder": -150870205, - "descriptor": "I", - "field": "__g", - "name": "g", - "owner": "y" - }, - { - "access": 0, - "decoder": -1657956317, - "descriptor": "I", - "field": "__n", - "name": "n", - "owner": "y" - }, - { - "access": 0, - "decoder": -2011838881, - "descriptor": "I", - "field": "__m", - "name": "m", - "owner": "y" - }, - { - "access": 0, - "decoder": -477370575, - "descriptor": "I", - "field": "__w", - "name": "w", - "owner": "y" - }, - { - "access": 0, - "decoder": -671345527, - "descriptor": "I", - "field": "__o", - "name": "o", - "owner": "y" - }, - { - "access": 0, - "decoder": -799353317, - "descriptor": "I", - "field": "__d", - "name": "d", - "owner": "y" - }, - { - "access": 0, - "decoder": 1009718107, - "descriptor": "I", - "field": "__l", - "name": "l", - "owner": "y" - }, - { - "access": 0, - "decoder": 1299225715, - "descriptor": "I", - "field": "__f", - "name": "f", - "owner": "y" - }, - { - "access": 0, - "decoder": 1345061881, - "descriptor": "I", - "field": "__i", - "name": "i", - "owner": "y" - }, - { - "access": 0, - "decoder": 529427495, - "descriptor": "I", - "field": "__u", - "name": "u", - "owner": "y" - }, - { - "access": 0, - "decoder": 82600709, - "descriptor": "I", - "field": "__q", - "name": "q", - "owner": "y" - } - ], - "interfaces": [ - "ab" - ], - "methods": [ - { - "access": 0, - "descriptor": "(I)V", - "method": "__g_25", - "name": "g", - "owner": "y", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(IIB)Z", - "method": "__q_21", - "name": "q", - "owner": "y", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(III)Lhu;", - "method": "__o_23", - "name": "o", - "owner": "y", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(IIIB)Z", - "method": "__f_20", - "name": "f", - "owner": "y", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "(IIII)[I", - "method": "__w_22", - "name": "w", - "owner": "y", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "(Lag;I)V", - "method": "__m_19", - "name": "m", - "owner": "y", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(Lgr;B)V", - "method": "__u_24", - "name": "u", - "owner": "y", - "parameters": [ - "arg0" - ] - } - ], - "name": "y", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "WorldMapSection1", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1383826035, - "descriptor": "I", - "field": "__u", - "name": "u", - "owner": "as" - }, - { - "access": 0, - "decoder": -1513010233, - "descriptor": "I", - "field": "__o", - "name": "o", - "owner": "as" - }, - { - "access": 0, - "decoder": -1797724181, - "descriptor": "I", - "field": "__e", - "name": "e", - "owner": "as" - }, - { - "access": 0, - "decoder": -1875803617, - "descriptor": "I", - "field": "__q", - "name": "q", - "owner": "as" - }, - { - "access": 0, - "decoder": -1971304641, - "descriptor": "I", - "field": "__m", - "name": "m", - "owner": "as" - }, - { - "access": 0, - "decoder": -890169045, - "descriptor": "I", - "field": "__l", - "name": "l", - "owner": "as" - }, - { - "access": 0, - "decoder": 1483447179, - "descriptor": "I", - "field": "__f", - "name": "f", - "owner": "as" - }, - { - "access": 0, - "decoder": 1526007343, - "descriptor": "I", - "field": "__g", - "name": "g", - "owner": "as" - }, - { - "access": 0, - "decoder": 284566685, - "descriptor": "I", - "field": "__w", - "name": "w", - "owner": "as" - }, - { - "access": 0, - "decoder": 325777555, - "descriptor": "I", - "field": "__x", - "name": "x", - "owner": "as" - } - ], - "interfaces": [ - "ab" - ], - "methods": [ - { - "access": 0, - "descriptor": "(I)V", - "method": "__g_84", - "name": "g", - "owner": "as", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(IIB)Z", - "method": "__q_80", - "name": "q", - "owner": "as", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(III)Lhu;", - "method": "__o_82", - "name": "o", - "owner": "as", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(IIIB)Z", - "method": "__f_79", - "name": "f", - "owner": "as", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "(IIII)[I", - "method": "__w_81", - "name": "w", - "owner": "as", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "(Lag;I)V", - "method": "__m_78", - "name": "m", - "owner": "as", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(Lgr;B)V", - "method": "__u_83", - "name": "u", - "owner": "as", - "parameters": [ - "arg0" - ] - } - ], - "name": "as", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "WorldMapSection2", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1024859679, - "descriptor": "I", - "field": "__q", - "name": "q", - "owner": "ah" - }, - { - "access": 0, - "decoder": -1272330125, - "descriptor": "I", - "field": "__u", - "name": "u", - "owner": "ah" - }, - { - "access": 0, - "decoder": -1561552223, - "descriptor": "I", - "field": "__m", - "name": "m", - "owner": "ah" - }, - { - "access": 0, - "decoder": -245382089, - "descriptor": "I", - "field": "__f", - "name": "f", - "owner": "ah" - }, - { - "access": 0, - "decoder": 40495485, - "descriptor": "I", - "field": "__w", - "name": "w", - "owner": "ah" - }, - { - "access": 0, - "decoder": 982234927, - "descriptor": "I", - "field": "__o", - "name": "o", - "owner": "ah" - } - ], - "interfaces": [ - "ab" - ], - "methods": [ - { - "access": 0, - "descriptor": "(I)V", - "method": "__g_65", - "name": "g", - "owner": "ah", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(IIB)Z", - "method": "__q_61", - "name": "q", - "owner": "ah", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(III)Lhu;", - "method": "__o_63", - "name": "o", - "owner": "ah", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(IIIB)Z", - "method": "__f_60", - "name": "f", - "owner": "ah", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "(IIII)[I", - "method": "__w_62", - "name": "w", - "owner": "ah", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "(Lag;I)V", - "method": "__m_59", - "name": "m", - "owner": "ah", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(Lgr;B)V", - "method": "__u_64", - "name": "u", - "owner": "ah", - "parameters": [ - "arg0" - ] - } - ], - "name": "ah", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "WorldMapSection3", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1068088609, - "descriptor": "I", - "field": "__w", - "name": "w", - "owner": "p" - }, - { - "access": 0, - "decoder": -1351623663, - "descriptor": "I", - "field": "__u", - "name": "u", - "owner": "p" - }, - { - "access": 0, - "decoder": -1622972483, - "descriptor": "I", - "field": "__f", - "name": "f", - "owner": "p" - }, - { - "access": 0, - "decoder": -627081155, - "descriptor": "I", - "field": "__x", - "name": "x", - "owner": "p" - }, - { - "access": 0, - "decoder": 1016557381, - "descriptor": "I", - "field": "__g", - "name": "g", - "owner": "p" - }, - { - "access": 0, - "decoder": 1257151629, - "descriptor": "I", - "field": "__o", - "name": "o", - "owner": "p" - }, - { - "access": 0, - "decoder": 1389733201, - "descriptor": "I", - "field": "__m", - "name": "m", - "owner": "p" - }, - { - "access": 0, - "decoder": 395786901, - "descriptor": "I", - "field": "__e", - "name": "e", - "owner": "p" - }, - { - "access": 0, - "decoder": 702057599, - "descriptor": "I", - "field": "__q", - "name": "q", - "owner": "p" - }, - { - "access": 0, - "decoder": 884736611, - "descriptor": "I", - "field": "__l", - "name": "l", - "owner": "p" - } - ], - "interfaces": [ - "ab" - ], - "methods": [ - { - "access": 0, - "descriptor": "(B)V", - "method": "__g_38", - "name": "g", - "owner": "p", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(IIB)Z", - "method": "__q_34", - "name": "q", - "owner": "p", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(III)Lhu;", - "method": "__o_36", - "name": "o", - "owner": "p", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(IIIB)Z", - "method": "__f_33", - "name": "f", - "owner": "p", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "(IIII)[I", - "method": "__w_35", - "name": "w", - "owner": "p", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "(Lag;I)V", - "method": "__m_32", - "name": "m", - "owner": "p", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(Lgr;B)V", - "method": "__u_37", - "name": "u", - "owner": "p", - "parameters": [ - "arg0" - ] - } - ], - "name": "p", - "super": "java.lang.Object" - }, - { - "access": 33, - "class": "WorldMapSectionType", - "constructors": [ - { - "access": 0, - "descriptor": "(IB)V" - } - ], - "fields": [ - { - "access": 16, - "decoder": 738759853, - "descriptor": "I", - "field": "type", - "name": "o", - "owner": "h" - }, - { - "access": 16, - "descriptor": "B", - "field": "id", - "name": "u", - "owner": "h" - } - ], - "interfaces": [ - "gc" - ], - "methods": [ - { - "access": 1, - "descriptor": "(B)I", - "method": "__f_26", - "name": "f", - "owner": "h", - "parameters": [] - } - ], - "name": "h", - "super": "java.lang.Object" - }, - { - "access": 48, - "class": "TotalQuantityComparator", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [], - "interfaces": [ - "java.util.Comparator" - ], - "methods": [ - { - "access": 0, - "descriptor": "(Ll;Ll;I)I", - "method": "__m_5", - "name": "m", - "owner": "e", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;)Z", - "method": "__equals_7", - "name": "equals", - "owner": "e", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", - "method": "__compare_6", - "name": "compare", - "owner": "e", - "parameters": [ - "arg0", - "arg1" - ] - } - ], - "name": "e", - "super": "java.lang.Object" - }, - { - "access": 48, - "class": "UnitPriceComparator", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [], - "interfaces": [ - "java.util.Comparator" - ], - "methods": [ - { - "access": 0, - "descriptor": "(Ll;Ll;I)I", - "method": "__m_11", - "name": "m", - "owner": "d", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;)Z", - "method": "__equals_13", - "name": "equals", - "owner": "d", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", - "method": "__compare_12", - "name": "compare", - "owner": "d", - "parameters": [ - "arg0", - "arg1" - ] - } - ], - "name": "d", - "super": "java.lang.Object" - }, - { - "access": 48, - "class": "WorldComparator", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [], - "interfaces": [ - "java.util.Comparator" - ], - "methods": [ - { - "access": 0, - "descriptor": "(Ll;Ll;I)I", - "method": "__m_0", - "name": "m", - "owner": "u", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;)Z", - "method": "__equals_2", - "name": "equals", - "owner": "u", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;Ljava/lang/Object;)I", - "method": "__compare_1", - "name": "compare", - "owner": "u", - "parameters": [ - "arg0", - "arg1" - ] - } - ], - "name": "u", - "super": "java.lang.Object" - }, - { - "access": 49, - "class": "AccessFile", - "constructors": [ - { - "access": 1, - "descriptor": "(Ljava/io/File;Ljava/lang/String;J)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -5849841282281477000, - "descriptor": "J", - "field": "capacity", - "name": "f", - "owner": "dk" - }, - { - "access": 0, - "decoder": 7465414039279036000, - "descriptor": "J", - "field": "index", - "name": "q", - "owner": "dk" - }, - { - "access": 0, - "descriptor": "Ljava/io/RandomAccessFile;", - "field": "file", - "name": "m", - "owner": "dk" - } - ], - "interfaces": [], - "methods": [ - { - "access": 16, - "descriptor": "(J)V", - "method": "seek", - "name": "m", - "owner": "dk", - "parameters": [ - "index" - ] - }, - { - "access": 17, - "descriptor": "(I)J", - "method": "length", - "name": "o", - "owner": "dk", - "parameters": [] - }, - { - "access": 17, - "descriptor": "(I)V", - "method": "close", - "name": "q", - "owner": "dk", - "parameters": [] - }, - { - "access": 17, - "descriptor": "(ZI)V", - "method": "closeSync", - "name": "w", - "owner": "dk", - "parameters": [ - "sync" - ] - }, - { - "access": 17, - "descriptor": "([BIIB)V", - "method": "write", - "name": "f", - "owner": "dk", - "parameters": [ - "length", - "src", - "srcIndex" - ] - }, - { - "access": 17, - "descriptor": "([BIII)I", - "method": "read", - "name": "u", - "owner": "dk", - "parameters": [ - "dst", - "dstIndex", - "length" - ] - }, - { - "access": 4, - "descriptor": "()V", - "method": "__finalize_211", - "name": "finalize", - "owner": "dk", - "parameters": [] - } - ], - "name": "dk", - "super": "java.lang.Object" - }, - { - "access": 49, - "class": "ArchiveDisk", - "constructors": [ - { - "access": 1, - "descriptor": "(ILdy;Ldy;I)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1982523283, - "descriptor": "I", - "field": "archive", - "name": "w", - "owner": "ff" - }, - { - "access": 0, - "decoder": -748616567, - "descriptor": "I", - "field": "maxEntrySize", - "name": "o", - "owner": "ff" - }, - { - "access": 0, - "descriptor": "Ldy;", - "field": "datFile", - "name": "f", - "owner": "ff" - }, - { - "access": 0, - "descriptor": "Ldy;", - "field": "idxFile", - "name": "q", - "owner": "ff" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I[BIZI)Z", - "method": "write0", - "name": "q", - "owner": "ff" - }, - { - "access": 1, - "descriptor": "(II)[B", - "method": "read", - "name": "m", - "owner": "ff", - "parameters": [ - "entry" - ] - }, - { - "access": 1, - "descriptor": "(I[BII)Z", - "method": "write", - "name": "f", - "owner": "ff" - } - ], - "name": "ff", - "super": "java.lang.Object" - }, - { - "access": 49, - "class": "BoundaryObject", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -260081891, - "descriptor": "I", - "field": "y", - "name": "q", - "owner": "ej" - }, - { - "access": 0, - "decoder": -693868549, - "descriptor": "I", - "field": "flags", - "name": "e", - "owner": "ej" - }, - { - "access": 0, - "decoder": -9307913, - "descriptor": "I", - "field": "tileHeight", - "name": "m", - "owner": "ej" - }, - { - "access": 0, - "decoder": -969316473, - "descriptor": "I", - "field": "orientationB", - "name": "o", - "owner": "ej" - }, - { - "access": 0, - "decoder": 1724480965, - "descriptor": "I", - "field": "orientationA", - "name": "w", - "owner": "ej" - }, - { - "access": 0, - "decoder": 860688417, - "descriptor": "I", - "field": "x", - "name": "f", - "owner": "ej" - }, - { - "access": 1, - "decoder": -4401157754236673500, - "descriptor": "J", - "field": "tag", - "name": "l", - "owner": "ej" - }, - { - "access": 1, - "descriptor": "Lex;", - "field": "entity1", - "name": "u", - "owner": "ej" - }, - { - "access": 1, - "descriptor": "Lex;", - "field": "entity2", - "name": "g", - "owner": "ej" - } - ], - "interfaces": [], - "methods": [], - "name": "ej", - "super": "java.lang.Object" - }, - { - "access": 49, - "class": "Bzip2Decompressor", - "constructors": [], - "fields": [], - "interfaces": [], - "methods": [], - "name": "gk", - "super": "java.lang.Object" - }, - { - "access": 49, - "class": "Bzip2State", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1510817847, - "descriptor": "I", - "field": "__l", - "name": "l", - "owner": "gt" - }, - { - "access": 0, - "decoder": -1793367959, - "descriptor": "I", - "field": "__z", - "name": "z", - "owner": "gt" - }, - { - "access": 0, - "decoder": -1981923611, - "descriptor": "I", - "field": "__h", - "name": "h", - "owner": "gt" - }, - { - "access": 0, - "decoder": -1987934943, - "descriptor": "I", - "field": "__j", - "name": "j", - "owner": "gt" - }, - { - "access": 0, - "decoder": -1994129645, - "descriptor": "I", - "field": "__a", - "name": "a", - "owner": "gt" - }, - { - "access": 0, - "decoder": -473971741, - "descriptor": "I", - "field": "__e", - "name": "e", - "owner": "gt" - }, - { - "access": 0, - "decoder": -557334365, - "descriptor": "I", - "field": "__c", - "name": "c", - "owner": "gt" - }, - { - "access": 0, - "decoder": -861462251, - "descriptor": "I", - "field": "__d", - "name": "d", - "owner": "gt" - }, - { - "access": 0, - "decoder": -886333045, - "descriptor": "I", - "field": "__v", - "name": "v", - "owner": "gt" - }, - { - "access": 0, - "decoder": -953353963, - "descriptor": "I", - "field": "__y", - "name": "y", - "owner": "gt" - }, - { - "access": 0, - "decoder": 1502359789, - "descriptor": "I", - "field": "__t", - "name": "t", - "owner": "gt" - }, - { - "access": 0, - "decoder": 1860254567, - "descriptor": "I", - "field": "__n", - "name": "n", - "owner": "gt" - }, - { - "access": 0, - "decoder": 444639767, - "descriptor": "I", - "field": "__ae", - "name": "ae", - "owner": "gt" - }, - { - "access": 0, - "decoder": 594179173, - "descriptor": "I", - "field": "__k", - "name": "k", - "owner": "gt" - }, - { - "access": 0, - "descriptor": "B", - "field": "__i", - "name": "i", - "owner": "gt" - }, - { - "access": 0, - "descriptor": "I", - "field": "__s", - "name": "s", - "owner": "gt" - }, - { - "access": 0, - "descriptor": "[B", - "field": "__ac", - "name": "ac", - "owner": "gt" - }, - { - "access": 0, - "descriptor": "[B", - "field": "__aj", - "name": "aj", - "owner": "gt" - }, - { - "access": 0, - "descriptor": "[B", - "field": "__av", - "name": "av", - "owner": "gt" - }, - { - "access": 0, - "descriptor": "[B", - "field": "__ay", - "name": "ay", - "owner": "gt" - }, - { - "access": 0, - "descriptor": "[B", - "field": "__g", - "name": "g", - "owner": "gt" - }, - { - "access": 0, - "descriptor": "[B", - "field": "__x", - "name": "x", - "owner": "gt" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__ab", - "name": "ab", - "owner": "gt" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__ar", - "name": "ar", - "owner": "gt" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__b", - "name": "b", - "owner": "gt" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__r", - "name": "r", - "owner": "gt" - }, - { - "access": 0, - "descriptor": "[Z", - "field": "__ag", - "name": "ag", - "owner": "gt" - }, - { - "access": 0, - "descriptor": "[Z", - "field": "__aq", - "name": "aq", - "owner": "gt" - }, - { - "access": 0, - "descriptor": "[[B", - "field": "__ah", - "name": "ah", - "owner": "gt" - }, - { - "access": 0, - "descriptor": "[[I", - "field": "__ak", - "name": "ak", - "owner": "gt" - }, - { - "access": 0, - "descriptor": "[[I", - "field": "__al", - "name": "al", - "owner": "gt" - }, - { - "access": 0, - "descriptor": "[[I", - "field": "__aw", - "name": "aw", - "owner": "gt" - }, - { - "access": 16, - "descriptor": "I", - "field": "__f", - "name": "f", - "owner": "gt" - }, - { - "access": 16, - "descriptor": "I", - "field": "__m", - "name": "m", - "owner": "gt" - }, - { - "access": 16, - "descriptor": "I", - "field": "__o", - "name": "o", - "owner": "gt" - }, - { - "access": 16, - "descriptor": "I", - "field": "__q", - "name": "q", - "owner": "gt" - }, - { - "access": 16, - "descriptor": "I", - "field": "__u", - "name": "u", - "owner": "gt" - }, - { - "access": 16, - "descriptor": "I", - "field": "__w", - "name": "w", - "owner": "gt" - } - ], - "interfaces": [], - "methods": [], - "name": "gt", - "super": "java.lang.Object" - }, - { - "access": 49, - "class": "Canvas", - "constructors": [ - { - "access": 0, - "descriptor": "(Ljava/awt/Component;)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Ljava/awt/Component;", - "field": "component", - "name": "m", - "owner": "ao" - } - ], - "interfaces": [], - "methods": [ - { - "access": 17, - "descriptor": "(Ljava/awt/Graphics;)V", - "method": "paint", - "name": "paint", - "owner": "ao", - "parameters": [ - "g" - ] - }, - { - "access": 17, - "descriptor": "(Ljava/awt/Graphics;)V", - "method": "update", - "name": "update", - "owner": "ao", - "parameters": [ - "g" - ] - } - ], - "name": "ao", - "super": "java.awt.Canvas" - }, - { - "access": 49, - "class": "Client", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 12, - "decoder": 1789653893, - "descriptor": "I", - "field": "fps", - "name": "k", - "owner": "ba" - }, - { - "access": 12, - "descriptor": "Lfz;", - "field": "taskHandler", - "name": "m", - "owner": "ba" - }, - { - "access": 12, - "descriptor": "Ljava/lang/String;", - "field": "__ks_at", - "name": "at", - "owner": "ks" - }, - { - "access": 12, - "descriptor": "Z", - "field": "__hy_az", - "name": "az", - "owner": "hy" - }, - { - "access": 12, - "descriptor": "Z", - "field": "isStereo", - "name": "u", - "owner": "co" - }, - { - "access": 24, - "descriptor": "D", - "field": "__bv_r", - "name": "r", - "owner": "bv" - }, - { - "access": 24, - "descriptor": "Law;", - "field": "WorldMapCacheName_area", - "name": "w", - "owner": "aw" - }, - { - "access": 24, - "descriptor": "Lcj;", - "field": "AttackOption_alwaysRightClick", - "name": "f", - "owner": "cj" - }, - { - "access": 24, - "descriptor": "Lcj;", - "field": "AttackOption_dependsOnCombatLevels", - "name": "m", - "owner": "cj" - }, - { - "access": 24, - "descriptor": "Lcj;", - "field": "AttackOption_hidden", - "name": "w", - "owner": "cj" - }, - { - "access": 24, - "descriptor": "Lcj;", - "field": "AttackOption_leftClickWhereAvailable", - "name": "q", - "owner": "cj" - }, - { - "access": 24, - "descriptor": "Lgl;", - "field": "__gl_f", - "name": "f", - "owner": "gl" - }, - { - "access": 24, - "descriptor": "Lgl;", - "field": "__gl_o", - "name": "o", - "owner": "gl" - }, - { - "access": 24, - "descriptor": "Lgs;", - "field": "__gs_am", - "name": "am", - "owner": "gs" - }, - { - "access": 24, - "descriptor": "Lgs;", - "field": "__gs_ci", - "name": "ci", - "owner": "gs" - }, - { - "access": 24, - "descriptor": "Lh;", - "field": "__h_f", - "name": "f", - "owner": "h" - }, - { - "access": 24, - "descriptor": "Lh;", - "field": "__h_m", - "name": "m", - "owner": "h" - }, - { - "access": 24, - "descriptor": "Lh;", - "field": "__h_q", - "name": "q", - "owner": "h" - }, - { - "access": 24, - "descriptor": "Lh;", - "field": "__h_w", - "name": "w", - "owner": "h" - }, - { - "access": 24, - "descriptor": "Lij;", - "field": "PlayerType_hardcoreIronman", - "name": "u", - "owner": "ij" - }, - { - "access": 24, - "descriptor": "Lij;", - "field": "PlayerType_ironman", - "name": "w", - "owner": "ij" - }, - { - "access": 24, - "descriptor": "Lij;", - "field": "PlayerType_jagexModerator", - "name": "q", - "owner": "ij" - }, - { - "access": 24, - "descriptor": "Lij;", - "field": "PlayerType_normal", - "name": "m", - "owner": "ij" - }, - { - "access": 24, - "descriptor": "Lij;", - "field": "PlayerType_playerModerator", - "name": "f", - "owner": "ij" - }, - { - "access": 24, - "descriptor": "Lij;", - "field": "PlayerType_ultimateIronman", - "name": "o", - "owner": "ij" - }, - { - "access": 24, - "descriptor": "Lis;", - "field": "__is_f", - "name": "f", - "owner": "is" - }, - { - "access": 24, - "descriptor": "Lis;", - "field": "__is_m", - "name": "m", - "owner": "is" - }, - { - "access": 24, - "descriptor": "Lis;", - "field": "__is_o", - "name": "o", - "owner": "is" - }, - { - "access": 24, - "descriptor": "Lis;", - "field": "__is_q", - "name": "q", - "owner": "is" - }, - { - "access": 24, - "descriptor": "Lis;", - "field": "__is_w", - "name": "w", - "owner": "is" - }, - { - "access": 24, - "descriptor": "Ljava/math/BigInteger;", - "field": "__ce_o", - "name": "o", - "owner": "ce" - }, - { - "access": 24, - "descriptor": "Ljava/math/BigInteger;", - "field": "__ce_u", - "name": "u", - "owner": "ce" - }, - { - "access": 24, - "descriptor": "Ljava/math/BigInteger;", - "field": "__cm_f", - "name": "f", - "owner": "cm" - }, - { - "access": 24, - "descriptor": "Ljava/math/BigInteger;", - "field": "__cm_m", - "name": "m", - "owner": "cm" - }, - { - "access": 24, - "descriptor": "Ljava/util/Map;", - "field": "Messages_channels", - "name": "m", - "owner": "cw" - }, - { - "access": 24, - "descriptor": "Ljc;", - "field": "Messages_queue", - "name": "q", - "owner": "cw" - }, - { - "access": 24, - "descriptor": "Lji;", - "field": "__ji_a", - "name": "a", - "owner": "ji" - }, - { - "access": 24, - "descriptor": "Lji;", - "field": "__ji_d", - "name": "d", - "owner": "ji" - }, - { - "access": 24, - "descriptor": "Lji;", - "field": "__ji_e", - "name": "e", - "owner": "ji" - }, - { - "access": 24, - "descriptor": "Lji;", - "field": "__ji_f", - "name": "f", - "owner": "ji" - }, - { - "access": 24, - "descriptor": "Lji;", - "field": "__ji_g", - "name": "g", - "owner": "ji" - }, - { - "access": 24, - "descriptor": "Lji;", - "field": "__ji_j", - "name": "j", - "owner": "ji" - }, - { - "access": 24, - "descriptor": "Lji;", - "field": "__ji_k", - "name": "k", - "owner": "ji" - }, - { - "access": 24, - "descriptor": "Lji;", - "field": "__ji_l", - "name": "l", - "owner": "ji" - }, - { - "access": 24, - "descriptor": "Lji;", - "field": "__ji_m", - "name": "m", - "owner": "ji" - }, - { - "access": 24, - "descriptor": "Lji;", - "field": "__ji_o", - "name": "o", - "owner": "ji" - }, - { - "access": 24, - "descriptor": "Lji;", - "field": "__ji_q", - "name": "q", - "owner": "ji" - }, - { - "access": 24, - "descriptor": "Lji;", - "field": "__ji_s", - "name": "s", - "owner": "ji" - }, - { - "access": 24, - "descriptor": "Lji;", - "field": "__ji_t", - "name": "t", - "owner": "ji" - }, - { - "access": 24, - "descriptor": "Lji;", - "field": "__ji_u", - "name": "u", - "owner": "ji" - }, - { - "access": 24, - "descriptor": "Lji;", - "field": "__ji_w", - "name": "w", - "owner": "ji" - }, - { - "access": 24, - "descriptor": "Lji;", - "field": "__ji_x", - "name": "x", - "owner": "ji" - }, - { - "access": 24, - "descriptor": "Lji;", - "field": "__ji_z", - "name": "z", - "owner": "ji" - }, - { - "access": 24, - "descriptor": "Lka;", - "field": "DefaultsGroup_graphics", - "name": "m", - "owner": "ka" - }, - { - "access": 24, - "descriptor": "Lkx;", - "field": "fontNameVerdana11", - "name": "x", - "owner": "lz" - }, - { - "access": 24, - "descriptor": "Lkx;", - "field": "fontNameVerdana13", - "name": "d", - "owner": "lz" - }, - { - "access": 24, - "descriptor": "Lkx;", - "field": "fontNameVerdana15", - "name": "k", - "owner": "lz" - }, - { - "access": 24, - "descriptor": "Llh;", - "field": "Messages_hashTable", - "name": "f", - "owner": "cw" - }, - { - "access": 24, - "descriptor": "Llj;", - "field": "__lj_f", - "name": "f", - "owner": "lj" - }, - { - "access": 24, - "descriptor": "Llj;", - "field": "__lj_q", - "name": "q", - "owner": "lj" - }, - { - "access": 24, - "descriptor": "Llx;", - "field": "__lx_f", - "name": "f", - "owner": "lx" - }, - { - "access": 24, - "descriptor": "Llx;", - "field": "__lx_g", - "name": "g", - "owner": "lx" - }, - { - "access": 24, - "descriptor": "Llx;", - "field": "__lx_l", - "name": "l", - "owner": "lx" - }, - { - "access": 24, - "descriptor": "Llx;", - "field": "__lx_o", - "name": "o", - "owner": "lx" - }, - { - "access": 24, - "descriptor": "Llx;", - "field": "__lx_q", - "name": "q", - "owner": "lx" - }, - { - "access": 24, - "descriptor": "Llx;", - "field": "__lx_u", - "name": "u", - "owner": "lx" - }, - { - "access": 24, - "descriptor": "Llx;", - "field": "__lx_w", - "name": "w", - "owner": "lx" - }, - { - "access": 24, - "descriptor": "[B", - "field": "__hs_x", - "name": "x", - "owner": "hs" - }, - { - "access": 24, - "descriptor": "[C", - "field": "__kb_q", - "name": "q", - "owner": "kb" - }, - { - "access": 24, - "descriptor": "[C", - "field": "__kb_w", - "name": "w", - "owner": "kb" - }, - { - "access": 24, - "descriptor": "[F", - "field": "__ca_f", - "name": "f", - "owner": "ca" - }, - { - "access": 24, - "descriptor": "[I", - "field": "PacketBuffer_masks", - "name": "x", - "owner": "hx" - }, - { - "access": 24, - "descriptor": "[I", - "field": "__bq_b", - "name": "b", - "owner": "bq" - }, - { - "access": 24, - "descriptor": "[I", - "field": "__bq_c", - "name": "c", - "owner": "bq" - }, - { - "access": 24, - "descriptor": "[I", - "field": "__bq_h", - "name": "h", - "owner": "bq" - }, - { - "access": 24, - "descriptor": "[I", - "field": "__bq_r", - "name": "r", - "owner": "bq" - }, - { - "access": 24, - "descriptor": "[I", - "field": "__bq_t", - "name": "t", - "owner": "bq" - }, - { - "access": 24, - "descriptor": "[I", - "field": "__bq_y", - "name": "y", - "owner": "bq" - }, - { - "access": 24, - "descriptor": "[I", - "field": "__ca_m", - "name": "m", - "owner": "ca" - }, - { - "access": 24, - "descriptor": "[I", - "field": "__client_gd", - "name": "gd", - "owner": "client" - }, - { - "access": 24, - "descriptor": "[I", - "field": "__em_aa", - "name": "aa", - "owner": "em" - }, - { - "access": 24, - "descriptor": "[I", - "field": "__em_af", - "name": "af", - "owner": "em" - }, - { - "access": 24, - "descriptor": "[I", - "field": "__em_ai", - "name": "ai", - "owner": "em" - }, - { - "access": 24, - "descriptor": "[I", - "field": "__em_ao", - "name": "ao", - "owner": "em" - }, - { - "access": 24, - "descriptor": "[I", - "field": "__em_au", - "name": "au", - "owner": "em" - }, - { - "access": 24, - "descriptor": "[I", - "field": "__em_ax", - "name": "ax", - "owner": "em" - }, - { - "access": 24, - "descriptor": "[I", - "field": "__em_ba", - "name": "ba", - "owner": "em" - }, - { - "access": 24, - "descriptor": "[I", - "field": "__gx_d", - "name": "d", - "owner": "gx" - }, - { - "access": 24, - "descriptor": "[I", - "field": "__gx_x", - "name": "x", - "owner": "gx" - }, - { - "access": 24, - "descriptor": "[I", - "field": "__hi_d", - "name": "d", - "owner": "hi" - }, - { - "access": 24, - "descriptor": "[I", - "field": "playerMenuOpcodes", - "name": "kp", - "owner": "client" - }, - { - "access": 24, - "descriptor": "[Lgl;", - "field": "__gl_g", - "name": "g", - "owner": "gl" - }, - { - "access": 24, - "descriptor": "[Ljava/lang/String;", - "field": "__bv_z", - "name": "z", - "owner": "bv" - }, - { - "access": 24, - "descriptor": "[Ljava/lang/String;", - "field": "__hg_f", - "name": "f", - "owner": "hg" - }, - { - "access": 24, - "descriptor": "[[I", - "field": "__dv_b", - "name": "b", - "owner": "dv" - }, - { - "access": 24, - "descriptor": "[[I", - "field": "__dv_h", - "name": "h", - "owner": "dv" - }, - { - "access": 24, - "descriptor": "[[Ljava/lang/String;", - "field": "__hg_m", - "name": "m", - "owner": "hg" - }, - { - "access": 25, - "descriptor": "Law;", - "field": "WorldMapCacheName_compositeMap", - "name": "f", - "owner": "aw" - }, - { - "access": 25, - "descriptor": "Law;", - "field": "WorldMapCacheName_compositeTexture", - "name": "q", - "owner": "aw" - }, - { - "access": 25, - "descriptor": "Law;", - "field": "WorldMapCacheName_details", - "name": "m", - "owner": "aw" - }, - { - "access": 25, - "descriptor": "Law;", - "field": "WorldMapCacheName_labels", - "name": "o", - "owner": "aw" - }, - { - "access": 25, - "descriptor": "Lcl;", - "field": "packetWriter", - "name": "fj", - "owner": "client" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_a", - "name": "a", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_aa", - "name": "aa", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_ab", - "name": "ab", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_ac", - "name": "ac", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_ad", - "name": "ad", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_ae", - "name": "ae", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_af", - "name": "af", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_ag", - "name": "ag", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_ah", - "name": "ah", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_ai", - "name": "ai", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_aj", - "name": "aj", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_ak", - "name": "ak", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_al", - "name": "al", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_am", - "name": "am", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_an", - "name": "an", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_ao", - "name": "ao", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_ap", - "name": "ap", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_aq", - "name": "aq", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_ar", - "name": "ar", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_as", - "name": "as", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_at", - "name": "at", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_au", - "name": "au", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_av", - "name": "av", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_aw", - "name": "aw", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_ax", - "name": "ax", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_ay", - "name": "ay", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_az", - "name": "az", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_b", - "name": "b", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_ba", - "name": "ba", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_bb", - "name": "bb", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_bc", - "name": "bc", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_bd", - "name": "bd", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_be", - "name": "be", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_bf", - "name": "bf", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_bg", - "name": "bg", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_bh", - "name": "bh", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_bi", - "name": "bi", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_bj", - "name": "bj", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_bk", - "name": "bk", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_bl", - "name": "bl", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_bm", - "name": "bm", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_bn", - "name": "bn", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_bo", - "name": "bo", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_bp", - "name": "bp", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_bq", - "name": "bq", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_br", - "name": "br", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_bs", - "name": "bs", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_bt", - "name": "bt", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_bu", - "name": "bu", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_bv", - "name": "bv", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_bw", - "name": "bw", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_bx", - "name": "bx", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_by", - "name": "by", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_bz", - "name": "bz", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_c", - "name": "c", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_ce", - "name": "ce", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_cj", - "name": "cj", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_cm", - "name": "cm", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_cr", - "name": "cr", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_cs", - "name": "cs", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_cv", - "name": "cv", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_cy", - "name": "cy", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_d", - "name": "d", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_e", - "name": "e", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_f", - "name": "f", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_g", - "name": "g", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_h", - "name": "h", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_i", - "name": "i", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_j", - "name": "j", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_k", - "name": "k", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_l", - "name": "l", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_m", - "name": "m", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_n", - "name": "n", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_o", - "name": "o", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_p", - "name": "p", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_q", - "name": "q", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_r", - "name": "r", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_s", - "name": "s", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_t", - "name": "t", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_u", - "name": "u", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_v", - "name": "v", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_w", - "name": "w", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_x", - "name": "x", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_y", - "name": "y", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lge;", - "field": "__ge_z", - "name": "z", - "owner": "ge" - }, - { - "access": 25, - "descriptor": "Lgl;", - "field": "__gl_m", - "name": "m", - "owner": "gl" - }, - { - "access": 25, - "descriptor": "Lgl;", - "field": "__gl_q", - "name": "q", - "owner": "gl" - }, - { - "access": 25, - "descriptor": "Lgl;", - "field": "__gl_w", - "name": "w", - "owner": "gl" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_a", - "name": "a", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_aa", - "name": "aa", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_ab", - "name": "ab", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_ac", - "name": "ac", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_ad", - "name": "ad", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_ae", - "name": "ae", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_af", - "name": "af", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_ag", - "name": "ag", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_ah", - "name": "ah", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_ai", - "name": "ai", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_aj", - "name": "aj", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_ak", - "name": "ak", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_al", - "name": "al", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_an", - "name": "an", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_ao", - "name": "ao", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_ap", - "name": "ap", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_aq", - "name": "aq", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_ar", - "name": "ar", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_as", - "name": "as", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_at", - "name": "at", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_au", - "name": "au", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_av", - "name": "av", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_aw", - "name": "aw", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_ax", - "name": "ax", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_ay", - "name": "ay", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_az", - "name": "az", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_b", - "name": "b", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_ba", - "name": "ba", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_bb", - "name": "bb", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_bc", - "name": "bc", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_bd", - "name": "bd", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_be", - "name": "be", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_bf", - "name": "bf", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_bg", - "name": "bg", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_bh", - "name": "bh", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_bi", - "name": "bi", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_bj", - "name": "bj", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_bk", - "name": "bk", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_bl", - "name": "bl", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_bm", - "name": "bm", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_bn", - "name": "bn", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_bo", - "name": "bo", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_bp", - "name": "bp", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_bq", - "name": "bq", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_br", - "name": "br", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_bs", - "name": "bs", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_bt", - "name": "bt", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_bu", - "name": "bu", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_bv", - "name": "bv", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_bw", - "name": "bw", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_bx", - "name": "bx", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_by", - "name": "by", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_bz", - "name": "bz", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_c", - "name": "c", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_cb", - "name": "cb", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_cc", - "name": "cc", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_ce", - "name": "ce", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_cf", - "name": "cf", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_cg", - "name": "cg", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_ch", - "name": "ch", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_cj", - "name": "cj", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_ck", - "name": "ck", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_cl", - "name": "cl", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_cm", - "name": "cm", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_cn", - "name": "cn", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_cp", - "name": "cp", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_cq", - "name": "cq", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_cr", - "name": "cr", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_cs", - "name": "cs", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_ct", - "name": "ct", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_cu", - "name": "cu", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_cv", - "name": "cv", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_cw", - "name": "cw", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_cy", - "name": "cy", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_cz", - "name": "cz", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_d", - "name": "d", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_e", - "name": "e", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_f", - "name": "f", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_g", - "name": "g", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_h", - "name": "h", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_i", - "name": "i", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_j", - "name": "j", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_k", - "name": "k", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_l", - "name": "l", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_m", - "name": "m", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_n", - "name": "n", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_o", - "name": "o", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_p", - "name": "p", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_q", - "name": "q", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_r", - "name": "r", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_s", - "name": "s", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_t", - "name": "t", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_u", - "name": "u", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_v", - "name": "v", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_w", - "name": "w", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_x", - "name": "x", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_y", - "name": "y", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lgs;", - "field": "__gs_z", - "name": "z", - "owner": "gs" - }, - { - "access": 25, - "descriptor": "Lis;", - "field": "__is_u", - "name": "u", - "owner": "is" - }, - { - "access": 25, - "descriptor": "Liy;", - "field": "__iy_f", - "name": "f", - "owner": "iy" - }, - { - "access": 25, - "descriptor": "Liy;", - "field": "__iy_m", - "name": "m", - "owner": "iy" - }, - { - "access": 25, - "descriptor": "Liy;", - "field": "__iy_q", - "name": "q", - "owner": "iy" - }, - { - "access": 25, - "descriptor": "Liy;", - "field": "__iy_w", - "name": "w", - "owner": "iy" - }, - { - "access": 25, - "descriptor": "Lji;", - "field": "__ji_i", - "name": "i", - "owner": "ji" - }, - { - "access": 25, - "descriptor": "Lji;", - "field": "__ji_n", - "name": "n", - "owner": "ji" - }, - { - "access": 25, - "descriptor": "Lkd;", - "field": "TriBool_false", - "name": "q", - "owner": "kd" - }, - { - "access": 25, - "descriptor": "Lkd;", - "field": "TriBool_true", - "name": "f", - "owner": "kd" - }, - { - "access": 25, - "descriptor": "Lkd;", - "field": "TriBool_unknown", - "name": "m", - "owner": "kd" - }, - { - "access": 25, - "descriptor": "Lkx;", - "field": "FontName_bold12", - "name": "q", - "owner": "kx" - }, - { - "access": 25, - "descriptor": "Lkx;", - "field": "FontName_plain11", - "name": "m", - "owner": "kx" - }, - { - "access": 25, - "descriptor": "Lkx;", - "field": "FontName_plain12", - "name": "f", - "owner": "kx" - }, - { - "access": 25, - "descriptor": "Lkx;", - "field": "FontName_verdana11", - "name": "w", - "owner": "kx" - }, - { - "access": 25, - "descriptor": "Lkx;", - "field": "FontName_verdana13", - "name": "o", - "owner": "kx" - }, - { - "access": 25, - "descriptor": "Lkx;", - "field": "FontName_verdana15", - "name": "u", - "owner": "kx" - }, - { - "access": 25, - "descriptor": "Llj;", - "field": "__lj_m", - "name": "m", - "owner": "lj" - }, - { - "access": 25, - "descriptor": "Llx;", - "field": "__lx_e", - "name": "e", - "owner": "lx" - }, - { - "access": 25, - "descriptor": "Llx;", - "field": "__lx_m", - "name": "m", - "owner": "lx" - }, - { - "access": 25, - "descriptor": "Ls;", - "field": "WorldMapLabelSize_large", - "name": "q", - "owner": "s" - }, - { - "access": 25, - "descriptor": "Ls;", - "field": "WorldMapLabelSize_medium", - "name": "f", - "owner": "s" - }, - { - "access": 25, - "descriptor": "Ls;", - "field": "WorldMapLabelSize_small", - "name": "m", - "owner": "s" - }, - { - "access": 25, - "descriptor": "[C", - "field": "base37Table", - "name": "m", - "owner": "ku" - }, - { - "access": 25, - "descriptor": "[C", - "field": "cp1252AsciiExtension", - "name": "m", - "owner": "kr" - }, - { - "access": 25, - "descriptor": "[S", - "field": "__ht_m", - "name": "m", - "owner": "ht" - }, - { - "access": 25, - "descriptor": "[S", - "field": "__ht_q", - "name": "q", - "owner": "ht" - }, - { - "access": 25, - "descriptor": "[Z", - "field": "Skills_enabled", - "name": "f", - "owner": "hc" - }, - { - "access": 25, - "descriptor": "[[S", - "field": "__ht_f", - "name": "f", - "owner": "ht" - }, - { - "access": 25, - "descriptor": "[[S", - "field": "__ht_w", - "name": "w", - "owner": "ht" - }, - { - "access": 72, - "descriptor": "Z", - "field": "hasFocus", - "name": "an", - "owner": "ba" - }, - { - "access": 73, - "decoder": -1080652669, - "descriptor": "I", - "field": "MouseHandler_idleCycles", - "name": "o", - "owner": "bb" - }, - { - "access": 73, - "decoder": -474146073, - "descriptor": "I", - "field": "KeyHandler_idleCycles", - "name": "ci", - "owner": "an" - }, - { - "access": 73, - "decoder": -5429651987476438000, - "descriptor": "J", - "field": "MouseHandler_millis0", - "name": "e", - "owner": "bb" - }, - { - "access": 73, - "decoder": -813801905, - "descriptor": "I", - "field": "MouseHandler_lastPressedX0", - "name": "a", - "owner": "bb" - }, - { - "access": 73, - "decoder": 1048471439, - "descriptor": "I", - "field": "MouseHandler_x0", - "name": "g", - "owner": "bb" - }, - { - "access": 73, - "decoder": 14138669, - "descriptor": "I", - "field": "MouseHandler_lastPressedY0", - "name": "z", - "owner": "bb" - }, - { - "access": 73, - "decoder": 2000222973, - "descriptor": "I", - "field": "MouseHandler_y0", - "name": "l", - "owner": "bb" - }, - { - "access": 73, - "decoder": 3555003757894628400, - "descriptor": "J", - "field": "MouseHandler_lastPressedTimeMillis0", - "name": "j", - "owner": "bb" - }, - { - "access": 73, - "decoder": 590718769, - "descriptor": "I", - "field": "MouseHandler_lastButton0", - "name": "i", - "owner": "bb" - }, - { - "access": 73, - "decoder": 642308075, - "descriptor": "I", - "field": "MouseHandler_currentButton0", - "name": "u", - "owner": "bb" - }, - { - "access": 8, - "decoder": -1019558835, - "descriptor": "I", - "field": "__bv_y", - "name": "y", - "owner": "bv" - }, - { - "access": 8, - "decoder": -1036874153, - "descriptor": "I", - "field": "hintArrowPlayerIndex", - "name": "ct", - "owner": "client" - }, - { - "access": 8, - "decoder": -1042005999, - "descriptor": "I", - "field": "__ba_aw", - "name": "aw", - "owner": "ba" - }, - { - "access": 8, - "decoder": -1050480853, - "descriptor": "I", - "field": "__client_fd", - "name": "fd", - "owner": "client" - }, - { - "access": 8, - "decoder": -1086790653, - "descriptor": "I", - "field": "__ik_rt", - "name": "rt", - "owner": "ik" - }, - { - "access": 8, - "decoder": -1119867679, - "descriptor": "I", - "field": "__lr_m", - "name": "m", - "owner": "lr" - }, - { - "access": 8, - "decoder": -1131782991, - "descriptor": "I", - "field": "__ao_gk", - "name": "gk", - "owner": "ao" - }, - { - "access": 8, - "decoder": -114766123, - "descriptor": "I", - "field": "Interpreter_stringStackSize", - "name": "x", - "owner": "bv" - }, - { - "access": 8, - "decoder": -1149138989, - "descriptor": "I", - "field": "__client_hk", - "name": "hk", - "owner": "client" - }, - { - "access": 8, - "decoder": -1163038981, - "descriptor": "I", - "field": "camAngleY", - "name": "hp", - "owner": "client" - }, - { - "access": 8, - "decoder": -1168497831, - "descriptor": "I", - "field": "Messages_count", - "name": "w", - "owner": "cw" - }, - { - "access": 8, - "decoder": -1179083285, - "descriptor": "I", - "field": "__ba_l", - "name": "l", - "owner": "ba" - }, - { - "access": 8, - "decoder": -12041645, - "descriptor": "I", - "field": "menuX", - "name": "kw", - "owner": "v" - }, - { - "access": 8, - "decoder": -1208053825, - "descriptor": "I", - "field": "__an_cw", - "name": "cw", - "owner": "an" - }, - { - "access": 8, - "decoder": -1208823721, - "descriptor": "I", - "field": "__client_ke", - "name": "ke", - "owner": "client" - }, - { - "access": 8, - "decoder": -1213062413, - "descriptor": "I", - "field": "__client_iy", - "name": "iy", - "owner": "client" - }, - { - "access": 8, - "decoder": -1218466245, - "descriptor": "I", - "field": "__by_hb", - "name": "hb", - "owner": "by" - }, - { - "access": 8, - "decoder": -123748133, - "descriptor": "I", - "field": "hintArrowY", - "name": "cc", - "owner": "client" - }, - { - "access": 8, - "decoder": -1237576843, - "descriptor": "I", - "field": "Interpreter_intStackSize", - "name": "l", - "owner": "fe" - }, - { - "access": 8, - "decoder": -1247107945, - "descriptor": "I", - "field": "__bs_nb", - "name": "nb", - "owner": "bs" - }, - { - "access": 8, - "decoder": -1267243587, - "descriptor": "I", - "field": "__client_jz", - "name": "jz", - "owner": "client" - }, - { - "access": 8, - "decoder": -12672775, - "descriptor": "I", - "field": "gameDrawingMode", - "name": "oz", - "owner": "client" - }, - { - "access": 8, - "decoder": -1282224505, - "descriptor": "I", - "field": "__iv_q", - "name": "q", - "owner": "iv" - }, - { - "access": 8, - "decoder": -1286287981, - "descriptor": "I", - "field": "__x_rg", - "name": "rg", - "owner": "x" - }, - { - "access": 8, - "decoder": -1302827103, - "descriptor": "I", - "field": "mouseCrossState", - "name": "jw", - "owner": "client" - }, - { - "access": 8, - "decoder": -1309758309, - "descriptor": "I", - "field": "combatTargetPlayerIndex", - "name": "kx", - "owner": "client" - }, - { - "access": 8, - "decoder": -1313705721, - "descriptor": "I", - "field": "__client_cq", - "name": "cq", - "owner": "client" - }, - { - "access": 8, - "decoder": -134014371, - "descriptor": "I", - "field": "__client_gy", - "name": "gy", - "owner": "client" - }, - { - "access": 8, - "decoder": -1344682613, - "descriptor": "I", - "field": "selectedSpellFlags", - "name": "my", - "owner": "do" - }, - { - "access": 8, - "decoder": -1352723865, - "descriptor": "I", - "field": "__client_qp", - "name": "qp", - "owner": "client" - }, - { - "access": 8, - "decoder": -1362734353, - "descriptor": "I", - "field": "__client_pl", - "name": "pl", - "owner": "client" - }, - { - "access": 8, - "decoder": -1367955455, - "descriptor": "I", - "field": "__hq_qg", - "name": "qg", - "owner": "hq" - }, - { - "access": 8, - "decoder": -137788125, - "descriptor": "I", - "field": "minimapState", - "name": "qm", - "owner": "client" - }, - { - "access": 8, - "decoder": -1379876433, - "descriptor": "I", - "field": "__client_ng", - "name": "ng", - "owner": "client" - }, - { - "access": 8, - "decoder": -1406125895, - "descriptor": "I", - "field": "__client_hx", - "name": "hx", - "owner": "client" - }, - { - "access": 8, - "decoder": -1420078475, - "descriptor": "I", - "field": "__client_hj", - "name": "hj", - "owner": "client" - }, - { - "access": 8, - "decoder": -1431050759, - "descriptor": "I", - "field": "js5ConnectState", - "name": "da", - "owner": "client" - }, - { - "access": 8, - "decoder": -1454618167, - "descriptor": "I", - "field": "Tiles_minPlane", - "name": "q", - "owner": "bq" - }, - { - "access": 8, - "decoder": -1456975367, - "descriptor": "I", - "field": "__client_gh", - "name": "gh", - "owner": "client" - }, - { - "access": 8, - "decoder": -1481002083, - "descriptor": "I", - "field": "soundEffectCount", - "name": "qa", - "owner": "client" - }, - { - "access": 8, - "decoder": -1514610183, - "descriptor": "I", - "field": "Login_loadingPercent", - "name": "b", - "owner": "cu" - }, - { - "access": 8, - "decoder": -1516124929, - "descriptor": "I", - "field": "__as_ey", - "name": "ey", - "owner": "as" - }, - { - "access": 8, - "decoder": -1520594673, - "descriptor": "I", - "field": "titleLoadingStage", - "name": "dt", - "owner": "client" - }, - { - "access": 8, - "decoder": -1546210597, - "descriptor": "I", - "field": "archiveLoaderArchive", - "name": "sq", - "owner": "client" - }, - { - "access": 8, - "decoder": -1555836449, - "descriptor": "I", - "field": "__ar_qw", - "name": "qw", - "owner": "ar" - }, - { - "access": 8, - "decoder": -1569269731, - "descriptor": "I", - "field": "npcCount", - "name": "ep", - "owner": "client" - }, - { - "access": 8, - "decoder": -1605454211, - "descriptor": "I", - "field": "__g_z", - "name": "z", - "owner": "g" - }, - { - "access": 8, - "decoder": -1605855913, - "descriptor": "I", - "field": "__client_sl", - "name": "sl", - "owner": "client" - }, - { - "access": 8, - "decoder": -1628183831, - "descriptor": "I", - "field": "mouseWheelRotation", - "name": "oe", - "owner": "client" - }, - { - "access": 8, - "decoder": -163579343, - "descriptor": "I", - "field": "loginState", - "name": "ed", - "owner": "client" - }, - { - "access": 8, - "decoder": -1645409107, - "descriptor": "I", - "field": "selectedItemComponent", - "name": "ix", - "owner": "ge" - }, - { - "access": 8, - "decoder": -1698831905, - "descriptor": "I", - "field": "__ba_e", - "name": "e", - "owner": "ba" - }, - { - "access": 8, - "decoder": -1704358328771671000, - "descriptor": "J", - "field": "__client_pp", - "name": "pp", - "owner": "client" - }, - { - "access": 8, - "decoder": -1715020411, - "descriptor": "I", - "field": "__client_mf", - "name": "mf", - "owner": "client" - }, - { - "access": 8, - "decoder": -1731573291, - "descriptor": "I", - "field": "__client_cn", - "name": "cn", - "owner": "client" - }, - { - "access": 8, - "decoder": -1734004743, - "descriptor": "I", - "field": "menuHeight", - "name": "ka", - "owner": "ak" - }, - { - "access": 8, - "decoder": -1749538901, - "descriptor": "I", - "field": "menuOptionsCount", - "name": "ll", - "owner": "client" - }, - { - "access": 8, - "decoder": -1757834373, - "descriptor": "I", - "field": "hintArrowX", - "name": "cz", - "owner": "client" - }, - { - "access": 8, - "decoder": -1762891465, - "descriptor": "I", - "field": "__dk_o", - "name": "o", - "owner": "dk" - }, - { - "access": 8, - "decoder": -1792536059, - "descriptor": "I", - "field": "rebootTimer", - "name": "cf", - "owner": "client" - }, - { - "access": 8, - "decoder": -1802494233, - "descriptor": "I", - "field": "publicChatMode", - "name": "pt", - "owner": "client" - }, - { - "access": 8, - "decoder": -1807262579, - "descriptor": "I", - "field": "__bw_d", - "name": "d", - "owner": "bw" - }, - { - "access": 8, - "decoder": -1810047523, - "descriptor": "I", - "field": "__i_af", - "name": "af", - "owner": "i" - }, - { - "access": 8, - "decoder": -184301597, - "descriptor": "I", - "field": "pcmPlayerCount", - "name": "e", - "owner": "cu" - }, - { - "access": 8, - "decoder": -1869532553, - "descriptor": "I", - "field": "localPlayerIndex", - "name": "ji", - "owner": "client" - }, - { - "access": 8, - "decoder": -1942470229, - "descriptor": "I", - "field": "__ak_qj", - "name": "qj", - "owner": "ak" - }, - { - "access": 8, - "decoder": -1942898885, - "descriptor": "I", - "field": "__an_cc", - "name": "cc", - "owner": "an" - }, - { - "access": 8, - "decoder": -1945589829, - "descriptor": "I", - "field": "cameraZ", - "name": "hl", - "owner": "k" - }, - { - "access": 8, - "decoder": -1946112139, - "descriptor": "I", - "field": "__y_sn", - "name": "sn", - "owner": "y" - }, - { - "access": 8, - "decoder": -1972775883, - "descriptor": "I", - "field": "componentClickX", - "name": "mt", - "owner": "client" - }, - { - "access": 8, - "decoder": -1984048653, - "descriptor": "I", - "field": "mouseCrossY", - "name": "jq", - "owner": "client" - }, - { - "access": 8, - "decoder": -2062450631, - "descriptor": "I", - "field": "selectedItemId", - "name": "iz", - "owner": "cs" - }, - { - "access": 8, - "decoder": -2071972829, - "descriptor": "I", - "field": "__dm_l", - "name": "l", - "owner": "dm" - }, - { - "access": 8, - "decoder": -2077113503, - "descriptor": "I", - "field": "__ka_e", - "name": "e", - "owner": "ka" - }, - { - "access": 8, - "decoder": -2078849253, - "descriptor": "I", - "field": "__ba_s", - "name": "s", - "owner": "ba" - }, - { - "access": 8, - "decoder": -2142579405, - "descriptor": "I", - "field": "__bq_p", - "name": "p", - "owner": "bq" - }, - { - "access": 8, - "decoder": -215744973, - "descriptor": "I", - "field": "__bb_hz", - "name": "hz", - "owner": "bb" - }, - { - "access": 8, - "decoder": -22568397, - "descriptor": "I", - "field": "__cq_n", - "name": "n", - "owner": "cq" - }, - { - "access": 8, - "decoder": -244224193, - "descriptor": "I", - "field": "__ir_s", - "name": "s", - "owner": "ir" - }, - { - "access": 8, - "decoder": -256520591, - "descriptor": "I", - "field": "port2", - "name": "eq", - "owner": "ag" - }, - { - "access": 8, - "decoder": -274968037, - "descriptor": "I", - "field": "__client_ls", - "name": "ls", - "owner": "client" - }, - { - "access": 8, - "decoder": -278874973, - "descriptor": "I", - "field": "__client_nh", - "name": "nh", - "owner": "client" - }, - { - "access": 8, - "decoder": -281664295, - "descriptor": "I", - "field": "__ba_q", - "name": "q", - "owner": "ba" - }, - { - "access": 8, - "decoder": -3234258972092460000, - "descriptor": "J", - "field": "__cu_bz", - "name": "bz", - "owner": "cu" - }, - { - "access": 8, - "decoder": -34294211, - "descriptor": "I", - "field": "__client_qy", - "name": "qy", - "owner": "client" - }, - { - "access": 8, - "decoder": -3607118089363666000, - "descriptor": "J", - "field": "garbageCollectorLastCheckTimeMs", - "name": "aa", - "owner": "ba" - }, - { - "access": 8, - "decoder": -362336323, - "descriptor": "I", - "field": "destinationX", - "name": "pd", - "owner": "client" - }, - { - "access": 8, - "decoder": -365366303, - "descriptor": "I", - "field": "__iy_lo", - "name": "lo", - "owner": "iy" - }, - { - "access": 8, - "decoder": -376233039, - "descriptor": "I", - "field": "__cu_br", - "name": "br", - "owner": "cu" - }, - { - "access": 8, - "decoder": -438288575, - "descriptor": "I", - "field": "baseY", - "name": "fr", - "owner": "bw" - }, - { - "access": 8, - "decoder": -441913785, - "descriptor": "I", - "field": "__client_hc", - "name": "hc", - "owner": "client" - }, - { - "access": 8, - "decoder": -447055355, - "descriptor": "I", - "field": "__client_eo", - "name": "eo", - "owner": "client" - }, - { - "access": 8, - "decoder": -457229589, - "descriptor": "I", - "field": "__eh_fy", - "name": "fy", - "owner": "eh" - }, - { - "access": 8, - "decoder": -460406997, - "descriptor": "I", - "field": "__client_pm", - "name": "pm", - "owner": "client" - }, - { - "access": 8, - "decoder": -480633777, - "descriptor": "I", - "field": "__client_hu", - "name": "hu", - "owner": "client" - }, - { - "access": 8, - "decoder": -516933613, - "descriptor": "I", - "field": "__client_hn", - "name": "hn", - "owner": "client" - }, - { - "access": 8, - "decoder": -546798303, - "descriptor": "I", - "field": "rootComponentCount", - "name": "os", - "owner": "client" - }, - { - "access": 8, - "decoder": -597100741, - "descriptor": "I", - "field": "__client_fn", - "name": "fn", - "owner": "client" - }, - { - "access": 8, - "decoder": -6104270600047501000, - "descriptor": "J", - "field": "js5StartTimeMs", - "name": "ds", - "owner": "eh" - }, - { - "access": 8, - "decoder": -6166028446082638000, - "descriptor": "J", - "field": "currentTimeMsOffset", - "name": "f", - "owner": "ga" - }, - { - "access": 8, - "decoder": -627650567, - "descriptor": "I", - "field": "hintArrowHeight", - "name": "ci", - "owner": "client" - }, - { - "access": 8, - "decoder": -629885193, - "descriptor": "I", - "field": "viewportHeight", - "name": "rx", - "owner": "client" - }, - { - "access": 8, - "decoder": -631434243, - "descriptor": "I", - "field": "plane", - "name": "jg", - "owner": "dx" - }, - { - "access": 8, - "decoder": -64320473, - "descriptor": "I", - "field": "__client_ky", - "name": "ky", - "owner": "client" - }, - { - "access": 8, - "decoder": -6574384275386813000, - "descriptor": "J", - "field": "__client_ch", - "name": "ch", - "owner": "client" - }, - { - "access": 8, - "decoder": -6780258776884307000, - "descriptor": "J", - "field": "__hd_fc", - "name": "fc", - "owner": "hd" - }, - { - "access": 8, - "decoder": -704675849, - "descriptor": "I", - "field": "__dr_ao", - "name": "ao", - "owner": "dr" - }, - { - "access": 8, - "decoder": -745071109, - "descriptor": "I", - "field": "__hb_sg", - "name": "sg", - "owner": "hb" - }, - { - "access": 8, - "decoder": -753026759, - "descriptor": "I", - "field": "port1", - "name": "ee", - "owner": "q" - }, - { - "access": 8, - "decoder": -758575207, - "descriptor": "I", - "field": "__client_nv", - "name": "nv", - "owner": "client" - }, - { - "access": 8, - "decoder": -76329055, - "descriptor": "I", - "field": "__lr_q", - "name": "q", - "owner": "lr" - }, - { - "access": 8, - "decoder": -766468303, - "descriptor": "I", - "field": "Players_count", - "name": "u", - "owner": "cq" - }, - { - "access": 8, - "decoder": -783816509, - "descriptor": "I", - "field": "rootInterface", - "name": "mm", - "owner": "client" - }, - { - "access": 8, - "decoder": -790717597, - "descriptor": "I", - "field": "baseX", - "name": "ff", - "owner": "af" - }, - { - "access": 8, - "decoder": -791125441, - "descriptor": "I", - "field": "ByteArrayPool_smallCount", - "name": "m", - "owner": "gi" - }, - { - "access": 8, - "decoder": -817957995, - "descriptor": "I", - "field": "__an_ra", - "name": "ra", - "owner": "an" - }, - { - "access": 8, - "decoder": -818676431, - "descriptor": "I", - "field": "__client_qc", - "name": "qc", - "owner": "client" - }, - { - "access": 8, - "decoder": -81902865, - "descriptor": "I", - "field": "viewportTempY", - "name": "ia", - "owner": "client" - }, - { - "access": 8, - "decoder": -836653679, - "descriptor": "I", - "field": "dragItemSlotDestination", - "name": "jy", - "owner": "client" - }, - { - "access": 8, - "decoder": -836962805, - "descriptor": "I", - "field": "__client_jo", - "name": "jo", - "owner": "client" - }, - { - "access": 8, - "decoder": -843739713, - "descriptor": "I", - "field": "__client_nw", - "name": "nw", - "owner": "client" - }, - { - "access": 8, - "decoder": -8445874050676184000, - "descriptor": "J", - "field": "mouseLastLastPressedTimeMillis", - "name": "cb", - "owner": "client" - }, - { - "access": 8, - "decoder": -852671813, - "descriptor": "I", - "field": "__dm_k", - "name": "k", - "owner": "dm" - }, - { - "access": 8, - "decoder": -852697585, - "descriptor": "I", - "field": "__fo_ro", - "name": "ro", - "owner": "fo" - }, - { - "access": 8, - "decoder": -871534943, - "descriptor": "I", - "field": "hintArrowType", - "name": "cp", - "owner": "client" - }, - { - "access": 8, - "decoder": -883931753, - "descriptor": "I", - "field": "__eo_u", - "name": "u", - "owner": "eo" - }, - { - "access": 8, - "decoder": -898263359, - "descriptor": "I", - "field": "__client_ku", - "name": "ku", - "owner": "client" - }, - { - "access": 8, - "decoder": -93280591, - "descriptor": "I", - "field": "__an_ct", - "name": "ct", - "owner": "an" - }, - { - "access": 8, - "decoder": -934082817, - "descriptor": "I", - "field": "__client_na", - "name": "na", - "owner": "client" - }, - { - "access": 8, - "decoder": -948290091, - "descriptor": "I", - "field": "__p_go", - "name": "go", - "owner": "p" - }, - { - "access": 8, - "decoder": -952172003, - "descriptor": "I", - "field": "__client_if", - "name": "if", - "owner": "client" - }, - { - "access": 8, - "decoder": -964416527, - "descriptor": "I", - "field": "__client_ej", - "name": "ej", - "owner": "client" - }, - { - "access": 8, - "decoder": -971800905, - "descriptor": "I", - "field": "ByteArrayPool_largeCount", - "name": "q", - "owner": "gi" - }, - { - "access": 8, - "decoder": -992379173, - "descriptor": "I", - "field": "__bx_o", - "name": "o", - "owner": "bx" - }, - { - "access": 8, - "decoder": 1005832199, - "descriptor": "I", - "field": "camFollowHeight", - "name": "ho", - "owner": "client" - }, - { - "access": 8, - "decoder": 1006519291, - "descriptor": "I", - "field": "__fw_nm", - "name": "nm", - "owner": "fw" - }, - { - "access": 8, - "decoder": 1013162399149344800, - "descriptor": "J", - "field": "garbageCollectorLastCollectionTime", - "name": "ao", - "owner": "ba" - }, - { - "access": 8, - "decoder": 1019025247, - "descriptor": "I", - "field": "__client_nk", - "name": "nk", - "owner": "client" - }, - { - "access": 8, - "decoder": 1052276727, - "descriptor": "I", - "field": "componentClickY", - "name": "me", - "owner": "client" - }, - { - "access": 8, - "decoder": 1052834531, - "descriptor": "I", - "field": "cameraX", - "name": "ha", - "owner": "as" - }, - { - "access": 8, - "decoder": 1075569245, - "descriptor": "I", - "field": "__bu_hy", - "name": "hy", - "owner": "bu" - }, - { - "access": 8, - "decoder": 1076448827, - "descriptor": "I", - "field": "__gs_qh", - "name": "qh", - "owner": "gs" - }, - { - "access": 8, - "decoder": 1077910071, - "descriptor": "I", - "field": "__cu_aj", - "name": "aj", - "owner": "cu" - }, - { - "access": 8, - "decoder": 1084498299, - "descriptor": "I", - "field": "__client_jc", - "name": "jc", - "owner": "client" - }, - { - "access": 8, - "decoder": 1112094745, - "descriptor": "I", - "field": "__an_ch", - "name": "ch", - "owner": "an" - }, - { - "access": 8, - "decoder": 1132932607, - "descriptor": "I", - "field": "__client_nx", - "name": "nx", - "owner": "client" - }, - { - "access": 8, - "decoder": 1135175963, - "descriptor": "I", - "field": "__dm_u", - "name": "u", - "owner": "dm" - }, - { - "access": 8, - "decoder": 1143875805, - "descriptor": "I", - "field": "__bt_g", - "name": "g", - "owner": "bt" - }, - { - "access": 8, - "decoder": 1154760205, - "descriptor": "I", - "field": "__client_dp", - "name": "dp", - "owner": "client" - }, - { - "access": 8, - "decoder": 1181569415, - "descriptor": "I", - "field": "__fs_au", - "name": "au", - "owner": "fs" - }, - { - "access": 8, - "decoder": 1186004739, - "descriptor": "I", - "field": "gameBuild", - "name": "bq", - "owner": "client" - }, - { - "access": 8, - "decoder": 120772859, - "descriptor": "I", - "field": "__hv_h", - "name": "h", - "owner": "hv" - }, - { - "access": 8, - "decoder": 1230692157, - "descriptor": "I", - "field": "__client_pb", - "name": "pb", - "owner": "client" - }, - { - "access": 8, - "decoder": 1298845031, - "descriptor": "I", - "field": "destinationY", - "name": "pk", - "owner": "client" - }, - { - "access": 8, - "decoder": 1326137897, - "descriptor": "I", - "field": "cameraY", - "name": "hs", - "owner": "g" - }, - { - "access": 8, - "decoder": 1348053843, - "descriptor": "I", - "field": "__client_oo", - "name": "oo", - "owner": "client" - }, - { - "access": 8, - "decoder": 1351620693, - "descriptor": "I", - "field": "__dq_rq", - "name": "rq", - "owner": "dq" - }, - { - "access": 8, - "decoder": 1365951359, - "descriptor": "I", - "field": "__client_qf", - "name": "qf", - "owner": "client" - }, - { - "access": 8, - "decoder": 1393270633, - "descriptor": "I", - "field": "hintArrowSubY", - "name": "cx", - "owner": "client" - }, - { - "access": 8, - "decoder": 1431381579, - "descriptor": "I", - "field": "__cu_bl", - "name": "bl", - "owner": "cu" - }, - { - "access": 8, - "decoder": 1467519791, - "descriptor": "I", - "field": "__client_nq", - "name": "nq", - "owner": "client" - }, - { - "access": 8, - "decoder": 1485594821, - "descriptor": "I", - "field": "hintArrowNpcIndex", - "name": "cl", - "owner": "client" - }, - { - "access": 8, - "decoder": 1486366835, - "descriptor": "I", - "field": "itemDragDuration", - "name": "jt", - "owner": "client" - }, - { - "access": 8, - "decoder": 1502058429, - "descriptor": "I", - "field": "__client_ht", - "name": "ht", - "owner": "client" - }, - { - "access": 8, - "decoder": 1548448409, - "descriptor": "I", - "field": "__bf_m", - "name": "m", - "owner": "bf" - }, - { - "access": 8, - "decoder": 1548722671, - "descriptor": "I", - "field": "__cu_bj", - "name": "bj", - "owner": "cu" - }, - { - "access": 8, - "decoder": 1577759565, - "descriptor": "I", - "field": "__s_fi", - "name": "fi", - "owner": "s" - }, - { - "access": 8, - "decoder": 1602665191, - "descriptor": "I", - "field": "followerIndex", - "name": "ml", - "owner": "client" - }, - { - "access": 8, - "decoder": 1606541885, - "descriptor": "I", - "field": "__cu_q", - "name": "q", - "owner": "cu" - }, - { - "access": 8, - "decoder": 1608439891, - "descriptor": "I", - "field": "__w_qs", - "name": "qs", - "owner": "w" - }, - { - "access": 8, - "decoder": 161627197, - "descriptor": "I", - "field": "__lr_f", - "name": "f", - "owner": "lr" - }, - { - "access": 8, - "decoder": 1630772923, - "descriptor": "I", - "field": "isItemSelected", - "name": "lz", - "owner": "client" - }, - { - "access": 8, - "decoder": 1658018867, - "descriptor": "I", - "field": "__client_hg", - "name": "hg", - "owner": "client" - }, - { - "access": 8, - "decoder": 1664350313, - "descriptor": "I", - "field": "__client_hr", - "name": "hr", - "owner": "client" - }, - { - "access": 8, - "decoder": 1677133239, - "descriptor": "I", - "field": "__cu_ac", - "name": "ac", - "owner": "cu" - }, - { - "access": 8, - "decoder": 1678472241, - "descriptor": "I", - "field": "clientType", - "name": "bm", - "owner": "client" - }, - { - "access": 8, - "decoder": 1691923909, - "descriptor": "I", - "field": "__client_ju", - "name": "ju", - "owner": "client" - }, - { - "access": 8, - "decoder": 1694810089, - "descriptor": "I", - "field": "__client_mb", - "name": "mb", - "owner": "client" - }, - { - "access": 8, - "decoder": 1769484271, - "descriptor": "I", - "field": "__cu_bb", - "name": "bb", - "owner": "cu" - }, - { - "access": 8, - "decoder": 1791955261, - "descriptor": "I", - "field": "js5Errors", - "name": "ek", - "owner": "client" - }, - { - "access": 8, - "decoder": 1861681835, - "descriptor": "I", - "field": "__cu_aw", - "name": "aw", - "owner": "cu" - }, - { - "access": 8, - "decoder": 1875936371, - "descriptor": "I", - "field": "menuY", - "name": "kl", - "owner": "ba" - }, - { - "access": 8, - "decoder": 1881890525, - "descriptor": "I", - "field": "__client_np", - "name": "np", - "owner": "client" - }, - { - "access": 8, - "decoder": 1889277277, - "descriptor": "I", - "field": "overheadTextLimit", - "name": "iv", - "owner": "client" - }, - { - "access": 8, - "decoder": 1909006131, - "descriptor": "I", - "field": "cycle", - "name": "cu", - "owner": "client" - }, - { - "access": 8, - "decoder": 1912123225, - "descriptor": "I", - "field": "selectedItemSlot", - "name": "lx", - "owner": "ii" - }, - { - "access": 8, - "decoder": 1939745821, - "descriptor": "I", - "field": "__client_nl", - "name": "nl", - "owner": "client" - }, - { - "access": 8, - "decoder": 1959822241, - "descriptor": "I", - "field": "__client_je", - "name": "je", - "owner": "client" - }, - { - "access": 8, - "decoder": 196309625, - "descriptor": "I", - "field": "__client_lc", - "name": "lc", - "owner": "client" - }, - { - "access": 8, - "decoder": 1990512261, - "descriptor": "I", - "field": "__client_ni", - "name": "ni", - "owner": "client" - }, - { - "access": 8, - "decoder": 202604997, - "descriptor": "I", - "field": "mouseCrossX", - "name": "jb", - "owner": "client" - }, - { - "access": 8, - "decoder": 2035623995, - "descriptor": "I", - "field": "viewportWidth", - "name": "ry", - "owner": "client" - }, - { - "access": 8, - "decoder": 2059180753, - "descriptor": "I", - "field": "componentDragDuration", - "name": "no", - "owner": "bu" - }, - { - "access": 8, - "decoder": 206275573, - "descriptor": "I", - "field": "__client_sx", - "name": "sx", - "owner": "client" - }, - { - "access": 8, - "decoder": 2066759739, - "descriptor": "I", - "field": "__an_cz", - "name": "cz", - "owner": "an" - }, - { - "access": 8, - "decoder": 2068355509, - "descriptor": "I", - "field": "language", - "name": "bo", - "owner": "client" - }, - { - "access": 8, - "decoder": 2069364655, - "descriptor": "I", - "field": "cameraYaw", - "name": "he", - "owner": "ha" - }, - { - "access": 8, - "decoder": 2079315667, - "descriptor": "I", - "field": "menuWidth", - "name": "ko", - "owner": "hf" - }, - { - "access": 8, - "decoder": 2096389021, - "descriptor": "I", - "field": "__ek_x", - "name": "x", - "owner": "ek" - }, - { - "access": 8, - "decoder": 2121641763, - "descriptor": "I", - "field": "ByteArrayPool_mediumCount", - "name": "f", - "owner": "gi" - }, - { - "access": 8, - "decoder": 2128395635, - "descriptor": "I", - "field": "__client_ms", - "name": "ms", - "owner": "client" - }, - { - "access": 8, - "decoder": 218086227, - "descriptor": "I", - "field": "__client_hv", - "name": "hv", - "owner": "client" - }, - { - "access": 8, - "decoder": 233222155, - "descriptor": "I", - "field": "worldsCount", - "name": "u", - "owner": "bt" - }, - { - "access": 8, - "decoder": 233318639, - "descriptor": "I", - "field": "mouseCrossColor", - "name": "jm", - "owner": "client" - }, - { - "access": 8, - "decoder": 236939601, - "descriptor": "I", - "field": "__client_ie", - "name": "ie", - "owner": "client" - }, - { - "access": 8, - "decoder": 244995961, - "descriptor": "I", - "field": "gameState", - "name": "br", - "owner": "client" - }, - { - "access": 8, - "decoder": 247245677, - "descriptor": "I", - "field": "chatEffects", - "name": "mg", - "owner": "client" - }, - { - "access": 8, - "decoder": 26099827, - "descriptor": "I", - "field": "__client_lq", - "name": "lq", - "owner": "client" - }, - { - "access": 8, - "decoder": 262104267, - "descriptor": "I", - "field": "__dm_g", - "name": "g", - "owner": "dm" - }, - { - "access": 8, - "decoder": 289477221, - "descriptor": "I", - "field": "viewportDrawCount", - "name": "ii", - "owner": "client" - }, - { - "access": 8, - "decoder": 3311945626287518700, - "descriptor": "J", - "field": "currentTimeMsLast", - "name": "m", - "owner": "ed" - }, - { - "access": 8, - "decoder": 334735939, - "descriptor": "I", - "field": "__ir_bu", - "name": "bu", - "owner": "ir" - }, - { - "access": 8, - "decoder": 3423502126894795300, - "descriptor": "J", - "field": "__z_si", - "name": "si", - "owner": "z" - }, - { - "access": 8, - "decoder": 344308849, - "descriptor": "I", - "field": "__client_nc", - "name": "nc", - "owner": "client" - }, - { - "access": 8, - "decoder": 351193663, - "descriptor": "I", - "field": "__client_in", - "name": "in", - "owner": "client" - }, - { - "access": 8, - "decoder": 352819683, - "descriptor": "I", - "field": "worldProperties", - "name": "bb", - "owner": "client" - }, - { - "access": 8, - "decoder": 36001423, - "descriptor": "I", - "field": "weight", - "name": "mv", - "owner": "client" - }, - { - "access": 8, - "decoder": 386331251, - "descriptor": "I", - "field": "viewportOffsetX", - "name": "rr", - "owner": "client" - }, - { - "access": 8, - "decoder": 402871301, - "descriptor": "I", - "field": "__client_hi", - "name": "hi", - "owner": "client" - }, - { - "access": 8, - "decoder": 410614005, - "descriptor": "I", - "field": "camAngleX", - "name": "hw", - "owner": "client" - }, - { - "access": 8, - "decoder": 424442889, - "descriptor": "I", - "field": "viewportTempX", - "name": "ig", - "owner": "client" - }, - { - "access": 8, - "decoder": 425367827, - "descriptor": "I", - "field": "__ba_d", - "name": "d", - "owner": "ba" - }, - { - "access": 8, - "decoder": 438998245, - "descriptor": "I", - "field": "__client_hd", - "name": "hd", - "owner": "client" - }, - { - "access": 8, - "decoder": 485534011, - "descriptor": "I", - "field": "dragItemSlotSource", - "name": "jp", - "owner": "client" - }, - { - "access": 8, - "decoder": 490189491, - "descriptor": "I", - "field": "cameraPitch", - "name": "hq", - "owner": "t" - }, - { - "access": 8, - "decoder": 516059665, - "descriptor": "I", - "field": "__client_fw", - "name": "fw", - "owner": "client" - }, - { - "access": 8, - "decoder": 535219347, - "descriptor": "I", - "field": "__client_mh", - "name": "mh", - "owner": "client" - }, - { - "access": 8, - "decoder": 541065633, - "descriptor": "I", - "field": "viewportZoom", - "name": "rz", - "owner": "client" - }, - { - "access": 8, - "decoder": 545127349, - "descriptor": "I", - "field": "Interpreter_frameDepth", - "name": "d", - "owner": "bv" - }, - { - "access": 8, - "decoder": 587773171, - "descriptor": "I", - "field": "__client_ph", - "name": "ph", - "owner": "client" - }, - { - "access": 8, - "decoder": 616180377, - "descriptor": "I", - "field": "overheadTextCount", - "name": "ir", - "owner": "client" - }, - { - "access": 8, - "decoder": 636454135, - "descriptor": "I", - "field": "__bd_er", - "name": "er", - "owner": "bd" - }, - { - "access": 8, - "decoder": 662119345, - "descriptor": "I", - "field": "__iu_n", - "name": "n", - "owner": "iu" - }, - { - "access": 8, - "decoder": 685418907, - "descriptor": "I", - "field": "__client_gp", - "name": "gp", - "owner": "client" - }, - { - "access": 8, - "decoder": 689094231, - "descriptor": "I", - "field": "__client_el", - "name": "el", - "owner": "client" - }, - { - "access": 8, - "decoder": 699084605, - "descriptor": "I", - "field": "__client_lb", - "name": "lb", - "owner": "client" - }, - { - "access": 8, - "decoder": 743073293, - "descriptor": "I", - "field": "__client_ns", - "name": "ns", - "owner": "client" - }, - { - "access": 8, - "decoder": 749254081, - "descriptor": "I", - "field": "hintArrowSubX", - "name": "cd", - "owner": "client" - }, - { - "access": 8, - "decoder": 755300107, - "descriptor": "I", - "field": "__client_ex", - "name": "ex", - "owner": "client" - }, - { - "access": 8, - "decoder": 760022015, - "descriptor": "I", - "field": "__client_nd", - "name": "nd", - "owner": "client" - }, - { - "access": 8, - "decoder": 803647694904294300, - "descriptor": "J", - "field": "__cu_bi", - "name": "bi", - "owner": "cu" - }, - { - "access": 8, - "decoder": 813973829, - "descriptor": "I", - "field": "__client_ja", - "name": "ja", - "owner": "client" - }, - { - "access": 8, - "decoder": 821563709, - "descriptor": "I", - "field": "staffModLevel", - "name": "mw", - "owner": "client" - }, - { - "access": 8, - "decoder": 829228151, - "descriptor": "I", - "field": "__client_fe", - "name": "fe", - "owner": "client" - }, - { - "access": 8, - "decoder": 834543729, - "descriptor": "I", - "field": "__bq_v", - "name": "v", - "owner": "bq" - }, - { - "access": 8, - "decoder": 8470625, - "descriptor": "I", - "field": "__client_fk", - "name": "fk", - "owner": "client" - }, - { - "access": 8, - "decoder": 864673321, - "descriptor": "I", - "field": "mapIconCount", - "name": "pi", - "owner": "client" - }, - { - "access": 8, - "decoder": 8818983958751332000, - "descriptor": "J", - "field": "__client_oa", - "name": "oa", - "owner": "client" - }, - { - "access": 8, - "decoder": 885052255, - "descriptor": "I", - "field": "__client_ln", - "name": "ln", - "owner": "client" - }, - { - "access": 8, - "decoder": 910983131, - "descriptor": "I", - "field": "__client_ik", - "name": "ik", - "owner": "client" - }, - { - "access": 8, - "decoder": 932541923, - "descriptor": "I", - "field": "__cu_y", - "name": "y", - "owner": "cu" - }, - { - "access": 8, - "decoder": 933910819, - "descriptor": "I", - "field": "runEnergy", - "name": "mi", - "owner": "client" - }, - { - "access": 8, - "decoder": 944933439, - "descriptor": "I", - "field": "__client_sd", - "name": "sd", - "owner": "client" - }, - { - "access": 8, - "decoder": 945250525, - "descriptor": "I", - "field": "__cq_l", - "name": "l", - "owner": "cq" - }, - { - "access": 8, - "decoder": 992721193, - "descriptor": "I", - "field": "viewportOffsetY", - "name": "rn", - "owner": "client" - }, - { - "access": 8, - "decoder": 994298267, - "descriptor": "I", - "field": "port3", - "name": "eh", - "owner": "ga" - }, - { - "access": 8, - "descriptor": "F", - "field": "__di_l", - "name": "l", - "owner": "di" - }, - { - "access": 8, - "descriptor": "I", - "field": "AbstractFont_alpha", - "name": "s", - "owner": "kt" - }, - { - "access": 8, - "descriptor": "I", - "field": "AbstractFont_color", - "name": "j", - "owner": "kt" - }, - { - "access": 8, - "descriptor": "I", - "field": "AbstractFont_justificationCurrent", - "name": "y", - "owner": "kt" - }, - { - "access": 8, - "descriptor": "I", - "field": "AbstractFont_justificationTotal", - "name": "t", - "owner": "kt" - }, - { - "access": 8, - "descriptor": "I", - "field": "AbstractFont_previousColor", - "name": "z", - "owner": "kt" - }, - { - "access": 8, - "descriptor": "I", - "field": "AbstractFont_previousShadow", - "name": "i", - "owner": "kt" - }, - { - "access": 8, - "descriptor": "I", - "field": "AbstractFont_shadow", - "name": "a", - "owner": "kt" - }, - { - "access": 8, - "descriptor": "I", - "field": "AbstractFont_strike", - "name": "k", - "owner": "kt" - }, - { - "access": 8, - "descriptor": "I", - "field": "AbstractFont_underline", - "name": "n", - "owner": "kt" - }, - { - "access": 8, - "descriptor": "I", - "field": "Model_transformTempX", - "name": "bd", - "owner": "du" - }, - { - "access": 8, - "descriptor": "I", - "field": "Model_transformTempY", - "name": "bc", - "owner": "du" - }, - { - "access": 8, - "descriptor": "I", - "field": "Model_transformTempZ", - "name": "bo", - "owner": "du" - }, - { - "access": 8, - "descriptor": "I", - "field": "Rasterizer3D_alpha", - "name": "o", - "owner": "et" - }, - { - "access": 8, - "descriptor": "I", - "field": "Rasterizer3D_clipHeight", - "name": "z", - "owner": "et" - }, - { - "access": 8, - "descriptor": "I", - "field": "Rasterizer3D_clipMidX", - "name": "n", - "owner": "et" - }, - { - "access": 8, - "descriptor": "I", - "field": "Rasterizer3D_clipMidX2", - "name": "s", - "owner": "et" - }, - { - "access": 8, - "descriptor": "I", - "field": "Rasterizer3D_clipMidY", - "name": "i", - "owner": "et" - }, - { - "access": 8, - "descriptor": "I", - "field": "Rasterizer3D_clipMidY2", - "name": "y", - "owner": "et" - }, - { - "access": 8, - "descriptor": "I", - "field": "Rasterizer3D_clipNegativeMidX", - "name": "j", - "owner": "et" - }, - { - "access": 8, - "descriptor": "I", - "field": "Rasterizer3D_clipNegativeMidY", - "name": "t", - "owner": "et" - }, - { - "access": 8, - "descriptor": "I", - "field": "Rasterizer3D_clipWidth", - "name": "a", - "owner": "et" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_cameraPitchCosine", - "name": "aq", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_cameraPitchSine", - "name": "ag", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_cameraX", - "name": "r", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_cameraXTile", - "name": "b", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_cameraXTileMax", - "name": "t", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_cameraXTileMin", - "name": "s", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_cameraY", - "name": "p", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_cameraYTile", - "name": "c", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_cameraYTileMax", - "name": "h", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_cameraYTileMin", - "name": "y", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_cameraYawCosine", - "name": "av", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_cameraYawSine", - "name": "aj", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_cameraZ", - "name": "v", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_currentOccludersCount", - "name": "am", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_drawnCount", - "name": "j", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_plane", - "name": "z", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_selectedPlane", - "name": "ay", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_selectedScreenX", - "name": "ah", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_selectedScreenY", - "name": "ak", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_viewportXCenter", - "name": "bx", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_viewportXMax", - "name": "bl", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_viewportXMin", - "name": "bu", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_viewportYCenter", - "name": "by", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_viewportYMax", - "name": "br", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "Scene_viewportYMin", - "name": "bm", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "__cd_d", - "name": "d", - "owner": "cd" - }, - { - "access": 8, - "descriptor": "I", - "field": "__cd_e", - "name": "e", - "owner": "cd" - }, - { - "access": 8, - "descriptor": "I", - "field": "__cd_l", - "name": "l", - "owner": "cd" - }, - { - "access": 8, - "descriptor": "I", - "field": "__cd_x", - "name": "x", - "owner": "cd" - }, - { - "access": 8, - "descriptor": "I", - "field": "__di_e", - "name": "e", - "owner": "di" - }, - { - "access": 8, - "descriptor": "I", - "field": "__dw_ab", - "name": "ab", - "owner": "dw" - }, - { - "access": 8, - "descriptor": "I", - "field": "__em_a", - "name": "a", - "owner": "em" - }, - { - "access": 8, - "descriptor": "I", - "field": "__em_ad", - "name": "ad", - "owner": "em" - }, - { - "access": 8, - "descriptor": "Lap;", - "field": "worldMapEvent", - "name": "j", - "owner": "z" - }, - { - "access": 8, - "descriptor": "Lba;", - "field": "gameShell", - "name": "f", - "owner": "ba" - }, - { - "access": 8, - "descriptor": "Lbf;", - "field": "clientPreferences", - "name": "su", - "owner": "lw" - }, - { - "access": 8, - "descriptor": "Lbj;", - "field": "__client_sj", - "name": "sj", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Lbr;", - "field": "localPlayer", - "name": "jk", - "owner": "ao" - }, - { - "access": 8, - "descriptor": "Lbu;", - "field": "mouseRecorder", - "name": "ck", - "owner": "cb" - }, - { - "access": 8, - "descriptor": "Lch;", - "field": "varcs", - "name": "of", - "owner": "gy" - }, - { - "access": 8, - "descriptor": "Lcj;", - "field": "npcAttackOption", - "name": "de", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Lcj;", - "field": "playerAttackOption", - "name": "co", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Lclient;", - "field": "client", - "name": "af", - "owner": "dl" - }, - { - "access": 8, - "descriptor": "Lcn;", - "field": "secureRandomFuture", - "name": "eu", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Lco;", - "field": "pcmPlayer0", - "name": "qu", - "owner": "aw" - }, - { - "access": 8, - "descriptor": "Lco;", - "field": "pcmPlayer1", - "name": "qb", - "owner": "ir" - }, - { - "access": 8, - "descriptor": "Lcs;", - "field": "tempMenuAction", - "name": "lr", - "owner": "d" - }, - { - "access": 8, - "descriptor": "Lct;", - "field": "pcmStreamMixer", - "name": "qr", - "owner": "fz" - }, - { - "access": 8, - "descriptor": "Ldl;", - "field": "textureProvider", - "name": "jn", - "owner": "cn" - }, - { - "access": 8, - "descriptor": "Ldp;", - "field": "decimator", - "name": "qi", - "owner": "fd" - }, - { - "access": 8, - "descriptor": "Ldu;", - "field": "Model_sharedSequenceModel", - "name": "m", - "owner": "du" - }, - { - "access": 8, - "descriptor": "Ldu;", - "field": "Model_sharedSpotAnimationModel", - "name": "q", - "owner": "du" - }, - { - "access": 8, - "descriptor": "Ldx;", - "field": "soundSystem", - "name": "x", - "owner": "cw" - }, - { - "access": 8, - "descriptor": "Lem;", - "field": "scene", - "name": "gf", - "owner": "bl" - }, - { - "access": 8, - "descriptor": "Leo;", - "field": "urlRequester", - "name": "fz", - "owner": "kd" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "Component_cachedFonts", - "name": "a", - "owner": "ho" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "Component_cachedModels", - "name": "i", - "owner": "ho" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "EnumDefinition_cached", - "name": "f", - "owner": "jw" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "FloorUnderlayDefinition_cached", - "name": "f", - "owner": "ih" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "HealthBarDefinition_cachedSprites", - "name": "w", - "owner": "ii" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "HitmarkDefinition_cached", - "name": "w", - "owner": "jm" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "HitmarkDefinition_cachedFonts", - "name": "u", - "owner": "jm" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "ItemDefinition_cached", - "name": "x", - "owner": "jv" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "ItemDefinition_cachedModels", - "name": "d", - "owner": "jv" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "KitDefinition_cached", - "name": "w", - "owner": "im" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "NpcDefinition_cached", - "name": "q", - "owner": "jz" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "NpcDefinition_cachedModels", - "name": "w", - "owner": "jz" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "ObjectDefinition_cached", - "name": "w", - "owner": "jr" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "ObjectDefinition_cachedModels", - "name": "g", - "owner": "jr" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "ParamDefinition_cached", - "name": "f", - "owner": "jb" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "Script_cached", - "name": "m", - "owner": "cg" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "SpotAnimationDefinition_cached", - "name": "q", - "owner": "io" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "SpotAnimationDefinition_cachedModels", - "name": "w", - "owner": "io" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "Sprite_cached", - "name": "k", - "owner": "jv" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "WorldMapElement_cachedSprites", - "name": "w", - "owner": "ic" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "__ho_n", - "name": "n", - "owner": "ho" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "__ho_z", - "name": "z", - "owner": "ho" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "__ib_f", - "name": "f", - "owner": "ib" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "__iw_f", - "name": "f", - "owner": "iw" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "__jm_o", - "name": "o", - "owner": "jm" - }, - { - "access": 8, - "descriptor": "Ler;", - "field": "__jr_u", - "name": "u", - "owner": "jr" - }, - { - "access": 8, - "descriptor": "Ley;", - "field": "__kn_x", - "name": "x", - "owner": "kn" - }, - { - "access": 8, - "descriptor": "Lfa;", - "field": "clock", - "name": "n", - "owner": "fg" - }, - { - "access": 8, - "descriptor": "Lff;", - "field": "masterDisk", - "name": "sc", - "owner": "kz" - }, - { - "access": 8, - "descriptor": "Lfm;", - "field": "js5SocketTask", - "name": "dn", - "owner": "hr" - }, - { - "access": 8, - "descriptor": "Lfm;", - "field": "socketTask", - "name": "fl", - "owner": "fq" - }, - { - "access": 8, - "descriptor": "Lfu;", - "field": "__ji_fp", - "name": "fp", - "owner": "ji" - }, - { - "access": 8, - "descriptor": "Lfu;", - "field": "js5Socket", - "name": "df", - "owner": "cf" - }, - { - "access": 8, - "descriptor": "Lfv;", - "field": "mouseWheel", - "name": "ol", - "owner": "j" - }, - { - "access": 8, - "descriptor": "Lg;", - "field": "grandExchangeEvents", - "name": "sm", - "owner": "do" - }, - { - "access": 8, - "descriptor": "Lgo;", - "field": "gzipDecompressor", - "name": "i", - "owner": "ir" - }, - { - "access": 8, - "descriptor": "Lgr;", - "field": "__cq_a", - "name": "a", - "owner": "cq" - }, - { - "access": 8, - "descriptor": "Lgt;", - "field": "Bzip2Decompressor_state", - "name": "l", - "owner": "gk" - }, - { - "access": 8, - "descriptor": "Lhi;", - "field": "__client_ru", - "name": "ru", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Lho;", - "field": "__client_md", - "name": "md", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Lho;", - "field": "__client_mo", - "name": "mo", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Lho;", - "field": "__dk_lm", - "name": "lm", - "owner": "dk" - }, - { - "access": 8, - "descriptor": "Lho;", - "field": "__ej_jv", - "name": "jv", - "owner": "ej" - }, - { - "access": 8, - "descriptor": "Lho;", - "field": "__fg_jh", - "name": "jh", - "owner": "fg" - }, - { - "access": 8, - "descriptor": "Lho;", - "field": "__n_n", - "name": "n", - "owner": "n" - }, - { - "access": 8, - "descriptor": "Lho;", - "field": "__t_i", - "name": "i", - "owner": "t" - }, - { - "access": 8, - "descriptor": "Lho;", - "field": "clickedComponent", - "name": "mc", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Lho;", - "field": "clickedComponentParent", - "name": "mr", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Lho;", - "field": "dragInventoryComponent", - "name": "jf", - "owner": "az" - }, - { - "access": 8, - "descriptor": "Lho;", - "field": "mousedOverComponentIf1", - "name": "lu", - "owner": "fa" - }, - { - "access": 8, - "descriptor": "Lho;", - "field": "viewportComponent", - "name": "mx", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Lir;", - "field": "FloorFloorUnderlayDefinition_archive", - "name": "m", - "owner": "ih" - }, - { - "access": 8, - "descriptor": "Lir;", - "field": "NpcDefinition_archive", - "name": "m", - "owner": "jz" - }, - { - "access": 8, - "descriptor": "Lir;", - "field": "NpcDefinition_modelArchive", - "name": "f", - "owner": "jz" - }, - { - "access": 8, - "descriptor": "Lir;", - "field": "ObjectDefinition_archive", - "name": "f", - "owner": "jr" - }, - { - "access": 8, - "descriptor": "Lir;", - "field": "VarbitDefinition_archive", - "name": "m", - "owner": "ia" - }, - { - "access": 8, - "descriptor": "Lir;", - "field": "__iw_m", - "name": "m", - "owner": "iw" - }, - { - "access": 8, - "descriptor": "Lir;", - "field": "__jm_f", - "name": "f", - "owner": "jm" - }, - { - "access": 8, - "descriptor": "Lir;", - "field": "__jm_m", - "name": "m", - "owner": "jm" - }, - { - "access": 8, - "descriptor": "Lir;", - "field": "__jm_q", - "name": "q", - "owner": "jm" - }, - { - "access": 8, - "descriptor": "Lir;", - "field": "__jr_q", - "name": "q", - "owner": "jr" - }, - { - "access": 8, - "descriptor": "Lis;", - "field": "studioGame", - "name": "bn", - "owner": "c" - }, - { - "access": 8, - "descriptor": "Lit;", - "field": "__bc_dm", - "name": "dm", - "owner": "bc" - }, - { - "access": 8, - "descriptor": "Lit;", - "field": "__gu_et", - "name": "et", - "owner": "gu" - }, - { - "access": 8, - "descriptor": "Lit;", - "field": "__s_dq", - "name": "dq", - "owner": "s" - }, - { - "access": 8, - "descriptor": "Lit;", - "field": "archive0", - "name": "di", - "owner": "ir" - }, - { - "access": 8, - "descriptor": "Lit;", - "field": "archive1", - "name": "dc", - "owner": "ek" - }, - { - "access": 8, - "descriptor": "Lit;", - "field": "archive10", - "name": "dv", - "owner": "j" - }, - { - "access": 8, - "descriptor": "Lit;", - "field": "archive11", - "name": "do", - "owner": "cu" - }, - { - "access": 8, - "descriptor": "Lit;", - "field": "archive12", - "name": "dh", - "owner": "cy" - }, - { - "access": 8, - "descriptor": "Lit;", - "field": "archive13", - "name": "dz", - "owner": "gi" - }, - { - "access": 8, - "descriptor": "Lit;", - "field": "archive14", - "name": "dj", - "owner": "q" - }, - { - "access": 8, - "descriptor": "Lit;", - "field": "archive15", - "name": "du", - "owner": "as" - }, - { - "access": 8, - "descriptor": "Lit;", - "field": "archive16", - "name": "eb", - "owner": "c" - }, - { - "access": 8, - "descriptor": "Lit;", - "field": "archive2", - "name": "dg", - "owner": "be" - }, - { - "access": 8, - "descriptor": "Lit;", - "field": "archive3", - "name": "db", - "owner": "t" - }, - { - "access": 8, - "descriptor": "Lit;", - "field": "archive4", - "name": "dd", - "owner": "v" - }, - { - "access": 8, - "descriptor": "Lit;", - "field": "archive5", - "name": "dy", - "owner": "cn" - }, - { - "access": 8, - "descriptor": "Lit;", - "field": "archive6", - "name": "dk", - "owner": "fq" - }, - { - "access": 8, - "descriptor": "Lit;", - "field": "archive7", - "name": "dl", - "owner": "ad" - }, - { - "access": 8, - "descriptor": "Lit;", - "field": "archive8", - "name": "dr", - "owner": "p" - }, - { - "access": 8, - "descriptor": "Lit;", - "field": "archive9", - "name": "dw", - "owner": "il" - }, - { - "access": 8, - "descriptor": "Liy;", - "field": "serverBuild", - "name": "bs", - "owner": "z" - }, - { - "access": 8, - "descriptor": "Ljava/awt/Font;", - "field": "__hb_av", - "name": "av", - "owner": "hb" - }, - { - "access": 8, - "descriptor": "Ljava/awt/FontMetrics;", - "field": "__bo_ar", - "name": "ar", - "owner": "bo" - }, - { - "access": 8, - "descriptor": "Ljava/awt/Image;", - "field": "__ij_ak", - "name": "ak", - "owner": "ij" - }, - { - "access": 8, - "descriptor": "Ljava/lang/Object;", - "field": "ArchiveDiskActionHandler_lock", - "name": "w", - "owner": "iv" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "Formatting_colorEndTag", - "name": "l", - "owner": "cy" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "Formatting_comma", - "name": "f", - "owner": "cy" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "Formatting_lineBreakTag", - "name": "g", - "owner": "cy" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "Formatting_pipe", - "name": "q", - "owner": "cy" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "Formatting_rightArrow", - "name": "u", - "owner": "cy" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "Formatting_rightParenthesis", - "name": "o", - "owner": "cy" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "Formatting_spaceLeftParenthesis", - "name": "w", - "owner": "cy" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "Formatting_true", - "name": "m", - "owner": "cy" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "Login_loadingText", - "name": "c", - "owner": "cu" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "Login_password", - "name": "ap", - "owner": "cu" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "Login_response0", - "name": "al", - "owner": "cu" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "Login_response1", - "name": "ab", - "owner": "cu" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "Login_response2", - "name": "ae", - "owner": "cu" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "Login_response3", - "name": "at", - "owner": "cu" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "Login_username", - "name": "ad", - "owner": "cu" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "__b_by", - "name": "by", - "owner": "b" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "__cj_ay", - "name": "ay", - "owner": "cj" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "__client_pz", - "name": "pz", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "__cu_ai", - "name": "ai", - "owner": "cu" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "__cu_bq", - "name": "bq", - "owner": "cu" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "__cu_bs", - "name": "bs", - "owner": "cu" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "__id_ab", - "name": "ab", - "owner": "id" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "selectedItemName", - "name": "it", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "selectedSpellActionName", - "name": "mk", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "selectedSpellName", - "name": "mu", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "worldHost", - "name": "ei", - "owner": "af" - }, - { - "access": 8, - "descriptor": "Ljava/lang/String;", - "field": "worldsUrl", - "name": "bx", - "owner": "iy" - }, - { - "access": 8, - "descriptor": "Ljava/lang/Thread;", - "field": "ArchiveDiskActionHandler_thread", - "name": "o", - "owner": "en" - }, - { - "access": 8, - "descriptor": "Ljava/lang/management/GarbageCollectorMXBean;", - "field": "garbageCollector", - "name": "au", - "owner": "ir" - }, - { - "access": 8, - "descriptor": "Ljava/security/SecureRandom;", - "field": "secureRandom", - "name": "ec", - "owner": "t" - }, - { - "access": 8, - "descriptor": "Ljava/util/ArrayList;", - "field": "archiveLoaders", - "name": "sy", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Ljava/util/Calendar;", - "field": "Interpreter_calendar", - "name": "a", - "owner": "bv" - }, - { - "access": 8, - "descriptor": "Ljava/util/Calendar;", - "field": "__hg_q", - "name": "q", - "owner": "hg" - }, - { - "access": 8, - "descriptor": "Ljava/util/HashMap;", - "field": "fontsMap", - "name": "ft", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Ljava/util/Hashtable;", - "field": "__fo_q", - "name": "q", - "owner": "fo" - }, - { - "access": 8, - "descriptor": "Ljava/util/Random;", - "field": "AbstractFont_random", - "name": "h", - "owner": "kt" - }, - { - "access": 8, - "descriptor": "Ljava/util/concurrent/ScheduledExecutorService;", - "field": "soundSystemExecutor", - "name": "l", - "owner": "kq" - }, - { - "access": 8, - "descriptor": "Ljava/util/zip/CRC32;", - "field": "Archive_crc", - "name": "aj", - "owner": "it" - }, - { - "access": 8, - "descriptor": "Lje;", - "field": "ArchiveDiskActionHandler_requestQueue", - "name": "m", - "owner": "iv" - }, - { - "access": 8, - "descriptor": "Lje;", - "field": "ArchiveDiskActionHandler_responseQueue", - "name": "f", - "owner": "iv" - }, - { - "access": 8, - "descriptor": "Lje;", - "field": "Scene_tilesDeque", - "name": "az", - "owner": "em" - }, - { - "access": 8, - "descriptor": "Lje;", - "field": "__client_kh", - "name": "kh", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Lje;", - "field": "__client_oc", - "name": "oc", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Lje;", - "field": "__client_oh", - "name": "oh", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Lje;", - "field": "graphicsObjects", - "name": "kt", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Lje;", - "field": "objectSounds", - "name": "m", - "owner": "be" - }, - { - "access": 8, - "descriptor": "Lje;", - "field": "projectiles", - "name": "kk", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Lje;", - "field": "scriptEvents", - "name": "og", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Ljo;", - "field": "timer", - "name": "fm", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Lkk;", - "field": "fontBold12", - "name": "fo", - "owner": "q" - }, - { - "access": 8, - "descriptor": "Lkk;", - "field": "fontPlain11", - "name": "fv", - "owner": "by" - }, - { - "access": 8, - "descriptor": "Lkk;", - "field": "fontPlain12", - "name": "fu", - "owner": "az" - }, - { - "access": 8, - "descriptor": "Lkv;", - "field": "clanChat", - "name": "pg", - "owner": "cl" - }, - { - "access": 8, - "descriptor": "Lkz;", - "field": "fonts", - "name": "fs", - "owner": "ic" - }, - { - "access": 8, - "descriptor": "Lla;", - "field": "__eb_ah", - "name": "ah", - "owner": "eb" - }, - { - "access": 8, - "descriptor": "Lla;", - "field": "__eo_ak", - "name": "ak", - "owner": "eo" - }, - { - "access": 8, - "descriptor": "Llb;", - "field": "platformInfo", - "name": "st", - "owner": "s" - }, - { - "access": 8, - "descriptor": "Lld;", - "field": "componentClickMasks", - "name": "on", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Lld;", - "field": "interfaceParents", - "name": "mj", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Lld;", - "field": "itemContainers", - "name": "m", - "owner": "bc" - }, - { - "access": 8, - "descriptor": "Llg;", - "field": "spriteIds", - "name": "em", - "owner": "hg" - }, - { - "access": 8, - "descriptor": "Llm;", - "field": "platformInfoProvider", - "name": "sk", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Lln;", - "field": "__cu_g", - "name": "g", - "owner": "cu" - }, - { - "access": 8, - "descriptor": "Lln;", - "field": "__d_gz", - "name": "gz", - "owner": "d" - }, - { - "access": 8, - "descriptor": "Lln;", - "field": "__el_gm", - "name": "gm", - "owner": "el" - }, - { - "access": 8, - "descriptor": "Lln;", - "field": "__kz_l", - "name": "l", - "owner": "kz" - }, - { - "access": 8, - "descriptor": "Lln;", - "field": "sceneMinimapSprite", - "name": "px", - "owner": "bx" - }, - { - "access": 8, - "descriptor": "Llq;", - "field": "__an_i", - "name": "i", - "owner": "an" - }, - { - "access": 8, - "descriptor": "Llq;", - "field": "__bd_u", - "name": "u", - "owner": "bd" - }, - { - "access": 8, - "descriptor": "Llq;", - "field": "__bw_k", - "name": "k", - "owner": "bw" - }, - { - "access": 8, - "descriptor": "Llq;", - "field": "__cn_bu", - "name": "bu", - "owner": "cn" - }, - { - "access": 8, - "descriptor": "Llq;", - "field": "__cu_d", - "name": "d", - "owner": "cu" - }, - { - "access": 8, - "descriptor": "Llq;", - "field": "__cu_o", - "name": "o", - "owner": "cu" - }, - { - "access": 8, - "descriptor": "Llq;", - "field": "__fb_bm", - "name": "bm", - "owner": "fb" - }, - { - "access": 8, - "descriptor": "Llq;", - "field": "__h_e", - "name": "e", - "owner": "h" - }, - { - "access": 8, - "descriptor": "Llq;", - "field": "__jn_by", - "name": "by", - "owner": "jn" - }, - { - "access": 8, - "descriptor": "Llq;", - "field": "__kw_n", - "name": "n", - "owner": "kw" - }, - { - "access": 8, - "descriptor": "Llx;", - "field": "loginType", - "name": "bk", - "owner": "an" - }, - { - "access": 8, - "descriptor": "Llz;", - "field": "worldMap0", - "name": "sz", - "owner": "bo" - }, - { - "access": 8, - "descriptor": "S", - "field": "__client_rb", - "name": "rb", - "owner": "client" - }, - { - "access": 8, - "descriptor": "S", - "field": "__client_re", - "name": "re", - "owner": "client" - }, - { - "access": 8, - "descriptor": "S", - "field": "__client_ri", - "name": "ri", - "owner": "client" - }, - { - "access": 8, - "descriptor": "S", - "field": "__client_rm", - "name": "rm", - "owner": "client" - }, - { - "access": 8, - "descriptor": "S", - "field": "__client_rp", - "name": "rp", - "owner": "client" - }, - { - "access": 8, - "descriptor": "S", - "field": "__client_rs", - "name": "rs", - "owner": "client" - }, - { - "access": 8, - "descriptor": "S", - "field": "__client_rv", - "name": "rv", - "owner": "client" - }, - { - "access": 8, - "descriptor": "S", - "field": "__client_rw", - "name": "rw", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "Login_isUsernameRemembered", - "name": "ew", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "ObjectDefinition_isLowDetail", - "name": "m", - "owner": "jr" - }, - { - "access": 8, - "descriptor": "Z", - "field": "Rasterizer3D_isLowDetailTexture", - "name": "q", - "owner": "et" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__bv_s", - "name": "s", - "owner": "bv" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__bv_t", - "name": "t", - "owner": "bv" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__cd_s", - "name": "s", - "owner": "cd" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__client_ai", - "name": "ai", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__client_bl", - "name": "bl", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__client_cw", - "name": "cw", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__client_fh", - "name": "fh", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__client_hh", - "name": "hh", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__client_ij", - "name": "ij", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__client_is", - "name": "is", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__client_jl", - "name": "jl", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__client_nn", - "name": "nn", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__client_nt", - "name": "nt", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__client_qq", - "name": "qq", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__cu_aa", - "name": "aa", - "owner": "cu" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__cu_ax", - "name": "ax", - "owner": "cu" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__cu_ba", - "name": "ba", - "owner": "cu" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__cu_bk", - "name": "bk", - "owner": "cu" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__cu_f", - "name": "f", - "owner": "cu" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__dq_pe", - "name": "pe", - "owner": "dq" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__du_bx", - "name": "bx", - "owner": "du" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__em_ab", - "name": "ab", - "owner": "em" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__em_ac", - "name": "ac", - "owner": "em" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__et_f", - "name": "f", - "owner": "et" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__et_m", - "name": "m", - "owner": "et" - }, - { - "access": 8, - "descriptor": "Z", - "field": "__lp_ca", - "name": "ca", - "owner": "lp" - }, - { - "access": 8, - "descriptor": "Z", - "field": "directBufferUnavailable", - "name": "f", - "owner": "gu" - }, - { - "access": 8, - "descriptor": "Z", - "field": "displayFps", - "name": "cg", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "followerOpsLowPriority", - "name": "lw", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "isCameraLocked", - "name": "qz", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "isDraggingComponent", - "name": "ny", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "isInInstance", - "name": "gg", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "isKilled", - "name": "u", - "owner": "ba" - }, - { - "access": 8, - "descriptor": "Z", - "field": "isLoading", - "name": "cj", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "isLowDetail", - "name": "bc", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "isMenuOpen", - "name": "kc", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "isResizable", - "name": "or", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "isSpellSelected", - "name": "lv", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "playerMod", - "name": "mn", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "renderSelf", - "name": "js", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "shiftClickDrop", - "name": "lf", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "showLoadingMessages", - "name": "jj", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "showMouseCross", - "name": "jr", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "showMouseOverText", - "name": "lj", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "tapToDrop", - "name": "lp", - "owner": "client" - }, - { - "access": 8, - "descriptor": "Z", - "field": "useBufferedSocket", - "name": "fx", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[B", - "field": "ArchiveDisk_buffer", - "name": "m", - "owner": "ff" - }, - { - "access": 8, - "descriptor": "[B", - "field": "Model_sharedSequenceModelFaceAlphas", - "name": "f", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[B", - "field": "Model_sharedSpotAnimationModelFaceAlphas", - "name": "w", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[B", - "field": "__cd_g", - "name": "g", - "owner": "cd" - }, - { - "access": 8, - "descriptor": "[B", - "field": "__client_ev", - "name": "ev", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[B", - "field": "__cq_q", - "name": "q", - "owner": "cq" - }, - { - "access": 8, - "descriptor": "[B", - "field": "__cq_w", - "name": "w", - "owner": "cq" - }, - { - "access": 8, - "descriptor": "[C", - "field": "__an_cg", - "name": "cg", - "owner": "an" - }, - { - "access": 8, - "descriptor": "[C", - "field": "__kc_f", - "name": "f", - "owner": "kc" - }, - { - "access": 8, - "descriptor": "[C", - "field": "__kc_q", - "name": "q", - "owner": "kc" - }, - { - "access": 8, - "descriptor": "[F", - "field": "__cd_ag", - "name": "ag", - "owner": "cd" - }, - { - "access": 8, - "descriptor": "[F", - "field": "__cd_aj", - "name": "aj", - "owner": "cd" - }, - { - "access": 8, - "descriptor": "[F", - "field": "__cd_aq", - "name": "aq", - "owner": "cd" - }, - { - "access": 8, - "descriptor": "[F", - "field": "__cd_c", - "name": "c", - "owner": "cd" - }, - { - "access": 8, - "descriptor": "[F", - "field": "__cd_p", - "name": "p", - "owner": "cd" - }, - { - "access": 8, - "descriptor": "[F", - "field": "__cd_r", - "name": "r", - "owner": "cd" - }, - { - "access": 8, - "descriptor": "[F", - "field": "__cd_v", - "name": "v", - "owner": "cd" - }, - { - "access": 8, - "descriptor": "[I", - "field": "Instrument_delays", - "name": "c", - "owner": "db" - }, - { - "access": 8, - "descriptor": "[I", - "field": "Instrument_noise", - "name": "t", - "owner": "db" - }, - { - "access": 8, - "descriptor": "[I", - "field": "Instrument_phases", - "name": "b", - "owner": "db" - }, - { - "access": 8, - "descriptor": "[I", - "field": "Instrument_pitchBaseSteps", - "name": "v", - "owner": "db" - }, - { - "access": 8, - "descriptor": "[I", - "field": "Instrument_pitchSteps", - "name": "p", - "owner": "db" - }, - { - "access": 8, - "descriptor": "[I", - "field": "Instrument_samples", - "name": "s", - "owner": "db" - }, - { - "access": 8, - "descriptor": "[I", - "field": "Instrument_sine", - "name": "y", - "owner": "db" - }, - { - "access": 8, - "descriptor": "[I", - "field": "Instrument_volumeSteps", - "name": "r", - "owner": "db" - }, - { - "access": 8, - "descriptor": "[I", - "field": "Interpreter_arrayLengths", - "name": "o", - "owner": "bv" - }, - { - "access": 8, - "descriptor": "[I", - "field": "Interpreter_intLocals", - "name": "q", - "owner": "kp" - }, - { - "access": 8, - "descriptor": "[I", - "field": "Interpreter_intStack", - "name": "g", - "owner": "bv" - }, - { - "access": 8, - "descriptor": "[I", - "field": "KeyHandler_keyCodes", - "name": "cd", - "owner": "an" - }, - { - "access": 8, - "descriptor": "[I", - "field": "ModelData_cosine", - "name": "at", - "owner": "dw" - }, - { - "access": 8, - "descriptor": "[I", - "field": "ModelData_sine", - "name": "ae", - "owner": "dw" - }, - { - "access": 8, - "descriptor": "[I", - "field": "Model_cosine", - "name": "bl", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[I", - "field": "Model_sine", - "name": "bm", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[I", - "field": "Players_indices", - "name": "g", - "owner": "cq" - }, - { - "access": 8, - "descriptor": "[I", - "field": "Players_orientations", - "name": "d", - "owner": "cq" - }, - { - "access": 8, - "descriptor": "[I", - "field": "Players_regions", - "name": "x", - "owner": "cq" - }, - { - "access": 8, - "descriptor": "[I", - "field": "Players_targetIndices", - "name": "k", - "owner": "cq" - }, - { - "access": 8, - "descriptor": "[I", - "field": "Rasterizer3D_rowOffsets", - "name": "h", - "owner": "et" - }, - { - "access": 8, - "descriptor": "[I", - "field": "Scene_planeOccluderCounts", - "name": "ap", - "owner": "em" - }, - { - "access": 8, - "descriptor": "[I", - "field": "Texture_animatedPixels", - "name": "a", - "owner": "dh" - }, - { - "access": 8, - "descriptor": "[I", - "field": "Varps_masks", - "name": "m", - "owner": "hv" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__ah_l", - "name": "l", - "owner": "ah" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__an_cf", - "name": "cf", - "owner": "an" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__an_cq", - "name": "cq", - "owner": "an" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__bk_g", - "name": "g", - "owner": "bk" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__bm_i", - "name": "i", - "owner": "bm" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__bt_e", - "name": "e", - "owner": "bt" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__bt_l", - "name": "l", - "owner": "bt" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__ca_d", - "name": "d", - "owner": "ca" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__ca_x", - "name": "x", - "owner": "ca" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__cd_ar", - "name": "ar", - "owner": "cd" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__cd_av", - "name": "av", - "owner": "cd" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__cd_j", - "name": "j", - "owner": "cd" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__client_fg", - "name": "fg", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__client_kd", - "name": "kd", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__client_kn", - "name": "kn", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__client_nf", - "name": "nf", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__client_nr", - "name": "nr", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__client_nz", - "name": "nz", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__client_pn", - "name": "pn", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__client_pq", - "name": "pq", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__client_pv", - "name": "pv", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__client_qd", - "name": "qd", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__client_qk", - "name": "qk", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__client_qn", - "name": "qn", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__client_rd", - "name": "rd", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__client_rj", - "name": "rj", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__client_rk", - "name": "rk", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__client_rl", - "name": "rl", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__client_th", - "name": "th", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__client_tp", - "name": "tp", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__cq_e", - "name": "e", - "owner": "cq" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__cq_i", - "name": "i", - "owner": "cq" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__cy_d", - "name": "d", - "owner": "cy" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__du_aa", - "name": "aa", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__du_af", - "name": "af", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__du_am", - "name": "am", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__du_an", - "name": "an", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__du_au", - "name": "au", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__du_az", - "name": "az", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__du_ba", - "name": "ba", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__du_bb", - "name": "bb", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__du_bj", - "name": "bj", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__du_bk", - "name": "bk", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__du_bn", - "name": "bn", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__du_bq", - "name": "bq", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__du_br", - "name": "br", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__du_bs", - "name": "bs", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__dv_j", - "name": "j", - "owner": "dv" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__dv_s", - "name": "s", - "owner": "dv" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__dv_t", - "name": "t", - "owner": "dv" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__dv_y", - "name": "y", - "owner": "dv" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__dv_z", - "name": "z", - "owner": "dv" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__dw_al", - "name": "al", - "owner": "dw" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__dw_aw", - "name": "aw", - "owner": "dw" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__dz_f", - "name": "f", - "owner": "dz" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__dz_m", - "name": "m", - "owner": "dz" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__dz_q", - "name": "q", - "owner": "dz" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__dz_w", - "name": "w", - "owner": "dz" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__et_p", - "name": "p", - "owner": "et" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__et_r", - "name": "r", - "owner": "et" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__fi_e", - "name": "e", - "owner": "fi" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__fi_l", - "name": "l", - "owner": "fi" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__gi_g", - "name": "g", - "owner": "gi" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__gr_q", - "name": "q", - "owner": "gr" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__h_n", - "name": "n", - "owner": "h" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__hc_ef", - "name": "ef", - "owner": "hc" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__hf_k", - "name": "k", - "owner": "hf" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__i_x", - "name": "x", - "owner": "i" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__ia_u", - "name": "u", - "owner": "ia" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__iu_e", - "name": "e", - "owner": "iu" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__kc_w", - "name": "w", - "owner": "kc" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__lr_l", - "name": "l", - "owner": "lr" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__lr_o", - "name": "o", - "owner": "lr" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__lr_w", - "name": "w", - "owner": "lr" - }, - { - "access": 8, - "descriptor": "[I", - "field": "__y_p", - "name": "p", - "owner": "y" - }, - { - "access": 8, - "descriptor": "[I", - "field": "currentLevels", - "name": "ki", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "experience", - "name": "kb", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "levels", - "name": "kr", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "mapIconXs", - "name": "ps", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "mapIconYs", - "name": "pw", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "menuArguments0", - "name": "lk", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "menuArguments1", - "name": "ly", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "menuArguments2", - "name": "li", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "menuOpcodes", - "name": "lh", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "modelViewportXs", - "name": "ap", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[I", - "field": "modelViewportYs", - "name": "as", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[I", - "field": "npcIndices", - "name": "fq", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "overheadTextAscents", - "name": "ip", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "overheadTextColors", - "name": "ic", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "overheadTextCyclesRemaining", - "name": "io", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "overheadTextEffects", - "name": "iw", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "overheadTextXOffsets", - "name": "ib", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "overheadTextXs", - "name": "iq", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "overheadTextYs", - "name": "iu", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "regionLandArchiveIds", - "name": "gb", - "owner": "bb" - }, - { - "access": 8, - "descriptor": "[I", - "field": "regionMapArchiveIds", - "name": "gw", - "owner": "bd" - }, - { - "access": 8, - "descriptor": "[I", - "field": "regions", - "name": "gn", - "owner": "kw" - }, - { - "access": 8, - "descriptor": "[I", - "field": "rootComponentHeights", - "name": "ox", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "rootComponentWidths", - "name": "oj", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "rootComponentXs", - "name": "oy", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "rootComponentYs", - "name": "oi", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[I", - "field": "soundEffectIds", - "name": "qv", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[J", - "field": "__ba_a", - "name": "a", - "owner": "ba" - }, - { - "access": 8, - "descriptor": "[J", - "field": "__ba_j", - "name": "j", - "owner": "ba" - }, - { - "access": 8, - "descriptor": "[J", - "field": "__client_pu", - "name": "pu", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[J", - "field": "__gr_o", - "name": "o", - "owner": "gr" - }, - { - "access": 8, - "descriptor": "[Lbn;", - "field": "Interpreter_frames", - "name": "k", - "owner": "bv" - }, - { - "access": 8, - "descriptor": "[Lbr;", - "field": "players", - "name": "jd", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[Lbt;", - "field": "worlds", - "name": "o", - "owner": "bc" - }, - { - "access": 8, - "descriptor": "[Lci;", - "field": "soundEffects", - "name": "qe", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[Lcv;", - "field": "npcs", - "name": "ez", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[Ldw;", - "field": "__jr_l", - "name": "l", - "owner": "jr" - }, - { - "access": 8, - "descriptor": "[Lee;", - "field": "Scene_currentOccluders", - "name": "an", - "owner": "em" - }, - { - "access": 8, - "descriptor": "[Leh;", - "field": "gameObjects", - "name": "ar", - "owner": "em" - }, - { - "access": 8, - "descriptor": "[Lfy;", - "field": "collisionMaps", - "name": "w", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[Lgr;", - "field": "__cq_o", - "name": "o", - "owner": "cq" - }, - { - "access": 8, - "descriptor": "[Lho;", - "field": "__jx_ne", - "name": "ne", - "owner": "jx" - }, - { - "access": 8, - "descriptor": "[Ljava/lang/String;", - "field": "AbstractFont_lines", - "name": "b", - "owner": "kt" - }, - { - "access": 8, - "descriptor": "[Ljava/lang/String;", - "field": "Interpreter_stringLocals", - "name": "w", - "owner": "bv" - }, - { - "access": 8, - "descriptor": "[Ljava/lang/String;", - "field": "Interpreter_stringStack", - "name": "e", - "owner": "bv" - }, - { - "access": 8, - "descriptor": "[Ljava/lang/String;", - "field": "menuActions", - "name": "ld", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[Ljava/lang/String;", - "field": "menuTargetNames", - "name": "la", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[Ljava/lang/String;", - "field": "overheadText", - "name": "ih", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[Ljava/lang/String;", - "field": "playerMenuActions", - "name": "kq", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[Lln;", - "field": "__ar_bd", - "name": "bd", - "owner": "ar" - }, - { - "access": 8, - "descriptor": "[Lln;", - "field": "crossSprites", - "name": "gx", - "owner": "an" - }, - { - "access": 8, - "descriptor": "[Lln;", - "field": "headIconHintSprites", - "name": "gi", - "owner": "br" - }, - { - "access": 8, - "descriptor": "[Lln;", - "field": "headIconPkSprites", - "name": "gt", - "owner": "z" - }, - { - "access": 8, - "descriptor": "[Lln;", - "field": "headIconPrayerSprites", - "name": "gr", - "owner": "bf" - }, - { - "access": 8, - "descriptor": "[Lln;", - "field": "mapDotSprites", - "name": "gu", - "owner": "at" - }, - { - "access": 8, - "descriptor": "[Lln;", - "field": "mapIcons", - "name": "po", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[Lln;", - "field": "mapMarkerSprites", - "name": "ga", - "owner": "j" - }, - { - "access": 8, - "descriptor": "[Llq;", - "field": "__an_x", - "name": "x", - "owner": "an" - }, - { - "access": 8, - "descriptor": "[Llq;", - "field": "__ap_w", - "name": "w", - "owner": "ap" - }, - { - "access": 8, - "descriptor": "[Llq;", - "field": "__cj_bo", - "name": "bo", - "owner": "cj" - }, - { - "access": 8, - "descriptor": "[Llq;", - "field": "__en_bc", - "name": "bc", - "owner": "en" - }, - { - "access": 8, - "descriptor": "[Llq;", - "field": "__ey_bx", - "name": "bx", - "owner": "ey" - }, - { - "access": 8, - "descriptor": "[Llq;", - "field": "mapSceneSprites", - "name": "gv", - "owner": "gq" - }, - { - "access": 8, - "descriptor": "[Llq;", - "field": "modIconSprites", - "name": "gc", - "owner": "h" - }, - { - "access": 8, - "descriptor": "[Llq;", - "field": "scrollBarSprites", - "name": "gj", - "owner": "ay" - }, - { - "access": 8, - "descriptor": "[Lx;", - "field": "grandExchangeOffers", - "name": "sb", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[S", - "field": "__cj_sp", - "name": "sp", - "owner": "cj" - }, - { - "access": 8, - "descriptor": "[Z", - "field": "__ca_k", - "name": "k", - "owner": "ca" - }, - { - "access": 8, - "descriptor": "[Z", - "field": "__cd_z", - "name": "z", - "owner": "cd" - }, - { - "access": 8, - "descriptor": "[Z", - "field": "__client_kv", - "name": "kv", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[Z", - "field": "__client_od", - "name": "od", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[Z", - "field": "__client_oq", - "name": "oq", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[Z", - "field": "__client_ot", - "name": "ot", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[Z", - "field": "__client_rh", - "name": "rh", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[Z", - "field": "__du_ad", - "name": "ad", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[Z", - "field": "__du_at", - "name": "at", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[Z", - "field": "menuShiftClick", - "name": "lt", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[[B", - "field": "ByteArrayPool_large", - "name": "u", - "owner": "gi" - }, - { - "access": 8, - "descriptor": "[[B", - "field": "ByteArrayPool_medium", - "name": "o", - "owner": "gi" - }, - { - "access": 8, - "descriptor": "[[B", - "field": "ByteArrayPool_small", - "name": "w", - "owner": "gi" - }, - { - "access": 8, - "descriptor": "[[B", - "field": "__lr_e", - "name": "e", - "owner": "lr" - }, - { - "access": 8, - "descriptor": "[[B", - "field": "regionLandArchives", - "name": "gs", - "owner": "ad" - }, - { - "access": 8, - "descriptor": "[[B", - "field": "regionMapArchives", - "name": "gl", - "owner": "bg" - }, - { - "access": 8, - "descriptor": "[[F", - "field": "__di_u", - "name": "u", - "owner": "di" - }, - { - "access": 8, - "descriptor": "[[I", - "field": "Interpreter_arrays", - "name": "u", - "owner": "bv" - }, - { - "access": 8, - "descriptor": "[[I", - "field": "__di_g", - "name": "g", - "owner": "di" - }, - { - "access": 8, - "descriptor": "[[I", - "field": "__du_ai", - "name": "ai", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[[I", - "field": "__du_ax", - "name": "ax", - "owner": "du" - }, - { - "access": 8, - "descriptor": "[[I", - "field": "__fi_q", - "name": "q", - "owner": "fi" - }, - { - "access": 8, - "descriptor": "[[I", - "field": "__fi_w", - "name": "w", - "owner": "fi" - }, - { - "access": 8, - "descriptor": "[[I", - "field": "__gd_e", - "name": "e", - "owner": "gd" - }, - { - "access": 8, - "descriptor": "[[I", - "field": "tileLastDrawnActor", - "name": "im", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[[I", - "field": "xteaKeys", - "name": "ge", - "owner": "gf" - }, - { - "access": 8, - "descriptor": "[[Lee;", - "field": "Scene_planeOccluders", - "name": "as", - "owner": "em" - }, - { - "access": 8, - "descriptor": "[[Z", - "field": "visibleTiles", - "name": "bo", - "owner": "em" - }, - { - "access": 8, - "descriptor": "[[[B", - "field": "Tiles_renderFlags", - "name": "f", - "owner": "bq" - }, - { - "access": 8, - "descriptor": "[[[B", - "field": "__ay_u", - "name": "u", - "owner": "ay" - }, - { - "access": 8, - "descriptor": "[[[B", - "field": "__bq_l", - "name": "l", - "owner": "bq" - }, - { - "access": 8, - "descriptor": "[[[B", - "field": "__bq_w", - "name": "w", - "owner": "bq" - }, - { - "access": 8, - "descriptor": "[[[B", - "field": "__fe_e", - "name": "e", - "owner": "fe" - }, - { - "access": 8, - "descriptor": "[[[B", - "field": "__kc_g", - "name": "g", - "owner": "kc" - }, - { - "access": 8, - "descriptor": "[[[B", - "field": "__kz_o", - "name": "o", - "owner": "kz" - }, - { - "access": 8, - "descriptor": "[[[I", - "field": "Tiles_heights", - "name": "m", - "owner": "bq" - }, - { - "access": 8, - "descriptor": "[[[I", - "field": "__bq_a", - "name": "a", - "owner": "bq" - }, - { - "access": 8, - "descriptor": "[[[I", - "field": "instanceChunkTemplates", - "name": "gq", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[[[Lje;", - "field": "groundItems", - "name": "kz", - "owner": "client" - }, - { - "access": 8, - "descriptor": "[[[[Z", - "field": "visibilityMap", - "name": "bc", - "owner": "em" - }, - { - "access": 9, - "decoder": -1063713523, - "descriptor": "I", - "field": "__client_il", - "name": "il", - "owner": "client" - }, - { - "access": 9, - "decoder": -112939189, - "descriptor": "I", - "field": "WorldMapElement_count", - "name": "q", - "owner": "ev" - }, - { - "access": 9, - "decoder": -1141619871, - "descriptor": "I", - "field": "NetCache_ioExceptions", - "name": "r", - "owner": "iq" - }, - { - "access": 9, - "decoder": -1404585009, - "descriptor": "I", - "field": "NetCache_crcMismatches", - "name": "c", - "owner": "iq" - }, - { - "access": 9, - "decoder": -1536028937, - "descriptor": "I", - "field": "__aj_e", - "name": "e", - "owner": "aj" - }, - { - "access": 9, - "decoder": -1583654139, - "descriptor": "I", - "field": "__gg_u", - "name": "u", - "owner": "gg" - }, - { - "access": 9, - "decoder": -1592359229, - "descriptor": "I", - "field": "NetCache_pendingWritesCount", - "name": "x", - "owner": "iq" - }, - { - "access": 9, - "decoder": -1627751389, - "descriptor": "I", - "field": "NetCache_pendingResponsesCount", - "name": "k", - "owner": "iq" - }, - { - "access": 9, - "decoder": -1753937079, - "descriptor": "I", - "field": "__ik_cn", - "name": "cn", - "owner": "ik" - }, - { - "access": 9, - "decoder": -1853704165, - "descriptor": "I", - "field": "MouseHandler_lastPressedX", - "name": "t", - "owner": "bb" - }, - { - "access": 9, - "decoder": -18917723, - "descriptor": "I", - "field": "musicTrackGroupId", - "name": "g", - "owner": "ar" - }, - { - "access": 9, - "decoder": -2044247305, - "descriptor": "I", - "field": "MouseHandler_currentButton", - "name": "d", - "owner": "bb" - }, - { - "access": 9, - "decoder": -2051451755, - "descriptor": "I", - "field": "idxCount", - "name": "u", - "owner": "fs" - }, - { - "access": 9, - "decoder": -2140977119, - "descriptor": "I", - "field": "ViewportMouse_entityCount", - "name": "i", - "owner": "dm" - }, - { - "access": 9, - "decoder": -451622431, - "descriptor": "I", - "field": "__client_ss", - "name": "ss", - "owner": "client" - }, - { - "access": 9, - "decoder": -4580427166942649300, - "descriptor": "J", - "field": "__iq_q", - "name": "q", - "owner": "iq" - }, - { - "access": 9, - "decoder": -649043937, - "descriptor": "I", - "field": "MouseHandler_x", - "name": "k", - "owner": "bb" - }, - { - "access": 9, - "decoder": -674534717, - "descriptor": "I", - "field": "__an_cl", - "name": "cl", - "owner": "an" - }, - { - "access": 9, - "decoder": -7587574528523107000, - "descriptor": "J", - "field": "MouseHandler_millis", - "name": "n", - "owner": "bb" - }, - { - "access": 9, - "decoder": -787495321, - "descriptor": "I", - "field": "revision", - "name": "q", - "owner": "fx" - }, - { - "access": 9, - "decoder": -812708185, - "descriptor": "I", - "field": "musicTrackFileId", - "name": "l", - "owner": "x" - }, - { - "access": 9, - "decoder": -842662451, - "descriptor": "I", - "field": "canvasHeight", - "name": "p", - "owner": "gd" - }, - { - "access": 9, - "decoder": -848833001, - "descriptor": "I", - "field": "__hf_o", - "name": "o", - "owner": "hf" - }, - { - "access": 9, - "decoder": 121013503, - "descriptor": "I", - "field": "__fx_w", - "name": "w", - "owner": "fx" - }, - { - "access": 9, - "decoder": 1291011547, - "descriptor": "I", - "field": "MouseHandler_y", - "name": "x", - "owner": "bb" - }, - { - "access": 9, - "decoder": 1412639841, - "descriptor": "I", - "field": "worldId", - "name": "ba", - "owner": "client" - }, - { - "access": 9, - "decoder": 147524751, - "descriptor": "I", - "field": "PcmPlayer_sampleRate", - "name": "o", - "owner": "kl" - }, - { - "access": 9, - "decoder": 1495729287, - "descriptor": "I", - "field": "NetCache_pendingPriorityWritesCount", - "name": "o", - "owner": "iq" - }, - { - "access": 9, - "decoder": 1535565231, - "descriptor": "I", - "field": "ViewportMouse_y", - "name": "q", - "owner": "dm" - }, - { - "access": 9, - "decoder": 1784515731, - "descriptor": "I", - "field": "canvasWidth", - "name": "r", - "owner": "dt" - }, - { - "access": 9, - "decoder": 1876967757, - "descriptor": "I", - "field": "MouseHandler_lastPressedY", - "name": "y", - "owner": "bb" - }, - { - "access": 9, - "decoder": 1891197573, - "descriptor": "I", - "field": "ViewportMouse_x", - "name": "f", - "owner": "dm" - }, - { - "access": 9, - "decoder": 2126310249, - "descriptor": "I", - "field": "MouseHandler_lastButton", - "name": "s", - "owner": "bb" - }, - { - "access": 9, - "decoder": 235389995, - "descriptor": "I", - "field": "__im_q", - "name": "q", - "owner": "im" - }, - { - "access": 9, - "decoder": 3806612340723844600, - "descriptor": "J", - "field": "MouseHandler_lastPressedTimeMillis", - "name": "h", - "owner": "bb" - }, - { - "access": 9, - "decoder": 422473713, - "descriptor": "I", - "field": "__el_x", - "name": "x", - "owner": "el" - }, - { - "access": 9, - "decoder": 510774535, - "descriptor": "I", - "field": "__ix_f", - "name": "f", - "owner": "ix" - }, - { - "access": 9, - "decoder": 516430597, - "descriptor": "I", - "field": "NetCache_pendingPriorityResponsesCount", - "name": "g", - "owner": "iq" - }, - { - "access": 9, - "decoder": 533653621, - "descriptor": "I", - "field": "__cm_e", - "name": "e", - "owner": "cm" - }, - { - "access": 9, - "decoder": 701739159, - "descriptor": "I", - "field": "__hx_z", - "name": "z", - "owner": "hx" - }, - { - "access": 9, - "decoder": 840549915, - "descriptor": "I", - "field": "__iq_j", - "name": "j", - "owner": "iq" - }, - { - "access": 9, - "decoder": 948359621, - "descriptor": "I", - "field": "__iq_f", - "name": "f", - "owner": "iq" - }, - { - "access": 9, - "descriptor": "B", - "field": "__iq_b", - "name": "b", - "owner": "iq" - }, - { - "access": 9, - "descriptor": "C", - "field": "__go_ck", - "name": "ck", - "owner": "go" - }, - { - "access": 9, - "descriptor": "I", - "field": "Rasterizer2D_height", - "name": "av", - "owner": "lf" - }, - { - "access": 9, - "descriptor": "I", - "field": "Rasterizer2D_width", - "name": "aj", - "owner": "lf" - }, - { - "access": 9, - "descriptor": "I", - "field": "Rasterizer2D_xClipEnd", - "name": "ah", - "owner": "lf" - }, - { - "access": 9, - "descriptor": "I", - "field": "Rasterizer2D_xClipStart", - "name": "ay", - "owner": "lf" - }, - { - "access": 9, - "descriptor": "I", - "field": "Rasterizer2D_yClipEnd", - "name": "ac", - "owner": "lf" - }, - { - "access": 9, - "descriptor": "I", - "field": "Rasterizer2D_yClipStart", - "name": "ar", - "owner": "lf" - }, - { - "access": 9, - "descriptor": "I", - "field": "Rasterizer3D_zoom", - "name": "k", - "owner": "et" - }, - { - "access": 9, - "descriptor": "I", - "field": "Scene_selectedX", - "name": "aw", - "owner": "em" - }, - { - "access": 9, - "descriptor": "I", - "field": "Scene_selectedY", - "name": "al", - "owner": "em" - }, - { - "access": 9, - "descriptor": "Lan;", - "field": "KeyHandler_instance", - "name": "m", - "owner": "an" - }, - { - "access": 9, - "descriptor": "Lbb;", - "field": "MouseHandler_instance", - "name": "w", - "owner": "bb" - }, - { - "access": 9, - "descriptor": "Lbh;", - "field": "friendSystem", - "name": "rc", - "owner": "ag" - }, - { - "access": 9, - "descriptor": "Lcz;", - "field": "pcmPlayerProvider", - "name": "n", - "owner": "bl" - }, - { - "access": 9, - "descriptor": "Ldt;", - "field": "soundCache", - "name": "n", - "owner": "kc" - }, - { - "access": 9, - "descriptor": "Ldy;", - "field": "dat2File", - "name": "n", - "owner": "fs" - }, - { - "access": 9, - "descriptor": "Ldy;", - "field": "idx255File", - "name": "i", - "owner": "fs" - }, - { - "access": 9, - "descriptor": "Ldy;", - "field": "randomDat", - "name": "k", - "owner": "fs" - }, - { - "access": 9, - "descriptor": "Lec;", - "field": "__av_o", - "name": "o", - "owner": "av" - }, - { - "access": 9, - "descriptor": "Lei;", - "field": "Rasterizer3D_textureLoader", - "name": "c", - "owner": "et" - }, - { - "access": 9, - "descriptor": "Ler;", - "field": "HealthBarDefinition_cached", - "name": "q", - "owner": "ii" - }, - { - "access": 9, - "descriptor": "Ler;", - "field": "PlayerAppearance_cachedModels", - "name": "k", - "owner": "hi" - }, - { - "access": 9, - "descriptor": "Ler;", - "field": "SequenceDefinition_cached", - "name": "w", - "owner": "jh" - }, - { - "access": 9, - "descriptor": "Ler;", - "field": "VarbitDefinition_cached", - "name": "f", - "owner": "ia" - }, - { - "access": 9, - "descriptor": "Ler;", - "field": "VarpDefinition_cached", - "name": "q", - "owner": "ix" - }, - { - "access": 9, - "descriptor": "Ler;", - "field": "__jf_f", - "name": "f", - "owner": "jf" - }, - { - "access": 9, - "descriptor": "Ler;", - "field": "__jh_o", - "name": "o", - "owner": "jh" - }, - { - "access": 9, - "descriptor": "Ler;", - "field": "__jq_f", - "name": "f", - "owner": "jq" - }, - { - "access": 9, - "descriptor": "Ler;", - "field": "__jr_o", - "name": "o", - "owner": "jr" - }, - { - "access": 9, - "descriptor": "Lfu;", - "field": "NetCache_socket", - "name": "m", - "owner": "iq" - }, - { - "access": 9, - "descriptor": "Lgd;", - "field": "huffman", - "name": "m", - "owner": "ki" - }, - { - "access": 9, - "descriptor": "Lgr;", - "field": "NetCache_reference", - "name": "y", - "owner": "cq" - }, - { - "access": 9, - "descriptor": "Lgr;", - "field": "NetCache_responseArchiveBuffer", - "name": "z", - "owner": "c" - }, - { - "access": 9, - "descriptor": "Lgr;", - "field": "NetCache_responseHeaderBuffer", - "name": "a", - "owner": "iq" - }, - { - "access": 9, - "descriptor": "Lhe;", - "field": "musicTrack", - "name": "k", - "owner": "i" - }, - { - "access": 9, - "descriptor": "Lhm;", - "field": "midiPcmStream", - "name": "w", - "owner": "hf" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "Component_archive", - "name": "e", - "owner": "ho" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "EnumDefinition_archive", - "name": "m", - "owner": "jw" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "ItemDefinition_archive", - "name": "u", - "owner": "jv" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "ItemDefinition_modelArchive", - "name": "g", - "owner": "jv" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "KitDefinition_archive", - "name": "m", - "owner": "im" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "SequenceDefinition_archive", - "name": "m", - "owner": "jh" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "SpotAnimationDefinition_archive", - "name": "m", - "owner": "io" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "SpotAnimationDefinition_modelArchive", - "name": "f", - "owner": "io" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "__aq_k", - "name": "k", - "owner": "aq" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "__f_m", - "name": "m", - "owner": "f" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "__fh_x", - "name": "x", - "owner": "fh" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "__hf_f", - "name": "f", - "owner": "hf" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "__hf_q", - "name": "q", - "owner": "hf" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "__hf_u", - "name": "u", - "owner": "hf" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "__ho_d", - "name": "d", - "owner": "ho" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "__ic_m", - "name": "m", - "owner": "ic" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "__ii_f", - "name": "f", - "owner": "ii" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "__ii_m", - "name": "m", - "owner": "ii" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "__im_f", - "name": "f", - "owner": "im" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "__ix_m", - "name": "m", - "owner": "ix" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "__jb_m", - "name": "m", - "owner": "jb" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "__jf_m", - "name": "m", - "owner": "jf" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "__jh_f", - "name": "f", - "owner": "jh" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "__jh_q", - "name": "q", - "owner": "jh" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "__jq_m", - "name": "m", - "owner": "jq" - }, - { - "access": 9, - "descriptor": "Lir;", - "field": "__o_m", - "name": "m", - "owner": "o" - }, - { - "access": 9, - "descriptor": "Liz;", - "field": "NetCache_currentResponse", - "name": "i", - "owner": "ed" - }, - { - "access": 9, - "descriptor": "Lja;", - "field": "reflectionChecks", - "name": "m", - "owner": "le" - }, - { - "access": 9, - "descriptor": "Ljava/applet/Applet;", - "field": "__af_m", - "name": "m", - "owner": "af" - }, - { - "access": 9, - "descriptor": "Ljava/applet/Applet;", - "field": "applet", - "name": "m", - "owner": "fx" - }, - { - "access": 9, - "descriptor": "Ljava/io/File;", - "field": "__fo_f", - "name": "f", - "owner": "fo" - }, - { - "access": 9, - "descriptor": "Ljava/io/File;", - "field": "__fs_o", - "name": "o", - "owner": "fs" - }, - { - "access": 9, - "descriptor": "Ljava/io/File;", - "field": "clDat", - "name": "w", - "owner": "lc" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_almostEverywhere", - "name": "hw", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_andTheProtectItemPrayerWontWork", - "name": "hj", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_attack", - "name": "fq", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_cancel", - "name": "iz", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_checkingForUpdates", - "name": "s", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_chooseOption", - "name": "fw", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_close", - "name": "fd", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_connectingToServer", - "name": "if", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_connectingToUpdateServer", - "name": "j", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_connectionLost", - "name": "n", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_continue", - "name": "g", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_drop", - "name": "q", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_examine", - "name": "ep", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_existingUser", - "name": "is", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_fromYourFriendListFirst", - "name": "fe", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_fromYourIgnoreListFirst", - "name": "fy", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_hasLoggedIn", - "name": "ea", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_hasLoggedOut", - "name": "es", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_hidden", - "name": "w", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_isAlreadyOnYourFriendList", - "name": "fo", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_level", - "name": "fl", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_loadedConfig", - "name": "v", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_loadedFonts", - "name": "b", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_loadedInputHandler", - "name": "ar", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_loadedInterfaces", - "name": "ak", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_loadedSprites", - "name": "aq", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_loadedTextures", - "name": "av", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_loadedTitleScreen", - "name": "r", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_loadedUpdateList", - "name": "t", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_loadedWordpack", - "name": "ay", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_loadedWorldMap", - "name": "al", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_loading", - "name": "kq", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_loadingConfig", - "name": "p", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_loadingFonts", - "name": "h", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_loadingInterfaces", - "name": "ah", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_loadingPleaseWait", - "name": "k", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_loadingSprites", - "name": "ag", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_loadingTextures", - "name": "aj", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_loadingTitleScreen", - "name": "c", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_loadingWordpack", - "name": "ac", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_loadingWorldMap", - "name": "aw", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_login", - "name": "ie", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_membersObject", - "name": "m", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_moreOptions", - "name": "fg", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_newUser", - "name": "iy", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_notWorkOnThisWorld", - "name": "hu", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_null", - "name": "e", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_ok", - "name": "o", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_password", - "name": "in", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_pin", - "name": "il", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_playersCanAttackEachOther", - "name": "he", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_playersCanAttackEachOtherAlmostEverywhere", - "name": "ht", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_pleaseEnterYourPassword", - "name": "dh", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_pleaseEnterYourUsername", - "name": "dw", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_pleaseRemoveFriend", - "name": "fi", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_pleaseRemoveIgnore", - "name": "fr", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_pleaseWait", - "name": "fp", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_pleaseWaitAttemptingToReestablish", - "name": "i", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_preparedSoundEngine", - "name": "y", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_preparedVisibilityMap", - "name": "z", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_select", - "name": "u", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_skill", - "name": "fj", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_space", - "name": "fh", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_startingGameEngine", - "name": "a", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_take", - "name": "f", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_theProtectItemPrayerWill", - "name": "hv", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_thisIsABetaWorld", - "name": "ho", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_thisIsAHighRiskPvpWorld", - "name": "hi", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_thisIsAHighRiskWorld", - "name": "hp", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_thisIsAPvpWorld", - "name": "hq", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_unableToFind", - "name": "eg", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_use", - "name": "ez", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_walkHere", - "name": "fc", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_warning", - "name": "hl", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_welcomeToRuneScape", - "name": "ij", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_yourFriendListIsFull", - "name": "fu", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_yourIgnoreListIsFull", - "name": "ft", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "Strings_yourNormalAccountWillNotBeAffected", - "name": "hz", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__af_f", - "name": "f", - "owner": "af" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_aa", - "name": "aa", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ad", - "name": "ad", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ae", - "name": "ae", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_af", - "name": "af", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ai", - "name": "ai", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_am", - "name": "am", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_an", - "name": "an", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ao", - "name": "ao", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ap", - "name": "ap", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_as", - "name": "as", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_at", - "name": "at", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_au", - "name": "au", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ax", - "name": "ax", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_az", - "name": "az", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ba", - "name": "ba", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_bb", - "name": "bb", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_bc", - "name": "bc", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_bd", - "name": "bd", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_be", - "name": "be", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_bf", - "name": "bf", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_bg", - "name": "bg", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_bh", - "name": "bh", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_bi", - "name": "bi", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_bj", - "name": "bj", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_bk", - "name": "bk", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_bl", - "name": "bl", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_bm", - "name": "bm", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_bn", - "name": "bn", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_bo", - "name": "bo", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_bp", - "name": "bp", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_bq", - "name": "bq", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_br", - "name": "br", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_bs", - "name": "bs", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_bt", - "name": "bt", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_bu", - "name": "bu", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_bv", - "name": "bv", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_bw", - "name": "bw", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_bx", - "name": "bx", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_by", - "name": "by", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_bz", - "name": "bz", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ca", - "name": "ca", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_cb", - "name": "cb", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_cc", - "name": "cc", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_cd", - "name": "cd", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ce", - "name": "ce", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_cf", - "name": "cf", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_cg", - "name": "cg", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ch", - "name": "ch", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ci", - "name": "ci", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_cj", - "name": "cj", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ck", - "name": "ck", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_cl", - "name": "cl", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_cm", - "name": "cm", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_cn", - "name": "cn", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_co", - "name": "co", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_cp", - "name": "cp", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_cq", - "name": "cq", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_cr", - "name": "cr", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_cs", - "name": "cs", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ct", - "name": "ct", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_cu", - "name": "cu", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_cv", - "name": "cv", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_cw", - "name": "cw", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_cx", - "name": "cx", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_cy", - "name": "cy", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_cz", - "name": "cz", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_d", - "name": "d", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_da", - "name": "da", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_db", - "name": "db", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_dc", - "name": "dc", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_dd", - "name": "dd", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_de", - "name": "de", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_df", - "name": "df", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_dg", - "name": "dg", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_di", - "name": "di", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_dj", - "name": "dj", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_dk", - "name": "dk", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_dl", - "name": "dl", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_dm", - "name": "dm", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_dn", - "name": "dn", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_do", - "name": "do", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_dp", - "name": "dp", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_dq", - "name": "dq", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_dr", - "name": "dr", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ds", - "name": "ds", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_dt", - "name": "dt", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_du", - "name": "du", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_dv", - "name": "dv", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_dx", - "name": "dx", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_dy", - "name": "dy", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_dz", - "name": "dz", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_eb", - "name": "eb", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ec", - "name": "ec", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ed", - "name": "ed", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ee", - "name": "ee", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ef", - "name": "ef", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_eh", - "name": "eh", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ei", - "name": "ei", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ej", - "name": "ej", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ek", - "name": "ek", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_el", - "name": "el", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_em", - "name": "em", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_en", - "name": "en", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_eo", - "name": "eo", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_eq", - "name": "eq", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_er", - "name": "er", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_et", - "name": "et", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_eu", - "name": "eu", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ev", - "name": "ev", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ew", - "name": "ew", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ex", - "name": "ex", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ey", - "name": "ey", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_fa", - "name": "fa", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_fb", - "name": "fb", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ff", - "name": "ff", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_fk", - "name": "fk", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_fm", - "name": "fm", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_fn", - "name": "fn", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_fs", - "name": "fs", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_fv", - "name": "fv", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_fx", - "name": "fx", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_fz", - "name": "fz", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ga", - "name": "ga", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gb", - "name": "gb", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gc", - "name": "gc", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gd", - "name": "gd", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ge", - "name": "ge", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gf", - "name": "gf", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gg", - "name": "gg", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gh", - "name": "gh", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gi", - "name": "gi", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gj", - "name": "gj", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gk", - "name": "gk", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gl", - "name": "gl", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gm", - "name": "gm", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gn", - "name": "gn", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_go", - "name": "go", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gp", - "name": "gp", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gq", - "name": "gq", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gr", - "name": "gr", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gs", - "name": "gs", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gt", - "name": "gt", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gu", - "name": "gu", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gv", - "name": "gv", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gw", - "name": "gw", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gx", - "name": "gx", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gy", - "name": "gy", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_gz", - "name": "gz", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ha", - "name": "ha", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_hb", - "name": "hb", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_hc", - "name": "hc", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_hd", - "name": "hd", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_hf", - "name": "hf", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_hg", - "name": "hg", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_hh", - "name": "hh", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_hk", - "name": "hk", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_hm", - "name": "hm", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_hn", - "name": "hn", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_hr", - "name": "hr", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_hs", - "name": "hs", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_hx", - "name": "hx", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_hy", - "name": "hy", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ia", - "name": "ia", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ib", - "name": "ib", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ic", - "name": "ic", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_id", - "name": "id", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ig", - "name": "ig", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ih", - "name": "ih", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ii", - "name": "ii", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ik", - "name": "ik", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_im", - "name": "im", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_io", - "name": "io", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ip", - "name": "ip", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_iq", - "name": "iq", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ir", - "name": "ir", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_it", - "name": "it", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_iu", - "name": "iu", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_iv", - "name": "iv", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_iw", - "name": "iw", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ix", - "name": "ix", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ja", - "name": "ja", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_jb", - "name": "jb", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_jc", - "name": "jc", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_jd", - "name": "jd", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_je", - "name": "je", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_jf", - "name": "jf", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_jg", - "name": "jg", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_jh", - "name": "jh", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ji", - "name": "ji", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_jj", - "name": "jj", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_jk", - "name": "jk", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_jl", - "name": "jl", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_jm", - "name": "jm", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_jn", - "name": "jn", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_jo", - "name": "jo", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_jp", - "name": "jp", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_jq", - "name": "jq", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_jr", - "name": "jr", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_js", - "name": "js", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_jt", - "name": "jt", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ju", - "name": "ju", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_jv", - "name": "jv", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_jw", - "name": "jw", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_jx", - "name": "jx", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_jy", - "name": "jy", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_jz", - "name": "jz", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_kd", - "name": "kd", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ke", - "name": "ke", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_kf", - "name": "kf", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_kg", - "name": "kg", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_kj", - "name": "kj", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_km", - "name": "km", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_kp", - "name": "kp", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ks", - "name": "ks", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_kv", - "name": "kv", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_ky", - "name": "ky", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_l", - "name": "l", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "__id_x", - "name": "x", - "owner": "id" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "javaVendor", - "name": "m", - "owner": "fz" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "javaVersion", - "name": "f", - "owner": "fz" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "localPlayerName", - "name": "f", - "owner": "fx" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "osName", - "name": "b", - "owner": "ju" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "osNameLowerCase", - "name": "h", - "owner": "p" - }, - { - "access": 9, - "descriptor": "Ljava/lang/String;", - "field": "userHomeDirectory", - "name": "c", - "owner": "as" - }, - { - "access": 9, - "descriptor": "Ljava/util/Comparator;", - "field": "__g_f", - "name": "f", - "owner": "g" - }, - { - "access": 9, - "descriptor": "Ljava/util/Comparator;", - "field": "__g_o", - "name": "o", - "owner": "g" - }, - { - "access": 9, - "descriptor": "Ljava/util/Comparator;", - "field": "__g_q", - "name": "q", - "owner": "g" - }, - { - "access": 9, - "descriptor": "Ljava/util/Comparator;", - "field": "__g_w", - "name": "w", - "owner": "g" - }, - { - "access": 9, - "descriptor": "Ljava/util/zip/CRC32;", - "field": "NetCache_crc", - "name": "t", - "owner": "iq" - }, - { - "access": 9, - "descriptor": "Ljp;", - "field": "NetCache_pendingWritesQueue", - "name": "l", - "owner": "iq" - }, - { - "access": 9, - "descriptor": "Lkk;", - "field": "__gx_n", - "name": "n", - "owner": "gx" - }, - { - "access": 9, - "descriptor": "Lld;", - "field": "NetCache_pendingPriorityResponses", - "name": "u", - "owner": "iq" - }, - { - "access": 9, - "descriptor": "Lld;", - "field": "NetCache_pendingPriorityWrites", - "name": "w", - "owner": "iq" - }, - { - "access": 9, - "descriptor": "Lld;", - "field": "NetCache_pendingResponses", - "name": "d", - "owner": "iq" - }, - { - "access": 9, - "descriptor": "Lld;", - "field": "NetCache_pendingWrites", - "name": "e", - "owner": "iq" - }, - { - "access": 9, - "descriptor": "Llp;", - "field": "rasterProvider", - "name": "ad", - "owner": "gz" - }, - { - "access": 9, - "descriptor": "Z", - "field": "Scene_isLowDetail", - "name": "m", - "owner": "em" - }, - { - "access": 9, - "descriptor": "Z", - "field": "ViewportMouse_false0", - "name": "w", - "owner": "dm" - }, - { - "access": 9, - "descriptor": "Z", - "field": "ViewportMouse_isInViewport", - "name": "m", - "owner": "dm" - }, - { - "access": 9, - "descriptor": "Z", - "field": "__ar_l", - "name": "l", - "owner": "ar" - }, - { - "access": 9, - "descriptor": "Z", - "field": "__et_w", - "name": "w", - "owner": "et" - }, - { - "access": 9, - "descriptor": "Z", - "field": "__fo_m", - "name": "m", - "owner": "fo" - }, - { - "access": 9, - "descriptor": "Z", - "field": "__ho_j", - "name": "j", - "owner": "ho" - }, - { - "access": 9, - "descriptor": "Z", - "field": "__u_n", - "name": "n", - "owner": "u" - }, - { - "access": 9, - "descriptor": "Z", - "field": "isMembersWorld", - "name": "bd", - "owner": "client" - }, - { - "access": 9, - "descriptor": "Z", - "field": "musicTrackBoolean", - "name": "d", - "owner": "lj" - }, - { - "access": 9, - "descriptor": "[C", - "field": "__kc_m", - "name": "m", - "owner": "kc" - }, - { - "access": 9, - "descriptor": "[I", - "field": "Rasterizer2D_pixels", - "name": "aq", - "owner": "lf" - }, - { - "access": 9, - "descriptor": "[I", - "field": "Rasterizer3D_colorPalette", - "name": "b", - "owner": "et" - }, - { - "access": 9, - "descriptor": "[I", - "field": "Rasterizer3D_cosine", - "name": "ag", - "owner": "et" - }, - { - "access": 9, - "descriptor": "[I", - "field": "Rasterizer3D_sine", - "name": "v", - "owner": "et" - }, - { - "access": 9, - "descriptor": "[I", - "field": "Skills_experienceTable", - "name": "q", - "owner": "hc" - }, - { - "access": 9, - "descriptor": "[I", - "field": "Varps_main", - "name": "q", - "owner": "hv" - }, - { - "access": 9, - "descriptor": "[I", - "field": "Varps_temp", - "name": "f", - "owner": "hv" - }, - { - "access": 9, - "descriptor": "[I", - "field": "__an_cp", - "name": "cp", - "owner": "an" - }, - { - "access": 9, - "descriptor": "[J", - "field": "ViewportMouse_entityTags", - "name": "a", - "owner": "dm" - }, - { - "access": 9, - "descriptor": "[Ldy;", - "field": "idxFiles", - "name": "a", - "owner": "ik" - }, - { - "access": 9, - "descriptor": "[Lgg;", - "field": "packetBufferNodes", - "name": "o", - "owner": "gg" - }, - { - "access": 9, - "descriptor": "[Lic;", - "field": "WorldMapElement_cached", - "name": "f", - "owner": "ho" - }, - { - "access": 9, - "descriptor": "[Lit;", - "field": "NetCache_archives", - "name": "h", - "owner": "iq" - }, - { - "access": 9, - "descriptor": "[Ljava/lang/String;", - "field": "__ao_s", - "name": "s", - "owner": "ao" - }, - { - "access": 9, - "descriptor": "[Ljava/lang/String;", - "field": "cacheDirectoryLocations", - "name": "j", - "owner": "ah" - }, - { - "access": 9, - "descriptor": "[Llq;", - "field": "AbstractFont_modIconSprites", - "name": "x", - "owner": "kt" - }, - { - "access": 9, - "descriptor": "[S", - "field": "__hi_g", - "name": "g", - "owner": "hi" - }, - { - "access": 9, - "descriptor": "[S", - "field": "__hj_e", - "name": "e", - "owner": "hj" - }, - { - "access": 9, - "descriptor": "[Z", - "field": "KeyHandler_pressedKeys", - "name": "cb", - "owner": "an" - }, - { - "access": 9, - "descriptor": "[Z", - "field": "loadedInterfaces", - "name": "l", - "owner": "ho" - }, - { - "access": 9, - "descriptor": "[[Lho;", - "field": "interfaceComponents", - "name": "g", - "owner": "ho" - }, - { - "access": 9, - "descriptor": "[[S", - "field": "__bd_x", - "name": "x", - "owner": "bd" - }, - { - "access": 9, - "descriptor": "[[S", - "field": "__hz_l", - "name": "l", - "owner": "hz" - } - ], - "interfaces": [ - "ky" - ], - "methods": [ - { - "access": 0, - "descriptor": "(B)V", - "method": "doCycleJs5", - "name": "ef", - "owner": "client", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(B)V", - "method": "doCycleJs5Connect", - "name": "ev", - "owner": "client", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "__ge_137", - "name": "ge", - "owner": "client", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(IS)V", - "method": "js5Error", - "name": "ea", - "owner": "client", - "parameters": [ - "code" - ] - }, - { - "access": 0, - "descriptor": "(Lho;B)V", - "method": "alignComponent", - "name": "ip", - "owner": "client", - "parameters": [ - "component" - ] - }, - { - "access": 1, - "descriptor": "(B)Lkp;", - "method": "username", - "name": "kr", - "owner": "client" - }, - { - "access": 16, - "descriptor": "(B)V", - "method": "doCycleLoggedOut", - "name": "fg", - "owner": "client", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(B)Z", - "method": "__ht_140", - "name": "ht", - "owner": "client", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(I)V", - "method": "__hi_139", - "name": "hi", - "owner": "client", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(I)V", - "method": "__jh_142", - "name": "jh", - "owner": "client", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(I)V", - "method": "doCycleLoggedIn", - "name": "fx", - "owner": "client", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(I)V", - "method": "drawLoggedIn", - "name": "gs", - "owner": "client", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(IIB)V", - "method": "openMenu", - "name": "hj", - "owner": "client", - "parameters": [ - "x", - "y" - ] - }, - { - "access": 16, - "descriptor": "(Lcl;I)Z", - "method": "__hg_138", - "name": "hg", - "owner": "client", - "parameters": [ - "arg0" - ] - }, - { - "access": 16, - "descriptor": "(ZI)V", - "method": "__iu_141", - "name": "iu", - "owner": "client", - "parameters": [ - "arg0" - ] - }, - { - "access": 17, - "descriptor": "()V", - "method": "init", - "name": "init", - "owner": "client", - "parameters": [] - }, - { - "access": 20, - "descriptor": "(I)V", - "method": "__au_135", - "name": "au", - "owner": "client", - "parameters": [] - }, - { - "access": 20, - "descriptor": "(I)V", - "method": "__j_136", - "name": "j", - "owner": "client", - "parameters": [] - }, - { - "access": 20, - "descriptor": "(I)V", - "method": "doCycle", - "name": "al", - "owner": "client", - "parameters": [] - }, - { - "access": 20, - "descriptor": "(I)V", - "method": "kill0", - "name": "ae", - "owner": "client", - "parameters": [] - }, - { - "access": 20, - "descriptor": "(I)V", - "method": "setUp", - "name": "aw", - "owner": "client", - "parameters": [] - }, - { - "access": 20, - "descriptor": "(ZI)V", - "method": "draw", - "name": "ab", - "owner": "client" - }, - { - "access": 24, - "descriptor": "(DII)V", - "method": "Rasterizer3D_buildPalette", - "name": "g", - "owner": "et", - "parameters": [ - "brightness", - "hsMax", - "hsMin" - ] - }, - { - "access": 24, - "descriptor": "(IIII)I", - "method": "getTileHeight", - "name": "gu", - "owner": "ay" - }, - { - "access": 24, - "descriptor": "(IIII)V", - "method": "Rasterizer3D_setClip", - "name": "f", - "owner": "et", - "parameters": [ - "xEnd", - "xStart", - "yEnd", - "yStart" - ] - }, - { - "access": 24, - "descriptor": "(IIII)V", - "method": "worldToScreen", - "name": "gx", - "owner": "aj" - }, - { - "access": 24, - "descriptor": "(IIIILjava/lang/String;Ljava/lang/String;III)V", - "method": "menuAction", - "name": "hb", - "owner": "bz", - "parameters": [ - "action", - "argument0", - "argument1", - "argument2", - "mouseX", - "mouseY", - "opcode", - "targetName" - ] - }, - { - "access": 24, - "descriptor": "(IIIILln;Lhp;I)V", - "method": "worldToMinimap", - "name": "jk", - "owner": "ep" - }, - { - "access": 24, - "descriptor": "(IIIIZI)V", - "method": "setViewportShape", - "name": "gg", - "owner": "kx", - "parameters": [ - "clear", - "height", - "width", - "x", - "y" - ] - }, - { - "access": 24, - "descriptor": "(Lbr;IIII)V", - "method": "addPlayerToMenu", - "name": "ik", - "owner": "e", - "parameters": [ - "menuArg0", - "menuArg1", - "menuArg2", - "player" - ] - }, - { - "access": 24, - "descriptor": "(Lbx;ZI)V", - "method": "closeInterface", - "name": "jd", - "owner": "cs", - "parameters": [ - "b", - "w" - ] - }, - { - "access": 24, - "descriptor": "(Lbz;IIIIIB)V", - "method": "drawActor2d", - "name": "gr", - "owner": "at", - "parameters": [ - "a", - "actor", - "b", - "c", - "d", - "e" - ] - }, - { - "access": 24, - "descriptor": "(Ldc;B)V", - "method": "PcmStream_disable", - "name": "al", - "owner": "hm", - "parameters": [ - "stream" - ] - }, - { - "access": 24, - "descriptor": "(Lgr;IIIIIIB)V", - "method": "loadTerrain", - "name": "o", - "owner": "e", - "parameters": [ - "buffer", - "n", - "plane", - "x", - "x0", - "y", - "y0" - ] - }, - { - "access": 24, - "descriptor": "(Lgr;Llh;I)Llh;", - "method": "readStringIntParameters", - "name": "m", - "owner": "ir", - "parameters": [ - "buffer", - "hashTable" - ] - }, - { - "access": 24, - "descriptor": "(Lho;I)Z", - "method": "runCs1", - "name": "im", - "owner": "il", - "parameters": [ - "component" - ] - }, - { - "access": 24, - "descriptor": "(Lho;III)V", - "method": "clickComponent", - "name": "jf", - "owner": "cq", - "parameters": [ - "component", - "x", - "y" - ] - }, - { - "access": 24, - "descriptor": "(Lhx;B)V", - "method": "updatePlayer", - "name": "m", - "owner": "k" - }, - { - "access": 24, - "descriptor": "(Ljava/lang/String;Ljava/lang/String;IIIIZB)V", - "method": "insertMenuItem", - "name": "il", - "owner": "j", - "parameters": [ - "action", - "arg0", - "arg1", - "arg2", - "b", - "opcode", - "targetName" - ] - }, - { - "access": 24, - "descriptor": "(Ljava/lang/String;ZI)V", - "method": "drawLoadingMessage", - "name": "gl", - "owner": "bi" - }, - { - "access": 24, - "descriptor": "(Ljz;IIIB)V", - "method": "addNpcToMenu", - "name": "is", - "owner": "dj", - "parameters": [ - "menuArg0", - "menuArg1", - "menuArg2", - "npc" - ] - }, - { - "access": 24, - "descriptor": "(ZLhx;B)V", - "method": "loadRegions", - "name": "gc", - "owner": "af", - "parameters": [ - "isInInstance", - "packetBuffer" - ] - }, - { - "access": 24, - "descriptor": "([BI)[B", - "method": "decompressBytes", - "name": "ay", - "owner": "id" - }, - { - "access": 24, - "descriptor": "([Lho;IIIIIIII)V", - "method": "updateInterface", - "name": "jr", - "owner": "il", - "parameters": [ - "a", - "b", - "c", - "components", - "d", - "parentId", - "x", - "y" - ] - }, - { - "access": 24, - "descriptor": "([Lho;IIIIIIIII)V", - "method": "drawInterface", - "name": "ir", - "owner": "az" - }, - { - "access": 25, - "descriptor": "()V", - "method": "Rasterizer3D_method1", - "name": "m", - "owner": "et" - }, - { - "access": 25, - "descriptor": "()V", - "method": "Rasterizer3D_method3", - "name": "q", - "owner": "et" - }, - { - "access": 25, - "descriptor": "(D)V", - "method": "Rasterizer3D_setBrightness", - "name": "u", - "owner": "et", - "parameters": [ - "brightness" - ] - }, - { - "access": 25, - "descriptor": "(IIIIIZI)Lln;", - "method": "getItemSprite", - "name": "d", - "owner": "ht", - "parameters": [ - "b0", - "id", - "n0", - "n1", - "n2", - "quantity" - ] - }, - { - "access": 25, - "descriptor": "(Lei;)V", - "method": "Rasterizer3D_setTextureLoader", - "name": "o", - "owner": "et", - "parameters": [ - "textureLoader" - ] - }, - { - "access": 25, - "descriptor": "(Lfz;III)Lco;", - "method": "newPcmPlayer", - "name": "aj", - "owner": "cq" - }, - { - "access": 40, - "descriptor": "(IZI)[B", - "method": "ByteArrayPool_get", - "name": "f", - "owner": "gi" - }, - { - "access": 41, - "descriptor": "(I)J", - "method": "currentTimeMs", - "name": "m", - "owner": "ga", - "parameters": [] - }, - { - "access": 8, - "descriptor": "(I)Llz;", - "method": "worldMap", - "name": "er", - "owner": "dy" - }, - { - "access": 8, - "descriptor": "(I)Z", - "method": "loadWorlds", - "name": "m", - "owner": "ji", - "parameters": [] - }, - { - "access": 8, - "descriptor": "(IB)V", - "method": "updateGameState", - "name": "ec", - "owner": "ba", - "parameters": [ - "gameState" - ] - }, - { - "access": 8, - "descriptor": "(ID)I", - "method": "Rasterizer3D_brighten", - "name": "l", - "owner": "et", - "parameters": [ - "brightness", - "rgb" - ] - }, - { - "access": 8, - "descriptor": "(II)Len;", - "method": "getFrames", - "name": "x", - "owner": "bc", - "parameters": [ - "id" - ] - }, - { - "access": 8, - "descriptor": "(II)Ljava/lang/String;", - "method": "colorStartTag", - "name": "f", - "owner": "dy", - "parameters": [ - "color" - ] - }, - { - "access": 8, - "descriptor": "(III)V", - "method": "Rasterizer2D_setPixel", - "name": "eb", - "owner": "lf", - "parameters": [ - "color", - "x", - "y" - ] - }, - { - "access": 8, - "descriptor": "(IIIB)V", - "method": "queueSoundEffect", - "name": "fv", - "owner": "ks" - }, - { - "access": 8, - "descriptor": "(IIIII)V", - "method": "Rasterizer2D_drawHorizontalLineAlpha", - "name": "du", - "owner": "lf", - "parameters": [ - "alpha", - "length", - "rgb", - "x", - "y" - ] - }, - { - "access": 8, - "descriptor": "(IIIII)V", - "method": "Rasterizer2D_drawVerticalLineAlpha", - "name": "dq", - "owner": "lf", - "parameters": [ - "alpha", - "length", - "rgb", - "x", - "y" - ] - }, - { - "access": 8, - "descriptor": "(IIIII)V", - "method": "itemContainerSetItem", - "name": "w", - "owner": "al", - "parameters": [ - "index", - "itemContainerId", - "itemId", - "itemQuantity" - ] - }, - { - "access": 8, - "descriptor": "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - "method": "addMessage", - "name": "f", - "owner": "g", - "parameters": [ - "prefix", - "sender", - "text", - "type" - ] - }, - { - "access": 8, - "descriptor": "(IZZZB)Lit;", - "method": "newArchive", - "name": "fw", - "owner": "c" - }, - { - "access": 8, - "descriptor": "(Lbr;ZI)V", - "method": "addPlayerToScene", - "name": "gk", - "owner": "aw", - "parameters": [ - "b", - "player" - ] - }, - { - "access": 8, - "descriptor": "(Lbt;Lbt;IZI)I", - "method": "compareWorlds", - "name": "u", - "owner": "aj", - "parameters": [ - "b", - "mode", - "w0", - "w1" - ] - }, - { - "access": 8, - "descriptor": "(Lby;II)V", - "method": "runScript0", - "name": "f", - "owner": "l", - "parameters": [ - "n", - "scriptEvent" - ] - }, - { - "access": 8, - "descriptor": "(Lho;I)I", - "method": "getComponentClickMask", - "name": "kp", - "owner": "f", - "parameters": [ - "component" - ] - }, - { - "access": 8, - "descriptor": "(Lho;IIB)V", - "method": "alignComponentPosition", - "name": "iw", - "owner": "jf", - "parameters": [ - "component", - "parentHeight", - "parentWidth" - ] - }, - { - "access": 8, - "descriptor": "(Lho;IIZB)V", - "method": "alignComponentSize", - "name": "ic", - "owner": "p", - "parameters": [ - "b", - "component", - "parentHeight", - "parentWidth" - ] - }, - { - "access": 8, - "descriptor": "(Lhx;II)Z", - "method": "updateExternalPlayer", - "name": "o", - "owner": "ie" - }, - { - "access": 8, - "descriptor": "(Lir;II)Lcd;", - "method": "readMusicSample", - "name": "e", - "owner": "cd" - }, - { - "access": 8, - "descriptor": "(Lit;IIIBZI)V", - "method": "requestNetFile", - "name": "f", - "owner": "hx" - }, - { - "access": 8, - "descriptor": "(Ljava/lang/String;I)Ljava/lang/Class;", - "method": "loadClassFromDescriptor", - "name": "w", - "owner": "iw", - "parameters": [ - "descriptor" - ] - }, - { - "access": 8, - "descriptor": "(Lkk;Lkk;Lkk;I)V", - "method": "drawTitle", - "name": "x", - "owner": "bd" - }, - { - "access": 8, - "descriptor": "([BI)Lcg;", - "method": "newScript", - "name": "w", - "owner": "ee", - "parameters": [ - "bytes" - ] - }, - { - "access": 8, - "descriptor": "([BIIIII)V", - "method": "AbstractFont_drawGlyph", - "name": "ah", - "owner": "kt", - "parameters": [ - "color", - "height", - "pixels", - "width", - "x", - "y" - ] - }, - { - "access": 8, - "descriptor": "([BIIIIII)V", - "method": "AbstractFont_drawGlyphAlpha", - "name": "aw", - "owner": "kt", - "parameters": [ - "alpha", - "color", - "height", - "pixels", - "width", - "x", - "y" - ] - }, - { - "access": 8, - "descriptor": "([I[BIIIIIII)V", - "method": "AbstractFont_placeGlyph", - "name": "ak", - "owner": "kt" - }, - { - "access": 8, - "descriptor": "([I[BIIIIIIII)V", - "method": "AbstractFont_placeGlyphAlpha", - "name": "al", - "owner": "kt" - }, - { - "access": 9, - "descriptor": "()V", - "method": "Rasterizer2D_clear", - "name": "dd", - "owner": "lf" - }, - { - "access": 9, - "descriptor": "()V", - "method": "Rasterizer2D_resetClip", - "name": "ds", - "owner": "lf" - }, - { - "access": 9, - "descriptor": "(CI)B", - "method": "charToByteCp1252", - "name": "m", - "owner": "cr", - "parameters": [ - "c" - ] - }, - { - "access": 9, - "descriptor": "(IB)Lho;", - "method": "getInterfaceComponent", - "name": "m", - "owner": "gd", - "parameters": [ - "id" - ] - }, - { - "access": 9, - "descriptor": "(IB)Lic;", - "method": "getWorldMapElement", - "name": "m", - "owner": "dm", - "parameters": [ - "id" - ] - }, - { - "access": 9, - "descriptor": "(IB)Lio;", - "method": "getSpotAnimationDefinition", - "name": "m", - "owner": "af" - }, - { - "access": 9, - "descriptor": "(IB)Ljb;", - "method": "getParamDefinition", - "name": "m", - "owner": "hz", - "parameters": [ - "id" - ] - }, - { - "access": 9, - "descriptor": "(IB)Z", - "method": "loadInterface", - "name": "q", - "owner": "dr", - "parameters": [ - "itf" - ] - }, - { - "access": 9, - "descriptor": "(II)I", - "method": "getVarbit", - "name": "m", - "owner": "ah", - "parameters": [ - "id" - ] - }, - { - "access": 9, - "descriptor": "(II)Lim;", - "method": "getKitDefinition", - "name": "m", - "owner": "as" - }, - { - "access": 9, - "descriptor": "(II)Ljh;", - "method": "getSequenceDefinition", - "name": "m", - "owner": "ae" - }, - { - "access": 9, - "descriptor": "(II)Ljm;", - "method": "getHitmarkDefinition", - "name": "f", - "owner": "bp", - "parameters": [ - "id" - ] - }, - { - "access": 9, - "descriptor": "(II)Ljr;", - "method": "getObjectDefinition", - "name": "f", - "owner": "af", - "parameters": [ - "id" - ] - }, - { - "access": 9, - "descriptor": "(II)Ljv;", - "method": "getItemDefinition", - "name": "m", - "owner": "hc", - "parameters": [ - "id" - ] - }, - { - "access": 9, - "descriptor": "(II)Ljz;", - "method": "getNpcDefinition", - "name": "f", - "owner": "jr", - "parameters": [ - "id" - ] - }, - { - "access": 9, - "descriptor": "(III)Lho;", - "method": "getComponentChild", - "name": "f", - "owner": "gx" - }, - { - "access": 9, - "descriptor": "(IIII)V", - "method": "Rasterizer2D_drawHorizontalLine", - "name": "dj", - "owner": "lf", - "parameters": [ - "color", - "length", - "x", - "y" - ] - }, - { - "access": 9, - "descriptor": "(IIII)V", - "method": "Rasterizer2D_drawVerticalLine", - "name": "dm", - "owner": "lf", - "parameters": [ - "color", - "length", - "x", - "y" - ] - }, - { - "access": 9, - "descriptor": "(IIII)V", - "method": "Rasterizer2D_expandClip", - "name": "dc", - "owner": "lf", - "parameters": [ - "xEnd", - "xStart", - "yEnd", - "yStart" - ] - }, - { - "access": 9, - "descriptor": "(IIII)V", - "method": "Rasterizer2D_setClip", - "name": "di", - "owner": "lf", - "parameters": [ - "xEnd", - "xStart", - "yEnd", - "yStart" - ] - }, - { - "access": 9, - "descriptor": "(IIIII)V", - "method": "Rasterizer2D_drawLine", - "name": "et", - "owner": "lf", - "parameters": [ - "color", - "x0", - "x1", - "y0", - "y1" - ] - }, - { - "access": 9, - "descriptor": "(IIIII)V", - "method": "Rasterizer2D_drawRectangle", - "name": "dh", - "owner": "lf", - "parameters": [ - "color", - "height", - "width", - "x", - "y" - ] - }, - { - "access": 9, - "descriptor": "(IIIII)V", - "method": "Rasterizer2D_fillRectangle", - "name": "dr", - "owner": "lf", - "parameters": [ - "color", - "height", - "width", - "x", - "y" - ] - }, - { - "access": 9, - "descriptor": "(IIIIII)V", - "method": "Rasterizer2D_drawRectangleAlpha", - "name": "dz", - "owner": "lf", - "parameters": [ - "alpha", - "height", - "rgb", - "width", - "x", - "y" - ] - }, - { - "access": 9, - "descriptor": "(IIIIIIII)V", - "method": "Scene_addOccluder", - "name": "w", - "owner": "em" - }, - { - "access": 9, - "descriptor": "(Lby;S)V", - "method": "runScript", - "name": "m", - "owner": "ir", - "parameters": [ - "scriptEvent" - ] - }, - { - "access": 9, - "descriptor": "(Lgw;Lgw;)V", - "method": "IterableNodeDeque_addBefore", - "name": "w", - "owner": "ja", - "parameters": [ - "node", - "old" - ] - }, - { - "access": 9, - "descriptor": "(Lir;II)Lci;", - "method": "readSoundEffect", - "name": "m", - "owner": "ci" - }, - { - "access": 9, - "descriptor": "(Lir;II)Lhe;", - "method": "readTrack", - "name": "m", - "owner": "he" - }, - { - "access": 9, - "descriptor": "(Lir;III)Lln;", - "method": "readSprite", - "name": "m", - "owner": "le", - "parameters": [ - "archive", - "file", - "group" - ] - }, - { - "access": 9, - "descriptor": "(Ljava/lang/CharSequence;I)I", - "method": "hashString", - "name": "l", - "owner": "client", - "parameters": [ - "chars" - ] - }, - { - "access": 9, - "descriptor": "(Ljava/lang/CharSequence;II[BII)I", - "method": "encodeStringCp1252", - "name": "w", - "owner": "dt", - "parameters": [ - "dst", - "dstStart", - "src", - "srcEnd", - "srcStart" - ] - }, - { - "access": 9, - "descriptor": "(Ljava/lang/Object;ZB)[B", - "method": "byteArrayFromObject", - "name": "u", - "owner": "dl", - "parameters": [ - "copyArray", - "o" - ] - }, - { - "access": 9, - "descriptor": "(Ljava/lang/String;)Ljava/lang/String;", - "method": "escapeBrackets", - "name": "s", - "owner": "kt", - "parameters": [ - "s" - ] - }, - { - "access": 9, - "descriptor": "(Ljava/lang/String;Ljava/lang/String;ZS)Ldk;", - "method": "getPreferencesFile", - "name": "q", - "owner": "gl" - }, - { - "access": 9, - "descriptor": "([BIII)Ljava/lang/String;", - "method": "decodeStringCp1252", - "name": "o", - "owner": "bx", - "parameters": [ - "length", - "src", - "srcStart" - ] - }, - { - "access": 9, - "descriptor": "([BI[BII)I", - "method": "Bzip2Decompressor_decompress", - "name": "m", - "owner": "gk" - }, - { - "access": 9, - "descriptor": "([BZB)Ljava/lang/Object;", - "method": "byteArrayToObject", - "name": "o", - "owner": "cb", - "parameters": [ - "bytes", - "copyArray" - ] - }, - { - "access": 9, - "descriptor": "([I)V", - "method": "Rasterizer2D_getClipArray", - "name": "dg", - "owner": "lf", - "parameters": [ - "dst" - ] - }, - { - "access": 9, - "descriptor": "([I)V", - "method": "Rasterizer2D_setClipArray", - "name": "db", - "owner": "lf", - "parameters": [ - "src" - ] - }, - { - "access": 9, - "descriptor": "([III)V", - "method": "Rasterizer2D_replace", - "name": "dp", - "owner": "lf", - "parameters": [ - "height", - "pixels", - "width" - ] - }, - { - "access": 9, - "descriptor": "([III)V", - "method": "clearIntArray", - "name": "x", - "owner": "hh" - }, - { - "access": 9, - "descriptor": "([IIIII)V", - "method": "Scene_buildVisiblityMap", - "name": "at", - "owner": "em", - "parameters": [ - "a", - "b", - "c", - "viewportHeight", - "viewportWidth" - ] - }, - { - "access": 9, - "descriptor": "([Lgc;II)Lgc;", - "method": "findEnumerated", - "name": "m", - "owner": "bn", - "parameters": [ - "ordinal", - "values" - ] - } - ], - "name": "client", - "super": "ba" - }, - { - "access": 49, - "class": "DemotingHashTable", - "constructors": [ - { - "access": 1, - "descriptor": "(II)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "I", - "field": "capacity", - "name": "m", - "owner": "ec" - }, - { - "access": 0, - "descriptor": "I", - "field": "remaining", - "name": "f", - "owner": "ec" - }, - { - "access": 0, - "descriptor": "Ljc;", - "field": "queue", - "name": "w", - "owner": "ec" - }, - { - "access": 0, - "descriptor": "Llh;", - "field": "hashTable", - "name": "q", - "owner": "ec" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(J)V", - "method": "remove", - "name": "f", - "owner": "ec", - "parameters": [ - "key" - ] - }, - { - "access": 0, - "descriptor": "(Leu;)V", - "method": "removeWrapper", - "name": "q", - "owner": "ec", - "parameters": [ - "wrapper" - ] - }, - { - "access": 1, - "descriptor": "()V", - "method": "clear", - "name": "u", - "owner": "ec", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "demote", - "name": "o", - "owner": "ec", - "parameters": [ - "softeningLevel" - ] - }, - { - "access": 1, - "descriptor": "(J)Ljava/lang/Object;", - "method": "get", - "name": "m", - "owner": "ec", - "parameters": [ - "key" - ] - }, - { - "access": 1, - "descriptor": "(Ljava/lang/Object;JI)V", - "method": "put", - "name": "w", - "owner": "ec", - "parameters": [ - "key", - "size", - "value" - ] - } - ], - "name": "ec", - "super": "java.lang.Object" - }, - { - "access": 49, - "class": "DualNodeDeque", - "constructors": [ - { - "access": 1, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Lfn;", - "field": "sentinel", - "name": "m", - "owner": "jp" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "()Lfn;", - "method": "last", - "name": "o", - "owner": "jp" - }, - { - "access": 1, - "descriptor": "()Lfn;", - "method": "removeLast", - "name": "w", - "owner": "jp" - }, - { - "access": 1, - "descriptor": "()V", - "method": "clear", - "name": "u", - "owner": "jp" - }, - { - "access": 1, - "descriptor": "(Lfn;)V", - "method": "addFirst", - "name": "m", - "owner": "jp" - }, - { - "access": 1, - "descriptor": "(Lfn;)V", - "method": "addLast", - "name": "f", - "owner": "jp" - } - ], - "name": "jp", - "super": "java.lang.Object" - }, - { - "access": 49, - "class": "EvictingDualNodeHashTable", - "constructors": [ - { - "access": 1, - "descriptor": "(I)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "I", - "field": "capacity", - "name": "f", - "owner": "er" - }, - { - "access": 0, - "descriptor": "I", - "field": "remainingCapacity", - "name": "q", - "owner": "er" - }, - { - "access": 0, - "descriptor": "Lfn;", - "field": "__m", - "name": "m", - "owner": "er" - }, - { - "access": 0, - "descriptor": "Ljp;", - "field": "deque", - "name": "o", - "owner": "er" - }, - { - "access": 0, - "descriptor": "Lld;", - "field": "hashTable", - "name": "w", - "owner": "er" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "()V", - "method": "clear", - "name": "w", - "owner": "er", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(J)Lfn;", - "method": "get", - "name": "m", - "owner": "er", - "parameters": [ - "key" - ] - }, - { - "access": 1, - "descriptor": "(J)V", - "method": "remove", - "name": "f", - "owner": "er", - "parameters": [ - "key" - ] - }, - { - "access": 1, - "descriptor": "(Lfn;J)V", - "method": "put", - "name": "q", - "owner": "er", - "parameters": [ - "key", - "value" - ] - } - ], - "name": "er", - "super": "java.lang.Object" - }, - { - "access": 49, - "class": "FloorDecoration", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1241982749, - "descriptor": "I", - "field": "flags", - "name": "u", - "owner": "do" - }, - { - "access": 0, - "decoder": -1358154703, - "descriptor": "I", - "field": "tileHeight", - "name": "f", - "owner": "do" - }, - { - "access": 0, - "decoder": 1309467119, - "descriptor": "I", - "field": "x", - "name": "q", - "owner": "do" - }, - { - "access": 0, - "decoder": 318503957, - "descriptor": "I", - "field": "y", - "name": "w", - "owner": "do" - }, - { - "access": 1, - "decoder": -5063688075016131000, - "descriptor": "J", - "field": "tag", - "name": "m", - "owner": "do" - }, - { - "access": 1, - "descriptor": "Lex;", - "field": "entity", - "name": "o", - "owner": "do" - } - ], - "interfaces": [], - "methods": [], - "name": "do", - "super": "java.lang.Object" - }, - { - "access": 49, - "class": "Font", - "constructors": [ - { - "access": 1, - "descriptor": "([B)V" - }, - { - "access": 1, - "descriptor": "([B[I[I[I[I[I[[B)V" - } - ], - "fields": [], - "interfaces": [], - "methods": [ - { - "access": 16, - "descriptor": "([BIIIII)V", - "method": "drawGlyph", - "name": "m", - "owner": "kk" - }, - { - "access": 16, - "descriptor": "([BIIIIII)V", - "method": "drawGlyphAlpha", - "name": "f", - "owner": "kk" - } - ], - "name": "kk", - "super": "kt" - }, - { - "access": 49, - "class": "GameObject", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1017836867, - "descriptor": "I", - "field": "startX", - "name": "g", - "owner": "eh" - }, - { - "access": 0, - "decoder": -1043687633, - "descriptor": "I", - "field": "lastDrawn", - "name": "k", - "owner": "eh" - }, - { - "access": 0, - "decoder": -1519796265, - "descriptor": "I", - "field": "startY", - "name": "e", - "owner": "eh" - }, - { - "access": 0, - "decoder": -161115901, - "descriptor": "I", - "field": "flags", - "name": "i", - "owner": "eh" - }, - { - "access": 0, - "decoder": -1791908691, - "descriptor": "I", - "field": "height", - "name": "q", - "owner": "eh" - }, - { - "access": 0, - "decoder": -379698951, - "descriptor": "I", - "field": "endX", - "name": "l", - "owner": "eh" - }, - { - "access": 0, - "decoder": -607228629, - "descriptor": "I", - "field": "endY", - "name": "x", - "owner": "eh" - }, - { - "access": 0, - "decoder": 109300811, - "descriptor": "I", - "field": "centerX", - "name": "w", - "owner": "eh" - }, - { - "access": 0, - "decoder": 1393658667, - "descriptor": "I", - "field": "orientation", - "name": "m", - "owner": "eh" - }, - { - "access": 0, - "decoder": 1941106389, - "descriptor": "I", - "field": "__d", - "name": "d", - "owner": "eh" - }, - { - "access": 0, - "decoder": 2095667225, - "descriptor": "I", - "field": "plane", - "name": "f", - "owner": "eh" - }, - { - "access": 0, - "decoder": 714046631, - "descriptor": "I", - "field": "centerY", - "name": "o", - "owner": "eh" - }, - { - "access": 1, - "decoder": -114546124748632880, - "descriptor": "J", - "field": "tag", - "name": "n", - "owner": "eh" - }, - { - "access": 1, - "descriptor": "Lex;", - "field": "entity", - "name": "u", - "owner": "eh" - } - ], - "interfaces": [], - "methods": [], - "name": "eh", - "super": "java.lang.Object" - }, - { - "access": 49, - "class": "GraphicsObject", - "constructors": [ - { - "access": 0, - "descriptor": "(IIIIIII)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1189549567, - "descriptor": "I", - "field": "x", - "name": "w", - "owner": "bw" - }, - { - "access": 0, - "decoder": -1245488067, - "descriptor": "I", - "field": "cycleStart", - "name": "f", - "owner": "bw" - }, - { - "access": 0, - "decoder": -1950327625, - "descriptor": "I", - "field": "frameCycle", - "name": "e", - "owner": "bw" - }, - { - "access": 0, - "decoder": -289084031, - "descriptor": "I", - "field": "id", - "name": "m", - "owner": "bw" - }, - { - "access": 0, - "decoder": 1156757009, - "descriptor": "I", - "field": "height", - "name": "u", - "owner": "bw" - }, - { - "access": 0, - "decoder": 1416438985, - "descriptor": "I", - "field": "y", - "name": "o", - "owner": "bw" - }, - { - "access": 0, - "decoder": 1541221595, - "descriptor": "I", - "field": "frame", - "name": "l", - "owner": "bw" - }, - { - "access": 0, - "decoder": 432847573, - "descriptor": "I", - "field": "plane", - "name": "q", - "owner": "bw" - }, - { - "access": 0, - "descriptor": "Ljh;", - "field": "sequenceDefinition", - "name": "g", - "owner": "bw" - }, - { - "access": 0, - "descriptor": "Z", - "field": "isFinished", - "name": "x", - "owner": "bw" - } - ], - "interfaces": [], - "methods": [ - { - "access": 16, - "descriptor": "(II)V", - "method": "advance", - "name": "m", - "owner": "bw", - "parameters": [ - "cycles" - ] - }, - { - "access": 20, - "descriptor": "(I)Ldu;", - "method": "getModel", - "name": "e", - "owner": "bw", - "parameters": [] - } - ], - "name": "bw", - "super": "ex" - }, - { - "access": 49, - "class": "GroundItem", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": 454094667, - "descriptor": "I", - "field": "quantity", - "name": "f", - "owner": "ck" - }, - { - "access": 0, - "decoder": 893970699, - "descriptor": "I", - "field": "id", - "name": "m", - "owner": "ck" - } - ], - "interfaces": [], - "methods": [ - { - "access": 20, - "descriptor": "(I)Ldu;", - "method": "getModel", - "name": "e", - "owner": "ck", - "parameters": [] - } - ], - "name": "ck", - "super": "ex" - }, - { - "access": 49, - "class": "GroundItemPile", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1363136655, - "descriptor": "I", - "field": "x", - "name": "q", - "owner": "dr" - }, - { - "access": 0, - "decoder": -1659262853, - "descriptor": "I", - "field": "height", - "name": "l", - "owner": "dr" - }, - { - "access": 0, - "decoder": -325682933, - "descriptor": "I", - "field": "tileHeight", - "name": "f", - "owner": "dr" - }, - { - "access": 0, - "decoder": -3696674445500473000, - "descriptor": "J", - "field": "tag", - "name": "g", - "owner": "dr" - }, - { - "access": 0, - "decoder": 968072997, - "descriptor": "I", - "field": "y", - "name": "w", - "owner": "dr" - }, - { - "access": 0, - "descriptor": "Lex;", - "field": "first", - "name": "o", - "owner": "dr" - }, - { - "access": 0, - "descriptor": "Lex;", - "field": "second", - "name": "m", - "owner": "dr" - }, - { - "access": 0, - "descriptor": "Lex;", - "field": "third", - "name": "u", - "owner": "dr" - } - ], - "interfaces": [], - "methods": [], - "name": "dr", - "super": "java.lang.Object" - }, - { - "access": 49, - "class": "IndexedSprite", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 1, - "descriptor": "I", - "field": "height", - "name": "l", - "owner": "lq" - }, - { - "access": 1, - "descriptor": "I", - "field": "subHeight", - "name": "w", - "owner": "lq" - }, - { - "access": 1, - "descriptor": "I", - "field": "subWidth", - "name": "q", - "owner": "lq" - }, - { - "access": 1, - "descriptor": "I", - "field": "width", - "name": "g", - "owner": "lq" - }, - { - "access": 1, - "descriptor": "I", - "field": "xOffset", - "name": "o", - "owner": "lq" - }, - { - "access": 1, - "descriptor": "I", - "field": "yOffset", - "name": "u", - "owner": "lq" - }, - { - "access": 1, - "descriptor": "[B", - "field": "pixels", - "name": "m", - "owner": "lq" - }, - { - "access": 1, - "descriptor": "[I", - "field": "palette", - "name": "f", - "owner": "lq" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "()V", - "method": "normalize", - "name": "m", - "owner": "lq", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(II)V", - "method": "__q_492", - "name": "q", - "owner": "lq", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(III)V", - "method": "shiftColors", - "name": "f", - "owner": "lq", - "parameters": [ - "b", - "g", - "r" - ] - }, - { - "access": 1, - "descriptor": "(IIII)V", - "method": "__o_493", - "name": "o", - "owner": "lq", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3" - ] - } - ], - "name": "lq", - "super": "lf" - }, - { - "access": 49, - "class": "IsaacCipher", - "constructors": [ - { - "access": 1, - "descriptor": "([I)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1670027699, - "descriptor": "I", - "field": "__g", - "name": "g", - "owner": "hn" - }, - { - "access": 0, - "decoder": -325762649, - "descriptor": "I", - "field": "__l", - "name": "l", - "owner": "hn" - }, - { - "access": 0, - "decoder": -689202647, - "descriptor": "I", - "field": "__e", - "name": "e", - "owner": "hn" - }, - { - "access": 0, - "decoder": 1514845493, - "descriptor": "I", - "field": "__w", - "name": "w", - "owner": "hn" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__o", - "name": "o", - "owner": "hn" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__u", - "name": "u", - "owner": "hn" - } - ], - "interfaces": [], - "methods": [ - { - "access": 16, - "descriptor": "(B)V", - "method": "__q_338", - "name": "q", - "owner": "hn", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(I)I", - "method": "__f_337", - "name": "f", - "owner": "hn", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(I)I", - "method": "__m_336", - "name": "m", - "owner": "hn", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(I)V", - "method": "__w_339", - "name": "w", - "owner": "hn", - "parameters": [] - } - ], - "name": "hn", - "super": "java.lang.Object" - }, - { - "access": 49, - "class": "IterableNodeHashTable", - "constructors": [ - { - "access": 1, - "descriptor": "(I)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "I", - "field": "index", - "name": "o", - "owner": "lh" - }, - { - "access": 0, - "descriptor": "I", - "field": "size", - "name": "m", - "owner": "lh" - }, - { - "access": 0, - "descriptor": "Lgw;", - "field": "current", - "name": "w", - "owner": "lh" - }, - { - "access": 0, - "descriptor": "Lgw;", - "field": "currentGet", - "name": "q", - "owner": "lh" - }, - { - "access": 0, - "descriptor": "[Lgw;", - "field": "buckets", - "name": "f", - "owner": "lh" - } - ], - "interfaces": [ - "java.lang.Iterable" - ], - "methods": [ - { - "access": 1, - "descriptor": "()Lgw;", - "method": "first", - "name": "w", - "owner": "lh" - }, - { - "access": 1, - "descriptor": "()Lgw;", - "method": "next", - "name": "o", - "owner": "lh" - }, - { - "access": 1, - "descriptor": "()Ljava/util/Iterator;", - "method": "__iterator_478", - "name": "iterator", - "owner": "lh", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "clear", - "name": "q", - "owner": "lh", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(J)Lgw;", - "method": "get", - "name": "m", - "owner": "lh" - }, - { - "access": 1, - "descriptor": "(Lgw;J)V", - "method": "put", - "name": "f", - "owner": "lh" - } - ], - "name": "lh", - "super": "java.lang.Object" - }, - { - "access": 49, - "class": "KeyHandler", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [], - "interfaces": [ - "java.awt.event.FocusListener", - "java.awt.event.KeyListener" - ], - "methods": [ - { - "access": 17, - "descriptor": "(Ljava/awt/event/FocusEvent;)V", - "method": "__focusGained_88", - "name": "focusGained", - "owner": "an", - "parameters": [ - "arg0" - ] - }, - { - "access": 17, - "descriptor": "(Ljava/awt/event/KeyEvent;)V", - "method": "__keyTyped_87", - "name": "keyTyped", - "owner": "an", - "parameters": [ - "arg0" - ] - }, - { - "access": 49, - "descriptor": "(Ljava/awt/event/FocusEvent;)V", - "method": "__focusLost_89", - "name": "focusLost", - "owner": "an", - "parameters": [ - "arg0" - ] - }, - { - "access": 49, - "descriptor": "(Ljava/awt/event/KeyEvent;)V", - "method": "__keyReleased_86", - "name": "keyReleased", - "owner": "an", - "parameters": [ - "arg0" - ] - }, - { - "access": 49, - "descriptor": "(Ljava/awt/event/KeyEvent;)V", - "method": "keyPressed", - "name": "keyPressed", - "owner": "an", - "parameters": [ - "ke" - ] - } - ], - "name": "an", - "super": "java.lang.Object" - }, - { - "access": 49, - "class": "MouseWheelHandler", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -182252389, - "descriptor": "I", - "field": "rotation", - "name": "m", - "owner": "am" - } - ], - "interfaces": [ - "fv", - "java.awt.event.MouseWheelListener" - ], - "methods": [ - { - "access": 0, - "descriptor": "(Ljava/awt/Component;B)V", - "method": "addTo", - "name": "m", - "owner": "am", - "parameters": [ - "component" - ] - }, - { - "access": 0, - "descriptor": "(Ljava/awt/Component;I)V", - "method": "removeFrom", - "name": "f", - "owner": "am", - "parameters": [ - "component" - ] - }, - { - "access": 33, - "descriptor": "(I)I", - "method": "useRotation", - "name": "q", - "owner": "am", - "parameters": [] - }, - { - "access": 33, - "descriptor": "(Ljava/awt/event/MouseWheelEvent;)V", - "method": "__mouseWheelMoved_85", - "name": "mouseWheelMoved", - "owner": "am", - "parameters": [ - "arg0" - ] - } - ], - "name": "am", - "super": "java.lang.Object" - }, - { - "access": 49, - "class": "NetSocket", - "constructors": [ - { - "access": 1, - "descriptor": "(Ljava/net/Socket;Lfz;I)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -738185459, - "descriptor": "I", - "field": "__l", - "name": "l", - "owner": "fb" - }, - { - "access": 0, - "decoder": 2057244853, - "descriptor": "I", - "field": "__e", - "name": "e", - "owner": "fb" - }, - { - "access": 0, - "descriptor": "Lfm;", - "field": "task", - "name": "u", - "owner": "fb" - }, - { - "access": 0, - "descriptor": "Lfz;", - "field": "taskHandler", - "name": "o", - "owner": "fb" - }, - { - "access": 0, - "descriptor": "Ljava/io/InputStream;", - "field": "inputStream", - "name": "m", - "owner": "fb" - }, - { - "access": 0, - "descriptor": "Ljava/io/OutputStream;", - "field": "outputStream", - "name": "f", - "owner": "fb" - }, - { - "access": 0, - "descriptor": "Ljava/net/Socket;", - "field": "socket", - "name": "q", - "owner": "fb" - }, - { - "access": 0, - "descriptor": "Z", - "field": "exceptionWriting", - "name": "x", - "owner": "fb" - }, - { - "access": 0, - "descriptor": "Z", - "field": "isClosed", - "name": "w", - "owner": "fb" - }, - { - "access": 0, - "descriptor": "[B", - "field": "array", - "name": "g", - "owner": "fb" - }, - { - "access": 16, - "decoder": -1644762957, - "descriptor": "I", - "field": "__d", - "name": "d", - "owner": "fb" - }, - { - "access": 16, - "decoder": -782964015, - "descriptor": "I", - "field": "__k", - "name": "k", - "owner": "fb" - } - ], - "interfaces": [ - "java.lang.Runnable" - ], - "methods": [ - { - "access": 0, - "descriptor": "([BIIB)V", - "method": "write0", - "name": "ay", - "owner": "fb", - "parameters": [ - "length", - "src", - "srcIndex" - ] - }, - { - "access": 1, - "descriptor": "()V", - "method": "__run_281", - "name": "run", - "owner": "fb", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "available", - "name": "q", - "owner": "fb", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "readUnsignedByte", - "name": "w", - "owner": "fb", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "close", - "name": "g", - "owner": "fb", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(II)Z", - "method": "isAvailable", - "name": "f", - "owner": "fb", - "parameters": [ - "length" - ] - }, - { - "access": 1, - "descriptor": "([BIIB)V", - "method": "write", - "name": "u", - "owner": "fb", - "parameters": [ - "length", - "src", - "srcIndex" - ] - }, - { - "access": 1, - "descriptor": "([BIII)I", - "method": "read", - "name": "o", - "owner": "fb", - "parameters": [ - "dst", - "dstIndex", - "length" - ] - }, - { - "access": 4, - "descriptor": "()V", - "method": "finalize", - "name": "finalize", - "owner": "fb" - } - ], - "name": "fb", - "super": "fu" - }, - { - "access": 49, - "class": "NodeHashTable", - "constructors": [ - { - "access": 1, - "descriptor": "(I)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "I", - "field": "index", - "name": "o", - "owner": "ld" - }, - { - "access": 0, - "descriptor": "I", - "field": "size", - "name": "m", - "owner": "ld" - }, - { - "access": 0, - "descriptor": "Lgw;", - "field": "current", - "name": "w", - "owner": "ld" - }, - { - "access": 0, - "descriptor": "Lgw;", - "field": "currentGet", - "name": "q", - "owner": "ld" - }, - { - "access": 0, - "descriptor": "[Lgw;", - "field": "buckets", - "name": "f", - "owner": "ld" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "()Lgw;", - "method": "first", - "name": "w", - "owner": "ld", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()Lgw;", - "method": "next", - "name": "o", - "owner": "ld", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "clear", - "name": "q", - "owner": "ld", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(J)Lgw;", - "method": "get", - "name": "m", - "owner": "ld", - "parameters": [ - "key" - ] - }, - { - "access": 1, - "descriptor": "(Lgw;J)V", - "method": "put", - "name": "f", - "owner": "ld", - "parameters": [ - "key", - "node" - ] - } - ], - "name": "ld", - "super": "java.lang.Object" - }, - { - "access": 49, - "class": "Npc", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Ljz;", - "field": "definition", - "name": "m", - "owner": "cv" - } - ], - "interfaces": [], - "methods": [ - { - "access": 16, - "descriptor": "(B)Z", - "method": "isVisible", - "name": "z", - "owner": "cv", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(IBI)V", - "method": "__m_162", - "name": "m", - "owner": "cv", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 16, - "descriptor": "(IIZI)V", - "method": "__f_163", - "name": "f", - "owner": "cv", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 20, - "descriptor": "(I)Ldu;", - "method": "getModel", - "name": "e", - "owner": "cv", - "parameters": [] - } - ], - "name": "cv", - "super": "bz" - }, - { - "access": 49, - "class": "ObjectSound", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1041508847, - "descriptor": "I", - "field": "__n", - "name": "n", - "owner": "be" - }, - { - "access": 0, - "decoder": -1608400407, - "descriptor": "I", - "field": "__x", - "name": "x", - "owner": "be" - }, - { - "access": 0, - "decoder": -211591209, - "descriptor": "I", - "field": "__o", - "name": "o", - "owner": "be" - }, - { - "access": 0, - "decoder": -731474443, - "descriptor": "I", - "field": "soundEffectId", - "name": "l", - "owner": "be" - }, - { - "access": 0, - "decoder": -800464493, - "descriptor": "I", - "field": "__q", - "name": "q", - "owner": "be" - }, - { - "access": 0, - "decoder": -85911525, - "descriptor": "I", - "field": "__w", - "name": "w", - "owner": "be" - }, - { - "access": 0, - "decoder": 1344558633, - "descriptor": "I", - "field": "__g", - "name": "g", - "owner": "be" - }, - { - "access": 0, - "decoder": 1748890449, - "descriptor": "I", - "field": "__d", - "name": "d", - "owner": "be" - }, - { - "access": 0, - "decoder": 512258949, - "descriptor": "I", - "field": "__u", - "name": "u", - "owner": "be" - }, - { - "access": 0, - "decoder": 647270745, - "descriptor": "I", - "field": "__f", - "name": "f", - "owner": "be" - }, - { - "access": 0, - "descriptor": "Lds;", - "field": "stream1", - "name": "e", - "owner": "be" - }, - { - "access": 0, - "descriptor": "Lds;", - "field": "stream2", - "name": "i", - "owner": "be" - }, - { - "access": 0, - "descriptor": "Ljr;", - "field": "obj", - "name": "a", - "owner": "be" - }, - { - "access": 0, - "descriptor": "[I", - "field": "soundEffectIds", - "name": "k", - "owner": "be" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(I)V", - "method": "set", - "name": "f", - "owner": "be", - "parameters": [] - } - ], - "name": "be", - "super": "gw" - }, - { - "access": 49, - "class": "Occluder", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1114046315, - "descriptor": "I", - "field": "maxY", - "name": "d", - "owner": "ee" - }, - { - "access": 0, - "decoder": -1334433969, - "descriptor": "I", - "field": "__s", - "name": "s", - "owner": "ee" - }, - { - "access": 0, - "decoder": -13700523, - "descriptor": "I", - "field": "maxTileX", - "name": "f", - "owner": "ee" - }, - { - "access": 0, - "decoder": -1527021367, - "descriptor": "I", - "field": "__a", - "name": "a", - "owner": "ee" - }, - { - "access": 0, - "decoder": -1805075909, - "descriptor": "I", - "field": "maxZ", - "name": "e", - "owner": "ee" - }, - { - "access": 0, - "decoder": -1824663821, - "descriptor": "I", - "field": "minX", - "name": "u", - "owner": "ee" - }, - { - "access": 0, - "decoder": -2141305127, - "descriptor": "I", - "field": "maxX", - "name": "g", - "owner": "ee" - }, - { - "access": 0, - "decoder": -373839103, - "descriptor": "I", - "field": "__j", - "name": "j", - "owner": "ee" - }, - { - "access": 0, - "decoder": -407777817, - "descriptor": "I", - "field": "__n", - "name": "n", - "owner": "ee" - }, - { - "access": 0, - "decoder": -41239751, - "descriptor": "I", - "field": "minZ", - "name": "l", - "owner": "ee" - }, - { - "access": 0, - "decoder": -570391007, - "descriptor": "I", - "field": "__z", - "name": "z", - "owner": "ee" - }, - { - "access": 0, - "decoder": -691483983, - "descriptor": "I", - "field": "minTileX", - "name": "m", - "owner": "ee" - }, - { - "access": 0, - "decoder": -806776509, - "descriptor": "I", - "field": "type", - "name": "o", - "owner": "ee" - }, - { - "access": 0, - "decoder": 1324959981, - "descriptor": "I", - "field": "__i", - "name": "i", - "owner": "ee" - }, - { - "access": 0, - "decoder": 1501977891, - "descriptor": "I", - "field": "maxTileY", - "name": "w", - "owner": "ee" - }, - { - "access": 0, - "decoder": 768402657, - "descriptor": "I", - "field": "minTileY", - "name": "q", - "owner": "ee" - }, - { - "access": 0, - "decoder": 826041747, - "descriptor": "I", - "field": "__k", - "name": "k", - "owner": "ee" - }, - { - "access": 0, - "decoder": 842961497, - "descriptor": "I", - "field": "minY", - "name": "x", - "owner": "ee" - } - ], - "interfaces": [], - "methods": [], - "name": "ee", - "super": "java.lang.Object" - }, - { - "access": 49, - "class": "PacketBuffer", - "constructors": [ - { - "access": 1, - "descriptor": "(I)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1048718919, - "descriptor": "I", - "field": "bitIndex", - "name": "d", - "owner": "hx" - }, - { - "access": 0, - "descriptor": "Lhn;", - "field": "isaacCipher0", - "name": "e", - "owner": "hx" - } - ], - "interfaces": [], - "methods": [ - { - "access": 1, - "descriptor": "(B)Z", - "method": "__ig_334", - "name": "ig", - "owner": "hx", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "readByteIsaac", - "name": "ii", - "owner": "hx", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)I", - "method": "readSmartByteShortIsaac", - "name": "ia", - "owner": "hx", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "exportIndex", - "name": "jm", - "owner": "hx", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "importIndex", - "name": "jq", - "owner": "hx", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(II)I", - "method": "bitsRemaining", - "name": "jr", - "owner": "hx", - "parameters": [ - "index" - ] - }, - { - "access": 1, - "descriptor": "(II)I", - "method": "readBits", - "name": "jw", - "owner": "hx", - "parameters": [ - "bits" - ] - }, - { - "access": 1, - "descriptor": "(IS)V", - "method": "writeByteIsaac", - "name": "im", - "owner": "hx", - "parameters": [ - "b" - ] - }, - { - "access": 1, - "descriptor": "(Lhn;B)V", - "method": "setIsaacCipher", - "name": "ih", - "owner": "hx", - "parameters": [ - "isaacCipher" - ] - }, - { - "access": 1, - "descriptor": "([BIII)V", - "method": "__jb_335", - "name": "jb", - "owner": "hx", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "([II)V", - "method": "newIsaacCipher", - "name": "io", - "owner": "hx", - "parameters": [ - "array" - ] - } - ], - "name": "hx", - "super": "gr" - }, - { - "access": 49, - "class": "Player", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1136542281, - "descriptor": "I", - "field": "skillLevel", - "name": "l", - "owner": "br" - }, - { - "access": 0, - "decoder": -1624108131, - "descriptor": "I", - "field": "tileHeight2", - "name": "n", - "owner": "br" - }, - { - "access": 0, - "decoder": -1771431457, - "descriptor": "I", - "field": "__i", - "name": "i", - "owner": "br" - }, - { - "access": 0, - "decoder": -351876137, - "descriptor": "I", - "field": "animationCycleStart", - "name": "x", - "owner": "br" - }, - { - "access": 0, - "decoder": -359981047, - "descriptor": "I", - "field": "animationCycleEnd", - "name": "d", - "owner": "br" - }, - { - "access": 0, - "decoder": -539678769, - "descriptor": "I", - "field": "tileX", - "name": "aq", - "owner": "br" - }, - { - "access": 0, - "decoder": -793415473, - "descriptor": "I", - "field": "headIconPrayer", - "name": "w", - "owner": "br" - }, - { - "access": 0, - "decoder": 1332604413, - "descriptor": "I", - "field": "plane", - "name": "c", - "owner": "br" - }, - { - "access": 0, - "decoder": 1486240677, - "descriptor": "I", - "field": "index", - "name": "r", - "owner": "br" - }, - { - "access": 0, - "decoder": 1610462047, - "descriptor": "I", - "field": "__z", - "name": "z", - "owner": "br" - }, - { - "access": 0, - "decoder": 1989338999, - "descriptor": "I", - "field": "tileHeight", - "name": "e", - "owner": "br" - }, - { - "access": 0, - "decoder": 2021372599, - "descriptor": "I", - "field": "headIconPk", - "name": "q", - "owner": "br" - }, - { - "access": 0, - "decoder": 224552403, - "descriptor": "I", - "field": "__j", - "name": "j", - "owner": "br" - }, - { - "access": 0, - "decoder": 305969541, - "descriptor": "I", - "field": "__s", - "name": "s", - "owner": "br" - }, - { - "access": 0, - "decoder": 665272587, - "descriptor": "I", - "field": "__k", - "name": "k", - "owner": "br" - }, - { - "access": 0, - "decoder": 702193221, - "descriptor": "I", - "field": "tileY", - "name": "aj", - "owner": "br" - }, - { - "access": 0, - "decoder": 892671055, - "descriptor": "I", - "field": "__t", - "name": "t", - "owner": "br" - }, - { - "access": 0, - "decoder": 91041167, - "descriptor": "I", - "field": "team", - "name": "h", - "owner": "br" - }, - { - "access": 0, - "decoder": 984869133, - "descriptor": "I", - "field": "combatLevel", - "name": "g", - "owner": "br" - }, - { - "access": 0, - "descriptor": "Ldu;", - "field": "model0", - "name": "a", - "owner": "br" - }, - { - "access": 0, - "descriptor": "Lhi;", - "field": "appearance", - "name": "f", - "owner": "br" - }, - { - "access": 0, - "descriptor": "Lkd;", - "field": "isFriend", - "name": "p", - "owner": "br" - }, - { - "access": 0, - "descriptor": "Lkd;", - "field": "isInClanChat", - "name": "v", - "owner": "br" - }, - { - "access": 0, - "descriptor": "Lkp;", - "field": "username", - "name": "m", - "owner": "br" - }, - { - "access": 0, - "descriptor": "Z", - "field": "__ag", - "name": "ag", - "owner": "br" - }, - { - "access": 0, - "descriptor": "Z", - "field": "isHidden", - "name": "b", - "owner": "br" - }, - { - "access": 0, - "descriptor": "Z", - "field": "isUnanimated", - "name": "y", - "owner": "br" - }, - { - "access": 0, - "descriptor": "[Ljava/lang/String;", - "field": "actions", - "name": "u", - "owner": "br" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(B)Z", - "method": "__f_124", - "name": "f", - "owner": "br", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(B)Z", - "method": "__o_127", - "name": "o", - "owner": "br", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)I", - "method": "transformedSize", - "name": "l", - "owner": "br", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "__g_129", - "name": "g", - "owner": "br", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "__q_125", - "name": "q", - "owner": "br", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "__u_128", - "name": "u", - "owner": "br", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(I)V", - "method": "__w_126", - "name": "w", - "owner": "br", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(III)V", - "method": "resetPath", - "name": "d", - "owner": "br", - "parameters": [ - "x", - "y" - ] - }, - { - "access": 16, - "descriptor": "(B)Z", - "method": "isVisible", - "name": "z", - "owner": "br", - "parameters": [] - }, - { - "access": 16, - "descriptor": "(IIBI)V", - "method": "__a_131", - "name": "a", - "owner": "br", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 16, - "descriptor": "(IIBI)V", - "method": "__x_130", - "name": "x", - "owner": "br", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 16, - "descriptor": "(Lgr;I)V", - "method": "read", - "name": "m", - "owner": "br", - "parameters": [ - "buffer" - ] - }, - { - "access": 20, - "descriptor": "(I)Ldu;", - "method": "getModel", - "name": "e", - "owner": "br", - "parameters": [] - } - ], - "name": "br", - "super": "bz" - }, - { - "access": 49, - "class": "Projectile", - "constructors": [ - { - "access": 0, - "descriptor": "(IIIIIIIIIII)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1038876505, - "descriptor": "I", - "field": "plane", - "name": "f", - "owner": "cb" - }, - { - "access": 0, - "decoder": -1421996173, - "descriptor": "I", - "field": "sourceY", - "name": "w", - "owner": "cb" - }, - { - "access": 0, - "decoder": -2072120189, - "descriptor": "I", - "field": "pitch", - "name": "b", - "owner": "cb" - }, - { - "access": 0, - "decoder": -2074328969, - "descriptor": "I", - "field": "int4", - "name": "x", - "owner": "cb" - }, - { - "access": 0, - "decoder": -377214997, - "descriptor": "I", - "field": "frame", - "name": "r", - "owner": "cb" - }, - { - "access": 0, - "decoder": -4446033, - "descriptor": "I", - "field": "sourceZ", - "name": "o", - "owner": "cb" - }, - { - "access": 0, - "decoder": -675081925, - "descriptor": "I", - "field": "int5", - "name": "u", - "owner": "cb" - }, - { - "access": 0, - "decoder": -742871951, - "descriptor": "I", - "field": "frameCycle", - "name": "p", - "owner": "cb" - }, - { - "access": 0, - "decoder": -769539171, - "descriptor": "I", - "field": "int3", - "name": "e", - "owner": "cb" - }, - { - "access": 0, - "decoder": 1281680175, - "descriptor": "I", - "field": "yaw", - "name": "h", - "owner": "cb" - }, - { - "access": 0, - "decoder": 1652455041, - "descriptor": "I", - "field": "sourceX", - "name": "q", - "owner": "cb" - }, - { - "access": 0, - "decoder": 2111080001, - "descriptor": "I", - "field": "id", - "name": "m", - "owner": "cb" - }, - { - "access": 0, - "decoder": 2121946763, - "descriptor": "I", - "field": "cycleEnd", - "name": "l", - "owner": "cb" - }, - { - "access": 0, - "decoder": 358196599, - "descriptor": "I", - "field": "cycleStart", - "name": "g", - "owner": "cb" - }, - { - "access": 0, - "decoder": 551413977, - "descriptor": "I", - "field": "targetIndex", - "name": "d", - "owner": "cb" - }, - { - "access": 0, - "descriptor": "D", - "field": "accelerationZ", - "name": "y", - "owner": "cb" - }, - { - "access": 0, - "descriptor": "D", - "field": "speed", - "name": "s", - "owner": "cb" - }, - { - "access": 0, - "descriptor": "D", - "field": "speedX", - "name": "z", - "owner": "cb" - }, - { - "access": 0, - "descriptor": "D", - "field": "speedY", - "name": "j", - "owner": "cb" - }, - { - "access": 0, - "descriptor": "D", - "field": "speedZ", - "name": "t", - "owner": "cb" - }, - { - "access": 0, - "descriptor": "D", - "field": "x", - "name": "n", - "owner": "cb" - }, - { - "access": 0, - "descriptor": "D", - "field": "y", - "name": "i", - "owner": "cb" - }, - { - "access": 0, - "descriptor": "D", - "field": "z", - "name": "a", - "owner": "cb" - }, - { - "access": 0, - "descriptor": "Ljh;", - "field": "sequenceDefinition", - "name": "c", - "owner": "cb" - }, - { - "access": 0, - "descriptor": "Z", - "field": "isMoving", - "name": "k", - "owner": "cb" - } - ], - "interfaces": [], - "methods": [ - { - "access": 16, - "descriptor": "(II)V", - "method": "advance", - "name": "f", - "owner": "cb", - "parameters": [ - "cycles" - ] - }, - { - "access": 16, - "descriptor": "(IIIII)V", - "method": "setDestination", - "name": "m", - "owner": "cb", - "parameters": [ - "cycle", - "height", - "x", - "y" - ] - }, - { - "access": 20, - "descriptor": "(I)Ldu;", - "method": "getModel", - "name": "e", - "owner": "cb", - "parameters": [] - } - ], - "name": "cb", - "super": "ex" - }, - { - "access": 49, - "class": "RasterProvider", - "constructors": [ - { - "access": 0, - "descriptor": "(IILjava/awt/Component;)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "Ljava/awt/Component;", - "field": "component0", - "name": "m", - "owner": "ai" - }, - { - "access": 0, - "descriptor": "Ljava/awt/Image;", - "field": "image", - "name": "f", - "owner": "ai" - } - ], - "interfaces": [], - "methods": [ - { - "access": 16, - "descriptor": "(Ljava/awt/Component;B)V", - "method": "setComponent", - "name": "m", - "owner": "ai" - }, - { - "access": 16, - "descriptor": "(Ljava/awt/Graphics;III)V", - "method": "drawFull0", - "name": "w", - "owner": "ai", - "parameters": [ - "graphics", - "x", - "y" - ] - }, - { - "access": 16, - "descriptor": "(Ljava/awt/Graphics;IIIIB)V", - "method": "draw0", - "name": "o", - "owner": "ai", - "parameters": [ - "graphics", - "height", - "width", - "x", - "y" - ] - }, - { - "access": 17, - "descriptor": "(III)V", - "method": "drawFull", - "name": "f", - "owner": "ai", - "parameters": [ - "x", - "y" - ] - }, - { - "access": 17, - "descriptor": "(IIIIB)V", - "method": "draw", - "name": "q", - "owner": "ai", - "parameters": [ - "height", - "width", - "x", - "y" - ] - } - ], - "name": "ai", - "super": "lp" - }, - { - "access": 49, - "class": "Sprite", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - }, - { - "access": 1, - "descriptor": "(II)V" - }, - { - "access": 1, - "descriptor": "([III)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "I", - "field": "xOffset", - "name": "o", - "owner": "ln" - }, - { - "access": 1, - "descriptor": "I", - "field": "height", - "name": "g", - "owner": "ln" - }, - { - "access": 1, - "descriptor": "I", - "field": "subHeight", - "name": "q", - "owner": "ln" - }, - { - "access": 1, - "descriptor": "I", - "field": "subWidth", - "name": "f", - "owner": "ln" - }, - { - "access": 1, - "descriptor": "I", - "field": "width", - "name": "u", - "owner": "ln" - }, - { - "access": 1, - "descriptor": "I", - "field": "yOffset", - "name": "w", - "owner": "ln" - }, - { - "access": 1, - "descriptor": "[I", - "field": "pixels", - "name": "m", - "owner": "ln" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(IIIIII)V", - "method": "__aw_512", - "name": "aw", - "owner": "ln", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4", - "arg5" - ] - }, - { - "access": 1, - "descriptor": "()Lln;", - "method": "copy", - "name": "m", - "owner": "ln", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()Lln;", - "method": "copyNormalized", - "name": "f", - "owner": "ln", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "__g_497", - "name": "g", - "owner": "ln", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "__q_494", - "name": "q", - "owner": "ln", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "__u_496", - "name": "u", - "owner": "ln", - "parameters": [] - }, - { - "access": 1, - "descriptor": "()V", - "method": "normalize", - "name": "w", - "owner": "ln", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "__e_499", - "name": "e", - "owner": "ln", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "__l_498", - "name": "l", - "owner": "ln", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(I)V", - "method": "__o_495", - "name": "o", - "owner": "ln", - "parameters": [ - "arg0" - ] - }, - { - "access": 1, - "descriptor": "(II)V", - "method": "__a_501", - "name": "a", - "owner": "ln", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(II)V", - "method": "__x_500", - "name": "x", - "owner": "ln", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(III)V", - "method": "__h_504", - "name": "h", - "owner": "ln", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "(III)V", - "method": "__v_506", - "name": "v", - "owner": "ln", - "parameters": [ - "arg0", - "arg1", - "arg2" - ] - }, - { - "access": 1, - "descriptor": "(IIII)V", - "method": "__ak_511", - "name": "ak", - "owner": "ln", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3" - ] - }, - { - "access": 1, - "descriptor": "(IIII)V", - "method": "__al_513", - "name": "al", - "owner": "ln", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3" - ] - }, - { - "access": 1, - "descriptor": "(IIII)V", - "method": "__j_502", - "name": "j", - "owner": "ln", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3" - ] - }, - { - "access": 1, - "descriptor": "(IIII)V", - "method": "__t_503", - "name": "t", - "owner": "ln", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3" - ] - }, - { - "access": 1, - "descriptor": "(IIIII)V", - "method": "__aj_507", - "name": "aj", - "owner": "ln", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4" - ] - }, - { - "access": 1, - "descriptor": "(IIIII)V", - "method": "__c_505", - "name": "c", - "owner": "ln", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4" - ] - }, - { - "access": 1, - "descriptor": "(IIIIIIDI)V", - "method": "__ah_510", - "name": "ah", - "owner": "ln", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4", - "arg5", - "arg6", - "arg7" - ] - }, - { - "access": 1, - "descriptor": "(IIIIIIII[I[I)V", - "method": "__ay_509", - "name": "ay", - "owner": "ln", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4", - "arg5", - "arg6", - "arg7", - "arg8", - "arg9" - ] - }, - { - "access": 1, - "descriptor": "(IIIIII[I[I)V", - "method": "__ac_508", - "name": "ac", - "owner": "ln", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4", - "arg5", - "arg6", - "arg7" - ] - } - ], - "name": "ln", - "super": "lf" - }, - { - "access": 49, - "class": "Tile", - "constructors": [ - { - "access": 0, - "descriptor": "(III)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1078135311, - "descriptor": "I", - "field": "minPlane", - "name": "a", - "owner": "dj" - }, - { - "access": 0, - "decoder": -172066661, - "descriptor": "I", - "field": "__h", - "name": "h", - "owner": "dj" - }, - { - "access": 0, - "decoder": -561562755, - "descriptor": "I", - "field": "y", - "name": "q", - "owner": "dj" - }, - { - "access": 0, - "decoder": -792635627, - "descriptor": "I", - "field": "gameObjectsCount", - "name": "d", - "owner": "dj" - }, - { - "access": 0, - "decoder": 103024387, - "descriptor": "I", - "field": "x", - "name": "f", - "owner": "dj" - }, - { - "access": 0, - "decoder": 1065165981, - "descriptor": "I", - "field": "plane", - "name": "m", - "owner": "dj" - }, - { - "access": 0, - "decoder": 1192947815, - "descriptor": "I", - "field": "gameObjectsEdgeMask", - "name": "i", - "owner": "dj" - }, - { - "access": 0, - "decoder": 1724493981, - "descriptor": "I", - "field": "__y", - "name": "y", - "owner": "dj" - }, - { - "access": 0, - "decoder": 2030010491, - "descriptor": "I", - "field": "__b", - "name": "b", - "owner": "dj" - }, - { - "access": 0, - "decoder": 507854577, - "descriptor": "I", - "field": "originalPlane", - "name": "w", - "owner": "dj" - }, - { - "access": 0, - "decoder": 769252193, - "descriptor": "I", - "field": "drawGameObjectEdges", - "name": "t", - "owner": "dj" - }, - { - "access": 0, - "descriptor": "Ldj;", - "field": "linkedBelowTile", - "name": "c", - "owner": "dj" - }, - { - "access": 0, - "descriptor": "Ldo;", - "field": "floorDecoration", - "name": "e", - "owner": "dj" - }, - { - "access": 0, - "descriptor": "Ldr;", - "field": "groundItemPile", - "name": "x", - "owner": "dj" - }, - { - "access": 0, - "descriptor": "Ldv;", - "field": "model", - "name": "u", - "owner": "dj" - }, - { - "access": 0, - "descriptor": "Leb;", - "field": "paint", - "name": "o", - "owner": "dj" - }, - { - "access": 0, - "descriptor": "Lej;", - "field": "boundaryObject", - "name": "g", - "owner": "dj" - }, - { - "access": 0, - "descriptor": "Leq;", - "field": "wallDecoration", - "name": "l", - "owner": "dj" - }, - { - "access": 0, - "descriptor": "Z", - "field": "drawGameObjects", - "name": "s", - "owner": "dj" - }, - { - "access": 0, - "descriptor": "Z", - "field": "drawPrimary", - "name": "z", - "owner": "dj" - }, - { - "access": 0, - "descriptor": "Z", - "field": "drawSecondary", - "name": "j", - "owner": "dj" - }, - { - "access": 0, - "descriptor": "[I", - "field": "gameObjectEdgeMasks", - "name": "n", - "owner": "dj" - }, - { - "access": 0, - "descriptor": "[Leh;", - "field": "gameObjects", - "name": "k", - "owner": "dj" - } - ], - "interfaces": [], - "methods": [], - "name": "dj", - "super": "gw" - }, - { - "access": 49, - "class": "TileModel", - "constructors": [ - { - "access": 0, - "descriptor": "(IIIIIIIIIIIIIIIIIII)V" - } - ], - "fields": [ - { - "access": 0, - "descriptor": "I", - "field": "overlayRgb", - "name": "a", - "owner": "dv" - }, - { - "access": 0, - "descriptor": "I", - "field": "rotation", - "name": "n", - "owner": "dv" - }, - { - "access": 0, - "descriptor": "I", - "field": "shape", - "name": "k", - "owner": "dv" - }, - { - "access": 0, - "descriptor": "I", - "field": "underlayRgb", - "name": "i", - "owner": "dv" - }, - { - "access": 0, - "descriptor": "Z", - "field": "isFlat", - "name": "d", - "owner": "dv" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__e", - "name": "e", - "owner": "dv" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__f", - "name": "f", - "owner": "dv" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__g", - "name": "g", - "owner": "dv" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__l", - "name": "l", - "owner": "dv" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__m", - "name": "m", - "owner": "dv" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__o", - "name": "o", - "owner": "dv" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__q", - "name": "q", - "owner": "dv" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__u", - "name": "u", - "owner": "dv" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__w", - "name": "w", - "owner": "dv" - }, - { - "access": 0, - "descriptor": "[I", - "field": "__x", - "name": "x", - "owner": "dv" - } - ], - "interfaces": [], - "methods": [], - "name": "dv", - "super": "java.lang.Object" - }, - { - "access": 49, - "class": "TilePaint", - "constructors": [ - { - "access": 0, - "descriptor": "(IIIIIIZ)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1057776035, - "descriptor": "I", - "field": "nwColor", - "name": "w", - "owner": "eb" - }, - { - "access": 0, - "decoder": -1668262341, - "descriptor": "I", - "field": "neColor", - "name": "q", - "owner": "eb" - }, - { - "access": 0, - "decoder": -1875844515, - "descriptor": "I", - "field": "seColor", - "name": "f", - "owner": "eb" - }, - { - "access": 0, - "decoder": 181759449, - "descriptor": "I", - "field": "swColor", - "name": "m", - "owner": "eb" - }, - { - "access": 0, - "decoder": 2097947337, - "descriptor": "I", - "field": "rgb", - "name": "g", - "owner": "eb" - }, - { - "access": 0, - "decoder": 463308567, - "descriptor": "I", - "field": "texture", - "name": "o", - "owner": "eb" - }, - { - "access": 0, - "descriptor": "Z", - "field": "isFlat", - "name": "u", - "owner": "eb" - } - ], - "interfaces": [], - "methods": [], - "name": "eb", - "super": "java.lang.Object" - }, - { - "access": 49, - "class": "Tiles", - "constructors": [], - "fields": [], - "interfaces": [], - "methods": [], - "name": "bq", - "super": "java.lang.Object" - }, - { - "access": 49, - "class": "WallDecoration", - "constructors": [ - { - "access": 0, - "descriptor": "()V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1164153171, - "descriptor": "I", - "field": "flags", - "name": "d", - "owner": "eq" - }, - { - "access": 0, - "decoder": -1531207607, - "descriptor": "I", - "field": "yOffset", - "name": "g", - "owner": "eq" - }, - { - "access": 0, - "decoder": -183359389, - "descriptor": "I", - "field": "orientation", - "name": "w", - "owner": "eq" - }, - { - "access": 0, - "decoder": -303827911, - "descriptor": "I", - "field": "int7", - "name": "o", - "owner": "eq" - }, - { - "access": 0, - "decoder": -629971645, - "descriptor": "I", - "field": "y", - "name": "q", - "owner": "eq" - }, - { - "access": 0, - "decoder": 1411967127, - "descriptor": "I", - "field": "x", - "name": "f", - "owner": "eq" - }, - { - "access": 0, - "decoder": 1781638945, - "descriptor": "I", - "field": "tileHeight", - "name": "m", - "owner": "eq" - }, - { - "access": 0, - "decoder": 1927462659, - "descriptor": "I", - "field": "xOffset", - "name": "u", - "owner": "eq" - }, - { - "access": 1, - "decoder": 3167575053900974600, - "descriptor": "J", - "field": "tag", - "name": "x", - "owner": "eq" - }, - { - "access": 1, - "descriptor": "Lex;", - "field": "entity1", - "name": "l", - "owner": "eq" - }, - { - "access": 1, - "descriptor": "Lex;", - "field": "entity2", - "name": "e", - "owner": "eq" - } - ], - "interfaces": [], - "methods": [], - "name": "eq", - "super": "java.lang.Object" - }, - { - "access": 49, - "class": "WorldMapManager", - "constructors": [ - { - "access": 1, - "descriptor": "([Llq;Ljava/util/HashMap;Lir;Lir;)V" - } - ], - "fields": [ - { - "access": 0, - "decoder": -1459928419, - "descriptor": "I", - "field": "__k", - "name": "k", - "owner": "al" - }, - { - "access": 0, - "decoder": -395718741, - "descriptor": "I", - "field": "__a", - "name": "a", - "owner": "al" - }, - { - "access": 0, - "decoder": 1364441271, - "descriptor": "I", - "field": "__n", - "name": "n", - "owner": "al" - }, - { - "access": 0, - "decoder": 1729323633, - "descriptor": "I", - "field": "__i", - "name": "i", - "owner": "al" - }, - { - "access": 0, - "descriptor": "Lae;", - "field": "mapAreaData", - "name": "q", - "owner": "al" - }, - { - "access": 0, - "descriptor": "Ljava/util/HashMap;", - "field": "__g", - "name": "g", - "owner": "al" - }, - { - "access": 0, - "descriptor": "Ljava/util/HashMap;", - "field": "icons", - "name": "o", - "owner": "al" - }, - { - "access": 0, - "descriptor": "Lln;", - "field": "overviewSprite", - "name": "w", - "owner": "al" - }, - { - "access": 0, - "descriptor": "Z", - "field": "isLoaded0", - "name": "m", - "owner": "al" - }, - { - "access": 0, - "descriptor": "Z", - "field": "loadStarted", - "name": "f", - "owner": "al" - }, - { - "access": 0, - "descriptor": "[Llq;", - "field": "mapSceneSprites", - "name": "l", - "owner": "al" - }, - { - "access": 0, - "descriptor": "[[Lav;", - "field": "regions", - "name": "u", - "owner": "al" - }, - { - "access": 1, - "decoder": 1085359673, - "descriptor": "I", - "field": "__z", - "name": "z", - "owner": "al" - }, - { - "access": 16, - "descriptor": "Lir;", - "field": "__e", - "name": "e", - "owner": "al" - }, - { - "access": 16, - "descriptor": "Lir;", - "field": "__x", - "name": "x", - "owner": "al" - }, - { - "access": 16, - "descriptor": "Ljava/util/HashMap;", - "field": "fonts", - "name": "d", - "owner": "al" - } - ], - "interfaces": [], - "methods": [ - { - "access": 0, - "descriptor": "(B)V", - "method": "buildIcons0", - "name": "x", - "owner": "al", - "parameters": [] - }, - { - "access": 0, - "descriptor": "(III)F", - "method": "__d_75", - "name": "d", - "owner": "al", - "parameters": [ - "arg0", - "arg1" - ] - }, - { - "access": 1, - "descriptor": "(I)Ljava/util/HashMap;", - "method": "buildIcons", - "name": "e", - "owner": "al", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(I)Z", - "method": "isLoaded", - "name": "l", - "owner": "al", - "parameters": [] - }, - { - "access": 1, - "descriptor": "(IIIIIIIIIII)Ljava/util/List;", - "method": "__u_74", - "name": "u", - "owner": "al", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4", - "arg5", - "arg6", - "arg7", - "arg8", - "arg9" - ] - }, - { - "access": 1, - "descriptor": "(IIIILjava/util/HashSet;III)V", - "method": "drawOverview", - "name": "o", - "owner": "al" - }, - { - "access": 1, - "descriptor": "(Lir;Ljava/lang/String;ZB)V", - "method": "load", - "name": "m", - "owner": "al", - "parameters": [ - "cacheName", - "archive", - "isMembersWorld" - ] - }, - { - "access": 17, - "descriptor": "(B)V", - "method": "clearIcons", - "name": "f", - "owner": "al", - "parameters": [] - }, - { - "access": 17, - "descriptor": "(IIIIIIIII)V", - "method": "__q_72", - "name": "q", - "owner": "al", - "parameters": [ - "arg0", - "arg1", - "arg2", - "arg3", - "arg4", - "arg5", - "arg6", - "arg7" - ] - }, - { - "access": 17, - "descriptor": "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZB)V", - "method": "__w_73", - "name": "w", - "owner": "al", - "parameters": [ - "arg0", - "arg1", - "arg10", - "arg11", - "arg12", - "arg2", - "arg3", - "arg4", - "arg5", - "arg6", - "arg7", - "arg8", - "arg9" - ] - } - ], - "name": "al", - "super": "java.lang.Object" - } -] \ No newline at end of file +[ { + "class" : "Formatting", + "name" : "cy", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "Task", + "name" : "fm", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "intArgument", + "owner" : "fm", + "name" : "g", + "access" : 1, + "descriptor" : "I" + }, { + "field" : "next", + "owner" : "fm", + "name" : "m", + "access" : 0, + "descriptor" : "Lfm;" + }, { + "field" : "objectArgument", + "owner" : "fm", + "name" : "l", + "access" : 0, + "descriptor" : "Ljava/lang/Object;" + }, { + "field" : "result", + "owner" : "fm", + "name" : "e", + "access" : 65, + "descriptor" : "Ljava/lang/Object;" + }, { + "field" : "status", + "owner" : "fm", + "name" : "o", + "access" : 65, + "descriptor" : "I" + }, { + "field" : "type", + "owner" : "fm", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : -1097728571 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "GzipDecompressor", + "name" : "go", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "inflater", + "owner" : "go", + "name" : "m", + "access" : 0, + "descriptor" : "Ljava/util/zip/Inflater;" + } ], + "methods" : [ { + "method" : "decompress", + "owner" : "go", + "name" : "m", + "access" : 1, + "descriptor" : "(Lgr;[BB)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + }, { + "access" : 0, + "descriptor" : "(III)V" + } ] +}, { + "class" : "AbstractRasterProvider", + "name" : "lp", + "super" : "java.lang.Object", + "access" : 1057, + "interfaces" : [ ], + "fields" : [ { + "field" : "height", + "owner" : "lp", + "name" : "o", + "access" : 1, + "descriptor" : "I", + "decoder" : -239960145 + }, { + "field" : "pixels", + "owner" : "lp", + "name" : "q", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "width", + "owner" : "lp", + "name" : "w", + "access" : 1, + "descriptor" : "I", + "decoder" : -560298363 + } ], + "methods" : [ { + "method" : "apply", + "owner" : "lp", + "name" : "b", + "access" : 17, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "draw", + "owner" : "lp", + "name" : "q", + "access" : 1025, + "parameters" : [ "x", "y", "width", "height" ], + "descriptor" : "(IIIIB)V" + }, { + "method" : "drawFull", + "owner" : "lp", + "name" : "f", + "access" : 1025, + "parameters" : [ "x", "y" ], + "descriptor" : "(III)V" + } ], + "constructors" : [ { + "access" : 4, + "descriptor" : "()V" + } ] +}, { + "class" : "Clock", + "name" : "fa", + "super" : "java.lang.Object", + "access" : 1057, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ { + "method" : "mark", + "owner" : "fa", + "name" : "m", + "access" : 1025, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "wait", + "owner" : "fa", + "name" : "f", + "access" : 1025, + "parameters" : [ "cycleMs", "minSleepMs" ], + "descriptor" : "(III)I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "ByteArrayPool", + "name" : "gi", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "DevicePcmPlayer", + "name" : "ax", + "super" : "co", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "byteSamples", + "owner" : "ax", + "name" : "w", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "capacity2", + "owner" : "ax", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -106586673 + }, { + "field" : "format", + "owner" : "ax", + "name" : "m", + "access" : 0, + "descriptor" : "Ljavax/sound/sampled/AudioFormat;" + }, { + "field" : "line", + "owner" : "ax", + "name" : "f", + "access" : 0, + "descriptor" : "Ljavax/sound/sampled/SourceDataLine;" + } ], + "methods" : [ { + "method" : "close", + "owner" : "ax", + "name" : "o", + "access" : 4, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "discard", + "owner" : "ax", + "name" : "u", + "access" : 4, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "init", + "owner" : "ax", + "name" : "m", + "access" : 4, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "open", + "owner" : "ax", + "name" : "f", + "access" : 4, + "parameters" : [ "bufferSize" ], + "descriptor" : "(II)V" + }, { + "method" : "position", + "owner" : "ax", + "name" : "q", + "access" : 4, + "parameters" : [ ], + "descriptor" : "(B)I" + }, { + "method" : "write", + "owner" : "ax", + "name" : "w", + "access" : 4, + "parameters" : [ ], + "descriptor" : "()V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Canvas", + "name" : "ao", + "super" : "java.awt.Canvas", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "component", + "owner" : "ao", + "name" : "m", + "access" : 0, + "descriptor" : "Ljava/awt/Component;" + } ], + "methods" : [ { + "method" : "paint", + "owner" : "ao", + "name" : "paint", + "access" : 17, + "parameters" : [ "g" ], + "descriptor" : "(Ljava/awt/Graphics;)V" + }, { + "method" : "update", + "owner" : "ao", + "name" : "update", + "access" : 17, + "parameters" : [ "g" ], + "descriptor" : "(Ljava/awt/Graphics;)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/awt/Component;)V" + } ] +}, { + "class" : "ClientParameter", + "name" : "ji", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "id", + "owner" : "ji", + "name" : "y", + "access" : 17, + "descriptor" : "Ljava/lang/String;" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/lang/String;Ljava/lang/String;)V" + } ] +}, { + "class" : "MenuAction", + "name" : "cs", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "action", + "owner" : "cs", + "name" : "o", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "argument0", + "owner" : "cs", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : -2057883817 + }, { + "field" : "argument1", + "owner" : "cs", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : 305977315 + }, { + "field" : "argument2", + "owner" : "cs", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 1764645917 + }, { + "field" : "opcode", + "owner" : "cs", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -1483856253 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "ClientPacket", + "name" : "gs", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "gb" ], + "fields" : [ { + "field" : "id", + "owner" : "gs", + "name" : "cd", + "access" : 16, + "descriptor" : "I", + "decoder" : -286923745 + }, { + "field" : "length", + "owner" : "gs", + "name" : "cx", + "access" : 16, + "descriptor" : "I", + "decoder" : -1759434223 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(II)V" + } ] +}, { + "class" : "TilePaint", + "name" : "eb", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "isFlat", + "owner" : "eb", + "name" : "u", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "neColor", + "owner" : "eb", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -1668262341 + }, { + "field" : "nwColor", + "owner" : "eb", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : -1057776035 + }, { + "field" : "rgb", + "owner" : "eb", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : 2097947337 + }, { + "field" : "seColor", + "owner" : "eb", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : -1875844515 + }, { + "field" : "swColor", + "owner" : "eb", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : 181759449 + }, { + "field" : "texture", + "owner" : "eb", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : 463308567 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(IIIIIIZ)V" + } ] +}, { + "class" : "AbstractByteArrayCopier", + "name" : "gu", + "super" : "java.lang.Object", + "access" : 1057, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ { + "method" : "get", + "owner" : "gu", + "name" : "m", + "access" : 1024, + "parameters" : [ ], + "descriptor" : "(I)[B" + }, { + "method" : "set", + "owner" : "gu", + "name" : "f", + "access" : 1024, + "parameters" : [ "array" ], + "descriptor" : "([BI)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "ModelData0", + "name" : "ed", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Varps", + "name" : "hv", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "Strings", + "name" : "id", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "WorldMapCacheName", + "name" : "aw", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "name", + "owner" : "aw", + "name" : "u", + "access" : 17, + "descriptor" : "Ljava/lang/String;" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/lang/String;)V" + } ] +}, { + "class" : "TriBool", + "name" : "kd", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Decimator", + "name" : "dp", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "inputRate", + "owner" : "dp", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : -1376358157 + }, { + "field" : "outputRate", + "owner" : "dp", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : -876645877 + }, { + "field" : "table", + "owner" : "dp", + "name" : "u", + "access" : 0, + "descriptor" : "[[I" + } ], + "methods" : [ { + "method" : "resample", + "owner" : "dp", + "name" : "m", + "access" : 0, + "descriptor" : "([BI)[B" + }, { + "method" : "scalePosition", + "owner" : "dp", + "name" : "q", + "access" : 0, + "parameters" : [ "position" ], + "descriptor" : "(IB)I" + }, { + "method" : "scaleRate", + "owner" : "dp", + "name" : "f", + "access" : 0, + "parameters" : [ "rate" ], + "descriptor" : "(II)I" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(II)V" + } ] +}, { + "class" : "DirectByteArrayCopier", + "name" : "gv", + "super" : "gu", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "directBuffer", + "owner" : "gv", + "name" : "m", + "access" : 0, + "descriptor" : "Ljava/nio/ByteBuffer;" + } ], + "methods" : [ { + "method" : "get", + "owner" : "gv", + "name" : "m", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)[B" + }, { + "method" : "set", + "owner" : "gv", + "name" : "f", + "access" : 0, + "parameters" : [ "array" ], + "descriptor" : "([BI)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Varcs", + "name" : "ch", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "intsPersistence", + "owner" : "ch", + "name" : "q", + "access" : 0, + "descriptor" : "[Z" + }, { + "field" : "lastWriteTimeMs", + "owner" : "ch", + "name" : "g", + "access" : 0, + "descriptor" : "J", + "decoder" : 4836824701467349417 + }, { + "field" : "map", + "owner" : "ch", + "name" : "w", + "access" : 0, + "descriptor" : "Ljava/util/Map;" + }, { + "field" : "strings", + "owner" : "ch", + "name" : "o", + "access" : 0, + "descriptor" : "[Ljava/lang/String;" + }, { + "field" : "unwrittenChanges", + "owner" : "ch", + "name" : "u", + "access" : 0, + "descriptor" : "Z" + } ], + "methods" : [ { + "method" : "clearTransient", + "owner" : "ch", + "name" : "g", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "getInt", + "owner" : "ch", + "name" : "f", + "access" : 0, + "parameters" : [ "index" ], + "descriptor" : "(IB)I" + }, { + "method" : "getPreferencesFile", + "owner" : "ch", + "name" : "l", + "access" : 0, + "descriptor" : "(ZB)Ldk;" + }, { + "method" : "getString", + "owner" : "ch", + "name" : "w", + "access" : 0, + "parameters" : [ "index" ], + "descriptor" : "(II)Ljava/lang/String;" + }, { + "method" : "getStringOld", + "owner" : "ch", + "name" : "u", + "access" : 0, + "parameters" : [ "index" ], + "descriptor" : "(IB)Ljava/lang/String;" + }, { + "method" : "hasUnwrittenChanges", + "owner" : "ch", + "name" : "a", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "read", + "owner" : "ch", + "name" : "x", + "access" : 0, + "descriptor" : "(I)V" + }, { + "method" : "setInt", + "owner" : "ch", + "name" : "m", + "access" : 0, + "parameters" : [ "index", "n" ], + "descriptor" : "(III)V" + }, { + "method" : "setString", + "owner" : "ch", + "name" : "q", + "access" : 0, + "parameters" : [ "index", "s" ], + "descriptor" : "(ILjava/lang/String;I)V" + }, { + "method" : "setStringOld", + "owner" : "ch", + "name" : "o", + "access" : 0, + "parameters" : [ "index", "s" ], + "descriptor" : "(ILjava/lang/String;B)V" + }, { + "method" : "tryWrite", + "owner" : "ch", + "name" : "d", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "write", + "owner" : "ch", + "name" : "e", + "access" : 0, + "descriptor" : "(I)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Usernamed", + "name" : "ky", + "super" : "java.lang.Object", + "access" : 1537, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ { + "method" : "username", + "owner" : "ky", + "name" : "kr", + "access" : 1025, + "descriptor" : "(B)Lkp;" + } ], + "constructors" : [ ] +}, { + "class" : "SecureRandomFuture", + "name" : "cn", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "executor", + "owner" : "cn", + "name" : "m", + "access" : 0, + "descriptor" : "Ljava/util/concurrent/ExecutorService;" + }, { + "field" : "future", + "owner" : "cn", + "name" : "f", + "access" : 0, + "descriptor" : "Ljava/util/concurrent/Future;" + } ], + "methods" : [ { + "method" : "get", + "owner" : "cn", + "name" : "q", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)Ljava/security/SecureRandom;" + }, { + "method" : "isDone", + "owner" : "cn", + "name" : "f", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "shutdown", + "owner" : "cn", + "name" : "m", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "ServerPacket", + "name" : "ge", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "id", + "owner" : "ge", + "name" : "cu", + "access" : 17, + "descriptor" : "I", + "decoder" : 1117211673 + }, { + "field" : "length", + "owner" : "ge", + "name" : "cb", + "access" : 17, + "descriptor" : "I", + "decoder" : 947096829 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(II)V" + } ] +}, { + "class" : "UrlRequest", + "name" : "ey", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "isDone0", + "owner" : "ey", + "name" : "f", + "access" : 64, + "descriptor" : "Z" + }, { + "field" : "response0", + "owner" : "ey", + "name" : "q", + "access" : 64, + "descriptor" : "[B" + }, { + "field" : "url", + "owner" : "ey", + "name" : "m", + "access" : 16, + "descriptor" : "Ljava/net/URL;" + } ], + "methods" : [ { + "method" : "getResponse", + "owner" : "ey", + "name" : "f", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)[B" + }, { + "method" : "isDone", + "owner" : "ey", + "name" : "m", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/net/URL;)V" + } ] +}, { + "class" : "WorldMapLabel", + "name" : "aj", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "height", + "owner" : "aj", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -85027761 + }, { + "field" : "size", + "owner" : "aj", + "name" : "w", + "access" : 0, + "descriptor" : "Ls;" + }, { + "field" : "text", + "owner" : "aj", + "name" : "m", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "width", + "owner" : "aj", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : -471061617 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/lang/String;IILs;)V" + } ] +}, { + "class" : "RunException", + "name" : "fx", + "super" : "java.lang.RuntimeException", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "string", + "owner" : "fx", + "name" : "o", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "throwable", + "owner" : "fx", + "name" : "u", + "access" : 0, + "descriptor" : "Ljava/lang/Throwable;" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/lang/Throwable;Ljava/lang/String;)V" + } ] +}, { + "class" : "Node", + "name" : "gw", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "key", + "owner" : "gw", + "name" : "cl", + "access" : 1, + "descriptor" : "J" + }, { + "field" : "next", + "owner" : "gw", + "name" : "cz", + "access" : 1, + "descriptor" : "Lgw;" + }, { + "field" : "previous", + "owner" : "gw", + "name" : "ct", + "access" : 1, + "descriptor" : "Lgw;" + } ], + "methods" : [ { + "method" : "hasNext", + "owner" : "gw", + "name" : "eg", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Z" + }, { + "method" : "remove", + "owner" : "gw", + "name" : "es", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "DefaultsGroup", + "name" : "ka", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "group", + "owner" : "ka", + "name" : "f", + "access" : 16, + "descriptor" : "I", + "decoder" : -800980069 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(I)V" + } ] +}, { + "class" : "SoundEnvelope", + "name" : "de", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "amplitude", + "owner" : "de", + "name" : "d", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "durations", + "owner" : "de", + "name" : "f", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "end", + "owner" : "de", + "name" : "o", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "form", + "owner" : "de", + "name" : "u", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "max", + "owner" : "de", + "name" : "k", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "phaseIndex", + "owner" : "de", + "name" : "l", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "phases", + "owner" : "de", + "name" : "q", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "segments", + "owner" : "de", + "name" : "m", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "start", + "owner" : "de", + "name" : "w", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "step", + "owner" : "de", + "name" : "e", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "ticks", + "owner" : "de", + "name" : "g", + "access" : 0, + "descriptor" : "I" + } ], + "methods" : [ { + "method" : "decode", + "owner" : "de", + "name" : "m", + "access" : 16, + "parameters" : [ "buffer" ], + "descriptor" : "(Lgr;)V" + }, { + "method" : "decodeSegments", + "owner" : "de", + "name" : "f", + "access" : 16, + "parameters" : [ "buffer" ], + "descriptor" : "(Lgr;)V" + }, { + "method" : "doStep", + "owner" : "de", + "name" : "w", + "access" : 16, + "parameters" : [ "n" ], + "descriptor" : "(I)I" + }, { + "method" : "reset", + "owner" : "de", + "name" : "q", + "access" : 16, + "parameters" : [ ], + "descriptor" : "()V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "FriendLoginUpdate", + "name" : "kn", + "super" : "gh", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "time", + "owner" : "kn", + "name" : "q", + "access" : 1, + "descriptor" : "I", + "decoder" : -1390885889 + }, { + "field" : "username", + "owner" : "kn", + "name" : "w", + "access" : 1, + "descriptor" : "Lkp;" + }, { + "field" : "world", + "owner" : "kn", + "name" : "o", + "access" : 1, + "descriptor" : "S" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Lkp;I)V" + } ] +}, { + "class" : "GrandExchangeEvents", + "name" : "g", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "events", + "owner" : "g", + "name" : "m", + "access" : 17, + "descriptor" : "Ljava/util/List;" + } ], + "methods" : [ { + "method" : "sort", + "owner" : "g", + "name" : "m", + "access" : 1, + "descriptor" : "(Ljava/util/Comparator;ZI)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Lgr;Z)V" + } ] +}, { + "class" : "ServerBuild", + "name" : "iy", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "id", + "owner" : "iy", + "name" : "u", + "access" : 17, + "descriptor" : "I", + "decoder" : -947415971 + }, { + "field" : "name", + "owner" : "iy", + "name" : "o", + "access" : 17, + "descriptor" : "Ljava/lang/String;" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/lang/String;I)V" + } ] +}, { + "class" : "ItemContainer", + "name" : "bc", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "ids", + "owner" : "bc", + "name" : "f", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "quantities", + "owner" : "bc", + "name" : "q", + "access" : 0, + "descriptor" : "[I" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "StudioGame", + "name" : "is", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "gc" ], + "fields" : [ { + "field" : "id", + "owner" : "is", + "name" : "l", + "access" : 16, + "descriptor" : "I", + "decoder" : -1688917715 + }, { + "field" : "name", + "owner" : "is", + "name" : "g", + "access" : 17, + "descriptor" : "Ljava/lang/String;" + } ], + "methods" : [ { + "method" : "ordinal", + "owner" : "is", + "name" : "f", + "access" : 1, + "descriptor" : "(B)I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/lang/String;Ljava/lang/String;I)V" + } ] +}, { + "class" : "ByteArrayNode", + "name" : "gp", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "byteArray", + "owner" : "gp", + "name" : "m", + "access" : 1, + "descriptor" : "[B" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 1, + "descriptor" : "([B)V" + } ] +}, { + "class" : "NanoClock", + "name" : "fp", + "super" : "fa", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "lastTimeNano", + "owner" : "fp", + "name" : "m", + "access" : 0, + "descriptor" : "J", + "decoder" : 7586221391557635221 + } ], + "methods" : [ { + "method" : "mark", + "owner" : "fp", + "name" : "m", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "wait", + "owner" : "fp", + "name" : "f", + "access" : 1, + "parameters" : [ "cycleMs", "minSleepMs" ], + "descriptor" : "(III)I" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "RasterProvider", + "name" : "ai", + "super" : "lp", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "component0", + "owner" : "ai", + "name" : "m", + "access" : 0, + "descriptor" : "Ljava/awt/Component;" + }, { + "field" : "image", + "owner" : "ai", + "name" : "f", + "access" : 0, + "descriptor" : "Ljava/awt/Image;" + } ], + "methods" : [ { + "method" : "draw", + "owner" : "ai", + "name" : "q", + "access" : 17, + "parameters" : [ "x", "y", "width", "height" ], + "descriptor" : "(IIIIB)V" + }, { + "method" : "draw0", + "owner" : "ai", + "name" : "o", + "access" : 16, + "parameters" : [ "graphics", "x", "y", "width", "height" ], + "descriptor" : "(Ljava/awt/Graphics;IIIIB)V" + }, { + "method" : "drawFull", + "owner" : "ai", + "name" : "f", + "access" : 17, + "parameters" : [ "x", "y" ], + "descriptor" : "(III)V" + }, { + "method" : "drawFull0", + "owner" : "ai", + "name" : "w", + "access" : 16, + "parameters" : [ "graphics", "x", "y" ], + "descriptor" : "(Ljava/awt/Graphics;III)V" + }, { + "method" : "setComponent", + "owner" : "ai", + "name" : "m", + "access" : 16, + "descriptor" : "(Ljava/awt/Component;B)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(IILjava/awt/Component;)V" + } ] +}, { + "class" : "MouseWheel", + "name" : "fv", + "super" : "java.lang.Object", + "access" : 1537, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ { + "method" : "useRotation", + "owner" : "fv", + "name" : "q", + "access" : 1025, + "parameters" : [ ], + "descriptor" : "(I)I" + } ], + "constructors" : [ ] +}, { + "class" : "WorldMapArchiveLoader", + "name" : "ls", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "archive", + "owner" : "ls", + "name" : "u", + "access" : 0, + "descriptor" : "Lir;" + }, { + "field" : "cacheName", + "owner" : "ls", + "name" : "o", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "isLoaded0", + "owner" : "ls", + "name" : "l", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "percentLoaded0", + "owner" : "ls", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : 624113115 + } ], + "methods" : [ { + "method" : "isLoaded", + "owner" : "ls", + "name" : "q", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(S)Z" + }, { + "method" : "load", + "owner" : "ls", + "name" : "f", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "percentLoaded", + "owner" : "ls", + "name" : "w", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "reset", + "owner" : "ls", + "name" : "m", + "access" : 0, + "parameters" : [ "cacheName" ], + "descriptor" : "(Ljava/lang/String;I)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Lir;)V" + } ] +}, { + "class" : "ClientPacketMarker", + "name" : "gb", + "super" : "java.lang.Object", + "access" : 1537, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "AbstractSound", + "name" : "dd", + "super" : "gw", + "access" : 1057, + "interfaces" : [ ], + "fields" : [ { + "field" : "position", + "owner" : "dd", + "name" : "u", + "access" : 0, + "descriptor" : "I" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "NodeDeque", + "name" : "je", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "current", + "owner" : "je", + "name" : "f", + "access" : 0, + "descriptor" : "Lgw;" + }, { + "field" : "sentinel", + "owner" : "je", + "name" : "m", + "access" : 1, + "descriptor" : "Lgw;" + } ], + "methods" : [ { + "method" : "addFirst", + "owner" : "je", + "name" : "f", + "access" : 1, + "parameters" : [ "node" ], + "descriptor" : "(Lgw;)V" + }, { + "method" : "addLast", + "owner" : "je", + "name" : "q", + "access" : 1, + "parameters" : [ "node" ], + "descriptor" : "(Lgw;)V" + }, { + "method" : "clear", + "owner" : "je", + "name" : "m", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "first", + "owner" : "je", + "name" : "l", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Lgw;" + }, { + "method" : "last", + "owner" : "je", + "name" : "g", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Lgw;" + }, { + "method" : "next", + "owner" : "je", + "name" : "x", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Lgw;" + }, { + "method" : "previous", + "owner" : "je", + "name" : "e", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Lgw;" + }, { + "method" : "removeFirst", + "owner" : "je", + "name" : "u", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Lgw;" + }, { + "method" : "removeLast", + "owner" : "je", + "name" : "o", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Lgw;" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "UserList", + "name" : "km", + "super" : "java.lang.Object", + "access" : 1057, + "interfaces" : [ ], + "fields" : [ { + "field" : "array", + "owner" : "km", + "name" : "u", + "access" : 0, + "descriptor" : "[Ljs;" + }, { + "field" : "capacity", + "owner" : "km", + "name" : "w", + "access" : 16, + "descriptor" : "I", + "decoder" : -2119868987 + }, { + "field" : "comparator", + "owner" : "km", + "name" : "e", + "access" : 0, + "descriptor" : "Ljava/util/Comparator;" + }, { + "field" : "previousUsernamesMap", + "owner" : "km", + "name" : "l", + "access" : 0, + "descriptor" : "Ljava/util/HashMap;" + }, { + "field" : "size0", + "owner" : "km", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : -280101247 + }, { + "field" : "usernamesMap", + "owner" : "km", + "name" : "g", + "access" : 0, + "descriptor" : "Ljava/util/HashMap;" + } ], + "methods" : [ { + "method" : "addComparator", + "owner" : "km", + "name" : "al", + "access" : 17, + "parameters" : [ "c" ], + "descriptor" : "(Ljava/util/Comparator;B)V" + }, { + "method" : "addLast", + "owner" : "km", + "name" : "ag", + "access" : 0, + "parameters" : [ "username", "previousUsername" ], + "descriptor" : "(Lkp;Lkp;I)Ljs;" + }, { + "method" : "addLastNoPreviousUsername", + "owner" : "km", + "name" : "v", + "access" : 0, + "parameters" : [ "username" ], + "descriptor" : "(Lkp;I)Ljs;" + }, { + "method" : "arrayAddLast", + "owner" : "km", + "name" : "ay", + "access" : 16, + "parameters" : [ "user" ], + "descriptor" : "(Ljs;I)V" + }, { + "method" : "arrayRemove", + "owner" : "km", + "name" : "ak", + "access" : 16, + "parameters" : [ "index" ], + "descriptor" : "(II)V" + }, { + "method" : "changeName", + "owner" : "km", + "name" : "av", + "access" : 16, + "parameters" : [ "user", "username", "previousUsername" ], + "descriptor" : "(Ljs;Lkp;Lkp;B)V" + }, { + "method" : "clear", + "owner" : "km", + "name" : "z", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "contains", + "owner" : "km", + "name" : "t", + "access" : 1, + "parameters" : [ "username" ], + "descriptor" : "(Lkp;I)Z" + }, { + "method" : "get", + "owner" : "km", + "name" : "aq", + "access" : 17, + "parameters" : [ "index" ], + "descriptor" : "(II)Ljs;" + }, { + "method" : "getByCurrentUsername", + "owner" : "km", + "name" : "h", + "access" : 0, + "parameters" : [ "username" ], + "descriptor" : "(Lkp;I)Ljs;" + }, { + "method" : "getByPreviousUsername", + "owner" : "km", + "name" : "b", + "access" : 0, + "parameters" : [ "previousUsername" ], + "descriptor" : "(Lkp;I)Ljs;" + }, { + "method" : "getByUsername", + "owner" : "km", + "name" : "y", + "access" : 1, + "parameters" : [ "username" ], + "descriptor" : "(Lkp;I)Ljs;" + }, { + "method" : "indexOf", + "owner" : "km", + "name" : "ar", + "access" : 16, + "parameters" : [ "user" ], + "descriptor" : "(Ljs;I)I" + }, { + "method" : "isFull", + "owner" : "km", + "name" : "s", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "mapPut", + "owner" : "km", + "name" : "ah", + "access" : 16, + "parameters" : [ "user" ], + "descriptor" : "(Ljs;B)V" + }, { + "method" : "mapRemove", + "owner" : "km", + "name" : "ac", + "access" : 16, + "parameters" : [ "user" ], + "descriptor" : "(Ljs;S)V" + }, { + "method" : "newInstance", + "owner" : "km", + "name" : "m", + "access" : 1024, + "parameters" : [ ], + "descriptor" : "(I)Ljs;" + }, { + "method" : "newTypedArray", + "owner" : "km", + "name" : "f", + "access" : 1024, + "parameters" : [ "size" ], + "descriptor" : "(II)[Ljs;" + }, { + "method" : "remove", + "owner" : "km", + "name" : "p", + "access" : 16, + "parameters" : [ "user" ], + "descriptor" : "(Ljs;I)V" + }, { + "method" : "removeByUsername", + "owner" : "km", + "name" : "c", + "access" : 17, + "parameters" : [ "username" ], + "descriptor" : "(Lkp;S)Z" + }, { + "method" : "removeComparator", + "owner" : "km", + "name" : "aw", + "access" : 17, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "size", + "owner" : "km", + "name" : "j", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "sort", + "owner" : "km", + "name" : "aj", + "access" : 17, + "parameters" : [ ], + "descriptor" : "(I)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(I)V" + } ] +}, { + "class" : "Skeleton", + "name" : "ek", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "count", + "owner" : "ek", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 1875841677 + }, { + "field" : "id", + "owner" : "ek", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : -1634889691 + }, { + "field" : "labels", + "owner" : "ek", + "name" : "w", + "access" : 0, + "descriptor" : "[[I" + }, { + "field" : "transformTypes", + "owner" : "ek", + "name" : "q", + "access" : 0, + "descriptor" : "[I" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(I[B)V" + } ] +}, { + "class" : "IntegerNode", + "name" : "gn", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "integer", + "owner" : "gn", + "name" : "m", + "access" : 1, + "descriptor" : "I" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(I)V" + } ] +}, { + "class" : "ObjectNode", + "name" : "fk", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "obj", + "owner" : "fk", + "name" : "m", + "access" : 17, + "descriptor" : "Ljava/lang/Object;" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Ljava/lang/Object;)V" + } ] +}, { + "class" : "DualNode", + "name" : "fn", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "keyDual", + "owner" : "fn", + "name" : "cg", + "access" : 1, + "descriptor" : "J" + }, { + "field" : "nextDual", + "owner" : "fn", + "name" : "cp", + "access" : 1, + "descriptor" : "Lfn;" + }, { + "field" : "previousDual", + "owner" : "fn", + "name" : "cf", + "access" : 1, + "descriptor" : "Lfn;" + } ], + "methods" : [ { + "method" : "removeDual", + "owner" : "fn", + "name" : "cg", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "InterfaceParent", + "name" : "bx", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "itf", + "owner" : "bx", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : -707461797 + }, { + "field" : "keep", + "owner" : "bx", + "name" : "q", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "type", + "owner" : "bx", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 1712037041 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "ParamDefinition", + "name" : "jb", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "autodisable", + "owner" : "jb", + "name" : "u", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "defaultint", + "owner" : "jb", + "name" : "w", + "access" : 1, + "descriptor" : "I", + "decoder" : 1133042753 + }, { + "field" : "defaultstr", + "owner" : "jb", + "name" : "o", + "access" : 1, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "type", + "owner" : "jb", + "name" : "q", + "access" : 0, + "descriptor" : "C" + } ], + "methods" : [ { + "method" : "decode", + "owner" : "jb", + "name" : "q", + "access" : 0, + "descriptor" : "(Lgr;I)V" + }, { + "method" : "decode0", + "owner" : "jb", + "name" : "w", + "access" : 0, + "descriptor" : "(Lgr;II)V" + }, { + "method" : "isString", + "owner" : "jb", + "name" : "o", + "access" : 1, + "descriptor" : "(I)Z" + }, { + "method" : "postDecode", + "owner" : "jb", + "name" : "f", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Animation", + "name" : "dz", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "hasAlphaTransform", + "owner" : "dz", + "name" : "d", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "skeleton", + "owner" : "dz", + "name" : "o", + "access" : 0, + "descriptor" : "Lek;" + }, { + "field" : "transformCount", + "owner" : "dz", + "name" : "u", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "transformSkeletonLabels", + "owner" : "dz", + "name" : "g", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "transformXs", + "owner" : "dz", + "name" : "l", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "transformYs", + "owner" : "dz", + "name" : "e", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "transformZs", + "owner" : "dz", + "name" : "x", + "access" : 0, + "descriptor" : "[I" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "([BLek;)V" + } ] +}, { + "class" : "PcmPlayerProvider", + "name" : "cz", + "super" : "java.lang.Object", + "access" : 1537, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ { + "method" : "player", + "owner" : "cz", + "name" : "m", + "access" : 1025, + "descriptor" : "(B)Lco;" + } ], + "constructors" : [ ] +}, { + "class" : "Enumerated", + "name" : "gc", + "super" : "java.lang.Object", + "access" : 1537, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ { + "method" : "ordinal", + "owner" : "gc", + "name" : "f", + "access" : 1025, + "parameters" : [ ], + "descriptor" : "(B)I" + } ], + "constructors" : [ ] +}, { + "class" : "NetFileRequest", + "name" : "iz", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "archive", + "owner" : "iz", + "name" : "m", + "access" : 1, + "descriptor" : "Lit;" + }, { + "field" : "crc", + "owner" : "iz", + "name" : "f", + "access" : 1, + "descriptor" : "I", + "decoder" : 1487103265 + }, { + "field" : "padding", + "owner" : "iz", + "name" : "q", + "access" : 1, + "descriptor" : "B" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Buddy", + "name" : "ke", + "super" : "js", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "int2", + "owner" : "ke", + "name" : "u", + "access" : 1, + "descriptor" : "I", + "decoder" : 120689297 + }, { + "field" : "rank", + "owner" : "ke", + "name" : "g", + "access" : 1, + "descriptor" : "I", + "decoder" : -304954565 + }, { + "field" : "world0", + "owner" : "ke", + "name" : "o", + "access" : 1, + "descriptor" : "I", + "decoder" : 429472919 + } ], + "methods" : [ { + "method" : "hasWorld", + "owner" : "ke", + "name" : "au", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "set", + "owner" : "ke", + "name" : "an", + "access" : 0, + "descriptor" : "(IIS)V" + }, { + "method" : "world", + "owner" : "ke", + "name" : "az", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "HealthBarUpdate", + "name" : "bg", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "cycle", + "owner" : "bg", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : 2103089795 + }, { + "field" : "cycleOffset", + "owner" : "bg", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : -1876302639 + }, { + "field" : "health", + "owner" : "bg", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 1821995313 + }, { + "field" : "health2", + "owner" : "bg", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -820353645 + } ], + "methods" : [ { + "method" : "set", + "owner" : "bg", + "name" : "m", + "access" : 0, + "descriptor" : "(IIIII)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(IIII)V" + } ] +}, { + "class" : "HealthBar", + "name" : "cr", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "definition", + "owner" : "cr", + "name" : "q", + "access" : 0, + "descriptor" : "Lii;" + }, { + "field" : "updates", + "owner" : "cr", + "name" : "w", + "access" : 0, + "descriptor" : "Lja;" + } ], + "methods" : [ { + "method" : "get", + "owner" : "cr", + "name" : "f", + "access" : 0, + "parameters" : [ "cycle" ], + "descriptor" : "(II)Lbg;" + }, { + "method" : "isEmpty", + "owner" : "cr", + "name" : "q", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "put", + "owner" : "cr", + "name" : "m", + "access" : 0, + "descriptor" : "(IIIIB)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Lii;)V" + } ] +}, { + "class" : "IntHashTable", + "name" : "lv", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "array", + "owner" : "lv", + "name" : "m", + "access" : 0, + "descriptor" : "[I" + } ], + "methods" : [ { + "method" : "get", + "owner" : "lv", + "name" : "m", + "access" : 1, + "descriptor" : "(II)I" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "([I)V" + } ] +}, { + "class" : "FloorUnderlayDefinition", + "name" : "ih", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "hue", + "owner" : "ih", + "name" : "w", + "access" : 1, + "descriptor" : "I", + "decoder" : -1465372343 + }, { + "field" : "hueMultiplier", + "owner" : "ih", + "name" : "g", + "access" : 1, + "descriptor" : "I", + "decoder" : 1484542081 + }, { + "field" : "lightness", + "owner" : "ih", + "name" : "u", + "access" : 1, + "descriptor" : "I", + "decoder" : -1691813081 + }, { + "field" : "rgb", + "owner" : "ih", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -635678213 + }, { + "field" : "saturation", + "owner" : "ih", + "name" : "o", + "access" : 1, + "descriptor" : "I", + "decoder" : 2031118785 + } ], + "methods" : [ { + "method" : "decode", + "owner" : "ih", + "name" : "w", + "access" : 0, + "descriptor" : "(Lgr;II)V" + }, { + "method" : "decode0", + "owner" : "ih", + "name" : "o", + "access" : 0, + "descriptor" : "(Lgr;III)V" + }, { + "method" : "postDecode", + "owner" : "ih", + "name" : "q", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "setHsl", + "owner" : "ih", + "name" : "u", + "access" : 0, + "parameters" : [ "rgb" ], + "descriptor" : "(IB)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Wrapper", + "name" : "eu", + "super" : "fn", + "access" : 1057, + "interfaces" : [ ], + "fields" : [ { + "field" : "size", + "owner" : "eu", + "name" : "f", + "access" : 16, + "descriptor" : "I" + } ], + "methods" : [ { + "method" : "get", + "owner" : "eu", + "name" : "m", + "access" : 1024, + "parameters" : [ ], + "descriptor" : "()Ljava/lang/Object;" + }, { + "method" : "isSoft", + "owner" : "eu", + "name" : "f", + "access" : 1024, + "parameters" : [ ], + "descriptor" : "()Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(I)V" + } ] +}, { + "class" : "DualNodeDeque", + "name" : "jp", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "sentinel", + "owner" : "jp", + "name" : "m", + "access" : 0, + "descriptor" : "Lfn;" + } ], + "methods" : [ { + "method" : "addFirst", + "owner" : "jp", + "name" : "m", + "access" : 1, + "descriptor" : "(Lfn;)V" + }, { + "method" : "addLast", + "owner" : "jp", + "name" : "f", + "access" : 1, + "descriptor" : "(Lfn;)V" + }, { + "method" : "clear", + "owner" : "jp", + "name" : "u", + "access" : 1, + "descriptor" : "()V" + }, { + "method" : "last", + "owner" : "jp", + "name" : "o", + "access" : 1, + "descriptor" : "()Lfn;" + }, { + "method" : "removeLast", + "owner" : "jp", + "name" : "w", + "access" : 1, + "descriptor" : "()Lfn;" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "NodeHashTable", + "name" : "ld", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "buckets", + "owner" : "ld", + "name" : "f", + "access" : 0, + "descriptor" : "[Lgw;" + }, { + "field" : "current", + "owner" : "ld", + "name" : "w", + "access" : 0, + "descriptor" : "Lgw;" + }, { + "field" : "currentGet", + "owner" : "ld", + "name" : "q", + "access" : 0, + "descriptor" : "Lgw;" + }, { + "field" : "index", + "owner" : "ld", + "name" : "o", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "size", + "owner" : "ld", + "name" : "m", + "access" : 0, + "descriptor" : "I" + } ], + "methods" : [ { + "method" : "clear", + "owner" : "ld", + "name" : "q", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "first", + "owner" : "ld", + "name" : "w", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Lgw;" + }, { + "method" : "get", + "owner" : "ld", + "name" : "m", + "access" : 1, + "parameters" : [ "key" ], + "descriptor" : "(J)Lgw;" + }, { + "method" : "next", + "owner" : "ld", + "name" : "o", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Lgw;" + }, { + "method" : "put", + "owner" : "ld", + "name" : "f", + "access" : 1, + "parameters" : [ "node", "key" ], + "descriptor" : "(Lgw;J)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(I)V" + } ] +}, { + "class" : "ReflectionCheck", + "name" : "lw", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "arguments", + "owner" : "lw", + "name" : "m", + "access" : 0, + "descriptor" : "[[[B" + }, { + "field" : "creationErrors", + "owner" : "lw", + "name" : "u", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "fields", + "owner" : "lw", + "name" : "g", + "access" : 0, + "descriptor" : "[Ljava/lang/reflect/Field;" + }, { + "field" : "id", + "owner" : "lw", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -1955146989 + }, { + "field" : "intReplaceValues", + "owner" : "lw", + "name" : "f", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "methods", + "owner" : "lw", + "name" : "l", + "access" : 0, + "descriptor" : "[Ljava/lang/reflect/Method;" + }, { + "field" : "operations", + "owner" : "lw", + "name" : "o", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "size", + "owner" : "lw", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : -1091722075 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "AbstractSocket", + "name" : "fu", + "super" : "java.lang.Object", + "access" : 1057, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ { + "method" : "available", + "owner" : "fu", + "name" : "q", + "access" : 1025, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "close", + "owner" : "fu", + "name" : "g", + "access" : 1025, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "isAvailable", + "owner" : "fu", + "name" : "f", + "access" : 1025, + "parameters" : [ "length" ], + "descriptor" : "(II)Z" + }, { + "method" : "read", + "owner" : "fu", + "name" : "o", + "access" : 1025, + "parameters" : [ "dst", "dstIndex", "length" ], + "descriptor" : "([BIII)I" + }, { + "method" : "readUnsignedByte", + "owner" : "fu", + "name" : "w", + "access" : 1025, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "write", + "owner" : "fu", + "name" : "u", + "access" : 1025, + "parameters" : [ "src", "srcIndex", "length" ], + "descriptor" : "([BIIB)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "VarbitDefinition", + "name" : "ia", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "baseVar", + "owner" : "ia", + "name" : "q", + "access" : 1, + "descriptor" : "I", + "decoder" : 1552575189 + }, { + "field" : "endBit", + "owner" : "ia", + "name" : "o", + "access" : 1, + "descriptor" : "I", + "decoder" : -1710935305 + }, { + "field" : "startBit", + "owner" : "ia", + "name" : "w", + "access" : 1, + "descriptor" : "I", + "decoder" : -870948181 + } ], + "methods" : [ { + "method" : "decode", + "owner" : "ia", + "name" : "q", + "access" : 0, + "descriptor" : "(Lgr;I)V" + }, { + "method" : "decode0", + "owner" : "ia", + "name" : "w", + "access" : 0, + "descriptor" : "(Lgr;IB)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "InvDefinition", + "name" : "ib", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "size", + "owner" : "ib", + "name" : "q", + "access" : 1, + "descriptor" : "I", + "decoder" : 1358868971 + } ], + "methods" : [ { + "method" : "decode", + "owner" : "ib", + "name" : "f", + "access" : 0, + "descriptor" : "(Lgr;I)V" + }, { + "method" : "decode0", + "owner" : "ib", + "name" : "q", + "access" : 0, + "descriptor" : "(Lgr;II)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "LoginPacket", + "name" : "gl", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "gb" ], + "fields" : [ { + "field" : "id", + "owner" : "gl", + "name" : "u", + "access" : 17, + "descriptor" : "I", + "decoder" : 1743806243 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(II)V" + } ] +}, { + "class" : "WorldMapEvent", + "name" : "ap", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "coord1", + "owner" : "ap", + "name" : "f", + "access" : 1, + "descriptor" : "Lhu;" + }, { + "field" : "coord2", + "owner" : "ap", + "name" : "q", + "access" : 1, + "descriptor" : "Lhu;" + }, { + "field" : "mapElement", + "owner" : "ap", + "name" : "m", + "access" : 1, + "descriptor" : "I", + "decoder" : 264384233 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(ILhu;Lhu;)V" + } ] +}, { + "class" : "WorldMapSection", + "name" : "ab", + "super" : "java.lang.Object", + "access" : 1537, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ { + "method" : "containsCoord", + "owner" : "ab", + "name" : "f", + "access" : 1025, + "parameters" : [ "plane", "x", "y" ], + "descriptor" : "(IIIB)Z" + }, { + "method" : "containsPosition", + "owner" : "ab", + "name" : "q", + "access" : 1025, + "parameters" : [ "x", "y" ], + "descriptor" : "(IIB)Z" + }, { + "method" : "coord", + "owner" : "ab", + "name" : "o", + "access" : 1025, + "parameters" : [ "x", "y" ], + "descriptor" : "(III)Lhu;" + }, { + "method" : "expandBounds", + "owner" : "ab", + "name" : "m", + "access" : 1025, + "parameters" : [ "area" ], + "descriptor" : "(Lag;I)V" + }, { + "method" : "position", + "owner" : "ab", + "name" : "w", + "access" : 1025, + "parameters" : [ "plane", "x", "y" ], + "descriptor" : "(IIII)[I" + }, { + "method" : "read", + "owner" : "ab", + "name" : "u", + "access" : 1025, + "parameters" : [ "buffer" ], + "descriptor" : "(Lgr;B)V" + } ], + "constructors" : [ ] +}, { + "class" : "Frames", + "name" : "en", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "frames", + "owner" : "en", + "name" : "m", + "access" : 0, + "descriptor" : "[Ldz;" + } ], + "methods" : [ { + "method" : "hasAlphaTransform", + "owner" : "en", + "name" : "m", + "access" : 1, + "parameters" : [ "frame" ], + "descriptor" : "(II)Z" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Lir;Lir;IZ)V" + } ] +}, { + "class" : "Skills", + "name" : "hc", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "SoftWrapper", + "name" : "ef", + "super" : "eu", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "ref", + "owner" : "ef", + "name" : "m", + "access" : 0, + "descriptor" : "Ljava/lang/ref/SoftReference;" + } ], + "methods" : [ { + "method" : "get", + "owner" : "ef", + "name" : "m", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()Ljava/lang/Object;" + }, { + "method" : "isSoft", + "owner" : "ef", + "name" : "f", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/lang/Object;I)V" + } ] +}, { + "class" : "DirectWrapper", + "name" : "ew", + "super" : "eu", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "obj", + "owner" : "ew", + "name" : "m", + "access" : 0, + "descriptor" : "Ljava/lang/Object;" + } ], + "methods" : [ { + "method" : "get", + "owner" : "ew", + "name" : "m", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()Ljava/lang/Object;" + }, { + "method" : "isSoft", + "owner" : "ew", + "name" : "f", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/lang/Object;I)V" + } ] +}, { + "class" : "SoundCache", + "name" : "dt", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "musicSampleIndex", + "owner" : "dt", + "name" : "f", + "access" : 0, + "descriptor" : "Lir;" + }, { + "field" : "musicSamples", + "owner" : "dt", + "name" : "q", + "access" : 0, + "descriptor" : "Lld;" + }, { + "field" : "rawSounds", + "owner" : "dt", + "name" : "w", + "access" : 0, + "descriptor" : "Lld;" + }, { + "field" : "soundEffectIndex", + "owner" : "dt", + "name" : "m", + "access" : 0, + "descriptor" : "Lir;" + } ], + "methods" : [ { + "method" : "getMusicSample", + "owner" : "dt", + "name" : "w", + "access" : 1, + "descriptor" : "(I[II)Lcx;" + }, { + "method" : "getMusicSample0", + "owner" : "dt", + "name" : "f", + "access" : 0, + "descriptor" : "(II[II)Lcx;" + }, { + "method" : "getSoundEffect", + "owner" : "dt", + "name" : "q", + "access" : 1, + "descriptor" : "(I[IB)Lcx;" + }, { + "method" : "getSoundEffect0", + "owner" : "dt", + "name" : "m", + "access" : 0, + "descriptor" : "(II[IS)Lcx;" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Lir;Lir;)V" + } ] +}, { + "class" : "SpriteMask", + "name" : "hp", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "height", + "owner" : "hp", + "name" : "f", + "access" : 17, + "descriptor" : "I", + "decoder" : -193097093 + }, { + "field" : "width", + "owner" : "hp", + "name" : "m", + "access" : 17, + "descriptor" : "I", + "decoder" : 574541221 + }, { + "field" : "xStarts", + "owner" : "hp", + "name" : "w", + "access" : 17, + "descriptor" : "[I" + }, { + "field" : "xWidths", + "owner" : "hp", + "name" : "q", + "access" : 17, + "descriptor" : "[I" + } ], + "methods" : [ { + "method" : "contains", + "owner" : "hp", + "name" : "m", + "access" : 1, + "parameters" : [ "x", "y" ], + "descriptor" : "(III)Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(II[I[II)V" + } ] +}, { + "class" : "StructDefinition", + "name" : "jq", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "params", + "owner" : "jq", + "name" : "q", + "access" : 0, + "descriptor" : "Llh;" + } ], + "methods" : [ { + "method" : "decode", + "owner" : "jq", + "name" : "q", + "access" : 0, + "descriptor" : "(Lgr;I)V" + }, { + "method" : "decode0", + "owner" : "jq", + "name" : "w", + "access" : 0, + "descriptor" : "(Lgr;II)V" + }, { + "method" : "getIntParam", + "owner" : "jq", + "name" : "o", + "access" : 1, + "descriptor" : "(IIB)I" + }, { + "method" : "getStringParam", + "owner" : "jq", + "name" : "u", + "access" : 1, + "descriptor" : "(ILjava/lang/String;I)Ljava/lang/String;" + }, { + "method" : "postDecode", + "owner" : "jq", + "name" : "f", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Rasterizer2D", + "name" : "lf", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ { + "access" : 4, + "descriptor" : "()V" + } ] +}, { + "class" : "Bzip2Decompressor", + "name" : "gk", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "Interpreter", + "name" : "bv", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "IgnoreList", + "name" : "kj", + "super" : "km", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "loginType", + "owner" : "kj", + "name" : "q", + "access" : 16, + "descriptor" : "Llx;" + } ], + "methods" : [ { + "method" : "newInstance", + "owner" : "kj", + "name" : "m", + "access" : 0, + "descriptor" : "(I)Ljs;" + }, { + "method" : "newTypedArray", + "owner" : "kj", + "name" : "f", + "access" : 0, + "descriptor" : "(II)[Ljs;" + }, { + "method" : "read", + "owner" : "kj", + "name" : "q", + "access" : 1, + "parameters" : [ "buffer", "n" ], + "descriptor" : "(Lgr;IB)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Llx;)V" + } ] +}, { + "class" : "Message", + "name" : "bm", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "count", + "owner" : "bm", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : 1597147817 + }, { + "field" : "cycle", + "owner" : "bm", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 1164592791 + }, { + "field" : "isFromFriend0", + "owner" : "bm", + "name" : "u", + "access" : 0, + "descriptor" : "Lkd;" + }, { + "field" : "isFromIgnored0", + "owner" : "bm", + "name" : "g", + "access" : 0, + "descriptor" : "Lkd;" + }, { + "field" : "prefix", + "owner" : "bm", + "name" : "l", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "sender", + "owner" : "bm", + "name" : "w", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "senderUsername", + "owner" : "bm", + "name" : "o", + "access" : 0, + "descriptor" : "Lkp;" + }, { + "field" : "text", + "owner" : "bm", + "name" : "e", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "type", + "owner" : "bm", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 1223792995 + } ], + "methods" : [ { + "method" : "clearIsFromFriend", + "owner" : "bm", + "name" : "f", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "clearIsFromIgnored", + "owner" : "bm", + "name" : "o", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "fillIsFromFriend", + "owner" : "bm", + "name" : "w", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "fillIsFromIgnored", + "owner" : "bm", + "name" : "g", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(S)V" + }, { + "method" : "fillSenderUsername", + "owner" : "bm", + "name" : "l", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "isFromFriend", + "owner" : "bm", + "name" : "q", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "isFromIgnored", + "owner" : "bm", + "name" : "u", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(B)Z" + }, { + "method" : "set", + "owner" : "bm", + "name" : "m", + "access" : 0, + "parameters" : [ "type", "sender", "prefix", "text" ], + "descriptor" : "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V" + } ] +}, { + "class" : "Entity", + "name" : "ex", + "super" : "fn", + "access" : 1057, + "interfaces" : [ ], + "fields" : [ { + "field" : "height", + "owner" : "ex", + "name" : "cw", + "access" : 1, + "descriptor" : "I", + "decoder" : 849583845 + } ], + "methods" : [ { + "method" : "draw", + "owner" : "ex", + "name" : "cy", + "access" : 0, + "parameters" : [ "yaw", "cameraPitchSine", "cameraPitchCosine", "cameraYawSine", "cameraYawCosine", "x", "y", "z", "tag" ], + "descriptor" : "(IIIIIIIIJ)V" + }, { + "method" : "getModel", + "owner" : "ex", + "name" : "e", + "access" : 4, + "parameters" : [ ], + "descriptor" : "(I)Ldu;" + } ], + "constructors" : [ { + "access" : 4, + "descriptor" : "()V" + } ] +}, { + "class" : "NetCache", + "name" : "iq", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "EnumDefinition", + "name" : "jw", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "defaultint", + "owner" : "jw", + "name" : "u", + "access" : 1, + "descriptor" : "I", + "decoder" : 1948115527 + }, { + "field" : "defaultstr", + "owner" : "jw", + "name" : "o", + "access" : 1, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "inputtype", + "owner" : "jw", + "name" : "q", + "access" : 1, + "descriptor" : "C" + }, { + "field" : "intvals", + "owner" : "jw", + "name" : "e", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "keys", + "owner" : "jw", + "name" : "l", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "outputcount", + "owner" : "jw", + "name" : "g", + "access" : 1, + "descriptor" : "I", + "decoder" : -12324053 + }, { + "field" : "outputtype", + "owner" : "jw", + "name" : "w", + "access" : 1, + "descriptor" : "C" + }, { + "field" : "strvals", + "owner" : "jw", + "name" : "x", + "access" : 1, + "descriptor" : "[Ljava/lang/String;" + } ], + "methods" : [ { + "method" : "decode", + "owner" : "jw", + "name" : "f", + "access" : 0, + "descriptor" : "(Lgr;I)V" + }, { + "method" : "decode0", + "owner" : "jw", + "name" : "q", + "access" : 0, + "descriptor" : "(Lgr;II)V" + }, { + "method" : "size", + "owner" : "jw", + "name" : "w", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Login", + "name" : "cu", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "AttackOption", + "name" : "cj", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "gc" ], + "fields" : [ { + "field" : "id", + "owner" : "cj", + "name" : "o", + "access" : 16, + "descriptor" : "I", + "decoder" : -1461217963 + } ], + "methods" : [ { + "method" : "ordinal", + "owner" : "cj", + "name" : "f", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(I)V" + } ] +}, { + "class" : "Messages", + "name" : "cw", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "Rasterizer3D", + "name" : "et", + "super" : "lf", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "AbstractFont", + "name" : "kt", + "super" : "lf", + "access" : 1057, + "interfaces" : [ ], + "fields" : [ { + "field" : "advances", + "owner" : "kt", + "name" : "f", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "ascent", + "owner" : "kt", + "name" : "g", + "access" : 1, + "descriptor" : "I" + }, { + "field" : "heights", + "owner" : "kt", + "name" : "w", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "kerning", + "owner" : "kt", + "name" : "d", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "leftBearings", + "owner" : "kt", + "name" : "o", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "maxAscent", + "owner" : "kt", + "name" : "l", + "access" : 1, + "descriptor" : "I" + }, { + "field" : "maxDescent", + "owner" : "kt", + "name" : "e", + "access" : 1, + "descriptor" : "I" + }, { + "field" : "pixels", + "owner" : "kt", + "name" : "m", + "access" : 0, + "descriptor" : "[[B" + }, { + "field" : "topBearings", + "owner" : "kt", + "name" : "u", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "widths", + "owner" : "kt", + "name" : "q", + "access" : 0, + "descriptor" : "[I" + } ], + "methods" : [ { + "method" : "breakLines", + "owner" : "kt", + "name" : "a", + "access" : 1, + "parameters" : [ "s", "lineWidths", "linesDst" ], + "descriptor" : "(Ljava/lang/String;[I[Ljava/lang/String;)I" + }, { + "method" : "calculateLineJustification", + "owner" : "kt", + "name" : "ar", + "access" : 0, + "parameters" : [ "s", "lineWidth" ], + "descriptor" : "(Ljava/lang/String;I)V" + }, { + "method" : "charWidth", + "owner" : "kt", + "name" : "x", + "access" : 0, + "parameters" : [ "c" ], + "descriptor" : "(C)I" + }, { + "method" : "decodeTag", + "owner" : "kt", + "name" : "av", + "access" : 0, + "parameters" : [ "s" ], + "descriptor" : "(Ljava/lang/String;)V" + }, { + "method" : "draw", + "owner" : "kt", + "name" : "t", + "access" : 1, + "parameters" : [ "s", "x", "y", "color", "shadow" ], + "descriptor" : "(Ljava/lang/String;IIII)V" + }, { + "method" : "draw0", + "owner" : "kt", + "name" : "ac", + "access" : 0, + "parameters" : [ "s", "x", "y" ], + "descriptor" : "(Ljava/lang/String;II)V" + }, { + "method" : "drawAlpha", + "owner" : "kt", + "name" : "y", + "access" : 1, + "parameters" : [ "s", "x", "y", "color", "shadow", "alpha" ], + "descriptor" : "(Ljava/lang/String;IIIII)V" + }, { + "method" : "drawCentered", + "owner" : "kt", + "name" : "b", + "access" : 1, + "parameters" : [ "s", "x", "y", "color", "shadow" ], + "descriptor" : "(Ljava/lang/String;IIII)V" + }, { + "method" : "drawCenteredShake", + "owner" : "kt", + "name" : "ag", + "access" : 1, + "parameters" : [ "s", "x", "y", "color", "shadow", "seed", "seed2" ], + "descriptor" : "(Ljava/lang/String;IIIIII)V" + }, { + "method" : "drawCenteredWave", + "owner" : "kt", + "name" : "p", + "access" : 1, + "parameters" : [ "s", "x", "y", "color", "shadow", "seed" ], + "descriptor" : "(Ljava/lang/String;IIIII)V" + }, { + "method" : "drawCenteredWave2", + "owner" : "kt", + "name" : "v", + "access" : 1, + "parameters" : [ "s", "x", "y", "color", "shadow", "seed" ], + "descriptor" : "(Ljava/lang/String;IIIII)V" + }, { + "method" : "drawGlyph", + "owner" : "kt", + "name" : "m", + "access" : 1024, + "parameters" : [ "pixels", "x", "y", "width", "height", "color" ], + "descriptor" : "([BIIIII)V" + }, { + "method" : "drawGlyphAlpha", + "owner" : "kt", + "name" : "f", + "access" : 1024, + "parameters" : [ "pixels", "x", "y", "width", "height", "color", "alpha" ], + "descriptor" : "([BIIIIII)V" + }, { + "method" : "drawLines", + "owner" : "kt", + "name" : "c", + "access" : 1, + "parameters" : [ "s", "x", "y", "width", "height", "color", "shadow", "xAlignment", "yAlignment", "lineHeight" ], + "descriptor" : "(Ljava/lang/String;IIIIIIIII)I" + }, { + "method" : "drawRandomAlphaAndSpacing", + "owner" : "kt", + "name" : "aq", + "access" : 1, + "parameters" : [ "s", "x", "y", "color", "shadow", "seed" ], + "descriptor" : "(Ljava/lang/String;IIIII)V" + }, { + "method" : "drawRightAligned", + "owner" : "kt", + "name" : "h", + "access" : 1, + "parameters" : [ "s", "x", "y", "color", "shadow" ], + "descriptor" : "(Ljava/lang/String;IIII)V" + }, { + "method" : "drawWithOffsets0", + "owner" : "kt", + "name" : "ay", + "access" : 0, + "parameters" : [ "s", "x", "y", "xs", "ys" ], + "descriptor" : "(Ljava/lang/String;II[I[I)V" + }, { + "method" : "lineCount", + "owner" : "kt", + "name" : "j", + "access" : 1, + "parameters" : [ "s", "lineWidth" ], + "descriptor" : "(Ljava/lang/String;I)I" + }, { + "method" : "lineWidth", + "owner" : "kt", + "name" : "z", + "access" : 1, + "parameters" : [ "s", "lineWidth" ], + "descriptor" : "(Ljava/lang/String;I)I" + }, { + "method" : "readMetrics", + "owner" : "kt", + "name" : "l", + "access" : 0, + "parameters" : [ "bytes" ], + "descriptor" : "([B)V" + }, { + "method" : "reset", + "owner" : "kt", + "name" : "aj", + "access" : 0, + "parameters" : [ "color", "shadow" ], + "descriptor" : "(II)V" + }, { + "method" : "stringWidth", + "owner" : "kt", + "name" : "d", + "access" : 1, + "parameters" : [ "s" ], + "descriptor" : "(Ljava/lang/String;)I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "([B[I[I[I[I[I[[B)V" + }, { + "access" : 0, + "descriptor" : "([B)V" + } ] +}, { + "class" : "DevicePcmPlayerProvider", + "name" : "az", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "cz" ], + "fields" : [ ], + "methods" : [ { + "method" : "player", + "owner" : "az", + "name" : "m", + "access" : 1, + "descriptor" : "(B)Lco;" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "ArchiveDisk", + "name" : "ff", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "archive", + "owner" : "ff", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : -1982523283 + }, { + "field" : "datFile", + "owner" : "ff", + "name" : "f", + "access" : 0, + "descriptor" : "Ldy;" + }, { + "field" : "idxFile", + "owner" : "ff", + "name" : "q", + "access" : 0, + "descriptor" : "Ldy;" + }, { + "field" : "maxEntrySize", + "owner" : "ff", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : -748616567 + } ], + "methods" : [ { + "method" : "read", + "owner" : "ff", + "name" : "m", + "access" : 1, + "parameters" : [ "entry" ], + "descriptor" : "(II)[B" + }, { + "method" : "write", + "owner" : "ff", + "name" : "f", + "access" : 1, + "descriptor" : "(I[BII)Z" + }, { + "method" : "write0", + "owner" : "ff", + "name" : "q", + "access" : 0, + "descriptor" : "(I[BIZI)Z" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(ILdy;Ldy;I)V" + } ] +}, { + "class" : "GroundItem", + "name" : "ck", + "super" : "ex", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "id", + "owner" : "ck", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : 893970699 + }, { + "field" : "quantity", + "owner" : "ck", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 454094667 + } ], + "methods" : [ { + "method" : "getModel", + "owner" : "ck", + "name" : "e", + "access" : 20, + "parameters" : [ ], + "descriptor" : "(I)Ldu;" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "VarpDefinition", + "name" : "ix", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "type", + "owner" : "ix", + "name" : "w", + "access" : 1, + "descriptor" : "I", + "decoder" : -1792568421 + } ], + "methods" : [ { + "method" : "decode", + "owner" : "ix", + "name" : "f", + "access" : 0, + "descriptor" : "(Lgr;B)V" + }, { + "method" : "decode0", + "owner" : "ix", + "name" : "q", + "access" : 0, + "descriptor" : "(Lgr;II)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Font", + "name" : "kk", + "super" : "kt", + "access" : 49, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ { + "method" : "drawGlyph", + "owner" : "kk", + "name" : "m", + "access" : 16, + "descriptor" : "([BIIIII)V" + }, { + "method" : "drawGlyphAlpha", + "owner" : "kk", + "name" : "f", + "access" : 16, + "descriptor" : "([BIIIIII)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "([B[I[I[I[I[I[[B)V" + }, { + "access" : 1, + "descriptor" : "([B)V" + } ] +}, { + "class" : "ChatChannel", + "name" : "cp", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "count", + "owner" : "cp", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 612486877 + }, { + "field" : "messages", + "owner" : "cp", + "name" : "f", + "access" : 0, + "descriptor" : "[Lbm;" + } ], + "methods" : [ { + "method" : "addMessage", + "owner" : "cp", + "name" : "m", + "access" : 0, + "parameters" : [ "type", "sender", "text", "prefix" ], + "descriptor" : "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbm;" + }, { + "method" : "getMessage", + "owner" : "cp", + "name" : "f", + "access" : 0, + "parameters" : [ "index" ], + "descriptor" : "(II)Lbm;" + }, { + "method" : "size", + "owner" : "cp", + "name" : "q", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "PlatformInfoProvider", + "name" : "lm", + "super" : "java.lang.Object", + "access" : 1537, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ { + "method" : "get", + "owner" : "lm", + "name" : "m", + "access" : 1025, + "parameters" : [ ], + "descriptor" : "(I)Llb;" + } ], + "constructors" : [ ] +}, { + "class" : "DynamicObject", + "name" : "cf", + "super" : "ex", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "cycleStart", + "owner" : "cf", + "name" : "e", + "access" : 0, + "descriptor" : "I", + "decoder" : -1596313489 + }, { + "field" : "frame", + "owner" : "cf", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : -2017547185 + }, { + "field" : "id", + "owner" : "cf", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : 1369707199 + }, { + "field" : "orientation", + "owner" : "cf", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 141031459 + }, { + "field" : "plane", + "owner" : "cf", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : 844945979 + }, { + "field" : "sequenceDefinition", + "owner" : "cf", + "name" : "g", + "access" : 0, + "descriptor" : "Ljh;" + }, { + "field" : "type", + "owner" : "cf", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 1713856147 + }, { + "field" : "x", + "owner" : "cf", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : -351084819 + }, { + "field" : "y", + "owner" : "cf", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : -126308963 + } ], + "methods" : [ { + "method" : "getModel", + "owner" : "cf", + "name" : "e", + "access" : 20, + "parameters" : [ ], + "descriptor" : "(I)Ldu;" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(IIIIIIIZLex;)V" + } ] +}, { + "class" : "ClanMate", + "name" : "jk", + "super" : "ke", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "isFriend0", + "owner" : "jk", + "name" : "m", + "access" : 0, + "descriptor" : "Lkd;" + }, { + "field" : "isIgnored0", + "owner" : "jk", + "name" : "f", + "access" : 0, + "descriptor" : "Lkd;" + } ], + "methods" : [ { + "method" : "clearIsFriend", + "owner" : "jk", + "name" : "m", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "clearIsIgnored", + "owner" : "jk", + "name" : "w", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "fillIsFriend", + "owner" : "jk", + "name" : "q", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "fillIsIgnored", + "owner" : "jk", + "name" : "u", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "isFriend", + "owner" : "jk", + "name" : "f", + "access" : 17, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "isIgnored", + "owner" : "jk", + "name" : "o", + "access" : 17, + "parameters" : [ ], + "descriptor" : "(I)Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "DesktopPlatformInfoProvider", + "name" : "lu", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "lm" ], + "fields" : [ ], + "methods" : [ { + "method" : "get", + "owner" : "lu", + "name" : "m", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Llb;" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "GroundItemPile", + "name" : "dr", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "first", + "owner" : "dr", + "name" : "o", + "access" : 0, + "descriptor" : "Lex;" + }, { + "field" : "height", + "owner" : "dr", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : -1659262853 + }, { + "field" : "second", + "owner" : "dr", + "name" : "m", + "access" : 0, + "descriptor" : "Lex;" + }, { + "field" : "tag", + "owner" : "dr", + "name" : "g", + "access" : 0, + "descriptor" : "J", + "decoder" : -3696674445500472687 + }, { + "field" : "third", + "owner" : "dr", + "name" : "u", + "access" : 0, + "descriptor" : "Lex;" + }, { + "field" : "tileHeight", + "owner" : "dr", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : -325682933 + }, { + "field" : "x", + "owner" : "dr", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -1363136655 + }, { + "field" : "y", + "owner" : "dr", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : 968072997 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "DemotingHashTable", + "name" : "ec", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "capacity", + "owner" : "ec", + "name" : "m", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "hashTable", + "owner" : "ec", + "name" : "q", + "access" : 0, + "descriptor" : "Llh;" + }, { + "field" : "queue", + "owner" : "ec", + "name" : "w", + "access" : 0, + "descriptor" : "Ljc;" + }, { + "field" : "remaining", + "owner" : "ec", + "name" : "f", + "access" : 0, + "descriptor" : "I" + } ], + "methods" : [ { + "method" : "clear", + "owner" : "ec", + "name" : "u", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "demote", + "owner" : "ec", + "name" : "o", + "access" : 1, + "parameters" : [ "softeningLevel" ], + "descriptor" : "(I)V" + }, { + "method" : "get", + "owner" : "ec", + "name" : "m", + "access" : 1, + "parameters" : [ "key" ], + "descriptor" : "(J)Ljava/lang/Object;" + }, { + "method" : "put", + "owner" : "ec", + "name" : "w", + "access" : 1, + "parameters" : [ "value", "key", "size" ], + "descriptor" : "(Ljava/lang/Object;JI)V" + }, { + "method" : "remove", + "owner" : "ec", + "name" : "f", + "access" : 0, + "parameters" : [ "key" ], + "descriptor" : "(J)V" + }, { + "method" : "removeWrapper", + "owner" : "ec", + "name" : "q", + "access" : 0, + "parameters" : [ "wrapper" ], + "descriptor" : "(Leu;)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(II)V" + } ] +}, { + "class" : "ScriptFrame", + "name" : "bn", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "intLocals", + "owner" : "bn", + "name" : "q", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "pc", + "owner" : "bn", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : -1715361849 + }, { + "field" : "script", + "owner" : "bn", + "name" : "m", + "access" : 0, + "descriptor" : "Lcg;" + }, { + "field" : "stringLocals", + "owner" : "bn", + "name" : "w", + "access" : 0, + "descriptor" : "[Ljava/lang/String;" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "BoundaryObject", + "name" : "ej", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "entity1", + "owner" : "ej", + "name" : "u", + "access" : 1, + "descriptor" : "Lex;" + }, { + "field" : "entity2", + "owner" : "ej", + "name" : "g", + "access" : 1, + "descriptor" : "Lex;" + }, { + "field" : "flags", + "owner" : "ej", + "name" : "e", + "access" : 0, + "descriptor" : "I", + "decoder" : -693868549 + }, { + "field" : "orientationA", + "owner" : "ej", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : 1724480965 + }, { + "field" : "orientationB", + "owner" : "ej", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : -969316473 + }, { + "field" : "tag", + "owner" : "ej", + "name" : "l", + "access" : 1, + "descriptor" : "J", + "decoder" : -4401157754236673285 + }, { + "field" : "tileHeight", + "owner" : "ej", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : -9307913 + }, { + "field" : "x", + "owner" : "ej", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 860688417 + }, { + "field" : "y", + "owner" : "ej", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -260081891 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "WallDecoration", + "name" : "eq", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "entity1", + "owner" : "eq", + "name" : "l", + "access" : 1, + "descriptor" : "Lex;" + }, { + "field" : "entity2", + "owner" : "eq", + "name" : "e", + "access" : 1, + "descriptor" : "Lex;" + }, { + "field" : "flags", + "owner" : "eq", + "name" : "d", + "access" : 0, + "descriptor" : "I", + "decoder" : -1164153171 + }, { + "field" : "int7", + "owner" : "eq", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : -303827911 + }, { + "field" : "orientation", + "owner" : "eq", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : -183359389 + }, { + "field" : "tag", + "owner" : "eq", + "name" : "x", + "access" : 1, + "descriptor" : "J", + "decoder" : 3167575053900974839 + }, { + "field" : "tileHeight", + "owner" : "eq", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : 1781638945 + }, { + "field" : "x", + "owner" : "eq", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 1411967127 + }, { + "field" : "xOffset", + "owner" : "eq", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : 1927462659 + }, { + "field" : "y", + "owner" : "eq", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -629971645 + }, { + "field" : "yOffset", + "owner" : "eq", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : -1531207607 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "ArchiveDiskAction", + "name" : "ik", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "archive", + "owner" : "ik", + "name" : "w", + "access" : 0, + "descriptor" : "Lit;" + }, { + "field" : "archiveDisk", + "owner" : "ik", + "name" : "q", + "access" : 0, + "descriptor" : "Lff;" + }, { + "field" : "data", + "owner" : "ik", + "name" : "f", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "type", + "owner" : "ik", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : -1942326733 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Projectile", + "name" : "cb", + "super" : "ex", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "accelerationZ", + "owner" : "cb", + "name" : "y", + "access" : 0, + "descriptor" : "D" + }, { + "field" : "cycleEnd", + "owner" : "cb", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : 2121946763 + }, { + "field" : "cycleStart", + "owner" : "cb", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : 358196599 + }, { + "field" : "frame", + "owner" : "cb", + "name" : "r", + "access" : 0, + "descriptor" : "I", + "decoder" : -377214997 + }, { + "field" : "frameCycle", + "owner" : "cb", + "name" : "p", + "access" : 0, + "descriptor" : "I", + "decoder" : -742871951 + }, { + "field" : "id", + "owner" : "cb", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : 2111080001 + }, { + "field" : "int3", + "owner" : "cb", + "name" : "e", + "access" : 0, + "descriptor" : "I", + "decoder" : -769539171 + }, { + "field" : "int4", + "owner" : "cb", + "name" : "x", + "access" : 0, + "descriptor" : "I", + "decoder" : -2074328969 + }, { + "field" : "int5", + "owner" : "cb", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : -675081925 + }, { + "field" : "isMoving", + "owner" : "cb", + "name" : "k", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "pitch", + "owner" : "cb", + "name" : "b", + "access" : 0, + "descriptor" : "I", + "decoder" : -2072120189 + }, { + "field" : "plane", + "owner" : "cb", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : -1038876505 + }, { + "field" : "sequenceDefinition", + "owner" : "cb", + "name" : "c", + "access" : 0, + "descriptor" : "Ljh;" + }, { + "field" : "sourceX", + "owner" : "cb", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 1652455041 + }, { + "field" : "sourceY", + "owner" : "cb", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : -1421996173 + }, { + "field" : "sourceZ", + "owner" : "cb", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : -4446033 + }, { + "field" : "speed", + "owner" : "cb", + "name" : "s", + "access" : 0, + "descriptor" : "D" + }, { + "field" : "speedX", + "owner" : "cb", + "name" : "z", + "access" : 0, + "descriptor" : "D" + }, { + "field" : "speedY", + "owner" : "cb", + "name" : "j", + "access" : 0, + "descriptor" : "D" + }, { + "field" : "speedZ", + "owner" : "cb", + "name" : "t", + "access" : 0, + "descriptor" : "D" + }, { + "field" : "targetIndex", + "owner" : "cb", + "name" : "d", + "access" : 0, + "descriptor" : "I", + "decoder" : 551413977 + }, { + "field" : "x", + "owner" : "cb", + "name" : "n", + "access" : 0, + "descriptor" : "D" + }, { + "field" : "y", + "owner" : "cb", + "name" : "i", + "access" : 0, + "descriptor" : "D" + }, { + "field" : "yaw", + "owner" : "cb", + "name" : "h", + "access" : 0, + "descriptor" : "I", + "decoder" : 1281680175 + }, { + "field" : "z", + "owner" : "cb", + "name" : "a", + "access" : 0, + "descriptor" : "D" + } ], + "methods" : [ { + "method" : "advance", + "owner" : "cb", + "name" : "f", + "access" : 16, + "parameters" : [ "cycles" ], + "descriptor" : "(II)V" + }, { + "method" : "getModel", + "owner" : "cb", + "name" : "e", + "access" : 20, + "parameters" : [ ], + "descriptor" : "(I)Ldu;" + }, { + "method" : "setDestination", + "owner" : "cb", + "name" : "m", + "access" : 16, + "parameters" : [ "x", "y", "height", "cycle" ], + "descriptor" : "(IIIII)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(IIIIIIIIIII)V" + } ] +}, { + "class" : "FloorDecoration", + "name" : "do", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "entity", + "owner" : "do", + "name" : "o", + "access" : 1, + "descriptor" : "Lex;" + }, { + "field" : "flags", + "owner" : "do", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : -1241982749 + }, { + "field" : "tag", + "owner" : "do", + "name" : "m", + "access" : 1, + "descriptor" : "J", + "decoder" : -5063688075016130813 + }, { + "field" : "tileHeight", + "owner" : "do", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : -1358154703 + }, { + "field" : "x", + "owner" : "do", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 1309467119 + }, { + "field" : "y", + "owner" : "do", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : 318503957 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "GraphicsObject", + "name" : "bw", + "super" : "ex", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "cycleStart", + "owner" : "bw", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : -1245488067 + }, { + "field" : "frame", + "owner" : "bw", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : 1541221595 + }, { + "field" : "frameCycle", + "owner" : "bw", + "name" : "e", + "access" : 0, + "descriptor" : "I", + "decoder" : -1950327625 + }, { + "field" : "height", + "owner" : "bw", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : 1156757009 + }, { + "field" : "id", + "owner" : "bw", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : -289084031 + }, { + "field" : "isFinished", + "owner" : "bw", + "name" : "x", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "plane", + "owner" : "bw", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 432847573 + }, { + "field" : "sequenceDefinition", + "owner" : "bw", + "name" : "g", + "access" : 0, + "descriptor" : "Ljh;" + }, { + "field" : "x", + "owner" : "bw", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : -1189549567 + }, { + "field" : "y", + "owner" : "bw", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : 1416438985 + } ], + "methods" : [ { + "method" : "advance", + "owner" : "bw", + "name" : "m", + "access" : 16, + "parameters" : [ "cycles" ], + "descriptor" : "(II)V" + }, { + "method" : "getModel", + "owner" : "bw", + "name" : "e", + "access" : 20, + "parameters" : [ ], + "descriptor" : "(I)Ldu;" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(IIIIIII)V" + } ] +}, { + "class" : "ViewportMouse", + "name" : "dm", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "Tiles", + "name" : "bq", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "Players", + "name" : "cq", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ ], + "constructors" : [ ] +}, { + "class" : "WorldComparator", + "name" : "u", + "super" : "java.lang.Object", + "access" : 48, + "interfaces" : [ "java.util.Comparator" ], + "fields" : [ ], + "methods" : [ { + "method" : "__m_0", + "owner" : "u", + "name" : "m", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ll;Ll;I)I" + }, { + "method" : "__compare_1", + "owner" : "u", + "name" : "compare", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" + }, { + "method" : "__equals_2", + "owner" : "u", + "name" : "equals", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/lang/Object;)Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "GrandExchangeEvent", + "name" : "l", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "grandExchangeOffer", + "owner" : "l", + "name" : "q", + "access" : 17, + "descriptor" : "Lx;" + }, { + "field" : "string1", + "owner" : "l", + "name" : "w", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "string2", + "owner" : "l", + "name" : "o", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "world", + "owner" : "l", + "name" : "m", + "access" : 17, + "descriptor" : "I", + "decoder" : -633089807 + }, { + "field" : "__f", + "owner" : "l", + "name" : "f", + "access" : 17, + "descriptor" : "J", + "decoder" : -6503890758391257651 + } ], + "methods" : [ { + "method" : "__m_3", + "owner" : "l", + "name" : "m", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Ljava/lang/String;" + }, { + "method" : "__f_4", + "owner" : "l", + "name" : "f", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Ljava/lang/String;" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Lgr;BI)V" + } ] +}, { + "class" : "TotalQuantityComparator", + "name" : "e", + "super" : "java.lang.Object", + "access" : 48, + "interfaces" : [ "java.util.Comparator" ], + "fields" : [ ], + "methods" : [ { + "method" : "__m_5", + "owner" : "e", + "name" : "m", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ll;Ll;I)I" + }, { + "method" : "__compare_6", + "owner" : "e", + "name" : "compare", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" + }, { + "method" : "__equals_7", + "owner" : "e", + "name" : "equals", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/lang/Object;)Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "GrandExchangeOffer", + "name" : "x", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "currentPrice", + "owner" : "x", + "name" : "u", + "access" : 1, + "descriptor" : "I", + "decoder" : 396420073 + }, { + "field" : "currentQuantity", + "owner" : "x", + "name" : "o", + "access" : 1, + "descriptor" : "I", + "decoder" : 1413132419 + }, { + "field" : "id", + "owner" : "x", + "name" : "f", + "access" : 1, + "descriptor" : "I", + "decoder" : 1136727241 + }, { + "field" : "state", + "owner" : "x", + "name" : "m", + "access" : 0, + "descriptor" : "B" + }, { + "field" : "totalQuantity", + "owner" : "x", + "name" : "w", + "access" : 1, + "descriptor" : "I", + "decoder" : 562564821 + }, { + "field" : "unitPrice", + "owner" : "x", + "name" : "q", + "access" : 1, + "descriptor" : "I", + "decoder" : -1627453165 + } ], + "methods" : [ { + "method" : "status", + "owner" : "x", + "name" : "q", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "type", + "owner" : "x", + "name" : "w", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__f_8", + "owner" : "x", + "name" : "f", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/lang/Integer;I)V" + }, { + "method" : "__o_9", + "owner" : "x", + "name" : "o", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(II)V" + }, { + "method" : "__u_10", + "owner" : "x", + "name" : "u", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(II)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + }, { + "access" : 1, + "descriptor" : "(Lgr;Z)V" + } ] +}, { + "class" : "UnitPriceComparator", + "name" : "d", + "super" : "java.lang.Object", + "access" : 48, + "interfaces" : [ "java.util.Comparator" ], + "fields" : [ ], + "methods" : [ { + "method" : "__m_11", + "owner" : "d", + "name" : "m", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ll;Ll;I)I" + }, { + "method" : "__compare_12", + "owner" : "d", + "name" : "compare", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" + }, { + "method" : "__equals_13", + "owner" : "d", + "name" : "equals", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/lang/Object;)Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "WorldMapLabelSize", + "name" : "s", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__o", + "owner" : "s", + "name" : "o", + "access" : 16, + "descriptor" : "I", + "decoder" : 707828941 + }, { + "field" : "__u", + "owner" : "s", + "name" : "u", + "access" : 16, + "descriptor" : "I", + "decoder" : -422937451 + }, { + "field" : "__w", + "owner" : "s", + "name" : "w", + "access" : 16, + "descriptor" : "I", + "decoder" : 1252293513 + } ], + "methods" : [ { + "method" : "__f_14", + "owner" : "s", + "name" : "f", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(FI)Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(III)V" + } ] +}, { + "class" : "WorldMapIcon1", + "name" : "t", + "super" : "ak", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "label0", + "owner" : "t", + "name" : "f", + "access" : 16, + "descriptor" : "Laj;" + }, { + "field" : "__m", + "owner" : "t", + "name" : "m", + "access" : 16, + "descriptor" : "I", + "decoder" : -1722323621 + }, { + "field" : "__q", + "owner" : "t", + "name" : "q", + "access" : 16, + "descriptor" : "I", + "decoder" : 364253793 + }, { + "field" : "__w", + "owner" : "t", + "name" : "w", + "access" : 16, + "descriptor" : "I", + "decoder" : -362031241 + } ], + "methods" : [ { + "method" : "__m_15", + "owner" : "t", + "name" : "m", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__f_16", + "owner" : "t", + "name" : "f", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)Laj;" + }, { + "method" : "__q_17", + "owner" : "t", + "name" : "q", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)I" + }, { + "method" : "__w_18", + "owner" : "t", + "name" : "w", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Lhu;Lhu;ILaj;)V" + } ] +}, { + "class" : "WorldMapSection0", + "name" : "y", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "ab" ], + "fields" : [ { + "field" : "__d", + "owner" : "y", + "name" : "d", + "access" : 0, + "descriptor" : "I", + "decoder" : -799353317 + }, { + "field" : "__e", + "owner" : "y", + "name" : "e", + "access" : 0, + "descriptor" : "I", + "decoder" : -1022177315 + }, { + "field" : "__f", + "owner" : "y", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 1299225715 + }, { + "field" : "__g", + "owner" : "y", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : -150870205 + }, { + "field" : "__i", + "owner" : "y", + "name" : "i", + "access" : 0, + "descriptor" : "I", + "decoder" : 1345061881 + }, { + "field" : "__k", + "owner" : "y", + "name" : "k", + "access" : 0, + "descriptor" : "I", + "decoder" : -1388959491 + }, { + "field" : "__l", + "owner" : "y", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : 1009718107 + }, { + "field" : "__m", + "owner" : "y", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : -2011838881 + }, { + "field" : "__n", + "owner" : "y", + "name" : "n", + "access" : 0, + "descriptor" : "I", + "decoder" : -1657956317 + }, { + "field" : "__o", + "owner" : "y", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : -671345527 + }, { + "field" : "__q", + "owner" : "y", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 82600709 + }, { + "field" : "__u", + "owner" : "y", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : 529427495 + }, { + "field" : "__w", + "owner" : "y", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : -477370575 + }, { + "field" : "__x", + "owner" : "y", + "name" : "x", + "access" : 0, + "descriptor" : "I", + "decoder" : -1397517463 + } ], + "methods" : [ { + "method" : "__m_19", + "owner" : "y", + "name" : "m", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Lag;I)V" + }, { + "method" : "__f_20", + "owner" : "y", + "name" : "f", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(IIIB)Z" + }, { + "method" : "__q_21", + "owner" : "y", + "name" : "q", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(IIB)Z" + }, { + "method" : "__w_22", + "owner" : "y", + "name" : "w", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(IIII)[I" + }, { + "method" : "__o_23", + "owner" : "y", + "name" : "o", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(III)Lhu;" + }, { + "method" : "__u_24", + "owner" : "y", + "name" : "u", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Lgr;B)V" + }, { + "method" : "__g_25", + "owner" : "y", + "name" : "g", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "WorldMapSectionType", + "name" : "h", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "gc" ], + "fields" : [ { + "field" : "id", + "owner" : "h", + "name" : "u", + "access" : 16, + "descriptor" : "B" + }, { + "field" : "type", + "owner" : "h", + "name" : "o", + "access" : 16, + "descriptor" : "I", + "decoder" : 738759853 + } ], + "methods" : [ { + "method" : "__f_26", + "owner" : "h", + "name" : "f", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(IB)V" + } ] +}, { + "class" : "WorldMapIcon2", + "name" : "r", + "super" : "ak", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "label0", + "owner" : "r", + "name" : "w", + "access" : 0, + "descriptor" : "Laj;" + }, { + "field" : "__o", + "owner" : "r", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : 927871683 + }, { + "field" : "__q", + "owner" : "r", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -25914375 + }, { + "field" : "__u", + "owner" : "r", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : -1431936619 + }, { + "field" : "__f", + "owner" : "r", + "name" : "f", + "access" : 16, + "descriptor" : "Lav;" + }, { + "field" : "__m", + "owner" : "r", + "name" : "m", + "access" : 16, + "descriptor" : "I", + "decoder" : -985436813 + } ], + "methods" : [ { + "method" : "__z_27", + "owner" : "r", + "name" : "z", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__m_28", + "owner" : "r", + "name" : "m", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__f_29", + "owner" : "r", + "name" : "f", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)Laj;" + }, { + "method" : "__q_30", + "owner" : "r", + "name" : "q", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)I" + }, { + "method" : "__w_31", + "owner" : "r", + "name" : "w", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Lhu;Lhu;ILav;)V" + } ] +}, { + "class" : "WorldMapSection3", + "name" : "p", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "ab" ], + "fields" : [ { + "field" : "__e", + "owner" : "p", + "name" : "e", + "access" : 0, + "descriptor" : "I", + "decoder" : 395786901 + }, { + "field" : "__f", + "owner" : "p", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : -1622972483 + }, { + "field" : "__g", + "owner" : "p", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : 1016557381 + }, { + "field" : "__l", + "owner" : "p", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : 884736611 + }, { + "field" : "__m", + "owner" : "p", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : 1389733201 + }, { + "field" : "__o", + "owner" : "p", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : 1257151629 + }, { + "field" : "__q", + "owner" : "p", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 702057599 + }, { + "field" : "__u", + "owner" : "p", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : -1351623663 + }, { + "field" : "__w", + "owner" : "p", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : -1068088609 + }, { + "field" : "__x", + "owner" : "p", + "name" : "x", + "access" : 0, + "descriptor" : "I", + "decoder" : -627081155 + } ], + "methods" : [ { + "method" : "__m_32", + "owner" : "p", + "name" : "m", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Lag;I)V" + }, { + "method" : "__f_33", + "owner" : "p", + "name" : "f", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(IIIB)Z" + }, { + "method" : "__q_34", + "owner" : "p", + "name" : "q", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(IIB)Z" + }, { + "method" : "__w_35", + "owner" : "p", + "name" : "w", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(IIII)[I" + }, { + "method" : "__o_36", + "owner" : "p", + "name" : "o", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(III)Lhu;" + }, { + "method" : "__u_37", + "owner" : "p", + "name" : "u", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Lgr;B)V" + }, { + "method" : "__g_38", + "owner" : "p", + "name" : "g", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "WorldMapArea", + "name" : "ag", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "archiveName0", + "owner" : "ag", + "name" : "f", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "id0", + "owner" : "ag", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : 1232579503 + }, { + "field" : "isMain0", + "owner" : "ag", + "name" : "d", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "maxX0", + "owner" : "ag", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : 225384859 + }, { + "field" : "maxY0", + "owner" : "ag", + "name" : "x", + "access" : 0, + "descriptor" : "I", + "decoder" : 1025105175 + }, { + "field" : "minX0", + "owner" : "ag", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : 1238532539 + }, { + "field" : "minY0", + "owner" : "ag", + "name" : "e", + "access" : 0, + "descriptor" : "I", + "decoder" : 963380367 + }, { + "field" : "name0", + "owner" : "ag", + "name" : "q", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "origin0", + "owner" : "ag", + "name" : "u", + "access" : 0, + "descriptor" : "Lhu;" + }, { + "field" : "sections", + "owner" : "ag", + "name" : "k", + "access" : 0, + "descriptor" : "Ljava/util/LinkedList;" + }, { + "field" : "zoom0", + "owner" : "ag", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : 196514055 + }, { + "field" : "__w", + "owner" : "ag", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : 986239133 + } ], + "methods" : [ { + "method" : "archiveName", + "owner" : "ag", + "name" : "x", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)Ljava/lang/String;" + }, { + "method" : "containsCoord", + "owner" : "ag", + "name" : "q", + "access" : 1, + "parameters" : [ "plane", "x", "y" ], + "descriptor" : "(IIII)Z" + }, { + "method" : "containsPosition", + "owner" : "ag", + "name" : "w", + "access" : 1, + "parameters" : [ "x", "y" ], + "descriptor" : "(III)Z" + }, { + "method" : "coord", + "owner" : "ag", + "name" : "u", + "access" : 1, + "parameters" : [ "x", "y" ], + "descriptor" : "(III)Lhu;" + }, { + "method" : "id", + "owner" : "ag", + "name" : "l", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "isMain", + "owner" : "ag", + "name" : "e", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)Z" + }, { + "method" : "maxX", + "owner" : "ag", + "name" : "s", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)I" + }, { + "method" : "maxY", + "owner" : "ag", + "name" : "y", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "minX", + "owner" : "ag", + "name" : "j", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)I" + }, { + "method" : "minY", + "owner" : "ag", + "name" : "t", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "name", + "owner" : "ag", + "name" : "d", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)Ljava/lang/String;" + }, { + "method" : "origin", + "owner" : "ag", + "name" : "p", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Lhu;" + }, { + "method" : "originPlane", + "owner" : "ag", + "name" : "b", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "originX", + "owner" : "ag", + "name" : "h", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)I" + }, { + "method" : "originY", + "owner" : "ag", + "name" : "c", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "position", + "owner" : "ag", + "name" : "o", + "access" : 1, + "parameters" : [ "plane", "x", "y" ], + "descriptor" : "(IIII)[I" + }, { + "method" : "read", + "owner" : "ag", + "name" : "m", + "access" : 1, + "descriptor" : "(Lgr;II)V" + }, { + "method" : "readWorldMapSection", + "owner" : "ag", + "name" : "f", + "access" : 0, + "descriptor" : "(Lgr;S)Lab;" + }, { + "method" : "setBounds", + "owner" : "ag", + "name" : "g", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "zoom", + "owner" : "ag", + "name" : "z", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__a_39", + "owner" : "ag", + "name" : "a", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)I" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "WorldMapRegion", + "name" : "av", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "fonts", + "owner" : "av", + "name" : "i", + "access" : 16, + "descriptor" : "Ljava/util/HashMap;" + }, { + "field" : "iconsList", + "owner" : "av", + "name" : "k", + "access" : 0, + "descriptor" : "Ljava/util/List;" + }, { + "field" : "iconsMap", + "owner" : "av", + "name" : "n", + "access" : 0, + "descriptor" : "Ljava/util/HashMap;" + }, { + "field" : "x", + "owner" : "av", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : -1061363609 + }, { + "field" : "y", + "owner" : "av", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : 2099407363 + }, { + "field" : "__d", + "owner" : "av", + "name" : "d", + "access" : 0, + "descriptor" : "I", + "decoder" : 415972873 + }, { + "field" : "__x", + "owner" : "av", + "name" : "x", + "access" : 0, + "descriptor" : "I", + "decoder" : -120515153 + }, { + "field" : "__e", + "owner" : "av", + "name" : "e", + "access" : 0, + "descriptor" : "Ljava/util/LinkedList;" + } ], + "methods" : [ { + "method" : "icons", + "owner" : "av", + "name" : "at", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)Ljava/util/List;" + }, { + "method" : "__w_40", + "owner" : "av", + "name" : "w", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(IIIB)V" + }, { + "method" : "__u_41", + "owner" : "av", + "name" : "u", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ljava/util/HashSet;Ljava/util/List;B)V" + }, { + "method" : "__e_42", + "owner" : "av", + "name" : "e", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "__x_43", + "owner" : "av", + "name" : "x", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/util/List;I)V" + }, { + "method" : "__d_44", + "owner" : "av", + "name" : "d", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__a_45", + "owner" : "av", + "name" : "a", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(Lir;B)Z" + }, { + "method" : "__j_46", + "owner" : "av", + "name" : "j", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], + "descriptor" : "(IIILjava/util/HashSet;I)V" + }, { + "method" : "__s_47", + "owner" : "av", + "name" : "s", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(Ljava/util/HashSet;IIB)V" + }, { + "method" : "__aq_48", + "owner" : "av", + "name" : "aq", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], + "descriptor" : "(IILjava/util/HashSet;IB)V" + }, { + "method" : "__aj_49", + "owner" : "av", + "name" : "aj", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(Ljava/util/HashSet;III)V" + }, { + "method" : "__av_50", + "owner" : "av", + "name" : "av", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], + "descriptor" : "(Lic;IIIIB)V" + }, { + "method" : "__ar_51", + "owner" : "av", + "name" : "ar", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], + "descriptor" : "(Lak;IIFI)V" + }, { + "method" : "__ac_52", + "owner" : "av", + "name" : "ac", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(Lic;III)V" + }, { + "method" : "__ay_53", + "owner" : "av", + "name" : "ay", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], + "descriptor" : "(Lak;Lic;IIFI)V" + }, { + "method" : "__ah_54", + "owner" : "av", + "name" : "ah", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], + "descriptor" : "(IILjava/util/HashSet;IB)V" + }, { + "method" : "__al_55", + "owner" : "av", + "name" : "al", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(II)Laj;" + }, { + "method" : "__ab_56", + "owner" : "av", + "name" : "ab", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(Lic;B)Laj;" + }, { + "method" : "__ae_57", + "owner" : "av", + "name" : "ae", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], + "descriptor" : "(IIIIII)Ljava/util/List;" + }, { + "method" : "__ad_58", + "owner" : "av", + "name" : "ad", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], + "descriptor" : "(IIIII)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(IIILjava/util/HashMap;)V" + } ] +}, { + "class" : "WorldMapSection2", + "name" : "ah", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "ab" ], + "fields" : [ { + "field" : "__f", + "owner" : "ah", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : -245382089 + }, { + "field" : "__m", + "owner" : "ah", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : -1561552223 + }, { + "field" : "__o", + "owner" : "ah", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : 982234927 + }, { + "field" : "__q", + "owner" : "ah", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -1024859679 + }, { + "field" : "__u", + "owner" : "ah", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : -1272330125 + }, { + "field" : "__w", + "owner" : "ah", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : 40495485 + } ], + "methods" : [ { + "method" : "__m_59", + "owner" : "ah", + "name" : "m", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Lag;I)V" + }, { + "method" : "__f_60", + "owner" : "ah", + "name" : "f", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(IIIB)Z" + }, { + "method" : "__q_61", + "owner" : "ah", + "name" : "q", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(IIB)Z" + }, { + "method" : "__w_62", + "owner" : "ah", + "name" : "w", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(IIII)[I" + }, { + "method" : "__o_63", + "owner" : "ah", + "name" : "o", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(III)Lhu;" + }, { + "method" : "__u_64", + "owner" : "ah", + "name" : "u", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Lgr;B)V" + }, { + "method" : "__g_65", + "owner" : "ah", + "name" : "g", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "AbstractWorldMapIcon", + "name" : "ak", + "super" : "java.lang.Object", + "access" : 1057, + "interfaces" : [ ], + "fields" : [ { + "field" : "coord1", + "owner" : "ak", + "name" : "l", + "access" : 17, + "descriptor" : "Lhu;" + }, { + "field" : "coord2", + "owner" : "ak", + "name" : "g", + "access" : 17, + "descriptor" : "Lhu;" + }, { + "field" : "__e", + "owner" : "ak", + "name" : "e", + "access" : 0, + "descriptor" : "I", + "decoder" : -521086143 + }, { + "field" : "__x", + "owner" : "ak", + "name" : "x", + "access" : 0, + "descriptor" : "I", + "decoder" : -1065362217 + } ], + "methods" : [ { + "method" : "element", + "owner" : "ak", + "name" : "m", + "access" : 1025, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "label", + "owner" : "ak", + "name" : "f", + "access" : 1024, + "parameters" : [ ], + "descriptor" : "(I)Laj;" + }, { + "method" : "__y_66", + "owner" : "ak", + "name" : "y", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(IIB)Z" + }, { + "method" : "__h_67", + "owner" : "ak", + "name" : "h", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "__b_68", + "owner" : "ak", + "name" : "b", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(III)Z" + }, { + "method" : "__c_69", + "owner" : "ak", + "name" : "c", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(III)Z" + }, { + "method" : "__w_70", + "owner" : "ak", + "name" : "w", + "access" : 1024, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__q_71", + "owner" : "ak", + "name" : "q", + "access" : 1024, + "parameters" : [ ], + "descriptor" : "(B)I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Lhu;Lhu;)V" + } ] +}, { + "class" : "WorldMapManager", + "name" : "al", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "fonts", + "owner" : "al", + "name" : "d", + "access" : 16, + "descriptor" : "Ljava/util/HashMap;" + }, { + "field" : "icons", + "owner" : "al", + "name" : "o", + "access" : 0, + "descriptor" : "Ljava/util/HashMap;" + }, { + "field" : "isLoaded0", + "owner" : "al", + "name" : "m", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "loadStarted", + "owner" : "al", + "name" : "f", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "mapAreaData", + "owner" : "al", + "name" : "q", + "access" : 0, + "descriptor" : "Lae;" + }, { + "field" : "mapSceneSprites", + "owner" : "al", + "name" : "l", + "access" : 0, + "descriptor" : "[Llq;" + }, { + "field" : "overviewSprite", + "owner" : "al", + "name" : "w", + "access" : 0, + "descriptor" : "Lln;" + }, { + "field" : "regions", + "owner" : "al", + "name" : "u", + "access" : 0, + "descriptor" : "[[Lav;" + }, { + "field" : "__a", + "owner" : "al", + "name" : "a", + "access" : 0, + "descriptor" : "I", + "decoder" : -395718741 + }, { + "field" : "__i", + "owner" : "al", + "name" : "i", + "access" : 0, + "descriptor" : "I", + "decoder" : 1729323633 + }, { + "field" : "__k", + "owner" : "al", + "name" : "k", + "access" : 0, + "descriptor" : "I", + "decoder" : -1459928419 + }, { + "field" : "__n", + "owner" : "al", + "name" : "n", + "access" : 0, + "descriptor" : "I", + "decoder" : 1364441271 + }, { + "field" : "__g", + "owner" : "al", + "name" : "g", + "access" : 0, + "descriptor" : "Ljava/util/HashMap;" + }, { + "field" : "__e", + "owner" : "al", + "name" : "e", + "access" : 16, + "descriptor" : "Lir;" + }, { + "field" : "__x", + "owner" : "al", + "name" : "x", + "access" : 16, + "descriptor" : "Lir;" + }, { + "field" : "__z", + "owner" : "al", + "name" : "z", + "access" : 1, + "descriptor" : "I", + "decoder" : 1085359673 + } ], + "methods" : [ { + "method" : "buildIcons", + "owner" : "al", + "name" : "e", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Ljava/util/HashMap;" + }, { + "method" : "buildIcons0", + "owner" : "al", + "name" : "x", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "clearIcons", + "owner" : "al", + "name" : "f", + "access" : 17, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "drawOverview", + "owner" : "al", + "name" : "o", + "access" : 1, + "descriptor" : "(IIIILjava/util/HashSet;III)V" + }, { + "method" : "isLoaded", + "owner" : "al", + "name" : "l", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "load", + "owner" : "al", + "name" : "m", + "access" : 1, + "parameters" : [ "indexCache", "cacheName", "isMembersWorld" ], + "descriptor" : "(Lir;Ljava/lang/String;ZB)V" + }, { + "method" : "__q_72", + "owner" : "al", + "name" : "q", + "access" : 17, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7" ], + "descriptor" : "(IIIIIIIII)V" + }, { + "method" : "__w_73", + "owner" : "al", + "name" : "w", + "access" : 17, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7", "arg8", "arg9", "arg10", "arg11", "arg12" ], + "descriptor" : "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZB)V" + }, { + "method" : "__u_74", + "owner" : "al", + "name" : "u", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7", "arg8", "arg9" ], + "descriptor" : "(IIIIIIIIIII)Ljava/util/List;" + }, { + "method" : "__d_75", + "owner" : "al", + "name" : "d", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(III)F" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "([Llq;Ljava/util/HashMap;Lir;Lir;)V" + } ] +}, { + "class" : "WorldMapAreaData", + "name" : "ae", + "super" : "ag", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__i", + "owner" : "ae", + "name" : "i", + "access" : 0, + "descriptor" : "Ljava/util/HashSet;" + }, { + "field" : "__n", + "owner" : "ae", + "name" : "n", + "access" : 0, + "descriptor" : "Ljava/util/HashSet;" + }, { + "field" : "__a", + "owner" : "ae", + "name" : "a", + "access" : 0, + "descriptor" : "Ljava/util/List;" + } ], + "methods" : [ { + "method" : "__ce_76", + "owner" : "ae", + "name" : "ce", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], + "descriptor" : "(Lgr;Lgr;IZI)V" + }, { + "method" : "__cy_77", + "owner" : "ae", + "name" : "cy", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Lgr;ZB)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "WorldMapSection1", + "name" : "as", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "ab" ], + "fields" : [ { + "field" : "__e", + "owner" : "as", + "name" : "e", + "access" : 0, + "descriptor" : "I", + "decoder" : -1797724181 + }, { + "field" : "__f", + "owner" : "as", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 1483447179 + }, { + "field" : "__g", + "owner" : "as", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : 1526007343 + }, { + "field" : "__l", + "owner" : "as", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : -890169045 + }, { + "field" : "__m", + "owner" : "as", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : -1971304641 + }, { + "field" : "__o", + "owner" : "as", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : -1513010233 + }, { + "field" : "__q", + "owner" : "as", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -1875803617 + }, { + "field" : "__u", + "owner" : "as", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : -1383826035 + }, { + "field" : "__w", + "owner" : "as", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : 284566685 + }, { + "field" : "__x", + "owner" : "as", + "name" : "x", + "access" : 0, + "descriptor" : "I", + "decoder" : 325777555 + } ], + "methods" : [ { + "method" : "__m_78", + "owner" : "as", + "name" : "m", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Lag;I)V" + }, { + "method" : "__f_79", + "owner" : "as", + "name" : "f", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(IIIB)Z" + }, { + "method" : "__q_80", + "owner" : "as", + "name" : "q", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(IIB)Z" + }, { + "method" : "__w_81", + "owner" : "as", + "name" : "w", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(IIII)[I" + }, { + "method" : "__o_82", + "owner" : "as", + "name" : "o", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(III)Lhu;" + }, { + "method" : "__u_83", + "owner" : "as", + "name" : "u", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Lgr;B)V" + }, { + "method" : "__g_84", + "owner" : "as", + "name" : "g", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "MouseWheelHandler", + "name" : "am", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ "fv", "java.awt.event.MouseWheelListener" ], + "fields" : [ { + "field" : "rotation", + "owner" : "am", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : -182252389 + } ], + "methods" : [ { + "method" : "addTo", + "owner" : "am", + "name" : "m", + "access" : 0, + "parameters" : [ "component" ], + "descriptor" : "(Ljava/awt/Component;B)V" + }, { + "method" : "removeFrom", + "owner" : "am", + "name" : "f", + "access" : 0, + "parameters" : [ "component" ], + "descriptor" : "(Ljava/awt/Component;I)V" + }, { + "method" : "useRotation", + "owner" : "am", + "name" : "q", + "access" : 33, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__mouseWheelMoved_85", + "owner" : "am", + "name" : "mouseWheelMoved", + "access" : 33, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/awt/event/MouseWheelEvent;)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "KeyHandler", + "name" : "an", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ "java.awt.event.KeyListener", "java.awt.event.FocusListener" ], + "fields" : [ ], + "methods" : [ { + "method" : "keyPressed", + "owner" : "an", + "name" : "keyPressed", + "access" : 49, + "parameters" : [ "ke" ], + "descriptor" : "(Ljava/awt/event/KeyEvent;)V" + }, { + "method" : "__keyReleased_86", + "owner" : "an", + "name" : "keyReleased", + "access" : 49, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/awt/event/KeyEvent;)V" + }, { + "method" : "__keyTyped_87", + "owner" : "an", + "name" : "keyTyped", + "access" : 17, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/awt/event/KeyEvent;)V" + }, { + "method" : "__focusGained_88", + "owner" : "an", + "name" : "focusGained", + "access" : 17, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/awt/event/FocusEvent;)V" + }, { + "method" : "__focusLost_89", + "owner" : "an", + "name" : "focusLost", + "access" : 49, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/awt/event/FocusEvent;)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "GameShell", + "name" : "ba", + "super" : "java.applet.Applet", + "access" : 1057, + "interfaces" : [ "java.lang.Runnable", "java.awt.event.FocusListener", "java.awt.event.WindowListener" ], + "fields" : [ { + "field" : "canvas", + "owner" : "ba", + "name" : "ay", + "access" : 0, + "descriptor" : "Ljava/awt/Canvas;" + }, { + "field" : "canvasSetTimeMs", + "owner" : "ba", + "name" : "ae", + "access" : 64, + "descriptor" : "J", + "decoder" : 956221087975405011 + }, { + "field" : "canvasX", + "owner" : "ba", + "name" : "b", + "access" : 0, + "descriptor" : "I", + "decoder" : 781373219 + }, { + "field" : "canvasY", + "owner" : "ba", + "name" : "c", + "access" : 0, + "descriptor" : "I", + "decoder" : 198681537 + }, { + "field" : "clipboard", + "owner" : "ba", + "name" : "as", + "access" : 0, + "descriptor" : "Ljava/awt/datatransfer/Clipboard;" + }, { + "field" : "contentHeight", + "owner" : "ba", + "name" : "h", + "access" : 4, + "descriptor" : "I", + "decoder" : -628781469 + }, { + "field" : "contentHeight0", + "owner" : "ba", + "name" : "ag", + "access" : 0, + "descriptor" : "I", + "decoder" : -2057041525 + }, { + "field" : "contentWidth", + "owner" : "ba", + "name" : "t", + "access" : 4, + "descriptor" : "I", + "decoder" : -1854329683 + }, { + "field" : "contentWidth0", + "owner" : "ba", + "name" : "v", + "access" : 0, + "descriptor" : "I", + "decoder" : 740831949 + }, { + "field" : "eventQueue", + "owner" : "ba", + "name" : "am", + "access" : 16, + "descriptor" : "Ljava/awt/EventQueue;" + }, { + "field" : "frame", + "owner" : "ba", + "name" : "ac", + "access" : 0, + "descriptor" : "Ljava/awt/Frame;" + }, { + "field" : "hasErrored", + "owner" : "ba", + "name" : "g", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "isCanvasInvalid", + "owner" : "ba", + "name" : "ab", + "access" : 64, + "descriptor" : "Z" + }, { + "field" : "mouseWheelHandler", + "owner" : "ba", + "name" : "ap", + "access" : 0, + "descriptor" : "Lam;" + }, { + "field" : "stopTimeMs", + "owner" : "ba", + "name" : "o", + "access" : 8, + "descriptor" : "J", + "decoder" : 5666519919949401915 + }, { + "field" : "__al", + "owner" : "ba", + "name" : "al", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "__aj", + "owner" : "ba", + "name" : "aj", + "access" : 0, + "descriptor" : "I", + "decoder" : 1911308233 + }, { + "field" : "__aq", + "owner" : "ba", + "name" : "aq", + "access" : 0, + "descriptor" : "I", + "decoder" : -2071955075 + }, { + "field" : "__ah", + "owner" : "ba", + "name" : "ah", + "access" : 64, + "descriptor" : "Z" + } ], + "methods" : [ { + "method" : "addCanvas", + "owner" : "ba", + "name" : "aq", + "access" : 48, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "checkHost", + "owner" : "ba", + "name" : "aj", + "access" : 20, + "parameters" : [ ], + "descriptor" : "(B)Z" + }, { + "method" : "clearBackground", + "owner" : "ba", + "name" : "p", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "clipboardSetString", + "owner" : "ba", + "name" : "x", + "access" : 4, + "parameters" : [ "s" ], + "descriptor" : "(Ljava/lang/String;I)V" + }, { + "method" : "container", + "owner" : "ba", + "name" : "as", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)Ljava/awt/Container;" + }, { + "method" : "drawInitial", + "owner" : "ba", + "name" : "at", + "access" : 20, + "descriptor" : "(ILjava/lang/String;ZB)V" + }, { + "method" : "error", + "owner" : "ba", + "name" : "ap", + "access" : 4, + "parameters" : [ "type" ], + "descriptor" : "(Ljava/lang/String;B)V" + }, { + "method" : "focusGained", + "owner" : "ba", + "name" : "focusGained", + "access" : 17, + "descriptor" : "(Ljava/awt/event/FocusEvent;)V" + }, { + "method" : "getFrameContentBounds", + "owner" : "ba", + "name" : "am", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)Lla;" + }, { + "method" : "hasFrame", + "owner" : "ba", + "name" : "an", + "access" : 20, + "parameters" : [ ], + "descriptor" : "(B)Z" + }, { + "method" : "kill", + "owner" : "ba", + "name" : "ah", + "access" : 48, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "kill0", + "owner" : "ba", + "name" : "ae", + "access" : 1028, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "mouseWheel", + "owner" : "ba", + "name" : "l", + "access" : 4, + "parameters" : [ ], + "descriptor" : "(B)Lfv;" + }, { + "method" : "paint", + "owner" : "ba", + "name" : "paint", + "access" : 49, + "parameters" : [ "g" ], + "descriptor" : "(Ljava/awt/Graphics;)V" + }, { + "method" : "replaceCanvas", + "owner" : "ba", + "name" : "v", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "run", + "owner" : "ba", + "name" : "run", + "access" : 1, + "descriptor" : "()V" + }, { + "method" : "setUp", + "owner" : "ba", + "name" : "aw", + "access" : 1028, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "setUpClipboard", + "owner" : "ba", + "name" : "e", + "access" : 4, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "setUpKeyboard", + "owner" : "ba", + "name" : "d", + "access" : 20, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "setUpMouse", + "owner" : "ba", + "name" : "a", + "access" : 20, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "startThread", + "owner" : "ba", + "name" : "ag", + "access" : 20, + "parameters" : [ "width", "height", "revision" ], + "descriptor" : "(IIII)V" + }, { + "method" : "update", + "owner" : "ba", + "name" : "update", + "access" : 17, + "parameters" : [ "g" ], + "descriptor" : "(Ljava/awt/Graphics;)V" + }, { + "method" : "__u_90", + "owner" : "ba", + "name" : "u", + "access" : 20, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(IIB)V" + }, { + "method" : "__g_91", + "owner" : "ba", + "name" : "g", + "access" : 16, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/lang/Object;I)V" + }, { + "method" : "__z_92", + "owner" : "ba", + "name" : "z", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__av_93", + "owner" : "ba", + "name" : "av", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "__ar_94", + "owner" : "ba", + "name" : "ar", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "__ac_95", + "owner" : "ba", + "name" : "ac", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__ay_96", + "owner" : "ba", + "name" : "ay", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__start_97", + "owner" : "ba", + "name" : "start", + "access" : 17, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__stop_98", + "owner" : "ba", + "name" : "stop", + "access" : 17, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__destroy_99", + "owner" : "ba", + "name" : "destroy", + "access" : 17, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__focusLost_100", + "owner" : "ba", + "name" : "focusLost", + "access" : 17, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/awt/event/FocusEvent;)V" + }, { + "method" : "__windowActivated_101", + "owner" : "ba", + "name" : "windowActivated", + "access" : 17, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/awt/event/WindowEvent;)V" + }, { + "method" : "__windowClosed_102", + "owner" : "ba", + "name" : "windowClosed", + "access" : 17, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/awt/event/WindowEvent;)V" + }, { + "method" : "__windowClosing_103", + "owner" : "ba", + "name" : "windowClosing", + "access" : 17, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/awt/event/WindowEvent;)V" + }, { + "method" : "__windowDeactivated_104", + "owner" : "ba", + "name" : "windowDeactivated", + "access" : 17, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/awt/event/WindowEvent;)V" + }, { + "method" : "__windowDeiconified_105", + "owner" : "ba", + "name" : "windowDeiconified", + "access" : 17, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/awt/event/WindowEvent;)V" + }, { + "method" : "__windowIconified_106", + "owner" : "ba", + "name" : "windowIconified", + "access" : 17, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/awt/event/WindowEvent;)V" + }, { + "method" : "__windowOpened_107", + "owner" : "ba", + "name" : "windowOpened", + "access" : 17, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/awt/event/WindowEvent;)V" + }, { + "method" : "__ad_108", + "owner" : "ba", + "name" : "ad", + "access" : 20, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__init_109", + "owner" : "ba", + "name" : "init", + "access" : 1025, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__au_110", + "owner" : "ba", + "name" : "au", + "access" : 1028, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__al_111", + "owner" : "ba", + "name" : "al", + "access" : 1028, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__ab_112", + "owner" : "ba", + "name" : "ab", + "access" : 1028, + "parameters" : [ "arg0" ], + "descriptor" : "(ZI)V" + }, { + "method" : "__j_113", + "owner" : "ba", + "name" : "j", + "access" : 1028, + "parameters" : [ ], + "descriptor" : "(I)V" + } ], + "constructors" : [ { + "access" : 4, + "descriptor" : "()V" + } ] +}, { + "class" : "MouseHandler", + "name" : "bb", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "java.awt.event.MouseListener", "java.awt.event.MouseMotionListener", "java.awt.event.FocusListener" ], + "fields" : [ ], + "methods" : [ { + "method" : "getButton", + "owner" : "bb", + "name" : "f", + "access" : 16, + "parameters" : [ "mouseEvent" ], + "descriptor" : "(Ljava/awt/event/MouseEvent;I)I" + }, { + "method" : "mouseMoved", + "owner" : "bb", + "name" : "mouseMoved", + "access" : 49, + "descriptor" : "(Ljava/awt/event/MouseEvent;)V" + }, { + "method" : "mousePressed", + "owner" : "bb", + "name" : "mousePressed", + "access" : 49, + "descriptor" : "(Ljava/awt/event/MouseEvent;)V" + }, { + "method" : "__mouseReleased_114", + "owner" : "bb", + "name" : "mouseReleased", + "access" : 49, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/awt/event/MouseEvent;)V" + }, { + "method" : "__mouseClicked_115", + "owner" : "bb", + "name" : "mouseClicked", + "access" : 17, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/awt/event/MouseEvent;)V" + }, { + "method" : "__mouseEntered_116", + "owner" : "bb", + "name" : "mouseEntered", + "access" : 49, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/awt/event/MouseEvent;)V" + }, { + "method" : "__mouseExited_117", + "owner" : "bb", + "name" : "mouseExited", + "access" : 49, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/awt/event/MouseEvent;)V" + }, { + "method" : "__mouseDragged_118", + "owner" : "bb", + "name" : "mouseDragged", + "access" : 49, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/awt/event/MouseEvent;)V" + }, { + "method" : "__focusGained_119", + "owner" : "bb", + "name" : "focusGained", + "access" : 17, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/awt/event/FocusEvent;)V" + }, { + "method" : "__focusLost_120", + "owner" : "bb", + "name" : "focusLost", + "access" : 49, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/awt/event/FocusEvent;)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "SecureRandomCallable", + "name" : "bk", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "java.util.concurrent.Callable" ], + "fields" : [ ], + "methods" : [ { + "method" : "__call_121", + "owner" : "bk", + "name" : "call", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Ljava/lang/Object;" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "ArchiveLoader", + "name" : "bd", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "archive", + "owner" : "bd", + "name" : "f", + "access" : 16, + "descriptor" : "Lit;" + }, { + "field" : "__w", + "owner" : "bd", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : 782003089 + }, { + "field" : "__q", + "owner" : "bd", + "name" : "q", + "access" : 16, + "descriptor" : "I", + "decoder" : 1459455501 + } ], + "methods" : [ { + "method" : "__m_122", + "owner" : "bd", + "name" : "m", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Lit;Ljava/lang/String;)V" + } ] +}, { + "class" : "ScriptEvent", + "name" : "by", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "args0", + "owner" : "by", + "name" : "m", + "access" : 0, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "boolean1", + "owner" : "by", + "name" : "f", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "component", + "owner" : "by", + "name" : "q", + "access" : 0, + "descriptor" : "Lho;" + }, { + "field" : "dragTarget", + "owner" : "by", + "name" : "g", + "access" : 0, + "descriptor" : "Lho;" + }, { + "field" : "keyPressed", + "owner" : "by", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : -1330602393 + }, { + "field" : "keyTyped", + "owner" : "by", + "name" : "e", + "access" : 0, + "descriptor" : "I", + "decoder" : 327085889 + }, { + "field" : "mouseX", + "owner" : "by", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : 488198377 + }, { + "field" : "mouseY", + "owner" : "by", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : 95719815 + }, { + "field" : "opIndex", + "owner" : "by", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : -1089993721 + }, { + "field" : "targetName", + "owner" : "by", + "name" : "x", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "type0", + "owner" : "by", + "name" : "k", + "access" : 0, + "descriptor" : "I", + "decoder" : -161292529 + }, { + "field" : "__d", + "owner" : "by", + "name" : "d", + "access" : 0, + "descriptor" : "I", + "decoder" : -2138736593 + } ], + "methods" : [ { + "method" : "setArgs", + "owner" : "by", + "name" : "m", + "access" : 1, + "parameters" : [ "args" ], + "descriptor" : "([Ljava/lang/Object;I)V" + }, { + "method" : "setType", + "owner" : "by", + "name" : "f", + "access" : 1, + "parameters" : [ "type" ], + "descriptor" : "(IB)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "MouseRecorder", + "name" : "bu", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "java.lang.Runnable" ], + "fields" : [ { + "field" : "index", + "owner" : "bu", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 973045825 + }, { + "field" : "isRunning", + "owner" : "bu", + "name" : "m", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "lock", + "owner" : "bu", + "name" : "f", + "access" : 0, + "descriptor" : "Ljava/lang/Object;" + }, { + "field" : "millis", + "owner" : "bu", + "name" : "u", + "access" : 0, + "descriptor" : "[J" + }, { + "field" : "xs", + "owner" : "bu", + "name" : "w", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "ys", + "owner" : "bu", + "name" : "o", + "access" : 0, + "descriptor" : "[I" + } ], + "methods" : [ { + "method" : "__run_123", + "owner" : "bu", + "name" : "run", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Player", + "name" : "br", + "super" : "bz", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "actions", + "owner" : "br", + "name" : "u", + "access" : 0, + "descriptor" : "[Ljava/lang/String;" + }, { + "field" : "animationCycleEnd", + "owner" : "br", + "name" : "d", + "access" : 0, + "descriptor" : "I", + "decoder" : -359981047 + }, { + "field" : "animationCycleStart", + "owner" : "br", + "name" : "x", + "access" : 0, + "descriptor" : "I", + "decoder" : -351876137 + }, { + "field" : "appearance", + "owner" : "br", + "name" : "f", + "access" : 0, + "descriptor" : "Lhi;" + }, { + "field" : "combatLevel", + "owner" : "br", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : 984869133 + }, { + "field" : "headIconPk", + "owner" : "br", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 2021372599 + }, { + "field" : "headIconPrayer", + "owner" : "br", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : -793415473 + }, { + "field" : "index", + "owner" : "br", + "name" : "r", + "access" : 0, + "descriptor" : "I", + "decoder" : 1486240677 + }, { + "field" : "isFriend", + "owner" : "br", + "name" : "p", + "access" : 0, + "descriptor" : "Lkd;" + }, { + "field" : "isHidden", + "owner" : "br", + "name" : "b", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "isInClanChat", + "owner" : "br", + "name" : "v", + "access" : 0, + "descriptor" : "Lkd;" + }, { + "field" : "isUnanimated", + "owner" : "br", + "name" : "y", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "model0", + "owner" : "br", + "name" : "a", + "access" : 0, + "descriptor" : "Ldu;" + }, { + "field" : "plane", + "owner" : "br", + "name" : "c", + "access" : 0, + "descriptor" : "I", + "decoder" : 1332604413 + }, { + "field" : "skillLevel", + "owner" : "br", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : -1136542281 + }, { + "field" : "team", + "owner" : "br", + "name" : "h", + "access" : 0, + "descriptor" : "I", + "decoder" : 91041167 + }, { + "field" : "tileHeight", + "owner" : "br", + "name" : "e", + "access" : 0, + "descriptor" : "I", + "decoder" : 1989338999 + }, { + "field" : "tileHeight2", + "owner" : "br", + "name" : "n", + "access" : 0, + "descriptor" : "I", + "decoder" : -1624108131 + }, { + "field" : "tileX", + "owner" : "br", + "name" : "aq", + "access" : 0, + "descriptor" : "I", + "decoder" : -539678769 + }, { + "field" : "tileY", + "owner" : "br", + "name" : "aj", + "access" : 0, + "descriptor" : "I", + "decoder" : 702193221 + }, { + "field" : "username", + "owner" : "br", + "name" : "m", + "access" : 0, + "descriptor" : "Lkp;" + }, { + "field" : "__ag", + "owner" : "br", + "name" : "ag", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "__i", + "owner" : "br", + "name" : "i", + "access" : 0, + "descriptor" : "I", + "decoder" : -1771431457 + }, { + "field" : "__j", + "owner" : "br", + "name" : "j", + "access" : 0, + "descriptor" : "I", + "decoder" : 224552403 + }, { + "field" : "__k", + "owner" : "br", + "name" : "k", + "access" : 0, + "descriptor" : "I", + "decoder" : 665272587 + }, { + "field" : "__s", + "owner" : "br", + "name" : "s", + "access" : 0, + "descriptor" : "I", + "decoder" : 305969541 + }, { + "field" : "__t", + "owner" : "br", + "name" : "t", + "access" : 0, + "descriptor" : "I", + "decoder" : 892671055 + }, { + "field" : "__z", + "owner" : "br", + "name" : "z", + "access" : 0, + "descriptor" : "I", + "decoder" : 1610462047 + } ], + "methods" : [ { + "method" : "getModel", + "owner" : "br", + "name" : "e", + "access" : 20, + "parameters" : [ ], + "descriptor" : "(I)Ldu;" + }, { + "method" : "isVisible", + "owner" : "br", + "name" : "z", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(B)Z" + }, { + "method" : "read", + "owner" : "br", + "name" : "m", + "access" : 16, + "parameters" : [ "buffer" ], + "descriptor" : "(Lgr;I)V" + }, { + "method" : "resetPath", + "owner" : "br", + "name" : "d", + "access" : 0, + "parameters" : [ "x", "y" ], + "descriptor" : "(III)V" + }, { + "method" : "transformedSize", + "owner" : "br", + "name" : "l", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__f_124", + "owner" : "br", + "name" : "f", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)Z" + }, { + "method" : "__q_125", + "owner" : "br", + "name" : "q", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__w_126", + "owner" : "br", + "name" : "w", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__o_127", + "owner" : "br", + "name" : "o", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)Z" + }, { + "method" : "__u_128", + "owner" : "br", + "name" : "u", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__g_129", + "owner" : "br", + "name" : "g", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__x_130", + "owner" : "br", + "name" : "x", + "access" : 16, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(IIBI)V" + }, { + "method" : "__a_131", + "owner" : "br", + "name" : "a", + "access" : 16, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(IIBI)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "OwnWorldComparator", + "name" : "bj", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "java.util.Comparator" ], + "fields" : [ { + "field" : "__m", + "owner" : "bj", + "name" : "m", + "access" : 0, + "descriptor" : "Z" + } ], + "methods" : [ { + "method" : "__m_132", + "owner" : "bj", + "name" : "m", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ll;Ll;B)I" + }, { + "method" : "__compare_133", + "owner" : "bj", + "name" : "compare", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" + }, { + "method" : "__equals_134", + "owner" : "bj", + "name" : "equals", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/lang/Object;)Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Actor", + "name" : "bz", + "super" : "ex", + "access" : 1057, + "interfaces" : [ ], + "fields" : [ { + "field" : "defaultHeight", + "owner" : "bz", + "name" : "cy", + "access" : 0, + "descriptor" : "I", + "decoder" : 1003085333 + }, { + "field" : "false0", + "owner" : "bz", + "name" : "bd", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "healthBars", + "owner" : "bz", + "name" : "bn", + "access" : 0, + "descriptor" : "Lja;" + }, { + "field" : "heightOffset", + "owner" : "bz", + "name" : "bp", + "access" : 0, + "descriptor" : "I", + "decoder" : -779457309 + }, { + "field" : "hitmarkCount", + "owner" : "bz", + "name" : "af", + "access" : 0, + "descriptor" : "B" + }, { + "field" : "hitmarkCycles", + "owner" : "bz", + "name" : "bb", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "hitmarkTypes", + "owner" : "bz", + "name" : "ai", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "hitmarkTypes2", + "owner" : "bz", + "name" : "bs", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "hitmarkValues", + "owner" : "bz", + "name" : "ba", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "hitmarkValues2", + "owner" : "bz", + "name" : "bq", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "isAutoChatting", + "owner" : "bz", + "name" : "an", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "movementFrame", + "owner" : "bz", + "name" : "bx", + "access" : 0, + "descriptor" : "I", + "decoder" : -1119758739 + }, { + "field" : "movementFrameCycle", + "owner" : "bz", + "name" : "by", + "access" : 0, + "descriptor" : "I", + "decoder" : -1646413227 + }, { + "field" : "movementSequence", + "owner" : "bz", + "name" : "bo", + "access" : 0, + "descriptor" : "I", + "decoder" : 1614854211 + }, { + "field" : "npcCycle", + "owner" : "bz", + "name" : "ce", + "access" : 0, + "descriptor" : "I", + "decoder" : 2051334073 + }, { + "field" : "orientation", + "owner" : "bz", + "name" : "cs", + "access" : 0, + "descriptor" : "I", + "decoder" : -1189634367 + }, { + "field" : "overheadText", + "owner" : "bz", + "name" : "am", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "overheadTextColor", + "owner" : "bz", + "name" : "ao", + "access" : 0, + "descriptor" : "I", + "decoder" : -1905191799 + }, { + "field" : "overheadTextCyclesRemaining", + "owner" : "bz", + "name" : "au", + "access" : 0, + "descriptor" : "I", + "decoder" : 137508815 + }, { + "field" : "overheadTextEffect", + "owner" : "bz", + "name" : "aa", + "access" : 0, + "descriptor" : "I", + "decoder" : 541000549 + }, { + "field" : "pathLength", + "owner" : "bz", + "name" : "cu", + "access" : 0, + "descriptor" : "I", + "decoder" : -2033082375 + }, { + "field" : "pathTraversed", + "owner" : "bz", + "name" : "cn", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "pathX", + "owner" : "bz", + "name" : "cb", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "pathY", + "owner" : "bz", + "name" : "ck", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "playerCycle", + "owner" : "bz", + "name" : "ak", + "access" : 0, + "descriptor" : "I", + "decoder" : 141226463 + }, { + "field" : "readySequence", + "owner" : "bz", + "name" : "aw", + "access" : 0, + "descriptor" : "I", + "decoder" : -299122235 + }, { + "field" : "runSequence", + "owner" : "bz", + "name" : "as", + "access" : 0, + "descriptor" : "I", + "decoder" : 1708570917 + }, { + "field" : "sequence", + "owner" : "bz", + "name" : "bu", + "access" : 0, + "descriptor" : "I", + "decoder" : 323216015 + }, { + "field" : "sequenceDelay", + "owner" : "bz", + "name" : "br", + "access" : 0, + "descriptor" : "I", + "decoder" : -134491649 + }, { + "field" : "sequenceFrame", + "owner" : "bz", + "name" : "bm", + "access" : 0, + "descriptor" : "I", + "decoder" : 1425662251 + }, { + "field" : "sequenceFrameCycle", + "owner" : "bz", + "name" : "bl", + "access" : 0, + "descriptor" : "I", + "decoder" : -1753867715 + }, { + "field" : "size", + "owner" : "bz", + "name" : "ah", + "access" : 0, + "descriptor" : "I", + "decoder" : -1357622739 + }, { + "field" : "spotAnimation", + "owner" : "bz", + "name" : "bi", + "access" : 0, + "descriptor" : "I", + "decoder" : -220610999 + }, { + "field" : "spotAnimationFrame", + "owner" : "bz", + "name" : "bz", + "access" : 0, + "descriptor" : "I", + "decoder" : -2125404733 + }, { + "field" : "spotAnimationFrameCycle", + "owner" : "bz", + "name" : "bg", + "access" : 0, + "descriptor" : "I", + "decoder" : 330334599 + }, { + "field" : "targetIndex", + "owner" : "bz", + "name" : "bk", + "access" : 0, + "descriptor" : "I", + "decoder" : -1387109107 + }, { + "field" : "turnLeftSequence", + "owner" : "bz", + "name" : "al", + "access" : 0, + "descriptor" : "I", + "decoder" : -831787909 + }, { + "field" : "turnRightSequence", + "owner" : "bz", + "name" : "ab", + "access" : 0, + "descriptor" : "I", + "decoder" : 1788714977 + }, { + "field" : "walkBackSequence", + "owner" : "bz", + "name" : "at", + "access" : 0, + "descriptor" : "I", + "decoder" : -1598871111 + }, { + "field" : "walkLeftSequence", + "owner" : "bz", + "name" : "ad", + "access" : 0, + "descriptor" : "I", + "decoder" : -568830521 + }, { + "field" : "walkRightSequence", + "owner" : "bz", + "name" : "ap", + "access" : 0, + "descriptor" : "I", + "decoder" : -257240117 + }, { + "field" : "walkSequence", + "owner" : "bz", + "name" : "ae", + "access" : 0, + "descriptor" : "I", + "decoder" : -2075997699 + }, { + "field" : "x", + "owner" : "bz", + "name" : "av", + "access" : 0, + "descriptor" : "I", + "decoder" : -1573449469 + }, { + "field" : "y", + "owner" : "bz", + "name" : "ar", + "access" : 0, + "descriptor" : "I", + "decoder" : 676600595 + }, { + "field" : "__ay", + "owner" : "bz", + "name" : "ay", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "__az", + "owner" : "bz", + "name" : "az", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "__ac", + "owner" : "bz", + "name" : "ac", + "access" : 0, + "descriptor" : "I", + "decoder" : 1439711403 + }, { + "field" : "__bc", + "owner" : "bz", + "name" : "bc", + "access" : 0, + "descriptor" : "I", + "decoder" : 139384875 + }, { + "field" : "__be", + "owner" : "bz", + "name" : "be", + "access" : 0, + "descriptor" : "I", + "decoder" : 837989037 + }, { + "field" : "__bf", + "owner" : "bz", + "name" : "bf", + "access" : 0, + "descriptor" : "I", + "decoder" : 2121599561 + }, { + "field" : "__bh", + "owner" : "bz", + "name" : "bh", + "access" : 0, + "descriptor" : "I", + "decoder" : 280591281 + }, { + "field" : "__bj", + "owner" : "bz", + "name" : "bj", + "access" : 0, + "descriptor" : "I", + "decoder" : -1523249259 + }, { + "field" : "__bt", + "owner" : "bz", + "name" : "bt", + "access" : 0, + "descriptor" : "I", + "decoder" : 886371765 + }, { + "field" : "__bv", + "owner" : "bz", + "name" : "bv", + "access" : 0, + "descriptor" : "I", + "decoder" : -1857513783 + }, { + "field" : "__bw", + "owner" : "bz", + "name" : "bw", + "access" : 0, + "descriptor" : "I", + "decoder" : -1630403001 + }, { + "field" : "__ch", + "owner" : "bz", + "name" : "ch", + "access" : 0, + "descriptor" : "I", + "decoder" : 1584102533 + }, { + "field" : "__cj", + "owner" : "bz", + "name" : "cj", + "access" : 0, + "descriptor" : "I", + "decoder" : -336931157 + }, { + "field" : "__cm", + "owner" : "bz", + "name" : "cm", + "access" : 0, + "descriptor" : "I", + "decoder" : 1252341007 + }, { + "field" : "__cq", + "owner" : "bz", + "name" : "cq", + "access" : 0, + "descriptor" : "I", + "decoder" : -1583514013 + }, { + "field" : "__cr", + "owner" : "bz", + "name" : "cr", + "access" : 0, + "descriptor" : "I", + "decoder" : 1367256299 + }, { + "field" : "__cv", + "owner" : "bz", + "name" : "cv", + "access" : 0, + "descriptor" : "I", + "decoder" : -1723834619 + } ], + "methods" : [ { + "method" : "addHealthBar", + "owner" : "bz", + "name" : "bq", + "access" : 16, + "parameters" : [ "healthBarDefinition", "cycle", "n0", "n1", "n2", "n3" ], + "descriptor" : "(IIIIIIB)V" + }, { + "method" : "addHitmark", + "owner" : "bz", + "name" : "bs", + "access" : 16, + "parameters" : [ "type", "value", "type2", "value2", "cycle", "cycle2" ], + "descriptor" : "(IIIIIII)V" + }, { + "method" : "isVisible", + "owner" : "bz", + "name" : "z", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)Z" + }, { + "method" : "removeHealthBar", + "owner" : "bz", + "name" : "bn", + "access" : 16, + "parameters" : [ "healthBarDefinition" ], + "descriptor" : "(IS)V" + }, { + "method" : "__bb_143", + "owner" : "bz", + "name" : "bb", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(I)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "World", + "name" : "bt", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "activity", + "owner" : "bt", + "name" : "a", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "host", + "owner" : "bt", + "name" : "i", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "id", + "owner" : "bt", + "name" : "d", + "access" : 0, + "descriptor" : "I", + "decoder" : -144265493 + }, { + "field" : "index", + "owner" : "bt", + "name" : "j", + "access" : 0, + "descriptor" : "I", + "decoder" : 1147427427 + }, { + "field" : "location", + "owner" : "bt", + "name" : "z", + "access" : 0, + "descriptor" : "I", + "decoder" : 1942858323 + }, { + "field" : "population", + "owner" : "bt", + "name" : "n", + "access" : 0, + "descriptor" : "I", + "decoder" : 1863464125 + }, { + "field" : "properties", + "owner" : "bt", + "name" : "k", + "access" : 0, + "descriptor" : "I", + "decoder" : 956991319 + } ], + "methods" : [ { + "method" : "__e_144", + "owner" : "bt", + "name" : "e", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "__x_145", + "owner" : "bt", + "name" : "x", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)Z" + }, { + "method" : "__d_146", + "owner" : "bt", + "name" : "d", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "__a_147", + "owner" : "bt", + "name" : "a", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "__z_148", + "owner" : "bt", + "name" : "z", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)Z" + }, { + "method" : "__j_149", + "owner" : "bt", + "name" : "j", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "ClientPreferences", + "name" : "bf", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "hideUsername", + "owner" : "bf", + "name" : "g", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "parameters", + "owner" : "bf", + "name" : "l", + "access" : 0, + "descriptor" : "Ljava/util/LinkedHashMap;" + }, { + "field" : "rememberedUsername", + "owner" : "bf", + "name" : "u", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "roofsHidden", + "owner" : "bf", + "name" : "q", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "titleMusicDisabled", + "owner" : "bf", + "name" : "w", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "windowMode", + "owner" : "bf", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : -359530975 + } ], + "methods" : [ { + "method" : "toBuffer", + "owner" : "bf", + "name" : "f", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)Lgr;" + }, { + "method" : "__m_150", + "owner" : "bf", + "name" : "m", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(ZI)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + }, { + "access" : 0, + "descriptor" : "(Lgr;)V" + } ] +}, { + "class" : "FriendSystem", + "name" : "bh", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "friendsList", + "owner" : "bh", + "name" : "o", + "access" : 17, + "descriptor" : "Lkg;" + }, { + "field" : "ignoreList", + "owner" : "bh", + "name" : "u", + "access" : 17, + "descriptor" : "Lkj;" + }, { + "field" : "loginType", + "owner" : "bh", + "name" : "w", + "access" : 16, + "descriptor" : "Llx;" + }, { + "field" : "__g", + "owner" : "bh", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : 1477282369 + } ], + "methods" : [ { + "method" : "clear", + "owner" : "bh", + "name" : "o", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "removeFriend", + "owner" : "bh", + "name" : "z", + "access" : 16, + "parameters" : [ "name" ], + "descriptor" : "(Ljava/lang/String;I)V" + }, { + "method" : "removeIgnore", + "owner" : "bh", + "name" : "j", + "access" : 16, + "parameters" : [ "name" ], + "descriptor" : "(Ljava/lang/String;I)V" + }, { + "method" : "__m_151", + "owner" : "bh", + "name" : "m", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)Z" + }, { + "method" : "__f_152", + "owner" : "bh", + "name" : "f", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__q_153", + "owner" : "bh", + "name" : "q", + "access" : 16, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Lgr;II)V" + }, { + "method" : "__w_154", + "owner" : "bh", + "name" : "w", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__u_155", + "owner" : "bh", + "name" : "u", + "access" : 16, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Lkp;ZI)Z" + }, { + "method" : "__g_156", + "owner" : "bh", + "name" : "g", + "access" : 16, + "parameters" : [ "arg0" ], + "descriptor" : "(Lkp;I)Z" + }, { + "method" : "__l_157", + "owner" : "bh", + "name" : "l", + "access" : 16, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/lang/String;I)V" + }, { + "method" : "__e_158", + "owner" : "bh", + "name" : "e", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(B)Z" + }, { + "method" : "__x_159", + "owner" : "bh", + "name" : "x", + "access" : 16, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/lang/String;B)V" + }, { + "method" : "__a_160", + "owner" : "bh", + "name" : "a", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(B)Z" + }, { + "method" : "__t_161", + "owner" : "bh", + "name" : "t", + "access" : 16, + "parameters" : [ "arg0" ], + "descriptor" : "(Lkp;S)Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Llx;)V" + } ] +}, { + "class" : "ObjectSound", + "name" : "be", + "super" : "gw", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "obj", + "owner" : "be", + "name" : "a", + "access" : 0, + "descriptor" : "Ljr;" + }, { + "field" : "soundEffectId", + "owner" : "be", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : -731474443 + }, { + "field" : "soundEffectIds", + "owner" : "be", + "name" : "k", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "stream1", + "owner" : "be", + "name" : "e", + "access" : 0, + "descriptor" : "Lds;" + }, { + "field" : "stream2", + "owner" : "be", + "name" : "i", + "access" : 0, + "descriptor" : "Lds;" + }, { + "field" : "__d", + "owner" : "be", + "name" : "d", + "access" : 0, + "descriptor" : "I", + "decoder" : 1748890449 + }, { + "field" : "__f", + "owner" : "be", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 647270745 + }, { + "field" : "__g", + "owner" : "be", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : 1344558633 + }, { + "field" : "__n", + "owner" : "be", + "name" : "n", + "access" : 0, + "descriptor" : "I", + "decoder" : -1041508847 + }, { + "field" : "__o", + "owner" : "be", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : -211591209 + }, { + "field" : "__q", + "owner" : "be", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -800464493 + }, { + "field" : "__u", + "owner" : "be", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : 512258949 + }, { + "field" : "__w", + "owner" : "be", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : -85911525 + }, { + "field" : "__x", + "owner" : "be", + "name" : "x", + "access" : 0, + "descriptor" : "I", + "decoder" : -1608400407 + } ], + "methods" : [ { + "method" : "set", + "owner" : "be", + "name" : "f", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Npc", + "name" : "cv", + "super" : "bz", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "definition", + "owner" : "cv", + "name" : "m", + "access" : 0, + "descriptor" : "Ljz;" + } ], + "methods" : [ { + "method" : "getModel", + "owner" : "cv", + "name" : "e", + "access" : 20, + "parameters" : [ ], + "descriptor" : "(I)Ldu;" + }, { + "method" : "isVisible", + "owner" : "cv", + "name" : "z", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(B)Z" + }, { + "method" : "__m_162", + "owner" : "cv", + "name" : "m", + "access" : 16, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(IBI)V" + }, { + "method" : "__f_163", + "owner" : "cv", + "name" : "f", + "access" : 16, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(IIZI)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Script", + "name" : "cg", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "intArgumentCount", + "owner" : "cg", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : -1077473933 + }, { + "field" : "intOperands", + "owner" : "cg", + "name" : "q", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "localIntCount", + "owner" : "cg", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : 1952727759 + }, { + "field" : "localStringCount", + "owner" : "cg", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : -1124477681 + }, { + "field" : "opcodes", + "owner" : "cg", + "name" : "f", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "stringArgumentCount", + "owner" : "cg", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : -503680987 + }, { + "field" : "stringOperands", + "owner" : "cg", + "name" : "w", + "access" : 0, + "descriptor" : "[Ljava/lang/String;" + }, { + "field" : "switches", + "owner" : "cg", + "name" : "e", + "access" : 0, + "descriptor" : "[Llh;" + } ], + "methods" : [ { + "method" : "__o_164", + "owner" : "cg", + "name" : "o", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(II)[Llh;" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "PacketWriter", + "name" : "cl", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "buffer", + "owner" : "cl", + "name" : "w", + "access" : 0, + "descriptor" : "Lgr;" + }, { + "field" : "isaacCipher", + "owner" : "cl", + "name" : "o", + "access" : 1, + "descriptor" : "Lhn;" + }, { + "field" : "packetBuffer", + "owner" : "cl", + "name" : "u", + "access" : 0, + "descriptor" : "Lhx;" + }, { + "field" : "packetBufferNodes", + "owner" : "cl", + "name" : "f", + "access" : 0, + "descriptor" : "Lja;" + }, { + "field" : "serverPacket0", + "owner" : "cl", + "name" : "g", + "access" : 0, + "descriptor" : "Lge;" + }, { + "field" : "serverPacket0Length", + "owner" : "cl", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : -1986766063 + }, { + "field" : "socket0", + "owner" : "cl", + "name" : "m", + "access" : 0, + "descriptor" : "Lfu;" + }, { + "field" : "__e", + "owner" : "cl", + "name" : "e", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "__i", + "owner" : "cl", + "name" : "i", + "access" : 0, + "descriptor" : "Lge;" + }, { + "field" : "__k", + "owner" : "cl", + "name" : "k", + "access" : 0, + "descriptor" : "Lge;" + }, { + "field" : "__n", + "owner" : "cl", + "name" : "n", + "access" : 0, + "descriptor" : "Lge;" + }, { + "field" : "__d", + "owner" : "cl", + "name" : "d", + "access" : 0, + "descriptor" : "I", + "decoder" : 1672229609 + }, { + "field" : "__q", + "owner" : "cl", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -1028046199 + }, { + "field" : "__x", + "owner" : "cl", + "name" : "x", + "access" : 0, + "descriptor" : "I", + "decoder" : 120570975 + } ], + "methods" : [ { + "method" : "close", + "owner" : "cl", + "name" : "o", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "getSocket", + "owner" : "cl", + "name" : "g", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)Lfu;" + }, { + "method" : "removeSocket", + "owner" : "cl", + "name" : "u", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "setSocket", + "owner" : "cl", + "name" : "w", + "access" : 0, + "parameters" : [ "socket" ], + "descriptor" : "(Lfu;B)V" + }, { + "method" : "__m_165", + "owner" : "cl", + "name" : "m", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__f_166", + "owner" : "cl", + "name" : "f", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__q_167", + "owner" : "cl", + "name" : "q", + "access" : 17, + "parameters" : [ "arg0" ], + "descriptor" : "(Lgg;I)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "PcmStreamMixer", + "name" : "ct", + "super" : "dc", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "subStreams", + "owner" : "ct", + "name" : "m", + "access" : 0, + "descriptor" : "Lje;" + }, { + "field" : "__o", + "owner" : "ct", + "name" : "o", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__q", + "owner" : "ct", + "name" : "q", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__f", + "owner" : "ct", + "name" : "f", + "access" : 0, + "descriptor" : "Lje;" + } ], + "methods" : [ { + "method" : "addSubStream", + "owner" : "ct", + "name" : "m", + "access" : 49, + "parameters" : [ "subStream" ], + "descriptor" : "(Ldc;)V" + }, { + "method" : "firstSubStream", + "owner" : "ct", + "name" : "u", + "access" : 4, + "parameters" : [ ], + "descriptor" : "()Ldc;" + }, { + "method" : "nextSubStream", + "owner" : "ct", + "name" : "g", + "access" : 4, + "parameters" : [ ], + "descriptor" : "()Ldc;" + }, { + "method" : "removeSubStream", + "owner" : "ct", + "name" : "f", + "access" : 49, + "parameters" : [ "subStream" ], + "descriptor" : "(Ldc;)V" + }, { + "method" : "skipSubStreams", + "owner" : "ct", + "name" : "a", + "access" : 0, + "parameters" : [ "length" ], + "descriptor" : "(I)V" + }, { + "method" : "updateSubStreams", + "owner" : "ct", + "name" : "x", + "access" : 0, + "parameters" : [ "buffer", "start", "end" ], + "descriptor" : "([III)V" + }, { + "method" : "__q_168", + "owner" : "ct", + "name" : "q", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__w_169", + "owner" : "ct", + "name" : "w", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Lgw;Ldf;)V" + }, { + "method" : "__o_170", + "owner" : "ct", + "name" : "o", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(Ldf;)V" + }, { + "method" : "__l_171", + "owner" : "ct", + "name" : "l", + "access" : 4, + "parameters" : [ ], + "descriptor" : "()I" + }, { + "method" : "__e_172", + "owner" : "ct", + "name" : "e", + "access" : 49, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "([III)V" + }, { + "method" : "__d_173", + "owner" : "ct", + "name" : "d", + "access" : 49, + "parameters" : [ "arg0" ], + "descriptor" : "(I)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "SoundEffect", + "name" : "ci", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "end", + "owner" : "ci", + "name" : "w", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "instruments", + "owner" : "ci", + "name" : "f", + "access" : 0, + "descriptor" : "[Ldb;" + }, { + "field" : "start", + "owner" : "ci", + "name" : "q", + "access" : 0, + "descriptor" : "I" + } ], + "methods" : [ { + "method" : "mix", + "owner" : "ci", + "name" : "w", + "access" : 16, + "parameters" : [ ], + "descriptor" : "()[B" + }, { + "method" : "toRawSound", + "owner" : "ci", + "name" : "f", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Lcx;" + }, { + "method" : "__q_174", + "owner" : "ci", + "name" : "q", + "access" : 17, + "parameters" : [ ], + "descriptor" : "()I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Lgr;)V" + } ] +}, { + "class" : "MusicSample", + "name" : "cd", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "end", + "owner" : "cd", + "name" : "o", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "sampleCount", + "owner" : "cd", + "name" : "q", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "sampleRate", + "owner" : "cd", + "name" : "f", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "samples", + "owner" : "cd", + "name" : "ac", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "start", + "owner" : "cd", + "name" : "w", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__b", + "owner" : "cd", + "name" : "b", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "__u", + "owner" : "cd", + "name" : "u", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "__m", + "owner" : "cd", + "name" : "m", + "access" : 0, + "descriptor" : "[[B" + }, { + "field" : "__t", + "owner" : "cd", + "name" : "t", + "access" : 0, + "descriptor" : "[F" + }, { + "field" : "__ah", + "owner" : "cd", + "name" : "ah", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__ay", + "owner" : "cd", + "name" : "ay", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__h", + "owner" : "cd", + "name" : "h", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__y", + "owner" : "cd", + "name" : "y", + "access" : 0, + "descriptor" : "I" + } ], + "methods" : [ { + "method" : "read", + "owner" : "cd", + "name" : "o", + "access" : 0, + "descriptor" : "([B)V" + }, { + "method" : "toRawSound", + "owner" : "cd", + "name" : "x", + "access" : 0, + "descriptor" : "([I)Lcx;" + }, { + "method" : "__g_175", + "owner" : "cd", + "name" : "g", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(I)[F" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "([B)V" + } ] +}, { + "class" : "RawSound", + "name" : "cx", + "super" : "dd", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "end", + "owner" : "cx", + "name" : "w", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "sampleRate", + "owner" : "cx", + "name" : "m", + "access" : 1, + "descriptor" : "I" + }, { + "field" : "samples", + "owner" : "cx", + "name" : "f", + "access" : 1, + "descriptor" : "[B" + }, { + "field" : "start", + "owner" : "cx", + "name" : "q", + "access" : 1, + "descriptor" : "I" + }, { + "field" : "__o", + "owner" : "cx", + "name" : "o", + "access" : 1, + "descriptor" : "Z" + } ], + "methods" : [ { + "method" : "resample", + "owner" : "cx", + "name" : "m", + "access" : 1, + "parameters" : [ "decimator" ], + "descriptor" : "(Ldp;)Lcx;" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(I[BII)V" + }, { + "access" : 0, + "descriptor" : "(I[BIIZ)V" + } ] +}, { + "class" : "PcmPlayer", + "name" : "co", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "capacity", + "owner" : "co", + "name" : "s", + "access" : 0, + "descriptor" : "I", + "decoder" : -1671644011 + }, { + "field" : "frequency", + "owner" : "co", + "name" : "t", + "access" : 0, + "descriptor" : "I", + "decoder" : 951871565 + }, { + "field" : "nextPosition", + "owner" : "co", + "name" : "r", + "access" : 0, + "descriptor" : "I", + "decoder" : -1586398263 + }, { + "field" : "retryTimeMs", + "owner" : "co", + "name" : "h", + "access" : 0, + "descriptor" : "J", + "decoder" : -200656835998283411 + }, { + "field" : "samples", + "owner" : "co", + "name" : "i", + "access" : 4, + "descriptor" : "[I" + }, { + "field" : "stream0", + "owner" : "co", + "name" : "a", + "access" : 0, + "descriptor" : "Ldc;" + }, { + "field" : "timeMs", + "owner" : "co", + "name" : "j", + "access" : 0, + "descriptor" : "J", + "decoder" : -8124323644430480811 + }, { + "field" : "__v", + "owner" : "co", + "name" : "v", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "__ah", + "owner" : "co", + "name" : "ah", + "access" : 0, + "descriptor" : "[Ldc;" + }, { + "field" : "__ay", + "owner" : "co", + "name" : "ay", + "access" : 0, + "descriptor" : "[Ldc;" + }, { + "field" : "__ac", + "owner" : "co", + "name" : "ac", + "access" : 0, + "descriptor" : "I", + "decoder" : -645495803 + }, { + "field" : "__b", + "owner" : "co", + "name" : "b", + "access" : 0, + "descriptor" : "I", + "decoder" : 48658021 + }, { + "field" : "__c", + "owner" : "co", + "name" : "c", + "access" : 0, + "descriptor" : "I", + "decoder" : 1624619697 + }, { + "field" : "__y", + "owner" : "co", + "name" : "y", + "access" : 0, + "descriptor" : "I", + "decoder" : 1907203055 + }, { + "field" : "__z", + "owner" : "co", + "name" : "z", + "access" : 0, + "descriptor" : "I", + "decoder" : 1125788887 + }, { + "field" : "__p", + "owner" : "co", + "name" : "p", + "access" : 0, + "descriptor" : "J", + "decoder" : -8188447292076890879 + } ], + "methods" : [ { + "method" : "close", + "owner" : "co", + "name" : "o", + "access" : 4, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "discard", + "owner" : "co", + "name" : "u", + "access" : 4, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "fill", + "owner" : "co", + "name" : "aw", + "access" : 16, + "parameters" : [ "buffer", "length" ], + "descriptor" : "([II)V" + }, { + "method" : "init", + "owner" : "co", + "name" : "m", + "access" : 4, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "open", + "owner" : "co", + "name" : "f", + "access" : 4, + "parameters" : [ "bufferSize" ], + "descriptor" : "(II)V" + }, { + "method" : "position", + "owner" : "co", + "name" : "q", + "access" : 4, + "parameters" : [ ], + "descriptor" : "(B)I" + }, { + "method" : "run", + "owner" : "co", + "name" : "ar", + "access" : 49, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "setStream", + "owner" : "co", + "name" : "av", + "access" : 49, + "parameters" : [ "stream" ], + "descriptor" : "(Ldc;I)V" + }, { + "method" : "shutdown", + "owner" : "co", + "name" : "ah", + "access" : 49, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "skip", + "owner" : "co", + "name" : "ak", + "access" : 16, + "parameters" : [ "length" ], + "descriptor" : "(II)V" + }, { + "method" : "tryDiscard", + "owner" : "co", + "name" : "ay", + "access" : 49, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "write", + "owner" : "co", + "name" : "w", + "access" : 4, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__ac_176", + "owner" : "co", + "name" : "ac", + "access" : 17, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__ab_177", + "owner" : "co", + "name" : "ab", + "access" : 16, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ldc;II)V" + } ], + "constructors" : [ { + "access" : 4, + "descriptor" : "()V" + } ] +}, { + "class" : "SoundSystem", + "name" : "dx", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "java.lang.Runnable" ], + "fields" : [ { + "field" : "players", + "owner" : "dx", + "name" : "m", + "access" : 64, + "descriptor" : "[Lco;" + } ], + "methods" : [ { + "method" : "__run_178", + "owner" : "dx", + "name" : "run", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "PcmStreamMixerListener", + "name" : "df", + "super" : "gw", + "access" : 1057, + "interfaces" : [ ], + "fields" : [ { + "field" : "__m", + "owner" : "df", + "name" : "m", + "access" : 0, + "descriptor" : "I" + } ], + "methods" : [ { + "method" : "remove2", + "owner" : "df", + "name" : "m", + "access" : 1024, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "update", + "owner" : "df", + "name" : "f", + "access" : 1024, + "parameters" : [ "mixer" ], + "descriptor" : "(Lct;)I" + } ], + "constructors" : [ ] +}, { + "class" : "RawPcmStream", + "name" : "ds", + "super" : "dc", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "end", + "owner" : "ds", + "name" : "d", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "start", + "owner" : "ds", + "name" : "x", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__k", + "owner" : "ds", + "name" : "k", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "__a", + "owner" : "ds", + "name" : "a", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__e", + "owner" : "ds", + "name" : "e", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__f", + "owner" : "ds", + "name" : "f", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__g", + "owner" : "ds", + "name" : "g", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__i", + "owner" : "ds", + "name" : "i", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__l", + "owner" : "ds", + "name" : "l", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__m", + "owner" : "ds", + "name" : "m", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__n", + "owner" : "ds", + "name" : "n", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__o", + "owner" : "ds", + "name" : "o", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__q", + "owner" : "ds", + "name" : "q", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__u", + "owner" : "ds", + "name" : "u", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__z", + "owner" : "ds", + "name" : "z", + "access" : 0, + "descriptor" : "I" + } ], + "methods" : [ { + "method" : "__az_179", + "owner" : "ds", + "name" : "az", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()I" + }, { + "method" : "__o_180", + "owner" : "ds", + "name" : "o", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__x_181", + "owner" : "ds", + "name" : "x", + "access" : 33, + "parameters" : [ "arg0" ], + "descriptor" : "(I)V" + }, { + "method" : "__a_182", + "owner" : "ds", + "name" : "a", + "access" : 33, + "parameters" : [ "arg0" ], + "descriptor" : "(I)V" + }, { + "method" : "__z_183", + "owner" : "ds", + "name" : "z", + "access" : 32, + "parameters" : [ "arg0" ], + "descriptor" : "(I)V" + }, { + "method" : "__j_184", + "owner" : "ds", + "name" : "j", + "access" : 32, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(II)V" + }, { + "method" : "__s_185", + "owner" : "ds", + "name" : "s", + "access" : 33, + "parameters" : [ ], + "descriptor" : "()I" + }, { + "method" : "__t_186", + "owner" : "ds", + "name" : "t", + "access" : 33, + "parameters" : [ ], + "descriptor" : "()I" + }, { + "method" : "__y_187", + "owner" : "ds", + "name" : "y", + "access" : 33, + "parameters" : [ "arg0" ], + "descriptor" : "(I)V" + }, { + "method" : "__h_188", + "owner" : "ds", + "name" : "h", + "access" : 33, + "parameters" : [ "arg0" ], + "descriptor" : "(Z)V" + }, { + "method" : "__b_189", + "owner" : "ds", + "name" : "b", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__c_190", + "owner" : "ds", + "name" : "c", + "access" : 33, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(II)V" + }, { + "method" : "__p_191", + "owner" : "ds", + "name" : "p", + "access" : 33, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(III)V" + }, { + "method" : "__v_192", + "owner" : "ds", + "name" : "v", + "access" : 33, + "parameters" : [ "arg0" ], + "descriptor" : "(I)V" + }, { + "method" : "__ah_193", + "owner" : "ds", + "name" : "ah", + "access" : 33, + "parameters" : [ "arg0" ], + "descriptor" : "(I)V" + }, { + "method" : "__ab_194", + "owner" : "ds", + "name" : "ab", + "access" : 33, + "parameters" : [ ], + "descriptor" : "()I" + }, { + "method" : "__ae_195", + "owner" : "ds", + "name" : "ae", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Z" + }, { + "method" : "__at_196", + "owner" : "ds", + "name" : "at", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Z" + }, { + "method" : "__u_197", + "owner" : "ds", + "name" : "u", + "access" : 4, + "parameters" : [ ], + "descriptor" : "()Ldc;" + }, { + "method" : "__g_198", + "owner" : "ds", + "name" : "g", + "access" : 4, + "parameters" : [ ], + "descriptor" : "()Ldc;" + }, { + "method" : "__l_199", + "owner" : "ds", + "name" : "l", + "access" : 4, + "parameters" : [ ], + "descriptor" : "()I" + }, { + "method" : "__e_200", + "owner" : "ds", + "name" : "e", + "access" : 33, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "([III)V" + }, { + "method" : "__d_201", + "owner" : "ds", + "name" : "d", + "access" : 33, + "parameters" : [ "arg0" ], + "descriptor" : "(I)V" + }, { + "method" : "__ad_202", + "owner" : "ds", + "name" : "ad", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], + "descriptor" : "([IIIII)I" + }, { + "method" : "__ap_203", + "owner" : "ds", + "name" : "ap", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], + "descriptor" : "([IIIII)I" + }, { + "method" : "__au_204", + "owner" : "ds", + "name" : "au", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Lcx;II)V" + }, { + "access" : 0, + "descriptor" : "(Lcx;III)V" + } ] +}, { + "class" : "AudioFilter", + "name" : "di", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__m", + "owner" : "di", + "name" : "m", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__o", + "owner" : "di", + "name" : "o", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__q", + "owner" : "di", + "name" : "q", + "access" : 0, + "descriptor" : "[[[I" + }, { + "field" : "__w", + "owner" : "di", + "name" : "w", + "access" : 0, + "descriptor" : "[[[I" + } ], + "methods" : [ { + "method" : "__m_205", + "owner" : "di", + "name" : "m", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(IIF)F" + }, { + "method" : "__q_206", + "owner" : "di", + "name" : "q", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(IIF)F" + }, { + "method" : "__w_207", + "owner" : "di", + "name" : "w", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(IF)I" + }, { + "method" : "__o_208", + "owner" : "di", + "name" : "o", + "access" : 16, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Lgr;Lde;)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "PcmStream", + "name" : "dc", + "super" : "gw", + "access" : 1057, + "interfaces" : [ ], + "fields" : [ { + "field" : "active", + "owner" : "dc", + "name" : "w", + "access" : 64, + "descriptor" : "Z" + }, { + "field" : "after", + "owner" : "dc", + "name" : "j", + "access" : 0, + "descriptor" : "Ldc;" + }, { + "field" : "sound", + "owner" : "dc", + "name" : "t", + "access" : 0, + "descriptor" : "Ldd;" + }, { + "field" : "__s", + "owner" : "dc", + "name" : "s", + "access" : 0, + "descriptor" : "I" + } ], + "methods" : [ { + "method" : "fill", + "owner" : "dc", + "name" : "e", + "access" : 1028, + "parameters" : [ "buffer", "start", "end" ], + "descriptor" : "([III)V" + }, { + "method" : "firstSubStream", + "owner" : "dc", + "name" : "u", + "access" : 1028, + "parameters" : [ ], + "descriptor" : "()Ldc;" + }, { + "method" : "nextSubStream", + "owner" : "dc", + "name" : "g", + "access" : 1028, + "parameters" : [ ], + "descriptor" : "()Ldc;" + }, { + "method" : "skip", + "owner" : "dc", + "name" : "d", + "access" : 1028, + "parameters" : [ "length" ], + "descriptor" : "(I)V" + }, { + "method" : "update", + "owner" : "dc", + "name" : "ef", + "access" : 16, + "parameters" : [ "buffer", "start", "end" ], + "descriptor" : "([III)V" + }, { + "method" : "__az_209", + "owner" : "dc", + "name" : "az", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()I" + }, { + "method" : "__l_210", + "owner" : "dc", + "name" : "l", + "access" : 1028, + "parameters" : [ ], + "descriptor" : "()I" + } ], + "constructors" : [ { + "access" : 4, + "descriptor" : "()V" + } ] +}, { + "class" : "Instrument", + "name" : "db", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "delayDecay", + "owner" : "db", + "name" : "n", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "delayTime", + "owner" : "db", + "name" : "k", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "duration", + "owner" : "db", + "name" : "z", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "filter", + "owner" : "db", + "name" : "i", + "access" : 0, + "descriptor" : "Ldi;" + }, { + "field" : "offset", + "owner" : "db", + "name" : "j", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "oscillatorDelays", + "owner" : "db", + "name" : "d", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "oscillatorPitch", + "owner" : "db", + "name" : "x", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "oscillatorVolume", + "owner" : "db", + "name" : "e", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__a", + "owner" : "db", + "name" : "a", + "access" : 0, + "descriptor" : "Lde;" + }, { + "field" : "__f", + "owner" : "db", + "name" : "f", + "access" : 0, + "descriptor" : "Lde;" + }, { + "field" : "__g", + "owner" : "db", + "name" : "g", + "access" : 0, + "descriptor" : "Lde;" + }, { + "field" : "__l", + "owner" : "db", + "name" : "l", + "access" : 0, + "descriptor" : "Lde;" + }, { + "field" : "__m", + "owner" : "db", + "name" : "m", + "access" : 0, + "descriptor" : "Lde;" + }, { + "field" : "__o", + "owner" : "db", + "name" : "o", + "access" : 0, + "descriptor" : "Lde;" + }, { + "field" : "__q", + "owner" : "db", + "name" : "q", + "access" : 0, + "descriptor" : "Lde;" + }, { + "field" : "__u", + "owner" : "db", + "name" : "u", + "access" : 0, + "descriptor" : "Lde;" + }, { + "field" : "__w", + "owner" : "db", + "name" : "w", + "access" : 0, + "descriptor" : "Lde;" + } ], + "methods" : [ { + "method" : "decode", + "owner" : "db", + "name" : "q", + "access" : 16, + "parameters" : [ "buffer" ], + "descriptor" : "(Lgr;)V" + }, { + "method" : "evaluateWave", + "owner" : "db", + "name" : "f", + "access" : 16, + "descriptor" : "(III)I" + }, { + "method" : "synthesize", + "owner" : "db", + "name" : "m", + "access" : 16, + "descriptor" : "(II)[I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "BufferedFile", + "name" : "dy", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "accessFile", + "owner" : "dy", + "name" : "m", + "access" : 0, + "descriptor" : "Ldk;" + }, { + "field" : "capacity", + "owner" : "dy", + "name" : "x", + "access" : 0, + "descriptor" : "J", + "decoder" : 2663146692618913943 + }, { + "field" : "readBuffer", + "owner" : "dy", + "name" : "f", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "writeBuffer", + "owner" : "dy", + "name" : "o", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "__g", + "owner" : "dy", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : -1558233611 + }, { + "field" : "__w", + "owner" : "dy", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : -846810907 + }, { + "field" : "__d", + "owner" : "dy", + "name" : "d", + "access" : 0, + "descriptor" : "J", + "decoder" : 5720856138805191881 + }, { + "field" : "__e", + "owner" : "dy", + "name" : "e", + "access" : 0, + "descriptor" : "J", + "decoder" : -3728247331531750871 + }, { + "field" : "__l", + "owner" : "dy", + "name" : "l", + "access" : 0, + "descriptor" : "J", + "decoder" : -6819476051574242871 + }, { + "field" : "__q", + "owner" : "dy", + "name" : "q", + "access" : 0, + "descriptor" : "J", + "decoder" : -7773729680030815835 + }, { + "field" : "__u", + "owner" : "dy", + "name" : "u", + "access" : 0, + "descriptor" : "J", + "decoder" : 5249231081498323007 + } ], + "methods" : [ { + "method" : "close", + "owner" : "dy", + "name" : "m", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "flush", + "owner" : "dy", + "name" : "l", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "length", + "owner" : "dy", + "name" : "q", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)J" + }, { + "method" : "load", + "owner" : "dy", + "name" : "u", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "read", + "owner" : "dy", + "name" : "o", + "access" : 1, + "parameters" : [ "dst", "dstIndex", "length" ], + "descriptor" : "([BIIB)V" + }, { + "method" : "readFill", + "owner" : "dy", + "name" : "w", + "access" : 1, + "parameters" : [ "dst" ], + "descriptor" : "([BI)V" + }, { + "method" : "seek", + "owner" : "dy", + "name" : "f", + "access" : 1, + "parameters" : [ "index" ], + "descriptor" : "(J)V" + }, { + "method" : "write", + "owner" : "dy", + "name" : "g", + "access" : 1, + "parameters" : [ "src", "srcIndex", "length" ], + "descriptor" : "([BIII)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Ldk;II)V" + } ] +}, { + "class" : "AccessFile", + "name" : "dk", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "capacity", + "owner" : "dk", + "name" : "f", + "access" : 0, + "descriptor" : "J", + "decoder" : -5849841282281477349 + }, { + "field" : "file", + "owner" : "dk", + "name" : "m", + "access" : 0, + "descriptor" : "Ljava/io/RandomAccessFile;" + }, { + "field" : "index", + "owner" : "dk", + "name" : "q", + "access" : 0, + "descriptor" : "J", + "decoder" : 7465414039279036117 + } ], + "methods" : [ { + "method" : "close", + "owner" : "dk", + "name" : "q", + "access" : 17, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "closeSync", + "owner" : "dk", + "name" : "w", + "access" : 17, + "parameters" : [ "sync" ], + "descriptor" : "(ZI)V" + }, { + "method" : "length", + "owner" : "dk", + "name" : "o", + "access" : 17, + "parameters" : [ ], + "descriptor" : "(I)J" + }, { + "method" : "read", + "owner" : "dk", + "name" : "u", + "access" : 17, + "parameters" : [ "dst", "dstIndex", "length" ], + "descriptor" : "([BIII)I" + }, { + "method" : "seek", + "owner" : "dk", + "name" : "m", + "access" : 16, + "parameters" : [ "index" ], + "descriptor" : "(J)V" + }, { + "method" : "write", + "owner" : "dk", + "name" : "f", + "access" : 17, + "parameters" : [ "src", "srcIndex", "length" ], + "descriptor" : "([BIIB)V" + }, { + "method" : "__finalize_211", + "owner" : "dk", + "name" : "finalize", + "access" : 4, + "parameters" : [ ], + "descriptor" : "()V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Ljava/io/File;Ljava/lang/String;J)V" + } ] +}, { + "class" : "TextureProvider", + "name" : "dl", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "ei" ], + "fields" : [ { + "field" : "archive", + "owner" : "dl", + "name" : "g", + "access" : 0, + "descriptor" : "Lir;" + }, { + "field" : "brightness0", + "owner" : "dl", + "name" : "o", + "access" : 0, + "descriptor" : "D" + }, { + "field" : "capacity", + "owner" : "dl", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 762273989 + }, { + "field" : "deque", + "owner" : "dl", + "name" : "f", + "access" : 0, + "descriptor" : "Lje;" + }, { + "field" : "remaining", + "owner" : "dl", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : 1130378699 + }, { + "field" : "textureSize", + "owner" : "dl", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : 1124790219 + }, { + "field" : "textures", + "owner" : "dl", + "name" : "m", + "access" : 0, + "descriptor" : "[Ldh;" + } ], + "methods" : [ { + "method" : "animate", + "owner" : "dl", + "name" : "l", + "access" : 1, + "parameters" : [ "n" ], + "descriptor" : "(II)V" + }, { + "method" : "clear", + "owner" : "dl", + "name" : "g", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "isLowDetail", + "owner" : "dl", + "name" : "u", + "access" : 1, + "descriptor" : "(II)Z" + }, { + "method" : "load", + "owner" : "dl", + "name" : "q", + "access" : 1, + "descriptor" : "(II)[I" + }, { + "method" : "setBrightness", + "owner" : "dl", + "name" : "f", + "access" : 1, + "parameters" : [ "brightness" ], + "descriptor" : "(D)V" + }, { + "method" : "__m_212", + "owner" : "dl", + "name" : "m", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__w_213", + "owner" : "dl", + "name" : "w", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(II)I" + }, { + "method" : "__o_214", + "owner" : "dl", + "name" : "o", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(IB)Z" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Lir;Lir;IDI)V" + } ] +}, { + "class" : "ModelData", + "name" : "dw", + "super" : "ex", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "faceAlphas", + "owner" : "dw", + "name" : "d", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "faceColors", + "owner" : "dw", + "name" : "n", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "faceCount", + "owner" : "dw", + "name" : "o", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "faceLabelsAlpha", + "owner" : "dw", + "name" : "r", + "access" : 0, + "descriptor" : "[[I" + }, { + "field" : "faceNormals", + "owner" : "dw", + "name" : "p", + "access" : 0, + "descriptor" : "[Lel;" + }, { + "field" : "faceTextures", + "owner" : "dw", + "name" : "i", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "indices1", + "owner" : "dw", + "name" : "u", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "indices2", + "owner" : "dw", + "name" : "g", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "indices3", + "owner" : "dw", + "name" : "l", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "isBoundsCalculated", + "owner" : "dw", + "name" : "av", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "vertexLabels", + "owner" : "dw", + "name" : "c", + "access" : 0, + "descriptor" : "[[I" + }, { + "field" : "verticesCount", + "owner" : "dw", + "name" : "m", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "verticesX", + "owner" : "dw", + "name" : "f", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "verticesY", + "owner" : "dw", + "name" : "q", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "verticesZ", + "owner" : "dw", + "name" : "w", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__a", + "owner" : "dw", + "name" : "a", + "access" : 0, + "descriptor" : "B" + }, { + "field" : "__e", + "owner" : "dw", + "name" : "e", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "__j", + "owner" : "dw", + "name" : "j", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "__k", + "owner" : "dw", + "name" : "k", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "__x", + "owner" : "dw", + "name" : "x", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "__ag", + "owner" : "dw", + "name" : "ag", + "access" : 0, + "descriptor" : "[Ldq;" + }, { + "field" : "__v", + "owner" : "dw", + "name" : "v", + "access" : 0, + "descriptor" : "[Ldq;" + }, { + "field" : "__ac", + "owner" : "dw", + "name" : "ac", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__ah", + "owner" : "dw", + "name" : "ah", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__ak", + "owner" : "dw", + "name" : "ak", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__ar", + "owner" : "dw", + "name" : "ar", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__ay", + "owner" : "dw", + "name" : "ay", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__z", + "owner" : "dw", + "name" : "z", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__b", + "owner" : "dw", + "name" : "b", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__h", + "owner" : "dw", + "name" : "h", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__s", + "owner" : "dw", + "name" : "s", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "__t", + "owner" : "dw", + "name" : "t", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "__y", + "owner" : "dw", + "name" : "y", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "__aj", + "owner" : "dw", + "name" : "aj", + "access" : 1, + "descriptor" : "S" + }, { + "field" : "__aq", + "owner" : "dw", + "name" : "aq", + "access" : 1, + "descriptor" : "S" + } ], + "methods" : [ { + "method" : "invalidate", + "owner" : "dw", + "name" : "b", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "recolor", + "owner" : "dw", + "name" : "j", + "access" : 1, + "parameters" : [ "from", "to" ], + "descriptor" : "(SS)V" + }, { + "method" : "retexture", + "owner" : "dw", + "name" : "s", + "access" : 1, + "parameters" : [ "from", "to" ], + "descriptor" : "(SS)V" + }, { + "method" : "toModel", + "owner" : "dw", + "name" : "v", + "access" : 17, + "parameters" : [ "a", "b", "c", "d", "e" ], + "descriptor" : "(IIIII)Ldu;" + }, { + "method" : "__f_215", + "owner" : "dw", + "name" : "f", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "([B)V" + }, { + "method" : "__q_216", + "owner" : "dw", + "name" : "q", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "([B)V" + }, { + "method" : "__w_217", + "owner" : "dw", + "name" : "w", + "access" : 16, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ldw;I)I" + }, { + "method" : "__o_218", + "owner" : "dw", + "name" : "o", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Ldw;" + }, { + "method" : "__u_219", + "owner" : "dw", + "name" : "u", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], + "descriptor" : "([[IIIIZI)Ldw;" + }, { + "method" : "__g_220", + "owner" : "dw", + "name" : "g", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__l_221", + "owner" : "dw", + "name" : "l", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__x_222", + "owner" : "dw", + "name" : "x", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__d_223", + "owner" : "dw", + "name" : "d", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__a_224", + "owner" : "dw", + "name" : "a", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(I)V" + }, { + "method" : "__z_225", + "owner" : "dw", + "name" : "z", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(III)V" + }, { + "method" : "__t_226", + "owner" : "dw", + "name" : "t", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__y_227", + "owner" : "dw", + "name" : "y", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(III)V" + }, { + "method" : "__h_228", + "owner" : "dw", + "name" : "h", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__c_229", + "owner" : "dw", + "name" : "c", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + }, { + "access" : 0, + "descriptor" : "([B)V" + }, { + "access" : 1, + "descriptor" : "([Ldw;I)V" + }, { + "access" : 1, + "descriptor" : "(Ldw;ZZZZ)V" + } ] +}, { + "class" : "TileModel", + "name" : "dv", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "isFlat", + "owner" : "dv", + "name" : "d", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "overlayRgb", + "owner" : "dv", + "name" : "a", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "rotation", + "owner" : "dv", + "name" : "n", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "shape", + "owner" : "dv", + "name" : "k", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "underlayRgb", + "owner" : "dv", + "name" : "i", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__e", + "owner" : "dv", + "name" : "e", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__f", + "owner" : "dv", + "name" : "f", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__g", + "owner" : "dv", + "name" : "g", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__l", + "owner" : "dv", + "name" : "l", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__m", + "owner" : "dv", + "name" : "m", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__o", + "owner" : "dv", + "name" : "o", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__q", + "owner" : "dv", + "name" : "q", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__u", + "owner" : "dv", + "name" : "u", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__w", + "owner" : "dv", + "name" : "w", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__x", + "owner" : "dv", + "name" : "x", + "access" : 0, + "descriptor" : "[I" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(IIIIIIIIIIIIIIIIIII)V" + } ] +}, { + "class" : "Texture", + "name" : "dh", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "animationDirection", + "owner" : "dh", + "name" : "d", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "animationSpeed", + "owner" : "dh", + "name" : "k", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "files", + "owner" : "dh", + "name" : "g", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "int1", + "owner" : "dh", + "name" : "o", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "isLoaded", + "owner" : "dh", + "name" : "i", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "pixels", + "owner" : "dh", + "name" : "n", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__u", + "owner" : "dh", + "name" : "u", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "__e", + "owner" : "dh", + "name" : "e", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__l", + "owner" : "dh", + "name" : "l", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__x", + "owner" : "dh", + "name" : "x", + "access" : 0, + "descriptor" : "[I" + } ], + "methods" : [ { + "method" : "animate", + "owner" : "dh", + "name" : "q", + "access" : 0, + "parameters" : [ "n" ], + "descriptor" : "(I)V" + }, { + "method" : "reset", + "owner" : "dh", + "name" : "f", + "access" : 0, + "descriptor" : "()V" + }, { + "method" : "__m_230", + "owner" : "dh", + "name" : "m", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(DILir;)Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Lgr;)V" + } ] +}, { + "class" : "Tile", + "name" : "dj", + "super" : "gw", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "boundaryObject", + "owner" : "dj", + "name" : "g", + "access" : 0, + "descriptor" : "Lej;" + }, { + "field" : "drawGameObjectEdges", + "owner" : "dj", + "name" : "t", + "access" : 0, + "descriptor" : "I", + "decoder" : 769252193 + }, { + "field" : "drawGameObjects", + "owner" : "dj", + "name" : "s", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "drawPrimary", + "owner" : "dj", + "name" : "z", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "drawSecondary", + "owner" : "dj", + "name" : "j", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "floorDecoration", + "owner" : "dj", + "name" : "e", + "access" : 0, + "descriptor" : "Ldo;" + }, { + "field" : "gameObjectEdgeMasks", + "owner" : "dj", + "name" : "n", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "gameObjects", + "owner" : "dj", + "name" : "k", + "access" : 0, + "descriptor" : "[Leh;" + }, { + "field" : "gameObjectsCount", + "owner" : "dj", + "name" : "d", + "access" : 0, + "descriptor" : "I", + "decoder" : -792635627 + }, { + "field" : "gameObjectsEdgeMask", + "owner" : "dj", + "name" : "i", + "access" : 0, + "descriptor" : "I", + "decoder" : 1192947815 + }, { + "field" : "groundItemPile", + "owner" : "dj", + "name" : "x", + "access" : 0, + "descriptor" : "Ldr;" + }, { + "field" : "linkedBelowTile", + "owner" : "dj", + "name" : "c", + "access" : 0, + "descriptor" : "Ldj;" + }, { + "field" : "minPlane", + "owner" : "dj", + "name" : "a", + "access" : 0, + "descriptor" : "I", + "decoder" : -1078135311 + }, { + "field" : "model", + "owner" : "dj", + "name" : "u", + "access" : 0, + "descriptor" : "Ldv;" + }, { + "field" : "originalPlane", + "owner" : "dj", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : 507854577 + }, { + "field" : "paint", + "owner" : "dj", + "name" : "o", + "access" : 0, + "descriptor" : "Leb;" + }, { + "field" : "plane", + "owner" : "dj", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : 1065165981 + }, { + "field" : "wallDecoration", + "owner" : "dj", + "name" : "l", + "access" : 0, + "descriptor" : "Leq;" + }, { + "field" : "x", + "owner" : "dj", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 103024387 + }, { + "field" : "y", + "owner" : "dj", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -561562755 + }, { + "field" : "__b", + "owner" : "dj", + "name" : "b", + "access" : 0, + "descriptor" : "I", + "decoder" : 2030010491 + }, { + "field" : "__h", + "owner" : "dj", + "name" : "h", + "access" : 0, + "descriptor" : "I", + "decoder" : -172066661 + }, { + "field" : "__y", + "owner" : "dj", + "name" : "y", + "access" : 0, + "descriptor" : "I", + "decoder" : 1724493981 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(III)V" + } ] +}, { + "class" : "Model", + "name" : "du", + "super" : "ex", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "bottomY", + "owner" : "du", + "name" : "aj", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "boundsType", + "owner" : "du", + "name" : "aq", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "diameter", + "owner" : "du", + "name" : "ar", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "faceAlphas", + "owner" : "du", + "name" : "j", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "faceColors1", + "owner" : "du", + "name" : "n", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "faceColors2", + "owner" : "du", + "name" : "i", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "faceColors3", + "owner" : "du", + "name" : "a", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "faceLabelsAlpha", + "owner" : "du", + "name" : "v", + "access" : 0, + "descriptor" : "[[I" + }, { + "field" : "faceTextures", + "owner" : "du", + "name" : "t", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "indices1", + "owner" : "du", + "name" : "x", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "indices2", + "owner" : "du", + "name" : "d", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "indices3", + "owner" : "du", + "name" : "k", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "indicesCount", + "owner" : "du", + "name" : "e", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "isSingleTile", + "owner" : "du", + "name" : "ag", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "radius", + "owner" : "du", + "name" : "ac", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "vertexLabels", + "owner" : "du", + "name" : "p", + "access" : 0, + "descriptor" : "[[I" + }, { + "field" : "verticesCount", + "owner" : "du", + "name" : "o", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "verticesX", + "owner" : "du", + "name" : "u", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "verticesY", + "owner" : "du", + "name" : "g", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "verticesZ", + "owner" : "du", + "name" : "l", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "xMid", + "owner" : "du", + "name" : "ay", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "xMidOffset", + "owner" : "du", + "name" : "aw", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "xzRadius", + "owner" : "du", + "name" : "av", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "yMid", + "owner" : "du", + "name" : "ah", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "yMidOffset", + "owner" : "du", + "name" : "al", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "zMid", + "owner" : "du", + "name" : "ak", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "zMidOffset", + "owner" : "du", + "name" : "ab", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__y", + "owner" : "du", + "name" : "y", + "access" : 0, + "descriptor" : "B" + }, { + "field" : "__s", + "owner" : "du", + "name" : "s", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "__z", + "owner" : "du", + "name" : "z", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "__h", + "owner" : "du", + "name" : "h", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__b", + "owner" : "du", + "name" : "b", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__c", + "owner" : "du", + "name" : "c", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__r", + "owner" : "du", + "name" : "r", + "access" : 0, + "descriptor" : "[I" + } ], + "methods" : [ { + "method" : "animate", + "owner" : "du", + "name" : "d", + "access" : 1, + "parameters" : [ "frames", "frame" ], + "descriptor" : "(Len;I)V", + "finalArgument" : -2 + }, { + "method" : "animate2", + "owner" : "du", + "name" : "a", + "access" : 1, + "descriptor" : "(Len;ILen;I[I)V" + }, { + "method" : "calculateBoundingBox", + "owner" : "du", + "name" : "o", + "access" : 0, + "parameters" : [ "yaw" ], + "descriptor" : "(I)V" + }, { + "method" : "calculateBoundsCylinder", + "owner" : "du", + "name" : "u", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "copy0", + "owner" : "du", + "name" : "w", + "access" : 0, + "descriptor" : "(ZLdu;[B)Ldu;" + }, { + "method" : "draw", + "owner" : "du", + "name" : "cy", + "access" : 0, + "parameters" : [ "yaw", "cameraPitchSine", "cameraPitchCosine", "cameraYawSine", "cameraYawCosine", "x", "y", "z", "tag" ], + "descriptor" : "(IIIIIIIIJ)V" + }, { + "method" : "draw0", + "owner" : "du", + "name" : "v", + "access" : 16, + "descriptor" : "(ZZZJ)V" + }, { + "method" : "offsetBy", + "owner" : "du", + "name" : "h", + "access" : 1, + "parameters" : [ "x", "y", "z" ], + "descriptor" : "(III)V" + }, { + "method" : "resetBounds", + "owner" : "du", + "name" : "x", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "rotateY180", + "owner" : "du", + "name" : "s", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "rotateY270Ccw", + "owner" : "du", + "name" : "t", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "rotateY90Ccw", + "owner" : "du", + "name" : "j", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "rotateZ", + "owner" : "du", + "name" : "y", + "access" : 1, + "parameters" : [ "pitch" ], + "descriptor" : "(I)V" + }, { + "method" : "scale", + "owner" : "du", + "name" : "b", + "access" : 1, + "parameters" : [ "x", "y", "z" ], + "descriptor" : "(III)V" + }, { + "method" : "toSharedSequenceModel", + "owner" : "du", + "name" : "f", + "access" : 1, + "parameters" : [ "b" ], + "descriptor" : "(Z)Ldu;" + }, { + "method" : "toSharedSpotAnimationModel", + "owner" : "du", + "name" : "q", + "access" : 1, + "parameters" : [ "b" ], + "descriptor" : "(Z)Ldu;" + }, { + "method" : "transform", + "owner" : "du", + "name" : "z", + "access" : 0, + "parameters" : [ "type", "labels", "tx", "ty", "tz" ], + "descriptor" : "(I[IIII)V" + }, { + "method" : "__m_231", + "owner" : "du", + "name" : "m", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], + "descriptor" : "([[IIIIZI)Ldu;" + }, { + "method" : "__g_232", + "owner" : "du", + "name" : "g", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__l_233", + "owner" : "du", + "name" : "l", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()I" + }, { + "method" : "__c_234", + "owner" : "du", + "name" : "c", + "access" : 17, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6" ], + "descriptor" : "(IIIIIII)V" + }, { + "method" : "__p_235", + "owner" : "du", + "name" : "p", + "access" : 17, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7" ], + "descriptor" : "(IIIIIIII)V" + }, { + "method" : "__ag_236", + "owner" : "du", + "name" : "ag", + "access" : 16, + "parameters" : [ "arg0" ], + "descriptor" : "(I)V" + }, { + "method" : "__aq_237", + "owner" : "du", + "name" : "aq", + "access" : 16, + "parameters" : [ "arg0" ], + "descriptor" : "(I)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + }, { + "access" : 1, + "descriptor" : "([Ldu;I)V" + } ] +}, { + "class" : "VertexNormal", + "name" : "dq", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__f", + "owner" : "dq", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : -1493845293 + }, { + "field" : "__m", + "owner" : "dq", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : 1414310131 + }, { + "field" : "__q", + "owner" : "dq", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 1575149515 + }, { + "field" : "__w", + "owner" : "dq", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : -487323631 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + }, { + "access" : 0, + "descriptor" : "(Ldq;)V" + } ] +}, { + "class" : "Scene", + "name" : "em", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "minPlane", + "owner" : "em", + "name" : "g", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "planes", + "owner" : "em", + "name" : "f", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "tempGameObjects", + "owner" : "em", + "name" : "e", + "access" : 0, + "descriptor" : "[Leh;" + }, { + "field" : "tempGameObjectsCount", + "owner" : "em", + "name" : "l", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "tileHeights", + "owner" : "em", + "name" : "o", + "access" : 0, + "descriptor" : "[[[I" + }, { + "field" : "tiles", + "owner" : "em", + "name" : "u", + "access" : 0, + "descriptor" : "[[[Ldj;" + }, { + "field" : "xSize", + "owner" : "em", + "name" : "q", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "ySize", + "owner" : "em", + "name" : "w", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__bd", + "owner" : "em", + "name" : "bd", + "access" : 0, + "descriptor" : "[[I" + }, { + "field" : "__bk", + "owner" : "em", + "name" : "bk", + "access" : 0, + "descriptor" : "[[I" + }, { + "field" : "__x", + "owner" : "em", + "name" : "x", + "access" : 0, + "descriptor" : "[[[I" + } ], + "methods" : [ { + "method" : "addTile", + "owner" : "em", + "name" : "u", + "access" : 1, + "descriptor" : "(IIIIIIIIIIIIIIIIIIII)V" + }, { + "method" : "clear", + "owner" : "em", + "name" : "m", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "clearTempGameObjects", + "owner" : "em", + "name" : "s", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "draw", + "owner" : "em", + "name" : "az", + "access" : 1, + "parameters" : [ "x", "y", "z", "pitch", "yaw", "plane" ], + "descriptor" : "(IIIIII)V" + }, { + "method" : "drawTile", + "owner" : "em", + "name" : "au", + "access" : 0, + "parameters" : [ "tile", "b" ], + "descriptor" : "(Ldj;Z)V" + }, { + "method" : "drawTileMinimap", + "owner" : "em", + "name" : "ae", + "access" : 1, + "parameters" : [ "pixels", "index", "width", "plane", "x", "y" ], + "descriptor" : "([IIIIII)V" + }, { + "method" : "getBoundaryObject", + "owner" : "em", + "name" : "ag", + "access" : 1, + "parameters" : [ "plane", "x", "y" ], + "descriptor" : "(III)Lej;" + }, { + "method" : "getFloorDecoration", + "owner" : "em", + "name" : "av", + "access" : 1, + "parameters" : [ "plane", "x", "y" ], + "descriptor" : "(III)Ldo;" + }, { + "method" : "getFloorDecorationTag", + "owner" : "em", + "name" : "ah", + "access" : 1, + "parameters" : [ "plane", "x", "y" ], + "descriptor" : "(III)J" + }, { + "method" : "getObjectFlags", + "owner" : "em", + "name" : "ak", + "access" : 1, + "parameters" : [ "plane", "x", "y", "id" ], + "descriptor" : "(IIIJ)I" + }, { + "method" : "getWallDecoration", + "owner" : "em", + "name" : "aq", + "access" : 1, + "parameters" : [ "plane", "x", "y" ], + "descriptor" : "(III)Leq;" + }, { + "method" : "init", + "owner" : "em", + "name" : "f", + "access" : 1, + "parameters" : [ "minPlane" ], + "descriptor" : "(I)V" + }, { + "method" : "menuOpen", + "owner" : "em", + "name" : "ap", + "access" : 1, + "parameters" : [ "plane", "screenX", "screenY", "b" ], + "descriptor" : "(IIIZ)V" + }, { + "method" : "newBoundaryObject", + "owner" : "em", + "name" : "e", + "access" : 1, + "parameters" : [ "plane", "x", "y", "tileHeight", "entity1", "entity2", "orientationA", "orientationB", "tag", "flags" ], + "descriptor" : "(IIIILex;Lex;IIJI)V" + }, { + "method" : "newFloorDecoration", + "owner" : "em", + "name" : "g", + "access" : 1, + "parameters" : [ "plane", "x", "y", "tileHeight", "entity", "tag", "flags" ], + "descriptor" : "(IIIILex;JI)V" + }, { + "method" : "newGameObject", + "owner" : "em", + "name" : "j", + "access" : 0, + "parameters" : [ "plane", "startX", "startY", "sizeX", "sizeY", "centerX", "centerY", "height", "entity", "orientation", "isTemp", "tag", "flags" ], + "descriptor" : "(IIIIIIIILex;IZJI)Z" + }, { + "method" : "newGroundItemPile", + "owner" : "em", + "name" : "l", + "access" : 1, + "parameters" : [ "plane", "x", "y", "tileHeight", "first", "tag", "second", "third" ], + "descriptor" : "(IIIILex;JLex;Lex;)V" + }, { + "method" : "newWallDecoration", + "owner" : "em", + "name" : "x", + "access" : 1, + "parameters" : [ "plane", "x", "y", "tileHeight", "entity1", "entity2", "orientation", "int7", "xOffset", "yOffset", "tag", "flags" ], + "descriptor" : "(IIIILex;Lex;IIIIJI)V" + }, { + "method" : "occlude", + "owner" : "em", + "name" : "ai", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "removeBoundaryObject", + "owner" : "em", + "name" : "h", + "access" : 1, + "parameters" : [ "plane", "x", "y" ], + "descriptor" : "(III)V" + }, { + "method" : "removeFloorDecoration", + "owner" : "em", + "name" : "p", + "access" : 1, + "parameters" : [ "plane", "x", "y" ], + "descriptor" : "(III)V" + }, { + "method" : "removeGameObject", + "owner" : "em", + "name" : "t", + "access" : 0, + "parameters" : [ "gameObject" ], + "descriptor" : "(Leh;)V" + }, { + "method" : "removeGroundItemPile", + "owner" : "em", + "name" : "v", + "access" : 1, + "parameters" : [ "plane", "x", "y" ], + "descriptor" : "(III)V" + }, { + "method" : "removeWallDecoration", + "owner" : "em", + "name" : "b", + "access" : 1, + "parameters" : [ "plane", "x", "y" ], + "descriptor" : "(III)V" + }, { + "method" : "setLinkBelow", + "owner" : "em", + "name" : "q", + "access" : 1, + "parameters" : [ "x", "y" ], + "descriptor" : "(II)V" + }, { + "method" : "setTileMinPlane", + "owner" : "em", + "name" : "o", + "access" : 1, + "parameters" : [ "plane", "x", "y", "minPlane" ], + "descriptor" : "(IIII)V" + }, { + "method" : "__d_238", + "owner" : "em", + "name" : "d", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7", "arg8", "arg9" ], + "descriptor" : "(IIIIIILex;IJI)Z" + }, { + "method" : "__a_239", + "owner" : "em", + "name" : "a", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7", "arg8" ], + "descriptor" : "(IIIIILex;IJZ)Z" + }, { + "method" : "__z_240", + "owner" : "em", + "name" : "z", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7", "arg8", "arg9", "arg10", "arg11" ], + "descriptor" : "(IIIIILex;IJIIII)Z" + }, { + "method" : "__y_241", + "owner" : "em", + "name" : "y", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], + "descriptor" : "(IIII)V" + }, { + "method" : "__c_242", + "owner" : "em", + "name" : "c", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(III)V" + }, { + "method" : "__aj_243", + "owner" : "em", + "name" : "aj", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(III)Leh;" + }, { + "method" : "__ar_244", + "owner" : "em", + "name" : "ar", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(III)J" + }, { + "method" : "__ac_245", + "owner" : "em", + "name" : "ac", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(III)J" + }, { + "method" : "__ay_246", + "owner" : "em", + "name" : "ay", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(III)J" + }, { + "method" : "__aw_247", + "owner" : "em", + "name" : "aw", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(III)V" + }, { + "method" : "__al_248", + "owner" : "em", + "name" : "al", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], + "descriptor" : "(Ldw;III)V" + }, { + "method" : "__ab_249", + "owner" : "em", + "name" : "ab", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], + "descriptor" : "(Ldw;IIIII)V" + }, { + "method" : "__as_250", + "owner" : "em", + "name" : "as", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__ao_251", + "owner" : "em", + "name" : "ao", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7" ], + "descriptor" : "(Leb;IIIIIII)V" + }, { + "method" : "__aa_252", + "owner" : "em", + "name" : "aa", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6" ], + "descriptor" : "(Ldv;IIIIII)V" + }, { + "method" : "__ba_253", + "owner" : "em", + "name" : "ba", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(III)Z" + }, { + "method" : "__bb_254", + "owner" : "em", + "name" : "bb", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], + "descriptor" : "(IIII)Z" + }, { + "method" : "__bs_255", + "owner" : "em", + "name" : "bs", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], + "descriptor" : "(IIII)Z" + }, { + "method" : "__bq_256", + "owner" : "em", + "name" : "bq", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], + "descriptor" : "(IIIIII)Z" + }, { + "method" : "__bn_257", + "owner" : "em", + "name" : "bn", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(III)Z" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(III[[[I)V" + } ] +}, { + "class" : "FaceNormal", + "name" : "el", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__f", + "owner" : "el", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : -1376860893 + }, { + "field" : "__m", + "owner" : "el", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : -2074333261 + }, { + "field" : "__q", + "owner" : "el", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 2619977 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "TextureLoader", + "name" : "ei", + "super" : "java.lang.Object", + "access" : 1537, + "interfaces" : [ ], + "fields" : [ ], + "methods" : [ { + "method" : "isLowDetail", + "owner" : "ei", + "name" : "u", + "access" : 1025, + "descriptor" : "(II)Z" + }, { + "method" : "load", + "owner" : "ei", + "name" : "q", + "access" : 1025, + "descriptor" : "(II)[I" + }, { + "method" : "__w_258", + "owner" : "ei", + "name" : "w", + "access" : 1025, + "parameters" : [ "arg0" ], + "descriptor" : "(II)I" + }, { + "method" : "__o_259", + "owner" : "ei", + "name" : "o", + "access" : 1025, + "parameters" : [ "arg0" ], + "descriptor" : "(IB)Z" + } ], + "constructors" : [ ] +}, { + "class" : "Occluder", + "name" : "ee", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "maxTileX", + "owner" : "ee", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : -13700523 + }, { + "field" : "maxTileY", + "owner" : "ee", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : 1501977891 + }, { + "field" : "maxX", + "owner" : "ee", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : -2141305127 + }, { + "field" : "maxY", + "owner" : "ee", + "name" : "d", + "access" : 0, + "descriptor" : "I", + "decoder" : -1114046315 + }, { + "field" : "maxZ", + "owner" : "ee", + "name" : "e", + "access" : 0, + "descriptor" : "I", + "decoder" : -1805075909 + }, { + "field" : "minTileX", + "owner" : "ee", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : -691483983 + }, { + "field" : "minTileY", + "owner" : "ee", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 768402657 + }, { + "field" : "minX", + "owner" : "ee", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : -1824663821 + }, { + "field" : "minY", + "owner" : "ee", + "name" : "x", + "access" : 0, + "descriptor" : "I", + "decoder" : 842961497 + }, { + "field" : "minZ", + "owner" : "ee", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : -41239751 + }, { + "field" : "type", + "owner" : "ee", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : -806776509 + }, { + "field" : "__a", + "owner" : "ee", + "name" : "a", + "access" : 0, + "descriptor" : "I", + "decoder" : -1527021367 + }, { + "field" : "__i", + "owner" : "ee", + "name" : "i", + "access" : 0, + "descriptor" : "I", + "decoder" : 1324959981 + }, { + "field" : "__j", + "owner" : "ee", + "name" : "j", + "access" : 0, + "descriptor" : "I", + "decoder" : -373839103 + }, { + "field" : "__k", + "owner" : "ee", + "name" : "k", + "access" : 0, + "descriptor" : "I", + "decoder" : 826041747 + }, { + "field" : "__n", + "owner" : "ee", + "name" : "n", + "access" : 0, + "descriptor" : "I", + "decoder" : -407777817 + }, { + "field" : "__s", + "owner" : "ee", + "name" : "s", + "access" : 0, + "descriptor" : "I", + "decoder" : -1334433969 + }, { + "field" : "__z", + "owner" : "ee", + "name" : "z", + "access" : 0, + "descriptor" : "I", + "decoder" : -570391007 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "GameObject", + "name" : "eh", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "centerX", + "owner" : "eh", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : 109300811 + }, { + "field" : "centerY", + "owner" : "eh", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : 714046631 + }, { + "field" : "endX", + "owner" : "eh", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : -379698951 + }, { + "field" : "endY", + "owner" : "eh", + "name" : "x", + "access" : 0, + "descriptor" : "I", + "decoder" : -607228629 + }, { + "field" : "entity", + "owner" : "eh", + "name" : "u", + "access" : 1, + "descriptor" : "Lex;" + }, { + "field" : "flags", + "owner" : "eh", + "name" : "i", + "access" : 0, + "descriptor" : "I", + "decoder" : -161115901 + }, { + "field" : "height", + "owner" : "eh", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -1791908691 + }, { + "field" : "lastDrawn", + "owner" : "eh", + "name" : "k", + "access" : 0, + "descriptor" : "I", + "decoder" : -1043687633 + }, { + "field" : "orientation", + "owner" : "eh", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : 1393658667 + }, { + "field" : "plane", + "owner" : "eh", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 2095667225 + }, { + "field" : "startX", + "owner" : "eh", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : -1017836867 + }, { + "field" : "startY", + "owner" : "eh", + "name" : "e", + "access" : 0, + "descriptor" : "I", + "decoder" : -1519796265 + }, { + "field" : "tag", + "owner" : "eh", + "name" : "n", + "access" : 1, + "descriptor" : "J", + "decoder" : -114546124748632877 + }, { + "field" : "__d", + "owner" : "eh", + "name" : "d", + "access" : 0, + "descriptor" : "I", + "decoder" : 1941106389 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "UrlRequester", + "name" : "eo", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "java.lang.Runnable" ], + "fields" : [ { + "field" : "isClosed", + "owner" : "eo", + "name" : "f", + "access" : 64, + "descriptor" : "Z" + }, { + "field" : "requests", + "owner" : "eo", + "name" : "q", + "access" : 0, + "descriptor" : "Ljava/util/Queue;" + }, { + "field" : "thread", + "owner" : "eo", + "name" : "m", + "access" : 16, + "descriptor" : "Ljava/lang/Thread;" + } ], + "methods" : [ { + "method" : "close", + "owner" : "eo", + "name" : "f", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(S)V" + }, { + "method" : "request", + "owner" : "eo", + "name" : "m", + "access" : 1, + "parameters" : [ "url" ], + "descriptor" : "(Ljava/net/URL;I)Ley;" + }, { + "method" : "__run_260", + "owner" : "eo", + "name" : "run", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "EvictingDualNodeHashTable", + "name" : "er", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "capacity", + "owner" : "er", + "name" : "f", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "deque", + "owner" : "er", + "name" : "o", + "access" : 0, + "descriptor" : "Ljp;" + }, { + "field" : "hashTable", + "owner" : "er", + "name" : "w", + "access" : 0, + "descriptor" : "Lld;" + }, { + "field" : "remainingCapacity", + "owner" : "er", + "name" : "q", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__m", + "owner" : "er", + "name" : "m", + "access" : 0, + "descriptor" : "Lfn;" + } ], + "methods" : [ { + "method" : "clear", + "owner" : "er", + "name" : "w", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "get", + "owner" : "er", + "name" : "m", + "access" : 1, + "parameters" : [ "key" ], + "descriptor" : "(J)Lfn;" + }, { + "method" : "put", + "owner" : "er", + "name" : "q", + "access" : 1, + "parameters" : [ "value", "key" ], + "descriptor" : "(Lfn;J)V" + }, { + "method" : "remove", + "owner" : "er", + "name" : "f", + "access" : 1, + "parameters" : [ "key" ], + "descriptor" : "(J)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(I)V" + } ] +}, { + "class" : "UserComparator4", + "name" : "ev", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "java.util.Comparator" ], + "fields" : [ { + "field" : "__m", + "owner" : "ev", + "name" : "m", + "access" : 16, + "descriptor" : "Z" + } ], + "methods" : [ { + "method" : "__m_261", + "owner" : "ev", + "name" : "m", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Lke;Lke;I)I" + }, { + "method" : "__compare_262", + "owner" : "ev", + "name" : "compare", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" + }, { + "method" : "__equals_263", + "owner" : "ev", + "name" : "equals", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/lang/Object;)Z" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Z)V" + } ] +}, { + "class" : "UserComparator9", + "name" : "ea", + "super" : "kf", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__m", + "owner" : "ea", + "name" : "m", + "access" : 16, + "descriptor" : "Z" + } ], + "methods" : [ { + "method" : "__m_264", + "owner" : "ea", + "name" : "m", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Lke;Lke;I)I" + }, { + "method" : "__compare_265", + "owner" : "ea", + "name" : "compare", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Z)V" + } ] +}, { + "class" : "UserComparator8", + "name" : "es", + "super" : "kf", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__m", + "owner" : "es", + "name" : "m", + "access" : 16, + "descriptor" : "Z" + } ], + "methods" : [ { + "method" : "__m_266", + "owner" : "es", + "name" : "m", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Lke;Lke;B)I" + }, { + "method" : "__compare_267", + "owner" : "es", + "name" : "compare", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Z)V" + } ] +}, { + "class" : "UserComparator10", + "name" : "eg", + "super" : "kf", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__m", + "owner" : "eg", + "name" : "m", + "access" : 16, + "descriptor" : "Z" + } ], + "methods" : [ { + "method" : "__m_268", + "owner" : "eg", + "name" : "m", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Lke;Lke;B)I" + }, { + "method" : "__compare_269", + "owner" : "eg", + "name" : "compare", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Z)V" + } ] +}, { + "class" : "UserComparator7", + "name" : "ez", + "super" : "kf", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__m", + "owner" : "ez", + "name" : "m", + "access" : 16, + "descriptor" : "Z" + } ], + "methods" : [ { + "method" : "__m_270", + "owner" : "ez", + "name" : "m", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Lke;Lke;I)I" + }, { + "method" : "__compare_271", + "owner" : "ez", + "name" : "compare", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Z)V" + } ] +}, { + "class" : "UserComparator5", + "name" : "ep", + "super" : "kf", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__m", + "owner" : "ep", + "name" : "m", + "access" : 16, + "descriptor" : "Z" + } ], + "methods" : [ { + "method" : "__m_272", + "owner" : "ep", + "name" : "m", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Lke;Lke;B)I" + }, { + "method" : "__compare_273", + "owner" : "ep", + "name" : "compare", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Z)V" + } ] +}, { + "class" : "UserComparator3", + "name" : "fq", + "super" : "kf", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__m", + "owner" : "fq", + "name" : "m", + "access" : 16, + "descriptor" : "Z" + } ], + "methods" : [ { + "method" : "__m_274", + "owner" : "fq", + "name" : "m", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Lke;Lke;I)I" + }, { + "method" : "__compare_275", + "owner" : "fq", + "name" : "compare", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Z)V" + } ] +}, { + "class" : "UserComparator6", + "name" : "fg", + "super" : "kf", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__m", + "owner" : "fg", + "name" : "m", + "access" : 16, + "descriptor" : "Z" + } ], + "methods" : [ { + "method" : "__m_276", + "owner" : "fg", + "name" : "m", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Lke;Lke;I)I" + }, { + "method" : "__compare_277", + "owner" : "fg", + "name" : "compare", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Z)V" + } ] +}, { + "class" : "MilliClock", + "name" : "fd", + "super" : "fa", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__f", + "owner" : "fd", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 1940981129 + }, { + "field" : "__o", + "owner" : "fd", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : 250272357 + }, { + "field" : "__q", + "owner" : "fd", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 1217137493 + }, { + "field" : "__u", + "owner" : "fd", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : 576555527 + }, { + "field" : "__w", + "owner" : "fd", + "name" : "w", + "access" : 0, + "descriptor" : "J", + "decoder" : -8372744267470318611 + }, { + "field" : "__m", + "owner" : "fd", + "name" : "m", + "access" : 0, + "descriptor" : "[J" + } ], + "methods" : [ { + "method" : "mark", + "owner" : "fd", + "name" : "m", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "wait", + "owner" : "fd", + "name" : "f", + "access" : 1, + "parameters" : [ "cycleMs", "minSleepMs" ], + "descriptor" : "(III)I" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "BufferedSource", + "name" : "fh", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "java.lang.Runnable" ], + "fields" : [ { + "field" : "buffer", + "owner" : "fh", + "name" : "w", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "capacity", + "owner" : "fh", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : -1970062431 + }, { + "field" : "exception", + "owner" : "fh", + "name" : "g", + "access" : 0, + "descriptor" : "Ljava/io/IOException;" + }, { + "field" : "inputStream", + "owner" : "fh", + "name" : "f", + "access" : 0, + "descriptor" : "Ljava/io/InputStream;" + }, { + "field" : "limit", + "owner" : "fh", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : 1507905677 + }, { + "field" : "position", + "owner" : "fh", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : 267006153 + }, { + "field" : "thread", + "owner" : "fh", + "name" : "m", + "access" : 0, + "descriptor" : "Ljava/lang/Thread;" + } ], + "methods" : [ { + "method" : "available", + "owner" : "fh", + "name" : "f", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "close", + "owner" : "fh", + "name" : "o", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "isAvailable", + "owner" : "fh", + "name" : "m", + "access" : 0, + "parameters" : [ "length" ], + "descriptor" : "(II)Z" + }, { + "method" : "read", + "owner" : "fh", + "name" : "w", + "access" : 0, + "parameters" : [ "dst", "dstIndex", "length" ], + "descriptor" : "([BIIB)I" + }, { + "method" : "readUnsignedByte", + "owner" : "fh", + "name" : "q", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__run_278", + "owner" : "fh", + "name" : "run", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/io/InputStream;I)V" + } ] +}, { + "class" : "TaskHandler", + "name" : "fz", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "java.lang.Runnable" ], + "fields" : [ { + "field" : "current", + "owner" : "fz", + "name" : "q", + "access" : 0, + "descriptor" : "Lfm;" + }, { + "field" : "isClosed", + "owner" : "fz", + "name" : "u", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "task0", + "owner" : "fz", + "name" : "w", + "access" : 0, + "descriptor" : "Lfm;" + }, { + "field" : "thread", + "owner" : "fz", + "name" : "o", + "access" : 0, + "descriptor" : "Ljava/lang/Thread;" + } ], + "methods" : [ { + "method" : "close", + "owner" : "fz", + "name" : "m", + "access" : 17, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "newSocketTask", + "owner" : "fz", + "name" : "q", + "access" : 17, + "descriptor" : "(Ljava/lang/String;II)Lfm;" + }, { + "method" : "newTask", + "owner" : "fz", + "name" : "f", + "access" : 16, + "descriptor" : "(IIILjava/lang/Object;I)Lfm;" + }, { + "method" : "newThreadTask", + "owner" : "fz", + "name" : "w", + "access" : 17, + "descriptor" : "(Ljava/lang/Runnable;II)Lfm;" + }, { + "method" : "__run_279", + "owner" : "fz", + "name" : "run", + "access" : 17, + "parameters" : [ ], + "descriptor" : "()V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "BufferedNetSocket", + "name" : "ft", + "super" : "fu", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "sink", + "owner" : "ft", + "name" : "q", + "access" : 0, + "descriptor" : "Lfr;" + }, { + "field" : "socket", + "owner" : "ft", + "name" : "m", + "access" : 0, + "descriptor" : "Ljava/net/Socket;" + }, { + "field" : "source", + "owner" : "ft", + "name" : "f", + "access" : 0, + "descriptor" : "Lfh;" + } ], + "methods" : [ { + "method" : "available", + "owner" : "ft", + "name" : "q", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "close", + "owner" : "ft", + "name" : "g", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "isAvailable", + "owner" : "ft", + "name" : "f", + "access" : 1, + "parameters" : [ "length" ], + "descriptor" : "(II)Z" + }, { + "method" : "read", + "owner" : "ft", + "name" : "o", + "access" : 1, + "parameters" : [ "dst", "dstIndex", "length" ], + "descriptor" : "([BIII)I" + }, { + "method" : "readUnsignedByte", + "owner" : "ft", + "name" : "w", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "write", + "owner" : "ft", + "name" : "u", + "access" : 1, + "parameters" : [ "src", "srcIndex", "length" ], + "descriptor" : "([BIIB)V" + }, { + "method" : "__finalize_280", + "owner" : "ft", + "name" : "finalize", + "access" : 4, + "parameters" : [ ], + "descriptor" : "()V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/net/Socket;II)V" + } ] +}, { + "class" : "NetSocket", + "name" : "fb", + "super" : "fu", + "access" : 49, + "interfaces" : [ "java.lang.Runnable" ], + "fields" : [ { + "field" : "array", + "owner" : "fb", + "name" : "g", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "exceptionWriting", + "owner" : "fb", + "name" : "x", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "inputStream", + "owner" : "fb", + "name" : "m", + "access" : 0, + "descriptor" : "Ljava/io/InputStream;" + }, { + "field" : "isClosed", + "owner" : "fb", + "name" : "w", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "outputStream", + "owner" : "fb", + "name" : "f", + "access" : 0, + "descriptor" : "Ljava/io/OutputStream;" + }, { + "field" : "socket", + "owner" : "fb", + "name" : "q", + "access" : 0, + "descriptor" : "Ljava/net/Socket;" + }, { + "field" : "task", + "owner" : "fb", + "name" : "u", + "access" : 0, + "descriptor" : "Lfm;" + }, { + "field" : "taskHandler", + "owner" : "fb", + "name" : "o", + "access" : 0, + "descriptor" : "Lfz;" + }, { + "field" : "__e", + "owner" : "fb", + "name" : "e", + "access" : 0, + "descriptor" : "I", + "decoder" : 2057244853 + }, { + "field" : "__l", + "owner" : "fb", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : -738185459 + }, { + "field" : "__d", + "owner" : "fb", + "name" : "d", + "access" : 16, + "descriptor" : "I", + "decoder" : -1644762957 + }, { + "field" : "__k", + "owner" : "fb", + "name" : "k", + "access" : 16, + "descriptor" : "I", + "decoder" : -782964015 + } ], + "methods" : [ { + "method" : "available", + "owner" : "fb", + "name" : "q", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "close", + "owner" : "fb", + "name" : "g", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "finalize", + "owner" : "fb", + "name" : "finalize", + "access" : 4, + "descriptor" : "()V" + }, { + "method" : "isAvailable", + "owner" : "fb", + "name" : "f", + "access" : 1, + "parameters" : [ "length" ], + "descriptor" : "(II)Z" + }, { + "method" : "read", + "owner" : "fb", + "name" : "o", + "access" : 1, + "parameters" : [ "dst", "dstIndex", "length" ], + "descriptor" : "([BIII)I" + }, { + "method" : "readUnsignedByte", + "owner" : "fb", + "name" : "w", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "write", + "owner" : "fb", + "name" : "u", + "access" : 1, + "parameters" : [ "src", "srcIndex", "length" ], + "descriptor" : "([BIIB)V" + }, { + "method" : "write0", + "owner" : "fb", + "name" : "ay", + "access" : 0, + "parameters" : [ "src", "srcIndex", "length" ], + "descriptor" : "([BIIB)V" + }, { + "method" : "__run_281", + "owner" : "fb", + "name" : "run", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Ljava/net/Socket;Lfz;I)V" + } ] +}, { + "class" : "BufferedSink", + "name" : "fr", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "java.lang.Runnable" ], + "fields" : [ { + "field" : "buffer", + "owner" : "fr", + "name" : "w", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "capacity", + "owner" : "fr", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 1805563727 + }, { + "field" : "exception", + "owner" : "fr", + "name" : "g", + "access" : 0, + "descriptor" : "Ljava/io/IOException;" + }, { + "field" : "isClosed0", + "owner" : "fr", + "name" : "l", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "limit", + "owner" : "fr", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : 1028856279 + }, { + "field" : "outputStream", + "owner" : "fr", + "name" : "f", + "access" : 0, + "descriptor" : "Ljava/io/OutputStream;" + }, { + "field" : "position", + "owner" : "fr", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : 315461309 + }, { + "field" : "thread", + "owner" : "fr", + "name" : "m", + "access" : 0, + "descriptor" : "Ljava/lang/Thread;" + } ], + "methods" : [ { + "method" : "close", + "owner" : "fr", + "name" : "q", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "isClosed", + "owner" : "fr", + "name" : "m", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "write", + "owner" : "fr", + "name" : "f", + "access" : 0, + "parameters" : [ "src", "srcIndex", "length" ], + "descriptor" : "([BIIB)V" + }, { + "method" : "__run_282", + "owner" : "fr", + "name" : "run", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/io/OutputStream;I)V" + } ] +}, { + "class" : "CollisionMap", + "name" : "fy", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "flags", + "owner" : "fy", + "name" : "ab", + "access" : 1, + "descriptor" : "[[I" + }, { + "field" : "xInset", + "owner" : "fy", + "name" : "ah", + "access" : 0, + "descriptor" : "I", + "decoder" : 264774249 + }, { + "field" : "xSize", + "owner" : "fy", + "name" : "aw", + "access" : 0, + "descriptor" : "I", + "decoder" : 674483785 + }, { + "field" : "yInset", + "owner" : "fy", + "name" : "ak", + "access" : 0, + "descriptor" : "I", + "decoder" : -1037712787 + }, { + "field" : "ySize", + "owner" : "fy", + "name" : "al", + "access" : 0, + "descriptor" : "I", + "decoder" : -871458249 + } ], + "methods" : [ { + "method" : "clear", + "owner" : "fy", + "name" : "m", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__f_283", + "owner" : "fy", + "name" : "f", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], + "descriptor" : "(IIIIZB)V" + }, { + "method" : "__q_284", + "owner" : "fy", + "name" : "q", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], + "descriptor" : "(IIIIZI)V" + }, { + "method" : "__w_285", + "owner" : "fy", + "name" : "w", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(III)V" + }, { + "method" : "__o_286", + "owner" : "fy", + "name" : "o", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(III)V" + }, { + "method" : "__u_287", + "owner" : "fy", + "name" : "u", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(IIII)V" + }, { + "method" : "__g_288", + "owner" : "fy", + "name" : "g", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], + "descriptor" : "(IIIIZB)V" + }, { + "method" : "__l_289", + "owner" : "fy", + "name" : "l", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], + "descriptor" : "(IIIIIZB)V" + }, { + "method" : "__e_290", + "owner" : "fy", + "name" : "e", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(IIII)V" + }, { + "method" : "__x_291", + "owner" : "fy", + "name" : "x", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(IIB)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(II)V" + } ] +}, { + "class" : "Link", + "name" : "gh", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__f", + "owner" : "gh", + "name" : "f", + "access" : 1, + "descriptor" : "Lgh;" + }, { + "field" : "__m", + "owner" : "gh", + "name" : "m", + "access" : 1, + "descriptor" : "Lgh;" + } ], + "methods" : [ { + "method" : "remove", + "owner" : "gh", + "name" : "m", + "access" : 1, + "descriptor" : "()V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "PacketBufferNode", + "name" : "gg", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "packetBuffer", + "owner" : "gg", + "name" : "q", + "access" : 1, + "descriptor" : "Lhx;" + }, { + "field" : "__m", + "owner" : "gg", + "name" : "m", + "access" : 1, + "descriptor" : "Lgs;" + }, { + "field" : "__f", + "owner" : "gg", + "name" : "f", + "access" : 1, + "descriptor" : "I", + "decoder" : 1433542775 + }, { + "field" : "__w", + "owner" : "gg", + "name" : "w", + "access" : 1, + "descriptor" : "I", + "decoder" : -2051819203 + } ], + "methods" : [ { + "method" : "__f_292", + "owner" : "gg", + "name" : "f", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "Huffman", + "name" : "gd", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__f", + "owner" : "gd", + "name" : "f", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "__m", + "owner" : "gd", + "name" : "m", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__q", + "owner" : "gd", + "name" : "q", + "access" : 0, + "descriptor" : "[I" + } ], + "methods" : [ { + "method" : "__m_293", + "owner" : "gd", + "name" : "m", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], + "descriptor" : "([BII[BIB)I" + }, { + "method" : "__f_294", + "owner" : "gd", + "name" : "f", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], + "descriptor" : "([BI[BIII)I" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "([B)V" + } ] +}, { + "class" : "Bzip2State", + "name" : "gt", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "__ag", + "owner" : "gt", + "name" : "ag", + "access" : 0, + "descriptor" : "[Z" + }, { + "field" : "__aq", + "owner" : "gt", + "name" : "aq", + "access" : 0, + "descriptor" : "[Z" + }, { + "field" : "__i", + "owner" : "gt", + "name" : "i", + "access" : 0, + "descriptor" : "B" + }, { + "field" : "__ac", + "owner" : "gt", + "name" : "ac", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "__aj", + "owner" : "gt", + "name" : "aj", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "__av", + "owner" : "gt", + "name" : "av", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "__ay", + "owner" : "gt", + "name" : "ay", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "__g", + "owner" : "gt", + "name" : "g", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "__x", + "owner" : "gt", + "name" : "x", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "__ah", + "owner" : "gt", + "name" : "ah", + "access" : 0, + "descriptor" : "[[B" + }, { + "field" : "__a", + "owner" : "gt", + "name" : "a", + "access" : 0, + "descriptor" : "I", + "decoder" : -1994129645 + }, { + "field" : "__ae", + "owner" : "gt", + "name" : "ae", + "access" : 0, + "descriptor" : "I", + "decoder" : 444639767 + }, { + "field" : "__c", + "owner" : "gt", + "name" : "c", + "access" : 0, + "descriptor" : "I", + "decoder" : -557334365 + }, { + "field" : "__d", + "owner" : "gt", + "name" : "d", + "access" : 0, + "descriptor" : "I", + "decoder" : -861462251 + }, { + "field" : "__e", + "owner" : "gt", + "name" : "e", + "access" : 0, + "descriptor" : "I", + "decoder" : -473971741 + }, { + "field" : "__h", + "owner" : "gt", + "name" : "h", + "access" : 0, + "descriptor" : "I", + "decoder" : -1981923611 + }, { + "field" : "__j", + "owner" : "gt", + "name" : "j", + "access" : 0, + "descriptor" : "I", + "decoder" : -1987934943 + }, { + "field" : "__k", + "owner" : "gt", + "name" : "k", + "access" : 0, + "descriptor" : "I", + "decoder" : 594179173 + }, { + "field" : "__l", + "owner" : "gt", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : -1510817847 + }, { + "field" : "__n", + "owner" : "gt", + "name" : "n", + "access" : 0, + "descriptor" : "I", + "decoder" : 1860254567 + }, { + "field" : "__s", + "owner" : "gt", + "name" : "s", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__t", + "owner" : "gt", + "name" : "t", + "access" : 0, + "descriptor" : "I", + "decoder" : 1502359789 + }, { + "field" : "__v", + "owner" : "gt", + "name" : "v", + "access" : 0, + "descriptor" : "I", + "decoder" : -886333045 + }, { + "field" : "__y", + "owner" : "gt", + "name" : "y", + "access" : 0, + "descriptor" : "I", + "decoder" : -953353963 + }, { + "field" : "__z", + "owner" : "gt", + "name" : "z", + "access" : 0, + "descriptor" : "I", + "decoder" : -1793367959 + }, { + "field" : "__ab", + "owner" : "gt", + "name" : "ab", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__ar", + "owner" : "gt", + "name" : "ar", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__b", + "owner" : "gt", + "name" : "b", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__r", + "owner" : "gt", + "name" : "r", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__ak", + "owner" : "gt", + "name" : "ak", + "access" : 0, + "descriptor" : "[[I" + }, { + "field" : "__al", + "owner" : "gt", + "name" : "al", + "access" : 0, + "descriptor" : "[[I" + }, { + "field" : "__aw", + "owner" : "gt", + "name" : "aw", + "access" : 0, + "descriptor" : "[[I" + }, { + "field" : "__f", + "owner" : "gt", + "name" : "f", + "access" : 16, + "descriptor" : "I" + }, { + "field" : "__m", + "owner" : "gt", + "name" : "m", + "access" : 16, + "descriptor" : "I" + }, { + "field" : "__o", + "owner" : "gt", + "name" : "o", + "access" : 16, + "descriptor" : "I" + }, { + "field" : "__q", + "owner" : "gt", + "name" : "q", + "access" : 16, + "descriptor" : "I" + }, { + "field" : "__u", + "owner" : "gt", + "name" : "u", + "access" : 16, + "descriptor" : "I" + }, { + "field" : "__w", + "owner" : "gt", + "name" : "w", + "access" : 16, + "descriptor" : "I" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Buffer", + "name" : "gr", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "array", + "owner" : "gr", + "name" : "m", + "access" : 1, + "descriptor" : "[B" + }, { + "field" : "index", + "owner" : "gr", + "name" : "f", + "access" : 1, + "descriptor" : "I", + "decoder" : -271438207 + } ], + "methods" : [ { + "method" : "encryptRsa", + "owner" : "gr", + "name" : "ao", + "access" : 1, + "descriptor" : "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V" + }, { + "method" : "readBoolean", + "owner" : "gr", + "name" : "ac", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "readByte", + "owner" : "gr", + "name" : "v", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)B" + }, { + "method" : "readInt", + "owner" : "gr", + "name" : "av", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "readLong", + "owner" : "gr", + "name" : "ar", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)J" + }, { + "method" : "readMedium", + "owner" : "gr", + "name" : "aj", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "readStringCp1252NullCircumfixed", + "owner" : "gr", + "name" : "ak", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Ljava/lang/String;" + }, { + "method" : "readStringCp1252NullTerminated", + "owner" : "gr", + "name" : "ah", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Ljava/lang/String;" + }, { + "method" : "readStringCp1252NullTerminatedOrNull", + "owner" : "gr", + "name" : "ay", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Ljava/lang/String;" + }, { + "method" : "readUnsignedByte", + "owner" : "gr", + "name" : "p", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)I" + }, { + "method" : "readUnsignedByteNegate", + "owner" : "gr", + "name" : "bs", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "writeBoolean", + "owner" : "gr", + "name" : "e", + "access" : 1, + "parameters" : [ "value" ], + "descriptor" : "(ZB)V" + }, { + "method" : "writeByte", + "owner" : "gr", + "name" : "q", + "access" : 1, + "parameters" : [ "value" ], + "descriptor" : "(II)V" + }, { + "method" : "writeInt", + "owner" : "gr", + "name" : "u", + "access" : 1, + "parameters" : [ "value" ], + "descriptor" : "(II)V" + }, { + "method" : "writeIntLE", + "owner" : "gr", + "name" : "bi", + "access" : 1, + "parameters" : [ "value" ], + "descriptor" : "(IB)V" + }, { + "method" : "writeIntLE16", + "owner" : "gr", + "name" : "bg", + "access" : 1, + "parameters" : [ "value" ], + "descriptor" : "(II)V" + }, { + "method" : "writeIntME", + "owner" : "gr", + "name" : "bz", + "access" : 1, + "parameters" : [ "value" ], + "descriptor" : "(IB)V" + }, { + "method" : "writeLong", + "owner" : "gr", + "name" : "l", + "access" : 1, + "parameters" : [ "n" ], + "descriptor" : "(J)V" + }, { + "method" : "writeLongMedium", + "owner" : "gr", + "name" : "g", + "access" : 1, + "parameters" : [ "n" ], + "descriptor" : "(J)V" + }, { + "method" : "writeMedium", + "owner" : "gr", + "name" : "o", + "access" : 1, + "parameters" : [ "value" ], + "descriptor" : "(IB)V" + }, { + "method" : "writeShort", + "owner" : "gr", + "name" : "w", + "access" : 1, + "parameters" : [ "value" ], + "descriptor" : "(IB)V" + }, { + "method" : "writeShortLE", + "owner" : "gr", + "name" : "bc", + "access" : 1, + "parameters" : [ "value" ], + "descriptor" : "(IB)V" + }, { + "method" : "writeSmartByteShort", + "owner" : "gr", + "name" : "b", + "access" : 1, + "parameters" : [ "value" ], + "descriptor" : "(II)V" + }, { + "method" : "writeStringCp1252NullCircumfixed", + "owner" : "gr", + "name" : "z", + "access" : 1, + "parameters" : [ "string" ], + "descriptor" : "(Ljava/lang/String;S)V" + }, { + "method" : "writeStringCp1252NullTerminated", + "owner" : "gr", + "name" : "d", + "access" : 1, + "parameters" : [ "string" ], + "descriptor" : "(Ljava/lang/String;B)V" + }, { + "method" : "xteaDecrypt", + "owner" : "gr", + "name" : "au", + "access" : 1, + "parameters" : [ "xteaKey", "start", "end" ], + "descriptor" : "([IIII)V" + }, { + "method" : "xteaDecryptAll", + "owner" : "gr", + "name" : "an", + "access" : 1, + "parameters" : [ "xteaKey" ], + "descriptor" : "([II)V" + }, { + "method" : "xteaEncrypt", + "owner" : "gr", + "name" : "az", + "access" : 1, + "parameters" : [ "xteaKey", "start", "end" ], + "descriptor" : "([IIII)V" + }, { + "method" : "xteaEncryptAll", + "owner" : "gr", + "name" : "am", + "access" : 1, + "parameters" : [ "xteaKey" ], + "descriptor" : "([IB)V" + }, { + "method" : "__f_295", + "owner" : "gr", + "name" : "f", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(S)V" + }, { + "method" : "__j_296", + "owner" : "gr", + "name" : "j", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/lang/CharSequence;B)V" + }, { + "method" : "__s_297", + "owner" : "gr", + "name" : "s", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "([BIII)V" + }, { + "method" : "__t_298", + "owner" : "gr", + "name" : "t", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(II)V" + }, { + "method" : "__y_299", + "owner" : "gr", + "name" : "y", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(II)V" + }, { + "method" : "__h_300", + "owner" : "gr", + "name" : "h", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(II)V" + }, { + "method" : "__c_301", + "owner" : "gr", + "name" : "c", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(II)V" + }, { + "method" : "__ag_302", + "owner" : "gr", + "name" : "ag", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)I" + }, { + "method" : "__aq_303", + "owner" : "gr", + "name" : "aq", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)I" + }, { + "method" : "__aw_304", + "owner" : "gr", + "name" : "aw", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)Ljava/lang/String;" + }, { + "method" : "__al_305", + "owner" : "gr", + "name" : "al", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "([BIIB)V" + }, { + "method" : "__ab_306", + "owner" : "gr", + "name" : "ab", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)I" + }, { + "method" : "__ae_307", + "owner" : "gr", + "name" : "ae", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__at_308", + "owner" : "gr", + "name" : "at", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__ad_309", + "owner" : "gr", + "name" : "ad", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)I" + }, { + "method" : "__ap_310", + "owner" : "gr", + "name" : "ap", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__as_311", + "owner" : "gr", + "name" : "as", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__aa_312", + "owner" : "gr", + "name" : "aa", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(II)I" + }, { + "method" : "__ax_313", + "owner" : "gr", + "name" : "ax", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)Z" + }, { + "method" : "__af_314", + "owner" : "gr", + "name" : "af", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(IB)V" + }, { + "method" : "__ai_315", + "owner" : "gr", + "name" : "ai", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(II)V" + }, { + "method" : "__ba_316", + "owner" : "gr", + "name" : "ba", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(IB)V" + }, { + "method" : "__bb_317", + "owner" : "gr", + "name" : "bb", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__bq_318", + "owner" : "gr", + "name" : "bq", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__bn_319", + "owner" : "gr", + "name" : "bn", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)B" + }, { + "method" : "__bk_320", + "owner" : "gr", + "name" : "bk", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)B" + }, { + "method" : "__bd_321", + "owner" : "gr", + "name" : "bd", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)B" + }, { + "method" : "__bo_322", + "owner" : "gr", + "name" : "bo", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(II)V" + }, { + "method" : "__bx_323", + "owner" : "gr", + "name" : "bx", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(IB)V" + }, { + "method" : "__by_324", + "owner" : "gr", + "name" : "by", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__bu_325", + "owner" : "gr", + "name" : "bu", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__bm_326", + "owner" : "gr", + "name" : "bm", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)I" + }, { + "method" : "__bl_327", + "owner" : "gr", + "name" : "bl", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)I" + }, { + "method" : "__br_328", + "owner" : "gr", + "name" : "br", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__bj_329", + "owner" : "gr", + "name" : "bj", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__bt_330", + "owner" : "gr", + "name" : "bt", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__bp_331", + "owner" : "gr", + "name" : "bp", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__bf_332", + "owner" : "gr", + "name" : "bf", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)I" + }, { + "method" : "__bh_333", + "owner" : "gr", + "name" : "bh", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "([BIII)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(I)V" + }, { + "access" : 1, + "descriptor" : "([B)V" + } ] +}, { + "class" : "PacketBuffer", + "name" : "hx", + "super" : "gr", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "bitIndex", + "owner" : "hx", + "name" : "d", + "access" : 0, + "descriptor" : "I", + "decoder" : -1048718919 + }, { + "field" : "isaacCipher0", + "owner" : "hx", + "name" : "e", + "access" : 0, + "descriptor" : "Lhn;" + } ], + "methods" : [ { + "method" : "bitsRemaining", + "owner" : "hx", + "name" : "jr", + "access" : 1, + "parameters" : [ "index" ], + "descriptor" : "(II)I" + }, { + "method" : "exportIndex", + "owner" : "hx", + "name" : "jm", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "importIndex", + "owner" : "hx", + "name" : "jq", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "newIsaacCipher", + "owner" : "hx", + "name" : "io", + "access" : 1, + "parameters" : [ "array" ], + "descriptor" : "([II)V" + }, { + "method" : "readBits", + "owner" : "hx", + "name" : "jw", + "access" : 1, + "parameters" : [ "bits" ], + "descriptor" : "(II)I" + }, { + "method" : "readByteIsaac", + "owner" : "hx", + "name" : "ii", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "readSmartByteShortIsaac", + "owner" : "hx", + "name" : "ia", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "setIsaacCipher", + "owner" : "hx", + "name" : "ih", + "access" : 1, + "parameters" : [ "isaacCipher" ], + "descriptor" : "(Lhn;B)V" + }, { + "method" : "writeByteIsaac", + "owner" : "hx", + "name" : "im", + "access" : 1, + "parameters" : [ "b" ], + "descriptor" : "(IS)V" + }, { + "method" : "__ig_334", + "owner" : "hx", + "name" : "ig", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)Z" + }, { + "method" : "__jb_335", + "owner" : "hx", + "name" : "jb", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "([BIII)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(I)V" + } ] +}, { + "class" : "IsaacCipher", + "name" : "hn", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "__e", + "owner" : "hn", + "name" : "e", + "access" : 0, + "descriptor" : "I", + "decoder" : -689202647 + }, { + "field" : "__g", + "owner" : "hn", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : -1670027699 + }, { + "field" : "__l", + "owner" : "hn", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : -325762649 + }, { + "field" : "__w", + "owner" : "hn", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : 1514845493 + }, { + "field" : "__o", + "owner" : "hn", + "name" : "o", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__u", + "owner" : "hn", + "name" : "u", + "access" : 0, + "descriptor" : "[I" + } ], + "methods" : [ { + "method" : "__m_336", + "owner" : "hn", + "name" : "m", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__f_337", + "owner" : "hn", + "name" : "f", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__q_338", + "owner" : "hn", + "name" : "q", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "__w_339", + "owner" : "hn", + "name" : "w", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(I)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "([I)V" + } ] +}, { + "class" : "MusicPatchNode2", + "name" : "hd", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__f", + "owner" : "hd", + "name" : "f", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "__m", + "owner" : "hd", + "name" : "m", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "__e", + "owner" : "hd", + "name" : "e", + "access" : 0, + "descriptor" : "I", + "decoder" : 1984131473 + }, { + "field" : "__g", + "owner" : "hd", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : 391670135 + }, { + "field" : "__l", + "owner" : "hd", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : 320761691 + }, { + "field" : "__o", + "owner" : "hd", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : -1455145595 + }, { + "field" : "__q", + "owner" : "hd", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 140046797 + }, { + "field" : "__u", + "owner" : "hd", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : 1577527995 + }, { + "field" : "__w", + "owner" : "hd", + "name" : "w", + "access" : 0, + "descriptor" : "I", + "decoder" : -249046051 + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "MidiPcmStream", + "name" : "hm", + "super" : "dc", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "midiFile", + "owner" : "hm", + "name" : "aq", + "access" : 0, + "descriptor" : "Lhs;" + }, { + "field" : "musicPatches", + "owner" : "hm", + "name" : "m", + "access" : 0, + "descriptor" : "Lld;" + }, { + "field" : "patchStream", + "owner" : "hm", + "name" : "ah", + "access" : 0, + "descriptor" : "Lhq;" + }, { + "field" : "track", + "owner" : "hm", + "name" : "av", + "access" : 0, + "descriptor" : "I", + "decoder" : 1450922835 + }, { + "field" : "trackLength", + "owner" : "hm", + "name" : "ar", + "access" : 0, + "descriptor" : "I", + "decoder" : 713752539 + }, { + "field" : "__aj", + "owner" : "hm", + "name" : "aj", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "__ag", + "owner" : "hm", + "name" : "ag", + "access" : 0, + "descriptor" : "[[Lha;" + }, { + "field" : "__v", + "owner" : "hm", + "name" : "v", + "access" : 0, + "descriptor" : "[[Lha;" + }, { + "field" : "__f", + "owner" : "hm", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 335918727 + }, { + "field" : "__q", + "owner" : "hm", + "name" : "q", + "access" : 0, + "descriptor" : "I", + "decoder" : 2095480747 + }, { + "field" : "__b", + "owner" : "hm", + "name" : "b", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__c", + "owner" : "hm", + "name" : "c", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__d", + "owner" : "hm", + "name" : "d", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__e", + "owner" : "hm", + "name" : "e", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__g", + "owner" : "hm", + "name" : "g", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__h", + "owner" : "hm", + "name" : "h", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__k", + "owner" : "hm", + "name" : "k", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__l", + "owner" : "hm", + "name" : "l", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__n", + "owner" : "hm", + "name" : "n", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__o", + "owner" : "hm", + "name" : "o", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__p", + "owner" : "hm", + "name" : "p", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__r", + "owner" : "hm", + "name" : "r", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__u", + "owner" : "hm", + "name" : "u", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__x", + "owner" : "hm", + "name" : "x", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__y", + "owner" : "hm", + "name" : "y", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__ac", + "owner" : "hm", + "name" : "ac", + "access" : 0, + "descriptor" : "J", + "decoder" : -7547625335559871937 + }, { + "field" : "__ay", + "owner" : "hm", + "name" : "ay", + "access" : 0, + "descriptor" : "J", + "decoder" : 3736036110499628937 + } ], + "methods" : [ { + "method" : "clear", + "owner" : "hm", + "name" : "a", + "access" : 33, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "clearAll", + "owner" : "hm", + "name" : "w", + "access" : 33, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "isReady", + "owner" : "hm", + "name" : "z", + "access" : 33, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "loadMusicTrack", + "owner" : "hm", + "name" : "q", + "access" : 33, + "parameters" : [ "musicTrack", "i", "s", "frequency" ], + "descriptor" : "(Lhe;Lir;Ldt;II)Z" + }, { + "method" : "removeAll", + "owner" : "hm", + "name" : "o", + "access" : 33, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "setMusicTrack", + "owner" : "hm", + "name" : "x", + "access" : 33, + "parameters" : [ "musicTrack", "b" ], + "descriptor" : "(Lhe;ZI)V" + }, { + "method" : "__m_340", + "owner" : "hm", + "name" : "m", + "access" : 33, + "parameters" : [ "arg0" ], + "descriptor" : "(IB)V" + }, { + "method" : "__f_341", + "owner" : "hm", + "name" : "f", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__j_342", + "owner" : "hm", + "name" : "j", + "access" : 33, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(III)V" + }, { + "method" : "__s_343", + "owner" : "hm", + "name" : "s", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(III)V" + }, { + "method" : "__t_344", + "owner" : "hm", + "name" : "t", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(III)V" + }, { + "method" : "__y_345", + "owner" : "hm", + "name" : "y", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(IIIB)V" + }, { + "method" : "__h_346", + "owner" : "hm", + "name" : "h", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Lha;ZI)V" + }, { + "method" : "__b_347", + "owner" : "hm", + "name" : "b", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(IIII)V" + }, { + "method" : "__c_348", + "owner" : "hm", + "name" : "c", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(IIII)V" + }, { + "method" : "__p_349", + "owner" : "hm", + "name" : "p", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(IIB)V" + }, { + "method" : "__v_350", + "owner" : "hm", + "name" : "v", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(IIB)V" + }, { + "method" : "__ah_351", + "owner" : "hm", + "name" : "ah", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(II)V" + }, { + "method" : "__ab_352", + "owner" : "hm", + "name" : "ab", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(II)V" + }, { + "method" : "__ae_353", + "owner" : "hm", + "name" : "ae", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(II)V" + }, { + "method" : "__at_354", + "owner" : "hm", + "name" : "at", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__ad_355", + "owner" : "hm", + "name" : "ad", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(II)V" + }, { + "method" : "__ap_356", + "owner" : "hm", + "name" : "ap", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(II)V" + }, { + "method" : "__au_357", + "owner" : "hm", + "name" : "au", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(II)V" + }, { + "method" : "__ao_358", + "owner" : "hm", + "name" : "ao", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(III)V" + }, { + "method" : "__aa_359", + "owner" : "hm", + "name" : "aa", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(Lha;I)I" + }, { + "method" : "__ax_360", + "owner" : "hm", + "name" : "ax", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(Lha;I)I" + }, { + "method" : "__af_361", + "owner" : "hm", + "name" : "af", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(Lha;I)I" + }, { + "method" : "__u_362", + "owner" : "hm", + "name" : "u", + "access" : 36, + "parameters" : [ ], + "descriptor" : "()Ldc;" + }, { + "method" : "__g_363", + "owner" : "hm", + "name" : "g", + "access" : 36, + "parameters" : [ ], + "descriptor" : "()Ldc;" + }, { + "method" : "__l_364", + "owner" : "hm", + "name" : "l", + "access" : 36, + "parameters" : [ ], + "descriptor" : "()I" + }, { + "method" : "__e_365", + "owner" : "hm", + "name" : "e", + "access" : 36, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "([III)V" + }, { + "method" : "__d_366", + "owner" : "hm", + "name" : "d", + "access" : 36, + "parameters" : [ "arg0" ], + "descriptor" : "(I)V" + }, { + "method" : "__ai_367", + "owner" : "hm", + "name" : "ai", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "__ba_368", + "owner" : "hm", + "name" : "ba", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(Lha;I)Z" + }, { + "method" : "__bb_369", + "owner" : "hm", + "name" : "bb", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], + "descriptor" : "(Lha;[IIII)Z" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "MusicPatchNode", + "name" : "ha", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "patch", + "owner" : "ha", + "name" : "f", + "access" : 0, + "descriptor" : "Lhl;" + }, { + "field" : "rawSound", + "owner" : "ha", + "name" : "q", + "access" : 0, + "descriptor" : "Lcx;" + }, { + "field" : "stream", + "owner" : "ha", + "name" : "t", + "access" : 0, + "descriptor" : "Lds;" + }, { + "field" : "__w", + "owner" : "ha", + "name" : "w", + "access" : 0, + "descriptor" : "Lhd;" + }, { + "field" : "__a", + "owner" : "ha", + "name" : "a", + "access" : 0, + "descriptor" : "I", + "decoder" : -2083252379 + }, { + "field" : "__b", + "owner" : "ha", + "name" : "b", + "access" : 0, + "descriptor" : "I", + "decoder" : 1359854411 + }, { + "field" : "__d", + "owner" : "ha", + "name" : "d", + "access" : 0, + "descriptor" : "I", + "decoder" : -852988281 + }, { + "field" : "__e", + "owner" : "ha", + "name" : "e", + "access" : 0, + "descriptor" : "I", + "decoder" : -471899285 + }, { + "field" : "__g", + "owner" : "ha", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : -836502917 + }, { + "field" : "__i", + "owner" : "ha", + "name" : "i", + "access" : 0, + "descriptor" : "I", + "decoder" : -2136855685 + }, { + "field" : "__j", + "owner" : "ha", + "name" : "j", + "access" : 0, + "descriptor" : "I", + "decoder" : 173672931 + }, { + "field" : "__k", + "owner" : "ha", + "name" : "k", + "access" : 0, + "descriptor" : "I", + "decoder" : -439388365 + }, { + "field" : "__l", + "owner" : "ha", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : -308599455 + }, { + "field" : "__m", + "owner" : "ha", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : 801157533 + }, { + "field" : "__n", + "owner" : "ha", + "name" : "n", + "access" : 0, + "descriptor" : "I", + "decoder" : 476852577 + }, { + "field" : "__o", + "owner" : "ha", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : -2058553171 + }, { + "field" : "__s", + "owner" : "ha", + "name" : "s", + "access" : 0, + "descriptor" : "I", + "decoder" : 219840779 + }, { + "field" : "__u", + "owner" : "ha", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : 62958303 + }, { + "field" : "__x", + "owner" : "ha", + "name" : "x", + "access" : 0, + "descriptor" : "I", + "decoder" : -1520706641 + }, { + "field" : "__y", + "owner" : "ha", + "name" : "y", + "access" : 0, + "descriptor" : "I", + "decoder" : -666877449 + }, { + "field" : "__z", + "owner" : "ha", + "name" : "z", + "access" : 0, + "descriptor" : "I", + "decoder" : 1605236771 + } ], + "methods" : [ { + "method" : "__m_370", + "owner" : "ha", + "name" : "m", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "MidiFileReader", + "name" : "hs", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "buffer", + "owner" : "hs", + "name" : "m", + "access" : 0, + "descriptor" : "Lgr;" + }, { + "field" : "division", + "owner" : "hs", + "name" : "f", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "trackLengths", + "owner" : "hs", + "name" : "o", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "trackPositions", + "owner" : "hs", + "name" : "w", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "trackStarts", + "owner" : "hs", + "name" : "q", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__g", + "owner" : "hs", + "name" : "g", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "__u", + "owner" : "hs", + "name" : "u", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__e", + "owner" : "hs", + "name" : "e", + "access" : 0, + "descriptor" : "J" + } ], + "methods" : [ { + "method" : "clear", + "owner" : "hs", + "name" : "f", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "getPrioritizedTrack", + "owner" : "hs", + "name" : "z", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()I" + }, { + "method" : "gotoTrack", + "owner" : "hs", + "name" : "o", + "access" : 0, + "parameters" : [ "trackId" ], + "descriptor" : "(I)V" + }, { + "method" : "isDone", + "owner" : "hs", + "name" : "j", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()Z" + }, { + "method" : "isReady", + "owner" : "hs", + "name" : "q", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()Z" + }, { + "method" : "markTrackPosition", + "owner" : "hs", + "name" : "u", + "access" : 0, + "parameters" : [ "trackId" ], + "descriptor" : "(I)V" + }, { + "method" : "parse", + "owner" : "hs", + "name" : "m", + "access" : 0, + "parameters" : [ "midi" ], + "descriptor" : "([B)V" + }, { + "method" : "readMessage", + "owner" : "hs", + "name" : "e", + "access" : 0, + "parameters" : [ "trackId" ], + "descriptor" : "(I)I" + }, { + "method" : "readMessage0", + "owner" : "hs", + "name" : "x", + "access" : 0, + "parameters" : [ "trackId" ], + "descriptor" : "(I)I" + }, { + "method" : "readTrackLength", + "owner" : "hs", + "name" : "l", + "access" : 0, + "parameters" : [ "trackId" ], + "descriptor" : "(I)V" + }, { + "method" : "reset", + "owner" : "hs", + "name" : "s", + "access" : 0, + "descriptor" : "(J)V" + }, { + "method" : "setTrackDone", + "owner" : "hs", + "name" : "g", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "trackCount", + "owner" : "hs", + "name" : "w", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()I" + }, { + "method" : "__d_371", + "owner" : "hs", + "name" : "d", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(II)I" + }, { + "method" : "__a_372", + "owner" : "hs", + "name" : "a", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(I)J" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + }, { + "access" : 0, + "descriptor" : "([B)V" + } ] +}, { + "class" : "MusicPatch", + "name" : "hl", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "rawSounds", + "owner" : "hl", + "name" : "f", + "access" : 0, + "descriptor" : "[Lcx;" + }, { + "field" : "__g", + "owner" : "hl", + "name" : "g", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "__o", + "owner" : "hl", + "name" : "o", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "__w", + "owner" : "hl", + "name" : "w", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "__u", + "owner" : "hl", + "name" : "u", + "access" : 0, + "descriptor" : "[Lhd;" + }, { + "field" : "__m", + "owner" : "hl", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : 574200865 + }, { + "field" : "__l", + "owner" : "hl", + "name" : "l", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__q", + "owner" : "hl", + "name" : "q", + "access" : 0, + "descriptor" : "[S" + } ], + "methods" : [ { + "method" : "clear", + "owner" : "hl", + "name" : "q", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "__f_373", + "owner" : "hl", + "name" : "f", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(Ldt;[B[II)Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "([B)V" + } ] +}, { + "class" : "MusicPatchPcmStream", + "name" : "hq", + "super" : "dc", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "mixer", + "owner" : "hq", + "name" : "q", + "access" : 0, + "descriptor" : "Lct;" + }, { + "field" : "queue", + "owner" : "hq", + "name" : "f", + "access" : 0, + "descriptor" : "Lje;" + }, { + "field" : "superStream", + "owner" : "hq", + "name" : "m", + "access" : 0, + "descriptor" : "Lhm;" + } ], + "methods" : [ { + "method" : "__u_374", + "owner" : "hq", + "name" : "u", + "access" : 4, + "parameters" : [ ], + "descriptor" : "()Ldc;" + }, { + "method" : "__g_375", + "owner" : "hq", + "name" : "g", + "access" : 4, + "parameters" : [ ], + "descriptor" : "()Ldc;" + }, { + "method" : "__l_376", + "owner" : "hq", + "name" : "l", + "access" : 4, + "parameters" : [ ], + "descriptor" : "()I" + }, { + "method" : "__e_377", + "owner" : "hq", + "name" : "e", + "access" : 4, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "([III)V" + }, { + "method" : "__d_378", + "owner" : "hq", + "name" : "d", + "access" : 4, + "parameters" : [ "arg0" ], + "descriptor" : "(I)V" + }, { + "method" : "__m_379", + "owner" : "hq", + "name" : "m", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], + "descriptor" : "(Lha;[IIIII)V" + }, { + "method" : "__f_380", + "owner" : "hq", + "name" : "f", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Lha;II)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Lhm;)V" + } ] +}, { + "class" : "MusicTrack", + "name" : "he", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "midi", + "owner" : "he", + "name" : "f", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "table", + "owner" : "he", + "name" : "m", + "access" : 0, + "descriptor" : "Lld;" + } ], + "methods" : [ { + "method" : "clear", + "owner" : "he", + "name" : "q", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__f_381", + "owner" : "he", + "name" : "f", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Lgr;)V" + } ] +}, { + "class" : "Coord", + "name" : "hu", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "x", + "owner" : "hu", + "name" : "f", + "access" : 1, + "descriptor" : "I", + "decoder" : 1225620013 + }, { + "field" : "y", + "owner" : "hu", + "name" : "m", + "access" : 1, + "descriptor" : "I", + "decoder" : 503621925 + }, { + "field" : "z", + "owner" : "hu", + "name" : "q", + "access" : 1, + "descriptor" : "I", + "decoder" : 154740833 + } ], + "methods" : [ { + "method" : "equals0", + "owner" : "hu", + "name" : "f", + "access" : 0, + "parameters" : [ "other" ], + "descriptor" : "(Lhu;B)Z" + }, { + "method" : "packed", + "owner" : "hu", + "name" : "m", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "toString0", + "owner" : "hu", + "name" : "q", + "access" : 0, + "parameters" : [ "separator" ], + "descriptor" : "(Ljava/lang/String;I)Ljava/lang/String;" + }, { + "method" : "__equals_382", + "owner" : "hu", + "name" : "equals", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/lang/Object;)Z" + }, { + "method" : "__hashCode_383", + "owner" : "hu", + "name" : "hashCode", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()I" + }, { + "method" : "__toString_384", + "owner" : "hu", + "name" : "toString", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Ljava/lang/String;" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(III)V" + }, { + "access" : 1, + "descriptor" : "(Lhu;)V" + }, { + "access" : 1, + "descriptor" : "(I)V" + } ] +}, { + "class" : "PlayerAppearance", + "name" : "hi", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "bodyColors", + "owner" : "hi", + "name" : "f", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "equipment", + "owner" : "hi", + "name" : "m", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "isFemale", + "owner" : "hi", + "name" : "q", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "npcTransformId", + "owner" : "hi", + "name" : "w", + "access" : 1, + "descriptor" : "I", + "decoder" : 1676934923 + }, { + "field" : "__o", + "owner" : "hi", + "name" : "o", + "access" : 0, + "descriptor" : "J", + "decoder" : -3506189412688081513 + }, { + "field" : "__u", + "owner" : "hi", + "name" : "u", + "access" : 0, + "descriptor" : "J", + "decoder" : 8217880921734028425 + } ], + "methods" : [ { + "method" : "getChatHeadId", + "owner" : "hi", + "name" : "e", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)I" + }, { + "method" : "getModel", + "owner" : "hi", + "name" : "g", + "access" : 1, + "descriptor" : "(Ljh;ILjh;II)Ldu;" + }, { + "method" : "getModelData", + "owner" : "hi", + "name" : "l", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)Ldw;" + }, { + "method" : "__m_385", + "owner" : "hi", + "name" : "m", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], + "descriptor" : "([I[IZII)V" + }, { + "method" : "__f_386", + "owner" : "hi", + "name" : "f", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(IZI)V" + }, { + "method" : "__q_387", + "owner" : "hi", + "name" : "q", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(IZI)V" + }, { + "method" : "__w_388", + "owner" : "hi", + "name" : "w", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(ZB)V" + }, { + "method" : "__o_389", + "owner" : "hi", + "name" : "o", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Lgr;I)V" + }, { + "method" : "__u_390", + "owner" : "hi", + "name" : "u", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "Component", + "name" : "ho", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "actions", + "owner" : "ho", + "name" : "dx", + "access" : 1, + "descriptor" : "[Ljava/lang/String;" + }, { + "field" : "buttonText", + "owner" : "ho", + "name" : "ec", + "access" : 1, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "buttonType", + "owner" : "ho", + "name" : "b", + "access" : 1, + "descriptor" : "I", + "decoder" : 1412102151 + }, { + "field" : "childIndex", + "owner" : "ho", + "name" : "y", + "access" : 1, + "descriptor" : "I", + "decoder" : -648033351 + }, { + "field" : "children", + "owner" : "ho", + "name" : "ep", + "access" : 1, + "descriptor" : "[Lho;" + }, { + "field" : "clickMask", + "owner" : "ho", + "name" : "cw", + "access" : 1, + "descriptor" : "I", + "decoder" : 1856618959 + }, { + "field" : "clientCode", + "owner" : "ho", + "name" : "c", + "access" : 1, + "descriptor" : "I", + "decoder" : -581762425 + }, { + "field" : "color", + "owner" : "ho", + "name" : "am", + "access" : 1, + "descriptor" : "I", + "decoder" : -2022638615 + }, { + "field" : "color2", + "owner" : "ho", + "name" : "an", + "access" : 1, + "descriptor" : "I", + "decoder" : -365781561 + }, { + "field" : "cs1ComparisonValues", + "owner" : "ho", + "name" : "er", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "cs1Comparisons", + "owner" : "ho", + "name" : "ey", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "cs1Instructions", + "owner" : "ho", + "name" : "eo", + "access" : 1, + "descriptor" : "[[I" + }, { + "field" : "cycle", + "owner" : "ho", + "name" : "fd", + "access" : 1, + "descriptor" : "I", + "decoder" : -1995006949 + }, { + "field" : "dataText", + "owner" : "ho", + "name" : "de", + "access" : 1, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "dragThreshold", + "owner" : "ho", + "name" : "df", + "access" : 1, + "descriptor" : "I", + "decoder" : -1021798347 + }, { + "field" : "dragZoneSize", + "owner" : "ho", + "name" : "dn", + "access" : 1, + "descriptor" : "I", + "decoder" : 2092800189 + }, { + "field" : "fill", + "owner" : "ho", + "name" : "ao", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "fontId", + "owner" : "ho", + "name" : "cr", + "access" : 1, + "descriptor" : "I", + "decoder" : 1435746863 + }, { + "field" : "hasListener", + "owner" : "ho", + "name" : "ds", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "height", + "owner" : "ho", + "name" : "ak", + "access" : 1, + "descriptor" : "I", + "decoder" : 1656646737 + }, { + "field" : "heightAlignment", + "owner" : "ho", + "name" : "ag", + "access" : 1, + "descriptor" : "I", + "decoder" : -709256449 + }, { + "field" : "id", + "owner" : "ho", + "name" : "t", + "access" : 1, + "descriptor" : "I", + "decoder" : -941148335 + }, { + "field" : "invTransmitTriggers", + "owner" : "ho", + "name" : "du", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "inventorySprites", + "owner" : "ho", + "name" : "cq", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "inventoryXOffsets", + "owner" : "ho", + "name" : "ck", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "inventoryYOffsets", + "owner" : "ho", + "name" : "cn", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "isHidden", + "owner" : "ho", + "name" : "ae", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "isIf3", + "owner" : "ho", + "name" : "s", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "isScrollBar", + "owner" : "ho", + "name" : "da", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "itemActions", + "owner" : "ho", + "name" : "ch", + "access" : 1, + "descriptor" : "[Ljava/lang/String;" + }, { + "field" : "itemId", + "owner" : "ho", + "name" : "ea", + "access" : 1, + "descriptor" : "I", + "decoder" : 1248629915 + }, { + "field" : "itemIds", + "owner" : "ho", + "name" : "ef", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "itemQuantities", + "owner" : "ho", + "name" : "ev", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "itemQuantity", + "owner" : "ho", + "name" : "es", + "access" : 1, + "descriptor" : "I", + "decoder" : 340244859 + }, { + "field" : "lineWid", + "owner" : "ho", + "name" : "ai", + "access" : 1, + "descriptor" : "I", + "decoder" : -110526699 + }, { + "field" : "modelAngleX", + "owner" : "ho", + "name" : "bz", + "access" : 1, + "descriptor" : "I", + "decoder" : 2044722063 + }, { + "field" : "modelAngleY", + "owner" : "ho", + "name" : "bg", + "access" : 1, + "descriptor" : "I", + "decoder" : -1253859481 + }, { + "field" : "modelAngleZ", + "owner" : "ho", + "name" : "bt", + "access" : 1, + "descriptor" : "I", + "decoder" : -692411223 + }, { + "field" : "modelFrame", + "owner" : "ho", + "name" : "eg", + "access" : 1, + "descriptor" : "I", + "decoder" : -431656963 + }, { + "field" : "modelFrameCycle", + "owner" : "ho", + "name" : "ez", + "access" : 1, + "descriptor" : "I", + "decoder" : -95117407 + }, { + "field" : "modelId", + "owner" : "ho", + "name" : "by", + "access" : 1, + "descriptor" : "I", + "decoder" : -2013625215 + }, { + "field" : "modelId2", + "owner" : "ho", + "name" : "bm", + "access" : 0, + "descriptor" : "I", + "decoder" : -201557389 + }, { + "field" : "modelOffsetX", + "owner" : "ho", + "name" : "bj", + "access" : 1, + "descriptor" : "I", + "decoder" : -459670781 + }, { + "field" : "modelOffsetY", + "owner" : "ho", + "name" : "bi", + "access" : 1, + "descriptor" : "I", + "decoder" : -2018053063 + }, { + "field" : "modelOrthog", + "owner" : "ho", + "name" : "be", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "modelTransparency", + "owner" : "ho", + "name" : "bv", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "modelType", + "owner" : "ho", + "name" : "bx", + "access" : 1, + "descriptor" : "I", + "decoder" : 630750753 + }, { + "field" : "modelType2", + "owner" : "ho", + "name" : "bu", + "access" : 0, + "descriptor" : "I", + "decoder" : 138222099 + }, { + "field" : "modelZoom", + "owner" : "ho", + "name" : "bp", + "access" : 1, + "descriptor" : "I", + "decoder" : -2133338643 + }, { + "field" : "mouseOverColor", + "owner" : "ho", + "name" : "az", + "access" : 1, + "descriptor" : "I", + "decoder" : -1831692129 + }, { + "field" : "mouseOverColor2", + "owner" : "ho", + "name" : "au", + "access" : 1, + "descriptor" : "I", + "decoder" : 1236161275 + }, { + "field" : "mouseOverRedirect", + "owner" : "ho", + "name" : "ew", + "access" : 1, + "descriptor" : "I", + "decoder" : -1390352887 + }, { + "field" : "noClickThrough", + "owner" : "ho", + "name" : "fx", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "onChatTransmit", + "owner" : "ho", + "name" : "em", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onClanTransmit", + "owner" : "ho", + "name" : "ej", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onClick", + "owner" : "ho", + "name" : "dc", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onClickRepeat", + "owner" : "ho", + "name" : "dg", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onDialogAbort", + "owner" : "ho", + "name" : "en", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onDrag", + "owner" : "ho", + "name" : "dr", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onDragComplete", + "owner" : "ho", + "name" : "dw", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onFriendTransmit", + "owner" : "ho", + "name" : "ex", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onHold", + "owner" : "ho", + "name" : "dd", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onInvTransmit", + "owner" : "ho", + "name" : "dj", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onKey", + "owner" : "ho", + "name" : "ed", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onLoad", + "owner" : "ho", + "name" : "di", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onMiscTransmit", + "owner" : "ho", + "name" : "el", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onMouseLeave", + "owner" : "ho", + "name" : "dl", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onMouseOver", + "owner" : "ho", + "name" : "dy", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onMouseRepeat", + "owner" : "ho", + "name" : "dk", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onOp", + "owner" : "ho", + "name" : "eb", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onRelease", + "owner" : "ho", + "name" : "db", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onScrollWheel", + "owner" : "ho", + "name" : "ek", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onStatTransmit", + "owner" : "ho", + "name" : "dm", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onStockTransmit", + "owner" : "ho", + "name" : "eq", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onSubChange", + "owner" : "ho", + "name" : "ei", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onTargetEnter", + "owner" : "ho", + "name" : "dv", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onTargetLeave", + "owner" : "ho", + "name" : "do", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onTimer", + "owner" : "ho", + "name" : "et", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "onVarTransmit", + "owner" : "ho", + "name" : "dh", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "outline", + "owner" : "ho", + "name" : "bk", + "access" : 1, + "descriptor" : "I", + "decoder" : -594884327 + }, { + "field" : "paddingX", + "owner" : "ho", + "name" : "cu", + "access" : 1, + "descriptor" : "I", + "decoder" : -23173063 + }, { + "field" : "paddingY", + "owner" : "ho", + "name" : "cb", + "access" : 1, + "descriptor" : "I", + "decoder" : 720760323 + }, { + "field" : "parent", + "owner" : "ho", + "name" : "dt", + "access" : 1, + "descriptor" : "Lho;" + }, { + "field" : "parentId", + "owner" : "ho", + "name" : "ab", + "access" : 1, + "descriptor" : "I", + "decoder" : -617209253 + }, { + "field" : "rawHeight", + "owner" : "ho", + "name" : "ar", + "access" : 1, + "descriptor" : "I", + "decoder" : 1202342839 + }, { + "field" : "rawWidth", + "owner" : "ho", + "name" : "av", + "access" : 1, + "descriptor" : "I", + "decoder" : -2001402777 + }, { + "field" : "rawX", + "owner" : "ho", + "name" : "aq", + "access" : 1, + "descriptor" : "I", + "decoder" : -872904863 + }, { + "field" : "rawY", + "owner" : "ho", + "name" : "aj", + "access" : 1, + "descriptor" : "I", + "decoder" : -1814696937 + }, { + "field" : "rectangleMode", + "owner" : "ho", + "name" : "aa", + "access" : 1, + "descriptor" : "Llj;" + }, { + "field" : "rootIndex", + "owner" : "ho", + "name" : "fp", + "access" : 1, + "descriptor" : "I", + "decoder" : 365867737 + }, { + "field" : "scrollHeight", + "owner" : "ho", + "name" : "as", + "access" : 1, + "descriptor" : "I", + "decoder" : -867175629 + }, { + "field" : "scrollWidth", + "owner" : "ho", + "name" : "ap", + "access" : 1, + "descriptor" : "I", + "decoder" : -623790443 + }, { + "field" : "scrollX", + "owner" : "ho", + "name" : "at", + "access" : 1, + "descriptor" : "I", + "decoder" : 2090399935 + }, { + "field" : "scrollY", + "owner" : "ho", + "name" : "ad", + "access" : 1, + "descriptor" : "I", + "decoder" : -537618643 + }, { + "field" : "sequenceId", + "owner" : "ho", + "name" : "bl", + "access" : 1, + "descriptor" : "I", + "decoder" : -1423753745 + }, { + "field" : "sequenceId2", + "owner" : "ho", + "name" : "br", + "access" : 1, + "descriptor" : "I", + "decoder" : -856053301 + }, { + "field" : "spellActionName", + "owner" : "ho", + "name" : "dp", + "access" : 1, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "spellName", + "owner" : "ho", + "name" : "eu", + "access" : 1, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "spriteAngle", + "owner" : "ho", + "name" : "bq", + "access" : 1, + "descriptor" : "I", + "decoder" : -1361791123 + }, { + "field" : "spriteFlipH", + "owner" : "ho", + "name" : "bo", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "spriteFlipV", + "owner" : "ho", + "name" : "bc", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "spriteId", + "owner" : "ho", + "name" : "bs", + "access" : 1, + "descriptor" : "I", + "decoder" : 1573420153 + }, { + "field" : "spriteId2", + "owner" : "ho", + "name" : "bb", + "access" : 1, + "descriptor" : "I", + "decoder" : -1074168553 + }, { + "field" : "spriteShadow", + "owner" : "ho", + "name" : "bd", + "access" : 1, + "descriptor" : "I", + "decoder" : 215797483 + }, { + "field" : "spriteTiling", + "owner" : "ho", + "name" : "bn", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "statTransmitTriggers", + "owner" : "ho", + "name" : "dq", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "text", + "owner" : "ho", + "name" : "cv", + "access" : 1, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "text2", + "owner" : "ho", + "name" : "ce", + "access" : 1, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "textLineHeight", + "owner" : "ho", + "name" : "cy", + "access" : 1, + "descriptor" : "I", + "decoder" : 1401272343 + }, { + "field" : "textShadowed", + "owner" : "ho", + "name" : "cj", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "textXAlignment", + "owner" : "ho", + "name" : "cs", + "access" : 1, + "descriptor" : "I", + "decoder" : 1527989635 + }, { + "field" : "textYAlignment", + "owner" : "ho", + "name" : "cm", + "access" : 1, + "descriptor" : "I", + "decoder" : 1271997981 + }, { + "field" : "transparency", + "owner" : "ho", + "name" : "ax", + "access" : 1, + "descriptor" : "I", + "decoder" : -638557371 + }, { + "field" : "type", + "owner" : "ho", + "name" : "h", + "access" : 1, + "descriptor" : "I", + "decoder" : 1521310729 + }, { + "field" : "varTransmitTriggers", + "owner" : "ho", + "name" : "dz", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "width", + "owner" : "ho", + "name" : "ah", + "access" : 1, + "descriptor" : "I", + "decoder" : 1716081883 + }, { + "field" : "widthAlignment", + "owner" : "ho", + "name" : "v", + "access" : 1, + "descriptor" : "I", + "decoder" : 1628640897 + }, { + "field" : "x", + "owner" : "ho", + "name" : "ac", + "access" : 1, + "descriptor" : "I", + "decoder" : 1271321381 + }, { + "field" : "xAlignment", + "owner" : "ho", + "name" : "r", + "access" : 1, + "descriptor" : "I", + "decoder" : 523318277 + }, { + "field" : "y", + "owner" : "ho", + "name" : "ay", + "access" : 1, + "descriptor" : "I", + "decoder" : 1492291497 + }, { + "field" : "yAlignment", + "owner" : "ho", + "name" : "p", + "access" : 1, + "descriptor" : "I", + "decoder" : 1300531185 + }, { + "field" : "__ba", + "owner" : "ho", + "name" : "ba", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "__cg", + "owner" : "ho", + "name" : "cg", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "__fm", + "owner" : "ho", + "name" : "fm", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "__fq", + "owner" : "ho", + "name" : "fq", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "__fw", + "owner" : "ho", + "name" : "fw", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "__fz", + "owner" : "ho", + "name" : "fz", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "__cf", + "owner" : "ho", + "name" : "cf", + "access" : 1, + "descriptor" : "[[B" + }, { + "field" : "__cp", + "owner" : "ho", + "name" : "cp", + "access" : 1, + "descriptor" : "[[B" + }, { + "field" : "__af", + "owner" : "ho", + "name" : "af", + "access" : 1, + "descriptor" : "I", + "decoder" : -1853255291 + }, { + "field" : "__al", + "owner" : "ho", + "name" : "al", + "access" : 1, + "descriptor" : "I", + "decoder" : -1047989223 + }, { + "field" : "__aw", + "owner" : "ho", + "name" : "aw", + "access" : 1, + "descriptor" : "I", + "decoder" : 206556853 + }, { + "field" : "__bf", + "owner" : "ho", + "name" : "bf", + "access" : 1, + "descriptor" : "I", + "decoder" : -1692331135 + }, { + "field" : "__bh", + "owner" : "ho", + "name" : "bh", + "access" : 1, + "descriptor" : "I", + "decoder" : 727421593 + }, { + "field" : "__bw", + "owner" : "ho", + "name" : "bw", + "access" : 1, + "descriptor" : "I", + "decoder" : -1658511475 + }, { + "field" : "__fc", + "owner" : "ho", + "name" : "fc", + "access" : 1, + "descriptor" : "I", + "decoder" : 209458049 + }, { + "field" : "__fg", + "owner" : "ho", + "name" : "fg", + "access" : 1, + "descriptor" : "I", + "decoder" : -1520351537 + }, { + "field" : "__fj", + "owner" : "ho", + "name" : "fj", + "access" : 1, + "descriptor" : "I", + "decoder" : 876695207 + }, { + "field" : "__fl", + "owner" : "ho", + "name" : "fl", + "access" : 1, + "descriptor" : "I", + "decoder" : -672198209 + }, { + "field" : "__cc", + "owner" : "ho", + "name" : "cc", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "__ci", + "owner" : "ho", + "name" : "ci", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "__fh", + "owner" : "ho", + "name" : "fh", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "__ee", + "owner" : "ho", + "name" : "ee", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "__eh", + "owner" : "ho", + "name" : "eh", + "access" : 1, + "descriptor" : "[Ljava/lang/Object;" + } ], + "methods" : [ { + "method" : "decode", + "owner" : "ho", + "name" : "u", + "access" : 0, + "parameters" : [ "buffer" ], + "descriptor" : "(Lgr;I)V" + }, { + "method" : "decodeLegacy", + "owner" : "ho", + "name" : "o", + "access" : 0, + "parameters" : [ "buffer" ], + "descriptor" : "(Lgr;I)V" + }, { + "method" : "getFont", + "owner" : "ho", + "name" : "d", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)Lkk;" + }, { + "method" : "getInventorySprite", + "owner" : "ho", + "name" : "a", + "access" : 1, + "descriptor" : "(II)Lln;" + }, { + "method" : "getModel", + "owner" : "ho", + "name" : "z", + "access" : 1, + "parameters" : [ "sequence", "frame", "b", "appearance" ], + "descriptor" : "(Ljh;IZLhi;I)Ldu;" + }, { + "method" : "getSprite", + "owner" : "ho", + "name" : "x", + "access" : 1, + "parameters" : [ "b" ], + "descriptor" : "(ZI)Lln;" + }, { + "method" : "getSpriteMask", + "owner" : "ho", + "name" : "j", + "access" : 1, + "parameters" : [ "b" ], + "descriptor" : "(ZB)Lhp;" + }, { + "method" : "readListener", + "owner" : "ho", + "name" : "g", + "access" : 0, + "parameters" : [ "buffer" ], + "descriptor" : "(Lgr;I)[Ljava/lang/Object;" + }, { + "method" : "readListenerTriggers", + "owner" : "ho", + "name" : "l", + "access" : 0, + "parameters" : [ "buffer" ], + "descriptor" : "(Lgr;B)[I" + }, { + "method" : "setAction", + "owner" : "ho", + "name" : "t", + "access" : 1, + "parameters" : [ "index", "s" ], + "descriptor" : "(ILjava/lang/String;B)V" + }, { + "method" : "swapItems", + "owner" : "ho", + "name" : "e", + "access" : 1, + "parameters" : [ "indexA", "indexB" ], + "descriptor" : "(III)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "PlayerType", + "name" : "ij", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "gc" ], + "fields" : [ { + "field" : "id", + "owner" : "ij", + "name" : "g", + "access" : 16, + "descriptor" : "I", + "decoder" : 1999564657 + }, { + "field" : "isPrivileged", + "owner" : "ij", + "name" : "e", + "access" : 17, + "descriptor" : "Z" + }, { + "field" : "isUser", + "owner" : "ij", + "name" : "x", + "access" : 17, + "descriptor" : "Z" + }, { + "field" : "modIcon", + "owner" : "ij", + "name" : "l", + "access" : 17, + "descriptor" : "I", + "decoder" : 613822977 + } ], + "methods" : [ { + "method" : "__f_391", + "owner" : "ij", + "name" : "f", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(IIZZZ)V" + } ] +}, { + "class" : "AbstractArchive", + "name" : "ir", + "super" : "java.lang.Object", + "access" : 1057, + "interfaces" : [ ], + "fields" : [ { + "field" : "fileCounts", + "owner" : "ir", + "name" : "l", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "fileIds", + "owner" : "ir", + "name" : "e", + "access" : 0, + "descriptor" : "[[I" + }, { + "field" : "fileNameHashTables", + "owner" : "ir", + "name" : "d", + "access" : 0, + "descriptor" : "[Llv;" + }, { + "field" : "fileNameHashes", + "owner" : "ir", + "name" : "x", + "access" : 0, + "descriptor" : "[[I" + }, { + "field" : "files", + "owner" : "ir", + "name" : "n", + "access" : 0, + "descriptor" : "[[Ljava/lang/Object;" + }, { + "field" : "groupCount", + "owner" : "ir", + "name" : "f", + "access" : 0, + "descriptor" : "I", + "decoder" : 1694798923 + }, { + "field" : "groupCrcs", + "owner" : "ir", + "name" : "u", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "groupIds", + "owner" : "ir", + "name" : "q", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "groupNameHashTable", + "owner" : "ir", + "name" : "o", + "access" : 0, + "descriptor" : "Llv;" + }, { + "field" : "groupNameHashes", + "owner" : "ir", + "name" : "w", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "groupVersions", + "owner" : "ir", + "name" : "g", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "groups", + "owner" : "ir", + "name" : "k", + "access" : 0, + "descriptor" : "[Ljava/lang/Object;" + }, { + "field" : "hash", + "owner" : "ir", + "name" : "a", + "access" : 1, + "descriptor" : "I", + "decoder" : -530370811 + }, { + "field" : "releaseGroups", + "owner" : "ir", + "name" : "z", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "shallowFiles", + "owner" : "ir", + "name" : "j", + "access" : 0, + "descriptor" : "Z" + } ], + "methods" : [ { + "method" : "buildFiles", + "owner" : "ir", + "name" : "c", + "access" : 0, + "parameters" : [ "group", "xteaKey" ], + "descriptor" : "(I[II)Z" + }, { + "method" : "decodeIndex", + "owner" : "ir", + "name" : "m", + "access" : 0, + "descriptor" : "([BB)V" + }, { + "method" : "getFile", + "owner" : "ir", + "name" : "d", + "access" : 1, + "parameters" : [ "group", "file" ], + "descriptor" : "(III)[B" + }, { + "method" : "getFileFlat", + "owner" : "ir", + "name" : "a", + "access" : 1, + "parameters" : [ "groupOrFile" ], + "descriptor" : "(IB)[B" + }, { + "method" : "getFileId", + "owner" : "ir", + "name" : "v", + "access" : 1, + "parameters" : [ "group", "fileName" ], + "descriptor" : "(ILjava/lang/String;I)I" + }, { + "method" : "getGroupId", + "owner" : "ir", + "name" : "p", + "access" : 1, + "parameters" : [ "groupName" ], + "descriptor" : "(Ljava/lang/String;I)I" + }, { + "method" : "groupLoadPercent", + "owner" : "ir", + "name" : "e", + "access" : 0, + "descriptor" : "(II)I" + }, { + "method" : "groupLoadPercentByName", + "owner" : "ir", + "name" : "ac", + "access" : 1, + "parameters" : [ "groupName" ], + "descriptor" : "(Ljava/lang/String;I)I" + }, { + "method" : "loadGroup", + "owner" : "ir", + "name" : "z", + "access" : 0, + "descriptor" : "(II)V" + }, { + "method" : "takeFile", + "owner" : "ir", + "name" : "q", + "access" : 1, + "parameters" : [ "group", "file" ], + "descriptor" : "(III)[B" + }, { + "method" : "takeFileByNames", + "owner" : "ir", + "name" : "aq", + "access" : 1, + "parameters" : [ "groupName", "fileName" ], + "descriptor" : "(Ljava/lang/String;Ljava/lang/String;S)[B" + }, { + "method" : "takeFileEncrypted", + "owner" : "ir", + "name" : "w", + "access" : 1, + "parameters" : [ "group", "file", "xteaKey" ], + "descriptor" : "(II[II)[B" + }, { + "method" : "takeFileFlat", + "owner" : "ir", + "name" : "x", + "access" : 1, + "parameters" : [ "groupOrFile" ], + "descriptor" : "(IS)[B" + }, { + "method" : "tryLoadFile", + "owner" : "ir", + "name" : "o", + "access" : 1, + "parameters" : [ "group", "file" ], + "descriptor" : "(III)Z" + }, { + "method" : "tryLoadFileByNames", + "owner" : "ir", + "name" : "aj", + "access" : 1, + "parameters" : [ "groupName", "fileName" ], + "descriptor" : "(Ljava/lang/String;Ljava/lang/String;I)Z" + }, { + "method" : "tryLoadGroup", + "owner" : "ir", + "name" : "g", + "access" : 1, + "parameters" : [ "group" ], + "descriptor" : "(II)Z" + }, { + "method" : "tryLoadGroupByName", + "owner" : "ir", + "name" : "av", + "access" : 1, + "parameters" : [ "groupName" ], + "descriptor" : "(Ljava/lang/String;I)Z" + }, { + "method" : "__f_392", + "owner" : "ir", + "name" : "f", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(II)V" + }, { + "method" : "__u_393", + "owner" : "ir", + "name" : "u", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(II)Z" + }, { + "method" : "__l_394", + "owner" : "ir", + "name" : "l", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "__j_395", + "owner" : "ir", + "name" : "j", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(IB)[I" + }, { + "method" : "__s_396", + "owner" : "ir", + "name" : "s", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(II)I" + }, { + "method" : "__t_397", + "owner" : "ir", + "name" : "t", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__y_398", + "owner" : "ir", + "name" : "y", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "__h_399", + "owner" : "ir", + "name" : "h", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(II)V" + }, { + "method" : "__b_400", + "owner" : "ir", + "name" : "b", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__ag_401", + "owner" : "ir", + "name" : "ag", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ljava/lang/String;Ljava/lang/String;B)Z" + }, { + "method" : "__ar_402", + "owner" : "ir", + "name" : "ar", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/lang/String;B)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(ZZ)V" + } ] +}, { + "class" : "ArchiveDiskActionHandler", + "name" : "iv", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "java.lang.Runnable" ], + "fields" : [ ], + "methods" : [ { + "method" : "__run_403", + "owner" : "iv", + "name" : "run", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Archive", + "name" : "it", + "super" : "ir", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "archiveDisk", + "owner" : "it", + "name" : "c", + "access" : 0, + "descriptor" : "Lff;" + }, { + "field" : "index", + "owner" : "it", + "name" : "p", + "access" : 0, + "descriptor" : "I", + "decoder" : -1579549759 + }, { + "field" : "indexCrc", + "owner" : "it", + "name" : "av", + "access" : 0, + "descriptor" : "I", + "decoder" : 1472870917 + }, { + "field" : "indexVersion", + "owner" : "it", + "name" : "ar", + "access" : 0, + "descriptor" : "I", + "decoder" : -785528219 + }, { + "field" : "masterDisk", + "owner" : "it", + "name" : "r", + "access" : 0, + "descriptor" : "Lff;" + }, { + "field" : "validGroups", + "owner" : "it", + "name" : "aq", + "access" : 64, + "descriptor" : "[Z" + }, { + "field" : "__ag", + "owner" : "it", + "name" : "ag", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "__ac", + "owner" : "it", + "name" : "ac", + "access" : 0, + "descriptor" : "I", + "decoder" : -1884661133 + }, { + "field" : "__v", + "owner" : "it", + "name" : "v", + "access" : 64, + "descriptor" : "Z" + } ], + "methods" : [ { + "method" : "groupLoadPercent", + "owner" : "it", + "name" : "e", + "access" : 0, + "descriptor" : "(II)I" + }, { + "method" : "load", + "owner" : "it", + "name" : "dx", + "access" : 0, + "descriptor" : "(Lff;I[BZI)V" + }, { + "method" : "loadAllLocal", + "owner" : "it", + "name" : "dt", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "loadGroup", + "owner" : "it", + "name" : "z", + "access" : 0, + "descriptor" : "(II)V" + }, { + "method" : "loadIndex", + "owner" : "it", + "name" : "co", + "access" : 1, + "descriptor" : "(III)V" + }, { + "method" : "loadPercent", + "owner" : "it", + "name" : "da", + "access" : 1, + "descriptor" : "(I)I" + }, { + "method" : "write", + "owner" : "it", + "name" : "de", + "access" : 1, + "descriptor" : "(I[BZZB)V" + }, { + "method" : "__cx_404", + "owner" : "it", + "name" : "cx", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "__ca_405", + "owner" : "it", + "name" : "ca", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__f_406", + "owner" : "it", + "name" : "f", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(II)V" + }, { + "method" : "__dn_407", + "owner" : "it", + "name" : "dn", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(IB)Z" + }, { + "method" : "__df_408", + "owner" : "it", + "name" : "df", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(II)Z" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Lff;Lff;IZZZ)V" + } ] +}, { + "class" : "WorldMapElement", + "name" : "ic", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "category", + "owner" : "ic", + "name" : "c", + "access" : 1, + "descriptor" : "I", + "decoder" : -653112729 + }, { + "field" : "sprite1", + "owner" : "ic", + "name" : "u", + "access" : 1, + "descriptor" : "I", + "decoder" : 2012857993 + }, { + "field" : "sprite2", + "owner" : "ic", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : -322924875 + }, { + "field" : "string1", + "owner" : "ic", + "name" : "n", + "access" : 1, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "strings", + "owner" : "ic", + "name" : "k", + "access" : 1, + "descriptor" : "[Ljava/lang/String;" + }, { + "field" : "textSize", + "owner" : "ic", + "name" : "x", + "access" : 1, + "descriptor" : "I", + "decoder" : 1184517129 + }, { + "field" : "__b", + "owner" : "ic", + "name" : "b", + "access" : 0, + "descriptor" : "[B" + }, { + "field" : "__a", + "owner" : "ic", + "name" : "a", + "access" : 0, + "descriptor" : "I", + "decoder" : 1336803515 + }, { + "field" : "__j", + "owner" : "ic", + "name" : "j", + "access" : 0, + "descriptor" : "I", + "decoder" : -1007121521 + }, { + "field" : "__s", + "owner" : "ic", + "name" : "s", + "access" : 0, + "descriptor" : "I", + "decoder" : -1209054101 + }, { + "field" : "__z", + "owner" : "ic", + "name" : "z", + "access" : 0, + "descriptor" : "I", + "decoder" : -1825795359 + }, { + "field" : "__h", + "owner" : "ic", + "name" : "h", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__i", + "owner" : "ic", + "name" : "i", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__e", + "owner" : "ic", + "name" : "e", + "access" : 1, + "descriptor" : "I", + "decoder" : -231067 + }, { + "field" : "__l", + "owner" : "ic", + "name" : "l", + "access" : 1, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__o", + "owner" : "ic", + "name" : "o", + "access" : 17, + "descriptor" : "I", + "decoder" : -1579051565 + } ], + "methods" : [ { + "method" : "decode", + "owner" : "ic", + "name" : "f", + "access" : 1, + "parameters" : [ "buffer" ], + "descriptor" : "(Lgr;B)V" + }, { + "method" : "decode0", + "owner" : "ic", + "name" : "q", + "access" : 0, + "parameters" : [ "buffer", "opcode" ], + "descriptor" : "(Lgr;II)V" + }, { + "method" : "getSprite", + "owner" : "ic", + "name" : "o", + "access" : 1, + "parameters" : [ "b" ], + "descriptor" : "(ZI)Lln;" + }, { + "method" : "getSprite0", + "owner" : "ic", + "name" : "u", + "access" : 0, + "parameters" : [ "id" ], + "descriptor" : "(IB)Lln;" + }, { + "method" : "__w_409", + "owner" : "ic", + "name" : "w", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__g_410", + "owner" : "ic", + "name" : "g", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(I)V" + } ] +}, { + "class" : "VarcInt", + "name" : "iw", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "persist", + "owner" : "iw", + "name" : "q", + "access" : 1, + "descriptor" : "Z" + } ], + "methods" : [ { + "method" : "__q_411", + "owner" : "iw", + "name" : "q", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(Lgr;I)V" + }, { + "method" : "__w_412", + "owner" : "iw", + "name" : "w", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Lgr;II)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "SpotAnimationDefinition", + "name" : "io", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "id", + "owner" : "io", + "name" : "o", + "access" : 0, + "descriptor" : "I", + "decoder" : -713866165 + }, { + "field" : "model", + "owner" : "io", + "name" : "u", + "access" : 0, + "descriptor" : "I", + "decoder" : -2065492247 + }, { + "field" : "orientation", + "owner" : "io", + "name" : "i", + "access" : 0, + "descriptor" : "I", + "decoder" : 1650590363 + }, { + "field" : "recol_d", + "owner" : "io", + "name" : "e", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "recol_s", + "owner" : "io", + "name" : "l", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "resizeh", + "owner" : "io", + "name" : "k", + "access" : 0, + "descriptor" : "I", + "decoder" : 680796997 + }, { + "field" : "resizev", + "owner" : "io", + "name" : "n", + "access" : 0, + "descriptor" : "I", + "decoder" : 1199960995 + }, { + "field" : "retex_d", + "owner" : "io", + "name" : "d", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "retex_s", + "owner" : "io", + "name" : "x", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "sequence", + "owner" : "io", + "name" : "g", + "access" : 1, + "descriptor" : "I", + "decoder" : 1580078789 + }, { + "field" : "__a", + "owner" : "io", + "name" : "a", + "access" : 0, + "descriptor" : "I", + "decoder" : -20619847 + }, { + "field" : "__z", + "owner" : "io", + "name" : "z", + "access" : 0, + "descriptor" : "I", + "decoder" : 1866148625 + } ], + "methods" : [ { + "method" : "decode", + "owner" : "io", + "name" : "f", + "access" : 0, + "parameters" : [ "buffer" ], + "descriptor" : "(Lgr;I)V" + }, { + "method" : "decode0", + "owner" : "io", + "name" : "q", + "access" : 0, + "parameters" : [ "buffer", "n" ], + "descriptor" : "(Lgr;II)V" + }, { + "method" : "getModel", + "owner" : "io", + "name" : "w", + "access" : 17, + "descriptor" : "(II)Ldu;" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "KitDefinition", + "name" : "im", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "bodyPart", + "owner" : "im", + "name" : "o", + "access" : 1, + "descriptor" : "I", + "decoder" : 1619779051 + }, { + "field" : "models", + "owner" : "im", + "name" : "d", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "models2", + "owner" : "im", + "name" : "u", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "recol_d", + "owner" : "im", + "name" : "l", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "recol_s", + "owner" : "im", + "name" : "g", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "retex_d", + "owner" : "im", + "name" : "x", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "retex_s", + "owner" : "im", + "name" : "e", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "__k", + "owner" : "im", + "name" : "k", + "access" : 1, + "descriptor" : "Z" + } ], + "methods" : [ { + "method" : "decode", + "owner" : "im", + "name" : "f", + "access" : 0, + "descriptor" : "(Lgr;S)V" + }, { + "method" : "decode0", + "owner" : "im", + "name" : "q", + "access" : 0, + "descriptor" : "(Lgr;II)V" + }, { + "method" : "__w_413", + "owner" : "im", + "name" : "w", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "__o_414", + "owner" : "im", + "name" : "o", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)Ldw;" + }, { + "method" : "__u_415", + "owner" : "im", + "name" : "u", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "__g_416", + "owner" : "im", + "name" : "g", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)Ldw;" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "HealthBarDefinition", + "name" : "ii", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "int1", + "owner" : "ii", + "name" : "l", + "access" : 1, + "descriptor" : "I", + "decoder" : 390656615 + }, { + "field" : "int2", + "owner" : "ii", + "name" : "e", + "access" : 1, + "descriptor" : "I", + "decoder" : 1890433231 + }, { + "field" : "int3", + "owner" : "ii", + "name" : "x", + "access" : 1, + "descriptor" : "I", + "decoder" : -1180353973 + }, { + "field" : "int4", + "owner" : "ii", + "name" : "d", + "access" : 1, + "descriptor" : "I", + "decoder" : -1956457117 + }, { + "field" : "int5", + "owner" : "ii", + "name" : "k", + "access" : 1, + "descriptor" : "I", + "decoder" : -642961053 + }, { + "field" : "spriteId1", + "owner" : "ii", + "name" : "n", + "access" : 0, + "descriptor" : "I", + "decoder" : 1310001257 + }, { + "field" : "spriteId2", + "owner" : "ii", + "name" : "i", + "access" : 0, + "descriptor" : "I", + "decoder" : -1707680631 + }, { + "field" : "width", + "owner" : "ii", + "name" : "a", + "access" : 1, + "descriptor" : "I", + "decoder" : -354704697 + }, { + "field" : "widthPadding", + "owner" : "ii", + "name" : "z", + "access" : 1, + "descriptor" : "I", + "decoder" : 166567703 + }, { + "field" : "__o", + "owner" : "ii", + "name" : "o", + "access" : 1, + "descriptor" : "I", + "decoder" : 1515955705 + } ], + "methods" : [ { + "method" : "decode", + "owner" : "ii", + "name" : "m", + "access" : 1, + "descriptor" : "(Lgr;I)V" + }, { + "method" : "decode0", + "owner" : "ii", + "name" : "f", + "access" : 0, + "descriptor" : "(Lgr;IB)V" + }, { + "method" : "getSprite1", + "owner" : "ii", + "name" : "q", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)Lln;" + }, { + "method" : "getSprite2", + "owner" : "ii", + "name" : "w", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)Lln;" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "HitmarkDefinition", + "name" : "jm", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "fontId", + "owner" : "jm", + "name" : "k", + "access" : 0, + "descriptor" : "I", + "decoder" : 431076793 + }, { + "field" : "transformVarbit", + "owner" : "jm", + "name" : "v", + "access" : 0, + "descriptor" : "I", + "decoder" : 516423393 + }, { + "field" : "transformVarp", + "owner" : "jm", + "name" : "ag", + "access" : 0, + "descriptor" : "I", + "decoder" : -1841054487 + }, { + "field" : "transforms", + "owner" : "jm", + "name" : "p", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "__a", + "owner" : "jm", + "name" : "a", + "access" : 0, + "descriptor" : "I", + "decoder" : -1533306389 + }, { + "field" : "__j", + "owner" : "jm", + "name" : "j", + "access" : 0, + "descriptor" : "I", + "decoder" : 1683792491 + }, { + "field" : "__s", + "owner" : "jm", + "name" : "s", + "access" : 0, + "descriptor" : "I", + "decoder" : 1845590719 + }, { + "field" : "__z", + "owner" : "jm", + "name" : "z", + "access" : 0, + "descriptor" : "I", + "decoder" : -1677628889 + }, { + "field" : "__b", + "owner" : "jm", + "name" : "b", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__c", + "owner" : "jm", + "name" : "c", + "access" : 1, + "descriptor" : "I", + "decoder" : 1003116765 + }, { + "field" : "__h", + "owner" : "jm", + "name" : "h", + "access" : 1, + "descriptor" : "I", + "decoder" : 199815415 + }, { + "field" : "__i", + "owner" : "jm", + "name" : "i", + "access" : 1, + "descriptor" : "I", + "decoder" : -102270561 + }, { + "field" : "__n", + "owner" : "jm", + "name" : "n", + "access" : 1, + "descriptor" : "I", + "decoder" : -1151968735 + }, { + "field" : "__r", + "owner" : "jm", + "name" : "r", + "access" : 1, + "descriptor" : "I", + "decoder" : 1498880475 + }, { + "field" : "__t", + "owner" : "jm", + "name" : "t", + "access" : 1, + "descriptor" : "I", + "decoder" : -389283589 + }, { + "field" : "__y", + "owner" : "jm", + "name" : "y", + "access" : 1, + "descriptor" : "I", + "decoder" : 1751286975 + } ], + "methods" : [ { + "method" : "decode", + "owner" : "jm", + "name" : "q", + "access" : 0, + "descriptor" : "(Lgr;I)V" + }, { + "method" : "decode0", + "owner" : "jm", + "name" : "w", + "access" : 0, + "descriptor" : "(Lgr;II)V" + }, { + "method" : "getFont", + "owner" : "jm", + "name" : "d", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Lkk;" + }, { + "method" : "getString", + "owner" : "jm", + "name" : "u", + "access" : 1, + "parameters" : [ "n" ], + "descriptor" : "(IS)Ljava/lang/String;" + }, { + "method" : "transform", + "owner" : "jm", + "name" : "o", + "access" : 17, + "parameters" : [ ], + "descriptor" : "(B)Ljm;" + }, { + "method" : "__g_417", + "owner" : "jm", + "name" : "g", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Lln;" + }, { + "method" : "__l_418", + "owner" : "jm", + "name" : "l", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)Lln;" + }, { + "method" : "__e_419", + "owner" : "jm", + "name" : "e", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)Lln;" + }, { + "method" : "__x_420", + "owner" : "jm", + "name" : "x", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Lln;" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "ObjectDefinition", + "name" : "jr", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "ambient", + "owner" : "jr", + "name" : "ag", + "access" : 0, + "descriptor" : "I", + "decoder" : 533219139 + }, { + "field" : "ambientSoundId", + "owner" : "jr", + "name" : "az", + "access" : 1, + "descriptor" : "I", + "decoder" : 374616127 + }, { + "field" : "animationId", + "owner" : "jr", + "name" : "p", + "access" : 1, + "descriptor" : "I", + "decoder" : -1018236769 + }, { + "field" : "boolean1", + "owner" : "jr", + "name" : "y", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "boolean2", + "owner" : "jr", + "name" : "at", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "clipType", + "owner" : "jr", + "name" : "b", + "access" : 0, + "descriptor" : "I", + "decoder" : -268374709 + }, { + "field" : "clipped", + "owner" : "jr", + "name" : "ay", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "contrast", + "owner" : "jr", + "name" : "aq", + "access" : 0, + "descriptor" : "I", + "decoder" : -216646581 + }, { + "field" : "id", + "owner" : "jr", + "name" : "e", + "access" : 1, + "descriptor" : "I", + "decoder" : -2034835389 + }, { + "field" : "int1", + "owner" : "jr", + "name" : "h", + "access" : 1, + "descriptor" : "I", + "decoder" : 1419333853 + }, { + "field" : "int2", + "owner" : "jr", + "name" : "v", + "access" : 1, + "descriptor" : "I", + "decoder" : 713665805 + }, { + "field" : "int3", + "owner" : "jr", + "name" : "ap", + "access" : 1, + "descriptor" : "I", + "decoder" : 1455451843 + }, { + "field" : "int4", + "owner" : "jr", + "name" : "au", + "access" : 1, + "descriptor" : "I", + "decoder" : -1990510197 + }, { + "field" : "int5", + "owner" : "jr", + "name" : "ao", + "access" : 1, + "descriptor" : "I", + "decoder" : -1519592967 + }, { + "field" : "int6", + "owner" : "jr", + "name" : "aa", + "access" : 1, + "descriptor" : "I", + "decoder" : 1201773735 + }, { + "field" : "interactType", + "owner" : "jr", + "name" : "t", + "access" : 1, + "descriptor" : "I", + "decoder" : -553719901 + }, { + "field" : "isRotated", + "owner" : "jr", + "name" : "ac", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "isSolid", + "owner" : "jr", + "name" : "ad", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "mapIconId", + "owner" : "jr", + "name" : "av", + "access" : 1, + "descriptor" : "I", + "decoder" : -1737602209 + }, { + "field" : "mapSceneId", + "owner" : "jr", + "name" : "ar", + "access" : 1, + "descriptor" : "I", + "decoder" : -324183669 + }, { + "field" : "modelClipped", + "owner" : "jr", + "name" : "r", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "modelHeight", + "owner" : "jr", + "name" : "ak", + "access" : 0, + "descriptor" : "I", + "decoder" : 511434049 + }, { + "field" : "modelSizeX", + "owner" : "jr", + "name" : "ah", + "access" : 0, + "descriptor" : "I", + "decoder" : -1509832827 + }, { + "field" : "modelSizeY", + "owner" : "jr", + "name" : "aw", + "access" : 0, + "descriptor" : "I", + "decoder" : 1746573233 + }, { + "field" : "name", + "owner" : "jr", + "name" : "k", + "access" : 1, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "nonFlatShading", + "owner" : "jr", + "name" : "c", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "offsetHeight", + "owner" : "jr", + "name" : "ab", + "access" : 0, + "descriptor" : "I", + "decoder" : -1720702573 + }, { + "field" : "offsetX", + "owner" : "jr", + "name" : "al", + "access" : 0, + "descriptor" : "I", + "decoder" : 967376007 + }, { + "field" : "offsetY", + "owner" : "jr", + "name" : "ae", + "access" : 0, + "descriptor" : "I", + "decoder" : 818611483 + }, { + "field" : "op", + "owner" : "jr", + "name" : "aj", + "access" : 1, + "descriptor" : "[Ljava/lang/String;" + }, { + "field" : "params", + "owner" : "jr", + "name" : "af", + "access" : 0, + "descriptor" : "Llh;" + }, { + "field" : "recol_d", + "owner" : "jr", + "name" : "i", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "recol_s", + "owner" : "jr", + "name" : "n", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "retex_d", + "owner" : "jr", + "name" : "z", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "retex_s", + "owner" : "jr", + "name" : "a", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "sizeX", + "owner" : "jr", + "name" : "j", + "access" : 1, + "descriptor" : "I", + "decoder" : 998026479 + }, { + "field" : "sizeY", + "owner" : "jr", + "name" : "s", + "access" : 1, + "descriptor" : "I", + "decoder" : -301273619 + }, { + "field" : "transformVarbit", + "owner" : "jr", + "name" : "am", + "access" : 0, + "descriptor" : "I", + "decoder" : 1136644531 + }, { + "field" : "transformVarp", + "owner" : "jr", + "name" : "an", + "access" : 0, + "descriptor" : "I", + "decoder" : -2119965579 + }, { + "field" : "transforms", + "owner" : "jr", + "name" : "as", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "__d", + "owner" : "jr", + "name" : "d", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__x", + "owner" : "jr", + "name" : "x", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__ax", + "owner" : "jr", + "name" : "ax", + "access" : 1, + "descriptor" : "[I" + } ], + "methods" : [ { + "method" : "decode", + "owner" : "jr", + "name" : "w", + "access" : 0, + "descriptor" : "(Lgr;I)V" + }, { + "method" : "decode0", + "owner" : "jr", + "name" : "o", + "access" : 0, + "descriptor" : "(Lgr;II)V" + }, { + "method" : "getIntParam", + "owner" : "jr", + "name" : "z", + "access" : 1, + "descriptor" : "(IIB)I" + }, { + "method" : "getModel", + "owner" : "jr", + "name" : "e", + "access" : 17, + "descriptor" : "(II[[IIIIB)Ldu;" + }, { + "method" : "getModelData", + "owner" : "jr", + "name" : "d", + "access" : 16, + "parameters" : [ "n", "m" ], + "descriptor" : "(IIB)Ldw;" + }, { + "method" : "getModelDynamic", + "owner" : "jr", + "name" : "x", + "access" : 17, + "descriptor" : "(II[[IIIILjh;II)Ldu;" + }, { + "method" : "getStringParam", + "owner" : "jr", + "name" : "j", + "access" : 1, + "descriptor" : "(ILjava/lang/String;I)Ljava/lang/String;" + }, { + "method" : "postDecode", + "owner" : "jr", + "name" : "q", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "transform", + "owner" : "jr", + "name" : "a", + "access" : 17, + "parameters" : [ ], + "descriptor" : "(B)Ljr;" + }, { + "method" : "__u_421", + "owner" : "jr", + "name" : "u", + "access" : 17, + "parameters" : [ "arg0" ], + "descriptor" : "(II)Z" + }, { + "method" : "__g_422", + "owner" : "jr", + "name" : "g", + "access" : 17, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "__l_423", + "owner" : "jr", + "name" : "l", + "access" : 17, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], + "descriptor" : "(II[[IIIIS)Lex;" + }, { + "method" : "__t_424", + "owner" : "jr", + "name" : "t", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "ItemDefinition", + "name" : "jv", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "ambient", + "owner" : "jv", + "name" : "ba", + "access" : 1, + "descriptor" : "I", + "decoder" : 738319589 + }, { + "field" : "boughtlink", + "owner" : "jv", + "name" : "bk", + "access" : 0, + "descriptor" : "I", + "decoder" : 700576005 + }, { + "field" : "boughttemplate", + "owner" : "jv", + "name" : "bd", + "access" : 0, + "descriptor" : "I", + "decoder" : -1969719185 + }, { + "field" : "certlink", + "owner" : "jv", + "name" : "ao", + "access" : 1, + "descriptor" : "I", + "decoder" : 619422509 + }, { + "field" : "certtemplate", + "owner" : "jv", + "name" : "aa", + "access" : 1, + "descriptor" : "I", + "decoder" : -2121346423 + }, { + "field" : "contrast", + "owner" : "jv", + "name" : "bb", + "access" : 1, + "descriptor" : "I", + "decoder" : -1984887305 + }, { + "field" : "cost", + "owner" : "jv", + "name" : "aq", + "access" : 1, + "descriptor" : "I", + "decoder" : -343501105 + }, { + "field" : "countco", + "owner" : "jv", + "name" : "au", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "countobj", + "owner" : "jv", + "name" : "az", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "id", + "owner" : "jv", + "name" : "i", + "access" : 1, + "descriptor" : "I", + "decoder" : -590103687 + }, { + "field" : "iop", + "owner" : "jv", + "name" : "ar", + "access" : 1, + "descriptor" : "[Ljava/lang/String;" + }, { + "field" : "manhead", + "owner" : "jv", + "name" : "ap", + "access" : 0, + "descriptor" : "I", + "decoder" : -650184697 + }, { + "field" : "manhead2", + "owner" : "jv", + "name" : "as", + "access" : 0, + "descriptor" : "I", + "decoder" : 548044049 + }, { + "field" : "manwear", + "owner" : "jv", + "name" : "ah", + "access" : 0, + "descriptor" : "I", + "decoder" : 939367983 + }, { + "field" : "manwear2", + "owner" : "jv", + "name" : "ak", + "access" : 0, + "descriptor" : "I", + "decoder" : 140643039 + }, { + "field" : "manwear3", + "owner" : "jv", + "name" : "at", + "access" : 0, + "descriptor" : "I", + "decoder" : -691559863 + }, { + "field" : "manwearyoff", + "owner" : "jv", + "name" : "aw", + "access" : 0, + "descriptor" : "I", + "decoder" : -1378899027 + }, { + "field" : "members", + "owner" : "jv", + "name" : "aj", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "model", + "owner" : "jv", + "name" : "a", + "access" : 0, + "descriptor" : "I", + "decoder" : 1070080857 + }, { + "field" : "name", + "owner" : "jv", + "name" : "z", + "access" : 1, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "op", + "owner" : "jv", + "name" : "av", + "access" : 1, + "descriptor" : "[Ljava/lang/String;" + }, { + "field" : "params", + "owner" : "jv", + "name" : "bq", + "access" : 0, + "descriptor" : "Llh;" + }, { + "field" : "placeholderlink", + "owner" : "jv", + "name" : "bc", + "access" : 1, + "descriptor" : "I", + "decoder" : 807815565 + }, { + "field" : "placeholdertemplate", + "owner" : "jv", + "name" : "bo", + "access" : 1, + "descriptor" : "I", + "decoder" : -1854342455 + }, { + "field" : "recol_d", + "owner" : "jv", + "name" : "s", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "recol_s", + "owner" : "jv", + "name" : "j", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "resizex", + "owner" : "jv", + "name" : "ax", + "access" : 0, + "descriptor" : "I", + "decoder" : 69034859 + }, { + "field" : "resizey", + "owner" : "jv", + "name" : "af", + "access" : 0, + "descriptor" : "I", + "decoder" : -17174497 + }, { + "field" : "resizez", + "owner" : "jv", + "name" : "ai", + "access" : 0, + "descriptor" : "I", + "decoder" : 1395132907 + }, { + "field" : "retex_d", + "owner" : "jv", + "name" : "y", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "retex_s", + "owner" : "jv", + "name" : "t", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "shiftclickindex", + "owner" : "jv", + "name" : "ay", + "access" : 0, + "descriptor" : "I", + "decoder" : 881309855 + }, { + "field" : "stackable", + "owner" : "jv", + "name" : "ag", + "access" : 1, + "descriptor" : "I", + "decoder" : -237597001 + }, { + "field" : "stockmarket", + "owner" : "jv", + "name" : "bn", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "team", + "owner" : "jv", + "name" : "bs", + "access" : 1, + "descriptor" : "I", + "decoder" : -1057008657 + }, { + "field" : "womanhead", + "owner" : "jv", + "name" : "am", + "access" : 0, + "descriptor" : "I", + "decoder" : 1709659237 + }, { + "field" : "womanhead2", + "owner" : "jv", + "name" : "an", + "access" : 0, + "descriptor" : "I", + "decoder" : 106668727 + }, { + "field" : "womanwear", + "owner" : "jv", + "name" : "al", + "access" : 0, + "descriptor" : "I", + "decoder" : 886682223 + }, { + "field" : "womanwear2", + "owner" : "jv", + "name" : "ab", + "access" : 0, + "descriptor" : "I", + "decoder" : 154223105 + }, { + "field" : "womanwear3", + "owner" : "jv", + "name" : "ad", + "access" : 0, + "descriptor" : "I", + "decoder" : -771136925 + }, { + "field" : "womanwearyoff", + "owner" : "jv", + "name" : "ae", + "access" : 0, + "descriptor" : "I", + "decoder" : -1619361485 + }, { + "field" : "xan2d", + "owner" : "jv", + "name" : "b", + "access" : 1, + "descriptor" : "I", + "decoder" : 880150839 + }, { + "field" : "xof2d", + "owner" : "jv", + "name" : "p", + "access" : 1, + "descriptor" : "I", + "decoder" : -533708435 + }, { + "field" : "yan2d", + "owner" : "jv", + "name" : "c", + "access" : 1, + "descriptor" : "I", + "decoder" : 507808107 + }, { + "field" : "yof2d", + "owner" : "jv", + "name" : "v", + "access" : 1, + "descriptor" : "I", + "decoder" : -2130350563 + }, { + "field" : "zan2d", + "owner" : "jv", + "name" : "r", + "access" : 1, + "descriptor" : "I", + "decoder" : 551313257 + }, { + "field" : "zoom2d", + "owner" : "jv", + "name" : "h", + "access" : 1, + "descriptor" : "I", + "decoder" : 278037959 + } ], + "methods" : [ { + "method" : "decode", + "owner" : "jv", + "name" : "q", + "access" : 0, + "descriptor" : "(Lgr;I)V" + }, { + "method" : "decode0", + "owner" : "jv", + "name" : "w", + "access" : 0, + "descriptor" : "(Lgr;II)V" + }, { + "method" : "genBought", + "owner" : "jv", + "name" : "u", + "access" : 0, + "parameters" : [ "template", "link" ], + "descriptor" : "(Ljv;Ljv;I)V" + }, { + "method" : "genCert", + "owner" : "jv", + "name" : "o", + "access" : 0, + "parameters" : [ "template", "link" ], + "descriptor" : "(Ljv;Ljv;I)V" + }, { + "method" : "genPlaceholder", + "owner" : "jv", + "name" : "g", + "access" : 0, + "parameters" : [ "template", "link" ], + "descriptor" : "(Ljv;Ljv;I)V" + }, { + "method" : "getCountObj", + "owner" : "jv", + "name" : "x", + "access" : 1, + "parameters" : [ "quantity" ], + "descriptor" : "(IB)Ljv;" + }, { + "method" : "getIntParam", + "owner" : "jv", + "name" : "y", + "access" : 1, + "descriptor" : "(IIS)I" + }, { + "method" : "getModel", + "owner" : "jv", + "name" : "e", + "access" : 17, + "parameters" : [ "quantity" ], + "descriptor" : "(II)Ldu;" + }, { + "method" : "getShiftClickIndex", + "owner" : "jv", + "name" : "b", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "getStringParam", + "owner" : "jv", + "name" : "h", + "access" : 1, + "descriptor" : "(ILjava/lang/String;I)Ljava/lang/String;" + }, { + "method" : "__f_425", + "owner" : "jv", + "name" : "f", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__l_426", + "owner" : "jv", + "name" : "l", + "access" : 17, + "parameters" : [ "arg0" ], + "descriptor" : "(II)Ldw;" + }, { + "method" : "__z_427", + "owner" : "jv", + "name" : "z", + "access" : 17, + "parameters" : [ "arg0" ], + "descriptor" : "(ZI)Z" + }, { + "method" : "__j_428", + "owner" : "jv", + "name" : "j", + "access" : 17, + "parameters" : [ "arg0" ], + "descriptor" : "(ZB)Ldw;" + }, { + "method" : "__s_429", + "owner" : "jv", + "name" : "s", + "access" : 17, + "parameters" : [ "arg0" ], + "descriptor" : "(ZI)Z" + }, { + "method" : "__t_430", + "owner" : "jv", + "name" : "t", + "access" : 17, + "parameters" : [ "arg0" ], + "descriptor" : "(ZI)Ldw;" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "NpcDefinition", + "name" : "jz", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "combatLevel", + "owner" : "jz", + "name" : "c", + "access" : 1, + "descriptor" : "I", + "decoder" : 1192179847 + }, { + "field" : "drawMapDot", + "owner" : "jz", + "name" : "b", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "headIconPrayer", + "owner" : "jz", + "name" : "aj", + "access" : 1, + "descriptor" : "I", + "decoder" : 235824283 + }, { + "field" : "id", + "owner" : "jz", + "name" : "o", + "access" : 1, + "descriptor" : "I", + "decoder" : -1937346627 + }, { + "field" : "isFollower", + "owner" : "jz", + "name" : "aw", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "isInteractable", + "owner" : "jz", + "name" : "ah", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "models", + "owner" : "jz", + "name" : "l", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "name", + "owner" : "jz", + "name" : "u", + "access" : 1, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "op", + "owner" : "jz", + "name" : "h", + "access" : 1, + "descriptor" : "[Ljava/lang/String;" + }, { + "field" : "params", + "owner" : "jz", + "name" : "al", + "access" : 0, + "descriptor" : "Llh;" + }, { + "field" : "readyanim", + "owner" : "jz", + "name" : "x", + "access" : 1, + "descriptor" : "I", + "decoder" : 275200787 + }, { + "field" : "recol_d", + "owner" : "jz", + "name" : "s", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "recol_s", + "owner" : "jz", + "name" : "j", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "resizeh", + "owner" : "jz", + "name" : "r", + "access" : 0, + "descriptor" : "I", + "decoder" : -1469219067 + }, { + "field" : "resizev", + "owner" : "jz", + "name" : "p", + "access" : 0, + "descriptor" : "I", + "decoder" : 1390683537 + }, { + "field" : "retex_d", + "owner" : "jz", + "name" : "y", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "retex_s", + "owner" : "jz", + "name" : "t", + "access" : 0, + "descriptor" : "[S" + }, { + "field" : "size", + "owner" : "jz", + "name" : "g", + "access" : 1, + "descriptor" : "I", + "decoder" : -1541308911 + }, { + "field" : "transformVarbit", + "owner" : "jz", + "name" : "ac", + "access" : 0, + "descriptor" : "I", + "decoder" : 1011388197 + }, { + "field" : "transformVarp", + "owner" : "jz", + "name" : "ay", + "access" : 0, + "descriptor" : "I", + "decoder" : 1631362233 + }, { + "field" : "transforms", + "owner" : "jz", + "name" : "ar", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "turnleftanim", + "owner" : "jz", + "name" : "d", + "access" : 1, + "descriptor" : "I", + "decoder" : 819690597 + }, { + "field" : "turnrightanim", + "owner" : "jz", + "name" : "k", + "access" : 1, + "descriptor" : "I", + "decoder" : 1311553413 + }, { + "field" : "walkanim", + "owner" : "jz", + "name" : "n", + "access" : 1, + "descriptor" : "I", + "decoder" : -284110917 + }, { + "field" : "walkbackanim", + "owner" : "jz", + "name" : "i", + "access" : 1, + "descriptor" : "I", + "decoder" : 1952230339 + }, { + "field" : "walkleftanim", + "owner" : "jz", + "name" : "a", + "access" : 1, + "descriptor" : "I", + "decoder" : -1213774321 + }, { + "field" : "walkrightanim", + "owner" : "jz", + "name" : "z", + "access" : 1, + "descriptor" : "I", + "decoder" : -96930503 + }, { + "field" : "__ag", + "owner" : "jz", + "name" : "ag", + "access" : 0, + "descriptor" : "I", + "decoder" : -1235927151 + }, { + "field" : "__aq", + "owner" : "jz", + "name" : "aq", + "access" : 0, + "descriptor" : "I", + "decoder" : 1962875903 + }, { + "field" : "__e", + "owner" : "jz", + "name" : "e", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__ak", + "owner" : "jz", + "name" : "ak", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "__v", + "owner" : "jz", + "name" : "v", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "__av", + "owner" : "jz", + "name" : "av", + "access" : 1, + "descriptor" : "I", + "decoder" : -506638747 + } ], + "methods" : [ { + "method" : "decode", + "owner" : "jz", + "name" : "w", + "access" : 0, + "descriptor" : "(Lgr;I)V" + }, { + "method" : "decode0", + "owner" : "jz", + "name" : "o", + "access" : 0, + "descriptor" : "(Lgr;IB)V" + }, { + "method" : "getIntParam", + "owner" : "jz", + "name" : "x", + "access" : 1, + "descriptor" : "(III)I" + }, { + "method" : "getModel", + "owner" : "jz", + "name" : "u", + "access" : 17, + "parameters" : [ "s1", "n1", "s2", "n2" ], + "descriptor" : "(Ljh;ILjh;II)Ldu;" + }, { + "method" : "getModelData", + "owner" : "jz", + "name" : "g", + "access" : 17, + "parameters" : [ ], + "descriptor" : "(I)Ldw;" + }, { + "method" : "getStringParam", + "owner" : "jz", + "name" : "d", + "access" : 1, + "descriptor" : "(ILjava/lang/String;I)Ljava/lang/String;" + }, { + "method" : "postDecode", + "owner" : "jz", + "name" : "q", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "transform", + "owner" : "jz", + "name" : "l", + "access" : 17, + "parameters" : [ ], + "descriptor" : "(B)Ljz;" + }, { + "method" : "__e_431", + "owner" : "jz", + "name" : "e", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Z" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "FloorOverlayDefinition", + "name" : "jf", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "hue", + "owner" : "jf", + "name" : "g", + "access" : 1, + "descriptor" : "I", + "decoder" : 2013422835 + }, { + "field" : "hue2", + "owner" : "jf", + "name" : "x", + "access" : 1, + "descriptor" : "I", + "decoder" : -122393061 + }, { + "field" : "lightness", + "owner" : "jf", + "name" : "e", + "access" : 1, + "descriptor" : "I", + "decoder" : -624223733 + }, { + "field" : "lightness2", + "owner" : "jf", + "name" : "k", + "access" : 1, + "descriptor" : "I", + "decoder" : 127639041 + }, { + "field" : "rgb", + "owner" : "jf", + "name" : "q", + "access" : 1, + "descriptor" : "I", + "decoder" : -111851793 + }, { + "field" : "rgb2", + "owner" : "jf", + "name" : "u", + "access" : 1, + "descriptor" : "I", + "decoder" : 528865753 + }, { + "field" : "saturation", + "owner" : "jf", + "name" : "l", + "access" : 1, + "descriptor" : "I", + "decoder" : -1719896767 + }, { + "field" : "saturation2", + "owner" : "jf", + "name" : "d", + "access" : 1, + "descriptor" : "I", + "decoder" : 1514187401 + }, { + "field" : "texture", + "owner" : "jf", + "name" : "w", + "access" : 1, + "descriptor" : "I", + "decoder" : 733377225 + }, { + "field" : "__o", + "owner" : "jf", + "name" : "o", + "access" : 1, + "descriptor" : "Z" + } ], + "methods" : [ { + "method" : "decode", + "owner" : "jf", + "name" : "q", + "access" : 1, + "descriptor" : "(Lgr;II)V" + }, { + "method" : "decode0", + "owner" : "jf", + "name" : "w", + "access" : 0, + "descriptor" : "(Lgr;III)V" + }, { + "method" : "postDecode", + "owner" : "jf", + "name" : "f", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "setHsl", + "owner" : "jf", + "name" : "o", + "access" : 0, + "parameters" : [ "rgb" ], + "descriptor" : "(II)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "SequenceDefinition", + "name" : "jh", + "super" : "fn", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "frameCount", + "owner" : "jh", + "name" : "x", + "access" : 1, + "descriptor" : "I", + "decoder" : -736885973 + }, { + "field" : "frameIds", + "owner" : "jh", + "name" : "u", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "frameIds2", + "owner" : "jh", + "name" : "g", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "frameLengths", + "owner" : "jh", + "name" : "l", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "shield", + "owner" : "jh", + "name" : "i", + "access" : 1, + "descriptor" : "I", + "decoder" : -1308226131 + }, { + "field" : "weapon", + "owner" : "jh", + "name" : "a", + "access" : 1, + "descriptor" : "I", + "decoder" : -1629538741 + }, { + "field" : "__d", + "owner" : "jh", + "name" : "d", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__k", + "owner" : "jh", + "name" : "k", + "access" : 1, + "descriptor" : "Z" + }, { + "field" : "__j", + "owner" : "jh", + "name" : "j", + "access" : 1, + "descriptor" : "I", + "decoder" : 1339014215 + }, { + "field" : "__n", + "owner" : "jh", + "name" : "n", + "access" : 1, + "descriptor" : "I", + "decoder" : 1309695045 + }, { + "field" : "__s", + "owner" : "jh", + "name" : "s", + "access" : 1, + "descriptor" : "I", + "decoder" : 2012242069 + }, { + "field" : "__t", + "owner" : "jh", + "name" : "t", + "access" : 1, + "descriptor" : "I", + "decoder" : 1147391369 + }, { + "field" : "__z", + "owner" : "jh", + "name" : "z", + "access" : 1, + "descriptor" : "I", + "decoder" : -28345361 + }, { + "field" : "__e", + "owner" : "jh", + "name" : "e", + "access" : 1, + "descriptor" : "[I" + } ], + "methods" : [ { + "method" : "animateComponent", + "owner" : "jh", + "name" : "e", + "access" : 1, + "parameters" : [ "model", "frame" ], + "descriptor" : "(Ldu;II)Ldu;" + }, { + "method" : "animateObject", + "owner" : "jh", + "name" : "u", + "access" : 0, + "parameters" : [ "model", "frame", "orientation" ], + "descriptor" : "(Ldu;IIB)Ldu;" + }, { + "method" : "animateSequence", + "owner" : "jh", + "name" : "o", + "access" : 1, + "parameters" : [ "model", "frame" ], + "descriptor" : "(Ldu;II)Ldu;" + }, { + "method" : "animateSequence2", + "owner" : "jh", + "name" : "l", + "access" : 1, + "parameters" : [ "model", "frame", "sequence", "sequenceFrame" ], + "descriptor" : "(Ldu;ILjh;II)Ldu;" + }, { + "method" : "animateSpotAnimation", + "owner" : "jh", + "name" : "g", + "access" : 0, + "parameters" : [ "model", "frame" ], + "descriptor" : "(Ldu;II)Ldu;" + }, { + "method" : "decode", + "owner" : "jh", + "name" : "f", + "access" : 0, + "descriptor" : "(Lgr;S)V" + }, { + "method" : "decode0", + "owner" : "jh", + "name" : "q", + "access" : 0, + "descriptor" : "(Lgr;II)V" + }, { + "method" : "postDecode", + "owner" : "jh", + "name" : "w", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "IterableNodeDeque", + "name" : "ja", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "java.lang.Iterable" ], + "fields" : [ { + "field" : "current", + "owner" : "ja", + "name" : "f", + "access" : 0, + "descriptor" : "Lgw;" + }, { + "field" : "sentinel", + "owner" : "ja", + "name" : "m", + "access" : 0, + "descriptor" : "Lgw;" + } ], + "methods" : [ { + "method" : "addFirst", + "owner" : "ja", + "name" : "f", + "access" : 1, + "parameters" : [ "node" ], + "descriptor" : "(Lgw;)V" + }, { + "method" : "addLast", + "owner" : "ja", + "name" : "q", + "access" : 1, + "parameters" : [ "node" ], + "descriptor" : "(Lgw;)V" + }, { + "method" : "clear", + "owner" : "ja", + "name" : "m", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "isEmpty", + "owner" : "ja", + "name" : "l", + "access" : 1, + "descriptor" : "()Z" + }, { + "method" : "last", + "owner" : "ja", + "name" : "o", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Lgw;" + }, { + "method" : "previous", + "owner" : "ja", + "name" : "g", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Lgw;" + }, { + "method" : "previousOrLast", + "owner" : "ja", + "name" : "u", + "access" : 0, + "parameters" : [ "node" ], + "descriptor" : "(Lgw;)Lgw;" + }, { + "method" : "__iterator_432", + "owner" : "ja", + "name" : "iterator", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Ljava/util/Iterator;" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "LinkDeque", + "name" : "jy", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__f", + "owner" : "jy", + "name" : "f", + "access" : 0, + "descriptor" : "Lgh;" + }, { + "field" : "__m", + "owner" : "jy", + "name" : "m", + "access" : 0, + "descriptor" : "Lgh;" + } ], + "methods" : [ { + "method" : "__m_433", + "owner" : "jy", + "name" : "m", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Lgh;)V" + }, { + "method" : "__f_434", + "owner" : "jy", + "name" : "f", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Lgh;" + }, { + "method" : "__q_435", + "owner" : "jy", + "name" : "q", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Lgh;" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "IterableDualNodeQueueIterator", + "name" : "jl", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "java.util.Iterator" ], + "fields" : [ { + "field" : "queue", + "owner" : "jl", + "name" : "m", + "access" : 0, + "descriptor" : "Ljc;" + }, { + "field" : "__f", + "owner" : "jl", + "name" : "f", + "access" : 0, + "descriptor" : "Lfn;" + }, { + "field" : "__q", + "owner" : "jl", + "name" : "q", + "access" : 0, + "descriptor" : "Lfn;" + } ], + "methods" : [ { + "method" : "__next_436", + "owner" : "jl", + "name" : "next", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Ljava/lang/Object;" + }, { + "method" : "__hasNext_437", + "owner" : "jl", + "name" : "hasNext", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Z" + }, { + "method" : "__remove_438", + "owner" : "jl", + "name" : "remove", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljc;)V" + } ] +}, { + "class" : "IterableNodeDequeDescendingIterator", + "name" : "jt", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "java.util.Iterator" ], + "fields" : [ { + "field" : "deque", + "owner" : "jt", + "name" : "m", + "access" : 0, + "descriptor" : "Lja;" + }, { + "field" : "__f", + "owner" : "jt", + "name" : "f", + "access" : 0, + "descriptor" : "Lgw;" + }, { + "field" : "__q", + "owner" : "jt", + "name" : "q", + "access" : 0, + "descriptor" : "Lgw;" + } ], + "methods" : [ { + "method" : "__u_439", + "owner" : "jt", + "name" : "u", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(Lja;)V" + }, { + "method" : "__g_440", + "owner" : "jt", + "name" : "g", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__next_441", + "owner" : "jt", + "name" : "next", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Ljava/lang/Object;" + }, { + "method" : "__hasNext_442", + "owner" : "jt", + "name" : "hasNext", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Z" + }, { + "method" : "__remove_443", + "owner" : "jt", + "name" : "remove", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Lja;)V" + } ] +}, { + "class" : "IterableDualNodeQueue", + "name" : "jc", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "java.lang.Iterable" ], + "fields" : [ { + "field" : "head", + "owner" : "jc", + "name" : "f", + "access" : 0, + "descriptor" : "Lfn;" + }, { + "field" : "sentinel", + "owner" : "jc", + "name" : "m", + "access" : 1, + "descriptor" : "Lfn;" + } ], + "methods" : [ { + "method" : "add", + "owner" : "jc", + "name" : "f", + "access" : 1, + "descriptor" : "(Lfn;)V" + }, { + "method" : "clear", + "owner" : "jc", + "name" : "m", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__q_444", + "owner" : "jc", + "name" : "q", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Lfn;" + }, { + "method" : "__w_445", + "owner" : "jc", + "name" : "w", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Lfn;" + }, { + "method" : "__o_446", + "owner" : "jc", + "name" : "o", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(Lfn;)Lfn;" + }, { + "method" : "__u_447", + "owner" : "jc", + "name" : "u", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Lfn;" + }, { + "method" : "__iterator_448", + "owner" : "jc", + "name" : "iterator", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Ljava/util/Iterator;" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "Timer", + "name" : "jo", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__e", + "owner" : "jo", + "name" : "e", + "access" : 0, + "descriptor" : "I", + "decoder" : 978183419 + }, { + "field" : "__g", + "owner" : "jo", + "name" : "g", + "access" : 0, + "descriptor" : "I", + "decoder" : -500639955 + }, { + "field" : "__l", + "owner" : "jo", + "name" : "l", + "access" : 0, + "descriptor" : "I", + "decoder" : 2043109577 + }, { + "field" : "__x", + "owner" : "jo", + "name" : "x", + "access" : 0, + "descriptor" : "I", + "decoder" : 1684916659 + }, { + "field" : "__f", + "owner" : "jo", + "name" : "f", + "access" : 0, + "descriptor" : "J", + "decoder" : -8166664055136527097 + }, { + "field" : "__m", + "owner" : "jo", + "name" : "m", + "access" : 0, + "descriptor" : "J", + "decoder" : 6181704275746246665 + }, { + "field" : "__o", + "owner" : "jo", + "name" : "o", + "access" : 0, + "descriptor" : "J", + "decoder" : -5820022560321695785 + }, { + "field" : "__u", + "owner" : "jo", + "name" : "u", + "access" : 0, + "descriptor" : "J", + "decoder" : -7044840680232740733 + }, { + "field" : "__w", + "owner" : "jo", + "name" : "w", + "access" : 0, + "descriptor" : "J", + "decoder" : -6206176920376957899 + }, { + "field" : "__q", + "owner" : "jo", + "name" : "q", + "access" : 1, + "descriptor" : "Z" + } ], + "methods" : [ { + "method" : "write", + "owner" : "jo", + "name" : "g", + "access" : 1, + "parameters" : [ "buffer" ], + "descriptor" : "(Lgr;I)V" + }, { + "method" : "__m_449", + "owner" : "jo", + "name" : "m", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__f_450", + "owner" : "jo", + "name" : "f", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "__q_451", + "owner" : "jo", + "name" : "q", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(II)V" + }, { + "method" : "__w_452", + "owner" : "jo", + "name" : "w", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__o_453", + "owner" : "jo", + "name" : "o", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(S)V" + }, { + "method" : "__u_454", + "owner" : "jo", + "name" : "u", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "User", + "name" : "js", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "java.lang.Comparable" ], + "fields" : [ { + "field" : "previousUsername", + "owner" : "js", + "name" : "w", + "access" : 0, + "descriptor" : "Lkp;" + }, { + "field" : "username0", + "owner" : "js", + "name" : "q", + "access" : 0, + "descriptor" : "Lkp;" + } ], + "methods" : [ { + "method" : "compareTo0", + "owner" : "js", + "name" : "aj", + "access" : 1, + "parameters" : [ "other" ], + "descriptor" : "(Ljs;I)I" + }, { + "method" : "name", + "owner" : "js", + "name" : "v", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)Ljava/lang/String;" + }, { + "method" : "previousName", + "owner" : "js", + "name" : "ag", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Ljava/lang/String;" + }, { + "method" : "set", + "owner" : "js", + "name" : "aq", + "access" : 0, + "parameters" : [ "username", "previousUsername" ], + "descriptor" : "(Lkp;Lkp;I)V" + }, { + "method" : "username", + "owner" : "js", + "name" : "p", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Lkp;" + }, { + "method" : "__compareTo_455", + "owner" : "js", + "name" : "compareTo", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/lang/Object;)I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "AbstractUserComparator", + "name" : "kf", + "super" : "java.lang.Object", + "access" : 1057, + "interfaces" : [ "java.util.Comparator" ], + "fields" : [ { + "field" : "__f", + "owner" : "kf", + "name" : "f", + "access" : 0, + "descriptor" : "Ljava/util/Comparator;" + } ], + "methods" : [ { + "method" : "__e_456", + "owner" : "kf", + "name" : "e", + "access" : 16, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/util/Comparator;B)V" + }, { + "method" : "__x_457", + "owner" : "kf", + "name" : "x", + "access" : 20, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ljs;Ljs;I)I" + }, { + "method" : "__equals_458", + "owner" : "kf", + "name" : "equals", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/lang/Object;)Z" + } ], + "constructors" : [ { + "access" : 4, + "descriptor" : "()V" + } ] +}, { + "class" : "Ignored", + "name" : "ks", + "super" : "js", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "id", + "owner" : "ks", + "name" : "m", + "access" : 0, + "descriptor" : "I", + "decoder" : 344024525 + } ], + "methods" : [ { + "method" : "compareTo00", + "owner" : "ks", + "name" : "m", + "access" : 0, + "parameters" : [ "other" ], + "descriptor" : "(Lks;I)I" + }, { + "method" : "__aj_459", + "owner" : "ks", + "name" : "aj", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljs;I)I" + }, { + "method" : "__compareTo_460", + "owner" : "ks", + "name" : "compareTo", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/lang/Object;)I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "FriendsList", + "name" : "kg", + "super" : "km", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "friendLoginUpdates", + "owner" : "kg", + "name" : "d", + "access" : 1, + "descriptor" : "Ljy;" + }, { + "field" : "loginType", + "owner" : "kg", + "name" : "q", + "access" : 16, + "descriptor" : "Llx;" + }, { + "field" : "__x", + "owner" : "kg", + "name" : "x", + "access" : 0, + "descriptor" : "I", + "decoder" : -217526077 + } ], + "methods" : [ { + "method" : "newInstance", + "owner" : "kg", + "name" : "m", + "access" : 0, + "descriptor" : "(I)Ljs;" + }, { + "method" : "newTypedArray", + "owner" : "kg", + "name" : "f", + "access" : 0, + "descriptor" : "(II)[Ljs;" + }, { + "method" : "read", + "owner" : "kg", + "name" : "x", + "access" : 1, + "parameters" : [ "buffer", "n" ], + "descriptor" : "(Lgr;IB)V" + }, { + "method" : "__q_461", + "owner" : "kg", + "name" : "q", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Lkp;ZI)Z" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Llx;)V" + } ] +}, { + "class" : "Username", + "name" : "kp", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "java.lang.Comparable" ], + "fields" : [ { + "field" : "cleanName", + "owner" : "kp", + "name" : "f", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "name0", + "owner" : "kp", + "name" : "m", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + } ], + "methods" : [ { + "method" : "compareTo0", + "owner" : "kp", + "name" : "q", + "access" : 1, + "parameters" : [ "other" ], + "descriptor" : "(Lkp;B)I" + }, { + "method" : "hasCleanName", + "owner" : "kp", + "name" : "f", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "name", + "owner" : "kp", + "name" : "m", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Ljava/lang/String;" + }, { + "method" : "__equals_462", + "owner" : "kp", + "name" : "equals", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/lang/Object;)Z" + }, { + "method" : "__hashCode_463", + "owner" : "kp", + "name" : "hashCode", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()I" + }, { + "method" : "__toString_464", + "owner" : "kp", + "name" : "toString", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Ljava/lang/String;" + }, { + "method" : "__compareTo_465", + "owner" : "kp", + "name" : "compareTo", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/lang/Object;)I" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Ljava/lang/String;Llx;)V" + } ] +}, { + "class" : "Friend", + "name" : "kq", + "super" : "ke", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__f", + "owner" : "kq", + "name" : "f", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "__m", + "owner" : "kq", + "name" : "m", + "access" : 0, + "descriptor" : "Z" + } ], + "methods" : [ { + "method" : "compareTo00", + "owner" : "kq", + "name" : "m", + "access" : 0, + "parameters" : [ "other" ], + "descriptor" : "(Lkq;I)I" + }, { + "method" : "__aj_466", + "owner" : "kq", + "name" : "aj", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljs;I)I" + }, { + "method" : "__compareTo_467", + "owner" : "kq", + "name" : "compareTo", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/lang/Object;)I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "ClanChat", + "name" : "kv", + "super" : "km", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "localUser", + "owner" : "kv", + "name" : "q", + "access" : 16, + "descriptor" : "Lky;" + }, { + "field" : "loginType", + "owner" : "kv", + "name" : "f", + "access" : 16, + "descriptor" : "Llx;" + }, { + "field" : "minKick", + "owner" : "kv", + "name" : "k", + "access" : 1, + "descriptor" : "B" + }, { + "field" : "name", + "owner" : "kv", + "name" : "x", + "access" : 1, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "owner", + "owner" : "kv", + "name" : "d", + "access" : 1, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "rank", + "owner" : "kv", + "name" : "n", + "access" : 1, + "descriptor" : "I", + "decoder" : -1534670751 + }, { + "field" : "__i", + "owner" : "kv", + "name" : "i", + "access" : 0, + "descriptor" : "I", + "decoder" : 386706253 + } ], + "methods" : [ { + "method" : "clearFriends", + "owner" : "kv", + "name" : "cg", + "access" : 17, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "clearIgnoreds", + "owner" : "kv", + "name" : "cf", + "access" : 17, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "newInstance", + "owner" : "kv", + "name" : "m", + "access" : 0, + "descriptor" : "(I)Ljs;" + }, { + "method" : "newTypedArray", + "owner" : "kv", + "name" : "f", + "access" : 0, + "descriptor" : "(II)[Ljs;" + }, { + "method" : "readUpdate", + "owner" : "kv", + "name" : "d", + "access" : 17, + "parameters" : [ "buffer" ], + "descriptor" : "(Lgr;I)V" + }, { + "method" : "__q_468", + "owner" : "kv", + "name" : "q", + "access" : 16, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/lang/String;I)V" + }, { + "method" : "__x_469", + "owner" : "kv", + "name" : "x", + "access" : 16, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/lang/String;B)V" + }, { + "method" : "__a_470", + "owner" : "kv", + "name" : "a", + "access" : 17, + "parameters" : [ "arg0" ], + "descriptor" : "(Lgr;B)V" + }, { + "method" : "__cp_471", + "owner" : "kv", + "name" : "cp", + "access" : 16, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljk;I)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Llx;Lky;)V" + } ] +}, { + "class" : "FontName", + "name" : "kx", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__g", + "owner" : "kx", + "name" : "g", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + } ], + "methods" : [ ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Ljava/lang/String;)V" + } ] +}, { + "class" : "Fonts", + "name" : "kz", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "map", + "owner" : "kz", + "name" : "q", + "access" : 0, + "descriptor" : "Ljava/util/HashMap;" + }, { + "field" : "__f", + "owner" : "kz", + "name" : "f", + "access" : 0, + "descriptor" : "Lir;" + }, { + "field" : "__m", + "owner" : "kz", + "name" : "m", + "access" : 0, + "descriptor" : "Lir;" + } ], + "methods" : [ { + "method" : "createMap", + "owner" : "kz", + "name" : "m", + "access" : 1, + "descriptor" : "([Lkx;I)Ljava/util/HashMap;" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Lir;Lir;)V" + } ] +}, { + "class" : "GraphicsDefaults", + "name" : "lg", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "crosses", + "owner" : "lg", + "name" : "l", + "access" : 1, + "descriptor" : "I", + "decoder" : 536911453 + }, { + "field" : "headIconsHint", + "owner" : "lg", + "name" : "u", + "access" : 1, + "descriptor" : "I", + "decoder" : 185111653 + }, { + "field" : "headIconsPk", + "owner" : "lg", + "name" : "w", + "access" : 1, + "descriptor" : "I", + "decoder" : -1052769237 + }, { + "field" : "headIconsPrayer", + "owner" : "lg", + "name" : "o", + "access" : 1, + "descriptor" : "I", + "decoder" : -1744250043 + }, { + "field" : "mapDots", + "owner" : "lg", + "name" : "e", + "access" : 1, + "descriptor" : "I", + "decoder" : -1114417319 + }, { + "field" : "mapMarkers", + "owner" : "lg", + "name" : "g", + "access" : 1, + "descriptor" : "I", + "decoder" : -1217061337 + }, { + "field" : "mapScenes", + "owner" : "lg", + "name" : "q", + "access" : 1, + "descriptor" : "I", + "decoder" : -104203005 + }, { + "field" : "modIcons", + "owner" : "lg", + "name" : "d", + "access" : 1, + "descriptor" : "I", + "decoder" : 2043130323 + }, { + "field" : "scrollBars", + "owner" : "lg", + "name" : "x", + "access" : 1, + "descriptor" : "I", + "decoder" : -919662109 + }, { + "field" : "__f", + "owner" : "lg", + "name" : "f", + "access" : 1, + "descriptor" : "I", + "decoder" : 159591367 + }, { + "field" : "__m", + "owner" : "lg", + "name" : "m", + "access" : 1, + "descriptor" : "I", + "decoder" : 1673796151 + } ], + "methods" : [ { + "method" : "decode", + "owner" : "lg", + "name" : "m", + "access" : 1, + "parameters" : [ "index" ], + "descriptor" : "(Lir;I)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "UserComparator1", + "name" : "ly", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "java.util.Comparator" ], + "fields" : [ { + "field" : "__m", + "owner" : "ly", + "name" : "m", + "access" : 16, + "descriptor" : "Z" + } ], + "methods" : [ { + "method" : "__m_472", + "owner" : "ly", + "name" : "m", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ljs;Ljs;B)I" + }, { + "method" : "__compare_473", + "owner" : "ly", + "name" : "compare", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" + }, { + "method" : "__equals_474", + "owner" : "ly", + "name" : "equals", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/lang/Object;)Z" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Z)V" + } ] +}, { + "class" : "UserComparator2", + "name" : "li", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "java.util.Comparator" ], + "fields" : [ { + "field" : "__m", + "owner" : "li", + "name" : "m", + "access" : 16, + "descriptor" : "Z" + } ], + "methods" : [ { + "method" : "__m_475", + "owner" : "li", + "name" : "m", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ljs;Ljs;I)I" + }, { + "method" : "__compare_476", + "owner" : "li", + "name" : "compare", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I" + }, { + "method" : "__equals_477", + "owner" : "li", + "name" : "equals", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(Ljava/lang/Object;)Z" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(Z)V" + } ] +}, { + "class" : "IterableNodeHashTable", + "name" : "lh", + "super" : "java.lang.Object", + "access" : 49, + "interfaces" : [ "java.lang.Iterable" ], + "fields" : [ { + "field" : "buckets", + "owner" : "lh", + "name" : "f", + "access" : 0, + "descriptor" : "[Lgw;" + }, { + "field" : "current", + "owner" : "lh", + "name" : "w", + "access" : 0, + "descriptor" : "Lgw;" + }, { + "field" : "currentGet", + "owner" : "lh", + "name" : "q", + "access" : 0, + "descriptor" : "Lgw;" + }, { + "field" : "index", + "owner" : "lh", + "name" : "o", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "size", + "owner" : "lh", + "name" : "m", + "access" : 0, + "descriptor" : "I" + } ], + "methods" : [ { + "method" : "clear", + "owner" : "lh", + "name" : "q", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "first", + "owner" : "lh", + "name" : "w", + "access" : 1, + "descriptor" : "()Lgw;" + }, { + "method" : "get", + "owner" : "lh", + "name" : "m", + "access" : 1, + "descriptor" : "(J)Lgw;" + }, { + "method" : "next", + "owner" : "lh", + "name" : "o", + "access" : 1, + "descriptor" : "()Lgw;" + }, { + "method" : "put", + "owner" : "lh", + "name" : "f", + "access" : 1, + "descriptor" : "(Lgw;J)V" + }, { + "method" : "__iterator_478", + "owner" : "lh", + "name" : "iterator", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Ljava/util/Iterator;" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(I)V" + } ] +}, { + "class" : "IterableNodeHashTableIterator", + "name" : "lk", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "java.util.Iterator" ], + "fields" : [ { + "field" : "hashTable", + "owner" : "lk", + "name" : "m", + "access" : 0, + "descriptor" : "Llh;" + }, { + "field" : "__f", + "owner" : "lk", + "name" : "f", + "access" : 0, + "descriptor" : "Lgw;" + }, { + "field" : "__w", + "owner" : "lk", + "name" : "w", + "access" : 0, + "descriptor" : "Lgw;" + }, { + "field" : "__q", + "owner" : "lk", + "name" : "q", + "access" : 0, + "descriptor" : "I" + } ], + "methods" : [ { + "method" : "__u_479", + "owner" : "lk", + "name" : "u", + "access" : 0, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__next_480", + "owner" : "lk", + "name" : "next", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Ljava/lang/Object;" + }, { + "method" : "__hasNext_481", + "owner" : "lk", + "name" : "hasNext", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Z" + }, { + "method" : "__remove_482", + "owner" : "lk", + "name" : "remove", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(Llh;)V" + } ] +}, { + "class" : "Bounds", + "name" : "la", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__f", + "owner" : "la", + "name" : "f", + "access" : 1, + "descriptor" : "I", + "decoder" : -1887298731 + }, { + "field" : "__m", + "owner" : "la", + "name" : "m", + "access" : 1, + "descriptor" : "I", + "decoder" : -2004088829 + }, { + "field" : "__q", + "owner" : "la", + "name" : "q", + "access" : 1, + "descriptor" : "I", + "decoder" : 2001187823 + }, { + "field" : "__w", + "owner" : "la", + "name" : "w", + "access" : 1, + "descriptor" : "I", + "decoder" : 1377856837 + } ], + "methods" : [ { + "method" : "__m_483", + "owner" : "la", + "name" : "m", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(IIB)V" + }, { + "method" : "__f_484", + "owner" : "la", + "name" : "f", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(III)V" + }, { + "method" : "__toString_485", + "owner" : "la", + "name" : "toString", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Ljava/lang/String;" + }, { + "method" : "__q_486", + "owner" : "la", + "name" : "q", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Lla;Lla;I)V" + }, { + "method" : "__w_487", + "owner" : "la", + "name" : "w", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Lla;Lla;I)V" + }, { + "method" : "__o_488", + "owner" : "la", + "name" : "o", + "access" : 0, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(Lla;Lla;S)V" + }, { + "method" : "__u_489", + "owner" : "la", + "name" : "u", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__g_490", + "owner" : "la", + "name" : "g", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)I" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "(II)V" + }, { + "access" : 1, + "descriptor" : "(IIII)V" + } ] +}, { + "class" : "RectangleMode", + "name" : "lj", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ "gc" ], + "fields" : [ { + "field" : "id", + "owner" : "lj", + "name" : "w", + "access" : 17, + "descriptor" : "I", + "decoder" : -1391612747 + }, { + "field" : "id2", + "owner" : "lj", + "name" : "o", + "access" : 16, + "descriptor" : "I", + "decoder" : -1204297807 + } ], + "methods" : [ { + "method" : "__f_491", + "owner" : "lj", + "name" : "f", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)I" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(II)V" + } ] +}, { + "class" : "IndexedSprite", + "name" : "lq", + "super" : "lf", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "height", + "owner" : "lq", + "name" : "l", + "access" : 1, + "descriptor" : "I" + }, { + "field" : "palette", + "owner" : "lq", + "name" : "f", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "pixels", + "owner" : "lq", + "name" : "m", + "access" : 1, + "descriptor" : "[B" + }, { + "field" : "subHeight", + "owner" : "lq", + "name" : "w", + "access" : 1, + "descriptor" : "I" + }, { + "field" : "subWidth", + "owner" : "lq", + "name" : "q", + "access" : 1, + "descriptor" : "I" + }, { + "field" : "width", + "owner" : "lq", + "name" : "g", + "access" : 1, + "descriptor" : "I" + }, { + "field" : "xOffset", + "owner" : "lq", + "name" : "o", + "access" : 1, + "descriptor" : "I" + }, { + "field" : "yOffset", + "owner" : "lq", + "name" : "u", + "access" : 1, + "descriptor" : "I" + } ], + "methods" : [ { + "method" : "normalize", + "owner" : "lq", + "name" : "m", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "shiftColors", + "owner" : "lq", + "name" : "f", + "access" : 1, + "parameters" : [ "r", "g", "b" ], + "descriptor" : "(III)V" + }, { + "method" : "__q_492", + "owner" : "lq", + "name" : "q", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(II)V" + }, { + "method" : "__o_493", + "owner" : "lq", + "name" : "o", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], + "descriptor" : "(IIII)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + } ] +}, { + "class" : "Sprite", + "name" : "ln", + "super" : "lf", + "access" : 49, + "interfaces" : [ ], + "fields" : [ { + "field" : "height", + "owner" : "ln", + "name" : "g", + "access" : 1, + "descriptor" : "I" + }, { + "field" : "pixels", + "owner" : "ln", + "name" : "m", + "access" : 1, + "descriptor" : "[I" + }, { + "field" : "subHeight", + "owner" : "ln", + "name" : "q", + "access" : 1, + "descriptor" : "I" + }, { + "field" : "subWidth", + "owner" : "ln", + "name" : "f", + "access" : 1, + "descriptor" : "I" + }, { + "field" : "width", + "owner" : "ln", + "name" : "u", + "access" : 1, + "descriptor" : "I" + }, { + "field" : "xOffset", + "owner" : "ln", + "name" : "o", + "access" : 0, + "descriptor" : "I" + }, { + "field" : "yOffset", + "owner" : "ln", + "name" : "w", + "access" : 1, + "descriptor" : "I" + } ], + "methods" : [ { + "method" : "copy", + "owner" : "ln", + "name" : "m", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Lln;" + }, { + "method" : "copyNormalized", + "owner" : "ln", + "name" : "f", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Lln;" + }, { + "method" : "normalize", + "owner" : "ln", + "name" : "w", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__q_494", + "owner" : "ln", + "name" : "q", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__o_495", + "owner" : "ln", + "name" : "o", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(I)V" + }, { + "method" : "__u_496", + "owner" : "ln", + "name" : "u", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__g_497", + "owner" : "ln", + "name" : "g", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "__l_498", + "owner" : "ln", + "name" : "l", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(I)V" + }, { + "method" : "__e_499", + "owner" : "ln", + "name" : "e", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(I)V" + }, { + "method" : "__x_500", + "owner" : "ln", + "name" : "x", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(II)V" + }, { + "method" : "__a_501", + "owner" : "ln", + "name" : "a", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(II)V" + }, { + "method" : "__j_502", + "owner" : "ln", + "name" : "j", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], + "descriptor" : "(IIII)V" + }, { + "method" : "__t_503", + "owner" : "ln", + "name" : "t", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], + "descriptor" : "(IIII)V" + }, { + "method" : "__h_504", + "owner" : "ln", + "name" : "h", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(III)V" + }, { + "method" : "__c_505", + "owner" : "ln", + "name" : "c", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], + "descriptor" : "(IIIII)V" + }, { + "method" : "__v_506", + "owner" : "ln", + "name" : "v", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(III)V" + }, { + "method" : "__aj_507", + "owner" : "ln", + "name" : "aj", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ], + "descriptor" : "(IIIII)V" + }, { + "method" : "__ac_508", + "owner" : "ln", + "name" : "ac", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7" ], + "descriptor" : "(IIIIII[I[I)V" + }, { + "method" : "__ay_509", + "owner" : "ln", + "name" : "ay", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7", "arg8", "arg9" ], + "descriptor" : "(IIIIIIII[I[I)V" + }, { + "method" : "__ah_510", + "owner" : "ln", + "name" : "ah", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7" ], + "descriptor" : "(IIIIIIDI)V" + }, { + "method" : "__ak_511", + "owner" : "ln", + "name" : "ak", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], + "descriptor" : "(IIII)V" + }, { + "method" : "__aw_512", + "owner" : "ln", + "name" : "aw", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], + "descriptor" : "(IIIIII)V" + }, { + "method" : "__al_513", + "owner" : "ln", + "name" : "al", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], + "descriptor" : "(IIII)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "()V" + }, { + "access" : 1, + "descriptor" : "(II)V" + }, { + "access" : 1, + "descriptor" : "([III)V" + } ] +}, { + "class" : "PlatformInfo", + "name" : "lb", + "super" : "gw", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__ah", + "owner" : "lb", + "name" : "ah", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "__at", + "owner" : "lb", + "name" : "at", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "__ab", + "owner" : "lb", + "name" : "ab", + "access" : 0, + "descriptor" : "I", + "decoder" : -1667177301 + }, { + "field" : "__ad", + "owner" : "lb", + "name" : "ad", + "access" : 0, + "descriptor" : "I", + "decoder" : -1765017 + }, { + "field" : "__ae", + "owner" : "lb", + "name" : "ae", + "access" : 0, + "descriptor" : "I", + "decoder" : 385109109 + }, { + "field" : "__af", + "owner" : "lb", + "name" : "af", + "access" : 0, + "descriptor" : "I", + "decoder" : 1955966365 + }, { + "field" : "__ai", + "owner" : "lb", + "name" : "ai", + "access" : 0, + "descriptor" : "I", + "decoder" : 1196598207 + }, { + "field" : "__ak", + "owner" : "lb", + "name" : "ak", + "access" : 0, + "descriptor" : "I", + "decoder" : 703904161 + }, { + "field" : "__al", + "owner" : "lb", + "name" : "al", + "access" : 0, + "descriptor" : "I", + "decoder" : 2097018521 + }, { + "field" : "__am", + "owner" : "lb", + "name" : "am", + "access" : 0, + "descriptor" : "I", + "decoder" : 30207059 + }, { + "field" : "__an", + "owner" : "lb", + "name" : "an", + "access" : 0, + "descriptor" : "I", + "decoder" : 890109053 + }, { + "field" : "__ap", + "owner" : "lb", + "name" : "ap", + "access" : 0, + "descriptor" : "I", + "decoder" : -817941105 + }, { + "field" : "__aw", + "owner" : "lb", + "name" : "aw", + "access" : 0, + "descriptor" : "I", + "decoder" : 467004305 + }, { + "field" : "__ax", + "owner" : "lb", + "name" : "ax", + "access" : 0, + "descriptor" : "I", + "decoder" : 871094255 + }, { + "field" : "__ay", + "owner" : "lb", + "name" : "ay", + "access" : 0, + "descriptor" : "I", + "decoder" : 1318366785 + }, { + "field" : "__ba", + "owner" : "lb", + "name" : "ba", + "access" : 0, + "descriptor" : "I", + "decoder" : -170839105 + }, { + "field" : "__bn", + "owner" : "lb", + "name" : "bn", + "access" : 0, + "descriptor" : "I", + "decoder" : 1466207635 + }, { + "field" : "__bq", + "owner" : "lb", + "name" : "bq", + "access" : 0, + "descriptor" : "[I" + }, { + "field" : "__aa", + "owner" : "lb", + "name" : "aa", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__ao", + "owner" : "lb", + "name" : "ao", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__au", + "owner" : "lb", + "name" : "au", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__az", + "owner" : "lb", + "name" : "az", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__bb", + "owner" : "lb", + "name" : "bb", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__bk", + "owner" : "lb", + "name" : "bk", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__bs", + "owner" : "lb", + "name" : "bs", + "access" : 0, + "descriptor" : "Ljava/lang/String;" + } ], + "methods" : [ { + "method" : "size", + "owner" : "lb", + "name" : "f", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "write", + "owner" : "lb", + "name" : "m", + "access" : 1, + "parameters" : [ "buffer" ], + "descriptor" : "(Lgr;I)V" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(IZIIIIIZIIIILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIIILjava/lang/String;Ljava/lang/String;[IILjava/lang/String;)V" + } ] +}, { + "class" : "WorldMap", + "name" : "lz", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "cacheLoader", + "owner" : "lz", + "name" : "h", + "access" : 0, + "descriptor" : "Lls;" + }, { + "field" : "currentMapArea0", + "owner" : "lz", + "name" : "s", + "access" : 0, + "descriptor" : "Lag;" + }, { + "field" : "elementsDisabled", + "owner" : "lz", + "name" : "ai", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "enabledCategories", + "owner" : "lz", + "name" : "aa", + "access" : 0, + "descriptor" : "Ljava/util/HashSet;" + }, { + "field" : "enabledElements", + "owner" : "lz", + "name" : "ao", + "access" : 0, + "descriptor" : "Ljava/util/HashSet;" + }, { + "field" : "flashingElements", + "owner" : "lz", + "name" : "ak", + "access" : 0, + "descriptor" : "Ljava/util/HashSet;" + }, { + "field" : "font", + "owner" : "lz", + "name" : "n", + "access" : 0, + "descriptor" : "Lkk;" + }, { + "field" : "fonts", + "owner" : "lz", + "name" : "i", + "access" : 0, + "descriptor" : "Ljava/util/HashMap;" + }, { + "field" : "iconIterator", + "owner" : "lz", + "name" : "bn", + "access" : 0, + "descriptor" : "Ljava/util/Iterator;" + }, { + "field" : "mainMapArea", + "owner" : "lz", + "name" : "j", + "access" : 0, + "descriptor" : "Lag;" + }, { + "field" : "mapAreas", + "owner" : "lz", + "name" : "z", + "access" : 0, + "descriptor" : "Ljava/util/HashMap;" + }, { + "field" : "mapSceneSprites", + "owner" : "lz", + "name" : "a", + "access" : 0, + "descriptor" : "[Llq;" + }, { + "field" : "mouseCoord", + "owner" : "lz", + "name" : "bd", + "access" : 0, + "descriptor" : "Lhu;" + }, { + "field" : "perpetualFlash0", + "owner" : "lz", + "name" : "ah", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "sprite", + "owner" : "lz", + "name" : "bo", + "access" : 0, + "descriptor" : "Lln;" + }, { + "field" : "worldMapManager", + "owner" : "lz", + "name" : "y", + "access" : 0, + "descriptor" : "Lal;" + }, { + "field" : "zoom", + "owner" : "lz", + "name" : "v", + "access" : 0, + "descriptor" : "F" + }, { + "field" : "zoomTarget", + "owner" : "lz", + "name" : "ag", + "access" : 0, + "descriptor" : "F" + }, { + "field" : "__t", + "owner" : "lz", + "name" : "t", + "access" : 0, + "descriptor" : "Lag;" + }, { + "field" : "__an", + "owner" : "lz", + "name" : "an", + "access" : 0, + "descriptor" : "Z" + }, { + "field" : "__ab", + "owner" : "lz", + "name" : "ab", + "access" : 0, + "descriptor" : "I", + "decoder" : -1979665983 + }, { + "field" : "__ac", + "owner" : "lz", + "name" : "ac", + "access" : 0, + "descriptor" : "I", + "decoder" : -1653084915 + }, { + "field" : "__ad", + "owner" : "lz", + "name" : "ad", + "access" : 0, + "descriptor" : "I", + "decoder" : -988933407 + }, { + "field" : "__ae", + "owner" : "lz", + "name" : "ae", + "access" : 0, + "descriptor" : "I", + "decoder" : 547126547 + }, { + "field" : "__aj", + "owner" : "lz", + "name" : "aj", + "access" : 0, + "descriptor" : "I", + "decoder" : -1140942239 + }, { + "field" : "__al", + "owner" : "lz", + "name" : "al", + "access" : 0, + "descriptor" : "I", + "decoder" : 2064651113 + }, { + "field" : "__am", + "owner" : "lz", + "name" : "am", + "access" : 0, + "descriptor" : "I", + "decoder" : -869889187 + }, { + "field" : "__aq", + "owner" : "lz", + "name" : "aq", + "access" : 0, + "descriptor" : "I", + "decoder" : -1469654441 + }, { + "field" : "__ar", + "owner" : "lz", + "name" : "ar", + "access" : 0, + "descriptor" : "I", + "decoder" : -298919797 + }, { + "field" : "__as", + "owner" : "lz", + "name" : "as", + "access" : 0, + "descriptor" : "I", + "decoder" : -969094439 + }, { + "field" : "__at", + "owner" : "lz", + "name" : "at", + "access" : 0, + "descriptor" : "I", + "decoder" : -815748997 + }, { + "field" : "__av", + "owner" : "lz", + "name" : "av", + "access" : 0, + "descriptor" : "I", + "decoder" : -1301477687 + }, { + "field" : "__aw", + "owner" : "lz", + "name" : "aw", + "access" : 0, + "descriptor" : "I", + "decoder" : -1683910031 + }, { + "field" : "__ay", + "owner" : "lz", + "name" : "ay", + "access" : 0, + "descriptor" : "I", + "decoder" : 1664740569 + }, { + "field" : "__b", + "owner" : "lz", + "name" : "b", + "access" : 0, + "descriptor" : "I", + "decoder" : 1711576969 + }, { + "field" : "__ba", + "owner" : "lz", + "name" : "ba", + "access" : 0, + "descriptor" : "I", + "decoder" : -237734529 + }, { + "field" : "__bm", + "owner" : "lz", + "name" : "bm", + "access" : 0, + "descriptor" : "I", + "decoder" : -1774424249 + }, { + "field" : "__bu", + "owner" : "lz", + "name" : "bu", + "access" : 0, + "descriptor" : "I", + "decoder" : 2064728623 + }, { + "field" : "__bx", + "owner" : "lz", + "name" : "bx", + "access" : 0, + "descriptor" : "I", + "decoder" : 2031417343 + }, { + "field" : "__by", + "owner" : "lz", + "name" : "by", + "access" : 0, + "descriptor" : "I", + "decoder" : 754899959 + }, { + "field" : "__c", + "owner" : "lz", + "name" : "c", + "access" : 0, + "descriptor" : "I", + "decoder" : 1318118645 + }, { + "field" : "__p", + "owner" : "lz", + "name" : "p", + "access" : 0, + "descriptor" : "I", + "decoder" : -56022357 + }, { + "field" : "__r", + "owner" : "lz", + "name" : "r", + "access" : 0, + "descriptor" : "I", + "decoder" : -89657613 + }, { + "field" : "__e", + "owner" : "lz", + "name" : "e", + "access" : 0, + "descriptor" : "Lir;" + }, { + "field" : "__g", + "owner" : "lz", + "name" : "g", + "access" : 0, + "descriptor" : "Lir;" + }, { + "field" : "__l", + "owner" : "lz", + "name" : "l", + "access" : 0, + "descriptor" : "Lir;" + }, { + "field" : "__af", + "owner" : "lz", + "name" : "af", + "access" : 0, + "descriptor" : "Ljava/util/HashSet;" + }, { + "field" : "__ax", + "owner" : "lz", + "name" : "ax", + "access" : 0, + "descriptor" : "Ljava/util/HashSet;" + }, { + "field" : "__bk", + "owner" : "lz", + "name" : "bk", + "access" : 0, + "descriptor" : "Ljava/util/HashSet;" + }, { + "field" : "__bq", + "owner" : "lz", + "name" : "bq", + "access" : 0, + "descriptor" : "Ljava/util/List;" + }, { + "field" : "__ap", + "owner" : "lz", + "name" : "ap", + "access" : 0, + "descriptor" : "J", + "decoder" : -4747643242047040283 + }, { + "field" : "__bs", + "owner" : "lz", + "name" : "bs", + "access" : 16, + "descriptor" : "[I" + }, { + "field" : "__bc", + "owner" : "lz", + "name" : "bc", + "access" : 1, + "descriptor" : "Z" + } ], + "methods" : [ { + "method" : "currentMapAreaId", + "owner" : "lz", + "name" : "j", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "disableCategory", + "owner" : "lz", + "name" : "bb", + "access" : 1, + "descriptor" : "(IZI)V" + }, { + "method" : "disableElement", + "owner" : "lz", + "name" : "ba", + "access" : 1, + "descriptor" : "(IZI)V" + }, { + "method" : "draw", + "owner" : "lz", + "name" : "c", + "access" : 1, + "parameters" : [ "x", "y", "width", "height", "cycle" ], + "descriptor" : "(IIIIII)V" + }, { + "method" : "drawLoading", + "owner" : "lz", + "name" : "aj", + "access" : 0, + "descriptor" : "(IIIIIB)V" + }, { + "method" : "drawOverview", + "owner" : "lz", + "name" : "ag", + "access" : 1, + "parameters" : [ "x", "y", "width", "height" ], + "descriptor" : "(IIIIB)V" + }, { + "method" : "flashCategory", + "owner" : "lz", + "name" : "ax", + "access" : 1, + "descriptor" : "(IB)V" + }, { + "method" : "flashElement", + "owner" : "lz", + "name" : "aa", + "access" : 1, + "descriptor" : "(II)V" + }, { + "method" : "getCurrentMapArea", + "owner" : "lz", + "name" : "s", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Lag;" + }, { + "method" : "getElementsEnabled", + "owner" : "lz", + "name" : "bs", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)Z" + }, { + "method" : "getMapArea", + "owner" : "lz", + "name" : "ah", + "access" : 1, + "parameters" : [ "id" ], + "descriptor" : "(II)Lag;" + }, { + "method" : "getZoomLevel", + "owner" : "lz", + "name" : "ar", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)I" + }, { + "method" : "iconNext", + "owner" : "lz", + "name" : "by", + "access" : 1, + "descriptor" : "(B)Lak;" + }, { + "method" : "iconStart", + "owner" : "lz", + "name" : "bx", + "access" : 1, + "descriptor" : "(I)Lak;" + }, { + "method" : "init", + "owner" : "lz", + "name" : "m", + "access" : 1, + "descriptor" : "(Lir;Lir;Lir;Lkk;Ljava/util/HashMap;[Llq;I)V" + }, { + "method" : "initializeWorldMapManager", + "owner" : "lz", + "name" : "y", + "access" : 0, + "parameters" : [ "mapArea" ], + "descriptor" : "(Lag;I)V" + }, { + "method" : "isCacheLoaded", + "owner" : "lz", + "name" : "ay", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(S)Z" + }, { + "method" : "isCategoryDisabled", + "owner" : "lz", + "name" : "bn", + "access" : 1, + "descriptor" : "(II)Z" + }, { + "method" : "isElementDisabled", + "owner" : "lz", + "name" : "bq", + "access" : 1, + "descriptor" : "(IB)Z" + }, { + "method" : "jump", + "owner" : "lz", + "name" : "b", + "access" : 0, + "parameters" : [ "plane", "x", "y" ], + "descriptor" : "(IIII)V" + }, { + "method" : "loadCache", + "owner" : "lz", + "name" : "ac", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "mapAreaAtCoord", + "owner" : "lz", + "name" : "d", + "access" : 1, + "parameters" : [ "plane", "x", "y" ], + "descriptor" : "(IIII)Lag;" + }, { + "method" : "menuAction", + "owner" : "lz", + "name" : "bo", + "access" : 1, + "parameters" : [ "a", "b", "c", "d" ], + "descriptor" : "(IILhu;Lhu;B)V" + }, { + "method" : "onCycle", + "owner" : "lz", + "name" : "q", + "access" : 1, + "parameters" : [ "a", "b", "c", "d", "e", "f", "g" ], + "descriptor" : "(IIZIIIIB)V" + }, { + "method" : "perpetualFlash", + "owner" : "lz", + "name" : "ao", + "access" : 1, + "descriptor" : "(ZI)V" + }, { + "method" : "setCurrentMapArea", + "owner" : "lz", + "name" : "t", + "access" : 0, + "parameters" : [ "mapArea" ], + "descriptor" : "(Lag;B)V" + }, { + "method" : "setCurrentMapAreaId", + "owner" : "lz", + "name" : "z", + "access" : 1, + "parameters" : [ "id" ], + "descriptor" : "(II)V" + }, { + "method" : "setElementsEnabled", + "owner" : "lz", + "name" : "ai", + "access" : 1, + "descriptor" : "(ZI)V" + }, { + "method" : "setZoomLevel", + "owner" : "lz", + "name" : "aq", + "access" : 1, + "parameters" : [ "zoom" ], + "descriptor" : "(II)V" + }, { + "method" : "smoothZoom", + "owner" : "lz", + "name" : "u", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "stopCurrentFlashes", + "owner" : "lz", + "name" : "af", + "access" : 1, + "descriptor" : "(I)V" + }, { + "method" : "__f_514", + "owner" : "lz", + "name" : "f", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__w_515", + "owner" : "lz", + "name" : "w", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], + "descriptor" : "(IIZZS)V" + }, { + "method" : "__o_516", + "owner" : "lz", + "name" : "o", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], + "descriptor" : "(IIZJ)V" + }, { + "method" : "__g_517", + "owner" : "lz", + "name" : "g", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__l_518", + "owner" : "lz", + "name" : "l", + "access" : 16, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(IIZI)V" + }, { + "method" : "__e_519", + "owner" : "lz", + "name" : "e", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "__x_520", + "owner" : "lz", + "name" : "x", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "__a_521", + "owner" : "lz", + "name" : "a", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], + "descriptor" : "(IIIZI)V" + }, { + "method" : "__h_522", + "owner" : "lz", + "name" : "h", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3" ], + "descriptor" : "(Lag;Lhu;Lhu;ZI)V" + }, { + "method" : "__p_523", + "owner" : "lz", + "name" : "p", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], + "descriptor" : "(IIIIIII)Z" + }, { + "method" : "__v_524", + "owner" : "lz", + "name" : "v", + "access" : 0, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], + "descriptor" : "(IIIIIII)V" + }, { + "method" : "__av_525", + "owner" : "lz", + "name" : "av", + "access" : 0, + "parameters" : [ "arg0" ], + "descriptor" : "(IB)F" + }, { + "method" : "__ak_526", + "owner" : "lz", + "name" : "ak", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(III)V" + }, { + "method" : "__aw_527", + "owner" : "lz", + "name" : "aw", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(III)V" + }, { + "method" : "__al_528", + "owner" : "lz", + "name" : "al", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(IIIB)V" + }, { + "method" : "__ab_529", + "owner" : "lz", + "name" : "ab", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2" ], + "descriptor" : "(IIII)V" + }, { + "method" : "__ae_530", + "owner" : "lz", + "name" : "ae", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__at_531", + "owner" : "lz", + "name" : "at", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__ad_532", + "owner" : "lz", + "name" : "ad", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)Lhu;" + }, { + "method" : "__ap_533", + "owner" : "lz", + "name" : "ap", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__as_534", + "owner" : "lz", + "name" : "as", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)I" + }, { + "method" : "__am_535", + "owner" : "lz", + "name" : "am", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(II)V" + }, { + "method" : "__an_536", + "owner" : "lz", + "name" : "an", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__az_537", + "owner" : "lz", + "name" : "az", + "access" : 1, + "parameters" : [ "arg0" ], + "descriptor" : "(II)V" + }, { + "method" : "__au_538", + "owner" : "lz", + "name" : "au", + "access" : 1, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__bk_539", + "owner" : "lz", + "name" : "bk", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__bd_540", + "owner" : "lz", + "name" : "bd", + "access" : 1, + "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ], + "descriptor" : "(IIIIIIB)V" + }, { + "method" : "__bc_541", + "owner" : "lz", + "name" : "bc", + "access" : 1, + "parameters" : [ "arg0", "arg1" ], + "descriptor" : "(ILhu;I)Lhu;" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +}, { + "class" : "LoginType", + "name" : "lx", + "super" : "java.lang.Object", + "access" : 33, + "interfaces" : [ ], + "fields" : [ { + "field" : "__d", + "owner" : "lx", + "name" : "d", + "access" : 16, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__x", + "owner" : "lx", + "name" : "x", + "access" : 17, + "descriptor" : "I", + "decoder" : -1916729379 + } ], + "methods" : [ { + "method" : "__toString_542", + "owner" : "lx", + "name" : "toString", + "access" : 1, + "parameters" : [ ], + "descriptor" : "()Ljava/lang/String;" + } ], + "constructors" : [ { + "access" : 0, + "descriptor" : "(IILjava/lang/String;Ljava/lang/String;)V" + }, { + "access" : 0, + "descriptor" : "(IILjava/lang/String;Ljava/lang/String;Z[Llx;)V" + } ] +}, { + "class" : "Client", + "name" : "client", + "super" : "ba", + "access" : 49, + "interfaces" : [ "ky" ], + "fields" : [ { + "field" : "AbstractFont_alpha", + "owner" : "kt", + "name" : "s", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "AbstractFont_color", + "owner" : "kt", + "name" : "j", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "AbstractFont_justificationCurrent", + "owner" : "kt", + "name" : "y", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "AbstractFont_justificationTotal", + "owner" : "kt", + "name" : "t", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "AbstractFont_lines", + "owner" : "kt", + "name" : "b", + "access" : 8, + "descriptor" : "[Ljava/lang/String;" + }, { + "field" : "AbstractFont_modIconSprites", + "owner" : "kt", + "name" : "x", + "access" : 9, + "descriptor" : "[Llq;" + }, { + "field" : "AbstractFont_previousColor", + "owner" : "kt", + "name" : "z", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "AbstractFont_previousShadow", + "owner" : "kt", + "name" : "i", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "AbstractFont_random", + "owner" : "kt", + "name" : "h", + "access" : 8, + "descriptor" : "Ljava/util/Random;" + }, { + "field" : "AbstractFont_shadow", + "owner" : "kt", + "name" : "a", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "AbstractFont_strike", + "owner" : "kt", + "name" : "k", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "AbstractFont_underline", + "owner" : "kt", + "name" : "n", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "ArchiveDiskActionHandler_lock", + "owner" : "iv", + "name" : "w", + "access" : 8, + "descriptor" : "Ljava/lang/Object;" + }, { + "field" : "ArchiveDiskActionHandler_requestQueue", + "owner" : "iv", + "name" : "m", + "access" : 8, + "descriptor" : "Lje;" + }, { + "field" : "ArchiveDiskActionHandler_responseQueue", + "owner" : "iv", + "name" : "f", + "access" : 8, + "descriptor" : "Lje;" + }, { + "field" : "ArchiveDiskActionHandler_thread", + "owner" : "en", + "name" : "o", + "access" : 8, + "descriptor" : "Ljava/lang/Thread;" + }, { + "field" : "ArchiveDisk_buffer", + "owner" : "ff", + "name" : "m", + "access" : 8, + "descriptor" : "[B" + }, { + "field" : "Archive_crc", + "owner" : "it", + "name" : "aj", + "access" : 8, + "descriptor" : "Ljava/util/zip/CRC32;" + }, { + "field" : "AttackOption_alwaysRightClick", + "owner" : "cj", + "name" : "f", + "access" : 24, + "descriptor" : "Lcj;" + }, { + "field" : "AttackOption_dependsOnCombatLevels", + "owner" : "cj", + "name" : "m", + "access" : 24, + "descriptor" : "Lcj;" + }, { + "field" : "AttackOption_hidden", + "owner" : "cj", + "name" : "w", + "access" : 24, + "descriptor" : "Lcj;" + }, { + "field" : "AttackOption_leftClickWhereAvailable", + "owner" : "cj", + "name" : "q", + "access" : 24, + "descriptor" : "Lcj;" + }, { + "field" : "ByteArrayPool_large", + "owner" : "gi", + "name" : "u", + "access" : 8, + "descriptor" : "[[B" + }, { + "field" : "ByteArrayPool_largeCount", + "owner" : "gi", + "name" : "q", + "access" : 8, + "descriptor" : "I", + "decoder" : -971800905 + }, { + "field" : "ByteArrayPool_medium", + "owner" : "gi", + "name" : "o", + "access" : 8, + "descriptor" : "[[B" + }, { + "field" : "ByteArrayPool_mediumCount", + "owner" : "gi", + "name" : "f", + "access" : 8, + "descriptor" : "I", + "decoder" : 2121641763 + }, { + "field" : "ByteArrayPool_small", + "owner" : "gi", + "name" : "w", + "access" : 8, + "descriptor" : "[[B" + }, { + "field" : "ByteArrayPool_smallCount", + "owner" : "gi", + "name" : "m", + "access" : 8, + "descriptor" : "I", + "decoder" : -791125441 + }, { + "field" : "Bzip2Decompressor_state", + "owner" : "gk", + "name" : "l", + "access" : 8, + "descriptor" : "Lgt;" + }, { + "field" : "Component_archive", + "owner" : "ho", + "name" : "e", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "Component_cachedFonts", + "owner" : "ho", + "name" : "a", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "Component_cachedModels", + "owner" : "ho", + "name" : "i", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "DefaultsGroup_graphics", + "owner" : "ka", + "name" : "m", + "access" : 24, + "descriptor" : "Lka;" + }, { + "field" : "EnumDefinition_archive", + "owner" : "jw", + "name" : "m", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "EnumDefinition_cached", + "owner" : "jw", + "name" : "f", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "FloorUnderlayDefinition_archive", + "owner" : "ih", + "name" : "m", + "access" : 8, + "descriptor" : "Lir;" + }, { + "field" : "FloorUnderlayDefinition_cached", + "owner" : "ih", + "name" : "f", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "FontName_bold12", + "owner" : "kx", + "name" : "q", + "access" : 25, + "descriptor" : "Lkx;" + }, { + "field" : "FontName_plain11", + "owner" : "kx", + "name" : "m", + "access" : 25, + "descriptor" : "Lkx;" + }, { + "field" : "FontName_plain12", + "owner" : "kx", + "name" : "f", + "access" : 25, + "descriptor" : "Lkx;" + }, { + "field" : "FontName_verdana11", + "owner" : "kx", + "name" : "w", + "access" : 25, + "descriptor" : "Lkx;" + }, { + "field" : "FontName_verdana13", + "owner" : "kx", + "name" : "o", + "access" : 25, + "descriptor" : "Lkx;" + }, { + "field" : "FontName_verdana15", + "owner" : "kx", + "name" : "u", + "access" : 25, + "descriptor" : "Lkx;" + }, { + "field" : "Formatting_colorEndTag", + "owner" : "cy", + "name" : "l", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Formatting_comma", + "owner" : "cy", + "name" : "f", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Formatting_lineBreakTag", + "owner" : "cy", + "name" : "g", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Formatting_pipe", + "owner" : "cy", + "name" : "q", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Formatting_rightArrow", + "owner" : "cy", + "name" : "u", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Formatting_rightParenthesis", + "owner" : "cy", + "name" : "o", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Formatting_spaceLeftParenthesis", + "owner" : "cy", + "name" : "w", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Formatting_true", + "owner" : "cy", + "name" : "m", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "HealthBarDefinition_cached", + "owner" : "ii", + "name" : "q", + "access" : 9, + "descriptor" : "Ler;" + }, { + "field" : "HealthBarDefinition_cachedSprites", + "owner" : "ii", + "name" : "w", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "HitmarkDefinition_cached", + "owner" : "jm", + "name" : "w", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "HitmarkDefinition_cachedFonts", + "owner" : "jm", + "name" : "u", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "Instrument_delays", + "owner" : "db", + "name" : "c", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "Instrument_noise", + "owner" : "db", + "name" : "t", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "Instrument_phases", + "owner" : "db", + "name" : "b", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "Instrument_pitchBaseSteps", + "owner" : "db", + "name" : "v", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "Instrument_pitchSteps", + "owner" : "db", + "name" : "p", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "Instrument_samples", + "owner" : "db", + "name" : "s", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "Instrument_sine", + "owner" : "db", + "name" : "y", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "Instrument_volumeSteps", + "owner" : "db", + "name" : "r", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "Interpreter_arrayLengths", + "owner" : "bv", + "name" : "o", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "Interpreter_arrays", + "owner" : "bv", + "name" : "u", + "access" : 8, + "descriptor" : "[[I" + }, { + "field" : "Interpreter_calendar", + "owner" : "bv", + "name" : "a", + "access" : 8, + "descriptor" : "Ljava/util/Calendar;" + }, { + "field" : "Interpreter_frameDepth", + "owner" : "bv", + "name" : "d", + "access" : 8, + "descriptor" : "I", + "decoder" : 545127349 + }, { + "field" : "Interpreter_frames", + "owner" : "bv", + "name" : "k", + "access" : 8, + "descriptor" : "[Lbn;" + }, { + "field" : "Interpreter_intLocals", + "owner" : "kp", + "name" : "q", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "Interpreter_intStack", + "owner" : "bv", + "name" : "g", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "Interpreter_intStackSize", + "owner" : "fe", + "name" : "l", + "access" : 8, + "descriptor" : "I", + "decoder" : -1237576843 + }, { + "field" : "Interpreter_stringLocals", + "owner" : "bv", + "name" : "w", + "access" : 8, + "descriptor" : "[Ljava/lang/String;" + }, { + "field" : "Interpreter_stringStack", + "owner" : "bv", + "name" : "e", + "access" : 8, + "descriptor" : "[Ljava/lang/String;" + }, { + "field" : "Interpreter_stringStackSize", + "owner" : "bv", + "name" : "x", + "access" : 8, + "descriptor" : "I", + "decoder" : -114766123 + }, { + "field" : "ItemDefinition_archive", + "owner" : "jv", + "name" : "u", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "ItemDefinition_cached", + "owner" : "jv", + "name" : "x", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "ItemDefinition_cachedModels", + "owner" : "jv", + "name" : "d", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "ItemDefinition_modelArchive", + "owner" : "jv", + "name" : "g", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "KeyHandler_idleCycles", + "owner" : "an", + "name" : "ci", + "access" : 73, + "descriptor" : "I", + "decoder" : -474146073 + }, { + "field" : "KeyHandler_instance", + "owner" : "an", + "name" : "m", + "access" : 9, + "descriptor" : "Lan;" + }, { + "field" : "KeyHandler_keyCodes", + "owner" : "an", + "name" : "cd", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "KeyHandler_pressedKeys", + "owner" : "an", + "name" : "cb", + "access" : 9, + "descriptor" : "[Z" + }, { + "field" : "KitDefinition_archive", + "owner" : "im", + "name" : "m", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "KitDefinition_cached", + "owner" : "im", + "name" : "w", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "Login_isUsernameRemembered", + "owner" : "client", + "name" : "ew", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "Login_loadingPercent", + "owner" : "cu", + "name" : "b", + "access" : 8, + "descriptor" : "I", + "decoder" : -1514610183 + }, { + "field" : "Login_loadingText", + "owner" : "cu", + "name" : "c", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Login_password", + "owner" : "cu", + "name" : "ap", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Login_response0", + "owner" : "cu", + "name" : "al", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Login_response1", + "owner" : "cu", + "name" : "ab", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Login_response2", + "owner" : "cu", + "name" : "ae", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Login_response3", + "owner" : "cu", + "name" : "at", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Login_username", + "owner" : "cu", + "name" : "ad", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Messages_channels", + "owner" : "cw", + "name" : "m", + "access" : 24, + "descriptor" : "Ljava/util/Map;" + }, { + "field" : "Messages_count", + "owner" : "cw", + "name" : "w", + "access" : 8, + "descriptor" : "I", + "decoder" : -1168497831 + }, { + "field" : "Messages_hashTable", + "owner" : "cw", + "name" : "f", + "access" : 24, + "descriptor" : "Llh;" + }, { + "field" : "Messages_queue", + "owner" : "cw", + "name" : "q", + "access" : 24, + "descriptor" : "Ljc;" + }, { + "field" : "ModelData_cosine", + "owner" : "dw", + "name" : "at", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "ModelData_sine", + "owner" : "dw", + "name" : "ae", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "Model_cosine", + "owner" : "du", + "name" : "bl", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "Model_sharedSequenceModel", + "owner" : "du", + "name" : "m", + "access" : 8, + "descriptor" : "Ldu;" + }, { + "field" : "Model_sharedSequenceModelFaceAlphas", + "owner" : "du", + "name" : "f", + "access" : 8, + "descriptor" : "[B" + }, { + "field" : "Model_sharedSpotAnimationModel", + "owner" : "du", + "name" : "q", + "access" : 8, + "descriptor" : "Ldu;" + }, { + "field" : "Model_sharedSpotAnimationModelFaceAlphas", + "owner" : "du", + "name" : "w", + "access" : 8, + "descriptor" : "[B" + }, { + "field" : "Model_sine", + "owner" : "du", + "name" : "bm", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "Model_transformTempX", + "owner" : "du", + "name" : "bd", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Model_transformTempY", + "owner" : "du", + "name" : "bc", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Model_transformTempZ", + "owner" : "du", + "name" : "bo", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "MouseHandler_currentButton", + "owner" : "bb", + "name" : "d", + "access" : 9, + "descriptor" : "I", + "decoder" : -2044247305 + }, { + "field" : "MouseHandler_currentButton0", + "owner" : "bb", + "name" : "u", + "access" : 73, + "descriptor" : "I", + "decoder" : 642308075 + }, { + "field" : "MouseHandler_idleCycles", + "owner" : "bb", + "name" : "o", + "access" : 73, + "descriptor" : "I", + "decoder" : -1080652669 + }, { + "field" : "MouseHandler_instance", + "owner" : "bb", + "name" : "w", + "access" : 9, + "descriptor" : "Lbb;" + }, { + "field" : "MouseHandler_lastButton", + "owner" : "bb", + "name" : "s", + "access" : 9, + "descriptor" : "I", + "decoder" : 2126310249 + }, { + "field" : "MouseHandler_lastButton0", + "owner" : "bb", + "name" : "i", + "access" : 73, + "descriptor" : "I", + "decoder" : 590718769 + }, { + "field" : "MouseHandler_lastPressedTimeMillis", + "owner" : "bb", + "name" : "h", + "access" : 9, + "descriptor" : "J", + "decoder" : 3806612340723844439 + }, { + "field" : "MouseHandler_lastPressedTimeMillis0", + "owner" : "bb", + "name" : "j", + "access" : 73, + "descriptor" : "J", + "decoder" : 3555003757894628243 + }, { + "field" : "MouseHandler_lastPressedX", + "owner" : "bb", + "name" : "t", + "access" : 9, + "descriptor" : "I", + "decoder" : -1853704165 + }, { + "field" : "MouseHandler_lastPressedX0", + "owner" : "bb", + "name" : "a", + "access" : 73, + "descriptor" : "I", + "decoder" : -813801905 + }, { + "field" : "MouseHandler_lastPressedY", + "owner" : "bb", + "name" : "y", + "access" : 9, + "descriptor" : "I", + "decoder" : 1876967757 + }, { + "field" : "MouseHandler_lastPressedY0", + "owner" : "bb", + "name" : "z", + "access" : 73, + "descriptor" : "I", + "decoder" : 14138669 + }, { + "field" : "MouseHandler_millis", + "owner" : "bb", + "name" : "n", + "access" : 9, + "descriptor" : "J", + "decoder" : -7587574528523107151 + }, { + "field" : "MouseHandler_millis0", + "owner" : "bb", + "name" : "e", + "access" : 73, + "descriptor" : "J", + "decoder" : -5429651987476437823 + }, { + "field" : "MouseHandler_x", + "owner" : "bb", + "name" : "k", + "access" : 9, + "descriptor" : "I", + "decoder" : -649043937 + }, { + "field" : "MouseHandler_x0", + "owner" : "bb", + "name" : "g", + "access" : 73, + "descriptor" : "I", + "decoder" : 1048471439 + }, { + "field" : "MouseHandler_y", + "owner" : "bb", + "name" : "x", + "access" : 9, + "descriptor" : "I", + "decoder" : 1291011547 + }, { + "field" : "MouseHandler_y0", + "owner" : "bb", + "name" : "l", + "access" : 73, + "descriptor" : "I", + "decoder" : 2000222973 + }, { + "field" : "NetCache_archives", + "owner" : "iq", + "name" : "h", + "access" : 9, + "descriptor" : "[Lit;" + }, { + "field" : "NetCache_crc", + "owner" : "iq", + "name" : "t", + "access" : 9, + "descriptor" : "Ljava/util/zip/CRC32;" + }, { + "field" : "NetCache_crcMismatches", + "owner" : "iq", + "name" : "c", + "access" : 9, + "descriptor" : "I", + "decoder" : -1404585009 + }, { + "field" : "NetCache_currentResponse", + "owner" : "ed", + "name" : "i", + "access" : 9, + "descriptor" : "Liz;" + }, { + "field" : "NetCache_ioExceptions", + "owner" : "iq", + "name" : "r", + "access" : 9, + "descriptor" : "I", + "decoder" : -1141619871 + }, { + "field" : "NetCache_pendingPriorityResponses", + "owner" : "iq", + "name" : "u", + "access" : 9, + "descriptor" : "Lld;" + }, { + "field" : "NetCache_pendingPriorityResponsesCount", + "owner" : "iq", + "name" : "g", + "access" : 9, + "descriptor" : "I", + "decoder" : 516430597 + }, { + "field" : "NetCache_pendingPriorityWrites", + "owner" : "iq", + "name" : "w", + "access" : 9, + "descriptor" : "Lld;" + }, { + "field" : "NetCache_pendingPriorityWritesCount", + "owner" : "iq", + "name" : "o", + "access" : 9, + "descriptor" : "I", + "decoder" : 1495729287 + }, { + "field" : "NetCache_pendingResponses", + "owner" : "iq", + "name" : "d", + "access" : 9, + "descriptor" : "Lld;" + }, { + "field" : "NetCache_pendingResponsesCount", + "owner" : "iq", + "name" : "k", + "access" : 9, + "descriptor" : "I", + "decoder" : -1627751389 + }, { + "field" : "NetCache_pendingWrites", + "owner" : "iq", + "name" : "e", + "access" : 9, + "descriptor" : "Lld;" + }, { + "field" : "NetCache_pendingWritesCount", + "owner" : "iq", + "name" : "x", + "access" : 9, + "descriptor" : "I", + "decoder" : -1592359229 + }, { + "field" : "NetCache_pendingWritesQueue", + "owner" : "iq", + "name" : "l", + "access" : 9, + "descriptor" : "Ljp;" + }, { + "field" : "NetCache_reference", + "owner" : "cq", + "name" : "y", + "access" : 9, + "descriptor" : "Lgr;" + }, { + "field" : "NetCache_responseArchiveBuffer", + "owner" : "c", + "name" : "z", + "access" : 9, + "descriptor" : "Lgr;" + }, { + "field" : "NetCache_responseHeaderBuffer", + "owner" : "iq", + "name" : "a", + "access" : 9, + "descriptor" : "Lgr;" + }, { + "field" : "NetCache_socket", + "owner" : "iq", + "name" : "m", + "access" : 9, + "descriptor" : "Lfu;" + }, { + "field" : "NpcDefinition_archive", + "owner" : "jz", + "name" : "m", + "access" : 8, + "descriptor" : "Lir;" + }, { + "field" : "NpcDefinition_cached", + "owner" : "jz", + "name" : "q", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "NpcDefinition_cachedModels", + "owner" : "jz", + "name" : "w", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "NpcDefinition_modelArchive", + "owner" : "jz", + "name" : "f", + "access" : 8, + "descriptor" : "Lir;" + }, { + "field" : "ObjectDefinition_archive", + "owner" : "jr", + "name" : "f", + "access" : 8, + "descriptor" : "Lir;" + }, { + "field" : "ObjectDefinition_cached", + "owner" : "jr", + "name" : "w", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "ObjectDefinition_cachedModels", + "owner" : "jr", + "name" : "g", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "ObjectDefinition_isLowDetail", + "owner" : "jr", + "name" : "m", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "PacketBuffer_masks", + "owner" : "hx", + "name" : "x", + "access" : 24, + "descriptor" : "[I" + }, { + "field" : "ParamDefinition_cached", + "owner" : "jb", + "name" : "f", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "PcmPlayer_sampleRate", + "owner" : "kl", + "name" : "o", + "access" : 9, + "descriptor" : "I", + "decoder" : 147524751 + }, { + "field" : "PlayerAppearance_cachedModels", + "owner" : "hi", + "name" : "k", + "access" : 9, + "descriptor" : "Ler;" + }, { + "field" : "PlayerType_hardcoreIronman", + "owner" : "ij", + "name" : "u", + "access" : 24, + "descriptor" : "Lij;" + }, { + "field" : "PlayerType_ironman", + "owner" : "ij", + "name" : "w", + "access" : 24, + "descriptor" : "Lij;" + }, { + "field" : "PlayerType_jagexModerator", + "owner" : "ij", + "name" : "q", + "access" : 24, + "descriptor" : "Lij;" + }, { + "field" : "PlayerType_normal", + "owner" : "ij", + "name" : "m", + "access" : 24, + "descriptor" : "Lij;" + }, { + "field" : "PlayerType_playerModerator", + "owner" : "ij", + "name" : "f", + "access" : 24, + "descriptor" : "Lij;" + }, { + "field" : "PlayerType_ultimateIronman", + "owner" : "ij", + "name" : "o", + "access" : 24, + "descriptor" : "Lij;" + }, { + "field" : "Players_count", + "owner" : "cq", + "name" : "u", + "access" : 8, + "descriptor" : "I", + "decoder" : -766468303 + }, { + "field" : "Players_indices", + "owner" : "cq", + "name" : "g", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "Players_orientations", + "owner" : "cq", + "name" : "d", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "Players_regions", + "owner" : "cq", + "name" : "x", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "Players_targetIndices", + "owner" : "cq", + "name" : "k", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "Rasterizer2D_height", + "owner" : "lf", + "name" : "av", + "access" : 9, + "descriptor" : "I" + }, { + "field" : "Rasterizer2D_pixels", + "owner" : "lf", + "name" : "aq", + "access" : 9, + "descriptor" : "[I" + }, { + "field" : "Rasterizer2D_width", + "owner" : "lf", + "name" : "aj", + "access" : 9, + "descriptor" : "I" + }, { + "field" : "Rasterizer2D_xClipEnd", + "owner" : "lf", + "name" : "ah", + "access" : 9, + "descriptor" : "I" + }, { + "field" : "Rasterizer2D_xClipStart", + "owner" : "lf", + "name" : "ay", + "access" : 9, + "descriptor" : "I" + }, { + "field" : "Rasterizer2D_yClipEnd", + "owner" : "lf", + "name" : "ac", + "access" : 9, + "descriptor" : "I" + }, { + "field" : "Rasterizer2D_yClipStart", + "owner" : "lf", + "name" : "ar", + "access" : 9, + "descriptor" : "I" + }, { + "field" : "Rasterizer3D_alpha", + "owner" : "et", + "name" : "o", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Rasterizer3D_clipHeight", + "owner" : "et", + "name" : "z", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Rasterizer3D_clipMidX", + "owner" : "et", + "name" : "n", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Rasterizer3D_clipMidX2", + "owner" : "et", + "name" : "s", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Rasterizer3D_clipMidY", + "owner" : "et", + "name" : "i", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Rasterizer3D_clipMidY2", + "owner" : "et", + "name" : "y", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Rasterizer3D_clipNegativeMidX", + "owner" : "et", + "name" : "j", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Rasterizer3D_clipNegativeMidY", + "owner" : "et", + "name" : "t", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Rasterizer3D_clipWidth", + "owner" : "et", + "name" : "a", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Rasterizer3D_colorPalette", + "owner" : "et", + "name" : "b", + "access" : 9, + "descriptor" : "[I" + }, { + "field" : "Rasterizer3D_cosine", + "owner" : "et", + "name" : "ag", + "access" : 9, + "descriptor" : "[I" + }, { + "field" : "Rasterizer3D_isLowDetailTexture", + "owner" : "et", + "name" : "q", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "Rasterizer3D_rowOffsets", + "owner" : "et", + "name" : "h", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "Rasterizer3D_sine", + "owner" : "et", + "name" : "v", + "access" : 9, + "descriptor" : "[I" + }, { + "field" : "Rasterizer3D_textureLoader", + "owner" : "et", + "name" : "c", + "access" : 9, + "descriptor" : "Lei;" + }, { + "field" : "Rasterizer3D_zoom", + "owner" : "et", + "name" : "k", + "access" : 9, + "descriptor" : "I" + }, { + "field" : "Scene_cameraPitchCosine", + "owner" : "em", + "name" : "aq", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_cameraPitchSine", + "owner" : "em", + "name" : "ag", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_cameraX", + "owner" : "em", + "name" : "r", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_cameraXTile", + "owner" : "em", + "name" : "b", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_cameraXTileMax", + "owner" : "em", + "name" : "t", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_cameraXTileMin", + "owner" : "em", + "name" : "s", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_cameraY", + "owner" : "em", + "name" : "p", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_cameraYTile", + "owner" : "em", + "name" : "c", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_cameraYTileMax", + "owner" : "em", + "name" : "h", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_cameraYTileMin", + "owner" : "em", + "name" : "y", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_cameraYawCosine", + "owner" : "em", + "name" : "av", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_cameraYawSine", + "owner" : "em", + "name" : "aj", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_cameraZ", + "owner" : "em", + "name" : "v", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_currentOccluders", + "owner" : "em", + "name" : "an", + "access" : 8, + "descriptor" : "[Lee;" + }, { + "field" : "Scene_currentOccludersCount", + "owner" : "em", + "name" : "am", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_drawnCount", + "owner" : "em", + "name" : "j", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_isLowDetail", + "owner" : "em", + "name" : "m", + "access" : 9, + "descriptor" : "Z" + }, { + "field" : "Scene_plane", + "owner" : "em", + "name" : "z", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_planeOccluderCounts", + "owner" : "em", + "name" : "ap", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "Scene_planeOccluders", + "owner" : "em", + "name" : "as", + "access" : 8, + "descriptor" : "[[Lee;" + }, { + "field" : "Scene_selectedPlane", + "owner" : "em", + "name" : "ay", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_selectedScreenX", + "owner" : "em", + "name" : "ah", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_selectedScreenY", + "owner" : "em", + "name" : "ak", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_selectedX", + "owner" : "em", + "name" : "aw", + "access" : 9, + "descriptor" : "I" + }, { + "field" : "Scene_selectedY", + "owner" : "em", + "name" : "al", + "access" : 9, + "descriptor" : "I" + }, { + "field" : "Scene_tilesDeque", + "owner" : "em", + "name" : "az", + "access" : 8, + "descriptor" : "Lje;" + }, { + "field" : "Scene_viewportXCenter", + "owner" : "em", + "name" : "bx", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_viewportXMax", + "owner" : "em", + "name" : "bl", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_viewportXMin", + "owner" : "em", + "name" : "bu", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_viewportYCenter", + "owner" : "em", + "name" : "by", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_viewportYMax", + "owner" : "em", + "name" : "br", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Scene_viewportYMin", + "owner" : "em", + "name" : "bm", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "Script_cached", + "owner" : "cg", + "name" : "m", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "SequenceDefinition_archive", + "owner" : "jh", + "name" : "m", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "SequenceDefinition_cached", + "owner" : "jh", + "name" : "w", + "access" : 9, + "descriptor" : "Ler;" + }, { + "field" : "Skills_enabled", + "owner" : "hc", + "name" : "f", + "access" : 25, + "descriptor" : "[Z" + }, { + "field" : "Skills_experienceTable", + "owner" : "hc", + "name" : "q", + "access" : 9, + "descriptor" : "[I" + }, { + "field" : "SpotAnimationDefinition_archive", + "owner" : "io", + "name" : "m", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "SpotAnimationDefinition_cached", + "owner" : "io", + "name" : "q", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "SpotAnimationDefinition_cachedModels", + "owner" : "io", + "name" : "w", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "SpotAnimationDefinition_modelArchive", + "owner" : "io", + "name" : "f", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "Sprite_cached", + "owner" : "jv", + "name" : "k", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "Strings_almostEverywhere", + "owner" : "id", + "name" : "hw", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_andTheProtectItemPrayerWontWork", + "owner" : "id", + "name" : "hj", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_attack", + "owner" : "id", + "name" : "fq", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_cancel", + "owner" : "id", + "name" : "iz", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_checkingForUpdates", + "owner" : "id", + "name" : "s", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_chooseOption", + "owner" : "id", + "name" : "fw", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_close", + "owner" : "id", + "name" : "fd", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_connectingToServer", + "owner" : "id", + "name" : "if", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_connectingToUpdateServer", + "owner" : "id", + "name" : "j", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_connectionLost", + "owner" : "id", + "name" : "n", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_continue", + "owner" : "id", + "name" : "g", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_drop", + "owner" : "id", + "name" : "q", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_examine", + "owner" : "id", + "name" : "ep", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_existingUser", + "owner" : "id", + "name" : "is", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_fromYourFriendListFirst", + "owner" : "id", + "name" : "fe", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_fromYourIgnoreListFirst", + "owner" : "id", + "name" : "fy", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_hasLoggedIn", + "owner" : "id", + "name" : "ea", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_hasLoggedOut", + "owner" : "id", + "name" : "es", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_hidden", + "owner" : "id", + "name" : "w", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_isAlreadyOnYourFriendList", + "owner" : "id", + "name" : "fo", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_level", + "owner" : "id", + "name" : "fl", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_loadedConfig", + "owner" : "id", + "name" : "v", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_loadedFonts", + "owner" : "id", + "name" : "b", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_loadedInputHandler", + "owner" : "id", + "name" : "ar", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_loadedInterfaces", + "owner" : "id", + "name" : "ak", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_loadedSprites", + "owner" : "id", + "name" : "aq", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_loadedTextures", + "owner" : "id", + "name" : "av", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_loadedTitleScreen", + "owner" : "id", + "name" : "r", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_loadedUpdateList", + "owner" : "id", + "name" : "t", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_loadedWordpack", + "owner" : "id", + "name" : "ay", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_loadedWorldMap", + "owner" : "id", + "name" : "al", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_loading", + "owner" : "id", + "name" : "kq", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_loadingConfig", + "owner" : "id", + "name" : "p", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_loadingFonts", + "owner" : "id", + "name" : "h", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_loadingInterfaces", + "owner" : "id", + "name" : "ah", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_loadingPleaseWait", + "owner" : "id", + "name" : "k", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_loadingSprites", + "owner" : "id", + "name" : "ag", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_loadingTextures", + "owner" : "id", + "name" : "aj", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_loadingTitleScreen", + "owner" : "id", + "name" : "c", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_loadingWordpack", + "owner" : "id", + "name" : "ac", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_loadingWorldMap", + "owner" : "id", + "name" : "aw", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_login", + "owner" : "id", + "name" : "ie", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_membersObject", + "owner" : "id", + "name" : "m", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_moreOptions", + "owner" : "id", + "name" : "fg", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_newUser", + "owner" : "id", + "name" : "iy", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_notWorkOnThisWorld", + "owner" : "id", + "name" : "hu", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_null", + "owner" : "id", + "name" : "e", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_ok", + "owner" : "id", + "name" : "o", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_password", + "owner" : "id", + "name" : "in", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_pin", + "owner" : "id", + "name" : "il", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_playersCanAttackEachOther", + "owner" : "id", + "name" : "he", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_playersCanAttackEachOtherAlmostEverywhere", + "owner" : "id", + "name" : "ht", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_pleaseEnterYourPassword", + "owner" : "id", + "name" : "dh", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_pleaseEnterYourUsername", + "owner" : "id", + "name" : "dw", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_pleaseRemoveFriend", + "owner" : "id", + "name" : "fi", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_pleaseRemoveIgnore", + "owner" : "id", + "name" : "fr", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_pleaseWait", + "owner" : "id", + "name" : "fp", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_pleaseWaitAttemptingToReestablish", + "owner" : "id", + "name" : "i", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_preparedSoundEngine", + "owner" : "id", + "name" : "y", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_preparedVisibilityMap", + "owner" : "id", + "name" : "z", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_select", + "owner" : "id", + "name" : "u", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_skill", + "owner" : "id", + "name" : "fj", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_space", + "owner" : "id", + "name" : "fh", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_startingGameEngine", + "owner" : "id", + "name" : "a", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_take", + "owner" : "id", + "name" : "f", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_theProtectItemPrayerWill", + "owner" : "id", + "name" : "hv", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_thisIsABetaWorld", + "owner" : "id", + "name" : "ho", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_thisIsAHighRiskPvpWorld", + "owner" : "id", + "name" : "hi", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_thisIsAHighRiskWorld", + "owner" : "id", + "name" : "hp", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_thisIsAPvpWorld", + "owner" : "id", + "name" : "hq", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_unableToFind", + "owner" : "id", + "name" : "eg", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_use", + "owner" : "id", + "name" : "ez", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_walkHere", + "owner" : "id", + "name" : "fc", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_warning", + "owner" : "id", + "name" : "hl", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_welcomeToRuneScape", + "owner" : "id", + "name" : "ij", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_yourFriendListIsFull", + "owner" : "id", + "name" : "fu", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_yourIgnoreListIsFull", + "owner" : "id", + "name" : "ft", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Strings_yourNormalAccountWillNotBeAffected", + "owner" : "id", + "name" : "hz", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "Texture_animatedPixels", + "owner" : "dh", + "name" : "a", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "Tiles_heights", + "owner" : "bq", + "name" : "m", + "access" : 8, + "descriptor" : "[[[I" + }, { + "field" : "Tiles_minPlane", + "owner" : "bq", + "name" : "q", + "access" : 8, + "descriptor" : "I", + "decoder" : -1454618167 + }, { + "field" : "Tiles_renderFlags", + "owner" : "bq", + "name" : "f", + "access" : 8, + "descriptor" : "[[[B" + }, { + "field" : "TriBool_false", + "owner" : "kd", + "name" : "q", + "access" : 25, + "descriptor" : "Lkd;" + }, { + "field" : "TriBool_true", + "owner" : "kd", + "name" : "f", + "access" : 25, + "descriptor" : "Lkd;" + }, { + "field" : "TriBool_unknown", + "owner" : "kd", + "name" : "m", + "access" : 25, + "descriptor" : "Lkd;" + }, { + "field" : "VarbitDefinition_archive", + "owner" : "ia", + "name" : "m", + "access" : 8, + "descriptor" : "Lir;" + }, { + "field" : "VarbitDefinition_cached", + "owner" : "ia", + "name" : "f", + "access" : 9, + "descriptor" : "Ler;" + }, { + "field" : "VarpDefinition_cached", + "owner" : "ix", + "name" : "q", + "access" : 9, + "descriptor" : "Ler;" + }, { + "field" : "Varps_main", + "owner" : "hv", + "name" : "q", + "access" : 9, + "descriptor" : "[I" + }, { + "field" : "Varps_masks", + "owner" : "hv", + "name" : "m", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "Varps_temp", + "owner" : "hv", + "name" : "f", + "access" : 9, + "descriptor" : "[I" + }, { + "field" : "ViewportMouse_entityCount", + "owner" : "dm", + "name" : "i", + "access" : 9, + "descriptor" : "I", + "decoder" : -2140977119 + }, { + "field" : "ViewportMouse_entityTags", + "owner" : "dm", + "name" : "a", + "access" : 9, + "descriptor" : "[J" + }, { + "field" : "ViewportMouse_false0", + "owner" : "dm", + "name" : "w", + "access" : 9, + "descriptor" : "Z" + }, { + "field" : "ViewportMouse_isInViewport", + "owner" : "dm", + "name" : "m", + "access" : 9, + "descriptor" : "Z" + }, { + "field" : "ViewportMouse_x", + "owner" : "dm", + "name" : "f", + "access" : 9, + "descriptor" : "I", + "decoder" : 1891197573 + }, { + "field" : "ViewportMouse_y", + "owner" : "dm", + "name" : "q", + "access" : 9, + "descriptor" : "I", + "decoder" : 1535565231 + }, { + "field" : "WorldMapCacheName_area", + "owner" : "aw", + "name" : "w", + "access" : 24, + "descriptor" : "Law;" + }, { + "field" : "WorldMapCacheName_compositeMap", + "owner" : "aw", + "name" : "f", + "access" : 25, + "descriptor" : "Law;" + }, { + "field" : "WorldMapCacheName_compositeTexture", + "owner" : "aw", + "name" : "q", + "access" : 25, + "descriptor" : "Law;" + }, { + "field" : "WorldMapCacheName_details", + "owner" : "aw", + "name" : "m", + "access" : 25, + "descriptor" : "Law;" + }, { + "field" : "WorldMapCacheName_labels", + "owner" : "aw", + "name" : "o", + "access" : 25, + "descriptor" : "Law;" + }, { + "field" : "WorldMapElement_cached", + "owner" : "ho", + "name" : "f", + "access" : 9, + "descriptor" : "[Lic;" + }, { + "field" : "WorldMapElement_cachedSprites", + "owner" : "ic", + "name" : "w", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "WorldMapElement_count", + "owner" : "ev", + "name" : "q", + "access" : 9, + "descriptor" : "I", + "decoder" : -112939189 + }, { + "field" : "WorldMapLabelSize_large", + "owner" : "s", + "name" : "q", + "access" : 25, + "descriptor" : "Ls;" + }, { + "field" : "WorldMapLabelSize_medium", + "owner" : "s", + "name" : "f", + "access" : 25, + "descriptor" : "Ls;" + }, { + "field" : "WorldMapLabelSize_small", + "owner" : "s", + "name" : "m", + "access" : 25, + "descriptor" : "Ls;" + }, { + "field" : "applet", + "owner" : "fx", + "name" : "m", + "access" : 9, + "descriptor" : "Ljava/applet/Applet;" + }, { + "field" : "archive0", + "owner" : "ir", + "name" : "di", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive1", + "owner" : "ek", + "name" : "dc", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive10", + "owner" : "j", + "name" : "dv", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive11", + "owner" : "cu", + "name" : "do", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive12", + "owner" : "cy", + "name" : "dh", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive13", + "owner" : "gi", + "name" : "dz", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive14", + "owner" : "q", + "name" : "dj", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive15", + "owner" : "as", + "name" : "du", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive16", + "owner" : "c", + "name" : "eb", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive2", + "owner" : "be", + "name" : "dg", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive3", + "owner" : "t", + "name" : "db", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive4", + "owner" : "v", + "name" : "dd", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive5", + "owner" : "cn", + "name" : "dy", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive6", + "owner" : "fq", + "name" : "dk", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive7", + "owner" : "ad", + "name" : "dl", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive8", + "owner" : "p", + "name" : "dr", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archive9", + "owner" : "il", + "name" : "dw", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "archiveLoaderArchive", + "owner" : "client", + "name" : "sq", + "access" : 8, + "descriptor" : "I", + "decoder" : -1546210597 + }, { + "field" : "archiveLoaders", + "owner" : "client", + "name" : "sy", + "access" : 8, + "descriptor" : "Ljava/util/ArrayList;" + }, { + "field" : "base37Table", + "owner" : "ku", + "name" : "m", + "access" : 25, + "descriptor" : "[C" + }, { + "field" : "baseX", + "owner" : "af", + "name" : "ff", + "access" : 8, + "descriptor" : "I", + "decoder" : -790717597 + }, { + "field" : "baseY", + "owner" : "bw", + "name" : "fr", + "access" : 8, + "descriptor" : "I", + "decoder" : -438288575 + }, { + "field" : "cacheDirectoryLocations", + "owner" : "ah", + "name" : "j", + "access" : 9, + "descriptor" : "[Ljava/lang/String;" + }, { + "field" : "camAngleX", + "owner" : "client", + "name" : "hw", + "access" : 8, + "descriptor" : "I", + "decoder" : 410614005 + }, { + "field" : "camAngleY", + "owner" : "client", + "name" : "hp", + "access" : 8, + "descriptor" : "I", + "decoder" : -1163038981 + }, { + "field" : "camFollowHeight", + "owner" : "client", + "name" : "ho", + "access" : 8, + "descriptor" : "I", + "decoder" : 1005832199 + }, { + "field" : "cameraPitch", + "owner" : "t", + "name" : "hq", + "access" : 8, + "descriptor" : "I", + "decoder" : 490189491 + }, { + "field" : "cameraX", + "owner" : "as", + "name" : "ha", + "access" : 8, + "descriptor" : "I", + "decoder" : 1052834531 + }, { + "field" : "cameraY", + "owner" : "g", + "name" : "hs", + "access" : 8, + "descriptor" : "I", + "decoder" : 1326137897 + }, { + "field" : "cameraYaw", + "owner" : "ha", + "name" : "he", + "access" : 8, + "descriptor" : "I", + "decoder" : 2069364655 + }, { + "field" : "cameraZ", + "owner" : "k", + "name" : "hl", + "access" : 8, + "descriptor" : "I", + "decoder" : -1945589829 + }, { + "field" : "canvasHeight", + "owner" : "gd", + "name" : "p", + "access" : 9, + "descriptor" : "I", + "decoder" : -842662451 + }, { + "field" : "canvasWidth", + "owner" : "dt", + "name" : "r", + "access" : 9, + "descriptor" : "I", + "decoder" : 1784515731 + }, { + "field" : "chatEffects", + "owner" : "client", + "name" : "mg", + "access" : 8, + "descriptor" : "I", + "decoder" : 247245677 + }, { + "field" : "clDat", + "owner" : "lc", + "name" : "w", + "access" : 9, + "descriptor" : "Ljava/io/File;" + }, { + "field" : "clanChat", + "owner" : "cl", + "name" : "pg", + "access" : 8, + "descriptor" : "Lkv;" + }, { + "field" : "clickedComponent", + "owner" : "client", + "name" : "mc", + "access" : 8, + "descriptor" : "Lho;" + }, { + "field" : "clickedComponentParent", + "owner" : "client", + "name" : "mr", + "access" : 8, + "descriptor" : "Lho;" + }, { + "field" : "client", + "owner" : "dl", + "name" : "af", + "access" : 8, + "descriptor" : "Lclient;" + }, { + "field" : "clientPreferences", + "owner" : "lw", + "name" : "su", + "access" : 8, + "descriptor" : "Lbf;" + }, { + "field" : "clientType", + "owner" : "client", + "name" : "bm", + "access" : 8, + "descriptor" : "I", + "decoder" : 1678472241 + }, { + "field" : "clock", + "owner" : "fg", + "name" : "n", + "access" : 8, + "descriptor" : "Lfa;" + }, { + "field" : "collisionMaps", + "owner" : "client", + "name" : "w", + "access" : 8, + "descriptor" : "[Lfy;" + }, { + "field" : "combatTargetPlayerIndex", + "owner" : "client", + "name" : "kx", + "access" : 8, + "descriptor" : "I", + "decoder" : -1309758309 + }, { + "field" : "componentClickMasks", + "owner" : "client", + "name" : "on", + "access" : 8, + "descriptor" : "Lld;" + }, { + "field" : "componentClickX", + "owner" : "client", + "name" : "mt", + "access" : 8, + "descriptor" : "I", + "decoder" : -1972775883 + }, { + "field" : "componentClickY", + "owner" : "client", + "name" : "me", + "access" : 8, + "descriptor" : "I", + "decoder" : 1052276727 + }, { + "field" : "componentDragDuration", + "owner" : "bu", + "name" : "no", + "access" : 8, + "descriptor" : "I", + "decoder" : 2059180753 + }, { + "field" : "cp1252AsciiExtension", + "owner" : "kr", + "name" : "m", + "access" : 25, + "descriptor" : "[C" + }, { + "field" : "crossSprites", + "owner" : "an", + "name" : "gx", + "access" : 8, + "descriptor" : "[Lln;" + }, { + "field" : "currentLevels", + "owner" : "client", + "name" : "ki", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "currentTimeMsLast", + "owner" : "ed", + "name" : "m", + "access" : 8, + "descriptor" : "J", + "decoder" : 3311945626287518857 + }, { + "field" : "currentTimeMsOffset", + "owner" : "ga", + "name" : "f", + "access" : 8, + "descriptor" : "J", + "decoder" : -6166028446082638015 + }, { + "field" : "cycle", + "owner" : "client", + "name" : "cu", + "access" : 8, + "descriptor" : "I", + "decoder" : 1909006131 + }, { + "field" : "dat2File", + "owner" : "fs", + "name" : "n", + "access" : 9, + "descriptor" : "Ldy;" + }, { + "field" : "decimator", + "owner" : "fd", + "name" : "qi", + "access" : 8, + "descriptor" : "Ldp;" + }, { + "field" : "destinationX", + "owner" : "client", + "name" : "pd", + "access" : 8, + "descriptor" : "I", + "decoder" : -362336323 + }, { + "field" : "destinationY", + "owner" : "client", + "name" : "pk", + "access" : 8, + "descriptor" : "I", + "decoder" : 1298845031 + }, { + "field" : "directBufferUnavailable", + "owner" : "gu", + "name" : "f", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "displayFps", + "owner" : "client", + "name" : "cg", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "dragInventoryComponent", + "owner" : "az", + "name" : "jf", + "access" : 8, + "descriptor" : "Lho;" + }, { + "field" : "dragItemSlotDestination", + "owner" : "client", + "name" : "jy", + "access" : 8, + "descriptor" : "I", + "decoder" : -836653679 + }, { + "field" : "dragItemSlotSource", + "owner" : "client", + "name" : "jp", + "access" : 8, + "descriptor" : "I", + "decoder" : 485534011 + }, { + "field" : "experience", + "owner" : "client", + "name" : "kb", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "followerIndex", + "owner" : "client", + "name" : "ml", + "access" : 8, + "descriptor" : "I", + "decoder" : 1602665191 + }, { + "field" : "followerOpsLowPriority", + "owner" : "client", + "name" : "lw", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "fontBold12", + "owner" : "q", + "name" : "fo", + "access" : 8, + "descriptor" : "Lkk;" + }, { + "field" : "fontNameVerdana11", + "owner" : "lz", + "name" : "x", + "access" : 24, + "descriptor" : "Lkx;" + }, { + "field" : "fontNameVerdana13", + "owner" : "lz", + "name" : "d", + "access" : 24, + "descriptor" : "Lkx;" + }, { + "field" : "fontNameVerdana15", + "owner" : "lz", + "name" : "k", + "access" : 24, + "descriptor" : "Lkx;" + }, { + "field" : "fontPlain11", + "owner" : "by", + "name" : "fv", + "access" : 8, + "descriptor" : "Lkk;" + }, { + "field" : "fontPlain12", + "owner" : "az", + "name" : "fu", + "access" : 8, + "descriptor" : "Lkk;" + }, { + "field" : "fonts", + "owner" : "ic", + "name" : "fs", + "access" : 8, + "descriptor" : "Lkz;" + }, { + "field" : "fontsMap", + "owner" : "client", + "name" : "ft", + "access" : 8, + "descriptor" : "Ljava/util/HashMap;" + }, { + "field" : "fps", + "owner" : "ba", + "name" : "k", + "access" : 12, + "descriptor" : "I", + "decoder" : 1789653893 + }, { + "field" : "friendSystem", + "owner" : "ag", + "name" : "rc", + "access" : 9, + "descriptor" : "Lbh;" + }, { + "field" : "gameBuild", + "owner" : "client", + "name" : "bq", + "access" : 8, + "descriptor" : "I", + "decoder" : 1186004739 + }, { + "field" : "gameDrawingMode", + "owner" : "client", + "name" : "oz", + "access" : 8, + "descriptor" : "I", + "decoder" : -12672775 + }, { + "field" : "gameObjects", + "owner" : "em", + "name" : "ar", + "access" : 8, + "descriptor" : "[Leh;" + }, { + "field" : "gameShell", + "owner" : "ba", + "name" : "f", + "access" : 8, + "descriptor" : "Lba;" + }, { + "field" : "gameState", + "owner" : "client", + "name" : "br", + "access" : 8, + "descriptor" : "I", + "decoder" : 244995961 + }, { + "field" : "garbageCollector", + "owner" : "ir", + "name" : "au", + "access" : 8, + "descriptor" : "Ljava/lang/management/GarbageCollectorMXBean;" + }, { + "field" : "garbageCollectorLastCheckTimeMs", + "owner" : "ba", + "name" : "aa", + "access" : 8, + "descriptor" : "J", + "decoder" : -3607118089363666005 + }, { + "field" : "garbageCollectorLastCollectionTime", + "owner" : "ba", + "name" : "ao", + "access" : 8, + "descriptor" : "J", + "decoder" : 1013162399149344707 + }, { + "field" : "grandExchangeEvents", + "owner" : "do", + "name" : "sm", + "access" : 8, + "descriptor" : "Lg;" + }, { + "field" : "grandExchangeOffers", + "owner" : "client", + "name" : "sb", + "access" : 8, + "descriptor" : "[Lx;" + }, { + "field" : "graphicsObjects", + "owner" : "client", + "name" : "kt", + "access" : 8, + "descriptor" : "Lje;" + }, { + "field" : "groundItems", + "owner" : "client", + "name" : "kz", + "access" : 8, + "descriptor" : "[[[Lje;" + }, { + "field" : "gzipDecompressor", + "owner" : "ir", + "name" : "i", + "access" : 8, + "descriptor" : "Lgo;" + }, { + "field" : "hasFocus", + "owner" : "ba", + "name" : "an", + "access" : 72, + "descriptor" : "Z" + }, { + "field" : "headIconHintSprites", + "owner" : "br", + "name" : "gi", + "access" : 8, + "descriptor" : "[Lln;" + }, { + "field" : "headIconPkSprites", + "owner" : "z", + "name" : "gt", + "access" : 8, + "descriptor" : "[Lln;" + }, { + "field" : "headIconPrayerSprites", + "owner" : "bf", + "name" : "gr", + "access" : 8, + "descriptor" : "[Lln;" + }, { + "field" : "hintArrowHeight", + "owner" : "client", + "name" : "ci", + "access" : 8, + "descriptor" : "I", + "decoder" : -627650567 + }, { + "field" : "hintArrowNpcIndex", + "owner" : "client", + "name" : "cl", + "access" : 8, + "descriptor" : "I", + "decoder" : 1485594821 + }, { + "field" : "hintArrowPlayerIndex", + "owner" : "client", + "name" : "ct", + "access" : 8, + "descriptor" : "I", + "decoder" : -1036874153 + }, { + "field" : "hintArrowSubX", + "owner" : "client", + "name" : "cd", + "access" : 8, + "descriptor" : "I", + "decoder" : 749254081 + }, { + "field" : "hintArrowSubY", + "owner" : "client", + "name" : "cx", + "access" : 8, + "descriptor" : "I", + "decoder" : 1393270633 + }, { + "field" : "hintArrowType", + "owner" : "client", + "name" : "cp", + "access" : 8, + "descriptor" : "I", + "decoder" : -871534943 + }, { + "field" : "hintArrowX", + "owner" : "client", + "name" : "cz", + "access" : 8, + "descriptor" : "I", + "decoder" : -1757834373 + }, { + "field" : "hintArrowY", + "owner" : "client", + "name" : "cc", + "access" : 8, + "descriptor" : "I", + "decoder" : -123748133 + }, { + "field" : "huffman", + "owner" : "ki", + "name" : "m", + "access" : 9, + "descriptor" : "Lgd;" + }, { + "field" : "idx255File", + "owner" : "fs", + "name" : "i", + "access" : 9, + "descriptor" : "Ldy;" + }, { + "field" : "idxCount", + "owner" : "fs", + "name" : "u", + "access" : 9, + "descriptor" : "I", + "decoder" : -2051451755 + }, { + "field" : "idxFiles", + "owner" : "ik", + "name" : "a", + "access" : 9, + "descriptor" : "[Ldy;" + }, { + "field" : "instanceChunkTemplates", + "owner" : "client", + "name" : "gq", + "access" : 8, + "descriptor" : "[[[I" + }, { + "field" : "interfaceComponents", + "owner" : "ho", + "name" : "g", + "access" : 9, + "descriptor" : "[[Lho;" + }, { + "field" : "interfaceParents", + "owner" : "client", + "name" : "mj", + "access" : 8, + "descriptor" : "Lld;" + }, { + "field" : "isCameraLocked", + "owner" : "client", + "name" : "qz", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "isDraggingComponent", + "owner" : "client", + "name" : "ny", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "isInInstance", + "owner" : "client", + "name" : "gg", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "isItemSelected", + "owner" : "client", + "name" : "lz", + "access" : 8, + "descriptor" : "I", + "decoder" : 1630772923 + }, { + "field" : "isKilled", + "owner" : "ba", + "name" : "u", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "isLoading", + "owner" : "client", + "name" : "cj", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "isLowDetail", + "owner" : "client", + "name" : "bc", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "isMembersWorld", + "owner" : "client", + "name" : "bd", + "access" : 9, + "descriptor" : "Z" + }, { + "field" : "isMenuOpen", + "owner" : "client", + "name" : "kc", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "isResizable", + "owner" : "client", + "name" : "or", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "isSpellSelected", + "owner" : "client", + "name" : "lv", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "isStereo", + "owner" : "co", + "name" : "u", + "access" : 12, + "descriptor" : "Z" + }, { + "field" : "itemContainers", + "owner" : "bc", + "name" : "m", + "access" : 8, + "descriptor" : "Lld;" + }, { + "field" : "itemDragDuration", + "owner" : "client", + "name" : "jt", + "access" : 8, + "descriptor" : "I", + "decoder" : 1486366835 + }, { + "field" : "javaVendor", + "owner" : "fz", + "name" : "m", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "javaVersion", + "owner" : "fz", + "name" : "f", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "js5ConnectState", + "owner" : "client", + "name" : "da", + "access" : 8, + "descriptor" : "I", + "decoder" : -1431050759 + }, { + "field" : "js5Errors", + "owner" : "client", + "name" : "ek", + "access" : 8, + "descriptor" : "I", + "decoder" : 1791955261 + }, { + "field" : "js5Socket", + "owner" : "cf", + "name" : "df", + "access" : 8, + "descriptor" : "Lfu;" + }, { + "field" : "js5SocketTask", + "owner" : "hr", + "name" : "dn", + "access" : 8, + "descriptor" : "Lfm;" + }, { + "field" : "js5StartTimeMs", + "owner" : "eh", + "name" : "ds", + "access" : 8, + "descriptor" : "J", + "decoder" : -6104270600047501055 + }, { + "field" : "language", + "owner" : "client", + "name" : "bo", + "access" : 8, + "descriptor" : "I", + "decoder" : 2068355509 + }, { + "field" : "levels", + "owner" : "client", + "name" : "kr", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "loadedInterfaces", + "owner" : "ho", + "name" : "l", + "access" : 9, + "descriptor" : "[Z" + }, { + "field" : "localPlayer", + "owner" : "ao", + "name" : "jk", + "access" : 8, + "descriptor" : "Lbr;" + }, { + "field" : "localPlayerIndex", + "owner" : "client", + "name" : "ji", + "access" : 8, + "descriptor" : "I", + "decoder" : -1869532553 + }, { + "field" : "localPlayerName", + "owner" : "fx", + "name" : "f", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "loginState", + "owner" : "client", + "name" : "ed", + "access" : 8, + "descriptor" : "I", + "decoder" : -163579343 + }, { + "field" : "loginType", + "owner" : "an", + "name" : "bk", + "access" : 8, + "descriptor" : "Llx;" + }, { + "field" : "mapDotSprites", + "owner" : "at", + "name" : "gu", + "access" : 8, + "descriptor" : "[Lln;" + }, { + "field" : "mapIconCount", + "owner" : "client", + "name" : "pi", + "access" : 8, + "descriptor" : "I", + "decoder" : 864673321 + }, { + "field" : "mapIconXs", + "owner" : "client", + "name" : "ps", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "mapIconYs", + "owner" : "client", + "name" : "pw", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "mapIcons", + "owner" : "client", + "name" : "po", + "access" : 8, + "descriptor" : "[Lln;" + }, { + "field" : "mapMarkerSprites", + "owner" : "j", + "name" : "ga", + "access" : 8, + "descriptor" : "[Lln;" + }, { + "field" : "mapSceneSprites", + "owner" : "gq", + "name" : "gv", + "access" : 8, + "descriptor" : "[Llq;" + }, { + "field" : "masterDisk", + "owner" : "kz", + "name" : "sc", + "access" : 8, + "descriptor" : "Lff;" + }, { + "field" : "menuActions", + "owner" : "client", + "name" : "ld", + "access" : 8, + "descriptor" : "[Ljava/lang/String;" + }, { + "field" : "menuArguments0", + "owner" : "client", + "name" : "lk", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "menuArguments1", + "owner" : "client", + "name" : "ly", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "menuArguments2", + "owner" : "client", + "name" : "li", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "menuHeight", + "owner" : "ak", + "name" : "ka", + "access" : 8, + "descriptor" : "I", + "decoder" : -1734004743 + }, { + "field" : "menuOpcodes", + "owner" : "client", + "name" : "lh", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "menuOptionsCount", + "owner" : "client", + "name" : "ll", + "access" : 8, + "descriptor" : "I", + "decoder" : -1749538901 + }, { + "field" : "menuShiftClick", + "owner" : "client", + "name" : "lt", + "access" : 8, + "descriptor" : "[Z" + }, { + "field" : "menuTargetNames", + "owner" : "client", + "name" : "la", + "access" : 8, + "descriptor" : "[Ljava/lang/String;" + }, { + "field" : "menuWidth", + "owner" : "hf", + "name" : "ko", + "access" : 8, + "descriptor" : "I", + "decoder" : 2079315667 + }, { + "field" : "menuX", + "owner" : "v", + "name" : "kw", + "access" : 8, + "descriptor" : "I", + "decoder" : -12041645 + }, { + "field" : "menuY", + "owner" : "ba", + "name" : "kl", + "access" : 8, + "descriptor" : "I", + "decoder" : 1875936371 + }, { + "field" : "midiPcmStream", + "owner" : "hf", + "name" : "w", + "access" : 9, + "descriptor" : "Lhm;" + }, { + "field" : "minimapState", + "owner" : "client", + "name" : "qm", + "access" : 8, + "descriptor" : "I", + "decoder" : -137788125 + }, { + "field" : "modIconSprites", + "owner" : "h", + "name" : "gc", + "access" : 8, + "descriptor" : "[Llq;" + }, { + "field" : "modelViewportXs", + "owner" : "du", + "name" : "ap", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "modelViewportYs", + "owner" : "du", + "name" : "as", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "mouseCrossColor", + "owner" : "client", + "name" : "jm", + "access" : 8, + "descriptor" : "I", + "decoder" : 233318639 + }, { + "field" : "mouseCrossState", + "owner" : "client", + "name" : "jw", + "access" : 8, + "descriptor" : "I", + "decoder" : -1302827103 + }, { + "field" : "mouseCrossX", + "owner" : "client", + "name" : "jb", + "access" : 8, + "descriptor" : "I", + "decoder" : 202604997 + }, { + "field" : "mouseCrossY", + "owner" : "client", + "name" : "jq", + "access" : 8, + "descriptor" : "I", + "decoder" : -1984048653 + }, { + "field" : "mouseLastLastPressedTimeMillis", + "owner" : "client", + "name" : "cb", + "access" : 8, + "descriptor" : "J", + "decoder" : -8445874050676184263 + }, { + "field" : "mouseRecorder", + "owner" : "cb", + "name" : "ck", + "access" : 8, + "descriptor" : "Lbu;" + }, { + "field" : "mouseWheel", + "owner" : "j", + "name" : "ol", + "access" : 8, + "descriptor" : "Lfv;" + }, { + "field" : "mouseWheelRotation", + "owner" : "client", + "name" : "oe", + "access" : 8, + "descriptor" : "I", + "decoder" : -1628183831 + }, { + "field" : "mousedOverComponentIf1", + "owner" : "fa", + "name" : "lu", + "access" : 8, + "descriptor" : "Lho;" + }, { + "field" : "musicTrack", + "owner" : "i", + "name" : "k", + "access" : 9, + "descriptor" : "Lhe;" + }, { + "field" : "musicTrackBoolean", + "owner" : "lj", + "name" : "d", + "access" : 9, + "descriptor" : "Z" + }, { + "field" : "musicTrackFileId", + "owner" : "x", + "name" : "l", + "access" : 9, + "descriptor" : "I", + "decoder" : -812708185 + }, { + "field" : "musicTrackGroupId", + "owner" : "ar", + "name" : "g", + "access" : 9, + "descriptor" : "I", + "decoder" : -18917723 + }, { + "field" : "npcAttackOption", + "owner" : "client", + "name" : "de", + "access" : 8, + "descriptor" : "Lcj;" + }, { + "field" : "npcCount", + "owner" : "client", + "name" : "ep", + "access" : 8, + "descriptor" : "I", + "decoder" : -1569269731 + }, { + "field" : "npcIndices", + "owner" : "client", + "name" : "fq", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "npcs", + "owner" : "client", + "name" : "ez", + "access" : 8, + "descriptor" : "[Lcv;" + }, { + "field" : "objectSounds", + "owner" : "be", + "name" : "m", + "access" : 8, + "descriptor" : "Lje;" + }, { + "field" : "osName", + "owner" : "ju", + "name" : "b", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "osNameLowerCase", + "owner" : "p", + "name" : "h", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "overheadText", + "owner" : "client", + "name" : "ih", + "access" : 8, + "descriptor" : "[Ljava/lang/String;" + }, { + "field" : "overheadTextAscents", + "owner" : "client", + "name" : "ip", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "overheadTextColors", + "owner" : "client", + "name" : "ic", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "overheadTextCount", + "owner" : "client", + "name" : "ir", + "access" : 8, + "descriptor" : "I", + "decoder" : 616180377 + }, { + "field" : "overheadTextCyclesRemaining", + "owner" : "client", + "name" : "io", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "overheadTextEffects", + "owner" : "client", + "name" : "iw", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "overheadTextLimit", + "owner" : "client", + "name" : "iv", + "access" : 8, + "descriptor" : "I", + "decoder" : 1889277277 + }, { + "field" : "overheadTextXOffsets", + "owner" : "client", + "name" : "ib", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "overheadTextXs", + "owner" : "client", + "name" : "iq", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "overheadTextYs", + "owner" : "client", + "name" : "iu", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "packetBufferNodes", + "owner" : "gg", + "name" : "o", + "access" : 9, + "descriptor" : "[Lgg;" + }, { + "field" : "packetWriter", + "owner" : "client", + "name" : "fj", + "access" : 25, + "descriptor" : "Lcl;" + }, { + "field" : "pcmPlayer0", + "owner" : "aw", + "name" : "qu", + "access" : 8, + "descriptor" : "Lco;" + }, { + "field" : "pcmPlayer1", + "owner" : "ir", + "name" : "qb", + "access" : 8, + "descriptor" : "Lco;" + }, { + "field" : "pcmPlayerCount", + "owner" : "cu", + "name" : "e", + "access" : 8, + "descriptor" : "I", + "decoder" : -184301597 + }, { + "field" : "pcmPlayerProvider", + "owner" : "bl", + "name" : "n", + "access" : 9, + "descriptor" : "Lcz;" + }, { + "field" : "pcmStreamMixer", + "owner" : "fz", + "name" : "qr", + "access" : 8, + "descriptor" : "Lct;" + }, { + "field" : "plane", + "owner" : "dx", + "name" : "jg", + "access" : 8, + "descriptor" : "I", + "decoder" : -631434243 + }, { + "field" : "platformInfo", + "owner" : "s", + "name" : "st", + "access" : 8, + "descriptor" : "Llb;" + }, { + "field" : "platformInfoProvider", + "owner" : "client", + "name" : "sk", + "access" : 8, + "descriptor" : "Llm;" + }, { + "field" : "playerAttackOption", + "owner" : "client", + "name" : "co", + "access" : 8, + "descriptor" : "Lcj;" + }, { + "field" : "playerMenuActions", + "owner" : "client", + "name" : "kq", + "access" : 8, + "descriptor" : "[Ljava/lang/String;" + }, { + "field" : "playerMenuOpcodes", + "owner" : "client", + "name" : "kp", + "access" : 24, + "descriptor" : "[I" + }, { + "field" : "playerMod", + "owner" : "client", + "name" : "mn", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "players", + "owner" : "client", + "name" : "jd", + "access" : 8, + "descriptor" : "[Lbr;" + }, { + "field" : "port1", + "owner" : "q", + "name" : "ee", + "access" : 8, + "descriptor" : "I", + "decoder" : -753026759 + }, { + "field" : "port2", + "owner" : "ag", + "name" : "eq", + "access" : 8, + "descriptor" : "I", + "decoder" : -256520591 + }, { + "field" : "port3", + "owner" : "ga", + "name" : "eh", + "access" : 8, + "descriptor" : "I", + "decoder" : 994298267 + }, { + "field" : "projectiles", + "owner" : "client", + "name" : "kk", + "access" : 8, + "descriptor" : "Lje;" + }, { + "field" : "publicChatMode", + "owner" : "client", + "name" : "pt", + "access" : 8, + "descriptor" : "I", + "decoder" : -1802494233 + }, { + "field" : "randomDat", + "owner" : "fs", + "name" : "k", + "access" : 9, + "descriptor" : "Ldy;" + }, { + "field" : "rasterProvider", + "owner" : "gz", + "name" : "ad", + "access" : 9, + "descriptor" : "Llp;" + }, { + "field" : "rebootTimer", + "owner" : "client", + "name" : "cf", + "access" : 8, + "descriptor" : "I", + "decoder" : -1792536059 + }, { + "field" : "reflectionChecks", + "owner" : "le", + "name" : "m", + "access" : 9, + "descriptor" : "Lja;" + }, { + "field" : "regionLandArchiveIds", + "owner" : "bb", + "name" : "gb", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "regionLandArchives", + "owner" : "ad", + "name" : "gs", + "access" : 8, + "descriptor" : "[[B" + }, { + "field" : "regionMapArchiveIds", + "owner" : "bd", + "name" : "gw", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "regionMapArchives", + "owner" : "bg", + "name" : "gl", + "access" : 8, + "descriptor" : "[[B" + }, { + "field" : "regions", + "owner" : "kw", + "name" : "gn", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "renderSelf", + "owner" : "client", + "name" : "js", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "revision", + "owner" : "fx", + "name" : "q", + "access" : 9, + "descriptor" : "I", + "decoder" : -787495321 + }, { + "field" : "rootComponentCount", + "owner" : "client", + "name" : "os", + "access" : 8, + "descriptor" : "I", + "decoder" : -546798303 + }, { + "field" : "rootComponentHeights", + "owner" : "client", + "name" : "ox", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "rootComponentWidths", + "owner" : "client", + "name" : "oj", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "rootComponentXs", + "owner" : "client", + "name" : "oy", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "rootComponentYs", + "owner" : "client", + "name" : "oi", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "rootInterface", + "owner" : "client", + "name" : "mm", + "access" : 8, + "descriptor" : "I", + "decoder" : -783816509 + }, { + "field" : "runEnergy", + "owner" : "client", + "name" : "mi", + "access" : 8, + "descriptor" : "I", + "decoder" : 933910819 + }, { + "field" : "scene", + "owner" : "bl", + "name" : "gf", + "access" : 8, + "descriptor" : "Lem;" + }, { + "field" : "sceneMinimapSprite", + "owner" : "bx", + "name" : "px", + "access" : 8, + "descriptor" : "Lln;" + }, { + "field" : "scriptEvents", + "owner" : "client", + "name" : "og", + "access" : 8, + "descriptor" : "Lje;" + }, { + "field" : "scrollBarSprites", + "owner" : "ay", + "name" : "gj", + "access" : 8, + "descriptor" : "[Llq;" + }, { + "field" : "secureRandom", + "owner" : "t", + "name" : "ec", + "access" : 8, + "descriptor" : "Ljava/security/SecureRandom;" + }, { + "field" : "secureRandomFuture", + "owner" : "client", + "name" : "eu", + "access" : 8, + "descriptor" : "Lcn;" + }, { + "field" : "selectedItemComponent", + "owner" : "ge", + "name" : "ix", + "access" : 8, + "descriptor" : "I", + "decoder" : -1645409107 + }, { + "field" : "selectedItemId", + "owner" : "cs", + "name" : "iz", + "access" : 8, + "descriptor" : "I", + "decoder" : -2062450631 + }, { + "field" : "selectedItemName", + "owner" : "client", + "name" : "it", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "selectedItemSlot", + "owner" : "ii", + "name" : "lx", + "access" : 8, + "descriptor" : "I", + "decoder" : 1912123225 + }, { + "field" : "selectedSpellActionName", + "owner" : "client", + "name" : "mk", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "selectedSpellFlags", + "owner" : "do", + "name" : "my", + "access" : 8, + "descriptor" : "I", + "decoder" : -1344682613 + }, { + "field" : "selectedSpellName", + "owner" : "client", + "name" : "mu", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "serverBuild", + "owner" : "z", + "name" : "bs", + "access" : 8, + "descriptor" : "Liy;" + }, { + "field" : "shiftClickDrop", + "owner" : "client", + "name" : "lf", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "showLoadingMessages", + "owner" : "client", + "name" : "jj", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "showMouseCross", + "owner" : "client", + "name" : "jr", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "showMouseOverText", + "owner" : "client", + "name" : "lj", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "socketTask", + "owner" : "fq", + "name" : "fl", + "access" : 8, + "descriptor" : "Lfm;" + }, { + "field" : "soundCache", + "owner" : "kc", + "name" : "n", + "access" : 9, + "descriptor" : "Ldt;" + }, { + "field" : "soundEffectCount", + "owner" : "client", + "name" : "qa", + "access" : 8, + "descriptor" : "I", + "decoder" : -1481002083 + }, { + "field" : "soundEffectIds", + "owner" : "client", + "name" : "qv", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "soundEffects", + "owner" : "client", + "name" : "qe", + "access" : 8, + "descriptor" : "[Lci;" + }, { + "field" : "soundSystem", + "owner" : "cw", + "name" : "x", + "access" : 8, + "descriptor" : "Ldx;" + }, { + "field" : "soundSystemExecutor", + "owner" : "kq", + "name" : "l", + "access" : 8, + "descriptor" : "Ljava/util/concurrent/ScheduledExecutorService;" + }, { + "field" : "spriteIds", + "owner" : "hg", + "name" : "em", + "access" : 8, + "descriptor" : "Llg;" + }, { + "field" : "staffModLevel", + "owner" : "client", + "name" : "mw", + "access" : 8, + "descriptor" : "I", + "decoder" : 821563709 + }, { + "field" : "studioGame", + "owner" : "c", + "name" : "bn", + "access" : 8, + "descriptor" : "Lis;" + }, { + "field" : "tapToDrop", + "owner" : "client", + "name" : "lp", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "taskHandler", + "owner" : "ba", + "name" : "m", + "access" : 12, + "descriptor" : "Lfz;" + }, { + "field" : "tempMenuAction", + "owner" : "d", + "name" : "lr", + "access" : 8, + "descriptor" : "Lcs;" + }, { + "field" : "textureProvider", + "owner" : "cn", + "name" : "jn", + "access" : 8, + "descriptor" : "Ldl;" + }, { + "field" : "tileLastDrawnActor", + "owner" : "client", + "name" : "im", + "access" : 8, + "descriptor" : "[[I" + }, { + "field" : "timer", + "owner" : "client", + "name" : "fm", + "access" : 8, + "descriptor" : "Ljo;" + }, { + "field" : "titleLoadingStage", + "owner" : "client", + "name" : "dt", + "access" : 8, + "descriptor" : "I", + "decoder" : -1520594673 + }, { + "field" : "urlRequester", + "owner" : "kd", + "name" : "fz", + "access" : 8, + "descriptor" : "Leo;" + }, { + "field" : "useBufferedSocket", + "owner" : "client", + "name" : "fx", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "userHomeDirectory", + "owner" : "as", + "name" : "c", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "varcs", + "owner" : "gy", + "name" : "of", + "access" : 8, + "descriptor" : "Lch;" + }, { + "field" : "viewportComponent", + "owner" : "client", + "name" : "mx", + "access" : 8, + "descriptor" : "Lho;" + }, { + "field" : "viewportDrawCount", + "owner" : "client", + "name" : "ii", + "access" : 8, + "descriptor" : "I", + "decoder" : 289477221 + }, { + "field" : "viewportHeight", + "owner" : "client", + "name" : "rx", + "access" : 8, + "descriptor" : "I", + "decoder" : -629885193 + }, { + "field" : "viewportOffsetX", + "owner" : "client", + "name" : "rr", + "access" : 8, + "descriptor" : "I", + "decoder" : 386331251 + }, { + "field" : "viewportOffsetY", + "owner" : "client", + "name" : "rn", + "access" : 8, + "descriptor" : "I", + "decoder" : 992721193 + }, { + "field" : "viewportTempX", + "owner" : "client", + "name" : "ig", + "access" : 8, + "descriptor" : "I", + "decoder" : 424442889 + }, { + "field" : "viewportTempY", + "owner" : "client", + "name" : "ia", + "access" : 8, + "descriptor" : "I", + "decoder" : -81902865 + }, { + "field" : "viewportWidth", + "owner" : "client", + "name" : "ry", + "access" : 8, + "descriptor" : "I", + "decoder" : 2035623995 + }, { + "field" : "viewportZoom", + "owner" : "client", + "name" : "rz", + "access" : 8, + "descriptor" : "I", + "decoder" : 541065633 + }, { + "field" : "visibilityMap", + "owner" : "em", + "name" : "bc", + "access" : 8, + "descriptor" : "[[[[Z" + }, { + "field" : "visibleTiles", + "owner" : "em", + "name" : "bo", + "access" : 8, + "descriptor" : "[[Z" + }, { + "field" : "weight", + "owner" : "client", + "name" : "mv", + "access" : 8, + "descriptor" : "I", + "decoder" : 36001423 + }, { + "field" : "worldHost", + "owner" : "af", + "name" : "ei", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "worldId", + "owner" : "client", + "name" : "ba", + "access" : 9, + "descriptor" : "I", + "decoder" : 1412639841 + }, { + "field" : "worldMap0", + "owner" : "bo", + "name" : "sz", + "access" : 8, + "descriptor" : "Llz;" + }, { + "field" : "worldMapEvent", + "owner" : "z", + "name" : "j", + "access" : 8, + "descriptor" : "Lap;" + }, { + "field" : "worldProperties", + "owner" : "client", + "name" : "bb", + "access" : 8, + "descriptor" : "I", + "decoder" : 352819683 + }, { + "field" : "worlds", + "owner" : "bc", + "name" : "o", + "access" : 8, + "descriptor" : "[Lbt;" + }, { + "field" : "worldsCount", + "owner" : "bt", + "name" : "u", + "access" : 8, + "descriptor" : "I", + "decoder" : 233222155 + }, { + "field" : "worldsUrl", + "owner" : "iy", + "name" : "bx", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "xteaKeys", + "owner" : "gf", + "name" : "ge", + "access" : 8, + "descriptor" : "[[I" + }, { + "field" : "__f_m", + "owner" : "f", + "name" : "m", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "__w_qs", + "owner" : "w", + "name" : "qs", + "access" : 8, + "descriptor" : "I", + "decoder" : 1608439891 + }, { + "field" : "__o_m", + "owner" : "o", + "name" : "m", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "__u_n", + "owner" : "u", + "name" : "n", + "access" : 9, + "descriptor" : "Z" + }, { + "field" : "__g_f", + "owner" : "g", + "name" : "f", + "access" : 9, + "descriptor" : "Ljava/util/Comparator;" + }, { + "field" : "__g_o", + "owner" : "g", + "name" : "o", + "access" : 9, + "descriptor" : "Ljava/util/Comparator;" + }, { + "field" : "__g_q", + "owner" : "g", + "name" : "q", + "access" : 9, + "descriptor" : "Ljava/util/Comparator;" + }, { + "field" : "__g_w", + "owner" : "g", + "name" : "w", + "access" : 9, + "descriptor" : "Ljava/util/Comparator;" + }, { + "field" : "__g_z", + "owner" : "g", + "name" : "z", + "access" : 8, + "descriptor" : "I", + "decoder" : -1605454211 + }, { + "field" : "__x_rg", + "owner" : "x", + "name" : "rg", + "access" : 8, + "descriptor" : "I", + "decoder" : -1286287981 + }, { + "field" : "__d_gz", + "owner" : "d", + "name" : "gz", + "access" : 8, + "descriptor" : "Lln;" + }, { + "field" : "__n_n", + "owner" : "n", + "name" : "n", + "access" : 8, + "descriptor" : "Lho;" + }, { + "field" : "__i_af", + "owner" : "i", + "name" : "af", + "access" : 8, + "descriptor" : "I", + "decoder" : -1810047523 + }, { + "field" : "__i_x", + "owner" : "i", + "name" : "x", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__z_si", + "owner" : "z", + "name" : "si", + "access" : 8, + "descriptor" : "J", + "decoder" : 3423502126894795079 + }, { + "field" : "__s_fi", + "owner" : "s", + "name" : "fi", + "access" : 8, + "descriptor" : "I", + "decoder" : 1577759565 + }, { + "field" : "__s_dq", + "owner" : "s", + "name" : "dq", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "__t_i", + "owner" : "t", + "name" : "i", + "access" : 8, + "descriptor" : "Lho;" + }, { + "field" : "__y_sn", + "owner" : "y", + "name" : "sn", + "access" : 8, + "descriptor" : "I", + "decoder" : -1946112139 + }, { + "field" : "__y_p", + "owner" : "y", + "name" : "p", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__h_n", + "owner" : "h", + "name" : "n", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__h_e", + "owner" : "h", + "name" : "e", + "access" : 8, + "descriptor" : "Llq;" + }, { + "field" : "__h_f", + "owner" : "h", + "name" : "f", + "access" : 24, + "descriptor" : "Lh;" + }, { + "field" : "__h_m", + "owner" : "h", + "name" : "m", + "access" : 24, + "descriptor" : "Lh;" + }, { + "field" : "__h_q", + "owner" : "h", + "name" : "q", + "access" : 24, + "descriptor" : "Lh;" + }, { + "field" : "__h_w", + "owner" : "h", + "name" : "w", + "access" : 24, + "descriptor" : "Lh;" + }, { + "field" : "__b_by", + "owner" : "b", + "name" : "by", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__p_go", + "owner" : "p", + "name" : "go", + "access" : 8, + "descriptor" : "I", + "decoder" : -948290091 + }, { + "field" : "__aq_k", + "owner" : "aq", + "name" : "k", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "__aj_e", + "owner" : "aj", + "name" : "e", + "access" : 9, + "descriptor" : "I", + "decoder" : -1536028937 + }, { + "field" : "__av_o", + "owner" : "av", + "name" : "o", + "access" : 9, + "descriptor" : "Lec;" + }, { + "field" : "__ar_l", + "owner" : "ar", + "name" : "l", + "access" : 9, + "descriptor" : "Z" + }, { + "field" : "__ar_qw", + "owner" : "ar", + "name" : "qw", + "access" : 8, + "descriptor" : "I", + "decoder" : -1555836449 + }, { + "field" : "__ar_bd", + "owner" : "ar", + "name" : "bd", + "access" : 8, + "descriptor" : "[Lln;" + }, { + "field" : "__ay_u", + "owner" : "ay", + "name" : "u", + "access" : 8, + "descriptor" : "[[[B" + }, { + "field" : "__ah_l", + "owner" : "ah", + "name" : "l", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__ak_qj", + "owner" : "ak", + "name" : "qj", + "access" : 8, + "descriptor" : "I", + "decoder" : -1942470229 + }, { + "field" : "__ap_w", + "owner" : "ap", + "name" : "w", + "access" : 8, + "descriptor" : "[Llq;" + }, { + "field" : "__as_ey", + "owner" : "as", + "name" : "ey", + "access" : 8, + "descriptor" : "I", + "decoder" : -1516124929 + }, { + "field" : "__an_cl", + "owner" : "an", + "name" : "cl", + "access" : 9, + "descriptor" : "I", + "decoder" : -674534717 + }, { + "field" : "__an_cp", + "owner" : "an", + "name" : "cp", + "access" : 9, + "descriptor" : "[I" + }, { + "field" : "__an_cg", + "owner" : "an", + "name" : "cg", + "access" : 8, + "descriptor" : "[C" + }, { + "field" : "__an_cc", + "owner" : "an", + "name" : "cc", + "access" : 8, + "descriptor" : "I", + "decoder" : -1942898885 + }, { + "field" : "__an_ch", + "owner" : "an", + "name" : "ch", + "access" : 8, + "descriptor" : "I", + "decoder" : 1112094745 + }, { + "field" : "__an_ct", + "owner" : "an", + "name" : "ct", + "access" : 8, + "descriptor" : "I", + "decoder" : -93280591 + }, { + "field" : "__an_cw", + "owner" : "an", + "name" : "cw", + "access" : 8, + "descriptor" : "I", + "decoder" : -1208053825 + }, { + "field" : "__an_cz", + "owner" : "an", + "name" : "cz", + "access" : 8, + "descriptor" : "I", + "decoder" : 2066759739 + }, { + "field" : "__an_ra", + "owner" : "an", + "name" : "ra", + "access" : 8, + "descriptor" : "I", + "decoder" : -817957995 + }, { + "field" : "__an_cf", + "owner" : "an", + "name" : "cf", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__an_cq", + "owner" : "an", + "name" : "cq", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__an_i", + "owner" : "an", + "name" : "i", + "access" : 8, + "descriptor" : "Llq;" + }, { + "field" : "__an_x", + "owner" : "an", + "name" : "x", + "access" : 8, + "descriptor" : "[Llq;" + }, { + "field" : "__ao_s", + "owner" : "ao", + "name" : "s", + "access" : 9, + "descriptor" : "[Ljava/lang/String;" + }, { + "field" : "__ao_gk", + "owner" : "ao", + "name" : "gk", + "access" : 8, + "descriptor" : "I", + "decoder" : -1131782991 + }, { + "field" : "__af_m", + "owner" : "af", + "name" : "m", + "access" : 9, + "descriptor" : "Ljava/applet/Applet;" + }, { + "field" : "__af_f", + "owner" : "af", + "name" : "f", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__ba_aw", + "owner" : "ba", + "name" : "aw", + "access" : 8, + "descriptor" : "I", + "decoder" : -1042005999 + }, { + "field" : "__ba_d", + "owner" : "ba", + "name" : "d", + "access" : 8, + "descriptor" : "I", + "decoder" : 425367827 + }, { + "field" : "__ba_e", + "owner" : "ba", + "name" : "e", + "access" : 8, + "descriptor" : "I", + "decoder" : -1698831905 + }, { + "field" : "__ba_l", + "owner" : "ba", + "name" : "l", + "access" : 8, + "descriptor" : "I", + "decoder" : -1179083285 + }, { + "field" : "__ba_q", + "owner" : "ba", + "name" : "q", + "access" : 8, + "descriptor" : "I", + "decoder" : -281664295 + }, { + "field" : "__ba_s", + "owner" : "ba", + "name" : "s", + "access" : 8, + "descriptor" : "I", + "decoder" : -2078849253 + }, { + "field" : "__ba_a", + "owner" : "ba", + "name" : "a", + "access" : 8, + "descriptor" : "[J" + }, { + "field" : "__ba_j", + "owner" : "ba", + "name" : "j", + "access" : 8, + "descriptor" : "[J" + }, { + "field" : "__bb_hz", + "owner" : "bb", + "name" : "hz", + "access" : 8, + "descriptor" : "I", + "decoder" : -215744973 + }, { + "field" : "__bs_nb", + "owner" : "bs", + "name" : "nb", + "access" : 8, + "descriptor" : "I", + "decoder" : -1247107945 + }, { + "field" : "__bq_l", + "owner" : "bq", + "name" : "l", + "access" : 8, + "descriptor" : "[[[B" + }, { + "field" : "__bq_w", + "owner" : "bq", + "name" : "w", + "access" : 8, + "descriptor" : "[[[B" + }, { + "field" : "__bq_p", + "owner" : "bq", + "name" : "p", + "access" : 8, + "descriptor" : "I", + "decoder" : -2142579405 + }, { + "field" : "__bq_v", + "owner" : "bq", + "name" : "v", + "access" : 8, + "descriptor" : "I", + "decoder" : 834543729 + }, { + "field" : "__bq_a", + "owner" : "bq", + "name" : "a", + "access" : 8, + "descriptor" : "[[[I" + }, { + "field" : "__bq_b", + "owner" : "bq", + "name" : "b", + "access" : 24, + "descriptor" : "[I" + }, { + "field" : "__bq_c", + "owner" : "bq", + "name" : "c", + "access" : 24, + "descriptor" : "[I" + }, { + "field" : "__bq_h", + "owner" : "bq", + "name" : "h", + "access" : 24, + "descriptor" : "[I" + }, { + "field" : "__bq_r", + "owner" : "bq", + "name" : "r", + "access" : 24, + "descriptor" : "[I" + }, { + "field" : "__bq_t", + "owner" : "bq", + "name" : "t", + "access" : 24, + "descriptor" : "[I" + }, { + "field" : "__bq_y", + "owner" : "bq", + "name" : "y", + "access" : 24, + "descriptor" : "[I" + }, { + "field" : "__bk_g", + "owner" : "bk", + "name" : "g", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__bd_x", + "owner" : "bd", + "name" : "x", + "access" : 9, + "descriptor" : "[[S" + }, { + "field" : "__bd_er", + "owner" : "bd", + "name" : "er", + "access" : 8, + "descriptor" : "I", + "decoder" : 636454135 + }, { + "field" : "__bd_u", + "owner" : "bd", + "name" : "u", + "access" : 8, + "descriptor" : "Llq;" + }, { + "field" : "__bc_dm", + "owner" : "bc", + "name" : "dm", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "__bo_ar", + "owner" : "bo", + "name" : "ar", + "access" : 8, + "descriptor" : "Ljava/awt/FontMetrics;" + }, { + "field" : "__bx_o", + "owner" : "bx", + "name" : "o", + "access" : 8, + "descriptor" : "I", + "decoder" : -992379173 + }, { + "field" : "__by_hb", + "owner" : "by", + "name" : "hb", + "access" : 8, + "descriptor" : "I", + "decoder" : -1218466245 + }, { + "field" : "__bu_hy", + "owner" : "bu", + "name" : "hy", + "access" : 8, + "descriptor" : "I", + "decoder" : 1075569245 + }, { + "field" : "__bm_i", + "owner" : "bm", + "name" : "i", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__client_il", + "owner" : "client", + "name" : "il", + "access" : 9, + "descriptor" : "I", + "decoder" : -1063713523 + }, { + "field" : "__client_ss", + "owner" : "client", + "name" : "ss", + "access" : 9, + "descriptor" : "I", + "decoder" : -451622431 + }, { + "field" : "__client_sj", + "owner" : "client", + "name" : "sj", + "access" : 8, + "descriptor" : "Lbj;" + }, { + "field" : "__client_ai", + "owner" : "client", + "name" : "ai", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__client_bl", + "owner" : "client", + "name" : "bl", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__client_cw", + "owner" : "client", + "name" : "cw", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__client_fh", + "owner" : "client", + "name" : "fh", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__client_hh", + "owner" : "client", + "name" : "hh", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__client_ij", + "owner" : "client", + "name" : "ij", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__client_is", + "owner" : "client", + "name" : "is", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__client_jl", + "owner" : "client", + "name" : "jl", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__client_nn", + "owner" : "client", + "name" : "nn", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__client_nt", + "owner" : "client", + "name" : "nt", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__client_qq", + "owner" : "client", + "name" : "qq", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__client_kv", + "owner" : "client", + "name" : "kv", + "access" : 8, + "descriptor" : "[Z" + }, { + "field" : "__client_od", + "owner" : "client", + "name" : "od", + "access" : 8, + "descriptor" : "[Z" + }, { + "field" : "__client_oq", + "owner" : "client", + "name" : "oq", + "access" : 8, + "descriptor" : "[Z" + }, { + "field" : "__client_ot", + "owner" : "client", + "name" : "ot", + "access" : 8, + "descriptor" : "[Z" + }, { + "field" : "__client_rh", + "owner" : "client", + "name" : "rh", + "access" : 8, + "descriptor" : "[Z" + }, { + "field" : "__client_ev", + "owner" : "client", + "name" : "ev", + "access" : 8, + "descriptor" : "[B" + }, { + "field" : "__client_ru", + "owner" : "client", + "name" : "ru", + "access" : 8, + "descriptor" : "Lhi;" + }, { + "field" : "__client_md", + "owner" : "client", + "name" : "md", + "access" : 8, + "descriptor" : "Lho;" + }, { + "field" : "__client_mo", + "owner" : "client", + "name" : "mo", + "access" : 8, + "descriptor" : "Lho;" + }, { + "field" : "__client_cn", + "owner" : "client", + "name" : "cn", + "access" : 8, + "descriptor" : "I", + "decoder" : -1731573291 + }, { + "field" : "__client_cq", + "owner" : "client", + "name" : "cq", + "access" : 8, + "descriptor" : "I", + "decoder" : -1313705721 + }, { + "field" : "__client_dp", + "owner" : "client", + "name" : "dp", + "access" : 8, + "descriptor" : "I", + "decoder" : 1154760205 + }, { + "field" : "__client_ej", + "owner" : "client", + "name" : "ej", + "access" : 8, + "descriptor" : "I", + "decoder" : -964416527 + }, { + "field" : "__client_el", + "owner" : "client", + "name" : "el", + "access" : 8, + "descriptor" : "I", + "decoder" : 689094231 + }, { + "field" : "__client_eo", + "owner" : "client", + "name" : "eo", + "access" : 8, + "descriptor" : "I", + "decoder" : -447055355 + }, { + "field" : "__client_ex", + "owner" : "client", + "name" : "ex", + "access" : 8, + "descriptor" : "I", + "decoder" : 755300107 + }, { + "field" : "__client_fd", + "owner" : "client", + "name" : "fd", + "access" : 8, + "descriptor" : "I", + "decoder" : -1050480853 + }, { + "field" : "__client_fe", + "owner" : "client", + "name" : "fe", + "access" : 8, + "descriptor" : "I", + "decoder" : 829228151 + }, { + "field" : "__client_fk", + "owner" : "client", + "name" : "fk", + "access" : 8, + "descriptor" : "I", + "decoder" : 8470625 + }, { + "field" : "__client_fn", + "owner" : "client", + "name" : "fn", + "access" : 8, + "descriptor" : "I", + "decoder" : -597100741 + }, { + "field" : "__client_fw", + "owner" : "client", + "name" : "fw", + "access" : 8, + "descriptor" : "I", + "decoder" : 516059665 + }, { + "field" : "__client_gh", + "owner" : "client", + "name" : "gh", + "access" : 8, + "descriptor" : "I", + "decoder" : -1456975367 + }, { + "field" : "__client_gp", + "owner" : "client", + "name" : "gp", + "access" : 8, + "descriptor" : "I", + "decoder" : 685418907 + }, { + "field" : "__client_gy", + "owner" : "client", + "name" : "gy", + "access" : 8, + "descriptor" : "I", + "decoder" : -134014371 + }, { + "field" : "__client_hc", + "owner" : "client", + "name" : "hc", + "access" : 8, + "descriptor" : "I", + "decoder" : -441913785 + }, { + "field" : "__client_hd", + "owner" : "client", + "name" : "hd", + "access" : 8, + "descriptor" : "I", + "decoder" : 438998245 + }, { + "field" : "__client_hg", + "owner" : "client", + "name" : "hg", + "access" : 8, + "descriptor" : "I", + "decoder" : 1658018867 + }, { + "field" : "__client_hi", + "owner" : "client", + "name" : "hi", + "access" : 8, + "descriptor" : "I", + "decoder" : 402871301 + }, { + "field" : "__client_hj", + "owner" : "client", + "name" : "hj", + "access" : 8, + "descriptor" : "I", + "decoder" : -1420078475 + }, { + "field" : "__client_hk", + "owner" : "client", + "name" : "hk", + "access" : 8, + "descriptor" : "I", + "decoder" : -1149138989 + }, { + "field" : "__client_hn", + "owner" : "client", + "name" : "hn", + "access" : 8, + "descriptor" : "I", + "decoder" : -516933613 + }, { + "field" : "__client_hr", + "owner" : "client", + "name" : "hr", + "access" : 8, + "descriptor" : "I", + "decoder" : 1664350313 + }, { + "field" : "__client_ht", + "owner" : "client", + "name" : "ht", + "access" : 8, + "descriptor" : "I", + "decoder" : 1502058429 + }, { + "field" : "__client_hu", + "owner" : "client", + "name" : "hu", + "access" : 8, + "descriptor" : "I", + "decoder" : -480633777 + }, { + "field" : "__client_hv", + "owner" : "client", + "name" : "hv", + "access" : 8, + "descriptor" : "I", + "decoder" : 218086227 + }, { + "field" : "__client_hx", + "owner" : "client", + "name" : "hx", + "access" : 8, + "descriptor" : "I", + "decoder" : -1406125895 + }, { + "field" : "__client_ie", + "owner" : "client", + "name" : "ie", + "access" : 8, + "descriptor" : "I", + "decoder" : 236939601 + }, { + "field" : "__client_if", + "owner" : "client", + "name" : "if", + "access" : 8, + "descriptor" : "I", + "decoder" : -952172003 + }, { + "field" : "__client_ik", + "owner" : "client", + "name" : "ik", + "access" : 8, + "descriptor" : "I", + "decoder" : 910983131 + }, { + "field" : "__client_in", + "owner" : "client", + "name" : "in", + "access" : 8, + "descriptor" : "I", + "decoder" : 351193663 + }, { + "field" : "__client_iy", + "owner" : "client", + "name" : "iy", + "access" : 8, + "descriptor" : "I", + "decoder" : -1213062413 + }, { + "field" : "__client_ja", + "owner" : "client", + "name" : "ja", + "access" : 8, + "descriptor" : "I", + "decoder" : 813973829 + }, { + "field" : "__client_jc", + "owner" : "client", + "name" : "jc", + "access" : 8, + "descriptor" : "I", + "decoder" : 1084498299 + }, { + "field" : "__client_je", + "owner" : "client", + "name" : "je", + "access" : 8, + "descriptor" : "I", + "decoder" : 1959822241 + }, { + "field" : "__client_jo", + "owner" : "client", + "name" : "jo", + "access" : 8, + "descriptor" : "I", + "decoder" : -836962805 + }, { + "field" : "__client_ju", + "owner" : "client", + "name" : "ju", + "access" : 8, + "descriptor" : "I", + "decoder" : 1691923909 + }, { + "field" : "__client_jz", + "owner" : "client", + "name" : "jz", + "access" : 8, + "descriptor" : "I", + "decoder" : -1267243587 + }, { + "field" : "__client_ke", + "owner" : "client", + "name" : "ke", + "access" : 8, + "descriptor" : "I", + "decoder" : -1208823721 + }, { + "field" : "__client_ku", + "owner" : "client", + "name" : "ku", + "access" : 8, + "descriptor" : "I", + "decoder" : -898263359 + }, { + "field" : "__client_ky", + "owner" : "client", + "name" : "ky", + "access" : 8, + "descriptor" : "I", + "decoder" : -64320473 + }, { + "field" : "__client_lb", + "owner" : "client", + "name" : "lb", + "access" : 8, + "descriptor" : "I", + "decoder" : 699084605 + }, { + "field" : "__client_lc", + "owner" : "client", + "name" : "lc", + "access" : 8, + "descriptor" : "I", + "decoder" : 196309625 + }, { + "field" : "__client_ln", + "owner" : "client", + "name" : "ln", + "access" : 8, + "descriptor" : "I", + "decoder" : 885052255 + }, { + "field" : "__client_lq", + "owner" : "client", + "name" : "lq", + "access" : 8, + "descriptor" : "I", + "decoder" : 26099827 + }, { + "field" : "__client_ls", + "owner" : "client", + "name" : "ls", + "access" : 8, + "descriptor" : "I", + "decoder" : -274968037 + }, { + "field" : "__client_mb", + "owner" : "client", + "name" : "mb", + "access" : 8, + "descriptor" : "I", + "decoder" : 1694810089 + }, { + "field" : "__client_mf", + "owner" : "client", + "name" : "mf", + "access" : 8, + "descriptor" : "I", + "decoder" : -1715020411 + }, { + "field" : "__client_mh", + "owner" : "client", + "name" : "mh", + "access" : 8, + "descriptor" : "I", + "decoder" : 535219347 + }, { + "field" : "__client_ms", + "owner" : "client", + "name" : "ms", + "access" : 8, + "descriptor" : "I", + "decoder" : 2128395635 + }, { + "field" : "__client_na", + "owner" : "client", + "name" : "na", + "access" : 8, + "descriptor" : "I", + "decoder" : -934082817 + }, { + "field" : "__client_nc", + "owner" : "client", + "name" : "nc", + "access" : 8, + "descriptor" : "I", + "decoder" : 344308849 + }, { + "field" : "__client_nd", + "owner" : "client", + "name" : "nd", + "access" : 8, + "descriptor" : "I", + "decoder" : 760022015 + }, { + "field" : "__client_ng", + "owner" : "client", + "name" : "ng", + "access" : 8, + "descriptor" : "I", + "decoder" : -1379876433 + }, { + "field" : "__client_nh", + "owner" : "client", + "name" : "nh", + "access" : 8, + "descriptor" : "I", + "decoder" : -278874973 + }, { + "field" : "__client_ni", + "owner" : "client", + "name" : "ni", + "access" : 8, + "descriptor" : "I", + "decoder" : 1990512261 + }, { + "field" : "__client_nk", + "owner" : "client", + "name" : "nk", + "access" : 8, + "descriptor" : "I", + "decoder" : 1019025247 + }, { + "field" : "__client_nl", + "owner" : "client", + "name" : "nl", + "access" : 8, + "descriptor" : "I", + "decoder" : 1939745821 + }, { + "field" : "__client_np", + "owner" : "client", + "name" : "np", + "access" : 8, + "descriptor" : "I", + "decoder" : 1881890525 + }, { + "field" : "__client_nq", + "owner" : "client", + "name" : "nq", + "access" : 8, + "descriptor" : "I", + "decoder" : 1467519791 + }, { + "field" : "__client_ns", + "owner" : "client", + "name" : "ns", + "access" : 8, + "descriptor" : "I", + "decoder" : 743073293 + }, { + "field" : "__client_nv", + "owner" : "client", + "name" : "nv", + "access" : 8, + "descriptor" : "I", + "decoder" : -758575207 + }, { + "field" : "__client_nw", + "owner" : "client", + "name" : "nw", + "access" : 8, + "descriptor" : "I", + "decoder" : -843739713 + }, { + "field" : "__client_nx", + "owner" : "client", + "name" : "nx", + "access" : 8, + "descriptor" : "I", + "decoder" : 1132932607 + }, { + "field" : "__client_oo", + "owner" : "client", + "name" : "oo", + "access" : 8, + "descriptor" : "I", + "decoder" : 1348053843 + }, { + "field" : "__client_pb", + "owner" : "client", + "name" : "pb", + "access" : 8, + "descriptor" : "I", + "decoder" : 1230692157 + }, { + "field" : "__client_ph", + "owner" : "client", + "name" : "ph", + "access" : 8, + "descriptor" : "I", + "decoder" : 587773171 + }, { + "field" : "__client_pl", + "owner" : "client", + "name" : "pl", + "access" : 8, + "descriptor" : "I", + "decoder" : -1362734353 + }, { + "field" : "__client_pm", + "owner" : "client", + "name" : "pm", + "access" : 8, + "descriptor" : "I", + "decoder" : -460406997 + }, { + "field" : "__client_qc", + "owner" : "client", + "name" : "qc", + "access" : 8, + "descriptor" : "I", + "decoder" : -818676431 + }, { + "field" : "__client_qf", + "owner" : "client", + "name" : "qf", + "access" : 8, + "descriptor" : "I", + "decoder" : 1365951359 + }, { + "field" : "__client_qp", + "owner" : "client", + "name" : "qp", + "access" : 8, + "descriptor" : "I", + "decoder" : -1352723865 + }, { + "field" : "__client_qy", + "owner" : "client", + "name" : "qy", + "access" : 8, + "descriptor" : "I", + "decoder" : -34294211 + }, { + "field" : "__client_sd", + "owner" : "client", + "name" : "sd", + "access" : 8, + "descriptor" : "I", + "decoder" : 944933439 + }, { + "field" : "__client_sl", + "owner" : "client", + "name" : "sl", + "access" : 8, + "descriptor" : "I", + "decoder" : -1605855913 + }, { + "field" : "__client_sx", + "owner" : "client", + "name" : "sx", + "access" : 8, + "descriptor" : "I", + "decoder" : 206275573 + }, { + "field" : "__client_fg", + "owner" : "client", + "name" : "fg", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__client_kd", + "owner" : "client", + "name" : "kd", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__client_kn", + "owner" : "client", + "name" : "kn", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__client_nf", + "owner" : "client", + "name" : "nf", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__client_nr", + "owner" : "client", + "name" : "nr", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__client_nz", + "owner" : "client", + "name" : "nz", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__client_pn", + "owner" : "client", + "name" : "pn", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__client_pq", + "owner" : "client", + "name" : "pq", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__client_pv", + "owner" : "client", + "name" : "pv", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__client_qd", + "owner" : "client", + "name" : "qd", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__client_qk", + "owner" : "client", + "name" : "qk", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__client_qn", + "owner" : "client", + "name" : "qn", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__client_rd", + "owner" : "client", + "name" : "rd", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__client_rj", + "owner" : "client", + "name" : "rj", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__client_rk", + "owner" : "client", + "name" : "rk", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__client_rl", + "owner" : "client", + "name" : "rl", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__client_th", + "owner" : "client", + "name" : "th", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__client_tp", + "owner" : "client", + "name" : "tp", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__client_pz", + "owner" : "client", + "name" : "pz", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__client_kh", + "owner" : "client", + "name" : "kh", + "access" : 8, + "descriptor" : "Lje;" + }, { + "field" : "__client_oc", + "owner" : "client", + "name" : "oc", + "access" : 8, + "descriptor" : "Lje;" + }, { + "field" : "__client_oh", + "owner" : "client", + "name" : "oh", + "access" : 8, + "descriptor" : "Lje;" + }, { + "field" : "__client_ch", + "owner" : "client", + "name" : "ch", + "access" : 8, + "descriptor" : "J", + "decoder" : -6574384275386813769 + }, { + "field" : "__client_oa", + "owner" : "client", + "name" : "oa", + "access" : 8, + "descriptor" : "J", + "decoder" : 8818983958751331899 + }, { + "field" : "__client_pp", + "owner" : "client", + "name" : "pp", + "access" : 8, + "descriptor" : "J", + "decoder" : -1704358328771670975 + }, { + "field" : "__client_pu", + "owner" : "client", + "name" : "pu", + "access" : 8, + "descriptor" : "[J" + }, { + "field" : "__client_rb", + "owner" : "client", + "name" : "rb", + "access" : 8, + "descriptor" : "S" + }, { + "field" : "__client_re", + "owner" : "client", + "name" : "re", + "access" : 8, + "descriptor" : "S" + }, { + "field" : "__client_ri", + "owner" : "client", + "name" : "ri", + "access" : 8, + "descriptor" : "S" + }, { + "field" : "__client_rm", + "owner" : "client", + "name" : "rm", + "access" : 8, + "descriptor" : "S" + }, { + "field" : "__client_rp", + "owner" : "client", + "name" : "rp", + "access" : 8, + "descriptor" : "S" + }, { + "field" : "__client_rs", + "owner" : "client", + "name" : "rs", + "access" : 8, + "descriptor" : "S" + }, { + "field" : "__client_rv", + "owner" : "client", + "name" : "rv", + "access" : 8, + "descriptor" : "S" + }, { + "field" : "__client_rw", + "owner" : "client", + "name" : "rw", + "access" : 8, + "descriptor" : "S" + }, { + "field" : "__client_gd", + "owner" : "client", + "name" : "gd", + "access" : 24, + "descriptor" : "[I" + }, { + "field" : "__bt_g", + "owner" : "bt", + "name" : "g", + "access" : 8, + "descriptor" : "I", + "decoder" : 1143875805 + }, { + "field" : "__bt_e", + "owner" : "bt", + "name" : "e", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__bt_l", + "owner" : "bt", + "name" : "l", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__bf_m", + "owner" : "bf", + "name" : "m", + "access" : 8, + "descriptor" : "I", + "decoder" : 1548448409 + }, { + "field" : "__bv_s", + "owner" : "bv", + "name" : "s", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__bv_t", + "owner" : "bv", + "name" : "t", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__bv_y", + "owner" : "bv", + "name" : "y", + "access" : 8, + "descriptor" : "I", + "decoder" : -1019558835 + }, { + "field" : "__bv_r", + "owner" : "bv", + "name" : "r", + "access" : 24, + "descriptor" : "D" + }, { + "field" : "__bv_z", + "owner" : "bv", + "name" : "z", + "access" : 24, + "descriptor" : "[Ljava/lang/String;" + }, { + "field" : "__bw_d", + "owner" : "bw", + "name" : "d", + "access" : 8, + "descriptor" : "I", + "decoder" : -1807262579 + }, { + "field" : "__bw_k", + "owner" : "bw", + "name" : "k", + "access" : 8, + "descriptor" : "Llq;" + }, { + "field" : "__ce_o", + "owner" : "ce", + "name" : "o", + "access" : 24, + "descriptor" : "Ljava/math/BigInteger;" + }, { + "field" : "__ce_u", + "owner" : "ce", + "name" : "u", + "access" : 24, + "descriptor" : "Ljava/math/BigInteger;" + }, { + "field" : "__cy_d", + "owner" : "cy", + "name" : "d", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__cm_e", + "owner" : "cm", + "name" : "e", + "access" : 9, + "descriptor" : "I", + "decoder" : 533653621 + }, { + "field" : "__cm_f", + "owner" : "cm", + "name" : "f", + "access" : 24, + "descriptor" : "Ljava/math/BigInteger;" + }, { + "field" : "__cm_m", + "owner" : "cm", + "name" : "m", + "access" : 24, + "descriptor" : "Ljava/math/BigInteger;" + }, { + "field" : "__cj_ay", + "owner" : "cj", + "name" : "ay", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__cj_bo", + "owner" : "cj", + "name" : "bo", + "access" : 8, + "descriptor" : "[Llq;" + }, { + "field" : "__cj_sp", + "owner" : "cj", + "name" : "sp", + "access" : 8, + "descriptor" : "[S" + }, { + "field" : "__cu_aa", + "owner" : "cu", + "name" : "aa", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__cu_ax", + "owner" : "cu", + "name" : "ax", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__cu_ba", + "owner" : "cu", + "name" : "ba", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__cu_bk", + "owner" : "cu", + "name" : "bk", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__cu_f", + "owner" : "cu", + "name" : "f", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__cu_ac", + "owner" : "cu", + "name" : "ac", + "access" : 8, + "descriptor" : "I", + "decoder" : 1677133239 + }, { + "field" : "__cu_aj", + "owner" : "cu", + "name" : "aj", + "access" : 8, + "descriptor" : "I", + "decoder" : 1077910071 + }, { + "field" : "__cu_aw", + "owner" : "cu", + "name" : "aw", + "access" : 8, + "descriptor" : "I", + "decoder" : 1861681835 + }, { + "field" : "__cu_bb", + "owner" : "cu", + "name" : "bb", + "access" : 8, + "descriptor" : "I", + "decoder" : 1769484271 + }, { + "field" : "__cu_bj", + "owner" : "cu", + "name" : "bj", + "access" : 8, + "descriptor" : "I", + "decoder" : 1548722671 + }, { + "field" : "__cu_bl", + "owner" : "cu", + "name" : "bl", + "access" : 8, + "descriptor" : "I", + "decoder" : 1431381579 + }, { + "field" : "__cu_br", + "owner" : "cu", + "name" : "br", + "access" : 8, + "descriptor" : "I", + "decoder" : -376233039 + }, { + "field" : "__cu_q", + "owner" : "cu", + "name" : "q", + "access" : 8, + "descriptor" : "I", + "decoder" : 1606541885 + }, { + "field" : "__cu_y", + "owner" : "cu", + "name" : "y", + "access" : 8, + "descriptor" : "I", + "decoder" : 932541923 + }, { + "field" : "__cu_ai", + "owner" : "cu", + "name" : "ai", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__cu_bq", + "owner" : "cu", + "name" : "bq", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__cu_bs", + "owner" : "cu", + "name" : "bs", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__cu_g", + "owner" : "cu", + "name" : "g", + "access" : 8, + "descriptor" : "Lln;" + }, { + "field" : "__cu_bi", + "owner" : "cu", + "name" : "bi", + "access" : 8, + "descriptor" : "J", + "decoder" : 803647694904294325 + }, { + "field" : "__cu_bz", + "owner" : "cu", + "name" : "bz", + "access" : 8, + "descriptor" : "J", + "decoder" : -3234258972092460093 + }, { + "field" : "__cu_d", + "owner" : "cu", + "name" : "d", + "access" : 8, + "descriptor" : "Llq;" + }, { + "field" : "__cu_o", + "owner" : "cu", + "name" : "o", + "access" : 8, + "descriptor" : "Llq;" + }, { + "field" : "__cn_bu", + "owner" : "cn", + "name" : "bu", + "access" : 8, + "descriptor" : "Llq;" + }, { + "field" : "__cq_q", + "owner" : "cq", + "name" : "q", + "access" : 8, + "descriptor" : "[B" + }, { + "field" : "__cq_w", + "owner" : "cq", + "name" : "w", + "access" : 8, + "descriptor" : "[B" + }, { + "field" : "__cq_a", + "owner" : "cq", + "name" : "a", + "access" : 8, + "descriptor" : "Lgr;" + }, { + "field" : "__cq_o", + "owner" : "cq", + "name" : "o", + "access" : 8, + "descriptor" : "[Lgr;" + }, { + "field" : "__cq_l", + "owner" : "cq", + "name" : "l", + "access" : 8, + "descriptor" : "I", + "decoder" : 945250525 + }, { + "field" : "__cq_n", + "owner" : "cq", + "name" : "n", + "access" : 8, + "descriptor" : "I", + "decoder" : -22568397 + }, { + "field" : "__cq_e", + "owner" : "cq", + "name" : "e", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__cq_i", + "owner" : "cq", + "name" : "i", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__cd_s", + "owner" : "cd", + "name" : "s", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__cd_z", + "owner" : "cd", + "name" : "z", + "access" : 8, + "descriptor" : "[Z" + }, { + "field" : "__cd_g", + "owner" : "cd", + "name" : "g", + "access" : 8, + "descriptor" : "[B" + }, { + "field" : "__cd_ag", + "owner" : "cd", + "name" : "ag", + "access" : 8, + "descriptor" : "[F" + }, { + "field" : "__cd_aj", + "owner" : "cd", + "name" : "aj", + "access" : 8, + "descriptor" : "[F" + }, { + "field" : "__cd_aq", + "owner" : "cd", + "name" : "aq", + "access" : 8, + "descriptor" : "[F" + }, { + "field" : "__cd_c", + "owner" : "cd", + "name" : "c", + "access" : 8, + "descriptor" : "[F" + }, { + "field" : "__cd_p", + "owner" : "cd", + "name" : "p", + "access" : 8, + "descriptor" : "[F" + }, { + "field" : "__cd_r", + "owner" : "cd", + "name" : "r", + "access" : 8, + "descriptor" : "[F" + }, { + "field" : "__cd_v", + "owner" : "cd", + "name" : "v", + "access" : 8, + "descriptor" : "[F" + }, { + "field" : "__cd_d", + "owner" : "cd", + "name" : "d", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "__cd_e", + "owner" : "cd", + "name" : "e", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "__cd_l", + "owner" : "cd", + "name" : "l", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "__cd_x", + "owner" : "cd", + "name" : "x", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "__cd_ar", + "owner" : "cd", + "name" : "ar", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__cd_av", + "owner" : "cd", + "name" : "av", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__cd_j", + "owner" : "cd", + "name" : "j", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__ca_k", + "owner" : "ca", + "name" : "k", + "access" : 8, + "descriptor" : "[Z" + }, { + "field" : "__ca_d", + "owner" : "ca", + "name" : "d", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__ca_x", + "owner" : "ca", + "name" : "x", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__ca_f", + "owner" : "ca", + "name" : "f", + "access" : 24, + "descriptor" : "[F" + }, { + "field" : "__ca_m", + "owner" : "ca", + "name" : "m", + "access" : 24, + "descriptor" : "[I" + }, { + "field" : "__di_l", + "owner" : "di", + "name" : "l", + "access" : 8, + "descriptor" : "F" + }, { + "field" : "__di_u", + "owner" : "di", + "name" : "u", + "access" : 8, + "descriptor" : "[[F" + }, { + "field" : "__di_e", + "owner" : "di", + "name" : "e", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "__di_g", + "owner" : "di", + "name" : "g", + "access" : 8, + "descriptor" : "[[I" + }, { + "field" : "__dk_lm", + "owner" : "dk", + "name" : "lm", + "access" : 8, + "descriptor" : "Lho;" + }, { + "field" : "__dk_o", + "owner" : "dk", + "name" : "o", + "access" : 8, + "descriptor" : "I", + "decoder" : -1762891465 + }, { + "field" : "__dr_ao", + "owner" : "dr", + "name" : "ao", + "access" : 8, + "descriptor" : "I", + "decoder" : -704675849 + }, { + "field" : "__dw_ab", + "owner" : "dw", + "name" : "ab", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "__dw_al", + "owner" : "dw", + "name" : "al", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__dw_aw", + "owner" : "dw", + "name" : "aw", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__dv_j", + "owner" : "dv", + "name" : "j", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__dv_s", + "owner" : "dv", + "name" : "s", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__dv_t", + "owner" : "dv", + "name" : "t", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__dv_y", + "owner" : "dv", + "name" : "y", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__dv_z", + "owner" : "dv", + "name" : "z", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__dv_b", + "owner" : "dv", + "name" : "b", + "access" : 24, + "descriptor" : "[[I" + }, { + "field" : "__dv_h", + "owner" : "dv", + "name" : "h", + "access" : 24, + "descriptor" : "[[I" + }, { + "field" : "__dz_f", + "owner" : "dz", + "name" : "f", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__dz_m", + "owner" : "dz", + "name" : "m", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__dz_q", + "owner" : "dz", + "name" : "q", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__dz_w", + "owner" : "dz", + "name" : "w", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__du_bx", + "owner" : "du", + "name" : "bx", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__du_ad", + "owner" : "du", + "name" : "ad", + "access" : 8, + "descriptor" : "[Z" + }, { + "field" : "__du_at", + "owner" : "du", + "name" : "at", + "access" : 8, + "descriptor" : "[Z" + }, { + "field" : "__du_aa", + "owner" : "du", + "name" : "aa", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__du_af", + "owner" : "du", + "name" : "af", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__du_am", + "owner" : "du", + "name" : "am", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__du_an", + "owner" : "du", + "name" : "an", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__du_au", + "owner" : "du", + "name" : "au", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__du_az", + "owner" : "du", + "name" : "az", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__du_ba", + "owner" : "du", + "name" : "ba", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__du_bb", + "owner" : "du", + "name" : "bb", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__du_bj", + "owner" : "du", + "name" : "bj", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__du_bk", + "owner" : "du", + "name" : "bk", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__du_bn", + "owner" : "du", + "name" : "bn", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__du_bq", + "owner" : "du", + "name" : "bq", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__du_br", + "owner" : "du", + "name" : "br", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__du_bs", + "owner" : "du", + "name" : "bs", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__du_ai", + "owner" : "du", + "name" : "ai", + "access" : 8, + "descriptor" : "[[I" + }, { + "field" : "__du_ax", + "owner" : "du", + "name" : "ax", + "access" : 8, + "descriptor" : "[[I" + }, { + "field" : "__dm_g", + "owner" : "dm", + "name" : "g", + "access" : 8, + "descriptor" : "I", + "decoder" : 262104267 + }, { + "field" : "__dm_k", + "owner" : "dm", + "name" : "k", + "access" : 8, + "descriptor" : "I", + "decoder" : -852671813 + }, { + "field" : "__dm_l", + "owner" : "dm", + "name" : "l", + "access" : 8, + "descriptor" : "I", + "decoder" : -2071972829 + }, { + "field" : "__dm_u", + "owner" : "dm", + "name" : "u", + "access" : 8, + "descriptor" : "I", + "decoder" : 1135175963 + }, { + "field" : "__dq_pe", + "owner" : "dq", + "name" : "pe", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__dq_rq", + "owner" : "dq", + "name" : "rq", + "access" : 8, + "descriptor" : "I", + "decoder" : 1351620693 + }, { + "field" : "__et_w", + "owner" : "et", + "name" : "w", + "access" : 9, + "descriptor" : "Z" + }, { + "field" : "__et_f", + "owner" : "et", + "name" : "f", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__et_m", + "owner" : "et", + "name" : "m", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__et_p", + "owner" : "et", + "name" : "p", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__et_r", + "owner" : "et", + "name" : "r", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__eb_ah", + "owner" : "eb", + "name" : "ah", + "access" : 8, + "descriptor" : "Lla;" + }, { + "field" : "__ek_x", + "owner" : "ek", + "name" : "x", + "access" : 8, + "descriptor" : "I", + "decoder" : 2096389021 + }, { + "field" : "__em_ab", + "owner" : "em", + "name" : "ab", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__em_ac", + "owner" : "em", + "name" : "ac", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__em_a", + "owner" : "em", + "name" : "a", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "__em_ad", + "owner" : "em", + "name" : "ad", + "access" : 8, + "descriptor" : "I" + }, { + "field" : "__em_aa", + "owner" : "em", + "name" : "aa", + "access" : 24, + "descriptor" : "[I" + }, { + "field" : "__em_af", + "owner" : "em", + "name" : "af", + "access" : 24, + "descriptor" : "[I" + }, { + "field" : "__em_ai", + "owner" : "em", + "name" : "ai", + "access" : 24, + "descriptor" : "[I" + }, { + "field" : "__em_ao", + "owner" : "em", + "name" : "ao", + "access" : 24, + "descriptor" : "[I" + }, { + "field" : "__em_au", + "owner" : "em", + "name" : "au", + "access" : 24, + "descriptor" : "[I" + }, { + "field" : "__em_ax", + "owner" : "em", + "name" : "ax", + "access" : 24, + "descriptor" : "[I" + }, { + "field" : "__em_ba", + "owner" : "em", + "name" : "ba", + "access" : 24, + "descriptor" : "[I" + }, { + "field" : "__ej_jv", + "owner" : "ej", + "name" : "jv", + "access" : 8, + "descriptor" : "Lho;" + }, { + "field" : "__el_x", + "owner" : "el", + "name" : "x", + "access" : 9, + "descriptor" : "I", + "decoder" : 422473713 + }, { + "field" : "__el_gm", + "owner" : "el", + "name" : "gm", + "access" : 8, + "descriptor" : "Lln;" + }, { + "field" : "__en_bc", + "owner" : "en", + "name" : "bc", + "access" : 8, + "descriptor" : "[Llq;" + }, { + "field" : "__eh_fy", + "owner" : "eh", + "name" : "fy", + "access" : 8, + "descriptor" : "I", + "decoder" : -457229589 + }, { + "field" : "__eo_u", + "owner" : "eo", + "name" : "u", + "access" : 8, + "descriptor" : "I", + "decoder" : -883931753 + }, { + "field" : "__eo_ak", + "owner" : "eo", + "name" : "ak", + "access" : 8, + "descriptor" : "Lla;" + }, { + "field" : "__ey_bx", + "owner" : "ey", + "name" : "bx", + "access" : 8, + "descriptor" : "[Llq;" + }, { + "field" : "__fw_nm", + "owner" : "fw", + "name" : "nm", + "access" : 8, + "descriptor" : "I", + "decoder" : 1006519291 + }, { + "field" : "__fg_jh", + "owner" : "fg", + "name" : "jh", + "access" : 8, + "descriptor" : "Lho;" + }, { + "field" : "__fh_x", + "owner" : "fh", + "name" : "x", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "__fx_w", + "owner" : "fx", + "name" : "w", + "access" : 9, + "descriptor" : "I", + "decoder" : 121013503 + }, { + "field" : "__fs_o", + "owner" : "fs", + "name" : "o", + "access" : 9, + "descriptor" : "Ljava/io/File;" + }, { + "field" : "__fs_au", + "owner" : "fs", + "name" : "au", + "access" : 8, + "descriptor" : "I", + "decoder" : 1181569415 + }, { + "field" : "__fo_m", + "owner" : "fo", + "name" : "m", + "access" : 9, + "descriptor" : "Z" + }, { + "field" : "__fo_f", + "owner" : "fo", + "name" : "f", + "access" : 9, + "descriptor" : "Ljava/io/File;" + }, { + "field" : "__fo_ro", + "owner" : "fo", + "name" : "ro", + "access" : 8, + "descriptor" : "I", + "decoder" : -852697585 + }, { + "field" : "__fo_q", + "owner" : "fo", + "name" : "q", + "access" : 8, + "descriptor" : "Ljava/util/Hashtable;" + }, { + "field" : "__fb_bm", + "owner" : "fb", + "name" : "bm", + "access" : 8, + "descriptor" : "Llq;" + }, { + "field" : "__fi_e", + "owner" : "fi", + "name" : "e", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__fi_l", + "owner" : "fi", + "name" : "l", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__fi_q", + "owner" : "fi", + "name" : "q", + "access" : 8, + "descriptor" : "[[I" + }, { + "field" : "__fi_w", + "owner" : "fi", + "name" : "w", + "access" : 8, + "descriptor" : "[[I" + }, { + "field" : "__fe_e", + "owner" : "fe", + "name" : "e", + "access" : 8, + "descriptor" : "[[[B" + }, { + "field" : "__ge_a", + "owner" : "ge", + "name" : "a", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_aa", + "owner" : "ge", + "name" : "aa", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_ab", + "owner" : "ge", + "name" : "ab", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_ac", + "owner" : "ge", + "name" : "ac", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_ad", + "owner" : "ge", + "name" : "ad", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_ae", + "owner" : "ge", + "name" : "ae", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_af", + "owner" : "ge", + "name" : "af", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_ag", + "owner" : "ge", + "name" : "ag", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_ah", + "owner" : "ge", + "name" : "ah", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_ai", + "owner" : "ge", + "name" : "ai", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_aj", + "owner" : "ge", + "name" : "aj", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_ak", + "owner" : "ge", + "name" : "ak", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_al", + "owner" : "ge", + "name" : "al", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_am", + "owner" : "ge", + "name" : "am", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_an", + "owner" : "ge", + "name" : "an", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_ao", + "owner" : "ge", + "name" : "ao", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_ap", + "owner" : "ge", + "name" : "ap", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_aq", + "owner" : "ge", + "name" : "aq", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_ar", + "owner" : "ge", + "name" : "ar", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_as", + "owner" : "ge", + "name" : "as", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_at", + "owner" : "ge", + "name" : "at", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_au", + "owner" : "ge", + "name" : "au", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_av", + "owner" : "ge", + "name" : "av", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_aw", + "owner" : "ge", + "name" : "aw", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_ax", + "owner" : "ge", + "name" : "ax", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_ay", + "owner" : "ge", + "name" : "ay", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_az", + "owner" : "ge", + "name" : "az", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_b", + "owner" : "ge", + "name" : "b", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_ba", + "owner" : "ge", + "name" : "ba", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_bb", + "owner" : "ge", + "name" : "bb", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_bc", + "owner" : "ge", + "name" : "bc", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_bd", + "owner" : "ge", + "name" : "bd", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_be", + "owner" : "ge", + "name" : "be", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_bf", + "owner" : "ge", + "name" : "bf", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_bg", + "owner" : "ge", + "name" : "bg", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_bh", + "owner" : "ge", + "name" : "bh", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_bi", + "owner" : "ge", + "name" : "bi", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_bj", + "owner" : "ge", + "name" : "bj", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_bk", + "owner" : "ge", + "name" : "bk", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_bl", + "owner" : "ge", + "name" : "bl", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_bm", + "owner" : "ge", + "name" : "bm", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_bn", + "owner" : "ge", + "name" : "bn", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_bo", + "owner" : "ge", + "name" : "bo", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_bp", + "owner" : "ge", + "name" : "bp", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_bq", + "owner" : "ge", + "name" : "bq", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_br", + "owner" : "ge", + "name" : "br", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_bs", + "owner" : "ge", + "name" : "bs", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_bt", + "owner" : "ge", + "name" : "bt", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_bu", + "owner" : "ge", + "name" : "bu", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_bv", + "owner" : "ge", + "name" : "bv", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_bw", + "owner" : "ge", + "name" : "bw", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_bx", + "owner" : "ge", + "name" : "bx", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_by", + "owner" : "ge", + "name" : "by", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_bz", + "owner" : "ge", + "name" : "bz", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_c", + "owner" : "ge", + "name" : "c", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_ce", + "owner" : "ge", + "name" : "ce", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_cj", + "owner" : "ge", + "name" : "cj", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_cm", + "owner" : "ge", + "name" : "cm", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_cr", + "owner" : "ge", + "name" : "cr", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_cs", + "owner" : "ge", + "name" : "cs", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_cv", + "owner" : "ge", + "name" : "cv", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_cy", + "owner" : "ge", + "name" : "cy", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_d", + "owner" : "ge", + "name" : "d", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_e", + "owner" : "ge", + "name" : "e", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_f", + "owner" : "ge", + "name" : "f", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_g", + "owner" : "ge", + "name" : "g", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_h", + "owner" : "ge", + "name" : "h", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_i", + "owner" : "ge", + "name" : "i", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_j", + "owner" : "ge", + "name" : "j", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_k", + "owner" : "ge", + "name" : "k", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_l", + "owner" : "ge", + "name" : "l", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_m", + "owner" : "ge", + "name" : "m", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_n", + "owner" : "ge", + "name" : "n", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_o", + "owner" : "ge", + "name" : "o", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_p", + "owner" : "ge", + "name" : "p", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_q", + "owner" : "ge", + "name" : "q", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_r", + "owner" : "ge", + "name" : "r", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_s", + "owner" : "ge", + "name" : "s", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_t", + "owner" : "ge", + "name" : "t", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_u", + "owner" : "ge", + "name" : "u", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_v", + "owner" : "ge", + "name" : "v", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_w", + "owner" : "ge", + "name" : "w", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_x", + "owner" : "ge", + "name" : "x", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_y", + "owner" : "ge", + "name" : "y", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__ge_z", + "owner" : "ge", + "name" : "z", + "access" : 25, + "descriptor" : "Lge;" + }, { + "field" : "__gs_a", + "owner" : "gs", + "name" : "a", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_aa", + "owner" : "gs", + "name" : "aa", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_ab", + "owner" : "gs", + "name" : "ab", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_ac", + "owner" : "gs", + "name" : "ac", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_ad", + "owner" : "gs", + "name" : "ad", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_ae", + "owner" : "gs", + "name" : "ae", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_af", + "owner" : "gs", + "name" : "af", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_ag", + "owner" : "gs", + "name" : "ag", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_ah", + "owner" : "gs", + "name" : "ah", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_ai", + "owner" : "gs", + "name" : "ai", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_aj", + "owner" : "gs", + "name" : "aj", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_ak", + "owner" : "gs", + "name" : "ak", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_al", + "owner" : "gs", + "name" : "al", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_an", + "owner" : "gs", + "name" : "an", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_ao", + "owner" : "gs", + "name" : "ao", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_ap", + "owner" : "gs", + "name" : "ap", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_aq", + "owner" : "gs", + "name" : "aq", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_ar", + "owner" : "gs", + "name" : "ar", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_as", + "owner" : "gs", + "name" : "as", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_at", + "owner" : "gs", + "name" : "at", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_au", + "owner" : "gs", + "name" : "au", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_av", + "owner" : "gs", + "name" : "av", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_aw", + "owner" : "gs", + "name" : "aw", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_ax", + "owner" : "gs", + "name" : "ax", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_ay", + "owner" : "gs", + "name" : "ay", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_az", + "owner" : "gs", + "name" : "az", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_b", + "owner" : "gs", + "name" : "b", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_ba", + "owner" : "gs", + "name" : "ba", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_bb", + "owner" : "gs", + "name" : "bb", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_bc", + "owner" : "gs", + "name" : "bc", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_bd", + "owner" : "gs", + "name" : "bd", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_be", + "owner" : "gs", + "name" : "be", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_bf", + "owner" : "gs", + "name" : "bf", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_bg", + "owner" : "gs", + "name" : "bg", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_bh", + "owner" : "gs", + "name" : "bh", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_bi", + "owner" : "gs", + "name" : "bi", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_bj", + "owner" : "gs", + "name" : "bj", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_bk", + "owner" : "gs", + "name" : "bk", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_bl", + "owner" : "gs", + "name" : "bl", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_bm", + "owner" : "gs", + "name" : "bm", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_bn", + "owner" : "gs", + "name" : "bn", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_bo", + "owner" : "gs", + "name" : "bo", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_bp", + "owner" : "gs", + "name" : "bp", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_bq", + "owner" : "gs", + "name" : "bq", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_br", + "owner" : "gs", + "name" : "br", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_bs", + "owner" : "gs", + "name" : "bs", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_bt", + "owner" : "gs", + "name" : "bt", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_bu", + "owner" : "gs", + "name" : "bu", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_bv", + "owner" : "gs", + "name" : "bv", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_bw", + "owner" : "gs", + "name" : "bw", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_bx", + "owner" : "gs", + "name" : "bx", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_by", + "owner" : "gs", + "name" : "by", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_bz", + "owner" : "gs", + "name" : "bz", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_c", + "owner" : "gs", + "name" : "c", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_cb", + "owner" : "gs", + "name" : "cb", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_cc", + "owner" : "gs", + "name" : "cc", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_ce", + "owner" : "gs", + "name" : "ce", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_cf", + "owner" : "gs", + "name" : "cf", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_cg", + "owner" : "gs", + "name" : "cg", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_ch", + "owner" : "gs", + "name" : "ch", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_cj", + "owner" : "gs", + "name" : "cj", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_ck", + "owner" : "gs", + "name" : "ck", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_cl", + "owner" : "gs", + "name" : "cl", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_cm", + "owner" : "gs", + "name" : "cm", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_cn", + "owner" : "gs", + "name" : "cn", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_cp", + "owner" : "gs", + "name" : "cp", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_cq", + "owner" : "gs", + "name" : "cq", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_cr", + "owner" : "gs", + "name" : "cr", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_cs", + "owner" : "gs", + "name" : "cs", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_ct", + "owner" : "gs", + "name" : "ct", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_cu", + "owner" : "gs", + "name" : "cu", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_cv", + "owner" : "gs", + "name" : "cv", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_cw", + "owner" : "gs", + "name" : "cw", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_cy", + "owner" : "gs", + "name" : "cy", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_cz", + "owner" : "gs", + "name" : "cz", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_d", + "owner" : "gs", + "name" : "d", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_e", + "owner" : "gs", + "name" : "e", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_f", + "owner" : "gs", + "name" : "f", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_g", + "owner" : "gs", + "name" : "g", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_h", + "owner" : "gs", + "name" : "h", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_i", + "owner" : "gs", + "name" : "i", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_j", + "owner" : "gs", + "name" : "j", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_k", + "owner" : "gs", + "name" : "k", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_l", + "owner" : "gs", + "name" : "l", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_m", + "owner" : "gs", + "name" : "m", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_n", + "owner" : "gs", + "name" : "n", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_o", + "owner" : "gs", + "name" : "o", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_p", + "owner" : "gs", + "name" : "p", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_q", + "owner" : "gs", + "name" : "q", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_r", + "owner" : "gs", + "name" : "r", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_s", + "owner" : "gs", + "name" : "s", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_t", + "owner" : "gs", + "name" : "t", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_u", + "owner" : "gs", + "name" : "u", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_v", + "owner" : "gs", + "name" : "v", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_w", + "owner" : "gs", + "name" : "w", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_x", + "owner" : "gs", + "name" : "x", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_y", + "owner" : "gs", + "name" : "y", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_z", + "owner" : "gs", + "name" : "z", + "access" : 25, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_qh", + "owner" : "gs", + "name" : "qh", + "access" : 8, + "descriptor" : "I", + "decoder" : 1076448827 + }, { + "field" : "__gs_am", + "owner" : "gs", + "name" : "am", + "access" : 24, + "descriptor" : "Lgs;" + }, { + "field" : "__gs_ci", + "owner" : "gs", + "name" : "ci", + "access" : 24, + "descriptor" : "Lgs;" + }, { + "field" : "__gl_m", + "owner" : "gl", + "name" : "m", + "access" : 25, + "descriptor" : "Lgl;" + }, { + "field" : "__gl_q", + "owner" : "gl", + "name" : "q", + "access" : 25, + "descriptor" : "Lgl;" + }, { + "field" : "__gl_w", + "owner" : "gl", + "name" : "w", + "access" : 25, + "descriptor" : "Lgl;" + }, { + "field" : "__gl_f", + "owner" : "gl", + "name" : "f", + "access" : 24, + "descriptor" : "Lgl;" + }, { + "field" : "__gl_o", + "owner" : "gl", + "name" : "o", + "access" : 24, + "descriptor" : "Lgl;" + }, { + "field" : "__gl_g", + "owner" : "gl", + "name" : "g", + "access" : 24, + "descriptor" : "[Lgl;" + }, { + "field" : "__gg_u", + "owner" : "gg", + "name" : "u", + "access" : 9, + "descriptor" : "I", + "decoder" : -1583654139 + }, { + "field" : "__gd_e", + "owner" : "gd", + "name" : "e", + "access" : 8, + "descriptor" : "[[I" + }, { + "field" : "__go_ck", + "owner" : "go", + "name" : "ck", + "access" : 9, + "descriptor" : "C" + }, { + "field" : "__gr_q", + "owner" : "gr", + "name" : "q", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__gr_o", + "owner" : "gr", + "name" : "o", + "access" : 8, + "descriptor" : "[J" + }, { + "field" : "__gi_g", + "owner" : "gi", + "name" : "g", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__gx_n", + "owner" : "gx", + "name" : "n", + "access" : 9, + "descriptor" : "Lkk;" + }, { + "field" : "__gx_d", + "owner" : "gx", + "name" : "d", + "access" : 24, + "descriptor" : "[I" + }, { + "field" : "__gx_x", + "owner" : "gx", + "name" : "x", + "access" : 24, + "descriptor" : "[I" + }, { + "field" : "__gu_et", + "owner" : "gu", + "name" : "et", + "access" : 8, + "descriptor" : "Lit;" + }, { + "field" : "__hx_z", + "owner" : "hx", + "name" : "z", + "access" : 9, + "descriptor" : "I", + "decoder" : 701739159 + }, { + "field" : "__hg_q", + "owner" : "hg", + "name" : "q", + "access" : 8, + "descriptor" : "Ljava/util/Calendar;" + }, { + "field" : "__hg_f", + "owner" : "hg", + "name" : "f", + "access" : 24, + "descriptor" : "[Ljava/lang/String;" + }, { + "field" : "__hg_m", + "owner" : "hg", + "name" : "m", + "access" : 24, + "descriptor" : "[[Ljava/lang/String;" + }, { + "field" : "__hd_fc", + "owner" : "hd", + "name" : "fc", + "access" : 8, + "descriptor" : "J", + "decoder" : -6780258776884306463 + }, { + "field" : "__hf_o", + "owner" : "hf", + "name" : "o", + "access" : 9, + "descriptor" : "I", + "decoder" : -848833001 + }, { + "field" : "__hf_f", + "owner" : "hf", + "name" : "f", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "__hf_q", + "owner" : "hf", + "name" : "q", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "__hf_u", + "owner" : "hf", + "name" : "u", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "__hf_k", + "owner" : "hf", + "name" : "k", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__hs_x", + "owner" : "hs", + "name" : "x", + "access" : 24, + "descriptor" : "[B" + }, { + "field" : "__hq_qg", + "owner" : "hq", + "name" : "qg", + "access" : 8, + "descriptor" : "I", + "decoder" : -1367955455 + }, { + "field" : "__hv_h", + "owner" : "hv", + "name" : "h", + "access" : 8, + "descriptor" : "I", + "decoder" : 120772859 + }, { + "field" : "__hi_g", + "owner" : "hi", + "name" : "g", + "access" : 9, + "descriptor" : "[S" + }, { + "field" : "__hi_d", + "owner" : "hi", + "name" : "d", + "access" : 24, + "descriptor" : "[I" + }, { + "field" : "__ht_m", + "owner" : "ht", + "name" : "m", + "access" : 25, + "descriptor" : "[S" + }, { + "field" : "__ht_q", + "owner" : "ht", + "name" : "q", + "access" : 25, + "descriptor" : "[S" + }, { + "field" : "__ht_f", + "owner" : "ht", + "name" : "f", + "access" : 25, + "descriptor" : "[[S" + }, { + "field" : "__ht_w", + "owner" : "ht", + "name" : "w", + "access" : 25, + "descriptor" : "[[S" + }, { + "field" : "__hj_e", + "owner" : "hj", + "name" : "e", + "access" : 9, + "descriptor" : "[S" + }, { + "field" : "__ho_j", + "owner" : "ho", + "name" : "j", + "access" : 9, + "descriptor" : "Z" + }, { + "field" : "__ho_d", + "owner" : "ho", + "name" : "d", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "__ho_n", + "owner" : "ho", + "name" : "n", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "__ho_z", + "owner" : "ho", + "name" : "z", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "__hz_l", + "owner" : "hz", + "name" : "l", + "access" : 9, + "descriptor" : "[[S" + }, { + "field" : "__hy_az", + "owner" : "hy", + "name" : "az", + "access" : 12, + "descriptor" : "Z" + }, { + "field" : "__hb_sg", + "owner" : "hb", + "name" : "sg", + "access" : 8, + "descriptor" : "I", + "decoder" : -745071109 + }, { + "field" : "__hb_av", + "owner" : "hb", + "name" : "av", + "access" : 8, + "descriptor" : "Ljava/awt/Font;" + }, { + "field" : "__hc_ef", + "owner" : "hc", + "name" : "ef", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__id_aa", + "owner" : "id", + "name" : "aa", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ad", + "owner" : "id", + "name" : "ad", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ae", + "owner" : "id", + "name" : "ae", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_af", + "owner" : "id", + "name" : "af", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ai", + "owner" : "id", + "name" : "ai", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_am", + "owner" : "id", + "name" : "am", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_an", + "owner" : "id", + "name" : "an", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ao", + "owner" : "id", + "name" : "ao", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ap", + "owner" : "id", + "name" : "ap", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_as", + "owner" : "id", + "name" : "as", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_at", + "owner" : "id", + "name" : "at", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_au", + "owner" : "id", + "name" : "au", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ax", + "owner" : "id", + "name" : "ax", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_az", + "owner" : "id", + "name" : "az", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ba", + "owner" : "id", + "name" : "ba", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_bb", + "owner" : "id", + "name" : "bb", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_bc", + "owner" : "id", + "name" : "bc", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_bd", + "owner" : "id", + "name" : "bd", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_be", + "owner" : "id", + "name" : "be", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_bf", + "owner" : "id", + "name" : "bf", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_bg", + "owner" : "id", + "name" : "bg", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_bh", + "owner" : "id", + "name" : "bh", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_bi", + "owner" : "id", + "name" : "bi", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_bj", + "owner" : "id", + "name" : "bj", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_bk", + "owner" : "id", + "name" : "bk", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_bl", + "owner" : "id", + "name" : "bl", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_bm", + "owner" : "id", + "name" : "bm", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_bn", + "owner" : "id", + "name" : "bn", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_bo", + "owner" : "id", + "name" : "bo", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_bp", + "owner" : "id", + "name" : "bp", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_bq", + "owner" : "id", + "name" : "bq", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_br", + "owner" : "id", + "name" : "br", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_bs", + "owner" : "id", + "name" : "bs", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_bt", + "owner" : "id", + "name" : "bt", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_bu", + "owner" : "id", + "name" : "bu", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_bv", + "owner" : "id", + "name" : "bv", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_bw", + "owner" : "id", + "name" : "bw", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_bx", + "owner" : "id", + "name" : "bx", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_by", + "owner" : "id", + "name" : "by", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_bz", + "owner" : "id", + "name" : "bz", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ca", + "owner" : "id", + "name" : "ca", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_cb", + "owner" : "id", + "name" : "cb", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_cc", + "owner" : "id", + "name" : "cc", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_cd", + "owner" : "id", + "name" : "cd", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ce", + "owner" : "id", + "name" : "ce", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_cf", + "owner" : "id", + "name" : "cf", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_cg", + "owner" : "id", + "name" : "cg", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ch", + "owner" : "id", + "name" : "ch", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ci", + "owner" : "id", + "name" : "ci", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_cj", + "owner" : "id", + "name" : "cj", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ck", + "owner" : "id", + "name" : "ck", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_cl", + "owner" : "id", + "name" : "cl", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_cm", + "owner" : "id", + "name" : "cm", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_cn", + "owner" : "id", + "name" : "cn", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_co", + "owner" : "id", + "name" : "co", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_cp", + "owner" : "id", + "name" : "cp", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_cq", + "owner" : "id", + "name" : "cq", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_cr", + "owner" : "id", + "name" : "cr", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_cs", + "owner" : "id", + "name" : "cs", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ct", + "owner" : "id", + "name" : "ct", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_cu", + "owner" : "id", + "name" : "cu", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_cv", + "owner" : "id", + "name" : "cv", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_cw", + "owner" : "id", + "name" : "cw", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_cx", + "owner" : "id", + "name" : "cx", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_cy", + "owner" : "id", + "name" : "cy", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_cz", + "owner" : "id", + "name" : "cz", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_d", + "owner" : "id", + "name" : "d", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_da", + "owner" : "id", + "name" : "da", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_db", + "owner" : "id", + "name" : "db", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_dc", + "owner" : "id", + "name" : "dc", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_dd", + "owner" : "id", + "name" : "dd", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_de", + "owner" : "id", + "name" : "de", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_df", + "owner" : "id", + "name" : "df", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_dg", + "owner" : "id", + "name" : "dg", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_di", + "owner" : "id", + "name" : "di", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_dj", + "owner" : "id", + "name" : "dj", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_dk", + "owner" : "id", + "name" : "dk", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_dl", + "owner" : "id", + "name" : "dl", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_dm", + "owner" : "id", + "name" : "dm", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_dn", + "owner" : "id", + "name" : "dn", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_do", + "owner" : "id", + "name" : "do", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_dp", + "owner" : "id", + "name" : "dp", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_dq", + "owner" : "id", + "name" : "dq", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_dr", + "owner" : "id", + "name" : "dr", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ds", + "owner" : "id", + "name" : "ds", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_dt", + "owner" : "id", + "name" : "dt", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_du", + "owner" : "id", + "name" : "du", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_dv", + "owner" : "id", + "name" : "dv", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_dx", + "owner" : "id", + "name" : "dx", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_dy", + "owner" : "id", + "name" : "dy", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_dz", + "owner" : "id", + "name" : "dz", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_eb", + "owner" : "id", + "name" : "eb", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ec", + "owner" : "id", + "name" : "ec", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ed", + "owner" : "id", + "name" : "ed", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ee", + "owner" : "id", + "name" : "ee", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ef", + "owner" : "id", + "name" : "ef", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_eh", + "owner" : "id", + "name" : "eh", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ei", + "owner" : "id", + "name" : "ei", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ej", + "owner" : "id", + "name" : "ej", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ek", + "owner" : "id", + "name" : "ek", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_el", + "owner" : "id", + "name" : "el", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_em", + "owner" : "id", + "name" : "em", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_en", + "owner" : "id", + "name" : "en", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_eo", + "owner" : "id", + "name" : "eo", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_eq", + "owner" : "id", + "name" : "eq", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_er", + "owner" : "id", + "name" : "er", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_et", + "owner" : "id", + "name" : "et", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_eu", + "owner" : "id", + "name" : "eu", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ev", + "owner" : "id", + "name" : "ev", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ew", + "owner" : "id", + "name" : "ew", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ex", + "owner" : "id", + "name" : "ex", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ey", + "owner" : "id", + "name" : "ey", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_fa", + "owner" : "id", + "name" : "fa", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_fb", + "owner" : "id", + "name" : "fb", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ff", + "owner" : "id", + "name" : "ff", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_fk", + "owner" : "id", + "name" : "fk", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_fm", + "owner" : "id", + "name" : "fm", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_fn", + "owner" : "id", + "name" : "fn", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_fs", + "owner" : "id", + "name" : "fs", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_fv", + "owner" : "id", + "name" : "fv", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_fx", + "owner" : "id", + "name" : "fx", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_fz", + "owner" : "id", + "name" : "fz", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ga", + "owner" : "id", + "name" : "ga", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gb", + "owner" : "id", + "name" : "gb", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gc", + "owner" : "id", + "name" : "gc", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gd", + "owner" : "id", + "name" : "gd", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ge", + "owner" : "id", + "name" : "ge", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gf", + "owner" : "id", + "name" : "gf", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gg", + "owner" : "id", + "name" : "gg", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gh", + "owner" : "id", + "name" : "gh", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gi", + "owner" : "id", + "name" : "gi", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gj", + "owner" : "id", + "name" : "gj", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gk", + "owner" : "id", + "name" : "gk", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gl", + "owner" : "id", + "name" : "gl", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gm", + "owner" : "id", + "name" : "gm", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gn", + "owner" : "id", + "name" : "gn", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_go", + "owner" : "id", + "name" : "go", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gp", + "owner" : "id", + "name" : "gp", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gq", + "owner" : "id", + "name" : "gq", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gr", + "owner" : "id", + "name" : "gr", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gs", + "owner" : "id", + "name" : "gs", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gt", + "owner" : "id", + "name" : "gt", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gu", + "owner" : "id", + "name" : "gu", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gv", + "owner" : "id", + "name" : "gv", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gw", + "owner" : "id", + "name" : "gw", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gx", + "owner" : "id", + "name" : "gx", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gy", + "owner" : "id", + "name" : "gy", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_gz", + "owner" : "id", + "name" : "gz", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ha", + "owner" : "id", + "name" : "ha", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_hb", + "owner" : "id", + "name" : "hb", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_hc", + "owner" : "id", + "name" : "hc", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_hd", + "owner" : "id", + "name" : "hd", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_hf", + "owner" : "id", + "name" : "hf", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_hg", + "owner" : "id", + "name" : "hg", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_hh", + "owner" : "id", + "name" : "hh", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_hk", + "owner" : "id", + "name" : "hk", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_hm", + "owner" : "id", + "name" : "hm", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_hn", + "owner" : "id", + "name" : "hn", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_hr", + "owner" : "id", + "name" : "hr", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_hs", + "owner" : "id", + "name" : "hs", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_hx", + "owner" : "id", + "name" : "hx", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_hy", + "owner" : "id", + "name" : "hy", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ia", + "owner" : "id", + "name" : "ia", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ib", + "owner" : "id", + "name" : "ib", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ic", + "owner" : "id", + "name" : "ic", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_id", + "owner" : "id", + "name" : "id", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ig", + "owner" : "id", + "name" : "ig", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ih", + "owner" : "id", + "name" : "ih", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ii", + "owner" : "id", + "name" : "ii", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ik", + "owner" : "id", + "name" : "ik", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_im", + "owner" : "id", + "name" : "im", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_io", + "owner" : "id", + "name" : "io", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ip", + "owner" : "id", + "name" : "ip", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_iq", + "owner" : "id", + "name" : "iq", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ir", + "owner" : "id", + "name" : "ir", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_it", + "owner" : "id", + "name" : "it", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_iu", + "owner" : "id", + "name" : "iu", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_iv", + "owner" : "id", + "name" : "iv", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_iw", + "owner" : "id", + "name" : "iw", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ix", + "owner" : "id", + "name" : "ix", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ja", + "owner" : "id", + "name" : "ja", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_jb", + "owner" : "id", + "name" : "jb", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_jc", + "owner" : "id", + "name" : "jc", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_jd", + "owner" : "id", + "name" : "jd", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_je", + "owner" : "id", + "name" : "je", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_jf", + "owner" : "id", + "name" : "jf", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_jg", + "owner" : "id", + "name" : "jg", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_jh", + "owner" : "id", + "name" : "jh", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ji", + "owner" : "id", + "name" : "ji", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_jj", + "owner" : "id", + "name" : "jj", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_jk", + "owner" : "id", + "name" : "jk", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_jl", + "owner" : "id", + "name" : "jl", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_jm", + "owner" : "id", + "name" : "jm", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_jn", + "owner" : "id", + "name" : "jn", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_jo", + "owner" : "id", + "name" : "jo", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_jp", + "owner" : "id", + "name" : "jp", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_jq", + "owner" : "id", + "name" : "jq", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_jr", + "owner" : "id", + "name" : "jr", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_js", + "owner" : "id", + "name" : "js", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_jt", + "owner" : "id", + "name" : "jt", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ju", + "owner" : "id", + "name" : "ju", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_jv", + "owner" : "id", + "name" : "jv", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_jw", + "owner" : "id", + "name" : "jw", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_jx", + "owner" : "id", + "name" : "jx", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_jy", + "owner" : "id", + "name" : "jy", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_jz", + "owner" : "id", + "name" : "jz", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_kd", + "owner" : "id", + "name" : "kd", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ke", + "owner" : "id", + "name" : "ke", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_kf", + "owner" : "id", + "name" : "kf", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_kg", + "owner" : "id", + "name" : "kg", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_kj", + "owner" : "id", + "name" : "kj", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_km", + "owner" : "id", + "name" : "km", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_kp", + "owner" : "id", + "name" : "kp", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ks", + "owner" : "id", + "name" : "ks", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_kv", + "owner" : "id", + "name" : "kv", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ky", + "owner" : "id", + "name" : "ky", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_l", + "owner" : "id", + "name" : "l", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_x", + "owner" : "id", + "name" : "x", + "access" : 9, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__id_ab", + "owner" : "id", + "name" : "ab", + "access" : 8, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__ij_ak", + "owner" : "ij", + "name" : "ak", + "access" : 8, + "descriptor" : "Ljava/awt/Image;" + }, { + "field" : "__iy_f", + "owner" : "iy", + "name" : "f", + "access" : 25, + "descriptor" : "Liy;" + }, { + "field" : "__iy_m", + "owner" : "iy", + "name" : "m", + "access" : 25, + "descriptor" : "Liy;" + }, { + "field" : "__iy_q", + "owner" : "iy", + "name" : "q", + "access" : 25, + "descriptor" : "Liy;" + }, { + "field" : "__iy_w", + "owner" : "iy", + "name" : "w", + "access" : 25, + "descriptor" : "Liy;" + }, { + "field" : "__iy_lo", + "owner" : "iy", + "name" : "lo", + "access" : 8, + "descriptor" : "I", + "decoder" : -365366303 + }, { + "field" : "__is_u", + "owner" : "is", + "name" : "u", + "access" : 25, + "descriptor" : "Lis;" + }, { + "field" : "__is_f", + "owner" : "is", + "name" : "f", + "access" : 24, + "descriptor" : "Lis;" + }, { + "field" : "__is_m", + "owner" : "is", + "name" : "m", + "access" : 24, + "descriptor" : "Lis;" + }, { + "field" : "__is_o", + "owner" : "is", + "name" : "o", + "access" : 24, + "descriptor" : "Lis;" + }, { + "field" : "__is_q", + "owner" : "is", + "name" : "q", + "access" : 24, + "descriptor" : "Lis;" + }, { + "field" : "__is_w", + "owner" : "is", + "name" : "w", + "access" : 24, + "descriptor" : "Lis;" + }, { + "field" : "__ik_cn", + "owner" : "ik", + "name" : "cn", + "access" : 9, + "descriptor" : "I", + "decoder" : -1753937079 + }, { + "field" : "__ik_rt", + "owner" : "ik", + "name" : "rt", + "access" : 8, + "descriptor" : "I", + "decoder" : -1086790653 + }, { + "field" : "__ir_bu", + "owner" : "ir", + "name" : "bu", + "access" : 8, + "descriptor" : "I", + "decoder" : 334735939 + }, { + "field" : "__ir_s", + "owner" : "ir", + "name" : "s", + "access" : 8, + "descriptor" : "I", + "decoder" : -244224193 + }, { + "field" : "__iv_q", + "owner" : "iv", + "name" : "q", + "access" : 8, + "descriptor" : "I", + "decoder" : -1282224505 + }, { + "field" : "__iq_b", + "owner" : "iq", + "name" : "b", + "access" : 9, + "descriptor" : "B" + }, { + "field" : "__iq_f", + "owner" : "iq", + "name" : "f", + "access" : 9, + "descriptor" : "I", + "decoder" : 948359621 + }, { + "field" : "__iq_j", + "owner" : "iq", + "name" : "j", + "access" : 9, + "descriptor" : "I", + "decoder" : 840549915 + }, { + "field" : "__iq_q", + "owner" : "iq", + "name" : "q", + "access" : 9, + "descriptor" : "J", + "decoder" : -4580427166942649525 + }, { + "field" : "__iu_n", + "owner" : "iu", + "name" : "n", + "access" : 8, + "descriptor" : "I", + "decoder" : 662119345 + }, { + "field" : "__iu_e", + "owner" : "iu", + "name" : "e", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__ib_f", + "owner" : "ib", + "name" : "f", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "__ix_f", + "owner" : "ix", + "name" : "f", + "access" : 9, + "descriptor" : "I", + "decoder" : 510774535 + }, { + "field" : "__ix_m", + "owner" : "ix", + "name" : "m", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "__ic_m", + "owner" : "ic", + "name" : "m", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "__iw_f", + "owner" : "iw", + "name" : "f", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "__iw_m", + "owner" : "iw", + "name" : "m", + "access" : 8, + "descriptor" : "Lir;" + }, { + "field" : "__im_q", + "owner" : "im", + "name" : "q", + "access" : 9, + "descriptor" : "I", + "decoder" : 235389995 + }, { + "field" : "__im_f", + "owner" : "im", + "name" : "f", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "__ii_f", + "owner" : "ii", + "name" : "f", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "__ii_m", + "owner" : "ii", + "name" : "m", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "__ia_u", + "owner" : "ia", + "name" : "u", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__jb_m", + "owner" : "jb", + "name" : "m", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "__jq_f", + "owner" : "jq", + "name" : "f", + "access" : 9, + "descriptor" : "Ler;" + }, { + "field" : "__jq_m", + "owner" : "jq", + "name" : "m", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "__jm_o", + "owner" : "jm", + "name" : "o", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "__jm_f", + "owner" : "jm", + "name" : "f", + "access" : 8, + "descriptor" : "Lir;" + }, { + "field" : "__jm_m", + "owner" : "jm", + "name" : "m", + "access" : 8, + "descriptor" : "Lir;" + }, { + "field" : "__jm_q", + "owner" : "jm", + "name" : "q", + "access" : 8, + "descriptor" : "Lir;" + }, { + "field" : "__jr_o", + "owner" : "jr", + "name" : "o", + "access" : 9, + "descriptor" : "Ler;" + }, { + "field" : "__jr_l", + "owner" : "jr", + "name" : "l", + "access" : 8, + "descriptor" : "[Ldw;" + }, { + "field" : "__jr_u", + "owner" : "jr", + "name" : "u", + "access" : 8, + "descriptor" : "Ler;" + }, { + "field" : "__jr_q", + "owner" : "jr", + "name" : "q", + "access" : 8, + "descriptor" : "Lir;" + }, { + "field" : "__jf_f", + "owner" : "jf", + "name" : "f", + "access" : 9, + "descriptor" : "Ler;" + }, { + "field" : "__jf_m", + "owner" : "jf", + "name" : "m", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "__jh_o", + "owner" : "jh", + "name" : "o", + "access" : 9, + "descriptor" : "Ler;" + }, { + "field" : "__jh_f", + "owner" : "jh", + "name" : "f", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "__jh_q", + "owner" : "jh", + "name" : "q", + "access" : 9, + "descriptor" : "Lir;" + }, { + "field" : "__jn_by", + "owner" : "jn", + "name" : "by", + "access" : 8, + "descriptor" : "Llq;" + }, { + "field" : "__jx_ne", + "owner" : "jx", + "name" : "ne", + "access" : 8, + "descriptor" : "[Lho;" + }, { + "field" : "__ji_i", + "owner" : "ji", + "name" : "i", + "access" : 25, + "descriptor" : "Lji;" + }, { + "field" : "__ji_n", + "owner" : "ji", + "name" : "n", + "access" : 25, + "descriptor" : "Lji;" + }, { + "field" : "__ji_fp", + "owner" : "ji", + "name" : "fp", + "access" : 8, + "descriptor" : "Lfu;" + }, { + "field" : "__ji_a", + "owner" : "ji", + "name" : "a", + "access" : 24, + "descriptor" : "Lji;" + }, { + "field" : "__ji_d", + "owner" : "ji", + "name" : "d", + "access" : 24, + "descriptor" : "Lji;" + }, { + "field" : "__ji_e", + "owner" : "ji", + "name" : "e", + "access" : 24, + "descriptor" : "Lji;" + }, { + "field" : "__ji_f", + "owner" : "ji", + "name" : "f", + "access" : 24, + "descriptor" : "Lji;" + }, { + "field" : "__ji_g", + "owner" : "ji", + "name" : "g", + "access" : 24, + "descriptor" : "Lji;" + }, { + "field" : "__ji_j", + "owner" : "ji", + "name" : "j", + "access" : 24, + "descriptor" : "Lji;" + }, { + "field" : "__ji_k", + "owner" : "ji", + "name" : "k", + "access" : 24, + "descriptor" : "Lji;" + }, { + "field" : "__ji_l", + "owner" : "ji", + "name" : "l", + "access" : 24, + "descriptor" : "Lji;" + }, { + "field" : "__ji_m", + "owner" : "ji", + "name" : "m", + "access" : 24, + "descriptor" : "Lji;" + }, { + "field" : "__ji_o", + "owner" : "ji", + "name" : "o", + "access" : 24, + "descriptor" : "Lji;" + }, { + "field" : "__ji_q", + "owner" : "ji", + "name" : "q", + "access" : 24, + "descriptor" : "Lji;" + }, { + "field" : "__ji_s", + "owner" : "ji", + "name" : "s", + "access" : 24, + "descriptor" : "Lji;" + }, { + "field" : "__ji_t", + "owner" : "ji", + "name" : "t", + "access" : 24, + "descriptor" : "Lji;" + }, { + "field" : "__ji_u", + "owner" : "ji", + "name" : "u", + "access" : 24, + "descriptor" : "Lji;" + }, { + "field" : "__ji_w", + "owner" : "ji", + "name" : "w", + "access" : 24, + "descriptor" : "Lji;" + }, { + "field" : "__ji_x", + "owner" : "ji", + "name" : "x", + "access" : 24, + "descriptor" : "Lji;" + }, { + "field" : "__ji_z", + "owner" : "ji", + "name" : "z", + "access" : 24, + "descriptor" : "Lji;" + }, { + "field" : "__ks_at", + "owner" : "ks", + "name" : "at", + "access" : 12, + "descriptor" : "Ljava/lang/String;" + }, { + "field" : "__kn_x", + "owner" : "kn", + "name" : "x", + "access" : 8, + "descriptor" : "Ley;" + }, { + "field" : "__kz_o", + "owner" : "kz", + "name" : "o", + "access" : 8, + "descriptor" : "[[[B" + }, { + "field" : "__kz_l", + "owner" : "kz", + "name" : "l", + "access" : 8, + "descriptor" : "Lln;" + }, { + "field" : "__kb_q", + "owner" : "kb", + "name" : "q", + "access" : 24, + "descriptor" : "[C" + }, { + "field" : "__kb_w", + "owner" : "kb", + "name" : "w", + "access" : 24, + "descriptor" : "[C" + }, { + "field" : "__kc_m", + "owner" : "kc", + "name" : "m", + "access" : 9, + "descriptor" : "[C" + }, { + "field" : "__kc_g", + "owner" : "kc", + "name" : "g", + "access" : 8, + "descriptor" : "[[[B" + }, { + "field" : "__kc_f", + "owner" : "kc", + "name" : "f", + "access" : 8, + "descriptor" : "[C" + }, { + "field" : "__kc_q", + "owner" : "kc", + "name" : "q", + "access" : 8, + "descriptor" : "[C" + }, { + "field" : "__kc_w", + "owner" : "kc", + "name" : "w", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__kw_n", + "owner" : "kw", + "name" : "n", + "access" : 8, + "descriptor" : "Llq;" + }, { + "field" : "__ka_e", + "owner" : "ka", + "name" : "e", + "access" : 8, + "descriptor" : "I", + "decoder" : -2077113503 + }, { + "field" : "__lp_ca", + "owner" : "lp", + "name" : "ca", + "access" : 8, + "descriptor" : "Z" + }, { + "field" : "__lj_m", + "owner" : "lj", + "name" : "m", + "access" : 25, + "descriptor" : "Llj;" + }, { + "field" : "__lj_f", + "owner" : "lj", + "name" : "f", + "access" : 24, + "descriptor" : "Llj;" + }, { + "field" : "__lj_q", + "owner" : "lj", + "name" : "q", + "access" : 24, + "descriptor" : "Llj;" + }, { + "field" : "__lr_e", + "owner" : "lr", + "name" : "e", + "access" : 8, + "descriptor" : "[[B" + }, { + "field" : "__lr_f", + "owner" : "lr", + "name" : "f", + "access" : 8, + "descriptor" : "I", + "decoder" : 161627197 + }, { + "field" : "__lr_m", + "owner" : "lr", + "name" : "m", + "access" : 8, + "descriptor" : "I", + "decoder" : -1119867679 + }, { + "field" : "__lr_q", + "owner" : "lr", + "name" : "q", + "access" : 8, + "descriptor" : "I", + "decoder" : -76329055 + }, { + "field" : "__lr_l", + "owner" : "lr", + "name" : "l", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__lr_o", + "owner" : "lr", + "name" : "o", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__lr_w", + "owner" : "lr", + "name" : "w", + "access" : 8, + "descriptor" : "[I" + }, { + "field" : "__lx_e", + "owner" : "lx", + "name" : "e", + "access" : 25, + "descriptor" : "Llx;" + }, { + "field" : "__lx_m", + "owner" : "lx", + "name" : "m", + "access" : 25, + "descriptor" : "Llx;" + }, { + "field" : "__lx_f", + "owner" : "lx", + "name" : "f", + "access" : 24, + "descriptor" : "Llx;" + }, { + "field" : "__lx_g", + "owner" : "lx", + "name" : "g", + "access" : 24, + "descriptor" : "Llx;" + }, { + "field" : "__lx_l", + "owner" : "lx", + "name" : "l", + "access" : 24, + "descriptor" : "Llx;" + }, { + "field" : "__lx_o", + "owner" : "lx", + "name" : "o", + "access" : 24, + "descriptor" : "Llx;" + }, { + "field" : "__lx_q", + "owner" : "lx", + "name" : "q", + "access" : 24, + "descriptor" : "Llx;" + }, { + "field" : "__lx_u", + "owner" : "lx", + "name" : "u", + "access" : 24, + "descriptor" : "Llx;" + }, { + "field" : "__lx_w", + "owner" : "lx", + "name" : "w", + "access" : 24, + "descriptor" : "Llx;" + } ], + "methods" : [ { + "method" : "AbstractFont_drawGlyph", + "owner" : "kt", + "name" : "ah", + "access" : 8, + "parameters" : [ "pixels", "x", "y", "width", "height", "color" ], + "descriptor" : "([BIIIII)V" + }, { + "method" : "AbstractFont_drawGlyphAlpha", + "owner" : "kt", + "name" : "aw", + "access" : 8, + "parameters" : [ "pixels", "x", "y", "width", "height", "color", "alpha" ], + "descriptor" : "([BIIIIII)V" + }, { + "method" : "AbstractFont_placeGlyph", + "owner" : "kt", + "name" : "ak", + "access" : 8, + "descriptor" : "([I[BIIIIIII)V" + }, { + "method" : "AbstractFont_placeGlyphAlpha", + "owner" : "kt", + "name" : "al", + "access" : 8, + "descriptor" : "([I[BIIIIIIII)V" + }, { + "method" : "ByteArrayPool_get", + "owner" : "gi", + "name" : "f", + "access" : 40, + "descriptor" : "(IZI)[B" + }, { + "method" : "Bzip2Decompressor_decompress", + "owner" : "gk", + "name" : "m", + "access" : 9, + "descriptor" : "([BI[BII)I" + }, { + "method" : "IterableNodeDeque_addBefore", + "owner" : "ja", + "name" : "w", + "access" : 9, + "parameters" : [ "node", "old" ], + "descriptor" : "(Lgw;Lgw;)V" + }, { + "method" : "PcmStream_disable", + "owner" : "hm", + "name" : "al", + "access" : 24, + "parameters" : [ "stream" ], + "descriptor" : "(Ldc;B)V" + }, { + "method" : "Rasterizer2D_clear", + "owner" : "lf", + "name" : "dd", + "access" : 9, + "descriptor" : "()V" + }, { + "method" : "Rasterizer2D_drawHorizontalLine", + "owner" : "lf", + "name" : "dj", + "access" : 9, + "parameters" : [ "x", "y", "length", "color" ], + "descriptor" : "(IIII)V" + }, { + "method" : "Rasterizer2D_drawHorizontalLineAlpha", + "owner" : "lf", + "name" : "du", + "access" : 8, + "parameters" : [ "x", "y", "length", "rgb", "alpha" ], + "descriptor" : "(IIIII)V" + }, { + "method" : "Rasterizer2D_drawLine", + "owner" : "lf", + "name" : "et", + "access" : 9, + "parameters" : [ "x0", "y0", "x1", "y1", "color" ], + "descriptor" : "(IIIII)V" + }, { + "method" : "Rasterizer2D_drawRectangle", + "owner" : "lf", + "name" : "dh", + "access" : 9, + "parameters" : [ "x", "y", "width", "height", "color" ], + "descriptor" : "(IIIII)V" + }, { + "method" : "Rasterizer2D_drawRectangleAlpha", + "owner" : "lf", + "name" : "dz", + "access" : 9, + "parameters" : [ "x", "y", "width", "height", "rgb", "alpha" ], + "descriptor" : "(IIIIII)V" + }, { + "method" : "Rasterizer2D_drawVerticalLine", + "owner" : "lf", + "name" : "dm", + "access" : 9, + "parameters" : [ "x", "y", "length", "color" ], + "descriptor" : "(IIII)V" + }, { + "method" : "Rasterizer2D_drawVerticalLineAlpha", + "owner" : "lf", + "name" : "dq", + "access" : 8, + "parameters" : [ "x", "y", "length", "rgb", "alpha" ], + "descriptor" : "(IIIII)V" + }, { + "method" : "Rasterizer2D_expandClip", + "owner" : "lf", + "name" : "dc", + "access" : 9, + "parameters" : [ "xStart", "yStart", "xEnd", "yEnd" ], + "descriptor" : "(IIII)V" + }, { + "method" : "Rasterizer2D_fillRectangle", + "owner" : "lf", + "name" : "dr", + "access" : 9, + "parameters" : [ "x", "y", "width", "height", "color" ], + "descriptor" : "(IIIII)V" + }, { + "method" : "Rasterizer2D_getClipArray", + "owner" : "lf", + "name" : "dg", + "access" : 9, + "parameters" : [ "dst" ], + "descriptor" : "([I)V" + }, { + "method" : "Rasterizer2D_replace", + "owner" : "lf", + "name" : "dp", + "access" : 9, + "parameters" : [ "pixels", "width", "height" ], + "descriptor" : "([III)V" + }, { + "method" : "Rasterizer2D_resetClip", + "owner" : "lf", + "name" : "ds", + "access" : 9, + "descriptor" : "()V" + }, { + "method" : "Rasterizer2D_setClip", + "owner" : "lf", + "name" : "di", + "access" : 9, + "parameters" : [ "xStart", "yStart", "xEnd", "yEnd" ], + "descriptor" : "(IIII)V" + }, { + "method" : "Rasterizer2D_setClipArray", + "owner" : "lf", + "name" : "db", + "access" : 9, + "parameters" : [ "src" ], + "descriptor" : "([I)V" + }, { + "method" : "Rasterizer2D_setPixel", + "owner" : "lf", + "name" : "eb", + "access" : 8, + "parameters" : [ "x", "y", "color" ], + "descriptor" : "(III)V" + }, { + "method" : "Rasterizer3D_brighten", + "owner" : "et", + "name" : "l", + "access" : 8, + "parameters" : [ "rgb", "brightness" ], + "descriptor" : "(ID)I" + }, { + "method" : "Rasterizer3D_buildPalette", + "owner" : "et", + "name" : "g", + "access" : 24, + "parameters" : [ "brightness", "hsMin", "hsMax" ], + "descriptor" : "(DII)V" + }, { + "method" : "Rasterizer3D_method1", + "owner" : "et", + "name" : "m", + "access" : 25, + "descriptor" : "()V" + }, { + "method" : "Rasterizer3D_method3", + "owner" : "et", + "name" : "q", + "access" : 25, + "descriptor" : "()V" + }, { + "method" : "Rasterizer3D_setBrightness", + "owner" : "et", + "name" : "u", + "access" : 25, + "parameters" : [ "brightness" ], + "descriptor" : "(D)V" + }, { + "method" : "Rasterizer3D_setClip", + "owner" : "et", + "name" : "f", + "access" : 24, + "parameters" : [ "xStart", "yStart", "xEnd", "yEnd" ], + "descriptor" : "(IIII)V" + }, { + "method" : "Rasterizer3D_setTextureLoader", + "owner" : "et", + "name" : "o", + "access" : 25, + "parameters" : [ "textureLoader" ], + "descriptor" : "(Lei;)V" + }, { + "method" : "Scene_addOccluder", + "owner" : "em", + "name" : "w", + "access" : 9, + "descriptor" : "(IIIIIIII)V" + }, { + "method" : "Scene_buildVisiblityMap", + "owner" : "em", + "name" : "at", + "access" : 9, + "parameters" : [ "a", "b", "c", "viewportWidth", "viewportHeight" ], + "descriptor" : "([IIIII)V" + }, { + "method" : "addMessage", + "owner" : "g", + "name" : "f", + "access" : 8, + "parameters" : [ "type", "sender", "text", "prefix" ], + "descriptor" : "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V" + }, { + "method" : "addNpcToMenu", + "owner" : "dj", + "name" : "is", + "access" : 24, + "parameters" : [ "npc", "menuArg0", "menuArg1", "menuArg2" ], + "descriptor" : "(Ljz;IIIB)V" + }, { + "method" : "addPlayerToMenu", + "owner" : "e", + "name" : "ik", + "access" : 24, + "parameters" : [ "player", "menuArg0", "menuArg1", "menuArg2" ], + "descriptor" : "(Lbr;IIII)V" + }, { + "method" : "addPlayerToScene", + "owner" : "aw", + "name" : "gk", + "access" : 8, + "parameters" : [ "player", "b" ], + "descriptor" : "(Lbr;ZI)V" + }, { + "method" : "alignComponent", + "owner" : "client", + "name" : "ip", + "access" : 0, + "parameters" : [ "component" ], + "descriptor" : "(Lho;B)V" + }, { + "method" : "alignComponentPosition", + "owner" : "jf", + "name" : "iw", + "access" : 8, + "parameters" : [ "component", "parentWidth", "parentHeight" ], + "descriptor" : "(Lho;IIB)V" + }, { + "method" : "alignComponentSize", + "owner" : "p", + "name" : "ic", + "access" : 8, + "parameters" : [ "component", "parentWidth", "parentHeight", "b" ], + "descriptor" : "(Lho;IIZB)V" + }, { + "method" : "byteArrayFromObject", + "owner" : "dl", + "name" : "u", + "access" : 9, + "parameters" : [ "o", "copyArray" ], + "descriptor" : "(Ljava/lang/Object;ZB)[B" + }, { + "method" : "byteArrayToObject", + "owner" : "cb", + "name" : "o", + "access" : 9, + "parameters" : [ "bytes", "copyArray" ], + "descriptor" : "([BZB)Ljava/lang/Object;" + }, { + "method" : "charToByteCp1252", + "owner" : "cr", + "name" : "m", + "access" : 9, + "parameters" : [ "c" ], + "descriptor" : "(CI)B" + }, { + "method" : "clearIntArray", + "owner" : "hh", + "name" : "x", + "access" : 9, + "descriptor" : "([III)V" + }, { + "method" : "clickComponent", + "owner" : "cq", + "name" : "jf", + "access" : 24, + "parameters" : [ "component", "x", "y" ], + "descriptor" : "(Lho;III)V" + }, { + "method" : "closeInterface", + "owner" : "cs", + "name" : "jd", + "access" : 24, + "parameters" : [ "w", "b" ], + "descriptor" : "(Lbx;ZI)V" + }, { + "method" : "colorStartTag", + "owner" : "dy", + "name" : "f", + "access" : 8, + "parameters" : [ "color" ], + "descriptor" : "(II)Ljava/lang/String;" + }, { + "method" : "compareWorlds", + "owner" : "aj", + "name" : "u", + "access" : 8, + "parameters" : [ "w0", "w1", "mode", "b" ], + "descriptor" : "(Lbt;Lbt;IZI)I" + }, { + "method" : "currentTimeMs", + "owner" : "ga", + "name" : "m", + "access" : 41, + "parameters" : [ ], + "descriptor" : "(I)J" + }, { + "method" : "decodeStringCp1252", + "owner" : "bx", + "name" : "o", + "access" : 9, + "parameters" : [ "src", "srcStart", "length" ], + "descriptor" : "([BIII)Ljava/lang/String;" + }, { + "method" : "decompressBytes", + "owner" : "id", + "name" : "ay", + "access" : 24, + "descriptor" : "([BI)[B" + }, { + "method" : "doCycle", + "owner" : "client", + "name" : "al", + "access" : 20, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "doCycleJs5", + "owner" : "client", + "name" : "ef", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "doCycleJs5Connect", + "owner" : "client", + "name" : "ev", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "doCycleLoggedIn", + "owner" : "client", + "name" : "fx", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "doCycleLoggedOut", + "owner" : "client", + "name" : "fg", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(B)V" + }, { + "method" : "draw", + "owner" : "client", + "name" : "ab", + "access" : 20, + "descriptor" : "(ZI)V" + }, { + "method" : "drawActor2d", + "owner" : "at", + "name" : "gr", + "access" : 24, + "parameters" : [ "actor", "a", "b", "c", "d", "e" ], + "descriptor" : "(Lbz;IIIIIB)V" + }, { + "method" : "drawInterface", + "owner" : "az", + "name" : "ir", + "access" : 24, + "descriptor" : "([Lho;IIIIIIIII)V" + }, { + "method" : "drawLoadingMessage", + "owner" : "bi", + "name" : "gl", + "access" : 24, + "descriptor" : "(Ljava/lang/String;ZI)V" + }, { + "method" : "drawLoggedIn", + "owner" : "client", + "name" : "gs", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "drawTitle", + "owner" : "bd", + "name" : "x", + "access" : 8, + "descriptor" : "(Lkk;Lkk;Lkk;I)V" + }, { + "method" : "encodeStringCp1252", + "owner" : "dt", + "name" : "w", + "access" : 9, + "parameters" : [ "src", "srcStart", "srcEnd", "dst", "dstStart" ], + "descriptor" : "(Ljava/lang/CharSequence;II[BII)I" + }, { + "method" : "escapeBrackets", + "owner" : "kt", + "name" : "s", + "access" : 9, + "parameters" : [ "s" ], + "descriptor" : "(Ljava/lang/String;)Ljava/lang/String;" + }, { + "method" : "findEnumerated", + "owner" : "bn", + "name" : "m", + "access" : 9, + "parameters" : [ "values", "ordinal" ], + "descriptor" : "([Lgc;II)Lgc;" + }, { + "method" : "getComponentChild", + "owner" : "gx", + "name" : "f", + "access" : 9, + "descriptor" : "(III)Lho;" + }, { + "method" : "getComponentClickMask", + "owner" : "f", + "name" : "kp", + "access" : 8, + "parameters" : [ "component" ], + "descriptor" : "(Lho;I)I" + }, { + "method" : "getFrames", + "owner" : "bc", + "name" : "x", + "access" : 8, + "parameters" : [ "id" ], + "descriptor" : "(II)Len;" + }, { + "method" : "getHitmarkDefinition", + "owner" : "bp", + "name" : "f", + "access" : 9, + "parameters" : [ "id" ], + "descriptor" : "(II)Ljm;" + }, { + "method" : "getInterfaceComponent", + "owner" : "gd", + "name" : "m", + "access" : 9, + "parameters" : [ "id" ], + "descriptor" : "(IB)Lho;" + }, { + "method" : "getItemDefinition", + "owner" : "hc", + "name" : "m", + "access" : 9, + "parameters" : [ "id" ], + "descriptor" : "(II)Ljv;" + }, { + "method" : "getItemSprite", + "owner" : "ht", + "name" : "d", + "access" : 25, + "parameters" : [ "id", "quantity", "n0", "n1", "n2", "b0" ], + "descriptor" : "(IIIIIZI)Lln;" + }, { + "method" : "getKitDefinition", + "owner" : "as", + "name" : "m", + "access" : 9, + "descriptor" : "(II)Lim;" + }, { + "method" : "getNpcDefinition", + "owner" : "jr", + "name" : "f", + "access" : 9, + "parameters" : [ "id" ], + "descriptor" : "(II)Ljz;" + }, { + "method" : "getObjectDefinition", + "owner" : "af", + "name" : "f", + "access" : 9, + "parameters" : [ "id" ], + "descriptor" : "(II)Ljr;" + }, { + "method" : "getParamDefinition", + "owner" : "hz", + "name" : "m", + "access" : 9, + "parameters" : [ "id" ], + "descriptor" : "(IB)Ljb;" + }, { + "method" : "getPreferencesFile", + "owner" : "gl", + "name" : "q", + "access" : 9, + "descriptor" : "(Ljava/lang/String;Ljava/lang/String;ZS)Ldk;" + }, { + "method" : "getSequenceDefinition", + "owner" : "ae", + "name" : "m", + "access" : 9, + "descriptor" : "(II)Ljh;" + }, { + "method" : "getSpotAnimationDefinition", + "owner" : "af", + "name" : "m", + "access" : 9, + "descriptor" : "(IB)Lio;" + }, { + "method" : "getTileHeight", + "owner" : "ay", + "name" : "gu", + "access" : 24, + "descriptor" : "(IIII)I" + }, { + "method" : "getVarbit", + "owner" : "ah", + "name" : "m", + "access" : 9, + "parameters" : [ "id" ], + "descriptor" : "(II)I" + }, { + "method" : "getWorldMapElement", + "owner" : "dm", + "name" : "m", + "access" : 9, + "parameters" : [ "id" ], + "descriptor" : "(IB)Lic;" + }, { + "method" : "hashString", + "owner" : "client", + "name" : "l", + "access" : 9, + "parameters" : [ "chars" ], + "descriptor" : "(Ljava/lang/CharSequence;I)I" + }, { + "method" : "init", + "owner" : "client", + "name" : "init", + "access" : 17, + "parameters" : [ ], + "descriptor" : "()V" + }, { + "method" : "insertMenuItem", + "owner" : "j", + "name" : "il", + "access" : 24, + "parameters" : [ "action", "targetName", "opcode", "arg0", "arg1", "arg2", "b" ], + "descriptor" : "(Ljava/lang/String;Ljava/lang/String;IIIIZB)V" + }, { + "method" : "itemContainerSetItem", + "owner" : "al", + "name" : "w", + "access" : 8, + "parameters" : [ "itemContainerId", "index", "itemId", "itemQuantity" ], + "descriptor" : "(IIIII)V" + }, { + "method" : "js5Error", + "owner" : "client", + "name" : "ea", + "access" : 0, + "parameters" : [ "code" ], + "descriptor" : "(IS)V" + }, { + "method" : "kill0", + "owner" : "client", + "name" : "ae", + "access" : 20, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "loadClassFromDescriptor", + "owner" : "iw", + "name" : "w", + "access" : 8, + "parameters" : [ "descriptor" ], + "descriptor" : "(Ljava/lang/String;I)Ljava/lang/Class;" + }, { + "method" : "loadInterface", + "owner" : "dr", + "name" : "q", + "access" : 9, + "parameters" : [ "itf" ], + "descriptor" : "(IB)Z" + }, { + "method" : "loadRegions", + "owner" : "af", + "name" : "gc", + "access" : 24, + "parameters" : [ "isInInstance", "packetBuffer" ], + "descriptor" : "(ZLhx;B)V" + }, { + "method" : "loadTerrain", + "owner" : "e", + "name" : "o", + "access" : 24, + "parameters" : [ "buffer", "plane", "x", "y", "x0", "y0", "n" ], + "descriptor" : "(Lgr;IIIIIIB)V" + }, { + "method" : "loadWorlds", + "owner" : "ji", + "name" : "m", + "access" : 8, + "parameters" : [ ], + "descriptor" : "(I)Z" + }, { + "method" : "menuAction", + "owner" : "bz", + "name" : "hb", + "access" : 24, + "parameters" : [ "argument1", "argument2", "opcode", "argument0", "action", "targetName", "mouseX", "mouseY" ], + "descriptor" : "(IIIILjava/lang/String;Ljava/lang/String;III)V" + }, { + "method" : "newArchive", + "owner" : "c", + "name" : "fw", + "access" : 8, + "descriptor" : "(IZZZB)Lit;" + }, { + "method" : "newPcmPlayer", + "owner" : "cq", + "name" : "aj", + "access" : 25, + "descriptor" : "(Lfz;III)Lco;" + }, { + "method" : "newScript", + "owner" : "ee", + "name" : "w", + "access" : 8, + "parameters" : [ "bytes" ], + "descriptor" : "([BI)Lcg;" + }, { + "method" : "openMenu", + "owner" : "client", + "name" : "hj", + "access" : 16, + "parameters" : [ "x", "y" ], + "descriptor" : "(IIB)V" + }, { + "method" : "queueSoundEffect", + "owner" : "ks", + "name" : "fv", + "access" : 8, + "descriptor" : "(IIIB)V" + }, { + "method" : "readMusicSample", + "owner" : "cd", + "name" : "e", + "access" : 8, + "descriptor" : "(Lir;II)Lcd;" + }, { + "method" : "readSoundEffect", + "owner" : "ci", + "name" : "m", + "access" : 9, + "descriptor" : "(Lir;II)Lci;" + }, { + "method" : "readSprite", + "owner" : "le", + "name" : "m", + "access" : 9, + "parameters" : [ "archive", "group", "file" ], + "descriptor" : "(Lir;III)Lln;" + }, { + "method" : "readStringIntParameters", + "owner" : "ir", + "name" : "m", + "access" : 24, + "parameters" : [ "buffer", "hashTable" ], + "descriptor" : "(Lgr;Llh;I)Llh;" + }, { + "method" : "readTrack", + "owner" : "he", + "name" : "m", + "access" : 9, + "descriptor" : "(Lir;II)Lhe;" + }, { + "method" : "requestNetFile", + "owner" : "hx", + "name" : "f", + "access" : 8, + "descriptor" : "(Lit;IIIBZI)V" + }, { + "method" : "runCs1", + "owner" : "il", + "name" : "im", + "access" : 24, + "parameters" : [ "component" ], + "descriptor" : "(Lho;I)Z" + }, { + "method" : "runScript", + "owner" : "ir", + "name" : "m", + "access" : 9, + "parameters" : [ "scriptEvent" ], + "descriptor" : "(Lby;S)V" + }, { + "method" : "runScript0", + "owner" : "l", + "name" : "f", + "access" : 8, + "parameters" : [ "scriptEvent", "n" ], + "descriptor" : "(Lby;II)V" + }, { + "method" : "setUp", + "owner" : "client", + "name" : "aw", + "access" : 20, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "setViewportShape", + "owner" : "kx", + "name" : "gg", + "access" : 24, + "parameters" : [ "x", "y", "width", "height", "clear" ], + "descriptor" : "(IIIIZI)V" + }, { + "method" : "updateExternalPlayer", + "owner" : "ie", + "name" : "o", + "access" : 8, + "descriptor" : "(Lhx;II)Z" + }, { + "method" : "updateGameState", + "owner" : "ba", + "name" : "ec", + "access" : 8, + "parameters" : [ "gameState" ], + "descriptor" : "(IB)V" + }, { + "method" : "updateInterface", + "owner" : "il", + "name" : "jr", + "access" : 24, + "parameters" : [ "components", "parentId", "a", "b", "c", "d", "x", "y" ], + "descriptor" : "([Lho;IIIIIIII)V" + }, { + "method" : "updatePlayer", + "owner" : "k", + "name" : "m", + "access" : 24, + "descriptor" : "(Lhx;B)V" + }, { + "method" : "username", + "owner" : "client", + "name" : "kr", + "access" : 1, + "descriptor" : "(B)Lkp;" + }, { + "method" : "worldMap", + "owner" : "dy", + "name" : "er", + "access" : 8, + "descriptor" : "(I)Llz;" + }, { + "method" : "worldToMinimap", + "owner" : "ep", + "name" : "jk", + "access" : 24, + "descriptor" : "(IIIILln;Lhp;I)V" + }, { + "method" : "worldToScreen", + "owner" : "aj", + "name" : "gx", + "access" : 24, + "descriptor" : "(IIII)V" + }, { + "method" : "__au_135", + "owner" : "client", + "name" : "au", + "access" : 20, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__j_136", + "owner" : "client", + "name" : "j", + "access" : 20, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__ge_137", + "owner" : "client", + "name" : "ge", + "access" : 0, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__hg_138", + "owner" : "client", + "name" : "hg", + "access" : 16, + "parameters" : [ "arg0" ], + "descriptor" : "(Lcl;I)Z" + }, { + "method" : "__hi_139", + "owner" : "client", + "name" : "hi", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(I)V" + }, { + "method" : "__ht_140", + "owner" : "client", + "name" : "ht", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(B)Z" + }, { + "method" : "__iu_141", + "owner" : "client", + "name" : "iu", + "access" : 16, + "parameters" : [ "arg0" ], + "descriptor" : "(ZI)V" + }, { + "method" : "__jh_142", + "owner" : "client", + "name" : "jh", + "access" : 16, + "parameters" : [ ], + "descriptor" : "(I)V" + } ], + "constructors" : [ { + "access" : 1, + "descriptor" : "()V" + } ] +} ] \ No newline at end of file diff --git a/runelite-api/src/main/java/net/runelite/api/PacketBuffer.java b/runelite-api/src/main/java/net/runelite/api/PacketBuffer.java deleted file mode 100644 index a44f4c9ac9..0000000000 --- a/runelite-api/src/main/java/net/runelite/api/PacketBuffer.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.api; - -public interface PacketBuffer -{ -} diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetType.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetType.java index 9d140c3cd0..cec850036f 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetType.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetType.java @@ -35,4 +35,10 @@ public final class WidgetType public static final int TEXT_INVENTORY = 7; public static final int IF1_TOOLTIP = 8; public static final int LINE = 9; + public static final int FPS = 1336; + public static final int VIEWPORT = 1337; + public static final int MINIMAP = 1338; + public static final int COMPASS = 1339; + public static final int WORLD_MAP = 1400; + public static final int WORLD_MAP_OVERVIEW = 1401; } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index f0b2fe58d2..3385ad0b2d 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -51,7 +51,6 @@ import net.runelite.api.MenuEntry; import net.runelite.api.MessageNode; import net.runelite.api.NPC; import net.runelite.api.Node; -import net.runelite.api.PacketBuffer; import static net.runelite.api.Perspective.LOCAL_TILE_SIZE; import net.runelite.api.Player; import net.runelite.api.Point; @@ -111,6 +110,7 @@ import net.runelite.api.mixins.MethodHook; import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Replace; import net.runelite.api.mixins.Shadow; +import net.runelite.rs.api.RSPacketBuffer; import org.slf4j.Logger; import net.runelite.rs.api.RSAbstractArchive; import net.runelite.rs.api.RSChatChannel; @@ -1329,13 +1329,13 @@ public abstract class RSClientMixin implements RSClient @Inject @MethodHook("updateNpcs") - public static void updateNpcs(boolean var0, PacketBuffer var1) + public static void updateNpcs(boolean var0, RSPacketBuffer var1) { client.getCallbacks().updateNpcs(); } @Inject - @MethodHook(value = "addMessage", end = true) + @MethodHook(value = "addChatMessage", end = true) public static void onAddChatMessage(int type, String name, String message, String sender) { Logger logger = client.getLogger(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index 4d3393c094..04ac4933a5 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java @@ -328,7 +328,7 @@ public interface RSClient extends RSGameShell, Client @Override RSWorld[] getWorldList(); - @Import("addMessage") + @Import("addChatMessage") void addChatMessage(int type, String name, String message, String sender); @Override diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java index 614734671d..602a497d4a 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java @@ -1,7 +1,5 @@ package net.runelite.rs.api; -import net.runelite.api.PacketBuffer; - -public interface RSPacketBuffer extends PacketBuffer +public interface RSPacketBuffer { } diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index 2bd08bf4ac..198880b6ba 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -708,28 +708,28 @@ public abstract class AbstractArchive { garbageValue = "15597880" ) @Export("readStringIntParameters") - static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { - int var2 = var0.readUnsignedByte(); + static final IterableNodeHashTable readStringIntParameters(Buffer buffer, IterableNodeHashTable hashTable) { + int var2 = buffer.readUnsignedByte(); int var3; - if (var1 == null) { + if (hashTable == null) { var3 = World.method1759(var2); - var1 = new IterableNodeHashTable(var3); + hashTable = new IterableNodeHashTable(var3); } for (var3 = 0; var3 < var2; ++var3) { - boolean var4 = var0.readUnsignedByte() == 1; - int var5 = var0.readMedium(); + boolean var4 = buffer.readUnsignedByte() == 1; + int var5 = buffer.readMedium(); Object var6; if (var4) { - var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); + var6 = new ObjectNode(buffer.readStringCp1252NullTerminated()); } else { - var6 = new IntegerNode(var0.readInt()); + var6 = new IntegerNode(buffer.readInt()); } - var1.put((Node)var6, (long)var5); + hashTable.put((Node)var6, (long)var5); } - return var1; + return hashTable; } @ObfuscatedName("m") @@ -738,8 +738,8 @@ public abstract class AbstractArchive { garbageValue = "-4702" ) @Export("runScript") - public static void runScript(ScriptEvent var0) { - GrandExchangeEvent.runScript0(var0, 500000); + public static void runScript(ScriptEvent scriptEvent) { + GrandExchangeEvent.runScript0(scriptEvent, 500000); } @ObfuscatedName("eg") diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 541d5d657f..bef6ef48d4 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -29,7 +29,7 @@ public abstract class AbstractByteArrayCopier { garbageValue = "-2034091753" ) @Export("set") - abstract void set(byte[] var1); + abstract void set(byte[] array); @ObfuscatedName("f") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index a387cfe60f..6cd19a4b75 100644 --- a/runescape-client/src/main/java/AbstractFont.java +++ b/runescape-client/src/main/java/AbstractFont.java @@ -111,28 +111,28 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("m") @Export("drawGlyph") - abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); + abstract void drawGlyph(byte[] pixels, int x, int y, int width, int height, int color); @ObfuscatedName("f") @Export("drawGlyphAlpha") - abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); + abstract void drawGlyphAlpha(byte[] pixels, int x, int y, int width, int height, int color, int alpha); @ObfuscatedName("l") @Export("readMetrics") - void readMetrics(byte[] var1) { + void readMetrics(byte[] bytes) { this.advances = new int[256]; int var2; - if (var1.length == 257) { + if (bytes.length == 257) { for (var2 = 0; var2 < this.advances.length; ++var2) { - this.advances[var2] = var1[var2] & 255; + this.advances[var2] = bytes[var2] & 255; } - this.ascent = var1[256] & 255; + this.ascent = bytes[256] & 255; } else { var2 = 0; for (int var3 = 0; var3 < 256; ++var3) { - this.advances[var3] = var1[var2++] & 255; + this.advances[var3] = bytes[var2++] & 255; } int[] var12 = new int[256]; @@ -140,11 +140,11 @@ public abstract class AbstractFont extends Rasterizer2D { int var5; for (var5 = 0; var5 < 256; ++var5) { - var12[var5] = var1[var2++] & 255; + var12[var5] = bytes[var2++] & 255; } for (var5 = 0; var5 < 256; ++var5) { - var4[var5] = var1[var2++] & 255; + var4[var5] = bytes[var2++] & 255; } byte[][] var6 = new byte[256][]; @@ -155,7 +155,7 @@ public abstract class AbstractFont extends Rasterizer2D { byte var9 = 0; for (var7 = 0; var7 < var6[var8].length; ++var7) { - var9 += var1[var2++]; + var9 += bytes[var2++]; var6[var8][var7] = var9; } } @@ -168,7 +168,7 @@ public abstract class AbstractFont extends Rasterizer2D { byte var10 = 0; for (int var11 = 0; var11 < var13[var14].length; ++var11) { - var10 += var1[var2++]; + var10 += bytes[var2++]; var13[var14][var11] = var10; } } @@ -258,7 +258,7 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("a") @Export("breakLines") - public int breakLines(String var1, int[] var2, String[] var3) { + public int breakLines(String var1, int[] lineWidths, String[] linesDst) { if (var1 == null) { return 0; } else { @@ -285,7 +285,7 @@ public abstract class AbstractFont extends Rasterizer2D { var6.append(var16); var6.append('>'); if (var16.equals("br")) { - var3[var12] = var6.toString().substring(var5, var6.length()); + linesDst[var12] = var6.toString().substring(var5, var6.length()); ++var12; var5 = var6.length(); var4 = 0; @@ -334,8 +334,8 @@ public abstract class AbstractFont extends Rasterizer2D { var9 = 1; } - if (var2 != null && var4 > var2[var12 < var2.length ? var12 : var2.length - 1] && var7 >= 0) { - var3[var12] = var6.toString().substring(var5, var7 - var9); + if (lineWidths != null && var4 > lineWidths[var12 < lineWidths.length ? var12 : lineWidths.length - 1] && var7 >= 0) { + linesDst[var12] = var6.toString().substring(var5, var7 - var9); ++var12; var5 = var7; var7 = -1; @@ -354,7 +354,7 @@ public abstract class AbstractFont extends Rasterizer2D { String var19 = var6.toString(); if (var19.length() > var5) { - var3[var12++] = var19.substring(var5, var19.length()); + linesDst[var12++] = var19.substring(var5, var19.length()); } return var12; @@ -363,8 +363,8 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("z") @Export("lineWidth") - public int lineWidth(String var1, int var2) { - int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); + public int lineWidth(String var1, int lineWidth) { + int var3 = this.breakLines(var1, new int[]{lineWidth}, AbstractFont_lines); int var4 = 0; for (int var5 = 0; var5 < var3; ++var5) { @@ -379,106 +379,106 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("j") @Export("lineCount") - public int lineCount(String var1, int var2) { - return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); + public int lineCount(String var1, int lineWidth) { + return this.breakLines(var1, new int[]{lineWidth}, AbstractFont_lines); } @ObfuscatedName("t") @Export("draw") - public void draw(String var1, int var2, int var3, int var4, int var5) { + public void draw(String var1, int x, int y, int color, int shadow) { if (var1 != null) { - this.reset(var4, var5); - this.draw0(var1, var2, var3); + this.reset(color, shadow); + this.draw0(var1, x, y); } } @ObfuscatedName("y") @Export("drawAlpha") - public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { + public void drawAlpha(String var1, int x, int y, int color, int shadow, int alpha) { if (var1 != null) { - this.reset(var4, var5); - AbstractFont_alpha = var6; - this.draw0(var1, var2, var3); + this.reset(color, shadow); + AbstractFont_alpha = alpha; + this.draw0(var1, x, y); } } @ObfuscatedName("h") @Export("drawRightAligned") - public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { + public void drawRightAligned(String var1, int x, int y, int color, int shadow) { if (var1 != null) { - this.reset(var4, var5); - this.draw0(var1, var2 - this.stringWidth(var1), var3); + this.reset(color, shadow); + this.draw0(var1, x - this.stringWidth(var1), y); } } @ObfuscatedName("b") @Export("drawCentered") - public void drawCentered(String var1, int var2, int var3, int var4, int var5) { + public void drawCentered(String var1, int x, int y, int color, int shadow) { if (var1 != null) { - this.reset(var4, var5); - this.draw0(var1, var2 - this.stringWidth(var1) / 2, var3); + this.reset(color, shadow); + this.draw0(var1, x - this.stringWidth(var1) / 2, y); } } @ObfuscatedName("c") @Export("drawLines") - public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + public int drawLines(String var1, int x, int y, int width, int height, int color, int shadow, int xAlignment, int yAlignment, int lineHeight) { if (var1 == null) { return 0; } else { - this.reset(var6, var7); - if (var10 == 0) { - var10 = this.ascent; + this.reset(color, shadow); + if (lineHeight == 0) { + lineHeight = this.ascent; } - int[] var11 = new int[]{var4}; - if (var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) { + int[] var11 = new int[]{width}; + if (height < lineHeight + this.maxAscent + this.maxDescent && height < lineHeight + lineHeight) { var11 = null; } int var12 = this.breakLines(var1, var11, AbstractFont_lines); - if (var9 == 3 && var12 == 1) { - var9 = 1; + if (yAlignment == 3 && var12 == 1) { + yAlignment = 1; } int var13; int var14; - if (var9 == 0) { - var13 = var3 + this.maxAscent; - } else if (var9 == 1) { - var13 = var3 + (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / 2 + this.maxAscent; - } else if (var9 == 2) { - var13 = var3 + var5 - this.maxDescent - var10 * (var12 - 1); + if (yAlignment == 0) { + var13 = y + this.maxAscent; + } else if (yAlignment == 1) { + var13 = y + (height - this.maxAscent - this.maxDescent - lineHeight * (var12 - 1)) / 2 + this.maxAscent; + } else if (yAlignment == 2) { + var13 = y + height - this.maxDescent - lineHeight * (var12 - 1); } else { - var14 = (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / (var12 + 1); + var14 = (height - this.maxAscent - this.maxDescent - lineHeight * (var12 - 1)) / (var12 + 1); if (var14 < 0) { var14 = 0; } - var13 = var3 + var14 + this.maxAscent; - var10 += var14; + var13 = y + var14 + this.maxAscent; + lineHeight += var14; } for (var14 = 0; var14 < var12; ++var14) { - if (var8 == 0) { - this.draw0(AbstractFont_lines[var14], var2, var13); - } else if (var8 == 1) { - this.draw0(AbstractFont_lines[var14], var2 + (var4 - this.stringWidth(AbstractFont_lines[var14])) / 2, var13); - } else if (var8 == 2) { - this.draw0(AbstractFont_lines[var14], var2 + var4 - this.stringWidth(AbstractFont_lines[var14]), var13); + if (xAlignment == 0) { + this.draw0(AbstractFont_lines[var14], x, var13); + } else if (xAlignment == 1) { + this.draw0(AbstractFont_lines[var14], x + (width - this.stringWidth(AbstractFont_lines[var14])) / 2, var13); + } else if (xAlignment == 2) { + this.draw0(AbstractFont_lines[var14], x + width - this.stringWidth(AbstractFont_lines[var14]), var13); } else if (var14 == var12 - 1) { - this.draw0(AbstractFont_lines[var14], var2, var13); + this.draw0(AbstractFont_lines[var14], x, var13); } else { - this.calculateLineJustification(AbstractFont_lines[var14], var4); - this.draw0(AbstractFont_lines[var14], var2, var13); + this.calculateLineJustification(AbstractFont_lines[var14], width); + this.draw0(AbstractFont_lines[var14], x, var13); AbstractFont_justificationTotal = 0; } - var13 += var10; + var13 += lineHeight; } return var12; @@ -487,44 +487,44 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("p") @Export("drawCenteredWave") - public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) { + public void drawCenteredWave(String var1, int x, int y, int color, int shadow, int seed) { if (var1 != null) { - this.reset(var4, var5); + this.reset(color, shadow); int[] var7 = new int[var1.length()]; for (int var8 = 0; var8 < var1.length(); ++var8) { - var7[var8] = (int)(Math.sin((double)var8 / 2.0D + (double)var6 / 5.0D) * 5.0D); + var7[var8] = (int)(Math.sin((double)var8 / 2.0D + (double)seed / 5.0D) * 5.0D); } - this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var7); + this.drawWithOffsets0(var1, x - this.stringWidth(var1) / 2, y, (int[])null, var7); } } @ObfuscatedName("v") @Export("drawCenteredWave2") - public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) { + public void drawCenteredWave2(String var1, int x, int y, int color, int shadow, int seed) { if (var1 != null) { - this.reset(var4, var5); + this.reset(color, shadow); int[] var7 = new int[var1.length()]; int[] var8 = new int[var1.length()]; for (int var9 = 0; var9 < var1.length(); ++var9) { - var7[var9] = (int)(Math.sin((double)var9 / 5.0D + (double)var6 / 5.0D) * 5.0D); - var8[var9] = (int)(Math.sin((double)var9 / 3.0D + (double)var6 / 5.0D) * 5.0D); + var7[var9] = (int)(Math.sin((double)var9 / 5.0D + (double)seed / 5.0D) * 5.0D); + var8[var9] = (int)(Math.sin((double)var9 / 3.0D + (double)seed / 5.0D) * 5.0D); } - this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, var7, var8); + this.drawWithOffsets0(var1, x - this.stringWidth(var1) / 2, y, var7, var8); } } @ObfuscatedName("ag") @Export("drawCenteredShake") - public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) { + public void drawCenteredShake(String var1, int x, int y, int color, int shadow, int seed, int seed2) { if (var1 != null) { - this.reset(var4, var5); - double var8 = 7.0D - (double)var7 / 8.0D; + this.reset(color, shadow); + double var8 = 7.0D - (double)seed2 / 8.0D; if (var8 < 0.0D) { var8 = 0.0D; } @@ -532,20 +532,20 @@ public abstract class AbstractFont extends Rasterizer2D { int[] var10 = new int[var1.length()]; for (int var11 = 0; var11 < var1.length(); ++var11) { - var10[var11] = (int)(Math.sin((double)var11 / 1.5D + (double)var6 / 1.0D) * var8); + var10[var11] = (int)(Math.sin((double)var11 / 1.5D + (double)seed / 1.0D) * var8); } - this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var10); + this.drawWithOffsets0(var1, x - this.stringWidth(var1) / 2, y, (int[])null, var10); } } @ObfuscatedName("aq") @Export("drawRandomAlphaAndSpacing") - public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { + public void drawRandomAlphaAndSpacing(String var1, int x, int y, int color, int shadow, int seed) { if (var1 != null) { - this.reset(var4, var5); - AbstractFont_random.setSeed((long)var6); + this.reset(color, shadow); + AbstractFont_random.setSeed((long)seed); AbstractFont_alpha = 192 + (AbstractFont_random.nextInt() & 31); int[] var7 = new int[var1.length()]; int var8 = 0; @@ -557,20 +557,20 @@ public abstract class AbstractFont extends Rasterizer2D { } } - this.drawWithOffsets0(var1, var2, var3, var7, (int[])null); + this.drawWithOffsets0(var1, x, y, var7, (int[])null); } } @ObfuscatedName("aj") @Export("reset") - void reset(int var1, int var2) { + void reset(int color, int shadow) { AbstractFont_strike = -1; AbstractFont_underline = -1; - AbstractFont_previousShadow = var2; - AbstractFont_shadow = var2; - AbstractFont_previousColor = var1; - AbstractFont_color = var1; + AbstractFont_previousShadow = shadow; + AbstractFont_shadow = shadow; + AbstractFont_previousColor = color; + AbstractFont_color = color; AbstractFont_alpha = 256; AbstractFont_justificationTotal = 0; AbstractFont_justificationCurrent = 0; @@ -612,7 +612,7 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("ar") @Export("calculateLineJustification") - void calculateLineJustification(String var1, int var2) { + void calculateLineJustification(String var1, int lineWidth) { int var3 = 0; boolean var4 = false; @@ -628,15 +628,15 @@ public abstract class AbstractFont extends Rasterizer2D { } if (var3 > 0) { - AbstractFont_justificationTotal = (var2 - this.stringWidth(var1) << 8) / var3; + AbstractFont_justificationTotal = (lineWidth - this.stringWidth(var1) << 8) / var3; } } @ObfuscatedName("ac") @Export("draw0") - void draw0(String var1, int var2, int var3) { - var3 -= this.ascent; + void draw0(String var1, int x, int y) { + y -= this.ascent; int var4 = -1; int var5 = -1; @@ -658,8 +658,8 @@ public abstract class AbstractFont extends Rasterizer2D { try { var8 = MouseHandler.method1085(var9.substring(4)); IndexedSprite var13 = AbstractFont_modIconSprites[var8]; - var13.drawAt(var2, var3 + this.ascent - var13.height); - var2 += var13.width; + var13.drawAt(x, y + this.ascent - var13.height); + x += var13.width; var5 = -1; } catch (Exception var11) { } @@ -679,7 +679,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (var4 == -1) { if (this.kerning != null && var5 != -1) { - var2 += this.kerning[var7 + (var5 << 8)]; + x += this.kerning[var7 + (var5 << 8)]; } int var12 = this.widths[var7]; @@ -687,33 +687,33 @@ public abstract class AbstractFont extends Rasterizer2D { if (var7 != ' ') { if (AbstractFont_alpha == 256) { if (AbstractFont_shadow != -1) { - AbstractFont_drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var8, AbstractFont_shadow); + AbstractFont_drawGlyph(this.pixels[var7], x + this.leftBearings[var7] + 1, y + this.topBearings[var7] + 1, var12, var8, AbstractFont_shadow); } - this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var8, AbstractFont_color); + this.drawGlyph(this.pixels[var7], x + this.leftBearings[var7], y + this.topBearings[var7], var12, var8, AbstractFont_color); } else { if (AbstractFont_shadow != -1) { - AbstractFont_drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var8, AbstractFont_shadow, AbstractFont_alpha); + AbstractFont_drawGlyphAlpha(this.pixels[var7], x + this.leftBearings[var7] + 1, y + this.topBearings[var7] + 1, var12, var8, AbstractFont_shadow, AbstractFont_alpha); } - this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var8, AbstractFont_color, AbstractFont_alpha); + this.drawGlyphAlpha(this.pixels[var7], x + this.leftBearings[var7], y + this.topBearings[var7], var12, var8, AbstractFont_color, AbstractFont_alpha); } } else if (AbstractFont_justificationTotal > 0) { AbstractFont_justificationCurrent += AbstractFont_justificationTotal; - var2 += AbstractFont_justificationCurrent >> 8; + x += AbstractFont_justificationCurrent >> 8; AbstractFont_justificationCurrent &= 255; } int var10 = this.advances[var7]; if (AbstractFont_strike != -1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var10, AbstractFont_strike); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(x, y + (int)((double)this.ascent * 0.7D), var10, AbstractFont_strike); } if (AbstractFont_underline != -1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var10, AbstractFont_underline); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(x, y + this.ascent + 1, var10, AbstractFont_underline); } - var2 += var10; + x += var10; var5 = var7; } } @@ -724,8 +724,8 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("ay") @Export("drawWithOffsets0") - void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) { - var3 -= this.ascent; + void drawWithOffsets0(String var1, int x, int y, int[] xs, int[] ys) { + y -= this.ascent; int var6 = -1; int var7 = -1; int var8 = 0; @@ -748,14 +748,14 @@ public abstract class AbstractFont extends Rasterizer2D { if (!var14.equals("gt")) { if (var14.startsWith("img=")) { try { - if (var4 != null) { - var11 = var4[var8]; + if (xs != null) { + var11 = xs[var8]; } else { var11 = 0; } - if (var5 != null) { - var12 = var5[var8]; + if (ys != null) { + var12 = ys[var8]; } else { var12 = 0; } @@ -763,8 +763,8 @@ public abstract class AbstractFont extends Rasterizer2D { ++var8; var13 = MouseHandler.method1085(var14.substring(4)); IndexedSprite var18 = AbstractFont_modIconSprites[var13]; - var18.drawAt(var11 + var2, var12 + (var3 + this.ascent - var18.height)); - var2 += var18.width; + var18.drawAt(var11 + x, var12 + (y + this.ascent - var18.height)); + x += var18.width; var7 = -1; } catch (Exception var16) { } @@ -784,19 +784,19 @@ public abstract class AbstractFont extends Rasterizer2D { if (var6 == -1) { if (this.kerning != null && var7 != -1) { - var2 += this.kerning[var10 + (var7 << 8)]; + x += this.kerning[var10 + (var7 << 8)]; } int var17 = this.widths[var10]; var11 = this.heights[var10]; - if (var4 != null) { - var12 = var4[var8]; + if (xs != null) { + var12 = xs[var8]; } else { var12 = 0; } - if (var5 != null) { - var13 = var5[var8]; + if (ys != null) { + var13 = ys[var8]; } else { var13 = 0; } @@ -805,33 +805,33 @@ public abstract class AbstractFont extends Rasterizer2D { if (var10 != ' ') { if (AbstractFont_alpha == 256) { if (AbstractFont_shadow != -1) { - AbstractFont_drawGlyph(this.pixels[var10], var12 + var2 + this.leftBearings[var10] + 1, var3 + var13 + this.topBearings[var10] + 1, var17, var11, AbstractFont_shadow); + AbstractFont_drawGlyph(this.pixels[var10], var12 + x + this.leftBearings[var10] + 1, y + var13 + this.topBearings[var10] + 1, var17, var11, AbstractFont_shadow); } - this.drawGlyph(this.pixels[var10], var12 + var2 + this.leftBearings[var10], var3 + var13 + this.topBearings[var10], var17, var11, AbstractFont_color); + this.drawGlyph(this.pixels[var10], var12 + x + this.leftBearings[var10], y + var13 + this.topBearings[var10], var17, var11, AbstractFont_color); } else { if (AbstractFont_shadow != -1) { - AbstractFont_drawGlyphAlpha(this.pixels[var10], var12 + var2 + this.leftBearings[var10] + 1, var3 + var13 + this.topBearings[var10] + 1, var17, var11, AbstractFont_shadow, AbstractFont_alpha); + AbstractFont_drawGlyphAlpha(this.pixels[var10], var12 + x + this.leftBearings[var10] + 1, y + var13 + this.topBearings[var10] + 1, var17, var11, AbstractFont_shadow, AbstractFont_alpha); } - this.drawGlyphAlpha(this.pixels[var10], var12 + var2 + this.leftBearings[var10], var3 + var13 + this.topBearings[var10], var17, var11, AbstractFont_color, AbstractFont_alpha); + this.drawGlyphAlpha(this.pixels[var10], var12 + x + this.leftBearings[var10], y + var13 + this.topBearings[var10], var17, var11, AbstractFont_color, AbstractFont_alpha); } } else if (AbstractFont_justificationTotal > 0) { AbstractFont_justificationCurrent += AbstractFont_justificationTotal; - var2 += AbstractFont_justificationCurrent >> 8; + x += AbstractFont_justificationCurrent >> 8; AbstractFont_justificationCurrent &= 255; } int var15 = this.advances[var10]; if (AbstractFont_strike != -1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var15, AbstractFont_strike); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(x, y + (int)((double)this.ascent * 0.7D), var15, AbstractFont_strike); } if (AbstractFont_underline != -1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var15, AbstractFont_underline); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(x, y + this.ascent, var15, AbstractFont_underline); } - var2 += var15; + x += var15; var7 = var10; } } @@ -907,43 +907,43 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("ah") @Export("AbstractFont_drawGlyph") - static void AbstractFont_drawGlyph(byte[] var0, int var1, int var2, int var3, int var4, int var5) { - int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var7 = Rasterizer2D.Rasterizer2D_width - var3; + static void AbstractFont_drawGlyph(byte[] pixels, int x, int y, int width, int height, int color) { + int var6 = x + y * Rasterizer2D.Rasterizer2D_width; + int var7 = Rasterizer2D.Rasterizer2D_width - width; int var8 = 0; int var9 = 0; int var10; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { - var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; - var4 -= var10; - var2 = Rasterizer2D.Rasterizer2D_yClipStart; - var9 += var3 * var10; + if (y < Rasterizer2D.Rasterizer2D_yClipStart) { + var10 = Rasterizer2D.Rasterizer2D_yClipStart - y; + height -= var10; + y = Rasterizer2D.Rasterizer2D_yClipStart; + var9 += width * var10; var6 += var10 * Rasterizer2D.Rasterizer2D_width; } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { - var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; + if (y + height > Rasterizer2D.Rasterizer2D_yClipEnd) { + height -= y + height - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { - var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; - var3 -= var10; - var1 = Rasterizer2D.Rasterizer2D_xClipStart; + if (x < Rasterizer2D.Rasterizer2D_xClipStart) { + var10 = Rasterizer2D.Rasterizer2D_xClipStart - x; + width -= var10; + x = Rasterizer2D.Rasterizer2D_xClipStart; var9 += var10; var6 += var10; var8 += var10; var7 += var10; } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var3 -= var10; + if (width + x > Rasterizer2D.Rasterizer2D_xClipEnd) { + var10 = width + x - Rasterizer2D.Rasterizer2D_xClipEnd; + width -= var10; var8 += var10; var7 += var10; } - if (var3 > 0 && var4 > 0) { - AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); + if (width > 0 && height > 0) { + AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, pixels, color, var9, var6, width, height, var7, var8); } } @@ -998,43 +998,43 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("aw") @Export("AbstractFont_drawGlyphAlpha") - static void AbstractFont_drawGlyphAlpha(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var8 = Rasterizer2D.Rasterizer2D_width - var3; + static void AbstractFont_drawGlyphAlpha(byte[] pixels, int x, int y, int width, int height, int color, int alpha) { + int var7 = x + y * Rasterizer2D.Rasterizer2D_width; + int var8 = Rasterizer2D.Rasterizer2D_width - width; int var9 = 0; int var10 = 0; int var11; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { - var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; - var4 -= var11; - var2 = Rasterizer2D.Rasterizer2D_yClipStart; - var10 += var3 * var11; + if (y < Rasterizer2D.Rasterizer2D_yClipStart) { + var11 = Rasterizer2D.Rasterizer2D_yClipStart - y; + height -= var11; + y = Rasterizer2D.Rasterizer2D_yClipStart; + var10 += width * var11; var7 += var11 * Rasterizer2D.Rasterizer2D_width; } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { - var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; + if (y + height > Rasterizer2D.Rasterizer2D_yClipEnd) { + height -= y + height - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { - var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; - var3 -= var11; - var1 = Rasterizer2D.Rasterizer2D_xClipStart; + if (x < Rasterizer2D.Rasterizer2D_xClipStart) { + var11 = Rasterizer2D.Rasterizer2D_xClipStart - x; + width -= var11; + x = Rasterizer2D.Rasterizer2D_xClipStart; var10 += var11; var7 += var11; var9 += var11; var8 += var11; } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var3 -= var11; + if (width + x > Rasterizer2D.Rasterizer2D_xClipEnd) { + var11 = width + x - Rasterizer2D.Rasterizer2D_xClipEnd; + width -= var11; var9 += var11; var8 += var11; } - if (var3 > 0 && var4 > 0) { - AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); + if (width > 0 && height > 0) { + AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, pixels, color, var10, var7, width, height, var8, var9, alpha); } } diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java index 4d6fcf99ea..d218bd3f3a 100644 --- a/runescape-client/src/main/java/AbstractRasterProvider.java +++ b/runescape-client/src/main/java/AbstractRasterProvider.java @@ -32,7 +32,7 @@ public abstract class AbstractRasterProvider { garbageValue = "-430495007" ) @Export("drawFull") - public abstract void drawFull(int var1, int var2); + public abstract void drawFull(int x, int y); @ObfuscatedName("q") @ObfuscatedSignature( @@ -40,7 +40,7 @@ public abstract class AbstractRasterProvider { garbageValue = "18" ) @Export("draw") - public abstract void draw(int var1, int var2, int var3, int var4); + public abstract void draw(int x, int y, int width, int height); @ObfuscatedName("b") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java index 1e66754c59..46978179ee 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -13,7 +13,7 @@ public abstract class AbstractSocket { garbageValue = "1765046516" ) @Export("isAvailable") - public abstract boolean isAvailable(int var1) throws IOException; + public abstract boolean isAvailable(int length) throws IOException; @ObfuscatedName("q") @ObfuscatedSignature( @@ -37,7 +37,7 @@ public abstract class AbstractSocket { garbageValue = "-1089665746" ) @Export("read") - public abstract int read(byte[] var1, int var2, int var3) throws IOException; + public abstract int read(byte[] dst, int dstIndex, int length) throws IOException; @ObfuscatedName("u") @ObfuscatedSignature( @@ -45,7 +45,7 @@ public abstract class AbstractSocket { garbageValue = "-86" ) @Export("write") - public abstract void write(byte[] var1, int var2, int var3) throws IOException; + public abstract void write(byte[] src, int srcIndex, int length) throws IOException; @ObfuscatedName("g") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index 4e4e90f7e0..04e7f744bb 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -54,14 +54,16 @@ public abstract class AbstractWorldMapIcon { signature = "(I)I", garbageValue = "1990181988" ) - public abstract int vmethod395(); + @Export("element") + public abstract int element(); @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)Laj;", garbageValue = "1159446036" ) - abstract WorldMapLabel vmethod396(); + @Export("label") + abstract WorldMapLabel label(); @ObfuscatedName("q") @ObfuscatedSignature( @@ -92,7 +94,7 @@ public abstract class AbstractWorldMapIcon { garbageValue = "1150380891" ) boolean method19() { - return this.vmethod395() >= 0; + return this.element() >= 0; } @ObfuscatedName("b") @@ -104,7 +106,7 @@ public abstract class AbstractWorldMapIcon { if (!this.method19()) { return false; } else { - WorldMapElement var3 = ViewportMouse.getWorldMapElement(this.vmethod395()); + WorldMapElement var3 = ViewportMouse.getWorldMapElement(this.element()); int var4 = this.vmethod397(); int var5 = this.vmethod398(); switch(var3.field3287.field3528) { @@ -153,7 +155,7 @@ public abstract class AbstractWorldMapIcon { garbageValue = "1201712205" ) boolean method21(int var1, int var2) { - WorldMapLabel var3 = this.vmethod396(); + WorldMapLabel var3 = this.label(); return var3 == null ? false : (var1 >= this.field5 - var3.width / 2 && var1 <= var3.width / 2 + this.field5 ? var2 >= this.field6 && var2 <= var3.height + this.field6 : false); } diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index 2426fcb1e9..2c31c8b140 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -61,9 +61,9 @@ public final class AccessFile { @ObfuscatedName("m") @Export("seek") - final void seek(long var1) throws IOException { - this.file.seek(var1); - this.index = var1; + final void seek(long index) throws IOException { + this.file.seek(index); + this.index = index; } @ObfuscatedName("f") @@ -72,14 +72,14 @@ public final class AccessFile { garbageValue = "-86" ) @Export("write") - public final void write(byte[] var1, int var2, int var3) throws IOException { - if ((long)var3 + this.index > this.capacity) { + public final void write(byte[] src, int srcIndex, int length) throws IOException { + if ((long)length + this.index > this.capacity) { this.file.seek(this.capacity + 1L); this.file.write(1); throw new EOFException(); } else { - this.file.write(var1, var2, var3); - this.index += (long)var3; + this.file.write(src, srcIndex, length); + this.index += (long)length; } } @@ -99,9 +99,9 @@ public final class AccessFile { garbageValue = "166642884" ) @Export("closeSync") - public final void closeSync(boolean var1) throws IOException { + public final void closeSync(boolean sync) throws IOException { if (this.file != null) { - if (var1) { + if (sync) { try { this.file.getFD().sync(); } catch (SyncFailedException var3) { @@ -130,8 +130,8 @@ public final class AccessFile { garbageValue = "971670468" ) @Export("read") - public final int read(byte[] var1, int var2, int var3) throws IOException { - int var4 = this.file.read(var1, var2, var3); + public final int read(byte[] dst, int dstIndex, int length) throws IOException { + int var4 = this.file.read(dst, dstIndex, length); if (var4 > 0) { this.index += (long)var4; } diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index 165e826ca9..12cc33ee48 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -390,13 +390,13 @@ public abstract class Actor extends Entity { garbageValue = "-1925126781" ) @Export("addHitSplat") - final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { + final void addHitSplat(int type, int value, int type2, int value2, int cycle, int cycle2) { boolean var7 = true; boolean var8 = true; int var9; for (var9 = 0; var9 < 4; ++var9) { - if (this.hitSplatCycles[var9] > var5) { + if (this.hitSplatCycles[var9] > cycle) { var7 = false; } else { var8 = false; @@ -406,8 +406,8 @@ public abstract class Actor extends Entity { var9 = -1; int var10 = -1; int var11 = 0; - if (var1 >= 0) { - HitSplatDefinition var12 = LoginScreenAnimation.getHitSplatDefinition(var1); + if (type >= 0) { + HitSplatDefinition var12 = LoginScreenAnimation.getHitSplatDefinition(type); var10 = var12.field396; var11 = var12.field387; } @@ -438,7 +438,7 @@ public abstract class Actor extends Entity { } } - if (var10 == 1 && var14 >= var2) { + if (var10 == 1 && var14 >= value) { return; } } else { @@ -449,7 +449,7 @@ public abstract class Actor extends Entity { for (var14 = 0; var14 < 4; ++var14) { byte var15 = this.hitSplatCount; this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4); - if (this.hitSplatCycles[var15] <= var5) { + if (this.hitSplatCycles[var15] <= cycle) { var9 = var15; break; } @@ -457,11 +457,11 @@ public abstract class Actor extends Entity { } if (var9 >= 0) { - this.hitSplatTypes[var9] = var1; - this.hitSplatValues[var9] = var2; - this.hitSplatTypes2[var9] = var3; - this.hitSplatValues2[var9] = var4; - this.hitSplatCycles[var9] = var5 + var11 + var6; + this.hitSplatTypes[var9] = type; + this.hitSplatValues[var9] = value; + this.hitSplatTypes2[var9] = type2; + this.hitSplatValues2[var9] = value2; + this.hitSplatCycles[var9] = cycle + var11 + cycle2; } } @@ -472,19 +472,19 @@ public abstract class Actor extends Entity { garbageValue = "27" ) @Export("addHealthBar") - final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { - HealthBarDefinition var7 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); + final void addHealthBar(int healthBarDefinition, int cycle, int var3, int var4, int var5, int var6) { + HealthBarDefinition var7 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)healthBarDefinition); HealthBarDefinition var8; if (var7 != null) { var8 = var7; } else { - byte[] var9 = HealthBarDefinition.field379.takeFile(33, var1); + byte[] var9 = HealthBarDefinition.field379.takeFile(33, healthBarDefinition); var7 = new HealthBarDefinition(); if (var9 != null) { var7.decode(new Buffer(var9)); } - HealthBarDefinition.HealthBarDefinition_cached.put(var7, (long)var1); + HealthBarDefinition.HealthBarDefinition_cached.put(var7, (long)healthBarDefinition); var8 = var7; } @@ -498,7 +498,7 @@ public abstract class Actor extends Entity { for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) { ++var12; if (var13.definition.field381 == var7.field381) { - var13.put(var2 + var4, var5, var6, var3); + var13.put(cycle + var4, var5, var6, var3); return; } @@ -520,7 +520,7 @@ public abstract class Actor extends Entity { IterableNodeDeque.IterableNodeDeque_addBefore(var13, var14); } - var13.put(var2 + var4, var5, var6, var3); + var13.put(cycle + var4, var5, var6, var3); if (var12 >= 4) { var10.remove(); } @@ -534,19 +534,19 @@ public abstract class Actor extends Entity { garbageValue = "-31198" ) @Export("removeHealthBar") - final void removeHealthBar(int var1) { - HealthBarDefinition var2 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); + final void removeHealthBar(int healthBarDefinition) { + HealthBarDefinition var2 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)healthBarDefinition); HealthBarDefinition var3; if (var2 != null) { var3 = var2; } else { - byte[] var4 = HealthBarDefinition.field379.takeFile(33, var1); + byte[] var4 = HealthBarDefinition.field379.takeFile(33, healthBarDefinition); var2 = new HealthBarDefinition(); if (var4 != null) { var2.decode(new Buffer(var4)); } - HealthBarDefinition.HealthBarDefinition_cached.put(var2, (long)var1); + HealthBarDefinition.HealthBarDefinition_cached.put(var2, (long)healthBarDefinition); var3 = var2; } @@ -567,343 +567,343 @@ public abstract class Actor extends Entity { garbageValue = "493234011" ) @Export("menuAction") - static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) { - if (var2 >= 2000) { - var2 -= 2000; + static final void menuAction(int argument1, int argument2, int opcode, int argument0, String action, String targetName, int mouseX, int mouseY) { + if (opcode >= 2000) { + opcode -= 2000; } PacketBufferNode var8; - if (var2 == 1) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + if (opcode == 1) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field266, Client.packetWriter.isaacCipher); - var8.packetBuffer.method64(GraphicsObject.baseY + var1); + var8.packetBuffer.method64(GraphicsObject.baseY + argument2); var8.packetBuffer.writeShortLE(HealthBarDefinition.selectedItemSlot); var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); var8.packetBuffer.writeIntLE(ServerPacket.selectedItemWidget); - var8.packetBuffer.method64(var0 + class50.baseX); - var8.packetBuffer.writeShort(var3); + var8.packetBuffer.method64(argument1 + class50.baseX); + var8.packetBuffer.writeShort(argument0); var8.packetBuffer.writeShortLE(MenuAction.selectedItemId); Client.packetWriter.method241(var8); - } else if (var2 == 2) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 2) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field314, Client.packetWriter.isaacCipher); var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(var0 + class50.baseX); - var8.packetBuffer.method63(var3); + var8.packetBuffer.writeShort(argument1 + class50.baseX); + var8.packetBuffer.method63(argument0); var8.packetBuffer.writeIntLE16(ServerBuild.field788); var8.packetBuffer.writeShort(Client.field220); - var8.packetBuffer.writeShortLE(GraphicsObject.baseY + var1); + var8.packetBuffer.writeShortLE(GraphicsObject.baseY + argument2); Client.packetWriter.method241(var8); - } else if (var2 == 3) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 3) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field232, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(GraphicsObject.baseY + var1); + var8.packetBuffer.writeShort(GraphicsObject.baseY + argument2); var8.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method63(var3); - var8.packetBuffer.method64(var0 + class50.baseX); + var8.packetBuffer.method63(argument0); + var8.packetBuffer.method64(argument1 + class50.baseX); Client.packetWriter.method241(var8); - } else if (var2 == 4) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 4) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field301, Client.packetWriter.isaacCipher); var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeShort(GraphicsObject.baseY + var1); - var8.packetBuffer.writeShort(var0 + class50.baseX); + var8.packetBuffer.writeShort(argument0); + var8.packetBuffer.writeShort(GraphicsObject.baseY + argument2); + var8.packetBuffer.writeShort(argument1 + class50.baseX); Client.packetWriter.method241(var8); - } else if (var2 == 5) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 5) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field311, Client.packetWriter.isaacCipher); - var8.packetBuffer.method64(var0 + class50.baseX); - var8.packetBuffer.method63(var3); - var8.packetBuffer.method64(GraphicsObject.baseY + var1); + var8.packetBuffer.method64(argument1 + class50.baseX); + var8.packetBuffer.method63(argument0); + var8.packetBuffer.method64(GraphicsObject.baseY + argument2); var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); Client.packetWriter.method241(var8); - } else if (var2 == 6) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 6) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field225, Client.packetWriter.isaacCipher); var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method63(GraphicsObject.baseY + var1); - var8.packetBuffer.method63(var0 + class50.baseX); - var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.method63(GraphicsObject.baseY + argument2); + var8.packetBuffer.method63(argument1 + class50.baseX); + var8.packetBuffer.writeShortLE(argument0); Client.packetWriter.method241(var8); } else { PacketBufferNode var9; NPC var10; - if (var2 == 7) { - var10 = Client.npcs[var3]; + if (opcode == 7) { + var10 = Client.npcs[argument0]; if (var10 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field245, Client.packetWriter.isaacCipher); var9.packetBuffer.method64(MenuAction.selectedItemId); var9.packetBuffer.writeShort(HealthBarDefinition.selectedItemSlot); - var9.packetBuffer.method64(var3); + var9.packetBuffer.method64(argument0); var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); var9.packetBuffer.writeInt(ServerPacket.selectedItemWidget); Client.packetWriter.method241(var9); } - } else if (var2 == 8) { - var10 = Client.npcs[var3]; + } else if (opcode == 8) { + var10 = Client.npcs[argument0]; if (var10 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field308, Client.packetWriter.isaacCipher); - var9.packetBuffer.method64(var3); + var9.packetBuffer.method64(argument0); var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); var9.packetBuffer.writeIntLE(ServerBuild.field788); var9.packetBuffer.method63(Client.field220); Client.packetWriter.method241(var9); } - } else if (var2 == 9) { - var10 = Client.npcs[var3]; + } else if (opcode == 9) { + var10 = Client.npcs[argument0]; if (var10 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field293, Client.packetWriter.isaacCipher); var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShortLE(var3); + var9.packetBuffer.writeShortLE(argument0); Client.packetWriter.method241(var9); } - } else if (var2 == 10) { - var10 = Client.npcs[var3]; + } else if (opcode == 10) { + var10 = Client.npcs[argument0]; if (var10 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field223, Client.packetWriter.isaacCipher); - var9.packetBuffer.method63(var3); + var9.packetBuffer.method63(argument0); var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); Client.packetWriter.method241(var9); } - } else if (var2 == 11) { - var10 = Client.npcs[var3]; + } else if (opcode == 11) { + var10 = Client.npcs[argument0]; if (var10 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field255, Client.packetWriter.isaacCipher); - var9.packetBuffer.method64(var3); + var9.packetBuffer.method64(argument0); var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); Client.packetWriter.method241(var9); } - } else if (var2 == 12) { - var10 = Client.npcs[var3]; + } else if (opcode == 12) { + var10 = Client.npcs[argument0]; if (var10 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field281, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); + var9.packetBuffer.writeShort(argument0); var9.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); Client.packetWriter.method241(var9); } - } else if (var2 == 13) { - var10 = Client.npcs[var3]; + } else if (opcode == 13) { + var10 = Client.npcs[argument0]; if (var10 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field253, Client.packetWriter.isaacCipher); var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method63(var3); + var9.packetBuffer.method63(argument0); Client.packetWriter.method241(var9); } } else { Player var11; - if (var2 == 14) { - var11 = Client.players[var3]; + if (opcode == 14) { + var11 = Client.players[argument0]; if (var11 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field303, Client.packetWriter.isaacCipher); var9.packetBuffer.method64(HealthBarDefinition.selectedItemSlot); var9.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); var9.packetBuffer.writeIntME(ServerPacket.selectedItemWidget); - var9.packetBuffer.writeShort(var3); + var9.packetBuffer.writeShort(argument0); var9.packetBuffer.writeShort(MenuAction.selectedItemId); Client.packetWriter.method241(var9); } - } else if (var2 == 15) { - var11 = Client.players[var3]; + } else if (opcode == 15) { + var11 = Client.players[argument0]; if (var11 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field277, Client.packetWriter.isaacCipher); var9.packetBuffer.writeIntLE16(ServerBuild.field788); var9.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); var9.packetBuffer.method63(Client.field220); - var9.packetBuffer.writeShort(var3); + var9.packetBuffer.writeShort(argument0); Client.packetWriter.method241(var9); } - } else if (var2 == 16) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 16) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field240, Client.packetWriter.isaacCipher); var8.packetBuffer.writeIntME(ServerPacket.selectedItemWidget); var8.packetBuffer.method64(MenuAction.selectedItemId); var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); var8.packetBuffer.writeShortLE(HealthBarDefinition.selectedItemSlot); - var8.packetBuffer.method64(var3); - var8.packetBuffer.method64(var0 + class50.baseX); - var8.packetBuffer.writeShortLE(GraphicsObject.baseY + var1); + var8.packetBuffer.method64(argument0); + var8.packetBuffer.method64(argument1 + class50.baseX); + var8.packetBuffer.writeShortLE(GraphicsObject.baseY + argument2); Client.packetWriter.method241(var8); - } else if (var2 == 17) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 17) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field275, Client.packetWriter.isaacCipher); var8.packetBuffer.writeIntME(ServerBuild.field788); var8.packetBuffer.writeShort(Client.field220); - var8.packetBuffer.method63(GraphicsObject.baseY + var1); - var8.packetBuffer.method63(var0 + class50.baseX); + var8.packetBuffer.method63(GraphicsObject.baseY + argument2); + var8.packetBuffer.method63(argument1 + class50.baseX); var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.writeShortLE(argument0); Client.packetWriter.method241(var8); - } else if (var2 == 18) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 18) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field227, Client.packetWriter.isaacCipher); - var8.packetBuffer.method64(GraphicsObject.baseY + var1); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.writeShortLE(var0 + class50.baseX); + var8.packetBuffer.method64(GraphicsObject.baseY + argument2); + var8.packetBuffer.writeShortLE(argument0); + var8.packetBuffer.writeShortLE(argument1 + class50.baseX); var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); Client.packetWriter.method241(var8); - } else if (var2 == 19) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 19) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field296, Client.packetWriter.isaacCipher); - var8.packetBuffer.method64(var3); - var8.packetBuffer.method63(var0 + class50.baseX); - var8.packetBuffer.writeShort(GraphicsObject.baseY + var1); + var8.packetBuffer.method64(argument0); + var8.packetBuffer.method63(argument1 + class50.baseX); + var8.packetBuffer.writeShort(GraphicsObject.baseY + argument2); var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); Client.packetWriter.method241(var8); - } else if (var2 == 20) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 20) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field228, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(GraphicsObject.baseY + var1); + var8.packetBuffer.writeShortLE(GraphicsObject.baseY + argument2); var8.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShortLE(var0 + class50.baseX); - var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.writeShortLE(argument1 + class50.baseX); + var8.packetBuffer.writeShortLE(argument0); Client.packetWriter.method241(var8); - } else if (var2 == 21) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 21) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field251, Client.packetWriter.isaacCipher); - var8.packetBuffer.method63(GraphicsObject.baseY + var1); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.writeShort(var0 + class50.baseX); + var8.packetBuffer.method63(GraphicsObject.baseY + argument2); + var8.packetBuffer.writeShortLE(argument0); + var8.packetBuffer.writeShort(argument1 + class50.baseX); var8.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); Client.packetWriter.method241(var8); - } else if (var2 == 22) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + } else if (opcode == 22) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field273, Client.packetWriter.isaacCipher); var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method64(var3); - var8.packetBuffer.method63(GraphicsObject.baseY + var1); - var8.packetBuffer.writeShort(var0 + class50.baseX); + var8.packetBuffer.method64(argument0); + var8.packetBuffer.method63(GraphicsObject.baseY + argument2); + var8.packetBuffer.writeShort(argument1 + class50.baseX); Client.packetWriter.method241(var8); - } else if (var2 == 23) { + } else if (opcode == 23) { if (Client.isMenuOpen) { class65.scene.method296(); } else { - class65.scene.menuOpen(SoundSystem.plane, var0, var1, true); + class65.scene.menuOpen(SoundSystem.plane, argument1, argument2, true); } } else { PacketBufferNode var12; Widget var13; - if (var2 == 24) { - var13 = Huffman.getWidget(var1); + if (opcode == 24) { + var13 = Huffman.getWidget(argument2); boolean var14 = true; if (var13.contentType > 0) { var14 = ViewportMouse.method2957(var13); @@ -911,15 +911,15 @@ public abstract class Actor extends Entity { if (var14) { var12 = Interpreter.method1915(ClientPacket.field291, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeInt(var1); + var12.packetBuffer.writeInt(argument2); Client.packetWriter.method241(var12); } } else { - if (var2 == 25) { - var13 = class204.getWidgetChild(var1, var0); + if (opcode == 25) { + var13 = class204.getWidgetChild(argument2, argument1); if (var13 != null) { Player.method1281(); - WorldMapDecoration.method350(var1, var0, class211.method4107(class1.getWidgetClickMask(var13)), var13.itemId); + WorldMapDecoration.method350(argument2, argument1, class211.method4107(class1.getWidgetClickMask(var13)), var13.itemId); Client.isItemSelected = 0; Client.selectedSpellActionName = class198.method3745(var13); if (Client.selectedSpellActionName == null) { @@ -936,117 +936,117 @@ public abstract class Actor extends Entity { return; } - if (var2 == 26) { + if (opcode == 26) { WorldMapLabelSize.method198(); } else { - Widget var15; - int var17; - if (var2 == 28) { + int var15; + Widget var17; + if (opcode == 28) { var8 = Interpreter.method1915(ClientPacket.field291, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); + var8.packetBuffer.writeInt(argument2); Client.packetWriter.method241(var8); - var15 = Huffman.getWidget(var1); - if (var15.cs1Instructions != null && var15.cs1Instructions[0][0] == 5) { - var17 = var15.cs1Instructions[0][1]; - Varps.Varps_main[var17] = 1 - Varps.Varps_main[var17]; - Archive.method4703(var17); + var17 = Huffman.getWidget(argument2); + if (var17.cs1Instructions != null && var17.cs1Instructions[0][0] == 5) { + var15 = var17.cs1Instructions[0][1]; + Varps.Varps_main[var15] = 1 - Varps.Varps_main[var15]; + Archive.method4703(var15); } - } else if (var2 == 29) { + } else if (opcode == 29) { var8 = Interpreter.method1915(ClientPacket.field291, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); + var8.packetBuffer.writeInt(argument2); Client.packetWriter.method241(var8); - var15 = Huffman.getWidget(var1); - if (var15.cs1Instructions != null && var15.cs1Instructions[0][0] == 5) { - var17 = var15.cs1Instructions[0][1]; - if (Varps.Varps_main[var17] != var15.cs1ComparisonValues[0]) { - Varps.Varps_main[var17] = var15.cs1ComparisonValues[0]; - Archive.method4703(var17); + var17 = Huffman.getWidget(argument2); + if (var17.cs1Instructions != null && var17.cs1Instructions[0][0] == 5) { + var15 = var17.cs1Instructions[0][1]; + if (Varps.Varps_main[var15] != var17.cs1ComparisonValues[0]) { + Varps.Varps_main[var15] = var17.cs1ComparisonValues[0]; + Archive.method4703(var15); } } - } else if (var2 == 30) { + } else if (opcode == 30) { if (Client.field127 == null) { - TilePaint.method3060(var1, var0); - Client.field127 = class204.getWidgetChild(var1, var0); + TilePaint.method3060(argument2, argument1); + Client.field127 = class204.getWidgetChild(argument2, argument1); class22.method295(Client.field127); } - } else if (var2 == 31) { + } else if (opcode == 31) { var8 = Interpreter.method1915(ClientPacket.field285, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(var1); + var8.packetBuffer.writeIntME(argument2); var8.packetBuffer.writeIntLE16(ServerPacket.selectedItemWidget); var8.packetBuffer.method64(HealthBarDefinition.selectedItemSlot); var8.packetBuffer.writeShortLE(MenuAction.selectedItemId); - var8.packetBuffer.writeShortLE(var0); - var8.packetBuffer.method64(var3); + var8.packetBuffer.writeShortLE(argument1); + var8.packetBuffer.method64(argument0); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; - } else if (var2 == 32) { + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; + } else if (opcode == 32) { var8 = Interpreter.method1915(ClientPacket.field224, Client.packetWriter.isaacCipher); var8.packetBuffer.writeIntME(ServerBuild.field788); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.writeInt(argument2); + var8.packetBuffer.writeShort(argument1); + var8.packetBuffer.writeShortLE(argument0); var8.packetBuffer.writeShortLE(Client.field220); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; - } else if (var2 == 33) { + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; + } else if (opcode == 33) { var8 = Interpreter.method1915(ClientPacket.field309, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.writeShort(var0); + var8.packetBuffer.writeShortLE(argument0); + var8.packetBuffer.writeIntME(argument2); + var8.packetBuffer.writeShort(argument1); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; - } else if (var2 == 34) { + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; + } else if (opcode == 34) { var8 = Interpreter.method1915(ClientPacket.field320, Client.packetWriter.isaacCipher); - var8.packetBuffer.method63(var3); - var8.packetBuffer.writeIntLE16(var1); - var8.packetBuffer.method64(var0); + var8.packetBuffer.method63(argument0); + var8.packetBuffer.writeIntLE16(argument2); + var8.packetBuffer.method64(argument1); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; - } else if (var2 == 35) { + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; + } else if (opcode == 35) { var8 = Interpreter.method1915(ClientPacket.field294, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntLE(var1); - var8.packetBuffer.method64(var0); - var8.packetBuffer.method64(var3); + var8.packetBuffer.writeIntLE(argument2); + var8.packetBuffer.method64(argument1); + var8.packetBuffer.method64(argument0); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; - } else if (var2 == 36) { + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; + } else if (opcode == 36) { var8 = Interpreter.method1915(ClientPacket.field229, Client.packetWriter.isaacCipher); - var8.packetBuffer.method64(var3); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.method64(var0); + var8.packetBuffer.method64(argument0); + var8.packetBuffer.writeInt(argument2); + var8.packetBuffer.method64(argument1); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; - } else if (var2 == 37) { + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; + } else if (opcode == 37) { var8 = Interpreter.method1915(ClientPacket.field280, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeInt(argument2); + var8.packetBuffer.writeShort(argument1); + var8.packetBuffer.writeShort(argument0); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; } else { - if (var2 == 38) { + if (opcode == 38) { Player.method1281(); - var13 = Huffman.getWidget(var1); + var13 = Huffman.getWidget(argument2); Client.isItemSelected = 1; - HealthBarDefinition.selectedItemSlot = var0; - ServerPacket.selectedItemWidget = var1; - MenuAction.selectedItemId = var3; + HealthBarDefinition.selectedItemSlot = argument1; + ServerPacket.selectedItemWidget = argument2; + MenuAction.selectedItemId = argument0; class22.method295(var13); - Client.selectedItemName = BufferedFile.colorStartTag(16748608) + Skills.getItemDefinition(var3).name + BufferedFile.colorStartTag(16777215); + Client.selectedItemName = BufferedFile.colorStartTag(16748608) + Skills.getItemDefinition(argument0).name + BufferedFile.colorStartTag(16777215); if (Client.selectedItemName == null) { Client.selectedItemName = "null"; } @@ -1054,174 +1054,174 @@ public abstract class Actor extends Entity { return; } - if (var2 == 39) { + if (opcode == 39) { var8 = Interpreter.method1915(ClientPacket.field268, Client.packetWriter.isaacCipher); - var8.packetBuffer.method64(var3); - var8.packetBuffer.writeIntLE16(var1); - var8.packetBuffer.writeShortLE(var0); + var8.packetBuffer.method64(argument0); + var8.packetBuffer.writeIntLE16(argument2); + var8.packetBuffer.writeShortLE(argument1); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; - } else if (var2 == 40) { + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; + } else if (opcode == 40) { var8 = Interpreter.method1915(ClientPacket.field248, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntLE16(var1); - var8.packetBuffer.writeShortLE(var0); - var8.packetBuffer.method63(var3); + var8.packetBuffer.writeIntLE16(argument2); + var8.packetBuffer.writeShortLE(argument1); + var8.packetBuffer.method63(argument0); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; - } else if (var2 == 41) { + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; + } else if (opcode == 41) { var8 = Interpreter.method1915(ClientPacket.field287, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntLE(var1); - var8.packetBuffer.method63(var0); - var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeIntLE(argument2); + var8.packetBuffer.method63(argument1); + var8.packetBuffer.writeShort(argument0); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; - } else if (var2 == 42) { + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; + } else if (opcode == 42) { var8 = Interpreter.method1915(ClientPacket.field286, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.method63(var0); - var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeInt(argument2); + var8.packetBuffer.method63(argument1); + var8.packetBuffer.writeShort(argument0); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; - } else if (var2 == 43) { + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; + } else if (opcode == 43) { var8 = Interpreter.method1915(ClientPacket.field254, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.writeShort(var0); + var8.packetBuffer.writeShort(argument0); + var8.packetBuffer.writeIntME(argument2); + var8.packetBuffer.writeShort(argument1); Client.packetWriter.method241(var8); Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; - } else if (var2 == 44) { - var11 = Client.players[var3]; + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; + } else if (opcode == 44) { + var11 = Client.players[argument0]; if (var11 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field269, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); + var9.packetBuffer.writeShort(argument0); var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); Client.packetWriter.method241(var9); } - } else if (var2 == 45) { - var11 = Client.players[var3]; + } else if (opcode == 45) { + var11 = Client.players[argument0]; if (var11 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field278, Client.packetWriter.isaacCipher); var9.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method63(var3); + var9.packetBuffer.method63(argument0); Client.packetWriter.method241(var9); } - } else if (var2 == 46) { - var11 = Client.players[var3]; + } else if (opcode == 46) { + var11 = Client.players[argument0]; if (var11 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field284, Client.packetWriter.isaacCipher); - var9.packetBuffer.method63(var3); + var9.packetBuffer.method63(argument0); var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); Client.packetWriter.method241(var9); } - } else if (var2 == 47) { - var11 = Client.players[var3]; + } else if (opcode == 47) { + var11 = Client.players[argument0]; if (var11 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field249, Client.packetWriter.isaacCipher); - var9.packetBuffer.method64(var3); + var9.packetBuffer.method64(argument0); var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); Client.packetWriter.method241(var9); } - } else if (var2 == 48) { - var11 = Client.players[var3]; + } else if (opcode == 48) { + var11 = Client.players[argument0]; if (var11 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field305, Client.packetWriter.isaacCipher); var9.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method63(var3); + var9.packetBuffer.method63(argument0); Client.packetWriter.method241(var9); } - } else if (var2 == 49) { - var11 = Client.players[var3]; + } else if (opcode == 49) { + var11 = Client.players[argument0]; if (var11 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field315, Client.packetWriter.isaacCipher); - var9.packetBuffer.method63(var3); + var9.packetBuffer.method63(argument0); var9.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); Client.packetWriter.method241(var9); } - } else if (var2 == 50) { - var11 = Client.players[var3]; + } else if (opcode == 50) { + var11 = Client.players[argument0]; if (var11 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field297, Client.packetWriter.isaacCipher); var9.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShortLE(var3); + var9.packetBuffer.writeShortLE(argument0); Client.packetWriter.method241(var9); } - } else if (var2 == 51) { - var11 = Client.players[var3]; + } else if (opcode == 51) { + var11 = Client.players[argument0]; if (var11 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var9 = Interpreter.method1915(ClientPacket.field272, Client.packetWriter.isaacCipher); var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method64(var3); + var9.packetBuffer.method64(argument0); Client.packetWriter.method241(var9); } } else { label415: { - if (var2 != 57) { - if (var2 == 58) { - var13 = class204.getWidgetChild(var1, var0); + if (opcode != 57) { + if (opcode == 58) { + var13 = class204.getWidgetChild(argument2, argument1); if (var13 != null) { var9 = Interpreter.method1915(ClientPacket.field304, Client.packetWriter.isaacCipher); var9.packetBuffer.writeShortLE(Client.field220); - var9.packetBuffer.writeIntLE16(var1); + var9.packetBuffer.writeIntLE16(argument2); var9.packetBuffer.writeShortLE(Client.field157); - var9.packetBuffer.method64(var0); + var9.packetBuffer.method64(argument1); var9.packetBuffer.writeInt(ServerBuild.field788); var9.packetBuffer.method64(var13.itemId); Client.packetWriter.method241(var9); @@ -1229,39 +1229,39 @@ public abstract class Actor extends Entity { break label415; } - if (var2 == 1001) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + if (opcode == 1001) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; + Client.destinationX = argument1; + Client.destinationY = argument2; var8 = Interpreter.method1915(ClientPacket.field316, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeShort(argument0); var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method63(var0 + class50.baseX); - var8.packetBuffer.method64(GraphicsObject.baseY + var1); + var8.packetBuffer.method63(argument1 + class50.baseX); + var8.packetBuffer.method64(GraphicsObject.baseY + argument2); Client.packetWriter.method241(var8); break label415; } - if (var2 == 1002) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + if (opcode == 1002) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; var8 = Interpreter.method1915(ClientPacket.field258, Client.packetWriter.isaacCipher); - var8.packetBuffer.method63(var3); + var8.packetBuffer.method63(argument0); Client.packetWriter.method241(var8); break label415; } - if (var2 == 1003) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + if (opcode == 1003) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; - var10 = Client.npcs[var3]; + var10 = Client.npcs[argument0]; if (var10 != null) { NPCDefinition var16 = var10.definition; if (var16.transforms != null) { @@ -1277,44 +1277,44 @@ public abstract class Actor extends Entity { break label415; } - if (var2 == 1004) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; + if (opcode == 1004) { + Client.mouseCrossX = mouseX; + Client.mouseCrossY = mouseY; Client.mouseCrossColor = 2; Client.mouseCrossState = 0; var8 = Interpreter.method1915(ClientPacket.field246, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.writeShortLE(argument0); Client.packetWriter.method241(var8); break label415; } - if (var2 == 1005) { - var13 = Huffman.getWidget(var1); - if (var13 != null && var13.itemQuantities[var0] >= 100000) { - WorldMapIcon1.addGameMessage(27, "", var13.itemQuantities[var0] + " x " + Skills.getItemDefinition(var3).name); + if (opcode == 1005) { + var13 = Huffman.getWidget(argument2); + if (var13 != null && var13.itemQuantities[argument1] >= 100000) { + WorldMapIcon1.addGameMessage(27, "", var13.itemQuantities[argument1] + " x " + Skills.getItemDefinition(argument0).name); } else { var9 = Interpreter.method1915(ClientPacket.field246, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortLE(var3); + var9.packetBuffer.writeShortLE(argument0); Client.packetWriter.method241(var9); } Client.field203 = 0; - BoundaryObject.field40 = Huffman.getWidget(var1); - Client.field204 = var0; + BoundaryObject.field40 = Huffman.getWidget(argument2); + Client.field204 = argument1; break label415; } - if (var2 != 1007) { - if (var2 == 1008 || var2 == 1011 || var2 == 1010 || var2 == 1009 || var2 == 1012) { - class60.worldMap0.menuAction(var2, var3, new Coord(var0), new Coord(var1)); + if (opcode != 1007) { + if (opcode == 1008 || opcode == 1011 || opcode == 1010 || opcode == 1009 || opcode == 1012) { + class60.worldMap0.menuAction(opcode, argument0, new Coord(argument1), new Coord(argument2)); } break label415; } } - var13 = class204.getWidgetChild(var1, var0); + var13 = class204.getWidgetChild(argument2, argument1); if (var13 != null) { - class171.method3494(var3, var1, var0, var13.itemId, var5); + class171.method3494(argument0, argument2, argument1, var13.itemId, targetName); } } } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index aa99584f22..1bd1f3e6f5 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -116,8 +116,8 @@ public class Archive extends AbstractArchive { byte[] var3 = null; NodeDeque var4 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue; synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - for (ArchiveDiskAction var6 = (ArchiveDiskAction) ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction) ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { - if (var6.key == (long) group && var2 == var6.archiveDisk && var6.type == 0) { + for (ArchiveDiskAction var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { + if (var6.key == (long)group && var2 == var6.archiveDisk && var6.type == 0) { var3 = var6.data; break; } @@ -181,7 +181,7 @@ public class Archive extends AbstractArchive { byte[] var5 = null; NodeDeque var6 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue; synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - for (ArchiveDiskAction var8 = (ArchiveDiskAction) ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction) ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { + for (ArchiveDiskAction var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { if (var8.key == (long)var3 && var4 == var8.archiveDisk && var8.type == 0) { var5 = var8.data; break; @@ -245,7 +245,9 @@ public class Archive extends AbstractArchive { if (var1 == this.masterDisk) { if (this.field403) { throw new RuntimeException(); - } else if (var3 == null) { + } + + if (var3 == null) { PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } else { Archive_crc.reset(); @@ -254,22 +256,22 @@ public class Archive extends AbstractArchive { if (var5 != this.indexCrc) { PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } else { - Buffer var9 = new Buffer(Strings.decompressBytes(var3)); - int var7 = var9.readUnsignedByte(); + Buffer var6 = new Buffer(Strings.decompressBytes(var3)); + int var7 = var6.readUnsignedByte(); if (var7 != 5 && var7 != 6) { throw new RuntimeException(var7 + "," + this.index + "," + var2); - } else { - int var8 = 0; - if (var7 >= 6) { - var8 = var9.readInt(); - } + } - if (var8 != this.indexVersion) { - PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); - } else { - this.decodeIndex(var3); - this.loadAllLocal(); - } + int var8 = 0; + if (var7 >= 6) { + var8 = var6.readInt(); + } + + if (var8 != this.indexVersion) { + PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + } else { + this.decodeIndex(var3); + this.loadAllLocal(); } } } @@ -282,28 +284,26 @@ public class Archive extends AbstractArchive { Archive_crc.reset(); Archive_crc.update(var3, 0, var3.length - 2); var5 = (int)Archive_crc.getValue(); - int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); - if (var5 == super.groupCrcs[var2] && var6 == super.groupVersions[var2]) { + int var9 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); + if (var5 == super.groupCrcs[var2] && var9 == super.groupVersions[var2]) { this.validGroups[var2] = true; if (var4) { super.groups[var2] = Projectile.byteArrayToObject(var3, false); } - } else { this.validGroups[var2] = false; if (this.field404 || var4) { PacketBuffer.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } - } } else { this.validGroups[var2] = false; if (this.field404 || var4) { PacketBuffer.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } - } } + } @ObfuscatedName("dt") diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index 24608e765e..19489b851f 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -8,8 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ff") @Implements("ArchiveDisk") -public final class ArchiveDisk -{ +public final class ArchiveDisk { @ObfuscatedName("m") @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; @@ -57,83 +56,86 @@ public final class ArchiveDisk garbageValue = "-294587791" ) @Export("read") - public byte[] read(int var1) { + public byte[] read(int entry) { BufferedFile var2 = this.datFile; synchronized(this.datFile) { - byte[] var10000; try { - Object var4; - if (this.idxFile.length() < (long)(var1 * 6 + 6)) { - var4 = null; - var10000 = ((byte[])var4); + byte[] var4; + Object var5; + byte[] var10000; + if (this.idxFile.length() < (long)(entry * 6 + 6)) { + var5 = null; + var4 = ((byte[])var5); + var10000 = var4; return var10000; - } + } else { + this.idxFile.seek((long)(entry * 6)); + this.idxFile.read(ArchiveDisk_buffer, 0, 6); + int var6 = ((ArchiveDisk_buffer[0] & 255) << 16) + (ArchiveDisk_buffer[2] & 255) + ((ArchiveDisk_buffer[1] & 255) << 8); + int var7 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); + if (var6 < 0 || var6 > this.maxEntrySize) { + var5 = null; + var4 = ((byte[])var5); + var10000 = var4; + return var10000; + } else if (var7 <= 0 || (long)var7 > this.datFile.length() / 520L) { + var5 = null; + var4 = ((byte[])var5); + return var4; + } else { + byte[] var8 = new byte[var6]; + int var9 = 0; + int var10 = 0; - this.idxFile.seek((long)(var1 * 6)); - this.idxFile.read(ArchiveDisk_buffer, 0, 6); - int var5 = ((ArchiveDisk_buffer[0] & 255) << 16) + (ArchiveDisk_buffer[2] & 255) + ((ArchiveDisk_buffer[1] & 255) << 8); - int var6 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); - if (var5 < 0 || var5 > this.maxEntrySize) { - var4 = null; - var10000 = ((byte[])var4); - return var10000; - } - - if (var6 > 0 && (long)var6 <= this.datFile.length() / 520L) { - byte[] var7 = new byte[var5]; - int var8 = 0; - int var9 = 0; - - while (var8 < var5) { - if (var6 == 0) { - var4 = null; - var10000 = ((byte[])var4); - return var10000; - } - - this.datFile.seek((long)(var6 * 520)); - int var10 = var5 - var8; - if (var10 > 512) { - var10 = 512; - } - - this.datFile.read(ArchiveDisk_buffer, 0, var10 + 8); - int var11 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); - int var12 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); - int var13 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); - int var14 = ArchiveDisk_buffer[7] & 255; - if (var11 == var1 && var9 == var12 && var14 == this.archive) { - if (var13 >= 0 && (long)var13 <= this.datFile.length() / 520L) { - for (int var15 = 0; var15 < var10; ++var15) { - var7[var8++] = ArchiveDisk_buffer[var15 + 8]; - } - - var6 = var13; - ++var9; - continue; + while (var9 < var6) { + if (var7 == 0) { + var5 = null; + var4 = ((byte[])var5); + var10000 = var4; + return var10000; } - var4 = null; - var10000 = ((byte[])var4); + this.datFile.seek((long)(var7 * 520)); + int var11 = var6 - var9; + if (var11 > 512) { + var11 = 512; + } + + this.datFile.read(ArchiveDisk_buffer, 0, var11 + 8); + int var12 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); + int var13 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); + int var14 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); + int var15 = ArchiveDisk_buffer[7] & 255; + if (var12 == entry && var10 == var13 && var15 == this.archive) { + if (var14 >= 0 && (long)var14 <= this.datFile.length() / 520L) { + for (int var16 = 0; var16 < var11; ++var16) { + var8[var9++] = ArchiveDisk_buffer[var16 + 8]; + } + + var7 = var14; + ++var10; + continue; + } + + var5 = null; + var4 = ((byte[])var5); + var10000 = var4; + return var10000; + } + + var5 = null; + var4 = ((byte[])var5); + var10000 = var4; return var10000; } - var4 = null; - var10000 = ((byte[])var4); + var10000 = var8; return var10000; } - - var10000 = var7; - return var10000; } - - var4 = null; - var10000 = ((byte[])var4); - } catch (IOException var17) { + } catch (IOException var18) { return null; } - - return var10000; } } @@ -202,75 +204,75 @@ public final class ArchiveDisk ArchiveDisk_buffer[5] = (byte)var7; this.idxFile.seek((long)(var1 * 6)); this.idxFile.write(ArchiveDisk_buffer, 0, 6); - int var9 = 0; int var10 = 0; + int var11 = 0; while (true) { - if (var9 < var3) { + if (var10 < var3) { label129: { - int var11 = 0; - int var12; + int var12 = 0; + int var13; if (var4) { this.datFile.seek((long)(var7 * 520)); try { this.datFile.read(ArchiveDisk_buffer, 0, 8); - } catch (EOFException var16) { + } catch (EOFException var17) { break label129; } - var12 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); - int var13 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); - var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); - int var14 = ArchiveDisk_buffer[7] & 255; - if (var12 != var1 || var13 != var10 || var14 != this.archive) { + var13 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); + int var14 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); + var12 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); + int var15 = ArchiveDisk_buffer[7] & 255; + if (var13 != var1 || var14 != var11 || var15 != this.archive) { var8 = false; var10000 = var8; return var10000; } - if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) { + if (var12 < 0 || (long)var12 > this.datFile.length() / 520L) { var8 = false; var10000 = var8; return var10000; } } - if (var11 == 0) { + if (var12 == 0) { var4 = false; - var11 = (int)((this.datFile.length() + 519L) / 520L); - if (var11 == 0) { - ++var11; + var12 = (int)((this.datFile.length() + 519L) / 520L); + if (var12 == 0) { + ++var12; } - if (var7 == var11) { - ++var11; + if (var7 == var12) { + ++var12; } } - if (var3 - var9 <= 512) { - var11 = 0; + if (var3 - var10 <= 512) { + var12 = 0; } ArchiveDisk_buffer[0] = (byte)(var1 >> 8); ArchiveDisk_buffer[1] = (byte)var1; - ArchiveDisk_buffer[2] = (byte)(var10 >> 8); - ArchiveDisk_buffer[3] = (byte)var10; - ArchiveDisk_buffer[4] = (byte)(var11 >> 16); - ArchiveDisk_buffer[5] = (byte)(var11 >> 8); - ArchiveDisk_buffer[6] = (byte)var11; + ArchiveDisk_buffer[2] = (byte)(var11 >> 8); + ArchiveDisk_buffer[3] = (byte)var11; + ArchiveDisk_buffer[4] = (byte)(var12 >> 16); + ArchiveDisk_buffer[5] = (byte)(var12 >> 8); + ArchiveDisk_buffer[6] = (byte)var12; ArchiveDisk_buffer[7] = (byte)this.archive; this.datFile.seek((long)(var7 * 520)); this.datFile.write(ArchiveDisk_buffer, 0, 8); - var12 = var3 - var9; - if (var12 > 512) { - var12 = 512; + var13 = var3 - var10; + if (var13 > 512) { + var13 = 512; } - this.datFile.write(var2, var9, var12); - var9 += var12; - var7 = var11; - ++var10; + this.datFile.write(var2, var10, var13); + var10 += var13; + var7 = var12; + ++var11; continue; } } @@ -279,7 +281,7 @@ public final class ArchiveDisk var10000 = var8; return var10000; } - } catch (IOException var17) { + } catch (IOException var18) { return false; } } @@ -306,188 +308,197 @@ public final class ArchiveDisk class178.bufferY[var11] = var1; int[][] var14 = var4.flags; - label204: - while (var13 != var12) { - var5 = class178.bufferX[var12]; - var6 = class178.bufferY[var12]; - var12 = var12 + 1 & 4095; - int var19 = var5 - var9; - int var20 = var6 - var10; - int var15 = var5 - var4.xInset; - int var16 = var6 - var4.yInset; - if (var3.vmethod3644(var2, var5, var6, var4)) { - InterfaceParent.field986 = var5; - UrlRequester.field929 = var6; - return true; - } + while (true) { + label241: + while (true) { + int var15; + int var16; + int var17; + int var18; + int var19; + int var20; + do { + do { + do { + label218: + do { + if (var13 == var12) { + InterfaceParent.field986 = var5; + UrlRequester.field929 = var6; + return false; + } - int var17 = class178.distances[var19][var20] + 1; - int var18; - if (var19 > 0 && class178.directions[var19 - 1][var20] == 0 && (var14[var15 - 1][var16] & 19136782) == 0 && (var14[var15 - 1][var16 + var2 - 1] & 19136824) == 0) { - var18 = 1; + var5 = class178.bufferX[var12]; + var6 = class178.bufferY[var12]; + var12 = var12 + 1 & 4095; + var15 = var5 - var9; + var16 = var6 - var10; + var17 = var5 - var4.xInset; + var18 = var6 - var4.yInset; + if (var3.vmethod3644(var2, var5, var6, var4)) { + InterfaceParent.field986 = var5; + UrlRequester.field929 = var6; + return true; + } - while (true) { - if (var18 >= var2 - 1) { - class178.bufferX[var13] = var5 - 1; - class178.bufferY[var13] = var6; - var13 = var13 + 1 & 4095; - class178.directions[var19 - 1][var20] = 2; - class178.distances[var19 - 1][var20] = var17; - break; - } + var19 = class178.distances[var15][var16] + 1; + if (var15 > 0 && class178.directions[var15 - 1][var16] == 0 && (var14[var17 - 1][var18] & 19136782) == 0 && (var14[var17 - 1][var18 + var2 - 1] & 19136824) == 0) { + var20 = 1; - if ((var14[var15 - 1][var18 + var16] & 19136830) != 0) { - break; - } + while (true) { + if (var20 >= var2 - 1) { + class178.bufferX[var13] = var5 - 1; + class178.bufferY[var13] = var6; + var13 = var13 + 1 & 4095; + class178.directions[var15 - 1][var16] = 2; + class178.distances[var15 - 1][var16] = var19; + break; + } - ++var18; - } - } + if ((var14[var17 - 1][var20 + var18] & 19136830) != 0) { + break; + } - if (var19 < 128 - var2 && class178.directions[var19 + 1][var20] == 0 && (var14[var15 + var2][var16] & 19136899) == 0 && (var14[var15 + var2][var16 + var2 - 1] & 19136992) == 0) { - var18 = 1; + ++var20; + } + } - while (true) { - if (var18 >= var2 - 1) { - class178.bufferX[var13] = var5 + 1; - class178.bufferY[var13] = var6; - var13 = var13 + 1 & 4095; - class178.directions[var19 + 1][var20] = 8; - class178.distances[var19 + 1][var20] = var17; - break; - } + if (var15 < 128 - var2 && class178.directions[var15 + 1][var16] == 0 && (var14[var17 + var2][var18] & 19136899) == 0 && (var14[var17 + var2][var18 + var2 - 1] & 19136992) == 0) { + var20 = 1; - if ((var14[var15 + var2][var16 + var18] & 19136995) != 0) { - break; - } + while (true) { + if (var20 >= var2 - 1) { + class178.bufferX[var13] = var5 + 1; + class178.bufferY[var13] = var6; + var13 = var13 + 1 & 4095; + class178.directions[var15 + 1][var16] = 8; + class178.distances[var15 + 1][var16] = var19; + break; + } - ++var18; - } - } + if ((var14[var17 + var2][var18 + var20] & 19136995) != 0) { + break; + } - if (var20 > 0 && class178.directions[var19][var20 - 1] == 0 && (var14[var15][var16 - 1] & 19136782) == 0 && (var14[var15 + var2 - 1][var16 - 1] & 19136899) == 0) { - var18 = 1; + ++var20; + } + } - while (true) { - if (var18 >= var2 - 1) { - class178.bufferX[var13] = var5; - class178.bufferY[var13] = var6 - 1; - var13 = var13 + 1 & 4095; - class178.directions[var19][var20 - 1] = 1; - class178.distances[var19][var20 - 1] = var17; - break; - } + if (var16 > 0 && class178.directions[var15][var16 - 1] == 0 && (var14[var17][var18 - 1] & 19136782) == 0 && (var14[var17 + var2 - 1][var18 - 1] & 19136899) == 0) { + var20 = 1; - if ((var14[var18 + var15][var16 - 1] & 19136911) != 0) { - break; - } + while (true) { + if (var20 >= var2 - 1) { + class178.bufferX[var13] = var5; + class178.bufferY[var13] = var6 - 1; + var13 = var13 + 1 & 4095; + class178.directions[var15][var16 - 1] = 1; + class178.distances[var15][var16 - 1] = var19; + break; + } - ++var18; - } - } + if ((var14[var20 + var17][var18 - 1] & 19136911) != 0) { + break; + } - if (var20 < 128 - var2 && class178.directions[var19][var20 + 1] == 0 && (var14[var15][var16 + var2] & 19136824) == 0 && (var14[var15 + var2 - 1][var16 + var2] & 19136992) == 0) { - var18 = 1; + ++var20; + } + } - while (true) { - if (var18 >= var2 - 1) { - class178.bufferX[var13] = var5; - class178.bufferY[var13] = var6 + 1; - var13 = var13 + 1 & 4095; - class178.directions[var19][var20 + 1] = 4; - class178.distances[var19][var20 + 1] = var17; - break; - } + if (var16 < 128 - var2 && class178.directions[var15][var16 + 1] == 0 && (var14[var17][var18 + var2] & 19136824) == 0 && (var14[var17 + var2 - 1][var18 + var2] & 19136992) == 0) { + var20 = 1; - if ((var14[var18 + var15][var16 + var2] & 19137016) != 0) { - break; - } + while (true) { + if (var20 >= var2 - 1) { + class178.bufferX[var13] = var5; + class178.bufferY[var13] = var6 + 1; + var13 = var13 + 1 & 4095; + class178.directions[var15][var16 + 1] = 4; + class178.distances[var15][var16 + 1] = var19; + break; + } - ++var18; - } - } + if ((var14[var20 + var17][var18 + var2] & 19137016) != 0) { + break; + } - if (var19 > 0 && var20 > 0 && class178.directions[var19 - 1][var20 - 1] == 0 && (var14[var15 - 1][var16 - 1] & 19136782) == 0) { - var18 = 1; + ++var20; + } + } - while (true) { - if (var18 >= var2) { - class178.bufferX[var13] = var5 - 1; - class178.bufferY[var13] = var6 - 1; - var13 = var13 + 1 & 4095; - class178.directions[var19 - 1][var20 - 1] = 3; - class178.distances[var19 - 1][var20 - 1] = var17; - break; - } + if (var15 > 0 && var16 > 0 && class178.directions[var15 - 1][var16 - 1] == 0 && (var14[var17 - 1][var18 - 1] & 19136782) == 0) { + var20 = 1; - if ((var14[var15 - 1][var18 + (var16 - 1)] & 19136830) != 0 || (var14[var18 + (var15 - 1)][var16 - 1] & 19136911) != 0) { - break; - } + while (true) { + if (var20 >= var2) { + class178.bufferX[var13] = var5 - 1; + class178.bufferY[var13] = var6 - 1; + var13 = var13 + 1 & 4095; + class178.directions[var15 - 1][var16 - 1] = 3; + class178.distances[var15 - 1][var16 - 1] = var19; + break; + } - ++var18; - } - } + if ((var14[var17 - 1][var20 + (var18 - 1)] & 19136830) != 0 || (var14[var20 + (var17 - 1)][var18 - 1] & 19136911) != 0) { + break; + } - if (var19 < 128 - var2 && var20 > 0 && class178.directions[var19 + 1][var20 - 1] == 0 && (var14[var15 + var2][var16 - 1] & 19136899) == 0) { - var18 = 1; + ++var20; + } + } - while (true) { - if (var18 >= var2) { - class178.bufferX[var13] = var5 + 1; - class178.bufferY[var13] = var6 - 1; - var13 = var13 + 1 & 4095; - class178.directions[var19 + 1][var20 - 1] = 9; - class178.distances[var19 + 1][var20 - 1] = var17; - break; - } + if (var15 < 128 - var2 && var16 > 0 && class178.directions[var15 + 1][var16 - 1] == 0 && (var14[var17 + var2][var18 - 1] & 19136899) == 0) { + var20 = 1; - if ((var14[var15 + var2][var18 + (var16 - 1)] & 19136995) != 0 || (var14[var18 + var15][var16 - 1] & 19136911) != 0) { - break; - } + while (true) { + if (var20 >= var2) { + class178.bufferX[var13] = var5 + 1; + class178.bufferY[var13] = var6 - 1; + var13 = var13 + 1 & 4095; + class178.directions[var15 + 1][var16 - 1] = 9; + class178.distances[var15 + 1][var16 - 1] = var19; + break; + } - ++var18; - } - } + if ((var14[var17 + var2][var20 + (var18 - 1)] & 19136995) != 0 || (var14[var20 + var17][var18 - 1] & 19136911) != 0) { + break; + } - if (var19 > 0 && var20 < 128 - var2 && class178.directions[var19 - 1][var20 + 1] == 0 && (var14[var15 - 1][var16 + var2] & 19136824) == 0) { - var18 = 1; + ++var20; + } + } - while (true) { - if (var18 >= var2) { - class178.bufferX[var13] = var5 - 1; - class178.bufferY[var13] = var6 + 1; - var13 = var13 + 1 & 4095; - class178.directions[var19 - 1][var20 + 1] = 6; - class178.distances[var19 - 1][var20 + 1] = var17; - break; - } + if (var15 > 0 && var16 < 128 - var2 && class178.directions[var15 - 1][var16 + 1] == 0 && (var14[var17 - 1][var18 + var2] & 19136824) == 0) { + for (var20 = 1; var20 < var2; ++var20) { + if ((var14[var17 - 1][var18 + var20] & 19136830) != 0 || (var14[var20 + (var17 - 1)][var18 + var2] & 19137016) != 0) { + continue label218; + } + } - if ((var14[var15 - 1][var16 + var18] & 19136830) != 0 || (var14[var18 + (var15 - 1)][var16 + var2] & 19137016) != 0) { - break; - } + class178.bufferX[var13] = var5 - 1; + class178.bufferY[var13] = var6 + 1; + var13 = var13 + 1 & 4095; + class178.directions[var15 - 1][var16 + 1] = 6; + class178.distances[var15 - 1][var16 + 1] = var19; + } + } while(var15 >= 128 - var2); + } while(var16 >= 128 - var2); + } while(class178.directions[var15 + 1][var16 + 1] != 0); + } while((var14[var17 + var2][var18 + var2] & 19136992) != 0); - ++var18; - } - } - - if (var19 < 128 - var2 && var20 < 128 - var2 && class178.directions[var19 + 1][var20 + 1] == 0 && (var14[var15 + var2][var16 + var2] & 19136992) == 0) { - for (var18 = 1; var18 < var2; ++var18) { - if ((var14[var15 + var18][var16 + var2] & 19137016) != 0 || (var14[var15 + var2][var18 + var16] & 19136995) != 0) { - continue label204; + for (var20 = 1; var20 < var2; ++var20) { + if ((var14[var17 + var20][var18 + var2] & 19137016) != 0 || (var14[var17 + var2][var20 + var18] & 19136995) != 0) { + continue label241; } } class178.bufferX[var13] = var5 + 1; class178.bufferY[var13] = var6 + 1; var13 = var13 + 1 & 4095; - class178.directions[var19 + 1][var20 + 1] = 12; - class178.distances[var19 + 1][var20 + 1] = var17; + class178.directions[var15 + 1][var16 + 1] = 12; + class178.distances[var15 + 1][var16 + 1] = var19; } } - - InterfaceParent.field986 = var5; - UrlRequester.field929 = var6; - return false; } static { diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index 28e4095285..03c033e450 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -6,8 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("bd") @Implements("ArchiveLoader") -public class ArchiveLoader -{ +public class ArchiveLoader { @ObfuscatedName("pf") @ObfuscatedSignature( signature = "Lko;" @@ -90,53 +89,53 @@ public class ArchiveLoader int var8; int var9; int var10; - boolean var20; + boolean var11; if (Login.worldSelectOpen) { if (class30.worldSelectBackSprites == null) { class30.worldSelectBackSprites = class2.method20(WorldMapSection3.archive8, "sl_back", ""); } - Archive var11; - int var12; + Archive var12; int var13; - IndexedSprite[] var14; + int var14; + IndexedSprite[] var15; if (Frames.worldSelectFlagSprites == null) { - var11 = WorldMapSection3.archive8; - var13 = var11.getGroupId("sl_flags"); - var12 = var11.getFileId(var13, ""); - if (!SpriteMask.loadSprite(var11, var13, var12)) { - var14 = null; + var12 = WorldMapSection3.archive8; + var14 = var12.getGroupId("sl_flags"); + var13 = var12.getFileId(var14, ""); + if (!SpriteMask.loadSprite(var12, var14, var13)) { + var15 = null; } else { - var14 = WorldMapLabel.createIndexedSpriteArray(); + var15 = WorldMapLabel.createIndexedSpriteArray(); } - Frames.worldSelectFlagSprites = var14; + Frames.worldSelectFlagSprites = var15; } if (AttackOption.worldSelectArrows == null) { - var11 = WorldMapSection3.archive8; - var13 = var11.getGroupId("sl_arrows"); - var12 = var11.getFileId(var13, ""); - if (!SpriteMask.loadSprite(var11, var13, var12)) { - var14 = null; + var12 = WorldMapSection3.archive8; + var14 = var12.getGroupId("sl_arrows"); + var13 = var12.getFileId(var14, ""); + if (!SpriteMask.loadSprite(var12, var14, var13)) { + var15 = null; } else { - var14 = WorldMapLabel.createIndexedSpriteArray(); + var15 = WorldMapLabel.createIndexedSpriteArray(); } - AttackOption.worldSelectArrows = var14; + AttackOption.worldSelectArrows = var15; } if (UrlRequest.worldSelectStars == null) { - var11 = WorldMapSection3.archive8; - var13 = var11.getGroupId("sl_stars"); - var12 = var11.getFileId(var13, ""); - if (!SpriteMask.loadSprite(var11, var13, var12)) { - var14 = null; + var12 = WorldMapSection3.archive8; + var14 = var12.getGroupId("sl_stars"); + var13 = var12.getFileId(var14, ""); + if (!SpriteMask.loadSprite(var12, var14, var13)) { + var15 = null; } else { - var14 = WorldMapLabel.createIndexedSpriteArray(); + var15 = WorldMapLabel.createIndexedSpriteArray(); } - UrlRequest.worldSelectStars = var14; + UrlRequest.worldSelectStars = var15; } if (SecureRandomFuture.worldSelectLeftSprite == null) { @@ -187,34 +186,34 @@ public class ArchiveLoader } var0.draw("Players", var7 + 32, 17, 16777215, -1); - var13 = Login.xPadding + 500; + var14 = Login.xPadding + 500; if (World.sortOption1[0] == 2 && World.sortOption2[0] == 0) { + AttackOption.worldSelectArrows[2].drawAt(var14, 4); + } else { + AttackOption.worldSelectArrows[0].drawAt(var14, 4); + } + + if (World.sortOption1[0] == 2 && World.sortOption2[0] == 1) { + AttackOption.worldSelectArrows[3].drawAt(var14 + 15, 4); + } else { + AttackOption.worldSelectArrows[1].drawAt(var14 + 15, 4); + } + + var0.draw("Location", var14 + 32, 17, 16777215, -1); + var13 = Login.xPadding + 610; + if (World.sortOption1[0] == 3 && World.sortOption2[0] == 0) { AttackOption.worldSelectArrows[2].drawAt(var13, 4); } else { AttackOption.worldSelectArrows[0].drawAt(var13, 4); } - if (World.sortOption1[0] == 2 && World.sortOption2[0] == 1) { + if (World.sortOption1[0] == 3 && World.sortOption2[0] == 1) { AttackOption.worldSelectArrows[3].drawAt(var13 + 15, 4); } else { AttackOption.worldSelectArrows[1].drawAt(var13 + 15, 4); } - var0.draw("Location", var13 + 32, 17, 16777215, -1); - var12 = Login.xPadding + 610; - if (World.sortOption1[0] == 3 && World.sortOption2[0] == 0) { - AttackOption.worldSelectArrows[2].drawAt(var12, 4); - } else { - AttackOption.worldSelectArrows[0].drawAt(var12, 4); - } - - if (World.sortOption1[0] == 3 && World.sortOption2[0] == 1) { - AttackOption.worldSelectArrows[3].drawAt(var12 + 15, 4); - } else { - AttackOption.worldSelectArrows[1].drawAt(var12 + 15, 4); - } - - var0.draw("Type", var12 + 32, 17, 16777215, -1); + var0.draw("Type", var13 + 32, 17, 16777215, -1); } Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); @@ -222,40 +221,40 @@ public class ArchiveLoader Login.hoveredWorldIndex = -1; if (class30.worldSelectBackSprites != null) { var6 = 88; - byte var15 = 19; - var13 = 765 / (var6 + 1) - 1; - var12 = 480 / (var15 + 1); + byte var16 = 19; + var14 = 765 / (var6 + 1) - 1; + var13 = 480 / (var16 + 1); while (true) { - var8 = var12; - var9 = var13; - if (var12 * (var13 - 1) >= World.worldsCount) { + var8 = var13; + var9 = var14; + if (var13 * (var14 - 1) >= World.worldsCount) { + --var14; + } + + if (var14 * (var13 - 1) >= World.worldsCount) { --var13; } - if (var13 * (var12 - 1) >= World.worldsCount) { - --var12; + if (var14 * (var13 - 1) >= World.worldsCount) { + --var13; } - if (var13 * (var12 - 1) >= World.worldsCount) { - --var12; - } - - if (var12 == var8 && var13 == var9) { - var8 = (765 - var6 * var13) / (var13 + 1); + if (var13 == var8 && var14 == var9) { + var8 = (765 - var6 * var14) / (var14 + 1); if (var8 > 5) { var8 = 5; } - var9 = (480 - var15 * var12) / (var12 + 1); + var9 = (480 - var16 * var13) / (var13 + 1); if (var9 > 5) { var9 = 5; } - var3 = (765 - var13 * var6 - var8 * (var13 - 1)) / 2; - int var16 = (480 - var12 * var15 - var9 * (var12 - 1)) / 2; - var4 = (var12 + World.worldsCount - 1) / var12; - Login.worldSelectPagesCount = var4 - var13; + var3 = (765 - var14 * var6 - var8 * (var14 - 1)) / 2; + int var17 = (480 - var13 * var16 - var9 * (var13 - 1)) / 2; + var4 = (var13 + World.worldsCount - 1) / var13; + Login.worldSelectPagesCount = var4 - var14; if (SecureRandomFuture.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { SecureRandomFuture.worldSelectLeftSprite.drawAt(8, Huffman.canvasHeight / 2 - SecureRandomFuture.worldSelectLeftSprite.subHeight / 2); } @@ -264,14 +263,14 @@ public class ArchiveLoader NetSocket.worldSelectRightSprite.drawAt(SoundCache.canvasWidth - NetSocket.worldSelectRightSprite.subWidth - 8, Huffman.canvasHeight / 2 - NetSocket.worldSelectRightSprite.subHeight / 2); } - int var17 = var16 + 23; - int var18 = var3 + Login.xPadding; - int var19 = 0; - var20 = false; + int var18 = var17 + 23; + int var19 = var3 + Login.xPadding; + int var20 = 0; + var11 = false; int var21 = Login.worldSelectPage; int var22; - for (var22 = var12 * var21; var22 < World.worldsCount && var21 - Login.worldSelectPage < var13; ++var22) { + for (var22 = var13 * var21; var22 < World.worldsCount && var21 - Login.worldSelectPage < var14; ++var22) { World var23 = ItemContainer.worlds[var22]; boolean var24 = true; String var25 = Integer.toString(var23.population); @@ -310,40 +309,40 @@ public class ArchiveLoader var27 = 0; } - if (MouseHandler.MouseHandler_x >= var18 && MouseHandler.MouseHandler_y >= var17 && MouseHandler.MouseHandler_x < var18 + var6 && MouseHandler.MouseHandler_y < var15 + var17 && var24) { + if (MouseHandler.MouseHandler_x >= var19 && MouseHandler.MouseHandler_y >= var18 && MouseHandler.MouseHandler_x < var19 + var6 && MouseHandler.MouseHandler_y < var16 + var18 && var24) { Login.hoveredWorldIndex = var22; - class30.worldSelectBackSprites[var27].drawAtTransOverlay(var18, var17, 128, 16777215); - var20 = true; + class30.worldSelectBackSprites[var27].drawAtTransOverlay(var19, var18, 128, 16777215); + var11 = true; } else { - class30.worldSelectBackSprites[var27].drawAt(var18, var17); + class30.worldSelectBackSprites[var27].drawAt(var19, var18); } if (Frames.worldSelectFlagSprites != null) { - Frames.worldSelectFlagSprites[(var23.isMembersOnly() ? 8 : 0) + var23.location].drawAt(var18 + 29, var17); + Frames.worldSelectFlagSprites[(var23.isMembersOnly() ? 8 : 0) + var23.location].drawAt(var19 + 29, var18); } - var0.drawCentered(Integer.toString(var23.id), var18 + 15, var15 / 2 + var17 + 5, var26, -1); - var1.drawCentered(var25, var18 + 60, var15 / 2 + var17 + 5, 268435455, -1); - var17 = var17 + var9 + var15; - ++var19; - if (var19 >= var12) { - var17 = var16 + 23; - var18 = var18 + var6 + var8; - var19 = 0; + var0.drawCentered(Integer.toString(var23.id), var19 + 15, var16 / 2 + var18 + 5, var26, -1); + var1.drawCentered(var25, var19 + 60, var16 / 2 + var18 + 5, 268435455, -1); + var18 = var18 + var9 + var16; + ++var20; + if (var20 >= var13) { + var18 = var17 + 23; + var19 = var19 + var6 + var8; + var20 = 0; ++var21; } } - if (var20) { + if (var11) { var22 = var1.stringWidth(ItemContainer.worlds[Login.hoveredWorldIndex].activity) + 6; - int var47 = var1.ascent + 8; + int var44 = var1.ascent + 8; var5 = MouseHandler.MouseHandler_y + 25; - if (var47 + var5 > 480) { - var5 = MouseHandler.MouseHandler_y - 25 - var47; + if (var44 + var5 > 480) { + var5 = MouseHandler.MouseHandler_y - 25 - var44; } - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var22 / 2, var5, var22, var47, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var22 / 2, var5, var22, var47, 0); + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var22 / 2, var5, var22, var44, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var22 / 2, var5, var22, var44, 0); var1.drawCentered(ItemContainer.worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var5 + var1.ascent + 4, 0, -1); } break; @@ -369,16 +368,16 @@ public class ArchiveLoader String var28; String var29; - String var30; + short var30; String var31; - short var32; + String var32; String var33; short var34; if (Client.gameState == 20) { Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); - var32 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); - var10 = var32 + 15; + var30 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var30, 16776960, 0); + var10 = var30 + 15; var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16776960, 0); var10 += 15; var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16776960, 0); @@ -390,20 +389,20 @@ public class ArchiveLoader if (ReflectionCheck.clientPreferences.hideUsername) { var29 = Login.Login_username; var28 = class168.method3450('*', var29.length()); - var30 = var28; + var31 = var28; } else { - var30 = Login.Login_username; + var31 = Login.Login_username; } - for (var30 = var30; var0.stringWidth(var30) > var34; var30 = var30.substring(0, var30.length() - 1)) { + for (var31 = var31; var0.stringWidth(var31) > var34; var31 = var31.substring(0, var31.length() - 1)) { } - var0.draw(AbstractFont.escapeBrackets(var30), Login.loginBoxX + 180 - 70, var10, 16777215, 0); + var0.draw(AbstractFont.escapeBrackets(var31), Login.loginBoxX + 180 - 70, var10, 16777215, 0); var10 += 15; var29 = "Password: "; - var33 = Login.Login_password; - var31 = class168.method3450('*', var33.length()); - var0.draw(var29 + var31, Login.loginBoxX + 180 - 108, var10, 16777215, 0); + var32 = Login.Login_password; + var33 = class168.method3450('*', var32.length()); + var0.draw(var29 + var33, Login.loginBoxX + 180 - 108, var10, 16777215, 0); var10 += 15; } } @@ -412,9 +411,9 @@ public class ArchiveLoader Login.titleboxSprite.drawAt(Login.loginBoxX, 171); short var35; if (Login.loginIndex == 0) { - var32 = 251; - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var32, 16776960, 0); - var10 = var32 + 30; + var30 = 251; + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var30, 16776960, 0); + var10 = var30 + 30; var7 = Login.loginBoxX + 180 - 80; var35 = 291; titlebuttonSprite.drawAt(var7 - 73, var35 - 20); @@ -424,9 +423,9 @@ public class ArchiveLoader var0.drawLines("Existing User", var7 - 73, var35 - 20, 144, 40, 16777215, 0, 1, 1, 0); } else if (Login.loginIndex == 1) { var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); - var32 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0); - var10 = var32 + 15; + var30 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var30, 16777215, 0); + var10 = var30 + 15; var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16777215, 0); var10 += 15; var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16777215, 0); @@ -438,238 +437,240 @@ public class ArchiveLoader var7 = Login.loginBoxX + 180 + 80; titlebuttonSprite.drawAt(var7 - 73, var35 - 20); var0.drawCentered("Cancel", var7, var35 + 5, 16777215, 0); - } else if (Login.loginIndex == 2) { - var32 = 201; - var0.drawCentered(Login.Login_response1, Varps.loginBoxCenter, var32, 16776960, 0); - var10 = var32 + 15; - var0.drawCentered(Login.Login_response2, Varps.loginBoxCenter, var10, 16776960, 0); - var10 += 15; - var0.drawCentered(Login.Login_response3, Varps.loginBoxCenter, var10, 16776960, 0); - var10 += 15; - var10 += 7; - var0.draw("Login: ", Varps.loginBoxCenter - 110, var10, 16777215, 0); - var34 = 200; - if (ReflectionCheck.clientPreferences.hideUsername) { - var29 = Login.Login_username; - var28 = class168.method3450('*', var29.length()); - var30 = var28; - } else { - var30 = Login.Login_username; - } - - for (var30 = var30; var0.stringWidth(var30) > var34; var30 = var30.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var30) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Varps.loginBoxCenter - 70, var10, 16777215, 0); - var10 += 15; - var29 = "Password: "; - var33 = Login.Login_password; - var31 = class168.method3450('*', var33.length()); - var0.draw(var29 + var31 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Varps.loginBoxCenter - 108, var10, 16777215, 0); - var10 += 15; - var32 = 277; - var4 = Varps.loginBoxCenter + -117; - boolean var40 = Client.Login_isUsernameRemembered; - var20 = Login.field468; - IndexedSprite var46 = var40 ? (var20 ? KeyHandler.options_buttons_6Sprite : class308.options_buttons_2Sprite) : (var20 ? GraphicsObject.options_buttons_4Sprite : Login.options_buttons_0Sprite); - var46.drawAt(var4, var32); - var4 = var4 + var46.subWidth + 5; - var1.draw("Remember username", var4, var32 + 13, 16776960, 0); - var4 = Varps.loginBoxCenter + 24; - boolean var44 = ReflectionCheck.clientPreferences.hideUsername; - boolean var48 = Login.field469; - IndexedSprite var49 = var44 ? (var48 ? KeyHandler.options_buttons_6Sprite : class308.options_buttons_2Sprite) : (var48 ? GraphicsObject.options_buttons_4Sprite : Login.options_buttons_0Sprite); - var49.drawAt(var4, var32); - var4 = var4 + var49.subWidth + 5; - var1.draw("Hide username", var4, var32 + 13, 16776960, 0); - var10 = var32 + 15; - var5 = Varps.loginBoxCenter - 80; - short var50 = 321; - titlebuttonSprite.drawAt(var5 - 73, var50 - 20); - var0.drawCentered("Login", var5, var50 + 5, 16777215, 0); - var5 = Varps.loginBoxCenter + 80; - titlebuttonSprite.drawAt(var5 - 73, var50 - 20); - var0.drawCentered("Cancel", var5, var50 + 5, 16777215, 0); - var32 = 357; - switch(Login.field467) { - case 2: - AttackOption.field31 = "Having trouble logging in?"; - break; - default: - AttackOption.field31 = "Can't login? Click here."; - } - - TilePaint.field907 = new Bounds(Varps.loginBoxCenter, var32, var1.stringWidth(AttackOption.field31), 11); - UrlRequester.field930 = new Bounds(Varps.loginBoxCenter, var32, var1.stringWidth("Still having trouble logging in?"), 11); - var1.drawCentered(AttackOption.field31, Varps.loginBoxCenter, var32, 16777215, 0); - } else if (Login.loginIndex == 3) { - var32 = 201; - var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var32, 16776960, 0); - var10 = var32 + 20; - var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var7 = Login.loginBoxX + 180; - var35 = 276; - titlebuttonSprite.drawAt(var7 - 73, var35 - 20); - var2.drawCentered("Try again", var7, var35 + 5, 16777215, 0); - var7 = Login.loginBoxX + 180; - var35 = 326; - titlebuttonSprite.drawAt(var7 - 73, var35 - 20); - var2.drawCentered("Forgotten password?", var7, var35 + 5, 16777215, 0); } else { - String var36; - if (Login.loginIndex == 4) { - var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); - var32 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0); - var10 = var32 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16777215, 0); + IndexedSprite var42; + if (Login.loginIndex == 2) { + var30 = 201; + var0.drawCentered(Login.Login_response1, Varps.loginBoxCenter, var30, 16776960, 0); + var10 = var30 + 15; + var0.drawCentered(Login.Login_response2, Varps.loginBoxCenter, var10, 16776960, 0); var10 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16777215, 0); + var0.drawCentered(Login.Login_response3, Varps.loginBoxCenter, var10, 16776960, 0); var10 += 15; - var36 = "PIN: "; - var28 = Login.otp; - var30 = class168.method3450('*', var28.length()); - var0.draw(var36 + var30 + (Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var10, 16777215, 0); - var10 -= 8; - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var10, 16776960, 0); - var10 += 15; - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var10, 16776960, 0); - var9 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; - var3 = var10 - var0.ascent; - IndexedSprite var43; - if (Login.field470) { - var43 = class308.options_buttons_2Sprite; + var10 += 7; + var0.draw("Login: ", Varps.loginBoxCenter - 110, var10, 16777215, 0); + var34 = 200; + if (ReflectionCheck.clientPreferences.hideUsername) { + var29 = Login.Login_username; + var28 = class168.method3450('*', var29.length()); + var31 = var28; } else { - var43 = Login.options_buttons_0Sprite; + var31 = Login.Login_username; } - var43.drawAt(var9, var3); + for (var31 = var31; var0.stringWidth(var31) > var34; var31 = var31.substring(1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var31) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Varps.loginBoxCenter - 70, var10, 16777215, 0); var10 += 15; - var4 = Login.loginBoxX + 180 - 80; - short var45 = 321; - titlebuttonSprite.drawAt(var4 - 73, var45 - 20); - var0.drawCentered("Continue", var4, var45 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - titlebuttonSprite.drawAt(var4 - 73, var45 - 20); - var0.drawCentered("Cancel", var4, var45 + 5, 16777215, 0); - var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var45 + 36, 255, 0); + var29 = "Password: "; + var32 = Login.Login_password; + var33 = class168.method3450('*', var32.length()); + var0.draw(var29 + var33 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Varps.loginBoxCenter - 108, var10, 16777215, 0); + var10 += 15; + var30 = 277; + var4 = Varps.loginBoxCenter + -117; + boolean var40 = Client.Login_isUsernameRemembered; + var11 = Login.field468; + var42 = var40 ? (var11 ? KeyHandler.options_buttons_6Sprite : class308.options_buttons_2Sprite) : (var11 ? GraphicsObject.options_buttons_4Sprite : Login.options_buttons_0Sprite); + var42.drawAt(var4, var30); + var4 = var4 + var42.subWidth + 5; + var1.draw("Remember username", var4, var30 + 13, 16776960, 0); + var4 = Varps.loginBoxCenter + 24; + boolean var47 = ReflectionCheck.clientPreferences.hideUsername; + boolean var45 = Login.field469; + IndexedSprite var48 = var47 ? (var45 ? KeyHandler.options_buttons_6Sprite : class308.options_buttons_2Sprite) : (var45 ? GraphicsObject.options_buttons_4Sprite : Login.options_buttons_0Sprite); + var48.drawAt(var4, var30); + var4 = var4 + var48.subWidth + 5; + var1.draw("Hide username", var4, var30 + 13, 16776960, 0); + var10 = var30 + 15; + var5 = Varps.loginBoxCenter - 80; + short var49 = 321; + titlebuttonSprite.drawAt(var5 - 73, var49 - 20); + var0.drawCentered("Login", var5, var49 + 5, 16777215, 0); + var5 = Varps.loginBoxCenter + 80; + titlebuttonSprite.drawAt(var5 - 73, var49 - 20); + var0.drawCentered("Cancel", var5, var49 + 5, 16777215, 0); + var30 = 357; + switch(Login.field467) { + case 2: + AttackOption.field31 = "Having trouble logging in?"; + break; + default: + AttackOption.field31 = "Can't login? Click here."; + } + + TilePaint.field907 = new Bounds(Varps.loginBoxCenter, var30, var1.stringWidth(AttackOption.field31), 11); + UrlRequester.field930 = new Bounds(Varps.loginBoxCenter, var30, var1.stringWidth("Still having trouble logging in?"), 11); + var1.drawCentered(AttackOption.field31, Varps.loginBoxCenter, var30, 16777215, 0); + } else if (Login.loginIndex == 3) { + var30 = 201; + var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var30, 16776960, 0); + var10 = var30 + 20; + var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var7 = Login.loginBoxX + 180; + var35 = 276; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var2.drawCentered("Try again", var7, var35 + 5, 16777215, 0); + var7 = Login.loginBoxX + 180; + var35 = 326; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var2.drawCentered("Forgotten password?", var7, var35 + 5, 16777215, 0); } else { - short var37; - if (Login.loginIndex != 5) { - if (Login.loginIndex == 6) { - var32 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); - var10 = var32 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16776960, 0); + String var36; + if (Login.loginIndex == 4) { + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); + var30 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var30, 16777215, 0); + var10 = var30 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16777215, 0); + var10 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16777215, 0); + var10 += 15; + var36 = "PIN: "; + var28 = Login.otp; + var31 = class168.method3450('*', var28.length()); + var0.draw(var36 + var31 + (Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var10, 16777215, 0); + var10 -= 8; + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var10, 16776960, 0); + var10 += 15; + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var10, 16776960, 0); + var9 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; + var3 = var10 - var0.ascent; + if (Login.field470) { + var42 = class308.options_buttons_2Sprite; + } else { + var42 = Login.options_buttons_0Sprite; + } + + var42.drawAt(var9, var3); + var10 += 15; + var4 = Login.loginBoxX + 180 - 80; + short var46 = 321; + titlebuttonSprite.drawAt(var4 - 73, var46 - 20); + var0.drawCentered("Continue", var4, var46 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + titlebuttonSprite.drawAt(var4 - 73, var46 - 20); + var0.drawCentered("Cancel", var4, var46 + 5, 16777215, 0); + var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var46 + 36, 255, 0); + } else { + short var37; + if (Login.loginIndex != 5) { + if (Login.loginIndex == 6) { + var30 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var30, 16776960, 0); + var10 = var30 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var7 = Login.loginBoxX + 180; + var35 = 321; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawCentered("Back", var7, var35 + 5, 16777215, 0); + } else if (Login.loginIndex == 7) { + var30 = 216; + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var30, 16776960, 0); + var10 = var30 + 15; + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var7 = Login.loginBoxX + 180 - 80; + var35 = 321; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawCentered("Set Date of Birth", var7, var35 + 5, 16777215, 0); + var7 = Login.loginBoxX + 180 + 80; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawCentered("Back", var7, var35 + 5, 16777215, 0); + } else if (Login.loginIndex == 8) { + var30 = 216; + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var30, 16776960, 0); + var10 = var30 + 15; + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var7 = Login.loginBoxX + 180 - 80; + var35 = 321; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawCentered("Privacy Policy", var7, var35 + 5, 16777215, 0); + var7 = Login.loginBoxX + 180 + 80; + titlebuttonSprite.drawAt(var7 - 73, var35 - 20); + var0.drawCentered("Back", var7, var35 + 5, 16777215, 0); + } else if (Login.loginIndex == 12) { + var30 = 201; + String var43 = ""; + var36 = ""; + var31 = ""; + switch(Login.field466) { + case 0: + var43 = "Your account has been disabled."; + var36 = Strings.field880; + var31 = ""; + break; + case 1: + var43 = "Account locked as we suspect it has been stolen."; + var36 = Strings.field881; + var31 = ""; + break; + default: + MouseHandler.method1084(false); + } + + var0.drawCentered(var43, Login.loginBoxX + 180, var30, 16776960, 0); + var10 = var30 + 15; + var2.drawCentered(var36, Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var2.drawCentered(var31, Login.loginBoxX + 180, var10, 16776960, 0); + var10 += 15; + var8 = Login.loginBoxX + 180; + var37 = 276; + titlebuttonSprite.drawAt(var8 - 73, var37 - 20); + var0.drawCentered("Support Page", var8, var37 + 5, 16777215, 0); + var8 = Login.loginBoxX + 180; + var37 = 326; + titlebuttonSprite.drawAt(var8 - 73, var37 - 20); + var0.drawCentered("Back", var8, var37 + 5, 16777215, 0); + } + } else { + var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); + var30 = 221; + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var30, 16776960, 0); + var10 = var30 + 15; + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16776960, 0); var10 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16776960, 0); + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16776960, 0); var10 += 15; - var7 = Login.loginBoxX + 180; - var35 = 321; - titlebuttonSprite.drawAt(var7 - 73, var35 - 20); - var0.drawCentered("Back", var7, var35 + 5, 16777215, 0); - } else if (Login.loginIndex == 7) { - var32 = 216; - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var32, 16776960, 0); - var10 = var32 + 15; - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var7 = Login.loginBoxX + 180 - 80; - var35 = 321; - titlebuttonSprite.drawAt(var7 - 73, var35 - 20); - var0.drawCentered("Set Date of Birth", var7, var35 + 5, 16777215, 0); - var7 = Login.loginBoxX + 180 + 80; - titlebuttonSprite.drawAt(var7 - 73, var35 - 20); - var0.drawCentered("Back", var7, var35 + 5, 16777215, 0); - } else if (Login.loginIndex == 8) { - var32 = 216; - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var32, 16776960, 0); - var10 = var32 + 15; - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var7 = Login.loginBoxX + 180 - 80; - var35 = 321; - titlebuttonSprite.drawAt(var7 - 73, var35 - 20); - var0.drawCentered("Privacy Policy", var7, var35 + 5, 16777215, 0); - var7 = Login.loginBoxX + 180 + 80; - titlebuttonSprite.drawAt(var7 - 73, var35 - 20); - var0.drawCentered("Back", var7, var35 + 5, 16777215, 0); - } else if (Login.loginIndex == 12) { - var32 = 201; - String var41 = ""; - var36 = ""; - var30 = ""; - switch(Login.field466) { - case 0: - var41 = "Your account has been disabled."; - var36 = Strings.field880; - var30 = ""; - break; - case 1: - var41 = "Account locked as we suspect it has been stolen."; - var36 = Strings.field881; - var30 = ""; - break; - default: - MouseHandler.method1084(false); + var10 += 14; + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var10, 16777215, 0); + var34 = 174; + if (ReflectionCheck.clientPreferences.hideUsername) { + var29 = Login.Login_username; + var28 = class168.method3450('*', var29.length()); + var31 = var28; + } else { + var31 = Login.Login_username; } - var0.drawCentered(var41, Login.loginBoxX + 180, var32, 16776960, 0); - var10 = var32 + 15; - var2.drawCentered(var36, Login.loginBoxX + 180, var10, 16776960, 0); + for (var31 = var31; var0.stringWidth(var31) > var34; var31 = var31.substring(1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var31) + (Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var10, 16777215, 0); var10 += 15; - var2.drawCentered(var30, Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var8 = Login.loginBoxX + 180; - var37 = 276; + var8 = Login.loginBoxX + 180 - 80; + var37 = 321; titlebuttonSprite.drawAt(var8 - 73, var37 - 20); - var0.drawCentered("Support Page", var8, var37 + 5, 16777215, 0); - var8 = Login.loginBoxX + 180; - var37 = 326; + var0.drawCentered("Recover", var8, var37 + 5, 16777215, 0); + var8 = Login.loginBoxX + 180 + 80; titlebuttonSprite.drawAt(var8 - 73, var37 - 20); var0.drawCentered("Back", var8, var37 + 5, 16777215, 0); + var37 = 356; + var1.drawCentered("Still having trouble logging in?", Varps.loginBoxCenter, var37, 268435455, 0); } - } else { - var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); - var32 = 221; - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); - var10 = var32 + 15; - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16776960, 0); - var10 += 15; - var10 += 14; - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var10, 16777215, 0); - var34 = 174; - if (ReflectionCheck.clientPreferences.hideUsername) { - var29 = Login.Login_username; - var28 = class168.method3450('*', var29.length()); - var30 = var28; - } else { - var30 = Login.Login_username; - } - - for (var30 = var30; var0.stringWidth(var30) > var34; var30 = var30.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var30) + (Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var10, 16777215, 0); - var10 += 15; - var8 = Login.loginBoxX + 180 - 80; - var37 = 321; - titlebuttonSprite.drawAt(var8 - 73, var37 - 20); - var0.drawCentered("Recover", var8, var37 + 5, 16777215, 0); - var8 = Login.loginBoxX + 180 + 80; - titlebuttonSprite.drawAt(var8 - 73, var37 - 20); - var0.drawCentered("Back", var8, var37 + 5, 16777215, 0); - var37 = 356; - var1.drawCentered("Still having trouble logging in?", Varps.loginBoxCenter, var37, 268435455, 0); } } } @@ -690,13 +691,13 @@ public class ArchiveLoader var10 = Login.xPadding + 5; var34 = 463; byte var39 = 100; - byte var42 = 35; + byte var41 = 35; class277.field1144.drawAt(var10, var34); - var0.drawCentered("World " + Client.worldId, var39 / 2 + var10, var42 / 2 + var34 - 2, 16777215, 0); + var0.drawCentered("World " + Client.worldId, var39 / 2 + var10, var41 / 2 + var34 - 2, 16777215, 0); if (FriendLoginUpdate.field356 != null) { - var1.drawCentered("Loading...", var39 / 2 + var10, var42 / 2 + var34 + 12, 16777215, 0); + var1.drawCentered("Loading...", var39 / 2 + var10, var41 / 2 + var34 + 12, 16777215, 0); } else { - var1.drawCentered("Click to switch", var39 / 2 + var10, var42 / 2 + var34 + 12, 16777215, 0); + var1.drawCentered("Click to switch", var39 / 2 + var10, var41 / 2 + var34 + 12, 16777215, 0); } } else { class277.field1144 = MenuAction.loadIndexedSpriteByName(WorldMapSection3.archive8, "sl_button", ""); diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index a1a4b514f1..db956f6e44 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -60,35 +60,35 @@ public class AudioFilter { field32[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method25(var1, 0, var2)); field32[var1][1] = var3 * var3; - float[] var10000; - int var4; - for (var4 = 1; var4 < this.field36[var1]; ++var4) { - var3 = this.method24(var1, var4, var2); - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method25(var1, var4, var2)); - float var6 = var3 * var3; - field32[var1][var4 * 2 + 1] = field32[var1][var4 * 2 - 1] * var6; - field32[var1][var4 * 2] = field32[var1][var4 * 2 - 1] * var5 + field32[var1][var4 * 2 - 2] * var6; + float[] var4; + int var5; + for (var5 = 1; var5 < this.field36[var1]; ++var5) { + var3 = this.method24(var1, var5, var2); + float var6 = -2.0F * var3 * (float)Math.cos((double)this.method25(var1, var5, var2)); + float var7 = var3 * var3; + field32[var1][var5 * 2 + 1] = field32[var1][var5 * 2 - 1] * var7; + field32[var1][var5 * 2] = field32[var1][var5 * 2 - 1] * var6 + field32[var1][var5 * 2 - 2] * var7; - for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { - var10000 = field32[var1]; - var10000[var7] += field32[var1][var7 - 1] * var5 + field32[var1][var7 - 2] * var6; + for (int var8 = var5 * 2 - 1; var8 >= 2; --var8) { + var4 = field32[var1]; + var4[var8] += field32[var1][var8 - 1] * var6 + field32[var1][var8 - 2] * var7; } - var10000 = field32[var1]; - var10000[1] += field32[var1][0] * var5 + var6; - var10000 = field32[var1]; - var10000[0] += var5; + var4 = field32[var1]; + var4[1] += field32[var1][0] * var6 + var7; + var4 = field32[var1]; + var4[0] += var6; } if (var1 == 0) { - for (var4 = 0; var4 < this.field36[0] * 2; ++var4) { - var10000 = field32[0]; - var10000[var4] *= field34; + for (var5 = 0; var5 < this.field36[0] * 2; ++var5) { + var4 = field32[0]; + var4[var5] *= field34; } } - for (var4 = 0; var4 < this.field36[var1] * 2; ++var4) { - field33[var1][var4] = (int)(field32[var1][var4] * 65536.0F); + for (var5 = 0; var5 < this.field36[var1] * 2; ++var5) { + field33[var1][var5] = (int)(field32[var1][var5] * 65536.0F); } return this.field36[var1] * 2; diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index 6657730bd2..950ee61a8c 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -51,8 +51,8 @@ public class Buffer extends Node { garbageValue = "-654332799" ) @Export("writeByte") - public void writeByte(int var1) { - this.array[++this.index - 1] = (byte)var1; + public void writeByte(int value) { + this.array[++this.index - 1] = (byte)value; } @ObfuscatedName("w") @@ -61,9 +61,9 @@ public class Buffer extends Node { garbageValue = "0" ) @Export("writeShort") - public void writeShort(int var1) { - this.array[++this.index - 1] = (byte)(var1 >> 8); - this.array[++this.index - 1] = (byte)var1; + public void writeShort(int value) { + this.array[++this.index - 1] = (byte)(value >> 8); + this.array[++this.index - 1] = (byte)value; } @ObfuscatedName("o") @@ -72,10 +72,10 @@ public class Buffer extends Node { garbageValue = "-26" ) @Export("writeMedium") - public void writeMedium(int var1) { - this.array[++this.index - 1] = (byte)(var1 >> 16); - this.array[++this.index - 1] = (byte)(var1 >> 8); - this.array[++this.index - 1] = (byte)var1; + public void writeMedium(int value) { + this.array[++this.index - 1] = (byte)(value >> 16); + this.array[++this.index - 1] = (byte)(value >> 8); + this.array[++this.index - 1] = (byte)value; } @ObfuscatedName("u") @@ -84,11 +84,11 @@ public class Buffer extends Node { garbageValue = "-106996411" ) @Export("writeInt") - public void writeInt(int var1) { - this.array[++this.index - 1] = (byte)(var1 >> 24); - this.array[++this.index - 1] = (byte)(var1 >> 16); - this.array[++this.index - 1] = (byte)(var1 >> 8); - this.array[++this.index - 1] = (byte)var1; + public void writeInt(int value) { + this.array[++this.index - 1] = (byte)(value >> 24); + this.array[++this.index - 1] = (byte)(value >> 16); + this.array[++this.index - 1] = (byte)(value >> 8); + this.array[++this.index - 1] = (byte)value; } @ObfuscatedName("g") @@ -121,8 +121,8 @@ public class Buffer extends Node { garbageValue = "-125" ) @Export("writeBoolean") - public void writeBoolean(boolean var1) { - this.writeByte(var1 ? 1 : 0); + public void writeBoolean(boolean value) { + this.writeByte(value ? 1 : 0); } @ObfuscatedName("d") @@ -131,12 +131,12 @@ public class Buffer extends Node { garbageValue = "-9" ) @Export("writeStringCp1252NullTerminated") - public void writeStringCp1252NullTerminated(String var1) { - int var2 = var1.indexOf(0); + public void writeStringCp1252NullTerminated(String string) { + int var2 = string.indexOf(0); if (var2 >= 0) { throw new IllegalArgumentException(""); } else { - this.index += SoundCache.encodeStringCp1252(var1, 0, var1.length(), this.array, this.index); + this.index += SoundCache.encodeStringCp1252(string, 0, string.length(), this.array, this.index); this.array[++this.index - 1] = 0; } } @@ -147,13 +147,13 @@ public class Buffer extends Node { garbageValue = "22356" ) @Export("writeStringCp1252NullCircumfixed") - public void writeStringCp1252NullCircumfixed(String var1) { - int var2 = var1.indexOf(0); + public void writeStringCp1252NullCircumfixed(String string) { + int var2 = string.indexOf(0); if (var2 >= 0) { throw new IllegalArgumentException(""); } else { this.array[++this.index - 1] = 0; - this.index += SoundCache.encodeStringCp1252(var1, 0, var1.length(), this.array, this.index); + this.index += SoundCache.encodeStringCp1252(string, 0, string.length(), this.array, this.index); this.array[++this.index - 1] = 0; } } @@ -232,15 +232,15 @@ public class Buffer extends Node { garbageValue = "1324532803" ) @Export("writeSmartByteShort") - public void writeSmartByteShort(int var1) { - if (var1 >= 0 && var1 < 128) { - this.writeByte(var1); + public void writeSmartByteShort(int value) { + if (value >= 0 && value < 128) { + this.writeByte(value); } else { - if (var1 < 0 || var1 >= 32768) { + if (value < 0 || value >= 32768) { throw new IllegalArgumentException(); } - this.writeShort(var1 + 32768); + this.writeShort(value + 32768); } } @@ -578,7 +578,7 @@ public class Buffer extends Node { garbageValue = "36" ) @Export("xteaEncryptAll") - public void xteaEncryptAll(int[] var1) { + public void xteaEncryptAll(int[] xteaKey) { int var2 = this.index / 8; this.index = 0; @@ -588,8 +588,8 @@ public class Buffer extends Node { int var6 = 0; int var7 = -1640531527; - for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { - var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; + for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ xteaKey[var6 >>> 11 & 3] + var6) { + var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + xteaKey[var6 & 3]; var6 += var7; } @@ -606,7 +606,7 @@ public class Buffer extends Node { garbageValue = "1682045100" ) @Export("xteaDecryptAll") - public void xteaDecryptAll(int[] var1) { + public void xteaDecryptAll(int[] xteaKey) { int var2 = this.index / 8; this.index = 0; @@ -616,8 +616,8 @@ public class Buffer extends Node { int var6 = -957401312; int var7 = -1640531527; - for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { - var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; + for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + xteaKey[var6 & 3]) { + var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ xteaKey[var6 >>> 11 & 3] + var6; var6 -= var7; } @@ -634,10 +634,10 @@ public class Buffer extends Node { garbageValue = "-1341435074" ) @Export("xteaEncrypt") - public void xteaEncrypt(int[] var1, int var2, int var3) { + public void xteaEncrypt(int[] xteaKey, int start, int end) { int var4 = this.index; - this.index = var2; - int var5 = (var3 - var2) / 8; + this.index = start; + int var5 = (end - start) / 8; for (int var6 = 0; var6 < var5; ++var6) { int var7 = this.readInt(); @@ -645,8 +645,8 @@ public class Buffer extends Node { int var9 = 0; int var10 = -1640531527; - for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { - var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; + for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ xteaKey[var9 >>> 11 & 3] + var9) { + var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + xteaKey[var9 & 3]; var9 += var10; } @@ -664,10 +664,10 @@ public class Buffer extends Node { garbageValue = "307218624" ) @Export("xteaDecrypt") - public void xteaDecrypt(int[] var1, int var2, int var3) { + public void xteaDecrypt(int[] xteaKey, int start, int end) { int var4 = this.index; - this.index = var2; - int var5 = (var3 - var2) / 8; + this.index = start; + int var5 = (end - start) / 8; for (int var6 = 0; var6 < var5; ++var6) { int var7 = this.readInt(); @@ -675,8 +675,8 @@ public class Buffer extends Node { int var9 = -957401312; int var10 = -1640531527; - for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { - var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; + for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + xteaKey[var9 & 3]) { + var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ xteaKey[var9 >>> 11 & 3] + var9; var9 -= var10; } @@ -835,9 +835,9 @@ public class Buffer extends Node { garbageValue = "51" ) @Export("writeShortLE") - public void writeShortLE(int var1) { - this.array[++this.index - 1] = (byte)var1; - this.array[++this.index - 1] = (byte)(var1 >> 8); + public void writeShortLE(int value) { + this.array[++this.index - 1] = (byte)value; + this.array[++this.index - 1] = (byte)(value >> 8); } @ObfuscatedName("bo") @@ -936,11 +936,11 @@ public class Buffer extends Node { garbageValue = "78" ) @Export("writeIntLE") - public void writeIntLE(int var1) { - this.array[++this.index - 1] = (byte)var1; - this.array[++this.index - 1] = (byte)(var1 >> 8); - this.array[++this.index - 1] = (byte)(var1 >> 16); - this.array[++this.index - 1] = (byte)(var1 >> 24); + public void writeIntLE(int value) { + this.array[++this.index - 1] = (byte)value; + this.array[++this.index - 1] = (byte)(value >> 8); + this.array[++this.index - 1] = (byte)(value >> 16); + this.array[++this.index - 1] = (byte)(value >> 24); } @ObfuscatedName("bz") @@ -949,11 +949,11 @@ public class Buffer extends Node { garbageValue = "80" ) @Export("writeIntME") - public void writeIntME(int var1) { - this.array[++this.index - 1] = (byte)(var1 >> 8); - this.array[++this.index - 1] = (byte)var1; - this.array[++this.index - 1] = (byte)(var1 >> 24); - this.array[++this.index - 1] = (byte)(var1 >> 16); + public void writeIntME(int value) { + this.array[++this.index - 1] = (byte)(value >> 8); + this.array[++this.index - 1] = (byte)value; + this.array[++this.index - 1] = (byte)(value >> 24); + this.array[++this.index - 1] = (byte)(value >> 16); } @ObfuscatedName("bg") @@ -962,11 +962,11 @@ public class Buffer extends Node { garbageValue = "2115295559" ) @Export("writeIntLE16") - public void writeIntLE16(int var1) { - this.array[++this.index - 1] = (byte)(var1 >> 16); - this.array[++this.index - 1] = (byte)(var1 >> 24); - this.array[++this.index - 1] = (byte)var1; - this.array[++this.index - 1] = (byte)(var1 >> 8); + public void writeIntLE16(int value) { + this.array[++this.index - 1] = (byte)(value >> 16); + this.array[++this.index - 1] = (byte)(value >> 24); + this.array[++this.index - 1] = (byte)value; + this.array[++this.index - 1] = (byte)(value >> 8); } @ObfuscatedName("bt") diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index e7385c68e3..14cb038e54 100644 --- a/runescape-client/src/main/java/BufferedFile.java +++ b/runescape-client/src/main/java/BufferedFile.java @@ -91,11 +91,11 @@ public class BufferedFile { @ObfuscatedName("f") @Export("seek") - public void seek(long var1) throws IOException { - if (var1 < 0L) { + public void seek(long index) throws IOException { + if (index < 0L) { throw new IOException(""); } else { - this.field51 = var1; + this.field51 = index; } } @@ -115,8 +115,8 @@ public class BufferedFile { garbageValue = "617965847" ) @Export("readFill") - public void readFill(byte[] var1) throws IOException { - this.read(var1, 0, var1.length); + public void readFill(byte[] dst) throws IOException { + this.read(dst, 0, dst.length); } @ObfuscatedName("o") @@ -125,69 +125,69 @@ public class BufferedFile { garbageValue = "-35" ) @Export("read") - public void read(byte[] var1, int var2, int var3) throws IOException { + public void read(byte[] dst, int dstIndex, int length) throws IOException { try { - if (var3 + var2 > var1.length) { - throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length); + if (length + dstIndex > dst.length) { + throw new ArrayIndexOutOfBoundsException(length + dstIndex - dst.length); } - if (-1L != this.field49 && this.field51 >= this.field49 && this.field51 + (long)var3 <= this.field49 + (long)this.field50) { - System.arraycopy(this.writeBuffer, (int)(this.field51 - this.field49), var1, var2, var3); - this.field51 += (long)var3; + if (-1L != this.field49 && this.field51 >= this.field49 && this.field51 + (long)length <= this.field49 + (long)this.field50) { + System.arraycopy(this.writeBuffer, (int)(this.field51 - this.field49), dst, dstIndex, length); + this.field51 += (long)length; return; } long var4 = this.field51; - int var6 = var3; + int var6 = length; int var7; if (this.field51 >= this.field47 && this.field51 < this.field47 + (long)this.field48) { var7 = (int)((long)this.field48 - (this.field51 - this.field47)); - if (var7 > var3) { - var7 = var3; + if (var7 > length) { + var7 = length; } - System.arraycopy(this.readBuffer, (int)(this.field51 - this.field47), var1, var2, var7); + System.arraycopy(this.readBuffer, (int)(this.field51 - this.field47), dst, dstIndex, var7); this.field51 += (long)var7; - var2 += var7; - var3 -= var7; + dstIndex += var7; + length -= var7; } - if (var3 > this.readBuffer.length) { + if (length > this.readBuffer.length) { this.accessFile.seek(this.field51); - for (this.field53 = this.field51; var3 > 0; var3 -= var7) { - var7 = this.accessFile.read(var1, var2, var3); + for (this.field53 = this.field51; length > 0; length -= var7) { + var7 = this.accessFile.read(dst, dstIndex, length); if (var7 == -1) { break; } this.field53 += (long)var7; this.field51 += (long)var7; - var2 += var7; + dstIndex += var7; } - } else if (var3 > 0) { + } else if (length > 0) { this.load(); - var7 = var3; - if (var3 > this.field48) { + var7 = length; + if (length > this.field48) { var7 = this.field48; } - System.arraycopy(this.readBuffer, 0, var1, var2, var7); - var2 += var7; - var3 -= var7; + System.arraycopy(this.readBuffer, 0, dst, dstIndex, var7); + dstIndex += var7; + length -= var7; this.field51 += (long)var7; } if (-1L != this.field49) { - if (this.field49 > this.field51 && var3 > 0) { - var7 = var2 + (int)(this.field49 - this.field51); - if (var7 > var3 + var2) { - var7 = var3 + var2; + if (this.field49 > this.field51 && length > 0) { + var7 = dstIndex + (int)(this.field49 - this.field51); + if (var7 > length + dstIndex) { + var7 = length + dstIndex; } - while (var2 < var7) { - var1[var2++] = 0; - --var3; + while (dstIndex < var7) { + dst[dstIndex++] = 0; + --length; ++this.field51; } } @@ -208,9 +208,9 @@ public class BufferedFile { if (var8 > -1L && var10 > var8) { int var12 = (int)(var10 - var8); - System.arraycopy(this.writeBuffer, (int)(var8 - this.field49), var1, (int)(var8 - var4) + var2, var12); + System.arraycopy(this.writeBuffer, (int)(var8 - this.field49), dst, (int)(var8 - var4) + dstIndex, var12); if (var10 > this.field51) { - var3 = (int)((long)var3 - (var10 - this.field51)); + length = (int)((long)length - (var10 - this.field51)); this.field51 = var10; } } @@ -220,7 +220,7 @@ public class BufferedFile { throw var13; } - if (var3 > 0) { + if (length > 0) { throw new EOFException(); } } @@ -256,34 +256,34 @@ public class BufferedFile { garbageValue = "-601174169" ) @Export("write") - public void write(byte[] var1, int var2, int var3) throws IOException { + public void write(byte[] src, int srcIndex, int length) throws IOException { try { - if (this.field51 + (long)var3 > this.capacity) { - this.capacity = this.field51 + (long)var3; + if (this.field51 + (long)length > this.capacity) { + this.capacity = this.field51 + (long)length; } if (-1L != this.field49 && (this.field51 < this.field49 || this.field51 > this.field49 + (long)this.field50)) { this.flush(); } - if (this.field49 != -1L && (long)var3 + this.field51 > this.field49 + (long)this.writeBuffer.length) { + if (this.field49 != -1L && (long)length + this.field51 > this.field49 + (long)this.writeBuffer.length) { int var4 = (int)((long)this.writeBuffer.length - (this.field51 - this.field49)); - System.arraycopy(var1, var2, this.writeBuffer, (int)(this.field51 - this.field49), var4); + System.arraycopy(src, srcIndex, this.writeBuffer, (int)(this.field51 - this.field49), var4); this.field51 += (long)var4; - var2 += var4; - var3 -= var4; + srcIndex += var4; + length -= var4; this.field50 = this.writeBuffer.length; this.flush(); } - if (var3 <= this.writeBuffer.length) { - if (var3 > 0) { + if (length <= this.writeBuffer.length) { + if (length > 0) { if (this.field49 == -1L) { this.field49 = this.field51; } - System.arraycopy(var1, var2, this.writeBuffer, (int)(this.field51 - this.field49), var3); - this.field51 += (long)var3; + System.arraycopy(src, srcIndex, this.writeBuffer, (int)(this.field51 - this.field49), length); + this.field51 += (long)length; if (this.field51 - this.field49 > (long)this.field50) { this.field50 = (int)(this.field51 - this.field49); } @@ -294,8 +294,8 @@ public class BufferedFile { this.field53 = this.field51; } - this.accessFile.write(var1, var2, var3); - this.field53 += (long)var3; + this.accessFile.write(src, srcIndex, length); + this.field53 += (long)length; if (this.field53 > this.field52) { this.field52 = this.field53; } @@ -304,22 +304,22 @@ public class BufferedFile { long var6 = -1L; if (this.field51 >= this.field47 && this.field51 < (long)this.field48 + this.field47) { var10 = this.field51; - } else if (this.field47 >= this.field51 && this.field47 < (long)var3 + this.field51) { + } else if (this.field47 >= this.field51 && this.field47 < (long)length + this.field51) { var10 = this.field47; } - if (this.field51 + (long)var3 > this.field47 && (long)var3 + this.field51 <= (long)this.field48 + this.field47) { - var6 = this.field51 + (long)var3; - } else if ((long)this.field48 + this.field47 > this.field51 && this.field47 + (long)this.field48 <= (long)var3 + this.field51) { + if (this.field51 + (long)length > this.field47 && (long)length + this.field51 <= (long)this.field48 + this.field47) { + var6 = this.field51 + (long)length; + } else if ((long)this.field48 + this.field47 > this.field51 && this.field47 + (long)this.field48 <= (long)length + this.field51) { var6 = (long)this.field48 + this.field47; } if (var10 > -1L && var6 > var10) { int var8 = (int)(var6 - var10); - System.arraycopy(var1, (int)(var10 + (long)var2 - this.field51), this.readBuffer, (int)(var10 - this.field47), var8); + System.arraycopy(src, (int)(var10 + (long)srcIndex - this.field51), this.readBuffer, (int)(var10 - this.field47), var8); } - this.field51 += (long)var3; + this.field51 += (long)length; } } catch (IOException var9) { @@ -387,8 +387,8 @@ public class BufferedFile { garbageValue = "-792629541" ) @Export("colorStartTag") - static String colorStartTag(int var0) { - return ""; + static String colorStartTag(int color) { + return ""; } @ObfuscatedName("er") diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java index 16f77583d9..009146f408 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -40,8 +40,8 @@ public class BufferedNetSocket extends AbstractSocket { garbageValue = "1765046516" ) @Export("isAvailable") - public boolean isAvailable(int var1) throws IOException { - return this.source.isAvailable(var1); + public boolean isAvailable(int length) throws IOException { + return this.source.isAvailable(length); } @ObfuscatedName("q") @@ -70,8 +70,8 @@ public class BufferedNetSocket extends AbstractSocket { garbageValue = "-1089665746" ) @Export("read") - public int read(byte[] var1, int var2, int var3) throws IOException { - return this.source.read(var1, var2, var3); + public int read(byte[] dst, int dstIndex, int length) throws IOException { + return this.source.read(dst, dstIndex, length); } @ObfuscatedName("u") @@ -80,8 +80,8 @@ public class BufferedNetSocket extends AbstractSocket { garbageValue = "-86" ) @Export("write") - public void write(byte[] var1, int var2, int var3) throws IOException { - this.sink.write(var1, var2, var3); + public void write(byte[] src, int srcIndex, int length) throws IOException { + this.sink.write(src, srcIndex, length); } @ObfuscatedName("g") diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index f4d5e0a768..9ace18e0fd 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -85,8 +85,8 @@ public class BufferedSink implements Runnable { garbageValue = "0" ) @Export("write") - void write(byte[] var1, int var2, int var3) throws IOException { - if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { + void write(byte[] src, int srcIndex, int length) throws IOException { + if (length >= 0 && srcIndex >= 0 && length + srcIndex <= src.length) { synchronized(this) { if (this.exception != null) { throw new IOException(this.exception.toString()); @@ -98,18 +98,18 @@ public class BufferedSink implements Runnable { var5 = this.position - this.limit - 1; } - if (var5 < var3) { + if (var5 < length) { throw new IOException(""); } else { - if (var3 + this.limit <= this.capacity) { - System.arraycopy(var1, var2, this.buffer, this.limit, var3); + if (length + this.limit <= this.capacity) { + System.arraycopy(src, srcIndex, this.buffer, this.limit, length); } else { int var6 = this.capacity - this.limit; - System.arraycopy(var1, var2, this.buffer, this.limit, var6); - System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6); + System.arraycopy(src, srcIndex, this.buffer, this.limit, var6); + System.arraycopy(src, var6 + srcIndex, this.buffer, 0, length - var6); } - this.limit = (var3 + this.limit) % this.capacity; + this.limit = (length + this.limit) % this.capacity; this.notifyAll(); } } @@ -142,29 +142,31 @@ public class BufferedSink implements Runnable { @ObfuscatedName("run") public void run() { while (true) { - synchronized(this){} + synchronized(this) { + ; + } while (true) { - boolean var13 = false; + boolean var1 = false; - int var1; + int var2; try { - var13 = true; + var1 = true; if (this.exception != null) { return; } if (this.position <= this.limit) { - var1 = this.limit - this.position; + var2 = this.limit - this.position; } else { - var1 = this.capacity - this.position + this.limit; + var2 = this.capacity - this.position + this.limit; } - if (var1 <= 0) { + if (var2 <= 0) { try { this.outputStream.flush(); - } catch (IOException var17) { - this.exception = var17; + } catch (IOException var20) { + this.exception = var20; return; } @@ -179,31 +181,31 @@ public class BufferedSink implements Runnable { continue; } - var13 = false; + var1 = false; } finally { - if (var13) { - ; + if (var1) { } + } try { - if (var1 + this.position <= this.capacity) { - this.outputStream.write(this.buffer, this.position, var1); - } else { - int var2 = this.capacity - this.position; + if (var2 + this.position <= this.capacity) { this.outputStream.write(this.buffer, this.position, var2); - this.outputStream.write(this.buffer, 0, var1 - var2); + } else { + int var3 = this.capacity - this.position; + this.outputStream.write(this.buffer, this.position, var3); + this.outputStream.write(this.buffer, 0, var2 - var3); } - } catch (IOException var16) { - IOException var3 = var16; + } catch (IOException var17) { + IOException var4 = var17; synchronized(this) { - this.exception = var3; + this.exception = var4; return; } } synchronized(this) { - this.position = (var1 + this.position) % this.capacity; + this.position = (var2 + this.position) % this.capacity; } if (!this.isClosed()) { @@ -221,13 +223,13 @@ public class BufferedSink implements Runnable { garbageValue = "449588720" ) static void method3603() { - Tiles.field908 = (byte[][][])null; - Fonts.field350 = (byte[][][])null; - class32.field1157 = (byte[][][])null; - class307.field1155 = (byte[][][])null; - Tiles.field910 = (int[][][])null; - Tiles.field909 = (byte[][][])null; - Huffman.field398 = (int[][])null; + Tiles.field908 = ((byte[][][])null); + Fonts.field350 = ((byte[][][])null); + class32.field1157 = ((byte[][][])null); + class307.field1155 = ((byte[][][])null); + Tiles.field910 = ((int[][][])null); + Tiles.field909 = ((byte[][][])null); + Huffman.field398 = ((int[][])null); class13.field1112 = null; Formatting.field353 = null; class214.field1131 = null; diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index 0f7ba7377b..5528e12d5f 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -63,10 +63,10 @@ public class BufferedSource implements Runnable { garbageValue = "1727240458" ) @Export("isAvailable") - boolean isAvailable(int var1) throws IOException { - if (var1 == 0) { + boolean isAvailable(int length) throws IOException { + if (length == 0) { return true; - } else if (var1 > 0 && var1 < this.capacity) { + } else if (length > 0 && length < this.capacity) { synchronized(this) { int var3; if (this.position <= this.limit) { @@ -75,7 +75,7 @@ public class BufferedSource implements Runnable { var3 = this.capacity - this.position + this.limit; } - if (var3 < var1) { + if (var3 < length) { if (this.exception != null) { throw new IOException(this.exception.toString()); } else { @@ -144,8 +144,8 @@ public class BufferedSource implements Runnable { garbageValue = "-37" ) @Export("read") - int read(byte[] var1, int var2, int var3) throws IOException { - if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { + int read(byte[] dst, int dstIndex, int length) throws IOException { + if (length >= 0 && dstIndex >= 0 && length + dstIndex <= dst.length) { synchronized(this) { int var5; if (this.position <= this.limit) { @@ -154,24 +154,24 @@ public class BufferedSource implements Runnable { var5 = this.capacity - this.position + this.limit; } - if (var3 > var5) { - var3 = var5; + if (length > var5) { + length = var5; } - if (var3 == 0 && this.exception != null) { + if (length == 0 && this.exception != null) { throw new IOException(this.exception.toString()); } else { - if (var3 + this.position <= this.capacity) { - System.arraycopy(this.buffer, this.position, var1, var2, var3); + if (length + this.position <= this.capacity) { + System.arraycopy(this.buffer, this.position, dst, dstIndex, length); } else { int var6 = this.capacity - this.position; - System.arraycopy(this.buffer, this.position, var1, var2, var6); - System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6); + System.arraycopy(this.buffer, this.position, dst, dstIndex, var6); + System.arraycopy(this.buffer, 0, dst, var6 + dstIndex, length - var6); } - this.position = (var3 + this.position) % this.capacity; + this.position = (length + this.position) % this.capacity; this.notifyAll(); - return var3; + return length; } } } else { diff --git a/runescape-client/src/main/java/Bzip2Decompressor.java b/runescape-client/src/main/java/Bzip2Decompressor.java index 70b8bdb0f8..8c452325a4 100644 --- a/runescape-client/src/main/java/Bzip2Decompressor.java +++ b/runescape-client/src/main/java/Bzip2Decompressor.java @@ -292,49 +292,49 @@ public final class Bzip2Decompressor { } int var33; - int var50; - for (var50 = 0; var50 < var28; ++var50) { - var33 = method3708(5, var0); + int var52; + for (var33 = 0; var33 < var28; ++var33) { + var52 = method3708(5, var0); for (var25 = 0; var25 < var27; ++var25) { while (true) { var24 = method3711(var0); if (var24 == 0) { - var0.field88[var50][var25] = (byte)var33; + var0.field88[var33][var25] = (byte)var52; break; } var24 = method3711(var0); if (var24 == 0) { - ++var33; + ++var52; } else { - --var33; + --var52; } } } } - for (var50 = 0; var50 < var28; ++var50) { - byte var51 = 32; - byte var34 = 0; + for (var33 = 0; var33 < var28; ++var33) { + byte var34 = 32; + byte var35 = 0; for (var25 = 0; var25 < var27; ++var25) { - if (var0.field88[var50][var25] > var34) { - var34 = var0.field88[var50][var25]; + if (var0.field88[var33][var25] > var35) { + var35 = var0.field88[var33][var25]; } - if (var0.field88[var50][var25] < var51) { - var51 = var0.field88[var50][var25]; + if (var0.field88[var33][var25] < var34) { + var34 = var0.field88[var33][var25]; } } - method3706(var0.field89[var50], var0.field90[var50], var0.field91[var50], var0.field88[var50], var51, var34, var27); - var0.field92[var50] = var51; + method3706(var0.field89[var33], var0.field90[var33], var0.field91[var33], var0.field88[var33], var34, var35, var27); + var0.field92[var33] = var34; } - var33 = var0.field80 + 1; - int var52 = -1; - byte var35 = 0; + var52 = var0.field80 + 1; + int var53 = -1; + byte var54 = 0; for (var25 = 0; var25 <= 255; ++var25) { var0.field77[var25] = 0; @@ -355,17 +355,17 @@ public final class Bzip2Decompressor { int var39 = 0; byte var40; - if (var35 == 0) { - ++var52; - var35 = 50; - var40 = var0.field86[var52]; + if (var54 == 0) { + ++var53; + var54 = 50; + var40 = var0.field86[var53]; var19 = var0.field92[var40]; var20 = var0.field89[var40]; var22 = var0.field91[var40]; var21 = var0.field90[var40]; } - int var41 = var35 - 1; + int var41 = var54 - 1; int var42 = var19; int var43; @@ -378,46 +378,46 @@ public final class Bzip2Decompressor { int var45 = var22[var43 - var21[var42]]; while (true) { - int[] var10000; - int var54; - while (var45 != var33) { - int var46; - int var47; + int[] var46; + int var48; + while (var45 != var52) { + int var49; if (var45 != 0 && var45 != 1) { - var46 = var45 - 1; - int var48; - if (var46 < 16) { - var47 = var0.field85[0]; + var48 = var45 - 1; + int var10003; + int var50; + if (var48 < 16) { + var49 = var0.field85[0]; - for (var24 = var0.field84[var47 + var46]; var46 > 3; var46 -= 4) { - var48 = var47 + var46; - var0.field84[var48] = var0.field84[var48 - 1]; - var0.field84[var48 - 1] = var0.field84[var48 - 2]; - var0.field84[var48 - 2] = var0.field84[var48 - 3]; - var0.field84[var48 - 3] = var0.field84[var48 - 4]; + for (var24 = var0.field84[var49 + var48]; var48 > 3; var48 -= 4) { + var50 = var49 + var48; + var0.field84[var50] = var0.field84[var50 - 1]; + var0.field84[var50 - 1] = var0.field84[var50 - 2]; + var0.field84[var50 - 2] = var0.field84[var50 - 3]; + var0.field84[var50 - 3] = var0.field84[var50 - 4]; } - while (var46 > 0) { - var0.field84[var47 + var46] = var0.field84[var47 + var46 - 1]; - --var46; + while (var48 > 0) { + var0.field84[var49 + var48] = var0.field84[var49 + var48 - 1]; + --var48; } - var0.field84[var47] = var24; + var0.field84[var49] = var24; } else { - var48 = var46 / 16; - int var49 = var46 % 16; - var47 = var0.field85[var48] + var49; + var50 = var48 / 16; + int var51 = var48 % 16; + var49 = var0.field85[var50] + var51; - for (var24 = var0.field84[var47]; var47 > var0.field85[var48]; --var47) { - var0.field84[var47] = var0.field84[var47 - 1]; + for (var24 = var0.field84[var49]; var49 > var0.field85[var50]; --var49) { + var0.field84[var49] = var0.field84[var49 - 1]; } - for (var54 = var0.field85[var48]++; var48 > 0; --var48) { - var54 = var0.field85[var48]--; - var0.field84[var0.field85[var48]] = var0.field84[var0.field85[var48 - 1] + 16 - 1]; + for (var10003 = var0.field85[var50]++; var50 > 0; --var50) { + var10003 = var0.field85[var50]--; + var0.field84[var0.field85[var50]] = var0.field84[var0.field85[var50 - 1] + 16 - 1]; } - var54 = var0.field85[0]--; + var10003 = var0.field85[0]--; var0.field84[var0.field85[0]] = var24; if (var0.field85[0] == 0) { var36 = 4095; @@ -433,13 +433,13 @@ public final class Bzip2Decompressor { } } - var54 = var0.field77[var0.field83[var24 & 255] & 255]++; + var10003 = var0.field77[var0.field83[var24 & 255] & 255]++; WorldMapSection0.field1056[var39] = var0.field83[var24 & 255] & 255; ++var39; if (var41 == 0) { - ++var52; + ++var53; var41 = 50; - var40 = var0.field86[var52]; + var40 = var0.field86[var53]; var19 = var0.field92[var40]; var20 = var0.field89[var40]; var22 = var0.field91[var40]; @@ -456,21 +456,21 @@ public final class Bzip2Decompressor { var45 = var22[var43 - var21[var42]]; } else { - var46 = -1; - var47 = 1; + var48 = -1; + var49 = 1; do { if (var45 == 0) { - var46 += var47; + var48 += var49; } else if (var45 == 1) { - var46 += var47 * 2; + var48 += var49 * 2; } - var47 *= 2; + var49 *= 2; if (var41 == 0) { - ++var52; + ++var53; var41 = 50; - var40 = var0.field86[var52]; + var40 = var0.field86[var53]; var19 = var0.field92[var40]; var20 = var0.field89[var40]; var22 = var0.field91[var40]; @@ -488,11 +488,11 @@ public final class Bzip2Decompressor { var45 = var22[var43 - var21[var42]]; } while(var45 == 0 || var45 == 1); - ++var46; + ++var48; var24 = var0.field83[var0.field84[var0.field85[0]] & 255]; - var10000 = var0.field77; + var46 = var0.field77; - for (var10000[var24 & 255] += var46; var46 > 0; --var46) { + for (var46[var24 & 255] += var48; var48 > 0; --var48) { WorldMapSection0.field1056[var39] = var24 & 255; ++var39; } @@ -508,16 +508,16 @@ public final class Bzip2Decompressor { } for (var25 = 1; var25 <= 256; ++var25) { - var10000 = var0.field79; - var10000[var25] += var0.field79[var25 - 1]; + var46 = var0.field79; + var46[var25] += var0.field79[var25 - 1]; } for (var25 = 0; var25 < var39; ++var25) { var24 = (byte)(WorldMapSection0.field1056[var25] & 255); - var10000 = WorldMapSection0.field1056; - int var53 = var0.field79[var24 & 255]; - var10000[var53] |= var25 << 8; - var54 = var0.field79[var24 & 255]++; + var46 = WorldMapSection0.field1056; + var48 = var0.field79[var24 & 255]; + var46[var48] |= var25 << 8; + ++var0.field79[var24 & 255]; } var0.field75 = WorldMapSection0.field1056[var0.field74] >> 8; diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index c4b82e87ce..079c70b9f2 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -118,7 +118,7 @@ public final class Canvas extends java.awt.Canvas { static int method861(int var0, Script var1, boolean var2) { int var3; int var4; - Widget var6; + Widget var5; if (var0 == ScriptOpcodes.CC_CREATE) { RouteStrategy.Interpreter_intStackSize -= 3; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; @@ -127,62 +127,62 @@ public final class Canvas extends java.awt.Canvas { if (var4 == 0) { throw new RuntimeException(); } else { - var6 = Huffman.getWidget(var3); - if (var6.children == null) { - var6.children = new Widget[var9 + 1]; + var5 = Huffman.getWidget(var3); + if (var5.children == null) { + var5.children = new Widget[var9 + 1]; } - if (var6.children.length <= var9) { + if (var5.children.length <= var9) { Widget[] var7 = new Widget[var9 + 1]; - for (int var8 = 0; var8 < var6.children.length; ++var8) { - var7[var8] = var6.children[var8]; + for (int var8 = 0; var8 < var5.children.length; ++var8) { + var7[var8] = var5.children[var8]; } - var6.children = var7; + var5.children = var7; } - if (var9 > 0 && var6.children[var9 - 1] == null) { + if (var9 > 0 && var5.children[var9 - 1] == null) { throw new RuntimeException("" + (var9 - 1)); } else { Widget var10 = new Widget(); var10.type = var4; - var10.parentId = var10.id = var6.id; + var10.parentId = var10.id = var5.id; var10.childIndex = var9; var10.isIf3 = true; - var6.children[var9] = var10; + var5.children[var9] = var10; if (var2) { WorldMapIcon1.field1030 = var10; } else { class12.field1111 = var10; } - class22.method295(var6); + class22.method295(var5); return 1; } } } else { - Widget var5; + Widget var6; if (var0 == ScriptOpcodes.CC_DELETE) { - var5 = var2 ? WorldMapIcon1.field1030 : class12.field1111; - var6 = Huffman.getWidget(var5.id); - var6.children[var5.childIndex] = null; - class22.method295(var6); - return 1; - } else if (var0 == ScriptOpcodes.CC_DELETEALL) { - var5 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - var5.children = null; + var6 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + var5 = Huffman.getWidget(var6.id); + var5.children[var6.childIndex] = null; class22.method295(var5); return 1; + } else if (var0 == ScriptOpcodes.CC_DELETEALL) { + var6 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + var6.children = null; + class22.method295(var6); + return 1; } else if (var0 != ScriptOpcodes.CC_FIND) { if (var0 == ScriptOpcodes.IF_FIND) { - var5 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - if (var5 != null) { + var6 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + if (var6 != null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; if (var2) { - WorldMapIcon1.field1030 = var5; + WorldMapIcon1.field1030 = var6; } else { - class12.field1111 = var5; + class12.field1111 = var6; } } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; @@ -196,13 +196,13 @@ public final class Canvas extends java.awt.Canvas { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var6 = class204.getWidgetChild(var3, var4); - if (var6 != null && var4 != -1) { + var5 = class204.getWidgetChild(var3, var4); + if (var5 != null && var4 != -1) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; if (var2) { - WorldMapIcon1.field1030 = var6; + WorldMapIcon1.field1030 = var5; } else { - class12.field1111 = var6; + class12.field1111 = var5; } } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index 1e5967e1e3..c56d7b18e7 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -30,7 +30,7 @@ public class ChatChannel { garbageValue = "463993373" ) @Export("addMessage") - Message addMessage(int var1, String var2, String var3, String var4) { + Message addMessage(int type, String sender, String text, String prefix) { Message var5 = this.messages[99]; for (int var6 = this.count; var6 > 0; --var6) { @@ -40,11 +40,11 @@ public class ChatChannel { } if (var5 == null) { - var5 = new Message(var1, var2, var4, var3); + var5 = new Message(type, sender, prefix, text); } else { var5.remove(); var5.removeDual(); - var5.set(var1, var2, var4, var3); + var5.set(type, sender, prefix, text); } this.messages[0] = var5; @@ -61,8 +61,8 @@ public class ChatChannel { garbageValue = "-195254780" ) @Export("getMessage") - Message getMessage(int var1) { - return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; + Message getMessage(int index) { + return index >= 0 && index < this.count ? this.messages[index] : null; } @ObfuscatedName("q") diff --git a/runescape-client/src/main/java/ClanChat.java b/runescape-client/src/main/java/ClanChat.java index f8ffae22d0..7f18f32635 100644 --- a/runescape-client/src/main/java/ClanChat.java +++ b/runescape-client/src/main/java/ClanChat.java @@ -26,7 +26,8 @@ public class ClanChat extends UserList { @Export("owner") public String owner; @ObfuscatedName("k") - public byte field96; + @Export("minKick") + public byte minKick; @ObfuscatedName("n") @ObfuscatedGetter( intValue = -1534670751 @@ -95,9 +96,9 @@ public class ClanChat extends UserList { garbageValue = "455791964" ) @Export("readUpdate") - public final void readUpdate(Buffer var1) { - this.method77(var1.readStringCp1252NullTerminated()); - long var2 = var1.readLong(); + public final void readUpdate(Buffer buffer) { + this.method77(buffer.readStringCp1252NullTerminated()); + long var2 = buffer.readLong(); long var4 = var2; String var6; int var7; @@ -126,17 +127,17 @@ public class ClanChat extends UserList { } this.method76(var6); - this.field96 = var1.readByte(); - var7 = var1.readUnsignedByte(); + this.minKick = buffer.readByte(); + var7 = buffer.readUnsignedByte(); if (var7 != 255) { this.clear(); for (int var12 = 0; var12 < var7; ++var12) { - ClanMate var13 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); - int var10 = var1.readUnsignedShort(); + ClanMate var13 = (ClanMate)this.addLastNoPreviousUsername(new Username(buffer.readStringCp1252NullTerminated(), this.loginType)); + int var10 = buffer.readUnsignedShort(); var13.set(var10, ++this.field97 - 1); - var13.rank = var1.readByte(); - var1.readStringCp1252NullTerminated(); + var13.rank = buffer.readByte(); + buffer.readStringCp1252NullTerminated(); this.method79(var13); } } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 647011e1b9..be5ea4273e 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -500,7 +500,8 @@ public final class Client extends GameShell implements Usernamed { @Export("changedSkillsCount") static int changedSkillsCount; @ObfuscatedName("mn") - static boolean field155; + @Export("playerMod") + static boolean playerMod; @ObfuscatedName("pb") @ObfuscatedGetter( intValue = 1230692157 @@ -1329,8 +1330,8 @@ public final class Client extends GameShell implements Usernamed { class307.soundCache = null; } } - } catch (Exception var54) { - var54.printStackTrace(); + } catch (Exception var55) { + var55.printStackTrace(); class214.midiPcmStream.clear(); class214.field1129 = 0; class13.musicTrack = null; @@ -1429,11 +1430,11 @@ public final class Client extends GameShell implements Usernamed { collisionMaps[var4].clear(); } - int var55; + int var56; for (var4 = 0; var4 < 4; ++var4) { - for (var55 = 0; var55 < 104; ++var55) { + for (var56 = 0; var56 < 104; ++var56) { for (var5 = 0; var5 < 104; ++var5) { - Tiles.Tiles_renderFlags[var4][var55][var5] = 0; + Tiles.Tiles_renderFlags[var4][var56][var5] = 0; } } } @@ -1471,20 +1472,20 @@ public final class Client extends GameShell implements Usernamed { int var21; if (!isInInstance) { byte[] var22; - for (var55 = 0; var55 < var4; ++var55) { - var5 = (class308.regions[var55] >> 8) * 64 - class50.baseX; - var6 = (class308.regions[var55] & 255) * 64 - GraphicsObject.baseY; - var22 = class40.regionLandArchives[var55]; + for (var56 = 0; var56 < var4; ++var56) { + var5 = (class308.regions[var56] >> 8) * 64 - class50.baseX; + var6 = (class308.regions[var56] & 255) * 64 - GraphicsObject.baseY; + var22 = class40.regionLandArchives[var56]; if (var22 != null) { class13.playPcmPlayers(); Varcs.method2166(var22, var5, var6, GameObject.field359 * 8 - 48, WorldMapLabelSize.field1041 * 8 - 48, collisionMaps); } } - for (var55 = 0; var55 < var4; ++var55) { - var5 = (class308.regions[var55] >> 8) * 64 - class50.baseX; - var6 = (class308.regions[var55] & 255) * 64 - GraphicsObject.baseY; - var22 = class40.regionLandArchives[var55]; + for (var56 = 0; var56 < var4; ++var56) { + var5 = (class308.regions[var56] >> 8) * 64 - class50.baseX; + var6 = (class308.regions[var56] & 255) * 64 - GraphicsObject.baseY; + var22 = class40.regionLandArchives[var56]; if (var22 == null && WorldMapLabelSize.field1041 < 800) { class13.playPcmPlayers(); UserComparator6.method3390(var5, var6, 64, 64); @@ -1493,11 +1494,11 @@ public final class Client extends GameShell implements Usernamed { UserComparator10.method3352(true); - for (var55 = 0; var55 < var4; ++var55) { - byte[] var23 = HealthBarUpdate.regionMapArchives[var55]; + for (var56 = 0; var56 < var4; ++var56) { + byte[] var23 = HealthBarUpdate.regionMapArchives[var56]; if (var23 != null) { - var6 = (class308.regions[var55] >> 8) * 64 - class50.baseX; - var21 = (class308.regions[var55] & 255) * 64 - GraphicsObject.baseY; + var6 = (class308.regions[var56] >> 8) * 64 - class50.baseX; + var21 = (class308.regions[var56] & 255) * 64 - GraphicsObject.baseY; class13.playPcmPlayers(); Scene var24 = class65.scene; CollisionMap[] var25 = collisionMaps; @@ -1547,29 +1548,29 @@ public final class Client extends GameShell implements Usernamed { } } - int var56; int var57; int var58; + int var59; if (isInInstance) { - var55 = 0; + var56 = 0; label998: while (true) { - if (var55 >= 4) { - for (var55 = 0; var55 < 13; ++var55) { + if (var56 >= 4) { + for (var56 = 0; var56 < 13; ++var56) { for (var5 = 0; var5 < 13; ++var5) { - var6 = instanceChunkTemplates[0][var55][var5]; + var6 = instanceChunkTemplates[0][var56][var5]; if (var6 == -1) { - UserComparator6.method3390(var55 * 8, var5 * 8, 8, 8); + UserComparator6.method3390(var56 * 8, var5 * 8, 8, 8); } } } UserComparator10.method3352(true); - var55 = 0; + var56 = 0; while (true) { - if (var55 >= 4) { + if (var56 >= 4) { break label998; } @@ -1577,17 +1578,17 @@ public final class Client extends GameShell implements Usernamed { for (var5 = 0; var5 < 13; ++var5) { for (var6 = 0; var6 < 13; ++var6) { - var21 = instanceChunkTemplates[var55][var5][var6]; + var21 = instanceChunkTemplates[var56][var5][var6]; if (var21 != -1) { - var56 = var21 >> 24 & 3; - var57 = var21 >> 1 & 3; - var58 = var21 >> 14 & 1023; + var57 = var21 >> 24 & 3; + var58 = var21 >> 1 & 3; + var59 = var21 >> 14 & 1023; var8 = var21 >> 3 & 2047; - var9 = (var58 / 8 << 8) + var8 / 8; + var9 = (var59 / 8 << 8) + var8 / 8; for (var10 = 0; var10 < class308.regions.length; ++var10) { if (class308.regions[var10] == var9 && HealthBarUpdate.regionMapArchives[var10] != null) { - ServerPacket.method3662(HealthBarUpdate.regionMapArchives[var10], var55, var5 * 8, var6 * 8, var56, (var58 & 7) * 8, (var8 & 7) * 8, var57, class65.scene, collisionMaps); + ServerPacket.method3662(HealthBarUpdate.regionMapArchives[var10], var56, var5 * 8, var6 * 8, var57, (var59 & 7) * 8, (var8 & 7) * 8, var58, class65.scene, collisionMaps); break; } } @@ -1595,7 +1596,7 @@ public final class Client extends GameShell implements Usernamed { } } - ++var55; + ++var56; } } @@ -1603,78 +1604,78 @@ public final class Client extends GameShell implements Usernamed { for (var5 = 0; var5 < 13; ++var5) { for (var6 = 0; var6 < 13; ++var6) { - boolean var59 = false; - var56 = instanceChunkTemplates[var55][var5][var6]; - if (var56 != -1) { - var57 = var56 >> 24 & 3; - var58 = var56 >> 1 & 3; - var8 = var56 >> 14 & 1023; - var9 = var56 >> 3 & 2047; + boolean var60 = false; + var57 = instanceChunkTemplates[var56][var5][var6]; + if (var57 != -1) { + var58 = var57 >> 24 & 3; + var59 = var57 >> 1 & 3; + var8 = var57 >> 14 & 1023; + var9 = var57 >> 3 & 2047; var10 = (var8 / 8 << 8) + var9 / 8; for (var11 = 0; var11 < class308.regions.length; ++var11) { if (class308.regions[var11] == var10 && class40.regionLandArchives[var11] != null) { - class204.method4013(class40.regionLandArchives[var11], var55, var5 * 8, var6 * 8, var57, (var8 & 7) * 8, (var9 & 7) * 8, var58, collisionMaps); - var59 = true; + class204.method4013(class40.regionLandArchives[var11], var56, var5 * 8, var6 * 8, var58, (var8 & 7) * 8, (var9 & 7) * 8, var59, collisionMaps); + var60 = true; break; } } } - if (!var59) { - var57 = var55; - var58 = var5 * 8; + if (!var60) { + var58 = var56; + var59 = var5 * 8; var8 = var6 * 8; for (var9 = 0; var9 < 8; ++var9) { for (var10 = 0; var10 < 8; ++var10) { - Tiles.Tiles_heights[var57][var9 + var58][var10 + var8] = 0; + Tiles.Tiles_heights[var58][var9 + var59][var10 + var8] = 0; } } - if (var58 > 0) { + if (var59 > 0) { for (var9 = 1; var9 < 8; ++var9) { - Tiles.Tiles_heights[var57][var58][var8 + var9] = Tiles.Tiles_heights[var57][var58 - 1][var8 + var9]; + Tiles.Tiles_heights[var58][var59][var8 + var9] = Tiles.Tiles_heights[var58][var59 - 1][var8 + var9]; } } if (var8 > 0) { for (var9 = 1; var9 < 8; ++var9) { - Tiles.Tiles_heights[var57][var58 + var9][var8] = Tiles.Tiles_heights[var57][var58 + var9][var8 - 1]; + Tiles.Tiles_heights[var58][var59 + var9][var8] = Tiles.Tiles_heights[var58][var59 + var9][var8 - 1]; } } - if (var58 > 0 && Tiles.Tiles_heights[var57][var58 - 1][var8] != 0) { - Tiles.Tiles_heights[var57][var58][var8] = Tiles.Tiles_heights[var57][var58 - 1][var8]; - } else if (var8 > 0 && Tiles.Tiles_heights[var57][var58][var8 - 1] != 0) { - Tiles.Tiles_heights[var57][var58][var8] = Tiles.Tiles_heights[var57][var58][var8 - 1]; - } else if (var58 > 0 && var8 > 0 && Tiles.Tiles_heights[var57][var58 - 1][var8 - 1] != 0) { - Tiles.Tiles_heights[var57][var58][var8] = Tiles.Tiles_heights[var57][var58 - 1][var8 - 1]; + if (var59 > 0 && Tiles.Tiles_heights[var58][var59 - 1][var8] != 0) { + Tiles.Tiles_heights[var58][var59][var8] = Tiles.Tiles_heights[var58][var59 - 1][var8]; + } else if (var8 > 0 && Tiles.Tiles_heights[var58][var59][var8 - 1] != 0) { + Tiles.Tiles_heights[var58][var59][var8] = Tiles.Tiles_heights[var58][var59][var8 - 1]; + } else if (var59 > 0 && var8 > 0 && Tiles.Tiles_heights[var58][var59 - 1][var8 - 1] != 0) { + Tiles.Tiles_heights[var58][var59][var8] = Tiles.Tiles_heights[var58][var59 - 1][var8 - 1]; } } } } - ++var55; + ++var56; } } UserComparator10.method3352(true); class13.playPcmPlayers(); - Scene var60 = class65.scene; - CollisionMap[] var61 = collisionMaps; + Scene var61 = class65.scene; + CollisionMap[] var62 = collisionMaps; for (var6 = 0; var6 < 4; ++var6) { for (var21 = 0; var21 < 104; ++var21) { - for (var56 = 0; var56 < 104; ++var56) { - if ((Tiles.Tiles_renderFlags[var6][var21][var56] & 1) == 1) { - var57 = var6; - if ((Tiles.Tiles_renderFlags[1][var21][var56] & 2) == 2) { - var57 = var6 - 1; + for (var57 = 0; var57 < 104; ++var57) { + if ((Tiles.Tiles_renderFlags[var6][var21][var57] & 1) == 1) { + var58 = var6; + if ((Tiles.Tiles_renderFlags[1][var21][var57] & 2) == 2) { + var58 = var6 - 1; } - if (var57 >= 0) { - var61[var57].method92(var21, var56); + if (var58 >= 0) { + var62[var58].method92(var21, var57); } } } @@ -1699,13 +1700,13 @@ public final class Client extends GameShell implements Usernamed { Tiles.field918 = 16; } - int[] var10000; + int[] var63; for (var6 = 0; var6 < 4; ++var6) { - byte[][] var62 = Tiles.field909[var6]; + byte[][] var28 = Tiles.field909[var6]; var10 = (int)Math.sqrt(5100.0D); var11 = var10 * 768 >> 8; - int var28; + int var29; for (var12 = 1; var12 < 103; ++var12) { for (var13 = 1; var13 < 103; ++var13) { var14 = Tiles.Tiles_heights[var6][var13 + 1][var12] - Tiles.Tiles_heights[var6][var13 - 1][var12]; @@ -1715,8 +1716,8 @@ public final class Client extends GameShell implements Usernamed { var18 = 65536 / var16; var19 = (var15 << 8) / var16; var20 = (var19 * -50 + var17 * -50 + var18 * -10) / var11 + 96; - var28 = (var62[var13 - 1][var12] >> 2) + (var62[var13][var12 - 1] >> 2) + (var62[var13 + 1][var12] >> 3) + (var62[var13][var12 + 1] >> 3) + (var62[var13][var12] >> 1); - Huffman.field398[var13][var12] = var20 - var28; + var29 = (var28[var13 - 1][var12] >> 2) + (var28[var13][var12 - 1] >> 2) + (var28[var13 + 1][var12] >> 3) + (var28[var13][var12 + 1] >> 3) + (var28[var13][var12] >> 1); + Huffman.field398[var13][var12] = var20 - var29; } } @@ -1731,21 +1732,21 @@ public final class Client extends GameShell implements Usernamed { for (var12 = -5; var12 < 109; ++var12) { for (var13 = 0; var13 < 104; ++var13) { var14 = var12 + 5; - int var10002; - FloorUnderlayDefinition var29; + int var10003; + FloorUnderlayDefinition var31; if (var14 >= 0 && var14 < 104) { var15 = Tiles.field908[var6][var14][var13] & 255; if (var15 > 0) { - var29 = StudioGame.method4550(var15 - 1); - var10000 = class13.field1112; - var10000[var13] += var29.hue; - var10000 = Formatting.field353; - var10000[var13] += var29.saturation; - var10000 = class214.field1131; - var10000[var13] += var29.lightness; - var10000 = WorldMapSectionType.field1104; - var10000[var13] += var29.hueMultiplier; - var10002 = Message.field490[var13]++; + var31 = StudioGame.method4550(var15 - 1); + var63 = class13.field1112; + var63[var13] += var31.hue; + var63 = Formatting.field353; + var63[var13] += var31.saturation; + var63 = class214.field1131; + var63[var13] += var31.lightness; + var63 = WorldMapSectionType.field1104; + var63[var13] += var31.hueMultiplier; + var10003 = Message.field490[var13]++; } } @@ -1753,16 +1754,16 @@ public final class Client extends GameShell implements Usernamed { if (var15 >= 0 && var15 < 104) { var16 = Tiles.field908[var6][var15][var13] & 255; if (var16 > 0) { - var29 = StudioGame.method4550(var16 - 1); - var10000 = class13.field1112; - var10000[var13] -= var29.hue; - var10000 = Formatting.field353; - var10000[var13] -= var29.saturation; - var10000 = class214.field1131; - var10000[var13] -= var29.lightness; - var10000 = WorldMapSectionType.field1104; - var10000[var13] -= var29.hueMultiplier; - var10002 = Message.field490[var13]--; + var31 = StudioGame.method4550(var16 - 1); + var63 = class13.field1112; + var63[var13] -= var31.hue; + var63 = Formatting.field353; + var63[var13] -= var31.saturation; + var63 = class214.field1131; + var63[var13] -= var31.lightness; + var63 = WorldMapSectionType.field1104; + var63[var13] -= var31.hueMultiplier; + var10003 = Message.field490[var13]--; } } } @@ -1798,144 +1799,144 @@ public final class Client extends GameShell implements Usernamed { Tiles.Tiles_minPlane = var6; } - var28 = Tiles.field908[var6][var12][var18] & 255; - int var65 = Fonts.field350[var6][var12][var18] & 255; - if (var28 > 0 || var65 > 0) { - int var30 = Tiles.Tiles_heights[var6][var12][var18]; - int var31 = Tiles.Tiles_heights[var6][var12 + 1][var18]; - int var32 = Tiles.Tiles_heights[var6][var12 + 1][var18 + 1]; - int var33 = Tiles.Tiles_heights[var6][var12][var18 + 1]; - int var34 = Huffman.field398[var12][var18]; - int var35 = Huffman.field398[var12 + 1][var18]; - int var36 = Huffman.field398[var12 + 1][var18 + 1]; - int var37 = Huffman.field398[var12][var18 + 1]; - int var38 = -1; + var29 = Tiles.field908[var6][var12][var18] & 255; + int var30 = Fonts.field350[var6][var12][var18] & 255; + if (var29 > 0 || var30 > 0) { + int var66 = Tiles.Tiles_heights[var6][var12][var18]; + int var32 = Tiles.Tiles_heights[var6][var12 + 1][var18]; + int var33 = Tiles.Tiles_heights[var6][var12 + 1][var18 + 1]; + int var34 = Tiles.Tiles_heights[var6][var12][var18 + 1]; + int var35 = Huffman.field398[var12][var18]; + int var36 = Huffman.field398[var12 + 1][var18]; + int var37 = Huffman.field398[var12 + 1][var18 + 1]; + int var38 = Huffman.field398[var12][var18 + 1]; int var39 = -1; - int var40; + int var40 = -1; int var41; int var42; - if (var28 > 0) { - var40 = var13 * 256 / var16; - var41 = var14 / var17; - var42 = var15 / var17; - var38 = WorldMapAreaData.method712(var40, var41, var42); - var40 = var40 + Tiles.field917 & 255; - var42 += Tiles.field918; - if (var42 < 0) { - var42 = 0; - } else if (var42 > 255) { - var42 = 255; + int var43; + if (var29 > 0) { + var41 = var13 * 256 / var16; + var42 = var14 / var17; + var43 = var15 / var17; + var39 = WorldMapAreaData.method712(var41, var42, var43); + var41 = var41 + Tiles.field917 & 255; + var43 += Tiles.field918; + if (var43 < 0) { + var43 = 0; + } else if (var43 > 255) { + var43 = 255; } - var39 = WorldMapAreaData.method712(var40, var41, var42); + var40 = WorldMapAreaData.method712(var41, var42, var43); } - FloorOverlayDefinition var43; + FloorOverlayDefinition var44; if (var6 > 0) { - boolean var44 = true; - if (var28 == 0 && class32.field1157[var6][var12][var18] != 0) { - var44 = false; + boolean var45 = true; + if (var29 == 0 && class32.field1157[var6][var12][var18] != 0) { + var45 = false; } - if (var65 > 0) { - var42 = var65 - 1; - var43 = (FloorOverlayDefinition) FloorOverlayDefinition.field664.get((long)var42); - FloorOverlayDefinition var45; - if (var43 != null) { - var45 = var43; + if (var30 > 0) { + var43 = var30 - 1; + var44 = (FloorOverlayDefinition)FloorOverlayDefinition.field664.get((long)var43); + FloorOverlayDefinition var46; + if (var44 != null) { + var46 = var44; } else { - byte[] var46 = FloorOverlayDefinition.field663.takeFile(4, var42); - var43 = new FloorOverlayDefinition(); - if (var46 != null) { - var43.decode(new Buffer(var46), var42); + byte[] var47 = FloorOverlayDefinition.field663.takeFile(4, var43); + var44 = new FloorOverlayDefinition(); + if (var47 != null) { + var44.decode(new Buffer(var47), var43); } - var43.postDecode(); - FloorOverlayDefinition.field664.put(var43, (long)var42); - var45 = var43; + var44.postDecode(); + FloorOverlayDefinition.field664.put(var44, (long)var43); + var46 = var44; } - if (!var45.field665) { - var44 = false; + if (!var46.field665) { + var45 = false; } } - if (var44 && var30 == var31 && var30 == var32 && var33 == var30) { - var10000 = Tiles.field910[var6][var12]; - var10000[var18] |= 2340; + if (var45 && var66 == var32 && var66 == var33 && var34 == var66) { + var63 = Tiles.field910[var6][var12]; + var63[var18] |= 2340; } } - var40 = 0; - if (var39 != -1) { - var40 = Rasterizer3D.Rasterizer3D_colorPalette[class15.method183(var39, 96)]; + var41 = 0; + if (var40 != -1) { + var41 = Rasterizer3D.Rasterizer3D_colorPalette[class15.method183(var40, 96)]; } - if (var65 == 0) { - var60.addTile(var6, var12, var18, 0, 0, -1, var30, var31, var32, var33, class15.method183(var38, var34), class15.method183(var38, var35), class15.method183(var38, var36), class15.method183(var38, var37), 0, 0, 0, 0, var40, 0); + if (var30 == 0) { + var61.addTile(var6, var12, var18, 0, 0, -1, var66, var32, var33, var34, class15.method183(var39, var35), class15.method183(var39, var36), class15.method183(var39, var37), class15.method183(var39, var38), 0, 0, 0, 0, var41, 0); } else { - var41 = class32.field1157[var6][var12][var18] + 1; - byte var66 = class307.field1155[var6][var12][var18]; - int var67 = var65 - 1; - FloorOverlayDefinition var68 = (FloorOverlayDefinition) FloorOverlayDefinition.field664.get((long)var67); - if (var68 != null) { - var43 = var68; + var42 = class32.field1157[var6][var12][var18] + 1; + byte var67 = class307.field1155[var6][var12][var18]; + int var68 = var30 - 1; + FloorOverlayDefinition var69 = (FloorOverlayDefinition)FloorOverlayDefinition.field664.get((long)var68); + if (var69 != null) { + var44 = var69; } else { - byte[] var47 = FloorOverlayDefinition.field663.takeFile(4, var67); - var68 = new FloorOverlayDefinition(); - if (var47 != null) { - var68.decode(new Buffer(var47), var67); + byte[] var48 = FloorOverlayDefinition.field663.takeFile(4, var68); + var69 = new FloorOverlayDefinition(); + if (var48 != null) { + var69.decode(new Buffer(var48), var68); } - var68.postDecode(); - FloorOverlayDefinition.field664.put(var68, (long)var67); - var43 = var68; + var69.postDecode(); + FloorOverlayDefinition.field664.put(var69, (long)var68); + var44 = var69; } - int var69 = var43.texture; - int var48; + int var70 = var44.texture; int var49; int var50; int var51; - if (var69 >= 0) { - var49 = Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var69); - var48 = -1; - } else if (var43.rgb == 16711935) { - var48 = -2; - var69 = -1; + int var52; + if (var70 >= 0) { + var50 = Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var70); + var49 = -1; + } else if (var44.rgb == 16711935) { var49 = -2; + var70 = -1; + var50 = -2; } else { - var48 = WorldMapAreaData.method712(var43.hue, var43.saturation, var43.lightness); - var50 = var43.hue + Tiles.field917 & 255; - var51 = var43.lightness + Tiles.field918; - if (var51 < 0) { - var51 = 0; - } else if (var51 > 255) { - var51 = 255; - } - - var49 = WorldMapAreaData.method712(var50, var43.saturation, var51); - } - - var50 = 0; - if (var49 != -2) { - var50 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapDecoration.method348(var49, 96)]; - } - - if (var43.rgb2 != -1) { - var51 = var43.hue2 + Tiles.field917 & 255; - int var52 = var43.lightness2 + Tiles.field918; + var49 = WorldMapAreaData.method712(var44.hue, var44.saturation, var44.lightness); + var51 = var44.hue + Tiles.field917 & 255; + var52 = var44.lightness + Tiles.field918; if (var52 < 0) { var52 = 0; } else if (var52 > 255) { var52 = 255; } - var49 = WorldMapAreaData.method712(var51, var43.saturation2, var52); - var50 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapDecoration.method348(var49, 96)]; + var50 = WorldMapAreaData.method712(var51, var44.saturation, var52); } - var60.addTile(var6, var12, var18, var41, var66, var69, var30, var31, var32, var33, class15.method183(var38, var34), class15.method183(var38, var35), class15.method183(var38, var36), class15.method183(var38, var37), WorldMapDecoration.method348(var48, var34), WorldMapDecoration.method348(var48, var35), WorldMapDecoration.method348(var48, var36), WorldMapDecoration.method348(var48, var37), var40, var50); + var51 = 0; + if (var50 != -2) { + var51 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapDecoration.method348(var50, 96)]; + } + + if (var44.rgb2 != -1) { + var52 = var44.hue2 + Tiles.field917 & 255; + int var53 = var44.lightness2 + Tiles.field918; + if (var53 < 0) { + var53 = 0; + } else if (var53 > 255) { + var53 = 255; + } + + var50 = WorldMapAreaData.method712(var52, var44.saturation2, var53); + var51 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapDecoration.method348(var50, 96)]; + } + + var61.addTile(var6, var12, var18, var42, var67, var70, var66, var32, var33, var34, class15.method183(var39, var35), class15.method183(var39, var36), class15.method183(var39, var37), class15.method183(var39, var38), WorldMapDecoration.method348(var49, var35), WorldMapDecoration.method348(var49, var36), WorldMapDecoration.method348(var49, var37), WorldMapDecoration.method348(var49, var38), var41, var51); } } } @@ -1953,51 +1954,51 @@ public final class Client extends GameShell implements Usernamed { var18 = var6; } - var60.setTileMinPlane(var6, var13, var12, var18); + var61.setTileMinPlane(var6, var13, var12, var18); } } - Tiles.field908[var6] = (byte[][])null; - Fonts.field350[var6] = (byte[][])null; - class32.field1157[var6] = (byte[][])null; - class307.field1155[var6] = (byte[][])null; - Tiles.field909[var6] = (byte[][])null; + Tiles.field908[var6] = ((byte[][])null); + Fonts.field350[var6] = ((byte[][])null); + class32.field1157[var6] = ((byte[][])null); + class307.field1155[var6] = ((byte[][])null); + Tiles.field909[var6] = ((byte[][])null); } - var60.method293(-50, -10, -50); + var61.method293(-50, -10, -50); for (var6 = 0; var6 < 104; ++var6) { for (var21 = 0; var21 < 104; ++var21) { if ((Tiles.Tiles_renderFlags[1][var6][var21] & 2) == 2) { - var60.setLinkBelow(var6, var21); + var61.setLinkBelow(var6, var21); } } } var6 = 1; var21 = 2; - var56 = 4; + var57 = 4; - for (var57 = 0; var57 < 4; ++var57) { - if (var57 > 0) { + for (var58 = 0; var58 < 4; ++var58) { + if (var58 > 0) { var6 <<= 3; var21 <<= 3; - var56 <<= 3; + var57 <<= 3; } - for (var58 = 0; var58 <= var57; ++var58) { + for (var59 = 0; var59 <= var58; ++var59) { for (var8 = 0; var8 <= 104; ++var8) { for (var9 = 0; var9 <= 104; ++var9) { - short var63; - if ((Tiles.field910[var58][var9][var8] & var6) != 0) { + short var64; + if ((Tiles.field910[var59][var9][var8] & var6) != 0) { var10 = var8; var11 = var8; - var12 = var58; + var12 = var59; - for (var13 = var58; var10 > 0 && (Tiles.field910[var58][var9][var10 - 1] & var6) != 0; --var10) { + for (var13 = var59; var10 > 0 && (Tiles.field910[var59][var9][var10 - 1] & var6) != 0; --var10) { } - while (var11 < 104 && (Tiles.field910[var58][var9][var11 + 1] & var6) != 0) { + while (var11 < 104 && (Tiles.field910[var59][var9][var11 + 1] & var6) != 0) { ++var11; } @@ -2013,7 +2014,7 @@ public final class Client extends GameShell implements Usernamed { } label638: - while (var13 < var57) { + while (var13 < var58) { for (var14 = var10; var14 <= var11; ++var14) { if ((Tiles.field910[var13 + 1][var9][var14] & var6) == 0) { break label638; @@ -2025,29 +2026,29 @@ public final class Client extends GameShell implements Usernamed { var14 = (var11 - var10 + 1) * (var13 + 1 - var12); if (var14 >= 8) { - var63 = 240; - var16 = Tiles.Tiles_heights[var13][var9][var10] - var63; + var64 = 240; + var16 = Tiles.Tiles_heights[var13][var9][var10] - var64; var17 = Tiles.Tiles_heights[var12][var9][var10]; - Scene.Scene_addOccluder(var57, 1, var9 * 128, var9 * 128, var10 * 128, var11 * 128 + 128, var16, var17); + Scene.Scene_addOccluder(var58, 1, var9 * 128, var9 * 128, var10 * 128, var11 * 128 + 128, var16, var17); for (var18 = var12; var18 <= var13; ++var18) { for (var19 = var10; var19 <= var11; ++var19) { - var10000 = Tiles.field910[var18][var9]; - var10000[var19] &= ~var6; + var63 = Tiles.field910[var18][var9]; + var63[var19] &= ~var6; } } } } - if ((Tiles.field910[var58][var9][var8] & var21) != 0) { + if ((Tiles.field910[var59][var9][var8] & var21) != 0) { var10 = var9; var11 = var9; - var12 = var58; + var12 = var59; - for (var13 = var58; var10 > 0 && (Tiles.field910[var58][var10 - 1][var8] & var21) != 0; --var10) { + for (var13 = var59; var10 > 0 && (Tiles.field910[var59][var10 - 1][var8] & var21) != 0; --var10) { } - while (var11 < 104 && (Tiles.field910[var58][var11 + 1][var8] & var21) != 0) { + while (var11 < 104 && (Tiles.field910[var59][var11 + 1][var8] & var21) != 0) { ++var11; } @@ -2063,7 +2064,7 @@ public final class Client extends GameShell implements Usernamed { } label691: - while (var13 < var57) { + while (var13 < var58) { for (var14 = var10; var14 <= var11; ++var14) { if ((Tiles.field910[var13 + 1][var14][var8] & var21) == 0) { break label691; @@ -2075,36 +2076,36 @@ public final class Client extends GameShell implements Usernamed { var14 = (var11 - var10 + 1) * (var13 + 1 - var12); if (var14 >= 8) { - var63 = 240; - var16 = Tiles.Tiles_heights[var13][var10][var8] - var63; + var64 = 240; + var16 = Tiles.Tiles_heights[var13][var10][var8] - var64; var17 = Tiles.Tiles_heights[var12][var10][var8]; - Scene.Scene_addOccluder(var57, 2, var10 * 128, var11 * 128 + 128, var8 * 128, var8 * 128, var16, var17); + Scene.Scene_addOccluder(var58, 2, var10 * 128, var11 * 128 + 128, var8 * 128, var8 * 128, var16, var17); for (var18 = var12; var18 <= var13; ++var18) { for (var19 = var10; var19 <= var11; ++var19) { - var10000 = Tiles.field910[var18][var19]; - var10000[var8] &= ~var21; + var63 = Tiles.field910[var18][var19]; + var63[var8] &= ~var21; } } } } - if ((Tiles.field910[var58][var9][var8] & var56) != 0) { + if ((Tiles.field910[var59][var9][var8] & var57) != 0) { var10 = var9; var11 = var9; var12 = var8; - for (var13 = var8; var12 > 0 && (Tiles.field910[var58][var9][var12 - 1] & var56) != 0; --var12) { + for (var13 = var8; var12 > 0 && (Tiles.field910[var59][var9][var12 - 1] & var57) != 0; --var12) { } - while (var13 < 104 && (Tiles.field910[var58][var9][var13 + 1] & var56) != 0) { + while (var13 < 104 && (Tiles.field910[var59][var9][var13 + 1] & var57) != 0) { ++var13; } label755: while (var10 > 0) { for (var14 = var12; var14 <= var13; ++var14) { - if ((Tiles.field910[var58][var10 - 1][var14] & var56) == 0) { + if ((Tiles.field910[var59][var10 - 1][var14] & var57) == 0) { break label755; } } @@ -2115,7 +2116,7 @@ public final class Client extends GameShell implements Usernamed { label744: while (var11 < 104) { for (var14 = var12; var14 <= var13; ++var14) { - if ((Tiles.field910[var58][var11 + 1][var14] & var56) == 0) { + if ((Tiles.field910[var59][var11 + 1][var14] & var57) == 0) { break label744; } } @@ -2124,13 +2125,13 @@ public final class Client extends GameShell implements Usernamed { } if ((var13 - var12 + 1) * (var11 - var10 + 1) >= 4) { - var14 = Tiles.Tiles_heights[var58][var10][var12]; - Scene.Scene_addOccluder(var57, 4, var10 * 128, var11 * 128 + 128, var12 * 128, var13 * 128 + 128, var14, var14); + var14 = Tiles.Tiles_heights[var59][var10][var12]; + Scene.Scene_addOccluder(var58, 4, var10 * 128, var11 * 128 + 128, var12 * 128, var13 * 128 + 128, var14, var14); for (var15 = var10; var15 <= var11; ++var15) { for (var16 = var12; var16 <= var13; ++var16) { - var10000 = Tiles.field910[var58][var15]; - var10000[var16] &= ~var56; + var63 = Tiles.field910[var59][var15]; + var63[var16] &= ~var57; } } } @@ -2157,30 +2158,30 @@ public final class Client extends GameShell implements Usernamed { } for (var21 = 0; var21 < 104; ++var21) { - for (var56 = 0; var56 < 104; ++var56) { - TilePaint.updateItemPile(var21, var56); + for (var57 = 0; var57 < 104; ++var57) { + TilePaint.updateItemPile(var21, var57); } } class13.playPcmPlayers(); ScriptEvent.method1179(); ObjectDefinition.field641.clear(); - PacketBufferNode var64; + PacketBufferNode var65; if (TextureProvider.client.hasFrame()) { - var64 = Interpreter.method1915(ClientPacket.field231, packetWriter.isaacCipher); - var64.packetBuffer.writeInt(1057001181); - packetWriter.method241(var64); + var65 = Interpreter.method1915(ClientPacket.field231, packetWriter.isaacCipher); + var65.packetBuffer.writeInt(1057001181); + packetWriter.method241(var65); } if (!isInInstance) { var21 = (GameObject.field359 - 6) / 8; - var56 = (GameObject.field359 + 6) / 8; - var57 = (WorldMapLabelSize.field1041 - 6) / 8; - var58 = (WorldMapLabelSize.field1041 + 6) / 8; + var57 = (GameObject.field359 + 6) / 8; + var58 = (WorldMapLabelSize.field1041 - 6) / 8; + var59 = (WorldMapLabelSize.field1041 + 6) / 8; - for (var8 = var21 - 1; var8 <= var56 + 1; ++var8) { - for (var9 = var57 - 1; var9 <= var58 + 1; ++var9) { - if (var8 < var21 || var8 > var56 || var9 < var57 || var9 > var58) { + for (var8 = var21 - 1; var8 <= var57 + 1; ++var8) { + for (var9 = var58 - 1; var9 <= var59 + 1; ++var9) { + if (var8 < var21 || var8 > var57 || var9 < var58 || var9 > var59) { SecureRandomFuture.archive5.method10("m" + var8 + "_" + var9); SecureRandomFuture.archive5.method10("l" + var8 + "_" + var9); } @@ -2191,8 +2192,8 @@ public final class Client extends GameShell implements Usernamed { GameShell.updateGameState(30); class13.playPcmPlayers(); BufferedSink.method3603(); - var64 = Interpreter.method1915(ClientPacket.field298, packetWriter.isaacCipher); - packetWriter.method241(var64); + var65 = Interpreter.method1915(ClientPacket.field298, packetWriter.isaacCipher); + packetWriter.method241(var65); class11.method145(); } } @@ -2397,27 +2398,29 @@ public final class Client extends GameShell implements Usernamed { } @ObfuscatedName("init") - public final void vmethod117() { + @Export("init") + public final void init() { try { if (this.checkHost()) { ClientParameter[] var1 = class4.method47(); - int var3 = 0; + int var2 = 0; while (true) { - int var2; - if (var3 >= var1.length) { + int var3; + int var6; + if (var2 >= var1.length) { class237.method4539(); class50.worldHost = this.getCodeBase().getHost(); - String var25 = class15.serverBuild.name; - byte var26 = 0; + String var26 = class15.serverBuild.name; + byte var27 = 0; try { class168.idxCount = 21; - PacketBuffer.field667 = var26; + PacketBuffer.field667 = var27; try { class266.osName = System.getProperty("os.name"); - } catch (Exception var20) { + } catch (Exception var21) { class266.osName = "Unknown"; } @@ -2428,7 +2431,7 @@ public final class Client extends GameShell implements Usernamed { if (WorldMapSection1.userHomeDirectory != null) { WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/"; } - } catch (Exception var19) { + } catch (Exception var20) { } try { @@ -2443,7 +2446,7 @@ public final class Client extends GameShell implements Usernamed { if (WorldMapSection1.userHomeDirectory != null) { WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/"; } - } catch (Exception var18) { + } catch (Exception var19) { } if (WorldMapSection1.userHomeDirectory == null) { @@ -2452,114 +2455,114 @@ public final class Client extends GameShell implements Usernamed { WorldMapSection2.cacheDirectoryLocations = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", WorldMapSection1.userHomeDirectory, "/tmp/", ""}; Canvas.field94 = new String[]{".jagex_cache_" + PacketBuffer.field667, ".file_store_" + PacketBuffer.field667}; - int var27 = 0; + var6 = 0; - label262: - while (var27 < 4) { - String var28 = var27 == 0 ? "" : "" + var27; - class337.clDat = new File(WorldMapSection1.userHomeDirectory, "jagex_cl_oldschool_" + var25 + var28 + ".dat"); + label256: + while (var6 < 4) { + String var28 = var6 == 0 ? "" : "" + var6; + class337.clDat = new File(WorldMapSection1.userHomeDirectory, "jagex_cl_oldschool_" + var26 + var28 + ".dat"); String var30 = null; String var31 = null; boolean var32 = false; - int var14; - File var33; + int var11; + File var12; if (class337.clDat.exists()) { try { - AccessFile var11 = new AccessFile(class337.clDat, "rw", 10000L); + AccessFile var13 = new AccessFile(class337.clDat, "rw", 10000L); - int var12; - Buffer var13; - for (var13 = new Buffer((int)var11.length()); var13.index < var13.array.length; var13.index += var12) { - var12 = var11.read(var13.array, var13.index, var13.array.length - var13.index); - if (var12 == -1) { + int var14; + Buffer var15; + for (var15 = new Buffer((int)var13.length()); var15.index < var15.array.length; var15.index += var14) { + var14 = var13.read(var15.array, var15.index, var15.array.length - var15.index); + if (var14 == -1) { throw new IOException(); } } - var13.index = 0; - var12 = var13.readUnsignedByte(); - if (var12 < 1 || var12 > 3) { - throw new IOException("" + var12); + var15.index = 0; + var14 = var15.readUnsignedByte(); + if (var14 < 1 || var14 > 3) { + throw new IOException("" + var14); } - var14 = 0; - if (var12 > 1) { - var14 = var13.readUnsignedByte(); + var11 = 0; + if (var14 > 1) { + var11 = var15.readUnsignedByte(); } - if (var12 <= 2) { - var30 = var13.readStringCp1252NullCircumfixed(); - if (var14 == 1) { - var31 = var13.readStringCp1252NullCircumfixed(); + if (var14 <= 2) { + var30 = var15.readStringCp1252NullCircumfixed(); + if (var11 == 1) { + var31 = var15.readStringCp1252NullCircumfixed(); } } else { - var30 = var13.method45(); - if (var14 == 1) { - var31 = var13.method45(); + var30 = var15.method45(); + if (var11 == 1) { + var31 = var15.method45(); } } - var11.close(); - } catch (IOException var22) { - var22.printStackTrace(); + var13.close(); + } catch (IOException var23) { + var23.printStackTrace(); } if (var30 != null) { - var33 = new File(var30); - if (!var33.exists()) { + var12 = new File(var30); + if (!var12.exists()) { var30 = null; } } if (var30 != null) { - var33 = new File(var30, "test.dat"); - if (!DevicePcmPlayerProvider.method847(var33, true)) { + var12 = new File(var30, "test.dat"); + if (!DevicePcmPlayerProvider.method847(var12, true)) { var30 = null; } } } - if (var30 == null && var27 == 0) { - label237: - for (var2 = 0; var2 < Canvas.field94.length; ++var2) { + File var36; + if (var30 == null && var6 == 0) { + label232: + for (var3 = 0; var3 < Canvas.field94.length; ++var3) { for (int var34 = 0; var34 < WorldMapSection2.cacheDirectoryLocations.length; ++var34) { - File var37 = new File(WorldMapSection2.cacheDirectoryLocations[var34] + Canvas.field94[var2] + File.separatorChar + "oldschool" + File.separatorChar); - if (var37.exists() && DevicePcmPlayerProvider.method847(new File(var37, "test.dat"), true)) { - var30 = var37.toString(); + var36 = new File(WorldMapSection2.cacheDirectoryLocations[var34] + Canvas.field94[var3] + File.separatorChar + "oldschool" + File.separatorChar); + if (var36.exists() && DevicePcmPlayerProvider.method847(new File(var36, "test.dat"), true)) { + var30 = var36.toString(); var32 = true; - break label237; + break label232; } } } } if (var30 == null) { - var30 = WorldMapSection1.userHomeDirectory + File.separatorChar + "jagexcache" + var28 + File.separatorChar + "oldschool" + File.separatorChar + var25 + File.separatorChar; + var30 = WorldMapSection1.userHomeDirectory + File.separatorChar + "jagexcache" + var28 + File.separatorChar + "oldschool" + File.separatorChar + var26 + File.separatorChar; var32 = true; } - File var15; - File var36; - File[] var38; - File[] var39; + File[] var16; + File var35; + File[] var37; if (var31 != null) { var36 = new File(var31); - var33 = new File(var30); + var12 = new File(var30); try { - var38 = var36.listFiles(); - var39 = var38; + var37 = var36.listFiles(); + var16 = var37; - for (var14 = 0; var14 < var39.length; ++var14) { - var15 = var39[var14]; - File var16 = new File(var33, var15.getName()); - boolean var17 = var15.renameTo(var16); - if (!var17) { + for (var11 = 0; var11 < var16.length; ++var11) { + var35 = var16[var11]; + File var17 = new File(var12, var35.getName()); + boolean var18 = var35.renameTo(var17); + if (!var18) { throw new IOException(); } } - } catch (Exception var21) { - var21.printStackTrace(); + } catch (Exception var22) { + var22.printStackTrace(); } var32 = true; @@ -2575,19 +2578,27 @@ public final class Client extends GameShell implements Usernamed { class168.field1115.mkdirs(); } - var38 = class168.field1115.listFiles(); - if (var38 != null) { - var39 = var38; - - for (var14 = 0; var14 < var39.length; ++var14) { - var15 = var39[var14]; - if (!DevicePcmPlayerProvider.method847(var15, false)) { - ++var27; - continue label262; - } - } + var37 = class168.field1115.listFiles(); + if (var37 == null) { + break; + } + + var16 = var37; + var11 = 0; + + while (true) { + if (var11 >= var16.length) { + break label256; + } + + var35 = var16[var11]; + if (!DevicePcmPlayerProvider.method847(var35, false)) { + ++var6; + break; + } + + ++var11; } - break; } File var29 = class168.field1115; @@ -2602,11 +2613,11 @@ public final class Client extends GameShell implements Usernamed { class168.idx255File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); ArchiveDiskAction.idxFiles = new BufferedFile[class168.idxCount]; - for (int var35 = 0; var35 < class168.idxCount; ++var35) { - ArchiveDiskAction.idxFiles[var35] = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx" + var35), "rw", 1048576L), 6000, 0); + for (int var33 = 0; var33 < class168.idxCount; ++var33) { + ArchiveDiskAction.idxFiles[var33] = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx" + var33), "rw", 1048576L), 6000, 0); } - } catch (Exception var23) { - NPCDefinition.sendStackTrace((String)null, var23); + } catch (Exception var24) { + NPCDefinition.sendStackTrace((String)null, var24); } TextureProvider.client = this; @@ -2615,7 +2626,7 @@ public final class Client extends GameShell implements Usernamed { break; } - ClientParameter var4 = var1[var3]; + ClientParameter var4 = var1[var2]; String var5 = this.getParameter(var4.id); if (var5 != null) { switch(Integer.parseInt(var4.id)) { @@ -2646,25 +2657,25 @@ public final class Client extends GameShell implements Usernamed { language = Integer.parseInt(var5); break; case 7: - int var6 = Integer.parseInt(var5); + var6 = Integer.parseInt(var5); ServerBuild[] var7 = new ServerBuild[]{ServerBuild.field786, ServerBuild.field787, ServerBuild.field784, ServerBuild.field785}; ServerBuild[] var8 = var7; - var2 = 0; + var3 = 0; ServerBuild var9; while (true) { - if (var2 >= var8.length) { + if (var3 >= var8.length) { var9 = null; break; } - ServerBuild var10 = var8[var2]; + ServerBuild var10 = var8[var3]; if (var6 == var10.id) { var9 = var10; break; } - ++var2; + ++var3; } class15.serverBuild = var9; @@ -2698,12 +2709,12 @@ public final class Client extends GameShell implements Usernamed { } } - ++var3; + ++var2; } } - } catch (RuntimeException var24) { - throw Players.method2120(var24, "client.init()"); + } catch (RuntimeException var25) { + throw Players.method2120(var25, "client.init()"); } } @@ -2782,9 +2793,9 @@ public final class Client extends GameShell implements Usernamed { int var11; int var12; int var13; - byte[] var10000; - int var10001; - Buffer var24; + byte[] var14; + int var15; + Buffer var16; if (var9 > 0) { var10 = var9 - NetCache.NetCache_responseHeaderBuffer.index; if (var10 > var8) { @@ -2794,14 +2805,14 @@ public final class Client extends GameShell implements Usernamed { NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.index, var10); if (NetCache.field631 != 0) { for (var11 = 0; var11 < var10; ++var11) { - var10000 = NetCache.NetCache_responseHeaderBuffer.array; - var10001 = NetCache.NetCache_responseHeaderBuffer.index + var11; - var10000[var10001] ^= NetCache.field631; + var14 = NetCache.NetCache_responseHeaderBuffer.array; + var15 = NetCache.NetCache_responseHeaderBuffer.index + var11; + var14[var15] ^= NetCache.field631; } } - var24 = NetCache.NetCache_responseHeaderBuffer; - var24.index += var10; + var16 = NetCache.NetCache_responseHeaderBuffer; + var16.index += var10; if (NetCache.NetCache_responseHeaderBuffer.index < var9) { break; } @@ -2810,24 +2821,24 @@ public final class Client extends GameShell implements Usernamed { NetCache.NetCache_responseHeaderBuffer.index = 0; var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); var12 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); - int var14 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); + int var17 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); var13 = NetCache.NetCache_responseHeaderBuffer.readInt(); - long var15 = (long)(var12 + (var11 << 16)); - NetFileRequest var17 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var15); + long var18 = (long)(var12 + (var11 << 16)); + NetFileRequest var20 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var18); WorldComparator.field988 = true; - if (var17 == null) { - var17 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var15); + if (var20 == null) { + var20 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var18); WorldComparator.field988 = false; } - if (var17 == null) { + if (var20 == null) { throw new IOException(); } - int var18 = var14 == 0 ? 5 : 9; - ModelData0.NetCache_currentResponse = var17; - class22.NetCache_responseArchiveBuffer = new Buffer(var13 + var18 + ModelData0.NetCache_currentResponse.padding); - class22.NetCache_responseArchiveBuffer.writeByte(var14); + int var21 = var17 == 0 ? 5 : 9; + ModelData0.NetCache_currentResponse = var20; + class22.NetCache_responseArchiveBuffer = new Buffer(var13 + var21 + ModelData0.NetCache_currentResponse.padding); + class22.NetCache_responseArchiveBuffer.writeByte(var17); class22.NetCache_responseArchiveBuffer.writeInt(var13); NetCache.field630 = 8; NetCache.NetCache_responseHeaderBuffer.index = 0; @@ -2853,26 +2864,26 @@ public final class Client extends GameShell implements Usernamed { NetCache.NetCache_socket.read(class22.NetCache_responseArchiveBuffer.array, class22.NetCache_responseArchiveBuffer.index, var11); if (NetCache.field631 != 0) { for (var12 = 0; var12 < var11; ++var12) { - var10000 = class22.NetCache_responseArchiveBuffer.array; - var10001 = class22.NetCache_responseArchiveBuffer.index + var12; - var10000[var10001] ^= NetCache.field631; + var14 = class22.NetCache_responseArchiveBuffer.array; + var15 = class22.NetCache_responseArchiveBuffer.index + var12; + var14[var15] ^= NetCache.field631; } } - var24 = class22.NetCache_responseArchiveBuffer; - var24.index += var11; + var16 = class22.NetCache_responseArchiveBuffer; + var16.index += var11; NetCache.field630 += var11; if (var10 == class22.NetCache_responseArchiveBuffer.index) { if (16711935L == ModelData0.NetCache_currentResponse.key) { Players.NetCache_reference = class22.NetCache_responseArchiveBuffer; for (var12 = 0; var12 < 256; ++var12) { - Archive var22 = NetCache.NetCache_archives[var12]; - if (var22 != null) { + Archive var25 = NetCache.NetCache_archives[var12]; + if (var25 != null) { Players.NetCache_reference.index = var12 * 8 + 5; var13 = Players.NetCache_reference.readInt(); - int var23 = Players.NetCache_reference.readInt(); - var22.loadIndex(var13, var23); + int var26 = Players.NetCache_reference.readInt(); + var25.loadIndex(var13, var26); } } } else { @@ -2882,7 +2893,7 @@ public final class Client extends GameShell implements Usernamed { if (var12 != ModelData0.NetCache_currentResponse.crc) { try { NetCache.NetCache_socket.close(); - } catch (Exception var20) { + } catch (Exception var23) { } ++NetCache.NetCache_crcMismatches; @@ -2919,10 +2930,10 @@ public final class Client extends GameShell implements Usernamed { var4 = true; } - } catch (IOException var21) { + } catch (IOException var24) { try { NetCache.NetCache_socket.close(); - } catch (Exception var19) { + } catch (Exception var22) { } ++NetCache.NetCache_ioExceptions; @@ -3086,7 +3097,7 @@ public final class Client extends GameShell implements Usernamed { garbageValue = "2348" ) @Export("js5Error") - void js5Error(int var1) { + void js5Error(int code) { class210.js5SocketTask = null; DynamicObject.js5Socket = null; js5ConnectState = 0; @@ -3097,8 +3108,8 @@ public final class Client extends GameShell implements Usernamed { } ++js5Errors; - if (js5Errors < 2 || var1 != 7 && var1 != 9) { - if (js5Errors >= 2 && var1 == 6) { + if (js5Errors < 2 || code != 7 && code != 9) { + if (js5Errors >= 2 && code == 6) { this.error("js5connect_outofdate"); gameState = 1000; } else if (js5Errors >= 4) { @@ -3190,8 +3201,8 @@ public final class Client extends GameShell implements Usernamed { loginState = 3; } - int var4; - boolean var16; + boolean var4; + int var16; if (loginState == 3) { if (WorldMapCacheName.pcmPlayer0 != null) { WorldMapCacheName.pcmPlayer0.method242(); @@ -3201,13 +3212,13 @@ public final class Client extends GameShell implements Usernamed { AbstractArchive.pcmPlayer1.method242(); } - var16 = true; + var4 = true; if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { - var16 = false; + var4 = false; } - if (var16) { - var4 = ((AbstractSocket)var1).readUnsignedByte(); + if (var4) { + var16 = ((AbstractSocket)var1).readUnsignedByte(); if (WorldMapCacheName.pcmPlayer0 != null) { WorldMapCacheName.pcmPlayer0.method242(); } @@ -3216,8 +3227,8 @@ public final class Client extends GameShell implements Usernamed { AbstractArchive.pcmPlayer1.method242(); } - if (var4 != 0) { - IsaacCipher.method4093(var4); + if (var16 != 0) { + IsaacCipher.method4093(var16); return; } @@ -3410,15 +3421,15 @@ public final class Client extends GameShell implements Usernamed { } if (loginState == 12 && ((AbstractSocket)var1).available() >= field171) { - var16 = ((AbstractSocket)var1).readUnsignedByte() == 1; + var4 = ((AbstractSocket)var1).readUnsignedByte() == 1; ((AbstractSocket)var1).read(var2.array, 0, 4); var2.index = 0; boolean var17 = false; - if (var16) { - var4 = var2.readByteIsaac() << 24; - var4 |= var2.readByteIsaac() << 16; - var4 |= var2.readByteIsaac() << 8; - var4 |= var2.readByteIsaac(); + if (var4) { + var16 = var2.readByteIsaac() << 24; + var16 |= var2.readByteIsaac() << 16; + var16 |= var2.readByteIsaac() << 8; + var16 |= var2.readByteIsaac(); int var20 = class279.method5357(Login.Login_username); if (ReflectionCheck.clientPreferences.parameters.size() >= 10 && !ReflectionCheck.clientPreferences.parameters.containsKey(var20)) { Iterator var23 = ReflectionCheck.clientPreferences.parameters.entrySet().iterator(); @@ -3426,7 +3437,7 @@ public final class Client extends GameShell implements Usernamed { var23.remove(); } - ReflectionCheck.clientPreferences.parameters.put(var20, var4); + ReflectionCheck.clientPreferences.parameters.put(var20, var16); } if (Login_isUsernameRemembered) { @@ -3437,7 +3448,7 @@ public final class Client extends GameShell implements Usernamed { WorldMapSection0.savePreferences(); staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); - field155 = ((AbstractSocket)var1).readUnsignedByte() == 1; + playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); localPlayerIndex <<= 8; localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); @@ -3542,14 +3553,14 @@ public final class Client extends GameShell implements Usernamed { minimapState = 0; destinationX = 0; - for (var4 = 0; var4 < 2048; ++var4) { - players[var4] = null; + for (var16 = 0; var16 < 2048; ++var16) { + players[var16] = null; } Canvas.localPlayer = null; - for (var4 = 0; var4 < npcs.length; ++var4) { - NPC var19 = npcs[var4]; + for (var16 = 0; var16 < npcs.length; ++var16) { + NPC var19 = npcs[var16]; if (var19 != null) { var19.targetIndex = -1; var19.false0 = false; @@ -3559,8 +3570,8 @@ public final class Client extends GameShell implements Usernamed { SpriteMask.method4389(); GameShell.updateGameState(30); - for (var4 = 0; var4 < 100; ++var4) { - field100[var4] = true; + for (var16 = 0; var16 < 100; ++var16) { + field100[var16] = true; } AbstractByteArrayCopier.method4024(); @@ -3682,8 +3693,8 @@ public final class Client extends GameShell implements Usernamed { var5 = Interpreter.method1915(ClientPacket.field256, packetWriter.isaacCipher); var5.packetBuffer.writeByte(0); var4 = var5.packetBuffer.index; - PacketBuffer var10000 = var5.packetBuffer; - var10000.index += 2; + PacketBuffer var19 = var5.packetBuffer; + var19.index += 2; var10 = 0; var11 = 0; } @@ -3744,8 +3755,8 @@ public final class Client extends GameShell implements Usernamed { if (var9 >= Projectile.mouseRecorder.index) { Projectile.mouseRecorder.index = 0; } else { - MouseRecorder var36 = Projectile.mouseRecorder; - var36.index -= var9; + MouseRecorder var32 = Projectile.mouseRecorder; + var32.index -= var9; System.arraycopy(Projectile.mouseRecorder.xs, var9, Projectile.mouseRecorder.xs, 0, Projectile.mouseRecorder.index); System.arraycopy(Projectile.mouseRecorder.ys, var9, Projectile.mouseRecorder.ys, 0, Projectile.mouseRecorder.index); System.arraycopy(Projectile.mouseRecorder.millis, var9, Projectile.mouseRecorder.millis, 0, Projectile.mouseRecorder.index); @@ -3754,11 +3765,11 @@ public final class Client extends GameShell implements Usernamed { } PacketBufferNode var18; - long var19; + long var33; if (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { - var19 = (MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis * -1L) / 50L; - if (var19 > 4095L) { - var19 = 4095L; + var33 = (MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis * -1L) / 50L; + if (var33 > 4095L) { + var33 = 4095L; } mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis * -1L; @@ -3776,7 +3787,7 @@ public final class Client extends GameShell implements Usernamed { var9 = SoundCache.canvasWidth; } - var10 = (int)var19; + var10 = (int)var33; var18 = Interpreter.method1915(ClientPacket.field263, packetWriter.isaacCipher); var18.packetBuffer.writeShort((var10 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0)); var18.packetBuffer.writeShort(var9); @@ -3788,15 +3799,15 @@ public final class Client extends GameShell implements Usernamed { var6 = Interpreter.method1915(ClientPacket.field289, packetWriter.isaacCipher); var6.packetBuffer.writeShort(0); var7 = var6.packetBuffer.index; - var19 = class203.currentTimeMs(); + var33 = class203.currentTimeMs(); for (var10 = 0; var10 < KeyHandler.field452; ++var10) { - long var21 = var19 - field126; + long var21 = var33 - field126; if (var21 > 16777215L) { var21 = 16777215L; } - field126 = var19; + field126 = var33; var6.packetBuffer.method56(KeyHandler.field451[var10]); var6.packetBuffer.writeMedium((int)var21); } @@ -3855,20 +3866,20 @@ public final class Client extends GameShell implements Usernamed { } var1 = Players.Players_count; - int[] var30 = Players.Players_indices; + int[] var34 = Players.Players_indices; for (var4 = 0; var4 < var1; ++var4) { - Player var20 = players[var30[var4]]; - if (var20 != null) { - class65.method1232(var20, 1); + Player var22 = players[var34[var4]]; + if (var22 != null) { + class65.method1232(var22, 1); } } for (var1 = 0; var1 < npcCount; ++var1) { var7 = npcIndices[var1]; - NPC var31 = npcs[var7]; - if (var31 != null) { - class65.method1232(var31, var31.definition.size); + NPC var35 = npcs[var7]; + if (var35 != null) { + class65.method1232(var35, var35.definition.size); } } @@ -3889,8 +3900,8 @@ public final class Client extends GameShell implements Usernamed { } } - Widget var32 = Clock.mousedOverWidgetIf1; - Widget var33 = AccessFile.field8; + Widget var36 = Clock.mousedOverWidgetIf1; + Widget var23 = AccessFile.field8; Clock.mousedOverWidgetIf1 = null; AccessFile.field8 = null; draggedOnWidget = null; @@ -3900,8 +3911,8 @@ public final class Client extends GameShell implements Usernamed { while (Decimator.method2490() && field137 < 128) { if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && ArchiveDiskAction.field411 == 66) { - String var22 = KeyHandler.method839(); - TextureProvider.client.clipboardSetString(var22); + String var24 = KeyHandler.method839(); + TextureProvider.client.clipboardSetString(var24); } else if (oculusOrbState != 1 || GzipDecompressor.field378 <= 0) { field145[field137] = ArchiveDiskAction.field411; field146[field137] = GzipDecompressor.field378; @@ -3938,73 +3949,73 @@ public final class Client extends GameShell implements Usernamed { ++cycleCntr; while (true) { - Widget var23; - ScriptEvent var24; - Widget var34; + ScriptEvent var25; + Widget var26; + Widget var37; do { - var24 = (ScriptEvent)field147.removeLast(); - if (var24 == null) { + var25 = (ScriptEvent)field147.removeLast(); + if (var25 == null) { while (true) { do { - var24 = (ScriptEvent)field148.removeLast(); - if (var24 == null) { + var25 = (ScriptEvent)field148.removeLast(); + if (var25 == null) { while (true) { do { - var24 = (ScriptEvent)scriptEvents.removeLast(); - if (var24 == null) { + var25 = (ScriptEvent)scriptEvents.removeLast(); + if (var25 == null) { this.method86(); WorldMapSectionType.method254(); if (clickedWidget != null) { this.method88(); } - PacketBufferNode var25; + PacketBufferNode var27; if (DevicePcmPlayerProvider.dragInventoryWidget != null) { class22.method295(DevicePcmPlayerProvider.dragInventoryWidget); ++itemDragDuration; if (MouseHandler.MouseHandler_currentButton == 0) { if (field207) { if (UserComparator6.field937 == DevicePcmPlayerProvider.dragInventoryWidget && dragItemSlotSource != dragItemSlotDestination) { - Widget var26 = DevicePcmPlayerProvider.dragInventoryWidget; - byte var27 = 0; - if (field136 == 1 && var26.contentType == 206) { - var27 = 1; + Widget var28 = DevicePcmPlayerProvider.dragInventoryWidget; + byte var29 = 0; + if (field136 == 1 && var28.contentType == 206) { + var29 = 1; } - if (var26.itemIds[dragItemSlotDestination] <= 0) { - var27 = 0; + if (var28.itemIds[dragItemSlotDestination] <= 0) { + var29 = 0; } - if (class168.method3461(class1.getWidgetClickMask(var26))) { + if (class168.method3461(class1.getWidgetClickMask(var28))) { var10 = dragItemSlotSource; var11 = dragItemSlotDestination; - var26.itemIds[var11] = var26.itemIds[var10]; - var26.itemQuantities[var11] = var26.itemQuantities[var10]; - var26.itemIds[var10] = -1; - var26.itemQuantities[var10] = 0; - } else if (var27 == 1) { + var28.itemIds[var11] = var28.itemIds[var10]; + var28.itemQuantities[var11] = var28.itemQuantities[var10]; + var28.itemIds[var10] = -1; + var28.itemQuantities[var10] = 0; + } else if (var29 == 1) { var10 = dragItemSlotSource; var11 = dragItemSlotDestination; while (var10 != var11) { if (var10 > var11) { - var26.swapItems(var10 - 1, var10); + var28.swapItems(var10 - 1, var10); --var10; } else if (var10 < var11) { - var26.swapItems(var10 + 1, var10); + var28.swapItems(var10 + 1, var10); ++var10; } } } else { - var26.swapItems(dragItemSlotDestination, dragItemSlotSource); + var28.swapItems(dragItemSlotDestination, dragItemSlotSource); } - var25 = Interpreter.method1915(ClientPacket.field302, packetWriter.isaacCipher); - var25.packetBuffer.writeShort(dragItemSlotDestination); - var25.packetBuffer.writeShortLE(dragItemSlotSource); - var25.packetBuffer.writeInt(DevicePcmPlayerProvider.dragInventoryWidget.id); - var25.packetBuffer.method56(var27); - packetWriter.method241(var25); + var27 = Interpreter.method1915(ClientPacket.field302, packetWriter.isaacCipher); + var27.packetBuffer.writeShort(dragItemSlotDestination); + var27.packetBuffer.writeShortLE(dragItemSlotSource); + var27.packetBuffer.writeInt(DevicePcmPlayerProvider.dragInventoryWidget.id); + var27.packetBuffer.method56(var29); + packetWriter.method241(var27); } } else if (this.shouldLeftClickOpenMenu()) { this.openMenu(field205, field206); @@ -4026,12 +4037,12 @@ public final class Client extends GameShell implements Usernamed { if (Scene.method3187()) { var4 = Scene.Scene_selectedX; var9 = Scene.Scene_selectedY; - var25 = Interpreter.method1915(ClientPacket.field318, packetWriter.isaacCipher); - var25.packetBuffer.writeByte(5); - var25.packetBuffer.method63(var9 + GraphicsObject.baseY); - var25.packetBuffer.method63(var4 + class50.baseX); - var25.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); - packetWriter.method241(var25); + var27 = Interpreter.method1915(ClientPacket.field318, packetWriter.isaacCipher); + var27.packetBuffer.writeByte(5); + var27.packetBuffer.method63(var9 + GraphicsObject.baseY); + var27.packetBuffer.method63(var4 + class50.baseX); + var27.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); + packetWriter.method241(var27); Scene.method3103(); mouseCrossX = MouseHandler.MouseHandler_lastPressedX; mouseCrossY = MouseHandler.MouseHandler_lastPressedY; @@ -4041,9 +4052,9 @@ public final class Client extends GameShell implements Usernamed { destinationY = var9; } - if (var32 != Clock.mousedOverWidgetIf1) { - if (var32 != null) { - class22.method295(var32); + if (var36 != Clock.mousedOverWidgetIf1) { + if (var36 != null) { + class22.method295(var36); } if (Clock.mousedOverWidgetIf1 != null) { @@ -4051,9 +4062,9 @@ public final class Client extends GameShell implements Usernamed { } } - if (var33 != AccessFile.field8 && field218 == field219) { - if (var33 != null) { - class22.method295(var33); + if (var23 != AccessFile.field8 && field218 == field219) { + if (var23 != null) { + class22.method295(var23); } if (AccessFile.field8 != null) { @@ -4169,22 +4180,22 @@ public final class Client extends GameShell implements Usernamed { MusicPatchNode.cameraYaw &= 2047; } - int var35 = var16 - MusicPatchNode.cameraYaw; - if (var35 > 1024) { - var35 -= 2048; + int var38 = var16 - MusicPatchNode.cameraYaw; + if (var38 > 1024) { + var38 -= 2048; } - if (var35 < -1024) { - var35 += 2048; + if (var38 < -1024) { + var38 += 2048; } - if (var35 < 0 && var17 > 0 || var35 > 0 && var17 < 0) { + if (var38 < 0 && var17 > 0 || var38 > 0 && var17 < 0) { MusicPatchNode.cameraYaw = var16; } } for (var4 = 0; var4 < 5; ++var4) { - int var10002 = field144[var4]++; + int var10003 = field144[var4]++; } class196.varcs.tryWrite(); @@ -4206,46 +4217,46 @@ public final class Client extends GameShell implements Usernamed { try { packetWriter.method240(); - } catch (IOException var28) { + } catch (IOException var30) { class48.method868(); } return; } - var23 = var24.widget; - if (var23.childIndex < 0) { + var37 = var25.widget; + if (var37.childIndex < 0) { break; } - var34 = Huffman.getWidget(var23.parentId); - } while(var34 == null || var34.children == null || var23.childIndex >= var34.children.length || var23 != var34.children[var23.childIndex]); + var26 = Huffman.getWidget(var37.parentId); + } while(var26 == null || var26.children == null || var37.childIndex >= var26.children.length || var37 != var26.children[var37.childIndex]); - AbstractArchive.runScript(var24); + AbstractArchive.runScript(var25); } } - var23 = var24.widget; - if (var23.childIndex < 0) { + var37 = var25.widget; + if (var37.childIndex < 0) { break; } - var34 = Huffman.getWidget(var23.parentId); - } while(var34 == null || var34.children == null || var23.childIndex >= var34.children.length || var23 != var34.children[var23.childIndex]); + var26 = Huffman.getWidget(var37.parentId); + } while(var26 == null || var26.children == null || var37.childIndex >= var26.children.length || var37 != var26.children[var37.childIndex]); - AbstractArchive.runScript(var24); + AbstractArchive.runScript(var25); } } - var23 = var24.widget; - if (var23.childIndex < 0) { + var37 = var25.widget; + if (var37.childIndex < 0) { break; } - var34 = Huffman.getWidget(var23.parentId); - } while(var34 == null || var34.children == null || var23.childIndex >= var34.children.length || var23 != var34.children[var23.childIndex]); + var26 = Huffman.getWidget(var37.parentId); + } while(var26 == null || var26.children == null || var37.childIndex >= var26.children.length || var37 != var26.children[var37.childIndex]); - AbstractArchive.runScript(var24); + AbstractArchive.runScript(var25); } } @@ -4580,17 +4591,17 @@ public final class Client extends GameShell implements Usernamed { return true; } - int var37; + int var38; if (ServerPacket.field817 == var1.serverPacket0) { - for (var37 = 0; var37 < players.length; ++var37) { - if (players[var37] != null) { - players[var37].sequence = -1; + for (var38 = 0; var38 < players.length; ++var38) { + if (players[var38] != null) { + players[var38].sequence = -1; } } - for (var37 = 0; var37 < npcs.length; ++var37) { - if (npcs[var37] != null) { - npcs[var37].sequence = -1; + for (var38 = 0; var38 < npcs.length; ++var38) { + if (npcs[var38] != null) { + npcs[var38].sequence = -1; } } @@ -4603,9 +4614,9 @@ public final class Client extends GameShell implements Usernamed { WorldMapSection3.field1089 = var3.readUnsignedByteNegate(); while (var3.index < var1.serverPacket0Length) { - var37 = var3.readUnsignedByte(); - class190 var38 = RunException.method3430()[var37]; - class16.method189(var38); + var38 = var3.readUnsignedByte(); + class190 var39 = RunException.method3430()[var38]; + class16.method189(var39); } var1.serverPacket0 = null; @@ -4614,11 +4625,11 @@ public final class Client extends GameShell implements Usernamed { Widget var8; if (ServerPacket.field850 == var1.serverPacket0) { - var37 = var3.method44(); + var38 = var3.method44(); var6 = var3.method73(); var8 = Huffman.getWidget(var6); - if (var37 != var8.sequenceId || var37 == -1) { - var8.sequenceId = var37; + if (var38 != var8.sequenceId || var38 == -1) { + var8.sequenceId = var38; var8.modelFrame = 0; var8.modelFrameCycle = 0; class22.method295(var8); @@ -4630,8 +4641,8 @@ public final class Client extends GameShell implements Usernamed { Widget var9; if (ServerPacket.field819 == var1.serverPacket0) { - var37 = var3.method73(); - var9 = Huffman.getWidget(var37); + var38 = var3.method73(); + var9 = Huffman.getWidget(var38); var9.modelType = 3; var9.modelId = Canvas.localPlayer.appearance.getChatHeadId(); class22.method295(var9); @@ -4646,8 +4657,8 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field796 == var1.serverPacket0) { - var37 = var3.method72(); - var9 = Huffman.getWidget(var37); + var38 = var3.method72(); + var9 = Huffman.getWidget(var38); for (var5 = 0; var5 < var9.itemIds.length; ++var5) { var9.itemIds[var5] = -1; @@ -4664,14 +4675,14 @@ public final class Client extends GameShell implements Usernamed { int var12; int var13; if (ServerPacket.field859 == var1.serverPacket0) { - var37 = var3.readInt(); + var38 = var3.readInt(); var6 = var3.readUnsignedShort(); - if (var37 < -70000) { + if (var38 < -70000) { var6 += 32768; } - if (var37 >= 0) { - var8 = Huffman.getWidget(var37); + if (var38 >= 0) { + var8 = Huffman.getWidget(var38); } else { var8 = null; } @@ -4732,9 +4743,9 @@ public final class Client extends GameShell implements Usernamed { boolean var14; if (ServerPacket.field810 == var1.serverPacket0) { - var37 = var3.readInt(); + var38 = var3.readInt(); var14 = var3.readUnsignedByte() == 1; - var8 = Huffman.getWidget(var37); + var8 = Huffman.getWidget(var38); if (var14 != var8.isHidden) { var8.isHidden = var14; class22.method295(var8); @@ -4745,11 +4756,11 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field852 == var1.serverPacket0) { - byte var39 = var3.method60(); + byte var40 = var3.method60(); var6 = var3.method66(); - Varps.Varps_temp[var6] = var39; - if (Varps.Varps_main[var6] != var39) { - Varps.Varps_main[var6] = var39; + Varps.Varps_temp[var6] = var40; + if (Varps.Varps_main[var6] != var40) { + Varps.Varps_main[var6] = var40; } Archive.method4703(var6); @@ -4765,13 +4776,13 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field844 == var1.serverPacket0) { - var37 = var3.readUnsignedByte(); + var38 = var3.readUnsignedByte(); if (var3.readUnsignedByte() == 0) { - grandExchangeOffers[var37] = new GrandExchangeOffer(); + grandExchangeOffers[var38] = new GrandExchangeOffer(); var3.index += 18; } else { --var3.index; - grandExchangeOffers[var37] = new GrandExchangeOffer(var3, false); + grandExchangeOffers[var38] = new GrandExchangeOffer(var3, false); } field122 = cycleCntr; @@ -4780,10 +4791,10 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field873 == var1.serverPacket0) { - var37 = var3.method67(); - rootInterface = var37; + var38 = var3.method67(); + rootInterface = var38; this.method87(false); - DevicePcmPlayerProvider.method845(var37); + DevicePcmPlayerProvider.method845(var38); WorldMapSection3.runWidgetOnLoadListener(rootInterface); for (var6 = 0; var6 < 100; ++var6) { @@ -4804,13 +4815,13 @@ public final class Client extends GameShell implements Usernamed { Widget var15; if (ServerPacket.field839 == var1.serverPacket0) { - var37 = var3.method67(); + var38 = var3.method67(); var6 = var3.method67(); var5 = var3.method67(); var10 = var3.method73(); var15 = Huffman.getWidget(var10); - if (var37 != var15.modelAngleX || var5 != var15.modelAngleY || var6 != var15.modelZoom) { - var15.modelAngleX = var37; + if (var38 != var15.modelAngleX || var5 != var15.modelAngleY || var6 != var15.modelZoom) { + var15.modelAngleX = var38; var15.modelAngleY = var5; var15.modelZoom = var6; class22.method295(var15); @@ -4881,11 +4892,11 @@ public final class Client extends GameShell implements Usernamed { Widget var16; if (ServerPacket.field830 == var1.serverPacket0) { - var37 = var3.method66(); + var38 = var3.method66(); var6 = var3.method65(); var5 = var3.method72(); var16 = Huffman.getWidget(var5); - var16.field963 = var37 + (var6 << 16); + var16.field963 = var38 + (var6 << 16); var1.serverPacket0 = null; return true; } @@ -4900,15 +4911,15 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field809 == var1.serverPacket0) { - var37 = var3.readInt(); + var38 = var3.readInt(); var6 = var3.readUnsignedShort(); if (var6 == 65535) { var6 = -1; } var5 = var3.method73(); - var16 = Huffman.getWidget(var37); - ItemDefinition var40; + var16 = Huffman.getWidget(var38); + ItemDefinition var41; if (!var16.isIf3) { if (var6 == -1) { var16.modelType = 0; @@ -4916,24 +4927,24 @@ public final class Client extends GameShell implements Usernamed { return true; } - var40 = Skills.getItemDefinition(var6); + var41 = Skills.getItemDefinition(var6); var16.modelType = 4; var16.modelId = var6; - var16.modelAngleX = var40.xan2d; - var16.modelAngleY = var40.yan2d; - var16.modelZoom = var40.zoom2d * 100 / var5; + var16.modelAngleX = var41.xan2d; + var16.modelAngleY = var41.yan2d; + var16.modelZoom = var41.zoom2d * 100 / var5; class22.method295(var16); } else { var16.itemId = var6; var16.itemQuantity = var5; - var40 = Skills.getItemDefinition(var6); - var16.modelAngleX = var40.xan2d; - var16.modelAngleY = var40.yan2d; - var16.modelAngleZ = var40.zan2d; - var16.modelOffsetX = var40.offsetX2d; - var16.modelOffsetY = var40.offsetY2d; - var16.modelZoom = var40.zoom2d; - if (var40.isStackable == 1) { + var41 = Skills.getItemDefinition(var6); + var16.modelAngleX = var41.xan2d; + var16.modelAngleY = var41.yan2d; + var16.modelAngleZ = var41.zan2d; + var16.modelOffsetX = var41.offsetX2d; + var16.modelOffsetY = var41.offsetY2d; + var16.modelZoom = var41.zoom2d; + if (var41.isStackable == 1) { var16.itemQuantityMode = 1; } else { var16.itemQuantityMode = 2; @@ -4955,7 +4966,7 @@ public final class Client extends GameShell implements Usernamed { String var17; boolean var18; if (ServerPacket.field792 == var1.serverPacket0) { - var37 = var3.method48(); + var38 = var3.method48(); var14 = var3.readUnsignedByte() == 1; var17 = ""; var18 = false; @@ -4966,9 +4977,9 @@ public final class Client extends GameShell implements Usernamed { } } - String var41 = var3.readStringCp1252NullTerminated(); + String var42 = var3.readStringCp1252NullTerminated(); if (!var18) { - WorldMapIcon1.addGameMessage(var37, var17, var41); + WorldMapIcon1.addGameMessage(var38, var17, var42); } var1.serverPacket0 = null; @@ -5003,7 +5014,7 @@ public final class Client extends GameShell implements Usernamed { long var19; if (ServerPacket.field837 == var1.serverPacket0) { - var37 = var3.method71(); + var38 = var3.method71(); var6 = var3.method66(); if (var6 == 65535) { var6 = -1; @@ -5017,12 +5028,12 @@ public final class Client extends GameShell implements Usernamed { for (var11 = var10; var11 <= var6; ++var11) { var19 = (long)var11 + ((long)var5 << 32); - Node var42 = widgetClickMasks.get(var19); - if (var42 != null) { - var42.remove(); + Node var43 = widgetClickMasks.get(var19); + if (var43 != null) { + var43.remove(); } - widgetClickMasks.put(new IntegerNode(var37), var19); + widgetClickMasks.put(new IntegerNode(var38), var19); } var1.serverPacket0 = null; @@ -5054,20 +5065,20 @@ public final class Client extends GameShell implements Usernamed { String var21; if (ServerPacket.field851 == var1.serverPacket0) { var21 = var3.readStringCp1252NullTerminated(); - Object[] var46 = new Object[var21.length() + 1]; + Object[] var47 = new Object[var21.length() + 1]; for (var5 = var21.length() - 1; var5 >= 0; --var5) { if (var21.charAt(var5) == 's') { - var46[var5 + 1] = var3.readStringCp1252NullTerminated(); + var47[var5 + 1] = var3.readStringCp1252NullTerminated(); } else { - var46[var5 + 1] = new Integer(var3.readInt()); + var47[var5 + 1] = new Integer(var3.readInt()); } } - var46[0] = new Integer(var3.readInt()); - ScriptEvent var49 = new ScriptEvent(); - var49.args0 = var46; - AbstractArchive.runScript(var49); + var47[0] = new Integer(var3.readInt()); + ScriptEvent var50 = new ScriptEvent(); + var50.args0 = var47; + AbstractArchive.runScript(var50); var1.serverPacket0 = null; return true; } @@ -5100,11 +5111,11 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field867 == var1.serverPacket0) { - for (var37 = 0; var37 < VarpDefinition.field944; ++var37) { - VarpDefinition var44 = SecureRandomCallable.method1140(var37); - if (var44 != null) { - Varps.Varps_temp[var37] = 0; - Varps.Varps_main[var37] = 0; + for (var38 = 0; var38 < VarpDefinition.field944; ++var38) { + VarpDefinition var45 = SecureRandomCallable.method1140(var38); + if (var45 != null) { + Varps.Varps_temp[var38] = 0; + Varps.Varps_main[var38] = 0; } } @@ -5115,14 +5126,14 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field833 == var1.serverPacket0) { - var37 = var3.readInt(); + var38 = var3.readInt(); var6 = var3.readUnsignedShort(); - if (var37 < -70000) { + if (var38 < -70000) { var6 += 32768; } - if (var37 >= 0) { - var8 = Huffman.getWidget(var37); + if (var38 >= 0) { + var8 = Huffman.getWidget(var38); } else { var8 = null; } @@ -5155,19 +5166,19 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field854 == var1.serverPacket0) { - var37 = var3.readUnsignedShort(); + var38 = var3.readUnsignedShort(); var6 = var3.readUnsignedByte(); var5 = var3.readUnsignedShort(); - Ignored.queueSoundEffect(var37, var6, var5); + Ignored.queueSoundEffect(var38, var6, var5); var1.serverPacket0 = null; return true; } if (ServerPacket.field848 == var1.serverPacket0) { - var37 = var3.method72(); + var38 = var3.method72(); var6 = var3.method69(); var5 = var3.method68(); - var16 = Huffman.getWidget(var37); + var16 = Huffman.getWidget(var38); if (var5 != var16.rawX || var6 != var16.rawY || var16.xAlignment != 0 || var16.yAlignment != 0) { var16.rawX = var5; var16.rawY = var6; @@ -5176,7 +5187,7 @@ public final class Client extends GameShell implements Usernamed { class22.method295(var16); this.alignWidget(var16); if (var16.type == 0) { - class39.revalidateWidgetScroll(Widget.interfaceComponents[var37 >> 16], var16, false); + class39.revalidateWidgetScroll(Widget.interfaceComponents[var38 >> 16], var16, false); } } @@ -5185,12 +5196,12 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field824 == var1.serverPacket0) { - var37 = var3.method67(); + var38 = var3.method67(); var6 = var3.method73(); var8 = Huffman.getWidget(var6); - if (var8.modelType != 2 || var37 != var8.modelId) { + if (var8.modelType != 2 || var38 != var8.modelId) { var8.modelType = 2; - var8.modelId = var37; + var8.modelId = var38; class22.method295(var8); } @@ -5199,15 +5210,15 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field836 == var1.serverPacket0) { - World var43 = new World(); - var43.host = var3.readStringCp1252NullTerminated(); - var43.id = var3.readUnsignedShort(); + World var44 = new World(); + var44.host = var3.readStringCp1252NullTerminated(); + var44.id = var3.readUnsignedShort(); var6 = var3.readInt(); - var43.properties = var6; + var44.properties = var6; GameShell.updateGameState(45); var2.close(); var2 = null; - class31.changeWorld(var43); + class31.changeWorld(var44); var1.serverPacket0 = null; return false; } @@ -5228,17 +5239,17 @@ public final class Client extends GameShell implements Usernamed { InterfaceParent var22; if (ServerPacket.field871 == var1.serverPacket0) { - var37 = var3.readInt(); + var38 = var3.readInt(); var6 = var3.readInt(); - InterfaceParent var48 = (InterfaceParent)interfaceParents.get((long)var6); - var22 = (InterfaceParent)interfaceParents.get((long)var37); + InterfaceParent var49 = (InterfaceParent)interfaceParents.get((long)var6); + var22 = (InterfaceParent)interfaceParents.get((long)var38); if (var22 != null) { - MenuAction.closeInterface(var22, var48 == null || var48.group != var22.group); + MenuAction.closeInterface(var22, var49 == null || var49.group != var22.group); } - if (var48 != null) { - var48.remove(); - interfaceParents.put(var48, (long)var37); + if (var49 != null) { + var49.remove(); + interfaceParents.put(var49, (long)var38); } var15 = Huffman.getWidget(var6); @@ -5246,7 +5257,7 @@ public final class Client extends GameShell implements Usernamed { class22.method295(var15); } - var15 = Huffman.getWidget(var37); + var15 = Huffman.getWidget(var38); if (var15 != null) { class22.method295(var15); class39.revalidateWidgetScroll(Widget.interfaceComponents[var15.id >>> 16], var15, true); @@ -5261,16 +5272,16 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field813 == var1.serverPacket0) { - var37 = var3.method72(); + var38 = var3.method72(); var6 = var3.method66(); var5 = var6 >> 10 & 31; var10 = var6 >> 5 & 31; var11 = var6 & 31; var12 = (var10 << 11) + (var5 << 19) + (var11 << 3); - Widget var47 = Huffman.getWidget(var37); - if (var12 != var47.color) { - var47.color = var12; - class22.method295(var47); + Widget var48 = Huffman.getWidget(var38); + if (var12 != var48.color) { + var48.color = var12; + class22.method295(var48); } var1.serverPacket0 = null; @@ -5278,15 +5289,15 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field828 == var1.serverPacket0) { - var37 = var3.readUnsignedByte(); + var38 = var3.readUnsignedByte(); var6 = var3.readUnsignedByte(); var5 = var3.readUnsignedByte(); var10 = var3.readUnsignedByte(); - field139[var37] = true; - field141[var37] = var6; - field142[var37] = var5; - field143[var37] = var10; - field144[var37] = 0; + field139[var38] = true; + field141[var38] = var6; + field142[var38] = var5; + field143[var38] = var10; + field144[var38] = 0; var1.serverPacket0 = null; return true; } @@ -5309,18 +5320,18 @@ public final class Client extends GameShell implements Usernamed { Canvas.field95 = var3.readUnsignedByteNegate(); WorldMapSection3.field1089 = var3.readUnsignedByte(); - for (var37 = WorldMapSection3.field1089; var37 < WorldMapSection3.field1089 + 8; ++var37) { + for (var38 = WorldMapSection3.field1089; var38 < WorldMapSection3.field1089 + 8; ++var38) { for (var6 = Canvas.field95; var6 < Canvas.field95 + 8; ++var6) { - if (groundItems[SoundSystem.plane][var37][var6] != null) { - groundItems[SoundSystem.plane][var37][var6] = null; - TilePaint.updateItemPile(var37, var6); + if (groundItems[SoundSystem.plane][var38][var6] != null) { + groundItems[SoundSystem.plane][var38][var6] = null; + TilePaint.updateItemPile(var38, var6); } } } - for (PendingSpawn var45 = (PendingSpawn) pendingSpawns.last(); var45 != null; var45 = (PendingSpawn) pendingSpawns.previous()) { - if (var45.x >= WorldMapSection3.field1089 && var45.x < WorldMapSection3.field1089 + 8 && var45.y >= Canvas.field95 && var45.y < Canvas.field95 + 8 && var45.level == SoundSystem.plane) { - var45.hitpoints = 0; + for (PendingSpawn var46 = (PendingSpawn)pendingSpawns.last(); var46 != null; var46 = (PendingSpawn)pendingSpawns.previous()) { + if (var46.x >= WorldMapSection3.field1089 && var46.x < WorldMapSection3.field1089 + 8 && var46.y >= Canvas.field95 && var46.y < Canvas.field95 + 8 && var46.level == SoundSystem.plane) { + var46.hitpoints = 0; } } @@ -5329,9 +5340,9 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field820 == var1.serverPacket0) { - var37 = var3.method73(); + var38 = var3.method73(); var6 = var3.method67(); - var8 = Huffman.getWidget(var37); + var8 = Huffman.getWidget(var38); if (var8.modelType != 1 || var6 != var8.modelId) { var8.modelType = 1; var8.modelId = var6; @@ -5343,8 +5354,8 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field823 == var1.serverPacket0) { - var37 = var3.readUnsignedByte(); - BufferedNetSocket.method3500(var37); + var38 = var3.readUnsignedByte(); + BufferedNetSocket.method3500(var38); var1.serverPacket0 = null; return true; } @@ -5353,6 +5364,7 @@ public final class Client extends GameShell implements Usernamed { long var25; long var27; PlayerType var29; + int var51; if (ServerPacket.field843 == var1.serverPacket0) { var21 = var3.readStringCp1252NullTerminated(); var25 = var3.readLong(); @@ -5360,27 +5372,27 @@ public final class Client extends GameShell implements Usernamed { var19 = (long)var3.readMedium(); var29 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte()); var23 = (var27 << 32) + var19; - boolean var53 = false; + boolean var55 = false; - for (int var31 = 0; var31 < 100; ++var31) { - if (field152[var31] == var23) { - var53 = true; + for (var51 = 0; var51 < 100; ++var51) { + if (field152[var51] == var23) { + var55 = true; break; } } if (var29.isUser && WorldMapArea.friendSystem.isIgnored(new Username(var21, KeyHandler.loginType))) { - var53 = true; + var55 = true; } - if (!var53 && field208 == 0) { + if (!var55 && field208 == 0) { field152[field156] = var23; field156 = (field156 + 1) % 100; - String var55 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3))); + String var56 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3))); if (var29.modIcon != -1) { - GrandExchangeEvents.addMessage(9, ItemContainer.method1170(var29.modIcon) + var21, var55, Clock.method3534(var25)); + GrandExchangeEvents.addChatMessage(9, ItemContainer.method1170(var29.modIcon) + var21, var56, Clock.method3534(var25)); } else { - GrandExchangeEvents.addMessage(9, var21, var55, Clock.method3534(var25)); + GrandExchangeEvents.addChatMessage(9, var21, var56, Clock.method3534(var25)); } } @@ -5395,9 +5407,9 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field808 == var1.serverPacket0) { - var37 = var3.readInt(); + var38 = var3.readInt(); var4 = var3.readStringCp1252NullTerminated(); - var8 = Huffman.getWidget(var37); + var8 = Huffman.getWidget(var38); if (!var4.equals(var8.text)) { var8.text = var4; class22.method295(var8); @@ -5416,8 +5428,8 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field791 == var1.serverPacket0) { isCameraLocked = false; - for (var37 = 0; var37 < 5; ++var37) { - field139[var37] = false; + for (var38 = 0; var38 < 5; ++var38) { + field139[var38] = false; } var1.serverPacket0 = null; @@ -5432,10 +5444,10 @@ public final class Client extends GameShell implements Usernamed { VertexNormal.field946 = var3.readUnsignedByte(); class171.field1116 = var3.readUnsignedByte(); if (class171.field1116 >= 100) { - var37 = GrandExchangeOffer.field376 * 128 + 64; + var38 = GrandExchangeOffer.field376 * 128 + 64; var6 = KeyHandler.field445 * 128 + 64; - var5 = class32.getTileHeight(var37, var6, SoundSystem.plane) - ArchiveDiskAction.field410; - var10 = var37 - WorldMapSection1.cameraX; + var5 = class32.getTileHeight(var38, var6, SoundSystem.plane) - ArchiveDiskAction.field410; + var10 = var38 - WorldMapSection1.cameraX; var11 = var5 - GrandExchangeEvents.cameraY; var12 = var6 - class11.cameraZ; var13 = (int)Math.sqrt((double)(var12 * var12 + var10 * var10)); @@ -5455,9 +5467,9 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field865 == var1.serverPacket0) { - var37 = var3.method73(); + var38 = var3.method73(); var6 = var3.method67(); - var8 = Huffman.getWidget(var37); + var8 = Huffman.getWidget(var38); if (var8 != null && var8.type == 0) { if (var6 > var8.scrollHeight - var8.height) { var6 = var8.scrollHeight - var8.height; @@ -5478,9 +5490,9 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field835 == var1.serverPacket0) { - var37 = var3.method65(); - Script.method2216(var37); - field116[++field117 - 1 & 31] = var37 & 32767; + var38 = var3.method65(); + Script.method2216(var38); + field116[++field117 - 1 & 31] = var38 & 32767; var1.serverPacket0 = null; return true; } @@ -5497,15 +5509,15 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field811 == var1.serverPacket0) { class12.method159(); - var37 = var3.method71(); + var38 = var3.method71(); var6 = var3.readUnsignedByteNegate(); var5 = var3.readUnsignedByte(); - experience[var6] = var37; + experience[var6] = var38; currentLevels[var6] = var5; levels[var6] = 1; for (var10 = 0; var10 < 98; ++var10) { - if (var37 >= Skills.Skills_experienceTable[var10]) { + if (var38 >= Skills.Skills_experienceTable[var10]) { levels[var6] = var10 + 2; } } @@ -5516,15 +5528,15 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field858 == var1.serverPacket0) { - var37 = var3.readInt(); + var38 = var3.readInt(); var6 = var3.readInt(); var5 = DynamicObject.method2222(); - PacketBufferNode var56 = Interpreter.method1915(ClientPacket.field233, packetWriter.isaacCipher); - var56.packetBuffer.method56(var5); - var56.packetBuffer.writeByte(GameShell.fps); - var56.packetBuffer.writeIntME(var37); - var56.packetBuffer.writeIntLE(var6); - packetWriter.method241(var56); + PacketBufferNode var54 = Interpreter.method1915(ClientPacket.field233, packetWriter.isaacCipher); + var54.packetBuffer.method56(var5); + var54.packetBuffer.writeByte(GameShell.fps); + var54.packetBuffer.writeIntME(var38); + var54.packetBuffer.writeIntLE(var6); + packetWriter.method241(var54); var1.serverPacket0 = null; return true; } @@ -5559,10 +5571,10 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field807 == var1.serverPacket0) { - byte[] var54 = new byte[var1.serverPacket0Length]; - var3.method237(var54, 0, var54.length); - Buffer var52 = new Buffer(var54); - var17 = var52.readStringCp1252NullTerminated(); + byte[] var52 = new byte[var1.serverPacket0Length]; + var3.method237(var52, 0, var52.length); + Buffer var53 = new Buffer(var52); + var17 = var53.readStringCp1252NullTerminated(); WorldMapCacheName.openURL(var17, true, false); var1.serverPacket0 = null; return true; @@ -5574,9 +5586,9 @@ public final class Client extends GameShell implements Usernamed { return true; } - InterfaceParent var50; + InterfaceParent var30; if (ServerPacket.field845 == var1.serverPacket0) { - var37 = var3.index + var1.serverPacket0Length; + var38 = var3.index + var1.serverPacket0Length; var6 = var3.readUnsignedShort(); var5 = var3.readUnsignedShort(); if (var6 != rootInterface) { @@ -5590,18 +5602,18 @@ public final class Client extends GameShell implements Usernamed { } } - for (; var5-- > 0; var50.keep = true) { + for (; var5-- > 0; var30.keep = true) { var10 = var3.readInt(); var11 = var3.readUnsignedShort(); var12 = var3.readUnsignedByte(); - var50 = (InterfaceParent)interfaceParents.get((long)var10); - if (var50 != null && var11 != var50.group) { - MenuAction.closeInterface(var50, true); - var50 = null; + var30 = (InterfaceParent)interfaceParents.get((long)var10); + if (var30 != null && var11 != var30.group) { + MenuAction.closeInterface(var30, true); + var30 = null; } - if (var50 == null) { - var50 = SecureRandomCallable.method1143(var10, var11, var12); + if (var30 == null) { + var30 = SecureRandomCallable.method1143(var10, var11, var12); } } @@ -5615,13 +5627,13 @@ public final class Client extends GameShell implements Usernamed { widgetClickMasks = new NodeHashTable(512); - while (var3.index < var37) { + while (var3.index < var38) { var10 = var3.readInt(); var11 = var3.readUnsignedShort(); var12 = var3.readUnsignedShort(); var13 = var3.readInt(); - for (int var51 = var11; var51 <= var12; ++var51) { + for (var51 = var11; var51 <= var12; ++var51) { var23 = (long)var51 + ((long)var10 << 32); widgetClickMasks.put(new IntegerNode(var13), var23); } @@ -5632,7 +5644,7 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field855 == var1.serverPacket0) { - var37 = var3.method58(); + var38 = var3.method58(); var6 = var3.method58(); var17 = var3.readStringCp1252NullTerminated(); if (var6 >= 1 && var6 <= 8) { @@ -5641,7 +5653,7 @@ public final class Client extends GameShell implements Usernamed { } playerMenuActions[var6 - 1] = var17; - playerOptionsPriorities[var6 - 1] = var37 == 0; + playerOptionsPriorities[var6 - 1] = var38 == 0; } var1.serverPacket0 = null; @@ -5671,15 +5683,15 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field793 == var1.serverPacket0) { - var37 = var3.readUnsignedShort(); + var38 = var3.readUnsignedShort(); var6 = var3.readInt(); - Varps.Varps_temp[var37] = var6; - if (Varps.Varps_main[var37] != var6) { - Varps.Varps_main[var37] = var6; + Varps.Varps_temp[var38] = var6; + if (Varps.Varps_main[var38] != var6) { + Varps.Varps_main[var38] = var6; } - Archive.method4703(var37); - field121[++field123 - 1 & 31] = var37; + Archive.method4703(var38); + field121[++field123 - 1 & 31] = var38; var1.serverPacket0 = null; return true; } @@ -5691,10 +5703,10 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field798 == var1.serverPacket0) { - var37 = var3.readInt(); - var50 = (InterfaceParent)interfaceParents.get((long)var37); - if (var50 != null) { - MenuAction.closeInterface(var50, true); + var38 = var3.readInt(); + var30 = (InterfaceParent)interfaceParents.get((long)var38); + if (var30 != null) { + MenuAction.closeInterface(var30, true); } if (field127 != null) { @@ -5707,11 +5719,11 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field862 == var1.serverPacket0) { - for (var37 = 0; var37 < Varps.Varps_main.length; ++var37) { - if (Varps.Varps_temp[var37] != Varps.Varps_main[var37]) { - Varps.Varps_main[var37] = Varps.Varps_temp[var37]; - Archive.method4703(var37); - field121[++field123 - 1 & 31] = var37; + for (var38 = 0; var38 < Varps.Varps_main.length; ++var38) { + if (Varps.Varps_temp[var38] != Varps.Varps_main[var38]) { + Varps.Varps_main[var38] = Varps.Varps_temp[var38]; + Archive.method4703(var38); + field121[++field123 - 1 & 31] = var38; } } @@ -5727,30 +5739,30 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field812 == var1.serverPacket0) { - var37 = var3.method67(); - if (var37 == 65535) { - var37 = -1; + var38 = var3.method67(); + if (var38 == 65535) { + var38 = -1; } - AbstractUserComparator.method5437(var37); + AbstractUserComparator.method5437(var38); var1.serverPacket0 = null; return true; } if (ServerPacket.field829 == var1.serverPacket0) { - var37 = var3.method70(); + var38 = var3.method70(); var6 = var3.method66(); if (var6 == 65535) { var6 = -1; } - HealthBar.method1994(var6, var37); + HealthBar.method1994(var6, var38); var1.serverPacket0 = null; return true; } if (ServerPacket.field866 == var1.serverPacket0) { - var37 = var3.method58(); + var38 = var3.method58(); var6 = var3.method72(); var5 = var3.method67(); var22 = (InterfaceParent)interfaceParents.get((long)var6); @@ -5758,7 +5770,7 @@ public final class Client extends GameShell implements Usernamed { MenuAction.closeInterface(var22, var5 != var22.group); } - SecureRandomCallable.method1143(var6, var5, var37); + SecureRandomCallable.method1143(var6, var5, var38); var1.serverPacket0 = null; return true; } @@ -5768,35 +5780,35 @@ public final class Client extends GameShell implements Usernamed { var25 = (long)var3.readUnsignedShort(); var27 = (long)var3.readMedium(); var29 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte()); - long var30 = (var25 << 32) + var27; - boolean var32 = false; + long var31 = (var25 << 32) + var27; + boolean var33 = false; - for (int var33 = 0; var33 < 100; ++var33) { - if (var30 == field152[var33]) { - var32 = true; + for (int var34 = 0; var34 < 100; ++var34) { + if (var31 == field152[var34]) { + var33 = true; break; } } if (WorldMapArea.friendSystem.isIgnored(new Username(var21, KeyHandler.loginType))) { - var32 = true; + var33 = true; } - if (!var32 && field208 == 0) { - field152[field156] = var30; + if (!var33 && field208 == 0) { + field152[field156] = var31; field156 = (field156 + 1) % 100; String var57 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3))); - byte var34; + byte var35; if (var29.isPrivileged) { - var34 = 7; + var35 = 7; } else { - var34 = 3; + var35 = 3; } if (var29.modIcon != -1) { - WorldMapIcon1.addGameMessage(var34, ItemContainer.method1170(var29.modIcon) + var21, var57); + WorldMapIcon1.addGameMessage(var35, ItemContainer.method1170(var29.modIcon) + var21, var57); } else { - WorldMapIcon1.addGameMessage(var34, var21, var57); + WorldMapIcon1.addGameMessage(var35, var21, var57); } } @@ -5805,9 +5817,9 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field794 == var1.serverPacket0) { - var37 = var3.readInt(); - if (var37 != field198) { - field198 = var37; + var38 = var3.readInt(); + if (var38 != field198) { + field198 = var38; WorldMapArea.method428(); } @@ -5831,16 +5843,16 @@ public final class Client extends GameShell implements Usernamed { NPCDefinition.sendStackTrace("" + (var1.serverPacket0 != null ? var1.serverPacket0.id : -1) + "," + (var1.field677 != null ? var1.field677.id : -1) + "," + (var1.field678 != null ? var1.field678.id : -1) + "," + var1.serverPacket0Length, (Throwable)null); TextureProvider.method2773(); - } catch (IOException var35) { + } catch (IOException var36) { class48.method868(); - } catch (Exception var36) { + } catch (Exception var37) { var4 = "" + (var1.serverPacket0 != null ? var1.serverPacket0.id : -1) + "," + (var1.field677 != null ? var1.field677.id : -1) + "," + (var1.field678 != null ? var1.field678.id : -1) + "," + var1.serverPacket0Length + "," + (Canvas.localPlayer.pathX[0] + class50.baseX) + "," + (Canvas.localPlayer.pathY[0] + GraphicsObject.baseY) + ","; for (var5 = 0; var5 < var1.serverPacket0Length && var5 < 50; ++var5) { var4 = var4 + var3.array[var5] + ","; } - NPCDefinition.sendStackTrace(var4, var36); + NPCDefinition.sendStackTrace(var4, var37); TextureProvider.method2773(); } @@ -5890,13 +5902,13 @@ public final class Client extends GameShell implements Usernamed { } if (DevicePcmPlayerProvider.dragInventoryWidget == null && clickedWidget == null) { - int var12 = MouseHandler.MouseHandler_lastButton; + int var11 = MouseHandler.MouseHandler_lastButton; int var7; - int var11; + int var12; int var13; if (isMenuOpen) { int var14; - if (var12 != 1 && (AbstractRasterProvider.mouseCam || var12 != 4)) { + if (var11 != 1 && (AbstractRasterProvider.mouseCam || var11 != 4)) { var2 = MouseHandler.MouseHandler_x; var14 = MouseHandler.MouseHandler_y; if (var2 < WorldMapDecoration.menuX - 10 || var2 > WorldMapDecoration.menuX + class214.menuWidth + 10 || var14 < GameShell.menuY - 10 || var14 > AbstractWorldMapIcon.menuHeight + GameShell.menuY + 10) { @@ -5905,17 +5917,17 @@ public final class Client extends GameShell implements Usernamed { } } - if (var12 == 1 || !AbstractRasterProvider.mouseCam && var12 == 4) { + if (var11 == 1 || !AbstractRasterProvider.mouseCam && var11 == 4) { var2 = WorldMapDecoration.menuX; var14 = GameShell.menuY; - var7 = class214.menuWidth; + var12 = class214.menuWidth; var3 = MouseHandler.MouseHandler_lastPressedX; - var11 = MouseHandler.MouseHandler_lastPressedY; + var13 = MouseHandler.MouseHandler_lastPressedY; int var15 = -1; for (int var16 = 0; var16 < menuOptionsCount; ++var16) { - var13 = (menuOptionsCount - 1 - var16) * 15 + var14 + 31; - if (var3 > var2 && var3 < var7 + var2 && var11 > var13 - 13 && var11 < var13 + 3) { + var7 = (menuOptionsCount - 1 - var16) * 15 + var14 + 31; + if (var3 > var2 && var3 < var12 + var2 && var13 > var7 - 13 && var13 < var7 + 3) { var15 = var16; } } @@ -5928,69 +5940,73 @@ public final class Client extends GameShell implements Usernamed { Players.method2112(WorldMapDecoration.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight); } } else { - var2 = menuOptionsCount - 1; - if ((var12 == 1 || !AbstractRasterProvider.mouseCam && var12 == 4) && var2 >= 0) { - var7 = menuOpcodes[var2]; - if (var7 == 39 || var7 == 40 || var7 == 41 || var7 == 42 || var7 == 43 || var7 == 33 || var7 == 34 || var7 == 35 || var7 == 36 || var7 == 37 || var7 == 38 || var7 == 1005) { - label223: { + label219: { + var2 = menuOptionsCount - 1; + if ((var11 == 1 || !AbstractRasterProvider.mouseCam && var11 == 4) && var2 >= 0) { + var12 = menuOpcodes[var2]; + if (var12 == 39 || var12 == 40 || var12 == 41 || var12 == 42 || var12 == 43 || var12 == 33 || var12 == 34 || var12 == 35 || var12 == 36 || var12 == 37 || var12 == 38 || var12 == 1005) { var3 = menuArguments1[var2]; - var11 = menuArguments2[var2]; - Widget var8 = Huffman.getWidget(var11); - var13 = class1.getWidgetClickMask(var8); - boolean var9 = (var13 >> 28 & 1) != 0; - if (!var9) { - Object var10 = null; - if (!class168.method3461(class1.getWidgetClickMask(var8))) { - break label223; - } + var13 = menuArguments2[var2]; + Widget var8 = Huffman.getWidget(var13); + var7 = class1.getWidgetClickMask(var8); + boolean var9 = (var7 >> 28 & 1) != 0; + if (var9) { + break label219; } - if (DevicePcmPlayerProvider.dragInventoryWidget != null && !field207 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { - var12 = field205; - var13 = field206; - WorldMapDecorationType.processTempMenuAction(UnitPriceComparator.tempMenuAction, var12, var13); - UnitPriceComparator.tempMenuAction = null; + Object var10 = null; + if (class168.method3461(class1.getWidgetClickMask(var8))) { + break label219; } - - field207 = false; - itemDragDuration = 0; - if (DevicePcmPlayerProvider.dragInventoryWidget != null) { - class22.method295(DevicePcmPlayerProvider.dragInventoryWidget); - } - - DevicePcmPlayerProvider.dragInventoryWidget = Huffman.getWidget(var11); - dragItemSlotSource = var3; - field205 = MouseHandler.MouseHandler_lastPressedX; - field206 = MouseHandler.MouseHandler_lastPressedY; - if (var2 >= 0) { - UnitPriceComparator.tempMenuAction = new MenuAction(); - UnitPriceComparator.tempMenuAction.argument1 = menuArguments1[var2]; - UnitPriceComparator.tempMenuAction.argument2 = menuArguments2[var2]; - UnitPriceComparator.tempMenuAction.opcode = menuOpcodes[var2]; - UnitPriceComparator.tempMenuAction.argument0 = menuArguments0[var2]; - UnitPriceComparator.tempMenuAction.action = menuActions[var2]; - } - - class22.method295(DevicePcmPlayerProvider.dragInventoryWidget); - return; } } + + if ((var11 == 1 || !AbstractRasterProvider.mouseCam && var11 == 4) && this.shouldLeftClickOpenMenu()) { + var11 = 2; + } + + if ((var11 == 1 || !AbstractRasterProvider.mouseCam && var11 == 4) && menuOptionsCount > 0) { + WorldMapSection0.method245(var2); + } + + if (var11 == 2 && menuOptionsCount > 0) { + this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + } + + return; } - if ((var12 == 1 || !AbstractRasterProvider.mouseCam && var12 == 4) && this.shouldLeftClickOpenMenu()) { - var12 = 2; + if (DevicePcmPlayerProvider.dragInventoryWidget != null && !field207 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { + var11 = field205; + var7 = field206; + WorldMapDecorationType.processTempMenuAction(UnitPriceComparator.tempMenuAction, var11, var7); + UnitPriceComparator.tempMenuAction = null; } - if ((var12 == 1 || !AbstractRasterProvider.mouseCam && var12 == 4) && menuOptionsCount > 0) { - WorldMapSection0.method245(var2); + field207 = false; + itemDragDuration = 0; + if (DevicePcmPlayerProvider.dragInventoryWidget != null) { + class22.method295(DevicePcmPlayerProvider.dragInventoryWidget); } - if (var12 == 2 && menuOptionsCount > 0) { - this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + DevicePcmPlayerProvider.dragInventoryWidget = Huffman.getWidget(var13); + dragItemSlotSource = var3; + field205 = MouseHandler.MouseHandler_lastPressedX; + field206 = MouseHandler.MouseHandler_lastPressedY; + if (var2 >= 0) { + UnitPriceComparator.tempMenuAction = new MenuAction(); + UnitPriceComparator.tempMenuAction.argument1 = menuArguments1[var2]; + UnitPriceComparator.tempMenuAction.argument2 = menuArguments2[var2]; + UnitPriceComparator.tempMenuAction.opcode = menuOpcodes[var2]; + UnitPriceComparator.tempMenuAction.argument0 = menuArguments0[var2]; + UnitPriceComparator.tempMenuAction.action = menuActions[var2]; } + + class22.method295(DevicePcmPlayerProvider.dragInventoryWidget); + return; } - } + } @ObfuscatedName("ht") @@ -6010,7 +6026,7 @@ public final class Client extends GameShell implements Usernamed { garbageValue = "1" ) @Export("openMenu") - final void openMenu(int var1, int var2) { + final void openMenu(int x, int y) { int var3 = class2.fontBold12.stringWidth("Choose Option"); int var4; @@ -6033,7 +6049,7 @@ public final class Client extends GameShell implements Usernamed { var3 += 8; var4 = menuOptionsCount * 15 + 22; - int var8 = var1 - var3 / 2; + int var8 = x - var3 / 2; if (var3 + var8 > SoundCache.canvasWidth) { var8 = SoundCache.canvasWidth - var3; } @@ -6042,8 +6058,8 @@ public final class Client extends GameShell implements Usernamed { var8 = 0; } - int var9 = var2; - if (var4 + var2 > Huffman.canvasHeight) { + int var9 = y; + if (var4 + y > Huffman.canvasHeight) { var9 = Huffman.canvasHeight - var4; } @@ -6055,7 +6071,7 @@ public final class Client extends GameShell implements Usernamed { GameShell.menuY = var9; class214.menuWidth = var3; AbstractWorldMapIcon.menuHeight = menuOptionsCount * 15 + 22; - class65.scene.menuOpen(SoundSystem.plane, var1, var2, false); + class65.scene.menuOpen(SoundSystem.plane, x, y, false); isMenuOpen = true; } @@ -6080,8 +6096,8 @@ public final class Client extends GameShell implements Usernamed { garbageValue = "0" ) @Export("alignWidget") - void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : Huffman.getWidget(var1.parentId); + void alignWidget(Widget component) { + Widget var2 = component.parentId == -1 ? null : Huffman.getWidget(component.parentId); int var3; int var4; if (var2 == null) { @@ -6092,8 +6108,8 @@ public final class Client extends GameShell implements Usernamed { var4 = var2.height; } - WorldMapSection3.alignWidgetSize(var1, var3, var4, false); - FloorOverlayDefinition.alignWidgetPosition(var1, var3, var4); + WorldMapSection3.alignWidgetSize(component, var3, var4, false); + FloorOverlayDefinition.alignWidgetPosition(component, var3, var4); } @ObfuscatedName("jh") @@ -6145,7 +6161,7 @@ public final class Client extends GameShell implements Usernamed { } if (MouseHandler.MouseHandler_currentButton == 0) { - int var10; + int var9; if (isDraggingWidget) { if (clickedWidget.onDragComplete != null) { var8 = new ScriptEvent(); @@ -6159,21 +6175,26 @@ public final class Client extends GameShell implements Usernamed { if (draggedOnWidget != null) { Widget var13 = clickedWidget; - var10 = WorldMapRegion.method568(class1.getWidgetClickMask(var13)); + var9 = WorldMapRegion.method568(class1.getWidgetClickMask(var13)); Widget var11; - if (var10 == 0) { + if (var9 == 0) { var11 = null; } else { - label100: { - for (int var12 = 0; var12 < var10; ++var12) { - var13 = Huffman.getWidget(var13.parentId); - if (var13 == null) { - var11 = null; - break label100; - } + int var12 = 0; + + while (true) { + if (var12 >= var9) { + var11 = var13; + break; } - var11 = var13; + var13 = Huffman.getWidget(var13.parentId); + if (var13 == null) { + var11 = null; + break; + } + + ++var12; } } @@ -6191,9 +6212,9 @@ public final class Client extends GameShell implements Usernamed { } else if (this.shouldLeftClickOpenMenu()) { this.openMenu(field110 + widgetClickX, field111 + widgetClickY); } else if (menuOptionsCount > 0) { - int var9 = widgetClickX + field110; - var10 = widgetClickY + field111; - WorldMapDecorationType.processTempMenuAction(UnitPriceComparator.tempMenuAction, var9, var10); + int var10 = widgetClickX + field110; + var9 = widgetClickY + field111; + WorldMapDecorationType.processTempMenuAction(UnitPriceComparator.tempMenuAction, var10, var9); UnitPriceComparator.tempMenuAction = null; } @@ -6221,12 +6242,12 @@ public final class Client extends GameShell implements Usernamed { garbageValue = "-1464358697" ) @Export("hashString") - public static int hashString(CharSequence var0) { - int var1 = var0.length(); + public static int hashString(CharSequence chars) { + int var1 = chars.length(); int var2 = 0; for (int var3 = 0; var3 < var1; ++var3) { - var2 = (var2 << 5) - var2 + HealthBar.charToByteCp1252(var0.charAt(var3)); + var2 = (var2 << 5) - var2 + HealthBar.charToByteCp1252(chars.charAt(var3)); } return var2; @@ -6412,7 +6433,7 @@ public final class Client extends GameShell implements Usernamed { weight = 0; staffModLevel = 0; followerIndex = -1; - field155 = false; + playerMod = false; viewportWidget = null; clickedWidget = null; clickedWidgetParent = null; diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index 5b4f4b05b2..58fa98ed08 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -27,7 +27,7 @@ public abstract class Clock { garbageValue = "-126803683" ) @Export("wait") - public abstract int wait(int var1, int var2); + public abstract int wait(int cycleMs, int minSleepMs); @ObfuscatedName("m") public static String method3534(long var0) { @@ -41,22 +41,22 @@ public abstract class Clock { ++var2; } - char var4; - StringBuilder var8; - for (var8 = new StringBuilder(var2); var0 != 0L; var8.append(var4)) { + StringBuilder var4; + char var8; + for (var4 = new StringBuilder(var2); var0 != 0L; var4.append(var8)) { long var5 = var0; var0 /= 37L; - var4 = class306.base37Table[(int)(var5 - 37L * var0)]; - if (var4 == '_') { - int var7 = var8.length() - 1; - var8.setCharAt(var7, Character.toUpperCase(var8.charAt(var7))); - var4 = 160; + var8 = class306.base37Table[(int)(var5 - 37L * var0)]; + if (var8 == '_') { + int var7 = var4.length() - 1; + var4.setCharAt(var7, Character.toUpperCase(var4.charAt(var7))); + var8 = 160; } } - var8.reverse(); - var8.setCharAt(0, Character.toUpperCase(var8.charAt(0))); - return var8.toString(); + var4.reverse(); + var4.setCharAt(0, Character.toUpperCase(var4.charAt(0))); + return var4.toString(); } } else { return null; diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index 1e1ac5e132..07d8425e12 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -249,8 +249,8 @@ public class CollisionMap { public void method92(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; - int[] var10000 = this.flags[var1]; - var10000[var2] |= 2097152; + int[] var3 = this.flags[var1]; + var3[var2] |= 2097152; } @ObfuscatedName("o") @@ -261,8 +261,8 @@ public class CollisionMap { public void method93(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; - int[] var10000 = this.flags[var1]; - var10000[var2] |= 262144; + int[] var3 = this.flags[var1]; + var3[var2] |= 262144; } @ObfuscatedName("u") @@ -271,8 +271,8 @@ public class CollisionMap { garbageValue = "953350100" ) void method94(int var1, int var2, int var3) { - int[] var10000 = this.flags[var1]; - var10000[var2] |= var3; + int[] var4 = this.flags[var1]; + var4[var2] |= var3; } @ObfuscatedName("g") @@ -465,8 +465,8 @@ public class CollisionMap { garbageValue = "52290294" ) void method97(int var1, int var2, int var3) { - int[] var10000 = this.flags[var1]; - var10000[var2] &= ~var3; + int[] var4 = this.flags[var1]; + var4[var2] &= ~var3; } @ObfuscatedName("x") @@ -477,8 +477,8 @@ public class CollisionMap { public void method98(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; - int[] var10000 = this.flags[var1]; - var10000[var2] &= -262145; + int[] var3 = this.flags[var1]; + var3[var2] &= -262145; } @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index 71ee061844..b7e3bb5c1a 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -6,8 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hu") @Implements("Coord") -public class Coord -{ +public class Coord { @ObfuscatedName("m") @ObfuscatedGetter( intValue = 503621925 @@ -69,8 +68,8 @@ public class Coord garbageValue = "-1" ) @Export("equals0") - boolean equals0(Coord var1) { - return this.plane != var1.plane ? false : (this.x != var1.x ? false : this.y == var1.y); + boolean equals0(Coord other) { + return this.plane != other.plane ? false : (this.x != other.x ? false : this.y == other.y); } @ObfuscatedName("q") @@ -79,8 +78,8 @@ public class Coord garbageValue = "997364398" ) @Export("toString0") - String toString0(String var1) { - return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); + String toString0(String separator) { + return this.plane + separator + (this.x >> 6) + separator + (this.y >> 6) + separator + (this.x & 63) + separator + (this.y & 63); } @ObfuscatedName("equals") diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index eede8d2877..4e4e0739db 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -126,12 +126,12 @@ public class Decimator { garbageValue = "-1419232405" ) @Export("scaleRate") - int scaleRate(int var1) { + int scaleRate(int rate) { if (this.table != null) { - var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate); + rate = (int)((long)this.outputRate * (long)rate / (long)this.inputRate); } - return var1; + return rate; } @ObfuscatedName("q") @@ -140,12 +140,12 @@ public class Decimator { garbageValue = "25" ) @Export("scalePosition") - int scalePosition(int var1) { + int scalePosition(int position) { if (this.table != null) { - var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6; + position = (int)((long)this.outputRate * (long)position / (long)this.inputRate) + 6; } - return var1; + return position; } @ObfuscatedName("f") diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java index e02abf6d73..4ef75cf266 100644 --- a/runescape-client/src/main/java/DefaultsGroup.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -6,13 +6,13 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ka") @Implements("DefaultsGroup") -public class DefaultsGroup -{ +public class DefaultsGroup { @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lka;" ) - static final DefaultsGroup field3810; + @Export("DefaultsGroup_graphics") + static final DefaultsGroup DefaultsGroup_graphics; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -2077113503 @@ -39,6 +39,6 @@ public class DefaultsGroup } static { - field3810 = new DefaultsGroup(3); + DefaultsGroup_graphics = new DefaultsGroup(3); } } diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index 28fb0907d2..0ff369a59b 100644 --- a/runescape-client/src/main/java/DemotingHashTable.java +++ b/runescape-client/src/main/java/DemotingHashTable.java @@ -39,8 +39,8 @@ public final class DemotingHashTable { @ObfuscatedName("m") @Export("get") - public Object get(long var1) { - Wrapper var3 = (Wrapper)this.hashTable.get(var1); + public Object get(long key) { + Wrapper var3 = (Wrapper)this.hashTable.get(key); if (var3 == null) { return null; } else { @@ -70,8 +70,8 @@ public final class DemotingHashTable { @ObfuscatedName("f") @Export("remove") - void remove(long var1) { - Wrapper var3 = (Wrapper)this.hashTable.get(var1); + void remove(long key) { + Wrapper var3 = (Wrapper)this.hashTable.get(key); this.removeWrapper(var3); } @@ -80,31 +80,31 @@ public final class DemotingHashTable { signature = "(Leu;)V" ) @Export("removeWrapper") - void removeWrapper(Wrapper var1) { - if (var1 != null) { - var1.remove(); - var1.removeDual(); - this.remaining += var1.size; + void removeWrapper(Wrapper wrapper) { + if (wrapper != null) { + wrapper.remove(); + wrapper.removeDual(); + this.remaining += wrapper.size; } } @ObfuscatedName("w") @Export("put") - public void put(Object var1, long var2, int var4) { - if (var4 > this.capacity) { + public void put(Object value, long key, int size) { + if (size > this.capacity) { throw new IllegalStateException(); } else { - this.remove(var2); - this.remaining -= var4; + this.remove(key); + this.remaining -= size; while (this.remaining < 0) { Wrapper var5 = (Wrapper)this.queue.removeLast(); this.removeWrapper(var5); } - DirectWrapper var6 = new DirectWrapper(var1, var4); - this.hashTable.put(var6, var2); + DirectWrapper var6 = new DirectWrapper(value, size); + this.hashTable.put(var6, key); this.queue.add(var6); var6.keyDual = 0L; } @@ -112,7 +112,7 @@ public final class DemotingHashTable { @ObfuscatedName("o") @Export("demote") - public void demote(int var1) { + public void demote(int softeningLevel) { for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { if (var2.isSoft()) { if (var2.get() == null) { @@ -120,7 +120,7 @@ public final class DemotingHashTable { var2.removeDual(); this.remaining += var2.size; } - } else if (++var2.keyDual > (long)var1) { + } else if (++var2.keyDual > (long)softeningLevel) { SoftWrapper var3 = new SoftWrapper(var2.get(), var2.size); this.hashTable.put(var3, var2.key); DualNodeDeque.DualNodeDeque_addBefore(var3, var2); diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index 894db8a282..e3d9693070 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -45,15 +45,15 @@ public class DevicePcmPlayer extends PcmPlayer { garbageValue = "-1738349775" ) @Export("open") - protected void open(int var1) throws LineUnavailableException { + protected void open(int bufferSize) throws LineUnavailableException { try { - Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.isStereo ? 2 : 1)); + Info var2 = new Info(SourceDataLine.class, this.format, bufferSize << (PcmPlayer.isStereo ? 2 : 1)); this.line = (SourceDataLine)AudioSystem.getLine(var2); this.line.open(); this.line.start(); - this.capacity2 = var1; + this.capacity2 = bufferSize; } catch (LineUnavailableException var5) { - int var3 = (var1 >>> 1 & 1431655765) + (var1 & 1431655765); + int var3 = (bufferSize >>> 1 & 1431655765) + (bufferSize & 1431655765); var3 = (var3 >>> 2 & 858993459) + (var3 & 858993459); var3 = (var3 >>> 4) + var3 & 252645135; var3 += var3 >>> 8; @@ -64,7 +64,7 @@ public class DevicePcmPlayer extends PcmPlayer { throw var5; } - this.open(World.method1759(var1)); + this.open(World.method1759(bufferSize)); } } diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index 9b46288631..e85a8da5ee 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -358,17 +358,17 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { for (var19 = 0; var19 < var10.rawHeight; ++var19) { for (var20 = 0; var20 < var10.rawWidth; ++var20) { var21 = var12 + var20 * (var10.paddingX + 32); - var33 = var13 + var19 * (var10.paddingY + 32); + var26 = var13 + var19 * (var10.paddingY + 32); if (var22 < 20) { var21 += var10.inventoryXOffsets[var22]; - var33 += var10.inventoryYOffsets[var22]; + var26 += var10.inventoryYOffsets[var22]; } if (var10.itemIds[var22] <= 0) { if (var10.inventorySprites != null && var22 < 20) { Sprite var36 = var10.getInventorySprite(var22); if (var36 != null) { - var36.drawAt2(var21, var33); + var36.drawAt2(var21, var26); } else if (Widget.field957) { class22.method295(var10); } @@ -376,38 +376,38 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } else { boolean var35 = false; boolean var46 = false; - var26 = var10.itemIds[var22] - 1; - if (var21 + 32 > var2 && var21 < var4 && var33 + 32 > var3 && var33 < var5 || var10 == dragInventoryWidget && var22 == Client.dragItemSlotSource) { + var25 = var10.itemIds[var22] - 1; + if (var21 + 32 > var2 && var21 < var4 && var26 + 32 > var3 && var26 < var5 || var10 == dragInventoryWidget && var22 == Client.dragItemSlotSource) { Sprite var42; if (Client.isItemSelected == 1 && var22 == HealthBarDefinition.selectedItemSlot && var10.id == ServerPacket.selectedItemWidget) { - var42 = class226.getItemSprite(var26, var10.itemQuantities[var22], 2, 0, 2, false); + var42 = class226.getItemSprite(var25, var10.itemQuantities[var22], 2, 0, 2, false); } else { - var42 = class226.getItemSprite(var26, var10.itemQuantities[var22], 1, 3153952, 2, false); + var42 = class226.getItemSprite(var25, var10.itemQuantities[var22], 1, 3153952, 2, false); } if (var42 != null) { if (var10 == dragInventoryWidget && var22 == Client.dragItemSlotSource) { - var24 = MouseHandler.MouseHandler_x - Client.field205; - var25 = MouseHandler.MouseHandler_y - Client.field206; + var33 = MouseHandler.MouseHandler_x - Client.field205; + var24 = MouseHandler.MouseHandler_y - Client.field206; + if (var33 < 5 && var33 > -5) { + var33 = 0; + } + if (var24 < 5 && var24 > -5) { var24 = 0; } - if (var25 < 5 && var25 > -5) { - var25 = 0; - } - if (Client.itemDragDuration < 5) { + var33 = 0; var24 = 0; - var25 = 0; } - var42.method310(var21 + var24, var33 + var25, 128); + var42.method310(var21 + var33, var26 + var24, 128); if (var1 != -1) { Widget var47 = var0[var1 & 65535]; int var45; - if (var33 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var47.scrollY > 0) { - var45 = (Rasterizer2D.Rasterizer2D_yClipStart - var33 - var25) * Client.field183 / 3; + if (var26 + var24 < Rasterizer2D.Rasterizer2D_yClipStart && var47.scrollY > 0) { + var45 = (Rasterizer2D.Rasterizer2D_yClipStart - var26 - var24) * Client.field183 / 3; if (var45 > Client.field183 * 10) { var45 = Client.field183 * 10; } @@ -421,8 +421,8 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { class22.method295(var47); } - if (var25 + var33 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var47.scrollY < var47.scrollHeight - var47.height) { - var45 = (var33 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field183 / 3; + if (var24 + var26 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var47.scrollY < var47.scrollHeight - var47.height) { + var45 = (var26 + var24 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field183 / 3; if (var45 > Client.field183 * 10) { var45 = Client.field183 * 10; } @@ -437,9 +437,9 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } } } else if (var10 == BoundaryObject.field40 && var22 == Client.field204) { - var42.method310(var21, var33, 128); + var42.method310(var21, var26, 128); } else { - var42.drawAt2(var21, var33); + var42.drawAt2(var21, var26); } } else { class22.method295(var10); @@ -569,16 +569,16 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } else { Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); var21 = (var19 - 1 + var10.width) / var19; - var33 = (var20 - 1 + var10.height) / var20; + var26 = (var20 - 1 + var10.height) / var20; - for (var24 = 0; var24 < var21; ++var24) { - for (var25 = 0; var25 < var33; ++var25) { + for (var33 = 0; var33 < var21; ++var33) { + for (var24 = 0; var24 < var26; ++var24) { if (var10.spriteAngle != 0) { - var37.method317(var19 / 2 + var12 + var19 * var24, var20 / 2 + var13 + var25 * var20, var10.spriteAngle, 4096); + var37.method317(var19 / 2 + var12 + var19 * var33, var20 / 2 + var13 + var24 * var20, var10.spriteAngle, 4096); } else if (var14 != 0) { - var37.method310(var12 + var19 * var24, var13 + var20 * var25, 256 - (var14 & 255)); + var37.method310(var12 + var19 * var33, var13 + var20 * var24, 256 - (var14 & 255)); } else { - var37.drawAt2(var12 + var19 * var24, var13 + var25 * var20); + var37.drawAt2(var12 + var19 * var33, var13 + var24 * var20); } } } @@ -602,7 +602,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { if (var10.itemId != -1) { var28 = Skills.getItemDefinition(var10.itemId); if (var28 != null) { - var28 = var28.method144(var10.itemQuantity); + var28 = var28.getCountObj(var10.itemQuantity); var43 = var28.getModel(1); if (var43 != null) { var43.calculateBoundsCylinder(); @@ -631,17 +631,17 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } Rasterizer3D.method2989(var10.width / 2 + var12, var10.height / 2 + var13); - var33 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; - var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; + var26 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; + var33 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; if (var43 != null) { if (!var10.isIf3) { - var43.method199(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var33, var24); + var43.method199(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var26, var33); } else { var43.calculateBoundsCylinder(); if (var10.modelOrthog) { - var43.method200(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var21 + var33 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + var43.method200(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var21 + var26 + var10.modelOffsetY, var33 + var10.modelOffsetY, var10.modelZoom); } else { - var43.method199(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var33 + var21 + var10.modelOffsetY, var24 + var10.modelOffsetY); + var43.method199(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var26 + var21 + var10.modelOffsetY, var33 + var10.modelOffsetY); } } } @@ -670,14 +670,14 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { var29 = BufferedFile.colorStartTag(16748608) + var28.name + " " + 'x' + GrandExchangeEvent.method88(var10.itemQuantities[var19]); } - var25 = var21 * (var10.paddingX + 115) + var12; - var26 = var20 * (var10.paddingY + 12) + var13; + var24 = var21 * (var10.paddingX + 115) + var12; + var25 = var20 * (var10.paddingY + 12) + var13; if (var10.textXAlignment == 0) { - var27.draw(var29, var25, var26, var10.color, var10.textShadowed ? 0 : -1); + var27.draw(var29, var24, var25, var10.color, var10.textShadowed ? 0 : -1); } else if (var10.textXAlignment == 1) { - var27.drawCentered(var29, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); + var27.drawCentered(var29, var10.width / 2 + var24, var25, var10.color, var10.textShadowed ? 0 : -1); } else { - var27.drawRightAligned(var29, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); + var27.drawRightAligned(var29, var24 + var10.width - 1, var25, var10.color, var10.textShadowed ? 0 : -1); } } @@ -694,43 +694,43 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { String var31; for (var30 = MouseRecorder.method1194(var30, var10); var30.length() > 0; var19 = var19 + var39.ascent + 1) { - var24 = var30.indexOf("
"); - if (var24 != -1) { - var31 = var30.substring(0, var24); - var30 = var30.substring(var24 + 4); + var33 = var30.indexOf("
"); + if (var33 != -1) { + var31 = var30.substring(0, var33); + var30 = var30.substring(var33 + 4); } else { var31 = var30; var30 = ""; } - var25 = var39.stringWidth(var31); - if (var25 > var22) { - var22 = var25; + var24 = var39.stringWidth(var31); + if (var24 > var22) { + var22 = var24; } } var22 += 6; var19 += 7; - var24 = var12 + var10.width - 5 - var22; - var25 = var13 + var10.height + 5; - if (var24 < var12 + 5) { - var24 = var12 + 5; + var33 = var12 + var10.width - 5 - var22; + var24 = var13 + var10.height + 5; + if (var33 < var12 + 5) { + var33 = var12 + 5; } - if (var22 + var24 > var4) { - var24 = var4 - var22; + if (var22 + var33 > var4) { + var33 = var4 - var22; } - if (var25 + var19 > var5) { - var25 = var5 - var19; + if (var24 + var19 > var5) { + var24 = var5 - var19; } - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var22, var19, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var22, var19, 0); + Rasterizer2D.Rasterizer2D_fillRectangle(var33, var24, var22, var19, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(var33, var24, var22, var19, 0); var30 = var10.text; - var26 = var25 + var39.ascent + 2; + var25 = var24 + var39.ascent + 2; - for (var30 = MouseRecorder.method1194(var30, var10); var30.length() > 0; var26 = var26 + var39.ascent + 1) { + for (var30 = MouseRecorder.method1194(var30, var10); var30.length() > 0; var25 = var25 + var39.ascent + 1) { int var32 = var30.indexOf("
"); if (var32 != -1) { var31 = var30.substring(0, var32); @@ -740,7 +740,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { var30 = ""; } - var39.draw(var31, var24 + 3, var26, 0, -1); + var39.draw(var31, var33 + 3, var25, 0, -1); } } diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index 0bf9f0d78a..e0280788db 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -30,9 +30,9 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { garbageValue = "-2034091753" ) @Export("set") - void set(byte[] var1) { - this.directBuffer = ByteBuffer.allocateDirect(var1.length); + void set(byte[] array) { + this.directBuffer = ByteBuffer.allocateDirect(array.length); this.directBuffer.position(0); - this.directBuffer.put(var1); + this.directBuffer.put(array); } } diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index 7a1b959161..6c1b90c9e2 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -236,27 +236,27 @@ public class DynamicObject extends Entity { RouteStrategy.Interpreter_intStackSize -= 2; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - PacketBufferNode var13 = Interpreter.method1915(ClientPacket.field260, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeByte(WorldMapRegion.method550(var3) + 2); - var13.packetBuffer.writeStringCp1252NullTerminated(var3); - var13.packetBuffer.writeByte(var4 - 1); - var13.packetBuffer.writeByte(var5); - Client.packetWriter.method241(var13); + PacketBufferNode var12 = Interpreter.method1915(ClientPacket.field260, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeByte(WorldMapRegion.method550(var3) + 2); + var12.packetBuffer.writeStringCp1252NullTerminated(var3); + var12.packetBuffer.writeByte(var4 - 1); + var12.packetBuffer.writeByte(var5); + Client.packetWriter.method241(var12); return 1; } else { - Message var11; + Message var6; if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { RouteStrategy.Interpreter_intStackSize -= 2; var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var11 = Message.method1226(var5, var4); - if (var11 != null) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.count; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.cycle; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.sender != null ? var11.sender : ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.prefix != null ? var11.prefix : ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.text != null ? var11.text : ""; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.isFromFriend() ? 1 : (var11.isFromIgnored() ? 2 : 0); + var6 = Message.method1226(var5, var4); + if (var6 != null) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.count; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.cycle; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.sender != null ? var6.sender : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.prefix != null ? var6.prefix : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.text != null ? var6.text : ""; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.isFromFriend() ? 1 : (var6.isFromIgnored() ? 2 : 0); } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; @@ -269,14 +269,14 @@ public class DynamicObject extends Entity { return 1; } else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var11 = NetCache.method4708(var5); - if (var11 != null) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.type; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.cycle; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.sender != null ? var11.sender : ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.prefix != null ? var11.prefix : ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.text != null ? var11.text : ""; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.isFromFriend() ? 1 : (var11.isFromIgnored() ? 2 : 0); + var6 = NetCache.method4708(var5); + if (var6 != null) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.type; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.cycle; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.sender != null ? var6.sender : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.prefix != null ? var6.prefix : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.text != null ? var6.text : ""; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.isFromFriend() ? 1 : (var6.isFromIgnored() ? 2 : 0); } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; @@ -296,145 +296,145 @@ public class DynamicObject extends Entity { return 1; } else { - String var6; + String var7; if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var6 = var3.toLowerCase(); - byte var12 = 0; - if (var6.startsWith("yellow:")) { - var12 = 0; + var7 = var3.toLowerCase(); + byte var13 = 0; + if (var7.startsWith("yellow:")) { + var13 = 0; var3 = var3.substring("yellow:".length()); - } else if (var6.startsWith("red:")) { - var12 = 1; + } else if (var7.startsWith("red:")) { + var13 = 1; var3 = var3.substring("red:".length()); - } else if (var6.startsWith("green:")) { - var12 = 2; + } else if (var7.startsWith("green:")) { + var13 = 2; var3 = var3.substring("green:".length()); - } else if (var6.startsWith("cyan:")) { - var12 = 3; + } else if (var7.startsWith("cyan:")) { + var13 = 3; var3 = var3.substring("cyan:".length()); - } else if (var6.startsWith("purple:")) { - var12 = 4; + } else if (var7.startsWith("purple:")) { + var13 = 4; var3 = var3.substring("purple:".length()); - } else if (var6.startsWith("white:")) { - var12 = 5; + } else if (var7.startsWith("white:")) { + var13 = 5; var3 = var3.substring("white:".length()); - } else if (var6.startsWith("flash1:")) { - var12 = 6; + } else if (var7.startsWith("flash1:")) { + var13 = 6; var3 = var3.substring("flash1:".length()); - } else if (var6.startsWith("flash2:")) { - var12 = 7; + } else if (var7.startsWith("flash2:")) { + var13 = 7; var3 = var3.substring("flash2:".length()); - } else if (var6.startsWith("flash3:")) { - var12 = 8; + } else if (var7.startsWith("flash3:")) { + var13 = 8; var3 = var3.substring("flash3:".length()); - } else if (var6.startsWith("glow1:")) { - var12 = 9; + } else if (var7.startsWith("glow1:")) { + var13 = 9; var3 = var3.substring("glow1:".length()); - } else if (var6.startsWith("glow2:")) { - var12 = 10; + } else if (var7.startsWith("glow2:")) { + var13 = 10; var3 = var3.substring("glow2:".length()); - } else if (var6.startsWith("glow3:")) { - var12 = 11; + } else if (var7.startsWith("glow3:")) { + var13 = 11; var3 = var3.substring("glow3:".length()); } else if (Client.language != 0) { - if (var6.startsWith("yellow:")) { - var12 = 0; + if (var7.startsWith("yellow:")) { + var13 = 0; var3 = var3.substring("yellow:".length()); - } else if (var6.startsWith("red:")) { - var12 = 1; + } else if (var7.startsWith("red:")) { + var13 = 1; var3 = var3.substring("red:".length()); - } else if (var6.startsWith("green:")) { - var12 = 2; + } else if (var7.startsWith("green:")) { + var13 = 2; var3 = var3.substring("green:".length()); - } else if (var6.startsWith("cyan:")) { - var12 = 3; + } else if (var7.startsWith("cyan:")) { + var13 = 3; var3 = var3.substring("cyan:".length()); - } else if (var6.startsWith("purple:")) { - var12 = 4; + } else if (var7.startsWith("purple:")) { + var13 = 4; var3 = var3.substring("purple:".length()); - } else if (var6.startsWith("white:")) { - var12 = 5; + } else if (var7.startsWith("white:")) { + var13 = 5; var3 = var3.substring("white:".length()); - } else if (var6.startsWith("flash1:")) { - var12 = 6; + } else if (var7.startsWith("flash1:")) { + var13 = 6; var3 = var3.substring("flash1:".length()); - } else if (var6.startsWith("flash2:")) { - var12 = 7; + } else if (var7.startsWith("flash2:")) { + var13 = 7; var3 = var3.substring("flash2:".length()); - } else if (var6.startsWith("flash3:")) { - var12 = 8; + } else if (var7.startsWith("flash3:")) { + var13 = 8; var3 = var3.substring("flash3:".length()); - } else if (var6.startsWith("glow1:")) { - var12 = 9; + } else if (var7.startsWith("glow1:")) { + var13 = 9; var3 = var3.substring("glow1:".length()); - } else if (var6.startsWith("glow2:")) { - var12 = 10; + } else if (var7.startsWith("glow2:")) { + var13 = 10; var3 = var3.substring("glow2:".length()); - } else if (var6.startsWith("glow3:")) { - var12 = 11; + } else if (var7.startsWith("glow3:")) { + var13 = 11; var3 = var3.substring("glow3:".length()); } } - var6 = var3.toLowerCase(); + var7 = var3.toLowerCase(); byte var14 = 0; - if (var6.startsWith("wave:")) { + if (var7.startsWith("wave:")) { var14 = 1; var3 = var3.substring("wave:".length()); - } else if (var6.startsWith("wave2:")) { + } else if (var7.startsWith("wave2:")) { var14 = 2; var3 = var3.substring("wave2:".length()); - } else if (var6.startsWith("shake:")) { + } else if (var7.startsWith("shake:")) { var14 = 3; var3 = var3.substring("shake:".length()); - } else if (var6.startsWith("scroll:")) { + } else if (var7.startsWith("scroll:")) { var14 = 4; var3 = var3.substring("scroll:".length()); - } else if (var6.startsWith("slide:")) { + } else if (var7.startsWith("slide:")) { var14 = 5; var3 = var3.substring("slide:".length()); } else if (Client.language != 0) { - if (var6.startsWith("wave:")) { + if (var7.startsWith("wave:")) { var14 = 1; var3 = var3.substring("wave:".length()); - } else if (var6.startsWith("wave2:")) { + } else if (var7.startsWith("wave2:")) { var14 = 2; var3 = var3.substring("wave2:".length()); - } else if (var6.startsWith("shake:")) { + } else if (var7.startsWith("shake:")) { var14 = 3; var3 = var3.substring("shake:".length()); - } else if (var6.startsWith("scroll:")) { + } else if (var7.startsWith("scroll:")) { var14 = 4; var3 = var3.substring("scroll:".length()); - } else if (var6.startsWith("slide:")) { + } else if (var7.startsWith("slide:")) { var14 = 5; var3 = var3.substring("slide:".length()); } } - PacketBufferNode var9 = Interpreter.method1915(ClientPacket.field319, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeByte(0); - int var10 = var9.packetBuffer.index; - var9.packetBuffer.writeByte(var4); - var9.packetBuffer.writeByte(var12); - var9.packetBuffer.writeByte(var14); - TextureProvider.method2777(var9.packetBuffer, var3); - var9.packetBuffer.method41(var9.packetBuffer.index - var10); - Client.packetWriter.method241(var9); + PacketBufferNode var10 = Interpreter.method1915(ClientPacket.field319, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeByte(0); + int var11 = var10.packetBuffer.index; + var10.packetBuffer.writeByte(var4); + var10.packetBuffer.writeByte(var13); + var10.packetBuffer.writeByte(var14); + TextureProvider.method2777(var10.packetBuffer, var3); + var10.packetBuffer.method41(var10.packetBuffer.index - var11); + Client.packetWriter.method241(var10); return 1; } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { Interpreter.Interpreter_stringStackSize -= 2; var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; - var6 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; - PacketBufferNode var7 = Interpreter.method1915(ClientPacket.field247, Client.packetWriter.isaacCipher); - var7.packetBuffer.writeShort(0); - int var8 = var7.packetBuffer.index; - var7.packetBuffer.writeStringCp1252NullTerminated(var3); - TextureProvider.method2777(var7.packetBuffer, var6); - var7.packetBuffer.method40(var7.packetBuffer.index - var8); - Client.packetWriter.method241(var7); + var7 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; + PacketBufferNode var8 = Interpreter.method1915(ClientPacket.field247, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(0); + int var9 = var8.packetBuffer.index; + var8.packetBuffer.writeStringCp1252NullTerminated(var3); + TextureProvider.method2777(var8.packetBuffer, var7); + var8.packetBuffer.method40(var8.packetBuffer.index - var9); + Client.packetWriter.method241(var8); return 1; } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { @@ -547,76 +547,76 @@ public class DynamicObject extends Entity { int var7; int var8; - int[] var10000; + int[] var9; for (var7 = 0; var7 < 32768; ++var7) { - NPC var9 = Client.npcs[var7]; - if (var9 != null) { + NPC var10 = Client.npcs[var7]; + if (var10 != null) { for (var8 = 0; var8 < 10; ++var8) { - var10000 = var9.pathX; - var10000[var8] -= var5; - var10000 = var9.pathY; - var10000[var8] -= var6; + var9 = var10.pathX; + var9[var8] -= var5; + var9 = var10.pathY; + var9[var8] -= var6; } - var9.x -= var5 * 128; - var9.y -= var6 * 128; + var10.x -= var5 * 128; + var10.y -= var6 * 128; } } for (var7 = 0; var7 < 2048; ++var7) { - Player var20 = Client.players[var7]; - if (var20 != null) { + Player var21 = Client.players[var7]; + if (var21 != null) { for (var8 = 0; var8 < 10; ++var8) { - var10000 = var20.pathX; - var10000[var8] -= var5; - var10000 = var20.pathY; - var10000[var8] -= var6; + var9 = var21.pathX; + var9[var8] -= var5; + var9 = var21.pathY; + var9[var8] -= var6; } - var20.x -= var5 * 128; - var20.y -= var6 * 128; + var21.x -= var5 * 128; + var21.y -= var6 * 128; } } - byte var21 = 0; - byte var10 = 104; - byte var11 = 1; + byte var22 = 0; + byte var11 = 104; + byte var12 = 1; if (var5 < 0) { - var21 = 103; - var10 = -1; + var22 = 103; var11 = -1; + var12 = -1; } - byte var12 = 0; - byte var13 = 104; - byte var14 = 1; + byte var13 = 0; + byte var14 = 104; + byte var15 = 1; if (var6 < 0) { - var12 = 103; - var13 = -1; + var13 = 103; var14 = -1; + var15 = -1; } - int var15; - for (int var16 = var21; var16 != var10; var16 += var11) { - for (var15 = var12; var13 != var15; var15 += var14) { - int var17 = var16 + var5; - int var18 = var15 + var6; + int var16; + for (int var17 = var22; var17 != var11; var17 += var12) { + for (var16 = var13; var14 != var16; var16 += var15) { + int var18 = var17 + var5; + int var19 = var16 + var6; - for (int var19 = 0; var19 < 4; ++var19) { - if (var17 >= 0 && var18 >= 0 && var17 < 104 && var18 < 104) { - Client.groundItems[var19][var16][var15] = Client.groundItems[var19][var17][var18]; + for (int var20 = 0; var20 < 4; ++var20) { + if (var18 >= 0 && var19 >= 0 && var18 < 104 && var19 < 104) { + Client.groundItems[var20][var17][var16] = Client.groundItems[var20][var18][var19]; } else { - Client.groundItems[var19][var16][var15] = null; + Client.groundItems[var20][var17][var16] = null; } } } } - for (PendingSpawn var22 = (PendingSpawn)Client.pendingSpawns.last(); var22 != null; var22 = (PendingSpawn)Client.pendingSpawns.previous()) { - var22.x -= var5; - var22.y -= var6; - if (var22.x < 0 || var22.y < 0 || var22.x >= 104 || var22.y >= 104) { - var22.remove(); + for (PendingSpawn var23 = (PendingSpawn)Client.pendingSpawns.last(); var23 != null; var23 = (PendingSpawn)Client.pendingSpawns.previous()) { + var23.x -= var5; + var23.y -= var6; + if (var23.x < 0 || var23.y < 0 || var23.x >= 104 || var23.y >= 104) { + var23.remove(); } } @@ -635,8 +635,8 @@ public class DynamicObject extends Entity { Client.graphicsObjects.clear(); Client.projectiles.clear(); - for (var15 = 0; var15 < 4; ++var15) { - Client.collisionMaps[var15].clear(); + for (var16 = 0; var16 < 4; ++var16) { + Client.collisionMaps[var16].clear(); } } diff --git a/runescape-client/src/main/java/Entity.java b/runescape-client/src/main/java/Entity.java index 2886344d41..556d76c21a 100644 --- a/runescape-client/src/main/java/Entity.java +++ b/runescape-client/src/main/java/Entity.java @@ -30,11 +30,11 @@ public abstract class Entity extends DualNode { @ObfuscatedName("cy") @Export("draw") - void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { + void draw(int yaw, int cameraPitchSine, int cameraPitchCosine, int cameraYawSine, int cameraYawCosine, int x, int y, int var8, long tag) { Model var11 = this.getModel(); if (var11 != null) { this.height = var11.height; - var11.draw(var1, var2, var3, var4, var5, var6, var7, var8, var9); + var11.draw(yaw, cameraPitchSine, cameraPitchCosine, cameraYawSine, cameraYawCosine, x, y, var8, tag); } } diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index f05386d31e..9ab1d0b28a 100644 --- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java +++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java @@ -48,8 +48,8 @@ public final class EvictingDualNodeHashTable { signature = "(J)Lfn;" ) @Export("get") - public DualNode get(long var1) { - DualNode var3 = (DualNode)this.hashTable.get(var1); + public DualNode get(long key) { + DualNode var3 = (DualNode)this.hashTable.get(key); if (var3 != null) { this.deque.addFirst(var3); } @@ -59,8 +59,8 @@ public final class EvictingDualNodeHashTable { @ObfuscatedName("f") @Export("remove") - public void remove(long var1) { - DualNode var3 = (DualNode)this.hashTable.get(var1); + public void remove(long key) { + DualNode var3 = (DualNode)this.hashTable.get(key); if (var3 != null) { var3.remove(); var3.removeDual(); @@ -74,7 +74,7 @@ public final class EvictingDualNodeHashTable { signature = "(Lfn;J)V" ) @Export("put") - public void put(DualNode var1, long var2) { + public void put(DualNode value, long key) { if (this.remainingCapacity == 0) { DualNode var4 = this.deque.removeLast(); var4.remove(); @@ -88,8 +88,8 @@ public final class EvictingDualNodeHashTable { --this.remainingCapacity; } - this.hashTable.put(var1, var2); - this.deque.addFirst(var1); + this.hashTable.put(value, key); + this.deque.addFirst(value); } @ObfuscatedName("w") diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index c68eb780f1..2568f46343 100644 --- a/runescape-client/src/main/java/FloorOverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -141,10 +141,10 @@ public class FloorOverlayDefinition extends DualNode { garbageValue = "489697731" ) @Export("setHsl") - void setHsl(int var1) { - double var2 = (double)(var1 >> 16 & 255) / 256.0D; - double var4 = (double)(var1 >> 8 & 255) / 256.0D; - double var6 = (double)(var1 & 255) / 256.0D; + void setHsl(int rgb) { + double var2 = (double)(rgb >> 16 & 255) / 256.0D; + double var4 = (double)(rgb >> 8 & 255) / 256.0D; + double var6 = (double)(rgb & 255) / 256.0D; double var8 = var2; if (var4 < var2) { var8 = var4; @@ -208,33 +208,33 @@ public class FloorOverlayDefinition extends DualNode { garbageValue = "30" ) @Export("alignWidgetPosition") - static void alignWidgetPosition(Widget var0, int var1, int var2) { - if (var0.xAlignment == 0) { - var0.x = var0.rawX; - } else if (var0.xAlignment == 1) { - var0.x = var0.rawX + (var1 - var0.width) / 2; - } else if (var0.xAlignment == 2) { - var0.x = var1 - var0.width - var0.rawX; - } else if (var0.xAlignment == 3) { - var0.x = var0.rawX * var1 >> 14; - } else if (var0.xAlignment == 4) { - var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2; + static void alignWidgetPosition(Widget component, int parentWidth, int parentHeight) { + if (component.xAlignment == 0) { + component.x = component.rawX; + } else if (component.xAlignment == 1) { + component.x = component.rawX + (parentWidth - component.width) / 2; + } else if (component.xAlignment == 2) { + component.x = parentWidth - component.width - component.rawX; + } else if (component.xAlignment == 3) { + component.x = component.rawX * parentWidth >> 14; + } else if (component.xAlignment == 4) { + component.x = (component.rawX * parentWidth >> 14) + (parentWidth - component.width) / 2; } else { - var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); + component.x = parentWidth - component.width - (component.rawX * parentWidth >> 14); } - if (var0.yAlignment == 0) { - var0.y = var0.rawY; - } else if (var0.yAlignment == 1) { - var0.y = (var2 - var0.height) / 2 + var0.rawY; - } else if (var0.yAlignment == 2) { - var0.y = var2 - var0.height - var0.rawY; - } else if (var0.yAlignment == 3) { - var0.y = var2 * var0.rawY >> 14; - } else if (var0.yAlignment == 4) { - var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2; + if (component.yAlignment == 0) { + component.y = component.rawY; + } else if (component.yAlignment == 1) { + component.y = (parentHeight - component.height) / 2 + component.rawY; + } else if (component.yAlignment == 2) { + component.y = parentHeight - component.height - component.rawY; + } else if (component.yAlignment == 3) { + component.y = parentHeight * component.rawY >> 14; + } else if (component.yAlignment == 4) { + component.y = (parentHeight * component.rawY >> 14) + (parentHeight - component.height) / 2; } else { - var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); + component.y = parentHeight - component.height - (parentHeight * component.rawY >> 14); } } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index 2d06743ef8..2dc2ec26c4 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -100,10 +100,10 @@ public class FloorUnderlayDefinition extends DualNode { garbageValue = "-107" ) @Export("setHsl") - void setHsl(int var1) { - double var2 = (double)(var1 >> 16 & 255) / 256.0D; - double var4 = (double)(var1 >> 8 & 255) / 256.0D; - double var6 = (double)(var1 & 255) / 256.0D; + void setHsl(int rgb) { + double var2 = (double)(rgb >> 16 & 255) / 256.0D; + double var4 = (double)(rgb >> 8 & 255) / 256.0D; + double var6 = (double)(rgb & 255) / 256.0D; double var8 = var2; if (var4 < var2) { var8 = var4; diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 66f09c3b9b..0fdb4f9aff 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -57,9 +57,9 @@ public class FontName { ) @Export("calculateTag") public static long calculateTag(int x, int y, int type, boolean isNotInteractable, int identifier) { - long var5 = (long)((x & 0b1111111) << 0 | (y & 0b1111111) << 7 | (type & 0b11) << 14) | ((long)identifier & 0xffffffffL) << 17; + long var5 = (long)((x & 127) << 0 | (y & 127) << 7 | (type & 3) << 14) | ((long)identifier & 4294967295L) << 17; if (isNotInteractable) { - var5 |= 0x10000L; + var5 |= 65536L; } return var5; @@ -211,7 +211,7 @@ public class FontName { return 1; } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null ? PacketWriter.clanChat.field96 : 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null ? PacketWriter.clanChat.minKick : 0; return 1; } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; @@ -498,16 +498,16 @@ public class FontName { garbageValue = "-2003105831" ) @Export("setViewportShape") - static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { - if (var2 < 1) { - var2 = 1; + static final void setViewportShape(int x, int y, int width, int height, boolean clear) { + if (width < 1) { + width = 1; } - if (var3 < 1) { - var3 = 1; + if (height < 1) { + height = 1; } - int var5 = var3 - 334; + int var5 = height - 334; int var6; if (var5 < 0) { var6 = Client.field130; @@ -517,53 +517,53 @@ public class FontName { var6 = (Client.field131 - Client.field130) * var5 / 100 + Client.field130; } - int var7 = var3 * var6 * 512 / (var2 * 334); + int var7 = height * var6 * 512 / (width * 334); int var8; int var9; short var10; if (var7 < Client.field132) { var10 = Client.field132; - var6 = var10 * var2 * 334 / (var3 * 512); + var6 = var10 * width * 334 / (height * 512); if (var6 > Client.field134) { var6 = Client.field134; - var8 = var3 * var6 * 512 / (var10 * 334); - var9 = (var2 - var8) / 2; - if (var4) { + var8 = height * var6 * 512 / (var10 * 334); + var9 = (width - var8) / 2; + if (clear) { Rasterizer2D.Rasterizer2D_resetClip(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(x, y, var9, height, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(x + width - var9, y, var9, height, -16777216); } - var0 += var9; - var2 -= var9 * 2; + x += var9; + width -= var9 * 2; } } else if (var7 > Client.field133) { var10 = Client.field133; - var6 = var10 * var2 * 334 / (var3 * 512); + var6 = var10 * width * 334 / (height * 512); if (var6 < Client.field135) { var6 = Client.field135; - var8 = var10 * var2 * 334 / (var6 * 512); - var9 = (var3 - var8) / 2; - if (var4) { + var8 = var10 * width * 334 / (var6 * 512); + var9 = (height - var8) / 2; + if (clear) { Rasterizer2D.Rasterizer2D_resetClip(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(x, y, width, var9, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(x, height + y - var9, width, var9, -16777216); } - var1 += var9; - var3 -= var9 * 2; + y += var9; + height -= var9 * 2; } } - Client.viewportZoom = var3 * var6 / 334; - if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { - ScriptEvent.method1183(var2, var3); + Client.viewportZoom = height * var6 / 334; + if (width != Client.viewportWidth || height != Client.viewportHeight) { + ScriptEvent.method1183(width, height); } - Client.viewportOffsetX = var0; - Client.viewportOffsetY = var1; - Client.viewportWidth = var2; - Client.viewportHeight = var3; + Client.viewportOffsetX = x; + Client.viewportOffsetY = y; + Client.viewportWidth = width; + Client.viewportHeight = height; } @ObfuscatedName("km") diff --git a/runescape-client/src/main/java/Formatting.java b/runescape-client/src/main/java/Formatting.java index 54a9d21e40..82103defdf 100644 --- a/runescape-client/src/main/java/Formatting.java +++ b/runescape-client/src/main/java/Formatting.java @@ -51,33 +51,33 @@ public class Formatting { int var3; int var4; int var5; - EnumDefinition var9; + EnumDefinition var6; if (var0 == ScriptOpcodes.ENUM_STRING) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - var9 = Interpreter.getEnum(var3); - if (var9.outputType != 's') { + var6 = Interpreter.getEnum(var3); + if (var6.outputType != 's') { } - for (var5 = 0; var5 < var9.outputCount; ++var5) { - if (var4 == var9.keys[var5]) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.strVals[var5]; - var9 = null; + for (var5 = 0; var5 < var6.outputCount; ++var5) { + if (var4 == var6.keys[var5]) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.strVals[var5]; + var6 = null; break; } } - if (var9 != null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.defaultStr; + if (var6 != null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.defaultStr; } return 1; } else if (var0 != ScriptOpcodes.ENUM) { if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - var9 = Interpreter.getEnum(var3); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var9.size(); + var6 = Interpreter.getEnum(var3); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.size(); return 1; } else { return 2; @@ -86,28 +86,28 @@ public class Formatting { RouteStrategy.Interpreter_intStackSize -= 4; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - int var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; + int var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3]; - EnumDefinition var7 = Interpreter.getEnum(var6); - if (var3 == var7.inputType && var4 == var7.outputType) { - for (int var8 = 0; var8 < var7.outputCount; ++var8) { - if (var5 == var7.keys[var8]) { + EnumDefinition var8 = Interpreter.getEnum(var7); + if (var3 == var8.inputType && var4 == var8.outputType) { + for (int var9 = 0; var9 < var8.outputCount; ++var9) { + if (var5 == var8.keys[var9]) { if (var4 == 115) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.strVals[var8]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.strVals[var9]; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.intVals[var8]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var8.intVals[var9]; } - var7 = null; + var8 = null; break; } } - if (var7 != null) { + if (var8 != null) { if (var4 == 115) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.defaultStr; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.defaultStr; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.defaultInt; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var8.defaultInt; } } diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index 7666c5d4de..3cb846b185 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -61,8 +61,8 @@ public class Frames extends DualNode { garbageValue = "-1018278334" ) @Export("hasAlphaTransform") - public boolean hasAlphaTransform(int var1) { - return this.frames[var1].hasAlphaTransform; + public boolean hasAlphaTransform(int frame) { + return this.frames[frame].hasAlphaTransform; } @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index af3960acfd..f1014670d3 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -21,8 +21,8 @@ public class Friend extends Buddy { garbageValue = "-1559116693" ) @Export("compareTo00") - int compareTo00(Friend var1) { - return super.world0 == Client.worldId && Client.worldId != var1.world0 ? -1 : (Client.worldId == var1.world0 && super.world0 != Client.worldId ? 1 : (super.world0 != 0 && var1.world0 == 0 ? -1 : (var1.world0 != 0 && super.world0 == 0 ? 1 : (this.field354 && !var1.field354 ? -1 : (!this.field354 && var1.field354 ? 1 : (this.field355 && !var1.field355 ? -1 : (!this.field355 && var1.field355 ? 1 : (super.world0 != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2)))))))); + int compareTo00(Friend other) { + return super.world0 == Client.worldId && Client.worldId != other.world0 ? -1 : (Client.worldId == other.world0 && super.world0 != Client.worldId ? 1 : (super.world0 != 0 && other.world0 == 0 ? -1 : (other.world0 != 0 && super.world0 == 0 ? 1 : (this.field354 && !other.field354 ? -1 : (!this.field354 && other.field354 ? 1 : (this.field355 && !other.field355 ? -1 : (!this.field355 && other.field355 ? 1 : (super.world0 != 0 ? super.int2 - other.int2 : other.int2 - super.int2)))))))); } @ObfuscatedName("aj") diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 0df652b880..aa0076fd7f 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -240,15 +240,15 @@ public class FriendSystem { garbageValue = "-2122207917" ) @Export("removeFriend") - final void removeFriend(String var1) { - if (var1 != null) { - Username var2 = new Username(var1, this.loginType); + final void removeFriend(String name) { + if (name != null) { + Username var2 = new Username(name, this.loginType); if (var2.hasCleanName()) { if (this.friendsList.removeByUsername(var2)) { WorldMapManager.method668(); PacketBufferNode var3 = Interpreter.method1915(ClientPacket.field276, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(WorldMapRegion.method550(var1)); - var3.packetBuffer.writeStringCp1252NullTerminated(var1); + var3.packetBuffer.writeByte(WorldMapRegion.method550(name)); + var3.packetBuffer.writeStringCp1252NullTerminated(name); Client.packetWriter.method241(var3); } @@ -264,15 +264,15 @@ public class FriendSystem { garbageValue = "-1673636127" ) @Export("removeIgnore") - final void removeIgnore(String var1) { - if (var1 != null) { - Username var2 = new Username(var1, this.loginType); + final void removeIgnore(String name) { + if (name != null) { + Username var2 = new Username(name, this.loginType); if (var2.hasCleanName()) { if (this.ignoreList.removeByUsername(var2)) { WorldMapManager.method668(); PacketBufferNode var3 = Interpreter.method1915(ClientPacket.field250, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(WorldMapRegion.method550(var1)); - var3.packetBuffer.writeStringCp1252NullTerminated(var1); + var3.packetBuffer.writeByte(WorldMapRegion.method550(name)); + var3.packetBuffer.writeStringCp1252NullTerminated(name); Client.packetWriter.method241(var3); } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index 36110033cc..61a36b680b 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -72,24 +72,24 @@ public class FriendsList extends UserList { garbageValue = "-11" ) @Export("read") - public void read(Buffer var1, int var2) { + public void read(Buffer buffer, int var2) { while (true) { - if (var1.index < var2) { - boolean var3 = var1.readUnsignedByte() == 1; - Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - int var6 = var1.readUnsignedShort(); - int var7 = var1.readUnsignedByte(); - int var8 = var1.readUnsignedByte(); + if (buffer.index < var2) { + boolean var3 = buffer.readUnsignedByte() == 1; + Username var4 = new Username(buffer.readStringCp1252NullTerminated(), this.loginType); + Username var5 = new Username(buffer.readStringCp1252NullTerminated(), this.loginType); + int var6 = buffer.readUnsignedShort(); + int var7 = buffer.readUnsignedByte(); + int var8 = buffer.readUnsignedByte(); boolean var9 = (var8 & 2) != 0; boolean var10 = (var8 & 1) != 0; if (var6 > 0) { - var1.readStringCp1252NullTerminated(); - var1.readUnsignedByte(); - var1.readInt(); + buffer.readStringCp1252NullTerminated(); + buffer.readUnsignedByte(); + buffer.readInt(); } - var1.readStringCp1252NullTerminated(); + buffer.readStringCp1252NullTerminated(); if (var4 != null && var4.hasCleanName()) { Friend var11 = (Friend)this.getByCurrentUsername(var4); if (var3) { diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index 0285a383e9..5bc595148e 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -469,7 +469,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene garbageValue = "559367680" ) @Export("startThread") - protected final void startThread(int var1, int var2, int var3) { + protected final void startThread(int width, int height, int revision) { try { if (gameShell != null) { ++field361; @@ -483,9 +483,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } gameShell = this; - SoundCache.canvasWidth = var1; - Huffman.canvasHeight = var2; - RunException.revision = var3; + SoundCache.canvasWidth = width; + Huffman.canvasHeight = height; + RunException.revision = revision; RunException.applet = this; if (taskHandler == null) { taskHandler = new TaskHandler(); @@ -810,13 +810,13 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene garbageValue = "39" ) @Export("error") - protected void error(String var1) { + protected void error(String type) { if (!this.hasErrored) { this.hasErrored = true; - System.out.println("error_game_" + var1); + System.out.println("error_game_" + type); try { - this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); + this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + type + ".ws"), "_self"); } catch (Exception var3) { } } @@ -1002,7 +1002,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } @ObfuscatedName("postDecode") - public abstract void vmethod117(); + public abstract void init(); @ObfuscatedName("stop") public final void method118() { @@ -1034,23 +1034,23 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene garbageValue = "17" ) @Export("updateGameState") - static void updateGameState(int var0) { - if (var0 != Client.gameState) { + static void updateGameState(int gameState) { + if (gameState != Client.gameState) { if (Client.gameState == 0) { TextureProvider.client.method113(); } - if (var0 == 20 || var0 == 40 || var0 == 45) { + if (gameState == 20 || gameState == 40 || gameState == 45) { Client.loginState = 0; Client.field168 = 0; Client.field169 = 0; - Client.timer.method331(var0); - if (var0 != 20) { + Client.timer.method331(gameState); + if (gameState != 20) { class15.method184(false); } } - if (var0 != 20 && var0 != 40 && ClientParameter.field341 != null) { + if (gameState != 20 && gameState != 40 && ClientParameter.field341 != null) { ClientParameter.field341.close(); ClientParameter.field341 = null; } @@ -1063,10 +1063,10 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene Client.field180 = 1; } - if (var0 != 5 && var0 != 10) { - if (var0 == 20) { + if (gameState != 5 && gameState != 10) { + if (gameState == 20) { class2.method27(class16.archive10, WorldMapSection3.archive8, true, Client.gameState == 11 ? 4 : 0); - } else if (var0 == 11) { + } else if (gameState == 11) { class2.method27(class16.archive10, WorldMapSection3.archive8, false, 4); } else { class80.method2015(); @@ -1075,7 +1075,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene class2.method27(class16.archive10, WorldMapSection3.archive8, true, 0); } - Client.gameState = var0; + Client.gameState = gameState; } } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index 28158757fe..4c177ca8ea 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -76,14 +76,14 @@ public class GrandExchangeEvent { garbageValue = "-1003049523" ) @Export("runScript0") - static void runScript0(ScriptEvent var0, int var1) { - Object[] var2 = var0.args0; + static void runScript0(ScriptEvent scriptEvent, int var1) { + Object[] var2 = scriptEvent.args0; Script var3; int var4; - if (class12.method162(var0.type0)) { + if (class12.method162(scriptEvent.type0)) { class15.worldMapEvent = (WorldMapEvent)var2[0]; WorldMapElement var5 = ViewportMouse.getWorldMapElement(class15.worldMapEvent.mapElement); - var3 = FaceNormal.method3236(var0.type0, var5.field1020, var5.category); + var3 = FaceNormal.method3236(scriptEvent.type0, var5.field1020, var5.category); } else { var4 = (Integer)var2[0]; var3 = SoundSystem.method2451(var4); @@ -113,46 +113,46 @@ public class GrandExchangeEvent { if (var2[var8] instanceof Integer) { var11 = (Integer)var2[var8]; if (var11 == -2147483647) { - var11 = var0.mouseX; + var11 = scriptEvent.mouseX; } if (var11 == -2147483646) { - var11 = var0.mouseY; + var11 = scriptEvent.mouseY; } if (var11 == -2147483645) { - var11 = var0.widget != null ? var0.widget.id : -1; + var11 = scriptEvent.widget != null ? scriptEvent.widget.id : -1; } if (var11 == -2147483644) { - var11 = var0.opIndex; + var11 = scriptEvent.opIndex; } if (var11 == -2147483643) { - var11 = var0.widget != null ? var0.widget.childIndex : -1; + var11 = scriptEvent.widget != null ? scriptEvent.widget.childIndex : -1; } if (var11 == -2147483642) { - var11 = var0.dragTarget != null ? var0.dragTarget.id : -1; + var11 = scriptEvent.dragTarget != null ? scriptEvent.dragTarget.id : -1; } if (var11 == -2147483641) { - var11 = var0.dragTarget != null ? var0.dragTarget.childIndex : -1; + var11 = scriptEvent.dragTarget != null ? scriptEvent.dragTarget.childIndex : -1; } if (var11 == -2147483640) { - var11 = var0.keyTyped; + var11 = scriptEvent.keyTyped; } if (var11 == -2147483639) { - var11 = var0.keyPressed; + var11 = scriptEvent.keyPressed; } Username.Interpreter_intLocals[var9++] = var11; } else if (var2[var8] instanceof String) { var12 = (String)var2[var8]; if (var12.equals("event_opbase")) { - var12 = var0.targetName; + var12 = scriptEvent.targetName; } Interpreter.Interpreter_stringLocals[var26++] = var12; @@ -160,7 +160,7 @@ public class GrandExchangeEvent { } var8 = 0; - Interpreter.field425 = var0.field772; + Interpreter.field425 = scriptEvent.field772; while (true) { ++var8; diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index 011fa3a829..4399ec11f2 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -78,15 +78,15 @@ public class GrandExchangeEvents { signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", garbageValue = "1601363438" ) - @Export("addMessage") - static void addMessage(int var0, String var1, String var2, String var3) { - ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); + @Export("addChatMessage") + static void addChatMessage(int type, String sender, String text, String prefix) { + ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(type); if (var4 == null) { var4 = new ChatChannel(); - Messages.Messages_channels.put(var0, var4); + Messages.Messages_channels.put(type, var4); } - Message var5 = var4.addMessage(var0, var1, var2, var3); + Message var5 = var4.addMessage(type, sender, text, prefix); Messages.Messages_hashTable.put(var5, (long)var5.count); Messages.Messages_queue.add(var5); Client.chatCycle = Client.cycleCntr; @@ -153,7 +153,7 @@ public class GrandExchangeEvents { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.rectangleMode.rsOrdinal(); return 1; } else if (var0 == 2614) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.field964 ? 1 : 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; return 1; } else { return 2; diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java index 15fc466c2f..bc393f6317 100644 --- a/runescape-client/src/main/java/GraphicsDefaults.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -6,8 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("lg") @Implements("GraphicsDefaults") -public class GraphicsDefaults -{ +public class GraphicsDefaults { @ObfuscatedName("m") @ObfuscatedGetter( intValue = 1673796151 @@ -93,8 +92,8 @@ public class GraphicsDefaults garbageValue = "1764356022" ) @Export("decode") - public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3810.group); + public void decode(AbstractArchive index) { + byte[] var2 = index.takeFileFlat(DefaultsGroup.DefaultsGroup_graphics.group); Buffer var3 = new Buffer(var2); while (true) { @@ -143,7 +142,7 @@ public class GraphicsDefaults VarbitDefinition.indexedSpriteWidths = null; SecureRandomCallable.indexedSpriteHeights = null; class328.indexedSpritePalette = null; - class328.spritePixels = (byte[][])null; + class328.spritePixels = ((byte[][])null); var5 = var6; } diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index e6c943d2e2..3e7fdda8f4 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -108,9 +108,9 @@ public final class GraphicsObject extends Entity { garbageValue = "-730240149" ) @Export("advance") - final void advance(int var1) { + final void advance(int cycles) { if (!this.isFinished) { - this.frameCycle += var1; + this.frameCycle += cycles; while (this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) { this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; diff --git a/runescape-client/src/main/java/GroundItemPile.java b/runescape-client/src/main/java/GroundItemPile.java index 5bf3db6b4a..dc6c145b69 100644 --- a/runescape-client/src/main/java/GroundItemPile.java +++ b/runescape-client/src/main/java/GroundItemPile.java @@ -68,37 +68,37 @@ public final class GroundItemPile { garbageValue = "-60" ) @Export("loadInterface") - public static boolean loadInterface(int var0) { - if (Widget.loadedInterfaces[var0]) { + public static boolean loadInterface(int itf) { + if (Widget.loadedInterfaces[itf]) { return true; - } else if (!Widget.Widget_archive.tryLoadGroup(var0)) { + } else if (!Widget.Widget_archive.tryLoadGroup(itf)) { return false; } else { - int var1 = Widget.Widget_archive.method4(var0); + int var1 = Widget.Widget_archive.method4(itf); if (var1 == 0) { - Widget.loadedInterfaces[var0] = true; + Widget.loadedInterfaces[itf] = true; return true; } else { - if (Widget.interfaceComponents[var0] == null) { - Widget.interfaceComponents[var0] = new Widget[var1]; + if (Widget.interfaceComponents[itf] == null) { + Widget.interfaceComponents[itf] = new Widget[var1]; } for (int var2 = 0; var2 < var1; ++var2) { - if (Widget.interfaceComponents[var0][var2] == null) { - byte[] var3 = Widget.Widget_archive.takeFile(var0, var2); + if (Widget.interfaceComponents[itf][var2] == null) { + byte[] var3 = Widget.Widget_archive.takeFile(itf, var2); if (var3 != null) { - Widget.interfaceComponents[var0][var2] = new Widget(); - Widget.interfaceComponents[var0][var2].id = var2 + (var0 << 16); + Widget.interfaceComponents[itf][var2] = new Widget(); + Widget.interfaceComponents[itf][var2].id = var2 + (itf << 16); if (var3[0] == -1) { - Widget.interfaceComponents[var0][var2].decode(new Buffer(var3)); + Widget.interfaceComponents[itf][var2].decode(new Buffer(var3)); } else { - Widget.interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); + Widget.interfaceComponents[itf][var2].decodeLegacy(new Buffer(var3)); } } } } - Widget.loadedInterfaces[var0] = true; + Widget.loadedInterfaces[itf] = true; return true; } } diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index 04391a34ef..d0b0d00a2c 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -68,15 +68,15 @@ public class HealthBar extends Node { garbageValue = "1594721795" ) @Export("get") - HealthBarUpdate get(int var1) { + HealthBarUpdate get(int cycle) { HealthBarUpdate var2 = (HealthBarUpdate)this.updates.last(); - if (var2 != null && var2.cycle <= var1) { - for (HealthBarUpdate var3 = (HealthBarUpdate)this.updates.previous(); var3 != null && var3.cycle <= var1; var3 = (HealthBarUpdate)this.updates.previous()) { + if (var2 != null && var2.cycle <= cycle) { + for (HealthBarUpdate var3 = (HealthBarUpdate)this.updates.previous(); var3 != null && var3.cycle <= cycle; var3 = (HealthBarUpdate)this.updates.previous()) { var2.remove(); var2 = var3; } - if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) { + if (this.definition.int5 + var2.cycleOffset + var2.cycle > cycle) { return var2; } else { var2.remove(); @@ -105,66 +105,64 @@ public class HealthBar extends Node { @Export("charToByteCp1252") public static byte charToByteCp1252(char var0) { byte var1; - if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { - if (var0 == 8364) { - var1 = -128; - } else if (var0 == 8218) { - var1 = -126; - } else if (var0 == 402) { - var1 = -125; - } else if (var0 == 8222) { - var1 = -124; - } else if (var0 == 8230) { - var1 = -123; - } else if (var0 == 8224) { - var1 = -122; - } else if (var0 == 8225) { - var1 = -121; - } else if (var0 == 710) { - var1 = -120; - } else if (var0 == 8240) { - var1 = -119; - } else if (var0 == 352) { - var1 = -118; - } else if (var0 == 8249) { - var1 = -117; - } else if (var0 == 338) { - var1 = -116; - } else if (var0 == 381) { - var1 = -114; - } else if (var0 == 8216) { - var1 = -111; - } else if (var0 == 8217) { - var1 = -110; - } else if (var0 == 8220) { - var1 = -109; - } else if (var0 == 8221) { - var1 = -108; - } else if (var0 == 8226) { - var1 = -107; - } else if (var0 == 8211) { - var1 = -106; - } else if (var0 == 8212) { - var1 = -105; - } else if (var0 == 732) { - var1 = -104; - } else if (var0 == 8482) { - var1 = -103; - } else if (var0 == 353) { - var1 = -102; - } else if (var0 == 8250) { - var1 = -101; - } else if (var0 == 339) { - var1 = -100; - } else if (var0 == 382) { - var1 = -98; - } else if (var0 == 376) { - var1 = -97; - } else { - var1 = 63; - } - } else { + if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { var1 = (byte)var0; + } else if (var0 == 8364) { + var1 = -128; + } else if (var0 == 8218) { + var1 = -126; + } else if (var0 == 402) { + var1 = -125; + } else if (var0 == 8222) { + var1 = -124; + } else if (var0 == 8230) { + var1 = -123; + } else if (var0 == 8224) { + var1 = -122; + } else if (var0 == 8225) { + var1 = -121; + } else if (var0 == 710) { + var1 = -120; + } else if (var0 == 8240) { + var1 = -119; + } else if (var0 == 352) { + var1 = -118; + } else if (var0 == 8249) { + var1 = -117; + } else if (var0 == 338) { + var1 = -116; + } else if (var0 == 381) { + var1 = -114; + } else if (var0 == 8216) { + var1 = -111; + } else if (var0 == 8217) { + var1 = -110; + } else if (var0 == 8220) { + var1 = -109; + } else if (var0 == 8221) { + var1 = -108; + } else if (var0 == 8226) { + var1 = -107; + } else if (var0 == 8211) { + var1 = -106; + } else if (var0 == 8212) { + var1 = -105; + } else if (var0 == 732) { + var1 = -104; + } else if (var0 == 8482) { + var1 = -103; + } else if (var0 == 353) { + var1 = -102; + } else if (var0 == 8250) { + var1 = -101; + } else if (var0 == 339) { + var1 = -100; + } else if (var0 == 382) { + var1 = -98; + } else if (var0 == 376) { + var1 = -97; + } else { + var1 = 63; } return var1; diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index 2ba085647a..eac4b5886a 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -47,14 +47,14 @@ public class IgnoreList extends UserList { garbageValue = "32" ) @Export("read") - public void read(Buffer var1, int var2) { + public void read(Buffer buffer, int var2) { while (true) { - if (var1.index < var2) { - int var3 = var1.readUnsignedByte(); + if (buffer.index < var2) { + int var3 = buffer.readUnsignedByte(); boolean var4 = (var3 & 1) == 1; - Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - var1.readStringCp1252NullTerminated(); + Username var5 = new Username(buffer.readStringCp1252NullTerminated(), this.loginType); + Username var6 = new Username(buffer.readStringCp1252NullTerminated(), this.loginType); + buffer.readStringCp1252NullTerminated(); if (var5 != null && var5.hasCleanName()) { Ignored var7 = (Ignored)this.getByCurrentUsername(var5); if (var4) { diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index dca7210b00..fef97e5777 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -22,8 +22,8 @@ public class Ignored extends User { garbageValue = "-842469150" ) @Export("compareTo00") - int compareTo00(Ignored var1) { - return this.id - var1.id; + int compareTo00(Ignored other) { + return this.id - other.id; } @ObfuscatedName("aj") diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index 60c864797e..f398bd47db 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -159,7 +159,7 @@ public class Instrument { int var13; int var14; int var15; - int[] var10000; + int[] var16; for (var11 = 0; var11 < var1; ++var11) { var12 = this.field413.doStep(var1); var13 = this.field414.doStep(var1); @@ -181,39 +181,39 @@ public class Instrument { if (this.oscillatorVolume[var14] != 0) { var15 = Instrument_delays[var14] + var11; if (var15 < var1) { - var10000 = Instrument_samples; - var10000[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.field413.form); - var10000 = Instrument_phases; - var10000[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14]; + var16 = Instrument_samples; + var16[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.field413.form); + var16 = Instrument_phases; + var16[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14]; } } } } - int var16; + int var17; if (this.field419 != null) { this.field419.reset(); this.field420.reset(); var11 = 0; - boolean var17 = false; - boolean var18 = true; + boolean var18 = false; + boolean var19 = true; for (var14 = 0; var14 < var1; ++var14) { var15 = this.field419.doStep(var1); - var16 = this.field420.doStep(var1); - if (var18) { + var17 = this.field420.doStep(var1); + if (var19) { var12 = (var15 * (this.field419.end - this.field419.start) >> 8) + this.field419.start; } else { - var12 = (var16 * (this.field419.end - this.field419.start) >> 8) + this.field419.start; + var12 = (var17 * (this.field419.end - this.field419.start) >> 8) + this.field419.start; } var11 += 256; if (var11 >= var12) { var11 = 0; - var18 = !var18; + var19 = !var19; } - if (var18) { + if (var19) { Instrument_samples[var14] = 0; } } @@ -223,8 +223,8 @@ public class Instrument { var11 = (int)((double)this.delayTime * var3); for (var12 = var11; var12 < var1; ++var12) { - var10000 = Instrument_samples; - var10000[var12] += Instrument_samples[var12 - var11] * this.delayDecay / 100; + var16 = Instrument_samples; + var16[var12] += Instrument_samples[var12 - var11] * this.delayDecay / 100; } } @@ -240,19 +240,19 @@ public class Instrument { var15 = var1 - var12; } - int var19; + int var20; while (var14 < var15) { - var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.field35 >> 16); + var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.field35 >> 16); - for (var19 = 0; var19 < var12; ++var19) { - var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var19] * (long)AudioFilter.field33[0][var19] >> 16); + for (var20 = 0; var20 < var12; ++var20) { + var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var20] * (long)AudioFilter.field33[0][var20] >> 16); } - for (var19 = 0; var19 < var14; ++var19) { - var16 -= (int)((long)Instrument_samples[var14 - 1 - var19] * (long)AudioFilter.field33[1][var19] >> 16); + for (var20 = 0; var20 < var14; ++var20) { + var17 -= (int)((long)Instrument_samples[var14 - 1 - var20] * (long)AudioFilter.field33[1][var20] >> 16); } - Instrument_samples[var14] = var16; + Instrument_samples[var14] = var17; var11 = this.field421.doStep(var1 + 1); ++var14; } @@ -264,36 +264,36 @@ public class Instrument { var15 = var1 - var12; } - int var20; + int var21; while (var14 < var15) { - var19 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.field35 >> 16); + var20 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.field35 >> 16); - for (var20 = 0; var20 < var12; ++var20) { - var19 += (int)((long)Instrument_samples[var14 + var12 - 1 - var20] * (long)AudioFilter.field33[0][var20] >> 16); + for (var21 = 0; var21 < var12; ++var21) { + var20 += (int)((long)Instrument_samples[var14 + var12 - 1 - var21] * (long)AudioFilter.field33[0][var21] >> 16); } - for (var20 = 0; var20 < var13; ++var20) { - var19 -= (int)((long)Instrument_samples[var14 - 1 - var20] * (long)AudioFilter.field33[1][var20] >> 16); + for (var21 = 0; var21 < var13; ++var21) { + var20 -= (int)((long)Instrument_samples[var14 - 1 - var21] * (long)AudioFilter.field33[1][var21] >> 16); } - Instrument_samples[var14] = var19; + Instrument_samples[var14] = var20; var11 = this.field421.doStep(var1 + 1); ++var14; } if (var14 >= var1 - var12) { while (var14 < var1) { - var19 = 0; + var20 = 0; - for (var20 = var14 + var12 - var1; var20 < var12; ++var20) { - var19 += (int)((long)Instrument_samples[var14 + var12 - 1 - var20] * (long)AudioFilter.field33[0][var20] >> 16); + for (var21 = var14 + var12 - var1; var21 < var12; ++var21) { + var20 += (int)((long)Instrument_samples[var14 + var12 - 1 - var21] * (long)AudioFilter.field33[0][var21] >> 16); } - for (var20 = 0; var20 < var13; ++var20) { - var19 -= (int)((long)Instrument_samples[var14 - 1 - var20] * (long)AudioFilter.field33[1][var20] >> 16); + for (var21 = 0; var21 < var13; ++var21) { + var20 -= (int)((long)Instrument_samples[var14 - 1 - var21] * (long)AudioFilter.field33[1][var21] >> 16); } - Instrument_samples[var14] = var19; + Instrument_samples[var14] = var20; this.field421.doStep(var1 + 1); ++var14; } @@ -332,56 +332,56 @@ public class Instrument { signature = "(Lgr;)V" ) @Export("decode") - final void decode(Buffer var1) { + final void decode(Buffer buffer) { this.field413 = new SoundEnvelope(); - this.field413.decode(var1); + this.field413.decode(buffer); this.field414 = new SoundEnvelope(); - this.field414.decode(var1); - int var2 = var1.readUnsignedByte(); + this.field414.decode(buffer); + int var2 = buffer.readUnsignedByte(); if (var2 != 0) { - --var1.index; + --buffer.index; this.field415 = new SoundEnvelope(); - this.field415.decode(var1); + this.field415.decode(buffer); this.field416 = new SoundEnvelope(); - this.field416.decode(var1); + this.field416.decode(buffer); } - var2 = var1.readUnsignedByte(); + var2 = buffer.readUnsignedByte(); if (var2 != 0) { - --var1.index; + --buffer.index; this.field417 = new SoundEnvelope(); - this.field417.decode(var1); + this.field417.decode(buffer); this.field418 = new SoundEnvelope(); - this.field418.decode(var1); + this.field418.decode(buffer); } - var2 = var1.readUnsignedByte(); + var2 = buffer.readUnsignedByte(); if (var2 != 0) { - --var1.index; + --buffer.index; this.field419 = new SoundEnvelope(); - this.field419.decode(var1); + this.field419.decode(buffer); this.field420 = new SoundEnvelope(); - this.field420.decode(var1); + this.field420.decode(buffer); } for (int var3 = 0; var3 < 10; ++var3) { - int var4 = var1.method48(); + int var4 = buffer.method48(); if (var4 == 0) { break; } this.oscillatorVolume[var3] = var4; - this.oscillatorPitch[var3] = var1.method47(); - this.oscillatorDelays[var3] = var1.method48(); + this.oscillatorPitch[var3] = buffer.method47(); + this.oscillatorDelays[var3] = buffer.method48(); } - this.delayTime = var1.method48(); - this.delayDecay = var1.method48(); - this.duration = var1.readUnsignedShort(); - this.offset = var1.readUnsignedShort(); + this.delayTime = buffer.method48(); + this.delayDecay = buffer.method48(); + this.duration = buffer.readUnsignedShort(); + this.offset = buffer.readUnsignedShort(); this.filter = new AudioFilter(); this.field421 = new SoundEnvelope(); - this.filter.method27(var1, this.field421); + this.filter.method27(buffer, this.field421); } static { diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java index c18871f91d..a19bdf72c4 100644 --- a/runescape-client/src/main/java/InterfaceParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -77,12 +77,12 @@ public class InterfaceParent extends Node { garbageValue = "619422509" ) @Export("decodeStringCp1252") - public static String decodeStringCp1252(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; + public static String decodeStringCp1252(byte[] src, int srcStart, int length) { + char[] var3 = new char[length]; int var4 = 0; - for (int var5 = 0; var5 < var2; ++var5) { - int var6 = var0[var5 + var1] & 255; + for (int var5 = 0; var5 < length; ++var5) { + int var6 = src[var5 + srcStart] & 255; if (var6 != 0) { if (var6 >= 128 && var6 < 160) { char var7 = class304.cp1252AsciiExtension[var6 - 128]; diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index 4cbd72177b..ebd5c220fd 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -47,7 +47,8 @@ public class ItemDefinition extends DualNode { @ObfuscatedGetter( intValue = 1070080857 ) - int field435; + @Export("model") + int model; @ObfuscatedName("z") @Export("name") public String name; @@ -199,9 +200,11 @@ public class ItemDefinition extends DualNode { @Export("femaleHeadModel2") int femaleHeadModel2; @ObfuscatedName("az") - int[] field436; + @Export("countobj") + int[] countobj; @ObfuscatedName("au") - int[] field437; + @Export("countco") + int[] countco; @ObfuscatedName("ao") @ObfuscatedGetter( intValue = 619422509 @@ -359,7 +362,7 @@ public class ItemDefinition extends DualNode { @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.field435 = var1.readUnsignedShort(); + this.model = var1.readUnsignedShort(); } else if (var2 == 2) { this.name = var1.readStringCp1252NullTerminated(); } else if (var2 == 4) { @@ -445,13 +448,13 @@ public class ItemDefinition extends DualNode { } else if (var2 == 98) { this.noteTemplate = var1.readUnsignedShort(); } else if (var2 >= 100 && var2 < 110) { - if (this.field436 == null) { - this.field436 = new int[10]; - this.field437 = new int[10]; + if (this.countobj == null) { + this.countobj = new int[10]; + this.countco = new int[10]; } - this.field436[var2 - 100] = var1.readUnsignedShort(); - this.field437[var2 - 100] = var1.readUnsignedShort(); + this.countobj[var2 - 100] = var1.readUnsignedShort(); + this.countco[var2 - 100] = var1.readUnsignedShort(); } else if (var2 == 110) { this.resizeX = var1.readUnsignedShort(); } else if (var2 == 111) { @@ -484,21 +487,22 @@ public class ItemDefinition extends DualNode { signature = "(Ljv;Ljv;I)V", garbageValue = "2051877377" ) - void method140(ItemDefinition var1, ItemDefinition var2) { - this.field435 = var1.field435; - this.zoom2d = var1.zoom2d; - this.xan2d = var1.xan2d; - this.yan2d = var1.yan2d; - this.zan2d = var1.zan2d; - this.offsetX2d = var1.offsetX2d; - this.offsetY2d = var1.offsetY2d; - this.recolorFrom = var1.recolorFrom; - this.recolorTo = var1.recolorTo; - this.retextureFrom = var1.retextureFrom; - this.retextureTo = var1.retextureTo; - this.name = var2.name; - this.isMembersOnly = var2.isMembersOnly; - this.price = var2.price; + @Export("genCert") + void genCert(ItemDefinition template, ItemDefinition link) { + this.model = template.model; + this.zoom2d = template.zoom2d; + this.xan2d = template.xan2d; + this.yan2d = template.yan2d; + this.zan2d = template.zan2d; + this.offsetX2d = template.offsetX2d; + this.offsetY2d = template.offsetY2d; + this.recolorFrom = template.recolorFrom; + this.recolorTo = template.recolorTo; + this.retextureFrom = template.retextureFrom; + this.retextureTo = template.retextureTo; + this.name = link.name; + this.isMembersOnly = link.isMembersOnly; + this.price = link.price; this.isStackable = 1; } @@ -507,37 +511,38 @@ public class ItemDefinition extends DualNode { signature = "(Ljv;Ljv;I)V", garbageValue = "227754762" ) - void method141(ItemDefinition var1, ItemDefinition var2) { - this.field435 = var1.field435; - this.zoom2d = var1.zoom2d; - this.xan2d = var1.xan2d; - this.yan2d = var1.yan2d; - this.zan2d = var1.zan2d; - this.offsetX2d = var1.offsetX2d; - this.offsetY2d = var1.offsetY2d; - this.recolorFrom = var2.recolorFrom; - this.recolorTo = var2.recolorTo; - this.retextureFrom = var2.retextureFrom; - this.retextureTo = var2.retextureTo; - this.name = var2.name; - this.isMembersOnly = var2.isMembersOnly; - this.isStackable = var2.isStackable; - this.maleModel = var2.maleModel; - this.maleModel1 = var2.maleModel1; - this.maleModel2 = var2.maleModel2; - this.femaleModel = var2.femaleModel; - this.femaleModel1 = var2.femaleModel1; - this.femaleModel2 = var2.femaleModel2; - this.maleHeadModel = var2.maleHeadModel; - this.maleHeadModel2 = var2.maleHeadModel2; - this.femaleHeadModel = var2.femaleHeadModel; - this.femaleHeadModel2 = var2.femaleHeadModel2; - this.team = var2.team; - this.groundActions = var2.groundActions; + @Export("genBought") + void genBought(ItemDefinition template, ItemDefinition link) { + this.model = template.model; + this.zoom2d = template.zoom2d; + this.xan2d = template.xan2d; + this.yan2d = template.yan2d; + this.zan2d = template.zan2d; + this.offsetX2d = template.offsetX2d; + this.offsetY2d = template.offsetY2d; + this.recolorFrom = link.recolorFrom; + this.recolorTo = link.recolorTo; + this.retextureFrom = link.retextureFrom; + this.retextureTo = link.retextureTo; + this.name = link.name; + this.isMembersOnly = link.isMembersOnly; + this.isStackable = link.isStackable; + this.maleModel = link.maleModel; + this.maleModel1 = link.maleModel1; + this.maleModel2 = link.maleModel2; + this.femaleModel = link.femaleModel; + this.femaleModel1 = link.femaleModel1; + this.femaleModel2 = link.femaleModel2; + this.maleHeadModel = link.maleHeadModel; + this.maleHeadModel2 = link.maleHeadModel2; + this.femaleHeadModel = link.femaleHeadModel; + this.femaleHeadModel2 = link.femaleHeadModel2; + this.team = link.team; + this.groundActions = link.groundActions; this.inventoryActions = new String[5]; - if (var2.inventoryActions != null) { + if (link.inventoryActions != null) { for (int var3 = 0; var3 < 4; ++var3) { - this.inventoryActions[var3] = var2.inventoryActions[var3]; + this.inventoryActions[var3] = link.inventoryActions[var3]; } } @@ -550,20 +555,21 @@ public class ItemDefinition extends DualNode { signature = "(Ljv;Ljv;I)V", garbageValue = "2084647027" ) - void method142(ItemDefinition var1, ItemDefinition var2) { - this.field435 = var1.field435; - this.zoom2d = var1.zoom2d; - this.xan2d = var1.xan2d; - this.yan2d = var1.yan2d; - this.zan2d = var1.zan2d; - this.offsetX2d = var1.offsetX2d; - this.offsetY2d = var1.offsetY2d; - this.recolorFrom = var1.recolorFrom; - this.recolorTo = var1.recolorTo; - this.retextureFrom = var1.retextureFrom; - this.retextureTo = var1.retextureTo; - this.isStackable = var1.isStackable; - this.name = var2.name; + @Export("genPlaceholder") + void genPlaceholder(ItemDefinition template, ItemDefinition link) { + this.model = template.model; + this.zoom2d = template.zoom2d; + this.xan2d = template.xan2d; + this.yan2d = template.yan2d; + this.zan2d = template.zan2d; + this.offsetX2d = template.offsetX2d; + this.offsetY2d = template.offsetY2d; + this.recolorFrom = template.recolorFrom; + this.recolorTo = template.recolorTo; + this.retextureFrom = template.retextureFrom; + this.retextureTo = template.retextureTo; + this.isStackable = template.isStackable; + this.name = link.name; this.price = 0; this.isMembersOnly = false; this.isTradable = false; @@ -576,12 +582,12 @@ public class ItemDefinition extends DualNode { ) public final ModelData method143(int var1) { int var2; - if (this.field436 != null && var1 > 1) { + if (this.countobj != null && var1 > 1) { int var3 = -1; for (var2 = 0; var2 < 10; ++var2) { - if (var1 >= this.field437[var2] && this.field437[var2] != 0) { - var3 = this.field436[var2]; + if (var1 >= this.countco[var2] && this.countco[var2] != 0) { + var3 = this.countobj[var2]; } } @@ -590,7 +596,7 @@ public class ItemDefinition extends DualNode { } } - ModelData var4 = ModelData.method2788(ItemDefinition_modelArchive, this.field435, 0); + ModelData var4 = ModelData.method2788(ItemDefinition_modelArchive, this.model, 0); if (var4 == null) { return null; } else { @@ -620,13 +626,13 @@ public class ItemDefinition extends DualNode { garbageValue = "1152916563" ) @Export("getModel") - public final Model getModel(int var1) { - if (this.field436 != null && var1 > 1) { + public final Model getModel(int quantity) { + if (this.countobj != null && quantity > 1) { int var2 = -1; for (int var3 = 0; var3 < 10; ++var3) { - if (var1 >= this.field437[var3] && this.field437[var3] != 0) { - var2 = this.field436[var3]; + if (quantity >= this.countco[var3] && this.countco[var3] != 0) { + var2 = this.countobj[var3]; } } @@ -639,7 +645,7 @@ public class ItemDefinition extends DualNode { if (var5 != null) { return var5; } else { - ModelData var6 = ModelData.method2788(ItemDefinition_modelArchive, this.field435, 0); + ModelData var6 = ModelData.method2788(ItemDefinition_modelArchive, this.model, 0); if (var6 == null) { return null; } else { @@ -673,13 +679,14 @@ public class ItemDefinition extends DualNode { signature = "(IB)Ljv;", garbageValue = "0" ) - public ItemDefinition method144(int var1) { - if (this.field436 != null && var1 > 1) { + @Export("getCountObj") + public ItemDefinition getCountObj(int quantity) { + if (this.countobj != null && quantity > 1) { int var2 = -1; for (int var3 = 0; var3 < 10; ++var3) { - if (var1 >= this.field437[var3] && this.field437[var3] != 0) { - var2 = this.field436[var3]; + if (quantity >= this.countco[var3] && this.countco[var3] != 0) { + var2 = this.countobj[var3]; } } diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java index 153160f944..f916f30966 100644 --- a/runescape-client/src/main/java/IterableNodeDeque.java +++ b/runescape-client/src/main/java/IterableNodeDeque.java @@ -40,15 +40,15 @@ public class IterableNodeDeque implements Iterable { signature = "(Lgw;)V" ) @Export("addFirst") - public void addFirst(Node var1) { - if (var1.next != null) { - var1.remove(); + public void addFirst(Node node) { + if (node.next != null) { + node.remove(); } - var1.next = this.sentinel.next; - var1.previous = this.sentinel; - var1.next.previous = var1; - var1.previous.next = var1; + node.next = this.sentinel.next; + node.previous = this.sentinel; + node.next.previous = node; + node.previous.next = node; } @ObfuscatedName("q") @@ -56,15 +56,15 @@ public class IterableNodeDeque implements Iterable { signature = "(Lgw;)V" ) @Export("addLast") - public void addLast(Node var1) { - if (var1.next != null) { - var1.remove(); + public void addLast(Node node) { + if (node.next != null) { + node.remove(); } - var1.next = this.sentinel; - var1.previous = this.sentinel.previous; - var1.next.previous = var1; - var1.previous.next = var1; + node.next = this.sentinel; + node.previous = this.sentinel.previous; + node.next.previous = node; + node.previous.next = node; } @ObfuscatedName("o") @@ -81,12 +81,12 @@ public class IterableNodeDeque implements Iterable { signature = "(Lgw;)Lgw;" ) @Export("previousOrLast") - Node previousOrLast(Node var1) { + Node previousOrLast(Node node) { Node var2; - if (var1 == null) { + if (node == null) { var2 = this.sentinel.previous; } else { - var2 = var1; + var2 = node; } if (var2 == this.sentinel) { @@ -131,14 +131,14 @@ public class IterableNodeDeque implements Iterable { signature = "(Lgw;Lgw;)V" ) @Export("IterableNodeDeque_addBefore") - public static void IterableNodeDeque_addBefore(Node var0, Node var1) { - if (var0.next != null) { - var0.remove(); + public static void IterableNodeDeque_addBefore(Node node, Node old) { + if (node.next != null) { + node.remove(); } - var0.next = var1; - var0.previous = var1.previous; - var0.next.previous = var0; - var0.previous.next = var0; + node.next = old; + node.previous = old.previous; + node.next.previous = node; + node.previous.next = node; } } diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index 93cecb53a0..c56d9b9e2f 100644 --- a/runescape-client/src/main/java/IterableNodeHashTable.java +++ b/runescape-client/src/main/java/IterableNodeHashTable.java @@ -125,15 +125,16 @@ public final class IterableNodeHashTable implements Iterable { this.current = var1.previous; return var1; } else { - while (this.index < this.size) { - var1 = this.buckets[this.index++].previous; - if (var1 != this.buckets[this.index - 1]) { - this.current = var1.previous; - return var1; + do { + if (this.index >= this.size) { + return null; } - } - return null; + var1 = this.buckets[this.index++].previous; + } while(var1 == this.buckets[this.index - 1]); + + this.current = var1.previous; + return var1; } } diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index 717dff1c35..3fc7468142 100644 --- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java +++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java @@ -56,16 +56,17 @@ public class IterableNodeHashTableIterator implements Iterator { this.last = var1; return var1; } else { - while (this.index < this.hashTable.size) { - var1 = this.hashTable.buckets[this.index++].previous; - if (var1 != this.hashTable.buckets[this.index - 1]) { - this.head = var1.previous; - this.last = var1; - return var1; + do { + if (this.index >= this.hashTable.size) { + return null; } - } - return null; + var1 = this.hashTable.buckets[this.index++].previous; + } while(var1 == this.hashTable.buckets[this.index - 1]); + + this.head = var1.previous; + this.last = var1; + return var1; } } diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 334f8a3b34..4c64860070 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -67,15 +67,15 @@ public class Message extends DualNode { garbageValue = "0" ) @Export("set") - void set(int var1, String var2, String var3, String var4) { + void set(int type, String sender, String prefix, String text) { int var5 = ++Messages.Messages_count - 1; this.count = var5; this.cycle = Client.cycle; - this.type = var1; - this.sender = var2; + this.type = type; + this.sender = sender; this.fillSenderUsername(); - this.prefix = var3; - this.text = var4; + this.prefix = prefix; + this.text = text; this.clearIsFromFriend(); this.clearIsFromIgnored(); } @@ -221,7 +221,7 @@ public class Message extends DualNode { } else if (VarcInt.isAlphaNumeric(var10)) { var11 = true; } else { - label149: { + label151: { char[] var12 = class305.field1149; int var13; @@ -230,27 +230,21 @@ public class Message extends DualNode { var14 = var12[var13]; if (var10 == var14) { var11 = true; - break label149; + break label151; } } var12 = class305.field1150; - var13 = 0; - - while (true) { - if (var13 >= var12.length) { - var11 = false; - break; - } + for (var13 = 0; var13 < var12.length; ++var13) { var14 = var12[var13]; if (var10 == var14) { var11 = true; - break; + break label151; } - - ++var13; } + + var11 = false; } } diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index 5998804d6f..7abeab23ee 100644 --- a/runescape-client/src/main/java/MidiFileReader.java +++ b/runescape-client/src/main/java/MidiFileReader.java @@ -44,33 +44,33 @@ public class MidiFileReader { @ObfuscatedName("m") @Export("parse") - void parse(byte[] var1) { - this.buffer.array = var1; + void parse(byte[] midi) { + this.buffer.array = midi; this.buffer.index = 10; int var2 = this.buffer.readUnsignedShort(); this.division = this.buffer.readUnsignedShort(); this.field493 = 500000; this.trackStarts = new int[var2]; - Buffer var10000; - int var3; + Buffer var3; int var4; - for (var3 = 0; var3 < var2; var10000.index += var4) { - int var5 = this.buffer.readInt(); - var4 = this.buffer.readInt(); - if (var5 == 1297379947) { - this.trackStarts[var3] = this.buffer.index; - ++var3; + int var5; + for (var4 = 0; var4 < var2; var3.index += var5) { + int var6 = this.buffer.readInt(); + var5 = this.buffer.readInt(); + if (var6 == 1297379947) { + this.trackStarts[var4] = this.buffer.index; + ++var4; } - var10000 = this.buffer; + var3 = this.buffer; } this.field494 = 0L; this.trackPositions = new int[var2]; - for (var3 = 0; var3 < var2; ++var3) { - this.trackPositions[var3] = this.trackStarts[var3]; + for (var4 = 0; var4 < var2; ++var4) { + this.trackPositions[var4] = this.trackStarts[var4]; } this.trackLengths = new int[var2]; @@ -101,14 +101,14 @@ public class MidiFileReader { @ObfuscatedName("o") @Export("gotoTrack") - void gotoTrack(int var1) { - this.buffer.index = this.trackPositions[var1]; + void gotoTrack(int trackId) { + this.buffer.index = this.trackPositions[trackId]; } @ObfuscatedName("u") @Export("markTrackPosition") - void markTrackPosition(int var1) { - this.trackPositions[var1] = this.buffer.index; + void markTrackPosition(int trackId) { + this.trackPositions[trackId] = this.buffer.index; } @ObfuscatedName("g") @@ -119,47 +119,47 @@ public class MidiFileReader { @ObfuscatedName("l") @Export("readTrackLength") - void readTrackLength(int var1) { + void readTrackLength(int trackId) { int var2 = this.buffer.method52(); - int[] var10000 = this.trackLengths; - var10000[var1] += var2; + int[] var3 = this.trackLengths; + var3[trackId] += var2; } @ObfuscatedName("e") @Export("readMessage") - int readMessage(int var1) { - int var2 = this.readMessage0(var1); + int readMessage(int trackId) { + int var2 = this.readMessage0(trackId); return var2; } @ObfuscatedName("x") @Export("readMessage0") - int readMessage0(int var1) { + int readMessage0(int trackId) { byte var2 = this.buffer.array[this.buffer.index]; int var3; if (var2 < 0) { var3 = var2 & 255; - this.field492[var1] = var3; + this.field492[trackId] = var3; ++this.buffer.index; } else { - var3 = this.field492[var1]; + var3 = this.field492[trackId]; } if (var3 != 240 && var3 != 247) { - return this.method167(var1, var3); + return this.method167(trackId, var3); } else { int var4 = this.buffer.method52(); if (var3 == 247 && var4 > 0) { int var5 = this.buffer.array[this.buffer.index] & 255; if (var5 >= 241 && var5 <= 243 || var5 == 246 || var5 == 248 || var5 >= 250 && var5 <= 252 || var5 == 254) { ++this.buffer.index; - this.field492[var1] = var5; - return this.method167(var1, var5); + this.field492[trackId] = var5; + return this.method167(trackId, var5); } } - Buffer var10000 = this.buffer; - var10000.index += var4; + Buffer var6 = this.buffer; + var6.index += var4; return 0; } } @@ -168,25 +168,25 @@ public class MidiFileReader { int method167(int var1, int var2) { int var3; if (var2 == 255) { - int var7 = this.buffer.readUnsignedByte(); + int var8 = this.buffer.readUnsignedByte(); var3 = this.buffer.method52(); - Buffer var10000; - if (var7 == 47) { - var10000 = this.buffer; - var10000.index += var3; + Buffer var5; + if (var8 == 47) { + var5 = this.buffer; + var5.index += var3; return 1; - } else if (var7 == 81) { - int var5 = this.buffer.readMedium(); + } else if (var8 == 81) { + int var6 = this.buffer.readMedium(); var3 -= 3; - int var6 = this.trackLengths[var1]; - this.field494 += (long)var6 * (long)(this.field493 - var5); - this.field493 = var5; - var10000 = this.buffer; - var10000.index += var3; + int var7 = this.trackLengths[var1]; + this.field494 += (long)var7 * (long)(this.field493 - var6); + this.field493 = var6; + var5 = this.buffer; + var5.index += var3; return 2; } else { - var10000 = this.buffer; - var10000.index += var3; + var5 = this.buffer; + var5.index += var3; return 3; } } else { diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java index 69bacc7cec..8ecb60c956 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -150,15 +150,15 @@ public class MidiPcmStream extends PcmStream { garbageValue = "-324121369" ) @Export("loadMusicTrack") - public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { - var1.method226(); + public synchronized boolean loadMusicTrack(MusicTrack musicTrack, AbstractArchive var2, SoundCache var3, int frequency) { + musicTrack.method226(); boolean var5 = true; int[] var6 = null; - if (var4 > 0) { - var6 = new int[]{var4}; + if (frequency > 0) { + var6 = new int[]{frequency}; } - for (ByteArrayNode var7 = (ByteArrayNode)var1.table.first(); var7 != null; var7 = (ByteArrayNode)var1.table.next()) { + for (ByteArrayNode var7 = (ByteArrayNode)musicTrack.table.first(); var7 != null; var7 = (ByteArrayNode)musicTrack.table.next()) { int var8 = (int)var7.key; MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)var8); if (var9 == null) { @@ -177,7 +177,7 @@ public class MidiPcmStream extends PcmStream { } if (var5) { - var1.clear(); + musicTrack.clear(); } return var5; @@ -233,7 +233,7 @@ public class MidiPcmStream extends PcmStream { } @ObfuscatedName("e") - protected synchronized void vmethod263(int[] var1, int var2, int var3) { + protected synchronized void fill(int[] var1, int var2, int var3) { if (this.midiFile.isReady()) { int var4 = this.midiFile.division * this.field496 / class309.PcmPlayer_sampleRate; @@ -246,14 +246,14 @@ public class MidiPcmStream extends PcmStream { int var7 = (int)(((long)var4 + (this.field516 - this.field515) - 1L) / (long)var4); this.field515 += (long)var4 * (long)var7; - this.patchStream.vmethod263(var1, var2, var7); + this.patchStream.fill(var1, var2, var7); var2 += var7; var3 -= var7; this.method194(); } while(this.midiFile.isReady()); } - this.patchStream.vmethod263(var1, var2, var3); + this.patchStream.fill(var1, var2, var3); } @ObfuscatedName("x") @@ -262,9 +262,9 @@ public class MidiPcmStream extends PcmStream { garbageValue = "-1859383102" ) @Export("setMusicTrack") - public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { + public synchronized void setMusicTrack(MusicTrack musicTrack, boolean var2) { this.clear(); - this.midiFile.parse(var1.midi); + this.midiFile.parse(musicTrack.midi); this.field514 = var2; this.field515 = 0L; int var3 = this.midiFile.trackCount(); @@ -281,7 +281,7 @@ public class MidiPcmStream extends PcmStream { } @ObfuscatedName("d") - protected synchronized void vmethod264(int var1) { + protected synchronized void skip(int var1) { if (this.midiFile.isReady()) { int var2 = this.midiFile.division * this.field496 / class309.PcmPlayer_sampleRate; @@ -294,13 +294,13 @@ public class MidiPcmStream extends PcmStream { int var5 = (int)(((long)var2 + (this.field516 - this.field515) - 1L) / (long)var2); this.field515 += (long)var5 * (long)var2; - this.patchStream.vmethod264(var5); + this.patchStream.skip(var5); var1 -= var5; this.method194(); } while(this.midiFile.isReady()); } - this.patchStream.vmethod264(var1); + this.patchStream.skip(var1); } @ObfuscatedName("a") @@ -703,25 +703,25 @@ public class MidiPcmStream extends PcmStream { this.field499[var3] = var5 + (this.field499[var3] & -128); } - int[] var10000; + int[] var6; if (var4 == 64) { if (var5 >= 64) { - var10000 = this.field506; - var10000[var3] |= 1; + var6 = this.field506; + var6[var3] |= 1; } else { - var10000 = this.field506; - var10000[var3] &= -2; + var6 = this.field506; + var6[var3] &= -2; } } if (var4 == 65) { if (var5 >= 64) { - var10000 = this.field506; - var10000[var3] |= 2; + var6 = this.field506; + var6[var3] |= 2; } else { this.method187(var3); - var10000 = this.field506; - var10000[var3] &= -3; + var6 = this.field506; + var6[var3] &= -3; } } @@ -753,17 +753,17 @@ public class MidiPcmStream extends PcmStream { this.method185(var3); } - int var6; + int var7; if (var4 == 6) { - var6 = this.field507[var3]; - if (var6 == 16384) { + var7 = this.field507[var3]; + if (var7 == 16384) { this.field508[var3] = (var5 << 7) + (this.field508[var3] & -16257); } } if (var4 == 38) { - var6 = this.field507[var3]; - if (var6 == 16384) { + var7 = this.field507[var3]; + if (var7 == 16384) { this.field508[var3] = var5 + (this.field508[var3] & -128); } } @@ -778,12 +778,12 @@ public class MidiPcmStream extends PcmStream { if (var4 == 81) { if (var5 >= 64) { - var10000 = this.field506; - var10000[var3] |= 4; + var6 = this.field506; + var6[var3] |= 4; } else { this.method188(var3); - var10000 = this.field506; - var10000[var3] &= -5; + var6 = this.field506; + var6[var3] &= -5; } } @@ -1040,9 +1040,9 @@ public class MidiPcmStream extends PcmStream { if (var7) { var1.stream.method275(var1.field590); if (var2 != null) { - var1.stream.vmethod263(var2, var3, var4); + var1.stream.fill(var2, var3, var4); } else { - var1.stream.vmethod264(var4); + var1.stream.skip(var4); } if (var1.stream.method279()) { @@ -1079,13 +1079,13 @@ public class MidiPcmStream extends PcmStream { garbageValue = "30" ) @Export("PcmStream_disable") - static final void PcmStream_disable(PcmStream var0) { - var0.active = false; - if (var0.sound != null) { - var0.sound.position = 0; + static final void PcmStream_disable(PcmStream stream) { + stream.active = false; + if (stream.sound != null) { + stream.sound.position = 0; } - for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { + for (PcmStream var1 = stream.firstSubStream(); var1 != null; var1 = stream.nextSubStream()) { PcmStream_disable(var1); } diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 0693a0531c..8c7e5bb61e 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -73,7 +73,7 @@ public class MilliClock extends Clock { garbageValue = "-126803683" ) @Export("wait") - public int wait(int var1, int var2) { + public int wait(int cycleMs, int minSleepMs) { int var3 = this.field518; int var4 = this.field519; this.field518 = 300; @@ -83,7 +83,7 @@ public class MilliClock extends Clock { this.field518 = var3; this.field519 = var4; } else if (this.field520 > this.field517[this.field522]) { - this.field518 = (int)((long)(var1 * 2560) / (this.field520 - this.field517[this.field522])); + this.field518 = (int)((long)(cycleMs * 2560) / (this.field520 - this.field517[this.field522])); } if (this.field518 < 25) { @@ -92,11 +92,11 @@ public class MilliClock extends Clock { if (this.field518 > 256) { this.field518 = 256; - this.field519 = (int)((long)var1 - (this.field520 - this.field517[this.field522]) / 10L); + this.field519 = (int)((long)cycleMs - (this.field520 - this.field517[this.field522]) / 10L); } - if (this.field519 > var1) { - this.field519 = var1; + if (this.field519 > cycleMs) { + this.field519 = cycleMs; } this.field517[this.field522] = this.field520; @@ -105,14 +105,14 @@ public class MilliClock extends Clock { if (this.field519 > 1) { for (var5 = 0; var5 < 10; ++var5) { if (this.field517[var5] != 0L) { - long[] var10000 = this.field517; - var10000[var5] += (long)this.field519; + long[] var6 = this.field517; + var6[var5] += (long)this.field519; } } } - if (this.field519 < var2) { - this.field519 = var2; + if (this.field519 < minSleepMs) { + this.field519 = minSleepMs; } class203.method4010((long)this.field519); diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index c3b75ed38f..337cb289dd 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -516,7 +516,7 @@ public class Model extends Entity { @ObfuscatedName("o") @Export("calculateBoundingBox") - void calculateBoundingBox(int var1) { + void calculateBoundingBox(int yaw) { if (this.xMidOffset == -1) { int var2 = 0; int var3 = 0; @@ -524,8 +524,8 @@ public class Model extends Entity { int var5 = 0; int var6 = 0; int var7 = 0; - int var8 = Model_cosine[var1]; - int var9 = Model_sine[var1]; + int var8 = Model_cosine[yaw]; + int var9 = Model_sine[yaw]; for (int var10 = 0; var10 < this.verticesCount; ++var10) { int var11 = Rasterizer3D.method3039(this.verticesX[var10], this.verticesZ[var10], var8, var9); @@ -653,9 +653,9 @@ public class Model extends Entity { signature = "(Len;I)V" ) @Export("animate") - public void animate(Frames var1, int var2) { - if (this.vertexLabels != null && var2 != -1) { - Animation var3 = var1.frames[var2]; + public void animate(Frames frames, int frame) { + if (this.vertexLabels != null && frame != -1) { + Animation var3 = frames.frames[frame]; Skeleton var4 = var3.skeleton; Model_transformTempX = 0; Model_transformTempY = 0; @@ -726,22 +726,23 @@ public class Model extends Entity { @ObfuscatedName("z") @Export("transform") - void transform(int var1, int[] var2, int var3, int var4, int var5) { - int var6 = var2.length; + void transform(int type, int[] labels, int var3, int var4, int var5) { + int var6 = labels.length; int var7; int var8; int var9; int var10; - if (var1 == 0) { + int[] var12; + if (type == 0) { var7 = 0; Model_transformTempX = 0; Model_transformTempY = 0; Model_transformTempZ = 0; for (var8 = 0; var8 < var6; ++var8) { - int var11 = var2[var8]; + int var11 = labels[var8]; if (var11 < this.vertexLabels.length) { - int[] var12 = this.vertexLabels[var11]; + var12 = this.vertexLabels[var11]; for (var9 = 0; var9 < var12.length; ++var9) { var10 = var12[var9]; @@ -763,113 +764,112 @@ public class Model extends Entity { Model_transformTempZ = var5; } } else { - int[] var10000; - int[] var18; - int var19; - if (var1 == 1) { + int var13; + int[] var19; + if (type == 1) { for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; + var8 = labels[var7]; if (var8 < this.vertexLabels.length) { - var18 = this.vertexLabels[var8]; + var12 = this.vertexLabels[var8]; - for (var19 = 0; var19 < var18.length; ++var19) { - var9 = var18[var19]; - var10000 = this.verticesX; - var10000[var9] += var3; - var10000 = this.verticesY; - var10000[var9] += var4; - var10000 = this.verticesZ; - var10000[var9] += var5; + for (var13 = 0; var13 < var12.length; ++var13) { + var9 = var12[var13]; + var19 = this.verticesX; + var19[var9] += var3; + var19 = this.verticesY; + var19[var9] += var4; + var19 = this.verticesZ; + var19[var9] += var5; } } } - } else if (var1 == 2) { + } else if (type == 2) { for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; + var8 = labels[var7]; if (var8 < this.vertexLabels.length) { - var18 = this.vertexLabels[var8]; + var12 = this.vertexLabels[var8]; - for (var19 = 0; var19 < var18.length; ++var19) { - var9 = var18[var19]; - var10000 = this.verticesX; - var10000[var9] -= Model_transformTempX; - var10000 = this.verticesY; - var10000[var9] -= Model_transformTempY; - var10000 = this.verticesZ; - var10000[var9] -= Model_transformTempZ; + for (var13 = 0; var13 < var12.length; ++var13) { + var9 = var12[var13]; + var19 = this.verticesX; + var19[var9] -= Model_transformTempX; + var19 = this.verticesY; + var19[var9] -= Model_transformTempY; + var19 = this.verticesZ; + var19[var9] -= Model_transformTempZ; var10 = (var3 & 255) * 8; - int var13 = (var4 & 255) * 8; - int var14 = (var5 & 255) * 8; - int var15; + int var14 = (var4 & 255) * 8; + int var15 = (var5 & 255) * 8; int var16; int var17; - if (var14 != 0) { - var15 = Model_sine[var14]; - var16 = Model_cosine[var14]; - var17 = var15 * this.verticesY[var9] + var16 * this.verticesX[var9] >> 16; - this.verticesY[var9] = var16 * this.verticesY[var9] - var15 * this.verticesX[var9] >> 16; - this.verticesX[var9] = var17; + int var18; + if (var15 != 0) { + var16 = Model_sine[var15]; + var17 = Model_cosine[var15]; + var18 = var16 * this.verticesY[var9] + var17 * this.verticesX[var9] >> 16; + this.verticesY[var9] = var17 * this.verticesY[var9] - var16 * this.verticesX[var9] >> 16; + this.verticesX[var9] = var18; } if (var10 != 0) { - var15 = Model_sine[var10]; - var16 = Model_cosine[var10]; - var17 = var16 * this.verticesY[var9] - var15 * this.verticesZ[var9] >> 16; - this.verticesZ[var9] = var15 * this.verticesY[var9] + var16 * this.verticesZ[var9] >> 16; - this.verticesY[var9] = var17; + var16 = Model_sine[var10]; + var17 = Model_cosine[var10]; + var18 = var17 * this.verticesY[var9] - var16 * this.verticesZ[var9] >> 16; + this.verticesZ[var9] = var16 * this.verticesY[var9] + var17 * this.verticesZ[var9] >> 16; + this.verticesY[var9] = var18; } - if (var13 != 0) { - var15 = Model_sine[var13]; - var16 = Model_cosine[var13]; - var17 = var15 * this.verticesZ[var9] + var16 * this.verticesX[var9] >> 16; - this.verticesZ[var9] = var16 * this.verticesZ[var9] - var15 * this.verticesX[var9] >> 16; - this.verticesX[var9] = var17; + if (var14 != 0) { + var16 = Model_sine[var14]; + var17 = Model_cosine[var14]; + var18 = var16 * this.verticesZ[var9] + var17 * this.verticesX[var9] >> 16; + this.verticesZ[var9] = var17 * this.verticesZ[var9] - var16 * this.verticesX[var9] >> 16; + this.verticesX[var9] = var18; } - var10000 = this.verticesX; - var10000[var9] += Model_transformTempX; - var10000 = this.verticesY; - var10000[var9] += Model_transformTempY; - var10000 = this.verticesZ; - var10000[var9] += Model_transformTempZ; + var19 = this.verticesX; + var19[var9] += Model_transformTempX; + var19 = this.verticesY; + var19[var9] += Model_transformTempY; + var19 = this.verticesZ; + var19[var9] += Model_transformTempZ; } } } - } else if (var1 == 3) { + } else if (type == 3) { for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; + var8 = labels[var7]; if (var8 < this.vertexLabels.length) { - var18 = this.vertexLabels[var8]; + var12 = this.vertexLabels[var8]; - for (var19 = 0; var19 < var18.length; ++var19) { - var9 = var18[var19]; - var10000 = this.verticesX; - var10000[var9] -= Model_transformTempX; - var10000 = this.verticesY; - var10000[var9] -= Model_transformTempY; - var10000 = this.verticesZ; - var10000[var9] -= Model_transformTempZ; + for (var13 = 0; var13 < var12.length; ++var13) { + var9 = var12[var13]; + var19 = this.verticesX; + var19[var9] -= Model_transformTempX; + var19 = this.verticesY; + var19[var9] -= Model_transformTempY; + var19 = this.verticesZ; + var19[var9] -= Model_transformTempZ; this.verticesX[var9] = var3 * this.verticesX[var9] / 128; this.verticesY[var9] = var4 * this.verticesY[var9] / 128; this.verticesZ[var9] = var5 * this.verticesZ[var9] / 128; - var10000 = this.verticesX; - var10000[var9] += Model_transformTempX; - var10000 = this.verticesY; - var10000[var9] += Model_transformTempY; - var10000 = this.verticesZ; - var10000[var9] += Model_transformTempZ; + var19 = this.verticesX; + var19[var9] += Model_transformTempX; + var19 = this.verticesY; + var19[var9] += Model_transformTempY; + var19 = this.verticesZ; + var19[var9] += Model_transformTempZ; } } } - } else if (var1 == 5 && this.faceLabelsAlpha != null && this.faceAlphas != null) { + } else if (type == 5 && this.faceLabelsAlpha != null && this.faceAlphas != null) { for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; + var8 = labels[var7]; if (var8 < this.faceLabelsAlpha.length) { - var18 = this.faceLabelsAlpha[var8]; + var12 = this.faceLabelsAlpha[var8]; - for (var19 = 0; var19 < var18.length; ++var19) { - var9 = var18[var19]; + for (var13 = 0; var13 < var12.length; ++var13) { + var9 = var12[var13]; var10 = (this.faceAlphas[var9] & 255) + var3 * 8; if (var10 < 0) { var10 = 0; @@ -923,9 +923,9 @@ public class Model extends Entity { @ObfuscatedName("y") @Export("rotateZ") - public void rotateZ(int var1) { - int var2 = Model_sine[var1]; - int var3 = Model_cosine[var1]; + public void rotateZ(int pitch) { + int var2 = Model_sine[pitch]; + int var3 = Model_cosine[pitch]; for (int var4 = 0; var4 < this.verticesCount; ++var4) { int var5 = var3 * this.verticesY[var4] - var2 * this.verticesZ[var4] >> 16; @@ -938,14 +938,14 @@ public class Model extends Entity { @ObfuscatedName("h") @Export("offsetBy") - public void offsetBy(int var1, int var2, int var3) { + public void offsetBy(int x, int y, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { - int[] var10000 = this.verticesX; - var10000[var4] += var1; - var10000 = this.verticesY; - var10000[var4] += var2; - var10000 = this.verticesZ; - var10000[var4] += var3; + int[] var5 = this.verticesX; + var5[var4] += x; + var5 = this.verticesY; + var5[var4] += y; + var5 = this.verticesZ; + var5[var4] += var3; } this.resetBounds(); @@ -953,10 +953,10 @@ public class Model extends Entity { @ObfuscatedName("b") @Export("scale") - public void scale(int var1, int var2, int var3) { + public void scale(int x, int y, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { - this.verticesX[var4] = this.verticesX[var4] * var1 / 128; - this.verticesY[var4] = var2 * this.verticesY[var4] / 128; + this.verticesX[var4] = this.verticesX[var4] * x / 128; + this.verticesY[var4] = y * this.verticesY[var4] / 128; this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; } @@ -1184,6 +1184,7 @@ public class Model extends Entity { field535[var7] = 0; } + int[] var30; for (var7 = this.diameter - 1; var7 >= 0; --var7) { var8 = field529[var7]; if (var8 > 0) { @@ -1195,8 +1196,8 @@ public class Model extends Entity { var12 = field531[var28]++; field532[var28][var12] = var10; if (var28 < 10) { - int[] var10000 = field535; - var10000[var28] += var7; + var30 = field535; + var30[var28] += var7; } else if (var28 == 10) { field533[var12] = var7; } else { @@ -1224,7 +1225,7 @@ public class Model extends Entity { var10 = 0; var11 = field531[10]; int[] var29 = field532[10]; - int[] var30 = field533; + var30 = field533; if (var10 == var11) { var10 = 0; var11 = field531[11]; @@ -1528,31 +1529,31 @@ public class Model extends Entity { @ObfuscatedName("cy") @Export("draw") - void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { + void draw(int yaw, int cameraPitchSine, int cameraPitchCosine, int cameraYawSine, int cameraYawCosine, int x, int y, int var8, long tag) { field529[0] = -1; if (this.boundsType != 1) { this.calculateBoundsCylinder(); } - this.calculateBoundingBox(var1); - int var11 = var5 * var8 - var4 * var6 >> 16; - int var12 = var2 * var7 + var3 * var11 >> 16; - int var13 = var3 * this.xzRadius >> 16; + this.calculateBoundingBox(yaw); + int var11 = cameraYawCosine * var8 - cameraYawSine * x >> 16; + int var12 = cameraPitchSine * y + cameraPitchCosine * var11 >> 16; + int var13 = cameraPitchCosine * this.xzRadius >> 16; int var14 = var12 + var13; if (var14 > 50 && var12 < 3500) { - int var15 = var8 * var4 + var5 * var6 >> 16; + int var15 = var8 * cameraYawSine + cameraYawCosine * x >> 16; int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; if (var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) { int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; if (var17 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidX) { - int var18 = var3 * var7 - var11 * var2 >> 16; - int var19 = var2 * this.xzRadius >> 16; + int var18 = cameraPitchCosine * y - var11 * cameraPitchSine >> 16; + int var19 = cameraPitchSine * this.xzRadius >> 16; int var20 = (var18 + var19) * Rasterizer3D.Rasterizer3D_zoom; if (var20 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) { - int var21 = (var3 * super.height >> 16) + var19; + int var21 = (cameraPitchCosine * super.height >> 16) + var19; int var22 = (var18 - var21) * Rasterizer3D.Rasterizer3D_zoom; if (var22 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) { - int var23 = var13 + (var2 * super.height >> 16); + int var23 = var13 + (cameraPitchSine * super.height >> 16); boolean var24 = false; boolean var25 = false; if (var12 - var23 <= 50) { @@ -1563,10 +1564,10 @@ public class Model extends Entity { int var27 = ViewportMouse.ViewportMouse_x; int var28 = ViewportMouse.ViewportMouse_y; boolean var29 = ViewportMouse.ViewportMouse_isInViewport; - boolean var30 = 0L != var9; + boolean var30 = 0L != tag; boolean var31; if (var30) { - var31 = (int)(var9 >>> 16 & 1L) == 1; + var31 = (int)(tag >>> 16 & 1L) == 1; var30 = !var31; } @@ -1577,7 +1578,7 @@ public class Model extends Entity { if (var30 && var29) { boolean var35 = false; if (field539) { - var35 = Decimator.method2491(this, var6, var7, var8); + var35 = Decimator.method2491(this, x, y, var8); } else { var32 = var12 - var13; if (var32 <= 50) { @@ -1609,7 +1610,7 @@ public class Model extends Entity { if (var35) { if (this.isSingleTile) { - Projectile.addEntityTagAtMouse(var9); + Projectile.addEntityTagAtMouse(tag); } else { var31 = true; } @@ -1620,9 +1621,9 @@ public class Model extends Entity { var32 = Rasterizer3D.Rasterizer3D_clipMidY; var33 = 0; var34 = 0; - if (var1 != 0) { - var33 = Model_sine[var1]; - var34 = Model_cosine[var1]; + if (yaw != 0) { + var33 = Model_sine[yaw]; + var34 = Model_cosine[yaw]; } for (int var36 = 0; var36 < this.verticesCount; ++var36) { @@ -1630,20 +1631,20 @@ public class Model extends Entity { int var38 = this.verticesY[var36]; int var39 = this.verticesZ[var36]; int var40; - if (var1 != 0) { + if (yaw != 0) { var40 = var39 * var33 + var37 * var34 >> 16; var39 = var39 * var34 - var37 * var33 >> 16; var37 = var40; } - var37 += var6; - var38 += var7; + var37 += x; + var38 += y; var39 += var8; - var40 = var39 * var4 + var5 * var37 >> 16; - var39 = var5 * var39 - var37 * var4 >> 16; + var40 = var39 * cameraYawSine + cameraYawCosine * var37 >> 16; + var39 = cameraYawCosine * var39 - var37 * cameraYawSine >> 16; var37 = var40; - var40 = var3 * var38 - var39 * var2 >> 16; - var39 = var38 * var2 + var3 * var39 >> 16; + var40 = cameraPitchCosine * var38 - var39 * cameraPitchSine >> 16; + var39 = var38 * cameraPitchSine + cameraPitchCosine * var39 >> 16; field525[var36] = var39 - var12; if (var39 >= 50) { modelViewportXs[var36] = var37 * Rasterizer3D.Rasterizer3D_zoom / var39 + var42; @@ -1661,7 +1662,7 @@ public class Model extends Entity { } try { - this.draw0(var24, var31, this.isSingleTile, var9); + this.draw0(var24, var31, this.isSingleTile, tag); } catch (Exception var41) { } } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index 7aed6dfdd3..f466b29af9 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -1119,30 +1119,30 @@ public class ModelData extends Entity { void method208() { int[] var1; int var2; - int var10002; - int var3; + int var10003; int var4; + int var5; if (this.field555 != null) { var1 = new int[256]; var2 = 0; - for (var3 = 0; var3 < this.verticesCount; ++var3) { - var4 = this.field555[var3]; - var10002 = var1[var4]++; - if (var4 > var2) { - var2 = var4; + for (var4 = 0; var4 < this.verticesCount; ++var4) { + var5 = this.field555[var4]; + var10003 = var1[var5]++; + if (var5 > var2) { + var2 = var5; } } this.vertexLabels = new int[var2 + 1][]; - for (var3 = 0; var3 <= var2; ++var3) { - this.vertexLabels[var3] = new int[var1[var3]]; - var1[var3] = 0; + for (var4 = 0; var4 <= var2; ++var4) { + this.vertexLabels[var4] = new int[var1[var4]]; + var1[var4] = 0; } - for (var3 = 0; var3 < this.verticesCount; this.vertexLabels[var4][var1[var4]++] = var3++) { - var4 = this.field555[var3]; + for (var4 = 0; var4 < this.verticesCount; this.vertexLabels[var5][var1[var5]++] = var4++) { + var5 = this.field555[var4]; } this.field555 = null; @@ -1152,23 +1152,23 @@ public class ModelData extends Entity { var1 = new int[256]; var2 = 0; - for (var3 = 0; var3 < this.faceCount; ++var3) { - var4 = this.field556[var3]; - var10002 = var1[var4]++; - if (var4 > var2) { - var2 = var4; + for (var4 = 0; var4 < this.faceCount; ++var4) { + var5 = this.field556[var4]; + var10003 = var1[var5]++; + if (var5 > var2) { + var2 = var5; } } this.faceLabelsAlpha = new int[var2 + 1][]; - for (var3 = 0; var3 <= var2; ++var3) { - this.faceLabelsAlpha[var3] = new int[var1[var3]]; - var1[var3] = 0; + for (var4 = 0; var4 <= var2; ++var4) { + this.faceLabelsAlpha[var4] = new int[var1[var4]]; + var1[var4] = 0; } - for (var3 = 0; var3 < this.faceCount; this.faceLabelsAlpha[var4][var1[var4]++] = var3++) { - var4 = this.field556[var3]; + for (var4 = 0; var4 < this.faceCount; this.faceLabelsAlpha[var5][var1[var5]++] = var4++) { + var5 = this.field556[var4]; } this.field556 = null; @@ -1225,12 +1225,12 @@ public class ModelData extends Entity { @ObfuscatedName("z") public void method213(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { - int[] var10000 = this.verticesX; - var10000[var4] += var1; - var10000 = this.verticesY; - var10000[var4] += var2; - var10000 = this.verticesZ; - var10000[var4] += var3; + int[] var5 = this.verticesX; + var5[var4] += var1; + var5 = this.verticesY; + var5[var4] += var2; + var5 = this.verticesZ; + var5[var4] += var3; } this.invalidate(); @@ -1238,9 +1238,9 @@ public class ModelData extends Entity { @ObfuscatedName("j") @Export("recolor") - public void recolor(short var1, short var2) { + public void recolor(short from, short var2) { for (int var3 = 0; var3 < this.faceCount; ++var3) { - if (this.faceColors[var3] == var1) { + if (this.faceColors[var3] == from) { this.faceColors[var3] = var2; } } @@ -1249,10 +1249,10 @@ public class ModelData extends Entity { @ObfuscatedName("s") @Export("retexture") - public void retexture(short var1, short var2) { + public void retexture(short from, short var2) { if (this.faceTextures != null) { for (int var3 = 0; var3 < this.faceCount; ++var3) { - if (this.faceTextures[var3] == var1) { + if (this.faceTextures[var3] == from) { this.faceTextures[var3] = var2; } } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index d7f7c7f983..f3e1510f7e 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -136,9 +136,9 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi garbageValue = "-965288682" ) @Export("getButton") - final int getButton(MouseEvent var1) { - int var2 = var1.getButton(); - return !var1.isAltDown() && var2 != 2 ? (!var1.isMetaDown() && var2 != 3 ? 1 : 2) : 4; + final int getButton(MouseEvent mouseEvent) { + int var2 = mouseEvent.getButton(); + return !mouseEvent.isAltDown() && var2 != 2 ? (!mouseEvent.isMetaDown() && var2 != 3 ? 1 : 2) : 4; } @Export("mouseMoved") diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index 488b96e0c2..179481d4be 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -80,32 +80,32 @@ public class MouseRecorder implements Runnable { int var10; int var11; int var12; - int var17; + int var13; if (var5 != 0L) { var7 = class65.scene.getObjectFlags(var0, var1, var2, var5); var8 = var7 >> 6 & 3; var9 = var7 & 31; var10 = var3; - boolean var13 = var5 != 0L; - if (var13) { - boolean var14 = (int)(var5 >>> 16 & 1L) == 1; - var13 = !var14; + boolean var14 = var5 != 0L; + if (var14) { + boolean var15 = (int)(var5 >>> 16 & 1L) == 1; + var14 = !var15; } - if (var13) { + if (var14) { var10 = var4; } int[] var20 = InterfaceParent.sceneMinimapSprite.pixels; var12 = var1 * 4 + (103 - var2) * 2048 + 24624; var11 = HitSplatDefinition.method4972(var5); - ObjectDefinition var15 = class50.getObjectDefinition(var11); - if (var15.mapSceneId != -1) { - IndexedSprite var16 = class192.mapSceneSprites[var15.mapSceneId]; - if (var16 != null) { - var17 = (var15.sizeX * 4 - var16.subWidth) / 2; - int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; - var16.drawAt(var1 * 4 + var17 + 48, (104 - var2 - var15.sizeY) * 4 + var18 + 48); + ObjectDefinition var16 = class50.getObjectDefinition(var11); + if (var16.mapSceneId != -1) { + IndexedSprite var17 = class192.mapSceneSprites[var16.mapSceneId]; + if (var17 != null) { + var13 = (var16.sizeX * 4 - var17.subWidth) / 2; + int var18 = (var16.sizeY * 4 - var17.subHeight) / 2; + var17.drawAt(var1 * 4 + var13 + 48, (104 - var2 - var16.sizeY) * 4 + var18 + 48); } } else { if (var9 == 0 || var9 == 2) { @@ -173,6 +173,7 @@ public class MouseRecorder implements Runnable { var5 = class65.scene.method292(var0, var1, var2); ObjectDefinition var19; IndexedSprite var21; + int var22; if (0L != var5) { var7 = class65.scene.getObjectFlags(var0, var1, var2, var5); var8 = var7 >> 6 & 3; @@ -187,7 +188,7 @@ public class MouseRecorder implements Runnable { var21.drawAt(var12 + var1 * 4 + 48, (104 - var2 - var19.sizeY) * 4 + var11 + 48); } } else if (var9 == 9) { - int var22 = 15658734; + var22 = 15658734; boolean var23 = 0L != var5; if (var23) { boolean var24 = (int)(var5 >>> 16 & 1L) == 1; @@ -198,18 +199,18 @@ public class MouseRecorder implements Runnable { var22 = 15597568; } - int[] var26 = InterfaceParent.sceneMinimapSprite.pixels; - var17 = var1 * 4 + (103 - var2) * 2048 + 24624; + int[] var25 = InterfaceParent.sceneMinimapSprite.pixels; + var13 = var1 * 4 + (103 - var2) * 2048 + 24624; if (var8 != 0 && var8 != 2) { - var26[var17] = var22; - var26[var17 + 1 + 512] = var22; - var26[var17 + 1024 + 2] = var22; - var26[var17 + 1536 + 3] = var22; + var25[var13] = var22; + var25[var13 + 1 + 512] = var22; + var25[var13 + 1024 + 2] = var22; + var25[var13 + 1536 + 3] = var22; } else { - var26[var17 + 1536] = var22; - var26[var17 + 1 + 1024] = var22; - var26[var17 + 512 + 2] = var22; - var26[var17 + 3] = var22; + var25[var13 + 1536] = var22; + var25[var13 + 1 + 1024] = var22; + var25[var13 + 512 + 2] = var22; + var25[var13 + 3] = var22; } } } @@ -222,8 +223,8 @@ public class MouseRecorder implements Runnable { var21 = class192.mapSceneSprites[var19.mapSceneId]; if (var21 != null) { var10 = (var19.sizeX * 4 - var21.subWidth) / 2; - int var25 = (var19.sizeY * 4 - var21.subHeight) / 2; - var21.drawAt(var10 + var1 * 4 + 48, var25 + (104 - var2 - var19.sizeY) * 4 + 48); + var22 = (var19.sizeY * 4 - var21.subHeight) / 2; + var21.drawAt(var10 + var1 * 4 + 48, var22 + (104 - var2 - var19.sizeY) * 4 + 48); } } } diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index 62907185a1..008e033335 100644 --- a/runescape-client/src/main/java/MouseWheelHandler.java +++ b/runescape-client/src/main/java/MouseWheelHandler.java @@ -27,8 +27,8 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { garbageValue = "-28" ) @Export("addTo") - void addTo(Component var1) { - var1.addMouseWheelListener(this); + void addTo(Component component) { + component.addMouseWheelListener(this); } @ObfuscatedName("f") @@ -37,8 +37,8 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { garbageValue = "-544062729" ) @Export("removeFrom") - void removeFrom(Component var1) { - var1.removeMouseWheelListener(this); + void removeFrom(Component component) { + component.removeMouseWheelListener(this); } @ObfuscatedName("q") diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index 2109c5b68a..7b349d936c 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -56,7 +56,7 @@ public class MusicPatchPcmStream extends PcmStream { break; } - var1.stream.vmethod263(var2, var3, var7); + var1.stream.fill(var2, var3, var7); var3 += var7; var4 -= var7; var1.field591 += var7 * var6 - 1048576; @@ -80,14 +80,14 @@ public class MusicPatchPcmStream extends PcmStream { } var10.method275(var8); - var10.vmethod263(var2, var3, var5 - var3); + var10.fill(var2, var3, var5 - var3); if (var10.method279()) { this.mixer.addSubStream(var10); } } } - var1.stream.vmethod263(var2, var3, var4); + var1.stream.fill(var2, var3, var4); } @ObfuscatedName("f") @@ -116,7 +116,7 @@ public class MusicPatchPcmStream extends PcmStream { } } - var1.stream.vmethod264(var2); + var1.stream.skip(var2); } @ObfuscatedName("u") @@ -152,8 +152,8 @@ public class MusicPatchPcmStream extends PcmStream { } @ObfuscatedName("e") - protected void vmethod263(int[] var1, int var2, int var3) { - this.mixer.vmethod263(var1, var2, var3); + protected void fill(int[] var1, int var2, int var3) { + this.mixer.fill(var1, var2, var3); for (MusicPatchNode var4 = (MusicPatchNode)this.queue.last(); var4 != null; var4 = (MusicPatchNode)this.queue.previous()) { if (!this.superStream.method195(var4)) { @@ -177,8 +177,8 @@ public class MusicPatchPcmStream extends PcmStream { } @ObfuscatedName("d") - protected void vmethod264(int var1) { - this.mixer.vmethod264(var1); + protected void skip(int var1) { + this.mixer.skip(var1); for (MusicPatchNode var2 = (MusicPatchNode)this.queue.last(); var2 != null; var2 = (MusicPatchNode)this.queue.previous()) { if (!this.superStream.method195(var2)) { diff --git a/runescape-client/src/main/java/MusicSample.java b/runescape-client/src/main/java/MusicSample.java index f20f348b1d..48d701efb9 100644 --- a/runescape-client/src/main/java/MusicSample.java +++ b/runescape-client/src/main/java/MusicSample.java @@ -175,9 +175,10 @@ public class MusicSample extends Node { boolean var17 = !field1324[var16].method2367(); boolean var18 = var17; + float[] var20; for (var16 = 0; var16 < var14.field1453; ++var16) { class109 var19 = field1344[var14.field1455[var16]]; - float[] var20 = field611; + var20 = field611; var19.method2473(var20, var4 >> 1, var18); } @@ -188,9 +189,9 @@ public class MusicSample extends Node { field1324[var48].method2375(field611, var4 >> 1); } - float[] var21; + int var21; int var22; - int var49; + float[] var23; if (var17) { for (var16 = var4 >> 1; var16 < var4; ++var16) { field611[var16] = 0.0F; @@ -198,18 +199,18 @@ public class MusicSample extends Node { } else { var16 = var4 >> 1; var48 = var4 >> 2; - var49 = var4 >> 3; - var21 = field611; + var22 = var4 >> 3; + var20 = field611; - for (var22 = 0; var22 < var16; ++var22) { - var21[var22] *= 0.5F; + for (var21 = 0; var21 < var16; ++var21) { + var20[var21] *= 0.5F; } - for (var22 = var16; var22 < var4; ++var22) { - var21[var22] = -var21[var4 - var22 - 1]; + for (var21 = var16; var21 < var4; ++var21) { + var20[var21] = -var20[var4 - var21 - 1]; } - float[] var23 = var3 ? field615 : field612; + var23 = var3 ? field615 : field612; float[] var24 = var3 ? field616 : field613; float[] var25 = var3 ? field617 : field614; int[] var26 = var3 ? field619 : field618; @@ -220,27 +221,27 @@ public class MusicSample extends Node { float var30; float var31; for (var27 = 0; var27 < var48; ++var27) { - var28 = var21[var27 * 4] - var21[var4 - var27 * 4 - 1]; - var29 = var21[var27 * 4 + 2] - var21[var4 - var27 * 4 - 3]; + var28 = var20[var27 * 4] - var20[var4 - var27 * 4 - 1]; + var29 = var20[var27 * 4 + 2] - var20[var4 - var27 * 4 - 3]; var30 = var23[var27 * 2]; var31 = var23[var27 * 2 + 1]; - var21[var4 - var27 * 4 - 1] = var28 * var30 - var29 * var31; - var21[var4 - var27 * 4 - 3] = var28 * var31 + var29 * var30; + var20[var4 - var27 * 4 - 1] = var28 * var30 - var29 * var31; + var20[var4 - var27 * 4 - 3] = var28 * var31 + var29 * var30; } float var32; float var33; - for (var27 = 0; var27 < var49; ++var27) { - var28 = var21[var16 + var27 * 4 + 3]; - var29 = var21[var16 + var27 * 4 + 1]; - var30 = var21[var27 * 4 + 3]; - var31 = var21[var27 * 4 + 1]; - var21[var16 + var27 * 4 + 3] = var28 + var30; - var21[var16 + var27 * 4 + 1] = var29 + var31; + for (var27 = 0; var27 < var22; ++var27) { + var28 = var20[var16 + var27 * 4 + 3]; + var29 = var20[var16 + var27 * 4 + 1]; + var30 = var20[var27 * 4 + 3]; + var31 = var20[var27 * 4 + 1]; + var20[var16 + var27 * 4 + 3] = var28 + var30; + var20[var16 + var27 * 4 + 1] = var29 + var31; var32 = var23[var16 - 4 - var27 * 4]; var33 = var23[var16 - 3 - var27 * 4]; - var21[var27 * 4 + 3] = (var28 - var30) * var32 - (var29 - var31) * var33; - var21[var27 * 4 + 1] = (var29 - var31) * var32 + (var28 - var30) * var33; + var20[var27 * 4 + 3] = (var28 - var30) * var32 - (var29 - var31) * var33; + var20[var27 * 4 + 1] = (var29 - var31) * var32 + (var28 - var30) * var33; } var27 = WorldMapCacheName.method634(var4 - 1); @@ -259,127 +260,127 @@ public class MusicSample extends Node { for (int var40 = 0; var40 < var4 >> var34 + 4; ++var40) { int var41 = var40 * 4; - float var42 = var21[var38 - 1 - var41]; - float var43 = var21[var38 - 3 - var41]; - float var44 = var21[var39 - 1 - var41]; - float var45 = var21[var39 - 3 - var41]; - var21[var38 - 1 - var41] = var42 + var44; - var21[var38 - 3 - var41] = var43 + var45; + float var42 = var20[var38 - 1 - var41]; + float var43 = var20[var38 - 3 - var41]; + float var44 = var20[var39 - 1 - var41]; + float var45 = var20[var39 - 3 - var41]; + var20[var38 - 1 - var41] = var42 + var44; + var20[var38 - 3 - var41] = var43 + var45; float var46 = var23[var40 * var36]; float var47 = var23[var40 * var36 + 1]; - var21[var39 - 1 - var41] = (var42 - var44) * var46 - (var43 - var45) * var47; - var21[var39 - 3 - var41] = (var43 - var45) * var46 + (var42 - var44) * var47; + var20[var39 - 1 - var41] = (var42 - var44) * var46 - (var43 - var45) * var47; + var20[var39 - 3 - var41] = (var43 - var45) * var46 + (var42 - var44) * var47; } } } - for (var34 = 1; var34 < var49 - 1; ++var34) { + for (var34 = 1; var34 < var22 - 1; ++var34) { var35 = var26[var34]; if (var34 < var35) { var36 = var34 * 8; var37 = var35 * 8; - var32 = var21[var36 + 1]; - var21[var36 + 1] = var21[var37 + 1]; - var21[var37 + 1] = var32; - var32 = var21[var36 + 3]; - var21[var36 + 3] = var21[var37 + 3]; - var21[var37 + 3] = var32; - var32 = var21[var36 + 5]; - var21[var36 + 5] = var21[var37 + 5]; - var21[var37 + 5] = var32; - var32 = var21[var36 + 7]; - var21[var36 + 7] = var21[var37 + 7]; - var21[var37 + 7] = var32; + var32 = var20[var36 + 1]; + var20[var36 + 1] = var20[var37 + 1]; + var20[var37 + 1] = var32; + var32 = var20[var36 + 3]; + var20[var36 + 3] = var20[var37 + 3]; + var20[var37 + 3] = var32; + var32 = var20[var36 + 5]; + var20[var36 + 5] = var20[var37 + 5]; + var20[var37 + 5] = var32; + var32 = var20[var36 + 7]; + var20[var36 + 7] = var20[var37 + 7]; + var20[var37 + 7] = var32; } } for (var34 = 0; var34 < var16; ++var34) { - var21[var34] = var21[var34 * 2 + 1]; + var20[var34] = var20[var34 * 2 + 1]; } - for (var34 = 0; var34 < var49; ++var34) { - var21[var4 - 1 - var34 * 2] = var21[var34 * 4]; - var21[var4 - 2 - var34 * 2] = var21[var34 * 4 + 1]; - var21[var4 - var48 - 1 - var34 * 2] = var21[var34 * 4 + 2]; - var21[var4 - var48 - 2 - var34 * 2] = var21[var34 * 4 + 3]; + for (var34 = 0; var34 < var22; ++var34) { + var20[var4 - 1 - var34 * 2] = var20[var34 * 4]; + var20[var4 - 2 - var34 * 2] = var20[var34 * 4 + 1]; + var20[var4 - var48 - 1 - var34 * 2] = var20[var34 * 4 + 2]; + var20[var4 - var48 - 2 - var34 * 2] = var20[var34 * 4 + 3]; } - for (var34 = 0; var34 < var49; ++var34) { + for (var34 = 0; var34 < var22; ++var34) { var29 = var25[var34 * 2]; var30 = var25[var34 * 2 + 1]; - var31 = var21[var16 + var34 * 2]; - var32 = var21[var16 + var34 * 2 + 1]; - var33 = var21[var4 - 2 - var34 * 2]; - float var51 = var21[var4 - 1 - var34 * 2]; - float var52 = var30 * (var31 - var33) + var29 * (var32 + var51); - var21[var16 + var34 * 2] = (var31 + var33 + var52) * 0.5F; - var21[var4 - 2 - var34 * 2] = (var31 + var33 - var52) * 0.5F; - var52 = var30 * (var32 + var51) - var29 * (var31 - var33); - var21[var16 + var34 * 2 + 1] = (var32 - var51 + var52) * 0.5F; - var21[var4 - 1 - var34 * 2] = (-var32 + var51 + var52) * 0.5F; + var31 = var20[var16 + var34 * 2]; + var32 = var20[var16 + var34 * 2 + 1]; + var33 = var20[var4 - 2 - var34 * 2]; + float var49 = var20[var4 - 1 - var34 * 2]; + float var51 = var30 * (var31 - var33) + var29 * (var32 + var49); + var20[var16 + var34 * 2] = (var31 + var33 + var51) * 0.5F; + var20[var4 - 2 - var34 * 2] = (var31 + var33 - var51) * 0.5F; + var51 = var30 * (var32 + var49) - var29 * (var31 - var33); + var20[var16 + var34 * 2 + 1] = (var32 - var49 + var51) * 0.5F; + var20[var4 - 1 - var34 * 2] = (-var32 + var49 + var51) * 0.5F; } for (var34 = 0; var34 < var48; ++var34) { - var21[var34] = var21[var16 + var34 * 2] * var24[var34 * 2] + var21[var16 + var34 * 2 + 1] * var24[var34 * 2 + 1]; - var21[var16 - 1 - var34] = var21[var16 + var34 * 2] * var24[var34 * 2 + 1] - var21[var16 + var34 * 2 + 1] * var24[var34 * 2]; + var20[var34] = var20[var16 + var34 * 2] * var24[var34 * 2] + var20[var16 + var34 * 2 + 1] * var24[var34 * 2 + 1]; + var20[var16 - 1 - var34] = var20[var16 + var34 * 2] * var24[var34 * 2 + 1] - var20[var16 + var34 * 2 + 1] * var24[var34 * 2]; } for (var34 = 0; var34 < var48; ++var34) { - var21[var34 + (var4 - var48)] = -var21[var34]; + var20[var34 + (var4 - var48)] = -var20[var34]; } for (var34 = 0; var34 < var48; ++var34) { - var21[var34] = var21[var48 + var34]; + var20[var34] = var20[var48 + var34]; } for (var34 = 0; var34 < var48; ++var34) { - var21[var48 + var34] = -var21[var48 - var34 - 1]; + var20[var48 + var34] = -var20[var48 - var34 - 1]; } for (var34 = 0; var34 < var48; ++var34) { - var21[var16 + var34] = var21[var4 - var34 - 1]; + var20[var16 + var34] = var20[var4 - var34 - 1]; } - float[] var10000; + float[] var50; for (var34 = var8; var34 < var9; ++var34) { var29 = (float)Math.sin(((double)(var34 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); - var10000 = field611; - var10000[var34] *= (float)Math.sin(1.5707963267948966D * (double)var29 * (double)var29); + var50 = field611; + var50[var34] *= (float)Math.sin(1.5707963267948966D * (double)var29 * (double)var29); } for (var34 = var11; var34 < var12; ++var34) { var29 = (float)Math.sin(((double)(var34 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); - var10000 = field611; - var10000[var34] *= (float)Math.sin(1.5707963267948966D * (double)var29 * (double)var29); + var50 = field611; + var50[var34] *= (float)Math.sin(1.5707963267948966D * (double)var29 * (double)var29); } } - var21 = null; + var20 = null; if (this.field623 > 0) { var48 = var4 + this.field623 >> 2; - var21 = new float[var48]; + var20 = new float[var48]; if (!this.field625) { - for (var49 = 0; var49 < this.field624; ++var49) { - var22 = var49 + (this.field623 >> 1); - var21[var49] += this.field622[var22]; + for (var22 = 0; var22 < this.field624; ++var22) { + var21 = var22 + (this.field623 >> 1); + var20[var22] += this.field622[var21]; } } if (!var17) { - for (var49 = var8; var49 < var4 >> 1; ++var49) { - var22 = var21.length - (var4 >> 1) + var49; - var21[var22] += field611[var49]; + for (var22 = var8; var22 < var4 >> 1; ++var22) { + var21 = var20.length - (var4 >> 1) + var22; + var20[var21] += field611[var22]; } } } - float[] var50 = this.field622; + var23 = this.field622; this.field622 = field611; - field611 = var50; + field611 = var23; this.field623 = var4; this.field624 = var12 - (var4 >> 1); this.field625 = var17; - return var21; + return var20; } @ObfuscatedName("x") diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index b8f9870ea3..29b6330f94 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -127,7 +127,7 @@ public final class NPC extends Actor { return null; } else { SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapAreaData.getSequenceDefinition(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence == -1 || super.movementSequence == super.readySequence && var1 != null ? null : WorldMapAreaData.getSequenceDefinition(super.movementSequence); + SequenceDefinition var2 = super.movementSequence != -1 && (super.movementSequence != super.readySequence || var1 == null) ? WorldMapAreaData.getSequenceDefinition(super.movementSequence) : null; Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); if (var3 == null) { return null; diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index d7c216de4e..27dda9d57e 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -34,8 +34,8 @@ public class NanoClock extends Clock { garbageValue = "-126803683" ) @Export("wait") - public int wait(int var1, int var2) { - long var3 = 1000000L * (long)var2; + public int wait(int cycleMs, int minSleepMs) { + long var3 = 1000000L * (long)minSleepMs; long var5 = this.lastTimeNano - System.nanoTime(); if (var5 < var3) { var5 = var3; @@ -45,7 +45,7 @@ public class NanoClock extends Clock { long var7 = System.nanoTime(); int var9; - for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) { + for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)cycleMs) { ++var9; } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index 0bb6fbcfc5..4eafb433fe 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -95,8 +95,8 @@ public final class NetSocket extends AbstractSocket implements Runnable { garbageValue = "1765046516" ) @Export("isAvailable") - public boolean isAvailable(int var1) throws IOException { - return this.isClosed ? false : this.inputStream.available() >= var1; + public boolean isAvailable(int length) throws IOException { + return this.isClosed ? false : this.inputStream.available() >= length; } @ObfuscatedName("q") @@ -125,19 +125,19 @@ public final class NetSocket extends AbstractSocket implements Runnable { garbageValue = "-1089665746" ) @Export("read") - public int read(byte[] var1, int var2, int var3) throws IOException { + public int read(byte[] dst, int dstIndex, int length) throws IOException { if (this.isClosed) { return 0; } else { int var4; int var5; - for (var4 = var3; var3 > 0; var3 -= var5) { - var5 = this.inputStream.read(var1, var2, var3); + for (var4 = length; length > 0; length -= var5) { + var5 = this.inputStream.read(dst, dstIndex, length); if (var5 <= 0) { throw new EOFException(); } - var2 += var5; + dstIndex += var5; } return var4; @@ -150,8 +150,8 @@ public final class NetSocket extends AbstractSocket implements Runnable { garbageValue = "-86" ) @Export("write") - public void write(byte[] var1, int var2, int var3) throws IOException { - this.write0(var1, var2, var3); + public void write(byte[] src, int srcIndex, int length) throws IOException { + this.write0(src, srcIndex, length); } @ObfuscatedName("g") @@ -191,7 +191,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { garbageValue = "-77" ) @Export("write0") - void write0(byte[] var1, int var2, int var3) throws IOException { + void write0(byte[] src, int srcIndex, int length) throws IOException { if (!this.isClosed) { if (this.exceptionWriting) { this.exceptionWriting = false; @@ -203,8 +203,8 @@ public final class NetSocket extends AbstractSocket implements Runnable { } synchronized(this) { - for (int var5 = 0; var5 < var3; ++var5) { - this.array[this.field633] = var1[var5 + var2]; + for (int var5 = 0; var5 < length; ++var5) { + this.array[this.field633] = src[var5 + srcIndex]; this.field633 = (this.field633 + 1) % this.field634; if ((this.field635 + this.field632) % this.field634 == this.field633) { throw new IOException(); @@ -347,91 +347,92 @@ public final class NetSocket extends AbstractSocket implements Runnable { int[][] var24 = var4.flags; boolean var25; - label226: { - while (var21 != var14) { - var9 = class178.bufferX[var14]; - var10 = class178.bufferY[var14]; - var14 = var14 + 1 & 4095; - var19 = var9 - var12; - var20 = var10 - var13; - var15 = var9 - var4.xInset; - var16 = var10 - var4.yInset; - if (var3.vmethod3644(1, var9, var10, var4)) { - InterfaceParent.field986 = var9; - UrlRequester.field929 = var10; - var25 = true; - break label226; - } - - var17 = class178.distances[var19][var20] + 1; - if (var19 > 0 && class178.directions[var19 - 1][var20] == 0 && (var24[var15 - 1][var16] & 19136776) == 0) { - class178.bufferX[var21] = var9 - 1; - class178.bufferY[var21] = var10; - var21 = var21 + 1 & 4095; - class178.directions[var19 - 1][var20] = 2; - class178.distances[var19 - 1][var20] = var17; - } - - if (var19 < 127 && class178.directions[var19 + 1][var20] == 0 && (var24[var15 + 1][var16] & 19136896) == 0) { - class178.bufferX[var21] = var9 + 1; - class178.bufferY[var21] = var10; - var21 = var21 + 1 & 4095; - class178.directions[var19 + 1][var20] = 8; - class178.distances[var19 + 1][var20] = var17; - } - - if (var20 > 0 && class178.directions[var19][var20 - 1] == 0 && (var24[var15][var16 - 1] & 19136770) == 0) { - class178.bufferX[var21] = var9; - class178.bufferY[var21] = var10 - 1; - var21 = var21 + 1 & 4095; - class178.directions[var19][var20 - 1] = 1; - class178.distances[var19][var20 - 1] = var17; - } - - if (var20 < 127 && class178.directions[var19][var20 + 1] == 0 && (var24[var15][var16 + 1] & 19136800) == 0) { - class178.bufferX[var21] = var9; - class178.bufferY[var21] = var10 + 1; - var21 = var21 + 1 & 4095; - class178.directions[var19][var20 + 1] = 4; - class178.distances[var19][var20 + 1] = var17; - } - - if (var19 > 0 && var20 > 0 && class178.directions[var19 - 1][var20 - 1] == 0 && (var24[var15 - 1][var16 - 1] & 19136782) == 0 && (var24[var15 - 1][var16] & 19136776) == 0 && (var24[var15][var16 - 1] & 19136770) == 0) { - class178.bufferX[var21] = var9 - 1; - class178.bufferY[var21] = var10 - 1; - var21 = var21 + 1 & 4095; - class178.directions[var19 - 1][var20 - 1] = 3; - class178.distances[var19 - 1][var20 - 1] = var17; - } - - if (var19 < 127 && var20 > 0 && class178.directions[var19 + 1][var20 - 1] == 0 && (var24[var15 + 1][var16 - 1] & 19136899) == 0 && (var24[var15 + 1][var16] & 19136896) == 0 && (var24[var15][var16 - 1] & 19136770) == 0) { - class178.bufferX[var21] = var9 + 1; - class178.bufferY[var21] = var10 - 1; - var21 = var21 + 1 & 4095; - class178.directions[var19 + 1][var20 - 1] = 9; - class178.distances[var19 + 1][var20 - 1] = var17; - } - - if (var19 > 0 && var20 < 127 && class178.directions[var19 - 1][var20 + 1] == 0 && (var24[var15 - 1][var16 + 1] & 19136824) == 0 && (var24[var15 - 1][var16] & 19136776) == 0 && (var24[var15][var16 + 1] & 19136800) == 0) { - class178.bufferX[var21] = var9 - 1; - class178.bufferY[var21] = var10 + 1; - var21 = var21 + 1 & 4095; - class178.directions[var19 - 1][var20 + 1] = 6; - class178.distances[var19 - 1][var20 + 1] = var17; - } - - if (var19 < 127 && var20 < 127 && class178.directions[var19 + 1][var20 + 1] == 0 && (var24[var15 + 1][var16 + 1] & 19136992) == 0 && (var24[var15 + 1][var16] & 19136896) == 0 && (var24[var15][var16 + 1] & 19136800) == 0) { - class178.bufferX[var21] = var9 + 1; - class178.bufferY[var21] = var10 + 1; - var21 = var21 + 1 & 4095; - class178.directions[var19 + 1][var20 + 1] = 12; - class178.distances[var19 + 1][var20 + 1] = var17; - } + while (true) { + if (var21 == var14) { + InterfaceParent.field986 = var9; + UrlRequester.field929 = var10; + var25 = false; + break; } - InterfaceParent.field986 = var9; - UrlRequester.field929 = var10; - var25 = false; + var9 = class178.bufferX[var14]; + var10 = class178.bufferY[var14]; + var14 = var14 + 1 & 4095; + var19 = var9 - var12; + var20 = var10 - var13; + var15 = var9 - var4.xInset; + var16 = var10 - var4.yInset; + if (var3.vmethod3644(1, var9, var10, var4)) { + InterfaceParent.field986 = var9; + UrlRequester.field929 = var10; + var25 = true; + break; + } + + var17 = class178.distances[var19][var20] + 1; + if (var19 > 0 && class178.directions[var19 - 1][var20] == 0 && (var24[var15 - 1][var16] & 19136776) == 0) { + class178.bufferX[var21] = var9 - 1; + class178.bufferY[var21] = var10; + var21 = var21 + 1 & 4095; + class178.directions[var19 - 1][var20] = 2; + class178.distances[var19 - 1][var20] = var17; + } + + if (var19 < 127 && class178.directions[var19 + 1][var20] == 0 && (var24[var15 + 1][var16] & 19136896) == 0) { + class178.bufferX[var21] = var9 + 1; + class178.bufferY[var21] = var10; + var21 = var21 + 1 & 4095; + class178.directions[var19 + 1][var20] = 8; + class178.distances[var19 + 1][var20] = var17; + } + + if (var20 > 0 && class178.directions[var19][var20 - 1] == 0 && (var24[var15][var16 - 1] & 19136770) == 0) { + class178.bufferX[var21] = var9; + class178.bufferY[var21] = var10 - 1; + var21 = var21 + 1 & 4095; + class178.directions[var19][var20 - 1] = 1; + class178.distances[var19][var20 - 1] = var17; + } + + if (var20 < 127 && class178.directions[var19][var20 + 1] == 0 && (var24[var15][var16 + 1] & 19136800) == 0) { + class178.bufferX[var21] = var9; + class178.bufferY[var21] = var10 + 1; + var21 = var21 + 1 & 4095; + class178.directions[var19][var20 + 1] = 4; + class178.distances[var19][var20 + 1] = var17; + } + + if (var19 > 0 && var20 > 0 && class178.directions[var19 - 1][var20 - 1] == 0 && (var24[var15 - 1][var16 - 1] & 19136782) == 0 && (var24[var15 - 1][var16] & 19136776) == 0 && (var24[var15][var16 - 1] & 19136770) == 0) { + class178.bufferX[var21] = var9 - 1; + class178.bufferY[var21] = var10 - 1; + var21 = var21 + 1 & 4095; + class178.directions[var19 - 1][var20 - 1] = 3; + class178.distances[var19 - 1][var20 - 1] = var17; + } + + if (var19 < 127 && var20 > 0 && class178.directions[var19 + 1][var20 - 1] == 0 && (var24[var15 + 1][var16 - 1] & 19136899) == 0 && (var24[var15 + 1][var16] & 19136896) == 0 && (var24[var15][var16 - 1] & 19136770) == 0) { + class178.bufferX[var21] = var9 + 1; + class178.bufferY[var21] = var10 - 1; + var21 = var21 + 1 & 4095; + class178.directions[var19 + 1][var20 - 1] = 9; + class178.distances[var19 + 1][var20 - 1] = var17; + } + + if (var19 > 0 && var20 < 127 && class178.directions[var19 - 1][var20 + 1] == 0 && (var24[var15 - 1][var16 + 1] & 19136824) == 0 && (var24[var15 - 1][var16] & 19136776) == 0 && (var24[var15][var16 + 1] & 19136800) == 0) { + class178.bufferX[var21] = var9 - 1; + class178.bufferY[var21] = var10 + 1; + var21 = var21 + 1 & 4095; + class178.directions[var19 - 1][var20 + 1] = 6; + class178.distances[var19 - 1][var20 + 1] = var17; + } + + if (var19 < 127 && var20 < 127 && class178.directions[var19 + 1][var20 + 1] == 0 && (var24[var15 + 1][var16 + 1] & 19136992) == 0 && (var24[var15 + 1][var16] & 19136896) == 0 && (var24[var15][var16 + 1] & 19136800) == 0) { + class178.bufferX[var21] = var9 + 1; + class178.bufferY[var21] = var10 + 1; + var21 = var21 + 1 & 4095; + class178.directions[var19 + 1][var20 + 1] = 12; + class178.distances[var19 + 1][var20 + 1] = var17; + } } var18 = var25; diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java index 6fb4ab6338..b7d3eb37a3 100644 --- a/runescape-client/src/main/java/NodeDeque.java +++ b/runescape-client/src/main/java/NodeDeque.java @@ -44,15 +44,15 @@ public class NodeDeque { signature = "(Lgw;)V" ) @Export("addFirst") - public void addFirst(Node var1) { - if (var1.next != null) { - var1.remove(); + public void addFirst(Node node) { + if (node.next != null) { + node.remove(); } - var1.next = this.sentinel.next; - var1.previous = this.sentinel; - var1.next.previous = var1; - var1.previous.next = var1; + node.next = this.sentinel.next; + node.previous = this.sentinel; + node.next.previous = node; + node.previous.next = node; } @ObfuscatedName("q") @@ -60,15 +60,15 @@ public class NodeDeque { signature = "(Lgw;)V" ) @Export("addLast") - public void addLast(Node var1) { - if (var1.next != null) { - var1.remove(); + public void addLast(Node node) { + if (node.next != null) { + node.remove(); } - var1.next = this.sentinel; - var1.previous = this.sentinel.previous; - var1.next.previous = var1; - var1.previous.next = var1; + node.next = this.sentinel; + node.previous = this.sentinel.previous; + node.next.previous = node; + node.previous.next = node; } @ObfuscatedName("o") diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java index ae81442438..d2f8c773d8 100644 --- a/runescape-client/src/main/java/NodeHashTable.java +++ b/runescape-client/src/main/java/NodeHashTable.java @@ -49,11 +49,11 @@ public final class NodeHashTable { signature = "(J)Lgw;" ) @Export("get") - public Node get(long var1) { - Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; + public Node get(long key) { + Node var3 = this.buckets[(int)(key & (long)(this.size - 1))]; for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { - if (this.currentGet.key == var1) { + if (this.currentGet.key == key) { Node var4 = this.currentGet; this.currentGet = this.currentGet.previous; return var4; @@ -69,17 +69,17 @@ public final class NodeHashTable { signature = "(Lgw;J)V" ) @Export("put") - public void put(Node var1, long var2) { - if (var1.next != null) { - var1.remove(); + public void put(Node node, long key) { + if (node.next != null) { + node.remove(); } - Node var4 = this.buckets[(int)(var2 & (long)(this.size - 1))]; - var1.next = var4.next; - var1.previous = var4; - var1.next.previous = var1; - var1.previous.next = var1; - var1.key = var2; + Node var4 = this.buckets[(int)(key & (long)(this.size - 1))]; + node.next = var4.next; + node.previous = var4; + node.next.previous = node; + node.previous.next = node; + node.key = key; } @ObfuscatedName("q") @@ -124,15 +124,16 @@ public final class NodeHashTable { this.current = var1.previous; return var1; } else { - while (this.index < this.size) { - var1 = this.buckets[this.index++].previous; - if (var1 != this.buckets[this.index - 1]) { - this.current = var1.previous; - return var1; + do { + if (this.index >= this.size) { + return null; } - } - return null; + var1 = this.buckets[this.index++].previous; + } while(var1 == this.buckets[this.index - 1]); + + this.current = var1.previous; + return var1; } } } diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index 5a90300641..2610044c34 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -687,6 +687,7 @@ public class ObjectDefinition extends DualNode { int var5; int var6; int var7; + boolean var8; if (this.field645 == null) { if (var1 != 10) { return null; @@ -746,7 +747,7 @@ public class ObjectDefinition extends DualNode { } var5 = this.field644[var7]; - boolean var8 = this.isRotated ^ var2 > 3; + var8 = this.isRotated ^ var2 > 3; if (var8) { var5 += 65536; } @@ -772,14 +773,13 @@ public class ObjectDefinition extends DualNode { var4 = true; } - boolean var10; if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { - var10 = false; + var8 = false; } else { - var10 = true; + var8 = true; } - ModelData var9 = new ModelData(var3, var2 == 0 && !var4 && !var10, this.recolorFrom == null, null == this.retextureFrom, true); + ModelData var9 = new ModelData(var3, var2 == 0 && !var4 && !var8, this.recolorFrom == null, null == this.retextureFrom, true); if (var1 == 4 && var2 > 3) { var9.method212(256); var9.method213(45, 0, -45); @@ -810,7 +810,7 @@ public class ObjectDefinition extends DualNode { var9.method215(this.modelSizeX, this.modelHeight, this.modelSizeY); } - if (var10) { + if (var8) { var9.method213(this.offsetX, this.offsetHeight, this.offsetY); } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index 645db55beb..67ba4151a0 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -136,9 +136,9 @@ public final class Occluder { garbageValue = "-1164060583" ) @Export("newScript") - static Script newScript(byte[] var0) { + static Script newScript(byte[] bytes) { Script var1 = new Script(); - Buffer var2 = new Buffer(var0); + Buffer var2 = new Buffer(bytes); var2.index = var2.array.length - 2; int var3 = var2.readUnsignedShort(); int var4 = var2.array.length - 2 - var3 - 12; diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index b4717ab040..562ce452d3 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -38,8 +38,8 @@ public final class PacketBuffer extends Buffer { garbageValue = "-763699765" ) @Export("newIsaacCipher") - public void newIsaacCipher(int[] var1) { - this.isaacCipher0 = new IsaacCipher(var1); + public void newIsaacCipher(int[] array) { + this.isaacCipher0 = new IsaacCipher(array); } @ObfuscatedName("ih") @@ -48,8 +48,8 @@ public final class PacketBuffer extends Buffer { garbageValue = "0" ) @Export("setIsaacCipher") - public void setIsaacCipher(IsaacCipher var1) { - this.isaacCipher0 = var1; + public void setIsaacCipher(IsaacCipher isaacCipher) { + this.isaacCipher0 = isaacCipher; } @ObfuscatedName("im") @@ -121,20 +121,20 @@ public final class PacketBuffer extends Buffer { garbageValue = "1710439720" ) @Export("readBits") - public int readBits(int var1) { + public int readBits(int bits) { int var2 = this.bitIndex >> 3; int var3 = 8 - (this.bitIndex & 7); int var4 = 0; - for (this.bitIndex += var1; var1 > var3; var3 = 8) { - var4 += (super.array[var2++] & PacketBuffer_masks[var3]) << var1 - var3; - var1 -= var3; + for (this.bitIndex += bits; bits > var3; var3 = 8) { + var4 += (super.array[var2++] & PacketBuffer_masks[var3]) << bits - var3; + bits -= var3; } - if (var3 == var1) { + if (var3 == bits) { var4 += super.array[var2] & PacketBuffer_masks[var3]; } else { - var4 += super.array[var2] >> var3 - var1 & PacketBuffer_masks[var1]; + var4 += super.array[var2] >> var3 - bits & PacketBuffer_masks[bits]; } return var4; @@ -156,8 +156,8 @@ public final class PacketBuffer extends Buffer { garbageValue = "-141269845" ) @Export("bitsRemaining") - public int bitsRemaining(int var1) { - return var1 * 8 - this.bitIndex; + public int bitsRemaining(int index) { + return index * 8 - this.bitIndex; } @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index ea0c467d30..56fe4d7e67 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -156,8 +156,8 @@ public class PacketWriter { garbageValue = "111" ) @Export("setSocket") - void setSocket(AbstractSocket var1) { - this.socket0 = var1; + void setSocket(AbstractSocket socket) { + this.socket0 = socket; } @ObfuscatedName("o") diff --git a/runescape-client/src/main/java/ParamDefinition.java b/runescape-client/src/main/java/ParamDefinition.java index f0d36e45d5..7b4dce8d3b 100644 --- a/runescape-client/src/main/java/ParamDefinition.java +++ b/runescape-client/src/main/java/ParamDefinition.java @@ -176,18 +176,18 @@ public class ParamDefinition extends DualNode { int var17; int var39; if (var5 != 1 && var5 != 3) { - var39 = var38.sizeX; - var17 = var38.sizeY; - } else { - var39 = var38.sizeY; var17 = var38.sizeX; + var39 = var38.sizeY; + } else { + var17 = var38.sizeY; + var39 = var38.sizeX; } int var18; int var19; - if (var39 + var2 <= 104) { - var18 = (var39 >> 1) + var2; - var19 = var2 + (var39 + 1 >> 1); + if (var17 + var2 <= 104) { + var18 = (var17 >> 1) + var2; + var19 = var2 + (var17 + 1 >> 1); } else { var18 = var2; var19 = var2 + 1; @@ -195,9 +195,9 @@ public class ParamDefinition extends DualNode { int var20; int var21; - if (var3 + var17 <= 104) { - var20 = var3 + (var17 >> 1); - var21 = var3 + (var17 + 1 >> 1); + if (var3 + var39 <= 104) { + var20 = var3 + (var39 >> 1); + var21 = var3 + (var39 + 1 >> 1); } else { var20 = var3; var21 = var3 + 1; @@ -205,8 +205,8 @@ public class ParamDefinition extends DualNode { int[][] var22 = Tiles.Tiles_heights[var12]; int var23 = var22[var18][var21] + var22[var19][var20] + var22[var18][var20] + var22[var19][var21] >> 2; - int var24 = (var2 << 7) + (var39 << 6); - int var25 = (var3 << 7) + (var17 << 6); + int var24 = (var2 << 7) + (var17 << 6); + int var25 = (var3 << 7) + (var39 << 6); long var26 = FontName.calculateTag(var2, var3, 2, var38.int1 == 0, var4); int var28 = (var5 << 6) + var6; if (var38.int3 == 1) { @@ -235,7 +235,7 @@ public class ParamDefinition extends DualNode { var36.method284(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28); if (var38.interactType != 0) { - var37.method91(var2, var3, var39, var17, var38.boolean1); + var37.method91(var2, var3, var17, var39, var38.boolean1); } } else if (var6 == 0) { if (var38.animationId == -1 && var38.transforms == null) { @@ -297,7 +297,7 @@ public class ParamDefinition extends DualNode { var36.method284(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28); if (var38.interactType != 0) { - var37.method91(var2, var3, var39, var17, var38.boolean1); + var37.method91(var2, var3, var17, var39, var38.boolean1); } } else if (var6 == 4) { if (var38.animationId == -1 && var38.transforms == null) { @@ -378,11 +378,11 @@ public class ParamDefinition extends DualNode { } if (var29 != null) { - var36.method284(var0, var2, var3, var23, var39, var17, (Entity)var29, var6 == 11 ? 256 : 0, var26, var28); + var36.method284(var0, var2, var3, var23, var17, var39, (Entity)var29, var6 == 11 ? 256 : 0, var26, var28); } if (var38.interactType != 0) { - var37.method91(var2, var3, var39, var17, var38.boolean1); + var37.method91(var2, var3, var17, var39, var38.boolean1); } } } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index 3645cf21ef..ece01a9aeb 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -121,7 +121,7 @@ public class PcmPlayer { garbageValue = "-1738349775" ) @Export("open") - protected void open(int var1) throws Exception { + protected void open(int bufferSize) throws Exception { } @ObfuscatedName("q") @@ -163,8 +163,8 @@ public class PcmPlayer { garbageValue = "2106357590" ) @Export("setStream") - public final synchronized void setStream(PcmStream var1) { - this.stream0 = var1; + public final synchronized void setStream(PcmStream stream) { + this.stream0 = stream; } @ObfuscatedName("ar") @@ -324,28 +324,28 @@ public class PcmPlayer { garbageValue = "-424358259" ) @Export("skip") - final void skip(int var1) { - this.field686 -= var1; + final void skip(int length) { + this.field686 -= length; if (this.field686 < 0) { this.field686 = 0; } if (this.stream0 != null) { - this.stream0.vmethod264(var1); + this.stream0.skip(length); } } @ObfuscatedName("aw") @Export("fill") - final void fill(int[] var1, int var2) { - int var3 = var2; + final void fill(int[] buffer, int length) { + int var3 = length; if (isStereo) { - var3 = var2 << 1; + var3 = length << 1; } - class212.clearIntArray(var1, 0, var3); - this.field686 -= var2; + class212.clearIntArray(buffer, 0, var3); + this.field686 -= length; if (this.stream0 != null && this.field686 <= 0) { this.field686 += class309.PcmPlayer_sampleRate >> 4; MidiPcmStream.PcmStream_disable(this.stream0); @@ -444,7 +444,7 @@ public class PcmPlayer { } if (this.stream0 != null) { - this.stream0.vmethod263(var1, 0, var2); + this.stream0.fill(buffer, 0, length); } this.timeMs = class203.currentTimeMs(); diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index de4c6a3fc7..b7e6a9af70 100644 --- a/runescape-client/src/main/java/PcmStream.java +++ b/runescape-client/src/main/java/PcmStream.java @@ -46,10 +46,12 @@ public abstract class PcmStream extends Node { protected abstract int vmethod262(); @ObfuscatedName("e") - protected abstract void vmethod263(int[] var1, int var2, int var3); + @Export("fill") + protected abstract void fill(int[] buffer, int start, int end); @ObfuscatedName("d") - protected abstract void vmethod264(int var1); + @Export("skip") + protected abstract void skip(int length); @ObfuscatedName("az") int vmethod282() { @@ -58,11 +60,11 @@ public abstract class PcmStream extends Node { @ObfuscatedName("ef") @Export("update") - final void update(int[] var1, int var2, int var3) { + final void update(int[] buffer, int start, int end) { if (this.active) { - this.vmethod263(var1, var2, var3); + this.fill(buffer, start, end); } else { - this.vmethod264(var3); + this.skip(end); } } diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java index 485333b5f2..29e659a256 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -34,8 +34,8 @@ public class PcmStreamMixer extends PcmStream { signature = "(Ldc;)V" ) @Export("addSubStream") - public final synchronized void addSubStream(PcmStream var1) { - this.subStreams.addLast(var1); + public final synchronized void addSubStream(PcmStream subStream) { + this.subStreams.addLast(subStream); } @ObfuscatedName("f") @@ -43,8 +43,8 @@ public class PcmStreamMixer extends PcmStream { signature = "(Ldc;)V" ) @Export("removeSubStream") - public final synchronized void removeSubStream(PcmStream var1) { - var1.remove(); + public final synchronized void removeSubStream(PcmStream subStream) { + subStream.remove(); } @ObfuscatedName("q") @@ -113,7 +113,7 @@ public class PcmStreamMixer extends PcmStream { } @ObfuscatedName("e") - public final synchronized void vmethod263(int[] var1, int var2, int var3) { + public final synchronized void fill(int[] var1, int var2, int var3) { do { if (this.field692 < 0) { this.updateSubStreams(var1, var2, var3); @@ -149,15 +149,15 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedName("x") @Export("updateSubStreams") - void updateSubStreams(int[] var1, int var2, int var3) { + void updateSubStreams(int[] buffer, int start, int end) { for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { - var4.update(var1, var2, var3); + var4.update(buffer, start, end); } } @ObfuscatedName("d") - public final synchronized void vmethod264(int var1) { + public final synchronized void skip(int var1) { do { if (this.field692 < 0) { this.skipSubStreams(var1); @@ -192,9 +192,9 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedName("a") @Export("skipSubStreams") - void skipSubStreams(int var1) { + void skipSubStreams(int length) { for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { - var2.vmethod264(var1); + var2.skip(length); } } diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index 674c083ee3..d3cd3d6756 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -138,37 +138,37 @@ public class PlatformInfo extends Node { garbageValue = "1518809220" ) @Export("write") - public void write(Buffer var1) { - var1.writeByte(7); - var1.writeByte(this.field694); - var1.writeByte(this.field695 ? 1 : 0); - var1.writeByte(this.field696); - var1.writeByte(this.field697); - var1.writeByte(this.field698); - var1.writeByte(this.field699); - var1.writeByte(this.field700); - var1.writeByte(this.field701 ? 1 : 0); - var1.writeShort(this.field702); - var1.writeByte(this.field703); - var1.writeMedium(this.field704); - var1.writeShort(this.field705); - var1.writeStringCp1252NullCircumfixed(this.field706); - var1.writeStringCp1252NullCircumfixed(this.field707); - var1.writeStringCp1252NullCircumfixed(this.field708); - var1.writeStringCp1252NullCircumfixed(this.field709); - var1.writeByte(this.field711); - var1.writeShort(this.field710); - var1.writeStringCp1252NullCircumfixed(this.field714); - var1.writeStringCp1252NullCircumfixed(this.field715); - var1.writeByte(this.field712); - var1.writeByte(this.field713); + public void write(Buffer buffer) { + buffer.writeByte(7); + buffer.writeByte(this.field694); + buffer.writeByte(this.field695 ? 1 : 0); + buffer.writeByte(this.field696); + buffer.writeByte(this.field697); + buffer.writeByte(this.field698); + buffer.writeByte(this.field699); + buffer.writeByte(this.field700); + buffer.writeByte(this.field701 ? 1 : 0); + buffer.writeShort(this.field702); + buffer.writeByte(this.field703); + buffer.writeMedium(this.field704); + buffer.writeShort(this.field705); + buffer.writeStringCp1252NullCircumfixed(this.field706); + buffer.writeStringCp1252NullCircumfixed(this.field707); + buffer.writeStringCp1252NullCircumfixed(this.field708); + buffer.writeStringCp1252NullCircumfixed(this.field709); + buffer.writeByte(this.field711); + buffer.writeShort(this.field710); + buffer.writeStringCp1252NullCircumfixed(this.field714); + buffer.writeStringCp1252NullCircumfixed(this.field715); + buffer.writeByte(this.field712); + buffer.writeByte(this.field713); for (int var2 = 0; var2 < this.field716.length; ++var2) { - var1.writeInt(this.field716[var2]); + buffer.writeInt(this.field716[var2]); } - var1.writeInt(this.field717); - var1.writeStringCp1252NullCircumfixed(this.field718); + buffer.writeInt(this.field717); + buffer.writeStringCp1252NullCircumfixed(this.field718); } @ObfuscatedName("f") diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index dcb1e0dc4e..5f6f9ad2de 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -190,11 +190,11 @@ public final class Player extends Actor { garbageValue = "-801926003" ) @Export("read") - final void read(Buffer var1) { - var1.index = 0; - int var2 = var1.readUnsignedByte(); - this.headIconPk = var1.readByte(); - this.headIconPrayer = var1.readByte(); + final void read(Buffer buffer) { + buffer.index = 0; + int var2 = buffer.readUnsignedByte(); + this.headIconPk = buffer.readByte(); + this.headIconPrayer = buffer.readByte(); int var3 = -1; this.team = 0; int[] var4 = new int[12]; @@ -202,14 +202,14 @@ public final class Player extends Actor { int var5; int var6; for (int var7 = 0; var7 < 12; ++var7) { - var5 = var1.readUnsignedByte(); + var5 = buffer.readUnsignedByte(); if (var5 == 0) { var4[var7] = 0; } else { - var6 = var1.readUnsignedByte(); + var6 = buffer.readUnsignedByte(); var4[var7] = var6 + (var5 << 8); if (var7 == 0 && var4[0] == 65535) { - var3 = var1.readUnsignedShort(); + var3 = buffer.readUnsignedShort(); break; } @@ -225,7 +225,7 @@ public final class Player extends Actor { int[] var9 = new int[5]; for (var5 = 0; var5 < 5; ++var5) { - var6 = var1.readUnsignedByte(); + var6 = buffer.readUnsignedByte(); if (var6 < 0 || var6 >= class229.field1137[var5].length) { var6 = 0; } @@ -233,52 +233,52 @@ public final class Player extends Actor { var9[var5] = var6; } - super.readySequence = var1.readUnsignedShort(); + super.readySequence = buffer.readUnsignedShort(); if (super.readySequence == 65535) { super.readySequence = -1; } - super.turnLeftSequence = var1.readUnsignedShort(); + super.turnLeftSequence = buffer.readUnsignedShort(); if (super.turnLeftSequence == 65535) { super.turnLeftSequence = -1; } super.turnRightSequence = super.turnLeftSequence; - super.walkSequence = var1.readUnsignedShort(); + super.walkSequence = buffer.readUnsignedShort(); if (super.walkSequence == 65535) { super.walkSequence = -1; } - super.walkBackSequence = var1.readUnsignedShort(); + super.walkBackSequence = buffer.readUnsignedShort(); if (super.walkBackSequence == 65535) { super.walkBackSequence = -1; } - super.walkLeftSequence = var1.readUnsignedShort(); + super.walkLeftSequence = buffer.readUnsignedShort(); if (super.walkLeftSequence == 65535) { super.walkLeftSequence = -1; } - super.walkRightSequence = var1.readUnsignedShort(); + super.walkRightSequence = buffer.readUnsignedShort(); if (super.walkRightSequence == 65535) { super.walkRightSequence = -1; } - super.runSequence = var1.readUnsignedShort(); + super.runSequence = buffer.readUnsignedShort(); if (super.runSequence == 65535) { super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), KeyHandler.loginType); + this.username = new Username(buffer.readStringCp1252NullTerminated(), KeyHandler.loginType); this.clearIsFriend(); this.clearIsInClanChat(); if (this == Canvas.localPlayer) { RunException.localPlayerName = this.username.getName(); } - this.combatLevel = var1.readUnsignedByte(); - this.skillLevel = var1.readUnsignedShort(); - this.isHidden = var1.readUnsignedByte() == 1; + this.combatLevel = buffer.readUnsignedByte(); + this.skillLevel = buffer.readUnsignedShort(); + this.isHidden = buffer.readUnsignedByte() == 1; if (Client.gameBuild == 0 && Client.staffModLevel >= 2) { this.isHidden = false; } @@ -379,7 +379,7 @@ public final class Player extends Actor { return null; } else { SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapAreaData.getSequenceDefinition(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.readySequence != super.movementSequence || var1 == null) ? WorldMapAreaData.getSequenceDefinition(super.movementSequence) : null; + SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.readySequence == super.movementSequence && var1 != null ? null : WorldMapAreaData.getSequenceDefinition(super.movementSequence); Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); if (var3 == null) { return null; @@ -472,12 +472,12 @@ public final class Player extends Actor { garbageValue = "1966552419" ) @Export("resetPath") - void resetPath(int var1, int var2) { + void resetPath(int x, int y) { super.pathLength = 0; super.field25 = 0; super.field24 = 0; - super.pathX[0] = var1; - super.pathY[0] = var2; + super.pathX[0] = x; + super.pathY[0] = y; int var3 = this.transformedSize(); super.x = super.pathX[0] * 128 + var3 * 64; super.y = super.pathY[0] * 128 + var3 * 64; diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index 8ce53385e0..cde1fbee52 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -144,12 +144,12 @@ public class Players { garbageValue = "-1991202495" ) @Export("clickWidget") - static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget == null && !Client.isMenuOpen && var0 != null && class48.method869(var0) != null) { - Client.clickedWidget = var0; - Client.clickedWidgetParent = class48.method869(var0); - Client.widgetClickX = var1; - Client.widgetClickY = var2; + static final void clickWidget(Widget component, int x, int y) { + if (Client.clickedWidget == null && !Client.isMenuOpen && component != null && class48.method869(component) != null) { + Client.clickedWidget = component; + Client.clickedWidgetParent = class48.method869(component); + Client.widgetClickX = x; + Client.widgetClickY = y; MouseRecorder.widgetDragDuration = 0; Client.isDraggingWidget = false; int var3 = Client.menuOptionsCount - 1; diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index f1c3efecb7..1712df6d1e 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -168,26 +168,26 @@ public final class Projectile extends Entity { garbageValue = "-553495769" ) @Export("setDestination") - final void setDestination(int var1, int var2, int var3, int var4) { + final void setDestination(int x, int y, int height, int cycle) { double var5; if (!this.isMoving) { - var5 = (double)(var1 - this.sourceX); - double var7 = (double)(var2 - this.sourceY); + var5 = (double)(x - this.sourceX); + double var7 = (double)(y - this.sourceY); double var9 = Math.sqrt(var5 * var5 + var7 * var7); this.x = (double)this.sourceX + var5 * (double)this.startHeight / var9; this.y = (double)this.sourceY + (double)this.startHeight * var7 / var9; this.z = (double)this.sourceZ; } - var5 = (double)(this.cycleEnd + 1 - var4); - this.speedX = ((double)var1 - this.x) / var5; - this.speedY = ((double)var2 - this.y) / var5; + var5 = (double)(this.cycleEnd + 1 - cycle); + this.speedX = ((double)x - this.x) / var5; + this.speedY = ((double)y - this.y) / var5; this.speed = Math.sqrt(this.speedY * this.speedY + this.speedX * this.speedX); if (!this.isMoving) { this.speedZ = -this.speed * Math.tan(0.02454369D * (double)this.slope); } - this.accelerationZ = ((double)var3 - this.z - var5 * this.speedZ) * 2.0D / (var5 * var5); + this.accelerationZ = ((double)height - this.z - var5 * this.speedZ) * 2.0D / (var5 * var5); } @ObfuscatedName("f") @@ -196,16 +196,16 @@ public final class Projectile extends Entity { garbageValue = "1351865817" ) @Export("advance") - final void advance(int var1) { + final void advance(int cycles) { this.isMoving = true; - this.x += this.speedX * (double)var1; - this.y += (double)var1 * this.speedY; - this.z += (double)var1 * this.accelerationZ * 0.5D * (double)var1 + this.speedZ * (double)var1; - this.speedZ += this.accelerationZ * (double)var1; + this.x += this.speedX * (double)cycles; + this.y += (double)cycles * this.speedY; + this.z += (double)cycles * this.accelerationZ * 0.5D * (double)cycles + this.speedZ * (double)cycles; + this.speedZ += this.accelerationZ * (double)cycles; this.yaw = (int)(Math.atan2(this.speedX, this.speedY) * 325.949D) + 1024 & 2047; this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047; if (this.sequenceDefinition != null) { - this.frameCycle += var1; + this.frameCycle += cycles; while (true) { do { @@ -249,21 +249,21 @@ public final class Projectile extends Entity { garbageValue = "95" ) @Export("byteArrayToObject") - public static Object byteArrayToObject(byte[] var0, boolean var1) { - if (var0 == null) { + public static Object byteArrayToObject(byte[] bytes, boolean copyArray) { + if (bytes == null) { return null; } else { - if (var0.length > 136 && !AbstractByteArrayCopier.directBufferUnavailable) { + if (bytes.length > 136 && !AbstractByteArrayCopier.directBufferUnavailable) { try { DirectByteArrayCopier var2 = new DirectByteArrayCopier(); - var2.set(var0); + var2.set(bytes); return var2; } catch (Throwable var3) { AbstractByteArrayCopier.directBufferUnavailable = true; } } - return var0; + return bytes; } } diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index 1de95514a1..af00547fa4 100644 --- a/runescape-client/src/main/java/RasterProvider.java +++ b/runescape-client/src/main/java/RasterProvider.java @@ -52,8 +52,8 @@ public final class RasterProvider extends AbstractRasterProvider { garbageValue = "-430495007" ) @Export("drawFull") - public final void drawFull(int var1, int var2) { - this.drawFull0(this.component0.getGraphics(), var1, var2); + public final void drawFull(int x, int y) { + this.drawFull0(this.component0.getGraphics(), x, y); } @ObfuscatedName("q") @@ -62,8 +62,8 @@ public final class RasterProvider extends AbstractRasterProvider { garbageValue = "18" ) @Export("draw") - public final void draw(int var1, int var2, int var3, int var4) { - this.draw0(this.component0.getGraphics(), var1, var2, var3, var4); + public final void draw(int x, int y, int width, int height) { + this.draw0(this.component0.getGraphics(), x, y, width, height); } @ObfuscatedName("w") @@ -72,9 +72,9 @@ public final class RasterProvider extends AbstractRasterProvider { garbageValue = "-2102440865" ) @Export("drawFull0") - final void drawFull0(Graphics var1, int var2, int var3) { + final void drawFull0(Graphics graphics, int x, int y) { try { - var1.drawImage(this.image, var2, var3, this.component0); + graphics.drawImage(this.image, x, y, this.component0); } catch (Exception var5) { this.component0.repaint(); } @@ -87,12 +87,12 @@ public final class RasterProvider extends AbstractRasterProvider { garbageValue = "3" ) @Export("draw0") - final void draw0(Graphics var1, int var2, int var3, int var4, int var5) { + final void draw0(Graphics graphics, int x, int y, int width, int height) { try { - Shape var6 = var1.getClip(); - var1.clipRect(var2, var3, var4, var5); - var1.drawImage(this.image, 0, 0, this.component0); - var1.setClip(var6); + Shape var6 = graphics.getClip(); + graphics.clipRect(x, y, width, height); + graphics.drawImage(this.image, 0, 0, this.component0); + graphics.setClip(var6); } catch (Exception var7) { this.component0.repaint(); } diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java index fa866cd41a..a25f8df18a 100644 --- a/runescape-client/src/main/java/Rasterizer2D.java +++ b/runescape-client/src/main/java/Rasterizer2D.java @@ -30,11 +30,11 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("dp") @Export("Rasterizer2D_replace") - public static void Rasterizer2D_replace(int[] var0, int var1, int var2) { - Rasterizer2D_pixels = var0; - Rasterizer2D_width = var1; - Rasterizer2D_height = var2; - Rasterizer2D_setClip(0, 0, var1, var2); + public static void Rasterizer2D_replace(int[] pixels, int width, int height) { + Rasterizer2D_pixels = pixels; + Rasterizer2D_width = width; + Rasterizer2D_height = height; + Rasterizer2D_setClip(0, 0, width, height); } @ObfuscatedName("ds") @@ -48,66 +48,66 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("di") @Export("Rasterizer2D_setClip") - public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) { - if (var0 < 0) { - var0 = 0; + public static void Rasterizer2D_setClip(int xStart, int yStart, int xEnd, int yEnd) { + if (xStart < 0) { + xStart = 0; } - if (var1 < 0) { - var1 = 0; + if (yStart < 0) { + yStart = 0; } - if (var2 > Rasterizer2D_width) { - var2 = Rasterizer2D_width; + if (xEnd > Rasterizer2D_width) { + xEnd = Rasterizer2D_width; } - if (var3 > Rasterizer2D_height) { - var3 = Rasterizer2D_height; + if (yEnd > Rasterizer2D_height) { + yEnd = Rasterizer2D_height; } - Rasterizer2D_xClipStart = var0; - Rasterizer2D_yClipStart = var1; - Rasterizer2D_xClipEnd = var2; - Rasterizer2D_yClipEnd = var3; + Rasterizer2D_xClipStart = xStart; + Rasterizer2D_yClipStart = yStart; + Rasterizer2D_xClipEnd = xEnd; + Rasterizer2D_yClipEnd = yEnd; } @ObfuscatedName("dc") @Export("Rasterizer2D_expandClip") - public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) { - if (Rasterizer2D_xClipStart < var0) { - Rasterizer2D_xClipStart = var0; + public static void Rasterizer2D_expandClip(int xStart, int yStart, int xEnd, int yEnd) { + if (Rasterizer2D_xClipStart < xStart) { + Rasterizer2D_xClipStart = xStart; } - if (Rasterizer2D_yClipStart < var1) { - Rasterizer2D_yClipStart = var1; + if (Rasterizer2D_yClipStart < yStart) { + Rasterizer2D_yClipStart = yStart; } - if (Rasterizer2D_xClipEnd > var2) { - Rasterizer2D_xClipEnd = var2; + if (Rasterizer2D_xClipEnd > xEnd) { + Rasterizer2D_xClipEnd = xEnd; } - if (Rasterizer2D_yClipEnd > var3) { - Rasterizer2D_yClipEnd = var3; + if (Rasterizer2D_yClipEnd > yEnd) { + Rasterizer2D_yClipEnd = yEnd; } } @ObfuscatedName("dg") @Export("Rasterizer2D_getClipArray") - public static void Rasterizer2D_getClipArray(int[] var0) { - var0[0] = Rasterizer2D_xClipStart; - var0[1] = Rasterizer2D_yClipStart; - var0[2] = Rasterizer2D_xClipEnd; - var0[3] = Rasterizer2D_yClipEnd; + public static void Rasterizer2D_getClipArray(int[] dst) { + dst[0] = Rasterizer2D_xClipStart; + dst[1] = Rasterizer2D_yClipStart; + dst[2] = Rasterizer2D_xClipEnd; + dst[3] = Rasterizer2D_yClipEnd; } @ObfuscatedName("db") @Export("Rasterizer2D_setClipArray") - public static void Rasterizer2D_setClipArray(int[] var0) { - Rasterizer2D_xClipStart = var0[0]; - Rasterizer2D_yClipStart = var0[1]; - Rasterizer2D_xClipEnd = var0[2]; - Rasterizer2D_yClipEnd = var0[3]; + public static void Rasterizer2D_setClipArray(int[] src) { + Rasterizer2D_xClipStart = src[0]; + Rasterizer2D_yClipStart = src[1]; + Rasterizer2D_xClipEnd = src[2]; + Rasterizer2D_yClipEnd = src[3]; } @ObfuscatedName("dd") @@ -379,31 +379,31 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("dr") @Export("Rasterizer2D_fillRectangle") - public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { - if (var0 < Rasterizer2D_xClipStart) { - var2 -= Rasterizer2D_xClipStart - var0; - var0 = Rasterizer2D_xClipStart; + public static void Rasterizer2D_fillRectangle(int x, int y, int width, int height, int color) { + if (x < Rasterizer2D_xClipStart) { + width -= Rasterizer2D_xClipStart - x; + x = Rasterizer2D_xClipStart; } - if (var1 < Rasterizer2D_yClipStart) { - var3 -= Rasterizer2D_yClipStart - var1; - var1 = Rasterizer2D_yClipStart; + if (y < Rasterizer2D_yClipStart) { + height -= Rasterizer2D_yClipStart - y; + y = Rasterizer2D_yClipStart; } - if (var0 + var2 > Rasterizer2D_xClipEnd) { - var2 = Rasterizer2D_xClipEnd - var0; + if (x + width > Rasterizer2D_xClipEnd) { + width = Rasterizer2D_xClipEnd - x; } - if (var3 + var1 > Rasterizer2D_yClipEnd) { - var3 = Rasterizer2D_yClipEnd - var1; + if (height + y > Rasterizer2D_yClipEnd) { + height = Rasterizer2D_yClipEnd - y; } - int var5 = Rasterizer2D_width - var2; - int var6 = var0 + Rasterizer2D_width * var1; + int var5 = Rasterizer2D_width - width; + int var6 = x + Rasterizer2D_width * y; - for (int var7 = -var3; var7 < 0; ++var7) { - for (int var8 = -var2; var8 < 0; ++var8) { - Rasterizer2D_pixels[var6++] = var4; + for (int var7 = -height; var7 < 0; ++var7) { + for (int var8 = -width; var8 < 0; ++var8) { + Rasterizer2D_pixels[var6++] = color; } var6 += var5; @@ -594,42 +594,42 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("dh") @Export("Rasterizer2D_drawRectangle") - public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) { - Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); - Rasterizer2D_drawHorizontalLine(var0, var3 + var1 - 1, var2, var4); - Rasterizer2D_drawVerticalLine(var0, var1, var3, var4); - Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); + public static void Rasterizer2D_drawRectangle(int x, int y, int width, int height, int color) { + Rasterizer2D_drawHorizontalLine(x, y, width, color); + Rasterizer2D_drawHorizontalLine(x, height + y - 1, width, color); + Rasterizer2D_drawVerticalLine(x, y, height, color); + Rasterizer2D_drawVerticalLine(x + width - 1, y, height, color); } @ObfuscatedName("dz") @Export("Rasterizer2D_drawRectangleAlpha") - public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { - Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); - Rasterizer2D_drawHorizontalLineAlpha(var0, var3 + var1 - 1, var2, var4, var5); - if (var3 >= 3) { - Rasterizer2D_drawVerticalLineAlpha(var0, var1 + 1, var3 - 2, var4, var5); - Rasterizer2D_drawVerticalLineAlpha(var0 + var2 - 1, var1 + 1, var3 - 2, var4, var5); + public static void Rasterizer2D_drawRectangleAlpha(int x, int y, int width, int height, int rgb, int alpha) { + Rasterizer2D_drawHorizontalLineAlpha(x, y, width, rgb, alpha); + Rasterizer2D_drawHorizontalLineAlpha(x, height + y - 1, width, rgb, alpha); + if (height >= 3) { + Rasterizer2D_drawVerticalLineAlpha(x, y + 1, height - 2, rgb, alpha); + Rasterizer2D_drawVerticalLineAlpha(x + width - 1, y + 1, height - 2, rgb, alpha); } } @ObfuscatedName("dj") @Export("Rasterizer2D_drawHorizontalLine") - public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) { - if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { - if (var0 < Rasterizer2D_xClipStart) { - var2 -= Rasterizer2D_xClipStart - var0; - var0 = Rasterizer2D_xClipStart; + public static void Rasterizer2D_drawHorizontalLine(int x, int y, int length, int color) { + if (y >= Rasterizer2D_yClipStart && y < Rasterizer2D_yClipEnd) { + if (x < Rasterizer2D_xClipStart) { + length -= Rasterizer2D_xClipStart - x; + x = Rasterizer2D_xClipStart; } - if (var0 + var2 > Rasterizer2D_xClipEnd) { - var2 = Rasterizer2D_xClipEnd - var0; + if (x + length > Rasterizer2D_xClipEnd) { + length = Rasterizer2D_xClipEnd - x; } - int var4 = var0 + Rasterizer2D_width * var1; + int var4 = x + Rasterizer2D_width * y; - for (int var5 = 0; var5 < var2; ++var5) { - Rasterizer2D_pixels[var4 + var5] = var3; + for (int var5 = 0; var5 < length; ++var5) { + Rasterizer2D_pixels[var4 + var5] = color; } } @@ -637,24 +637,24 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("du") @Export("Rasterizer2D_drawHorizontalLineAlpha") - static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) { - if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { - if (var0 < Rasterizer2D_xClipStart) { - var2 -= Rasterizer2D_xClipStart - var0; - var0 = Rasterizer2D_xClipStart; + static void Rasterizer2D_drawHorizontalLineAlpha(int x, int y, int length, int rgb, int alpha) { + if (y >= Rasterizer2D_yClipStart && y < Rasterizer2D_yClipEnd) { + if (x < Rasterizer2D_xClipStart) { + length -= Rasterizer2D_xClipStart - x; + x = Rasterizer2D_xClipStart; } - if (var0 + var2 > Rasterizer2D_xClipEnd) { - var2 = Rasterizer2D_xClipEnd - var0; + if (x + length > Rasterizer2D_xClipEnd) { + length = Rasterizer2D_xClipEnd - x; } - int var5 = 256 - var4; - int var6 = (var3 >> 16 & 255) * var4; - int var7 = (var3 >> 8 & 255) * var4; - int var8 = var4 * (var3 & 255); - int var9 = var0 + Rasterizer2D_width * var1; + int var5 = 256 - alpha; + int var6 = (rgb >> 16 & 255) * alpha; + int var7 = (rgb >> 8 & 255) * alpha; + int var8 = alpha * (rgb & 255); + int var9 = x + Rasterizer2D_width * y; - for (int var10 = 0; var10 < var2; ++var10) { + for (int var10 = 0; var10 < length; ++var10) { int var11 = var5 * (Rasterizer2D_pixels[var9] >> 16 & 255); int var12 = (Rasterizer2D_pixels[var9] >> 8 & 255) * var5; int var13 = var5 * (Rasterizer2D_pixels[var9] & 255); @@ -667,21 +667,21 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("dm") @Export("Rasterizer2D_drawVerticalLine") - public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) { - if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { - if (var1 < Rasterizer2D_yClipStart) { - var2 -= Rasterizer2D_yClipStart - var1; - var1 = Rasterizer2D_yClipStart; + public static void Rasterizer2D_drawVerticalLine(int x, int y, int length, int color) { + if (x >= Rasterizer2D_xClipStart && x < Rasterizer2D_xClipEnd) { + if (y < Rasterizer2D_yClipStart) { + length -= Rasterizer2D_yClipStart - y; + y = Rasterizer2D_yClipStart; } - if (var2 + var1 > Rasterizer2D_yClipEnd) { - var2 = Rasterizer2D_yClipEnd - var1; + if (length + y > Rasterizer2D_yClipEnd) { + length = Rasterizer2D_yClipEnd - y; } - int var4 = var0 + Rasterizer2D_width * var1; + int var4 = x + Rasterizer2D_width * y; - for (int var5 = 0; var5 < var2; ++var5) { - Rasterizer2D_pixels[var4 + var5 * Rasterizer2D_width] = var3; + for (int var5 = 0; var5 < length; ++var5) { + Rasterizer2D_pixels[var4 + var5 * Rasterizer2D_width] = color; } } @@ -689,24 +689,24 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("dq") @Export("Rasterizer2D_drawVerticalLineAlpha") - static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) { - if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { - if (var1 < Rasterizer2D_yClipStart) { - var2 -= Rasterizer2D_yClipStart - var1; - var1 = Rasterizer2D_yClipStart; + static void Rasterizer2D_drawVerticalLineAlpha(int x, int y, int length, int rgb, int alpha) { + if (x >= Rasterizer2D_xClipStart && x < Rasterizer2D_xClipEnd) { + if (y < Rasterizer2D_yClipStart) { + length -= Rasterizer2D_yClipStart - y; + y = Rasterizer2D_yClipStart; } - if (var2 + var1 > Rasterizer2D_yClipEnd) { - var2 = Rasterizer2D_yClipEnd - var1; + if (length + y > Rasterizer2D_yClipEnd) { + length = Rasterizer2D_yClipEnd - y; } - int var5 = 256 - var4; - int var6 = (var3 >> 16 & 255) * var4; - int var7 = (var3 >> 8 & 255) * var4; - int var8 = var4 * (var3 & 255); - int var9 = var0 + Rasterizer2D_width * var1; + int var5 = 256 - alpha; + int var6 = (rgb >> 16 & 255) * alpha; + int var7 = (rgb >> 8 & 255) * alpha; + int var8 = alpha * (rgb & 255); + int var9 = x + Rasterizer2D_width * y; - for (int var10 = 0; var10 < var2; ++var10) { + for (int var10 = 0; var10 < length; ++var10) { int var11 = var5 * (Rasterizer2D_pixels[var9] >> 16 & 255); int var12 = (Rasterizer2D_pixels[var9] >> 8 & 255) * var5; int var13 = var5 * (Rasterizer2D_pixels[var9] & 255); @@ -720,78 +720,78 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("et") @Export("Rasterizer2D_drawLine") - public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) { - var2 -= var0; - var3 -= var1; - if (var3 == 0) { - if (var2 >= 0) { - Rasterizer2D_drawHorizontalLine(var0, var1, var2 + 1, var4); + public static void Rasterizer2D_drawLine(int x0, int y0, int x1, int y1, int color) { + x1 -= x0; + y1 -= y0; + if (y1 == 0) { + if (x1 >= 0) { + Rasterizer2D_drawHorizontalLine(x0, y0, x1 + 1, color); } else { - Rasterizer2D_drawHorizontalLine(var0 + var2, var1, -var2 + 1, var4); + Rasterizer2D_drawHorizontalLine(x0 + x1, y0, -x1 + 1, color); } - } else if (var2 == 0) { - if (var3 >= 0) { - Rasterizer2D_drawVerticalLine(var0, var1, var3 + 1, var4); + } else if (x1 == 0) { + if (y1 >= 0) { + Rasterizer2D_drawVerticalLine(x0, y0, y1 + 1, color); } else { - Rasterizer2D_drawVerticalLine(var0, var3 + var1, -var3 + 1, var4); + Rasterizer2D_drawVerticalLine(x0, y1 + y0, -y1 + 1, color); } } else { - if (var3 + var2 < 0) { - var0 += var2; - var2 = -var2; - var1 += var3; - var3 = -var3; + if (y1 + x1 < 0) { + x0 += x1; + x1 = -x1; + y0 += y1; + y1 = -y1; } int var5; int var6; - if (var2 > var3) { - var1 <<= 16; - var1 += 32768; - var3 <<= 16; - var5 = (int)Math.floor((double)var3 / (double)var2 + 0.5D); - var2 += var0; - if (var0 < Rasterizer2D_xClipStart) { - var1 += var5 * (Rasterizer2D_xClipStart - var0); - var0 = Rasterizer2D_xClipStart; + if (x1 > y1) { + y0 <<= 16; + y0 += 32768; + y1 <<= 16; + var5 = (int)Math.floor((double)y1 / (double)x1 + 0.5D); + x1 += x0; + if (x0 < Rasterizer2D_xClipStart) { + y0 += var5 * (Rasterizer2D_xClipStart - x0); + x0 = Rasterizer2D_xClipStart; } - if (var2 >= Rasterizer2D_xClipEnd) { - var2 = Rasterizer2D_xClipEnd - 1; + if (x1 >= Rasterizer2D_xClipEnd) { + x1 = Rasterizer2D_xClipEnd - 1; } - while (var0 <= var2) { - var6 = var1 >> 16; + while (x0 <= x1) { + var6 = y0 >> 16; if (var6 >= Rasterizer2D_yClipStart && var6 < Rasterizer2D_yClipEnd) { - Rasterizer2D_pixels[var0 + var6 * Rasterizer2D_width] = var4; + Rasterizer2D_pixels[x0 + var6 * Rasterizer2D_width] = color; } - var1 += var5; - ++var0; + y0 += var5; + ++x0; } } else { - var0 <<= 16; - var0 += 32768; - var2 <<= 16; - var5 = (int)Math.floor((double)var2 / (double)var3 + 0.5D); - var3 += var1; - if (var1 < Rasterizer2D_yClipStart) { - var0 += (Rasterizer2D_yClipStart - var1) * var5; - var1 = Rasterizer2D_yClipStart; + x0 <<= 16; + x0 += 32768; + x1 <<= 16; + var5 = (int)Math.floor((double)x1 / (double)y1 + 0.5D); + y1 += y0; + if (y0 < Rasterizer2D_yClipStart) { + x0 += (Rasterizer2D_yClipStart - y0) * var5; + y0 = Rasterizer2D_yClipStart; } - if (var3 >= Rasterizer2D_yClipEnd) { - var3 = Rasterizer2D_yClipEnd - 1; + if (y1 >= Rasterizer2D_yClipEnd) { + y1 = Rasterizer2D_yClipEnd - 1; } - while (var1 <= var3) { - var6 = var0 >> 16; + while (y0 <= y1) { + var6 = x0 >> 16; if (var6 >= Rasterizer2D_xClipStart && var6 < Rasterizer2D_xClipEnd) { - Rasterizer2D_pixels[var6 + Rasterizer2D_width * var1] = var4; + Rasterizer2D_pixels[var6 + Rasterizer2D_width * y0] = color; } - var0 += var5; - ++var1; + x0 += var5; + ++y0; } } } @@ -800,9 +800,9 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("eb") @Export("Rasterizer2D_setPixel") - static void Rasterizer2D_setPixel(int var0, int var1, int var2) { - if (var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) { - Rasterizer2D_pixels[var0 + Rasterizer2D_width * var1] = var2; + static void Rasterizer2D_setPixel(int x, int y, int color) { + if (x >= Rasterizer2D_xClipStart && y >= Rasterizer2D_yClipStart && x < Rasterizer2D_xClipEnd && y < Rasterizer2D_yClipEnd) { + Rasterizer2D_pixels[x + Rasterizer2D_width * y] = color; } } diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java index 1723beeb42..5f84a7352c 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -76,15 +76,15 @@ public class Rasterizer3D extends Rasterizer2D { @ObfuscatedName("f") @Export("Rasterizer3D_setClip") - static final void Rasterizer3D_setClip(int var0, int var1, int var2, int var3) { - Rasterizer3D_clipWidth = var2 - var0; - Rasterizer3D_clipHeight = var3 - var1; + static final void Rasterizer3D_setClip(int xStart, int yStart, int xEnd, int yEnd) { + Rasterizer3D_clipWidth = xEnd - xStart; + Rasterizer3D_clipHeight = yEnd - yStart; Rasterizer3D_method3(); if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { Rasterizer3D_rowOffsets = new int[World.method1759(Rasterizer3D_clipHeight)]; } - int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; + int var4 = xStart + Rasterizer2D.Rasterizer2D_width * yStart; for (int var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { Rasterizer3D_rowOffsets[var5] = var4; @@ -122,22 +122,22 @@ public class Rasterizer3D extends Rasterizer2D { signature = "(Lei;)V" ) @Export("Rasterizer3D_setTextureLoader") - public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { - Rasterizer3D_textureLoader = var0; + public static final void Rasterizer3D_setTextureLoader(TextureLoader textureLoader) { + Rasterizer3D_textureLoader = textureLoader; } @ObfuscatedName("u") @Export("Rasterizer3D_setBrightness") - public static final void Rasterizer3D_setBrightness(double var0) { - Rasterizer3D_buildPalette(var0, 0, 512); + public static final void Rasterizer3D_setBrightness(double brightness) { + Rasterizer3D_buildPalette(brightness, 0, 512); } @ObfuscatedName("g") @Export("Rasterizer3D_buildPalette") - static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) { - int var4 = var2 * 128; + static final void Rasterizer3D_buildPalette(double brightness, int hsMin, int hsMax) { + int var4 = hsMin * 128; - for (int var5 = var2; var5 < var3; ++var5) { + for (int var5 = hsMin; var5 < hsMax; ++var5) { double var6 = (double)(var5 >> 3) / 64.0D + 0.0078125D; double var8 = (double)(var5 & 7) / 8.0D + 0.0625D; @@ -200,7 +200,7 @@ public class Rasterizer3D extends Rasterizer2D { int var20 = (int)(var15 * 256.0D); int var27 = (int)(var17 * 256.0D); int var22 = var27 + (var20 << 8) + (var28 << 16); - var22 = Rasterizer3D_brighten(var22, var0); + var22 = Rasterizer3D_brighten(var22, brightness); if (var22 == 0) { var22 = 1; } @@ -213,13 +213,13 @@ public class Rasterizer3D extends Rasterizer2D { @ObfuscatedName("l") @Export("Rasterizer3D_brighten") - static int Rasterizer3D_brighten(int var0, double var1) { - double var3 = (double)(var0 >> 16) / 256.0D; - double var5 = (double)(var0 >> 8 & 255) / 256.0D; - double var7 = (double)(var0 & 255) / 256.0D; - var3 = Math.pow(var3, var1); - var5 = Math.pow(var5, var1); - var7 = Math.pow(var7, var1); + static int Rasterizer3D_brighten(int rgb, double brightness) { + double var3 = (double)(rgb >> 16) / 256.0D; + double var5 = (double)(rgb >> 8 & 255) / 256.0D; + double var7 = (double)(rgb & 255) / 256.0D; + var3 = Math.pow(var3, brightness); + var5 = Math.pow(var5, brightness); + var7 = Math.pow(var7, brightness); int var9 = (int)(var3 * 256.0D); int var10 = (int)(var5 * 256.0D); int var11 = (int)(var7 * 256.0D); @@ -2033,7 +2033,7 @@ public class Rasterizer3D extends Rasterizer2D { int var15 = var6 - var5; int var16; int var10000; - int var17; + int var18; int var19; int var20; int var21; @@ -2077,7 +2077,7 @@ public class Rasterizer3D extends Rasterizer2D { } var2 = (var19 << 20) + var20; - var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20); + var18 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20); var15 >>= 3; var8 <<= 3; var16 = var7 >> 8; @@ -2086,28 +2086,28 @@ public class Rasterizer3D extends Rasterizer2D { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var10000 = var17 + var2; + var10000 = var18 + var2; var19 = var21; var20 = var22; var9 += var12; @@ -2128,7 +2128,7 @@ public class Rasterizer3D extends Rasterizer2D { } var2 = (var19 << 20) + var20; - var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20); + var18 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20); var7 += var8; var16 = var7 >> 8; --var15; @@ -2140,7 +2140,7 @@ public class Rasterizer3D extends Rasterizer2D { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; --var15; } while(var15 > 0); } @@ -2152,49 +2152,49 @@ public class Rasterizer3D extends Rasterizer2D { } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var10000 = var17 + var2; + var10000 = var18 + var2; var19 = var21; var20 = var22; var9 += var12; @@ -2215,7 +2215,7 @@ public class Rasterizer3D extends Rasterizer2D { } var2 = (var19 << 20) + var20; - var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20); + var18 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20); var7 += var8; var16 = var7 >> 8; --var15; @@ -2230,7 +2230,7 @@ public class Rasterizer3D extends Rasterizer2D { } ++var4; - var2 += var17; + var2 += var18; --var15; } while(var15 > 0); } @@ -2272,7 +2272,7 @@ public class Rasterizer3D extends Rasterizer2D { } var2 = (var19 << 18) + var20; - var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18); + var18 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18); var15 >>= 3; var8 <<= 3; var16 = var7 >> 8; @@ -2281,28 +2281,28 @@ public class Rasterizer3D extends Rasterizer2D { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var10000 = var17 + var2; + var10000 = var18 + var2; var19 = var21; var20 = var22; var9 += var12; @@ -2323,7 +2323,7 @@ public class Rasterizer3D extends Rasterizer2D { } var2 = (var19 << 18) + var20; - var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18); + var18 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18); var7 += var8; var16 = var7 >> 8; --var15; @@ -2335,7 +2335,7 @@ public class Rasterizer3D extends Rasterizer2D { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; - var2 += var17; + var2 += var18; --var15; } while(var15 > 0); } @@ -2347,49 +2347,49 @@ public class Rasterizer3D extends Rasterizer2D { } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var2 += var17; + var2 += var18; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8; } ++var4; - var10000 = var17 + var2; + var10000 = var18 + var2; var19 = var21; var20 = var22; var9 += var12; @@ -2410,7 +2410,7 @@ public class Rasterizer3D extends Rasterizer2D { } var2 = (var19 << 18) + var20; - var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18); + var18 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18); var7 += var8; var16 = var7 >> 8; --var15; @@ -2425,7 +2425,7 @@ public class Rasterizer3D extends Rasterizer2D { } ++var4; - var2 += var17; + var2 += var18; --var15; } while(var15 > 0); } diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java index 4137302304..391846e881 100644 --- a/runescape-client/src/main/java/RawPcmStream.java +++ b/runescape-client/src/main/java/RawPcmStream.java @@ -101,9 +101,9 @@ public class RawPcmStream extends PcmStream { } @ObfuscatedName("e") - public synchronized void vmethod263(int[] var1, int var2, int var3) { + public synchronized void fill(int[] var1, int var2, int var3) { if (this.field746 == 0 && this.field752 == 0) { - this.vmethod264(var3); + this.skip(var3); } else { RawSound var4 = (RawSound)super.sound; int var5 = this.start << 8; @@ -290,7 +290,7 @@ public class RawPcmStream extends PcmStream { } @ObfuscatedName("d") - public synchronized void vmethod264(int var1) { + public synchronized void skip(int var1) { if (this.field752 > 0) { if (var1 >= this.field752) { if (this.field746 == Integer.MIN_VALUE) { diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java index c1b0778740..90de54156c 100644 --- a/runescape-client/src/main/java/RawSound.java +++ b/runescape-client/src/main/java/RawSound.java @@ -41,14 +41,14 @@ public class RawSound extends AbstractSound { signature = "(Ldp;)Lcx;" ) @Export("resample") - public RawSound resample(Decimator var1) { - this.samples = var1.resample(this.samples); - this.sampleRate = var1.scaleRate(this.sampleRate); + public RawSound resample(Decimator decimator) { + this.samples = decimator.resample(this.samples); + this.sampleRate = decimator.scaleRate(this.sampleRate); if (this.start == this.end) { - this.start = this.end = var1.scalePosition(this.start); + this.start = this.end = decimator.scalePosition(this.start); } else { - this.start = var1.scalePosition(this.start); - this.end = var1.scalePosition(this.end); + this.start = decimator.scalePosition(this.start); + this.end = decimator.scalePosition(this.end); if (this.start == this.end) { --this.start; } diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index 9a55cda333..fc9b08f46c 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -236,13 +236,13 @@ public class Scene { @ObfuscatedName("f") @Export("init") - public void init(int var1) { - this.minPlane = var1; + public void init(int minPlane) { + this.minPlane = minPlane; for (int var2 = 0; var2 < this.xSize; ++var2) { for (int var3 = 0; var3 < this.ySize; ++var3) { - if (this.tiles[var1][var2][var3] == null) { - this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); + if (this.tiles[minPlane][var2][var3] == null) { + this.tiles[minPlane][var2][var3] = new Tile(minPlane, var2, var3); } } } @@ -251,11 +251,11 @@ public class Scene { @ObfuscatedName("q") @Export("setLinkBelow") - public void setLinkBelow(int var1, int var2) { - Tile var3 = this.tiles[0][var1][var2]; + public void setLinkBelow(int x, int y) { + Tile var3 = this.tiles[0][x][y]; for (int var4 = 0; var4 < 3; ++var4) { - Tile var5 = this.tiles[var4][var1][var2] = this.tiles[var4 + 1][var1][var2]; + Tile var5 = this.tiles[var4][x][y] = this.tiles[var4 + 1][x][y]; if (var5 != null) { --var5.plane; @@ -264,27 +264,27 @@ public class Scene { long var8 = var7.tag; int var10 = (int)(var8 >>> 14 & 3L); boolean var11 = var10 == 2; - if (var11 && var7.startX == var1 && var2 == var7.startY) { + if (var11 && var7.startX == x && y == var7.startY) { --var7.plane; } } } } - if (this.tiles[0][var1][var2] == null) { - this.tiles[0][var1][var2] = new Tile(0, var1, var2); + if (this.tiles[0][x][y] == null) { + this.tiles[0][x][y] = new Tile(0, x, y); } - this.tiles[0][var1][var2].linkedBelowTile = var3; - this.tiles[3][var1][var2] = null; + this.tiles[0][x][y].linkedBelowTile = var3; + this.tiles[3][x][y] = null; } @ObfuscatedName("o") @Export("setTileMinPlane") - public void setTileMinPlane(int var1, int var2, int var3, int var4) { - Tile var5 = this.tiles[var1][var2][var3]; + public void setTileMinPlane(int plane, int x, int y, int minPlane) { + Tile var5 = this.tiles[plane][x][y]; if (var5 != null) { - this.tiles[var1][var2][var3].minPlane = var4; + this.tiles[plane][x][y].minPlane = minPlane; } } @@ -333,20 +333,20 @@ public class Scene { signature = "(IIIILex;JI)V" ) @Export("newFloorDecoration") - public void newFloorDecoration(int var1, int var2, int var3, int var4, Entity var5, long var6, int var8) { - if (var5 != null) { + public void newFloorDecoration(int plane, int x, int y, int tileHeight, Entity entity, long tag, int flags) { + if (entity != null) { FloorDecoration var9 = new FloorDecoration(); - var9.entity = var5; - var9.x = var2 * 128 + 64; - var9.y = var3 * 128 + 64; - var9.tileHeight = var4; - var9.tag = var6; - var9.flags = var8; - if (this.tiles[var1][var2][var3] == null) { - this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); + var9.entity = entity; + var9.x = x * 128 + 64; + var9.y = y * 128 + 64; + var9.tileHeight = tileHeight; + var9.tag = tag; + var9.flags = flags; + if (this.tiles[plane][x][y] == null) { + this.tiles[plane][x][y] = new Tile(plane, x, y); } - this.tiles[var1][var2][var3].floorDecoration = var9; + this.tiles[plane][x][y].floorDecoration = var9; } } @@ -356,17 +356,17 @@ public class Scene { signature = "(IIIILex;JLex;Lex;)V" ) @Export("newGroundItemPile") - public void newGroundItemPile(int var1, int var2, int var3, int var4, Entity var5, long var6, Entity var8, Entity var9) { + public void newGroundItemPile(int plane, int x, int y, int tileHeight, Entity first, long tag, Entity second, Entity third) { GroundItemPile var10 = new GroundItemPile(); - var10.first = var5; - var10.x = var2 * 128 + 64; - var10.y = var3 * 128 + 64; - var10.tileHeight = var4; - var10.tag = var6; - var10.second = var8; - var10.third = var9; + var10.first = first; + var10.x = x * 128 + 64; + var10.y = y * 128 + 64; + var10.tileHeight = tileHeight; + var10.tag = tag; + var10.second = second; + var10.third = third; int var11 = 0; - Tile var12 = this.tiles[var1][var2][var3]; + Tile var12 = this.tiles[plane][x][y]; if (var12 != null) { for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].entity instanceof Model) { @@ -380,11 +380,11 @@ public class Scene { } var10.height = var11; - if (this.tiles[var1][var2][var3] == null) { - this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); + if (this.tiles[plane][x][y] == null) { + this.tiles[plane][x][y] = new Tile(plane, x, y); } - this.tiles[var1][var2][var3].groundItemPile = var10; + this.tiles[plane][x][y].groundItemPile = var10; } @ObfuscatedName("e") @@ -392,26 +392,26 @@ public class Scene { signature = "(IIIILex;Lex;IIJI)V" ) @Export("newBoundaryObject") - public void newBoundaryObject(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, long var9, int var11) { - if (var5 != null || var6 != null) { + public void newBoundaryObject(int plane, int x, int y, int tileHeight, Entity entity1, Entity entity2, int orientationA, int orientationB, long tag, int flags) { + if (entity1 != null || entity2 != null) { BoundaryObject var12 = new BoundaryObject(); - var12.tag = var9; - var12.flags = var11; - var12.x = var2 * 128 + 64; - var12.y = var3 * 128 + 64; - var12.tileHeight = var4; - var12.entity1 = var5; - var12.entity2 = var6; - var12.orientationA = var7; - var12.orientationB = var8; + var12.tag = tag; + var12.flags = flags; + var12.x = x * 128 + 64; + var12.y = y * 128 + 64; + var12.tileHeight = tileHeight; + var12.entity1 = entity1; + var12.entity2 = entity2; + var12.orientationA = orientationA; + var12.orientationB = orientationB; - for (int var13 = var1; var13 >= 0; --var13) { - if (this.tiles[var13][var2][var3] == null) { - this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); + for (int var13 = plane; var13 >= 0; --var13) { + if (this.tiles[var13][x][y] == null) { + this.tiles[var13][x][y] = new Tile(var13, x, y); } } - this.tiles[var1][var2][var3].boundaryObject = var12; + this.tiles[plane][x][y].boundaryObject = var12; } } @@ -421,28 +421,28 @@ public class Scene { signature = "(IIIILex;Lex;IIIIJI)V" ) @Export("newWallDecoration") - public void newWallDecoration(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, int var9, int var10, long var11, int var13) { - if (var5 != null) { + public void newWallDecoration(int plane, int x, int y, int tileHeight, Entity entity1, Entity entity2, int orientation, int int7, int xOffset, int yOffset, long tag, int flags) { + if (entity1 != null) { WallDecoration var14 = new WallDecoration(); - var14.tag = var11; - var14.flags = var13; - var14.x = var2 * 128 + 64; - var14.y = var3 * 128 + 64; - var14.tileHeight = var4; - var14.entity1 = var5; - var14.entity2 = var6; - var14.orientation = var7; - var14.orientation2 = var8; - var14.xOffset = var9; - var14.yOffset = var10; + var14.tag = tag; + var14.flags = flags; + var14.x = x * 128 + 64; + var14.y = y * 128 + 64; + var14.tileHeight = tileHeight; + var14.entity1 = entity1; + var14.entity2 = entity2; + var14.orientation = orientation; + var14.orientation2 = int7; + var14.xOffset = xOffset; + var14.yOffset = yOffset; - for (int var15 = var1; var15 >= 0; --var15) { - if (this.tiles[var15][var2][var3] == null) { - this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); + for (int var15 = plane; var15 >= 0; --var15) { + if (this.tiles[var15][x][y] == null) { + this.tiles[var15][x][y] = new Tile(var15, x, y); } } - this.tiles[var1][var2][var3].wallDecoration = var14; + this.tiles[plane][x][y].wallDecoration = var14; } } @@ -512,15 +512,15 @@ public class Scene { signature = "(IIIIIIIILex;IZJI)Z" ) @Export("newGameObject") - boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Entity var9, int var10, boolean var11, long var12, int var14) { + boolean newGameObject(int plane, int startX, int startY, int sizeX, int sizeY, int centerX, int centerY, int height, Entity entity, int orientation, boolean isTemp, long tag, int flags) { int var15; - for (int var16 = var2; var16 < var2 + var4; ++var16) { - for (var15 = var3; var15 < var3 + var5; ++var15) { + for (int var16 = startX; var16 < startX + sizeX; ++var16) { + for (var15 = startY; var15 < startY + sizeY; ++var15) { if (var16 < 0 || var15 < 0 || var16 >= this.xSize || var15 >= this.ySize) { return false; } - Tile var17 = this.tiles[var1][var16][var15]; + Tile var17 = this.tiles[plane][var16][var15]; if (var17 != null && var17.gameObjectsCount >= 5) { return false; } @@ -528,45 +528,45 @@ public class Scene { } GameObject var20 = new GameObject(); - var20.tag = var12; - var20.flags = var14; - var20.plane = var1; - var20.centerX = var6; - var20.centerY = var7; - var20.height = var8; - var20.entity = var9; - var20.orientation = var10; - var20.startX = var2; - var20.startY = var3; - var20.endX = var2 + var4 - 1; - var20.endY = var3 + var5 - 1; + var20.tag = tag; + var20.flags = flags; + var20.plane = plane; + var20.centerX = centerX; + var20.centerY = centerY; + var20.height = height; + var20.entity = entity; + var20.orientation = orientation; + var20.startX = startX; + var20.startY = startY; + var20.endX = startX + sizeX - 1; + var20.endY = startY + sizeY - 1; - for (var15 = var2; var15 < var2 + var4; ++var15) { - for (int var21 = var3; var21 < var3 + var5; ++var21) { + for (var15 = startX; var15 < startX + sizeX; ++var15) { + for (int var21 = startY; var21 < startY + sizeY; ++var21) { int var18 = 0; - if (var15 > var2) { + if (var15 > startX) { ++var18; } - if (var15 < var2 + var4 - 1) { + if (var15 < startX + sizeX - 1) { var18 += 4; } - if (var21 > var3) { + if (var21 > startY) { var18 += 8; } - if (var21 < var3 + var5 - 1) { + if (var21 < startY + sizeY - 1) { var18 += 2; } - for (int var19 = var1; var19 >= 0; --var19) { + for (int var19 = plane; var19 >= 0; --var19) { if (this.tiles[var19][var15][var21] == null) { this.tiles[var19][var15][var21] = new Tile(var19, var15, var21); } } - Tile var22 = this.tiles[var1][var15][var21]; + Tile var22 = this.tiles[plane][var15][var21]; var22.gameObjects[var22.gameObjectsCount] = var20; var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; var22.gameObjectsEdgeMask |= var18; @@ -574,7 +574,7 @@ public class Scene { } } - if (var11) { + if (isTemp) { this.tempGameObjects[this.tempGameObjectsCount++] = var20; } @@ -598,14 +598,14 @@ public class Scene { signature = "(Leh;)V" ) @Export("removeGameObject") - void removeGameObject(GameObject var1) { - for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { - for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { - Tile var4 = this.tiles[var1.plane][var2][var3]; + void removeGameObject(GameObject gameObject) { + for (int var2 = gameObject.startX; var2 <= gameObject.endX; ++var2) { + for (int var3 = gameObject.startY; var3 <= gameObject.endY; ++var3) { + Tile var4 = this.tiles[gameObject.plane][var2][var3]; if (var4 != null) { int var5; for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - if (var4.gameObjects[var5] == var1) { + if (var4.gameObjects[var5] == gameObject) { --var4.gameObjectsCount; for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { @@ -644,8 +644,8 @@ public class Scene { @ObfuscatedName("h") @Export("removeBoundaryObject") - public void removeBoundaryObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + public void removeBoundaryObject(int plane, int x, int y) { + Tile var4 = this.tiles[plane][x][y]; if (var4 != null) { var4.boundaryObject = null; } @@ -654,8 +654,8 @@ public class Scene { @ObfuscatedName("b") @Export("removeWallDecoration") - public void removeWallDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + public void removeWallDecoration(int plane, int x, int y) { + Tile var4 = this.tiles[plane][x][y]; if (var4 != null) { var4.wallDecoration = null; } @@ -682,8 +682,8 @@ public class Scene { @ObfuscatedName("p") @Export("removeFloorDecoration") - public void removeFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + public void removeFloorDecoration(int plane, int x, int y) { + Tile var4 = this.tiles[plane][x][y]; if (var4 != null) { var4.floorDecoration = null; } @@ -692,8 +692,8 @@ public class Scene { @ObfuscatedName("v") @Export("removeGroundItemPile") - public void removeGroundItemPile(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + public void removeGroundItemPile(int plane, int x, int y) { + Tile var4 = this.tiles[plane][x][y]; if (var4 != null) { var4.groundItemPile = null; } @@ -705,8 +705,8 @@ public class Scene { signature = "(III)Lej;" ) @Export("getBoundaryObject") - public BoundaryObject getBoundaryObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + public BoundaryObject getBoundaryObject(int plane, int x, int y) { + Tile var4 = this.tiles[plane][x][y]; return var4 == null ? null : var4.boundaryObject; } @@ -715,8 +715,8 @@ public class Scene { signature = "(III)Leq;" ) @Export("getWallDecoration") - public WallDecoration getWallDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + public WallDecoration getWallDecoration(int plane, int x, int y) { + Tile var4 = this.tiles[plane][x][y]; return var4 == null ? null : var4.wallDecoration; } @@ -748,8 +748,8 @@ public class Scene { signature = "(III)Ldo;" ) @Export("getFloorDecoration") - public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + public FloorDecoration getFloorDecoration(int plane, int x, int y) { + Tile var4 = this.tiles[plane][x][y]; return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; } @@ -787,15 +787,15 @@ public class Scene { @ObfuscatedName("ah") @Export("getFloorDecorationTag") - public long getFloorDecorationTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + public long getFloorDecorationTag(int plane, int x, int y) { + Tile var4 = this.tiles[plane][x][y]; return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; } @ObfuscatedName("ak") @Export("getObjectFlags") - public int getObjectFlags(int var1, int var2, int var3, long var4) { - Tile var6 = this.tiles[var1][var2][var3]; + public int getObjectFlags(int plane, int x, int y, long var4) { + Tile var6 = this.tiles[plane][x][y]; if (var6 == null) { return -1; } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { @@ -958,8 +958,8 @@ public class Scene { @ObfuscatedName("ae") @Export("drawTileMinimap") - public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) { - Tile var7 = this.tiles[var4][var5][var6]; + public void drawTileMinimap(int[] pixels, int index, int width, int plane, int x, int y) { + Tile var7 = this.tiles[plane][x][y]; if (var7 != null) { TilePaint var8 = var7.paint; int var9; @@ -967,11 +967,11 @@ public class Scene { int var10 = var8.rgb; if (var10 != 0) { for (var9 = 0; var9 < 4; ++var9) { - var1[var2] = var10; - var1[var2 + 1] = var10; - var1[var2 + 2] = var10; - var1[var2 + 3] = var10; - var2 += var3; + pixels[index] = var10; + pixels[index + 1] = var10; + pixels[index + 2] = var10; + pixels[index + 3] = var10; + index += width; } } } else { @@ -987,31 +987,31 @@ public class Scene { int var17; if (var12 != 0) { for (var17 = 0; var17 < 4; ++var17) { - var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; - var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; - var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; - var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; - var2 += var3; + pixels[index] = var14[var15[var16++]] == 0 ? var12 : var13; + pixels[index + 1] = var14[var15[var16++]] == 0 ? var12 : var13; + pixels[index + 2] = var14[var15[var16++]] == 0 ? var12 : var13; + pixels[index + 3] = var14[var15[var16++]] == 0 ? var12 : var13; + index += width; } } else { for (var17 = 0; var17 < 4; ++var17) { if (var14[var15[var16++]] != 0) { - var1[var2] = var13; + pixels[index] = var13; } if (var14[var15[var16++]] != 0) { - var1[var2 + 1] = var13; + pixels[index + 1] = var13; } if (var14[var15[var16++]] != 0) { - var1[var2 + 2] = var13; + pixels[index + 2] = var13; } if (var14[var15[var16++]] != 0) { - var1[var2 + 3] = var13; + pixels[index + 3] = var13; } - var2 += var3; + index += width; } } } @@ -1022,13 +1022,13 @@ public class Scene { @ObfuscatedName("ap") @Export("menuOpen") - public void menuOpen(int var1, int var2, int var3, boolean var4) { + public void menuOpen(int plane, int screenX, int screenY, boolean var4) { if (!method3187() || var4) { checkClick = true; viewportWalking = var4; - Scene_selectedPlane = var1; - Scene_selectedScreenX = var2; - Scene_selectedScreenY = var3; + Scene_selectedPlane = plane; + Scene_selectedScreenX = screenX; + Scene_selectedScreenY = screenY; Scene_selectedX = -1; Scene_selectedY = -1; } @@ -1042,11 +1042,11 @@ public class Scene { @ObfuscatedName("az") @Export("draw") - public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 < 0) { - var1 = 0; - } else if (var1 >= this.xSize * 128) { - var1 = this.xSize * 128 - 1; + public void draw(int x, int y, int var3, int pitch, int yaw, int plane) { + if (x < 0) { + x = 0; + } else if (x >= this.xSize * 128) { + x = this.xSize * 128 - 1; } if (var3 < 0) { @@ -1055,24 +1055,24 @@ public class Scene { var3 = this.ySize * 128 - 1; } - if (var4 < 128) { - var4 = 128; - } else if (var4 > 383) { - var4 = 383; + if (pitch < 128) { + pitch = 128; + } else if (pitch > 383) { + pitch = 383; } ++Scene_drawnCount; - Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; - Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; - Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; - Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; - visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; - Scene_cameraX = var1; - Scene_cameraY = var2; + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[pitch]; + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[pitch]; + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[yaw]; + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[yaw]; + visibleTiles = visibilityMap[(pitch - 128) / 32][yaw / 64]; + Scene_cameraX = x; + Scene_cameraY = y; Scene_cameraZ = var3; - Scene_cameraXTile = var1 / 128; + Scene_cameraXTile = x / 128; Scene_cameraYTile = var3 / 128; - Scene_plane = var6; + Scene_plane = plane; Scene_cameraXTileMin = Scene_cameraXTile - 25; if (Scene_cameraXTileMin < 0) { Scene_cameraXTileMin = 0; @@ -1107,7 +1107,7 @@ public class Scene { for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { Tile var11 = var8[var9][var10]; if (var11 != null) { - if (var11.minPlane > var6 || !visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] && this.tileHeights[var7][var9][var10] - var2 < 2000) { + if (var11.minPlane > plane || !visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] && this.tileHeights[var7][var9][var10] - y < 2000) { var11.drawPrimary = false; var11.drawSecondary = false; var11.drawGameObjectEdges = 0; @@ -1128,8 +1128,8 @@ public class Scene { } int var12; - int var13; - Tile var14; + Tile var13; + int var14; int var15; int var16; for (var7 = this.minPlane; var7 < this.planes; ++var7) { @@ -1137,39 +1137,39 @@ public class Scene { for (var9 = -25; var9 <= 0; ++var9) { var10 = var9 + Scene_cameraXTile; - var15 = Scene_cameraXTile - var9; - if (var10 >= Scene_cameraXTileMin || var15 < Scene_cameraXTileMax) { - for (var16 = -25; var16 <= 0; ++var16) { - var12 = var16 + Scene_cameraYTile; - var13 = Scene_cameraYTile - var16; + var14 = Scene_cameraXTile - var9; + if (var10 >= Scene_cameraXTileMin || var14 < Scene_cameraXTileMax) { + for (var15 = -25; var15 <= 0; ++var15) { + var16 = var15 + Scene_cameraYTile; + var12 = Scene_cameraYTile - var15; if (var10 >= Scene_cameraXTileMin) { - if (var12 >= Scene_cameraYTileMin) { - var14 = var8[var10][var12]; - if (var14 != null && var14.drawPrimary) { - this.drawTile(var14, true); + if (var16 >= Scene_cameraYTileMin) { + var13 = var8[var10][var16]; + if (var13 != null && var13.drawPrimary) { + this.drawTile(var13, true); } } - if (var13 < Scene_cameraYTileMax) { - var14 = var8[var10][var13]; - if (var14 != null && var14.drawPrimary) { - this.drawTile(var14, true); + if (var12 < Scene_cameraYTileMax) { + var13 = var8[var10][var12]; + if (var13 != null && var13.drawPrimary) { + this.drawTile(var13, true); } } } - if (var15 < Scene_cameraXTileMax) { - if (var12 >= Scene_cameraYTileMin) { - var14 = var8[var15][var12]; - if (var14 != null && var14.drawPrimary) { - this.drawTile(var14, true); + if (var14 < Scene_cameraXTileMax) { + if (var16 >= Scene_cameraYTileMin) { + var13 = var8[var14][var16]; + if (var13 != null && var13.drawPrimary) { + this.drawTile(var13, true); } } - if (var13 < Scene_cameraYTileMax) { - var14 = var8[var15][var13]; - if (var14 != null && var14.drawPrimary) { - this.drawTile(var14, true); + if (var12 < Scene_cameraYTileMax) { + var13 = var8[var14][var12]; + if (var13 != null && var13.drawPrimary) { + this.drawTile(var13, true); } } } @@ -1188,39 +1188,39 @@ public class Scene { for (var9 = -25; var9 <= 0; ++var9) { var10 = var9 + Scene_cameraXTile; - var15 = Scene_cameraXTile - var9; - if (var10 >= Scene_cameraXTileMin || var15 < Scene_cameraXTileMax) { - for (var16 = -25; var16 <= 0; ++var16) { - var12 = var16 + Scene_cameraYTile; - var13 = Scene_cameraYTile - var16; + var14 = Scene_cameraXTile - var9; + if (var10 >= Scene_cameraXTileMin || var14 < Scene_cameraXTileMax) { + for (var15 = -25; var15 <= 0; ++var15) { + var16 = var15 + Scene_cameraYTile; + var12 = Scene_cameraYTile - var15; if (var10 >= Scene_cameraXTileMin) { - if (var12 >= Scene_cameraYTileMin) { - var14 = var8[var10][var12]; - if (var14 != null && var14.drawPrimary) { - this.drawTile(var14, false); + if (var16 >= Scene_cameraYTileMin) { + var13 = var8[var10][var16]; + if (var13 != null && var13.drawPrimary) { + this.drawTile(var13, false); } } - if (var13 < Scene_cameraYTileMax) { - var14 = var8[var10][var13]; - if (var14 != null && var14.drawPrimary) { - this.drawTile(var14, false); + if (var12 < Scene_cameraYTileMax) { + var13 = var8[var10][var12]; + if (var13 != null && var13.drawPrimary) { + this.drawTile(var13, false); } } } - if (var15 < Scene_cameraXTileMax) { - if (var12 >= Scene_cameraYTileMin) { - var14 = var8[var15][var12]; - if (var14 != null && var14.drawPrimary) { - this.drawTile(var14, false); + if (var14 < Scene_cameraXTileMax) { + if (var16 >= Scene_cameraYTileMin) { + var13 = var8[var14][var16]; + if (var13 != null && var13.drawPrimary) { + this.drawTile(var13, false); } } - if (var13 < Scene_cameraYTileMax) { - var14 = var8[var15][var13]; - if (var14 != null && var14.drawPrimary) { - this.drawTile(var14, false); + if (var12 < Scene_cameraYTileMax) { + var13 = var8[var14][var12]; + if (var13 != null && var13.drawPrimary) { + this.drawTile(var13, false); } } } @@ -1242,8 +1242,8 @@ public class Scene { signature = "(Ldj;Z)V" ) @Export("drawTile") - void drawTile(Tile var1, boolean var2) { - Scene_tilesDeque.addFirst(var1); + void drawTile(Tile tile, boolean var2) { + Scene_tilesDeque.addFirst(tile); while (true) { Tile var3; @@ -2417,13 +2417,13 @@ public class Scene { @ObfuscatedName("at") @Export("Scene_buildVisiblityMap") - public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { + public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int viewportWidth, int viewportHeight) { Scene_viewportXMin = 0; Scene_viewportYMin = 0; - Scene_viewportXMax = var3; - Scene_viewportYMax = var4; - Scene_viewportXCenter = var3 / 2; - Scene_viewportYCenter = var4 / 2; + Scene_viewportXMax = viewportWidth; + Scene_viewportYMax = viewportHeight; + Scene_viewportXCenter = viewportWidth / 2; + Scene_viewportYCenter = viewportHeight / 2; boolean[][][][] var5 = new boolean[var0.length][32][53][53]; int var6; diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 8ca4152491..41de47a2e5 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -93,8 +93,8 @@ public class ScriptEvent extends Node { garbageValue = "723852511" ) @Export("setArgs") - public void setArgs(Object[] var1) { - this.args0 = var1; + public void setArgs(Object[] args) { + this.args0 = args; } @ObfuscatedName("f") @@ -103,8 +103,8 @@ public class ScriptEvent extends Node { garbageValue = "-110" ) @Export("setType") - public void setType(int var1) { - this.type0 = var1; + public void setType(int type) { + this.type0 = type; } @ObfuscatedName("j") @@ -157,7 +157,7 @@ public class ScriptEvent extends Node { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.rectangleMode.rsOrdinal(); return 1; } else if (var0 == 1614) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.field964 ? 1 : 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; return 1; } else { return 2; @@ -272,7 +272,7 @@ public class ScriptEvent extends Node { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.weight; return 1; } else if (var0 == ScriptOpcodes.PLAYERMOD) { - if (Client.field155) { + if (Client.playerMod) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index e86e4aea9d..dae5cef950 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -36,12 +36,12 @@ public class ScriptFrame { garbageValue = "-1726705535" ) @Export("findEnumerated") - public static Enumerated findEnumerated(Enumerated[] var0, int var1) { - Enumerated[] var2 = var0; + public static Enumerated findEnumerated(Enumerated[] values, int ordinal) { + Enumerated[] var2 = values; for (int var3 = 0; var3 < var2.length; ++var3) { Enumerated var4 = var2[var3]; - if (var1 == var4.rsOrdinal()) { + if (ordinal == var4.rsOrdinal()) { return var4; } } diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index b8c180e6fb..3db6636931 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -129,38 +129,38 @@ public class SequenceDefinition extends DualNode { ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - int[] var10000; - int var3; + int[] var3; int var4; + int var5; if (var2 == 1) { - var3 = var1.readUnsignedShort(); - this.frameLengths = new int[var3]; + var4 = var1.readUnsignedShort(); + this.frameLengths = new int[var4]; - for (var4 = 0; var4 < var3; ++var4) { - this.frameLengths[var4] = var1.readUnsignedShort(); + for (var5 = 0; var5 < var4; ++var5) { + this.frameLengths[var5] = var1.readUnsignedShort(); } - this.frameIds = new int[var3]; + this.frameIds = new int[var4]; - for (var4 = 0; var4 < var3; ++var4) { - this.frameIds[var4] = var1.readUnsignedShort(); + for (var5 = 0; var5 < var4; ++var5) { + this.frameIds[var5] = var1.readUnsignedShort(); } - for (var4 = 0; var4 < var3; ++var4) { - var10000 = this.frameIds; - var10000[var4] += var1.readUnsignedShort() << 16; + for (var5 = 0; var5 < var4; ++var5) { + var3 = this.frameIds; + var3[var5] += var1.readUnsignedShort() << 16; } } else if (var2 == 2) { this.frameCount = var1.readUnsignedShort(); } else if (var2 == 3) { - var3 = var1.readUnsignedByte(); - this.field777 = new int[var3 + 1]; + var4 = var1.readUnsignedByte(); + this.field777 = new int[var4 + 1]; - for (var4 = 0; var4 < var3; ++var4) { - this.field777[var4] = var1.readUnsignedByte(); + for (var5 = 0; var5 < var4; ++var5) { + this.field777[var5] = var1.readUnsignedByte(); } - this.field777[var3] = 9999999; + this.field777[var4] = 9999999; } else if (var2 == 4) { this.field778 = true; } else if (var2 == 5) { @@ -178,23 +178,23 @@ public class SequenceDefinition extends DualNode { } else if (var2 == 11) { this.field783 = var1.readUnsignedByte(); } else if (var2 == 12) { - var3 = var1.readUnsignedByte(); - this.frameIds2 = new int[var3]; + var4 = var1.readUnsignedByte(); + this.frameIds2 = new int[var4]; - for (var4 = 0; var4 < var3; ++var4) { - this.frameIds2[var4] = var1.readUnsignedShort(); + for (var5 = 0; var5 < var4; ++var5) { + this.frameIds2[var5] = var1.readUnsignedShort(); } - for (var4 = 0; var4 < var3; ++var4) { - var10000 = this.frameIds2; - var10000[var4] += var1.readUnsignedShort() << 16; + for (var5 = 0; var5 < var4; ++var5) { + var3 = this.frameIds2; + var3[var5] += var1.readUnsignedShort() << 16; } } else if (var2 == 13) { - var3 = var1.readUnsignedByte(); - this.field776 = new int[var3]; + var4 = var1.readUnsignedByte(); + this.field776 = new int[var4]; - for (var4 = 0; var4 < var3; ++var4) { - this.field776[var4] = var1.readMedium(); + for (var5 = 0; var5 < var4; ++var5) { + this.field776[var5] = var1.readMedium(); } } @@ -231,15 +231,15 @@ public class SequenceDefinition extends DualNode { garbageValue = "128527714" ) @Export("animateSequence") - public Model animateSequence(Model var1, int var2) { - var2 = this.frameIds[var2]; - Frames var3 = ItemContainer.getFrames(var2 >> 16); - var2 &= 65535; + public Model animateSequence(Model model, int frame) { + frame = this.frameIds[frame]; + Frames var3 = ItemContainer.getFrames(frame >> 16); + frame &= 65535; if (var3 == null) { - return var1.toSharedSequenceModel(true); + return model.toSharedSequenceModel(true); } else { - Model var4 = var1.toSharedSequenceModel(!var3.hasAlphaTransform(var2)); - var4.animate(var3, var2); + Model var4 = model.toSharedSequenceModel(!var3.hasAlphaTransform(frame)); + var4.animate(var3, frame); return var4; } } @@ -250,29 +250,29 @@ public class SequenceDefinition extends DualNode { garbageValue = "-65" ) @Export("animateObject") - Model animateObject(Model var1, int var2, int var3) { - var2 = this.frameIds[var2]; - Frames var4 = ItemContainer.getFrames(var2 >> 16); - var2 &= 65535; + Model animateObject(Model model, int frame, int orientation) { + frame = this.frameIds[frame]; + Frames var4 = ItemContainer.getFrames(frame >> 16); + frame &= 65535; if (var4 == null) { - return var1.toSharedSequenceModel(true); + return model.toSharedSequenceModel(true); } else { - Model var5 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var2)); - var3 &= 3; - if (var3 == 1) { + Model var5 = model.toSharedSequenceModel(!var4.hasAlphaTransform(frame)); + orientation &= 3; + if (orientation == 1) { var5.rotateY270Ccw(); - } else if (var3 == 2) { + } else if (orientation == 2) { var5.rotateY180(); - } else if (var3 == 3) { + } else if (orientation == 3) { var5.rotateY90Ccw(); } - var5.animate(var4, var2); - if (var3 == 1) { + var5.animate(var4, frame); + if (orientation == 1) { var5.rotateY90Ccw(); - } else if (var3 == 2) { + } else if (orientation == 2) { var5.rotateY180(); - } else if (var3 == 3) { + } else if (orientation == 3) { var5.rotateY270Ccw(); } @@ -286,15 +286,15 @@ public class SequenceDefinition extends DualNode { garbageValue = "-1692496767" ) @Export("animateSpotAnimation") - Model animateSpotAnimation(Model var1, int var2) { - var2 = this.frameIds[var2]; - Frames var3 = ItemContainer.getFrames(var2 >> 16); - var2 &= 65535; + Model animateSpotAnimation(Model model, int frame) { + frame = this.frameIds[frame]; + Frames var3 = ItemContainer.getFrames(frame >> 16); + frame &= 65535; if (var3 == null) { - return var1.toSharedSpotAnimationModel(true); + return model.toSharedSpotAnimationModel(true); } else { - Model var4 = var1.toSharedSpotAnimationModel(!var3.hasAlphaTransform(var2)); - var4.animate(var3, var2); + Model var4 = model.toSharedSpotAnimationModel(!var3.hasAlphaTransform(frame)); + var4.animate(var3, frame); return var4; } } @@ -305,24 +305,24 @@ public class SequenceDefinition extends DualNode { garbageValue = "-386360993" ) @Export("animateSequence2") - public Model animateSequence2(Model var1, int var2, SequenceDefinition var3, int var4) { - var2 = this.frameIds[var2]; - Frames var5 = ItemContainer.getFrames(var2 >> 16); - var2 &= 65535; + public Model animateSequence2(Model model, int frame, SequenceDefinition sequence, int sequenceFrame) { + frame = this.frameIds[frame]; + Frames var5 = ItemContainer.getFrames(frame >> 16); + frame &= 65535; if (var5 == null) { - return var3.animateSequence(var1, var4); + return sequence.animateSequence(model, sequenceFrame); } else { - var4 = var3.frameIds[var4]; - Frames var6 = ItemContainer.getFrames(var4 >> 16); - var4 &= 65535; + sequenceFrame = sequence.frameIds[sequenceFrame]; + Frames var6 = ItemContainer.getFrames(sequenceFrame >> 16); + sequenceFrame &= 65535; Model var7; if (var6 == null) { - var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); - var7.animate(var5, var2); + var7 = model.toSharedSequenceModel(!var5.hasAlphaTransform(frame)); + var7.animate(var5, frame); return var7; } else { - var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); - var7.animate2(var5, var2, var6, var4, this.field777); + var7 = model.toSharedSequenceModel(!var5.hasAlphaTransform(frame) & !var6.hasAlphaTransform(sequenceFrame)); + var7.animate2(var5, frame, var6, sequenceFrame, this.field777); return var7; } } @@ -334,29 +334,29 @@ public class SequenceDefinition extends DualNode { garbageValue = "-15433768" ) @Export("animateWidget") - public Model animateWidget(Model var1, int var2) { - int var3 = this.frameIds[var2]; + public Model animateWidget(Model model, int frame) { + int var3 = this.frameIds[frame]; Frames var4 = ItemContainer.getFrames(var3 >> 16); var3 &= 65535; if (var4 == null) { - return var1.toSharedSequenceModel(true); + return model.toSharedSequenceModel(true); } else { Frames var5 = null; int var6 = 0; - if (this.frameIds2 != null && var2 < this.frameIds2.length) { - var6 = this.frameIds2[var2]; + if (this.frameIds2 != null && frame < this.frameIds2.length) { + var6 = this.frameIds2[frame]; var5 = ItemContainer.getFrames(var6 >> 16); var6 &= 65535; } Model var7; if (var5 != null && var6 != 65535) { - var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); + var7 = model.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); var7.animate(var4, var3); var7.animate(var5, var6); return var7; } else { - var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); + var7 = model.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); var7.animate(var4, var3); return var7; } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index 175df49e43..68feb8a77e 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -477,7 +477,7 @@ public class ServerPacket { VarbitDefinition.indexedSpriteWidths = null; SecureRandomCallable.indexedSpriteHeights = null; class328.indexedSpritePalette = null; - class328.spritePixels = (byte[][])null; + class328.spritePixels = ((byte[][])null); return var0; } diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index 586d0e674f..b5309806fc 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -35,15 +35,15 @@ public class Skills { var1.post(); if (var1.noteTemplate != -1) { - var1.method140(getItemDefinition(var1.noteTemplate), getItemDefinition(var1.note)); + var1.genCert(getItemDefinition(var1.noteTemplate), getItemDefinition(var1.note)); } if (var1.notedId != -1) { - var1.method141(getItemDefinition(var1.notedId), getItemDefinition(var1.unnotedId)); + var1.genBought(getItemDefinition(var1.notedId), getItemDefinition(var1.unnotedId)); } if (var1.placeholderTemplate != -1) { - var1.method142(getItemDefinition(var1.placeholderTemplate), getItemDefinition(var1.placeholder)); + var1.genPlaceholder(getItemDefinition(var1.placeholderTemplate), getItemDefinition(var1.placeholder)); } if (!class30.inMembersWorld && var1.isMembersOnly) { diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java index e27628c686..c529ad236a 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -154,71 +154,71 @@ public class SoundCache { garbageValue = "-1706770105" ) @Export("encodeStringCp1252") - public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { - int var5 = var2 - var1; + public static int encodeStringCp1252(CharSequence src, int srcStart, int srcEnd, byte[] dst, int dstStart) { + int var5 = srcEnd - srcStart; for (int var6 = 0; var6 < var5; ++var6) { - char var7 = var0.charAt(var6 + var1); + char var7 = src.charAt(var6 + srcStart); if ((var7 <= 0 || var7 >= 128) && (var7 < 160 || var7 > 255)) { if (var7 == 8364) { - var3[var6 + var4] = -128; + dst[var6 + dstStart] = -128; } else if (var7 == 8218) { - var3[var6 + var4] = -126; + dst[var6 + dstStart] = -126; } else if (var7 == 402) { - var3[var6 + var4] = -125; + dst[var6 + dstStart] = -125; } else if (var7 == 8222) { - var3[var6 + var4] = -124; + dst[var6 + dstStart] = -124; } else if (var7 == 8230) { - var3[var6 + var4] = -123; + dst[var6 + dstStart] = -123; } else if (var7 == 8224) { - var3[var6 + var4] = -122; + dst[var6 + dstStart] = -122; } else if (var7 == 8225) { - var3[var6 + var4] = -121; + dst[var6 + dstStart] = -121; } else if (var7 == 710) { - var3[var6 + var4] = -120; + dst[var6 + dstStart] = -120; } else if (var7 == 8240) { - var3[var6 + var4] = -119; + dst[var6 + dstStart] = -119; } else if (var7 == 352) { - var3[var6 + var4] = -118; + dst[var6 + dstStart] = -118; } else if (var7 == 8249) { - var3[var6 + var4] = -117; + dst[var6 + dstStart] = -117; } else if (var7 == 338) { - var3[var6 + var4] = -116; + dst[var6 + dstStart] = -116; } else if (var7 == 381) { - var3[var6 + var4] = -114; + dst[var6 + dstStart] = -114; } else if (var7 == 8216) { - var3[var6 + var4] = -111; + dst[var6 + dstStart] = -111; } else if (var7 == 8217) { - var3[var6 + var4] = -110; + dst[var6 + dstStart] = -110; } else if (var7 == 8220) { - var3[var6 + var4] = -109; + dst[var6 + dstStart] = -109; } else if (var7 == 8221) { - var3[var6 + var4] = -108; + dst[var6 + dstStart] = -108; } else if (var7 == 8226) { - var3[var6 + var4] = -107; + dst[var6 + dstStart] = -107; } else if (var7 == 8211) { - var3[var6 + var4] = -106; + dst[var6 + dstStart] = -106; } else if (var7 == 8212) { - var3[var6 + var4] = -105; + dst[var6 + dstStart] = -105; } else if (var7 == 732) { - var3[var6 + var4] = -104; + dst[var6 + dstStart] = -104; } else if (var7 == 8482) { - var3[var6 + var4] = -103; + dst[var6 + dstStart] = -103; } else if (var7 == 353) { - var3[var6 + var4] = -102; + dst[var6 + dstStart] = -102; } else if (var7 == 8250) { - var3[var6 + var4] = -101; + dst[var6 + dstStart] = -101; } else if (var7 == 339) { - var3[var6 + var4] = -100; + dst[var6 + dstStart] = -100; } else if (var7 == 382) { - var3[var6 + var4] = -98; + dst[var6 + dstStart] = -98; } else if (var7 == 376) { - var3[var6 + var4] = -97; + dst[var6 + dstStart] = -97; } else { - var3[var6 + var4] = 63; + dst[var6 + dstStart] = 63; } } else { - var3[var6 + var4] = (byte)var7; + dst[var6 + dstStart] = (byte)var7; } } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index a0568f7435..29276a314d 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -66,8 +66,8 @@ public class SoundEffect { if (var1 != 9999999 && var1 != 0) { for (var2 = 0; var2 < 10; ++var2) { if (this.instruments[var2] != null) { - Instrument var10000 = this.instruments[var2]; - var10000.offset -= var1 * 20; + Instrument var3 = this.instruments[var2]; + var3.offset -= var1 * 20; } } diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java index dcbf6c0597..114aa68414 100644 --- a/runescape-client/src/main/java/SoundEnvelope.java +++ b/runescape-client/src/main/java/SoundEnvelope.java @@ -55,11 +55,11 @@ public class SoundEnvelope { signature = "(Lgr;)V" ) @Export("decode") - final void decode(Buffer var1) { - this.form = var1.readUnsignedByte(); - this.start = var1.readInt(); - this.end = var1.readInt(); - this.decodeSegments(var1); + final void decode(Buffer buffer) { + this.form = buffer.readUnsignedByte(); + this.start = buffer.readInt(); + this.end = buffer.readInt(); + this.decodeSegments(buffer); } @ObfuscatedName("f") @@ -67,14 +67,14 @@ public class SoundEnvelope { signature = "(Lgr;)V" ) @Export("decodeSegments") - final void decodeSegments(Buffer var1) { - this.segments = var1.readUnsignedByte(); + final void decodeSegments(Buffer buffer) { + this.segments = buffer.readUnsignedByte(); this.durations = new int[this.segments]; this.phases = new int[this.segments]; for (int var2 = 0; var2 < this.segments; ++var2) { - this.durations[var2] = var1.readUnsignedShort(); - this.phases[var2] = var1.readUnsignedShort(); + this.durations[var2] = buffer.readUnsignedShort(); + this.phases[var2] = buffer.readUnsignedShort(); } } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index f2f467aa57..7bc1f44bd8 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -105,14 +105,14 @@ public class SpotAnimationDefinition extends DualNode { garbageValue = "906815828" ) @Export("decode") - void decode(Buffer var1) { + void decode(Buffer buffer) { while (true) { - int var2 = var1.readUnsignedByte(); + int var2 = buffer.readUnsignedByte(); if (var2 == 0) { return; } - this.decodeNext(var1, var2); + this.decodeNext(buffer, var2); } } @@ -122,41 +122,41 @@ public class SpotAnimationDefinition extends DualNode { garbageValue = "2099681848" ) @Export("decodeNext") - void decodeNext(Buffer var1, int var2) { + void decodeNext(Buffer buffer, int var2) { if (var2 == 1) { - this.archive = var1.readUnsignedShort(); + this.archive = buffer.readUnsignedShort(); } else if (var2 == 2) { - this.sequence = var1.readUnsignedShort(); + this.sequence = buffer.readUnsignedShort(); } else if (var2 == 4) { - this.widthScale = var1.readUnsignedShort(); + this.widthScale = buffer.readUnsignedShort(); } else if (var2 == 5) { - this.heightScale = var1.readUnsignedShort(); + this.heightScale = buffer.readUnsignedShort(); } else if (var2 == 6) { - this.orientation = var1.readUnsignedShort(); + this.orientation = buffer.readUnsignedShort(); } else if (var2 == 7) { - this.field876 = var1.readUnsignedByte(); + this.field876 = buffer.readUnsignedByte(); } else if (var2 == 8) { - this.field877 = var1.readUnsignedByte(); + this.field877 = buffer.readUnsignedByte(); } else { int var3; int var4; if (var2 == 40) { - var3 = var1.readUnsignedByte(); + var3 = buffer.readUnsignedByte(); this.recolorFrom = new short[var3]; this.recolorTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); - this.recolorTo[var4] = (short)var1.readUnsignedShort(); + this.recolorFrom[var4] = (short)buffer.readUnsignedShort(); + this.recolorTo[var4] = (short)buffer.readUnsignedShort(); } } else if (var2 == 41) { - var3 = var1.readUnsignedByte(); + var3 = buffer.readUnsignedByte(); this.retextureFrom = new short[var3]; this.retextureTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); - this.retextureTo[var4] = (short)var1.readUnsignedShort(); + this.retextureFrom[var4] = (short)buffer.readUnsignedShort(); + this.retextureTo[var4] = (short)buffer.readUnsignedShort(); } } } diff --git a/runescape-client/src/main/java/Sprite.java b/runescape-client/src/main/java/Sprite.java index 58538a0d46..81b909b331 100644 --- a/runescape-client/src/main/java/Sprite.java +++ b/runescape-client/src/main/java/Sprite.java @@ -666,44 +666,45 @@ public final class Sprite extends Rasterizer2D { int var9 = var2 < 0 ? -var2 : 0; int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; int var11 = var1 < 0 ? -var1 : 0; + int var12; if (this.subWidth + var1 <= var5) { - int var12 = this.subWidth; + var12 = this.subWidth; } else { int var10000 = var5 - var1; } - int var13 = var3 + var11 + (var9 + var2 + var4) * Rasterizer2D.Rasterizer2D_width + var1; - int var14 = var9 + var2; + var12 = var3 + var11 + (var9 + var2 + var4) * Rasterizer2D.Rasterizer2D_width + var1; + int var13 = var9 + var2; + + for (int var14 = var9; var14 < var10; ++var14) { + int var15 = var7[var13]; + int var16 = var8[var13++]; + int var17 = var12; + int var18; + if (var1 < var15) { + var18 = var15 - var1; + var17 = var12 + (var18 - var11); + } else { + var18 = var11; + } - for (int var15 = var9; var15 < var10; ++var15) { - int var16 = var7[var14]; - int var17 = var8[var14++]; - int var18 = var13; int var19; - if (var1 < var16) { - var19 = var16 - var1; - var18 = var13 + (var19 - var11); + if (this.subWidth + var1 <= var15 + var16) { + var19 = this.subWidth; } else { - var19 = var11; + var19 = var15 + var16 - var1; } - int var20; - if (this.subWidth + var1 <= var16 + var17) { - var20 = this.subWidth; - } else { - var20 = var16 + var17 - var1; - } - - for (int var21 = var19; var21 < var20; ++var21) { - int var22 = this.pixels[var21 + var15 * this.subWidth]; - if (var22 != 0) { - Rasterizer2D.Rasterizer2D_pixels[var18++] = var22; + for (int var20 = var18; var20 < var19; ++var20) { + int var21 = this.pixels[var20 + var14 * this.subWidth]; + if (var21 != 0) { + Rasterizer2D.Rasterizer2D_pixels[var17++] = var21; } else { - ++var18; + ++var17; } } - var13 += Rasterizer2D.Rasterizer2D_width; + var12 += Rasterizer2D.Rasterizer2D_width; } } diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index 48dbd00210..c248aeaada 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -39,10 +39,10 @@ public class SpriteMask extends DualNode { garbageValue = "781236044" ) @Export("contains") - public boolean contains(int var1, int var2) { - if (var2 >= 0 && var2 < this.xStarts.length) { - int var3 = this.xStarts[var2]; - if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { + public boolean contains(int x, int y) { + if (y >= 0 && y < this.xStarts.length) { + int var3 = this.xStarts[y]; + if (x >= var3 && x <= var3 + this.xWidths[y]) { return true; } } diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index b09dcca747..7e7903bafb 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -27,28 +27,26 @@ public class Strings { Buffer var1 = new Buffer(var0); int var2 = var1.readUnsignedByte(); int var3 = var1.readInt(); - if (var3 >= 0 && (AbstractArchive.field1 == 0 || var3 <= AbstractArchive.field1)) { - if (var2 == 0) { - byte[] var6 = new byte[var3]; - var1.method46(var6, 0, var3); - return var6; - } else { - int var4 = var1.readInt(); - if (var4 < 0 || AbstractArchive.field1 != 0 && var4 > AbstractArchive.field1) { - throw new RuntimeException(); - } else { - byte[] var5 = new byte[var4]; - if (var2 == 1) { - Bzip2Decompressor.Bzip2Decompressor_decompress(var5, var4, var0, var3, 9); - } else { - AbstractArchive.gzipDecompressor.decompress(var1, var5); - } - - return var5; - } - } - } else { + if (var3 < 0 || AbstractArchive.field1 != 0 && var3 > AbstractArchive.field1) { throw new RuntimeException(); + } else if (var2 == 0) { + byte[] var6 = new byte[var3]; + var1.method46(var6, 0, var3); + return var6; + } else { + int var4 = var1.readInt(); + if (var4 < 0 || AbstractArchive.field1 != 0 && var4 > AbstractArchive.field1) { + throw new RuntimeException(); + } else { + byte[] var5 = new byte[var4]; + if (var2 == 1) { + Bzip2Decompressor.Bzip2Decompressor_decompress(var5, var4, var0, var3, 9); + } else { + AbstractArchive.gzipDecompressor.decompress(var1, var5); + } + + return var5; + } } } diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index eea4b8bdae..fac6e90ef1 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -276,7 +276,7 @@ public class StructDefinition extends DualNode { return 1; } else if (var0 == 1127) { var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - var4.field964 = var6; + var4.modelTransparency = var6; return 1; } else { return 2; diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index b86fc415ec..87f2f9d2b5 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -69,7 +69,7 @@ public enum StudioGame implements Enumerated { garbageValue = "-2058685786" ) public static FloorUnderlayDefinition method4550(int var0) { - FloorUnderlayDefinition var1 = (FloorUnderlayDefinition) FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); + FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); if (var1 != null) { return var1; } else { diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java index 4e8252ffb7..c40719ff15 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -112,8 +112,8 @@ public class TextureProvider implements TextureLoader { @ObfuscatedName("f") @Export("setBrightness") - public void setBrightness(double var1) { - this.brightness0 = var1; + public void setBrightness(double brightness) { + this.brightness0 = brightness; this.clear(); } @@ -231,12 +231,12 @@ public class TextureProvider implements TextureLoader { garbageValue = "-8" ) @Export("byteArrayFromObject") - public static byte[] byteArrayFromObject(Object var0, boolean var1) { + public static byte[] byteArrayFromObject(Object var0, boolean copyArray) { if (var0 == null) { return null; } else if (var0 instanceof byte[]) { - byte[] var5 = (byte[])var0; - if (var1) { + byte[] var5 = ((byte[])var0); + if (copyArray) { int var3 = var5.length; byte[] var4 = new byte[var3]; System.arraycopy(var5, 0, var4, 0, var3); @@ -262,7 +262,7 @@ public class TextureProvider implements TextureLoader { Buffer var4 = new Buffer(var0); int var5 = -1; - label71: + label56: while (true) { int var6 = var4.method49(); if (var6 == 0) { @@ -274,50 +274,38 @@ public class TextureProvider implements TextureLoader { boolean var8 = false; while (true) { - int var12; - ObjectDefinition var15; - do { - int var13; - int var14; - do { - do { - do { - do { - int var9; - while (var8) { - var9 = var4.method48(); - if (var9 == 0) { - continue label71; - } + int var13; + while (!var8) { + var13 = var4.method48(); + if (var13 == 0) { + continue label56; + } - var4.readUnsignedByte(); - } + var7 += var13 - 1; + int var14 = var7 & 63; + int var15 = var7 >> 6 & 63; + int var9 = var4.readUnsignedByte() >> 2; + int var11 = var15 + var1; + int var12 = var14 + var2; + if (var11 > 0 && var12 > 0 && var11 < 103 && var12 < 103) { + ObjectDefinition var10 = class50.getObjectDefinition(var5); + if (var9 != 22 || !Client.isLowDetail || var10.int1 != 0 || var10.interactType == 1 || var10.boolean2) { + if (!var10.method231()) { + ++Client.field179; + var3 = false; + } - var9 = var4.method48(); - if (var9 == 0) { - continue label71; - } - - var7 += var9 - 1; - int var10 = var7 & 63; - int var11 = var7 >> 6 & 63; - var12 = var4.readUnsignedByte() >> 2; - var13 = var11 + var1; - var14 = var10 + var2; - } while(var13 <= 0); - } while(var14 <= 0); - } while(var13 >= 103); - } while(var14 >= 103); - - var15 = class50.getObjectDefinition(var5); - } while(var12 == 22 && Client.isLowDetail && var15.int1 == 0 && var15.interactType != 1 && !var15.boolean2); - - if (!var15.method231()) { - ++Client.field179; - var3 = false; + var8 = true; + } + } } - var8 = true; + var13 = var4.method48(); + if (var13 == 0) { + break; + } + + var4.readUnsignedByte(); } } } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index 43aa68bb91..753d7eb522 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -155,19 +155,19 @@ public final class Tile extends Node { garbageValue = "117" ) @Export("addNpcToMenu") - static final void addNpcToMenu(NPCDefinition var0, int var1, int var2, int var3) { + static final void addNpcToMenu(NPCDefinition npc, int menuArg0, int menuArg1, int menuArg2) { if (Client.menuOptionsCount < 400) { - if (var0.transforms != null) { - var0 = var0.transform(); + if (npc.transforms != null) { + npc = npc.transform(); } - if (var0 != null && var0.isInteractable && (!var0.isFollower || Client.followerIndex == var1)) { - String var4 = var0.name; + if (npc != null && npc.isInteractable && (!npc.isFollower || Client.followerIndex == menuArg0)) { + String var4 = npc.name; int var5; int var6; int var7; - if (var0.combatLevel != 0) { - var5 = var0.combatLevel; + if (npc.combatLevel != 0) { + var5 = npc.combatLevel; var6 = Canvas.localPlayer.combatLevel; var7 = var6 - var5; String var8; @@ -191,22 +191,22 @@ public final class Tile extends Node { var8 = BufferedFile.colorStartTag(16776960); } - var4 = var4 + var8 + " (level-" + var0.combatLevel + ")"; + var4 = var4 + var8 + " (level-" + npc.combatLevel + ")"; } - if (var0.isFollower && Client.followerOpsLowPriority) { - Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + if (npc.isFollower && Client.followerOpsLowPriority) { + Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, menuArg0, menuArg1, menuArg2); } if (Client.isItemSelected == 1) { - Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16776960) + var4, 7, var1, var2, var3); + Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16776960) + var4, 7, menuArg0, menuArg1, menuArg2); } else if (Client.isSpellSelected) { if ((FloorDecoration.selectedSpellFlags & 2) == 2) { - Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16776960) + var4, 8, var1, var2, var3); + Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16776960) + var4, 8, menuArg0, menuArg1, menuArg2); } } else { - var7 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; - String[] var10 = var0.actions; + var7 = npc.isFollower && Client.followerOpsLowPriority ? 2000 : 0; + String[] var10 = npc.actions; if (var10 != null) { for (var5 = 4; var5 >= 0; --var5) { if (var10[var5] != null && !var10[var5].equalsIgnoreCase("Attack")) { @@ -231,7 +231,7 @@ public final class Tile extends Node { var6 = var7 + 13; } - Tiles.insertMenuItemNoShift(var10[var5], BufferedFile.colorStartTag(16776960) + var4, var6, var1, var2, var3); + Tiles.insertMenuItemNoShift(var10[var5], BufferedFile.colorStartTag(16776960) + var4, var6, menuArg0, menuArg1, menuArg2); } } } @@ -241,7 +241,7 @@ public final class Tile extends Node { if (var10[var5] != null && var10[var5].equalsIgnoreCase("Attack")) { short var9 = 0; if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { - if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > Canvas.localPlayer.combatLevel) { + if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && npc.combatLevel > Canvas.localPlayer.combatLevel) { var9 = 2000; } @@ -266,14 +266,14 @@ public final class Tile extends Node { var6 = var9 + 13; } - Tiles.insertMenuItemNoShift(var10[var5], BufferedFile.colorStartTag(16776960) + var4, var6, var1, var2, var3); + Tiles.insertMenuItemNoShift(var10[var5], BufferedFile.colorStartTag(16776960) + var4, var6, menuArg0, menuArg1, menuArg2); } } } } - if (!var0.isFollower || !Client.followerOpsLowPriority) { - Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + if (!npc.isFollower || !Client.followerOpsLowPriority) { + Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, menuArg0, menuArg1, menuArg2); } } } diff --git a/runescape-client/src/main/java/TilePaint.java b/runescape-client/src/main/java/TilePaint.java index 2f21f70ab0..586e34d0eb 100644 --- a/runescape-client/src/main/java/TilePaint.java +++ b/runescape-client/src/main/java/TilePaint.java @@ -74,8 +74,8 @@ public final class TilePaint { if (var2 == null) { class65.scene.removeGroundItemPile(SoundSystem.plane, var0, var1); } else { - long highestValue = -99999999L; - GroundItem highestValuedItem = null; + long var3 = -99999999L; + GroundItem var5 = null; GroundItem var6; for (var6 = (GroundItem)var2.last(); var6 != null; var6 = (GroundItem)var2.previous()) { @@ -85,21 +85,21 @@ public final class TilePaint { var8 *= (long)(var6.quantity + 1); } - if (var8 > highestValue) { - highestValue = var8; - highestValuedItem = var6; + if (var8 > var3) { + var3 = var8; + var5 = var6; } } - if (highestValuedItem == null) { + if (var5 == null) { class65.scene.removeGroundItemPile(SoundSystem.plane, var0, var1); } else { - var2.addLast(highestValuedItem); + var2.addLast(var5); GroundItem var11 = null; GroundItem var12 = null; for (var6 = (GroundItem)var2.last(); var6 != null; var6 = (GroundItem)var2.previous()) { - if (highestValuedItem.id != var6.id) { + if (var5.id != var6.id) { if (var11 == null) { var11 = var6; } @@ -111,7 +111,7 @@ public final class TilePaint { } long var9 = FontName.calculateTag(var0, var1, 3, false, 0); - class65.scene.newGroundItemPile(SoundSystem.plane, var0, var1, class32.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, SoundSystem.plane), highestValuedItem, var9, var11, var12); + class65.scene.newGroundItemPile(SoundSystem.plane, var0, var1, class32.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, SoundSystem.plane), var5, var9, var11, var12); } } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index e2bd0099ce..e1e8b9bb6b 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -140,7 +140,7 @@ public class Timer { garbageValue = "805398419" ) @Export("write") - public void write(Buffer var1) { + public void write(Buffer buffer) { long var2 = this.field923; var2 /= 10L; if (var2 < 0L) { @@ -149,7 +149,7 @@ public class Timer { var2 = 65535L; } - var1.writeShort((int)var2); + buffer.writeShort((int)var2); long var4 = this.field922; var4 /= 10L; if (var4 < 0L) { @@ -158,7 +158,7 @@ public class Timer { var4 = 65535L; } - var1.writeShort((int)var4); + buffer.writeShort((int)var4); long var6 = this.field924; var6 /= 10L; if (var6 < 0L) { @@ -167,10 +167,10 @@ public class Timer { var6 = 65535L; } - var1.writeShort((int)var6); - var1.writeShort(this.field925); - var1.writeShort(this.field926); - var1.writeShort(this.field927); - var1.writeShort(this.field928); + buffer.writeShort((int)var6); + buffer.writeShort(this.field925); + buffer.writeShort(this.field926); + buffer.writeShort(this.field927); + buffer.writeShort(this.field928); } } diff --git a/runescape-client/src/main/java/TotalQuantityComparator.java b/runescape-client/src/main/java/TotalQuantityComparator.java index a78820009f..db2a9b6f2d 100644 --- a/runescape-client/src/main/java/TotalQuantityComparator.java +++ b/runescape-client/src/main/java/TotalQuantityComparator.java @@ -33,18 +33,18 @@ final class TotalQuantityComparator implements Comparator { garbageValue = "46" ) @Export("loadTerrain") - static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { + static final void loadTerrain(Buffer buffer, int plane, int x, int y, int x0, int y0, int var6) { int var7; - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { - Tiles.Tiles_renderFlags[var1][var2][var3] = 0; + if (x >= 0 && x < 104 && y >= 0 && y < 104) { + Tiles.Tiles_renderFlags[plane][x][y] = 0; while (true) { - var7 = var0.readUnsignedByte(); + var7 = buffer.readUnsignedByte(); if (var7 == 0) { - if (var1 == 0) { - int[] var12 = Tiles.Tiles_heights[0][var2]; - int var9 = var2 + var4 + 932731; - int var10 = var3 + var5 + 556238; + if (plane == 0) { + int[] var12 = Tiles.Tiles_heights[0][x]; + int var9 = x + x0 + 932731; + int var10 = y + y0 + 556238; int var11 = Script.method2204(var9 + 45365, var10 + 91923, 4) - 128 + (Script.method2204(10294 + var9, 37821 + var10, 2) - 128 >> 1) + (Script.method2204(var9, var10, 1) - 128 >> 2); var11 = (int)((double)var11 * 0.3D) + 35; if (var11 < 10) { @@ -53,51 +53,51 @@ final class TotalQuantityComparator implements Comparator { var11 = 60; } - var12[var3] = -var11 * 8; + var12[y] = -var11 * 8; } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; + Tiles.Tiles_heights[plane][x][y] = Tiles.Tiles_heights[plane - 1][x][y] - 240; } break; } if (var7 == 1) { - int var8 = var0.readUnsignedByte(); + int var8 = buffer.readUnsignedByte(); if (var8 == 1) { var8 = 0; } - if (var1 == 0) { - Tiles.Tiles_heights[0][var2][var3] = -var8 * 8; + if (plane == 0) { + Tiles.Tiles_heights[0][x][y] = -var8 * 8; } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; + Tiles.Tiles_heights[plane][x][y] = Tiles.Tiles_heights[plane - 1][x][y] - var8 * 8; } break; } if (var7 <= 49) { - Fonts.field350[var1][var2][var3] = var0.readByte(); - class32.field1157[var1][var2][var3] = (byte)((var7 - 2) / 4); - class307.field1155[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); + Fonts.field350[plane][x][y] = buffer.readByte(); + class32.field1157[plane][x][y] = (byte)((var7 - 2) / 4); + class307.field1155[plane][x][y] = (byte)(var7 - 2 + var6 & 3); } else if (var7 <= 81) { - Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); + Tiles.Tiles_renderFlags[plane][x][y] = (byte)(var7 - 49); } else { - Tiles.field908[var1][var2][var3] = (byte)(var7 - 81); + Tiles.field908[plane][x][y] = (byte)(var7 - 81); } } } else { while (true) { - var7 = var0.readUnsignedByte(); + var7 = buffer.readUnsignedByte(); if (var7 == 0) { break; } if (var7 == 1) { - var0.readUnsignedByte(); + buffer.readUnsignedByte(); break; } if (var7 <= 49) { - var0.readUnsignedByte(); + buffer.readUnsignedByte(); } } } @@ -124,13 +124,13 @@ final class TotalQuantityComparator implements Comparator { garbageValue = "835715563" ) @Export("addPlayerToMenu") - static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (Canvas.localPlayer != var0 && Client.menuOptionsCount < 400) { + static final void addPlayerToMenu(Player player, int menuArg0, int menuArg1, int menuArg2) { + if (Canvas.localPlayer != player && Client.menuOptionsCount < 400) { String var4; int var5; - if (var0.skillLevel == 0) { - String var6 = var0.actions[0] + var0.username + var0.actions[1]; - var5 = var0.combatLevel; + if (player.skillLevel == 0) { + String var6 = player.actions[0] + player.username + player.actions[1]; + var5 = player.combatLevel; int var7 = Canvas.localPlayer.combatLevel; int var8 = var7 - var5; String var9; @@ -154,17 +154,17 @@ final class TotalQuantityComparator implements Comparator { var9 = BufferedFile.colorStartTag(16776960); } - var4 = var6 + var9 + " (level-" + var0.combatLevel + ")" + var0.actions[2]; + var4 = var6 + var9 + " (level-" + player.combatLevel + ")" + player.actions[2]; } else { - var4 = var0.actions[0] + var0.username + var0.actions[1] + " (skill-" + var0.skillLevel + ")" + var0.actions[2]; + var4 = player.actions[0] + player.username + player.actions[1] + " (skill-" + player.skillLevel + ")" + player.actions[2]; } int var10; if (Client.isItemSelected == 1) { - Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16777215) + var4, 14, var1, var2, var3); + Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16777215) + var4, 14, menuArg0, menuArg1, menuArg2); } else if (Client.isSpellSelected) { if ((FloorDecoration.selectedSpellFlags & 8) == 8) { - Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16777215) + var4, 15, var1, var2, var3); + Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16777215) + var4, 15, menuArg0, menuArg1, menuArg2); } } else { for (var10 = 7; var10 >= 0; --var10) { @@ -175,12 +175,12 @@ final class TotalQuantityComparator implements Comparator { continue; } - if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > Canvas.localPlayer.combatLevel) { + if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && player.combatLevel > Canvas.localPlayer.combatLevel) { var11 = 2000; } - if (Canvas.localPlayer.team != 0 && var0.team != 0) { - if (var0.team == Canvas.localPlayer.team) { + if (Canvas.localPlayer.team != 0 && player.team != 0) { + if (player.team == Canvas.localPlayer.team) { var11 = 2000; } else { var11 = 0; @@ -192,7 +192,7 @@ final class TotalQuantityComparator implements Comparator { boolean var12 = false; var5 = Client.playerMenuOpcodes[var10] + var11; - Tiles.insertMenuItemNoShift(Client.playerMenuActions[var10], BufferedFile.colorStartTag(16777215) + var4, var5, var1, var2, var3); + Tiles.insertMenuItemNoShift(Client.playerMenuActions[var10], BufferedFile.colorStartTag(16777215) + var4, var5, menuArg0, menuArg1, menuArg2); } } } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index 2ba47e291b..3abe3aa985 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -47,8 +47,8 @@ public class UrlRequester implements Runnable { garbageValue = "1097505066" ) @Export("request") - public UrlRequest request(URL var1) { - UrlRequest var2 = new UrlRequest(var1); + public UrlRequest request(URL url) { + UrlRequest var2 = new UrlRequest(url); synchronized(this) { this.requests.add(var2); this.notify(); diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index 51a619cdf7..1032dbeab6 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -55,12 +55,12 @@ public class User implements Comparable { garbageValue = "1156866388" ) @Export("set") - void set(Username var1, Username var2) { - if (var1 == null) { + void set(Username username, Username previousUsername) { + if (username == null) { throw new NullPointerException(); } else { - this.username0 = var1; - this.previousUsername = var2; + this.username0 = username; + this.previousUsername = previousUsername; } } @@ -70,8 +70,8 @@ public class User implements Comparable { garbageValue = "1627362569" ) @Export("compareTo0") - public int compareTo0(User var1) { - return this.username0.compareTo0(var1.username0); + public int compareTo0(User other) { + return this.username0.compareTo0(other.username0); } @Export("compareTo") diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 0a6ed5f44d..7ccd37d150 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -85,7 +85,7 @@ public class UserComparator9 extends AbstractUserComparator { VarbitDefinition.indexedSpriteWidths = null; SecureRandomCallable.indexedSpriteHeights = null; class328.indexedSpritePalette = null; - class328.spritePixels = (byte[][])null; + class328.spritePixels = ((byte[][])null); return var0; } } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index bca808e17d..d8672c62b7 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -61,7 +61,7 @@ public abstract class UserList { garbageValue = "861814350" ) @Export("newTypedArray") - abstract User[] newTypedArray(int var1); + abstract User[] newTypedArray(int size); @ObfuscatedName("z") @ObfuscatedSignature( @@ -102,8 +102,8 @@ public abstract class UserList { garbageValue = "933434965" ) @Export("contains") - public boolean contains(Username var1) { - return var1.hasCleanName() && (this.usernamesMap.containsKey(var1) || this.previousUsernamesMap.containsKey(var1)); + public boolean contains(Username username) { + return username.hasCleanName() && (this.usernamesMap.containsKey(username) || this.previousUsernamesMap.containsKey(username)); } @ObfuscatedName("y") @@ -112,9 +112,9 @@ public abstract class UserList { garbageValue = "-291023874" ) @Export("getByUsername") - public User getByUsername(Username var1) { - User var2 = this.getByCurrentUsername(var1); - return var2 != null ? var2 : this.getByPreviousUsername(var1); + public User getByUsername(Username username) { + User var2 = this.getByCurrentUsername(username); + return var2 != null ? var2 : this.getByPreviousUsername(username); } @ObfuscatedName("h") @@ -123,8 +123,8 @@ public abstract class UserList { garbageValue = "-1364698032" ) @Export("getByCurrentUsername") - User getByCurrentUsername(Username var1) { - return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); + User getByCurrentUsername(Username username) { + return !username.hasCleanName() ? null : (User)this.usernamesMap.get(username); } @ObfuscatedName("b") @@ -133,8 +133,8 @@ public abstract class UserList { garbageValue = "-1976876334" ) @Export("getByPreviousUsername") - User getByPreviousUsername(Username var1) { - return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); + User getByPreviousUsername(Username previousUsername) { + return !previousUsername.hasCleanName() ? null : (User)this.previousUsernamesMap.get(previousUsername); } @ObfuscatedName("c") @@ -143,8 +143,8 @@ public abstract class UserList { garbageValue = "7857" ) @Export("removeByUsername") - public final boolean removeByUsername(Username var1) { - User var2 = this.getByCurrentUsername(var1); + public final boolean removeByUsername(Username username) { + User var2 = this.getByCurrentUsername(username); if (var2 == null) { return false; } else { @@ -159,11 +159,11 @@ public abstract class UserList { garbageValue = "-1991960360" ) @Export("remove") - final void remove(User var1) { - int var2 = this.indexOf(var1); + final void remove(User user) { + int var2 = this.indexOf(user); if (var2 != -1) { this.arrayRemove(var2); - this.mapRemove(var1); + this.mapRemove(user); } } @@ -174,8 +174,8 @@ public abstract class UserList { garbageValue = "-1137431921" ) @Export("addLastNoPreviousUsername") - User addLastNoPreviousUsername(Username var1) { - return this.addLast(var1, (Username)null); + User addLastNoPreviousUsername(Username username) { + return this.addLast(username, (Username)null); } @ObfuscatedName("ag") @@ -184,12 +184,12 @@ public abstract class UserList { garbageValue = "1445676158" ) @Export("addLast") - User addLast(Username var1, Username var2) { - if (this.getByCurrentUsername(var1) != null) { + User addLast(Username username, Username previousUsername) { + if (this.getByCurrentUsername(username) != null) { throw new IllegalStateException(); } else { User var3 = this.newInstance(); - var3.set(var1, var2); + var3.set(username, previousUsername); this.arrayAddLast(var3); this.mapPut(var3); return var3; @@ -202,11 +202,11 @@ public abstract class UserList { garbageValue = "-1676228472" ) @Export("get") - public final User get(int var1) { - if (var1 >= 0 && var1 < this.size0) { - return this.array[var1]; + public final User get(int index) { + if (index >= 0 && index < this.size0) { + return this.array[index]; } else { - throw new ArrayIndexOutOfBoundsException(var1); + throw new ArrayIndexOutOfBoundsException(index); } } @@ -231,10 +231,10 @@ public abstract class UserList { garbageValue = "35" ) @Export("changeName") - final void changeName(User var1, Username var2, Username var3) { - this.mapRemove(var1); - var1.set(var2, var3); - this.mapPut(var1); + final void changeName(User user, Username username, Username previousUsername) { + this.mapRemove(user); + user.set(username, previousUsername); + this.mapPut(user); } @ObfuscatedName("ar") @@ -243,9 +243,9 @@ public abstract class UserList { garbageValue = "-1908653684" ) @Export("indexOf") - final int indexOf(User var1) { + final int indexOf(User user) { for (int var2 = 0; var2 < this.size0; ++var2) { - if (this.array[var2] == var1) { + if (this.array[var2] == user) { return var2; } } @@ -259,9 +259,9 @@ public abstract class UserList { garbageValue = "-20791" ) @Export("mapRemove") - final void mapRemove(User var1) { - if (var1.previousUsername != null) { - this.previousUsernamesMap.remove(var1.previousUsername); + final void mapRemove(User user) { + if (user.previousUsername != null) { + this.previousUsernamesMap.remove(user.previousUsername); } } @@ -272,8 +272,8 @@ public abstract class UserList { garbageValue = "1398315954" ) @Export("arrayAddLast") - final void arrayAddLast(User var1) { - this.array[++this.size0 - 1] = var1; + final void arrayAddLast(User user) { + this.array[++this.size0 - 1] = user; } @ObfuscatedName("ah") @@ -282,11 +282,11 @@ public abstract class UserList { garbageValue = "103" ) @Export("mapPut") - final void mapPut(User var1) { - this.usernamesMap.put(var1.username0, var1); - if (var1.previousUsername != null) { - User var2 = (User)this.previousUsernamesMap.put(var1.previousUsername, var1); - if (var2 != null && var2 != var1) { + final void mapPut(User user) { + this.usernamesMap.put(user.username0, user); + if (user.previousUsername != null) { + User var2 = (User)this.previousUsernamesMap.put(user.previousUsername, user); + if (var2 != null && var2 != user) { var2.previousUsername = null; } } @@ -299,10 +299,10 @@ public abstract class UserList { garbageValue = "-616972929" ) @Export("arrayRemove") - final void arrayRemove(int var1) { + final void arrayRemove(int index) { --this.size0; - if (var1 < this.size0) { - System.arraycopy(this.array, var1 + 1, this.array, var1, this.size0 - var1); + if (index < this.size0) { + System.arraycopy(this.array, index + 1, this.array, index, this.size0 - index); } } diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index 8d5f6e22b8..0f56c052da 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -50,8 +50,8 @@ public class Username implements Comparable { garbageValue = "8" ) @Export("compareTo0") - public int compareTo0(Username var1) { - return this.cleanName == null ? (var1.cleanName == null ? 0 : 1) : (var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName)); + public int compareTo0(Username other) { + return this.cleanName == null ? (other.cleanName == null ? 0 : 1) : (other.cleanName == null ? -1 : this.cleanName.compareTo(other.cleanName)); } @Export("equals") diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index 572b8c0a4d..3f88e84cf1 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -60,8 +60,8 @@ public class VarcInt extends DualNode { garbageValue = "1680587190" ) @Export("loadClassFromDescriptor") - static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { - return var0.equals("B") ? Byte.TYPE : (var0.equals("I") ? Integer.TYPE : (var0.equals("S") ? Short.TYPE : (var0.equals("J") ? Long.TYPE : (var0.equals("Z") ? Boolean.TYPE : (var0.equals("F") ? Float.TYPE : (var0.equals("D") ? Double.TYPE : (var0.equals("C") ? Character.TYPE : (var0.equals("void") ? Void.TYPE : Reflection.findClass(var0))))))))); + static Class loadClassFromDescriptor(String descriptor) throws ClassNotFoundException { + return descriptor.equals("B") ? Byte.TYPE : (descriptor.equals("I") ? Integer.TYPE : (descriptor.equals("S") ? Short.TYPE : (descriptor.equals("J") ? Long.TYPE : (descriptor.equals("Z") ? Boolean.TYPE : (descriptor.equals("F") ? Float.TYPE : (descriptor.equals("D") ? Double.TYPE : (descriptor.equals("C") ? Character.TYPE : (descriptor.equals("void") ? Void.TYPE : Reflection.findClass(descriptor))))))))); } @ObfuscatedName("a") diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index 67c0d35728..416de63972 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -58,9 +58,9 @@ public class Varcs { garbageValue = "920518911" ) @Export("setInt") - void setInt(int var1, int var2) { - this.map.put(var1, var2); - if (this.intsPersistence[var1]) { + void setInt(int index, int var2) { + this.map.put(index, var2); + if (this.intsPersistence[index]) { this.unwrittenChanges = true; } @@ -72,8 +72,8 @@ public class Varcs { garbageValue = "6" ) @Export("getInt") - int getInt(int var1) { - Object var2 = this.map.get(var1); + int getInt(int index) { + Object var2 = this.map.get(index); return var2 instanceof Integer ? (Integer)var2 : -1; } @@ -83,8 +83,8 @@ public class Varcs { garbageValue = "12847051" ) @Export("setString") - void setString(int var1, String var2) { - this.map.put(var1, var2); + void setString(int index, String var2) { + this.map.put(index, var2); } @ObfuscatedName("w") @@ -93,8 +93,8 @@ public class Varcs { garbageValue = "897961099" ) @Export("getString") - String getString(int var1) { - Object var2 = this.map.get(var1); + String getString(int index) { + Object var2 = this.map.get(index); return var2 instanceof String ? (String)var2 : ""; } @@ -104,8 +104,8 @@ public class Varcs { garbageValue = "15" ) @Export("setStringOld") - void setStringOld(int var1, String var2) { - this.strings[var1] = var2; + void setStringOld(int index, String var2) { + this.strings[index] = var2; } @ObfuscatedName("u") @@ -114,8 +114,8 @@ public class Varcs { garbageValue = "0" ) @Export("getStringOld") - String getStringOld(int var1) { - return this.strings[var1]; + String getStringOld(int index) { + return this.strings[index]; } @ObfuscatedName("g") @@ -178,72 +178,80 @@ public class Varcs { } } - Buffer var29 = new Buffer(var2); - var29.writeByte(2); - var29.writeShort(var3); - Iterator var30 = this.map.entrySet().iterator(); + Buffer var28 = new Buffer(var2); + var28.writeByte(2); + var28.writeShort(var3); + Iterator var29 = this.map.entrySet().iterator(); - label187: + label179: while (true) { - int var8; - Entry var31; + Entry var8; + int var30; do { - if (!var30.hasNext()) { - var1.write(var29.array, 0, var29.index); - break label187; + if (!var29.hasNext()) { + var1.write(var28.array, 0, var28.index); + break label179; } - var31 = (Entry)var30.next(); - var8 = (Integer)var31.getKey(); - } while(!this.intsPersistence[var8]); + var8 = (Entry)var29.next(); + var30 = (Integer)var8.getKey(); + } while(!this.intsPersistence[var30]); - var29.writeShort(var8); - Object var9 = var31.getValue(); + var28.writeShort(var30); + Object var9 = var8.getValue(); Class var10 = var9.getClass(); class3[] var11 = class3.method34(); + int var13 = 0; - class3 var13; - label174: { - for (int var12 = 0; var12 < var11.length; ++var12) { - class3 var14 = var11[var12]; - if (var10 == var14.field18) { - var13 = var14; - break label174; - } + class3 var12; + while (true) { + if (var13 >= var11.length) { + var12 = null; + break; } - var13 = null; - } - - var29.writeByte(var13.field1147); - Class var32 = var9.getClass(); - class3[] var15 = class3.method34(); - - class3 var17; - label184: { - for (int var16 = 0; var16 < var15.length; ++var16) { - class3 var18 = var15[var16]; - if (var32 == var18.field18) { - var17 = var18; - break label184; - } + class3 var14 = var11[var13]; + if (var10 == var14.field18) { + var12 = var14; + break; } - var17 = null; + ++var13; } - if (var17 == null) { + var28.writeByte(var12.field1147); + Class var31 = var9.getClass(); + class3[] var32 = class3.method34(); + int var16 = 0; + + class3 var15; + while (true) { + if (var16 >= var32.length) { + var15 = null; + break; + } + + class3 var17 = var32[var16]; + if (var31 == var17.field18) { + var15 = var17; + break; + } + + ++var16; + } + + if (var15 == null) { throw new IllegalArgumentException(); } - class0 var33 = var17.field19; - var33.vmethod44(var9, var29); + class0 var33 = var15.field19; + var33.vmethod44(var9, var28); } - } catch (Exception var27) { + } catch (Exception var26) { } finally { try { var1.close(); - } catch (Exception var26) { + } catch (Exception var25) { } } @@ -261,69 +269,69 @@ public class Varcs { void read() { AccessFile var1 = this.getPreferencesFile(false); - try { - byte[] var2 = new byte[(int)var1.length()]; + try { + byte[] var2 = new byte[(int)var1.length()]; - int var3; - for (int var4 = 0; var4 < var2.length; var4 += var3) { - var3 = var1.read(var2, var4, var2.length - var4); - if (var3 == -1) { - throw new EOFException(); - } + int var3; + for (int var4 = 0; var4 < var2.length; var4 += var3) { + var3 = var1.read(var2, var4, var2.length - var4); + if (var3 == -1) { + throw new EOFException(); } + } - Buffer var25 = new Buffer(var2); - if (var25.array.length - var25.index < 1) { - return; - } + Buffer var24 = new Buffer(var2); + if (var24.array.length - var24.index < 1) { + return; + } - int var5 = var25.readUnsignedByte(); + int var5 = var24.readUnsignedByte(); if (var5 < 0 || var5 > 2) { return; } - int var6; - int var7; - int var8; - int var9; - if (var5 >= 2) { - var9 = var25.readUnsignedShort(); + int var6; + int var7; + int var8; + int var9; + if (var5 >= 2) { + var9 = var24.readUnsignedShort(); for (var6 = 0; var6 < var9; ++var6) { - var7 = var25.readUnsignedShort(); - var8 = var25.readUnsignedByte(); - class3 var10 = (class3)ScriptFrame.findEnumerated(class3.method34(), var8); - Object var11 = var10.method31(var25); - if (this.intsPersistence[var7]) { - this.map.put(var7, var11); - } - } - } else { - var9 = var25.readUnsignedShort(); - - for (var6 = 0; var6 < var9; ++var6) { - var7 = var25.readUnsignedShort(); - var8 = var25.readInt(); - if (this.intsPersistence[var7]) { - this.map.put(var7, var8); - } - } - - var6 = var25.readUnsignedShort(); - - for (var7 = 0; var7 < var6; ++var7) { - var25.readUnsignedShort(); - var25.readStringCp1252NullTerminated(); + var7 = var24.readUnsignedShort(); + var8 = var24.readUnsignedByte(); + class3 var10 = (class3)ScriptFrame.findEnumerated(class3.method34(), var8); + Object var11 = var10.method31(var24); + if (this.intsPersistence[var7]) { + this.map.put(var7, var11); } } - } catch (Exception var23) { - } finally { - try { - var1.close(); - } catch (Exception var22) { + } else { + var9 = var24.readUnsignedShort(); + + for (var6 = 0; var6 < var9; ++var6) { + var7 = var24.readUnsignedShort(); + var8 = var24.readInt(); + if (this.intsPersistence[var7]) { + this.map.put(var7, var8); + } } + var6 = var24.readUnsignedShort(); + + for (var7 = 0; var7 < var6; ++var7) { + var24.readUnsignedShort(); + var24.readStringCp1252NullTerminated(); + } } + } catch (Exception var22) { + } finally { + try { + var1.close(); + } catch (Exception var21) { + } + + } this.unwrittenChanges = false; } @@ -372,8 +380,8 @@ public class Varcs { for (var6 = 0; var6 < 64; ++var6) { for (var7 = 0; var7 < 64; ++var7) { if (var6 + var1 > 0 && var6 + var1 < 103 && var7 + var2 > 0 && var7 + var2 < 103) { - int[] var10000 = var5[var8].flags[var6 + var1]; - var10000[var7 + var2] &= -16777217; + int[] var9 = var5[var8].flags[var6 + var1]; + var9[var7 + var2] &= -16777217; } } } @@ -383,8 +391,8 @@ public class Varcs { for (var6 = 0; var6 < 4; ++var6) { for (var7 = 0; var7 < 64; ++var7) { - for (int var9 = 0; var9 < 64; ++var9) { - TotalQuantityComparator.loadTerrain(var10, var6, var7 + var1, var9 + var2, var3, var4, 0); + for (int var11 = 0; var11 < 64; ++var11) { + TotalQuantityComparator.loadTerrain(var10, var6, var7 + var1, var11 + var2, var3, var4, 0); } } } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index eee06e912c..d4f7ddae7e 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -383,7 +383,8 @@ public class Widget extends Node { @Export("modelOrthog") public boolean modelOrthog; @ObfuscatedName("bv") - public boolean field964; + @Export("modelTransparency") + public boolean modelTransparency; @ObfuscatedName("bw") @ObfuscatedGetter( intValue = -1658511475 @@ -560,25 +561,31 @@ public class Widget extends Node { @Export("onScroll") public Object[] onScroll; @ObfuscatedName("em") - public Object[] field970; + @Export("onChatTransmit") + public Object[] onChatTransmit; @ObfuscatedName("ed") @Export("onKey") public Object[] onKey; @ObfuscatedName("ex") - public Object[] field971; + @Export("onFriendTransmit") + public Object[] onFriendTransmit; @ObfuscatedName("ej") - public Object[] field972; + @Export("onClanTransmit") + public Object[] onClanTransmit; @ObfuscatedName("el") - public Object[] field973; + @Export("onMiscTransmit") + public Object[] onMiscTransmit; @ObfuscatedName("en") @Export("onDialogAbort") public Object[] onDialogAbort; @ObfuscatedName("ei") - public Object[] field974; + @Export("onSubChange") + public Object[] onSubChange; @ObfuscatedName("ee") public Object[] field975; @ObfuscatedName("eq") - public Object[] field976; + @Export("onStockTransmit") + public Object[] onStockTransmit; @ObfuscatedName("eh") public Object[] field977; @ObfuscatedName("eo") @@ -742,7 +749,7 @@ public class Widget extends Node { this.field962 = 0; this.field963 = 0; this.modelOrthog = false; - this.field964 = false; + this.modelTransparency = false; this.itemQuantityMode = 2; this.fontId = -1; this.text = ""; @@ -788,41 +795,41 @@ public class Widget extends Node { garbageValue = "688173225" ) @Export("decodeLegacy") - void decodeLegacy(Buffer var1) { + void decodeLegacy(Buffer buffer) { this.isIf3 = false; - this.type = var1.readUnsignedByte(); - this.buttonType = var1.readUnsignedByte(); - this.contentType = var1.readUnsignedShort(); - this.rawX = var1.method44(); - this.rawY = var1.method44(); - this.rawWidth = var1.readUnsignedShort(); - this.rawHeight = var1.readUnsignedShort(); - this.transparency = var1.readUnsignedByte(); - this.parentId = var1.readUnsignedShort(); + this.type = buffer.readUnsignedByte(); + this.buttonType = buffer.readUnsignedByte(); + this.contentType = buffer.readUnsignedShort(); + this.rawX = buffer.method44(); + this.rawY = buffer.method44(); + this.rawWidth = buffer.readUnsignedShort(); + this.rawHeight = buffer.readUnsignedShort(); + this.transparency = buffer.readUnsignedByte(); + this.parentId = buffer.readUnsignedShort(); if (this.parentId == 65535) { this.parentId = -1; } else { this.parentId += this.id & -65536; } - this.mouseOverRedirect = var1.readUnsignedShort(); + this.mouseOverRedirect = buffer.readUnsignedShort(); if (this.mouseOverRedirect == 65535) { this.mouseOverRedirect = -1; } - int var2 = var1.readUnsignedByte(); + int var2 = buffer.readUnsignedByte(); int var3; if (var2 > 0) { this.cs1Comparisons = new int[var2]; this.cs1ComparisonValues = new int[var2]; for (var3 = 0; var3 < var2; ++var3) { - this.cs1Comparisons[var3] = var1.readUnsignedByte(); - this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); + this.cs1Comparisons[var3] = buffer.readUnsignedByte(); + this.cs1ComparisonValues[var3] = buffer.readUnsignedShort(); } } - var3 = var1.readUnsignedByte(); + var3 = buffer.readUnsignedByte(); int var4; int var5; int var6; @@ -830,11 +837,11 @@ public class Widget extends Node { this.cs1Instructions = new int[var3][]; for (var4 = 0; var4 < var3; ++var4) { - var5 = var1.readUnsignedShort(); + var5 = buffer.readUnsignedShort(); this.cs1Instructions[var4] = new int[var5]; for (var6 = 0; var6 < var5; ++var6) { - this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); + this.cs1Instructions[var4][var6] = buffer.readUnsignedShort(); if (this.cs1Instructions[var4][var6] == 65535) { this.cs1Instructions[var4][var6] = -1; } @@ -843,51 +850,51 @@ public class Widget extends Node { } if (this.type == 0) { - this.scrollHeight = var1.readUnsignedShort(); - this.isHidden = var1.readUnsignedByte() == 1; + this.scrollHeight = buffer.readUnsignedShort(); + this.isHidden = buffer.readUnsignedByte() == 1; } if (this.type == 1) { - var1.readUnsignedShort(); - var1.readUnsignedByte(); + buffer.readUnsignedShort(); + buffer.readUnsignedByte(); } if (this.type == 2) { this.itemIds = new int[this.rawHeight * this.rawWidth]; this.itemQuantities = new int[this.rawWidth * this.rawHeight]; - var4 = var1.readUnsignedByte(); + var4 = buffer.readUnsignedByte(); if (var4 == 1) { this.clickMask |= 268435456; } - var5 = var1.readUnsignedByte(); + var5 = buffer.readUnsignedByte(); if (var5 == 1) { this.clickMask |= 1073741824; } - var6 = var1.readUnsignedByte(); + var6 = buffer.readUnsignedByte(); if (var6 == 1) { this.clickMask |= Integer.MIN_VALUE; } - int var7 = var1.readUnsignedByte(); + int var7 = buffer.readUnsignedByte(); if (var7 == 1) { this.clickMask |= 536870912; } - this.paddingX = var1.readUnsignedByte(); - this.paddingY = var1.readUnsignedByte(); + this.paddingX = buffer.readUnsignedByte(); + this.paddingY = buffer.readUnsignedByte(); this.inventoryXOffsets = new int[20]; this.inventoryYOffsets = new int[20]; this.inventorySprites = new int[20]; int var8; for (var8 = 0; var8 < 20; ++var8) { - int var9 = var1.readUnsignedByte(); + int var9 = buffer.readUnsignedByte(); if (var9 == 1) { - this.inventoryXOffsets[var8] = var1.method44(); - this.inventoryYOffsets[var8] = var1.method44(); - this.inventorySprites[var8] = var1.readInt(); + this.inventoryXOffsets[var8] = buffer.method44(); + this.inventoryYOffsets[var8] = buffer.method44(); + this.inventorySprites[var8] = buffer.readInt(); } else { this.inventorySprites[var8] = -1; } @@ -896,7 +903,7 @@ public class Widget extends Node { this.itemActions = new String[5]; for (var8 = 0; var8 < 5; ++var8) { - String var11 = var1.readStringCp1252NullTerminated(); + String var11 = buffer.readStringCp1252NullTerminated(); if (var11.length() > 0) { this.itemActions[var8] = var11; this.clickMask |= 1 << var8 + 23; @@ -905,83 +912,83 @@ public class Widget extends Node { } if (this.type == 3) { - this.fill = var1.readUnsignedByte() == 1; + this.fill = buffer.readUnsignedByte() == 1; } if (this.type == 4 || this.type == 1) { - this.textXAlignment = var1.readUnsignedByte(); - this.textYAlignment = var1.readUnsignedByte(); - this.textLineHeight = var1.readUnsignedByte(); - this.fontId = var1.readUnsignedShort(); + this.textXAlignment = buffer.readUnsignedByte(); + this.textYAlignment = buffer.readUnsignedByte(); + this.textLineHeight = buffer.readUnsignedByte(); + this.fontId = buffer.readUnsignedShort(); if (this.fontId == 65535) { this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; + this.textShadowed = buffer.readUnsignedByte() == 1; } if (this.type == 4) { - this.text = var1.readStringCp1252NullTerminated(); - this.text2 = var1.readStringCp1252NullTerminated(); + this.text = buffer.readStringCp1252NullTerminated(); + this.text2 = buffer.readStringCp1252NullTerminated(); } if (this.type == 1 || this.type == 3 || this.type == 4) { - this.color = var1.readInt(); + this.color = buffer.readInt(); } if (this.type == 3 || this.type == 4) { - this.color2 = var1.readInt(); - this.mouseOverColor = var1.readInt(); - this.mouseOverColor2 = var1.readInt(); + this.color2 = buffer.readInt(); + this.mouseOverColor = buffer.readInt(); + this.mouseOverColor2 = buffer.readInt(); } if (this.type == 5) { - this.spriteId2 = var1.readInt(); - this.spriteId = var1.readInt(); + this.spriteId2 = buffer.readInt(); + this.spriteId = buffer.readInt(); } if (this.type == 6) { this.modelType = 1; - this.modelId = var1.readUnsignedShort(); + this.modelId = buffer.readUnsignedShort(); if (this.modelId == 65535) { this.modelId = -1; } this.modelType2 = 1; - this.modelId2 = var1.readUnsignedShort(); + this.modelId2 = buffer.readUnsignedShort(); if (this.modelId2 == 65535) { this.modelId2 = -1; } - this.sequenceId = var1.readUnsignedShort(); + this.sequenceId = buffer.readUnsignedShort(); if (this.sequenceId == 65535) { this.sequenceId = -1; } - this.sequenceId2 = var1.readUnsignedShort(); + this.sequenceId2 = buffer.readUnsignedShort(); if (this.sequenceId2 == 65535) { this.sequenceId2 = -1; } - this.modelZoom = var1.readUnsignedShort(); - this.modelAngleX = var1.readUnsignedShort(); - this.modelAngleY = var1.readUnsignedShort(); + this.modelZoom = buffer.readUnsignedShort(); + this.modelAngleX = buffer.readUnsignedShort(); + this.modelAngleY = buffer.readUnsignedShort(); } if (this.type == 7) { this.itemIds = new int[this.rawHeight * this.rawWidth]; this.itemQuantities = new int[this.rawWidth * this.rawHeight]; - this.textXAlignment = var1.readUnsignedByte(); - this.fontId = var1.readUnsignedShort(); + this.textXAlignment = buffer.readUnsignedByte(); + this.fontId = buffer.readUnsignedShort(); if (this.fontId == 65535) { this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; - this.color = var1.readInt(); - this.paddingX = var1.method44(); - this.paddingY = var1.method44(); - var4 = var1.readUnsignedByte(); + this.textShadowed = buffer.readUnsignedByte() == 1; + this.color = buffer.readInt(); + this.paddingX = buffer.method44(); + this.paddingY = buffer.method44(); + var4 = buffer.readUnsignedByte(); if (var4 == 1) { this.clickMask |= 1073741824; } @@ -989,7 +996,7 @@ public class Widget extends Node { this.itemActions = new String[5]; for (var5 = 0; var5 < 5; ++var5) { - String var10 = var1.readStringCp1252NullTerminated(); + String var10 = buffer.readStringCp1252NullTerminated(); if (var10.length() > 0) { this.itemActions[var5] = var10; this.clickMask |= 1 << var5 + 23; @@ -998,18 +1005,18 @@ public class Widget extends Node { } if (this.type == 8) { - this.text = var1.readStringCp1252NullTerminated(); + this.text = buffer.readStringCp1252NullTerminated(); } if (this.buttonType == 2 || this.type == 2) { - this.spellActionName = var1.readStringCp1252NullTerminated(); - this.spellName = var1.readStringCp1252NullTerminated(); - var4 = var1.readUnsignedShort() & 63; + this.spellActionName = buffer.readStringCp1252NullTerminated(); + this.spellName = buffer.readStringCp1252NullTerminated(); + var4 = buffer.readUnsignedShort() & 63; this.clickMask |= var4 << 11; } if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { - this.buttonText = var1.readStringCp1252NullTerminated(); + this.buttonText = buffer.readStringCp1252NullTerminated(); if (this.buttonText.length() == 0) { if (this.buttonType == 1) { this.buttonText = "Ok"; @@ -1045,140 +1052,140 @@ public class Widget extends Node { garbageValue = "-1967445442" ) @Export("decode") - void decode(Buffer var1) { - var1.readUnsignedByte(); + void decode(Buffer buffer) { + buffer.readUnsignedByte(); this.isIf3 = true; - this.type = var1.readUnsignedByte(); - this.contentType = var1.readUnsignedShort(); - this.rawX = var1.method44(); - this.rawY = var1.method44(); - this.rawWidth = var1.readUnsignedShort(); + this.type = buffer.readUnsignedByte(); + this.contentType = buffer.readUnsignedShort(); + this.rawX = buffer.method44(); + this.rawY = buffer.method44(); + this.rawWidth = buffer.readUnsignedShort(); if (this.type == 9) { - this.rawHeight = var1.method44(); + this.rawHeight = buffer.method44(); } else { - this.rawHeight = var1.readUnsignedShort(); + this.rawHeight = buffer.readUnsignedShort(); } - this.widthAlignment = var1.readByte(); - this.heightAlignment = var1.readByte(); - this.xAlignment = var1.readByte(); - this.yAlignment = var1.readByte(); - this.parentId = var1.readUnsignedShort(); + this.widthAlignment = buffer.readByte(); + this.heightAlignment = buffer.readByte(); + this.xAlignment = buffer.readByte(); + this.yAlignment = buffer.readByte(); + this.parentId = buffer.readUnsignedShort(); if (this.parentId == 65535) { this.parentId = -1; } else { this.parentId += this.id & -65536; } - this.isHidden = var1.readUnsignedByte() == 1; + this.isHidden = buffer.readUnsignedByte() == 1; if (this.type == 0) { - this.scrollWidth = var1.readUnsignedShort(); - this.scrollHeight = var1.readUnsignedShort(); - this.noClickThrough = var1.readUnsignedByte() == 1; + this.scrollWidth = buffer.readUnsignedShort(); + this.scrollHeight = buffer.readUnsignedShort(); + this.noClickThrough = buffer.readUnsignedByte() == 1; } if (this.type == 5) { - this.spriteId2 = var1.readInt(); - this.spriteAngle = var1.readUnsignedShort(); - this.spriteTiling = var1.readUnsignedByte() == 1; - this.transparency = var1.readUnsignedByte(); - this.outline = var1.readUnsignedByte(); - this.spriteShadow = var1.readInt(); - this.spriteFlipV = var1.readUnsignedByte() == 1; - this.spriteFlipH = var1.readUnsignedByte() == 1; + this.spriteId2 = buffer.readInt(); + this.spriteAngle = buffer.readUnsignedShort(); + this.spriteTiling = buffer.readUnsignedByte() == 1; + this.transparency = buffer.readUnsignedByte(); + this.outline = buffer.readUnsignedByte(); + this.spriteShadow = buffer.readInt(); + this.spriteFlipV = buffer.readUnsignedByte() == 1; + this.spriteFlipH = buffer.readUnsignedByte() == 1; } if (this.type == 6) { this.modelType = 1; - this.modelId = var1.readUnsignedShort(); + this.modelId = buffer.readUnsignedShort(); if (this.modelId == 65535) { this.modelId = -1; } - this.modelOffsetX = var1.method44(); - this.modelOffsetY = var1.method44(); - this.modelAngleX = var1.readUnsignedShort(); - this.modelAngleY = var1.readUnsignedShort(); - this.modelAngleZ = var1.readUnsignedShort(); - this.modelZoom = var1.readUnsignedShort(); - this.sequenceId = var1.readUnsignedShort(); + this.modelOffsetX = buffer.method44(); + this.modelOffsetY = buffer.method44(); + this.modelAngleX = buffer.readUnsignedShort(); + this.modelAngleY = buffer.readUnsignedShort(); + this.modelAngleZ = buffer.readUnsignedShort(); + this.modelZoom = buffer.readUnsignedShort(); + this.sequenceId = buffer.readUnsignedShort(); if (this.sequenceId == 65535) { this.sequenceId = -1; } - this.modelOrthog = var1.readUnsignedByte() == 1; - var1.readUnsignedShort(); + this.modelOrthog = buffer.readUnsignedByte() == 1; + buffer.readUnsignedShort(); if (this.widthAlignment != 0) { - this.field962 = var1.readUnsignedShort(); + this.field962 = buffer.readUnsignedShort(); } if (this.heightAlignment != 0) { - var1.readUnsignedShort(); + buffer.readUnsignedShort(); } } if (this.type == 4) { - this.fontId = var1.readUnsignedShort(); + this.fontId = buffer.readUnsignedShort(); if (this.fontId == 65535) { this.fontId = -1; } - this.text = var1.readStringCp1252NullTerminated(); - this.textLineHeight = var1.readUnsignedByte(); - this.textXAlignment = var1.readUnsignedByte(); - this.textYAlignment = var1.readUnsignedByte(); - this.textShadowed = var1.readUnsignedByte() == 1; - this.color = var1.readInt(); + this.text = buffer.readStringCp1252NullTerminated(); + this.textLineHeight = buffer.readUnsignedByte(); + this.textXAlignment = buffer.readUnsignedByte(); + this.textYAlignment = buffer.readUnsignedByte(); + this.textShadowed = buffer.readUnsignedByte() == 1; + this.color = buffer.readInt(); } if (this.type == 3) { - this.color = var1.readInt(); - this.fill = var1.readUnsignedByte() == 1; - this.transparency = var1.readUnsignedByte(); + this.color = buffer.readInt(); + this.fill = buffer.readUnsignedByte() == 1; + this.transparency = buffer.readUnsignedByte(); } if (this.type == 9) { - this.lineWid = var1.readUnsignedByte(); - this.color = var1.readInt(); - this.field961 = var1.readUnsignedByte() == 1; + this.lineWid = buffer.readUnsignedByte(); + this.color = buffer.readInt(); + this.field961 = buffer.readUnsignedByte() == 1; } - this.clickMask = var1.readMedium(); - this.dataText = var1.readStringCp1252NullTerminated(); - int var2 = var1.readUnsignedByte(); + this.clickMask = buffer.readMedium(); + this.dataText = buffer.readStringCp1252NullTerminated(); + int var2 = buffer.readUnsignedByte(); if (var2 > 0) { this.actions = new String[var2]; for (int var3 = 0; var3 < var2; ++var3) { - this.actions[var3] = var1.readStringCp1252NullTerminated(); + this.actions[var3] = buffer.readStringCp1252NullTerminated(); } } - this.dragZoneSize = var1.readUnsignedByte(); - this.dragThreshold = var1.readUnsignedByte(); - this.isScrollBar = var1.readUnsignedByte() == 1; - this.spellActionName = var1.readStringCp1252NullTerminated(); - this.onLoad = this.readListener(var1); - this.onMouseOver = this.readListener(var1); - this.onMouseLeave = this.readListener(var1); - this.onTargetLeave = this.readListener(var1); - this.onTargetEnter = this.readListener(var1); - this.onVarTransmit = this.readListener(var1); - this.onInvTransmit = this.readListener(var1); - this.onStatTransmit = this.readListener(var1); - this.onTimer = this.readListener(var1); - this.onOp = this.readListener(var1); - this.onMouseRepeat = this.readListener(var1); - this.onClick = this.readListener(var1); - this.onClickRepeat = this.readListener(var1); - this.onRelease = this.readListener(var1); - this.onHold = this.readListener(var1); - this.onDrag = this.readListener(var1); - this.onDragComplete = this.readListener(var1); - this.onScroll = this.readListener(var1); - this.varTransmitTriggers = this.readListenerTriggers(var1); - this.invTransmitTriggers = this.readListenerTriggers(var1); - this.statTransmitTriggers = this.readListenerTriggers(var1); + this.dragZoneSize = buffer.readUnsignedByte(); + this.dragThreshold = buffer.readUnsignedByte(); + this.isScrollBar = buffer.readUnsignedByte() == 1; + this.spellActionName = buffer.readStringCp1252NullTerminated(); + this.onLoad = this.readListener(buffer); + this.onMouseOver = this.readListener(buffer); + this.onMouseLeave = this.readListener(buffer); + this.onTargetLeave = this.readListener(buffer); + this.onTargetEnter = this.readListener(buffer); + this.onVarTransmit = this.readListener(buffer); + this.onInvTransmit = this.readListener(buffer); + this.onStatTransmit = this.readListener(buffer); + this.onTimer = this.readListener(buffer); + this.onOp = this.readListener(buffer); + this.onMouseRepeat = this.readListener(buffer); + this.onClick = this.readListener(buffer); + this.onClickRepeat = this.readListener(buffer); + this.onRelease = this.readListener(buffer); + this.onHold = this.readListener(buffer); + this.onDrag = this.readListener(buffer); + this.onDragComplete = this.readListener(buffer); + this.onScroll = this.readListener(buffer); + this.varTransmitTriggers = this.readListenerTriggers(buffer); + this.invTransmitTriggers = this.readListenerTriggers(buffer); + this.statTransmitTriggers = this.readListenerTriggers(buffer); } @ObfuscatedName("g") @@ -1187,19 +1194,19 @@ public class Widget extends Node { garbageValue = "1906438788" ) @Export("readListener") - Object[] readListener(Buffer var1) { - int var2 = var1.readUnsignedByte(); + Object[] readListener(Buffer buffer) { + int var2 = buffer.readUnsignedByte(); if (var2 == 0) { return null; } else { Object[] var3 = new Object[var2]; for (int var4 = 0; var4 < var2; ++var4) { - int var5 = var1.readUnsignedByte(); + int var5 = buffer.readUnsignedByte(); if (var5 == 0) { - var3[var4] = new Integer(var1.readInt()); + var3[var4] = new Integer(buffer.readInt()); } else if (var5 == 1) { - var3[var4] = var1.readStringCp1252NullTerminated(); + var3[var4] = buffer.readStringCp1252NullTerminated(); } } @@ -1214,15 +1221,15 @@ public class Widget extends Node { garbageValue = "1" ) @Export("readListenerTriggers") - int[] readListenerTriggers(Buffer var1) { - int var2 = var1.readUnsignedByte(); + int[] readListenerTriggers(Buffer buffer) { + int var2 = buffer.readUnsignedByte(); if (var2 == 0) { return null; } else { int[] var3 = new int[var2]; for (int var4 = 0; var4 < var2; ++var4) { - var3[var4] = var1.readInt(); + var3[var4] = buffer.readInt(); } return var3; @@ -1235,13 +1242,13 @@ public class Widget extends Node { garbageValue = "1403134294" ) @Export("swapItems") - public void swapItems(int var1, int var2) { - int var3 = this.itemIds[var2]; - this.itemIds[var2] = this.itemIds[var1]; - this.itemIds[var1] = var3; - var3 = this.itemQuantities[var2]; - this.itemQuantities[var2] = this.itemQuantities[var1]; - this.itemQuantities[var1] = var3; + public void swapItems(int indexA, int indexB) { + int var3 = this.itemIds[indexB]; + this.itemIds[indexB] = this.itemIds[indexA]; + this.itemIds[indexA] = var3; + var3 = this.itemQuantities[indexB]; + this.itemQuantities[indexB] = this.itemQuantities[indexA]; + this.itemQuantities[indexA] = var3; } @ObfuscatedName("x") @@ -1368,7 +1375,7 @@ public class Widget extends Node { garbageValue = "1082545676" ) @Export("getModel") - public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerAppearance var4) { + public Model getModel(SequenceDefinition sequence, int frame, boolean var3, PlayerAppearance appearance) { field957 = false; int var5; int var6; @@ -1409,11 +1416,11 @@ public class Widget extends Node { } if (var5 == 3) { - if (var4 == null) { + if (appearance == null) { return null; } - var8 = var4.getModelData(); + var8 = appearance.getModelData(); if (var8 == null) { field957 = true; return null; @@ -1436,8 +1443,8 @@ public class Widget extends Node { Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); } - if (var1 != null) { - var7 = var1.animateWidget(var7, var2); + if (sequence != null) { + var7 = sequence.animateWidget(var7, frame); } return var7; @@ -1509,9 +1516,9 @@ public class Widget extends Node { garbageValue = "-30" ) @Export("setAction") - public void setAction(int var1, String var2) { - if (this.actions == null || this.actions.length <= var1) { - String[] var3 = new String[var1 + 1]; + public void setAction(int index, String var2) { + if (this.actions == null || this.actions.length <= index) { + String[] var3 = new String[index + 1]; if (this.actions != null) { for (int var4 = 0; var4 < this.actions.length; ++var4) { var3[var4] = this.actions[var4]; @@ -1521,7 +1528,7 @@ public class Widget extends Node { this.actions = var3; } - this.actions[var1] = var2; + this.actions[index] = var2; } @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index ab67905eaf..e18f167bf5 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -374,7 +374,7 @@ public class WorldMap { var13 = (AbstractWorldMapIcon)var12.next(); var11.add(var13); var14 = new ScriptEvent(); - var15 = new WorldMapEvent(var13.vmethod395(), var13.coord1, var13.coord2); + var15 = new WorldMapEvent(var13.element(), var13.coord1, var13.coord2); var14.setArgs(new Object[]{var15, var1, var2}); if (this.field1010.contains(var13)) { var14.setType(17); @@ -389,7 +389,7 @@ public class WorldMap { var13 = (AbstractWorldMapIcon)var12.next(); if (!var11.contains(var13)) { var14 = new ScriptEvent(); - var15 = new WorldMapEvent(var13.vmethod395(), var13.coord1, var13.coord2); + var15 = new WorldMapEvent(var13.element(), var13.coord1, var13.coord2); var14.setArgs(new Object[]{var15, var1, var2}); var14.setType(16); AbstractArchive.runScript(var14); @@ -444,31 +444,31 @@ public class WorldMap { if (this.mouseCoord != null && var3) { int var8; int var9; - PacketBufferNode var11; + PacketBufferNode var10; if (FriendSystem.jmodCheck() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { int var12 = this.mouseCoord.x; var8 = this.mouseCoord.y; var9 = this.mouseCoord.plane; - var11 = Interpreter.method1915(ClientPacket.field283, Client.packetWriter.isaacCipher); - var11.packetBuffer.writeIntME(0); - var11.packetBuffer.writeShortLE(var8); - var11.packetBuffer.method56(var9); - var11.packetBuffer.writeShort(var12); - Client.packetWriter.method241(var11); + var10 = Interpreter.method1915(ClientPacket.field283, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeIntME(0); + var10.packetBuffer.writeShortLE(var8); + var10.packetBuffer.method56(var9); + var10.packetBuffer.writeShort(var12); + Client.packetWriter.method241(var10); } else { - boolean var10 = true; + boolean var11 = true; if (this.field1004) { var8 = var1 - this.field1002; var9 = var2 - this.field1003; if (var4 - this.field1001 > 500L || var8 < -25 || var8 > 25 || var9 < -25 || var9 > 25) { - var10 = false; + var11 = false; } } - if (var10) { - var11 = Interpreter.method1915(ClientPacket.field267, Client.packetWriter.isaacCipher); - var11.packetBuffer.writeIntME(this.mouseCoord.packed()); - Client.packetWriter.method241(var11); + if (var11) { + var10 = Interpreter.method1915(ClientPacket.field267, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeIntME(this.mouseCoord.packed()); + Client.packetWriter.method241(var10); this.field1001 = 0L; } } @@ -569,17 +569,19 @@ public class WorldMap { garbageValue = "1738506455" ) @Export("mapAreaAtCoord") - public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { + public WorldMapArea mapAreaAtCoord(int plane, int x, int y) { Iterator var4 = this.mapAreas.values().iterator(); - while (var4.hasNext()) { - WorldMapArea var5 = (WorldMapArea)var4.next(); - if (var5.containsCoord(var1, var2, var3)) { - return var5; + WorldMapArea var5; + do { + if (!var4.hasNext()) { + return null; } - } - return null; + var5 = (WorldMapArea)var4.next(); + } while(!var5.containsCoord(plane, x, y)); + + return var5; } @ObfuscatedName("a") @@ -650,9 +652,9 @@ public class WorldMap { garbageValue = "-44" ) @Export("setCurrentMapArea") - void setCurrentMapArea(WorldMapArea var1) { - if (this.currentMapArea == null || var1 != this.currentMapArea) { - this.initializeWorldMapManager(var1); + void setCurrentMapArea(WorldMapArea mapArea) { + if (this.currentMapArea == null || mapArea != this.currentMapArea) { + this.initializeWorldMapManager(mapArea); this.jump(-1, -1, -1); } @@ -664,8 +666,8 @@ public class WorldMap { garbageValue = "-1072205896" ) @Export("initializeWorldMapManager") - void initializeWorldMapManager(WorldMapArea var1) { - this.currentMapArea = var1; + void initializeWorldMapManager(WorldMapArea mapArea) { + this.currentMapArea = mapArea; this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.field990, this.field991); this.cacheLoader.reset(this.currentMapArea.archiveName()); } @@ -696,9 +698,9 @@ public class WorldMap { garbageValue = "1094346962" ) @Export("jump") - void jump(int var1, int var2, int var3) { + void jump(int plane, int x, int y) { if (this.currentMapArea != null) { - int[] var4 = this.currentMapArea.position(var1, var2, var3); + int[] var4 = this.currentMapArea.position(plane, x, y); if (var4 == null) { var4 = this.currentMapArea.position(this.currentMapArea.originPlane(), this.currentMapArea.originX(), this.currentMapArea.originY()); } @@ -721,14 +723,14 @@ public class WorldMap { garbageValue = "-288419793" ) @Export("draw") - public void draw(int var1, int var2, int var3, int var4, int var5) { + public void draw(int x, int y, int width, int height, int cycle) { int[] var6 = new int[4]; Rasterizer2D.Rasterizer2D_getClipArray(var6); - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); + Rasterizer2D.Rasterizer2D_setClip(x, y, width + x, y + height); + Rasterizer2D.Rasterizer2D_fillRectangle(x, y, width, height, -16777216); int var7 = this.cacheLoader.getPercentLoaded(); if (var7 < 100) { - this.drawLoading(var1, var2, var3, var4, var7); + this.drawLoading(x, y, width, height, var7); } else { if (!this.worldMapManager.isLoaded()) { this.worldMapManager.load(this.field989, this.currentMapArea.archiveName(), Client.isMembersWorld); @@ -749,28 +751,28 @@ public class WorldMap { } } - int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); - int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); - this.worldMapManager.method401(this.worldMapX - var8 / 2, this.worldMapY - var9 / 2, var8 / 2 + this.worldMapX, var9 / 2 + this.worldMapY, var1, var2, var3 + var1, var2 + var4); + int var8 = (int)Math.ceil((double)((float)width / this.zoom)); + int var9 = (int)Math.ceil((double)((float)height / this.zoom)); + this.worldMapManager.method401(this.worldMapX - var8 / 2, this.worldMapY - var9 / 2, var8 / 2 + this.worldMapX, var9 / 2 + this.worldMapY, x, y, width + x, y + height); if (!this.elementsDisabled) { boolean var10 = false; - if (var5 - this.field1007 > 100) { - this.field1007 = var5; + if (cycle - this.field1007 > 100) { + this.field1007 = cycle; var10 = true; } - this.worldMapManager.method402(this.worldMapX - var8 / 2, this.worldMapY - var9 / 2, var8 / 2 + this.worldMapX, var9 / 2 + this.worldMapY, var1, var2, var3 + var1, var2 + var4, this.field1006, this.flashingElements, this.field996, this.field994, var10); + this.worldMapManager.method402(this.worldMapX - var8 / 2, this.worldMapY - var9 / 2, var8 / 2 + this.worldMapX, var9 / 2 + this.worldMapY, x, y, width + x, y + height, this.field1006, this.flashingElements, this.field996, this.field994, var10); } - this.method369(var1, var2, var3, var4, var8, var9); + this.method369(x, y, width, height, var8, var9); if (FriendSystem.jmodCheck() && this.showCoord && this.mouseCoord != null) { this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); } this.worldMapDisplayWidth = var8; this.worldMapDisplayHeight = var9; - this.worldMapDisplayX = var1; - this.worldMapDisplayY = var2; + this.worldMapDisplayX = x; + this.worldMapDisplayY = y; Rasterizer2D.Rasterizer2D_setClipArray(var6); } @@ -834,7 +836,7 @@ public class WorldMap { garbageValue = "-84" ) @Export("drawOverview") - public void drawOverview(int var1, int var2, int var3, int var4) { + public void drawOverview(int x, int y, int width, int height) { if (this.cacheLoader.getIsLoaded()) { if (!this.worldMapManager.isLoaded()) { this.worldMapManager.load(this.field989, this.currentMapArea.archiveName(), Client.isMembersWorld); @@ -843,7 +845,7 @@ public class WorldMap { } } - this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.field996, this.field994); + this.worldMapManager.drawOverview(x, y, width, height, this.flashingElements, this.field996, this.field994); } } @@ -854,8 +856,8 @@ public class WorldMap { garbageValue = "328502073" ) @Export("setZoomLevel") - public void setZoomLevel(int var1) { - this.zoomTarget = this.method370(var1); + public void setZoomLevel(int zoom) { + this.zoomTarget = this.method370(zoom); } @ObfuscatedName("aj") @@ -922,14 +924,16 @@ public class WorldMap { public WorldMapArea getMapArea(int var1) { Iterator var2 = this.mapAreas.values().iterator(); - while (var2.hasNext()) { - WorldMapArea var3 = (WorldMapArea)var2.next(); - if (var3.id() == var1) { - return var3; + WorldMapArea var3; + do { + if (!var2.hasNext()) { + return null; } - } - return null; + var3 = (WorldMapArea)var2.next(); + } while(var3.id() != var1); + + return var3; } @ObfuscatedName("ak") @@ -1243,12 +1247,12 @@ public class WorldMap { } AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var10.next(); - WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.vmethod395()); + WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.element()); var11 = false; for (int var14 = this.field1008.length - 1; var14 >= 0; --var14) { if (var13.strings[var14] != null) { - Tiles.insertMenuItemNoShift(var13.strings[var14], var13.string1, this.field1008[var14], var12.vmethod395(), var12.coord1.packed(), var12.coord2.packed()); + Tiles.insertMenuItemNoShift(var13.strings[var14], var13.string1, this.field1008[var14], var12.element(), var12.coord1.packed(), var12.coord2.packed()); var11 = true; } } @@ -1278,22 +1282,26 @@ public class WorldMap { int var6 = -1; Iterator var7 = var4.iterator(); - while (var7.hasNext()) { - AbstractWorldMapIcon var8 = (AbstractWorldMapIcon)var7.next(); - int var10 = var8.coord2.x - var2.x; - int var11 = var8.coord2.y - var2.y; - int var9 = var11 * var11 + var10 * var10; - if (var9 == 0) { - return var8.coord2; - } + while (true) { + AbstractWorldMapIcon var8; + int var11; + do { + if (!var7.hasNext()) { + return var5.coord2; + } - if (var9 < var6 || var5 == null) { - var5 = var8; - var6 = var9; - } + var8 = (AbstractWorldMapIcon)var7.next(); + int var9 = var8.coord2.x - var2.x; + int var10 = var8.coord2.y - var2.y; + var11 = var10 * var10 + var9 * var9; + if (var11 == 0) { + return var8.coord2; + } + } while(var11 >= var6 && var5 != null); + + var5 = var8; + var6 = var11; } - - return var5.coord2; } else { return null; } @@ -1366,14 +1374,16 @@ public class WorldMap { if (this.iconIterator == null) { return null; } else { - while (this.iconIterator.hasNext()) { - AbstractWorldMapIcon var1 = (AbstractWorldMapIcon)this.iconIterator.next(); - if (var1.vmethod395() != -1) { - return var1; + AbstractWorldMapIcon var1; + do { + if (!this.iconIterator.hasNext()) { + return null; } - } - return null; + var1 = (AbstractWorldMapIcon)this.iconIterator.next(); + } while(var1.element() == -1); + + return var1; } } diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java index 3ff6dbd111..0240307fe8 100644 --- a/runescape-client/src/main/java/WorldMapArchiveLoader.java +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -6,8 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ls") @Implements("WorldMapArchiveLoader") -public class WorldMapArchiveLoader -{ +public class WorldMapArchiveLoader { @ObfuscatedName("o") @Export("cacheName") String cacheName; diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index 8b576be1f7..a7c2416d34 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -156,17 +156,19 @@ public class WorldMapArea { garbageValue = "1843012457" ) @Export("containsCoord") - public boolean containsCoord(int var1, int var2, int var3) { + public boolean containsCoord(int plane, int x, int y) { Iterator var4 = this.sections.iterator(); - while (var4.hasNext()) { - WorldMapSection var5 = (WorldMapSection)var4.next(); - if (var5.containsCoord(var1, var2, var3)) { - return true; + WorldMapSection var5; + do { + if (!var4.hasNext()) { + return false; } - } - return false; + var5 = (WorldMapSection)var4.next(); + } while(!var5.containsCoord(plane, x, y)); + + return true; } @ObfuscatedName("w") @@ -175,21 +177,23 @@ public class WorldMapArea { garbageValue = "-693447297" ) @Export("containsPosition") - public boolean containsPosition(int var1, int var2) { - int var3 = var1 / 64; - int var4 = var2 / 64; + public boolean containsPosition(int x, int y) { + int var3 = x / 64; + int var4 = y / 64; if (var3 >= this.minX0 && var3 <= this.maxX0) { if (var4 >= this.minY0 && var4 <= this.maxY0) { Iterator var5 = this.sections.iterator(); - while (var5.hasNext()) { - WorldMapSection var6 = (WorldMapSection)var5.next(); - if (var6.containsPosition(var1, var2)) { - return true; + WorldMapSection var6; + do { + if (!var5.hasNext()) { + return false; } - } - return false; + var6 = (WorldMapSection)var5.next(); + } while(!var6.containsPosition(x, y)); + + return true; } else { return false; } @@ -204,17 +208,19 @@ public class WorldMapArea { garbageValue = "745399916" ) @Export("position") - public int[] position(int var1, int var2, int var3) { + public int[] position(int plane, int x, int y) { Iterator var4 = this.sections.iterator(); - while (var4.hasNext()) { - WorldMapSection var5 = (WorldMapSection)var4.next(); - if (var5.containsCoord(var1, var2, var3)) { - return var5.position(var1, var2, var3); + WorldMapSection var5; + do { + if (!var4.hasNext()) { + return null; } - } - return null; + var5 = (WorldMapSection)var4.next(); + } while(!var5.containsCoord(plane, x, y)); + + return var5.position(plane, x, y); } @ObfuscatedName("u") @@ -223,17 +229,19 @@ public class WorldMapArea { garbageValue = "1509069978" ) @Export("coord") - public Coord coord(int var1, int var2) { + public Coord coord(int x, int y) { Iterator var3 = this.sections.iterator(); - while (var3.hasNext()) { - WorldMapSection var4 = (WorldMapSection)var3.next(); - if (var4.containsPosition(var1, var2)) { - return var4.coord(var1, var2); + WorldMapSection var4; + do { + if (!var3.hasNext()) { + return null; } - } - return null; + var4 = (WorldMapSection)var3.next(); + } while(!var4.containsPosition(x, y)); + + return var4.coord(x, y); } @ObfuscatedName("g") diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index a08306244e..e01228c344 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -70,7 +70,7 @@ public class WorldMapCacheName { } else { ByteArrayPool.field55 = null; WorldMapSection2.field1082 = null; - RouteStrategy.field760 = (byte[][][])null; + RouteStrategy.field760 = ((byte[][][])null); } } @@ -145,24 +145,24 @@ public class WorldMapCacheName { garbageValue = "519207109" ) @Export("addPlayerToScene") - static void addPlayerToScene(Player var0, boolean var1) { - if (var0 != null && var0.isVisible() && !var0.isHidden) { - var0.isUnanimated = false; - if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.readySequence) { - var0.isUnanimated = true; + static void addPlayerToScene(Player player, boolean var1) { + if (player != null && player.isVisible() && !player.isHidden) { + player.isUnanimated = false; + if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && player.movementSequence == player.readySequence) { + player.isUnanimated = true; } - int var2 = var0.x >> 7; - int var3 = var0.y >> 7; + int var2 = player.x >> 7; + int var3 = player.y >> 7; if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { - long var4 = FontName.calculateTag(0, 0, 0, false, var0.index); - if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { - var0.isUnanimated = false; - var0.tileHeight = class32.getTileHeight(var0.x, var0.y, SoundSystem.plane); - var0.playerCycle = Client.cycle; - class65.scene.method286(SoundSystem.plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.field9, var4, var0.field721, var0.field722, var0.field723, var0.field724); + long var4 = FontName.calculateTag(0, 0, 0, false, player.index); + if (player.model0 != null && Client.cycle >= player.animationCycleStart && Client.cycle < player.animationCycleEnd) { + player.isUnanimated = false; + player.tileHeight = class32.getTileHeight(player.x, player.y, SoundSystem.plane); + player.playerCycle = Client.cycle; + class65.scene.method286(SoundSystem.plane, player.x, player.y, player.tileHeight, 60, player, player.field9, var4, player.field721, player.field722, player.field723, player.field724); } else { - if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { + if ((player.x & 127) == 64 && (player.y & 127) == 64) { if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { return; } @@ -170,9 +170,9 @@ public class WorldMapCacheName { Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; } - var0.tileHeight = class32.getTileHeight(var0.x, var0.y, SoundSystem.plane); - var0.playerCycle = Client.cycle; - class65.scene.method285(SoundSystem.plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.field9, var4, var0.field10); + player.tileHeight = class32.getTileHeight(player.x, player.y, SoundSystem.plane); + player.playerCycle = Client.cycle; + class65.scene.method285(SoundSystem.plane, player.x, player.y, player.tileHeight, 60, player, player.field9, var4, player.field10); } } } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index c944c25f41..e5977c7fd7 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -124,14 +124,14 @@ public class WorldMapElement extends DualNode { garbageValue = "81" ) @Export("decode") - public void decode(Buffer var1) { + public void decode(Buffer buffer) { while (true) { - int var2 = var1.readUnsignedByte(); + int var2 = buffer.readUnsignedByte(); if (var2 == 0) { return; } - this.decodeNext(var1, var2); + this.decodeNext(buffer, var2); } } @@ -141,82 +141,82 @@ public class WorldMapElement extends DualNode { garbageValue = "-1197630144" ) @Export("decodeNext") - void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { - this.sprite1 = var1.method51(); - } else if (var2 == 2) { - this.sprite2 = var1.method51(); - } else if (var2 == 3) { - this.field1021 = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { - this.field1022 = var1.readMedium(); - } else if (var2 == 5) { - var1.readMedium(); - } else if (var2 == 6) { - this.textSize = var1.readUnsignedByte(); + void decodeNext(Buffer buffer, int opcode) { + if (opcode == 1) { + this.sprite1 = buffer.method51(); + } else if (opcode == 2) { + this.sprite2 = buffer.method51(); + } else if (opcode == 3) { + this.field1021 = buffer.readStringCp1252NullTerminated(); + } else if (opcode == 4) { + this.field1022 = buffer.readMedium(); + } else if (opcode == 5) { + buffer.readMedium(); + } else if (opcode == 6) { + this.textSize = buffer.readUnsignedByte(); } else { int var3; - if (var2 == 7) { - var3 = var1.readUnsignedByte(); + if (opcode == 7) { + var3 = buffer.readUnsignedByte(); if ((var3 & 1) == 0) { } if ((var3 & 2) == 2) { } - } else if (var2 == 8) { - var1.readUnsignedByte(); - } else if (var2 >= 10 && var2 <= 14) { - this.strings[var2 - 10] = var1.readStringCp1252NullTerminated(); - } else if (var2 == 15) { - var3 = var1.readUnsignedByte(); + } else if (opcode == 8) { + buffer.readUnsignedByte(); + } else if (opcode >= 10 && opcode <= 14) { + this.strings[opcode - 10] = buffer.readStringCp1252NullTerminated(); + } else if (opcode == 15) { + var3 = buffer.readUnsignedByte(); this.field1023 = new int[var3 * 2]; int var4; for (var4 = 0; var4 < var3 * 2; ++var4) { - this.field1023[var4] = var1.method44(); + this.field1023[var4] = buffer.method44(); } - var1.readInt(); - var4 = var1.readUnsignedByte(); + buffer.readInt(); + var4 = buffer.readUnsignedByte(); this.field1028 = new int[var4]; int var5; for (var5 = 0; var5 < this.field1028.length; ++var5) { - this.field1028[var5] = var1.readInt(); + this.field1028[var5] = buffer.readInt(); } this.field1029 = new byte[var3]; for (var5 = 0; var5 < var3; ++var5) { - this.field1029[var5] = var1.readByte(); + this.field1029[var5] = buffer.readByte(); } - } else if (var2 != 16) { - if (var2 == 17) { - this.string1 = var1.readStringCp1252NullTerminated(); - } else if (var2 == 18) { - var1.method51(); - } else if (var2 == 19) { - this.category = var1.readUnsignedShort(); - } else if (var2 == 21) { - var1.readInt(); - } else if (var2 == 22) { - var1.readInt(); - } else if (var2 == 23) { - var1.readUnsignedByte(); - var1.readUnsignedByte(); - var1.readUnsignedByte(); - } else if (var2 == 24) { - var1.method44(); - var1.method44(); - } else if (var2 == 25) { - var1.method51(); - } else if (var2 == 28) { - var1.readUnsignedByte(); - } else if (var2 == 29) { + } else if (opcode != 16) { + if (opcode == 17) { + this.string1 = buffer.readStringCp1252NullTerminated(); + } else if (opcode == 18) { + buffer.method51(); + } else if (opcode == 19) { + this.category = buffer.readUnsignedShort(); + } else if (opcode == 21) { + buffer.readInt(); + } else if (opcode == 22) { + buffer.readInt(); + } else if (opcode == 23) { + buffer.readUnsignedByte(); + buffer.readUnsignedByte(); + buffer.readUnsignedByte(); + } else if (opcode == 24) { + buffer.method44(); + buffer.method44(); + } else if (opcode == 25) { + buffer.method51(); + } else if (opcode == 28) { + buffer.readUnsignedByte(); + } else if (opcode == 29) { class266[] var6 = new class266[]{class266.field3527, class266.field3526, class266.field3529}; - this.field3287 = (class266)ScriptFrame.findEnumerated(var6, var1.readUnsignedByte()); - } else if (var2 == 30) { - this.field3301 = (class249)ScriptFrame.findEnumerated(FloorUnderlayDefinition.method4839(), var1.readUnsignedByte()); + this.field3287 = (class266)ScriptFrame.findEnumerated(var6, buffer.readUnsignedByte()); + } else if (opcode == 30) { + this.field3301 = (class249)ScriptFrame.findEnumerated(FloorUnderlayDefinition.method4839(), buffer.readUnsignedByte()); } } } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index 02aee7929e..40e3e92b0d 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -78,18 +78,18 @@ public class WorldMapEvent { return; } - long tag = ViewportMouse.ViewportMouse_entityTags[var8]; - if (var6 != tag) { + long var10 = ViewportMouse.ViewportMouse_entityTags[var8]; + if (var6 != var10) { label276: { - var6 = tag; - int x = method780(var8); + var6 = var10; + int var12 = method780(var8); long var13 = ViewportMouse.ViewportMouse_entityTags[var8]; - int y = (int)(var13 >>> 7 & 127L); - y = y; + int var15 = (int)(var13 >>> 7 & 127L); + var15 = var15; int var16 = GrandExchangeEvent.method80(var8); - int identifier = ClientPreferences.method1808(var8); - if (var16 == 2 && class65.scene.getObjectFlags(SoundSystem.plane, x, y, tag) >= 0) { - ObjectDefinition var18 = class50.getObjectDefinition(identifier); + int var17 = ClientPreferences.method1808(var8); + if (var16 == 2 && class65.scene.getObjectFlags(SoundSystem.plane, var12, var15, var10) >= 0) { + ObjectDefinition var18 = class50.getObjectDefinition(var17); if (var18.transforms != null) { var18 = var18.transform(); } @@ -99,10 +99,10 @@ public class WorldMapEvent { } if (Client.isItemSelected == 1) { - Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(65535) + var18.name, 1, identifier, x, y); + Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(65535) + var18.name, 1, var17, var12, var15); } else if (Client.isSpellSelected) { if ((FloorDecoration.selectedSpellFlags & 4) == 4) { - Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(65535) + var18.name, 2, identifier, x, y); + Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(65535) + var18.name, 2, var17, var12, var15); } } else { String[] var19 = var18.actions; @@ -130,90 +130,90 @@ public class WorldMapEvent { var21 = 1001; } - Tiles.insertMenuItemNoShift(var19[var20], BufferedFile.colorStartTag(65535) + var18.name, var21, identifier, x, y); + Tiles.insertMenuItemNoShift(var19[var20], BufferedFile.colorStartTag(65535) + var18.name, var21, var17, var12, var15); } } } - Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(65535) + var18.name, 1002, var18.id, x, y); + Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(65535) + var18.name, 1002, var18.id, var12, var15); } } - int var22; + int[] var22; int var30; - NPC var31; - Player var32; - int[] var34; + int var31; + NPC var32; + Player var34; if (var16 == 1) { - NPC var23 = Client.npcs[identifier]; + NPC var23 = Client.npcs[var17]; if (var23 == null) { break label276; } if (var23.definition.size == 1 && (var23.x & 127) == 64 && (var23.y & 127) == 64) { - for (var30 = 0; var30 < Client.npcCount; ++var30) { - var31 = Client.npcs[Client.npcIndices[var30]]; - if (var31 != null && var23 != var31 && var31.definition.size == 1 && var31.x == var23.x && var31.y == var23.y) { - Tile.addNpcToMenu(var31.definition, Client.npcIndices[var30], x, y); + for (var31 = 0; var31 < Client.npcCount; ++var31) { + var32 = Client.npcs[Client.npcIndices[var31]]; + if (var32 != null && var23 != var32 && var32.definition.size == 1 && var32.x == var23.x && var32.y == var23.y) { + Tile.addNpcToMenu(var32.definition, Client.npcIndices[var31], var12, var15); } } - var30 = Players.Players_count; - var34 = Players.Players_indices; + var31 = Players.Players_count; + var22 = Players.Players_indices; - for (var22 = 0; var22 < var30; ++var22) { - var32 = Client.players[var34[var22]]; - if (var32 != null && var32.x == var23.x && var32.y == var23.y) { - TotalQuantityComparator.addPlayerToMenu(var32, var34[var22], x, y); + for (var30 = 0; var30 < var31; ++var30) { + var34 = Client.players[var22[var30]]; + if (var34 != null && var34.x == var23.x && var34.y == var23.y) { + TotalQuantityComparator.addPlayerToMenu(var34, var22[var30], var12, var15); } } } - Tile.addNpcToMenu(var23.definition, identifier, x, y); + Tile.addNpcToMenu(var23.definition, var17, var12, var15); } if (var16 == 0) { - Player var33 = Client.players[identifier]; + Player var33 = Client.players[var17]; if (var33 == null) { break label276; } if ((var33.x & 127) == 64 && (var33.y & 127) == 64) { - for (var30 = 0; var30 < Client.npcCount; ++var30) { - var31 = Client.npcs[Client.npcIndices[var30]]; - if (var31 != null && var31.definition.size == 1 && var33.x == var31.x && var33.y == var31.y) { - Tile.addNpcToMenu(var31.definition, Client.npcIndices[var30], x, y); + for (var31 = 0; var31 < Client.npcCount; ++var31) { + var32 = Client.npcs[Client.npcIndices[var31]]; + if (var32 != null && var32.definition.size == 1 && var33.x == var32.x && var33.y == var32.y) { + Tile.addNpcToMenu(var32.definition, Client.npcIndices[var31], var12, var15); } } - var30 = Players.Players_count; - var34 = Players.Players_indices; + var31 = Players.Players_count; + var22 = Players.Players_indices; - for (var22 = 0; var22 < var30; ++var22) { - var32 = Client.players[var34[var22]]; - if (var32 != null && var32 != var33 && var32.x == var33.x && var32.y == var33.y) { - TotalQuantityComparator.addPlayerToMenu(var32, var34[var22], x, y); + for (var30 = 0; var30 < var31; ++var30) { + var34 = Client.players[var22[var30]]; + if (var34 != null && var34 != var33 && var34.x == var33.x && var34.y == var33.y) { + TotalQuantityComparator.addPlayerToMenu(var34, var22[var30], var12, var15); } } } - if (identifier != Client.combatTargetPlayerIndex) { - TotalQuantityComparator.addPlayerToMenu(var33, identifier, x, y); + if (var17 != Client.combatTargetPlayerIndex) { + TotalQuantityComparator.addPlayerToMenu(var33, var17, var12, var15); } else { - var4 = tag; + var4 = var10; } } if (var16 == 3) { - NodeDeque var35 = Client.groundItems[SoundSystem.plane][x][y]; + NodeDeque var35 = Client.groundItems[SoundSystem.plane][var12][var15]; if (var35 != null) { for (GroundItem var24 = (GroundItem)var35.first(); var24 != null; var24 = (GroundItem)var35.next()) { ItemDefinition var25 = Skills.getItemDefinition(var24.id); if (Client.isItemSelected == 1) { - Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16748608) + var25.name, 16, var24.id, x, y); + Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16748608) + var25.name, 16, var24.id, var12, var15); } else if (Client.isSpellSelected) { if ((FloorDecoration.selectedSpellFlags & 1) == 1) { - Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16748608) + var25.name, 17, var24.id, x, y); + Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16748608) + var25.name, 17, var24.id, var12, var15); } } else { String[] var26 = var25.groundActions; @@ -241,13 +241,13 @@ public class WorldMapEvent { var28 = 22; } - Tiles.insertMenuItemNoShift(var26[var27], BufferedFile.colorStartTag(16748608) + var25.name, var28, var24.id, x, y); + Tiles.insertMenuItemNoShift(var26[var27], BufferedFile.colorStartTag(16748608) + var25.name, var28, var24.id, var12, var15); } else if (var27 == 2) { - Tiles.insertMenuItemNoShift("Take", BufferedFile.colorStartTag(16748608) + var25.name, 20, var24.id, x, y); + Tiles.insertMenuItemNoShift("Take", BufferedFile.colorStartTag(16748608) + var25.name, 20, var24.id, var12, var15); } } - Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16748608) + var25.name, 1004, var24.id, x, y); + Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16748608) + var25.name, 1004, var24.id, var12, var15); } } } diff --git a/runescape-client/src/main/java/WorldMapIcon1.java b/runescape-client/src/main/java/WorldMapIcon1.java index b22d71e9ad..fb95ef0345 100644 --- a/runescape-client/src/main/java/WorldMapIcon1.java +++ b/runescape-client/src/main/java/WorldMapIcon1.java @@ -57,7 +57,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { super(var1, var2); this.field1031 = var3; this.label0 = var4; - WorldMapElement var5 = ViewportMouse.getWorldMapElement(this.vmethod395()); + WorldMapElement var5 = ViewportMouse.getWorldMapElement(this.element()); Sprite var6 = var5.getSprite(false); if (var6 != null) { this.field1032 = var6.subWidth; @@ -74,7 +74,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { signature = "(I)I", garbageValue = "1990181988" ) - public int vmethod395() { + public int element() { return this.field1031; } @@ -83,7 +83,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { signature = "(I)Laj;", garbageValue = "1159446036" ) - WorldMapLabel vmethod396() { + WorldMapLabel label() { return this.label0; } @@ -112,7 +112,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { ) @Export("addGameMessage") static void addGameMessage(int var0, String var1, String var2) { - GrandExchangeEvents.addMessage(var0, var1, var2, (String)null); + GrandExchangeEvents.addChatMessage(var0, var1, var2, (String)null); } @ObfuscatedName("fz") @@ -122,57 +122,57 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { ) static final void method212() { for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { - int var10002 = Client.queuedSoundEffectDelays[var0]--; + int var10003 = Client.queuedSoundEffectDelays[var0]--; if (Client.queuedSoundEffectDelays[var0] >= -10) { - SoundEffect var10 = Client.soundEffects[var0]; - if (var10 == null) { - Object var2 = null; - var10 = SoundEffect.readSoundEffect(WorldMapDecoration.archive4, Client.soundEffectIds[var0], 0); - if (var10 == null) { + SoundEffect var11 = Client.soundEffects[var0]; + if (var11 == null) { + Object var3 = null; + var11 = SoundEffect.readSoundEffect(WorldMapDecoration.archive4, Client.soundEffectIds[var0], 0); + if (var11 == null) { continue; } - int[] var10000 = Client.queuedSoundEffectDelays; - var10000[var0] += var10.method303(); - Client.soundEffects[var0] = var10; + int[] var4 = Client.queuedSoundEffectDelays; + var4[var0] += var11.method303(); + Client.soundEffects[var0] = var11; } if (Client.queuedSoundEffectDelays[var0] < 0) { - int var11; + int var12; if (Client.soundLocations[var0] != 0) { - int var3 = (Client.soundLocations[var0] & 255) * 128; - int var4 = Client.soundLocations[var0] >> 16 & 255; - int var5 = var4 * 128 + 64 - Canvas.localPlayer.x; - if (var5 < 0) { - var5 = -var5; + int var13 = (Client.soundLocations[var0] & 255) * 128; + int var5 = Client.soundLocations[var0] >> 16 & 255; + int var6 = var5 * 128 + 64 - Canvas.localPlayer.x; + if (var6 < 0) { + var6 = -var6; } - int var6 = Client.soundLocations[var0] >> 8 & 255; - int var7 = var6 * 128 + 64 - Canvas.localPlayer.y; - if (var7 < 0) { - var7 = -var7; + int var7 = Client.soundLocations[var0] >> 8 & 255; + int var8 = var7 * 128 + 64 - Canvas.localPlayer.y; + if (var8 < 0) { + var8 = -var8; } - int var8 = var5 + var7 - 128; - if (var8 > var3) { + int var9 = var6 + var8 - 128; + if (var9 > var13) { Client.queuedSoundEffectDelays[var0] = -100; continue; } - if (var8 < 0) { - var8 = 0; + if (var9 < 0) { + var9 = 0; } - var11 = (var3 - var8) * Client.field115 / var3; + var12 = (var13 - var9) * Client.field115 / var13; } else { - var11 = Client.soundEffectVolume; + var12 = Client.soundEffectVolume; } - if (var11 > 0) { - RawSound var12 = var10.toRawSound().resample(MilliClock.decimator); - RawPcmStream var13 = RawPcmStream.createRawPcmStream(var12, 100, var11); - var13.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); - TaskHandler.pcmStreamMixer.addSubStream(var13); + if (var12 > 0) { + RawSound var14 = var11.toRawSound().resample(MilliClock.decimator); + RawPcmStream var15 = RawPcmStream.createRawPcmStream(var14, 100, var12); + var15.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); + TaskHandler.pcmStreamMixer.addSubStream(var15); } Client.queuedSoundEffectDelays[var0] = -100; @@ -180,12 +180,12 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { } else { --Client.soundEffectCount; - for (int var1 = var0; var1 < Client.soundEffectCount; ++var1) { - Client.soundEffectIds[var1] = Client.soundEffectIds[var1 + 1]; - Client.soundEffects[var1] = Client.soundEffects[var1 + 1]; - Client.queuedSoundEffectLoops[var1] = Client.queuedSoundEffectLoops[var1 + 1]; - Client.queuedSoundEffectDelays[var1] = Client.queuedSoundEffectDelays[var1 + 1]; - Client.soundLocations[var1] = Client.soundLocations[var1 + 1]; + for (int var2 = var0; var2 < Client.soundEffectCount; ++var2) { + Client.soundEffectIds[var2] = Client.soundEffectIds[var2 + 1]; + Client.soundEffects[var2] = Client.soundEffects[var2 + 1]; + Client.queuedSoundEffectLoops[var2] = Client.queuedSoundEffectLoops[var2 + 1]; + Client.queuedSoundEffectDelays[var2] = Client.queuedSoundEffectDelays[var2 + 1]; + Client.soundLocations[var2] = Client.soundLocations[var2 + 1]; } --var0; @@ -193,14 +193,14 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { } if (Client.field107) { - boolean var9; + boolean var10; if (class214.field1129 != 0) { - var9 = true; + var10 = true; } else { - var9 = class214.midiPcmStream.isReady(); + var10 = class214.midiPcmStream.isReady(); } - if (!var9) { + if (!var10) { if (Client.field128 != 0 && Client.field112 != -1) { Login.method2076(UserComparator3.archive6, Client.field112, 0, Client.field128, false); } diff --git a/runescape-client/src/main/java/WorldMapIcon2.java b/runescape-client/src/main/java/WorldMapIcon2.java index 450dc4d60a..342b053130 100644 --- a/runescape-client/src/main/java/WorldMapIcon2.java +++ b/runescape-client/src/main/java/WorldMapIcon2.java @@ -56,7 +56,7 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { signature = "(I)I", garbageValue = "1990181988" ) - public int vmethod395() { + public int element() { return this.field1036; } @@ -65,7 +65,7 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { signature = "(I)Laj;", garbageValue = "1159446036" ) - WorldMapLabel vmethod396() { + WorldMapLabel label() { return this.label0; } @@ -95,7 +95,7 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { void method399() { this.field1036 = class50.getObjectDefinition(this.field1034).transform().mapIconId; this.label0 = this.field1035.method420(ViewportMouse.getWorldMapElement(this.field1036)); - WorldMapElement var1 = ViewportMouse.getWorldMapElement(this.vmethod395()); + WorldMapElement var1 = ViewportMouse.getWorldMapElement(this.element()); Sprite var2 = var1.getSprite(false); if (var2 != null) { this.field1037 = var2.subWidth; diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index 0917600d1d..525708dfec 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -190,7 +190,7 @@ public class WorldMapLabel { VarbitDefinition.indexedSpriteWidths = null; SecureRandomCallable.indexedSpriteHeights = null; class328.indexedSpritePalette = null; - class328.spritePixels = (byte[][])null; + class328.spritePixels = ((byte[][])null); return var0; } @@ -200,8 +200,8 @@ public class WorldMapLabel { garbageValue = "1459100828" ) @Export("compareWorlds") - static int compareWorlds(World var0, World var1, int var2, boolean var3) { - if (var2 == 1) { + static int compareWorlds(World var0, World var1, int mode, boolean var3) { + if (mode == 1) { int var4 = var0.population; int var5 = var1.population; if (!var3) { @@ -216,7 +216,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.method357() ? (var1.method357() ? 0 : 1) : (var1.method357() ? -1 : 0)) : (var2 == 5 ? (var0.method356() ? (var1.method356() ? 0 : 1) : (var1.method356() ? -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))))); + return mode == 2 ? var0.location - var1.location : (mode == 3 ? (var0.activity.equals("-") ? (var1.activity.equals("-") ? 0 : (var3 ? -1 : 1)) : (var1.activity.equals("-") ? (var3 ? 1 : -1) : var0.activity.compareTo(var1.activity))) : (mode == 4 ? (var0.method357() ? (var1.method357() ? 0 : 1) : (var1.method357() ? -1 : 0)) : (mode == 5 ? (var0.method356() ? (var1.method356() ? 0 : 1) : (var1.method356() ? -1 : 0)) : (mode == 6 ? (var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0)) : (mode == 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 b7fc8eccab..46b9863c80 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -108,21 +108,21 @@ public final class WorldMapManager { garbageValue = "32" ) @Export("load") - public void load(AbstractArchive var1, String var2, boolean var3) { + public void load(AbstractArchive indexCache, String cacheName, boolean isMembersWorld) { if (!this.loadStarted) { this.isLoaded0 = false; this.loadStarted = true; System.nanoTime(); - int var4 = var1.getGroupId(WorldMapCacheName.WorldMapCacheName_details.name); - int var5 = var1.getFileId(var4, var2); - Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.WorldMapCacheName_details.name, var2)); - Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, var2)); + int var4 = indexCache.getGroupId(WorldMapCacheName.WorldMapCacheName_details.name); + int var5 = indexCache.getFileId(var4, cacheName); + Buffer var6 = new Buffer(indexCache.takeFileByNames(WorldMapCacheName.WorldMapCacheName_details.name, cacheName)); + Buffer var7 = new Buffer(indexCache.takeFileByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, cacheName)); System.nanoTime(); System.nanoTime(); this.mapAreaData = new WorldMapAreaData(); try { - this.mapAreaData.method387(var6, var7, var5, var3); + this.mapAreaData.method387(var6, var7, var5, isMembersWorld); } catch (IllegalStateException var16) { return; } @@ -142,36 +142,36 @@ public final class WorldMapManager { this.regions = new WorldMapRegion[var8][var9]; Iterator var10 = this.mapAreaData.field1016.iterator(); - int var12; + int var11; while (var10.hasNext()) { - class15 var11 = (class15)var10.next(); - var12 = var11.field149; - int var13 = var11.field146; - int var14 = var12 - this.mapAreaData.minX(); + class15 var12 = (class15)var10.next(); + var11 = var12.field149; + int var13 = var12.field146; + int var14 = var11 - this.mapAreaData.minX(); int var15 = var13 - this.mapAreaData.minY(); - this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.method386(), this.fonts); - this.regions[var14][var15].method447(var11, this.mapAreaData.field1018); + this.regions[var14][var15] = new WorldMapRegion(var11, var13, this.mapAreaData.method386(), this.fonts); + this.regions[var14][var15].method447(var12, this.mapAreaData.field1018); } for (int var17 = 0; var17 < var8; ++var17) { - for (var12 = 0; var12 < var9; ++var12) { - if (this.regions[var17][var12] == null) { - this.regions[var17][var12] = new WorldMapRegion(this.mapAreaData.minX() + var17, this.mapAreaData.minY() + var12, this.mapAreaData.method386(), this.fonts); - this.regions[var17][var12].method405(this.mapAreaData.field1017, this.mapAreaData.field1018); + for (var11 = 0; var11 < var9; ++var11) { + if (this.regions[var17][var11] == null) { + this.regions[var17][var11] = new WorldMapRegion(this.mapAreaData.minX() + var17, this.mapAreaData.minY() + var11, this.mapAreaData.method386(), this.fonts); + this.regions[var17][var11].method405(this.mapAreaData.field1017, this.mapAreaData.field1018); } } } System.nanoTime(); System.nanoTime(); - if (var1.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2)) { - byte[] var18 = var1.takeFileByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2); + if (indexCache.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, cacheName)) { + byte[] var18 = indexCache.takeFileByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, cacheName); this.overviewSprite = class27.convertJpgToSprite(var18); } System.nanoTime(); - var1.method6(); - var1.method8(); + indexCache.method6(); + indexCache.method8(); this.isLoaded0 = true; } @@ -421,7 +421,7 @@ public final class WorldMapManager { while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); if (var5.method19()) { - int var6 = var5.vmethod395(); + int var6 = var5.element(); if (!this.icons.containsKey(var6)) { LinkedList var7 = new LinkedList(); var7.add(var5); @@ -461,16 +461,16 @@ public final class WorldMapManager { garbageValue = "514181856" ) @Export("itemContainerSetItem") - static void itemContainerSetItem(int var0, int var1, int var2, int var3) { - ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + static void itemContainerSetItem(int itemContainerId, int index, int itemId, int itemQuantity) { + ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)itemContainerId); if (var4 == null) { var4 = new ItemContainer(); - ItemContainer.itemContainers.put(var4, (long)var0); + ItemContainer.itemContainers.put(var4, (long)itemContainerId); } - if (var4.ids.length <= var1) { - int[] var5 = new int[var1 + 1]; - int[] var6 = new int[var1 + 1]; + if (var4.ids.length <= index) { + int[] var5 = new int[index + 1]; + int[] var6 = new int[index + 1]; int var7; for (var7 = 0; var7 < var4.ids.length; ++var7) { @@ -478,7 +478,7 @@ public final class WorldMapManager { var6[var7] = var4.quantities[var7]; } - for (var7 = var4.ids.length; var7 < var1; ++var7) { + for (var7 = var4.ids.length; var7 < index; ++var7) { var5[var7] = -1; var6[var7] = 0; } @@ -487,8 +487,8 @@ public final class WorldMapManager { var4.quantities = var6; } - var4.ids[var1] = var2; - var4.quantities[var1] = var3; + var4.ids[index] = itemId; + var4.quantities[index] = itemQuantity; } @ObfuscatedName("s") diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index cd5e892ed1..e1f8f315aa 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -348,7 +348,7 @@ public class WorldMapRegion { while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); if (var5.method19()) { - int var6 = var5.vmethod395(); + int var6 = var5.element(); if (var1.contains(var6)) { WorldMapElement var7 = ViewportMouse.getWorldMapElement(var6); this.method414(var7, var5.field5, var5.field6, var2, var3); @@ -444,7 +444,7 @@ public class WorldMapRegion { int var9; if (var7 != -1) { int var10 = this.field1053; - FloorOverlayDefinition var11 = (FloorOverlayDefinition) FloorOverlayDefinition.field664.get((long)var7); + FloorOverlayDefinition var11 = (FloorOverlayDefinition)FloorOverlayDefinition.field664.get((long)var7); FloorOverlayDefinition var12; if (var11 != null) { var12 = var11; @@ -549,7 +549,7 @@ public class WorldMapRegion { int var6 = var3.field145[var5][var1][var2] - 1; if (var6 > -1) { int var7 = this.field1053; - FloorOverlayDefinition var8 = (FloorOverlayDefinition) FloorOverlayDefinition.field664.get((long)var6); + FloorOverlayDefinition var8 = (FloorOverlayDefinition)FloorOverlayDefinition.field664.get((long)var6); FloorOverlayDefinition var9; if (var8 != null) { var9 = var8; @@ -694,13 +694,13 @@ public class WorldMapRegion { boolean var10 = var9 >= WorldMapDecorationType.field2805.id && var9 <= WorldMapDecorationType.field2804.id || var9 == WorldMapDecorationType.field2806.id; if (var10) { ObjectDefinition var11 = class50.getObjectDefinition(var8.objectDefinitionId); - int var12 = var11.int1 != 0 ? 0xffcc0000 : 0xffcccccc; + int var12 = var11.int1 != 0 ? -3407872 : -3355444; if (var8.decoration == WorldMapDecorationType.field2805.id) { this.method422(var1, var2, var8.rotation, var12); } if (var8.decoration == WorldMapDecorationType.field2813.id) { - this.method422(var1, var2, var8.rotation, 0xffcccccc); + this.method422(var1, var2, var8.rotation, -3355444); this.method422(var1, var2, var8.rotation + 1, var12); } @@ -761,7 +761,7 @@ public class WorldMapRegion { if (var12 != null && var12.method19()) { var12.field5 = var10; var12.field6 = var11; - WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.vmethod395()); + WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.element()); if (!var3.contains(var13.method390())) { this.method415(var12, var10, var11, var5); } @@ -781,7 +781,7 @@ public class WorldMapRegion { while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); if (var5.method19()) { - WorldMapElement var6 = ViewportMouse.getWorldMapElement(var5.vmethod395()); + WorldMapElement var6 = ViewportMouse.getWorldMapElement(var5.element()); if (var6 != null && var1.contains(var6.method390())) { this.method414(var6, var5.field5, var5.field6, var2, var3); } @@ -813,7 +813,7 @@ public class WorldMapRegion { garbageValue = "-1283733783" ) void method415(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = ViewportMouse.getWorldMapElement(var1.vmethod395()); + WorldMapElement var5 = ViewportMouse.getWorldMapElement(var1.element()); this.method416(var5, var2, var3); this.method417(var1, var5, var2, var3, var4); } @@ -839,7 +839,7 @@ public class WorldMapRegion { garbageValue = "-1237576843" ) void method417(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { - WorldMapLabel var6 = var1.vmethod396(); + WorldMapLabel var6 = var1.label(); if (var6 != null && var6.size.method400(var5)) { Font var7 = (Font)this.fonts.get(var6.size); var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1022, 0, 1, 0, var7.ascent / 2); @@ -863,7 +863,7 @@ public class WorldMapRegion { int var9 = var7.coord2.y % 64; var7.field5 = (int)((float)var8 * var5 + (float)var1); var7.field6 = (int)(var5 * (float)(63 - var9) + (float)var2); - if (!var3.contains(var7.vmethod395())) { + if (!var3.contains(var7.element())) { this.method415(var7, var7.field5, var7.field6, var5); } } diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index c2e18f2b79..3e7942dc74 100644 --- a/runescape-client/src/main/java/WorldMapSection.java +++ b/runescape-client/src/main/java/WorldMapSection.java @@ -12,7 +12,7 @@ public interface WorldMapSection { garbageValue = "1384899025" ) @Export("expandBounds") - void expandBounds(WorldMapArea var1); + void expandBounds(WorldMapArea area); @ObfuscatedName("f") @ObfuscatedSignature( @@ -20,7 +20,7 @@ public interface WorldMapSection { garbageValue = "93" ) @Export("containsCoord") - boolean containsCoord(int var1, int var2, int var3); + boolean containsCoord(int plane, int x, int y); @ObfuscatedName("q") @ObfuscatedSignature( @@ -28,7 +28,7 @@ public interface WorldMapSection { garbageValue = "4" ) @Export("containsPosition") - boolean containsPosition(int var1, int var2); + boolean containsPosition(int x, int y); @ObfuscatedName("w") @ObfuscatedSignature( @@ -36,7 +36,7 @@ public interface WorldMapSection { garbageValue = "1545934424" ) @Export("position") - int[] position(int var1, int var2, int var3); + int[] position(int plane, int x, int y); @ObfuscatedName("o") @ObfuscatedSignature( @@ -44,7 +44,7 @@ public interface WorldMapSection { garbageValue = "-1916486802" ) @Export("coord") - Coord coord(int var1, int var2); + Coord coord(int x, int y); @ObfuscatedName("u") @ObfuscatedSignature( @@ -52,5 +52,5 @@ public interface WorldMapSection { garbageValue = "-113" ) @Export("read") - void read(Buffer var1); + void read(Buffer buffer); } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 9ace770508..f90d0505ca 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -175,87 +175,87 @@ public class WorldMapSection2 implements WorldMapSection { byte var10 = 0; int var11 = 0; class178.bufferX[var10] = var0; - int var13 = var10 + 1; + int var12 = var10 + 1; class178.bufferY[var10] = var1; - int[][] var14 = var3.flags; + int[][] var13 = var3.flags; - while (var13 != var11) { + while (var12 != var11) { var4 = class178.bufferX[var11]; var5 = class178.bufferY[var11]; var11 = var11 + 1 & 4095; - int var15 = var4 - var8; - int var16 = var5 - var9; - int var17 = var4 - var3.xInset; - int var18 = var5 - var3.yInset; + int var14 = var4 - var8; + int var15 = var5 - var9; + int var16 = var4 - var3.xInset; + int var17 = var5 - var3.yInset; if (var2.vmethod3644(2, var4, var5, var3)) { InterfaceParent.field986 = var4; UrlRequester.field929 = var5; return true; } - int var19 = class178.distances[var15][var16] + 1; - if (var15 > 0 && class178.directions[var15 - 1][var16] == 0 && (var14[var17 - 1][var18] & 19136782) == 0 && (var14[var17 - 1][var18 + 1] & 19136824) == 0) { - class178.bufferX[var13] = var4 - 1; - class178.bufferY[var13] = var5; - var13 = var13 + 1 & 4095; - class178.directions[var15 - 1][var16] = 2; - class178.distances[var15 - 1][var16] = var19; + int var18 = class178.distances[var14][var15] + 1; + if (var14 > 0 && class178.directions[var14 - 1][var15] == 0 && (var13[var16 - 1][var17] & 19136782) == 0 && (var13[var16 - 1][var17 + 1] & 19136824) == 0) { + class178.bufferX[var12] = var4 - 1; + class178.bufferY[var12] = var5; + var12 = var12 + 1 & 4095; + class178.directions[var14 - 1][var15] = 2; + class178.distances[var14 - 1][var15] = var18; } - if (var15 < 126 && class178.directions[var15 + 1][var16] == 0 && (var14[var17 + 2][var18] & 19136899) == 0 && (var14[var17 + 2][var18 + 1] & 19136992) == 0) { - class178.bufferX[var13] = var4 + 1; - class178.bufferY[var13] = var5; - var13 = var13 + 1 & 4095; - class178.directions[var15 + 1][var16] = 8; - class178.distances[var15 + 1][var16] = var19; + if (var14 < 126 && class178.directions[var14 + 1][var15] == 0 && (var13[var16 + 2][var17] & 19136899) == 0 && (var13[var16 + 2][var17 + 1] & 19136992) == 0) { + class178.bufferX[var12] = var4 + 1; + class178.bufferY[var12] = var5; + var12 = var12 + 1 & 4095; + class178.directions[var14 + 1][var15] = 8; + class178.distances[var14 + 1][var15] = var18; } - if (var16 > 0 && class178.directions[var15][var16 - 1] == 0 && (var14[var17][var18 - 1] & 19136782) == 0 && (var14[var17 + 1][var18 - 1] & 19136899) == 0) { - class178.bufferX[var13] = var4; - class178.bufferY[var13] = var5 - 1; - var13 = var13 + 1 & 4095; - class178.directions[var15][var16 - 1] = 1; - class178.distances[var15][var16 - 1] = var19; + if (var15 > 0 && class178.directions[var14][var15 - 1] == 0 && (var13[var16][var17 - 1] & 19136782) == 0 && (var13[var16 + 1][var17 - 1] & 19136899) == 0) { + class178.bufferX[var12] = var4; + class178.bufferY[var12] = var5 - 1; + var12 = var12 + 1 & 4095; + class178.directions[var14][var15 - 1] = 1; + class178.distances[var14][var15 - 1] = var18; } - if (var16 < 126 && class178.directions[var15][var16 + 1] == 0 && (var14[var17][var18 + 2] & 19136824) == 0 && (var14[var17 + 1][var18 + 2] & 19136992) == 0) { - class178.bufferX[var13] = var4; - class178.bufferY[var13] = var5 + 1; - var13 = var13 + 1 & 4095; - class178.directions[var15][var16 + 1] = 4; - class178.distances[var15][var16 + 1] = var19; + if (var15 < 126 && class178.directions[var14][var15 + 1] == 0 && (var13[var16][var17 + 2] & 19136824) == 0 && (var13[var16 + 1][var17 + 2] & 19136992) == 0) { + class178.bufferX[var12] = var4; + class178.bufferY[var12] = var5 + 1; + var12 = var12 + 1 & 4095; + class178.directions[var14][var15 + 1] = 4; + class178.distances[var14][var15 + 1] = var18; } - if (var15 > 0 && var16 > 0 && class178.directions[var15 - 1][var16 - 1] == 0 && (var14[var17 - 1][var18] & 19136830) == 0 && (var14[var17 - 1][var18 - 1] & 19136782) == 0 && (var14[var17][var18 - 1] & 19136911) == 0) { - class178.bufferX[var13] = var4 - 1; - class178.bufferY[var13] = var5 - 1; - var13 = var13 + 1 & 4095; - class178.directions[var15 - 1][var16 - 1] = 3; - class178.distances[var15 - 1][var16 - 1] = var19; + if (var14 > 0 && var15 > 0 && class178.directions[var14 - 1][var15 - 1] == 0 && (var13[var16 - 1][var17] & 19136830) == 0 && (var13[var16 - 1][var17 - 1] & 19136782) == 0 && (var13[var16][var17 - 1] & 19136911) == 0) { + class178.bufferX[var12] = var4 - 1; + class178.bufferY[var12] = var5 - 1; + var12 = var12 + 1 & 4095; + class178.directions[var14 - 1][var15 - 1] = 3; + class178.distances[var14 - 1][var15 - 1] = var18; } - if (var15 < 126 && var16 > 0 && class178.directions[var15 + 1][var16 - 1] == 0 && (var14[var17 + 1][var18 - 1] & 19136911) == 0 && (var14[var17 + 2][var18 - 1] & 19136899) == 0 && (var14[var17 + 2][var18] & 19136995) == 0) { - class178.bufferX[var13] = var4 + 1; - class178.bufferY[var13] = var5 - 1; - var13 = var13 + 1 & 4095; - class178.directions[var15 + 1][var16 - 1] = 9; - class178.distances[var15 + 1][var16 - 1] = var19; + if (var14 < 126 && var15 > 0 && class178.directions[var14 + 1][var15 - 1] == 0 && (var13[var16 + 1][var17 - 1] & 19136911) == 0 && (var13[var16 + 2][var17 - 1] & 19136899) == 0 && (var13[var16 + 2][var17] & 19136995) == 0) { + class178.bufferX[var12] = var4 + 1; + class178.bufferY[var12] = var5 - 1; + var12 = var12 + 1 & 4095; + class178.directions[var14 + 1][var15 - 1] = 9; + class178.distances[var14 + 1][var15 - 1] = var18; } - if (var15 > 0 && var16 < 126 && class178.directions[var15 - 1][var16 + 1] == 0 && (var14[var17 - 1][var18 + 1] & 19136830) == 0 && (var14[var17 - 1][var18 + 2] & 19136824) == 0 && (var14[var17][var18 + 2] & 19137016) == 0) { - class178.bufferX[var13] = var4 - 1; - class178.bufferY[var13] = var5 + 1; - var13 = var13 + 1 & 4095; - class178.directions[var15 - 1][var16 + 1] = 6; - class178.distances[var15 - 1][var16 + 1] = var19; + if (var14 > 0 && var15 < 126 && class178.directions[var14 - 1][var15 + 1] == 0 && (var13[var16 - 1][var17 + 1] & 19136830) == 0 && (var13[var16 - 1][var17 + 2] & 19136824) == 0 && (var13[var16][var17 + 2] & 19137016) == 0) { + class178.bufferX[var12] = var4 - 1; + class178.bufferY[var12] = var5 + 1; + var12 = var12 + 1 & 4095; + class178.directions[var14 - 1][var15 + 1] = 6; + class178.distances[var14 - 1][var15 + 1] = var18; } - if (var15 < 126 && var16 < 126 && class178.directions[var15 + 1][var16 + 1] == 0 && (var14[var17 + 1][var18 + 2] & 19137016) == 0 && (var14[var17 + 2][var18 + 2] & 19136992) == 0 && (var14[var17 + 2][var18 + 1] & 19136995) == 0) { - class178.bufferX[var13] = var4 + 1; - class178.bufferY[var13] = var5 + 1; - var13 = var13 + 1 & 4095; - class178.directions[var15 + 1][var16 + 1] = 12; - class178.distances[var15 + 1][var16 + 1] = var19; + if (var14 < 126 && var15 < 126 && class178.directions[var14 + 1][var15 + 1] == 0 && (var13[var16 + 1][var17 + 2] & 19137016) == 0 && (var13[var16 + 2][var17 + 2] & 19136992) == 0 && (var13[var16 + 2][var17 + 1] & 19136995) == 0) { + class178.bufferX[var12] = var4 + 1; + class178.bufferY[var12] = var5 + 1; + var12 = var12 + 1 & 4095; + class178.directions[var14 + 1][var15 + 1] = 12; + class178.distances[var14 + 1][var15 + 1] = var18; } } diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java index e6072c6d25..d5bdacfad1 100644 --- a/runescape-client/src/main/java/WorldMapSection3.java +++ b/runescape-client/src/main/java/WorldMapSection3.java @@ -222,41 +222,41 @@ public class WorldMapSection3 implements WorldMapSection { garbageValue = "-35" ) @Export("alignWidgetSize") - static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { - int var4 = var0.width; - int var5 = var0.height; - if (var0.widthAlignment == 0) { - var0.width = var0.rawWidth; - } else if (var0.widthAlignment == 1) { - var0.width = var1 - var0.rawWidth; - } else if (var0.widthAlignment == 2) { - var0.width = var0.rawWidth * var1 >> 14; + static void alignWidgetSize(Widget component, int parentWidth, int parentHeight, boolean var3) { + int var4 = component.width; + int var5 = component.height; + if (component.widthAlignment == 0) { + component.width = component.rawWidth; + } else if (component.widthAlignment == 1) { + component.width = parentWidth - component.rawWidth; + } else if (component.widthAlignment == 2) { + component.width = component.rawWidth * parentWidth >> 14; } - if (var0.heightAlignment == 0) { - var0.height = var0.rawHeight; - } else if (var0.heightAlignment == 1) { - var0.height = var2 - var0.rawHeight; - } else if (var0.heightAlignment == 2) { - var0.height = var2 * var0.rawHeight >> 14; + if (component.heightAlignment == 0) { + component.height = component.rawHeight; + } else if (component.heightAlignment == 1) { + component.height = parentHeight - component.rawHeight; + } else if (component.heightAlignment == 2) { + component.height = parentHeight * component.rawHeight >> 14; } - if (var0.widthAlignment == 4) { - var0.width = var0.height * var0.field958 / var0.field959; + if (component.widthAlignment == 4) { + component.width = component.height * component.field958 / component.field959; } - if (var0.heightAlignment == 4) { - var0.height = var0.width * var0.field959 / var0.field958; + if (component.heightAlignment == 4) { + component.height = component.width * component.field959 / component.field958; } - if (var0.contentType == 1337) { - Client.viewportWidget = var0; + if (component.contentType == 1337) { + Client.viewportWidget = component; } - if (var3 && var0.field975 != null && (var4 != var0.width || var5 != var0.height)) { + if (var3 && component.field975 != null && (var4 != component.width || var5 != component.height)) { ScriptEvent var6 = new ScriptEvent(); - var6.widget = var0; - var6.args0 = var0.field975; + var6.widget = component; + var6.args0 = component.field975; Client.scriptEvents.addFirst(var6); } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 3aa2e06c56..38525130c7 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -271,8 +271,8 @@ final class class1 implements class0 { garbageValue = "1809366429" ) @Export("getWidgetClickMask") - static int getWidgetClickMask(Widget var0) { - IntegerNode var1 = (IntegerNode)Client.widgetClickMasks.get(((long)var0.id << 32) + (long)var0.childIndex); - return var1 != null ? var1.integer : var0.clickMask; + static int getWidgetClickMask(Widget component) { + IntegerNode var1 = (IntegerNode)Client.widgetClickMasks.get(((long)component.id << 32) + (long)component.childIndex); + return var1 != null ? var1.integer : component.clickMask; } } diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java index badbef64d7..71ec0bf799 100644 --- a/runescape-client/src/main/java/class11.java +++ b/runescape-client/src/main/java/class11.java @@ -159,21 +159,21 @@ final class class11 implements Comparator { } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { var3.onScroll = var8; } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { - var3.field970 = var8; + var3.onChatTransmit = var8; } else if (var0 == ScriptOpcodes.CC_SETONKEY) { var3.onKey = var8; } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { - var3.field971 = var8; + var3.onFriendTransmit = var8; } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { - var3.field972 = var8; + var3.onClanTransmit = var8; } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { - var3.field973 = var8; + var3.onMiscTransmit = var8; } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { var3.onDialogAbort = var8; } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { - var3.field974 = var8; + var3.onSubChange = var8; } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { - var3.field976 = var8; + var3.onStockTransmit = var8; } else if (var0 == 1426) { var3.field977 = var8; } else { diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index d6b51aa347..58cc3cb806 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -294,24 +294,24 @@ public class class16 { } } } else { - NodeDeque var38; - GroundItem var41; + GroundItem var38; + NodeDeque var40; if (class190.field2347 == var0) { var31 = var1.method58(); var2 = (var31 >> 4 & 7) + WorldMapSection3.field1089; var32 = (var31 & 7) + Canvas.field95; var3 = var1.method67(); if (var2 >= 0 && var32 >= 0 && var2 < 104 && var32 < 104) { - var38 = Client.groundItems[SoundSystem.plane][var2][var32]; - if (var38 != null) { - for (var41 = (GroundItem)var38.last(); var41 != null; var41 = (GroundItem)var38.previous()) { - if ((var3 & 32767) == var41.id) { - var41.remove(); + var40 = Client.groundItems[SoundSystem.plane][var2][var32]; + if (var40 != null) { + for (var38 = (GroundItem)var40.last(); var38 != null; var38 = (GroundItem)var40.previous()) { + if ((var3 & 32767) == var38.id) { + var38.remove(); break; } } - if (var38.last() == null) { + if (var40.last() == null) { Client.groundItems[SoundSystem.plane][var2][var32] = null; } @@ -342,17 +342,17 @@ public class class16 { var35 = (var8 >> 4 & 7) + WorldMapSection3.field1089; var9 = (var8 & 7) + Canvas.field95; var10 = var1.method60(); - byte var40 = var1.method61(); - var11 = var40 + var35; + byte var41 = var1.method61(); + var11 = var41 + var35; int var42 = var10 + var9; if (var35 >= 0 && var9 >= 0 && var35 < 104 && var9 < 104 && var11 >= 0 && var42 >= 0 && var11 < 104 && var42 < 104 && var32 != 65535) { var35 = var35 * 128 + 64; var9 = var9 * 128 + 64; var11 = var11 * 128 + 64; var42 = var42 * 128 + 64; - Projectile var43 = new Projectile(var32, SoundSystem.plane, var35, var9, class32.getTileHeight(var35, var9, SoundSystem.plane) - var3, var7 + Client.cycle, var2 + Client.cycle, var5, var6, var4, var31); - var43.setDestination(var11, var42, class32.getTileHeight(var11, var42, SoundSystem.plane) - var31, var7 + Client.cycle); - Client.projectiles.addFirst(var43); + Projectile var44 = new Projectile(var32, SoundSystem.plane, var35, var9, class32.getTileHeight(var35, var9, SoundSystem.plane) - var3, var7 + Client.cycle, var2 + Client.cycle, var5, var6, var4, var31); + var44.setDestination(var11, var42, class32.getTileHeight(var11, var42, SoundSystem.plane) - var31, var7 + Client.cycle); + Client.projectiles.addFirst(var44); } } else if (class190.field2346 != var0) { if (class190.field2343 == var0) { @@ -362,14 +362,14 @@ public class class16 { var3 = (var32 >> 4 & 7) + WorldMapSection3.field1089; var4 = (var32 & 7) + Canvas.field95; if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - var41 = new GroundItem(); - var41.id = var2; - var41.quantity = var31; + var38 = new GroundItem(); + var38.id = var2; + var38.quantity = var31; if (Client.groundItems[SoundSystem.plane][var3][var4] == null) { Client.groundItems[SoundSystem.plane][var3][var4] = new NodeDeque(); } - Client.groundItems[SoundSystem.plane][var3][var4].addFirst(var41); + Client.groundItems[SoundSystem.plane][var3][var4].addFirst(var38); TilePaint.updateItemPile(var3, var4); } } @@ -381,11 +381,11 @@ public class class16 { var4 = (var3 >> 4 & 7) + WorldMapSection3.field1089; var5 = (var3 & 7) + Canvas.field95; if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { - var38 = Client.groundItems[SoundSystem.plane][var4][var5]; - if (var38 != null) { - for (GroundItem var44 = (GroundItem)var38.last(); var44 != null; var44 = (GroundItem)var38.previous()) { - if ((var31 & 32767) == var44.id && var32 == var44.quantity) { - var44.quantity = var2; + var40 = Client.groundItems[SoundSystem.plane][var4][var5]; + if (var40 != null) { + for (GroundItem var43 = (GroundItem)var40.last(); var43 != null; var43 = (GroundItem)var40.previous()) { + if ((var31 & 32767) == var43.id && var32 == var43.quantity) { + var43.quantity = var2; break; } } @@ -406,11 +406,11 @@ public class class16 { garbageValue = "0" ) @Export("insertMenuItem") - static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { + static final void insertMenuItem(String action, String targetName, int opcode, int var3, int var4, int var5, boolean var6) { if (!Client.isMenuOpen && Client.menuOptionsCount < 500) { - Client.menuActions[Client.menuOptionsCount] = var0; - Client.menuTargetNames[Client.menuOptionsCount] = var1; - Client.menuOpcodes[Client.menuOptionsCount] = var2; + Client.menuActions[Client.menuOptionsCount] = action; + Client.menuTargetNames[Client.menuOptionsCount] = targetName; + Client.menuOpcodes[Client.menuOptionsCount] = opcode; Client.menuArguments0[Client.menuOptionsCount] = var3; Client.menuArguments1[Client.menuOptionsCount] = var4; Client.menuArguments2[Client.menuOptionsCount] = var5; diff --git a/runescape-client/src/main/java/class204.java b/runescape-client/src/main/java/class204.java index 4014951a80..c122f6cba3 100644 --- a/runescape-client/src/main/java/class204.java +++ b/runescape-client/src/main/java/class204.java @@ -46,8 +46,8 @@ public class class204 { for (int var10 = 0; var10 < 8; ++var10) { for (var9 = 0; var9 < 8; ++var9) { if (var10 + var2 > 0 && var10 + var2 < 103 && var3 + var9 > 0 && var3 + var9 < 103) { - int[] var10000 = var8[var1].flags[var10 + var2]; - var10000[var3 + var9] &= -16777217; + int[] var11 = var8[var1].flags[var10 + var2]; + var11[var3 + var9] &= -16777217; } } } @@ -55,11 +55,11 @@ public class class204 { Buffer var18 = new Buffer(var0); for (var9 = 0; var9 < 4; ++var9) { - for (int var11 = 0; var11 < 64; ++var11) { + for (int var19 = 0; var19 < 64; ++var19) { for (int var12 = 0; var12 < 64; ++var12) { - if (var9 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { - int var13 = var2 + CollisionMap.method3632(var11 & 7, var12 & 7, var7); - int var14 = var11 & 7; + if (var9 == var4 && var19 >= var5 && var19 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { + int var13 = var2 + CollisionMap.method3632(var19 & 7, var12 & 7, var7); + int var14 = var19 & 7; int var15 = var12 & 7; int var16 = var7 & 3; int var17; diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java index 8fcf3e0641..6fa1f51396 100644 --- a/runescape-client/src/main/java/class21.java +++ b/runescape-client/src/main/java/class21.java @@ -112,11 +112,11 @@ public abstract class class21 { garbageValue = "-2111523326" ) void method282() { - this.field151 = (short[][][])null; - this.field145 = (short[][][])null; - this.field154 = (byte[][][])null; - this.field155 = (byte[][][])null; - this.field144 = (WorldMapDecoration[][][][])null; + this.field151 = (short[][][])((short[][][])null); + this.field145 = (short[][][])((short[][][])null); + this.field154 = ((byte[][][])null); + this.field155 = ((byte[][][])null); + this.field144 = (WorldMapDecoration[][][][])((WorldMapDecoration[][][][])null); this.field157 = false; this.field153 = false; } diff --git a/runescape-client/src/main/java/class226.java b/runescape-client/src/main/java/class226.java index 099dbf1a87..717fe2281a 100644 --- a/runescape-client/src/main/java/class226.java +++ b/runescape-client/src/main/java/class226.java @@ -19,14 +19,14 @@ public class class226 { garbageValue = "-76173898" ) @Export("getItemSprite") - public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { - if (var1 == -1) { + public static final Sprite getItemSprite(int var0, int quantity, int var2, int var3, int var4, boolean var5) { + if (quantity == -1) { var4 = 0; - } else if (var4 == 2 && var1 != 1) { + } else if (var4 == 2 && quantity != 1) { var4 = 1; } - long var6 = ((long)var1 << 16) + (long)var0 + ((long)var2 << 38) + ((long)var4 << 40) + ((long)var3 << 42); + long var6 = ((long)quantity << 16) + (long)var0 + ((long)var2 << 38) + ((long)var4 << 40) + ((long)var3 << 42); Sprite var8; if (!var5) { var8 = (Sprite)ItemDefinition.Sprite_cached.get(var6); @@ -36,12 +36,12 @@ public class class226 { } ItemDefinition var9 = Skills.getItemDefinition(var0); - if (var1 > 1 && var9.field436 != null) { + if (quantity > 1 && var9.countobj != null) { int var10 = -1; for (int var11 = 0; var11 < 10; ++var11) { - if (var1 >= var9.field437[var11] && var9.field437[var11] != 0) { - var10 = var9.field436[var11]; + if (quantity >= var9.countco[var11] && var9.countco[var11] != 0) { + var10 = var9.countobj[var11]; } } @@ -61,12 +61,12 @@ public class class226 { return null; } } else if (var9.notedId != -1) { - var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); + var20 = getItemSprite(var9.unnotedId, quantity, var2, var3, 0, false); if (var20 == null) { return null; } } else if (var9.placeholderTemplate != -1) { - var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); + var20 = getItemSprite(var9.placeholder, quantity, 0, 0, 0, false); if (var20 == null) { return null; } @@ -120,7 +120,7 @@ public class class226 { } if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { - class204.field1122.draw(class196.method3735(var1), 0, 9, 16776960, 1); + class204.field1122.draw(class196.method3735(quantity), 0, 9, 16776960, 1); } if (!var5) { diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java index f0251349b1..b1772ff91e 100644 --- a/runescape-client/src/main/java/class227.java +++ b/runescape-client/src/main/java/class227.java @@ -90,16 +90,16 @@ public class class227 { } } - Object var31; + Object var32; if (var5 == 22) { if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { if (var8.animationId == -1 && var8.transforms == null) { - var31 = var8.method232(22, var4, var15, var17, var16, var18); + var32 = var8.method232(22, var4, var15, var17, var16, var18); } else { - var31 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + var32 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null); } - var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var31, var19, var21); + var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var32, var19, var21); if (var8.interactType == 1 && var7 != null) { var7.method93(var1, var2); } @@ -107,18 +107,18 @@ public class class227 { } else { int var25; if (var5 != 10 && var5 != 11) { - int[] var10000; + int[] var26; if (var5 >= 12) { if (var8.animationId == -1 && var8.transforms == null) { - var31 = var8.method232(var5, var4, var15, var17, var16, var18); + var32 = var8.method232(var5, var4, var15, var17, var16, var18); } else { - var31 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + var32 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); } - var6.method284(var0, var1, var2, var16, 1, 1, (Entity)var31, 0, var19, var21); + var6.method284(var0, var1, var2, var16, 1, 1, (Entity)var32, 0, var19, var21); if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { - var10000 = Tiles.field910[var0][var1]; - var10000[var2] |= 2340; + var26 = Tiles.field910[var0][var1]; + var26[var2] |= 2340; } if (var8.interactType != 0 && var7 != null) { @@ -126,12 +126,12 @@ public class class227 { } } else if (var5 == 0) { if (var8.animationId == -1 && var8.transforms == null) { - var31 = var8.method232(0, var4, var15, var17, var16, var18); + var32 = var8.method232(0, var4, var15, var17, var16, var18); } else { - var31 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + var32 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null); } - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var31, (Entity)null, Tiles.field911[var4], 0, var19, var21); + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var32, (Entity)null, Tiles.field911[var4], 0, var19, var21); if (var4 == 0) { if (var8.clipped) { Tiles.field909[var0][var1][var2] = 50; @@ -139,8 +139,8 @@ public class class227 { } if (var8.modelClipped) { - var10000 = Tiles.field910[var0][var1]; - var10000[var2] |= 585; + var26 = Tiles.field910[var0][var1]; + var26[var2] |= 585; } } else if (var4 == 1) { if (var8.clipped) { @@ -149,8 +149,8 @@ public class class227 { } if (var8.modelClipped) { - var10000 = Tiles.field910[var0][var1]; - var10000[1 + var2] |= 1170; + var26 = Tiles.field910[var0][var1]; + var26[1 + var2] |= 1170; } } else if (var4 == 2) { if (var8.clipped) { @@ -159,8 +159,8 @@ public class class227 { } if (var8.modelClipped) { - var10000 = Tiles.field910[var0][var1 + 1]; - var10000[var2] |= 585; + var26 = Tiles.field910[var0][var1 + 1]; + var26[var2] |= 585; } } else if (var4 == 3) { if (var8.clipped) { @@ -169,8 +169,8 @@ public class class227 { } if (var8.modelClipped) { - var10000 = Tiles.field910[var0][var1]; - var10000[var2] |= 1170; + var26 = Tiles.field910[var0][var1]; + var26[var2] |= 1170; } } @@ -183,12 +183,12 @@ public class class227 { } } else if (var5 == 1) { if (var8.animationId == -1 && var8.transforms == null) { - var31 = var8.method232(1, var4, var15, var17, var16, var18); + var32 = var8.method232(1, var4, var15, var17, var16, var18); } else { - var31 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + var32 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null); } - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var31, (Entity)null, Tiles.field912[var4], 0, var19, var21); + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var32, (Entity)null, Tiles.field912[var4], 0, var19, var21); if (var8.clipped) { if (var4 == 0) { Tiles.field909[var0][var1][var2 + 1] = 50; @@ -204,167 +204,168 @@ public class class227 { if (var8.interactType != 0 && var7 != null) { var7.method90(var1, var2, var5, var4, var8.boolean1); } - } else if (var5 == 2) { - var25 = var4 + 1 & 3; - Object var26; - Object var27; - if (var8.animationId == -1 && var8.transforms == null) { - var26 = var8.method232(2, var4 + 4, var15, var17, var16, var18); - var27 = var8.method232(2, var25, var15, var17, var16, var18); - } else { - var26 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - var27 = new DynamicObject(var3, 2, var25, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var26, (Entity)var27, Tiles.field911[var4], Tiles.field911[var25], var19, var21); - if (var8.modelClipped) { - if (var4 == 0) { - var10000 = Tiles.field910[var0][var1]; - var10000[var2] |= 585; - var10000 = Tiles.field910[var0][var1]; - var10000[1 + var2] |= 1170; - } else if (var4 == 1) { - var10000 = Tiles.field910[var0][var1]; - var10000[1 + var2] |= 1170; - var10000 = Tiles.field910[var0][var1 + 1]; - var10000[var2] |= 585; - } else if (var4 == 2) { - var10000 = Tiles.field910[var0][var1 + 1]; - var10000[var2] |= 585; - var10000 = Tiles.field910[var0][var1]; - var10000[var2] |= 1170; - } else if (var4 == 3) { - var10000 = Tiles.field910[var0][var1]; - var10000[var2] |= 1170; - var10000 = Tiles.field910[var0][var1]; - var10000[var2] |= 585; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method90(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method287(var0, var1, var2, var8.int2); - } - } else if (var5 == 3) { - if (var8.animationId == -1 && var8.transforms == null) { - var31 = var8.method232(3, var4, var15, var17, var16, var18); - } else { - var31 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var31, (Entity)null, Tiles.field912[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - Tiles.field909[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - Tiles.field909[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - Tiles.field909[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - Tiles.field909[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method90(var1, var2, var5, var4, var8.boolean1); - } - } else if (var5 == 9) { - if (var8.animationId == -1 && var8.transforms == null) { - var31 = var8.method232(var5, var4, var15, var17, var16, var18); - } else { - var31 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.method284(var0, var1, var2, var16, 1, 1, (Entity)var31, 0, var19, var21); - if (var8.interactType != 0 && var7 != null) { - var7.method91(var1, var2, var9, var10, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method287(var0, var1, var2, var8.int2); - } - } else if (var5 == 4) { - if (var8.animationId == -1 && var8.transforms == null) { - var31 = var8.method232(4, var4, var15, var17, var16, var18); - } else { - var31 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var31, (Entity)null, Tiles.field911[var4], 0, 0, 0, var19, var21); } else { - Object var28; - long var32; - if (var5 == 5) { - var25 = 16; - var32 = var6.method290(var0, var1, var2); - if (var32 != 0L) { - var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var32)).int2; - } - + Object var27; + if (var5 == 2) { + var25 = var4 + 1 & 3; + Object var28; if (var8.animationId == -1 && var8.transforms == null) { - var28 = var8.method232(4, var4, var15, var17, var16, var18); + var27 = var8.method232(2, var4 + 4, var15, var17, var16, var18); + var28 = var8.method232(2, var25, var15, var17, var16, var18); } else { - var28 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + var27 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + var28 = new DynamicObject(var3, 2, var25, var0, var1, var2, var8.animationId, true, (Entity)null); } - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var28, (Entity)null, Tiles.field911[var4], 0, var25 * Tiles.field913[var4], var25 * Tiles.field914[var4], var19, var21); - } else if (var5 == 6) { - var25 = 8; - var32 = var6.method290(var0, var1, var2); - if (var32 != 0L) { - var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var32)).int2 / 2; + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var27, (Entity)var28, Tiles.field911[var4], Tiles.field911[var25], var19, var21); + if (var8.modelClipped) { + if (var4 == 0) { + var26 = Tiles.field910[var0][var1]; + var26[var2] |= 585; + var26 = Tiles.field910[var0][var1]; + var26[1 + var2] |= 1170; + } else if (var4 == 1) { + var26 = Tiles.field910[var0][var1]; + var26[1 + var2] |= 1170; + var26 = Tiles.field910[var0][var1 + 1]; + var26[var2] |= 585; + } else if (var4 == 2) { + var26 = Tiles.field910[var0][var1 + 1]; + var26[var2] |= 585; + var26 = Tiles.field910[var0][var1]; + var26[var2] |= 1170; + } else if (var4 == 3) { + var26 = Tiles.field910[var0][var1]; + var26[var2] |= 1170; + var26 = Tiles.field910[var0][var1]; + var26[var2] |= 585; + } } + if (var8.interactType != 0 && var7 != null) { + var7.method90(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method287(var0, var1, var2, var8.int2); + } + } else if (var5 == 3) { if (var8.animationId == -1 && var8.transforms == null) { - var28 = var8.method232(4, var4 + 4, var15, var17, var16, var18); + var32 = var8.method232(3, var4, var15, var17, var16, var18); } else { - var28 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + var32 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null); } - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var28, (Entity)null, 256, var4, var25 * Tiles.field915[var4], var25 * Tiles.field916[var4], var19, var21); - } else if (var5 == 7) { - var22 = var4 + 2 & 3; + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var32, (Entity)null, Tiles.field912[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + Tiles.field909[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + Tiles.field909[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + Tiles.field909[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + Tiles.field909[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method90(var1, var2, var5, var4, var8.boolean1); + } + } else if (var5 == 9) { if (var8.animationId == -1 && var8.transforms == null) { - var31 = var8.method232(4, var22 + 4, var15, var17, var16, var18); + var32 = var8.method232(var5, var4, var15, var17, var16, var18); } else { - var31 = new DynamicObject(var3, 4, var22 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + var32 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); } - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var31, (Entity)null, 256, var22, 0, 0, var19, var21); - } else if (var5 == 8) { - var25 = 8; - var32 = var6.method290(var0, var1, var2); - if (var32 != 0L) { - var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var32)).int2 / 2; + var6.method284(var0, var1, var2, var16, 1, 1, (Entity)var32, 0, var19, var21); + if (var8.interactType != 0 && var7 != null) { + var7.method91(var1, var2, var9, var10, var8.boolean1); } - int var29 = var4 + 2 & 3; - Object var30; + if (var8.int2 != 16) { + var6.method287(var0, var1, var2, var8.int2); + } + } else if (var5 == 4) { if (var8.animationId == -1 && var8.transforms == null) { - var28 = var8.method232(4, var4 + 4, var15, var17, var16, var18); - var30 = var8.method232(4, var29 + 4, var15, var17, var16, var18); + var32 = var8.method232(4, var4, var15, var17, var16, var18); } else { - var28 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - var30 = new DynamicObject(var3, 4, var29 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + var32 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); } - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var28, (Entity)var30, 256, var4, var25 * Tiles.field915[var4], var25 * Tiles.field916[var4], var19, var21); + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var32, (Entity)null, Tiles.field911[var4], 0, 0, 0, var19, var21); + } else { + long var33; + if (var5 == 5) { + var25 = 16; + var33 = var6.method290(var0, var1, var2); + if (var33 != 0L) { + var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var33)).int2; + } + + if (var8.animationId == -1 && var8.transforms == null) { + var27 = var8.method232(4, var4, var15, var17, var16, var18); + } else { + var27 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var27, (Entity)null, Tiles.field911[var4], 0, var25 * Tiles.field913[var4], var25 * Tiles.field914[var4], var19, var21); + } else if (var5 == 6) { + var25 = 8; + var33 = var6.method290(var0, var1, var2); + if (var33 != 0L) { + var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var33)).int2 / 2; + } + + if (var8.animationId == -1 && var8.transforms == null) { + var27 = var8.method232(4, var4 + 4, var15, var17, var16, var18); + } else { + var27 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var27, (Entity)null, 256, var4, var25 * Tiles.field915[var4], var25 * Tiles.field916[var4], var19, var21); + } else if (var5 == 7) { + var22 = var4 + 2 & 3; + if (var8.animationId == -1 && var8.transforms == null) { + var32 = var8.method232(4, var22 + 4, var15, var17, var16, var18); + } else { + var32 = new DynamicObject(var3, 4, var22 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var32, (Entity)null, 256, var22, 0, 0, var19, var21); + } else if (var5 == 8) { + var25 = 8; + var33 = var6.method290(var0, var1, var2); + if (var33 != 0L) { + var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var33)).int2 / 2; + } + + int var30 = var4 + 2 & 3; + Object var31; + if (var8.animationId == -1 && var8.transforms == null) { + var27 = var8.method232(4, var4 + 4, var15, var17, var16, var18); + var31 = var8.method232(4, var30 + 4, var15, var17, var16, var18); + } else { + var27 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + var31 = new DynamicObject(var3, 4, var30 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var27, (Entity)var31, 256, var4, var25 * Tiles.field915[var4], var25 * Tiles.field916[var4], var19, var21); + } } } } else { if (var8.animationId == -1 && var8.transforms == null) { - var31 = var8.method232(10, var4, var15, var17, var16, var18); + var32 = var8.method232(10, var4, var15, var17, var16, var18); } else { - var31 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + var32 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null); } - if (var31 != null && var6.method284(var0, var1, var2, var16, var9, var10, (Entity)var31, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { + if (var32 != null && var6.method284(var0, var1, var2, var16, var9, var10, (Entity)var32, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { var22 = 15; - if (var31 instanceof Model) { - var22 = ((Model)var31).method198() / 4; + if (var32 instanceof Model) { + var22 = ((Model)var32).method198() / 4; if (var22 > 30) { var22 = 30; } diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java index 615739165b..05806fa845 100644 --- a/runescape-client/src/main/java/class229.java +++ b/runescape-client/src/main/java/class229.java @@ -15,7 +15,7 @@ public class class229 { ) @Export("getParamDefinition") public static ParamDefinition getParamDefinition(int var0) { - ParamDefinition var1 = (ParamDefinition) ParamDefinition.ParamDefinition_cached.get((long)var0); + ParamDefinition var1 = (ParamDefinition)ParamDefinition.ParamDefinition_cached.get((long)var0); if (var1 != null) { return var1; } else { diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java index bbc75db01f..93abb6d2d3 100644 --- a/runescape-client/src/main/java/class238.java +++ b/runescape-client/src/main/java/class238.java @@ -17,22 +17,22 @@ public final class class238 { garbageValue = "188151075" ) @Export("runCs1") - static final boolean runCs1(Widget var0) { - if (var0.cs1Comparisons == null) { + static final boolean runCs1(Widget component) { + if (component.cs1Comparisons == null) { return false; } else { - for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { - int var2 = class16.method187(var0, var1); - int var3 = var0.cs1ComparisonValues[var1]; - if (var0.cs1Comparisons[var1] == 2) { + for (int var1 = 0; var1 < component.cs1Comparisons.length; ++var1) { + int var2 = class16.method187(component, var1); + int var3 = component.cs1ComparisonValues[var1]; + if (component.cs1Comparisons[var1] == 2) { if (var2 >= var3) { return false; } - } else if (var0.cs1Comparisons[var1] == 3) { + } else if (component.cs1Comparisons[var1] == 3) { if (var2 <= var3) { return false; } - } else if (var0.cs1Comparisons[var1] == 4) { + } else if (component.cs1Comparisons[var1] == 4) { if (var2 == var3) { return false; } @@ -51,10 +51,10 @@ public final class class238 { garbageValue = "1706481742" ) @Export("updateInterface") - static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - for (int var8 = 0; var8 < var0.length; ++var8) { - Widget var9 = var0[var8]; - if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class1.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { + static final void updateInterface(Widget[] components, int parentId, int var2, int var3, int var4, int var5, int x, int y) { + for (int var8 = 0; var8 < components.length; ++var8) { + Widget var9 = components[var8]; + if (var9 != null && var9.parentId == parentId && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class1.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { if (var9.isIf3) { if (PacketBufferNode.method3673(var9)) { continue; @@ -63,8 +63,8 @@ public final class class238 { continue; } - int var10 = var9.x + var6; - int var11 = var7 + var9.y; + int var10 = var9.x + x; + int var11 = y + var9.y; int var12; int var13; int var14; @@ -194,10 +194,11 @@ public final class class238 { boolean var20; int var21; + boolean var23; if (var28) { for (int var22 = 0; var22 < var9.field966.length; ++var22) { var20 = false; - boolean var23 = false; + var23 = false; if (!var20 && var9.field966[var22] != null) { for (var21 = 0; var21 < var9.field966[var22].length; ++var21) { boolean var24 = false; @@ -260,7 +261,7 @@ public final class class238 { } } - ScriptEvent var32; + ScriptEvent var31; if (var9.isIf3) { if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { var30 = true; @@ -268,9 +269,9 @@ public final class class238 { var30 = false; } - boolean var31 = false; + var23 = false; if ((MouseHandler.MouseHandler_currentButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var30) { - var31 = true; + var23 = true; } var20 = false; @@ -283,7 +284,7 @@ public final class class238 { } if (var9.contentType == 1400) { - class60.worldMap0.method361(var16, var17, var30 & var31, var30 & var20); + class60.worldMap0.method361(var16, var17, var30 & var23, var30 & var20); } if (Client.clickedWidget != null && var9 != Client.clickedWidget && var30 && class54.method1090(class1.getWidgetClickMask(var9))) { @@ -298,133 +299,133 @@ public final class class238 { if (var9.hasListener) { if (var30 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { - var32 = new ScriptEvent(); - var32.boolean1 = true; - var32.widget = var9; - var32.mouseY = Client.mouseWheelRotation; - var32.args0 = var9.onScroll; - Client.scriptEvents.addFirst(var32); + var31 = new ScriptEvent(); + var31.boolean1 = true; + var31.widget = var9; + var31.mouseY = Client.mouseWheelRotation; + var31.args0 = var9.onScroll; + Client.scriptEvents.addFirst(var31); } if (Client.clickedWidget != null || DevicePcmPlayerProvider.dragInventoryWidget != null || Client.isMenuOpen) { var20 = false; - var31 = false; + var23 = false; var30 = false; } if (!var9.field979 && var20) { var9.field979 = true; if (var9.onClick != null) { - var32 = new ScriptEvent(); - var32.boolean1 = true; - var32.widget = var9; - var32.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; - var32.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; - var32.args0 = var9.onClick; - Client.scriptEvents.addFirst(var32); + var31 = new ScriptEvent(); + var31.boolean1 = true; + var31.widget = var9; + var31.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; + var31.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; + var31.args0 = var9.onClick; + Client.scriptEvents.addFirst(var31); } } - if (var9.field979 && var31 && var9.onClickRepeat != null) { - var32 = new ScriptEvent(); - var32.boolean1 = true; - var32.widget = var9; - var32.mouseX = MouseHandler.MouseHandler_x - var10; - var32.mouseY = MouseHandler.MouseHandler_y - var11; - var32.args0 = var9.onClickRepeat; - Client.scriptEvents.addFirst(var32); + if (var9.field979 && var23 && var9.onClickRepeat != null) { + var31 = new ScriptEvent(); + var31.boolean1 = true; + var31.widget = var9; + var31.mouseX = MouseHandler.MouseHandler_x - var10; + var31.mouseY = MouseHandler.MouseHandler_y - var11; + var31.args0 = var9.onClickRepeat; + Client.scriptEvents.addFirst(var31); } - if (var9.field979 && !var31) { + if (var9.field979 && !var23) { var9.field979 = false; if (var9.onRelease != null) { - var32 = new ScriptEvent(); - var32.boolean1 = true; - var32.widget = var9; - var32.mouseX = MouseHandler.MouseHandler_x - var10; - var32.mouseY = MouseHandler.MouseHandler_y - var11; - var32.args0 = var9.onRelease; - Client.field148.addFirst(var32); + var31 = new ScriptEvent(); + var31.boolean1 = true; + var31.widget = var9; + var31.mouseX = MouseHandler.MouseHandler_x - var10; + var31.mouseY = MouseHandler.MouseHandler_y - var11; + var31.args0 = var9.onRelease; + Client.field148.addFirst(var31); } } - if (var31 && var9.onHold != null) { - var32 = new ScriptEvent(); - var32.boolean1 = true; - var32.widget = var9; - var32.mouseX = MouseHandler.MouseHandler_x - var10; - var32.mouseY = MouseHandler.MouseHandler_y - var11; - var32.args0 = var9.onHold; - Client.scriptEvents.addFirst(var32); + if (var23 && var9.onHold != null) { + var31 = new ScriptEvent(); + var31.boolean1 = true; + var31.widget = var9; + var31.mouseX = MouseHandler.MouseHandler_x - var10; + var31.mouseY = MouseHandler.MouseHandler_y - var11; + var31.args0 = var9.onHold; + Client.scriptEvents.addFirst(var31); } if (!var9.field978 && var30) { var9.field978 = true; if (var9.onMouseOver != null) { - var32 = new ScriptEvent(); - var32.boolean1 = true; - var32.widget = var9; - var32.mouseX = MouseHandler.MouseHandler_x - var10; - var32.mouseY = MouseHandler.MouseHandler_y - var11; - var32.args0 = var9.onMouseOver; - Client.scriptEvents.addFirst(var32); + var31 = new ScriptEvent(); + var31.boolean1 = true; + var31.widget = var9; + var31.mouseX = MouseHandler.MouseHandler_x - var10; + var31.mouseY = MouseHandler.MouseHandler_y - var11; + var31.args0 = var9.onMouseOver; + Client.scriptEvents.addFirst(var31); } } if (var9.field978 && var30 && var9.onMouseRepeat != null) { - var32 = new ScriptEvent(); - var32.boolean1 = true; - var32.widget = var9; - var32.mouseX = MouseHandler.MouseHandler_x - var10; - var32.mouseY = MouseHandler.MouseHandler_y - var11; - var32.args0 = var9.onMouseRepeat; - Client.scriptEvents.addFirst(var32); + var31 = new ScriptEvent(); + var31.boolean1 = true; + var31.widget = var9; + var31.mouseX = MouseHandler.MouseHandler_x - var10; + var31.mouseY = MouseHandler.MouseHandler_y - var11; + var31.args0 = var9.onMouseRepeat; + Client.scriptEvents.addFirst(var31); } if (var9.field978 && !var30) { var9.field978 = false; if (var9.onMouseLeave != null) { - var32 = new ScriptEvent(); - var32.boolean1 = true; - var32.widget = var9; - var32.mouseX = MouseHandler.MouseHandler_x - var10; - var32.mouseY = MouseHandler.MouseHandler_y - var11; - var32.args0 = var9.onMouseLeave; - Client.field148.addFirst(var32); + var31 = new ScriptEvent(); + var31.boolean1 = true; + var31.widget = var9; + var31.mouseX = MouseHandler.MouseHandler_x - var10; + var31.mouseY = MouseHandler.MouseHandler_y - var11; + var31.args0 = var9.onMouseLeave; + Client.field148.addFirst(var31); } } if (var9.onTimer != null) { - var32 = new ScriptEvent(); - var32.widget = var9; - var32.args0 = var9.onTimer; - Client.field147.addFirst(var32); + var31 = new ScriptEvent(); + var31.widget = var9; + var31.args0 = var9.onTimer; + Client.field147.addFirst(var31); } int var26; - ScriptEvent var34; - int var35; + int var32; + ScriptEvent var33; if (var9.onVarTransmit != null && Client.field123 > var9.field981) { if (var9.varTransmitTriggers != null && Client.field123 - var9.field981 <= 32) { label590: - for (var35 = var9.field981; var35 < Client.field123; ++var35) { - var21 = Client.field121[var35 & 31]; + for (var26 = var9.field981; var26 < Client.field123; ++var26) { + var21 = Client.field121[var26 & 31]; - for (var26 = 0; var26 < var9.varTransmitTriggers.length; ++var26) { - if (var21 == var9.varTransmitTriggers[var26]) { - var34 = new ScriptEvent(); - var34.widget = var9; - var34.args0 = var9.onVarTransmit; - Client.scriptEvents.addFirst(var34); + for (var32 = 0; var32 < var9.varTransmitTriggers.length; ++var32) { + if (var21 == var9.varTransmitTriggers[var32]) { + var33 = new ScriptEvent(); + var33.widget = var9; + var33.args0 = var9.onVarTransmit; + Client.scriptEvents.addFirst(var33); break label590; } } } } else { - var32 = new ScriptEvent(); - var32.widget = var9; - var32.args0 = var9.onVarTransmit; - Client.scriptEvents.addFirst(var32); + var31 = new ScriptEvent(); + var31.widget = var9; + var31.args0 = var9.onVarTransmit; + Client.scriptEvents.addFirst(var31); } var9.field981 = Client.field123; @@ -433,24 +434,24 @@ public final class class238 { if (var9.onInvTransmit != null && Client.field117 > var9.field982) { if (var9.invTransmitTriggers != null && Client.field117 - var9.field982 <= 32) { label566: - for (var35 = var9.field982; var35 < Client.field117; ++var35) { - var21 = Client.field116[var35 & 31]; + for (var26 = var9.field982; var26 < Client.field117; ++var26) { + var21 = Client.field116[var26 & 31]; - for (var26 = 0; var26 < var9.invTransmitTriggers.length; ++var26) { - if (var21 == var9.invTransmitTriggers[var26]) { - var34 = new ScriptEvent(); - var34.widget = var9; - var34.args0 = var9.onInvTransmit; - Client.scriptEvents.addFirst(var34); + for (var32 = 0; var32 < var9.invTransmitTriggers.length; ++var32) { + if (var21 == var9.invTransmitTriggers[var32]) { + var33 = new ScriptEvent(); + var33.widget = var9; + var33.args0 = var9.onInvTransmit; + Client.scriptEvents.addFirst(var33); break label566; } } } } else { - var32 = new ScriptEvent(); - var32.widget = var9; - var32.args0 = var9.onInvTransmit; - Client.scriptEvents.addFirst(var32); + var31 = new ScriptEvent(); + var31.widget = var9; + var31.args0 = var9.onInvTransmit; + Client.scriptEvents.addFirst(var31); } var9.field982 = Client.field117; @@ -459,78 +460,78 @@ public final class class238 { if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field983) { if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field983 <= 32) { label542: - for (var35 = var9.field983; var35 < Client.changedSkillsCount; ++var35) { - var21 = Client.changedSkills[var35 & 31]; + for (var26 = var9.field983; var26 < Client.changedSkillsCount; ++var26) { + var21 = Client.changedSkills[var26 & 31]; - for (var26 = 0; var26 < var9.statTransmitTriggers.length; ++var26) { - if (var21 == var9.statTransmitTriggers[var26]) { - var34 = new ScriptEvent(); - var34.widget = var9; - var34.args0 = var9.onStatTransmit; - Client.scriptEvents.addFirst(var34); + for (var32 = 0; var32 < var9.statTransmitTriggers.length; ++var32) { + if (var21 == var9.statTransmitTriggers[var32]) { + var33 = new ScriptEvent(); + var33.widget = var9; + var33.args0 = var9.onStatTransmit; + Client.scriptEvents.addFirst(var33); break label542; } } } } else { - var32 = new ScriptEvent(); - var32.widget = var9; - var32.args0 = var9.onStatTransmit; - Client.scriptEvents.addFirst(var32); + var31 = new ScriptEvent(); + var31.widget = var9; + var31.args0 = var9.onStatTransmit; + Client.scriptEvents.addFirst(var31); } var9.field983 = Client.changedSkillsCount; } - if (Client.chatCycle > var9.field980 && var9.field970 != null) { - var32 = new ScriptEvent(); - var32.widget = var9; - var32.args0 = var9.field970; - Client.scriptEvents.addFirst(var32); + if (Client.chatCycle > var9.field980 && var9.onChatTransmit != null) { + var31 = new ScriptEvent(); + var31.widget = var9; + var31.args0 = var9.onChatTransmit; + Client.scriptEvents.addFirst(var31); } - if (Client.field105 > var9.field980 && var9.field971 != null) { - var32 = new ScriptEvent(); - var32.widget = var9; - var32.args0 = var9.field971; - Client.scriptEvents.addFirst(var32); + if (Client.field105 > var9.field980 && var9.onFriendTransmit != null) { + var31 = new ScriptEvent(); + var31.widget = var9; + var31.args0 = var9.onFriendTransmit; + Client.scriptEvents.addFirst(var31); } - if (Client.field129 > var9.field980 && var9.field972 != null) { - var32 = new ScriptEvent(); - var32.widget = var9; - var32.args0 = var9.field972; - Client.scriptEvents.addFirst(var32); + if (Client.field129 > var9.field980 && var9.onClanTransmit != null) { + var31 = new ScriptEvent(); + var31.widget = var9; + var31.args0 = var9.onClanTransmit; + Client.scriptEvents.addFirst(var31); } - if (Client.field122 > var9.field980 && var9.field976 != null) { - var32 = new ScriptEvent(); - var32.widget = var9; - var32.args0 = var9.field976; - Client.scriptEvents.addFirst(var32); + if (Client.field122 > var9.field980 && var9.onStockTransmit != null) { + var31 = new ScriptEvent(); + var31.widget = var9; + var31.args0 = var9.onStockTransmit; + Client.scriptEvents.addFirst(var31); } if (Client.field154 > var9.field980 && var9.field977 != null) { - var32 = new ScriptEvent(); - var32.widget = var9; - var32.args0 = var9.field977; - Client.scriptEvents.addFirst(var32); + var31 = new ScriptEvent(); + var31.widget = var9; + var31.args0 = var9.field977; + Client.scriptEvents.addFirst(var31); } - if (Client.field124 > var9.field980 && var9.field973 != null) { - var32 = new ScriptEvent(); - var32.widget = var9; - var32.args0 = var9.field973; - Client.scriptEvents.addFirst(var32); + if (Client.field124 > var9.field980 && var9.onMiscTransmit != null) { + var31 = new ScriptEvent(); + var31.widget = var9; + var31.args0 = var9.onMiscTransmit; + Client.scriptEvents.addFirst(var31); } var9.field980 = Client.cycleCntr; if (var9.onKey != null) { - for (var35 = 0; var35 < Client.field137; ++var35) { + for (var26 = 0; var26 < Client.field137; ++var26) { ScriptEvent var27 = new ScriptEvent(); var27.widget = var9; - var27.keyTyped = Client.field145[var35]; - var27.keyPressed = Client.field146[var35]; + var27.keyTyped = Client.field145[var26]; + var27.keyPressed = Client.field146[var26]; var27.args0 = var9.onKey; Client.scriptEvents.addFirst(var27); } @@ -545,7 +546,7 @@ public final class class238 { if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { if (var9.mouseOverRedirect >= 0) { - Clock.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + Clock.mousedOverWidgetIf1 = components[var9.mouseOverRedirect]; } else { Clock.mousedOverWidgetIf1 = var9; } @@ -561,18 +562,18 @@ public final class class238 { } if (var9.type == 0) { - updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); + updateInterface(components, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); if (var9.children != null) { updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); } - InterfaceParent var33 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); - if (var33 != null) { - if (var33.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { - for (var32 = (ScriptEvent)Client.scriptEvents.last(); var32 != null; var32 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var32.boolean1) { - var32.remove(); - var32.widget.field978 = false; + InterfaceParent var34 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); + if (var34 != null) { + if (var34.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { + for (var31 = (ScriptEvent)Client.scriptEvents.last(); var31 != null; var31 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var31.boolean1) { + var31.remove(); + var31.widget.field978 = false; } } @@ -586,7 +587,7 @@ public final class class238 { } } - WorldMapDecorationType.method4517(var33.group, var12, var13, var14, var15, var10, var11); + WorldMapDecorationType.method4517(var34.group, var12, var13, var14, var15, var10, var11); } } } diff --git a/runescape-client/src/main/java/class258.java b/runescape-client/src/main/java/class258.java index 9d5e68b68a..cf4d55d817 100644 --- a/runescape-client/src/main/java/class258.java +++ b/runescape-client/src/main/java/class258.java @@ -29,7 +29,7 @@ public class class258 { VarbitDefinition.indexedSpriteWidths = null; SecureRandomCallable.indexedSpriteHeights = null; class328.indexedSpritePalette = null; - class328.spritePixels = (byte[][])null; + class328.spritePixels = ((byte[][])null); return var0; } diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index a144cb7a8c..70a71e1b02 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -100,7 +100,7 @@ public class class3 implements Enumerated { NodeDeque var0 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue; ArchiveDiskAction var1; synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - var1 = (ArchiveDiskAction) ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); } if (var1 == null) { diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java index 77d9e00f00..aceac67d05 100644 --- a/runescape-client/src/main/java/class30.java +++ b/runescape-client/src/main/java/class30.java @@ -98,7 +98,7 @@ public class class30 { AbstractArchive.runScript(var6); } - if (var1 == 1 && var3.field974 != null) { + if (var1 == 1 && var3.onSubChange != null) { if (var3.childIndex >= 0) { Widget var5 = Huffman.getWidget(var3.id); if (var5 == null || var5.children == null || var3.childIndex >= var5.children.length || var3 != var5.children[var3.childIndex]) { @@ -108,7 +108,7 @@ public class class30 { var6 = new ScriptEvent(); var6.widget = var3; - var6.args0 = var3.field974; + var6.args0 = var3.onSubChange; AbstractArchive.runScript(var6); } } diff --git a/runescape-client/src/main/java/class322.java b/runescape-client/src/main/java/class322.java index 6e9164fb42..279019cb09 100644 --- a/runescape-client/src/main/java/class322.java +++ b/runescape-client/src/main/java/class322.java @@ -17,8 +17,8 @@ public class class322 { garbageValue = "-2000477161" ) @Export("readSprite") - public static Sprite readSprite(AbstractArchive var0, int var1, int var2) { - return !SpriteMask.loadSprite(var0, var1, var2) ? null : class258.method4900(); + public static Sprite readSprite(AbstractArchive archive, int group, int file) { + return !SpriteMask.loadSprite(archive, group, file) ? null : class258.method4900(); } static { diff --git a/runescape-client/src/main/java/class39.java b/runescape-client/src/main/java/class39.java index f3a61b0a8d..36ca69390f 100644 --- a/runescape-client/src/main/java/class39.java +++ b/runescape-client/src/main/java/class39.java @@ -145,10 +145,10 @@ public class class39 extends class21 { garbageValue = "-1" ) @Export("drawActor2d") - static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { - if (var0 != null && var0.isVisible()) { - if (var0 instanceof NPC) { - NPCDefinition var6 = ((NPC)var0).definition; + static final void drawActor2d(Actor actor, int var1, int var2, int var3, int var4, int var5) { + if (actor != null && actor.isVisible()) { + if (actor instanceof NPC) { + NPCDefinition var6 = ((NPC)actor).definition; if (var6.transforms != null) { var6 = var6.transform(); } @@ -162,8 +162,8 @@ public class class39 extends class21 { int[] var7 = Players.Players_indices; byte var8 = 0; Player var9; - if (var1 < var77 && var0.playerCycle == Client.cycle) { - var9 = (Player)var0; + if (var1 < var77 && actor.playerCycle == Client.cycle) { + var9 = (Player)actor; boolean var10; if (Client.field210 == 0) { var10 = false; @@ -188,87 +188,87 @@ public class class39 extends class21 { } if (var10) { - Player var79 = (Player)var0; + Player var79 = (Player)actor; if (var1 < var77) { - DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15); + DevicePcmPlayerProvider.method840(actor, actor.defaultHeight + 15); AbstractFont var81 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); - byte var84 = 9; - var81.drawCentered(var79.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var84, 16777215, 0); + byte var83 = 9; + var81.drawCentered(var79.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var83, 16777215, 0); var8 = 18; } } } int var78 = -2; - int var24; - int var25; + int var15; int var80; int var82; + int var84; int var85; - if (!var0.healthBars.isEmpty()) { - DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15); + if (!actor.healthBars.isEmpty()) { + DevicePcmPlayerProvider.method840(actor, actor.defaultHeight + 15); - for (HealthBar var83 = (HealthBar)var0.healthBars.last(); var83 != null; var83 = (HealthBar)var0.healthBars.previous()) { - HealthBarUpdate var15 = var83.get(Client.cycle); - if (var15 == null) { - if (var83.isEmpty()) { - var83.remove(); + for (HealthBar var16 = (HealthBar)actor.healthBars.last(); var16 != null; var16 = (HealthBar)actor.healthBars.previous()) { + HealthBarUpdate var17 = var16.get(Client.cycle); + if (var17 == null) { + if (var16.isEmpty()) { + var16.remove(); } } else { - HealthBarDefinition var16 = var83.definition; - Sprite var17 = var16.getSprite2(); - Sprite var18 = var16.getSprite1(); - int var19 = 0; - if (var17 != null && var18 != null) { - if (var16.widthPadding * 2 < var18.subWidth) { - var19 = var16.widthPadding; + HealthBarDefinition var18 = var16.definition; + Sprite var19 = var18.getSprite2(); + Sprite var20 = var18.getSprite1(); + int var21 = 0; + if (var19 != null && var20 != null) { + if (var18.widthPadding * 2 < var20.subWidth) { + var21 = var18.widthPadding; } - var80 = var18.subWidth - var19 * 2; + var85 = var20.subWidth - var21 * 2; } else { - var80 = var16.width; + var85 = var18.width; } - int var20 = 255; - boolean var21 = true; - int var22 = Client.cycle - var15.cycle; - int var23 = var80 * var15.health2 / var16.width; - if (var15.cycleOffset > var22) { - var24 = var16.int4 == 0 ? 0 : var16.int4 * (var22 / var16.int4); - var82 = var80 * var15.health / var16.width; - var25 = var24 * (var23 - var82) / var15.cycleOffset + var82; + int var22 = 255; + boolean var23 = true; + int var24 = Client.cycle - var17.cycle; + int var25 = var85 * var17.health2 / var18.width; + if (var17.cycleOffset > var24) { + var80 = var18.int4 == 0 ? 0 : var18.int4 * (var24 / var18.int4); + var84 = var85 * var17.health / var18.width; + var82 = var80 * (var25 - var84) / var17.cycleOffset + var84; } else { - var25 = var23; - var24 = var15.cycleOffset + var16.int5 - var22; - if (var16.int3 >= 0) { - var20 = (var24 << 8) / (var16.int5 - var16.int3); + var82 = var25; + var80 = var17.cycleOffset + var18.int5 - var24; + if (var18.int3 >= 0) { + var22 = (var80 << 8) / (var18.int5 - var18.int3); } } - if (var15.health2 > 0 && var25 < 1) { - var25 = 1; + if (var17.health2 > 0 && var82 < 1) { + var82 = 1; } - if (var17 != null && var18 != null) { - if (var80 == var25) { - var25 += var19 * 2; + if (var19 != null && var20 != null) { + if (var85 == var82) { + var82 += var21 * 2; } else { - var25 += var19; + var82 += var21; } - var24 = var17.subHeight; - var78 += var24; - var82 = var2 + Client.viewportTempX - (var80 >> 1); - var85 = var3 + Client.viewportTempY - var78; - var82 -= var19; - if (var20 >= 0 && var20 < 255) { - var17.method310(var82, var85, var20); - Rasterizer2D.Rasterizer2D_expandClip(var82, var85, var82 + var25, var85 + var24); - var18.method310(var82, var85, var20); + var80 = var19.subHeight; + var78 += var80; + var84 = var2 + Client.viewportTempX - (var85 >> 1); + var15 = var3 + Client.viewportTempY - var78; + var84 -= var21; + if (var22 >= 0 && var22 < 255) { + var19.method310(var84, var15, var22); + Rasterizer2D.Rasterizer2D_expandClip(var84, var15, var84 + var82, var15 + var80); + var20.method310(var84, var15, var22); } else { - var17.drawAt2(var82, var85); - Rasterizer2D.Rasterizer2D_expandClip(var82, var85, var25 + var82, var24 + var85); - var18.drawAt2(var82, var85); + var19.drawAt2(var84, var15); + Rasterizer2D.Rasterizer2D_expandClip(var84, var15, var82 + var84, var80 + var15); + var20.drawAt2(var84, var15); } Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); @@ -276,10 +276,10 @@ public class class39 extends class21 { } else { var78 += 5; if (Client.viewportTempX > -1) { - var24 = var2 + Client.viewportTempX - (var80 >> 1); - var82 = var3 + Client.viewportTempY - var78; - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var82, var25, 5, 65280); - Rasterizer2D.Rasterizer2D_fillRectangle(var24 + var25, var82, var80 - var25, 5, 16711680); + var80 = var2 + Client.viewportTempX - (var85 >> 1); + var84 = var3 + Client.viewportTempY - var78; + Rasterizer2D.Rasterizer2D_fillRectangle(var80, var84, var82, 5, 65280); + Rasterizer2D.Rasterizer2D_fillRectangle(var80 + var82, var84, var85 - var82, 5, 16711680); } var78 += 2; @@ -294,13 +294,13 @@ public class class39 extends class21 { var78 += var8; if (var1 < var77) { - var9 = (Player)var0; + var9 = (Player)actor; if (var9.isHidden) { return; } if (var9.headIconPk != -1 || var9.headIconPrayer != -1) { - DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15); + DevicePcmPlayerProvider.method840(actor, actor.defaultHeight + 15); if (Client.viewportTempX > -1) { if (var9.headIconPk != -1) { var78 += 25; @@ -315,51 +315,51 @@ public class class39 extends class21 { } if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { - DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15); + DevicePcmPlayerProvider.method840(actor, actor.defaultHeight + 15); if (Client.viewportTempX > -1) { var78 += Player.headIconHintSprites[1].subHeight; Player.headIconHintSprites[1].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var78); } } } else { - NPCDefinition var86 = ((NPC)var0).definition; + NPCDefinition var86 = ((NPC)actor).definition; if (var86.transforms != null) { var86 = var86.transform(); } if (var86.headIconPrayer >= 0 && var86.headIconPrayer < ClientPreferences.headIconPrayerSprites.length) { - DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15); + DevicePcmPlayerProvider.method840(actor, actor.defaultHeight + 15); if (Client.viewportTempX > -1) { ClientPreferences.headIconPrayerSprites[var86.headIconPrayer].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); } } if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var77] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { - DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15); + DevicePcmPlayerProvider.method840(actor, actor.defaultHeight + 15); if (Client.viewportTempX > -1) { Player.headIconHintSprites[0].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); } } } - if (var0.overheadText != null && (var1 >= var77 || !var0.field11 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { - DevicePcmPlayerProvider.method840(var0, var0.defaultHeight); + if (actor.overheadText != null && (var1 >= var77 || !actor.field11 && (Client.publicChatMode == 4 || !actor.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)actor).isFriend())))) { + DevicePcmPlayerProvider.method840(actor, actor.defaultHeight); if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { - Client.overheadTextXOffsets[Client.overheadTextCount] = class2.fontBold12.stringWidth(var0.overheadText) / 2; + Client.overheadTextXOffsets[Client.overheadTextCount] = class2.fontBold12.stringWidth(actor.overheadText) / 2; Client.overheadTextAscents[Client.overheadTextCount] = class2.fontBold12.ascent; Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; - Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; - Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; - Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; - Client.overheadText[Client.overheadTextCount] = var0.overheadText; + Client.overheadTextColors[Client.overheadTextCount] = actor.overheadTextColor; + Client.overheadTextEffects[Client.overheadTextCount] = actor.overheadTextEffect; + Client.overheadTextCyclesRemaining[Client.overheadTextCount] = actor.overheadTextCyclesRemaining; + Client.overheadText[Client.overheadTextCount] = actor.overheadText; ++Client.overheadTextCount; } } for (int var88 = 0; var88 < 4; ++var88) { - int var87 = var0.hitSplatCycles[var88]; - int var89 = var0.hitSplatTypes[var88]; + int var87 = actor.hitSplatCycles[var88]; + int var89 = actor.hitSplatTypes[var88]; HitSplatDefinition var90 = null; int var91 = 0; if (var89 >= 0) { @@ -367,12 +367,12 @@ public class class39 extends class21 { continue; } - var90 = LoginScreenAnimation.getHitSplatDefinition(var0.hitSplatTypes[var88]); + var90 = LoginScreenAnimation.getHitSplatDefinition(actor.hitSplatTypes[var88]); var91 = var90.field387; if (var90 != null && var90.transforms != null) { var90 = var90.transform(); if (var90 == null) { - var0.hitSplatCycles[var88] = -1; + actor.hitSplatCycles[var88] = -1; continue; } } @@ -380,10 +380,10 @@ public class class39 extends class21 { continue; } - var80 = var0.hitSplatTypes2[var88]; + var85 = actor.hitSplatTypes2[var88]; HitSplatDefinition var92 = null; - if (var80 >= 0) { - var92 = LoginScreenAnimation.getHitSplatDefinition(var80); + if (var85 >= 0) { + var92 = LoginScreenAnimation.getHitSplatDefinition(var85); if (var92 != null && var92.transforms != null) { var92 = var92.transform(); } @@ -391,9 +391,9 @@ public class class39 extends class21 { if (var87 - var91 <= Client.cycle) { if (var90 == null) { - var0.hitSplatCycles[var88] = -1; + actor.hitSplatCycles[var88] = -1; } else { - DevicePcmPlayerProvider.method840(var0, var0.defaultHeight / 2); + DevicePcmPlayerProvider.method840(actor, actor.defaultHeight / 2); if (Client.viewportTempX > -1) { if (var88 == 1) { Client.viewportTempY -= 20; @@ -413,10 +413,10 @@ public class class39 extends class21 { Sprite var94 = null; Sprite var95 = null; Sprite var96 = null; + var84 = 0; + var15 = 0; + var80 = 0; var82 = 0; - var85 = 0; - var24 = 0; - var25 = 0; int var26 = 0; int var27 = 0; int var28 = 0; @@ -437,7 +437,7 @@ public class class39 extends class21 { var93 = var90.method123(); int var43; if (var93 != null) { - var82 = var93.subWidth; + var84 = var93.subWidth; var43 = var93.subHeight; if (var43 > var42) { var42 = var43; @@ -448,7 +448,7 @@ public class class39 extends class21 { var94 = var90.method124(); if (var94 != null) { - var85 = var94.subWidth; + var15 = var94.subWidth; var43 = var94.subHeight; if (var43 > var42) { var42 = var43; @@ -459,7 +459,7 @@ public class class39 extends class21 { var95 = var90.method125(); if (var95 != null) { - var24 = var95.subWidth; + var80 = var95.subWidth; var43 = var95.subHeight; if (var43 > var42) { var42 = var43; @@ -470,7 +470,7 @@ public class class39 extends class21 { var96 = var90.method126(); if (var96 != null) { - var25 = var96.subWidth; + var82 = var96.subWidth; var43 = var96.subHeight; if (var43 > var42) { var42 = var43; @@ -544,20 +544,20 @@ public class class39 extends class21 { String var47 = null; boolean var48 = false; int var49 = 0; - var46 = var90.getString(var0.hitSplatValues[var88]); + var46 = var90.getString(actor.hitSplatValues[var88]); int var50 = var44.stringWidth(var46); if (var92 != null) { - var47 = var92.getString(var0.hitSplatValues2[var88]); + var47 = var92.getString(actor.hitSplatValues2[var88]); var49 = var45.stringWidth(var47); } int var51 = 0; int var52 = 0; - if (var85 > 0) { + if (var15 > 0) { if (var95 == null && var96 == null) { var51 = 1; } else { - var51 = var50 / var85 + 1; + var51 = var50 / var15 + 1; } } @@ -571,21 +571,21 @@ public class class39 extends class21 { int var53 = 0; int var54 = var53; - if (var82 > 0) { - var53 += var82; + if (var84 > 0) { + var53 += var84; } var53 += 2; int var55 = var53; - if (var24 > 0) { - var53 += var24; + if (var80 > 0) { + var53 += var80; } int var56 = var53; int var57 = var53; int var58; - if (var85 > 0) { - var58 = var85 * var51; + if (var15 > 0) { + var58 = var15 * var51; var53 += var58; var57 += (var58 - var50) / 2; } else { @@ -593,8 +593,8 @@ public class class39 extends class21 { } var58 = var53; - if (var25 > 0) { - var53 += var25; + if (var82 > 0) { + var53 += var82; } int var59 = 0; @@ -632,7 +632,7 @@ public class class39 extends class21 { } } - var64 = var0.hitSplatCycles[var88] - Client.cycle; + var64 = actor.hitSplatCycles[var88] - Client.cycle; int var65 = var90.field392 - var64 * var90.field392 / var90.field387; int var66 = var64 * var90.field393 / var90.field387 + -var90.field393; int var67 = var65 + (var2 + Client.viewportTempX - (var53 >> 1)); @@ -680,7 +680,7 @@ public class class39 extends class21 { if (var94 != null) { for (var76 = 0; var76 < var51; ++var76) { - var94.method310(var85 * var76 + (var67 + var56 - var27), var68, var75); + var94.method310(var15 * var76 + (var67 + var56 - var27), var68, var75); } } @@ -721,7 +721,7 @@ public class class39 extends class21 { if (var94 != null) { for (var76 = 0; var76 < var51; ++var76) { - var94.drawAt2(var85 * var76 + (var56 + var67 - var27), var68); + var94.drawAt2(var15 * var76 + (var56 + var67 - var27), var68); } } diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 659262007e..4d9ae2fc98 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -154,18 +154,18 @@ final class class4 implements class0 { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_stringStackSize -= 2; var6 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; - String var10 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; + String var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; if (var6.length() > 500) { return 1; - } else if (var10.length() > 500) { + } else if (var9.length() > 500) { return 1; } else { - PacketBufferNode var9 = Interpreter.method1915(ClientPacket.field238, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(1 + WorldMapRegion.method550(var6) + WorldMapRegion.method550(var10)); - var9.packetBuffer.writeStringCp1252NullTerminated(var6); - var9.packetBuffer.writeByte(var7); - var9.packetBuffer.writeStringCp1252NullTerminated(var10); - Client.packetWriter.method241(var9); + PacketBufferNode var10 = Interpreter.method1915(ClientPacket.field238, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeShort(1 + WorldMapRegion.method550(var6) + WorldMapRegion.method550(var9)); + var10.packetBuffer.writeStringCp1252NullTerminated(var6); + var10.packetBuffer.writeByte(var7); + var10.packetBuffer.writeStringCp1252NullTerminated(var9); + Client.packetWriter.method241(var10); return 1; } } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java index 47beb72c59..2352c15295 100644 --- a/runescape-client/src/main/java/class40.java +++ b/runescape-client/src/main/java/class40.java @@ -725,41 +725,41 @@ public class class40 { var4 = Client.field142[4] + 128; } - var15 = Client.camAngleY & 2047; + var13 = Client.camAngleY & 2047; var6 = MouseHandler.oculusOrbFocalPointX; - var22 = MouseRecorder.field566; - var24 = ScriptEvent.oculusOrbFocalPointY; - var9 = var4 * 3 + 600; - var10 = ScriptEvent.method1176(var9, var3); - var11 = 2048 - var4 & 2047; - var12 = 2048 - var15 & 2047; - var13 = 0; - var14 = 0; - int var16 = var10; + var14 = MouseRecorder.field566; + var15 = ScriptEvent.oculusOrbFocalPointY; + var22 = var4 * 3 + 600; + var24 = ScriptEvent.method1176(var22, var3); + var9 = 2048 - var4 & 2047; + var10 = 2048 - var13 & 2047; + var11 = 0; + var12 = 0; + int var16 = var24; int var17; int var18; int var19; - if (var11 != 0) { - var17 = Rasterizer3D.Rasterizer3D_sine[var11]; - var18 = Rasterizer3D.Rasterizer3D_cosine[var11]; - var19 = var14 * var18 - var17 * var10 >> 16; - var16 = var18 * var10 + var17 * var14 >> 16; - var14 = var19; + if (var9 != 0) { + var17 = Rasterizer3D.Rasterizer3D_sine[var9]; + var18 = Rasterizer3D.Rasterizer3D_cosine[var9]; + var19 = var12 * var18 - var17 * var24 >> 16; + var16 = var18 * var24 + var17 * var12 >> 16; + var12 = var19; } - if (var12 != 0) { - var17 = Rasterizer3D.Rasterizer3D_sine[var12]; - var18 = Rasterizer3D.Rasterizer3D_cosine[var12]; - var19 = var16 * var17 + var18 * var13 >> 16; - var16 = var16 * var18 - var17 * var13 >> 16; - var13 = var19; + if (var10 != 0) { + var17 = Rasterizer3D.Rasterizer3D_sine[var10]; + var18 = Rasterizer3D.Rasterizer3D_cosine[var10]; + var19 = var16 * var17 + var18 * var11 >> 16; + var16 = var16 * var18 - var17 * var11 >> 16; + var11 = var19; } - WorldMapSection1.cameraX = var6 - var13; - GrandExchangeEvents.cameraY = var22 - var14; - class11.cameraZ = var24 - var16; + WorldMapSection1.cameraX = var6 - var11; + GrandExchangeEvents.cameraY = var14 - var12; + class11.cameraZ = var15 - var16; WorldMapIcon1.cameraPitch = var4; - MusicPatchNode.cameraYaw = var15; + MusicPatchNode.cameraYaw = var13; if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (MouseHandler.oculusOrbFocalPointX >> 7 != Canvas.localPlayer.x >> 7 || ScriptEvent.oculusOrbFocalPointY >> 7 != Canvas.localPlayer.y >> 7)) { var17 = Canvas.localPlayer.plane; var18 = (MouseHandler.oculusOrbFocalPointX >> 7) + class50.baseX; @@ -779,33 +779,33 @@ public class class40 { var4 = Login.method2061(); } - var15 = WorldMapSection1.cameraX; + var13 = WorldMapSection1.cameraX; var6 = GrandExchangeEvents.cameraY; - var22 = class11.cameraZ; - var24 = WorldMapIcon1.cameraPitch; - var9 = MusicPatchNode.cameraYaw; + var14 = class11.cameraZ; + var15 = WorldMapIcon1.cameraPitch; + var22 = MusicPatchNode.cameraYaw; - for (var10 = 0; var10 < 5; ++var10) { - if (Client.field139[var10]) { - var11 = (int)(Math.random() * (double)(Client.field141[var10] * 2 + 1) - (double)Client.field141[var10] + Math.sin((double)Client.field144[var10] * ((double)Client.field143[var10] / 100.0D)) * (double)Client.field142[var10]); - if (var10 == 0) { - WorldMapSection1.cameraX += var11; + for (var24 = 0; var24 < 5; ++var24) { + if (Client.field139[var24]) { + var9 = (int)(Math.random() * (double)(Client.field141[var24] * 2 + 1) - (double)Client.field141[var24] + Math.sin((double)Client.field144[var24] * ((double)Client.field143[var24] / 100.0D)) * (double)Client.field142[var24]); + if (var24 == 0) { + WorldMapSection1.cameraX += var9; } - if (var10 == 1) { - GrandExchangeEvents.cameraY += var11; + if (var24 == 1) { + GrandExchangeEvents.cameraY += var9; } - if (var10 == 2) { - class11.cameraZ += var11; + if (var24 == 2) { + class11.cameraZ += var9; } - if (var10 == 3) { - MusicPatchNode.cameraYaw = var11 + MusicPatchNode.cameraYaw & 2047; + if (var24 == 3) { + MusicPatchNode.cameraYaw = var9 + MusicPatchNode.cameraYaw & 2047; } - if (var10 == 4) { - WorldMapIcon1.cameraPitch += var11; + if (var24 == 4) { + WorldMapIcon1.cameraPitch += var9; if (WorldMapIcon1.cameraPitch < 128) { WorldMapIcon1.cameraPitch = 128; } @@ -817,18 +817,18 @@ public class class40 { } } - var10 = MouseHandler.MouseHandler_x; - var11 = MouseHandler.MouseHandler_y; + var24 = MouseHandler.MouseHandler_x; + var9 = MouseHandler.MouseHandler_y; if (MouseHandler.MouseHandler_lastButton != 0) { - var10 = MouseHandler.MouseHandler_lastPressedX; - var11 = MouseHandler.MouseHandler_lastPressedY; + var24 = MouseHandler.MouseHandler_lastPressedX; + var9 = MouseHandler.MouseHandler_lastPressedY; } - if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { - var12 = var10 - var0; - var13 = var11 - var1; - ViewportMouse.ViewportMouse_x = var12; - ViewportMouse.ViewportMouse_y = var13; + if (var24 >= var0 && var24 < var0 + var2 && var9 >= var1 && var9 < var3 + var1) { + var10 = var24 - var0; + var11 = var9 - var1; + ViewportMouse.ViewportMouse_x = var10; + ViewportMouse.ViewportMouse_y = var11; ViewportMouse.ViewportMouse_isInViewport = true; ViewportMouse.ViewportMouse_entityCount = 0; ViewportMouse.ViewportMouse_false0 = false; @@ -840,39 +840,39 @@ public class class40 { class13.playPcmPlayers(); Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); class13.playPcmPlayers(); - var12 = Rasterizer3D.Rasterizer3D_zoom; + var10 = Rasterizer3D.Rasterizer3D_zoom; Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; class65.scene.draw(WorldMapSection1.cameraX, GrandExchangeEvents.cameraY, class11.cameraZ, WorldMapIcon1.cameraPitch, MusicPatchNode.cameraYaw, var4); - Rasterizer3D.Rasterizer3D_zoom = var12; + Rasterizer3D.Rasterizer3D_zoom = var10; class13.playPcmPlayers(); class65.scene.clearTempGameObjects(); UrlRequester.method3258(var0, var1, var2, var3); UnitPriceComparator.method136(var0, var1); ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field183); Client.field208 = 0; - var13 = (Canvas.localPlayer.x >> 7) + class50.baseX; - var14 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY; - if (var13 >= 3053 && var13 <= 3156 && var14 >= 3056 && var14 <= 3136) { + var11 = (Canvas.localPlayer.x >> 7) + class50.baseX; + var12 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY; + if (var11 >= 3053 && var11 <= 3156 && var12 >= 3056 && var12 <= 3136) { Client.field208 = 1; } - if (var13 >= 3072 && var13 <= 3118 && var14 >= 9492 && var14 <= 9535) { + if (var11 >= 3072 && var11 <= 3118 && var12 >= 9492 && var12 <= 9535) { Client.field208 = 1; } - if (Client.field208 == 1 && var13 >= 3139 && var13 <= 3199 && var14 >= 3008 && var14 <= 3062) { + if (Client.field208 == 1 && var11 >= 3139 && var11 <= 3199 && var12 >= 3008 && var12 <= 3062) { Client.field208 = 0; } - WorldMapSection1.cameraX = var15; + WorldMapSection1.cameraX = var13; GrandExchangeEvents.cameraY = var6; - class11.cameraZ = var22; - WorldMapIcon1.cameraPitch = var24; - MusicPatchNode.cameraYaw = var9; + class11.cameraZ = var14; + WorldMapIcon1.cameraPitch = var15; + MusicPatchNode.cameraYaw = var22; if (Client.isLoading) { byte var25 = 0; - var14 = var25 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; - if (var14 == 0) { + var12 = var25 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; + if (var12 == 0) { Client.isLoading = false; } } diff --git a/runescape-client/src/main/java/class48.java b/runescape-client/src/main/java/class48.java index 802a80da79..1f1da473c8 100644 --- a/runescape-client/src/main/java/class48.java +++ b/runescape-client/src/main/java/class48.java @@ -42,16 +42,21 @@ public class class48 { if (var2 == 0) { var3 = null; } else { - label29: { - for (int var4 = 0; var4 < var2; ++var4) { - var1 = Huffman.getWidget(var1.parentId); - if (var1 == null) { - var3 = null; - break label29; - } + int var4 = 0; + + while (true) { + if (var4 >= var2) { + var3 = var1; + break; } - var3 = var1; + var1 = Huffman.getWidget(var1.parentId); + if (var1 == null) { + var3 = null; + break; + } + + ++var4; } } diff --git a/runescape-client/src/main/java/class50.java b/runescape-client/src/main/java/class50.java index 5016653145..1cf6f12438 100644 --- a/runescape-client/src/main/java/class50.java +++ b/runescape-client/src/main/java/class50.java @@ -78,8 +78,8 @@ public class class50 { garbageValue = "83" ) @Export("loadRegions") - static final void loadRegions(boolean var0, PacketBuffer var1) { - Client.isInInstance = var0; + static final void loadRegions(boolean isInInstance, PacketBuffer packetBuffer) { + Client.isInInstance = isInInstance; int var2; int var3; int var4; @@ -87,14 +87,14 @@ public class class50 { int var6; int var7; if (!Client.isInInstance) { - var2 = var1.method67(); - var3 = var1.method66(); - int var8 = var1.readUnsignedShort(); + var2 = packetBuffer.method67(); + var3 = packetBuffer.method66(); + int var8 = packetBuffer.readUnsignedShort(); class190.xteaKeys = new int[var8][4]; for (var4 = 0; var4 < var8; ++var4) { for (var5 = 0; var5 < 4; ++var5) { - class190.xteaKeys[var4][var5] = var1.readInt(); + class190.xteaKeys[var4][var5] = packetBuffer.readInt(); } } @@ -128,19 +128,19 @@ public class class50 { DynamicObject.method2224(var3, var2, true); } else { - var2 = var1.method66(); - var3 = var1.method67(); - boolean var15 = var1.readUnsignedByte() == 1; - var4 = var1.readUnsignedShort(); - var1.importIndex(); + var2 = packetBuffer.method66(); + var3 = packetBuffer.method67(); + boolean var15 = packetBuffer.readUnsignedByte() == 1; + var4 = packetBuffer.readUnsignedShort(); + packetBuffer.importIndex(); int var16; for (var5 = 0; var5 < 4; ++var5) { for (var6 = 0; var6 < 13; ++var6) { for (var7 = 0; var7 < 13; ++var7) { - var16 = var1.readBits(1); + var16 = packetBuffer.readBits(1); if (var16 == 1) { - Client.instanceChunkTemplates[var5][var6][var7] = var1.readBits(26); + Client.instanceChunkTemplates[var5][var6][var7] = packetBuffer.readBits(26); } else { Client.instanceChunkTemplates[var5][var6][var7] = -1; } @@ -148,12 +148,12 @@ public class class50 { } } - var1.exportIndex(); + packetBuffer.exportIndex(); class190.xteaKeys = new int[var4][4]; for (var5 = 0; var5 < var4; ++var5) { for (var6 = 0; var6 < 4; ++var6) { - class190.xteaKeys[var5][var6] = var1.readInt(); + class190.xteaKeys[var5][var6] = packetBuffer.readInt(); } } diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java index ca6d82db8b..f57969ae3a 100644 --- a/runescape-client/src/main/java/class54.java +++ b/runescape-client/src/main/java/class54.java @@ -153,25 +153,25 @@ public final class class54 { } } } else { - short var9; - int var20; + int var9; + short var20; if (Login.loginIndex != 1) { boolean var10; int var11; short var12; if (Login.loginIndex == 2) { var12 = 201; - var20 = var12 + 52; - if (var1 == 1 && var17 >= var20 - 12 && var17 < var20 + 2) { + var9 = var12 + 52; + if (var1 == 1 && var17 >= var9 - 12 && var17 < var9 + 2) { Login.currentLoginField = 0; } - var20 += 15; - if (var1 == 1 && var17 >= var20 - 12 && var17 < var20 + 2) { + var9 += 15; + if (var1 == 1 && var17 >= var9 - 12 && var17 < var9 + 2) { Login.currentLoginField = 1; } - var20 += 15; + var9 += 15; var12 = 361; if (TilePaint.field907 != null) { var18 = TilePaint.field907.field43 / 2; @@ -310,15 +310,15 @@ public final class class54 { } if (Login.loginIndex == 3) { - var20 = Login.loginBoxX + 180; - var9 = 276; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + var9 = Login.loginBoxX + 180; + var20 = 276; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { MouseHandler.method1084(false); } - var20 = Login.loginBoxX + 180; - var9 = 326; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + var9 = Login.loginBoxX + 180; + var20 = 326; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { method1089("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); Login.loginIndex = 5; return; @@ -326,9 +326,9 @@ public final class class54 { } else { int var13; if (Login.loginIndex == 4) { - var20 = Login.loginBoxX + 180 - 80; - var9 = 321; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + var9 = Login.loginBoxX + 180 - 80; + var20 = 321; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { Login.otp.trim(); if (Login.otp.length() != 6) { method1089("", "Please enter a 6-digit PIN.", ""); @@ -351,8 +351,8 @@ public final class class54 { WorldMapCacheName.openURL(Message.method1227("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); } - var20 = Login.loginBoxX + 180 + 80; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + var9 = Login.loginBoxX + 180 + 80; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { Login.loginIndex = 0; Login.Login_username = ""; Login.Login_password = ""; @@ -402,15 +402,15 @@ public final class class54 { } } } else if (Login.loginIndex == 5) { - var20 = Login.loginBoxX + 180 - 80; - var9 = 321; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + var9 = Login.loginBoxX + 180 - 80; + var20 = 321; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { NPCDefinition.method5162(); return; } - var20 = Login.loginBoxX + 180 + 80; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + var9 = Login.loginBoxX + 180 + 80; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { MouseHandler.method1084(true); } @@ -468,31 +468,31 @@ public final class class54 { } if (Login.loginIndex == 7) { - var20 = Login.loginBoxX + 180 - 80; - var9 = 321; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + var9 = Login.loginBoxX + 180 - 80; + var20 = 321; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { WorldMapCacheName.openURL(Message.method1227("secure", true) + "m=dob/set_dob.ws", true, false); method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)"); Login.loginIndex = 6; return; } - var20 = Login.loginBoxX + 180 + 80; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + var9 = Login.loginBoxX + 180 + 80; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { MouseHandler.method1084(true); } } else if (Login.loginIndex == 8) { - var20 = Login.loginBoxX + 180 - 80; - var9 = 321; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + var9 = Login.loginBoxX + 180 - 80; + var20 = 321; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { WorldMapCacheName.openURL("https://www.jagex.com/terms/privacy/#eight", true, false); method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)"); Login.loginIndex = 6; return; } - var20 = Login.loginBoxX + 180 + 80; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + var9 = Login.loginBoxX + 180 + 80; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { MouseHandler.method1084(true); } } else if (Login.loginIndex == 12) { @@ -534,14 +534,14 @@ public final class class54 { } } - var20 = Varps.loginBoxCenter - 80; - var9 = 321; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + var9 = Varps.loginBoxCenter - 80; + var20 = 321; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { MouseHandler.method1084(false); } - var20 = Varps.loginBoxCenter + 80; - if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) { + var9 = Varps.loginBoxCenter + 80; + if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) { Login.loginIndex = 0; } } @@ -906,7 +906,7 @@ public final class class54 { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.vmethod395(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.element(); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.coord2.packed(); } @@ -917,7 +917,7 @@ public final class class54 { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.vmethod395(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.element(); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.coord2.packed(); } From 83533475d473ca1be2073ed9ee2816ec718bb803 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sun, 7 Jul 2019 21:30:17 +0200 Subject: [PATCH 377/472] Even more... you guessed it! REFACTORING. Removes the need for @Export for methods overriding base java methods --- .../runelite/cache/script/Instructions.java | 6 + .../net/runelite/cache/script/Opcodes.java | 6 + .../scriptopcodes/ScriptOpcode.java | 6 + .../deob/updater/AnnotationCleaner.java | 15 +- .../runelite/injector/InjectHookMethod.java | 12 +- .../net/runelite/injector/InjectUtil.java | 13 ++ .../net/runelite/injector/raw/RenderDraw.java | 2 +- .../java/net/runelite/rs/api/RSBuddy.java | 2 +- .../main/java/AbstractByteArrayCopier.java | 2 +- .../src/main/java/AbstractUserComparator.java | 23 +- .../src/main/java/AbstractWorldMapIcon.java | 14 +- runescape-client/src/main/java/Archive.java | 2 +- .../main/java/ArchiveDiskActionHandler.java | 7 +- .../src/main/java/AttackOption.java | 12 +- runescape-client/src/main/java/Bounds.java | 3 +- runescape-client/src/main/java/Buddy.java | 16 +- ...class157.java => BuddyRankComparator.java} | 19 +- .../src/main/java/BufferedSink.java | 10 +- .../src/main/java/BufferedSource.java | 2 - runescape-client/src/main/java/Canvas.java | 18 +- .../src/main/java/ChatChannel.java | 5 +- runescape-client/src/main/java/ClanChat.java | 4 +- runescape-client/src/main/java/ClanMate.java | 4 +- runescape-client/src/main/java/Client.java | 101 ++++----- runescape-client/src/main/java/Coord.java | 21 +- .../main/java/DevicePcmPlayerProvider.java | 4 +- .../src/main/java/DynamicObject.java | 6 +- .../src/main/java/FaceNormal.java | 2 +- runescape-client/src/main/java/FontName.java | 30 +-- .../src/main/java/Formatting.java | 2 +- runescape-client/src/main/java/Friend.java | 14 +- .../src/main/java/FriendSystem.java | 14 +- .../src/main/java/FriendsList.java | 10 +- runescape-client/src/main/java/GameShell.java | 38 +--- .../src/main/java/GrandExchangeEvent.java | 24 ++- .../src/main/java/GrandExchangeEvents.java | 22 +- ...a => GrandExchangeOfferAgeComparator.java} | 10 +- ... => GrandExchangeOfferNameComparator.java} | 15 +- ...GrandExchangeOfferOwnWorldComparator.java} | 19 +- ...ExchangeOfferTotalQuantityComparator.java} | 14 +- ...randExchangeOfferUnitPriceComparator.java} | 19 +- ...=> GrandExchangeOfferWorldComparator.java} | 14 +- .../src/main/java/GroundItem.java | 5 +- .../src/main/java/GzipDecompressor.java | 9 +- runescape-client/src/main/java/Ignored.java | 12 +- .../src/main/java/Interpreter.java | 2 +- .../src/main/java/IsaacCipher.java | 2 +- runescape-client/src/main/java/Login.java | 4 +- .../src/main/java/LoginScreenAnimation.java | 2 +- runescape-client/src/main/java/LoginType.java | 3 - .../src/main/java/MidiPcmStream.java | 2 + .../src/main/java/MouseRecorder.java | 6 +- .../src/main/java/MusicPatchPcmStream.java | 2 + runescape-client/src/main/java/NetSocket.java | 2 - .../src/main/java/ParamDefinition.java | 202 +++++++++--------- runescape-client/src/main/java/PcmPlayer.java | 20 +- .../src/main/java/PcmStreamMixer.java | 2 + .../src/main/java/PendingSpawn.java | 4 +- runescape-client/src/main/java/Players.java | 12 +- .../src/main/java/RawPcmStream.java | 2 + runescape-client/src/main/java/Scene.java | 27 +-- .../src/main/java/ScriptEvent.java | 2 +- .../src/main/java/SoundSystem.java | 2 - .../main/java/SpotAnimationDefinition.java | 3 +- .../src/main/java/StructDefinition.java | 10 +- .../src/main/java/TaskHandler.java | 2 - .../src/main/java/UrlRequest.java | 3 +- .../src/main/java/UrlRequester.java | 2 - runescape-client/src/main/java/User.java | 32 ++- .../src/main/java/UserComparator1.java | 17 +- .../src/main/java/UserComparator10.java | 14 +- .../src/main/java/UserComparator2.java | 17 +- .../src/main/java/UserComparator3.java | 14 +- .../src/main/java/UserComparator4.java | 21 +- .../src/main/java/UserComparator5.java | 24 +-- .../src/main/java/UserComparator6.java | 14 +- .../src/main/java/UserComparator7.java | 14 +- .../src/main/java/UserComparator8.java | 24 +-- .../src/main/java/UserComparator9.java | 14 +- runescape-client/src/main/java/UserList.java | 4 +- runescape-client/src/main/java/Username.java | 26 +-- runescape-client/src/main/java/Varcs.java | 4 +- runescape-client/src/main/java/Widget.java | 3 +- runescape-client/src/main/java/WorldMap.java | 78 ++++--- .../src/main/java/WorldMapAreaData.java | 2 +- .../src/main/java/WorldMapElement.java | 5 +- .../src/main/java/WorldMapEvent.java | 12 +- .../src/main/java/WorldMapIcon1.java | 23 +- .../src/main/java/WorldMapIcon2.java | 23 +- .../src/main/java/WorldMapLabel.java | 8 +- .../src/main/java/WorldMapManager.java | 2 +- .../src/main/java/WorldMapRegion.java | 17 +- .../src/main/java/WorldMapSection3.java | 4 +- .../src/main/java/WorldMapSectionType.java | 7 +- runescape-client/src/main/java/class1.java | 4 +- runescape-client/src/main/java/class13.java | 10 +- runescape-client/src/main/java/class159.java | 10 +- runescape-client/src/main/java/class16.java | 2 +- runescape-client/src/main/java/class171.java | 12 +- runescape-client/src/main/java/class196.java | 2 +- runescape-client/src/main/java/class204.java | 4 +- runescape-client/src/main/java/class211.java | 8 +- runescape-client/src/main/java/class22.java | 2 +- runescape-client/src/main/java/class227.java | 6 +- runescape-client/src/main/java/class229.java | 2 +- runescape-client/src/main/java/class248.java | 16 +- runescape-client/src/main/java/class249.java | 7 +- runescape-client/src/main/java/class258.java | 4 +- runescape-client/src/main/java/class266.java | 7 +- runescape-client/src/main/java/class3.java | 33 +-- runescape-client/src/main/java/class31.java | 12 +- runescape-client/src/main/java/class32.java | 2 +- runescape-client/src/main/java/class4.java | 14 +- runescape-client/src/main/java/class40.java | 14 +- runescape-client/src/main/java/class54.java | 28 +-- .../java/net/runelite/rs/ScriptOpcodes.java | 6 + 116 files changed, 802 insertions(+), 752 deletions(-) rename runescape-client/src/main/java/{class157.java => BuddyRankComparator.java} (58%) rename runescape-client/src/main/java/{class12.java => GrandExchangeOfferAgeComparator.java} (91%) rename runescape-client/src/main/java/{class11.java => GrandExchangeOfferNameComparator.java} (95%) rename runescape-client/src/main/java/{OwnWorldComparator.java => GrandExchangeOfferOwnWorldComparator.java} (84%) rename runescape-client/src/main/java/{TotalQuantityComparator.java => GrandExchangeOfferTotalQuantityComparator.java} (95%) rename runescape-client/src/main/java/{UnitPriceComparator.java => GrandExchangeOfferUnitPriceComparator.java} (91%) rename runescape-client/src/main/java/{WorldComparator.java => GrandExchangeOfferWorldComparator.java} (95%) diff --git a/cache/src/main/java/net/runelite/cache/script/Instructions.java b/cache/src/main/java/net/runelite/cache/script/Instructions.java index 17dfabfcd1..a0c7b859a1 100644 --- a/cache/src/main/java/net/runelite/cache/script/Instructions.java +++ b/cache/src/main/java/net/runelite/cache/script/Instructions.java @@ -78,6 +78,7 @@ public class Instructions add(CC_SETSIZE, "cc_setsize"); add(CC_SETHIDE, "cc_sethide"); add(CC_SETNOCLICKTHROUGH, "cc_setnoclickthrough"); + add(CC_SETNOSCROLLTHROUGH, "cc_setnoscrollthrough"); add(CC_SETSCROLLPOS, "cc_setscrollpos"); add(CC_SETCOLOUR, "cc_setcolour"); add(CC_SETFILL, "cc_setfill"); @@ -287,11 +288,14 @@ public class Instructions add(SETSHOWLOADINGMESSAGES, "setshowloadingmessages"); add(SETTAPTODROP, "settaptodrop"); add(GETTAPTODROP, "gettaptodrop"); + add(SETOCULUSORBSPEED, "setoculusorbspeed"); add(GETCANVASSIZE, "getcanvassize"); add(SETHIDEUSERNAME, "sethideusername"); add(GETHIDEUSERNAME, "gethideusername"); add(SETREMEMBERUSERNAME, "setrememberusername"); add(GETREMEMBERUSERNAME, "getrememberusername"); + add(SETTITLEMUSICENABLED, "settitlemusicenabled"); + add(GETTITLEMUSICENABLED, "gettitlemusicenabled"); add(SOUND_SYNTH, "sound_synth"); add(SOUND_SONG, "sound_song"); add(SOUND_JINGLE, "sound_jingle"); @@ -411,6 +415,7 @@ public class Instructions add(REMOVETAGS, "removetags"); add(STRING_INDEXOF_CHAR, "string_indexof_char"); add(STRING_INDEXOF_STRING, "string_indexof_string"); + add(UPPERCASE, "uppercase"); add(OC_NAME, "oc_name"); add(OC_OP, "oc_op"); add(OC_IOP, "oc_iop"); @@ -461,6 +466,7 @@ public class Instructions add(WORLDLIST_NEXT, "worldlist_next"); add(WORLDLIST_SPECIFIC, "worldlist_specific"); add(WORLDLIST_SORT, "worldlist_sort"); + add(GETWORLDINFO, "getworldinfo"); add(SETFOLLOWEROPSLOWPRIORITY, "setfolloweropslowpriority"); add(NC_PARAM, "nc_param"); add(LC_PARAM, "lc_param"); diff --git a/cache/src/main/java/net/runelite/cache/script/Opcodes.java b/cache/src/main/java/net/runelite/cache/script/Opcodes.java index e69a1ef5ef..5a4fe89061 100644 --- a/cache/src/main/java/net/runelite/cache/script/Opcodes.java +++ b/cache/src/main/java/net/runelite/cache/script/Opcodes.java @@ -69,6 +69,7 @@ public class Opcodes public static final int CC_SETSIZE = 1001; public static final int CC_SETHIDE = 1003; public static final int CC_SETNOCLICKTHROUGH = 1005; + public static final int CC_SETNOSCROLLTHROUGH = 1006; public static final int CC_SETSCROLLPOS = 1100; public static final int CC_SETCOLOUR = 1101; public static final int CC_SETFILL = 1102; @@ -278,11 +279,14 @@ public class Opcodes public static final int SETSHOWLOADINGMESSAGES = 3126; public static final int SETTAPTODROP = 3127; public static final int GETTAPTODROP = 3128; + public static final int SETOCULUSORBSPEED = 3129; public static final int GETCANVASSIZE = 3132; public static final int SETHIDEUSERNAME = 3141; public static final int GETHIDEUSERNAME = 3142; public static final int SETREMEMBERUSERNAME = 3143; public static final int GETREMEMBERUSERNAME = 3144; + public static final int SETTITLEMUSICENABLED = 3146; + public static final int GETTITLEMUSICENABLED = 3147; public static final int SOUND_SYNTH = 3200; public static final int SOUND_SONG = 3201; public static final int SOUND_JINGLE = 3202; @@ -402,6 +406,7 @@ public class Opcodes public static final int REMOVETAGS = 4119; public static final int STRING_INDEXOF_CHAR = 4120; public static final int STRING_INDEXOF_STRING = 4121; + public static final int UPPERCASE = 4122; public static final int OC_NAME = 4200; public static final int OC_OP = 4201; public static final int OC_IOP = 4202; @@ -452,6 +457,7 @@ public class Opcodes public static final int WORLDLIST_NEXT = 6502; public static final int WORLDLIST_SPECIFIC = 6506; public static final int WORLDLIST_SORT = 6507; + public static final int GETWORLDINFO = 6511; public static final int SETFOLLOWEROPSLOWPRIORITY = 6512; public static final int NC_PARAM = 6513; public static final int LC_PARAM = 6514; diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/scriptopcodes/ScriptOpcode.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/scriptopcodes/ScriptOpcode.java index 5033c63e43..1a8e4abbfd 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/scriptopcodes/ScriptOpcode.java +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/scriptopcodes/ScriptOpcode.java @@ -48,6 +48,7 @@ public enum ScriptOpcode CC_SETSIZE(1001), CC_SETHIDE(1003), CC_SETNOCLICKTHROUGH(1005), + CC_SETNOSCROLLTHROUGH(1006), CC_SETSCROLLPOS(1100), CC_SETCOLOUR(1101), CC_SETFILL(1102), @@ -257,11 +258,14 @@ public enum ScriptOpcode SETSHOWLOADINGMESSAGES(3126), SETTAPTODROP(3127), GETTAPTODROP(3128), + SETOCULUSORBSPEED(3129), GETCANVASSIZE(3132), SETHIDEUSERNAME(3141), GETHIDEUSERNAME(3142), SETREMEMBERUSERNAME(3143), GETREMEMBERUSERNAME(3144), + SETTITLEMUSICENABLED(3146), + GETTITLEMUSICENABLED(3147), SOUND_SYNTH(3200), SOUND_SONG(3201), SOUND_JINGLE(3202), @@ -381,6 +385,7 @@ public enum ScriptOpcode REMOVETAGS(4119), STRING_INDEXOF_CHAR(4120), STRING_INDEXOF_STRING(4121), + UPPERCASE(4122), OC_NAME(4200), OC_OP(4201), OC_IOP(4202), @@ -431,6 +436,7 @@ public enum ScriptOpcode WORLDLIST_NEXT(6502), WORLDLIST_SPECIFIC(6506), WORLDLIST_SORT(6507), + GETWORLDINFO(6511), SETFOLLOWEROPSLOWPRIORITY(6512), NC_PARAM(6513), LC_PARAM(6514), diff --git a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java index fe137ec096..dddc93c4d6 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java +++ b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java @@ -1,5 +1,6 @@ package net.runelite.deob.updater; +import com.google.common.base.Strings; import java.io.File; import net.runelite.asm.ClassFile; import net.runelite.asm.ClassGroup; @@ -39,6 +40,12 @@ public class AnnotationCleaner log.debug("Checking {}", c.toString()); + String implementingName = DeobAnnotations.getImplements(c); + if (!Strings.isNullOrEmpty(implementingName)) + { + assertEquals(c + " implements " + implementingName + " but is called " + c.getClassName(), implementingName, c.getClassName()); + } + for (Field f : c.getFields()) { Annotations an = f.getAnnotations(); @@ -48,11 +55,11 @@ public class AnnotationCleaner if (exportedName == null) { - assertTrue("Field " + fieldName + " isn't obfuscated but doesn't have @Export.", Deob.isObfuscated(fieldName) || fieldName.contains("$")); + assertTrue("Field " + c.getClassName() + '.' + fieldName + " isn't obfuscated but doesn't have @Export.", Deob.isObfuscated(fieldName) || fieldName.equals(DeobAnnotations.getObfuscatedName(an)) || DeobAnnotations.getObfuscatedName(an) == null); continue; } - assertEquals("Field " + fieldName + " has " + exportedName + " in @Export", fieldName, exportedName); + assertEquals("Field " + c.getClassName() + '.' + fieldName + " has " + exportedName + " in @Export", fieldName, exportedName); } for (Method m : c.getMethods()) @@ -64,11 +71,11 @@ public class AnnotationCleaner if (exportedName == null) { - assertTrue("Method " + fieldName + " isn't obfuscated but doesn't have @Export.", Deob.isObfuscated(fieldName) || fieldName.endsWith("init>") || fieldName.equals("values") || fieldName.equals("valueOf") || fieldName.startsWith("compareTo") || fieldName.equals("equals") || fieldName.equals("hashCode") || fieldName.equals("compare")); + assertTrue("Method " + c.getClassName() + '.' + fieldName + " isn't obfuscated but doesn't have @Export.", Deob.isObfuscated(fieldName) || fieldName.equals(DeobAnnotations.getObfuscatedName(an)) || DeobAnnotations.getObfuscatedName(an) == null); continue; } - assertEquals("Method " + fieldName + " has " + exportedName + " in @Export", fieldName, exportedName); + assertEquals("Method " + c.getClassName() + '.' + fieldName + " has " + exportedName + " in @Export", fieldName, exportedName); } } } diff --git a/injector-plugin/src/main/java/net/runelite/injector/InjectHookMethod.java b/injector-plugin/src/main/java/net/runelite/injector/InjectHookMethod.java index be654e127d..3c304807be 100644 --- a/injector-plugin/src/main/java/net/runelite/injector/InjectHookMethod.java +++ b/injector-plugin/src/main/java/net/runelite/injector/InjectHookMethod.java @@ -33,6 +33,7 @@ import net.runelite.asm.ClassGroup; import net.runelite.asm.Method; import net.runelite.asm.Type; import net.runelite.asm.attributes.Annotations; +import net.runelite.asm.attributes.Code; import net.runelite.asm.attributes.annotation.Annotation; import net.runelite.asm.attributes.code.Instruction; import net.runelite.asm.attributes.code.InstructionType; @@ -89,9 +90,9 @@ public class InjectHookMethod obfuscatedClassName = DeobAnnotations.getObfuscatedName(cf.getAnnotations()); // might be a constructor - if (obfuscatedMethodName == null && method.getName().equals("")) + if (obfuscatedMethodName == null) { - obfuscatedMethodName = ""; + obfuscatedMethodName = method.getName(); } assert obfuscatedClassName != null : "hook on method in class with no obfuscated name"; @@ -110,7 +111,12 @@ public class InjectHookMethod private void injectHookMethod(Method hookMethod, String hookName, boolean end, Method deobMethod, Method vanillaMethod, boolean useHooks) throws InjectionException { - Instructions instructions = vanillaMethod.getCode().getInstructions(); + Code code = vanillaMethod.getCode(); + if (code == null) + { + logger.warn(vanillaMethod + " code is null"); + } + Instructions instructions = code.getInstructions(); Signature.Builder builder = new Signature.Builder() .setReturnType(Type.VOID); // Hooks always return void 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 1f0275110c..27b60ce344 100644 --- a/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java +++ b/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java @@ -181,4 +181,17 @@ public class InjectUtil throw new InjectionException(String.format("Mapped field \"%s\" could not be found.", name)); } + + public static Method findStaticDeob(Inject inject, String name) throws InjectionException + { + for (ClassFile cf : inject.getDeobfuscated().getClasses()) + { + if (cf.findMethod(name) != null) + { + return cf.findMethod(name); + } + } + + throw new InjectionException("Fycj you"); + } } diff --git a/injector-plugin/src/main/java/net/runelite/injector/raw/RenderDraw.java b/injector-plugin/src/main/java/net/runelite/injector/raw/RenderDraw.java index a3d71a4e4e..6bebd6ccb1 100644 --- a/injector-plugin/src/main/java/net/runelite/injector/raw/RenderDraw.java +++ b/injector-plugin/src/main/java/net/runelite/injector/raw/RenderDraw.java @@ -21,7 +21,7 @@ public class RenderDraw private static final Logger log = LoggerFactory.getLogger(RenderDraw.class); private static final net.runelite.asm.pool.Method renderDraw = new net.runelite.asm.pool.Method( new Class("net.runelite.client.callback.Hooks"), - "draw", + "renderDraw", new Signature("(Lnet/runelite/api/Renderable;IIIIIIIIJ)V") ); private final Inject inject; diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java b/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java index e13893c244..77b62b5aca 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java @@ -5,7 +5,7 @@ import net.runelite.mapping.Import; public interface RSBuddy extends ChatPlayer, RSUser { - @Import("world0") + @Import("getWorld") @Override int getWorld(); diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index bef6ef48d4..509818dd92 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -92,7 +92,7 @@ public abstract class AbstractByteArrayCopier { ) static void method4024() { PacketBufferNode var0 = Interpreter.method1915(ClientPacket.field257, Client.packetWriter.isaacCipher); - var0.packetBuffer.writeByte(SpotAnimationDefinition.method4822()); + var0.packetBuffer.writeByte(SpotAnimationDefinition.getWindowedMode()); var0.packetBuffer.writeShort(SoundCache.canvasWidth); var0.packetBuffer.writeShort(Huffman.canvasHeight); Client.packetWriter.method241(var0); diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 9f2d053651..6071aae588 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -1,4 +1,5 @@ import java.util.Comparator; +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,18 +8,20 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { @ObfuscatedName("f") - Comparator field3; + @Export("nextComparator") + Comparator nextComparator; @ObfuscatedName("e") @ObfuscatedSignature( signature = "(Ljava/util/Comparator;B)V", garbageValue = "-2" ) - final void method11(Comparator var1) { - if (this.field3 == null) { - this.field3 = var1; - } else if (this.field3 instanceof AbstractUserComparator) { - ((AbstractUserComparator)this.field3).method11(var1); + @Export("addComparator") + final void addComparator(Comparator var1) { + if (this.nextComparator == null) { + this.nextComparator = var1; + } else if (this.nextComparator instanceof AbstractUserComparator) { + ((AbstractUserComparator)this.nextComparator).addComparator(var1); } } @@ -28,12 +31,12 @@ public abstract class AbstractUserComparator implements Comparator { signature = "(Ljs;Ljs;I)I", garbageValue = "-962181316" ) - protected final int method12(User var1, User var2) { - return this.field3 == null ? 0 : this.field3.compare(var1, var2); + @Export("compareUser") + protected final int compareUser(User var1, User var2) { + return this.nextComparator == null ? 0 : this.nextComparator.compare(var1, var2); } - @ObfuscatedName("equals") - public boolean method13(Object var1) { + public boolean equals(Object var1) { return super.equals(var1); } diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index 04e7f744bb..6eb7f5cc76 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -54,16 +54,16 @@ public abstract class AbstractWorldMapIcon { signature = "(I)I", garbageValue = "1990181988" ) - @Export("element") - public abstract int element(); + @Export("getElement") + public abstract int getElement(); @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)Laj;", garbageValue = "1159446036" ) - @Export("label") - abstract WorldMapLabel label(); + @Export("getLabel") + abstract WorldMapLabel getLabel(); @ObfuscatedName("q") @ObfuscatedSignature( @@ -94,7 +94,7 @@ public abstract class AbstractWorldMapIcon { garbageValue = "1150380891" ) boolean method19() { - return this.element() >= 0; + return this.getElement() >= 0; } @ObfuscatedName("b") @@ -106,7 +106,7 @@ public abstract class AbstractWorldMapIcon { if (!this.method19()) { return false; } else { - WorldMapElement var3 = ViewportMouse.getWorldMapElement(this.element()); + WorldMapElement var3 = ViewportMouse.getWorldMapElement(this.getElement()); int var4 = this.vmethod397(); int var5 = this.vmethod398(); switch(var3.field3287.field3528) { @@ -155,7 +155,7 @@ public abstract class AbstractWorldMapIcon { garbageValue = "1201712205" ) boolean method21(int var1, int var2) { - WorldMapLabel var3 = this.label(); + WorldMapLabel var3 = this.getLabel(); return var3 == null ? false : (var1 >= this.field5 - var3.width / 2 && var1 <= var3.width / 2 + this.field5 ? var2 >= this.field6 && var2 <= var3.height + this.field6 : false); } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index 1bd1f3e6f5..11542e7c7b 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -389,7 +389,7 @@ public class Archive extends AbstractArchive { garbageValue = "-34" ) static final void method4703(int var0) { - class12.method159(); + GrandExchangeOfferAgeComparator.method159(); for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { if (var1.obj != null) { diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index 3e12c3d7da..d9899dacb7 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -28,8 +28,6 @@ public class ArchiveDiskActionHandler implements Runnable { @Export("ArchiveDiskActionHandler_lock") static Object ArchiveDiskActionHandler_lock; - @Export("run") - @ObfuscatedName("run") public void run() { try { while (true) { @@ -89,10 +87,11 @@ public class ArchiveDiskActionHandler implements Runnable { signature = "(Ljava/lang/String;B)V", garbageValue = "67" ) - static final void method4655(String var0) { + @Export("clanKickUser") + static final void clanKickUser(String var0) { if (PacketWriter.clanChat != null) { PacketBufferNode var1 = Interpreter.method1915(ClientPacket.field235, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(WorldMapRegion.method550(var0)); + var1.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var0)); var1.packetBuffer.writeStringCp1252NullTerminated(var0); Client.packetWriter.method241(var1); } diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index 2f393def77..207673d24a 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -81,7 +81,7 @@ public enum AttackOption implements Enumerated { signature = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;II)I", garbageValue = "-189314181" ) - public static int method2033(CharSequence var0, CharSequence var1, int var2) { + public static int method2033(CharSequence var0, CharSequence var1, int language) { int var3 = var0.length(); int var4 = var1.length(); int var5 = 0; @@ -146,13 +146,13 @@ public enum AttackOption implements Enumerated { } var8 = var12; - var9 = class12.method155(var9, var2); - var14 = class12.method155(var14, var2); + var9 = GrandExchangeOfferAgeComparator.method155(var9, language); + var14 = GrandExchangeOfferAgeComparator.method155(var14, language); if (var9 != var14 && Character.toUpperCase(var9) != Character.toUpperCase(var14)) { var9 = Character.toLowerCase(var9); var14 = Character.toLowerCase(var14); if (var14 != var9) { - return CollisionMap.method3631(var9, var2) - CollisionMap.method3631(var14, var2); + return CollisionMap.method3631(var9, language) - CollisionMap.method3631(var14, language); } } } @@ -168,7 +168,7 @@ public enum AttackOption implements Enumerated { var19 = Character.toLowerCase(var19); var18 = Character.toLowerCase(var18); if (var19 != var18) { - return CollisionMap.method3631(var19, var2) - CollisionMap.method3631(var18, var2); + return CollisionMap.method3631(var19, language) - CollisionMap.method3631(var18, language); } } } @@ -181,7 +181,7 @@ public enum AttackOption implements Enumerated { var18 = var0.charAt(var20); char var13 = var1.charAt(var20); if (var18 != var13) { - return CollisionMap.method3631(var18, var2) - CollisionMap.method3631(var13, var2); + return CollisionMap.method3631(var18, language) - CollisionMap.method3631(var13, language); } } diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index 28eb923bce..46652aebef 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -130,8 +130,7 @@ public class Bounds { return this.field42 + this.field44; } - @ObfuscatedName("toString") - public String method35() { + public String toString() { return null; } diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index a676800453..a45ba272a1 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -11,8 +11,8 @@ public class Buddy extends User { @ObfuscatedGetter( intValue = 429472919 ) - @Export("world0") - public int world0; + @Export("world") + public int world; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 120689297 @@ -27,7 +27,7 @@ public class Buddy extends User { public int rank; Buddy() { - this.world0 = -1; + this.world = -1; } @ObfuscatedName("an") @@ -37,7 +37,7 @@ public class Buddy extends User { ) @Export("set") void set(int var1, int var2) { - this.world0 = var1; + this.world = var1; this.int2 = var2; } @@ -46,9 +46,9 @@ public class Buddy extends User { signature = "(B)I", garbageValue = "0" ) - @Export("world") - public int world() { - return this.world0; + @Export("getWorld") + public int getWorld() { + return this.world; } @ObfuscatedName("au") @@ -58,7 +58,7 @@ public class Buddy extends User { ) @Export("hasWorld") public boolean hasWorld() { - return this.world0 > 0; + return this.world > 0; } @ObfuscatedName("ff") diff --git a/runescape-client/src/main/java/class157.java b/runescape-client/src/main/java/BuddyRankComparator.java similarity index 58% rename from runescape-client/src/main/java/class157.java rename to runescape-client/src/main/java/BuddyRankComparator.java index a7d3eb0d9f..23c76bfbd4 100644 --- a/runescape-client/src/main/java/class157.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -1,19 +1,23 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("fw") -public class class157 extends AbstractUserComparator { +@Implements("BuddyRankComparator") +public class BuddyRankComparator extends AbstractUserComparator { @ObfuscatedName("nm") @ObfuscatedGetter( intValue = 1006519291 ) static int field1114; @ObfuscatedName("m") - final boolean field1969; + @Export("reversed") + final boolean reversed; - public class157(boolean var1) { - this.field1969 = var1; + public BuddyRankComparator(boolean var1) { + this.reversed = var1; } @ObfuscatedName("m") @@ -21,12 +25,13 @@ public class class157 extends AbstractUserComparator { signature = "(Lke;Lke;I)I", garbageValue = "884616259" ) - int method3381(Buddy var1, Buddy var2) { - return var2.rank != var1.rank ? (this.field1969 ? var1.rank - var2.rank : var2.rank - var1.rank) : this.method12(var1, var2); + @Export("compareBuddy") + int compareBuddy(Buddy var1, Buddy var2) { + return var2.rank != var1.rank ? (this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank) : this.compareUser(var1, var2); } public int compare(Object var1, Object var2) { - return this.method3381((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("s") diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index 9ace18e0fd..107fecae1d 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -40,8 +40,8 @@ public class BufferedSink implements Runnable { @Export("exception") IOException exception; @ObfuscatedName("l") - @Export("isClosed0") - boolean isClosed0; + @Export("closed") + boolean closed; BufferedSink(OutputStream var1, int var2) { this.position = 0; @@ -61,7 +61,7 @@ public class BufferedSink implements Runnable { ) @Export("isClosed") boolean isClosed() { - if (this.isClosed0) { + if (this.closed) { try { this.outputStream.close(); if (this.exception == null) { @@ -127,7 +127,7 @@ public class BufferedSink implements Runnable { @Export("close") void close() { synchronized(this) { - this.isClosed0 = true; + this.closed = true; this.notifyAll(); } @@ -138,8 +138,6 @@ public class BufferedSink implements Runnable { } - @Export("run") - @ObfuscatedName("run") public void run() { while (true) { synchronized(this) { diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index 5528e12d5f..c4371c89af 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -201,8 +201,6 @@ public class BufferedSource implements Runnable { } - @Export("run") - @ObfuscatedName("run") public void run() { while (true) { int var1; diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index 079c70b9f2..fa8f279fc6 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -154,7 +154,7 @@ public final class Canvas extends java.awt.Canvas { if (var2) { WorldMapIcon1.field1030 = var10; } else { - class12.field1111 = var10; + GrandExchangeOfferAgeComparator.field1111 = var10; } class22.method295(var5); @@ -164,7 +164,7 @@ public final class Canvas extends java.awt.Canvas { } else { Widget var6; if (var0 == ScriptOpcodes.CC_DELETE) { - var6 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + var6 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; var5 = Huffman.getWidget(var6.id); var5.children[var6.childIndex] = null; class22.method295(var5); @@ -182,7 +182,7 @@ public final class Canvas extends java.awt.Canvas { if (var2) { WorldMapIcon1.field1030 = var6; } else { - class12.field1111 = var6; + GrandExchangeOfferAgeComparator.field1111 = var6; } } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; @@ -202,7 +202,7 @@ public final class Canvas extends java.awt.Canvas { if (var2) { WorldMapIcon1.field1030 = var5; } else { - class12.field1111 = var5; + GrandExchangeOfferAgeComparator.field1111 = var5; } } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; @@ -218,9 +218,9 @@ public final class Canvas extends java.awt.Canvas { signature = "(ILir;Ljava/lang/String;Ljava/lang/String;IZS)V", garbageValue = "-9124" ) - public static void method858(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) { - int var6 = var1.getGroupId(var2); - int var7 = var1.getFileId(var6, var3); + public static void method858(int var0, AbstractArchive var1, String groupName, String fileName, int var4, boolean var5) { + int var6 = var1.getGroupId(groupName); + int var7 = var1.getFileId(var6, fileName); class214.field1129 = 1; class214.field1130 = var1; class30.musicTrackGroupId = var6; @@ -243,7 +243,7 @@ public final class Canvas extends java.awt.Canvas { if (var0.hitpoints == 0) { if (var0.field903 < 0 || VarbitDefinition.method4910(var0.field903, var0.field905)) { - ParamDefinition.method4933(var0.level, var0.type, var0.x, var0.y, var0.field903, var0.field904, var0.field905); + ParamDefinition.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.field903, var0.field904, var0.field905); var0.remove(); } } else { @@ -252,7 +252,7 @@ public final class Canvas extends java.awt.Canvas { } if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102 && (var0.id < 0 || VarbitDefinition.method4910(var0.id, var0.field908))) { - ParamDefinition.method4933(var0.level, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field908); + ParamDefinition.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field908); var0.delay = -1; if (var0.field903 == var0.id && var0.field903 == -1) { var0.remove(); diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index c56d7b18e7..a82d79c56d 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -80,7 +80,8 @@ public class ChatChannel { signature = "(CI)Z", garbageValue = "-1857344803" ) - public static boolean method2238(char var0) { + @Export("isCharPrintable") + public static boolean isCharPrintable(char var0) { return var0 >= ' ' && var0 <= '~' ? true : (var0 >= 160 && var0 <= 255 ? true : var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376); } @@ -317,7 +318,7 @@ public class ChatChannel { if (var0.isIf3) { if (Client.isSpellSelected) { - if (WorldComparator.method58(class1.getWidgetClickMask(var0)) && (FloorDecoration.selectedSpellFlags & 32) == 32) { + if (GrandExchangeOfferWorldComparator.method58(class1.getWidgetClickMask(var0)) && (FloorDecoration.selectedSpellFlags & 32) == 32) { Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + var0.dataText, 58, 0, var0.childIndex, var0.id); } } else { diff --git a/runescape-client/src/main/java/ClanChat.java b/runescape-client/src/main/java/ClanChat.java index 7f18f32635..8128276a66 100644 --- a/runescape-client/src/main/java/ClanChat.java +++ b/runescape-client/src/main/java/ClanChat.java @@ -165,7 +165,7 @@ public class ClanChat extends UserList { } var6 = (ClanMate)this.getByCurrentUsername(var2); - if (var6 != null && var6.world() == var3) { + if (var6 != null && var6.getWorld() == var3) { this.remove(var6); } } else { @@ -218,7 +218,7 @@ public class ClanChat extends UserList { garbageValue = "-128608554" ) final void method79(ClanMate var1) { - if (var1.username().equals(this.localUser.username())) { + if (var1.getUsername().equals(this.localUser.username())) { this.rank = var1.rank; } diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java index baf085d3fa..0888815189 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -55,7 +55,7 @@ public class ClanMate extends Buddy { ) @Export("fillIsFriend") void fillIsFriend() { - this.isFriend0 = WorldMapArea.friendSystem.friendsList.contains(super.username0) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFriend0 = WorldMapArea.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } @ObfuscatedName("w") @@ -89,6 +89,6 @@ public class ClanMate extends Buddy { ) @Export("fillIsIgnored") void fillIsIgnored() { - this.isIgnored0 = WorldMapArea.friendSystem.ignoreList.contains(super.username0) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isIgnored0 = WorldMapArea.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index be5ea4273e..77c7b0767f 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -524,7 +524,8 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedSignature( signature = "Lbj;" ) - static OwnWorldComparator field159; + @Export("geOwnWorldComparator") + static GrandExchangeOfferOwnWorldComparator geOwnWorldComparator; @ObfuscatedName("pv") static int[] field160; @ObfuscatedName("w") @@ -572,7 +573,8 @@ public final class Client extends GameShell implements Usernamed { @Export("clientType") static int clientType; @ObfuscatedName("bl") - static boolean field162; + @Export("onMobile") + static boolean onMobile; @ObfuscatedName("br") @ObfuscatedGetter( intValue = 244995961 @@ -926,7 +928,8 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 351193663 ) - static int field197; + @Export("oculusOrbSlowedSpeed") + static int oculusOrbSlowedSpeed; @ObfuscatedName("il") @ObfuscatedGetter( intValue = -1063713523 @@ -1291,7 +1294,7 @@ public final class Client extends GameShell implements Usernamed { displayFps = true; } - GroundItem.method2095(ReflectionCheck.clientPreferences.windowMode); + GroundItem.setWindowedMode(ReflectionCheck.clientPreferences.windowMode); WorldMapArea.friendSystem = new FriendSystem(KeyHandler.loginType); } @@ -1361,11 +1364,11 @@ public final class Client extends GameShell implements Usernamed { if (gameState == 0) { class171.method3497(); - class11.method145(); + GrandExchangeOfferNameComparator.method145(); } else if (gameState == 5) { class54.method1092(this); class171.method3497(); - class11.method145(); + GrandExchangeOfferNameComparator.method145(); } else if (gameState != 10 && gameState != 11) { if (gameState == 20) { class54.method1092(this); @@ -2194,7 +2197,7 @@ public final class Client extends GameShell implements Usernamed { BufferedSink.method3603(); var65 = Interpreter.method1915(ClientPacket.field298, packetWriter.isaacCipher); packetWriter.method241(var65); - class11.method145(); + GrandExchangeOfferNameComparator.method145(); } } } @@ -2262,7 +2265,7 @@ public final class Client extends GameShell implements Usernamed { } if ((gameState == 10 || gameState == 20 || gameState == 30) && field99 != 0L && class203.currentTimeMs() > field99) { - GroundItem.method2095(SpotAnimationDefinition.method4822()); + GroundItem.setWindowedMode(SpotAnimationDefinition.getWindowedMode()); } int var3; @@ -2825,10 +2828,10 @@ public final class Client extends GameShell implements Usernamed { var13 = NetCache.NetCache_responseHeaderBuffer.readInt(); long var18 = (long)(var12 + (var11 << 16)); NetFileRequest var20 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var18); - WorldComparator.field988 = true; + GrandExchangeOfferWorldComparator.field988 = true; if (var20 == null) { var20 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var18); - WorldComparator.field988 = false; + GrandExchangeOfferWorldComparator.field988 = false; } if (var20 == null) { @@ -2905,11 +2908,11 @@ public final class Client extends GameShell implements Usernamed { NetCache.NetCache_crcMismatches = 0; NetCache.NetCache_ioExceptions = 0; - ModelData0.NetCache_currentResponse.archive.write((int)(ModelData0.NetCache_currentResponse.key & 65535L), class22.NetCache_responseArchiveBuffer.array, 16711680L == (ModelData0.NetCache_currentResponse.key & 16711680L), WorldComparator.field988); + ModelData0.NetCache_currentResponse.archive.write((int)(ModelData0.NetCache_currentResponse.key & 65535L), class22.NetCache_responseArchiveBuffer.array, 16711680L == (ModelData0.NetCache_currentResponse.key & 16711680L), GrandExchangeOfferWorldComparator.field988); } ModelData0.NetCache_currentResponse.remove(); - if (WorldComparator.field988) { + if (GrandExchangeOfferWorldComparator.field988) { --NetCache.NetCache_pendingPriorityResponsesCount; } else { --NetCache.NetCache_pendingResponsesCount; @@ -3482,7 +3485,7 @@ public final class Client extends GameShell implements Usernamed { ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacket0Length); timer.method332(); WorldMapSection1.method808(); - class11.updatePlayer(var2); + GrandExchangeOfferNameComparator.updatePlayer(var2); GameObject.field359 = -1; class50.loadRegions(false, var2); packetWriter.serverPacket0 = null; @@ -3575,7 +3578,7 @@ public final class Client extends GameShell implements Usernamed { } AbstractByteArrayCopier.method4024(); - class11.updatePlayer(var2); + GrandExchangeOfferNameComparator.updatePlayer(var2); if (var5 != var2.index) { throw new RuntimeException(); } @@ -4022,8 +4025,8 @@ public final class Client extends GameShell implements Usernamed { } else if (menuOptionsCount > 0) { var4 = field205; var9 = field206; - WorldMapDecorationType.processTempMenuAction(UnitPriceComparator.tempMenuAction, var4, var9); - UnitPriceComparator.tempMenuAction = null; + WorldMapDecorationType.processTempMenuAction(GrandExchangeOfferUnitPriceComparator.tempMenuAction, var4, var9); + GrandExchangeOfferUnitPriceComparator.tempMenuAction = null; } field203 = 10; @@ -4116,17 +4119,17 @@ public final class Client extends GameShell implements Usernamed { } } - if (class11.cameraZ < var9) { - class11.cameraZ = (var9 - class11.cameraZ) * class30.field1148 / 1000 + class11.cameraZ + ClientPacket.field221; - if (class11.cameraZ > var9) { - class11.cameraZ = var9; + if (GrandExchangeOfferNameComparator.cameraZ < var9) { + GrandExchangeOfferNameComparator.cameraZ = (var9 - GrandExchangeOfferNameComparator.cameraZ) * class30.field1148 / 1000 + GrandExchangeOfferNameComparator.cameraZ + ClientPacket.field221; + if (GrandExchangeOfferNameComparator.cameraZ > var9) { + GrandExchangeOfferNameComparator.cameraZ = var9; } } - if (class11.cameraZ > var9) { - class11.cameraZ -= class30.field1148 * (class11.cameraZ - var9) / 1000 + ClientPacket.field221; - if (class11.cameraZ < var9) { - class11.cameraZ = var9; + if (GrandExchangeOfferNameComparator.cameraZ > var9) { + GrandExchangeOfferNameComparator.cameraZ -= class30.field1148 * (GrandExchangeOfferNameComparator.cameraZ - var9) / 1000 + ClientPacket.field221; + if (GrandExchangeOfferNameComparator.cameraZ < var9) { + GrandExchangeOfferNameComparator.cameraZ = var9; } } @@ -4135,7 +4138,7 @@ public final class Client extends GameShell implements Usernamed { var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - ArchiveDiskAction.field410; var11 = var4 - WorldMapSection1.cameraX; var12 = var10 - GrandExchangeEvents.cameraY; - var13 = var9 - class11.cameraZ; + var13 = var9 - GrandExchangeOfferNameComparator.cameraZ; var14 = (int)Math.sqrt((double)(var13 * var13 + var11 * var11)); var15 = (int)(Math.atan2((double)var12, (double)var14) * 325.949D) & 2047; var16 = (int)(Math.atan2((double)var11, (double)var13) * -325.949D) & 2047; @@ -4291,7 +4294,7 @@ public final class Client extends GameShell implements Usernamed { if (ReflectionCheck.clientPreferences != null) { try { Client var3 = TextureProvider.client; - Object[] var4 = new Object[]{SpotAnimationDefinition.method4822()}; + Object[] var4 = new Object[]{SpotAnimationDefinition.getWindowedMode()}; JSObject.getWindow(var3).call("resize", var4); } catch (Throwable var5) { } @@ -4583,8 +4586,8 @@ public final class Client extends GameShell implements Usernamed { class30.field1148 = var3.readUnsignedByte(); if (class30.field1148 >= 100) { WorldMapSection1.cameraX = class3.field1146 * 128 + 64; - class11.cameraZ = MusicPatchPcmStream.field602 * 128 + 64; - GrandExchangeEvents.cameraY = class32.getTileHeight(WorldMapSection1.cameraX, class11.cameraZ, SoundSystem.plane) - AbstractWorldMapIcon.field4; + GrandExchangeOfferNameComparator.cameraZ = MusicPatchPcmStream.field602 * 128 + 64; + GrandExchangeEvents.cameraY = class32.getTileHeight(WorldMapSection1.cameraX, GrandExchangeOfferNameComparator.cameraZ, SoundSystem.plane) - AbstractWorldMapIcon.field4; } var1.serverPacket0 = null; @@ -4716,7 +4719,7 @@ public final class Client extends GameShell implements Usernamed { class22.method295(var8); } - class12.method159(); + GrandExchangeOfferAgeComparator.method159(); field116[++field117 - 1 & 31] = var6 & 32767; var1.serverPacket0 = null; return true; @@ -4806,7 +4809,7 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field849 == var1.serverPacket0) { - class12.method159(); + GrandExchangeOfferAgeComparator.method159(); runEnergy = var3.readUnsignedByte(); field124 = cycleCntr; var1.serverPacket0 = null; @@ -5119,7 +5122,7 @@ public final class Client extends GameShell implements Usernamed { } } - class12.method159(); + GrandExchangeOfferAgeComparator.method159(); field123 += 32; var1.serverPacket0 = null; return true; @@ -5159,7 +5162,7 @@ public final class Client extends GameShell implements Usernamed { class22.method295(var8); } - class12.method159(); + GrandExchangeOfferAgeComparator.method159(); field116[++field117 - 1 & 31] = var6 & 32767; var1.serverPacket0 = null; return true; @@ -5330,7 +5333,7 @@ public final class Client extends GameShell implements Usernamed { } for (PendingSpawn var46 = (PendingSpawn)pendingSpawns.last(); var46 != null; var46 = (PendingSpawn)pendingSpawns.previous()) { - if (var46.x >= WorldMapSection3.field1089 && var46.x < WorldMapSection3.field1089 + 8 && var46.y >= Canvas.field95 && var46.y < Canvas.field95 + 8 && var46.level == SoundSystem.plane) { + if (var46.x >= WorldMapSection3.field1089 && var46.x < WorldMapSection3.field1089 + 8 && var46.y >= Canvas.field95 && var46.y < Canvas.field95 + 8 && var46.plane == SoundSystem.plane) { var46.hitpoints = 0; } } @@ -5449,7 +5452,7 @@ public final class Client extends GameShell implements Usernamed { var5 = class32.getTileHeight(var38, var6, SoundSystem.plane) - ArchiveDiskAction.field410; var10 = var38 - WorldMapSection1.cameraX; var11 = var5 - GrandExchangeEvents.cameraY; - var12 = var6 - class11.cameraZ; + var12 = var6 - GrandExchangeOfferNameComparator.cameraZ; var13 = (int)Math.sqrt((double)(var12 * var12 + var10 * var10)); WorldMapIcon1.cameraPitch = (int)(Math.atan2((double)var11, (double)var13) * 325.949D) & 2047; MusicPatchNode.cameraYaw = (int)(Math.atan2((double)var10, (double)var12) * -325.949D) & 2047; @@ -5508,7 +5511,7 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field811 == var1.serverPacket0) { - class12.method159(); + GrandExchangeOfferAgeComparator.method159(); var38 = var3.method71(); var6 = var3.readUnsignedByteNegate(); var5 = var3.readUnsignedByte(); @@ -5542,7 +5545,7 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field860 == var1.serverPacket0) { - class12.method159(); + GrandExchangeOfferAgeComparator.method159(); weight = var3.method44(); field124 = cycleCntr; var1.serverPacket0 = null; @@ -5979,8 +5982,8 @@ public final class Client extends GameShell implements Usernamed { if (DevicePcmPlayerProvider.dragInventoryWidget != null && !field207 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { var11 = field205; var7 = field206; - WorldMapDecorationType.processTempMenuAction(UnitPriceComparator.tempMenuAction, var11, var7); - UnitPriceComparator.tempMenuAction = null; + WorldMapDecorationType.processTempMenuAction(GrandExchangeOfferUnitPriceComparator.tempMenuAction, var11, var7); + GrandExchangeOfferUnitPriceComparator.tempMenuAction = null; } field207 = false; @@ -5994,12 +5997,12 @@ public final class Client extends GameShell implements Usernamed { field205 = MouseHandler.MouseHandler_lastPressedX; field206 = MouseHandler.MouseHandler_lastPressedY; if (var2 >= 0) { - UnitPriceComparator.tempMenuAction = new MenuAction(); - UnitPriceComparator.tempMenuAction.argument1 = menuArguments1[var2]; - UnitPriceComparator.tempMenuAction.argument2 = menuArguments2[var2]; - UnitPriceComparator.tempMenuAction.opcode = menuOpcodes[var2]; - UnitPriceComparator.tempMenuAction.argument0 = menuArguments0[var2]; - UnitPriceComparator.tempMenuAction.action = menuActions[var2]; + GrandExchangeOfferUnitPriceComparator.tempMenuAction = new MenuAction(); + GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument1 = menuArguments1[var2]; + GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument2 = menuArguments2[var2]; + GrandExchangeOfferUnitPriceComparator.tempMenuAction.opcode = menuOpcodes[var2]; + GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument0 = menuArguments0[var2]; + GrandExchangeOfferUnitPriceComparator.tempMenuAction.action = menuActions[var2]; } class22.method295(DevicePcmPlayerProvider.dragInventoryWidget); @@ -6214,8 +6217,8 @@ public final class Client extends GameShell implements Usernamed { } else if (menuOptionsCount > 0) { int var10 = widgetClickX + field110; var9 = widgetClickY + field111; - WorldMapDecorationType.processTempMenuAction(UnitPriceComparator.tempMenuAction, var10, var9); - UnitPriceComparator.tempMenuAction = null; + WorldMapDecorationType.processTempMenuAction(GrandExchangeOfferUnitPriceComparator.tempMenuAction, var10, var9); + GrandExchangeOfferUnitPriceComparator.tempMenuAction = null; } clickedWidget = null; @@ -6271,7 +6274,7 @@ public final class Client extends GameShell implements Usernamed { isLowDetail = false; language = 0; clientType = -1; - field162 = false; + onMobile = false; gameState = 0; isLoading = true; cycle = 0; @@ -6343,7 +6346,7 @@ public final class Client extends GameShell implements Usernamed { field195 = 0; field196 = 0; oculusOrbNormalSpeed = 12; - field197 = 6; + oculusOrbSlowedSpeed = 6; field198 = 0; field199 = false; field200 = 0; @@ -6530,7 +6533,7 @@ public final class Client extends GameShell implements Usernamed { field120 = -1; platformInfoProvider = new DesktopPlatformInfoProvider(); grandExchangeOffers = new GrandExchangeOffer[8]; - field159 = new OwnWorldComparator(); + geOwnWorldComparator = new GrandExchangeOfferOwnWorldComparator(); field104 = -1; archiveLoaders = new ArrayList(10); archiveLoaderArchive = 0; diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index b7e3bb5c1a..b50902a475 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -67,8 +67,8 @@ public class Coord { signature = "(Lhu;B)Z", garbageValue = "-1" ) - @Export("equals0") - boolean equals0(Coord other) { + @Export("equalsCoord") + boolean equalsCoord(Coord other) { return this.plane != other.plane ? false : (this.x != other.x ? false : this.y == other.y); } @@ -77,23 +77,20 @@ public class Coord { signature = "(Ljava/lang/String;I)Ljava/lang/String;", garbageValue = "997364398" ) - @Export("toString0") - String toString0(String separator) { + @Export("toString") + String toString(String separator) { return this.plane + separator + (this.x >> 6) + separator + (this.y >> 6) + separator + (this.x & 63) + separator + (this.y & 63); } - @ObfuscatedName("equals") - public boolean method326(Object var1) { - return this == var1 ? true : (!(var1 instanceof Coord) ? false : this.equals0((Coord)var1)); + public boolean equals(Object var1) { + return this == var1 ? true : (!(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1)); } - @ObfuscatedName("hashCode") - public int method327() { + public int hashCode() { return this.packed(); } - @ObfuscatedName("toString") - public String method328() { - return this.toString0(","); + public String toString() { + return this.toString(","); } } diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index e85a8da5ee..4ced5dafce 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -184,7 +184,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { if (var1 != -1412584499 && !var10.isScrollBar) { class279.field1145 = var0; class54.field1161 = var6; - class157.field1114 = var7; + BuddyRankComparator.field1114 = var7; continue; } @@ -344,7 +344,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { if (Client.isResizable || Client.field101[var11] || Client.gameDrawingMode > 1) { if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { - class11.method148(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); + GrandExchangeOfferNameComparator.method148(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); } if (var10.type != 1) { diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index 6c1b90c9e2..ad287bbc64 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -237,7 +237,7 @@ public class DynamicObject extends Entity { var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; PacketBufferNode var12 = Interpreter.method1915(ClientPacket.field260, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeByte(WorldMapRegion.method550(var3) + 2); + var12.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var3) + 2); var12.packetBuffer.writeStringCp1252NullTerminated(var3); var12.packetBuffer.writeByte(var4 - 1); var12.packetBuffer.writeByte(var5); @@ -446,7 +446,7 @@ public class DynamicObject extends Entity { return 1; } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class12.method161(var5); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.method161(var5); return 1; } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; @@ -628,7 +628,7 @@ public class DynamicObject extends Entity { Client.soundEffectCount = 0; Client.isCameraLocked = false; WorldMapSection1.cameraX -= var5 << 7; - class11.cameraZ -= var6 << 7; + GrandExchangeOfferNameComparator.cameraZ -= var6 << 7; MouseHandler.oculusOrbFocalPointX -= var5 << 7; ScriptEvent.oculusOrbFocalPointY -= var6 << 7; Client.field125 = -1; diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java index 865938be90..a2cfb61b8c 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -41,7 +41,7 @@ public class FaceNormal { garbageValue = "-1788849120" ) static Script method3236(int var0, int var1, int var2) { - int var3 = UnitPriceComparator.method125(var1, var0); + int var3 = GrandExchangeOfferUnitPriceComparator.method125(var1, var0); Script var4 = InterfaceParent.method1175(var3, var0); if (var4 != null) { return var4; diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 0fdb4f9aff..b942a26fd2 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -85,7 +85,7 @@ public class FontName { ) static final void method5638(String var0, int var1) { PacketBufferNode var2 = Interpreter.method1915(ClientPacket.field299, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeByte(WorldMapRegion.method550(var0) + 1); + var2.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var0) + 1); var2.packetBuffer.writeStringCp1252NullTerminated(var0); var2.packetBuffer.writeByte(var1); Client.packetWriter.method241(var2); @@ -113,8 +113,8 @@ public class FontName { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) { Friend var6 = (Friend)WorldMapArea.friendSystem.friendsList.get(var3); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.name(); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.previousName(); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.getName(); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.getPreviousName(); } else { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; @@ -124,7 +124,7 @@ public class FontName { } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)WorldMapArea.friendSystem.friendsList.get(var3)).world0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)WorldMapArea.friendSystem.friendsList.get(var3)).world; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } @@ -186,7 +186,7 @@ public class FontName { } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { 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(); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketWriter.clanChat.get(var3).getUsername().getName(); } else { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } @@ -195,7 +195,7 @@ public class FontName { } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)PacketWriter.clanChat.get(var3)).world(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)PacketWriter.clanChat.get(var3)).getWorld(); } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } @@ -215,7 +215,7 @@ public class FontName { return 1; } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - ArchiveDiskActionHandler.method4655(var4); + ArchiveDiskActionHandler.clanKickUser(var4); return 1; } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null ? PacketWriter.clanChat.rank : 0; @@ -225,7 +225,7 @@ public class FontName { class31.method574(var4); return 1; } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { - class12.method158(); + GrandExchangeOfferAgeComparator.method158(); return 1; } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { if (!WorldMapArea.friendSystem.method99()) { @@ -239,8 +239,8 @@ public class FontName { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.ignoreList.size()) { Ignored var7 = (Ignored)WorldMapArea.friendSystem.ignoreList.get(var3); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.name(); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.previousName(); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.getName(); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.getPreviousName(); } else { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; @@ -254,7 +254,7 @@ public class FontName { return 1; } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && PacketWriter.clanChat.get(var3).username().equals(Canvas.localPlayer.username)) { + if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && PacketWriter.clanChat.get(var3).getUsername().equals(Canvas.localPlayer.username)) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; @@ -425,12 +425,12 @@ public class FontName { return 1; } else if (var0 == 3656) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - WorldMapArea.friendSystem.friendsList.addComparator(new class157(var5)); + WorldMapArea.friendSystem.friendsList.addComparator(new BuddyRankComparator(var5)); return 1; } else if (var0 == 3657) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if (PacketWriter.clanChat != null) { - PacketWriter.clanChat.addComparator(new class157(var5)); + PacketWriter.clanChat.addComparator(new BuddyRankComparator(var5)); } return 1; @@ -471,11 +471,11 @@ public class FontName { VarpDefinition.VarpDefinition_cached.clear(); GrandExchangeEvents.method69(); Buffer.clearHealthbarCaches(); - StructDefinition.field886.clear(); + StructDefinition.StructDefinition_cached.clear(); InvDefinition.method4754(); Projectile.method2089(); PlayerAppearance.PlayerAppearance_cachedModels.clear(); - class157.method3382(); + BuddyRankComparator.method3382(); ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); Script.Script_cached.clear(); AbstractArchive.archive0.method8(); diff --git a/runescape-client/src/main/java/Formatting.java b/runescape-client/src/main/java/Formatting.java index 82103defdf..e70709cc5a 100644 --- a/runescape-client/src/main/java/Formatting.java +++ b/runescape-client/src/main/java/Formatting.java @@ -22,7 +22,7 @@ public class Formatting { garbageValue = "1654486766" ) static int method2023(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + Widget var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemId; return 1; diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index f1014670d3..4203d642d2 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -20,9 +20,9 @@ public class Friend extends Buddy { signature = "(Lkq;I)I", garbageValue = "-1559116693" ) - @Export("compareTo00") - int compareTo00(Friend other) { - return super.world0 == Client.worldId && Client.worldId != other.world0 ? -1 : (Client.worldId == other.world0 && super.world0 != Client.worldId ? 1 : (super.world0 != 0 && other.world0 == 0 ? -1 : (other.world0 != 0 && super.world0 == 0 ? 1 : (this.field354 && !other.field354 ? -1 : (!this.field354 && other.field354 ? 1 : (this.field355 && !other.field355 ? -1 : (!this.field355 && other.field355 ? 1 : (super.world0 != 0 ? super.int2 - other.int2 : other.int2 - super.int2)))))))); + @Export("compareToFriend") + int compareToFriend(Friend other) { + return super.world == Client.worldId && Client.worldId != other.world ? -1 : (Client.worldId == other.world && super.world != Client.worldId ? 1 : (super.world != 0 && other.world == 0 ? -1 : (other.world != 0 && super.world == 0 ? 1 : (this.field354 && !other.field354 ? -1 : (!this.field354 && other.field354 ? 1 : (this.field355 && !other.field355 ? -1 : (!this.field355 && other.field355 ? 1 : (super.world != 0 ? super.int2 - other.int2 : other.int2 - super.int2)))))))); } @ObfuscatedName("aj") @@ -30,12 +30,12 @@ public class Friend extends Buddy { signature = "(Ljs;I)I", garbageValue = "1627362569" ) - public int compareTo0(User var1) { - return this.compareTo00((Friend)var1); + @Export("compareToUser") + public int compareToUser(User var1) { + return this.compareToFriend((Friend)var1); } - @ObfuscatedName("compareTo") public int compareTo(Object var1) { - return this.compareTo00((Friend)var1); + return this.compareToFriend((Friend)var1); } } diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index aa0076fd7f..c4d48244db 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -161,7 +161,7 @@ public class FriendSystem { WorldMapIcon1.addGameMessage(30, "", var4); } else { PacketBufferNode var6 = Interpreter.method1915(ClientPacket.field310, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeByte(WorldMapRegion.method550(var1)); + var6.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var1)); var6.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.method241(var6); } @@ -214,7 +214,7 @@ public class FriendSystem { WorldMapIcon1.addGameMessage(30, "", var4); } else { var5 = Interpreter.method1915(ClientPacket.field312, Client.packetWriter.isaacCipher); - var5.packetBuffer.writeByte(WorldMapRegion.method550(var1)); + var5.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var1)); var5.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.method241(var5); } @@ -247,7 +247,7 @@ public class FriendSystem { if (this.friendsList.removeByUsername(var2)) { WorldMapManager.method668(); PacketBufferNode var3 = Interpreter.method1915(ClientPacket.field276, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(WorldMapRegion.method550(name)); + var3.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(name)); var3.packetBuffer.writeStringCp1252NullTerminated(name); Client.packetWriter.method241(var3); } @@ -271,7 +271,7 @@ public class FriendSystem { if (this.ignoreList.removeByUsername(var2)) { WorldMapManager.method668(); PacketBufferNode var3 = Interpreter.method1915(ClientPacket.field250, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(WorldMapRegion.method550(name)); + var3.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(name)); var3.packetBuffer.writeStringCp1252NullTerminated(name); Client.packetWriter.method241(var3); } @@ -304,18 +304,18 @@ public class FriendSystem { var0 -= 1000; var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); } else { - var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; } if (var0 == ScriptOpcodes.CC_CALLONRESIZE) { if (Interpreter.field425 >= 10) { throw new RuntimeException(); - } else if (var3.field975 == null) { + } else if (var3.onResize == null) { return 0; } else { ScriptEvent var4 = new ScriptEvent(); var4.widget = var3; - var4.args0 = var3.field975; + var4.args0 = var3.onResize; var4.field772 = Interpreter.field425 + 1; Client.scriptEvents.addFirst(var4); return 1; diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index 61a36b680b..c9fbb3601f 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -63,7 +63,7 @@ public class FriendsList extends UserList { @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { Friend var3 = (Friend)this.getByUsername(var1); - return var3 != null && (!var2 || var3.world0 != 0); + return var3 != null && (!var2 || var3.world != 0); } @ObfuscatedName("x") @@ -105,7 +105,7 @@ public class FriendsList extends UserList { if (var11 != null) { this.changeName(var11, var4, var5); - if (var6 != var11.world0) { + if (var6 != var11.world) { boolean var14 = true; for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) { @@ -132,13 +132,13 @@ public class FriendsList extends UserList { var11 = (Friend)this.addLast(var4, var5); } - if (var6 != var11.world0) { + if (var6 != var11.world) { var11.int2 = ++this.field358 - 1; - if (var11.world0 == -1 && var6 == 0) { + if (var11.world == -1 && var6 == 0) { var11.int2 = -(var11.int2 * -1377538447) * 120689297; } - var11.world0 = var6; + var11.world = var6; } var11.rank = var7; diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index 5bc595148e..4ca3e00005 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -869,8 +869,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene ) protected abstract void vmethod114(); - @ObfuscatedName("destroy") - public final void method115() { + public final void destroy() { if (this == gameShell && !isKilled) { stopTimeMs = class203.currentTimeMs(); class203.method4010(5000L); @@ -879,8 +878,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } - @Export("paint") - @ObfuscatedName("paint") public final synchronized void paint(Graphics var1) { if (this == gameShell && !isKilled) { this.field369 = true; @@ -894,8 +891,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } - @Export("run") - @ObfuscatedName("run") public void run() { try { if (TaskHandler.javaVendor != null) { @@ -909,7 +904,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene if (var2.startsWith("1.6.0_")) { int var3; - for (var3 = 6; var3 < var2.length() && class159.method3394(var2.charAt(var3)); ++var3) { + for (var3 = 6; var3 < var2.length() && class159.isCharDigit(var2.charAt(var3)); ++var3) { } String var4 = var2.substring(6, var3); @@ -954,76 +949,53 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.kill(); } - @ObfuscatedName("start") - public final void method116() { + public final void start() { if (this == gameShell && !isKilled) { stopTimeMs = 0L; } } - @Export("update") - @ObfuscatedName("update") public final void update(Graphics var1) { this.paint(var1); } - @Export("focusGained") - @ObfuscatedName("focusGained") public final void focusGained(FocusEvent var1) { hasFocus = true; this.field369 = true; } - @Export("windowActivated") - @ObfuscatedName("windowActivated") public final void windowActivated(WindowEvent var1) { } - @Export("windowClosed") - @ObfuscatedName("windowClosed") public final void windowClosed(WindowEvent var1) { } - @Export("windowClosing") - @ObfuscatedName("windowClosing") public final void windowClosing(WindowEvent var1) { - this.method115(); + this.destroy(); } - @Export("windowDeiconified") - @ObfuscatedName("windowDeiconified") public final void windowDeiconified(WindowEvent var1) { } - @Export("windowOpened") - @ObfuscatedName("windowOpened") public final void windowOpened(WindowEvent var1) { } - @ObfuscatedName("postDecode") public abstract void init(); - @ObfuscatedName("stop") - public final void method118() { + public final void stop() { if (this == gameShell && !isKilled) { stopTimeMs = class203.currentTimeMs() + 4000L; } } - @Export("windowIconified") - @ObfuscatedName("windowIconified") public final void windowIconified(WindowEvent var1) { } - @Export("windowDeactivated") - @ObfuscatedName("windowDeactivated") public final void windowDeactivated(WindowEvent var1) { } - @Export("focusLost") - @ObfuscatedName("focusLost") public final void focusLost(FocusEvent var1) { hasFocus = false; } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index 4c177ca8ea..14ad28bf74 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -26,18 +26,18 @@ public class GrandExchangeEvent { @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; @ObfuscatedName("w") - @Export("string1") - String string1; + @Export("offerName") + String offerName; @ObfuscatedName("o") - @Export("string2") - String string2; + @Export("previousOfferName") + String previousOfferName; @ObfuscatedSignature( signature = "(Lgr;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { - this.string1 = var1.readStringCp1252NullTerminated(); - this.string2 = var1.readStringCp1252NullTerminated(); + this.offerName = var1.readStringCp1252NullTerminated(); + this.previousOfferName = var1.readStringCp1252NullTerminated(); this.world = var1.readUnsignedShort(); this.field370 = var1.readLong(); int var4 = var1.readInt(); @@ -57,8 +57,9 @@ public class GrandExchangeEvent { signature = "(I)Ljava/lang/String;", garbageValue = "1672323214" ) - public String method119() { - return this.string1; + @Export("getOfferName") + public String getOfferName() { + return this.offerName; } @ObfuscatedName("f") @@ -66,8 +67,9 @@ public class GrandExchangeEvent { signature = "(I)Ljava/lang/String;", garbageValue = "-271438207" ) - public String method120() { - return this.string2; + @Export("getPreviousOfferName") + public String getPreviousOfferName() { + return this.previousOfferName; } @ObfuscatedName("f") @@ -80,7 +82,7 @@ public class GrandExchangeEvent { Object[] var2 = scriptEvent.args0; Script var3; int var4; - if (class12.method162(scriptEvent.type0)) { + if (GrandExchangeOfferAgeComparator.method162(scriptEvent.type0)) { class15.worldMapEvent = (WorldMapEvent)var2[0]; WorldMapElement var5 = ViewportMouse.getWorldMapElement(class15.worldMapEvent.mapElement); var3 = FaceNormal.method3236(scriptEvent.type0, var5.field1020, var5.category); diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index 4399ec11f2..8043c86470 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -13,13 +13,17 @@ import net.runelite.rs.ScriptOpcodes; @Implements("GrandExchangeEvents") public class GrandExchangeEvents { @ObfuscatedName("f") - public static Comparator field371; + @Export("geAgeComparator") + public static Comparator geAgeComparator; @ObfuscatedName("q") - public static Comparator field372; + @Export("geUnitPriceComparator") + public static Comparator geUnitPriceComparator; @ObfuscatedName("w") - public static Comparator field373; + @Export("geItemNameComparator") + public static Comparator geItemNameComparator; @ObfuscatedName("o") - public static Comparator field374; + @Export("geTotalQuantityComparator") + public static Comparator geTotalQuantityComparator; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -1605454211 @@ -173,10 +177,10 @@ public class GrandExchangeEvents { } static { - field371 = new class12(); - new WorldComparator(); - field372 = new UnitPriceComparator(); - field373 = new class11(); - field374 = new TotalQuantityComparator(); + geAgeComparator = new GrandExchangeOfferAgeComparator(); + new GrandExchangeOfferWorldComparator(); + geUnitPriceComparator = new GrandExchangeOfferUnitPriceComparator(); + geItemNameComparator = new GrandExchangeOfferNameComparator(); + geTotalQuantityComparator = new GrandExchangeOfferTotalQuantityComparator(); } } diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java similarity index 91% rename from runescape-client/src/main/java/class12.java rename to runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index dbe1615663..6a0f456579 100644 --- a/runescape-client/src/main/java/class12.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -1,9 +1,12 @@ import java.util.Comparator; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("n") -final class class12 implements Comparator { +@Implements("GrandExchangeOfferAgeComparator") +final class GrandExchangeOfferAgeComparator implements Comparator { @ObfuscatedName("n") @ObfuscatedSignature( signature = "Lho;" @@ -15,7 +18,8 @@ final class class12 implements Comparator { signature = "(Ll;Ll;B)I", garbageValue = "-86" ) - int method149(GrandExchangeEvent var1, GrandExchangeEvent var2) { + @Export("compareTyped") + int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.field370 < var2.field370 ? -1 : (var1.field370 == var2.field370 ? 0 : 1); } @@ -24,7 +28,7 @@ final class class12 implements Comparator { } public int compare(Object var1, Object var2) { - return this.method149((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java similarity index 95% rename from runescape-client/src/main/java/class11.java rename to runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index 71ec0bf799..41dae69c39 100644 --- a/runescape-client/src/main/java/class11.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -1,12 +1,14 @@ import java.util.Comparator; import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("k") -final class class11 implements Comparator { +@Implements("GrandExchangeOfferNameComparator") +final class GrandExchangeOfferNameComparator implements Comparator { @ObfuscatedName("hl") @ObfuscatedGetter( intValue = -1945589829 @@ -19,8 +21,9 @@ final class class11 implements Comparator { signature = "(Ll;Ll;B)I", garbageValue = "1" ) - int method138(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.method119().compareTo(var2.method119()); + @Export("compareTyped") + int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) { + return var1.getOfferName().compareTo(var2.getOfferName()); } public boolean equals(Object var1) { @@ -28,7 +31,7 @@ final class class11 implements Comparator { } public int compare(Object var1, Object var2) { - return this.method138((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } @ObfuscatedName("m") @@ -88,7 +91,7 @@ final class class11 implements Comparator { var0 -= 1000; var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); } else { - var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; } String var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; @@ -181,7 +184,7 @@ final class class11 implements Comparator { return 2; } - var3.field975 = var8; + var3.onResize = var8; } var3.hasListener = true; diff --git a/runescape-client/src/main/java/OwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java similarity index 84% rename from runescape-client/src/main/java/OwnWorldComparator.java rename to runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index 6066ee60cd..b7a541aaf0 100644 --- a/runescape-client/src/main/java/OwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -6,21 +6,23 @@ import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("bj") -@Implements("OwnWorldComparator") -public class OwnWorldComparator implements Comparator { +@Implements("GrandExchangeOfferOwnWorldComparator") +public class GrandExchangeOfferOwnWorldComparator implements Comparator { @ObfuscatedName("m") - boolean field666; + @Export("compareOwnWorld") + boolean compareOwnWorld; @ObfuscatedName("m") @ObfuscatedSignature( signature = "(Ll;Ll;B)I", garbageValue = "21" ) - int method234(GrandExchangeEvent var1, GrandExchangeEvent var2) { + @Export("compareTyped") + int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) { if (var2.world == var1.world) { return 0; } else { - if (this.field666) { + if (this.compareOwnWorld) { if (Client.worldId == var1.world) { return -1; } @@ -34,15 +36,12 @@ public class OwnWorldComparator implements Comparator { } } - @ObfuscatedName("equals") - public boolean method235(Object var1) { + public boolean equals(Object var1) { return super.equals(var1); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method234((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } @ObfuscatedName("al") diff --git a/runescape-client/src/main/java/TotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java similarity index 95% rename from runescape-client/src/main/java/TotalQuantityComparator.java rename to runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index db2a9b6f2d..4b32d87fec 100644 --- a/runescape-client/src/main/java/TotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -5,25 +5,23 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("e") -@Implements("TotalQuantityComparator") -final class TotalQuantityComparator implements Comparator { +@Implements("GrandExchangeOfferTotalQuantityComparator") +final class GrandExchangeOfferTotalQuantityComparator implements Comparator { @ObfuscatedName("m") @ObfuscatedSignature( signature = "(Ll;Ll;I)I", garbageValue = "-573736433" ) - int method335(GrandExchangeEvent var1, GrandExchangeEvent var2) { + @Export("compareTyped") + int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity ? -1 : (var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity ? 0 : 1); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method335((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @ObfuscatedName("equals") - public boolean method336(Object var1) { + public boolean equals(Object var1) { return super.equals(var1); } diff --git a/runescape-client/src/main/java/UnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java similarity index 91% rename from runescape-client/src/main/java/UnitPriceComparator.java rename to runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index 1ebfa9ecc5..924dc0bdbc 100644 --- a/runescape-client/src/main/java/UnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("d") -@Implements("UnitPriceComparator") -final class UnitPriceComparator implements Comparator { +@Implements("GrandExchangeOfferUnitPriceComparator") +final class GrandExchangeOfferUnitPriceComparator implements Comparator { @ObfuscatedName("gz") @ObfuscatedSignature( signature = "Lln;" @@ -25,18 +25,16 @@ final class UnitPriceComparator implements Comparator { signature = "(Ll;Ll;I)I", garbageValue = "-120071238" ) - int method337(GrandExchangeEvent var1, GrandExchangeEvent var2) { + @Export("compareTyped") + int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice ? -1 : (var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice ? 0 : 1); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method337((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @ObfuscatedName("equals") - public boolean method338(Object var1) { + public boolean equals(Object var1) { return super.equals(var1); } @@ -45,7 +43,8 @@ final class UnitPriceComparator implements Comparator { signature = "(Lir;B)V", garbageValue = "23" ) - public static void method135(AbstractArchive var0) { + @Export("setVarbitDefinitionArchive") + public static void setVarbitDefinitionArchive(AbstractArchive var0) { VarbitDefinition.VarbitDefinition_archive = var0; } @@ -85,7 +84,7 @@ final class UnitPriceComparator implements Comparator { } int var3 = WorldMapSection1.cameraX >> 7; - int var4 = class11.cameraZ >> 7; + int var4 = GrandExchangeOfferNameComparator.cameraZ >> 7; if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { return SoundSystem.plane; } diff --git a/runescape-client/src/main/java/WorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java similarity index 95% rename from runescape-client/src/main/java/WorldComparator.java rename to runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index 5a9fd666ae..fe2abac0ab 100644 --- a/runescape-client/src/main/java/WorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -6,8 +6,8 @@ import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("u") -@Implements("WorldComparator") -final class WorldComparator implements Comparator { +@Implements("GrandExchangeOfferWorldComparator") +final class GrandExchangeOfferWorldComparator implements Comparator { @ObfuscatedName("n") public static boolean field988; @@ -16,18 +16,16 @@ final class WorldComparator implements Comparator { signature = "(Ll;Ll;I)I", garbageValue = "707844889" ) - int method358(GrandExchangeEvent var1, GrandExchangeEvent var2) { + @Export("compareTyped") + int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method358((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @ObfuscatedName("equals") - public boolean method359(Object var1) { + public boolean equals(Object var1) { return super.equals(var1); } diff --git a/runescape-client/src/main/java/GroundItem.java b/runescape-client/src/main/java/GroundItem.java index 076a89f0e3..a54b76c5bd 100644 --- a/runescape-client/src/main/java/GroundItem.java +++ b/runescape-client/src/main/java/GroundItem.java @@ -47,7 +47,8 @@ public final class GroundItem extends Entity { signature = "(II)V", garbageValue = "411352848" ) - static void method2095(int var0) { + @Export("setWindowedMode") + static void setWindowedMode(int var0) { Client.field99 = 0L; if (var0 >= 2) { Client.isResizable = true; @@ -55,7 +56,7 @@ public final class GroundItem extends Entity { Client.isResizable = false; } - if (SpotAnimationDefinition.method4822() == 1) { + if (SpotAnimationDefinition.getWindowedMode() == 1) { TextureProvider.client.setMaxCanvasSize(765, 503); } else { TextureProvider.client.setMaxCanvasSize(7680, 2160); diff --git a/runescape-client/src/main/java/GzipDecompressor.java b/runescape-client/src/main/java/GzipDecompressor.java index f44d3f8c94..2907038b9f 100644 --- a/runescape-client/src/main/java/GzipDecompressor.java +++ b/runescape-client/src/main/java/GzipDecompressor.java @@ -55,19 +55,20 @@ public class GzipDecompressor { signature = "(II)Ljq;", garbageValue = "-1060388349" ) - public static StructDefinition method3702(int var0) { - StructDefinition var1 = (StructDefinition)StructDefinition.field886.get((long)var0); + @Export("getStructDefinition") + public static StructDefinition getStructDefinition(int var0) { + StructDefinition var1 = (StructDefinition)StructDefinition.StructDefinition_cached.get((long)var0); if (var1 != null) { return var1; } else { - byte[] var2 = StructDefinition.field885.takeFile(34, var0); + byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0); var1 = new StructDefinition(); if (var2 != null) { var1.decode(new Buffer(var2)); } var1.postDecode(); - StructDefinition.field886.put(var1, (long)var0); + StructDefinition.StructDefinition_cached.put(var1, (long)var0); return var1; } } diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index fef97e5777..b716e2a1c0 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -21,8 +21,8 @@ public class Ignored extends User { signature = "(Lks;I)I", garbageValue = "-842469150" ) - @Export("compareTo00") - int compareTo00(Ignored other) { + @Export("compareToIgnored") + int compareToIgnored(Ignored other) { return this.id - other.id; } @@ -31,13 +31,13 @@ public class Ignored extends User { signature = "(Ljs;I)I", garbageValue = "1627362569" ) - public int compareTo0(User var1) { - return this.compareTo00((Ignored)var1); + @Export("compareToUser") + public int compareToUser(User var1) { + return this.compareToIgnored((Ignored)var1); } - @ObfuscatedName("compareTo") public int compareTo(Object var1) { - return this.compareTo00((Ignored)var1); + return this.compareToIgnored((Ignored)var1); } @ObfuscatedName("fv") diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index 328d7db1b9..26455786ac 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -191,7 +191,7 @@ public class Interpreter { class279.field1145 = null; DevicePcmPlayerProvider.drawInterface(Widget.interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); if (class279.field1145 != null) { - DevicePcmPlayerProvider.drawInterface(class279.field1145, -1412584499, var1, var2, var3, var4, class54.field1161, class157.field1114, var7); + DevicePcmPlayerProvider.drawInterface(class279.field1145, -1412584499, var1, var2, var3, var4, class54.field1161, BuddyRankComparator.field1114, var7); class279.field1145 = null; } } else if (var7 != -1) { diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index 032efe9275..b7c0bfef42 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -263,7 +263,7 @@ public final class IsaacCipher { } else if (var0 == 5) { Login.field467 = 2; class54.method1089("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); - } else if (var0 != 68 && (Client.field162 || var0 != 6)) { + } else if (var0 != 68 && (Client.onMobile || var0 != 6)) { if (var0 == 7) { class54.method1089("This world is full.", "Please use a different world.", ""); } else if (var0 == 8) { diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 75aa7d03e9..ef1fbe61a1 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -205,8 +205,8 @@ public class Login { if (ReflectionCheck.clientPreferences.roofsHidden) { return SoundSystem.plane; } else { - int var0 = class32.getTileHeight(WorldMapSection1.cameraX, class11.cameraZ, SoundSystem.plane); - return var0 - GrandExchangeEvents.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.plane][WorldMapSection1.cameraX >> 7][class11.cameraZ >> 7] & 4) != 0 ? SoundSystem.plane : 3; + int var0 = class32.getTileHeight(WorldMapSection1.cameraX, GrandExchangeOfferNameComparator.cameraZ, SoundSystem.plane); + return var0 - GrandExchangeEvents.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.plane][WorldMapSection1.cameraX >> 7][GrandExchangeOfferNameComparator.cameraZ >> 7] & 4) != 0 ? SoundSystem.plane : 3; } } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index bf939fbb2d..6171060b16 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -510,7 +510,7 @@ public class LoginScreenAnimation { Varps.method4400(var5); var5.writeLong(var3.nextLong()); var5.encryptRsa(class80.field1163, class80.field1164); - var7 = WorldMapRegion.method550(var2); + var7 = WorldMapRegion.stringCp1252NullTerminatedByteSize(var2); if (var7 % 8 != 0) { var7 += 8 - var7 % 8; } diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index b7bff3b2b6..88c8325bc5 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -73,8 +72,6 @@ public class LoginType { this.field489 = var4; } - @ObfuscatedName("toString") - @Export("toString") public String toString() { return this.field489; } diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java index 8ecb60c956..e7abdefd73 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -233,6 +233,7 @@ public class MidiPcmStream extends PcmStream { } @ObfuscatedName("e") + @Export("fill") protected synchronized void fill(int[] var1, int var2, int var3) { if (this.midiFile.isReady()) { int var4 = this.midiFile.division * this.field496 / class309.PcmPlayer_sampleRate; @@ -281,6 +282,7 @@ public class MidiPcmStream extends PcmStream { } @ObfuscatedName("d") + @Export("skip") protected synchronized void skip(int var1) { if (this.midiFile.isReady()) { int var2 = this.midiFile.division * this.field496 / class309.PcmPlayer_sampleRate; diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index 179481d4be..99f0dff651 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -49,8 +49,6 @@ public class MouseRecorder implements Runnable { this.millis = new long[500]; } - @Export("run") - @ObfuscatedName("run") public void run() { for (; this.isRunning; class203.method4010(50L)) { Object var1 = this.lock; @@ -73,7 +71,7 @@ public class MouseRecorder implements Runnable { ) @Export("drawObject") static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = class65.scene.method290(var0, var1, var2); + long var5 = class65.scene.getBoundaryObjectTag(var0, var1, var2); int var7; int var8; int var9; @@ -170,7 +168,7 @@ public class MouseRecorder implements Runnable { } } - var5 = class65.scene.method292(var0, var1, var2); + var5 = class65.scene.getGameObjectTag(var0, var1, var2); ObjectDefinition var19; IndexedSprite var21; int var22; diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index 7b349d936c..f8cd4f1e2c 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -152,6 +152,7 @@ public class MusicPatchPcmStream extends PcmStream { } @ObfuscatedName("e") + @Export("fill") protected void fill(int[] var1, int var2, int var3) { this.mixer.fill(var1, var2, var3); @@ -177,6 +178,7 @@ public class MusicPatchPcmStream extends PcmStream { } @ObfuscatedName("d") + @Export("skip") protected void skip(int var1) { this.mixer.skip(var1); diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index 4eafb433fe..2907e27c90 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -221,8 +221,6 @@ public final class NetSocket extends AbstractSocket implements Runnable { } - @Export("run") - @ObfuscatedName("run") public void run() { try { while (true) { diff --git a/runescape-client/src/main/java/ParamDefinition.java b/runescape-client/src/main/java/ParamDefinition.java index 7b4dce8d3b..dc7c2c46d0 100644 --- a/runescape-client/src/main/java/ParamDefinition.java +++ b/runescape-client/src/main/java/ParamDefinition.java @@ -11,7 +11,8 @@ public class ParamDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractArchive field679; + @Export("ParamDefinition_archive") + public static AbstractArchive ParamDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" @@ -98,9 +99,10 @@ public class ParamDefinition extends DualNode { signature = "(IIIIIIII)V", garbageValue = "-904254947" ) - static final void method4933(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { - if (Client.isLowDetail && var0 != SoundSystem.plane) { + @Export("addPendingSpawnToScene") + static final void addPendingSpawnToScene(int plane, int objectType, int x, int y, int id, int orientation, int var6) { + if (x >= 1 && y >= 1 && x <= 102 && y <= 102) { + if (Client.isLowDetail && plane != SoundSystem.plane) { return; } @@ -108,74 +110,74 @@ public class ParamDefinition extends DualNode { boolean var9 = true; boolean var10 = false; boolean var11 = false; - if (var1 == 0) { - var7 = class65.scene.method290(var0, var2, var3); + if (objectType == 0) { + var7 = class65.scene.getBoundaryObjectTag(plane, x, y); } - if (var1 == 1) { - var7 = class65.scene.method291(var0, var2, var3); + if (objectType == 1) { + var7 = class65.scene.getWallDecorationTag(plane, x, y); } - if (var1 == 2) { - var7 = class65.scene.method292(var0, var2, var3); + if (objectType == 2) { + var7 = class65.scene.getGameObjectTag(plane, x, y); } - if (var1 == 3) { - var7 = class65.scene.getFloorDecorationTag(var0, var2, var3); + if (objectType == 3) { + var7 = class65.scene.getFloorDecorationTag(plane, x, y); } int var12; if (0L != var7) { - var12 = class65.scene.getObjectFlags(var0, var2, var3, var7); + var12 = class65.scene.getObjectFlags(plane, x, y, var7); int var13 = HitSplatDefinition.method4972(var7); int var14 = var12 & 31; int var15 = var12 >> 6 & 3; ObjectDefinition var16; - if (var1 == 0) { - class65.scene.removeBoundaryObject(var0, var2, var3); + if (objectType == 0) { + class65.scene.removeBoundaryObject(plane, x, y); var16 = class50.getObjectDefinition(var13); if (var16.interactType != 0) { - Client.collisionMaps[var0].method95(var2, var3, var14, var15, var16.boolean1); + Client.collisionMaps[plane].method95(x, y, var14, var15, var16.boolean1); } } - if (var1 == 1) { - class65.scene.removeWallDecoration(var0, var2, var3); + if (objectType == 1) { + class65.scene.removeWallDecoration(plane, x, y); } - if (var1 == 2) { - class65.scene.method288(var0, var2, var3); + if (objectType == 2) { + class65.scene.method288(plane, x, y); var16 = class50.getObjectDefinition(var13); - if (var2 + var16.sizeX > 103 || var3 + var16.sizeX > 103 || var2 + var16.sizeY > 103 || var3 + var16.sizeY > 103) { + if (x + var16.sizeX > 103 || y + var16.sizeX > 103 || x + var16.sizeY > 103 || y + var16.sizeY > 103) { return; } if (var16.interactType != 0) { - Client.collisionMaps[var0].method96(var2, var3, var16.sizeX, var16.sizeY, var15, var16.boolean1); + Client.collisionMaps[plane].method96(x, y, var16.sizeX, var16.sizeY, var15, var16.boolean1); } } - if (var1 == 3) { - class65.scene.removeFloorDecoration(var0, var2, var3); + if (objectType == 3) { + class65.scene.removeFloorDecoration(plane, x, y); var16 = class50.getObjectDefinition(var13); if (var16.interactType == 1) { - Client.collisionMaps[var0].method98(var2, var3); + Client.collisionMaps[plane].method98(x, y); } } } - if (var4 >= 0) { - var12 = var0; - if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { - var12 = var0 + 1; + if (id >= 0) { + var12 = plane; + if (plane < 3 && (Tiles.Tiles_renderFlags[1][x][y] & 2) == 2) { + var12 = plane + 1; } Scene var36 = class65.scene; - CollisionMap var37 = Client.collisionMaps[var0]; - ObjectDefinition var38 = class50.getObjectDefinition(var4); + CollisionMap var37 = Client.collisionMaps[plane]; + ObjectDefinition var38 = class50.getObjectDefinition(id); int var17; int var39; - if (var5 != 1 && var5 != 3) { + if (orientation != 1 && orientation != 3) { var17 = var38.sizeX; var39 = var38.sizeY; } else { @@ -185,30 +187,30 @@ public class ParamDefinition extends DualNode { int var18; int var19; - if (var17 + var2 <= 104) { - var18 = (var17 >> 1) + var2; - var19 = var2 + (var17 + 1 >> 1); + if (var17 + x <= 104) { + var18 = (var17 >> 1) + x; + var19 = x + (var17 + 1 >> 1); } else { - var18 = var2; - var19 = var2 + 1; + var18 = x; + var19 = x + 1; } int var20; int var21; - if (var3 + var39 <= 104) { - var20 = var3 + (var39 >> 1); - var21 = var3 + (var39 + 1 >> 1); + if (y + var39 <= 104) { + var20 = y + (var39 >> 1); + var21 = y + (var39 + 1 >> 1); } else { - var20 = var3; - var21 = var3 + 1; + var20 = y; + var21 = y + 1; } int[][] var22 = Tiles.Tiles_heights[var12]; int var23 = var22[var18][var21] + var22[var19][var20] + var22[var18][var20] + var22[var19][var21] >> 2; - int var24 = (var2 << 7) + (var17 << 6); - int var25 = (var3 << 7) + (var39 << 6); - long var26 = FontName.calculateTag(var2, var3, 2, var38.int1 == 0, var4); - int var28 = (var5 << 6) + var6; + int var24 = (x << 7) + (var17 << 6); + int var25 = (y << 7) + (var39 << 6); + long var26 = FontName.calculateTag(x, y, 2, var38.int1 == 0, id); + int var28 = (orientation << 6) + var6; if (var38.int3 == 1) { var28 += 256; } @@ -216,173 +218,173 @@ public class ParamDefinition extends DualNode { Object var29; if (var6 == 22) { if (var38.animationId == -1 && var38.transforms == null) { - var29 = var38.getModel(22, var5, var22, var24, var23, var25); + var29 = var38.getModel(22, orientation, var22, var24, var23, var25); } else { - var29 = new DynamicObject(var4, 22, var5, var12, var2, var3, var38.animationId, true, (Entity)null); + var29 = new DynamicObject(id, 22, orientation, var12, x, y, var38.animationId, true, (Entity)null); } - var36.newFloorDecoration(var0, var2, var3, var23, (Entity)var29, var26, var28); + var36.newFloorDecoration(plane, x, y, var23, (Entity)var29, var26, var28); if (var38.interactType == 1) { - var37.method93(var2, var3); + var37.method93(x, y); } } else if (var6 != 10 && var6 != 11) { if (var6 >= 12) { if (var38.animationId == -1 && var38.transforms == null) { - var29 = var38.getModel(var6, var5, var22, var24, var23, var25); + var29 = var38.getModel(var6, orientation, var22, var24, var23, var25); } else { - var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var38.animationId, true, (Entity)null); + var29 = new DynamicObject(id, var6, orientation, var12, x, y, var38.animationId, true, (Entity)null); } - var36.method284(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28); + var36.method284(plane, x, y, var23, 1, 1, (Entity)var29, 0, var26, var28); if (var38.interactType != 0) { - var37.method91(var2, var3, var17, var39, var38.boolean1); + var37.method91(x, y, var17, var39, var38.boolean1); } } else if (var6 == 0) { if (var38.animationId == -1 && var38.transforms == null) { - var29 = var38.getModel(0, var5, var22, var24, var23, var25); + var29 = var38.getModel(0, orientation, var22, var24, var23, var25); } else { - var29 = new DynamicObject(var4, 0, var5, var12, var2, var3, var38.animationId, true, (Entity)null); + var29 = new DynamicObject(id, 0, orientation, var12, x, y, var38.animationId, true, (Entity)null); } - var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field911[var5], 0, var26, var28); + var36.newBoundaryObject(plane, x, y, var23, (Entity)var29, (Entity)null, Tiles.field911[orientation], 0, var26, var28); if (var38.interactType != 0) { - var37.method90(var2, var3, var6, var5, var38.boolean1); + var37.method90(x, y, var6, orientation, var38.boolean1); } } else if (var6 == 1) { if (var38.animationId == -1 && var38.transforms == null) { - var29 = var38.getModel(1, var5, var22, var24, var23, var25); + var29 = var38.getModel(1, orientation, var22, var24, var23, var25); } else { - var29 = new DynamicObject(var4, 1, var5, var12, var2, var3, var38.animationId, true, (Entity)null); + var29 = new DynamicObject(id, 1, orientation, var12, x, y, var38.animationId, true, (Entity)null); } - var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field912[var5], 0, var26, var28); + var36.newBoundaryObject(plane, x, y, var23, (Entity)var29, (Entity)null, Tiles.field912[orientation], 0, var26, var28); if (var38.interactType != 0) { - var37.method90(var2, var3, var6, var5, var38.boolean1); + var37.method90(x, y, var6, orientation, var38.boolean1); } } else { int var30; Object var31; if (var6 == 2) { - var30 = var5 + 1 & 3; + var30 = orientation + 1 & 3; Object var32; if (var38.animationId == -1 && var38.transforms == null) { - var31 = var38.getModel(2, var5 + 4, var22, var24, var23, var25); + var31 = var38.getModel(2, orientation + 4, var22, var24, var23, var25); var32 = var38.getModel(2, var30, var22, var24, var23, var25); } else { - var31 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var38.animationId, true, (Entity)null); - var32 = new DynamicObject(var4, 2, var30, var12, var2, var3, var38.animationId, true, (Entity)null); + var31 = new DynamicObject(id, 2, orientation + 4, var12, x, y, var38.animationId, true, (Entity)null); + var32 = new DynamicObject(id, 2, var30, var12, x, y, var38.animationId, true, (Entity)null); } - var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var31, (Entity)var32, Tiles.field911[var5], Tiles.field911[var30], var26, var28); + var36.newBoundaryObject(plane, x, y, var23, (Entity)var31, (Entity)var32, Tiles.field911[orientation], Tiles.field911[var30], var26, var28); if (var38.interactType != 0) { - var37.method90(var2, var3, var6, var5, var38.boolean1); + var37.method90(x, y, var6, orientation, var38.boolean1); } } else if (var6 == 3) { if (var38.animationId == -1 && var38.transforms == null) { - var29 = var38.getModel(3, var5, var22, var24, var23, var25); + var29 = var38.getModel(3, orientation, var22, var24, var23, var25); } else { - var29 = new DynamicObject(var4, 3, var5, var12, var2, var3, var38.animationId, true, (Entity)null); + var29 = new DynamicObject(id, 3, orientation, var12, x, y, var38.animationId, true, (Entity)null); } - var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field912[var5], 0, var26, var28); + var36.newBoundaryObject(plane, x, y, var23, (Entity)var29, (Entity)null, Tiles.field912[orientation], 0, var26, var28); if (var38.interactType != 0) { - var37.method90(var2, var3, var6, var5, var38.boolean1); + var37.method90(x, y, var6, orientation, var38.boolean1); } } else if (var6 == 9) { if (var38.animationId == -1 && var38.transforms == null) { - var29 = var38.getModel(var6, var5, var22, var24, var23, var25); + var29 = var38.getModel(var6, orientation, var22, var24, var23, var25); } else { - var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var38.animationId, true, (Entity)null); + var29 = new DynamicObject(id, var6, orientation, var12, x, y, var38.animationId, true, (Entity)null); } - var36.method284(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28); + var36.method284(plane, x, y, var23, 1, 1, (Entity)var29, 0, var26, var28); if (var38.interactType != 0) { - var37.method91(var2, var3, var17, var39, var38.boolean1); + var37.method91(x, y, var17, var39, var38.boolean1); } } else if (var6 == 4) { if (var38.animationId == -1 && var38.transforms == null) { - var29 = var38.getModel(4, var5, var22, var24, var23, var25); + var29 = var38.getModel(4, orientation, var22, var24, var23, var25); } else { - var29 = new DynamicObject(var4, 4, var5, var12, var2, var3, var38.animationId, true, (Entity)null); + var29 = new DynamicObject(id, 4, orientation, var12, x, y, var38.animationId, true, (Entity)null); } - var36.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field911[var5], 0, 0, 0, var26, var28); + var36.newWallDecoration(plane, x, y, var23, (Entity)var29, (Entity)null, Tiles.field911[orientation], 0, 0, 0, var26, var28); } else { long var40; if (var6 == 5) { var30 = 16; - var40 = var36.method290(var0, var2, var3); + var40 = var36.getBoundaryObjectTag(plane, x, y); if (var40 != 0L) { var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2; } if (var38.animationId == -1 && var38.transforms == null) { - var31 = var38.getModel(4, var5, var22, var24, var23, var25); + var31 = var38.getModel(4, orientation, var22, var24, var23, var25); } else { - var31 = new DynamicObject(var4, 4, var5, var12, var2, var3, var38.animationId, true, (Entity)null); + var31 = new DynamicObject(id, 4, orientation, var12, x, y, var38.animationId, true, (Entity)null); } - var36.newWallDecoration(var0, var2, var3, var23, (Entity)var31, (Entity)null, Tiles.field911[var5], 0, var30 * Tiles.field913[var5], var30 * Tiles.field914[var5], var26, var28); + var36.newWallDecoration(plane, x, y, var23, (Entity)var31, (Entity)null, Tiles.field911[orientation], 0, var30 * Tiles.field913[orientation], var30 * Tiles.field914[orientation], var26, var28); } else if (var6 == 6) { var30 = 8; - var40 = var36.method290(var0, var2, var3); + var40 = var36.getBoundaryObjectTag(plane, x, y); if (var40 != 0L) { var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2 / 2; } if (var38.animationId == -1 && var38.transforms == null) { - var31 = var38.getModel(4, var5 + 4, var22, var24, var23, var25); + var31 = var38.getModel(4, orientation + 4, var22, var24, var23, var25); } else { - var31 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var38.animationId, true, (Entity)null); + var31 = new DynamicObject(id, 4, orientation + 4, var12, x, y, var38.animationId, true, (Entity)null); } - var36.newWallDecoration(var0, var2, var3, var23, (Entity)var31, (Entity)null, 256, var5, var30 * Tiles.field915[var5], var30 * Tiles.field916[var5], var26, var28); + var36.newWallDecoration(plane, x, y, var23, (Entity)var31, (Entity)null, 256, orientation, var30 * Tiles.field915[orientation], var30 * Tiles.field916[orientation], var26, var28); } else { int var34; if (var6 == 7) { - var34 = var5 + 2 & 3; + var34 = orientation + 2 & 3; if (var38.animationId == -1 && var38.transforms == null) { var29 = var38.getModel(4, var34 + 4, var22, var24, var23, var25); } else { - var29 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var38.animationId, true, (Entity)null); + var29 = new DynamicObject(id, 4, var34 + 4, var12, x, y, var38.animationId, true, (Entity)null); } - var36.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, 256, var34, 0, 0, var26, var28); + var36.newWallDecoration(plane, x, y, var23, (Entity)var29, (Entity)null, 256, var34, 0, 0, var26, var28); } else if (var6 == 8) { var30 = 8; - var40 = var36.method290(var0, var2, var3); + var40 = var36.getBoundaryObjectTag(plane, x, y); if (var40 != 0L) { var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2 / 2; } - var34 = var5 + 2 & 3; + var34 = orientation + 2 & 3; Object var35; if (var38.animationId == -1 && var38.transforms == null) { - var31 = var38.getModel(4, var5 + 4, var22, var24, var23, var25); + var31 = var38.getModel(4, orientation + 4, var22, var24, var23, var25); var35 = var38.getModel(4, var34 + 4, var22, var24, var23, var25); } else { - var31 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var38.animationId, true, (Entity)null); - var35 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var38.animationId, true, (Entity)null); + var31 = new DynamicObject(id, 4, orientation + 4, var12, x, y, var38.animationId, true, (Entity)null); + var35 = new DynamicObject(id, 4, var34 + 4, var12, x, y, var38.animationId, true, (Entity)null); } - var36.newWallDecoration(var0, var2, var3, var23, (Entity)var31, (Entity)var35, 256, var5, var30 * Tiles.field915[var5], var30 * Tiles.field916[var5], var26, var28); + var36.newWallDecoration(plane, x, y, var23, (Entity)var31, (Entity)var35, 256, orientation, var30 * Tiles.field915[orientation], var30 * Tiles.field916[orientation], var26, var28); } } } } } else { if (var38.animationId == -1 && var38.transforms == null) { - var29 = var38.getModel(10, var5, var22, var24, var23, var25); + var29 = var38.getModel(10, orientation, var22, var24, var23, var25); } else { - var29 = new DynamicObject(var4, 10, var5, var12, var2, var3, var38.animationId, true, (Entity)null); + var29 = new DynamicObject(id, 10, orientation, var12, x, y, var38.animationId, true, (Entity)null); } if (var29 != null) { - var36.method284(var0, var2, var3, var23, var17, var39, (Entity)var29, var6 == 11 ? 256 : 0, var26, var28); + var36.method284(plane, x, y, var23, var17, var39, (Entity)var29, var6 == 11 ? 256 : 0, var26, var28); } if (var38.interactType != 0) { - var37.method91(var2, var3, var17, var39, var38.boolean1); + var37.method91(x, y, var17, var39, var38.boolean1); } } } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index ece01a9aeb..ef333e2f0f 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -17,8 +17,8 @@ public class PcmPlayer { @ObfuscatedSignature( signature = "Ldc;" ) - @Export("stream0") - PcmStream stream0; + @Export("stream") + PcmStream stream; @ObfuscatedName("z") @ObfuscatedGetter( intValue = 1125788887 @@ -164,7 +164,7 @@ public class PcmPlayer { ) @Export("setStream") public final synchronized void setStream(PcmStream stream) { - this.stream0 = stream; + this.stream = stream; } @ObfuscatedName("ar") @@ -330,8 +330,8 @@ public class PcmPlayer { this.field686 = 0; } - if (this.stream0 != null) { - this.stream0.skip(length); + if (this.stream != null) { + this.stream.skip(length); } } @@ -346,10 +346,10 @@ public class PcmPlayer { class212.clearIntArray(buffer, 0, var3); this.field686 -= length; - if (this.stream0 != null && this.field686 <= 0) { + if (this.stream != null && this.field686 <= 0) { this.field686 += class309.PcmPlayer_sampleRate >> 4; - MidiPcmStream.PcmStream_disable(this.stream0); - this.method243(this.stream0, this.stream0.vmethod282()); + MidiPcmStream.PcmStream_disable(this.stream); + this.method243(this.stream, this.stream.vmethod282()); int var4 = 0; int var5 = 255; @@ -443,8 +443,8 @@ public class PcmPlayer { this.field686 = 0; } - if (this.stream0 != null) { - this.stream0.fill(buffer, 0, length); + if (this.stream != null) { + this.stream.fill(buffer, 0, length); } this.timeMs = class203.currentTimeMs(); diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java index 29e659a256..95c0469546 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -113,6 +113,7 @@ public class PcmStreamMixer extends PcmStream { } @ObfuscatedName("e") + @Export("fill") public final synchronized void fill(int[] var1, int var2, int var3) { do { if (this.field692 < 0) { @@ -157,6 +158,7 @@ public class PcmStreamMixer extends PcmStream { } @ObfuscatedName("d") + @Export("skip") public final synchronized void skip(int var1) { do { if (this.field692 < 0) { diff --git a/runescape-client/src/main/java/PendingSpawn.java b/runescape-client/src/main/java/PendingSpawn.java index b37305c175..c3b1a86330 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -11,8 +11,8 @@ public final class PendingSpawn extends Node { @ObfuscatedGetter( intValue = 1439936951 ) - @Export("level") - int level; + @Export("plane") + int plane; @ObfuscatedName("f") @ObfuscatedGetter( intValue = -1471611383 diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index cde1fbee52..031248e6ca 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -154,12 +154,12 @@ public class Players { Client.isDraggingWidget = false; int var3 = Client.menuOptionsCount - 1; if (var3 != -1) { - UnitPriceComparator.tempMenuAction = new MenuAction(); - UnitPriceComparator.tempMenuAction.argument1 = Client.menuArguments1[var3]; - UnitPriceComparator.tempMenuAction.argument2 = Client.menuArguments2[var3]; - UnitPriceComparator.tempMenuAction.opcode = Client.menuOpcodes[var3]; - UnitPriceComparator.tempMenuAction.argument0 = Client.menuArguments0[var3]; - UnitPriceComparator.tempMenuAction.action = Client.menuActions[var3]; + GrandExchangeOfferUnitPriceComparator.tempMenuAction = new MenuAction(); + GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument1 = Client.menuArguments1[var3]; + GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument2 = Client.menuArguments2[var3]; + GrandExchangeOfferUnitPriceComparator.tempMenuAction.opcode = Client.menuOpcodes[var3]; + GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument0 = Client.menuArguments0[var3]; + GrandExchangeOfferUnitPriceComparator.tempMenuAction.action = Client.menuActions[var3]; } } diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java index 391846e881..54a3b4136d 100644 --- a/runescape-client/src/main/java/RawPcmStream.java +++ b/runescape-client/src/main/java/RawPcmStream.java @@ -101,6 +101,7 @@ public class RawPcmStream extends PcmStream { } @ObfuscatedName("e") + @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { if (this.field746 == 0 && this.field752 == 0) { this.skip(var3); @@ -290,6 +291,7 @@ public class RawPcmStream extends PcmStream { } @ObfuscatedName("d") + @Export("skip") public synchronized void skip(int var1) { if (this.field752 > 0) { if (var1 >= this.field752) { diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index fc9b08f46c..e07ebe99e3 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -754,20 +754,23 @@ public class Scene { } @ObfuscatedName("ar") - public long method290(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + @Export("getBoundaryObjectTag") + public long getBoundaryObjectTag(int plane, int x, int y) { + Tile var4 = this.tiles[plane][x][y]; return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; } @ObfuscatedName("ac") - public long method291(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + @Export("getWallDecorationTag") + public long getWallDecorationTag(int plane, int x, int y) { + Tile var4 = this.tiles[plane][x][y]; return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; } @ObfuscatedName("ay") - public long method292(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + @Export("getGameObjectTag") + public long getGameObjectTag(int plane, int x, int y) { + Tile var4 = this.tiles[plane][x][y]; if (var4 == null) { return 0L; } else { @@ -776,7 +779,7 @@ public class Scene { long var7 = var6.tag; int var9 = (int)(var7 >>> 14 & 3L); boolean var10 = var9 == 2; - if (var10 && var2 == var6.startX && var3 == var6.startY) { + if (var10 && x == var6.startX && y == var6.startY) { return var6.tag; } } @@ -794,19 +797,19 @@ public class Scene { @ObfuscatedName("ak") @Export("getObjectFlags") - public int getObjectFlags(int plane, int x, int y, long var4) { + public int getObjectFlags(int plane, int x, int y, long tag) { Tile var6 = this.tiles[plane][x][y]; if (var6 == null) { return -1; - } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { + } else if (var6.boundaryObject != null && var6.boundaryObject.tag == tag) { return var6.boundaryObject.flags & 255; - } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { + } else if (var6.wallDecoration != null && var6.wallDecoration.tag == tag) { return var6.wallDecoration.flags & 255; - } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { + } else if (var6.floorDecoration != null && var6.floorDecoration.tag == tag) { return var6.floorDecoration.flags & 255; } else { for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { - if (var6.gameObjects[var7].tag == var4) { + if (var6.gameObjects[var7].tag == tag) { return var6.gameObjects[var7].flags & 255; } } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 41de47a2e5..6e2d40c75f 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -113,7 +113,7 @@ public class ScriptEvent extends Node { garbageValue = "0" ) static int method1185(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + Widget var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; if (var0 == ScriptOpcodes.CC_GETSCROLLX) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollX; return 1; diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java index 201dcdb11a..38b8eeb3f6 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -24,8 +24,6 @@ public class SoundSystem implements Runnable { this.players = new PcmPlayer[2]; } - @Export("run") - @ObfuscatedName("run") public void run() { try { for (int var1 = 0; var1 < 2; ++var1) { diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index 7bc1f44bd8..3d7668daf8 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -230,7 +230,8 @@ public class SpotAnimationDefinition extends DualNode { signature = "(B)I", garbageValue = "95" ) - static int method4822() { + @Export("getWindowedMode") + static int getWindowedMode() { return Client.isResizable ? 2 : 1; } diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index fac6e90ef1..7fcc7dcf5e 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -11,12 +11,14 @@ public class StructDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractArchive field885; + @Export("StructDefinition_archive") + public static AbstractArchive StructDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" ) - public static EvictingDualNodeHashTable field886; + @Export("StructDefinition_cached") + public static EvictingDualNodeHashTable StructDefinition_cached; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Llh;" @@ -109,7 +111,7 @@ public class StructDefinition extends DualNode { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4 = Huffman.getWidget(var3); } else { - var4 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + var4 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; } if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { @@ -286,6 +288,6 @@ public class StructDefinition extends DualNode { } static { - field886 = new EvictingDualNodeHashTable(64); + StructDefinition_cached = new EvictingDualNodeHashTable(64); } } diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java index 5a6c3f2bf9..ebebc5f6dd 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -124,8 +124,6 @@ public class TaskHandler implements Runnable { return this.newTask(2, var2, 0, var1); } - @Export("run") - @ObfuscatedName("run") public final void run() { while (true) { Task var1; diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index c911d6c9be..838bd46cd2 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -52,7 +52,8 @@ public class UrlRequest { signature = "(CI)Z", garbageValue = "-476632347" ) - public static boolean method3271(char var0) { + @Export("isCharAlphabetic") + public static boolean isCharAlphabetic(char var0) { return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; } } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index 3abe3aa985..4d4eca1bb3 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -76,8 +76,6 @@ public class UrlRequester implements Runnable { } - @Export("run") - @ObfuscatedName("run") public void run() { while (!this.isClosed) { try { diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index 1032dbeab6..9ce76ff9e5 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -10,8 +10,8 @@ public class User implements Comparable { @ObfuscatedSignature( signature = "Lkp;" ) - @Export("username0") - Username username0; + @Export("username") + Username username; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lkp;" @@ -24,9 +24,9 @@ public class User implements Comparable { signature = "(I)Lkp;", garbageValue = "1922393088" ) - @Export("username") - public Username username() { - return this.username0; + @Export("getUsername") + public Username getUsername() { + return this.username; } @ObfuscatedName("v") @@ -34,9 +34,9 @@ public class User implements Comparable { signature = "(B)Ljava/lang/String;", garbageValue = "-60" ) - @Export("name") - public String name() { - return this.username0 == null ? "" : this.username0.getName(); + @Export("getName") + public String getName() { + return this.username == null ? "" : this.username.getName(); } @ObfuscatedName("ag") @@ -44,8 +44,8 @@ public class User implements Comparable { signature = "(I)Ljava/lang/String;", garbageValue = "1204003359" ) - @Export("previousName") - public String previousName() { + @Export("getPreviousName") + public String getPreviousName() { return this.previousUsername == null ? "" : this.previousUsername.getName(); } @@ -59,7 +59,7 @@ public class User implements Comparable { if (username == null) { throw new NullPointerException(); } else { - this.username0 = username; + this.username = username; this.previousUsername = previousUsername; } } @@ -69,14 +69,12 @@ public class User implements Comparable { signature = "(Ljs;I)I", garbageValue = "1627362569" ) - @Export("compareTo0") - public int compareTo0(User other) { - return this.username0.compareTo0(other.username0); + @Export("compareToUser") + public int compareToUser(User other) { + return this.username.compareToTyped(other.username); } - @Export("compareTo") - @ObfuscatedName("compareTo") public int compareTo(Object var1) { - return this.compareTo0((User)var1); + return this.compareToUser((User)var1); } } diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index 2adcca3189..39effa29a3 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -8,10 +8,11 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator1") public class UserComparator1 implements Comparator { @ObfuscatedName("m") - final boolean field931; + @Export("reversed") + final boolean reversed; public UserComparator1(boolean var1) { - this.field931 = var1; + this.reversed = var1; } @ObfuscatedName("m") @@ -19,18 +20,16 @@ public class UserComparator1 implements Comparator { signature = "(Ljs;Ljs;B)I", garbageValue = "68" ) - int method339(User var1, User var2) { - return this.field931 ? var1.compareTo0(var2) : var2.compareTo0(var1); + @Export("compareUser") + int compareUser(User var1, User var2) { + return this.reversed ? var1.compareToUser(var2) : var2.compareToUser(var1); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method339((User)var1, (User)var2); + return this.compareUser((User)var1, (User)var2); } - @ObfuscatedName("equals") - public boolean method340(Object var1) { + public boolean equals(Object var1) { return super.equals(var1); } } diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index e1fdf2f164..d6aee1b8e3 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -8,10 +8,11 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { @ObfuscatedName("m") - final boolean field932; + @Export("reversed") + final boolean reversed; public UserComparator10(boolean var1) { - this.field932 = var1; + this.reversed = var1; } @ObfuscatedName("m") @@ -19,14 +20,13 @@ public class UserComparator10 extends AbstractUserComparator { signature = "(Lke;Lke;B)I", garbageValue = "-15" ) - int method341(Buddy var1, Buddy var2) { - return Client.worldId == var1.world0 && var2.world0 == Client.worldId ? (this.field932 ? var1.int2 - var2.int2 : var2.int2 - var1.int2) : this.method12(var1, var2); + @Export("compareBuddy") + int compareBuddy(Buddy var1, Buddy var2) { + return Client.worldId == var1.world && var2.world == Client.worldId ? (this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2) : this.compareUser(var1, var2); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method341((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("hn") diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index 44a97180b0..a7b3995ba0 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -8,10 +8,11 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator2") public class UserComparator2 implements Comparator { @ObfuscatedName("m") - final boolean field933; + @Export("reversed") + final boolean reversed; public UserComparator2(boolean var1) { - this.field933 = var1; + this.reversed = var1; } @ObfuscatedName("m") @@ -19,18 +20,16 @@ public class UserComparator2 implements Comparator { signature = "(Ljs;Ljs;I)I", garbageValue = "-2069683911" ) - int method342(User var1, User var2) { - return this.field933 ? var1.username().compareTo0(var2.username()) : var2.username().compareTo0(var1.username()); + @Export("compareTyped") + int compareTyped(User var1, User var2) { + return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); } - @ObfuscatedName("equals") - public boolean method343(Object var1) { + public boolean equals(Object var1) { return super.equals(var1); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method342((User)var1, (User)var2); + return this.compareTyped((User)var1, (User)var2); } } diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index 193ca517ab..469ffc770c 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -19,10 +19,11 @@ public class UserComparator3 extends AbstractUserComparator { @Export("socketTask") static Task socketTask; @ObfuscatedName("m") - final boolean field934; + @Export("reversed") + final boolean reversed; public UserComparator3(boolean var1) { - this.field934 = var1; + this.reversed = var1; } @ObfuscatedName("m") @@ -30,14 +31,13 @@ public class UserComparator3 extends AbstractUserComparator { signature = "(Lke;Lke;I)I", garbageValue = "-1157645406" ) - int method344(Buddy var1, Buddy var2) { - return var2.world0 != var1.world0 ? (this.field934 ? var1.world0 - var2.world0 : var2.world0 - var1.world0) : this.method12(var1, var2); + @Export("compareBuddy") + int compareBuddy(Buddy var1, Buddy var2) { + return var2.world != var1.world ? (this.reversed ? var1.world - var2.world : var2.world - var1.world) : this.compareUser(var1, var2); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method344((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("o") diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index 0f5758bf29..63b67c7ca4 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -16,10 +16,11 @@ public class UserComparator4 implements Comparator { @Export("WorldMapElement_count") public static int WorldMapElement_count; @ObfuscatedName("m") - final boolean field935; + @Export("reversed") + final boolean reversed; public UserComparator4(boolean var1) { - this.field935 = var1; + this.reversed = var1; } @ObfuscatedName("m") @@ -27,19 +28,17 @@ public class UserComparator4 implements Comparator { signature = "(Lke;Lke;I)I", garbageValue = "950234237" ) - int method345(Buddy var1, Buddy var2) { - return this.field935 ? var1.int2 - var2.int2 : var2.int2 - var1.int2; + @Export("compareBuddy") + int compareBuddy(Buddy var1, Buddy var2) { + return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; } - @ObfuscatedName("equals") - public boolean method346(Object var1) { + public boolean equals(Object var1) { return super.equals(var1); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method345((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("f") @@ -58,14 +57,14 @@ public class UserComparator4 implements Comparator { ) static int method3335(int var0, Script var1, boolean var2) { if (var0 == ScriptOpcodes.GETWINDOWMODE) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SpotAnimationDefinition.method4822(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SpotAnimationDefinition.getWindowedMode(); return 1; } else { int var3; if (var0 == ScriptOpcodes.SETWINDOWMODE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (var3 == 1 || var3 == 2) { - GroundItem.method2095(var3); + GroundItem.setWindowedMode(var3); } return 1; diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index 49da2bb4f8..d6631df263 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -7,10 +7,11 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { @ObfuscatedName("m") - final boolean field936; + @Export("reversed") + final boolean reversed; public UserComparator5(boolean var1) { - this.field936 = var1; + this.reversed = var1; } @ObfuscatedName("m") @@ -18,22 +19,21 @@ public class UserComparator5 extends AbstractUserComparator { signature = "(Lke;Lke;B)I", garbageValue = "-22" ) - int method347(Buddy var1, Buddy var2) { - if (var1.world0 != 0) { - if (var2.world0 == 0) { - return this.field936 ? -1 : 1; + @Export("compareBuddy") + int compareBuddy(Buddy var1, Buddy var2) { + if (var1.world != 0) { + if (var2.world == 0) { + return this.reversed ? -1 : 1; } - } else if (var2.world0 != 0) { - return this.field936 ? 1 : -1; + } else if (var2.world != 0) { + return this.reversed ? 1 : -1; } - return this.method12(var1, var2); + return this.compareUser(var1, var2); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method347((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("jk") diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index 58325e9817..2ce3abcc8f 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -18,10 +18,11 @@ public class UserComparator6 extends AbstractUserComparator { ) static Widget field937; @ObfuscatedName("m") - final boolean field938; + @Export("reversed") + final boolean reversed; public UserComparator6(boolean var1) { - this.field938 = var1; + this.reversed = var1; } @ObfuscatedName("m") @@ -29,14 +30,13 @@ public class UserComparator6 extends AbstractUserComparator { signature = "(Lke;Lke;I)I", garbageValue = "750521759" ) - int method348(Buddy var1, Buddy var2) { - return var1.world0 != 0 && var2.world0 != 0 ? (this.field938 ? var1.username().compareTo0(var2.username()) : var2.username().compareTo0(var1.username())) : this.method12(var1, var2); + @Export("compareBuddy") + int compareBuddy(Buddy var1, Buddy var2) { + return var1.world != 0 && var2.world != 0 ? (this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername())) : this.compareUser(var1, var2); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method348((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("f") diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index 72f05177c9..a0c6b7e792 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -10,10 +10,11 @@ import net.runelite.rs.Reflection; @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { @ObfuscatedName("m") - final boolean field939; + @Export("reversed") + final boolean reversed; public UserComparator7(boolean var1) { - this.field939 = var1; + this.reversed = var1; } @ObfuscatedName("m") @@ -21,14 +22,13 @@ public class UserComparator7 extends AbstractUserComparator { signature = "(Lke;Lke;I)I", garbageValue = "-9252550" ) - int method349(Buddy var1, Buddy var2) { - return var1.world0 != 0 && var2.world0 != 0 ? (this.field939 ? var1.int2 - var2.int2 : var2.int2 - var1.int2) : this.method12(var1, var2); + @Export("compareBuddy") + int compareBuddy(Buddy var1, Buddy var2) { + return var1.world != 0 && var2.world != 0 ? (this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2) : this.compareUser(var1, var2); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method349((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("q") diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index a5a40b8595..f997c45574 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -7,10 +7,11 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { @ObfuscatedName("m") - final boolean field940; + @Export("reversed") + final boolean reversed; public UserComparator8(boolean var1) { - this.field940 = var1; + this.reversed = var1; } @ObfuscatedName("m") @@ -18,22 +19,21 @@ public class UserComparator8 extends AbstractUserComparator { signature = "(Lke;Lke;B)I", garbageValue = "0" ) - int method350(Buddy var1, Buddy var2) { - if (Client.worldId == var1.world0) { - if (var2.world0 != Client.worldId) { - return this.field940 ? -1 : 1; + @Export("compareBuddy") + int compareBuddy(Buddy var1, Buddy var2) { + if (Client.worldId == var1.world) { + if (var2.world != Client.worldId) { + return this.reversed ? -1 : 1; } - } else if (var2.world0 == Client.worldId) { - return this.field940 ? 1 : -1; + } else if (var2.world == Client.worldId) { + return this.reversed ? 1 : -1; } - return this.method12(var1, var2); + return this.compareUser(var1, var2); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method350((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("ke") diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 7ccd37d150..fedabeaa4c 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -8,10 +8,11 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { @ObfuscatedName("m") - final boolean field941; + @Export("reversed") + final boolean reversed; public UserComparator9(boolean var1) { - this.field941 = var1; + this.reversed = var1; } @ObfuscatedName("m") @@ -19,14 +20,13 @@ public class UserComparator9 extends AbstractUserComparator { signature = "(Lke;Lke;I)I", garbageValue = "1966780392" ) - int method351(Buddy var1, Buddy var2) { - return Client.worldId == var1.world0 && var2.world0 == Client.worldId ? (this.field941 ? var1.username().compareTo0(var2.username()) : var2.username().compareTo0(var1.username())) : this.method12(var1, var2); + @Export("compareBuddy") + int compareBuddy(Buddy var1, Buddy var2) { + return Client.worldId == var1.world && var2.world == Client.worldId ? (this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername())) : this.compareUser(var1, var2); } - @Export("compare") - @ObfuscatedName("compare") public int compare(Object var1, Object var2) { - return this.method351((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); } @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index d8672c62b7..1db071698b 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -283,7 +283,7 @@ public abstract class UserList { ) @Export("mapPut") final void mapPut(User user) { - this.usernamesMap.put(user.username0, user); + this.usernamesMap.put(user.username, user); if (user.previousUsername != null) { User var2 = (User)this.previousUsernamesMap.put(user.previousUsername, user); if (var2 != null && var2 != user) { @@ -327,7 +327,7 @@ public abstract class UserList { if (this.comparator == null) { this.comparator = var1; } else if (this.comparator instanceof AbstractUserComparator) { - ((AbstractUserComparator)this.comparator).method11(var1); + ((AbstractUserComparator)this.comparator).addComparator(var1); } } diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index 0f56c052da..e9d4e0cf48 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -10,8 +10,8 @@ public class Username implements Comparable { @Export("Interpreter_intLocals") static int[] Interpreter_intLocals; @ObfuscatedName("m") - @Export("name0") - String name0; + @Export("name") + String name; @ObfuscatedName("f") @Export("cleanName") String cleanName; @@ -20,7 +20,7 @@ public class Username implements Comparable { signature = "(Ljava/lang/String;Llx;)V" ) public Username(String var1, LoginType var2) { - this.name0 = var1; + this.name = var1; this.cleanName = Message.method1229(var1, var2); } @@ -31,7 +31,7 @@ public class Username implements Comparable { ) @Export("getName") public String getName() { - return this.name0; + return this.name; } @ObfuscatedName("f") @@ -49,39 +49,33 @@ public class Username implements Comparable { signature = "(Lkp;B)I", garbageValue = "8" ) - @Export("compareTo0") - public int compareTo0(Username other) { + @Export("compareToTyped") + public int compareToTyped(Username other) { return this.cleanName == null ? (other.cleanName == null ? 0 : 1) : (other.cleanName == null ? -1 : this.cleanName.compareTo(other.cleanName)); } - @Export("equals") - @ObfuscatedName("equals") public boolean equals(Object var1) { if (var1 instanceof Username) { Username var2 = (Username)var1; if (this.cleanName == null) { return var2.cleanName == null; } else { - return var2.cleanName != null && this.method352() == var2.method352() && this.cleanName.equals(var2.cleanName); + return var2.cleanName != null && this.hashCode() == var2.hashCode() && this.cleanName.equals(var2.cleanName); } } else { return false; } } - @ObfuscatedName("hashCode") - public int method352() { + public int hashCode() { return this.cleanName == null ? 0 : this.cleanName.hashCode(); } - @ObfuscatedName("toString") - public String method353() { + public String toString() { return this.getName(); } - @Export("compareTo") - @ObfuscatedName("compareTo") public int compareTo(Object var1) { - return this.compareTo0((Username)var1); + return this.compareToTyped((Username)var1); } } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index 416de63972..6a64bd9e0d 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -171,7 +171,7 @@ public class Varcs { if (var7 instanceof Integer) { var2 += 4; } else if (var7 instanceof String) { - var2 += WorldMapRegion.method550((String)var7); + var2 += WorldMapRegion.stringCp1252NullTerminatedByteSize((String)var7); } ++var3; @@ -392,7 +392,7 @@ public class Varcs { for (var6 = 0; var6 < 4; ++var6) { for (var7 = 0; var7 < 64; ++var7) { for (int var11 = 0; var11 < 64; ++var11) { - TotalQuantityComparator.loadTerrain(var10, var6, var7 + var1, var11 + var2, var3, var4, 0); + GrandExchangeOfferTotalQuantityComparator.loadTerrain(var10, var6, var7 + var1, var11 + var2, var3, var4, 0); } } } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index d4f7ddae7e..11fb4c6deb 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -582,7 +582,8 @@ public class Widget extends Node { @Export("onSubChange") public Object[] onSubChange; @ObfuscatedName("ee") - public Object[] field975; + @Export("onResize") + public Object[] onResize; @ObfuscatedName("eq") @Export("onStockTransmit") public Object[] onStockTransmit; diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index e18f167bf5..2de1441c4f 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -158,8 +158,8 @@ public class WorldMap { ) int field994; @ObfuscatedName("ah") - @Export("perpetualFlash0") - boolean perpetualFlash0; + @Export("perpetualFlash") + boolean perpetualFlash; @ObfuscatedName("ak") @Export("flashingElements") HashSet flashingElements; @@ -282,7 +282,7 @@ public class WorldMap { this.worldMapDisplayY = -1; this.field993 = 3; this.field994 = 50; - this.perpetualFlash0 = false; + this.perpetualFlash = false; this.flashingElements = null; this.field995 = -1; this.field996 = -1; @@ -374,7 +374,7 @@ public class WorldMap { var13 = (AbstractWorldMapIcon)var12.next(); var11.add(var13); var14 = new ScriptEvent(); - var15 = new WorldMapEvent(var13.element(), var13.coord1, var13.coord2); + var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); var14.setArgs(new Object[]{var15, var1, var2}); if (this.field1010.contains(var13)) { var14.setType(17); @@ -389,7 +389,7 @@ public class WorldMap { var13 = (AbstractWorldMapIcon)var12.next(); if (!var11.contains(var13)) { var14 = new ScriptEvent(); - var15 = new WorldMapEvent(var13.element(), var13.coord1, var13.coord2); + var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); var14.setArgs(new Object[]{var15, var1, var2}); var14.setType(16); AbstractArchive.runScript(var14); @@ -438,8 +438,8 @@ public class WorldMap { @ObfuscatedName("o") void method362(int var1, int var2, boolean var3, long var4) { if (this.currentMapArea != null) { - int var6 = (int)((float)this.worldMapX + ((float)(var1 - this.worldMapDisplayX) - (float)this.method377() * this.zoom / 2.0F) / this.zoom); - int var7 = (int)((float)this.worldMapY - ((float)(var2 - this.worldMapDisplayY) - (float)this.method378() * this.zoom / 2.0F) / this.zoom); + int var6 = (int)((float)this.worldMapX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); + int var7 = (int)((float)this.worldMapY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.minX() * 64, var7 + this.currentMapArea.minY() * 64); if (this.mouseCoord != null && var3) { int var8; @@ -746,7 +746,7 @@ public class WorldMap { ++this.field995; } - if (this.field995 >= this.field993 && !this.perpetualFlash0) { + if (this.field995 >= this.field993 && !this.perpetualFlash) { this.flashingElements = null; } } @@ -800,8 +800,8 @@ public class WorldMap { float var10 = 1.0F; var8 = (int)((float)var8 / var10); var9 = (int)((float)var9 / var10); - int var11 = this.method374() - var5 / 2 - var7; - int var12 = this.method375() - var6 / 2 - var7; + int var11 = this.getDisplayX() - var5 / 2 - var7; + int var12 = this.getDisplayY() - var6 / 2 - var7; int var13 = var1 - (var7 + var11 - this.field1012) * this.worldMapManager.field1050; int var14 = var2 - this.worldMapManager.field1050 * (var7 - (var12 - this.field1013)); if (this.method368(var8, var9, var13, var14, var3, var4)) { @@ -811,8 +811,8 @@ public class WorldMap { this.sprite = new Sprite(var8, var9); } - this.field1012 = this.method374() - var5 / 2 - var7; - this.field1013 = this.method375() - var6 / 2 - var7; + this.field1012 = this.getDisplayX() - var5 / 2 - var7; + this.field1013 = this.getDisplayY() - var6 / 2 - var7; this.field1011 = this.worldMapManager.field1050; ClientParameter.field3645.method4720(this.field1012, this.field1013, this.sprite, (float)this.field1011 / var10); this.field1014 = Client.field104; @@ -942,10 +942,10 @@ public class WorldMap { garbageValue = "1820000123" ) @Export("setWorldMapPositionTarget") - public void setWorldMapPositionTarget(int var1, int var2) { - if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { - this.worldMapTargetX = var1 - this.currentMapArea.minX() * 64; - this.worldMapTargetY = var2 - this.currentMapArea.minY() * 64; + public void setWorldMapPositionTarget(int x, int y) { + if (this.currentMapArea != null && this.currentMapArea.containsPosition(x, y)) { + this.worldMapTargetX = x - this.currentMapArea.minX() * 64; + this.worldMapTargetY = y - this.currentMapArea.minY() * 64; } } @@ -955,9 +955,10 @@ public class WorldMap { signature = "(III)V", garbageValue = "-2147142500" ) - public void method371(int var1, int var2) { + @Export("setWorldMapPositionTargetInstant") + public void setWorldMapPositionTargetInstant(int x, int y) { if (this.currentMapArea != null) { - this.setWorldMapPosition(var1 - this.currentMapArea.minX() * 64, var2 - this.currentMapArea.minY() * 64, true); + this.setWorldMapPosition(x - this.currentMapArea.minX() * 64, y - this.currentMapArea.minY() * 64, true); this.worldMapTargetX = -1; this.worldMapTargetY = -1; } @@ -969,9 +970,10 @@ public class WorldMap { signature = "(IIIB)V", garbageValue = "-40" ) - public void method372(int var1, int var2, int var3) { + @Export("jumpToSourceCoord") + public void jumpToSourceCoord(int plane, int x, int y) { if (this.currentMapArea != null) { - int[] var4 = this.currentMapArea.position(var1, var2, var3); + int[] var4 = this.currentMapArea.position(plane, x, y); if (var4 != null) { this.setWorldMapPositionTarget(var4[0], var4[1]); } @@ -984,11 +986,12 @@ public class WorldMap { signature = "(IIII)V", garbageValue = "1808854561" ) - public void method373(int var1, int var2, int var3) { + @Export("jumpToSourceCoordInstant") + public void jumpToSourceCoordInstant(int plane, int x, int y) { if (this.currentMapArea != null) { - int[] var4 = this.currentMapArea.position(var1, var2, var3); + int[] var4 = this.currentMapArea.position(plane, x, y); if (var4 != null) { - this.method371(var4[0], var4[1]); + this.setWorldMapPositionTargetInstant(var4[0], var4[1]); } } @@ -999,7 +1002,8 @@ public class WorldMap { signature = "(I)I", garbageValue = "-659556919" ) - public int method374() { + @Export("getDisplayX") + public int getDisplayX() { return this.currentMapArea == null ? -1 : this.worldMapX + this.currentMapArea.minX() * 64; } @@ -1008,7 +1012,8 @@ public class WorldMap { signature = "(I)I", garbageValue = "1893257871" ) - public int method375() { + @Export("getDisplayY") + public int getDisplayY() { return this.currentMapArea == null ? -1 : this.worldMapY + this.currentMapArea.minY() * 64; } @@ -1017,8 +1022,9 @@ public class WorldMap { signature = "(I)Lhu;", garbageValue = "-2005824064" ) - public Coord method376() { - return this.currentMapArea == null ? null : this.currentMapArea.coord(this.method374(), this.method375()); + @Export("getDisplayCoord") + public Coord getDisplayCoord() { + return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); } @ObfuscatedName("ap") @@ -1026,7 +1032,8 @@ public class WorldMap { signature = "(I)I", garbageValue = "442119278" ) - public int method377() { + @Export("getDisplayWith") + public int getDisplayWith() { return this.worldMapDisplayWidth; } @@ -1035,7 +1042,8 @@ public class WorldMap { signature = "(I)I", garbageValue = "-2065910749" ) - public int method378() { + @Export("getDisplayHeight") + public int getDisplayHeight() { return this.worldMapDisplayHeight; } @@ -1086,9 +1094,9 @@ public class WorldMap { signature = "(ZI)V", garbageValue = "1025207933" ) - @Export("perpetualFlash") - public void perpetualFlash(boolean var1) { - this.perpetualFlash0 = var1; + @Export("setPerpetualFlash") + public void setPerpetualFlash(boolean var1) { + this.perpetualFlash = var1; } @ObfuscatedName("aa") @@ -1247,12 +1255,12 @@ public class WorldMap { } AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var10.next(); - WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.element()); + WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.getElement()); var11 = false; for (int var14 = this.field1008.length - 1; var14 >= 0; --var14) { if (var13.strings[var14] != null) { - Tiles.insertMenuItemNoShift(var13.strings[var14], var13.string1, this.field1008[var14], var12.element(), var12.coord1.packed(), var12.coord2.packed()); + Tiles.insertMenuItemNoShift(var13.strings[var14], var13.string1, this.field1008[var14], var12.getElement(), var12.coord1.packed(), var12.coord2.packed()); var11 = true; } } @@ -1381,7 +1389,7 @@ public class WorldMap { } var1 = (AbstractWorldMapIcon)this.iconIterator.next(); - } while(var1.element() == -1); + } while(var1.getElement() == -1); return var1; } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 6aa284a9ff..4c259a1f69 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -132,7 +132,7 @@ public class WorldMapAreaData extends WorldMapArea { var4 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); var3 = false; } else { - var4 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + var4 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; } int var5; diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index e5977c7fd7..fa307bd627 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -11,7 +11,8 @@ public class WorldMapElement extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractArchive field1019; + @Export("WorldMapElement_archive") + public static AbstractArchive WorldMapElement_archive; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Ler;" @@ -272,7 +273,7 @@ public class WorldMapElement extends DualNode { if (var2 != null) { return var2; } else { - var2 = class322.readSprite(field1019, var1, 0); + var2 = class322.readSprite(WorldMapElement_archive, var1, 0); if (var2 != null) { WorldMapElement_cachedSprites.put(var2, (long)var1); } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index 40e3e92b0d..77adb62209 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -47,7 +47,7 @@ public class WorldMapEvent { garbageValue = "-782761258" ) public static int method780(int var0) { - return UnitPriceComparator.method134(ViewportMouse.ViewportMouse_entityTags[var0]); + return GrandExchangeOfferUnitPriceComparator.method134(ViewportMouse.ViewportMouse_entityTags[var0]); } @ObfuscatedName("iy") @@ -69,10 +69,10 @@ public class WorldMapEvent { int var9 = ViewportMouse.ViewportMouse_entityCount; if (var8 >= var9) { if (-1L != var4) { - var8 = UnitPriceComparator.method134(var4); + var8 = GrandExchangeOfferUnitPriceComparator.method134(var4); int var29 = (int)(var4 >>> 7 & 127L); Player var11 = Client.players[Client.combatTargetPlayerIndex]; - TotalQuantityComparator.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var29); + GrandExchangeOfferTotalQuantityComparator.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var29); } return; @@ -164,7 +164,7 @@ public class WorldMapEvent { for (var30 = 0; var30 < var31; ++var30) { var34 = Client.players[var22[var30]]; if (var34 != null && var34.x == var23.x && var34.y == var23.y) { - TotalQuantityComparator.addPlayerToMenu(var34, var22[var30], var12, var15); + GrandExchangeOfferTotalQuantityComparator.addPlayerToMenu(var34, var22[var30], var12, var15); } } } @@ -192,13 +192,13 @@ public class WorldMapEvent { for (var30 = 0; var30 < var31; ++var30) { var34 = Client.players[var22[var30]]; if (var34 != null && var34 != var33 && var34.x == var33.x && var34.y == var33.y) { - TotalQuantityComparator.addPlayerToMenu(var34, var22[var30], var12, var15); + GrandExchangeOfferTotalQuantityComparator.addPlayerToMenu(var34, var22[var30], var12, var15); } } } if (var17 != Client.combatTargetPlayerIndex) { - TotalQuantityComparator.addPlayerToMenu(var33, var17, var12, var15); + GrandExchangeOfferTotalQuantityComparator.addPlayerToMenu(var33, var17, var12, var15); } else { var4 = var10; } diff --git a/runescape-client/src/main/java/WorldMapIcon1.java b/runescape-client/src/main/java/WorldMapIcon1.java index fb95ef0345..002ffe1a56 100644 --- a/runescape-client/src/main/java/WorldMapIcon1.java +++ b/runescape-client/src/main/java/WorldMapIcon1.java @@ -32,13 +32,14 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { @ObfuscatedGetter( intValue = -1722323621 ) - final int field1031; + @Export("element") + final int element; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Laj;" ) - @Export("label0") - final WorldMapLabel label0; + @Export("label") + final WorldMapLabel label; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 364253793 @@ -55,9 +56,9 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { ) WorldMapIcon1(Coord var1, Coord var2, int var3, WorldMapLabel var4) { super(var1, var2); - this.field1031 = var3; - this.label0 = var4; - WorldMapElement var5 = ViewportMouse.getWorldMapElement(this.element()); + this.element = var3; + this.label = var4; + WorldMapElement var5 = ViewportMouse.getWorldMapElement(this.getElement()); Sprite var6 = var5.getSprite(false); if (var6 != null) { this.field1032 = var6.subWidth; @@ -74,8 +75,9 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { signature = "(I)I", garbageValue = "1990181988" ) - public int element() { - return this.field1031; + @Export("getElement") + public int getElement() { + return this.element; } @ObfuscatedName("f") @@ -83,8 +85,9 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { signature = "(I)Laj;", garbageValue = "1159446036" ) - WorldMapLabel label() { - return this.label0; + @Export("getLabel") + WorldMapLabel getLabel() { + return this.label; } @ObfuscatedName("q") diff --git a/runescape-client/src/main/java/WorldMapIcon2.java b/runescape-client/src/main/java/WorldMapIcon2.java index 342b053130..7138ead64f 100644 --- a/runescape-client/src/main/java/WorldMapIcon2.java +++ b/runescape-client/src/main/java/WorldMapIcon2.java @@ -23,13 +23,14 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { @ObfuscatedGetter( intValue = -25914375 ) - int field1036; + @Export("element") + int element; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Laj;" ) - @Export("label0") - WorldMapLabel label0; + @Export("label") + WorldMapLabel label; @ObfuscatedName("o") @ObfuscatedGetter( intValue = 927871683 @@ -56,8 +57,9 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { signature = "(I)I", garbageValue = "1990181988" ) - public int element() { - return this.field1036; + @Export("getElement") + public int getElement() { + return this.element; } @ObfuscatedName("f") @@ -65,8 +67,9 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { signature = "(I)Laj;", garbageValue = "1159446036" ) - WorldMapLabel label() { - return this.label0; + @Export("getLabel") + WorldMapLabel getLabel() { + return this.label; } @ObfuscatedName("q") @@ -93,9 +96,9 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { garbageValue = "-806344204" ) void method399() { - this.field1036 = class50.getObjectDefinition(this.field1034).transform().mapIconId; - this.label0 = this.field1035.method420(ViewportMouse.getWorldMapElement(this.field1036)); - WorldMapElement var1 = ViewportMouse.getWorldMapElement(this.element()); + this.element = class50.getObjectDefinition(this.field1034).transform().mapIconId; + this.label = this.field1035.method420(ViewportMouse.getWorldMapElement(this.element)); + WorldMapElement var1 = ViewportMouse.getWorldMapElement(this.getElement()); Sprite var2 = var1.getSprite(false); if (var2 != null) { this.field1037 = var2.subWidth; diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index 525708dfec..1d30cddb90 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -200,11 +200,11 @@ public class WorldMapLabel { garbageValue = "1459100828" ) @Export("compareWorlds") - static int compareWorlds(World var0, World var1, int mode, boolean var3) { + static int compareWorlds(World var0, World var1, int mode, boolean reversed) { if (mode == 1) { int var4 = var0.population; int var5 = var1.population; - if (!var3) { + if (!reversed) { if (var4 == -1) { var4 = 2001; } @@ -216,7 +216,7 @@ public class WorldMapLabel { return var4 - var5; } else { - return mode == 2 ? var0.location - var1.location : (mode == 3 ? (var0.activity.equals("-") ? (var1.activity.equals("-") ? 0 : (var3 ? -1 : 1)) : (var1.activity.equals("-") ? (var3 ? 1 : -1) : var0.activity.compareTo(var1.activity))) : (mode == 4 ? (var0.method357() ? (var1.method357() ? 0 : 1) : (var1.method357() ? -1 : 0)) : (mode == 5 ? (var0.method356() ? (var1.method356() ? 0 : 1) : (var1.method356() ? -1 : 0)) : (mode == 6 ? (var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0)) : (mode == 7 ? (var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0)) : var0.id - var1.id))))); + return mode == 2 ? var0.location - var1.location : (mode == 3 ? (var0.activity.equals("-") ? (var1.activity.equals("-") ? 0 : (reversed ? -1 : 1)) : (var1.activity.equals("-") ? (reversed ? 1 : -1) : var0.activity.compareTo(var1.activity))) : (mode == 4 ? (var0.method357() ? (var1.method357() ? 0 : 1) : (var1.method357() ? -1 : 0)) : (mode == 5 ? (var0.method356() ? (var1.method356() ? 0 : 1) : (var1.method356() ? -1 : 0)) : (mode == 6 ? (var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0)) : (mode == 7 ? (var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0)) : var0.id - var1.id))))); } } @@ -241,7 +241,7 @@ public class WorldMapLabel { int var3 = class32.getTileHeight(var0, var1, SoundSystem.plane) - var2; var0 -= WorldMapSection1.cameraX; var3 -= GrandExchangeEvents.cameraY; - var1 -= class11.cameraZ; + var1 -= GrandExchangeOfferNameComparator.cameraZ; int var4 = Rasterizer3D.Rasterizer3D_sine[WorldMapIcon1.cameraPitch]; int var5 = Rasterizer3D.Rasterizer3D_cosine[WorldMapIcon1.cameraPitch]; int var6 = Rasterizer3D.Rasterizer3D_sine[MusicPatchNode.cameraYaw]; diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 46b9863c80..3c3c0f055c 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -421,7 +421,7 @@ public final class WorldMapManager { while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); if (var5.method19()) { - int var6 = var5.element(); + int var6 = var5.getElement(); if (!this.icons.containsKey(var6)) { LinkedList var7 = new LinkedList(); var7.add(var5); diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index e1f8f315aa..dbc5e24dfa 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -221,7 +221,7 @@ public class WorldMapRegion { while (var2.hasNext()) { WorldMapIcon1 var3 = (WorldMapIcon1)var2.next(); if (var3.coord2.x >> 6 == this.x && var3.coord2.y >> 6 == this.y) { - WorldMapIcon1 var4 = new WorldMapIcon1(var3.coord2, var3.coord2, var3.field1031, this.method419(var3.field1031)); + WorldMapIcon1 var4 = new WorldMapIcon1(var3.coord2, var3.coord2, var3.element, this.method419(var3.element)); this.iconsList.add(var4); } } @@ -348,7 +348,7 @@ public class WorldMapRegion { while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); if (var5.method19()) { - int var6 = var5.element(); + int var6 = var5.getElement(); if (var1.contains(var6)) { WorldMapElement var7 = ViewportMouse.getWorldMapElement(var6); this.method414(var7, var5.field5, var5.field6, var2, var3); @@ -761,7 +761,7 @@ public class WorldMapRegion { if (var12 != null && var12.method19()) { var12.field5 = var10; var12.field6 = var11; - WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.element()); + WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.getElement()); if (!var3.contains(var13.method390())) { this.method415(var12, var10, var11, var5); } @@ -781,7 +781,7 @@ public class WorldMapRegion { while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); if (var5.method19()) { - WorldMapElement var6 = ViewportMouse.getWorldMapElement(var5.element()); + WorldMapElement var6 = ViewportMouse.getWorldMapElement(var5.getElement()); if (var6 != null && var1.contains(var6.method390())) { this.method414(var6, var5.field5, var5.field6, var2, var3); } @@ -813,7 +813,7 @@ public class WorldMapRegion { garbageValue = "-1283733783" ) void method415(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = ViewportMouse.getWorldMapElement(var1.element()); + WorldMapElement var5 = ViewportMouse.getWorldMapElement(var1.getElement()); this.method416(var5, var2, var3); this.method417(var1, var5, var2, var3, var4); } @@ -839,7 +839,7 @@ public class WorldMapRegion { garbageValue = "-1237576843" ) void method417(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { - WorldMapLabel var6 = var1.label(); + WorldMapLabel var6 = var1.getLabel(); if (var6 != null && var6.size.method400(var5)) { Font var7 = (Font)this.fonts.get(var6.size); var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1022, 0, 1, 0, var7.ascent / 2); @@ -863,7 +863,7 @@ public class WorldMapRegion { int var9 = var7.coord2.y % 64; var7.field5 = (int)((float)var8 * var5 + (float)var1); var7.field6 = (int)(var5 * (float)(63 - var9) + (float)var2); - if (!var3.contains(var7.element())) { + if (!var3.contains(var7.getElement())) { this.method415(var7, var7.field5, var7.field6, var5); } } @@ -1040,7 +1040,8 @@ public class WorldMapRegion { signature = "(Ljava/lang/String;I)I", garbageValue = "1877870965" ) - public static int method550(String var0) { + @Export("stringCp1252NullTerminatedByteSize") + public static int stringCp1252NullTerminatedByteSize(String var0) { return var0.length() + 1; } diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java index d5bdacfad1..3122fa5e65 100644 --- a/runescape-client/src/main/java/WorldMapSection3.java +++ b/runescape-client/src/main/java/WorldMapSection3.java @@ -253,10 +253,10 @@ public class WorldMapSection3 implements WorldMapSection { Client.viewportWidget = component; } - if (var3 && component.field975 != null && (var4 != component.width || var5 != component.height)) { + if (var3 && component.onResize != null && (var4 != component.width || var5 != component.height)) { ScriptEvent var6 = new ScriptEvent(); var6.widget = component; - var6.args0 = component.field975; + var6.args0 = component.onResize; Client.scriptEvents.addFirst(var6); } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index d0e2ea0201..f22ace252c 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -87,9 +87,10 @@ public enum WorldMapSectionType implements Enumerated { signature = "(IZIZI)V", garbageValue = "2102950996" ) - static void method248(int var0, boolean var1, int var2, boolean var3) { + @Export("sortWorlds") + static void sortWorlds(int primaryMode, boolean primaryReversed, int secondaryMode, boolean secondaryReversed) { if (ItemContainer.worlds != null) { - class3.method42(0, ItemContainer.worlds.length - 1, var0, var1, var2, var3); + class3.doWorldSorting(0, ItemContainer.worlds.length - 1, primaryMode, primaryReversed, secondaryMode, secondaryReversed); } } @@ -100,7 +101,7 @@ public enum WorldMapSectionType implements Enumerated { garbageValue = "-1520594673" ) static int method253(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + Widget var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; if (var0 == ScriptOpcodes.CC_GETX) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.x; return 1; diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 38525130c7..7a52970d1d 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -84,7 +84,7 @@ final class class1 implements class0 { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4 = Huffman.getWidget(var3); } else { - var4 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + var4 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; } if (var0 == ScriptOpcodes.CC_SETPOSITION) { @@ -124,7 +124,7 @@ final class class1 implements class0 { } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { var4.noClickThrough = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; - } else if (var0 == 1006) { + } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { var4.noScrollThrough = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else { diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index 4706aa5295..fb13bb6aae 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -57,23 +57,23 @@ public class class13 { int var4 = 0; int var5 = 0; if (var0.type == 0) { - var1 = class65.scene.method290(var0.level, var0.x, var0.y); + var1 = class65.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); } if (var0.type == 1) { - var1 = class65.scene.method291(var0.level, var0.x, var0.y); + var1 = class65.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); } if (var0.type == 2) { - var1 = class65.scene.method292(var0.level, var0.x, var0.y); + var1 = class65.scene.getGameObjectTag(var0.plane, var0.x, var0.y); } if (var0.type == 3) { - var1 = class65.scene.getFloorDecorationTag(var0.level, var0.x, var0.y); + var1 = class65.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); } if (var1 != 0L) { - int var6 = class65.scene.getObjectFlags(var0.level, var0.x, var0.y, var1); + int var6 = class65.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); var3 = HitSplatDefinition.method4972(var1); var4 = var6 & 31; var5 = var6 >> 6 & 3; diff --git a/runescape-client/src/main/java/class159.java b/runescape-client/src/main/java/class159.java index 658ded8e00..58d72f6461 100644 --- a/runescape-client/src/main/java/class159.java +++ b/runescape-client/src/main/java/class159.java @@ -35,11 +35,12 @@ public enum class159 implements Enumerated { @ObfuscatedGetter( intValue = 458308007 ) - final int field1981; + @Export("id") + final int id; private class159(int var3, int var4) { this.field1984 = var3; - this.field1981 = var4; + this.id = var4; } @ObfuscatedName("f") @@ -49,7 +50,7 @@ public enum class159 implements Enumerated { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field1981; + return this.id; } @ObfuscatedName("d") @@ -57,7 +58,8 @@ public enum class159 implements Enumerated { signature = "(CI)Z", garbageValue = "1176730001" ) - public static boolean method3394(char var0) { + @Export("isCharDigit") + public static boolean isCharDigit(char var0) { return var0 >= '0' && var0 <= '9'; } } diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 58cc3cb806..6b30dbe49d 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -62,7 +62,7 @@ public class class16 { garbageValue = "1394688825" ) static int method188(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + Widget var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class211.method4107(class1.getWidgetClickMask(var3)); return 1; diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index e5cc8b1886..51e80c8a4b 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -234,7 +234,7 @@ public class class171 { RectangleMode.method6028(ObjectSound.archive2, class40.archive7, Client.isLowDetail); IsaacCipher.method4082(ObjectSound.archive2, class40.archive7); var30 = ObjectSound.archive2; - StructDefinition.field885 = var30; + StructDefinition.StructDefinition_archive = var30; Archive var5 = ObjectSound.archive2; Archive var6 = class40.archive7; boolean var7 = Client.isMembersWorld; @@ -254,7 +254,7 @@ public class class171 { Archive var13 = class40.archive7; SpotAnimationDefinition.SpotAnimationDefinition_archive = var12; SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var13; - UnitPriceComparator.method135(ObjectSound.archive2); + GrandExchangeOfferUnitPriceComparator.setVarbitDefinitionArchive(ObjectSound.archive2); Archive var14 = ObjectSound.archive2; VarpDefinition.field943 = var14; VarpDefinition.field944 = VarpDefinition.field943.method4(16); @@ -274,7 +274,7 @@ public class class171 { EnumDefinition.EnumDefinition_archive = var20; Frames.method3241(ObjectSound.archive2); Archive var21 = ObjectSound.archive2; - ParamDefinition.field679 = var21; + ParamDefinition.ParamDefinition_archive = var21; class196.varcs = new Varcs(); class60.method1172(ObjectSound.archive2, WorldMapSection3.archive8, ByteArrayPool.archive13); Archive var22 = ObjectSound.archive2; @@ -283,7 +283,7 @@ public class class171 { HealthBarDefinition.field380 = var23; Archive var24 = ObjectSound.archive2; Archive var25 = WorldMapSection3.archive8; - WorldMapElement.field1019 = var25; + WorldMapElement.WorldMapElement_archive = var25; if (var24.method2()) { UserComparator4.WorldMapElement_count = var24.method4(35); Widget.WorldMapElement_cached = new WorldMapElement[UserComparator4.WorldMapElement_count]; @@ -304,8 +304,8 @@ public class class171 { } } else if (Client.titleLoadingStage == 80) { var0 = 0; - if (UnitPriceComparator.compass == null) { - UnitPriceComparator.compass = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field878, 0); + if (GrandExchangeOfferUnitPriceComparator.compass == null) { + GrandExchangeOfferUnitPriceComparator.compass = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field878, 0); } else { ++var0; } diff --git a/runescape-client/src/main/java/class196.java b/runescape-client/src/main/java/class196.java index 64d8241dc3..5931b7aa83 100644 --- a/runescape-client/src/main/java/class196.java +++ b/runescape-client/src/main/java/class196.java @@ -18,7 +18,7 @@ public class class196 { garbageValue = "125" ) static int method3736(int var0, Script var1, boolean var2) { - return var0 < 1000 ? Canvas.method861(var0, var1, var2) : (var0 < 1100 ? class1.method8(var0, var1, var2) : (var0 < 1200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 1300 ? class32.method576(var0, var1, var2) : (var0 < 1400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 1500 ? class11.method141(var0, var1, var2) : (var0 < 1600 ? WorldMapSectionType.method253(var0, var1, var2) : (var0 < 1700 ? ScriptEvent.method1185(var0, var1, var2) : (var0 < 1800 ? Formatting.method2023(var0, var1, var2) : (var0 < 1900 ? class16.method188(var0, var1, var2) : (var0 < 2000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 2100 ? class1.method8(var0, var1, var2) : (var0 < 2200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 2300 ? class32.method576(var0, var1, var2) : (var0 < 2400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 2500 ? class11.method141(var0, var1, var2) : (var0 < 2600 ? ViewportMouse.method2983(var0, var1, var2) : (var0 < 2700 ? GrandExchangeEvents.method75(var0, var1, var2) : (var0 < 2800 ? class11.method146(var0, var1, var2) : (var0 < 2900 ? class15.method182(var0, var1, var2) : (var0 < 3000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 3200 ? class4.method54(var0, var1, var2) : (var0 < 3300 ? WorldComparator.method68(var0, var1, var2) : (var0 < 3400 ? ScriptEvent.method1187(var0, var1, var2) : (var0 < 3500 ? Formatting.method2022(var0, var1, var2) : (var0 < 3700 ? FontName.method5639(var0, var1, var2) : (var0 < 4000 ? class248.method4741(var0, var1, var2) : (var0 < 4100 ? TextureProvider.method2752(var0, var1, var2) : (var0 < 4200 ? class211.method4103(var0, var1, var2) : (var0 < 4300 ? class1.method16(var0, var1, var2) : (var0 < 5100 ? DynamicObject.method2223(var0, var1, var2) : (var0 < 5400 ? UserComparator4.method3335(var0, var1, var2) : (var0 < 5600 ? OwnWorldComparator.method1285(var0, var1, var2) : (var0 < 5700 ? Decimator.method2492(var0, var1, var2) : (var0 < 6300 ? class229.method4513(var0, var1, var2) : (var0 < 6600 ? class31.method573(var0, var1, var2) : (var0 < 6700 ? class54.method1093(var0, var1, var2) : 2)))))))))))))))))))))))))))))))))))); + return var0 < 1000 ? Canvas.method861(var0, var1, var2) : (var0 < 1100 ? class1.method8(var0, var1, var2) : (var0 < 1200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 1300 ? class32.method576(var0, var1, var2) : (var0 < 1400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 1500 ? GrandExchangeOfferNameComparator.method141(var0, var1, var2) : (var0 < 1600 ? WorldMapSectionType.method253(var0, var1, var2) : (var0 < 1700 ? ScriptEvent.method1185(var0, var1, var2) : (var0 < 1800 ? Formatting.method2023(var0, var1, var2) : (var0 < 1900 ? class16.method188(var0, var1, var2) : (var0 < 2000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 2100 ? class1.method8(var0, var1, var2) : (var0 < 2200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 2300 ? class32.method576(var0, var1, var2) : (var0 < 2400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 2500 ? GrandExchangeOfferNameComparator.method141(var0, var1, var2) : (var0 < 2600 ? ViewportMouse.method2983(var0, var1, var2) : (var0 < 2700 ? GrandExchangeEvents.method75(var0, var1, var2) : (var0 < 2800 ? GrandExchangeOfferNameComparator.method146(var0, var1, var2) : (var0 < 2900 ? class15.method182(var0, var1, var2) : (var0 < 3000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 3200 ? class4.method54(var0, var1, var2) : (var0 < 3300 ? GrandExchangeOfferWorldComparator.method68(var0, var1, var2) : (var0 < 3400 ? ScriptEvent.method1187(var0, var1, var2) : (var0 < 3500 ? Formatting.method2022(var0, var1, var2) : (var0 < 3700 ? FontName.method5639(var0, var1, var2) : (var0 < 4000 ? class248.method4741(var0, var1, var2) : (var0 < 4100 ? TextureProvider.method2752(var0, var1, var2) : (var0 < 4200 ? class211.method4103(var0, var1, var2) : (var0 < 4300 ? class1.method16(var0, var1, var2) : (var0 < 5100 ? DynamicObject.method2223(var0, var1, var2) : (var0 < 5400 ? UserComparator4.method3335(var0, var1, var2) : (var0 < 5600 ? GrandExchangeOfferOwnWorldComparator.method1285(var0, var1, var2) : (var0 < 5700 ? Decimator.method2492(var0, var1, var2) : (var0 < 6300 ? class229.method4513(var0, var1, var2) : (var0 < 6600 ? class31.method573(var0, var1, var2) : (var0 < 6700 ? class54.method1093(var0, var1, var2) : 2)))))))))))))))))))))))))))))))))))); } @ObfuscatedName("u") diff --git a/runescape-client/src/main/java/class204.java b/runescape-client/src/main/java/class204.java index c122f6cba3..fe7e8011c0 100644 --- a/runescape-client/src/main/java/class204.java +++ b/runescape-client/src/main/java/class204.java @@ -73,9 +73,9 @@ public class class204 { var17 = var14; } - TotalQuantityComparator.loadTerrain(var18, var1, var13, var3 + var17, 0, 0, var7); + GrandExchangeOfferTotalQuantityComparator.loadTerrain(var18, var1, var13, var3 + var17, 0, 0, var7); } else { - TotalQuantityComparator.loadTerrain(var18, 0, -1, -1, 0, 0, 0); + GrandExchangeOfferTotalQuantityComparator.loadTerrain(var18, 0, -1, -1, 0, 0, 0); } } } diff --git a/runescape-client/src/main/java/class211.java b/runescape-client/src/main/java/class211.java index 7832a23c92..b017a4cdb1 100644 --- a/runescape-client/src/main/java/class211.java +++ b/runescape-client/src/main/java/class211.java @@ -125,7 +125,7 @@ public class class211 { return 1; } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ChatChannel.method2238((char)var7) ? 1 : 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ChatChannel.isCharPrintable((char)var7) ? 1 : 0; return 1; } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; @@ -133,11 +133,11 @@ public class class211 { return 1; } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = UrlRequest.method3271((char)var7) ? 1 : 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = UrlRequest.isCharAlphabetic((char)var7) ? 1 : 0; return 1; } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class159.method3394((char)var7) ? 1 : 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class159.isCharDigit((char)var7) ? 1 : 0; return 1; } else if (var0 == ScriptOpcodes.STRING_LENGTH) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; @@ -185,7 +185,7 @@ public class class211 { var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.indexOf(var5, var8); return 1; - } else if (var0 == 4122) { + } else if (var0 == ScriptOpcodes.UPPERCASE) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toUpperCase(); return 1; diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java index ea8a07849e..59bb98f81f 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/class22.java @@ -112,7 +112,7 @@ public final class class22 { SpriteMask var4 = var0.getSpriteMask(false); if (var4 != null) { if (Client.minimapState < 3) { - UnitPriceComparator.compass.method315(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); + GrandExchangeOfferUnitPriceComparator.compass.method315(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); } else { Rasterizer2D.method5948(var1, var2, 0, var4.xStarts, var4.xWidths); } diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java index b1772ff91e..b42c492b72 100644 --- a/runescape-client/src/main/java/class227.java +++ b/runescape-client/src/main/java/class227.java @@ -299,7 +299,7 @@ public class class227 { long var33; if (var5 == 5) { var25 = 16; - var33 = var6.method290(var0, var1, var2); + var33 = var6.getBoundaryObjectTag(var0, var1, var2); if (var33 != 0L) { var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var33)).int2; } @@ -313,7 +313,7 @@ public class class227 { var6.newWallDecoration(var0, var1, var2, var16, (Entity)var27, (Entity)null, Tiles.field911[var4], 0, var25 * Tiles.field913[var4], var25 * Tiles.field914[var4], var19, var21); } else if (var5 == 6) { var25 = 8; - var33 = var6.method290(var0, var1, var2); + var33 = var6.getBoundaryObjectTag(var0, var1, var2); if (var33 != 0L) { var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var33)).int2 / 2; } @@ -336,7 +336,7 @@ public class class227 { var6.newWallDecoration(var0, var1, var2, var16, (Entity)var32, (Entity)null, 256, var22, 0, 0, var19, var21); } else if (var5 == 8) { var25 = 8; - var33 = var6.method290(var0, var1, var2); + var33 = var6.getBoundaryObjectTag(var0, var1, var2); if (var33 != 0L) { var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var33)).int2 / 2; } diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java index 05806fa845..45b2567226 100644 --- a/runescape-client/src/main/java/class229.java +++ b/runescape-client/src/main/java/class229.java @@ -19,7 +19,7 @@ public class class229 { if (var1 != null) { return var1; } else { - byte[] var2 = ParamDefinition.field679.takeFile(11, var0); + byte[] var2 = ParamDefinition.ParamDefinition_archive.takeFile(11, var0); var1 = new ParamDefinition(); if (var2 != null) { var1.decode(new Buffer(var2)); diff --git a/runescape-client/src/main/java/class248.java b/runescape-client/src/main/java/class248.java index f3e00fb049..83ad2b9478 100644 --- a/runescape-client/src/main/java/class248.java +++ b/runescape-client/src/main/java/class248.java @@ -243,14 +243,14 @@ public class class248 { if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if (FloorDecoration.grandExchangeEvents != null) { - FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field373, var5); + FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.geItemNameComparator, var5); } return 1; } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if (FloorDecoration.grandExchangeEvents != null) { - FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field372, var5); + FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.geUnitPriceComparator, var5); } return 1; @@ -259,22 +259,22 @@ public class class248 { var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] == 1; boolean var13 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1; if (FloorDecoration.grandExchangeEvents != null) { - Client.field159.field666 = var13; - FloorDecoration.grandExchangeEvents.sort(Client.field159, var5); + Client.geOwnWorldComparator.compareOwnWorld = var13; + FloorDecoration.grandExchangeEvents.sort(Client.geOwnWorldComparator, var5); } return 1; } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if (FloorDecoration.grandExchangeEvents != null) { - FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field371, var5); + FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.geAgeComparator, var5); } return 1; } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if (FloorDecoration.grandExchangeEvents != null) { - FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field374, var5); + FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.geTotalQuantityComparator, var5); } return 1; @@ -291,12 +291,12 @@ public class class248 { } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.method119(); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.getOfferName(); return 1; } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.method120(); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.getPreviousOfferName(); return 1; } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; diff --git a/runescape-client/src/main/java/class249.java b/runescape-client/src/main/java/class249.java index 5693e89cd6..dc09ff3081 100644 --- a/runescape-client/src/main/java/class249.java +++ b/runescape-client/src/main/java/class249.java @@ -30,11 +30,12 @@ public enum class249 implements Enumerated { @ObfuscatedGetter( intValue = 1686539261 ) - final int field3276; + @Export("id") + final int id; private class249(int var3, int var4) { this.field3275 = var3; - this.field3276 = var4; + this.id = var4; } @ObfuscatedName("f") @@ -44,6 +45,6 @@ public enum class249 implements Enumerated { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field3276; + return this.id; } } diff --git a/runescape-client/src/main/java/class258.java b/runescape-client/src/main/java/class258.java index cf4d55d817..c020bc70dd 100644 --- a/runescape-client/src/main/java/class258.java +++ b/runescape-client/src/main/java/class258.java @@ -42,7 +42,7 @@ public class class258 { PendingSpawn var9 = null; for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0 == var10.level && var10.x == var1 && var2 == var10.y && var3 == var10.type) { + if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { var9 = var10; break; } @@ -50,7 +50,7 @@ public class class258 { if (var9 == null) { var9 = new PendingSpawn(); - var9.level = var0; + var9.plane = var0; var9.type = var3; var9.x = var1; var9.y = var2; diff --git a/runescape-client/src/main/java/class266.java b/runescape-client/src/main/java/class266.java index 530e82e647..275ac90a19 100644 --- a/runescape-client/src/main/java/class266.java +++ b/runescape-client/src/main/java/class266.java @@ -33,11 +33,12 @@ public enum class266 implements Enumerated { @ObfuscatedGetter( intValue = -1327532101 ) - final int field3530; + @Export("id") + final int id; private class266(int var3, int var4) { this.field3528 = var3; - this.field3530 = var4; + this.id = var4; } @ObfuscatedName("f") @@ -47,7 +48,7 @@ public enum class266 implements Enumerated { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field3530; + return this.id; } @ObfuscatedName("ft") diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index 70a71e1b02..98d7e65ec0 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -116,29 +116,30 @@ public class class3 implements Enumerated { signature = "(IIIZIZI)V", garbageValue = "653716649" ) - static void method42(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { - if (var0 < var1) { - int var6 = (var0 + var1) / 2; - int var7 = var0; + @Export("doWorldSorting") + static void doWorldSorting(int lowestUnsorted, int highestUnsorted, int primaryMode, boolean primaryReversed, int secondaryMode, boolean secondaryReversed) { + if (lowestUnsorted < highestUnsorted) { + int var6 = (lowestUnsorted + highestUnsorted) / 2; + int var7 = lowestUnsorted; World var8 = ItemContainer.worlds[var6]; - ItemContainer.worlds[var6] = ItemContainer.worlds[var1]; - ItemContainer.worlds[var1] = var8; + ItemContainer.worlds[var6] = ItemContainer.worlds[highestUnsorted]; + ItemContainer.worlds[highestUnsorted] = var8; - for (int var9 = var0; var9 < var1; ++var9) { + for (int var9 = lowestUnsorted; var9 < highestUnsorted; ++var9) { World var10 = ItemContainer.worlds[var9]; - int var11 = WorldMapLabel.compareWorlds(var10, var8, var2, var3); + int var11 = WorldMapLabel.compareWorlds(var10, var8, primaryMode, primaryReversed); int var12; if (var11 != 0) { - if (var3) { + if (primaryReversed) { var12 = -var11; } else { var12 = var11; } - } else if (var4 == -1) { + } else if (secondaryMode == -1) { var12 = 0; } else { - int var13 = WorldMapLabel.compareWorlds(var10, var8, var4, var5); - if (var5) { + int var13 = WorldMapLabel.compareWorlds(var10, var8, secondaryMode, secondaryReversed); + if (secondaryReversed) { var12 = -var13; } else { var12 = var13; @@ -152,10 +153,10 @@ public class class3 implements Enumerated { } } - ItemContainer.worlds[var1] = ItemContainer.worlds[var7]; + ItemContainer.worlds[highestUnsorted] = ItemContainer.worlds[var7]; ItemContainer.worlds[var7] = var8; - method42(var0, var7 - 1, var2, var3, var4, var5); - method42(var7 + 1, var1, var2, var3, var4, var5); + doWorldSorting(lowestUnsorted, var7 - 1, primaryMode, primaryReversed, secondaryMode, secondaryReversed); + doWorldSorting(var7 + 1, highestUnsorted, primaryMode, primaryReversed, secondaryMode, secondaryReversed); } } @@ -299,7 +300,7 @@ public class class3 implements Enumerated { } var1.exportIndex(); - WorldComparator.method67(var1); + GrandExchangeOfferWorldComparator.method67(var1); for (var13 = 0; var13 < Client.field211; ++var13) { var3 = Client.field212[var13]; diff --git a/runescape-client/src/main/java/class31.java b/runescape-client/src/main/java/class31.java index 4d678dc0bb..ad52fd4fdb 100644 --- a/runescape-client/src/main/java/class31.java +++ b/runescape-client/src/main/java/class31.java @@ -137,9 +137,9 @@ public class class31 { boolean var9 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1; var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; boolean var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3] == 1; - WorldMapSectionType.method248(var6, var9, var5, var10); + WorldMapSectionType.sortWorlds(var6, var9, var5, var10); return 1; - } else if (var0 != 6511) { + } else if (var0 != ScriptOpcodes.GETWORLDINFO) { if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; @@ -188,14 +188,14 @@ public class class31 { var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; var8 = class229.getParamDefinition(var7); if (var8.isString()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = GzipDecompressor.method3702(var6).getStringParam(var7, var8.defaultStr); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = GzipDecompressor.getStructDefinition(var6).getStringParam(var7, var8.defaultStr); } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GzipDecompressor.method3702(var6).getIntParam(var7, var8.defaultInt); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GzipDecompressor.getStructDefinition(var6).getIntParam(var7, var8.defaultInt); } return 1; } else if (var0 == ScriptOpcodes.ON_MOBILE) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.field162 ? 1 : 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; return 1; } else if (var0 == ScriptOpcodes.CLIENTTYPE) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.clientType & 3; @@ -258,7 +258,7 @@ public class class31 { static final void method574(String var0) { if (!var0.equals("")) { PacketBufferNode var1 = Interpreter.method1915(ClientPacket.field300, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(WorldMapRegion.method550(var0)); + var1.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var0)); var1.packetBuffer.writeStringCp1252NullTerminated(var0); Client.packetWriter.method241(var1); } diff --git a/runescape-client/src/main/java/class32.java b/runescape-client/src/main/java/class32.java index d0224db34b..5bce438bb1 100644 --- a/runescape-client/src/main/java/class32.java +++ b/runescape-client/src/main/java/class32.java @@ -25,7 +25,7 @@ public class class32 { var0 -= 1000; var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); } else { - var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; } class22.method295(var3); diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 4d9ae2fc98..b23775676d 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -124,7 +124,7 @@ final class class4 implements class0 { RouteStrategy.Interpreter_intStackSize -= 2; var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - Widget var12 = var2 ? WorldMapIcon1.field1030 : class12.field1111; + Widget var12 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; Players.clickWidget(var12, var7, var4); return 1; } else if (var0 == ScriptOpcodes.MOUSECAM) { @@ -161,7 +161,7 @@ final class class4 implements class0 { return 1; } else { PacketBufferNode var10 = Interpreter.method1915(ClientPacket.field238, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeShort(1 + WorldMapRegion.method550(var6) + WorldMapRegion.method550(var9)); + var10.packetBuffer.writeShort(1 + WorldMapRegion.stringCp1252NullTerminatedByteSize(var6) + WorldMapRegion.stringCp1252NullTerminatedByteSize(var9)); var10.packetBuffer.writeStringCp1252NullTerminated(var6); var10.packetBuffer.writeByte(var7); var10.packetBuffer.writeStringCp1252NullTerminated(var9); @@ -224,10 +224,10 @@ final class class4 implements class0 { } else if (var0 == ScriptOpcodes.GETTAPTODROP) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class206.getTapToDrop() ? 1 : 0; return 1; - } else if (var0 == 3129) { + } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { RouteStrategy.Interpreter_intStackSize -= 2; Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; - Client.field197 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; return 1; } else if (var0 == 3130) { RouteStrategy.Interpreter_intStackSize -= 2; @@ -263,7 +263,7 @@ final class class4 implements class0 { return 1; } else if (var0 == 3140) { Client.field151 = 3; - Client.field153 = var2 ? WorldMapIcon1.field1030.id : class12.field1111.id; + Client.field153 = var2 ? WorldMapIcon1.field1030.id : GrandExchangeOfferAgeComparator.field1111.id; return 1; } else if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; @@ -287,7 +287,7 @@ final class class4 implements class0 { return 1; } else if (var0 == 3145) { return 1; - } else if (var0 == 3146) { + } else if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) { var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if (var8 == ReflectionCheck.clientPreferences.titleMusicDisabled) { ReflectionCheck.clientPreferences.titleMusicDisabled = !var8; @@ -295,7 +295,7 @@ final class class4 implements class0 { } return 1; - } else if (var0 == 3147) { + } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.titleMusicDisabled ? 0 : 1; return 1; } else if (var0 == 3148) { diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java index 2352c15295..5e353ec340 100644 --- a/runescape-client/src/main/java/class40.java +++ b/runescape-client/src/main/java/class40.java @@ -757,7 +757,7 @@ public class class40 { WorldMapSection1.cameraX = var6 - var11; GrandExchangeEvents.cameraY = var14 - var12; - class11.cameraZ = var15 - var16; + GrandExchangeOfferNameComparator.cameraZ = var15 - var16; WorldMapIcon1.cameraPitch = var4; MusicPatchNode.cameraYaw = var13; if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (MouseHandler.oculusOrbFocalPointX >> 7 != Canvas.localPlayer.x >> 7 || ScriptEvent.oculusOrbFocalPointY >> 7 != Canvas.localPlayer.y >> 7)) { @@ -774,14 +774,14 @@ public class class40 { } if (!Client.isCameraLocked) { - var4 = UnitPriceComparator.method131(); + var4 = GrandExchangeOfferUnitPriceComparator.method131(); } else { var4 = Login.method2061(); } var13 = WorldMapSection1.cameraX; var6 = GrandExchangeEvents.cameraY; - var14 = class11.cameraZ; + var14 = GrandExchangeOfferNameComparator.cameraZ; var15 = WorldMapIcon1.cameraPitch; var22 = MusicPatchNode.cameraYaw; @@ -797,7 +797,7 @@ public class class40 { } if (var24 == 2) { - class11.cameraZ += var9; + GrandExchangeOfferNameComparator.cameraZ += var9; } if (var24 == 3) { @@ -842,12 +842,12 @@ public class class40 { class13.playPcmPlayers(); var10 = Rasterizer3D.Rasterizer3D_zoom; Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; - class65.scene.draw(WorldMapSection1.cameraX, GrandExchangeEvents.cameraY, class11.cameraZ, WorldMapIcon1.cameraPitch, MusicPatchNode.cameraYaw, var4); + class65.scene.draw(WorldMapSection1.cameraX, GrandExchangeEvents.cameraY, GrandExchangeOfferNameComparator.cameraZ, WorldMapIcon1.cameraPitch, MusicPatchNode.cameraYaw, var4); Rasterizer3D.Rasterizer3D_zoom = var10; class13.playPcmPlayers(); class65.scene.clearTempGameObjects(); UrlRequester.method3258(var0, var1, var2, var3); - UnitPriceComparator.method136(var0, var1); + GrandExchangeOfferUnitPriceComparator.method136(var0, var1); ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field183); Client.field208 = 0; var11 = (Canvas.localPlayer.x >> 7) + class50.baseX; @@ -866,7 +866,7 @@ public class class40 { WorldMapSection1.cameraX = var13; GrandExchangeEvents.cameraY = var6; - class11.cameraZ = var14; + GrandExchangeOfferNameComparator.cameraZ = var14; WorldMapIcon1.cameraPitch = var15; MusicPatchNode.cameraYaw = var22; if (Client.isLoading) { diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java index f57969ae3a..7519252f20 100644 --- a/runescape-client/src/main/java/class54.java +++ b/runescape-client/src/main/java/class54.java @@ -672,19 +672,19 @@ public final class class54 { return 1; } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - BufferedFile.worldMap().method371(var5.x, var5.y); + BufferedFile.worldMap().setWorldMapPositionTargetInstant(var5.x, var5.y); return 1; } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - BufferedFile.worldMap().method372(var5.plane, var5.x, var5.y); + BufferedFile.worldMap().jumpToSourceCoord(var5.plane, var5.x, var5.y); return 1; } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); - BufferedFile.worldMap().method373(var5.plane, var5.x, var5.y); + BufferedFile.worldMap().jumpToSourceCoordInstant(var5.plane, var5.x, var5.y); return 1; } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method374(); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method375(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getDisplayX(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getDisplayY(); return 1; } else { WorldMapArea var6; @@ -737,7 +737,7 @@ public final class class54 { return 1; } else if (var0 == 6615) { - var5 = BufferedFile.worldMap().method376(); + var5 = BufferedFile.worldMap().getDisplayCoord(); if (var5 == null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; @@ -794,13 +794,13 @@ public final class class54 { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var8 = new Coord(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); - TotalQuantityComparator.method96(var3, var8, false); + GrandExchangeOfferTotalQuantityComparator.method96(var3, var8, false); return 1; } else if (var0 == 6620) { RouteStrategy.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var8 = new Coord(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); - TotalQuantityComparator.method96(var3, var8, true); + GrandExchangeOfferTotalQuantityComparator.method96(var3, var8, true); return 1; } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { RouteStrategy.Interpreter_intStackSize -= 2; @@ -815,8 +815,8 @@ public final class class54 { return 1; } } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method377(); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method378(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getDisplayWith(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getDisplayHeight(); return 1; } else if (var0 == 6623) { var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); @@ -844,7 +844,7 @@ public final class class54 { boolean var9; if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { var9 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - BufferedFile.worldMap().perpetualFlash(var9); + BufferedFile.worldMap().setPerpetualFlash(var9); return 1; } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; @@ -906,7 +906,7 @@ public final class class54 { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.element(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.getElement(); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.coord2.packed(); } @@ -917,7 +917,7 @@ public final class class54 { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.element(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.getElement(); Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.coord2.packed(); } @@ -1097,7 +1097,7 @@ public final class class54 { var2 = 0; if (var11 >= 0 || var10 != 0) { - var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.field197 : Client.oculusOrbNormalSpeed; + var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.oculusOrbSlowedSpeed : Client.oculusOrbNormalSpeed; var2 *= 16; Client.field195 = var11; Client.field196 = var10; diff --git a/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java b/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java index 8e3084a0a7..1c6980a8b4 100644 --- a/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java +++ b/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java @@ -42,6 +42,7 @@ public class ScriptOpcodes { public static final int CC_SETSIZE = 1001; public static final int CC_SETHIDE = 1003; public static final int CC_SETNOCLICKTHROUGH = 1005; + public static final int CC_SETNOSCROLLTHROUGH = 1006; public static final int CC_SETSCROLLPOS = 1100; public static final int CC_SETCOLOUR = 1101; public static final int CC_SETFILL = 1102; @@ -251,11 +252,14 @@ public class ScriptOpcodes { public static final int SETSHOWLOADINGMESSAGES = 3126; public static final int SETTAPTODROP = 3127; public static final int GETTAPTODROP = 3128; + public static final int SETOCULUSORBSPEED = 3129; public static final int GETCANVASSIZE = 3132; public static final int SETHIDEUSERNAME = 3141; public static final int GETHIDEUSERNAME = 3142; public static final int SETREMEMBERUSERNAME = 3143; public static final int GETREMEMBERUSERNAME = 3144; + public static final int SETTITLEMUSICENABLED = 3146; + public static final int GETTITLEMUSICENABLED = 3147; public static final int SOUND_SYNTH = 3200; public static final int SOUND_SONG = 3201; public static final int SOUND_JINGLE = 3202; @@ -375,6 +379,7 @@ public class ScriptOpcodes { public static final int REMOVETAGS = 4119; public static final int STRING_INDEXOF_CHAR = 4120; public static final int STRING_INDEXOF_STRING = 4121; + public static final int UPPERCASE = 4122; public static final int OC_NAME = 4200; public static final int OC_OP = 4201; public static final int OC_IOP = 4202; @@ -425,6 +430,7 @@ public class ScriptOpcodes { public static final int WORLDLIST_NEXT = 6502; public static final int WORLDLIST_SPECIFIC = 6506; public static final int WORLDLIST_SORT = 6507; + public static final int GETWORLDINFO = 6511; public static final int SETFOLLOWEROPSLOWPRIORITY = 6512; public static final int NC_PARAM = 6513; public static final int LC_PARAM = 6514; From f9c6cd2670c6ab9dafd377ba76e4feb928bda431 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:44:22 +0200 Subject: [PATCH 378/472] tileindicators: Merge nested if statements --- .../plugins/tileindicators/TileIndicatorsOverlay.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java index b7df67dd1a..e701b46390 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java @@ -59,13 +59,11 @@ public class TileIndicatorsOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (plugin.isHighlightHoveredTile()) - { + if (plugin.isHighlightHoveredTile() && // If we have tile "selected" render it - if (client.getSelectedSceneTile() != null) - { - renderTile(graphics, client.getSelectedSceneTile().getLocalLocation(), plugin.getHighlightHoveredColor()); - } + client.getSelectedSceneTile() != null) + { + renderTile(graphics, client.getSelectedSceneTile().getLocalLocation(), plugin.getHighlightHoveredColor()); } if (plugin.isHighlightDestinationTile()) From 6f7009ae5e0aa11f28ff9a8437ae0c7aba186844 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:45:22 +0200 Subject: [PATCH 379/472] timers: Merge nested if statements --- .../client/plugins/timers/TimersPlugin.java | 52 +++---------------- 1 file changed, 8 insertions(+), 44 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index 36071cacf2..1b3cbfeb62 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -60,11 +60,11 @@ import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; -import net.runelite.api.events.SpotAnimationChanged; import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.LocalPlayerDeath; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.NpcDespawned; +import net.runelite.api.events.SpotAnimationChanged; import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.WidgetHiddenChanged; import net.runelite.api.widgets.Widget; @@ -78,41 +78,7 @@ import net.runelite.client.game.SpriteManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import static net.runelite.client.plugins.timers.GameIndicator.VENGEANCE_ACTIVE; -import static net.runelite.client.plugins.timers.GameTimer.ABYSSAL_SIRE_STUN; -import static net.runelite.client.plugins.timers.GameTimer.ANTIFIRE; -import static net.runelite.client.plugins.timers.GameTimer.ANTIPOISON; -import static net.runelite.client.plugins.timers.GameTimer.ANTIVENOM; -import static net.runelite.client.plugins.timers.GameTimer.BIND; -import static net.runelite.client.plugins.timers.GameTimer.CANNON; -import static net.runelite.client.plugins.timers.GameTimer.CHARGE; -import static net.runelite.client.plugins.timers.GameTimer.DMM_FULLTB; -import static net.runelite.client.plugins.timers.GameTimer.DMM_HALFTB; -import static net.runelite.client.plugins.timers.GameTimer.ENTANGLE; -import static net.runelite.client.plugins.timers.GameTimer.EXANTIFIRE; -import static net.runelite.client.plugins.timers.GameTimer.EXSUPERANTIFIRE; -import static net.runelite.client.plugins.timers.GameTimer.FULLTB; -import static net.runelite.client.plugins.timers.GameTimer.GOD_WARS_ALTAR; -import static net.runelite.client.plugins.timers.GameTimer.HALFBIND; -import static net.runelite.client.plugins.timers.GameTimer.HALFENTANGLE; -import static net.runelite.client.plugins.timers.GameTimer.HALFSNARE; -import static net.runelite.client.plugins.timers.GameTimer.HALFTB; -import static net.runelite.client.plugins.timers.GameTimer.HOME_TELEPORT; -import static net.runelite.client.plugins.timers.GameTimer.ICEBARRAGE; -import static net.runelite.client.plugins.timers.GameTimer.ICEBLITZ; -import static net.runelite.client.plugins.timers.GameTimer.ICEBURST; -import static net.runelite.client.plugins.timers.GameTimer.ICERUSH; -import static net.runelite.client.plugins.timers.GameTimer.IMBUEDHEART; -import static net.runelite.client.plugins.timers.GameTimer.MAGICIMBUE; -import static net.runelite.client.plugins.timers.GameTimer.MINIGAME_TELEPORT; -import static net.runelite.client.plugins.timers.GameTimer.OVERLOAD; -import static net.runelite.client.plugins.timers.GameTimer.OVERLOAD_RAID; -import static net.runelite.client.plugins.timers.GameTimer.PRAYER_ENHANCE; -import static net.runelite.client.plugins.timers.GameTimer.SKULL; -import static net.runelite.client.plugins.timers.GameTimer.SNARE; -import static net.runelite.client.plugins.timers.GameTimer.STAFF_OF_THE_DEAD; -import static net.runelite.client.plugins.timers.GameTimer.STAMINA; -import static net.runelite.client.plugins.timers.GameTimer.SUPERANTIFIRE; -import static net.runelite.client.plugins.timers.GameTimer.VENGEANCE; +import static net.runelite.client.plugins.timers.GameTimer.*; import net.runelite.client.ui.overlay.infobox.InfoBoxManager; @PluginDescriptor( @@ -677,15 +643,13 @@ public class TimersPlugin extends Plugin } } - if (freezeTimer != null) - { + if (freezeTimer != null && // assume movement means unfrozen - if (freezeTime != client.getTickCount() - && !currentWorldPoint.equals(lastPoint)) - { - removeGameTimer(freezeTimer.getTimer()); - freezeTimer = null; - } + freezeTime != client.getTickCount() + && !currentWorldPoint.equals(lastPoint)) + { + removeGameTimer(freezeTimer.getTimer()); + freezeTimer = null; } lastPoint = currentWorldPoint; From 12749a627099dfbed206a7be35abd11dfb3334fb Mon Sep 17 00:00:00 2001 From: GeChallengeM Date: Sun, 7 Jul 2019 21:46:14 +0200 Subject: [PATCH 380/472] Stops the overlay from activating when it's not supposed to. Before this, you could for example get this bug: Have player safespots turned on and NPC safespots turned off. Interact with another player, which creates a safespotlist. After this, whenever you're interacting with an NPC and then stop interacting with it, the overlay would turn on with the tiles from the old playerinteraction safespotlist highlighted for 10 seconds. --- .../runelite/client/plugins/safespot/SafeSpotPlugin.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java index b702b5d17f..e95934a145 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java @@ -119,15 +119,14 @@ public class SafeSpotPlugin extends Plugin updateSafeSpots(); } } + else if (tickCount > 0) + { + tickCount--; + } else { safeSpotsRenderable = false; } - if (tickCount > 0) - { - tickCount--; - safeSpotsRenderable = true; - } } /** From 6ca3823c29aafccdb1f6b7b4901a51a9d1e12f47 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:46:16 +0200 Subject: [PATCH 381/472] timetracking: Final field --- .../client/plugins/timetracking/hunter/BirdHouseTracker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseTracker.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseTracker.java index bfb71e3287..1c30f2da58 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseTracker.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseTracker.java @@ -50,7 +50,7 @@ public class BirdHouseTracker // average time taken to harvest 10 birds, in seconds static final int BIRD_HOUSE_DURATION = (int) Duration.ofMinutes(50).getSeconds(); - private static ImmutableSet FOSSIL_ISLAND_REGIONS = ImmutableSet.of(14650, 14651, 14652, 14906, 14907, 15162, 15163); + private static final ImmutableSet FOSSIL_ISLAND_REGIONS = ImmutableSet.of(14650, 14651, 14652, 14906, 14907, 15162, 15163); private final Client client; private final ItemManager itemManager; From ad9597b9923210610d12a9869ec8ac190fb58e91 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:46:32 +0200 Subject: [PATCH 382/472] timetracking: Access levels --- .../client/plugins/timetracking/clocks/ClockManager.java | 2 +- .../runelite/client/plugins/timetracking/clocks/ClockPanel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockManager.java index 3be9dc053b..7690423f03 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockManager.java @@ -62,7 +62,7 @@ public class ClockManager @Getter private ClockTabPanel clockTabPanel; - ClockManager() + private ClockManager() { try { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockPanel.java index 98db274ee2..9b0e2c24cd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockPanel.java @@ -242,7 +242,7 @@ abstract class ClockPanel extends JPanel } } - void updateActivityStatus() + private void updateActivityStatus() { boolean isActive = clock.isActive(); From 319914677ac919b7c3550d024afe311c9bf58207 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:48:07 +0200 Subject: [PATCH 383/472] tobdamagecount: Final field --- .../client/plugins/tobdamagecount/DamageCounterPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java index 1202e4466b..273c0be164 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java @@ -93,7 +93,7 @@ public class DamageCounterPlugin extends Plugin private static final int[] ToB_Region = {MAIDEN_REGION, MAIDEN_REGION_1, BLOAT_REGION, NYLOCAS_REGION, SOTETSEG_REGION, SOTETSEG_REGION2, XARPUS_REGION, VERZIK_REGION}; //setting up the array for a check list - private static int[] NPCARRAY = {NpcID.THE_MAIDEN_OF_SUGADINTI, NpcID.THE_MAIDEN_OF_SUGADINTI_8361, + private static final int[] NPCARRAY = {NpcID.THE_MAIDEN_OF_SUGADINTI, NpcID.THE_MAIDEN_OF_SUGADINTI_8361, NpcID.THE_MAIDEN_OF_SUGADINTI_8362, NpcID.THE_MAIDEN_OF_SUGADINTI_8363, NpcID.THE_MAIDEN_OF_SUGADINTI_8364, NpcID.THE_MAIDEN_OF_SUGADINTI_8365, NpcID.PESTILENT_BLOAT, NpcID.NYLOCAS_VASILIAS, NpcID.NYLOCAS_VASILIAS_8355, NpcID.NYLOCAS_VASILIAS_8356, NpcID.NYLOCAS_VASILIAS_8357, NpcID.SOTETSEG, From fb9bcd09c57ea67b2b98b642d0405d61261044a4 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:49:00 +0200 Subject: [PATCH 384/472] tobdamagecount: Remove unused field and var --- .../client/plugins/tobdamagecount/DamageCounterPlugin.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java index 273c0be164..bdff5c31cd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java @@ -101,8 +101,6 @@ public class DamageCounterPlugin extends Plugin NpcID.VERZIK_VITUR, NpcID.VERZIK_VITUR_8369, NpcID.VERZIK_VITUR_8370, NpcID.VERZIK_VITUR_8371, NpcID.VERZIK_VITUR_8372, NpcID.VERZIK_VITUR_8373, NpcID.VERZIK_VITUR_8374, NpcID.VERZIK_VITUR_8375}; - private int[] HEALTHARRAY = {MAIDENHP, NYLOHP, VERZIKHP}; - @Inject private Client client; @Inject @@ -193,7 +191,6 @@ public class DamageCounterPlugin extends Plugin if (interacting instanceof NPC) { String interactingName = interacting.getName(); - int NPC = ((NPC) interacting).getId(); if (interactingName.equals(BossName)) { DamageCount += (XPtoDamage() * BOSS_MODIFIER); From f06ae013de8bfc42746e2905cda1779f01a0d665 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:49:54 +0200 Subject: [PATCH 385/472] tobdamagecount: Merge nested if statements --- .../tobdamagecount/DamageCounterPlugin.java | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java index bdff5c31cd..842e1cc887 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java @@ -126,21 +126,15 @@ public class DamageCounterPlugin extends Plugin { Player localPlayer = client.getLocalPlayer(); Actor interacting = localPlayer.getInteracting(); - if (client.getGameState() == GameState.LOGGED_IN) + if (client.getGameState() == GameState.LOGGED_IN && BossName == null && interacting instanceof NPC) { - if (BossName == null) + int interactingId = ((NPC) interacting).getId(); + String interactingName = interacting.getName(); + for (int aNPCARRAY : NPCARRAY) { - if (interacting instanceof NPC) + if (aNPCARRAY == interactingId) { - int interactingId = ((NPC) interacting).getId(); - String interactingName = interacting.getName(); - for (int aNPCARRAY : NPCARRAY) - { - if (aNPCARRAY == interactingId) - { - BossName = interactingName; - } - } + BossName = interactingName; } } } @@ -186,16 +180,13 @@ public class DamageCounterPlugin extends Plugin { Player localPlayer = client.getLocalPlayer(); Actor interacting = localPlayer.getInteracting(); - if (client.getGameState() == GameState.LOGGED_IN) + if (client.getGameState() == GameState.LOGGED_IN && interacting instanceof NPC) { - if (interacting instanceof NPC) + String interactingName = interacting.getName(); + if (interactingName.equals(BossName)) { - String interactingName = interacting.getName(); - if (interactingName.equals(BossName)) - { - DamageCount += (XPtoDamage() * BOSS_MODIFIER); + DamageCount += (XPtoDamage() * BOSS_MODIFIER); - } } } } From 14f1088eed5a3dfa40e6a85a3ebbb199189783c4 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:50:30 +0200 Subject: [PATCH 386/472] vetion: Final field --- .../java/net/runelite/client/plugins/vetion/VetionOverlay.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionOverlay.java index 6dccc6abc3..0a42864ffe 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionOverlay.java @@ -45,7 +45,7 @@ public class VetionOverlay extends Overlay private static final Color RED_ALPHA = new Color(Color.RED.getRed(), Color.RED.getGreen(), Color.RED.getBlue(), 100); private static final Duration MAX_TIME = Duration.ofSeconds(9); private final VetionPlugin plugin; - private Client client; + private final Client client; @Inject private VetionOverlay(Client client, VetionPlugin plugin) From 3bea5078742c2480224143d8c18fbb77f6407549 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:51:04 +0200 Subject: [PATCH 387/472] vorkath: Final fields --- .../net/runelite/client/plugins/vorkath/VorkathOverlay.java | 4 ++-- .../client/plugins/vorkath/ZombifiedSpawnOverlay.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java index af8635f8af..02470ffea8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java @@ -51,8 +51,8 @@ public class VorkathOverlay extends Overlay private static final int OVERLAY_ICON_DISTANCE = 30; private static final int OVERLAY_ICON_MARGIN = 1; - private Client client; - private VorkathPlugin plugin; + private final Client client; + private final VorkathPlugin plugin; @Inject public VorkathOverlay(final Client client, final VorkathPlugin plugin) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/ZombifiedSpawnOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/ZombifiedSpawnOverlay.java index 145eb2602d..a0cbc0451a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/ZombifiedSpawnOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/ZombifiedSpawnOverlay.java @@ -37,7 +37,7 @@ import net.runelite.client.ui.overlay.OverlayUtil; @Singleton public class ZombifiedSpawnOverlay extends Overlay { - private VorkathPlugin plugin; + private final VorkathPlugin plugin; @Inject public ZombifiedSpawnOverlay(final VorkathPlugin plugin) From 7e178ff57f26ad1277017f827558b3f57bfe4519 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:51:21 +0200 Subject: [PATCH 388/472] vorkath: Null check --- .../net/runelite/client/plugins/vorkath/VorkathOverlay.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java index 02470ffea8..d55484adb6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java @@ -80,7 +80,11 @@ public class VorkathOverlay extends Overlay BufferedImage currentPhaseIcon = getIcon(vorkath); - int totalWidth = currentPhaseIcon.getWidth() * OVERLAY_ICON_MARGIN; + int totalWidth = 0; + if (currentPhaseIcon != null) + { + totalWidth = currentPhaseIcon.getWidth() * OVERLAY_ICON_MARGIN; + } int bgPadding = 8; int currentPosX = 0; From f98fe211261beff4ce0c24dba8fc7711b6202c9a Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:52:34 +0200 Subject: [PATCH 389/472] warindicators: Merge nested if statements --- .../warindicators/WarIndicatorMiniMapOverlay.java | 7 ++----- .../plugins/warindicators/WarIndicatorOverlay.java | 14 ++++---------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorMiniMapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorMiniMapOverlay.java index 3e278405e5..5e3e253797 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorMiniMapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorMiniMapOverlay.java @@ -68,12 +68,9 @@ public class WarIndicatorMiniMapOverlay extends Overlay String[] callers = plugin.getGetActiveCallers().split(", "); String[] targets = plugin.getGetTargetedSnipes().split(", "); - if (plugin.isCallerMinimap() && ArrayUtils.contains(callers, actor.getName())) + if (plugin.isCallerMinimap() && ArrayUtils.contains(callers, actor.getName()) && minimapLocation != null) { - if (minimapLocation != null) - { - OverlayUtil.renderTextLocation(graphics, minimapLocation, name, color); - } + OverlayUtil.renderTextLocation(graphics, minimapLocation, name, color); } if (plugin.isSnipeMinimap() && ArrayUtils.contains(targets, actor.getName())) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorOverlay.java index 4d24401d7d..c430a3ba28 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorOverlay.java @@ -73,20 +73,14 @@ public class WarIndicatorOverlay extends Overlay String[] callers = plugin.getGetActiveCallers().split(", "); String[] targets = plugin.getGetTargetedSnipes().split(", "); - if (plugin.isCallerTile() && ArrayUtils.contains(callers, actor.getName())) + if (plugin.isCallerTile() && ArrayUtils.contains(callers, actor.getName()) && poly != null) { - if (poly != null) - { - OverlayUtil.renderPolygon(graphics, poly, color); - } + OverlayUtil.renderPolygon(graphics, poly, color); } - if (plugin.isSnipeTile() && ArrayUtils.contains(targets, actor.getName())) + if (plugin.isSnipeTile() && ArrayUtils.contains(targets, actor.getName()) && poly != null) { - if (poly != null) - { - OverlayUtil.renderPolygon(graphics, poly, color); - } + OverlayUtil.renderPolygon(graphics, poly, color); } String name = actor.getName().replace('\u00A0', ' '); From 9ed6759c838a6e1c8b0380e03217a09ed0699452 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:53:02 +0200 Subject: [PATCH 390/472] whalewatchers: Final fields --- .../plugins/whalewatchers/WhaleWatchersGloryOverlay.java | 4 ++-- .../client/plugins/whalewatchers/WhaleWatchersOverlay.java | 6 +++--- .../plugins/whalewatchers/WhaleWatchersProtOverlay.java | 4 ++-- .../whalewatchers/WhaleWatchersSmiteableOverlay.java | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java index d5b9d32afa..3423fa083d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java @@ -28,8 +28,8 @@ import net.runelite.client.ui.overlay.components.TitleComponent; @Singleton public class WhaleWatchersGloryOverlay extends Overlay { - private WhaleWatchersPlugin plugin; - private PanelComponent panelComponent; + private final WhaleWatchersPlugin plugin; + private final PanelComponent panelComponent; @Inject private ItemManager itemManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersOverlay.java index a915399cab..2ee2ed02e3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersOverlay.java @@ -31,9 +31,9 @@ import net.runelite.client.ui.overlay.components.TitleComponent; @Singleton public class WhaleWatchersOverlay extends Overlay { - private Client client; - private WhaleWatchersPlugin plugin; - private PanelComponent panelComponent; + private final Client client; + private final WhaleWatchersPlugin plugin; + private final PanelComponent panelComponent; private String lastOpponent = "-"; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java index 17de8ac9b8..f93a397d2e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java @@ -34,8 +34,8 @@ import net.runelite.client.ui.overlay.OverlayUtil; public class WhaleWatchersProtOverlay extends Overlay { - private Client client; - private WhaleWatchersPlugin plugin; + private final Client client; + private final WhaleWatchersPlugin plugin; @Inject public WhaleWatchersProtOverlay(final Client client, final WhaleWatchersPlugin plugin) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersSmiteableOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersSmiteableOverlay.java index 0d2cd567e9..4a5b434900 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersSmiteableOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersSmiteableOverlay.java @@ -28,8 +28,8 @@ import net.runelite.client.ui.overlay.components.TitleComponent; @Singleton public class WhaleWatchersSmiteableOverlay extends Overlay { - private WhaleWatchersPlugin plugin; - private PanelComponent panelComponent; + private final WhaleWatchersPlugin plugin; + private final PanelComponent panelComponent; @Inject From 9764fac99632fd1ec408ff4242c3ed3e0502030f Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:54:17 +0200 Subject: [PATCH 391/472] whalewatchers: Merge nested if statements --- .../whalewatchers/WhaleWatchersPlugin.java | 32 ++++++------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java index a35c9fe846..31878c18ab 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java @@ -98,12 +98,9 @@ public class WhaleWatchersPlugin extends Plugin @Subscribe public void onOverlayMenuClicked(OverlayMenuClicked event) { - if (event.getOverlay().equals(overlay)) + if (event.getOverlay().equals(overlay) && event.getEntry().getOption().equals("Reset")) { - if (event.getEntry().getOption().equals("Reset")) - { - resetDamageCounter(); - } + resetDamageCounter(); } } @@ -207,16 +204,10 @@ public class WhaleWatchersPlugin extends Plugin @Subscribe public void onVarbitChanged(VarbitChanged event) { - if (this.showDamageCounter) - { - if (client.getVar(VarPlayer.ATTACKING_PLAYER) == -1) + if (this.showDamageCounter && client.getVar(VarPlayer.ATTACKING_PLAYER) == -1 && inCombat) { - if (inCombat) - { - tickCountdown = 10; - } + tickCountdown = 10; } - } if (this.protectItemWarning) { @@ -254,17 +245,14 @@ public class WhaleWatchersPlugin extends Plugin @Subscribe public void onGameTick(GameTick event) { - if (this.showDamageCounter) + if (this.showDamageCounter && tickCountdown > 0 && tickCountdown < 11) { - if (tickCountdown > 0 && tickCountdown < 11) + tickCountdown--; + if (tickCountdown == 1) { - tickCountdown--; - if (tickCountdown == 1) - { - inCombat = false; - resetDamageCounter(); - return; - } + inCombat = false; + resetDamageCounter(); + return; } } if (this.smiteableWarning && (client.getVar(Varbits.IN_WILDERNESS) == 1 || isPvpWorld(client.getWorldType()))) From f706c1ae41ce1c885665d998c8311443126993eb Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:54:40 +0200 Subject: [PATCH 392/472] wildernesslocations: Final field --- .../plugins/wildernesslocations/WildernessLocationsOverlay.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsOverlay.java index 921ed916b6..3a87600da7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsOverlay.java @@ -23,7 +23,7 @@ import net.runelite.client.ui.overlay.components.TextComponent; public class WildernessLocationsOverlay extends Overlay { private final WildernessLocationsPlugin plugin; - private TextComponent textComponent; + private final TextComponent textComponent; @Inject public WildernessLocationsOverlay(final WildernessLocationsPlugin plugin) From ddb0ea89298cbc6187994e57ec9efb783273c0fb Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:55:17 +0200 Subject: [PATCH 393/472] wildernesslocations: Use interface instead of type --- .../wildernesslocations/WildernessLocationsPlugin.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java index b051211fc6..07e7442638 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java @@ -81,7 +81,7 @@ public class WildernessLocationsPlugin extends Plugin private String oldChat = ""; private int currentCooldown = 0; private WorldPoint worldPoint = null; - private final HashMap wildLocs = getLocationMap(); + private final Map wildLocs = getLocationMap(); private final HotkeyListener hotkeyListener = new HotkeyListener(() -> this.keybind) { @@ -202,9 +202,9 @@ public class WildernessLocationsPlugin extends Plugin return s; } - private static HashMap getLocationMap() + private static Map getLocationMap() { - HashMap hashMap = new HashMap<>(); + Map hashMap = new HashMap<>(); Arrays.stream(WildernessLocation.values()).forEach(wildernessLocation -> hashMap.put(wildernessLocation.getWorldArea(), wildernessLocation.getName())); return hashMap; From 631280bc83e5f84f5015540fc2807551a16fc3e8 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:56:37 +0200 Subject: [PATCH 394/472] zulrah: Package private class --- .../runelite/client/plugins/zulrah/patterns/ZulrahPattern.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/patterns/ZulrahPattern.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/patterns/ZulrahPattern.java index caf6bcf575..74f89b05d4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/patterns/ZulrahPattern.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/patterns/ZulrahPattern.java @@ -39,7 +39,7 @@ public abstract class ZulrahPattern { private final List pattern = new ArrayList<>(); - protected final void add(ZulrahLocation loc, ZulrahType type, StandLocation standLocation, Prayer prayer) + final void add(ZulrahLocation loc, ZulrahType type, StandLocation standLocation, Prayer prayer) { add(loc, type, standLocation, false, prayer); } From b13320aea4d32c124956e638a4e6b757e9c4e4f3 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sun, 7 Jul 2019 21:56:57 +0200 Subject: [PATCH 395/472] Remove not used and honestly just bad method in InjectUtil --- .../main/java/net/runelite/injector/InjectUtil.java | 13 ------------- 1 file changed, 13 deletions(-) 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 27b60ce344..1f0275110c 100644 --- a/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java +++ b/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java @@ -181,17 +181,4 @@ public class InjectUtil throw new InjectionException(String.format("Mapped field \"%s\" could not be found.", name)); } - - public static Method findStaticDeob(Inject inject, String name) throws InjectionException - { - for (ClassFile cf : inject.getDeobfuscated().getClasses()) - { - if (cf.findMethod(name) != null) - { - return cf.findMethod(name); - } - } - - throw new InjectionException("Fycj you"); - } } From 8c4593e80f4e5a79b0d94c19a4ab0123d1c9f457 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:57:04 +0200 Subject: [PATCH 396/472] zulrah: Null checks --- .../plugins/zulrah/overlays/ZulrahOverlay.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahOverlay.java index db8136ac24..3d9e5eac0e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahOverlay.java @@ -188,15 +188,24 @@ public class ZulrahOverlay extends Overlay Point zulrahMinimapPoint = Perspective.localToMinimap(client, zulrahLocalTile); Color color = phase.getColor(); graphics.setColor(color); - graphics.fillOval(zulrahMinimapPoint.getX() - 2, zulrahMinimapPoint.getY() - 2, 4, 4); + if (zulrahMinimapPoint != null) + { + graphics.fillOval(zulrahMinimapPoint.getX() - 2, zulrahMinimapPoint.getY() - 2, 4, 4); + } graphics.setColor(TILE_BORDER_COLOR); graphics.setStroke(new BasicStroke(1)); - graphics.drawOval(zulrahMinimapPoint.getX() - 2, zulrahMinimapPoint.getY() - 2, 4, 4); + if (zulrahMinimapPoint != null) + { + graphics.drawOval(zulrahMinimapPoint.getX() - 2, zulrahMinimapPoint.getY() - 2, 4, 4); + } if (next) { graphics.setColor(NEXT_TEXT_COLOR); FontMetrics fm = graphics.getFontMetrics(); - graphics.drawString("Next", zulrahMinimapPoint.getX() - fm.stringWidth("Next") / 2, zulrahMinimapPoint.getY() - 2); + if (zulrahMinimapPoint != null) + { + graphics.drawString("Next", zulrahMinimapPoint.getX() - fm.stringWidth("Next") / 2, zulrahMinimapPoint.getY() - 2); + } } } From 3511158cbc20f64111c50bf2bb182e36281572b2 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:57:47 +0200 Subject: [PATCH 397/472] zulrah: Use equals to compare objects --- .../java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java index c8551b1d0f..54d04c956b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java @@ -214,7 +214,7 @@ public class ZulrahPlugin extends Plugin Actor actor = event.getActor(); if (config.sounds()) { - if (zulrah == actor) + if (zulrah != null && zulrah.equals(actor)) { if (zulrah.getAnimation() == AnimationID.ZULRAH_PHASE) { From 39db9979f7b070718e71b540e7c10d1e9de45534 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:58:40 +0200 Subject: [PATCH 398/472] zulrah: Merge nested if statements --- .../client/plugins/zulrah/ZulrahPlugin.java | 30 ++++++++----------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java index 54d04c956b..82deb0d766 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java @@ -212,26 +212,20 @@ public class ZulrahPlugin extends Plugin } Actor actor = event.getActor(); - if (config.sounds()) + if (config.sounds() && zulrah != null && zulrah.equals(actor) && zulrah.getAnimation() == AnimationID.ZULRAH_PHASE) { - if (zulrah != null && zulrah.equals(actor)) - { - if (zulrah.getAnimation() == AnimationID.ZULRAH_PHASE) - { - Prayer prayer = instance.getNextPhase().getPrayer(); + Prayer prayer = instance.getNextPhase().getPrayer(); - if (prayer != null) - { - switch (prayer) - { - case PROTECT_FROM_MAGIC: - soundManager.playSound(Sound.PRAY_MAGIC); - break; - case PROTECT_FROM_MISSILES: - soundManager.playSound(Sound.PRAY_RANGED); - break; - } - } + if (prayer != null) + { + switch (prayer) + { + case PROTECT_FROM_MAGIC: + soundManager.playSound(Sound.PRAY_MAGIC); + break; + case PROTECT_FROM_MISSILES: + soundManager.playSound(Sound.PRAY_RANGED); + break; } } } From e5dbb4b38cbe64af501c89d3efcb791fab16967c Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:59:23 +0200 Subject: [PATCH 399/472] config: Bulk instead of iteration --- .../java/net/runelite/client/config/ConfigDescriptor.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/config/ConfigDescriptor.java b/runelite-client/src/main/java/net/runelite/client/config/ConfigDescriptor.java index 20013adc67..4ceb696339 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/ConfigDescriptor.java +++ b/runelite-client/src/main/java/net/runelite/client/config/ConfigDescriptor.java @@ -53,10 +53,7 @@ public class ConfigDescriptor Collection allItems = new ArrayList<>(); for (ConfigItemsGroup g : itemGroups) { - for (ConfigItemDescriptor item : g.getItems()) - { - allItems.add(item); - } + allItems.addAll(g.getItems()); } return allItems; } From 9ac2fce5f129a0c642eda124c67779c8c0248a03 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:59:54 +0200 Subject: [PATCH 400/472] config: Acceslevels --- .../src/main/java/net/runelite/client/config/Keybind.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/config/Keybind.java b/runelite-client/src/main/java/net/runelite/client/config/Keybind.java index b0fb4dffcf..8dac88a232 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/Keybind.java +++ b/runelite-client/src/main/java/net/runelite/client/config/Keybind.java @@ -60,7 +60,7 @@ public class Keybind private final int keyCode; private final int modifiers; - protected Keybind(int keyCode, int modifiers, boolean ignoreModifiers) + Keybind(int keyCode, int modifiers, boolean ignoreModifiers) { modifiers &= KEYBOARD_MODIFIER_MASK; @@ -108,7 +108,7 @@ public class Keybind return matches(e, false); } - protected boolean matches(KeyEvent e, boolean ignoreModifiers) + boolean matches(KeyEvent e, boolean ignoreModifiers) { if (NOT_SET.equals(this)) { @@ -177,7 +177,7 @@ public class Keybind return mod; } - public static String getModifiersExText(int modifiers) + private static String getModifiersExText(int modifiers) { StringBuilder buf = new StringBuilder(); if ((modifiers & InputEvent.META_DOWN_MASK) != 0) From 1dfca3328292ecb52e041410da574a17124795e4 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 22:00:17 +0200 Subject: [PATCH 401/472] config: Field should be local --- .../main/java/net/runelite/client/config/ConfigManager.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java index a9adb43b62..af234aeeca 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java +++ b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java @@ -81,7 +81,6 @@ public class ConfigManager @Inject EventBus eventBus; - private final ScheduledExecutorService executor; private final ConfigInvocationHandler handler = new ConfigInvocationHandler(this); private final Properties properties = new Properties(); private final Map configObjectCache = new HashMap<>(); @@ -90,9 +89,8 @@ public class ConfigManager @Inject public ConfigManager(ScheduledExecutorService scheduledExecutorService) { - this.executor = scheduledExecutorService; - executor.scheduleWithFixedDelay(this::sendConfig, 30, 30, TimeUnit.SECONDS); + scheduledExecutorService.scheduleWithFixedDelay(this::sendConfig, 30, 30, TimeUnit.SECONDS); } public final void switchSession() From b37f02869fb9daf6e6aa2285e35d70c665cecf43 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 22:00:39 +0200 Subject: [PATCH 402/472] config: Redundant var --- .../main/java/net/runelite/client/config/ConfigManager.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java index af234aeeca..b22c8e67a7 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java +++ b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java @@ -243,12 +243,10 @@ public class ConfigManager throw new RuntimeException("Non-public configuration classes can't have default methods invoked"); } - T t = (T) Proxy.newProxyInstance(clazz.getClassLoader(), new Class[] + return (T) Proxy.newProxyInstance(clazz.getClassLoader(), new Class[] { clazz }, handler); - - return t; } public List getConfigurationKeys(String prefix) From a24f87e738811e0baef74b6e9a79974f541f9fe6 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 22:02:52 +0200 Subject: [PATCH 403/472] ui: Local fields --- .../ui/components/materialtabs/MaterialTab.java | 5 +---- .../runelite/client/ui/overlay/OverlayRenderer.java | 11 +++++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTab.java b/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTab.java index 365206340c..f4e7e835fc 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTab.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTab.java @@ -57,9 +57,6 @@ public class MaterialTab extends JLabel private static final Border UNSELECTED_BORDER = BorderFactory .createEmptyBorder(5, 10, 5, 10); - /* The tab's containing group */ - private final MaterialTabGroup group; - /* The tab's associated content display */ @Getter private final JComponent content; @@ -75,7 +72,7 @@ public class MaterialTab extends JLabel { super(string); - this.group = group; + /* The tab's containing group */ this.content = content; if (selected) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java index 41a3b9329a..76d5a21386 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java @@ -91,8 +91,6 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener private boolean isResizeable; private OverlayBounds snapCorners; - // Overlay Fonts - private Font clientFont; private Font standardFont; private Font tooltipFont; private Font interfaceFont; @@ -115,10 +113,11 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener private void updateConfig() { - this.clientFont = runeLiteConfig.clientFont(); - this.standardFont = FontManager.getFontFromType(this.clientFont, runeLiteConfig.fontType()); - this.tooltipFont = FontManager.getFontFromType(this.clientFont, runeLiteConfig.tooltipFontType()); - this.interfaceFont = FontManager.getFontFromType(this.clientFont, runeLiteConfig.interfaceFontType()); + // Overlay Fonts + Font clientFont = runeLiteConfig.clientFont(); + this.standardFont = FontManager.getFontFromType(clientFont, runeLiteConfig.fontType()); + this.tooltipFont = FontManager.getFontFromType(clientFont, runeLiteConfig.tooltipFontType()); + this.interfaceFont = FontManager.getFontFromType(clientFont, runeLiteConfig.interfaceFontType()); } @Subscribe From 0cfb6f8d99d479b31f113ba1cc033a9a66ea235c Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 22:03:22 +0200 Subject: [PATCH 404/472] ui: Final fields --- .../java/net/runelite/client/ui/RuneLiteSplashScreen.java | 6 +++--- .../client/ui/components/colorpicker/ColorPanel.java | 2 +- .../client/ui/components/colorpicker/ColorValuePanel.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java b/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java index 895df62c0e..c309537ae2 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java @@ -52,13 +52,13 @@ import org.pushingpixels.substance.internal.SubstanceSynapse; @Singleton public class RuneLiteSplashScreen { - private RuneLiteProperties runeLiteProperties = new RuneLiteProperties(); + private final RuneLiteProperties runeLiteProperties = new RuneLiteProperties(); public JFrame frame; - public JPanel panel = new JPanel(); + public final JPanel panel = new JPanel(); private JLabel messageLabel; private JLabel subMessageLabel; - private JProgressBar progressBar = new JProgressBar(); + private final JProgressBar progressBar = new JProgressBar(); /** * This is not done in the constructor in order to avoid processing in case the user chooses to not load diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorPanel.java b/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorPanel.java index dab064566c..036de05ae2 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorPanel.java @@ -46,7 +46,7 @@ public class ColorPanel extends JPanel private final int size; - private BufferedImage image; + private final BufferedImage image; private Point targetPosition; private int selectedY; private boolean forceRedraw; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorValuePanel.java b/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorValuePanel.java index 08110b01b6..9dddff5bb7 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorValuePanel.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorValuePanel.java @@ -47,8 +47,8 @@ public class ColorValuePanel extends JPanel { private static final int DEFAULT_VALUE = ColorUtil.MAX_RGB_VALUE; - private ColorValueSlider slider = new ColorValueSlider(); - private JTextField input = new JTextField(); + private final ColorValueSlider slider = new ColorValueSlider(); + private final JTextField input = new JTextField(); private Consumer onValueChanged; From ca6fc2525abb29ad8f7ed59cd23358272829ae26 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 22:03:47 +0200 Subject: [PATCH 405/472] ui: Access levels --- .../src/main/java/net/runelite/client/ui/FontManager.java | 2 +- .../java/net/runelite/client/ui/RuneLiteSplashScreen.java | 4 ++-- .../runelite/client/ui/components/CustomScrollBarUI.java | 2 +- .../java/net/runelite/client/ui/components/ProgressBar.java | 2 +- .../client/ui/components/colorpicker/ColorValuePanel.java | 2 +- .../client/ui/overlay/components/table/TableComponent.java | 6 +++--- .../main/java/net/runelite/client/ui/skin/ObsidianSkin.java | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java b/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java index 91a1a658ab..61e9f14569 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java @@ -108,7 +108,7 @@ public class FontManager } } - public static Font getFontOffCorrectSize(Font f) + private static Font getFontOffCorrectSize(Font f) { // Size of the font is already set if (f.getSize2D() > 1) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java b/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java index c309537ae2..7974c121bd 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java @@ -54,8 +54,8 @@ public class RuneLiteSplashScreen { private final RuneLiteProperties runeLiteProperties = new RuneLiteProperties(); - public JFrame frame; - public final JPanel panel = new JPanel(); + private JFrame frame; + private final JPanel panel = new JPanel(); private JLabel messageLabel; private JLabel subMessageLabel; private final JProgressBar progressBar = new JProgressBar(); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/CustomScrollBarUI.java b/runelite-client/src/main/java/net/runelite/client/ui/components/CustomScrollBarUI.java index 128c88197a..29125a9ee3 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/CustomScrollBarUI.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/CustomScrollBarUI.java @@ -76,7 +76,7 @@ public class CustomScrollBarUI extends BasicScrollBarUI /** * Creates an empty JButton to be used as the scroll bar's arrows (to disable the arrows). */ - protected JButton createEmptyButton() + private JButton createEmptyButton() { JButton button = new JButton(); Dimension zeroDim = new Dimension(0, 0); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/ProgressBar.java b/runelite-client/src/main/java/net/runelite/client/ui/components/ProgressBar.java index dc340613d6..ac5ba1cd79 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/ProgressBar.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/ProgressBar.java @@ -159,7 +159,7 @@ public class ProgressBar extends DimmableJPanel centerLabel.setText(isDimmed() ? txt : centerLabelText); } - public int getPercentage() + private int getPercentage() { if (value == 0) { diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorValuePanel.java b/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorValuePanel.java index 9dddff5bb7..43f549143b 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorValuePanel.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorValuePanel.java @@ -43,7 +43,7 @@ import javax.swing.text.DocumentFilter; import net.runelite.client.ui.ColorScheme; import net.runelite.client.util.ColorUtil; -public class ColorValuePanel extends JPanel +class ColorValuePanel extends JPanel { private static final int DEFAULT_VALUE = ColorUtil.MAX_RGB_VALUE; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/table/TableComponent.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/table/TableComponent.java index 6edbca14e8..117b021eca 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/table/TableComponent.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/table/TableComponent.java @@ -341,7 +341,7 @@ public class TableComponent implements LayoutableRenderableEntity defaultColor); } - public void setColumnAlignment(final int col, final TableAlignment alignment) + private void setColumnAlignment(final int col, final TableAlignment alignment) { assert columns.size() > col; columns.get(col).setAlignment(alignment); @@ -409,7 +409,7 @@ public class TableComponent implements LayoutableRenderableEntity this.rows.add(row); } - public void addRows(@Nonnull final String[]... rows) + private void addRows(@Nonnull final String[]... rows) { for (String[] row : rows) { @@ -434,7 +434,7 @@ public class TableComponent implements LayoutableRenderableEntity this.rows.addAll(Arrays.asList(elements)); } - public void addColumn(@Nonnull final String col) + private void addColumn(@Nonnull final String col) { this.columns.add(TableElement.builder().content(col).build()); } diff --git a/runelite-client/src/main/java/net/runelite/client/ui/skin/ObsidianSkin.java b/runelite-client/src/main/java/net/runelite/client/ui/skin/ObsidianSkin.java index 6cd6e140d4..33400b0bdc 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/skin/ObsidianSkin.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/skin/ObsidianSkin.java @@ -46,7 +46,7 @@ import org.pushingpixels.substance.api.painter.overlay.TopLineOverlayPainter; import org.pushingpixels.substance.api.shaper.ClassicButtonShaper; import org.pushingpixels.substance.internal.utils.SubstanceColorUtilities; -public class ObsidianSkin extends SubstanceSkin +class ObsidianSkin extends SubstanceSkin { /** * Display name for this skin. From 4c80c427759f549e96221d8025a3c37c34cb909c Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 22:04:39 +0200 Subject: [PATCH 406/472] ui: Lambda is present --- .../java/net/runelite/client/ui/overlay/OverlayManager.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java index d68a7acbc1..40d82c357d 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java @@ -138,10 +138,7 @@ public class OverlayManager Optional optionalOverlayMenuEntry = menuEntries.stream() .filter(me -> me.getOption().equals(event.getOption())) .findAny(); - if (optionalOverlayMenuEntry.isPresent()) - { - eventBus.post(new OverlayMenuClicked(optionalOverlayMenuEntry.get(), overlay)); - } + optionalOverlayMenuEntry.ifPresent(overlayMenuEntry -> eventBus.post(new OverlayMenuClicked(overlayMenuEntry, overlay))); } } From f8e5ee6fb20852d927ac06a197f91dfe6f0decd5 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 22:05:09 +0200 Subject: [PATCH 407/472] ui: Tabs is never null --- .../client/ui/components/materialtabs/MaterialTabGroup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTabGroup.java b/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTabGroup.java index a25019ad8f..d6ef646b50 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTabGroup.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTabGroup.java @@ -75,7 +75,7 @@ public class MaterialTabGroup extends JPanel public MaterialTab getTab(int index) { - if (tabs == null || tabs.isEmpty()) + if (tabs.isEmpty()) { return null; } From 826133f055333f6970fa2873f96f26a66052d8c9 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 22:05:34 +0200 Subject: [PATCH 408/472] ui: Null check --- .../client/ui/overlay/arrow/ArrowMinimapOverlay.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowMinimapOverlay.java index 904eac78ce..59e3784686 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowMinimapOverlay.java @@ -163,7 +163,10 @@ public class ArrowMinimapOverlay extends Overlay AffineTransform at = new AffineTransform(); if (arrowPoint.isMinimapImagePointToTarget()) { - at.translate(minimapPlayerPos.getX(), minimapPlayerPos.getY()); + if (minimapPlayerPos != null) + { + at.translate(minimapPlayerPos.getX(), minimapPlayerPos.getY()); + } at.rotate(cameraAngle - theta); at.translate(0, 66); at.translate(minimapImageOffset.getX() - minimapImage.getWidth() / 2, minimapImageOffset.getY() - minimapImage.getHeight() / 2); @@ -177,7 +180,10 @@ public class ArrowMinimapOverlay extends Overlay double dY = at.getTranslateY(); //Then apply that position to an un-rotated transform at = new AffineTransform(); - at.translate(minimapPlayerPos.getX(), minimapPlayerPos.getY()); + if (minimapPlayerPos != null) + { + at.translate(minimapPlayerPos.getX(), minimapPlayerPos.getY()); + } at.translate(dX, dY); at.translate(minimapImageOffset.getX() - minimapImage.getWidth() / 2, minimapImageOffset.getY() - minimapImage.getHeight() / 2); } From 094914f1e0a5544dc0dd1693a3a1ba9eb05d8cf9 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 22:05:56 +0200 Subject: [PATCH 409/472] ui: Remove pre-sized array --- .../src/main/java/net/runelite/client/ui/FontManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java b/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java index 61e9f14569..64a271c7e6 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java @@ -214,7 +214,7 @@ public class FontManager public static String[] getAvailableFontNames() { - return fontMap.keySet().toArray(new String[fontMap.keySet().size()]); + return fontMap.keySet().toArray(new String[0]); } public static boolean isAvailable(Font font) From 2b6668429735aa64982d4548fe2092fc0ba192c0 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 22:06:38 +0200 Subject: [PATCH 410/472] ui: Static field --- .../src/main/java/net/runelite/client/ui/NavigationButton.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/NavigationButton.java b/runelite-client/src/main/java/net/runelite/client/ui/NavigationButton.java index 4cc334ac76..d44896cceb 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/NavigationButton.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/NavigationButton.java @@ -54,7 +54,7 @@ public class NavigationButton * Tooltip to show when hovered. */ @Builder.Default - private final String tooltip = ""; + private final static String tooltip = ""; /** * Button selection state From a5390e0a5d8667a20f37eea1ec12cbdc8ef90fe7 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 22:07:02 +0200 Subject: [PATCH 411/472] ui: Index of char is faster than string --- .../runelite/client/ui/overlay/components/TextComponent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TextComponent.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TextComponent.java index fba19f5013..c5c65893c0 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TextComponent.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TextComponent.java @@ -67,7 +67,7 @@ public class TextComponent implements RenderableEntity for (String textSplitOnCol : parts) { final String textWithoutCol = textWithoutColTags(textSplitOnCol); - final String colColor = textSplitOnCol.substring(textSplitOnCol.indexOf("=") + 1, textSplitOnCol.indexOf(">")); + final String colColor = textSplitOnCol.substring(textSplitOnCol.indexOf('=') + 1, textSplitOnCol.indexOf('>')); renderText(graphics, x, position.y, textWithoutCol, Color.decode("#" + colColor), borderColor); From e97628ef491a2027306b57c81d97a4af9de6e332 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 22:08:38 +0200 Subject: [PATCH 412/472] ui: Interface instead of type --- .../src/main/java/net/runelite/client/ui/FontManager.java | 3 ++- .../client/ui/overlay/arrow/ArrowMinimapOverlay.java | 4 ++-- .../net/runelite/client/ui/overlay/arrow/ArrowPoint.java | 8 ++++---- .../net/runelite/client/ui/overlay/arrow/ArrowUtil.java | 5 +++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java b/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java index 64a271c7e6..1205c6b3a7 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java @@ -34,6 +34,7 @@ import java.awt.Font; import java.awt.FontFormatException; import java.awt.GraphicsEnvironment; import java.io.IOException; +import java.util.Map; import lombok.Getter; import net.runelite.client.config.FontType; @@ -59,7 +60,7 @@ public class FontManager } private static final ImmutableBiMap fontMap; - private static final HashMap derivedFontMap = new HashMap<>(); + private static final Map derivedFontMap = new HashMap<>(); static { diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowMinimapOverlay.java index 59e3784686..91be8caeca 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowMinimapOverlay.java @@ -28,8 +28,8 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; -import java.util.ArrayList; import java.util.Collection; +import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; @@ -106,7 +106,7 @@ public class ArrowMinimapOverlay extends Overlay else if (arrowPoint.types.contains(ArrowType.OBJECT)) { - ArrayList objects = ArrowUtil.getObjects(client, arrowPoint.getObjectIDs()); + List objects = ArrowUtil.getObjects(client, arrowPoint.getObjectIDs()); if (objects.isEmpty() && fallBackPoint != null) { renderMinimapArrow(graphics, arrowPoint, null, localPlayerPos, worldPlayerPos); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowPoint.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowPoint.java index 9969869356..2b381ca9cc 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowPoint.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowPoint.java @@ -27,7 +27,7 @@ package net.runelite.client.ui.overlay.arrow; import java.awt.Color; import java.awt.image.BufferedImage; import java.util.EnumSet; -import java.util.HashSet; +import java.util.Set; import lombok.Builder; import lombok.Data; import lombok.NonNull; @@ -44,15 +44,15 @@ public class ArrowPoint @NonNull private WorldPoint worldPoint; - private HashSet npcIDs; + private Set npcIDs; - private HashSet objectIDs; + private Set objectIDs; /** * The regions that an NPC or Object has to be in to be marked (eg. Exam Centre locked chest Hard Clue requires * killing a Barbarian in Barbarian Village, or Konar Slayer requires killing monsters in a certain area) */ - private HashSet region; + private Set region; private BufferedImage worldImage; @Builder.Default diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowUtil.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowUtil.java index a4380ae9a4..3d3b864b51 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowUtil.java @@ -1,7 +1,8 @@ package net.runelite.client.ui.overlay.arrow; import java.util.ArrayList; -import java.util.HashSet; +import java.util.List; +import java.util.Set; import net.runelite.api.Client; import net.runelite.api.GameObject; import net.runelite.api.ObjectDefinition; @@ -10,7 +11,7 @@ import net.runelite.api.Tile; class ArrowUtil { - static ArrayList getObjects(final Client client, HashSet objectIDs) + static List getObjects(final Client client, Set objectIDs) { final Scene scene = client.getScene(); final Tile[][] tiles = scene.getTiles()[client.getPlane()]; From 7a299ae8f8d7878b3539812b6f071aedfa6a51c1 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 22:08:55 +0200 Subject: [PATCH 413/472] Revert "ui: Static field" This reverts commit 2b6668429735aa64982d4548fe2092fc0ba192c0. --- .../src/main/java/net/runelite/client/ui/NavigationButton.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/NavigationButton.java b/runelite-client/src/main/java/net/runelite/client/ui/NavigationButton.java index d44896cceb..4cc334ac76 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/NavigationButton.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/NavigationButton.java @@ -54,7 +54,7 @@ public class NavigationButton * Tooltip to show when hovered. */ @Builder.Default - private final static String tooltip = ""; + private final String tooltip = ""; /** * Button selection state From 2635bd2a74d3f313c6535a2bfe7c171290a194c6 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 22:12:10 +0200 Subject: [PATCH 414/472] ui: Fix compiling --- .../runelite/client/ui/overlay/arrow/ArrowWorldOverlay.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowWorldOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowWorldOverlay.java index 72301360f6..d822998223 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowWorldOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowWorldOverlay.java @@ -28,8 +28,8 @@ import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Polygon; import java.awt.image.BufferedImage; -import java.util.ArrayList; import java.util.Collection; +import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; @@ -105,7 +105,7 @@ public class ArrowWorldOverlay extends Overlay else if (arrowPoint.types.contains(ArrowType.OBJECT)) { - ArrayList objects = ArrowUtil.getObjects(client, arrowPoint.getObjectIDs()); + List objects = ArrowUtil.getObjects(client, arrowPoint.getObjectIDs()); if (objects.isEmpty() && fallBackPoint != null) { renderWorldArrow(graphics, arrowPoint, fallBackPoint); From 8370e2096b90ba99e1347092af421764dcf7f971 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 22:14:50 +0200 Subject: [PATCH 415/472] timetracking: Fix runtime --- .../client/plugins/timetracking/clocks/ClockManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockManager.java index 7690423f03..3be9dc053b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockManager.java @@ -62,7 +62,7 @@ public class ClockManager @Getter private ClockTabPanel clockTabPanel; - private ClockManager() + ClockManager() { try { From 0d0e93949f9b60f5228e37b7bead45a06753e0c0 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 22:24:18 +0200 Subject: [PATCH 416/472] checkstyle: Fix checkstyle --- .../plugins/pyramidplunder/PyramidPlunderPlugin.java | 10 ---------- .../plugins/skillcalculator/BankedCalculator.java | 3 ++- .../client/plugins/theatre/rooms/VerzikHandler.java | 1 - 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java index cf73974cdc..f12911344c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java @@ -38,19 +38,9 @@ import lombok.Getter; import net.runelite.api.Client; import static net.runelite.api.Constants.GAME_TICK_LENGTH; import static net.runelite.api.ItemID.PHARAOHS_SCEPTRE; -import static net.runelite.api.ObjectID.GRAND_GOLD_CHEST; -import static net.runelite.api.ObjectID.OPENED_GOLD_CHEST; -import static net.runelite.api.ObjectID.SARCOPHAGUS_21255; -import static net.runelite.api.ObjectID.SARCOPHAGUS_21256; import static net.runelite.api.ObjectID.SPEARTRAP_21280; import static net.runelite.api.ObjectID.TOMB_DOOR_20948; import static net.runelite.api.ObjectID.TOMB_DOOR_20949; -import static net.runelite.api.ObjectID.URN_21261; -import static net.runelite.api.ObjectID.URN_21262; -import static net.runelite.api.ObjectID.URN_21263; -import static net.runelite.api.ObjectID.URN_21265; -import static net.runelite.api.ObjectID.URN_21266; -import static net.runelite.api.ObjectID.URN_21267; import net.runelite.api.Player; import net.runelite.api.Tile; import net.runelite.api.TileObject; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java index fcbd8e89f1..ac7d985013 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java @@ -539,7 +539,8 @@ public class BankedCalculator extends JPanel if (oldMapFlag) { CalculatorType calc = CalculatorType.getBySkill(currentSkill); - SwingUtilities.invokeLater(() -> { + SwingUtilities.invokeLater(() -> + { if (calc != null) { openBanked(calc); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java index 71e26b585b..65cb217054 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java @@ -13,7 +13,6 @@ import net.runelite.api.Actor; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.GraphicsObject; -import net.runelite.api.Model; import net.runelite.api.NPC; import net.runelite.api.Perspective; import net.runelite.api.Player; From 5986befe72ec50f774953b06154ddd32b971652d Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Sun, 7 Jul 2019 21:36:52 +0100 Subject: [PATCH 417/472] boost timer fix (#923) boost timer fix --- .../java/net/runelite/client/plugins/boosts/BoostsPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java index a3ea8a41de..9bbee9f251 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java @@ -445,7 +445,7 @@ public class BoostsPlugin extends Plugin this.displayInfoboxes = config.displayInfoboxes(); this.displayIcons = config.displayIcons(); this.boldIconFont = config.boldIconFont(); - this.displayNextBuffChange = config.displayNextDebuffChange(); + this.displayNextBuffChange = config.displayNextBuffChange(); this.displayNextDebuffChange = config.displayNextDebuffChange(); this.boostThreshold = config.boostThreshold(); this.groupNotifications = config.groupNotifications(); From 4f0ba60f016ed2ba9fd8fbce6955c285e3f0d32b Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Sun, 7 Jul 2019 22:11:29 +0100 Subject: [PATCH 418/472] npcunaggroarea: make the notifications respect the config --- .../client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java index af60fb56ed..fd8d2312f4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java @@ -521,6 +521,10 @@ public class NpcAggroAreaPlugin extends Plugin void doNotification() { + if(!this.sendNotification) + { + return; + } if (hasSentNotification) { return; From 459198cdf0e6b5aa5c46afff3262529aaac5feb0 Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Sun, 7 Jul 2019 22:12:22 +0100 Subject: [PATCH 419/472] guard clauses should have a newline after them --- .../client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java index fd8d2312f4..f2c14bb0cd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java @@ -525,10 +525,12 @@ public class NpcAggroAreaPlugin extends Plugin { return; } + if (hasSentNotification) { return; } + final Player local = client.getLocalPlayer(); hasSentNotification = true; notifier.notify("[" + local.getName() + "]'s aggression timer has run out!"); From 9b44123fd3ab0c91abccb9aab41e3d6ebd070056 Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Sun, 7 Jul 2019 22:21:25 +0100 Subject: [PATCH 420/472] i would force-push this but im using github web --- .../client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java index f2c14bb0cd..f9053cc2dd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java @@ -521,7 +521,7 @@ public class NpcAggroAreaPlugin extends Plugin void doNotification() { - if(!this.sendNotification) + if (!this.sendNotification) { return; } From f5a56e0b177825e165236813b8c42f76f8aecfe6 Mon Sep 17 00:00:00 2001 From: Visne <39844191+Visne@users.noreply.github.com> Date: Sun, 7 Jul 2019 23:47:12 +0200 Subject: [PATCH 421/472] addFriend() and removeFriend() functionality --- .../src/main/java/net/runelite/api/Client.java | 9 +++++++++ .../java/net/runelite/mixins/RSClientMixin.java | 16 ++++++++++++++++ .../java/net/runelite/rs/api/RSFriendSystem.java | 6 ++++++ runescape-client/src/main/java/FontName.java | 2 +- runescape-client/src/main/java/FriendSystem.java | 3 ++- 5 files changed, 34 insertions(+), 2 deletions(-) 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 4b0748ff0e..f19fdea2e3 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -1685,4 +1685,13 @@ public interface Client extends GameShell */ void sortMenuEntries(); + /** + * Add player to friendlist + */ + void addFriend(String name); + + /** + * Remove player from friendlist + */ + void removeFriend(String name); } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index 782f01915b..54002e8293 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -1607,4 +1607,20 @@ public abstract class RSClientMixin implements RSClient return hideFriendAttackOptions && (p.isFriended() || p.isClanMember()); } + + @Inject + @Override + public void addFriend(String friend) + { + RSFriendSystem friendSystem = getFriendManager(); + friendSystem.addFriend(friend); + } + + @Inject + @Override + public void removeFriend(String friend) + { + RSFriendSystem friendSystem = getFriendManager(); + friendSystem.removeFriend(friend); + } } \ No newline at end of file diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFriendSystem.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFriendSystem.java index 017971b308..ce0977f4a8 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFriendSystem.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSFriendSystem.java @@ -13,4 +13,10 @@ public interface RSFriendSystem extends FriendManager @Import("isFriended") boolean isFriended(RSUsername var1, boolean var2); + + @Import("addFriend") + void addFriend(String username); + + @Import("removeFriend") + void removeFriend(String username); } diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index acb0e22e88..dfd20fe4b7 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -147,7 +147,7 @@ public class FontName { return 1; } else if (var0 == 3605) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - WorldMapArea.friendSystem.method103(var4); + WorldMapArea.friendSystem.addFriend(var4); return 1; } else if (var0 == 3606) { var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 911b82db63..558beec2ba 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -129,7 +129,8 @@ public class FriendSystem { signature = "(Ljava/lang/String;I)V", garbageValue = "-1721017960" ) - final void method103(String var1) { + @Export("addFriend") + final void addFriend(String var1) { if (var1 != null) { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { From 05c6743cb03c08a36b0e51c6bdb4a68dde367b19 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 7 Jul 2019 18:22:06 -0400 Subject: [PATCH 422/472] Remove runescape-api and mixins This code is used by internal tooling to build the client patch, which is already closed source, and is not directly shipped as a dependency. Outside contributions to it are rare due to the lack of build tools, and it is primarily being abused by others. As such, I no longer wish to release further changes to it under BSD-2. --- README.md | 2 - pom.xml | 2 - runelite-mixins/pom.xml | 91 - .../java/net/runelite/api/mixins/Copy.java | 48 - .../net/runelite/api/mixins/FieldHook.java | 41 - .../java/net/runelite/api/mixins/Inject.java | 37 - .../net/runelite/api/mixins/MethodHook.java | 41 - .../java/net/runelite/api/mixins/Mixin.java | 44 - .../java/net/runelite/api/mixins/Mixins.java | 37 - .../java/net/runelite/api/mixins/Replace.java | 47 - .../java/net/runelite/api/mixins/Shadow.java | 37 - .../java/net/runelite/mixins/CameraMixin.java | 112 -- .../net/runelite/mixins/ClickboxMixin.java | 320 ---- .../mixins/EntityHiderBridgeMixin.java | 143 -- .../net/runelite/mixins/EntityHiderMixin.java | 172 -- .../runelite/mixins/GraphicsObjectMixin.java | 54 - .../java/net/runelite/mixins/MenuMixin.java | 112 -- .../net/runelite/mixins/MinimapMixin.java | 101 -- .../mixins/ProcessClientErrorMixin.java | 74 - .../net/runelite/mixins/RSActorMixin.java | 286 --- .../mixins/RSChatLineBufferMixin.java | 72 - .../mixins/RSClanMemberManagerMixin.java | 71 - .../runelite/mixins/RSClanMemberMixin.java | 48 - .../net/runelite/mixins/RSClientMixin.java | 1542 ----------------- .../mixins/RSDecorativeObjectMixin.java | 167 -- .../runelite/mixins/RSDynamicObjectMixin.java | 81 - .../java/net/runelite/mixins/RSEnumMixin.java | 75 - .../runelite/mixins/RSFriendManagerMixin.java | 48 - .../net/runelite/mixins/RSFriendMixin.java | 49 - .../runelite/mixins/RSGameCanvasMixin.java | 93 - .../runelite/mixins/RSGameEngineMixin.java | 100 -- .../runelite/mixins/RSGameObjectMixin.java | 110 -- .../mixins/RSGrandExchangeOfferMixin.java | 108 -- .../runelite/mixins/RSGroundObjectMixin.java | 85 - .../net/runelite/mixins/RSHashTableMixin.java | 63 - .../net/runelite/mixins/RSHealthBarMixin.java | 50 - .../net/runelite/mixins/RSIgnoreMixin.java | 49 - .../runelite/mixins/RSIndexDataBaseMixin.java | 139 -- .../mixins/RSItemCompositionMixin.java | 92 - .../runelite/mixins/RSItemContainerMixin.java | 82 - .../net/runelite/mixins/RSItemLayerMixin.java | 58 - .../java/net/runelite/mixins/RSItemMixin.java | 125 -- .../mixins/RSKeyFocusListenerMixin.java | 95 - .../mixins/RSMainBufferProviderMixin.java | 89 - .../runelite/mixins/RSMessageNodeMixin.java | 97 -- .../net/runelite/mixins/RSModelDataMixin.java | 202 --- .../net/runelite/mixins/RSModelMixin.java | 437 ----- .../runelite/mixins/RSMouseInputMixin.java | 209 --- .../mixins/RSMouseWheelHandlerMixin.java | 54 - .../java/net/runelite/mixins/RSNPCMixin.java | 192 -- .../mixins/RSNameableContainerMixin.java | 72 - .../net/runelite/mixins/RSNameableMixin.java | 48 - .../java/net/runelite/mixins/RSNodeMixin.java | 46 - .../mixins/RSNpcCompositionMixin.java | 74 - .../mixins/RSPlayerCompositionMixin.java | 58 - .../net/runelite/mixins/RSPlayerMixin.java | 264 --- .../runelite/mixins/RSProjectileMixin.java | 72 - .../net/runelite/mixins/RSSceneMixin.java | 751 -------- .../mixins/RSSceneTileModelMixin.java | 84 - .../mixins/RSSceneTilePaintMixin.java | 84 - .../net/runelite/mixins/RSSequenceMixin.java | 243 --- .../runelite/mixins/RSSpritePixelsMixin.java | 136 -- .../net/runelite/mixins/RSTextureMixin.java | 92 - .../mixins/RSTextureProviderMixin.java | 58 - .../java/net/runelite/mixins/RSTileMixin.java | 565 ------ .../net/runelite/mixins/RSVarcsMixin.java | 31 - .../runelite/mixins/RSWallObjectMixin.java | 124 -- .../net/runelite/mixins/RSWidgetMixin.java | 584 ------- .../net/runelite/mixins/RSWorldMixin.java | 69 - .../runelite/mixins/Rasterizer2DMixin.java | 244 --- .../net/runelite/mixins/ScriptVMMixin.java | 156 -- .../net/runelite/mixins/SoundEffectMixin.java | 148 -- .../java/net/runelite/mixins/SpriteMixin.java | 80 - .../mixins/StretchedModeMaxSizeMixin.java | 76 - .../runelite/mixins/StretchedModeMixin.java | 216 --- .../net/runelite/mixins/TileObjectMixin.java | 113 -- .../java/net/runelite/mixins/VarbitMixin.java | 158 -- .../runelite/mixins/WidgetSpriteMixin.java | 64 - .../runelite/mixins/WorldHoppingMixin.java | 52 - .../runelite/mixins/WorldMapManagerMixin.java | 58 - .../net/runelite/mixins/WorldMapMixin.java | 53 - .../net/runelite/mixins/RSSceneMixinTest.java | 53 - runescape-api/pom.xml | 46 - .../java/net/runelite/mapping/Construct.java | 51 - .../java/net/runelite/mapping/Import.java | 40 - .../java/net/runelite/rs/api/RSActor.java | 127 -- .../net/runelite/rs/api/RSAudioTaskNode.java | 33 - .../runelite/rs/api/RSAudioTaskNodeQueue.java | 33 - .../java/net/runelite/rs/api/RSBuffer.java | 36 - .../net/runelite/rs/api/RSBufferProvider.java | 46 - .../net/runelite/rs/api/RSCacheableNode.java | 33 - .../net/runelite/rs/api/RSChatLineBuffer.java | 45 - .../net/runelite/rs/api/RSChatPlayer.java | 38 - .../net/runelite/rs/api/RSClanMember.java | 31 - .../runelite/rs/api/RSClanMemberManager.java | 36 - .../java/net/runelite/rs/api/RSClassInfo.java | 41 - .../java/net/runelite/rs/api/RSClient.java | 1016 ----------- .../net/runelite/rs/api/RSCollisionData.java | 34 - .../net/runelite/rs/api/RSCombatInfo1.java | 36 - .../net/runelite/rs/api/RSCombatInfoList.java | 36 - .../rs/api/RSCombatInfoListHolder.java | 36 - .../runelite/rs/api/RSDecorativeObject.java | 60 - .../java/net/runelite/rs/api/RSDeque.java | 36 - .../net/runelite/rs/api/RSDynamicObject.java | 43 - .../main/java/net/runelite/rs/api/RSEnum.java | 49 - .../net/runelite/rs/api/RSFileOnDisk.java | 40 - .../main/java/net/runelite/rs/api/RSFont.java | 30 - .../net/runelite/rs/api/RSFontTypeFace.java | 42 - .../java/net/runelite/rs/api/RSFrame.java | 51 - .../java/net/runelite/rs/api/RSFrameMap.java | 39 - .../java/net/runelite/rs/api/RSFrames.java | 33 - .../java/net/runelite/rs/api/RSFriend.java | 31 - .../runelite/rs/api/RSFriendContainer.java | 29 - .../net/runelite/rs/api/RSFriendManager.java | 40 - .../net/runelite/rs/api/RSGameCanvas.java | 29 - .../net/runelite/rs/api/RSGameEngine.java | 60 - .../net/runelite/rs/api/RSGameObject.java | 70 - .../runelite/rs/api/RSGrandExchangeOffer.java | 56 - .../net/runelite/rs/api/RSGraphicsObject.java | 53 - .../net/runelite/rs/api/RSGroundObject.java | 47 - .../java/net/runelite/rs/api/RSHashTable.java | 41 - .../java/net/runelite/rs/api/RSHealthBar.java | 50 - .../java/net/runelite/rs/api/RSIgnore.java | 31 - .../runelite/rs/api/RSIgnoreContainer.java | 29 - .../java/net/runelite/rs/api/RSIndexData.java | 33 - .../net/runelite/rs/api/RSIndexDataBase.java | 34 - .../net/runelite/rs/api/RSIndexedSprite.java | 95 - .../net/runelite/rs/api/RSIntegerNode.java | 39 - .../main/java/net/runelite/rs/api/RSItem.java | 60 - .../runelite/rs/api/RSItemComposition.java | 92 - .../net/runelite/rs/api/RSItemContainer.java | 37 - .../java/net/runelite/rs/api/RSItemLayer.java | 58 - .../runelite/rs/api/RSIterableHashTable.java | 35 - .../net/runelite/rs/api/RSJagexLoginType.java | 30 - .../runelite/rs/api/RSKeyFocusListener.java | 33 - .../runelite/rs/api/RSMainBufferProvider.java | 43 - .../runelite/rs/api/RSMapElementConfig.java | 35 - .../net/runelite/rs/api/RSMessageNode.java | 62 - .../java/net/runelite/rs/api/RSModel.java | 173 -- .../java/net/runelite/rs/api/RSModelData.java | 69 - .../net/runelite/rs/api/RSMouseInput.java | 33 - .../runelite/rs/api/RSMouseWheelHandler.java | 31 - .../main/java/net/runelite/rs/api/RSNPC.java | 42 - .../net/runelite/rs/api/RSNPCComposition.java | 78 - .../main/java/net/runelite/rs/api/RSName.java | 33 - .../java/net/runelite/rs/api/RSNameable.java | 37 - .../runelite/rs/api/RSNameableContainer.java | 55 - .../main/java/net/runelite/rs/api/RSNode.java | 51 - .../java/net/runelite/rs/api/RSNodeCache.java | 46 - .../runelite/rs/api/RSObjectComposition.java | 59 - .../net/runelite/rs/api/RSPacketBuffer.java | 31 - .../java/net/runelite/rs/api/RSPlayer.java | 66 - .../runelite/rs/api/RSPlayerComposition.java | 49 - .../net/runelite/rs/api/RSPreferences.java | 39 - .../net/runelite/rs/api/RSProjectile.java | 99 -- .../net/runelite/rs/api/RSRawAudioNode.java | 33 - .../net/runelite/rs/api/RSRenderOverview.java | 77 - .../net/runelite/rs/api/RSRenderable.java | 46 - .../java/net/runelite/rs/api/RSResampler.java | 29 - .../net/runelite/rs/api/RSRunException.java | 33 - .../java/net/runelite/rs/api/RSScene.java | 63 - .../net/runelite/rs/api/RSSceneTileModel.java | 87 - .../net/runelite/rs/api/RSSceneTilePaint.java | 55 - .../java/net/runelite/rs/api/RSScript.java | 39 - .../net/runelite/rs/api/RSScriptEvent.java | 47 - .../java/net/runelite/rs/api/RSSequence.java | 51 - .../net/runelite/rs/api/RSSoundEffect.java | 33 - .../java/net/runelite/rs/api/RSSprite.java | 29 - .../net/runelite/rs/api/RSSpritePixels.java | 62 - .../net/runelite/rs/api/RSTaskDataNode.java | 29 - .../java/net/runelite/rs/api/RSTexture.java | 47 - .../runelite/rs/api/RSTextureProvider.java | 53 - .../main/java/net/runelite/rs/api/RSTile.java | 108 -- .../java/net/runelite/rs/api/RSVarbit.java | 39 - .../java/net/runelite/rs/api/RSVarcs.java | 34 - .../net/runelite/rs/api/RSWallObject.java | 65 - .../java/net/runelite/rs/api/RSWidget.java | 474 ----- .../net/runelite/rs/api/RSWidgetNode.java | 35 - .../java/net/runelite/rs/api/RSWorld.java | 85 - .../net/runelite/rs/api/RSWorldMapData.java | 34 - .../runelite/rs/api/RSWorldMapManager.java | 44 - 181 files changed, 17600 deletions(-) delete mode 100644 runelite-mixins/pom.xml delete mode 100644 runelite-mixins/src/main/java/net/runelite/api/mixins/Copy.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/api/mixins/FieldHook.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/api/mixins/Inject.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/api/mixins/MethodHook.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/api/mixins/Mixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/api/mixins/Mixins.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/api/mixins/Replace.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/api/mixins/Shadow.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/CameraMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/ClickboxMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderBridgeMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/GraphicsObjectMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/MenuMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/MinimapMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/ProcessClientErrorMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSChatLineBufferMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSClanMemberManagerMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSClanMemberMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSDecorativeObjectMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSDynamicObjectMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSEnumMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSFriendManagerMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSFriendMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSGameCanvasMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSGameEngineMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSGameObjectMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSGrandExchangeOfferMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSGroundObjectMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSHashTableMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSHealthBarMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSIgnoreMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSIndexDataBaseMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSItemCompositionMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSItemContainerMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSItemLayerMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSItemMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSKeyFocusListenerMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSMainBufferProviderMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSMessageNodeMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSModelDataMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSModelMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSMouseInputMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSMouseWheelHandlerMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSNPCMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSNameableContainerMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSNameableMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSNodeMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSNpcCompositionMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerCompositionMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSProjectileMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSSceneMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSSceneTileModelMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSSceneTilePaintMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSSequenceMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSSpritePixelsMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSTextureMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSTextureProviderMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSVarcsMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSWallObjectMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSWorldMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/Rasterizer2DMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/SoundEffectMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/StretchedModeMaxSizeMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/StretchedModeMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/TileObjectMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/WidgetSpriteMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/WorldHoppingMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/WorldMapManagerMixin.java delete mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/WorldMapMixin.java delete mode 100644 runelite-mixins/src/test/java/net/runelite/mixins/RSSceneMixinTest.java delete mode 100644 runescape-api/pom.xml delete mode 100644 runescape-api/src/main/java/net/runelite/mapping/Construct.java delete mode 100644 runescape-api/src/main/java/net/runelite/mapping/Import.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSActor.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSAudioTaskNode.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSAudioTaskNodeQueue.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSBuffer.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSBufferProvider.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSCacheableNode.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSChatLineBuffer.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSChatPlayer.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSClanMember.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSClanMemberManager.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSClassInfo.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSClient.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSCollisionData.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfo1.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoList.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoListHolder.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSDecorativeObject.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSDeque.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSDynamicObject.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSEnum.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSFileOnDisk.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSFont.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSFontTypeFace.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSFrame.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSFrameMap.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSFrames.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSFriend.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSFriendContainer.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSFriendManager.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSGameCanvas.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSGameEngine.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSGameObject.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSGrandExchangeOffer.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSGraphicsObject.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSGroundObject.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSHashTable.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSHealthBar.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSIgnore.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSIgnoreContainer.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSIndexData.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSIndexDataBase.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSIndexedSprite.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSIntegerNode.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSItem.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSItemComposition.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSItemContainer.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSItemLayer.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSIterableHashTable.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSJagexLoginType.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSKeyFocusListener.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSMainBufferProvider.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSMapElementConfig.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSMessageNode.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSModel.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSModelData.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSMouseInput.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSMouseWheelHandler.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSNPC.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSNPCComposition.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSName.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSNameable.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSNameableContainer.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSNode.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSNodeCache.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSObjectComposition.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSPlayerComposition.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSPreferences.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSProjectile.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSRawAudioNode.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSRenderOverview.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSRenderable.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSResampler.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSRunException.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSScene.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSSceneTileModel.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSSceneTilePaint.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSScript.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSScriptEvent.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSSequence.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSSoundEffect.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSSprite.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSSpritePixels.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSTaskDataNode.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSTexture.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSTextureProvider.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSTile.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSVarbit.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSVarcs.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSWallObject.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSWidgetNode.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSWorld.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapData.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapManager.java diff --git a/README.md b/README.md index 9c70f4f745..2c0c749e1f 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,6 @@ If you have any questions, please join our IRC channel on [irc.rizon.net #runeli - [http-api](http-api/src/main/java/net/runelite/http/api) - API for api.runelite.net - [http-service](http-service/src/main/java/net/runelite/http/service) - Service for api.runelite.net - [runelite-api](runelite-api/src/main/java/net/runelite/api) - RuneLite API, interfaces for accessing the client -- [runelite-mixins](runelite-mixins/src/main/java/net/runelite) - Mixins which are injected into the injected client's classes -- [runescape-api](runescape-api/src/main/java/net/runelite) - Mappings correspond to these interfaces, runelite-api is a subset of this - [runelite-client](runelite-client/src/main/java/net/runelite/client) - Game client with plugins ## Usage diff --git a/pom.xml b/pom.xml index 52a30f3d35..22bebd255d 100644 --- a/pom.xml +++ b/pom.xml @@ -117,9 +117,7 @@ cache-updater runelite-api runelite-client - runelite-mixins runelite-script-assembler-plugin - runescape-api http-api http-service protocol-api diff --git a/runelite-mixins/pom.xml b/runelite-mixins/pom.xml deleted file mode 100644 index e29ca008fe..0000000000 --- a/runelite-mixins/pom.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - 4.0.0 - - - net.runelite - runelite-parent - 1.5.29-SNAPSHOT - - - mixins - RuneLite Mixins - - - - org.slf4j - slf4j-api - provided - - - net.runelite.rs - runescape-api - ${project.version} - provided - - - com.google.guava - guava - provided - - - javax.inject - javax.inject - 1 - provided - - - - junit - junit - 4.12 - test - - - org.mockito - mockito-all - 1.10.19 - test - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - 1.6 - 1.6 - - - - - diff --git a/runelite-mixins/src/main/java/net/runelite/api/mixins/Copy.java b/runelite-mixins/src/main/java/net/runelite/api/mixins/Copy.java deleted file mode 100644 index c4a3b46326..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/api/mixins/Copy.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.api.mixins; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Indicates a copy of the specified method should be copied into - * the target class. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.METHOD) -@Documented -public @interface Copy -{ - /** - * Method to copy - * - * @return - */ - String value(); -} diff --git a/runelite-mixins/src/main/java/net/runelite/api/mixins/FieldHook.java b/runelite-mixins/src/main/java/net/runelite/api/mixins/FieldHook.java deleted file mode 100644 index 84a0db08f0..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/api/mixins/FieldHook.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.api.mixins; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.METHOD) -@Documented -public @interface FieldHook -{ - String value(); - - boolean before() default false; -} diff --git a/runelite-mixins/src/main/java/net/runelite/api/mixins/Inject.java b/runelite-mixins/src/main/java/net/runelite/api/mixins/Inject.java deleted file mode 100644 index a0f40f6bb5..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/api/mixins/Inject.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.api.mixins; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR}) -public @interface Inject -{ - -} diff --git a/runelite-mixins/src/main/java/net/runelite/api/mixins/MethodHook.java b/runelite-mixins/src/main/java/net/runelite/api/mixins/MethodHook.java deleted file mode 100644 index 5caeca8336..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/api/mixins/MethodHook.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.api.mixins; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.METHOD) -@Documented -public @interface MethodHook -{ - String value(); - - boolean end() default false; -} diff --git a/runelite-mixins/src/main/java/net/runelite/api/mixins/Mixin.java b/runelite-mixins/src/main/java/net/runelite/api/mixins/Mixin.java deleted file mode 100644 index 6efd9d41fa..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/api/mixins/Mixin.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.api.mixins; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Repeatable; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -@Repeatable(Mixins.class) -public @interface Mixin -{ - /** - * Class to inject this mixin into - * - * @return - */ - Class value(); -} diff --git a/runelite-mixins/src/main/java/net/runelite/api/mixins/Mixins.java b/runelite-mixins/src/main/java/net/runelite/api/mixins/Mixins.java deleted file mode 100644 index 2d55b71e51..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/api/mixins/Mixins.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.api.mixins; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -public @interface Mixins -{ - Mixin[] value(); -} diff --git a/runelite-mixins/src/main/java/net/runelite/api/mixins/Replace.java b/runelite-mixins/src/main/java/net/runelite/api/mixins/Replace.java deleted file mode 100644 index 57f7edc0dc..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/api/mixins/Replace.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.api.mixins; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Replaces the existing method in the target class with the given method. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.METHOD) -@Documented -public @interface Replace -{ - /** - * Method to replace - * - * @return - */ - String value(); -} diff --git a/runelite-mixins/src/main/java/net/runelite/api/mixins/Shadow.java b/runelite-mixins/src/main/java/net/runelite/api/mixins/Shadow.java deleted file mode 100644 index 8b177eab19..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/api/mixins/Shadow.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.api.mixins; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.FIELD) -public @interface Shadow -{ - String value(); -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/CameraMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/CameraMixin.java deleted file mode 100644 index 6f272856b1..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/CameraMixin.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright (c) 2018 Abex - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.mixins.FieldHook; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; - -@Mixin(RSClient.class) -public abstract class CameraMixin implements RSClient -{ - private static final int STANDARD_PITCH_MAX = 383; - private static final int NEW_PITCH_MAX = 512; - - @Shadow("clientInstance") - static RSClient client; - - @Inject - static boolean pitchRelaxEnabled = false; - - @Inject - static int lastPitch = 128; - - @Inject - static int lastPitchTarget = 128; - - @Inject - public void setCameraPitchRelaxerEnabled(boolean enabled) - { - if (pitchRelaxEnabled == enabled) - { - return; - } - pitchRelaxEnabled = enabled; - if (!enabled) - { - int pitch = client.getCameraPitchTarget(); - if (pitch > STANDARD_PITCH_MAX) - { - client.setCameraPitchTarget(STANDARD_PITCH_MAX); - } - } - } - - @FieldHook("cameraPitchTarget") - @Inject - static void onCameraPitchTargetChanged(int idx) - { - int newPitch = client.getCameraPitchTarget(); - int pitch = newPitch; - if (pitchRelaxEnabled) - { - // This works because the vanilla camera movement code only moves %2 - if (lastPitchTarget > STANDARD_PITCH_MAX && newPitch == STANDARD_PITCH_MAX) - { - pitch = lastPitchTarget; - if (pitch > NEW_PITCH_MAX) - { - pitch = NEW_PITCH_MAX; - } - client.setCameraPitchTarget(pitch); - } - } - lastPitchTarget = pitch; - } - - @FieldHook("cameraPitch") - @Inject - static void onCameraPitchChanged(int idx) - { - int newPitch = client.getCameraPitch(); - int pitch = newPitch; - if (pitchRelaxEnabled) - { - // This works because the vanilla camera movement code only moves %2 - if (lastPitch > STANDARD_PITCH_MAX && newPitch == STANDARD_PITCH_MAX) - { - pitch = lastPitch; - if (pitch > NEW_PITCH_MAX) - { - pitch = NEW_PITCH_MAX; - } - client.setCameraPitch(pitch); - } - } - lastPitch = pitch; - } -} \ No newline at end of file diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/ClickboxMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/ClickboxMixin.java deleted file mode 100644 index a95cd06220..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/ClickboxMixin.java +++ /dev/null @@ -1,320 +0,0 @@ -package net.runelite.mixins; - -import net.runelite.api.Model; -import net.runelite.api.Perspective; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSModel; - -/** - * Class to check clickboxes of models. Mostly refactored code from the client. - */ -@Mixin(RSClient.class) -public abstract class ClickboxMixin implements RSClient -{ - @Shadow("clientInstance") - private static RSClient client; - - private static final int MAX_ENTITES_AT_MOUSE = 1000; - private static final int CLICKBOX_CLOSE = 50; - private static final int CLICKBOX_FAR = 3500; - private static final int OBJECT_INTERACTION_FAR = 35; // Max distance, in tiles, from camera - - @Inject - private static final int[] rl$modelViewportXs = new int[4700]; - - @Inject - private static final int[] rl$modelViewportYs = new int[4700]; - - @Inject - public void checkClickbox(Model rlModel, int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int _x, int _y, int _z, long hash) - { - RSModel model = (RSModel) rlModel; - boolean hasFlag = hash != 0L && (int) (hash >>> 16 & 1L) != 1; - boolean viewportContainsMouse = client.getViewportContainsMouse(); - - if (!hasFlag || !viewportContainsMouse || client.getOculusOrbState() != 0) - { - return; - } - - boolean bb = boundingboxCheck(model, _x, _y, _z); - if (!bb) - { - return; - } - - if (Math.sqrt(_x * _x + _z * _z) > OBJECT_INTERACTION_FAR * Perspective.LOCAL_TILE_SIZE) - { - return; - } - - // only need a boundingbox check? - if (model.isClickable()) - { - addHashAtMouse(hash); - return; - } - - // otherwise we must check if the mouse is in a triangle - final int vertexCount = model.getVerticesCount(); - final int triangleCount = model.getTrianglesCount(); - - final int[] vertexX = model.getVerticesX(); - final int[] vertexY = model.getVerticesY(); - final int[] vertexZ = model.getVerticesZ(); - - final int[] triangleX = model.getTrianglesX(); - final int[] triangleY = model.getTrianglesY(); - final int[] triangleZ = model.getTrianglesZ(); - - final int[] color3 = model.getFaceColors3(); - - final int zoom = client.get3dZoom(); - - final int centerX = client.getCenterX(); - final int centerY = client.getCenterY(); - - int sin = 0; - int cos = 0; - if (orientation != 0) - { - sin = Perspective.SINE[orientation]; - cos = Perspective.COSINE[orientation]; - } - - for (int i = 0; i < vertexCount; ++i) - { - int x = vertexX[i]; - int y = vertexY[i]; - int z = vertexZ[i]; - - int var42; - if (orientation != 0) - { - var42 = z * sin + x * cos >> 16; - z = z * cos - x * sin >> 16; - x = var42; - } - - x += _x; - y += _y; - z += _z; - - var42 = z * yawSin + yawCos * x >> 16; - z = yawCos * z - x * yawSin >> 16; - x = var42; - var42 = pitchCos * y - z * pitchSin >> 16; - z = y * pitchSin + pitchCos * z >> 16; - - if (z >= 50) - { - rl$modelViewportYs[i] = x * zoom / z + centerX; - rl$modelViewportXs[i] = var42 * zoom / z + centerY; - } - else - { - rl$modelViewportYs[i] = -5000; - } - } - - final int viewportMouseX = client.getViewportMouseX(); - final int viewportMouseY = client.getViewportMouseY(); - - for (int i = 0; i < triangleCount; ++i) - { - if (color3[i] == -2) - { - continue; - } - - final int vA = triangleX[i]; - final int vB = triangleY[i]; - final int vC = triangleZ[i]; - - int y1 = rl$modelViewportYs[vA]; - int y2 = rl$modelViewportYs[vB]; - int y3 = rl$modelViewportYs[vC]; - - int x1 = rl$modelViewportXs[vA]; - int x2 = rl$modelViewportXs[vB]; - int x3 = rl$modelViewportXs[vC]; - - if (y1 == -5000 || y2 == -5000 || y3 == -5000) - { - continue; - } - - final int radius = model.isClickable() ? 20 : 5; - - int var18 = radius + viewportMouseY; - boolean var34; - if (var18 < x1 && var18 < x2 && var18 < x3) - { - var34 = false; - } - else - { - var18 = viewportMouseY - radius; - if (var18 > x1 && var18 > x2 && var18 > x3) - { - var34 = false; - } - else - { - var18 = radius + viewportMouseX; - if (var18 < y1 && var18 < y2 && var18 < y3) - { - var34 = false; - } - else - { - var18 = viewportMouseX - radius; - if (var18 > y1 && var18 > y2 && var18 > y3) - { - var34 = false; - } - else - { - var34 = true; - } - } - } - } - - if (var34) - { - addHashAtMouse(hash); - break; - } - } - } - - @Inject - private void addHashAtMouse(long hash) - { - long[] entitiesAtMouse = client.getEntitiesAtMouse(); - int count = client.getEntitiesAtMouseCount(); - if (count < MAX_ENTITES_AT_MOUSE) - { - entitiesAtMouse[count] = hash; - client.setEntitiesAtMouseCount(count + 1); - } - } - - @Inject - private boolean boundingboxCheck(Model model, int x, int y, int z) - { - final int cameraPitch = client.getCameraPitch(); - final int cameraYaw = client.getCameraYaw(); - - final int pitchSin = Perspective.SINE[cameraPitch]; - final int pitchCos = Perspective.COSINE[cameraPitch]; - - final int yawSin = Perspective.SINE[cameraYaw]; - final int yawCos = Perspective.COSINE[cameraYaw]; - - final int centerX = client.getCenterX(); - final int centerY = client.getCenterY(); - - final int viewportMouseX = client.getViewportMouseX(); - final int viewportMouseY = client.getViewportMouseY(); - - final int Rasterizer3D_zoom = client.get3dZoom(); - - int var6 = (viewportMouseX - centerX) * CLICKBOX_CLOSE / Rasterizer3D_zoom; - int var7 = (viewportMouseY - centerY) * CLICKBOX_CLOSE / Rasterizer3D_zoom; - int var8 = (viewportMouseX - centerX) * CLICKBOX_FAR / Rasterizer3D_zoom; - int var9 = (viewportMouseY - centerY) * CLICKBOX_FAR / Rasterizer3D_zoom; - int var10 = rl$rot1(var7, CLICKBOX_CLOSE, pitchCos, pitchSin); - int var11 = rl$rot2(var7, CLICKBOX_CLOSE, pitchCos, pitchSin); - var7 = var10; - var10 = rl$rot1(var9, CLICKBOX_FAR, pitchCos, pitchSin); - int var12 = rl$rot2(var9, CLICKBOX_FAR, pitchCos, pitchSin); - var9 = var10; - var10 = rl$rot3(var6, var11, yawCos, yawSin); - var11 = rl$rot4(var6, var11, yawCos, yawSin); - var6 = var10; - var10 = rl$rot3(var8, var12, yawCos, yawSin); - var12 = rl$rot4(var8, var12, yawCos, yawSin); - int field1720 = (var10 - var6) / 2; - int field638 = (var9 - var7) / 2; - int field1846 = (var12 - var11) / 2; - int field1722 = Math.abs(field1720); - int field601 = Math.abs(field638); - int field38 = Math.abs(field1846); - - int var38 = x + model.getCenterX(); - int var39 = y + model.getCenterY(); - int var40 = z + model.getCenterZ(); - int var41 = model.getExtremeX(); - int var42 = model.getExtremeY(); - int var43 = model.getExtremeZ(); - - int field1861 = (var6 + var10) / 2; - int field2317 = (var7 + var9) / 2; - int field528 = (var12 + var11) / 2; - - int var44 = field1861 - var38; - int var45 = field2317 - var39; - int var46 = field528 - var40; - - boolean passes; - if (Math.abs(var44) > var41 + field1722) - { - passes = false; - } - else if (Math.abs(var45) > var42 + field601) - { - passes = false; - } - else if (Math.abs(var46) > var43 + field38) - { - passes = false; - } - else if (Math.abs(var46 * field638 - var45 * field1846) > var42 * field38 + var43 * field601) - { - passes = false; - } - else if (Math.abs(var44 * field1846 - var46 * field1720) > var43 * field1722 + var41 * field38) - { - passes = false; - } - else if (Math.abs(var45 * field1720 - var44 * field638) > var42 * field1722 + var41 * field601) - { - passes = false; - } - else - { - passes = true; - } - - return passes; - } - - @Inject - private static int rl$rot1(int var0, int var1, int var2, int var3) - { - return var0 * var2 + var3 * var1 >> 16; - } - - @Inject - private static int rl$rot2(int var0, int var1, int var2, int var3) - { - return var2 * var1 - var3 * var0 >> 16; - } - - @Inject - private static int rl$rot3(int var0, int var1, int var2, int var3) - { - return var0 * var2 - var3 * var1 >> 16; - } - - @Inject - private static int rl$rot4(int var0, int var1, int var2, int var3) - { - return var3 * var0 + var2 * var1 >> 16; - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderBridgeMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderBridgeMixin.java deleted file mode 100644 index 959e9c41bc..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderBridgeMixin.java +++ /dev/null @@ -1,143 +0,0 @@ -/* - * Copyright (c) 2018, Lotto - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.rs.api.RSClient; - -@Mixin(RSClient.class) -public abstract class EntityHiderBridgeMixin implements RSClient -{ - @Inject - public static boolean isHidingEntities; - - @Inject - public static boolean hidePlayers; - - @Inject - public static boolean hidePlayers2D; - - @Inject - public static boolean hideFriends; - - @Inject - public static boolean hideClanMates; - - @Inject - public static boolean hideLocalPlayer; - - @Inject - public static boolean hideLocalPlayer2D; - - @Inject - public static boolean hideNPCs; - - @Inject - public static boolean hideNPCs2D; - - @Inject - public static boolean hideAttackers; - - @Inject - public static boolean hideProjectiles; - - @Inject - @Override - public void setIsHidingEntities(boolean state) - { - isHidingEntities = state; - } - - @Inject - @Override - public void setPlayersHidden(boolean state) - { - hidePlayers = state; - } - - @Inject - @Override - public void setPlayersHidden2D(boolean state) - { - hidePlayers2D = state; - } - - @Inject - @Override - public void setFriendsHidden(boolean state) - { - hideFriends = state; - } - - @Inject - @Override - public void setClanMatesHidden(boolean state) - { - hideClanMates = state; - } - - @Inject - @Override - public void setLocalPlayerHidden(boolean state) - { - hideLocalPlayer = state; - } - - @Inject - @Override - public void setLocalPlayerHidden2D(boolean state) - { - hideLocalPlayer2D = state; - } - - @Inject - @Override - public void setNPCsHidden(boolean state) - { - hideNPCs = state; - } - - @Inject - @Override - public void setNPCsHidden2D(boolean state) - { - hideNPCs2D = state; - } - - @Inject - @Override - public void setAttackersHidden(boolean state) - { - hideAttackers = state; - } - - @Inject - @Override - public void setProjectilesHidden(boolean state) - { - hideProjectiles = state; - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java deleted file mode 100644 index d055fceed5..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java +++ /dev/null @@ -1,172 +0,0 @@ -/* - * Copyright (c) 2018, Lotto - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSActor; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSNPC; -import net.runelite.rs.api.RSPlayer; -import net.runelite.rs.api.RSProjectile; -import net.runelite.rs.api.RSScene; -import net.runelite.rs.api.RSRenderable; - -@Mixin(RSScene.class) -public abstract class EntityHiderMixin implements RSScene -{ - @Shadow("clientInstance") - private static RSClient client; - - @Shadow("isHidingEntities") - private static boolean isHidingEntities; - - @Shadow("hidePlayers") - private static boolean hidePlayers; - - @Shadow("hidePlayers2D") - private static boolean hidePlayers2D; - - @Shadow("hideFriends") - private static boolean hideFriends; - - @Shadow("hideClanMates") - private static boolean hideClanMates; - - @Shadow("hideLocalPlayer") - private static boolean hideLocalPlayer; - - @Shadow("hideLocalPlayer2D") - private static boolean hideLocalPlayer2D; - - @Shadow("hideNPCs") - private static boolean hideNPCs; - - @Shadow("hideNPCs2D") - private static boolean hideNPCs2D; - - @Shadow("hideAttackers") - private static boolean hideAttackers; - - @Shadow("hideProjectiles") - private static boolean hideProjectiles; - - @Copy("addEntityMarker") - abstract boolean addEntityMarker(int var1, int var2, int var3, int var4, int var5, int x, int y, int var8, RSRenderable renderable, int var10, boolean var11, long var12, int var13); - - @Replace("addEntityMarker") - boolean rl$addEntityMarker(int var1, int var2, int var3, int var4, int var5, int x, int y, int var8, RSRenderable renderable, int var10, boolean var11, long var12, int var13) - { - final boolean shouldDraw = shouldDraw(renderable, false); - - if (!shouldDraw) - { - final int tileX = x >> 7; - final int tileY = y >> 7; - /* - * Set the 'occupied' tick to -1, to reset the tile being 'occupied', - * making the game think an entity hasn't been rendered at the location yet. - */ - client.getOccupiedTilesTick()[tileX][tileY] = -1; - } - - return shouldDraw && addEntityMarker(var1, var2, var3, var4, var5, x, y, var8, renderable, var10, var11, var12, var13); - } - - @Copy("draw2DExtras") - private static void draw2DExtras(RSActor actor, int var1, int var2, int var3, int var4, int var5) - { - throw new RuntimeException(); - } - - @Replace("draw2DExtras") - private static void rl$draw2DExtras(RSActor actor, int var1, int var2, int var3, int var4, int var5) - { - if (shouldDraw(actor, true)) - { - draw2DExtras(actor, var1, var2, var3, var4, var5); - } - } - - @Inject - private static boolean shouldDraw(Object renderable, boolean drawingUI) - { - if (!isHidingEntities) - { - return true; - } - - if (renderable instanceof RSPlayer) - { - boolean local = drawingUI ? hideLocalPlayer2D : hideLocalPlayer; - boolean other = drawingUI ? hidePlayers2D : hidePlayers; - boolean isLocalPlayer = renderable == client.getLocalPlayer(); - - if (isLocalPlayer ? local : other) - { - RSPlayer player = (RSPlayer) renderable; - - if (!hideAttackers) - { - if (player.getInteracting() == client.getLocalPlayer()) - { - return true; - } - } - - if (player.getName() == null) - { - // player.isFriend() and player.isClanMember() npe when the player has a null name - return false; - } - - return (!hideFriends && player.isFriend()) || (!isLocalPlayer && !hideClanMates && player.isClanMember()); - } - } - else if (renderable instanceof RSNPC) - { - RSNPC npc = (RSNPC) renderable; - - if (!hideAttackers) - { - if (npc.getInteracting() == client.getLocalPlayer()) - { - return true; - } - } - - return drawingUI ? !hideNPCs2D : !hideNPCs; - } - else if (renderable instanceof RSProjectile) - { - return !hideProjectiles; - } - - return true; - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/GraphicsObjectMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/GraphicsObjectMixin.java deleted file mode 100644 index 7bfa3c1bd9..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/GraphicsObjectMixin.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2018, Woox - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.coords.LocalPoint; -import net.runelite.api.events.GraphicsObjectCreated; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSGraphicsObject; - -@Mixin(RSGraphicsObject.class) -public abstract class GraphicsObjectMixin implements RSGraphicsObject -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - GraphicsObjectMixin() - { - final GraphicsObjectCreated event = new GraphicsObjectCreated(this); - client.getCallbacks().post(event); - } - - @Override - @Inject - public LocalPoint getLocation() - { - return new LocalPoint(this.getX(), this.getY()); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/MenuMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/MenuMixin.java deleted file mode 100644 index 9bfb4af721..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/MenuMixin.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright (c) 2019, Ron Young - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSFont; - -@Mixin(RSClient.class) -public abstract class MenuMixin implements RSClient -{ - private static final int MENU_BORDER_OUTER_2010 = 0x6D6A5B; - private static final int MENU_BORDER_INNER_2010 = 0x524A3D; - private static final int MENU_PADDING_2010 = 0x2B2622; - private static final int MENU_BACKGROUND_2010 = 0x2B271C; - private static final int MENU_TEXT_2010 = 0xC6B895; - private static final int MENU_HEADER_GRADIENT_TOP_2010 = 0x322E22; - private static final int MENU_HEADER_GRADIENT_BOTTOM_2010 = 0x090A04; - - @Inject - @Override - public void draw2010Menu() - { - int x = getMenuX(); - int y = getMenuY(); - int w = getMenuWidth(); - int h = getMenuHeight(); - - // Outside border - RasterizerDrawHorizontalLine(x + 2, y, w - 4, MENU_BORDER_OUTER_2010); - RasterizerDrawHorizontalLine(x + 2, y + h - 1, w - 4, MENU_BORDER_OUTER_2010); - RasterizerDrawVerticalLine(x, y + 2, h - 4, MENU_BORDER_OUTER_2010); - RasterizerDrawVerticalLine(x + w - 1, y + 2, h - 4, MENU_BORDER_OUTER_2010); - - // Padding - RasterizerDrawRectangle(x + 1, y + 5, w - 2, h - 6, MENU_PADDING_2010); - RasterizerDrawHorizontalLine(x + 1, y + 17, w - 2, MENU_PADDING_2010); - RasterizerDrawCircle(x + 2, y + h - 3, 0, MENU_PADDING_2010); - RasterizerDrawCircle(x + w - 3, y + h - 3, 0, MENU_PADDING_2010); - - // Header - RasterizerDrawGradient(x + 2, y + 1, w - 4, 16, MENU_HEADER_GRADIENT_TOP_2010, MENU_HEADER_GRADIENT_BOTTOM_2010); - RasterizerFillRectangle(x + 1, y + 1, 2, 4, MENU_PADDING_2010); - RasterizerFillRectangle(x + w - 3, y + 1, 2, 4, MENU_PADDING_2010); - - // Inside border - RasterizerDrawHorizontalLine(x + 2, y + 18, w - 4, MENU_BORDER_INNER_2010); - RasterizerDrawHorizontalLine(x + 3, y + h - 3, w - 6, MENU_BORDER_INNER_2010); - RasterizerDrawVerticalLine(x + 2, y + 18, h - 21, MENU_BORDER_INNER_2010); - RasterizerDrawVerticalLine(x + w - 3, y + 18, h - 21, MENU_BORDER_INNER_2010); - - // Options background - RasterizerFillRectangle(x + 3, y + 19, w - 6, h - 22, MENU_BACKGROUND_2010); - - // Corner insets - RasterizerDrawCircle(x + 1, y + 1, 0, MENU_BORDER_OUTER_2010); - RasterizerDrawCircle(x + w - 2, y + 1, 0, MENU_BORDER_OUTER_2010); - RasterizerDrawCircle(x + 1, y + h - 2, 0, MENU_BORDER_OUTER_2010); - RasterizerDrawCircle(x + w - 2, y + h - 2, 0, MENU_BORDER_OUTER_2010); - - RSFont font = getFontBold12(); - font.drawTextLeftAligned("Choose Option", x + 3, y + 14, MENU_TEXT_2010, -1); - - int mouseX = getMouseX(); - int mouseY = getMouseY(); - - int count = getMenuOptionCount(); - String[] targets = getMenuTargets(); - String[] options = getMenuOptions(); - for (int i = 0; i < count; i++) - { - int rowY = y + (count - 1 - i) * 15 + 31; - - String s = options[i]; - if (!targets[i].isEmpty()) - { - s += " " + targets[i]; - } - - font.drawTextLeftAligned(s, x + 3, rowY, MENU_TEXT_2010, -1); - - // Highlight current option - if (mouseX > x && mouseX < w + x && mouseY > rowY - 13 && mouseY < rowY + 3) - { - RasterizerFillRectangleAlpha(x + 3, rowY - 12, w - 6, 15, 0xffffff, 80); - } - } - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/MinimapMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/MinimapMixin.java deleted file mode 100644 index 1aab9836f8..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/MinimapMixin.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import static net.runelite.api.Perspective.SCENE_SIZE; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSScene; -import net.runelite.rs.api.RSSpritePixels; - -@Mixin(RSClient.class) -public abstract class MinimapMixin implements RSClient -{ - @Inject - @Override - public RSSpritePixels drawInstanceMap(int z) - { - RSSpritePixels ourSprite = createSpritePixels(new int[512 * 512], 512, 512); - RSSpritePixels theirSprite = getMinimapSprite(); - - RSScene scene = getScene(); - int[] pixels = ourSprite.getPixels(); - byte[][][] tileSettings = getTileSettings(); - - try - { - setMinimapSprite(ourSprite); - - int var4; - for (int x = 1; x < SCENE_SIZE - 1; ++x) - { - var4 = (103 - x) * 2048 + 24628; - - for (int y = 1; y < SCENE_SIZE - 1; ++y) - { - if ((tileSettings[z][y][x] & 24) == 0) - { - scene.drawTile(pixels, var4, 512, z, y, x); - } - - if (z < 3 && (tileSettings[z + 1][y][x] & 8) != 0) - { - scene.drawTile(pixels, var4, 512, z + 1, y, x); - } - - var4 += 4; - } - } - - int color1 = (238 + (int) (Math.random() * 20.0D) - 10 << 16) + (238 + (int) (Math.random() * 20.0D) - 10 << 8) + (238 + (int) (Math.random() * 20.0D) - 10); - int color2 = 238 + (int) (Math.random() * 20.0D) - 10 << 16; - ourSprite.setRaster(); - - for (int y = 1; y < SCENE_SIZE - 1; ++y) - { - for (int x = 1; x < SCENE_SIZE - 1; ++x) - { - if ((tileSettings[z][x][y] & 24) == 0) - { - drawObject(z, x, y, color1, color2); - } - - if (z < 3 && (tileSettings[z + 1][x][y] & 8) != 0) - { - drawObject(z + 1, x, y, color1, color2); - } - } - } - } - finally - { - getBufferProvider().setRaster(); - setMinimapSprite(theirSprite); - } - - return ourSprite; - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/ProcessClientErrorMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/ProcessClientErrorMixin.java deleted file mode 100644 index eb3e971a3a..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/ProcessClientErrorMixin.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2018, Lotto - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSRunException; - -@Mixin(RSClient.class) -public abstract class ProcessClientErrorMixin implements RSClient -{ - @Shadow("clientInstance") - private static RSClient client; - - @Copy("processClientError") - static void rs$processClientError(String string, Throwable throwable) - { - throw new RuntimeException(); - } - - @Replace("processClientError") - static void rl$processClientError(String string, Throwable throwable) - { - if (throwable != null) - { - Throwable throwableToScan = throwable; - - if (throwable instanceof RSRunException) - { - throwableToScan = ((RSRunException) throwable).getParent(); - } - - client.getLogger().error("Game crash: {}", string, throwableToScan); - - StackTraceElement[] stackTrace = throwableToScan.getStackTrace(); - - for (StackTraceElement stackTraceElement : stackTrace) - { - // If stack trace contains "runelite", don't send it - if (stackTraceElement.getClassName().contains("runelite")) - { - return; - } - } - } - - rs$processClientError(string, throwable); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java deleted file mode 100644 index 7c2d19323f..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java +++ /dev/null @@ -1,286 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.awt.Graphics2D; -import java.awt.Polygon; -import java.awt.image.BufferedImage; -import net.runelite.api.Actor; -import net.runelite.api.Hitsplat; -import net.runelite.api.NPC; -import net.runelite.api.NPCComposition; -import net.runelite.api.Perspective; -import net.runelite.api.Player; -import net.runelite.api.Point; -import net.runelite.api.SpritePixels; -import net.runelite.api.coords.LocalPoint; -import net.runelite.api.coords.WorldArea; -import net.runelite.api.coords.WorldPoint; -import net.runelite.api.events.AnimationChanged; -import net.runelite.api.events.GraphicChanged; -import net.runelite.api.events.HitsplatApplied; -import net.runelite.api.events.InteractingChanged; -import net.runelite.api.events.LocalPlayerDeath; -import net.runelite.api.events.OverheadTextChanged; -import net.runelite.api.mixins.FieldHook; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.MethodHook; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSActor; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSCombatInfo1; -import net.runelite.rs.api.RSHealthBar; -import net.runelite.rs.api.RSCombatInfoList; -import net.runelite.rs.api.RSCombatInfoListHolder; -import net.runelite.rs.api.RSNPC; -import net.runelite.rs.api.RSNode; - -@Mixin(RSActor.class) -public abstract class RSActorMixin implements RSActor -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - @Override - public Actor getInteracting() - { - int i = getRSInteracting(); - if (i == -1 || i == 65535) - { - return null; - } - - if (i < 0x8000) - { - NPC[] npcs = client.getCachedNPCs(); - return npcs[i]; - } - - i -= 0x8000; - Player[] players = client.getCachedPlayers(); - return players[i]; - } - - @Inject - @Override - public int getHealthRatio() - { - RSCombatInfoList combatInfoList = getCombatInfoList(); - if (combatInfoList != null) - { - RSNode node = combatInfoList.getNode(); - RSNode next = node.getNext(); - if (next instanceof RSCombatInfoListHolder) - { - RSCombatInfoListHolder combatInfoListWrapper = (RSCombatInfoListHolder) next; - RSCombatInfoList combatInfoList1 = combatInfoListWrapper.getCombatInfo1(); - - RSNode node2 = combatInfoList1.getNode(); - RSNode next2 = node2.getNext(); - if (next2 instanceof RSCombatInfo1) - { - RSCombatInfo1 combatInfo = (RSCombatInfo1) next2; - return combatInfo.getHealthRatio(); - } - } - } - return -1; - } - - @Inject - @Override - public int getHealth() - { - RSCombatInfoList combatInfoList = getCombatInfoList(); - if (combatInfoList != null) - { - RSNode node = combatInfoList.getNode(); - RSNode next = node.getNext(); - if (next instanceof RSCombatInfoListHolder) - { - RSCombatInfoListHolder combatInfoListWrapper = (RSCombatInfoListHolder) next; - RSHealthBar cf = combatInfoListWrapper.getHealthBar(); - return cf.getHealthScale(); - } - } - return -1; - } - - @Override - @Inject - public WorldPoint getWorldLocation() - { - return WorldPoint.fromLocal(client, - this.getPathX()[0] * Perspective.LOCAL_TILE_SIZE + Perspective.LOCAL_TILE_SIZE / 2, - this.getPathY()[0] * Perspective.LOCAL_TILE_SIZE + Perspective.LOCAL_TILE_SIZE / 2, - client.getPlane()); - } - - @Inject - @Override - public LocalPoint getLocalLocation() - { - return new LocalPoint(getX(), getY()); - } - - @Inject - @Override - public Polygon getCanvasTilePoly() - { - return Perspective.getCanvasTilePoly(client, getLocalLocation()); - } - - @Inject - @Override - public Point getCanvasTextLocation(Graphics2D graphics, String text, int zOffset) - { - return Perspective.getCanvasTextLocation(client, graphics, getLocalLocation(), text, zOffset); - } - - @Inject - @Override - public Point getCanvasImageLocation(BufferedImage image, int zOffset) - { - return Perspective.getCanvasImageLocation(client, getLocalLocation(), image, zOffset); - } - - @Inject - @Override - public Point getCanvasSpriteLocation(SpritePixels sprite, int zOffset) - { - return Perspective.getCanvasSpriteLocation(client, getLocalLocation(), sprite, zOffset); - } - - @Inject - @Override - public Point getMinimapLocation() - { - return Perspective.localToMinimap(client, getLocalLocation()); - } - - @FieldHook("animation") - @Inject - public void animationChanged(int idx) - { - AnimationChanged animationChange = new AnimationChanged(); - animationChange.setActor(this); - client.getCallbacks().post(animationChange); - } - - @FieldHook("graphic") - @Inject - public void graphicChanged(int idx) - { - GraphicChanged graphicChanged = new GraphicChanged(); - graphicChanged.setActor(this); - client.getCallbacks().post(graphicChanged); - } - - @FieldHook("interacting") - @Inject - public void interactingChanged(int idx) - { - InteractingChanged interactingChanged = new InteractingChanged(this, getInteracting()); - client.getCallbacks().post(interactingChanged); - } - - @FieldHook("overhead") - @Inject - public void overheadTextChanged(int idx) - { - String overheadText = getOverheadText(); - if (overheadText != null) - { - OverheadTextChanged overheadTextChanged = new OverheadTextChanged(this, overheadText); - client.getCallbacks().post(overheadTextChanged); - } - } - - @Inject - @Override - public WorldArea getWorldArea() - { - int size = 1; - if (this instanceof NPC) - { - NPCComposition composition = ((NPC)this).getComposition(); - if (composition != null && composition.getConfigs() != null) - { - composition = composition.transform(); - } - if (composition != null) - { - size = composition.getSize(); - } - } - - return new WorldArea(this.getWorldLocation(), size, size); - } - - @Inject - @MethodHook("setCombatInfo") - public void setCombatInfo(int combatInfoId, int gameCycle, int var3, int var4, int healthRatio, int health) - { - if (healthRatio == 0) - { - if (this == client.getLocalPlayer()) - { - client.getLogger().debug("You died!"); - - LocalPlayerDeath event = new LocalPlayerDeath(); - client.getCallbacks().post(event); - } - else if (this instanceof RSNPC) - { - ((RSNPC) this).setDead(true); - } - } - } - - /** - * Called after a hitsplat has been processed on an actor. - * Note that this event runs even if the hitsplat didn't show up, - * i.e. the actor already had 4 visible hitsplats. - * - * @param type The hitsplat type (i.e. color) - * @param value The value of the hitsplat (i.e. how high the hit was) - * @param var3 unknown - * @param var4 unknown - * @param gameCycle The gamecycle the hitsplat was applied on - * @param duration The amount of gamecycles the hitsplat will last for - */ - @Inject - @MethodHook(value = "applyActorHitsplat", end = true) - public void applyActorHitsplat(int type, int value, int var3, int var4, int gameCycle, int duration) - { - final Hitsplat hitsplat = new Hitsplat(Hitsplat.HitsplatType.fromInteger(type), value, gameCycle + duration); - final HitsplatApplied event = new HitsplatApplied(); - event.setActor(this); - event.setHitsplat(hitsplat); - client.getCallbacks().post(event); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSChatLineBufferMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSChatLineBufferMixin.java deleted file mode 100644 index 6b720a26f8..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSChatLineBufferMixin.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2018, trimbe - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.MessageNode; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.rs.api.RSCacheableNode; -import net.runelite.rs.api.RSChatLineBuffer; - -@Mixin(RSChatLineBuffer.class) -public abstract class RSChatLineBufferMixin implements RSChatLineBuffer -{ - @Inject - @Override - public void removeMessageNode(MessageNode node) - { - MessageNode[] lines = getLines(); - final int length = getLength(); - int found = -1; - - // Find the index of the node - for (int idx = 0; idx < length; idx++) - { - if (lines[idx] == node) - { - found = idx; - break; - } - } - - if (found == -1) - { - return; - } - - // Shift down all other messages - for (int i = found; i < length - 1; i++) - { - lines[i] = lines[i + 1]; - } - lines[length - 1] = null; - setLength(length - 1); - - RSCacheableNode rsCacheableNode = (RSCacheableNode) node; - rsCacheableNode.unlink(); - rsCacheableNode.unlinkDual(); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClanMemberManagerMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClanMemberManagerMixin.java deleted file mode 100644 index 25e01ce1ca..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClanMemberManagerMixin.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2018, trimbe - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.ClanMember; -import net.runelite.api.events.ClanMemberJoined; -import net.runelite.api.events.ClanMemberLeft; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClanMemberManager; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSName; -import net.runelite.rs.api.RSNameable; - -@Mixin(RSClanMemberManager.class) -public abstract class RSClanMemberManagerMixin implements RSClanMemberManager -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - @Override - public void rl$add(RSName name, RSName prevName) - { - ClanMember member = findByName(name); - if (member == null) - { - return; - } - - ClanMemberJoined event = new ClanMemberJoined(member); - client.getCallbacks().postDeferred(event); - } - - @Inject - @Override - public void rl$remove(RSNameable nameable) - { - ClanMember member = findByName(nameable.getRsName()); - if (member == null) - { - return; - } - - ClanMemberLeft event = new ClanMemberLeft(member); - client.getCallbacks().postDeferred(event); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClanMemberMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClanMemberMixin.java deleted file mode 100644 index a35a267bce..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClanMemberMixin.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.ClanMemberRank; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.rs.api.RSClanMember; - -@Mixin(RSClanMember.class) -public abstract class RSClanMemberMixin implements RSClanMember -{ - @Override - @Inject - public String getUsername() - { - return getRsName().getName(); - } - - @Override - @Inject - public ClanMemberRank getRank() - { - return ClanMemberRank.valueOf(getRSRank()); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java deleted file mode 100644 index 7932b31482..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ /dev/null @@ -1,1542 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import com.google.common.cache.Cache; -import com.google.common.cache.CacheBuilder; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.EnumSet; -import java.util.List; -import java.util.Map; -import javax.annotation.Nullable; -import javax.inject.Named; -import net.runelite.api.ChatMessageType; -import net.runelite.api.ClanMember; -import net.runelite.api.EnumComposition; -import net.runelite.api.Friend; -import net.runelite.api.GameState; -import net.runelite.api.GrandExchangeOffer; -import net.runelite.api.GraphicsObject; -import net.runelite.api.HashTable; -import net.runelite.api.HintArrowType; -import net.runelite.api.Ignore; -import net.runelite.api.IndexDataBase; -import net.runelite.api.IndexedSprite; -import net.runelite.api.InventoryID; -import net.runelite.api.MenuAction; -import static net.runelite.api.MenuAction.PLAYER_EIGTH_OPTION; -import static net.runelite.api.MenuAction.PLAYER_FIFTH_OPTION; -import static net.runelite.api.MenuAction.PLAYER_FIRST_OPTION; -import static net.runelite.api.MenuAction.PLAYER_FOURTH_OPTION; -import static net.runelite.api.MenuAction.PLAYER_SECOND_OPTION; -import static net.runelite.api.MenuAction.PLAYER_SEVENTH_OPTION; -import static net.runelite.api.MenuAction.PLAYER_SIXTH_OPTION; -import static net.runelite.api.MenuAction.PLAYER_THIRD_OPTION; -import net.runelite.api.MenuEntry; -import net.runelite.api.MessageNode; -import net.runelite.api.NPC; -import net.runelite.api.Node; -import net.runelite.api.PacketBuffer; -import static net.runelite.api.Perspective.LOCAL_TILE_SIZE; -import net.runelite.api.Player; -import net.runelite.api.Point; -import net.runelite.api.Prayer; -import net.runelite.api.Projectile; -import net.runelite.api.Skill; -import net.runelite.api.SpritePixels; -import net.runelite.api.Tile; -import net.runelite.api.VarPlayer; -import net.runelite.api.Varbits; -import net.runelite.api.WidgetNode; -import net.runelite.api.WorldType; -import net.runelite.api.coords.LocalPoint; -import net.runelite.api.coords.WorldPoint; -import net.runelite.api.events.BoostedLevelChanged; -import net.runelite.api.events.CanvasSizeChanged; -import net.runelite.api.events.ChatMessage; -import net.runelite.api.events.ClanChanged; -import net.runelite.api.events.ClientTick; -import net.runelite.api.events.DraggingWidgetChanged; -import net.runelite.api.events.ExperienceChanged; -import net.runelite.api.events.GameStateChanged; -import net.runelite.api.events.GrandExchangeOfferChanged; -import net.runelite.api.events.MenuEntryAdded; -import net.runelite.api.events.MenuOpened; -import net.runelite.api.events.MenuOptionClicked; -import net.runelite.api.events.MenuShouldLeftClick; -import net.runelite.api.events.NpcSpawned; -import net.runelite.api.events.PlayerDespawned; -import net.runelite.api.events.PlayerMenuOptionsChanged; -import net.runelite.api.events.PlayerSpawned; -import net.runelite.api.events.ResizeableChanged; -import net.runelite.api.events.UsernameChanged; -import net.runelite.api.events.VarbitChanged; -import net.runelite.api.events.WidgetLoaded; -import net.runelite.api.hooks.Callbacks; -import net.runelite.api.hooks.DrawCallbacks; -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.FieldHook; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.MethodHook; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.api.vars.AccountType; -import net.runelite.api.widgets.Widget; -import net.runelite.api.widgets.WidgetInfo; -import net.runelite.api.widgets.WidgetItem; -import net.runelite.api.widgets.WidgetType; -import net.runelite.rs.api.RSChatLineBuffer; -import net.runelite.rs.api.RSClanMemberManager; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSDeque; -import net.runelite.rs.api.RSEnum; -import net.runelite.rs.api.RSFriendContainer; -import net.runelite.rs.api.RSFriendManager; -import net.runelite.rs.api.RSHashTable; -import net.runelite.rs.api.RSIgnoreContainer; -import net.runelite.rs.api.RSIndexDataBase; -import net.runelite.rs.api.RSIndexedSprite; -import net.runelite.rs.api.RSItem; -import net.runelite.rs.api.RSItemContainer; -import net.runelite.rs.api.RSNPC; -import net.runelite.rs.api.RSName; -import net.runelite.rs.api.RSPlayer; -import net.runelite.rs.api.RSSpritePixels; -import net.runelite.rs.api.RSWidget; -import org.slf4j.Logger; - -@Mixin(RSClient.class) -public abstract class RSClientMixin implements RSClient -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - @javax.inject.Inject - private Callbacks callbacks; - - @Inject - private DrawCallbacks drawCallbacks; - - @Inject - @javax.inject.Inject - @Named("Core Logger") - private Logger logger; - - @Inject - private static int tickCount; - - @Inject - private static boolean interpolatePlayerAnimations; - - @Inject - private static boolean interpolateNpcAnimations; - - @Inject - private static boolean interpolateObjectAnimations; - - @Inject - private static RSPlayer[] oldPlayers = new RSPlayer[2048]; - - @Inject - private static int itemPressedDurationBuffer; - - @Inject - private static int inventoryDragDelay; - - @Inject - private static int oldMenuEntryCount; - - @Inject - private static RSItem lastItemDespawn; - - @Inject - private boolean gpu; - - @Inject - private static boolean oldIsResized; - - @Inject - static int skyboxColor; - - @Inject - private final Cache enumCache = CacheBuilder.newBuilder() - .maximumSize(64) - .build(); - - @Inject - public RSClientMixin() - { - } - - @Inject - @Override - public Callbacks getCallbacks() - { - return callbacks; - } - - @Inject - @Override - public DrawCallbacks getDrawCallbacks() - { - return drawCallbacks; - } - - @Inject - @Override - public void setDrawCallbacks(DrawCallbacks drawCallbacks) - { - this.drawCallbacks = drawCallbacks; - } - - @Inject - @Override - public Logger getLogger() - { - return logger; - } - - @Inject - @Override - public boolean isInterpolatePlayerAnimations() - { - return interpolatePlayerAnimations; - } - - @Inject - @Override - public void setInterpolatePlayerAnimations(boolean interpolate) - { - interpolatePlayerAnimations = interpolate; - } - - @Inject - @Override - public boolean isInterpolateNpcAnimations() - { - return interpolateNpcAnimations; - } - - @Inject - @Override - public void setInterpolateNpcAnimations(boolean interpolate) - { - interpolateNpcAnimations = interpolate; - } - - @Inject - @Override - public boolean isInterpolateObjectAnimations() - { - return interpolateObjectAnimations; - } - - @Inject - @Override - public void setInterpolateObjectAnimations(boolean interpolate) - { - interpolateObjectAnimations = interpolate; - } - - @Inject - @Override - public void setInventoryDragDelay(int delay) - { - inventoryDragDelay = delay; - } - - @Inject - @Override - public AccountType getAccountType() - { - int varbit = getVar(Varbits.ACCOUNT_TYPE); - - switch (varbit) - { - case 1: - return AccountType.IRONMAN; - case 2: - return AccountType.ULTIMATE_IRONMAN; - case 3: - return AccountType.HARDCORE_IRONMAN; - } - - return AccountType.NORMAL; - } - - @Inject - @Override - public Tile getSelectedSceneTile() - { - int tileX = getSelectedSceneTileX(); - int tileY = getSelectedSceneTileY(); - - if (tileX == -1 || tileY == -1) - { - return null; - } - - return getScene().getTiles()[getPlane()][tileX][tileY]; - } - - @Inject - @Override - public List getPlayers() - { - int validPlayerIndexes = getPlayerIndexesCount(); - int[] playerIndexes = getPlayerIndices(); - Player[] cachedPlayers = getCachedPlayers(); - List players = new ArrayList(validPlayerIndexes); - - for (int i = 0; i < validPlayerIndexes; ++i) - { - players.add(cachedPlayers[playerIndexes[i]]); - } - - return players; - } - - @Inject - @Override - public List getNpcs() - { - int validNpcIndexes = getNpcIndexesCount(); - int[] npcIndexes = getNpcIndices(); - NPC[] cachedNpcs = getCachedNPCs(); - List npcs = new ArrayList(validNpcIndexes); - - for (int i = 0; i < validNpcIndexes; ++i) - { - npcs.add(cachedNpcs[npcIndexes[i]]); - } - - return npcs; - } - - @Inject - @Override - public int getBoostedSkillLevel(Skill skill) - { - int[] boostedLevels = getBoostedSkillLevels(); - return boostedLevels[skill.ordinal()]; - } - - @Inject - @Override - public int getRealSkillLevel(Skill skill) - { - int[] realLevels = getRealSkillLevels(); - return realLevels[skill.ordinal()]; - } - - @Inject - @Override - public int getTotalLevel() - { - int totalLevel = 0; - - int[] realLevels = client.getRealSkillLevels(); - int lastSkillIdx = Skill.CONSTRUCTION.ordinal(); - - for (int i = 0; i < realLevels.length; i++) - { - if (i <= lastSkillIdx) - { - totalLevel += realLevels[i]; - } - } - - return totalLevel; - } - - @Inject - @Override - public void addChatMessage(ChatMessageType type, String name, String message, String sender) - { - addChatMessage(type.getType(), name, message, sender); - } - - @Inject - @Override - public GameState getGameState() - { - return GameState.of(getRSGameState()); - } - - @Inject - @Override - public Point getMouseCanvasPosition() - { - return new Point(getMouseX(), getMouseY()); - } - - @Inject - @Override - public Widget[] getWidgetRoots() - { - int topGroup = getWidgetRoot(); - List widgets = new ArrayList(); - for (RSWidget widget : getWidgets()[topGroup]) - { - if (widget != null && widget.getRSParentId() == -1) - { - widgets.add(widget); - } - } - return widgets.toArray(new Widget[widgets.size()]); - } - - @Inject - @Override - public Widget getWidget(WidgetInfo widget) - { - int groupId = widget.getGroupId(); - int childId = widget.getChildId(); - - return getWidget(groupId, childId); - } - - @Inject - @Override - public RSWidget[] getGroup(int groupId) - { - RSWidget[][] widgets = getWidgets(); - - if (widgets == null || groupId < 0 || groupId >= widgets.length || widgets[groupId] == null) - { - return null; - } - - return widgets[groupId]; - } - - @Inject - @Override - public Widget getWidget(int groupId, int childId) - { - RSWidget[][] widgets = getWidgets(); - - if (widgets == null || widgets.length <= groupId) - { - return null; - } - - RSWidget[] childWidgets = widgets[groupId]; - if (childWidgets == null || childWidgets.length <= childId) - { - return null; - } - - return childWidgets[childId]; - } - - @Inject - @Override - public int getVar(VarPlayer varPlayer) - { - int[] varps = getVarps(); - return varps[varPlayer.getId()]; - } - - @Inject - @Override - public int getVarpValue(int[] varps, int varpId) - { - return varps[varpId]; - } - - @Inject - @Override - public void setVarpValue(int[] varps, int varpId, int value) - { - varps[varpId] = value; - } - - @Inject - @Override - public boolean isPrayerActive(Prayer prayer) - { - return getVar(prayer.getVarbit()) == 1; - } - - /** - * Returns the local player's current experience in the specified - * {@link Skill}. - * - * @param skill the {@link Skill} to retrieve the experience for - * @return the local player's current experience in the specified - * {@link Skill}, or -1 if the {@link Skill} isn't valid - */ - @Inject - @Override - public int getSkillExperience(Skill skill) - { - int[] experiences = getSkillExperiences(); - - if (skill == Skill.OVERALL) - { - logger.debug("getSkillExperience called for {}!", skill); - return (int) getOverallExperience(); - } - - int idx = skill.ordinal(); - - // I'm not certain exactly how needed this is, but if the Skill enum is updated in the future - // to hold something else that's not reported it'll save us from an ArrayIndexOutOfBoundsException. - if (idx >= experiences.length) - { - return -1; - } - - return experiences[idx]; - } - - @Inject - @Override - public long getOverallExperience() - { - int[] experiences = getSkillExperiences(); - - long totalExperience = 0L; - - for (int experience : experiences) - { - totalExperience += experience; - } - - return totalExperience; - } - - @Inject - @Override - public void refreshChat() - { - setChatCycle(getCycleCntr()); - } - - @Inject - @Override - public Widget getViewportWidget() - { - if (isResized()) - { - if (getVar(Varbits.SIDE_PANELS) == 1) - { - return getWidget(WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE); - } - else - { - return getWidget(WidgetInfo.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX); - } - } - return getWidget(WidgetInfo.FIXED_VIEWPORT); - } - - @Inject - @Override - public MenuEntry[] getMenuEntries() - { - int count = getMenuOptionCount(); - String[] menuOptions = getMenuOptions(); - String[] menuTargets = getMenuTargets(); - int[] menuIdentifiers = getMenuIdentifiers(); - int[] menuTypes = getMenuTypes(); - int[] params0 = getMenuActionParams0(); - int[] params1 = getMenuActionParams1(); - boolean[] leftClick = getMenuForceLeftClick(); - - MenuEntry[] entries = new MenuEntry[count]; - for (int i = 0; i < count; ++i) - { - MenuEntry entry = entries[i] = new MenuEntry(); - entry.setOption(menuOptions[i]); - entry.setTarget(menuTargets[i]); - entry.setIdentifier(menuIdentifiers[i]); - entry.setType(menuTypes[i]); - entry.setParam0(params0[i]); - entry.setParam1(params1[i]); - entry.setForceLeftClick(leftClick[i]); - } - return entries; - } - - @Inject - @Override - public void setMenuEntries(MenuEntry[] entries) - { - int count = 0; - String[] menuOptions = getMenuOptions(); - String[] menuTargets = getMenuTargets(); - int[] menuIdentifiers = getMenuIdentifiers(); - int[] menuTypes = getMenuTypes(); - int[] params0 = getMenuActionParams0(); - int[] params1 = getMenuActionParams1(); - boolean[] leftClick = getMenuForceLeftClick(); - - for (MenuEntry entry : entries) - { - menuOptions[count] = entry.getOption(); - menuTargets[count] = entry.getTarget(); - menuIdentifiers[count] = entry.getIdentifier(); - menuTypes[count] = entry.getType(); - params0[count] = entry.getParam0(); - params1[count] = entry.getParam1(); - leftClick[count] = entry.isForceLeftClick(); - ++count; - } - - setMenuOptionCount(count); - oldMenuEntryCount = count; - } - - @FieldHook("menuOptionCount") - @Inject - public static void onMenuOptionsChanged(int idx) - { - int oldCount = oldMenuEntryCount; - int newCount = client.getMenuOptionCount(); - - oldMenuEntryCount = newCount; - - if (newCount == oldCount + 1) - { - MenuEntryAdded event = new MenuEntryAdded( - client.getMenuOptions()[newCount - 1], - client.getMenuTargets()[newCount - 1], - client.getMenuTypes()[newCount - 1], - client.getMenuIdentifiers()[newCount - 1], - client.getMenuActionParams0()[newCount - 1], - client.getMenuActionParams1()[newCount - 1] - ); - - client.getCallbacks().post(event); - } - } - - @Inject - @Override - public List getProjectiles() - { - List projectiles = new ArrayList(); - RSDeque projectileDeque = this.getProjectilesDeque(); - Node head = projectileDeque.getHead(); - - for (Node node = head.getNext(); node != head; node = node.getNext()) - { - projectiles.add((Projectile) node); - } - - return projectiles; - } - - @Inject - @Override - public List getGraphicsObjects() - { - List graphicsObjects = new ArrayList(); - RSDeque graphicsObjectDeque = this.getGraphicsObjectDeque(); - Node head = graphicsObjectDeque.getHead(); - - for (Node node = head.getNext(); node != head; node = node.getNext()) - { - graphicsObjects.add((GraphicsObject) node); - } - - return graphicsObjects; - } - - @Inject - @Override - public void setModIcons(IndexedSprite[] modIcons) - { - setRSModIcons((RSIndexedSprite[]) modIcons); - } - - @Inject - @Override - @Nullable - public LocalPoint getLocalDestinationLocation() - { - int sceneX = getDestinationX(); - int sceneY = getDestinationY(); - if (sceneX != 0 && sceneY != 0) - { - return LocalPoint.fromScene(sceneX, sceneY); - } - return null; - } - - @Inject - @Override - public void changeMemoryMode(boolean lowMemory) - { - setLowMemory(lowMemory); - setSceneLowMemory(lowMemory); - setAudioHighMemory(true); - setObjectCompositionLowDetail(lowMemory); - } - - @Inject - @Override - public RSItemContainer getItemContainer(InventoryID inventory) - { - RSHashTable itemContainers = getItemContainers(); - return (RSItemContainer) itemContainers.get(inventory.getId()); - } - - @Inject - @Override - public boolean isFriended(String name, boolean mustBeLoggedIn) - { - RSName rsName = createName(name, getLoginType()); - return getFriendManager().isFriended(rsName, mustBeLoggedIn); - } - - @Inject - @Override - public int getClanChatCount() - { - final RSClanMemberManager clanMemberManager = getClanMemberManager(); - return clanMemberManager != null ? clanMemberManager.getCount() : 0; - } - - @Inject - @Override - public ClanMember[] getClanMembers() - { - final RSClanMemberManager clanMemberManager = getClanMemberManager(); - if (clanMemberManager == null) - { - return null; - } - - final int count = clanMemberManager.getCount(); - return Arrays.copyOf(clanMemberManager.getNameables(), count); - } - - @Inject - @Override - public String getClanOwner() - { - return getClanMemberManager().getClanOwner(); - } - - @Inject - @Override - public String getClanChatName() - { - return getClanMemberManager().getClanChatName(); - } - - @Inject - @Override - public Friend[] getFriends() - { - final RSFriendManager friendManager = getFriendManager(); - if (friendManager == null) - { - return null; - } - - final RSFriendContainer friendContainer = friendManager.getFriendContainer(); - if (friendContainer == null) - { - return null; - } - - final int count = friendContainer.getCount(); - return Arrays.copyOf(friendContainer.getNameables(), count); - } - - @Inject - @Override - public int getFriendsCount() - { - final RSFriendManager friendManager = getFriendManager(); - if (friendManager == null) - { - return -1; - } - - final RSFriendContainer friendContainer = friendManager.getFriendContainer(); - if (friendContainer == null) - { - return -1; - } - - return friendContainer.getCount(); - } - - @Inject - @Override - public Ignore[] getIgnores() - { - final RSFriendManager friendManager = getFriendManager(); - if (friendManager == null) - { - return null; - } - - final RSIgnoreContainer ignoreContainer = friendManager.getIgnoreContainer(); - if (ignoreContainer == null) - { - return null; - } - - final int count = ignoreContainer.getCount(); - return Arrays.copyOf(ignoreContainer.getNameables(), count); - } - - @Inject - @Override - public int getIgnoreCount() - { - final RSFriendManager friendManager = getFriendManager(); - if (friendManager == null) - { - return -1; - } - - final RSIgnoreContainer ignoreContainer = friendManager.getIgnoreContainer(); - if (ignoreContainer == null) - { - return -1; - } - - return ignoreContainer.getCount(); - } - - @Inject - @Override - public boolean isClanMember(String name) - { - final RSClanMemberManager clanMemberManager = getClanMemberManager(); - return clanMemberManager != null && clanMemberManager.isMember(createName(name, getLoginType())); - } - - @FieldHook("draggingWidget") - @Inject - public static void draggingWidgetChanged(int idx) - { - DraggingWidgetChanged draggingWidgetChanged = new DraggingWidgetChanged(); - draggingWidgetChanged.setDraggingWidget(client.isDraggingWidget()); - client.getCallbacks().post(draggingWidgetChanged); - } - - @Inject - @Override - public SpritePixels createItemSprite(int itemId, int quantity, int border, int shadowColor, int stackable, boolean noted, int scale) - { - assert isClientThread(); - int zoom = get3dZoom(); - set3dZoom(scale); - try - { - return createItemSprite(itemId, quantity, border, shadowColor, stackable, noted); - } - finally - { - set3dZoom(zoom); - } - } - - @Copy("runWidgetOnLoadListener") - public static void rs$runWidgetOnLoadListener(int groupId) - { - throw new RuntimeException(); - } - - @Replace("runWidgetOnLoadListener") - public static void rl$runWidgetOnLoadListener(int groupId) - { - rs$runWidgetOnLoadListener(groupId); - - RSWidget[][] widgets = client.getWidgets(); - boolean loaded = widgets != null && widgets[groupId] != null; - - if (loaded) - { - WidgetLoaded event = new WidgetLoaded(); - event.setGroupId(groupId); - client.getCallbacks().post(event); - } - } - - @FieldHook("itemPressedDuration") - @Inject - public static void itemPressedDurationChanged(int idx) - { - if (client.getItemPressedDuration() > 0) - { - itemPressedDurationBuffer++; - if (itemPressedDurationBuffer >= inventoryDragDelay) - { - client.setItemPressedDuration(itemPressedDurationBuffer); - } - else - { - client.setItemPressedDuration(0); - } - } - else - { - itemPressedDurationBuffer = 0; - } - } - - @FieldHook("skillExperiences") - @Inject - public static void experiencedChanged(int idx) - { - ExperienceChanged experienceChanged = new ExperienceChanged(); - Skill[] possibleSkills = Skill.values(); - - // We subtract one here because 'Overall' isn't considered a skill that's updated. - if (idx < possibleSkills.length - 1) - { - Skill updatedSkill = possibleSkills[idx]; - experienceChanged.setSkill(updatedSkill); - client.getCallbacks().post(experienceChanged); - } - } - - @FieldHook("boostedSkillLevels") - @Inject - public static void boostedSkillLevelsChanged(int idx) - { - Skill[] skills = Skill.values(); - - if (idx >= 0 && idx < skills.length - 1) - { - Skill updatedSkill = skills[idx]; - BoostedLevelChanged boostedLevelChanged = new BoostedLevelChanged(); - boostedLevelChanged.setSkill(updatedSkill); - client.getCallbacks().post(boostedLevelChanged); - } - } - - @FieldHook("playerOptions") - @Inject - public static void playerOptionsChanged(int idx) - { - // Reset the menu type - MenuAction[] playerActions = {PLAYER_FIRST_OPTION, PLAYER_SECOND_OPTION, PLAYER_THIRD_OPTION, PLAYER_FOURTH_OPTION, - PLAYER_FIFTH_OPTION, PLAYER_SIXTH_OPTION, PLAYER_SEVENTH_OPTION, PLAYER_EIGTH_OPTION}; - if (idx >= 0 && idx < playerActions.length) - { - MenuAction playerAction = playerActions[idx]; - client.getPlayerMenuTypes()[idx] = playerAction.getId(); - } - - PlayerMenuOptionsChanged optionsChanged = new PlayerMenuOptionsChanged(); - optionsChanged.setIndex(idx); - client.getCallbacks().post(optionsChanged); - } - - @FieldHook("gameState") - @Inject - public static void gameStateChanged(int idx) - { - GameStateChanged gameStateChange = new GameStateChanged(); - gameStateChange.setGameState(client.getGameState()); - client.getCallbacks().post(gameStateChange); - } - - - @FieldHook("cachedNPCs") - @Inject - public static void cachedNPCsChanged(int idx) - { - RSNPC[] cachedNPCs = client.getCachedNPCs(); - if (idx < 0 || idx >= cachedNPCs.length) - { - return; - } - - RSNPC npc = cachedNPCs[idx]; - if (npc != null) - { - npc.setIndex(idx); - - client.getCallbacks().postDeferred(new NpcSpawned(npc)); - } - } - - @FieldHook("cachedPlayers") - @Inject - public static void cachedPlayersChanged(int idx) - { - RSPlayer[] cachedPlayers = client.getCachedPlayers(); - if (idx < 0 || idx >= cachedPlayers.length) - { - return; - } - - RSPlayer player = cachedPlayers[idx]; - RSPlayer oldPlayer = oldPlayers[idx]; - oldPlayers[idx] = player; - - if (oldPlayer != null) - { - client.getCallbacks().post(new PlayerDespawned(oldPlayer)); - } - if (player != null) - { - client.getCallbacks().postDeferred(new PlayerSpawned(player)); - } - } - - @Inject - @FieldHook("grandExchangeOffers") - public static void onGrandExchangeOffersChanged(int idx) - { - if (idx == -1) - { - return; - } - - GrandExchangeOffer internalOffer = client.getGrandExchangeOffers()[idx]; - - if (internalOffer == null) - { - return; - } - - GrandExchangeOfferChanged offerChangedEvent = new GrandExchangeOfferChanged(); - offerChangedEvent.setOffer(internalOffer); - offerChangedEvent.setSlot(idx); - client.getCallbacks().post(offerChangedEvent); - } - - @FieldHook("clientVarps") - @Inject - public static void settingsChanged(int idx) - { - VarbitChanged varbitChanged = new VarbitChanged(); - varbitChanged.setIndex(idx); - client.getCallbacks().post(varbitChanged); - } - - @FieldHook("isResized") - @Inject - public static void resizeChanged(int idx) - { - //maybe couple with varbitChanged. resizeable may not be a varbit but it would fit with the other client settings. - boolean isResized = client.isResized(); - - if (oldIsResized != isResized) - { - ResizeableChanged resizeableChanged = new ResizeableChanged(); - resizeableChanged.setResized(isResized); - client.getCallbacks().post(resizeableChanged); - - oldIsResized = isResized; - } - } - - @FieldHook("clanMemberManager") - @Inject - public static void clanMemberManagerChanged(int idx) - { - client.getCallbacks().post(new ClanChanged(client.getClanMemberManager() != null)); - } - - @FieldHook("canvasWidth") - @Inject - public static void canvasWidthChanged(int idx) - { - client.getCallbacks().post(new CanvasSizeChanged()); - } - - @FieldHook("canvasHeight") - @Inject - public static void canvasHeightChanged(int idx) - { - client.getCallbacks().post(new CanvasSizeChanged()); - } - - @Inject - @Override - public boolean hasHintArrow() - { - return client.getHintArrowTargetType() != HintArrowType.NONE.getValue(); - } - - @Inject - @Override - public HintArrowType getHintArrowType() - { - int type = client.getHintArrowTargetType(); - if (type == HintArrowType.NPC.getValue()) - { - return HintArrowType.NPC; - } - else if (type == HintArrowType.PLAYER.getValue()) - { - return HintArrowType.PLAYER; - } - else if (type == HintArrowType.WORLD_POSITION.getValue()) - { - return HintArrowType.WORLD_POSITION; - } - else - { - return HintArrowType.NONE; - } - } - - @Inject - @Override - public void clearHintArrow() - { - client.setHintArrowTargetType(HintArrowType.NONE.getValue()); - } - - @Inject - @Override - public void setHintArrow(NPC npc) - { - client.setHintArrowTargetType(HintArrowType.NPC.getValue()); - client.setHintArrowNpcTargetIdx(npc.getIndex()); - } - - @Inject - @Override - public void setHintArrow(Player player) - { - client.setHintArrowTargetType(HintArrowType.PLAYER.getValue()); - client.setHintArrowPlayerTargetIdx(((RSPlayer) player).getPlayerId()); - } - - @Inject - @Override - public void setHintArrow(WorldPoint point) - { - client.setHintArrowTargetType(HintArrowType.WORLD_POSITION.getValue()); - client.setHintArrowX(point.getX()); - client.setHintArrowY(point.getY()); - // position the arrow in center of the tile - client.setHintArrowOffsetX(LOCAL_TILE_SIZE / 2); - client.setHintArrowOffsetY(LOCAL_TILE_SIZE / 2); - } - - @Inject - @Override - public WorldPoint getHintArrowPoint() - { - if (getHintArrowType() == HintArrowType.WORLD_POSITION) - { - int x = client.getHintArrowX(); - int y = client.getHintArrowY(); - return new WorldPoint(x, y, client.getPlane()); - } - - return null; - } - - @Inject - @Override - public Player getHintArrowPlayer() - { - if (getHintArrowType() == HintArrowType.PLAYER) - { - int idx = client.getHintArrowPlayerTargetIdx(); - RSPlayer[] players = client.getCachedPlayers(); - - if (idx < 0 || idx >= players.length) - { - return null; - } - - return players[idx]; - } - - return null; - } - - @Inject - @Override - public NPC getHintArrowNpc() - { - if (getHintArrowType() == HintArrowType.NPC) - { - int idx = client.getHintArrowNpcTargetIdx(); - RSNPC[] npcs = client.getCachedNPCs(); - - if (idx < 0 || idx >= npcs.length) - { - return null; - } - - return npcs[idx]; - } - - return null; - } - - @Copy("menuAction") - static void rs$menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) - { - throw new RuntimeException(); - } - - @Replace("menuAction") - static void rl$menuAction(int actionParam, int widgetId, int menuAction, int id, String menuOption, String menuTarget, int var6, int var7) - { - /* Along the way, the RuneScape client may change a menuAction by incrementing it with 2000. - * I have no idea why, but it does. Their code contains the same conditional statement. - */ - if (menuAction >= 2000) - { - menuAction -= 2000; - } - - final MenuOptionClicked menuOptionClicked = new MenuOptionClicked(); - menuOptionClicked.setActionParam(actionParam); - menuOptionClicked.setMenuOption(menuOption); - menuOptionClicked.setMenuTarget(menuTarget); - menuOptionClicked.setMenuAction(MenuAction.of(menuAction)); - menuOptionClicked.setId(id); - menuOptionClicked.setWidgetId(widgetId); - client.getCallbacks().post(menuOptionClicked); - - if (menuOptionClicked.isConsumed()) - { - return; - } - - rs$menuAction(actionParam, widgetId, menuAction, id, menuOption, menuTarget, var6, var7); - } - - @FieldHook("username") - @Inject - public static void onUsernameChanged(int idx) - { - client.getCallbacks().post(new UsernameChanged()); - } - - @Override - @Inject - public int getTickCount() - { - return tickCount; - } - - @Override - @Inject - public void setTickCount(int tick) - { - tickCount = tick; - } - - @Inject - @Override - public EnumSet getWorldType() - { - int flags = getFlags(); - return WorldType.fromMask(flags); - } - - @Inject - @MethodHook("openMenu") - public void menuOpened(int var1, int var2) - { - final MenuOpened event = new MenuOpened(); - event.setMenuEntries(getMenuEntries()); - callbacks.post(event); - } - - @Inject - @MethodHook("updateNpcs") - public static void updateNpcs(boolean var0, PacketBuffer var1) - { - client.getCallbacks().updateNpcs(); - } - - @Inject - @MethodHook(value = "addChatMessage", end = true) - public static void onAddChatMessage(int type, String name, String message, String sender) - { - Logger logger = client.getLogger(); - if (logger.isDebugEnabled()) - { - logger.debug("Chat message type {}: {}", ChatMessageType.of(type), message); - } - - // Get the message node which was added - Map chatLineMap = client.getChatLineMap(); - RSChatLineBuffer chatLineBuffer = chatLineMap.get(type); - MessageNode messageNode = chatLineBuffer.getLines()[0]; - - final ChatMessageType chatMessageType = ChatMessageType.of(type); - final ChatMessage chatMessage = new ChatMessage(messageNode, chatMessageType, name, message, sender, messageNode.getTimestamp()); - client.getCallbacks().post(chatMessage); - } - - @Inject - @MethodHook("methodDraw") - public void methodDraw(boolean var1) - { - callbacks.clientMainLoop(); - } - - @MethodHook("renderWidgetLayer") - @Inject - public static void renderWidgetLayer(Widget[] widgets, int parentId, int minX, int minY, int maxX, int maxY, int x, int y, int var8) - { - Callbacks callbacks = client.getCallbacks(); - HashTable componentTable = client.getComponentTable(); - - for (Widget rlWidget : widgets) - { - RSWidget widget = (RSWidget) rlWidget; - if (widget == null || widget.getRSParentId() != parentId || widget.isSelfHidden()) - { - continue; - } - - if (parentId != -1) - { - widget.setRenderParentId(parentId); - } - - final int renderX = x + widget.getRelativeX(); - final int renderY = y + widget.getRelativeY(); - widget.setRenderX(renderX); - widget.setRenderY(renderY); - - final int widgetType = widget.getType(); - if (widgetType == WidgetType.GRAPHIC && widget.getItemId() != -1) - { - if (renderX >= minX && renderX <= maxX && renderY >= minY && renderY <= maxY) - { - WidgetItem widgetItem = new WidgetItem(widget.getItemId(), widget.getItemQuantity(), -1, widget.getBounds(), widget); - callbacks.drawItem(widget.getItemId(), widgetItem); - } - } - else if (widgetType == WidgetType.INVENTORY) - { - Collection widgetItems = widget.getWidgetItems(); - for (WidgetItem widgetItem : widgetItems) - { - callbacks.drawItem(widgetItem.getId(), widgetItem); - } - } - - WidgetNode childNode = componentTable.get(widget.getId()); - if (childNode != null) - { - int widgetId = widget.getId(); - int groupId = childNode.getId(); - RSWidget[] children = client.getWidgets()[groupId]; - - for (RSWidget child : children) - { - if (child.getRSParentId() == -1) - { - child.setRenderParentId(widgetId); - } - } - } - } - } - - @Inject - @Override - public RSItem getLastItemDespawn() - { - return lastItemDespawn; - } - - @Inject - @Override - public void setLastItemDespawn(RSItem lastItemDespawn) - { - RSClientMixin.lastItemDespawn = lastItemDespawn; - } - - @Inject - @Override - public boolean isGpu() - { - return gpu; - } - - @Inject - @Override - public void setGpu(boolean gpu) - { - this.gpu = gpu; - } - - @Inject - @Override - public void queueChangedSkill(Skill skill) - { - int[] skills = client.getChangedSkills(); - int count = client.getChangedSkillsCount(); - skills[++count - 1 & 31] = skill.ordinal(); - client.setChangedSkillsCount(count); - } - - @Inject - @Override - public RSSpritePixels[] getSprites(IndexDataBase source, int archiveId, int fileId) - { - RSIndexDataBase rsSource = (RSIndexDataBase) source; - byte[] configData = rsSource.getConfigData(archiveId, fileId); - if (configData == null) - { - return null; - } - - decodeSprite(configData); - - int indexedSpriteCount = getIndexedSpriteCount(); - int maxWidth = getIndexedSpriteWidth(); - int maxHeight = getIndexedSpriteHeight(); - int[] offsetX = getIndexedSpriteOffsetXs(); - int[] offsetY = getIndexedSpriteOffsetYs(); - int[] widths = getIndexSpriteWidths(); - int[] heights = getIndexedSpriteHeights(); - byte[][] spritePixelsArray = getSpritePixels(); - int[] indexedSpritePalette = getIndexedSpritePalette(); - - RSSpritePixels[] array = new RSSpritePixels[indexedSpriteCount]; - - for (int i = 0; i < indexedSpriteCount; ++i) - { - int width = widths[i]; - int height = heights[i]; - - byte[] pixelArray = spritePixelsArray[i]; - int[] pixels = new int[width * height]; - - RSSpritePixels spritePixels = createSpritePixels(pixels, width, height); - spritePixels.setMaxHeight(maxHeight); - spritePixels.setMaxWidth(maxWidth); - spritePixels.setOffsetX(offsetX[i]); - spritePixels.setOffsetY(offsetY[i]); - - for (int j = 0; j < width * height; ++j) - { - pixels[j] = indexedSpritePalette[pixelArray[j] & 0xff]; - } - - array[i] = spritePixels; - } - - setIndexedSpriteOffsetXs(null); - setIndexedSpriteOffsetYs(null); - setIndexSpriteWidths(null); - setIndexedSpriteHeights(null); - setIndexSpritePalette(null); - setSpritePixels(null); - - return array; - } - - @Inject - @Override - public void setSkyboxColor(int newSkyboxColor) - { - skyboxColor = newSkyboxColor; - } - - @Inject - @Override - public int getSkyboxColor() - { - return skyboxColor; - } - - @Inject - @FieldHook("cycleCntr") - public static void onCycleCntrChanged(int idx) - { - client.getCallbacks().post(new ClientTick()); - } - - @Copy("shouldLeftClickOpenMenu") - boolean rs$shouldLeftClickOpenMenu() - { - throw new RuntimeException(); - } - - @Replace("shouldLeftClickOpenMenu") - boolean rl$shouldLeftClickOpenMenu() - { - if (rs$shouldLeftClickOpenMenu()) - { - return true; - } - - MenuShouldLeftClick menuShouldLeftClick = new MenuShouldLeftClick(); - client.getCallbacks().post(menuShouldLeftClick); - - if (menuShouldLeftClick.isForceRightClick()) - { - return true; - } - - int len = getMenuOptionCount(); - if (len > 0) - { - int type = getMenuTypes()[len - 1]; - return type == MenuAction.RUNELITE_OVERLAY.getId(); - } - - return false; - } - - @Inject - @Override - public EnumComposition getEnum(int id) - { - assert isClientThread() : "getEnum must be called on client thread"; - - RSEnum rsEnum = enumCache.getIfPresent(id); - if (rsEnum != null) - { - return rsEnum; - } - - rsEnum = getRsEnum(id); - enumCache.put(id, rsEnum); - return rsEnum; - } - - @Inject - @Override - public void resetHealthBarCaches() - { - getHealthBarCache().reset(); - getHealthBarSpriteCache().reset(); - } -} \ No newline at end of file diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSDecorativeObjectMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSDecorativeObjectMixin.java deleted file mode 100644 index 9bf27786eb..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSDecorativeObjectMixin.java +++ /dev/null @@ -1,167 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.awt.Polygon; -import java.awt.geom.Area; -import net.runelite.api.Model; -import net.runelite.api.Perspective; -import net.runelite.api.coords.LocalPoint; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSDecorativeObject; -import net.runelite.rs.api.RSModel; -import net.runelite.rs.api.RSRenderable; - -@Mixin(RSDecorativeObject.class) -public abstract class RSDecorativeObjectMixin implements RSDecorativeObject -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - private int decorativeObjectPlane; - - @Inject - @Override - public int getPlane() - { - return decorativeObjectPlane; - } - - @Inject - @Override - public void setPlane(int plane) - { - this.decorativeObjectPlane = plane; - } - - @Inject - private RSModel getModel() - { - RSRenderable renderable = getRenderable(); - if (renderable == null) - { - return null; - } - - RSModel model; - - if (renderable instanceof Model) - { - model = (RSModel) renderable; - } - else - { - model = renderable.getModel(); - } - - return model; - } - - @Inject - private RSModel getModel2() - { - RSRenderable renderable = getRenderable2(); - if (renderable == null) - { - return null; - } - - RSModel model; - - if (renderable instanceof Model) - { - model = (RSModel) renderable; - } - else - { - model = renderable.getModel(); - } - - return model; - } - - @Inject - @Override - public Area getClickbox() - { - Area clickbox = new Area(); - - LocalPoint lp = getLocalLocation(); - Area clickboxA = Perspective.getClickbox(client, getModel(), 0, - new LocalPoint(lp.getX() + getXOffset(), lp.getY() + getYOffset())); - Area clickboxB = Perspective.getClickbox(client, getModel2(), 0, lp); - - if (clickboxA == null && clickboxB == null) - { - return null; - } - - if (clickboxA != null) - { - clickbox.add(clickboxA); - } - - if (clickboxB != null) - { - clickbox.add(clickboxB); - } - - return clickbox; - } - - @Inject - @Override - public Polygon getConvexHull() - { - RSModel model = getModel(); - - if (model == null) - { - return null; - } - - int tileHeight = Perspective.getTileHeight(client, new LocalPoint(getX(), getY()), client.getPlane()); - return model.getConvexHull(getX() + getXOffset(), getY() + getYOffset(), 0, tileHeight); - } - - @Inject - @Override - public Polygon getConvexHull2() - { - RSModel model = getModel2(); - - if (model == null) - { - return null; - } - - int tileHeight = Perspective.getTileHeight(client, new LocalPoint(getX(), getY()), client.getPlane()); - return model.getConvexHull(getX(), getY(), 0, tileHeight); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSDynamicObjectMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSDynamicObjectMixin.java deleted file mode 100644 index f9639b6309..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSDynamicObjectMixin.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.FieldHook; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSDynamicObject; -import net.runelite.rs.api.RSModel; - -@Mixin(RSDynamicObject.class) -public abstract class RSDynamicObjectMixin implements RSDynamicObject -{ - @Shadow("clientInstance") - private static RSClient client; - - @Copy("getModel") - public abstract RSModel rs$getModel(); - - @Replace("getModel") - public RSModel rl$getModel() - { - try - { - // reset frame because it may have been set from the constructor - // it should be set again inside the getModel method - int animFrame = getAnimFrame(); - if (animFrame < 0) - { - setAnimFrame((animFrame ^ Integer.MIN_VALUE) & 0xFFFF); - } - return rs$getModel(); - } - finally - { - int animFrame = getAnimFrame(); - if (animFrame < 0) - { - setAnimFrame((animFrame ^ Integer.MIN_VALUE) & 0xFFFF); - } - } - } - - @FieldHook("animCycleCount") - @Inject - public void onAnimCycleCountChanged(int idx) - { - if (client.isInterpolateObjectAnimations()) - { - // sets the packed anim frame with the frame cycle - int objectFrameCycle = client.getGameCycle() - getAnimCycleCount(); - setAnimFrame(Integer.MIN_VALUE | objectFrameCycle << 16 | getAnimFrame()); - } - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSEnumMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSEnumMixin.java deleted file mode 100644 index 06dd3ab2e8..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSEnumMixin.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2019, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.rs.api.RSEnum; - -@Mixin(RSEnum.class) -public abstract class RSEnumMixin implements RSEnum -{ - @Inject - @Override - public int getIntValue(int key) - { - final int[] keys = getKeys(); - if (keys == null) - { - return getDefaultInt(); - } - - for (int i = 0; i < keys.length; ++i) - { - if (keys[i] == key) - { - final int[] values = getIntVals(); - return values[i]; - } - } - return getDefaultInt(); - } - - @Inject - @Override - public String getStringValue(int key) - { - final int[] keys = getKeys(); - if (keys == null) - { - return getDefaultString(); - } - - for (int i = 0; i < keys.length; ++i) - { - if (keys[i] == key) - { - final String[] values = getStringVals(); - return values[i]; - } - } - return getDefaultString(); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendManagerMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendManagerMixin.java deleted file mode 100644 index 91d5077dd0..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendManagerMixin.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.events.RemovedFriend; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.MethodHook; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSFriendManager; - -@Mixin(RSFriendManager.class) -public abstract class RSFriendManagerMixin implements RSFriendManager -{ - @Shadow("clientInstance") - private static RSClient client; - - @MethodHook("removeFriend") - @Inject - public void rl$removeFriend(String friendName) - { - RemovedFriend removedFriend = new RemovedFriend(friendName); - client.getCallbacks().post(removedFriend); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendMixin.java deleted file mode 100644 index db47e095a1..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendMixin.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.rs.api.RSFriend; -import net.runelite.rs.api.RSName; - -@Mixin(RSFriend.class) -public abstract class RSFriendMixin implements RSFriend -{ - @Override - @Inject - public String getName() - { - return getRsName().getName(); - } - - @Override - @Inject - public String getPrevName() - { - RSName prevName = getRsPrevName(); - return prevName == null ? null : prevName.getName(); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSGameCanvasMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSGameCanvasMixin.java deleted file mode 100644 index f456a1c5e7..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSGameCanvasMixin.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2018 Abex - * Copyright (c) 2018, Lotto - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.awt.Canvas; -import java.awt.event.FocusListener; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSGameCanvas; - -@Mixin(RSGameCanvas.class) -public abstract class RSGameCanvasMixin extends Canvas implements RSGameCanvas -{ - @Shadow("clientInstance") - private static RSClient client; - - // This is inverted because it is false initialized. - @Inject - private static boolean shouldNotHaveFocus; - - @Inject - @Override - public void removeFocusListener(FocusListener l) - { - super.removeFocusListener(l); - shouldNotHaveFocus = !this.hasFocus(); - } - - @Inject - @Override - public void requestFocus() - { - // Runescape requests focus whenever the window is resized. Because of this, PluginPanels cannot have focus - // if they cause the sidebar to expand. This change prevents Runescape from requesting focus whenever it wants - if (!shouldNotHaveFocus) - { - this.requestFocusInWindow(); - } - } - - @Inject - @Override - public void setSize(int width, int height) - { - if (client.isStretchedEnabled()) - { - super.setSize(client.getStretchedDimensions().width, client.getStretchedDimensions().height); - } - else - { - super.setSize(width, height); - } - } - - @Inject - @Override - public void setLocation(int x, int y) - { - if (client.isStretchedEnabled()) - { - super.setLocation((getParent().getWidth() - client.getStretchedDimensions().width) / 2, 0); - } - else - { - super.setLocation(x, y); - } - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSGameEngineMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSGameEngineMixin.java deleted file mode 100644 index ee4fe10fa6..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSGameEngineMixin.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (c) 2018 Abex - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.awt.event.FocusEvent; -import net.runelite.api.events.FocusChanged; -import net.runelite.api.hooks.DrawCallbacks; -import net.runelite.api.mixins.FieldHook; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.MethodHook; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSGameEngine; - -@Mixin(RSGameEngine.class) -public abstract class RSGameEngineMixin implements RSGameEngine -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - private Thread thread; - - @Inject - @Override - public Thread getClientThread() - { - return thread; - } - - @Inject - @Override - public boolean isClientThread() - { - return thread == Thread.currentThread(); - } - - @Inject - @MethodHook("run") - public void onRun() - { - thread = Thread.currentThread(); - thread.setName("Client"); - } - - @Inject - @MethodHook("focusGained") - public void onFocusGained(FocusEvent focusEvent) - { - final FocusChanged focusChanged = new FocusChanged(); - focusChanged.setFocused(true); - client.getCallbacks().post(focusChanged); - } - - @Inject - @MethodHook("post") - public void onPost(Object canvas) - { - DrawCallbacks drawCallbacks = client.getDrawCallbacks(); - if (drawCallbacks != null) - { - drawCallbacks.draw(); - } - } - - @FieldHook("replaceCanvasNextFrame") - @Inject - public void onReplaceCanvasNextFrameChanged(int idx) - { - // when this is initially called the client instance doesn't exist yet - if (client != null && client.isGpu() && isReplaceCanvasNextFrame()) - { - setReplaceCanvasNextFrame(false); - setResizeCanvasNextFrame(true); - } - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSGameObjectMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSGameObjectMixin.java deleted file mode 100644 index 25fb322c79..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSGameObjectMixin.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.awt.Polygon; -import java.awt.geom.Area; -import net.runelite.api.Perspective; -import net.runelite.api.Point; -import net.runelite.api.coords.Angle; -import net.runelite.api.coords.LocalPoint; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSGameObject; -import net.runelite.rs.api.RSModel; -import net.runelite.rs.api.RSRenderable; - -@Mixin(RSGameObject.class) -public abstract class RSGameObjectMixin implements RSGameObject -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - @Override - public Point getSceneMinLocation() - { - return new Point(getRelativeX(), getRelativeY()); - } - - @Inject - @Override - public Point getSceneMaxLocation() - { - return new Point(getOffsetX(), getOffsetY()); - } - - @Inject - private RSModel getModel() - { - RSRenderable renderable = getRenderable(); - if (renderable == null) - { - return null; - } - - if (renderable instanceof RSModel) - { - return (RSModel) renderable; - } - else - { - return renderable.getModel(); - } - } - - @Inject - @Override - public Area getClickbox() - { - return Perspective.getClickbox(client, getModel(), getRsOrientation(), getLocalLocation()); - } - - @Inject - @Override - public Polygon getConvexHull() - { - RSModel model = getModel(); - - if (model == null) - { - return null; - } - - int tileHeight = Perspective.getTileHeight(client, new LocalPoint(getX(), getY()), client.getPlane()); - return model.getConvexHull(getX(), getY(), getRsOrientation(), tileHeight); - } - - @Override - @Inject - public Angle getOrientation() - { - int orientation = getRsOrientation(); - int rotation = (getFlags() >> 6) & 3; - return new Angle(rotation * 512 + orientation); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSGrandExchangeOfferMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSGrandExchangeOfferMixin.java deleted file mode 100644 index 17509a4aa1..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSGrandExchangeOfferMixin.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (c) 2018, SomeoneWithAnInternetConnection - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package net.runelite.mixins; - -import net.runelite.api.GrandExchangeOfferState; -import static net.runelite.api.GrandExchangeOfferState.BOUGHT; -import static net.runelite.api.GrandExchangeOfferState.BUYING; -import static net.runelite.api.GrandExchangeOfferState.CANCELLED_BUY; -import static net.runelite.api.GrandExchangeOfferState.CANCELLED_SELL; -import static net.runelite.api.GrandExchangeOfferState.EMPTY; -import static net.runelite.api.GrandExchangeOfferState.SELLING; -import static net.runelite.api.GrandExchangeOfferState.SOLD; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.rs.api.RSGrandExchangeOffer; - -@Mixin(RSGrandExchangeOffer.class) -public abstract class RSGrandExchangeOfferMixin implements RSGrandExchangeOffer -{ - - /* - Internally a GrandExchangeOffer's state is represented as 4 flags - packed into the lower half of a byte. They are: - */ - - //Set for sell offers, unset for buy offers - private static final int IS_SELLING = 1 << 3; // 0b1000 - - - /* - Set for offers that have finished, either because they've - been filled, or because they were cancelled - */ - private static final int COMPLETED = 1 << 2; // 0b0100 - - /* - Set for offers that are actually live - NB: Insta-buy/sell offers will be simultaneously LIVE and LOCAL - */ - private static final int LIVE = 1 << 1; // 0b0010 - - //True for just-made, just-cancelled, completely cancelled, and completed offers - private static final int LOCAL = 1; - - @Inject - @Override - public GrandExchangeOfferState getState() - { - byte code = getRSState(); - boolean isSelling = (code & IS_SELLING) == IS_SELLING; - boolean isFinished = (code & COMPLETED) == COMPLETED; - - - if (code == 0) - { - return EMPTY; - } - else if (isFinished && getQuantitySold() < getTotalQuantity()) - { - return isSelling ? CANCELLED_SELL : CANCELLED_BUY; - } - else if (isSelling) - { - if (isFinished) - { - return SOLD; - } - else // if isUnfinished - { - return SELLING; - } - } - else // if isBuying - { - if (isFinished) - { - return BOUGHT; - } - else // if isUnfinished - { - return BUYING; - } - } - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSGroundObjectMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSGroundObjectMixin.java deleted file mode 100644 index d0d00d8e9b..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSGroundObjectMixin.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (c) 2018, SomeoneWithAnInternetConnection - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.awt.geom.Area; -import net.runelite.api.Model; -import net.runelite.api.Perspective; -import net.runelite.api.Renderable; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSGroundObject; - -@Mixin(RSGroundObject.class) -public abstract class RSGroundObjectMixin implements RSGroundObject -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - private int groundObjectPlane; - - @Inject - @Override - public int getPlane() - { - return groundObjectPlane; - } - - @Inject - @Override - public void setPlane(int plane) - { - this.groundObjectPlane = plane; - } - - @Inject - private Model getModel() - { - Renderable renderable = getRenderable(); - if (renderable == null) - { - return null; - } - - if (renderable instanceof Model) - { - return (Model) renderable; - } - else - { - return renderable.getModel(); - } - } - - @Inject - @Override - public Area getClickbox() - { - return Perspective.getClickbox(client, getModel(), 0, getLocalLocation()); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSHashTableMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSHashTableMixin.java deleted file mode 100644 index ae82420438..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSHashTableMixin.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import net.runelite.api.Node; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.rs.api.RSHashTable; -import net.runelite.rs.api.RSNode; - -@Mixin(RSHashTable.class) -public abstract class RSHashTableMixin implements RSHashTable -{ - @Inject - @Override - public Collection getNodes() - { - // Copied in RSWidgetMixin.getParentId to reduce allocations - List nodes = new ArrayList(); - - RSNode[] buckets = getBuckets(); - for (int i = 0; i < buckets.length; ++i) - { - Node node = buckets[i]; - - // It looks like the first node in the bucket is always - // a sentinel - Node cur = node.getNext(); - while (cur != node) - { - nodes.add(cur); - cur = cur.getNext(); - } - } - - return nodes; - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSHealthBarMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSHealthBarMixin.java deleted file mode 100644 index ee80620f2e..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSHealthBarMixin.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2019, Lotto - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.events.PostHealthBar; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.MethodHook; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSBuffer; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSHealthBar; - -@Mixin(RSHealthBar.class) -public abstract class RSHealthBarMixin implements RSHealthBar -{ - @Shadow("clientInstance") - private static RSClient client; - - @MethodHook(value = "read", end = true) - @Inject - public void onRead(RSBuffer buffer) - { - PostHealthBar postHealthBar = new PostHealthBar(); - postHealthBar.setHealthBar(this); - client.getCallbacks().post(postHealthBar); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSIgnoreMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSIgnoreMixin.java deleted file mode 100644 index 98bcd7b3b2..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSIgnoreMixin.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.rs.api.RSIgnore; -import net.runelite.rs.api.RSName; - -@Mixin(RSIgnore.class) -public abstract class RSIgnoreMixin implements RSIgnore -{ - @Override - @Inject - public String getName() - { - return getRsName().getName(); - } - - @Override - @Inject - public String getPrevName() - { - RSName prevName = getRsPrevName(); - return prevName == null ? null : prevName.getName(); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSIndexDataBaseMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSIndexDataBaseMixin.java deleted file mode 100644 index c2c6806802..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSIndexDataBaseMixin.java +++ /dev/null @@ -1,139 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import com.google.common.hash.HashCode; -import com.google.common.hash.Hashing; -import com.google.common.io.BaseEncoding; -import com.google.common.io.ByteStreams; -import com.google.common.io.CharStreams; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.api.overlay.OverlayIndex; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSIndexData; -import net.runelite.rs.api.RSIndexDataBase; -import org.slf4j.Logger; - -@Mixin(RSIndexDataBase.class) -public abstract class RSIndexDataBaseMixin implements RSIndexDataBase -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - private boolean overlayOutdated; - - @Inject - @Override - public boolean isOverlayOutdated() - { - return overlayOutdated; - } - - @Copy("getConfigData") - abstract byte[] rs$getConfigData(int archiveId, int fileId); - - @Replace("getConfigData") - public byte[] rl$getConfigData(int archiveId, int fileId) - { - byte[] rsData = rs$getConfigData(archiveId, fileId); - RSIndexData indexData = (RSIndexData) this; - - if (!OverlayIndex.hasOverlay(indexData.getIndex(), archiveId)) - { - return rsData; - } - - Logger log = client.getLogger(); - - InputStream in = getClass().getResourceAsStream("/runelite/" + indexData.getIndex() + "/" + archiveId); - if (in == null) - { - log.warn("Missing overlay data for {}/{}", indexData.getIndex(), archiveId); - return rsData; - } - - InputStream in2 = getClass().getResourceAsStream("/runelite/" + indexData.getIndex() + "/" + archiveId + ".hash"); - if (rsData == null) - { - if (in2 != null) - { - log.warn("Hash file for non existing archive {}/{}", indexData.getIndex(), archiveId); - return null; - } - - log.debug("Adding archive {}/{}", indexData.getIndex(), archiveId); - - try - { - return ByteStreams.toByteArray(in); - } - catch (IOException ex) - { - log.warn("error loading archive replacement", ex); - } - - return null; - } - if (in2 == null) - { - log.warn("Missing hash file for {}/{}", indexData.getIndex(), archiveId); - return rsData; - } - - HashCode rsDataHash = Hashing.sha256().hashBytes(rsData); - - String rsHash = BaseEncoding.base16().encode(rsDataHash.asBytes()); - - try - { - String replaceHash = CharStreams.toString(new InputStreamReader(in2)); - - if (replaceHash.equals(rsHash)) - { - log.debug("Replacing archive {}/{}", - indexData.getIndex(), archiveId); - return ByteStreams.toByteArray(in); - } - - log.warn("Mismatch in overlaid cache archive hash for {}/{}: {} != {}", - indexData.getIndex(), archiveId, replaceHash, rsHash); - overlayOutdated = true; - } - catch (IOException ex) - { - log.warn("error checking hash", ex); - } - - return rsData; - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSItemCompositionMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSItemCompositionMixin.java deleted file mode 100644 index c37acc3946..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSItemCompositionMixin.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (c) 2018, SomeoneWithAnInternetConnection - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package net.runelite.mixins; - -import net.runelite.api.events.PostItemComposition; -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.MethodHook; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSItemComposition; - -@Mixin(RSItemComposition.class) -public abstract class RSItemCompositionMixin implements RSItemComposition -{ - private static final int DEFAULT_CUSTOM_SHIFT_CLICK_INDEX = -2; - - @Shadow("clientInstance") - private static RSClient client; - - @Inject - private int shiftClickActionIndex = DEFAULT_CUSTOM_SHIFT_CLICK_INDEX; - - @Inject - RSItemCompositionMixin() - { - } - - @Inject - @Override - public boolean isStackable() - { - return getIsStackable() != 0; - } - - @Inject - @Override - public void setShiftClickActionIndex(int shiftClickActionIndex) - { - this.shiftClickActionIndex = shiftClickActionIndex; - } - - @Copy("getShiftClickActionIndex") - abstract int rs$getShiftClickActionIndex(); - - @Replace("getShiftClickActionIndex") - public int getShiftClickActionIndex() - { - return shiftClickActionIndex == DEFAULT_CUSTOM_SHIFT_CLICK_INDEX ? rs$getShiftClickActionIndex() : shiftClickActionIndex; - } - - @Inject - @Override - public void resetShiftClickActionIndex() - { - shiftClickActionIndex = DEFAULT_CUSTOM_SHIFT_CLICK_INDEX; - } - - @Inject - @MethodHook(value = "post", end = true) - public void post() - { - final PostItemComposition event = new PostItemComposition(); - event.setItemComposition(this); - client.getCallbacks().post(event); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSItemContainerMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSItemContainerMixin.java deleted file mode 100644 index 638e90ced9..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSItemContainerMixin.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2016-2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.Item; -import net.runelite.api.events.ItemContainerChanged; -import net.runelite.api.mixins.FieldHook; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSItem; -import net.runelite.rs.api.RSItemContainer; - -@Mixin(RSItemContainer.class) -public abstract class RSItemContainerMixin implements RSItemContainer -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - private int rl$lastCycle; - - @Inject - @Override - public Item[] getItems() - { - int[] itemIds = getItemIds(); - int[] stackSizes = getStackSizes(); - Item[] items = new Item[itemIds.length]; - - for (int i = 0; i < itemIds.length; ++i) - { - RSItem item = client.createItem(); - item.setId(itemIds[i]); - item.setQuantity(stackSizes[i]); - items[i] = item; - } - - return items; - } - - @FieldHook("stackSizes") - @Inject - public void stackSizesChanged(int idx) - { - int cycle = client.getGameCycle(); - if (rl$lastCycle == cycle) - { - // Limit item container updates to one per cycle - return; - } - - rl$lastCycle = cycle; - - ItemContainerChanged event = new ItemContainerChanged(this); - client.getCallbacks().postDeferred(event); - } - -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSItemLayerMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSItemLayerMixin.java deleted file mode 100644 index 8b67d4d314..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSItemLayerMixin.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2018, SomeoneWithAnInternetConnection - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.awt.geom.Area; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.rs.api.RSItemLayer; - -@Mixin(RSItemLayer.class) -public abstract class RSItemLayerMixin implements RSItemLayer -{ - @Inject - private int itemLayerPlane; - - @Inject - @Override - public int getPlane() - { - return itemLayerPlane; - } - - @Inject - @Override - public void setPlane(int plane) - { - this.itemLayerPlane = plane; - } - - @Inject - @Override - public Area getClickbox() - { - throw new UnsupportedOperationException(); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSItemMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSItemMixin.java deleted file mode 100644 index 1d0732d9f6..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSItemMixin.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.Tile; -import net.runelite.api.events.ItemQuantityChanged; -import net.runelite.api.mixins.FieldHook; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSItem; - -@Mixin(RSItem.class) -public abstract class RSItemMixin implements RSItem -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - private int rl$sceneX = -1; - - @Inject - private int rl$sceneY = -1; - - @Inject - RSItemMixin() - { - } - - @Inject - @Override - public Tile getTile() - { - int x = rl$sceneX; - int y = rl$sceneY; - - if (x == -1 || y == -1) - { - return null; - } - - Tile[][][] tiles = client.getScene().getTiles(); - Tile tile = tiles[client.getPlane()][x][y]; - return tile; - } - - @Inject - @Override - public void onUnlink() - { - if (rl$sceneX != -1) - { - // on despawn, the first item unlinked is the item despawning. However on spawn - // items can be delinked in order to sort them, so we can't assume the item here is despawning - if (client.getLastItemDespawn() == null) - { - client.setLastItemDespawn(this); - } - } - } - - @Inject - @FieldHook(value = "quantity", before = true) - public void quantityChanged(int quantity) - { - if (rl$sceneX != -1) - { - client.getLogger().debug("Item quantity changed: {} ({} -> {})", getId(), getQuantity(), quantity); - - ItemQuantityChanged itemQuantityChanged = new ItemQuantityChanged(this, getTile(), getQuantity(), quantity); - client.getCallbacks().post(itemQuantityChanged); - } - } - - @Inject - @Override - public int getX() - { - return rl$sceneX; - } - - @Inject - @Override - public void setX(int x) - { - rl$sceneX = x; - } - - @Inject - @Override - public int getY() - { - return rl$sceneY; - } - - @Inject - @Override - public void setY(int y) - { - rl$sceneY = y; - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSKeyFocusListenerMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSKeyFocusListenerMixin.java deleted file mode 100644 index 73ddd9fd99..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSKeyFocusListenerMixin.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.awt.event.FocusEvent; -import java.awt.event.KeyEvent; -import net.runelite.api.events.FocusChanged; -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.MethodHook; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSKeyFocusListener; - -@Mixin(RSKeyFocusListener.class) -public abstract class RSKeyFocusListenerMixin implements RSKeyFocusListener -{ - @Shadow("clientInstance") - private static RSClient client; - - @Copy("keyPressed") - abstract void rs$keyPressed(KeyEvent keyEvent); - - @Copy("keyReleased") - abstract void rs$keyReleased(KeyEvent keyEvent); - - @Copy("keyTyped") - abstract void rs$keyTyped(KeyEvent keyEvent); - - @Override - @Replace("keyPressed") - public final synchronized void keyPressed(KeyEvent keyEvent) - { - client.getCallbacks().keyPressed(keyEvent); - if (!keyEvent.isConsumed()) - { - rs$keyPressed(keyEvent); - } - } - - @Override - @Replace("keyReleased") - public final synchronized void keyReleased(KeyEvent keyEvent) - { - client.getCallbacks().keyReleased(keyEvent); - if (!keyEvent.isConsumed()) - { - rs$keyReleased(keyEvent); - } - } - - @Override - @Replace("keyTyped") - public final void keyTyped(KeyEvent keyEvent) - { - client.getCallbacks().keyTyped(keyEvent); - if (!keyEvent.isConsumed()) - { - rs$keyTyped(keyEvent); - } - } - - @Inject - @MethodHook("focusLost") - public void onFocusLost(FocusEvent focusEvent) - { - final FocusChanged focusChanged = new FocusChanged(); - focusChanged.setFocused(false); - client.getCallbacks().post(focusChanged); - } -} \ No newline at end of file diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSMainBufferProviderMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSMainBufferProviderMixin.java deleted file mode 100644 index 0edcd02ad5..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSMainBufferProviderMixin.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) 2018, Lotto - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.awt.Component; -import java.awt.Graphics; -import java.awt.color.ColorSpace; -import java.awt.image.BufferedImage; -import java.awt.image.DataBuffer; -import java.awt.image.DataBufferInt; -import java.awt.image.DirectColorModel; -import java.awt.image.Raster; -import java.awt.image.WritableRaster; -import java.nio.IntBuffer; -import java.util.Hashtable; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.MethodHook; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSMainBufferProvider; - -@Mixin(RSMainBufferProvider.class) -public abstract class RSMainBufferProviderMixin implements RSMainBufferProvider -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - private IntBuffer buffer; - - @MethodHook(value = "", end = true) - @Inject - public void init(int width, int height, Component canvas) - { - if (!client.isGpu()) - { - return; - } - - final int[] pixels = getPixels(); - - // we need to make our own buffered image for the client with the alpha channel enabled in order to - // have alphas for the overlays applied correctly - DataBufferInt dataBufferInt = new DataBufferInt(pixels, pixels.length); - DirectColorModel directColorModel = new DirectColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB), - 32, 0xff0000, 0xff00, 0xff, 0xff000000, - true, DataBuffer.TYPE_INT); - WritableRaster writableRaster = Raster.createWritableRaster(directColorModel.createCompatibleSampleModel(width, height), dataBufferInt, null); - BufferedImage bufferedImage = new BufferedImage(directColorModel, writableRaster, true, new Hashtable()); - - setImage(bufferedImage); - } - - /** - * Replacing this method makes it so we can completely - * control when/what is drawn on the game's canvas, - * as the method that is replaced draws - * the game's image on the canvas. - */ - @Replace("draw") - final void draw(Graphics graphics, int x, int y) - { - client.getCallbacks().draw(this, graphics, x, y); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSMessageNodeMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSMessageNodeMixin.java deleted file mode 100644 index da716252e7..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSMessageNodeMixin.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.ChatMessageType; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.MethodHook; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSMessageNode; - -@Mixin(RSMessageNode.class) -public abstract class RSMessageNodeMixin implements RSMessageNode -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - private String runeLiteFormatMessage; - - @Inject - private int rl$timestamp; - - @Inject - RSMessageNodeMixin() - { - rl$timestamp = (int) (System.currentTimeMillis() / 1000L); - } - - @Inject - @Override - public ChatMessageType getType() - { - return ChatMessageType.of(getRSType()); - } - - @Inject - @Override - public String getRuneLiteFormatMessage() - { - return runeLiteFormatMessage; - } - - @Inject - @Override - public void setRuneLiteFormatMessage(String runeLiteFormatMessage) - { - this.runeLiteFormatMessage = runeLiteFormatMessage; - } - - @Inject - @Override - public int getTimestamp() - { - return rl$timestamp; - } - - @Inject - @Override - public void setTimestamp(int timestamp) - { - this.rl$timestamp = timestamp; - } - - @Inject - @MethodHook(value = "setMessage", end = true) - public void setMessage(int type, String name, String sender, String value) - { - // Message nodes get reused after a time by calling setMessage. - // Clear the runelite formatted message then. - runeLiteFormatMessage = null; - rl$timestamp = (int) (System.currentTimeMillis() / 1000L); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSModelDataMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSModelDataMixin.java deleted file mode 100644 index 6a074e6aba..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSModelDataMixin.java +++ /dev/null @@ -1,202 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.Model; -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSModel; -import net.runelite.rs.api.RSModelData; - -@Mixin(RSModelData.class) -public abstract class RSModelDataMixin implements RSModelData -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - private float[][] faceTextureUCoordinates; - - @Inject - private float[][] faceTextureVCoordinates; - - @Copy("light") - public abstract Model rs$light(int ambient, int contrast, int var3, int var4, int var5); - - @Replace("light") - public Model rl$light(int ambient, int contrast, int var3, int var4, int var5) - { - client.getLogger().trace("Lighting model {}", this); - - Model model = rs$light(ambient, contrast, var3, var4, var5); - if (model == null) - { - return null; - } - - if (faceTextureUCoordinates == null) - { - computeTextureUVCoordinates(); - } - - RSModel rsModel = (RSModel) model; - rsModel.setFaceTextureUCoordinates(faceTextureUCoordinates); - rsModel.setFaceTextureVCoordinates(faceTextureVCoordinates); - return model; - } - - @Inject - public void computeTextureUVCoordinates() - { - final short[] faceTextures = getFaceTextures(); - if (faceTextures == null) - { - return; - } - - final int[] vertexPositionsX = getVertexX(); - final int[] vertexPositionsY = getVertexY(); - final int[] vertexPositionsZ = getVertexZ(); - - final int[] trianglePointsX = getTrianglePointsX(); - final int[] trianglePointsY = getTrianglePointsY(); - final int[] trianglePointsZ = getTrianglePointsZ(); - - final short[] texTriangleX = getTexTriangleX(); - final short[] texTriangleY = getTexTriangleY(); - final short[] texTriangleZ = getTexTriangleZ(); - - final byte[] textureCoords = getTextureCoords(); - final byte[] textureRenderTypes = getTextureRenderTypes(); - - int faceCount = getTriangleFaceCount(); - this.faceTextureUCoordinates = new float[faceCount][]; - this.faceTextureVCoordinates = new float[faceCount][]; - - for (int i = 0; i < faceCount; i++) - { - int textureCoordinate; - if (textureCoords == null) - { - textureCoordinate = -1; - } - else - { - textureCoordinate = textureCoords[i]; - } - - short textureIdx; - textureIdx = faceTextures[i]; - - if (textureIdx != -1) - { - float[] u = new float[3]; - float[] v = new float[3]; - - if (textureCoordinate == -1) - { - u[0] = 0.0F; - v[0] = 1.0F; - - u[1] = 1.0F; - v[1] = 1.0F; - - u[2] = 0.0F; - v[2] = 0.0F; - } - else - { - textureCoordinate &= 0xFF; - - byte textureRenderType = 0; - if (textureRenderTypes != null) - { - textureRenderType = textureRenderTypes[textureCoordinate]; - } - - if (textureRenderType == 0) - { - int faceVertexIdx1 = trianglePointsX[i]; - int faceVertexIdx2 = trianglePointsY[i]; - int faceVertexIdx3 = trianglePointsZ[i]; - - int triangleVertexIdx1 = texTriangleX[textureCoordinate]; - int triangleVertexIdx2 = texTriangleY[textureCoordinate]; - int triangleVertexIdx3 = texTriangleZ[textureCoordinate]; - - float triangleX = (float) vertexPositionsX[triangleVertexIdx1]; - float triangleY = (float) vertexPositionsY[triangleVertexIdx1]; - float triangleZ = (float) vertexPositionsZ[triangleVertexIdx1]; - - float f_882_ = (float) vertexPositionsX[triangleVertexIdx2] - triangleX; - float f_883_ = (float) vertexPositionsY[triangleVertexIdx2] - triangleY; - float f_884_ = (float) vertexPositionsZ[triangleVertexIdx2] - triangleZ; - float f_885_ = (float) vertexPositionsX[triangleVertexIdx3] - triangleX; - float f_886_ = (float) vertexPositionsY[triangleVertexIdx3] - triangleY; - float f_887_ = (float) vertexPositionsZ[triangleVertexIdx3] - triangleZ; - float f_888_ = (float) vertexPositionsX[faceVertexIdx1] - triangleX; - float f_889_ = (float) vertexPositionsY[faceVertexIdx1] - triangleY; - float f_890_ = (float) vertexPositionsZ[faceVertexIdx1] - triangleZ; - float f_891_ = (float) vertexPositionsX[faceVertexIdx2] - triangleX; - float f_892_ = (float) vertexPositionsY[faceVertexIdx2] - triangleY; - float f_893_ = (float) vertexPositionsZ[faceVertexIdx2] - triangleZ; - float f_894_ = (float) vertexPositionsX[faceVertexIdx3] - triangleX; - float f_895_ = (float) vertexPositionsY[faceVertexIdx3] - triangleY; - float f_896_ = (float) vertexPositionsZ[faceVertexIdx3] - triangleZ; - - float f_897_ = f_883_ * f_887_ - f_884_ * f_886_; - float f_898_ = f_884_ * f_885_ - f_882_ * f_887_; - float f_899_ = f_882_ * f_886_ - f_883_ * f_885_; - float f_900_ = f_886_ * f_899_ - f_887_ * f_898_; - float f_901_ = f_887_ * f_897_ - f_885_ * f_899_; - float f_902_ = f_885_ * f_898_ - f_886_ * f_897_; - float f_903_ = 1.0F / (f_900_ * f_882_ + f_901_ * f_883_ + f_902_ * f_884_); - - u[0] = (f_900_ * f_888_ + f_901_ * f_889_ + f_902_ * f_890_) * f_903_; - u[1] = (f_900_ * f_891_ + f_901_ * f_892_ + f_902_ * f_893_) * f_903_; - u[2] = (f_900_ * f_894_ + f_901_ * f_895_ + f_902_ * f_896_) * f_903_; - - f_900_ = f_883_ * f_899_ - f_884_ * f_898_; - f_901_ = f_884_ * f_897_ - f_882_ * f_899_; - f_902_ = f_882_ * f_898_ - f_883_ * f_897_; - f_903_ = 1.0F / (f_900_ * f_885_ + f_901_ * f_886_ + f_902_ * f_887_); - - v[0] = (f_900_ * f_888_ + f_901_ * f_889_ + f_902_ * f_890_) * f_903_; - v[1] = (f_900_ * f_891_ + f_901_ * f_892_ + f_902_ * f_893_) * f_903_; - v[2] = (f_900_ * f_894_ + f_901_ * f_895_ + f_902_ * f_896_) * f_903_; - } - } - - this.faceTextureUCoordinates[i] = u; - this.faceTextureVCoordinates[i] = v; - } - } - } - -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSModelMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSModelMixin.java deleted file mode 100644 index 470f453b03..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSModelMixin.java +++ /dev/null @@ -1,437 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.awt.Polygon; -import java.util.ArrayList; -import java.util.List; -import net.runelite.api.Model; -import net.runelite.api.Perspective; -import net.runelite.api.Point; -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.MethodHook; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.api.model.Jarvis; -import net.runelite.api.model.Triangle; -import net.runelite.api.model.Vertex; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSFrame; -import net.runelite.rs.api.RSFrameMap; -import net.runelite.rs.api.RSFrames; -import net.runelite.rs.api.RSModel; - -@Mixin(RSModel.class) -public abstract class RSModelMixin implements RSModel -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - private int rl$sceneId; - - @Inject - private int rl$bufferOffset; - - @Inject - private int rl$uvBufferOffset; - - @Inject - private float[][] rl$faceTextureUCoordinates; - - @Inject - private float[][] rl$faceTextureVCoordinates; - - @MethodHook(value = "", end = true) - @Inject - public void rl$init(RSModel[] models, int length) - { - int count = 0; - for (int i = 0; i < length; ++i) - { - RSModel model = models[i]; - if (model != null) - { - count += model.getTrianglesCount(); - } - } - - float[][] u = new float[count][]; - float[][] v = new float[count][]; - int idx = 0; - - for (int i = 0; i < length; ++i) - { - RSModel model = models[i]; - if (model != null) - { - float[][] modelU = model.getFaceTextureUCoordinates(); - float[][] modelV = model.getFaceTextureVCoordinates(); - - for (int j = 0; j < model.getTrianglesCount(); ++j) - { - if (modelU != null && modelV != null) - { - u[idx] = modelU[j]; - v[idx] = modelV[j]; - } - ++idx; - } - } - } - - setFaceTextureUCoordinates(u); - setFaceTextureVCoordinates(v); - } - - @Override - @Inject - public List getVertices() - { - int[] verticesX = getVerticesX(); - int[] verticesY = getVerticesY(); - int[] verticesZ = getVerticesZ(); - - List vertices = new ArrayList(getVerticesCount()); - - for (int i = 0; i < getVerticesCount(); ++i) - { - Vertex v = new Vertex( - verticesX[i], - verticesY[i], - verticesZ[i] - ); - vertices.add(v); - } - - return vertices; - } - - @Override - @Inject - public List getTriangles() - { - int[] trianglesX = getTrianglesX(); - int[] trianglesY = getTrianglesY(); - int[] trianglesZ = getTrianglesZ(); - - List vertices = getVertices(); - List triangles = new ArrayList(getTrianglesCount()); - - for (int i = 0; i < getTrianglesCount(); ++i) - { - int triangleX = trianglesX[i]; - int triangleY = trianglesY[i]; - int triangleZ = trianglesZ[i]; - - Triangle triangle = new Triangle( - vertices.get(triangleX), - vertices.get(triangleY), - vertices.get(triangleZ) - ); - triangles.add(triangle); - } - - return triangles; - } - - @Copy("contourGround") - public abstract Model rs$contourGround(int[][] tileHeights, int packedX, int height, int packedY, boolean copy, int contouredGround); - - @Replace("contourGround") - public Model rl$contourGround(int[][] tileHeights, int packedX, int height, int packedY, boolean copy, int contouredGround) - { - // With contouredGround >= 0 lighted models are countoured, so we need to copy uvs - Model model = rs$contourGround(tileHeights, packedX, height, packedY, copy, contouredGround); - if (model != null && model != this) - { - RSModel rsModel = (RSModel) model; - rsModel.setFaceTextureUCoordinates(rl$faceTextureUCoordinates); - rsModel.setFaceTextureVCoordinates(rl$faceTextureVCoordinates); - } - return model; - } - - @MethodHook("buildSharedModel") - @Inject - public void rl$buildSharedModel(boolean refTransparencies, Model sharedModel, byte[] transparencyBuffer) - { - // Animated models are usually a shared Model instance that is global - RSModel rsModel = (RSModel) sharedModel; - rsModel.setFaceTextureUCoordinates(rl$faceTextureUCoordinates); - rsModel.setFaceTextureVCoordinates(rl$faceTextureVCoordinates); - } - - @Inject - public void interpolateFrames(RSFrames frames, int frameId, RSFrames nextFrames, int nextFrameId, int interval, - int intervalCount) - { - if (getVertexGroups() != null) - { - if (frameId != -1) - { - RSFrame frame = frames.getFrames()[frameId]; - RSFrameMap skin = frame.getSkin(); - RSFrame nextFrame = null; - if (nextFrames != null) - { - nextFrame = nextFrames.getFrames()[nextFrameId]; - if (nextFrame.getSkin() != skin) - { - nextFrame = null; - } - } - - client.setAnimOffsetX(0); - client.setAnimOffsetY(0); - client.setAnimOffsetZ(0); - - interpolateFrames(skin, frame, nextFrame, interval, intervalCount); - resetBounds(); - } - } - } - - @Inject - public void interpolateFrames(RSFrameMap skin, RSFrame frame, RSFrame nextFrame, int interval, int intervalCount) - { - if (nextFrame == null || interval == 0) - { - // if there is no next frame or interval then animate the model as we normally would - for (int i = 0; i < frame.getTransformCount(); i++) - { - int type = frame.getTransformTypes()[i]; - this.animate(skin.getTypes()[type], skin.getList()[type], frame.getTranslatorX()[i], - frame.getTranslatorY()[i], frame.getTranslatorZ()[i]); - } - } - else - { - int transformIndex = 0; - int nextTransformIndex = 0; - for (int i = 0; i < skin.getCount(); i++) - { - boolean frameValid = false; - if (transformIndex < frame.getTransformCount() - && frame.getTransformTypes()[transformIndex] == i) - { - frameValid = true; - } - boolean nextFrameValid = false; - if (nextTransformIndex < nextFrame.getTransformCount() - && nextFrame.getTransformTypes()[nextTransformIndex] == i) - { - nextFrameValid = true; - } - if (frameValid || nextFrameValid) - { - int staticFrame = 0; - int type = skin.getTypes()[i]; - if (type == 3 || type == 10) - { - staticFrame = 128; - } - int currentTranslateX = staticFrame; - int currentTranslateY = staticFrame; - int currentTranslateZ = staticFrame; - if (frameValid) - { - currentTranslateX = frame.getTranslatorX()[transformIndex]; - currentTranslateY = frame.getTranslatorY()[transformIndex]; - currentTranslateZ = frame.getTranslatorZ()[transformIndex]; - transformIndex++; - } - int nextTranslateX = staticFrame; - int nextTranslateY = staticFrame; - int nextTranslateZ = staticFrame; - if (nextFrameValid) - { - nextTranslateX = nextFrame.getTranslatorX()[nextTransformIndex]; - nextTranslateY = nextFrame.getTranslatorY()[nextTransformIndex]; - nextTranslateZ = nextFrame.getTranslatorZ()[nextTransformIndex]; - nextTransformIndex++; - } - int translateX; - int translateY; - int translateZ; - if (type == 2) - { - int deltaX = nextTranslateX - currentTranslateX & 0xFF; - int deltaY = nextTranslateY - currentTranslateY & 0xFF; - int deltaZ = nextTranslateZ - currentTranslateZ & 0xFF; - if (deltaX >= 128) - { - deltaX -= 256; - } - if (deltaY >= 128) - { - deltaY -= 256; - } - if (deltaZ >= 128) - { - deltaZ -= 256; - } - translateX = currentTranslateX + deltaX * interval / intervalCount & 0xFF; - translateY = currentTranslateY + deltaY * interval / intervalCount & 0xFF; - translateZ = currentTranslateZ + deltaZ * interval / intervalCount & 0xFF; - } - else if (type == 5) - { - // don't interpolate alpha transformations - // alpha - translateX = currentTranslateX; - translateY = 0; - translateZ = 0; - } - else - { - translateX = currentTranslateX + (nextTranslateX - currentTranslateX) * interval / intervalCount; - translateY = currentTranslateY + (nextTranslateY - currentTranslateY) * interval / intervalCount; - translateZ = currentTranslateZ + (nextTranslateZ - currentTranslateZ) * interval / intervalCount; - } - // use interpolated translations to animate - animate(type, skin.getList()[i], translateX, translateY, translateZ); - } - } - } - } - - @Override - @Inject - public Polygon getConvexHull(int localX, int localY, int orientation, int tileHeight) - { - List vertices = getVertices(); - - // rotate vertices - for (int i = 0; i < vertices.size(); ++i) - { - Vertex v = vertices.get(i); - vertices.set(i, v.rotate(orientation)); - } - - List points = new ArrayList(); - - for (Vertex v : vertices) - { - // Compute canvas location of vertex - Point p = Perspective.localToCanvas(client, - localX - v.getX(), - localY - v.getZ(), - tileHeight + v.getY()); - if (p != null) - { - points.add(p); - } - } - - // Run Jarvis march algorithm - points = Jarvis.convexHull(points); - if (points == null) - { - return null; - } - - // Convert to a polygon - Polygon p = new Polygon(); - for (Point point : points) - { - p.addPoint(point.getX(), point.getY()); - } - - return p; - } - - @Inject - @Override - public int getSceneId() - { - return rl$sceneId; - } - - @Inject - @Override - public void setSceneId(int sceneId) - { - this.rl$sceneId = sceneId; - } - - @Inject - @Override - public int getBufferOffset() - { - return rl$bufferOffset; - } - - @Inject - @Override - public void setBufferOffset(int bufferOffset) - { - rl$bufferOffset = bufferOffset; - } - - @Inject - @Override - public int getUvBufferOffset() - { - return rl$uvBufferOffset; - } - - @Inject - @Override - public void setUvBufferOffset(int bufferOffset) - { - rl$uvBufferOffset = bufferOffset; - } - - @Inject - @Override - public float[][] getFaceTextureUCoordinates() - { - return rl$faceTextureUCoordinates; - } - - @Inject - @Override - public void setFaceTextureUCoordinates(float[][] faceTextureUCoordinates) - { - this.rl$faceTextureUCoordinates = faceTextureUCoordinates; - } - - @Inject - @Override - public float[][] getFaceTextureVCoordinates() - { - return rl$faceTextureVCoordinates; - } - - @Inject - @Override - public void setFaceTextureVCoordinates(float[][] faceTextureVCoordinates) - { - this.rl$faceTextureVCoordinates = faceTextureVCoordinates; - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSMouseInputMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSMouseInputMixin.java deleted file mode 100644 index dcaa7261b1..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSMouseInputMixin.java +++ /dev/null @@ -1,209 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.awt.event.MouseEvent; -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSMouseInput; - -@Mixin(RSMouseInput.class) -public abstract class RSMouseInputMixin implements RSMouseInput -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - private int isInEvent; - - @Copy("mousePressed") - abstract void rs$mousePressed(MouseEvent mouseEvent); - - @Copy("mouseReleased") - abstract void rs$mouseReleased(MouseEvent mouseEvent); - - @Copy("mouseClicked") - abstract void rs$mouseClicked(MouseEvent mouseEvent); - - @Copy("mouseEntered") - abstract void rs$mouseEntered(MouseEvent mouseEvent); - - @Copy("mouseExited") - abstract void rs$mouseExited(MouseEvent mouseEvent); - - @Copy("mouseDragged") - abstract void rs$mouseDragged(MouseEvent mouseEvent); - - @Copy("mouseMoved") - abstract void rs$mouseMoved(MouseEvent mouseEvent); - - @Override - @Replace("mousePressed") - public synchronized void mousePressed(MouseEvent mouseEvent) - { - if (isInEvent == 0) - { - mouseEvent = client.getCallbacks().mousePressed(mouseEvent); - } - if (!mouseEvent.isConsumed()) - { - isInEvent++; - try - { - rs$mousePressed(mouseEvent); - } - finally - { - isInEvent--; - } - } - } - - @Override - @Replace("mouseReleased") - public synchronized void mouseReleased(MouseEvent mouseEvent) - { - if (isInEvent == 0) - { - mouseEvent = client.getCallbacks().mouseReleased(mouseEvent); - } - if (!mouseEvent.isConsumed()) - { - isInEvent++; - try - { - rs$mouseReleased(mouseEvent); - } - finally - { - isInEvent--; - } - } - } - - @Override - @Replace("mouseClicked") - public void mouseClicked(MouseEvent event) - { - event = client.getCallbacks().mouseClicked(event); - if (!event.isConsumed()) - { - rs$mouseClicked(event); - } - } - - @Override - @Replace("mouseEntered") - public synchronized void mouseEntered(MouseEvent mouseEvent) - { - if (isInEvent == 0) - { - mouseEvent = client.getCallbacks().mouseEntered(mouseEvent); - } - if (!mouseEvent.isConsumed()) - { - isInEvent++; - try - { - rs$mouseEntered(mouseEvent); - } - finally - { - isInEvent--; - } - } - } - - - @Override - @Replace("mouseExited") - public synchronized void mouseExited(MouseEvent mouseEvent) - { - if (isInEvent == 0) - { - mouseEvent = client.getCallbacks().mouseExited(mouseEvent); - } - if (!mouseEvent.isConsumed()) - { - isInEvent++; - try - { - rs$mouseExited(mouseEvent); - } - finally - { - isInEvent--; - } - } - } - - @Override - @Replace("mouseDragged") - public synchronized void mouseDragged(MouseEvent mouseEvent) - { - if (isInEvent == 0) - { - mouseEvent = client.getCallbacks().mouseDragged(mouseEvent); - } - if (!mouseEvent.isConsumed()) - { - isInEvent++; - try - { - rs$mouseDragged(mouseEvent); - } - finally - { - isInEvent--; - } - } - } - - @Override - @Replace("mouseMoved") - public synchronized void mouseMoved(MouseEvent mouseEvent) - { - if (isInEvent == 0) - { - mouseEvent = client.getCallbacks().mouseMoved(mouseEvent); - } - if (!mouseEvent.isConsumed()) - { - isInEvent++; - try - { - rs$mouseMoved(mouseEvent); - } - finally - { - isInEvent--; - } - } - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSMouseWheelHandlerMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSMouseWheelHandlerMixin.java deleted file mode 100644 index 1c56a34458..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSMouseWheelHandlerMixin.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.awt.event.MouseWheelEvent; -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSMouseWheelHandler; - -@Mixin(RSMouseWheelHandler.class) -public abstract class RSMouseWheelHandlerMixin implements RSMouseWheelHandler -{ - @Shadow("clientInstance") - private static RSClient client; - - @Copy("mouseWheelMoved") - abstract void rs$mouseWheelMoved(MouseWheelEvent event); - - @Override - @Replace("mouseWheelMoved") - public void mouseWheelMoved(MouseWheelEvent event) - { - event = client.getCallbacks().mouseWheelMoved(event); - if (!event.isConsumed()) - { - rs$mouseWheelMoved(event); - } - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSNPCMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSNPCMixin.java deleted file mode 100644 index be4cad31fc..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSNPCMixin.java +++ /dev/null @@ -1,192 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.awt.Polygon; -import net.runelite.api.AnimationID; -import net.runelite.api.NPCComposition; -import net.runelite.api.Perspective; -import net.runelite.api.coords.LocalPoint; -import net.runelite.api.events.NpcDespawned; -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.FieldHook; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSModel; -import net.runelite.rs.api.RSNPC; -import net.runelite.rs.api.RSNPCComposition; - -@Mixin(RSNPC.class) -public abstract class RSNPCMixin implements RSNPC -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - private int npcIndex; - - @Inject - private boolean dead; - - @Inject - @Override - public int getId() - { - RSNPCComposition composition = getComposition(); - if (composition != null && composition.getConfigs() != null) - { - composition = composition.transform(); - } - return composition == null ? -1 : composition.getId(); - } - - @Inject - @Override - public String getName() - { - RSNPCComposition composition = getComposition(); - if (composition != null && composition.getConfigs() != null) - { - composition = composition.transform(); - } - return composition == null ? null : composition.getName().replace('\u00A0', ' '); - } - - @Inject - @Override - public int getCombatLevel() - { - RSNPCComposition composition = getComposition(); - if (composition != null && composition.getConfigs() != null) - { - composition = composition.transform(); - } - return composition == null ? -1 : composition.getCombatLevel(); - } - - @Inject - @Override - public int getIndex() - { - return npcIndex; - } - - @Inject - @Override - public void setIndex(int id) - { - npcIndex = id; - } - - @FieldHook(value = "composition", before = true) - @Inject - public void onCompositionChanged(RSNPCComposition composition) - { - if (composition == null) - { - client.getCallbacks().post(new NpcDespawned(this)); - } - } - - @Copy("getModel") - public abstract RSModel rs$getModel(); - - @Replace("getModel") - public RSModel rl$getModel() - { - if (!client.isInterpolateNpcAnimations() - || getAnimation() == AnimationID.HELLHOUND_DEFENCE) - { - return rs$getModel(); - } - int actionFrame = getActionFrame(); - int poseFrame = getPoseFrame(); - int spotAnimFrame = getSpotAnimFrame(); - try - { - // combine the frames with the frame cycle so we can access this information in the sequence methods - // without having to change method calls - setActionFrame(Integer.MIN_VALUE | getActionFrameCycle() << 16 | actionFrame); - setPoseFrame(Integer.MIN_VALUE | getPoseFrameCycle() << 16 | poseFrame); - setSpotAnimFrame(Integer.MIN_VALUE | getSpotAnimFrameCycle() << 16 | spotAnimFrame); - return rs$getModel(); - } - finally - { - // reset frames - setActionFrame(actionFrame); - setPoseFrame(poseFrame); - setSpotAnimFrame(spotAnimFrame); - } - } - - @Inject - @Override - public NPCComposition getTransformedComposition() - { - RSNPCComposition composition = getComposition(); - if (composition != null && composition.getConfigs() != null) - { - composition = composition.transform(); - } - return composition; - } - - @Inject - @Override - public boolean isDead() - { - return dead; - } - - @Inject - @Override - public void setDead(boolean dead) - { - this.dead = dead; - } - - @Inject - @Override - public Polygon getConvexHull() - { - RSModel model = getModel(); - if (model == null) - { - return null; - } - - int size = getComposition().getSize(); - LocalPoint tileHeightPoint = new LocalPoint( - size * Perspective.LOCAL_HALF_TILE_SIZE - Perspective.LOCAL_HALF_TILE_SIZE + getX(), - size * Perspective.LOCAL_HALF_TILE_SIZE - Perspective.LOCAL_HALF_TILE_SIZE + getY()); - - int tileHeight = Perspective.getTileHeight(client, tileHeightPoint, client.getPlane()); - return model.getConvexHull(getX(), getY(), getOrientation(), tileHeight); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSNameableContainerMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSNameableContainerMixin.java deleted file mode 100644 index 8a3a1492e0..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSNameableContainerMixin.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2018, trimbe - * Copyright (c) 2019, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.MethodHook; -import net.runelite.api.mixins.Mixin; -import net.runelite.rs.api.RSName; -import net.runelite.rs.api.RSNameable; -import net.runelite.rs.api.RSNameableContainer; - -@Mixin(RSNameableContainer.class) -public abstract class RSNameableContainerMixin implements RSNameableContainer -{ - /** - * Default implementation of rl$add - * @param name - * @param prevName - */ - @Inject - @Override - public void rl$add(RSName name, RSName prevName) - { - } - - /** - * Default implementation of rl$del - * @param nameable - */ - @Inject - @Override - public void rl$remove(RSNameable nameable) - { - } - - @Inject - @MethodHook(value = "add", end = true) - public void add(RSName name, RSName prevName) - { - rl$add(name, prevName); - } - - @Inject - @MethodHook("remove") - public void remove(RSNameable nameable) - { - rl$remove(nameable); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSNameableMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSNameableMixin.java deleted file mode 100644 index 2d64135330..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSNameableMixin.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.events.NameableNameChanged; -import net.runelite.api.mixins.FieldHook; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSNameable; - -@Mixin(RSNameable.class) -public abstract class RSNameableMixin implements RSNameable -{ - @Shadow("clientInstance") - private static RSClient client; - - @FieldHook("prevName") - @Inject - public void onPrevNameChanged(int idx) - { - NameableNameChanged nameableNameChanged = new NameableNameChanged(this); - client.getCallbacks().post(nameableNameChanged); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSNodeMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSNodeMixin.java deleted file mode 100644 index 4a8f7162cf..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSNodeMixin.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.MethodHook; -import net.runelite.api.mixins.Mixin; -import net.runelite.rs.api.RSNode; - -@Mixin(RSNode.class) -public abstract class RSNodeMixin implements RSNode -{ - @Inject - public void onUnlink() - { - } - - @Inject - @MethodHook("unlink") - public void rl$unlink() - { - onUnlink(); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSNpcCompositionMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSNpcCompositionMixin.java deleted file mode 100644 index b12477525c..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSNpcCompositionMixin.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.HeadIcon; -import static net.runelite.api.HeadIcon.MAGIC; -import static net.runelite.api.HeadIcon.MELEE; -import static net.runelite.api.HeadIcon.RANGED; -import static net.runelite.api.HeadIcon.RANGE_MAGE; -import net.runelite.api.events.NpcActionChanged; -import net.runelite.api.mixins.FieldHook; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSNPCComposition; - -@Mixin(RSNPCComposition.class) -public abstract class RSNpcCompositionMixin implements RSNPCComposition -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - @Override - public HeadIcon getOverheadIcon() - { - switch (getRsOverheadIcon()) - { - case 0: - return MELEE; - case 1: - return RANGED; - case 2: - return MAGIC; - case 6: - return RANGE_MAGE; - default: - return null; - } - } - - @FieldHook("actions") - @Inject - public void actionsHook(int idx) - { - NpcActionChanged npcActionChanged = new NpcActionChanged(); - npcActionChanged.setNpcComposition(this); - npcActionChanged.setIdx(idx); - client.getCallbacks().post(npcActionChanged); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerCompositionMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerCompositionMixin.java deleted file mode 100644 index d52b267daf..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerCompositionMixin.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.kit.KitType; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.rs.api.RSPlayerComposition; - -@Mixin(RSPlayerComposition.class) -public abstract class RSPlayerCompositionMixin implements RSPlayerComposition -{ - @Inject - @Override - public int getEquipmentId(KitType type) - { - int id = getEquipmentIds()[type.getIndex()]; - if (id < 512) - { - return -1; // not an item - } - return id - 512; - } - - @Inject - @Override - public int getKitId(KitType type) - { - int id = getEquipmentIds()[type.getIndex()]; - if (id < 256 || id >= 512) - { - return -1; // not a kit - } - return id - 256; - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java deleted file mode 100644 index e4f8d9b8e7..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java +++ /dev/null @@ -1,264 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.awt.Polygon; -import java.util.ArrayList; -import java.util.List; -import net.runelite.api.HeadIcon; -import static net.runelite.api.HeadIcon.MAGIC; -import static net.runelite.api.HeadIcon.MELEE; -import static net.runelite.api.HeadIcon.RANGED; -import static net.runelite.api.HeadIcon.REDEMPTION; -import static net.runelite.api.HeadIcon.RETRIBUTION; -import static net.runelite.api.HeadIcon.SMITE; -import net.runelite.api.Model; -import net.runelite.api.Perspective; -import net.runelite.api.Point; -import net.runelite.api.SkullIcon; -import static net.runelite.api.SkullIcon.DEAD_MAN_FIVE; -import static net.runelite.api.SkullIcon.DEAD_MAN_FOUR; -import static net.runelite.api.SkullIcon.DEAD_MAN_ONE; -import static net.runelite.api.SkullIcon.DEAD_MAN_THREE; -import static net.runelite.api.SkullIcon.DEAD_MAN_TWO; -import static net.runelite.api.SkullIcon.SKULL; -import static net.runelite.api.SkullIcon.SKULL_FIGHT_PIT; -import net.runelite.api.coords.LocalPoint; -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.api.model.Triangle; -import net.runelite.api.model.Vertex; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSModel; -import net.runelite.rs.api.RSName; -import net.runelite.rs.api.RSPlayer; - -@Mixin(RSPlayer.class) -public abstract class RSPlayerMixin implements RSPlayer -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - @Override - public String getName() - { - final RSName rsName = getRsName(); - - if (rsName == null) - { - return null; - } - - String name = rsName.getName(); - - if (name == null) - { - return null; - } - - return name.replace('\u00A0', ' '); - } - - @Inject - @Override - public HeadIcon getOverheadIcon() - { - switch (getRsOverheadIcon()) - { - case 0: - return MELEE; - case 1: - return RANGED; - case 2: - return MAGIC; - case 3: - return RETRIBUTION; - case 4: - return SMITE; - case 5: - return REDEMPTION; - default: - return null; - } - } - - @Inject - @Override - public SkullIcon getSkullIcon() - { - if (this != client.getLocalPlayer()) - { - // prevent seeing skulls of other players. - return null; - } - - switch (getRsSkullIcon()) - { - case 0: - return SKULL; - case 1: - return SKULL_FIGHT_PIT; - case 8: - return DEAD_MAN_FIVE; - case 9: - return DEAD_MAN_FOUR; - case 10: - return DEAD_MAN_THREE; - case 11: - return DEAD_MAN_TWO; - case 12: - return DEAD_MAN_ONE; - default: - return null; - } - } - - @Inject - @Override - public Polygon[] getPolygons() - { - Model model = getModel(); - - if (model == null) - { - return null; - } - - int localX = getX(); - int localY = getY(); - - int orientation = getOrientation(); - - final int tileHeight = Perspective.getTileHeight(client, new LocalPoint(localX, localY), client.getPlane()); - - List triangles = model.getTriangles(); - - triangles = rotate(triangles, orientation); - - List polys = new ArrayList(); - for (Triangle triangle : triangles) - { - Vertex vx = triangle.getA(); - Vertex vy = triangle.getB(); - Vertex vz = triangle.getC(); - - Point x = Perspective.localToCanvas(client, - localX - vx.getX(), - localY - vx.getZ(), - tileHeight + vx.getY()); - - Point y = Perspective.localToCanvas(client, - localX - vy.getX(), - localY - vy.getZ(), - tileHeight + vy.getY()); - - Point z = Perspective.localToCanvas(client, - localX - vz.getX(), - localY - vz.getZ(), - tileHeight + vz.getY()); - - int[] xx = - { - x.getX(), y.getX(), z.getX() - }; - int[] yy = - { - x.getY(), y.getY(), z.getY() - }; - polys.add(new Polygon(xx, yy, 3)); - } - - return polys.toArray(new Polygon[polys.size()]); - } - - @Inject - @Override - public Polygon getConvexHull() - { - RSModel model = getModel(); - if (model == null) - { - return null; - } - - int tileHeight = Perspective.getTileHeight(client, new LocalPoint(getX(), getY()), client.getPlane()); - return model.getConvexHull(getX(), getY(), getOrientation(), tileHeight); - } - - @Inject - private List rotate(List triangles, int orientation) - { - List rotatedTriangles = new ArrayList(); - for (Triangle triangle : triangles) - { - Vertex a = triangle.getA(); - Vertex b = triangle.getB(); - Vertex c = triangle.getC(); - - Triangle rotatedTriangle = new Triangle( - a.rotate(orientation), - b.rotate(orientation), - c.rotate(orientation) - ); - rotatedTriangles.add(rotatedTriangle); - } - return rotatedTriangles; - } - - @Copy("getModel") - public abstract RSModel rs$getModel(); - - @Replace("getModel") - public RSModel rl$getModel() - { - if (!client.isInterpolatePlayerAnimations()) - { - return rs$getModel(); - } - int actionFrame = getActionFrame(); - int poseFrame = getPoseFrame(); - int spotAnimFrame = getSpotAnimFrame(); - try - { - // combine the frames with the frame cycle so we can access this information in the sequence methods - // without having to change method calls - setActionFrame(Integer.MIN_VALUE | getActionFrameCycle() << 16 | actionFrame); - setPoseFrame(Integer.MIN_VALUE | getPoseFrameCycle() << 16 | poseFrame); - setSpotAnimFrame(Integer.MIN_VALUE | getSpotAnimFrameCycle() << 16 | spotAnimFrame); - return rs$getModel(); - } - finally - { - // reset frames - setActionFrame(actionFrame); - setPoseFrame(poseFrame); - setSpotAnimFrame(spotAnimFrame); - } - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSProjectileMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSProjectileMixin.java deleted file mode 100644 index e5b8c238db..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSProjectileMixin.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.coords.LocalPoint; -import net.runelite.api.events.ProjectileMoved; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.MethodHook; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSProjectile; - -@Mixin(RSProjectile.class) -public abstract class RSProjectileMixin implements RSProjectile -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - @Override - public int getRemainingCycles() - { - int currentGameCycle = client.getGameCycle(); - - return getEndCycle() - currentGameCycle; - } - - /** - * Called when a projectile is set to move towards a point. For - * projectiles that target the ground, like AoE projectiles from - * Lizardman Shamans, this is only called once - * - * @param targetX X position of where the projectile is being moved to - * @param targetY Y position of where the projectile is being moved to - * @param targetZ Z position of where the projectile is being moved to - * @param cycle - */ - @Inject - @MethodHook("moveProjectile") - public void projectileMoved(int targetX, int targetY, int targetZ, int cycle) - { - final LocalPoint position = new LocalPoint(targetX, targetY); - final ProjectileMoved projectileMoved = new ProjectileMoved(); - projectileMoved.setProjectile(this); - projectileMoved.setPosition(position); - projectileMoved.setZ(targetZ); - client.getCallbacks().post(projectileMoved); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSSceneMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSSceneMixin.java deleted file mode 100644 index 7bbb154848..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSSceneMixin.java +++ /dev/null @@ -1,751 +0,0 @@ -/* - * Copyright (c) 2018 Abex - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.Perspective; -import net.runelite.api.Renderable; -import net.runelite.api.SceneTileModel; -import net.runelite.api.SceneTilePaint; -import net.runelite.api.Tile; -import net.runelite.api.coords.LocalPoint; -import net.runelite.api.hooks.DrawCallbacks; -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSDecorativeObject; -import net.runelite.rs.api.RSGroundObject; -import net.runelite.rs.api.RSItemLayer; -import net.runelite.rs.api.RSScene; -import net.runelite.rs.api.RSSceneTileModel; -import net.runelite.rs.api.RSTile; -import net.runelite.rs.api.RSWallObject; - -@Mixin(RSScene.class) -public abstract class RSSceneMixin implements RSScene -{ - private static final int DEFAULT_DISTANCE = 25; - private static final int MAX_DISTANCE = 90; - - private static final int PITCH_LOWER_LIMIT = 128; - private static final int PITCH_UPPER_LIMIT = 383; - - private static final int MAX_TARGET_DISTANCE = 45; - - @Shadow("clientInstance") - static RSClient client; - - @Shadow("pitchRelaxEnabled") - private static boolean pitchRelaxEnabled; - - @Inject - private static int[] tmpX = new int[6]; - - @Shadow("skyboxColor") - static int skyboxColor; - - @Inject - private static int[] tmpY = new int[6]; - - @Inject - private static int rl$drawDistance; - - @Replace("drawScene") - void rl$drawScene(int cameraX, int cameraY, int cameraZ, int cameraPitch, int cameraYaw, int plane) - { - final DrawCallbacks drawCallbacks = client.getDrawCallbacks(); - if (drawCallbacks != null) - { - drawCallbacks.drawScene(cameraX, cameraY, cameraZ, cameraPitch, cameraYaw, plane); - } - - final boolean isGpu = client.isGpu(); - final boolean checkClick = client.isCheckClick(); - if (!client.isMenuOpen()) - { - // Force check click to update the selected tile - client.setCheckClick(true); - final int mouseX = client.getMouseX(); - final int mouseY = client.getMouseY(); - client.setMouseCanvasHoverPositionX(mouseX - client.getViewportXOffset()); - client.setMouseCanvasHoverPositionY(mouseY - client.getViewportYOffset()); - } - - if (!isGpu) - { - if (skyboxColor != 0) - { - client.RasterizerFillRectangle( - client.getViewportXOffset(), - client.getViewportYOffset(), - client.getViewportWidth(), - client.getViewportHeight(), - skyboxColor - ); - } - } - - final int maxX = getMaxX(); - final int maxY = getMaxY(); - final int maxZ = getMaxZ(); - - final int minLevel = getMinLevel(); - - final RSTile[][][] tiles = getTiles(); - final int distance = isGpu ? rl$drawDistance : DEFAULT_DISTANCE; - - if (cameraX < 0) - { - cameraX = 0; - } - else if (cameraX >= maxX * Perspective.LOCAL_TILE_SIZE) - { - cameraX = maxX * Perspective.LOCAL_TILE_SIZE - 1; - } - - if (cameraZ < 0) - { - cameraZ = 0; - } - else if (cameraZ >= maxZ * Perspective.LOCAL_TILE_SIZE) - { - cameraZ = maxZ * Perspective.LOCAL_TILE_SIZE - 1; - } - - // we store the uncapped pitch for setting camera angle for the pitch relaxer - // we still have to cap the pitch in order to access the visibility map, though - int realPitch = cameraPitch; - if (cameraPitch < PITCH_LOWER_LIMIT) - { - cameraPitch = PITCH_LOWER_LIMIT; - } - else if (cameraPitch > PITCH_UPPER_LIMIT) - { - cameraPitch = PITCH_UPPER_LIMIT; - } - if (!pitchRelaxEnabled) - { - realPitch = cameraPitch; - } - - client.setCycle(client.getCycle() + 1); - - client.setPitchSin(Perspective.SINE[realPitch]); - client.setPitchCos(Perspective.COSINE[realPitch]); - client.setYawSin(Perspective.SINE[cameraYaw]); - client.setYawCos(Perspective.COSINE[cameraYaw]); - - final int[][][] tileHeights = client.getTileHeights(); - boolean[][] renderArea = client.getVisibilityMaps()[(cameraPitch - 128) / 32][cameraYaw / 64]; - client.setRenderArea(renderArea); - - client.setCameraX2(cameraX); - client.setCameraY2(cameraY); - client.setCameraZ2(cameraZ); - - int screenCenterX = cameraX / Perspective.LOCAL_TILE_SIZE; - int screenCenterZ = cameraZ / Perspective.LOCAL_TILE_SIZE; - - client.setScreenCenterX(screenCenterX); - client.setScreenCenterZ(screenCenterZ); - client.setScenePlane(plane); - - int minTileX = screenCenterX - distance; - if (minTileX < 0) - { - minTileX = 0; - } - - int minTileZ = screenCenterZ - distance; - if (minTileZ < 0) - { - minTileZ = 0; - } - - int maxTileX = screenCenterX + distance; - if (maxTileX > maxX) - { - maxTileX = maxX; - } - - int maxTileZ = screenCenterZ + distance; - if (maxTileZ > maxZ) - { - maxTileZ = maxZ; - } - - client.setMinTileX(minTileX); - client.setMinTileZ(minTileZ); - client.setMaxTileX(maxTileX); - client.setMaxTileZ(maxTileZ); - - updateOccluders(); - - client.setTileUpdateCount(0); - - for (int z = minLevel; z < maxY; ++z) - { - RSTile[][] planeTiles = tiles[z]; - - for (int x = minTileX; x < maxTileX; ++x) - { - for (int y = minTileZ; y < maxTileZ; ++y) - { - RSTile tile = planeTiles[x][y]; - if (tile != null) - { - if (tile.getPhysicalLevel() <= plane - && (isGpu - || renderArea[x - screenCenterX + DEFAULT_DISTANCE][y - screenCenterZ + DEFAULT_DISTANCE] - || tileHeights[z][x][y] - cameraY >= 2000)) - { - tile.setDraw(true); - tile.setVisible(true); - tile.setDrawEntities(true); - client.setTileUpdateCount(client.getTileUpdateCount() + 1); - } - else - { - tile.setDraw(false); - tile.setVisible(false); - tile.setWallCullDirection(0); - } - } - } - } - } - - for (int z = minLevel; z < maxY; ++z) - { - RSTile[][] planeTiles = tiles[z]; - - for (int x = -distance; x <= 0; ++x) - { - int var10 = x + screenCenterX; - int var16 = screenCenterX - x; - if (var10 >= minTileX || var16 < maxTileX) - { - for (int y = -distance; y <= 0; ++y) - { - int var13 = y + screenCenterZ; - int var14 = screenCenterZ - y; - if (var10 >= minTileX) - { - if (var13 >= minTileZ) - { - RSTile tile = planeTiles[var10][var13]; - if (tile != null && tile.isDraw()) - { - draw(tile, true); - } - } - - if (var14 < maxTileZ) - { - RSTile tile = planeTiles[var10][var14]; - if (tile != null && tile.isDraw()) - { - draw(tile, true); - } - } - } - - if (var16 < maxTileX) - { - if (var13 >= minTileZ) - { - RSTile tile = planeTiles[var16][var13]; - if (tile != null && tile.isDraw()) - { - draw(tile, true); - } - } - - if (var14 < maxTileZ) - { - RSTile tile = planeTiles[var16][var14]; - if (tile != null && tile.isDraw()) - { - draw(tile, true); - } - } - } - - if (client.getTileUpdateCount() == 0) - { - if (!isGpu && client.getOculusOrbState() != 0) - { - client.setEntitiesAtMouseCount(0); - } - client.setCheckClick(false); - if (!checkClick) - { - client.setViewportWalking(false); - } - client.getCallbacks().drawScene(); - return; - } - } - } - } - } - - for (int z = minLevel; z < maxY; ++z) - { - RSTile[][] planeTiles = tiles[z]; - - for (int x = -distance; x <= 0; ++x) - { - int var10 = x + screenCenterX; - int var16 = screenCenterX - x; - if (var10 >= minTileX || var16 < maxTileX) - { - for (int y = -distance; y <= 0; ++y) - { - int var13 = y + screenCenterZ; - int var14 = screenCenterZ - y; - if (var10 >= minTileX) - { - if (var13 >= minTileZ) - { - RSTile tile = planeTiles[var10][var13]; - if (tile != null && tile.isDraw()) - { - draw(tile, false); - } - } - - if (var14 < maxTileZ) - { - RSTile tile = planeTiles[var10][var14]; - if (tile != null && tile.isDraw()) - { - draw(tile, false); - } - } - } - - if (var16 < maxTileX) - { - if (var13 >= minTileZ) - { - RSTile tile = planeTiles[var16][var13]; - if (tile != null && tile.isDraw()) - { - draw(tile, false); - } - } - - if (var14 < maxTileZ) - { - RSTile tile = planeTiles[var16][var14]; - if (tile != null && tile.isDraw()) - { - draw(tile, false); - } - } - } - - if (client.getTileUpdateCount() == 0) - { - if (!isGpu && client.getOculusOrbState() != 0) - { - client.setEntitiesAtMouseCount(0); - } - client.setCheckClick(false); - if (!checkClick) - { - client.setViewportWalking(false); - } - client.getCallbacks().drawScene(); - return; - } - } - } - } - } - - if (!isGpu && client.getOculusOrbState() != 0) - { - client.setEntitiesAtMouseCount(0); - } - client.setCheckClick(false); - if (!checkClick) - { - // If checkClick was false, then the selected tile wouldn't have existed next tick, - // so clear viewport walking in order to prevent it triggering a walk - client.setViewportWalking(false); - } - client.getCallbacks().drawScene(); - } - - @Copy("addBoundaryDecoration") - abstract public void rs$addBoundaryDecoration(int plane, int x, int y, int floor, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, long hash, int var12); - - @Replace("addBoundaryDecoration") - public void rl$addBoundaryDecoration(int plane, int x, int y, int floor, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, long hash, int var12) - { - rs$addBoundaryDecoration(plane, x, y, floor, var5, var6, var7, var8, var9, var10, hash, var12); - Tile tile = getTiles()[plane][x][y]; - if (tile != null) - { - RSDecorativeObject object = (RSDecorativeObject) tile.getDecorativeObject(); - if (object != null) - { - object.setPlane(plane); - } - } - } - - @Copy("addItemPile") - abstract public void rs$addItemPile(int plane, int x, int y, int hash, Renderable var5, long var6, Renderable var7, Renderable var8); - - @Replace("addItemPile") - public void rl$addItemPile(int plane, int x, int y, int hash, Renderable var5, long var6, Renderable var7, Renderable var8) - { - rs$addItemPile(plane, x, y, hash, var5, var6, var7, var8); - Tile tile = getTiles()[plane][x][y]; - if (tile != null) - { - RSItemLayer itemLayer = (RSItemLayer) tile.getItemLayer(); - if (itemLayer != null) - { - itemLayer.setPlane(plane); - } - } - } - - @Copy("groundObjectSpawned") - abstract public void rs$groundObjectSpawned(int plane, int x, int y, int floor, Renderable var5, long hash, int var7); - - @Replace("groundObjectSpawned") - public void rl$groundObjectSpawned(int plane, int x, int y, int floor, Renderable var5, long hash, int var7) - { - rs$groundObjectSpawned(plane, x, y, floor, var5, hash, var7); - Tile tile = getTiles()[plane][x][y]; - if (tile != null) - { - RSGroundObject groundObject = (RSGroundObject) tile.getGroundObject(); - if (groundObject != null) - { - groundObject.setPlane(plane); - } - } - } - - @Copy("addBoundary") - abstract public void rs$addBoundary(int plane, int x, int y, int floor, Renderable var5, Renderable var6, int var7, int var8, long hash, int var10); - - @Replace("addBoundary") - public void rl$addBoundary(int plane, int x, int y, int floor, Renderable var5, Renderable var6, int var7, int var8, long hash, int var10) - { - rs$addBoundary(plane, x, y, floor, var5, var6, var7, var8, hash, var10); - Tile tile = getTiles()[plane][x][y]; - if (tile != null) - { - RSWallObject wallObject = (RSWallObject) tile.getWallObject(); - if (wallObject != null) - { - wallObject.setPlane(plane); - } - } - } - - @Copy("drawTileUnderlay") - abstract public void rs$drawTileUnderlay(SceneTilePaint tile, int z, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y); - - @Replace("drawTileUnderlay") - public void rl$drawTileUnderlay(SceneTilePaint tile, int z, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y) - { - if (!client.isGpu()) - { - try - { - rs$drawTileUnderlay(tile, z, pitchSin, pitchCos, yawSin, yawCos, x, y); - } - catch (Exception ex) - { - client.getLogger().warn("error during tile underlay rendering", ex); - } - return; - } - - final DrawCallbacks drawCallbacks = client.getDrawCallbacks(); - - if (drawCallbacks == null) - { - return; - } - - try - { - final int[][][] tileHeights = getTileHeights(); - - final int cameraX2 = client.getCameraX2(); - final int cameraY2 = client.getCameraY2(); - final int cameraZ2 = client.getCameraZ2(); - - final int zoom = client.get3dZoom(); - final int centerX = client.getCenterX(); - final int centerY = client.getCenterY(); - - final int mouseX2 = client.getMouseX2(); - final int mouseY2 = client.getMouseY2(); - - final boolean checkClick = client.isCheckClick(); - - int var9; - int var10 = var9 = (x << 7) - cameraX2; - int var11; - int var12 = var11 = (y << 7) - cameraZ2; - int var13; - int var14 = var13 = var10 + 128; - int var15; - int var16 = var15 = var12 + 128; - int var17 = tileHeights[z][x][y] - cameraY2; - int var18 = tileHeights[z][x + 1][y] - cameraY2; - int var19 = tileHeights[z][x + 1][y + 1] - cameraY2; - int var20 = tileHeights[z][x][y + 1] - cameraY2; - int var21 = var10 * yawCos + yawSin * var12 >> 16; - var12 = var12 * yawCos - yawSin * var10 >> 16; - var10 = var21; - var21 = var17 * pitchCos - pitchSin * var12 >> 16; - var12 = pitchSin * var17 + var12 * pitchCos >> 16; - var17 = var21; - if (var12 >= 50) - { - var21 = var14 * yawCos + yawSin * var11 >> 16; - var11 = var11 * yawCos - yawSin * var14 >> 16; - var14 = var21; - var21 = var18 * pitchCos - pitchSin * var11 >> 16; - var11 = pitchSin * var18 + var11 * pitchCos >> 16; - var18 = var21; - if (var11 >= 50) - { - var21 = var13 * yawCos + yawSin * var16 >> 16; - var16 = var16 * yawCos - yawSin * var13 >> 16; - var13 = var21; - var21 = var19 * pitchCos - pitchSin * var16 >> 16; - var16 = pitchSin * var19 + var16 * pitchCos >> 16; - var19 = var21; - if (var16 >= 50) - { - var21 = var9 * yawCos + yawSin * var15 >> 16; - var15 = var15 * yawCos - yawSin * var9 >> 16; - var9 = var21; - var21 = var20 * pitchCos - pitchSin * var15 >> 16; - var15 = pitchSin * var20 + var15 * pitchCos >> 16; - if (var15 >= 50) - { - int dy = var10 * zoom / var12 + centerX; - int dx = var17 * zoom / var12 + centerY; - int cy = var14 * zoom / var11 + centerX; - int cx = var18 * zoom / var11 + centerY; - int ay = var13 * zoom / var16 + centerX; - int ax = var19 * zoom / var16 + centerY; - int by = var9 * zoom / var15 + centerX; - int bx = var21 * zoom / var15 + centerY; - - drawCallbacks.drawScenePaint(0, pitchSin, pitchCos, yawSin, yawCos, - -cameraX2, -cameraY2, -cameraZ2, - tile, z, x, y, - zoom, centerX, centerY); - - if ((ay - by) * (cx - bx) - (ax - bx) * (cy - by) > 0) - { - if (checkClick && client.containsBounds(mouseX2, mouseY2, ax, bx, cx, ay, by, cy)) - { - setTargetTile(x, y); - } - } - - if ((dy - cy) * (bx - cx) - (dx - cx) * (by - cy) > 0) - { - if (checkClick && client.containsBounds(mouseX2, mouseY2, dx, cx, bx, dy, cy, by)) - { - setTargetTile(x, y); - } - } - - } - } - } - } - } - catch (Exception ex) - { - client.getLogger().warn("error during underlay rendering", ex); - } - } - - @Copy("drawTileOverlay") - abstract public void rs$drawTileOverlay(SceneTileModel tile, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y); - - @Replace("drawTileOverlay") - public void rl$drawTileOverlay(SceneTileModel tile, int pitchSin, int pitchCos, int yawSin, int yawCos, int tileX, int tileY) - { - if (!client.isGpu()) - { - rs$drawTileOverlay(tile, pitchSin, pitchCos, yawSin, yawCos, tileX, tileY); - return; - } - - final DrawCallbacks drawCallbacks = client.getDrawCallbacks(); - - if (drawCallbacks == null) - { - return; - } - - try - { - final int cameraX2 = client.getCameraX2(); - final int cameraY2 = client.getCameraY2(); - final int cameraZ2 = client.getCameraZ2(); - final int zoom = client.get3dZoom(); - final int centerX = client.getCenterX(); - final int centerY = client.getCenterY(); - - drawCallbacks.drawSceneModel(0, pitchSin, pitchCos, yawSin, yawCos, -cameraX2, -cameraY2, -cameraZ2, - tile, client.getPlane(), tileX, tileY, - zoom, centerX, centerY); - - final boolean checkClick = client.isCheckClick(); - if (!checkClick) - { - return; - } - - RSSceneTileModel sceneTileModel = (RSSceneTileModel) tile; - - final int[] faceX = sceneTileModel.getFaceX(); - final int[] faceY = sceneTileModel.getFaceY(); - final int[] faceZ = sceneTileModel.getFaceZ(); - - final int[] vertexX = sceneTileModel.getVertexX(); - final int[] vertexY = sceneTileModel.getVertexY(); - final int[] vertexZ = sceneTileModel.getVertexZ(); - - final int vertexCount = vertexX.length; - final int faceCount = faceX.length; - - final int mouseX2 = client.getMouseX2(); - final int mouseY2 = client.getMouseY2(); - - for (int i = 0; i < vertexCount; ++i) - { - int vx = vertexX[i] - cameraX2; - int vy = vertexY[i] - cameraY2; - int vz = vertexZ[i] - cameraZ2; - - int rotA = vz * yawSin + vx * yawCos >> 16; - int rotB = vz * yawCos - vx * yawSin >> 16; - - int var13 = vy * pitchCos - rotB * pitchSin >> 16; - int var12 = vy * pitchSin + rotB * pitchCos >> 16; - if (var12 < 50) - { - return; - } - - int ax = rotA * zoom / var12 + centerX; - int ay = var13 * zoom / var12 + centerY; - - tmpX[i] = ax; - tmpY[i] = ay; - } - - for (int i = 0; i < faceCount; ++i) - { - int va = faceX[i]; - int vb = faceY[i]; - int vc = faceZ[i]; - - int x1 = tmpX[va]; - int x2 = tmpX[vb]; - int x3 = tmpX[vc]; - - int y1 = tmpY[va]; - int y2 = tmpY[vb]; - int y3 = tmpY[vc]; - - if ((x1 - x2) * (y3 - y2) - (y1 - y2) * (x3 - x2) > 0) - { - if (client.containsBounds(mouseX2, mouseY2, y1, y2, y3, x1, x2, x3)) - { - setTargetTile(tileX, tileY); - break; - } - } - } - } - catch (Exception ex) - { - client.getLogger().warn("error during overlay rendering", ex); - } - } - - @Inject - @Override - public int getDrawDistance() - { - return rl$drawDistance; - } - - @Inject - @Override - public void setDrawDistance(int drawDistance) - { - rl$drawDistance = drawDistance; - } - - @Inject - static void setTargetTile(int targetX, int targetY) - { - final LocalPoint current = client.getLocalPlayer().getLocalLocation(); - - // Limit walk distance - https://math.stackexchange.com/a/85582 - final int a = current.getSceneX(); - final int b = current.getSceneY(); - final int c = targetX; - final int d = targetY; - - final int r = MAX_TARGET_DISTANCE; - final int t = (int) Math.hypot(a - c, b - d) - r; - int x = targetX; - int y = targetY; - - if (t > 0) - { - x = (r * c + t * a) / (r + t); - y = (r * d + t * b) / (r + t); - } - - client.setSelectedSceneTileX(x); - client.setSelectedSceneTileY(y); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSSceneTileModelMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSSceneTileModelMixin.java deleted file mode 100644 index a1ab51260e..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSSceneTileModelMixin.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.rs.api.RSSceneTileModel; - -@Mixin(RSSceneTileModel.class) -public abstract class RSSceneTileModelMixin implements RSSceneTileModel -{ - @Inject - private int rl$modelBufferOffset; - - @Inject - private int rl$modelUvBufferOffset; - - @Inject - private int rl$modelBufferLen; - - @Inject - @Override - public int getBufferOffset() - { - return rl$modelBufferOffset; - } - - @Inject - @Override - public void setBufferOffset(int bufferOffset) - { - rl$modelBufferOffset = bufferOffset; - } - - @Inject - @Override - public int getUvBufferOffset() - { - return rl$modelUvBufferOffset; - } - - @Inject - @Override - public void setUvBufferOffset(int bufferOffset) - { - rl$modelUvBufferOffset = bufferOffset; - } - - @Inject - @Override - public int getBufferLen() - { - return rl$modelBufferLen; - } - - @Inject - @Override - public void setBufferLen(int bufferLen) - { - rl$modelBufferLen = bufferLen; - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSSceneTilePaintMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSSceneTilePaintMixin.java deleted file mode 100644 index 27c719d58c..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSSceneTilePaintMixin.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.rs.api.RSSceneTilePaint; - -@Mixin(RSSceneTilePaint.class) -public abstract class RSSceneTilePaintMixin implements RSSceneTilePaint -{ - @Inject - private int rl$paintModelBufferOffset; - - @Inject - private int rl$paintModelUvBufferOffset; - - @Inject - private int rl$paintModelBufferLen; - - @Inject - @Override - public int getBufferOffset() - { - return rl$paintModelBufferOffset; - } - - @Inject - @Override - public void setBufferOffset(int bufferOffset) - { - rl$paintModelBufferOffset = bufferOffset; - } - - @Inject - @Override - public int getUvBufferOffset() - { - return rl$paintModelUvBufferOffset; - } - - @Inject - @Override - public void setUvBufferOffset(int bufferOffset) - { - rl$paintModelUvBufferOffset = bufferOffset; - } - - @Inject - @Override - public int getBufferLen() - { - return rl$paintModelBufferLen; - } - - @Inject - @Override - public void setBufferLen(int bufferLen) - { - rl$paintModelBufferLen = bufferLen; - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSSequenceMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSSequenceMixin.java deleted file mode 100644 index 563d5fce17..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSSequenceMixin.java +++ /dev/null @@ -1,243 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSFrames; -import net.runelite.rs.api.RSModel; -import net.runelite.rs.api.RSSequence; - -@Mixin(RSSequence.class) -public abstract class RSSequenceMixin implements RSSequence -{ - @Shadow("clientInstance") - private static RSClient client; - - @Copy("applyTransformations") - public abstract RSModel rs$applyTransformations(RSModel model, int actionFrame, RSSequence poseSeq, int poseFrame); - - @Replace("applyTransformations") - public RSModel rl$applyTransformations(RSModel model, int actionFrame, RSSequence poseSeq, int poseFrame) - { - // reset frame ids because we're not interpolating this - if (actionFrame < 0) - { - int packed = actionFrame ^ Integer.MIN_VALUE; - actionFrame = packed & 0xFFFF; - } - if (poseFrame < 0) - { - int packed = poseFrame ^ Integer.MIN_VALUE; - poseFrame = packed & 0xFFFF; - } - return rs$applyTransformations(model, actionFrame, poseSeq, poseFrame); - } - - @Copy("transformActorModel") - public abstract RSModel rs$transformActorModel(RSModel model, int frameIdx); - - @Replace("transformActorModel") - public RSModel rl$transformActorModel(RSModel model, int frame) - { - // check if the frame has been modified - if (frame < 0) - { - // remove flag to check if the frame has been modified - int packed = frame ^ Integer.MIN_VALUE; - int interval = packed >> 16; - frame = packed & 0xFFFF; - int nextFrame = frame + 1; - if (nextFrame >= getFrameIDs().length) - { - // dont interpolate last frame - nextFrame = -1; - } - int[] frameIds = getFrameIDs(); - int frameId = frameIds[frame]; - RSFrames frames = client.getFrames(frameId >> 16); - int frameIdx = frameId & 0xFFFF; - - int nextFrameIdx = -1; - RSFrames nextFrames = null; - if (nextFrame != -1) - { - int nextFrameId = frameIds[nextFrame]; - nextFrames = client.getFrames(nextFrameId >> 16); - nextFrameIdx = nextFrameId & 0xFFFF; - } - - if (frames == null) - { - // not sure what toSharedModel does but it is needed - return model.toSharedModel(true); - } - else - { - RSModel animatedModel = model.toSharedModel(!frames.getFrames()[frameIdx].isShowing()); - animatedModel.interpolateFrames(frames, frameIdx, nextFrames, nextFrameIdx, interval, - getFrameLenths()[frame]); - return animatedModel; - } - } - else - { - return rs$transformActorModel(model, frame); - } - } - - @Copy("transformObjectModel") - public abstract RSModel rs$transformObjectModel(RSModel model, int frame, int rotation); - - @Replace("transformObjectModel") - public RSModel rl$transformObjectModel(RSModel model, int frame, int rotation) - { - // check if the frame has been modified - if (frame < 0) - { - // remove flag to check if the frame has been modified - int packed = frame ^ Integer.MIN_VALUE; - int interval = packed >> 16; - frame = packed & 0xFFFF; - - int nextFrame = frame + 1; - if (nextFrame >= getFrameIDs().length) - { - // dont interpolate last frame - nextFrame = -1; - } - int[] frameIds = getFrameIDs(); - int frameId = frameIds[frame]; - RSFrames frames = client.getFrames(frameId >> 16); - int frameIdx = frameId & 0xFFFF; - - int nextFrameIdx = -1; - RSFrames nextFrames = null; - if (nextFrame != -1) - { - int nextFrameId = frameIds[nextFrame]; - nextFrames = client.getFrames(nextFrameId >> 16); - nextFrameIdx = nextFrameId & 0xFFFF; - } - - if (frames == null) - { - return model.toSharedModel(true); - } - else - { - RSModel animatedModel = model.toSharedModel(!frames.getFrames()[frameIdx].isShowing()); - // reset rotation before animating - rotation &= 3; - if (rotation == 1) - { - animatedModel.rotateY270Ccw(); - } - else if (rotation == 2) - { - animatedModel.rotateY180Ccw(); - } - else if (rotation == 3) - { - animatedModel.rotateY90Ccw(); - } - animatedModel.interpolateFrames(frames, frameIdx, nextFrames, nextFrameIdx, interval, - getFrameLenths()[frame]); - // reapply rotation after animating - if (rotation == 1) - { - animatedModel.rotateY90Ccw(); - } - else if (rotation == 2) - { - animatedModel.rotateY180Ccw(); - } - else if (rotation == 3) - { - animatedModel.rotateY270Ccw(); - } - return animatedModel; - } - } - else - { - return rs$transformObjectModel(model, frame, rotation); - } - } - - @Copy("transformSpotAnimModel") - public abstract RSModel rs$transformSpotAnimModel(RSModel model, int frame); - - @Replace("transformSpotAnimModel") - public RSModel rl$transformSpotAnimModel(RSModel model, int frame) - { - // check if the frame has been modified - if (frame < 0) - { - // remove flag to check if the frame has been modified - int packed = frame ^ Integer.MIN_VALUE; - int interval = packed >> 16; - frame = packed & 0xFFFF; - int nextFrame = frame + 1; - if (nextFrame >= getFrameIDs().length) - { - // dont interpolate last frame - nextFrame = -1; - } - int[] frameIds = getFrameIDs(); - int frameId = frameIds[frame]; - RSFrames frames = client.getFrames(frameId >> 16); - int frameIdx = frameId & 0xFFFF; - - int nextFrameIdx = -1; - RSFrames nextFrames = null; - if (nextFrame != -1) - { - int nextFrameId = frameIds[nextFrame]; - nextFrames = client.getFrames(nextFrameId >> 16); - nextFrameIdx = nextFrameId & 0xFFFF; - } - - if (frames == null) - { - return model.toSharedSpotAnimModel(true); - } - else - { - RSModel animatedModel = model.toSharedSpotAnimModel(!frames.getFrames()[frameIdx].isShowing()); - animatedModel.interpolateFrames(frames, frameIdx, nextFrames, nextFrameIdx, interval, - getFrameLenths()[frame]); - return animatedModel; - } - } - else - { - return rs$transformSpotAnimModel(model, frame); - } - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSSpritePixelsMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSSpritePixelsMixin.java deleted file mode 100644 index b351a3d768..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSSpritePixelsMixin.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.awt.Color; -import java.awt.image.BufferedImage; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.rs.api.RSSpritePixels; - -@Mixin(RSSpritePixels.class) -public abstract class RSSpritePixelsMixin implements RSSpritePixels -{ - @Inject - @Override - public BufferedImage toBufferedImage() - { - BufferedImage img = new BufferedImage(getWidth(), getHeight(), BufferedImage.TYPE_INT_ARGB); - - toBufferedImage(img); - - return img; - } - - @Inject - @Override - public void toBufferedImage(BufferedImage img) - { - int width = getWidth(); - int height = getHeight(); - - if (img.getWidth() != width || img.getHeight() != height) - { - throw new IllegalArgumentException("Image bounds do not match SpritePixels"); - } - - int[] pixels = getPixels(); - int[] transPixels = new int[pixels.length]; - - for (int i = 0; i < pixels.length; i++) - { - if (pixels[i] != 0) - { - transPixels[i] = pixels[i] | 0xff000000; - } - } - - img.setRGB(0, 0, width, height, transPixels, 0, width); - } - - @Inject - @Override - public BufferedImage toBufferedOutline(Color color) - { - BufferedImage img = new BufferedImage(getWidth(), getHeight(), BufferedImage.TYPE_INT_ARGB); - - toBufferedOutline(img, color.getRGB()); - - return img; - } - - @Inject - @Override - public void toBufferedOutline(BufferedImage img, int color) - { - int width = getWidth(); - int height = getHeight(); - - if (img.getWidth() != width || img.getHeight() != height) - { - throw new IllegalArgumentException("Image bounds do not match SpritePixels"); - } - - int[] pixels = getPixels(); - int[] newPixels = new int[width * height]; - int pixelIndex = 0; - - for (int y = 0; y < height; ++y) - { - for (int x = 0; x < width; ++x) - { - int pixel = pixels[pixelIndex]; - if (pixel == 16777215 || pixel == 0) - { - // W - if (x > 0 && pixels[pixelIndex - 1] != 0) - { - pixel = color; - } - // N - else if (y > 0 && pixels[pixelIndex - width] != 0) - { - pixel = color; - } - // E - else if (x < width - 1 && pixels[pixelIndex + 1] != 0) - { - pixel = color; - } - // S - else if (y < height - 1 && pixels[pixelIndex + width] != 0) - { - pixel = color; - } - newPixels[pixelIndex] = pixel; - } - - pixelIndex++; - } - } - - img.setRGB(0, 0, width, height, newPixels, 0, width); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureMixin.java deleted file mode 100644 index 357da3f2f2..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureMixin.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSTexture; - -@Mixin(RSTexture.class) -public abstract class RSTextureMixin implements RSTexture -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - private float rl$u; - - @Inject - private float rl$v; - - @Copy("animate") - public abstract void rs$animate(int diff); - - @Replace("animate") - public void rl$animate(int diff) - { - // The client animates textures by cycling the backing pixels of the texture each fram - // based on how long it was since the last tick. On GPU we let the plugin manage this - // which will calculate uvs instead. - if (!client.isGpu()) - { - rs$animate(diff); - return; - } - - client.getDrawCallbacks().animate(this, diff); - } - - @Inject - @Override - public float getU() - { - return rl$u; - } - - @Inject - @Override - public void setU(float u) - { - this.rl$u = u; - } - - @Inject - @Override - public float getV() - { - return rl$v; - } - - @Inject - @Override - public void setV(float v) - { - this.rl$v = v; - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureProviderMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureProviderMixin.java deleted file mode 100644 index df3c15b38f..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureProviderMixin.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2018, Tomas Slusny - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.IndexDataBase; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.MethodHook; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSTextureProvider; - -@Mixin(RSTextureProvider.class) -public abstract class RSTextureProviderMixin implements RSTextureProvider -{ - @Shadow("clientInstance") - private static RSClient client; - - @MethodHook(value = "", end = true) - @Inject - public void rl$init(IndexDataBase indexTextures, IndexDataBase indexSprites, int maxSize, double brightness, int width) - { - // the client's max size is 20, however there are many scenes with >20 textures, - // which causes continuous alloc/free of textures with the gl. There are - // only ~57 textures in total. - setMaxSize(64); - setSize(64); - } - - @MethodHook(value = "checkTextures", end = true) - @Inject - public void checkTextures(int diff) - { - client.getCallbacks().drawAboveOverheads(); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java deleted file mode 100644 index 1cb4a729a8..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java +++ /dev/null @@ -1,565 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.util.ArrayList; -import java.util.List; -import net.runelite.api.CollisionData; -import net.runelite.api.CollisionDataFlag; -import net.runelite.api.Constants; -import net.runelite.api.DecorativeObject; -import net.runelite.api.GroundObject; -import net.runelite.api.Item; -import net.runelite.api.ItemLayer; -import net.runelite.api.Node; -import net.runelite.api.Point; -import net.runelite.api.Tile; -import net.runelite.api.WallObject; -import net.runelite.api.coords.LocalPoint; -import net.runelite.api.coords.WorldPoint; -import net.runelite.api.events.DecorativeObjectChanged; -import net.runelite.api.events.DecorativeObjectDespawned; -import net.runelite.api.events.DecorativeObjectSpawned; -import net.runelite.api.events.GameObjectChanged; -import net.runelite.api.events.GameObjectDespawned; -import net.runelite.api.events.GameObjectSpawned; -import net.runelite.api.events.GroundObjectChanged; -import net.runelite.api.events.GroundObjectDespawned; -import net.runelite.api.events.GroundObjectSpawned; -import net.runelite.api.events.ItemDespawned; -import net.runelite.api.events.ItemSpawned; -import net.runelite.api.events.WallObjectChanged; -import net.runelite.api.events.WallObjectDespawned; -import net.runelite.api.events.WallObjectSpawned; -import net.runelite.api.mixins.FieldHook; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSActor; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSDeque; -import net.runelite.rs.api.RSGameObject; -import net.runelite.rs.api.RSGraphicsObject; -import net.runelite.rs.api.RSItem; -import net.runelite.rs.api.RSItemLayer; -import net.runelite.rs.api.RSNode; -import net.runelite.rs.api.RSProjectile; -import net.runelite.rs.api.RSRenderable; -import net.runelite.rs.api.RSTile; -import org.slf4j.Logger; - -@Mixin(RSTile.class) -public abstract class RSTileMixin implements RSTile -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - private static RSGameObject lastGameObject; - - @Inject - private static RSDeque[][][] lastGroundItems = new RSDeque[Constants.MAX_Z][Constants.SCENE_SIZE][Constants.SCENE_SIZE]; - - @Inject - private WallObject previousWallObject; - - @Inject - private DecorativeObject previousDecorativeObject; - - @Inject - private GroundObject previousGroundObject; - - @Inject - private RSGameObject[] previousGameObjects; - - @Inject - @Override - public WorldPoint getWorldLocation() - { - return WorldPoint.fromScene(client, getX(), getY(), getPlane()); - } - - @Inject - @Override - public Point getSceneLocation() - { - return new Point(getX(), getY()); - } - - @Inject - @Override - public LocalPoint getLocalLocation() - { - return LocalPoint.fromScene(getX(), getY()); - } - - @FieldHook("wallObject") - @Inject - public void wallObjectChanged(int idx) - { - WallObject previous = previousWallObject; - WallObject current = getWallObject(); - - previousWallObject = current; - - if (current == null && previous != null) - { - WallObjectDespawned wallObjectDespawned = new WallObjectDespawned(); - wallObjectDespawned.setTile(this); - wallObjectDespawned.setWallObject(previous); - client.getCallbacks().post(wallObjectDespawned); - } - else if (current != null && previous == null) - { - WallObjectSpawned wallObjectSpawned = new WallObjectSpawned(); - wallObjectSpawned.setTile(this); - wallObjectSpawned.setWallObject(current); - client.getCallbacks().post(wallObjectSpawned); - } - else if (current != null && previous != null) - { - WallObjectChanged wallObjectChanged = new WallObjectChanged(); - wallObjectChanged.setTile(this); - wallObjectChanged.setPrevious(previous); - wallObjectChanged.setWallObject(current); - client.getCallbacks().post(wallObjectChanged); - } - } - - @FieldHook("decorativeObject") - @Inject - public void decorativeObjectChanged(int idx) - { - DecorativeObject previous = previousDecorativeObject; - DecorativeObject current = getDecorativeObject(); - - previousDecorativeObject = current; - - if (current == null && previous != null) - { - DecorativeObjectDespawned decorativeObjectDespawned = new DecorativeObjectDespawned(); - decorativeObjectDespawned.setTile(this); - decorativeObjectDespawned.setDecorativeObject(previous); - client.getCallbacks().post(decorativeObjectDespawned); - } - else if (current != null && previous == null) - { - DecorativeObjectSpawned decorativeObjectSpawned = new DecorativeObjectSpawned(); - decorativeObjectSpawned.setTile(this); - decorativeObjectSpawned.setDecorativeObject(current); - client.getCallbacks().post(decorativeObjectSpawned); - } - else if (current != null && previous != null) - { - DecorativeObjectChanged decorativeObjectChanged = new DecorativeObjectChanged(); - decorativeObjectChanged.setTile(this); - decorativeObjectChanged.setPrevious(previous); - decorativeObjectChanged.setDecorativeObject(current); - client.getCallbacks().post(decorativeObjectChanged); - } - } - - @FieldHook("groundObject") - @Inject - public void groundObjectChanged(int idx) - { - GroundObject previous = previousGroundObject; - GroundObject current = getGroundObject(); - - previousGroundObject = current; - - if (current == null && previous != null) - { - GroundObjectDespawned groundObjectDespawned = new GroundObjectDespawned(); - groundObjectDespawned.setTile(this); - groundObjectDespawned.setGroundObject(previous); - client.getCallbacks().post(groundObjectDespawned); - } - else if (current != null && previous == null) - { - GroundObjectSpawned groundObjectSpawned = new GroundObjectSpawned(); - groundObjectSpawned.setTile(this); - groundObjectSpawned.setGroundObject(current); - client.getCallbacks().post(groundObjectSpawned); - } - else if (current != null && previous != null) - { - GroundObjectChanged groundObjectChanged = new GroundObjectChanged(); - groundObjectChanged.setTile(this); - groundObjectChanged.setPrevious(previous); - groundObjectChanged.setGroundObject(current); - client.getCallbacks().post(groundObjectChanged); - } - } - - @FieldHook("objects") - @Inject - public void gameObjectsChanged(int idx) - { - if (idx == -1) // this happens from the field assignment - { - return; - } - - if (previousGameObjects == null) - { - previousGameObjects = new RSGameObject[5]; - } - - // Previous game object - RSGameObject previous = previousGameObjects[idx]; - - // GameObject that was changed. - RSGameObject current = (RSGameObject) getGameObjects()[idx]; - - // Update previous object to current - previousGameObjects[idx] = current; - - // Last game object - RSGameObject last = lastGameObject; - - // Update last game object - lastGameObject = current; - - // Duplicate event, return - if (current == previous) - { - return; - } - - if (current != null && current == last) - { - // When >1 tile objects are added to the scene, the same GameObject is added to - // multiple tiles. We keep lastGameObject to prevent duplicate spawn events from - // firing for these objects. - return; - } - - // actors, projectiles, and graphics objects are added and removed from the scene each frame as GameObjects, - // so ignore them. - boolean currentInvalid = false, prevInvalid = false; - if (current != null) - { - RSRenderable renderable = current.getRenderable(); - currentInvalid = renderable instanceof RSActor || renderable instanceof RSProjectile || renderable instanceof RSGraphicsObject; - } - - if (previous != null) - { - RSRenderable renderable = previous.getRenderable(); - prevInvalid = renderable instanceof RSActor || renderable instanceof RSProjectile || renderable instanceof RSGraphicsObject; - } - - Logger logger = client.getLogger(); - if (current == null) - { - if (prevInvalid) - { - return; - } - - logger.trace("Game object despawn: {}", previous.getId()); - - GameObjectDespawned gameObjectDespawned = new GameObjectDespawned(); - gameObjectDespawned.setTile(this); - gameObjectDespawned.setGameObject(previous); - client.getCallbacks().post(gameObjectDespawned); - } - else if (previous == null) - { - if (currentInvalid) - { - return; - } - - logger.trace("Game object spawn: {}", current.getId()); - - GameObjectSpawned gameObjectSpawned = new GameObjectSpawned(); - gameObjectSpawned.setTile(this); - gameObjectSpawned.setGameObject(current); - client.getCallbacks().post(gameObjectSpawned); - } - else - { - if (currentInvalid && prevInvalid) - { - return; - } - - logger.trace("Game object change: {} -> {}", previous.getId(), current.getId()); - - GameObjectChanged gameObjectsChanged = new GameObjectChanged(); - gameObjectsChanged.setTile(this); - gameObjectsChanged.setPrevious(previous); - gameObjectsChanged.setGameObject(current); - client.getCallbacks().post(gameObjectsChanged); - } - } - - @FieldHook("itemLayer") - @Inject - public void itemLayerChanged(int idx) - { - int x = getX(); - int y = getY(); - int z = client.getPlane(); - RSDeque[][][] groundItemDeque = client.getGroundItemDeque(); - - RSDeque oldQueue = lastGroundItems[z][x][y]; - RSDeque newQueue = groundItemDeque[z][x][y]; - - if (oldQueue != newQueue) - { - if (oldQueue != null) - { - // despawn everything in old .. - RSNode head = oldQueue.getHead(); - for (RSNode cur = head.getNext(); cur != head; cur = cur.getNext()) - { - RSItem item = (RSItem) cur; - ItemDespawned itemDespawned = new ItemDespawned(this, item); - client.getCallbacks().post(itemDespawned); - } - } - lastGroundItems[z][x][y] = newQueue; - } - - RSItem lastUnlink = client.getLastItemDespawn(); - if (lastUnlink != null) - { - client.setLastItemDespawn(null); - } - - RSItemLayer itemLayer = (RSItemLayer) getItemLayer(); - if (itemLayer == null) - { - if (lastUnlink != null) - { - ItemDespawned itemDespawned = new ItemDespawned(this, lastUnlink); - client.getCallbacks().post(itemDespawned); - } - return; - } - - RSDeque itemDeque = newQueue; - - if (itemDeque == null) - { - if (lastUnlink != null) - { - ItemDespawned itemDespawned = new ItemDespawned(this, lastUnlink); - client.getCallbacks().post(itemDespawned); - } - return; - } - - // The new item gets added to either the head, or the tail, depending on its price - RSNode head = itemDeque.getHead(); - RSNode current = null; - RSNode previous = head.getPrevious(); - boolean forward = false; - if (head != previous) - { - RSItem prev = (RSItem) previous; - if (x != prev.getX() || y != prev.getY()) - { - current = prev; - } - } - - RSNode next = head.getNext(); - if (current == null && head != next) - { - RSItem n = (RSItem) next; - if (x != n.getX() || y != n.getY()) - { - current = n; - forward = true; - } - } - - if (lastUnlink != null && lastUnlink != previous && lastUnlink != next) - { - ItemDespawned itemDespawned = new ItemDespawned(this, lastUnlink); - client.getCallbacks().post(itemDespawned); - } - - if (current == null) - { - return; // already seen this spawn, or no new item - } - - do - { - RSItem item = (RSItem) current; - item.setX(x); - item.setY(y); - - ItemSpawned itemSpawned = new ItemSpawned(this, item); - client.getCallbacks().post(itemSpawned); - - current = forward ? current.getNext() : current.getPrevious(); - - // Send spawn events for anything on this tile which is at the wrong location, which happens - // when the scene base changes - } while (current != head && (((RSItem) current).getX() != x || ((RSItem) current).getY() != y)); - } - - @Inject - @Override - public boolean hasLineOfSightTo(Tile other) - { - // Thanks to Henke for this method :) - - if (this.getPlane() != other.getPlane()) - { - return false; - } - - CollisionData[] collisionData = client.getCollisionMaps(); - if (collisionData == null) - { - return false; - } - - int z = this.getPlane(); - int[][] collisionDataFlags = collisionData[z].getFlags(); - - Point p1 = this.getSceneLocation(); - Point p2 = other.getSceneLocation(); - if (p1.getX() == p2.getX() && p1.getY() == p2.getY()) - { - return true; - } - - int dx = p2.getX() - p1.getX(); - int dy = p2.getY() - p1.getY(); - int dxAbs = Math.abs(dx); - int dyAbs = Math.abs(dy); - - int xFlags = CollisionDataFlag.BLOCK_LINE_OF_SIGHT_FULL; - int yFlags = CollisionDataFlag.BLOCK_LINE_OF_SIGHT_FULL; - if (dx < 0) - { - xFlags |= CollisionDataFlag.BLOCK_LINE_OF_SIGHT_EAST; - } - else - { - xFlags |= CollisionDataFlag.BLOCK_LINE_OF_SIGHT_WEST; - } - if (dy < 0) - { - yFlags |= CollisionDataFlag.BLOCK_LINE_OF_SIGHT_NORTH; - } - else - { - yFlags |= CollisionDataFlag.BLOCK_LINE_OF_SIGHT_SOUTH; - } - - if (dxAbs > dyAbs) - { - int x = p1.getX(); - int yBig = p1.getY() << 16; // The y position is represented as a bigger number to handle rounding - int slope = (dy << 16) / dxAbs; - yBig += 0x8000; // Add half of a tile - if (dy < 0) - { - yBig--; // For correct rounding - } - int direction = dx < 0 ? -1 : 1; - - while (x != p2.getX()) - { - x += direction; - int y = yBig >>> 16; - if ((collisionDataFlags[x][y] & xFlags) != 0) - { - // Collision while traveling on the x axis - return false; - } - yBig += slope; - int nextY = yBig >>> 16; - if (nextY != y && (collisionDataFlags[x][nextY] & yFlags) != 0) - { - // Collision while traveling on the y axis - return false; - } - } - } - else - { - int y = p1.getY(); - int xBig = p1.getX() << 16; // The x position is represented as a bigger number to handle rounding - int slope = (dx << 16) / dyAbs; - xBig += 0x8000; // Add half of a tile - if (dx < 0) - { - xBig--; // For correct rounding - } - int direction = dy < 0 ? -1 : 1; - - while (y != p2.getY()) - { - y += direction; - int x = xBig >>> 16; - if ((collisionDataFlags[x][y] & yFlags) != 0) - { - // Collision while traveling on the y axis - return false; - } - xBig += slope; - int nextX = xBig >>> 16; - if (nextX != x && (collisionDataFlags[nextX][y] & xFlags) != 0) - { - // Collision while traveling on the x axis - return false; - } - } - } - - // No collision - return true; - } - - @Inject - @Override - public List getGroundItems() - { - ItemLayer layer = this.getItemLayer(); - if (layer == null) - { - return null; - } - - List result = new ArrayList(); - Node node = layer.getBottom(); - while (node instanceof Item) - { - result.add((Item) node); - node = node.getNext(); - } - return result; - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSVarcsMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSVarcsMixin.java deleted file mode 100644 index 2c9a0d4e1e..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSVarcsMixin.java +++ /dev/null @@ -1,31 +0,0 @@ -package net.runelite.mixins; - -import net.runelite.api.events.VarClientIntChanged; -import net.runelite.api.events.VarClientStrChanged; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.MethodHook; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSVarcs; - -@Mixin(RSVarcs.class) -public abstract class RSVarcsMixin implements RSVarcs -{ - @Shadow("clientInstance") - private static RSClient client; - - @MethodHook(value = "putVarc", end = true) - @Inject - public void onVarCIntChanged(int id, int value) - { - client.getCallbacks().post(new VarClientIntChanged(id)); - } - - @MethodHook(value = "putVarcStringNew", end = true) - @Inject - public void onVarCStrChanged(int id, String value) - { - client.getCallbacks().post(new VarClientStrChanged(id)); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSWallObjectMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSWallObjectMixin.java deleted file mode 100644 index e5db24d686..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSWallObjectMixin.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright (c) 2018, SomeoneWithAnInternetConnection - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.awt.geom.Area; -import net.runelite.api.Model; -import net.runelite.api.Perspective; -import net.runelite.api.Renderable; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSWallObject; - -@Mixin(RSWallObject.class) -public abstract class RSWallObjectMixin implements RSWallObject -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - private int wallPlane; - - @Inject - @Override - public int getPlane() - { - return wallPlane; - } - - @Inject - @Override - public void setPlane(int plane) - { - this.wallPlane = plane; - } - - @Inject - private Model getModelA() - { - Renderable renderable = getRenderable1(); - if (renderable == null) - { - return null; - } - - if (renderable instanceof Model) - { - return (Model) renderable; - } - else - { - return renderable.getModel(); - } - } - - @Inject - private Model getModelB() - { - Renderable renderable = getRenderable2(); - if (renderable == null) - { - return null; - } - - if (renderable instanceof Model) - { - return (Model) renderable; - } - else - { - return renderable.getModel(); - } - } - - @Inject - @Override - public Area getClickbox() - { - Area clickbox = new Area(); - - Area clickboxA = Perspective.getClickbox(client, getModelA(), 0, getLocalLocation()); - Area clickboxB = Perspective.getClickbox(client, getModelB(), 0, getLocalLocation()); - - if (clickboxA == null && clickboxB == null) - { - return null; - } - - if (clickboxA != null) - { - clickbox.add(clickboxA); - } - - if (clickboxB != null) - { - clickbox.add(clickboxB); - } - - return clickbox; - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java deleted file mode 100644 index 60ec7821cb..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java +++ /dev/null @@ -1,584 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import net.runelite.api.HashTable; -import net.runelite.api.Node; -import net.runelite.api.Point; -import net.runelite.api.WidgetNode; -import net.runelite.api.events.WidgetHiddenChanged; -import net.runelite.api.events.WidgetPositioned; -import net.runelite.api.mixins.FieldHook; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.api.widgets.Widget; -import static net.runelite.api.widgets.WidgetInfo.TO_CHILD; -import static net.runelite.api.widgets.WidgetInfo.TO_GROUP; -import net.runelite.api.widgets.WidgetItem; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSHashTable; -import net.runelite.rs.api.RSNode; -import net.runelite.rs.api.RSWidget; - -@Mixin(RSWidget.class) -public abstract class RSWidgetMixin implements RSWidget -{ - private static final int ITEM_SLOT_SIZE = 32; - - @Shadow("clientInstance") - private static RSClient client; - - @Inject - private static int rl$widgetLastPosChanged; - - @Inject - private int rl$parentId; - - @Inject - private int rl$x; - - @Inject - private int rl$y; - - @Inject - RSWidgetMixin() - { - rl$parentId = -1; - rl$x = -1; - rl$y = -1; - } - - @Inject - @Override - public void setRenderParentId(int parentId) - { - rl$parentId = parentId; - } - - @Inject - @Override - public void setRenderX(int x) - { - rl$x = x; - } - - @Inject - @Override - public void setRenderY(int y) - { - rl$y = y; - } - - @Inject - @Override - public Widget getParent() - { - int id = getParentId(); - if (id == -1) - { - return null; - } - - return client.getWidget(TO_GROUP(id), TO_CHILD(id)); - } - - @Inject - @Override - public int getParentId() - { - assert client.isClientThread(); - - int rsParentId = getRSParentId(); - if (rsParentId != -1) - { - return rsParentId; - } - - final int id = getId(); - if (TO_GROUP(id) == client.getWidgetRoot()) - { - // this is a root widget - return -1; - } - - int parentId = rl$parentId; - if (parentId != -1) - { - // if this happens, the widget is or was nested. - // rl$parentId is updated when drawing, but will not be updated when - // the widget is no longer reachable in the tree, leaving - // parent id potentially incorrect - - // check the parent in the component table - HashTable componentTable = client.getComponentTable(); - WidgetNode widgetNode = componentTable.get(parentId); - if (widgetNode == null || widgetNode.getId() != TO_GROUP(id)) - { - // invalidate parent - rl$parentId = -1; - } - else - { - return parentId; - } - } - - // also the widget may not have been drawn, yet - int groupId = TO_GROUP(getId()); - RSHashTable componentTable = client.getComponentTable(); - RSNode[] buckets = componentTable.getBuckets(); - for (RSNode node : buckets) - { - // It looks like the first node in the bucket is always - // a sentinel - Node cur = node.getNext(); - while (cur != node) - { - WidgetNode wn = (WidgetNode) cur; - - if (groupId == wn.getId()) - { - return (int) wn.getHash(); - } - - cur = cur.getNext(); - } - } - - return -1; - } - - @Inject - @Override - public String getText() - { - return getRSText().replace('\u00A0', ' '); - } - - @Inject - @Override - public String getName() - { - return getRSName().replace('\u00A0', ' '); - } - - @Inject - @Override - public void setName(String name) - { - setRSName(name.replace(' ', '\u00A0')); - } - - @Inject - @Override - public boolean isHidden() - { - assert client.isClientThread(); - - if (isSelfHidden()) - { - return true; - } - - Widget parent = getParent(); - - if (parent == null) - { - if (TO_GROUP(getId()) != client.getWidgetRoot()) - { - // Widget has no parent and is not the root widget (which is always visible), - // so it's not visible. - return true; - } - } - else if (parent.isHidden()) - { - // If the parent is hidden, this widget is also hidden. - return true; - } - - return false; - } - - @Inject - @Override - public Point getCanvasLocation() - { - return new Point(rl$x, rl$y); - } - - @Inject - @Override - public Rectangle getBounds() - { - Point canvasLocation = getCanvasLocation(); - return new Rectangle(canvasLocation.getX(), canvasLocation.getY(), getWidth(), getHeight()); - } - - @Inject - @Override - public Collection getWidgetItems() - { - int[] itemIds = getItemIds(); - - if (itemIds == null) - { - return null; - } - - List items = new ArrayList(itemIds.length); - - for (int i = 0; i < itemIds.length; ++i) - { - if (itemIds[i] <= 0) - { - continue; - } - - WidgetItem item = getWidgetItem(i); - - if (item != null) - { - items.add(item); - } - } - - return items; - } - - @Inject - @Override - public WidgetItem getWidgetItem(int index) - { - int[] itemIds = getItemIds(); - int[] itemQuantities = getItemQuantities(); - - if (itemIds == null || itemQuantities == null) - { - return null; - } - - int columns = getWidth(); // the number of item slot columns is stored here - int xPitch = getXPitch(); - int yPitch = getYPitch(); - int itemId = itemIds[index]; - int itemQuantity = itemQuantities[index]; - - if (columns <= 0) - { - return null; - } - - int row = index / columns; - int col = index % columns; - int itemX = rl$x + ((ITEM_SLOT_SIZE + xPitch) * col); - int itemY = rl$y + ((ITEM_SLOT_SIZE + yPitch) * row); - - Rectangle bounds = new Rectangle(itemX, itemY, ITEM_SLOT_SIZE, ITEM_SLOT_SIZE); - return new WidgetItem(itemId - 1, itemQuantity, index, bounds, this); - } - - @Inject - @Override - public Widget getChild(int index) - { - RSWidget[] widgets = getChildren(); - - if (widgets == null || widgets[index] == null) - { - return null; - } - - return widgets[index]; - } - - @Inject - @Override - public Widget[] getDynamicChildren() - { - RSWidget[] children = getChildren(); - - if (children == null) - { - return new Widget[0]; - } - - List widgets = new ArrayList(); - for (RSWidget widget : children) - { - if (widget != null && widget.getRSParentId() == getId()) - { - widgets.add(widget); - } - } - return widgets.toArray(new Widget[widgets.size()]); - } - - @Inject - @Override - public Widget[] getStaticChildren() - { - if (getRSParentId() == getId()) - { - // This is a dynamic widget, so it can't have static children - return new Widget[0]; - } - - List widgets = new ArrayList(); - for (RSWidget widget : client.getGroup(TO_GROUP(getId()))) - { - if (widget != null && widget.getRSParentId() == getId()) - { - widgets.add(widget); - } - } - return widgets.toArray(new RSWidget[widgets.size()]); - } - - @Inject - @Override - public Widget[] getNestedChildren() - { - assert client.isClientThread(); - - if (getRSParentId() == getId()) - { - // This is a dynamic widget, so it can't have nested children - return new Widget[0]; - } - - HashTable componentTable = client.getComponentTable(); - - WidgetNode wn = componentTable.get(getId()); - if (wn == null) - { - return new RSWidget[0]; - } - - int group = wn.getId(); - - List widgets = new ArrayList(); - for (RSWidget widget : client.getGroup(group)) - { - if (widget != null && widget.getRSParentId() == -1) - { - widgets.add(widget); - } - } - return widgets.toArray(new RSWidget[widgets.size()]); - } - - @Inject - @Override - public boolean contains(Point point) - { - Rectangle bounds = getBounds(); - return bounds != null && bounds.contains(new java.awt.Point(point.getX(), point.getY())); - } - - @Inject - @Override - public void broadcastHidden(boolean hidden) - { - WidgetHiddenChanged event = new WidgetHiddenChanged(); - event.setWidget(this); - event.setHidden(hidden); - - client.getCallbacks().post(event); - - RSWidget[] children = getChildren(); - - if (children != null) - { - // recursive through children - for (RSWidget child : children) - { - // if the widget is hidden it will not magically unhide from its parent changing - if (child == null || child.isSelfHidden()) - { - continue; - } - - child.broadcastHidden(hidden); - } - } - - // make sure we iterate nested children as well - // cannot be null - Widget[] nestedChildren = getNestedChildren(); - - for (Widget nestedChild : nestedChildren) - { - if (nestedChild == null || nestedChild.isSelfHidden()) - { - continue; - } - - ((RSWidget) nestedChild).broadcastHidden(hidden); - } - } - - @FieldHook("isHidden") - @Inject - public void onHiddenChanged(int idx) - { - int id = getId(); - - if (id == -1) - { - return; - } - - Widget parent = getParent(); - - // if the parent is hidden then changes in this widget don't have any visual effect - // so ignore them - if (parent != null) - { - if (parent.isHidden()) - { - return; - } - } - else if (TO_GROUP(id) != client.getWidgetRoot()) - { - return; - } - - broadcastHidden(isSelfHidden()); - } - - @FieldHook("relativeY") - @Inject - public void onPositionChanged(int idx) - { - int id = getId(); - if (id == -1) - { - return; - } - - int tick = client.getGameCycle(); - if (tick == rl$widgetLastPosChanged) - { - return; - } - - rl$widgetLastPosChanged = tick; - - client.getLogger().trace("Posting widget position changed"); - - WidgetPositioned widgetPositioned = new WidgetPositioned(); - client.getCallbacks().postDeferred(widgetPositioned); - } - - @Inject - @Override - public Widget createChild(int index, int type) - { - assert client.isClientThread(); - - RSWidget w = client.createWidget(); - w.setType(type); - w.setParentId(getId()); - w.setId(getId()); - w.setIsIf3(true); - - RSWidget[] siblings = getChildren(); - - if (index < 0) - { - if (siblings == null) - { - index = 0; - } - else - { - index = 0; - for (int i = siblings.length - 1; i >= 0; i--) - { - if (siblings[i] != null) - { - index = i + 1; - break; - } - } - } - } - - if (siblings == null) - { - siblings = new RSWidget[index + 1]; - setChildren(siblings); - } - else if (siblings.length <= index) - { - RSWidget[] newSiblings = new RSWidget[index + 1]; - System.arraycopy(siblings, 0, newSiblings, 0, siblings.length); - siblings = newSiblings; - setChildren(siblings); - } - - siblings[index] = w; - w.setIndex(index); - - return w; - } - - @Inject - @Override - public void revalidate() - { - assert client.isClientThread(); - - client.revalidateWidget(this); - } - - @Inject - @Override - public void revalidateScroll() - { - assert client.isClientThread(); - - client.revalidateWidget(this); - client.revalidateWidgetScroll(client.getWidgets()[TO_GROUP(this.getId())], this, false); - } - - @Inject - @Override - public void deleteAllChildren() - { - if (getChildren() != null) - { - Arrays.fill(getChildren(), null); - } - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSWorldMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSWorldMixin.java deleted file mode 100644 index 55155b500f..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSWorldMixin.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2018, Tomas Slusny - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.util.EnumSet; -import net.runelite.api.WorldType; -import net.runelite.api.events.WorldListLoad; -import net.runelite.api.mixins.FieldHook; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSWorld; - -@Mixin(RSWorld.class) -public abstract class RSWorldMixin implements RSWorld -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - @Override - public EnumSet getTypes() - { - return WorldType.fromMask(getMask()); - } - - @Inject - @Override - public void setTypes(final EnumSet types) - { - setMask(WorldType.toMask(types)); - } - - @Inject - @FieldHook("playerCount") - public void playerCountChanged(int idx) - { - RSWorld[] worlds = client.getWorldList(); - if (worlds != null && worlds.length > 0 && worlds[worlds.length - 1] == this) - { - // this is the last world in the list. - WorldListLoad worldLoad = new WorldListLoad(worlds); - client.getCallbacks().post(worldLoad); - } - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/Rasterizer2DMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/Rasterizer2DMixin.java deleted file mode 100644 index c8c2cc5a9b..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/Rasterizer2DMixin.java +++ /dev/null @@ -1,244 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; - -@Mixin(RSClient.class) -public abstract class Rasterizer2DMixin implements RSClient -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - private static void drawAlpha(int[] pixels, int index, int value, int alpha) - { - if (!client.isGpu() || pixels != client.getBufferProvider().getPixels()) - { - pixels[index] = value; - return; - } - - // (int) x * 0x8081 >>> 23 is equivalent to (short) x / 255 - int outAlpha = alpha + ((pixels[index] >>> 24) * (255 - alpha) * 0x8081 >>> 23); - pixels[index] = value & 0x00FFFFFF | outAlpha << 24; - } - - @Copy("drawGradientAlpha") - private static void rs$raster2d6(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) - { - throw new RuntimeException(); - } - - @Replace("drawGradientAlpha") - private static void rl$drawGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) - { - final int width = client.getGraphicsPixelsWidth(); - final int startX = client.getStartX(); - final int startY = client.getStartY(); - final int endX = client.getEndX(); - final int endY = client.getEndY(); - final int[] pixels = client.getGraphicsPixels(); - - if (!client.isGpu()) - { - rs$raster2d6(var0, var1, var2, var3, var4, var5, var6, var7); - return; - } - - if (var2 > 0 && var3 > 0) - { - int var8 = 0; - int var9 = 65536 / var3; - if (var0 < startX) - { - var2 -= startX - var0; - var0 = startX; - } - - if (var1 < startY) - { - var8 += (startY - var1) * var9; - var3 -= startY - var1; - var1 = startY; - } - - if (var0 + var2 > endX) - { - var2 = endX - var0; - } - - if (var3 + var1 > endY) - { - var3 = endY - var1; - } - - int var10 = width - var2; - int var11 = var0 + width * var1; - - for (int var12 = -var3; var12 < 0; ++var12) - { - int var13 = 65536 - var8 >> 8; - int var14 = var8 >> 8; - int var15 = (var13 * var6 + var14 * var7 & 65280) >>> 8; - if (var15 == 0) - { - var11 += width; - var8 += var9; - } - else - { - int var16 = (var14 * (var5 & 16711935) + var13 * (var4 & 16711935) & -16711936) + (var14 * (var5 & 65280) + var13 * (var4 & 65280) & 16711680) >>> 8; - int var17 = 255 - var15; - int var18 = ((var16 & 16711935) * var15 >> 8 & 16711935) + (var15 * (var16 & 65280) >> 8 & 65280); - - for (int var19 = -var2; var19 < 0; ++var19) - { - int var20 = pixels[var11]; - var20 = ((var20 & 16711935) * var17 >> 8 & 16711935) + (var17 * (var20 & 65280) >> 8 & 65280); - drawAlpha(pixels, var11++, var18 + var20, var15); - } - - var11 += var10; - var8 += var9; - } - } - } - } - - @Copy("raster2d7") - public static void rs$raster2d7(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) - { - throw new RuntimeException(); - } - - @Replace("raster2d7") - public static void rl$raster2d7(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) - { - final int width = client.getGraphicsPixelsWidth(); - final int height = client.getGraphicsPixelsHeight(); - final int[] pixels = client.getGraphicsPixels(); - - if (!client.isGpu()) - { - rs$raster2d7(var0, var1, var2, var3, var4, var5, var6, var7); - return; - } - - if (var0 + var2 >= 0 && var3 + var1 >= 0) - { - if (var0 < width && var1 < height) - { - int var8 = 0; - int var9 = 0; - if (var0 < 0) - { - var8 -= var0; - var2 += var0; - } - - if (var1 < 0) - { - var9 -= var1; - var3 += var1; - } - - if (var0 + var2 > width) - { - var2 = width - var0; - } - - if (var3 + var1 > height) - { - var3 = height - var1; - } - - int var10 = var6.length / var7; - int var11 = width - var2; - int var12 = var4 >>> 24; - int var13 = var5 >>> 24; - int var14; - int var15; - int var16; - int var17; - int var18; - if (var12 == 255 && var13 == 255) - { - var14 = var0 + var8 + (var9 + var1) * width; - - for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) - { - for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) - { - var17 = (var15 - var1) % var10; - var18 = (var16 - var0) % var7; - if (var6[var18 + var17 * var7] != 0) - { - pixels[var14++] = var5; - } - else - { - pixels[var14++] = var4; - } - } - - var14 += var11; - } - } - else - { - var14 = var0 + var8 + (var9 + var1) * width; - - for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) - { - for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) - { - var17 = (var15 - var1) % var10; - var18 = (var16 - var0) % var7; - int var19 = var4; - if (var6[var18 + var17 * var7] != 0) - { - var19 = var5; - } - - int var20 = var19 >>> 24; - int var21 = 255 - var20; - int var22 = pixels[var14]; - int var23 = ((var19 & 16711935) * var20 + (var22 & 16711935) * var21 & -16711936) + (var20 * (var19 & 65280) + var21 * (var22 & 65280) & 16711680) >> 8; - drawAlpha(pixels, var14++, var23, var20); - } - - var14 += var11; - } - } - } - } - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java deleted file mode 100644 index 03cecd206a..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright (c) 2018 Abex - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import net.runelite.api.Client; -import net.runelite.api.events.ScriptCallbackEvent; -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.api.widgets.JavaScriptCallback; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSScript; -import net.runelite.rs.api.RSScriptEvent; - -import static net.runelite.api.Opcodes.RUNELITE_EXECUTE; - -@Mixin(RSClient.class) -public abstract class ScriptVMMixin implements RSClient -{ - @Shadow("clientInstance") - private static Client client; - - // This field is set by the ScriptVM raw injector - @Inject - private static RSScript currentScript; - - // This field is set by the ScriptVM raw injector - @Inject - private static int currentScriptPC; - - // Call is injected into runScript by the ScriptVM raw injector - @Inject - static boolean vmExecuteOpcode(int opcode) - { - if (opcode == RUNELITE_EXECUTE) - { - assert currentScript.getInstructions()[currentScriptPC] == RUNELITE_EXECUTE; - - int stringStackSize = client.getStringStackSize(); - String stringOp = client.getStringStack()[--stringStackSize]; - client.setStringStackSize(stringStackSize); - - if ("debug".equals(stringOp)) - { - int intStackSize = client.getIntStackSize(); - - String fmt = client.getStringStack()[--stringStackSize]; - StringBuffer out = new StringBuffer(); - Matcher m = Pattern.compile("%(.)").matcher(fmt); - for (; m.find(); ) - { - m.appendReplacement(out, ""); - switch (m.group(1).charAt(0)) - { - case 'i': - case 'd': - out.append(client.getIntStack()[--intStackSize]); - break; - case 's': - out.append(client.getStringStack()[--stringStackSize]); - break; - default: - out.append(m.group(0)).append("=unknown"); - } - } - m.appendTail(out); - - client.getLogger().debug(out.toString()); - - client.setStringStackSize(stringStackSize); - client.setIntStackSize(intStackSize); - return true; - } - - ScriptCallbackEvent event = new ScriptCallbackEvent(); - event.setScript(currentScript); - event.setEventName(stringOp); - client.getCallbacks().post(event); - return true; - } - return false; - } - - @Copy("runScript") - static void rs$runScript(RSScriptEvent event, int maxExecutionTime) - { - throw new RuntimeException(); - } - - @Replace("runScript") - static void rl$runScript(RSScriptEvent event, int maxExecutionTime) - { - Object[] arguments = event.getArguments(); - if (arguments != null && arguments.length > 0 && arguments[0] instanceof JavaScriptCallback) - { - try - { - ((JavaScriptCallback) arguments[0]).run(event); - } - catch (Exception e) - { - client.getLogger().error("Error in JavaScriptCallback", e); - } - return; - } - - try - { - rs$runScript(event, maxExecutionTime); - } - finally - { - currentScript = null; - } - } - - @Inject - @Override - public void runScript(int id, Object... args) - { - assert isClientThread(); - assert currentScript == null; - Object[] cargs = new Object[args.length + 1]; - cargs[0] = id; - System.arraycopy(args, 0, cargs, 1, args.length); - RSScriptEvent se = createScriptEvent(); - se.setArguments(cargs); - runScript(se, 5000000); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/SoundEffectMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/SoundEffectMixin.java deleted file mode 100644 index c9a3f77ba4..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/SoundEffectMixin.java +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Copyright (c) 2018, SomeoneWithAnInternetConnection - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.SoundEffectVolume; -import net.runelite.api.events.AreaSoundEffectPlayed; -import net.runelite.api.events.SoundEffectPlayed; -import net.runelite.api.mixins.FieldHook; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSAudioTaskNode; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSRawAudioNode; -import net.runelite.rs.api.RSSoundEffect; -import net.runelite.rs.api.RSTaskDataNode; - -@Mixin(RSClient.class) -public abstract class SoundEffectMixin implements RSClient -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - private static int lastSoundEffectCount; - - @Inject - @Override - public void playSoundEffect(int id) - { - playSoundEffect(id, 0, 0, 0, 0); - } - - @Inject - @Override - public void playSoundEffect(int id, int x, int y, int range) - { - playSoundEffect(id, x, y, range, 0); - } - - @Inject - @Override - public void playSoundEffect(int id, int x, int y, int range, int delay) - { - int position = ((x & 255) << 16) + ((y & 255) << 8) + (range & 255); - - int[] queuedSoundEffectIDs = getQueuedSoundEffectIDs(); - int[] queuedSoundEffectLoops = getQueuedSoundEffectLoops(); - int[] queuedSoundEffectDelays = getQueuedSoundEffectDelays(); - RSSoundEffect[] audioEffects = getAudioEffects(); - int[] soundLocations = getSoundLocations(); - int queuedSoundEffectCount = getQueuedSoundEffectCount(); - - queuedSoundEffectIDs[queuedSoundEffectCount] = id; - queuedSoundEffectLoops[queuedSoundEffectCount] = 1; - queuedSoundEffectDelays[queuedSoundEffectCount] = delay; - audioEffects[queuedSoundEffectCount] = null; - soundLocations[queuedSoundEffectCount] = position; - - setQueuedSoundEffectCount(queuedSoundEffectCount + 1); - } - - @Inject - @Override - public void playSoundEffect(int id, int volume) - { - RSSoundEffect soundEffect = getTrack(getIndexCache4(), id, 0); - if (soundEffect == null) - { - return; - } - - // If the current volume is not muted, use it instead - final int soundEffectVolume = getSoundEffectVolume(); - if (soundEffectVolume != SoundEffectVolume.MUTED) - { - volume = soundEffectVolume; - } - - RSRawAudioNode rawAudioNode = soundEffect.toRawAudioNode().applyResampler(getSoundEffectResampler()); - RSAudioTaskNode audioTaskNode = createSoundEffectAudioTaskNode(rawAudioNode, 100, volume); - audioTaskNode.setNumLoops(1); - - getSoundEffectAudioQueue().queueAudioTaskNode((RSTaskDataNode) audioTaskNode); - } - - @FieldHook("queuedSoundEffectCount") - @Inject - public static void queuedSoundEffectCountChanged(int idx) - { - int soundCount = client.getQueuedSoundEffectCount(); - if (soundCount == lastSoundEffectCount + 1) - { - int soundIndex = soundCount - 1; - int packedLocation = client.getSoundLocations()[soundIndex]; - - if (packedLocation == 0) - { - // Regular sound effect - - SoundEffectPlayed event = new SoundEffectPlayed(); - event.setSoundId(client.getQueuedSoundEffectIDs()[soundIndex]); - event.setDelay(client.getQueuedSoundEffectDelays()[soundIndex]); - client.getCallbacks().post(event); - } - else - { - // Area sound effect - - int x = (packedLocation >> 16) & 0xFF; - int y = (packedLocation >> 8) & 0xFF; - int range = (packedLocation) & 0xFF; - - AreaSoundEffectPlayed event = new AreaSoundEffectPlayed(); - event.setSoundId(client.getQueuedSoundEffectIDs()[soundIndex]); - event.setSceneX(x); - event.setSceneY(y); - event.setRange(range); - event.setDelay(client.getQueuedSoundEffectDelays()[soundIndex]); - client.getCallbacks().post(event); - } - } - - lastSoundEffectCount = soundCount; - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java deleted file mode 100644 index efe5ee605c..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2018, Lotto - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.util.HashMap; -import java.util.Map; -import net.runelite.api.SpritePixels; -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSIndexDataBase; -import net.runelite.rs.api.RSSpritePixels; - -@Mixin(RSClient.class) -public abstract class SpriteMixin implements RSClient -{ - @Inject - private static final Map spriteOverrides = new HashMap(); - - @Inject - private static final Map widgetSpriteOverrides = new HashMap(); - - @Inject - @Override - public Map getSpriteOverrides() - { - return spriteOverrides; - } - - @Inject - @Override - public Map getWidgetSpriteOverrides() - { - return widgetSpriteOverrides; - } - - @Copy("getSpriteAsSpritePixels") - public static RSSpritePixels rs$loadSprite(RSIndexDataBase var0, int var1, int var2) - { - throw new RuntimeException(); - } - - @Replace("getSpriteAsSpritePixels") - public static RSSpritePixels rl$loadSprite(RSIndexDataBase var0, int var1, int var2) - { - SpritePixels sprite = spriteOverrides.get(var1); - - if (sprite != null) - { - return (RSSpritePixels) sprite; - } - - return rs$loadSprite(var0, var1, var2); - } -} \ No newline at end of file diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/StretchedModeMaxSizeMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/StretchedModeMaxSizeMixin.java deleted file mode 100644 index aa52b4e5e5..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/StretchedModeMaxSizeMixin.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2018, Lotto - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.awt.Dimension; -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSGameEngine; - -@Mixin(RSGameEngine.class) -public abstract class StretchedModeMaxSizeMixin implements RSGameEngine -{ - @Shadow("clientInstance") - private static RSClient client; - - @Copy("resizeCanvas") - abstract void rs$resizeCanvas(); - - @Replace("resizeCanvas") - public void rl$resizeCanvas() - { - if (client.isStretchedEnabled()) - { - client.invalidateStretching(false); - - if (client.isResized()) - { - Dimension realDimensions = client.getRealDimensions(); - - setMaxCanvasWidth(realDimensions.width); - setMaxCanvasHeight(realDimensions.height); - } - } - - rs$resizeCanvas(); - } - - @Copy("setMaxCanvasSize") - abstract void rs$setMaxCanvasSize(int width, int height); - - @Replace("setMaxCanvasSize") - public void rl$setMaxCanvasSize(int width, int height) - { - if (client.isStretchedEnabled() && client.isResized()) - { - return; - } - - rs$setMaxCanvasSize(width, height); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/StretchedModeMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/StretchedModeMixin.java deleted file mode 100644 index 1dbfe97f00..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/StretchedModeMixin.java +++ /dev/null @@ -1,216 +0,0 @@ -/* - * Copyright (c) 2018, Lotto - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.awt.Container; -import java.awt.Dimension; -import net.runelite.api.Constants; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.rs.api.RSClient; - -@Mixin(RSClient.class) -public abstract class StretchedModeMixin implements RSClient -{ - @Inject - private static boolean stretchedEnabled; - - @Inject - private static boolean stretchedFast; - - @Inject - private static boolean stretchedIntegerScaling; - - @Inject - private static boolean stretchedKeepAspectRatio; - - @Inject - private static double scalingFactor; - - @Inject - private static Dimension cachedStretchedDimensions; - - @Inject - private static Dimension cachedRealDimensions; - - @Inject - @Override - public boolean isStretchedEnabled() - { - return stretchedEnabled; - } - - @Inject - @Override - public void setStretchedEnabled(boolean state) - { - stretchedEnabled = state; - } - - @Inject - @Override - public boolean isStretchedFast() - { - return stretchedFast; - } - - @Inject - @Override - public void setStretchedFast(boolean state) - { - stretchedFast = state; - } - - @Inject - @Override - public void setStretchedIntegerScaling(boolean state) - { - stretchedIntegerScaling = state; - } - - @Inject - @Override - public void setStretchedKeepAspectRatio(boolean state) - { - stretchedKeepAspectRatio = state; - } - - @Inject - @Override - public void setScalingFactor(int factor) - { - scalingFactor = 1 + (factor / 100D); - } - - @Inject - @Override - public Dimension getRealDimensions() - { - if (!isStretchedEnabled()) - { - return getCanvas().getSize(); - } - - if (cachedRealDimensions == null) - { - if (isResized()) - { - Container canvasParent = getCanvas().getParent(); - - int parentWidth = canvasParent.getWidth(); - int parentHeight = canvasParent.getHeight(); - - int newWidth = (int) (parentWidth / scalingFactor); - int newHeight = (int) (parentHeight / scalingFactor); - - if (newWidth < Constants.GAME_FIXED_WIDTH || newHeight < Constants.GAME_FIXED_HEIGHT) - { - double scalingFactorW = (double)parentWidth / Constants.GAME_FIXED_WIDTH; - double scalingFactorH = (double)parentHeight / Constants.GAME_FIXED_HEIGHT; - double scalingFactor = Math.min(scalingFactorW, scalingFactorH); - - newWidth = (int) (parentWidth / scalingFactor); - newHeight = (int) (parentHeight / scalingFactor); - } - - cachedRealDimensions = new Dimension(newWidth, newHeight); - } - else - { - cachedRealDimensions = Constants.GAME_FIXED_SIZE; - } - } - - return cachedRealDimensions; - } - - @Inject - @Override - public Dimension getStretchedDimensions() - { - if (cachedStretchedDimensions == null) - { - Container canvasParent = getCanvas().getParent(); - - int parentWidth = canvasParent.getWidth(); - int parentHeight = canvasParent.getHeight(); - - Dimension realDimensions = getRealDimensions(); - - if (stretchedKeepAspectRatio) - { - double aspectRatio = realDimensions.getWidth() / realDimensions.getHeight(); - - int tempNewWidth = (int) (parentHeight * aspectRatio); - - if (tempNewWidth > parentWidth) - { - parentHeight = (int) (parentWidth / aspectRatio); - } - else - { - parentWidth = tempNewWidth; - } - } - - if (stretchedIntegerScaling) - { - if (parentWidth > realDimensions.width) - { - parentWidth = parentWidth - (parentWidth % realDimensions.width); - } - if (parentHeight > realDimensions.height) - { - parentHeight = parentHeight - (parentHeight % realDimensions.height); - } - } - - cachedStretchedDimensions = new Dimension(parentWidth, parentHeight); - } - - return cachedStretchedDimensions; - } - - @Inject - @Override - public void invalidateStretching(boolean resize) - { - cachedRealDimensions = null; - cachedStretchedDimensions = null; - - if (resize && isResized()) - { - /* - Tells the game to run resizeCanvas the next frame. - - This is useful when resizeCanvas wouldn't usually run, - for example when we've only changed the scaling factor - and we still want the game's canvas to resize - with regards to the new maximum bounds. - */ - setResizeCanvasNextFrame(true); - } - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/TileObjectMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/TileObjectMixin.java deleted file mode 100644 index f2a22c9d60..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/TileObjectMixin.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.awt.Graphics2D; -import java.awt.Polygon; -import net.runelite.api.Perspective; -import net.runelite.api.Point; -import net.runelite.api.TileObject; -import net.runelite.api.coords.LocalPoint; -import net.runelite.api.coords.WorldPoint; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Mixins; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSDecorativeObject; -import net.runelite.rs.api.RSGameObject; -import net.runelite.rs.api.RSGroundObject; -import net.runelite.rs.api.RSItemLayer; -import net.runelite.rs.api.RSWallObject; - -@Mixins({ - @Mixin(RSDecorativeObject.class), - @Mixin(RSGameObject.class), - @Mixin(RSGroundObject.class), - @Mixin(RSItemLayer.class), - @Mixin(RSWallObject.class) -}) -public abstract class TileObjectMixin implements TileObject -{ - @Shadow("clientInstance") - private static RSClient client; - - @Override - @Inject - public int getId() - { - long hash = getHash(); - return (int) (hash >>> 17 & 4294967295L); - } - - @Override - @Inject - public WorldPoint getWorldLocation() - { - return WorldPoint.fromLocal(client, getX(), getY(), getPlane()); - } - - @Override - @Inject - public LocalPoint getLocalLocation() - { - return new LocalPoint(getX(), getY()); - } - - @Override - @Inject - public Point getCanvasLocation() - { - return getCanvasLocation(0); - } - - @Override - @Inject - public Point getCanvasLocation(int zOffset) - { - return Perspective.localToCanvas(client, getLocalLocation(), getPlane(), zOffset); - } - - @Override - @Inject - public Polygon getCanvasTilePoly() - { - return Perspective.getCanvasTilePoly(client, getLocalLocation()); - } - - @Override - @Inject - public Point getCanvasTextLocation(Graphics2D graphics, String text, int zOffset) - { - return Perspective.getCanvasTextLocation(client, graphics, getLocalLocation(), text, zOffset); - } - - @Override - @Inject - public Point getMinimapLocation() - { - return Perspective.localToMinimap(client, getLocalLocation()); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java deleted file mode 100644 index a473dad4a9..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import com.google.common.cache.Cache; -import com.google.common.cache.CacheBuilder; -import java.util.Map; -import net.runelite.api.VarClientInt; -import net.runelite.api.VarClientStr; -import net.runelite.api.Varbits; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSNodeCache; -import net.runelite.rs.api.RSVarbit; - -@Mixin(RSClient.class) -public abstract class VarbitMixin implements RSClient -{ - @Shadow("clientInstance") - private static RSClient client; - - @Inject - private Cache varbitCache = CacheBuilder.newBuilder() - .maximumSize(128) - .build(); - - @Inject - VarbitMixin() - { - } - - @Inject - @Override - public int getVar(Varbits varbit) - { - int varbitId = varbit.getId(); - return getVarbitValue(getVarps(), varbitId); - } - - @Inject - @Override - public void setSetting(Varbits varbit, int value) - { - int varbitId = varbit.getId(); - setVarbitValue(getVarps(), varbitId, value); - } - - @Inject - @Override - public int getVarbitValue(int[] varps, int varbitId) - { - assert client.isClientThread(); - - RSVarbit v = varbitCache.getIfPresent(varbitId); - if (v == null) - { - client.getVarbit(varbitId); // load varbit into cache - RSNodeCache varbits = client.getVarbitCache(); - v = (RSVarbit) varbits.get(varbitId); // get from cache - varbitCache.put(varbitId, v); - } - - if (v.getIndex() == 0 && v.getLeastSignificantBit() == 0 && v.getMostSignificantBit() == 0) - { - throw new IndexOutOfBoundsException("Varbit " + varbitId + " does not exist"); - } - - int value = varps[v.getIndex()]; - int lsb = v.getLeastSignificantBit(); - int msb = v.getMostSignificantBit(); - int mask = (1 << ((msb - lsb) + 1)) - 1; - return (value >> lsb) & mask; - } - - @Inject - @Override - public void setVarbitValue(int[] varps, int varbitId, int value) - { - RSVarbit v = varbitCache.getIfPresent(varbitId); - if (v == null) - { - client.getVarbit(varbitId); // load varbit into cache - RSNodeCache varbits = client.getVarbitCache(); - v = (RSVarbit) varbits.get(varbitId); // get from cache - varbitCache.put(varbitId, v); - } - - int lsb = v.getLeastSignificantBit(); - int msb = v.getMostSignificantBit(); - int mask = (1 << ((msb - lsb) + 1)) - 1; - varps[v.getIndex()] = (varps[v.getIndex()] & ~(mask << lsb)) | ((value & mask) << lsb); - } - - @Inject - @Override - public int getVar(VarClientInt varClientInt) - { - Map varcmap = getVarcMap(); - Object object = varcmap.get(varClientInt.getIndex()); - return object instanceof Integer ? (Integer) object : 0; - } - - @Inject - @Override - public String getVar(VarClientStr varClientStr) - { - Map varcmap = getVarcMap(); - Object var2 = varcmap.get(varClientStr.getIndex()); - return var2 instanceof String ? (String) var2 : ""; - } - - @Inject - @Override - public void setVar(VarClientStr varClientStr, String value) - { - Map varcmap = getVarcMap(); - varcmap.put(varClientStr.getIndex(), value); - } - - @Inject - @Override - public void setVar(VarClientInt varClientInt, int value) - { - Map varcmap = getVarcMap(); - varcmap.put(varClientInt.getIndex(), value); - } - - @Inject - @Override - public Map getVarcMap() - { - return getVarcs().getVarcMap(); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/WidgetSpriteMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/WidgetSpriteMixin.java deleted file mode 100644 index 12001fb4c8..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/WidgetSpriteMixin.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2018, Lotto - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import java.util.Map; -import net.runelite.api.SpritePixels; -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSSpritePixels; -import net.runelite.rs.api.RSWidget; - -@Mixin(RSWidget.class) -public abstract class WidgetSpriteMixin implements RSWidget -{ - @Shadow("widgetSpriteOverrides") - private static Map widgetSpriteOverrides; - - @Copy("getWidgetSprite") - public RSSpritePixels rs$getWidgetSprite(boolean var1) - { - throw new RuntimeException(); - } - - @Replace("getWidgetSprite") - public RSSpritePixels rl$getWidgetSprite(boolean var1) - { - if (getSpriteId() != -1) - { - SpritePixels sprite = widgetSpriteOverrides.get(getId()); - - if (sprite != null) - { - return (RSSpritePixels) sprite; - } - } - - return rs$getWidgetSprite(var1); - } -} \ No newline at end of file diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/WorldHoppingMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/WorldHoppingMixin.java deleted file mode 100644 index 78778e3993..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/WorldHoppingMixin.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2018, Lotto - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.MenuAction; -import net.runelite.api.World; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.widgets.WidgetInfo; -import net.runelite.rs.api.RSClient; - -@Mixin(RSClient.class) -public abstract class WorldHoppingMixin implements RSClient -{ - @Inject - @Override - public void openWorldHopper() - { - // The clicked x & y coordinates (the last arguments) are not processed in the game or sent to Jagex, so they don't have to be real. - menuAction(-1, WidgetInfo.WORLD_SWITCHER_BUTTON.getId(), MenuAction.WIDGET_DEFAULT.getId(), 1, "World Switcher", "", 658, 384); - } - - @Inject - @Override - public void hopToWorld(World world) - { - final int worldId = world.getId(); - menuAction(worldId, WidgetInfo.WORLD_SWITCHER_LIST.getId(), MenuAction.WIDGET_DEFAULT.getId(), 1, "Switch", "" + (worldId - 300) + "", 683, 244); - } -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/WorldMapManagerMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/WorldMapManagerMixin.java deleted file mode 100644 index 3f51e31e48..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/WorldMapManagerMixin.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2018, Morgan Lewis - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSWorldMapManager; - -@Mixin(RSWorldMapManager.class) -public abstract class WorldMapManagerMixin implements RSWorldMapManager -{ - @Shadow("clientInstance") - static RSClient client; - - /* - The worldMapZoom is essentially pixels per tile. In most instances - getPixelsPerTile returns the same as worldMapZoom. - - At some map widths when 100% zoomed in the Jagex version of this function - returns 7.89 instead of 8.0 (the worldMapZoom at this level). - This would cause both the x and y positions of the map to shift - slightly when the map was certain widths. - - This mixin function replaces Jagex calculation with getWorldMapZoom. - This small change makes the world map tile sizing predictable. - */ - @Replace("getPixelsPerTile") - @Override - public float getPixelsPerTile(int graphicsDiff, int worldDiff) - { - return client.getRenderOverview().getWorldMapZoom(); - } - -} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/WorldMapMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/WorldMapMixin.java deleted file mode 100644 index bdd291b354..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/WorldMapMixin.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2018, Morgan Lewis - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.Point; -import net.runelite.api.coords.WorldPoint; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.rs.api.RSRenderOverview; -import net.runelite.rs.api.RSWorldMapManager; - -@Mixin(RSRenderOverview.class) -public abstract class WorldMapMixin implements RSRenderOverview -{ - @Override - @Inject - public Point getWorldMapPosition() - { - RSWorldMapManager worldMapManager = getWorldMapManager(); - int worldX = getWorldMapX() + worldMapManager.getSurfaceOffsetX(); - int worldY = getWorldMapY() + worldMapManager.getSurfaceOffsetY(); - return new Point(worldX, worldY); - } - - @Inject - public void setWorldMapPositionTarget(WorldPoint worldPoint) - { - setWorldMapPositionTarget(worldPoint.getX(), worldPoint.getY()); - } - -} diff --git a/runelite-mixins/src/test/java/net/runelite/mixins/RSSceneMixinTest.java b/runelite-mixins/src/test/java/net/runelite/mixins/RSSceneMixinTest.java deleted file mode 100644 index 54097331eb..0000000000 --- a/runelite-mixins/src/test/java/net/runelite/mixins/RSSceneMixinTest.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.coords.LocalPoint; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSPlayer; -import org.junit.Test; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -public class RSSceneMixinTest -{ - @Test - public void testWalkDistance() - { - RSClient client = mock(RSClient.class); - RSPlayer localPlayer = mock(RSPlayer.class); - when(client.getLocalPlayer()).thenReturn(localPlayer); - - when(localPlayer.getLocalLocation()).thenReturn(new LocalPoint(0, 0)); - - RSSceneMixin.client = client; - RSSceneMixin.setTargetTile(90, 0); - - verify(client).setSelectedSceneTileX(eq(45)); - verify(client).setSelectedSceneTileY(eq(0)); - } -} \ No newline at end of file diff --git a/runescape-api/pom.xml b/runescape-api/pom.xml deleted file mode 100644 index cfe8d98273..0000000000 --- a/runescape-api/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - 4.0.0 - - - net.runelite - runelite-parent - 1.5.29-SNAPSHOT - - - net.runelite.rs - runescape-api - RuneScape API - - - - net.runelite - runelite-api - ${project.version} - - - diff --git a/runescape-api/src/main/java/net/runelite/mapping/Construct.java b/runescape-api/src/main/java/net/runelite/mapping/Construct.java deleted file mode 100644 index a5b5b2541a..0000000000 --- a/runescape-api/src/main/java/net/runelite/mapping/Construct.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mapping; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Inject a method to create and construct an object. - * The object type is inferred from the return value - * of the method. - * - * {@code - * {@literal @}Construct - * RSIndexedImage createIndexedImage(); - * } - * - * @author Adam - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.METHOD) -@Documented -public @interface Construct -{ - -} diff --git a/runescape-api/src/main/java/net/runelite/mapping/Import.java b/runescape-api/src/main/java/net/runelite/mapping/Import.java deleted file mode 100644 index 97e4e81d7f..0000000000 --- a/runescape-api/src/main/java/net/runelite/mapping/Import.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mapping; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Retention(RetentionPolicy.RUNTIME) -@Target( -{ - ElementType.FIELD, ElementType.METHOD -}) -public @interface Import -{ - String value(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java b/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java deleted file mode 100644 index 801cf4413a..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.Actor; -import net.runelite.mapping.Import; - -public interface RSActor extends RSRenderable, Actor -{ - @Import("interacting") - int getRSInteracting(); - - @Import("overhead") - @Override - String getOverheadText(); - - @Import("overhead") - @Override - void setOverheadText(String overheadText); - - @Import("x") - int getX(); - - @Import("y") - int getY(); - - @Import("pathX") - int[] getPathX(); - - @Import("pathY") - int[] getPathY(); - - @Import("animation") - @Override - int getAnimation(); - - @Import("animation") - @Override - void setAnimation(int animation); - - @Import("graphic") - @Override - int getGraphic(); - - @Import("graphic") - @Override - void setGraphic(int graphic); - - @Import("combatInfoList") - RSCombatInfoList getCombatInfoList(); - - @Import("orientation") - @Override - int getOrientation(); - - @Import("logicalHeight") - @Override - int getLogicalHeight(); - - @Import("idlePoseAnimation") - @Override - void setIdlePoseAnimation(int animation); - - @Import("poseAnimation") - @Override - void setPoseAnimation(int animation); - - @Import("actionFrame") - int getActionFrame(); - - @Import("actionFrame") - @Override - void setActionFrame(int frame); - - @Import("actionFrameCycle") - int getActionFrameCycle(); - - @Import("poseFrame") - int getPoseFrame(); - - @Import("poseFrame") - void setPoseFrame(int frame); - - @Import("poseFrameCycle") - int getPoseFrameCycle(); - - @Import("spotAnimFrame") - int getSpotAnimFrame(); - - @Import("spotAnimFrame") - @Override - void setSpotAnimFrame(int frame); - - @Import("spotAnimFrameCycle") - int getSpotAnimFrameCycle(); - - @Import("hitsplatValues") - int[] getHitsplatValues(); - - @Import("hitsplatTypes") - int[] getHitsplatTypes(); - - @Import("hitsplatCycles") - int[] getHitsplatCycles(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSAudioTaskNode.java b/runescape-api/src/main/java/net/runelite/rs/api/RSAudioTaskNode.java deleted file mode 100644 index 9a90fc7883..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSAudioTaskNode.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2018, trimbe - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.mapping.Import; - -public interface RSAudioTaskNode -{ - @Import("setNumLoops") - void setNumLoops(int numLoops); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSAudioTaskNodeQueue.java b/runescape-api/src/main/java/net/runelite/rs/api/RSAudioTaskNodeQueue.java deleted file mode 100644 index 2a50e79471..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSAudioTaskNodeQueue.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2018, trimbe - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.mapping.Import; - -public interface RSAudioTaskNodeQueue -{ - @Import("queueAudioTaskNode") - void queueAudioTaskNode(RSTaskDataNode taskDataNode); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSBuffer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSBuffer.java deleted file mode 100644 index 0c357c3fee..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSBuffer.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.mapping.Import; - -public interface RSBuffer extends RSNode -{ - @Import("payload") - byte[] getPayload(); - - @Import("offset") - int getOffset(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSBufferProvider.java b/runescape-api/src/main/java/net/runelite/rs/api/RSBufferProvider.java deleted file mode 100644 index c46cfa6b7c..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSBufferProvider.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.BufferProvider; -import net.runelite.mapping.Import; - -public interface RSBufferProvider extends BufferProvider -{ - @Import("pixels") - @Override - int[] getPixels(); - - @Import("width") - @Override - int getWidth(); - - @Import("height") - @Override - int getHeight(); - - @Import("setRaster") - void setRaster(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSCacheableNode.java b/runescape-api/src/main/java/net/runelite/rs/api/RSCacheableNode.java deleted file mode 100644 index 44d7b876cc..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSCacheableNode.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.mapping.Import; - -public interface RSCacheableNode extends RSNode -{ - @Import("unlinkDual") - void unlinkDual(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSChatLineBuffer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSChatLineBuffer.java deleted file mode 100644 index 9aa9b35c3b..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSChatLineBuffer.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2017. l2- - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package net.runelite.rs.api; - -import net.runelite.api.ChatLineBuffer; -import net.runelite.api.MessageNode; -import net.runelite.mapping.Import; - -public interface RSChatLineBuffer extends ChatLineBuffer -{ - @Import("lines") - @Override - MessageNode[] getLines(); - - @Import("length") - @Override - int getLength(); - - @Import("length") - void setLength(int length); -} \ No newline at end of file diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSChatPlayer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSChatPlayer.java deleted file mode 100644 index 0a6824b2e3..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSChatPlayer.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2016-2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.ChatPlayer; -import net.runelite.mapping.Import; - -public interface RSChatPlayer extends ChatPlayer, RSNameable -{ - @Import("world") - @Override - int getWorld(); - - @Import("rank") - int getRSRank(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClanMember.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClanMember.java deleted file mode 100644 index ba65238fa4..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClanMember.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.ClanMember; - -public interface RSClanMember extends RSChatPlayer, ClanMember -{ -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClanMemberManager.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClanMemberManager.java deleted file mode 100644 index 36a486c28b..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClanMemberManager.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.mapping.Import; - -public interface RSClanMemberManager extends RSNameableContainer -{ - @Import("clanOwner") - String getClanOwner(); - - @Import("clanChatName") - String getClanChatName(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClassInfo.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClassInfo.java deleted file mode 100644 index 52dbd172d1..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClassInfo.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import net.runelite.mapping.Import; - -public interface RSClassInfo -{ - @Import("methods") - Method[] getMethods(); - - @Import("fields") - Field[] getFields(); - - @Import("args") - byte[][][] getArgs(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java deleted file mode 100644 index e4833e1830..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ /dev/null @@ -1,1016 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import java.util.Map; -import net.runelite.api.Client; -import net.runelite.api.SpritePixels; -import net.runelite.api.World; -import net.runelite.api.widgets.Widget; -import net.runelite.mapping.Construct; -import net.runelite.mapping.Import; - -public interface RSClient extends RSGameEngine, Client -{ - @Import("cameraX") - @Override - int getCameraX(); - - @Import("cameraY") - @Override - int getCameraY(); - - @Import("cameraZ") - @Override - int getCameraZ(); - - @Import("cameraX2") - @Override - int getCameraX2(); - - @Import("cameraY2") - @Override - int getCameraY2(); - - @Import("cameraZ2") - @Override - int getCameraZ2(); - - @Import("plane") - @Override - int getPlane(); - - @Import("cameraPitch") - @Override - int getCameraPitch(); - - @Import("cameraPitch") - void setCameraPitch(int cameraPitch); - - @Import("cameraYaw") - @Override - int getCameraYaw(); - - @Import("world") - int getWorld(); - - @Import("FPS") - @Override - int getFPS(); - - @Import("mapAngle") - @Override - int getMapAngle(); - - @Import("tileHeights") - @Override - int[][][] getTileHeights(); - - @Import("tileSettings") - @Override - byte[][][] getTileSettings(); - - @Import("clientVarps") - @Override - int[] getVarps(); - - @Import("varcs") - RSVarcs getVarcs(); - - @Import("energy") - @Override - int getEnergy(); - - @Import("weight") - @Override - int getWeight(); - - @Import("baseX") - @Override - int getBaseX(); - - @Import("baseY") - @Override - int getBaseY(); - - @Import("boostedSkillLevels") - @Override - int[] getBoostedSkillLevels(); - - @Import("realSkillLevels") - @Override - int[] getRealSkillLevels(); - - @Import("skillExperiences") - @Override - int[] getSkillExperiences(); - - @Import("changedSkills") - int[] getChangedSkills(); - - @Import("changedSkillsCount") - int getChangedSkillsCount(); - - @Import("changedSkillsCount") - void setChangedSkillsCount(int i); - - @Import("gameState") - int getRSGameState(); - - @Import("checkClick") - void setCheckClick(boolean checkClick); - - @Import("mouseX2") - void setMouseCanvasHoverPositionX(int x); - - @Import("mouseY2") - void setMouseCanvasHoverPositionY(int y); - - @Import("mouseCurrentButton") - @Override - int getMouseCurrentButton(); - - @Import("selectedSceneTileX") - int getSelectedSceneTileX(); - - @Import("selectedSceneTileX") - void setSelectedSceneTileX(int selectedSceneTileX); - - @Import("selectedSceneTileY") - int getSelectedSceneTileY(); - - @Import("selectedSceneTileY") - void setSelectedSceneTileY(int selectedSceneTileY); - - @Import("draggingWidget") - @Override - boolean isDraggingWidget(); - - @Import("draggedWidget") - @Override - RSWidget getDraggedWidget(); - - @Import("draggedOnWidget") - @Override - RSWidget getDraggedOnWidget(); - - @Import("draggedOnWidget") - @Override - void setDraggedOnWidget(Widget widget); - - @Import("widgets") - RSWidget[][] getWidgets(); - - /** - * Gets an array of widgets that correspond to the passed group ID. - * - * @param groupId the group ID - * @return the widget group - * @see net.runelite.api.widgets.WidgetID - */ - RSWidget[] getGroup(int groupId); - - @Import("scene") - @Override - RSScene getScene(); - - @Import("localPlayer") - @Override - RSPlayer getLocalPlayer(); - - @Import("npcIndexesCount") - int getNpcIndexesCount(); - - @Import("npcIndices") - int[] getNpcIndices(); - - @Import("cachedNPCs") - @Override - RSNPC[] getCachedNPCs(); - - @Import("collisionMaps") - RSCollisionData[] getCollisionMaps(); - - @Import("playerIndexesCount") - int getPlayerIndexesCount(); - - @Import("playerIndices") - int[] getPlayerIndices(); - - @Import("cachedPlayers") - @Override - RSPlayer[] getCachedPlayers(); - - @Import("localInteractingIndex") - int getLocalInteractingIndex(); - - @Import("groundItemDeque") - RSDeque[][][] getGroundItemDeque(); - - @Import("projectiles") - RSDeque getProjectilesDeque(); - - @Import("graphicsObjectDeque") - RSDeque getGraphicsObjectDeque(); - - @Import("username") - @Override - String getUsername(); - - @Import("username") - @Override - void setUsername(String username); - - @Import("password") - @Override - void setPassword(String password); - - @Import("otp") - @Override - void setOtp(String otp); - - @Import("currentLoginField") - @Override - int getCurrentLoginField(); - - @Import("loginIndex") - @Override - int getLoginIndex(); - - @Import("playerOptions") - @Override - String[] getPlayerOptions(); - - @Import("playerOptionsPriorities") - @Override - boolean[] getPlayerOptionsPriorities(); - - @Import("playerMenuTypes") - @Override - int[] getPlayerMenuTypes(); - - @Import("mouseX") - int getMouseX(); - - @Import("mouseY") - int getMouseY(); - - @Import("mouseX2") - int getMouseX2(); - - @Import("mouseY2") - int getMouseY2(); - - @Import("containsBounds") - boolean containsBounds(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7); - - @Import("checkClick") - boolean isCheckClick(); - - @Import("menuOptionCount") - int getMenuOptionCount(); - - @Import("menuOptionCount") - void setMenuOptionCount(int menuOptionCount); - - @Import("menuOptions") - String[] getMenuOptions(); - - @Import("menuTargets") - String[] getMenuTargets(); - - @Import("menuIdentifiers") - int[] getMenuIdentifiers(); - - @Import("menuTypes") - int[] getMenuTypes(); - - @Import("menuActionParams0") - int[] getMenuActionParams0(); - - @Import("menuActionParams1") - int[] getMenuActionParams1(); - - @Import("menuForceLeftClick") - boolean[] getMenuForceLeftClick(); - - @Import("worldList") - @Override - RSWorld[] getWorldList(); - - @Import("addChatMessage") - void addChatMessage(int type, String name, String message, String sender); - - @Override - @Import("getObjectDefinition") - RSObjectComposition getObjectDefinition(int objectId); - - @Override - @Import("getNpcDefinition") - RSNPCComposition getNpcDefinition(int npcId); - - @Import("scale") - @Override - int getScale(); - - @Import("canvasHeight") - @Override - int getCanvasHeight(); - - @Import("canvasWidth") - @Override - int getCanvasWidth(); - - @Import("viewportHeight") - @Override - int getViewportHeight(); - - @Import("viewportWidth") - @Override - int getViewportWidth(); - - @Import("Viewport_xOffset") - @Override - int getViewportXOffset(); - - @Import("Viewport_yOffset") - @Override - int getViewportYOffset(); - - @Import("isResized") - @Override - boolean isResized(); - - @Import("widgetPositionX") - @Override - int[] getWidgetPositionsX(); - - @Import("widgetPositionY") - @Override - int[] getWidgetPositionsY(); - - @Import("itemContainers") - RSHashTable getItemContainers(); - - @Import("getItemDefinition") - @Override - RSItemComposition getItemDefinition(int itemId); - - @Import("createSprite") - RSSpritePixels createItemSprite(int itemId, int quantity, int thickness, int borderColor, int stackable, boolean noted); - - @Import("decodeSprite") - void decodeSprite(byte[] data); - - @Import("indexedSpriteCount") - int getIndexedSpriteCount(); - - @Import("indexedSpriteWidth") - int getIndexedSpriteWidth(); - - @Import("indexedSpriteHeight") - int getIndexedSpriteHeight(); - - @Import("indexedSpriteOffsetXs") - int[] getIndexedSpriteOffsetXs(); - - @Import("indexedSpriteOffsetXs") - void setIndexedSpriteOffsetXs(int[] indexedSpriteOffsetXs); - - @Import("indexedSpriteOffsetYs") - int[] getIndexedSpriteOffsetYs(); - - @Import("indexedSpriteOffsetYs") - void setIndexedSpriteOffsetYs(int[] indexedSpriteOffsetYs); - - @Import("indexSpriteWidths") - int[] getIndexSpriteWidths(); - - @Import("indexSpriteWidths") - void setIndexSpriteWidths(int[] indexSpriteWidths); - - @Import("indexedSpriteHeights") - int[] getIndexedSpriteHeights(); - - @Import("indexedSpriteHeights") - void setIndexedSpriteHeights(int[] indexedSpriteHeights); - - @Import("spritePixels") - byte[][] getSpritePixels(); - - @Import("spritePixels") - void setSpritePixels(byte[][] spritePixels); - - @Import("indexedSpritePalette") - int[] getIndexedSpritePalette(); - - @Import("indexedSpritePalette") - void setIndexSpritePalette(int[] indexSpritePalette); - - @Import("indexSprites") - @Override - RSIndexDataBase getIndexSprites(); - - @Import("indexScripts") - @Override - RSIndexDataBase getIndexScripts(); - - @Import("widgetFlags") - @Override - RSHashTable getWidgetFlags(); - - @Import("componentTable") - @Override - RSHashTable getComponentTable(); - - @Import("grandExchangeOffers") - RSGrandExchangeOffer[] getGrandExchangeOffers(); - - @Import("isMenuOpen") - @Override - boolean isMenuOpen(); - - @Import("gameCycle") - @Override - int getGameCycle(); - - @Import("packetHandler") - void packetHandler(); - - @Import("chatLineMap") - @Override - Map getChatLineMap(); - - @Import("messages") - @Override - RSIterableHashTable getMessages(); - - @Import("revision") - @Override - int getRevision(); - - @Import("mapRegions") - @Override - int[] getMapRegions(); - - @Import("instanceTemplateChunks") - @Override - int[][][] getInstanceTemplateChunks(); - - @Import("xteaKeys") - @Override - int[][] getXteaKeys(); - - @Import("gameDrawingMode") - @Override - int getGameDrawingMode(); - - @Import("gameDrawingMode") - @Override - void setGameDrawingMode(int gameDrawingMode); - - @Import("cycleCntr") - int getCycleCntr(); - - @Import("chatCycle") - void setChatCycle(int value); - - /** - * Get the widget top group. widgets[topGroup] contains widgets with - * parentId -1, which are the widget roots. - * - * @return - */ - @Import("widgetRoot") - int getWidgetRoot(); - - @Import("mapElementConfigs") - @Override - RSMapElementConfig[] getMapElementConfigs(); - - @Import("mapscene") - @Override - RSIndexedSprite[] getMapScene(); - - @Import("mapIcons") - @Override - RSSpritePixels[] getMapIcons(); - - @Import("mapDots") - RSSpritePixels[] getMapDots(); - - @Import("modIcons") - @Override - RSIndexedSprite[] getModIcons(); - - @Import("modIcons") - void setRSModIcons(RSIndexedSprite[] modIcons); - - @Construct - @Override - RSIndexedSprite createIndexedSprite(); - - @Construct - @Override - RSSpritePixels createSpritePixels(int[] pixels, int width, int height); - - @Import("destinationX") - int getDestinationX(); - - @Import("destinationY") - int getDestinationY(); - - @Import("audioEffects") - RSSoundEffect[] getAudioEffects(); - - @Import("queuedSoundEffectIDs") - int[] getQueuedSoundEffectIDs(); - - @Import("soundLocations") - int[] getSoundLocations(); - - @Import("queuedSoundEffectLoops") - int[] getQueuedSoundEffectLoops(); - - @Import("queuedSoundEffectDelays") - int[] getQueuedSoundEffectDelays(); - - @Import("queuedSoundEffectCount") - int getQueuedSoundEffectCount(); - - @Import("queuedSoundEffectCount") - void setQueuedSoundEffectCount(int queuedSoundEffectCount); - - @Import("queueSoundEffect") - void queueSoundEffect(int id, int numLoops, int delay); - - @Import("rasterProvider") - @Override - RSBufferProvider getBufferProvider(); - - @Import("mouseIdleTicks") - @Override - int getMouseIdleTicks(); - - @Import("mouseLastPressedTimeMillis") - @Override - long getMouseLastPressedMillis(); - - @Import("keyboardIdleTicks") - @Override - int getKeyboardIdleTicks(); - - @Import("lowMemory") - void setLowMemory(boolean lowMemory); - - @Import("sceneLowMemory") - void setSceneLowMemory(boolean lowMemory); - - @Import("audioHighMemory") - void setAudioHighMemory(boolean highMemory); - - @Import("objectCompositionLowDetail") - void setObjectCompositionLowDetail(boolean lowDetail); - - @Construct - RSItem createItem(); - - @Import("intStackSize") - @Override - int getIntStackSize(); - - @Import("intStackSize") - @Override - void setIntStackSize(int stackSize); - - @Import("intStack") - @Override - int[] getIntStack(); - - @Import("scriptStringStackSize") - @Override - int getStringStackSize(); - - @Import("scriptStringStackSize") - @Override - void setStringStackSize(int stackSize); - - @Import("scriptStringStack") - @Override - String[] getStringStack(); - - @Import("friendManager") - RSFriendManager getFriendManager(); - - @Import("clanMemberManager") - RSClanMemberManager getClanMemberManager(); - - @Import("loginType") - RSJagexLoginType getLoginType(); - - @Construct - RSName createName(String name, RSJagexLoginType type); - - @Import("getVarbit") - int getVarbit(int varbitId); - - @Import("varbits") - RSNodeCache getVarbitCache(); - - @Import("preferences") - @Override - RSPreferences getPreferences(); - - /** - * This is the pitch the user has set the camera to. - * It should be between 128 and (pitchUnlimiter?512:383) JAUs(1). - * The difference between this and cameraPitch is that cameraPitch has a lower limit, imposed by the surrounding - * terrain. - * - * (1) JAU - Jagex Angle Unit; 1/1024 of a revolution - */ - @Import("cameraPitchTarget") - int getCameraPitchTarget(); - - @Import("cameraPitchTarget") - void setCameraPitchTarget(int pitch); - - @Import("pitchSin") - void setPitchSin(int v); - - @Import("pitchCos") - void setPitchCos(int v); - - @Import("yawSin") - void setYawSin(int v); - - @Import("yawCos") - void setYawCos(int v); - - @Import("Rasterizer3D_zoom") - @Override - int get3dZoom(); - - @Import("Rasterizer3D_zoom") - void set3dZoom(int zoom); - - @Import("Rasterizer3D_clipMidX2") - @Override - int getRasterizer3D_clipMidX2(); - - @Import("Rasterizer3D_clipNegativeMidX") - @Override - int getRasterizer3D_clipNegativeMidX(); - - @Import("Rasterizer3D_clipNegativeMidY") - @Override - int getRasterizer3D_clipNegativeMidY(); - - @Import("Rasterizer3D_clipMidY2") - @Override - int getRasterizer3D_clipMidY2(); - - @Import("centerX") - @Override - int getCenterX(); - - @Import("centerY") - @Override - int getCenterY(); - - @Import("renderOverview") - RSRenderOverview getRenderOverview(); - - @Import("changeWorld") - @Override - void changeWorld(World world); - - @Construct - @Override - RSWorld createWorld(); - - @Import("animOffsetX") - void setAnimOffsetX(int animOffsetX); - - @Import("animOffsetY") - void setAnimOffsetY(int animOffsetY); - - @Import("animOffsetZ") - void setAnimOffsetZ(int animOffsetZ); - - @Import("getFrames") - RSFrames getFrames(int frameId); - - @Import("minimapSprite") - RSSpritePixels getMinimapSprite(); - - @Import("minimapSprite") - void setMinimapSprite(SpritePixels spritePixels); - - @Import("drawObject") - void drawObject(int z, int x, int y, int randomColor1, int randomColor2); - - @Construct - RSScriptEvent createScriptEvent(); - - @Import("runScript") - void runScript(RSScriptEvent ev, int ex); - - @Import("hintArrowTargetType") - void setHintArrowTargetType(int value); - - @Import("hintArrowTargetType") - int getHintArrowTargetType(); - - @Import("hintArrowX") - void setHintArrowX(int value); - - @Import("hintArrowX") - int getHintArrowX(); - - @Import("hintArrowY") - void setHintArrowY(int value); - - @Import("hintArrowY") - int getHintArrowY(); - - @Import("hintArrowOffsetX") - void setHintArrowOffsetX(int value); - - @Import("hintArrowOffsetY") - void setHintArrowOffsetY(int value); - - @Import("hintArrowNpcTargetIdx") - void setHintArrowNpcTargetIdx(int value); - - @Import("hintArrowNpcTargetIdx") - int getHintArrowNpcTargetIdx(); - - @Import("hintArrowPlayerTargetIdx") - void setHintArrowPlayerTargetIdx(int value); - - @Import("hintArrowPlayerTargetIdx") - int getHintArrowPlayerTargetIdx(); - - @Import("isDynamicRegion") - @Override - boolean isInInstancedRegion(); - - @Import("itemPressedDuration") - @Override - int getItemPressedDuration(); - - @Import("itemPressedDuration") - void setItemPressedDuration(int duration); - - @Import("flags") - int getFlags(); - - @Import("compass") - void setCompass(SpritePixels spritePixels); - - @Import("widgetSpriteCache") - @Override - RSNodeCache getWidgetSpriteCache(); - - @Import("items") - @Override - RSNodeCache getItemCompositionCache(); - - @Import("oculusOrbState") - @Override - int getOculusOrbState(); - - @Import("oculusOrbState") - @Override - void setOculusOrbState(int state); - - @Import("oculusOrbNormalSpeed") - @Override - void setOculusOrbNormalSpeed(int state); - - @Import("lookingAtX") - @Override - int getOculusOrbFocalPointX(); - - @Import("lookingAtY") - @Override - int getOculusOrbFocalPointY(); - - RSItem getLastItemDespawn(); - - void setLastItemDespawn(RSItem lastItemDespawn); - - @Construct - RSWidget createWidget(); - - @Import("revalidateWidget") - void revalidateWidget(Widget w); - - @Import("revalidateWidgetScroll") - void revalidateWidgetScroll(Widget[] group, Widget w, boolean postEvent); - - @Import("menuAction") - void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7); - - @Import("Viewport_entityCountAtMouse") - int getEntitiesAtMouseCount(); - - @Import("Viewport_entityCountAtMouse") - void setEntitiesAtMouseCount(int i); - - @Import("Viewport_entitiesAtMouse") - long[] getEntitiesAtMouse(); - - @Import("Viewport_mouseX") - int getViewportMouseX(); - - @Import("Viewport_mouseY") - int getViewportMouseY(); - - @Import("textureProvider") - @Override - RSTextureProvider getTextureProvider(); - - @Import("occupiedTilesTick") - int[][] getOccupiedTilesTick(); - - @Import("cachedModels2") - RSNodeCache getCachedModels2(); - - @Import("cycle") - int getCycle(); - - @Import("cycle") - void setCycle(int cycle); - - @Import("visibilityMaps") - boolean[][][][] getVisibilityMaps(); - - @Import("renderArea") - void setRenderArea(boolean[][] renderArea); - - @Import("cameraX2") - void setCameraX2(int cameraX2); - - @Import("cameraY2") - void setCameraY2(int cameraY2); - - @Import("cameraZ2") - void setCameraZ2(int cameraZ2); - - @Import("screenCenterX") - void setScreenCenterX(int screenCenterX); - - @Import("screenCenterZ") - void setScreenCenterZ(int screenCenterZ); - - @Import("Scene_plane") - void setScenePlane(int scenePlane); - - @Import("minTileX") - void setMinTileX(int i); - - @Import("minTileZ") - void setMinTileZ(int i); - - @Import("maxTileX") - void setMaxTileX(int i); - - @Import("maxTileZ") - void setMaxTileZ(int i); - - @Import("tileUpdateCount") - int getTileUpdateCount(); - - @Import("tileUpdateCount") - void setTileUpdateCount(int tileUpdateCount); - - @Import("Viewport_containsMouse") - boolean getViewportContainsMouse(); - - @Import("graphicsPixels") - int[] getGraphicsPixels(); - - @Import("graphicsPixelsWidth") - int getGraphicsPixelsWidth(); - - @Import("graphicsPixelsHeight") - int getGraphicsPixelsHeight(); - - @Import("fillRectangle") - void RasterizerFillRectangle(int x, int y, int w, int h, int rgb); - - @Import("startX") - int getStartX(); - - @Import("startY") - int getStartY(); - - @Import("endX") - int getEndX(); - - @Import("endY") - int getEndY(); - - @Import("if1DraggedWidget") - @Override - RSWidget getIf1DraggedWidget(); - - @Import("if1DraggedItemIndex") - @Override - int getIf1DraggedItemIndex(); - - @Import("spellSelected") - @Override - void setSpellSelected(boolean selected); - - @Import("getEnum") - RSEnum getRsEnum(int id); - - @Import("menuX") - int getMenuX(); - - @Import("menuY") - int getMenuY(); - - @Import("menuHeight") - int getMenuHeight(); - - @Import("menuWidth") - int getMenuWidth(); - - @Import("fontBold12") - RSFont getFontBold12(); - - @Import("drawHorizontalLine") - void RasterizerDrawHorizontalLine(int x, int y, int w, int rgb); - - @Import("drawVerticalLine") - void RasterizerDrawVerticalLine(int x, int y, int h, int rgb); - - @Import("drawGradient") - void RasterizerDrawGradient(int x, int y, int w, int h, int rgbTop, int rgbBottom); - - @Import("fillRectangleAlpha") - void RasterizerFillRectangleAlpha(int x, int y, int w, int h, int rgb, int a); - - @Import("drawRectangle") - void RasterizerDrawRectangle(int x, int y, int w, int h, int rgb); - - @Import("drawCircle") - void RasterizerDrawCircle(int x, int y, int r, int rgb); - - @Import("healthbarCache") - RSNodeCache getHealthBarCache(); - - @Import("healthBarSpriteCache") - RSNodeCache getHealthBarSpriteCache(); - - @Import("getTrack") - RSSoundEffect getTrack(RSIndexData indexData, int id, int var0); - - @Import("createSoundEffectAudioTaskNode") - RSAudioTaskNode createSoundEffectAudioTaskNode(RSRawAudioNode audioNode, int var0, int volume); - - @Import("soundEffectAudioQueue") - RSAudioTaskNodeQueue getSoundEffectAudioQueue(); - - @Import("indexCache4") - RSIndexData getIndexCache4(); - - @Import("soundEffectResampler") - RSResampler getSoundEffectResampler(); - - @Import("soundEffectVolume") - int getSoundEffectVolume(); - - @Import("viewportWalking") - void setViewportWalking(boolean viewportWalking); - - @Import("crossSprites") - @Override - RSSpritePixels[] getCrossSprites(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSCollisionData.java b/runescape-api/src/main/java/net/runelite/rs/api/RSCollisionData.java deleted file mode 100644 index 8df6236650..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSCollisionData.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.CollisionData; -import net.runelite.mapping.Import; - -public interface RSCollisionData extends CollisionData -{ - @Import("flags") - int[][] getFlags(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfo1.java b/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfo1.java deleted file mode 100644 index 7f9519718b..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfo1.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.mapping.Import; - -public interface RSCombatInfo1 -{ - @Import("healthRatio") - int getHealthRatio(); - - @Import("health") - int getHealth(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoList.java b/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoList.java deleted file mode 100644 index 297556f8ec..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoList.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.mapping.Import; - -/** - * Created by bold on 2/2/17. - */ -public interface RSCombatInfoList -{ - @Import("node") - RSNode getNode(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoListHolder.java b/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoListHolder.java deleted file mode 100644 index dcfab0d976..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoListHolder.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.mapping.Import; - -public interface RSCombatInfoListHolder extends RSNode -{ - @Import("combatInfo1") - RSCombatInfoList getCombatInfo1(); - - @Import("healthBar") - RSHealthBar getHealthBar(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSDecorativeObject.java b/runescape-api/src/main/java/net/runelite/rs/api/RSDecorativeObject.java deleted file mode 100644 index 910c5acc1b..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSDecorativeObject.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.DecorativeObject; -import net.runelite.mapping.Import; - -public interface RSDecorativeObject extends DecorativeObject -{ - @Import("hash") - @Override - long getHash(); - - @Import("x") - int getX(); - - @Import("y") - int getY(); - - @Import("offsetX") - int getXOffset(); - - @Import("offsetY") - int getYOffset(); - - @Import("rotation") - int getOrientation(); - - @Import("renderable1") - @Override - RSRenderable getRenderable(); - - @Import("renderable2") - @Override - RSRenderable getRenderable2(); - - void setPlane(int plane); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSDeque.java b/runescape-api/src/main/java/net/runelite/rs/api/RSDeque.java deleted file mode 100644 index 9a0c2aa303..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSDeque.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.mapping.Import; - -public interface RSDeque -{ - @Import("current") - RSNode getCurrent(); - - @Import("head") - RSNode getHead(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSDynamicObject.java b/runescape-api/src/main/java/net/runelite/rs/api/RSDynamicObject.java deleted file mode 100644 index 4d18bdd26a..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSDynamicObject.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.Renderable; -import net.runelite.mapping.Import; - -public interface RSDynamicObject extends Renderable, RSRenderable -{ - @Import("id") - int getId(); - - @Import("animFrame") - int getAnimFrame(); - - @Import("animFrame") - void setAnimFrame(int frame); - - @Import("animCycleCount") - int getAnimCycleCount(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSEnum.java b/runescape-api/src/main/java/net/runelite/rs/api/RSEnum.java deleted file mode 100644 index afad5c131e..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSEnum.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2019, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.EnumComposition; -import net.runelite.mapping.Import; - -public interface RSEnum extends EnumComposition, RSCacheableNode -{ - @Import("keys") - @Override - int[] getKeys(); - - @Import("intVals") - @Override - int[] getIntVals(); - - @Import("stringVals") - @Override - String[] getStringVals(); - - @Import("defaultInt") - int getDefaultInt(); - - @Import("defaultString") - String getDefaultString(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFileOnDisk.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFileOnDisk.java deleted file mode 100644 index e7f07e34ee..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFileOnDisk.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import java.io.RandomAccessFile; -import net.runelite.mapping.Import; - -public interface RSFileOnDisk -{ - @Import("file") - RandomAccessFile getFile(); - - @Import("position") - long getPosition(); - - @Import("length") - long getLength(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFont.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFont.java deleted file mode 100644 index 243193302a..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFont.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2019, Ron Young - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package net.runelite.rs.api; - -public interface RSFont extends RSFontTypeFace -{ -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFontTypeFace.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFontTypeFace.java deleted file mode 100644 index 36fe246e0f..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFontTypeFace.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2018 Abex - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.FontTypeFace; -import net.runelite.mapping.Import; - -public interface RSFontTypeFace extends FontTypeFace -{ - @Import("getTextWidth") - @Override - int getTextWidth(String text); - - @Import("verticalSpace") - @Override - int getBaseline(); - - @Import("drawTextLeftAligned") - void drawTextLeftAligned(String text, int x, int y, int fontColor, int shadowColor); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFrame.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFrame.java deleted file mode 100644 index 6169518500..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFrame.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.mapping.Import; - -public interface RSFrame -{ - @Import("skin") - RSFrameMap getSkin(); - - @Import("transformCount") - int getTransformCount(); - - @Import("transformTypes") - int[] getTransformTypes(); - - @Import("translator_x") - int[] getTranslatorX(); - - @Import("translator_y") - int[] getTranslatorY(); - - @Import("translator_z") - int[] getTranslatorZ(); - - @Import("showing") - boolean isShowing(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFrameMap.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFrameMap.java deleted file mode 100644 index 215f3be17b..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFrameMap.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.mapping.Import; - -public interface RSFrameMap extends RSNode -{ - @Import("count") - int getCount(); - - @Import("types") - int[] getTypes(); - - @Import("list") - int[][] getList(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFrames.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFrames.java deleted file mode 100644 index 947549248d..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFrames.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.mapping.Import; - -public interface RSFrames extends RSCacheableNode -{ - @Import("skeletons") - RSFrame[] getFrames(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFriend.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFriend.java deleted file mode 100644 index 0948c5fc85..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFriend.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.Friend; - -public interface RSFriend extends Friend, RSChatPlayer -{ -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFriendContainer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFriendContainer.java deleted file mode 100644 index 2b3793f478..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFriendContainer.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -public interface RSFriendContainer extends RSNameableContainer -{ -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFriendManager.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFriendManager.java deleted file mode 100644 index 4ff789bc5b..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFriendManager.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.FriendManager; -import net.runelite.mapping.Import; - -public interface RSFriendManager extends FriendManager -{ - @Import("friendContainer") - RSFriendContainer getFriendContainer(); - - @Import("ignoreContainer") - RSIgnoreContainer getIgnoreContainer(); - - @Import("isFriended") - boolean isFriended(RSName var1, boolean var2); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSGameCanvas.java b/runescape-api/src/main/java/net/runelite/rs/api/RSGameCanvas.java deleted file mode 100644 index f23456261a..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSGameCanvas.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -public interface RSGameCanvas -{ -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSGameEngine.java b/runescape-api/src/main/java/net/runelite/rs/api/RSGameEngine.java deleted file mode 100644 index 87bc24ca15..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSGameEngine.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import java.awt.Canvas; -import net.runelite.api.GameEngine; -import net.runelite.mapping.Import; - -public interface RSGameEngine extends GameEngine -{ - @Import("canvas") - Canvas getCanvas(); - - @Import("post") - void post(Object canvas); - - @Import("resizeCanvas") - @Override - void resizeCanvas(); - - @Import("resizeCanvasNextFrame") - boolean isResizeCanvasNextFrame(); - - @Import("resizeCanvasNextFrame") - void setResizeCanvasNextFrame(boolean resize); - - @Import("replaceCanvasNextFrame") - boolean isReplaceCanvasNextFrame(); - - @Import("replaceCanvasNextFrame") - void setReplaceCanvasNextFrame(boolean replace); - - @Import("maxCanvasWidth") - void setMaxCanvasWidth(int width); - - @Import("maxCanvasHeight") - void setMaxCanvasHeight(int height); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSGameObject.java b/runescape-api/src/main/java/net/runelite/rs/api/RSGameObject.java deleted file mode 100644 index b77453c325..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSGameObject.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.GameObject; -import net.runelite.mapping.Import; - -public interface RSGameObject extends GameObject -{ - @Import("renderable") - RSRenderable getRenderable(); - - @Import("plane") - int getPlane(); - - @Import("relativeX") - int getRelativeX(); - - @Import("relativeY") - int getRelativeY(); - - @Import("offsetX") - int getOffsetX(); - - @Import("offsetY") - int getOffsetY(); - - @Import("x") - @Override - int getX(); - - @Import("y") - @Override - int getY(); - - @Import("height") - int getHeight(); - - @Import("orientation") - int getRsOrientation(); - - @Import("hash") - @Override - long getHash(); - - @Import("flags") - int getFlags(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSGrandExchangeOffer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSGrandExchangeOffer.java deleted file mode 100644 index d88e582ef7..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSGrandExchangeOffer.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.GrandExchangeOffer; -import net.runelite.mapping.Import; - -public interface RSGrandExchangeOffer extends GrandExchangeOffer -{ - @Import("quantitySold") - @Override - int getQuantitySold(); - - @Import("itemId") - @Override - int getItemId(); - - @Import("totalQuantity") - @Override - int getTotalQuantity(); - - @Import("price") - @Override - int getPrice(); - - @Import("spent") - @Override - int getSpent(); - - @Import("state") - byte getRSState(); - - -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSGraphicsObject.java b/runescape-api/src/main/java/net/runelite/rs/api/RSGraphicsObject.java deleted file mode 100644 index 2edde942f1..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSGraphicsObject.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2018, Woox - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.GraphicsObject; -import net.runelite.mapping.Import; - -public interface RSGraphicsObject extends GraphicsObject, RSRenderable -{ - @Import("id") - @Override - int getId(); - - @Import("x") - int getX(); - - @Import("y") - int getY(); - - @Import("startCycle") - @Override - int getStartCycle(); - - @Import("level") - @Override - int getLevel(); - - @Import("height") - @Override - int getHeight(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSGroundObject.java b/runescape-api/src/main/java/net/runelite/rs/api/RSGroundObject.java deleted file mode 100644 index efd272cdff..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSGroundObject.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.GroundObject; -import net.runelite.mapping.Import; - -public interface RSGroundObject extends GroundObject -{ - @Import("hash") - @Override - long getHash(); - - @Import("x") - int getX(); - - @Import("y") - int getY(); - - @Import("renderable") - @Override - RSRenderable getRenderable(); - - void setPlane(int plane); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSHashTable.java b/runescape-api/src/main/java/net/runelite/rs/api/RSHashTable.java deleted file mode 100644 index e1462ce1dd..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSHashTable.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.HashTable; -import net.runelite.mapping.Import; - -public interface RSHashTable extends HashTable -{ - @Import("get") - @Override - RSNode get(long value); - - @Import("size") - int getSize(); - - @Import("buckets") - RSNode[] getBuckets(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSHealthBar.java b/runescape-api/src/main/java/net/runelite/rs/api/RSHealthBar.java deleted file mode 100644 index ca9ff1419f..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSHealthBar.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.HealthBar; -import net.runelite.mapping.Import; - -public interface RSHealthBar extends RSCacheableNode, HealthBar -{ - @Import("healthScale") - int getHealthScale(); - - @Import("healthBarFrontSpriteId") - @Override - int getHealthBarFrontSpriteId(); - - @Import("getHealthBarFrontSprite") - @Override - RSSpritePixels getHealthBarFrontSprite(); - - @Import("getHealthBarBackSprite") - @Override - RSSpritePixels getHealthBarBackSprite(); - - @Import("healthBarPadding") - @Override - void setPadding(int padding); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIgnore.java b/runescape-api/src/main/java/net/runelite/rs/api/RSIgnore.java deleted file mode 100644 index f4c3c8150b..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSIgnore.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.Ignore; - -public interface RSIgnore extends Ignore, RSNameable -{ -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIgnoreContainer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSIgnoreContainer.java deleted file mode 100644 index 74fb4d5f37..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSIgnoreContainer.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -public interface RSIgnoreContainer extends RSNameableContainer -{ -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIndexData.java b/runescape-api/src/main/java/net/runelite/rs/api/RSIndexData.java deleted file mode 100644 index 6ec1b9d3b6..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSIndexData.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.mapping.Import; - -public interface RSIndexData extends RSIndexDataBase -{ - @Import("index") - int getIndex(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIndexDataBase.java b/runescape-api/src/main/java/net/runelite/rs/api/RSIndexDataBase.java deleted file mode 100644 index 26a5a507df..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSIndexDataBase.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.IndexDataBase; -import net.runelite.mapping.Import; - -public interface RSIndexDataBase extends IndexDataBase -{ - @Import("getConfigData") - byte[] getConfigData(int archiveId, int fileId); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIndexedSprite.java b/runescape-api/src/main/java/net/runelite/rs/api/RSIndexedSprite.java deleted file mode 100644 index 01988e04cc..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSIndexedSprite.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.IndexedSprite; -import net.runelite.mapping.Import; - -public interface RSIndexedSprite extends IndexedSprite -{ - @Import("pixels") - @Override - byte[] getPixels(); - - @Import("pixels") - @Override - void setPixels(byte[] pixels); - - @Import("palette") - @Override - int[] getPalette(); - - @Import("palette") - @Override - void setPalette(int[] palette); - - @Import("originalWidth") - @Override - int getOriginalWidth(); - - @Import("originalWidth") - @Override - void setOriginalWidth(int originalWidth); - - @Import("originalHeight") - @Override - int getOriginalHeight(); - - @Import("originalHeight") - @Override - void setOriginalHeight(int originalHeight); - - @Import("height") - @Override - int getHeight(); - - @Import("height") - @Override - void setHeight(int height); - - @Import("offsetX") - @Override - int getOffsetX(); - - @Import("offsetX") - @Override - void setOffsetX(int offsetX); - - @Import("offsetY") - @Override - int getOffsetY(); - - @Import("offsetY") - @Override - void setOffsetY(int offsetY); - - @Import("width") - @Override - int getWidth(); - - @Import("width") - @Override - void setWidth(int width); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIntegerNode.java b/runescape-api/src/main/java/net/runelite/rs/api/RSIntegerNode.java deleted file mode 100644 index 2f31190951..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSIntegerNode.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.IntegerNode; -import net.runelite.mapping.Import; - -public interface RSIntegerNode extends RSNode, IntegerNode -{ - @Import("value") - @Override - int getValue(); - - @Import("value") - @Override - void setValue(int value); -} \ No newline at end of file diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSItem.java b/runescape-api/src/main/java/net/runelite/rs/api/RSItem.java deleted file mode 100644 index 4f451cf028..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSItem.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.Item; -import net.runelite.api.Tile; -import net.runelite.mapping.Import; - -public interface RSItem extends RSRenderable, Item -{ - @Import("id") - @Override - int getId(); - - @Import("id") - void setId(int id); - - @Import("quantity") - @Override - int getQuantity(); - - @Import("quantity") - void setQuantity(int quantity); - - int getX(); - - void setX(int x); - - int getY(); - - void setY(int y); - - /** - * Get the tile this item is on - * @return - */ - Tile getTile(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSItemComposition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSItemComposition.java deleted file mode 100644 index fcc649ca72..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSItemComposition.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.ItemComposition; -import net.runelite.mapping.Import; - -/** - * ItemComposition is an interface that represents the various properties of an - * item. Imports several values from runescape-client/ItemComposition, and allows - * direct access to them by calling these methods. - */ -public interface RSItemComposition extends ItemComposition -{ - @Import("name") - @Override - String getName(); - - @Import("id") - @Override - int getId(); - - @Import("notedTemplate") - @Override - int getNote(); - - @Import("note") - @Override - int getLinkedNoteId(); - - @Import("placeholderId") - @Override - int getPlaceholderId(); - - @Import("placeholderTemplateId") - @Override - int getPlaceholderTemplateId(); - - @Import("price") - @Override - int getPrice(); - - @Import("isMembers") - @Override - boolean isMembers(); - - @Import("isTradable") - @Override - boolean isTradeable(); - - /** - * You probably want {@link #isStackable} - *

- * This is the {@code int} that client code uses internally to represent this true/false value. It appears to only ever be set to 1 or 0 - * @return 0 when this type of item isn't stackable, 1 otherwise - */ - @Import("isStackable") - int getIsStackable(); - - @Import("maleModel") - int getMaleModel(); - - @Import("inventoryActions") - @Override - String[] getInventoryActions(); - - @Import("getShiftClickActionIndex") - @Override - int getShiftClickActionIndex(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSItemContainer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSItemContainer.java deleted file mode 100644 index d84a50971b..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSItemContainer.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.ItemContainer; -import net.runelite.mapping.Import; - -public interface RSItemContainer extends RSNode, ItemContainer -{ - @Import("itemIds") - int[] getItemIds(); - - @Import("stackSizes") - int[] getStackSizes(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSItemLayer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSItemLayer.java deleted file mode 100644 index 4afd479296..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSItemLayer.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.ItemLayer; -import net.runelite.mapping.Import; - -public interface RSItemLayer extends ItemLayer -{ - @Import("x") - int getX(); - - @Import("y") - int getY(); - - @Import("hash") - @Override - long getHash(); - - @Import("height") - int getHeight(); - - @Import("bottom") - @Override - RSRenderable getBottom(); - - @Import("middle") - @Override - RSRenderable getMiddle(); - - @Import("top") - @Override - RSRenderable getTop(); - - void setPlane(int plane); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIterableHashTable.java b/runescape-api/src/main/java/net/runelite/rs/api/RSIterableHashTable.java deleted file mode 100644 index 404f2c32bb..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSIterableHashTable.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.IterableHashTable; -import net.runelite.mapping.Import; - -public interface RSIterableHashTable extends IterableHashTable -{ - @Import("get") - @Override - RSNode get(long hash); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSJagexLoginType.java b/runescape-api/src/main/java/net/runelite/rs/api/RSJagexLoginType.java deleted file mode 100644 index 5446d5d4bb..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSJagexLoginType.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -public interface RSJagexLoginType -{ - -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSKeyFocusListener.java b/runescape-api/src/main/java/net/runelite/rs/api/RSKeyFocusListener.java deleted file mode 100644 index 9ef296251b..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSKeyFocusListener.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import java.awt.event.FocusListener; -import java.awt.event.KeyListener; -import net.runelite.api.KeyFocusListener; - -public interface RSKeyFocusListener extends KeyListener, FocusListener, KeyFocusListener -{ -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSMainBufferProvider.java b/runescape-api/src/main/java/net/runelite/rs/api/RSMainBufferProvider.java deleted file mode 100644 index 8b27911a27..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSMainBufferProvider.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import java.awt.Component; -import java.awt.Image; -import net.runelite.api.MainBufferProvider; -import net.runelite.mapping.Import; - -public interface RSMainBufferProvider extends RSBufferProvider, MainBufferProvider -{ - @Import("image") - @Override - Image getImage(); - - @Import("image") - void setImage(Image image); - - @Import("canvas") - Component getCanvas(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSMapElementConfig.java b/runescape-api/src/main/java/net/runelite/rs/api/RSMapElementConfig.java deleted file mode 100644 index 028f5269a5..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSMapElementConfig.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.MapElementConfig; -import net.runelite.mapping.Import; - -public interface RSMapElementConfig extends RSCacheableNode, MapElementConfig -{ - @Import("getMapIcon") - @Override - RSSpritePixels getMapIcon(boolean var1); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSMessageNode.java b/runescape-api/src/main/java/net/runelite/rs/api/RSMessageNode.java deleted file mode 100644 index f673e58c7a..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSMessageNode.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.MessageNode; -import net.runelite.mapping.Import; - -public interface RSMessageNode extends MessageNode -{ - @Import("id") - @Override - int getId(); - - @Import("type") - int getRSType(); - - @Import("name") - @Override - String getName(); - - @Import("name") - @Override - void setName(String name); - - @Import("sender") - @Override - String getSender(); - - @Import("sender") - @Override - void setSender(String sender); - - @Import("value") - @Override - String getValue(); - - @Import("value") - @Override - void setValue(String value); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSModel.java b/runescape-api/src/main/java/net/runelite/rs/api/RSModel.java deleted file mode 100644 index a447b080c1..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSModel.java +++ /dev/null @@ -1,173 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import java.awt.Polygon; -import net.runelite.api.Model; -import net.runelite.mapping.Import; - -public interface RSModel extends RSRenderable, Model -{ - @Import("verticesCount") - @Override - int getVerticesCount(); - - @Import("verticesX") - @Override - int[] getVerticesX(); - - @Import("verticesY") - @Override - int[] getVerticesY(); - - @Import("verticesZ") - @Override - int[] getVerticesZ(); - - @Import("indicesCount") - @Override - int getTrianglesCount(); - - @Import("indices1") - @Override - int[] getTrianglesX(); - - @Import("indices2") - @Override - int[] getTrianglesY(); - - @Import("indices3") - @Override - int[] getTrianglesZ(); - - @Import("faceColors1") - @Override - int[] getFaceColors1(); - - @Import("faceColors2") - @Override - int[] getFaceColors2(); - - @Import("faceColors3") - @Override - int[] getFaceColors3(); - - @Import("triangleTransparencies") - @Override - byte[] getTriangleTransparencies(); - - @Import("faceRenderPriorities") - @Override - byte[] getFaceRenderPriorities(); - - @Import("vertexGroups") - int[][] getVertexGroups(); - - @Import("modelHeight") - @Override - int getModelHeight(); - - @Import("animate") - void animate(int type, int[] list, int x, int y, int z); - - @Import("calculateBoundsCylinder") - @Override - void calculateBoundsCylinder(); - - @Import("calculateExtreme") - @Override - void calculateExtreme(int orientation); - - @Import("resetBounds") - void resetBounds(); - - @Import("toSharedModel") - RSModel toSharedModel(boolean b); - - @Import("toSharedSpotAnimModel") - RSModel toSharedSpotAnimModel(boolean b); - - @Import("rotateY90Ccw") - void rotateY90Ccw(); - - @Import("rotateY180Ccw") - void rotateY180Ccw(); - - @Import("rotateY270Ccw") - void rotateY270Ccw(); - - @Import("isClickable") - boolean isClickable(); - - @Import("radius") - @Override - int getRadius(); - - @Import("centerX") - @Override - int getCenterX(); - - @Import("centerY") - @Override - int getCenterY(); - - @Import("centerZ") - @Override - int getCenterZ(); - - @Import("extremeX") - @Override - int getExtremeX(); - - @Import("extremeY") - @Override - int getExtremeY(); - - @Import("extremeZ") - @Override - int getExtremeZ(); - - @Import("faceTextures") - @Override - short[] getFaceTextures(); - - @Import("XYZMag") - @Override - int getXYZMag(); - - void interpolateFrames(RSFrames frames, int frameId, RSFrames nextFrames, int nextFrameId, int interval, - int intervalCount); - - /** - * Compute the convex hull of this model - */ - Polygon getConvexHull(int localX, int localY, int orientation, int tileHeight); - - float[][] getFaceTextureUCoordinates(); - void setFaceTextureUCoordinates(float[][] rl$faceTextureUCoordinates); - - float[][] getFaceTextureVCoordinates(); - void setFaceTextureVCoordinates(float[][] rl$faceTextureVCoordinates); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSModelData.java b/runescape-api/src/main/java/net/runelite/rs/api/RSModelData.java deleted file mode 100644 index 4503e75729..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSModelData.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.mapping.Import; - -public interface RSModelData extends RSRenderable -{ - @Import("triangleFaceCount") - int getTriangleFaceCount(); - - @Import("trianglePointsX") - int[] getTrianglePointsX(); - - @Import("trianglePointsY") - int[] getTrianglePointsY(); - - @Import("trianglePointsZ") - int[] getTrianglePointsZ(); - - @Import("vertexX") - int[] getVertexX(); - - @Import("vertexY") - int[] getVertexY(); - - @Import("vertexZ") - int[] getVertexZ(); - - @Import("texTriangleX") - short[] getTexTriangleX(); - - @Import("texTriangleY") - short[] getTexTriangleY(); - - @Import("texTriangleZ") - short[] getTexTriangleZ(); - - @Import("faceTextures") - short[] getFaceTextures(); - - @Import("textureCoords") - byte[] getTextureCoords(); - - @Import("textureRenderTypes") - byte[] getTextureRenderTypes(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSMouseInput.java b/runescape-api/src/main/java/net/runelite/rs/api/RSMouseInput.java deleted file mode 100644 index 7db688d071..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSMouseInput.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import java.awt.event.FocusListener; -import java.awt.event.MouseListener; -import java.awt.event.MouseMotionListener; - -public interface RSMouseInput extends MouseListener, MouseMotionListener, FocusListener -{ -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSMouseWheelHandler.java b/runescape-api/src/main/java/net/runelite/rs/api/RSMouseWheelHandler.java deleted file mode 100644 index bd50e7a428..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSMouseWheelHandler.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import java.awt.event.MouseWheelListener; - -public interface RSMouseWheelHandler extends MouseWheelListener -{ -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNPC.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNPC.java deleted file mode 100644 index fc4bfcc714..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSNPC.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.NPC; -import net.runelite.mapping.Import; - -public interface RSNPC extends RSActor, NPC -{ - @Import("composition") - @Override - RSNPCComposition getComposition(); - - @Override - int getIndex(); - - void setIndex(int id); - - void setDead(boolean dead); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNPCComposition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNPCComposition.java deleted file mode 100644 index 87c781cea8..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSNPCComposition.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.NPCComposition; -import net.runelite.mapping.Import; - -public interface RSNPCComposition extends NPCComposition -{ - @Import("name") - @Override - String getName(); - - @Import("models") - @Override - int[] getModels(); - - @Import("actions") - @Override - String[] getActions(); - - @Import("isClickable") - @Override - boolean isClickable(); - - @Import("isMinimapVisible") - @Override - boolean isMinimapVisible(); - - @Import("isVisible") - @Override - boolean isVisible(); - - @Import("id") - @Override - int getId(); - - @Import("combatLevel") - @Override - int getCombatLevel(); - - @Import("configs") - @Override - int[] getConfigs(); - - @Import("transform") - @Override - RSNPCComposition transform(); - - @Import("size") - @Override - int getSize(); - - @Import("headIcon") - int getRsOverheadIcon(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSName.java b/runescape-api/src/main/java/net/runelite/rs/api/RSName.java deleted file mode 100644 index 4b2c83abfe..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSName.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.mapping.Import; - -public interface RSName extends Comparable -{ - @Import("name") - String getName(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNameable.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNameable.java deleted file mode 100644 index 6b7feef4ab..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSNameable.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.Nameable; -import net.runelite.mapping.Import; - -public interface RSNameable extends Nameable, Comparable -{ - @Import("name") - RSName getRsName(); - - @Import("prevName") - RSName getRsPrevName(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNameableContainer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNameableContainer.java deleted file mode 100644 index 33f2070048..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSNameableContainer.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.mapping.Import; - -public interface RSNameableContainer -{ - @Import("count") - int getCount(); - - @Import("nameables") - T[] getNameables(); - - @Import("isMember") - boolean isMember(RSName var1); - - @Import("findByName") - T findByName(RSName name); - - /** - * Method called by the container when an element is added - * @param name - * @param prevName - */ - void rl$add(RSName name, RSName prevName); - - /** - * Method called by the container when an element is removed - * @param nameable - */ - void rl$remove(RSNameable nameable); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNode.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNode.java deleted file mode 100644 index ab24b70dda..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSNode.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.Node; -import net.runelite.mapping.Import; - -public interface RSNode extends Node -{ - @Import("next") - @Override - RSNode getNext(); - - @Import("hash") - @Override - long getHash(); - - @Import("previous") - @Override - RSNode getPrevious(); - - @Import("unlink") - void unlink(); - - /** - * Called when this node is unlinked - */ - void onUnlink(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNodeCache.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNodeCache.java deleted file mode 100644 index 6a7eb9e2ec..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSNodeCache.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.NodeCache; -import net.runelite.mapping.Import; - -public interface RSNodeCache extends NodeCache -{ - @Import("get") - RSCacheableNode get(long id); - - @Import("reset") - @Override - void reset(); - - @Import("capacity") - @Override - void setCapacity(int capacity); - - @Import("remainingCapacity") - @Override - void setRemainingCapacity(int remainingCapacity); -} \ No newline at end of file diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSObjectComposition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSObjectComposition.java deleted file mode 100644 index 3df00175f5..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSObjectComposition.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.ObjectComposition; -import net.runelite.mapping.Import; - -public interface RSObjectComposition extends ObjectComposition -{ - @Import("id") - @Override - int getId(); - - @Import("name") - @Override - String getName(); - - @Import("actions") - @Override - String[] getActions(); - - @Import("mapSceneId") - @Override - int getMapSceneId(); - - @Import("mapIconId") - @Override - int getMapIconId(); - - @Import("impostorIds") - @Override - int[] getImpostorIds(); - - @Import("getImpostor") - @Override - RSObjectComposition getImpostor(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java deleted file mode 100644 index 2a79d8983b..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.PacketBuffer; - -public interface RSPacketBuffer extends PacketBuffer -{ -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java deleted file mode 100644 index ec8db1f005..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.Player; -import net.runelite.mapping.Import; - -public interface RSPlayer extends RSActor, Player -{ - @Import("name") - RSName getRsName(); - - @Import("playerId") - int getPlayerId(); - - @Import("composition") - @Override - RSPlayerComposition getPlayerComposition(); - - @Import("combatLevel") - @Override - int getCombatLevel(); - - @Import("totalLevel") - int getTotalLevel(); - - @Import("team") - @Override - int getTeam(); - - @Import("isClanMember") - @Override - boolean isClanMember(); - - @Import("isFriend") - @Override - boolean isFriend(); - - @Import("overheadIcon") - int getRsOverheadIcon(); - - @Import("skullIcon") - int getRsSkullIcon(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSPlayerComposition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSPlayerComposition.java deleted file mode 100644 index 15a3fb0e58..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSPlayerComposition.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.PlayerComposition; -import net.runelite.mapping.Import; - -public interface RSPlayerComposition extends PlayerComposition -{ - @Import("isFemale") - boolean isFemale(); - - @Import("bodyPartColours") - int[] getBodyPartColours(); - - @Import("equipmentIds") - @Override - int[] getEquipmentIds(); - - @Import("transformedNpcId") - @Override - void setTransformedNpcId(int id); - - @Import("setHash") - @Override - void setHash(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSPreferences.java b/runescape-api/src/main/java/net/runelite/rs/api/RSPreferences.java deleted file mode 100644 index eca6b3d5bb..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSPreferences.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2018, Lotto - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.Preferences; -import net.runelite.mapping.Import; - -public interface RSPreferences extends Preferences -{ - @Import("rememberedUsername") - @Override - String getRememberedUsername(); - - @Import("rememberedUsername") - @Override - void setRememberedUsername(String username); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSProjectile.java b/runescape-api/src/main/java/net/runelite/rs/api/RSProjectile.java deleted file mode 100644 index c25a698539..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSProjectile.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.Projectile; -import net.runelite.mapping.Import; - -public interface RSProjectile extends RSRenderable, Projectile -{ - @Import("id") - @Override - int getId(); - - @Import("height") - @Override - int getHeight(); - - @Import("endHeight") - @Override - int getEndHeight(); - - @Import("x1") - @Override - int getX1(); - - @Import("y1") - @Override - int getY1(); - - @Import("floor") - @Override - int getFloor(); - - @Import("startMovementCycle") - @Override - int getStartMovementCycle(); - - @Import("endCycle") - @Override - int getEndCycle(); - - @Import("slope") - @Override - int getSlope(); - - @Import("startHeight") - @Override - int getStartHeight(); - - @Import("x") - @Override - double getX(); - - @Import("y") - @Override - double getY(); - - @Import("z") - @Override - double getZ(); - - @Import("scalar") - @Override - double getScalar(); - - @Import("velocityX") - @Override - double getVelocityX(); - - @Import("velocityY") - @Override - double getVelocityY(); - - @Import("velocityZ") - @Override - double getVelocityZ(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSRawAudioNode.java b/runescape-api/src/main/java/net/runelite/rs/api/RSRawAudioNode.java deleted file mode 100644 index 5c51c394da..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSRawAudioNode.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2018, trimbe - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.mapping.Import; - -public interface RSRawAudioNode -{ - @Import("applyResampler") - RSRawAudioNode applyResampler(RSResampler resampler); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSRenderOverview.java b/runescape-api/src/main/java/net/runelite/rs/api/RSRenderOverview.java deleted file mode 100644 index ddc348a11b..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSRenderOverview.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.RenderOverview; -import net.runelite.api.WorldMapData; -import net.runelite.mapping.Import; - -public interface RSRenderOverview extends RenderOverview -{ - @Import("worldMapX") - int getWorldMapX(); - - @Import("worldMapY") - int getWorldMapY(); - - @Import("worldMapZoom") - float getWorldMapZoom(); - - @Import("worldMapTargetX") - int getWorldMapTargetX(); - - @Import("worldMapTargetY") - int getWorldMapTargetY(); - - @Import("worldMapDisplayWidth") - int getWorldMapDisplayWidth(); - - @Import("worldMapDisplayHeight") - int getWorldMapDisplayHeight(); - - @Import("worldMapDisplayX") - int getWorldMapDisplayX(); - - @Import("worldMapDisplayY") - int getWorldMapDisplayY(); - - @Import("setWorldMapPosition") - void setWorldMapPosition(int worldMapX, int worldMapY, boolean changedSurface); - - @Import("setWorldMapPositionTargetWorldPoint") - void setWorldMapPositionTarget(int worldPointX, int worldPointY); - - @Import("worldMapManager") - @Override - RSWorldMapManager getWorldMapManager(); - - @Import("initializeWorldMap") - @Override - void initializeWorldMap(WorldMapData var1); - - @Import("worldMapData") - @Override - RSWorldMapData getWorldMapData(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSRenderable.java b/runescape-api/src/main/java/net/runelite/rs/api/RSRenderable.java deleted file mode 100644 index 398c68088a..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSRenderable.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.Renderable; -import net.runelite.mapping.Import; - -public interface RSRenderable extends RSNode, Renderable -{ - @Import("modelHeight") - int getModelHeight(); - - @Import("modelHeight") - @Override - void setModelHeight(int modelHeight); - - @Import("getModel") - @Override - RSModel getModel(); - - @Import("draw") - @Override - void draw(int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y, int z, long hash); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSResampler.java b/runescape-api/src/main/java/net/runelite/rs/api/RSResampler.java deleted file mode 100644 index 6b75c34f09..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSResampler.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2018, trimbe - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -public interface RSResampler -{ -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSRunException.java b/runescape-api/src/main/java/net/runelite/rs/api/RSRunException.java deleted file mode 100644 index de6f6e670b..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSRunException.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2018, Lotto - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.mapping.Import; - -public interface RSRunException -{ - @Import("parent") - Throwable getParent(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java b/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java deleted file mode 100644 index 3cfeed4fe5..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.Scene; -import net.runelite.api.Tile; -import net.runelite.mapping.Import; - -public interface RSScene extends Scene -{ - @Import("objects") - RSGameObject[] getObjects(); - - @Import("tiles") - @Override - RSTile[][][] getTiles(); - - @Import("draw") - void draw(Tile tile, boolean var2); - - @Import("tileHeights") - int[][][] getTileHeights(); - - @Import("drawTile") - void drawTile(int[] pixels, int pixelOffset, int width, int z, int x, int y); - - @Import("updateOccluders") - void updateOccluders(); - - @Import("maxX") - int getMaxX(); - - @Import("maxY") - int getMaxY(); - - @Import("maxZ") - int getMaxZ(); - - @Import("minLevel") - int getMinLevel(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSSceneTileModel.java b/runescape-api/src/main/java/net/runelite/rs/api/RSSceneTileModel.java deleted file mode 100644 index 35c3fa6e5c..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSSceneTileModel.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.SceneTileModel; -import net.runelite.mapping.Import; - -public interface RSSceneTileModel extends SceneTileModel -{ - @Import("underlay") - @Override - int getModelUnderlay(); - - @Import("overlay") - @Override - int getModelOverlay(); - - @Import("shape") - @Override - int getShape(); - - @Import("rotation") - @Override - int getRotation(); - - @Import("faceX") - @Override - int[] getFaceX(); - - @Import("faceY") - @Override - int[] getFaceY(); - - @Import("faceZ") - @Override - int[] getFaceZ(); - - @Import("vertexX") - @Override - int[] getVertexX(); - - @Import("vertexY") - @Override - int[] getVertexY(); - - @Import("vertexZ") - @Override - int[] getVertexZ(); - - @Import("triangleColorA") - @Override - int[] getTriangleColorA(); - - @Import("triangleColorB") - @Override - int[] getTriangleColorB(); - - @Import("triangleColorC") - @Override - int[] getTriangleColorC(); - - @Import("triangleTextureId") - @Override - int[] getTriangleTextureId(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSSceneTilePaint.java b/runescape-api/src/main/java/net/runelite/rs/api/RSSceneTilePaint.java deleted file mode 100644 index 99c6b9f763..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSSceneTilePaint.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.SceneTilePaint; -import net.runelite.mapping.Import; - -public interface RSSceneTilePaint extends SceneTilePaint -{ - @Import("rgb") - @Override - int getRBG(); - - @Import("swColor") - @Override - int getSwColor(); - - @Import("seColor") - @Override - int getSeColor(); - - @Import("nwColor") - @Override - int getNwColor(); - - @Import("neColor") - @Override - int getNeColor(); - - @Import("texture") - @Override - int getTexture(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSScript.java b/runescape-api/src/main/java/net/runelite/rs/api/RSScript.java deleted file mode 100644 index 5bf9a0d094..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSScript.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2018 Abex - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.Script; -import net.runelite.mapping.Import; - -public interface RSScript extends Script, RSCacheableNode -{ - @Import("intOperands") - @Override - int[] getIntOperands(); - - @Import("instructions") - @Override - int[] getInstructions(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSScriptEvent.java b/runescape-api/src/main/java/net/runelite/rs/api/RSScriptEvent.java deleted file mode 100644 index a2f293b417..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSScriptEvent.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2018 Abex - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.ScriptEvent; -import net.runelite.api.widgets.Widget; -import net.runelite.mapping.Import; - -public interface RSScriptEvent extends ScriptEvent -{ - @Import("params") - Object[] getArguments(); - - @Import("params") - void setArguments(Object[] args); - - @Import("source") - Widget getSource(); - - @Import("op") - int getOp(); - - @Import("opbase") - String getOpbase(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSSequence.java b/runescape-api/src/main/java/net/runelite/rs/api/RSSequence.java deleted file mode 100644 index 0bea230793..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSSequence.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.mapping.Import; - -public interface RSSequence -{ - @Import("stretches") - boolean getStretches(); - - @Import("maxLoops") - int getMaxLoops(); - - @Import("precedenceAnimating") - int getPrecedenceAnimating(); - - @Import("replyMode") - int getReplyMode(); - - @Import("interleaveLeave") - int[] getInterleaveLeave(); - - @Import("frameIDs") - int[] getFrameIDs(); - - @Import("frameLengths") - int[] getFrameLenths(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSSoundEffect.java b/runescape-api/src/main/java/net/runelite/rs/api/RSSoundEffect.java deleted file mode 100644 index c1f6002bf8..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSSoundEffect.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2018, SomeoneWithAnInternetConnection - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.mapping.Import; - -public interface RSSoundEffect -{ - @Import("toRawAudioNode") - RSRawAudioNode toRawAudioNode(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSSprite.java b/runescape-api/src/main/java/net/runelite/rs/api/RSSprite.java deleted file mode 100644 index 6f6cd9b67c..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSSprite.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -public interface RSSprite -{ -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSSpritePixels.java b/runescape-api/src/main/java/net/runelite/rs/api/RSSpritePixels.java deleted file mode 100644 index f69f90ed35..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSSpritePixels.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.SpritePixels; -import net.runelite.mapping.Import; - -public interface RSSpritePixels extends SpritePixels -{ - @Import("drawAt") - @Override - void drawAt(int x, int y); - - @Import("height") - @Override - int getHeight(); - - @Import("width") - @Override - int getWidth(); - - @Import("pixels") - @Override - int[] getPixels(); - - @Import("setRaster") - void setRaster(); - - @Import("maxWidth") - void setMaxWidth(int maxWidth); - - @Import("maxHeight") - void setMaxHeight(int maxHeight); - - @Import("offsetX") - void setOffsetX(int offsetX); - - @Import("offsetY") - void setOffsetY(int offsetY); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSTaskDataNode.java b/runescape-api/src/main/java/net/runelite/rs/api/RSTaskDataNode.java deleted file mode 100644 index bcc61f9684..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSTaskDataNode.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2018, trimbe - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -public interface RSTaskDataNode -{ -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSTexture.java b/runescape-api/src/main/java/net/runelite/rs/api/RSTexture.java deleted file mode 100644 index 60cbe94b03..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSTexture.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.Texture; -import net.runelite.mapping.Import; - -public interface RSTexture extends Texture, RSNode -{ - @Import("pixels") - @Override - int[] getPixels(); - - @Import("animationDirection") - @Override - int getAnimationDirection(); - - @Import("animationSpeed") - @Override - int getAnimationSpeed(); - - @Import("loaded") - @Override - boolean isLoaded(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSTextureProvider.java b/runescape-api/src/main/java/net/runelite/rs/api/RSTextureProvider.java deleted file mode 100644 index 2651367376..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSTextureProvider.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2018, Tomas Slusny - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.TextureProvider; -import net.runelite.mapping.Import; - -public interface RSTextureProvider extends TextureProvider -{ - @Import("brightness") - @Override - double getBrightness(); - - @Import("setBrightness") - @Override - void setBrightness(double brightness); - - @Import("maxSize") - void setMaxSize(int maxSize); - - @Import("size") - void setSize(int size); - - @Import("textures") - @Override - RSTexture[] getTextures(); - - @Import("load") - @Override - int[] load(int textureId); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSTile.java b/runescape-api/src/main/java/net/runelite/rs/api/RSTile.java deleted file mode 100644 index 30a81196a5..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSTile.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.DecorativeObject; -import net.runelite.api.GameObject; -import net.runelite.api.GroundObject; -import net.runelite.api.ItemLayer; -import net.runelite.api.SceneTileModel; -import net.runelite.api.SceneTilePaint; -import net.runelite.api.Tile; -import net.runelite.api.WallObject; -import net.runelite.mapping.Import; - -public interface RSTile extends Tile -{ - @Import("objects") - @Override - GameObject[] getGameObjects(); - - @Import("itemLayer") - @Override - ItemLayer getItemLayer(); - - @Import("decorativeObject") - @Override - DecorativeObject getDecorativeObject(); - - @Import("groundObject") - @Override - GroundObject getGroundObject(); - - @Import("wallObject") - @Override - WallObject getWallObject(); - - @Import("paint") - @Override - SceneTilePaint getSceneTilePaint(); - - @Import("overlay") - @Override - SceneTileModel getSceneTileModel(); - - @Import("x") - int getX(); - - @Import("y") - int getY(); - - @Import("plane") - @Override - int getPlane(); - - @Import("renderLevel") - @Override - int getRenderLevel(); - - @Import("physicalLevel") - int getPhysicalLevel(); - - @Import("flags") - int getFlags(); - - @Import("bridge") - @Override - RSTile getBridge(); - - @Import("draw") - boolean isDraw(); - - @Import("draw") - void setDraw(boolean draw); - - @Import("visible") - boolean isVisible(); - - @Import("visible") - void setVisible(boolean visible); - - @Import("drawEntities") - void setDrawEntities(boolean drawEntities); - - @Import("wallCullDirection") - void setWallCullDirection(int wallCullDirection); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSVarbit.java b/runescape-api/src/main/java/net/runelite/rs/api/RSVarbit.java deleted file mode 100644 index 94990d561e..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSVarbit.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.mapping.Import; - -public interface RSVarbit extends RSCacheableNode -{ - @Import("configId") - int getIndex(); - - @Import("leastSignificantBit") - int getLeastSignificantBit(); - - @Import("mostSignificantBit") - int getMostSignificantBit(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSVarcs.java b/runescape-api/src/main/java/net/runelite/rs/api/RSVarcs.java deleted file mode 100644 index 527377ae7b..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSVarcs.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2018, Tomas Slusny - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import java.util.Map; -import net.runelite.mapping.Import; - -public interface RSVarcs -{ - @Import("varcMap") - Map getVarcMap(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWallObject.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWallObject.java deleted file mode 100644 index 1406f49e5d..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWallObject.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.WallObject; -import net.runelite.mapping.Import; - -public interface RSWallObject extends WallObject -{ - @Import("hash") - @Override - long getHash(); - - @Import("x") - @Override - int getX(); - - @Import("y") - @Override - int getY(); - - @Import("orientationA") - @Override - int getOrientationA(); - - @Import("orientationB") - @Override - int getOrientationB(); - - @Import("renderable1") - @Override - RSRenderable getRenderable1(); - - @Import("renderable2") - @Override - RSRenderable getRenderable2(); - - @Import("config") - @Override - int getConfig(); - - void setPlane(int plane); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java deleted file mode 100644 index 0dd5b24d4f..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java +++ /dev/null @@ -1,474 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.widgets.Widget; -import net.runelite.mapping.Import; - -public interface RSWidget extends Widget -{ - @Import("children") - @Override - RSWidget[] getChildren(); - - @Import("children") - @Override - void setChildren(Widget[] children); - - @Import("id") - @Override - int getId(); - - void setRenderParentId(int parentId); - - void setRenderX(int x); - - void setRenderY(int y); - - @Import("id") - void setId(int id); - - @Import("parentId") - int getRSParentId(); - - @Import("parentId") - void setParentId(int id); - - @Import("clickMask") - int getClickMask(); - - @Import("clickMask") - void setClickMask(int mask); - - @Import("boundsIndex") - int getBoundsIndex(); - - @Import("modelId") - @Override - int getModelId(); - - @Import("itemIds") - int[] getItemIds(); - - @Import("itemQuantities") - int[] getItemQuantities(); - - @Import("modelType") - int getModelType(); - - @Import("actions") - @Override - String[] getActions(); - - @Import("text") - String getRSText(); - - @Import("name") - String getRSName(); - - @Import("name") - void setRSName(String name); - - @Import("text") - @Override - void setText(String text); - - @Import("textColor") - @Override - int getTextColor(); - - @Import("textColor") - @Override - void setTextColor(int textColor); - - @Import("opacity") - @Override - int getOpacity(); - - @Import("opacity") - @Override - void setOpacity(int opacity); - - @Import("relativeX") - @Override - int getRelativeX(); - - @Import("relativeX") - @Override - void setRelativeX(int x); - - @Import("relativeY") - @Override - int getRelativeY(); - - @Import("relativeY") - @Override - void setRelativeY(int y); - - @Import("width") - @Override - int getWidth(); - - @Import("width") - @Override - void setWidth(int width); - - @Import("height") - @Override - int getHeight(); - - @Import("height") - @Override - void setHeight(int height); - - @Import("isHidden") - @Override - boolean isSelfHidden(); - - @Import("isHidden") - void setHidden(boolean hidden); - - @Import("index") - int getIndex(); - - @Import("index") - void setIndex(int index); - - @Import("rotationX") - int getRotationX(); - - @Import("rotationY") - int getRotationY(); - - @Import("rotationZ") - int getRotationZ(); - - @Import("contentType") - @Override - int getContentType(); - - @Import("contentType") - @Override - void setContentType(int contentType); - - @Import("type") - @Override - int getType(); - - @Import("type") - @Override - void setType(int type); - - @Import("scrollX") - @Override - int getScrollX(); - - @Import("scrollX") - @Override - void setScrollX(int scrollX); - - @Import("scrollY") - @Override - int getScrollY(); - - @Import("scrollY") - @Override - void setScrollY(int scrollY); - - @Import("scrollWidth") - @Override - int getScrollWidth(); - - @Import("scrollWidth") - @Override - void setScrollWidth(int width); - - @Import("scrollHeight") - @Override - int getScrollHeight(); - - @Import("scrollHeight") - @Override - void setScrollHeight(int height); - - @Import("spriteId") - @Override - int getSpriteId(); - - @Import("spriteId") - @Override - void setSpriteId(int spriteId); - - @Import("borderType") - @Override - int getBorderType(); - - @Import("borderType") - @Override - void setBorderType(int type); - - @Import("itemId") - @Override - int getItemId(); - - @Import("itemId") - @Override - void setItemId(int itemId); - - @Import("itemQuantity") - @Override - int getItemQuantity(); - - @Import("itemQuantity") - @Override - void setItemQuantity(int quantity); - - @Import("originalX") - @Override - int getOriginalX(); - - @Import("originalX") - @Override - void setOriginalX(int originalX); - - @Import("originalY") - @Override - int getOriginalY(); - - @Import("originalY") - @Override - void setOriginalY(int originalY); - - @Import("originalHeight") - @Override - int getOriginalHeight(); - - @Import("originalHeight") - @Override - void setOriginalHeight(int originalHeight); - - @Import("originalWidth") - @Override - int getOriginalWidth(); - - @Import("originalWidth") - @Override - void setOriginalWidth(int originalWidth); - - @Import("xPitch") - int getXPitch(); - - @Import("yPitch") - int getYPitch(); - - void broadcastHidden(boolean hidden); - - @Import("onOpListener") - @Override - void setOnOpListener(Object... args); - - @Import("setAction") - @Override - void setAction(int idx, String action); - - @Import("isIf3") - @Override - boolean isIf3(); - - @Import("isIf3") - void setIsIf3(boolean isIf3); - - @Import("hasListener") - @Override - boolean hasListener(); - - @Import("hasListener") - @Override - void setHasListener(boolean hasListener); - - @Import("onKeyListener") - @Override - Object[] getOnKeyListener(); - - @Import("onLoadListener") - @Override - Object[] getOnLoadListener(); - - @Import("onDialogAbortListener") - @Override - void setOnDialogAbortListener(Object... args); - - @Import("onKeyListener") - @Override - void setOnKeyListener(Object... args); - - @Import("onMouseOverListener") - @Override - void setOnMouseOverListener(Object... args); - - @Import("onMouseRepeatListener") - @Override - void setOnMouseRepeatListener(Object... args); - - @Import("onMouseLeaveListener") - @Override - void setOnMouseLeaveListener(Object... args); - - @Import("onTimerListener") - @Override - void setOnTimerListener(Object... args); - - @Import("onTargetEnterListener") - @Override - void setOnTargetEnterListener(Object... args); - - @Import("onTargetLeaveListener") - @Override - void setOnTargetLeaveListener(Object... args); - - @Import("fontId") - @Override - int getFontId(); - - @Import("fontId") - @Override - void setFontId(int id); - - @Import("textShadowed") - @Override - boolean getTextShadowed(); - - @Import("textShadowed") - @Override - void setTextShadowed(boolean shadowed); - - @Import("dragDeadZone") - @Override - int getDragDeadZone(); - - @Import("dragDeadZone") - @Override - void setDragDeadZone(int deadZone); - - @Import("dragDeadTime") - @Override - int getDragDeadTime(); - - @Import("dragDeadTime") - @Override - void setDragDeadTime(int deadTime); - - @Import("itemQuantityMode") - @Override - int getItemQuantityMode(); - - @Import("itemQuantityMode") - @Override - void setItemQuantityMode(int itemQuantityMode); - - @Import("xPositionMode") - @Override - int getXPositionMode(); - - @Import("xPositionMode") - @Override - void setXPositionMode(int xpm); - - @Import("yPositionMode") - @Override - int getYPositionMode(); - - @Import("yPositionMode") - @Override - void setYPositionMode(int ypm); - - @Import("xTextAlignment") - @Override - int getXTextAlignment(); - - @Import("xTextAlignment") - @Override - void setXTextAlignment(int xta); - - @Import("yTextAlignment") - @Override - int getYTextAlignment(); - - @Import("yTextAlignment") - @Override - void setYTextAlignment(int yta); - - @Import("widthMode") - @Override - int getWidthMode(); - - @Import("widthMode") - @Override - void setWidthMode(int widthMode); - - @Import("heightMode") - @Override - int getHeightMode(); - - @Import("heightMode") - @Override - void setHeightMode(int heightMode); - - @Import("getFont") - @Override - RSFontTypeFace getFont(); - - @Import("filled") - @Override - boolean isFilled(); - - @Import("filled") - @Override - void setFilled(boolean filled); - - @Import("targetVerb") - @Override - String getTargetVerb(); - - @Import("targetVerb") - @Override - void setTargetVerb(String targetVerb); - - @Import("noClickThrough") - @Override - boolean getNoClickThrough(); - - @Import("noClickThrough") - @Override - void setNoClickThrough(boolean noClickThrough); - - @Import("noScrollThrough") - @Override - boolean getNoScrollThrough(); - - @Import("noScrollThrough") - @Override - void setNoScrollThrough(boolean noScrollThrough); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidgetNode.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidgetNode.java deleted file mode 100644 index 9c08a5a977..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidgetNode.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.WidgetNode; -import net.runelite.mapping.Import; - -public interface RSWidgetNode extends RSNode, WidgetNode -{ - @Import("id") - @Override - int getId(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWorld.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWorld.java deleted file mode 100644 index 2a4a8c4925..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWorld.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.World; -import net.runelite.mapping.Import; - -public interface RSWorld extends World -{ - @Import("mask") - int getMask(); - - @Import("mask") - void setMask(int mask); - - @Import("playerCount") - @Override - int getPlayerCount(); - - @Import("playerCount") - @Override - void setPlayerCount(int playerCount); - - @Import("location") - @Override - int getLocation(); - - @Import("location") - @Override - void setLocation(int location); - - @Import("index") - @Override - int getIndex(); - - @Import("index") - @Override - void setIndex(int index); - - @Import("id") - @Override - int getId(); - - @Import("id") - @Override - void setId(int id); - - @Import("activity") - @Override - String getActivity(); - - @Import("activity") - @Override - void setActivity(String activity); - - @Import("address") - @Override - String getAddress(); - - @Import("address") - @Override - void setAddress(String address); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapData.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapData.java deleted file mode 100644 index 5638d6813c..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapData.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.WorldMapData; -import net.runelite.mapping.Import; - -public interface RSWorldMapData extends WorldMapData -{ - @Import("surfaceContainsPosition") - boolean surfaceContainsPosition(int x, int y); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapManager.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapManager.java deleted file mode 100644 index 60377bc659..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapManager.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.rs.api; - -import net.runelite.api.WorldMapManager; -import net.runelite.mapping.Import; - -public interface RSWorldMapManager extends WorldMapManager -{ - @Import("loaded") - @Override - boolean isLoaded(); - - @Import("mapSurfaceBaseOffsetX") - int getSurfaceOffsetX(); - - @Import("mapSurfaceBaseOffsetY") - int getSurfaceOffsetY(); - - @Import("getPixelsPerTile") - float getPixelsPerTile(int graphicsDiff, int worldDiff); -} From d59a57d21aaed542a99cf6a4fa3e6a3f4caccf8c Mon Sep 17 00:00:00 2001 From: Lucas Date: Mon, 8 Jul 2019 00:31:04 +0200 Subject: [PATCH 423/472] Use try-with-resources in metronomeplugin and narrow down exception catching --- .../plugins/metronome/MetronomePlugin.java | 49 +++++++++---------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java index 5ba3246d87..b0d9e42f3f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java @@ -26,8 +26,12 @@ package net.runelite.client.plugins.metronome; import com.google.inject.Provides; +import java.io.IOException; import javax.inject.Inject; import javax.inject.Singleton; +import javax.sound.sampled.LineUnavailableException; +import javax.sound.sampled.UnsupportedAudioFileException; +import lombok.extern.slf4j.Slf4j; import net.runelite.api.SoundEffectVolume; import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioSystem; @@ -49,6 +53,7 @@ import net.runelite.client.plugins.PluginDescriptor; tags = {"skilling", "tick", "timers"}, enabledByDefault = false ) +@Slf4j @Singleton public class MetronomePlugin extends Plugin { @@ -80,33 +85,26 @@ public class MetronomePlugin extends Plugin private Clip GetAudioClip(String path) { File audioFile = new File(path); - if (audioFile.exists()) + if (!audioFile.exists()) { - AudioInputStream audioStream; - try - { - audioStream = AudioSystem.getAudioInputStream(audioFile); - } - catch (Exception e) - { - return null; - } - - try - { - Clip audioClip = AudioSystem.getClip(); - audioClip.open(audioStream); - FloatControl gainControl = (FloatControl) audioClip.getControl(FloatControl.Type.MASTER_GAIN); - float gainValue = (((float) this.volume) * 40f / 100f) - 35f; - gainControl.setValue(gainValue); - return audioClip; - } - catch (Exception e) - { - return null; - } + return null; + } + + try (AudioInputStream audioStream = AudioSystem.getAudioInputStream(audioFile)) + { + Clip audioClip = AudioSystem.getClip(); + audioClip.open(audioStream); + FloatControl gainControl = (FloatControl) audioClip.getControl(FloatControl.Type.MASTER_GAIN); + float gainValue = (((float) this.volume) * 40f / 100f) - 35f; + gainControl.setValue(gainValue); + + return audioClip; + } + catch (IOException | LineUnavailableException | UnsupportedAudioFileException e) + { + log.warn("Error opening audiostream from " + audioFile, e); + return null; } - return null; } @Override @@ -146,6 +144,7 @@ public class MetronomePlugin extends Plugin float gainValue = (((float) this.volume) * 40f / 100f) - 35f; FloatControl gainControlTick = (FloatControl) tickClip.getControl(FloatControl.Type.MASTER_GAIN); gainControlTick.setValue(gainValue); + FloatControl gainControlTock = (FloatControl) tockClip.getControl(FloatControl.Type.MASTER_GAIN); gainControlTock.setValue(gainValue); } From 6519daaabf3040c25943490e36b2f4f3ec4c8de1 Mon Sep 17 00:00:00 2001 From: James Munson Date: Sun, 7 Jul 2019 15:45:00 -0700 Subject: [PATCH 424/472] Added back MAX_DISTANCE to AgilityOverlay --- .../runelite/client/plugins/agility/AgilityOverlay.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java index 7db0667088..31a987bf14 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java @@ -36,6 +36,7 @@ import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Point; import net.runelite.api.Tile; +import net.runelite.api.coords.LocalPoint; import net.runelite.client.game.AgilityShortcut; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; @@ -45,6 +46,7 @@ import net.runelite.client.ui.overlay.OverlayUtil; @Singleton class AgilityOverlay extends Overlay { + private static final int MAX_DISTANCE = 2350; private static final Color SHORTCUT_HIGH_LEVEL_COLOR = Color.ORANGE; private final Client client; @@ -63,6 +65,7 @@ class AgilityOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { + LocalPoint playerLocation = client.getLocalPlayer().getLocalLocation(); Point mousePosition = client.getMouseCanvasPosition(); final List marksOfGrace = plugin.getMarksOfGrace(); plugin.getObstacles().forEach((object, obstacle) -> @@ -74,7 +77,8 @@ class AgilityOverlay extends Overlay } Tile tile = obstacle.getTile(); - if (tile.getPlane() == client.getPlane()) + if (tile.getPlane() == client.getPlane() + && object.getLocalLocation().distanceTo(playerLocation) < MAX_DISTANCE) { // This assumes that the obstacle is not clickable. if (Obstacles.TRAP_OBSTACLE_IDS.contains(object.getId())) @@ -117,7 +121,8 @@ class AgilityOverlay extends Overlay { for (Tile markOfGraceTile : marksOfGrace) { - if (markOfGraceTile.getPlane() == client.getPlane() && markOfGraceTile.getItemLayer() != null) + if (markOfGraceTile.getPlane() == client.getPlane() && markOfGraceTile.getItemLayer() != null + && markOfGraceTile.getLocalLocation().distanceTo(playerLocation) < MAX_DISTANCE) { final Polygon poly = markOfGraceTile.getItemLayer().getCanvasTilePoly(); From dce4c387f82e535c1d9df74e3dad48c092546c5c Mon Sep 17 00:00:00 2001 From: Zeruth Date: Sun, 7 Jul 2019 19:36:41 -0400 Subject: [PATCH 425/472] finish upstream merge --- .../MenuEntrySwapperConfig.java | 1 - .../MenuEntrySwapperPlugin.java | 5 --- .../client/plugins/timers/TimersPlugin.java | 37 +------------------ 3 files changed, 2 insertions(+), 41 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java index 8808985dc9..121b1f395c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java @@ -1,4 +1,3 @@ -<<<<<<< HEAD /* * Copyright (c) 2018, Adam * Copyright (c) 2018, Kyle diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java index 65b87f2138..a4414ca6dc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java @@ -1162,7 +1162,6 @@ public class MenuEntrySwapperPlugin extends Plugin swap(client, "quick-travel", option, target, true); } -<<<<<<< HEAD if (this.swapEnchant) { swap(client, "enchant", option, target, true); @@ -1178,10 +1177,6 @@ public class MenuEntrySwapperPlugin extends Plugin else if (this.swapMetamorphosis && target.contains("baby chinchompa")) { swap(client, "metamorphosis", option, target, true); - if (config.swapEnchant()) - { - swap("enchant", option, target, true); - } } else if (this.swapStun && target.contains("hoop snake")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index d6b95dee24..43701cbb34 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -78,41 +78,8 @@ import net.runelite.client.game.SpriteManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import static net.runelite.client.plugins.timers.GameIndicator.VENGEANCE_ACTIVE; -import static net.runelite.client.plugins.timers.GameTimer.ABYSSAL_SIRE_STUN; -import static net.runelite.client.plugins.timers.GameTimer.ANTIFIRE; -import static net.runelite.client.plugins.timers.GameTimer.ANTIPOISON; -import static net.runelite.client.plugins.timers.GameTimer.ANTIVENOM; -import static net.runelite.client.plugins.timers.GameTimer.BIND; -import static net.runelite.client.plugins.timers.GameTimer.CANNON; -import static net.runelite.client.plugins.timers.GameTimer.CHARGE; -import static net.runelite.client.plugins.timers.GameTimer.DMM_FULLTB; -import static net.runelite.client.plugins.timers.GameTimer.DMM_HALFTB; -import static net.runelite.client.plugins.timers.GameTimer.ENTANGLE; -import static net.runelite.client.plugins.timers.GameTimer.EXANTIFIRE; -import static net.runelite.client.plugins.timers.GameTimer.EXSUPERANTIFIRE; -import static net.runelite.client.plugins.timers.GameTimer.FULLTB; -import static net.runelite.client.plugins.timers.GameTimer.GOD_WARS_ALTAR; -import static net.runelite.client.plugins.timers.GameTimer.HALFBIND; -import static net.runelite.client.plugins.timers.GameTimer.HALFENTANGLE; -import static net.runelite.client.plugins.timers.GameTimer.HALFSNARE; -import static net.runelite.client.plugins.timers.GameTimer.HALFTB; -import static net.runelite.client.plugins.timers.GameTimer.HOME_TELEPORT; -import static net.runelite.client.plugins.timers.GameTimer.ICEBARRAGE; -import static net.runelite.client.plugins.timers.GameTimer.ICEBLITZ; -import static net.runelite.client.plugins.timers.GameTimer.ICEBURST; -import static net.runelite.client.plugins.timers.GameTimer.ICERUSH; -import static net.runelite.client.plugins.timers.GameTimer.IMBUEDHEART; -import static net.runelite.client.plugins.timers.GameTimer.MAGICIMBUE; -import static net.runelite.client.plugins.timers.GameTimer.MINIGAME_TELEPORT; -import static net.runelite.client.plugins.timers.GameTimer.OVERLOAD; -import static net.runelite.client.plugins.timers.GameTimer.OVERLOAD_RAID; -import static net.runelite.client.plugins.timers.GameTimer.PRAYER_ENHANCE; -import static net.runelite.client.plugins.timers.GameTimer.SKULL; -import static net.runelite.client.plugins.timers.GameTimer.SNARE; -import static net.runelite.client.plugins.timers.GameTimer.STAFF_OF_THE_DEAD; -import static net.runelite.client.plugins.timers.GameTimer.STAMINA; -import static net.runelite.client.plugins.timers.GameTimer.SUPERANTIFIRE; -import static net.runelite.client.plugins.timers.GameTimer.VENGEANCE; +import static net.runelite.client.plugins.timers.GameTimer.*; + import net.runelite.client.ui.overlay.infobox.InfoBoxManager; @PluginDescriptor( From 3b452981b46d09a1e2a769eeefe86af9295e5e9b Mon Sep 17 00:00:00 2001 From: Ron Young Date: Sun, 7 Jul 2019 19:32:48 -0500 Subject: [PATCH 426/472] widget item overlay: don't render on tag tabs and bank tabs --- .../src/main/java/net/runelite/api/widgets/WidgetID.java | 1 + .../main/java/net/runelite/api/widgets/WidgetInfo.java | 1 + .../net/runelite/client/ui/overlay/WidgetItemOverlay.java | 8 ++++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index 6a097d254c..f93ad417f9 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -223,6 +223,7 @@ public class WidgetID static final int INVENTORY_ITEM_CONTAINER = 3; static final int BANK_TITLE_BAR = 4; static final int CONTENT_CONTAINER = 10; + static final int TAB_CONTAINER = 11; static final int ITEM_CONTAINER = 13; static final int SEARCH_BUTTON_BACKGROUND = 40; static final int DEPOSIT_INVENTORY = 42; diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index 6173fd2f83..50c054c42f 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -133,6 +133,7 @@ public enum WidgetInfo BANK_CONTENT_CONTAINER(WidgetID.BANK_GROUP_ID, WidgetID.Bank.CONTENT_CONTAINER), BANK_DEPOSIT_EQUIPMENT(WidgetID.BANK_GROUP_ID, WidgetID.Bank.DEPOSIT_EQUIPMENT), BANK_DEPOSIT_INVENTORY(WidgetID.BANK_GROUP_ID, WidgetID.Bank.DEPOSIT_INVENTORY), + BANK_TAB_CONTAINER(WidgetID.BANK_GROUP_ID, WidgetID.Bank.TAB_CONTAINER), GRAND_EXCHANGE_WINDOW_CONTAINER(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.WINDOW_CONTAINER), GRAND_EXCHANGE_OFFER_CONTAINER(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.OFFER_CONTAINER), diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java index 3d8f1ab2e2..5e707064b4 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java @@ -43,6 +43,8 @@ import static net.runelite.api.widgets.WidgetID.GUIDE_PRICES_INVENTORY_GROUP_ID; import static net.runelite.api.widgets.WidgetID.INVENTORY_GROUP_ID; import static net.runelite.api.widgets.WidgetID.SEED_VAULT_INVENTORY_GROUP_ID; import static net.runelite.api.widgets.WidgetID.SHOP_INVENTORY_GROUP_ID; +import static net.runelite.api.widgets.WidgetInfo.BANK_CONTENT_CONTAINER; +import static net.runelite.api.widgets.WidgetInfo.BANK_TAB_CONTAINER; import static net.runelite.api.widgets.WidgetInfo.TO_GROUP; import net.runelite.api.widgets.WidgetItem; @@ -73,8 +75,10 @@ public abstract class WidgetItemOverlay extends Overlay Widget widget = widgetItem.getWidget(); int interfaceGroup = TO_GROUP(widget.getId()); - // Don't draw if this widget isn't one of the allowed - if (!interfaceGroups.contains(interfaceGroup)) + // Don't draw if this widget isn't one of the allowed nor in tag tab/item tab + if (!interfaceGroups.contains(interfaceGroup) || + (interfaceGroup == BANK_GROUP_ID + && (widget.getParentId() == BANK_CONTENT_CONTAINER.getId() || widget.getParentId() == BANK_TAB_CONTAINER.getId()))) { continue; } From 4d94d2eafd89c02913cb6a4d27900bded1bbb5d4 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 02:41:59 +0200 Subject: [PATCH 427/472] skitzo: Best rotterdammer out there --- .../java/net/runelite/api/AnimationID.java | 7 + .../main/java/net/runelite/api/ScriptID.java | 5 + .../net/runelite/api/widgets/WidgetID.java | 1 + .../client/plugins/banlist/BanListPlugin.java | 66 +++--- .../plugins/barrows/BarrowsOverlay.java | 2 +- .../chatcommands/ChatCommandsPlugin.java | 2 +- .../ChatTranslationPlugin.java | 11 +- .../plugins/clanchat/ClanChatPlugin.java | 2 +- .../plugins/combatcounter/CombatCounter.java | 196 +++++++++--------- .../client/plugins/corp/CorpPlugin.java | 8 +- .../plugins/itemprices/ItemPricesOverlay.java | 2 +- .../LizardmenShamanPlugin.java | 3 +- 12 files changed, 161 insertions(+), 144 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/AnimationID.java b/runelite-api/src/main/java/net/runelite/api/AnimationID.java index 45ce683b6e..d57b288af4 100644 --- a/runelite-api/src/main/java/net/runelite/api/AnimationID.java +++ b/runelite-api/src/main/java/net/runelite/api/AnimationID.java @@ -312,4 +312,11 @@ public final class AnimationID public static final int DAG_REX = 2853; public static final int DAG_PRIME = 2854; public static final int DAG_SUPREME = 2855; + + // Lizardman shaman + public static final int LIZARDMAN_SHAMAN_SPAWN = 2855; + + // Combat counter + public static final int BARRAGE_ANIMATION = 1979; + public static final int CHIN_ANIMATION = 7618; } \ No newline at end of file diff --git a/runelite-api/src/main/java/net/runelite/api/ScriptID.java b/runelite-api/src/main/java/net/runelite/api/ScriptID.java index 0fdc3ad13b..156f9969f2 100644 --- a/runelite-api/src/main/java/net/runelite/api/ScriptID.java +++ b/runelite-api/src/main/java/net/runelite/api/ScriptID.java @@ -205,4 +205,9 @@ public final class ScriptID * Send a public message */ public static final int PUBLICMSG = 13337; + + /** + * TExt typed in the chatbox + */ + public static final int CHATBOX_TEXT = 96; } \ No newline at end of file diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index 931004b869..c15e2c285e 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -151,6 +151,7 @@ public class WidgetID public static final int BEGINNER_CLUE_MAP_WIZARDS_TOWER = 356; public static final int SEED_BOX_GROUP_ID = 128; public static final int ITEMS_KEPT_ON_DEATH_GROUP_ID = 4; + public static final int TRADING_SCREEN = 335; static class WorldMap { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java index 4ea6de2dff..384da53621 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java @@ -26,11 +26,14 @@ */ package net.runelite.client.plugins.banlist; +import com.google.common.base.Splitter; import com.google.inject.Provides; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashSet; import java.util.List; +import java.util.Set; import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; @@ -43,6 +46,7 @@ import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.WidgetHiddenChanged; import net.runelite.api.events.WidgetLoaded; import net.runelite.api.widgets.Widget; +import static net.runelite.api.widgets.WidgetID.TRADING_SCREEN; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.callback.ClientThread; import net.runelite.client.chat.ChatColorType; @@ -85,10 +89,10 @@ public class BanListPlugin extends Plugin @Inject private ChatMessageManager chatMessageManager; - private final List wdrScamArrayList = new ArrayList<>(); - private final List wdrToxicArrayList = new ArrayList<>(); - private final List runeWatchArrayList = new ArrayList<>(); - private final List manualBans = new ArrayList<>(); + private final Set wdrScamSet = new HashSet<>(); + private final Set wdrToxicSet = new HashSet<>(); + private final Set runeWatchSet = new HashSet<>(); + private final Set manualBans = new HashSet<>(); @Provides BanListConfig getConfig(ConfigManager configManager) @@ -113,9 +117,9 @@ public class BanListPlugin extends Plugin @Override protected void shutDown() throws Exception { - wdrScamArrayList.clear(); - wdrToxicArrayList.clear(); - runeWatchArrayList.clear(); + wdrScamSet.clear(); + wdrToxicSet.clear(); + runeWatchSet.clear(); manualBans.clear(); } @@ -124,11 +128,17 @@ public class BanListPlugin extends Plugin { if (event.getGroup().equals("banlist") && event.getKey().equals("bannedPlayers")) { - for (String manual : Text.fromCSV(config.getBannedPlayers())) + List bannedPlayers = Splitter + .on(",") + .trimResults() + .omitEmptyStrings() + .splitToList(config.getBannedPlayers()); + + for (String bannedPlayer : bannedPlayers) { - if (!manualBans.contains(manual)) + if (!manualBans.contains(bannedPlayer)) { - manualBans.add(Text.standardize(manual)); + manualBans.add(Text.standardize(bannedPlayer)); } } } @@ -171,12 +181,14 @@ public class BanListPlugin extends Plugin public void onClanMemberJoined(ClanMemberJoined event) { ClanMember member = event.getMember(); - ListType scamList = checkScamList(Text.standardize(member.getUsername())); - ListType toxicList = checkToxicList(Text.standardize(member.getUsername())); + String memberUsername = Text.standardize(member.getUsername().toLowerCase()); + + ListType scamList = checkScamList(memberUsername); + ListType toxicList = checkToxicList(memberUsername); if (scamList != null) { - sendWarning(Text.standardize(member.getUsername()), scamList); + sendWarning(memberUsername, scamList); if (this.highlightInClan) { highlightRedInCC(); @@ -185,7 +197,7 @@ public class BanListPlugin extends Plugin if (toxicList != null) { - sendWarning(Text.standardize(member.getUsername()), toxicList); + sendWarning(memberUsername, toxicList); if (this.highlightInClan) { highlightRedInCC(); @@ -199,12 +211,12 @@ public class BanListPlugin extends Plugin @Subscribe public void onWidgetLoaded(WidgetLoaded widgetLoaded) { - if (this.highlightInTrade && widgetLoaded.getGroupId() == 335) + if (this.highlightInTrade && widgetLoaded.getGroupId() == TRADING_SCREEN) { //if trading window was loaded clientThread.invokeLater(() -> { Widget tradingWith = client.getWidget(335, 31); - String name = tradingWith.getText().replaceAll("Trading With: ", ""); + String name = tradingWith.getText().replaceAll("Trading With: ", "").toLowerCase(); if (checkScamList(name) != null) { tradingWith.setText(tradingWith.getText().replaceAll(name, "" + name + " (Scammer)" + "")); @@ -222,17 +234,17 @@ public class BanListPlugin extends Plugin */ private ListType checkScamList(String nameToBeChecked) { - if (wdrScamArrayList.size() > 0 && this.enableWDR && wdrScamArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) + if (wdrScamSet.size() > 0 && this.enableWDR && wdrScamSet.contains(nameToBeChecked)) { return ListType.WEDORAIDSSCAM_LIST; } - if (runeWatchArrayList.size() > 0 && this.enableRuneWatch && runeWatchArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) + if (runeWatchSet.size() > 0 && this.enableRuneWatch && runeWatchSet.contains(nameToBeChecked)) { return ListType.RUNEWATCH_LIST; } - if (manualBans.size() > 0 && manualBans.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) + if (manualBans.size() > 0 && manualBans.contains(nameToBeChecked)) { return ListType.MANUAL_LIST; } @@ -243,7 +255,7 @@ public class BanListPlugin extends Plugin private ListType checkToxicList(String nameToBeChecked) { - if (wdrToxicArrayList.size() > 0 && this.enableWDR && wdrToxicArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase)) + if (wdrToxicSet.size() > 0 && this.enableWDR && wdrToxicSet.contains(nameToBeChecked)) { return ListType.WEDORAIDSTOXIC_LIST; } @@ -337,9 +349,9 @@ public class BanListPlugin extends Plugin ArrayList wdrList = new ArrayList<>(Arrays.asList(text.split(","))); ArrayList wdrList2 = new ArrayList<>(); - wdrList.forEach((name) -> wdrList2.add(Text.standardize(name))); + wdrList.forEach((name) -> wdrList2.add(Text.standardize(name).toLowerCase())); - wdrScamArrayList.addAll(wdrList2); + wdrScamSet.addAll(wdrList2); } }); @@ -367,7 +379,7 @@ public class BanListPlugin extends Plugin { x = x.substring(x.indexOf("title"), x.indexOf('>')); x = x.substring(x.indexOf('=') + 2, x.length() - 1); - runeWatchArrayList.add(Text.standardize(x)); + runeWatchSet.add(Text.standardize(x).toLowerCase()); } } } @@ -394,9 +406,9 @@ public class BanListPlugin extends Plugin ArrayList wdrToxicList = new ArrayList<>(Arrays.asList(text.split(","))); ArrayList wdrToxicList2 = new ArrayList<>(); - wdrToxicList.forEach((name) -> wdrToxicList2.add(Text.standardize(name))); + wdrToxicList.forEach((name) -> wdrToxicList2.add(Text.standardize(name).toLowerCase())); - wdrToxicArrayList.addAll(wdrToxicList2); + wdrToxicSet.addAll(wdrToxicList2); } }); } @@ -411,8 +423,8 @@ public class BanListPlugin extends Plugin Widget widget = client.getWidget(WidgetInfo.CLAN_CHAT_LIST); for (Widget widgetChild : widget.getDynamicChildren()) { - ListType scamList = checkScamList(widgetChild.getText()); - ListType toxicList = checkToxicList(widgetChild.getText()); + ListType scamList = checkScamList(widgetChild.getText().toLowerCase()); + ListType toxicList = checkToxicList(widgetChild.getText().toLowerCase()); if (scamList != null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java index 673a5d77c1..12b3494af7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java @@ -97,7 +97,7 @@ class BarrowsOverlay extends Overlay final List players = client.getPlayers(); for (Player player : players) { - if (player.equals(local)) + if (player == local) { // Skip local player as we draw square for it later continue; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java index 30bcaeb72f..951547e777 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java @@ -818,7 +818,7 @@ public class ChatCommandsPlugin extends Plugin } catch (IOException e) { - log.error(e.toString()); + log.error("Error looking up prices", e); } int itemId = item.getId(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java index 9dcaae6540..4231bb6059 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java @@ -4,8 +4,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ObjectArrays; import com.google.inject.Provides; import java.awt.event.KeyEvent; -import java.util.ArrayList; -import java.util.List; +import java.util.HashSet; +import java.util.Set; import javax.inject.Inject; import javax.inject.Provider; import javax.inject.Singleton; @@ -15,6 +15,7 @@ import net.runelite.api.GameState; import net.runelite.api.MenuAction; import net.runelite.api.MenuEntry; import net.runelite.api.MessageNode; +import static net.runelite.api.ScriptID.CHATBOX_TEXT; import net.runelite.api.VarClientStr; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ConfigChanged; @@ -50,7 +51,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener private static final ImmutableList AFTER_OPTIONS = ImmutableList.of("Message", "Add ignore", "Remove friend", "Kick"); - private final List playerNames = new ArrayList<>(); + private final Set playerNames = new HashSet<>(); @Inject private Client client; @@ -258,7 +259,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener } catch (Exception e) { - log.warn(e.toString()); + log.warn("Translation error", e); } return; } @@ -274,7 +275,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, translation); clientThread.invoke(() -> - client.runScript(96, 0, translation)); + client.runScript(CHATBOX_TEXT, 0, translation)); } client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, ""); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java index ea6b78efeb..ecbb2e1d63 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java @@ -197,7 +197,7 @@ public class ClanChatPlugin extends Plugin for (final Player player : client.getPlayers()) { - if (player != null && !player.equals(local) && memberName.equals(Text.toJagexName(player.getName()))) + if (player != null && player != local && memberName.equals(Text.toJagexName(player.getName()))) { clanMembers.add(player); addClanCounter(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java index 4c12d83363..b1e618466f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java @@ -24,14 +24,26 @@ */ package net.runelite.client.plugins.combatcounter; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import com.google.inject.Provides; import java.awt.Color; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.inject.Inject; import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Actor; +import static net.runelite.api.AnimationID.BARRAGE_ANIMATION; +import static net.runelite.api.AnimationID.BLOWPIPE_ATTACK; +import static net.runelite.api.AnimationID.CHIN_ANIMATION; import net.runelite.api.Client; import net.runelite.api.Hitsplat; import net.runelite.api.NPC; @@ -50,13 +62,6 @@ import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; -import javax.inject.Inject; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - @PluginDescriptor( name = "Tick Counter", description = "Count the amount of perfect combat ticks performed by each player.", @@ -116,130 +121,116 @@ public class CombatCounter extends Plugin return configManager.getConfig(CombatCounterConfig.class); } - private final Map VARIABLES = new HashMap() - { - { - this.put(422, 4); // Unarmed Punch, Block - this.put(423, 4); // Unarmed Kick + private static final Map VARIABLES = ImmutableMap.builder() + .put(422, 4) // Unarmed Punch, Block + .put(423, 4) // Unarmed Kick - this.put(8145, 4); // Rapier Stab, Lunge, Block - this.put(390, 4); // Rapier Slash + .put(8145, 4) // Rapier Stab, Lunge, Block + .put(390, 4) // Rapier Slash - this.put(7552, 5); // Armadyl Crossbow Accurate, Rapid, Longrange, Special + .put(7552, 5) // Armadyl Crossbow Accurate, Rapid, Longrange, Special - this.put(1167, 4); // Trident Accurate, Accurate, Longrange + .put(1167, 4) // Trident Accurate, Accurate, Longrange - this.put(401, 6); // Dragon Warhammer Pound, Pummel, Block - this.put(1378, 6); // Dragon Warhammer Special + .put(401, 6) // Dragon Warhammer Pound, Pummel, Block + .put(1378, 6) // Dragon Warhammer Special - this.put(393, 4); // Dragon Claws Chop, Slash, Block - this.put(1067, 4); // Dragon Claws Lunge - this.put(7514, 4); // Dragon Claws Special + .put(393, 4) // Dragon Claws Chop, Slash, Block + .put(1067, 4) // Dragon Claws Lunge + .put(7514, 4) // Dragon Claws Special - this.put(8288, 4); // Dragon Hunter Lance Lunge, Block - this.put(8289, 4); // Dragon Hunter Lance Swipe - this.put(8290, 4); // Dragon Hunter Lance Pound + .put(8288, 4) // Dragon Hunter Lance Lunge, Block + .put(8289, 4) // Dragon Hunter Lance Swipe + .put(8290, 4) // Dragon Hunter Lance Pound - this.put(7516, 6); // Elder maul Pound, Pummel, Block + .put(7516, 6) // Elder maul Pound, Pummel, Block - this.put(8056, 5); // Scythe of Vitur Reap, Chop, Jab, Block + .put(8056, 5) // Scythe of Vitur Reap, Chop, Jab, Block - this.put(7045, 6); // Bandos Godsword Chop, Slash - this.put(7054, 6); // Bandos Godsword Smash - this.put(7055, 6); // Bandos Godsword Block - this.put(7642, 6); // Bandos Godsword Special - this.put(7643, 6); // Bandos Godsword Special (Ornamate) + .put(7045, 6) // Bandos Godsword Chop, Slash + .put(7054, 6) // Bandos Godsword Smash + .put(7055, 6) // Bandos Godsword Block + .put(7642, 6) // Bandos Godsword Special + .put(7643, 6) // Bandos Godsword Special (Ornamate) - this.put(426, 5); // Twisted Bow Accurate, Rapid, Longrange + .put(426, 5) // Twisted Bow Accurate, Rapid, Longrange - this.put(414, 5); // Kodai Bash, Pound, Focus + .put(414, 5) // Kodai Bash, Pound, Focus - this.put(428, 4); // Staff of Light Jab - this.put(440, 4); // Staff of Light Swipe - this.put(419, 4); // Staff of Light Fend - this.put(7967, 4); // Staff of Light Special + .put(428, 4) // Staff of Light Jab + .put(440, 4) // Staff of Light Swipe + .put(419, 4) // Staff of Light Fend + .put(7967, 4) // Staff of Light Special - this.put(428, 7); // Crystal Halberd Jab, Fend - this.put(419, 7); // Crystal Halberd Swipe - this.put(1203, 7); // Crystal Halberd Special + .put(428, 7) // Crystal Halberd Jab, Fend + .put(419, 7) // Crystal Halberd Swipe + .put(1203, 7) // Crystal Halberd Special - this.put(5061, 2); // Toxic Blowpipe Accurate, Rapid, Longrange, Special + .put(5061, 2) // Toxic Blowpipe Accurate, Rapid, Longrange, Special - this.put(1979, 5); // Ancient Magicks Barrage - this.put(1978, 5); // Ancient Magicks Blitz + .put(1979, 5) // Ancient Magicks Barrage + .put(1978, 5) // Ancient Magicks Blitz - this.put(7618, 3); // Chinchompa Short, Medium, Long Fuse - this.put(1658, 4); // Whip Flick, Lash, Deflect + .put(7618, 3) // Chinchompa Short, Medium, Long Fuse + .put(1658, 4) // Whip Flick, Lash, Deflect - this.put(7555, 6); // Ballista Accurate, Rapid, Longrange - } - }; + .put(7555, 6) // Ballista Accurate, Rapid, Longrange + .build(); - private final List MELEE_ANIMATIONS = new ArrayList() - { - { - this.add(422); // Unarmed Punch, Block - this.add(423); // Unarmed Kick - this.add(8145); // Rapier Stab, Lunge, Block - this.add(390); // Rapier Slash + private static final Set MELEE_ANIMATIONS = ImmutableSet.builder() + .add(422) // Unarmed Punch, Block + .add(423) // Unarmed Kick - this.add(401); // Dragon Warhammer Pound, Pummel, Block - this.add(1378); // Dragon Warhammer Special + .add(8145) // Rapier Stab, Lunge, Block + .add(390) // Rapier Slash - this.add(393); // Dragon Claws Chop, Slash, Block - this.add(1067); // Dragon Claws Lunge - this.add(7514); // Dragon Claws Special + .add(401) // Dragon Warhammer Pound, Pummel, Block + .add(1378) // Dragon Warhammer Special - this.add(8288); // Dragon Hunter Lance Lunge, Block - this.add(8289); // Dragon Hunter Lance Swipe - this.add(8290); // Dragon Hunter Lance Pound + .add(393) // Dragon Claws Chop, Slash, Block + .add(1067) // Dragon Claws Lunge + .add(7514) // Dragon Claws Special - this.add(7516); // Elder maul Pound, Pummel, Block + .add(8288) // Dragon Hunter Lance Lunge, Block + .add(8289) // Dragon Hunter Lance Swipe + .add(8290) // Dragon Hunter Lance Pound - this.add(8056); // Scythe of Vitur Reap, Chop, Jab, Block + .add(7516) // Elder maul Pound, Pummel, Block - this.add(7045); // Bandos Godsword Chop, Slash - this.add(7054); // Bandos Godsword Smash - this.add(7055); // Bandos Godsword Block - this.add(7642); // Bandos Godsword Special - this.add(7643); // Bandos Godsword Special (Ornamate) + .add(8056) // Scythe of Vitur Reap, Chop, Jab, Block - this.add(414); // Kodai Bash, Pound, Focus + .add(7045) // Bandos Godsword Chop, Slash + .add(7054) // Bandos Godsword Smash + .add(7055) // Bandos Godsword Block + .add(7642) // Bandos Godsword Special + .add(7643) // Bandos Godsword Special (Ornamate) - this.add(428); // Staff of Light Jab - this.add(440); // Staff of Light Swipe - this.add(419); // Staff of Light Fend + .add(414) // Kodai Bash, Pound, Focus - this.add(428); // Crystal Halberd Jab, Fend - this.add(419); // Crystal Halberd Swipe - this.add(1203); // Crystal Halberd Special + .add(428) // Staff of Light Jab + .add(440) // Staff of Light Swipe + .add(419) // Staff of Light Fend - this.add(1658); // Whip Flick, Lash, Deflect - } - }; + .add(428) // Crystal Halberd Jab, Fend + .add(419) // Crystal Halberd Swipe + .add(1203) // Crystal Halberd Special - private final List RANGE_ANIMATIONS = new ArrayList() - { - { - this.add(7552); // Armadyl Crossbow Accurate, Rapid, Longrange, Special + .add(1658) // Whip Flick, Lash, Deflect + .build(); - this.add(426); // Twisted Bow Accurate, Rapid, Longrange + private static final Set RANGE_ANIMATIONS = ImmutableSet.of( + 7552, // Armadyl Crossbow Accurate, Rapid, Longrange, Special + 426, // Twisted Bow Accurate, Rapid, Longrange + 7618, // Chinchompa Short, Medium, Long Fuse + 7555 // Ballista Accurate, Rapid, Longrange + ); - this.add(7618); // Chinchompa Short, Medium, Long Fuse - - this.add(7555); // Ballista Accurate, Rapid, Longrange - } - }; - - private final List MAGE_ANIMATIONS = new ArrayList() - { - { - this.add(1167); // Trident Accurate, Accurate, Longrange - this.add(1978); // Ancient Magicks Blitz - this.add(1979); // Ancient Magicks Barrage - } - }; + private static final Set MAGE_ANIMATIONS = ImmutableSet.of( + 1167, // Trident Accurate, Accurate, Longrange + 1978, // Ancient Magicks Blitz + 1979 // Ancient Magicks Barrage + ); @Override protected void startUp() throws Exception @@ -298,8 +289,7 @@ public class CombatCounter extends Plugin counter.put(name, ticks); counter = sortByValue(counter); - long BLOWPIPE_ID = 5061; - if (animation == BLOWPIPE_ID) + if (animation == BLOWPIPE_ATTACK) { this.blowpipe.put(name, -4L); } @@ -315,12 +305,12 @@ public class CombatCounter extends Plugin List actives = new ArrayList<>(); actives.add(npc); - if (animation == 1979 || animation == 7618) + if (BARRAGE_ANIMATION == 1979 || CHIN_ANIMATION == 7618) { // Barrage or chin. for (NPC nearby : this.client.getNpcs()) { int distance = npc.getWorldLocation().distanceTo(nearby.getWorldLocation()); - if (distance <= 1 && npc.equals(nearby)) + if (distance <= 1 && npc != nearby) { actives.add(nearby); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java index 20df61077a..06bbe2701c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java @@ -167,7 +167,7 @@ public class CorpPlugin extends Plugin { NPC npc = npcDespawned.getNpc(); - if (npc != null && npc.equals(corp)) + if (npc == corp) { log.debug("Corporeal beast despawn: {}", npc); corp = null; @@ -193,7 +193,7 @@ public class CorpPlugin extends Plugin .build()); } } - else if (npc != null && npc.equals(core)) + else if (npc == core) { core = null; } @@ -204,7 +204,7 @@ public class CorpPlugin extends Plugin { Actor actor = hitsplatApplied.getActor(); - if (actor != null && !actor.equals(corp)) + if (actor != corp) { return; } @@ -224,7 +224,7 @@ public class CorpPlugin extends Plugin Actor source = interactingChanged.getSource(); Actor target = interactingChanged.getTarget(); - if (target != null && !target.equals(corp)) + if (target != corp) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java index 7ae5d58c2a..1b06ce6714 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java @@ -97,7 +97,7 @@ class ItemPricesOverlay extends Overlay switch (action) { case ITEM_USE_ON_WIDGET: - if (!menuEntry.getTarget().contains("High Level Alchemy") || !plugin.isShowAlchProfit()) + if (!client.getSelectedSpellName().equalsIgnoreCase("high level alchemy") || !plugin.isShowAlchProfit()) { return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java index 8a55f1fc21..0f6440b20f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java @@ -33,6 +33,7 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Actor; +import static net.runelite.api.AnimationID.LIZARDMAN_SHAMAN_SPAWN; import net.runelite.api.coords.LocalPoint; import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.ChatMessage; @@ -117,7 +118,7 @@ public class LizardmenShamanPlugin extends Plugin return; } - if (actor.getName().equals(SHAMAN) && actor.getAnimation() == 7157 && this.showTimer) + if (actor.getName().equals(SHAMAN) && actor.getAnimation() == LIZARDMAN_SHAMAN_SPAWN && this.showTimer) { spawns.put(event.getActor().getLocalLocation(), new LizardmenShamanSpawn(8.4, null)); } From a42fef45408271c65c6798fbc422cf17ffa6f81b Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 02:46:20 +0200 Subject: [PATCH 428/472] banlist: Check for manual bans on startup --- .../net/runelite/client/plugins/banlist/BanListPlugin.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java index 384da53621..564c7474fb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java @@ -110,7 +110,12 @@ public class BanListPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - manualBans.addAll(Text.fromCSV(config.getBannedPlayers())); + List bannedPlayers = Splitter + .on(",") + .trimResults() + .omitEmptyStrings() + .splitToList(config.getBannedPlayers()); + manualBans.addAll(bannedPlayers); fetchFromWebsites(); } From c7369f83aec6e681e48270fb8cd11bc0b539fab1 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 02:51:46 +0200 Subject: [PATCH 429/472] combatcounter: Remove duplicate keys --- .../runelite/client/plugins/combatcounter/CombatCounter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java index b1e618466f..1e0079ebd6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java @@ -157,9 +157,9 @@ public class CombatCounter extends Plugin .put(414, 5) // Kodai Bash, Pound, Focus - .put(428, 4) // Staff of Light Jab + // .put(428, 4) // Staff of Light Jab .put(440, 4) // Staff of Light Swipe - .put(419, 4) // Staff of Light Fend + //.put(419, 4) // Staff of Light Fend .put(7967, 4) // Staff of Light Special .put(428, 7) // Crystal Halberd Jab, Fend From b80ca6e2fa86a8a4bd1deb94c62d920ffbba306a Mon Sep 17 00:00:00 2001 From: Zeruth Date: Sun, 7 Jul 2019 21:05:33 -0400 Subject: [PATCH 430/472] Improves bootstrapper. Moves all jars to single folder ./live as it produces bootstrap for easy moving. --- .gitignore | 1 + bootstrap.json => live/bootstrap.json | 42 +++++++++---------- runelite-client/pom.xml | 6 +++ .../java/net/runelite/client/RuneLite.java | 2 +- .../client/util/bootstrap/Bootstrap.java | 14 +++++++ .../client/util/bootstrap/Bootstrapper.java | 6 ++- 6 files changed, 48 insertions(+), 23 deletions(-) rename bootstrap.json => live/bootstrap.json (90%) diff --git a/.gitignore b/.gitignore index 51854a9d2e..28626d1e7c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ git classes/artifacts/client_jar/run.bat classes/artifacts/client_jar/client.jar *.jar +.live/ diff --git a/bootstrap.json b/live/bootstrap.json similarity index 90% rename from bootstrap.json rename to live/bootstrap.json index 2052530dbe..9045d19d54 100644 --- a/bootstrap.json +++ b/live/bootstrap.json @@ -1,5 +1,5 @@ { - "buildCommit": "2d0c2b8eb66a8088b41b29d42ec2a58ead460581", + "buildCommit": "92e2fa38572d949c7cd871dc799706487e436143", "artifacts": [ { "hash": "b12331da8683e5f107d294adeebb83ecf9124abc1db533554d2a8d3c62832d75", @@ -20,10 +20,10 @@ "size": "3168921" }, { - "hash": "4c388a85fb538bbb8cb6e0fd93e0ba0666605123d77b976764818be6f090bbe5", - "name": "client-1.5.28-SNAPSHOT.jar", - "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/client-1.5.28-SNAPSHOT.jar", - "size": "5871886" + "hash": "8cf9a48969c6c6808d919bd5af94e743a73ab0438db53e540eb91ece77ae9d20", + "name": "client-1.5.29-SNAPSHOT.jar", + "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/client-1.5.29-SNAPSHOT.jar", + "size": "6021185" }, { "hash": "18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79", @@ -212,22 +212,22 @@ "size": "2327547" }, { - "hash": "440c629bec3905eb21dc5965fa38464f160a4cb8f87ca76806cdecc18b2c5992", - "name": "runelite-api-1.5.28-SNAPSHOT.jar", - "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/runelite-api-1.5.28-SNAPSHOT.jar", - "size": "1019717" + "hash": "b40a6c04bb69c812985058332e80e7e1c5e25cc7e25f42da5474813a36eea138", + "name": "runelite-api-1.5.29-SNAPSHOT.jar", + "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/runelite-api-1.5.29-SNAPSHOT.jar", + "size": "1027651" }, { - "hash": "45e3bcec9e7bae4ca2facd0fbee1f3da5e0700584e8419deed784a95255552c1", - "name": "runescape-api-1.5.28-SNAPSHOT.jar", - "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/runescape-api-1.5.28-SNAPSHOT.jar", - "size": "56079" + "hash": "051f8c8fb6dfbcdf35c6b266bf4dddbfb1eca44ea3e5319b622dda57a83b0eea", + "name": "runescape-api-1.5.29-SNAPSHOT.jar", + "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/runescape-api-1.5.29-SNAPSHOT.jar", + "size": "58029" }, { - "hash": "811aadce9ce35ac638712da86123d4cb99570a9550614931471295cb26f91c36", - "name": "http-api-1.5.28-SNAPSHOT.jar", - "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/http-api-1.5.28-SNAPSHOT.jar", - "size": "101785" + "hash": "542ef6f3b6948da98edbb631e2b07d2e61b446104c8bffabc1209930a5b22449", + "name": "http-api-1.5.29-SNAPSHOT.jar", + "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/http-api-1.5.29-SNAPSHOT.jar", + "size": "115764" }, { "hash": "f55abda036da75e1af45bd43b9dfa79b2a3d90905be9cb38687c6621597a8165", @@ -254,10 +254,10 @@ "size": "617294" }, { - "hash": "a3cab9293960d1d61968ce1591c87859ddcaa6cb2faca554cc938961c8fb3d3a", - "name": "injected-client-1.5.28-SNAPSHOT.jar", - "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/injected-client-1.5.28-SNAPSHOT.jar", - "size": "2193046" + "hash": "f5ef960f1f639254c164d72585c2ea0ccd7cd4e707b45a5209142479f075eede", + "name": "injected-client-1.5.29-SNAPSHOT.jar", + "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/injected-client-1.5.29-SNAPSHOT.jar", + "size": "2196522" } ], "client": { diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 50735fa911..bf9d9ef83d 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -284,6 +284,12 @@ asm-all 6.0_BETA + + org.codehaus.plexus + plexus-utils + 3.0.21 + compile + diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java index 862ddd2981..7acdecb815 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java @@ -83,7 +83,7 @@ import org.slf4j.LoggerFactory; @Slf4j public class RuneLite { - public static final String RUNELIT_VERSION = "2.0.1-1"; + public static final String RUNELIT_VERSION = "2.0.2"; public static final File RUNELITE_DIR = new File(System.getProperty("user.home"), ".runelite"); public static final File PROFILES_DIR = new File(RUNELITE_DIR, "profiles"); public static final File PLUGIN_DIR = new File(RUNELITE_DIR, "plugins"); diff --git a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java index b8e6d60d94..58db27b079 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java +++ b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java @@ -11,6 +11,7 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import javax.xml.bind.DatatypeConverter; import net.runelite.http.api.RuneLiteAPI; +import org.codehaus.plexus.util.FileUtils; public class Bootstrap { @@ -84,6 +85,14 @@ public class Bootstrap } + public void copyTodir(String origPath, String newPath) { + try { + FileUtils.copyFileToDirectory(new File(origPath), new File(newPath)); + } catch (IOException e) { + e.printStackTrace(); + } + } + private static String bytesToHex(byte[] hashInBytes) { @@ -300,26 +309,31 @@ public class Bootstrap artifacts[3].hash = getChecksumFile("./runelite-client/target/" + artifacts[3].name); artifacts[3].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/" + artifacts[3].name; artifacts[3].size = Long.toString(getFileSize("./runelite-client/target/" + artifacts[3].name)); + copyTodir("./runelite-client/target/" + artifacts[3].name, "./live/"); artifacts[35] = new Artifact(); artifacts[35].name = "runelite-api-" + RuneLiteAPI.getVersion() + ".jar"; artifacts[35].hash = getChecksumFile("./runelite-api/target/" + artifacts[35].name); artifacts[35].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/" + artifacts[35].name; artifacts[35].size = Long.toString(getFileSize("./runelite-api/target/" + artifacts[35].name)); + copyTodir("./runelite-api/target/" + artifacts[35].name, "./live/"); artifacts[36] = new Artifact(); artifacts[36].name = "runescape-api-" + RuneLiteAPI.getVersion() + ".jar"; artifacts[36].hash = getChecksumFile("./runescape-api/target/" + artifacts[36].name); artifacts[36].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/" + artifacts[36].name; artifacts[36].size = Long.toString(getFileSize("./runescape-api/target/" + artifacts[36].name)); + copyTodir("./runescape-api/target/" + artifacts[36].name, "./live/"); artifacts[37] = new Artifact(); artifacts[37].name = "http-api-" + RuneLiteAPI.getVersion() + ".jar"; artifacts[37].hash = getChecksumFile("./http-api/target/" + artifacts[37].name); artifacts[37].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/" + artifacts[37].name; artifacts[37].size = Long.toString(getFileSize("./http-api/target/" + artifacts[37].name)); + copyTodir("./http-api/target/" + artifacts[37].name, "./live/"); artifacts[42] = new Artifact(); artifacts[42].name = "injected-client-" + RuneLiteAPI.getVersion() + ".jar"; artifacts[42].hash = getChecksumFile("./injected-client/target/" + artifacts[42].name); artifacts[42].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/" + artifacts[42].name; artifacts[42].size = Long.toString(getFileSize("./injected-client/target/" + artifacts[42].name)); + copyTodir("./injected-client/target/" + artifacts[42].name, "./live/"); } catch (IOException | NoSuchAlgorithmException e) { diff --git a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java index b74b0453c2..7e21bed246 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java +++ b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java @@ -2,6 +2,8 @@ package net.runelite.client.util.bootstrap; import com.google.gson.Gson; import com.google.gson.GsonBuilder; + +import java.io.File; import java.io.FileWriter; public class Bootstrapper @@ -10,7 +12,9 @@ public class Bootstrapper public static void main(String[] args) { Gson gson = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create(); - try (FileWriter fw = new FileWriter("./bootstrap.json")) + File dir = new File("./live/"); + dir.mkdir(); + try (FileWriter fw = new FileWriter("./live/bootstrap.json")) { gson.toJson(new Bootstrap(), fw); } From b440389b1f489816882ec65e24c27bccf9112631 Mon Sep 17 00:00:00 2001 From: Tyler Bochard Date: Sun, 7 Jul 2019 21:50:34 -0400 Subject: [PATCH 431/472] Create FUNDING.yml --- .github/FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000000..0c53255148 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +patreon: RuneLitePlus From 75e4c63948232db89956cea80fe2ba478f820c38 Mon Sep 17 00:00:00 2001 From: Zeruth Date: Sun, 7 Jul 2019 22:23:10 -0400 Subject: [PATCH 432/472] checkstyle fix for bootstrap use RuneLite.RuneLitVersion for splash update bootstrap to live --- live/bootstrap.json | 18 ++++---- .../client/ui/RuneLiteSplashScreen.java | 3 +- .../client/util/bootstrap/Bootstrap.java | 45 ++++++++++--------- 3 files changed, 36 insertions(+), 30 deletions(-) diff --git a/live/bootstrap.json b/live/bootstrap.json index 9045d19d54..1745408e52 100644 --- a/live/bootstrap.json +++ b/live/bootstrap.json @@ -1,5 +1,5 @@ { - "buildCommit": "92e2fa38572d949c7cd871dc799706487e436143", + "buildCommit": "b82c8903c64695d44b255d45b449440e4eaa17ef", "artifacts": [ { "hash": "b12331da8683e5f107d294adeebb83ecf9124abc1db533554d2a8d3c62832d75", @@ -20,10 +20,10 @@ "size": "3168921" }, { - "hash": "8cf9a48969c6c6808d919bd5af94e743a73ab0438db53e540eb91ece77ae9d20", + "hash": "bc9ad97e68f88e53d6e5844a5b02e8b874cb7f0bbdd08a99c4529caf9148e99f", "name": "client-1.5.29-SNAPSHOT.jar", "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/client-1.5.29-SNAPSHOT.jar", - "size": "6021185" + "size": "6018354" }, { "hash": "18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79", @@ -212,10 +212,10 @@ "size": "2327547" }, { - "hash": "b40a6c04bb69c812985058332e80e7e1c5e25cc7e25f42da5474813a36eea138", + "hash": "aa603ad557917ad4c14f0683195c481e84760e2c12cf7564f4ad9a22f66fe9d6", "name": "runelite-api-1.5.29-SNAPSHOT.jar", "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/runelite-api-1.5.29-SNAPSHOT.jar", - "size": "1027651" + "size": "1027726" }, { "hash": "051f8c8fb6dfbcdf35c6b266bf4dddbfb1eca44ea3e5319b622dda57a83b0eea", @@ -224,10 +224,10 @@ "size": "58029" }, { - "hash": "542ef6f3b6948da98edbb631e2b07d2e61b446104c8bffabc1209930a5b22449", + "hash": "9084498c38d640206ec099578ec21f0e52ff1afab5d77580e12e27f59b9987c8", "name": "http-api-1.5.29-SNAPSHOT.jar", "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/http-api-1.5.29-SNAPSHOT.jar", - "size": "115764" + "size": "115763" }, { "hash": "f55abda036da75e1af45bd43b9dfa79b2a3d90905be9cb38687c6621597a8165", @@ -254,10 +254,10 @@ "size": "617294" }, { - "hash": "f5ef960f1f639254c164d72585c2ea0ccd7cd4e707b45a5209142479f075eede", + "hash": "48bfa99ac87f3c3b8d555efd2ac3a84f636e8f9fd282284f87df77cd9feacfa6", "name": "injected-client-1.5.29-SNAPSHOT.jar", "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/injected-client-1.5.29-SNAPSHOT.jar", - "size": "2196522" + "size": "2196574" } ], "client": { diff --git a/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java b/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java index 7974c121bd..1427745ea0 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java @@ -40,6 +40,7 @@ import javax.swing.JProgressBar; import javax.swing.SwingUtilities; import javax.swing.plaf.basic.BasicProgressBarUI; import lombok.extern.slf4j.Slf4j; +import net.runelite.client.RuneLite; import net.runelite.client.RuneLiteProperties; import net.runelite.client.util.SwingUtil; import org.pushingpixels.substance.internal.SubstanceSynapse; @@ -127,7 +128,7 @@ public class RuneLiteSplashScreen panel.add(version, versionConstraints); // version - final JLabel litVersion = new JLabel("Plus Version : " + runeLiteProperties.getRunelitVersion()); + final JLabel litVersion = new JLabel("Plus Version : " + RuneLite.RUNELIT_VERSION); litVersion.setForeground(Color.GREEN); litVersion.setFont(FontManager.getRunescapeSmallFont()); litVersion.setForeground(litVersion.getForeground().darker()); diff --git a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java index 58db27b079..e22256425b 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java +++ b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java @@ -15,16 +15,7 @@ import org.codehaus.plexus.util.FileUtils; public class Bootstrap { - class Artifact - { - String hash; - String name; - String path; - String size; - } - - String buildCommit = "2d0c2b8eb66a8088b41b29d42ec2a58ead460581"; - private Artifact[] artifacts = getArtifacts(); + String buildCommit = "b82c8903c64695d44b255d45b449440e4eaa17ef"; Client client = new Client(); String[] clientJvm9Arguments = new String[]{ "-XX:+DisableAttachMechanism", @@ -53,7 +44,7 @@ public class Bootstrap "-XX:+UseConcMarkSweepGC", "-XX:+UseParNewGC", "-Djna.nosys=true"}; - + private Artifact[] artifacts = getArtifacts(); Bootstrap() { } @@ -77,7 +68,9 @@ public class Bootstrap try (DigestInputStream dis = new DigestInputStream(new FileInputStream(filepath), md)) { //empty loop to clear the data - while (dis.read() != -1); + while (dis.read() != -1) + { + } md = dis.getMessageDigest(); } @@ -85,14 +78,6 @@ public class Bootstrap } - public void copyTodir(String origPath, String newPath) { - try { - FileUtils.copyFileToDirectory(new File(origPath), new File(newPath)); - } catch (IOException e) { - e.printStackTrace(); - } - } - private static String bytesToHex(byte[] hashInBytes) { @@ -105,6 +90,18 @@ public class Bootstrap } + public void copyTodir(String origPath, String newPath) + { + try + { + FileUtils.copyFileToDirectory(new File(origPath), new File(newPath)); + } + catch (IOException e) + { + e.printStackTrace(); + } + } + private Artifact[] getArtifacts() { try @@ -348,4 +345,12 @@ public class Bootstrap return f.length(); } + class Artifact + { + String hash; + String name; + String path; + String size; + } + } From 9a98431ddbb9e871b3a6e5fc9fc9bf950c7f9438 Mon Sep 17 00:00:00 2001 From: Zeruth Date: Sun, 7 Jul 2019 22:47:48 -0400 Subject: [PATCH 433/472] removes rl-client.rs.mixins --- .../client/rs/mixins/MixinRunner.java | 134 -------- .../transformers/AppendTransformer.java | 120 ------- .../transformers/DoNothingTransformer.java | 38 --- .../transformers/InjectTransformer.java | 125 -------- .../transformers/InterfaceTransformer.java | 77 ----- .../mixins/transformers/MethodReflector.java | 295 ------------------ .../transformers/OverwriteSanityCheck.java | 86 ----- .../transformers/OverwriteTransformer.java | 102 ------ .../transformers/PrependTransformer.java | 125 -------- .../transformers/ProtectTransformer.java | 51 --- .../rs/mixins/transformers/SanityChecker.java | 38 --- 11 files changed, 1191 deletions(-) delete mode 100644 runelite-client/src/main/java/net/runelite/client/rs/mixins/MixinRunner.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/AppendTransformer.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/DoNothingTransformer.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/InjectTransformer.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/InterfaceTransformer.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/MethodReflector.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/OverwriteSanityCheck.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/OverwriteTransformer.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/PrependTransformer.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/ProtectTransformer.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/SanityChecker.java diff --git a/runelite-client/src/main/java/net/runelite/client/rs/mixins/MixinRunner.java b/runelite-client/src/main/java/net/runelite/client/rs/mixins/MixinRunner.java deleted file mode 100644 index b43179e044..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/rs/mixins/MixinRunner.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (c) 2019, ThatGamerBlue - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package net.runelite.client.rs.mixins; - -import java.lang.reflect.InvocationTargetException; -import java.util.Map; -import lombok.RequiredArgsConstructor; -import net.runelite.client.rs.mixins.transformers.DoNothingTransformer; -import net.runelite.client.rs.mixins.transformers.SanityChecker; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.commons.ClassRemapper; -import org.objectweb.asm.commons.Remapper; -import org.objectweb.asm.tree.ClassNode; - -@RequiredArgsConstructor -public class MixinRunner -{ - - private final Map classes; - private final Map patches; - - public Map run() - throws NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException - { - // runVisitor(InterfaceTransformer.class); - // runVisitor(OverwriteTransformer.class); - // runSanityChecker(OverwriteSanityCheck.class); - // runVisitor(InjectTransformer.class); - // runVisitor(AppendTransformer.class); // append has to come before prepend or append does nothing - // (test method: Projectile.rl$$init()V ) - // runVisitor(PrependTransformer.class); - // runRemapper(ProtectTransformer.class); - - // recalcMaxes(); - return classes; - } - - private void runRemapper(Class clazz) throws IllegalAccessException, InstantiationException - { - for (Map.Entry entry : classes.entrySet()) - { - if (entry.getKey().contains("META-INF")) - { - continue; - } - Remapper inst = clazz.newInstance(); - ClassReader cr = new ClassReader(entry.getValue()); - ClassWriter cw = new ClassWriter(cr, 1); - cr.accept(new ClassRemapper(cw, inst), 0); - - entry.setValue(cw.toByteArray()); - } - } - - private void runVisitor(Class clazz) - throws IllegalAccessException, NoSuchMethodException, InvocationTargetException, InstantiationException - { - runVisitor(clazz, 1); - } - - private void runVisitor(Class clazz, int flags) - throws IllegalAccessException, NoSuchMethodException, InvocationTargetException, InstantiationException - { - for (Map.Entry entry : classes.entrySet()) - { - if (entry.getKey().contains("META-INF")) - { - continue; - } - ClassReader cr = new ClassReader(entry.getValue()); - ClassWriter cw = new ClassWriter(cr, flags); - byte[] patch = patches.getOrDefault(entry.getKey(), null); - ClassNode node = new ClassNode(); - cr.accept(node, 0); - ClassVisitor inst = clazz.getConstructor(ClassVisitor.class, byte[].class, ClassNode.class).newInstance(cw, - patch, node); - cr.accept(inst, 0); - - entry.setValue(cw.toByteArray()); - } - } - - private void runSanityChecker(Class clazz) - throws IllegalAccessException, NoSuchMethodException, InvocationTargetException, InstantiationException - { - runSanityChecker(clazz, 1); - } - - private void runSanityChecker(Class clazz, int flags) - throws IllegalAccessException, NoSuchMethodException, InvocationTargetException, InstantiationException - { - for (Map.Entry entry : patches.entrySet()) - { - ClassReader cr = new ClassReader(entry.getValue()); - ClassWriter cw = new ClassWriter(cr, flags); - ClassNode node = new ClassNode(); - cr.accept(node, 0); - SanityChecker inst = clazz.getConstructor(ClassVisitor.class, ClassNode.class).newInstance(cw, node); - cr.accept(inst, 0); - } - } - - private void recalcMaxes() - throws InvocationTargetException, NoSuchMethodException, InstantiationException, IllegalAccessException - { - runVisitor(DoNothingTransformer.class, 3); - } - -} diff --git a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/AppendTransformer.java b/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/AppendTransformer.java deleted file mode 100644 index 5ee15c84c8..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/AppendTransformer.java +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Copyright (c) 2019, ThatGamerBlue - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package net.runelite.client.rs.mixins.transformers; - -import lombok.extern.slf4j.Slf4j; -import net.runelite.client.util.RefUtils; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Opcodes; -import org.objectweb.asm.tree.AbstractInsnNode; -import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.LabelNode; -import org.objectweb.asm.tree.LineNumberNode; -import org.objectweb.asm.tree.MethodNode; - -@Slf4j -public class AppendTransformer extends ClassVisitor implements Opcodes -{ - - private final byte[] patch; - private String className; - private ClassNode classNode; - - public AppendTransformer(ClassVisitor classVisitor, byte[] patch, ClassNode node) - { - super(Opcodes.ASM6, classVisitor); - this.patch = patch; - this.classNode = node; - } - - @Override - public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) - { - className = name; - super.visit(version, access, name, signature, superName, interfaces); - } - - @Override - public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) - { - if (patch == null) - { - return super.visitMethod(access, name, descriptor, signature, exceptions); - } - ClassReader cr = new ClassReader(patch); - ClassNode patchNode = new ClassNode(Opcodes.ASM6); - cr.accept(patchNode, 0); - for (Object obj : patchNode.methods) - { - MethodNode patchMethod = (MethodNode) obj; - if ((patchMethod.access == access && patchMethod.name.equals("append$" + name) && - patchMethod.desc.equals(descriptor)) && - RefUtils.checkAnnotation(patchMethod, "Append")) - { - MethodVisitor mv = - new MethodVisitor(Opcodes.ASM6, super.visitMethod(access, name, descriptor, signature, - exceptions)) - { - }; - mv.visitCode(); - - for (Object obj2 : classNode.methods) - { - MethodNode classMethod = (MethodNode) obj2; - if (classMethod.access == access && classMethod.name.equals(name) && - classMethod.desc.equals(descriptor)) - { - AbstractInsnNode inode = classMethod.instructions.getLast(); - - while (inode instanceof LabelNode || inode instanceof LineNumberNode) - { - inode = inode.getPrevious(); - } - - if (RefUtils.isReturn(inode.getOpcode(), true)) - { - log.error("[Append] Can't append to {}.{}, requires typed return opcode", className, name); - return super.visitMethod(access, name, descriptor, signature, exceptions); - } - - classMethod.instructions.remove(inode); - - classMethod.accept(new MethodReflector(mv)); - break; - } - } - - patchMethod.accept(new MethodReflector(mv)); - - mv.visitEnd(); - return mv; - } - } - return super.visitMethod(access, name, descriptor, signature, exceptions); - } -} diff --git a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/DoNothingTransformer.java b/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/DoNothingTransformer.java deleted file mode 100644 index 7f6079c792..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/DoNothingTransformer.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2019, ThatGamerBlue - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package net.runelite.client.rs.mixins.transformers; - -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.Opcodes; -import org.objectweb.asm.tree.ClassNode; - -public class DoNothingTransformer extends ClassVisitor -{ - public DoNothingTransformer(ClassVisitor parent, byte[] patch, ClassNode node) - { - super(Opcodes.ASM6, parent); - } -} diff --git a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/InjectTransformer.java b/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/InjectTransformer.java deleted file mode 100644 index 29fb2bf554..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/InjectTransformer.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (c) 2019, ThatGamerBlue - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package net.runelite.client.rs.mixins.transformers; - -import net.runelite.client.util.RefUtils; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Opcodes; -import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.FieldNode; -import org.objectweb.asm.tree.MethodNode; - -public class InjectTransformer extends ClassVisitor -{ - - private final byte[] patch; - private ClassNode node; - private String className; - private boolean patching = false; - - public InjectTransformer(ClassVisitor classVisitor, byte[] patch, ClassNode node) - { - super(Opcodes.ASM6, classVisitor); - this.patch = patch; - this.node = node; - } - - @Override - public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) - { - className = name; - super.visit(version, access, name, signature, superName, interfaces); - } - - @Override - public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) - { - if (patch == null || name.startsWith("1protect$")) - { - return super.visitMethod(access, name, descriptor, signature, exceptions); - } - if (name.startsWith("prepend$") || name.startsWith("append$") || - (patching && name.startsWith("<"))) - { - return null; - } - MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions); - ClassReader cr = new ClassReader(patch); - ClassNode patchNode = new ClassNode(Opcodes.ASM6); - cr.accept(patchNode, 0); - for (Object obj : patchNode.methods) - { - MethodNode node = (MethodNode) obj; - if ((node.access == access && node.name.equals(name) && node.desc.equals(descriptor)) && - RefUtils.checkAnnotation(node, "Inject")) - { - mv.visitCode(); - node.accept(new MethodReflector(mv)); - mv.visitEnd(); - } - } - return mv; - } - - @Override - public void visitEnd() - { - - if (patch == null) - { - super.visitEnd(); - return; - } - - ClassReader cr = new ClassReader(patch); - ClassNode patchNode = new ClassNode(Opcodes.ASM6); - cr.accept(patchNode, 0); - patching = true; - for (Object obj : patchNode.methods) - { - MethodNode node = (MethodNode) obj; - if (RefUtils.checkAnnotation(node, "Inject")) - { - visitMethod(node.access, node.name, node.desc, node.signature, - (String[]) node.exceptions.toArray(new String[0])); - } - } - - for (Object obj : patchNode.fields) - { - FieldNode node = (FieldNode) obj; - if (RefUtils.checkAnnotation(node, "Inject")) - { - visitField(node.access, node.name, node.desc, node.signature, node.value); - } - } - patching = false; - super.visitEnd(); - } - -} diff --git a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/InterfaceTransformer.java b/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/InterfaceTransformer.java deleted file mode 100644 index 850e3be921..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/InterfaceTransformer.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) 2019, ThatGamerBlue - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package net.runelite.client.rs.mixins.transformers; - -import java.util.ArrayList; -import java.util.Arrays; -import lombok.extern.slf4j.Slf4j; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.Opcodes; -import org.objectweb.asm.tree.ClassNode; - -@Slf4j -public class InterfaceTransformer extends ClassVisitor implements Opcodes -{ - - private final byte[] patch; - private ClassNode node; - private String className; - - public InterfaceTransformer(ClassVisitor classVisitor, byte[] patch, ClassNode node) - { - super(Opcodes.ASM6, classVisitor); - this.patch = patch; - this.node = node; - } - - @Override - public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) - { - className = name; - if (patch != null) - { - ClassReader reader = new ClassReader(patch); - ClassNode pNode = new ClassNode(); - reader.accept(pNode, 0); - if (pNode.interfaces != null && pNode.interfaces.size() != 0) - { - if (interfaces == null) - { - interfaces = (String[]) pNode.interfaces.toArray(new String[0]); - } - else - { - ArrayList list = new ArrayList<>(Arrays.asList(interfaces)); - pNode.interfaces.forEach((s) -> list.add((String) s)); - interfaces = list.toArray(new String[0]); - } - } - } - super.visit(version, access, name, signature, superName, interfaces); - } - -} diff --git a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/MethodReflector.java b/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/MethodReflector.java deleted file mode 100644 index a6f6813c49..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/MethodReflector.java +++ /dev/null @@ -1,295 +0,0 @@ -/* - * Copyright (c) 2019, ThatGamerBlue - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package net.runelite.client.rs.mixins.transformers; - -import org.objectweb.asm.AnnotationVisitor; -import org.objectweb.asm.Attribute; -import org.objectweb.asm.Handle; -import org.objectweb.asm.Label; -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Opcodes; -import org.objectweb.asm.TypePath; - -public class MethodReflector extends MethodVisitor -{ - - private MethodVisitor target; - - public MethodReflector(MethodVisitor target) - { - super(Opcodes.ASM6); - this.target = target; - } - - public void visitParameter(String var1, int var2) - { - if (target != null) - { - target.visitParameter(var1, var2); - } - super.visitParameter(var1, var2); - } - - public AnnotationVisitor visitAnnotationDefault() - { - return super.visitAnnotationDefault(); - } - - public AnnotationVisitor visitAnnotation(String var1, boolean var2) - { - return super.visitAnnotation(var1, var2); - } - - public AnnotationVisitor visitTypeAnnotation(int var1, TypePath var2, String var3, boolean var4) - { - return super.visitTypeAnnotation(var1, var2, var3, var4); - } - - public AnnotationVisitor visitParameterAnnotation(int var1, String var2, boolean var3) - { - return super.visitParameterAnnotation(var1, var2, var3); - } - - public void visitAttribute(Attribute var1) - { - if (target != null) - { - target.visitAttribute(var1); - } - super.visitAttribute(var1); - } - - public void visitFrame(int var1, int var2, Object[] var3, int var4, Object[] var5) - { - if (target != null) - { - target.visitFrame(var1, var2, var3, var4, var5); - } - super.visitFrame(var1, var2, var3, var4, var5); - } - - public void visitInsn(int var1) - { - if (target != null) - { - target.visitInsn(var1); - } - super.visitInsn(var1); - } - - public void visitIntInsn(int var1, int var2) - { - if (target != null) - { - target.visitIntInsn(var1, var2); - } - super.visitIntInsn(var1, var2); - } - - public void visitVarInsn(int var1, int var2) - { - if (target != null) - { - target.visitVarInsn(var1, var2); - } - super.visitVarInsn(var1, var2); - } - - public void visitTypeInsn(int var1, String var2) - { - if (target != null) - { - target.visitTypeInsn(var1, var2); - } - super.visitTypeInsn(var1, var2); - } - - public void visitFieldInsn(int var1, String var2, String var3, String var4) - { - if (target != null) - { - target.visitFieldInsn(var1, var2, var3, var4); - } - super.visitFieldInsn(var1, var2, var3, var4); - } - - /** - * @deprecated - */ - public void visitMethodInsn(int var1, String var2, String var3, String var4) - { - if (target != null) - { - target.visitMethodInsn(var1, var2, var3, var4); - } - super.visitMethodInsn(var1, var2, var3, var4); - } - - public void visitMethodInsn(int var1, String var2, String var3, String var4, boolean var5) - { - if (target != null) - { - target.visitMethodInsn(var1, var2, var3, var4, var5); - } - super.visitMethodInsn(var1, var2, var3, var4, var5); - } - - public void visitInvokeDynamicInsn(String var1, String var2, Handle var3, Object... var4) - { - if (target != null) - { - target.visitInvokeDynamicInsn(var1, var2, var3, var4); - } - super.visitInvokeDynamicInsn(var1, var2, var3, var4); - } - - public void visitJumpInsn(int var1, Label var2) - { - if (target != null) - { - target.visitJumpInsn(var1, var2); - } - super.visitJumpInsn(var1, var2); - } - - public void visitLabel(Label var1) - { - if (target != null) - { - target.visitLabel(var1); - } - super.visitLabel(var1); - } - - public void visitLdcInsn(Object var1) - { - if (target != null) - { - target.visitLdcInsn(var1); - } - super.visitLdcInsn(var1); - } - - public void visitIincInsn(int var1, int var2) - { - if (target != null) - { - target.visitIincInsn(var1, var2); - } - super.visitIincInsn(var1, var2); - } - - public void visitTableSwitchInsn(int var1, int var2, Label var3, Label... var4) - { - if (target != null) - { - target.visitTableSwitchInsn(var1, var2, var3, var4); - } - super.visitTableSwitchInsn(var1, var2, var3, var4); - } - - public void visitLookupSwitchInsn(Label var1, int[] var2, Label[] var3) - { - if (target != null) - { - target.visitLookupSwitchInsn(var1, var2, var3); - } - super.visitLookupSwitchInsn(var1, var2, var3); - } - - public void visitMultiANewArrayInsn(String var1, int var2) - { - if (target != null) - { - target.visitMultiANewArrayInsn(var1, var2); - } - super.visitMultiANewArrayInsn(var1, var2); - } - - public AnnotationVisitor visitInsnAnnotation(int var1, TypePath var2, String var3, boolean var4) - { - if (target != null) - { - target.visitInsnAnnotation(var1, var2, var3, var4); - } - return super.visitInsnAnnotation(var1, var2, var3, var4); - } - - public void visitTryCatchBlock(Label var1, Label var2, Label var3, String var4) - { - if (target != null) - { - target.visitTryCatchBlock(var1, var2, var3, var4); - } - super.visitTryCatchBlock(var1, var2, var3, var4); - } - - public AnnotationVisitor visitTryCatchAnnotation(int var1, TypePath var2, String var3, boolean var4) - { - if (target != null) - { - target.visitTryCatchAnnotation(var1, var2, var3, var4); - } - return super.visitTryCatchAnnotation(var1, var2, var3, var4); - } - - public void visitLocalVariable(String var1, String var2, String var3, Label var4, Label var5, int var6) - { - if (target != null) - { - target.visitLocalVariable(var1, var2, var3, var4, var5, var6); - } - super.visitLocalVariable(var1, var2, var3, var4, var5, var6); - } - - public AnnotationVisitor visitLocalVariableAnnotation(int var1, TypePath var2, Label[] var3, Label[] var4, int[] var5, String var6, boolean var7) - { - if (target != null) - { - target.visitLocalVariableAnnotation(var1, var2, var3, var4, var5, var6, var7); - } - return super.visitLocalVariableAnnotation(var1, var2, var3, var4, var5, var6, var7); - } - - public void visitLineNumber(int var1, Label var2) - { - if (target != null) - { - target.visitLineNumber(var1, var2); - } - super.visitLineNumber(var1, var2); - } - - public void visitMaxs(int var1, int var2) - { - if (target != null) - { - target.visitMaxs(var1, var2); - } - super.visitMaxs(var1, var2); - } - -} diff --git a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/OverwriteSanityCheck.java b/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/OverwriteSanityCheck.java deleted file mode 100644 index 37c0ca9d65..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/OverwriteSanityCheck.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (c) 2019, ThatGamerBlue - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package net.runelite.client.rs.mixins.transformers; - -import java.util.ArrayList; -import lombok.extern.slf4j.Slf4j; -import net.runelite.client.util.RefUtils; -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Opcodes; -import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.MethodNode; - -@Slf4j -public class OverwriteSanityCheck extends SanityChecker implements Opcodes -{ - - private String className; - private ClassNode patchNode; - public static final ArrayList methodsUsed = new ArrayList<>(); - - public OverwriteSanityCheck(ClassVisitor classVisitor, ClassNode node) - { - super(ASM6, classVisitor); - this.className = node.name; - this.patchNode = node; - } - - @Override - public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) - { - String check = String.format("%s %s %s %s", className, name, - descriptor, access); - - MethodNode methodNode = null; - for (Object obj2 : patchNode.methods) - { - MethodNode classMethod = (MethodNode) obj2; - if (classMethod.access == access && classMethod.name.equals(name) && - classMethod.desc.equals(descriptor)) - { - methodNode = classMethod; - } - } - - if (methodNode == null) - { - log.error("[OverwriteSanity] Failed to find original patch method for {}", check); - return super.visitMethod(access, name, descriptor, signature, exceptions); - } - - if (!RefUtils.checkAnnotation(methodNode, "Overwrite")) - { - return super.visitMethod(access, name, descriptor, signature, exceptions); - } - - if (!methodsUsed.contains(check)) - { - throw new RuntimeException("[OverwriteSanity] Overwrite target not found: " + check); - } - return super.visitMethod(access, name, descriptor, signature, exceptions); - } -} diff --git a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/OverwriteTransformer.java b/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/OverwriteTransformer.java deleted file mode 100644 index 9decd259bd..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/OverwriteTransformer.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (c) 2019, ThatGamerBlue - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package net.runelite.client.rs.mixins.transformers; - -import lombok.extern.slf4j.Slf4j; -import net.runelite.client.util.RefUtils; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Opcodes; -import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.MethodNode; - -@Slf4j -public class OverwriteTransformer extends ClassVisitor -{ - - private final byte[] patch; - private ClassNode node; - private String className; - - public OverwriteTransformer(ClassVisitor classVisitor, byte[] patch, ClassNode node) - { - super(Opcodes.ASM6, classVisitor); - this.patch = patch; - this.node = node; - this.className = node.name; - } - - @Override - public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) - { - className = name; - super.visit(version, access, name, signature, superName, interfaces); - } - - @Override - public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) - { - if (patch == null || name.startsWith("1protect$")) - { - return super.visitMethod(access, name, descriptor, signature, exceptions); - } - - if (name.startsWith("prepend$") || name.startsWith("append$")) - { - return null; - } - - ClassReader cr = new ClassReader(patch); - ClassNode patchNode = new ClassNode(Opcodes.ASM6); - cr.accept(patchNode, 0); - - for (Object obj : patchNode.methods) - { - MethodNode patchMethod = (MethodNode) obj; - - if (patchMethod.access == access && patchMethod.name.equals(name) && patchMethod.desc.equals(descriptor)) - { - if (RefUtils.checkAnnotation(patchMethod, "Overwrite")) - { - MethodVisitor mv = - new MethodVisitor(Opcodes.ASM6, super.visitMethod(access, name, descriptor, signature, - exceptions)) - { - }; - mv.visitCode(); - patchMethod.accept(new MethodReflector(mv)); - mv.visitEnd(); - String s = String.format("%s %s %s %s", className, patchMethod.name, - patchMethod.desc, patchMethod.access); - OverwriteSanityCheck.methodsUsed.add(s); - return mv; - } - } - } - return super.visitMethod(access, name, descriptor, signature, exceptions); - } -} diff --git a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/PrependTransformer.java b/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/PrependTransformer.java deleted file mode 100644 index e06c4703ea..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/PrependTransformer.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (c) 2019, ThatGamerBlue - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package net.runelite.client.rs.mixins.transformers; - -import net.runelite.client.util.RefUtils; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Opcodes; -import org.objectweb.asm.tree.AbstractInsnNode; -import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.InsnNode; -import org.objectweb.asm.tree.MethodNode; - -public class PrependTransformer extends ClassVisitor -{ - - private final byte[] patch; - private String className; - private ClassNode classNode; - - public PrependTransformer(ClassVisitor classVisitor, byte[] patch, ClassNode node) - { - super(Opcodes.ASM6, classVisitor); - this.patch = patch; - this.classNode = node; - } - - @Override - public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) - { - className = name; - super.visit(version, access, name, signature, superName, interfaces); - } - - @Override - public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) - { - if (patch == null) - { - return super.visitMethod(access, name, descriptor, signature, exceptions); - } - ClassReader cr = new ClassReader(patch); - ClassNode patchNode = new ClassNode(Opcodes.ASM6); - cr.accept(patchNode, 0); - for (Object obj : patchNode.methods) - { - MethodNode patchMethod = (MethodNode) obj; - if ((patchMethod.access == access && patchMethod.name.equals("prepend$" + name) && - patchMethod.desc.equals(descriptor)) && - RefUtils.checkAnnotation(patchMethod, "Prepend")) - { - MethodVisitor mv = - new MethodVisitor(Opcodes.ASM6, super.visitMethod(access, name, descriptor, signature, - exceptions)) - { - }; - mv.visitCode(); - - AbstractInsnNode node = patchMethod.instructions.getLast(); - while (!(node instanceof InsnNode)) - { - node = node.getPrevious(); - } - - if (RefUtils.isReturn(node.getOpcode())) - { - patchMethod.instructions.remove(node); - } - - patchMethod.accept(new MethodReflector(mv)); - - for (Object obj2 : classNode.methods) - { - MethodNode classMethod = (MethodNode) obj2; - if (classMethod.access == access && classMethod.name.equals(name) && - classMethod.desc.equals(descriptor)) - { - classMethod.accept(new MethodReflector(mv)); - break; - } - } - - mv.visitEnd(); - return mv; - } - } - return super.visitMethod(access, name, descriptor, signature, exceptions); - } - - @Override - public void visitEnd() - { - if (patch == null) - { - super.visitEnd(); - return; - } - super.visitEnd(); - } - -} diff --git a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/ProtectTransformer.java b/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/ProtectTransformer.java deleted file mode 100644 index 51a96cfc14..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/ProtectTransformer.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2019, ThatGamerBlue - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package net.runelite.client.rs.mixins.transformers; - -import org.objectweb.asm.commons.Remapper; - -public class ProtectTransformer extends Remapper -{ - - public String mapFieldName(String owner, String name, String descriptor) - { - if (name.startsWith("1protect$")) - { - name = name.substring("1protect$".length()); - } - return super.mapFieldName(owner, name, descriptor); - } - - public String mapMethodName(String owner, String name, String descriptor) - { - if (name.startsWith("1protect$")) - { - name = name.substring("1protect$".length()); - } - return super.mapMethodName(owner, name, descriptor); - } - -} diff --git a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/SanityChecker.java b/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/SanityChecker.java deleted file mode 100644 index 4581b00c59..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/SanityChecker.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2019, ThatGamerBlue - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package net.runelite.client.rs.mixins.transformers; - -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.Opcodes; - -public abstract class SanityChecker extends ClassVisitor implements Opcodes -{ - protected SanityChecker(int i, ClassVisitor classVisitor) - { - super(i, classVisitor); - } - -} From 3f4dba6f16f3c3f19185adcf0137103c0cd562f9 Mon Sep 17 00:00:00 2001 From: caleyz Date: Mon, 8 Jul 2019 15:56:07 +0100 Subject: [PATCH 434/472] chat filter: refresh chat on config change, startup, and shutdown --- .../runelite/client/plugins/chatfilter/ChatFilterPlugin.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java index 690669cc54..53f4e43ef6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java @@ -81,12 +81,14 @@ public class ChatFilterPlugin extends Plugin protected void startUp() throws Exception { updateFilteredPatterns(); + client.refreshChat(); } @Override protected void shutDown() throws Exception { filteredPatterns.clear(); + client.refreshChat(); } @Subscribe @@ -235,5 +237,8 @@ public class ChatFilterPlugin extends Plugin } updateFilteredPatterns(); + + //Refresh chat after config change to reflect current rules + client.refreshChat(); } } From dbf76ce8de7d75f0015b75cbba9dd268fc448cb9 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:08:02 +0200 Subject: [PATCH 435/472] chatbox: Merge duplicate branch --- .../net/runelite/client/game/chatbox/ChatboxTextInput.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java index 79ca18a124..f4d806343c 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java +++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java @@ -722,9 +722,6 @@ public class ChatboxTextInput extends ChatboxInput implements KeyListener, Mouse newPos++; break; case KeyEvent.VK_UP: - ev.consume(); - newPos = getLineOffset.applyAsInt(code); - break; case KeyEvent.VK_DOWN: ev.consume(); newPos = getLineOffset.applyAsInt(code); From 115f21962087efae7670c8de2817490ca0b733fa Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:08:55 +0200 Subject: [PATCH 436/472] game: Remove redundant modifier for enum constructor --- .../src/main/java/net/runelite/client/game/Sound.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/game/Sound.java b/runelite-client/src/main/java/net/runelite/client/game/Sound.java index aeeddd8b34..cad967e08b 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/Sound.java +++ b/runelite-client/src/main/java/net/runelite/client/game/Sound.java @@ -23,7 +23,7 @@ public enum Sound private String filePath; private int id; - private Sound(int id, String filePath) + Sound(int id, String filePath) { this.id = id; this.filePath = filePath; From a784b9559a8b075e9f06eac6ab6096c8f28a9144 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:09:22 +0200 Subject: [PATCH 437/472] game: Access levels --- .../main/java/net/runelite/client/game/SpriteManager.java | 2 +- .../java/net/runelite/client/game/chatbox/ChatboxInput.java | 6 +++--- .../net/runelite/client/game/chatbox/ChatboxTextInput.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java b/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java index 3a4cc667e7..b9a6de5272 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java @@ -54,7 +54,7 @@ public class SpriteManager @Inject private ClientThread clientThread; - public Cache cache = CacheBuilder.newBuilder() + private Cache cache = CacheBuilder.newBuilder() .maximumSize(128L) .expireAfterAccess(1, TimeUnit.HOURS) .build(); diff --git a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxInput.java b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxInput.java index bdd7c10dda..f29b01dbc5 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxInput.java +++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxInput.java @@ -27,13 +27,13 @@ package net.runelite.client.game.chatbox; /** * A modal input that lives in the chatbox panel. */ -public abstract class ChatboxInput +abstract class ChatboxInput { - protected void open() + void open() { } - protected void close() + void close() { } } diff --git a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java index f4d806343c..82973cecb1 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java +++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java @@ -156,12 +156,12 @@ public class ChatboxTextInput extends ChatboxInput implements KeyListener, Mouse return this; } - public ChatboxTextInput cursorAt(int index) + private ChatboxTextInput cursorAt(int index) { return cursorAt(index, index); } - public ChatboxTextInput cursorAt(int indexA, int indexB) + private ChatboxTextInput cursorAt(int indexA, int indexB) { if (indexA < 0) { From decfd24a7bf057fc094f13f90fd83eab25256510 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:09:35 +0200 Subject: [PATCH 438/472] game: Final fields --- .../src/main/java/net/runelite/client/game/Sound.java | 4 ++-- .../src/main/java/net/runelite/client/game/SpriteManager.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/game/Sound.java b/runelite-client/src/main/java/net/runelite/client/game/Sound.java index cad967e08b..e9cb20dfaf 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/Sound.java +++ b/runelite-client/src/main/java/net/runelite/client/game/Sound.java @@ -20,8 +20,8 @@ public enum Sound RESTORED_SPECIAL_ATTACK(16, "net/runelite/client/game/sounds/restorespec.wav"), IDLE(17, "net/runelite/client/game/sounds/idle.wav"); - private String filePath; - private int id; + private final String filePath; + private final int id; Sound(int id, String filePath) { diff --git a/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java b/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java index b9a6de5272..1b4ca5159e 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java @@ -54,7 +54,7 @@ public class SpriteManager @Inject private ClientThread clientThread; - private Cache cache = CacheBuilder.newBuilder() + private final Cache cache = CacheBuilder.newBuilder() .maximumSize(128L) .expireAfterAccess(1, TimeUnit.HOURS) .build(); From ec324351552e85bdb058bf8a04eaa96fb6ab620a Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:10:08 +0200 Subject: [PATCH 439/472] game: Replace statement with expression --- .../java/net/runelite/client/game/SpriteManager.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java b/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java index 1b4ca5159e..df81112d27 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java @@ -110,12 +110,8 @@ public class SpriteManager public void addSpriteTo(JButton c, int archive, int file) { getSpriteAsync(archive, file, img -> - { SwingUtilities.invokeLater(() -> - { - c.setIcon(new ImageIcon(img)); - }); - }); + c.setIcon(new ImageIcon(img)))); } /** @@ -124,12 +120,8 @@ public class SpriteManager public void addSpriteTo(JLabel c, int archive, int file) { getSpriteAsync(archive, file, img -> - { SwingUtilities.invokeLater(() -> - { - c.setIcon(new ImageIcon(img)); - }); - }); + c.setIcon(new ImageIcon(img)))); } public void addSpriteOverrides(SpriteOverride[] add) From 1ad623d0379f8048ac2c21e04e16fdae6f58d841 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:11:02 +0200 Subject: [PATCH 440/472] game: @Notnull --- .../main/java/net/runelite/client/game/HiscoreLoader.java | 3 ++- .../main/java/net/runelite/client/game/ItemManager.java | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/game/HiscoreLoader.java b/runelite-client/src/main/java/net/runelite/client/game/HiscoreLoader.java index 36b6024e35..dbe603dc8d 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/HiscoreLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/game/HiscoreLoader.java @@ -36,6 +36,7 @@ import static net.runelite.client.game.HiscoreManager.NONE; import net.runelite.http.api.hiscore.HiscoreClient; import net.runelite.http.api.hiscore.HiscoreEndpoint; import net.runelite.http.api.hiscore.HiscoreResult; +import org.jetbrains.annotations.NotNull; @Slf4j class HiscoreLoader extends CacheLoader @@ -50,7 +51,7 @@ class HiscoreLoader extends CacheLoader() { @Override - public AsyncBufferedImage load(ImageKey key) throws Exception + public AsyncBufferedImage load(@NotNull ImageKey key) throws Exception { return loadImage(key.itemId, key.itemQuantity, key.stackable); } @@ -291,7 +292,7 @@ public class ItemManager .build(new CacheLoader() { @Override - public ItemDefinition load(Integer key) throws Exception + public ItemDefinition load(@NotNull Integer key) throws Exception { return client.getItemDefinition(key); } @@ -303,7 +304,7 @@ public class ItemManager .build(new CacheLoader() { @Override - public BufferedImage load(OutlineKey key) throws Exception + public BufferedImage load(@NotNull OutlineKey key) throws Exception { return loadItemOutline(key.itemId, key.itemQuantity, key.outlineColor); } From 0ba21e14242c9b60eccc290295c302e6a3c50ba6 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:11:25 +0200 Subject: [PATCH 441/472] game: Remove redundant initializer --- .../main/java/net/runelite/client/game/SkillIconManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/game/SkillIconManager.java b/runelite-client/src/main/java/net/runelite/client/game/SkillIconManager.java index 03c78617b1..fd17ad0f7f 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/SkillIconManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/SkillIconManager.java @@ -40,7 +40,7 @@ public class SkillIconManager public BufferedImage getSkillImage(Skill skill, boolean small) { int skillIdx = skill.ordinal() + (small ? Skill.values().length : 0); - BufferedImage skillImage = null; + BufferedImage skillImage; if (imgCache[skillIdx] != null) { From 65203897cb6acbb95e7e2373e3e78d581af31bb1 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:13:29 +0200 Subject: [PATCH 442/472] chat: Remove redundant initializer --- .../main/java/net/runelite/client/chat/ChatMessageManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java index da4c222fd6..c571282a00 100644 --- a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java +++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java @@ -115,7 +115,7 @@ public class ChatMessageManager boolean isChatboxTransparent = client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1; Color usernameColor = null; - Color senderColor = null; + Color senderColor; switch (chatMessageType) { From c082febf11c606eae30edd467a2964fc53ae4c74 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:14:08 +0200 Subject: [PATCH 443/472] callback: Final field --- .../main/java/net/runelite/client/callback/ClientThread.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/callback/ClientThread.java b/runelite-client/src/main/java/net/runelite/client/callback/ClientThread.java index a1e3880a39..bbe3ae3f0d 100644 --- a/runelite-client/src/main/java/net/runelite/client/callback/ClientThread.java +++ b/runelite-client/src/main/java/net/runelite/client/callback/ClientThread.java @@ -36,7 +36,7 @@ import net.runelite.api.Client; @Slf4j public class ClientThread { - private ConcurrentLinkedQueue invokes = new ConcurrentLinkedQueue<>(); + private final ConcurrentLinkedQueue invokes = new ConcurrentLinkedQueue<>(); @Inject private Client client; From 1fa5f695832561e1fe6e79c70a10386ad75c3741 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:15:26 +0200 Subject: [PATCH 444/472] discord: Access level --- .../main/java/net/runelite/client/discord/DiscordService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java b/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java index 8ff303b6d0..091c479ac6 100644 --- a/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java +++ b/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java @@ -49,7 +49,7 @@ import net.runelite.discord.DiscordUser; public class DiscordService implements AutoCloseable { private final EventBus eventBus; - public final RuneLiteProperties runeLiteProperties; + private final RuneLiteProperties runeLiteProperties; private final ScheduledExecutorService executorService; private final DiscordRPC discordRPC; From 6c6ad3ffa5606901a9634b82bed1a756d48d3ae0 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:17:11 +0200 Subject: [PATCH 445/472] EventBus: Annotate ovverride --- .../java/net/runelite/client/util/DeferredEventBus.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java b/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java index 183fce738b..70e79cbe67 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java +++ b/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java @@ -29,6 +29,7 @@ import java.util.concurrent.ConcurrentLinkedQueue; import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.client.eventbus.EventBus; +import org.jetbrains.annotations.NotNull; @Singleton public class DeferredEventBus extends EventBus @@ -43,19 +44,19 @@ public class DeferredEventBus extends EventBus } @Override - public void register(Object object) + public void register(@NotNull Object object) { eventBus.register(object); } @Override - public void unregister(Object object) + public void unregister(@NotNull Object object) { eventBus.unregister(object); } @Override - public void post(Object object) + public void post(@NotNull Object object) { pendingEvents.add(object); } From 330d3d9cd50c5b00de85a434fadb71451f86ff60 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:22:52 +0200 Subject: [PATCH 446/472] util: Final fields --- .../java/net/runelite/client/util/MiscUtils.java | 12 ++++++------ .../net/runelite/client/util/WildernessLocation.java | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java b/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java index c44767d4a5..a5c50a374b 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java +++ b/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java @@ -8,13 +8,13 @@ import net.runelite.api.coords.WorldPoint; public class MiscUtils { - private static int[] abovePointsX = {2944, 3392, 3392, 2944}; - private static int[] abovePointsY = {3523, 3523, 3971, 3971}; - private static int[] belowPointsX = {2944, 2944, 3264, 3264}; - private static int[] belowPointsY = {9918, 10360, 10360, 9918}; + private static final int[] abovePointsX = {2944, 3392, 3392, 2944}; + private static final int[] abovePointsY = {3523, 3523, 3971, 3971}; + private static final int[] belowPointsX = {2944, 2944, 3264, 3264}; + private static final int[] belowPointsY = {9918, 10360, 10360, 9918}; - private static Polygon abovePoly = new Polygon(abovePointsX, abovePointsY, abovePointsX.length); - private static Polygon belowPoly = new Polygon(belowPointsX, belowPointsY, belowPointsX.length); + private static final Polygon abovePoly = new Polygon(abovePointsX, abovePointsY, abovePointsX.length); + private static final Polygon belowPoly = new Polygon(belowPointsX, belowPointsY, belowPointsX.length); //test replacement so private for now private static boolean inWildy(WorldPoint point) diff --git a/runelite-client/src/main/java/net/runelite/client/util/WildernessLocation.java b/runelite-client/src/main/java/net/runelite/client/util/WildernessLocation.java index 4757c875f0..facf742088 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/WildernessLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/util/WildernessLocation.java @@ -79,10 +79,10 @@ public enum WildernessLocation public static class Location { - public int x; - public int y; - public int width; - public int height; + public final int x; + public final int y; + public final int width; + public final int height; Location(int x, int y, int x1, int y1) { From 33a6824ca66cf818e137378dcfd8ce5a155d01c1 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:23:31 +0200 Subject: [PATCH 447/472] util: Access levels --- .../main/java/net/runelite/client/util/PvPUtil.java | 2 +- .../main/java/net/runelite/client/util/RefUtils.java | 6 +++--- .../main/java/net/runelite/client/util/SwingUtil.java | 6 +++--- .../net/runelite/client/util/WildernessLocation.java | 10 +++++----- .../net/runelite/client/util/ping/IcmpEchoReply.java | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/util/PvPUtil.java b/runelite-client/src/main/java/net/runelite/client/util/PvPUtil.java index 53672490ac..a91de1c7cc 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/PvPUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/util/PvPUtil.java @@ -36,7 +36,7 @@ public class PvPUtil * @param point the point in the world to get the wilderness level for * @return the int representing the wilderness level */ - public static int getWildernessLevelFrom(WorldPoint point) + private static int getWildernessLevelFrom(WorldPoint point) { int y = point.getY(); diff --git a/runelite-client/src/main/java/net/runelite/client/util/RefUtils.java b/runelite-client/src/main/java/net/runelite/client/util/RefUtils.java index 5c4e5d08f3..0d5afbf564 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/RefUtils.java +++ b/runelite-client/src/main/java/net/runelite/client/util/RefUtils.java @@ -30,12 +30,12 @@ import org.objectweb.asm.tree.AnnotationNode; import org.objectweb.asm.tree.FieldNode; import org.objectweb.asm.tree.MethodNode; -public class RefUtils implements Opcodes +class RefUtils implements Opcodes { private static final String TYPE_PREFIX = "us/runelitepl/mixinprocessor/annotations/"; - public static boolean isReturn(int opcode, boolean checkType) + private static boolean isReturn(int opcode, boolean checkType) { return (opcode == RETURN && !checkType) || opcode == IRETURN || opcode == LRETURN || opcode == DRETURN || opcode == ARETURN || opcode == FRETURN; @@ -76,7 +76,7 @@ public class RefUtils implements Opcodes return false; } - public static String makeAnnotationDesc(String annot) + private static String makeAnnotationDesc(String annot) { return "L" + TYPE_PREFIX + annot + ";"; } diff --git a/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java b/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java index 021de4dc10..ff62937bc8 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java @@ -76,7 +76,7 @@ public class SwingUtil * Sets some sensible defaults for swing. * IMPORTANT! Needs to be called before main frame creation */ - public static void setupDefaults() + private static void setupDefaults() { // Force heavy-weight popups/tooltips. // Prevents them from being obscured by the game applet. @@ -117,7 +117,7 @@ public class SwingUtil * * @param laf the swing look and feel */ - public static void setTheme(@Nonnull final LookAndFeel laf) + private static void setTheme(@Nonnull final LookAndFeel laf) { try { @@ -135,7 +135,7 @@ public class SwingUtil * * @param font the new font to use */ - public static void setFont(@Nonnull final Font font) + private static void setFont(@Nonnull final Font font) { final FontUIResource f = new FontUIResource(font); final Enumeration keys = UIManager.getDefaults().keys(); diff --git a/runelite-client/src/main/java/net/runelite/client/util/WildernessLocation.java b/runelite-client/src/main/java/net/runelite/client/util/WildernessLocation.java index facf742088..4bf7b3e4a4 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/WildernessLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/util/WildernessLocation.java @@ -77,12 +77,12 @@ public enum WildernessLocation this.worldArea = new WorldArea(location.x, location.y, location.width, location.height, plane); } - public static class Location + static class Location { - public final int x; - public final int y; - public final int width; - public final int height; + final int x; + final int y; + final int width; + final int height; Location(int x, int y, int x1, int y1) { diff --git a/runelite-client/src/main/java/net/runelite/client/util/ping/IcmpEchoReply.java b/runelite-client/src/main/java/net/runelite/client/util/ping/IcmpEchoReply.java index 2756320990..0e4af9137e 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/ping/IcmpEchoReply.java +++ b/runelite-client/src/main/java/net/runelite/client/util/ping/IcmpEchoReply.java @@ -30,7 +30,7 @@ import com.sun.jna.platform.win32.WinDef; import java.util.Arrays; import java.util.List; -public class IcmpEchoReply extends Structure +class IcmpEchoReply extends Structure { private static final int IP_OPTION_INFO_SIZE = 1 + 1 + 1 + 1 + (Pointer.SIZE == 8 ? 12 : 4); // on 64bit vms add 4 byte padding public static final int SIZE = 4 + 4 + 4 + 2 + 2 + Pointer.SIZE + IP_OPTION_INFO_SIZE; From d0b69a41d695929f49f9e174c0a0a53da6ff7a8b Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:24:21 +0200 Subject: [PATCH 448/472] deferredeventbus: Null check --- .../main/java/net/runelite/client/util/DeferredEventBus.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java b/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java index 70e79cbe67..4ac1941d7f 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java +++ b/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java @@ -67,7 +67,10 @@ public class DeferredEventBus extends EventBus while (size-- > 0) { Object object = pendingEvents.poll(); - eventBus.post(object); + if (object != null) + { + eventBus.post(object); + } } } } From 647829a4e6f035efe86eb5bd289576ecc94d8282 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:26:41 +0200 Subject: [PATCH 449/472] util: Merge nested if statements --- .../src/main/java/net/runelite/client/util/MiscUtils.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java b/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java index a5c50a374b..647a411cdf 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java +++ b/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java @@ -50,12 +50,9 @@ public class MiscUtils //v underground //v above ground int wildernessLevel = clamp(y > 6400 ? ((y - 9920) / 8) + 1 : ((y - 3520) / 8) + 1, 0, 56); - if (point.getPlane() > 0) + if (point.getPlane() > 0 && y < 9920) { - if (y < 9920) - { - wildernessLevel = 0; - } + wildernessLevel = 0; } if (client.getWorldType().stream().anyMatch(worldType -> worldType == WorldType.PVP || worldType == WorldType.HIGH_RISK)) From 31df0c45527c5159f81841440b2637bcedcb51ab Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:27:28 +0200 Subject: [PATCH 450/472] rs: Final field --- .../src/main/java/net/runelite/client/rs/ClientLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java index 1024da016f..9a660fe58d 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java @@ -40,7 +40,7 @@ import lombok.extern.slf4j.Slf4j; public class ClientLoader { private final ClientConfigLoader clientConfigLoader; - private ClientUpdateCheckMode updateCheckMode; + private final ClientUpdateCheckMode updateCheckMode; public static boolean useLocalInjected = false; @Inject From 727660fd4936919102c3a8b3a195df3b4e871290 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 17:28:46 +0200 Subject: [PATCH 451/472] rs: Move this catch to its own catch --- .../net/runelite/client/rs/ClientLoader.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java index 9a660fe58d..e39b76716d 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java @@ -69,14 +69,16 @@ public class ClientLoader return null; } } - catch (IOException | ClassNotFoundException | InstantiationException | IllegalAccessException e) + catch (IOException | InstantiationException | IllegalAccessException e) { - if (e instanceof ClassNotFoundException) - { - log.error("Unable to load client - class not found. This means you" - + " are not running RuneLite with Maven as the injected client" - + " is not in your classpath."); - } + log.error("Error loading RS!", e); + return null; + } + catch (ClassNotFoundException e) + { + log.error("Unable to load client - class not found. This means you" + + " are not running RuneLite with Maven as the injected client" + + " is not in your classpath."); log.error("Error loading RS!", e); return null; From a32c66725117952e8deab5c387ed63cce20eb702 Mon Sep 17 00:00:00 2001 From: Visne <39844191+Visne@users.noreply.github.com> Date: Mon, 8 Jul 2019 17:34:25 +0200 Subject: [PATCH 452/472] mixins: Add FriendAdded event * added onAddedFriend() event * renamed events to FriendAdded and FriendRemoved --- .../java/net/runelite/api/events/FriendAdded.java | 15 +++++++++++++++ .../{RemovedFriend.java => FriendRemoved.java} | 2 +- .../plugins/friendnotes/FriendNotesPlugin.java | 4 ++-- .../friendtagging/FriendTaggingPlugin.java | 4 ++-- .../net/runelite/mixins/RSFriendSystemMixin.java | 15 ++++++++++++--- 5 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 runelite-api/src/main/java/net/runelite/api/events/FriendAdded.java rename runelite-api/src/main/java/net/runelite/api/events/{RemovedFriend.java => FriendRemoved.java} (98%) diff --git a/runelite-api/src/main/java/net/runelite/api/events/FriendAdded.java b/runelite-api/src/main/java/net/runelite/api/events/FriendAdded.java new file mode 100644 index 0000000000..76b60e3681 --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/events/FriendAdded.java @@ -0,0 +1,15 @@ +package net.runelite.api.events; + +import lombok.Value; + +/** + * An event where a request to add a friend is sent to the server. + */ +@Value +public class FriendAdded +{ + /** + * The name of the added friend. + */ + private final String name; +} diff --git a/runelite-api/src/main/java/net/runelite/api/events/RemovedFriend.java b/runelite-api/src/main/java/net/runelite/api/events/FriendRemoved.java similarity index 98% rename from runelite-api/src/main/java/net/runelite/api/events/RemovedFriend.java rename to runelite-api/src/main/java/net/runelite/api/events/FriendRemoved.java index c60cd13c33..2b9c641b3c 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/RemovedFriend.java +++ b/runelite-api/src/main/java/net/runelite/api/events/FriendRemoved.java @@ -30,7 +30,7 @@ import lombok.Value; * An event where a request to remove a friend is sent to the server. */ @Value -public class RemovedFriend +public class FriendRemoved { /** * The name of the removed friend. diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java index 75561cb114..caefd58452 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java @@ -43,7 +43,7 @@ import net.runelite.api.Nameable; import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.NameableNameChanged; -import net.runelite.api.events.RemovedFriend; +import net.runelite.api.events.FriendRemoved; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; @@ -250,7 +250,7 @@ public class FriendNotesPlugin extends Plugin } @Subscribe - public void onRemovedFriend(RemovedFriend event) + public void onFriendRemoved(FriendRemoved event) { // Delete a friend's note if they are removed final String displayName = Text.toJagexName(event.getName()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java index 5e550cdfb2..4a693a64a3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java @@ -30,7 +30,7 @@ import net.runelite.api.Nameable; import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.NameableNameChanged; -import net.runelite.api.events.RemovedFriend; +import net.runelite.api.events.FriendRemoved; import net.runelite.api.events.WidgetMenuOptionClicked; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; @@ -128,7 +128,7 @@ public class FriendTaggingPlugin extends Plugin } @Subscribe - public void onRemovedFriend(RemovedFriend event) + public void onFriendRemoved(FriendRemoved event) { final String displayName = event.getName().trim().toLowerCase(); deleteTag(displayName); diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendSystemMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendSystemMixin.java index 7497e7c2a5..d273a3bf33 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendSystemMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendSystemMixin.java @@ -1,6 +1,7 @@ package net.runelite.mixins; -import net.runelite.api.events.RemovedFriend; +import net.runelite.api.events.FriendAdded; +import net.runelite.api.events.FriendRemoved; import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.MethodHook; import net.runelite.api.mixins.Mixin; @@ -18,7 +19,15 @@ public abstract class RSFriendSystemMixin implements RSFriendSystem @Inject public void rl$removeFriend(String friendName) { - RemovedFriend removedFriend = new RemovedFriend(friendName); - client.getCallbacks().post(removedFriend); + FriendRemoved friendRemoved = new FriendRemoved(friendName); + client.getCallbacks().post(friendRemoved); + } + + @MethodHook("addFriend") + @Inject + public void rl$addFriend(String friendName) + { + FriendAdded friendAdded = new FriendAdded(friendName); + client.getCallbacks().post(friendAdded); } } From 3571166fb2e45127ba4744dbb8bdf6c9dbda6649 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 4 Jul 2019 10:33:23 +0000 Subject: [PATCH 453/472] Update Item IDs to 2019-07-04-rev180 --- .../main/java/net/runelite/api/ItemID.java | 16 +++++++++++++++ .../java/net/runelite/api/NullItemID.java | 20 +++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/ItemID.java b/runelite-api/src/main/java/net/runelite/api/ItemID.java index 79ca788870..4eb03633a5 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -10854,5 +10854,21 @@ public final class ItemID public static final int HEALER_ICON_23486 = 23486; public static final int WINE_OF_ZAMORAK_23489 = 23489; public static final int LARRANS_KEY = 23490; + public static final int SRARACHA = 23495; + public static final int TEMPLE_COIN = 23497; + public static final int GRUBBY_KEY = 23499; + public static final int TEMPLE_KEY = 23502; + public static final int TOME_OF_THE_MOON = 23504; + public static final int TOME_OF_THE_SUN = 23506; + public static final int TOME_OF_THE_TEMPLE = 23508; + public static final int TATTERED_MOON_PAGE = 23510; + public static final int TATTERED_SUN_PAGE = 23512; + public static final int TATTERED_TEMPLE_PAGE = 23514; + public static final int LAMP_OF_KNOWLEDGE = 23516; + public static final int GIANT_EGG_SACFULL = 23517; + public static final int GIANT_EGG_SAC = 23520; + public static final int MASK_OF_RANUL = 23522; + public static final int JAR_OF_EYES = 23525; + public static final int SARACHNIS_CUDGEL = 23528; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullItemID.java b/runelite-api/src/main/java/net/runelite/api/NullItemID.java index 5a7f1eb567..4b18aa3a5c 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -12430,5 +12430,25 @@ public final class NullItemID public static final int NULL_23492 = 23492; public static final int NULL_23493 = 23493; public static final int NULL_23494 = 23494; + public static final int NULL_23496 = 23496; + public static final int NULL_23498 = 23498; + public static final int NULL_23500 = 23500; + public static final int NULL_23501 = 23501; + public static final int NULL_23503 = 23503; + public static final int NULL_23505 = 23505; + public static final int NULL_23507 = 23507; + public static final int NULL_23509 = 23509; + public static final int NULL_23511 = 23511; + public static final int NULL_23513 = 23513; + public static final int NULL_23515 = 23515; + public static final int NULL_23518 = 23518; + public static final int NULL_23519 = 23519; + public static final int NULL_23521 = 23521; + public static final int NULL_23523 = 23523; + public static final int NULL_23524 = 23524; + public static final int NULL_23526 = 23526; + public static final int NULL_23527 = 23527; + public static final int NULL_23529 = 23529; + public static final int NULL_23530 = 23530; /* This file is automatically generated. Do not edit. */ } From 0944c0a4e6d67dfaad2b78fcdcd1a616f33984c7 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 4 Jul 2019 10:33:23 +0000 Subject: [PATCH 454/472] Update Item variations to 2019-07-04-rev180 --- runelite-client/src/main/resources/item_variations.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index 987169cb75..d5639ec663 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -9101,5 +9101,9 @@ 23321, 23324, 23327 + ], + "giant egg sac": [ + 23517, + 23520 ] } \ No newline at end of file From 227c75fd7d1b2c673cd27bb04e64564457607666 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 4 Jul 2019 10:33:24 +0000 Subject: [PATCH 455/472] Update Object IDs to 2019-07-04-rev180 --- .../java/net/runelite/api/NullObjectID.java | 28 ++++++++++ .../main/java/net/runelite/api/ObjectID.java | 56 +++++++++++++++++-- 2 files changed, 78 insertions(+), 6 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java index 103bf0143c..1cd637ed47 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -16211,5 +16211,33 @@ public final class NullObjectID public static final int NULL_34825 = 34825; public static final int NULL_34831 = 34831; public static final int NULL_34832 = 34832; + public static final int NULL_34841 = 34841; + public static final int NULL_34869 = 34869; + public static final int NULL_34875 = 34875; + public static final int NULL_34876 = 34876; + public static final int NULL_34877 = 34877; + public static final int NULL_34878 = 34878; + public static final int NULL_34879 = 34879; + public static final int NULL_34880 = 34880; + public static final int NULL_34881 = 34881; + public static final int NULL_34882 = 34882; + public static final int NULL_34883 = 34883; + public static final int NULL_34884 = 34884; + public static final int NULL_34885 = 34885; + public static final int NULL_34886 = 34886; + public static final int NULL_34887 = 34887; + public static final int NULL_34888 = 34888; + public static final int NULL_34889 = 34889; + public static final int NULL_34890 = 34890; + public static final int NULL_34891 = 34891; + public static final int NULL_34892 = 34892; + public static final int NULL_34893 = 34893; + public static final int NULL_34894 = 34894; + public static final int NULL_34895 = 34895; + public static final int NULL_34900 = 34900; + public static final int NULL_34901 = 34901; + public static final int NULL_34902 = 34902; + public static final int NULL_34903 = 34903; + public static final int NULL_34904 = 34904; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/ObjectID.java b/runelite-api/src/main/java/net/runelite/api/ObjectID.java index 9d5ee32bfb..248591ae09 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -15241,11 +15241,11 @@ public final class ObjectID public static final int ROCKS_28890 = 28890; public static final int CRACK_28892 = 28892; public static final int STONE_28893 = 28893; - public static final int ROPE_LADDER_28894 = 28894; - public static final int ROPE_28895 = 28895; - public static final int ROPE_28896 = 28896; - public static final int ROPE_28897 = 28897; - public static final int ROPE_28898 = 28898; + public static final int VINE_LADDER = 28894; + public static final int VINE_28895 = 28895; + public static final int VINE_28896 = 28896; + public static final int VINE_28897 = 28897; + public static final int VINE_28898 = 28898; public static final int ALTAR_28900 = 28900; public static final int BOULDER_28901 = 28901; public static final int BOULDER_28904 = 28904; @@ -16846,7 +16846,7 @@ public final class ObjectID public static final int ROCK_31787 = 31787; public static final int ROCK_31788 = 31788; public static final int ROCK_31789 = 31789; - public static final int VINE_LADDER = 31790; + public static final int VINE_LADDER_31790 = 31790; public static final int HOLE_31791 = 31791; public static final int ROOTS_31792 = 31792; public static final int ROOT_31796 = 31796; @@ -18610,5 +18610,49 @@ public final class ObjectID public static final int LARRANS_SMALL_CHEST_34828 = 34828; public static final int LARRANS_BIG_CHEST = 34829; public static final int LARRANS_BIG_CHEST_34830 = 34830; + public static final int SARACHNIS_DISPLAY = 34833; + public static final int STRANGE_FLOOR_34834 = 34834; + public static final int ANCIENT_FIRE = 34835; + public static final int CURSED_ALTAR = 34836; + public static final int ALTAR_34837 = 34837; + public static final int GRUBBY_CHEST = 34838; + public static final int GRUBBY_CHEST_34839 = 34839; + public static final int GRUBBY_DOOR = 34840; + public static final int TEMPLE_DOOR_34842 = 34842; + public static final int TEMPLE_DOOR_34843 = 34843; + public static final int DOOR_34844 = 34844; + public static final int LEVER_34845 = 34845; + public static final int LEVER_34846 = 34846; + public static final int MUSTY_BOOKSHELF = 34847; + public static final int MUSTY_BOOKSHELF_34848 = 34848; + public static final int MUSTY_BOOKSHELF_34849 = 34849; + public static final int MUSTY_BOOKSHELF_34850 = 34850; + public static final int STONE_RELIEF = 34851; + public static final int STONE_RELIEF_34852 = 34852; + public static final int PASSAGE_34853 = 34853; + public static final int WALL_34854 = 34854; + public static final int SACRED_BONE_BURNER = 34855; + public static final int TORCH_34856 = 34856; + public static final int DRAGON_EGG_34857 = 34857; + public static final int THICK_WEB = 34858; + public static final int THICK_WEB_34859 = 34859; + public static final int STRANGE_PASSAGE = 34860; + public static final int STRANGE_WALL_34861 = 34861; + public static final int LADDER_34862 = 34862; + public static final int LADDER_34863 = 34863; + public static final int STAIRCASE_34864 = 34864; + public static final int STAIRCASE_34865 = 34865; + public static final int CAULDRON_34866 = 34866; + public static final int EGG_SAC = 34867; + public static final int EMPTY_SAC = 34868; + public static final int STONE_PILE_34870 = 34870; + public static final int STONE_PILE_34871 = 34871; + public static final int BROKEN_SUN_ALTAR = 34872; + public static final int EMPTY_SARCOPHAGUS = 34873; + public static final int FLOOR_TILE = 34874; + public static final int BLOOD_34896 = 34896; + public static final int WEB_34897 = 34897; + public static final int WEB_34898 = 34898; + public static final int SLASHED_WEB_34899 = 34899; /* This file is automatically generated. Do not edit. */ } From a443b1d5eb6afda930da7992ae00af511d7567f5 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 4 Jul 2019 10:33:25 +0000 Subject: [PATCH 456/472] Update NPC IDs to 2019-07-04-rev180 --- .../src/main/java/net/runelite/api/NpcID.java | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java index 1288a33ba7..e23906bb98 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -1992,9 +1992,9 @@ public final class NpcID public static final int CYCLOPS_2140 = 2140; public static final int CYCLOPS_2141 = 2141; public static final int CYCLOPS_2142 = 2142; - public static final int GIANT_FROG_2143 = 2143; - public static final int BIG_FROG_2144 = 2144; - public static final int FROG_2145 = 2145; + public static final int SRARACHA = 2143; + public static final int SRARACHA_2144 = 2144; + public static final int UNDEAD_DRUID = 2145; public static final int FISHING_SPOT_2146 = 2146; public static final int VEOS = 2147; public static final int GRAND_EXCHANGE_CLERK = 2148; @@ -7866,5 +7866,21 @@ public final class NpcID public static final int LEKE_QUO_KERAN = 8697; public static final int MONK_OF_ZAMORAK_8698 = 8698; public static final int LARRAN = 8699; + public static final int GIANT_FROG_8700 = 8700; + public static final int BIG_FROG_8701 = 8701; + public static final int FROG_8702 = 8702; + public static final int TEMPLE_SPIDER = 8703; + public static final int BROTHER_AIMERI = 8704; + public static final int BROTHER_AIMERI_8705 = 8705; + public static final int OLBERTUS = 8706; + public static final int OLBERTUS_8707 = 8707; + public static final int OLBERTUS_8708 = 8708; + public static final int SHAEDED_BEAST = 8709; + public static final int SHAEDED_BEAST_8710 = 8710; + public static final int EODAN = 8711; + public static final int KNIGHT_OF_VARLAMORE_8712 = 8712; + public static final int SARACHNIS = 8713; + public static final int SPAWN_OF_SARACHNIS = 8714; + public static final int SPAWN_OF_SARACHNIS_8715 = 8715; /* This file is automatically generated. Do not edit. */ } From 112a2bcba75d5ba9759bd64ab83b1b94af08bbd9 Mon Sep 17 00:00:00 2001 From: Lucas Date: Mon, 8 Jul 2019 17:46:10 +0200 Subject: [PATCH 457/472] more RSClient refactoring --- .../deob/updater/AnnotationCleaner.java | 4 + .../java/net/runelite/rs/api/RSClient.java | 2 +- .../src/main/java/AbstractWorldMapIcon.java | 24 +- runescape-client/src/main/java/Actor.java | 10 +- .../src/main/java/ArchiveLoader.java | 18 +- .../src/main/java/BoundaryObject.java | 2 +- .../src/main/java/ByteArrayPool.java | 6 +- .../src/main/java/Bzip2Decompressor.java | 20 +- .../java/{class211.java => Calendar.java} | 22 +- runescape-client/src/main/java/Canvas.java | 6 +- runescape-client/src/main/java/Client.java | 210 ++++----- .../java/DesktopPlatformInfoProvider.java | 6 +- .../main/java/DevicePcmPlayerProvider.java | 26 +- .../src/main/java/DynamicObject.java | 2 +- .../src/main/java/FloorOverlayDefinition.java | 8 +- .../main/java/FloorUnderlayDefinition.java | 4 +- runescape-client/src/main/java/FontName.java | 2 +- .../src/main/java/FriendSystem.java | 2 +- runescape-client/src/main/java/GameShell.java | 6 +- .../src/main/java/GrandExchangeEvent.java | 2 +- .../java/GrandExchangeOfferAgeComparator.java | 2 +- ...GrandExchangeOfferUnitPriceComparator.java | 2 +- .../src/main/java/HitSplatDefinition.java | 2 +- ...class266.java => HorizontalAlignment.java} | 11 +- runescape-client/src/main/java/Huffman.java | 77 ++-- .../src/main/java/Interpreter.java | 6 +- .../src/main/java/KitDefinition.java | 2 +- runescape-client/src/main/java/Login.java | 4 +- .../src/main/java/LoginPacket.java | 2 +- .../src/main/java/LoginScreenAnimation.java | 2 + .../src/main/java/MenuAction.java | 2 +- .../src/main/java/NPCDefinition.java | 4 +- .../src/main/java/NetFileRequest.java | 4 +- runescape-client/src/main/java/NetSocket.java | 2 +- .../src/main/java/ObjectDefinition.java | 2 +- runescape-client/src/main/java/Occluder.java | 3 +- .../src/main/java/PendingSpawn.java | 2 +- runescape-client/src/main/java/Player.java | 2 +- .../src/main/java/PlayerAppearance.java | 12 +- .../src/main/java/Rasterizer2D.java | 140 +++--- .../src/main/java/Rasterizer3D.java | 4 +- .../src/main/java/RouteStrategy.java | 2 + runescape-client/src/main/java/Scene.java | 6 +- .../src/main/java/ScriptEvent.java | 2 +- .../src/main/java/SecureRandomCallable.java | 6 +- .../src/main/java/SoundEffect.java | 3 +- .../src/main/java/StructDefinition.java | 52 +-- runescape-client/src/main/java/Texture.java | 6 +- .../src/main/java/TextureLoader.java | 3 +- .../src/main/java/TextureProvider.java | 7 +- .../src/main/java/UserComparator4.java | 2 +- runescape-client/src/main/java/Varcs.java | 4 +- .../src/main/java/VertexNormal.java | 4 +- .../{class249.java => VerticalAlignment.java} | 11 +- .../src/main/java/WorldMapArea.java | 12 +- .../src/main/java/WorldMapAreaData.java | 4 +- .../src/main/java/WorldMapCacheName.java | 4 +- .../src/main/java/WorldMapDecoration.java | 2 +- .../src/main/java/WorldMapDecorationType.java | 5 +- .../src/main/java/WorldMapElement.java | 25 +- .../src/main/java/WorldMapIcon1.java | 2 +- .../src/main/java/WorldMapIcon2.java | 2 +- .../src/main/java/WorldMapLabel.java | 2 +- .../src/main/java/WorldMapLabelSize.java | 10 +- .../src/main/java/WorldMapManager.java | 66 +-- .../{class22.java => WorldMapRectangle.java} | 19 +- .../src/main/java/WorldMapRegion.java | 139 +++--- .../src/main/java/WorldMapSection0.java | 367 +++++++++------- .../src/main/java/WorldMapSection1.java | 304 ++++++------- .../src/main/java/WorldMapSection2.java | 406 +++++++++--------- .../src/main/java/WorldMapSection3.java | 303 +++++++------ .../src/main/java/WorldMapSectionType.java | 30 +- runescape-client/src/main/java/class1.java | 10 +- runescape-client/src/main/java/class15.java | 4 +- runescape-client/src/main/java/class16.java | 24 +- runescape-client/src/main/java/class171.java | 114 ++--- runescape-client/src/main/java/class196.java | 2 +- runescape-client/src/main/java/class198.java | 2 +- runescape-client/src/main/java/class21.java | 12 +- runescape-client/src/main/java/class238.java | 4 +- runescape-client/src/main/java/class306.java | 2 +- runescape-client/src/main/java/class32.java | 2 +- runescape-client/src/main/java/class39.java | 2 +- runescape-client/src/main/java/class4.java | 16 +- runescape-client/src/main/java/class40.java | 14 +- runescape-client/src/main/java/class50.java | 8 +- runescape-client/src/main/java/class54.java | 12 +- 87 files changed, 1384 insertions(+), 1323 deletions(-) rename runescape-client/src/main/java/{class211.java => Calendar.java} (94%) rename runescape-client/src/main/java/{class266.java => HorizontalAlignment.java} (84%) rename runescape-client/src/main/java/{class249.java => VerticalAlignment.java} (78%) rename runescape-client/src/main/java/{class22.java => WorldMapRectangle.java} (88%) diff --git a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java index dddc93c4d6..56d716cda2 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java +++ b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java @@ -45,6 +45,10 @@ public class AnnotationCleaner { assertEquals(c + " implements " + implementingName + " but is called " + c.getClassName(), implementingName, c.getClassName()); } + else + { + assertTrue(c + " isn't obfuscated but doesn't have @Implements", Deob.isObfuscated(c.getClassName())); + } for (Field f : c.getFields()) { diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index 421bc5e64e..eba775f70e 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java @@ -978,7 +978,7 @@ public interface RSClient extends RSGameShell, Client @Import("Rasterizer2D_drawVerticalLine") void rasterizerDrawVerticalLine(int x, int y, int h, int rgb); - @Import("drawGradient") + @Import("Rasterizer2D_drawGradient") void rasterizerDrawGradient(int x, int y, int w, int h, int rgbTop, int rgbBottom); @Import("Rasterizer2D_fillRectangleAlpha") diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index 6eb7f5cc76..6fb6f20059 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -34,12 +34,14 @@ public abstract class AbstractWorldMapIcon { @ObfuscatedGetter( intValue = -521086143 ) - int field5; + @Export("screenX") + int screenX; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -1065362217 ) - int field6; + @Export("screenY") + int screenY; @ObfuscatedSignature( signature = "(Lhu;Lhu;)V" @@ -109,38 +111,38 @@ public abstract class AbstractWorldMapIcon { WorldMapElement var3 = ViewportMouse.getWorldMapElement(this.getElement()); int var4 = this.vmethod397(); int var5 = this.vmethod398(); - switch(var3.field3287.field3528) { + switch(var3.horizontalAlignment.value) { case 0: - if (var1 >= this.field5 - var4 / 2 && var1 <= var4 / 2 + this.field5) { + if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) { break; } return false; case 1: - if (var1 >= this.field5 && var1 < var4 + this.field5) { + if (var1 >= this.screenX && var1 < var4 + this.screenX) { break; } return false; case 2: - if (var1 <= this.field5 - var4 || var1 > this.field5) { + if (var1 <= this.screenX - var4 || var1 > this.screenX) { return false; } } - switch(var3.field3301.field3275) { + switch(var3.verticalAlignment.value) { case 0: - if (var2 <= this.field6 - var5 || var2 > this.field6) { + if (var2 <= this.screenY - var5 || var2 > this.screenY) { return false; } break; case 1: - if (var2 < this.field6 - var5 / 2 || var2 > var5 / 2 + this.field6) { + if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) { return false; } break; case 2: - if (var2 < this.field6 || var2 >= var5 + this.field6) { + if (var2 < this.screenY || var2 >= var5 + this.screenY) { return false; } } @@ -156,7 +158,7 @@ public abstract class AbstractWorldMapIcon { ) boolean method21(int var1, int var2) { WorldMapLabel var3 = this.getLabel(); - return var3 == null ? false : (var1 >= this.field5 - var3.width / 2 && var1 <= var3.width / 2 + this.field5 ? var2 >= this.field6 && var2 <= var3.height + this.field6 : false); + return var3 == null ? false : (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX ? var2 >= this.screenY && var2 <= var3.height + this.screenY : false); } @ObfuscatedName("es") diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index 12cc33ee48..5c22e661a8 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -919,7 +919,7 @@ public abstract class Actor extends Entity { var13 = class204.getWidgetChild(argument2, argument1); if (var13 != null) { Player.method1281(); - WorldMapDecoration.method350(argument2, argument1, class211.method4107(class1.getWidgetClickMask(var13)), var13.itemId); + WorldMapDecoration.method350(argument2, argument1, Calendar.method4107(class1.getWidgetClickMask(var13)), var13.itemId); Client.isItemSelected = 0; Client.selectedSpellActionName = class198.method3745(var13); if (Client.selectedSpellActionName == null) { @@ -967,7 +967,7 @@ public abstract class Actor extends Entity { if (Client.field127 == null) { TilePaint.method3060(argument2, argument1); Client.field127 = class204.getWidgetChild(argument2, argument1); - class22.method295(Client.field127); + WorldMapRectangle.method295(Client.field127); } } else if (opcode == 31) { var8 = Interpreter.method1915(ClientPacket.field285, Client.packetWriter.isaacCipher); @@ -1045,7 +1045,7 @@ public abstract class Actor extends Entity { HealthBarDefinition.selectedItemSlot = argument1; ServerPacket.selectedItemWidget = argument2; MenuAction.selectedItemId = argument0; - class22.method295(var13); + WorldMapRectangle.method295(var13); Client.selectedItemName = BufferedFile.colorStartTag(16748608) + Skills.getItemDefinition(argument0).name + BufferedFile.colorStartTag(16777215); if (Client.selectedItemName == null) { Client.selectedItemName = "null"; @@ -1327,7 +1327,7 @@ public abstract class Actor extends Entity { if (Client.isItemSelected != 0) { Client.isItemSelected = 0; - class22.method295(Huffman.getWidget(ServerPacket.selectedItemWidget)); + WorldMapRectangle.method295(Huffman.getWidget(ServerPacket.selectedItemWidget)); } if (Client.isSpellSelected) { @@ -1335,7 +1335,7 @@ public abstract class Actor extends Entity { } if (BoundaryObject.field40 != null && Client.field203 == 0) { - class22.method295(BoundaryObject.field40); + WorldMapRectangle.method295(BoundaryObject.field40); } } diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index 03c033e450..266e415c5b 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -92,7 +92,7 @@ public class ArchiveLoader { boolean var11; if (Login.worldSelectOpen) { if (class30.worldSelectBackSprites == null) { - class30.worldSelectBackSprites = class2.method20(WorldMapSection3.archive8, "sl_back", ""); + class30.worldSelectBackSprites = class2.method20(WorldMapSection1.archive8, "sl_back", ""); } Archive var12; @@ -100,7 +100,7 @@ public class ArchiveLoader { int var14; IndexedSprite[] var15; if (Frames.worldSelectFlagSprites == null) { - var12 = WorldMapSection3.archive8; + var12 = WorldMapSection1.archive8; var14 = var12.getGroupId("sl_flags"); var13 = var12.getFileId(var14, ""); if (!SpriteMask.loadSprite(var12, var14, var13)) { @@ -113,7 +113,7 @@ public class ArchiveLoader { } if (AttackOption.worldSelectArrows == null) { - var12 = WorldMapSection3.archive8; + var12 = WorldMapSection1.archive8; var14 = var12.getGroupId("sl_arrows"); var13 = var12.getFileId(var14, ""); if (!SpriteMask.loadSprite(var12, var14, var13)) { @@ -126,7 +126,7 @@ public class ArchiveLoader { } if (UrlRequest.worldSelectStars == null) { - var12 = WorldMapSection3.archive8; + var12 = WorldMapSection1.archive8; var14 = var12.getGroupId("sl_stars"); var13 = var12.getFileId(var14, ""); if (!SpriteMask.loadSprite(var12, var14, var13)) { @@ -139,16 +139,16 @@ public class ArchiveLoader { } if (SecureRandomFuture.worldSelectLeftSprite == null) { - SecureRandomFuture.worldSelectLeftSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.archive8, "leftarrow", ""); + SecureRandomFuture.worldSelectLeftSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection1.archive8, "leftarrow", ""); } if (NetSocket.worldSelectRightSprite == null) { - NetSocket.worldSelectRightSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.archive8, "rightarrow", ""); + NetSocket.worldSelectRightSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection1.archive8, "rightarrow", ""); } 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); + Rasterizer2D.Rasterizer2D_drawGradient(Login.xPadding, 0, 125, 23, 0xbd9839, 0x8b6608); + Rasterizer2D.Rasterizer2D_drawGradient(Login.xPadding + 125, 0, 640, 23, 0x4f4f4f, 0x292929); var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); if (UrlRequest.worldSelectStars != null) { UrlRequest.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); @@ -700,7 +700,7 @@ public class ArchiveLoader { var1.drawCentered("Click to switch", var39 / 2 + var10, var41 / 2 + var34 + 12, 16777215, 0); } } else { - class277.field1144 = MenuAction.loadIndexedSpriteByName(WorldMapSection3.archive8, "sl_button", ""); + class277.field1144 = MenuAction.loadIndexedSpriteByName(WorldMapSection1.archive8, "sl_button", ""); } } } diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index 217a8415c8..f1a17d3d5b 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -81,7 +81,7 @@ public final class BoundaryObject { static final void doCheat(String var0) { if (var0.equalsIgnoreCase("toggleroof")) { ReflectionCheck.clientPreferences.roofsHidden = !ReflectionCheck.clientPreferences.roofsHidden; - WorldMapSection0.savePreferences(); + WorldMapSection3.savePreferences(); if (ReflectionCheck.clientPreferences.roofsHidden) { WorldMapIcon1.addGameMessage(99, "", "Roofs are now all hidden"); } else { diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index 2e8ad5df4a..1135e87bb1 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -83,9 +83,9 @@ public class ByteArrayPool { if (field55[var3] != var0) { if (var0 < field55[var3]) { } - } else if (WorldMapSection2.field1082[var3] > 0) { - byte[] var4 = RouteStrategy.field760[var3][--WorldMapSection2.field1082[var3]]; - RouteStrategy.field760[var3][WorldMapSection2.field1082[var3]] = null; + } else if (WorldMapSection0.field1082[var3] > 0) { + byte[] var4 = RouteStrategy.field760[var3][--WorldMapSection0.field1082[var3]]; + RouteStrategy.field760[var3][WorldMapSection0.field1082[var3]] = null; return var4; } } diff --git a/runescape-client/src/main/java/Bzip2Decompressor.java b/runescape-client/src/main/java/Bzip2Decompressor.java index 8c452325a4..e174e355e2 100644 --- a/runescape-client/src/main/java/Bzip2Decompressor.java +++ b/runescape-client/src/main/java/Bzip2Decompressor.java @@ -44,7 +44,7 @@ public final class Bzip2Decompressor { int var2 = var0.field70; int var3 = var0.field78; int var4 = var0.field76; - int[] var5 = WorldMapSection0.field1056; + int[] var5 = WorldMapSection3.field1056; int var6 = var0.field75; byte[] var7 = var0.field65; int var8 = var0.field66; @@ -159,7 +159,7 @@ public final class Bzip2Decompressor { var0.field70 = var2; var0.field78 = var3; var0.field76 = var4; - WorldMapSection0.field1056 = var5; + WorldMapSection3.field1056 = var5; var0.field75 = var6; var0.field65 = var7; var0.field66 = var8; @@ -194,8 +194,8 @@ public final class Bzip2Decompressor { int[] var21 = null; int[] var22 = null; var0.field73 = 1; - if (WorldMapSection0.field1056 == null) { - WorldMapSection0.field1056 = new int[var0.field73 * 100000]; + if (WorldMapSection3.field1056 == null) { + WorldMapSection3.field1056 = new int[var0.field73 * 100000]; } boolean var23 = true; @@ -434,7 +434,7 @@ public final class Bzip2Decompressor { } var10003 = var0.field77[var0.field83[var24 & 255] & 255]++; - WorldMapSection0.field1056[var39] = var0.field83[var24 & 255] & 255; + WorldMapSection3.field1056[var39] = var0.field83[var24 & 255] & 255; ++var39; if (var41 == 0) { ++var53; @@ -493,7 +493,7 @@ public final class Bzip2Decompressor { var46 = var0.field77; for (var46[var24 & 255] += var48; var48 > 0; --var48) { - WorldMapSection0.field1056[var39] = var24 & 255; + WorldMapSection3.field1056[var39] = var24 & 255; ++var39; } } @@ -513,16 +513,16 @@ public final class Bzip2Decompressor { } for (var25 = 0; var25 < var39; ++var25) { - var24 = (byte)(WorldMapSection0.field1056[var25] & 255); - var46 = WorldMapSection0.field1056; + var24 = (byte)(WorldMapSection3.field1056[var25] & 255); + var46 = WorldMapSection3.field1056; var48 = var0.field79[var24 & 255]; var46[var48] |= var25 << 8; ++var0.field79[var24 & 255]; } - var0.field75 = WorldMapSection0.field1056[var0.field74] >> 8; + var0.field75 = WorldMapSection3.field1056[var0.field74] >> 8; var0.field78 = 0; - var0.field75 = WorldMapSection0.field1056[var0.field75]; + var0.field75 = WorldMapSection3.field1056[var0.field75]; var0.field76 = (byte)(var0.field75 & 255); var0.field75 >>= 8; ++var0.field78; diff --git a/runescape-client/src/main/java/class211.java b/runescape-client/src/main/java/Calendar.java similarity index 94% rename from runescape-client/src/main/java/class211.java rename to runescape-client/src/main/java/Calendar.java index b017a4cdb1..0d00a8f7fa 100644 --- a/runescape-client/src/main/java/class211.java +++ b/runescape-client/src/main/java/Calendar.java @@ -1,19 +1,23 @@ -import java.util.Calendar; import java.util.Date; import java.util.TimeZone; import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("hg") -public class class211 { +@Implements("Calendar") +public class Calendar { @ObfuscatedName("m") - static final String[][] field1124; + @Export("MONTH_NAMES_ENGLISH_GERMAN") + static final String[][] MONTH_NAMES_ENGLISH_GERMAN; @ObfuscatedName("f") - static final String[] field1125; + @Export("DAYS_OF_THE_WEEK") + static final String[] DAYS_OF_THE_WEEK; @ObfuscatedName("q") - static Calendar field1126; + @Export("Calendar_calendar") + static java.util.Calendar Calendar_calendar; @ObfuscatedName("em") @ObfuscatedSignature( signature = "Llg;" @@ -210,9 +214,9 @@ public class class211 { } static { - field1124 = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}}; - field1125 = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; - Calendar.getInstance(TimeZone.getTimeZone("Europe/London")); - field1126 = Calendar.getInstance(TimeZone.getTimeZone("GMT")); + MONTH_NAMES_ENGLISH_GERMAN = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}}; + DAYS_OF_THE_WEEK = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; + java.util.Calendar.getInstance(TimeZone.getTimeZone("Europe/London")); + Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); } } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index fa8f279fc6..2908ce3715 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -157,7 +157,7 @@ public final class Canvas extends java.awt.Canvas { GrandExchangeOfferAgeComparator.field1111 = var10; } - class22.method295(var5); + WorldMapRectangle.method295(var5); return 1; } } @@ -167,12 +167,12 @@ public final class Canvas extends java.awt.Canvas { var6 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; var5 = Huffman.getWidget(var6.id); var5.children[var6.childIndex] = null; - class22.method295(var5); + WorldMapRectangle.method295(var5); return 1; } else if (var0 == ScriptOpcodes.CC_DELETEALL) { var6 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); var6.children = null; - class22.method295(var6); + WorldMapRectangle.method295(var6); return 1; } else if (var0 != ScriptOpcodes.CC_FIND) { if (var0 == ScriptOpcodes.IF_FIND) { diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 77c7b0767f..8a104b9752 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1843,19 +1843,19 @@ public final class Client extends GameShell implements Usernamed { if (var30 > 0) { var43 = var30 - 1; - var44 = (FloorOverlayDefinition)FloorOverlayDefinition.field664.get((long)var43); + var44 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var43); FloorOverlayDefinition var46; if (var44 != null) { var46 = var44; } else { - byte[] var47 = FloorOverlayDefinition.field663.takeFile(4, var43); + byte[] var47 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var43); var44 = new FloorOverlayDefinition(); if (var47 != null) { var44.decode(new Buffer(var47), var43); } var44.postDecode(); - FloorOverlayDefinition.field664.put(var44, (long)var43); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var44, (long)var43); var46 = var44; } @@ -1881,18 +1881,18 @@ public final class Client extends GameShell implements Usernamed { var42 = class32.field1157[var6][var12][var18] + 1; byte var67 = class307.field1155[var6][var12][var18]; int var68 = var30 - 1; - FloorOverlayDefinition var69 = (FloorOverlayDefinition)FloorOverlayDefinition.field664.get((long)var68); + FloorOverlayDefinition var69 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var68); if (var69 != null) { var44 = var69; } else { - byte[] var48 = FloorOverlayDefinition.field663.takeFile(4, var68); + byte[] var48 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var68); var69 = new FloorOverlayDefinition(); if (var48 != null) { var69.decode(new Buffer(var48), var68); } var69.postDecode(); - FloorOverlayDefinition.field664.put(var69, (long)var68); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var69, (long)var68); var44 = var69; } @@ -1902,7 +1902,7 @@ public final class Client extends GameShell implements Usernamed { int var51; int var52; if (var70 >= 0) { - var50 = Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var70); + var50 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var70); var49 = -1; } else if (var44.rgb == 16711935) { var49 = -2; @@ -2422,48 +2422,48 @@ public final class Client extends GameShell implements Usernamed { PacketBuffer.field667 = var27; try { - class266.osName = System.getProperty("os.name"); + HorizontalAlignment.osName = System.getProperty("os.name"); } catch (Exception var21) { - class266.osName = "Unknown"; + HorizontalAlignment.osName = "Unknown"; } - WorldMapSection3.osNameLowerCase = class266.osName.toLowerCase(); + WorldMapSection1.osNameLowerCase = HorizontalAlignment.osName.toLowerCase(); try { - WorldMapSection1.userHomeDirectory = System.getProperty("user.home"); - if (WorldMapSection1.userHomeDirectory != null) { - WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/"; + WorldMapSection2.userHomeDirectory = System.getProperty("user.home"); + if (WorldMapSection2.userHomeDirectory != null) { + WorldMapSection2.userHomeDirectory = WorldMapSection2.userHomeDirectory + "/"; } } catch (Exception var20) { } try { - if (WorldMapSection3.osNameLowerCase.startsWith("win")) { - if (WorldMapSection1.userHomeDirectory == null) { - WorldMapSection1.userHomeDirectory = System.getenv("USERPROFILE"); + if (WorldMapSection1.osNameLowerCase.startsWith("win")) { + if (WorldMapSection2.userHomeDirectory == null) { + WorldMapSection2.userHomeDirectory = System.getenv("USERPROFILE"); } - } else if (WorldMapSection1.userHomeDirectory == null) { - WorldMapSection1.userHomeDirectory = System.getenv("HOME"); + } else if (WorldMapSection2.userHomeDirectory == null) { + WorldMapSection2.userHomeDirectory = System.getenv("HOME"); } - if (WorldMapSection1.userHomeDirectory != null) { - WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/"; + if (WorldMapSection2.userHomeDirectory != null) { + WorldMapSection2.userHomeDirectory = WorldMapSection2.userHomeDirectory + "/"; } } catch (Exception var19) { } - if (WorldMapSection1.userHomeDirectory == null) { - WorldMapSection1.userHomeDirectory = "~/"; + if (WorldMapSection2.userHomeDirectory == null) { + WorldMapSection2.userHomeDirectory = "~/"; } - WorldMapSection2.cacheDirectoryLocations = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", WorldMapSection1.userHomeDirectory, "/tmp/", ""}; + WorldMapSection0.cacheDirectoryLocations = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", WorldMapSection2.userHomeDirectory, "/tmp/", ""}; Canvas.field94 = new String[]{".jagex_cache_" + PacketBuffer.field667, ".file_store_" + PacketBuffer.field667}; var6 = 0; label256: while (var6 < 4) { String var28 = var6 == 0 ? "" : "" + var6; - class337.clDat = new File(WorldMapSection1.userHomeDirectory, "jagex_cl_oldschool_" + var26 + var28 + ".dat"); + class337.clDat = new File(WorldMapSection2.userHomeDirectory, "jagex_cl_oldschool_" + var26 + var28 + ".dat"); String var30 = null; String var31 = null; boolean var32 = false; @@ -2529,8 +2529,8 @@ public final class Client extends GameShell implements Usernamed { if (var30 == null && var6 == 0) { label232: for (var3 = 0; var3 < Canvas.field94.length; ++var3) { - for (int var34 = 0; var34 < WorldMapSection2.cacheDirectoryLocations.length; ++var34) { - var36 = new File(WorldMapSection2.cacheDirectoryLocations[var34] + Canvas.field94[var3] + File.separatorChar + "oldschool" + File.separatorChar); + for (int var34 = 0; var34 < WorldMapSection0.cacheDirectoryLocations.length; ++var34) { + var36 = new File(WorldMapSection0.cacheDirectoryLocations[var34] + Canvas.field94[var3] + File.separatorChar + "oldschool" + File.separatorChar); if (var36.exists() && DevicePcmPlayerProvider.method847(new File(var36, "test.dat"), true)) { var30 = var36.toString(); var32 = true; @@ -2541,7 +2541,7 @@ public final class Client extends GameShell implements Usernamed { } if (var30 == null) { - var30 = WorldMapSection1.userHomeDirectory + File.separatorChar + "jagexcache" + var28 + File.separatorChar + "oldschool" + File.separatorChar + var26 + File.separatorChar; + var30 = WorldMapSection2.userHomeDirectory + File.separatorChar + "jagexcache" + var28 + File.separatorChar + "oldschool" + File.separatorChar + var26 + File.separatorChar; var32 = true; } @@ -2691,8 +2691,8 @@ public final class Client extends GameShell implements Usernamed { class21.field1123 = var5; break; case 10: - class22.studioGame = (StudioGame)ScriptFrame.findEnumerated(ClientPacket.method3664(), Integer.parseInt(var5)); - if (class22.studioGame == StudioGame.field892) { + WorldMapRectangle.studioGame = (StudioGame)ScriptFrame.findEnumerated(ClientPacket.method3664(), Integer.parseInt(var5)); + if (WorldMapRectangle.studioGame == StudioGame.field892) { KeyHandler.loginType = LoginType.field479; } else { KeyHandler.loginType = LoginType.field487; @@ -2840,9 +2840,9 @@ public final class Client extends GameShell implements Usernamed { int var21 = var17 == 0 ? 5 : 9; ModelData0.NetCache_currentResponse = var20; - class22.NetCache_responseArchiveBuffer = new Buffer(var13 + var21 + ModelData0.NetCache_currentResponse.padding); - class22.NetCache_responseArchiveBuffer.writeByte(var17); - class22.NetCache_responseArchiveBuffer.writeInt(var13); + WorldMapRectangle.NetCache_responseArchiveBuffer = new Buffer(var13 + var21 + ModelData0.NetCache_currentResponse.padding); + WorldMapRectangle.NetCache_responseArchiveBuffer.writeByte(var17); + WorldMapRectangle.NetCache_responseArchiveBuffer.writeInt(var13); NetCache.field630 = 8; NetCache.NetCache_responseHeaderBuffer.index = 0; } else if (NetCache.field630 == 0) { @@ -2854,31 +2854,31 @@ public final class Client extends GameShell implements Usernamed { } } } else { - var10 = class22.NetCache_responseArchiveBuffer.array.length - ModelData0.NetCache_currentResponse.padding; + var10 = WorldMapRectangle.NetCache_responseArchiveBuffer.array.length - ModelData0.NetCache_currentResponse.padding; var11 = 512 - NetCache.field630; - if (var11 > var10 - class22.NetCache_responseArchiveBuffer.index) { - var11 = var10 - class22.NetCache_responseArchiveBuffer.index; + if (var11 > var10 - WorldMapRectangle.NetCache_responseArchiveBuffer.index) { + var11 = var10 - WorldMapRectangle.NetCache_responseArchiveBuffer.index; } if (var11 > var8) { var11 = var8; } - NetCache.NetCache_socket.read(class22.NetCache_responseArchiveBuffer.array, class22.NetCache_responseArchiveBuffer.index, var11); + NetCache.NetCache_socket.read(WorldMapRectangle.NetCache_responseArchiveBuffer.array, WorldMapRectangle.NetCache_responseArchiveBuffer.index, var11); if (NetCache.field631 != 0) { for (var12 = 0; var12 < var11; ++var12) { - var14 = class22.NetCache_responseArchiveBuffer.array; - var15 = class22.NetCache_responseArchiveBuffer.index + var12; + var14 = WorldMapRectangle.NetCache_responseArchiveBuffer.array; + var15 = WorldMapRectangle.NetCache_responseArchiveBuffer.index + var12; var14[var15] ^= NetCache.field631; } } - var16 = class22.NetCache_responseArchiveBuffer; + var16 = WorldMapRectangle.NetCache_responseArchiveBuffer; var16.index += var11; NetCache.field630 += var11; - if (var10 == class22.NetCache_responseArchiveBuffer.index) { + if (var10 == WorldMapRectangle.NetCache_responseArchiveBuffer.index) { if (16711935L == ModelData0.NetCache_currentResponse.key) { - Players.NetCache_reference = class22.NetCache_responseArchiveBuffer; + Players.NetCache_reference = WorldMapRectangle.NetCache_responseArchiveBuffer; for (var12 = 0; var12 < 256; ++var12) { Archive var25 = NetCache.NetCache_archives[var12]; @@ -2891,7 +2891,7 @@ public final class Client extends GameShell implements Usernamed { } } else { NetCache.NetCache_crc.reset(); - NetCache.NetCache_crc.update(class22.NetCache_responseArchiveBuffer.array, 0, var10); + NetCache.NetCache_crc.update(WorldMapRectangle.NetCache_responseArchiveBuffer.array, 0, var10); var12 = (int)NetCache.NetCache_crc.getValue(); if (var12 != ModelData0.NetCache_currentResponse.crc) { try { @@ -2908,7 +2908,7 @@ public final class Client extends GameShell implements Usernamed { NetCache.NetCache_crcMismatches = 0; NetCache.NetCache_ioExceptions = 0; - ModelData0.NetCache_currentResponse.archive.write((int)(ModelData0.NetCache_currentResponse.key & 65535L), class22.NetCache_responseArchiveBuffer.array, 16711680L == (ModelData0.NetCache_currentResponse.key & 16711680L), GrandExchangeOfferWorldComparator.field988); + ModelData0.NetCache_currentResponse.archive.write((int)(ModelData0.NetCache_currentResponse.key & 65535L), WorldMapRectangle.NetCache_responseArchiveBuffer.array, 16711680L == (ModelData0.NetCache_currentResponse.key & 16711680L), GrandExchangeOfferWorldComparator.field988); } ModelData0.NetCache_currentResponse.remove(); @@ -2920,7 +2920,7 @@ public final class Client extends GameShell implements Usernamed { NetCache.field630 = 0; ModelData0.NetCache_currentResponse = null; - class22.NetCache_responseArchiveBuffer = null; + WorldMapRectangle.NetCache_responseArchiveBuffer = null; } else { if (NetCache.field630 != 512) { break; @@ -3038,7 +3038,7 @@ public final class Client extends GameShell implements Usernamed { UserComparator9.method3343(var2); NetCache.NetCache_responseHeaderBuffer.index = 0; ModelData0.NetCache_currentResponse = null; - class22.NetCache_responseArchiveBuffer = null; + WorldMapRectangle.NetCache_responseArchiveBuffer = null; NetCache.field630 = 0; while (true) { @@ -3343,16 +3343,16 @@ public final class Client extends GameShell implements Usernamed { var8.packetBuffer.writeInt(SecureRandomFuture.archive5.hash); var8.packetBuffer.writeInt(UserComparator3.archive6.hash); var8.packetBuffer.writeInt(class40.archive7.hash); - var8.packetBuffer.writeInt(WorldMapSection3.archive8.hash); + var8.packetBuffer.writeInt(WorldMapSection1.archive8.hash); var8.packetBuffer.writeInt(class238.archive9.hash); var8.packetBuffer.writeInt(class16.archive10.hash); var8.packetBuffer.writeInt(Login.archive11.hash); var8.packetBuffer.writeInt(Formatting.archive12.hash); var8.packetBuffer.writeInt(ByteArrayPool.archive13.hash); var8.packetBuffer.writeInt(class2.archive14.hash); - var8.packetBuffer.writeInt(WorldMapSection1.archive15.hash); + var8.packetBuffer.writeInt(WorldMapSection2.archive15.hash); var8.packetBuffer.writeInt(0); - var8.packetBuffer.writeInt(class22.archive16.hash); + var8.packetBuffer.writeInt(WorldMapRectangle.archive16.hash); var8.packetBuffer.writeInt(WorldMapLabelSize.field1040.hash); var8.packetBuffer.writeInt(ItemContainer.field434.hash); var8.packetBuffer.writeInt(AbstractByteArrayCopier.field0.hash); @@ -3396,12 +3396,12 @@ public final class Client extends GameShell implements Usernamed { } if (loginState == 7 && ((AbstractSocket)var1).available() > 0) { - WorldMapSection1.field1071 = ((AbstractSocket)var1).readUnsignedByte(); + WorldMapSection2.field1071 = ((AbstractSocket)var1).readUnsignedByte(); loginState = 8; } - if (loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapSection1.field1071) { - ((AbstractSocket)var1).read(var2.array, 0, WorldMapSection1.field1071); + if (loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapSection2.field1071) { + ((AbstractSocket)var1).read(var2.array, 0, WorldMapSection2.field1071); var2.index = 0; loginState = 6; } @@ -3449,7 +3449,7 @@ public final class Client extends GameShell implements Usernamed { ReflectionCheck.clientPreferences.rememberedUsername = null; } - WorldMapSection0.savePreferences(); + WorldMapSection3.savePreferences(); staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); @@ -3484,7 +3484,7 @@ public final class Client extends GameShell implements Usernamed { var2.index = 0; ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacket0Length); timer.method332(); - WorldMapSection1.method808(); + WorldMapSection2.method808(); GrandExchangeOfferNameComparator.updatePlayer(var2); GameObject.field359 = -1; class50.loadRegions(false, var2); @@ -3854,7 +3854,7 @@ public final class Client extends GameShell implements Usernamed { class60.worldMap0.method360(); } - class266.method5120(); + HorizontalAlignment.method5120(); Message.method1228(); if (gameState != 30) { return; @@ -3898,7 +3898,7 @@ public final class Client extends GameShell implements Usernamed { if (BoundaryObject.field40 != null) { ++field203; if (field203 >= 15) { - class22.method295(BoundaryObject.field40); + WorldMapRectangle.method295(BoundaryObject.field40); BoundaryObject.field40 = null; } } @@ -3974,7 +3974,7 @@ public final class Client extends GameShell implements Usernamed { PacketBufferNode var27; if (DevicePcmPlayerProvider.dragInventoryWidget != null) { - class22.method295(DevicePcmPlayerProvider.dragInventoryWidget); + WorldMapRectangle.method295(DevicePcmPlayerProvider.dragInventoryWidget); ++itemDragDuration; if (MouseHandler.MouseHandler_currentButton == 0) { if (field207) { @@ -4057,21 +4057,21 @@ public final class Client extends GameShell implements Usernamed { if (var36 != Clock.mousedOverWidgetIf1) { if (var36 != null) { - class22.method295(var36); + WorldMapRectangle.method295(var36); } if (Clock.mousedOverWidgetIf1 != null) { - class22.method295(Clock.mousedOverWidgetIf1); + WorldMapRectangle.method295(Clock.mousedOverWidgetIf1); } } if (var23 != AccessFile.field8 && field218 == field219) { if (var23 != null) { - class22.method295(var23); + WorldMapRectangle.method295(var23); } if (AccessFile.field8 != null) { - class22.method295(AccessFile.field8); + WorldMapRectangle.method295(AccessFile.field8); } } @@ -4079,7 +4079,7 @@ public final class Client extends GameShell implements Usernamed { if (field218 < field219) { ++field218; if (field219 == field218) { - class22.method295(AccessFile.field8); + WorldMapRectangle.method295(AccessFile.field8); } } } else if (field218 > 0) { @@ -4091,17 +4091,17 @@ public final class Client extends GameShell implements Usernamed { var4 = class3.field1146 * 128 + 64; var9 = MusicPatchPcmStream.field602 * 128 + 64; var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - AbstractWorldMapIcon.field4; - if (WorldMapSection1.cameraX < var4) { - WorldMapSection1.cameraX = (var4 - WorldMapSection1.cameraX) * class30.field1148 / 1000 + WorldMapSection1.cameraX + ClientPacket.field221; - if (WorldMapSection1.cameraX > var4) { - WorldMapSection1.cameraX = var4; + if (WorldMapSection2.cameraX < var4) { + WorldMapSection2.cameraX = (var4 - WorldMapSection2.cameraX) * class30.field1148 / 1000 + WorldMapSection2.cameraX + ClientPacket.field221; + if (WorldMapSection2.cameraX > var4) { + WorldMapSection2.cameraX = var4; } } - if (WorldMapSection1.cameraX > var4) { - WorldMapSection1.cameraX -= class30.field1148 * (WorldMapSection1.cameraX - var4) / 1000 + ClientPacket.field221; - if (WorldMapSection1.cameraX < var4) { - WorldMapSection1.cameraX = var4; + if (WorldMapSection2.cameraX > var4) { + WorldMapSection2.cameraX -= class30.field1148 * (WorldMapSection2.cameraX - var4) / 1000 + ClientPacket.field221; + if (WorldMapSection2.cameraX < var4) { + WorldMapSection2.cameraX = var4; } } @@ -4136,7 +4136,7 @@ public final class Client extends GameShell implements Usernamed { var4 = GrandExchangeOffer.field376 * 128 + 64; var9 = KeyHandler.field445 * 128 + 64; var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - ArchiveDiskAction.field410; - var11 = var4 - WorldMapSection1.cameraX; + var11 = var4 - WorldMapSection2.cameraX; var12 = var10 - GrandExchangeEvents.cameraY; var13 = var9 - GrandExchangeOfferNameComparator.cameraZ; var14 = (int)Math.sqrt((double)(var13 * var13 + var11 * var11)); @@ -4202,7 +4202,7 @@ public final class Client extends GameShell implements Usernamed { } class196.varcs.tryWrite(); - var4 = class22.method297(); + var4 = WorldMapRectangle.method297(); var9 = KeyHandler.KeyHandler_idleCycles; if (var4 > 15000 && var9 > 15000) { field175 = 250; @@ -4585,9 +4585,9 @@ public final class Client extends GameShell implements Usernamed { ClientPacket.field221 = var3.readUnsignedByte(); class30.field1148 = var3.readUnsignedByte(); if (class30.field1148 >= 100) { - WorldMapSection1.cameraX = class3.field1146 * 128 + 64; + WorldMapSection2.cameraX = class3.field1146 * 128 + 64; GrandExchangeOfferNameComparator.cameraZ = MusicPatchPcmStream.field602 * 128 + 64; - GrandExchangeEvents.cameraY = class32.getTileHeight(WorldMapSection1.cameraX, GrandExchangeOfferNameComparator.cameraZ, SoundSystem.plane) - AbstractWorldMapIcon.field4; + GrandExchangeEvents.cameraY = class32.getTileHeight(WorldMapSection2.cameraX, GrandExchangeOfferNameComparator.cameraZ, SoundSystem.plane) - AbstractWorldMapIcon.field4; } var1.serverPacket0 = null; @@ -4614,7 +4614,7 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field806 == var1.serverPacket0) { Canvas.field95 = var3.method59(); - WorldMapSection3.field1089 = var3.readUnsignedByteNegate(); + WorldMapSection1.field1089 = var3.readUnsignedByteNegate(); while (var3.index < var1.serverPacket0Length) { var38 = var3.readUnsignedByte(); @@ -4635,7 +4635,7 @@ public final class Client extends GameShell implements Usernamed { var8.sequenceId = var38; var8.modelFrame = 0; var8.modelFrameCycle = 0; - class22.method295(var8); + WorldMapRectangle.method295(var8); } var1.serverPacket0 = null; @@ -4648,7 +4648,7 @@ public final class Client extends GameShell implements Usernamed { var9 = Huffman.getWidget(var38); var9.modelType = 3; var9.modelId = Canvas.localPlayer.appearance.getChatHeadId(); - class22.method295(var9); + WorldMapRectangle.method295(var9); var1.serverPacket0 = null; return true; } @@ -4668,7 +4668,7 @@ public final class Client extends GameShell implements Usernamed { var9.itemIds[var5] = 0; } - class22.method295(var9); + WorldMapRectangle.method295(var9); var1.serverPacket0 = null; return true; } @@ -4716,7 +4716,7 @@ public final class Client extends GameShell implements Usernamed { } if (var8 != null) { - class22.method295(var8); + WorldMapRectangle.method295(var8); } GrandExchangeOfferAgeComparator.method159(); @@ -4738,7 +4738,7 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field853 == var1.serverPacket0) { - WorldMapSection3.field1089 = var3.readUnsignedByteNegate(); + WorldMapSection1.field1089 = var3.readUnsignedByteNegate(); Canvas.field95 = var3.method59(); var1.serverPacket0 = null; return true; @@ -4751,7 +4751,7 @@ public final class Client extends GameShell implements Usernamed { var8 = Huffman.getWidget(var38); if (var14 != var8.isHidden) { var8.isHidden = var14; - class22.method295(var8); + WorldMapRectangle.method295(var8); } var1.serverPacket0 = null; @@ -4798,7 +4798,7 @@ public final class Client extends GameShell implements Usernamed { rootInterface = var38; this.method87(false); DevicePcmPlayerProvider.method845(var38); - WorldMapSection3.runWidgetOnLoadListener(rootInterface); + WorldMapSection1.runWidgetOnLoadListener(rootInterface); for (var6 = 0; var6 < 100; ++var6) { field100[var6] = true; @@ -4827,7 +4827,7 @@ public final class Client extends GameShell implements Usernamed { var15.modelAngleX = var38; var15.modelAngleY = var5; var15.modelZoom = var6; - class22.method295(var15); + WorldMapRectangle.method295(var15); } var1.serverPacket0 = null; @@ -4936,7 +4936,7 @@ public final class Client extends GameShell implements Usernamed { var16.modelAngleX = var41.xan2d; var16.modelAngleY = var41.yan2d; var16.modelZoom = var41.zoom2d * 100 / var5; - class22.method295(var16); + WorldMapRectangle.method295(var16); } else { var16.itemId = var6; var16.itemQuantity = var5; @@ -4959,7 +4959,7 @@ public final class Client extends GameShell implements Usernamed { var16.modelZoom = var16.modelZoom * 32 / var16.rawWidth; } - class22.method295(var16); + WorldMapRectangle.method295(var16); } var1.serverPacket0 = null; @@ -5159,7 +5159,7 @@ public final class Client extends GameShell implements Usernamed { } if (var8 != null) { - class22.method295(var8); + WorldMapRectangle.method295(var8); } GrandExchangeOfferAgeComparator.method159(); @@ -5187,7 +5187,7 @@ public final class Client extends GameShell implements Usernamed { var16.rawY = var6; var16.xAlignment = 0; var16.yAlignment = 0; - class22.method295(var16); + WorldMapRectangle.method295(var16); this.alignWidget(var16); if (var16.type == 0) { class39.revalidateWidgetScroll(Widget.interfaceComponents[var38 >> 16], var16, false); @@ -5205,7 +5205,7 @@ public final class Client extends GameShell implements Usernamed { if (var8.modelType != 2 || var38 != var8.modelId) { var8.modelType = 2; var8.modelId = var38; - class22.method295(var8); + WorldMapRectangle.method295(var8); } var1.serverPacket0 = null; @@ -5257,12 +5257,12 @@ public final class Client extends GameShell implements Usernamed { var15 = Huffman.getWidget(var6); if (var15 != null) { - class22.method295(var15); + WorldMapRectangle.method295(var15); } var15 = Huffman.getWidget(var38); if (var15 != null) { - class22.method295(var15); + WorldMapRectangle.method295(var15); class39.revalidateWidgetScroll(Widget.interfaceComponents[var15.id >>> 16], var15, true); } @@ -5284,7 +5284,7 @@ public final class Client extends GameShell implements Usernamed { Widget var48 = Huffman.getWidget(var38); if (var12 != var48.color) { var48.color = var12; - class22.method295(var48); + WorldMapRectangle.method295(var48); } var1.serverPacket0 = null; @@ -5321,9 +5321,9 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field814 == var1.serverPacket0) { Canvas.field95 = var3.readUnsignedByteNegate(); - WorldMapSection3.field1089 = var3.readUnsignedByte(); + WorldMapSection1.field1089 = var3.readUnsignedByte(); - for (var38 = WorldMapSection3.field1089; var38 < WorldMapSection3.field1089 + 8; ++var38) { + for (var38 = WorldMapSection1.field1089; var38 < WorldMapSection1.field1089 + 8; ++var38) { for (var6 = Canvas.field95; var6 < Canvas.field95 + 8; ++var6) { if (groundItems[SoundSystem.plane][var38][var6] != null) { groundItems[SoundSystem.plane][var38][var6] = null; @@ -5333,7 +5333,7 @@ public final class Client extends GameShell implements Usernamed { } for (PendingSpawn var46 = (PendingSpawn)pendingSpawns.last(); var46 != null; var46 = (PendingSpawn)pendingSpawns.previous()) { - if (var46.x >= WorldMapSection3.field1089 && var46.x < WorldMapSection3.field1089 + 8 && var46.y >= Canvas.field95 && var46.y < Canvas.field95 + 8 && var46.plane == SoundSystem.plane) { + if (var46.x >= WorldMapSection1.field1089 && var46.x < WorldMapSection1.field1089 + 8 && var46.y >= Canvas.field95 && var46.y < Canvas.field95 + 8 && var46.plane == SoundSystem.plane) { var46.hitpoints = 0; } } @@ -5349,7 +5349,7 @@ public final class Client extends GameShell implements Usernamed { if (var8.modelType != 1 || var6 != var8.modelId) { var8.modelType = 1; var8.modelId = var6; - class22.method295(var8); + WorldMapRectangle.method295(var8); } var1.serverPacket0 = null; @@ -5415,7 +5415,7 @@ public final class Client extends GameShell implements Usernamed { var8 = Huffman.getWidget(var38); if (!var4.equals(var8.text)) { var8.text = var4; - class22.method295(var8); + WorldMapRectangle.method295(var8); } var1.serverPacket0 = null; @@ -5450,7 +5450,7 @@ public final class Client extends GameShell implements Usernamed { var38 = GrandExchangeOffer.field376 * 128 + 64; var6 = KeyHandler.field445 * 128 + 64; var5 = class32.getTileHeight(var38, var6, SoundSystem.plane) - ArchiveDiskAction.field410; - var10 = var38 - WorldMapSection1.cameraX; + var10 = var38 - WorldMapSection2.cameraX; var11 = var5 - GrandExchangeEvents.cameraY; var12 = var6 - GrandExchangeOfferNameComparator.cameraZ; var13 = (int)Math.sqrt((double)(var12 * var12 + var10 * var10)); @@ -5484,7 +5484,7 @@ public final class Client extends GameShell implements Usernamed { if (var6 != var8.scrollY) { var8.scrollY = var6; - class22.method295(var8); + WorldMapRectangle.method295(var8); } } @@ -5598,7 +5598,7 @@ public final class Client extends GameShell implements Usernamed { rootInterface = var6; this.method87(false); DevicePcmPlayerProvider.method845(rootInterface); - WorldMapSection3.runWidgetOnLoadListener(rootInterface); + WorldMapSection1.runWidgetOnLoadListener(rootInterface); for (var10 = 0; var10 < 100; ++var10) { field100[var10] = true; @@ -5713,7 +5713,7 @@ public final class Client extends GameShell implements Usernamed { } if (field127 != null) { - class22.method295(field127); + WorldMapRectangle.method295(field127); field127 = null; } @@ -5936,7 +5936,7 @@ public final class Client extends GameShell implements Usernamed { } if (var15 != -1) { - WorldMapSection0.method245(var15); + WorldMapSection3.method245(var15); } isMenuOpen = false; @@ -5969,7 +5969,7 @@ public final class Client extends GameShell implements Usernamed { } if ((var11 == 1 || !AbstractRasterProvider.mouseCam && var11 == 4) && menuOptionsCount > 0) { - WorldMapSection0.method245(var2); + WorldMapSection3.method245(var2); } if (var11 == 2 && menuOptionsCount > 0) { @@ -5989,7 +5989,7 @@ public final class Client extends GameShell implements Usernamed { field207 = false; itemDragDuration = 0; if (DevicePcmPlayerProvider.dragInventoryWidget != null) { - class22.method295(DevicePcmPlayerProvider.dragInventoryWidget); + WorldMapRectangle.method295(DevicePcmPlayerProvider.dragInventoryWidget); } DevicePcmPlayerProvider.dragInventoryWidget = Huffman.getWidget(var13); @@ -6005,7 +6005,7 @@ public final class Client extends GameShell implements Usernamed { GrandExchangeOfferUnitPriceComparator.tempMenuAction.action = menuActions[var2]; } - class22.method295(DevicePcmPlayerProvider.dragInventoryWidget); + WorldMapRectangle.method295(DevicePcmPlayerProvider.dragInventoryWidget); return; } } @@ -6111,7 +6111,7 @@ public final class Client extends GameShell implements Usernamed { var4 = var2.height; } - WorldMapSection3.alignWidgetSize(component, var3, var4, false); + WorldMapSection1.alignWidgetSize(component, var3, var4, false); FloorOverlayDefinition.alignWidgetPosition(component, var3, var4); } @@ -6121,7 +6121,7 @@ public final class Client extends GameShell implements Usernamed { garbageValue = "715978124" ) final void method88() { - class22.method295(clickedWidget); + WorldMapRectangle.method295(clickedWidget); ++MouseRecorder.widgetDragDuration; if (field103 && field106) { int var1 = MouseHandler.MouseHandler_x; diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java index 34868b1afd..0bf9ad7997 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -15,11 +15,11 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { @Export("get") public PlatformInfo get() { byte var1; - if (WorldMapSection3.osNameLowerCase.startsWith("win")) { + if (WorldMapSection1.osNameLowerCase.startsWith("win")) { var1 = 1; - } else if (WorldMapSection3.osNameLowerCase.startsWith("mac")) { + } else if (WorldMapSection1.osNameLowerCase.startsWith("mac")) { var1 = 2; - } else if (WorldMapSection3.osNameLowerCase.startsWith("linux")) { + } else if (WorldMapSection1.osNameLowerCase.startsWith("linux")) { var1 = 3; } else { var1 = 4; diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index 4ced5dafce..292829e300 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -295,7 +295,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } if (var10.contentType == 1339) { - class22.method296(var10, var12, var13, var11); + WorldMapRectangle.method296(var10, var12, var13, var11); Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); continue; } @@ -370,7 +370,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { if (var36 != null) { var36.drawAt2(var21, var26); } else if (Widget.field957) { - class22.method295(var10); + WorldMapRectangle.method295(var10); } } } else { @@ -418,7 +418,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { var47.scrollY -= var45; Client.field206 += var45; - class22.method295(var47); + WorldMapRectangle.method295(var47); } if (var24 + var26 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var47.scrollY < var47.scrollHeight - var47.height) { @@ -433,7 +433,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { var47.scrollY += var45; Client.field206 -= var45; - class22.method295(var47); + WorldMapRectangle.method295(var47); } } } else if (var10 == BoundaryObject.field40 && var22 == Client.field204) { @@ -442,7 +442,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { var42.drawAt2(var21, var26); } } else { - class22.method295(var10); + WorldMapRectangle.method295(var10); } } } @@ -466,7 +466,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { if (var10.fill) { switch(var10.rectangleMode.id) { case 1: - Rasterizer2D.drawGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); + Rasterizer2D.Rasterizer2D_drawGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); break; case 2: Rasterizer2D.drawGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparency & 255), 255 - (var10.field960 & 255)); @@ -489,7 +489,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { var27 = var10.getFont(); if (var27 == null) { if (Widget.field957) { - class22.method295(var10); + WorldMapRectangle.method295(var10); } } else { String var38 = var10.text; @@ -539,7 +539,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { if (var37 != null) { var37.drawAt2(var12, var13); } else if (Widget.field957) { - class22.method295(var10); + WorldMapRectangle.method295(var10); } } else { if (var10.itemId != -1) { @@ -550,7 +550,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { if (var37 == null) { if (Widget.field957) { - class22.method295(var10); + WorldMapRectangle.method295(var10); } } else { var19 = var37.width; @@ -608,7 +608,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { var43.calculateBoundsCylinder(); var21 = var43.height / 2; } else { - class22.method295(var10); + WorldMapRectangle.method295(var10); } } } else if (var10.modelType == 5) { @@ -620,13 +620,13 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } else if (var19 == -1) { var43 = var10.getModel((SequenceDefinition)null, -1, var40, Canvas.localPlayer.appearance); if (var43 == null && Widget.field957) { - class22.method295(var10); + WorldMapRectangle.method295(var10); } } else { SequenceDefinition var44 = WorldMapAreaData.getSequenceDefinition(var19); var43 = var10.getModel(var44, var10.modelFrame, var40, Canvas.localPlayer.appearance); if (var43 == null && Widget.field957) { - class22.method295(var10); + WorldMapRectangle.method295(var10); } } @@ -652,7 +652,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { var27 = var10.getFont(); if (var27 == null) { if (Widget.field957) { - class22.method295(var10); + WorldMapRectangle.method295(var10); } continue; } diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index ad287bbc64..c023e48d5a 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -627,7 +627,7 @@ public class DynamicObject extends Entity { Client.soundEffectCount = 0; Client.isCameraLocked = false; - WorldMapSection1.cameraX -= var5 << 7; + WorldMapSection2.cameraX -= var5 << 7; GrandExchangeOfferNameComparator.cameraZ -= var6 << 7; MouseHandler.oculusOrbFocalPointX -= var5 << 7; ScriptEvent.oculusOrbFocalPointY -= var6 << 7; diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index 2568f46343..79c2455a5b 100644 --- a/runescape-client/src/main/java/FloorOverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -11,12 +11,14 @@ public class FloorOverlayDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractArchive field663; + @Export("FloorOverlayDefinition_archive") + public static AbstractArchive FloorOverlayDefinition_archive; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" ) - public static EvictingDualNodeHashTable field664; + @Export("FloorOverlayDefinition_cached") + public static EvictingDualNodeHashTable FloorOverlayDefinition_cached; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -111851793 @@ -240,6 +242,6 @@ public class FloorOverlayDefinition extends DualNode { } static { - field664 = new EvictingDualNodeHashTable(64); + FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64); } } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index 2dc2ec26c4..e4c30b8774 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -176,8 +176,8 @@ public class FloorUnderlayDefinition extends DualNode { signature = "(I)[Lip;", garbageValue = "618327716" ) - static class249[] method4839() { - return new class249[]{class249.field3277, class249.field3273, class249.field3274}; + static VerticalAlignment[] method4839() { + return new VerticalAlignment[]{VerticalAlignment.field3277, VerticalAlignment.field3273, VerticalAlignment.field3274}; } static { diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index b942a26fd2..71f2f3b9d8 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -485,7 +485,7 @@ public class FontName { SecureRandomFuture.archive5.method8(); UserComparator3.archive6.method8(); class40.archive7.method8(); - WorldMapSection3.archive8.method8(); + WorldMapSection1.archive8.method8(); class238.archive9.method8(); class16.archive10.method8(); Login.archive11.method8(); diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index c4d48244db..9976c7a2e0 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -202,7 +202,7 @@ public class FriendSystem { var4 = "You can't add yourself to your own ignore list"; WorldMapIcon1.addGameMessage(30, "", var4); } else if (this.isIgnored(var2)) { - class22.method294(var1); + WorldMapRectangle.method294(var1); } else { PacketBufferNode var5; if (this.isFriended(var2, false)) { diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index 4ca3e00005..1aaea20dfb 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -1037,14 +1037,14 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene if (gameState != 5 && gameState != 10) { if (gameState == 20) { - class2.method27(class16.archive10, WorldMapSection3.archive8, true, Client.gameState == 11 ? 4 : 0); + class2.method27(class16.archive10, WorldMapSection1.archive8, true, Client.gameState == 11 ? 4 : 0); } else if (gameState == 11) { - class2.method27(class16.archive10, WorldMapSection3.archive8, false, 4); + class2.method27(class16.archive10, WorldMapSection1.archive8, false, 4); } else { class80.method2015(); } } else { - class2.method27(class16.archive10, WorldMapSection3.archive8, true, 0); + class2.method27(class16.archive10, WorldMapSection1.archive8, true, 0); } Client.gameState = gameState; diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index 14ad28bf74..0ea9e315c3 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -238,7 +238,7 @@ public class GrandExchangeEvent { Interpreter.Interpreter_stringLocals = var30.stringLocals; } else if (var13 == ScriptOpcodes.GET_VARBIT) { var11 = var6[var4]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection2.getVarbit(var11); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection0.getVarbit(var11); } else if (var13 == ScriptOpcodes.SET_VARBIT) { var11 = var6[var4]; PendingSpawn.method1695(var11, Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index 6a0f456579..4d54ab3c6b 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -145,7 +145,7 @@ final class GrandExchangeOfferAgeComparator implements Comparator { var4 = (int)var0.key; Widget var5 = Huffman.getWidget(var4); if (var5 != null) { - class22.method295(var5); + WorldMapRectangle.method295(var5); } } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index 924dc0bdbc..96ea411df2 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -83,7 +83,7 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator { var2 = Canvas.localPlayer.y >> 7; } - int var3 = WorldMapSection1.cameraX >> 7; + int var3 = WorldMapSection2.cameraX >> 7; int var4 = GrandExchangeOfferNameComparator.cameraZ >> 7; if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { return SoundSystem.plane; diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 4dd5c6279b..17c3f5e280 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -231,7 +231,7 @@ public class HitSplatDefinition extends DualNode { public final HitSplatDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = WorldMapSection2.getVarbit(this.transformVarbit); + var1 = WorldMapSection0.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } diff --git a/runescape-client/src/main/java/class266.java b/runescape-client/src/main/java/HorizontalAlignment.java similarity index 84% rename from runescape-client/src/main/java/class266.java rename to runescape-client/src/main/java/HorizontalAlignment.java index 275ac90a19..55adc59bad 100644 --- a/runescape-client/src/main/java/class266.java +++ b/runescape-client/src/main/java/HorizontalAlignment.java @@ -1,10 +1,12 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ju") -public enum class266 implements Enumerated { +@Implements("HorizontalAlignment") +public enum HorizontalAlignment implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lju;" @@ -28,7 +30,8 @@ public enum class266 implements Enumerated { @ObfuscatedGetter( intValue = -739868097 ) - public final int field3528; + @Export("value") + public final int value; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -1327532101 @@ -36,8 +39,8 @@ public enum class266 implements Enumerated { @Export("id") final int id; - private class266(int var3, int var4) { - this.field3528 = var3; + private HorizontalAlignment(int var3, int var4) { + this.value = var3; this.id = var4; } diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index 3ec70bc75d..b90daa9e9d 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -16,18 +16,21 @@ public class Huffman { @Export("canvasHeight") public static int canvasHeight; @ObfuscatedName("m") - int[] field399; + @Export("masks") + int[] masks; @ObfuscatedName("f") - byte[] field400; + @Export("bits") + byte[] bits; @ObfuscatedName("q") - int[] field401; + @Export("keys") + int[] keys; public Huffman(byte[] var1) { int var2 = var1.length; - this.field399 = new int[var2]; - this.field400 = var1; + this.masks = new int[var2]; + this.bits = var1; int[] var3 = new int[33]; - this.field401 = new int[8]; + this.keys = new int[8]; int var4 = 0; for (int var5 = 0; var5 < var2; ++var5) { @@ -35,7 +38,7 @@ public class Huffman { if (var6 != 0) { int var7 = 1 << 32 - var6; int var8 = var3[var6]; - this.field399[var5] = var8; + this.masks[var5] = var8; int var9; int var10; int var11; @@ -74,29 +77,29 @@ public class Huffman { for (var11 = 0; var11 < var6; ++var11) { var12 = Integer.MIN_VALUE >>> var11; if ((var8 & var12) != 0) { - if (this.field401[var10] == 0) { - this.field401[var10] = var4; + if (this.keys[var10] == 0) { + this.keys[var10] = var4; } - var10 = this.field401[var10]; + var10 = this.keys[var10]; } else { ++var10; } - if (var10 >= this.field401.length) { - int[] var13 = new int[this.field401.length * 2]; + if (var10 >= this.keys.length) { + int[] var13 = new int[this.keys.length * 2]; - for (int var14 = 0; var14 < this.field401.length; ++var14) { - var13[var14] = this.field401[var14]; + for (int var14 = 0; var14 < this.keys.length; ++var14) { + var13[var14] = this.keys[var14]; } - this.field401 = var13; + this.keys = var13; } var12 >>>= 1; } - this.field401[var10] = ~var5; + this.keys[var10] = ~var5; if (var10 >= var4) { var4 = var10 + 1; } @@ -110,14 +113,15 @@ public class Huffman { signature = "([BII[BIB)I", garbageValue = "64" ) - public int method127(byte[] var1, int var2, int var3, byte[] var4, int var5) { + @Export("compress") + public int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { int var6 = 0; int var7 = var5 << 3; for (var3 += var2; var2 < var3; ++var2) { int var8 = var1[var2] & 255; - int var9 = this.field399[var8]; - byte var10 = this.field400[var8]; + int var9 = this.masks[var8]; + byte var10 = this.bits[var8]; if (var10 == 0) { throw new RuntimeException(""); } @@ -160,7 +164,8 @@ public class Huffman { signature = "([BI[BIII)I", garbageValue = "-2094399899" ) - public int method128(byte[] var1, int var2, byte[] var3, int var4, int var5) { + @Export("decompress") + public int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { if (var5 == 0) { return 0; } else { @@ -171,13 +176,13 @@ public class Huffman { while (true) { byte var8 = var1[var7]; if (var8 < 0) { - var6 = this.field401[var6]; + var6 = this.keys[var6]; } else { ++var6; } int var9; - if ((var9 = this.field401[var6]) < 0) { + if ((var9 = this.keys[var6]) < 0) { var3[var4++] = (byte)(~var9); if (var4 >= var5) { break; @@ -187,12 +192,12 @@ public class Huffman { } if ((var8 & 64) != 0) { - var6 = this.field401[var6]; + var6 = this.keys[var6]; } else { ++var6; } - if ((var9 = this.field401[var6]) < 0) { + if ((var9 = this.keys[var6]) < 0) { var3[var4++] = (byte)(~var9); if (var4 >= var5) { break; @@ -202,12 +207,12 @@ public class Huffman { } if ((var8 & 32) != 0) { - var6 = this.field401[var6]; + var6 = this.keys[var6]; } else { ++var6; } - if ((var9 = this.field401[var6]) < 0) { + if ((var9 = this.keys[var6]) < 0) { var3[var4++] = (byte)(~var9); if (var4 >= var5) { break; @@ -217,12 +222,12 @@ public class Huffman { } if ((var8 & 16) != 0) { - var6 = this.field401[var6]; + var6 = this.keys[var6]; } else { ++var6; } - if ((var9 = this.field401[var6]) < 0) { + if ((var9 = this.keys[var6]) < 0) { var3[var4++] = (byte)(~var9); if (var4 >= var5) { break; @@ -232,12 +237,12 @@ public class Huffman { } if ((var8 & 8) != 0) { - var6 = this.field401[var6]; + var6 = this.keys[var6]; } else { ++var6; } - if ((var9 = this.field401[var6]) < 0) { + if ((var9 = this.keys[var6]) < 0) { var3[var4++] = (byte)(~var9); if (var4 >= var5) { break; @@ -247,12 +252,12 @@ public class Huffman { } if ((var8 & 4) != 0) { - var6 = this.field401[var6]; + var6 = this.keys[var6]; } else { ++var6; } - if ((var9 = this.field401[var6]) < 0) { + if ((var9 = this.keys[var6]) < 0) { var3[var4++] = (byte)(~var9); if (var4 >= var5) { break; @@ -262,12 +267,12 @@ public class Huffman { } if ((var8 & 2) != 0) { - var6 = this.field401[var6]; + var6 = this.keys[var6]; } else { ++var6; } - if ((var9 = this.field401[var6]) < 0) { + if ((var9 = this.keys[var6]) < 0) { var3[var4++] = (byte)(~var9); if (var4 >= var5) { break; @@ -277,12 +282,12 @@ public class Huffman { } if ((var8 & 1) != 0) { - var6 = this.field401[var6]; + var6 = this.keys[var6]; } else { ++var6; } - if ((var9 = this.field401[var6]) < 0) { + if ((var9 = this.keys[var6]) < 0) { var3[var4++] = (byte)(~var9); if (var4 >= var5) { break; diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index 26455786ac..17773e38ff 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -149,15 +149,15 @@ public class Interpreter { ) public static void method1976() { try { - File var0 = new File(WorldMapSection1.userHomeDirectory, "random.dat"); + File var0 = new File(WorldMapSection2.userHomeDirectory, "random.dat"); int var1; if (var0.exists()) { class168.randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); } else { label34: for (int var2 = 0; var2 < Canvas.field94.length; ++var2) { - for (var1 = 0; var1 < WorldMapSection2.cacheDirectoryLocations.length; ++var1) { - File var3 = new File(WorldMapSection2.cacheDirectoryLocations[var1] + Canvas.field94[var2] + File.separatorChar + "random.dat"); + for (var1 = 0; var1 < WorldMapSection0.cacheDirectoryLocations.length; ++var1) { + File var3 = new File(WorldMapSection0.cacheDirectoryLocations[var1] + Canvas.field94[var2] + File.separatorChar + "random.dat"); if (var3.exists()) { class168.randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); break label34; diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index 2aac8708a3..f3c8232050 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -251,7 +251,7 @@ public class KitDefinition extends DualNode { } byte[] var3 = new byte[var2]; - var0.index += class303.huffman.method128(var0.array, var0.index, var3, 0, var2); + var0.index += class303.huffman.decompress(var0.array, var0.index, var3, 0, var2); String var4 = InterfaceParent.decodeStringCp1252(var3, 0, var2); var1 = var4; } catch (Exception var5) { diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index ef1fbe61a1..fd020ffbb4 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -205,8 +205,8 @@ public class Login { if (ReflectionCheck.clientPreferences.roofsHidden) { return SoundSystem.plane; } else { - int var0 = class32.getTileHeight(WorldMapSection1.cameraX, GrandExchangeOfferNameComparator.cameraZ, SoundSystem.plane); - return var0 - GrandExchangeEvents.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.plane][WorldMapSection1.cameraX >> 7][GrandExchangeOfferNameComparator.cameraZ >> 7] & 4) != 0 ? SoundSystem.plane : 3; + int var0 = class32.getTileHeight(WorldMapSection2.cameraX, GrandExchangeOfferNameComparator.cameraZ, SoundSystem.plane); + return var0 - GrandExchangeEvents.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.plane][WorldMapSection2.cameraX >> 7][GrandExchangeOfferNameComparator.cameraZ >> 7] & 4) != 0 ? SoundSystem.plane : 3; } } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index 95d3ad97ad..39c810feeb 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -77,7 +77,7 @@ public class LoginPacket implements ClientPacketMarker { var4 = "_wip"; } - File var5 = new File(WorldMapSection1.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); + File var5 = new File(WorldMapSection2.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); AccessFile var6; if (!var2 && var5.exists()) { try { diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 6171060b16..cd04c9ff89 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -4,11 +4,13 @@ import java.net.URL; import java.net.URLConnection; import java.util.Random; import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("bp") +@Implements("LoginScreenAnimation") public class LoginScreenAnimation { @ObfuscatedName("m") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 4712119a3f..2bd6703d40 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -82,7 +82,7 @@ public class MenuAction { Widget var12 = Huffman.getWidget(var3); if (var12 != null) { - class22.method295(var12); + WorldMapRectangle.method295(var12); } int var5; diff --git a/runescape-client/src/main/java/NPCDefinition.java b/runescape-client/src/main/java/NPCDefinition.java index 4f473abdf5..f12aa595fa 100644 --- a/runescape-client/src/main/java/NPCDefinition.java +++ b/runescape-client/src/main/java/NPCDefinition.java @@ -505,7 +505,7 @@ public class NPCDefinition extends DualNode { public final NPCDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = WorldMapSection2.getVarbit(this.transformVarbit); + var1 = WorldMapSection0.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -531,7 +531,7 @@ public class NPCDefinition extends DualNode { } else { int var1 = -1; if (this.transformVarbit != -1) { - var1 = WorldMapSection2.getVarbit(this.transformVarbit); + var1 = WorldMapSection0.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index da43e7940b..c459759de8 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -61,7 +61,7 @@ public class NetFileRequest extends DualNode { if (var7 != -1) { SequenceDefinition var6 = WorldMapAreaData.getSequenceDefinition(var7); - for (var3.modelFrameCycle += Client.field183; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class22.method295(var3)) { + for (var3.modelFrameCycle += Client.field183; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; WorldMapRectangle.method295(var3)) { var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; ++var3.modelFrame; if (var3.modelFrame >= var6.frameIds.length) { @@ -81,7 +81,7 @@ public class NetFileRequest extends DualNode { var7 *= Client.field183; var3.modelAngleX = var8 + var3.modelAngleX & 2047; var3.modelAngleY = var7 + var3.modelAngleY & 2047; - class22.method295(var3); + WorldMapRectangle.method295(var3); } } } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index 2907e27c90..867629e386 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -435,7 +435,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { var18 = var25; } else if (var2 == 2) { - var18 = WorldMapSection2.method593(var0, var1, var3, var4); + var18 = WorldMapSection0.method593(var0, var1, var3, var4); } else { var18 = ArchiveDisk.method3585(var0, var1, var2, var3, var4); } diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index 2610044c34..d0187aad78 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -826,7 +826,7 @@ public class ObjectDefinition extends DualNode { public final ObjectDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = WorldMapSection2.getVarbit(this.transformVarbit); + var1 = WorldMapSection0.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index 67ba4151a0..ea90eddf8e 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -114,7 +114,8 @@ public final class Occluder { signature = "(IB)Lia;", garbageValue = "16" ) - public static VarbitDefinition method3255(int var0) { + @Export("getVarbitDefinition") + public static VarbitDefinition getVarbitDefinition(int var0) { VarbitDefinition var1 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); if (var1 != null) { return var1; diff --git a/runescape-client/src/main/java/PendingSpawn.java b/runescape-client/src/main/java/PendingSpawn.java index c3b1a86330..5712ee43e4 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -96,7 +96,7 @@ public final class PendingSpawn extends Node { garbageValue = "1641191614" ) public static void method1695(int var0, int var1) { - VarbitDefinition var2 = Occluder.method3255(var0); + VarbitDefinition var2 = Occluder.getVarbitDefinition(var0); int var3 = var2.baseVar; int var4 = var2.startBit; int var5 = var2.endBit; diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 5f6f9ad2de..1219103c7c 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -530,7 +530,7 @@ public final class Player extends Actor { } Client.isSpellSelected = false; - class22.method295(var0); + WorldMapRectangle.method295(var0); } } diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java index 46059675b7..6b9510751b 100644 --- a/runescape-client/src/main/java/PlayerAppearance.java +++ b/runescape-client/src/main/java/PlayerAppearance.java @@ -54,7 +54,7 @@ public class PlayerAppearance { for (int var5 = 0; var5 < 7; ++var5) { for (int var6 = 0; var6 < KitDefinition.field457; ++var6) { - KitDefinition var7 = WorldMapSection1.getKitDefinition(var6); + KitDefinition var7 = WorldMapSection2.getKitDefinition(var6); if (var7 != null && !var7.nonSelectable && var5 + (var3 ? 7 : 0) == var7.bodypartID) { var1[field727[var5]] = var6 + 256; break; @@ -97,7 +97,7 @@ public class PlayerAppearance { } } - var4 = WorldMapSection1.getKitDefinition(var3); + var4 = WorldMapSection2.getKitDefinition(var3); } while(var4 == null); } while(var4.nonSelectable); } while(var1 + (this.isFemale ? 7 : 0) != var4.bodypartID); @@ -254,7 +254,7 @@ public class PlayerAppearance { int var10; for (int var11 = 0; var11 < 12; ++var11) { var10 = var7[var11]; - if (var10 >= 256 && var10 < 512 && !WorldMapSection1.getKitDefinition(var10 - 256).ready()) { + if (var10 >= 256 && var10 < 512 && !WorldMapSection2.getKitDefinition(var10 - 256).ready()) { var9 = true; } @@ -282,7 +282,7 @@ public class PlayerAppearance { var12 = var7[var13]; ModelData var14; if (var12 >= 256 && var12 < 512) { - var14 = WorldMapSection1.getKitDefinition(var12 - 256).getModelData(); + var14 = WorldMapSection2.getKitDefinition(var12 - 256).getModelData(); if (var14 != null) { var17[var10++] = var14; } @@ -346,7 +346,7 @@ public class PlayerAppearance { int var2; for (int var3 = 0; var3 < 12; ++var3) { var2 = this.equipment[var3]; - if (var2 >= 256 && var2 < 512 && !WorldMapSection1.getKitDefinition(var2 - 256).method161()) { + if (var2 >= 256 && var2 < 512 && !WorldMapSection2.getKitDefinition(var2 - 256).method161()) { var1 = true; } @@ -366,7 +366,7 @@ public class PlayerAppearance { var4 = this.equipment[var5]; ModelData var6; if (var4 >= 256 && var4 < 512) { - var6 = WorldMapSection1.getKitDefinition(var4 - 256).method162(); + var6 = WorldMapSection2.getKitDefinition(var4 - 256).method162(); if (var6 != null) { var7[var2++] = var6; } diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java index a25f8df18a..1409081934 100644 --- a/runescape-client/src/main/java/Rasterizer2D.java +++ b/runescape-client/src/main/java/Rasterizer2D.java @@ -228,19 +228,19 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("dk") @Export("Rasterizer2D_drawCircleAlpha") - public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) { - if (var4 != 0) { - if (var4 == 256) { + public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int opacity) { + if (opacity != 0) { + if (opacity == 256) { drawCircle(var0, var1, var2, var3); } else { if (var2 < 0) { var2 = -var2; } - int var5 = 256 - var4; - int var6 = (var3 >> 16 & 255) * var4; - int var7 = (var3 >> 8 & 255) * var4; - int var8 = var4 * (var3 & 255); + int var5 = 256 - opacity; + int var6 = (var3 >> 16 & 255) * opacity; + int var7 = (var3 >> 8 & 255) * opacity; + int var8 = opacity * (var3 & 255); int var9 = var1 - var2; if (var9 < Rasterizer2D_yClipStart) { var9 = Rasterizer2D_yClipStart; @@ -411,40 +411,40 @@ public class Rasterizer2D extends DualNode { } - @Export("drawGradient") + @Export("Rasterizer2D_drawGradient") @ObfuscatedName("dw") - public static void drawGradient(int var0, int var1, int var2, int var3, int var4, int var5) { - if (var2 > 0 && var3 > 0) { + public static void Rasterizer2D_drawGradient(int x, int y, int width, int height, int rgbTop, int rgbBot) { + if (width > 0 && height > 0) { int var6 = 0; - int var7 = 65536 / var3; - if (var0 < Rasterizer2D_xClipStart) { - var2 -= Rasterizer2D_xClipStart - var0; - var0 = Rasterizer2D_xClipStart; + int var7 = 65536 / height; + if (x < Rasterizer2D_xClipStart) { + width -= Rasterizer2D_xClipStart - x; + x = Rasterizer2D_xClipStart; } - if (var1 < Rasterizer2D_yClipStart) { - var6 += (Rasterizer2D_yClipStart - var1) * var7; - var3 -= Rasterizer2D_yClipStart - var1; - var1 = Rasterizer2D_yClipStart; + if (y < Rasterizer2D_yClipStart) { + var6 += (Rasterizer2D_yClipStart - y) * var7; + height -= Rasterizer2D_yClipStart - y; + y = Rasterizer2D_yClipStart; } - if (var0 + var2 > Rasterizer2D_xClipEnd) { - var2 = Rasterizer2D_xClipEnd - var0; + if (x + width > Rasterizer2D_xClipEnd) { + width = Rasterizer2D_xClipEnd - x; } - if (var3 + var1 > Rasterizer2D_yClipEnd) { - var3 = Rasterizer2D_yClipEnd - var1; + if (height + y > Rasterizer2D_yClipEnd) { + height = Rasterizer2D_yClipEnd - y; } - int var8 = Rasterizer2D_width - var2; - int var9 = var0 + Rasterizer2D_width * var1; + int var8 = Rasterizer2D_width - width; + int var9 = x + Rasterizer2D_width * y; - for (int var10 = -var3; var10 < 0; ++var10) { + for (int var10 = -height; var10 < 0; ++var10) { int var11 = 65536 - var6 >> 8; int var12 = var6 >> 8; - int var13 = (var12 * (var5 & 16711935) + var11 * (var4 & 16711935) & -16711936) + (var12 * (var5 & 65280) + var11 * (var4 & 65280) & 16711680) >>> 8; + int var13 = (var12 * (rgbBot & 16711935) + var11 * (rgbTop & 16711935) & -16711936) + (var12 * (rgbBot & 65280) + var11 * (rgbTop & 65280) & 16711680) >>> 8; - for (int var14 = -var2; var14 < 0; ++var14) { + for (int var14 = -width; var14 < 0; ++var14) { Rasterizer2D_pixels[var9++] = var13; } @@ -457,45 +457,45 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("dv") @Export("drawGradientAlpha") - public static void drawGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (var2 > 0 && var3 > 0) { + public static void drawGradientAlpha(int x, int y, int width, int height, int rgbTop, int rgbBot, int alphaTop, int alphaBot) { + if (width > 0 && height > 0) { int var8 = 0; - int var9 = 65536 / var3; - if (var0 < Rasterizer2D_xClipStart) { - var2 -= Rasterizer2D_xClipStart - var0; - var0 = Rasterizer2D_xClipStart; + int var9 = 65536 / height; + if (x < Rasterizer2D_xClipStart) { + width -= Rasterizer2D_xClipStart - x; + x = Rasterizer2D_xClipStart; } - if (var1 < Rasterizer2D_yClipStart) { - var8 += (Rasterizer2D_yClipStart - var1) * var9; - var3 -= Rasterizer2D_yClipStart - var1; - var1 = Rasterizer2D_yClipStart; + if (y < Rasterizer2D_yClipStart) { + var8 += (Rasterizer2D_yClipStart - y) * var9; + height -= Rasterizer2D_yClipStart - y; + y = Rasterizer2D_yClipStart; } - if (var0 + var2 > Rasterizer2D_xClipEnd) { - var2 = Rasterizer2D_xClipEnd - var0; + if (x + width > Rasterizer2D_xClipEnd) { + width = Rasterizer2D_xClipEnd - x; } - if (var3 + var1 > Rasterizer2D_yClipEnd) { - var3 = Rasterizer2D_yClipEnd - var1; + if (height + y > Rasterizer2D_yClipEnd) { + height = Rasterizer2D_yClipEnd - y; } - int var10 = Rasterizer2D_width - var2; - int var11 = var0 + Rasterizer2D_width * var1; + int var10 = Rasterizer2D_width - width; + int var11 = x + Rasterizer2D_width * y; - for (int var12 = -var3; var12 < 0; ++var12) { + for (int var12 = -height; var12 < 0; ++var12) { int var13 = 65536 - var8 >> 8; int var14 = var8 >> 8; - int var15 = (var13 * var6 + var14 * var7 & 65280) >>> 8; + int var15 = (var13 * alphaTop + var14 * alphaBot & 65280) >>> 8; if (var15 == 0) { var11 += Rasterizer2D_width; var8 += var9; } else { - int var16 = (var14 * (var5 & 16711935) + var13 * (var4 & 16711935) & -16711936) + (var14 * (var5 & 65280) + var13 * (var4 & 65280) & 16711680) >>> 8; + int var16 = (var14 * (rgbBot & 16711935) + var13 * (rgbTop & 16711935) & -16711936) + (var14 * (rgbBot & 65280) + var13 * (rgbTop & 65280) & 16711680) >>> 8; int var17 = 255 - var15; int var18 = ((var16 & 16711935) * var15 >> 8 & 16711935) + (var15 * (var16 & 65280) >> 8 & 65280); - for (int var19 = -var2; var19 < 0; ++var19) { + for (int var19 = -width; var19 < 0; ++var19) { int var20 = Rasterizer2D_pixels[var11]; if (var20 == 0) { Rasterizer2D_pixels[var11++] = var18; @@ -519,30 +519,30 @@ public class Rasterizer2D extends DualNode { garbageValue = "1" ) @Export("raster2d7") - public static void raster2d7(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) { - if (var0 + var2 >= 0 && var3 + var1 >= 0 && var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) { + public static void raster2d7(int x, int y, int width, int height, int var4, int var5, byte[] var6, int var7) { + if (x + width >= 0 && height + y >= 0 && x < Rasterizer2D_width && y < Rasterizer2D_height) { int var8 = 0; int var9 = 0; - if (var0 < 0) { - var8 -= var0; - var2 += var0; + if (x < 0) { + var8 -= x; + width += x; } - if (var1 < 0) { - var9 -= var1; - var3 += var1; + if (y < 0) { + var9 -= y; + height += y; } - if (var0 + var2 > Rasterizer2D_width) { - var2 = Rasterizer2D_width - var0; + if (x + width > Rasterizer2D_width) { + width = Rasterizer2D_width - x; } - if (var3 + var1 > Rasterizer2D_height) { - var3 = Rasterizer2D_height - var1; + if (height + y > Rasterizer2D_height) { + height = Rasterizer2D_height - y; } int var10 = var6.length / var7; - int var11 = Rasterizer2D_width - var2; + int var11 = Rasterizer2D_width - width; int var12 = var4 >>> 24; int var13 = var5 >>> 24; int var14; @@ -551,12 +551,12 @@ public class Rasterizer2D extends DualNode { int var17; int var18; if (var12 == 255 && var13 == 255) { - var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; + var14 = x + var8 + (var9 + y) * Rasterizer2D_width; - for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { - for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { - var17 = (var15 - var1) % var10; - var18 = (var16 - var0) % var7; + for (var15 = var9 + y; var15 < height + var9 + y; ++var15) { + for (var16 = x + var8; var16 < x + var8 + width; ++var16) { + var17 = (var15 - y) % var10; + var18 = (var16 - x) % var7; if (var6[var18 + var17 * var7] != 0) { Rasterizer2D_pixels[var14++] = var5; } else { @@ -567,12 +567,12 @@ public class Rasterizer2D extends DualNode { var14 += var11; } } else { - var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; + var14 = x + var8 + (var9 + y) * Rasterizer2D_width; - for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { - for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { - var17 = (var15 - var1) % var10; - var18 = (var16 - var0) % var7; + for (var15 = var9 + y; var15 < height + var9 + y; ++var15) { + for (var16 = x + var8; var16 < x + var8 + width; ++var16) { + var17 = (var15 - y) % var10; + var18 = (var16 - x) % var7; int var19 = var4; if (var6[var18 + var17 * var7] != 0) { var19 = var5; diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java index 5f84a7352c..2541162f80 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -1397,7 +1397,7 @@ public class Rasterizer3D extends Rasterizer2D { int[] var19 = Rasterizer3D_textureLoader.load(var18); int var20; if (var19 == null) { - var20 = Rasterizer3D_textureLoader.vmethod324(var18); + var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); method3037(var0, var1, var2, var3, var4, var5, method3040(var20, var6), method3040(var20, var7), method3040(var20, var8)); } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); @@ -2440,7 +2440,7 @@ public class Rasterizer3D extends Rasterizer2D { int[] var19 = Rasterizer3D_textureLoader.load(var18); int var20; if (var19 == null) { - var20 = Rasterizer3D_textureLoader.vmethod324(var18); + var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); method3037(var0, var1, var2, var3, var4, var5, method3040(var20, var6), method3040(var20, var7), method3040(var20, var8)); } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index eee9d2ab63..040ead2a47 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -1,9 +1,11 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("fe") +@Implements("RouteStrategy") public abstract class RouteStrategy { @ObfuscatedName("l") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index e07ebe99e3..10abbdb8a5 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -1848,7 +1848,7 @@ public class Scene { Rasterizer3D.method3012(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); } } else { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var1.texture); + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); Rasterizer3D.method3037(var27, var29, var25, var26, var28, var24, method3108(var30, var1.neColor), method3108(var30, var1.nwColor), method3108(var30, var1.seColor)); } } @@ -1871,7 +1871,7 @@ public class Scene { } else if (!Scene_isLowDetail) { Rasterizer3D.method3012(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); } else { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var1.texture); + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); Rasterizer3D.method3037(var23, var25, var29, var22, var24, var28, method3108(var30, var1.swColor), method3108(var30, var1.seColor), method3108(var30, var1.nwColor)); } } @@ -1950,7 +1950,7 @@ public class Scene { Rasterizer3D.method3012(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field902[var10], TileModel.field902[var11], TileModel.field902[var12], TileModel.field903[var10], TileModel.field903[var11], TileModel.field903[var12], TileModel.field904[var10], TileModel.field904[var11], TileModel.field904[var12], var1.triangleTextureId[var9]); } } else { - int var19 = Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var1.triangleTextureId[var9]); + int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); Rasterizer3D.method3037(var16, var17, var18, var13, var14, var15, method3108(var19, var1.triangleColorA[var9]), method3108(var19, var1.triangleColorB[var9]), method3108(var19, var1.triangleColorC[var9])); } } else if (var1.triangleColorA[var9] != 12345678) { diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 6e2d40c75f..0753934907 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -196,7 +196,7 @@ public class ScriptEvent extends Node { return 1; } else if (var0 == ScriptOpcodes.INV_SIZE) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapDecorationType.method4523(var3).size; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapDecorationType.getInvDefinition(var3).size; return 1; } else if (var0 == ScriptOpcodes.STAT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 22a36b63d4..4a855b6eb9 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -59,9 +59,9 @@ public class SecureRandomCallable implements Callable { Client.interfaceParents.put(var3, (long)var0); DevicePcmPlayerProvider.method845(var1); Widget var4 = Huffman.getWidget(var0); - class22.method295(var4); + WorldMapRectangle.method295(var4); if (Client.field127 != null) { - class22.method295(Client.field127); + WorldMapRectangle.method295(Client.field127); Client.field127 = null; } @@ -133,7 +133,7 @@ public class SecureRandomCallable implements Callable { class214.menuWidth = var7; AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22; class39.revalidateWidgetScroll(Widget.interfaceComponents[var0 >> 16], var4, false); - WorldMapSection3.runWidgetOnLoadListener(var1); + WorldMapSection1.runWidgetOnLoadListener(var1); if (Client.rootInterface != -1) { GrandExchangeEvents.method74(Client.rootInterface, 1); } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index 29276a314d..cbac1dcd68 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -49,7 +49,8 @@ public class SoundEffect { } @ObfuscatedName("q") - public final int method303() { + @Export("calculateDelay") + public final int calculateDelay() { int var1 = 9999999; int var2; diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index 7fcc7dcf5e..a9578d1220 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -134,40 +134,40 @@ public class StructDefinition extends DualNode { var4.scrollY = 0; } - class22.method295(var4); + WorldMapRectangle.method295(var4); return 1; } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { var4.color = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var4); + WorldMapRectangle.method295(var4); return 1; } else if (var0 == ScriptOpcodes.CC_SETFILL) { var4.fill = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - class22.method295(var4); + WorldMapRectangle.method295(var4); return 1; } else if (var0 == ScriptOpcodes.CC_SETTRANS) { var4.transparency = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var4); + WorldMapRectangle.method295(var4); return 1; } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { var4.lineWid = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var4); + WorldMapRectangle.method295(var4); return 1; } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { var4.spriteId2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var4); + WorldMapRectangle.method295(var4); return 1; } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { var4.spriteAngle = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var4); + WorldMapRectangle.method295(var4); return 1; } else if (var0 == ScriptOpcodes.CC_SETTILING) { var4.spriteTiling = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - class22.method295(var4); + WorldMapRectangle.method295(var4); return 1; } else if (var0 == ScriptOpcodes.CC_SETMODEL) { var4.modelType = 1; var4.modelId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var4); + WorldMapRectangle.method295(var4); return 1; } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { RouteStrategy.Interpreter_intStackSize -= 6; @@ -177,7 +177,7 @@ public class StructDefinition extends DualNode { var4.modelAngleY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3]; var4.modelAngleZ = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 4]; var4.modelZoom = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 5]; - class22.method295(var4); + WorldMapRectangle.method295(var4); return 1; } else { int var5; @@ -187,58 +187,58 @@ public class StructDefinition extends DualNode { var4.sequenceId = var5; var4.modelFrame = 0; var4.modelFrameCycle = 0; - class22.method295(var4); + WorldMapRectangle.method295(var4); } return 1; } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { var4.modelOrthog = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - class22.method295(var4); + WorldMapRectangle.method295(var4); return 1; } else if (var0 == ScriptOpcodes.CC_SETTEXT) { String var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; if (!var8.equals(var4.text)) { var4.text = var8; - class22.method295(var4); + WorldMapRectangle.method295(var4); } return 1; } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { var4.fontId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var4); + WorldMapRectangle.method295(var4); return 1; } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { RouteStrategy.Interpreter_intStackSize -= 3; var4.textXAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4.textYAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; var4.textLineHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; - class22.method295(var4); + WorldMapRectangle.method295(var4); return 1; } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { var4.textShadowed = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - class22.method295(var4); + WorldMapRectangle.method295(var4); return 1; } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { var4.outline = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var4); + WorldMapRectangle.method295(var4); return 1; } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { var4.spriteShadow = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var4); + WorldMapRectangle.method295(var4); return 1; } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { var4.spriteFlipV = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - class22.method295(var4); + WorldMapRectangle.method295(var4); return 1; } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { var4.spriteFlipH = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - class22.method295(var4); + WorldMapRectangle.method295(var4); return 1; } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { RouteStrategy.Interpreter_intStackSize -= 2; var4.scrollWidth = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; var4.scrollHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; - class22.method295(var4); + WorldMapRectangle.method295(var4); if (var3 != -1 && var4.type == 0) { class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false); } @@ -247,26 +247,26 @@ public class StructDefinition extends DualNode { } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { TilePaint.method3060(var4.id, var4.childIndex); Client.field127 = var4; - class22.method295(var4); + WorldMapRectangle.method295(var4); return 1; } else if (var0 == 1122) { var4.spriteId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var4); + WorldMapRectangle.method295(var4); return 1; } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { var4.color2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var4); + WorldMapRectangle.method295(var4); return 1; } else if (var0 == 1124) { var4.field960 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - class22.method295(var4); + WorldMapRectangle.method295(var4); return 1; } else if (var0 == 1125) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; RectangleMode var7 = (RectangleMode)ScriptFrame.findEnumerated(DefaultsGroup.method5822(), var5); if (var7 != null) { var4.rectangleMode = var7; - class22.method295(var4); + WorldMapRectangle.method295(var4); } return 1; diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index 99c20b1185..6d1f37c646 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -10,8 +10,8 @@ public class Texture extends Node { @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; @ObfuscatedName("o") - @Export("int1") - int int1; + @Export("averageRGB") + int averageRGB; @ObfuscatedName("u") boolean field893; @ObfuscatedName("g") @@ -41,7 +41,7 @@ public class Texture extends Node { ) Texture(Buffer var1) { this.isLoaded = false; - this.int1 = var1.readUnsignedShort(); + this.averageRGB = var1.readUnsignedShort(); this.field893 = var1.readUnsignedByte() == 1; int var2 = var1.readUnsignedByte(); if (var2 >= 1 && var2 <= 4) { diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java index ef97959b05..a6d1e7110f 100644 --- a/runescape-client/src/main/java/TextureLoader.java +++ b/runescape-client/src/main/java/TextureLoader.java @@ -19,7 +19,8 @@ public interface TextureLoader { signature = "(II)I", garbageValue = "-1641984961" ) - int vmethod324(int var1); + @Export("getAverageTextureRGB") + int getAverageTextureRGB(int var1); @ObfuscatedName("o") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java index c40719ff15..54c69195ff 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -155,8 +155,9 @@ public class TextureProvider implements TextureLoader { signature = "(II)I", garbageValue = "-1641984961" ) - public int vmethod324(int var1) { - return this.textures[var1] != null ? this.textures[var1].int1 : 0; + @Export("getAverageTextureRGB") + public int getAverageTextureRGB(int var1) { + return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; } @ObfuscatedName("o") @@ -221,7 +222,7 @@ public class TextureProvider implements TextureLoader { int var2 = var0.index; byte[] var3 = class230.method4516(var1); var0.writeSmartByteShort(var3.length); - var0.index += class303.huffman.method127(var3, 0, var3.length, var0.array, var0.index); + var0.index += class303.huffman.compress(var3, 0, var3.length, var0.array, var0.index); return var0.index - var2; } diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index 63b67c7ca4..f87a66a02a 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -82,7 +82,7 @@ public class UserComparator4 implements Comparator { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if (var3 == 1 || var3 == 2) { ReflectionCheck.clientPreferences.windowMode = var3; - WorldMapSection0.savePreferences(); + WorldMapSection3.savePreferences(); } return 1; diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index 6a64bd9e0d..8081a699f5 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -145,7 +145,7 @@ public class Varcs { ) @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { - return LoginPacket.getPreferencesFile("2", class22.studioGame.name, var1); + return LoginPacket.getPreferencesFile("2", WorldMapRectangle.studioGame.name, var1); } @ObfuscatedName("e") @@ -365,7 +365,7 @@ public class Varcs { garbageValue = "321265868" ) public static void method2160(AbstractArchive var0) { - FloorOverlayDefinition.field663 = var0; + FloorOverlayDefinition.FloorOverlayDefinition_archive = var0; } @ObfuscatedName("q") diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index 213155cbe1..66ffc6364d 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -61,8 +61,8 @@ public class VertexNormal { ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; } else if (RouteStrategy.field760 != null) { for (int var1 = 0; var1 < ByteArrayPool.field55.length; ++var1) { - if (var0.length == ByteArrayPool.field55[var1] && WorldMapSection2.field1082[var1] < RouteStrategy.field760[var1].length) { - RouteStrategy.field760[var1][WorldMapSection2.field1082[var1]++] = var0; + if (var0.length == ByteArrayPool.field55[var1] && WorldMapSection0.field1082[var1] < RouteStrategy.field760[var1].length) { + RouteStrategy.field760[var1][WorldMapSection0.field1082[var1]++] = var0; return; } } diff --git a/runescape-client/src/main/java/class249.java b/runescape-client/src/main/java/VerticalAlignment.java similarity index 78% rename from runescape-client/src/main/java/class249.java rename to runescape-client/src/main/java/VerticalAlignment.java index dc09ff3081..c562dc666b 100644 --- a/runescape-client/src/main/java/class249.java +++ b/runescape-client/src/main/java/VerticalAlignment.java @@ -1,10 +1,12 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ip") -public enum class249 implements Enumerated { +@Implements("VerticalAlignment") +public enum VerticalAlignment implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lip;" @@ -25,7 +27,8 @@ public enum class249 implements Enumerated { @ObfuscatedGetter( intValue = 2070321655 ) - public final int field3275; + @Export("value") + public final int value; @ObfuscatedName("o") @ObfuscatedGetter( intValue = 1686539261 @@ -33,8 +36,8 @@ public enum class249 implements Enumerated { @Export("id") final int id; - private class249(int var3, int var4) { - this.field3275 = var3; + private VerticalAlignment(int var3, int var4) { + this.value = var3; this.id = var4; } diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index a7c2416d34..03d369df0a 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -126,21 +126,21 @@ public class WorldMapArea { @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { int var2 = var1.readUnsignedByte(); - WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.field1101, WorldMapSectionType.field1103, WorldMapSectionType.field1100, WorldMapSectionType.field1102}; + WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE1, WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE2}; WorldMapSectionType var4 = (WorldMapSectionType)ScriptFrame.findEnumerated(var3, var2); Object var5 = null; switch(var4.type) { case 0: - var5 = new WorldMapSection2(); + var5 = new WorldMapSection0(); break; case 1: - var5 = new WorldMapSection3(); - break; - case 2: var5 = new WorldMapSection1(); break; + case 2: + var5 = new WorldMapSection2(); + break; case 3: - var5 = new WorldMapSection0(); + var5 = new WorldMapSection3(); break; default: throw new IllegalStateException(""); diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 4c259a1f69..2f31fc3b62 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -207,14 +207,14 @@ public class WorldMapAreaData extends WorldMapArea { --RouteStrategy.Interpreter_intStackSize; var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] - 1; if (var5 >= 0 && var5 <= 9) { - WorldMapSection3.method345(var4, var5); + WorldMapSection1.method345(var4, var5); return 1; } else { throw new RuntimeException(); } } else if (var0 == 1355) { var11 = 10; - WorldMapSection3.method345(var4, var11); + WorldMapSection1.method345(var4, var11); return 1; } else { return 2; diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index e01228c344..59043310c4 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -61,7 +61,7 @@ public class WorldMapCacheName { public static void method633(int[] var0, int[] var1) { if (var0 != null && var1 != null) { ByteArrayPool.field55 = var0; - WorldMapSection2.field1082 = new int[var0.length]; + WorldMapSection0.field1082 = new int[var0.length]; RouteStrategy.field760 = new byte[var0.length][][]; for (int var2 = 0; var2 < ByteArrayPool.field55.length; ++var2) { @@ -69,7 +69,7 @@ public class WorldMapCacheName { } } else { ByteArrayPool.field55 = null; - WorldMapSection2.field1082 = null; + WorldMapSection0.field1082 = null; RouteStrategy.field760 = ((byte[][][])null); } diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index ba3cfb9896..c599c7972a 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -104,6 +104,6 @@ public class WorldMapDecoration { ServerBuild.field788 = var0; Client.field220 = var1; FloorDecoration.selectedSpellFlags = var2; - class22.method295(var4); + WorldMapRectangle.method295(var4); } } diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index fbe474bd51..88b0771864 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -160,12 +160,13 @@ public enum WorldMapDecorationType implements Enumerated { signature = "(IB)Lib;", garbageValue = "1" ) - public static InvDefinition method4523(int var0) { + @Export("getInvDefinition") + public static InvDefinition getInvDefinition(int var0) { InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); if (var1 != null) { return var1; } else { - byte[] var2 = class4.field1158.takeFile(5, var0); + byte[] var2 = class4.InvDefinition_archive.takeFile(5, var0); var1 = new InvDefinition(); if (var2 != null) { var1.decode(new Buffer(var2)); diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index fa307bd627..f4a1c44e73 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -23,8 +23,8 @@ public class WorldMapElement extends DualNode { @ObfuscatedSignature( signature = "Lkz;" ) - @Export("fonts") - static Fonts fonts; + @Export("WorldMapElement_fonts") + static Fonts WorldMapElement_fonts; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -1579051565 @@ -43,7 +43,8 @@ public class WorldMapElement extends DualNode { @Export("sprite2") int sprite2; @ObfuscatedName("l") - public String field1021; + @Export("name") + public String name; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -231067 @@ -87,12 +88,14 @@ public class WorldMapElement extends DualNode { @ObfuscatedSignature( signature = "Lju;" ) - public class266 field3287; + @Export("horizontalAlignment") + public HorizontalAlignment horizontalAlignment; @ObfuscatedName("y") @ObfuscatedSignature( signature = "Lip;" ) - public class249 field3301; + @Export("verticalAlignment") + public VerticalAlignment verticalAlignment; @ObfuscatedName("h") int[] field1028; @ObfuscatedName("b") @@ -113,8 +116,8 @@ public class WorldMapElement extends DualNode { this.field1025 = Integer.MAX_VALUE; this.field1026 = Integer.MIN_VALUE; this.field1027 = Integer.MIN_VALUE; - this.field3287 = class266.field3527; - this.field3301 = class249.field3273; + this.horizontalAlignment = HorizontalAlignment.field3527; + this.verticalAlignment = VerticalAlignment.field3273; this.category = -1; this.field1020 = var1; } @@ -148,7 +151,7 @@ public class WorldMapElement extends DualNode { } else if (opcode == 2) { this.sprite2 = buffer.method51(); } else if (opcode == 3) { - this.field1021 = buffer.readStringCp1252NullTerminated(); + this.name = buffer.readStringCp1252NullTerminated(); } else if (opcode == 4) { this.field1022 = buffer.readMedium(); } else if (opcode == 5) { @@ -214,10 +217,10 @@ public class WorldMapElement extends DualNode { } else if (opcode == 28) { buffer.readUnsignedByte(); } else if (opcode == 29) { - class266[] var6 = new class266[]{class266.field3527, class266.field3526, class266.field3529}; - this.field3287 = (class266)ScriptFrame.findEnumerated(var6, buffer.readUnsignedByte()); + HorizontalAlignment[] var6 = new HorizontalAlignment[]{HorizontalAlignment.field3527, HorizontalAlignment.field3526, HorizontalAlignment.field3529}; + this.horizontalAlignment = (HorizontalAlignment)ScriptFrame.findEnumerated(var6, buffer.readUnsignedByte()); } else if (opcode == 30) { - this.field3301 = (class249)ScriptFrame.findEnumerated(FloorUnderlayDefinition.method4839(), buffer.readUnsignedByte()); + this.verticalAlignment = (VerticalAlignment)ScriptFrame.findEnumerated(FloorUnderlayDefinition.method4839(), buffer.readUnsignedByte()); } } } diff --git a/runescape-client/src/main/java/WorldMapIcon1.java b/runescape-client/src/main/java/WorldMapIcon1.java index 002ffe1a56..a8151352b2 100644 --- a/runescape-client/src/main/java/WorldMapIcon1.java +++ b/runescape-client/src/main/java/WorldMapIcon1.java @@ -136,7 +136,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { } int[] var4 = Client.queuedSoundEffectDelays; - var4[var0] += var11.method303(); + var4[var0] += var11.calculateDelay(); Client.soundEffects[var0] = var11; } diff --git a/runescape-client/src/main/java/WorldMapIcon2.java b/runescape-client/src/main/java/WorldMapIcon2.java index 7138ead64f..e29e9aca9a 100644 --- a/runescape-client/src/main/java/WorldMapIcon2.java +++ b/runescape-client/src/main/java/WorldMapIcon2.java @@ -97,7 +97,7 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { ) void method399() { this.element = class50.getObjectDefinition(this.field1034).transform().mapIconId; - this.label = this.field1035.method420(ViewportMouse.getWorldMapElement(this.element)); + this.label = this.field1035.createMapLabel(ViewportMouse.getWorldMapElement(this.element)); WorldMapElement var1 = ViewportMouse.getWorldMapElement(this.getElement()); Sprite var2 = var1.getSprite(false); if (var2 != null) { diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index 1d30cddb90..801b7a91f9 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -239,7 +239,7 @@ public class WorldMapLabel { static final void worldToScreen(int var0, int var1, int var2) { if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { int var3 = class32.getTileHeight(var0, var1, SoundSystem.plane) - var2; - var0 -= WorldMapSection1.cameraX; + var0 -= WorldMapSection2.cameraX; var3 -= GrandExchangeEvents.cameraY; var1 -= GrandExchangeOfferNameComparator.cameraZ; int var4 = Rasterizer3D.Rasterizer3D_sine[WorldMapIcon1.cameraPitch]; diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index 05ebdd1621..a558fcd511 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -77,7 +77,8 @@ public class WorldMapLabelSize { signature = "(I)[Ls;", garbageValue = "1579674051" ) - static WorldMapLabelSize[] method192() { + @Export("values") + static WorldMapLabelSize[] values() { return new WorldMapLabelSize[]{WorldMapLabelSize_small, WorldMapLabelSize_medium, WorldMapLabelSize_large}; } @@ -86,8 +87,9 @@ public class WorldMapLabelSize { signature = "(IB)Ls;", garbageValue = "-67" ) - static WorldMapLabelSize method195(int var0) { - WorldMapLabelSize[] var1 = method192(); + @Export("valueOf") + static WorldMapLabelSize valueOf(int var0) { + WorldMapLabelSize[] var1 = values(); for (int var2 = 0; var2 < var1.length; ++var2) { WorldMapLabelSize var3 = var1[var2]; @@ -115,7 +117,7 @@ public class WorldMapLabelSize { } if (Client.field127 != null) { - class22.method295(Client.field127); + WorldMapRectangle.method295(Client.field127); Client.field127 = null; } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 3c3c0f055c..2b669590f6 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -198,7 +198,7 @@ public final class WorldMapManager { int var11 = Rasterizer2D.Rasterizer2D_height; int[] var12 = new int[4]; Rasterizer2D.Rasterizer2D_getClipArray(var12); - class22 var13 = this.method643(var1, var2, var3, var4); + WorldMapRectangle var13 = this.method643(var1, var2, var3, var4); float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); int var15 = (int)Math.ceil((double)var14); this.field1050 = var15; @@ -208,13 +208,13 @@ public final class WorldMapManager { this.field1045.put(var15, var16); } - int var23 = var13.field166 + var13.field169 - 1; - int var17 = var13.field167 + var13.field164 - 1; + int var23 = var13.worldMapRegionX + var13.worldMapRegionWidth - 1; + int var17 = var13.worldMapRegionY + var13.worldMapRegionHeight - 1; int var18; int var19; - for (var18 = var13.field166; var18 <= var23; ++var18) { - for (var19 = var13.field167; var19 <= var17; ++var19) { + for (var18 = var13.worldMapRegionX; var18 <= var23; ++var18) { + for (var19 = var13.worldMapRegionY; var19 <= var17; ++var19) { this.regions[var18][var19].method455(var15, (class40)this.field1045.get(var15), this.mapSceneSprites, this.field1046, this.field1047); } } @@ -225,8 +225,8 @@ public final class WorldMapManager { var19 = this.surfaceOffsetX + var1; int var20 = var2 + this.surfaceOffsetY; - for (int var21 = var13.field166; var21 < var13.field166 + var13.field169; ++var21) { - for (int var22 = var13.field167; var22 < var13.field167 + var13.field164; ++var22) { + for (int var21 = var13.worldMapRegionX; var21 < var13.worldMapRegionX + var13.worldMapRegionWidth; ++var21) { + for (int var22 = var13.worldMapRegionY; var22 < var13.worldMapRegionY + var13.worldMapRegionHeight; ++var22) { this.regions[var21][var22].method404(var5 + var18 * (this.regions[var21][var22].x * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].y * 64 - var20 + 64) / 64, var18); } } @@ -239,7 +239,7 @@ public final class WorldMapManager { garbageValue = "-71" ) public final void method402(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) { - class22 var14 = this.method643(var1, var2, var3, var4); + WorldMapRectangle var14 = this.method643(var1, var2, var3, var4); float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); int var16 = (int)(var15 * 64.0F); int var17 = this.surfaceOffsetX + var1; @@ -247,8 +247,8 @@ public final class WorldMapManager { int var19; int var20; - for (var19 = var14.field166; var19 < var14.field169 + var14.field166; ++var19) { - for (var20 = var14.field167; var20 < var14.field164 + var14.field167; ++var20) { + for (var19 = var14.worldMapRegionX; var19 < var14.worldMapRegionWidth + var14.worldMapRegionX; ++var19) { + for (var20 = var14.worldMapRegionY; var20 < var14.worldMapRegionHeight + var14.worldMapRegionY; ++var20) { if (var13) { this.regions[var19][var20].method406(); } @@ -258,8 +258,8 @@ public final class WorldMapManager { } if (var10 != null && var11 > 0) { - for (var19 = var14.field166; var19 < var14.field169 + var14.field166; ++var19) { - for (var20 = var14.field167; var20 < var14.field167 + var14.field164; ++var20) { + for (var19 = var14.worldMapRegionX; var19 < var14.worldMapRegionWidth + var14.worldMapRegionX; ++var19) { + for (var20 = var14.worldMapRegionY; var20 < var14.worldMapRegionY + var14.worldMapRegionHeight; ++var20) { this.regions[var19][var20].method411(var10, var11, var12); } } @@ -318,14 +318,14 @@ public final class WorldMapManager { if (!this.isLoaded0) { return var11; } else { - class22 var12 = this.method643(var1, var2, var3, var4); + WorldMapRectangle var12 = this.method643(var1, var2, var3, var4); float var13 = this.getPixelsPerTile(var7, var3 - var1); int var14 = (int)(var13 * 64.0F); int var15 = this.surfaceOffsetX + var1; int var16 = var2 + this.surfaceOffsetY; - for (int var17 = var12.field166; var17 < var12.field166 + var12.field169; ++var17) { - for (int var18 = var12.field167; var18 < var12.field164 + var12.field167; ++var18) { + for (int var17 = var12.worldMapRegionX; var17 < var12.worldMapRegionX + var12.worldMapRegionWidth; ++var17) { + for (int var18 = var12.worldMapRegionY; var18 < var12.worldMapRegionHeight + var12.worldMapRegionY; ++var18) { List var19 = this.regions[var17][var18].method421(var5 + var14 * (this.regions[var17][var18].x * 64 - var15) / 64, var8 + var6 - var14 * (this.regions[var17][var18].y * 64 - var16 + 64) / 64, var14, var9, var10); if (!var19.isEmpty()) { var11.addAll(var19); @@ -342,8 +342,8 @@ public final class WorldMapManager { signature = "(IIIII)Lc;", garbageValue = "-1455088394" ) - class22 method643(int var1, int var2, int var3, int var4) { - class22 var5 = new class22(this); + WorldMapRectangle method643(int var1, int var2, int var3, int var4) { + WorldMapRectangle var5 = new WorldMapRectangle(this); int var6 = this.surfaceOffsetX + var1; int var7 = var2 + this.surfaceOffsetY; int var8 = var3 + this.surfaceOffsetX; @@ -352,30 +352,30 @@ public final class WorldMapManager { int var11 = var7 / 64; int var12 = var8 / 64; int var13 = var9 / 64; - var5.field169 = var12 - var10 + 1; - var5.field164 = var13 - var11 + 1; - var5.field166 = var10 - this.mapAreaData.minX(); - var5.field167 = var11 - this.mapAreaData.minY(); - if (var5.field166 < 0) { - var5.field169 += var5.field166; - var5.field166 = 0; + var5.worldMapRegionWidth = var12 - var10 + 1; + var5.worldMapRegionHeight = var13 - var11 + 1; + var5.worldMapRegionX = var10 - this.mapAreaData.minX(); + var5.worldMapRegionY = var11 - this.mapAreaData.minY(); + if (var5.worldMapRegionX < 0) { + var5.worldMapRegionWidth += var5.worldMapRegionX; + var5.worldMapRegionX = 0; } - if (var5.field166 > this.regions.length - var5.field169) { - var5.field169 = this.regions.length - var5.field166; + if (var5.worldMapRegionX > this.regions.length - var5.worldMapRegionWidth) { + var5.worldMapRegionWidth = this.regions.length - var5.worldMapRegionX; } - if (var5.field167 < 0) { - var5.field164 += var5.field167; - var5.field167 = 0; + if (var5.worldMapRegionY < 0) { + var5.worldMapRegionHeight += var5.worldMapRegionY; + var5.worldMapRegionY = 0; } - if (var5.field167 > this.regions[0].length - var5.field164) { - var5.field164 = this.regions[0].length - var5.field167; + if (var5.worldMapRegionY > this.regions[0].length - var5.worldMapRegionHeight) { + var5.worldMapRegionHeight = this.regions[0].length - var5.worldMapRegionY; } - var5.field169 = Math.min(var5.field169, this.regions.length); - var5.field164 = Math.min(var5.field164, this.regions[0].length); + var5.worldMapRegionWidth = Math.min(var5.worldMapRegionWidth, this.regions.length); + var5.worldMapRegionHeight = Math.min(var5.worldMapRegionHeight, this.regions[0].length); return var5; } diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/WorldMapRectangle.java similarity index 88% rename from runescape-client/src/main/java/class22.java rename to runescape-client/src/main/java/WorldMapRectangle.java index 59bb98f81f..a75566568a 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -1,10 +1,13 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("c") -public final class class22 { +@Implements("WorldMapRectangle") +public final class WorldMapRectangle +{ @ObfuscatedName("z") @ObfuscatedSignature( signature = "Lgr;" @@ -27,22 +30,26 @@ public final class class22 { @ObfuscatedGetter( intValue = 1976624405 ) - int field169; + @Export("worldMapRegionWidth") + int worldMapRegionWidth; @ObfuscatedName("f") @ObfuscatedGetter( intValue = -698663527 ) - int field164; + @Export("worldMapRegionHeight") + int worldMapRegionHeight; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 1588021801 ) - int field166; + @Export("worldMapRegionX") + int worldMapRegionX; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 2138505015 ) - int field167; + @Export("worldMapRegionY") + int worldMapRegionY; @ObfuscatedSignature( signature = "Lal;" ) @@ -51,7 +58,7 @@ public final class class22 { @ObfuscatedSignature( signature = "(Lal;)V" ) - class22(WorldMapManager var1) { + WorldMapRectangle(WorldMapManager var1) { this.this$0 = var1; } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index dbc5e24dfa..ba6726efa0 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -46,7 +46,8 @@ public class WorldMapRegion { @ObfuscatedGetter( intValue = 415972873 ) - int field1054; + @Export("pixelsPerTile") + int pixelsPerTile; @ObfuscatedName("k") @Export("iconsList") List iconsList; @@ -73,9 +74,9 @@ public class WorldMapRegion { garbageValue = "-87" ) void method404(int var1, int var2, int var3) { - Sprite var4 = class13.method164(this.x, this.y, this.field1054); + Sprite var4 = class13.method164(this.x, this.y, this.pixelsPerTile); if (var4 != null) { - if (var3 == this.field1054 * 64) { + if (var3 == this.pixelsPerTile * 64) { var4.drawAt(var1, var2); } else { var4.method319(var1, var2, var3, var3); @@ -126,7 +127,7 @@ public class WorldMapRegion { label66: for (int var7 = var2; var7 < var2 + var4; ++var7) { for (int var8 = 0; var8 < var5.field156; ++var8) { - WorldMapDecoration[] var9 = var5.field144[var8][var6][var7]; + WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; if (var9 != null && var9.length != 0) { WorldMapDecoration[] var10 = var9; @@ -187,7 +188,7 @@ public class WorldMapRegion { var10 = new WorldMapIcon2(var7, var6, var1.id, this); } else { WorldMapElement var9 = ViewportMouse.getWorldMapElement(var1.mapIconId); - var10 = new WorldMapIcon1(var7, var6, var9.field1020, this.method420(var9)); + var10 = new WorldMapIcon1(var7, var6, var9.field1020, this.createMapLabel(var9)); } this.iconsMap.put(new Coord(0, var3, var4), var10); @@ -290,7 +291,7 @@ public class WorldMapRegion { garbageValue = "518389076" ) void method455(int var1, class40 var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { - this.field1054 = var1; + this.pixelsPerTile = var1; if ((this.field239 != null || !this.field1052.isEmpty()) && class13.method164(this.x, this.y, var1) == null) { boolean var6 = true; var6 &= this.method409(var4); @@ -305,7 +306,7 @@ public class WorldMapRegion { if (var6) { byte[] var8 = var5.takeFileFlat(var7); class27 var9 = SecureRandomCallable.method1145(var8); - Sprite var10 = new Sprite(this.field1054 * 64, this.field1054 * 64); + Sprite var10 = new Sprite(this.pixelsPerTile * 64, this.pixelsPerTile * 64); var10.setRaster(); if (this.field239 != null) { this.method546(var2, var3, var9); @@ -315,7 +316,7 @@ public class WorldMapRegion { int var11 = this.x; int var12 = this.y; - int var13 = this.field1054; + int var13 = this.pixelsPerTile; field1051.put(var10, MouseHandler.method1083(var11, var12, var13), var10.pixels.length * 4); this.method408(); } @@ -333,8 +334,8 @@ public class WorldMapRegion { var4 = new HashSet(); } - this.method412(var1, var2, var4, var3); - this.method418(var1, var2, var4, var3); + this.drawNonLinkMapIcons(var1, var2, var4, var3); + this.drawMapLinks(var1, var2, var4, var3); } @ObfuscatedName("s") @@ -351,7 +352,7 @@ public class WorldMapRegion { int var6 = var5.getElement(); if (var1.contains(var6)) { WorldMapElement var7 = ViewportMouse.getWorldMapElement(var6); - this.method414(var7, var5.field5, var5.field6, var2, var3); + this.method414(var7, var5.screenX, var5.screenY, var2, var3); } } } @@ -437,26 +438,26 @@ public class WorldMapRegion { int var6 = var3.field151[0][var1][var2] - 1; int var7 = var3.field145[0][var1][var2] - 1; if (var6 == -1 && var7 == -1) { - Rasterizer2D.Rasterizer2D_fillRectangle(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, this.field1054, this.field1053); + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.field1053); } int var8 = 16711935; int var9; if (var7 != -1) { int var10 = this.field1053; - FloorOverlayDefinition var11 = (FloorOverlayDefinition)FloorOverlayDefinition.field664.get((long)var7); + FloorOverlayDefinition var11 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var7); FloorOverlayDefinition var12; if (var11 != null) { var12 = var11; } else { - byte[] var13 = FloorOverlayDefinition.field663.takeFile(4, var7); + byte[] var13 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var7); var11 = new FloorOverlayDefinition(); if (var13 != null) { var11.decode(new Buffer(var13), var7); } var11.postDecode(); - FloorOverlayDefinition.field664.put(var11, (long)var7); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var11, (long)var7); var12 = var11; } @@ -467,7 +468,7 @@ public class WorldMapRegion { } else { int var20; if (var12.texture >= 0) { - var20 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var12.texture), 96); + var20 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var12.texture), 96); var9 = Rasterizer3D.Rasterizer3D_colorPalette[var20] | -16777216; } else if (var12.rgb == 16711935) { var9 = var10; @@ -527,13 +528,13 @@ public class WorldMapRegion { } if (var7 > -1 && var3.field154[0][var1][var2] == 0) { - Rasterizer2D.Rasterizer2D_fillRectangle(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, this.field1054, var8); + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); } else { var9 = this.method541(var1, var2, var3, var5); if (var7 == -1) { - Rasterizer2D.Rasterizer2D_fillRectangle(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, this.field1054, var9); + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); } else { - var4.method743(this.field1054 * var1, this.field1054 * (63 - var2), var9, var8, this.field1054, this.field1054, var3.field154[0][var1][var2], var3.field155[0][var1][var2]); + var4.method743(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field154[0][var1][var2], var3.field155[0][var1][var2]); } } @@ -549,19 +550,19 @@ public class WorldMapRegion { int var6 = var3.field145[var5][var1][var2] - 1; if (var6 > -1) { int var7 = this.field1053; - FloorOverlayDefinition var8 = (FloorOverlayDefinition)FloorOverlayDefinition.field664.get((long)var6); + FloorOverlayDefinition var8 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var6); FloorOverlayDefinition var9; if (var8 != null) { var9 = var8; } else { - byte[] var10 = FloorOverlayDefinition.field663.takeFile(4, var6); + byte[] var10 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var6); var8 = new FloorOverlayDefinition(); if (var10 != null) { var8.decode(new Buffer(var10), var6); } var8.postDecode(); - FloorOverlayDefinition.field664.put(var8, (long)var6); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var8, (long)var6); var9 = var8; } @@ -573,7 +574,7 @@ public class WorldMapRegion { } else { int var11; if (var9.texture >= 0) { - var11 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var9.texture), 96); + var11 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture), 96); var18 = Rasterizer3D.Rasterizer3D_colorPalette[var11] | -16777216; } else if (var9.rgb == 16711935) { var18 = var7; @@ -630,9 +631,9 @@ public class WorldMapRegion { } if (var3.field154[var5][var1][var2] == 0) { - Rasterizer2D.Rasterizer2D_fillRectangle(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, this.field1054, var18); + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var18); } else { - var4.method743(this.field1054 * var1, this.field1054 * (63 - var2), 0, var18, this.field1054, this.field1054, var3.field154[var5][var1][var2], var3.field155[var5][var1][var2]); + var4.method743(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var18, this.pixelsPerTile, this.pixelsPerTile, var3.field154[var5][var1][var2], var3.field155[var5][var1][var2]); } } } @@ -655,7 +656,7 @@ public class WorldMapRegion { ) void method464(int var1, int var2, class21 var3, IndexedSprite[] var4) { for (int var5 = 0; var5 < var3.field156; ++var5) { - WorldMapDecoration[] var6 = var3.field144[var5][var1][var2]; + WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; if (var6 != null && var6.length != 0) { WorldMapDecoration[] var7 = var6; @@ -665,9 +666,9 @@ public class WorldMapRegion { ObjectDefinition var10 = class50.getObjectDefinition(var9.objectDefinitionId); if (var10.mapSceneId != -1) { if (var10.mapSceneId != 46 && var10.mapSceneId != 52) { - var4[var10.mapSceneId].method135(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054 * 2, this.field1054 * 2); + var4[var10.mapSceneId].method135(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); } else { - var4[var10.mapSceneId].method135(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054 * 2 + 1, this.field1054 * 2 + 1); + var4[var10.mapSceneId].method135(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); } } } @@ -684,7 +685,7 @@ public class WorldMapRegion { ) void method465(int var1, int var2, class21 var3) { for (int var4 = 0; var4 < var3.field156; ++var4) { - WorldMapDecoration[] var5 = var3.field144[var4][var1][var2]; + WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; if (var5 != null && var5.length != 0) { WorldMapDecoration[] var6 = var5; @@ -706,19 +707,19 @@ public class WorldMapRegion { if (var8.decoration == WorldMapDecorationType.field2804.id) { if (var8.rotation == 0) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1, this.field1054 * (63 - var2), 1, var12); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var12); } if (var8.rotation == 1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1 + this.field1054 - 1, this.field1054 * (63 - var2), 1, var12); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var12); } if (var8.rotation == 2) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1 + this.field1054 - 1, this.field1054 * (63 - var2) + this.field1054 - 1, 1, var12); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); } if (var8.rotation == 3) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1, this.field1054 * (63 - var2) + this.field1054 - 1, 1, var12); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); } } @@ -726,12 +727,12 @@ public class WorldMapRegion { int var13 = var8.rotation % 2; int var14; if (var13 == 0) { - for (var14 = 0; var14 < this.field1054; ++var14) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.field1054 * var1, (64 - var2) * this.field1054 - 1 - var14, 1, var12); + for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var14, 1, var12); } } else { - for (var14 = 0; var14 < this.field1054; ++var14) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.field1054 * var1, var14 + this.field1054 * (63 - var2), 1, var12); + for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, var14 + this.pixelsPerTile * (63 - var2), 1, var12); } } } @@ -747,7 +748,8 @@ public class WorldMapRegion { signature = "(IILjava/util/HashSet;IB)V", garbageValue = "0" ) - void method412(int var1, int var2, HashSet var3, int var4) { + @Export("drawNonLinkMapIcons") + void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { float var5 = (float)var4 / 64.0F; float var6 = var5 / 2.0F; Iterator var7 = this.iconsMap.entrySet().iterator(); @@ -759,8 +761,8 @@ public class WorldMapRegion { int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); if (var12 != null && var12.method19()) { - var12.field5 = var10; - var12.field6 = var11; + var12.screenX = var10; + var12.screenY = var11; WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.getElement()); if (!var3.contains(var13.method390())) { this.method415(var12, var10, var11, var5); @@ -783,7 +785,7 @@ public class WorldMapRegion { if (var5.method19()) { WorldMapElement var6 = ViewportMouse.getWorldMapElement(var5.getElement()); if (var6 != null && var1.contains(var6.method390())) { - this.method414(var6, var5.field5, var5.field6, var2, var3); + this.method414(var6, var5.screenX, var5.screenY, var2, var3); } } } @@ -795,13 +797,13 @@ public class WorldMapRegion { signature = "(Lic;IIIIB)V", garbageValue = "92" ) - void method414(WorldMapElement var1, int var2, int var3, int var4, int var5) { + void method414(WorldMapElement var1, int x, int y, int var4, int var5) { Sprite var6 = var1.getSprite(false); if (var6 != null) { - var6.drawAt2(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); + var6.drawAt2(x - var6.subWidth / 2, y - var6.subHeight / 2); if (var4 % var5 < var5 / 2) { - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); + Rasterizer2D.Rasterizer2D_drawCircleAlpha(x, y, 15, 16776960, 128); + Rasterizer2D.Rasterizer2D_drawCircleAlpha(x, y, 7, 16777215, 256); } } @@ -826,8 +828,8 @@ public class WorldMapRegion { void method416(WorldMapElement var1, int var2, int var3) { Sprite var4 = var1.getSprite(false); if (var4 != null) { - int var5 = this.method473(var4, var1.field3287); - int var6 = this.method474(var4, var1.field3301); + int var5 = this.method473(var4, var1.horizontalAlignment); + int var6 = this.method474(var4, var1.verticalAlignment); var4.drawAt2(var5 + var2, var3 + var6); } @@ -852,7 +854,8 @@ public class WorldMapRegion { signature = "(IILjava/util/HashSet;IB)V", garbageValue = "-17" ) - void method418(int var1, int var2, HashSet var3, int var4) { + @Export("drawMapLinks") + void drawMapLinks(int var1, int var2, HashSet var3, int var4) { float var5 = (float)var4 / 64.0F; Iterator var6 = this.iconsList.iterator(); @@ -861,10 +864,10 @@ public class WorldMapRegion { if (var7.method19()) { int var8 = var7.coord2.x % 64; int var9 = var7.coord2.y % 64; - var7.field5 = (int)((float)var8 * var5 + (float)var1); - var7.field6 = (int)(var5 * (float)(63 - var9) + (float)var2); + var7.screenX = (int)((float)var8 * var5 + (float)var1); + var7.screenY = (int)(var5 * (float)(63 - var9) + (float)var2); if (!var3.contains(var7.getElement())) { - this.method415(var7, var7.field5, var7.field6, var5); + this.method415(var7, var7.screenX, var7.screenY, var5); } } } @@ -876,8 +879,8 @@ public class WorldMapRegion { signature = "(Lln;Lju;I)I", garbageValue = "1945325707" ) - int method473(Sprite var1, class266 var2) { - switch(var2.field3528) { + int method473(Sprite var1, HorizontalAlignment var2) { + switch(var2.value) { case 0: return -var1.subWidth / 2; case 2: @@ -892,8 +895,8 @@ public class WorldMapRegion { signature = "(Lln;Lip;I)I", garbageValue = "1788772278" ) - int method474(Sprite var1, class249 var2) { - switch(var2.field3275) { + int method474(Sprite var1, VerticalAlignment var2) { + switch(var2.value) { case 0: return 0; case 1: @@ -910,7 +913,7 @@ public class WorldMapRegion { ) WorldMapLabel method419(int var1) { WorldMapElement var2 = ViewportMouse.getWorldMapElement(var1); - return this.method420(var2); + return this.createMapLabel(var2); } @ObfuscatedName("ab") @@ -918,9 +921,10 @@ public class WorldMapRegion { signature = "(Lic;B)Laj;", garbageValue = "59" ) - WorldMapLabel method420(WorldMapElement var1) { - if (var1.field1021 != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { - WorldMapLabelSize var2 = WorldMapLabelSize.method195(var1.textSize); + @Export("createMapLabel") + WorldMapLabel createMapLabel(WorldMapElement var1) { + if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { + WorldMapLabelSize var2 = WorldMapLabelSize.valueOf(var1.textSize); if (var2 == null) { return null; } else { @@ -928,9 +932,9 @@ public class WorldMapRegion { if (var3 == null) { return null; } else { - int var4 = var3.lineCount(var1.field1021, 1000000); + int var4 = var3.lineCount(var1.name, 1000000); String[] var5 = new String[var4]; - var3.breakLines(var1.field1021, (int[])null, var5); + var3.breakLines(var1.name, (int[])null, var5); int var6 = var5.length * var3.ascent / 2; int var7 = 0; String[] var8 = var5; @@ -943,7 +947,7 @@ public class WorldMapRegion { } } - return new WorldMapLabel(var1.field1021, var7, var6, var2); + return new WorldMapLabel(var1.name, var7, var6, var2); } } } else { @@ -1009,19 +1013,19 @@ public class WorldMapRegion { void method422(int var1, int var2, int var3, int var4) { var3 %= 4; if (var3 == 0) { - Rasterizer2D.Rasterizer2D_drawVerticalLine(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, var4); + Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } if (var3 == 1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, var4); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } if (var3 == 2) { - Rasterizer2D.Rasterizer2D_drawVerticalLine(this.field1054 * var1 + this.field1054 - 1, this.field1054 * (63 - var2), this.field1054, var4); + Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } if (var3 == 3) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1, this.field1054 * (63 - var2) + this.field1054 - 1, this.field1054, var4); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); } } @@ -1050,6 +1054,7 @@ public class WorldMapRegion { signature = "(Lho;IIS)V", garbageValue = "597" ) + // Click minimap? static final void method567(Widget var0, int var1, int var2) { if ((Client.minimapState == 0 || Client.minimapState == 3) && !Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { SpriteMask var3 = var0.getSpriteMask(true); @@ -1102,7 +1107,7 @@ public class WorldMapRegion { for (int var5 = 0; var5 < var0.length; ++var5) { Widget var6 = var0[var5]; if (var6 != null && var6.parentId == var1) { - WorldMapSection3.alignWidgetSize(var6, var2, var3, var4); + WorldMapSection1.alignWidgetSize(var6, var2, var3, var4); FloorOverlayDefinition.alignWidgetPosition(var6, var2, var3); if (var6.scrollX > var6.scrollWidth - var6.width) { var6.scrollX = var6.scrollWidth - var6.width; diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java index 9314fc62b0..d7f2c11787 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -4,86 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("y") +@ObfuscatedName("ah") @Implements("WorldMapSection0") public class WorldMapSection0 implements WorldMapSection { - @ObfuscatedName("sn") - @ObfuscatedGetter( - intValue = -1946112139 - ) - static int field1055; - @ObfuscatedName("p") - static int[] field1056; + @ObfuscatedName("l") + static int[] field1082; + @ObfuscatedName("j") + @Export("cacheDirectoryLocations") + public static String[] cacheDirectoryLocations; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -2011838881 + intValue = -1561552223 ) - int field1057; + @Export("minPlane") + int minPlane; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1299225715 + intValue = -245382089 ) - int field1058; + @Export("planes") + int planes; @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 82600709 + intValue = -1024859679 ) - int field1059; + @Export("xRegion") + int xRegion; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -477370575 + intValue = 40495485 ) - int field1060; + @Export("yRegion") + int yRegion; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -671345527 + intValue = 982234927 ) - int field1061; + int field1087; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 529427495 + intValue = -1272330125 ) - int field1062; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -150870205 - ) - int field1063; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1009718107 - ) - int field1064; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1022177315 - ) - int field1065; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1397517463 - ) - int field1066; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -799353317 - ) - int field1067; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -1388959491 - ) - int field1068; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -1657956317 - ) - int field1069; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1345061881 - ) - int field1070; + int field1088; @ObfuscatedName("m") @ObfuscatedSignature( @@ -91,21 +53,21 @@ public class WorldMapSection0 implements WorldMapSection { garbageValue = "1384899025" ) @Export("expandBounds") - public void expandBounds(WorldMapArea var1) { - if (var1.minX0 > this.field1061) { - var1.minX0 = this.field1061; + public void expandBounds(WorldMapArea area) { + if (area.minX0 > this.field1087) { + area.minX0 = this.field1087; } - if (var1.maxX0 < this.field1061) { - var1.maxX0 = this.field1061; + if (area.maxX0 < this.field1087) { + area.maxX0 = this.field1087; } - if (var1.minY0 > this.field1062) { - var1.minY0 = this.field1062; + if (area.minY0 > this.field1088) { + area.minY0 = this.field1088; } - if (var1.maxY0 < this.field1062) { - var1.maxY0 = this.field1062; + if (area.maxY0 < this.field1088) { + area.maxY0 = this.field1088; } } @@ -116,8 +78,8 @@ public class WorldMapSection0 implements WorldMapSection { garbageValue = "93" ) @Export("containsCoord") - public boolean containsCoord(int var1, int var2, int var3) { - return var1 >= this.field1057 && var1 < this.field1057 + this.field1058 ? var2 >= (this.field1059 << 6) + (this.field1063 << 3) && var2 <= (this.field1059 << 6) + (this.field1065 << 3) + 7 && var3 >= (this.field1060 << 6) + (this.field1064 << 3) && var3 <= (this.field1060 << 6) + (this.field1066 << 3) + 7 : false; + public boolean containsCoord(int plane, int x, int y) { + return plane >= this.minPlane && plane < this.minPlane + this.planes ? x >> 6 == this.xRegion && y >> 6 == this.yRegion : false; } @ObfuscatedName("q") @@ -126,8 +88,8 @@ public class WorldMapSection0 implements WorldMapSection { garbageValue = "4" ) @Export("containsPosition") - public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field1061 << 6) + (this.field1067 << 3) && var1 <= (this.field1061 << 6) + (this.field1069 << 3) + 7 && var2 >= (this.field1062 << 6) + (this.field1068 << 3) && var2 <= (this.field1062 << 6) + (this.field1070 << 3) + 7; + public boolean containsPosition(int x, int y) { + return x >> 6 == this.field1087 && y >> 6 == this.field1088; } @ObfuscatedName("w") @@ -136,11 +98,11 @@ public class WorldMapSection0 implements WorldMapSection { garbageValue = "1545934424" ) @Export("position") - public int[] position(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { + public int[] position(int plane, int x, int y) { + if (!this.containsCoord(plane, x, y)) { return null; } else { - int[] var4 = new int[]{this.field1061 * 64 - this.field1059 * 64 + var2 + (this.field1067 * 8 - this.field1063 * 8), var3 + (this.field1062 * 64 - this.field1060 * 64) + (this.field1068 * 8 - this.field1064 * 8)}; + int[] var4 = new int[]{this.field1087 * 64 - this.xRegion * 64 + x, y + (this.field1088 * 64 - this.yRegion * 64)}; return var4; } } @@ -151,13 +113,13 @@ public class WorldMapSection0 implements WorldMapSection { garbageValue = "-1916486802" ) @Export("coord") - public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { + public Coord coord(int x, int y) { + if (!this.containsPosition(x, y)) { return null; } else { - int var3 = this.field1059 * 64 - this.field1061 * 64 + (this.field1063 * 8 - this.field1067 * 8) + var1; - int var4 = this.field1060 * 64 - this.field1062 * 64 + var2 + (this.field1064 * 8 - this.field1068 * 8); - return new Coord(this.field1057, var3, var4); + int var3 = this.xRegion * 64 - this.field1087 * 64 + x; + int var4 = this.yRegion * 64 - this.field1088 * 64 + y; + return new Coord(this.minPlane, var3, var4); } } @@ -167,116 +129,189 @@ public class WorldMapSection0 implements WorldMapSection { garbageValue = "-113" ) @Export("read") - public void read(Buffer var1) { - this.field1057 = var1.readUnsignedByte(); - this.field1058 = var1.readUnsignedByte(); - this.field1059 = var1.readUnsignedShort(); - this.field1063 = var1.readUnsignedByte(); - this.field1065 = var1.readUnsignedByte(); - this.field1060 = var1.readUnsignedShort(); - this.field1064 = var1.readUnsignedByte(); - this.field1066 = var1.readUnsignedByte(); - this.field1061 = var1.readUnsignedShort(); - this.field1067 = var1.readUnsignedByte(); - this.field1069 = var1.readUnsignedByte(); - this.field1062 = var1.readUnsignedShort(); - this.field1068 = var1.readUnsignedByte(); - this.field1070 = var1.readUnsignedByte(); - this.method423(); + public void read(Buffer buffer) { + this.minPlane = buffer.readUnsignedByte(); + this.planes = buffer.readUnsignedByte(); + this.xRegion = buffer.readUnsignedShort(); + this.yRegion = buffer.readUnsignedShort(); + this.field1087 = buffer.readUnsignedShort(); + this.field1088 = buffer.readUnsignedShort(); + this.method425(); } @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1967186894" + garbageValue = "-1602858772" ) - void method423() { + void method425() { } - @ObfuscatedName("w") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2102591569" + signature = "(II)I", + garbageValue = "409746497" ) - @Export("savePreferences") - static void savePreferences() { - AccessFile var0 = null; + @Export("getVarbit") + public static int getVarbit(int var0) { + VarbitDefinition var1 = Occluder.getVarbitDefinition(var0); + int var2 = var1.baseVar; + int var3 = var1.startBit; + int var4 = var1.endBit; + int var5 = Varps.Varps_masks[var4 - var3]; + return Varps.Varps_main[var2] >> var3 & var5; + } - try { - var0 = LoginPacket.getPreferencesFile("", class22.studioGame.name, true); - Buffer var1 = ReflectionCheck.clientPreferences.toBuffer(); - var0.write(var1.array, 0, var1.index); - } catch (Exception var3) { - } + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(IILfe;Lfy;I)Z", + garbageValue = "-2025028346" + ) + static final boolean method593(int var0, int var1, RouteStrategy var2, CollisionMap var3) { + int var4 = var0; + int var5 = var1; + byte var6 = 64; + byte var7 = 64; + int var8 = var0 - var6; + int var9 = var1 - var7; + class178.directions[var6][var7] = 99; + class178.distances[var6][var7] = 0; + byte var10 = 0; + int var11 = 0; + class178.bufferX[var10] = var0; + int var12 = var10 + 1; + class178.bufferY[var10] = var1; + int[][] var13 = var3.flags; - try { - if (var0 != null) { - var0.closeSync(true); + while (var12 != var11) { + var4 = class178.bufferX[var11]; + var5 = class178.bufferY[var11]; + var11 = var11 + 1 & 4095; + int var14 = var4 - var8; + int var15 = var5 - var9; + int var16 = var4 - var3.xInset; + int var17 = var5 - var3.yInset; + if (var2.vmethod3644(2, var4, var5, var3)) { + InterfaceParent.field986 = var4; + UrlRequester.field929 = var5; + return true; + } + + int var18 = class178.distances[var14][var15] + 1; + if (var14 > 0 && class178.directions[var14 - 1][var15] == 0 && (var13[var16 - 1][var17] & 19136782) == 0 && (var13[var16 - 1][var17 + 1] & 19136824) == 0) { + class178.bufferX[var12] = var4 - 1; + class178.bufferY[var12] = var5; + var12 = var12 + 1 & 4095; + class178.directions[var14 - 1][var15] = 2; + class178.distances[var14 - 1][var15] = var18; + } + + if (var14 < 126 && class178.directions[var14 + 1][var15] == 0 && (var13[var16 + 2][var17] & 19136899) == 0 && (var13[var16 + 2][var17 + 1] & 19136992) == 0) { + class178.bufferX[var12] = var4 + 1; + class178.bufferY[var12] = var5; + var12 = var12 + 1 & 4095; + class178.directions[var14 + 1][var15] = 8; + class178.distances[var14 + 1][var15] = var18; + } + + if (var15 > 0 && class178.directions[var14][var15 - 1] == 0 && (var13[var16][var17 - 1] & 19136782) == 0 && (var13[var16 + 1][var17 - 1] & 19136899) == 0) { + class178.bufferX[var12] = var4; + class178.bufferY[var12] = var5 - 1; + var12 = var12 + 1 & 4095; + class178.directions[var14][var15 - 1] = 1; + class178.distances[var14][var15 - 1] = var18; + } + + if (var15 < 126 && class178.directions[var14][var15 + 1] == 0 && (var13[var16][var17 + 2] & 19136824) == 0 && (var13[var16 + 1][var17 + 2] & 19136992) == 0) { + class178.bufferX[var12] = var4; + class178.bufferY[var12] = var5 + 1; + var12 = var12 + 1 & 4095; + class178.directions[var14][var15 + 1] = 4; + class178.distances[var14][var15 + 1] = var18; + } + + if (var14 > 0 && var15 > 0 && class178.directions[var14 - 1][var15 - 1] == 0 && (var13[var16 - 1][var17] & 19136830) == 0 && (var13[var16 - 1][var17 - 1] & 19136782) == 0 && (var13[var16][var17 - 1] & 19136911) == 0) { + class178.bufferX[var12] = var4 - 1; + class178.bufferY[var12] = var5 - 1; + var12 = var12 + 1 & 4095; + class178.directions[var14 - 1][var15 - 1] = 3; + class178.distances[var14 - 1][var15 - 1] = var18; + } + + if (var14 < 126 && var15 > 0 && class178.directions[var14 + 1][var15 - 1] == 0 && (var13[var16 + 1][var17 - 1] & 19136911) == 0 && (var13[var16 + 2][var17 - 1] & 19136899) == 0 && (var13[var16 + 2][var17] & 19136995) == 0) { + class178.bufferX[var12] = var4 + 1; + class178.bufferY[var12] = var5 - 1; + var12 = var12 + 1 & 4095; + class178.directions[var14 + 1][var15 - 1] = 9; + class178.distances[var14 + 1][var15 - 1] = var18; + } + + if (var14 > 0 && var15 < 126 && class178.directions[var14 - 1][var15 + 1] == 0 && (var13[var16 - 1][var17 + 1] & 19136830) == 0 && (var13[var16 - 1][var17 + 2] & 19136824) == 0 && (var13[var16][var17 + 2] & 19137016) == 0) { + class178.bufferX[var12] = var4 - 1; + class178.bufferY[var12] = var5 + 1; + var12 = var12 + 1 & 4095; + class178.directions[var14 - 1][var15 + 1] = 6; + class178.distances[var14 - 1][var15 + 1] = var18; + } + + if (var14 < 126 && var15 < 126 && class178.directions[var14 + 1][var15 + 1] == 0 && (var13[var16 + 1][var17 + 2] & 19137016) == 0 && (var13[var16 + 2][var17 + 2] & 19136992) == 0 && (var13[var16 + 2][var17 + 1] & 19136995) == 0) { + class178.bufferX[var12] = var4 + 1; + class178.bufferY[var12] = var5 + 1; + var12 = var12 + 1 & 4095; + class178.directions[var14 + 1][var15 + 1] = 12; + class178.distances[var14 + 1][var15 + 1] = var18; } - } catch (Exception var2) { } + InterfaceParent.field986 = var4; + UrlRequester.field929 = var5; + return false; } - @ObfuscatedName("hz") + @ObfuscatedName("hc") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1886145284" + signature = "(ILjava/lang/String;I)V", + garbageValue = "-1850233906" ) - static final void method245(int var0) { - if (var0 >= 0) { - int var1 = Client.menuArguments1[var0]; - int var2 = Client.menuArguments2[var0]; - int var3 = Client.menuOpcodes[var0]; - int var4 = Client.menuArguments0[var0]; - String var5 = Client.menuActions[var0]; - String var6 = Client.menuTargetNames[var0]; - Actor.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } + static void method583(int var0, String var1) { + int var2 = Players.Players_count; + int[] var3 = Players.Players_indices; + boolean var4 = false; + Username var5 = new Username(var1, KeyHandler.loginType); - } - - @ObfuscatedName("io") - @ObfuscatedSignature( - signature = "(Lho;IIIIIII)V", - garbageValue = "-1723792771" - ) - static final void method246(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Client.field188) { - Client.field189 = 32; - } else { - Client.field189 = 0; - } - - Client.field188 = false; - int var7; - 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); - } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { - var0.scrollY += 4; - class22.method295(var0); - } else if (var5 >= var1 - Client.field189 && var5 < Client.field189 + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { - var7 = var3 * (var3 - 32) / var4; - if (var7 < 8) { - var7 = 8; + 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(var5)) { + PacketBufferNode var8; + if (var0 == 1) { + var8 = Interpreter.method1915(ClientPacket.field269, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var3[var6]); + var8.packetBuffer.method56(0); + Client.packetWriter.method241(var8); + } else if (var0 == 4) { + var8 = Interpreter.method1915(ClientPacket.field249, Client.packetWriter.isaacCipher); + var8.packetBuffer.method64(var3[var6]); + var8.packetBuffer.method56(0); + Client.packetWriter.method241(var8); + } else if (var0 == 6) { + var8 = Interpreter.method1915(ClientPacket.field315, Client.packetWriter.isaacCipher); + var8.packetBuffer.method63(var3[var6]); + var8.packetBuffer.method57(0); + Client.packetWriter.method241(var8); + } else if (var0 == 7) { + var8 = Interpreter.method1915(ClientPacket.field297, Client.packetWriter.isaacCipher); + var8.packetBuffer.method57(0); + var8.packetBuffer.writeShortLE(var3[var6]); + Client.packetWriter.method241(var8); } - int var8 = var6 - var2 - 16 - var7 / 2; - int var9 = var3 - 32 - var7; - var0.scrollY = var8 * (var4 - var3) / var9; - class22.method295(var0); - Client.field188 = true; + var4 = true; + break; } } - if (Client.mouseWheelRotation != 0) { - var7 = var0.width; - if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { - var0.scrollY += Client.mouseWheelRotation * 45; - class22.method295(var0); - } + if (!var4) { + WorldMapIcon1.addGameMessage(4, "", "Unable to find " + var1); } } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index 201ac1b868..b2ed5c1c6d 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -4,79 +4,73 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("as") +@ObfuscatedName("p") @Implements("WorldMapSection1") public class WorldMapSection1 implements WorldMapSection { - @ObfuscatedName("c") - @Export("userHomeDirectory") - public static String userHomeDirectory; - @ObfuscatedName("du") + @ObfuscatedName("h") + @Export("osNameLowerCase") + public static String osNameLowerCase; + @ObfuscatedName("dr") @ObfuscatedSignature( signature = "Lit;" ) - @Export("archive15") - static Archive archive15; - @ObfuscatedName("ey") + @Export("archive8") + static Archive archive8; + @ObfuscatedName("go") @ObfuscatedGetter( - intValue = -1516124929 + intValue = -948290091 ) - static int field1071; - @ObfuscatedName("ha") - @ObfuscatedGetter( - intValue = 1052834531 - ) - @Export("cameraX") - static int cameraX; + static int field1089; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1971304641 + intValue = 1389733201 ) - int field1072; + int field1090; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1483447179 + intValue = -1622972483 ) - int field1073; + int field1091; @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1875803617 + intValue = 702057599 ) - int field1074; + int field1092; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 284566685 + intValue = -1068088609 ) - int field1075; + int field1093; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1513010233 + intValue = 1257151629 ) - int field1076; + int field1094; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1383826035 + intValue = -1351623663 ) - int field1077; + int field1095; @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1526007343 + intValue = 1016557381 ) - int field1078; + int field1096; @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -890169045 + intValue = 884736611 ) - int field1079; + int field1097; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1797724181 + intValue = 395786901 ) - int field1080; + int field1098; @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 325777555 + intValue = -627081155 ) - int field1081; + int field1099; @ObfuscatedName("m") @ObfuscatedSignature( @@ -84,21 +78,21 @@ public class WorldMapSection1 implements WorldMapSection { garbageValue = "1384899025" ) @Export("expandBounds") - public void expandBounds(WorldMapArea var1) { - if (var1.minX0 > this.field1076) { - var1.minX0 = this.field1076; + public void expandBounds(WorldMapArea area) { + if (area.minX0 > this.field1096) { + area.minX0 = this.field1096; } - if (var1.maxX0 < this.field1076) { - var1.maxX0 = this.field1076; + if (area.maxX0 < this.field1098) { + area.maxX0 = this.field1098; } - if (var1.minY0 > this.field1077) { - var1.minY0 = this.field1077; + if (area.minY0 > this.field1097) { + area.minY0 = this.field1097; } - if (var1.maxY0 < this.field1077) { - var1.maxY0 = this.field1077; + if (area.maxY0 < this.field1099) { + area.maxY0 = this.field1099; } } @@ -109,8 +103,8 @@ public class WorldMapSection1 implements WorldMapSection { garbageValue = "93" ) @Export("containsCoord") - public boolean containsCoord(int var1, int var2, int var3) { - return var1 >= this.field1072 && var1 < this.field1072 + this.field1073 ? var2 >= (this.field1074 << 6) + (this.field1078 << 3) && var2 <= (this.field1074 << 6) + (this.field1078 << 3) + 7 && var3 >= (this.field1075 << 6) + (this.field1079 << 3) && var3 <= (this.field1075 << 6) + (this.field1079 << 3) + 7 : false; + public boolean containsCoord(int plane, int x, int y) { + return plane >= this.field1090 && plane < this.field1090 + this.field1091 ? x >> 6 >= this.field1092 && x >> 6 <= this.field1094 && y >> 6 >= this.field1093 && y >> 6 <= this.field1095 : false; } @ObfuscatedName("q") @@ -119,8 +113,8 @@ public class WorldMapSection1 implements WorldMapSection { garbageValue = "4" ) @Export("containsPosition") - public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field1076 << 6) + (this.field1080 << 3) && var1 <= (this.field1076 << 6) + (this.field1080 << 3) + 7 && var2 >= (this.field1077 << 6) + (this.field1081 << 3) && var2 <= (this.field1077 << 6) + (this.field1081 << 3) + 7; + public boolean containsPosition(int x, int y) { + return x >> 6 >= this.field1096 && x >> 6 <= this.field1098 && y >> 6 >= this.field1097 && y >> 6 <= this.field1099; } @ObfuscatedName("w") @@ -129,11 +123,11 @@ public class WorldMapSection1 implements WorldMapSection { garbageValue = "1545934424" ) @Export("position") - public int[] position(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { + public int[] position(int plane, int x, int y) { + if (!this.containsCoord(plane, x, y)) { return null; } else { - int[] var4 = new int[]{this.field1076 * 64 - this.field1074 * 64 + var2 + (this.field1080 * 8 - this.field1078 * 8), var3 + (this.field1077 * 64 - this.field1075 * 64) + (this.field1081 * 8 - this.field1079 * 8)}; + int[] var4 = new int[]{this.field1096 * 64 - this.field1092 * 64 + x, y + (this.field1097 * 64 - this.field1093 * 64)}; return var4; } } @@ -144,13 +138,13 @@ public class WorldMapSection1 implements WorldMapSection { garbageValue = "-1916486802" ) @Export("coord") - public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { + public Coord coord(int x, int y) { + if (!this.containsPosition(x, y)) { return null; } else { - int var3 = this.field1074 * 64 - this.field1076 * 64 + (this.field1078 * 8 - this.field1080 * 8) + var1; - int var4 = this.field1075 * 64 - this.field1077 * 64 + var2 + (this.field1079 * 8 - this.field1081 * 8); - return new Coord(this.field1072, var3, var4); + int var3 = this.field1092 * 64 - this.field1096 * 64 + x; + int var4 = this.field1093 * 64 - this.field1097 * 64 + y; + return new Coord(this.field1090, var3, var4); } } @@ -160,165 +154,111 @@ public class WorldMapSection1 implements WorldMapSection { garbageValue = "-113" ) @Export("read") - public void read(Buffer var1) { - this.field1072 = var1.readUnsignedByte(); - this.field1073 = var1.readUnsignedByte(); - this.field1074 = var1.readUnsignedShort(); - this.field1078 = var1.readUnsignedByte(); - this.field1075 = var1.readUnsignedShort(); - this.field1079 = var1.readUnsignedByte(); - this.field1076 = var1.readUnsignedShort(); - this.field1080 = var1.readUnsignedByte(); - this.field1077 = var1.readUnsignedShort(); - this.field1081 = var1.readUnsignedByte(); - this.method424(); + public void read(Buffer buffer) { + this.field1090 = buffer.readUnsignedByte(); + this.field1091 = buffer.readUnsignedByte(); + this.field1092 = buffer.readUnsignedShort(); + this.field1093 = buffer.readUnsignedShort(); + this.field1094 = buffer.readUnsignedShort(); + this.field1095 = buffer.readUnsignedShort(); + this.field1096 = buffer.readUnsignedShort(); + this.field1097 = buffer.readUnsignedShort(); + this.field1098 = buffer.readUnsignedShort(); + this.field1099 = buffer.readUnsignedShort(); + this.method426(); } @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2026323437" + signature = "(B)V", + garbageValue = "-126" ) - void method424() { + void method426() { } - @ObfuscatedName("m") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(II)Lim;", - garbageValue = "-205156540" + signature = "(Lho;II)V", + garbageValue = "1115233428" ) - @Export("getKitDefinition") - public static KitDefinition getKitDefinition(int var0) { - KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + static final void method345(Widget var0, int var1) { + if (var0.field966 == null) { + throw new RuntimeException(); } else { - byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); - var1 = new KitDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + if (var0.field984 == null) { + var0.field984 = new int[var0.field966.length]; } - KitDefinition.KitDefinition_cached.put(var1, (long)var0); - return var1; + var0.field984[var1] = Integer.MAX_VALUE; } } - @ObfuscatedName("fc") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2142100332" + signature = "(IB)V", + garbageValue = "23" ) - static void method808() { - Client.mouseLastLastPressedTimeMillis = 1L; - Projectile.mouseRecorder.index = 0; - class230.field1138 = true; - Client.field166 = true; - Client.field126 = -1L; - PendingSpawn.method1694(); - Client.packetWriter.method239(); - Client.packetWriter.packetBuffer.index = 0; - Client.packetWriter.serverPacket0 = null; - Client.packetWriter.field676 = null; - Client.packetWriter.field677 = null; - Client.packetWriter.field678 = null; - Client.packetWriter.serverPacket0Length = 0; - Client.packetWriter.field674 = 0; - Client.rebootTimer = 0; - Client.field175 = 0; - Client.hintArrowType = 0; - Client.menuOptionsCount = 0; - Client.isMenuOpen = false; - MouseHandler.MouseHandler_idleCycles = 0; - GroundItem.method2094(); - Client.isItemSelected = 0; - Client.isSpellSelected = false; - Client.soundEffectCount = 0; - Client.camAngleY = 0; - Client.oculusOrbState = 0; - ClientParameter.field3645 = null; - Client.minimapState = 0; - Client.field125 = -1; - Client.destinationX = 0; - Client.destinationY = 0; - Client.playerAttackOption = AttackOption.AttackOption_hidden; - Client.npcAttackOption = AttackOption.AttackOption_hidden; - Client.npcCount = 0; - Players.Players_count = 0; + @Export("runWidgetOnLoadListener") + static void runWidgetOnLoadListener(int var0) { + if (var0 != -1 && GroundItemPile.loadInterface(var0)) { + Widget[] var1 = Widget.interfaceComponents[var0]; - int var0; - for (var0 = 0; var0 < 2048; ++var0) { - Players.field733[var0] = null; - Players.field732[var0] = 1; - } - - for (var0 = 0; var0 < 2048; ++var0) { - Client.players[var0] = null; - } - - for (var0 = 0; var0 < 32768; ++var0) { - Client.npcs[var0] = null; - } - - Client.combatTargetPlayerIndex = -1; - Client.projectiles.clear(); - Client.graphicsObjects.clear(); - - for (var0 = 0; var0 < 4; ++var0) { - for (int var1 = 0; var1 < 104; ++var1) { - for (int var2 = 0; var2 < 104; ++var2) { - Client.groundItems[var0][var1][var2] = null; + for (int var2 = 0; var2 < var1.length; ++var2) { + Widget var3 = var1[var2]; + if (var3.onLoad != null) { + ScriptEvent var4 = new ScriptEvent(); + var4.widget = var3; + var4.args0 = var3.onLoad; + GrandExchangeEvent.runScript0(var4, 5000000); } } } - Client.pendingSpawns = new NodeDeque(); - WorldMapArea.friendSystem.clear(); + } - for (var0 = 0; var0 < VarpDefinition.field944; ++var0) { - VarpDefinition var3 = SecureRandomCallable.method1140(var0); - if (var3 != null) { - Varps.Varps_temp[var0] = 0; - Varps.Varps_main[var0] = 0; - } + @ObfuscatedName("ic") + @ObfuscatedSignature( + signature = "(Lho;IIZB)V", + garbageValue = "-35" + ) + @Export("alignWidgetSize") + static void alignWidgetSize(Widget component, int parentWidth, int parentHeight, boolean var3) { + int var4 = component.width; + int var5 = component.height; + if (component.widthAlignment == 0) { + component.width = component.rawWidth; + } else if (component.widthAlignment == 1) { + component.width = parentWidth - component.rawWidth; + } else if (component.widthAlignment == 2) { + component.width = component.rawWidth * parentWidth >> 14; } - class196.varcs.clearTransient(); - Client.followerIndex = -1; - if (Client.rootInterface != -1) { - AbstractByteArrayCopier.unloadInterface(Client.rootInterface); + if (component.heightAlignment == 0) { + component.height = component.rawHeight; + } else if (component.heightAlignment == 1) { + component.height = parentHeight - component.rawHeight; + } else if (component.heightAlignment == 2) { + component.height = parentHeight * component.rawHeight >> 14; } - for (InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.first(); var4 != null; var4 = (InterfaceParent)Client.interfaceParents.next()) { - MenuAction.closeInterface(var4, true); + if (component.widthAlignment == 4) { + component.width = component.height * component.field958 / component.field959; } - Client.rootInterface = -1; - Client.interfaceParents = new NodeHashTable(8); - Client.field127 = null; - Client.menuOptionsCount = 0; - Client.isMenuOpen = false; - Client.field119.method256((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); - - for (var0 = 0; var0 < 8; ++var0) { - Client.playerMenuActions[var0] = null; - Client.playerOptionsPriorities[var0] = false; + if (component.heightAlignment == 4) { + component.height = component.width * component.field959 / component.field958; } - SpriteMask.method4389(); - Client.isLoading = true; - - for (var0 = 0; var0 < 100; ++var0) { - Client.field100[var0] = true; + if (component.contentType == 1337) { + Client.viewportWidget = component; } - AbstractByteArrayCopier.method4024(); - PacketWriter.clanChat = null; - - for (var0 = 0; var0 < 8; ++var0) { - Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); + if (var3 && component.onResize != null && (var4 != component.width || var5 != component.height)) { + ScriptEvent var6 = new ScriptEvent(); + var6.widget = component; + var6.args0 = component.onResize; + Client.scriptEvents.addFirst(var6); } - FloorDecoration.grandExchangeEvents = null; } } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index f90d0505ca..0b55613c3c 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -4,44 +4,79 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ah") +@ObfuscatedName("as") @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { - @ObfuscatedName("l") - static int[] field1082; - @ObfuscatedName("j") - @Export("cacheDirectoryLocations") - public static String[] cacheDirectoryLocations; + @ObfuscatedName("c") + @Export("userHomeDirectory") + public static String userHomeDirectory; + @ObfuscatedName("du") + @ObfuscatedSignature( + signature = "Lit;" + ) + @Export("archive15") + static Archive archive15; + @ObfuscatedName("ey") + @ObfuscatedGetter( + intValue = -1516124929 + ) + static int field1071; + @ObfuscatedName("ha") + @ObfuscatedGetter( + intValue = 1052834531 + ) + @Export("cameraX") + static int cameraX; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1561552223 + intValue = -1971304641 ) - int field1083; + int field1072; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -245382089 + intValue = 1483447179 ) - int field1084; + int field1073; @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1024859679 + intValue = -1875803617 ) - int field1085; + int field1074; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 40495485 + intValue = 284566685 ) - int field1086; + int field1075; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 982234927 + intValue = -1513010233 ) - int field1087; + int field1076; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1272330125 + intValue = -1383826035 ) - int field1088; + int field1077; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 1526007343 + ) + int field1078; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -890169045 + ) + int field1079; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -1797724181 + ) + int field1080; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 325777555 + ) + int field1081; @ObfuscatedName("m") @ObfuscatedSignature( @@ -49,21 +84,21 @@ public class WorldMapSection2 implements WorldMapSection { garbageValue = "1384899025" ) @Export("expandBounds") - public void expandBounds(WorldMapArea var1) { - if (var1.minX0 > this.field1087) { - var1.minX0 = this.field1087; + public void expandBounds(WorldMapArea area) { + if (area.minX0 > this.field1076) { + area.minX0 = this.field1076; } - if (var1.maxX0 < this.field1087) { - var1.maxX0 = this.field1087; + if (area.maxX0 < this.field1076) { + area.maxX0 = this.field1076; } - if (var1.minY0 > this.field1088) { - var1.minY0 = this.field1088; + if (area.minY0 > this.field1077) { + area.minY0 = this.field1077; } - if (var1.maxY0 < this.field1088) { - var1.maxY0 = this.field1088; + if (area.maxY0 < this.field1077) { + area.maxY0 = this.field1077; } } @@ -74,8 +109,8 @@ public class WorldMapSection2 implements WorldMapSection { garbageValue = "93" ) @Export("containsCoord") - public boolean containsCoord(int var1, int var2, int var3) { - return var1 >= this.field1083 && var1 < this.field1083 + this.field1084 ? var2 >> 6 == this.field1085 && var3 >> 6 == this.field1086 : false; + public boolean containsCoord(int plane, int x, int y) { + return plane >= this.field1072 && plane < this.field1072 + this.field1073 ? x >= (this.field1074 << 6) + (this.field1078 << 3) && x <= (this.field1074 << 6) + (this.field1078 << 3) + 7 && y >= (this.field1075 << 6) + (this.field1079 << 3) && y <= (this.field1075 << 6) + (this.field1079 << 3) + 7 : false; } @ObfuscatedName("q") @@ -84,8 +119,8 @@ public class WorldMapSection2 implements WorldMapSection { garbageValue = "4" ) @Export("containsPosition") - public boolean containsPosition(int var1, int var2) { - return var1 >> 6 == this.field1087 && var2 >> 6 == this.field1088; + public boolean containsPosition(int x, int y) { + return x >= (this.field1076 << 6) + (this.field1080 << 3) && x <= (this.field1076 << 6) + (this.field1080 << 3) + 7 && y >= (this.field1077 << 6) + (this.field1081 << 3) && y <= (this.field1077 << 6) + (this.field1081 << 3) + 7; } @ObfuscatedName("w") @@ -94,11 +129,11 @@ public class WorldMapSection2 implements WorldMapSection { garbageValue = "1545934424" ) @Export("position") - public int[] position(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { + public int[] position(int plane, int x, int y) { + if (!this.containsCoord(plane, x, y)) { return null; } else { - int[] var4 = new int[]{this.field1087 * 64 - this.field1085 * 64 + var2, var3 + (this.field1088 * 64 - this.field1086 * 64)}; + int[] var4 = new int[]{this.field1076 * 64 - this.field1074 * 64 + x + (this.field1080 * 8 - this.field1078 * 8), y + (this.field1077 * 64 - this.field1075 * 64) + (this.field1081 * 8 - this.field1079 * 8)}; return var4; } } @@ -109,13 +144,13 @@ public class WorldMapSection2 implements WorldMapSection { garbageValue = "-1916486802" ) @Export("coord") - public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { + public Coord coord(int x, int y) { + if (!this.containsPosition(x, y)) { return null; } else { - int var3 = this.field1085 * 64 - this.field1087 * 64 + var1; - int var4 = this.field1086 * 64 - this.field1088 * 64 + var2; - return new Coord(this.field1083, var3, var4); + int var3 = this.field1074 * 64 - this.field1076 * 64 + (this.field1078 * 8 - this.field1080 * 8) + x; + int var4 = this.field1075 * 64 - this.field1077 * 64 + y + (this.field1079 * 8 - this.field1081 * 8); + return new Coord(this.field1072, var3, var4); } } @@ -125,190 +160,165 @@ public class WorldMapSection2 implements WorldMapSection { garbageValue = "-113" ) @Export("read") - public void read(Buffer var1) { - this.field1083 = var1.readUnsignedByte(); - this.field1084 = var1.readUnsignedByte(); - this.field1085 = var1.readUnsignedShort(); - this.field1086 = var1.readUnsignedShort(); - this.field1087 = var1.readUnsignedShort(); - this.field1088 = var1.readUnsignedShort(); - this.method425(); + public void read(Buffer buffer) { + this.field1072 = buffer.readUnsignedByte(); + this.field1073 = buffer.readUnsignedByte(); + this.field1074 = buffer.readUnsignedShort(); + this.field1078 = buffer.readUnsignedByte(); + this.field1075 = buffer.readUnsignedShort(); + this.field1079 = buffer.readUnsignedByte(); + this.field1076 = buffer.readUnsignedShort(); + this.field1080 = buffer.readUnsignedByte(); + this.field1077 = buffer.readUnsignedShort(); + this.field1081 = buffer.readUnsignedByte(); + this.method424(); } @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1602858772" + garbageValue = "2026323437" ) - void method425() { + void method424() { } @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "409746497" + signature = "(II)Lim;", + garbageValue = "-205156540" ) - @Export("getVarbit") - public static int getVarbit(int var0) { - VarbitDefinition var1 = Occluder.method3255(var0); - int var2 = var1.baseVar; - int var3 = var1.startBit; - int var4 = var1.endBit; - int var5 = Varps.Varps_masks[var4 - var3]; - return Varps.Varps_main[var2] >> var3 & var5; + @Export("getKitDefinition") + public static KitDefinition getKitDefinition(int var0) { + KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); + var1 = new KitDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + KitDefinition.KitDefinition_cached.put(var1, (long)var0); + return var1; + } } - @ObfuscatedName("f") + @ObfuscatedName("fc") @ObfuscatedSignature( - signature = "(IILfe;Lfy;I)Z", - garbageValue = "-2025028346" + signature = "(I)V", + garbageValue = "2142100332" ) - static final boolean method593(int var0, int var1, RouteStrategy var2, CollisionMap var3) { - int var4 = var0; - int var5 = var1; - byte var6 = 64; - byte var7 = 64; - int var8 = var0 - var6; - int var9 = var1 - var7; - class178.directions[var6][var7] = 99; - class178.distances[var6][var7] = 0; - byte var10 = 0; - int var11 = 0; - class178.bufferX[var10] = var0; - int var12 = var10 + 1; - class178.bufferY[var10] = var1; - int[][] var13 = var3.flags; + static void method808() { + Client.mouseLastLastPressedTimeMillis = 1L; + Projectile.mouseRecorder.index = 0; + class230.field1138 = true; + Client.field166 = true; + Client.field126 = -1L; + PendingSpawn.method1694(); + Client.packetWriter.method239(); + Client.packetWriter.packetBuffer.index = 0; + Client.packetWriter.serverPacket0 = null; + Client.packetWriter.field676 = null; + Client.packetWriter.field677 = null; + Client.packetWriter.field678 = null; + Client.packetWriter.serverPacket0Length = 0; + Client.packetWriter.field674 = 0; + Client.rebootTimer = 0; + Client.field175 = 0; + Client.hintArrowType = 0; + Client.menuOptionsCount = 0; + Client.isMenuOpen = false; + MouseHandler.MouseHandler_idleCycles = 0; + GroundItem.method2094(); + Client.isItemSelected = 0; + Client.isSpellSelected = false; + Client.soundEffectCount = 0; + Client.camAngleY = 0; + Client.oculusOrbState = 0; + ClientParameter.field3645 = null; + Client.minimapState = 0; + Client.field125 = -1; + Client.destinationX = 0; + Client.destinationY = 0; + Client.playerAttackOption = AttackOption.AttackOption_hidden; + Client.npcAttackOption = AttackOption.AttackOption_hidden; + Client.npcCount = 0; + Players.Players_count = 0; - while (var12 != var11) { - var4 = class178.bufferX[var11]; - var5 = class178.bufferY[var11]; - var11 = var11 + 1 & 4095; - int var14 = var4 - var8; - int var15 = var5 - var9; - int var16 = var4 - var3.xInset; - int var17 = var5 - var3.yInset; - if (var2.vmethod3644(2, var4, var5, var3)) { - InterfaceParent.field986 = var4; - UrlRequester.field929 = var5; - return true; - } - - int var18 = class178.distances[var14][var15] + 1; - if (var14 > 0 && class178.directions[var14 - 1][var15] == 0 && (var13[var16 - 1][var17] & 19136782) == 0 && (var13[var16 - 1][var17 + 1] & 19136824) == 0) { - class178.bufferX[var12] = var4 - 1; - class178.bufferY[var12] = var5; - var12 = var12 + 1 & 4095; - class178.directions[var14 - 1][var15] = 2; - class178.distances[var14 - 1][var15] = var18; - } - - if (var14 < 126 && class178.directions[var14 + 1][var15] == 0 && (var13[var16 + 2][var17] & 19136899) == 0 && (var13[var16 + 2][var17 + 1] & 19136992) == 0) { - class178.bufferX[var12] = var4 + 1; - class178.bufferY[var12] = var5; - var12 = var12 + 1 & 4095; - class178.directions[var14 + 1][var15] = 8; - class178.distances[var14 + 1][var15] = var18; - } - - if (var15 > 0 && class178.directions[var14][var15 - 1] == 0 && (var13[var16][var17 - 1] & 19136782) == 0 && (var13[var16 + 1][var17 - 1] & 19136899) == 0) { - class178.bufferX[var12] = var4; - class178.bufferY[var12] = var5 - 1; - var12 = var12 + 1 & 4095; - class178.directions[var14][var15 - 1] = 1; - class178.distances[var14][var15 - 1] = var18; - } - - if (var15 < 126 && class178.directions[var14][var15 + 1] == 0 && (var13[var16][var17 + 2] & 19136824) == 0 && (var13[var16 + 1][var17 + 2] & 19136992) == 0) { - class178.bufferX[var12] = var4; - class178.bufferY[var12] = var5 + 1; - var12 = var12 + 1 & 4095; - class178.directions[var14][var15 + 1] = 4; - class178.distances[var14][var15 + 1] = var18; - } - - if (var14 > 0 && var15 > 0 && class178.directions[var14 - 1][var15 - 1] == 0 && (var13[var16 - 1][var17] & 19136830) == 0 && (var13[var16 - 1][var17 - 1] & 19136782) == 0 && (var13[var16][var17 - 1] & 19136911) == 0) { - class178.bufferX[var12] = var4 - 1; - class178.bufferY[var12] = var5 - 1; - var12 = var12 + 1 & 4095; - class178.directions[var14 - 1][var15 - 1] = 3; - class178.distances[var14 - 1][var15 - 1] = var18; - } - - if (var14 < 126 && var15 > 0 && class178.directions[var14 + 1][var15 - 1] == 0 && (var13[var16 + 1][var17 - 1] & 19136911) == 0 && (var13[var16 + 2][var17 - 1] & 19136899) == 0 && (var13[var16 + 2][var17] & 19136995) == 0) { - class178.bufferX[var12] = var4 + 1; - class178.bufferY[var12] = var5 - 1; - var12 = var12 + 1 & 4095; - class178.directions[var14 + 1][var15 - 1] = 9; - class178.distances[var14 + 1][var15 - 1] = var18; - } - - if (var14 > 0 && var15 < 126 && class178.directions[var14 - 1][var15 + 1] == 0 && (var13[var16 - 1][var17 + 1] & 19136830) == 0 && (var13[var16 - 1][var17 + 2] & 19136824) == 0 && (var13[var16][var17 + 2] & 19137016) == 0) { - class178.bufferX[var12] = var4 - 1; - class178.bufferY[var12] = var5 + 1; - var12 = var12 + 1 & 4095; - class178.directions[var14 - 1][var15 + 1] = 6; - class178.distances[var14 - 1][var15 + 1] = var18; - } - - if (var14 < 126 && var15 < 126 && class178.directions[var14 + 1][var15 + 1] == 0 && (var13[var16 + 1][var17 + 2] & 19137016) == 0 && (var13[var16 + 2][var17 + 2] & 19136992) == 0 && (var13[var16 + 2][var17 + 1] & 19136995) == 0) { - class178.bufferX[var12] = var4 + 1; - class178.bufferY[var12] = var5 + 1; - var12 = var12 + 1 & 4095; - class178.directions[var14 + 1][var15 + 1] = 12; - class178.distances[var14 + 1][var15 + 1] = var18; - } + int var0; + for (var0 = 0; var0 < 2048; ++var0) { + Players.field733[var0] = null; + Players.field732[var0] = 1; } - InterfaceParent.field986 = var4; - UrlRequester.field929 = var5; - return false; - } + for (var0 = 0; var0 < 2048; ++var0) { + Client.players[var0] = null; + } - @ObfuscatedName("hc") - @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)V", - garbageValue = "-1850233906" - ) - static void method583(int var0, String var1) { - int var2 = Players.Players_count; - int[] var3 = Players.Players_indices; - boolean var4 = false; - Username var5 = new Username(var1, KeyHandler.loginType); + for (var0 = 0; var0 < 32768; ++var0) { + Client.npcs[var0] = null; + } - 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(var5)) { - PacketBufferNode var8; - if (var0 == 1) { - var8 = Interpreter.method1915(ClientPacket.field269, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3[var6]); - var8.packetBuffer.method56(0); - Client.packetWriter.method241(var8); - } else if (var0 == 4) { - var8 = Interpreter.method1915(ClientPacket.field249, Client.packetWriter.isaacCipher); - var8.packetBuffer.method64(var3[var6]); - var8.packetBuffer.method56(0); - Client.packetWriter.method241(var8); - } else if (var0 == 6) { - var8 = Interpreter.method1915(ClientPacket.field315, Client.packetWriter.isaacCipher); - var8.packetBuffer.method63(var3[var6]); - var8.packetBuffer.method57(0); - Client.packetWriter.method241(var8); - } else if (var0 == 7) { - var8 = Interpreter.method1915(ClientPacket.field297, Client.packetWriter.isaacCipher); - var8.packetBuffer.method57(0); - var8.packetBuffer.writeShortLE(var3[var6]); - Client.packetWriter.method241(var8); + Client.combatTargetPlayerIndex = -1; + Client.projectiles.clear(); + Client.graphicsObjects.clear(); + + for (var0 = 0; var0 < 4; ++var0) { + for (int var1 = 0; var1 < 104; ++var1) { + for (int var2 = 0; var2 < 104; ++var2) { + Client.groundItems[var0][var1][var2] = null; } - - var4 = true; - break; } } - if (!var4) { - WorldMapIcon1.addGameMessage(4, "", "Unable to find " + var1); + Client.pendingSpawns = new NodeDeque(); + WorldMapArea.friendSystem.clear(); + + for (var0 = 0; var0 < VarpDefinition.field944; ++var0) { + VarpDefinition var3 = SecureRandomCallable.method1140(var0); + if (var3 != null) { + Varps.Varps_temp[var0] = 0; + Varps.Varps_main[var0] = 0; + } } + class196.varcs.clearTransient(); + Client.followerIndex = -1; + if (Client.rootInterface != -1) { + AbstractByteArrayCopier.unloadInterface(Client.rootInterface); + } + + for (InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.first(); var4 != null; var4 = (InterfaceParent)Client.interfaceParents.next()) { + MenuAction.closeInterface(var4, true); + } + + Client.rootInterface = -1; + Client.interfaceParents = new NodeHashTable(8); + Client.field127 = null; + Client.menuOptionsCount = 0; + Client.isMenuOpen = false; + Client.field119.method256((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); + + for (var0 = 0; var0 < 8; ++var0) { + Client.playerMenuActions[var0] = null; + Client.playerOptionsPriorities[var0] = false; + } + + SpriteMask.method4389(); + Client.isLoading = true; + + for (var0 = 0; var0 < 100; ++var0) { + Client.field100[var0] = true; + } + + AbstractByteArrayCopier.method4024(); + PacketWriter.clanChat = null; + + for (var0 = 0; var0 < 8; ++var0) { + Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); + } + + FloorDecoration.grandExchangeEvents = null; } } diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java index 3122fa5e65..1f50642d0f 100644 --- a/runescape-client/src/main/java/WorldMapSection3.java +++ b/runescape-client/src/main/java/WorldMapSection3.java @@ -4,73 +4,86 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("p") +@ObfuscatedName("y") @Implements("WorldMapSection3") public class WorldMapSection3 implements WorldMapSection { - @ObfuscatedName("h") - @Export("osNameLowerCase") - public static String osNameLowerCase; - @ObfuscatedName("dr") - @ObfuscatedSignature( - signature = "Lit;" - ) - @Export("archive8") - static Archive archive8; - @ObfuscatedName("go") + @ObfuscatedName("sn") @ObfuscatedGetter( - intValue = -948290091 + intValue = -1946112139 ) - static int field1089; + static int field1055; + @ObfuscatedName("p") + static int[] field1056; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1389733201 + intValue = -2011838881 ) - int field1090; + int field1057; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1622972483 + intValue = 1299225715 ) - int field1091; + int field1058; @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 702057599 + intValue = 82600709 ) - int field1092; + int field1059; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1068088609 + intValue = -477370575 ) - int field1093; + int field1060; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1257151629 + intValue = -671345527 ) - int field1094; + int field1061; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1351623663 + intValue = 529427495 ) - int field1095; + int field1062; @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1016557381 + intValue = -150870205 ) - int field1096; + int field1063; @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 884736611 + intValue = 1009718107 ) - int field1097; + int field1064; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 395786901 + intValue = -1022177315 ) - int field1098; + int field1065; @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -627081155 + intValue = -1397517463 ) - int field1099; + int field1066; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -799353317 + ) + int field1067; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1388959491 + ) + int field1068; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1657956317 + ) + int field1069; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 1345061881 + ) + int field1070; @ObfuscatedName("m") @ObfuscatedSignature( @@ -78,21 +91,21 @@ public class WorldMapSection3 implements WorldMapSection { garbageValue = "1384899025" ) @Export("expandBounds") - public void expandBounds(WorldMapArea var1) { - if (var1.minX0 > this.field1096) { - var1.minX0 = this.field1096; + public void expandBounds(WorldMapArea area) { + if (area.minX0 > this.field1061) { + area.minX0 = this.field1061; } - if (var1.maxX0 < this.field1098) { - var1.maxX0 = this.field1098; + if (area.maxX0 < this.field1061) { + area.maxX0 = this.field1061; } - if (var1.minY0 > this.field1097) { - var1.minY0 = this.field1097; + if (area.minY0 > this.field1062) { + area.minY0 = this.field1062; } - if (var1.maxY0 < this.field1099) { - var1.maxY0 = this.field1099; + if (area.maxY0 < this.field1062) { + area.maxY0 = this.field1062; } } @@ -103,8 +116,8 @@ public class WorldMapSection3 implements WorldMapSection { garbageValue = "93" ) @Export("containsCoord") - public boolean containsCoord(int var1, int var2, int var3) { - return var1 >= this.field1090 && var1 < this.field1090 + this.field1091 ? var2 >> 6 >= this.field1092 && var2 >> 6 <= this.field1094 && var3 >> 6 >= this.field1093 && var3 >> 6 <= this.field1095 : false; + public boolean containsCoord(int plane, int x, int y) { + return plane >= this.field1057 && plane < this.field1057 + this.field1058 ? x >= (this.field1059 << 6) + (this.field1063 << 3) && x <= (this.field1059 << 6) + (this.field1065 << 3) + 7 && y >= (this.field1060 << 6) + (this.field1064 << 3) && y <= (this.field1060 << 6) + (this.field1066 << 3) + 7 : false; } @ObfuscatedName("q") @@ -113,8 +126,8 @@ public class WorldMapSection3 implements WorldMapSection { garbageValue = "4" ) @Export("containsPosition") - public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.field1096 && var1 >> 6 <= this.field1098 && var2 >> 6 >= this.field1097 && var2 >> 6 <= this.field1099; + public boolean containsPosition(int x, int y) { + return x >= (this.field1061 << 6) + (this.field1067 << 3) && x <= (this.field1061 << 6) + (this.field1069 << 3) + 7 && y >= (this.field1062 << 6) + (this.field1068 << 3) && y <= (this.field1062 << 6) + (this.field1070 << 3) + 7; } @ObfuscatedName("w") @@ -123,11 +136,11 @@ public class WorldMapSection3 implements WorldMapSection { garbageValue = "1545934424" ) @Export("position") - public int[] position(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { + public int[] position(int plane, int x, int y) { + if (!this.containsCoord(plane, x, y)) { return null; } else { - int[] var4 = new int[]{this.field1096 * 64 - this.field1092 * 64 + var2, var3 + (this.field1097 * 64 - this.field1093 * 64)}; + int[] var4 = new int[]{this.field1061 * 64 - this.field1059 * 64 + x + (this.field1067 * 8 - this.field1063 * 8), y + (this.field1062 * 64 - this.field1060 * 64) + (this.field1068 * 8 - this.field1064 * 8)}; return var4; } } @@ -138,13 +151,13 @@ public class WorldMapSection3 implements WorldMapSection { garbageValue = "-1916486802" ) @Export("coord") - public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { + public Coord coord(int x, int y) { + if (!this.containsPosition(x, y)) { return null; } else { - int var3 = this.field1092 * 64 - this.field1096 * 64 + var1; - int var4 = this.field1093 * 64 - this.field1097 * 64 + var2; - return new Coord(this.field1090, var3, var4); + int var3 = this.field1059 * 64 - this.field1061 * 64 + (this.field1063 * 8 - this.field1067 * 8) + x; + int var4 = this.field1060 * 64 - this.field1062 * 64 + y + (this.field1064 * 8 - this.field1068 * 8); + return new Coord(this.field1057, var3, var4); } } @@ -154,110 +167,116 @@ public class WorldMapSection3 implements WorldMapSection { garbageValue = "-113" ) @Export("read") - public void read(Buffer var1) { - this.field1090 = var1.readUnsignedByte(); - this.field1091 = var1.readUnsignedByte(); - this.field1092 = var1.readUnsignedShort(); - this.field1093 = var1.readUnsignedShort(); - this.field1094 = var1.readUnsignedShort(); - this.field1095 = var1.readUnsignedShort(); - this.field1096 = var1.readUnsignedShort(); - this.field1097 = var1.readUnsignedShort(); - this.field1098 = var1.readUnsignedShort(); - this.field1099 = var1.readUnsignedShort(); - this.method426(); + public void read(Buffer buffer) { + this.field1057 = buffer.readUnsignedByte(); + this.field1058 = buffer.readUnsignedByte(); + this.field1059 = buffer.readUnsignedShort(); + this.field1063 = buffer.readUnsignedByte(); + this.field1065 = buffer.readUnsignedByte(); + this.field1060 = buffer.readUnsignedShort(); + this.field1064 = buffer.readUnsignedByte(); + this.field1066 = buffer.readUnsignedByte(); + this.field1061 = buffer.readUnsignedShort(); + this.field1067 = buffer.readUnsignedByte(); + this.field1069 = buffer.readUnsignedByte(); + this.field1062 = buffer.readUnsignedShort(); + this.field1068 = buffer.readUnsignedByte(); + this.field1070 = buffer.readUnsignedByte(); + this.method423(); } @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-126" + signature = "(I)V", + garbageValue = "1967186894" ) - void method426() { + void method423() { } - @ObfuscatedName("d") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lho;II)V", - garbageValue = "1115233428" + signature = "(I)V", + garbageValue = "-2102591569" ) - static final void method345(Widget var0, int var1) { - if (var0.field966 == null) { - throw new RuntimeException(); + @Export("savePreferences") + static void savePreferences() { + AccessFile var0 = null; + + try { + var0 = LoginPacket.getPreferencesFile("", WorldMapRectangle.studioGame.name, true); + Buffer var1 = ReflectionCheck.clientPreferences.toBuffer(); + var0.write(var1.array, 0, var1.index); + } catch (Exception var3) { + } + + try { + if (var0 != null) { + var0.closeSync(true); + } + } catch (Exception var2) { + } + + } + + @ObfuscatedName("hz") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "1886145284" + ) + static final void method245(int var0) { + if (var0 >= 0) { + int var1 = Client.menuArguments1[var0]; + int var2 = Client.menuArguments2[var0]; + int var3 = Client.menuOpcodes[var0]; + int var4 = Client.menuArguments0[var0]; + String var5 = Client.menuActions[var0]; + String var6 = Client.menuTargetNames[var0]; + Actor.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + } + + } + + @ObfuscatedName("io") + @ObfuscatedSignature( + signature = "(Lho;IIIIIII)V", + garbageValue = "-1723792771" + ) + static final void method246(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Client.field188) { + Client.field189 = 32; } else { - if (var0.field984 == null) { - var0.field984 = new int[var0.field966.length]; - } - - var0.field984[var1] = Integer.MAX_VALUE; + Client.field189 = 0; } - } - @ObfuscatedName("am") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "23" - ) - @Export("runWidgetOnLoadListener") - static void runWidgetOnLoadListener(int var0) { - if (var0 != -1 && GroundItemPile.loadInterface(var0)) { - Widget[] var1 = Widget.interfaceComponents[var0]; - - for (int var2 = 0; var2 < var1.length; ++var2) { - Widget var3 = var1[var2]; - if (var3.onLoad != null) { - ScriptEvent var4 = new ScriptEvent(); - var4.widget = var3; - var4.args0 = var3.onLoad; - GrandExchangeEvent.runScript0(var4, 5000000); + Client.field188 = false; + int var7; + 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; + WorldMapRectangle.method295(var0); + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { + var0.scrollY += 4; + WorldMapRectangle.method295(var0); + } else if (var5 >= var1 - Client.field189 && var5 < Client.field189 + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { + var7 = var3 * (var3 - 32) / var4; + if (var7 < 8) { + var7 = 8; } + + int var8 = var6 - var2 - 16 - var7 / 2; + int var9 = var3 - 32 - var7; + var0.scrollY = var8 * (var4 - var3) / var9; + WorldMapRectangle.method295(var0); + Client.field188 = true; } } - } - - @ObfuscatedName("ic") - @ObfuscatedSignature( - signature = "(Lho;IIZB)V", - garbageValue = "-35" - ) - @Export("alignWidgetSize") - static void alignWidgetSize(Widget component, int parentWidth, int parentHeight, boolean var3) { - int var4 = component.width; - int var5 = component.height; - if (component.widthAlignment == 0) { - component.width = component.rawWidth; - } else if (component.widthAlignment == 1) { - component.width = parentWidth - component.rawWidth; - } else if (component.widthAlignment == 2) { - component.width = component.rawWidth * parentWidth >> 14; - } - - if (component.heightAlignment == 0) { - component.height = component.rawHeight; - } else if (component.heightAlignment == 1) { - component.height = parentHeight - component.rawHeight; - } else if (component.heightAlignment == 2) { - component.height = parentHeight * component.rawHeight >> 14; - } - - if (component.widthAlignment == 4) { - component.width = component.height * component.field958 / component.field959; - } - - if (component.heightAlignment == 4) { - component.height = component.width * component.field959 / component.field958; - } - - if (component.contentType == 1337) { - Client.viewportWidget = component; - } - - if (var3 && component.onResize != null && (var4 != component.width || var5 != component.height)) { - ScriptEvent var6 = new ScriptEvent(); - var6.widget = component; - var6.args0 = component.onResize; - Client.scriptEvents.addFirst(var6); + if (Client.mouseWheelRotation != 0) { + var7 = var0.width; + if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { + var0.scrollY += Client.mouseWheelRotation * 45; + WorldMapRectangle.method295(var0); + } } } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index f22ace252c..30441ed6bd 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -13,22 +13,26 @@ public enum WorldMapSectionType implements Enumerated { @ObfuscatedSignature( signature = "Lh;" ) - field1100(1, (byte)0), + @Export("WORLDMAPSECTIONTYPE0") + WORLDMAPSECTIONTYPE0(1, (byte)0), @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lh;" ) - field1101(0, (byte)1), + @Export("WORLDMAPSECTIONTYPE1") + WORLDMAPSECTIONTYPE1(0, (byte)1), @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lh;" ) - field1102(3, (byte)2), + @Export("WORLDMAPSECTIONTYPE2") + WORLDMAPSECTIONTYPE2(3, (byte)2), @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lh;" ) - field1103(2, (byte)3); + @Export("WORLDMAPSECTIONTYPE3") + WORLDMAPSECTIONTYPE3(2, (byte)3); @ObfuscatedName("e") @ObfuscatedSignature( @@ -71,15 +75,15 @@ public enum WorldMapSectionType implements Enumerated { @ObfuscatedName("m") public static String method252(long var0) { - class211.field1126.setTime(new Date(var0)); - int var2 = class211.field1126.get(7); - int var3 = class211.field1126.get(5); - int var4 = class211.field1126.get(2); - int var5 = class211.field1126.get(1); - int var6 = class211.field1126.get(11); - int var7 = class211.field1126.get(12); - int var8 = class211.field1126.get(13); - return class211.field1125[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + class211.field1124[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; + Calendar.Calendar_calendar.setTime(new Date(var0)); + int var2 = Calendar.Calendar_calendar.get(7); + int var3 = Calendar.Calendar_calendar.get(5); + int var4 = Calendar.Calendar_calendar.get(2); + int var5 = Calendar.Calendar_calendar.get(1); + int var6 = Calendar.Calendar_calendar.get(11); + int var7 = Calendar.Calendar_calendar.get(12); + int var8 = Calendar.Calendar_calendar.get(13); + return Calendar.DAYS_OF_THE_WEEK[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; } @ObfuscatedName("w") diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 7a52970d1d..0ad3f3a622 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -93,7 +93,7 @@ final class class1 implements class0 { 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); + WorldMapRectangle.method295(var4); TextureProvider.client.alignWidget(var4); if (var3 != -1 && var4.type == 0) { class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false); @@ -106,7 +106,7 @@ final class class1 implements class0 { 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); + WorldMapRectangle.method295(var4); TextureProvider.client.alignWidget(var4); if (var3 != -1 && var4.type == 0) { class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false); @@ -117,7 +117,7 @@ final class class1 implements class0 { boolean var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if (var5 != var4.isHidden) { var4.isHidden = var5; - class22.method295(var4); + WorldMapRectangle.method295(var4); } return 1; @@ -228,7 +228,7 @@ final class class1 implements class0 { String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class50.method900(var7, var4 == 1); - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection0.field1055; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection3.field1055; return 1; } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { if (var0 == ScriptOpcodes.OC_FINDRESET) { @@ -238,7 +238,7 @@ final class class1 implements class0 { return 2; } } else { - if (AttackOption.field30 != null && WorldMapDecorationType.field1139 < WorldMapSection0.field1055) { + if (AttackOption.field30 != null && WorldMapDecorationType.field1139 < WorldMapSection3.field1055) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = AttackOption.field30[++WorldMapDecorationType.field1139 - 1] & '\uffff'; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java index d8eb31073f..beec47d32f 100644 --- a/runescape-client/src/main/java/class15.java +++ b/runescape-client/src/main/java/class15.java @@ -62,7 +62,7 @@ public class class15 extends class21 { super.field145 = new short[super.field156][64][64]; super.field154 = new byte[super.field156][64][64]; super.field155 = new byte[super.field156][64][64]; - super.field144 = new WorldMapDecoration[super.field156][64][64][]; + super.decorations = new WorldMapDecoration[super.field156][64][64][]; int var2 = var1.readUnsignedByte(); if (var2 != class30.field246.field248) { throw new IllegalStateException(""); @@ -123,7 +123,7 @@ public class class15 extends class21 { static int method182(int var0, Script var1, boolean var2) { Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class211.method4107(class1.getWidgetClickMask(var3)); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Calendar.method4107(class1.getWidgetClickMask(var3)); return 1; } else if (var0 != ScriptOpcodes.IF_GETOP) { if (var0 == ScriptOpcodes.IF_GETOPBASE) { diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 6b30dbe49d..d3099181eb 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -64,7 +64,7 @@ public class class16 { static int method188(int var0, Script var1, boolean var2) { Widget var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class211.method4107(class1.getWidgetClickMask(var3)); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Calendar.method4107(class1.getWidgetClickMask(var3)); return 1; } else if (var0 != ScriptOpcodes.CC_GETOP) { if (var0 == ScriptOpcodes.CC_GETOPBASE) { @@ -122,7 +122,7 @@ public class class16 { var9 = var1.method65(); var10 = var1.method61(); var11 = var1.readUnsignedByteNegate(); - int var15 = (var11 >> 4 & 7) + WorldMapSection3.field1089; + int var15 = (var11 >> 4 & 7) + WorldMapSection1.field1089; int var16 = (var11 & 7) + Canvas.field95; Player var17; if (var9 == Client.localPlayerIndex) { @@ -185,7 +185,7 @@ public class class16 { int var32; if (class190.field2349 == var0) { var31 = var1.method58(); - var2 = (var31 >> 4 & 7) + WorldMapSection3.field1089; + var2 = (var31 >> 4 & 7) + WorldMapSection1.field1089; var32 = (var31 & 7) + Canvas.field95; var3 = var1.method59(); var4 = var3 >> 2; @@ -198,7 +198,7 @@ public class class16 { } else { if (class190.field2345 == var0) { var31 = var1.readUnsignedByte(); - var2 = (var31 >> 4 & 7) + WorldMapSection3.field1089; + var2 = (var31 >> 4 & 7) + WorldMapSection1.field1089; var32 = (var31 & 7) + Canvas.field95; var3 = var1.method59(); var4 = var1.method58(); @@ -223,7 +223,7 @@ public class class16 { var2 = var1.method58(); var32 = var1.method66(); var3 = var1.readUnsignedByte(); - var4 = (var3 >> 4 & 7) + WorldMapSection3.field1089; + var4 = (var3 >> 4 & 7) + WorldMapSection1.field1089; var5 = (var3 & 7) + Canvas.field95; if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { var4 = var4 * 128 + 64; @@ -239,7 +239,7 @@ public class class16 { var32 = var31 & 3; var3 = Client.field182[var2]; var4 = var1.readUnsignedByteNegate(); - var5 = (var4 >> 4 & 7) + WorldMapSection3.field1089; + var5 = (var4 >> 4 & 7) + WorldMapSection1.field1089; var6 = (var4 & 7) + Canvas.field95; var7 = var1.readUnsignedShort(); if (var5 >= 0 && var6 >= 0 && var5 < 103 && var6 < 103) { @@ -298,7 +298,7 @@ public class class16 { NodeDeque var40; if (class190.field2347 == var0) { var31 = var1.method58(); - var2 = (var31 >> 4 & 7) + WorldMapSection3.field1089; + var2 = (var31 >> 4 & 7) + WorldMapSection1.field1089; var32 = (var31 & 7) + Canvas.field95; var3 = var1.method67(); if (var2 >= 0 && var32 >= 0 && var2 < 104 && var32 < 104) { @@ -324,7 +324,7 @@ public class class16 { var32 = var31 & 3; var3 = Client.field182[var2]; var4 = var1.method59(); - var5 = (var4 >> 4 & 7) + WorldMapSection3.field1089; + var5 = (var4 >> 4 & 7) + WorldMapSection1.field1089; var6 = (var4 & 7) + Canvas.field95; if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { class258.method4898(SoundSystem.plane, var5, var6, var3, -1, var2, var32, 0, -1); @@ -339,7 +339,7 @@ public class class16 { var6 = var1.method59(); var7 = var1.method65(); var8 = var1.method58(); - var35 = (var8 >> 4 & 7) + WorldMapSection3.field1089; + var35 = (var8 >> 4 & 7) + WorldMapSection1.field1089; var9 = (var8 & 7) + Canvas.field95; var10 = var1.method60(); byte var41 = var1.method61(); @@ -359,7 +359,7 @@ public class class16 { var31 = var1.method66(); var2 = var1.method67(); var32 = var1.method58(); - var3 = (var32 >> 4 & 7) + WorldMapSection3.field1089; + var3 = (var32 >> 4 & 7) + WorldMapSection1.field1089; var4 = (var32 & 7) + Canvas.field95; if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { var38 = new GroundItem(); @@ -378,7 +378,7 @@ public class class16 { var2 = var1.method67(); var32 = var1.method65(); var3 = var1.method58(); - var4 = (var3 >> 4 & 7) + WorldMapSection3.field1089; + var4 = (var3 >> 4 & 7) + WorldMapSection1.field1089; var5 = (var3 & 7) + Canvas.field95; if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { var40 = Client.groundItems[SoundSystem.plane][var4][var5]; @@ -526,7 +526,7 @@ public class class16 { if (var6 == 14) { var9 = var2[var4++]; - var7 = WorldMapSection2.getVarbit(var9); + var7 = WorldMapSection0.getVarbit(var9); } if (var6 == 15) { diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index 51e80c8a4b..3de5f3d753 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -99,26 +99,26 @@ public class class171 { Login.Login_loadingPercent = 10; Client.titleLoadingStage = 30; } else if (Client.titleLoadingStage == 30) { - AbstractArchive.archive0 = class22.newArchive(0, false, true, true); - Skeleton.archive1 = class22.newArchive(1, false, true, true); - ObjectSound.archive2 = class22.newArchive(2, true, false, true); - WorldMapIcon1.archive3 = class22.newArchive(3, false, true, true); - WorldMapDecoration.archive4 = class22.newArchive(4, false, true, true); - SecureRandomFuture.archive5 = class22.newArchive(5, true, true, true); - UserComparator3.archive6 = class22.newArchive(6, true, true, true); - class40.archive7 = class22.newArchive(7, false, true, true); - WorldMapSection3.archive8 = class22.newArchive(8, false, true, true); - class238.archive9 = class22.newArchive(9, false, true, true); - class16.archive10 = class22.newArchive(10, false, true, true); - Login.archive11 = class22.newArchive(11, false, true, true); - Formatting.archive12 = class22.newArchive(12, false, true, true); - ByteArrayPool.archive13 = class22.newArchive(13, true, false, true); - class2.archive14 = class22.newArchive(14, false, true, true); - WorldMapSection1.archive15 = class22.newArchive(15, false, true, true); - class22.archive16 = class22.newArchive(17, true, true, true); - WorldMapLabelSize.field1040 = class22.newArchive(18, false, true, true); - ItemContainer.field434 = class22.newArchive(19, false, true, true); - AbstractByteArrayCopier.field0 = class22.newArchive(20, false, true, true); + AbstractArchive.archive0 = WorldMapRectangle.newArchive(0, false, true, true); + Skeleton.archive1 = WorldMapRectangle.newArchive(1, false, true, true); + ObjectSound.archive2 = WorldMapRectangle.newArchive(2, true, false, true); + WorldMapIcon1.archive3 = WorldMapRectangle.newArchive(3, false, true, true); + WorldMapDecoration.archive4 = WorldMapRectangle.newArchive(4, false, true, true); + SecureRandomFuture.archive5 = WorldMapRectangle.newArchive(5, true, true, true); + UserComparator3.archive6 = WorldMapRectangle.newArchive(6, true, true, true); + class40.archive7 = WorldMapRectangle.newArchive(7, false, true, true); + WorldMapSection1.archive8 = WorldMapRectangle.newArchive(8, false, true, true); + class238.archive9 = WorldMapRectangle.newArchive(9, false, true, true); + class16.archive10 = WorldMapRectangle.newArchive(10, false, true, true); + Login.archive11 = WorldMapRectangle.newArchive(11, false, true, true); + Formatting.archive12 = WorldMapRectangle.newArchive(12, false, true, true); + ByteArrayPool.archive13 = WorldMapRectangle.newArchive(13, true, false, true); + class2.archive14 = WorldMapRectangle.newArchive(14, false, true, true); + WorldMapSection2.archive15 = WorldMapRectangle.newArchive(15, false, true, true); + WorldMapRectangle.archive16 = WorldMapRectangle.newArchive(17, true, true, true); + WorldMapLabelSize.field1040 = WorldMapRectangle.newArchive(18, false, true, true); + ItemContainer.field434 = WorldMapRectangle.newArchive(19, false, true, true); + AbstractByteArrayCopier.field0 = WorldMapRectangle.newArchive(20, false, true, true); Login.Login_loadingText = "Connecting to update server"; Login.Login_loadingPercent = 20; Client.titleLoadingStage = 40; @@ -132,18 +132,18 @@ public class class171 { var0 += SecureRandomFuture.archive5.percentage() * 4 / 100; var0 += UserComparator3.archive6.percentage() * 2 / 100; var0 += class40.archive7.percentage() * 56 / 100; - var0 += WorldMapSection3.archive8.percentage() * 2 / 100; + var0 += WorldMapSection1.archive8.percentage() * 2 / 100; var0 += class238.archive9.percentage() * 2 / 100; var0 += class16.archive10.percentage() * 2 / 100; var0 += Login.archive11.percentage() * 2 / 100; var0 += Formatting.archive12.percentage() * 2 / 100; var0 += ByteArrayPool.archive13.percentage() * 2 / 100; var0 += class2.archive14.percentage() * 2 / 100; - var0 += WorldMapSection1.archive15.percentage() * 2 / 100; + var0 += WorldMapSection2.archive15.percentage() * 2 / 100; var0 += ItemContainer.field434.percentage() / 100; var0 += WorldMapLabelSize.field1040.percentage() / 100; var0 += AbstractByteArrayCopier.field0.percentage() / 100; - var0 += class22.archive16.method130() && class22.archive16.method2() ? 1 : 0; + var0 += WorldMapRectangle.archive16.method130() && WorldMapRectangle.archive16.method2() ? 1 : 0; if (var0 != 100) { if (var0 != 0) { Login.Login_loadingText = "Checking for updates - " + var0 + "%"; @@ -157,15 +157,15 @@ public class class171 { AbstractWorldMapIcon.method625(SecureRandomFuture.archive5, "Maps"); AbstractWorldMapIcon.method625(UserComparator3.archive6, "Music Tracks"); AbstractWorldMapIcon.method625(class40.archive7, "Models"); - AbstractWorldMapIcon.method625(WorldMapSection3.archive8, "Sprites"); + AbstractWorldMapIcon.method625(WorldMapSection1.archive8, "Sprites"); AbstractWorldMapIcon.method625(Login.archive11, "Music Jingles"); AbstractWorldMapIcon.method625(class2.archive14, "Music Samples"); - AbstractWorldMapIcon.method625(WorldMapSection1.archive15, "Music Patches"); + AbstractWorldMapIcon.method625(WorldMapSection2.archive15, "Music Patches"); AbstractWorldMapIcon.method625(ItemContainer.field434, "World Map"); AbstractWorldMapIcon.method625(WorldMapLabelSize.field1040, "World Map Geography"); AbstractWorldMapIcon.method625(AbstractByteArrayCopier.field0, "World Map Ground"); - class211.spriteIds = new GraphicsDefaults(); - class211.spriteIds.decode(class22.archive16); + Calendar.spriteIds = new GraphicsDefaults(); + Calendar.spriteIds.decode(WorldMapRectangle.archive16); Login.Login_loadingText = "Loaded update list"; Login.Login_loadingPercent = 30; Client.titleLoadingStage = 45; @@ -176,7 +176,7 @@ public class class171 { var28.method174(9, 128); WorldMapCacheName.pcmPlayer0 = Players.newPcmPlayer(GameShell.taskHandler, 0, 22050); WorldMapCacheName.pcmPlayer0.setStream(var28); - NetSocket.method3537(WorldMapSection1.archive15, class2.archive14, WorldMapDecoration.archive4, var28); + NetSocket.method3537(WorldMapSection2.archive15, class2.archive14, WorldMapDecoration.archive4, var28); AbstractArchive.pcmPlayer1 = Players.newPcmPlayer(GameShell.taskHandler, 1, 2048); TaskHandler.pcmStreamMixer = new PcmStreamMixer(); AbstractArchive.pcmPlayer1.setStream(TaskHandler.pcmStreamMixer); @@ -184,13 +184,13 @@ public class class171 { Login.Login_loadingText = "Prepared sound engine"; Login.Login_loadingPercent = 35; Client.titleLoadingStage = 50; - WorldMapElement.fonts = new Fonts(WorldMapSection3.archive8, ByteArrayPool.archive13); + WorldMapElement.WorldMapElement_fonts = new Fonts(WorldMapSection1.archive8, ByteArrayPool.archive13); } else { int var29; if (Client.titleLoadingStage == 50) { FontName[] var2 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13}; var29 = var2.length; - Fonts var3 = WorldMapElement.fonts; + Fonts var3 = WorldMapElement.WorldMapElement_fonts; FontName[] var4 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13}; Client.fontsMap = var3.createMap(var4); if (Client.fontsMap.size() < var29) { @@ -206,7 +206,7 @@ public class class171 { Client.titleLoadingStage = 60; } } else if (Client.titleLoadingStage == 60) { - var0 = FloorDecoration.method2853(class16.archive10, WorldMapSection3.archive8); + var0 = FloorDecoration.method2853(class16.archive10, WorldMapSection1.archive8); var29 = class3.method36(); if (var0 < var29) { Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var29 + "%"; @@ -260,7 +260,7 @@ public class class171 { VarpDefinition.field944 = VarpDefinition.field943.method4(16); Archive var15 = WorldMapIcon1.archive3; Archive var16 = class40.archive7; - Archive var17 = WorldMapSection3.archive8; + Archive var17 = WorldMapSection1.archive8; Archive var18 = ByteArrayPool.archive13; Widget.Widget_archive = var15; BufferedSource.field54 = var16; @@ -269,20 +269,20 @@ public class class171 { Widget.interfaceComponents = new Widget[Widget.Widget_archive.method5()][]; Widget.loadedInterfaces = new boolean[Widget.Widget_archive.method5()]; Archive var19 = ObjectSound.archive2; - class4.field1158 = var19; + class4.InvDefinition_archive = var19; Archive var20 = ObjectSound.archive2; EnumDefinition.EnumDefinition_archive = var20; Frames.method3241(ObjectSound.archive2); Archive var21 = ObjectSound.archive2; ParamDefinition.ParamDefinition_archive = var21; class196.varcs = new Varcs(); - class60.method1172(ObjectSound.archive2, WorldMapSection3.archive8, ByteArrayPool.archive13); + class60.method1172(ObjectSound.archive2, WorldMapSection1.archive8, ByteArrayPool.archive13); Archive var22 = ObjectSound.archive2; - Archive var23 = WorldMapSection3.archive8; + Archive var23 = WorldMapSection1.archive8; HealthBarDefinition.field379 = var22; HealthBarDefinition.field380 = var23; Archive var24 = ObjectSound.archive2; - Archive var25 = WorldMapSection3.archive8; + Archive var25 = WorldMapSection1.archive8; WorldMapElement.WorldMapElement_archive = var25; if (var24.method2()) { UserComparator4.WorldMapElement_count = var24.method4(35); @@ -305,13 +305,13 @@ public class class171 { } else if (Client.titleLoadingStage == 80) { var0 = 0; if (GrandExchangeOfferUnitPriceComparator.compass == null) { - GrandExchangeOfferUnitPriceComparator.compass = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field878, 0); + GrandExchangeOfferUnitPriceComparator.compass = class322.readSprite(WorldMapSection1.archive8, Calendar.spriteIds.field878, 0); } else { ++var0; } if (FaceNormal.field345 == null) { - FaceNormal.field345 = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field879, 0); + FaceNormal.field345 = class322.readSprite(WorldMapSection1.archive8, Calendar.spriteIds.field879, 0); } else { ++var0; } @@ -319,8 +319,8 @@ public class class171 { IndexedSprite[] var32; int var34; if (class192.mapSceneSprites == null) { - var30 = WorldMapSection3.archive8; - var34 = class211.spriteIds.mapScenes; + var30 = WorldMapSection1.archive8; + var34 = Calendar.spriteIds.mapScenes; if (!SpriteMask.loadSprite(var30, var34, 0)) { var32 = null; } else { @@ -334,8 +334,8 @@ public class class171 { Sprite[] var35; if (class15.headIconPkSprites == null) { - var30 = WorldMapSection3.archive8; - var34 = class211.spriteIds.headIconsPk; + var30 = WorldMapSection1.archive8; + var34 = Calendar.spriteIds.headIconsPk; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; } else { @@ -348,8 +348,8 @@ public class class171 { } if (ClientPreferences.headIconPrayerSprites == null) { - var30 = WorldMapSection3.archive8; - var34 = class211.spriteIds.headIconsPrayer; + var30 = WorldMapSection1.archive8; + var34 = Calendar.spriteIds.headIconsPrayer; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; } else { @@ -362,8 +362,8 @@ public class class171 { } if (Player.headIconHintSprites == null) { - var30 = WorldMapSection3.archive8; - var34 = class211.spriteIds.headIconsHint; + var30 = WorldMapSection1.archive8; + var34 = Calendar.spriteIds.headIconsHint; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; } else { @@ -376,8 +376,8 @@ public class class171 { } if (class16.mapMarkerSprites == null) { - var30 = WorldMapSection3.archive8; - var34 = class211.spriteIds.mapMarkers; + var30 = WorldMapSection1.archive8; + var34 = Calendar.spriteIds.mapMarkers; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; } else { @@ -390,8 +390,8 @@ public class class171 { } if (KeyHandler.crossSprites == null) { - var30 = WorldMapSection3.archive8; - var34 = class211.spriteIds.crosses; + var30 = WorldMapSection1.archive8; + var34 = Calendar.spriteIds.crosses; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; } else { @@ -404,8 +404,8 @@ public class class171 { } if (class39.mapDotSprites == null) { - var30 = WorldMapSection3.archive8; - var34 = class211.spriteIds.mapDots; + var30 = WorldMapSection1.archive8; + var34 = Calendar.spriteIds.mapDots; if (!SpriteMask.loadSprite(var30, var34, 0)) { var35 = null; } else { @@ -418,8 +418,8 @@ public class class171 { } if (class32.scrollBarSprites == null) { - var30 = WorldMapSection3.archive8; - var34 = class211.spriteIds.scrollBars; + var30 = WorldMapSection1.archive8; + var34 = Calendar.spriteIds.scrollBars; if (!SpriteMask.loadSprite(var30, var34, 0)) { var32 = null; } else { @@ -432,8 +432,8 @@ public class class171 { } if (WorldMapSectionType.modIconSprites == null) { - var30 = WorldMapSection3.archive8; - var34 = class211.spriteIds.modIcons; + var30 = WorldMapSection1.archive8; + var34 = Calendar.spriteIds.modIcons; if (!SpriteMask.loadSprite(var30, var34, 0)) { var32 = null; } else { @@ -465,7 +465,7 @@ public class class171 { Login.Login_loadingText = "Loading textures - 0%"; Login.Login_loadingPercent = 90; } else { - SecureRandomFuture.textureProvider = new TextureProvider(class238.archive9, WorldMapSection3.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128); + SecureRandomFuture.textureProvider = new TextureProvider(class238.archive9, WorldMapSection1.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128); Rasterizer3D.Rasterizer3D_setTextureLoader(SecureRandomFuture.textureProvider); Rasterizer3D.Rasterizer3D_setBrightness(0.8D); Client.titleLoadingStage = 100; diff --git a/runescape-client/src/main/java/class196.java b/runescape-client/src/main/java/class196.java index 5931b7aa83..5df771cfd5 100644 --- a/runescape-client/src/main/java/class196.java +++ b/runescape-client/src/main/java/class196.java @@ -18,7 +18,7 @@ public class class196 { garbageValue = "125" ) static int method3736(int var0, Script var1, boolean var2) { - return var0 < 1000 ? Canvas.method861(var0, var1, var2) : (var0 < 1100 ? class1.method8(var0, var1, var2) : (var0 < 1200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 1300 ? class32.method576(var0, var1, var2) : (var0 < 1400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 1500 ? GrandExchangeOfferNameComparator.method141(var0, var1, var2) : (var0 < 1600 ? WorldMapSectionType.method253(var0, var1, var2) : (var0 < 1700 ? ScriptEvent.method1185(var0, var1, var2) : (var0 < 1800 ? Formatting.method2023(var0, var1, var2) : (var0 < 1900 ? class16.method188(var0, var1, var2) : (var0 < 2000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 2100 ? class1.method8(var0, var1, var2) : (var0 < 2200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 2300 ? class32.method576(var0, var1, var2) : (var0 < 2400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 2500 ? GrandExchangeOfferNameComparator.method141(var0, var1, var2) : (var0 < 2600 ? ViewportMouse.method2983(var0, var1, var2) : (var0 < 2700 ? GrandExchangeEvents.method75(var0, var1, var2) : (var0 < 2800 ? GrandExchangeOfferNameComparator.method146(var0, var1, var2) : (var0 < 2900 ? class15.method182(var0, var1, var2) : (var0 < 3000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 3200 ? class4.method54(var0, var1, var2) : (var0 < 3300 ? GrandExchangeOfferWorldComparator.method68(var0, var1, var2) : (var0 < 3400 ? ScriptEvent.method1187(var0, var1, var2) : (var0 < 3500 ? Formatting.method2022(var0, var1, var2) : (var0 < 3700 ? FontName.method5639(var0, var1, var2) : (var0 < 4000 ? class248.method4741(var0, var1, var2) : (var0 < 4100 ? TextureProvider.method2752(var0, var1, var2) : (var0 < 4200 ? class211.method4103(var0, var1, var2) : (var0 < 4300 ? class1.method16(var0, var1, var2) : (var0 < 5100 ? DynamicObject.method2223(var0, var1, var2) : (var0 < 5400 ? UserComparator4.method3335(var0, var1, var2) : (var0 < 5600 ? GrandExchangeOfferOwnWorldComparator.method1285(var0, var1, var2) : (var0 < 5700 ? Decimator.method2492(var0, var1, var2) : (var0 < 6300 ? class229.method4513(var0, var1, var2) : (var0 < 6600 ? class31.method573(var0, var1, var2) : (var0 < 6700 ? class54.method1093(var0, var1, var2) : 2)))))))))))))))))))))))))))))))))))); + return var0 < 1000 ? Canvas.method861(var0, var1, var2) : (var0 < 1100 ? class1.method8(var0, var1, var2) : (var0 < 1200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 1300 ? class32.method576(var0, var1, var2) : (var0 < 1400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 1500 ? GrandExchangeOfferNameComparator.method141(var0, var1, var2) : (var0 < 1600 ? WorldMapSectionType.method253(var0, var1, var2) : (var0 < 1700 ? ScriptEvent.method1185(var0, var1, var2) : (var0 < 1800 ? Formatting.method2023(var0, var1, var2) : (var0 < 1900 ? class16.method188(var0, var1, var2) : (var0 < 2000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 2100 ? class1.method8(var0, var1, var2) : (var0 < 2200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 2300 ? class32.method576(var0, var1, var2) : (var0 < 2400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 2500 ? GrandExchangeOfferNameComparator.method141(var0, var1, var2) : (var0 < 2600 ? ViewportMouse.method2983(var0, var1, var2) : (var0 < 2700 ? GrandExchangeEvents.method75(var0, var1, var2) : (var0 < 2800 ? GrandExchangeOfferNameComparator.method146(var0, var1, var2) : (var0 < 2900 ? class15.method182(var0, var1, var2) : (var0 < 3000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 3200 ? class4.method54(var0, var1, var2) : (var0 < 3300 ? GrandExchangeOfferWorldComparator.method68(var0, var1, var2) : (var0 < 3400 ? ScriptEvent.method1187(var0, var1, var2) : (var0 < 3500 ? Formatting.method2022(var0, var1, var2) : (var0 < 3700 ? FontName.method5639(var0, var1, var2) : (var0 < 4000 ? class248.method4741(var0, var1, var2) : (var0 < 4100 ? TextureProvider.method2752(var0, var1, var2) : (var0 < 4200 ? Calendar.method4103(var0, var1, var2) : (var0 < 4300 ? class1.method16(var0, var1, var2) : (var0 < 5100 ? DynamicObject.method2223(var0, var1, var2) : (var0 < 5400 ? UserComparator4.method3335(var0, var1, var2) : (var0 < 5600 ? GrandExchangeOfferOwnWorldComparator.method1285(var0, var1, var2) : (var0 < 5700 ? Decimator.method2492(var0, var1, var2) : (var0 < 6300 ? class229.method4513(var0, var1, var2) : (var0 < 6600 ? class31.method573(var0, var1, var2) : (var0 < 6700 ? class54.method1093(var0, var1, var2) : 2)))))))))))))))))))))))))))))))))))); } @ObfuscatedName("u") diff --git a/runescape-client/src/main/java/class198.java b/runescape-client/src/main/java/class198.java index 362dfec973..8c993792a7 100644 --- a/runescape-client/src/main/java/class198.java +++ b/runescape-client/src/main/java/class198.java @@ -9,6 +9,6 @@ public class class198 { garbageValue = "1713547686" ) static String method3745(Widget var0) { - return class211.method4107(class1.getWidgetClickMask(var0)) == 0 ? null : (var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null); + return Calendar.method4107(class1.getWidgetClickMask(var0)) == 0 ? null : (var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null); } } diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java index 6fa1f51396..2b38dda583 100644 --- a/runescape-client/src/main/java/class21.java +++ b/runescape-client/src/main/java/class21.java @@ -1,4 +1,5 @@ import java.util.LinkedList; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -59,7 +60,8 @@ public abstract class class21 { @ObfuscatedSignature( signature = "[[[[Lv;" ) - WorldMapDecoration[][][][] field144; + @Export("decorations") + WorldMapDecoration[][][][] decorations; @ObfuscatedName("i") boolean field157; @ObfuscatedName("a") @@ -112,11 +114,11 @@ public abstract class class21 { garbageValue = "-2111523326" ) void method282() { - this.field151 = (short[][][])((short[][][])null); - this.field145 = (short[][][])((short[][][])null); + this.field151 = ((short[][][])null); + this.field145 = ((short[][][])null); this.field154 = ((byte[][][])null); this.field155 = ((byte[][][])null); - this.field144 = (WorldMapDecoration[][][][])((WorldMapDecoration[][][][])null); + this.decorations = ((WorldMapDecoration[][][][])null); this.field157 = false; this.field153 = false; } @@ -183,7 +185,7 @@ public abstract class class21 { for (var8 = 0; var8 < var5; ++var8) { var9 = var3.readUnsignedByte(); if (var9 != 0) { - WorldMapDecoration[] var14 = this.field144[var8][var1][var2] = new WorldMapDecoration[var9]; + WorldMapDecoration[] var14 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; for (var10 = 0; var10 < var9; ++var10) { int var12 = var3.method51(); diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java index 93abb6d2d3..dd236c8353 100644 --- a/runescape-client/src/main/java/class238.java +++ b/runescape-client/src/main/java/class238.java @@ -226,7 +226,7 @@ public final class class238 { class171.method3494(var22 + 1, var9.id, var9.childIndex, var9.itemId, ""); } else if (var22 == 10) { Player.method1281(); - WorldMapDecoration.method350(var9.id, var9.childIndex, class211.method4107(class1.getWidgetClickMask(var9)), var9.itemId); + WorldMapDecoration.method350(var9.id, var9.childIndex, Calendar.method4107(class1.getWidgetClickMask(var9)), var9.itemId); Client.selectedSpellActionName = class198.method3745(var9); if (Client.selectedSpellActionName == null) { Client.selectedSpellActionName = "null"; @@ -557,7 +557,7 @@ public final class class238 { } if (var9.scrollHeight > var9.height) { - WorldMapSection0.method246(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); + WorldMapSection3.method246(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); } } diff --git a/runescape-client/src/main/java/class306.java b/runescape-client/src/main/java/class306.java index 8d43fd8015..5e43864f4f 100644 --- a/runescape-client/src/main/java/class306.java +++ b/runescape-client/src/main/java/class306.java @@ -58,7 +58,7 @@ public final class class306 { ClientPreferences var1 = new ClientPreferences(); try { - var0 = LoginPacket.getPreferencesFile("", class22.studioGame.name, false); + var0 = LoginPacket.getPreferencesFile("", WorldMapRectangle.studioGame.name, false); byte[] var2 = new byte[(int)var0.length()]; int var3; diff --git a/runescape-client/src/main/java/class32.java b/runescape-client/src/main/java/class32.java index 5bce438bb1..e55e10c7de 100644 --- a/runescape-client/src/main/java/class32.java +++ b/runescape-client/src/main/java/class32.java @@ -28,7 +28,7 @@ public class class32 { var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111; } - class22.method295(var3); + WorldMapRectangle.method295(var3); if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { var3.modelType = 2; diff --git a/runescape-client/src/main/java/class39.java b/runescape-client/src/main/java/class39.java index 36ca69390f..e06fd1e3b0 100644 --- a/runescape-client/src/main/java/class39.java +++ b/runescape-client/src/main/java/class39.java @@ -68,7 +68,7 @@ public class class39 extends class21 { super.field145 = new short[super.field156][64][64]; super.field154 = new byte[super.field156][64][64]; super.field155 = new byte[super.field156][64][64]; - super.field144 = new WorldMapDecoration[super.field156][64][64][]; + super.decorations = new WorldMapDecoration[super.field156][64][64][]; int var2 = var1.readUnsignedByte(); if (var2 != class30.field247.field248) { throw new IllegalStateException(""); diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index b23775676d..85b1bbb8a8 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; @@ -8,7 +9,8 @@ final class class4 implements class0 { @ObfuscatedSignature( signature = "Lir;" ) - public static AbstractArchive field1158; + @Export("InvDefinition_archive") + public static AbstractArchive InvDefinition_archive; @ObfuscatedName("m") @ObfuscatedSignature( @@ -52,7 +54,7 @@ final class class4 implements class0 { garbageValue = "-843046456" ) public static void method55() { - FloorOverlayDefinition.field664.clear(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); } @ObfuscatedName("v") @@ -110,7 +112,7 @@ final class class4 implements class0 { if (var0 == ScriptOpcodes.OPPLAYER) { var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - WorldMapSection2.method583(var7, var6); + WorldMapSection0.method583(var7, var6); return 1; } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { RouteStrategy.Interpreter_intStackSize -= 3; @@ -135,7 +137,7 @@ final class class4 implements class0 { return 1; } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { ReflectionCheck.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; - WorldMapSection0.savePreferences(); + WorldMapSection3.savePreferences(); return 1; } else { boolean var8; @@ -268,7 +270,7 @@ final class class4 implements class0 { } else if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; ReflectionCheck.clientPreferences.hideUsername = var8; - WorldMapSection0.savePreferences(); + WorldMapSection3.savePreferences(); return 1; } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.hideUsername ? 1 : 0; @@ -278,7 +280,7 @@ final class class4 implements class0 { Client.Login_isUsernameRemembered = var8; if (!var8) { ReflectionCheck.clientPreferences.rememberedUsername = ""; - WorldMapSection0.savePreferences(); + WorldMapSection3.savePreferences(); } return 1; @@ -291,7 +293,7 @@ final class class4 implements class0 { var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if (var8 == ReflectionCheck.clientPreferences.titleMusicDisabled) { ReflectionCheck.clientPreferences.titleMusicDisabled = !var8; - WorldMapSection0.savePreferences(); + WorldMapSection3.savePreferences(); } return 1; diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java index 5e353ec340..bdb93f4406 100644 --- a/runescape-client/src/main/java/class40.java +++ b/runescape-client/src/main/java/class40.java @@ -31,11 +31,11 @@ public class class40 { signature = "(IIIIIIIIB)V", garbageValue = "125" ) - void method743(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + void method743(int x, int y, int var3, int var4, int width, int height, int var7, int var8) { if (var7 != 0 && this.field326 != 0 && this.field329 != null) { var8 = this.method744(var8, var7); var7 = this.method774(var7); - Rasterizer2D.raster2d7(var1, var2, var5, var6, var3, var4, this.field329[var7 - 1][var8], this.field326); + Rasterizer2D.raster2d7(x, y, width, height, var3, var4, this.field329[var7 - 1][var8], this.field326); } } @@ -755,7 +755,7 @@ public class class40 { var11 = var19; } - WorldMapSection1.cameraX = var6 - var11; + WorldMapSection2.cameraX = var6 - var11; GrandExchangeEvents.cameraY = var14 - var12; GrandExchangeOfferNameComparator.cameraZ = var15 - var16; WorldMapIcon1.cameraPitch = var4; @@ -779,7 +779,7 @@ public class class40 { var4 = Login.method2061(); } - var13 = WorldMapSection1.cameraX; + var13 = WorldMapSection2.cameraX; var6 = GrandExchangeEvents.cameraY; var14 = GrandExchangeOfferNameComparator.cameraZ; var15 = WorldMapIcon1.cameraPitch; @@ -789,7 +789,7 @@ public class class40 { if (Client.field139[var24]) { var9 = (int)(Math.random() * (double)(Client.field141[var24] * 2 + 1) - (double)Client.field141[var24] + Math.sin((double)Client.field144[var24] * ((double)Client.field143[var24] / 100.0D)) * (double)Client.field142[var24]); if (var24 == 0) { - WorldMapSection1.cameraX += var9; + WorldMapSection2.cameraX += var9; } if (var24 == 1) { @@ -842,7 +842,7 @@ public class class40 { class13.playPcmPlayers(); var10 = Rasterizer3D.Rasterizer3D_zoom; Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; - class65.scene.draw(WorldMapSection1.cameraX, GrandExchangeEvents.cameraY, GrandExchangeOfferNameComparator.cameraZ, WorldMapIcon1.cameraPitch, MusicPatchNode.cameraYaw, var4); + class65.scene.draw(WorldMapSection2.cameraX, GrandExchangeEvents.cameraY, GrandExchangeOfferNameComparator.cameraZ, WorldMapIcon1.cameraPitch, MusicPatchNode.cameraYaw, var4); Rasterizer3D.Rasterizer3D_zoom = var10; class13.playPcmPlayers(); class65.scene.clearTempGameObjects(); @@ -864,7 +864,7 @@ public class class40 { Client.field208 = 0; } - WorldMapSection1.cameraX = var13; + WorldMapSection2.cameraX = var13; GrandExchangeEvents.cameraY = var6; GrandExchangeOfferNameComparator.cameraZ = var14; WorldMapIcon1.cameraPitch = var15; diff --git a/runescape-client/src/main/java/class50.java b/runescape-client/src/main/java/class50.java index 1cf6f12438..2320090bd0 100644 --- a/runescape-client/src/main/java/class50.java +++ b/runescape-client/src/main/java/class50.java @@ -213,7 +213,7 @@ public class class50 { ItemDefinition var5 = Skills.getItemDefinition(var4); if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { if (var3 >= 250) { - WorldMapSection0.field1055 = -1; + WorldMapSection3.field1055 = -1; AttackOption.field30 = null; return; } @@ -234,10 +234,10 @@ public class class50 { AttackOption.field30 = var2; WorldMapDecorationType.field1139 = 0; - WorldMapSection0.field1055 = var3; - String[] var8 = new String[WorldMapSection0.field1055]; + WorldMapSection3.field1055 = var3; + String[] var8 = new String[WorldMapSection3.field1055]; - for (int var9 = 0; var9 < WorldMapSection0.field1055; ++var9) { + for (int var9 = 0; var9 < WorldMapSection3.field1055; ++var9) { var8[var9] = Skills.getItemDefinition(var2[var9]).name; } diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java index 7519252f20..cfed70848e 100644 --- a/runescape-client/src/main/java/class54.java +++ b/runescape-client/src/main/java/class54.java @@ -18,7 +18,7 @@ public final class class54 { ) static int method1086(int var0, int var1) { long var2 = (long)((var0 << 16) + var1); - return ModelData0.NetCache_currentResponse != null && var2 == ModelData0.NetCache_currentResponse.key ? class22.NetCache_responseArchiveBuffer.index * 99 / (class22.NetCache_responseArchiveBuffer.array.length - ModelData0.NetCache_currentResponse.padding) + 1 : 0; + return ModelData0.NetCache_currentResponse != null && var2 == ModelData0.NetCache_currentResponse.key ? WorldMapRectangle.NetCache_responseArchiveBuffer.index * 99 / (WorldMapRectangle.NetCache_responseArchiveBuffer.array.length - ModelData0.NetCache_currentResponse.padding) + 1 : 0; } @ObfuscatedName("q") @@ -41,7 +41,7 @@ public final class class54 { if (!Login.worldSelectOpen) { 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.savePreferences(); + WorldMapSection3.savePreferences(); if (!ReflectionCheck.clientPreferences.titleMusicDisabled) { class204.method4011(UserComparator3.archive6, "scape main", "", 255, false); } else { @@ -224,7 +224,7 @@ public final class class54 { Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; if (!Client.Login_isUsernameRemembered && ReflectionCheck.clientPreferences.rememberedUsername != null) { ReflectionCheck.clientPreferences.rememberedUsername = null; - WorldMapSection0.savePreferences(); + WorldMapSection3.savePreferences(); } } @@ -239,7 +239,7 @@ public final class class54 { class196.method3740(); } - WorldMapSection0.savePreferences(); + WorldMapSection3.savePreferences(); } while (true) { @@ -927,10 +927,10 @@ public final class class54 { if (var0 == ScriptOpcodes.MEC_TEXT) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var12 = ViewportMouse.getWorldMapElement(var3); - if (var12.field1021 == null) { + if (var12.name == null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12.field1021; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12.name; } return 1; From 6c85d64fe91f6da20ff1b12b2776b42d486e156c Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 18:07:09 +0200 Subject: [PATCH 458/472] api: Simplify if statements --- .../src/main/java/net/runelite/api/Point.java | 6 +----- .../java/net/runelite/api/coords/WorldArea.java | 7 ++----- .../java/net/runelite/api/coords/WorldPoint.java | 16 ++++++---------- 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/Point.java b/runelite-api/src/main/java/net/runelite/api/Point.java index 1c97a43666..a4aa342983 100644 --- a/runelite-api/src/main/java/net/runelite/api/Point.java +++ b/runelite-api/src/main/java/net/runelite/api/Point.java @@ -104,10 +104,6 @@ public class Point { return false; } - if (this.y != other.y) - { - return false; - } - return true; + return this.y == other.y; } } diff --git a/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java b/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java index 7156045eb8..0b39214143 100644 --- a/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java +++ b/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java @@ -427,11 +427,8 @@ public class WorldArea } if (height == 1) { - if ((collisionDataFlags[checkX - dx][checkY] & yFlags) != 0 && - extraCondition.test(WorldPoint.fromScene(client, startX, checkY, client.getPlane()))) - { - return false; - } + return (collisionDataFlags[checkX - dx][checkY] & yFlags) == 0 || + !extraCondition.test(WorldPoint.fromScene(client, startX, checkY, client.getPlane())); } } diff --git a/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java b/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java index fb1291273a..2882367c36 100644 --- a/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java +++ b/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java @@ -370,16 +370,12 @@ public class WorldPoint */ public static boolean isInZone(WorldPoint lowerBound, WorldPoint upperBound, WorldPoint userLocation) { - if (userLocation.getX() < lowerBound.getX() - || userLocation.getX() > upperBound.getX() - || userLocation.getY() < lowerBound.getY() - || userLocation.getY() > upperBound.getY() - || userLocation.getPlane() < lowerBound.getPlane() - || userLocation.getPlane() > upperBound.getPlane()) - { - return false; - } - return true; + return userLocation.getX() >= lowerBound.getX() + && userLocation.getX() <= upperBound.getX() + && userLocation.getY() >= lowerBound.getY() + && userLocation.getY() <= upperBound.getY() + && userLocation.getPlane() >= lowerBound.getPlane() + && userLocation.getPlane() <= upperBound.getPlane(); } /** From 1846c72f7ebecf6aa5659799960243d513533456 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 18:08:00 +0200 Subject: [PATCH 459/472] api: Inline vars --- .../main/java/net/runelite/api/Perspective.java | 14 ++++---------- .../main/java/net/runelite/api/model/Jarvis.java | 3 +-- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/Perspective.java b/runelite-api/src/main/java/net/runelite/api/Perspective.java index 5c1955f249..4c08e65bf1 100644 --- a/runelite-api/src/main/java/net/runelite/api/Perspective.java +++ b/runelite-api/src/main/java/net/runelite/api/Perspective.java @@ -317,12 +317,6 @@ public class Perspective final int neX = localLocation.getX() + (size * LOCAL_TILE_SIZE / 2); final int neY = localLocation.getY() + (size * LOCAL_TILE_SIZE / 2); - final int seX = swX; - final int seY = neY; - - final int nwX = neX; - final int nwY = swY; - final byte[][][] tileSettings = client.getTileSettings(); final int sceneX = localLocation.getSceneX(); @@ -340,14 +334,14 @@ public class Perspective } final int swHeight = getHeight(client, swX, swY, tilePlane); - final int nwHeight = getHeight(client, nwX, nwY, tilePlane); + final int nwHeight = getHeight(client, neX, swY, tilePlane); final int neHeight = getHeight(client, neX, neY, tilePlane); - final int seHeight = getHeight(client, seX, seY, tilePlane); + final int seHeight = getHeight(client, swX, neY, tilePlane); Point p1 = localToCanvas(client, swX, swY, swHeight); - Point p2 = localToCanvas(client, nwX, nwY, nwHeight); + Point p2 = localToCanvas(client, neX, swY, nwHeight); Point p3 = localToCanvas(client, neX, neY, neHeight); - Point p4 = localToCanvas(client, seX, seY, seHeight); + Point p4 = localToCanvas(client, swX, neY, seHeight); if (p1 == null || p2 == null || p3 == null || p4 == null) { diff --git a/runelite-api/src/main/java/net/runelite/api/model/Jarvis.java b/runelite-api/src/main/java/net/runelite/api/model/Jarvis.java index d71fe38b51..5435470c37 100644 --- a/runelite-api/src/main/java/net/runelite/api/model/Jarvis.java +++ b/runelite-api/src/main/java/net/runelite/api/model/Jarvis.java @@ -125,8 +125,7 @@ public class Jarvis private static long crossProduct(Point p, Point q, Point r) { - long val = (long)(q.getY() - p.getY()) * (r.getX() - q.getX()) + return (long)(q.getY() - p.getY()) * (r.getX() - q.getX()) - (long)(q.getX() - p.getX()) * (r.getY() - q.getY()); - return val; } } From 352e3311de57d6494f9f83624bc5d160736932bc Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 18:10:18 +0200 Subject: [PATCH 460/472] api: Null checks --- .../main/java/net/runelite/api/coords/WorldArea.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java b/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java index 0b39214143..7a12a730fd 100644 --- a/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java +++ b/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java @@ -271,8 +271,16 @@ public class WorldArea LocalPoint lp = LocalPoint.fromWorld(client, x, y); - int startX = lp.getSceneX() + dx; - int startY = lp.getSceneY() + dy; + int startX = 0; + if (lp != null) + { + startX = lp.getSceneX() + dx; + } + int startY = 0; + if (lp != null) + { + startY = lp.getSceneY() + dy; + } int checkX = startX + (dx > 0 ? width - 1 : 0); int checkY = startY + (dy > 0 ? height - 1 : 0); int endX = startX + width - 1; From 10d4a94f76e2a8ddcce5c04f3f4466c84f9f5695 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 18:11:23 +0200 Subject: [PATCH 461/472] api: Interface instead of type --- runelite-api/src/main/java/net/runelite/api/Client.java | 3 ++- .../src/main/java/net/runelite/mixins/RSClientMixin.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) 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 f19fdea2e3..b8c3ea9630 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -30,6 +30,7 @@ import java.util.EnumSet; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import javax.annotation.Nullable; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldPoint; @@ -1677,7 +1678,7 @@ public interface Client extends GameShell /** * Set spells excluded from above hiding */ - void setUnhiddenCasts(HashSet casts); + void setUnhiddenCasts(Set casts); /** * Sorts the current menu entries in the same way the client does this. diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index c00cc189ad..849ec90fbc 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -25,6 +25,7 @@ package net.runelite.mixins; import java.util.HashSet; +import java.util.Set; import net.runelite.api.ChatMessageType; import net.runelite.api.ClanMember; import net.runelite.api.EnumDefinition; @@ -207,7 +208,7 @@ public abstract class RSClientMixin implements RSClient private static boolean hideFriendCastOptions = false; @Inject - private static HashSet unhiddenCasts = new HashSet(); + private static Set unhiddenCasts = new HashSet(); @Inject @Override @@ -225,7 +226,7 @@ public abstract class RSClientMixin implements RSClient @Inject @Override - public void setUnhiddenCasts(HashSet casts) + public void setUnhiddenCasts(Set casts) { unhiddenCasts = casts; } From ba6d4967517c0525347c5c1ce2c030bc10bafe46 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 18:51:19 +0200 Subject: [PATCH 462/472] client: Remove unused import --- runelite-api/src/main/java/net/runelite/api/Client.java | 1 - 1 file changed, 1 deletion(-) 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 b8c3ea9630..ab4ee7f15b 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -27,7 +27,6 @@ package net.runelite.api; import java.awt.Canvas; import java.awt.Dimension; import java.util.EnumSet; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; From 0fd80701c9b4ab5f67a2282df455444acd62e163 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 21:06:02 +0200 Subject: [PATCH 463/472] travis: BUILD MAYBE!!?? From fc28d2fac7d9cff53cf7fa5f2fa2906a80a786bd Mon Sep 17 00:00:00 2001 From: Ganom Date: Mon, 8 Jul 2019 15:31:30 -0400 Subject: [PATCH 464/472] Fix bug with good crabs missing from certain rotas --- .../java/net/runelite/client/plugins/raids/RaidsPlugin.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java index 6794ebe2cb..d8759a4d64 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java @@ -127,6 +127,9 @@ public class RaidsPlugin extends Plugin "SCFPC.CSPCF - #WSWWNE#WSEENE" //good crabs first rare crabs second ); private static final ImmutableSet GOOD_CRABS_SECOND = ImmutableSet.of( + "FSCCP.PCSCF - #WNWSWN#ESEENW", //both good crabs + "SCSPF.CCSPF - #ESWWNW#ESENES", //both good crabs + "SPCFC.CSPCF - #WWNEEE#WSWNWS", //both good crabs "SCFCP.CCSPF - #ESEENW#ESWWNW", //bad crabs first good crabs second "SCPFC.CSPSF - #WWSEEE#NWSWWN", //bad crabs first good crabs second "SFCCS.PCPSF - #ENWWSW#ENESEN", //bad crabs first good crabs second From d1d4aacb9f222a05115a5eb4bd2291c41dac9b0b Mon Sep 17 00:00:00 2001 From: Ganom Date: Mon, 8 Jul 2019 15:37:55 -0400 Subject: [PATCH 465/472] Add more missing crabs. --- .../java/net/runelite/client/plugins/raids/RaidsPlugin.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java index d8759a4d64..64ae7c8661 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java @@ -130,6 +130,7 @@ public class RaidsPlugin extends Plugin "FSCCP.PCSCF - #WNWSWN#ESEENW", //both good crabs "SCSPF.CCSPF - #ESWWNW#ESENES", //both good crabs "SPCFC.CSPCF - #WWNEEE#WSWNWS", //both good crabs + "SCPFC.CSPCF - #NEEESW#WWNEEE", //rare crabs first good crabs second "SCFCP.CCSPF - #ESEENW#ESWWNW", //bad crabs first good crabs second "SCPFC.CSPSF - #WWSEEE#NWSWWN", //bad crabs first good crabs second "SFCCS.PCPSF - #ENWWSW#ENESEN", //bad crabs first good crabs second @@ -143,6 +144,7 @@ public class RaidsPlugin extends Plugin "SCPFC.CCPSF - #NWWWSE#WNEESE" //both rare crabs ); private static final ImmutableSet RARE_CRABS_SECOND = ImmutableSet.of( + "SCPFC.CCPSF - #NWWWSE#WNEESE", //both rare crabs "FSCPC.CSCPF - #WNWWSE#EENWWW", //bad crabs first rare crabs second "SCFPC.PCCSF - #WSEENE#WWWSEE", //bad crabs first rare crabs second "SCFPC.SCPCF - #NESENE#WSWWNE", //bad crabs first rare crabs second From 314f45dc79c0887de27d050c174d44ca2c1e230c Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 22:26:28 +0200 Subject: [PATCH 466/472] fontmanager: Change font on panels --- .../client/plugins/equipmentinspector/ItemPanel.java | 2 +- .../net/runelite/client/plugins/profiles/ProfilesPanel.java | 6 +++--- .../net/runelite/client/plugins/slayer/SlayerTaskPanel.java | 4 ++-- .../client/plugins/stonedloottracker/ui/ItemPanel.java | 2 +- .../client/plugins/stonedloottracker/ui/LootTrackerBox.java | 6 +++--- .../plugins/suppliestracker/SuppliesTrackerPanel.java | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/ItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/ItemPanel.java index 20f1c2f9be..684cb8ab31 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/ItemPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/ItemPanel.java @@ -49,7 +49,7 @@ class ItemPanel extends JPanel JLabel name = new JLabel(item.getName()); JLabel location = new JLabel(StringUtils.capitalize(kitType.toString().toLowerCase())); - location.setFont(FontManager.getRunescapeSmallFont()); + location.setFont(FontManager.getSmallFont(getFont())); JLabel imageLabel = new JLabel(); icon.addTo(imageLabel); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java index 60835272a2..28b554e6f2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java @@ -77,8 +77,8 @@ class ProfilesPanel extends PluginPanel private static final String ACCOUNT_LABEL = "Account Label"; private static final String PASSWORD_LABEL = "Account Password"; private static final String HELP = "To add and load accounts, first enter a password into the Encryption Password " + - "field then press Load Accounts. You can now add as many accounts as you would like. The next time you restart" + - "Runelite, enter your encryption password and click load accounts to see the accounts you entered"; + "field then press Load Accounts. You can now add as many accounts as you would like. The next time you restart " + + "RunelitePlus, enter your encryption password and click load accounts to see the accounts you entered"; private static final Dimension PREFERRED_SIZE = new Dimension(PluginPanel.PANEL_WIDTH - 20, 30); private static final Dimension HELP_PREFERRED_SIZE = new Dimension(PluginPanel.PANEL_WIDTH - 20, 130); @@ -116,7 +116,7 @@ class ProfilesPanel extends PluginPanel JPanel helpPanel = new JPanel(new BorderLayout()); helpPanel.setBackground(ColorScheme.DARKER_GRAY_COLOR); JLabel helpLabel = new JLabel("

" + HELP + "

"); - helpLabel.setFont(FontManager.getRunescapeSmallFont()); + helpLabel.setFont(FontManager.getSmallFont(getFont())); helpPanel.setPreferredSize(HELP_PREFERRED_SIZE); // helpPanel.setSize(MINIMUM_SIZE); helpPanel.add(helpLabel, BorderLayout.NORTH); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerTaskPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerTaskPanel.java index f865237fe9..d9eb0d0065 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerTaskPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerTaskPanel.java @@ -195,8 +195,8 @@ public class SlayerTaskPanel extends PluginPanel overallInfo.setBackground(ColorScheme.DARKER_GRAY_COLOR); overallInfo.setLayout(new GridLayout(2, 1)); overallInfo.setBorder(new EmptyBorder(2, 10, 2, 0)); - overallKillsLabel.setFont(FontManager.getRunescapeSmallFont()); - overallTimeLabel.setFont(FontManager.getRunescapeSmallFont()); + overallKillsLabel.setFont(FontManager.getSmallFont(getFont())); + overallTimeLabel.setFont(FontManager.getSmallFont(getFont())); overallInfo.add(overallKillsLabel); overallInfo.add(overallTimeLabel); overallPanel.add(overallIcon, BorderLayout.WEST); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/ItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/ItemPanel.java index b7e01d00a8..aa4947c9e3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/ItemPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/ItemPanel.java @@ -91,7 +91,7 @@ class ItemPanel extends JPanel } JShadowedLabel labelValue = new JShadowedLabel(gpLabel); - labelValue.setFont(FontManager.getRunescapeSmallFont()); + labelValue.setFont(FontManager.getSmallFont(getFont())); colorLabel(labelValue, this.record.getTotal()); labelValue.setVerticalAlignment(SwingUtilities.TOP); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java index 9618536cc0..3008f2d421 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java @@ -80,12 +80,12 @@ class LootTrackerBox extends JPanel logTitle.setBackground(ColorScheme.DARKER_GRAY_COLOR.darker()); final JLabel titleLabel = new JLabel(Text.removeTags(id)); - titleLabel.setFont(FontManager.getRunescapeSmallFont()); + titleLabel.setFont(FontManager.getSmallFont(getFont())); titleLabel.setForeground(Color.WHITE); logTitle.add(titleLabel, BorderLayout.WEST); - subTitleLabel.setFont(FontManager.getRunescapeSmallFont()); + subTitleLabel.setFont(FontManager.getSmallFont(getFont())); subTitleLabel.setForeground(ColorScheme.LIGHT_GRAY_COLOR); logTitle.add(subTitleLabel, BorderLayout.CENTER); @@ -94,7 +94,7 @@ class LootTrackerBox extends JPanel subTitleLabel.setText(subtitle); } - priceLabel.setFont(FontManager.getRunescapeSmallFont()); + priceLabel.setFont(FontManager.getSmallFont(getFont())); priceLabel.setForeground(ColorScheme.LIGHT_GRAY_COLOR); logTitle.add(priceLabel, BorderLayout.EAST); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPanel.java index 088d2421b5..983587c50c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPanel.java @@ -90,8 +90,8 @@ class SuppliesTrackerPanel extends PluginPanel overallInfo.setBackground(ColorScheme.DARKER_GRAY_COLOR); overallInfo.setLayout(new GridLayout(2, 1)); overallInfo.setBorder(new EmptyBorder(0, 10, 0, 0)); - overallSuppliesUsedLabel.setFont(FontManager.getRunescapeSmallFont()); - overallCostLabel.setFont(FontManager.getRunescapeSmallFont()); + overallSuppliesUsedLabel.setFont(FontManager.getSmallFont(getFont())); + overallCostLabel.setFont(FontManager.getSmallFont(getFont())); overallInfo.add(overallSuppliesUsedLabel); overallInfo.add(overallCostLabel); overallPanel.add(overallIcon, BorderLayout.WEST); From ad565d399173e2de4a6852dc5eb5dfa2dc3071ce Mon Sep 17 00:00:00 2001 From: Lucas Date: Mon, 8 Jul 2019 22:41:26 +0200 Subject: [PATCH 467/472] more RSClient refactoring --- .../net/runelite/mixins/ClickboxMixin.java | 3 +- .../runelite/mixins/RSRasterizer2DMixin.java | 8 +- .../java/net/runelite/rs/api/RSClient.java | 2 +- .../runelite/rs/api/RSWorldMapManager.java | 2 +- .../src/main/java/AbstractArchive.java | 16 +- .../main/java/AbstractByteArrayCopier.java | 3 +- .../src/main/java/AbstractWorldMapIcon.java | 2 +- runescape-client/src/main/java/Animation.java | 6 +- runescape-client/src/main/java/Archive.java | 44 ++--- .../src/main/java/ArchiveLoader.java | 29 +-- .../src/main/java/AudioFilter.java | 34 ++-- runescape-client/src/main/java/Buffer.java | 74 +++++--- runescape-client/src/main/java/Calendar.java | 2 +- runescape-client/src/main/java/Client.java | 43 ++--- .../src/main/java/ClientParameter.java | 4 +- runescape-client/src/main/java/Decimator.java | 15 +- .../src/main/java/DefaultsGroup.java | 2 +- .../main/java/DevicePcmPlayerProvider.java | 80 ++++---- .../src/main/java/DynamicObject.java | 4 +- runescape-client/src/main/java/Fonts.java | 5 +- runescape-client/src/main/java/Frames.java | 2 +- .../src/main/java/GrandExchangeOffer.java | 2 +- .../GrandExchangeOfferWorldComparator.java | 20 +- .../src/main/java/GroundItemPile.java | 2 +- .../src/main/java/HitSplatDefinition.java | 6 +- .../src/main/java/Instrument.java | 173 +++++++++--------- .../src/main/java/Interpreter.java | 15 +- .../src/main/java/IsaacCipher.java | 156 ++++++++-------- .../src/main/java/ItemContainer.java | 3 +- .../src/main/java/KitDefinition.java | 5 +- .../src/main/java/LoginPacket.java | 9 +- .../src/main/java/LoginScreenAnimation.java | 6 +- .../src/main/java/MidiFileReader.java | 6 +- .../src/main/java/MilliClock.java | 67 +++---- runescape-client/src/main/java/Model.java | 10 +- runescape-client/src/main/java/ModelData.java | 36 ++-- .../src/main/java/MouseHandler.java | 14 -- .../src/main/java/MusicPatch.java | 2 +- .../src/main/java/MusicSample.java | 2 +- .../src/main/java/MusicTrack.java | 8 +- .../src/main/java/NetFileRequest.java | 4 +- .../src/main/java/ObjectDefinition.java | 6 +- .../src/main/java/PacketBuffer.java | 30 +-- .../src/main/java/PacketBufferNode.java | 5 +- .../src/main/java/PacketWriter.java | 2 +- runescape-client/src/main/java/Player.java | 2 +- .../src/main/java/PlayerAppearance.java | 38 ++-- .../src/main/java/Rasterizer2D.java | 8 +- .../src/main/java/Rasterizer3D.java | 4 +- .../src/main/java/RectangleMode.java | 28 +-- .../src/main/java/ServerPacket.java | 2 +- .../src/main/java/SoundCache.java | 8 +- runescape-client/src/main/java/Sprite.java | 16 +- runescape-client/src/main/java/Strings.java | 2 +- .../src/main/java/TextureProvider.java | 6 +- .../src/main/java/UserComparator7.java | 2 +- runescape-client/src/main/java/Varcs.java | 4 +- runescape-client/src/main/java/Varps.java | 4 +- .../src/main/java/ViewportMouse.java | 10 +- .../src/main/java/WallDecoration.java | 2 +- runescape-client/src/main/java/Widget.java | 30 +-- runescape-client/src/main/java/World.java | 5 +- .../src/main/java/WorldMapElement.java | 6 +- .../src/main/java/WorldMapIcon2.java | 3 +- .../src/main/java/WorldMapLabel.java | 2 +- .../src/main/java/WorldMapLabelSize.java | 3 +- .../src/main/java/WorldMapManager.java | 32 ++-- .../src/main/java/WorldMapRectangle.java | 10 +- .../src/main/java/WorldMapSection2.java | 2 +- .../src/main/java/WorldMapSectionType.java | 4 +- runescape-client/src/main/java/class14.java | 4 +- runescape-client/src/main/java/class15.java | 40 ++-- runescape-client/src/main/java/class171.java | 46 ++--- runescape-client/src/main/java/class190.java | 7 +- runescape-client/src/main/java/class204.java | 8 +- runescape-client/src/main/java/class21.java | 22 +-- runescape-client/src/main/java/class226.java | 40 ++-- runescape-client/src/main/java/class238.java | 4 +- runescape-client/src/main/java/class31.java | 6 +- runescape-client/src/main/java/class40.java | 2 +- 80 files changed, 714 insertions(+), 667 deletions(-) diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/ClickboxMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/ClickboxMixin.java index 3bf15193e1..d8cc17ecfd 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/ClickboxMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/ClickboxMixin.java @@ -40,8 +40,7 @@ public abstract class ClickboxMixin implements RSClient return; } - boolean bb = boundingboxCheck(model, _x, _y, _z); - if (!bb) + if (!boundingboxCheck(model, _x, _y, _z)) { return; } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSRasterizer2DMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSRasterizer2DMixin.java index 8b8c3534e6..0233976309 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSRasterizer2DMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSRasterizer2DMixin.java @@ -27,13 +27,13 @@ public abstract class RSRasterizer2DMixin implements RSClient pixels[index] = value & 0x00FFFFFF | outAlpha << 24; } - @Copy("drawGradientAlpha") - private static void rs$raster2d6(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) + @Copy("Rasterizer2D_fillRectangleGradientAlpha") + private static void rs$drawGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { throw new RuntimeException(); } - @Replace("drawGradientAlpha") + @Replace("Rasterizer2D_fillRectangleGradientAlpha") private static void rl$drawGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { final int width = client.getGraphicsPixelsWidth(); @@ -45,7 +45,7 @@ public abstract class RSRasterizer2DMixin implements RSClient if (!client.isGpu()) { - rs$raster2d6(var0, var1, var2, var3, var4, var5, var6, var7); + rs$drawGradientAlpha(var0, var1, var2, var3, var4, var5, var6, var7); return; } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index eba775f70e..88502c4b9c 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java @@ -978,7 +978,7 @@ public interface RSClient extends RSGameShell, Client @Import("Rasterizer2D_drawVerticalLine") void rasterizerDrawVerticalLine(int x, int y, int h, int rgb); - @Import("Rasterizer2D_drawGradient") + @Import("Rasterizer2D_fillRectangleGradient") void rasterizerDrawGradient(int x, int y, int w, int h, int rgbTop, int rgbBottom); @Import("Rasterizer2D_fillRectangleAlpha") diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapManager.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapManager.java index 9a534ce187..ec78157ef3 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapManager.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapManager.java @@ -5,7 +5,7 @@ import net.runelite.mapping.Import; public interface RSWorldMapManager extends WorldMapManager { - @Import("isLoaded0") + @Import("isLoaded") @Override boolean isLoaded(); diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index 198880b6ba..8c9bc68e6f 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -97,9 +97,9 @@ public abstract class AbstractArchive { @Export("shallowFiles") boolean shallowFiles; - AbstractArchive(boolean var1, boolean var2) { - this.releaseGroups = var1; - this.shallowFiles = var2; + AbstractArchive(boolean releaseGroups, boolean shallowFiles) { + this.releaseGroups = releaseGroups; + this.shallowFiles = shallowFiles; } @ObfuscatedName("m") @@ -446,8 +446,9 @@ public abstract class AbstractArchive { signature = "(II)I", garbageValue = "1178362496" ) - public int method4(int var1) { - return this.files[var1].length; + @Export("getGroupFileCount") + public int getGroupFileCount(int group) { + return this.files[group].length; } @ObfuscatedName("t") @@ -455,7 +456,8 @@ public abstract class AbstractArchive { signature = "(I)I", garbageValue = "1702434573" ) - public int method5() { + @Export("getGroupCount") + public int getGroupCount() { return this.files.length; } @@ -751,7 +753,7 @@ public abstract class AbstractArchive { if (Client.archiveLoaders != null && Client.archiveLoaderArchive < Client.archiveLoaders.size()) { while (Client.archiveLoaderArchive < Client.archiveLoaders.size()) { ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoaderArchive); - if (!var0.method134()) { + if (!var0.isLoaded()) { return false; } diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 509818dd92..94a019905b 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -13,7 +13,8 @@ public abstract class AbstractByteArrayCopier { @ObfuscatedSignature( signature = "Lit;" ) - static Archive field0; + @Export("archive20") + static Archive archive20; @ObfuscatedName("m") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index 6fb6f20059..1c881a4b02 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -169,6 +169,6 @@ public abstract class AbstractWorldMapIcon { static void method625(Archive var0, String var1) { ArchiveLoader var2 = new ArchiveLoader(var0, var1); Client.archiveLoaders.add(var2); - Client.field140 += var2.field408; + Client.field140 += var2.groupCount; } } diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index da9442b259..ee445af99c 100644 --- a/runescape-client/src/main/java/Animation.java +++ b/runescape-client/src/main/java/Animation.java @@ -79,19 +79,19 @@ public class Animation { } if ((var9 & 1) != 0) { - field27[var7] = var4.method47(); + field27[var7] = var4.readShortSmart(); } else { field27[var7] = var11; } if ((var9 & 2) != 0) { - field28[var7] = var4.method47(); + field28[var7] = var4.readShortSmart(); } else { field28[var7] = var11; } if ((var9 & 4) != 0) { - field29[var7] = var4.method47(); + field29[var7] = var4.readShortSmart(); } else { field29[var7] = var11; } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index 11542e7c7b..72a68414b8 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -57,14 +57,14 @@ public class Archive extends AbstractArchive { @ObfuscatedSignature( signature = "(Lff;Lff;IZZZ)V" ) - public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) { - super(var4, var5); + public Archive(ArchiveDisk archiveDisk, ArchiveDisk masterDisk, int index, boolean releaseGroups, boolean shallowFiles, boolean var6) { + super(releaseGroups, shallowFiles); this.field403 = false; this.field404 = false; this.field405 = -1; - this.archiveDisk = var1; - this.masterDisk = var2; - this.index = var3; + this.archiveDisk = archiveDisk; + this.masterDisk = masterDisk; + this.index = index; this.field404 = var6; int var7 = this.index; if (Players.NetCache_reference != null) { @@ -240,26 +240,26 @@ public class Archive extends AbstractArchive { garbageValue = "-2045340856" ) @Export("load") - void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { + void load(ArchiveDisk var1, int group, byte[] data, boolean var4) { int var5; if (var1 == this.masterDisk) { if (this.field403) { throw new RuntimeException(); } - if (var3 == null) { + if (data == null) { PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } else { Archive_crc.reset(); - Archive_crc.update(var3, 0, var3.length); + Archive_crc.update(data, 0, data.length); var5 = (int)Archive_crc.getValue(); if (var5 != this.indexCrc) { PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } else { - Buffer var6 = new Buffer(Strings.decompressBytes(var3)); + Buffer var6 = new Buffer(Strings.decompressBytes(data)); int var7 = var6.readUnsignedByte(); if (var7 != 5 && var7 != 6) { - throw new RuntimeException(var7 + "," + this.index + "," + var2); + throw new RuntimeException(var7 + "," + this.index + "," + group); } int var8 = 0; @@ -270,36 +270,36 @@ public class Archive extends AbstractArchive { if (var8 != this.indexVersion) { PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } else { - this.decodeIndex(var3); + this.decodeIndex(data); this.loadAllLocal(); } } } } else { - if (!var4 && var2 == this.field405) { + if (!var4 && group == this.field405) { this.field403 = true; } - if (var3 != null && var3.length > 2) { + if (data != null && data.length > 2) { Archive_crc.reset(); - Archive_crc.update(var3, 0, var3.length - 2); + Archive_crc.update(data, 0, data.length - 2); var5 = (int)Archive_crc.getValue(); - int var9 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); - if (var5 == super.groupCrcs[var2] && var9 == super.groupVersions[var2]) { - this.validGroups[var2] = true; + int var9 = ((data[data.length - 2] & 255) << 8) + (data[data.length - 1] & 255); + if (var5 == super.groupCrcs[group] && var9 == super.groupVersions[group]) { + this.validGroups[group] = true; if (var4) { - super.groups[var2] = Projectile.byteArrayToObject(var3, false); + super.groups[group] = Projectile.byteArrayToObject(data, false); } } else { - this.validGroups[var2] = false; + this.validGroups[group] = false; if (this.field404 || var4) { - PacketBuffer.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + PacketBuffer.requestNetFile(this, this.index, group, super.groupCrcs[group], (byte)2, var4); } } } else { - this.validGroups[var2] = false; + this.validGroups[group] = false; if (this.field404 || var4) { - PacketBuffer.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + PacketBuffer.requestNetFile(this, this.index, group, super.groupCrcs[group], (byte)2, var4); } } } diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index 266e415c5b..6459f155c2 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -38,20 +38,22 @@ public class ArchiveLoader { @ObfuscatedGetter( intValue = 1459455501 ) - final int field408; + @Export("groupCount") + final int groupCount; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 782003089 ) - int field409; + @Export("loadedCount") + int loadedCount; @ObfuscatedSignature( signature = "(Lit;Ljava/lang/String;)V" ) - ArchiveLoader(Archive var1, String var2) { - this.field409 = 0; - this.archive = var1; - this.field408 = var1.method5(); + ArchiveLoader(Archive archive, String name) { + this.loadedCount = 0; + this.archive = archive; + this.groupCount = archive.getGroupCount(); } @ObfuscatedName("m") @@ -59,16 +61,17 @@ public class ArchiveLoader { signature = "(I)Z", garbageValue = "1352221725" ) - boolean method134() { - this.field409 = 0; + @Export("isLoaded") + boolean isLoaded() { + this.loadedCount = 0; - for (int var1 = 0; var1 < this.field408; ++var1) { + for (int var1 = 0; var1 < this.groupCount; ++var1) { if (!this.archive.method133(var1) || this.archive.method132(var1)) { - ++this.field409; + ++this.loadedCount; } } - return this.field409 >= this.field408; + return this.loadedCount >= this.groupCount; } @ObfuscatedName("x") @@ -147,8 +150,8 @@ public class ArchiveLoader { } Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); - Rasterizer2D.Rasterizer2D_drawGradient(Login.xPadding, 0, 125, 23, 0xbd9839, 0x8b6608); - Rasterizer2D.Rasterizer2D_drawGradient(Login.xPadding + 125, 0, 640, 23, 0x4f4f4f, 0x292929); + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 0xbd9839, 0x8b6608); + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 0x4f4f4f, 0x292929); var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); if (UrlRequest.worldSelectStars != null) { UrlRequest.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index db956f6e44..c39825230b 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -8,13 +8,13 @@ public class AudioFilter { @ObfuscatedName("u") static float[][] field32; @ObfuscatedName("g") - static int[][] field33; + static int[][] coefficients; @ObfuscatedName("l") static float field34; @ObfuscatedName("e") - static int field35; + static int forwardMultiplier; @ObfuscatedName("m") - int[] field36; + int[] pairs; @ObfuscatedName("q") int[][][] field37; @ObfuscatedName("w") @@ -23,7 +23,7 @@ public class AudioFilter { int[] field39; AudioFilter() { - this.field36 = new int[2]; + this.pairs = new int[2]; this.field37 = new int[2][2][4]; this.field38 = new int[2][2][4]; this.field39 = new int[2]; @@ -44,16 +44,16 @@ public class AudioFilter { } @ObfuscatedName("w") - int method26(int var1, float var2) { + int compute(int var1, float var2) { float var3; if (var1 == 0) { var3 = (float)this.field39[0] + (float)(this.field39[1] - this.field39[0]) * var2; var3 *= 0.0030517578F; field34 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); - field35 = (int)(field34 * 65536.0F); + forwardMultiplier = (int)(field34 * 65536.0F); } - if (this.field36[var1] == 0) { + if (this.pairs[var1] == 0) { return 0; } else { var3 = this.method24(var1, 0, var2); @@ -62,7 +62,7 @@ public class AudioFilter { float[] var4; int var5; - for (var5 = 1; var5 < this.field36[var1]; ++var5) { + for (var5 = 1; var5 < this.pairs[var1]; ++var5) { var3 = this.method24(var1, var5, var2); float var6 = -2.0F * var3 * (float)Math.cos((double)this.method25(var1, var5, var2)); float var7 = var3 * var3; @@ -81,17 +81,17 @@ public class AudioFilter { } if (var1 == 0) { - for (var5 = 0; var5 < this.field36[0] * 2; ++var5) { + for (var5 = 0; var5 < this.pairs[0] * 2; ++var5) { var4 = field32[0]; var4[var5] *= field34; } } - for (var5 = 0; var5 < this.field36[var1] * 2; ++var5) { - field33[var1][var5] = (int)(field32[var1][var5] * 65536.0F); + for (var5 = 0; var5 < this.pairs[var1] * 2; ++var5) { + coefficients[var1][var5] = (int)(field32[var1][var5] * 65536.0F); } - return this.field36[var1] * 2; + return this.pairs[var1] * 2; } } @@ -101,8 +101,8 @@ public class AudioFilter { ) final void method27(Buffer var1, SoundEnvelope var2) { int var3 = var1.readUnsignedByte(); - this.field36[0] = var3 >> 4; - this.field36[1] = var3 & 15; + this.pairs[0] = var3 >> 4; + this.pairs[1] = var3 & 15; if (var3 != 0) { this.field39[0] = var1.readUnsignedShort(); this.field39[1] = var1.readUnsignedShort(); @@ -111,14 +111,14 @@ public class AudioFilter { int var5; int var6; for (var5 = 0; var5 < 2; ++var5) { - for (var6 = 0; var6 < this.field36[var5]; ++var6) { + for (var6 = 0; var6 < this.pairs[var5]; ++var6) { this.field37[var5][0][var6] = var1.readUnsignedShort(); this.field38[var5][0][var6] = var1.readUnsignedShort(); } } for (var5 = 0; var5 < 2; ++var5) { - for (var6 = 0; var6 < this.field36[var5]; ++var6) { + for (var6 = 0; var6 < this.pairs[var5]; ++var6) { if ((var4 & 1 << var5 * 4 << var6) != 0) { this.field37[var5][1][var6] = var1.readUnsignedShort(); this.field38[var5][1][var6] = var1.readUnsignedShort(); @@ -148,6 +148,6 @@ public class AudioFilter { static { field32 = new float[2][8]; - field33 = new int[2][8]; + coefficients = new int[2][8]; } } diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index 950ee61a8c..ec0ccb5661 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -9,9 +9,11 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Buffer") public class Buffer extends Node { @ObfuscatedName("q") - static int[] field45; + @Export("crc32Table") + static int[] crc32Table; @ObfuscatedName("o") - static long[] field46; + @Export("crc64Table") + static long[] crc64Table; @ObfuscatedName("m") @Export("array") public byte[] array; @@ -163,7 +165,8 @@ public class Buffer extends Node { signature = "(Ljava/lang/CharSequence;B)V", garbageValue = "58" ) - public void method37(CharSequence var1) { + @Export("writeCESU8") + public void writeCESU8(CharSequence var1) { int var2 = var1.length(); int var3 = 0; @@ -179,7 +182,7 @@ public class Buffer extends Node { } this.array[++this.index - 1] = 0; - this.method42(var3); + this.writeVarInt(var3); this.index += class16.method190(this.array, this.index, var1); } @@ -188,9 +191,10 @@ public class Buffer extends Node { signature = "([BIII)V", garbageValue = "-1915344405" ) - public void method38(byte[] var1, int var2, int var3) { - for (int var4 = var2; var4 < var3 + var2; ++var4) { - this.array[++this.index - 1] = var1[var4]; + @Export("writeBytes") + public void writeBytes(byte[] bytes, int startIdx, int endIdx) { + for (int var4 = startIdx; var4 < endIdx + startIdx; ++var4) { + this.array[++this.index - 1] = bytes[var4]; } } @@ -200,7 +204,8 @@ public class Buffer extends Node { signature = "(II)V", garbageValue = "-225163682" ) - public void method39(int var1) { + @Export("writeLengthInt") + public void writeLengthInt(int var1) { this.array[this.index - var1 - 4] = (byte)(var1 >> 24); this.array[this.index - var1 - 3] = (byte)(var1 >> 16); this.array[this.index - var1 - 2] = (byte)(var1 >> 8); @@ -212,7 +217,8 @@ public class Buffer extends Node { signature = "(II)V", garbageValue = "-1298210761" ) - public void method40(int var1) { + @Export("writeLengthShort") + public void writeLengthShort(int var1) { this.array[this.index - var1 - 2] = (byte)(var1 >> 8); this.array[this.index - var1 - 1] = (byte)var1; } @@ -222,7 +228,8 @@ public class Buffer extends Node { signature = "(II)V", garbageValue = "-1839722163" ) - public void method41(int var1) { + @Export("writeLengthByte") + public void writeLengthByte(int var1) { this.array[this.index - var1 - 1] = (byte)var1; } @@ -250,7 +257,8 @@ public class Buffer extends Node { signature = "(II)V", garbageValue = "820873705" ) - public void method42(int var1) { + @Export("writeVarInt") + public void writeVarInt(int var1) { if ((var1 & -128) != 0) { if ((var1 & -16384) != 0) { if ((var1 & -2097152) != 0) { @@ -306,7 +314,8 @@ public class Buffer extends Node { signature = "(B)I", garbageValue = "1" ) - public int method44() { + @Export("readShort") + public int readShort() { this.index += 2; int var1 = (this.array[this.index - 1] & 255) + ((this.array[this.index - 2] & 255) << 8); if (var1 > 32767) { @@ -417,12 +426,13 @@ public class Buffer extends Node { signature = "(B)Ljava/lang/String;", garbageValue = "-14" ) - public String method45() { + @Export("readCESU8") + public String readCESU8() { byte var1 = this.array[++this.index - 1]; if (var1 != 0) { throw new IllegalStateException(""); } else { - int var2 = this.method52(); + int var2 = this.readVarInt(); if (var2 + this.index > this.array.length) { throw new IllegalStateException(""); } else { @@ -489,7 +499,8 @@ public class Buffer extends Node { signature = "([BIIB)V", garbageValue = "-122" ) - public void method46(byte[] var1, int var2, int var3) { + @Export("readBytes") + public void readBytes(byte[] var1, int var2, int var3) { for (int var4 = var2; var4 < var3 + var2; ++var4) { var1[var4] = this.array[++this.index - 1]; } @@ -501,7 +512,8 @@ public class Buffer extends Node { signature = "(B)I", garbageValue = "-24" ) - public int method47() { + @Export("readShortSmart") + public int readShortSmart() { int var1 = this.array[this.index] & 255; return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; } @@ -511,7 +523,8 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "1370512869" ) - public int method48() { + @Export("readUShortSmart") + public int readUShortSmart() { int var1 = this.array[this.index] & 255; return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; } @@ -525,7 +538,7 @@ public class Buffer extends Node { int var1 = 0; int var2; - for (var2 = this.method48(); var2 == 32767; var2 = this.method48()) { + for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { var1 += 32767; } @@ -561,7 +574,8 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "984135559" ) - public int method52() { + @Export("readVarInt") + public int readVarInt() { byte var1 = this.array[++this.index - 1]; int var2; @@ -698,13 +712,13 @@ public class Buffer extends Node { int var3 = this.index; this.index = 0; byte[] var4 = new byte[var3]; - this.method46(var4, 0, var3); + this.readBytes(var4, 0, var3); BigInteger var5 = new BigInteger(var4); BigInteger var6 = var5.modPow(var1, var2); byte[] var7 = var6.toByteArray(); this.index = 0; this.writeShort(var7.length); - this.method38(var7, 0, var7.length); + this.writeBytes(var7, 0, var7.length); } @ObfuscatedName("aa") @@ -712,13 +726,14 @@ public class Buffer extends Node { signature = "(II)I", garbageValue = "-484928770" ) - public int method53(int var1) { + @Export("writeCrc") + public int writeCrc(int var1) { byte[] var2 = this.array; int var3 = this.index; int var4 = -1; for (int var5 = var1; var5 < var3; ++var5) { - var4 = var4 >>> 8 ^ field45[(var4 ^ var2[var5]) & 255]; + var4 = var4 >>> 8 ^ crc32Table[(var4 ^ var2[var5]) & 255]; } var4 = ~var4; @@ -731,7 +746,8 @@ public class Buffer extends Node { signature = "(B)Z", garbageValue = "-11" ) - public boolean method54() { + @Export("checkCrc") + public boolean checkCrc() { this.index -= 4; byte[] var1 = this.array; int var2 = this.index; @@ -739,7 +755,7 @@ public class Buffer extends Node { int var4; for (var4 = 0; var4 < var2; ++var4) { - var3 = var3 >>> 8 ^ field45[(var3 ^ var1[var4]) & 255]; + var3 = var3 >>> 8 ^ crc32Table[(var3 ^ var1[var4]) & 255]; } var3 = ~var3; @@ -1023,7 +1039,7 @@ public class Buffer extends Node { } static { - field45 = new int[256]; + crc32Table = new int[256]; int var0; for (int var1 = 0; var1 < 256; ++var1) { @@ -1037,10 +1053,10 @@ public class Buffer extends Node { } } - field45[var1] = var2; + crc32Table[var1] = var2; } - field46 = new long[256]; + crc64Table = new long[256]; for (var0 = 0; var0 < 256; ++var0) { long var4 = (long)var0; @@ -1053,7 +1069,7 @@ public class Buffer extends Node { } } - field46[var0] = var4; + crc64Table[var0] = var4; } } diff --git a/runescape-client/src/main/java/Calendar.java b/runescape-client/src/main/java/Calendar.java index 0d00a8f7fa..cb8ef7e634 100644 --- a/runescape-client/src/main/java/Calendar.java +++ b/runescape-client/src/main/java/Calendar.java @@ -74,7 +74,7 @@ public class Calendar { var6 = Interpreter.Interpreter_calendar.get(5); int var15 = Interpreter.Interpreter_calendar.get(2); int var16 = Interpreter.Interpreter_calendar.get(1); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.field422[var15] + "-" + var16; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var15] + "-" + var16; return 1; } else if (var0 != ScriptOpcodes.TEXT_GENDER) { if (var0 == ScriptOpcodes.TOSTRING) { diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 8a104b9752..86bf250252 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -236,7 +236,8 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedSignature( signature = "Lhi;" ) - static PlayerAppearance field119; + @Export("playerAppearance") + static PlayerAppearance playerAppearance; @ObfuscatedName("qa") @ObfuscatedGetter( intValue = -1481002083 @@ -1518,7 +1519,7 @@ public final class Client extends GameShell implements Usernamed { var10 = 0; while (true) { - var11 = var26.method48(); + var11 = var26.readUShortSmart(); if (var11 == 0) { break; } @@ -2499,9 +2500,9 @@ public final class Client extends GameShell implements Usernamed { var31 = var15.readStringCp1252NullCircumfixed(); } } else { - var30 = var15.method45(); + var30 = var15.readCESU8(); if (var11 == 1) { - var31 = var15.method45(); + var31 = var15.readCESU8(); } } @@ -3321,7 +3322,7 @@ public final class Client extends GameShell implements Usernamed { var8.packetBuffer.writeInt(180); var8.packetBuffer.writeInt(1); var8.packetBuffer.writeByte(clientType); - var8.packetBuffer.method38(var6.array, 0, var6.index); + var8.packetBuffer.writeBytes(var6.array, 0, var6.index); int var10 = var8.packetBuffer.index; var8.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); var8.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); @@ -3332,7 +3333,7 @@ public final class Client extends GameShell implements Usernamed { var8.packetBuffer.writeInt(AbstractArchive.field2); Buffer var11 = new Buffer(WorldMapLabelSize.platformInfo.size()); WorldMapLabelSize.platformInfo.write(var11); - var8.packetBuffer.method38(var11.array, 0, var11.array.length); + var8.packetBuffer.writeBytes(var11.array, 0, var11.array.length); var8.packetBuffer.writeByte(clientType); var8.packetBuffer.writeInt(0); var8.packetBuffer.writeInt(AbstractArchive.archive0.hash); @@ -3352,12 +3353,12 @@ public final class Client extends GameShell implements Usernamed { var8.packetBuffer.writeInt(class2.archive14.hash); var8.packetBuffer.writeInt(WorldMapSection2.archive15.hash); var8.packetBuffer.writeInt(0); - var8.packetBuffer.writeInt(WorldMapRectangle.archive16.hash); - var8.packetBuffer.writeInt(WorldMapLabelSize.field1040.hash); - var8.packetBuffer.writeInt(ItemContainer.field434.hash); - var8.packetBuffer.writeInt(AbstractByteArrayCopier.field0.hash); + var8.packetBuffer.writeInt(WorldMapRectangle.archive17.hash); + var8.packetBuffer.writeInt(WorldMapLabelSize.archive18.hash); + var8.packetBuffer.writeInt(ItemContainer.archive19.hash); + var8.packetBuffer.writeInt(AbstractByteArrayCopier.archive20.hash); var8.packetBuffer.xteaEncrypt(var7, var10, var8.packetBuffer.index); - var8.packetBuffer.method40(var8.packetBuffer.index - var9); + var8.packetBuffer.writeLengthShort(var8.packetBuffer.index - var9); packetWriter.method241(var8); packetWriter.method240(); packetWriter.isaacCipher = new IsaacCipher(var7); @@ -3650,7 +3651,7 @@ public final class Client extends GameShell implements Usernamed { var6.packetBuffer.writeByte(0); var7 = var6.packetBuffer.index; timer.write(var6.packetBuffer); - var6.packetBuffer.method41(var6.packetBuffer.index - var7); + var6.packetBuffer.writeLengthByte(var6.packetBuffer.index - var7); packetWriter.method241(var6); timer.method333(); } @@ -3746,7 +3747,7 @@ public final class Client extends GameShell implements Usernamed { } if (var5 != null) { - var5.packetBuffer.method41(var5.packetBuffer.index - var4); + var5.packetBuffer.writeLengthByte(var5.packetBuffer.index - var4); var12 = var5.packetBuffer.index; var5.packetBuffer.index = var4; var5.packetBuffer.writeByte(var10 / var11); @@ -3815,7 +3816,7 @@ public final class Client extends GameShell implements Usernamed { var6.packetBuffer.writeMedium((int)var21); } - var6.packetBuffer.method40(var6.packetBuffer.index - var7); + var6.packetBuffer.writeLengthShort(var6.packetBuffer.index - var7); packetWriter.method241(var6); } @@ -4267,7 +4268,7 @@ public final class Client extends GameShell implements Usernamed { var5.packetBuffer.writeByte(0); var4 = var5.packetBuffer.index; WorldMapLabel.method443(var5.packetBuffer); - var5.packetBuffer.method41(var5.packetBuffer.index - var4); + var5.packetBuffer.writeLengthByte(var5.packetBuffer.index - var4); packetWriter.method241(var5); } } @@ -4628,7 +4629,7 @@ public final class Client extends GameShell implements Usernamed { Widget var8; if (ServerPacket.field850 == var1.serverPacket0) { - var38 = var3.method44(); + var38 = var3.readShort(); var6 = var3.method73(); var8 = Huffman.getWidget(var6); if (var38 != var8.sequenceId || var38 == -1) { @@ -4969,7 +4970,7 @@ public final class Client extends GameShell implements Usernamed { String var17; boolean var18; if (ServerPacket.field792 == var1.serverPacket0) { - var38 = var3.method48(); + var38 = var3.readUShortSmart(); var14 = var3.readUnsignedByte() == 1; var17 = ""; var18 = false; @@ -5142,7 +5143,7 @@ public final class Client extends GameShell implements Usernamed { } for (; var3.index < var1.serverPacket0Length; WorldMapManager.itemContainerSetItem(var6, var10, var11 - 1, var12)) { - var10 = var3.method48(); + var10 = var3.readUShortSmart(); var11 = var3.readUnsignedShort(); var12 = 0; if (var11 != 0) { @@ -5502,7 +5503,7 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field846 == var1.serverPacket0) { var3.index += 28; - if (var3.method54()) { + if (var3.checkCrc()) { class234.method4535(var3, var3.index - 28); } @@ -5546,7 +5547,7 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field860 == var1.serverPacket0) { GrandExchangeOfferAgeComparator.method159(); - weight = var3.method44(); + weight = var3.readShort(); field124 = cycleCntr; var1.serverPacket0 = null; return true; @@ -6528,7 +6529,7 @@ public final class Client extends GameShell implements Usernamed { viewportWidth = 0; viewportHeight = 0; viewportZoom = 0; - field119 = new PlayerAppearance(); + playerAppearance = new PlayerAppearance(); field118 = -1; field120 = -1; platformInfoProvider = new DesktopPlatformInfoProvider(); diff --git a/runescape-client/src/main/java/ClientParameter.java b/runescape-client/src/main/java/ClientParameter.java index 3ca51f2f48..85eddcd51d 100644 --- a/runescape-client/src/main/java/ClientParameter.java +++ b/runescape-client/src/main/java/ClientParameter.java @@ -145,10 +145,10 @@ public class ClientParameter { var2.host = var1.readStringCp1252NullTerminated(); var2.activity = var1.readStringCp1252NullTerminated(); var2.location = var1.readUnsignedByte(); - var2.population = var1.method44(); + var2.population = var1.readShort(); } - MilliClock.method3400(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.sortOption1, World.sortOption2); + MilliClock.sortWorlds(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.sortOption1, World.sortOption2); FriendLoginUpdate.field356 = null; return true; } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index 4e4e0739db..3a8f3dd9e9 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -172,7 +172,8 @@ public class Decimator { signature = "(Ldu;IIII)Z", garbageValue = "555449756" ) - static final boolean method2491(Model var0, int var1, int var2, int var3) { + @Export("boundingBoxCheck") + static final boolean boundingBoxCheck(Model model, int x, int y, int z) { boolean var4 = ViewportMouse.ViewportMouse_isInViewport; if (!var4) { return false; @@ -219,12 +220,12 @@ public class Decimator { class248.field1142 = Math.abs(Skeleton.field874); } - var5 = var0.xMid + var1; - var6 = var2 + var0.yMid; - var7 = var3 + var0.zMid; - var8 = var0.xMidOffset; - var12 = var0.yMidOffset; - var13 = var0.zMidOffset; + var5 = model.xMid + x; + var6 = y + model.yMid; + var7 = z + model.zMid; + var8 = model.xMidOffset; + var12 = model.yMidOffset; + var13 = model.zMidOffset; var9 = AccessFile.field7 - var5; var10 = ViewportMouse.field951 - var6; var11 = ViewportMouse.field952 - var7; diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java index 4ef75cf266..03f11c56c7 100644 --- a/runescape-client/src/main/java/DefaultsGroup.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -35,7 +35,7 @@ public class DefaultsGroup { garbageValue = "-2017595575" ) public static RectangleMode[] method5822() { - return new RectangleMode[]{RectangleMode.field758, RectangleMode.field757, RectangleMode.field759}; + return new RectangleMode[]{RectangleMode.GRADIENT_COLOR, RectangleMode.SOLID, RectangleMode.GRADIENT_ALPHA}; } static { diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index 292829e300..86dcbb5f66 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -150,13 +150,13 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { garbageValue = "-1516599170" ) @Export("drawInterface") - static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.Rasterizer3D_method1(); + static final void drawInterface(Widget[] components, int interfaceID, int xStart, int yStart, int xEnd, int yEnd, int var6, int var7, int var8) { + Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - for (int var9 = 0; var9 < var0.length; ++var9) { - Widget var10 = var0[var9]; - if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { + for (int var9 = 0; var9 < components.length; ++var9) { + Widget var10 = components[var9]; + if (var10 != null && (var10.parentId == interfaceID || interfaceID == 0xabcdabcd && var10 == Client.clickedWidget)) { int var11; if (var8 == -1) { Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; @@ -170,7 +170,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { var10.rootIndex = var11; var10.cycle = Client.cycle; - if (!var10.isIf3 || !PacketBufferNode.method3673(var10)) { + if (!var10.isIf3 || !PacketBufferNode.isComponentHidden(var10)) { if (var10.contentType > 0) { class15.method186(var10); } @@ -181,8 +181,8 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { int var15; int var16; if (var10 == Client.clickedWidget) { - if (var1 != -1412584499 && !var10.isScrollBar) { - class279.field1145 = var0; + if (interfaceID != -1412584499 && !var10.isScrollBar) { + class279.field1145 = components; class54.field1161 = var6; BuddyRankComparator.field1114 = var7; continue; @@ -225,10 +225,10 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { int var21; int var22; if (var10.type == 2) { - var15 = var2; - var16 = var3; - var17 = var4; - var18 = var5; + var15 = xStart; + var16 = yStart; + var17 = xEnd; + var18 = yEnd; } else if (var10.type == 9) { var22 = var12; var19 = var13; @@ -246,17 +246,17 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { ++var20; ++var21; - var15 = var22 > var2 ? var22 : var2; - var16 = var19 > var3 ? var19 : var3; - var17 = var20 < var4 ? var20 : var4; - var18 = var21 < var5 ? var21 : var5; + var15 = var22 > xStart ? var22 : xStart; + var16 = var19 > yStart ? var19 : yStart; + var17 = var20 < xEnd ? var20 : xEnd; + var18 = var21 < yEnd ? var21 : yEnd; } else { var22 = var12 + var10.width; var19 = var13 + var10.height; - var15 = var12 > var2 ? var12 : var2; - var16 = var13 > var3 ? var13 : var3; - var17 = var22 < var4 ? var22 : var4; - var18 = var19 < var5 ? var19 : var5; + var15 = var12 > xStart ? var12 : xStart; + var16 = var13 > yStart ? var13 : yStart; + var17 = var22 < xEnd ? var22 : xEnd; + var18 = var19 < yEnd ? var19 : yEnd; } if (!var10.isIf3 || var15 < var17 && var16 < var18) { @@ -284,19 +284,19 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { Client.field217 = var13; class40.drawEntities(var12, var13, var10.width, var10.height); Client.field100[var10.rootIndex] = true; - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd); continue; } if (var10.contentType == 1338) { MouseRecorder.method1189(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd); continue; } if (var10.contentType == 1339) { WorldMapRectangle.method296(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd); continue; } @@ -314,7 +314,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } if (var10.type == 0) { - if (!var10.isIf3 && PacketBufferNode.method3673(var10) && var10 != Clock.mousedOverWidgetIf1) { + if (!var10.isIf3 && PacketBufferNode.isComponentHidden(var10) && var10 != Clock.mousedOverWidgetIf1) { continue; } @@ -328,7 +328,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } } - drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + drawInterface(components, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); if (var10.children != null) { drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); } @@ -338,8 +338,8 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { Interpreter.drawWidgets(var23.group, var15, var16, var17, var18, var12, var13, var11); } - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.Rasterizer3D_method1(); + Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); } if (Client.isResizable || Client.field101[var11] || Client.gameDrawingMode > 1) { @@ -377,7 +377,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { boolean var35 = false; boolean var46 = false; var25 = var10.itemIds[var22] - 1; - if (var21 + 32 > var2 && var21 < var4 && var26 + 32 > var3 && var26 < var5 || var10 == dragInventoryWidget && var22 == Client.dragItemSlotSource) { + if (var21 + 32 > xStart && var21 < xEnd && var26 + 32 > yStart && var26 < yEnd || var10 == dragInventoryWidget && var22 == Client.dragItemSlotSource) { Sprite var42; if (Client.isItemSelected == 1 && var22 == HealthBarDefinition.selectedItemSlot && var10.id == ServerPacket.selectedItemWidget) { var42 = class226.getItemSprite(var25, var10.itemQuantities[var22], 2, 0, 2, false); @@ -403,8 +403,8 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } var42.method310(var21 + var33, var26 + var24, 128); - if (var1 != -1) { - Widget var47 = var0[var1 & 65535]; + if (interfaceID != -1) { + Widget var47 = components[interfaceID & 65535]; int var45; if (var26 + var24 < Rasterizer2D.Rasterizer2D_yClipStart && var47.scrollY > 0) { var45 = (Rasterizer2D.Rasterizer2D_yClipStart - var26 - var24) * Client.field183 / 3; @@ -464,12 +464,12 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } if (var10.fill) { - switch(var10.rectangleMode.id) { + switch(var10.rectangleMode.value) { case 1: - Rasterizer2D.Rasterizer2D_drawGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); + Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); break; case 2: - Rasterizer2D.drawGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparency & 255), 255 - (var10.field960 & 255)); + Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparency & 255), 255 - (var10.field960 & 255)); break; default: if (var14 == 0) { @@ -583,7 +583,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } } - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd); } } } @@ -613,7 +613,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } } else if (var10.modelType == 5) { if (var10.modelId == 0) { - var43 = Client.field119.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); + var43 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); } else { var43 = Canvas.localPlayer.getModel(); } @@ -717,12 +717,12 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { var33 = var12 + 5; } - if (var22 + var33 > var4) { - var33 = var4 - var22; + if (var22 + var33 > xEnd) { + var33 = xEnd - var22; } - if (var24 + var19 > var5) { - var24 = var5 - var19; + if (var24 + var19 > yEnd) { + var24 = yEnd - var19; } Rasterizer2D.Rasterizer2D_fillRectangle(var33, var24, var22, var19, 16777120); diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index c023e48d5a..c467592e44 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -421,7 +421,7 @@ public class DynamicObject extends Entity { var10.packetBuffer.writeByte(var13); var10.packetBuffer.writeByte(var14); TextureProvider.method2777(var10.packetBuffer, var3); - var10.packetBuffer.method41(var10.packetBuffer.index - var11); + var10.packetBuffer.writeLengthByte(var10.packetBuffer.index - var11); Client.packetWriter.method241(var10); return 1; } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { @@ -433,7 +433,7 @@ public class DynamicObject extends Entity { int var9 = var8.packetBuffer.index; var8.packetBuffer.writeStringCp1252NullTerminated(var3); TextureProvider.method2777(var8.packetBuffer, var7); - var8.packetBuffer.method40(var8.packetBuffer.index - var9); + var8.packetBuffer.writeLengthShort(var8.packetBuffer.index - var9); Client.packetWriter.method241(var8); return 1; } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index 81cb67cf78..d081332b56 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -80,7 +80,8 @@ public class Fonts { signature = "(I)Lbt;", garbageValue = "2102006478" ) - static World method5647() { - return World.field987 < World.worldsCount ? ItemContainer.worlds[++World.field987 - 1] : null; + @Export("getNextWorldListWorld") + static World getNextWorldListWorld() { + return World.worldListWorldCount < World.worldsCount ? ItemContainer.worlds[++World.worldListWorldCount - 1] : null; } } diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index 3cb846b185..21657bfe05 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -28,7 +28,7 @@ public class Frames extends DualNode { ) public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { NodeDeque var5 = new NodeDeque(); - int var6 = var1.method4(var3); + int var6 = var1.getGroupFileCount(var3); this.frames = new Animation[var6]; int[] var7 = var1.method3(var3); diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index e88a74d43f..89fec173ad 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -143,7 +143,7 @@ public class GrandExchangeOffer { int var0 = 0; for (int var1 = 0; var1 <= Client.archiveLoaderArchive; ++var1) { - var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).field409; + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; } return var0 * 10000 / Client.field140; diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index fe2abac0ab..a34c468e81 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -143,19 +143,19 @@ final class GrandExchangeOfferWorldComparator implements Comparator { var8 = -1; var9 = -1; var10 = -1; - var7 = var0.method48(); + var7 = var0.readUShortSmart(); if (var7 == 32767) { - var7 = var0.method48(); - var9 = var0.method48(); - var8 = var0.method48(); - var10 = var0.method48(); + var7 = var0.readUShortSmart(); + var9 = var0.readUShortSmart(); + var8 = var0.readUShortSmart(); + var10 = var0.readUShortSmart(); } else if (var7 != 32766) { - var9 = var0.method48(); + var9 = var0.readUShortSmart(); } else { var7 = -1; } - var11 = var0.method48(); + var11 = var0.readUShortSmart(); var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); } } @@ -163,10 +163,10 @@ final class GrandExchangeOfferWorldComparator implements Comparator { var6 = var0.method58(); if (var6 > 0) { for (var7 = 0; var7 < var6; ++var7) { - var8 = var0.method48(); - var9 = var0.method48(); + var8 = var0.readUShortSmart(); + var9 = var0.readUShortSmart(); if (var9 != 32767) { - var10 = var0.method48(); + var10 = var0.readUShortSmart(); var11 = var0.readUnsignedByte(); int var12 = var9 > 0 ? var0.method59() : var11; var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); diff --git a/runescape-client/src/main/java/GroundItemPile.java b/runescape-client/src/main/java/GroundItemPile.java index dc6c145b69..46e1dfe9fe 100644 --- a/runescape-client/src/main/java/GroundItemPile.java +++ b/runescape-client/src/main/java/GroundItemPile.java @@ -74,7 +74,7 @@ public final class GroundItemPile { } else if (!Widget.Widget_archive.tryLoadGroup(itf)) { return false; } else { - int var1 = Widget.Widget_archive.method4(itf); + int var1 = Widget.Widget_archive.getGroupFileCount(itf); if (var1 == 0) { Widget.loadedInterfaces[itf] = true; return true; diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 17c3f5e280..07ae476724 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -173,19 +173,19 @@ public class HitSplatDefinition extends DualNode { } else if (var2 == 6) { this.field391 = var1.method51(); } else if (var2 == 7) { - this.field392 = var1.method44(); + this.field392 = var1.readShort(); } else if (var2 == 8) { this.field395 = var1.readStringCp1252NullCircumfixed(); } else if (var2 == 9) { this.field387 = var1.readUnsignedShort(); } else if (var2 == 10) { - this.field393 = var1.method44(); + this.field393 = var1.readShort(); } else if (var2 == 11) { this.field394 = 0; } else if (var2 == 12) { this.field396 = var1.readUnsignedByte(); } else if (var2 == 13) { - this.field397 = var1.method44(); + this.field397 = var1.readShort(); } else if (var2 == 14) { this.field394 = var1.readUnsignedShort(); } else if (var2 == 17 || var2 == 18) { diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index f398bd47db..a00392cd96 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -35,42 +35,50 @@ public class Instrument { @ObfuscatedSignature( signature = "Lde;" ) - SoundEnvelope field413; + @Export("pitch") + SoundEnvelope pitch; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lde;" ) - SoundEnvelope field414; + @Export("volume") + SoundEnvelope volume; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lde;" ) - SoundEnvelope field415; + @Export("pitchModifier") + SoundEnvelope pitchModifier; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lde;" ) - SoundEnvelope field416; + @Export("pitchModifierAmplitude") + SoundEnvelope pitchModifierAmplitude; @ObfuscatedName("o") @ObfuscatedSignature( signature = "Lde;" ) - SoundEnvelope field417; + @Export("volumeMultiplier") + SoundEnvelope volumeMultiplier; @ObfuscatedName("u") @ObfuscatedSignature( signature = "Lde;" ) - SoundEnvelope field418; + @Export("volumeMultiplierAmplitude") + SoundEnvelope volumeMultiplierAmplitude; @ObfuscatedName("g") @ObfuscatedSignature( signature = "Lde;" ) - SoundEnvelope field419; + @Export("release") + SoundEnvelope release; @ObfuscatedName("l") @ObfuscatedSignature( signature = "Lde;" ) - SoundEnvelope field420; + @Export("attack") + SoundEnvelope attack; @ObfuscatedName("e") @Export("oscillatorVolume") int[] oscillatorVolume; @@ -96,7 +104,8 @@ public class Instrument { @ObfuscatedSignature( signature = "Lde;" ) - SoundEnvelope field421; + @Export("filterEnvelope") + SoundEnvelope filterEnvelope; @ObfuscatedName("z") @Export("duration") int duration; @@ -122,26 +131,26 @@ public class Instrument { return Instrument_samples; } else { double var3 = (double)var1 / ((double)var2 + 0.0D); - this.field413.reset(); - this.field414.reset(); + this.pitch.reset(); + this.volume.reset(); int var5 = 0; int var6 = 0; int var7 = 0; - if (this.field415 != null) { - this.field415.reset(); - this.field416.reset(); - var5 = (int)((double)(this.field415.end - this.field415.start) * 32.768D / var3); - var6 = (int)((double)this.field415.start * 32.768D / var3); + if (this.pitchModifier != null) { + this.pitchModifier.reset(); + this.pitchModifierAmplitude.reset(); + var5 = (int)((double)(this.pitchModifier.end - this.pitchModifier.start) * 32.768D / var3); + var6 = (int)((double)this.pitchModifier.start * 32.768D / var3); } int var8 = 0; int var9 = 0; int var10 = 0; - if (this.field417 != null) { - this.field417.reset(); - this.field418.reset(); - var8 = (int)((double)(this.field417.end - this.field417.start) * 32.768D / var3); - var9 = (int)((double)this.field417.start * 32.768D / var3); + if (this.volumeMultiplier != null) { + this.volumeMultiplier.reset(); + this.volumeMultiplierAmplitude.reset(); + var8 = (int)((double)(this.volumeMultiplier.end - this.volumeMultiplier.start) * 32.768D / var3); + var9 = (int)((double)this.volumeMultiplier.start * 32.768D / var3); } int var11; @@ -150,8 +159,8 @@ public class Instrument { Instrument_phases[var11] = 0; Instrument_delays[var11] = (int)((double)this.oscillatorDelays[var11] * var3); Instrument_volumeSteps[var11] = (this.oscillatorVolume[var11] << 14) / 100; - Instrument_pitchSteps[var11] = (int)((double)(this.field413.end - this.field413.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3); - Instrument_pitchBaseSteps[var11] = (int)((double)this.field413.start * 32.768D / var3); + Instrument_pitchSteps[var11] = (int)((double)(this.pitch.end - this.pitch.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3); + Instrument_pitchBaseSteps[var11] = (int)((double)this.pitch.start * 32.768D / var3); } } @@ -161,19 +170,19 @@ public class Instrument { int var15; int[] var16; for (var11 = 0; var11 < var1; ++var11) { - var12 = this.field413.doStep(var1); - var13 = this.field414.doStep(var1); - if (this.field415 != null) { - var14 = this.field415.doStep(var1); - var15 = this.field416.doStep(var1); - var12 += this.evaluateWave(var7, var15, this.field415.form) >> 1; + var12 = this.pitch.doStep(var1); + var13 = this.volume.doStep(var1); + if (this.pitchModifier != null) { + var14 = this.pitchModifier.doStep(var1); + var15 = this.pitchModifierAmplitude.doStep(var1); + var12 += this.evaluateWave(var7, var15, this.pitchModifier.form) >> 1; var7 = var7 + var6 + (var14 * var5 >> 16); } - if (this.field417 != null) { - var14 = this.field417.doStep(var1); - var15 = this.field418.doStep(var1); - var13 = var13 * ((this.evaluateWave(var10, var15, this.field417.form) >> 1) + 32768) >> 15; + if (this.volumeMultiplier != null) { + var14 = this.volumeMultiplier.doStep(var1); + var15 = this.volumeMultiplierAmplitude.doStep(var1); + var13 = var13 * ((this.evaluateWave(var10, var15, this.volumeMultiplier.form) >> 1) + 32768) >> 15; var10 = var10 + var9 + (var14 * var8 >> 16); } @@ -182,7 +191,7 @@ public class Instrument { var15 = Instrument_delays[var14] + var11; if (var15 < var1) { var16 = Instrument_samples; - var16[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.field413.form); + var16[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.pitch.form); var16 = Instrument_phases; var16[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14]; } @@ -191,20 +200,20 @@ public class Instrument { } int var17; - if (this.field419 != null) { - this.field419.reset(); - this.field420.reset(); + if (this.release != null) { + this.release.reset(); + this.attack.reset(); var11 = 0; boolean var18 = false; boolean var19 = true; for (var14 = 0; var14 < var1; ++var14) { - var15 = this.field419.doStep(var1); - var17 = this.field420.doStep(var1); + var15 = this.release.doStep(var1); + var17 = this.attack.doStep(var1); if (var19) { - var12 = (var15 * (this.field419.end - this.field419.start) >> 8) + this.field419.start; + var12 = (var15 * (this.release.end - this.release.start) >> 8) + this.release.start; } else { - var12 = (var17 * (this.field419.end - this.field419.start) >> 8) + this.field419.start; + var12 = (var17 * (this.release.end - this.release.start) >> 8) + this.release.start; } var11 += 256; @@ -228,11 +237,11 @@ public class Instrument { } } - if (this.filter.field36[0] > 0 || this.filter.field36[1] > 0) { - this.field421.reset(); - var11 = this.field421.doStep(var1 + 1); - var12 = this.filter.method26(0, (float)var11 / 65536.0F); - var13 = this.filter.method26(1, (float)var11 / 65536.0F); + if (this.filter.pairs[0] > 0 || this.filter.pairs[1] > 0) { + this.filterEnvelope.reset(); + var11 = this.filterEnvelope.doStep(var1 + 1); + var12 = this.filter.compute(0, (float)var11 / 65536.0F); + var13 = this.filter.compute(1, (float)var11 / 65536.0F); if (var1 >= var12 + var13) { var14 = 0; var15 = var13; @@ -242,18 +251,18 @@ public class Instrument { int var20; while (var14 < var15) { - var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.field35 >> 16); + var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); for (var20 = 0; var20 < var12; ++var20) { - var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var20] * (long)AudioFilter.field33[0][var20] >> 16); + var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var20] * (long)AudioFilter.coefficients[0][var20] >> 16); } for (var20 = 0; var20 < var14; ++var20) { - var17 -= (int)((long)Instrument_samples[var14 - 1 - var20] * (long)AudioFilter.field33[1][var20] >> 16); + var17 -= (int)((long)Instrument_samples[var14 - 1 - var20] * (long)AudioFilter.coefficients[1][var20] >> 16); } Instrument_samples[var14] = var17; - var11 = this.field421.doStep(var1 + 1); + var11 = this.filterEnvelope.doStep(var1 + 1); ++var14; } @@ -266,18 +275,18 @@ public class Instrument { int var21; while (var14 < var15) { - var20 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.field35 >> 16); + var20 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); for (var21 = 0; var21 < var12; ++var21) { - var20 += (int)((long)Instrument_samples[var14 + var12 - 1 - var21] * (long)AudioFilter.field33[0][var21] >> 16); + var20 += (int)((long)Instrument_samples[var14 + var12 - 1 - var21] * (long)AudioFilter.coefficients[0][var21] >> 16); } for (var21 = 0; var21 < var13; ++var21) { - var20 -= (int)((long)Instrument_samples[var14 - 1 - var21] * (long)AudioFilter.field33[1][var21] >> 16); + var20 -= (int)((long)Instrument_samples[var14 - 1 - var21] * (long)AudioFilter.coefficients[1][var21] >> 16); } Instrument_samples[var14] = var20; - var11 = this.field421.doStep(var1 + 1); + var11 = this.filterEnvelope.doStep(var1 + 1); ++var14; } @@ -286,22 +295,22 @@ public class Instrument { var20 = 0; for (var21 = var14 + var12 - var1; var21 < var12; ++var21) { - var20 += (int)((long)Instrument_samples[var14 + var12 - 1 - var21] * (long)AudioFilter.field33[0][var21] >> 16); + var20 += (int)((long)Instrument_samples[var14 + var12 - 1 - var21] * (long)AudioFilter.coefficients[0][var21] >> 16); } for (var21 = 0; var21 < var13; ++var21) { - var20 -= (int)((long)Instrument_samples[var14 - 1 - var21] * (long)AudioFilter.field33[1][var21] >> 16); + var20 -= (int)((long)Instrument_samples[var14 - 1 - var21] * (long)AudioFilter.coefficients[1][var21] >> 16); } Instrument_samples[var14] = var20; - this.field421.doStep(var1 + 1); + this.filterEnvelope.doStep(var1 + 1); ++var14; } break; } - var12 = this.filter.method26(0, (float)var11 / 65536.0F); - var13 = this.filter.method26(1, (float)var11 / 65536.0F); + var12 = this.filter.compute(0, (float)var11 / 65536.0F); + var13 = this.filter.compute(1, (float)var11 / 65536.0F); var15 += 128; } } @@ -333,55 +342,55 @@ public class Instrument { ) @Export("decode") final void decode(Buffer buffer) { - this.field413 = new SoundEnvelope(); - this.field413.decode(buffer); - this.field414 = new SoundEnvelope(); - this.field414.decode(buffer); + this.pitch = new SoundEnvelope(); + this.pitch.decode(buffer); + this.volume = new SoundEnvelope(); + this.volume.decode(buffer); int var2 = buffer.readUnsignedByte(); if (var2 != 0) { --buffer.index; - this.field415 = new SoundEnvelope(); - this.field415.decode(buffer); - this.field416 = new SoundEnvelope(); - this.field416.decode(buffer); + this.pitchModifier = new SoundEnvelope(); + this.pitchModifier.decode(buffer); + this.pitchModifierAmplitude = new SoundEnvelope(); + this.pitchModifierAmplitude.decode(buffer); } var2 = buffer.readUnsignedByte(); if (var2 != 0) { --buffer.index; - this.field417 = new SoundEnvelope(); - this.field417.decode(buffer); - this.field418 = new SoundEnvelope(); - this.field418.decode(buffer); + this.volumeMultiplier = new SoundEnvelope(); + this.volumeMultiplier.decode(buffer); + this.volumeMultiplierAmplitude = new SoundEnvelope(); + this.volumeMultiplierAmplitude.decode(buffer); } var2 = buffer.readUnsignedByte(); if (var2 != 0) { --buffer.index; - this.field419 = new SoundEnvelope(); - this.field419.decode(buffer); - this.field420 = new SoundEnvelope(); - this.field420.decode(buffer); + this.release = new SoundEnvelope(); + this.release.decode(buffer); + this.attack = new SoundEnvelope(); + this.attack.decode(buffer); } for (int var3 = 0; var3 < 10; ++var3) { - int var4 = buffer.method48(); + int var4 = buffer.readUShortSmart(); if (var4 == 0) { break; } this.oscillatorVolume[var3] = var4; - this.oscillatorPitch[var3] = buffer.method47(); - this.oscillatorDelays[var3] = buffer.method48(); + this.oscillatorPitch[var3] = buffer.readShortSmart(); + this.oscillatorDelays[var3] = buffer.readUShortSmart(); } - this.delayTime = buffer.method48(); - this.delayDecay = buffer.method48(); + this.delayTime = buffer.readUShortSmart(); + this.delayDecay = buffer.readUShortSmart(); this.duration = buffer.readUnsignedShort(); this.offset = buffer.readUnsignedShort(); this.filter = new AudioFilter(); - this.field421 = new SoundEnvelope(); - this.filter.method27(buffer, this.field421); + this.filterEnvelope = new SoundEnvelope(); + this.filter.method27(buffer, this.filterEnvelope); } static { diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index 17773e38ff..ca85e1b04b 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -48,7 +48,8 @@ public class Interpreter { @Export("Interpreter_calendar") static Calendar Interpreter_calendar; @ObfuscatedName("z") - static final String[] field422; + @Export("Interpreter_MONTHS") + static final String[] Interpreter_MONTHS; @ObfuscatedName("s") static boolean field423; @ObfuscatedName("t") @@ -139,7 +140,7 @@ public class Interpreter { World.sortOption1 = var2; World.sortOption2 = var3; - MilliClock.method3400(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.sortOption1, World.sortOption2); + MilliClock.sortWorlds(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.sortOption1, World.sortOption2); } @ObfuscatedName("w") @@ -186,12 +187,12 @@ public class Interpreter { garbageValue = "-10" ) @Export("drawWidgets") - static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (GroundItemPile.loadInterface(var0)) { + static final void drawWidgets(int interfaceID, int xStart, int yStart, int xEnd, int yEnd, int var5, int var6, int var7) { + if (GroundItemPile.loadInterface(interfaceID)) { class279.field1145 = null; - DevicePcmPlayerProvider.drawInterface(Widget.interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); + DevicePcmPlayerProvider.drawInterface(Widget.interfaceComponents[interfaceID], -1, xStart, yStart, xEnd, yEnd, var5, var6, var7); if (class279.field1145 != null) { - DevicePcmPlayerProvider.drawInterface(class279.field1145, -1412584499, var1, var2, var3, var4, class54.field1161, BuddyRankComparator.field1114, var7); + DevicePcmPlayerProvider.drawInterface(class279.field1145, -1412584499, xStart, yStart, xEnd, yEnd, class54.field1161, BuddyRankComparator.field1114, var7); class279.field1145 = null; } } else if (var7 != -1) { @@ -212,7 +213,7 @@ public class Interpreter { Interpreter_frameDepth = 0; Interpreter_frames = new ScriptFrame[50]; Interpreter_calendar = Calendar.getInstance(); - field422 = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; + Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; field423 = false; field424 = false; field425 = 0; diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index b7c0bfef42..235eec0d49 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -10,33 +11,39 @@ public final class IsaacCipher { @ObfuscatedGetter( intValue = 1514845493 ) - int field428; + @Export("valuesRemaining") + int valuesRemaining; @ObfuscatedName("o") - int[] field429; + @Export("results") + int[] results; @ObfuscatedName("u") - int[] field430; + @Export("mm") + int[] mm; @ObfuscatedName("g") @ObfuscatedGetter( intValue = -1670027699 ) - int field431; + @Export("aa") + int aa; @ObfuscatedName("l") @ObfuscatedGetter( intValue = -325762649 ) - int field432; + @Export("bb") + int bb; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -1951204929 ) - int field433; + @Export("cc") + int cc; - public IsaacCipher(int[] var1) { - this.field430 = new int[256]; - this.field429 = new int[256]; + public IsaacCipher(int[] seed) { + this.mm = new int[256]; + this.results = new int[256]; - for (int var2 = 0; var2 < var1.length; ++var2) { - this.field429[var2] = var1[var2]; + for (int var2 = 0; var2 < seed.length; ++var2) { + this.results[var2] = seed[var2]; } this.method139(); @@ -47,13 +54,14 @@ public final class IsaacCipher { signature = "(I)I", garbageValue = "-7509790" ) - final int method136() { - if (0 == --this.field428 + 1) { - this.method138(); - this.field428 = 255; + @Export("nextInt") + final int nextInt() { + if (0 == --this.valuesRemaining + 1) { + this.generateMoreResults(); + this.valuesRemaining = 255; } - return this.field429[this.field428]; + return this.results[this.valuesRemaining]; } @ObfuscatedName("f") @@ -62,12 +70,12 @@ public final class IsaacCipher { garbageValue = "-506873526" ) final int method137() { - if (this.field428 == 0) { - this.method138(); - this.field428 = 256; + if (this.valuesRemaining == 0) { + this.generateMoreResults(); + this.valuesRemaining = 256; } - return this.field429[this.field428 - 1]; + return this.results[this.valuesRemaining - 1]; } @ObfuscatedName("q") @@ -75,27 +83,28 @@ public final class IsaacCipher { signature = "(B)V", garbageValue = "124" ) - final void method138() { - this.field432 += ++this.field433; + @Export("generateMoreResults") + final void generateMoreResults() { + this.bb += ++this.cc; for (int var1 = 0; var1 < 256; ++var1) { - int var2 = this.field430[var1]; + int var2 = this.mm[var1]; if ((var1 & 2) == 0) { if ((var1 & 1) == 0) { - this.field431 ^= this.field431 << 13; + this.aa ^= this.aa << 13; } else { - this.field431 ^= this.field431 >>> 6; + this.aa ^= this.aa >>> 6; } } else if ((var1 & 1) == 0) { - this.field431 ^= this.field431 << 2; + this.aa ^= this.aa << 2; } else { - this.field431 ^= this.field431 >>> 16; + this.aa ^= this.aa >>> 16; } - this.field431 += this.field430[128 + var1 & 255]; + this.aa += this.mm[128 + var1 & 255]; int var3; - this.field430[var1] = var3 = this.field430[(var2 & 1020) >> 2] + this.field432 + this.field431; - this.field429[var1] = this.field432 = this.field430[(var3 >> 8 & 1020) >> 2] + var2; + this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.bb + this.aa; + this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2; } } @@ -106,14 +115,14 @@ public final class IsaacCipher { garbageValue = "579890110" ) final void method139() { - int var1 = -1640531527; - int var2 = -1640531527; - int var3 = -1640531527; - int var4 = -1640531527; - int var5 = -1640531527; - int var6 = -1640531527; - int var7 = -1640531527; - int var8 = -1640531527; + int var1 = 0x9e3779b9; + int var2 = 0x9e3779b9; + int var3 = 0x9e3779b9; + int var4 = 0x9e3779b9; + int var5 = 0x9e3779b9; + int var6 = 0x9e3779b9; + int var7 = 0x9e3779b9; + int var8 = 0x9e3779b9; int var9; for (var9 = 0; var9 < 4; ++var9) { @@ -144,14 +153,14 @@ public final class IsaacCipher { } for (var9 = 0; var9 < 256; var9 += 8) { - var8 += this.field429[var9]; - var7 += this.field429[var9 + 1]; - var6 += this.field429[var9 + 2]; - var5 += this.field429[var9 + 3]; - var4 += this.field429[var9 + 4]; - var3 += this.field429[var9 + 5]; - var2 += this.field429[var9 + 6]; - var1 += this.field429[var9 + 7]; + var8 += this.results[var9]; + var7 += this.results[var9 + 1]; + var6 += this.results[var9 + 2]; + var5 += this.results[var9 + 3]; + var4 += this.results[var9 + 4]; + var3 += this.results[var9 + 5]; + var2 += this.results[var9 + 6]; + var1 += this.results[var9 + 7]; var8 ^= var7 << 11; var5 += var8; var7 += var6; @@ -176,25 +185,25 @@ public final class IsaacCipher { var1 ^= var8 >>> 9; var6 += var1; var8 += var7; - this.field430[var9] = var8; - this.field430[var9 + 1] = var7; - this.field430[var9 + 2] = var6; - this.field430[var9 + 3] = var5; - this.field430[var9 + 4] = var4; - this.field430[var9 + 5] = var3; - this.field430[var9 + 6] = var2; - this.field430[var9 + 7] = var1; + this.mm[var9] = var8; + this.mm[var9 + 1] = var7; + this.mm[var9 + 2] = var6; + this.mm[var9 + 3] = var5; + this.mm[var9 + 4] = var4; + this.mm[var9 + 5] = var3; + this.mm[var9 + 6] = var2; + this.mm[var9 + 7] = var1; } for (var9 = 0; var9 < 256; var9 += 8) { - var8 += this.field430[var9]; - var7 += this.field430[var9 + 1]; - var6 += this.field430[var9 + 2]; - var5 += this.field430[var9 + 3]; - var4 += this.field430[var9 + 4]; - var3 += this.field430[var9 + 5]; - var2 += this.field430[var9 + 6]; - var1 += this.field430[var9 + 7]; + var8 += this.mm[var9]; + var7 += this.mm[var9 + 1]; + var6 += this.mm[var9 + 2]; + var5 += this.mm[var9 + 3]; + var4 += this.mm[var9 + 4]; + var3 += this.mm[var9 + 5]; + var2 += this.mm[var9 + 6]; + var1 += this.mm[var9 + 7]; var8 ^= var7 << 11; var5 += var8; var7 += var6; @@ -219,18 +228,18 @@ public final class IsaacCipher { var1 ^= var8 >>> 9; var6 += var1; var8 += var7; - this.field430[var9] = var8; - this.field430[var9 + 1] = var7; - this.field430[var9 + 2] = var6; - this.field430[var9 + 3] = var5; - this.field430[var9 + 4] = var4; - this.field430[var9 + 5] = var3; - this.field430[var9 + 6] = var2; - this.field430[var9 + 7] = var1; + this.mm[var9] = var8; + this.mm[var9 + 1] = var7; + this.mm[var9 + 2] = var6; + this.mm[var9 + 3] = var5; + this.mm[var9 + 4] = var4; + this.mm[var9 + 5] = var3; + this.mm[var9 + 6] = var2; + this.mm[var9 + 7] = var1; } - this.method138(); - this.field428 = 256; + this.generateMoreResults(); + this.valuesRemaining = 256; } @ObfuscatedName("m") @@ -238,7 +247,8 @@ public final class IsaacCipher { signature = "(Lir;Lir;I)V", garbageValue = "75867683" ) - public static void method4082(AbstractArchive var0, AbstractArchive var1) { + @Export("setNpcDefinitionArchives") + public static void setNpcDefinitionArchives(AbstractArchive var0, AbstractArchive var1) { NPCDefinition.NpcDefinition_archive = var0; NPCDefinition.NpcDefinition_modelArchive = var1; } diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index b29e3ea6c9..40a7592c28 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -22,7 +22,8 @@ public class ItemContainer extends Node { @ObfuscatedSignature( signature = "Lit;" ) - static Archive field434; + @Export("archive19") + static Archive archive19; @ObfuscatedName("f") @Export("ids") int[] ids; diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index f3c8232050..1bc3ba848e 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -22,7 +22,8 @@ public class KitDefinition extends DualNode { @ObfuscatedGetter( intValue = 235389995 ) - public static int field457; + @Export("KitDefinition_totalCount") + public static int KitDefinition_totalCount; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Ler;" @@ -245,7 +246,7 @@ public class KitDefinition extends DualNode { public static String method4866(Buffer var0) { String var1; try { - int var2 = var0.method48(); + int var2 = var0.readUShortSmart(); if (var2 > 32767) { var2 = 32767; } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index 39c810feeb..1c26096efc 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -38,7 +38,8 @@ public class LoginPacket implements ClientPacketMarker { @ObfuscatedSignature( signature = "[Lgl;" ) - static final LoginPacket[] field478; + @Export("LoginPacket_indexedValues") + static final LoginPacket[] LoginPacket_indexedValues; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 1743806243 @@ -101,11 +102,11 @@ public class LoginPacket implements ClientPacketMarker { field475 = new LoginPacket(16, -2); field476 = new LoginPacket(18, -2); field477 = new LoginPacket(27, 0); - field478 = new LoginPacket[32]; - LoginPacket[] var0 = WorldMapIcon2.method300(); + LoginPacket_indexedValues = new LoginPacket[32]; + LoginPacket[] var0 = WorldMapIcon2.LoginPacket_values(); for (int var1 = 0; var1 < var0.length; ++var1) { - field478[var0[var1].id] = var0[var1]; + LoginPacket_indexedValues[var0[var1].id] = var0[var1]; } } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index cd04c9ff89..b519c6b2b7 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -524,11 +524,11 @@ public class LoginScreenAnimation { Buffer var9 = new Buffer(var4.index + var5.index + var8.index + 5); var9.writeByte(2); var9.writeByte(var4.index); - var9.method38(var4.array, 0, var4.index); + var9.writeBytes(var4.array, 0, var4.index); var9.writeByte(var5.index); - var9.method38(var5.array, 0, var5.index); + var9.writeBytes(var5.array, 0, var5.index); var9.writeShort(var8.index); - var9.method38(var8.array, 0, var8.index); + var9.writeBytes(var8.array, 0, var8.index); byte[] var10 = var9.array; int var11 = var10.length; StringBuilder var12 = new StringBuilder(); diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index 7abeab23ee..9e01515cc3 100644 --- a/runescape-client/src/main/java/MidiFileReader.java +++ b/runescape-client/src/main/java/MidiFileReader.java @@ -120,7 +120,7 @@ public class MidiFileReader { @ObfuscatedName("l") @Export("readTrackLength") void readTrackLength(int trackId) { - int var2 = this.buffer.method52(); + int var2 = this.buffer.readVarInt(); int[] var3 = this.trackLengths; var3[trackId] += var2; } @@ -148,7 +148,7 @@ public class MidiFileReader { if (var3 != 240 && var3 != 247) { return this.method167(trackId, var3); } else { - int var4 = this.buffer.method52(); + int var4 = this.buffer.readVarInt(); if (var3 == 247 && var4 > 0) { int var5 = this.buffer.array[this.buffer.index] & 255; if (var5 >= 241 && var5 <= 243 || var5 == 246 || var5 == 248 || var5 >= 250 && var5 <= 252 || var5 == 254) { @@ -169,7 +169,7 @@ public class MidiFileReader { int var3; if (var2 == 255) { int var8 = this.buffer.readUnsignedByte(); - var3 = this.buffer.method52(); + var3 = this.buffer.readVarInt(); Buffer var5; if (var8 == 47) { var5 = this.buffer; diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 8c7e5bb61e..f66a6ba026 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -130,14 +130,15 @@ public class MilliClock extends Clock { signature = "([Lbt;II[I[II)V", garbageValue = "-1374398116" ) - static void method3400(World[] var0, int var1, int var2, int[] var3, int[] var4) { - if (var1 < var2) { - int var5 = var1 - 1; - int var6 = var2 + 1; - int var7 = (var2 + var1) / 2; - World var8 = var0[var7]; - var0[var7] = var0[var1]; - var0[var1] = var8; + @Export("sortWorlds") + static void sortWorlds(World[] worlds, int lowestUnsorted, int highestUnsorted, int[] sortOption1, int[] sortOption2) { + if (lowestUnsorted < highestUnsorted) { + int var5 = lowestUnsorted - 1; + int var6 = highestUnsorted + 1; + int var7 = (highestUnsorted + lowestUnsorted) / 2; + World var8 = worlds[var7]; + worlds[var7] = worlds[lowestUnsorted]; + worlds[lowestUnsorted] = var8; while (var5 < var6) { boolean var9 = true; @@ -149,29 +150,29 @@ public class MilliClock extends Clock { --var6; for (var10 = 0; var10 < 4; ++var10) { - if (var3[var10] == 2) { - var11 = var0[var6].index; + if (sortOption1[var10] == 2) { + var11 = worlds[var6].index; var12 = var8.index; - } else if (var3[var10] == 1) { - var11 = var0[var6].population; + } else if (sortOption1[var10] == 1) { + var11 = worlds[var6].population; var12 = var8.population; - if (var11 == -1 && var4[var10] == 1) { + if (var11 == -1 && sortOption2[var10] == 1) { var11 = 2001; } - if (var12 == -1 && var4[var10] == 1) { + if (var12 == -1 && sortOption2[var10] == 1) { var12 = 2001; } - } else if (var3[var10] == 3) { - var11 = var0[var6].isMembersOnly() ? 1 : 0; + } else if (sortOption1[var10] == 3) { + var11 = worlds[var6].isMembersOnly() ? 1 : 0; var12 = var8.isMembersOnly() ? 1 : 0; } else { - var11 = var0[var6].id; + var11 = worlds[var6].id; var12 = var8.id; } if (var12 != var11) { - if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { + if ((sortOption2[var10] != 1 || var11 <= var12) && (sortOption2[var10] != 0 || var11 >= var12)) { var9 = false; } break; @@ -189,29 +190,29 @@ public class MilliClock extends Clock { ++var5; for (var10 = 0; var10 < 4; ++var10) { - if (var3[var10] == 2) { - var11 = var0[var5].index; + if (sortOption1[var10] == 2) { + var11 = worlds[var5].index; var12 = var8.index; - } else if (var3[var10] == 1) { - var11 = var0[var5].population; + } else if (sortOption1[var10] == 1) { + var11 = worlds[var5].population; var12 = var8.population; - if (var11 == -1 && var4[var10] == 1) { + if (var11 == -1 && sortOption2[var10] == 1) { var11 = 2001; } - if (var12 == -1 && var4[var10] == 1) { + if (var12 == -1 && sortOption2[var10] == 1) { var12 = 2001; } - } else if (var3[var10] == 3) { - var11 = var0[var5].isMembersOnly() ? 1 : 0; + } else if (sortOption1[var10] == 3) { + var11 = worlds[var5].isMembersOnly() ? 1 : 0; var12 = var8.isMembersOnly() ? 1 : 0; } else { - var11 = var0[var5].id; + var11 = worlds[var5].id; var12 = var8.id; } if (var11 != var12) { - if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { + if ((sortOption2[var10] != 1 || var11 >= var12) && (sortOption2[var10] != 0 || var11 <= var12)) { var9 = false; } break; @@ -224,14 +225,14 @@ public class MilliClock extends Clock { } while(var9); if (var5 < var6) { - World var13 = var0[var5]; - var0[var5] = var0[var6]; - var0[var6] = var13; + World var13 = worlds[var5]; + worlds[var5] = worlds[var6]; + worlds[var6] = var13; } } - method3400(var0, var1, var6, var3, var4); - method3400(var0, var6 + 1, var2, var3, var4); + sortWorlds(worlds, lowestUnsorted, var6, sortOption1, sortOption2); + sortWorlds(worlds, var6 + 1, highestUnsorted, sortOption1, sortOption2); } } diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index 337cb289dd..0e010afbf3 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -1529,19 +1529,19 @@ public class Model extends Entity { @ObfuscatedName("cy") @Export("draw") - void draw(int yaw, int cameraPitchSine, int cameraPitchCosine, int cameraYawSine, int cameraYawCosine, int x, int y, int var8, long tag) { + void draw(int yaw, int cameraPitchSine, int cameraPitchCosine, int cameraYawSine, int cameraYawCosine, int x, int y, int z, long tag) { field529[0] = -1; if (this.boundsType != 1) { this.calculateBoundsCylinder(); } this.calculateBoundingBox(yaw); - int var11 = cameraYawCosine * var8 - cameraYawSine * x >> 16; + int var11 = cameraYawCosine * z - cameraYawSine * x >> 16; int var12 = cameraPitchSine * y + cameraPitchCosine * var11 >> 16; int var13 = cameraPitchCosine * this.xzRadius >> 16; int var14 = var12 + var13; if (var14 > 50 && var12 < 3500) { - int var15 = var8 * cameraYawSine + cameraYawCosine * x >> 16; + int var15 = z * cameraYawSine + cameraYawCosine * x >> 16; int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; if (var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) { int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; @@ -1578,7 +1578,7 @@ public class Model extends Entity { if (var30 && var29) { boolean var35 = false; if (field539) { - var35 = Decimator.method2491(this, x, y, var8); + var35 = Decimator.boundingBoxCheck(this, x, y, z); } else { var32 = var12 - var13; if (var32 <= 50) { @@ -1639,7 +1639,7 @@ public class Model extends Entity { var37 += x; var38 += y; - var39 += var8; + var39 += z; var40 = var39 * cameraYawSine + cameraYawCosine * var37 >> 16; var39 = cameraYawCosine * var39 - var37 * cameraYawSine >> 16; var37 = var40; diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index f466b29af9..009a9a53c6 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -532,17 +532,17 @@ public class ModelData extends Entity { var50 = var2.readUnsignedByte(); var51 = 0; if ((var50 & 1) != 0) { - var51 = var3.method47(); + var51 = var3.readShortSmart(); } var52 = 0; if ((var50 & 2) != 0) { - var52 = var4.method47(); + var52 = var4.readShortSmart(); } var53 = 0; if ((var50 & 4) != 0) { - var53 = var5.method47(); + var53 = var5.readShortSmart(); } this.verticesX[var49] = var46 + var51; @@ -602,9 +602,9 @@ public class ModelData extends Entity { for (var53 = 0; var53 < var10; ++var53) { var54 = var3.readUnsignedByte(); if (var54 == 1) { - var49 = var2.method47() + var52; - var50 = var2.method47() + var49; - var51 = var2.method47() + var50; + var49 = var2.readShortSmart() + var52; + var50 = var2.readShortSmart() + var49; + var51 = var2.readShortSmart() + var50; var52 = var51; this.indices1[var53] = var49; this.indices2[var53] = var50; @@ -613,7 +613,7 @@ public class ModelData extends Entity { if (var54 == 2) { var50 = var51; - var51 = var2.method47() + var52; + var51 = var2.readShortSmart() + var52; var52 = var51; this.indices1[var53] = var49; this.indices2[var53] = var50; @@ -622,7 +622,7 @@ public class ModelData extends Entity { if (var54 == 3) { var49 = var51; - var51 = var2.method47() + var52; + var51 = var2.readShortSmart() + var52; var52 = var51; this.indices1[var53] = var49; this.indices2[var53] = var50; @@ -633,7 +633,7 @@ public class ModelData extends Entity { int var55 = var49; var49 = var50; var50 = var55; - var51 = var2.method47() + var52; + var51 = var2.readShortSmart() + var52; var52 = var51; this.indices1[var53] = var49; this.indices2[var53] = var55; @@ -790,17 +790,17 @@ public class ModelData extends Entity { var39 = var4.readUnsignedByte(); var40 = 0; if ((var39 & 1) != 0) { - var40 = var5.method47(); + var40 = var5.readShortSmart(); } var41 = 0; if ((var39 & 2) != 0) { - var41 = var6.method47(); + var41 = var6.readShortSmart(); } var42 = 0; if ((var39 & 4) != 0) { - var42 = var7.method47(); + var42 = var7.readShortSmart(); } this.verticesX[var38] = var35 + var40; @@ -869,9 +869,9 @@ public class ModelData extends Entity { for (var42 = 0; var42 < var10; ++var42) { var43 = var5.readUnsignedByte(); if (var43 == 1) { - var38 = var4.method47() + var41; - var39 = var4.method47() + var38; - var40 = var4.method47() + var39; + var38 = var4.readShortSmart() + var41; + var39 = var4.readShortSmart() + var38; + var40 = var4.readShortSmart() + var39; var41 = var40; this.indices1[var42] = var38; this.indices2[var42] = var39; @@ -880,7 +880,7 @@ public class ModelData extends Entity { if (var43 == 2) { var39 = var40; - var40 = var4.method47() + var41; + var40 = var4.readShortSmart() + var41; var41 = var40; this.indices1[var42] = var38; this.indices2[var42] = var39; @@ -889,7 +889,7 @@ public class ModelData extends Entity { if (var43 == 3) { var38 = var40; - var40 = var4.method47() + var41; + var40 = var4.readShortSmart() + var41; var41 = var40; this.indices1[var42] = var38; this.indices2[var42] = var39; @@ -900,7 +900,7 @@ public class ModelData extends Entity { var44 = var38; var38 = var39; var39 = var44; - var40 = var4.method47() + var41; + var40 = var4.readShortSmart() + var41; var41 = var40; this.indices1[var42] = var38; this.indices2[var42] = var44; diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index f3e1510f7e..7334e28bc0 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -141,8 +141,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi return !mouseEvent.isAltDown() && var2 != 2 ? (!mouseEvent.isMetaDown() && var2 != 3 ? 1 : 2) : 4; } - @Export("mouseMoved") - @ObfuscatedName("mouseMoved") public final synchronized void mouseMoved(MouseEvent var1) { if (MouseHandler_instance != null) { MouseHandler_idleCycles = 0; @@ -153,8 +151,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } - @Export("mousePressed") - @ObfuscatedName("mousePressed") public final synchronized void mousePressed(MouseEvent var1) { if (MouseHandler_instance != null) { MouseHandler_idleCycles = 0; @@ -173,8 +169,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } - @Export("mouseReleased") - @ObfuscatedName("mouseReleased") public final synchronized void mouseReleased(MouseEvent var1) { if (MouseHandler_instance != null) { MouseHandler_idleCycles = 0; @@ -208,19 +202,13 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } - @Export("mouseDragged") - @ObfuscatedName("mouseDragged") public final synchronized void mouseDragged(MouseEvent var1) { this.mouseMoved(var1); } - @Export("focusGained") - @ObfuscatedName("focusGained") public final void focusGained(FocusEvent var1) { } - @Export("focusLost") - @ObfuscatedName("focusLost") public final synchronized void focusLost(FocusEvent var1) { if (MouseHandler_instance != null) { MouseHandler_currentButton0 = 0; @@ -228,8 +216,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } - @Export("mouseEntered") - @ObfuscatedName("mouseEntered") public final synchronized void mouseEntered(MouseEvent var1) { this.mouseMoved(var1); } diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java index 4ebabaf7ee..753ae666df 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -177,7 +177,7 @@ public class MusicPatch extends Node { var21 = -1; } - var23 = var2.method52(); + var23 = var2.readVarInt(); } this.field568[var24] = (short)(this.field568[var24] + ((var23 - 1 & 2) << 14)); diff --git a/runescape-client/src/main/java/MusicSample.java b/runescape-client/src/main/java/MusicSample.java index 48d701efb9..182e0b9278 100644 --- a/runescape-client/src/main/java/MusicSample.java +++ b/runescape-client/src/main/java/MusicSample.java @@ -122,7 +122,7 @@ public class MusicSample extends Node { } while(var6 >= 255); byte[] var7 = new byte[var5]; - var2.method46(var7, 0, var5); + var2.readBytes(var7, 0, var5); this.field620[var4] = var7; } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index deb18fb6d6..7c5b88f066 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -82,7 +82,7 @@ public class MusicTrack extends Node { var14 = var2 + var5 + var6 + var7 + var8 + var9 + var10 + var11 + var12; for (var15 = 0; var15 < var14; ++var15) { - var1.method52(); + var1.readVarInt(); } var4 += var1.index - var13; @@ -205,8 +205,8 @@ public class MusicTrack extends Node { while (true) { while (true) { - int var63 = var1.method52(); - var51.method42(var63); + int var63 = var1.readVarInt(); + var51.writeVarInt(var63); int var64 = var1.array[var29++] & 255; boolean var65 = var64 != var62; var62 = var64 & 15; @@ -217,7 +217,7 @@ public class MusicTrack extends Node { var51.writeByte(47); var51.writeByte(0); - var51.method39(var51.index - var61); + var51.writeLengthInt(var51.index - var61); continue label222; } diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index c459759de8..19788c8a3b 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -31,9 +31,9 @@ public class NetFileRequest extends DualNode { static final void method4555(Widget[] var0, int var1) { for (int var2 = 0; var2 < var0.length; ++var2) { Widget var3 = var0[var2]; - if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !PacketBufferNode.method3673(var3))) { + if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !PacketBufferNode.isComponentHidden(var3))) { if (var3.type == 0) { - if (!var3.isIf3 && PacketBufferNode.method3673(var3) && var3 != Clock.mousedOverWidgetIf1) { + if (!var3.isIf3 && PacketBufferNode.isComponentHidden(var3) && var3 != Clock.mousedOverWidgetIf1) { continue; } diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index d0187aad78..6a6a68db6f 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -440,11 +440,11 @@ public class ObjectDefinition extends DualNode { } else if (var2 == 69) { var1.readUnsignedByte(); } else if (var2 == 70) { - this.offsetX = var1.method44(); + this.offsetX = var1.readShort(); } else if (var2 == 71) { - this.offsetHeight = var1.method44(); + this.offsetHeight = var1.readShort(); } else if (var2 == 72) { - this.offsetY = var1.method44(); + this.offsetY = var1.readShort(); } else if (var2 == 73) { this.boolean2 = true; } else if (var2 == 74) { diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index 562ce452d3..2c70890ad6 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -19,8 +19,8 @@ public final class PacketBuffer extends Buffer { @ObfuscatedSignature( signature = "Lhn;" ) - @Export("isaacCipher0") - IsaacCipher isaacCipher0; + @Export("isaacCipher") + IsaacCipher isaacCipher; @ObfuscatedName("d") @ObfuscatedGetter( intValue = -1048718919 @@ -39,7 +39,7 @@ public final class PacketBuffer extends Buffer { ) @Export("newIsaacCipher") public void newIsaacCipher(int[] array) { - this.isaacCipher0 = new IsaacCipher(array); + this.isaacCipher = new IsaacCipher(array); } @ObfuscatedName("ih") @@ -49,7 +49,7 @@ public final class PacketBuffer extends Buffer { ) @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher isaacCipher) { - this.isaacCipher0 = isaacCipher; + this.isaacCipher = isaacCipher; } @ObfuscatedName("im") @@ -59,7 +59,7 @@ public final class PacketBuffer extends Buffer { ) @Export("writeByteIsaac") public void writeByteIsaac(int var1) { - super.array[++super.index - 1] = (byte)(var1 + this.isaacCipher0.method136()); + super.array[++super.index - 1] = (byte)(var1 + this.isaacCipher.nextInt()); } @ObfuscatedName("ii") @@ -69,7 +69,7 @@ public final class PacketBuffer extends Buffer { ) @Export("readByteIsaac") public int readByteIsaac() { - return super.array[++super.index - 1] - this.isaacCipher0.method136() & 255; + return super.array[++super.index - 1] - this.isaacCipher.nextInt() & 255; } @ObfuscatedName("ig") @@ -78,7 +78,7 @@ public final class PacketBuffer extends Buffer { garbageValue = "101" ) public boolean method236() { - int var1 = super.array[super.index] - this.isaacCipher0.method137() & 255; + int var1 = super.array[super.index] - this.isaacCipher.method137() & 255; return var1 >= 128; } @@ -89,8 +89,8 @@ public final class PacketBuffer extends Buffer { ) @Export("readSmartByteShortIsaac") public int readSmartByteShortIsaac() { - int var1 = super.array[++super.index - 1] - this.isaacCipher0.method136() & 255; - return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.index - 1] - this.isaacCipher0.method136() & 255); + int var1 = super.array[++super.index - 1] - this.isaacCipher.nextInt() & 255; + return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.index - 1] - this.isaacCipher.nextInt() & 255); } @ObfuscatedName("jb") @@ -100,7 +100,7 @@ public final class PacketBuffer extends Buffer { ) public void method237(byte[] var1, int var2, int var3) { for (int var4 = 0; var4 < var3; ++var4) { - var1[var4 + var2] = (byte)(super.array[++super.index - 1] - this.isaacCipher0.method136()); + var1[var4 + var2] = (byte)(super.array[++super.index - 1] - this.isaacCipher.nextInt()); } } @@ -175,7 +175,7 @@ public final class PacketBuffer extends Buffer { garbageValue = "-1562700981" ) @Export("requestNetFile") - static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { + static void requestNetFile(Archive archive, int var1, int var2, int var3, byte var4, boolean priority) { long var6 = (long)((var1 << 16) + var2); NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); if (var8 == null) { @@ -183,14 +183,14 @@ public final class PacketBuffer extends Buffer { if (var8 == null) { var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); if (var8 != null) { - if (var5) { + if (priority) { var8.removeDual(); NetCache.NetCache_pendingPriorityWrites.put(var8, var6); --NetCache.NetCache_pendingWritesCount; ++NetCache.NetCache_pendingPriorityWritesCount; } } else { - if (!var5) { + if (!priority) { var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); if (var8 != null) { return; @@ -198,10 +198,10 @@ public final class PacketBuffer extends Buffer { } var8 = new NetFileRequest(); - var8.archive = var0; + var8.archive = archive; var8.crc = var3; var8.padding = var4; - if (var5) { + if (priority) { NetCache.NetCache_pendingPriorityWrites.put(var8, var6); ++NetCache.NetCache_pendingPriorityWritesCount; } else { diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index 192a707d9b..551145d4b0 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -57,8 +57,9 @@ public class PacketBufferNode extends Node { signature = "(Lho;I)Z", garbageValue = "-739353556" ) - static boolean method3673(Widget var0) { - return var0.isHidden; + @Export("isComponentHidden") + static boolean isComponentHidden(Widget component) { + return component.isHidden; } static { diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index 56fe4d7e67..55e9f56060 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -128,7 +128,7 @@ public class PacketWriter { break; } - this.buffer.method38(var1.packetBuffer.array, 0, var1.field671); + this.buffer.writeBytes(var1.packetBuffer.array, 0, var1.field671); this.field672 -= var1.field671; var1.remove(); var1.packetBuffer.method36(); diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 1219103c7c..f51c19a45e 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -287,7 +287,7 @@ public final class Player extends Actor { this.appearance = new PlayerAppearance(); } - this.appearance.method256(var4, var9, var2 == 1, var3); + this.appearance.update(var4, var9, var2 == 1, var3); } @ObfuscatedName("f") diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java index 6b9510751b..ad5de3e57f 100644 --- a/runescape-client/src/main/java/PlayerAppearance.java +++ b/runescape-client/src/main/java/PlayerAppearance.java @@ -10,7 +10,8 @@ public class PlayerAppearance { @ObfuscatedName("g") public static short[] field726; @ObfuscatedName("d") - static final int[] field727; + @Export("equipmentIndices") + static final int[] equipmentIndices; @ObfuscatedName("k") @ObfuscatedSignature( signature = "Ler;" @@ -48,25 +49,26 @@ public class PlayerAppearance { signature = "([I[IZII)V", garbageValue = "727056871" ) - public void method256(int[] var1, int[] var2, boolean var3, int var4) { - if (var1 == null) { - var1 = new int[12]; + @Export("update") + public void update(int[] equipment, int[] bodyColors, boolean isFemale, int npcTransformId) { + if (equipment == null) { + equipment = new int[12]; for (int var5 = 0; var5 < 7; ++var5) { - for (int var6 = 0; var6 < KitDefinition.field457; ++var6) { + for (int var6 = 0; var6 < KitDefinition.KitDefinition_totalCount; ++var6) { KitDefinition var7 = WorldMapSection2.getKitDefinition(var6); - if (var7 != null && !var7.nonSelectable && var5 + (var3 ? 7 : 0) == var7.bodypartID) { - var1[field727[var5]] = var6 + 256; + if (var7 != null && !var7.nonSelectable && var5 + (isFemale ? 7 : 0) == var7.bodypartID) { + equipment[equipmentIndices[var5]] = var6 + 256; break; } } } } - this.equipment = var1; - this.bodyColors = var2; - this.isFemale = var3; - this.npcTransformId = var4; + this.equipment = equipment; + this.bodyColors = bodyColors; + this.isFemale = isFemale; + this.npcTransformId = npcTransformId; this.setHash(); } @@ -77,7 +79,7 @@ public class PlayerAppearance { ) public void method257(int var1, boolean var2) { if (var1 != 1 || !this.isFemale) { - int var3 = this.equipment[field727[var1]]; + int var3 = this.equipment[equipmentIndices[var1]]; if (var3 != 0) { var3 -= 256; @@ -88,11 +90,11 @@ public class PlayerAppearance { if (!var2) { --var3; if (var3 < 0) { - var3 = KitDefinition.field457 - 1; + var3 = KitDefinition.KitDefinition_totalCount - 1; } } else { ++var3; - if (var3 >= KitDefinition.field457) { + if (var3 >= KitDefinition.KitDefinition_totalCount) { var3 = 0; } } @@ -102,7 +104,7 @@ public class PlayerAppearance { } while(var4.nonSelectable); } while(var1 + (this.isFemale ? 7 : 0) != var4.bodypartID); - this.equipment[field727[var1]] = var3 + 256; + this.equipment[equipmentIndices[var1]] = var3 + 256; this.setHash(); } } @@ -143,7 +145,7 @@ public class PlayerAppearance { ) public void method259(boolean var1) { if (this.isFemale != var1) { - this.method256((int[])null, this.bodyColors, var1, -1); + this.update((int[])null, this.bodyColors, var1, -1); } } @@ -158,7 +160,7 @@ public class PlayerAppearance { int var2; for (var2 = 0; var2 < 7; ++var2) { - int var3 = this.equipment[field727[var2]]; + int var3 = this.equipment[equipmentIndices[var2]]; if (var3 == 0) { var1.writeByte(-1); } else { @@ -408,7 +410,7 @@ public class PlayerAppearance { } static { - field727 = new int[]{8, 11, 4, 6, 9, 7, 10}; + equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); } } diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java index 1409081934..181dc8e39c 100644 --- a/runescape-client/src/main/java/Rasterizer2D.java +++ b/runescape-client/src/main/java/Rasterizer2D.java @@ -411,9 +411,9 @@ public class Rasterizer2D extends DualNode { } - @Export("Rasterizer2D_drawGradient") + @Export("Rasterizer2D_fillRectangleGradient") @ObfuscatedName("dw") - public static void Rasterizer2D_drawGradient(int x, int y, int width, int height, int rgbTop, int rgbBot) { + public static void Rasterizer2D_fillRectangleGradient(int x, int y, int width, int height, int rgbTop, int rgbBot) { if (width > 0 && height > 0) { int var6 = 0; int var7 = 65536 / height; @@ -456,8 +456,8 @@ public class Rasterizer2D extends DualNode { } @ObfuscatedName("dv") - @Export("drawGradientAlpha") - public static void drawGradientAlpha(int x, int y, int width, int height, int rgbTop, int rgbBot, int alphaTop, int alphaBot) { + @Export("Rasterizer2D_fillRectangleGradientAlpha") + public static void Rasterizer2D_fillRectangleGradientAlpha(int x, int y, int width, int height, int rgbTop, int rgbBot, int alphaTop, int alphaBot) { if (width > 0 && height > 0) { int var8 = 0; int var9 = 65536 / height; diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java index 2541162f80..992dff9e1b 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -69,8 +69,8 @@ public class Rasterizer3D extends Rasterizer2D { public static int[] Rasterizer3D_cosine; @ObfuscatedName("m") - @Export("Rasterizer3D_method1") - public static final void Rasterizer3D_method1() { + @Export("Rasterizer3D_setClipFromRasterizer2D") + public static final void Rasterizer3D_setClipFromRasterizer2D() { Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); } diff --git a/runescape-client/src/main/java/RectangleMode.java b/runescape-client/src/main/java/RectangleMode.java index 8ff42d1569..06257b72d3 100644 --- a/runescape-client/src/main/java/RectangleMode.java +++ b/runescape-client/src/main/java/RectangleMode.java @@ -11,17 +11,20 @@ public enum RectangleMode implements Enumerated { @ObfuscatedSignature( signature = "Llj;" ) - field757(0, 0), + @Export("SOLID") + SOLID(0, 0), @ObfuscatedName("f") @ObfuscatedSignature( signature = "Llj;" ) - field758(1, 1), + @Export("GRADIENT_COLOR") + GRADIENT_COLOR(1, 1), @ObfuscatedName("q") @ObfuscatedSignature( signature = "Llj;" ) - field759(2, 2); + @Export("GRADIENT_ALPHA") + GRADIENT_ALPHA(2, 2); @ObfuscatedName("d") @Export("musicTrackBoolean") @@ -30,18 +33,18 @@ public enum RectangleMode implements Enumerated { @ObfuscatedGetter( intValue = -1391612747 ) - @Export("id") - public final int id; + @Export("value") + public final int value; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -1204297807 ) - @Export("id2") - final int id2; + @Export("id") + final int id; private RectangleMode(int var3, int var4) { - this.id = var3; - this.id2 = var4; + this.value = var3; + this.id = var4; } @ObfuscatedName("f") @@ -51,7 +54,7 @@ public enum RectangleMode implements Enumerated { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id2; + return this.id; } @ObfuscatedName("m") @@ -59,9 +62,10 @@ public enum RectangleMode implements Enumerated { signature = "(Lir;Lir;ZB)V", garbageValue = "1" ) - public static void method6028(AbstractArchive var0, AbstractArchive var1, boolean var2) { + @Export("setObjectDefinitionArchives") + public static void setObjectDefinitionArchives(AbstractArchive var0, AbstractArchive var1, boolean isLowDetail) { ObjectDefinition.ObjectDefinition_archive = var0; ObjectDefinition.field640 = var1; - ObjectDefinition.ObjectDefinition_isLowDetail = var2; + ObjectDefinition.ObjectDefinition_isLowDetail = isLowDetail; } } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index 68feb8a77e..f5779b1c83 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -500,7 +500,7 @@ public class ServerPacket { int var13 = 0; while (true) { - int var14 = var10.method48(); + int var14 = var10.readUShortSmart(); if (var14 == 0) { break; } diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java index c529ad236a..0ba06677af 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -123,9 +123,9 @@ public class SoundCache { ) @Export("getSoundEffect") public RawSound getSoundEffect(int var1, int[] var2) { - if (this.soundEffectIndex.method5() == 1) { + if (this.soundEffectIndex.getGroupCount() == 1) { return this.getSoundEffect0(0, var1, var2); - } else if (this.soundEffectIndex.method4(var1) == 1) { + } else if (this.soundEffectIndex.getGroupFileCount(var1) == 1) { return this.getSoundEffect0(var1, 0, var2); } else { throw new RuntimeException(); @@ -139,9 +139,9 @@ public class SoundCache { ) @Export("getMusicSample") public RawSound getMusicSample(int var1, int[] var2) { - if (this.musicSampleIndex.method5() == 1) { + if (this.musicSampleIndex.getGroupCount() == 1) { return this.getMusicSample0(0, var1, var2); - } else if (this.musicSampleIndex.method4(var1) == 1) { + } else if (this.musicSampleIndex.getGroupFileCount(var1) == 1) { return this.getMusicSample0(var1, 0, var2); } else { throw new RuntimeException(); diff --git a/runescape-client/src/main/java/Sprite.java b/runescape-client/src/main/java/Sprite.java index 81b909b331..7de90a652c 100644 --- a/runescape-client/src/main/java/Sprite.java +++ b/runescape-client/src/main/java/Sprite.java @@ -181,7 +181,8 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("l") - public void method307(int var1) { + @Export("outline") + public void outline(int color) { int[] var2 = new int[this.subWidth * this.subHeight]; int var3 = 0; @@ -190,13 +191,13 @@ public final class Sprite extends Rasterizer2D { int var6 = this.pixels[var3]; if (var6 == 0) { if (var5 > 0 && this.pixels[var3 - 1] != 0) { - var6 = var1; + var6 = color; } else if (var4 > 0 && this.pixels[var3 - this.subWidth] != 0) { - var6 = var1; + var6 = color; } else if (var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) { - var6 = var1; + var6 = color; } else if (var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) { - var6 = var1; + var6 = color; } } @@ -208,13 +209,14 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("e") - public void method308(int var1) { + @Export("shadow") + public void shadow(int color) { for (int var2 = this.subHeight - 1; var2 > 0; --var2) { int var3 = var2 * this.subWidth; for (int var4 = this.subWidth - 1; var4 > 0; --var4) { if (this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) { - this.pixels[var4 + var3] = var1; + this.pixels[var4 + var3] = color; } } } diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index 7e7903bafb..4e4ca80681 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -31,7 +31,7 @@ public class Strings { throw new RuntimeException(); } else if (var2 == 0) { byte[] var6 = new byte[var3]; - var1.method46(var6, 0, var3); + var1.readBytes(var6, 0, var3); return var6; } else { int var4 = var1.readInt(); diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java index 54c69195ff..c572412dd1 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -69,7 +69,7 @@ public class TextureProvider implements TextureLoader { this.textureSize = var6; int[] var7 = var1.method3(0); int var8 = var7.length; - this.textures = new Texture[var1.method4(0)]; + this.textures = new Texture[var1.getGroupFileCount(0)]; for (int var9 = 0; var9 < var8; ++var9) { Buffer var10 = new Buffer(var1.takeFile(0, var7[var9])); @@ -277,7 +277,7 @@ public class TextureProvider implements TextureLoader { while (true) { int var13; while (!var8) { - var13 = var4.method48(); + var13 = var4.readUShortSmart(); if (var13 == 0) { continue label56; } @@ -301,7 +301,7 @@ public class TextureProvider implements TextureLoader { } } - var13 = var4.method48(); + var13 = var4.readUShortSmart(); if (var13 == 0) { break; } diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index a0c6b7e792..91e28b043d 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -71,7 +71,7 @@ public class UserComparator7 extends AbstractUserComparator { for (int var12 = 0; var12 < var7; ++var12) { var11 = var0.readInt(); var10[var12] = new byte[var11]; - var0.method46(var10[var12], 0, var11); + var0.readBytes(var10[var12], 0, var11); } } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index 8081a699f5..0b73237f57 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -33,7 +33,7 @@ public class Varcs { Varcs() { this.unwrittenChanges = false; - int var1 = ObjectSound.archive2.method4(19); + int var1 = ObjectSound.archive2.getGroupFileCount(19); this.map = new HashMap(); this.intsPersistence = new boolean[var1]; @@ -45,7 +45,7 @@ public class Varcs { var2 = 0; if (ObjectSound.archive2.method133(15)) { - var2 = ObjectSound.archive2.method4(15); + var2 = ObjectSound.archive2.getGroupFileCount(15); } this.strings = new String[var2]; diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index a18fcda29b..0778f793cb 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -39,10 +39,10 @@ public class Varps { ) static void method4400(Buffer var0) { if (Client.field172 != null) { - var0.method38(Client.field172, 0, Client.field172.length); + var0.writeBytes(Client.field172, 0, Client.field172.length); } else { byte[] var1 = AttackOption.method2032(); - var0.method38(var1, 0, var1.length); + var0.writeBytes(var1, 0, var1.length); } } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index 8ca879af33..ae4ed28680 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -112,26 +112,26 @@ public class ViewportMouse { if (var1 >= 300 && var1 <= 313) { var2 = (var1 - 300) / 2; var3 = var1 & 1; - Client.field119.method257(var2, var3 == 1); + Client.playerAppearance.method257(var2, var3 == 1); } if (var1 >= 314 && var1 <= 323) { var2 = (var1 - 314) / 2; var3 = var1 & 1; - Client.field119.method258(var2, var3 == 1); + Client.playerAppearance.method258(var2, var3 == 1); } if (var1 == 324) { - Client.field119.method259(false); + Client.playerAppearance.method259(false); } if (var1 == 325) { - Client.field119.method259(true); + Client.playerAppearance.method259(true); } if (var1 == 326) { PacketBufferNode var4 = Interpreter.method1915(ClientPacket.field234, Client.packetWriter.isaacCipher); - Client.field119.method260(var4.packetBuffer); + Client.playerAppearance.method260(var4.packetBuffer); Client.packetWriter.method241(var4); return true; } else { diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java index 517e9deb81..66423c855c 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -88,7 +88,7 @@ public final class WallDecoration { int var2 = -1; for (int var3 = 0; var3 < var1; ++var3) { - var2 = var2 >>> 8 ^ Buffer.field45[(var2 ^ var0[var3]) & 255]; + var2 = var2 >>> 8 ^ Buffer.crc32Table[(var2 ^ var0[var3]) & 255]; } var2 = ~var2; diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 11fb4c6deb..69b5dca3b4 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -724,7 +724,7 @@ public class Widget extends Node { this.mouseOverColor = 0; this.mouseOverColor2 = 0; this.fill = false; - this.rectangleMode = RectangleMode.field757; + this.rectangleMode = RectangleMode.SOLID; this.transparency = 0; this.field960 = 0; this.lineWid = 1; @@ -801,8 +801,8 @@ public class Widget extends Node { this.type = buffer.readUnsignedByte(); this.buttonType = buffer.readUnsignedByte(); this.contentType = buffer.readUnsignedShort(); - this.rawX = buffer.method44(); - this.rawY = buffer.method44(); + this.rawX = buffer.readShort(); + this.rawY = buffer.readShort(); this.rawWidth = buffer.readUnsignedShort(); this.rawHeight = buffer.readUnsignedShort(); this.transparency = buffer.readUnsignedByte(); @@ -893,8 +893,8 @@ public class Widget extends Node { for (var8 = 0; var8 < 20; ++var8) { int var9 = buffer.readUnsignedByte(); if (var9 == 1) { - this.inventoryXOffsets[var8] = buffer.method44(); - this.inventoryYOffsets[var8] = buffer.method44(); + this.inventoryXOffsets[var8] = buffer.readShort(); + this.inventoryYOffsets[var8] = buffer.readShort(); this.inventorySprites[var8] = buffer.readInt(); } else { this.inventorySprites[var8] = -1; @@ -987,8 +987,8 @@ public class Widget extends Node { this.textShadowed = buffer.readUnsignedByte() == 1; this.color = buffer.readInt(); - this.paddingX = buffer.method44(); - this.paddingY = buffer.method44(); + this.paddingX = buffer.readShort(); + this.paddingY = buffer.readShort(); var4 = buffer.readUnsignedByte(); if (var4 == 1) { this.clickMask |= 1073741824; @@ -1058,11 +1058,11 @@ public class Widget extends Node { this.isIf3 = true; this.type = buffer.readUnsignedByte(); this.contentType = buffer.readUnsignedShort(); - this.rawX = buffer.method44(); - this.rawY = buffer.method44(); + this.rawX = buffer.readShort(); + this.rawY = buffer.readShort(); this.rawWidth = buffer.readUnsignedShort(); if (this.type == 9) { - this.rawHeight = buffer.method44(); + this.rawHeight = buffer.readShort(); } else { this.rawHeight = buffer.readUnsignedShort(); } @@ -1103,8 +1103,8 @@ public class Widget extends Node { this.modelId = -1; } - this.modelOffsetX = buffer.method44(); - this.modelOffsetY = buffer.method44(); + this.modelOffsetX = buffer.readShort(); + this.modelOffsetY = buffer.readShort(); this.modelAngleX = buffer.readUnsignedShort(); this.modelAngleY = buffer.readUnsignedShort(); this.modelAngleZ = buffer.readUnsignedShort(); @@ -1293,15 +1293,15 @@ public class Widget extends Node { } if (this.outline >= 1) { - var5.method307(1); + var5.outline(1); } if (this.outline >= 2) { - var5.method307(16777215); + var5.outline(16777215); } if (this.spriteShadow != 0) { - var5.method308(this.spriteShadow); + var5.shadow(this.spriteShadow); } widgetSpriteCache.put(var5, var3); diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index 410e309591..75467409f7 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -17,7 +17,8 @@ public class World { @ObfuscatedGetter( intValue = 1143875805 ) - static int field987; + @Export("worldListWorldCount") + static int worldListWorldCount; @ObfuscatedName("l") @Export("sortOption2") static int[] sortOption2; @@ -136,7 +137,7 @@ public class World { static { worldsCount = 0; - field987 = 0; + worldListWorldCount = 0; sortOption2 = new int[]{1, 1, 1, 1}; sortOption1 = new int[]{0, 1, 2, 3}; } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index f4a1c44e73..b3f27793bc 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -177,7 +177,7 @@ public class WorldMapElement extends DualNode { int var4; for (var4 = 0; var4 < var3 * 2; ++var4) { - this.field1023[var4] = buffer.method44(); + this.field1023[var4] = buffer.readShort(); } buffer.readInt(); @@ -210,8 +210,8 @@ public class WorldMapElement extends DualNode { buffer.readUnsignedByte(); buffer.readUnsignedByte(); } else if (opcode == 24) { - buffer.method44(); - buffer.method44(); + buffer.readShort(); + buffer.readShort(); } else if (opcode == 25) { buffer.method51(); } else if (opcode == 28) { diff --git a/runescape-client/src/main/java/WorldMapIcon2.java b/runescape-client/src/main/java/WorldMapIcon2.java index e29e9aca9a..1f03250147 100644 --- a/runescape-client/src/main/java/WorldMapIcon2.java +++ b/runescape-client/src/main/java/WorldMapIcon2.java @@ -115,7 +115,8 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { signature = "(I)[Lgl;", garbageValue = "1026409510" ) - static LoginPacket[] method300() { + @Export("LoginPacket_values") + static LoginPacket[] LoginPacket_values() { return new LoginPacket[]{LoginPacket.field475, LoginPacket.field476, LoginPacket.field473, LoginPacket.field477, LoginPacket.field474}; } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index 801b7a91f9..dae9994f72 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -148,7 +148,7 @@ public class WorldMapLabel { } } - var0.method53(var2); + var0.writeCrc(var2); var1.remove(); } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index a558fcd511..f86e3b2de0 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -35,7 +35,8 @@ public class WorldMapLabelSize { @ObfuscatedSignature( signature = "Lit;" ) - static Archive field1040; + @Export("archive18") + static Archive archive18; @ObfuscatedName("fi") @ObfuscatedGetter( intValue = 1577759565 diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 2b669590f6..43ef750c5d 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -13,8 +13,8 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("WorldMapManager") public final class WorldMapManager { @ObfuscatedName("m") - @Export("isLoaded0") - boolean isLoaded0; + @Export("loaded") + boolean loaded; @ObfuscatedName("f") @Export("loadStarted") boolean loadStarted; @@ -92,7 +92,7 @@ public final class WorldMapManager { signature = "([Llq;Ljava/util/HashMap;Lir;Lir;)V" ) public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { - this.isLoaded0 = false; + this.loaded = false; this.loadStarted = false; this.field1045 = new HashMap(); this.field1050 = 0; @@ -108,15 +108,15 @@ public final class WorldMapManager { garbageValue = "32" ) @Export("load") - public void load(AbstractArchive indexCache, String cacheName, boolean isMembersWorld) { + public void load(AbstractArchive archive, String cacheName, boolean isMembersWorld) { if (!this.loadStarted) { - this.isLoaded0 = false; + this.loaded = false; this.loadStarted = true; System.nanoTime(); - int var4 = indexCache.getGroupId(WorldMapCacheName.WorldMapCacheName_details.name); - int var5 = indexCache.getFileId(var4, cacheName); - Buffer var6 = new Buffer(indexCache.takeFileByNames(WorldMapCacheName.WorldMapCacheName_details.name, cacheName)); - Buffer var7 = new Buffer(indexCache.takeFileByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, cacheName)); + int var4 = archive.getGroupId(WorldMapCacheName.WorldMapCacheName_details.name); + int var5 = archive.getFileId(var4, cacheName); + Buffer var6 = new Buffer(archive.takeFileByNames(WorldMapCacheName.WorldMapCacheName_details.name, cacheName)); + Buffer var7 = new Buffer(archive.takeFileByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, cacheName)); System.nanoTime(); System.nanoTime(); this.mapAreaData = new WorldMapAreaData(); @@ -164,15 +164,15 @@ public final class WorldMapManager { System.nanoTime(); System.nanoTime(); - if (indexCache.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, cacheName)) { - byte[] var18 = indexCache.takeFileByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, cacheName); + if (archive.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, cacheName)) { + byte[] var18 = archive.takeFileByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, cacheName); this.overviewSprite = class27.convertJpgToSprite(var18); } System.nanoTime(); - indexCache.method6(); - indexCache.method8(); - this.isLoaded0 = true; + archive.method6(); + archive.method8(); + this.loaded = true; } } @@ -315,7 +315,7 @@ public final class WorldMapManager { ) public List method403(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { LinkedList var11 = new LinkedList(); - if (!this.isLoaded0) { + if (!this.loaded) { return var11; } else { WorldMapRectangle var12 = this.method643(var1, var2, var3, var4); @@ -386,7 +386,7 @@ public final class WorldMapManager { ) @Export("isLoaded") public boolean isLoaded() { - return this.isLoaded0; + return this.loaded; } @ObfuscatedName("e") diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java index a75566568a..3276cdc08b 100644 --- a/runescape-client/src/main/java/WorldMapRectangle.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -24,8 +24,8 @@ public final class WorldMapRectangle @ObfuscatedSignature( signature = "Lit;" ) - @Export("archive16") - static Archive archive16; + @Export("archive17") + static Archive archive17; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 1976624405 @@ -89,13 +89,13 @@ public final class WorldMapRectangle garbageValue = "-15" ) @Export("newArchive") - static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { + static Archive newArchive(int index, boolean releaseGroups, boolean shallowFiles, boolean var3) { ArchiveDisk var4 = null; if (class168.dat2File != null) { - var4 = new ArchiveDisk(var0, class168.dat2File, ArchiveDiskAction.idxFiles[var0], 1000000); + var4 = new ArchiveDisk(index, class168.dat2File, ArchiveDiskAction.idxFiles[index], 1000000); } - return new Archive(var4, Fonts.masterDisk, var0, var1, var2, var3); + return new Archive(var4, Fonts.masterDisk, index, releaseGroups, shallowFiles, var3); } @ObfuscatedName("jp") diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 0b55613c3c..cc68c4570b 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -298,7 +298,7 @@ public class WorldMapSection2 implements WorldMapSection { Client.field127 = null; Client.menuOptionsCount = 0; Client.isMenuOpen = false; - Client.field119.method256((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); + Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); for (var0 = 0; var0 < 8; ++var0) { Client.playerMenuActions[var0] = null; diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index 30441ed6bd..5b094b7385 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -91,8 +91,8 @@ public enum WorldMapSectionType implements Enumerated { signature = "(IZIZI)V", garbageValue = "2102950996" ) - @Export("sortWorlds") - static void sortWorlds(int primaryMode, boolean primaryReversed, int secondaryMode, boolean secondaryReversed) { + @Export("sortWorldList") + static void sortWorldList(int primaryMode, boolean primaryReversed, int secondaryMode, boolean secondaryReversed) { if (ItemContainer.worlds != null) { class3.doWorldSorting(0, ItemContainer.worlds.length - 1, primaryMode, primaryReversed, secondaryMode, secondaryReversed); } diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java index c221cc9d65..05982b75e4 100644 --- a/runescape-client/src/main/java/class14.java +++ b/runescape-client/src/main/java/class14.java @@ -16,9 +16,9 @@ public class class14 { Buffer var3 = new Buffer(500); var3.writeByte(3); var3.writeByte(var1 != null ? 1 : 0); - var3.method37(var0.getPath()); + var3.writeCESU8(var0.getPath()); if (var1 != null) { - var3.method37(""); + var3.writeCESU8(""); } var2.write(var3.array, 0, var3.index); diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java index beec47d32f..c58056d2b0 100644 --- a/runescape-client/src/main/java/class15.java +++ b/runescape-client/src/main/java/class15.java @@ -169,40 +169,40 @@ public class class15 extends class21 { signature = "(Lho;I)V", garbageValue = "1585987978" ) - static final void method186(Widget var0) { - int var1 = var0.contentType; + static final void method186(Widget component) { + int var1 = component.contentType; if (var1 == 324) { if (Client.field118 == -1) { - Client.field118 = var0.spriteId2; - Client.field120 = var0.spriteId; + Client.field118 = component.spriteId2; + Client.field120 = component.spriteId; } - if (Client.field119.isFemale) { - var0.spriteId2 = Client.field118; + if (Client.playerAppearance.isFemale) { + component.spriteId2 = Client.field118; } else { - var0.spriteId2 = Client.field120; + component.spriteId2 = Client.field120; } } else if (var1 == 325) { if (Client.field118 == -1) { - Client.field118 = var0.spriteId2; - Client.field120 = var0.spriteId; + Client.field118 = component.spriteId2; + Client.field120 = component.spriteId; } - if (Client.field119.isFemale) { - var0.spriteId2 = Client.field120; + if (Client.playerAppearance.isFemale) { + component.spriteId2 = Client.field120; } else { - var0.spriteId2 = Client.field118; + component.spriteId2 = Client.field118; } } else if (var1 == 327) { - var0.modelAngleX = 150; - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; - var0.modelType = 5; - var0.modelId = 0; + component.modelAngleX = 150; + component.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; + component.modelType = 5; + component.modelId = 0; } else if (var1 == 328) { - var0.modelAngleX = 150; - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; - var0.modelType = 5; - var0.modelId = 1; + component.modelAngleX = 150; + component.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; + component.modelType = 5; + component.modelId = 1; } } diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index 3de5f3d753..e367b2fbc8 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -115,10 +115,10 @@ public class class171 { ByteArrayPool.archive13 = WorldMapRectangle.newArchive(13, true, false, true); class2.archive14 = WorldMapRectangle.newArchive(14, false, true, true); WorldMapSection2.archive15 = WorldMapRectangle.newArchive(15, false, true, true); - WorldMapRectangle.archive16 = WorldMapRectangle.newArchive(17, true, true, true); - WorldMapLabelSize.field1040 = WorldMapRectangle.newArchive(18, false, true, true); - ItemContainer.field434 = WorldMapRectangle.newArchive(19, false, true, true); - AbstractByteArrayCopier.field0 = WorldMapRectangle.newArchive(20, false, true, true); + WorldMapRectangle.archive17 = WorldMapRectangle.newArchive(17, true, true, true); + WorldMapLabelSize.archive18 = WorldMapRectangle.newArchive(18, false, true, true); + ItemContainer.archive19 = WorldMapRectangle.newArchive(19, false, true, true); + AbstractByteArrayCopier.archive20 = WorldMapRectangle.newArchive(20, false, true, true); Login.Login_loadingText = "Connecting to update server"; Login.Login_loadingPercent = 20; Client.titleLoadingStage = 40; @@ -140,10 +140,10 @@ public class class171 { var0 += ByteArrayPool.archive13.percentage() * 2 / 100; var0 += class2.archive14.percentage() * 2 / 100; var0 += WorldMapSection2.archive15.percentage() * 2 / 100; - var0 += ItemContainer.field434.percentage() / 100; - var0 += WorldMapLabelSize.field1040.percentage() / 100; - var0 += AbstractByteArrayCopier.field0.percentage() / 100; - var0 += WorldMapRectangle.archive16.method130() && WorldMapRectangle.archive16.method2() ? 1 : 0; + var0 += ItemContainer.archive19.percentage() / 100; + var0 += WorldMapLabelSize.archive18.percentage() / 100; + var0 += AbstractByteArrayCopier.archive20.percentage() / 100; + var0 += WorldMapRectangle.archive17.method130() && WorldMapRectangle.archive17.method2() ? 1 : 0; if (var0 != 100) { if (var0 != 0) { Login.Login_loadingText = "Checking for updates - " + var0 + "%"; @@ -161,11 +161,11 @@ public class class171 { AbstractWorldMapIcon.method625(Login.archive11, "Music Jingles"); AbstractWorldMapIcon.method625(class2.archive14, "Music Samples"); AbstractWorldMapIcon.method625(WorldMapSection2.archive15, "Music Patches"); - AbstractWorldMapIcon.method625(ItemContainer.field434, "World Map"); - AbstractWorldMapIcon.method625(WorldMapLabelSize.field1040, "World Map Geography"); - AbstractWorldMapIcon.method625(AbstractByteArrayCopier.field0, "World Map Ground"); + AbstractWorldMapIcon.method625(ItemContainer.archive19, "World Map"); + AbstractWorldMapIcon.method625(WorldMapLabelSize.archive18, "World Map Geography"); + AbstractWorldMapIcon.method625(AbstractByteArrayCopier.archive20, "World Map Ground"); Calendar.spriteIds = new GraphicsDefaults(); - Calendar.spriteIds.decode(WorldMapRectangle.archive16); + Calendar.spriteIds.decode(WorldMapRectangle.archive17); Login.Login_loadingText = "Loaded update list"; Login.Login_loadingPercent = 30; Client.titleLoadingStage = 45; @@ -230,9 +230,9 @@ public class class171 { Archive var33 = class40.archive7; KitDefinition.KitDefinition_archive = var31; KitDefinition.field456 = var33; - KitDefinition.field457 = KitDefinition.KitDefinition_archive.method4(3); - RectangleMode.method6028(ObjectSound.archive2, class40.archive7, Client.isLowDetail); - IsaacCipher.method4082(ObjectSound.archive2, class40.archive7); + KitDefinition.KitDefinition_totalCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); + RectangleMode.setObjectDefinitionArchives(ObjectSound.archive2, class40.archive7, Client.isLowDetail); + IsaacCipher.setNpcDefinitionArchives(ObjectSound.archive2, class40.archive7); var30 = ObjectSound.archive2; StructDefinition.StructDefinition_archive = var30; Archive var5 = ObjectSound.archive2; @@ -242,7 +242,7 @@ public class class171 { ItemDefinition.ItemDefinition_archive = var5; ItemDefinition.ItemDefinition_modelArchive = var6; class30.inMembersWorld = var7; - class83.field1167 = ItemDefinition.ItemDefinition_archive.method4(10); + class83.field1167 = ItemDefinition.ItemDefinition_archive.getGroupFileCount(10); class204.field1122 = var8; Archive var9 = ObjectSound.archive2; Archive var10 = AbstractArchive.archive0; @@ -257,7 +257,7 @@ public class class171 { GrandExchangeOfferUnitPriceComparator.setVarbitDefinitionArchive(ObjectSound.archive2); Archive var14 = ObjectSound.archive2; VarpDefinition.field943 = var14; - VarpDefinition.field944 = VarpDefinition.field943.method4(16); + VarpDefinition.field944 = VarpDefinition.field943.getGroupFileCount(16); Archive var15 = WorldMapIcon1.archive3; Archive var16 = class40.archive7; Archive var17 = WorldMapSection1.archive8; @@ -266,8 +266,8 @@ public class class171 { BufferedSource.field54 = var16; Widget.field955 = var17; class27.field1143 = var18; - Widget.interfaceComponents = new Widget[Widget.Widget_archive.method5()][]; - Widget.loadedInterfaces = new boolean[Widget.Widget_archive.method5()]; + Widget.interfaceComponents = new Widget[Widget.Widget_archive.getGroupCount()][]; + Widget.loadedInterfaces = new boolean[Widget.Widget_archive.getGroupCount()]; Archive var19 = ObjectSound.archive2; class4.InvDefinition_archive = var19; Archive var20 = ObjectSound.archive2; @@ -285,7 +285,7 @@ public class class171 { Archive var25 = WorldMapSection1.archive8; WorldMapElement.WorldMapElement_archive = var25; if (var24.method2()) { - UserComparator4.WorldMapElement_count = var24.method4(35); + UserComparator4.WorldMapElement_count = var24.getGroupFileCount(35); Widget.WorldMapElement_cached = new WorldMapElement[UserComparator4.WorldMapElement_count]; for (int var26 = 0; var26 < UserComparator4.WorldMapElement_count; ++var26) { @@ -514,12 +514,12 @@ public class class171 { } } else if (Client.titleLoadingStage == 140) { Login.Login_loadingPercent = 100; - if (!ItemContainer.field434.tryLoadGroupByName(WorldMapCacheName.WorldMapCacheName_details.name)) { - Login.Login_loadingText = "Loading world map - " + ItemContainer.field434.groupLoadPercentByName(WorldMapCacheName.WorldMapCacheName_details.name) / 10 + "%"; + if (!ItemContainer.archive19.tryLoadGroupByName(WorldMapCacheName.WorldMapCacheName_details.name)) { + Login.Login_loadingText = "Loading world map - " + ItemContainer.archive19.groupLoadPercentByName(WorldMapCacheName.WorldMapCacheName_details.name) / 10 + "%"; } else { if (class60.worldMap0 == null) { class60.worldMap0 = new WorldMap(); - class60.worldMap0.init(ItemContainer.field434, WorldMapLabelSize.field1040, AbstractByteArrayCopier.field0, class2.fontBold12, Client.fontsMap, class192.mapSceneSprites); + class60.worldMap0.init(ItemContainer.archive19, WorldMapLabelSize.archive18, AbstractByteArrayCopier.archive20, class2.fontBold12, Client.fontsMap, class192.mapSceneSprites); } Login.Login_loadingText = "Loaded world map"; diff --git a/runescape-client/src/main/java/class190.java b/runescape-client/src/main/java/class190.java index d0a6e50c4b..0da28fa61f 100644 --- a/runescape-client/src/main/java/class190.java +++ b/runescape-client/src/main/java/class190.java @@ -70,9 +70,10 @@ public class class190 { signature = "(I)Lbt;", garbageValue = "-68901151" ) - static World method3672() { - World.field987 = 0; - return Fonts.method5647(); + @Export("worldListStart") + static World worldListStart() { + World.worldListWorldCount = 0; + return Fonts.getNextWorldListWorld(); } @ObfuscatedName("iv") diff --git a/runescape-client/src/main/java/class204.java b/runescape-client/src/main/java/class204.java index fe7e8011c0..91a9695535 100644 --- a/runescape-client/src/main/java/class204.java +++ b/runescape-client/src/main/java/class204.java @@ -30,10 +30,10 @@ public class class204 { signature = "(Lir;Ljava/lang/String;Ljava/lang/String;IZB)V", garbageValue = "0" ) - public static void method4011(AbstractArchive var0, String var1, String var2, int var3, boolean var4) { - int var5 = var0.getGroupId(var1); - int var6 = var0.getFileId(var5, var2); - Login.method2076(var0, var5, var6, var3, var4); + public static void method4011(AbstractArchive archive, String groupName, String fileName, int var3, boolean var4) { + int var5 = archive.getGroupId(groupName); + int var6 = archive.getFileId(var5, fileName); + Login.method2076(archive, var5, var6, var3, var4); } @ObfuscatedName("w") diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java index 2b38dda583..c7fa01f8f1 100644 --- a/runescape-client/src/main/java/class21.java +++ b/runescape-client/src/main/java/class21.java @@ -246,19 +246,19 @@ public abstract class class21 { var8 = -1; var9 = -1; var12 = -1; - var11 = var0.method48(); + var11 = var0.readUShortSmart(); if (var11 == 32767) { - var11 = var0.method48(); - var9 = var0.method48(); - var8 = var0.method48(); - var12 = var0.method48(); + var11 = var0.readUShortSmart(); + var9 = var0.readUShortSmart(); + var8 = var0.readUShortSmart(); + var12 = var0.readUShortSmart(); } else if (var11 != 32766) { - var9 = var0.method48(); + var9 = var0.readUShortSmart(); } else { var11 = -1; } - var13 = var0.method48(); + var13 = var0.readUShortSmart(); var3.addHitSplat(var11, var9, var8, var12, Client.cycle, var13); } } @@ -266,10 +266,10 @@ public abstract class class21 { var7 = var0.readUnsignedByteNegate(); if (var7 > 0) { for (var11 = 0; var11 < var7; ++var11) { - var8 = var0.method48(); - var9 = var0.method48(); + var8 = var0.readUShortSmart(); + var9 = var0.readUShortSmart(); if (var9 != 32767) { - var12 = var0.method48(); + var12 = var0.readUShortSmart(); var13 = var0.method58(); var10 = var9 > 0 ? var0.readUnsignedByte() : var13; var3.addHealthBar(var8, Client.cycle, var9, var12, var13, var10); @@ -382,7 +382,7 @@ public abstract class class21 { if (!var19 && Client.field208 == 0 && !var3.isHidden) { Players.field738.index = 0; - var0.method46(Players.field738.array, 0, var8); + var0.readBytes(Players.field738.array, 0, var8); Players.field738.index = 0; String var14 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(Players.field738))); var3.overheadText = var14.trim(); diff --git a/runescape-client/src/main/java/class226.java b/runescape-client/src/main/java/class226.java index 717fe2281a..9432e890f4 100644 --- a/runescape-client/src/main/java/class226.java +++ b/runescape-client/src/main/java/class226.java @@ -19,23 +19,23 @@ public class class226 { garbageValue = "-76173898" ) @Export("getItemSprite") - public static final Sprite getItemSprite(int var0, int quantity, int var2, int var3, int var4, boolean var5) { + public static final Sprite getItemSprite(int id, int quantity, int outline, int shadow, int quantityMode, boolean noted) { if (quantity == -1) { - var4 = 0; - } else if (var4 == 2 && quantity != 1) { - var4 = 1; + quantityMode = 0; + } else if (quantityMode == 2 && quantity != 1) { + quantityMode = 1; } - long var6 = ((long)quantity << 16) + (long)var0 + ((long)var2 << 38) + ((long)var4 << 40) + ((long)var3 << 42); + long var6 = ((long)quantity << 16) + (long)id + ((long)outline << 38) + ((long)quantityMode << 40) + ((long)shadow << 42); Sprite var8; - if (!var5) { + if (!noted) { var8 = (Sprite)ItemDefinition.Sprite_cached.get(var6); if (var8 != null) { return var8; } } - ItemDefinition var9 = Skills.getItemDefinition(var0); + ItemDefinition var9 = Skills.getItemDefinition(id); if (quantity > 1 && var9.countobj != null) { int var10 = -1; @@ -61,7 +61,7 @@ public class class226 { return null; } } else if (var9.notedId != -1) { - var20 = getItemSprite(var9.unnotedId, quantity, var2, var3, 0, false); + var20 = getItemSprite(var9.unnotedId, quantity, outline, shadow, 0, false); if (var20 == null) { return null; } @@ -80,7 +80,7 @@ public class class226 { var8 = new Sprite(36, 32); Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); Rasterizer2D.Rasterizer2D_clear(); - Rasterizer3D.Rasterizer3D_method1(); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); Rasterizer3D.method2989(16, 16); Rasterizer3D.field741 = false; if (var9.placeholderTemplate != -1) { @@ -88,9 +88,9 @@ public class class226 { } int var16 = var9.zoom2d; - if (var5) { + if (noted) { var16 = (int)((double)var16 * 1.5D); - } else if (var2 == 2) { + } else if (outline == 2) { var16 = (int)((double)var16 * 1.04D); } @@ -102,16 +102,16 @@ public class class226 { var20.drawAt2(0, 0); } - if (var2 >= 1) { - var8.method307(1); + if (outline >= 1) { + var8.outline(1); } - if (var2 >= 2) { - var8.method307(16777215); + if (outline >= 2) { + var8.outline(16777215); } - if (var3 != 0) { - var8.method308(var3); + if (shadow != 0) { + var8.shadow(shadow); } Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); @@ -119,17 +119,17 @@ public class class226 { var20.drawAt2(0, 0); } - if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { + if (quantityMode == 1 || quantityMode == 2 && var9.isStackable == 1) { class204.field1122.draw(class196.method3735(quantity), 0, 9, 16776960, 1); } - if (!var5) { + if (!noted) { ItemDefinition.Sprite_cached.put(var8, var6); } Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); Rasterizer2D.Rasterizer2D_setClipArray(var15); - Rasterizer3D.Rasterizer3D_method1(); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); Rasterizer3D.field741 = true; return var8; } diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java index dd236c8353..b7aa774a6e 100644 --- a/runescape-client/src/main/java/class238.java +++ b/runescape-client/src/main/java/class238.java @@ -56,10 +56,10 @@ public final class class238 { Widget var9 = components[var8]; if (var9 != null && var9.parentId == parentId && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class1.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { if (var9.isIf3) { - if (PacketBufferNode.method3673(var9)) { + if (PacketBufferNode.isComponentHidden(var9)) { continue; } - } else if (var9.type == 0 && var9 != Clock.mousedOverWidgetIf1 && PacketBufferNode.method3673(var9)) { + } else if (var9.type == 0 && var9 != Clock.mousedOverWidgetIf1 && PacketBufferNode.isComponentHidden(var9)) { continue; } diff --git a/runescape-client/src/main/java/class31.java b/runescape-client/src/main/java/class31.java index ad52fd4fdb..f4c2c2884a 100644 --- a/runescape-client/src/main/java/class31.java +++ b/runescape-client/src/main/java/class31.java @@ -62,7 +62,7 @@ public class class31 { } else { World var3; if (var0 == ScriptOpcodes.WORLDLIST_START) { - var3 = class190.method3672(); + var3 = class190.worldListStart(); if (var3 != null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.id; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.properties; @@ -81,7 +81,7 @@ public class class31 { return 1; } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { - var3 = Fonts.method5647(); + var3 = Fonts.getNextWorldListWorld(); if (var3 != null) { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.id; Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.properties; @@ -137,7 +137,7 @@ public class class31 { boolean var9 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1; var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; boolean var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3] == 1; - WorldMapSectionType.sortWorlds(var6, var9, var5, var10); + WorldMapSectionType.sortWorldList(var6, var9, var5, var10); return 1; } else if (var0 != ScriptOpcodes.GETWORLDINFO) { if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java index bdb93f4406..1a197bd508 100644 --- a/runescape-client/src/main/java/class40.java +++ b/runescape-client/src/main/java/class40.java @@ -705,7 +705,7 @@ public class class40 { var2 = Client.viewportWidth; var3 = Client.viewportHeight; Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - Rasterizer3D.Rasterizer3D_method1(); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); int var9; int var10; int var11; From 35f8ff65b6ce84e828500d039f8464a9efe5108f Mon Sep 17 00:00:00 2001 From: 7ate9 <7ate9@users.noreply.github.com`> Date: Mon, 8 Jul 2019 16:53:48 -0400 Subject: [PATCH 468/472] widgetpressed: add event for draggable widgets being pressed --- .../runelite/api/events/WidgetPressed.java | 42 +++++++++++++++++++ .../net/runelite/mixins/RSClientMixin.java | 11 +++++ .../java/net/runelite/rs/api/RSClient.java | 3 ++ .../net/runelite/rs/api/RSMenuAction.java | 29 +++++++++++++ 4 files changed, 85 insertions(+) create mode 100644 runelite-api/src/main/java/net/runelite/api/events/WidgetPressed.java create mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSMenuAction.java diff --git a/runelite-api/src/main/java/net/runelite/api/events/WidgetPressed.java b/runelite-api/src/main/java/net/runelite/api/events/WidgetPressed.java new file mode 100644 index 0000000000..12ee089c80 --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/events/WidgetPressed.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2019, 7ate9 + * Copyright (c) 2019, https://runelitepl.us + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.api.events; + +import lombok.Data; + +/** + * An event where a draggable widget has been pressed. + */ +@Data +public class WidgetPressed +{ + public static final WidgetPressed INSTANCE = new WidgetPressed(); + + private WidgetPressed() + { + // noop + } +} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index c00cc189ad..575a9ba80d 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -86,6 +86,7 @@ import net.runelite.api.events.ResizeableChanged; import net.runelite.api.events.UsernameChanged; import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.WidgetLoaded; +import net.runelite.api.events.WidgetPressed; import net.runelite.api.hooks.Callbacks; import net.runelite.api.hooks.DrawCallbacks; import net.runelite.api.vars.AccountType; @@ -1304,6 +1305,16 @@ public abstract class RSClientMixin implements RSClient client.sendMenuAction(actionParam, widgetId, menuAction, id, menuOption, "!AUTHENTIC" + menuTarget, var6, var7); } + @Inject + @FieldHook("tempMenuAction") + public static void onTempMenuActionChanged(int idx) + { + if (client.getTempMenuAction() != null) + { + client.getCallbacks().post(WidgetPressed.INSTANCE); + } + } + @FieldHook("Login_username") @Inject public static void onUsernameChanged(int idx) diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index 421bc5e64e..81d2d25014 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java @@ -392,6 +392,9 @@ public interface RSClient extends RSGameShell, Client @Import("menuAction") void sendMenuAction(int n2, int n3, int n4, int n5, String string, String string2, int n6, int n7); + @Import("tempMenuAction") + RSMenuAction getTempMenuAction(); + @Import("decodeSprite") void decodeSprite(byte[] data); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSMenuAction.java b/runescape-api/src/main/java/net/runelite/rs/api/RSMenuAction.java new file mode 100644 index 0000000000..02cf730a39 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSMenuAction.java @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2019, https://runelitepl.us + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.rs.api; + +public interface RSMenuAction +{ +} From daf1a5efb902bb7bd40a05edd5f70f75cd37a7a6 Mon Sep 17 00:00:00 2001 From: 7ate9 <7ate9@users.noreply.github.com`> Date: Mon, 8 Jul 2019 17:02:11 -0400 Subject: [PATCH 469/472] menumanager: fix inaccurate left click options for inventory items --- .../runelite/client/menus/MenuManager.java | 67 +++++++++++++------ 1 file changed, 46 insertions(+), 21 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java index 5ff9277e18..70ab8ebadf 100644 --- a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java +++ b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java @@ -31,6 +31,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -62,6 +63,7 @@ import net.runelite.api.events.NpcActionChanged; import net.runelite.api.events.PlayerMenuOptionClicked; import net.runelite.api.events.PlayerMenuOptionsChanged; import net.runelite.api.events.WidgetMenuOptionClicked; +import net.runelite.api.events.WidgetPressed; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.eventbus.EventBus; import net.runelite.client.eventbus.Subscribe; @@ -97,6 +99,7 @@ public class MenuManager private final LinkedHashSet entries = Sets.newLinkedHashSet(); private MenuEntry leftClickEntry = null; + private MenuEntry firstEntry = null; @Inject private MenuManager(Client client, EventBus eventBus) @@ -150,7 +153,7 @@ public class MenuManager // Need to reorder the list to normal, then rebuild with swaps MenuEntry[] oldEntries = event.getMenuEntries(); - leftClickEntry = null; + firstEntry = null; client.sortMenuEntries(); @@ -280,24 +283,23 @@ public class MenuManager @Subscribe public void onBeforeRender(BeforeRender event) { - leftClickEntry = null; - - if (client.isMenuOpen()) - { - return; - } - rebuildLeftClickMenu(); } - private void rebuildLeftClickMenu() + private MenuEntry rebuildLeftClickMenu() { + if (client.isMenuOpen()) + { + return null; + } + + firstEntry = null; entries.clear(); entries.addAll(Arrays.asList(client.getMenuEntries())); if (entries.size() < 2) { - return; + return null; } if (!hiddenEntries.isEmpty()) @@ -316,22 +318,24 @@ public class MenuManager indexPriorityEntries(entries); } - if (leftClickEntry == null && !swaps.isEmpty()) + if (firstEntry == null && !swaps.isEmpty()) { indexSwapEntries(entries); } - if (leftClickEntry != null) + if (firstEntry != null) { - entries.remove(leftClickEntry); - entries.add(leftClickEntry); + entries.remove(firstEntry); + entries.add(firstEntry); } else if (!currentHiddenEntries.isEmpty()) { - leftClickEntry = Iterables.getLast(entries, null); + firstEntry = Iterables.getLast(entries, null); } client.setMenuEntries(entries.toArray(new MenuEntry[0])); + + return firstEntry; } public void addPlayerMenuItem(String menuText) @@ -435,12 +439,23 @@ public class MenuManager } } + @Subscribe + public void onWidgetPressed(WidgetPressed event) + { + leftClickEntry = rebuildLeftClickMenu(); + } + @Subscribe public void onMenuOptionClicked(MenuOptionClicked event) { if (!client.isMenuOpen() && event.isAuthentic()) { - rebuildLeftClickMenu(); + // The mouse button will not be 0 if a non draggable widget was clicked, + // otherwise the left click entry will have been set in onWidgetPressed + if (client.getMouseCurrentButton() != 0) + { + leftClickEntry = rebuildLeftClickMenu(); + } if (leftClickEntry != null) { @@ -808,21 +823,31 @@ public class MenuManager } }); - leftClickEntry = Iterables.getLast(safeCurrentPriorityEntries.entrySet().stream() + firstEntry = Iterables.getLast(safeCurrentPriorityEntries.entrySet().stream() .sorted(Comparator.comparingInt(e -> e.getValue().getPriority())) .map(Map.Entry::getKey) .collect(Collectors.toList()), null); } - private void indexSwapEntries(Set entries) + private void indexSwapEntries(Set entries) { MenuEntry first = Iterables.getLast(entries); - leftClickEntry = entries.parallelStream().filter(entry -> + List values = new ArrayList<>(); + + for (Map.Entry pair : swaps.entrySet()) { - for (Map.Entry p : swaps.entrySet()) + if (pair.getKey().matches(first)) { - if (p.getKey().matches(first) && p.getValue().matches(entry)) + values.add(pair.getValue()); + } + } + + firstEntry = entries.parallelStream().filter(entry -> + { + for (ComparableEntry value : values) + { + if (value.matches(entry)) { return true; } From aaaa7845ef4b200f4c8cdbf8053405a38a6cf929 Mon Sep 17 00:00:00 2001 From: OnlyHereToPlayOsrs <37775694+xperiaclash@users.noreply.github.com> Date: Mon, 8 Jul 2019 23:16:53 +0200 Subject: [PATCH 470/472] banlist: add tob functionality, config options (#945) * banlist add tob functionality, config options * Checkstyle Fixes * Widget Info * Various White spaces removed. --- .../net/runelite/api/widgets/WidgetID.java | 1 + .../net/runelite/api/widgets/WidgetInfo.java | 15 +-- .../client/plugins/banlist/BanListConfig.java | 63 +++++++------ .../client/plugins/banlist/BanListPlugin.java | 94 ++++++++++++++----- 4 files changed, 117 insertions(+), 56 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index f0f016b5fe..510c19532d 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -667,6 +667,7 @@ public class WidgetID static class TheatreOfBlood { + static final int RAIDING_PARTY = 9; static final int ORB_BOX = 10; static final int BOSS_HEALTH_BAR = 35; } diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index c8c0ff88a6..755b710d57 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -445,6 +445,7 @@ public enum WidgetInfo THEATRE_OF_BLOOD_HEALTH_ORBS(WidgetID.THEATRE_OF_BLOOD_GROUP_ID, WidgetID.TheatreOfBlood.ORB_BOX), THEATRE_OF_BLOOD_BOSS_HEALTH(WidgetID.THEATRE_OF_BLOOD_GROUP_ID, WidgetID.TheatreOfBlood.BOSS_HEALTH_BAR), + THEATRE_OF_BLOOD_RAIDING_PARTY(WidgetID.THEATRE_OF_BLOOD_GROUP_ID, WidgetID.TheatreOfBlood.RAIDING_PARTY), BLAST_FURNACE_COFFER(WidgetID.BLAST_FURNACE_GROUP_ID, 2), @@ -514,7 +515,7 @@ public enum WidgetInfo PVP_KILLDEATH_COUNTER(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.KILLDEATH_RATIO), SPELLBOOK_FILTERED_BOUNDS(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.FILTERED_SPELLS_BOUNDS), - + /* STANDARD SPELL BOOK WIDGETS*/ SPELL_LUMBRIDGE_HOME_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LUMBRIDGE_HOME_TELEPORT), SPELL_WIND_STRIKE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WIND_STRIKE), @@ -530,7 +531,7 @@ public enum WidgetInfo SPELL_CURSE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CURSE), SPELL_BIND(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.BIND), SPELL_LOW_LEVEL_ALCHEMY(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LOW_LEVEL_ALCHEMY), - SPELL_WATER_BOLT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WATER_BOLT), + SPELL_WATER_BOLT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WATER_BOLT), SPELL_VARROCK_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.VARROCK_TELEPORT), SPELL_LVL_2_ENCHANT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LVL_2_ENCHANT), SPELL_EARTH_BOLT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.EARTH_BOLT), @@ -545,7 +546,7 @@ public enum WidgetInfo SPELL_CAMELOT_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CAMELOT_TELEPORT), SPELL_WATER_BLAST(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WATER_BLAST), SPELL_LVL_3_ENCHANT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LVL_3_ENCHANT), - SPELL_IBAN_BLAST(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.IBAN_BLAST), + SPELL_IBAN_BLAST(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.IBAN_BLAST), SPELL_SNARE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.SNARE), SPELL_MAGIC_DART(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.MAGIC_DART), SPELL_ARDOUGNE_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.ARDOUGNE_TELEPORT), @@ -562,7 +563,7 @@ public enum WidgetInfo SPELL_FLAMES_OF_ZAMORAK(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.FLAMES_OF_ZAMORAK), SPELL_TROLLHEIM_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TROLLHEIM_TELEPORT), SPELL_WIND_WAVE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WIND_WAVE), - SPELL_CHARGE_FIRE_ORB(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CHARGE_FIRE_ORB), + SPELL_CHARGE_FIRE_ORB(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CHARGE_FIRE_ORB), SPELL_TELEPORT_TO_APE_ATOLL(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELEPORT_TO_APE_ATOLL), SPELL_WATER_WAVE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WATER_WAVE), SPELL_CHARGE_AIR_ORB(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CHARGE_AIR_ORB), @@ -580,14 +581,14 @@ public enum WidgetInfo SPELL_TELEOTHER_FALADOR(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELEOTHER_FALADOR), SPELL_WATER_SURGE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WATER_SURGE), SPELL_TELE_BLOCK(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELE_BLOCK), - SPELL_LVL_6_ENCHANT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LVL_6_ENCHANT), + SPELL_LVL_6_ENCHANT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LVL_6_ENCHANT), SPELL_TELEOTHER_CAMELOT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELEOTHER_CAMELOT), SPELL_EARTH_SURGE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.EARTH_SURGE), SPELL_LVL_7_ENCHANT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LVL_7_ENCHANT), SPELL_FIRE_SURGE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.FIRE_SURGE), SPELL_BOUNTY_TARGET_TELEPORT2(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.BOUNTY_TARGET_TELEPORT), /* END OF STANDARD SPELL BOOK WIDGETS*/ - + /* ANCIENT SPELL BOOK WIDGETS*/ SPELL_ICE_RUSH(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.ICE_RUSH), SPELL_ICE_BLITZ(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.ICE_BLITZ), @@ -688,7 +689,7 @@ public enum WidgetInfo QUESTLIST_FREE_CONTAINER(WidgetID.QUESTLIST_GROUP_ID, WidgetID.QuestList.FREE_CONTAINER), QUESTLIST_MEMBERS_CONTAINER(WidgetID.QUESTLIST_GROUP_ID, WidgetID.QuestList.MEMBERS_CONTAINER), QUESTLIST_MINIQUEST_CONTAINER(WidgetID.QUESTLIST_GROUP_ID, WidgetID.QuestList.MINIQUEST_CONTAINER), - + MUSICTAB_INTERFACE(WidgetID.MUSICTAB_GROUP_ID, 1), MUSICTAB_SONG_BOX(WidgetID.MUSICTAB_GROUP_ID, 2), MUSICTAB_ALL_SONGS(WidgetID.MUSICTAB_GROUP_ID, 3), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListConfig.java index 4278c295b4..9e40544ba5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListConfig.java @@ -9,11 +9,10 @@ import net.runelite.client.config.ConfigItem; public interface BanListConfig extends Config { @ConfigItem( - keyName = "bannedPlayers", - name = "Manual Scammer List", - description = "Players you add to this list will be shown when you join a clan.", - position = 0 - + keyName = "bannedPlayers", + name = "Manual Scammer List", + description = "Manually add players seperated by commas that you wish to be warned about while in a clan/cox/tob party", + position = 0 ) default String getBannedPlayers() { @@ -21,28 +20,39 @@ public interface BanListConfig extends Config } @ConfigItem( - keyName = "bannedPlayers", - name = "", - description = "" + keyName = "bannedPlayers", + name = "", + description = "" ) void setBannedPlayers(String key); @ConfigItem( - position = 1, - keyName = "enableWDR", - name = "Enable WDR Scammer List", - description = "Incorporate WDR Scammer list" + position = 1, + keyName = "enableWDRScam", + name = "Enable WDR Scammer List", + description = "Incorporate WDR Scammer list" ) - default boolean enableWDR() + default boolean enableWDRScam() { return true; } @ConfigItem( - position = 2, - keyName = "enableRuneWatch", - name = "Enable RuneWatch Scammer List", - description = "Incorporate RuneWatch Scammer list" + position = 2, + keyName = "enableWDRToxic", + name = "Enable WDR Toxic List", + description = "Incorporate WDR Toxic list" + ) + default boolean enableWDRToxic() + { + return true; + } + + @ConfigItem( + position = 3, + keyName = "enableRuneWatch", + name = "Enable RuneWatch List", + description = "Incorporate RuneWatch potential scammer list" ) default boolean enableRuneWatch() { @@ -50,10 +60,10 @@ public interface BanListConfig extends Config } @ConfigItem( - position = 3, - keyName = "highlightInClan", - name = "Highlight red in Clan Chat", - description = "Highlights Scammer\'s name in your current clan chat." + position = 4, + keyName = "highlightInClan", + name = "Highlight red in Clan Chat", + description = "Highlights Scammer\'s name in your current clan chat." ) default boolean highlightInClan() { @@ -61,14 +71,13 @@ public interface BanListConfig extends Config } @ConfigItem( - position = 4, - keyName = "highlightInTrade", - name = "Highlight red in trade screen", - description = "Highlights Scammer\'s name in your trade window" + position = 5, + keyName = "highlightInTrade", + name = "Highlight red in trade screen", + description = "Highlights Scammer\'s name in your trade window" ) default boolean highlightInTrade() { return true; } - -} +} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java index 564c7474fb..a34b7e756c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java @@ -41,8 +41,10 @@ import net.runelite.api.ChatMessageType; import net.runelite.api.ClanMember; import net.runelite.api.Client; import net.runelite.api.GameState; +import net.runelite.api.Varbits; import net.runelite.api.events.ClanMemberJoined; import net.runelite.api.events.ConfigChanged; +import net.runelite.api.events.GameTick; import net.runelite.api.events.WidgetHiddenChanged; import net.runelite.api.events.WidgetLoaded; import net.runelite.api.widgets.Widget; @@ -77,22 +79,24 @@ import okhttp3.Response; @Slf4j public class BanListPlugin extends Plugin { - @Inject - private Client client; - - @Inject - private ClientThread clientThread; - - @Inject - private BanListConfig config; - - @Inject - private ChatMessageManager chatMessageManager; - private final Set wdrScamSet = new HashSet<>(); private final Set wdrToxicSet = new HashSet<>(); private final Set runeWatchSet = new HashSet<>(); private final Set manualBans = new HashSet<>(); + @Inject + private Client client; + @Inject + private ClientThread clientThread; + @Inject + private BanListConfig config; + @Inject + private ChatMessageManager chatMessageManager; + private String tobNames = ""; + private boolean enableWDRScam; + private boolean enableWDRToxic; + private boolean enableRuneWatch; + private boolean highlightInClan; + private boolean highlightInTrade; @Provides BanListConfig getConfig(ConfigManager configManager) @@ -100,12 +104,6 @@ public class BanListPlugin extends Plugin return configManager.getConfig(BanListConfig.class); } - // save config values - private boolean enableWDR; - private boolean enableRuneWatch; - private boolean highlightInClan; - private boolean highlightInTrade; - @Override protected void startUp() throws Exception { @@ -151,7 +149,8 @@ public class BanListPlugin extends Plugin private void updateConfig() { - this.enableWDR = config.enableWDR(); + this.enableWDRScam = config.enableWDRScam(); + this.enableWDRToxic = config.enableWDRToxic(); this.enableRuneWatch = config.enableRuneWatch(); this.highlightInClan = config.highlightInClan(); this.highlightInTrade = config.highlightInTrade(); @@ -234,12 +233,63 @@ public class BanListPlugin extends Plugin } } + + @Subscribe + public void onGameTick(GameTick event) + { + + if (client.getWidget(WidgetInfo.THEATRE_OF_BLOOD_RAIDING_PARTY) == null) + { + return; + } + + Widget raidingParty = client.getWidget(WidgetInfo.THEATRE_OF_BLOOD_RAIDING_PARTY); + String allNames = raidingParty.getText(); + + if (allNames.equalsIgnoreCase(tobNames)) + { + return; + } + + tobNames = allNames; + + String[] split = allNames.split("
"); + + for (int i = 0; i < 5; i++) + { + String name = split[i]; + if (!name.equalsIgnoreCase("-")) + { + ListType scamList = checkScamList(Text.standardize(name)); + + if (scamList != null) + { + sendWarning(name, scamList); + } + + ListType toxicList = checkToxicList(Text.standardize(name)); + + if (toxicList != null) + { + sendWarning(name, toxicList); + } + } + } + } + + + boolean inTobParty() + { + return client.getVar(Varbits.THEATRE_OF_BLOOD) == 1; + } + + /** * Compares player name to everything in the ban lists */ private ListType checkScamList(String nameToBeChecked) { - if (wdrScamSet.size() > 0 && this.enableWDR && wdrScamSet.contains(nameToBeChecked)) + if (wdrScamSet.size() > 0 && this.enableWDRScam && wdrScamSet.contains(nameToBeChecked)) { return ListType.WEDORAIDSSCAM_LIST; } @@ -260,7 +310,7 @@ public class BanListPlugin extends Plugin private ListType checkToxicList(String nameToBeChecked) { - if (wdrToxicSet.size() > 0 && this.enableWDR && wdrToxicSet.contains(nameToBeChecked)) + if (wdrToxicSet.size() > 0 && this.enableWDRToxic && wdrToxicSet.contains(nameToBeChecked)) { return ListType.WEDORAIDSTOXIC_LIST; } @@ -304,7 +354,7 @@ public class BanListPlugin extends Plugin case RUNEWATCH_LIST: final String rw_message = new ChatMessageBuilder() .append(ChatColorType.HIGHLIGHT) - .append("Warning! " + playerName + " is on the Runewatch\'s scammer list!") + .append("Warning! " + playerName + " is on the Runewatch\'s potential scammer list!") .build(); chatMessageManager.queue( From 1a998d4a67e55671c347a913a1401c048bdd0ca1 Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Mon, 8 Jul 2019 22:38:01 +0100 Subject: [PATCH 471/472] checkstyle: disallow wildcard imports --- checkstyle.xml | 6 ++++++ .../runelite/client/plugins/mining/MiningPlugin.java | 8 +++++++- .../calculators/testconfig/MagicMaxHitConfig.java | 8 +++++++- .../calculators/testconfig/MeleeMaxHitConfig.java | 11 +++++++++-- .../calculators/testconfig/RangeMaxHitConfig.java | 9 ++++++++- 5 files changed, 37 insertions(+), 5 deletions(-) diff --git a/checkstyle.xml b/checkstyle.xml index e8669a742c..c1935e18a2 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -1,6 +1,7 @@